From ea8b3440aa3fa89da03addd7411e879d29d5210e Mon Sep 17 00:00:00 2001 From: SodiumChlorideLogic <19625889+SodiumChlorideLogic@users.noreply.github.com> Date: Sat, 13 Nov 2021 11:50:41 -0500 Subject: [PATCH] Sound headers and ogSE progress --- include/JSystem/JAI/JAIBasic.h | 32 +++ include/JSystem/JAI/JAInter.h | 27 ++ include/PSSystem/FxMgr.h | 11 + include/PSSystem/SysIF.h | 40 +++ include/SoundID.h | 479 +++++++++++++++++++++++++++++++++ include/og/Sound.h | 54 ++++ src/plugProjectOgawaU/ogSE.cpp | 462 ++++--------------------------- 7 files changed, 690 insertions(+), 415 deletions(-) create mode 100644 include/JSystem/JAI/JAIBasic.h create mode 100644 include/JSystem/JAI/JAInter.h create mode 100644 include/PSSystem/FxMgr.h create mode 100644 include/PSSystem/SysIF.h create mode 100644 include/SoundID.h create mode 100644 include/og/Sound.h diff --git a/include/JSystem/JAI/JAIBasic.h b/include/JSystem/JAI/JAIBasic.h new file mode 100644 index 000000000..8110de6b0 --- /dev/null +++ b/include/JSystem/JAI/JAIBasic.h @@ -0,0 +1,32 @@ +#ifndef _JSYSTEM_JAI_JAIBASIC_H +#define _JSYSTEM_JAI_JAIBASIC_H + +#include "types.h" +#include "JSystem/JAI/JAInter.h" + +struct JKRHeap; +struct JAISound; + +struct JAIBasic { + virtual void makeSequence(); // _00 + virtual void makeSe(); // _04 + virtual void makeStream(); // _08 + virtual void getMapInfoFxline(ulong); // _0C + virtual void getMapInfoGround(ulong); // _10 + virtual void getMapInfoFxParameter(ulong); // _14 + virtual void setSeExtParameter(JAISound*); // _18 + virtual void setRegisterTrackCallback(); // _1C + + // VT _00 + JAInter::Camera* m_cameras; // _04 + JKRHeap* m_heap; // _08 + uchar _0C; // _0C + u8 m_paramSoundOutputMode; // _0D + u8 _0E; // _0E + u32 _10; // _10 + u32 _14; // _14 + u32 _18; // _18 + u32 _1C; // _1C +}; + +#endif diff --git a/include/JSystem/JAI/JAInter.h b/include/JSystem/JAI/JAInter.h new file mode 100644 index 000000000..b5e9bf089 --- /dev/null +++ b/include/JSystem/JAI/JAInter.h @@ -0,0 +1,27 @@ +#ifndef _JSYSTEM_JAI_JAINTER_H +#define _JSYSTEM_JAI_JAINTER_H + + +namespace JAInter { + namespace SequenceMgr { + struct CustomHeapInfo {}; + } // namespace SequenceMgr + struct Actor {}; + struct Camera {}; + struct HeapBlock {}; + struct LinkSound {}; + struct MoveParaSet {}; + struct MoveParaSetInitHalf {}; + struct MoveParaSetInitZero {}; + struct MuteBit {}; + struct Object {}; + struct ObjectBase {}; + struct PlayerParameter {}; + struct SeParameter {}; + struct SeqParameter {}; + struct SeqUpdateData {}; + struct SoundInfo {}; + struct SoundTable {}; +} + +#endif diff --git a/include/PSSystem/FxMgr.h b/include/PSSystem/FxMgr.h new file mode 100644 index 000000000..a7cee8163 --- /dev/null +++ b/include/PSSystem/FxMgr.h @@ -0,0 +1,11 @@ +#ifndef _PSSYSTEM_FXMGR_H +#define _PSSYSTEM_FXMGR_H + +namespace PSSystem { + struct FxMgr { + }; +} + + + +#endif diff --git a/include/PSSystem/SysIF.h b/include/PSSystem/SysIF.h new file mode 100644 index 000000000..b6d6d6502 --- /dev/null +++ b/include/PSSystem/SysIF.h @@ -0,0 +1,40 @@ +#ifndef _PSSYSTEM_SYSIF_H +#define _PSSYSTEM_SYSIF_H + +#include "types.h" +#include "Dolphin/os.h" +#include "JSystem/JAI/JAIBasic.h" +#include "PSSystem/FxMgr.h" + +namespace PSSystem { + struct SetupArg; +} + +namespace PSSystem { + // Size: 0x4C + struct SysIF : public JAIBasic { + SysIF(const SetupArg&); + void stopSoundSystem(); + void playSystemSe(ulong, ulong); + void playSystemSe(ulong, JAISound**, ulong); + void initIF(const SetupArg&); + void makeSe(); + void mainLoop(); + void setConfigVol_Se(float); + void setConfigVol_Bgm(float); + void start1stSeq(); + void makeSequence(); + void makeStream(); + + float _20; // _20 + float _24; // _24 + OSMutexObject m_mutex; // _28 + int _40; // _40 + FxMgr m_fxMgr; // _44 + u32 _48; // _48 + }; + + extern SysIF* spSysIF; +} // namespace PSSystem + +#endif diff --git a/include/SoundID.h b/include/SoundID.h new file mode 100644 index 000000000..ee3b35dc4 --- /dev/null +++ b/include/SoundID.h @@ -0,0 +1,479 @@ +#ifndef _SOUNDID_H +#define _SOUNDID_H + +enum SoundID { + PPSE_EV_S04_VACUUM_PLAYER=14369, + PSSE_CHALLENGE_COURSECLEAR=6196, + PSSE_CHALLENGE_PERFECTCLEAR=6197, + PSSE_DEMOG03_LOUIE=14446, + PSSE_DEMOG03_PIKI=14447, + PSSE_DEMOG04_TREASURE_FX=14448, + PSSE_DEMOG1A_RED_DOPING=14456, + PSSE_DEMOG26_LOUIE=14454, + PSSE_DEMOG26_ORIMA=14453, + PSSE_DEMOG27_PIKI_BREATH=14455, + PSSE_DEMOG2C_ORIMA=14451, + PSSE_DEMOS0E_POD_RETURN=14452, + PSSE_DEMOX01A_HATCH=14428, + PSSE_DEMOX01A_LOUIE_FALL=14429, + PSSE_DEMOX01A_LUGI_WONDER=14432, + PSSE_DEMOX01A_ORIMA_BIKU=14431, + PSSE_DEMOX01A_ORIMA_BOUND1=14434, + PSSE_DEMOX01A_ORIMA_BOUND2=14435, + PSSE_DEMOX01A_ORIMA_BOUND3=14436, + PSSE_DEMOX01A_ORIMA_BOUND4=14437, + PSSE_DEMOX01A_ORIMA_THROWN=14433, + PSSE_DEMOX01A_ROCET_HIT=14430, + PSSE_DEMOX01A_ROCKET=14427, + PSSE_DEMOX01B_ONYON=14439, + PSSE_DEMOX01B_ROCKET=14438, + PSSE_DEMOX01C_GOLDROCKET=14440, + PSSE_DEMOX02_ORIMA=14441, + PSSE_DEMOX03_LOUIE1=14444, + PSSE_DEMOX03_LOUIE2=14445, + PSSE_DEMOX05_LOUIE_ANTENNA=14442, + PSSE_DEMOX05_LOUIE_RADER=14443, + PSSE_DEMOX06_LOUIE=14450, + PSSE_DEMOX06_ORIMA=14449, + PSSE_DOKUTSU_COMPLETE=6195, + PSSE_EN_BIGFOOT_WALK=22678, + PSSE_EN_BIGTAKARA_EP_BOUND=22876, + PSSE_EN_BIGTAKARA_EP_BREAK=22877, + PSSE_EN_BIGTAKARA_E_SPARK=20827, + PSSE_EN_BIGTAKARA_E_SUSTAIN=20826, + PSSE_EN_BIGTAKARA_FIRE_BODY=20817, + PSSE_EN_BIGTAKARA_FIRE_ROOT=20816, + PSSE_EN_BIGTAKARA_FIRE_TAIL=20818, + PSSE_EN_BIGTAKARA_G_SPOUT=20821, + PSSE_EN_BIGTAKARA_G_SPRAY1=20822, + PSSE_EN_BIGTAKARA_G_SPRAY2=20823, + PSSE_EN_BIGTAKARA_G_SPRAY3=20824, + PSSE_EN_BIGTAKARA_G_SPRAY4=20825, + PSSE_EN_BIGTAKARA_WALK=22856, + PSSE_EN_BIGTAKARA_W_GROUND=22867, + PSSE_EN_BIGTAKARA_W_SHOT=22868, + PSSE_EN_BOMBSARAI_AIR=20709, + PSSE_EN_BOMBSARAI_DEAD=22762, + PSSE_EN_BOMB_FLY=20773, + PSSE_EN_BOMB_LOOP=22537, + PSSE_EN_BOMB_START=22536, + PSSE_EN_BUTTERFLY_L=14420, + PSSE_EN_BUTTERFLY_M=14419, + PSSE_EN_BUTTERFLY_S=14418, + PSSE_EN_CHAPPY_BITE1=22549, + PSSE_EN_CHAPPY_EAT=22553, + PSSE_EN_CHAPPY_NOTICE=22889, + PSSE_EN_COLLEC_DEAD=22646, + PSSE_EN_ENEMY_FATAL_HIT=22539, + PSSE_EN_ENEMY_GHOST=22538, + PSSE_EN_FUEFUKI_BOUND=22722, + PSSE_EN_FUEFUKI_DAMAGE=22720, + PSSE_EN_FUEFUKI_DEAD=22721, + PSSE_EN_FUEFUKI_JUMP=22718, + PSSE_EN_FUEFUKI_LNDING_WIND=22724, + PSSE_EN_FUEFUKI_VOICE=22719, + PSSE_EN_FUEFUKI_WHISTLE=22723, + PSSE_EN_HACHAPPY_WALK=22888, + PSSE_EN_HOUDAI_BAREFOOT=22822, + PSSE_EN_HOUDAI_BEAM=14421, + PSSE_EN_HOUDAI_IMPACT=22837, + PSSE_EN_HOUDAI_METALFOOT=22823, + PSSE_EN_HOUDAI_WATER_IMPACT=22533, + PSSE_EN_KOCHAPPY_NOTICE=22890, + PSSE_EN_KOGANE_WALK=22642, + PSSE_EN_KURAGE_AIR=20679, + PSSE_EN_KURAGE_DAMAGE=22728, + PSSE_EN_KURAGE_DEAD=22725, + PSSE_EN_KURAGE_FLICK=22729, + PSSE_EN_KURAGE_GET_PIKI=10282, + PSSE_EN_KURAGE_HARETSU=22726, + PSSE_EN_KURAGE_LAND=22731, + PSSE_EN_KURAGE_PRE_VACUUM=22733, + PSSE_EN_KURAGE_SING=20686, + PSSE_EN_KURAGE_TAKEOFF=22730, + PSSE_EN_KURAGE_VACUUM=20684, + PSSE_EN_LAND_SOIL_S=22529, + PSSE_EN_MINI_CHAPPY_ALERT=22561, + PSSE_EN_MINI_CHAPPY_BITE=22558, + PSSE_EN_MINI_CHAPPY_DIE=22556, + PSSE_EN_MINI_CHAPPY_DOWN=22560, + PSSE_EN_MINI_CHAPPY_EAT=22559, + PSSE_EN_MINI_CHAPPY_FDAMAGE=22555, + PSSE_EN_MINI_CHAPPY_SWING=22557, + PSSE_EN_MINI_CHAPPY_WALK=22554, + PSSE_EN_NAMAZU_DEAD=22693, + PSSE_EN_NAMAZU_EAT=22692, + PSSE_EN_NAMAZU_WALK=22691, + PSSE_EN_ONIKURAGE_AIR=20747, + PSSE_EN_ONIKURAGE_DAMAGE=22796, + PSSE_EN_ONIKURAGE_DEAD=22793, + PSSE_EN_ONIKURAGE_FLICK=22797, + PSSE_EN_ONIKURAGE_LAND=22799, + PSSE_EN_ONIKURAGE_VOMIT=2070, + PSSE_EN_OTAKARA_ATK_GAS=20836, + PSSE_EN_OTAKARA_DROP_ITEM=22887, + PSSE_EN_POISON_DAMAGE=22535, + PSSE_EN_QUEEN_BEAR_CHILD=22717, + PSSE_EN_QUEEN_CRUSH=22714, + PSSE_EN_QUEEN_DAMAGE=22710, + PSSE_EN_QUEEN_DEAD=22711, + PSSE_EN_QUEEN_DEAD_BOMB1=22712, + PSSE_EN_QUEEN_DEAD_BOMB2=22713, + PSSE_EN_QUEEN_ROLL_GROUND=20667, + PSSE_EN_QUEEN_ROLL_WIND=22716, + PSSE_EN_SPIDER_WALK=22583, + PSSE_EN_TAMAGOMUSHI_APPEAR=22805, + PSSE_EN_YOROI_APPEAR=22740, + PSSE_EN_YOROI_ATTACK=22744, + PSSE_EN_YOROI_DEAD=22745, + PSSE_EN_YOROI_DIVE=22741, + PSSE_EN_YOROI_FLICK=22746, + PSSE_EN_YOROI_PIERCE=22742, + PSSE_EN_YOROI_SUCK=22743, + PSSE_EN_YOROI_VOICE=22747, + PSSE_EV_DOL2GOLD_FLY_AWAY=14372, + PSSE_EV_DOL2GOLD_LAND = 14375, + PSSE_EV_DOL2GOLD_LNDING=14374, + PSSE_EV_DOL2GOLD_PISTON=14376, + PSSE_EV_DOL2GOLD_TAKEOFF=14373, + PSSE_EV_DOWNFLOOR_SHAKE=14406, + PSSE_EV_ELEC_GATE=14392, + PSSE_EV_FOUNTAIN_SHOT=14391, + PSSE_EV_FRUIT_POP=14402, + PSSE_EV_G20_ONYON_APPEAR_W=14354, + PSSE_EV_G20_ONYON_LAND_W=14353, + PSSE_EV_HOLE_APPEAR=14405, + PSSE_EV_HOME_PELLET_BACUUM=14340, + PSSE_EV_HOME_PELLET_FINISH=14341, + PSSE_EV_ITEM_LAND_SOIL_L=14346, + PSSE_EV_ITEM_LAND_SOIL_M=14345, + PSSE_EV_ITEM_LAND_SOIL_S=14344, + PSSE_EV_ITEM_LAND_WATER1_L=14349, + PSSE_EV_ITEM_LAND_WATER1_M=14348, + PSSE_EV_ITEM_LAND_WATER1_S=14347, + PSSE_EV_ITEM_LAND_WATER1_XL=14409, + PSSE_EV_KEY_BOUND=14384, + PSSE_EV_ONYON_APPEAR=14356, + PSSE_EV_ONYON_BOOTUP=14355, + PSSE_EV_ONYON_BOUND_PLAYER=14342, + PSSE_EV_ONYON_FOOT=14357, + PSSE_EV_ONYON_GAS=14385, + PSSE_EV_ONYON_LAND=14358, + PSSE_EV_PAPERBAG_PRESSED=14425, + PSSE_EV_PAPERBAG_SINK=14426, + PSSE_EV_PODGOLD_CLOSE=14382, + PSSE_EV_PODGOLD_FLY_AWAY=14378, + PSSE_EV_PODGOLD_FLY_DOWN=14377, + PSSE_EV_PODGOLD_JOINT=14380, + PSSE_EV_PODGOLD_OPEN=14383, + PSSE_EV_PODGOLD_PROPELLER=14379, + PSSE_EV_PODGOLD_SLIDE=14381, + PSSE_EV_POD_BOOST=14397, + PSSE_EV_POD_CLOSE=14389, + PSSE_EV_POD_FLY_AWAY=14364, + PSSE_EV_POD_FLY_DOWN=14363, + PSSE_EV_POD_JOINT=14398, + PSSE_EV_POD_OPEN=14390, + PSSE_EV_POD_PROPELLER=14404, + PSSE_EV_POD_SLIDE=14388, + PSSE_EV_POLLUTIONMIX_DOWN01=14460, + PSSE_EV_POLLUTION_NOISE=14459, + PSSE_EV_POLUTIONMIX_DOWN01=14461, + PSSE_EV_POLUTIONMIX_DOWN02=14462, + PSSE_EV_POLUTION_MIX01=14457, + PSSE_EV_POLUTION_MIX02=14458, + PSSE_EV_PROPERA_LANDING=14361, + PSSE_EV_PROPERA_TAKEOFF=14362, + PSSE_EV_ROCKET_FLY_AWAY=14350, + PSSE_EV_ROCKET_JET_LANDING=14359, + PSSE_EV_ROCKET_LAND=14360, + PSSE_EV_ROCKET_TAKEOFF=14351, + PSSE_EV_ROCKET_VACUUM=14365, + PSSE_EV_ROCKET_VOLVE=14343, + PSSE_EV_RUIN_DISCHARGE=14393, + PSSE_EV_RUIN_FOUNTAIN=14396, + PSSE_EV_RUIN_GLOW=14394, + PSSE_EV_RUIN_WITHER=14395, + PSSE_EV_S01_VACUUM_PLAYER=14367, + PSSE_EV_S03_VACUUM_PLAYER=14368, + PSSE_EV_S06_VACUUM_PLAYER=14370, + PSSE_EV_S12_VACUUM_PLAYER=14371, + PSSE_EV_TREASURE_JUMP_OUT=14387, + PSSE_EV_TREASURE_RISE_UP=14386, + PSSE_EV_TSUUKUSA_WITHER=14401, + PSSE_EV_TSUYUKUSA_FRUIT=14400, + PSSE_EV_TSUYUKUSA_GROW=14399, + PSSE_EV_UFO_PISTON=14403, + PSSE_EV_VACUUM_PLAYER_END=14366, + PSSE_EV_WATERSHOT_NORMAL=14408, + PSSE_EV_WATER_OUT=14407, + PSSE_EV_WORK_BRIDGE_EXTEND=14337, + PSSE_EV_WORK_HONEY_DROP=14336, + PSSE_EV_WORK_STONE_BREAK=14338, + PSSE_EV_WORK_WALLDOWN=14339, + PSSE_MP_BIRD_FA_KAMO=16442, + PSSE_MP_BIRD_FA_MOZU=16443, + PSSE_MP_BIRD_FA_TSUGUMI=16444, + PSSE_MP_SHIP_CALLING_01=6255, + PSSE_MP_SHIP_PERIOD_01=6256, + PSSE_MP_VOX_CANCEL=6254, + PSSE_ONYON_FLY_AWAY=14352, + PSSE_OTAKARA_COMPLETE=6213, + PSSE_PAY_COME=6181, + PSSE_PAY_COMPLETE=6212, + PSSE_PK_AINOUTA_RA=10374, + PSSE_PK_AINOUTA_RU=10373, + PSSE_PK_CARROT_CRUSH=14423, + PSSE_PK_CARROT_GROUND=14422, + PSSE_PK_CARROT_THROW=14424, + PSSE_PK_DOPING_IMI=10325, + PSSE_PK_ESCAPE_HOLE=10330, + PSSE_PK_FLOWER_FALL_VOICE=10310, + PSSE_PK_FLOWER_VOICE=10309, + PSSE_PK_G03_MEET_RED=10331, + PSSE_PK_G1F_PIKI_ELEC=10311, + PSSE_PK_G21_MEET_BLUE=10332, + PSSE_PK_G24_MEET_BLACK=10334, + PSSE_PK_G24_MMET_BLACK2=10375, + PSSE_PK_G27_MEET_WHITE=10333, + PSSE_PK_HAPPA_ATTACK=10355, + PSSE_PK_HAPPA_BREAKUP=10340, + PSSE_PK_HAPPA_CALLED=10341, + PSSE_PK_HAPPA_DIGGING=10360, + PSSE_PK_HAPPA_DOPE_ATTACK=10357, + PSSE_PK_HAPPA_DOPE_END=10358, + PSSE_PK_HAPPA_DOPING=10356, + PSSE_PK_HAPPA_EATEN=10343, + PSSE_PK_HAPPA_FALL=10349, + PSSE_PK_HAPPA_FLOWER=10344, + PSSE_PK_HAPPA_FLOWER_FALL=10345, + PSSE_PK_HAPPA_GHOST=10346, + PSSE_PK_HAPPA_JUMP_HOLE=10348, + PSSE_PK_HAPPA_LIFT_MOVE=10354, + PSSE_PK_HAPPA_LIFT_SUCCESS=10353, + PSSE_PK_HAPPA_LIFT_TRY=10352, + PSSE_PK_HAPPA_PANIC=10363, + PSSE_PK_HAPPA_PRESSED=10350, + PSSE_PK_HAPPA_PULLOUT=10351, + PSSE_PK_HAPPA_SAVED=10361, + PSSE_PK_HAPPA_SCATTERED=10359, + PSSE_PK_HAPPA_THROWN=10342, + PSSE_PK_HAPPA_THROW_WAIT=10347, + PSSE_PK_HUMING01=10370, + PSSE_PK_HUMING02=10371, + PSSE_PK_HUMING03=10372, + PSSE_PK_HUMMING_TEST=10365, + PSSE_PK_RESULT_DECREMENT=10336, + PSSE_PK_RESULT_INCREMENT=10335, + PSSE_PK_SE_ATTACH=10245, + PSSE_PK_SE_ATTACKHIT=10248, + PSSE_PK_SE_BOMB=22528, + PSSE_PK_SE_DOSUN=10318, + PSSE_PK_SE_DOSUN_HIT=10364, + PSSE_PK_SE_HIT_BRIDGE=10279, + PSSE_PK_SE_HIT_CONCRETEWALL=10278, + PSSE_PK_SE_HIT_ELEC_GATE=10317, + PSSE_PK_SE_HIT_FOUNTAIN=10275, + PSSE_PK_SE_HIT_HARDWALL=10276, + PSSE_PK_SE_HIT_SOFTWALL=10277, + PSSE_PK_SE_HIT_STONE=10280, + PSSE_PK_SE_INSIDE_ONYON=10260, + PSSE_PK_SE_INSIDE_VOLVE=10272, + PSSE_PK_SE_KARABURI=10247, + PSSE_PK_SE_ONY_ENTER=10269, + PSSE_PK_SE_ONY_HATSUGA=10264, + PSSE_PK_SE_ONY_KARERU=10268, + PSSE_PK_SE_ONY_SAKU=10267, + PSSE_PK_SE_ONY_SEED_EJECT=10262, + PSSE_PK_SE_ONY_SEED_GROUND=10263, + PSSE_PK_SE_ONY_SODATSU=10265, + PSSE_PK_SE_ONY_TSUBOMI=10266, + PSSE_PK_SE_PULL_GRASS=10281, + PSSE_PK_SE_STABBED=10283, + PSSE_PK_SE_WATER_IN=10257, + PSSE_PK_SHOUT01=10366, + PSSE_PK_SHOUT02=10367, + PSSE_PK_SHOUT03=10368, + PSSE_PK_SHOUT04=10369, + PSSE_PK_VC_AKUBI=10292, + PSSE_PK_VC_ANGRY1=10303, + PSSE_PK_VC_ANGRY2=10304, + PSSE_PK_VC_ATTACK=10246, + PSSE_PK_VC_BLOWN_DEAD=10312, + PSSE_PK_VC_BREAKUP=10240, + PSSE_PK_VC_BURUBURU=10293, + PSSE_PK_VC_CALLED=10241, + PSSE_PK_VC_CRASH=10294, + PSSE_PK_VC_DAMAGED=10250, + PSSE_PK_VC_DEAD1=10253, + PSSE_PK_VC_DEAD2=10254, + PSSE_PK_VC_DEAD3=10255, + PSSE_PK_VC_DIGGING=10319, + PSSE_PK_VC_DOPE_ATTACK=10322, + PSSE_PK_VC_DOPE_END=10323, + PSSE_PK_VC_DOPING=10321, + PSSE_PK_VC_DRINK=10291, + PSSE_PK_VC_EATEN=10249, + PSSE_PK_VC_ELEC_DEAD=10316, + PSSE_PK_VC_FALL=10295, + PSSE_PK_VC_FIND=10288, + PSSE_PK_VC_FIRED=10252, + PSSE_PK_VC_GAKKARI=10300, + PSSE_PK_VC_GAS_POISONING=10320, + PSSE_PK_VC_GHOST=10256, + PSSE_PK_VC_HANG=10296, + PSSE_PK_VC_JUMP1=10297, + PSSE_PK_VC_JUMP2=10298, + PSSE_PK_VC_JUMP3=10299, + PSSE_PK_VC_JUMP_INTO_HOLE=10287, + PSSE_PK_VC_JUMP_INTO_UFO=10271, + PSSE_PK_VC_KINOKO_OBORE=10259, + PSSE_PK_VC_LAND=10244, + PSSE_PK_VC_LIFT_MOVE=10286, + PSSE_PK_VC_LIFT_SUCCESS=10285, + PSSE_PK_VC_LIFT_TRY=10284, + PSSE_PK_VC_NOBI=10290, + PSSE_PK_VC_ONY_CLIMB=10261, + PSSE_PK_VC_ONY_EXIT=10270, + PSSE_PK_VC_OTTOTTO=10305, + PSSE_PK_VC_PANIC=10362, + PSSE_PK_VC_PRESSED=10251, + PSSE_PK_VC_SAVED=10274, + PSSE_PK_VC_SCATTERED=10324, + PSSE_PK_VC_SLEEP=10302, + PSSE_PK_VC_SLIP=10306, + PSSE_PK_VC_SLIP1=10307, + PSSE_PK_VC_SLIP2=10308, + PSSE_PK_VC_SNEEZE=10301, + PSSE_PK_VC_SPLASH_OFF=10314, + PSSE_PK_VC_SWALLOWED=10313, + PSSE_PK_VC_THROWN=10243, + PSSE_PK_VC_THROW_WAIT=10242, + PSSE_PK_VC_WATER_DROWN=10258, + PSSE_PK_VC_WATER_PANIC=10315, + PSSE_PK_VC_YATTA=10289, + PSSE_PL_DAYEND_KAISAN_LUI=2212, + PSSE_PL_DAYEND_KAISAN_ORI=2211, + PSSE_PL_DAYEND_KAISAN_SHA=2213, + PSSE_PL_DEMOE00_BIKU_LUGI=14417, + PSSE_PL_DEMOE00_BIKU_ORIMA=14416, + PSSE_PL_DEMOE00_POD=10329, + PSSE_PL_DEMOG00_BIKU_LUGI=14411, + PSSE_PL_DEMOG00_BIKU_ORIMA=14410, + PSSE_PL_DEMOG07_BIKU_LUGI=14413, + PSSE_PL_DEMOG07_BIKU_ORIMA=14412, + PSSE_PL_DEMOG08_BIKU_LUGI=14415, + PSSE_PL_DEMOG08_BIKU_ORIMA=14414, + PSSE_PL_DEMOG26_POD=10337, + PSSE_PL_DEMOG29_POD=10338, + PSSE_PL_DEMOG32_POD=10339, + PSSE_PL_DEMOS00_POD=10326, + PSSE_PL_DEMOS07_POD=10327, + PSSE_PL_DEMOS08_POD=10328, + PSSE_PL_KAISAN_LUI=2209, + PSSE_PL_KAISAN_SHACHO=2210, + PSSE_PL_PIKON_LUI=2215, + PSSE_PL_PIKON_ORIMA=2214, + PSSE_PL_PIKON_SHACHO=2216, + PSSE_PL_PULLOUT_PIKI=10273, + PSSE_PL_SYUGO_SHACHO=2208, + PSSE_POD_PC=16391, + PSSE_READYGO_BATTLE_COME=6182, + PSSE_READYGO_CHALLENGE_COME=6183, + PSSE_SAVESELECTPAD=16390, + PSSE_SY_2PSLOT_APPEAR=6202, + PSSE_SY_2PSLOT_GO=6204, + PSSE_SY_2PSLOT_ROLL=4155, + PSSE_SY_2PTOP_ONY_ENTER=6201, + PSSE_SY_2P_MARBLE_COUNT=6281, + PSSE_SY_2P_RULE_WAIT=4235, + PSSE_SY_2P_SLOT_STOC=6282, + PSSE_SY_2P_WIN_COUNT=6259, + PSSE_SY_CAMERAVIEW_CHANGE=6159, + PSSE_SY_CAMERAVIEW_ROTATE=6280, + PSSE_SY_CHALLENGE_FLOWER=6192, + PSSE_SY_CHALLENGE_ONY_MOVE=6188, + PSSE_SY_CHALLENGE_ONY_SPIN=6189, + PSSE_SY_CHALLENGE_SCOREROLL=4145, + PSSE_SY_CHALLENGE_SCORE_L=6191, + PSSE_SY_CHALLENGE_SCORE_S=6190, + PSSE_SY_CHANGE_LUI=6286, + PSSE_SY_CHANGE_ORIMA=6285, + PSSE_SY_CHANGE_SHACHO=6287, + PSSE_SY_COIN_COUNT=6174, + PSSE_SY_DAYEND_COUNTDOWN=6168, + PSSE_SY_EQUIP_LADER=6270, + PSSE_SY_EQUIP_SPLAY=6272, + PSSE_SY_EVENING_ALERT=6167, + PSSE_SY_FLOOR_COMPLETE=6278, + PSSE_SY_HAPPA_SAY_PIKMIN=6258, + PSSE_SY_KANTEI_OUT=6290, + PSSE_SY_LADER_NOISE_SINGLE=6279, + PSSE_SY_LADER_TURN_GRAY=6273, + PSSE_SY_LIFE_DANGER=6169, + PSSE_SY_MAIL_LOUIE_GRANMA=6266, + PSSE_SY_MAIL_ORIMA_DAUGHTER=6265, + PSSE_SY_MAIL_ORIMA_SON=6264, + PSSE_SY_MAIL_ORIMA_WIFE=6263, + PSSE_SY_MAIL_RECIEVE=6269, + PSSE_SY_MAIL_SHACHO=6262, + PSSE_SY_MAIL_SHACHO_WIFE=6267, + PSSE_SY_MAIL_SPAM=6268, + PSSE_SY_MEMORYCARD_ACCESS=4107, + PSSE_SY_MEMORYCARD_ERROR=6157, + PSSE_SY_MEMORYCARD_OK=6156, + PSSE_SY_MEMO_SCROLL=4213, + PSSE_SY_MENU_CANCEL=6145, + PSSE_SY_MENU_CLOSE=6148, + PSSE_SY_MENU_CURSOR=6146, + PSSE_SY_MENU_DECIDE=6144, + PSSE_SY_MENU_ERROR=6151, + PSSE_SY_MENU_OPEN=6147, + PSSE_SY_MENU_PAUSE=6149, + PSSE_SY_MENU_PLUS_MINUS=6150, + PSSE_SY_MENU_SCROLL=4106, + PSSE_SY_MENU_ZOOMIN=4104, + PSSE_SY_MENU_ZOOMOUT=4105, + PSSE_SY_MESSAGE_EXIT=6161, + PSSE_SY_MESSAGE_WARNING=6291, + PSSE_SY_MESSAGE_WRITE=6160, + PSSE_SY_NEW_COURSE_OPEN=6162, + PSSE_SY_ONYON_READY=4123, + PSSE_SY_OTAKARA_NAME=6277, + PSSE_SY_OTAKARA_SCROLL=4228, + PSSE_SY_OTAKARA_ZOOMIN=6274, + PSSE_SY_OTAKARA_ZOOMOUT=6275, + PSSE_SY_PIKI_DECREMENT=6186, + PSSE_SY_PIKI_DECRE_SUM=6187, + PSSE_SY_PIKI_INCREMENT=6184, + PSSE_SY_PIKI_INCRE_SUM=6185, + PSSE_SY_PK_UNDER_DOPING=4209, + PSSE_SY_PLAYER_CHANGE=6175, + PSSE_SY_PLUS_MINUS_REPEAT=4128, + PSSE_SY_REGI_DRAWER_OPEN=6163, + PSSE_SY_REGI_RECEIPT=6173, + PSSE_SY_REGI_ROLL=4122, + PSSE_SY_REGI_SUM_UP=6164, + PSSE_SY_ROCKET_SMOKE=4129, + PSSE_SY_SOUND_CONFIG=6158, + PSSE_SY_STORED_SPRAY=6194, + PSSE_SY_THROW_PIKI_CHANGE=6178, + PSSE_SY_TIME_SIGNAL_NOON=6166, + PSSE_SY_TIME_SIGNAL_SMALL=6165, + PSSE_SY_TRESURE_LADER=6260, + PSSE_SY_WMAP_CAVE_COMP=6211, + PSSE_SY_WMAP_CAVE_ITEM=6210, + PSSE_SY_WMAP_CAVE_MONEY=6209, + PSSE_SY_WMAP_CAVE_NAME=6208, + PSSE_SY_WMAP_ITEM_COMP=6207, + PSSE_SY_WMAP_ITEM_GET=6206, + PSSE_SY_WMAP_MONEY_UP=6205, + PSSE_SY_WMAP_ZUKAN_NEW=6271, + PSSE_SY_WORK_FINISH=6172, + PSSE_SY_ZUKAN_SCRIPT_LOUIE=6199, + PSSE_SY_ZUKAN_SCRIPT_ORIMA=6198, + PSSE_SY_ZUKAN_SCRIPT_POD=6200, + dropItem=22544 +}; + +#endif diff --git a/include/og/Sound.h b/include/og/Sound.h new file mode 100644 index 000000000..c3c5b6f69 --- /dev/null +++ b/include/og/Sound.h @@ -0,0 +1,54 @@ +#ifndef _OG_SOUND_H +#define _OG_SOUND_H + +#include "types.h" + +namespace og { + struct Sound { + void setSE(ulong); + void setLifeDanger(); + void setChimeNoon(); + void setChime(); + void setDecide(); + void setCancel(); + void setCursor(); + void setOpen(); + void setClose(); + void setPause(); + void setPlusMinus(bool); + void setSMenuLR(); + void setError(); + void setZoomIn(); + void setZoomOut(); + void setScroll(); + void setOpenDoukutu(); + void setSaveCave(); + void setOpenWMapMenu(); + void setOpenTotalPoko(); + void setCloseTotalPoko(); + void setPlusTotalPoko(); + void setOpenFinalMsg(); + void setSprayAdd(); + void setTimeCarry(); + void setSensorSE(); + void setGetSensor(); + void setFloorComplete(); + void setGraySensor(); + void setGetSpray(); + void setItemName(); + void setKanteiExit(); + void setFloorTitle(); + void setVsTitle(); + void setBdamaGet(); + void setNaviChange(int); + void setVsTitleAbutton(); + void stopSound(); + void setVsWin1P(); + void setVsWin2P(); + void setVsDraw(); + void setWarning(); + }; + extern Sound ogSound; +} // namespace og + +#endif diff --git a/src/plugProjectOgawaU/ogSE.cpp b/src/plugProjectOgawaU/ogSE.cpp index eb8fa4d81..bcba9cc7e 100644 --- a/src/plugProjectOgawaU/ogSE.cpp +++ b/src/plugProjectOgawaU/ogSE.cpp @@ -1,4 +1,7 @@ #include "types.h" +#include "og/Sound.h" +#include "PSSystem/SysIF.h" +#include "SoundID.h" /* Generated from dpostproc @@ -21,26 +24,16 @@ */ namespace og { +Sound ogSound; /* * --INFO-- * Address: 8030C9B0 * Size: 000028 */ -void Sound::setSE(unsigned long) +void Sound::setSE(ulong soundID) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(soundID, 0); } /* @@ -50,19 +43,7 @@ void Sound::setSE(unsigned long) */ void Sound::setLifeDanger(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1819 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_LIFE_DANGER, 0); } /* @@ -156,19 +137,7 @@ lbl_8030CAD8: */ void Sound::setChime(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1815 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_TIME_SIGNAL_SMALL, 0); } /* @@ -178,19 +147,7 @@ void Sound::setChime(void) */ void Sound::setDecide(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1800 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_DECIDE, 0); } /* @@ -200,19 +157,7 @@ void Sound::setDecide(void) */ void Sound::setCancel(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1801 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_CANCEL, 0); } /* @@ -222,19 +167,7 @@ void Sound::setCancel(void) */ void Sound::setCursor(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1802 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_CURSOR, 0); } /* @@ -244,19 +177,7 @@ void Sound::setCursor(void) */ void Sound::setOpen(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1803 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_OPEN, 0); } /* @@ -266,19 +187,7 @@ void Sound::setOpen(void) */ void Sound::setClose(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1804 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_CLOSE, 0); } /* @@ -296,32 +205,13 @@ void Sound::setPause(void) * Address: 8030CC00 * Size: 000048 */ -void Sound::setPlusMinus(bool) +void Sound::setPlusMinus(bool isRepeat) { - /* - stwu r1, -0x10(r1) - mflr r0 - stw r0, 0x14(r1) - clrlwi. r0, r4, 0x18 - beq lbl_8030CC28 - lwz r3, spSysIF__8PSSystem@sda21(r13) - li r4, 0x1020 - li r5, 0 - bl playSystemSe__Q28PSSystem5SysIFFUlUl - b lbl_8030CC38 - -lbl_8030CC28: - lwz r3, spSysIF__8PSSystem@sda21(r13) - li r4, 0x1806 - li r5, 0 - bl playSystemSe__Q28PSSystem5SysIFFUlUl - -lbl_8030CC38: - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + if (isRepeat) { + PSSystem::spSysIF->playSystemSe(PSSE_SY_PLUS_MINUS_REPEAT, 0); + } else { + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_PLUS_MINUS, 0); + } } /* @@ -331,19 +221,7 @@ lbl_8030CC38: */ void Sound::setSMenuLR(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1806 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_PLUS_MINUS, 0); } /* @@ -353,19 +231,7 @@ void Sound::setSMenuLR(void) */ void Sound::setError(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1807 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_ERROR, 0); } /* @@ -375,19 +241,7 @@ void Sound::setError(void) */ void Sound::setZoomIn(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1008 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_ZOOMIN, 0); } /* @@ -397,19 +251,7 @@ void Sound::setZoomIn(void) */ void Sound::setZoomOut(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1009 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_ZOOMOUT, 0); } /* @@ -419,19 +261,7 @@ void Sound::setZoomOut(void) */ void Sound::setScroll(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x100a - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MENU_SCROLL, 0); } /* @@ -441,19 +271,7 @@ void Sound::setScroll(void) */ void Sound::setOpenDoukutu(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1811 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MESSAGE_EXIT, 0); } /* @@ -463,19 +281,7 @@ void Sound::setOpenDoukutu(void) */ void Sound::setSaveCave(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x4006 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SAVESELECTPAD, 0); } /* @@ -485,19 +291,7 @@ void Sound::setSaveCave(void) */ void Sound::setOpenWMapMenu(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1811 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MESSAGE_EXIT, 0); } /* @@ -507,19 +301,7 @@ void Sound::setOpenWMapMenu(void) */ void Sound::setOpenTotalPoko(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1813 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_REGI_DRAWER_OPEN, 0); } /* @@ -529,19 +311,7 @@ void Sound::setOpenTotalPoko(void) */ void Sound::setCloseTotalPoko(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x181d - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_REGI_RECEIPT, 0); } /* @@ -551,19 +321,7 @@ void Sound::setCloseTotalPoko(void) */ void Sound::setPlusTotalPoko(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1814 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_REGI_SUM_UP, 0); } /* @@ -573,19 +331,7 @@ void Sound::setPlusTotalPoko(void) */ void Sound::setOpenFinalMsg(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1811 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MESSAGE_EXIT, 0); } /* @@ -595,19 +341,7 @@ void Sound::setOpenFinalMsg(void) */ void Sound::setSprayAdd(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1832 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_STORED_SPRAY, 0); } /* @@ -617,19 +351,7 @@ void Sound::setSprayAdd(void) */ void Sound::setTimeCarry(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1829 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_PIKI_INCRE_SUM, 0); } /* @@ -649,19 +371,7 @@ void Sound::setSensorSE(void) */ void Sound::setGetSensor(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x187e - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_EQUIP_LADER, 0); } /* @@ -671,19 +381,7 @@ void Sound::setGetSensor(void) */ void Sound::setFloorComplete(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1886 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_FLOOR_COMPLETE, 0); } /* @@ -693,19 +391,7 @@ void Sound::setFloorComplete(void) */ void Sound::setGraySensor(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1881 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_LADER_TURN_GRAY, 0); } /* @@ -715,19 +401,7 @@ void Sound::setGraySensor(void) */ void Sound::setGetSpray(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1880 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_EQUIP_SPLAY, 0); } /* @@ -747,19 +421,7 @@ void Sound::setItemName(void) */ void Sound::setKanteiExit(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1892 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_KANTEI_OUT, 0); } /* @@ -776,19 +438,7 @@ void Sound::setFloorTitle(void) { } */ void Sound::setVsTitle(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x108b - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_2P_RULE_WAIT, 0); } /* @@ -798,19 +448,7 @@ void Sound::setVsTitle(void) */ void Sound::setBdamaGet(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1889 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_2P_MARBLE_COUNT, 0); } /* @@ -847,6 +485,8 @@ void Sound::stopSound(void) */ void Sound::setVsWin1P(void) { + // PSStart2DStream(0xc0011043) + // stopSound(); /* stwu r1, -0x10(r1) mflr r0 @@ -922,6 +562,8 @@ lbl_8030D098: */ void Sound::setVsWin2P(void) { + // PSStart2DStream(0xc0011044) + // stopSound(); /* stwu r1, -0x10(r1) mflr r0 @@ -997,6 +639,8 @@ lbl_8030D178: */ void Sound::setVsDraw(void) { + // PSStart2DStream(0xc0011045) + // stopSound(); /* stwu r1, -0x10(r1) mflr r0 @@ -1072,18 +716,6 @@ lbl_8030D258: */ void Sound::setWarning(void) { - /* - stwu r1, -0x10(r1) - mflr r0 - li r4, 0x1893 - li r5, 0 - stw r0, 0x14(r1) - lwz r3, spSysIF__8PSSystem@sda21(r13) - bl playSystemSe__Q28PSSystem5SysIFFUlUl - lwz r0, 0x14(r1) - mtlr r0 - addi r1, r1, 0x10 - blr - */ + PSSystem::spSysIF->playSystemSe(PSSE_SY_MESSAGE_WARNING, 0); } } // namespace og