From e2a84aef47879a1e96a951b16c9ec42ff25ea80b Mon Sep 17 00:00:00 2001 From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com> Date: Fri, 26 Jan 2024 21:11:28 -0500 Subject: [PATCH] Z2Creature mostly done (#2049) --- Progress.md | 8 +- ..._B_zan_modPitch__FP17Z2SoundHandlePoolUl.s | 92 - ...2_E_mm_modPitch__FP17Z2SoundHandlePoolUl.s | 20 - .../Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl.s | 20 - ...2_E_sw_modPitch__FP17Z2SoundHandlePoolUl.s | 35 - .../Z2Creature/__ct__10Z2CreatureFv.s | 23 - .../Z2Creature/__ct__12Z2CreatureFMFv.s | 24 - .../Z2Creature/__ct__12Z2CreatureOIFv.s | 30 - .../Z2Creature/__ct__15Z2CreatureEnemyFv.s | 25 - .../Z2Creature/__ct__16Z2CreatureSumomoFv.s | 16 - .../Z2Creature/__ct__17Z2CreatureCitizenFv.s | 24 - .../Z2Creature/__ct__18Z2SoundObjBeeGroupFv.s | 16 - .../Z2Creature/__dt__10Z2CreatureFv.s | 55 - .../Z2Creature/__dt__17Z2CreatureCitizenFv.s | 33 - .../deleteObject__12Z2CreatureFMFv.s | 20 - .../deleteObject__12Z2CreatureOIFv.s | 34 - .../deleteObject__15Z2CreatureEnemyFv.s | 56 - .../deleteObject__16Z2CreatureSumomoFv.s | 32 - .../framework__12Z2CreatureFMFUlSc.s | 44 - .../framework__12Z2CreatureOIFUlSc.s | 93 - ...VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc.s | 64 - ...P3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec.s | 137 -- ...t__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc.s | 9 - .../init__18Z2SoundObjBeeGroupFP3VecUc.s | 9 - ...und__18Z2SoundObjBeeGroupF10JAISoundIDUc.s | 133 -- .../playSumomoBgm__16Z2CreatureSumomoFUl.s | 36 - .../setEnemyName__15Z2CreatureEnemyFPCc.s | 26 - .../setMdlType__17Z2CreatureCitizenFScbb.s | 56 - ...evel__12Z2CreatureFMF10JAISoundIDUcfUlSc.s | 152 -- ...ound__12Z2CreatureFMF10JAISoundIDUcfUlSc.s | 71 - ...startCollisionSE__15Z2CreatureEnemyFUlUl.s | 101 -- ...oundLevel__10Z2CreatureF10JAISoundIDUlSc.s | 124 -- ...ndLevel__12Z2CreatureOIF10JAISoundIDUlSc.s | 182 -- ...evel__15Z2CreatureEnemyF10JAISoundIDUlSc.s | 209 --- ...tureSound__10Z2CreatureF10JAISoundIDUlSc.s | 93 - ...ound__15Z2CreatureEnemyF10JAISoundIDUlSc.s | 161 -- ...eVoiceLevel__10Z2CreatureF10JAISoundIDSc.s | 34 - ...iceLevel__13Z2CreatureGobF10JAISoundIDSc.s | 46 - ...eLevel__15Z2CreatureEnemyF10JAISoundIDSc.s | 23 - ...eatureVoice__10Z2CreatureF10JAISoundIDSc.s | 48 - ...eVoice__15Z2CreatureEnemyF10JAISoundIDSc.s | 198 --- ...oice__17Z2CreatureCitizenF10JAISoundIDSc.s | 38 - ...evel__12Z2CreatureOIF10JAISoundIDUcfUlSc.s | 70 - ...Sound__12Z2CreatureOIF10JAISoundIDUcUlSc.s | 21 - include/JSystem/JAudio2/JAISound.h | 7 +- include/Z2AudioLib/Z2Audience.h | 3 + include/Z2AudioLib/Z2Creature.h | 92 +- include/Z2AudioLib/Z2Param.h | 8 + include/Z2AudioLib/Z2SeqMgr.h | 3 +- include/Z2AudioLib/Z2SoundHandles.h | 10 +- include/Z2AudioLib/Z2SoundObjMgr.h | 1 + include/Z2AudioLib/Z2SoundObject.h | 18 +- include/Z2AudioLib/Z2StatusMgr.h | 1 + include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h | 17 - libs/JSystem/JAudio2/JAISeMgr.cpp | 4 - libs/Z2AudioLib/Z2Audience.cpp | 7 +- libs/Z2AudioLib/Z2Creature.cpp | 1558 ++++++++--------- libs/Z2AudioLib/Z2LinkMgr.cpp | 4 +- libs/Z2AudioLib/Z2Param.cpp | 36 +- libs/Z2AudioLib/Z2SceneMgr.cpp | 5 +- libs/Z2AudioLib/Z2SeqMgr.cpp | 2 - libs/Z2AudioLib/Z2SoundHandles.cpp | 24 +- libs/Z2AudioLib/Z2SoundObjMgr.cpp | 4 - libs/Z2AudioLib/Z2SoundObject.cpp | 32 +- libs/Z2AudioLib/Z2SoundStarter.cpp | 15 +- libs/Z2AudioLib/Z2SpeechMgr2.cpp | 21 +- src/d/a/d_a_obj_item.cpp | 3 +- 67 files changed, 924 insertions(+), 3692 deletions(-) delete mode 100644 asm/Z2AudioLib/Z2Creature/Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl.s delete mode 100644 asm/Z2AudioLib/Z2Creature/Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl.s delete mode 100644 asm/Z2AudioLib/Z2Creature/Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl.s delete mode 100644 asm/Z2AudioLib/Z2Creature/Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl.s delete mode 100644 asm/Z2AudioLib/Z2Creature/__ct__10Z2CreatureFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/__ct__12Z2CreatureFMFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/__ct__12Z2CreatureOIFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/__ct__15Z2CreatureEnemyFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/__ct__16Z2CreatureSumomoFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/__ct__17Z2CreatureCitizenFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/__ct__18Z2SoundObjBeeGroupFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/__dt__10Z2CreatureFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/__dt__17Z2CreatureCitizenFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/deleteObject__12Z2CreatureFMFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/deleteObject__12Z2CreatureOIFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/deleteObject__15Z2CreatureEnemyFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/deleteObject__16Z2CreatureSumomoFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/framework__12Z2CreatureFMFUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/framework__12Z2CreatureOIFUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec.s delete mode 100644 asm/Z2AudioLib/Z2Creature/init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/init__18Z2SoundObjBeeGroupFP3VecUc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/playSumomoBgm__16Z2CreatureSumomoFUl.s delete mode 100644 asm/Z2AudioLib/Z2Creature/setEnemyName__15Z2CreatureEnemyFPCc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/setMdlType__17Z2CreatureCitizenFScbb.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCollisionSE__15Z2CreatureEnemyFUlUl.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureSound__10Z2CreatureF10JAISoundIDUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureVoice__10Z2CreatureF10JAISoundIDSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc.s diff --git a/Progress.md b/Progress.md index 4166697f2f..f7c14cafd0 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 44.112237% | 1586516 | 3596544 +.text | 44.556552% | 1602496 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 50.002885% | 2010452 | 4020672 +Total | 50.400331% | 2026432 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 50.002885% | 2010452 | 4020672 +main.dol | 50.400331% | 2026432 | 4020672 RELs | 35.541016% | 4087332 | 11500324 -Total | 39.287324% | 6097784 | 15520996 +Total | 39.390281% | 6113764 | 15520996 ## RELs diff --git a/asm/Z2AudioLib/Z2Creature/Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl.s b/asm/Z2AudioLib/Z2Creature/Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl.s deleted file mode 100644 index 19b2d3b501..0000000000 --- a/asm/Z2AudioLib/Z2Creature/Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl.s +++ /dev/null @@ -1,92 +0,0 @@ -lbl_802C2EE4: -/* 802C2EE4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802C2EE8 7C 08 02 A6 */ mflr r0 -/* 802C2EEC 90 01 00 44 */ stw r0, 0x44(r1) -/* 802C2EF0 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 802C2EF4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 802C2EF8 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 802C2EFC F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 802C2F00 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802C2F04 93 C1 00 18 */ stw r30, 0x18(r1) -/* 802C2F08 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802C2F0C 7C 9F 23 78 */ mr r31, r4 -/* 802C2F10 41 82 01 08 */ beq lbl_802C3018 -/* 802C2F14 80 1E 00 00 */ lwz r0, 0(r30) -/* 802C2F18 28 00 00 00 */ cmplwi r0, 0 -/* 802C2F1C 41 82 00 FC */ beq lbl_802C3018 -/* 802C2F20 C3 C2 C2 20 */ lfs f30, lit_3669(r2) -/* 802C2F24 28 1F 01 90 */ cmplwi r31, 0x190 -/* 802C2F28 40 81 00 0C */ ble lbl_802C2F34 -/* 802C2F2C C3 E2 C2 1C */ lfs f31, lit_3668(r2) -/* 802C2F30 48 00 00 C0 */ b lbl_802C2FF0 -lbl_802C2F34: -/* 802C2F34 28 1F 00 64 */ cmplwi r31, 0x64 -/* 802C2F38 40 81 00 44 */ ble lbl_802C2F7C -/* 802C2F3C 20 1F 01 90 */ subfic r0, r31, 0x190 -/* 802C2F40 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C2F44 90 01 00 0C */ stw r0, 0xc(r1) -/* 802C2F48 3C 00 43 30 */ lis r0, 0x4330 -/* 802C2F4C 90 01 00 08 */ stw r0, 8(r1) -/* 802C2F50 C8 01 00 08 */ lfd f0, 8(r1) -/* 802C2F54 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C2F58 C0 42 C2 34 */ lfs f2, lit_3717(r2) -/* 802C2F5C C0 62 C2 90 */ lfs f3, lit_4944(r2) -/* 802C2F60 C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C2F64 C0 A2 C2 1C */ lfs f5, lit_3668(r2) -/* 802C2F68 FC C0 F0 90 */ fmr f6, f30 -/* 802C2F6C 38 60 00 00 */ li r3, 0 -/* 802C2F70 4B FE 67 85 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C2F74 FF E0 08 90 */ fmr f31, f1 -/* 802C2F78 48 00 00 78 */ b lbl_802C2FF0 -lbl_802C2F7C: -/* 802C2F7C 20 1F 00 64 */ subfic r0, r31, 0x64 -/* 802C2F80 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C2F84 90 01 00 0C */ stw r0, 0xc(r1) -/* 802C2F88 3C 00 43 30 */ lis r0, 0x4330 -/* 802C2F8C 90 01 00 08 */ stw r0, 8(r1) -/* 802C2F90 C8 01 00 08 */ lfd f0, 8(r1) -/* 802C2F94 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C2F98 C0 42 C2 34 */ lfs f2, lit_3717(r2) -/* 802C2F9C C0 62 C2 48 */ lfs f3, lit_4091(r2) -/* 802C2FA0 C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C2FA4 FC A0 F0 90 */ fmr f5, f30 -/* 802C2FA8 C0 C2 C2 94 */ lfs f6, lit_4945(r2) -/* 802C2FAC 38 60 00 00 */ li r3, 0 -/* 802C2FB0 4B FE 67 45 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C2FB4 FF E0 08 90 */ fmr f31, f1 -/* 802C2FB8 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C2FBC 93 E1 00 14 */ stw r31, 0x14(r1) -/* 802C2FC0 3C 00 43 30 */ lis r0, 0x4330 -/* 802C2FC4 90 01 00 10 */ stw r0, 0x10(r1) -/* 802C2FC8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802C2FCC EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C2FD0 C0 42 C2 48 */ lfs f2, lit_4091(r2) -/* 802C2FD4 C0 62 C2 0C */ lfs f3, lit_3664(r2) -/* 802C2FD8 C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C2FDC FC A0 20 90 */ fmr f5, f4 -/* 802C2FE0 C0 C2 C2 20 */ lfs f6, lit_3669(r2) -/* 802C2FE4 38 60 00 00 */ li r3, 0 -/* 802C2FE8 4B FE 67 0D */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C2FEC FF C0 08 90 */ fmr f30, f1 -lbl_802C2FF0: -/* 802C2FF0 80 7E 00 00 */ lwz r3, 0(r30) -/* 802C2FF4 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2FF8 FC 20 F8 90 */ fmr f1, f31 -/* 802C2FFC 38 80 00 00 */ li r4, 0 -/* 802C3000 4B FD FE 0D */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C3004 80 7E 00 00 */ lwz r3, 0(r30) -/* 802C3008 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C300C FC 20 F0 90 */ fmr f1, f30 -/* 802C3010 38 80 00 00 */ li r4, 0 -/* 802C3014 4B FD FD A1 */ bl moveVolume__18JAISoundParamsMoveFfUl -lbl_802C3018: -/* 802C3018 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 802C301C CB E1 00 30 */ lfd f31, 0x30(r1) -/* 802C3020 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 802C3024 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 802C3028 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802C302C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802C3030 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802C3034 7C 08 03 A6 */ mtlr r0 -/* 802C3038 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C303C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl.s b/asm/Z2AudioLib/Z2Creature/Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl.s deleted file mode 100644 index 6704f73c16..0000000000 --- a/asm/Z2AudioLib/Z2Creature/Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802C2E9C: -/* 802C2E9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C2EA0 7C 08 02 A6 */ mflr r0 -/* 802C2EA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C2EA8 28 03 00 00 */ cmplwi r3, 0 -/* 802C2EAC 41 82 00 28 */ beq lbl_802C2ED4 -/* 802C2EB0 80 63 00 00 */ lwz r3, 0(r3) -/* 802C2EB4 28 03 00 00 */ cmplwi r3, 0 -/* 802C2EB8 41 82 00 1C */ beq lbl_802C2ED4 -/* 802C2EBC 28 04 00 03 */ cmplwi r4, 3 -/* 802C2EC0 40 82 00 14 */ bne lbl_802C2ED4 -/* 802C2EC4 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2EC8 C0 22 C2 64 */ lfs f1, lit_4192(r2) -/* 802C2ECC 38 80 00 00 */ li r4, 0 -/* 802C2ED0 4B FD FF 3D */ bl movePitch__18JAISoundParamsMoveFfUl -lbl_802C2ED4: -/* 802C2ED4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C2ED8 7C 08 03 A6 */ mtlr r0 -/* 802C2EDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2EE0 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl.s b/asm/Z2AudioLib/Z2Creature/Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl.s deleted file mode 100644 index 3b30da1d12..0000000000 --- a/asm/Z2AudioLib/Z2Creature/Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802C2E54: -/* 802C2E54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C2E58 7C 08 02 A6 */ mflr r0 -/* 802C2E5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C2E60 28 03 00 00 */ cmplwi r3, 0 -/* 802C2E64 41 82 00 28 */ beq lbl_802C2E8C -/* 802C2E68 80 63 00 00 */ lwz r3, 0(r3) -/* 802C2E6C 28 03 00 00 */ cmplwi r3, 0 -/* 802C2E70 41 82 00 1C */ beq lbl_802C2E8C -/* 802C2E74 28 04 00 01 */ cmplwi r4, 1 -/* 802C2E78 40 82 00 14 */ bne lbl_802C2E8C -/* 802C2E7C 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2E80 C0 22 C2 8C */ lfs f1, lit_4906(r2) -/* 802C2E84 38 80 00 00 */ li r4, 0 -/* 802C2E88 4B FD FF 2D */ bl moveVolume__18JAISoundParamsMoveFfUl -lbl_802C2E8C: -/* 802C2E8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C2E90 7C 08 03 A6 */ mtlr r0 -/* 802C2E94 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2E98 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl.s b/asm/Z2AudioLib/Z2Creature/Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl.s deleted file mode 100644 index 29022a4632..0000000000 --- a/asm/Z2AudioLib/Z2Creature/Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_802C2DE0: -/* 802C2DE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C2DE4 7C 08 02 A6 */ mflr r0 -/* 802C2DE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C2DEC 28 03 00 00 */ cmplwi r3, 0 -/* 802C2DF0 41 82 00 54 */ beq lbl_802C2E44 -/* 802C2DF4 80 03 00 00 */ lwz r0, 0(r3) -/* 802C2DF8 28 00 00 00 */ cmplwi r0, 0 -/* 802C2DFC 41 82 00 48 */ beq lbl_802C2E44 -/* 802C2E00 C0 22 C2 20 */ lfs f1, lit_3669(r2) -/* 802C2E04 2C 04 00 02 */ cmpwi r4, 2 -/* 802C2E08 41 82 00 2C */ beq lbl_802C2E34 -/* 802C2E0C 40 80 00 10 */ bge lbl_802C2E1C -/* 802C2E10 2C 04 00 01 */ cmpwi r4, 1 -/* 802C2E14 40 80 00 14 */ bge lbl_802C2E28 -/* 802C2E18 48 00 00 1C */ b lbl_802C2E34 -lbl_802C2E1C: -/* 802C2E1C 2C 04 00 04 */ cmpwi r4, 4 -/* 802C2E20 40 80 00 14 */ bge lbl_802C2E34 -/* 802C2E24 48 00 00 0C */ b lbl_802C2E30 -lbl_802C2E28: -/* 802C2E28 C0 22 C2 54 */ lfs f1, lit_4188(r2) -/* 802C2E2C 48 00 00 08 */ b lbl_802C2E34 -lbl_802C2E30: -/* 802C2E30 C0 22 C2 14 */ lfs f1, lit_3666(r2) -lbl_802C2E34: -/* 802C2E34 80 63 00 00 */ lwz r3, 0(r3) -/* 802C2E38 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2E3C 38 80 00 00 */ li r4, 0 -/* 802C2E40 4B FD FF CD */ bl movePitch__18JAISoundParamsMoveFfUl -lbl_802C2E44: -/* 802C2E44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C2E48 7C 08 03 A6 */ mtlr r0 -/* 802C2E4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2E50 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/__ct__10Z2CreatureFv.s b/asm/Z2AudioLib/Z2Creature/__ct__10Z2CreatureFv.s deleted file mode 100644 index 3107ed337e..0000000000 --- a/asm/Z2AudioLib/Z2Creature/__ct__10Z2CreatureFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802C03C8: -/* 802C03C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C03CC 7C 08 02 A6 */ mflr r0 -/* 802C03D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C03D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C03D8 7C 7F 1B 78 */ mr r31, r3 -/* 802C03DC 3C 60 80 3D */ lis r3, __vt__10Z2Creature@ha /* 0x803CB8C0@ha */ -/* 802C03E0 38 03 B8 C0 */ addi r0, r3, __vt__10Z2Creature@l /* 0x803CB8C0@l */ -/* 802C03E4 90 1F 00 00 */ stw r0, 0(r31) -/* 802C03E8 38 7F 00 08 */ addi r3, r31, 8 -/* 802C03EC 4B FF E7 A9 */ bl __ct__15Z2SoundObjAnimeFv -/* 802C03F0 38 7F 00 50 */ addi r3, r31, 0x50 -/* 802C03F4 4B FF E4 51 */ bl __ct__16Z2SoundObjSimpleFv -/* 802C03F8 38 7F 00 70 */ addi r3, r31, 0x70 -/* 802C03FC 4B FF E4 49 */ bl __ct__16Z2SoundObjSimpleFv -/* 802C0400 38 00 00 00 */ li r0, 0 -/* 802C0404 90 1F 00 04 */ stw r0, 4(r31) -/* 802C0408 7F E3 FB 78 */ mr r3, r31 -/* 802C040C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0410 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0414 7C 08 03 A6 */ mtlr r0 -/* 802C0418 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C041C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/__ct__12Z2CreatureFMFv.s b/asm/Z2AudioLib/Z2Creature/__ct__12Z2CreatureFMFv.s deleted file mode 100644 index 1c78189a0b..0000000000 --- a/asm/Z2AudioLib/Z2Creature/__ct__12Z2CreatureFMFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_802C1F54: -/* 802C1F54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C1F58 7C 08 02 A6 */ mflr r0 -/* 802C1F5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1F60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C1F64 7C 7F 1B 78 */ mr r31, r3 -/* 802C1F68 4B FF EF FD */ bl __ct__15Z2CreatureEnemyFv -/* 802C1F6C 3C 60 80 3D */ lis r3, __vt__12Z2CreatureFM@ha /* 0x803CB7E0@ha */ -/* 802C1F70 38 03 B7 E0 */ addi r0, r3, __vt__12Z2CreatureFM@l /* 0x803CB7E0@l */ -/* 802C1F74 90 1F 00 00 */ stw r0, 0(r31) -/* 802C1F78 38 7F 00 A4 */ addi r3, r31, 0xa4 -/* 802C1F7C 4B FF C8 C9 */ bl __ct__16Z2SoundObjSimpleFv -/* 802C1F80 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 802C1F84 4B FF C8 C1 */ bl __ct__16Z2SoundObjSimpleFv -/* 802C1F88 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 802C1F8C 4B FF C8 B9 */ bl __ct__16Z2SoundObjSimpleFv -/* 802C1F90 38 7F 01 04 */ addi r3, r31, 0x104 -/* 802C1F94 4B FF C8 B1 */ bl __ct__16Z2SoundObjSimpleFv -/* 802C1F98 7F E3 FB 78 */ mr r3, r31 -/* 802C1F9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C1FA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C1FA4 7C 08 03 A6 */ mtlr r0 -/* 802C1FA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1FAC 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/__ct__12Z2CreatureOIFv.s b/asm/Z2AudioLib/Z2Creature/__ct__12Z2CreatureOIFv.s deleted file mode 100644 index 5f17a262c6..0000000000 --- a/asm/Z2AudioLib/Z2Creature/__ct__12Z2CreatureOIFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_802C2578: -/* 802C2578 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C257C 7C 08 02 A6 */ mflr r0 -/* 802C2580 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C2584 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C2588 7C 7F 1B 78 */ mr r31, r3 -/* 802C258C 4B FF E9 D9 */ bl __ct__15Z2CreatureEnemyFv -/* 802C2590 3C 60 80 3D */ lis r3, __vt__12Z2CreatureOI@ha /* 0x803CB780@ha */ -/* 802C2594 38 03 B7 80 */ addi r0, r3, __vt__12Z2CreatureOI@l /* 0x803CB780@l */ -/* 802C2598 90 1F 00 00 */ stw r0, 0(r31) -/* 802C259C 38 7F 00 A4 */ addi r3, r31, 0xa4 -/* 802C25A0 4B FF C2 A5 */ bl __ct__16Z2SoundObjSimpleFv -/* 802C25A4 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 802C25A8 4B FF C2 9D */ bl __ct__16Z2SoundObjSimpleFv -/* 802C25AC 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 802C25B0 4B FF C2 95 */ bl __ct__16Z2SoundObjSimpleFv -/* 802C25B4 38 7F 01 04 */ addi r3, r31, 0x104 -/* 802C25B8 3C 80 80 2C */ lis r4, __ct__16Z2SoundObjSimpleFv@ha /* 0x802BE844@ha */ -/* 802C25BC 38 84 E8 44 */ addi r4, r4, __ct__16Z2SoundObjSimpleFv@l /* 0x802BE844@l */ -/* 802C25C0 3C A0 80 16 */ lis r5, __dt__16Z2SoundObjSimpleFv@ha /* 0x8015BA3C@ha */ -/* 802C25C4 38 A5 BA 3C */ addi r5, r5, __dt__16Z2SoundObjSimpleFv@l /* 0x8015BA3C@l */ -/* 802C25C8 38 C0 00 20 */ li r6, 0x20 -/* 802C25CC 38 E0 00 08 */ li r7, 8 -/* 802C25D0 48 09 F7 91 */ bl __construct_array -/* 802C25D4 7F E3 FB 78 */ mr r3, r31 -/* 802C25D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C25DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C25E0 7C 08 03 A6 */ mtlr r0 -/* 802C25E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C25E8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/__ct__15Z2CreatureEnemyFv.s b/asm/Z2AudioLib/Z2Creature/__ct__15Z2CreatureEnemyFv.s deleted file mode 100644 index 1a4e96d24a..0000000000 --- a/asm/Z2AudioLib/Z2Creature/__ct__15Z2CreatureEnemyFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_802C0F64: -/* 802C0F64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0F68 7C 08 02 A6 */ mflr r0 -/* 802C0F6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0F70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C0F74 7C 7F 1B 78 */ mr r31, r3 -/* 802C0F78 4B FF F4 51 */ bl __ct__10Z2CreatureFv -/* 802C0F7C 38 7F 00 90 */ addi r3, r31, 0x90 -/* 802C0F80 7F E4 FB 78 */ mr r4, r31 -/* 802C0F84 48 01 AE 79 */ bl __ct__10JSUPtrLinkFPv -/* 802C0F88 3C 60 80 3D */ lis r3, __vt__15Z2CreatureEnemy@ha /* 0x803CB860@ha */ -/* 802C0F8C 38 03 B8 60 */ addi r0, r3, __vt__15Z2CreatureEnemy@l /* 0x803CB860@l */ -/* 802C0F90 90 1F 00 00 */ stw r0, 0(r31) -/* 802C0F94 38 60 00 00 */ li r3, 0 -/* 802C0F98 98 7F 00 A0 */ stb r3, 0xa0(r31) -/* 802C0F9C 38 00 00 01 */ li r0, 1 -/* 802C0FA0 98 1F 00 A1 */ stb r0, 0xa1(r31) -/* 802C0FA4 98 7F 00 A2 */ stb r3, 0xa2(r31) -/* 802C0FA8 98 7F 00 A3 */ stb r3, 0xa3(r31) -/* 802C0FAC 7F E3 FB 78 */ mr r3, r31 -/* 802C0FB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0FB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0FB8 7C 08 03 A6 */ mtlr r0 -/* 802C0FBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0FC0 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/__ct__16Z2CreatureSumomoFv.s b/asm/Z2AudioLib/Z2Creature/__ct__16Z2CreatureSumomoFv.s deleted file mode 100644 index 985c1cd1b5..0000000000 --- a/asm/Z2AudioLib/Z2Creature/__ct__16Z2CreatureSumomoFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802C1BE8: -/* 802C1BE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C1BEC 7C 08 02 A6 */ mflr r0 -/* 802C1BF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1BF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C1BF8 7C 7F 1B 78 */ mr r31, r3 -/* 802C1BFC 4B FF E7 CD */ bl __ct__10Z2CreatureFv -/* 802C1C00 3C 60 80 3D */ lis r3, __vt__16Z2CreatureSumomo@ha /* 0x803CB830@ha */ -/* 802C1C04 38 03 B8 30 */ addi r0, r3, __vt__16Z2CreatureSumomo@l /* 0x803CB830@l */ -/* 802C1C08 90 1F 00 00 */ stw r0, 0(r31) -/* 802C1C0C 7F E3 FB 78 */ mr r3, r31 -/* 802C1C10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C1C14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C1C18 7C 08 03 A6 */ mtlr r0 -/* 802C1C1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1C20 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/__ct__17Z2CreatureCitizenFv.s b/asm/Z2AudioLib/Z2Creature/__ct__17Z2CreatureCitizenFv.s deleted file mode 100644 index 9e61a6faa0..0000000000 --- a/asm/Z2AudioLib/Z2Creature/__ct__17Z2CreatureCitizenFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_802C0C10: -/* 802C0C10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0C14 7C 08 02 A6 */ mflr r0 -/* 802C0C18 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0C1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C0C20 7C 7F 1B 78 */ mr r31, r3 -/* 802C0C24 4B FF F7 A5 */ bl __ct__10Z2CreatureFv -/* 802C0C28 38 7F 00 90 */ addi r3, r31, 0x90 -/* 802C0C2C 7F E4 FB 78 */ mr r4, r31 -/* 802C0C30 48 01 B1 CD */ bl __ct__10JSUPtrLinkFPv -/* 802C0C34 3C 60 80 3D */ lis r3, __vt__17Z2CreatureCitizen@ha /* 0x803CB890@ha */ -/* 802C0C38 38 03 B8 90 */ addi r0, r3, __vt__17Z2CreatureCitizen@l /* 0x803CB890@l */ -/* 802C0C3C 90 1F 00 00 */ stw r0, 0(r31) -/* 802C0C40 38 00 FF FF */ li r0, -1 -/* 802C0C44 98 1F 00 A0 */ stb r0, 0xa0(r31) -/* 802C0C48 98 1F 00 A1 */ stb r0, 0xa1(r31) -/* 802C0C4C 38 00 00 00 */ li r0, 0 -/* 802C0C50 98 1F 00 A2 */ stb r0, 0xa2(r31) -/* 802C0C54 7F E3 FB 78 */ mr r3, r31 -/* 802C0C58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0C5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0C60 7C 08 03 A6 */ mtlr r0 -/* 802C0C64 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0C68 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/__ct__18Z2SoundObjBeeGroupFv.s b/asm/Z2AudioLib/Z2Creature/__ct__18Z2SoundObjBeeGroupFv.s deleted file mode 100644 index 5b1ce3a251..0000000000 --- a/asm/Z2AudioLib/Z2Creature/__ct__18Z2SoundObjBeeGroupFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802C1D10: -/* 802C1D10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C1D14 7C 08 02 A6 */ mflr r0 -/* 802C1D18 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1D1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C1D20 7C 7F 1B 78 */ mr r31, r3 -/* 802C1D24 4B FF C1 CD */ bl __ct__14Z2SoundObjBaseFv -/* 802C1D28 3C 60 80 3D */ lis r3, __vt__18Z2SoundObjBeeGroup@ha /* 0x803CB810@ha */ -/* 802C1D2C 38 03 B8 10 */ addi r0, r3, __vt__18Z2SoundObjBeeGroup@l /* 0x803CB810@l */ -/* 802C1D30 90 1F 00 10 */ stw r0, 0x10(r31) -/* 802C1D34 7F E3 FB 78 */ mr r3, r31 -/* 802C1D38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C1D3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C1D40 7C 08 03 A6 */ mtlr r0 -/* 802C1D44 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1D48 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/__dt__10Z2CreatureFv.s b/asm/Z2AudioLib/Z2Creature/__dt__10Z2CreatureFv.s deleted file mode 100644 index daed290df3..0000000000 --- a/asm/Z2AudioLib/Z2Creature/__dt__10Z2CreatureFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_802C0420: -/* 802C0420 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0424 7C 08 02 A6 */ mflr r0 -/* 802C0428 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C042C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C0430 93 C1 00 08 */ stw r30, 8(r1) -/* 802C0434 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802C0438 7C 9F 23 78 */ mr r31, r4 -/* 802C043C 41 82 00 90 */ beq lbl_802C04CC -/* 802C0440 3C 80 80 3D */ lis r4, __vt__10Z2Creature@ha /* 0x803CB8C0@ha */ -/* 802C0444 38 04 B8 C0 */ addi r0, r4, __vt__10Z2Creature@l /* 0x803CB8C0@l */ -/* 802C0448 90 1E 00 00 */ stw r0, 0(r30) -/* 802C044C 81 83 00 00 */ lwz r12, 0(r3) -/* 802C0450 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C0454 7D 89 03 A6 */ mtctr r12 -/* 802C0458 4E 80 04 21 */ bctrl -/* 802C045C 34 1E 00 70 */ addic. r0, r30, 0x70 -/* 802C0460 41 82 00 1C */ beq lbl_802C047C -/* 802C0464 3C 60 80 3D */ lis r3, __vt__16Z2SoundObjSimple@ha /* 0x803CAD10@ha */ -/* 802C0468 38 03 AD 10 */ addi r0, r3, __vt__16Z2SoundObjSimple@l /* 0x803CAD10@l */ -/* 802C046C 90 1E 00 80 */ stw r0, 0x80(r30) -/* 802C0470 38 7E 00 70 */ addi r3, r30, 0x70 -/* 802C0474 38 80 00 00 */ li r4, 0 -/* 802C0478 4B FF DA D1 */ bl __dt__14Z2SoundObjBaseFv -lbl_802C047C: -/* 802C047C 34 1E 00 50 */ addic. r0, r30, 0x50 -/* 802C0480 41 82 00 1C */ beq lbl_802C049C -/* 802C0484 3C 60 80 3D */ lis r3, __vt__16Z2SoundObjSimple@ha /* 0x803CAD10@ha */ -/* 802C0488 38 03 AD 10 */ addi r0, r3, __vt__16Z2SoundObjSimple@l /* 0x803CAD10@l */ -/* 802C048C 90 1E 00 60 */ stw r0, 0x60(r30) -/* 802C0490 38 7E 00 50 */ addi r3, r30, 0x50 -/* 802C0494 38 80 00 00 */ li r4, 0 -/* 802C0498 4B FF DA B1 */ bl __dt__14Z2SoundObjBaseFv -lbl_802C049C: -/* 802C049C 34 1E 00 08 */ addic. r0, r30, 8 -/* 802C04A0 41 82 00 1C */ beq lbl_802C04BC -/* 802C04A4 3C 60 80 3D */ lis r3, __vt__15Z2SoundObjAnime@ha /* 0x803CACD0@ha */ -/* 802C04A8 38 03 AC D0 */ addi r0, r3, __vt__15Z2SoundObjAnime@l /* 0x803CACD0@l */ -/* 802C04AC 90 1E 00 18 */ stw r0, 0x18(r30) -/* 802C04B0 38 7E 00 08 */ addi r3, r30, 8 -/* 802C04B4 38 80 00 00 */ li r4, 0 -/* 802C04B8 4B FF DA 91 */ bl __dt__14Z2SoundObjBaseFv -lbl_802C04BC: -/* 802C04BC 7F E0 07 35 */ extsh. r0, r31 -/* 802C04C0 40 81 00 0C */ ble lbl_802C04CC -/* 802C04C4 7F C3 F3 78 */ mr r3, r30 -/* 802C04C8 48 00 E8 75 */ bl __dl__FPv -lbl_802C04CC: -/* 802C04CC 7F C3 F3 78 */ mr r3, r30 -/* 802C04D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C04D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802C04D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C04DC 7C 08 03 A6 */ mtlr r0 -/* 802C04E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C04E4 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/__dt__17Z2CreatureCitizenFv.s b/asm/Z2AudioLib/Z2Creature/__dt__17Z2CreatureCitizenFv.s deleted file mode 100644 index 345cfeac6b..0000000000 --- a/asm/Z2AudioLib/Z2Creature/__dt__17Z2CreatureCitizenFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_802C0C6C: -/* 802C0C6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0C70 7C 08 02 A6 */ mflr r0 -/* 802C0C74 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0C78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C0C7C 93 C1 00 08 */ stw r30, 8(r1) -/* 802C0C80 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802C0C84 7C 9F 23 78 */ mr r31, r4 -/* 802C0C88 41 82 00 40 */ beq lbl_802C0CC8 -/* 802C0C8C 3C 60 80 3D */ lis r3, __vt__17Z2CreatureCitizen@ha /* 0x803CB890@ha */ -/* 802C0C90 38 03 B8 90 */ addi r0, r3, __vt__17Z2CreatureCitizen@l /* 0x803CB890@l */ -/* 802C0C94 90 1E 00 00 */ stw r0, 0(r30) -/* 802C0C98 34 1E 00 90 */ addic. r0, r30, 0x90 -/* 802C0C9C 41 82 00 10 */ beq lbl_802C0CAC -/* 802C0CA0 38 7E 00 90 */ addi r3, r30, 0x90 -/* 802C0CA4 38 80 00 00 */ li r4, 0 -/* 802C0CA8 48 01 B1 6D */ bl __dt__10JSUPtrLinkFv -lbl_802C0CAC: -/* 802C0CAC 7F C3 F3 78 */ mr r3, r30 -/* 802C0CB0 38 80 00 00 */ li r4, 0 -/* 802C0CB4 4B FF F7 6D */ bl __dt__10Z2CreatureFv -/* 802C0CB8 7F E0 07 35 */ extsh. r0, r31 -/* 802C0CBC 40 81 00 0C */ ble lbl_802C0CC8 -/* 802C0CC0 7F C3 F3 78 */ mr r3, r30 -/* 802C0CC4 48 00 E0 79 */ bl __dl__FPv -lbl_802C0CC8: -/* 802C0CC8 7F C3 F3 78 */ mr r3, r30 -/* 802C0CCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0CD0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802C0CD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0CD8 7C 08 03 A6 */ mtlr r0 -/* 802C0CDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0CE0 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/deleteObject__12Z2CreatureFMFv.s b/asm/Z2AudioLib/Z2Creature/deleteObject__12Z2CreatureFMFv.s deleted file mode 100644 index d499e3efa4..0000000000 --- a/asm/Z2AudioLib/Z2Creature/deleteObject__12Z2CreatureFMFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802C1FB0: -/* 802C1FB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C1FB4 7C 08 02 A6 */ mflr r0 -/* 802C1FB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1FBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C1FC0 7C 7F 1B 78 */ mr r31, r3 -/* 802C1FC4 4B FF F0 01 */ bl deleteObject__15Z2CreatureEnemyFv -/* 802C1FC8 38 7F 00 A4 */ addi r3, r31, 0xa4 -/* 802C1FCC 4B FF C0 2D */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C1FD0 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 802C1FD4 4B FF C0 25 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C1FD8 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 802C1FDC 4B FF C0 1D */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C1FE0 38 7F 01 04 */ addi r3, r31, 0x104 -/* 802C1FE4 4B FF C0 15 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C1FE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C1FEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C1FF0 7C 08 03 A6 */ mtlr r0 -/* 802C1FF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1FF8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/deleteObject__12Z2CreatureOIFv.s b/asm/Z2AudioLib/Z2Creature/deleteObject__12Z2CreatureOIFv.s deleted file mode 100644 index 3c2f14179d..0000000000 --- a/asm/Z2AudioLib/Z2Creature/deleteObject__12Z2CreatureOIFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_802C25EC: -/* 802C25EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C25F0 7C 08 02 A6 */ mflr r0 -/* 802C25F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C25F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C25FC 7C 7F 1B 78 */ mr r31, r3 -/* 802C2600 4B FF E9 C5 */ bl deleteObject__15Z2CreatureEnemyFv -/* 802C2604 38 7F 00 A4 */ addi r3, r31, 0xa4 -/* 802C2608 4B FF B9 F1 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C260C 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 802C2610 4B FF B9 E9 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C2614 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 802C2618 4B FF B9 E1 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C261C 38 7F 01 04 */ addi r3, r31, 0x104 -/* 802C2620 4B FF B9 D9 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C2624 38 7F 01 24 */ addi r3, r31, 0x124 -/* 802C2628 4B FF B9 D1 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C262C 38 7F 01 44 */ addi r3, r31, 0x144 -/* 802C2630 4B FF B9 C9 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C2634 38 7F 01 64 */ addi r3, r31, 0x164 -/* 802C2638 4B FF B9 C1 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C263C 38 7F 01 84 */ addi r3, r31, 0x184 -/* 802C2640 4B FF B9 B9 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C2644 38 7F 01 A4 */ addi r3, r31, 0x1a4 -/* 802C2648 4B FF B9 B1 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C264C 38 7F 01 C4 */ addi r3, r31, 0x1c4 -/* 802C2650 4B FF B9 A9 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C2654 38 7F 01 E4 */ addi r3, r31, 0x1e4 -/* 802C2658 4B FF B9 A1 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C265C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C2660 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C2664 7C 08 03 A6 */ mtlr r0 -/* 802C2668 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C266C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/deleteObject__15Z2CreatureEnemyFv.s b/asm/Z2AudioLib/Z2Creature/deleteObject__15Z2CreatureEnemyFv.s deleted file mode 100644 index db881ff35c..0000000000 --- a/asm/Z2AudioLib/Z2Creature/deleteObject__15Z2CreatureEnemyFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_802C0FC4: -/* 802C0FC4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C0FC8 7C 08 02 A6 */ mflr r0 -/* 802C0FCC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C0FD0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802C0FD4 7C 7F 1B 78 */ mr r31, r3 -/* 802C0FD8 88 03 00 A0 */ lbz r0, 0xa0(r3) -/* 802C0FDC 28 00 00 2C */ cmplwi r0, 0x2c -/* 802C0FE0 40 82 00 5C */ bne lbl_802C103C -/* 802C0FE4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C0FE8 C0 62 C2 20 */ lfs f3, lit_3669(r2) -/* 802C0FEC D0 63 00 34 */ stfs f3, 0x34(r3) -/* 802C0FF0 C0 02 C2 34 */ lfs f0, lit_3717(r2) -/* 802C0FF4 D0 03 00 38 */ stfs f0, 0x38(r3) -/* 802C0FF8 38 00 00 00 */ li r0, 0 -/* 802C0FFC 90 03 00 40 */ stw r0, 0x40(r3) -/* 802C1000 D0 03 00 3C */ stfs f0, 0x3c(r3) -/* 802C1004 C0 03 00 44 */ lfs f0, 0x44(r3) -/* 802C1008 38 00 00 21 */ li r0, 0x21 -/* 802C100C 90 03 00 50 */ stw r0, 0x50(r3) -/* 802C1010 EC 43 00 28 */ fsubs f2, f3, f0 -/* 802C1014 80 03 00 50 */ lwz r0, 0x50(r3) -/* 802C1018 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C101C 90 01 00 0C */ stw r0, 0xc(r1) -/* 802C1020 3C 00 43 30 */ lis r0, 0x4330 -/* 802C1024 90 01 00 08 */ stw r0, 8(r1) -/* 802C1028 C8 01 00 08 */ lfd f0, 8(r1) -/* 802C102C EC 00 08 28 */ fsubs f0, f0, f1 -/* 802C1030 EC 02 00 24 */ fdivs f0, f2, f0 -/* 802C1034 D0 03 00 48 */ stfs f0, 0x48(r3) -/* 802C1038 D0 63 00 4C */ stfs f3, 0x4c(r3) -lbl_802C103C: -/* 802C103C 80 1F 00 94 */ lwz r0, 0x94(r31) -/* 802C1040 28 00 00 00 */ cmplwi r0, 0 -/* 802C1044 41 82 00 1C */ beq lbl_802C1060 -/* 802C1048 7F E4 FB 78 */ mr r4, r31 -/* 802C104C 28 1F 00 00 */ cmplwi r31, 0 -/* 802C1050 41 82 00 08 */ beq lbl_802C1058 -/* 802C1054 38 9F 00 90 */ addi r4, r31, 0x90 -lbl_802C1058: -/* 802C1058 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) -/* 802C105C 4B FF F1 35 */ bl func_802C0190 -lbl_802C1060: -/* 802C1060 38 00 00 00 */ li r0, 0 -/* 802C1064 90 1F 00 28 */ stw r0, 0x28(r31) -/* 802C1068 38 7F 00 08 */ addi r3, r31, 8 -/* 802C106C 4B FF CF 8D */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C1070 38 7F 00 50 */ addi r3, r31, 0x50 -/* 802C1074 4B FF CF 85 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C1078 38 7F 00 70 */ addi r3, r31, 0x70 -/* 802C107C 4B FF CF 7D */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C1080 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802C1084 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C1088 7C 08 03 A6 */ mtlr r0 -/* 802C108C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C1090 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/deleteObject__16Z2CreatureSumomoFv.s b/asm/Z2AudioLib/Z2Creature/deleteObject__16Z2CreatureSumomoFv.s deleted file mode 100644 index 9815ce542b..0000000000 --- a/asm/Z2AudioLib/Z2Creature/deleteObject__16Z2CreatureSumomoFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_802C1CA0: -/* 802C1CA0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C1CA4 7C 08 02 A6 */ mflr r0 -/* 802C1CA8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C1CAC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802C1CB0 7C 7F 1B 78 */ mr r31, r3 -/* 802C1CB4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C1CB8 80 83 00 04 */ lwz r4, 4(r3) -/* 802C1CBC 28 04 00 00 */ cmplwi r4, 0 -/* 802C1CC0 41 82 00 10 */ beq lbl_802C1CD0 -/* 802C1CC4 80 84 00 18 */ lwz r4, 0x18(r4) -/* 802C1CC8 90 81 00 08 */ stw r4, 8(r1) -/* 802C1CCC 48 00 00 08 */ b lbl_802C1CD4 -lbl_802C1CD0: -/* 802C1CD0 38 80 FF FF */ li r4, -1 -lbl_802C1CD4: -/* 802C1CD4 3C 04 FF 00 */ addis r0, r4, 0xff00 -/* 802C1CD8 28 00 00 64 */ cmplwi r0, 0x64 -/* 802C1CDC 40 82 00 18 */ bne lbl_802C1CF4 -/* 802C1CE0 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) -/* 802C1CE4 88 04 00 2C */ lbz r0, 0x2c(r4) -/* 802C1CE8 28 00 00 06 */ cmplwi r0, 6 -/* 802C1CEC 41 82 00 08 */ beq lbl_802C1CF4 -/* 802C1CF0 4B FE DB 95 */ bl subBgmStop__8Z2SeqMgrFv -lbl_802C1CF4: -/* 802C1CF4 7F E3 FB 78 */ mr r3, r31 -/* 802C1CF8 4B FF E7 F1 */ bl deleteObject__10Z2CreatureFv -/* 802C1CFC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802C1D00 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C1D04 7C 08 03 A6 */ mtlr r0 -/* 802C1D08 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C1D0C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/framework__12Z2CreatureFMFUlSc.s b/asm/Z2AudioLib/Z2Creature/framework__12Z2CreatureFMFUlSc.s deleted file mode 100644 index 8f5eefca07..0000000000 --- a/asm/Z2AudioLib/Z2Creature/framework__12Z2CreatureFMFUlSc.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_802C20E8: -/* 802C20E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C20EC 7C 08 02 A6 */ mflr r0 -/* 802C20F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C20F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C20F8 48 0A 00 E5 */ bl _savegpr_29 -/* 802C20FC 7C 7D 1B 78 */ mr r29, r3 -/* 802C2100 7C 9E 23 78 */ mr r30, r4 -/* 802C2104 7C BF 2B 78 */ mr r31, r5 -/* 802C2108 4B FF E5 45 */ bl framework__10Z2CreatureFUlSc -/* 802C210C 38 7D 00 A4 */ addi r3, r29, 0xa4 -/* 802C2110 7F C4 F3 78 */ mr r4, r30 -/* 802C2114 7F E5 FB 78 */ mr r5, r31 -/* 802C2118 81 9D 00 B4 */ lwz r12, 0xb4(r29) -/* 802C211C 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C2120 7D 89 03 A6 */ mtctr r12 -/* 802C2124 4E 80 04 21 */ bctrl -/* 802C2128 38 7D 00 C4 */ addi r3, r29, 0xc4 -/* 802C212C 7F C4 F3 78 */ mr r4, r30 -/* 802C2130 7F E5 FB 78 */ mr r5, r31 -/* 802C2134 81 9D 00 D4 */ lwz r12, 0xd4(r29) -/* 802C2138 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C213C 7D 89 03 A6 */ mtctr r12 -/* 802C2140 4E 80 04 21 */ bctrl -/* 802C2144 38 7D 00 E4 */ addi r3, r29, 0xe4 -/* 802C2148 7F C4 F3 78 */ mr r4, r30 -/* 802C214C 7F E5 FB 78 */ mr r5, r31 -/* 802C2150 81 9D 00 F4 */ lwz r12, 0xf4(r29) -/* 802C2154 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C2158 7D 89 03 A6 */ mtctr r12 -/* 802C215C 4E 80 04 21 */ bctrl -/* 802C2160 38 7D 01 04 */ addi r3, r29, 0x104 -/* 802C2164 7F C4 F3 78 */ mr r4, r30 -/* 802C2168 7F E5 FB 78 */ mr r5, r31 -/* 802C216C 81 9D 01 14 */ lwz r12, 0x114(r29) -/* 802C2170 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C2174 7D 89 03 A6 */ mtctr r12 -/* 802C2178 4E 80 04 21 */ bctrl -/* 802C217C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C2180 48 0A 00 A9 */ bl _restgpr_29 -/* 802C2184 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C2188 7C 08 03 A6 */ mtlr r0 -/* 802C218C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C2190 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/framework__12Z2CreatureOIFUlSc.s b/asm/Z2AudioLib/Z2Creature/framework__12Z2CreatureOIFUlSc.s deleted file mode 100644 index cd3bb9a154..0000000000 --- a/asm/Z2AudioLib/Z2Creature/framework__12Z2CreatureOIFUlSc.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_802C2864: -/* 802C2864 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C2868 7C 08 02 A6 */ mflr r0 -/* 802C286C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C2870 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C2874 48 09 F9 69 */ bl _savegpr_29 -/* 802C2878 7C 7D 1B 78 */ mr r29, r3 -/* 802C287C 7C 9E 23 78 */ mr r30, r4 -/* 802C2880 7C BF 2B 78 */ mr r31, r5 -/* 802C2884 4B FF DD C9 */ bl framework__10Z2CreatureFUlSc -/* 802C2888 38 7D 00 A4 */ addi r3, r29, 0xa4 -/* 802C288C 7F C4 F3 78 */ mr r4, r30 -/* 802C2890 7F E5 FB 78 */ mr r5, r31 -/* 802C2894 81 9D 00 B4 */ lwz r12, 0xb4(r29) -/* 802C2898 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C289C 7D 89 03 A6 */ mtctr r12 -/* 802C28A0 4E 80 04 21 */ bctrl -/* 802C28A4 38 7D 00 C4 */ addi r3, r29, 0xc4 -/* 802C28A8 7F C4 F3 78 */ mr r4, r30 -/* 802C28AC 7F E5 FB 78 */ mr r5, r31 -/* 802C28B0 81 9D 00 D4 */ lwz r12, 0xd4(r29) -/* 802C28B4 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C28B8 7D 89 03 A6 */ mtctr r12 -/* 802C28BC 4E 80 04 21 */ bctrl -/* 802C28C0 38 7D 00 E4 */ addi r3, r29, 0xe4 -/* 802C28C4 7F C4 F3 78 */ mr r4, r30 -/* 802C28C8 7F E5 FB 78 */ mr r5, r31 -/* 802C28CC 81 9D 00 F4 */ lwz r12, 0xf4(r29) -/* 802C28D0 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C28D4 7D 89 03 A6 */ mtctr r12 -/* 802C28D8 4E 80 04 21 */ bctrl -/* 802C28DC 38 7D 01 04 */ addi r3, r29, 0x104 -/* 802C28E0 7F C4 F3 78 */ mr r4, r30 -/* 802C28E4 7F E5 FB 78 */ mr r5, r31 -/* 802C28E8 81 9D 01 14 */ lwz r12, 0x114(r29) -/* 802C28EC 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C28F0 7D 89 03 A6 */ mtctr r12 -/* 802C28F4 4E 80 04 21 */ bctrl -/* 802C28F8 38 7D 01 24 */ addi r3, r29, 0x124 -/* 802C28FC 7F C4 F3 78 */ mr r4, r30 -/* 802C2900 7F E5 FB 78 */ mr r5, r31 -/* 802C2904 81 9D 01 34 */ lwz r12, 0x134(r29) -/* 802C2908 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C290C 7D 89 03 A6 */ mtctr r12 -/* 802C2910 4E 80 04 21 */ bctrl -/* 802C2914 38 7D 01 44 */ addi r3, r29, 0x144 -/* 802C2918 7F C4 F3 78 */ mr r4, r30 -/* 802C291C 7F E5 FB 78 */ mr r5, r31 -/* 802C2920 81 9D 01 54 */ lwz r12, 0x154(r29) -/* 802C2924 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C2928 7D 89 03 A6 */ mtctr r12 -/* 802C292C 4E 80 04 21 */ bctrl -/* 802C2930 38 7D 01 64 */ addi r3, r29, 0x164 -/* 802C2934 7F C4 F3 78 */ mr r4, r30 -/* 802C2938 7F E5 FB 78 */ mr r5, r31 -/* 802C293C 81 9D 01 74 */ lwz r12, 0x174(r29) -/* 802C2940 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C2944 7D 89 03 A6 */ mtctr r12 -/* 802C2948 4E 80 04 21 */ bctrl -/* 802C294C 38 7D 01 84 */ addi r3, r29, 0x184 -/* 802C2950 7F C4 F3 78 */ mr r4, r30 -/* 802C2954 7F E5 FB 78 */ mr r5, r31 -/* 802C2958 81 9D 01 94 */ lwz r12, 0x194(r29) -/* 802C295C 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C2960 7D 89 03 A6 */ mtctr r12 -/* 802C2964 4E 80 04 21 */ bctrl -/* 802C2968 38 7D 01 A4 */ addi r3, r29, 0x1a4 -/* 802C296C 7F C4 F3 78 */ mr r4, r30 -/* 802C2970 7F E5 FB 78 */ mr r5, r31 -/* 802C2974 81 9D 01 B4 */ lwz r12, 0x1b4(r29) -/* 802C2978 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C297C 7D 89 03 A6 */ mtctr r12 -/* 802C2980 4E 80 04 21 */ bctrl -/* 802C2984 38 7D 01 C4 */ addi r3, r29, 0x1c4 -/* 802C2988 7F C4 F3 78 */ mr r4, r30 -/* 802C298C 7F E5 FB 78 */ mr r5, r31 -/* 802C2990 81 9D 01 D4 */ lwz r12, 0x1d4(r29) -/* 802C2994 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C2998 7D 89 03 A6 */ mtctr r12 -/* 802C299C 4E 80 04 21 */ bctrl -/* 802C29A0 38 7D 01 E4 */ addi r3, r29, 0x1e4 -/* 802C29A4 7F C4 F3 78 */ mr r4, r30 -/* 802C29A8 7F E5 FB 78 */ mr r5, r31 -/* 802C29AC 81 9D 01 F4 */ lwz r12, 0x1f4(r29) -/* 802C29B0 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C29B4 7D 89 03 A6 */ mtctr r12 -/* 802C29B8 4E 80 04 21 */ bctrl -/* 802C29BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C29C0 48 09 F8 69 */ bl _restgpr_29 -/* 802C29C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C29C8 7C 08 03 A6 */ mtlr r0 -/* 802C29CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C29D0 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc.s b/asm/Z2AudioLib/Z2Creature/init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc.s deleted file mode 100644 index b8d16f8345..0000000000 --- a/asm/Z2AudioLib/Z2Creature/init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_802C1FFC: -/* 802C1FFC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802C2000 7C 08 02 A6 */ mflr r0 -/* 802C2004 90 01 00 34 */ stw r0, 0x34(r1) -/* 802C2008 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C200C 48 0A 01 B9 */ bl _savegpr_23 -/* 802C2010 7C 77 1B 78 */ mr r23, r3 -/* 802C2014 7C D8 33 78 */ mr r24, r6 -/* 802C2018 7C F9 3B 78 */ mr r25, r7 -/* 802C201C 7D 1A 43 78 */ mr r26, r8 -/* 802C2020 7D 3B 4B 78 */ mr r27, r9 -/* 802C2024 88 E1 00 3B */ lbz r7, 0x3b(r1) -/* 802C2028 8B 81 00 3F */ lbz r28, 0x3f(r1) -/* 802C202C 8B A1 00 43 */ lbz r29, 0x43(r1) -/* 802C2030 8B C1 00 47 */ lbz r30, 0x47(r1) -/* 802C2034 8B E1 00 4B */ lbz r31, 0x4b(r1) -/* 802C2038 7D 46 53 78 */ mr r6, r10 -/* 802C203C 4B FF E4 F5 */ bl init__10Z2CreatureFP3VecP3VecUcUc -/* 802C2040 28 18 00 00 */ cmplwi r24, 0 -/* 802C2044 41 82 00 20 */ beq lbl_802C2064 -/* 802C2048 38 77 00 A4 */ addi r3, r23, 0xa4 -/* 802C204C 7F 04 C3 78 */ mr r4, r24 -/* 802C2050 7F 85 E3 78 */ mr r5, r28 -/* 802C2054 81 97 00 B4 */ lwz r12, 0xb4(r23) -/* 802C2058 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C205C 7D 89 03 A6 */ mtctr r12 -/* 802C2060 4E 80 04 21 */ bctrl -lbl_802C2064: -/* 802C2064 28 19 00 00 */ cmplwi r25, 0 -/* 802C2068 41 82 00 20 */ beq lbl_802C2088 -/* 802C206C 38 77 00 C4 */ addi r3, r23, 0xc4 -/* 802C2070 7F 24 CB 78 */ mr r4, r25 -/* 802C2074 7F A5 EB 78 */ mr r5, r29 -/* 802C2078 81 97 00 D4 */ lwz r12, 0xd4(r23) -/* 802C207C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C2080 7D 89 03 A6 */ mtctr r12 -/* 802C2084 4E 80 04 21 */ bctrl -lbl_802C2088: -/* 802C2088 28 1A 00 00 */ cmplwi r26, 0 -/* 802C208C 41 82 00 20 */ beq lbl_802C20AC -/* 802C2090 38 77 00 E4 */ addi r3, r23, 0xe4 -/* 802C2094 7F 44 D3 78 */ mr r4, r26 -/* 802C2098 7F C5 F3 78 */ mr r5, r30 -/* 802C209C 81 97 00 F4 */ lwz r12, 0xf4(r23) -/* 802C20A0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C20A4 7D 89 03 A6 */ mtctr r12 -/* 802C20A8 4E 80 04 21 */ bctrl -lbl_802C20AC: -/* 802C20AC 28 1B 00 00 */ cmplwi r27, 0 -/* 802C20B0 41 82 00 20 */ beq lbl_802C20D0 -/* 802C20B4 38 77 01 04 */ addi r3, r23, 0x104 -/* 802C20B8 7F 64 DB 78 */ mr r4, r27 -/* 802C20BC 7F E5 FB 78 */ mr r5, r31 -/* 802C20C0 81 97 01 14 */ lwz r12, 0x114(r23) -/* 802C20C4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C20C8 7D 89 03 A6 */ mtctr r12 -/* 802C20CC 4E 80 04 21 */ bctrl -lbl_802C20D0: -/* 802C20D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C20D4 48 0A 01 3D */ bl _restgpr_23 -/* 802C20D8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802C20DC 7C 08 03 A6 */ mtlr r0 -/* 802C20E0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C20E4 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec.s b/asm/Z2AudioLib/Z2Creature/init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec.s deleted file mode 100644 index b33efc1d0e..0000000000 --- a/asm/Z2AudioLib/Z2Creature/init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec.s +++ /dev/null @@ -1,137 +0,0 @@ -lbl_802C2670: -/* 802C2670 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802C2674 7C 08 02 A6 */ mflr r0 -/* 802C2678 90 01 00 44 */ stw r0, 0x44(r1) -/* 802C267C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C2680 48 09 FB 39 */ bl _savegpr_20 -/* 802C2684 7C 74 1B 78 */ mr r20, r3 -/* 802C2688 7C D5 33 78 */ mr r21, r6 -/* 802C268C 7C F6 3B 78 */ mr r22, r7 -/* 802C2690 7D 17 43 78 */ mr r23, r8 -/* 802C2694 7D 38 4B 78 */ mr r24, r9 -/* 802C2698 7D 59 53 78 */ mr r25, r10 -/* 802C269C 83 41 00 48 */ lwz r26, 0x48(r1) -/* 802C26A0 83 61 00 4C */ lwz r27, 0x4c(r1) -/* 802C26A4 83 81 00 50 */ lwz r28, 0x50(r1) -/* 802C26A8 83 A1 00 54 */ lwz r29, 0x54(r1) -/* 802C26AC 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 802C26B0 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 802C26B4 38 C0 00 01 */ li r6, 1 -/* 802C26B8 38 E0 00 01 */ li r7, 1 -/* 802C26BC 4B FF DE 75 */ bl init__10Z2CreatureFP3VecP3VecUcUc -/* 802C26C0 28 15 00 00 */ cmplwi r21, 0 -/* 802C26C4 41 82 00 20 */ beq lbl_802C26E4 -/* 802C26C8 38 74 00 A4 */ addi r3, r20, 0xa4 -/* 802C26CC 7E A4 AB 78 */ mr r4, r21 -/* 802C26D0 38 A0 00 01 */ li r5, 1 -/* 802C26D4 81 94 00 B4 */ lwz r12, 0xb4(r20) -/* 802C26D8 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C26DC 7D 89 03 A6 */ mtctr r12 -/* 802C26E0 4E 80 04 21 */ bctrl -lbl_802C26E4: -/* 802C26E4 28 16 00 00 */ cmplwi r22, 0 -/* 802C26E8 41 82 00 20 */ beq lbl_802C2708 -/* 802C26EC 38 74 00 C4 */ addi r3, r20, 0xc4 -/* 802C26F0 7E C4 B3 78 */ mr r4, r22 -/* 802C26F4 38 A0 00 01 */ li r5, 1 -/* 802C26F8 81 94 00 D4 */ lwz r12, 0xd4(r20) -/* 802C26FC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C2700 7D 89 03 A6 */ mtctr r12 -/* 802C2704 4E 80 04 21 */ bctrl -lbl_802C2708: -/* 802C2708 28 17 00 00 */ cmplwi r23, 0 -/* 802C270C 41 82 00 20 */ beq lbl_802C272C -/* 802C2710 38 74 00 E4 */ addi r3, r20, 0xe4 -/* 802C2714 7E E4 BB 78 */ mr r4, r23 -/* 802C2718 38 A0 00 01 */ li r5, 1 -/* 802C271C 81 94 00 F4 */ lwz r12, 0xf4(r20) -/* 802C2720 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C2724 7D 89 03 A6 */ mtctr r12 -/* 802C2728 4E 80 04 21 */ bctrl -lbl_802C272C: -/* 802C272C 28 18 00 00 */ cmplwi r24, 0 -/* 802C2730 41 82 00 20 */ beq lbl_802C2750 -/* 802C2734 38 74 01 04 */ addi r3, r20, 0x104 -/* 802C2738 7F 04 C3 78 */ mr r4, r24 -/* 802C273C 38 A0 00 01 */ li r5, 1 -/* 802C2740 81 94 01 14 */ lwz r12, 0x114(r20) -/* 802C2744 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C2748 7D 89 03 A6 */ mtctr r12 -/* 802C274C 4E 80 04 21 */ bctrl -lbl_802C2750: -/* 802C2750 28 19 00 00 */ cmplwi r25, 0 -/* 802C2754 41 82 00 20 */ beq lbl_802C2774 -/* 802C2758 38 74 01 24 */ addi r3, r20, 0x124 -/* 802C275C 7F 24 CB 78 */ mr r4, r25 -/* 802C2760 38 A0 00 01 */ li r5, 1 -/* 802C2764 81 94 01 34 */ lwz r12, 0x134(r20) -/* 802C2768 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C276C 7D 89 03 A6 */ mtctr r12 -/* 802C2770 4E 80 04 21 */ bctrl -lbl_802C2774: -/* 802C2774 28 1A 00 00 */ cmplwi r26, 0 -/* 802C2778 41 82 00 20 */ beq lbl_802C2798 -/* 802C277C 38 74 01 44 */ addi r3, r20, 0x144 -/* 802C2780 7F 44 D3 78 */ mr r4, r26 -/* 802C2784 38 A0 00 01 */ li r5, 1 -/* 802C2788 81 94 01 54 */ lwz r12, 0x154(r20) -/* 802C278C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C2790 7D 89 03 A6 */ mtctr r12 -/* 802C2794 4E 80 04 21 */ bctrl -lbl_802C2798: -/* 802C2798 28 1B 00 00 */ cmplwi r27, 0 -/* 802C279C 41 82 00 20 */ beq lbl_802C27BC -/* 802C27A0 38 74 01 64 */ addi r3, r20, 0x164 -/* 802C27A4 7F 64 DB 78 */ mr r4, r27 -/* 802C27A8 38 A0 00 01 */ li r5, 1 -/* 802C27AC 81 94 01 74 */ lwz r12, 0x174(r20) -/* 802C27B0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C27B4 7D 89 03 A6 */ mtctr r12 -/* 802C27B8 4E 80 04 21 */ bctrl -lbl_802C27BC: -/* 802C27BC 28 1C 00 00 */ cmplwi r28, 0 -/* 802C27C0 41 82 00 20 */ beq lbl_802C27E0 -/* 802C27C4 38 74 01 84 */ addi r3, r20, 0x184 -/* 802C27C8 7F 84 E3 78 */ mr r4, r28 -/* 802C27CC 38 A0 00 01 */ li r5, 1 -/* 802C27D0 81 94 01 94 */ lwz r12, 0x194(r20) -/* 802C27D4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C27D8 7D 89 03 A6 */ mtctr r12 -/* 802C27DC 4E 80 04 21 */ bctrl -lbl_802C27E0: -/* 802C27E0 28 1D 00 00 */ cmplwi r29, 0 -/* 802C27E4 41 82 00 20 */ beq lbl_802C2804 -/* 802C27E8 38 74 01 A4 */ addi r3, r20, 0x1a4 -/* 802C27EC 7F A4 EB 78 */ mr r4, r29 -/* 802C27F0 38 A0 00 01 */ li r5, 1 -/* 802C27F4 81 94 01 B4 */ lwz r12, 0x1b4(r20) -/* 802C27F8 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C27FC 7D 89 03 A6 */ mtctr r12 -/* 802C2800 4E 80 04 21 */ bctrl -lbl_802C2804: -/* 802C2804 28 1E 00 00 */ cmplwi r30, 0 -/* 802C2808 41 82 00 20 */ beq lbl_802C2828 -/* 802C280C 38 74 01 C4 */ addi r3, r20, 0x1c4 -/* 802C2810 7F C4 F3 78 */ mr r4, r30 -/* 802C2814 38 A0 00 01 */ li r5, 1 -/* 802C2818 81 94 01 D4 */ lwz r12, 0x1d4(r20) -/* 802C281C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C2820 7D 89 03 A6 */ mtctr r12 -/* 802C2824 4E 80 04 21 */ bctrl -lbl_802C2828: -/* 802C2828 28 1F 00 00 */ cmplwi r31, 0 -/* 802C282C 41 82 00 20 */ beq lbl_802C284C -/* 802C2830 38 74 01 E4 */ addi r3, r20, 0x1e4 -/* 802C2834 7F E4 FB 78 */ mr r4, r31 -/* 802C2838 38 A0 00 01 */ li r5, 1 -/* 802C283C 81 94 01 F4 */ lwz r12, 0x1f4(r20) -/* 802C2840 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C2844 7D 89 03 A6 */ mtctr r12 -/* 802C2848 4E 80 04 21 */ bctrl -lbl_802C284C: -/* 802C284C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C2850 48 09 F9 B5 */ bl _restgpr_20 -/* 802C2854 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802C2858 7C 08 03 A6 */ mtlr r0 -/* 802C285C 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C2860 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc.s b/asm/Z2AudioLib/Z2Creature/init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc.s deleted file mode 100644 index 6e4a1df82b..0000000000 --- a/asm/Z2AudioLib/Z2Creature/init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802C24B0: -/* 802C24B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C24B4 7C 08 02 A6 */ mflr r0 -/* 802C24B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C24BC 4B FF E0 F5 */ bl init__10Z2CreatureFP3VecP3VecP3VecUcUcUc -/* 802C24C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C24C4 7C 08 03 A6 */ mtlr r0 -/* 802C24C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C24CC 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/init__18Z2SoundObjBeeGroupFP3VecUc.s b/asm/Z2AudioLib/Z2Creature/init__18Z2SoundObjBeeGroupFP3VecUc.s deleted file mode 100644 index bea5e742da..0000000000 --- a/asm/Z2AudioLib/Z2Creature/init__18Z2SoundObjBeeGroupFP3VecUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802C1D4C: -/* 802C1D4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C1D50 7C 08 02 A6 */ mflr r0 -/* 802C1D54 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1D58 4B FF C2 59 */ bl init__14Z2SoundObjBaseFP3VecUc -/* 802C1D5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C1D60 7C 08 03 A6 */ mtlr r0 -/* 802C1D64 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1D68 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc.s b/asm/Z2AudioLib/Z2Creature/playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc.s deleted file mode 100644 index b72321e9e3..0000000000 --- a/asm/Z2AudioLib/Z2Creature/playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc.s +++ /dev/null @@ -1,133 +0,0 @@ -lbl_802C1D6C: -/* 802C1D6C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802C1D70 7C 08 02 A6 */ mflr r0 -/* 802C1D74 90 01 00 44 */ stw r0, 0x44(r1) -/* 802C1D78 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C1D7C 48 0A 04 61 */ bl _savegpr_29 -/* 802C1D80 7C 7E 1B 78 */ mr r30, r3 -/* 802C1D84 7C BF 2B 78 */ mr r31, r5 -/* 802C1D88 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 802C1D8C 41 82 01 B0 */ beq lbl_802C1F3C -/* 802C1D90 80 A4 00 00 */ lwz r5, 0(r4) -/* 802C1D94 3C 80 00 07 */ lis r4, 0x0007 /* 0x00070127@ha */ -/* 802C1D98 38 04 01 27 */ addi r0, r4, 0x0127 /* 0x00070127@l */ -/* 802C1D9C 7C 05 00 00 */ cmpw r5, r0 -/* 802C1DA0 41 82 00 68 */ beq lbl_802C1E08 -/* 802C1DA4 40 80 00 24 */ bge lbl_802C1DC8 -/* 802C1DA8 38 64 01 25 */ addi r3, r4, 0x125 -/* 802C1DAC 7C 05 18 00 */ cmpw r5, r3 -/* 802C1DB0 41 82 00 88 */ beq lbl_802C1E38 -/* 802C1DB4 40 80 00 44 */ bge lbl_802C1DF8 -/* 802C1DB8 38 04 01 24 */ addi r0, r4, 0x124 -/* 802C1DBC 7C 05 00 00 */ cmpw r5, r0 -/* 802C1DC0 40 80 00 58 */ bge lbl_802C1E18 -/* 802C1DC4 48 00 00 74 */ b lbl_802C1E38 -lbl_802C1DC8: -/* 802C1DC8 38 64 03 76 */ addi r3, r4, 0x376 -/* 802C1DCC 7C 05 18 00 */ cmpw r5, r3 -/* 802C1DD0 41 82 00 68 */ beq lbl_802C1E38 -/* 802C1DD4 40 80 00 14 */ bge lbl_802C1DE8 -/* 802C1DD8 38 04 03 75 */ addi r0, r4, 0x375 -/* 802C1DDC 7C 05 00 00 */ cmpw r5, r0 -/* 802C1DE0 40 80 00 44 */ bge lbl_802C1E24 -/* 802C1DE4 48 00 00 54 */ b lbl_802C1E38 -lbl_802C1DE8: -/* 802C1DE8 38 04 03 78 */ addi r0, r4, 0x378 -/* 802C1DEC 7C 05 00 00 */ cmpw r5, r0 -/* 802C1DF0 40 80 00 48 */ bge lbl_802C1E38 -/* 802C1DF4 48 00 00 3C */ b lbl_802C1E30 -lbl_802C1DF8: -/* 802C1DF8 38 04 01 29 */ addi r0, r4, 0x129 -/* 802C1DFC 90 01 00 20 */ stw r0, 0x20(r1) -/* 802C1E00 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C1E04 48 00 00 34 */ b lbl_802C1E38 -lbl_802C1E08: -/* 802C1E08 38 04 01 2A */ addi r0, r4, 0x12a -/* 802C1E0C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802C1E10 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C1E14 48 00 00 24 */ b lbl_802C1E38 -lbl_802C1E18: -/* 802C1E18 90 61 00 18 */ stw r3, 0x18(r1) -/* 802C1E1C 90 61 00 24 */ stw r3, 0x24(r1) -/* 802C1E20 48 00 00 18 */ b lbl_802C1E38 -lbl_802C1E24: -/* 802C1E24 90 61 00 14 */ stw r3, 0x14(r1) -/* 802C1E28 90 61 00 24 */ stw r3, 0x24(r1) -/* 802C1E2C 48 00 00 0C */ b lbl_802C1E38 -lbl_802C1E30: -/* 802C1E30 90 01 00 10 */ stw r0, 0x10(r1) -/* 802C1E34 90 01 00 24 */ stw r0, 0x24(r1) -lbl_802C1E38: -/* 802C1E38 90 A1 00 0C */ stw r5, 0xc(r1) -/* 802C1E3C 7F C3 F3 78 */ mr r3, r30 -/* 802C1E40 38 81 00 0C */ addi r4, r1, 0xc -/* 802C1E44 38 A0 00 00 */ li r5, 0 -/* 802C1E48 38 C0 FF FF */ li r6, -1 -/* 802C1E4C 81 9E 00 10 */ lwz r12, 0x10(r30) -/* 802C1E50 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C1E54 7D 89 03 A6 */ mtctr r12 -/* 802C1E58 4E 80 04 21 */ bctrl -/* 802C1E5C 7C 7D 1B 78 */ mr r29, r3 -/* 802C1E60 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C1E64 90 01 00 08 */ stw r0, 8(r1) -/* 802C1E68 7F C3 F3 78 */ mr r3, r30 -/* 802C1E6C 38 81 00 08 */ addi r4, r1, 8 -/* 802C1E70 38 A0 00 00 */ li r5, 0 -/* 802C1E74 38 C0 FF FF */ li r6, -1 -/* 802C1E78 81 9E 00 10 */ lwz r12, 0x10(r30) -/* 802C1E7C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C1E80 7D 89 03 A6 */ mtctr r12 -/* 802C1E84 4E 80 04 21 */ bctrl -/* 802C1E88 7C 7E 1B 78 */ mr r30, r3 -/* 802C1E8C 28 1D 00 00 */ cmplwi r29, 0 -/* 802C1E90 41 82 00 54 */ beq lbl_802C1EE4 -/* 802C1E94 80 1D 00 00 */ lwz r0, 0(r29) -/* 802C1E98 28 00 00 00 */ cmplwi r0, 0 -/* 802C1E9C 41 82 00 48 */ beq lbl_802C1EE4 -/* 802C1EA0 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 802C1EA4 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C1EA8 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802C1EAC 3C 00 43 30 */ lis r0, 0x4330 -/* 802C1EB0 90 01 00 28 */ stw r0, 0x28(r1) -/* 802C1EB4 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802C1EB8 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C1EBC C0 42 C2 20 */ lfs f2, lit_3669(r2) -/* 802C1EC0 C0 62 C2 70 */ lfs f3, lit_4561(r2) -/* 802C1EC4 C0 82 C2 1C */ lfs f4, lit_3668(r2) -/* 802C1EC8 FC A0 10 90 */ fmr f5, f2 -/* 802C1ECC 38 60 00 00 */ li r3, 0 -/* 802C1ED0 4B FE 77 BD */ bl linearTransform__6Z2CalcFfffffb -/* 802C1ED4 80 7D 00 00 */ lwz r3, 0(r29) -/* 802C1ED8 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C1EDC 38 80 00 00 */ li r4, 0 -/* 802C1EE0 4B FE 0E D5 */ bl moveVolume__18JAISoundParamsMoveFfUl -lbl_802C1EE4: -/* 802C1EE4 28 1E 00 00 */ cmplwi r30, 0 -/* 802C1EE8 41 82 00 54 */ beq lbl_802C1F3C -/* 802C1EEC 80 1E 00 00 */ lwz r0, 0(r30) -/* 802C1EF0 28 00 00 00 */ cmplwi r0, 0 -/* 802C1EF4 41 82 00 48 */ beq lbl_802C1F3C -/* 802C1EF8 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 802C1EFC C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C1F00 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802C1F04 3C 00 43 30 */ lis r0, 0x4330 -/* 802C1F08 90 01 00 28 */ stw r0, 0x28(r1) -/* 802C1F0C C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802C1F10 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C1F14 C0 42 C2 20 */ lfs f2, lit_3669(r2) -/* 802C1F18 C0 62 C2 74 */ lfs f3, lit_4562(r2) -/* 802C1F1C C0 82 C2 4C */ lfs f4, lit_4092(r2) -/* 802C1F20 FC A0 10 90 */ fmr f5, f2 -/* 802C1F24 38 60 00 00 */ li r3, 0 -/* 802C1F28 4B FE 77 65 */ bl linearTransform__6Z2CalcFfffffb -/* 802C1F2C 80 7E 00 00 */ lwz r3, 0(r30) -/* 802C1F30 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C1F34 38 80 00 00 */ li r4, 0 -/* 802C1F38 4B FE 0E 7D */ bl moveVolume__18JAISoundParamsMoveFfUl -lbl_802C1F3C: -/* 802C1F3C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C1F40 48 0A 02 E9 */ bl _restgpr_29 -/* 802C1F44 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802C1F48 7C 08 03 A6 */ mtlr r0 -/* 802C1F4C 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C1F50 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/playSumomoBgm__16Z2CreatureSumomoFUl.s b/asm/Z2AudioLib/Z2Creature/playSumomoBgm__16Z2CreatureSumomoFUl.s deleted file mode 100644 index 87a8b3a975..0000000000 --- a/asm/Z2AudioLib/Z2Creature/playSumomoBgm__16Z2CreatureSumomoFUl.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_802C1C24: -/* 802C1C24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C1C28 7C 08 02 A6 */ mflr r0 -/* 802C1C2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1C30 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C1C34 80 A3 00 04 */ lwz r5, 4(r3) -/* 802C1C38 28 05 00 00 */ cmplwi r5, 0 -/* 802C1C3C 41 82 00 10 */ beq lbl_802C1C4C -/* 802C1C40 80 A5 00 18 */ lwz r5, 0x18(r5) -/* 802C1C44 90 A1 00 08 */ stw r5, 8(r1) -/* 802C1C48 48 00 00 08 */ b lbl_802C1C50 -lbl_802C1C4C: -/* 802C1C4C 38 A0 FF FF */ li r5, -1 -lbl_802C1C50: -/* 802C1C50 3C 05 FF 00 */ addis r0, r5, 0xff00 -/* 802C1C54 28 00 00 64 */ cmplwi r0, 0x64 -/* 802C1C58 41 82 00 1C */ beq lbl_802C1C74 -/* 802C1C5C 28 04 02 BC */ cmplwi r4, 0x2bc -/* 802C1C60 40 80 00 30 */ bge lbl_802C1C90 -/* 802C1C64 3C 80 01 00 */ lis r4, 0x0100 /* 0x01000064@ha */ -/* 802C1C68 38 84 00 64 */ addi r4, r4, 0x0064 /* 0x01000064@l */ -/* 802C1C6C 4B FE D8 31 */ bl subBgmStart__8Z2SeqMgrFUl -/* 802C1C70 48 00 00 20 */ b lbl_802C1C90 -lbl_802C1C74: -/* 802C1C74 28 04 03 E8 */ cmplwi r4, 0x3e8 -/* 802C1C78 41 80 00 18 */ blt lbl_802C1C90 -/* 802C1C7C 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) -/* 802C1C80 88 04 00 2C */ lbz r0, 0x2c(r4) -/* 802C1C84 28 00 00 06 */ cmplwi r0, 6 -/* 802C1C88 41 82 00 08 */ beq lbl_802C1C90 -/* 802C1C8C 4B FE DB F9 */ bl subBgmStop__8Z2SeqMgrFv -lbl_802C1C90: -/* 802C1C90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C1C94 7C 08 03 A6 */ mtlr r0 -/* 802C1C98 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1C9C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/setEnemyName__15Z2CreatureEnemyFPCc.s b/asm/Z2AudioLib/Z2Creature/setEnemyName__15Z2CreatureEnemyFPCc.s deleted file mode 100644 index 8ad2cff152..0000000000 --- a/asm/Z2AudioLib/Z2Creature/setEnemyName__15Z2CreatureEnemyFPCc.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_802C1B90: -/* 802C1B90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C1B94 7C 08 02 A6 */ mflr r0 -/* 802C1B98 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1B9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C1BA0 7C 7F 1B 78 */ mr r31, r3 -/* 802C1BA4 28 04 00 00 */ cmplwi r4, 0 -/* 802C1BA8 40 82 00 10 */ bne lbl_802C1BB8 -/* 802C1BAC 38 00 FF FF */ li r0, -1 -/* 802C1BB0 98 1F 00 A1 */ stb r0, 0xa1(r31) -/* 802C1BB4 48 00 00 20 */ b lbl_802C1BD4 -lbl_802C1BB8: -/* 802C1BB8 7F E5 FB 78 */ mr r5, r31 -/* 802C1BBC 28 1F 00 00 */ cmplwi r31, 0 -/* 802C1BC0 41 82 00 08 */ beq lbl_802C1BC8 -/* 802C1BC4 38 A5 00 90 */ addi r5, r5, 0x90 -lbl_802C1BC8: -/* 802C1BC8 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) -/* 802C1BCC 4B FF E4 A9 */ bl func_802C0074 -/* 802C1BD0 98 7F 00 A0 */ stb r3, 0xa0(r31) -lbl_802C1BD4: -/* 802C1BD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C1BD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C1BDC 7C 08 03 A6 */ mtlr r0 -/* 802C1BE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1BE4 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/setMdlType__17Z2CreatureCitizenFScbb.s b/asm/Z2AudioLib/Z2Creature/setMdlType__17Z2CreatureCitizenFScbb.s deleted file mode 100644 index 42e293503e..0000000000 --- a/asm/Z2AudioLib/Z2Creature/setMdlType__17Z2CreatureCitizenFScbb.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_802C0D48: -/* 802C0D48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0D4C 7C 08 02 A6 */ mflr r0 -/* 802C0D50 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0D54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C0D58 93 C1 00 08 */ stw r30, 8(r1) -/* 802C0D5C 7C 7F 1B 78 */ mr r31, r3 -/* 802C0D60 7C 9E 23 78 */ mr r30, r4 -/* 802C0D64 54 87 06 BE */ clrlwi r7, r4, 0x1a -/* 802C0D68 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 802C0D6C 20 00 00 00 */ subfic r0, r0, 0 -/* 802C0D70 7C 60 01 10 */ subfe r3, r0, r0 -/* 802C0D74 38 00 00 40 */ li r0, 0x40 -/* 802C0D78 7C 00 18 38 */ and r0, r0, r3 -/* 802C0D7C 7C 05 07 74 */ extsb r5, r0 -/* 802C0D80 54 C4 06 3F */ clrlwi. r4, r6, 0x18 -/* 802C0D84 20 04 00 00 */ subfic r0, r4, 0 -/* 802C0D88 7C 60 01 10 */ subfe r3, r0, r0 -/* 802C0D8C 38 00 00 80 */ li r0, 0x80 -/* 802C0D90 7C 00 18 38 */ and r0, r0, r3 -/* 802C0D94 7C 00 07 74 */ extsb r0, r0 -/* 802C0D98 7C 00 2A 14 */ add r0, r0, r5 -/* 802C0D9C 7C 07 02 14 */ add r0, r7, r0 -/* 802C0DA0 98 1F 00 A0 */ stb r0, 0xa0(r31) -/* 802C0DA4 40 82 00 0C */ bne lbl_802C0DB0 -/* 802C0DA8 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) -/* 802C0DAC 4B FE AB 91 */ bl incrCrowdSize__7Z2SeMgrFv -lbl_802C0DB0: -/* 802C0DB0 7F C0 07 75 */ extsb. r0, r30 -/* 802C0DB4 40 82 00 24 */ bne lbl_802C0DD8 -/* 802C0DB8 88 0D 8D D8 */ lbz r0, struct_80451358+0x0(r13) -/* 802C0DBC 98 1F 00 A1 */ stb r0, 0xa1(r31) -/* 802C0DC0 88 0D 8D D8 */ lbz r0, struct_80451358+0x0(r13) -/* 802C0DC4 7C 00 07 74 */ extsb r0, r0 -/* 802C0DC8 7C 00 00 34 */ cntlzw r0, r0 -/* 802C0DCC 54 00 D9 7E */ srwi r0, r0, 5 -/* 802C0DD0 98 0D 8D D8 */ stb r0, struct_80451358+0x0(r13) -/* 802C0DD4 48 00 00 2C */ b lbl_802C0E00 -lbl_802C0DD8: -/* 802C0DD8 7F C0 07 74 */ extsb r0, r30 -/* 802C0DDC 2C 00 00 01 */ cmpwi r0, 1 -/* 802C0DE0 40 82 00 20 */ bne lbl_802C0E00 -/* 802C0DE4 88 0D 8D D9 */ lbz r0, struct_80451358+0x1(r13) -/* 802C0DE8 98 1F 00 A1 */ stb r0, 0xa1(r31) -/* 802C0DEC 88 0D 8D D9 */ lbz r0, struct_80451358+0x1(r13) -/* 802C0DF0 7C 00 07 74 */ extsb r0, r0 -/* 802C0DF4 7C 00 00 34 */ cntlzw r0, r0 -/* 802C0DF8 54 00 D9 7E */ srwi r0, r0, 5 -/* 802C0DFC 98 0D 8D D9 */ stb r0, struct_80451358+0x1(r13) -lbl_802C0E00: -/* 802C0E00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0E04 83 C1 00 08 */ lwz r30, 8(r1) -/* 802C0E08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0E0C 7C 08 03 A6 */ mtlr r0 -/* 802C0E10 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0E14 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc.s b/asm/Z2AudioLib/Z2Creature/startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc.s deleted file mode 100644 index 773b65c4a6..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_802C2290: -/* 802C2290 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802C2294 7C 08 02 A6 */ mflr r0 -/* 802C2298 90 01 00 34 */ stw r0, 0x34(r1) -/* 802C229C DB E1 00 20 */ stfd f31, 0x20(r1) -/* 802C22A0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 802C22A4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802C22A8 FF E0 08 90 */ fmr f31, f1 -/* 802C22AC 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 802C22B0 2C 00 00 02 */ cmpwi r0, 2 -/* 802C22B4 41 82 01 84 */ beq lbl_802C2438 -/* 802C22B8 40 80 00 14 */ bge lbl_802C22CC -/* 802C22BC 2C 00 00 00 */ cmpwi r0, 0 -/* 802C22C0 41 82 00 18 */ beq lbl_802C22D8 -/* 802C22C4 40 80 00 C4 */ bge lbl_802C2388 -/* 802C22C8 48 00 01 C8 */ b lbl_802C2490 -lbl_802C22CC: -/* 802C22CC 2C 00 00 04 */ cmpwi r0, 4 -/* 802C22D0 40 80 01 C0 */ bge lbl_802C2490 -/* 802C22D4 48 00 01 90 */ b lbl_802C2464 -lbl_802C22D8: -/* 802C22D8 80 04 00 00 */ lwz r0, 0(r4) -/* 802C22DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C22E0 38 63 00 A4 */ addi r3, r3, 0xa4 -/* 802C22E4 38 81 00 14 */ addi r4, r1, 0x14 -/* 802C22E8 7C C5 33 78 */ mr r5, r6 -/* 802C22EC 7C E6 3B 78 */ mr r6, r7 -/* 802C22F0 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C22F4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C22F8 7D 89 03 A6 */ mtctr r12 -/* 802C22FC 4E 80 04 21 */ bctrl -/* 802C2300 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802C2304 41 82 00 7C */ beq lbl_802C2380 -/* 802C2308 80 1F 00 00 */ lwz r0, 0(r31) -/* 802C230C 28 00 00 00 */ cmplwi r0, 0 -/* 802C2310 41 82 00 70 */ beq lbl_802C2380 -/* 802C2314 C0 02 C2 08 */ lfs f0, lit_3663(r2) -/* 802C2318 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 802C231C 40 81 00 0C */ ble lbl_802C2328 -/* 802C2320 C3 E2 C2 78 */ lfs f31, lit_4681(r2) -/* 802C2324 48 00 00 14 */ b lbl_802C2338 -lbl_802C2328: -/* 802C2328 C0 02 C2 70 */ lfs f0, lit_4561(r2) -/* 802C232C EC 20 07 F2 */ fmuls f1, f0, f31 -/* 802C2330 C0 02 C2 0C */ lfs f0, lit_3664(r2) -/* 802C2334 EF E1 00 24 */ fdivs f31, f1, f0 -lbl_802C2338: -/* 802C2338 C0 22 C2 7C */ lfs f1, lit_4682(r2) -/* 802C233C C0 42 C2 20 */ lfs f2, lit_3669(r2) -/* 802C2340 C0 62 C2 1C */ lfs f3, lit_3668(r2) -/* 802C2344 4B FE 74 D1 */ bl getRandom__6Z2CalcFfff -/* 802C2348 C0 02 C2 64 */ lfs f0, lit_4192(r2) -/* 802C234C EC 00 08 2A */ fadds f0, f0, f1 -/* 802C2350 EF FF 00 2A */ fadds f31, f31, f0 -/* 802C2354 C0 02 C2 78 */ lfs f0, lit_4681(r2) -/* 802C2358 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 802C235C 40 81 00 08 */ ble lbl_802C2364 -/* 802C2360 FF E0 00 90 */ fmr f31, f0 -lbl_802C2364: -/* 802C2364 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C2368 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C236C FC 20 F8 90 */ fmr f1, f31 -/* 802C2370 38 80 00 03 */ li r4, 3 -/* 802C2374 4B FE 0A 99 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C2378 7F E3 FB 78 */ mr r3, r31 -/* 802C237C 48 00 01 18 */ b lbl_802C2494 -lbl_802C2380: -/* 802C2380 38 60 00 00 */ li r3, 0 -/* 802C2384 48 00 01 10 */ b lbl_802C2494 -lbl_802C2388: -/* 802C2388 80 04 00 00 */ lwz r0, 0(r4) -/* 802C238C 90 01 00 10 */ stw r0, 0x10(r1) -/* 802C2390 38 63 00 A4 */ addi r3, r3, 0xa4 -/* 802C2394 38 81 00 10 */ addi r4, r1, 0x10 -/* 802C2398 7C C5 33 78 */ mr r5, r6 -/* 802C239C 7C E6 3B 78 */ mr r6, r7 -/* 802C23A0 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C23A4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C23A8 7D 89 03 A6 */ mtctr r12 -/* 802C23AC 4E 80 04 21 */ bctrl -/* 802C23B0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802C23B4 41 82 00 7C */ beq lbl_802C2430 -/* 802C23B8 80 1F 00 00 */ lwz r0, 0(r31) -/* 802C23BC 28 00 00 00 */ cmplwi r0, 0 -/* 802C23C0 41 82 00 70 */ beq lbl_802C2430 -/* 802C23C4 C0 02 C2 08 */ lfs f0, lit_3663(r2) -/* 802C23C8 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 802C23CC 40 81 00 0C */ ble lbl_802C23D8 -/* 802C23D0 C3 E2 C2 78 */ lfs f31, lit_4681(r2) -/* 802C23D4 48 00 00 14 */ b lbl_802C23E8 -lbl_802C23D8: -/* 802C23D8 C0 02 C2 70 */ lfs f0, lit_4561(r2) -/* 802C23DC EC 20 07 F2 */ fmuls f1, f0, f31 -/* 802C23E0 C0 02 C2 0C */ lfs f0, lit_3664(r2) -/* 802C23E4 EF E1 00 24 */ fdivs f31, f1, f0 -lbl_802C23E8: -/* 802C23E8 C0 22 C2 7C */ lfs f1, lit_4682(r2) -/* 802C23EC C0 42 C2 20 */ lfs f2, lit_3669(r2) -/* 802C23F0 C0 62 C2 1C */ lfs f3, lit_3668(r2) -/* 802C23F4 4B FE 74 21 */ bl getRandom__6Z2CalcFfff -/* 802C23F8 C0 02 C2 1C */ lfs f0, lit_3668(r2) -/* 802C23FC EC 00 08 2A */ fadds f0, f0, f1 -/* 802C2400 EF FF 00 2A */ fadds f31, f31, f0 -/* 802C2404 C0 02 C2 78 */ lfs f0, lit_4681(r2) -/* 802C2408 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 802C240C 40 81 00 08 */ ble lbl_802C2414 -/* 802C2410 FF E0 00 90 */ fmr f31, f0 -lbl_802C2414: -/* 802C2414 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C2418 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C241C FC 20 F8 90 */ fmr f1, f31 -/* 802C2420 38 80 00 03 */ li r4, 3 -/* 802C2424 4B FE 09 E9 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C2428 7F E3 FB 78 */ mr r3, r31 -/* 802C242C 48 00 00 68 */ b lbl_802C2494 -lbl_802C2430: -/* 802C2430 38 60 00 00 */ li r3, 0 -/* 802C2434 48 00 00 60 */ b lbl_802C2494 -lbl_802C2438: -/* 802C2438 80 04 00 00 */ lwz r0, 0(r4) -/* 802C243C 90 01 00 0C */ stw r0, 0xc(r1) -/* 802C2440 38 63 00 E4 */ addi r3, r3, 0xe4 -/* 802C2444 38 81 00 0C */ addi r4, r1, 0xc -/* 802C2448 7C C5 33 78 */ mr r5, r6 -/* 802C244C 7C E6 3B 78 */ mr r6, r7 -/* 802C2450 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C2454 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C2458 7D 89 03 A6 */ mtctr r12 -/* 802C245C 4E 80 04 21 */ bctrl -/* 802C2460 48 00 00 34 */ b lbl_802C2494 -lbl_802C2464: -/* 802C2464 80 04 00 00 */ lwz r0, 0(r4) -/* 802C2468 90 01 00 08 */ stw r0, 8(r1) -/* 802C246C 38 63 01 04 */ addi r3, r3, 0x104 -/* 802C2470 38 81 00 08 */ addi r4, r1, 8 -/* 802C2474 7C C5 33 78 */ mr r5, r6 -/* 802C2478 7C E6 3B 78 */ mr r6, r7 -/* 802C247C 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C2480 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C2484 7D 89 03 A6 */ mtctr r12 -/* 802C2488 4E 80 04 21 */ bctrl -/* 802C248C 48 00 00 08 */ b lbl_802C2494 -lbl_802C2490: -/* 802C2490 38 60 00 00 */ li r3, 0 -lbl_802C2494: -/* 802C2494 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 802C2498 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 802C249C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802C24A0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802C24A4 7C 08 03 A6 */ mtlr r0 -/* 802C24A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C24AC 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc.s b/asm/Z2AudioLib/Z2Creature/startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc.s deleted file mode 100644 index aae18baf19..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_802C2194: -/* 802C2194 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C2198 7C 08 02 A6 */ mflr r0 -/* 802C219C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C21A0 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 802C21A4 2C 00 00 02 */ cmpwi r0, 2 -/* 802C21A8 41 82 00 7C */ beq lbl_802C2224 -/* 802C21AC 40 80 00 14 */ bge lbl_802C21C0 -/* 802C21B0 2C 00 00 00 */ cmpwi r0, 0 -/* 802C21B4 41 82 00 18 */ beq lbl_802C21CC -/* 802C21B8 40 80 00 40 */ bge lbl_802C21F8 -/* 802C21BC 48 00 00 C0 */ b lbl_802C227C -lbl_802C21C0: -/* 802C21C0 2C 00 00 04 */ cmpwi r0, 4 -/* 802C21C4 40 80 00 B8 */ bge lbl_802C227C -/* 802C21C8 48 00 00 88 */ b lbl_802C2250 -lbl_802C21CC: -/* 802C21CC 80 04 00 00 */ lwz r0, 0(r4) -/* 802C21D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C21D4 38 63 00 A4 */ addi r3, r3, 0xa4 -/* 802C21D8 38 81 00 14 */ addi r4, r1, 0x14 -/* 802C21DC 7C C5 33 78 */ mr r5, r6 -/* 802C21E0 7C E6 3B 78 */ mr r6, r7 -/* 802C21E4 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C21E8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C21EC 7D 89 03 A6 */ mtctr r12 -/* 802C21F0 4E 80 04 21 */ bctrl -/* 802C21F4 48 00 00 8C */ b lbl_802C2280 -lbl_802C21F8: -/* 802C21F8 80 04 00 00 */ lwz r0, 0(r4) -/* 802C21FC 90 01 00 10 */ stw r0, 0x10(r1) -/* 802C2200 38 63 00 C4 */ addi r3, r3, 0xc4 -/* 802C2204 38 81 00 10 */ addi r4, r1, 0x10 -/* 802C2208 7C C5 33 78 */ mr r5, r6 -/* 802C220C 7C E6 3B 78 */ mr r6, r7 -/* 802C2210 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C2214 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C2218 7D 89 03 A6 */ mtctr r12 -/* 802C221C 4E 80 04 21 */ bctrl -/* 802C2220 48 00 00 60 */ b lbl_802C2280 -lbl_802C2224: -/* 802C2224 80 04 00 00 */ lwz r0, 0(r4) -/* 802C2228 90 01 00 0C */ stw r0, 0xc(r1) -/* 802C222C 38 63 00 E4 */ addi r3, r3, 0xe4 -/* 802C2230 38 81 00 0C */ addi r4, r1, 0xc -/* 802C2234 7C C5 33 78 */ mr r5, r6 -/* 802C2238 7C E6 3B 78 */ mr r6, r7 -/* 802C223C 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C2240 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C2244 7D 89 03 A6 */ mtctr r12 -/* 802C2248 4E 80 04 21 */ bctrl -/* 802C224C 48 00 00 34 */ b lbl_802C2280 -lbl_802C2250: -/* 802C2250 80 04 00 00 */ lwz r0, 0(r4) -/* 802C2254 90 01 00 08 */ stw r0, 8(r1) -/* 802C2258 38 63 01 04 */ addi r3, r3, 0x104 -/* 802C225C 38 81 00 08 */ addi r4, r1, 8 -/* 802C2260 7C C5 33 78 */ mr r5, r6 -/* 802C2264 7C E6 3B 78 */ mr r6, r7 -/* 802C2268 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C226C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C2270 7D 89 03 A6 */ mtctr r12 -/* 802C2274 4E 80 04 21 */ bctrl -/* 802C2278 48 00 00 08 */ b lbl_802C2280 -lbl_802C227C: -/* 802C227C 38 60 00 00 */ li r3, 0 -lbl_802C2280: -/* 802C2280 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C2284 7C 08 03 A6 */ mtlr r0 -/* 802C2288 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C228C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCollisionSE__15Z2CreatureEnemyFUlUl.s b/asm/Z2AudioLib/Z2Creature/startCollisionSE__15Z2CreatureEnemyFUlUl.s deleted file mode 100644 index 44c07ccef1..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCollisionSE__15Z2CreatureEnemyFUlUl.s +++ /dev/null @@ -1,101 +0,0 @@ -lbl_802C1A14: -/* 802C1A14 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C1A18 7C 08 02 A6 */ mflr r0 -/* 802C1A1C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C1A20 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C1A24 48 0A 07 B9 */ bl _savegpr_29 -/* 802C1A28 7C 7D 1B 78 */ mr r29, r3 -/* 802C1A2C 7C 9E 23 78 */ mr r30, r4 -/* 802C1A30 7C BF 2B 78 */ mr r31, r5 -/* 802C1A34 88 83 00 A0 */ lbz r4, 0xa0(r3) -/* 802C1A38 2C 04 00 2F */ cmpwi r4, 0x2f -/* 802C1A3C 41 82 00 40 */ beq lbl_802C1A7C -/* 802C1A40 40 80 00 78 */ bge lbl_802C1AB8 -/* 802C1A44 2C 04 00 21 */ cmpwi r4, 0x21 -/* 802C1A48 41 82 00 08 */ beq lbl_802C1A50 -/* 802C1A4C 48 00 00 6C */ b lbl_802C1AB8 -lbl_802C1A50: -/* 802C1A50 38 00 00 01 */ li r0, 1 -/* 802C1A54 98 1D 00 A3 */ stb r0, 0xa3(r29) -/* 802C1A58 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C1A5C 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) -/* 802C1A60 4B FF 30 9D */ bl setBattleLastHit__8Z2SeqMgrFUc -/* 802C1A64 38 7D 00 08 */ addi r3, r29, 8 -/* 802C1A68 7F C4 F3 78 */ mr r4, r30 -/* 802C1A6C 7F E5 FB 78 */ mr r5, r31 -/* 802C1A70 38 C0 00 00 */ li r6, 0 -/* 802C1A74 4B FF CA 31 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -/* 802C1A78 48 00 00 EC */ b lbl_802C1B64 -lbl_802C1A7C: -/* 802C1A7C 80 1D 00 94 */ lwz r0, 0x94(r29) -/* 802C1A80 28 00 00 00 */ cmplwi r0, 0 -/* 802C1A84 41 82 00 1C */ beq lbl_802C1AA0 -/* 802C1A88 7F A4 EB 78 */ mr r4, r29 -/* 802C1A8C 28 1D 00 00 */ cmplwi r29, 0 -/* 802C1A90 41 82 00 08 */ beq lbl_802C1A98 -/* 802C1A94 38 84 00 90 */ addi r4, r4, 0x90 -lbl_802C1A98: -/* 802C1A98 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) -/* 802C1A9C 4B FF E6 F5 */ bl func_802C0190 -lbl_802C1AA0: -/* 802C1AA0 38 7D 00 08 */ addi r3, r29, 8 -/* 802C1AA4 7F C4 F3 78 */ mr r4, r30 -/* 802C1AA8 7F E5 FB 78 */ mr r5, r31 -/* 802C1AAC 38 C0 00 00 */ li r6, 0 -/* 802C1AB0 4B FF C9 F5 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -/* 802C1AB4 48 00 00 B0 */ b lbl_802C1B64 -lbl_802C1AB8: -/* 802C1AB8 38 1F FF E2 */ addi r0, r31, -30 -/* 802C1ABC 28 00 00 16 */ cmplwi r0, 0x16 -/* 802C1AC0 41 81 00 90 */ bgt lbl_802C1B50 -/* 802C1AC4 3C 60 80 3D */ lis r3, lit_4411@ha /* 0x803CB724@ha */ -/* 802C1AC8 38 63 B7 24 */ addi r3, r3, lit_4411@l /* 0x803CB724@l */ -/* 802C1ACC 54 00 10 3A */ slwi r0, r0, 2 -/* 802C1AD0 7C 03 00 2E */ lwzx r0, r3, r0 -/* 802C1AD4 7C 09 03 A6 */ mtctr r0 -/* 802C1AD8 4E 80 04 20 */ bctr -/* 802C1ADC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C1AE0 38 80 00 02 */ li r4, 2 -/* 802C1AE4 4B FF 2D 61 */ bl setBattleSeqState__8Z2SeqMgrFUc -/* 802C1AE8 48 00 00 68 */ b lbl_802C1B50 -/* 802C1AEC 38 00 00 01 */ li r0, 1 -/* 802C1AF0 98 1D 00 A3 */ stb r0, 0xa3(r29) -/* 802C1AF4 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) -/* 802C1AF8 3C 1E FF FC */ addis r0, r30, 0xfffc -/* 802C1AFC 28 00 00 01 */ cmplwi r0, 1 -/* 802C1B00 40 81 00 0C */ ble lbl_802C1B0C -/* 802C1B04 28 00 00 03 */ cmplwi r0, 3 -/* 802C1B08 40 82 00 08 */ bne lbl_802C1B10 -lbl_802C1B0C: -/* 802C1B0C 38 80 00 14 */ li r4, 0x14 -lbl_802C1B10: -/* 802C1B10 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C1B14 4B FF 2F E9 */ bl setBattleLastHit__8Z2SeqMgrFUc -/* 802C1B18 48 00 00 38 */ b lbl_802C1B50 -/* 802C1B1C 28 04 00 2B */ cmplwi r4, 0x2b -/* 802C1B20 40 82 00 1C */ bne lbl_802C1B3C -/* 802C1B24 38 00 00 01 */ li r0, 1 -/* 802C1B28 98 1D 00 A3 */ stb r0, 0xa3(r29) -/* 802C1B2C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C1B30 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) -/* 802C1B34 4B FF 2F C9 */ bl setBattleLastHit__8Z2SeqMgrFUc -/* 802C1B38 48 00 00 18 */ b lbl_802C1B50 -lbl_802C1B3C: -/* 802C1B3C 28 04 00 16 */ cmplwi r4, 0x16 -/* 802C1B40 40 82 00 10 */ bne lbl_802C1B50 -/* 802C1B44 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C1B48 38 80 00 02 */ li r4, 2 -/* 802C1B4C 4B FF 2C F9 */ bl setBattleSeqState__8Z2SeqMgrFUc -lbl_802C1B50: -/* 802C1B50 38 7D 00 08 */ addi r3, r29, 8 -/* 802C1B54 7F C4 F3 78 */ mr r4, r30 -/* 802C1B58 7F E5 FB 78 */ mr r5, r31 -/* 802C1B5C 38 C0 00 00 */ li r6, 0 -/* 802C1B60 4B FF C9 45 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -lbl_802C1B64: -/* 802C1B64 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C1B68 48 0A 06 C1 */ bl _restgpr_29 -/* 802C1B6C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C1B70 7C 08 03 A6 */ mtlr r0 -/* 802C1B74 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C1B78 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc.s deleted file mode 100644 index 9df1947ad1..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc.s +++ /dev/null @@ -1,124 +0,0 @@ -lbl_802C087C: -/* 802C087C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802C0880 7C 08 02 A6 */ mflr r0 -/* 802C0884 90 01 00 54 */ stw r0, 0x54(r1) -/* 802C0888 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 802C088C F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 802C0890 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 802C0894 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 802C0898 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C089C 48 0A 19 41 */ bl _savegpr_29 -/* 802C08A0 7C 67 1B 78 */ mr r7, r3 -/* 802C08A4 7C 9D 23 78 */ mr r29, r4 -/* 802C08A8 7C BE 2B 78 */ mr r30, r5 -/* 802C08AC 80 84 00 00 */ lwz r4, 0(r4) -/* 802C08B0 3C 60 00 06 */ lis r3, 0x0006 /* 0x000600D6@ha */ -/* 802C08B4 38 03 00 D6 */ addi r0, r3, 0x00D6 /* 0x000600D6@l */ -/* 802C08B8 7C 04 00 00 */ cmpw r4, r0 -/* 802C08BC 41 82 00 08 */ beq lbl_802C08C4 -/* 802C08C0 48 00 00 3C */ b lbl_802C08FC -lbl_802C08C4: -/* 802C08C4 90 81 00 0C */ stw r4, 0xc(r1) -/* 802C08C8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802C08CC 38 81 00 0C */ addi r4, r1, 0xc -/* 802C08D0 80 A7 00 04 */ lwz r5, 4(r7) -/* 802C08D4 38 C0 00 00 */ li r6, 0 -/* 802C08D8 38 E0 00 00 */ li r7, 0 -/* 802C08DC C0 22 C2 20 */ lfs f1, lit_3669(r2) -/* 802C08E0 FC 40 08 90 */ fmr f2, f1 -/* 802C08E4 C0 62 C2 30 */ lfs f3, lit_3716(r2) -/* 802C08E8 FC 80 18 90 */ fmr f4, f3 -/* 802C08EC 39 00 00 00 */ li r8, 0 -/* 802C08F0 4B FE BC 1D */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 802C08F4 38 60 00 00 */ li r3, 0 -/* 802C08F8 48 00 01 2C */ b lbl_802C0A24 -lbl_802C08FC: -/* 802C08FC 90 81 00 08 */ stw r4, 8(r1) -/* 802C0900 38 67 00 08 */ addi r3, r7, 8 -/* 802C0904 38 81 00 08 */ addi r4, r1, 8 -/* 802C0908 81 87 00 18 */ lwz r12, 0x18(r7) -/* 802C090C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C0910 7D 89 03 A6 */ mtctr r12 -/* 802C0914 4E 80 04 21 */ bctrl -/* 802C0918 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802C091C 41 82 01 04 */ beq lbl_802C0A20 -/* 802C0920 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C0924 28 03 00 00 */ cmplwi r3, 0 -/* 802C0928 41 82 00 F8 */ beq lbl_802C0A20 -/* 802C092C 80 9D 00 00 */ lwz r4, 0(r29) -/* 802C0930 3C 04 FF FA */ addis r0, r4, 0xfffa -/* 802C0934 28 00 00 86 */ cmplwi r0, 0x86 -/* 802C0938 41 82 00 0C */ beq lbl_802C0944 -/* 802C093C 28 00 00 8A */ cmplwi r0, 0x8a -/* 802C0940 40 82 00 AC */ bne lbl_802C09EC -lbl_802C0944: -/* 802C0944 C3 E2 C2 34 */ lfs f31, lit_3717(r2) -/* 802C0948 28 1E 00 00 */ cmplwi r30, 0 -/* 802C094C 41 82 00 3C */ beq lbl_802C0988 -/* 802C0950 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C0954 93 C1 00 14 */ stw r30, 0x14(r1) -/* 802C0958 3C 00 43 30 */ lis r0, 0x4330 -/* 802C095C 90 01 00 10 */ stw r0, 0x10(r1) -/* 802C0960 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802C0964 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C0968 FC 40 F8 90 */ fmr f2, f31 -/* 802C096C C0 62 C2 38 */ lfs f3, lit_3718(r2) -/* 802C0970 C0 82 C2 3C */ lfs f4, lit_3719(r2) -/* 802C0974 C0 A2 C2 40 */ lfs f5, lit_3720(r2) -/* 802C0978 C0 C2 C2 20 */ lfs f6, lit_3669(r2) -/* 802C097C 38 60 00 00 */ li r3, 0 -/* 802C0980 4B FE 8D 75 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C0984 FF E0 08 90 */ fmr f31, f1 -lbl_802C0988: -/* 802C0988 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C098C 93 C1 00 1C */ stw r30, 0x1c(r1) -/* 802C0990 3C 00 43 30 */ lis r0, 0x4330 -/* 802C0994 90 01 00 18 */ stw r0, 0x18(r1) -/* 802C0998 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802C099C EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C09A0 C0 42 C2 34 */ lfs f2, lit_3717(r2) -/* 802C09A4 C0 62 C2 38 */ lfs f3, lit_3718(r2) -/* 802C09A8 C0 82 C2 10 */ lfs f4, lit_3665(r2) -/* 802C09AC C0 A2 C2 1C */ lfs f5, lit_3668(r2) -/* 802C09B0 C0 C2 C2 18 */ lfs f6, lit_3667(r2) -/* 802C09B4 38 60 00 00 */ li r3, 0 -/* 802C09B8 4B FE 8D 3D */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C09BC FF C0 08 90 */ fmr f30, f1 -/* 802C09C0 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C09C4 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C09C8 FC 20 F8 90 */ fmr f1, f31 -/* 802C09CC 38 80 00 00 */ li r4, 0 -/* 802C09D0 4B FE 23 E5 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C09D4 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C09D8 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C09DC FC 20 F0 90 */ fmr f1, f30 -/* 802C09E0 38 80 00 00 */ li r4, 0 -/* 802C09E4 4B FE 24 29 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C09E8 48 00 00 38 */ b lbl_802C0A20 -lbl_802C09EC: -/* 802C09EC 28 00 00 98 */ cmplwi r0, 0x98 -/* 802C09F0 40 82 00 30 */ bne lbl_802C0A20 -/* 802C09F4 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C09F8 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C09FC 93 C1 00 1C */ stw r30, 0x1c(r1) -/* 802C0A00 3C 00 43 30 */ lis r0, 0x4330 -/* 802C0A04 90 01 00 18 */ stw r0, 0x18(r1) -/* 802C0A08 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802C0A0C EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C0A10 C0 02 C2 0C */ lfs f0, lit_3664(r2) -/* 802C0A14 EC 21 00 24 */ fdivs f1, f1, f0 -/* 802C0A18 38 80 00 00 */ li r4, 0 -/* 802C0A1C 4B FE 23 99 */ bl moveVolume__18JAISoundParamsMoveFfUl -lbl_802C0A20: -/* 802C0A20 7F E3 FB 78 */ mr r3, r31 -lbl_802C0A24: -/* 802C0A24 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 802C0A28 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 802C0A2C E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 802C0A30 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 802C0A34 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C0A38 48 0A 17 F1 */ bl _restgpr_29 -/* 802C0A3C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802C0A40 7C 08 03 A6 */ mtlr r0 -/* 802C0A44 38 21 00 50 */ addi r1, r1, 0x50 -/* 802C0A48 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc.s deleted file mode 100644 index 4b7919bc48..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc.s +++ /dev/null @@ -1,182 +0,0 @@ -lbl_802C29D4: -/* 802C29D4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802C29D8 7C 08 02 A6 */ mflr r0 -/* 802C29DC 90 01 00 74 */ stw r0, 0x74(r1) -/* 802C29E0 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 802C29E4 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 802C29E8 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 802C29EC F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 802C29F0 39 61 00 50 */ addi r11, r1, 0x50 -/* 802C29F4 48 09 F7 D9 */ bl _savegpr_25 -/* 802C29F8 7C 79 1B 78 */ mr r25, r3 -/* 802C29FC 7C 9A 23 78 */ mr r26, r4 -/* 802C2A00 7C BB 2B 78 */ mr r27, r5 -/* 802C2A04 7C DF 33 78 */ mr r31, r6 -/* 802C2A08 80 64 00 00 */ lwz r3, 0(r4) -/* 802C2A0C 3C 03 FF F9 */ addis r0, r3, 0xfff9 -/* 802C2A10 28 00 03 53 */ cmplwi r0, 0x353 -/* 802C2A14 40 82 02 2C */ bne lbl_802C2C40 -/* 802C2A18 90 61 00 18 */ stw r3, 0x18(r1) -/* 802C2A1C 38 79 00 08 */ addi r3, r25, 8 -/* 802C2A20 38 81 00 18 */ addi r4, r1, 0x18 -/* 802C2A24 81 99 00 18 */ lwz r12, 0x18(r25) -/* 802C2A28 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C2A2C 7D 89 03 A6 */ mtctr r12 -/* 802C2A30 4E 80 04 21 */ bctrl -/* 802C2A34 7C 7C 1B 78 */ mr r28, r3 -/* 802C2A38 80 1A 00 00 */ lwz r0, 0(r26) -/* 802C2A3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C2A40 38 79 00 A4 */ addi r3, r25, 0xa4 -/* 802C2A44 38 81 00 14 */ addi r4, r1, 0x14 -/* 802C2A48 7F 65 DB 78 */ mr r5, r27 -/* 802C2A4C 7F E6 FB 78 */ mr r6, r31 -/* 802C2A50 81 99 00 B4 */ lwz r12, 0xb4(r25) -/* 802C2A54 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C2A58 7D 89 03 A6 */ mtctr r12 -/* 802C2A5C 4E 80 04 21 */ bctrl -/* 802C2A60 7C 7D 1B 78 */ mr r29, r3 -/* 802C2A64 80 1A 00 00 */ lwz r0, 0(r26) -/* 802C2A68 90 01 00 10 */ stw r0, 0x10(r1) -/* 802C2A6C 38 79 00 C4 */ addi r3, r25, 0xc4 -/* 802C2A70 38 81 00 10 */ addi r4, r1, 0x10 -/* 802C2A74 7F 65 DB 78 */ mr r5, r27 -/* 802C2A78 7F E6 FB 78 */ mr r6, r31 -/* 802C2A7C 81 99 00 D4 */ lwz r12, 0xd4(r25) -/* 802C2A80 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C2A84 7D 89 03 A6 */ mtctr r12 -/* 802C2A88 4E 80 04 21 */ bctrl -/* 802C2A8C 7C 7E 1B 78 */ mr r30, r3 -/* 802C2A90 80 1A 00 00 */ lwz r0, 0(r26) -/* 802C2A94 90 01 00 0C */ stw r0, 0xc(r1) -/* 802C2A98 38 79 00 E4 */ addi r3, r25, 0xe4 -/* 802C2A9C 38 81 00 0C */ addi r4, r1, 0xc -/* 802C2AA0 7F 65 DB 78 */ mr r5, r27 -/* 802C2AA4 7F E6 FB 78 */ mr r6, r31 -/* 802C2AA8 81 99 00 F4 */ lwz r12, 0xf4(r25) -/* 802C2AAC 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C2AB0 7D 89 03 A6 */ mtctr r12 -/* 802C2AB4 4E 80 04 21 */ bctrl -/* 802C2AB8 7C 7F 1B 78 */ mr r31, r3 -/* 802C2ABC C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C2AC0 93 61 00 24 */ stw r27, 0x24(r1) -/* 802C2AC4 3C 00 43 30 */ lis r0, 0x4330 -/* 802C2AC8 90 01 00 20 */ stw r0, 0x20(r1) -/* 802C2ACC C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802C2AD0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C2AD4 C0 42 C2 34 */ lfs f2, lit_3717(r2) -/* 802C2AD8 C0 62 C2 80 */ lfs f3, lit_4837(r2) -/* 802C2ADC C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C2AE0 FC A0 10 90 */ fmr f5, f2 -/* 802C2AE4 C0 C2 C2 20 */ lfs f6, lit_3669(r2) -/* 802C2AE8 38 60 00 01 */ li r3, 1 -/* 802C2AEC 4B FE 6C 09 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C2AF0 FF E0 08 90 */ fmr f31, f1 -/* 802C2AF4 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C2AF8 93 61 00 2C */ stw r27, 0x2c(r1) -/* 802C2AFC 3C 00 43 30 */ lis r0, 0x4330 -/* 802C2B00 90 01 00 28 */ stw r0, 0x28(r1) -/* 802C2B04 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802C2B08 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C2B0C C0 42 C2 34 */ lfs f2, lit_3717(r2) -/* 802C2B10 C0 62 C2 80 */ lfs f3, lit_4837(r2) -/* 802C2B14 C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C2B18 C0 A2 C2 84 */ lfs f5, lit_4838(r2) -/* 802C2B1C C0 C2 C2 54 */ lfs f6, lit_4188(r2) -/* 802C2B20 38 60 00 01 */ li r3, 1 -/* 802C2B24 4B FE 6B D1 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C2B28 FF C0 08 90 */ fmr f30, f1 -/* 802C2B2C 28 1C 00 00 */ cmplwi r28, 0 -/* 802C2B30 41 82 00 38 */ beq lbl_802C2B68 -/* 802C2B34 80 7C 00 00 */ lwz r3, 0(r28) -/* 802C2B38 28 03 00 00 */ cmplwi r3, 0 -/* 802C2B3C 41 82 00 2C */ beq lbl_802C2B68 -/* 802C2B40 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2B44 FC 20 F8 90 */ fmr f1, f31 -/* 802C2B48 38 80 00 00 */ li r4, 0 -/* 802C2B4C 4B FE 02 69 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C2B50 80 7C 00 00 */ lwz r3, 0(r28) -/* 802C2B54 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2B58 FC 20 F0 90 */ fmr f1, f30 -/* 802C2B5C 38 80 00 00 */ li r4, 0 -/* 802C2B60 4B FE 02 AD */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C2B64 48 00 00 0C */ b lbl_802C2B70 -lbl_802C2B68: -/* 802C2B68 38 60 00 00 */ li r3, 0 -/* 802C2B6C 48 00 00 F0 */ b lbl_802C2C5C -lbl_802C2B70: -/* 802C2B70 28 1D 00 00 */ cmplwi r29, 0 -/* 802C2B74 41 82 00 38 */ beq lbl_802C2BAC -/* 802C2B78 80 7D 00 00 */ lwz r3, 0(r29) -/* 802C2B7C 28 03 00 00 */ cmplwi r3, 0 -/* 802C2B80 41 82 00 2C */ beq lbl_802C2BAC -/* 802C2B84 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2B88 FC 20 F8 90 */ fmr f1, f31 -/* 802C2B8C 38 80 00 00 */ li r4, 0 -/* 802C2B90 4B FE 02 25 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C2B94 80 7D 00 00 */ lwz r3, 0(r29) -/* 802C2B98 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2B9C FC 20 F0 90 */ fmr f1, f30 -/* 802C2BA0 38 80 00 00 */ li r4, 0 -/* 802C2BA4 4B FE 02 69 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C2BA8 48 00 00 0C */ b lbl_802C2BB4 -lbl_802C2BAC: -/* 802C2BAC 38 60 00 00 */ li r3, 0 -/* 802C2BB0 48 00 00 AC */ b lbl_802C2C5C -lbl_802C2BB4: -/* 802C2BB4 28 1E 00 00 */ cmplwi r30, 0 -/* 802C2BB8 41 82 00 38 */ beq lbl_802C2BF0 -/* 802C2BBC 80 7E 00 00 */ lwz r3, 0(r30) -/* 802C2BC0 28 03 00 00 */ cmplwi r3, 0 -/* 802C2BC4 41 82 00 2C */ beq lbl_802C2BF0 -/* 802C2BC8 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2BCC FC 20 F8 90 */ fmr f1, f31 -/* 802C2BD0 38 80 00 00 */ li r4, 0 -/* 802C2BD4 4B FE 01 E1 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C2BD8 80 7E 00 00 */ lwz r3, 0(r30) -/* 802C2BDC 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2BE0 FC 20 F0 90 */ fmr f1, f30 -/* 802C2BE4 38 80 00 00 */ li r4, 0 -/* 802C2BE8 4B FE 02 25 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C2BEC 48 00 00 0C */ b lbl_802C2BF8 -lbl_802C2BF0: -/* 802C2BF0 38 60 00 00 */ li r3, 0 -/* 802C2BF4 48 00 00 68 */ b lbl_802C2C5C -lbl_802C2BF8: -/* 802C2BF8 28 1F 00 00 */ cmplwi r31, 0 -/* 802C2BFC 41 82 00 3C */ beq lbl_802C2C38 -/* 802C2C00 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C2C04 28 03 00 00 */ cmplwi r3, 0 -/* 802C2C08 41 82 00 30 */ beq lbl_802C2C38 -/* 802C2C0C 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2C10 FC 20 F8 90 */ fmr f1, f31 -/* 802C2C14 38 80 00 00 */ li r4, 0 -/* 802C2C18 4B FE 01 9D */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C2C1C 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C2C20 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2C24 FC 20 F0 90 */ fmr f1, f30 -/* 802C2C28 38 80 00 00 */ li r4, 0 -/* 802C2C2C 4B FE 01 E1 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C2C30 7F E3 FB 78 */ mr r3, r31 -/* 802C2C34 48 00 00 28 */ b lbl_802C2C5C -lbl_802C2C38: -/* 802C2C38 38 60 00 00 */ li r3, 0 -/* 802C2C3C 48 00 00 20 */ b lbl_802C2C5C -lbl_802C2C40: -/* 802C2C40 90 61 00 08 */ stw r3, 8(r1) -/* 802C2C44 38 79 00 08 */ addi r3, r25, 8 -/* 802C2C48 38 81 00 08 */ addi r4, r1, 8 -/* 802C2C4C 81 99 00 18 */ lwz r12, 0x18(r25) -/* 802C2C50 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C2C54 7D 89 03 A6 */ mtctr r12 -/* 802C2C58 4E 80 04 21 */ bctrl -lbl_802C2C5C: -/* 802C2C5C E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 802C2C60 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 802C2C64 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 802C2C68 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 802C2C6C 39 61 00 50 */ addi r11, r1, 0x50 -/* 802C2C70 48 09 F5 A9 */ bl _restgpr_25 -/* 802C2C74 80 01 00 74 */ lwz r0, 0x74(r1) -/* 802C2C78 7C 08 03 A6 */ mtlr r0 -/* 802C2C7C 38 21 00 70 */ addi r1, r1, 0x70 -/* 802C2C80 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s deleted file mode 100644 index 3b8b0da6f7..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s +++ /dev/null @@ -1,209 +0,0 @@ -lbl_802C136C: -/* 802C136C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 802C1370 7C 08 02 A6 */ mflr r0 -/* 802C1374 90 01 00 64 */ stw r0, 0x64(r1) -/* 802C1378 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 802C137C F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 802C1380 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 802C1384 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 802C1388 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C138C 48 0A 0E 4D */ bl _savegpr_28 -/* 802C1390 7C 7C 1B 78 */ mr r28, r3 -/* 802C1394 7C 9D 23 78 */ mr r29, r4 -/* 802C1398 7C BE 2B 78 */ mr r30, r5 -/* 802C139C 80 64 00 00 */ lwz r3, 0(r4) -/* 802C13A0 3C 03 FF F9 */ addis r0, r3, 0xfff9 -/* 802C13A4 28 00 FF FF */ cmplwi r0, 0xffff -/* 802C13A8 40 82 00 7C */ bne lbl_802C1424 -/* 802C13AC 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) -/* 802C13B0 80 9C 00 04 */ lwz r4, 4(r28) -/* 802C13B4 38 A1 00 0C */ addi r5, r1, 0xc -/* 802C13B8 38 C0 00 00 */ li r6, 0 -/* 802C13BC 4B FF C5 71 */ bl convertAbsToRel__10Z2AudienceFR3VecP3Veci -/* 802C13C0 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) -/* 802C13C4 38 81 00 0C */ addi r4, r1, 0xc -/* 802C13C8 C0 22 C2 50 */ lfs f1, lit_4187(r2) -/* 802C13CC 38 A0 00 00 */ li r5, 0 -/* 802C13D0 4B FF C5 8D */ bl calcRelPosVolume__10Z2AudienceFRC3Vecfi -/* 802C13D4 FF E0 08 90 */ fmr f31, f1 -/* 802C13D8 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) -/* 802C13DC 38 81 00 0C */ addi r4, r1, 0xc -/* 802C13E0 38 A0 00 00 */ li r5, 0 -/* 802C13E4 4B FF C6 61 */ bl calcRelPosPan__10Z2AudienceFRC3Veci -/* 802C13E8 FF C0 08 90 */ fmr f30, f1 -/* 802C13EC 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) -/* 802C13F0 38 81 00 0C */ addi r4, r1, 0xc -/* 802C13F4 38 A0 00 00 */ li r5, 0 -/* 802C13F8 4B FF C7 4D */ bl calcRelPosDolby__10Z2AudienceFRC3Veci -/* 802C13FC FC 60 08 90 */ fmr f3, f1 -/* 802C1400 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C1404 7C 64 1B 78 */ mr r4, r3 -/* 802C1408 38 A0 00 07 */ li r5, 7 -/* 802C140C FC 20 F8 90 */ fmr f1, f31 -/* 802C1410 38 C0 00 00 */ li r6, 0 -/* 802C1414 FC 40 F0 90 */ fmr f2, f30 -/* 802C1418 4B FF 2B D5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff -/* 802C141C 38 60 00 00 */ li r3, 0 -/* 802C1420 48 00 02 44 */ b lbl_802C1664 -lbl_802C1424: -/* 802C1424 90 61 00 08 */ stw r3, 8(r1) -/* 802C1428 38 7C 00 08 */ addi r3, r28, 8 -/* 802C142C 38 81 00 08 */ addi r4, r1, 8 -/* 802C1430 81 9C 00 18 */ lwz r12, 0x18(r28) -/* 802C1434 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C1438 7D 89 03 A6 */ mtctr r12 -/* 802C143C 4E 80 04 21 */ bctrl -/* 802C1440 7C 7F 1B 78 */ mr r31, r3 -/* 802C1444 88 1C 00 A0 */ lbz r0, 0xa0(r28) -/* 802C1448 2C 00 00 29 */ cmpwi r0, 0x29 -/* 802C144C 41 82 00 98 */ beq lbl_802C14E4 -/* 802C1450 40 80 00 10 */ bge lbl_802C1460 -/* 802C1454 2C 00 00 23 */ cmpwi r0, 0x23 -/* 802C1458 41 82 00 14 */ beq lbl_802C146C -/* 802C145C 48 00 01 48 */ b lbl_802C15A4 -lbl_802C1460: -/* 802C1460 2C 00 00 36 */ cmpwi r0, 0x36 -/* 802C1464 41 82 00 74 */ beq lbl_802C14D8 -/* 802C1468 48 00 01 3C */ b lbl_802C15A4 -lbl_802C146C: -/* 802C146C 28 1F 00 00 */ cmplwi r31, 0 -/* 802C1470 41 82 01 F0 */ beq lbl_802C1660 -/* 802C1474 80 1F 00 00 */ lwz r0, 0(r31) -/* 802C1478 28 00 00 00 */ cmplwi r0, 0 -/* 802C147C 41 82 01 E4 */ beq lbl_802C1660 -/* 802C1480 80 7D 00 00 */ lwz r3, 0(r29) -/* 802C1484 3C 03 FF F9 */ addis r0, r3, 0xfff9 -/* 802C1488 28 00 03 23 */ cmplwi r0, 0x323 -/* 802C148C 40 82 01 D4 */ bne lbl_802C1660 -/* 802C1490 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C1494 93 C1 00 1C */ stw r30, 0x1c(r1) -/* 802C1498 3C 00 43 30 */ lis r0, 0x4330 -/* 802C149C 90 01 00 18 */ stw r0, 0x18(r1) -/* 802C14A0 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802C14A4 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C14A8 C0 42 C2 20 */ lfs f2, lit_3669(r2) -/* 802C14AC C0 62 C2 48 */ lfs f3, lit_4091(r2) -/* 802C14B0 C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C14B4 C0 A2 C2 4C */ lfs f5, lit_4092(r2) -/* 802C14B8 C0 C2 C2 54 */ lfs f6, lit_4188(r2) -/* 802C14BC 38 60 00 01 */ li r3, 1 -/* 802C14C0 4B FE 82 35 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C14C4 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C14C8 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C14CC 38 80 00 00 */ li r4, 0 -/* 802C14D0 4B FE 18 E5 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C14D4 48 00 01 8C */ b lbl_802C1660 -lbl_802C14D8: -/* 802C14D8 7F C4 F3 78 */ mr r4, r30 -/* 802C14DC 48 00 19 05 */ bl Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl -/* 802C14E0 48 00 01 80 */ b lbl_802C1660 -lbl_802C14E4: -/* 802C14E4 28 1F 00 00 */ cmplwi r31, 0 -/* 802C14E8 41 82 00 BC */ beq lbl_802C15A4 -/* 802C14EC 80 1F 00 00 */ lwz r0, 0(r31) -/* 802C14F0 28 00 00 00 */ cmplwi r0, 0 -/* 802C14F4 41 82 00 B0 */ beq lbl_802C15A4 -/* 802C14F8 80 7D 00 00 */ lwz r3, 0(r29) -/* 802C14FC 3C 03 FF F9 */ addis r0, r3, 0xfff9 -/* 802C1500 28 00 04 64 */ cmplwi r0, 0x464 -/* 802C1504 40 82 00 A0 */ bne lbl_802C15A4 -/* 802C1508 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C150C 93 C1 00 1C */ stw r30, 0x1c(r1) -/* 802C1510 3C 00 43 30 */ lis r0, 0x4330 -/* 802C1514 90 01 00 18 */ stw r0, 0x18(r1) -/* 802C1518 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802C151C EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C1520 C0 42 C2 58 */ lfs f2, lit_4189(r2) -/* 802C1524 C0 62 C2 5C */ lfs f3, lit_4190(r2) -/* 802C1528 C0 82 C2 60 */ lfs f4, lit_4191(r2) -/* 802C152C C0 A2 C2 64 */ lfs f5, lit_4192(r2) -/* 802C1530 C0 C2 C2 20 */ lfs f6, lit_3669(r2) -/* 802C1534 38 60 00 01 */ li r3, 1 -/* 802C1538 4B FE 81 BD */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C153C FF C0 08 90 */ fmr f30, f1 -/* 802C1540 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C1544 93 C1 00 24 */ stw r30, 0x24(r1) -/* 802C1548 3C 00 43 30 */ lis r0, 0x4330 -/* 802C154C 90 01 00 20 */ stw r0, 0x20(r1) -/* 802C1550 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802C1554 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C1558 C0 42 C2 58 */ lfs f2, lit_4189(r2) -/* 802C155C C0 62 C2 5C */ lfs f3, lit_4190(r2) -/* 802C1560 C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C1564 C0 A2 C2 14 */ lfs f5, lit_3666(r2) -/* 802C1568 C0 C2 C2 20 */ lfs f6, lit_3669(r2) -/* 802C156C 38 60 00 01 */ li r3, 1 -/* 802C1570 4B FE 81 85 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C1574 FF E0 08 90 */ fmr f31, f1 -/* 802C1578 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C157C 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C1580 FC 20 F0 90 */ fmr f1, f30 -/* 802C1584 38 80 00 00 */ li r4, 0 -/* 802C1588 4B FE 18 2D */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C158C 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C1590 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C1594 FC 20 F8 90 */ fmr f1, f31 -/* 802C1598 38 80 00 00 */ li r4, 0 -/* 802C159C 4B FE 18 71 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C15A0 48 00 00 C0 */ b lbl_802C1660 -lbl_802C15A4: -/* 802C15A4 28 1F 00 00 */ cmplwi r31, 0 -/* 802C15A8 41 82 00 B8 */ beq lbl_802C1660 -/* 802C15AC 80 1F 00 00 */ lwz r0, 0(r31) -/* 802C15B0 28 00 00 00 */ cmplwi r0, 0 -/* 802C15B4 41 82 00 AC */ beq lbl_802C1660 -/* 802C15B8 80 7D 00 00 */ lwz r3, 0(r29) -/* 802C15BC 3C 03 FF F9 */ addis r0, r3, 0xfff9 -/* 802C15C0 28 00 04 62 */ cmplwi r0, 0x462 -/* 802C15C4 40 82 00 9C */ bne lbl_802C1660 -/* 802C15C8 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C15CC 93 C1 00 24 */ stw r30, 0x24(r1) -/* 802C15D0 3C 00 43 30 */ lis r0, 0x4330 -/* 802C15D4 90 01 00 20 */ stw r0, 0x20(r1) -/* 802C15D8 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802C15DC EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C15E0 C0 42 C2 34 */ lfs f2, lit_3717(r2) -/* 802C15E4 C0 62 C2 08 */ lfs f3, lit_3663(r2) -/* 802C15E8 C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C15EC FC A0 10 90 */ fmr f5, f2 -/* 802C15F0 C0 C2 C2 20 */ lfs f6, lit_3669(r2) -/* 802C15F4 38 60 00 01 */ li r3, 1 -/* 802C15F8 4B FE 80 FD */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C15FC FF C0 08 90 */ fmr f30, f1 -/* 802C1600 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C1604 93 C1 00 1C */ stw r30, 0x1c(r1) -/* 802C1608 3C 00 43 30 */ lis r0, 0x4330 -/* 802C160C 90 01 00 18 */ stw r0, 0x18(r1) -/* 802C1610 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802C1614 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C1618 C0 42 C2 68 */ lfs f2, lit_4193(r2) -/* 802C161C C0 62 C2 6C */ lfs f3, lit_4194(r2) -/* 802C1620 C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C1624 C0 A2 C2 14 */ lfs f5, lit_3666(r2) -/* 802C1628 C0 C2 C2 18 */ lfs f6, lit_3667(r2) -/* 802C162C 38 60 00 01 */ li r3, 1 -/* 802C1630 4B FE 80 C5 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C1634 FF E0 08 90 */ fmr f31, f1 -/* 802C1638 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C163C 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C1640 FC 20 F0 90 */ fmr f1, f30 -/* 802C1644 38 80 00 00 */ li r4, 0 -/* 802C1648 4B FE 17 6D */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C164C 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C1650 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C1654 FC 20 F8 90 */ fmr f1, f31 -/* 802C1658 38 80 00 00 */ li r4, 0 -/* 802C165C 4B FE 17 B1 */ bl movePitch__18JAISoundParamsMoveFfUl -lbl_802C1660: -/* 802C1660 7F E3 FB 78 */ mr r3, r31 -lbl_802C1664: -/* 802C1664 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 802C1668 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 802C166C E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 802C1670 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 802C1674 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C1678 48 0A 0B AD */ bl _restgpr_28 -/* 802C167C 80 01 00 64 */ lwz r0, 0x64(r1) -/* 802C1680 7C 08 03 A6 */ mtlr r0 -/* 802C1684 38 21 00 60 */ addi r1, r1, 0x60 -/* 802C1688 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureSound__10Z2CreatureF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureSound__10Z2CreatureF10JAISoundIDUlSc.s deleted file mode 100644 index 1f6e5dde49..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureSound__10Z2CreatureF10JAISoundIDUlSc.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_802C0720: -/* 802C0720 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802C0724 7C 08 02 A6 */ mflr r0 -/* 802C0728 90 01 00 44 */ stw r0, 0x44(r1) -/* 802C072C DB E1 00 30 */ stfd f31, 0x30(r1) -/* 802C0730 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 802C0734 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C0738 48 0A 1A A5 */ bl _savegpr_29 -/* 802C073C 7C 9D 23 78 */ mr r29, r4 -/* 802C0740 7C BE 2B 78 */ mr r30, r5 -/* 802C0744 80 E4 00 00 */ lwz r7, 0(r4) -/* 802C0748 3C 80 00 05 */ lis r4, 0x0005 /* 0x00050046@ha */ -/* 802C074C 38 04 00 46 */ addi r0, r4, 0x0046 /* 0x00050046@l */ -/* 802C0750 7C 07 00 00 */ cmpw r7, r0 -/* 802C0754 41 82 00 08 */ beq lbl_802C075C -/* 802C0758 48 00 00 28 */ b lbl_802C0780 -lbl_802C075C: -/* 802C075C 90 E1 00 0C */ stw r7, 0xc(r1) -/* 802C0760 38 63 00 50 */ addi r3, r3, 0x50 -/* 802C0764 38 81 00 0C */ addi r4, r1, 0xc -/* 802C0768 38 C0 00 00 */ li r6, 0 -/* 802C076C 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C0770 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C0774 7D 89 03 A6 */ mtctr r12 -/* 802C0778 4E 80 04 21 */ bctrl -/* 802C077C 48 00 00 E0 */ b lbl_802C085C -lbl_802C0780: -/* 802C0780 90 E1 00 08 */ stw r7, 8(r1) -/* 802C0784 38 63 00 08 */ addi r3, r3, 8 -/* 802C0788 38 81 00 08 */ addi r4, r1, 8 -/* 802C078C 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C0790 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C0794 7D 89 03 A6 */ mtctr r12 -/* 802C0798 4E 80 04 21 */ bctrl -/* 802C079C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802C07A0 41 82 00 B8 */ beq lbl_802C0858 -/* 802C07A4 80 1F 00 00 */ lwz r0, 0(r31) -/* 802C07A8 28 00 00 00 */ cmplwi r0, 0 -/* 802C07AC 41 82 00 AC */ beq lbl_802C0858 -/* 802C07B0 80 9D 00 00 */ lwz r4, 0(r29) -/* 802C07B4 3C 60 00 06 */ lis r3, 0x0006 /* 0x000600D7@ha */ -/* 802C07B8 38 03 00 D7 */ addi r0, r3, 0x00D7 /* 0x000600D7@l */ -/* 802C07BC 7C 04 00 00 */ cmpw r4, r0 -/* 802C07C0 41 82 00 08 */ beq lbl_802C07C8 -/* 802C07C4 48 00 00 94 */ b lbl_802C0858 -lbl_802C07C8: -/* 802C07C8 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C07CC 93 C1 00 14 */ stw r30, 0x14(r1) -/* 802C07D0 3C 00 43 30 */ lis r0, 0x4330 -/* 802C07D4 90 01 00 10 */ stw r0, 0x10(r1) -/* 802C07D8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802C07DC EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C07E0 C0 42 C2 08 */ lfs f2, lit_3663(r2) -/* 802C07E4 C0 62 C2 0C */ lfs f3, lit_3664(r2) -/* 802C07E8 C0 82 C2 10 */ lfs f4, lit_3665(r2) -/* 802C07EC C0 A2 C2 14 */ lfs f5, lit_3666(r2) -/* 802C07F0 C0 C2 C2 18 */ lfs f6, lit_3667(r2) -/* 802C07F4 38 60 00 00 */ li r3, 0 -/* 802C07F8 4B FE 8E FD */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C07FC FF E0 08 90 */ fmr f31, f1 -/* 802C0800 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C0804 93 C1 00 1C */ stw r30, 0x1c(r1) -/* 802C0808 3C 00 43 30 */ lis r0, 0x4330 -/* 802C080C 90 01 00 18 */ stw r0, 0x18(r1) -/* 802C0810 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802C0814 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C0818 C0 42 C2 08 */ lfs f2, lit_3663(r2) -/* 802C081C C0 62 C2 0C */ lfs f3, lit_3664(r2) -/* 802C0820 C0 82 C2 10 */ lfs f4, lit_3665(r2) -/* 802C0824 C0 A2 C2 1C */ lfs f5, lit_3668(r2) -/* 802C0828 C0 C2 C2 20 */ lfs f6, lit_3669(r2) -/* 802C082C 38 60 00 00 */ li r3, 0 -/* 802C0830 4B FE 8E C5 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C0834 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C0838 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C083C 38 80 00 00 */ li r4, 0 -/* 802C0840 4B FE 25 75 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C0844 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C0848 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C084C FC 20 F8 90 */ fmr f1, f31 -/* 802C0850 38 80 00 00 */ li r4, 0 -/* 802C0854 4B FE 25 B9 */ bl movePitch__18JAISoundParamsMoveFfUl -lbl_802C0858: -/* 802C0858 7F E3 FB 78 */ mr r3, r31 -lbl_802C085C: -/* 802C085C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 802C0860 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 802C0864 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C0868 48 0A 19 C1 */ bl _restgpr_29 -/* 802C086C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802C0870 7C 08 03 A6 */ mtlr r0 -/* 802C0874 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C0878 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s deleted file mode 100644 index b73d92f76b..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s +++ /dev/null @@ -1,161 +0,0 @@ -lbl_802C110C: -/* 802C110C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802C1110 7C 08 02 A6 */ mflr r0 -/* 802C1114 90 01 00 54 */ stw r0, 0x54(r1) -/* 802C1118 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 802C111C F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 802C1120 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 802C1124 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 802C1128 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C112C 48 0A 10 AD */ bl _savegpr_28 -/* 802C1130 7C 7D 1B 78 */ mr r29, r3 -/* 802C1134 7C 9E 23 78 */ mr r30, r4 -/* 802C1138 7C BC 2B 78 */ mr r28, r5 -/* 802C113C 80 04 00 00 */ lwz r0, 0(r4) -/* 802C1140 90 01 00 08 */ stw r0, 8(r1) -/* 802C1144 38 7D 00 08 */ addi r3, r29, 8 -/* 802C1148 38 81 00 08 */ addi r4, r1, 8 -/* 802C114C 81 9D 00 18 */ lwz r12, 0x18(r29) -/* 802C1150 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C1154 7D 89 03 A6 */ mtctr r12 -/* 802C1158 4E 80 04 21 */ bctrl -/* 802C115C 7C 7F 1B 78 */ mr r31, r3 -/* 802C1160 88 9D 00 A0 */ lbz r4, 0xa0(r29) -/* 802C1164 38 04 FF E7 */ addi r0, r4, -25 -/* 802C1168 28 00 00 1D */ cmplwi r0, 0x1d -/* 802C116C 41 81 01 88 */ bgt lbl_802C12F4 -/* 802C1170 3C 80 80 3D */ lis r4, lit_4094@ha /* 0x803CB630@ha */ -/* 802C1174 38 84 B6 30 */ addi r4, r4, lit_4094@l /* 0x803CB630@l */ -/* 802C1178 54 00 10 3A */ slwi r0, r0, 2 -/* 802C117C 7C 04 00 2E */ lwzx r0, r4, r0 -/* 802C1180 7C 09 03 A6 */ mtctr r0 -/* 802C1184 4E 80 04 20 */ bctr -/* 802C1188 80 7E 00 00 */ lwz r3, 0(r30) -/* 802C118C 3C 63 FF F9 */ addis r3, r3, 0xfff9 -/* 802C1190 28 03 00 96 */ cmplwi r3, 0x96 -/* 802C1194 40 82 00 28 */ bne lbl_802C11BC -/* 802C1198 38 00 00 01 */ li r0, 1 -/* 802C119C 98 1D 00 A3 */ stb r0, 0xa3(r29) -/* 802C11A0 7F A4 EB 78 */ mr r4, r29 -/* 802C11A4 28 1D 00 00 */ cmplwi r29, 0 -/* 802C11A8 41 82 00 08 */ beq lbl_802C11B0 -/* 802C11AC 38 9D 00 90 */ addi r4, r29, 0x90 -lbl_802C11B0: -/* 802C11B0 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) -/* 802C11B4 48 01 AF A9 */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802C11B8 48 00 01 3C */ b lbl_802C12F4 -lbl_802C11BC: -/* 802C11BC 88 1D 00 A3 */ lbz r0, 0xa3(r29) -/* 802C11C0 28 00 00 00 */ cmplwi r0, 0 -/* 802C11C4 41 82 01 30 */ beq lbl_802C12F4 -/* 802C11C8 28 03 00 95 */ cmplwi r3, 0x95 -/* 802C11CC 40 82 01 28 */ bne lbl_802C12F4 -/* 802C11D0 38 00 00 00 */ li r0, 0 -/* 802C11D4 98 1D 00 A3 */ stb r0, 0xa3(r29) -/* 802C11D8 7F A4 EB 78 */ mr r4, r29 -/* 802C11DC 28 1D 00 00 */ cmplwi r29, 0 -/* 802C11E0 41 82 00 08 */ beq lbl_802C11E8 -/* 802C11E4 38 9D 00 90 */ addi r4, r29, 0x90 -lbl_802C11E8: -/* 802C11E8 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) -/* 802C11EC 48 01 AD 61 */ bl append__10JSUPtrListFP10JSUPtrLink -/* 802C11F0 48 00 01 04 */ b lbl_802C12F4 -/* 802C11F4 28 1F 00 00 */ cmplwi r31, 0 -/* 802C11F8 41 82 00 FC */ beq lbl_802C12F4 -/* 802C11FC 80 1F 00 00 */ lwz r0, 0(r31) -/* 802C1200 28 00 00 00 */ cmplwi r0, 0 -/* 802C1204 41 82 00 F0 */ beq lbl_802C12F4 -/* 802C1208 80 7E 00 00 */ lwz r3, 0(r30) -/* 802C120C 3C 03 FF F9 */ addis r0, r3, 0xfff9 -/* 802C1210 28 00 03 20 */ cmplwi r0, 0x320 -/* 802C1214 40 82 00 E0 */ bne lbl_802C12F4 -/* 802C1218 C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C121C 93 81 00 14 */ stw r28, 0x14(r1) -/* 802C1220 3C 00 43 30 */ lis r0, 0x4330 -/* 802C1224 90 01 00 10 */ stw r0, 0x10(r1) -/* 802C1228 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802C122C EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C1230 C0 42 C2 44 */ lfs f2, lit_4090(r2) -/* 802C1234 C0 62 C2 48 */ lfs f3, lit_4091(r2) -/* 802C1238 C0 82 C2 4C */ lfs f4, lit_4092(r2) -/* 802C123C C0 A2 C2 20 */ lfs f5, lit_3669(r2) -/* 802C1240 38 60 00 00 */ li r3, 0 -/* 802C1244 4B FE 84 49 */ bl linearTransform__6Z2CalcFfffffb -/* 802C1248 FF E0 08 90 */ fmr f31, f1 -/* 802C124C C8 22 C2 28 */ lfd f1, lit_3672(r2) -/* 802C1250 93 81 00 1C */ stw r28, 0x1c(r1) -/* 802C1254 3C 00 43 30 */ lis r0, 0x4330 -/* 802C1258 90 01 00 18 */ stw r0, 0x18(r1) -/* 802C125C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802C1260 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802C1264 C0 42 C2 44 */ lfs f2, lit_4090(r2) -/* 802C1268 C0 62 C2 48 */ lfs f3, lit_4091(r2) -/* 802C126C C0 82 C2 14 */ lfs f4, lit_3666(r2) -/* 802C1270 C0 A2 C2 18 */ lfs f5, lit_3667(r2) -/* 802C1274 38 60 00 00 */ li r3, 0 -/* 802C1278 4B FE 84 15 */ bl linearTransform__6Z2CalcFfffffb -/* 802C127C FF C0 08 90 */ fmr f30, f1 -/* 802C1280 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C1284 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C1288 FC 20 F8 90 */ fmr f1, f31 -/* 802C128C 38 80 00 00 */ li r4, 0 -/* 802C1290 4B FE 1B 25 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C1294 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C1298 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C129C FC 20 F0 90 */ fmr f1, f30 -/* 802C12A0 38 80 00 00 */ li r4, 0 -/* 802C12A4 4B FE 1B 69 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C12A8 48 00 00 4C */ b lbl_802C12F4 -/* 802C12AC A0 9D 00 24 */ lhz r4, 0x24(r29) -/* 802C12B0 48 00 1B A5 */ bl Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl -/* 802C12B4 48 00 00 40 */ b lbl_802C12F4 -/* 802C12B8 7F 84 E3 78 */ mr r4, r28 -/* 802C12BC 48 00 1B 25 */ bl Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl -/* 802C12C0 48 00 00 34 */ b lbl_802C12F4 -/* 802C12C4 A0 9D 00 24 */ lhz r4, 0x24(r29) -/* 802C12C8 48 00 1B D5 */ bl Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl -/* 802C12CC 48 00 00 28 */ b lbl_802C12F4 -/* 802C12D0 80 7E 00 00 */ lwz r3, 0(r30) -/* 802C12D4 3C 03 FF F9 */ addis r0, r3, 0xfff9 -/* 802C12D8 28 00 02 7B */ cmplwi r0, 0x27b -/* 802C12DC 40 82 00 18 */ bne lbl_802C12F4 -/* 802C12E0 38 00 00 01 */ li r0, 1 -/* 802C12E4 98 1D 00 A3 */ stb r0, 0xa3(r29) -/* 802C12E8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C12EC 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) -/* 802C12F0 4B FF 38 0D */ bl setBattleLastHit__8Z2SeqMgrFUc -lbl_802C12F4: -/* 802C12F4 80 9E 00 00 */ lwz r4, 0(r30) -/* 802C12F8 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070460@ha */ -/* 802C12FC 38 03 04 60 */ addi r0, r3, 0x0460 /* 0x00070460@l */ -/* 802C1300 7C 04 00 00 */ cmpw r4, r0 -/* 802C1304 41 82 00 28 */ beq lbl_802C132C -/* 802C1308 40 80 00 38 */ bge lbl_802C1340 -/* 802C130C 38 03 04 38 */ addi r0, r3, 0x438 -/* 802C1310 7C 04 00 00 */ cmpw r4, r0 -/* 802C1314 41 82 00 08 */ beq lbl_802C131C -/* 802C1318 48 00 00 28 */ b lbl_802C1340 -lbl_802C131C: -/* 802C131C 7F E3 FB 78 */ mr r3, r31 -/* 802C1320 A0 9D 00 24 */ lhz r4, 0x24(r29) -/* 802C1324 48 00 1B C1 */ bl Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl -/* 802C1328 48 00 00 18 */ b lbl_802C1340 -lbl_802C132C: -/* 802C132C A0 1D 00 24 */ lhz r0, 0x24(r29) -/* 802C1330 28 00 00 64 */ cmplwi r0, 0x64 -/* 802C1334 40 81 00 0C */ ble lbl_802C1340 -/* 802C1338 38 60 00 00 */ li r3, 0 -/* 802C133C 48 00 00 08 */ b lbl_802C1344 -lbl_802C1340: -/* 802C1340 7F E3 FB 78 */ mr r3, r31 -lbl_802C1344: -/* 802C1344 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 802C1348 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 802C134C E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 802C1350 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 802C1354 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C1358 48 0A 0E CD */ bl _restgpr_28 -/* 802C135C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802C1360 7C 08 03 A6 */ mtlr r0 -/* 802C1364 38 21 00 50 */ addi r1, r1, 0x50 -/* 802C1368 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc.s deleted file mode 100644 index ef2bcd528f..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_802C0AF8: -/* 802C0AF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0AFC 7C 08 02 A6 */ mflr r0 -/* 802C0B00 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0B04 7C A6 2B 78 */ mr r6, r5 -/* 802C0B08 80 A4 00 00 */ lwz r5, 0(r4) -/* 802C0B0C 3C 05 FF FB */ addis r0, r5, 0xfffb -/* 802C0B10 28 00 01 F0 */ cmplwi r0, 0x1f0 -/* 802C0B14 40 82 00 2C */ bne lbl_802C0B40 -/* 802C0B18 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) -/* 802C0B1C 88 04 00 2C */ lbz r0, 0x2c(r4) -/* 802C0B20 28 00 00 02 */ cmplwi r0, 2 -/* 802C0B24 41 82 00 14 */ beq lbl_802C0B38 -/* 802C0B28 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) -/* 802C0B2C 88 04 00 1C */ lbz r0, 0x1c(r4) -/* 802C0B30 28 00 00 00 */ cmplwi r0, 0 -/* 802C0B34 40 82 00 0C */ bne lbl_802C0B40 -lbl_802C0B38: -/* 802C0B38 38 60 00 00 */ li r3, 0 -/* 802C0B3C 48 00 00 24 */ b lbl_802C0B60 -lbl_802C0B40: -/* 802C0B40 90 A1 00 08 */ stw r5, 8(r1) -/* 802C0B44 38 63 00 50 */ addi r3, r3, 0x50 -/* 802C0B48 38 81 00 08 */ addi r4, r1, 8 -/* 802C0B4C 38 A0 00 00 */ li r5, 0 -/* 802C0B50 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C0B54 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C0B58 7D 89 03 A6 */ mtctr r12 -/* 802C0B5C 4E 80 04 21 */ bctrl -lbl_802C0B60: -/* 802C0B60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0B64 7C 08 03 A6 */ mtlr r0 -/* 802C0B68 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0B6C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc.s deleted file mode 100644 index 0cd0aec557..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_802C24D0: -/* 802C24D0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802C24D4 7C 08 02 A6 */ mflr r0 -/* 802C24D8 90 01 00 34 */ stw r0, 0x34(r1) -/* 802C24DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C24E0 48 09 FC FD */ bl _savegpr_29 -/* 802C24E4 7C 7D 1B 78 */ mr r29, r3 -/* 802C24E8 7C 9E 23 78 */ mr r30, r4 -/* 802C24EC 7C BF 2B 78 */ mr r31, r5 -/* 802C24F0 3C 60 00 07 */ lis r3, 0x0007 /* 0x000701F6@ha */ -/* 802C24F4 38 03 01 F6 */ addi r0, r3, 0x01F6 /* 0x000701F6@l */ -/* 802C24F8 90 01 00 10 */ stw r0, 0x10(r1) -/* 802C24FC 38 7D 00 50 */ addi r3, r29, 0x50 -/* 802C2500 38 81 00 10 */ addi r4, r1, 0x10 -/* 802C2504 4B FE 8D 51 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID -/* 802C2508 28 03 00 00 */ cmplwi r3, 0 -/* 802C250C 40 82 00 24 */ bne lbl_802C2530 -/* 802C2510 3C 60 00 07 */ lis r3, 0x0007 /* 0x000701F7@ha */ -/* 802C2514 38 03 01 F7 */ addi r0, r3, 0x01F7 /* 0x000701F7@l */ -/* 802C2518 90 01 00 0C */ stw r0, 0xc(r1) -/* 802C251C 38 7D 00 50 */ addi r3, r29, 0x50 -/* 802C2520 38 81 00 0C */ addi r4, r1, 0xc -/* 802C2524 4B FE 8D 31 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID -/* 802C2528 28 03 00 00 */ cmplwi r3, 0 -/* 802C252C 41 82 00 0C */ beq lbl_802C2538 -lbl_802C2530: -/* 802C2530 38 60 00 00 */ li r3, 0 -/* 802C2534 48 00 00 2C */ b lbl_802C2560 -lbl_802C2538: -/* 802C2538 80 1E 00 00 */ lwz r0, 0(r30) -/* 802C253C 90 01 00 08 */ stw r0, 8(r1) -/* 802C2540 38 7D 00 50 */ addi r3, r29, 0x50 -/* 802C2544 38 81 00 08 */ addi r4, r1, 8 -/* 802C2548 38 A0 00 00 */ li r5, 0 -/* 802C254C 7F E6 FB 78 */ mr r6, r31 -/* 802C2550 81 9D 00 60 */ lwz r12, 0x60(r29) -/* 802C2554 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C2558 7D 89 03 A6 */ mtctr r12 -/* 802C255C 4E 80 04 21 */ bctrl -lbl_802C2560: -/* 802C2560 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C2564 48 09 FC C5 */ bl _restgpr_29 -/* 802C2568 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802C256C 7C 08 03 A6 */ mtlr r0 -/* 802C2570 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C2574 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc.s deleted file mode 100644 index f873e0e1c2..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802C1948: -/* 802C1948 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C194C 7C 08 02 A6 */ mflr r0 -/* 802C1950 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1954 7C A6 2B 78 */ mr r6, r5 -/* 802C1958 38 A0 00 00 */ li r5, 0 -/* 802C195C 88 03 00 A0 */ lbz r0, 0xa0(r3) -/* 802C1960 28 00 00 07 */ cmplwi r0, 7 -/* 802C1964 40 82 00 08 */ bne lbl_802C196C -/* 802C1968 38 A0 00 01 */ li r5, 1 -lbl_802C196C: -/* 802C196C 80 04 00 00 */ lwz r0, 0(r4) -/* 802C1970 90 01 00 08 */ stw r0, 8(r1) -/* 802C1974 38 63 00 50 */ addi r3, r3, 0x50 -/* 802C1978 38 81 00 08 */ addi r4, r1, 8 -/* 802C197C 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C1980 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C1984 7D 89 03 A6 */ mtctr r12 -/* 802C1988 4E 80 04 21 */ bctrl -/* 802C198C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C1990 7C 08 03 A6 */ mtlr r0 -/* 802C1994 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1998 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__10Z2CreatureF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureVoice__10Z2CreatureF10JAISoundIDSc.s deleted file mode 100644 index e657c9dfdb..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__10Z2CreatureF10JAISoundIDSc.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_802C0A4C: -/* 802C0A4C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C0A50 7C 08 02 A6 */ mflr r0 -/* 802C0A54 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C0A58 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C0A5C 48 0A 17 81 */ bl _savegpr_29 -/* 802C0A60 7C 7D 1B 78 */ mr r29, r3 -/* 802C0A64 7C 9E 23 78 */ mr r30, r4 -/* 802C0A68 7C BF 2B 78 */ mr r31, r5 -/* 802C0A6C 80 84 00 00 */ lwz r4, 0(r4) -/* 802C0A70 3C 60 00 05 */ lis r3, 0x0005 /* 0x000501F3@ha */ -/* 802C0A74 38 03 01 F3 */ addi r0, r3, 0x01F3 /* 0x000501F3@l */ -/* 802C0A78 7C 04 00 00 */ cmpw r4, r0 -/* 802C0A7C 41 82 00 3C */ beq lbl_802C0AB8 -/* 802C0A80 40 80 00 14 */ bge lbl_802C0A94 -/* 802C0A84 38 03 01 E9 */ addi r0, r3, 0x1e9 -/* 802C0A88 7C 04 00 00 */ cmpw r4, r0 -/* 802C0A8C 40 80 00 14 */ bge lbl_802C0AA0 -/* 802C0A90 48 00 00 28 */ b lbl_802C0AB8 -lbl_802C0A94: -/* 802C0A94 38 03 02 00 */ addi r0, r3, 0x200 -/* 802C0A98 7C 04 00 00 */ cmpw r4, r0 -/* 802C0A9C 40 80 00 1C */ bge lbl_802C0AB8 -lbl_802C0AA0: -/* 802C0AA0 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) -/* 802C0AA4 48 00 C4 E5 */ bl isMidnaSpeak__12Z2SpeechMgr2Fv -/* 802C0AA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802C0AAC 41 82 00 0C */ beq lbl_802C0AB8 -/* 802C0AB0 38 60 00 00 */ li r3, 0 -/* 802C0AB4 48 00 00 2C */ b lbl_802C0AE0 -lbl_802C0AB8: -/* 802C0AB8 80 1E 00 00 */ lwz r0, 0(r30) -/* 802C0ABC 90 01 00 08 */ stw r0, 8(r1) -/* 802C0AC0 38 7D 00 50 */ addi r3, r29, 0x50 -/* 802C0AC4 38 81 00 08 */ addi r4, r1, 8 -/* 802C0AC8 38 A0 00 00 */ li r5, 0 -/* 802C0ACC 7F E6 FB 78 */ mr r6, r31 -/* 802C0AD0 81 9D 00 60 */ lwz r12, 0x60(r29) -/* 802C0AD4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C0AD8 7D 89 03 A6 */ mtctr r12 -/* 802C0ADC 4E 80 04 21 */ bctrl -lbl_802C0AE0: -/* 802C0AE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C0AE4 48 0A 17 45 */ bl _restgpr_29 -/* 802C0AE8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C0AEC 7C 08 03 A6 */ mtlr r0 -/* 802C0AF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C0AF4 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc.s deleted file mode 100644 index 6e3175a28b..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc.s +++ /dev/null @@ -1,198 +0,0 @@ -lbl_802C168C: -/* 802C168C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802C1690 7C 08 02 A6 */ mflr r0 -/* 802C1694 90 01 00 44 */ stw r0, 0x44(r1) -/* 802C1698 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C169C 48 0A 0B 41 */ bl _savegpr_29 -/* 802C16A0 7C 7E 1B 78 */ mr r30, r3 -/* 802C16A4 7C 9F 23 78 */ mr r31, r4 -/* 802C16A8 7C A6 2B 78 */ mr r6, r5 -/* 802C16AC 80 8D 86 04 */ lwz r4, __OSReport_disable-0x14(r13) -/* 802C16B0 80 64 00 00 */ lwz r3, 0(r4) -/* 802C16B4 28 03 00 00 */ cmplwi r3, 0 -/* 802C16B8 41 82 00 10 */ beq lbl_802C16C8 -/* 802C16BC 80 63 00 18 */ lwz r3, 0x18(r3) -/* 802C16C0 90 61 00 08 */ stw r3, 8(r1) -/* 802C16C4 48 00 00 08 */ b lbl_802C16CC -lbl_802C16C8: -/* 802C16C8 38 60 FF FF */ li r3, -1 -lbl_802C16CC: -/* 802C16CC 3C 03 FF 00 */ addis r0, r3, 0xff00 -/* 802C16D0 28 00 00 62 */ cmplwi r0, 0x62 -/* 802C16D4 40 82 01 6C */ bne lbl_802C1840 -/* 802C16D8 88 04 00 BC */ lbz r0, 0xbc(r4) -/* 802C16DC 2C 00 00 06 */ cmpwi r0, 6 -/* 802C16E0 40 80 00 1C */ bge lbl_802C16FC -/* 802C16E4 2C 00 00 02 */ cmpwi r0, 2 -/* 802C16E8 40 80 00 08 */ bge lbl_802C16F0 -/* 802C16EC 48 00 01 54 */ b lbl_802C1840 -lbl_802C16F0: -/* 802C16F0 2C 00 00 04 */ cmpwi r0, 4 -/* 802C16F4 40 80 00 70 */ bge lbl_802C1764 -/* 802C16F8 48 00 00 24 */ b lbl_802C171C -lbl_802C16FC: -/* 802C16FC 2C 00 00 0A */ cmpwi r0, 0xa -/* 802C1700 40 80 00 10 */ bge lbl_802C1710 -/* 802C1704 2C 00 00 08 */ cmpwi r0, 8 -/* 802C1708 40 80 00 EC */ bge lbl_802C17F4 -/* 802C170C 48 00 00 A0 */ b lbl_802C17AC -lbl_802C1710: -/* 802C1710 2C 00 00 0C */ cmpwi r0, 0xc -/* 802C1714 40 80 01 2C */ bge lbl_802C1840 -/* 802C1718 48 00 01 04 */ b lbl_802C181C -lbl_802C171C: -/* 802C171C 80 9F 00 00 */ lwz r4, 0(r31) -/* 802C1720 3C 60 00 07 */ lis r3, 0x0007 /* 0x0007040C@ha */ -/* 802C1724 38 03 04 0C */ addi r0, r3, 0x040C /* 0x0007040C@l */ -/* 802C1728 7C 04 00 00 */ cmpw r4, r0 -/* 802C172C 41 82 00 28 */ beq lbl_802C1754 -/* 802C1730 40 80 01 10 */ bge lbl_802C1840 -/* 802C1734 38 03 04 05 */ addi r0, r3, 0x405 -/* 802C1738 7C 04 00 00 */ cmpw r4, r0 -/* 802C173C 41 82 00 08 */ beq lbl_802C1744 -/* 802C1740 48 00 01 00 */ b lbl_802C1840 -lbl_802C1744: -/* 802C1744 38 03 04 06 */ addi r0, r3, 0x406 -/* 802C1748 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802C174C 90 1F 00 00 */ stw r0, 0(r31) -/* 802C1750 48 00 00 F0 */ b lbl_802C1840 -lbl_802C1754: -/* 802C1754 38 03 04 0D */ addi r0, r3, 0x40d -/* 802C1758 90 01 00 28 */ stw r0, 0x28(r1) -/* 802C175C 90 1F 00 00 */ stw r0, 0(r31) -/* 802C1760 48 00 00 E0 */ b lbl_802C1840 -lbl_802C1764: -/* 802C1764 80 9F 00 00 */ lwz r4, 0(r31) -/* 802C1768 3C 60 00 07 */ lis r3, 0x0007 /* 0x0007040C@ha */ -/* 802C176C 38 03 04 0C */ addi r0, r3, 0x040C /* 0x0007040C@l */ -/* 802C1770 7C 04 00 00 */ cmpw r4, r0 -/* 802C1774 41 82 00 28 */ beq lbl_802C179C -/* 802C1778 40 80 00 C8 */ bge lbl_802C1840 -/* 802C177C 38 03 04 05 */ addi r0, r3, 0x405 -/* 802C1780 7C 04 00 00 */ cmpw r4, r0 -/* 802C1784 41 82 00 08 */ beq lbl_802C178C -/* 802C1788 48 00 00 B8 */ b lbl_802C1840 -lbl_802C178C: -/* 802C178C 38 03 04 07 */ addi r0, r3, 0x407 -/* 802C1790 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C1794 90 1F 00 00 */ stw r0, 0(r31) -/* 802C1798 48 00 00 A8 */ b lbl_802C1840 -lbl_802C179C: -/* 802C179C 38 03 04 0E */ addi r0, r3, 0x40e -/* 802C17A0 90 01 00 20 */ stw r0, 0x20(r1) -/* 802C17A4 90 1F 00 00 */ stw r0, 0(r31) -/* 802C17A8 48 00 00 98 */ b lbl_802C1840 -lbl_802C17AC: -/* 802C17AC 80 9F 00 00 */ lwz r4, 0(r31) -/* 802C17B0 3C 60 00 07 */ lis r3, 0x0007 /* 0x0007040C@ha */ -/* 802C17B4 38 03 04 0C */ addi r0, r3, 0x040C /* 0x0007040C@l */ -/* 802C17B8 7C 04 00 00 */ cmpw r4, r0 -/* 802C17BC 41 82 00 28 */ beq lbl_802C17E4 -/* 802C17C0 40 80 00 80 */ bge lbl_802C1840 -/* 802C17C4 38 03 04 05 */ addi r0, r3, 0x405 -/* 802C17C8 7C 04 00 00 */ cmpw r4, r0 -/* 802C17CC 41 82 00 08 */ beq lbl_802C17D4 -/* 802C17D0 48 00 00 70 */ b lbl_802C1840 -lbl_802C17D4: -/* 802C17D4 38 03 04 08 */ addi r0, r3, 0x408 -/* 802C17D8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802C17DC 90 1F 00 00 */ stw r0, 0(r31) -/* 802C17E0 48 00 00 60 */ b lbl_802C1840 -lbl_802C17E4: -/* 802C17E4 38 03 04 0F */ addi r0, r3, 0x40f -/* 802C17E8 90 01 00 18 */ stw r0, 0x18(r1) -/* 802C17EC 90 1F 00 00 */ stw r0, 0(r31) -/* 802C17F0 48 00 00 50 */ b lbl_802C1840 -lbl_802C17F4: -/* 802C17F4 80 9F 00 00 */ lwz r4, 0(r31) -/* 802C17F8 3C 60 00 07 */ lis r3, 0x0007 /* 0x0007040C@ha */ -/* 802C17FC 38 03 04 0C */ addi r0, r3, 0x040C /* 0x0007040C@l */ -/* 802C1800 7C 04 00 00 */ cmpw r4, r0 -/* 802C1804 41 82 00 08 */ beq lbl_802C180C -/* 802C1808 48 00 00 38 */ b lbl_802C1840 -lbl_802C180C: -/* 802C180C 38 03 04 10 */ addi r0, r3, 0x410 -/* 802C1810 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1814 90 1F 00 00 */ stw r0, 0(r31) -/* 802C1818 48 00 00 28 */ b lbl_802C1840 -lbl_802C181C: -/* 802C181C 80 9F 00 00 */ lwz r4, 0(r31) -/* 802C1820 3C 60 00 07 */ lis r3, 0x0007 /* 0x0007040C@ha */ -/* 802C1824 38 03 04 0C */ addi r0, r3, 0x040C /* 0x0007040C@l */ -/* 802C1828 7C 04 00 00 */ cmpw r4, r0 -/* 802C182C 41 82 00 08 */ beq lbl_802C1834 -/* 802C1830 48 00 00 10 */ b lbl_802C1840 -lbl_802C1834: -/* 802C1834 38 03 04 11 */ addi r0, r3, 0x411 -/* 802C1838 90 01 00 10 */ stw r0, 0x10(r1) -/* 802C183C 90 1F 00 00 */ stw r0, 0(r31) -lbl_802C1840: -/* 802C1840 38 A0 00 00 */ li r5, 0 -/* 802C1844 88 1E 00 A0 */ lbz r0, 0xa0(r30) -/* 802C1848 28 00 00 07 */ cmplwi r0, 7 -/* 802C184C 40 82 00 08 */ bne lbl_802C1854 -/* 802C1850 38 A0 00 01 */ li r5, 1 -lbl_802C1854: -/* 802C1854 80 1F 00 00 */ lwz r0, 0(r31) -/* 802C1858 90 01 00 0C */ stw r0, 0xc(r1) -/* 802C185C 38 7E 00 50 */ addi r3, r30, 0x50 -/* 802C1860 38 81 00 0C */ addi r4, r1, 0xc -/* 802C1864 81 9E 00 60 */ lwz r12, 0x60(r30) -/* 802C1868 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C186C 7D 89 03 A6 */ mtctr r12 -/* 802C1870 4E 80 04 21 */ bctrl -/* 802C1874 7C 7D 1B 78 */ mr r29, r3 -/* 802C1878 88 9E 00 A0 */ lbz r4, 0xa0(r30) -/* 802C187C 38 04 FF E8 */ addi r0, r4, -24 -/* 802C1880 28 00 00 1E */ cmplwi r0, 0x1e -/* 802C1884 41 81 00 8C */ bgt lbl_802C1910 -/* 802C1888 3C 80 80 3D */ lis r4, lit_4340@ha /* 0x803CB6A8@ha */ -/* 802C188C 38 84 B6 A8 */ addi r4, r4, lit_4340@l /* 0x803CB6A8@l */ -/* 802C1890 54 00 10 3A */ slwi r0, r0, 2 -/* 802C1894 7C 04 00 2E */ lwzx r0, r4, r0 -/* 802C1898 7C 09 03 A6 */ mtctr r0 -/* 802C189C 4E 80 04 20 */ bctr -/* 802C18A0 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C18A4 3C 03 FF F9 */ addis r0, r3, 0xfff9 -/* 802C18A8 28 00 00 A2 */ cmplwi r0, 0xa2 -/* 802C18AC 40 82 00 64 */ bne lbl_802C1910 -/* 802C18B0 38 00 00 01 */ li r0, 1 -/* 802C18B4 98 1E 00 A3 */ stb r0, 0xa3(r30) -/* 802C18B8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C18BC 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) -/* 802C18C0 4B FF 32 3D */ bl setBattleLastHit__8Z2SeqMgrFUc -/* 802C18C4 48 00 00 4C */ b lbl_802C1910 -/* 802C18C8 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C18CC 3C 03 FF F9 */ addis r0, r3, 0xfff9 -/* 802C18D0 28 00 00 AE */ cmplwi r0, 0xae -/* 802C18D4 40 82 00 3C */ bne lbl_802C1910 -/* 802C18D8 38 00 00 01 */ li r0, 1 -/* 802C18DC 98 1E 00 A3 */ stb r0, 0xa3(r30) -/* 802C18E0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802C18E4 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) -/* 802C18E8 4B FF 32 15 */ bl setBattleLastHit__8Z2SeqMgrFUc -/* 802C18EC 48 00 00 24 */ b lbl_802C1910 -/* 802C18F0 A0 9E 00 6C */ lhz r4, 0x6c(r30) -/* 802C18F4 48 00 15 61 */ bl Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl -/* 802C18F8 48 00 00 18 */ b lbl_802C1910 -/* 802C18FC A0 9E 00 6C */ lhz r4, 0x6c(r30) -/* 802C1900 48 00 14 E1 */ bl Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl -/* 802C1904 48 00 00 0C */ b lbl_802C1910 -/* 802C1908 A0 9E 00 6C */ lhz r4, 0x6c(r30) -/* 802C190C 48 00 15 91 */ bl Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl -lbl_802C1910: -/* 802C1910 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C1914 3C 03 FF F9 */ addis r0, r3, 0xfff9 -/* 802C1918 28 00 04 39 */ cmplwi r0, 0x439 -/* 802C191C 40 82 00 10 */ bne lbl_802C192C -/* 802C1920 7F A3 EB 78 */ mr r3, r29 -/* 802C1924 A0 9E 00 6C */ lhz r4, 0x6c(r30) -/* 802C1928 48 00 15 BD */ bl Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl -lbl_802C192C: -/* 802C192C 7F A3 EB 78 */ mr r3, r29 -/* 802C1930 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C1934 48 0A 08 F5 */ bl _restgpr_29 -/* 802C1938 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802C193C 7C 08 03 A6 */ mtlr r0 -/* 802C1940 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C1944 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc.s deleted file mode 100644 index 6712b6d047..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_802C0ED8: -/* 802C0ED8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C0EDC 7C 08 02 A6 */ mflr r0 -/* 802C0EE0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C0EE4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802C0EE8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 802C0EEC 7C 7E 1B 78 */ mr r30, r3 -/* 802C0EF0 7C 9F 23 78 */ mr r31, r4 -/* 802C0EF4 80 84 00 00 */ lwz r4, 0(r4) -/* 802C0EF8 3C 60 00 05 */ lis r3, 0x0005 /* 0x000501D5@ha */ -/* 802C0EFC 38 03 01 D5 */ addi r0, r3, 0x01D5 /* 0x000501D5@l */ -/* 802C0F00 7C 04 00 00 */ cmpw r4, r0 -/* 802C0F04 40 80 00 30 */ bge lbl_802C0F34 -/* 802C0F08 38 03 01 D2 */ addi r0, r3, 0x1d2 -/* 802C0F0C 7C 04 00 00 */ cmpw r4, r0 -/* 802C0F10 40 80 00 08 */ bge lbl_802C0F18 -/* 802C0F14 48 00 00 20 */ b lbl_802C0F34 -lbl_802C0F18: -/* 802C0F18 88 1E 00 A2 */ lbz r0, 0xa2(r30) -/* 802C0F1C 28 00 00 00 */ cmplwi r0, 0 -/* 802C0F20 40 82 00 14 */ bne lbl_802C0F34 -/* 802C0F24 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) -/* 802C0F28 4B FE AA 39 */ bl decrCrowdSize__7Z2SeMgrFv -/* 802C0F2C 38 00 00 01 */ li r0, 1 -/* 802C0F30 98 1E 00 A2 */ stb r0, 0xa2(r30) -lbl_802C0F34: -/* 802C0F34 80 1F 00 00 */ lwz r0, 0(r31) -/* 802C0F38 90 01 00 08 */ stw r0, 8(r1) -/* 802C0F3C 7F C3 F3 78 */ mr r3, r30 -/* 802C0F40 38 81 00 08 */ addi r4, r1, 8 -/* 802C0F44 38 A0 FF FF */ li r5, -1 -/* 802C0F48 4B FF FB 05 */ bl startCreatureVoice__10Z2CreatureF10JAISoundIDSc -/* 802C0F4C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802C0F50 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802C0F54 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C0F58 7C 08 03 A6 */ mtlr r0 -/* 802C0F5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C0F60 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc.s b/asm/Z2AudioLib/Z2Creature/startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc.s deleted file mode 100644 index 4bd332ab38..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_802C2CD4: -/* 802C2CD4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802C2CD8 7C 08 02 A6 */ mflr r0 -/* 802C2CDC 90 01 00 44 */ stw r0, 0x44(r1) -/* 802C2CE0 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 802C2CE4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 802C2CE8 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 802C2CEC F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 802C2CF0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802C2CF4 7C 68 1B 78 */ mr r8, r3 -/* 802C2CF8 FF C0 08 90 */ fmr f30, f1 -/* 802C2CFC 80 04 00 00 */ lwz r0, 0(r4) -/* 802C2D00 90 01 00 08 */ stw r0, 8(r1) -/* 802C2D04 54 A3 2C F4 */ rlwinm r3, r5, 5, 0x13, 0x1a -/* 802C2D08 38 63 01 04 */ addi r3, r3, 0x104 -/* 802C2D0C 7C 68 1A 14 */ add r3, r8, r3 -/* 802C2D10 38 81 00 08 */ addi r4, r1, 8 -/* 802C2D14 7C C5 33 78 */ mr r5, r6 -/* 802C2D18 7C E6 3B 78 */ mr r6, r7 -/* 802C2D1C 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C2D20 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C2D24 7D 89 03 A6 */ mtctr r12 -/* 802C2D28 4E 80 04 21 */ bctrl -/* 802C2D2C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802C2D30 41 82 00 88 */ beq lbl_802C2DB8 -/* 802C2D34 80 1F 00 00 */ lwz r0, 0(r31) -/* 802C2D38 28 00 00 00 */ cmplwi r0, 0 -/* 802C2D3C 41 82 00 7C */ beq lbl_802C2DB8 -/* 802C2D40 FC 20 F0 90 */ fmr f1, f30 -/* 802C2D44 C0 42 C2 34 */ lfs f2, lit_3717(r2) -/* 802C2D48 C0 62 C2 88 */ lfs f3, lit_4875(r2) -/* 802C2D4C C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C2D50 FC A0 10 90 */ fmr f5, f2 -/* 802C2D54 C0 C2 C2 20 */ lfs f6, lit_3669(r2) -/* 802C2D58 38 60 00 01 */ li r3, 1 -/* 802C2D5C 4B FE 69 99 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C2D60 FF E0 08 90 */ fmr f31, f1 -/* 802C2D64 FC 20 F0 90 */ fmr f1, f30 -/* 802C2D68 C0 42 C2 34 */ lfs f2, lit_3717(r2) -/* 802C2D6C C0 62 C2 88 */ lfs f3, lit_4875(r2) -/* 802C2D70 C0 82 C2 40 */ lfs f4, lit_3720(r2) -/* 802C2D74 C0 A2 C2 84 */ lfs f5, lit_4838(r2) -/* 802C2D78 C0 C2 C2 54 */ lfs f6, lit_4188(r2) -/* 802C2D7C 38 60 00 01 */ li r3, 1 -/* 802C2D80 4B FE 69 75 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802C2D84 FF C0 08 90 */ fmr f30, f1 -/* 802C2D88 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C2D8C 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2D90 FC 20 F8 90 */ fmr f1, f31 -/* 802C2D94 38 80 00 00 */ li r4, 0 -/* 802C2D98 4B FE 00 1D */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C2D9C 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C2DA0 38 63 00 48 */ addi r3, r3, 0x48 -/* 802C2DA4 FC 20 F0 90 */ fmr f1, f30 -/* 802C2DA8 38 80 00 00 */ li r4, 0 -/* 802C2DAC 4B FE 00 61 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802C2DB0 7F E3 FB 78 */ mr r3, r31 -/* 802C2DB4 48 00 00 08 */ b lbl_802C2DBC -lbl_802C2DB8: -/* 802C2DB8 38 60 00 00 */ li r3, 0 -lbl_802C2DBC: -/* 802C2DBC E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 802C2DC0 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 802C2DC4 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 802C2DC8 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 802C2DCC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802C2DD0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802C2DD4 7C 08 03 A6 */ mtlr r0 -/* 802C2DD8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C2DDC 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc.s b/asm/Z2AudioLib/Z2Creature/startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc.s deleted file mode 100644 index 5ed2c85eb1..0000000000 --- a/asm/Z2AudioLib/Z2Creature/startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_802C2C84: -/* 802C2C84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C2C88 7C 08 02 A6 */ mflr r0 -/* 802C2C8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C2C90 7C 68 1B 78 */ mr r8, r3 -/* 802C2C94 80 04 00 00 */ lwz r0, 0(r4) -/* 802C2C98 90 01 00 08 */ stw r0, 8(r1) -/* 802C2C9C 54 A3 2C F4 */ rlwinm r3, r5, 5, 0x13, 0x1a -/* 802C2CA0 38 63 01 04 */ addi r3, r3, 0x104 -/* 802C2CA4 7C 68 1A 14 */ add r3, r8, r3 -/* 802C2CA8 38 81 00 08 */ addi r4, r1, 8 -/* 802C2CAC 7C C5 33 78 */ mr r5, r6 -/* 802C2CB0 7C E6 3B 78 */ mr r6, r7 -/* 802C2CB4 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802C2CB8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C2CBC 7D 89 03 A6 */ mtctr r12 -/* 802C2CC0 4E 80 04 21 */ bctrl -/* 802C2CC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C2CC8 7C 08 03 A6 */ mtlr r0 -/* 802C2CCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2CD0 4E 80 00 20 */ blr diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index 310622c84f..8d9793d9da 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -8,7 +8,6 @@ class JAISoundID { public: operator u32() const { return this->mId.mFullId; } - const JAISoundID& operator=(JAISoundID const& other) { mId.mFullId = other.mId.mFullId; return *this; }; JAISoundID(u32 pId) { mId.mFullId = pId; }; @@ -16,10 +15,6 @@ public: JAISoundID() {} - // Helps solve some JAISoundID ctor/assignment operator stack issues - // Remove when solved - void stackCopyHelper(JAISoundID other) { mId = other.mId; } - bool isAnonymous() { return mId.mFullId == 0xffffffff; } void setAnonymous() { mId.mFullId = -1; } @@ -229,7 +224,7 @@ public: virtual JAITempoMgr* getTempoMgr() = 0; virtual bool JAISound_tryDie_() = 0; - JAISoundID getID() const; + JAISoundID getID() const { return soundID; } u8 getAnimationState() const { return status_.state.flags.animationState; } bool isAnimated() const { return getAnimationState() != 0; } void setAnimationState(u8 pState) { diff --git a/include/Z2AudioLib/Z2Audience.h b/include/Z2AudioLib/Z2Audience.h index 5b6e0acd80..7e00984450 100644 --- a/include/Z2AudioLib/Z2Audience.h +++ b/include/Z2AudioLib/Z2Audience.h @@ -238,4 +238,7 @@ inline Z2Audience* Z2GetAudience() { return JASGlobalInstance::getInstance(); } +extern s8 data_80451358; +extern s8 data_80451359; + #endif /* Z2AUDIENCE_H */ diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 8da7834449..1ca1552738 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -19,13 +19,13 @@ public: virtual void deleteObject(); virtual void setSoundStarter(Z2SoundStarter*); virtual void framework(u32, s8); - virtual void startCreatureSound(JAISoundID, u32, s8); - virtual void startCreatureSoundLevel(JAISoundID, u32, s8); - virtual void startCreatureVoice(JAISoundID, s8); - virtual void startCreatureVoiceLevel(JAISoundID, s8); - virtual void startCreatureExtraSound(JAISoundID, u32, s8); - virtual void startCreatureExtraSoundLevel(JAISoundID, u32, s8); - virtual void startCollisionSE(u32, u32); + virtual Z2SoundHandlePool* startCreatureSound(JAISoundID, u32, s8); + virtual Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID, u32, s8); + virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID, s8); + virtual Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID, s8); + virtual Z2SoundHandlePool* startCreatureExtraSound(JAISoundID, u32, s8); + virtual Z2SoundHandlePool* startCreatureExtraSoundLevel(JAISoundID, u32, s8); + virtual Z2SoundHandlePool* startCollisionSE(u32, u32); Vec* getCurrentPos() const { return mpPos; } @@ -33,7 +33,7 @@ public: /* 0x08 */ Z2SoundObjAnime mSoundObjAnime; /* 0x50 */ Z2SoundObjSimple mSoundObjSimple1; /* 0x70 */ Z2SoundObjSimple mSoundObjSimple2; -}; +}; // Size: 0x90 struct Z2LinkSoundStarter : public Z2SoundStarter { Z2LinkSoundStarter(); @@ -69,7 +69,7 @@ public: void startLinkVoice(JAISoundID, s8); void startLinkVoiceLevel(JAISoundID, s8); void startLinkSwordSound(JAISoundID, u32, s8); - virtual void startCollisionSE(u32, u32); + virtual Z2SoundHandlePool* startCollisionSE(u32, u32); int startHitItemSE(u32, u32, Z2SoundObjBase*, float); void setResumeAttack(bool); @@ -147,31 +147,30 @@ private: /* 0x98 */ bool mLinkRiding; }; // Size: 0x9C -class Z2CreatureEnemy : public Z2Creature { +class Z2CreatureEnemy : public Z2Creature, public JSULink { public: /* 802C0F64 */ Z2CreatureEnemy(); /* 802C0FC4 */ virtual void deleteObject(); /* 802C1094 */ void init(Vec*, Vec*, u8, u8); /* 802C10B4 */ void init(Vec*, Vec*, Vec*, u8, u8, u8); /* 802C10D4 */ virtual void framework(u32, s8); - /* 802C110C */ virtual void startCreatureSound(JAISoundID, u32, s8); - /* 802C136C */ virtual void startCreatureSoundLevel(JAISoundID, u32, s8); - /* 802C168C */ virtual void startCreatureVoice(JAISoundID, s8); - /* 802C1948 */ virtual void startCreatureVoiceLevel(JAISoundID, s8); - /* 802C199C */ virtual void startCreatureExtraSound(JAISoundID, u32, s8); - /* 802C19D8 */ virtual void startCreatureExtraSoundLevel(JAISoundID, u32, s8); - /* 802C1A14 */ virtual void startCollisionSE(u32, u32); + /* 802C110C */ virtual Z2SoundHandlePool* startCreatureSound(JAISoundID, u32, s8); + /* 802C136C */ virtual Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID, u32, s8); + /* 802C168C */ virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID, s8); + /* 802C1948 */ virtual Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID, s8); + /* 802C199C */ virtual Z2SoundHandlePool* startCreatureExtraSound(JAISoundID, u32, s8); + /* 802C19D8 */ virtual Z2SoundHandlePool* startCreatureExtraSoundLevel(JAISoundID, u32, s8); + /* 802C1A14 */ virtual Z2SoundHandlePool* startCollisionSE(u32, u32); /* 802C1B7C */ void setLinkSearch(bool); /* 802C1B90 */ void setEnemyName(char const*); - /* 0x90 */ JSULink mLink; /* 0xA0 */ u8 mEnemyID; /* 0xA1 */ s8 field_0xa1; /* 0xA2 */ bool mLinkSearch; /* 0xA3 */ u8 field_0xa3; }; // Size: 0xA4 -class Z2CreatureCitizen : public Z2Creature { +class Z2CreatureCitizen : public Z2Creature, public JSULink { public: /* 802C0C10 */ Z2CreatureCitizen(); /* 802C0C6C */ ~Z2CreatureCitizen(); @@ -179,14 +178,65 @@ public: /* 802C0D04 */ virtual void deleteObject(); /* 802C0D48 */ void setMdlType(s8, bool, bool); /* 802C0E18 */ void playVoice(int); - /* 802C0ED8 */ virtual void startCreatureVoice(JAISoundID, s8); + /* 802C0ED8 */ virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID, s8); private: - /* 0x90 */ JSULink mLink; /* 0xA0 */ s8 mCitizenID; /* 0xA1 */ s8 field_0xa1; /* 0xA2 */ bool mLinkSearch; /* 0xA3 */ u8 field_0xa3; }; // Size: 0xA4 +class Z2CreatureSumomo : public Z2Creature { +public: + /* 802C1BE8 */ Z2CreatureSumomo(); + /* 802C1C24 */ void playSumomoBgm(u32); + /* 802C1CA0 */ void deleteObject(); +}; // Size: 0x90 + +class Z2SoundObjBeeGroup : public Z2SoundObjBase { +public: + /* 802C1D10 */ Z2SoundObjBeeGroup(); + /* 802C1D4C */ void init(Vec*, u8); + /* 802C1D6C */ void playBeeGroupSound(JAISoundID, u8); +}; // Size: 0x20 + +class Z2CreatureFM : public Z2CreatureEnemy { +public: + /* 802C1F54 */ Z2CreatureFM(); + /* 802C1FB0 */ void deleteObject(); + /* 802C1FFC */ void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, u8, u8, u8, u8, u8, u8); + /* 802C20E8 */ void framework(u32, s8); + /* 802C2194 */ Z2SoundHandlePool* startChainSound(JAISoundID, u8, f32, u32, s8); + /* 802C2290 */ Z2SoundHandlePool* startChainSoundLevel(JAISoundID, u8, f32, u32, s8); + + /* 0x0A4 */ Z2SoundObjSimple field_0xa4; + /* 0x0C4 */ Z2SoundObjSimple field_0xc4; + /* 0x0E4 */ Z2SoundObjSimple field_0xe4; + /* 0x104 */ Z2SoundObjSimple field_0x104; +}; // Size: 0x124 + +class Z2CreatureGob : public Z2Creature { +public: + /* 802C24B0 */ void init(Vec*, Vec*, Vec*, u8, u8, u8); + /* 802C24D0 */ Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID, s8); +}; + +class Z2CreatureOI : public Z2CreatureEnemy { +public: + /* 802C2578 */ Z2CreatureOI(); + /* 802C25EC */ void deleteObject(); + /* 802C2670 */ void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, + Vec*); + /* 802C2864 */ void framework(u32, s8); + /* 802C29D4 */ Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID, u32, s8); + /* 802C2C84 */ Z2SoundHandlePool* startTentacleSound(JAISoundID, u8, u32, s8); + /* 802C2CD4 */ Z2SoundHandlePool* startTentacleSoundLevel(JAISoundID, u8, f32, u32, s8); + + /* 0x0A4 */ Z2SoundObjSimple field_0xa4; + /* 0x0C4 */ Z2SoundObjSimple field_0xc4; + /* 0x0E4 */ Z2SoundObjSimple field_0xe4; + /* 0x104 */ Z2SoundObjSimple mTentacleSounds[8]; +}; // Size: 0x204 + #endif /* Z2CREATURE_H */ diff --git a/include/Z2AudioLib/Z2Param.h b/include/Z2AudioLib/Z2Param.h index d384e22a76..6ba40e0ddd 100644 --- a/include/Z2AudioLib/Z2Param.h +++ b/include/Z2AudioLib/Z2Param.h @@ -46,5 +46,13 @@ extern u8 struct_80450860; extern u8 struct_80450861; extern u8 struct_80450862; extern u8 struct_80450863; +extern u8 struct_80450864; +extern u8 struct_80450865; +extern u8 struct_80450866; +extern u8 struct_80450867; +extern u8 struct_80450868; +extern u8 struct_80450869; +extern u8 struct_8045086A; +extern u8 struct_8045086B; #endif /* Z2PARAM_H */ diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h index c29d1d72b8..ba97cf2e25 100644 --- a/include/Z2AudioLib/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr.h @@ -122,7 +122,8 @@ public: return -1; } -private: + JAISoundHandle* getMainBgmHandle() { return &mMainBgmHandle; } + /* 0x00 */ JAISoundHandle mMainBgmHandle; /* 0x04 */ JAISoundHandle mSubBgmHandle; /* 0x08 */ JAISoundHandle field_0x08; diff --git a/include/Z2AudioLib/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles.h index 4ff460bc8a..773089dc27 100644 --- a/include/Z2AudioLib/Z2SoundHandles.h +++ b/include/Z2AudioLib/Z2SoundHandles.h @@ -19,20 +19,20 @@ public: void initHandlesPool(u8 pNumHandles); void deleteHandlesPool(); - JAISoundHandle* getFreeHandle(); - JAISoundHandle* getLowPrioSound(JAISoundID pSoundId); + Z2SoundHandlePool* getFreeHandle(); + Z2SoundHandlePool* getLowPrioSound(JAISoundID pSoundId); bool isActive() const; - JAISoundHandle* getHandleSoundID(JAISoundID pSoundId); - JAISoundHandle* getHandleUserData(u32 pUserData); + Z2SoundHandlePool* getHandleSoundID(JAISoundID pSoundId); + Z2SoundHandlePool* getHandleUserData(u32 pUserData); void stopAllSounds(u32 fadeout); void setPos(const JGeometry::TVec3& pos); int getNumHandles() const { return getNumLinks(); } - JAISoundHandle* getHandle(int index) { return (Z2SoundHandlePool*)getNth(index); } + Z2SoundHandlePool* getHandle(int index) { return (Z2SoundHandlePool*)getNth(index); } private: /* 0xC */ u8 mNumHandles; diff --git a/include/Z2AudioLib/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr.h index e002b32489..66ca7bfcdd 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr.h +++ b/include/Z2AudioLib/Z2SoundObjMgr.h @@ -31,6 +31,7 @@ public: u8 isTwilightBattle(); bool isForceBattle() { return mForceBattle; } + JSUList* getEnemyList() { return this; } private: /* 0x0C */ Z2EnemyArea mEnemyArea; diff --git a/include/Z2AudioLib/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject.h index a022ba4abc..c96b01e4cc 100644 --- a/include/Z2AudioLib/Z2SoundObject.h +++ b/include/Z2AudioLib/Z2SoundObject.h @@ -7,13 +7,13 @@ class Z2SoundStarter; -class Z2SoundObjBase : protected Z2SoundHandles { +class Z2SoundObjBase : public Z2SoundHandles { public: Z2SoundObjBase(); ~Z2SoundObjBase(); void deleteObject(); - JAISoundHandle* startCollisionSE(u32, u32, Z2SoundObjBase*); + Z2SoundHandlePool* startCollisionSE(u32, u32, Z2SoundObjBase*); bool isAlive() const { return mIsInitialized; } void setSoundStarter(Z2SoundStarter* i_soundStarter) { mSoundStarter = i_soundStarter; } @@ -22,8 +22,8 @@ public: virtual void dispose(); virtual bool stopOK(Z2SoundHandlePool& pool); virtual void init(Vec* pSoundPos, u8 pNumHandles); - virtual JAISoundHandle* startSound(JAISoundID, u32, s8); - virtual JAISoundHandle* startLevelSound(JAISoundID, u32, s8); + virtual Z2SoundHandlePool* startSound(JAISoundID, u32, s8); + virtual Z2SoundHandlePool* startLevelSound(JAISoundID, u32, s8); /* 0x14 */ Z2SoundStarter* mSoundStarter; /* 0x18 */ JGeometry::TVec3* mSoundPos; @@ -35,11 +35,11 @@ public: class Z2SoundObjSimple : public Z2SoundObjBase { public: Z2SoundObjSimple(); - ~Z2SoundObjSimple(); + ~Z2SoundObjSimple() {} virtual void init(Vec* pSoundPos, u8 pNumHandles); - virtual JAISoundHandle* startSound(JAISoundID, u32, s8); - virtual JAISoundHandle* startLevelSound(JAISoundID, u32, s8); + virtual Z2SoundHandlePool* startSound(JAISoundID, u32, s8); + virtual Z2SoundHandlePool* startLevelSound(JAISoundID, u32, s8); }; class Z2SoundObjAnime : public Z2SoundObjBase { @@ -91,8 +91,8 @@ public: virtual void framework(u32, s8); virtual void init(Vec*, u8); - virtual JAISoundHandle* startSound(JAISoundID, u32, s8); - virtual JAISoundHandle* startLevelSound(JAISoundID, u32, s8); + virtual Z2SoundHandlePool* startSound(JAISoundID, u32, s8); + virtual Z2SoundHandlePool* startLevelSound(JAISoundID, u32, s8); /* 0x20 */ JGeometry::TVec3 field_0x20; /* 0x2C */ JGeometry::TVec3 field_0x2c; diff --git a/include/Z2AudioLib/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr.h index 6194388d72..272d7124d6 100644 --- a/include/Z2AudioLib/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr.h @@ -21,6 +21,7 @@ struct Z2StatusMgr : public JASGlobalInstance { void setCameraGroupInfo(u8); void setCameraInWaterDepth(float); + u8 getDemoStatus() const { return mDemoStatus; } void setHour(s32 hour) { mHour = hour; } void setMinute(s32 min) { mMinute = min; } void setWeekday(s32 day) { mWeekday = day; } diff --git a/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h b/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h index 27ddd29cd4..967fd7137c 100644 --- a/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h +++ b/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h @@ -4,23 +4,6 @@ #include "Z2AudioLib/Z2Creature.h" #include "d/cc/d_cc_uty.h" -struct Z2CreatureOI : public Z2CreatureEnemy { - /* 802C2578 */ Z2CreatureOI(); - /* 802C2670 */ void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, - Vec*); - /* 802C2C84 */ void startTentacleSound(JAISoundID, u8, u32, s8); - /* 802C2CD4 */ void startTentacleSoundLevel(JAISoundID, u8, f32, u32, s8); - - /* 802C25EC */ virtual void deleteObject(); - /* 802C2864 */ virtual void framework(u32, s8); - /* 802C29D4 */ virtual void startCreatureSoundLevel(JAISoundID, u32, s8); - - /* 0x0A4 */ Z2SoundObjSimple field_0xa4; - /* 0x0C4 */ Z2SoundObjSimple field_0xc4; - /* 0x0E4 */ Z2SoundObjSimple field_0xe4; - /* 0x104 */ Z2SoundObjSimple field_0x104[8]; -}; - struct ob_part_s { /* 8061A658 */ ~ob_part_s(); /* 8061A72C */ ob_part_s(); diff --git a/libs/JSystem/JAudio2/JAISeMgr.cpp b/libs/JSystem/JAudio2/JAISeMgr.cpp index fa5744f076..9f2631a512 100644 --- a/libs/JSystem/JAudio2/JAISeMgr.cpp +++ b/libs/JSystem/JAudio2/JAISeMgr.cpp @@ -237,10 +237,6 @@ void JAISeCategoryMgr::stop() { /* 8029FE78-8029FEEC 29A7B8 0074+00 1/1 0/0 0/0 .text stopSoundID__16JAISeCategoryMgrF10JAISoundID */ -inline JAISoundID JAISound::getID() const { - return JAISoundID((u32)soundID); -} - void JAISeCategoryMgr::stopSoundID(JAISoundID param_0) { if (!param_0.isAnonymous()) { for (JSULink* link = mSeList.getFirst(); link != NULL; link = link->getNext()) { diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp index 3088fb5d93..83e0b4bc95 100644 --- a/libs/Z2AudioLib/Z2Audience.cpp +++ b/libs/Z2AudioLib/Z2Audience.cpp @@ -1513,5 +1513,8 @@ REGISTER_CTORS(0x802BDEDC, __sinit_Z2Audience_cpp); /* 80451358-80451360 -00001 0008+00 0/0 1/1 0/0 .sbss None */ /* 80451358 0001+00 data_80451358 None */ /* 80451359 0007+00 data_80451359 None */ -extern u8 struct_80451358[8]; -u8 struct_80451358[8]; +// extern u8 struct_80451358[8]; +// u8 struct_80451358[8]; +s8 data_80451358; +s8 data_80451359; +u8 data_8045135a[6]; // padding? diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index dfe0137b6c..b8ca3c564e 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/libs/Z2AudioLib/Z2Creature.cpp @@ -1,156 +1,22 @@ -// -// Generated By: dol2asm -// Translation Unit: Z2Creature -// +/** + * Z2Creature.cpp + * Z2AudioLib - Creatures + */ #include "Z2AudioLib/Z2Creature.h" +#include "Z2AudioLib/Z2Param.h" #include "Z2AudioLib/Z2SceneMgr.h" #include "Z2AudioLib/Z2SeMgr.h" #include "Z2AudioLib/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2StatusMgr.h" +#include "Z2AudioLib/Z2Calc.h" +#include "Z2AudioLib/Z2AudioMgr.h" #include "dol2asm.h" -// -// Types: -// - -struct Z2SpeechMgr2 { - /* 802CCF88 */ void isMidnaSpeak(); -}; - -struct Z2SoundObjBeeGroup { - /* 802C1D10 */ Z2SoundObjBeeGroup(); - /* 802C1D4C */ void init(Vec*, u8); - /* 802C1D6C */ void playBeeGroupSound(JAISoundID, u8); -}; - -struct Z2SeqMgr { - /* 802AF49C */ void subBgmStart(u32); - /* 802AF884 */ void subBgmStop(); - /* 802B3FEC */ void setChildTrackVolume(JAISoundHandle*, int, f32, u32, f32, f32); - /* 802B4844 */ void setBattleSeqState(u8); - /* 802B4AFC */ void setBattleLastHit(u8); -}; - -struct Z2CreatureSumomo { - /* 802C1BE8 */ Z2CreatureSumomo(); - /* 802C1C24 */ void playSumomoBgm(u32); - /* 802C1CA0 */ void deleteObject(); -}; - -struct Z2CreatureOI { - /* 802C2578 */ Z2CreatureOI(); - /* 802C25EC */ void deleteObject(); - /* 802C2670 */ void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, - Vec*); - /* 802C2864 */ void framework(u32, s8); - /* 802C29D4 */ void startCreatureSoundLevel(JAISoundID, u32, s8); - /* 802C2C84 */ void startTentacleSound(JAISoundID, u8, u32, s8); - /* 802C2CD4 */ void startTentacleSoundLevel(JAISoundID, u8, f32, u32, s8); -}; - -struct Z2CreatureGob { - /* 802C24B0 */ void init(Vec*, Vec*, Vec*, u8, u8, u8); - /* 802C24D0 */ void startCreatureVoiceLevel(JAISoundID, s8); -}; - -struct Z2CreatureFM { - /* 802C1F54 */ Z2CreatureFM(); - /* 802C1FB0 */ void deleteObject(); - /* 802C1FFC */ void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, u8, u8, u8, u8, u8, u8); - /* 802C20E8 */ void framework(u32, s8); - /* 802C2194 */ void startChainSound(JAISoundID, u8, f32, u32, s8); - /* 802C2290 */ void startChainSoundLevel(JAISoundID, u8, f32, u32, s8); -}; - -struct Z2Calc { - struct CurveSign {}; - - /* 802A968C */ void linearTransform(f32, f32, f32, f32, f32, bool); - /* 802A96F4 */ void getParamByExp(f32, f32, f32, f32, f32, f32, Z2Calc::CurveSign); - /* 802A9814 */ void getRandom(f32, f32, f32); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct Z2Audience { - /* 802BD92C */ void convertAbsToRel(Vec&, Vec*, int); - /* 802BD95C */ void calcRelPosVolume(Vec const&, f32, int); - /* 802BDA44 */ void calcRelPosPan(Vec const&, int); - /* 802BDB44 */ void calcRelPosDolby(Vec const&, int); -}; - -// -// Forward References: -// - -extern "C" void __ct__10Z2CreatureFv(); -extern "C" void __dt__10Z2CreatureFv(); -extern "C" void deleteObject__10Z2CreatureFv(); -extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); -extern "C" void init__10Z2CreatureFP3VecP3VecP3VecUcUcUc(); -extern "C" void setSoundStarter__10Z2CreatureFP14Z2SoundStarter(); -extern "C" void initAnime__10Z2CreatureFPvbff(); -extern "C" void framework__10Z2CreatureFUlSc(); -extern "C" void updateAnime__10Z2CreatureFff(); -extern "C" void stopAnime__10Z2CreatureFv(); -extern "C" void startCreatureSound__10Z2CreatureF10JAISoundIDUlSc(); -extern "C" void startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc(); -extern "C" void startCreatureVoice__10Z2CreatureF10JAISoundIDSc(); -extern "C" void startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc(); -extern "C" void startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc(); -extern "C" void startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc(); -extern "C" void startCollisionSE__10Z2CreatureFUlUl(); -extern "C" void __ct__17Z2CreatureCitizenFv(); -extern "C" void __dt__17Z2CreatureCitizenFv(); -extern "C" void init__17Z2CreatureCitizenFP3VecP3VecUcUc(); -extern "C" void deleteObject__17Z2CreatureCitizenFv(); -extern "C" void setMdlType__17Z2CreatureCitizenFScbb(); -extern "C" void playVoice__17Z2CreatureCitizenFi(); -extern "C" void startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc(); -extern "C" void __ct__15Z2CreatureEnemyFv(); -extern "C" void deleteObject__15Z2CreatureEnemyFv(); -extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc(); -extern "C" void init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc(); -extern "C" void framework__15Z2CreatureEnemyFUlSc(); -extern "C" void startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc(); -extern "C" void startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc(); -extern "C" void startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc(); -extern "C" void startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc(); -extern "C" void startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc(); -extern "C" void startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc(); -extern "C" void startCollisionSE__15Z2CreatureEnemyFUlUl(); -extern "C" void setLinkSearch__15Z2CreatureEnemyFb(); -extern "C" void setEnemyName__15Z2CreatureEnemyFPCc(); -extern "C" void __ct__16Z2CreatureSumomoFv(); -extern "C" void playSumomoBgm__16Z2CreatureSumomoFUl(); -extern "C" void deleteObject__16Z2CreatureSumomoFv(); -extern "C" void __ct__18Z2SoundObjBeeGroupFv(); -extern "C" void init__18Z2SoundObjBeeGroupFP3VecUc(); -extern "C" void playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc(); -extern "C" void __ct__12Z2CreatureFMFv(); -extern "C" void deleteObject__12Z2CreatureFMFv(); -extern "C" void init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc(); -extern "C" void framework__12Z2CreatureFMFUlSc(); -extern "C" void startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc(); -extern "C" void startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc(); -extern "C" void init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc(); -extern "C" void startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc(); -extern "C" void __ct__12Z2CreatureOIFv(); -extern "C" void deleteObject__12Z2CreatureOIFv(); -extern "C" void -init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec(); -extern "C" void framework__12Z2CreatureOIFUlSc(); -extern "C" void startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc(); -extern "C" void startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc(); -extern "C" void startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc(); -extern "C" static void Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl(); -extern "C" static void Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl(); -extern "C" static void Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl(); -extern "C" static void Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl(); -extern "C" void __sinit_Z2Creature_cpp(); +static void Z2_E_sw_modPitch(Z2SoundHandlePool*, u32); +static void Z2_E_ms_modVol(Z2SoundHandlePool*, u32); +static void Z2_E_mm_modPitch(Z2SoundHandlePool*, u32); +static void Z2_B_zan_modPitch(Z2SoundHandlePool*, u32); // // External References: @@ -210,7 +76,6 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__15Z2SoundObjAnime[8]; extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 struct_80450868[4]; extern "C" extern u8 data_80450B44[4]; extern "C" extern u8 data_80450B48[4]; extern "C" extern u8 data_80450B70[4]; @@ -295,245 +160,15 @@ SECTION_DATA static u8 mEnemyInfo[1024] = { 0x42, 0x5F, 0x74, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 803CB630-803CB6A8 -00001 0078+00 1/1 0/0 0/0 .data @4094 */ -SECTION_DATA static void* lit_4094[30] = { - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x7C), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0xE8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1B8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1A0), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1E8), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1C4), - (void*)(((char*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc) + 0x1AC), -}; - -/* 803CB6A8-803CB724 -00001 007C+00 1/1 0/0 0/0 .data @4340 */ -SECTION_DATA static void* lit_4340[31] = { - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x214), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x23C), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x27C), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x264), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x284), - (void*)(((char*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc) + 0x270), -}; - -/* 803CB724-803CB780 -00001 005C+00 1/1 0/0 0/0 .data @4411 */ -SECTION_DATA static void* lit_4411[23] = { - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xC8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xC8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xD8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x108), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xC8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xC8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xD8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xC8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x13C), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x13C), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xC8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xC8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xC8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x13C), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x13C), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xC8), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x13C), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x13C), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x13C), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x13C), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x13C), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0x13C), - (void*)(((char*)startCollisionSE__15Z2CreatureEnemyFUlUl) + 0xC8), -}; - -/* 803CB780-803CB7B0 0288A0 0030+00 1/1 0/0 0/0 .data __vt__12Z2CreatureOI */ -SECTION_DATA extern void* __vt__12Z2CreatureOI[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)deleteObject__12Z2CreatureOIFv, - (void*)setSoundStarter__10Z2CreatureFP14Z2SoundStarter, - (void*)framework__12Z2CreatureOIFUlSc, - (void*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc, - (void*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc, - (void*)startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc, - (void*)startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCollisionSE__15Z2CreatureEnemyFUlUl, -}; - -/* 803CB7B0-803CB7E0 0288D0 0030+00 0/0 0/0 1/1 .data __vt__13Z2CreatureGob */ -SECTION_DATA extern void* __vt__13Z2CreatureGob[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)deleteObject__10Z2CreatureFv, - (void*)setSoundStarter__10Z2CreatureFP14Z2SoundStarter, - (void*)framework__10Z2CreatureFUlSc, - (void*)startCreatureSound__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureVoice__10Z2CreatureF10JAISoundIDSc, - (void*)startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc, - (void*)startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCollisionSE__10Z2CreatureFUlUl, -}; - -/* 803CB7E0-803CB810 028900 0030+00 1/1 0/0 0/0 .data __vt__12Z2CreatureFM */ -SECTION_DATA extern void* __vt__12Z2CreatureFM[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)deleteObject__12Z2CreatureFMFv, - (void*)setSoundStarter__10Z2CreatureFP14Z2SoundStarter, - (void*)framework__12Z2CreatureFMFUlSc, - (void*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc, - (void*)startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc, - (void*)startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCollisionSE__15Z2CreatureEnemyFUlUl, -}; - -/* 803CB810-803CB830 028930 0020+00 1/1 0/0 0/0 .data __vt__18Z2SoundObjBeeGroup */ -SECTION_DATA extern void* __vt__18Z2SoundObjBeeGroup[8] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)framework__14Z2SoundObjBaseFUlSc, - (void*)dispose__14Z2SoundObjBaseFv, - (void*)stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool, - (void*)init__18Z2SoundObjBeeGroupFP3VecUc, - (void*)startSound__14Z2SoundObjBaseF10JAISoundIDUlSc, - (void*)startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc, -}; - -/* 803CB830-803CB860 028950 0030+00 1/1 0/0 1/1 .data __vt__16Z2CreatureSumomo */ -SECTION_DATA extern void* __vt__16Z2CreatureSumomo[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)deleteObject__16Z2CreatureSumomoFv, - (void*)setSoundStarter__10Z2CreatureFP14Z2SoundStarter, - (void*)framework__10Z2CreatureFUlSc, - (void*)startCreatureSound__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureVoice__10Z2CreatureF10JAISoundIDSc, - (void*)startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc, - (void*)startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCollisionSE__10Z2CreatureFUlUl, -}; - -/* 803CB860-803CB890 028980 0030+00 1/1 0/0 0/0 .data __vt__15Z2CreatureEnemy */ -SECTION_DATA extern void* __vt__15Z2CreatureEnemy[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)deleteObject__15Z2CreatureEnemyFv, - (void*)setSoundStarter__10Z2CreatureFP14Z2SoundStarter, - (void*)framework__15Z2CreatureEnemyFUlSc, - (void*)startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc, - (void*)startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc, - (void*)startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc, - (void*)startCollisionSE__15Z2CreatureEnemyFUlUl, -}; - -/* 803CB890-803CB8C0 0289B0 0030+00 2/2 0/0 0/0 .data __vt__17Z2CreatureCitizen */ -SECTION_DATA extern void* __vt__17Z2CreatureCitizen[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)deleteObject__17Z2CreatureCitizenFv, - (void*)setSoundStarter__10Z2CreatureFP14Z2SoundStarter, - (void*)framework__10Z2CreatureFUlSc, - (void*)startCreatureSound__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc, - (void*)startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc, - (void*)startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCollisionSE__10Z2CreatureFUlUl, -}; - -/* 803CB8C0-803CB8F0 0289E0 0030+00 2/2 0/0 0/0 .data __vt__10Z2Creature */ -SECTION_DATA extern void* __vt__10Z2Creature[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)deleteObject__10Z2CreatureFv, - (void*)setSoundStarter__10Z2CreatureFP14Z2SoundStarter, - (void*)framework__10Z2CreatureFUlSc, - (void*)startCreatureSound__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureVoice__10Z2CreatureF10JAISoundIDSc, - (void*)startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc, - (void*)startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc, - (void*)startCollisionSE__10Z2CreatureFUlUl, -}; - /* 802C03C8-802C0420 2BAD08 0058+00 3/3 3/3 129/129 .text __ct__10Z2CreatureFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2Creature::Z2Creature() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/__ct__10Z2CreatureFv.s" +Z2Creature::Z2Creature() { + mpPos = NULL; } -#pragma pop /* 802C0420-802C04E8 2BAD60 00C8+00 1/1 4/4 91/91 .text __dt__10Z2CreatureFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2Creature::~Z2Creature() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/__dt__10Z2CreatureFv.s" +Z2Creature::~Z2Creature() { + deleteObject(); } -#pragma pop /* 802C04E8-802C0530 2BAE28 0048+00 4/2 2/2 0/0 .text deleteObject__10Z2CreatureFv */ void Z2Creature::deleteObject() { @@ -630,135 +265,133 @@ SECTION_SDATA2 static u32 sAreaSmallFloating = 0x000001F4; /* 80455C04-80455C08 004204 0004+00 1/1 0/0 0/0 .sdata2 None */ SECTION_SDATA2 static u32 data_80455C04 = 0x032004B0; -/* 80455C08-80455C0C 004208 0004+00 3/3 0/0 0/0 .sdata2 @3663 */ -SECTION_SDATA2 static f32 lit_3663 = 30.0f; - -/* 80455C0C-80455C10 00420C 0004+00 4/4 0/0 0/0 .sdata2 @3664 */ -SECTION_SDATA2 static f32 lit_3664 = 100.0f; - -/* 80455C10-80455C14 004210 0004+00 2/2 0/0 0/0 .sdata2 @3665 */ -SECTION_SDATA2 static f32 lit_3665 = 3.0f / 10.0f; - -/* 80455C14-80455C18 004214 0004+00 4/4 0/0 0/0 .sdata2 @3666 */ -SECTION_SDATA2 static f32 lit_3666 = 4.0f / 5.0f; - -/* 80455C18-80455C1C 004218 0004+00 4/4 0/0 0/0 .sdata2 @3667 */ -SECTION_SDATA2 static f32 lit_3667 = 6.0f / 5.0f; - -/* 80455C1C-80455C20 00421C 0004+00 5/5 0/0 0/0 .sdata2 @3668 */ -SECTION_SDATA2 static f32 lit_3668 = 0.5f; - -/* 80455C20-80455C28 004220 0004+04 11/11 0/0 0/0 .sdata2 @3669 */ -SECTION_SDATA2 static f32 lit_3669[1 + 1 /* padding */] = { - 1.0f, - /* padding */ - 0.0f, -}; - -/* 80455C28-80455C30 004228 0008+00 8/8 0/0 0/0 .sdata2 @3672 */ -SECTION_SDATA2 static f64 lit_3672 = 4503599627370496.0 /* cast u32 to float */; - /* 802C0720-802C087C 2BB060 015C+00 4/0 2/0 0/0 .text * startCreatureSound__10Z2CreatureF10JAISoundIDUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::startCreatureSound(JAISoundID param_0, u32 param_1, s8 param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureSound__10Z2CreatureF10JAISoundIDUlSc.s" +Z2SoundHandlePool* Z2Creature::startCreatureSound(JAISoundID i_soundID, u32 param_1, s8 param_2) { + switch (i_soundID) { + case Z2SE_KOSARU_V_KAGO_WAIT: + return mSoundObjSimple1.startSound(i_soundID, param_1, 0); + default: + Z2SoundHandlePool* handle = mSoundObjAnime.startSound(i_soundID, param_1, param_2); + if (handle != NULL && *handle != NULL) { + switch (i_soundID) { + case Z2SE_FAIRY_S_FLY: + f32 pitch = Z2Calc::getParamByExp((f32)param_1, 30.0f, 100.0f, 0.3f, + 0.8f, 1.2f, Z2Calc::CURVE_SIGN_0); + f32 volume = Z2Calc::getParamByExp((f32)param_1, 30.0f, 100.0f, 0.3f, + 0.5f, 1.0f, Z2Calc::CURVE_SIGN_0); + (*handle)->getAuxiliary().moveVolume(volume, 0); + (*handle)->getAuxiliary().movePitch(pitch, 0); + } + } + return handle; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80455C30-80455C34 004230 0004+00 1/1 0/0 0/0 .sdata2 @3716 */ -SECTION_SDATA2 static f32 lit_3716 = -1.0f; - -/* 80455C34-80455C38 004234 0004+00 6/6 0/0 0/0 .sdata2 @3717 */ -SECTION_SDATA2 static u8 lit_3717[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80455C38-80455C3C 004238 0004+00 1/1 0/0 0/0 .sdata2 @3718 */ -SECTION_SDATA2 static f32 lit_3718 = 92.0f; - -/* 80455C3C-80455C40 00423C 0004+00 1/1 0/0 0/0 .sdata2 @3719 */ -SECTION_SDATA2 static f32 lit_3719 = 0.25f; - -/* 80455C40-80455C44 004240 0004+00 5/5 0/0 0/0 .sdata2 @3720 */ -SECTION_SDATA2 static f32 lit_3720 = 2.0f / 5.0f; /* 802C087C-802C0A4C 2BB1BC 01D0+00 4/0 2/0 0/0 .text * startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::startCreatureSoundLevel(JAISoundID param_0, u32 param_1, s8 param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc.s" +Z2SoundHandlePool* Z2Creature::startCreatureSoundLevel(JAISoundID i_soundID, u32 param_1, s8 param_2) { + switch (i_soundID) { + case 0x600d6: + Z2GetAudioMgr()->seStartLevel(i_soundID, mpPos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + return NULL; + default: + Z2SoundHandlePool* handle = mSoundObjAnime.startLevelSound(i_soundID, param_1, param_2); + if (handle != NULL && *handle != NULL) { + if (i_soundID == Z2SE_YM_SNOBO_RIDE || i_soundID == Z2SE_YW_SNOBO_RIDE) { + f32 volume = 0.0f; + if (param_1 != 0) { + volume = Z2Calc::getParamByExp((f32)param_1, 0.0f, 92.0f, 0.25f, + 0.4f, 1.0f, Z2Calc::CURVE_SIGN_0); + } + f32 pitch = Z2Calc::getParamByExp((f32)param_1, 0.0f, 92.0f, 0.3f, + 0.5f, 1.2f, Z2Calc::CURVE_SIGN_0); + + (*handle)->getAuxiliary().moveVolume(volume, 0); + (*handle)->getAuxiliary().movePitch(pitch, 0); + } else if (i_soundID == Z2SE_ZRZ_MV) { + (*handle)->getAuxiliary().moveVolume((f32)param_1 / 100.0f, 0); + } + } + return handle; + } } -#pragma pop /* 802C0A4C-802C0AF8 2BB38C 00AC+00 4/1 2/0 0/0 .text * startCreatureVoice__10Z2CreatureF10JAISoundIDSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::startCreatureVoice(JAISoundID param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureVoice__10Z2CreatureF10JAISoundIDSc.s" +Z2SoundHandlePool* Z2Creature::startCreatureVoice(JAISoundID i_soundID, s8 param_1) { + switch (i_soundID) { + case Z2SE_MDN_V_FLY_OUT: + case Z2SE_MDN_V_MGN_TAME: + case Z2SE_MDN_V_CLINGST: + case Z2SE_MDN_V_LV_PANIC: + case Z2SE_MDN_V_HIT: + case Z2SE_MDN_V_LOOKABOUT_1: + case Z2SE_MDN_V_WLSWIMDIE: + case Z2SE_MDN_V_WAITD: + case Z2SE_MDN_V_SWAITA: + case Z2SE_MDN_V_SWAITB_1: + case Z2SE_MDN_V_SWAITB_3: + case Z2SE_MDN_V_SWAITC: + case Z2SE_MDN_V_SWAITD: + case Z2SE_MDN_V_LEADSWAIT: + case Z2SE_MDN_V_HIP: + case Z2SE_MDN_V_WLDIEA: + case Z2SE_MDN_V_ENTRANCE: + case Z2SE_MDN_V_DOOROP: + case Z2SE_MDN_V_ROPEWAIT_1: + case Z2SE_MDN_V_ROPEWAIT_2: + case Z2SE_MDN_V_ROPEFALTER: + case Z2SE_MDN_V_WAITTP: + if (Z2GetSpeechMgr2()->isMidnaSpeak()) { + return NULL; + } + } + return mSoundObjSimple1.startSound(i_soundID, 0, param_1); } -#pragma pop /* 802C0AF8-802C0B70 2BB438 0078+00 3/0 2/0 0/0 .text * startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::startCreatureVoiceLevel(JAISoundID param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc.s" +Z2SoundHandlePool* Z2Creature::startCreatureVoiceLevel(JAISoundID i_soundID, s8 param_1) { + if (i_soundID == 0x501f0) { + if (Z2GetStatusMgr()->getDemoStatus() == 2 || !Z2GetSceneMgr()->isInGame()) { + return NULL; + } + } + return mSoundObjSimple1.startLevelSound((u32)i_soundID, 0, param_1); } -#pragma pop /* 802C0B70-802C0BAC 2BB4B0 003C+00 4/0 2/0 0/0 .text * startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc */ -void Z2Creature::startCreatureExtraSound(JAISoundID param_0, u32 param_1, s8 param_2) { - mSoundObjSimple2.startSound(param_0, param_1, param_2); +Z2SoundHandlePool* Z2Creature::startCreatureExtraSound(JAISoundID param_0, u32 param_1, s8 param_2) { + return mSoundObjSimple2.startSound(param_0, param_1, param_2); } /* 802C0BAC-802C0BE8 2BB4EC 003C+00 4/0 2/0 0/0 .text * startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc */ -void Z2Creature::startCreatureExtraSoundLevel(JAISoundID param_0, u32 param_1, s8 param_2) { - mSoundObjSimple2.startLevelSound(param_0, param_1, param_2); +Z2SoundHandlePool* Z2Creature::startCreatureExtraSoundLevel(JAISoundID param_0, u32 param_1, s8 param_2) { + return mSoundObjSimple2.startLevelSound(param_0, param_1, param_2); } /* 802C0BE8-802C0C10 2BB528 0028+00 4/0 2/0 0/0 .text startCollisionSE__10Z2CreatureFUlUl */ -void Z2Creature::startCollisionSE(u32 param_0, u32 param_1) { - mSoundObjAnime.startCollisionSE(param_0, param_1, NULL); +Z2SoundHandlePool* Z2Creature::startCollisionSE(u32 param_0, u32 param_1) { + return mSoundObjAnime.startCollisionSE(param_0, param_1, NULL); } /* 802C0C10-802C0C6C 2BB550 005C+00 0/0 0/0 12/12 .text __ct__17Z2CreatureCitizenFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2CreatureCitizen::Z2CreatureCitizen() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/__ct__17Z2CreatureCitizenFv.s" +Z2CreatureCitizen::Z2CreatureCitizen() : + JSULink(this), + mCitizenID(-1), + field_0xa1(-1), + mLinkSearch(false) +{ + /* empty function */ } -#pragma pop /* 802C0C6C-802C0CE4 2BB5AC 0078+00 0/0 0/0 12/12 .text __dt__17Z2CreatureCitizenFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2CreatureCitizen::~Z2CreatureCitizen() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/__dt__17Z2CreatureCitizenFv.s" +Z2CreatureCitizen::~Z2CreatureCitizen() { + /* empty function */ } -#pragma pop /* 802C0CE4-802C0D04 2BB624 0020+00 0/0 2/2 7/7 .text init__17Z2CreatureCitizenFP3VecP3VecUcUc */ void Z2CreatureCitizen::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { @@ -774,17 +407,45 @@ void Z2CreatureCitizen::deleteObject() { } /* 802C0D48-802C0E18 2BB688 00D0+00 0/0 2/2 4/4 .text setMdlType__17Z2CreatureCitizenFScbb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureCitizen::setMdlType(s8 param_0, bool param_1, bool param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/setMdlType__17Z2CreatureCitizenFScbb.s" +void Z2CreatureCitizen::setMdlType(s8 param_0, bool param_1, bool param_2) { + s8 a = param_0 & 0x3f; + s8 b = param_1 ? 0x40 : 0; + s8 c = param_2 ? 0x80 : 0; + mCitizenID = a + c + b; + if (!param_2) { + Z2GetSeMgr()->incrCrowdSize(); + } + if (param_0 == 0) { + field_0xa1 = data_80451358; + data_80451358 = !data_80451358; + } + else if (param_0 == 1) { + field_0xa1 = data_80451359; + data_80451359 = !data_80451359; + } } -#pragma pop /* 802C0E18-802C0ED8 2BB758 00C0+00 0/0 0/0 21/21 .text playVoice__17Z2CreatureCitizenFi */ +#ifdef NONMATCHING +// regalloc +void Z2CreatureCitizen::playVoice(int i_sound) { + u32 sound_id = Z2SE_MAN_A1_V_AWAY + 6 * mCitizenID + i_sound; + switch (mCitizenID) { + case 0: + case 1: + if (field_0xa1 == 1) { + sound_id += 3; + } + break; + } + mSoundObjSimple1.startSound(sound_id, 0, -1); + if ((i_sound == 0 || i_sound == 2) && !mLinkSearch) { + Z2GetSeMgr()->decrCrowdSize(); + mLinkSearch = true; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -793,39 +454,49 @@ asm void Z2CreatureCitizen::playVoice(int param_0) { #include "asm/Z2AudioLib/Z2Creature/playVoice__17Z2CreatureCitizenFi.s" } #pragma pop +#endif /* 802C0ED8-802C0F64 2BB818 008C+00 1/0 0/0 0/0 .text * startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureCitizen::startCreatureVoice(JAISoundID param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc.s" +Z2SoundHandlePool* Z2CreatureCitizen::startCreatureVoice(JAISoundID i_soundID, s8 param_1) { + switch (i_soundID) { + case Z2SE_KIU_V_FEAR: + case Z2SE_HANA_V_FEAR: + case Z2SE_MICH_V_FEAR: + if (!mLinkSearch) { + Z2GetSeMgr()->decrCrowdSize(); + mLinkSearch = true; + } + break; + } + return Z2Creature::startCreatureVoice(i_soundID, -1); } -#pragma pop /* 802C0F64-802C0FC4 2BB8A4 0060+00 2/2 0/0 100/100 .text __ct__15Z2CreatureEnemyFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2CreatureEnemy::Z2CreatureEnemy() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/__ct__15Z2CreatureEnemyFv.s" +Z2CreatureEnemy::Z2CreatureEnemy() : + JSULink(this), + mEnemyID(0), + field_0xa1(1), + mLinkSearch(false), + field_0xa3(0) +{ + /* empty function */ } -#pragma pop /* 802C0FC4-802C1094 2BB904 00D0+00 3/2 0/0 0/0 .text deleteObject__15Z2CreatureEnemyFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void deleteObject__15Z2CreatureEnemyFv() { - // asm void Z2CreatureEnemy::deleteObject() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/deleteObject__15Z2CreatureEnemyFv.s" +void Z2CreatureEnemy::deleteObject() { + if (mEnemyID == 0x2c) { + Z2GetSeqMgr()->i_unMuteSceneBgm(0x21); + } + if (getSupervisor() != NULL) { + Z2GetSoundObjMgr()->removeEnemy(this); + } + mSoundObjAnime.stopAnime(); + mSoundObjAnime.deleteObject(); + mSoundObjSimple1.deleteObject(); + mSoundObjSimple2.deleteObject(); } -#pragma pop /* 802C1094-802C10B4 2BB9D4 0020+00 0/0 0/0 98/98 .text init__15Z2CreatureEnemyFP3VecP3VecUcUc */ void Z2CreatureEnemy::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { @@ -847,106 +518,281 @@ void Z2CreatureEnemy::framework(u32 param_0, s8 param_1) { Z2Creature::framework(param_0, param_1); } -/* ############################################################################################## */ -/* 80455C44-80455C48 004244 0004+00 1/1 0/0 0/0 .sdata2 @4090 */ -SECTION_SDATA2 static f32 lit_4090 = 10.0f; - -/* 80455C48-80455C4C 004248 0004+00 3/3 0/0 0/0 .sdata2 @4091 */ -SECTION_SDATA2 static f32 lit_4091 = 50.0f; - -/* 80455C4C-80455C50 00424C 0004+00 3/3 0/0 0/0 .sdata2 @4092 */ -SECTION_SDATA2 static f32 lit_4092 = 1.0f / 10.0f; - /* 802C110C-802C136C 2BBA4C 0260+00 4/0 0/0 0/0 .text * startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::startCreatureSound(JAISoundID param_0, u32 param_1, s8 param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s" +Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSound(JAISoundID i_soundID, u32 param_1, s8 param_2) { + Z2SoundHandlePool* handle = mSoundObjAnime.startSound(i_soundID, param_1, param_2); + + switch (mEnemyID) { + case 0x19: + if (i_soundID == Z2SE_EN_SF_BREAK_DOWN) { + field_0xa3 = 1; + Z2GetSoundObjMgr()->getEnemyList()->remove(this); + } else if (field_0xa3 != 0 && i_soundID == Z2SE_EN_SF_BUILD_UP) { + field_0xa3 = 0; + Z2GetSoundObjMgr()->getEnemyList()->append(this); + } + break; + case 0x23: + if (handle != NULL && handle->isSoundAttached() && i_soundID == Z2SE_EN_FZ_BOUND) { + f32 volume = Z2Calc::linearTransform(param_1, 10.0f, 50.0f, 0.1f, 1.0f, false); + f32 pitch = Z2Calc::linearTransform(param_1, 10.0f, 50.0f, 0.8f, 1.2f, false); + (*handle)->getAuxiliary().moveVolume(volume, 0); + (*handle)->getAuxiliary().movePitch(pitch, 0); + } + break; + case 0x2d: + Z2_E_ms_modVol(handle, mSoundObjAnime.field_0x1c); + break; + case 0x36: + Z2_E_sw_modPitch(handle, param_1); + break; + case 0x26: + Z2_E_mm_modPitch(handle, mSoundObjAnime.field_0x1c); + break; + case 0x35: + if (i_soundID == Z2SE_EN_SM_HIT) { + field_0xa3 = 1; + Z2GetSeqMgr()->setBattleLastHit(struct_80450869); + } + break; + } + + switch (i_soundID) { + case Z2SE_EN_ZAN_YO_LAND: + Z2_B_zan_modPitch(handle, mSoundObjAnime.field_0x1c); + break; + case Z2SE_EN_ZAN_YO_FLOAT_WAIT: + if (mSoundObjAnime.field_0x1c > 100) { + return NULL; + } + break; + } + + return handle; } -#pragma pop - -/* ############################################################################################## */ -/* 80455C50-80455C54 004250 0004+00 1/1 0/0 0/0 .sdata2 @4187 */ -SECTION_SDATA2 static f32 lit_4187 = 2.0f; - -/* 80455C54-80455C58 004254 0004+00 4/4 0/0 0/0 .sdata2 @4188 */ -SECTION_SDATA2 static f32 lit_4188 = 11.0f / 10.0f; - -/* 80455C58-80455C5C 004258 0004+00 1/1 0/0 0/0 .sdata2 @4189 */ -SECTION_SDATA2 static f32 lit_4189 = 4.0f; - -/* 80455C5C-80455C60 00425C 0004+00 1/1 0/0 0/0 .sdata2 @4190 */ -SECTION_SDATA2 static f32 lit_4190 = 35.0f; - -/* 80455C60-80455C64 004260 0004+00 1/1 0/0 0/0 .sdata2 @4191 */ -SECTION_SDATA2 static f32 lit_4191 = 3.0f / 5.0f; - -/* 80455C64-80455C68 004264 0004+00 3/3 0/0 0/0 .sdata2 @4192 */ -SECTION_SDATA2 static f32 lit_4192 = 7.0f / 10.0f; - -/* 80455C68-80455C6C 004268 0004+00 1/1 0/0 0/0 .sdata2 @4193 */ -SECTION_SDATA2 static f32 lit_4193 = 4000.0f; - -/* 80455C6C-80455C70 00426C 0004+00 1/1 0/0 0/0 .sdata2 @4194 */ -SECTION_SDATA2 static f32 lit_4194 = 13000.0f; /* 802C136C-802C168C 2BBCAC 0320+00 2/0 0/0 0/0 .text * startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID param_0, u32 param_1, s8 param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s" +Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID i_soundID, u32 param_1, s8 param_2) { + if (i_soundID == 0x7FFFF) { + cXyz pos; + Z2GetAudience()->convertAbsToRel(*mpPos, &pos, 0); + f32 volume = Z2GetAudience()->calcRelPosVolume(pos, 2.0f, 0); + f32 pan = Z2GetAudience()->calcRelPosPan(pos, 0); + f32 dolby = Z2GetAudience()->calcRelPosDolby(pos, 0); + Z2GetSeqMgr()->setChildTrackVolume(Z2GetSeqMgr()->getMainBgmHandle(), + 7, volume, 0, pan, dolby); + return NULL; + } + + Z2SoundHandlePool* handle = mSoundObjAnime.startLevelSound(i_soundID, param_1, param_2); + + switch (mEnemyID) { + case 0x23: + if (handle != NULL && *handle != NULL && i_soundID == Z2SE_EN_FZ_MOVE) { + f32 volume = Z2Calc::getParamByExp(param_1, 1.0f, 50.0f, 0.4f, 0.1f, 1.1f, + Z2Calc::CURVE_SIGN_1); + (*handle)->getAuxiliary().moveVolume(volume, 0); + } + break; + case 0x36: + Z2_E_sw_modPitch(handle, param_1); + break; + case 0x29: + if (handle != NULL && *handle != NULL && i_soundID == Z2SE_EN_RB_MOVE) { + f32 volume = Z2Calc::getParamByExp(param_1, 4.0f, 35.0f, 0.6f, 0.7f, 1.0f, + Z2Calc::CURVE_SIGN_1); + f32 pitch = Z2Calc::getParamByExp(param_1, 4.0f, 35.0f, 0.4f, 0.8f, 1.0f, + Z2Calc::CURVE_SIGN_1); + (*handle)->getAuxiliary().moveVolume(volume, 0); + (*handle)->getAuxiliary().movePitch(pitch, 0); + break; + } + // no break + default: + if (handle != NULL && *handle != NULL && i_soundID == Z2SE_EN_PH_PROPELLER) { + f32 volume = Z2Calc::getParamByExp(param_1, 0.0f, 30.0f, 0.4f, 0.0f, 1.0f, + Z2Calc::CURVE_SIGN_1); + f32 pitch = Z2Calc::getParamByExp(param_1, 4000.0f, 13000.0f, 0.4f, 0.8f, 1.2f, + Z2Calc::CURVE_SIGN_1); + (*handle)->getAuxiliary().moveVolume(volume, 0); + (*handle)->getAuxiliary().movePitch(pitch, 0); + } + break; + } + + return handle; } -#pragma pop /* 802C168C-802C1948 2BBFCC 02BC+00 4/0 0/0 0/0 .text * startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::startCreatureVoice(JAISoundID param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc.s" +Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoice(JAISoundID i_soundID, s8 param_1) { + if (Z2GetSeqMgr()->getMainBgmID() == Z2BGM_BOSS_ZANT) { + switch (Z2GetSeqMgr()->field_0xbc) { + case 0: + case 1: + break; + case 2: + case 3: + switch (i_soundID) { + case Z2SE_EN_ZAN_V_ATK_BALL: + i_soundID = Z2SE_EN_ZAN_V_ATK_BALL_MG; + break; + case Z2SE_EN_ZAN_V_DMG: + i_soundID = Z2SE_EN_ZAN_V_DMG_MG; + break; + } + break; + case 4: + case 5: + switch (i_soundID) { + case Z2SE_EN_ZAN_V_ATK_BALL: + i_soundID = Z2SE_EN_ZAN_V_ATK_BALL_OI; + break; + case Z2SE_EN_ZAN_V_DMG: + i_soundID = Z2SE_EN_ZAN_V_DMG_OI; + break; + } + break; + case 6: + case 7: + switch (i_soundID) { + case Z2SE_EN_ZAN_V_ATK_BALL: + i_soundID = Z2SE_EN_ZAN_V_ATK_BALL_MK; + break; + case Z2SE_EN_ZAN_V_DMG: + i_soundID = Z2SE_EN_ZAN_V_DMG_MK; + break; + } + break; + case 8: + case 9: + switch (i_soundID) { + case Z2SE_EN_ZAN_V_DMG: + i_soundID = Z2SE_EN_ZAN_V_DMG_YO; + break; + } + break; + case 10: + case 11: + switch (i_soundID) { + case Z2SE_EN_ZAN_V_DMG: + i_soundID = Z2SE_EN_ZAN_V_DMG_CTL; + break; + } + break; + } + } + + u32 var1 = 0; + if (mEnemyID == 7) { + var1 = 1; + } + Z2SoundHandlePool* handle = mSoundObjSimple1.startSound(i_soundID, var1, param_1); + + switch (mEnemyID) { + case 0x18: + if (i_soundID == Z2SE_EN_SH_V_DEAD) { + field_0xa3 = 1; + Z2GetSeqMgr()->setBattleLastHit(struct_80450869); + } + break; + case 0x1a: + if (i_soundID == Z2SE_EN_BS_V_DEAD) { + field_0xa3 = 1; + Z2GetSeqMgr()->setBattleLastHit(struct_80450869); + } + break; + case 0x2d: + Z2_E_ms_modVol(handle, mSoundObjSimple1.field_0x1c); + break; + case 0x36: + Z2_E_sw_modPitch(handle, mSoundObjSimple1.field_0x1c); + break; + case 0x26: + Z2_E_mm_modPitch(handle, mSoundObjSimple1.field_0x1c); + break; + } + + if (i_soundID == Z2SE_EN_ZAN_YO_V_KENKEN) { + Z2_B_zan_modPitch(handle, mSoundObjSimple1.field_0x1c); + } + + return handle; } -#pragma pop /* 802C1948-802C199C 2BC288 0054+00 3/0 0/0 0/0 .text * startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::startCreatureVoiceLevel(JAISoundID param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc.s" +Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoiceLevel(JAISoundID i_soundID, s8 param_1) { + u32 var1 = 0; + if (mEnemyID == 7) { + var1 = 1; + } + return mSoundObjSimple1.startLevelSound(i_soundID, var1, param_1); } -#pragma pop /* 802C199C-802C19D8 2BC2DC 003C+00 3/0 0/0 0/0 .text * startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc */ -void Z2CreatureEnemy::startCreatureExtraSound(JAISoundID param_0, u32 param_1, s8 param_2) { - mSoundObjSimple2.startSound(param_0, param_1, param_2); +Z2SoundHandlePool* Z2CreatureEnemy::startCreatureExtraSound(JAISoundID i_soundID, u32 param_1, + s8 param_2) { + return mSoundObjSimple2.startSound(i_soundID, param_1, param_2); } /* 802C19D8-802C1A14 2BC318 003C+00 3/0 0/0 0/0 .text * startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc */ -void Z2CreatureEnemy::startCreatureExtraSoundLevel(JAISoundID param_0, u32 param_1, s8 param_2) { - mSoundObjSimple2.startLevelSound(param_0, param_1, param_2); +Z2SoundHandlePool* Z2CreatureEnemy::startCreatureExtraSoundLevel(JAISoundID i_soundID, u32 param_1, + s8 param_2) { + return mSoundObjSimple2.startLevelSound(i_soundID, param_1, param_2); } /* 802C1A14-802C1B7C 2BC354 0168+00 4/0 0/0 0/0 .text startCollisionSE__15Z2CreatureEnemyFUlUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::startCollisionSE(u32 param_0, u32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCollisionSE__15Z2CreatureEnemyFUlUl.s" +Z2SoundHandlePool* Z2CreatureEnemy::startCollisionSE(u32 param_0, u32 param_1) { + switch (mEnemyID) { + case 0x21: + field_0xa3 = 1; + Z2GetSeqMgr()->setBattleLastHit(struct_80450869); + return mSoundObjAnime.startCollisionSE(param_0, param_1, NULL); + case 0x2f: + if (getSupervisor() != NULL) { + Z2GetSoundObjMgr()->removeEnemy(this); + } + return mSoundObjAnime.startCollisionSE(param_0, param_1, NULL); + default: + switch (param_1) { + case 0x1e: + case 0x1f: + case 0x22: + case 0x23: + case 0x25: + case 0x28: + case 0x29: + case 0x2a: + case 0x2d: + case 0x34: + Z2GetSeqMgr()->setBattleSeqState(2); + break; + case 0x20: + case 0x24: + field_0xa3 = 1; + u8 var1 = struct_80450869; + if (param_0 - 0x40000 <= 1 || param_0 - 0x40000 == 3) { + var1 = 0x14; + } + Z2GetSeqMgr()->setBattleLastHit(var1); + break; + case 0x21: + if (mEnemyID == 0x2b) { + field_0xa3 = 1; + Z2GetSeqMgr()->setBattleLastHit(struct_80450869); + } else if (mEnemyID == 0x16) { + Z2GetSeqMgr()->setBattleSeqState(2); + } + break; + } + return mSoundObjAnime.startCollisionSE(param_0, param_1, NULL); + } } -#pragma pop /* 802C1B7C-802C1B90 2BC4BC 0014+00 0/0 0/0 55/55 .text setLinkSearch__15Z2CreatureEnemyFb */ void Z2CreatureEnemy::setLinkSearch(bool b_search) { @@ -957,320 +803,420 @@ void Z2CreatureEnemy::setLinkSearch(bool b_search) { } /* 802C1B90-802C1BE8 2BC4D0 0058+00 0/0 0/0 72/72 .text setEnemyName__15Z2CreatureEnemyFPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::setEnemyName(char const* param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/setEnemyName__15Z2CreatureEnemyFPCc.s" +void Z2CreatureEnemy::setEnemyName(char const* i_name) { + if (i_name == NULL) { + field_0xa1 = -1; + } else { + mEnemyID = Z2GetSoundObjMgr()->getEnemyID(i_name, this); + } } -#pragma pop /* 802C1BE8-802C1C24 2BC528 003C+00 0/0 0/0 1/1 .text __ct__16Z2CreatureSumomoFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2CreatureSumomo::Z2CreatureSumomo() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/__ct__16Z2CreatureSumomoFv.s" +Z2CreatureSumomo::Z2CreatureSumomo() { + /* empty function */ } -#pragma pop /* 802C1C24-802C1CA0 2BC564 007C+00 0/0 0/0 8/8 .text playSumomoBgm__16Z2CreatureSumomoFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureSumomo::playSumomoBgm(u32 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/playSumomoBgm__16Z2CreatureSumomoFUl.s" +void Z2CreatureSumomo::playSumomoBgm(u32 param_0) { + if (Z2GetSeqMgr()->getSubBgmID() != Z2BGM_SUMOMO) { + if (param_0 < 700) { + Z2GetSeqMgr()->subBgmStart(Z2BGM_SUMOMO); + } + } else if (param_0 >= 1000 && Z2GetStatusMgr()->getDemoStatus() != 6) { + Z2GetSeqMgr()->subBgmStop(); + } } -#pragma pop /* 802C1CA0-802C1D10 2BC5E0 0070+00 1/0 0/0 0/0 .text deleteObject__16Z2CreatureSumomoFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureSumomo::deleteObject() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/deleteObject__16Z2CreatureSumomoFv.s" +void Z2CreatureSumomo::deleteObject() { + if (Z2GetSeqMgr()->getSubBgmID() == Z2BGM_SUMOMO && Z2GetStatusMgr()->getDemoStatus() != 6) { + Z2GetSeqMgr()->subBgmStop(); + } + Z2Creature::deleteObject(); } -#pragma pop /* 802C1D10-802C1D4C 2BC650 003C+00 0/0 0/0 3/3 .text __ct__18Z2SoundObjBeeGroupFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2SoundObjBeeGroup::Z2SoundObjBeeGroup() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/__ct__18Z2SoundObjBeeGroupFv.s" +Z2SoundObjBeeGroup::Z2SoundObjBeeGroup() { + /* empty function */ } -#pragma pop /* 802C1D4C-802C1D6C 2BC68C 0020+00 1/0 0/0 0/0 .text init__18Z2SoundObjBeeGroupFP3VecUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SoundObjBeeGroup::init(Vec* param_0, u8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/init__18Z2SoundObjBeeGroupFP3VecUc.s" +void Z2SoundObjBeeGroup::init(Vec* param_0, u8 param_1) { + Z2SoundObjBase::init(param_0, param_1); } -#pragma pop - -/* ############################################################################################## */ -/* 80455C70-80455C74 004270 0004+00 2/2 0/0 0/0 .sdata2 @4561 */ -SECTION_SDATA2 static f32 lit_4561 = 5.0f; - -/* 80455C74-80455C78 004274 0004+00 1/1 0/0 0/0 .sdata2 @4562 */ -SECTION_SDATA2 static f32 lit_4562 = 20.0f; /* 802C1D6C-802C1F54 2BC6AC 01E8+00 0/0 0/0 2/2 .text * playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID param_0, u8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc.s" +void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID i_soundID, u8 param_1) { + if (param_1 == 0) { + return; + } + + u32 sound_id = (u32)i_soundID; + JAISoundID sound_id2; + + switch (sound_id) { + case Z2SE_EN_BE_STAY: + sound_id2 = Z2SE_EN_BE_STAY_GROUP; + break; + case Z2SE_EN_BE_FLY: + sound_id2 = Z2SE_EN_BE_FLY_GROUP; + break; + case Z2SE_EN_BE_FLY_D: + sound_id2 = Z2SE_EN_BE_FLY_GROUP_D; + break; + case Z2SE_EN_BUG_WALK_GRD: + sound_id2 = Z2SE_EN_BUG_WALK_GRD_GRP; + break; + case Z2SE_EN_BUG_WALK_BODY: + sound_id2 = Z2SE_EN_BUG_WALK_BODY_GRP; + break; + } + + Z2SoundHandlePool* handle1 = startLevelSound(sound_id, 0, -1); + Z2SoundHandlePool* handle2 = startLevelSound(sound_id2, 0, -1); + + if (handle1 != NULL && *handle1 != NULL) { + f32 volume = Z2Calc::linearTransform(param_1, 1.0f, 5.0f, 0.5f, 1.0f, false); + (*handle1)->getAuxiliary().moveVolume(volume, 0); + } + if (handle2 != NULL && *handle2 != NULL) { + f32 volume = Z2Calc::linearTransform(param_1, 1.0f, 20.0f, 0.1f, 1.0f, false); + (*handle2)->getAuxiliary().moveVolume(volume, 0); + } } -#pragma pop /* 802C1F54-802C1FB0 2BC894 005C+00 0/0 0/0 1/1 .text __ct__12Z2CreatureFMFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2CreatureFM::Z2CreatureFM() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/__ct__12Z2CreatureFMFv.s" +Z2CreatureFM::Z2CreatureFM() { + /* empty function */ } -#pragma pop /* 802C1FB0-802C1FFC 2BC8F0 004C+00 1/0 0/0 0/0 .text deleteObject__12Z2CreatureFMFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureFM::deleteObject() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/deleteObject__12Z2CreatureFMFv.s" +void Z2CreatureFM::deleteObject() { + Z2CreatureEnemy::deleteObject(); + field_0xa4.deleteObject(); + field_0xc4.deleteObject(); + field_0xe4.deleteObject(); + field_0x104.deleteObject(); } -#pragma pop /* 802C1FFC-802C20E8 2BC93C 00EC+00 0/0 0/0 1/1 .text * init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureFM::init(Vec* param_0, Vec* param_1, Vec* param_2, Vec* param_3, Vec* param_4, - Vec* param_5, u8 param_6, u8 param_7, u8 param_8, u8 param_9, - u8 param_10, u8 param_11) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc.s" +void Z2CreatureFM::init(Vec* param_0, Vec* param_1, Vec* param_2, Vec* param_3, Vec* param_4, + Vec* param_5, u8 param_6, u8 param_7, u8 param_8, u8 param_9, + u8 param_10, u8 param_11) { + Z2Creature::init(param_0, param_1, param_6, param_7); + if (param_2 != NULL) { + field_0xa4.init(param_2, param_8); + } + if (param_3 != NULL) { + field_0xc4.init(param_3, param_9); + } + if (param_4 != NULL) { + field_0xe4.init(param_4, param_10); + } + if (param_5 != NULL) { + field_0x104.init(param_5, param_11); + } } -#pragma pop /* 802C20E8-802C2194 2BCA28 00AC+00 1/0 0/0 0/0 .text framework__12Z2CreatureFMFUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureFM::framework(u32 param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/framework__12Z2CreatureFMFUlSc.s" +void Z2CreatureFM::framework(u32 param_0, s8 param_1) { + Z2Creature::framework(param_0, param_1); + field_0xa4.framework(param_0, param_1); + field_0xc4.framework(param_0, param_1); + field_0xe4.framework(param_0, param_1); + field_0x104.framework(param_0, param_1); } -#pragma pop /* 802C2194-802C2290 2BCAD4 00FC+00 0/0 0/0 1/1 .text * startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureFM::startChainSound(JAISoundID param_0, u8 param_1, f32 param_2, u32 param_3, - s8 param_4) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc.s" +Z2SoundHandlePool* Z2CreatureFM::startChainSound(JAISoundID i_soundID, u8 param_1, f32 param_2, + u32 param_3, s8 param_4) { + switch (param_1) { + case 0: + return field_0xa4.startSound(i_soundID, param_3, param_4); + case 1: + return field_0xc4.startSound(i_soundID, param_3, param_4); + case 2: + return field_0xe4.startSound(i_soundID, param_3, param_4); + case 3: + return field_0x104.startSound(i_soundID, param_3, param_4); + default: + return NULL; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80455C78-80455C7C 004278 0004+00 1/1 0/0 0/0 .sdata2 @4681 */ -SECTION_SDATA2 static f32 lit_4681 = 53.0f / 50.0f; - -/* 80455C7C-80455C80 00427C 0004+00 1/1 0/0 0/0 .sdata2 @4682 */ -SECTION_SDATA2 static f32 lit_4682 = 3.0f / 100.0f; /* 802C2290-802C24B0 2BCBD0 0220+00 0/0 0/0 1/1 .text * startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureFM::startChainSoundLevel(JAISoundID param_0, u8 param_1, f32 param_2, - u32 param_3, s8 param_4) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc.s" +Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID i_soundID, u8 param_1, f32 param_2, + u32 param_3, s8 param_4) { + Z2SoundHandlePool* handle; + f32 pitch; + switch (param_1) { + case 0: + handle = field_0xa4.startLevelSound(i_soundID, param_3, param_4); + if (handle != NULL && *handle != NULL) { + if (param_2 > 30.0f) { + pitch = 1.06f; + } else { + pitch = (param_2 * 5.0f) / 100.0f; + } + pitch += Z2Calc::getRandom(0.03f, 1.0f, 0.5f) + 0.7f; + if (pitch > 1.06f) { + pitch = 1.06f; + } + (*handle)->getAuxiliary().movePitch(pitch, 3); + return handle; + } + return NULL; + case 1: + handle = field_0xa4.startLevelSound(i_soundID, param_3, param_4); + if (handle != NULL && *handle != NULL) { + if (param_2 > 30.0f) { + pitch = 1.06f; + } else { + pitch = (param_2 * 5.0f) / 100.0f; + } + pitch += Z2Calc::getRandom(0.03f, 1.0f, 0.5f) + 0.5f; + if (pitch > 1.06f) { + pitch = 1.06f; + } + (*handle)->getAuxiliary().movePitch(pitch, 3); + return handle; + } + return NULL; + case 2: + return field_0xe4.startLevelSound(i_soundID, param_3, param_4); + case 3: + return field_0x104.startLevelSound(i_soundID, param_3, param_4); + default: + return NULL; + } } -#pragma pop /* 802C24B0-802C24D0 2BCDF0 0020+00 0/0 0/0 1/1 .text init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureGob::init(Vec* param_0, Vec* param_1, Vec* param_2, u8 param_3, u8 param_4, - u8 param_5) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc.s" +void Z2CreatureGob::init(Vec* param_0, Vec* param_1, Vec* param_2, u8 param_3, u8 param_4, + u8 param_5) { + Z2Creature::init(param_0, param_1, param_2, param_3, param_4, param_5); } -#pragma pop /* 802C24D0-802C2578 2BCE10 00A8+00 1/0 0/0 0/0 .text * startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureGob::startCreatureVoiceLevel(JAISoundID param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc.s" +Z2SoundHandlePool* Z2CreatureGob::startCreatureVoiceLevel(JAISoundID i_soundID, s8 param_1) { + if (mSoundObjSimple1.getHandleSoundID(Z2SE_EN_GOB_V_DAMAGE) != NULL || + mSoundObjSimple1.getHandleSoundID(Z2SE_EN_GOB_V_STOMACH) != NULL) + { + return NULL; + } + return mSoundObjSimple1.startLevelSound(i_soundID, 0, param_1); } -#pragma pop /* 802C2578-802C25EC 2BCEB8 0074+00 0/0 0/0 1/1 .text __ct__12Z2CreatureOIFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2CreatureOI::Z2CreatureOI() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/__ct__12Z2CreatureOIFv.s" +Z2CreatureOI::Z2CreatureOI() { + /* empty function */ } -#pragma pop /* 802C25EC-802C2670 2BCF2C 0084+00 1/0 0/0 0/0 .text deleteObject__12Z2CreatureOIFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureOI::deleteObject() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/deleteObject__12Z2CreatureOIFv.s" +void Z2CreatureOI::deleteObject() { + Z2CreatureEnemy::deleteObject(); + field_0xa4.deleteObject(); + field_0xc4.deleteObject(); + field_0xe4.deleteObject(); + mTentacleSounds[0].deleteObject(); + mTentacleSounds[1].deleteObject(); + mTentacleSounds[2].deleteObject(); + mTentacleSounds[3].deleteObject(); + mTentacleSounds[4].deleteObject(); + mTentacleSounds[5].deleteObject(); + mTentacleSounds[6].deleteObject(); + mTentacleSounds[7].deleteObject(); } -#pragma pop /* 802C2670-802C2864 2BCFB0 01F4+00 0/0 0/0 1/1 .text * init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureOI::init(Vec* param_0, Vec* param_1, Vec* param_2, Vec* param_3, Vec* param_4, - Vec* param_5, Vec* param_6, Vec* param_7, Vec* param_8, Vec* param_9, - Vec* param_10, Vec* param_11, Vec* param_12) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec.s" +void Z2CreatureOI::init(Vec* param_0, Vec* param_1, Vec* param_2, Vec* param_3, Vec* param_4, + Vec* param_5, Vec* param_6, Vec* param_7, Vec* param_8, Vec* param_9, + Vec* param_10, Vec* param_11, Vec* param_12) { + Z2Creature::init(param_0, param_1, 1, 1); + if (param_2 != NULL) { + field_0xa4.init(param_2, 1); + } + if (param_3 != NULL) { + field_0xc4.init(param_3, 1); + } + if (param_4 != NULL) { + field_0xe4.init(param_4, 1); + } + if (param_5 != NULL) { + mTentacleSounds[0].init(param_5, 1); + } + if (param_6 != NULL) { + mTentacleSounds[1].init(param_6, 1); + } + if (param_7 != NULL) { + mTentacleSounds[2].init(param_7, 1); + } + if (param_8 != NULL) { + mTentacleSounds[3].init(param_8, 1); + } + if (param_9 != NULL) { + mTentacleSounds[4].init(param_9, 1); + } + if (param_10 != NULL) { + mTentacleSounds[5].init(param_10, 1); + } + if (param_11 != NULL) { + mTentacleSounds[6].init(param_11, 1); + } + if (param_12 != NULL) { + mTentacleSounds[7].init(param_12, 1); + } } -#pragma pop /* 802C2864-802C29D4 2BD1A4 0170+00 1/0 0/0 0/0 .text framework__12Z2CreatureOIFUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureOI::framework(u32 param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/framework__12Z2CreatureOIFUlSc.s" +void Z2CreatureOI::framework(u32 param_0, s8 param_1) { + Z2Creature::framework(param_0, param_1); + field_0xa4.framework(param_0, param_1); + field_0xc4.framework(param_0, param_1); + field_0xe4.framework(param_0, param_1); + mTentacleSounds[0].framework(param_0, param_1); + mTentacleSounds[1].framework(param_0, param_1); + mTentacleSounds[2].framework(param_0, param_1); + mTentacleSounds[3].framework(param_0, param_1); + mTentacleSounds[4].framework(param_0, param_1); + mTentacleSounds[5].framework(param_0, param_1); + mTentacleSounds[6].framework(param_0, param_1); + mTentacleSounds[7].framework(param_0, param_1); } -#pragma pop - -/* ############################################################################################## */ -/* 80455C80-80455C84 004280 0004+00 1/1 0/0 0/0 .sdata2 @4837 */ -SECTION_SDATA2 static f32 lit_4837 = 42.0f; - -/* 80455C84-80455C88 004284 0004+00 2/2 0/0 0/0 .sdata2 @4838 */ -SECTION_SDATA2 static f32 lit_4838 = 9.0f / 10.0f; /* 802C29D4-802C2C84 2BD314 02B0+00 1/0 0/0 0/0 .text * startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureOI::startCreatureSoundLevel(JAISoundID param_0, u32 param_1, s8 param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc.s" +Z2SoundHandlePool* Z2CreatureOI::startCreatureSoundLevel(JAISoundID i_soundID, u32 param_1, + s8 param_2) { + if (i_soundID == Z2SE_EN_OI_MOVE) { + Z2SoundHandlePool* handle1 = mSoundObjAnime.startLevelSound(i_soundID, param_1, param_2); + Z2SoundHandlePool* handle2 = field_0xa4.startLevelSound(i_soundID, param_1, param_2); + Z2SoundHandlePool* handle3 = field_0xc4.startLevelSound(i_soundID, param_1, param_2); + Z2SoundHandlePool* handle4 = field_0xe4.startLevelSound(i_soundID, param_1, param_2); + + f32 volume = Z2Calc::getParamByExp(param_1, 0.0f, 42.0f, 0.4f, 0.0f, 1.0f, + Z2Calc::CURVE_SIGN_1); + f32 pitch = Z2Calc::getParamByExp(param_1, 0.0f, 42.0f, 0.4f, 0.9f, 1.1f, + Z2Calc::CURVE_SIGN_1); + + if (handle1 != NULL && *handle1 != NULL) { + (*handle1)->getAuxiliary().moveVolume(volume, 0); + (*handle1)->getAuxiliary().movePitch(pitch, 0); + } else { + return NULL; + } + + if (handle2 != NULL && *handle2 != NULL) { + (*handle2)->getAuxiliary().moveVolume(volume, 0); + (*handle2)->getAuxiliary().movePitch(pitch, 0); + } else { + return NULL; + } + + if (handle3 != NULL && *handle3 != NULL) { + (*handle3)->getAuxiliary().moveVolume(volume, 0); + (*handle3)->getAuxiliary().movePitch(pitch, 0); + } else { + return NULL; + } + + if (handle4 != NULL && *handle4 != NULL) { + (*handle4)->getAuxiliary().moveVolume(volume, 0); + (*handle4)->getAuxiliary().movePitch(pitch, 0); + return handle4; + } else { + return NULL; + } + } else { + return mSoundObjAnime.startLevelSound(i_soundID, param_1, param_2); + } } -#pragma pop /* 802C2C84-802C2CD4 2BD5C4 0050+00 0/0 0/0 1/1 .text * startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureOI::startTentacleSound(JAISoundID param_0, u8 param_1, u32 param_2, s8 param_3) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc.s" +Z2SoundHandlePool* Z2CreatureOI::startTentacleSound(JAISoundID i_soundID, u8 param_1, u32 param_2, + s8 param_3) { + mTentacleSounds[param_1].startSound(i_soundID, param_2, param_3); } -#pragma pop - -/* ############################################################################################## */ -/* 80455C88-80455C8C 004288 0004+00 1/1 0/0 0/0 .sdata2 @4875 */ -SECTION_SDATA2 static f32 lit_4875 = 60.0f; /* 802C2CD4-802C2DE0 2BD614 010C+00 0/0 0/0 1/1 .text * startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureOI::startTentacleSoundLevel(JAISoundID param_0, u8 param_1, f32 param_2, - u32 param_3, s8 param_4) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc.s" +Z2SoundHandlePool* Z2CreatureOI::startTentacleSoundLevel(JAISoundID i_soundID, u8 param_1, + f32 param_2, u32 param_3, s8 param_4) { + Z2SoundHandlePool* handle = + mTentacleSounds[param_1].startLevelSound(i_soundID, param_3, param_4); + if (handle != NULL && *handle != NULL) { + f32 volume = Z2Calc::getParamByExp(param_2, 0.0f, 60.0f, 0.4f, 0.0f, 1.0f, + Z2Calc::CURVE_SIGN_1); + f32 pitch = Z2Calc::getParamByExp(param_2, 0.0f, 60.0f, 0.4f, 0.9f, 1.1f, + Z2Calc::CURVE_SIGN_1); + (*handle)->getAuxiliary().moveVolume(volume, 0); + (*handle)->getAuxiliary().movePitch(pitch, 0); + return handle; + } else { + return NULL; + } } -#pragma pop /* 802C2DE0-802C2E54 2BD720 0074+00 3/3 0/0 0/0 .text Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void Z2_E_sw_modPitch(Z2SoundHandlePool* param_0, u32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl.s" +static void Z2_E_sw_modPitch(Z2SoundHandlePool* i_handle, u32 param_1) { + if (i_handle != NULL && *i_handle != NULL) { + f32 pitch = 1.0f; + switch (param_1) { + case 1: + pitch = 1.1f; + break; + case 3: + pitch = 0.8f; + break; + } + (*i_handle)->getAuxiliary().movePitch(pitch, 0); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80455C8C-80455C90 00428C 0004+00 1/1 0/0 0/0 .sdata2 @4906 */ -SECTION_SDATA2 static f32 lit_4906 = 1.0f / 5.0f; /* 802C2E54-802C2E9C 2BD794 0048+00 2/2 0/0 0/0 .text Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void Z2_E_ms_modVol(Z2SoundHandlePool* param_0, u32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl.s" +static void Z2_E_ms_modVol(Z2SoundHandlePool* i_handle, u32 param_1) { + if (i_handle != NULL && *i_handle != NULL && param_1 == 1) { + (*i_handle)->getAuxiliary().moveVolume(0.2f, 0); + } } -#pragma pop /* 802C2E9C-802C2EE4 2BD7DC 0048+00 2/2 0/0 0/0 .text Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void Z2_E_mm_modPitch(Z2SoundHandlePool* param_0, u32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl.s" +static void Z2_E_mm_modPitch(Z2SoundHandlePool* i_handle, u32 param_1) { + if (i_handle != NULL && *i_handle != NULL && param_1 == 3) { + (*i_handle)->getAuxiliary().movePitch(0.7f, 0); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80455C90-80455C94 004290 0004+00 1/1 0/0 0/0 .sdata2 @4944 */ -SECTION_SDATA2 static f32 lit_4944 = 300.0f; - -/* 80455C94-80455C98 004294 0004+00 1/1 0/0 0/0 .sdata2 @4945 */ -SECTION_SDATA2 static f32 lit_4945 = 1.5f; /* 802C2EE4-802C3040 2BD824 015C+00 2/2 0/0 0/0 .text Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void Z2_B_zan_modPitch(Z2SoundHandlePool* param_0, u32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl.s" +static void Z2_B_zan_modPitch(Z2SoundHandlePool* i_handle, u32 param_1) { + if (i_handle != NULL && *i_handle != NULL) { + f32 pitch; + f32 volume = 1.0f; + if (param_1 > 400) { + pitch = 0.5f; + } else if (param_1 > 100) { + pitch = Z2Calc::getParamByExp(400 - param_1, 0.0f, 300.0f, 0.4f, 0.5f, 1.0f, + Z2Calc::CURVE_SIGN_0); + } else { + pitch = Z2Calc::getParamByExp(100 - param_1, 0.0f, 50.0f, 0.4f, 1.0f, 1.5f, + Z2Calc::CURVE_SIGN_0); + volume = Z2Calc::getParamByExp(param_1, 50.0f, 100.0f, 0.4f, 0.4f, 1.0f, + Z2Calc::CURVE_SIGN_0); + } + (*i_handle)->getAuxiliary().movePitch(pitch, 0); + (*i_handle)->getAuxiliary().moveVolume(volume, 0); + } } -#pragma pop /* 802C3040-802C321C 2BD980 01DC+00 0/0 1/0 0/0 .text __sinit_Z2Creature_cpp */ #pragma push diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index e1d3778c28..ef8cd54226 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -583,7 +583,7 @@ void Z2CreatureLink::startLinkSwordSound(JAISoundID i_soundID, u32 id, s8 ch) { } /* 802C4784-802C4814 2BF0C4 0090+00 1/0 0/0 0/0 .text startCollisionSE__14Z2CreatureLinkFUlUl */ -void Z2CreatureLink::startCollisionSE(u32 hitID, u32 mapinfo) { +Z2SoundHandlePool* Z2CreatureLink::startCollisionSE(u32 hitID, u32 mapinfo) { switch (mapinfo) { case 0x28: case 0x29: @@ -597,7 +597,7 @@ void Z2CreatureLink::startCollisionSE(u32 hitID, u32 mapinfo) { break; } - mSoundObjAnime.startCollisionSE(hitID, mapinfo, NULL); + return mSoundObjAnime.startCollisionSE(hitID, mapinfo, NULL); } /* ############################################################################################## */ diff --git a/libs/Z2AudioLib/Z2Param.cpp b/libs/Z2AudioLib/Z2Param.cpp index 84f9cee297..64ff29c7ae 100644 --- a/libs/Z2AudioLib/Z2Param.cpp +++ b/libs/Z2AudioLib/Z2Param.cpp @@ -129,30 +129,22 @@ u8 struct_80450862 = 0x3C; u8 struct_80450863 = 0x1E; /* 80450864-80450868 -00001 0004+00 0/0 2/2 0/0 .sdata None */ -extern u8 struct_80450864[4]; -u8 struct_80450864[4] = { - /* 80450864 0001+00 data_80450864 None */ - 0x14, - /* 80450865 0001+00 data_80450865 None */ - 0x1E, - /* 80450866 0001+00 data_80450866 None */ - 0x0A, - /* 80450867 0001+00 data_80450867 None */ - 0x1E, -}; +#pragma push +#pragma force_active on +u8 struct_80450864 = 0x14; +u8 struct_80450865 = 0x1E; +u8 struct_80450866 = 0x0A; +u8 struct_80450867 = 0x1E; +#pragma pop /* 80450868-8045086C -00001 0004+00 0/0 5/5 0/0 .sdata None */ -extern u8 struct_80450868[4]; -u8 struct_80450868[4] = { - /* 80450868 0001+00 data_80450868 None */ - 0x01, - /* 80450869 0001+00 data_80450869 None */ - 0x0A, - /* 8045086A 0001+00 data_8045086A None */ - 0x1E, - /* 8045086B 0001+00 data_8045086B None */ - 0x14, -}; +#pragma push +#pragma force_active on +u8 struct_80450868 = 0x01; +u8 struct_80450869 = 0x0A; +u8 struct_8045086A = 0x1E; +u8 struct_8045086B = 0x14; +#pragma pop /* 8045086C-80450870 0002EC 0004+00 0/0 3/3 0/0 .sdata None */ extern u32 data_8045086C = 0x01000000; diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 2df20f2842..9dd92318d5 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -712,7 +712,7 @@ asm void Z2SceneMgr::setSceneName(char* param_0, s32 param_1, s32 param_2) { //! @meme this looks to be non-inlined here because @ref setSceneName is too large* extern "C" void __ct__10JAISoundIDFRC10JAISoundID(JAISoundID* this_, JAISoundID const& soundIdToSet) { - *this_ = soundIdToSet; + this_->mId = soundIdToSet.mId; } /* 802B9968-802B9978 2B42A8 0010+00 1/1 0/0 0/0 .text setFieldBgmPlay__8Z2SeqMgrFb */ @@ -734,7 +734,8 @@ asm bool JAIStreamMgr::isActive() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JAISoundID JAISound::getID() const { +// asm JAISoundID JAISound::getID() const { +extern "C" asm void getID__8JAISoundCFv() { nofralloc #include "asm/Z2AudioLib/Z2SceneMgr/getID__8JAISoundCFv.s" } diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp index d6bb979115..3fd22713e4 100644 --- a/libs/Z2AudioLib/Z2SeqMgr.cpp +++ b/libs/Z2AudioLib/Z2SeqMgr.cpp @@ -145,8 +145,6 @@ extern "C" void _restgpr_29(); extern "C" f32 VOL_BGM_DEFAULT__7Z2Param; extern "C" f32 VOL_BGM_TALKING__7Z2Param; extern "C" f32 VOL_BGM_PAUSING__7Z2Param; -extern "C" extern u8 struct_80450864[4]; -extern "C" extern u8 struct_80450868[4]; extern "C" extern u32 data_8045086C; extern "C" extern u8 data_80450B48[4]; extern "C" extern u8 data_80450B60[4]; diff --git a/libs/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp index 81003b1cd8..52c4a19825 100644 --- a/libs/Z2AudioLib/Z2SoundHandles.cpp +++ b/libs/Z2AudioLib/Z2SoundHandles.cpp @@ -40,10 +40,6 @@ u8 data_804341C4[16 + 4 /* padding */]; // inline JAISoundID::JAISoundID(u32 pId) : mId(pId) {} -inline JAISoundID JAISound::getID() const { - return JAISoundID((u32)soundID); -} - Z2SoundHandles::Z2SoundHandles() { mNumHandles = 0; } @@ -88,10 +84,10 @@ extern "C" asm void func_802AB200(void* _this) { } #pragma pop -JAISoundHandle* Z2SoundHandles::getHandleSoundID(JAISoundID pSoundId) { +Z2SoundHandlePool* Z2SoundHandles::getHandleSoundID(JAISoundID pSoundId) { JSULink* link; for (link = getFirst(); link != NULL; link = link->getNext()) { - JAISoundHandle* handle = link->getObject(); + Z2SoundHandlePool* handle = link->getObject(); if (handle->isSoundAttached()) { if ((*handle)->getID() == pSoundId) { return handle; @@ -102,10 +98,10 @@ JAISoundHandle* Z2SoundHandles::getHandleSoundID(JAISoundID pSoundId) { return NULL; } -JAISoundHandle* Z2SoundHandles::getHandleUserData(u32 pUserData) { +Z2SoundHandlePool* Z2SoundHandles::getHandleUserData(u32 pUserData) { JSULink* link; for (link = getFirst(); link != NULL; link = link->getNext()) { - JAISoundHandle* handle = link->getObject(); + Z2SoundHandlePool* handle = link->getObject(); if (handle->isSoundAttached()) { if ((*handle)->getUserData() == pUserData) { return handle; @@ -119,10 +115,10 @@ JAISoundHandle* Z2SoundHandles::getHandleUserData(u32 pUserData) { /* 802AB2D8-802AB3D0 2A5C18 00F8+00 0/0 3/3 0/0 .text getFreeHandle__14Z2SoundHandlesFv */ #ifdef NONMATCHING -JAISoundHandle* Z2SoundHandles::getFreeHandle() { +Z2SoundHandlePool* Z2SoundHandles::getFreeHandle() { JSULink* link; for (link = getFirst(); link != NULL; link = link->getNext()) { - JAISoundHandle* handle = link->getObject(); + Z2SoundHandlePool* handle = link->getObject(); if (!handle->isSoundAttached()) { return handle; } @@ -143,7 +139,7 @@ JAISoundHandle* Z2SoundHandles::getFreeHandle() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JAISoundHandle* Z2SoundHandles::getFreeHandle() { +asm Z2SoundHandlePool* Z2SoundHandles::getFreeHandle() { nofralloc #include "asm/Z2AudioLib/Z2SoundHandles/getFreeHandle__14Z2SoundHandlesFv.s" } @@ -152,11 +148,11 @@ asm JAISoundHandle* Z2SoundHandles::getFreeHandle() { /* 802AB3D0-802AB4A0 2A5D10 00D0+00 0/0 2/2 0/0 .text * getLowPrioSound__14Z2SoundHandlesF10JAISoundID */ -JAISoundHandle* Z2SoundHandles::getLowPrioSound(JAISoundID pSoundId) { +Z2SoundHandlePool* Z2SoundHandles::getLowPrioSound(JAISoundID pSoundId) { JAISoundInfo* sound_info = JASGlobalInstance::getInstance(); - JAISoundHandle* handle; + Z2SoundHandlePool* handle; u32 low_prio = 0xffff; - JAISoundHandle* low_prio_handle = NULL; + Z2SoundHandlePool* low_prio_handle = NULL; JSULink* link; for (link = getFirst(); link != NULL; link = link->getNext()) { handle = link->getObject(); diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index d3441a8d51..037523117a 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -145,10 +145,6 @@ SECTION_SDATA2 static u32 sAreaSmallFloating = 0x000001F4; /* 80455BAC-80455BB0 0041AC 0004+00 1/1 0/0 0/0 .sdata2 None */ SECTION_SDATA2 static u32 data_80455BAC = 0x032004B0; -inline JAISoundID JAISound::getID() const { - return JAISoundID((u32)soundID); -} - /* 802BF994-802BFFEC 2BA2D4 0658+00 1/0 1/1 0/0 .text searchEnemy__13Z2SoundObjMgrFv */ void Z2SoundObjMgr::searchEnemy() { mTwilightBattle = 0; diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index 967f7586f5..59d6fa7ecb 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -13,10 +13,6 @@ #include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JAudio2/JAUSoundAnimator.h" -inline JAISoundID JAISound::getID() const { - return JAISoundID((u32)soundID); -} - Z2SoundObjBase::Z2SoundObjBase() { //! @note initializer list doesn't work since fields were initialized out of //! structure layout order, indicating original code didn't use initializer list. @@ -80,7 +76,7 @@ bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& pSoundHandlePool) { /* 802BE144-802BE2D4 2B8A84 0190+00 5/3 3/1 0/0 .text * startSound__14Z2SoundObjBaseF10JAISoundIDUlSc */ -JAISoundHandle* Z2SoundObjBase::startSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { +Z2SoundHandlePool* Z2SoundObjBase::startSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { if (!mIsInitialized) { return NULL; } @@ -94,7 +90,7 @@ JAISoundHandle* Z2SoundObjBase::startSound(JAISoundID pSoundId, u32 param_1, s8 param_2 = field_0x1e; } f32 local_0 = (f32)param_2 / 127.0f; - JAISoundHandle* handle = getHandleSoundID(pSoundId); + Z2SoundHandlePool* handle = getHandleSoundID(pSoundId); if (handle != NULL) { if ((JASGlobalInstance::getInstance()->getSwBit(pSoundId) & 0x4000) != 0) { handle = NULL; @@ -117,7 +113,7 @@ JAISoundHandle* Z2SoundObjBase::startSound(JAISoundID pSoundId, u32 param_1, s8 /* 802BE2D4-802BE4A4 2B8C14 01D0+00 4/2 3/0 0/0 .text * startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc */ -JAISoundHandle* Z2SoundObjBase::startLevelSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { +Z2SoundHandlePool* Z2SoundObjBase::startLevelSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { if (!mIsInitialized) { return NULL; } @@ -128,7 +124,7 @@ JAISoundHandle* Z2SoundObjBase::startLevelSound(JAISoundID pSoundId, u32 param_1 param_2 = field_0x1e; } f32 local_0 = (f32)param_2 / 127.0f; - JAISoundHandle* handle = getHandleSoundID(pSoundId); + Z2SoundHandlePool* handle = getHandleSoundID(pSoundId); if (handle != NULL) { handle->getSound()->updateLifeTime(1); mSoundStarter->setPortData(handle, 6, (u16)param_1, -1); @@ -154,7 +150,7 @@ JAISoundHandle* Z2SoundObjBase::startLevelSound(JAISoundID pSoundId, u32 param_1 /* 802BE4A4-802BE5A0 2B8DE4 00FC+00 0/0 5/5 21/21 .text * startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase */ -JAISoundHandle* Z2SoundObjBase::startCollisionSE(u32 pId, u32 pUserData, Z2SoundObjBase* pOther) { +Z2SoundHandlePool* Z2SoundObjBase::startCollisionSE(u32 pId, u32 pUserData, Z2SoundObjBase* pOther) { if (pOther != NULL) { return pOther->startCollisionSE(pId, pUserData, NULL); } @@ -168,7 +164,7 @@ JAISoundHandle* Z2SoundObjBase::startCollisionSE(u32 pId, u32 pUserData, Z2Sound link->getObject()->stop(); } } - JAISoundHandle* handle = Z2SoundObjBase::startSound(JAISoundID(pId), pUserData, -1); + Z2SoundHandlePool* handle = Z2SoundObjBase::startSound(JAISoundID(pId), pUserData, -1); if (handle != NULL && handle->getSound() != NULL) { handle->getSound()->setUserData(pUserData); if (30 <= pUserData && pUserData <= 52) { @@ -219,10 +215,10 @@ void Z2DopplerSoundObjBase::framework(u32 param_0, s8 param_1) { /* 802BE714-802BE7AC 2B9054 0098+00 2/0 0/0 0/0 .text * startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc */ -JAISoundHandle* Z2DopplerSoundObjBase::startSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { +Z2SoundHandlePool* Z2DopplerSoundObjBase::startSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { JGeometry::TVec3* pos = mSoundPos; mSoundPos = NULL; - JAISoundHandle* handle = Z2SoundObjBase::startSound(pSoundId, param_1, param_2); + Z2SoundHandlePool* handle = Z2SoundObjBase::startSound(pSoundId, param_1, param_2); if (pos != NULL && handle != NULL && handle->getSound() != NULL) { if (handle->getSound()->acceptsNewAudible()) { handle->getSound()->newAudible(*pos, &field_0x20, 0, NULL); @@ -234,11 +230,11 @@ JAISoundHandle* Z2DopplerSoundObjBase::startSound(JAISoundID pSoundId, u32 param /* 802BE7AC-802BE844 2B90EC 0098+00 2/0 0/0 0/0 .text * startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc */ -JAISoundHandle* Z2DopplerSoundObjBase::startLevelSound(JAISoundID pSoundId, +Z2SoundHandlePool* Z2DopplerSoundObjBase::startLevelSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { JGeometry::TVec3* pos = mSoundPos; mSoundPos = NULL; - JAISoundHandle* handle = Z2SoundObjBase::startLevelSound(pSoundId, param_1, param_2); + Z2SoundHandlePool* handle = Z2SoundObjBase::startLevelSound(pSoundId, param_1, param_2); if (pos != NULL && handle != NULL && handle->getSound() != NULL) { if (handle->getSound()->acceptsNewAudible()) { handle->getSound()->newAudible(*pos, &field_0x20, 0, NULL); @@ -257,8 +253,8 @@ void Z2SoundObjSimple::init(Vec* pSoundPos, u8 pNumHandles) { /* 802BE8A0-802BE9B0 2B91E0 0110+00 1/0 0/0 0/0 .text * startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc */ -JAISoundHandle* Z2SoundObjSimple::startSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { - JAISoundHandle* handle = Z2SoundObjBase::startSound(pSoundId, param_1, param_2); +Z2SoundHandlePool* Z2SoundObjSimple::startSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { + Z2SoundHandlePool* handle = Z2SoundObjBase::startSound(pSoundId, param_1, param_2); if (pSoundId == 0x200c7 && handle != NULL && handle->getSound() != NULL) { f32 local_0 = Z2Calc::getParamByExp((f32)param_1, 0.0f, 127.0f, 0.2f, 0.4f, 1.0f, Z2Calc::CURVE_SIGN_1); @@ -272,8 +268,8 @@ JAISoundHandle* Z2SoundObjSimple::startSound(JAISoundID pSoundId, u32 param_1, s /* 802BE9B0-802BEB38 2B92F0 0188+00 1/0 0/0 0/0 .text * startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc */ -JAISoundHandle* Z2SoundObjSimple::startLevelSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { - JAISoundHandle* handle = Z2SoundObjBase::startLevelSound(pSoundId, param_1, param_2); +Z2SoundHandlePool* Z2SoundObjSimple::startLevelSound(JAISoundID pSoundId, u32 param_1, s8 param_2) { + Z2SoundHandlePool* handle = Z2SoundObjBase::startLevelSound(pSoundId, param_1, param_2); if (handle != NULL && handle->getSound() != NULL) { f32 local_0 = 1.0f; f32 local_1 = 1.0f; diff --git a/libs/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp index 5461fa21e5..0157d6064b 100644 --- a/libs/Z2AudioLib/Z2SoundStarter.cpp +++ b/libs/Z2AudioLib/Z2SoundStarter.cpp @@ -26,16 +26,15 @@ int Z2SoundStarter::startSound(JAISoundID param_1, JAISoundHandle* handlePtr, f32 param_6, f32 param_7, f32 param_8, f32 param_9, u32 param_10) { JUT_ASSERT(45, handlePtr); if (param_4 == 6) { - switch ((u32)param_1) { - case 0x6002b: - // TODO: Fix JAISoundID fake match - param_1.stackCopyHelper(0x6002e); + switch (param_1) { + case Z2SE_CM_BODYFALL_S: + param_1 = Z2SE_CM_BODYFALL_ASASE_S; break; - case 0x6002c: - param_1.stackCopyHelper(0x6002f); + case Z2SE_CM_BODYFALL_M: + param_1 = Z2SE_CM_BODYFALL_ASASE_M; break; - case 0x6002d: - param_1.stackCopyHelper(0x60030); + case Z2SE_CM_BODYFALL_L: + param_1 = Z2SE_CM_BODYFALL_ASASE_L; break; } } diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp index 6d2b9259ae..2064328432 100644 --- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/libs/Z2AudioLib/Z2SpeechMgr2.cpp @@ -623,35 +623,34 @@ void Z2SpeechMgr2::setTextCount(s16 param_0) { JAISoundID aJStack_18; switch (field_0x3fe) { case 0xb: - // TODO: Fix JAISoundID fake match - aJStack_18.stackCopyHelper(0x7b); + aJStack_18 = Z2SE_SY_TEXT_OUT; break; case 0xc: - aJStack_18.stackCopyHelper(0x7c); + aJStack_18 = Z2SE_SY_TEXT_OUT_FEMALE; break; case 0xd: - aJStack_18.stackCopyHelper(0x7d); + aJStack_18 = Z2SE_SY_TEXT_OUT_CHILD; break; case 0xe: - aJStack_18.stackCopyHelper(0x7e); + aJStack_18 = Z2SE_SY_TEXT_OUT_GORON; break; case 0xf: - aJStack_18.stackCopyHelper(0x7f); + aJStack_18 = Z2SE_SY_TEXT_OUT_ZORA; break; case 0x10: - aJStack_18.stackCopyHelper(0x80); + aJStack_18 = Z2SE_SY_TEXT_OUT_GREY; break; case 0x11: - aJStack_18.stackCopyHelper(0x81); + aJStack_18 = Z2SE_SY_TEXT_OUT_SPIRIT; break; case 0x12: - aJStack_18.stackCopyHelper(0x82); + aJStack_18 = Z2SE_SY_TEXT_OUT_BRAVE; break; case 0x1e: - aJStack_18.stackCopyHelper(0x83); + aJStack_18 = Z2SE_SY_TEXT_OUT_GANON; break; case 0x1f: - aJStack_18.stackCopyHelper(0x84); + aJStack_18 = Z2SE_SY_TEXT_OUT_ZANT; break; } mSpeech.startSound(aJStack_18, &field_0x4, NULL, 0, 0.0f, 1.0f, 1.0f, -1.0f, -1.0f, diff --git a/src/d/a/d_a_obj_item.cpp b/src/d/a/d_a_obj_item.cpp index feb081b15b..ea6b5207cd 100644 --- a/src/d/a/d_a_obj_item.cpp +++ b/src/d/a/d_a_obj_item.cpp @@ -796,7 +796,8 @@ asm int daItem_c::_daItem_create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm Z2SoundObjSimple::~Z2SoundObjSimple() { +// asm Z2SoundObjSimple::~Z2SoundObjSimple() { +extern "C" asm void __dt__16Z2SoundObjSimpleFv() { nofralloc #include "asm/a/obj/d_a_obj_item/__dt__16Z2SoundObjSimpleFv.s" }