diff options
| author | Erin Moon <erin@hecke.rs> | 2021-01-21 22:16:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 23:16:51 -0500 |
| commit | a072e71c33dc4f78f20f7b4ba8645346af66fd9c (patch) | |
| tree | e4caf9392e0672fceccfd11beed6eb45a10b0bac /include/Z2AudioLib | |
| parent | afb426c60ca87472063b9b58b1a6b6a9db4fc127 (diff) | |
Z2AudioLib misc decomp (#75)
* Z2SoundHandles: decomp portions
* start decomping: Z2SpeechMgr2, Z2SoundHandles
* Z2SoundHandles::stopAllSounds(): ok
* Z2SoundHandles::getHandleUserData(): ok
* Z2SoundInfo: header
* Z2SoundObjBase::framework(): ok
* Z2SoundObjBase::Z2SoundObjBase(), Z2SoundObjBase::init(): ok
* Z2SoundObjBase::~Z2SoundObjBase(): ok
* Z2SoundObjBase::stopOK(): ok
* Z2SoundObjBase::stopOK, incomplete Z2SoundObjBase::dispose()
* clang-format
* Z2SoundObjBase::dispose(): ok
* JAISound::operator->(): null assert
* JAIAudience: stub
* Z2SoundObject::{init, deleteObject, isAlive}: ok
* Z2SeMgr: elaborate struct (and decl JAISoundHandles to support this)
* start subclassing Z2SoundObjBase; nonmatching Z2SoundObjSimple::init()
* Z2SeMGr::{incrCrowdSize, decrCrowdSize}: ok
* Z2MultiSeMgr::resetMultiSePos(): ok
* Z2WolfHowlMgr.h: decls
* Z2SoundStarter: move to decls and fix postprocess.py symbol pass
* Z2AudioArcLoader: decls
* Z2SoundObjMgr: ok some fns
- deleteEnemyAll()
- isTwilightBattle()
- setGhostEnemyState()
additionally elaborates parts of the Z2Creature hierarchy
* delete unused .s files and add tool to find them (only runs on linux)
* run clang-format
* postprocess.py: comment out debugging
* add python step to ok-check workflow
* address review comments
* address review comments
Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>
Diffstat (limited to 'include/Z2AudioLib')
125 files changed, 554 insertions, 621 deletions
diff --git a/include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h b/include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h new file mode 100644 index 0000000000..de83a57545 --- /dev/null +++ b/include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h @@ -0,0 +1,16 @@ +#ifndef Z2AUDIOARCLOADER_H_ +#define Z2AUDIOARCLOADER_H_ + +#include "JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h" +#include "global.h" + +class Z2AudioArcLoader { + Z2AudioArcLoader(JAUSection*); + ~Z2AudioArcLoader(); + + void readCommandMore(u32); + void readBFCA(const void*); + void readBSTN(const void*, u32); +}; + +#endif
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A70.s b/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A70.s index 19aa6daef7..ae22ca4df1 100644 --- a/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A70.s +++ b/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A70.s @@ -14,7 +14,7 @@ lbl_802A9A94: /* 802A9AA0 002A69E0 90 03 00 04 */ stw r0, 4(r3) /* 802A9AA4 002A69E4 80 03 00 08 */ lwz r0, 8(r3) /* 802A9AA8 002A69E8 7C 80 2A 14 */ add r4, r0, r5 -/* 802A9AAC 002A69EC 48 00 00 1D */ bl Z2AudioArcLoader_NS_readBFCA +/* 802A9AAC 002A69EC 48 00 00 1D */ bl readBFCA__16Z2AudioArcLoaderFPCv /* 802A9AB0 002A69F0 38 C0 00 01 */ li r6, 1 lbl_802A9AB4: /* 802A9AB4 002A69F4 7C C3 33 78 */ mr r3, r6 diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s index 3e191feef9..be76b6ff6a 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s @@ -12,7 +12,7 @@ /* 802CD274 002CA1B4 38 7F 04 C4 */ addi r3, r31, 0x4c4 /* 802CD278 002CA1B8 4B FE 8C A5 */ bl __ct__11Z2StatusMgrFv /* 802CD27C 002CA1BC 38 7F 04 F4 */ addi r3, r31, 0x4f4 -/* 802CD280 002CA1C0 4B FF 26 A1 */ bl Z2SoundObjMgr_NS_ctor +/* 802CD280 002CA1C0 4B FF 26 A1 */ bl __ct__13Z2SoundObjMgrFv /* 802CD284 002CA1C4 3C 60 80 3D */ lis r3, lbl_803CBF38@ha /* 802CD288 002CA1C8 38 03 BF 38 */ addi r0, r3, lbl_803CBF38@l /* 802CD28C 002CA1CC 90 1F 05 14 */ stw r0, 0x514(r31) @@ -20,7 +20,7 @@ /* 802CD294 002CA1D4 4B FC FE 21 */ bl JASAudioReseter /* 802CD298 002CA1D8 38 7F 05 2C */ addi r3, r31, 0x52c /* 802CD29C 002CA1DC 38 80 00 01 */ li r4, 1 -/* 802CD2A0 002CA1E0 4B FD D8 F5 */ bl Z2SoundStarter_NS_ctor +/* 802CD2A0 002CA1E0 4B FD D8 F5 */ bl __ct__14Z2SoundStarterFb /* 802CD2A4 002CA1E4 38 7F 05 30 */ addi r3, r31, 0x530 /* 802CD2A8 002CA1E8 4B FD CB D9 */ bl Z2SoundMgr_NS_ctor /* 802CD2AC 002CA1EC 3B DF 0D 40 */ addi r30, r31, 0xd40 @@ -50,7 +50,7 @@ lbl_802CD2E8: /* 802CD308 002CA248 38 7F 0D 4C */ addi r3, r31, 0xd4c /* 802CD30C 002CA24C 4B FE FE 25 */ bl Z2Audience /* 802CD310 002CA250 38 7F 0F 2C */ addi r3, r31, 0xf2c -/* 802CD314 002CA254 4B FF E9 4D */ bl Z2SpeechMgr2_NS_ctor +/* 802CD314 002CA254 4B FF E9 4D */ bl __ct__12Z2SpeechMgr2Fv /* 802CD318 002CA258 38 7F 13 70 */ addi r3, r31, 0x1370 /* 802CD31C 002CA25C 4B FE D4 C1 */ bl Z2FxLineMgr /* 802CD320 002CA260 93 ED 8D E8 */ stw r31, lbl_80451368-_SDA_BASE_(r13) diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s index e6dd6f871b..9e014d5d3c 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s @@ -253,7 +253,7 @@ lbl_802CD6A8: /* 802CD708 002CA648 4B FD 89 A5 */ bl JAUSectionHeap_NS_newDynamicSeqBlock /* 802CD70C 002CA64C 38 61 00 08 */ addi r3, r1, 8 /* 802CD710 002CA650 7F 24 CB 78 */ mr r4, r25 -/* 802CD714 002CA654 4B FD C3 21 */ bl Z2AudioArcLoader +/* 802CD714 002CA654 4B FD C3 21 */ bl __ct__16Z2AudioArcLoaderFP10JAUSection /* 802CD718 002CA658 38 61 00 08 */ addi r3, r1, 8 /* 802CD71C 002CA65C 7F 44 D3 78 */ mr r4, r26 /* 802CD720 002CA660 4B FD 70 6D */ bl JAUAudioArcLoader_NS_load diff --git a/include/Z2AudioLib/Z2Creature/Z2Creature.h b/include/Z2AudioLib/Z2Creature/Z2Creature.h new file mode 100644 index 0000000000..d4ebd0e597 --- /dev/null +++ b/include/Z2AudioLib/Z2Creature/Z2Creature.h @@ -0,0 +1,22 @@ +#ifndef Z2CREATURE_H_ +#define Z2CREATURE_H_ + +class Z2Creature { +public: + Z2Creature(); + + virtual void deleteObject(); + virtual void setSoundStarter(); + virtual void framework(); + virtual void startCreatureSound(); + virtual void startCreatureSoundLevel(); + virtual void startCreatureVoice(); + virtual void startCreatureVoiceLevel(); + virtual void startCreatureExtraSound(); + virtual void startCreatureExtraSoundLevel(); + virtual void startCollisionSE(); +}; + +class Z2CreatureEnemy : public Z2Creature {}; + +#endif // Z2CREATURE_H_
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0420.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0420.s index d5b1103ff6..db9cde8f82 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0420.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0420.s @@ -20,7 +20,7 @@ /* 802C046C 002BD3AC 90 1E 00 80 */ stw r0, 0x80(r30) /* 802C0470 002BD3B0 38 7E 00 70 */ addi r3, r30, 0x70 /* 802C0474 002BD3B4 38 80 00 00 */ li r4, 0 -/* 802C0478 002BD3B8 4B FF DA D1 */ bl Z2SoundObjBase_NS_dtor +/* 802C0478 002BD3B8 4B FF DA D1 */ bl __dt__14Z2SoundObjBaseFv lbl_802C047C: /* 802C047C 002BD3BC 34 1E 00 50 */ addic. r0, r30, 0x50 /* 802C0480 002BD3C0 41 82 00 1C */ beq lbl_802C049C @@ -29,7 +29,7 @@ lbl_802C047C: /* 802C048C 002BD3CC 90 1E 00 60 */ stw r0, 0x60(r30) /* 802C0490 002BD3D0 38 7E 00 50 */ addi r3, r30, 0x50 /* 802C0494 002BD3D4 38 80 00 00 */ li r4, 0 -/* 802C0498 002BD3D8 4B FF DA B1 */ bl Z2SoundObjBase_NS_dtor +/* 802C0498 002BD3D8 4B FF DA B1 */ bl __dt__14Z2SoundObjBaseFv lbl_802C049C: /* 802C049C 002BD3DC 34 1E 00 08 */ addic. r0, r30, 8 /* 802C04A0 002BD3E0 41 82 00 1C */ beq lbl_802C04BC @@ -38,7 +38,7 @@ lbl_802C049C: /* 802C04AC 002BD3EC 90 1E 00 18 */ stw r0, 0x18(r30) /* 802C04B0 002BD3F0 38 7E 00 08 */ addi r3, r30, 8 /* 802C04B4 002BD3F4 38 80 00 00 */ li r4, 0 -/* 802C04B8 002BD3F8 4B FF DA 91 */ bl Z2SoundObjBase_NS_dtor +/* 802C04B8 002BD3F8 4B FF DA 91 */ bl __dt__14Z2SoundObjBaseFv lbl_802C04BC: /* 802C04BC 002BD3FC 7F E0 07 35 */ extsh. r0, r31 /* 802C04C0 002BD400 40 81 00 0C */ ble lbl_802C04CC diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C04E8.s b/include/Z2AudioLib/Z2Creature/asm/func_802C04E8.s index 766c5c9611..518480ddbf 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C04E8.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C04E8.s @@ -6,11 +6,11 @@ /* 802C04FC 002BD43C 38 00 00 00 */ li r0, 0 /* 802C0500 002BD440 90 03 00 28 */ stw r0, 0x28(r3) /* 802C0504 002BD444 38 7F 00 08 */ addi r3, r31, 8 -/* 802C0508 002BD448 4B FF DA F1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C0508 002BD448 4B FF DA F1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C050C 002BD44C 38 7F 00 50 */ addi r3, r31, 0x50 -/* 802C0510 002BD450 4B FF DA E9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C0510 002BD450 4B FF DA E9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C0514 002BD454 38 7F 00 70 */ addi r3, r31, 0x70 -/* 802C0518 002BD458 4B FF DA E1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C0518 002BD458 4B FF DA E1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C051C 002BD45C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C0520 002BD460 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C0524 002BD464 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0C10.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0C10.s index aa2fecc605..ac44578064 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0C10.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0C10.s @@ -3,7 +3,7 @@ /* 802C0C18 002BDB58 90 01 00 14 */ stw r0, 0x14(r1) /* 802C0C1C 002BDB5C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C0C20 002BDB60 7C 7F 1B 78 */ mr r31, r3 -/* 802C0C24 002BDB64 4B FF F7 A5 */ bl Z2Creature +/* 802C0C24 002BDB64 4B FF F7 A5 */ bl __ct__10Z2CreatureFv /* 802C0C28 002BDB68 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C0C2C 002BDB6C 7F E4 FB 78 */ mr r4, r31 /* 802C0C30 002BDB70 48 01 B1 CD */ bl __ct__10JSUPtrLinkFPv diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0F64.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0F64.s index 9c3ae5a03c..b386d926f3 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0F64.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0F64.s @@ -3,7 +3,7 @@ /* 802C0F6C 002BDEAC 90 01 00 14 */ stw r0, 0x14(r1) /* 802C0F70 002BDEB0 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C0F74 002BDEB4 7C 7F 1B 78 */ mr r31, r3 -/* 802C0F78 002BDEB8 4B FF F4 51 */ bl Z2Creature +/* 802C0F78 002BDEB8 4B FF F4 51 */ bl __ct__10Z2CreatureFv /* 802C0F7C 002BDEBC 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C0F80 002BDEC0 7F E4 FB 78 */ mr r4, r31 /* 802C0F84 002BDEC4 48 01 AE 79 */ bl __ct__10JSUPtrLinkFPv diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0FC4.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0FC4.s index 9276da0812..cca3340287 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0FC4.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0FC4.s @@ -43,11 +43,11 @@ lbl_802C1060: /* 802C1060 002BDFA0 38 00 00 00 */ li r0, 0 /* 802C1064 002BDFA4 90 1F 00 28 */ stw r0, 0x28(r31) /* 802C1068 002BDFA8 38 7F 00 08 */ addi r3, r31, 8 -/* 802C106C 002BDFAC 4B FF CF 8D */ bl Z2SoundObjBase_NS_deleteObject +/* 802C106C 002BDFAC 4B FF CF 8D */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1070 002BDFB0 38 7F 00 50 */ addi r3, r31, 0x50 -/* 802C1074 002BDFB4 4B FF CF 85 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C1074 002BDFB4 4B FF CF 85 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1078 002BDFB8 38 7F 00 70 */ addi r3, r31, 0x70 -/* 802C107C 002BDFBC 4B FF CF 7D */ bl Z2SoundObjBase_NS_deleteObject +/* 802C107C 002BDFBC 4B FF CF 7D */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1080 002BDFC0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C1084 002BDFC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C1088 002BDFC8 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1BE8.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1BE8.s index df86dd9691..67a5de8533 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1BE8.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1BE8.s @@ -3,7 +3,7 @@ /* 802C1BF0 002BEB30 90 01 00 14 */ stw r0, 0x14(r1) /* 802C1BF4 002BEB34 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C1BF8 002BEB38 7C 7F 1B 78 */ mr r31, r3 -/* 802C1BFC 002BEB3C 4B FF E7 CD */ bl Z2Creature +/* 802C1BFC 002BEB3C 4B FF E7 CD */ bl __ct__10Z2CreatureFv /* 802C1C00 002BEB40 3C 60 80 3D */ lis r3, lbl_803CB830@ha /* 802C1C04 002BEB44 38 03 B8 30 */ addi r0, r3, lbl_803CB830@l /* 802C1C08 002BEB48 90 1F 00 00 */ stw r0, 0(r31) diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1D10.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1D10.s index 8fb97435a9..35ad5cfb2b 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1D10.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1D10.s @@ -3,7 +3,7 @@ /* 802C1D18 002BEC58 90 01 00 14 */ stw r0, 0x14(r1) /* 802C1D1C 002BEC5C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C1D20 002BEC60 7C 7F 1B 78 */ mr r31, r3 -/* 802C1D24 002BEC64 4B FF C1 CD */ bl Z2SoundObjBase_NS_ctor +/* 802C1D24 002BEC64 4B FF C1 CD */ bl __ct__14Z2SoundObjBaseFv /* 802C1D28 002BEC68 3C 60 80 3D */ lis r3, lbl_803CB810@ha /* 802C1D2C 002BEC6C 38 03 B8 10 */ addi r0, r3, lbl_803CB810@l /* 802C1D30 002BEC70 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1D4C.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1D4C.s index b351927c40..f0ee9adb1d 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1D4C.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1D4C.s @@ -1,7 +1,7 @@ /* 802C1D4C 002BEC8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C1D50 002BEC90 7C 08 02 A6 */ mflr r0 /* 802C1D54 002BEC94 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1D58 002BEC98 4B FF C2 59 */ bl Z2SoundObjBase_NS_init +/* 802C1D58 002BEC98 4B FF C2 59 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802C1D5C 002BEC9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C1D60 002BECA0 7C 08 03 A6 */ mtlr r0 /* 802C1D64 002BECA4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s index 6d915c1860..efb40157fa 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s @@ -5,13 +5,13 @@ /* 802C1FC0 002BEF00 7C 7F 1B 78 */ mr r31, r3 /* 802C1FC4 002BEF04 4B FF F0 01 */ bl Z2CreatureEnemy_NS_deleteObject /* 802C1FC8 002BEF08 38 7F 00 A4 */ addi r3, r31, 0xa4 -/* 802C1FCC 002BEF0C 4B FF C0 2D */ bl Z2SoundObjBase_NS_deleteObject +/* 802C1FCC 002BEF0C 4B FF C0 2D */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1FD0 002BEF10 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 802C1FD4 002BEF14 4B FF C0 25 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C1FD4 002BEF14 4B FF C0 25 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1FD8 002BEF18 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 802C1FDC 002BEF1C 4B FF C0 1D */ bl Z2SoundObjBase_NS_deleteObject +/* 802C1FDC 002BEF1C 4B FF C0 1D */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1FE0 002BEF20 38 7F 01 04 */ addi r3, r31, 0x104 -/* 802C1FE4 002BEF24 4B FF C0 15 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C1FE4 002BEF24 4B FF C0 15 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1FE8 002BEF28 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C1FEC 002BEF2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C1FF0 002BEF30 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C24D0.s b/include/Z2AudioLib/Z2Creature/asm/func_802C24D0.s index a1f6145b7a..eb1c978c11 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C24D0.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C24D0.s @@ -11,7 +11,7 @@ /* 802C24F8 002BF438 90 01 00 10 */ stw r0, 0x10(r1) /* 802C24FC 002BF43C 38 7D 00 50 */ addi r3, r29, 0x50 /* 802C2500 002BF440 38 81 00 10 */ addi r4, r1, 0x10 -/* 802C2504 002BF444 4B FE 8D 51 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C2504 002BF444 4B FE 8D 51 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C2508 002BF448 28 03 00 00 */ cmplwi r3, 0 /* 802C250C 002BF44C 40 82 00 24 */ bne lbl_802C2530 /* 802C2510 002BF450 3C 60 00 07 */ lis r3, 0x000701F7@ha @@ -19,7 +19,7 @@ /* 802C2518 002BF458 90 01 00 0C */ stw r0, 0xc(r1) /* 802C251C 002BF45C 38 7D 00 50 */ addi r3, r29, 0x50 /* 802C2520 002BF460 38 81 00 0C */ addi r4, r1, 0xc -/* 802C2524 002BF464 4B FE 8D 31 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C2524 002BF464 4B FE 8D 31 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C2528 002BF468 28 03 00 00 */ cmplwi r3, 0 /* 802C252C 002BF46C 41 82 00 0C */ beq lbl_802C2538 lbl_802C2530: diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s b/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s index 219278d99a..a5672d238d 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s @@ -5,27 +5,27 @@ /* 802C25FC 002BF53C 7C 7F 1B 78 */ mr r31, r3 /* 802C2600 002BF540 4B FF E9 C5 */ bl Z2CreatureEnemy_NS_deleteObject /* 802C2604 002BF544 38 7F 00 A4 */ addi r3, r31, 0xa4 -/* 802C2608 002BF548 4B FF B9 F1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2608 002BF548 4B FF B9 F1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C260C 002BF54C 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 802C2610 002BF550 4B FF B9 E9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2610 002BF550 4B FF B9 E9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C2614 002BF554 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 802C2618 002BF558 4B FF B9 E1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2618 002BF558 4B FF B9 E1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C261C 002BF55C 38 7F 01 04 */ addi r3, r31, 0x104 -/* 802C2620 002BF560 4B FF B9 D9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2620 002BF560 4B FF B9 D9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C2624 002BF564 38 7F 01 24 */ addi r3, r31, 0x124 -/* 802C2628 002BF568 4B FF B9 D1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2628 002BF568 4B FF B9 D1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C262C 002BF56C 38 7F 01 44 */ addi r3, r31, 0x144 -/* 802C2630 002BF570 4B FF B9 C9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2630 002BF570 4B FF B9 C9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C2634 002BF574 38 7F 01 64 */ addi r3, r31, 0x164 -/* 802C2638 002BF578 4B FF B9 C1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2638 002BF578 4B FF B9 C1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C263C 002BF57C 38 7F 01 84 */ addi r3, r31, 0x184 -/* 802C2640 002BF580 4B FF B9 B9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2640 002BF580 4B FF B9 B9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C2644 002BF584 38 7F 01 A4 */ addi r3, r31, 0x1a4 -/* 802C2648 002BF588 4B FF B9 B1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2648 002BF588 4B FF B9 B1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C264C 002BF58C 38 7F 01 C4 */ addi r3, r31, 0x1c4 -/* 802C2650 002BF590 4B FF B9 A9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2650 002BF590 4B FF B9 A9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C2654 002BF594 38 7F 01 E4 */ addi r3, r31, 0x1e4 -/* 802C2658 002BF598 4B FF B9 A1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2658 002BF598 4B FF B9 A1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C265C 002BF59C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C2660 002BF5A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C2664 002BF5A4 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C58AC.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C58AC.s index 6aacd0ad8d..e5632277a6 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C58AC.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C58AC.s @@ -9,7 +9,7 @@ /* 802C58CC 002C280C 34 1E 00 04 */ addic. r0, r30, 4 /* 802C58D0 002C2810 41 82 00 0C */ beq lbl_802C58DC /* 802C58D4 002C2814 38 7E 00 04 */ addi r3, r30, 4 -/* 802C58D8 002C2818 4B FD C8 AD */ bl JAISoundHandle_NS_releaseSound +/* 802C58D8 002C2818 4B FD C8 AD */ bl releaseSound__14JAISoundHandleFv lbl_802C58DC: /* 802C58DC 002C281C 7F E0 07 35 */ extsh. r0, r31 /* 802C58E0 002C2820 40 81 00 0C */ ble lbl_802C58EC diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s index ce4997c8db..5859f1d3f1 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s @@ -396,7 +396,7 @@ lbl_802C76AC: /* 802C76C4 002C4604 7C 04 00 40 */ cmplw r4, r0 /* 802C76C8 002C4608 41 82 00 14 */ beq lbl_802C76DC /* 802C76CC 002C460C 38 80 00 1E */ li r4, 0x1e -/* 802C76D0 002C4610 4B FD AE 0D */ bl JAISound_NS_stop +/* 802C76D0 002C4610 4B FD AE 0D */ bl stop__8JAISoundFUl /* 802C76D4 002C4614 80 7F 00 04 */ lwz r3, 4(r31) /* 802C76D8 002C4618 4B FD AA C9 */ bl JAISound_NS_releaseHandle lbl_802C76DC: @@ -410,7 +410,7 @@ lbl_802C76DC: /* 802C76F8 002C4638 7C 04 00 40 */ cmplw r4, r0 /* 802C76FC 002C463C 41 82 00 14 */ beq lbl_802C7710 /* 802C7700 002C4640 38 80 00 1E */ li r4, 0x1e -/* 802C7704 002C4644 4B FD AD D9 */ bl JAISound_NS_stop +/* 802C7704 002C4644 4B FD AD D9 */ bl stop__8JAISoundFUl /* 802C7708 002C4648 80 7C 00 00 */ lwz r3, 0(r28) /* 802C770C 002C464C 4B FD AA 95 */ bl JAISound_NS_releaseHandle lbl_802C7710: @@ -444,7 +444,7 @@ lbl_802C7710: /* 802C777C 002C46BC 88 DF 01 41 */ lbz r6, 0x141(r31) /* 802C7780 002C46C0 7C C6 07 74 */ extsb r6, r6 /* 802C7784 002C46C4 38 E0 FF FF */ li r7, -1 -/* 802C7788 002C46C8 4B FE 37 55 */ bl Z2SoundStarter_NS_setPortData +/* 802C7788 002C46C8 4B FE 37 55 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802C778C: /* 802C778C 002C46CC 80 1C 00 00 */ lwz r0, 0(r28) /* 802C7790 002C46D0 28 00 00 00 */ cmplwi r0, 0 @@ -455,7 +455,7 @@ lbl_802C778C: /* 802C77A4 002C46E4 88 DF 01 41 */ lbz r6, 0x141(r31) /* 802C77A8 002C46E8 7C C6 07 74 */ extsb r6, r6 /* 802C77AC 002C46EC 38 E0 FF FF */ li r7, -1 -/* 802C77B0 002C46F0 4B FE 37 2D */ bl Z2SoundStarter_NS_setPortData +/* 802C77B0 002C46F0 4B FE 37 2D */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802C77B4: /* 802C77B4 002C46F4 38 60 00 00 */ li r3, 0 /* 802C77B8 002C46F8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s index 93425767be..abfa577292 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s @@ -184,7 +184,7 @@ lbl_802C7AD8: /* 802C7AF0 002C4A30 7C 04 00 40 */ cmplw r4, r0 /* 802C7AF4 002C4A34 41 82 00 14 */ beq lbl_802C7B08 /* 802C7AF8 002C4A38 38 80 00 1E */ li r4, 0x1e -/* 802C7AFC 002C4A3C 4B FD A9 E1 */ bl JAISound_NS_stop +/* 802C7AFC 002C4A3C 4B FD A9 E1 */ bl stop__8JAISoundFUl /* 802C7B00 002C4A40 80 7F 00 84 */ lwz r3, 0x84(r31) /* 802C7B04 002C4A44 4B FD A6 9D */ bl JAISound_NS_releaseHandle lbl_802C7B08: @@ -197,7 +197,7 @@ lbl_802C7B08: /* 802C7B20 002C4A60 7C 04 00 40 */ cmplw r4, r0 /* 802C7B24 002C4A64 41 82 00 14 */ beq lbl_802C7B38 /* 802C7B28 002C4A68 38 80 00 1E */ li r4, 0x1e -/* 802C7B2C 002C4A6C 4B FD A9 B1 */ bl JAISound_NS_stop +/* 802C7B2C 002C4A6C 4B FD A9 B1 */ bl stop__8JAISoundFUl /* 802C7B30 002C4A70 80 7F 00 8C */ lwz r3, 0x8c(r31) /* 802C7B34 002C4A74 4B FD A6 6D */ bl JAISound_NS_releaseHandle lbl_802C7B38: @@ -261,7 +261,7 @@ lbl_802C7BB4: /* 802C7C14 002C4B54 7C 04 00 40 */ cmplw r4, r0 /* 802C7C18 002C4B58 41 82 00 14 */ beq lbl_802C7C2C /* 802C7C1C 002C4B5C 38 80 00 1E */ li r4, 0x1e -/* 802C7C20 002C4B60 4B FD A8 BD */ bl JAISound_NS_stop +/* 802C7C20 002C4B60 4B FD A8 BD */ bl stop__8JAISoundFUl /* 802C7C24 002C4B64 80 7F 00 84 */ lwz r3, 0x84(r31) /* 802C7C28 002C4B68 4B FD A5 79 */ bl JAISound_NS_releaseHandle lbl_802C7C2C: diff --git a/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h b/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h index bb5d940e43..71ee62252a 100644 --- a/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h +++ b/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h @@ -1,5 +1,5 @@ #include "JSystem/JAudio2/JAISe/JAISe.h" -#include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h" +#include "JSystem/JAudio2/JAISound/JAISound.h" #include "global.h" struct Z2SoundObjBase {}; diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s index 9baf70da81..e0ee6b708f 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s @@ -3,7 +3,7 @@ /* 802C3344 002C0284 90 01 00 14 */ stw r0, 0x14(r1) /* 802C3348 002C0288 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C334C 002C028C 7C 7F 1B 78 */ mr r31, r3 -/* 802C3350 002C0290 4B FF D0 79 */ bl Z2Creature +/* 802C3350 002C0290 4B FF D0 79 */ bl __ct__10Z2CreatureFv /* 802C3354 002C0294 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C3358 002C0298 48 00 15 91 */ bl Z2LinkSoundStarter_NS_ctor /* 802C335C 002C029C 3C 60 80 3D */ lis r3, lbl_803CB980@ha diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s index 37cb5d143f..721f0535f9 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s @@ -22,7 +22,7 @@ /* 802C3554 002C0494 90 1F 00 A4 */ stw r0, 0xa4(r31) /* 802C3558 002C0498 38 7F 00 94 */ addi r3, r31, 0x94 /* 802C355C 002C049C 38 80 00 00 */ li r4, 0 -/* 802C3560 002C04A0 4B FF A9 E9 */ bl Z2SoundObjBase_NS_dtor +/* 802C3560 002C04A0 4B FF A9 E9 */ bl __dt__14Z2SoundObjBaseFv lbl_802C3564: /* 802C3564 002C04A4 34 1F 00 90 */ addic. r0, r31, 0x90 /* 802C3568 002C04A8 41 82 00 58 */ beq lbl_802C35C0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s index fae5e52714..f94ca8c13f 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s @@ -4,7 +4,7 @@ /* 802C3758 002C0698 38 00 00 00 */ li r0, 0 /* 802C375C 002C069C 98 03 00 C5 */ stb r0, 0xc5(r3) /* 802C3760 002C06A0 38 63 00 94 */ addi r3, r3, 0x94 -/* 802C3764 002C06A4 4B FF A8 95 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C3764 002C06A4 4B FF A8 95 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C3768 002C06A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C376C 002C06AC 7C 08 03 A6 */ mtlr r0 /* 802C3770 002C06B0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s index d8bec59ff0..79b1d1e9fb 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s @@ -26,7 +26,7 @@ /* 802C3B60 002C0AA0 4B FF 72 BD */ bl Z2FxLineMgr_NS_setFxForceOff /* 802C3B64 002C0AA4 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) /* 802C3B68 002C0AA8 38 80 00 20 */ li r4, 0x20 -/* 802C3B6C 002C0AAC 4B FF C4 81 */ bl Z2SoundObjMgr_NS_setGhostEnemyState +/* 802C3B6C 002C0AAC 4B FF C4 81 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc /* 802C3B70 002C0AB0 48 00 00 54 */ b lbl_802C3BC4 lbl_802C3B74: /* 802C3B74 002C0AB4 3C 60 00 02 */ lis r3, 0x00020095@ha @@ -48,7 +48,7 @@ lbl_802C3B74: /* 802C3BB4 002C0AF4 4B FF 72 69 */ bl Z2FxLineMgr_NS_setFxForceOff /* 802C3BB8 002C0AF8 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) /* 802C3BBC 002C0AFC 38 80 00 10 */ li r4, 0x10 -/* 802C3BC0 002C0B00 4B FF C4 2D */ bl Z2SoundObjMgr_NS_setGhostEnemyState +/* 802C3BC0 002C0B00 4B FF C4 2D */ bl setGhostEnemyState__13Z2SoundObjMgrFUc lbl_802C3BC4: /* 802C3BC4 002C0B04 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C3BC8 002C0B08 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s index b7f2bc2e8f..16aa09a6df 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s @@ -53,12 +53,12 @@ lbl_802C3C94: /* 802C3C98 002C0BD8 90 01 00 08 */ stw r0, 8(r1) /* 802C3C9C 002C0BDC 38 7E 00 08 */ addi r3, r30, 8 /* 802C3CA0 002C0BE0 38 81 00 08 */ addi r4, r1, 8 -/* 802C3CA4 002C0BE4 4B FE 75 B1 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C3CA4 002C0BE4 4B FE 75 B1 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C3CA8 002C0BE8 28 03 00 00 */ cmplwi r3, 0 /* 802C3CAC 002C0BEC 41 82 01 90 */ beq lbl_802C3E3C /* 802C3CB0 002C0BF0 80 63 00 00 */ lwz r3, 0(r3) /* 802C3CB4 002C0BF4 38 80 00 00 */ li r4, 0 -/* 802C3CB8 002C0BF8 4B FD E8 25 */ bl JAISound_NS_stop +/* 802C3CB8 002C0BF8 4B FD E8 25 */ bl stop__8JAISoundFUl /* 802C3CBC 002C0BFC 48 00 01 80 */ b lbl_802C3E3C lbl_802C3CC0: /* 802C3CC0 002C0C00 28 1F 00 00 */ cmplwi r31, 0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s index 6d3d8b2cf0..b9bcdb7c49 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s @@ -53,7 +53,7 @@ lbl_802C43D4: /* 802C43D8 002C1318 90 01 00 2C */ stw r0, 0x2c(r1) /* 802C43DC 002C131C 38 7D 00 50 */ addi r3, r29, 0x50 /* 802C43E0 002C1320 38 81 00 2C */ addi r4, r1, 0x2c -/* 802C43E4 002C1324 4B FE 6E 71 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C43E4 002C1324 4B FE 6E 71 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C43E8 002C1328 28 03 00 00 */ cmplwi r3, 0 /* 802C43EC 002C132C 41 82 01 88 */ beq lbl_802C4574 /* 802C43F0 002C1330 38 60 00 00 */ li r3, 0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s index 24681e549a..5efd587f87 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s @@ -67,7 +67,7 @@ lbl_802C4650: /* 802C469C 002C15DC 38 A0 00 08 */ li r5, 8 /* 802C46A0 002C15E0 57 E6 06 3E */ clrlwi r6, r31, 0x18 /* 802C46A4 002C15E4 38 E0 FF FF */ li r7, -1 -/* 802C46A8 002C15E8 4B FE 68 35 */ bl Z2SoundStarter_NS_setPortData +/* 802C46A8 002C15E8 4B FE 68 35 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802C46AC: /* 802C46AC 002C15EC 7F C3 F3 78 */ mr r3, r30 /* 802C46B0 002C15F0 48 00 00 20 */ b lbl_802C46D0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s index 76f7ad6726..aa3aae8382 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s @@ -4,7 +4,7 @@ /* 802C48F4 002C1834 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C48F8 002C1838 7C 7F 1B 78 */ mr r31, r3 /* 802C48FC 002C183C 38 80 00 00 */ li r4, 0 -/* 802C4900 002C1840 4B FE 62 95 */ bl Z2SoundStarter_NS_ctor +/* 802C4900 002C1840 4B FE 62 95 */ bl __ct__14Z2SoundStarterFb /* 802C4904 002C1844 3C 60 80 3D */ lis r3, lbl_803CB96C@ha /* 802C4908 002C1848 38 03 B9 6C */ addi r0, r3, lbl_803CB96C@l /* 802C490C 002C184C 90 1F 00 00 */ stw r0, 0(r31) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s index 3a3e512193..90c707c391 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s @@ -178,13 +178,13 @@ lbl_802C4B9C: lbl_802C4BAC: /* 802C4BAC 002C1AEC 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4BB0 002C1AF0 38 63 00 50 */ addi r3, r3, 0x50 -/* 802C4BB4 002C1AF4 4B FE 69 51 */ bl Z2SoundHandles_NS_isActive +/* 802C4BB4 002C1AF4 4B FE 69 51 */ bl isActive__14Z2SoundHandlesCFv /* 802C4BB8 002C1AF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C4BBC 002C1AFC 41 82 01 48 */ beq lbl_802C4D04 /* 802C4BC0 002C1B00 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4BC4 002C1B04 38 63 00 50 */ addi r3, r3, 0x50 /* 802C4BC8 002C1B08 38 80 00 01 */ li r4, 1 -/* 802C4BCC 002C1B0C 4B FE 68 D5 */ bl Z2SoundHandles_NS_stopAllSounds +/* 802C4BCC 002C1B0C 4B FE 68 D5 */ bl stopAllSounds__14Z2SoundHandlesFUl /* 802C4BD0 002C1B10 48 00 01 34 */ b lbl_802C4D04 lbl_802C4BD4: /* 802C4BD4 002C1B14 3B E0 00 01 */ li r31, 1 @@ -225,7 +225,7 @@ lbl_802C4C44: /* 802C4C50 002C1B90 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4C54 002C1B94 38 63 00 50 */ addi r3, r3, 0x50 /* 802C4C58 002C1B98 38 81 00 30 */ addi r4, r1, 0x30 -/* 802C4C5C 002C1B9C 4B FE 65 F9 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C4C5C 002C1B9C 4B FE 65 F9 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C4C60 002C1BA0 28 03 00 00 */ cmplwi r3, 0 /* 802C4C64 002C1BA4 41 82 00 A0 */ beq lbl_802C4D04 /* 802C4C68 002C1BA8 3C 60 00 01 */ lis r3, 0x0001000B@ha @@ -246,7 +246,7 @@ lbl_802C4C90: /* 802C4C9C 002C1BDC 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4CA0 002C1BE0 38 63 00 50 */ addi r3, r3, 0x50 /* 802C4CA4 002C1BE4 38 81 00 28 */ addi r4, r1, 0x28 -/* 802C4CA8 002C1BE8 4B FE 65 AD */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C4CA8 002C1BE8 4B FE 65 AD */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C4CAC 002C1BEC 28 03 00 00 */ cmplwi r3, 0 /* 802C4CB0 002C1BF0 41 82 00 54 */ beq lbl_802C4D04 /* 802C4CB4 002C1BF4 3C 60 00 01 */ lis r3, 0x0001000D@ha @@ -264,12 +264,12 @@ lbl_802C4CD4: /* 802C4CE0 002C1C20 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4CE4 002C1C24 38 63 00 08 */ addi r3, r3, 8 /* 802C4CE8 002C1C28 38 81 00 08 */ addi r4, r1, 8 -/* 802C4CEC 002C1C2C 4B FE 65 69 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C4CEC 002C1C2C 4B FE 65 69 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C4CF0 002C1C30 28 03 00 00 */ cmplwi r3, 0 /* 802C4CF4 002C1C34 41 82 00 10 */ beq lbl_802C4D04 /* 802C4CF8 002C1C38 80 63 00 00 */ lwz r3, 0(r3) /* 802C4CFC 002C1C3C 38 80 00 00 */ li r4, 0 -/* 802C4D00 002C1C40 4B FD D7 DD */ bl JAISound_NS_stop +/* 802C4D00 002C1C40 4B FD D7 DD */ bl stop__8JAISoundFUl lbl_802C4D04: /* 802C4D04 002C1C44 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4D08 002C1C48 88 A3 00 CA */ lbz r5, 0xca(r3) @@ -341,7 +341,7 @@ lbl_802C4DD8: /* 802C4E00 002C1D40 FC 80 E8 90 */ fmr f4, f29 /* 802C4E04 002C1D44 FC A0 F0 90 */ fmr f5, f30 /* 802C4E08 002C1D48 7F A8 EB 78 */ mr r8, r29 -/* 802C4E0C 002C1D4C 4B FE 5E 31 */ bl Z2SoundStarter_NS_startSound_X1_ +/* 802C4E0C 002C1D4C 4B FE 5E 31 */ bl startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl /* 802C4E10 002C1D50 7C 7D 1B 78 */ mr r29, r3 /* 802C4E14 002C1D54 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802C4E18 002C1D58 41 82 01 24 */ beq lbl_802C4F3C diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s index 961a5f11a5..3965711c5a 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s @@ -3,7 +3,7 @@ /* 802C5004 002C1F44 90 01 00 14 */ stw r0, 0x14(r1) /* 802C5008 002C1F48 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C500C 002C1F4C 7C 7F 1B 78 */ mr r31, r3 -/* 802C5010 002C1F50 4B FF B3 B9 */ bl Z2Creature +/* 802C5010 002C1F50 4B FF B3 B9 */ bl __ct__10Z2CreatureFv /* 802C5014 002C1F54 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C5018 002C1F58 7F E4 FB 78 */ mr r4, r31 /* 802C501C 002C1F5C 48 00 02 19 */ bl Z2RideSoundStarter diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s index 4664355482..4574995006 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s @@ -6,7 +6,7 @@ /* 802C5248 002C2188 7C 7E 1B 78 */ mr r30, r3 /* 802C524C 002C218C 7C 9F 23 78 */ mr r31, r4 /* 802C5250 002C2190 38 80 00 00 */ li r4, 0 -/* 802C5254 002C2194 4B FE 59 41 */ bl Z2SoundStarter_NS_ctor +/* 802C5254 002C2194 4B FE 59 41 */ bl __ct__14Z2SoundStarterFb /* 802C5258 002C2198 3C 60 80 3D */ lis r3, lbl_803CB910@ha /* 802C525C 002C219C 38 03 B9 10 */ addi r0, r3, lbl_803CB910@l /* 802C5260 002C21A0 90 1E 00 00 */ stw r0, 0(r30) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s index 2b21234572..d2076fda3e 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s @@ -42,7 +42,7 @@ lbl_802C5310: /* 802C5314 002C2254 7F A3 EB 78 */ mr r3, r29 /* 802C5318 002C2258 38 81 00 18 */ addi r4, r1, 0x18 /* 802C531C 002C225C FC 20 F8 90 */ fmr f1, f31 -/* 802C5320 002C2260 4B FE 59 1D */ bl Z2SoundStarter_NS_startSound_X1_ +/* 802C5320 002C2260 4B FE 59 1D */ bl startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl /* 802C5324 002C2264 7C 7E 1B 78 */ mr r30, r3 /* 802C5328 002C2268 80 7D 00 04 */ lwz r3, 4(r29) /* 802C532C 002C226C 88 03 00 98 */ lbz r0, 0x98(r3) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s index d7567b9955..272616ed6e 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s @@ -3,7 +3,7 @@ /* 802C54C0 002C2400 90 01 00 14 */ stw r0, 0x14(r1) /* 802C54C4 002C2404 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C54C8 002C2408 7C 7F 1B 78 */ mr r31, r3 -/* 802C54CC 002C240C 4B FF 8A 25 */ bl Z2SoundObjBase_NS_ctor +/* 802C54CC 002C240C 4B FF 8A 25 */ bl __ct__14Z2SoundObjBaseFv /* 802C54D0 002C2410 3C 60 80 3D */ lis r3, lbl_803CB8F0@ha /* 802C54D4 002C2414 38 03 B8 F0 */ addi r0, r3, lbl_803CB8F0@l /* 802C54D8 002C2418 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s index 2b9c6de3a7..a4f0584e9c 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s @@ -1,7 +1,7 @@ /* 802C54FC 002C243C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C5500 002C2440 7C 08 02 A6 */ mflr r0 /* 802C5504 002C2444 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C5508 002C2448 4B FF 8A A9 */ bl Z2SoundObjBase_NS_init +/* 802C5508 002C2448 4B FF 8A A9 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802C550C 002C244C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C5510 002C2450 7C 08 03 A6 */ mtlr r0 /* 802C5514 002C2454 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B68B0.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B68B0.s deleted file mode 100644 index 868d91ea82..0000000000 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B68B0.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 802B68B0 002B37F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802B68B4 002B37F4 7C 08 02 A6 */ mflr r0 -/* 802B68B8 002B37F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802B68BC 002B37FC 98 83 00 1E */ stb r4, 0x1e(r3) -/* 802B68C0 002B3800 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802B68C4 002B3804 40 82 00 0C */ bne lbl_802B68D0 -/* 802B68C8 002B3808 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) -/* 802B68CC 002B380C 4B FF 3B 65 */ bl resetFilterAll__10Z2SoundMgrFv -lbl_802B68D0: -/* 802B68D0 002B3810 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802B68D4 002B3814 7C 08 03 A6 */ mtlr r0 -/* 802B68D8 002B3818 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B68DC 002B381C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s index 0b916e6722..f9dc9297e0 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s @@ -38,7 +38,7 @@ /* 802B6B8C 002B3ACC 48 00 2F 39 */ bl Z2SeMgr_NS_resetCrowdSize /* 802B6B90 002B3AD0 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) /* 802B6B94 002B3AD4 38 80 00 00 */ li r4, 0 -/* 802B6B98 002B3AD8 48 00 94 55 */ bl Z2SoundObjMgr_NS_setGhostEnemyState +/* 802B6B98 002B3AD8 48 00 94 55 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc /* 802B6B9C 002B3ADC 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13) /* 802B6BA0 002B3AE0 4B FF 4C 6D */ bl resetModY__7Z2SeMgrFv /* 802B6BA4 002B3AE4 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13) @@ -1145,7 +1145,7 @@ lbl_802B7B58: /* 802B7BA0 002B4AE0 38 A0 02 BC */ li r5, 0x2bc /* 802B7BA4 002B4AE4 38 C0 04 4C */ li r6, 0x44c /* 802B7BA8 002B4AE8 38 E0 05 DC */ li r7, 0x5dc -/* 802B7BAC 002B4AEC 48 00 7D D5 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B7BAC 002B4AEC 48 00 7D D5 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B7BB0 002B4AF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802B7BB4 002B4AF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802B7BB8 002B4AF8 38 80 00 2E */ li r4, 0x2e @@ -1262,7 +1262,7 @@ lbl_802B7D08: /* 802B7D54 002B4C94 3C E0 00 01 */ lis r7, 0x00009C40@ha /* 802B7D58 002B4C98 38 C7 9C 40 */ addi r6, r7, 0x00009C40@l /* 802B7D5C 002B4C9C 38 E7 C3 50 */ addi r7, r7, -15536 -/* 802B7D60 002B4CA0 48 00 7C 21 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B7D60 002B4CA0 48 00 7C 21 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B7D64 002B4CA4 48 00 19 54 */ b lbl_802B96B8 lbl_802B7D68: /* 802B7D68 002B4CA8 38 60 00 0F */ li r3, 0xf @@ -1775,7 +1775,7 @@ lbl_802B8468: /* 802B849C 002B53DC 38 A0 03 E8 */ li r5, 0x3e8 /* 802B84A0 002B53E0 38 C0 07 D0 */ li r6, 0x7d0 /* 802B84A4 002B53E4 38 E0 23 28 */ li r7, 0x2328 -/* 802B84A8 002B53E8 48 00 74 D9 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B84A8 002B53E8 48 00 74 D9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B84AC 002B53EC 3B E0 00 3D */ li r31, 0x3d /* 802B84B0 002B53F0 3B 20 00 1C */ li r25, 0x1c lbl_802B84B4: @@ -1855,7 +1855,7 @@ lbl_802B8578: /* 802B85B4 002B54F4 38 A0 02 BC */ li r5, 0x2bc /* 802B85B8 002B54F8 38 C0 04 4C */ li r6, 0x44c /* 802B85BC 002B54FC 38 E0 05 DC */ li r7, 0x5dc -/* 802B85C0 002B5500 48 00 73 C1 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B85C0 002B5500 48 00 73 C1 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B85C4 002B5504 48 00 10 F4 */ b lbl_802B96B8 lbl_802B85C8: /* 802B85C8 002B5508 88 1B 00 1E */ lbz r0, 0x1e(r27) @@ -2022,7 +2022,7 @@ lbl_802B87E8: /* 802B8810 002B5750 38 A0 02 BC */ li r5, 0x2bc /* 802B8814 002B5754 38 C0 04 4C */ li r6, 0x44c /* 802B8818 002B5758 38 E0 05 DC */ li r7, 0x5dc -/* 802B881C 002B575C 48 00 71 65 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B881C 002B575C 48 00 71 65 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8820 002B5760 48 00 0E 98 */ b lbl_802B96B8 /* 802B8824 002B5764 3B A0 00 4A */ li r29, 0x4a /* 802B8828 002B5768 2C 13 00 0B */ cmpwi r19, 0xb @@ -2057,7 +2057,7 @@ lbl_802B887C: /* 802B888C 002B57CC 38 A0 02 BC */ li r5, 0x2bc /* 802B8890 002B57D0 38 C0 04 4C */ li r6, 0x44c /* 802B8894 002B57D4 38 E0 05 DC */ li r7, 0x5dc -/* 802B8898 002B57D8 48 00 70 E9 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8898 002B57D8 48 00 70 E9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B889C 002B57DC 48 00 0E 1C */ b lbl_802B96B8 /* 802B88A0 002B57E0 3B A0 00 4A */ li r29, 0x4a /* 802B88A4 002B57E4 48 00 10 F9 */ bl dComIfGs_getStartPoint @@ -2112,7 +2112,7 @@ lbl_802B8938: /* 802B894C 002B588C 38 A0 02 BC */ li r5, 0x2bc /* 802B8950 002B5890 38 C0 04 4C */ li r6, 0x44c /* 802B8954 002B5894 38 E0 05 DC */ li r7, 0x5dc -/* 802B8958 002B5898 48 00 70 29 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8958 002B5898 48 00 70 29 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B895C 002B589C 48 00 0D 5C */ b lbl_802B96B8 /* 802B8960 002B58A0 38 61 00 C8 */ addi r3, r1, 0xc8 /* 802B8964 002B58A4 3C 80 01 00 */ lis r4, 0x01000009@ha @@ -2147,7 +2147,7 @@ lbl_802B8938: /* 802B89D8 002B5918 38 A0 02 BC */ li r5, 0x2bc /* 802B89DC 002B591C 38 C0 04 4C */ li r6, 0x44c /* 802B89E0 002B5920 38 E0 05 DC */ li r7, 0x5dc -/* 802B89E4 002B5924 48 00 6F 9D */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B89E4 002B5924 48 00 6F 9D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B89E8 002B5928 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B89EC 002B592C 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13) /* 802B89F0 002B5930 48 00 0F BD */ bl Z2SeqMgr_NS_unMuteSceneBgm @@ -2192,7 +2192,7 @@ lbl_802B8A6C: /* 802B8A84 002B59C4 38 A0 02 BC */ li r5, 0x2bc /* 802B8A88 002B59C8 38 C0 04 4C */ li r6, 0x44c /* 802B8A8C 002B59CC 38 E0 05 DC */ li r7, 0x5dc -/* 802B8A90 002B59D0 48 00 6E F1 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8A90 002B59D0 48 00 6E F1 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs lbl_802B8A94: /* 802B8A94 002B59D4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B8A98 002B59D8 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13) @@ -2231,7 +2231,7 @@ lbl_802B8A94: /* 802B8B1C 002B5A5C 38 A0 02 BC */ li r5, 0x2bc /* 802B8B20 002B5A60 38 C0 04 4C */ li r6, 0x44c /* 802B8B24 002B5A64 38 E0 05 DC */ li r7, 0x5dc -/* 802B8B28 002B5A68 48 00 6E 59 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8B28 002B5A68 48 00 6E 59 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8B2C 002B5A6C 48 00 0B 8C */ b lbl_802B96B8 /* 802B8B30 002B5A70 3B A0 00 05 */ li r29, 5 /* 802B8B34 002B5A74 38 60 00 03 */ li r3, 3 @@ -2273,7 +2273,7 @@ lbl_802B8BA4: /* 802B8BBC 002B5AFC 38 A0 02 BC */ li r5, 0x2bc /* 802B8BC0 002B5B00 38 C0 04 4C */ li r6, 0x44c /* 802B8BC4 002B5B04 38 E0 05 DC */ li r7, 0x5dc -/* 802B8BC8 002B5B08 48 00 6D B9 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8BC8 002B5B08 48 00 6D B9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8BCC 002B5B0C 48 00 0A EC */ b lbl_802B96B8 /* 802B8BD0 002B5B10 38 61 00 A8 */ addi r3, r1, 0xa8 /* 802B8BD4 002B5B14 3C 80 01 00 */ lis r4, 0x01000020@ha @@ -2305,7 +2305,7 @@ lbl_802B8BA4: /* 802B8C3C 002B5B7C 38 A0 02 BC */ li r5, 0x2bc /* 802B8C40 002B5B80 38 C0 04 4C */ li r6, 0x44c /* 802B8C44 002B5B84 38 E0 05 DC */ li r7, 0x5dc -/* 802B8C48 002B5B88 48 00 6D 39 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8C48 002B5B88 48 00 6D 39 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8C4C 002B5B8C 48 00 0A 6C */ b lbl_802B96B8 /* 802B8C50 002B5B90 3B A0 00 09 */ li r29, 9 /* 802B8C54 002B5B94 38 60 00 04 */ li r3, 4 @@ -2347,7 +2347,7 @@ lbl_802B8CC4: /* 802B8CDC 002B5C1C 38 A0 02 BC */ li r5, 0x2bc /* 802B8CE0 002B5C20 38 C0 04 4C */ li r6, 0x44c /* 802B8CE4 002B5C24 38 E0 05 DC */ li r7, 0x5dc -/* 802B8CE8 002B5C28 48 00 6C 99 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8CE8 002B5C28 48 00 6C 99 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8CEC 002B5C2C 48 00 09 CC */ b lbl_802B96B8 /* 802B8CF0 002B5C30 38 61 00 98 */ addi r3, r1, 0x98 /* 802B8CF4 002B5C34 3C 80 01 00 */ lis r4, 0x0100002D@ha @@ -2367,7 +2367,7 @@ lbl_802B8CC4: /* 802B8D2C 002B5C6C 38 A0 02 BC */ li r5, 0x2bc /* 802B8D30 002B5C70 38 C0 04 4C */ li r6, 0x44c /* 802B8D34 002B5C74 38 E0 05 DC */ li r7, 0x5dc -/* 802B8D38 002B5C78 48 00 6C 49 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8D38 002B5C78 48 00 6C 49 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8D3C 002B5C7C 48 00 09 7C */ b lbl_802B96B8 /* 802B8D40 002B5C80 38 61 00 94 */ addi r3, r1, 0x94 /* 802B8D44 002B5C84 3C 80 01 00 */ lis r4, 0x0100002D@ha @@ -2387,7 +2387,7 @@ lbl_802B8CC4: /* 802B8D7C 002B5CBC 38 A0 02 BC */ li r5, 0x2bc /* 802B8D80 002B5CC0 38 C0 04 4C */ li r6, 0x44c /* 802B8D84 002B5CC4 38 E0 05 DC */ li r7, 0x5dc -/* 802B8D88 002B5CC8 48 00 6B F9 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8D88 002B5CC8 48 00 6B F9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8D8C 002B5CCC 48 00 09 2C */ b lbl_802B96B8 /* 802B8D90 002B5CD0 3B A0 00 0D */ li r29, 0xd /* 802B8D94 002B5CD4 38 60 00 0A */ li r3, 0xa @@ -2429,7 +2429,7 @@ lbl_802B8E04: /* 802B8E1C 002B5D5C 38 A0 02 BC */ li r5, 0x2bc /* 802B8E20 002B5D60 38 C0 04 4C */ li r6, 0x44c /* 802B8E24 002B5D64 38 E0 05 DC */ li r7, 0x5dc -/* 802B8E28 002B5D68 48 00 6B 59 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8E28 002B5D68 48 00 6B 59 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8E2C 002B5D6C 48 00 08 8C */ b lbl_802B96B8 /* 802B8E30 002B5D70 38 61 00 88 */ addi r3, r1, 0x88 /* 802B8E34 002B5D74 3C 80 01 00 */ lis r4, 0x01000037@ha @@ -2464,7 +2464,7 @@ lbl_802B8E04: /* 802B8EA8 002B5DE8 38 A0 02 BC */ li r5, 0x2bc /* 802B8EAC 002B5DEC 38 C0 04 4C */ li r6, 0x44c /* 802B8EB0 002B5DF0 38 E0 05 DC */ li r7, 0x5dc -/* 802B8EB4 002B5DF4 48 00 6A CD */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8EB4 002B5DF4 48 00 6A CD */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8EB8 002B5DF8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B8EBC 002B5DFC 7F 44 D3 78 */ mr r4, r26 /* 802B8EC0 002B5E00 4B FF 70 CD */ bl changeBgmStatus__8Z2SeqMgrFl @@ -2512,7 +2512,7 @@ lbl_802B8F48: /* 802B8F60 002B5EA0 38 A0 02 BC */ li r5, 0x2bc /* 802B8F64 002B5EA4 38 C0 04 4C */ li r6, 0x44c /* 802B8F68 002B5EA8 38 E0 05 DC */ li r7, 0x5dc -/* 802B8F6C 002B5EAC 48 00 6A 15 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8F6C 002B5EAC 48 00 6A 15 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8F70 002B5EB0 48 00 07 48 */ b lbl_802B96B8 /* 802B8F74 002B5EB4 38 61 00 78 */ addi r3, r1, 0x78 /* 802B8F78 002B5EB8 3C 80 01 00 */ lis r4, 0x0100003C@ha @@ -2544,7 +2544,7 @@ lbl_802B8F48: /* 802B8FE0 002B5F20 38 A0 02 BC */ li r5, 0x2bc /* 802B8FE4 002B5F24 38 C0 04 4C */ li r6, 0x44c /* 802B8FE8 002B5F28 38 E0 05 DC */ li r7, 0x5dc -/* 802B8FEC 002B5F2C 48 00 69 95 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8FEC 002B5F2C 48 00 69 95 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8FF0 002B5F30 48 00 06 C8 */ b lbl_802B96B8 /* 802B8FF4 002B5F34 3B A0 00 15 */ li r29, 0x15 /* 802B8FF8 002B5F38 38 60 00 07 */ li r3, 7 @@ -2586,7 +2586,7 @@ lbl_802B9068: /* 802B9080 002B5FC0 38 A0 02 BC */ li r5, 0x2bc /* 802B9084 002B5FC4 38 C0 04 4C */ li r6, 0x44c /* 802B9088 002B5FC8 38 E0 05 DC */ li r7, 0x5dc -/* 802B908C 002B5FCC 48 00 68 F5 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B908C 002B5FCC 48 00 68 F5 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B9090 002B5FD0 48 00 06 28 */ b lbl_802B96B8 /* 802B9094 002B5FD4 2C 1A 00 10 */ cmpwi r26, 0x10 /* 802B9098 002B5FD8 40 82 00 28 */ bne lbl_802B90C0 @@ -2630,7 +2630,7 @@ lbl_802B90E0: /* 802B9128 002B6068 38 A0 02 BC */ li r5, 0x2bc /* 802B912C 002B606C 38 C0 04 4C */ li r6, 0x44c /* 802B9130 002B6070 38 E0 05 DC */ li r7, 0x5dc -/* 802B9134 002B6074 48 00 68 4D */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B9134 002B6074 48 00 68 4D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B9138 002B6078 48 00 05 80 */ b lbl_802B96B8 /* 802B913C 002B607C 3B A0 00 19 */ li r29, 0x19 /* 802B9140 002B6080 38 60 00 16 */ li r3, 0x16 @@ -2672,7 +2672,7 @@ lbl_802B91B0: /* 802B91C8 002B6108 38 A0 02 BC */ li r5, 0x2bc /* 802B91CC 002B610C 38 C0 04 4C */ li r6, 0x44c /* 802B91D0 002B6110 38 E0 05 DC */ li r7, 0x5dc -/* 802B91D4 002B6114 48 00 67 AD */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B91D4 002B6114 48 00 67 AD */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B91D8 002B6118 48 00 04 E0 */ b lbl_802B96B8 /* 802B91DC 002B611C 2C 13 00 08 */ cmpwi r19, 8 /* 802B91E0 002B6120 40 82 00 2C */ bne lbl_802B920C @@ -2728,7 +2728,7 @@ lbl_802B924C: /* 802B9294 002B61D4 38 A0 02 BC */ li r5, 0x2bc /* 802B9298 002B61D8 38 C0 04 4C */ li r6, 0x44c /* 802B929C 002B61DC 38 E0 05 DC */ li r7, 0x5dc -/* 802B92A0 002B61E0 48 00 66 E1 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B92A0 002B61E0 48 00 66 E1 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B92A4 002B61E4 48 00 04 14 */ b lbl_802B96B8 /* 802B92A8 002B61E8 2C 13 00 08 */ cmpwi r19, 8 /* 802B92AC 002B61EC 40 82 00 0C */ bne lbl_802B92B8 @@ -2808,7 +2808,7 @@ lbl_802B93A8: /* 802B93B8 002B62F8 38 A0 02 BC */ li r5, 0x2bc /* 802B93BC 002B62FC 38 C0 04 4C */ li r6, 0x44c /* 802B93C0 002B6300 38 E0 05 DC */ li r7, 0x5dc -/* 802B93C4 002B6304 48 00 65 BD */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B93C4 002B6304 48 00 65 BD */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B93C8 002B6308 48 00 02 F0 */ b lbl_802B96B8 /* 802B93CC 002B630C 2C 1A 00 01 */ cmpwi r26, 1 /* 802B93D0 002B6310 41 80 00 30 */ blt lbl_802B9400 @@ -2855,7 +2855,7 @@ lbl_802B944C: /* 802B9464 002B63A4 38 A0 02 BC */ li r5, 0x2bc /* 802B9468 002B63A8 38 C0 04 4C */ li r6, 0x44c /* 802B946C 002B63AC 38 E0 05 DC */ li r7, 0x5dc -/* 802B9470 002B63B0 48 00 65 11 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B9470 002B63B0 48 00 65 11 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B9474 002B63B4 48 00 02 44 */ b lbl_802B96B8 /* 802B9478 002B63B8 2C 1A 00 32 */ cmpwi r26, 0x32 /* 802B947C 002B63BC 40 82 00 58 */ bne lbl_802B94D4 @@ -2893,7 +2893,7 @@ lbl_802B94D4: /* 802B94E8 002B6428 38 A0 02 BC */ li r5, 0x2bc /* 802B94EC 002B642C 38 C0 04 4C */ li r6, 0x44c /* 802B94F0 002B6430 38 E0 05 DC */ li r7, 0x5dc -/* 802B94F4 002B6434 48 00 64 8D */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B94F4 002B6434 48 00 64 8D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B94F8 002B6438 48 00 01 C0 */ b lbl_802B96B8 /* 802B94FC 002B643C 3B E0 00 4B */ li r31, 0x4b /* 802B9500 002B6440 3B C0 00 63 */ li r30, 0x63 @@ -2905,7 +2905,7 @@ lbl_802B94D4: /* 802B9518 002B6458 38 A0 02 BC */ li r5, 0x2bc /* 802B951C 002B645C 38 C0 04 4C */ li r6, 0x44c /* 802B9520 002B6460 38 E0 05 DC */ li r7, 0x5dc -/* 802B9524 002B6464 48 00 64 5D */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B9524 002B6464 48 00 64 5D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B9528 002B6468 48 00 01 90 */ b lbl_802B96B8 /* 802B952C 002B646C 2C 13 00 08 */ cmpwi r19, 8 /* 802B9530 002B6470 40 82 00 10 */ bne lbl_802B9540 @@ -3122,7 +3122,7 @@ lbl_802B9814: lbl_802B9840: /* 802B9840 002B6780 80 70 00 00 */ lwz r3, 0(r16) /* 802B9844 002B6784 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13) -/* 802B9848 002B6788 4B FE 8C 95 */ bl JAISound_NS_stop +/* 802B9848 002B6788 4B FE 8C 95 */ bl stop__8JAISoundFUl lbl_802B984C: /* 802B984C 002B678C 82 10 00 0C */ lwz r16, 0xc(r16) lbl_802B9850: diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s index 7629942f45..85aeaca7b0 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s @@ -6,7 +6,7 @@ /* 802B9D54 002B6C94 38 00 00 00 */ li r0, 0 /* 802B9D58 002B6C98 90 03 00 08 */ stw r0, 8(r3) /* 802B9D5C 002B6C9C 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B9D60 002B6CA0 48 00 63 DD */ bl Z2SoundObjMgr_NS_deleteEnemyAll +/* 802B9D60 002B6CA0 48 00 63 DD */ bl deleteEnemyAll__13Z2SoundObjMgrFv /* 802B9D64 002B6CA4 7F E3 FB 78 */ mr r3, r31 /* 802B9D68 002B6CA8 38 80 00 00 */ li r4, 0 /* 802B9D6C 002B6CAC 4B FF CB 75 */ bl setSceneExist__10Z2SceneMgrFb diff --git a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h index fda7860f9d..9152bae2e2 100644 --- a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h +++ b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h @@ -2,12 +2,17 @@ #define Z2SEMGR_H_ #include "JSystem/JAudio2/JAISe/JAISe.h" +#include "JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h" #include "Z2AudioLib/Z2Param/Z2Param.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" #include "global.h" struct Z2MultiSeObj { Z2MultiSeObj(); + + u8 unk0[28]; + u32 field_0x1c; + u8 unk1[4]; }; struct Z2SeMgr { @@ -31,6 +36,27 @@ struct Z2SeMgr { void processSeFramework(void); bool isLevelSe(JAISoundID); bool isSoundCulling(JAISoundID); + + JAISoundHandles sound_handles; + Z2SeMgr* se_mgr; + u32 field_0x64; + + Z2MultiSeObj level_object_se[10]; + u8 level_object_se_count; + + u8 padding_1[3]; + + Z2MultiSeObj multi_trigger_se[10]; + u8 multi_trigger_se_count; + + u8 padding_2[3]; + + u8 unk0[128]; + s8 unk1[12]; + + u8 mCrowdSize; + + u8 unk2[3]; }; struct Z2MultiSeMgr { @@ -40,6 +66,17 @@ struct Z2MultiSeMgr { void resetMultiSePos(void); float getPanPower(void); float getDolbyPower(void); + + u8 field_0x0; + u8 field_0x1; + u8 field_0x2; + u8 field_0x3; + f32 field_0x4; + f32 field_0x8; + f32 field_0xc; + f32 field_0x10; + f32 field_0x14; + s8 field_0x18; }; extern "C" { @@ -57,7 +94,7 @@ void Z2Audience_NS_calcOffMicSound(void); void modHeightAtCamera__7Z2SeMgrFPPC3Vec(Vec const**); void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8); -void JAISoundHandle_NS_releaseSound(void); +void releaseSound__14JAISoundHandleFv(void); void seStop__7Z2SeMgrF10JAISoundIDUl(JAISoundID, u32); void JAISeCategoryMgr_NS_stop(void); void seMoveVolumeAll__7Z2SeMgrFfUl(float, u32); @@ -88,7 +125,7 @@ extern float lbl_804558D4; extern double lbl_804558E0; extern float lbl_804558C0; extern float lbl_8045587C; -extern float lbl_80455878; +extern float lbl_80455878; // 0.0f extern float lbl_80455870; extern float lbl_80455874; extern float lbl_80455880; diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s deleted file mode 100644 index 6c390ddd99..0000000000 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802AB93C 002A887C 88 83 03 CC */ lbz r4, 0x3cc(r3) -/* 802AB940 002A8880 38 04 00 01 */ addi r0, r4, 1 -/* 802AB944 002A8884 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB948 002A8888 88 03 03 CC */ lbz r0, 0x3cc(r3) -/* 802AB94C 002A888C 28 00 00 64 */ cmplwi r0, 0x64 -/* 802AB950 002A8890 4C 81 00 20 */ blelr -/* 802AB954 002A8894 38 00 00 64 */ li r0, 0x64 -/* 802AB958 002A8898 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB95C 002A889C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB960.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AB960.s deleted file mode 100644 index 69cb6c1d6e..0000000000 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB960.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802AB960 002A88A0 88 83 03 CC */ lbz r4, 0x3cc(r3) -/* 802AB964 002A88A4 38 04 FF FF */ addi r0, r4, -1 -/* 802AB968 002A88A8 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB96C 002A88AC 88 03 03 CC */ lbz r0, 0x3cc(r3) -/* 802AB970 002A88B0 28 00 00 64 */ cmplwi r0, 0x64 -/* 802AB974 002A88B4 4C 81 00 20 */ blelr -/* 802AB978 002A88B8 38 00 00 00 */ li r0, 0 -/* 802AB97C 002A88BC 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB980 002A88C0 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s index 7045b5c12e..88e83b4827 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s @@ -1191,7 +1191,7 @@ lbl_802AD638: /* 802AD64C 002AA58C 38 A0 00 06 */ li r5, 6 /* 802AD650 002AA590 57 86 04 3E */ clrlwi r6, r28, 0x10 /* 802AD654 002AA594 38 E0 FF FF */ li r7, -1 -/* 802AD658 002AA598 4B FF D8 85 */ bl Z2SoundStarter_NS_setPortData +/* 802AD658 002AA598 4B FF D8 85 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802AD65C: /* 802AD65C 002AA59C 7F A0 07 75 */ extsb. r0, r29 /* 802AD660 002AA5A0 41 82 00 40 */ beq lbl_802AD6A0 diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s index 8cb05f26d5..41b89eab9f 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s @@ -24,10 +24,10 @@ lbl_802AD8E8: /* 802AD908 002AA848 7C 04 00 40 */ cmplw r4, r0 /* 802AD90C 002AA84C 40 82 00 18 */ bne lbl_802AD924 /* 802AD910 002AA850 7F A4 EB 78 */ mr r4, r29 -/* 802AD914 002AA854 4B FF 4B C9 */ bl JAISound_NS_stop +/* 802AD914 002AA854 4B FF 4B C9 */ bl stop__8JAISoundFUl /* 802AD918 002AA858 80 1B 00 60 */ lwz r0, 0x60(r27) /* 802AD91C 002AA85C 7C 60 FA 14 */ add r3, r0, r31 -/* 802AD920 002AA860 4B FF 48 65 */ bl JAISoundHandle_NS_releaseSound +/* 802AD920 002AA860 4B FF 48 65 */ bl releaseSound__14JAISoundHandleFv lbl_802AD924: /* 802AD924 002AA864 3B DE 00 01 */ addi r30, r30, 1 lbl_802AD928: diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s deleted file mode 100644 index 23318a9f2a..0000000000 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802AECBC 002ABBFC 38 00 FF FF */ li r0, -1 -/* 802AECC0 002ABC00 98 03 00 18 */ stb r0, 0x18(r3) -/* 802AECC4 002ABC04 C0 02 BE 78 */ lfs f0, lbl_80455878-_SDA2_BASE_(r2) -/* 802AECC8 002ABC08 D0 03 00 08 */ stfs f0, 8(r3) -/* 802AECCC 002ABC0C D0 03 00 0C */ stfs f0, 0xc(r3) -/* 802AECD0 002ABC10 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 802AECD4 002ABC14 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 802AECD8 002ABC18 D0 03 00 04 */ stfs f0, 4(r3) -/* 802AECDC 002ABC1C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h index aa909c9137..08508124c9 100644 --- a/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h @@ -2,7 +2,7 @@ #define Z2SEQMGR_H_ #include "JSystem/JAudio2/JAISe/JAISe.h" -#include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h" +#include "JSystem/JAudio2/JAISound/JAISound.h" #include "Z2AudioLib/Z2Param/Z2Param.h" #include "global.h" @@ -67,13 +67,12 @@ void JAISeqMgr_NS_stop_X1_(void); void bgmStart__8Z2SeqMgrFUlUll(u32, u32, s32); void bgmStop__8Z2SeqMgrFUll(u32, s32); void bgmStreamCheckReady__8Z2SeqMgrFv(void); -void JAISoundHandle_NS_releaseSound(void); +void releaseSound__14JAISoundHandleFv(void); void Z2SeqMgr_NS_subBgmStop(void); void subBgmStop__8Z2SeqMgrFv(void); void subBgmStopInner__8Z2SeqMgrFv(void); void JAISoundStatus__NS_lockWhenPrepared(); void bgmStreamPrepare__8Z2SeqMgrFUl(u32); -void JAISound_NS_stop_X1_(void); void JAISoundStatus__NS_unlockIfLocked(void); void bgmStreamPlay__8Z2SeqMgrFv(void); void bgmStreamStop__8Z2SeqMgrFUl(u32); diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s index 61dc0b34f7..9f266fe2cc 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s @@ -141,7 +141,7 @@ lbl_802AF210: /* 802AF214 002AC154 28 03 00 00 */ cmplwi r3, 0 /* 802AF218 002AC158 41 82 00 0C */ beq lbl_802AF224 /* 802AF21C 002AC15C 38 80 00 00 */ li r4, 0 -/* 802AF220 002AC160 4B FF 32 BD */ bl JAISound_NS_stop +/* 802AF220 002AC160 4B FF 32 BD */ bl stop__8JAISoundFUl lbl_802AF224: /* 802AF224 002AC164 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2) /* 802AF228 002AC168 D0 1C 00 64 */ stfs f0, 0x64(r28) @@ -159,7 +159,7 @@ lbl_802AF240: /* 802AF254 002AC194 28 03 00 00 */ cmplwi r3, 0 /* 802AF258 002AC198 41 82 00 0C */ beq lbl_802AF264 /* 802AF25C 002AC19C 38 80 00 00 */ li r4, 0 -/* 802AF260 002AC1A0 4B FF 32 7D */ bl JAISound_NS_stop +/* 802AF260 002AC1A0 4B FF 32 7D */ bl stop__8JAISoundFUl lbl_802AF264: /* 802AF264 002AC1A4 2C 1F 00 00 */ cmpwi r31, 0 /* 802AF268 002AC1A8 40 82 00 48 */ bne lbl_802AF2B0 @@ -167,7 +167,7 @@ lbl_802AF264: /* 802AF270 002AC1B0 28 03 00 00 */ cmplwi r3, 0 /* 802AF274 002AC1B4 41 82 00 0C */ beq lbl_802AF280 /* 802AF278 002AC1B8 38 80 00 00 */ li r4, 0 -/* 802AF27C 002AC1BC 4B FF 32 61 */ bl JAISound_NS_stop +/* 802AF27C 002AC1BC 4B FF 32 61 */ bl stop__8JAISoundFUl lbl_802AF280: /* 802AF280 002AC1C0 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2) /* 802AF284 002AC1C4 D0 1C 00 14 */ stfs f0, 0x14(r28) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s index cf6c8ad09b..d79c5c6f58 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s @@ -9,13 +9,13 @@ /* 802AF428 002AC368 80 63 00 00 */ lwz r3, 0(r3) /* 802AF42C 002AC36C 28 03 00 00 */ cmplwi r3, 0 /* 802AF430 002AC370 41 82 00 08 */ beq lbl_802AF438 -/* 802AF434 002AC374 4B FF 30 A9 */ bl JAISound_NS_stop +/* 802AF434 002AC374 4B FF 30 A9 */ bl stop__8JAISoundFUl lbl_802AF438: /* 802AF438 002AC378 80 7D 00 0C */ lwz r3, 0xc(r29) /* 802AF43C 002AC37C 28 03 00 00 */ cmplwi r3, 0 /* 802AF440 002AC380 41 82 00 0C */ beq lbl_802AF44C /* 802AF444 002AC384 7F C4 F3 78 */ mr r4, r30 -/* 802AF448 002AC388 4B FF 30 95 */ bl JAISound_NS_stop +/* 802AF448 002AC388 4B FF 30 95 */ bl stop__8JAISoundFUl lbl_802AF44C: /* 802AF44C 002AC38C 2C 1F 00 00 */ cmpwi r31, 0 /* 802AF450 002AC390 40 82 00 34 */ bne lbl_802AF484 @@ -23,7 +23,7 @@ lbl_802AF44C: /* 802AF458 002AC398 28 03 00 00 */ cmplwi r3, 0 /* 802AF45C 002AC39C 41 82 00 0C */ beq lbl_802AF468 /* 802AF460 002AC3A0 7F C4 F3 78 */ mr r4, r30 -/* 802AF464 002AC3A4 4B FF 30 79 */ bl JAISound_NS_stop +/* 802AF464 002AC3A4 4B FF 30 79 */ bl stop__8JAISoundFUl lbl_802AF468: /* 802AF468 002AC3A8 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2) /* 802AF46C 002AC3AC D0 1D 00 14 */ stfs f0, 0x14(r29) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s index 83f61440ba..bcc3a8c6c4 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s @@ -57,7 +57,7 @@ lbl_802AF51C: /* 802AF570 002AC4B0 28 03 00 00 */ cmplwi r3, 0 /* 802AF574 002AC4B4 41 82 00 0C */ beq lbl_802AF580 /* 802AF578 002AC4B8 38 80 00 00 */ li r4, 0 -/* 802AF57C 002AC4BC 4B FF 2F 61 */ bl JAISound_NS_stop +/* 802AF57C 002AC4BC 4B FF 2F 61 */ bl stop__8JAISoundFUl lbl_802AF580: /* 802AF580 002AC4C0 7F A3 EB 78 */ mr r3, r29 /* 802AF584 002AC4C4 38 80 00 01 */ li r4, 1 @@ -79,13 +79,13 @@ lbl_802AF580: /* 802AF5C4 002AC504 28 03 00 00 */ cmplwi r3, 0 /* 802AF5C8 002AC508 41 82 00 0C */ beq lbl_802AF5D4 /* 802AF5CC 002AC50C 38 80 00 00 */ li r4, 0 -/* 802AF5D0 002AC510 4B FF 2F 0D */ bl JAISound_NS_stop +/* 802AF5D0 002AC510 4B FF 2F 0D */ bl stop__8JAISoundFUl lbl_802AF5D4: /* 802AF5D4 002AC514 80 7D 00 0C */ lwz r3, 0xc(r29) /* 802AF5D8 002AC518 28 03 00 00 */ cmplwi r3, 0 /* 802AF5DC 002AC51C 41 82 00 0C */ beq lbl_802AF5E8 /* 802AF5E0 002AC520 38 80 00 00 */ li r4, 0 -/* 802AF5E4 002AC524 4B FF 2E F9 */ bl JAISound_NS_stop +/* 802AF5E4 002AC524 4B FF 2E F9 */ bl stop__8JAISoundFUl lbl_802AF5E8: /* 802AF5E8 002AC528 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2) /* 802AF5EC 002AC52C D0 1D 00 64 */ stfs f0, 0x64(r29) @@ -125,9 +125,9 @@ lbl_802AF64C: /* 802AF664 002AC5A4 40 82 00 18 */ bne lbl_802AF67C lbl_802AF668: /* 802AF668 002AC5A8 38 80 00 00 */ li r4, 0 -/* 802AF66C 002AC5AC 4B FF 2E 71 */ bl JAISound_NS_stop +/* 802AF66C 002AC5AC 4B FF 2E 71 */ bl stop__8JAISoundFUl /* 802AF670 002AC5B0 38 7D 00 04 */ addi r3, r29, 4 -/* 802AF674 002AC5B4 4B FF 2B 11 */ bl JAISoundHandle_NS_releaseSound +/* 802AF674 002AC5B4 4B FF 2B 11 */ bl releaseSound__14JAISoundHandleFv /* 802AF678 002AC5B8 48 00 00 28 */ b lbl_802AF6A0 lbl_802AF67C: /* 802AF67C 002AC5BC 38 00 FF FF */ li r0, -1 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s index 20edfa47b7..9500b969d4 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s @@ -45,7 +45,7 @@ lbl_802AF8B4: /* 802AF92C 002AC86C 48 00 48 39 */ bl Z2SeqMgr_NS_setBattleBgmOff /* 802AF930 002AC870 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF934 002AC874 38 80 00 17 */ li r4, 0x17 -/* 802AF938 002AC878 4B FF 2B A5 */ bl JAISound_NS_stop +/* 802AF938 002AC878 4B FF 2B A5 */ bl stop__8JAISoundFUl /* 802AF93C 002AC87C 38 00 00 37 */ li r0, 0x37 /* 802AF940 002AC880 B0 1F 00 B8 */ sth r0, 0xb8(r31) /* 802AF944 002AC884 48 00 00 78 */ b lbl_802AF9BC @@ -53,25 +53,25 @@ lbl_802AF8B4: /* 802AF94C 002AC88C B0 1F 00 B8 */ sth r0, 0xb8(r31) /* 802AF950 002AC890 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF954 002AC894 38 80 00 2D */ li r4, 0x2d -/* 802AF958 002AC898 4B FF 2B 85 */ bl JAISound_NS_stop +/* 802AF958 002AC898 4B FF 2B 85 */ bl stop__8JAISoundFUl /* 802AF95C 002AC89C 48 00 00 60 */ b lbl_802AF9BC /* 802AF960 002AC8A0 38 00 01 FE */ li r0, 0x1fe /* 802AF964 002AC8A4 B0 1F 00 B8 */ sth r0, 0xb8(r31) /* 802AF968 002AC8A8 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF96C 002AC8AC 38 80 00 2D */ li r4, 0x2d -/* 802AF970 002AC8B0 4B FF 2B 6D */ bl JAISound_NS_stop +/* 802AF970 002AC8B0 4B FF 2B 6D */ bl stop__8JAISoundFUl /* 802AF974 002AC8B4 48 00 00 48 */ b lbl_802AF9BC /* 802AF978 002AC8B8 38 00 01 68 */ li r0, 0x168 /* 802AF97C 002AC8BC B0 1F 00 B8 */ sth r0, 0xb8(r31) /* 802AF980 002AC8C0 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF984 002AC8C4 38 80 00 2D */ li r4, 0x2d -/* 802AF988 002AC8C8 4B FF 2B 55 */ bl JAISound_NS_stop +/* 802AF988 002AC8C8 4B FF 2B 55 */ bl stop__8JAISoundFUl /* 802AF98C 002AC8CC 48 00 00 30 */ b lbl_802AF9BC /* 802AF990 002AC8D0 38 00 01 A4 */ li r0, 0x1a4 /* 802AF994 002AC8D4 B0 1F 00 B8 */ sth r0, 0xb8(r31) /* 802AF998 002AC8D8 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF99C 002AC8DC 38 80 00 2D */ li r4, 0x2d -/* 802AF9A0 002AC8E0 4B FF 2B 3D */ bl JAISound_NS_stop +/* 802AF9A0 002AC8E0 4B FF 2B 3D */ bl stop__8JAISoundFUl /* 802AF9A4 002AC8E4 48 00 00 18 */ b lbl_802AF9BC /* 802AF9A8 002AC8E8 7F E3 FB 78 */ mr r3, r31 /* 802AF9AC 002AC8EC 38 80 00 00 */ li r4, 0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s index 610ca88cfd..019612d01f 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s @@ -86,9 +86,9 @@ lbl_802AFAEC: lbl_802AFAFC: /* 802AFAFC 002ACA3C 80 7E 00 04 */ lwz r3, 4(r30) /* 802AFB00 002ACA40 7F E4 FB 78 */ mr r4, r31 -/* 802AFB04 002ACA44 4B FF 29 D9 */ bl JAISound_NS_stop +/* 802AFB04 002ACA44 4B FF 29 D9 */ bl stop__8JAISoundFUl /* 802AFB08 002ACA48 38 7E 00 04 */ addi r3, r30, 4 -/* 802AFB0C 002ACA4C 4B FF 26 79 */ bl JAISoundHandle_NS_releaseSound +/* 802AFB0C 002ACA4C 4B FF 26 79 */ bl releaseSound__14JAISoundHandleFv /* 802AFB10 002ACA50 88 0D 82 E2 */ lbz r0, lbl_80450862-_SDA_BASE_(r13) /* 802AFB14 002ACA54 28 00 00 00 */ cmplwi r0, 0 /* 802AFB18 002ACA58 41 82 00 40 */ beq lbl_802AFB58 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s index a41e71052e..9ef353a862 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s @@ -90,14 +90,14 @@ lbl_802AFCD8: /* 802AFCDC 002ACC1C 28 03 00 00 */ cmplwi r3, 0 /* 802AFCE0 002ACC20 41 82 00 F4 */ beq lbl_802AFDD4 /* 802AFCE4 002ACC24 88 8D 82 E2 */ lbz r4, lbl_80450862-_SDA_BASE_(r13) -/* 802AFCE8 002ACC28 4B FF 27 F5 */ bl JAISound_NS_stop +/* 802AFCE8 002ACC28 4B FF 27 F5 */ bl stop__8JAISoundFUl /* 802AFCEC 002ACC2C 48 00 00 E8 */ b lbl_802AFDD4 lbl_802AFCF0: /* 802AFCF0 002ACC30 80 7F 00 00 */ lwz r3, 0(r31) /* 802AFCF4 002ACC34 28 03 00 00 */ cmplwi r3, 0 /* 802AFCF8 002ACC38 41 82 00 0C */ beq lbl_802AFD04 /* 802AFCFC 002ACC3C 38 80 00 00 */ li r4, 0 -/* 802AFD00 002ACC40 4B FF 27 DD */ bl JAISound_NS_stop +/* 802AFD00 002ACC40 4B FF 27 DD */ bl stop__8JAISoundFUl lbl_802AFD04: /* 802AFD04 002ACC44 C0 02 BF 9C */ lfs f0, lbl_8045599C-_SDA2_BASE_(r2) /* 802AFD08 002ACC48 D0 1F 00 64 */ stfs f0, 0x64(r31) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s index 704fa6bcd5..349b5b0b9d 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s @@ -25,7 +25,7 @@ lbl_802AFE5C: /* 802AFE6C 002ACDAC 28 03 00 00 */ cmplwi r3, 0 /* 802AFE70 002ACDB0 41 82 00 58 */ beq lbl_802AFEC8 /* 802AFE74 002ACDB4 38 80 00 1E */ li r4, 0x1e -/* 802AFE78 002ACDB8 4B FF 26 65 */ bl JAISound_NS_stop +/* 802AFE78 002ACDB8 4B FF 26 65 */ bl stop__8JAISoundFUl /* 802AFE7C 002ACDBC 48 00 00 4C */ b lbl_802AFEC8 lbl_802AFE80: /* 802AFE80 002ACDC0 28 03 00 00 */ cmplwi r3, 0 @@ -41,7 +41,7 @@ lbl_802AFE98: /* 802AFEA0 002ACDE0 40 82 00 28 */ bne lbl_802AFEC8 /* 802AFEA4 002ACDE4 28 03 00 00 */ cmplwi r3, 0 /* 802AFEA8 002ACDE8 41 82 00 08 */ beq lbl_802AFEB0 -/* 802AFEAC 002ACDEC 4B FF 26 ED */ bl JAISound_NS_stop_X1_ +/* 802AFEAC 002ACDEC 4B FF 26 ED */ bl stop__8JAISoundFv lbl_802AFEB0: /* 802AFEB0 002ACDF0 7F E3 FB 78 */ mr r3, r31 /* 802AFEB4 002ACDF4 3C 80 01 00 */ lis r4, 0x010000A9@ha diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s index e8cb450f7b..45baf692a1 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s @@ -39,10 +39,10 @@ lbl_802AFF58: /* 802AFF5C 002ACE9C 28 03 00 00 */ cmplwi r3, 0 /* 802AFF60 002ACEA0 41 82 00 0C */ beq lbl_802AFF6C /* 802AFF64 002ACEA4 7F E4 FB 78 */ mr r4, r31 -/* 802AFF68 002ACEA8 4B FF 25 75 */ bl JAISound_NS_stop +/* 802AFF68 002ACEA8 4B FF 25 75 */ bl stop__8JAISoundFUl lbl_802AFF6C: /* 802AFF6C 002ACEAC 38 7E 00 0C */ addi r3, r30, 0xc -/* 802AFF70 002ACEB0 4B FF 22 15 */ bl JAISoundHandle_NS_releaseSound +/* 802AFF70 002ACEB0 4B FF 22 15 */ bl releaseSound__14JAISoundHandleFv /* 802AFF74 002ACEB4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802AFF78 002ACEB8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802AFF7C 002ACEBC 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s index b53b845f56..5528dec328 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s @@ -286,7 +286,7 @@ lbl_802B03AC: /* 802B03BC 002AD2FC 38 A0 05 DC */ li r5, 0x5dc /* 802B03C0 002AD300 38 C0 13 88 */ li r6, 0x1388 /* 802B03C4 002AD304 38 E0 27 10 */ li r7, 0x2710 -/* 802B03C8 002AD308 48 00 F5 B9 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B03C8 002AD308 48 00 F5 B9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs lbl_802B03CC: /* 802B03CC 002AD30C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802B03D0 002AD310 40 82 19 D0 */ bne lbl_802B1DA0 @@ -2023,7 +2023,7 @@ lbl_802B1DA0: /* 802B1DA8 002AECE8 38 A0 00 09 */ li r5, 9 /* 802B1DAC 002AECEC 57 C6 04 3E */ clrlwi r6, r30, 0x10 /* 802B1DB0 002AECF0 38 E0 FF FF */ li r7, -1 -/* 802B1DB4 002AECF4 4B FF 91 29 */ bl Z2SoundStarter_NS_setPortData +/* 802B1DB4 002AECF4 4B FF 91 29 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802B1DB8 002AECF8 9B DD 00 BC */ stb r30, 0xbc(r29) lbl_802B1DBC: /* 802B1DBC 002AECFC E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s index e3c1e8b302..c4b342b023 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s @@ -436,7 +436,7 @@ lbl_802B2464: /* 802B246C 002AF3AC 38 A0 00 09 */ li r5, 9 /* 802B2470 002AF3B0 38 C0 00 01 */ li r6, 1 /* 802B2474 002AF3B4 38 E0 FF FF */ li r7, -1 -/* 802B2478 002AF3B8 4B FF 8A 65 */ bl Z2SoundStarter_NS_setPortData +/* 802B2478 002AF3B8 4B FF 8A 65 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802B247C 002AF3BC 48 00 05 08 */ b lbl_802B2984 lbl_802B2480: /* 802B2480 002AF3C0 7F 83 E3 78 */ mr r3, r28 @@ -763,7 +763,7 @@ lbl_802B2960: /* 802B2970 002AF8B0 38 A0 00 09 */ li r5, 9 /* 802B2974 002AF8B4 57 A6 04 3E */ clrlwi r6, r29, 0x10 /* 802B2978 002AF8B8 38 E0 FF FF */ li r7, -1 -/* 802B297C 002AF8BC 4B FF 85 61 */ bl Z2SoundStarter_NS_setPortData +/* 802B297C 002AF8BC 4B FF 85 61 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802B2980: /* 802B2980 002AF8C0 9B BC 00 BD */ stb r29, 0xbd(r28) lbl_802B2984: diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B327C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B327C.s index 10350c8cd0..9c01776b9e 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B327C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B327C.s @@ -33,7 +33,7 @@ lbl_802B32C4: /* 802B32F8 002B0238 7C 09 03 A6 */ mtctr r0 /* 802B32FC 002B023C 4E 80 04 20 */ bctr /* 802B3300 002B0240 38 80 00 1E */ li r4, 0x1e -/* 802B3304 002B0244 4B FE F1 D9 */ bl JAISound_NS_stop +/* 802B3304 002B0244 4B FE F1 D9 */ bl stop__8JAISoundFUl lbl_802B3308: /* 802B3308 002B0248 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B330C 002B024C 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4128.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4128.s index 8b9c046bce..f301f0f100 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4128.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4128.s @@ -8,7 +8,7 @@ /* 802B4144 002B1084 38 A0 02 BC */ li r5, 0x2bc /* 802B4148 002B1088 38 C0 04 4C */ li r6, 0x44c /* 802B414C 002B108C 38 E0 05 DC */ li r7, 0x5dc -/* 802B4150 002B1090 48 00 B8 31 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B4150 002B1090 48 00 B8 31 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs lbl_802B4154: /* 802B4154 002B1094 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B4158 002B1098 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s index 15b8324b10..eb4dd63460 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s @@ -75,7 +75,7 @@ lbl_802B4544: /* 802B45AC 002B14EC D0 5E 00 1C */ stfs f2, 0x1c(r30) lbl_802B45B0: /* 802B45B0 002B14F0 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B45B4 002B14F4 48 00 BC 31 */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B45B4 002B14F4 48 00 BC 31 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B45B8 002B14F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B45BC 002B14FC 41 82 00 2C */ beq lbl_802B45E8 /* 802B45C0 002B1500 80 7E 00 04 */ lwz r3, 4(r30) @@ -92,7 +92,7 @@ lbl_802B45DC: /* 802B45E4 002B1524 41 82 00 3C */ beq lbl_802B4620 lbl_802B45E8: /* 802B45E8 002B1528 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B45EC 002B152C 48 00 BB F9 */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B45EC 002B152C 48 00 BB F9 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B45F0 002B1530 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B45F4 002B1534 40 82 00 40 */ bne lbl_802B4634 /* 802B45F8 002B1538 80 7E 00 04 */ lwz r3, 4(r30) @@ -110,12 +110,12 @@ lbl_802B4614: lbl_802B4620: /* 802B4620 002B1560 80 7E 00 04 */ lwz r3, 4(r30) /* 802B4624 002B1564 38 80 00 1E */ li r4, 0x1e -/* 802B4628 002B1568 4B FE DE B5 */ bl JAISound_NS_stop +/* 802B4628 002B1568 4B FE DE B5 */ bl stop__8JAISoundFUl /* 802B462C 002B156C 80 7E 00 04 */ lwz r3, 4(r30) /* 802B4630 002B1570 4B FE DB 71 */ bl JAISound_NS_releaseHandle lbl_802B4634: /* 802B4634 002B1574 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B4638 002B1578 48 00 BB AD */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B4638 002B1578 48 00 BB AD */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B463C 002B157C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4640 002B1580 40 82 00 2C */ bne lbl_802B466C /* 802B4644 002B1584 80 7E 00 04 */ lwz r3, 4(r30) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s index 3a15821b9e..ad008aae7e 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s @@ -48,7 +48,7 @@ lbl_802B48E8: /* 802B48EC 002B182C 28 00 00 00 */ cmplwi r0, 0 /* 802B48F0 002B1830 40 82 00 14 */ bne lbl_802B4904 /* 802B48F4 002B1834 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B48F8 002B1838 48 00 B8 ED */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B48F8 002B1838 48 00 B8 ED */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B48FC 002B183C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4900 002B1840 41 82 01 E4 */ beq lbl_802B4AE4 lbl_802B4904: @@ -68,7 +68,7 @@ lbl_802B4920: /* 802B4934 002B1874 38 A0 00 09 */ li r5, 9 /* 802B4938 002B1878 38 C0 00 01 */ li r6, 1 /* 802B493C 002B187C 38 E0 FF FF */ li r7, -1 -/* 802B4940 002B1880 4B FF 65 9D */ bl Z2SoundStarter_NS_setPortData +/* 802B4940 002B1880 4B FF 65 9D */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802B4944 002B1884 7F C3 F3 78 */ mr r3, r30 /* 802B4948 002B1888 38 9E 00 04 */ addi r4, r30, 4 /* 802B494C 002B188C 88 AD 82 EC */ lbz r5, lbl_8045086C-_SDA_BASE_(r13) @@ -164,7 +164,7 @@ lbl_802B4A6C: /* 802B4AAC 002B19EC 38 A0 00 09 */ li r5, 9 /* 802B4AB0 002B19F0 38 C0 00 03 */ li r6, 3 /* 802B4AB4 002B19F4 38 E0 FF FF */ li r7, -1 -/* 802B4AB8 002B19F8 4B FF 64 25 */ bl Z2SoundStarter_NS_setPortData +/* 802B4AB8 002B19F8 4B FF 64 25 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802B4ABC 002B19FC 48 00 00 24 */ b lbl_802B4AE0 lbl_802B4AC0: /* 802B4AC0 002B1A00 28 00 00 02 */ cmplwi r0, 2 @@ -174,7 +174,7 @@ lbl_802B4AC0: /* 802B4AD0 002B1A10 38 A0 00 09 */ li r5, 9 /* 802B4AD4 002B1A14 38 C0 00 02 */ li r6, 2 /* 802B4AD8 002B1A18 38 E0 FF FF */ li r7, -1 -/* 802B4ADC 002B1A1C 4B FF 64 01 */ bl Z2SoundStarter_NS_setPortData +/* 802B4ADC 002B1A1C 4B FF 64 01 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802B4AE0: /* 802B4AE0 002B1A20 9B FE 00 BF */ stb r31, 0xbf(r30) lbl_802B4AE4: diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s index 9a83dc2eb5..3ad2be4c0d 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s @@ -36,7 +36,7 @@ lbl_802B4C30: /* 802B4C48 002B1B88 28 00 00 00 */ cmplwi r0, 0 /* 802B4C4C 002B1B8C 40 82 00 14 */ bne lbl_802B4C60 /* 802B4C50 002B1B90 80 7F 00 04 */ lwz r3, 4(r31) -/* 802B4C54 002B1B94 4B FE D9 45 */ bl JAISound_NS_stop_X1_ +/* 802B4C54 002B1B94 4B FE D9 45 */ bl stop__8JAISoundFv /* 802B4C58 002B1B98 38 00 00 00 */ li r0, 0 /* 802B4C5C 002B1B9C 98 1F 00 BF */ stb r0, 0xbf(r31) lbl_802B4C60: @@ -81,7 +81,7 @@ lbl_802B4CE0: /* 802B4CE4 002B1C24 28 00 00 00 */ cmplwi r0, 0 /* 802B4CE8 002B1C28 40 82 00 14 */ bne lbl_802B4CFC /* 802B4CEC 002B1C2C 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B4CF0 002B1C30 48 00 B4 F5 */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B4CF0 002B1C30 48 00 B4 F5 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B4CF4 002B1C34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4CF8 002B1C38 41 82 01 A4 */ beq lbl_802B4E9C lbl_802B4CFC: diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s index 9eecf92da9..b07dd47f57 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s @@ -28,7 +28,7 @@ lbl_802B4F08: /* 802B4F18 002B1E58 28 00 00 00 */ cmplwi r0, 0 /* 802B4F1C 002B1E5C 40 82 00 14 */ bne lbl_802B4F30 /* 802B4F20 002B1E60 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B4F24 002B1E64 48 00 B2 C1 */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B4F24 002B1E64 48 00 B2 C1 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B4F28 002B1E68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4F2C 002B1E6C 41 82 00 14 */ beq lbl_802B4F40 lbl_802B4F30: @@ -63,7 +63,7 @@ lbl_802B4F5C: /* 802B4F94 002B1ED4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4F98 002B1ED8 41 82 02 54 */ beq lbl_802B51EC /* 802B4F9C 002B1EDC 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B4FA0 002B1EE0 48 00 B1 61 */ bl Z2SoundObjMgr_NS_setBattleInit +/* 802B4FA0 002B1EE0 48 00 B1 61 */ bl setBattleInit__13Z2SoundObjMgrFv /* 802B4FA4 002B1EE4 38 00 00 FF */ li r0, 0xff /* 802B4FA8 002B1EE8 98 1C 00 BD */ stb r0, 0xbd(r28) /* 802B4FAC 002B1EEC 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) @@ -147,7 +147,7 @@ lbl_802B50A8: /* 802B50D4 002B2014 48 00 00 30 */ b lbl_802B5104 lbl_802B50D8: /* 802B50D8 002B2018 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B50DC 002B201C 48 00 B1 09 */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B50DC 002B201C 48 00 B1 09 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B50E0 002B2020 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 802B50E4 002B2024 7F 83 E3 78 */ mr r3, r28 /* 802B50E8 002B2028 4B FF CD 0D */ bl changeSubBgmStatus__8Z2SeqMgrFl diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s index 03170bef40..4a84de128a 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s @@ -41,7 +41,7 @@ lbl_802B59CC: /* 802B59DC 002B291C 7F E4 FB 78 */ mr r4, r31 /* 802B59E0 002B2920 38 A0 00 0A */ li r5, 0xa /* 802B59E4 002B2924 38 C0 FF FF */ li r6, -1 -/* 802B59E8 002B2928 4B FF 55 8D */ bl Z2SoundStarter_NS_getPortData +/* 802B59E8 002B2928 4B FF 55 8D */ bl getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc /* 802B59EC 002B292C 98 7F 00 C4 */ stb r3, 0xc4(r31) /* 802B59F0 002B2930 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13) /* 802B59F4 002B2934 88 03 00 0C */ lbz r0, 0xc(r3) @@ -214,9 +214,9 @@ lbl_802B5C28: /* 802B5C48 002B2B88 41 80 00 1C */ blt lbl_802B5C64 /* 802B5C4C 002B2B8C 80 7F 00 00 */ lwz r3, 0(r31) /* 802B5C50 002B2B90 38 80 00 3C */ li r4, 0x3c -/* 802B5C54 002B2B94 4B FE C8 89 */ bl JAISound_NS_stop +/* 802B5C54 002B2B94 4B FE C8 89 */ bl stop__8JAISoundFUl /* 802B5C58 002B2B98 7F E3 FB 78 */ mr r3, r31 -/* 802B5C5C 002B2B9C 4B FE C5 29 */ bl JAISoundHandle_NS_releaseSound +/* 802B5C5C 002B2B9C 4B FE C5 29 */ bl releaseSound__14JAISoundHandleFv /* 802B5C60 002B2BA0 48 00 02 0C */ b lbl_802B5E6C lbl_802B5C64: /* 802B5C64 002B2BA4 2C 04 00 11 */ cmpwi r4, 0x11 @@ -260,9 +260,9 @@ lbl_802B5CC0: /* 802B5CE8 002B2C28 28 00 00 14 */ cmplwi r0, 0x14 /* 802B5CEC 002B2C2C 40 80 01 80 */ bge lbl_802B5E6C /* 802B5CF0 002B2C30 38 80 00 3C */ li r4, 0x3c -/* 802B5CF4 002B2C34 4B FE C7 E9 */ bl JAISound_NS_stop +/* 802B5CF4 002B2C34 4B FE C7 E9 */ bl stop__8JAISoundFUl /* 802B5CF8 002B2C38 7F E3 FB 78 */ mr r3, r31 -/* 802B5CFC 002B2C3C 4B FE C4 89 */ bl JAISoundHandle_NS_releaseSound +/* 802B5CFC 002B2C3C 4B FE C4 89 */ bl releaseSound__14JAISoundHandleFv /* 802B5D00 002B2C40 48 00 01 6C */ b lbl_802B5E6C lbl_802B5D04: /* 802B5D04 002B2C44 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h new file mode 100644 index 0000000000..2edc4bf2e9 --- /dev/null +++ b/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h @@ -0,0 +1,34 @@ +#ifndef __Z2SOUNDHANDLES_H__ +#define __Z2SOUNDHANDLES_H__ + +#include "JSystem/JAudio2/JAISound/JAISound.h" +#include "JSystem/JGeometry/JGeometry.h" +#include "JSystem/JSupport/JSUList/JSUList.h" +#include "dolphin/types.h" + +class Z2SoundHandlePool : public JAISoundHandle, JSULink<Z2SoundHandlePool> {}; + +class Z2SoundHandles : protected JSUList<Z2SoundHandlePool> { +public: + Z2SoundHandles(); + ~Z2SoundHandles(); + + void initHandlesPool(u8 pNumHandles); + void deleteHandlesPool(); + + bool isActive() const; + + JAISoundHandle* getHandleSoundID(JAISoundID pSoundId); + JAISoundHandle* getHandleUserData(u32 pUserData); + + void stopAllSounds(u32 fadeout); + + void setPos(const JGeometry::TVec3<f32>& pos); + + u32 getNumHandles() const { return this->getNumLinks(); } + +private: + u8 mNumHandles; +}; + +#endif
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB07C.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB07C.s deleted file mode 100644 index 1de2fcd21c..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB07C.s +++ /dev/null @@ -1,14 +0,0 @@ -/* 802AB07C 002A7FBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB080 002A7FC0 7C 08 02 A6 */ mflr r0 -/* 802AB084 002A7FC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB088 002A7FC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB08C 002A7FCC 7C 7F 1B 78 */ mr r31, r3 -/* 802AB090 002A7FD0 48 03 0E 85 */ bl initiate__10JSUPtrListFv -/* 802AB094 002A7FD4 38 00 00 00 */ li r0, 0 -/* 802AB098 002A7FD8 98 1F 00 0C */ stb r0, 0xc(r31) -/* 802AB09C 002A7FDC 7F E3 FB 78 */ mr r3, r31 -/* 802AB0A0 002A7FE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB0A4 002A7FE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB0A8 002A7FE8 7C 08 03 A6 */ mtlr r0 -/* 802AB0AC 002A7FEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB0B0 002A7FF0 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB0B4.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB0B4.s deleted file mode 100644 index 1cf4f4af22..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB0B4.s +++ /dev/null @@ -1,27 +0,0 @@ -/* 802AB0B4 002A7FF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB0B8 002A7FF8 7C 08 02 A6 */ mflr r0 -/* 802AB0BC 002A7FFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB0C0 002A8000 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB0C4 002A8004 93 C1 00 08 */ stw r30, 8(r1) -/* 802AB0C8 002A8008 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802AB0CC 002A800C 7C 9F 23 78 */ mr r31, r4 -/* 802AB0D0 002A8010 41 82 00 2C */ beq lbl_802AB0FC -/* 802AB0D4 002A8014 48 00 00 4D */ bl Z2SoundHandles_NS_deleteHandlesPool -/* 802AB0D8 002A8018 28 1E 00 00 */ cmplwi r30, 0 -/* 802AB0DC 002A801C 41 82 00 10 */ beq lbl_802AB0EC -/* 802AB0E0 002A8020 7F C3 F3 78 */ mr r3, r30 -/* 802AB0E4 002A8024 38 80 00 00 */ li r4, 0 -/* 802AB0E8 002A8028 48 03 0D C5 */ bl __dt__10JSUPtrListFv -lbl_802AB0EC: -/* 802AB0EC 002A802C 7F E0 07 35 */ extsh. r0, r31 -/* 802AB0F0 002A8030 40 81 00 0C */ ble lbl_802AB0FC -/* 802AB0F4 002A8034 7F C3 F3 78 */ mr r3, r30 -/* 802AB0F8 002A8038 48 02 3C 45 */ bl __dl__FPv -lbl_802AB0FC: -/* 802AB0FC 002A803C 7F C3 F3 78 */ mr r3, r30 -/* 802AB100 002A8040 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB104 002A8044 83 C1 00 08 */ lwz r30, 8(r1) -/* 802AB108 002A8048 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB10C 002A804C 7C 08 03 A6 */ mtlr r0 -/* 802AB110 002A8050 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB114 002A8054 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB118.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB118.s deleted file mode 100644 index 0eb05fd4b8..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB118.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 802AB118 002A8058 98 83 00 0C */ stb r4, 0xc(r3) -/* 802AB11C 002A805C 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s index c4e63d0b53..687811480f 100644 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s +++ b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s @@ -25,7 +25,7 @@ lbl_802AB174: /* 802AB174 002A80B4 28 1E 00 00 */ cmplwi r30, 0 /* 802AB178 002A80B8 41 82 00 0C */ beq lbl_802AB184 /* 802AB17C 002A80BC 7F C3 F3 78 */ mr r3, r30 -/* 802AB180 002A80C0 4B FF 70 05 */ bl JAISoundHandle_NS_releaseSound +/* 802AB180 002A80C0 4B FF 70 05 */ bl releaseSound__14JAISoundHandleFv lbl_802AB184: /* 802AB184 002A80C4 88 0D 8D C8 */ lbz r0, lbl_80451348-_SDA_BASE_(r13) /* 802AB188 002A80C8 7C 00 07 75 */ extsb. r0, r0 diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB254.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB254.s deleted file mode 100644 index 78a93b0ec2..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB254.s +++ /dev/null @@ -1,23 +0,0 @@ -/* 802AB254 002A8194 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB258 002A8198 80 A3 00 00 */ lwz r5, 0(r3) -/* 802AB25C 002A819C 80 04 00 00 */ lwz r0, 0(r4) -/* 802AB260 002A81A0 48 00 00 2C */ b lbl_802AB28C -lbl_802AB264: -/* 802AB264 002A81A4 80 65 00 00 */ lwz r3, 0(r5) -/* 802AB268 002A81A8 80 83 00 00 */ lwz r4, 0(r3) -/* 802AB26C 002A81AC 28 04 00 00 */ cmplwi r4, 0 -/* 802AB270 002A81B0 41 82 00 18 */ beq lbl_802AB288 -/* 802AB274 002A81B4 80 84 00 18 */ lwz r4, 0x18(r4) -/* 802AB278 002A81B8 90 81 00 08 */ stw r4, 8(r1) -/* 802AB27C 002A81BC 7C 04 00 40 */ cmplw r4, r0 -/* 802AB280 002A81C0 40 82 00 08 */ bne lbl_802AB288 -/* 802AB284 002A81C4 48 00 00 14 */ b lbl_802AB298 -lbl_802AB288: -/* 802AB288 002A81C8 80 A5 00 0C */ lwz r5, 0xc(r5) -lbl_802AB28C: -/* 802AB28C 002A81CC 28 05 00 00 */ cmplwi r5, 0 -/* 802AB290 002A81D0 40 82 FF D4 */ bne lbl_802AB264 -/* 802AB294 002A81D4 38 60 00 00 */ li r3, 0 -lbl_802AB298: -/* 802AB298 002A81D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB29C 002A81DC 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2A0.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2A0.s deleted file mode 100644 index 2273e24a00..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2A0.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 802AB2A0 002A81E0 80 C3 00 00 */ lwz r6, 0(r3) -/* 802AB2A4 002A81E4 48 00 00 24 */ b lbl_802AB2C8 -lbl_802AB2A8: -/* 802AB2A8 002A81E8 80 66 00 00 */ lwz r3, 0(r6) -/* 802AB2AC 002A81EC 80 A3 00 00 */ lwz r5, 0(r3) -/* 802AB2B0 002A81F0 28 05 00 00 */ cmplwi r5, 0 -/* 802AB2B4 002A81F4 41 82 00 10 */ beq lbl_802AB2C4 -/* 802AB2B8 002A81F8 80 05 00 20 */ lwz r0, 0x20(r5) -/* 802AB2BC 002A81FC 7C 04 00 40 */ cmplw r4, r0 -/* 802AB2C0 002A8200 4D 82 00 20 */ beqlr -lbl_802AB2C4: -/* 802AB2C4 002A8204 80 C6 00 0C */ lwz r6, 0xc(r6) -lbl_802AB2C8: -/* 802AB2C8 002A8208 28 06 00 00 */ cmplwi r6, 0 -/* 802AB2CC 002A820C 40 82 FF DC */ bne lbl_802AB2A8 -/* 802AB2D0 002A8210 38 60 00 00 */ li r3, 0 -/* 802AB2D4 002A8214 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB4A0.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB4A0.s deleted file mode 100644 index c44d222516..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB4A0.s +++ /dev/null @@ -1,28 +0,0 @@ -/* 802AB4A0 002A83E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB4A4 002A83E4 7C 08 02 A6 */ mflr r0 -/* 802AB4A8 002A83E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB4AC 002A83EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB4B0 002A83F0 93 C1 00 08 */ stw r30, 8(r1) -/* 802AB4B4 002A83F4 7C 9E 23 78 */ mr r30, r4 -/* 802AB4B8 002A83F8 83 E3 00 00 */ lwz r31, 0(r3) -/* 802AB4BC 002A83FC 48 00 00 28 */ b lbl_802AB4E4 -lbl_802AB4C0: -/* 802AB4C0 002A8400 80 7F 00 00 */ lwz r3, 0(r31) -/* 802AB4C4 002A8404 28 03 00 00 */ cmplwi r3, 0 -/* 802AB4C8 002A8408 41 82 00 18 */ beq lbl_802AB4E0 -/* 802AB4CC 002A840C 80 63 00 00 */ lwz r3, 0(r3) -/* 802AB4D0 002A8410 28 03 00 00 */ cmplwi r3, 0 -/* 802AB4D4 002A8414 41 82 00 0C */ beq lbl_802AB4E0 -/* 802AB4D8 002A8418 7F C4 F3 78 */ mr r4, r30 -/* 802AB4DC 002A841C 4B FF 70 01 */ bl JAISound_NS_stop -lbl_802AB4E0: -/* 802AB4E0 002A8420 83 FF 00 0C */ lwz r31, 0xc(r31) -lbl_802AB4E4: -/* 802AB4E4 002A8424 28 1F 00 00 */ cmplwi r31, 0 -/* 802AB4E8 002A8428 40 82 FF D8 */ bne lbl_802AB4C0 -/* 802AB4EC 002A842C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB4F0 002A8430 83 C1 00 08 */ lwz r30, 8(r1) -/* 802AB4F4 002A8434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB4F8 002A8438 7C 08 03 A6 */ mtlr r0 -/* 802AB4FC 002A843C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB500 002A8440 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB504.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB504.s deleted file mode 100644 index 3fcf79eaf6..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB504.s +++ /dev/null @@ -1,16 +0,0 @@ -/* 802AB504 002A8444 80 83 00 00 */ lwz r4, 0(r3) -/* 802AB508 002A8448 48 00 00 20 */ b lbl_802AB528 -lbl_802AB50C: -/* 802AB50C 002A844C 80 64 00 00 */ lwz r3, 0(r4) -/* 802AB510 002A8450 80 03 00 00 */ lwz r0, 0(r3) -/* 802AB514 002A8454 28 00 00 00 */ cmplwi r0, 0 -/* 802AB518 002A8458 41 82 00 0C */ beq lbl_802AB524 -/* 802AB51C 002A845C 38 60 00 01 */ li r3, 1 -/* 802AB520 002A8460 4E 80 00 20 */ blr -lbl_802AB524: -/* 802AB524 002A8464 80 84 00 0C */ lwz r4, 0xc(r4) -lbl_802AB528: -/* 802AB528 002A8468 28 04 00 00 */ cmplwi r4, 0 -/* 802AB52C 002A846C 40 82 FF E0 */ bne lbl_802AB50C -/* 802AB530 002A8470 38 60 00 00 */ li r3, 0 -/* 802AB534 002A8474 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s index 48b3a06ec8..6901019bb7 100644 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s +++ b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s @@ -41,7 +41,7 @@ lbl_802AB5C8: /* 802AB5C8 002A8508 28 1F 00 00 */ cmplwi r31, 0 /* 802AB5CC 002A850C 41 82 00 0C */ beq lbl_802AB5D8 /* 802AB5D0 002A8510 7F E3 FB 78 */ mr r3, r31 -/* 802AB5D4 002A8514 4B FF 6B B1 */ bl JAISoundHandle_NS_releaseSound +/* 802AB5D4 002A8514 4B FF 6B B1 */ bl releaseSound__14JAISoundHandleFv lbl_802AB5D8: /* 802AB5D8 002A8518 88 0D 8D C8 */ lbz r0, lbl_80451348-_SDA_BASE_(r13) /* 802AB5DC 002A851C 7C 00 07 75 */ extsb. r0, r0 diff --git a/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h new file mode 100644 index 0000000000..ce6e15f700 --- /dev/null +++ b/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h @@ -0,0 +1,17 @@ +#ifndef __Z2SOUNDINFO_H__ +#define __Z2SOUNDINFO_H__ + +#include "JSystem/JAudio2/JAISound/JAISound.h" +#include "dolphin/types.h" + +class Z2SoundInfo { +public: + u32 getBgmSeqResourceID(JAISoundID) const; + u32 getCategory(void) const; + + u32 getSwBit(JAISoundID) const; +}; + +extern Z2SoundInfo* lbl_80450B4C; + +#endif
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s index 429c169466..c3a5a81106 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s @@ -19,7 +19,7 @@ lbl_802BB198: /* 802BB19C 002B80DC 90 01 00 30 */ stw r0, 0x30(r1) /* 802BB1A0 002B80E0 7F C3 F3 78 */ mr r3, r30 /* 802BB1A4 002B80E4 38 81 00 30 */ addi r4, r1, 0x30 -/* 802BB1A8 002B80E8 48 00 09 21 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB1A8 002B80E8 48 00 09 21 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB1AC 002B80EC 88 01 00 38 */ lbz r0, 0x38(r1) /* 802BB1B0 002B80F0 50 60 E6 36 */ rlwimi r0, r3, 0x1c, 0x18, 0x1b /* 802BB1B4 002B80F4 98 01 00 38 */ stb r0, 0x38(r1) @@ -27,7 +27,7 @@ lbl_802BB198: /* 802BB1BC 002B80FC 90 01 00 2C */ stw r0, 0x2c(r1) /* 802BB1C0 002B8100 7F C3 F3 78 */ mr r3, r30 /* 802BB1C4 002B8104 38 81 00 2C */ addi r4, r1, 0x2c -/* 802BB1C8 002B8108 48 00 09 01 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB1C8 002B8108 48 00 09 01 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB1CC 002B810C 54 60 07 FF */ clrlwi. r0, r3, 0x1f /* 802BB1D0 002B8110 41 82 00 18 */ beq lbl_802BB1E8 /* 802BB1D4 002B8114 38 60 00 00 */ li r3, 0 @@ -45,7 +45,7 @@ lbl_802BB1F8: /* 802BB1FC 002B813C 90 01 00 28 */ stw r0, 0x28(r1) /* 802BB200 002B8140 7F C3 F3 78 */ mr r3, r30 /* 802BB204 002B8144 38 81 00 28 */ addi r4, r1, 0x28 -/* 802BB208 002B8148 48 00 08 C1 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB208 002B8148 48 00 08 C1 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB20C 002B814C 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 802BB210 002B8150 41 82 00 18 */ beq lbl_802BB228 /* 802BB214 002B8154 38 60 00 00 */ li r3, 0 @@ -63,7 +63,7 @@ lbl_802BB238: /* 802BB23C 002B817C 90 01 00 24 */ stw r0, 0x24(r1) /* 802BB240 002B8180 7F C3 F3 78 */ mr r3, r30 /* 802BB244 002B8184 38 81 00 24 */ addi r4, r1, 0x24 -/* 802BB248 002B8188 48 00 08 81 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB248 002B8188 48 00 08 81 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB24C 002B818C 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d /* 802BB250 002B8190 41 82 00 18 */ beq lbl_802BB268 /* 802BB254 002B8194 38 60 00 00 */ li r3, 0 @@ -81,7 +81,7 @@ lbl_802BB278: /* 802BB27C 002B81BC 90 01 00 20 */ stw r0, 0x20(r1) /* 802BB280 002B81C0 7F C3 F3 78 */ mr r3, r30 /* 802BB284 002B81C4 38 81 00 20 */ addi r4, r1, 0x20 -/* 802BB288 002B81C8 48 00 08 41 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB288 002B81C8 48 00 08 41 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB28C 002B81CC 54 60 02 11 */ rlwinm. r0, r3, 0, 8, 8 /* 802BB290 002B81D0 41 82 00 18 */ beq lbl_802BB2A8 /* 802BB294 002B81D4 38 60 00 01 */ li r3, 1 @@ -99,7 +99,7 @@ lbl_802BB2B8: /* 802BB2BC 002B81FC 90 01 00 1C */ stw r0, 0x1c(r1) /* 802BB2C0 002B8200 7F C3 F3 78 */ mr r3, r30 /* 802BB2C4 002B8204 38 81 00 1C */ addi r4, r1, 0x1c -/* 802BB2C8 002B8208 48 00 08 01 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB2C8 002B8208 48 00 08 01 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB2CC 002B820C 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13 /* 802BB2D0 002B8210 41 82 00 18 */ beq lbl_802BB2E8 /* 802BB2D4 002B8214 38 60 00 00 */ li r3, 0 @@ -117,7 +117,7 @@ lbl_802BB2F8: /* 802BB2FC 002B823C 90 01 00 18 */ stw r0, 0x18(r1) /* 802BB300 002B8240 7F C3 F3 78 */ mr r3, r30 /* 802BB304 002B8244 38 81 00 18 */ addi r4, r1, 0x18 -/* 802BB308 002B8248 48 00 07 C1 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB308 002B8248 48 00 07 C1 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB30C 002B824C 54 60 04 A5 */ rlwinm. r0, r3, 0, 0x12, 0x12 /* 802BB310 002B8250 41 82 00 18 */ beq lbl_802BB328 /* 802BB314 002B8254 38 60 00 00 */ li r3, 0 @@ -136,7 +136,7 @@ lbl_802BB338: /* 802BB340 002B8280 90 01 00 14 */ stw r0, 0x14(r1) /* 802BB344 002B8284 7F C3 F3 78 */ mr r3, r30 /* 802BB348 002B8288 38 81 00 14 */ addi r4, r1, 0x14 -/* 802BB34C 002B828C 48 00 07 7D */ bl Z2SoundInfo_NS_getSwBit +/* 802BB34C 002B828C 48 00 07 7D */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB350 002B8290 54 60 03 19 */ rlwinm. r0, r3, 0, 0xc, 0xc /* 802BB354 002B8294 41 82 00 08 */ beq lbl_802BB35C /* 802BB358 002B8298 3B 80 00 08 */ li r28, 8 @@ -145,20 +145,20 @@ lbl_802BB35C: /* 802BB360 002B82A0 90 01 00 10 */ stw r0, 0x10(r1) /* 802BB364 002B82A4 7F C3 F3 78 */ mr r3, r30 /* 802BB368 002B82A8 38 81 00 10 */ addi r4, r1, 0x10 -/* 802BB36C 002B82AC 48 00 07 5D */ bl Z2SoundInfo_NS_getSwBit +/* 802BB36C 002B82AC 48 00 07 5D */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB370 002B82B0 54 7D 87 7E */ rlwinm r29, r3, 0x10, 0x1d, 0x1f /* 802BB374 002B82B4 80 1F 00 00 */ lwz r0, 0(r31) /* 802BB378 002B82B8 90 01 00 0C */ stw r0, 0xc(r1) /* 802BB37C 002B82BC 7F C3 F3 78 */ mr r3, r30 /* 802BB380 002B82C0 38 81 00 0C */ addi r4, r1, 0xc -/* 802BB384 002B82C4 48 00 07 45 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB384 002B82C4 48 00 07 45 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB388 002B82C8 54 60 86 76 */ rlwinm r0, r3, 0x10, 0x19, 0x1b /* 802BB38C 002B82CC 7F BD 02 14 */ add r29, r29, r0 /* 802BB390 002B82D0 80 1F 00 00 */ lwz r0, 0(r31) /* 802BB394 002B82D4 90 01 00 08 */ stw r0, 8(r1) /* 802BB398 002B82D8 7F C3 F3 78 */ mr r3, r30 /* 802BB39C 002B82DC 38 81 00 08 */ addi r4, r1, 8 -/* 802BB3A0 002B82E0 48 00 07 29 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB3A0 002B82E0 48 00 07 29 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB3A4 002B82E4 54 60 85 2E */ rlwinm r0, r3, 0x10, 0x14, 0x17 /* 802BB3A8 002B82E8 7F BD 02 14 */ add r29, r29, r0 /* 802BB3AC 002B82EC 88 01 00 39 */ lbz r0, 0x39(r1) diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s index d0c5eeb29f..dabda088a6 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s @@ -19,7 +19,7 @@ lbl_802BB488: /* 802BB48C 002B83CC 90 01 00 30 */ stw r0, 0x30(r1) /* 802BB490 002B83D0 7F C3 F3 78 */ mr r3, r30 /* 802BB494 002B83D4 38 81 00 30 */ addi r4, r1, 0x30 -/* 802BB498 002B83D8 48 00 06 31 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB498 002B83D8 48 00 06 31 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB49C 002B83DC 88 01 00 38 */ lbz r0, 0x38(r1) /* 802BB4A0 002B83E0 50 60 E6 36 */ rlwimi r0, r3, 0x1c, 0x18, 0x1b /* 802BB4A4 002B83E4 98 01 00 38 */ stb r0, 0x38(r1) @@ -27,7 +27,7 @@ lbl_802BB488: /* 802BB4AC 002B83EC 90 01 00 2C */ stw r0, 0x2c(r1) /* 802BB4B0 002B83F0 7F C3 F3 78 */ mr r3, r30 /* 802BB4B4 002B83F4 38 81 00 2C */ addi r4, r1, 0x2c -/* 802BB4B8 002B83F8 48 00 06 11 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB4B8 002B83F8 48 00 06 11 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB4BC 002B83FC 54 60 07 FF */ clrlwi. r0, r3, 0x1f /* 802BB4C0 002B8400 41 82 00 18 */ beq lbl_802BB4D8 /* 802BB4C4 002B8404 38 60 00 00 */ li r3, 0 @@ -45,7 +45,7 @@ lbl_802BB4E8: /* 802BB4EC 002B842C 90 01 00 28 */ stw r0, 0x28(r1) /* 802BB4F0 002B8430 7F C3 F3 78 */ mr r3, r30 /* 802BB4F4 002B8434 38 81 00 28 */ addi r4, r1, 0x28 -/* 802BB4F8 002B8438 48 00 05 D1 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB4F8 002B8438 48 00 05 D1 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB4FC 002B843C 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 802BB500 002B8440 41 82 00 18 */ beq lbl_802BB518 /* 802BB504 002B8444 38 60 00 00 */ li r3, 0 @@ -63,7 +63,7 @@ lbl_802BB528: /* 802BB52C 002B846C 90 01 00 24 */ stw r0, 0x24(r1) /* 802BB530 002B8470 7F C3 F3 78 */ mr r3, r30 /* 802BB534 002B8474 38 81 00 24 */ addi r4, r1, 0x24 -/* 802BB538 002B8478 48 00 05 91 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB538 002B8478 48 00 05 91 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB53C 002B847C 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d /* 802BB540 002B8480 41 82 00 18 */ beq lbl_802BB558 /* 802BB544 002B8484 38 60 00 00 */ li r3, 0 @@ -81,7 +81,7 @@ lbl_802BB568: /* 802BB56C 002B84AC 90 01 00 20 */ stw r0, 0x20(r1) /* 802BB570 002B84B0 7F C3 F3 78 */ mr r3, r30 /* 802BB574 002B84B4 38 81 00 20 */ addi r4, r1, 0x20 -/* 802BB578 002B84B8 48 00 05 51 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB578 002B84B8 48 00 05 51 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB57C 002B84BC 54 60 02 11 */ rlwinm. r0, r3, 0, 8, 8 /* 802BB580 002B84C0 41 82 00 18 */ beq lbl_802BB598 /* 802BB584 002B84C4 38 60 00 01 */ li r3, 1 @@ -99,7 +99,7 @@ lbl_802BB5A8: /* 802BB5AC 002B84EC 90 01 00 1C */ stw r0, 0x1c(r1) /* 802BB5B0 002B84F0 7F C3 F3 78 */ mr r3, r30 /* 802BB5B4 002B84F4 38 81 00 1C */ addi r4, r1, 0x1c -/* 802BB5B8 002B84F8 48 00 05 11 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB5B8 002B84F8 48 00 05 11 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB5BC 002B84FC 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13 /* 802BB5C0 002B8500 41 82 00 18 */ beq lbl_802BB5D8 /* 802BB5C4 002B8504 38 60 00 00 */ li r3, 0 @@ -117,7 +117,7 @@ lbl_802BB5E8: /* 802BB5EC 002B852C 90 01 00 18 */ stw r0, 0x18(r1) /* 802BB5F0 002B8530 7F C3 F3 78 */ mr r3, r30 /* 802BB5F4 002B8534 38 81 00 18 */ addi r4, r1, 0x18 -/* 802BB5F8 002B8538 48 00 04 D1 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB5F8 002B8538 48 00 04 D1 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB5FC 002B853C 54 60 04 A5 */ rlwinm. r0, r3, 0, 0x12, 0x12 /* 802BB600 002B8540 41 82 00 18 */ beq lbl_802BB618 /* 802BB604 002B8544 38 60 00 00 */ li r3, 0 @@ -136,7 +136,7 @@ lbl_802BB628: /* 802BB630 002B8570 90 01 00 14 */ stw r0, 0x14(r1) /* 802BB634 002B8574 7F C3 F3 78 */ mr r3, r30 /* 802BB638 002B8578 38 81 00 14 */ addi r4, r1, 0x14 -/* 802BB63C 002B857C 48 00 04 8D */ bl Z2SoundInfo_NS_getSwBit +/* 802BB63C 002B857C 48 00 04 8D */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB640 002B8580 54 60 03 19 */ rlwinm. r0, r3, 0, 0xc, 0xc /* 802BB644 002B8584 41 82 00 08 */ beq lbl_802BB64C /* 802BB648 002B8588 3B 80 00 08 */ li r28, 8 @@ -145,20 +145,20 @@ lbl_802BB64C: /* 802BB650 002B8590 90 01 00 10 */ stw r0, 0x10(r1) /* 802BB654 002B8594 7F C3 F3 78 */ mr r3, r30 /* 802BB658 002B8598 38 81 00 10 */ addi r4, r1, 0x10 -/* 802BB65C 002B859C 48 00 04 6D */ bl Z2SoundInfo_NS_getSwBit +/* 802BB65C 002B859C 48 00 04 6D */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB660 002B85A0 54 7D 87 7E */ rlwinm r29, r3, 0x10, 0x1d, 0x1f /* 802BB664 002B85A4 80 1F 00 00 */ lwz r0, 0(r31) /* 802BB668 002B85A8 90 01 00 0C */ stw r0, 0xc(r1) /* 802BB66C 002B85AC 7F C3 F3 78 */ mr r3, r30 /* 802BB670 002B85B0 38 81 00 0C */ addi r4, r1, 0xc -/* 802BB674 002B85B4 48 00 04 55 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB674 002B85B4 48 00 04 55 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB678 002B85B8 54 60 86 76 */ rlwinm r0, r3, 0x10, 0x19, 0x1b /* 802BB67C 002B85BC 7F BD 02 14 */ add r29, r29, r0 /* 802BB680 002B85C0 80 1F 00 00 */ lwz r0, 0(r31) /* 802BB684 002B85C4 90 01 00 08 */ stw r0, 8(r1) /* 802BB688 002B85C8 7F C3 F3 78 */ mr r3, r30 /* 802BB68C 002B85CC 38 81 00 08 */ addi r4, r1, 8 -/* 802BB690 002B85D0 48 00 04 39 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB690 002B85D0 48 00 04 39 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB694 002B85D4 54 60 85 2E */ rlwinm r0, r3, 0x10, 0x14, 0x17 /* 802BB698 002B85D8 7F BD 02 14 */ add r29, r29, r0 /* 802BB69C 002B85DC 88 01 00 39 */ lbz r0, 0x39(r1) diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s index ed1b9fe764..9e236bf9a3 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s @@ -43,7 +43,7 @@ lbl_802BB764: /* 802BB77C 002B86BC 90 01 00 0C */ stw r0, 0xc(r1) /* 802BB780 002B86C0 7F 63 DB 78 */ mr r3, r27 /* 802BB784 002B86C4 38 81 00 0C */ addi r4, r1, 0xc -/* 802BB788 002B86C8 48 00 03 41 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB788 002B86C8 48 00 03 41 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB78C 002B86CC 54 7F E7 3E */ rlwinm r31, r3, 0x1c, 0x1c, 0x1f /* 802BB790 002B86D0 28 1F 00 08 */ cmplwi r31, 8 /* 802BB794 002B86D4 40 81 00 58 */ ble lbl_802BB7EC @@ -87,7 +87,7 @@ lbl_802BB820: /* 802BB824 002B8764 90 01 00 08 */ stw r0, 8(r1) /* 802BB828 002B8768 7F 63 DB 78 */ mr r3, r27 /* 802BB82C 002B876C 38 81 00 08 */ addi r4, r1, 8 -/* 802BB830 002B8770 48 00 02 99 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB830 002B8770 48 00 02 99 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB834 002B8774 54 7E 27 3F */ rlwinm. r30, r3, 4, 0x1c, 0x1f /* 802BB838 002B8778 41 82 00 5C */ beq lbl_802BB894 /* 802BB83C 002B877C 4B FE E0 99 */ bl getRandom_0_1__6Z2CalcFv diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCBC.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCBC.s index 8e1933886e..919de28fec 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCBC.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCBC.s @@ -1,3 +1,3 @@ /* 802BBCBC 002B8BFC 38 63 FF FC */ addi r3, r3, -4 /*.global Z2SoundInfo_NS_getBgmSeqResourceID*/ -/* 802BBCC0 002B8C00 4B FF F3 4C */ b Z2SoundInfo_NS_getBgmSeqResourceID
\ No newline at end of file +/* 802BBCC0 002B8C00 4B FF F3 4C */ b getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s index 4837d9c5a6..a978ef225e 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s @@ -30,7 +30,7 @@ lbl_802A9F50: /* 802A9F54 002A6E94 90 01 00 20 */ stw r0, 0x20(r1) /* 802A9F58 002A6E98 80 6D 85 CC */ lwz r3, lbl_80450B4C-_SDA_BASE_(r13) /* 802A9F5C 002A6E9C 38 81 00 20 */ addi r4, r1, 0x20 -/* 802A9F60 002A6EA0 48 01 1B 69 */ bl Z2SoundInfo_NS_getSwBit +/* 802A9F60 002A6EA0 48 01 1B 69 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802A9F64 002A6EA4 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c /* 802A9F68 002A6EA8 41 82 00 4C */ beq lbl_802A9FB4 /* 802A9F6C 002A6EAC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) diff --git a/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h new file mode 100644 index 0000000000..92fcb6dd07 --- /dev/null +++ b/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h @@ -0,0 +1,42 @@ +#ifndef Z2SOUNDOBJMGR_H_ +#define Z2SOUNDOBJMGR_H_ + +#include "JSystem/JSupport/JSUList/JSUList.h" +#include "Z2AudioLib/Z2Creature/Z2Creature.h" +#include "dolphin/types.h" + +class Z2SoundObjMgr : protected JSUList<Z2CreatureEnemy> { +public: + Z2SoundObjMgr(); + + void setBattleInit(); + void setForceBattleArea(bool, u16, u16, u16); + void setGhostEnemyState(u8); + + void deleteEnemyAll(); + + bool isTwilightBattle(); + bool isForceBattle() { return mForceBattle; } + +private: + u8 unk0[2]; + + u16 field_0xe; + u16 field_0x10; + u16 field_0x12; + u8 field_0x14; + u8 field_0x15; + u8 field_0x16; + u8 field_0x17; + u8 field_0x18; + u8 field_0x19; + bool field_0x1a; + bool mTwilightBattle; + bool mForceBattle; + + u8 unk1[3]; +}; + +extern Z2SoundObjMgr* lbl_80450B48; // Z2SoundObjMgr sInstance + +#endif // Z2SOUNDOBJMGR_H_
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF920.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF920.s index 4186292d0c..a528b490fa 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF920.s +++ b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF920.s @@ -9,13 +9,13 @@ /* 802BF940 002BC880 98 1F 00 19 */ stb r0, 0x19(r31) /* 802BF944 002BC884 98 1F 00 1B */ stb r0, 0x1b(r31) /* 802BF948 002BC888 7F E3 FB 78 */ mr r3, r31 -/* 802BF94C 002BC88C 48 00 07 B5 */ bl Z2SoundObjMgr_NS_setBattleInit +/* 802BF94C 002BC88C 48 00 07 B5 */ bl setBattleInit__13Z2SoundObjMgrFv /* 802BF950 002BC890 7F E3 FB 78 */ mr r3, r31 /* 802BF954 002BC894 38 80 00 00 */ li r4, 0 /* 802BF958 002BC898 38 A0 02 BC */ li r5, 0x2bc /* 802BF95C 002BC89C 38 C0 04 4C */ li r6, 0x44c /* 802BF960 002BC8A0 38 E0 05 DC */ li r7, 0x5dc -/* 802BF964 002BC8A4 48 00 00 1D */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802BF964 002BC8A4 48 00 00 1D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802BF968 002BC8A8 7F E3 FB 78 */ mr r3, r31 /* 802BF96C 002BC8AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802BF970 002BC8B0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s index bdbddc0918..ca5cbf84a8 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s +++ b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s @@ -335,12 +335,12 @@ lbl_802BFE44: /* 802BFE64 002BCDA4 41 80 00 14 */ blt lbl_802BFE78 /* 802BFE68 002BCDA8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BFE6C 002BCDAC 38 80 00 00 */ li r4, 0 -/* 802BFE70 002BCDB0 4B FF 45 71 */ bl Z2SeqMgr_NS_setBattleGhostMute +/* 802BFE70 002BCDB0 4B FF 45 71 */ bl setBattleGhostMute__8Z2SeqMgrFb /* 802BFE74 002BCDB4 48 00 00 34 */ b lbl_802BFEA8 lbl_802BFE78: /* 802BFE78 002BCDB8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BFE7C 002BCDBC 38 80 00 01 */ li r4, 1 -/* 802BFE80 002BCDC0 4B FF 45 61 */ bl Z2SeqMgr_NS_setBattleGhostMute +/* 802BFE80 002BCDC0 4B FF 45 61 */ bl setBattleGhostMute__8Z2SeqMgrFb /* 802BFE84 002BCDC4 48 00 00 24 */ b lbl_802BFEA8 lbl_802BFE88: /* 802BFE88 002BCDC8 28 00 00 20 */ cmplwi r0, 0x20 @@ -350,7 +350,7 @@ lbl_802BFE88: /* 802BFE98 002BCDD8 40 82 00 10 */ bne lbl_802BFEA8 /* 802BFE9C 002BCDDC 7E E3 BB 78 */ mr r3, r23 /* 802BFEA0 002BCDE0 38 80 00 00 */ li r4, 0 -/* 802BFEA4 002BCDE4 48 00 01 49 */ bl Z2SoundObjMgr_NS_setGhostEnemyState +/* 802BFEA4 002BCDE4 48 00 01 49 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc lbl_802BFEA8: /* 802BFEA8 002BCDE8 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 802BFEAC 002BCDEC 28 00 00 01 */ cmplwi r0, 1 diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BFFEC.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BFFEC.s deleted file mode 100644 index 6d17f02b1f..0000000000 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BFFEC.s +++ /dev/null @@ -1,37 +0,0 @@ -/* 802BFFEC 002BCF2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BFFF0 002BCF30 7C 08 02 A6 */ mflr r0 -/* 802BFFF4 002BCF34 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BFFF8 002BCF38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BFFFC 002BCF3C 93 C1 00 08 */ stw r30, 8(r1) -/* 802C0000 002BCF40 7C 7E 1B 78 */ mr r30, r3 -/* 802C0004 002BCF44 7C 9F 23 78 */ mr r31, r4 -/* 802C0008 002BCF48 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802C000C 002BCF4C 28 00 00 20 */ cmplwi r0, 0x20 -/* 802C0010 002BCF50 40 82 00 24 */ bne lbl_802C0034 -/* 802C0014 002BCF54 88 7E 00 1A */ lbz r3, 0x1a(r30) -/* 802C0018 002BCF58 88 1E 00 16 */ lbz r0, 0x16(r30) -/* 802C001C 002BCF5C 7C 03 00 40 */ cmplw r3, r0 -/* 802C0020 002BCF60 41 80 00 2C */ blt lbl_802C004C -/* 802C0024 002BCF64 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) -/* 802C0028 002BCF68 38 80 00 01 */ li r4, 1 -/* 802C002C 002BCF6C 4B FF 43 B5 */ bl Z2SeqMgr_NS_setBattleGhostMute -/* 802C0030 002BCF70 48 00 00 1C */ b lbl_802C004C -lbl_802C0034: -/* 802C0034 002BCF74 88 1E 00 1A */ lbz r0, 0x1a(r30) -/* 802C0038 002BCF78 28 00 00 00 */ cmplwi r0, 0 -/* 802C003C 002BCF7C 40 82 00 10 */ bne lbl_802C004C -/* 802C0040 002BCF80 38 00 00 00 */ li r0, 0 -/* 802C0044 002BCF84 98 1E 00 19 */ stb r0, 0x19(r30) -/* 802C0048 002BCF88 48 00 00 14 */ b lbl_802C005C -lbl_802C004C: -/* 802C004C 002BCF8C 88 1E 00 19 */ lbz r0, 0x19(r30) -/* 802C0050 002BCF90 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 802C0054 002BCF94 7C 1F 02 14 */ add r0, r31, r0 -/* 802C0058 002BCF98 98 1E 00 19 */ stb r0, 0x19(r30) -lbl_802C005C: -/* 802C005C 002BCF9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0060 002BCFA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802C0064 002BCFA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0068 002BCFA8 7C 08 03 A6 */ mtlr r0 -/* 802C006C 002BCFAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0070 002BCFB0 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C013C.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C013C.s deleted file mode 100644 index baf69e5f35..0000000000 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C013C.s +++ /dev/null @@ -1,23 +0,0 @@ -/* 802C013C 002BD07C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0140 002BD080 7C 08 02 A6 */ mflr r0 -/* 802C0144 002BD084 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0148 002BD088 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C014C 002BD08C 7C 7F 1B 78 */ mr r31, r3 -/* 802C0150 002BD090 48 00 00 20 */ b lbl_802C0170 -lbl_802C0154: -/* 802C0154 002BD094 80 63 00 00 */ lwz r3, 0(r3) -/* 802C0158 002BD098 28 03 00 00 */ cmplwi r3, 0 -/* 802C015C 002BD09C 41 82 00 14 */ beq lbl_802C0170 -/* 802C0160 002BD0A0 81 83 00 00 */ lwz r12, 0(r3) -/* 802C0164 002BD0A4 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C0168 002BD0A8 7D 89 03 A6 */ mtctr r12 -/* 802C016C 002BD0AC 4E 80 04 21 */ bctrl -lbl_802C0170: -/* 802C0170 002BD0B0 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C0174 002BD0B4 28 03 00 00 */ cmplwi r3, 0 -/* 802C0178 002BD0B8 40 82 FF DC */ bne lbl_802C0154 -/* 802C017C 002BD0BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0180 002BD0C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0184 002BD0C4 7C 08 03 A6 */ mtlr r0 -/* 802C0188 002BD0C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C018C 002BD0CC 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C01E4.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C01E4.s deleted file mode 100644 index dc31ea10af..0000000000 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C01E4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 802C01E4 002BD124 88 63 00 1B */ lbz r3, 0x1b(r3) -/* 802C01E8 002BD128 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h new file mode 100644 index 0000000000..f7aed0b1e1 --- /dev/null +++ b/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h @@ -0,0 +1,50 @@ +#ifndef __Z2SOUNDOBJECT_H__ +#define __Z2SOUNDOBJECT_H__ + +#include "JSystem/JGeometry/JGeometry.h" +#include "Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h" +#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" +#include "global.h" + +/* struct Z2SoundObjBase_vtable { + void* field_0x0; + void* field_0x4; + void* framework; + void* dispose; + void* stopOK; + void* init; + void* startSound; + void* startLevelSound; +}; + */ + +class Z2SoundObjBase : protected Z2SoundHandles { +public: + Z2SoundObjBase(); + ~Z2SoundObjBase(); + + void deleteObject(); + + bool isAlive() const { return mIsInitialized; } + + virtual void framework(u32, s8); + virtual void dispose(); + virtual bool stopOK(Z2SoundHandlePool& pool); + virtual void init(Vec* pSoundPos, u8 pNumHandles); + + // Z2SoundObjBase_vtable* vtable; + Z2SoundStarter* mSoundStarter; + Vec* mSoundPos; + u16 field_0x1c; + u8 field_0x1e; + bool mIsInitialized; +}; + +class Z2SoundObjSimple : protected Z2SoundHandles { +public: + virtual void init(Vec* pSoundPos, u8 pNumHandles); +}; + +class Z2DopplerSoundObjBase : protected Z2SoundHandles {}; + +#endif
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDEF0.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BDEF0.s deleted file mode 100644 index baed7b864e..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDEF0.s +++ /dev/null @@ -1,22 +0,0 @@ -/* 802BDEF0 002BAE30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDEF4 002BAE34 7C 08 02 A6 */ mflr r0 -/* 802BDEF8 002BAE38 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BDEFC 002BAE3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BDF00 002BAE40 7C 7F 1B 78 */ mr r31, r3 -/* 802BDF04 002BAE44 4B FE D1 79 */ bl Z2SoundHandles -/* 802BDF08 002BAE48 3C 60 80 3D */ lis r3, lbl_803CAD50@ha -/* 802BDF0C 002BAE4C 38 03 AD 50 */ addi r0, r3, lbl_803CAD50@l -/* 802BDF10 002BAE50 90 1F 00 10 */ stw r0, 0x10(r31) -/* 802BDF14 002BAE54 38 60 00 00 */ li r3, 0 -/* 802BDF18 002BAE58 90 7F 00 18 */ stw r3, 0x18(r31) -/* 802BDF1C 002BAE5C 98 7F 00 1F */ stb r3, 0x1f(r31) -/* 802BDF20 002BAE60 80 0D 85 F4 */ lwz r0, lbl_80450B74-_SDA_BASE_(r13) -/* 802BDF24 002BAE64 90 1F 00 14 */ stw r0, 0x14(r31) -/* 802BDF28 002BAE68 B0 7F 00 1C */ sth r3, 0x1c(r31) -/* 802BDF2C 002BAE6C 98 7F 00 1E */ stb r3, 0x1e(r31) -/* 802BDF30 002BAE70 7F E3 FB 78 */ mr r3, r31 -/* 802BDF34 002BAE74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BDF38 002BAE78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BDF3C 002BAE7C 7C 08 03 A6 */ mtlr r0 -/* 802BDF40 002BAE80 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDF44 002BAE84 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDF48.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BDF48.s deleted file mode 100644 index 02eb64a46f..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDF48.s +++ /dev/null @@ -1,27 +0,0 @@ -/* 802BDF48 002BAE88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDF4C 002BAE8C 7C 08 02 A6 */ mflr r0 -/* 802BDF50 002BAE90 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BDF54 002BAE94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BDF58 002BAE98 93 C1 00 08 */ stw r30, 8(r1) -/* 802BDF5C 002BAE9C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802BDF60 002BAEA0 7C 9F 23 78 */ mr r31, r4 -/* 802BDF64 002BAEA4 41 82 00 30 */ beq lbl_802BDF94 -/* 802BDF68 002BAEA8 3C 80 80 3D */ lis r4, lbl_803CAD50@ha -/* 802BDF6C 002BAEAC 38 04 AD 50 */ addi r0, r4, lbl_803CAD50@l -/* 802BDF70 002BAEB0 90 1E 00 10 */ stw r0, 0x10(r30) -/* 802BDF74 002BAEB4 48 00 00 85 */ bl Z2SoundObjBase_NS_deleteObject -/* 802BDF78 002BAEB8 7F C3 F3 78 */ mr r3, r30 -/* 802BDF7C 002BAEBC 38 80 00 00 */ li r4, 0 -/* 802BDF80 002BAEC0 4B FE D1 35 */ bl Z2SoundHandles_NS_dtor -/* 802BDF84 002BAEC4 7F E0 07 35 */ extsh. r0, r31 -/* 802BDF88 002BAEC8 40 81 00 0C */ ble lbl_802BDF94 -/* 802BDF8C 002BAECC 7F C3 F3 78 */ mr r3, r30 -/* 802BDF90 002BAED0 48 01 0D AD */ bl __dl__FPv -lbl_802BDF94: -/* 802BDF94 002BAED4 7F C3 F3 78 */ mr r3, r30 -/* 802BDF98 002BAED8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BDF9C 002BAEDC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802BDFA0 002BAEE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BDFA4 002BAEE4 7C 08 03 A6 */ mtlr r0 -/* 802BDFA8 002BAEE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDFAC 002BAEEC 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFB0.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFB0.s deleted file mode 100644 index 46b389d23e..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFB0.s +++ /dev/null @@ -1,18 +0,0 @@ -/* 802BDFB0 002BAEF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDFB4 002BAEF4 7C 08 02 A6 */ mflr r0 -/* 802BDFB8 002BAEF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BDFBC 002BAEFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BDFC0 002BAF00 93 C1 00 08 */ stw r30, 8(r1) -/* 802BDFC4 002BAF04 7C 7E 1B 78 */ mr r30, r3 -/* 802BDFC8 002BAF08 7C 9F 23 78 */ mr r31, r4 -/* 802BDFCC 002BAF0C 7C A4 2B 78 */ mr r4, r5 -/* 802BDFD0 002BAF10 4B FE D1 49 */ bl Z2SoundHandles_NS_initHandlesPool -/* 802BDFD4 002BAF14 93 FE 00 18 */ stw r31, 0x18(r30) -/* 802BDFD8 002BAF18 38 00 00 01 */ li r0, 1 -/* 802BDFDC 002BAF1C 98 1E 00 1F */ stb r0, 0x1f(r30) -/* 802BDFE0 002BAF20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BDFE4 002BAF24 83 C1 00 08 */ lwz r30, 8(r1) -/* 802BDFE8 002BAF28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BDFEC 002BAF2C 7C 08 03 A6 */ mtlr r0 -/* 802BDFF0 002BAF30 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDFF4 002BAF34 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFF8.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFF8.s deleted file mode 100644 index 2e6600380a..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFF8.s +++ /dev/null @@ -1,16 +0,0 @@ -/* 802BDFF8 002BAF38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDFFC 002BAF3C 7C 08 02 A6 */ mflr r0 -/* 802BE000 002BAF40 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BE004 002BAF44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BE008 002BAF48 7C 7F 1B 78 */ mr r31, r3 -/* 802BE00C 002BAF4C 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802BE010 002BAF50 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802BE014 002BAF54 7D 89 03 A6 */ mtctr r12 -/* 802BE018 002BAF58 4E 80 04 21 */ bctrl -/* 802BE01C 002BAF5C 7F E3 FB 78 */ mr r3, r31 -/* 802BE020 002BAF60 4B FE D1 01 */ bl Z2SoundHandles_NS_deleteHandlesPool -/* 802BE024 002BAF64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BE028 002BAF68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BE02C 002BAF6C 7C 08 03 A6 */ mtlr r0 -/* 802BE030 002BAF70 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE034 002BAF74 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE038.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE038.s deleted file mode 100644 index 53d62b8b39..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE038.s +++ /dev/null @@ -1,15 +0,0 @@ -/* 802BE038 002BAF78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BE03C 002BAF7C 7C 08 02 A6 */ mflr r0 -/* 802BE040 002BAF80 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BE044 002BAF84 88 03 00 1F */ lbz r0, 0x1f(r3) -/* 802BE048 002BAF88 28 00 00 00 */ cmplwi r0, 0 -/* 802BE04C 002BAF8C 41 82 00 14 */ beq lbl_802BE060 -/* 802BE050 002BAF90 B0 83 00 1C */ sth r4, 0x1c(r3) -/* 802BE054 002BAF94 98 A3 00 1E */ stb r5, 0x1e(r3) -/* 802BE058 002BAF98 80 83 00 18 */ lwz r4, 0x18(r3) -/* 802BE05C 002BAF9C 4B FE D4 DD */ bl Z2SoundHandles_NS_setPos -lbl_802BE060: -/* 802BE060 002BAFA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BE064 002BAFA4 7C 08 03 A6 */ mtlr r0 -/* 802BE068 002BAFA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE06C 002BAFAC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE070.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE070.s deleted file mode 100644 index 51aea37173..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE070.s +++ /dev/null @@ -1,41 +0,0 @@ -/* 802BE070 002BAFB0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802BE074 002BAFB4 7C 08 02 A6 */ mflr r0 -/* 802BE078 002BAFB8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802BE07C 002BAFBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE080 002BAFC0 48 0A 41 5D */ bl _savegpr_29 -/* 802BE084 002BAFC4 7C 7D 1B 78 */ mr r29, r3 -/* 802BE088 002BAFC8 83 C3 00 00 */ lwz r30, 0(r3) -/* 802BE08C 002BAFCC 48 00 00 50 */ b lbl_802BE0DC -lbl_802BE090: -/* 802BE090 002BAFD0 83 FE 00 00 */ lwz r31, 0(r30) -/* 802BE094 002BAFD4 28 1F 00 00 */ cmplwi r31, 0 -/* 802BE098 002BAFD8 41 82 00 40 */ beq lbl_802BE0D8 -/* 802BE09C 002BAFDC 80 7F 00 00 */ lwz r3, 0(r31) -/* 802BE0A0 002BAFE0 28 03 00 00 */ cmplwi r3, 0 -/* 802BE0A4 002BAFE4 41 82 00 34 */ beq lbl_802BE0D8 -/* 802BE0A8 002BAFE8 80 03 00 18 */ lwz r0, 0x18(r3) -/* 802BE0AC 002BAFEC 90 01 00 08 */ stw r0, 8(r1) -/* 802BE0B0 002BAFF0 80 6D 85 CC */ lwz r3, lbl_80450B4C-_SDA_BASE_(r13) -/* 802BE0B4 002BAFF4 38 81 00 08 */ addi r4, r1, 8 -/* 802BE0B8 002BAFF8 4B FF DA 11 */ bl Z2SoundInfo_NS_getSwBit -/* 802BE0BC 002BAFFC 54 60 04 21 */ rlwinm. r0, r3, 0, 0x10, 0x10 -/* 802BE0C0 002BB000 41 82 00 10 */ beq lbl_802BE0D0 -/* 802BE0C4 002BB004 7F E3 FB 78 */ mr r3, r31 -/* 802BE0C8 002BB008 4B FE 40 BD */ bl JAISoundHandle_NS_releaseSound -/* 802BE0CC 002BB00C 48 00 00 0C */ b lbl_802BE0D8 -lbl_802BE0D0: -/* 802BE0D0 002BB010 80 7F 00 00 */ lwz r3, 0(r31) -/* 802BE0D4 002BB014 4B FE 44 C5 */ bl JAISound_NS_stop_X1_ -lbl_802BE0D8: -/* 802BE0D8 002BB018 83 DE 00 0C */ lwz r30, 0xc(r30) -lbl_802BE0DC: -/* 802BE0DC 002BB01C 28 1E 00 00 */ cmplwi r30, 0 -/* 802BE0E0 002BB020 40 82 FF B0 */ bne lbl_802BE090 -/* 802BE0E4 002BB024 38 00 00 00 */ li r0, 0 -/* 802BE0E8 002BB028 98 1D 00 1F */ stb r0, 0x1f(r29) -/* 802BE0EC 002BB02C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE0F0 002BB030 48 0A 41 39 */ bl _restgpr_29 -/* 802BE0F4 002BB034 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802BE0F8 002BB038 7C 08 03 A6 */ mtlr r0 -/* 802BE0FC 002BB03C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BE100 002BB040 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE104.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE104.s deleted file mode 100644 index b688dabe46..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE104.s +++ /dev/null @@ -1,16 +0,0 @@ -/* 802BE104 002BB044 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BE108 002BB048 7C 08 02 A6 */ mflr r0 -/* 802BE10C 002BB04C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BE110 002BB050 80 64 00 00 */ lwz r3, 0(r4) -/* 802BE114 002BB054 80 03 00 18 */ lwz r0, 0x18(r3) -/* 802BE118 002BB058 90 01 00 08 */ stw r0, 8(r1) -/* 802BE11C 002BB05C 80 6D 85 CC */ lwz r3, lbl_80450B4C-_SDA_BASE_(r13) -/* 802BE120 002BB060 38 81 00 08 */ addi r4, r1, 8 -/* 802BE124 002BB064 4B FF D9 A5 */ bl Z2SoundInfo_NS_getSwBit -/* 802BE128 002BB068 54 60 04 20 */ rlwinm r0, r3, 0, 0x10, 0x10 -/* 802BE12C 002BB06C 7C 00 00 34 */ cntlzw r0, r0 -/* 802BE130 002BB070 54 03 D9 7E */ srwi r3, r0, 5 -/* 802BE134 002BB074 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BE138 002BB078 7C 08 03 A6 */ mtlr r0 -/* 802BE13C 002BB07C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE140 002BB080 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s index 8e4e980417..635ebce812 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s @@ -47,14 +47,14 @@ lbl_802BE1C0: /* 802BE1EC 002BB12C 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE1F0 002BB130 7F A3 EB 78 */ mr r3, r29 /* 802BE1F4 002BB134 38 81 00 14 */ addi r4, r1, 0x14 -/* 802BE1F8 002BB138 4B FE D0 5D */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802BE1F8 002BB138 4B FE D0 5D */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802BE1FC 002BB13C 7C 7C 1B 79 */ or. r28, r3, r3 /* 802BE200 002BB140 41 82 00 30 */ beq lbl_802BE230 /* 802BE204 002BB144 80 1E 00 00 */ lwz r0, 0(r30) /* 802BE208 002BB148 90 01 00 10 */ stw r0, 0x10(r1) /* 802BE20C 002BB14C 80 6D 85 CC */ lwz r3, lbl_80450B4C-_SDA_BASE_(r13) /* 802BE210 002BB150 38 81 00 10 */ addi r4, r1, 0x10 -/* 802BE214 002BB154 4B FF D8 B5 */ bl Z2SoundInfo_NS_getSwBit +/* 802BE214 002BB154 4B FF D8 B5 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BE218 002BB158 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 /* 802BE21C 002BB15C 41 82 00 0C */ beq lbl_802BE228 /* 802BE220 002BB160 3B 80 00 00 */ li r28, 0 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s index fd6b845867..be10d18613 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s @@ -36,7 +36,7 @@ lbl_802BE328: /* 802BE354 002BB294 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE358 002BB298 7F C3 F3 78 */ mr r3, r30 /* 802BE35C 002BB29C 38 81 00 14 */ addi r4, r1, 0x14 -/* 802BE360 002BB2A0 4B FE CE F5 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802BE360 002BB2A0 4B FE CE F5 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802BE364 002BB2A4 7C 7D 1B 79 */ or. r29, r3, r3 /* 802BE368 002BB2A8 41 82 00 4C */ beq lbl_802BE3B4 /* 802BE36C 002BB2AC 80 7D 00 00 */ lwz r3, 0(r29) @@ -51,7 +51,7 @@ lbl_802BE384: /* 802BE38C 002BB2CC 38 A0 00 06 */ li r5, 6 /* 802BE390 002BB2D0 57 E6 04 3E */ clrlwi r6, r31, 0x10 /* 802BE394 002BB2D4 38 E0 FF FF */ li r7, -1 -/* 802BE398 002BB2D8 4B FE CB 45 */ bl Z2SoundStarter_NS_setPortData +/* 802BE398 002BB2D8 4B FE CB 45 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802BE39C 002BB2DC 80 7D 00 00 */ lwz r3, 0(r29) /* 802BE3A0 002BB2E0 38 63 00 48 */ addi r3, r3, 0x48 /* 802BE3A4 002BB2E4 FC 20 F8 90 */ fmr f1, f31 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s index a13ee5895f..3bbcf698b8 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s @@ -30,7 +30,7 @@ lbl_802BE4F4: /* 802BE50C 002BB44C 7C 1E 00 40 */ cmplw r30, r0 /* 802BE510 002BB450 40 82 00 0C */ bne lbl_802BE51C /* 802BE514 002BB454 38 63 00 10 */ addi r3, r3, 0x10 -/* 802BE518 002BB458 4B FE 40 81 */ bl JAISound_NS_stop_X1_ +/* 802BE518 002BB458 4B FE 40 81 */ bl stop__8JAISoundFv lbl_802BE51C: /* 802BE51C 002BB45C 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802BE520: diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5A0.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5A0.s index 0e1a3444f2..e338c14a3c 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5A0.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5A0.s @@ -3,7 +3,7 @@ /* 802BE5A8 002BB4E8 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE5AC 002BB4EC 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BE5B0 002BB4F0 7C 7F 1B 78 */ mr r31, r3 -/* 802BE5B4 002BB4F4 4B FF F9 3D */ bl Z2SoundObjBase_NS_ctor +/* 802BE5B4 002BB4F4 4B FF F9 3D */ bl __ct__14Z2SoundObjBaseFv /* 802BE5B8 002BB4F8 3C 60 80 3D */ lis r3, lbl_803CAD30@ha /* 802BE5BC 002BB4FC 38 03 AD 30 */ addi r0, r3, lbl_803CAD30@l /* 802BE5C0 002BB500 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5FC.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5FC.s index 0167fd928f..87cd23acc1 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5FC.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5FC.s @@ -10,7 +10,7 @@ /* 802BE620 002BB560 38 04 AD 30 */ addi r0, r4, lbl_803CAD30@l /* 802BE624 002BB564 90 1E 00 10 */ stw r0, 0x10(r30) /* 802BE628 002BB568 38 80 00 00 */ li r4, 0 -/* 802BE62C 002BB56C 4B FF F9 1D */ bl Z2SoundObjBase_NS_dtor +/* 802BE62C 002BB56C 4B FF F9 1D */ bl __dt__14Z2SoundObjBaseFv /* 802BE630 002BB570 7F E0 07 35 */ extsh. r0, r31 /* 802BE634 002BB574 40 81 00 0C */ ble lbl_802BE640 /* 802BE638 002BB578 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s index e95d5ad530..227b87c2df 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s @@ -3,7 +3,7 @@ /* 802BE664 002BB5A4 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE668 002BB5A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BE66C 002BB5AC 7C 7F 1B 78 */ mr r31, r3 -/* 802BE670 002BB5B0 4B FF F9 41 */ bl Z2SoundObjBase_NS_init +/* 802BE670 002BB5B0 4B FF F9 41 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802BE674 002BB5B4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 802BE678 002BB5B8 28 03 00 00 */ cmplwi r3, 0 /* 802BE67C 002BB5BC 41 82 00 28 */ beq lbl_802BE6A4 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE6B8.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE6B8.s index 08f0f6ff4a..5b885aeb76 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE6B8.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE6B8.s @@ -3,7 +3,7 @@ /* 802BE6C0 002BB600 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE6C4 002BB604 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BE6C8 002BB608 7C 7F 1B 78 */ mr r31, r3 -/* 802BE6CC 002BB60C 4B FF F9 6D */ bl Z2SoundObjBase_NS_framework +/* 802BE6CC 002BB60C 4B FF F9 6D */ bl framework__14Z2SoundObjBaseFUlSc /* 802BE6D0 002BB610 80 1F 00 18 */ lwz r0, 0x18(r31) /* 802BE6D4 002BB614 28 00 00 00 */ cmplwi r0, 0 /* 802BE6D8 002BB618 41 82 00 28 */ beq lbl_802BE700 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE844.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE844.s index 8656f708be..21f26d05bb 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE844.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE844.s @@ -3,7 +3,7 @@ /* 802BE84C 002BB78C 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE850 002BB790 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BE854 002BB794 7C 7F 1B 78 */ mr r31, r3 -/* 802BE858 002BB798 4B FF F6 99 */ bl Z2SoundObjBase_NS_ctor +/* 802BE858 002BB798 4B FF F6 99 */ bl __ct__14Z2SoundObjBaseFv /* 802BE85C 002BB79C 3C 60 80 3D */ lis r3, lbl_803CAD10@ha /* 802BE860 002BB7A0 38 03 AD 10 */ addi r0, r3, lbl_803CAD10@l /* 802BE864 002BB7A4 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE880.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE880.s index 7b97d73e5c..0e15d5a9b0 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE880.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE880.s @@ -1,7 +1,7 @@ /* 802BE880 002BB7C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802BE884 002BB7C4 7C 08 02 A6 */ mflr r0 /* 802BE888 002BB7C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BE88C 002BB7CC 4B FF F7 25 */ bl Z2SoundObjBase_NS_init +/* 802BE88C 002BB7CC 4B FF F7 25 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802BE890 002BB7D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BE894 002BB7D4 7C 08 03 A6 */ mtlr r0 /* 802BE898 002BB7D8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB74.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB74.s index d988f9d0a8..438f986db1 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB74.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB74.s @@ -1,7 +1,7 @@ /* 802BEB74 002BBAB4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802BEB78 002BBAB8 7C 08 02 A6 */ mflr r0 /* 802BEB7C 002BBABC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BEB80 002BBAC0 4B FF F4 31 */ bl Z2SoundObjBase_NS_init +/* 802BEB80 002BBAC0 4B FF F4 31 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802BEB84 002BBAC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BEB88 002BBAC8 7C 08 03 A6 */ mtlr r0 /* 802BEB8C 002BBACC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB94.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB94.s index 6bc068f6ad..fb81b52674 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB94.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB94.s @@ -3,7 +3,7 @@ /* 802BEB9C 002BBADC 90 01 00 14 */ stw r0, 0x14(r1) /* 802BEBA0 002BBAE0 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BEBA4 002BBAE4 7C 7F 1B 78 */ mr r31, r3 -/* 802BEBA8 002BBAE8 4B FF F3 49 */ bl Z2SoundObjBase_NS_ctor +/* 802BEBA8 002BBAE8 4B FF F3 49 */ bl __ct__14Z2SoundObjBaseFv /* 802BEBAC 002BBAEC 3C 60 80 3D */ lis r3, lbl_803CACD0@ha /* 802BEBB0 002BBAF0 38 03 AC D0 */ addi r0, r3, lbl_803CACD0@l /* 802BEBB4 002BBAF4 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBDC.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBDC.s index 17dd6840bc..e5399a6878 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBDC.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBDC.s @@ -1,7 +1,7 @@ /* 802BEBDC 002BBB1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802BEBE0 002BBB20 7C 08 02 A6 */ mflr r0 /* 802BEBE4 002BBB24 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BEBE8 002BBB28 4B FF F3 C9 */ bl Z2SoundObjBase_NS_init +/* 802BEBE8 002BBB28 4B FF F3 C9 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802BEBEC 002BBB2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BEBF0 002BBB30 7C 08 03 A6 */ mtlr r0 /* 802BEBF4 002BBB34 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BED68.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BED68.s index 7827e38829..a4874a3bc0 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BED68.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BED68.s @@ -52,7 +52,7 @@ lbl_802BEDFC: /* 802BEE20 002BBD60 38 63 FF FC */ addi r3, r3, -4 lbl_802BEE24: /* 802BEE24 002BBD64 80 63 00 00 */ lwz r3, 0(r3) -/* 802BEE28 002BBD68 4B FE 37 71 */ bl JAISound_NS_stop_X1_ +/* 802BEE28 002BBD68 4B FE 37 71 */ bl stop__8JAISoundFv /* 802BEE2C 002BBD6C 48 00 00 80 */ b lbl_802BEEAC lbl_802BEE30: /* 802BEE30 002BBD70 7F E3 FB 78 */ mr r3, r31 @@ -75,7 +75,7 @@ lbl_802BEE48: /* 802BEE70 002BBDB0 38 63 FF FC */ addi r3, r3, -4 lbl_802BEE74: /* 802BEE74 002BBDB4 80 63 00 00 */ lwz r3, 0(r3) -/* 802BEE78 002BBDB8 4B FE 37 21 */ bl JAISound_NS_stop_X1_ +/* 802BEE78 002BBDB8 4B FE 37 21 */ bl stop__8JAISoundFv /* 802BEE7C 002BBDBC 48 00 00 30 */ b lbl_802BEEAC lbl_802BEE80: /* 802BEE80 002BBDC0 7F E3 FB 78 */ mr r3, r31 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BF304.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BF304.s index 313b552535..59f166aa81 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BF304.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BF304.s @@ -144,7 +144,7 @@ lbl_802BF4EC: /* 802BF500 002BC440 38 63 FF FC */ addi r3, r3, -4 lbl_802BF504: /* 802BF504 002BC444 80 63 00 00 */ lwz r3, 0(r3) -/* 802BF508 002BC448 4B FE 30 91 */ bl JAISound_NS_stop_X1_ +/* 802BF508 002BC448 4B FE 30 91 */ bl stop__8JAISoundFv /* 802BF50C 002BC44C 48 00 01 1C */ b lbl_802BF628 lbl_802BF510: /* 802BF510 002BC450 54 80 06 3F */ clrlwi. r0, r4, 0x18 @@ -157,7 +157,7 @@ lbl_802BF510: /* 802BF52C 002BC46C 38 63 FF FC */ addi r3, r3, -4 lbl_802BF530: /* 802BF530 002BC470 80 63 00 00 */ lwz r3, 0(r3) -/* 802BF534 002BC474 4B FE 30 65 */ bl JAISound_NS_stop_X1_ +/* 802BF534 002BC474 4B FE 30 65 */ bl stop__8JAISoundFv /* 802BF538 002BC478 48 00 00 F0 */ b lbl_802BF628 lbl_802BF53C: /* 802BF53C 002BC47C 54 A0 06 F7 */ rlwinm. r0, r5, 0, 0x1b, 0x1b @@ -227,7 +227,7 @@ lbl_802BF600: /* 802BF61C 002BC55C 38 63 FF FC */ addi r3, r3, -4 lbl_802BF620: /* 802BF620 002BC560 80 63 00 00 */ lwz r3, 0(r3) -/* 802BF624 002BC564 4B FE 2F 75 */ bl JAISound_NS_stop_X1_ +/* 802BF624 002BC564 4B FE 2F 75 */ bl stop__8JAISoundFv lbl_802BF628: /* 802BF628 002BC568 3B DE 00 01 */ addi r30, r30, 1 lbl_802BF62C: diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s index d201110323..4635c44356 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s @@ -66,7 +66,7 @@ lbl_802BF708: /* 802BF750 002BC690 40 82 01 20 */ bne lbl_802BF870 /* 802BF754 002BC694 7F 03 C3 78 */ mr r3, r24 /* 802BF758 002BC698 7F C4 F3 78 */ mr r4, r30 -/* 802BF75C 002BC69C 4B FE BB 45 */ bl Z2SoundHandles_NS_getHandleUserData +/* 802BF75C 002BC69C 4B FE BB 45 */ bl getHandleUserData__14Z2SoundHandlesFUl /* 802BF760 002BC6A0 7C 7D 1B 79 */ or. r29, r3, r3 /* 802BF764 002BC6A4 41 82 00 24 */ beq lbl_802BF788 /* 802BF768 002BC6A8 80 7D 00 00 */ lwz r3, 0(r29) diff --git a/include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h b/include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h new file mode 100644 index 0000000000..aaebddf148 --- /dev/null +++ b/include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h @@ -0,0 +1,31 @@ +#ifndef Z2SOUNDSTARTER_H_ +#define Z2SOUNDSTARTER_H_ + +#include "JSystem/JAudio2/JAISound/JAISound.h" +#include "JSystem/JGeometry/JGeometry.h" + +struct Z2SoundStarter_vtable { + void* field_0x0; + void* field_0x4; + void* dtor; + void* startSound1; + void* startSound2; +}; + +struct Z2SoundStarter { + // Z2SoundStarter_vtable* vtable; + + Z2SoundStarter(bool); + virtual ~Z2SoundStarter(); + + virtual void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*); + virtual void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*, u32, float, + float, float, float, float, u32); + + void setPortData(JAISoundHandle*, u32, u16, s8); + void getPortData(JAISoundHandle*, u32, s8); +}; + +extern Z2SoundStarter* lbl_80450B74; + +#endif // Z2SOUNDSTARTER_H_ diff --git a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s index 5017850dc4..8fc760775a 100644 --- a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s +++ b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s @@ -11,7 +11,7 @@ /* 802AAC1C 002A7B5C C0 82 BE 60 */ lfs f4, lbl_80455860-_SDA2_BASE_(r2) /* 802AAC20 002A7B60 FC A0 20 90 */ fmr f5, f4 /* 802AAC24 002A7B64 39 00 00 00 */ li r8, 0 -/* 802AAC28 002A7B68 48 00 00 15 */ bl Z2SoundStarter_NS_startSound_X1_ +/* 802AAC28 002A7B68 48 00 00 15 */ bl startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl /* 802AAC2C 002A7B6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802AAC30 002A7B70 7C 08 03 A6 */ mtlr r0 /* 802AAC34 002A7B74 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s index d8c7eb99e8..34a38f9321 100644 --- a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s +++ b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s @@ -116,7 +116,7 @@ lbl_802AADA0: /* 802AADE8 002A7D28 38 A0 00 06 */ li r5, 6 /* 802AADEC 002A7D2C 57 C6 04 3E */ clrlwi r6, r30, 0x10 /* 802AADF0 002A7D30 38 E0 FF FF */ li r7, -1 -/* 802AADF4 002A7D34 48 00 00 E9 */ bl Z2SoundStarter_NS_setPortData +/* 802AADF4 002A7D34 48 00 00 E9 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802AADF8: /* 802AADF8 002A7D38 C0 02 BE 58 */ lfs f0, lbl_80455858-_SDA2_BASE_(r2) /* 802AADFC 002A7D3C FC 1B 00 40 */ fcmpo cr0, f27, f0 diff --git a/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h new file mode 100644 index 0000000000..4c592210ae --- /dev/null +++ b/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h @@ -0,0 +1,42 @@ +#ifndef __Z2SPEECHMGR2_H__ +#define __Z2SPEECHMGR2_H__ + +#include "JSystem/JAudio2/JAISound/JAISound.h" +#include "JSystem/JMath/random.h" +#include "dolphin/types.h" + +class Z2SpeechStarter { +public: + Z2SpeechStarter(); + +private: + void* __vt; //! @todo vtable +}; + +class Z2SpeechMgr2 { +public: + Z2SpeechMgr2(); + +private: + JAISoundHandle mSoundHandle1; + JAISoundHandle mSoundHandle2; + JMath::TRandom_fast_ mRandom; + Z2SpeechStarter mSpeechStarter; + + u16 field_0x10[500]; + s16 field_0x3f8; + s16 mTextCount; + u16 field_0x3fc; + u8 field_0x3fe; + u8 field_0x3ff; + u8 field_0x400; + u8 field_0x401; + u8 field_0x402[64]; + u16 field_0x442; +}; + +//! @todo: we need to eventually figure out how to get JASGlobalInstance working once +//! const placement is fixed. +extern Z2SpeechMgr2* lbl_80450B70; // m_Do_main::JASGlobalInstance<Z2SpeechMgr2>::sInstance + +#endif
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s index 903a088e9c..41ba8c422e 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s @@ -11,7 +11,7 @@ /* 802CBC88 002C8BC8 38 80 00 00 */ li r4, 0 /* 802CBC8C 002C8BCC 48 06 DE 59 */ bl __ct__Q25JMath13TRandom_fast_FUl /* 802CBC90 002C8BD0 38 7F 00 0C */ addi r3, r31, 0xc -/* 802CBC94 002C8BD4 48 00 13 25 */ bl Z2SpeechStarter +/* 802CBC94 002C8BD4 48 00 13 25 */ bl __ct__15Z2SpeechStarterFv /* 802CBC98 002C8BD8 38 00 00 00 */ li r0, 0 /* 802CBC9C 002C8BDC B0 1F 03 F8 */ sth r0, 0x3f8(r31) /* 802CBCA0 002C8BE0 38 60 FF FF */ li r3, -1 diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s index 96d9bc40cf..9c87051917 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s @@ -79,7 +79,7 @@ lbl_802CC21C: /* 802CC2BC 002C91FC 38 06 00 01 */ addi r0, r6, 1 /* 802CC2C0 002C9200 54 06 04 3E */ clrlwi r6, r0, 0x10 /* 802CC2C4 002C9204 38 E0 FF FF */ li r7, -1 -/* 802CC2C8 002C9208 4B FD EC 15 */ bl Z2SoundStarter_NS_setPortData +/* 802CC2C8 002C9208 4B FD EC 15 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802CC2CC 002C920C 88 1E 04 00 */ lbz r0, 0x400(r30) /* 802CC2D0 002C9210 28 00 00 00 */ cmplwi r0, 0 /* 802CC2D4 002C9214 40 82 00 10 */ bne lbl_802CC2E4 diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC4C0.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC4C0.s index a18c626e16..f3a0f4fad9 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC4C0.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC4C0.s @@ -5,7 +5,7 @@ /* 802CC4D0 002C9410 28 00 00 40 */ cmplwi r0, 0x40 /* 802CC4D4 002C9414 41 80 00 10 */ blt lbl_802CC4E4 /* 802CC4D8 002C9418 80 63 00 00 */ lwz r3, 0(r3) -/* 802CC4DC 002C941C 4B FD 60 BD */ bl JAISound_NS_stop_X1_ +/* 802CC4DC 002C941C 4B FD 60 BD */ bl stop__8JAISoundFv /* 802CC4E0 002C9420 48 00 02 48 */ b lbl_802CC728 lbl_802CC4E4: /* 802CC4E4 002C9424 3C A0 80 3A */ lis r5, lbl_8039C98C@ha diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s index 7eb82e70ee..0f5c2f773c 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s @@ -354,7 +354,7 @@ lbl_802CCEEC: /* 802CCEF0 002C9E30 28 00 00 00 */ cmplwi r0, 0 /* 802CCEF4 002C9E34 41 82 00 0C */ beq lbl_802CCF00 /* 802CCEF8 002C9E38 7F 83 E3 78 */ mr r3, r28 -/* 802CCEFC 002C9E3C 4B FD 52 89 */ bl JAISoundHandle_NS_releaseSound +/* 802CCEFC 002C9E3C 4B FD 52 89 */ bl releaseSound__14JAISoundHandleFv lbl_802CCF00: /* 802CCF00 002C9E40 80 01 00 80 */ lwz r0, 0x80(r1) /* 802CCF04 002C9E44 90 01 00 08 */ stw r0, 8(r1) @@ -381,7 +381,7 @@ lbl_802CCF00: /* 802CCF58 002C9E98 38 A0 00 08 */ li r5, 8 /* 802CCF5C 002C9E9C 7F C6 F3 78 */ mr r6, r30 /* 802CCF60 002C9EA0 38 E0 FF FF */ li r7, -1 -/* 802CCF64 002C9EA4 4B FD DF 79 */ bl Z2SoundStarter_NS_setPortData +/* 802CCF64 002C9EA4 4B FD DF 79 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802CCF68: /* 802CCF68 002C9EA8 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, 0 /* 802CCF6C 002C9EAC CB E1 00 A0 */ lfd f31, 0xa0(r1) diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s index b0c9df84c0..d37edc65f8 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s @@ -4,7 +4,7 @@ /* 802CCFC4 002C9F04 93 E1 00 0C */ stw r31, 0xc(r1) /* 802CCFC8 002C9F08 7C 7F 1B 78 */ mr r31, r3 /* 802CCFCC 002C9F0C 38 80 00 00 */ li r4, 0 -/* 802CCFD0 002C9F10 4B FD DB C5 */ bl Z2SoundStarter_NS_ctor +/* 802CCFD0 002C9F10 4B FD DB C5 */ bl __ct__14Z2SoundStarterFb /* 802CCFD4 002C9F14 3C 60 80 3D */ lis r3, lbl_803CBF24@ha /* 802CCFD8 002C9F18 38 03 BF 24 */ addi r0, r3, lbl_803CBF24@l /* 802CCFDC 002C9F1C 90 1F 00 00 */ stw r0, 0(r31) diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s index 48379fb143..486770759a 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s @@ -93,7 +93,7 @@ lbl_802CD10C: /* 802CD154 002CA094 38 A0 00 06 */ li r5, 6 /* 802CD158 002CA098 57 66 04 3E */ clrlwi r6, r27, 0x10 /* 802CD15C 002CA09C 38 E0 FF FF */ li r7, -1 -/* 802CD160 002CA0A0 4B FD DD 7D */ bl Z2SoundStarter_NS_setPortData +/* 802CD160 002CA0A0 4B FD DD 7D */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802CD164: /* 802CD164 002CA0A4 C0 02 C5 30 */ lfs f0, lbl_80455F30-_SDA2_BASE_(r2) /* 802CD168 002CA0A8 FC 1B 00 40 */ fcmpo cr0, f27, f0 diff --git a/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h index cf6cdade92..69607e5aec 100644 --- a/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h @@ -20,6 +20,8 @@ struct Z2StatusMgr { void setCameraGroupInfo(u8); void setCameraInWaterDepth(float); + //! @todo there are a number of inlines only called from rels: see CHN_debug + u8 hour; u8 minute; u8 weekday; diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h new file mode 100644 index 0000000000..7ee6268425 --- /dev/null +++ b/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h @@ -0,0 +1,25 @@ +#ifndef Z2WOLFHOWLMGR_H_ +#define Z2WOLFHOWLMGR_H_ + +struct Z2WolfHowlData {}; + +class Z2WolfHowlMgr { + Z2WolfHowlMgr(); + + void resetState(); + void calcVolumeMod(float); + void getNowPitch(); + void getNowInputValue(); + void calcPitchMod(float, float); + void startWolfHowlSound(float, float, bool, float); + void setCorrectData(s8, Z2WolfHowlData*); + void getCorrectLine(u8); + void getCorrectLineNum(); + void checkLine(); + void getOnLineNum(); + void startWindStoneSound(s8, Vec*); + void startGuideMelody(bool); + void skipCorrectDemo(); +}; + +#endif // Z2WOLFHOWLMGR_H_
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s index c17cb920fc..bdd78c1fa4 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s @@ -9,7 +9,7 @@ /* 802CACF4 002C7C34 7C 7F 1B 78 */ mr r31, r3 /* 802CACF8 002C7C38 FF C0 10 90 */ fmr f30, f2 /* 802CACFC 002C7C3C C3 E2 C4 64 */ lfs f31, lbl_80455E64-_SDA2_BASE_(r2) -/* 802CAD00 002C7C40 4B FF FF B1 */ bl Z2WolfHowlMgr_NS_getNowPitch +/* 802CAD00 002C7C40 4B FF FF B1 */ bl getNowPitch__13Z2WolfHowlMgrFv /* 802CAD04 002C7C44 D0 3F 00 20 */ stfs f1, 0x20(r31) /* 802CAD08 002C7C48 88 1F 00 8C */ lbz r0, 0x8c(r31) /* 802CAD0C 002C7C4C 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAED4.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAED4.s index b7ff46fbbc..6ea78179ae 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAED4.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAED4.s @@ -91,10 +91,10 @@ lbl_802CB00C: /* 802CB018 002C7F58 7F E3 FB 78 */ mr r3, r31 /* 802CB01C 002C7F5C C0 22 C4 60 */ lfs f1, lbl_80455E60-_SDA2_BASE_(r2) /* 802CB020 002C7F60 FC 40 08 90 */ fmr f2, f1 -/* 802CB024 002C7F64 4B FF FC B1 */ bl Z2WolfHowlMgr_NS_calcPitchMod +/* 802CB024 002C7F64 4B FF FC B1 */ bl calcPitchMod__13Z2WolfHowlMgrFff /* 802CB028 002C7F68 7F E3 FB 78 */ mr r3, r31 /* 802CB02C 002C7F6C FC 20 F8 90 */ fmr f1, f31 -/* 802CB030 002C7F70 4B FF FB BD */ bl Z2WolfHowlMgr_NS_calcVolumeMod +/* 802CB030 002C7F70 4B FF FB BD */ bl calcVolumeMod__13Z2WolfHowlMgrFf lbl_802CB034: /* 802CB034 002C7F74 80 7F 00 88 */ lwz r3, 0x88(r31) /* 802CB038 002C7F78 38 03 00 01 */ addi r0, r3, 1 @@ -122,10 +122,10 @@ lbl_802CB044: /* 802CB08C 002C7FCC 7F E3 FB 78 */ mr r3, r31 /* 802CB090 002C7FD0 C0 22 C4 60 */ lfs f1, lbl_80455E60-_SDA2_BASE_(r2) /* 802CB094 002C7FD4 FC 40 08 90 */ fmr f2, f1 -/* 802CB098 002C7FD8 4B FF FC 3D */ bl Z2WolfHowlMgr_NS_calcPitchMod +/* 802CB098 002C7FD8 4B FF FC 3D */ bl calcPitchMod__13Z2WolfHowlMgrFff /* 802CB09C 002C7FDC 7F E3 FB 78 */ mr r3, r31 /* 802CB0A0 002C7FE0 FC 20 F8 90 */ fmr f1, f31 -/* 802CB0A4 002C7FE4 4B FF FB 49 */ bl Z2WolfHowlMgr_NS_calcVolumeMod +/* 802CB0A4 002C7FE4 4B FF FB 49 */ bl calcVolumeMod__13Z2WolfHowlMgrFf lbl_802CB0A8: /* 802CB0A8 002C7FE8 88 7F 00 8C */ lbz r3, 0x8c(r31) /* 802CB0AC 002C7FEC 38 03 00 01 */ addi r0, r3, 1 @@ -136,14 +136,14 @@ lbl_802CB0A8: /* 802CB0C0 002C8000 48 00 00 18 */ b lbl_802CB0D8 lbl_802CB0C4: /* 802CB0C4 002C8004 7F E3 FB 78 */ mr r3, r31 -/* 802CB0C8 002C8008 4B FF FA C5 */ bl Z2WolfHowlMgr_NS_resetState +/* 802CB0C8 002C8008 4B FF FA C5 */ bl resetState__13Z2WolfHowlMgrFv /* 802CB0CC 002C800C 48 00 00 0C */ b lbl_802CB0D8 lbl_802CB0D0: /* 802CB0D0 002C8010 7F E3 FB 78 */ mr r3, r31 -/* 802CB0D4 002C8014 4B FF FA B9 */ bl Z2WolfHowlMgr_NS_resetState +/* 802CB0D4 002C8014 4B FF FA B9 */ bl resetState__13Z2WolfHowlMgrFv lbl_802CB0D8: /* 802CB0D8 002C8018 7F E3 FB 78 */ mr r3, r31 -/* 802CB0DC 002C801C 48 00 02 B1 */ bl Z2WolfHowlMgr_NS_checkLine +/* 802CB0DC 002C801C 48 00 02 B1 */ bl checkLine__13Z2WolfHowlMgrFv /* 802CB0E0 002C8020 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 802CB0E4 002C8024 CB E1 00 20 */ lfd f31, 0x20(r1) /* 802CB0E8 002C8028 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB100.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB100.s index c6338f5165..5867d434bf 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB100.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB100.s @@ -103,14 +103,14 @@ lbl_802CB258: lbl_802CB26C: /* 802CB26C 002C81AC 7F E3 FB 78 */ mr r3, r31 /* 802CB270 002C81B0 7F A4 EB 78 */ mr r4, r29 -/* 802CB274 002C81B4 48 00 00 AD */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB274 002C81B4 48 00 00 AD */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB278 002C81B8 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB27C 002C81BC B0 01 00 10 */ sth r0, 0x10(r1) /* 802CB280 002C81C0 88 01 00 11 */ lbz r0, 0x11(r1) /* 802CB284 002C81C4 7F DE 02 14 */ add r30, r30, r0 /* 802CB288 002C81C8 7F E3 FB 78 */ mr r3, r31 /* 802CB28C 002C81CC 7F A4 EB 78 */ mr r4, r29 -/* 802CB290 002C81D0 48 00 00 91 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB290 002C81D0 48 00 00 91 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB294 002C81D4 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB298 002C81D8 B0 01 00 0C */ sth r0, 0xc(r1) /* 802CB29C 002C81DC 88 01 00 0C */ lbz r0, 0xc(r1) @@ -122,7 +122,7 @@ lbl_802CB26C: /* 802CB2B4 002C81F4 B0 1F 00 BE */ sth r0, 0xbe(r31) /* 802CB2B8 002C81F8 7F E3 FB 78 */ mr r3, r31 /* 802CB2BC 002C81FC 7F A4 EB 78 */ mr r4, r29 -/* 802CB2C0 002C8200 48 00 00 61 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB2C0 002C8200 48 00 00 61 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB2C4 002C8204 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB2C8 002C8208 B0 01 00 08 */ sth r0, 8(r1) /* 802CB2CC 002C820C A0 7F 00 BE */ lhz r3, 0xbe(r31) @@ -133,7 +133,7 @@ lbl_802CB2DC: /* 802CB2DC 002C821C 3B BD 00 01 */ addi r29, r29, 1 lbl_802CB2E0: /* 802CB2E0 002C8220 7F E3 FB 78 */ mr r3, r31 -/* 802CB2E4 002C8224 48 00 00 8D */ bl Z2WolfHowlMgr_NS_getCorrectLineNum +/* 802CB2E4 002C8224 48 00 00 8D */ bl getCorrectLineNum__13Z2WolfHowlMgrFv /* 802CB2E8 002C8228 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 802CB2EC 002C822C 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 802CB2F0 002C8230 7C 00 18 40 */ cmplw r0, r3 diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB38C.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB38C.s index c0ef9f6e69..9a0f722f77 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB38C.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB38C.s @@ -52,7 +52,7 @@ lbl_802CB420: lbl_802CB43C: /* 802CB43C 002C837C 7F E3 FB 78 */ mr r3, r31 /* 802CB440 002C8380 7F A4 EB 78 */ mr r4, r29 -/* 802CB444 002C8384 4B FF FE DD */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB444 002C8384 4B FF FE DD */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB448 002C8388 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB44C 002C838C B0 01 00 10 */ sth r0, 0x10(r1) /* 802CB450 002C8390 88 01 00 11 */ lbz r0, 0x11(r1) @@ -60,7 +60,7 @@ lbl_802CB43C: /* 802CB458 002C8398 3B BD 00 01 */ addi r29, r29, 1 lbl_802CB45C: /* 802CB45C 002C839C 7F E3 FB 78 */ mr r3, r31 -/* 802CB460 002C83A0 4B FF FF 11 */ bl Z2WolfHowlMgr_NS_getCorrectLineNum +/* 802CB460 002C83A0 4B FF FF 11 */ bl getCorrectLineNum__13Z2WolfHowlMgrFv /* 802CB464 002C83A4 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 802CB468 002C83A8 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 802CB46C 002C83AC 7C 00 18 40 */ cmplw r0, r3 @@ -132,7 +132,7 @@ lbl_802CB544: lbl_802CB560: /* 802CB560 002C84A0 7F E3 FB 78 */ mr r3, r31 /* 802CB564 002C84A4 7F 84 E3 78 */ mr r4, r28 -/* 802CB568 002C84A8 4B FF FD B9 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB568 002C84A8 4B FF FD B9 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB56C 002C84AC 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB570 002C84B0 B0 01 00 0C */ sth r0, 0xc(r1) /* 802CB574 002C84B4 88 01 00 0D */ lbz r0, 0xd(r1) @@ -146,7 +146,7 @@ lbl_802CB580: /* 802CB590 002C84D0 7C 1D F0 40 */ cmplw r29, r30 /* 802CB594 002C84D4 40 81 00 80 */ ble lbl_802CB614 /* 802CB598 002C84D8 7F E3 FB 78 */ mr r3, r31 -/* 802CB59C 002C84DC 4B FF FD D5 */ bl Z2WolfHowlMgr_NS_getCorrectLineNum +/* 802CB59C 002C84DC 4B FF FD D5 */ bl getCorrectLineNum__13Z2WolfHowlMgrFv /* 802CB5A0 002C84E0 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 802CB5A4 002C84E4 88 1F 00 BA */ lbz r0, 0xba(r31) /* 802CB5A8 002C84E8 7C 00 18 40 */ cmplw r0, r3 @@ -157,7 +157,7 @@ lbl_802CB580: /* 802CB5BC 002C84FC B0 1F 00 90 */ sth r0, 0x90(r31) /* 802CB5C0 002C8500 7F E3 FB 78 */ mr r3, r31 /* 802CB5C4 002C8504 88 9F 00 BA */ lbz r4, 0xba(r31) -/* 802CB5C8 002C8508 4B FF FD 59 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB5C8 002C8508 4B FF FD 59 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB5CC 002C850C 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB5D0 002C8510 B0 01 00 08 */ sth r0, 8(r1) /* 802CB5D4 002C8514 88 9F 00 BC */ lbz r4, 0xbc(r31) @@ -179,7 +179,7 @@ lbl_802CB5FC: /* 802CB610 002C8550 48 00 00 24 */ b lbl_802CB634 lbl_802CB614: /* 802CB614 002C8554 7F E3 FB 78 */ mr r3, r31 -/* 802CB618 002C8558 48 00 00 39 */ bl Z2WolfHowlMgr_NS_getOnLineNum +/* 802CB618 002C8558 48 00 00 39 */ bl getOnLineNum__13Z2WolfHowlMgrFv /* 802CB61C 002C855C 7C 60 07 74 */ extsb r0, r3 /* 802CB620 002C8560 2C 00 FF FF */ cmpwi r0, -1 /* 802CB624 002C8564 40 81 00 10 */ ble lbl_802CB634 diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB650.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB650.s index 275baa22a7..712e5dda3c 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB650.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB650.s @@ -4,7 +4,7 @@ /* 802CB65C 002C859C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802CB660 002C85A0 7C 7F 1B 78 */ mr r31, r3 /* 802CB664 002C85A4 88 83 00 BA */ lbz r4, 0xba(r3) -/* 802CB668 002C85A8 4B FF FC B9 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB668 002C85A8 4B FF FC B9 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB66C 002C85AC 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB670 002C85B0 B0 01 00 08 */ sth r0, 8(r1) /* 802CB674 002C85B4 88 01 00 08 */ lbz r0, 8(r1) diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB6EC.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB6EC.s index 607bfa6b06..06e5c5f39c 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB6EC.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB6EC.s @@ -101,7 +101,7 @@ lbl_802CB848: /* 802CB854 002C8794 80 7D 00 04 */ lwz r3, 4(r29) /* 802CB858 002C8798 28 03 00 00 */ cmplwi r3, 0 /* 802CB85C 002C879C 41 82 00 0C */ beq lbl_802CB868 -/* 802CB860 002C87A0 4B FD 6D 39 */ bl JAISound_NS_stop_X1_ +/* 802CB860 002C87A0 4B FD 6D 39 */ bl stop__8JAISoundFv /* 802CB864 002C87A4 48 00 00 54 */ b lbl_802CB8B8 lbl_802CB868: /* 802CB868 002C87A8 C0 02 C4 C0 */ lfs f0, lbl_80455EC0-_SDA2_BASE_(r2) @@ -138,7 +138,7 @@ lbl_802CB8B8: /* 802CB8E0 002C8820 D0 23 00 2C */ stfs f1, 0x2c(r3) /* 802CB8E4 002C8824 80 7D 00 04 */ lwz r3, 4(r29) /* 802CB8E8 002C8828 38 80 00 1E */ li r4, 0x1e -/* 802CB8EC 002C882C 4B FD 6B F1 */ bl JAISound_NS_stop +/* 802CB8EC 002C882C 4B FD 6B F1 */ bl stop__8JAISoundFUl /* 802CB8F0 002C8830 80 8D 8D E0 */ lwz r4, lbl_80451360-_SDA_BASE_(r13) /* 802CB8F4 002C8834 88 04 00 C0 */ lbz r0, 0xc0(r4) /* 802CB8F8 002C8838 28 00 00 01 */ cmplwi r0, 1 diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBA88.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBA88.s index 8dd8eccca8..237547f42d 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBA88.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBA88.s @@ -41,7 +41,7 @@ lbl_802CBAFC: /* 802CBB24 002C8A64 D0 23 00 2C */ stfs f1, 0x2c(r3) /* 802CBB28 002C8A68 80 7F 00 08 */ lwz r3, 8(r31) /* 802CBB2C 002C8A6C 38 80 00 1E */ li r4, 0x1e -/* 802CBB30 002C8A70 4B FD 69 AD */ bl JAISound_NS_stop +/* 802CBB30 002C8A70 4B FD 69 AD */ bl stop__8JAISoundFUl /* 802CBB34 002C8A74 80 7F 00 08 */ lwz r3, 8(r31) /* 802CBB38 002C8A78 80 63 00 38 */ lwz r3, 0x38(r3) /* 802CBB3C 002C8A7C 48 00 00 08 */ b lbl_802CBB44 |