From 42c47c82a7a32a61d1b29e73bddebd8cfb7ea6a2 Mon Sep 17 00:00:00 2001 From: Noah McQueen <67965519+Yotona@users.noreply.github.com> Date: Sat, 19 Aug 2023 07:57:50 -0600 Subject: [PATCH] Some tiny Z2Creature matches (#1888) --- Progress.md | 16 +- .../Z2Creature/deleteObject__10Z2CreatureFv.s | 19 -- .../deleteObject__17Z2CreatureCitizenFv.s | 19 -- .../Z2Creature/framework__10Z2CreatureFUlSc.s | 34 --- .../framework__15Z2CreatureEnemyFUlSc.s | 16 -- .../initAnime__10Z2CreatureFPvbff.s | 10 - ...init__10Z2CreatureFP3VecP3VecP3VecUcUcUc.s | 28 -- .../init__10Z2CreatureFP3VecP3VecUcUc.s | 35 --- ..._15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc.s | 9 - .../init__15Z2CreatureEnemyFP3VecP3VecUcUc.s | 9 - ...init__17Z2CreatureCitizenFP3VecP3VecUcUc.s | 9 - .../setLinkSearch__15Z2CreatureEnemyFb.s | 6 - ...dStarter__10Z2CreatureFP14Z2SoundStarter.s | 5 - .../startCollisionSE__10Z2CreatureFUlUl.s | 11 - ...oundLevel__10Z2CreatureF10JAISoundIDUlSc.s | 16 -- ...evel__15Z2CreatureEnemyF10JAISoundIDUlSc.s | 16 -- ...xtraSound__10Z2CreatureF10JAISoundIDUlSc.s | 16 -- ...ound__15Z2CreatureEnemyF10JAISoundIDUlSc.s | 16 -- .../Z2Creature/stopAnime__10Z2CreatureFv.s | 12 - .../Z2Creature/updateAnime__10Z2CreatureFff.s | 10 - .../Z2WolfHowlMgr/__ct__13Z2WolfHowlMgrFv.s | 56 ---- .../Z2WolfHowlMgr/__sinit_Z2WolfHowlMgr_cpp.s | 58 ---- .../calcPitchMod__13Z2WolfHowlMgrFff.s | 137 ---------- .../calcVolumeMod__13Z2WolfHowlMgrFf.s | 54 ---- .../checkLine__13Z2WolfHowlMgrFv.s | 198 -------------- .../getCorrectLineNum__13Z2WolfHowlMgrFv.s | 9 - .../getCorrectLine__13Z2WolfHowlMgrFUc.s | 24 -- .../getNowInputValue__13Z2WolfHowlMgrFv.s | 3 - .../getNowPitch__13Z2WolfHowlMgrFv.s | 9 - .../getOnLineNum__13Z2WolfHowlMgrFv.s | 45 --- .../resetState__13Z2WolfHowlMgrFv.s | 27 -- ...ata__13Z2WolfHowlMgrFScP14Z2WolfHowlData.s | 152 ----------- .../skipCorrectDemo__13Z2WolfHowlMgrFv.s | 10 - .../startGuideMelody__13Z2WolfHowlMgrFb.s | 56 ---- ...tWindStoneSound__13Z2WolfHowlMgrFScP3Vec.s | 257 ------------------ ...startWolfHowlSound__13Z2WolfHowlMgrFffbf.s | 155 ----------- asm/d/bg/d_bg_s/ConvDzb__4cBgSFPv.s | 45 --- .../GetRoomId__4dBgSFRC13cBgS_PolyInfo.s | 43 --- ...10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s | 45 --- asm/dolphin/mtx/quat/C_QUATRotAxisRad.s | 36 --- asm/dolphin/mtx/quat/C_QUATSlerp.s | 97 ------- include/Z2AudioLib/Z2Creature.h | 22 +- libs/Z2AudioLib/Z2Creature.cpp | 247 ++++++----------- 43 files changed, 105 insertions(+), 1992 deletions(-) delete mode 100644 asm/Z2AudioLib/Z2Creature/deleteObject__10Z2CreatureFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/deleteObject__17Z2CreatureCitizenFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/framework__10Z2CreatureFUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/framework__15Z2CreatureEnemyFUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/initAnime__10Z2CreatureFPvbff.s delete mode 100644 asm/Z2AudioLib/Z2Creature/init__10Z2CreatureFP3VecP3VecP3VecUcUcUc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/init__10Z2CreatureFP3VecP3VecUcUc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/init__15Z2CreatureEnemyFP3VecP3VecUcUc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/init__17Z2CreatureCitizenFP3VecP3VecUcUc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/setLinkSearch__15Z2CreatureEnemyFb.s delete mode 100644 asm/Z2AudioLib/Z2Creature/setSoundStarter__10Z2CreatureFP14Z2SoundStarter.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCollisionSE__10Z2CreatureFUlUl.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s delete mode 100644 asm/Z2AudioLib/Z2Creature/stopAnime__10Z2CreatureFv.s delete mode 100644 asm/Z2AudioLib/Z2Creature/updateAnime__10Z2CreatureFff.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/__ct__13Z2WolfHowlMgrFv.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/__sinit_Z2WolfHowlMgr_cpp.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/calcPitchMod__13Z2WolfHowlMgrFff.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/calcVolumeMod__13Z2WolfHowlMgrFf.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/getCorrectLineNum__13Z2WolfHowlMgrFv.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/getCorrectLine__13Z2WolfHowlMgrFUc.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/getNowInputValue__13Z2WolfHowlMgrFv.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/getNowPitch__13Z2WolfHowlMgrFv.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/getOnLineNum__13Z2WolfHowlMgrFv.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/resetState__13Z2WolfHowlMgrFv.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/skipCorrectDemo__13Z2WolfHowlMgrFv.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/startGuideMelody__13Z2WolfHowlMgrFb.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/startWindStoneSound__13Z2WolfHowlMgrFScP3Vec.s delete mode 100644 asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s delete mode 100644 asm/d/bg/d_bg_s/ConvDzb__4cBgSFPv.s delete mode 100644 asm/d/bg/d_bg_s/GetRoomId__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s delete mode 100644 asm/dolphin/mtx/quat/C_QUATRotAxisRad.s delete mode 100644 asm/dolphin/mtx/quat/C_QUATSlerp.s diff --git a/Progress.md b/Progress.md index d446ec04afa..d82a642066a 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 | 30.976404% | 1114080 | 3596544 +.text | 31.228646% | 1123152 | 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 | 38.252710% | 1538016 | 4020672 +Total | 38.478344% | 1547088 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 38.252710% | 1538016 | 4020672 -RELs | 34.230862% | 3936660 | 11500324 -Total | 35.272711% | 5474676 | 15520996 +main.dol | 38.478344% | 1547088 | 4020672 +RELs | 34.240635% | 3937784 | 11500324 +Total | 35.338402% | 5484872 | 15520996 ## RELs @@ -191,7 +191,7 @@ d_a_horse | 22.301298% | 15668 | 70256 d_a_hozelda | 28.805621% | 4920 | 17080 d_a_izumi_gate | 100.000000% | 2044 | 2044 d_a_kago | 24.588671% | 15124 | 61508 -d_a_kytag00 | 33.522084% | 2368 | 7064 +d_a_kytag00 | 40.656852% | 2872 | 7064 d_a_kytag01 | 35.156250% | 1260 | 3584 d_a_kytag02 | 100.000000% | 1800 | 1800 d_a_kytag03 | 23.399898% | 1828 | 7812 @@ -781,8 +781,8 @@ d_a_tbox2 | 42.486445% | 4388 | 10328 d_a_tboxSw | 100.000000% | 1016 | 1016 d_a_title | 39.558574% | 2796 | 7068 d_a_vrbox | 100.000000% | 2152 | 2152 -d_a_vrbox2 | 34.977578% | 2184 | 6244 +d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 34.230862% | 3936660 | 11500324 +Total | 34.240635% | 3937784 | 11500324 diff --git a/asm/Z2AudioLib/Z2Creature/deleteObject__10Z2CreatureFv.s b/asm/Z2AudioLib/Z2Creature/deleteObject__10Z2CreatureFv.s deleted file mode 100644 index 89e7de513d8..00000000000 --- a/asm/Z2AudioLib/Z2Creature/deleteObject__10Z2CreatureFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_802C04E8: -/* 802C04E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C04EC 7C 08 02 A6 */ mflr r0 -/* 802C04F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C04F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C04F8 7C 7F 1B 78 */ mr r31, r3 -/* 802C04FC 38 00 00 00 */ li r0, 0 -/* 802C0500 90 03 00 28 */ stw r0, 0x28(r3) -/* 802C0504 38 7F 00 08 */ addi r3, r31, 8 -/* 802C0508 4B FF DA F1 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C050C 38 7F 00 50 */ addi r3, r31, 0x50 -/* 802C0510 4B FF DA E9 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C0514 38 7F 00 70 */ addi r3, r31, 0x70 -/* 802C0518 4B FF DA E1 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802C051C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0520 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0524 7C 08 03 A6 */ mtlr r0 -/* 802C0528 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C052C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/deleteObject__17Z2CreatureCitizenFv.s b/asm/Z2AudioLib/Z2Creature/deleteObject__17Z2CreatureCitizenFv.s deleted file mode 100644 index f4d5b1e3808..00000000000 --- a/asm/Z2AudioLib/Z2Creature/deleteObject__17Z2CreatureCitizenFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_802C0D04: -/* 802C0D04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0D08 7C 08 02 A6 */ mflr r0 -/* 802C0D0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0D10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C0D14 7C 7F 1B 78 */ mr r31, r3 -/* 802C0D18 88 03 00 A2 */ lbz r0, 0xa2(r3) -/* 802C0D1C 28 00 00 00 */ cmplwi r0, 0 -/* 802C0D20 40 82 00 0C */ bne lbl_802C0D2C -/* 802C0D24 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) -/* 802C0D28 4B FE AC 39 */ bl decrCrowdSize__7Z2SeMgrFv -lbl_802C0D2C: -/* 802C0D2C 7F E3 FB 78 */ mr r3, r31 -/* 802C0D30 4B FF F7 B9 */ bl deleteObject__10Z2CreatureFv -/* 802C0D34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0D38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0D3C 7C 08 03 A6 */ mtlr r0 -/* 802C0D40 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0D44 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/framework__10Z2CreatureFUlSc.s b/asm/Z2AudioLib/Z2Creature/framework__10Z2CreatureFUlSc.s deleted file mode 100644 index 4bae7f7fa33..00000000000 --- a/asm/Z2AudioLib/Z2Creature/framework__10Z2CreatureFUlSc.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_802C064C: -/* 802C064C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C0650 7C 08 02 A6 */ mflr r0 -/* 802C0654 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C0658 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C065C 48 0A 1B 81 */ bl _savegpr_29 -/* 802C0660 7C 7D 1B 78 */ mr r29, r3 -/* 802C0664 7C 9E 23 78 */ mr r30, r4 -/* 802C0668 7C BF 2B 78 */ mr r31, r5 -/* 802C066C 38 7D 00 08 */ addi r3, r29, 8 -/* 802C0670 81 9D 00 18 */ lwz r12, 0x18(r29) -/* 802C0674 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C0678 7D 89 03 A6 */ mtctr r12 -/* 802C067C 4E 80 04 21 */ bctrl -/* 802C0680 38 7D 00 50 */ addi r3, r29, 0x50 -/* 802C0684 7F C4 F3 78 */ mr r4, r30 -/* 802C0688 7F E5 FB 78 */ mr r5, r31 -/* 802C068C 81 9D 00 60 */ lwz r12, 0x60(r29) -/* 802C0690 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C0694 7D 89 03 A6 */ mtctr r12 -/* 802C0698 4E 80 04 21 */ bctrl -/* 802C069C 38 7D 00 70 */ addi r3, r29, 0x70 -/* 802C06A0 7F C4 F3 78 */ mr r4, r30 -/* 802C06A4 7F E5 FB 78 */ mr r5, r31 -/* 802C06A8 81 9D 00 80 */ lwz r12, 0x80(r29) -/* 802C06AC 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C06B0 7D 89 03 A6 */ mtctr r12 -/* 802C06B4 4E 80 04 21 */ bctrl -/* 802C06B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C06BC 48 0A 1B 6D */ bl _restgpr_29 -/* 802C06C0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C06C4 7C 08 03 A6 */ mtlr r0 -/* 802C06C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C06CC 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/framework__15Z2CreatureEnemyFUlSc.s b/asm/Z2AudioLib/Z2Creature/framework__15Z2CreatureEnemyFUlSc.s deleted file mode 100644 index 0dfa8a45cb3..00000000000 --- a/asm/Z2AudioLib/Z2Creature/framework__15Z2CreatureEnemyFUlSc.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802C10D4: -/* 802C10D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C10D8 7C 08 02 A6 */ mflr r0 -/* 802C10DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C10E0 88 C3 00 A1 */ lbz r6, 0xa1(r3) -/* 802C10E4 7C C0 07 74 */ extsb r0, r6 -/* 802C10E8 2C 00 00 01 */ cmpwi r0, 1 -/* 802C10EC 40 80 00 0C */ bge lbl_802C10F8 -/* 802C10F0 38 06 00 01 */ addi r0, r6, 1 -/* 802C10F4 98 03 00 A1 */ stb r0, 0xa1(r3) -lbl_802C10F8: -/* 802C10F8 4B FF F5 55 */ bl framework__10Z2CreatureFUlSc -/* 802C10FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C1100 7C 08 03 A6 */ mtlr r0 -/* 802C1104 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1108 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/initAnime__10Z2CreatureFPvbff.s b/asm/Z2AudioLib/Z2Creature/initAnime__10Z2CreatureFPvbff.s deleted file mode 100644 index 215a866ca5b..00000000000 --- a/asm/Z2AudioLib/Z2Creature/initAnime__10Z2CreatureFPvbff.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802C0628: -/* 802C0628 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C062C 7C 08 02 A6 */ mflr r0 -/* 802C0630 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0634 38 63 00 08 */ addi r3, r3, 8 -/* 802C0638 4B FF E5 C5 */ bl initAnime__15Z2SoundObjAnimeFPvbff -/* 802C063C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0640 7C 08 03 A6 */ mtlr r0 -/* 802C0644 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0648 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/init__10Z2CreatureFP3VecP3VecP3VecUcUcUc.s b/asm/Z2AudioLib/Z2Creature/init__10Z2CreatureFP3VecP3VecP3VecUcUcUc.s deleted file mode 100644 index 781ca6d9d89..00000000000 --- a/asm/Z2AudioLib/Z2Creature/init__10Z2CreatureFP3VecP3VecP3VecUcUcUc.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_802C05B0: -/* 802C05B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C05B4 7C 08 02 A6 */ mflr r0 -/* 802C05B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C05BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C05C0 48 0A 1C 1D */ bl _savegpr_29 -/* 802C05C4 7C 7D 1B 78 */ mr r29, r3 -/* 802C05C8 7C DE 33 78 */ mr r30, r6 -/* 802C05CC 7D 3F 4B 78 */ mr r31, r9 -/* 802C05D0 7C E6 3B 78 */ mr r6, r7 -/* 802C05D4 7D 07 43 78 */ mr r7, r8 -/* 802C05D8 4B FF FF 59 */ bl init__10Z2CreatureFP3VecP3VecUcUc -/* 802C05DC 28 1E 00 00 */ cmplwi r30, 0 -/* 802C05E0 41 82 00 20 */ beq lbl_802C0600 -/* 802C05E4 38 7D 00 70 */ addi r3, r29, 0x70 -/* 802C05E8 7F C4 F3 78 */ mr r4, r30 -/* 802C05EC 7F E5 FB 78 */ mr r5, r31 -/* 802C05F0 81 9D 00 80 */ lwz r12, 0x80(r29) -/* 802C05F4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C05F8 7D 89 03 A6 */ mtctr r12 -/* 802C05FC 4E 80 04 21 */ bctrl -lbl_802C0600: -/* 802C0600 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C0604 48 0A 1C 25 */ bl _restgpr_29 -/* 802C0608 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C060C 7C 08 03 A6 */ mtlr r0 -/* 802C0610 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C0614 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/init__10Z2CreatureFP3VecP3VecUcUc.s b/asm/Z2AudioLib/Z2Creature/init__10Z2CreatureFP3VecP3VecUcUc.s deleted file mode 100644 index 4db9582959b..00000000000 --- a/asm/Z2AudioLib/Z2Creature/init__10Z2CreatureFP3VecP3VecUcUc.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_802C0530: -/* 802C0530 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C0534 7C 08 02 A6 */ mflr r0 -/* 802C0538 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C053C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C0540 48 0A 1C 99 */ bl _savegpr_28 -/* 802C0544 7C 7C 1B 78 */ mr r28, r3 -/* 802C0548 7C 9D 23 79 */ or. r29, r4, r4 -/* 802C054C 7C BE 2B 78 */ mr r30, r5 -/* 802C0550 7C FF 3B 78 */ mr r31, r7 -/* 802C0554 41 82 00 20 */ beq lbl_802C0574 -/* 802C0558 38 7C 00 08 */ addi r3, r28, 8 -/* 802C055C 7C C5 33 78 */ mr r5, r6 -/* 802C0560 81 9C 00 18 */ lwz r12, 0x18(r28) -/* 802C0564 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C0568 7D 89 03 A6 */ mtctr r12 -/* 802C056C 4E 80 04 21 */ bctrl -/* 802C0570 93 BC 00 04 */ stw r29, 4(r28) -lbl_802C0574: -/* 802C0574 28 1E 00 00 */ cmplwi r30, 0 -/* 802C0578 41 82 00 20 */ beq lbl_802C0598 -/* 802C057C 38 7C 00 50 */ addi r3, r28, 0x50 -/* 802C0580 7F C4 F3 78 */ mr r4, r30 -/* 802C0584 7F E5 FB 78 */ mr r5, r31 -/* 802C0588 81 9C 00 60 */ lwz r12, 0x60(r28) -/* 802C058C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C0590 7D 89 03 A6 */ mtctr r12 -/* 802C0594 4E 80 04 21 */ bctrl -lbl_802C0598: -/* 802C0598 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C059C 48 0A 1C 89 */ bl _restgpr_28 -/* 802C05A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C05A4 7C 08 03 A6 */ mtlr r0 -/* 802C05A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C05AC 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc.s b/asm/Z2AudioLib/Z2Creature/init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc.s deleted file mode 100644 index ed27c9155cd..00000000000 --- a/asm/Z2AudioLib/Z2Creature/init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802C10B4: -/* 802C10B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C10B8 7C 08 02 A6 */ mflr r0 -/* 802C10BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C10C0 4B FF F4 F1 */ bl init__10Z2CreatureFP3VecP3VecP3VecUcUcUc -/* 802C10C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C10C8 7C 08 03 A6 */ mtlr r0 -/* 802C10CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C10D0 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/init__15Z2CreatureEnemyFP3VecP3VecUcUc.s b/asm/Z2AudioLib/Z2Creature/init__15Z2CreatureEnemyFP3VecP3VecUcUc.s deleted file mode 100644 index 0bc2dbf17a7..00000000000 --- a/asm/Z2AudioLib/Z2Creature/init__15Z2CreatureEnemyFP3VecP3VecUcUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802C1094: -/* 802C1094 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C1098 7C 08 02 A6 */ mflr r0 -/* 802C109C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C10A0 4B FF F4 91 */ bl init__10Z2CreatureFP3VecP3VecUcUc -/* 802C10A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C10A8 7C 08 03 A6 */ mtlr r0 -/* 802C10AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C10B0 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/init__17Z2CreatureCitizenFP3VecP3VecUcUc.s b/asm/Z2AudioLib/Z2Creature/init__17Z2CreatureCitizenFP3VecP3VecUcUc.s deleted file mode 100644 index 3089207e20a..00000000000 --- a/asm/Z2AudioLib/Z2Creature/init__17Z2CreatureCitizenFP3VecP3VecUcUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802C0CE4: -/* 802C0CE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0CE8 7C 08 02 A6 */ mflr r0 -/* 802C0CEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0CF0 4B FF F8 41 */ bl init__10Z2CreatureFP3VecP3VecUcUc -/* 802C0CF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0CF8 7C 08 03 A6 */ mtlr r0 -/* 802C0CFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0D00 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/setLinkSearch__15Z2CreatureEnemyFb.s b/asm/Z2AudioLib/Z2Creature/setLinkSearch__15Z2CreatureEnemyFb.s deleted file mode 100644 index 1f07ddd7cec..00000000000 --- a/asm/Z2AudioLib/Z2Creature/setLinkSearch__15Z2CreatureEnemyFb.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802C1B7C: -/* 802C1B7C 88 03 00 A3 */ lbz r0, 0xa3(r3) -/* 802C1B80 28 00 00 00 */ cmplwi r0, 0 -/* 802C1B84 4C 82 00 20 */ bnelr -/* 802C1B88 98 83 00 A2 */ stb r4, 0xa2(r3) -/* 802C1B8C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/setSoundStarter__10Z2CreatureFP14Z2SoundStarter.s b/asm/Z2AudioLib/Z2Creature/setSoundStarter__10Z2CreatureFP14Z2SoundStarter.s deleted file mode 100644 index 579d2b61381..00000000000 --- a/asm/Z2AudioLib/Z2Creature/setSoundStarter__10Z2CreatureFP14Z2SoundStarter.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802C0618: -/* 802C0618 90 83 00 1C */ stw r4, 0x1c(r3) -/* 802C061C 90 83 00 64 */ stw r4, 0x64(r3) -/* 802C0620 90 83 00 84 */ stw r4, 0x84(r3) -/* 802C0624 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCollisionSE__10Z2CreatureFUlUl.s b/asm/Z2AudioLib/Z2Creature/startCollisionSE__10Z2CreatureFUlUl.s deleted file mode 100644 index 030503e5426..00000000000 --- a/asm/Z2AudioLib/Z2Creature/startCollisionSE__10Z2CreatureFUlUl.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_802C0BE8: -/* 802C0BE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0BEC 7C 08 02 A6 */ mflr r0 -/* 802C0BF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0BF4 38 C0 00 00 */ li r6, 0 -/* 802C0BF8 38 63 00 08 */ addi r3, r3, 8 -/* 802C0BFC 4B FF D8 A9 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -/* 802C0C00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0C04 7C 08 03 A6 */ mtlr r0 -/* 802C0C08 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0C0C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc.s deleted file mode 100644 index 38fa585a586..00000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802C0BAC: -/* 802C0BAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0BB0 7C 08 02 A6 */ mflr r0 -/* 802C0BB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0BB8 80 04 00 00 */ lwz r0, 0(r4) -/* 802C0BBC 90 01 00 08 */ stw r0, 8(r1) -/* 802C0BC0 38 81 00 08 */ addi r4, r1, 8 -/* 802C0BC4 81 83 00 80 */ lwz r12, 0x80(r3) -/* 802C0BC8 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C0BCC 7D 89 03 A6 */ mtctr r12 -/* 802C0BD0 38 63 00 70 */ addi r3, r3, 0x70 -/* 802C0BD4 4E 80 04 21 */ bctrl -/* 802C0BD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0BDC 7C 08 03 A6 */ mtlr r0 -/* 802C0BE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0BE4 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s deleted file mode 100644 index 4c5a446aca8..00000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802C19D8: -/* 802C19D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C19DC 7C 08 02 A6 */ mflr r0 -/* 802C19E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C19E4 80 04 00 00 */ lwz r0, 0(r4) -/* 802C19E8 90 01 00 08 */ stw r0, 8(r1) -/* 802C19EC 38 81 00 08 */ addi r4, r1, 8 -/* 802C19F0 81 83 00 80 */ lwz r12, 0x80(r3) -/* 802C19F4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802C19F8 7D 89 03 A6 */ mtctr r12 -/* 802C19FC 38 63 00 70 */ addi r3, r3, 0x70 -/* 802C1A00 4E 80 04 21 */ bctrl -/* 802C1A04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C1A08 7C 08 03 A6 */ mtlr r0 -/* 802C1A0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1A10 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc.s deleted file mode 100644 index 0f0f3eb10aa..00000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802C0B70: -/* 802C0B70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0B74 7C 08 02 A6 */ mflr r0 -/* 802C0B78 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0B7C 80 04 00 00 */ lwz r0, 0(r4) -/* 802C0B80 90 01 00 08 */ stw r0, 8(r1) -/* 802C0B84 38 81 00 08 */ addi r4, r1, 8 -/* 802C0B88 81 83 00 80 */ lwz r12, 0x80(r3) -/* 802C0B8C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C0B90 7D 89 03 A6 */ mtctr r12 -/* 802C0B94 38 63 00 70 */ addi r3, r3, 0x70 -/* 802C0B98 4E 80 04 21 */ bctrl -/* 802C0B9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0BA0 7C 08 03 A6 */ mtlr r0 -/* 802C0BA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0BA8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s deleted file mode 100644 index c3f9f28202c..00000000000 --- a/asm/Z2AudioLib/Z2Creature/startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802C199C: -/* 802C199C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C19A0 7C 08 02 A6 */ mflr r0 -/* 802C19A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C19A8 80 04 00 00 */ lwz r0, 0(r4) -/* 802C19AC 90 01 00 08 */ stw r0, 8(r1) -/* 802C19B0 38 81 00 08 */ addi r4, r1, 8 -/* 802C19B4 81 83 00 80 */ lwz r12, 0x80(r3) -/* 802C19B8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802C19BC 7D 89 03 A6 */ mtctr r12 -/* 802C19C0 38 63 00 70 */ addi r3, r3, 0x70 -/* 802C19C4 4E 80 04 21 */ bctrl -/* 802C19C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C19CC 7C 08 03 A6 */ mtlr r0 -/* 802C19D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C19D4 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/stopAnime__10Z2CreatureFv.s b/asm/Z2AudioLib/Z2Creature/stopAnime__10Z2CreatureFv.s deleted file mode 100644 index abe35c48416..00000000000 --- a/asm/Z2AudioLib/Z2Creature/stopAnime__10Z2CreatureFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802C06F4: -/* 802C06F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C06F8 7C 08 02 A6 */ mflr r0 -/* 802C06FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0700 81 83 00 00 */ lwz r12, 0(r3) -/* 802C0704 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C0708 7D 89 03 A6 */ mtctr r12 -/* 802C070C 4E 80 04 21 */ bctrl -/* 802C0710 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0714 7C 08 03 A6 */ mtlr r0 -/* 802C0718 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C071C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2Creature/updateAnime__10Z2CreatureFff.s b/asm/Z2AudioLib/Z2Creature/updateAnime__10Z2CreatureFff.s deleted file mode 100644 index da87925b195..00000000000 --- a/asm/Z2AudioLib/Z2Creature/updateAnime__10Z2CreatureFff.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802C06D0: -/* 802C06D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C06D4 7C 08 02 A6 */ mflr r0 -/* 802C06D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C06DC 38 63 00 08 */ addi r3, r3, 8 -/* 802C06E0 4B FF E7 F5 */ bl updateAnime__15Z2SoundObjAnimeFff -/* 802C06E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C06E8 7C 08 03 A6 */ mtlr r0 -/* 802C06EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C06F0 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/__ct__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/__ct__13Z2WolfHowlMgrFv.s deleted file mode 100644 index ba1561f5821..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/__ct__13Z2WolfHowlMgrFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_802CAAC0: -/* 802CAAC0 90 6D 85 B8 */ stw r3, __OSReport_disable-0x60(r13) -/* 802CAAC4 38 A0 00 00 */ li r5, 0 -/* 802CAAC8 90 A3 00 00 */ stw r5, 0(r3) -/* 802CAACC 90 A3 00 04 */ stw r5, 4(r3) -/* 802CAAD0 90 A3 00 08 */ stw r5, 8(r3) -/* 802CAAD4 90 A3 00 0C */ stw r5, 0xc(r3) -/* 802CAAD8 C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CAADC D0 03 00 14 */ stfs f0, 0x14(r3) -/* 802CAAE0 C0 22 C4 64 */ lfs f1, lit_3486(r2) -/* 802CAAE4 D0 23 00 18 */ stfs f1, 0x18(r3) -/* 802CAAE8 D0 23 00 1C */ stfs f1, 0x1c(r3) -/* 802CAAEC C0 0D 83 04 */ lfs f0, cPitchCenter(r13) -/* 802CAAF0 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 802CAAF4 C0 0D 83 04 */ lfs f0, cPitchCenter(r13) -/* 802CAAF8 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 802CAAFC D0 23 00 28 */ stfs f1, 0x28(r3) -/* 802CAB00 90 A3 00 88 */ stw r5, 0x88(r3) -/* 802CAB04 98 A3 00 8C */ stb r5, 0x8c(r3) -/* 802CAB08 38 00 FF FF */ li r0, -1 -/* 802CAB0C 98 03 00 8E */ stb r0, 0x8e(r3) -/* 802CAB10 B0 03 00 90 */ sth r0, 0x90(r3) -/* 802CAB14 98 A3 00 BA */ stb r5, 0xba(r3) -/* 802CAB18 98 A3 00 BB */ stb r5, 0xbb(r3) -/* 802CAB1C 98 A3 00 BC */ stb r5, 0xbc(r3) -/* 802CAB20 38 C0 00 00 */ li r6, 0 -/* 802CAB24 48 00 00 14 */ b lbl_802CAB38 -lbl_802CAB28: -/* 802CAB28 54 C4 0D FC */ rlwinm r4, r6, 1, 0x17, 0x1e -/* 802CAB2C 38 04 00 92 */ addi r0, r4, 0x92 -/* 802CAB30 7C A3 03 2E */ sthx r5, r3, r0 -/* 802CAB34 38 C6 00 01 */ addi r6, r6, 1 -lbl_802CAB38: -/* 802CAB38 54 C0 06 3E */ clrlwi r0, r6, 0x18 -/* 802CAB3C 28 00 00 14 */ cmplwi r0, 0x14 -/* 802CAB40 41 80 FF E8 */ blt lbl_802CAB28 -/* 802CAB44 38 A0 00 00 */ li r5, 0 -/* 802CAB48 C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CAB4C 48 00 00 18 */ b lbl_802CAB64 -lbl_802CAB50: -/* 802CAB50 54 A0 15 BA */ rlwinm r0, r5, 2, 0x16, 0x1d -/* 802CAB54 7C 83 02 14 */ add r4, r3, r0 -/* 802CAB58 D0 04 00 38 */ stfs f0, 0x38(r4) -/* 802CAB5C D0 04 00 60 */ stfs f0, 0x60(r4) -/* 802CAB60 38 A5 00 01 */ addi r5, r5, 1 -lbl_802CAB64: -/* 802CAB64 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 802CAB68 28 00 00 0A */ cmplwi r0, 0xa -/* 802CAB6C 41 80 FF E4 */ blt lbl_802CAB50 -/* 802CAB70 C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CAB74 D0 03 00 34 */ stfs f0, 0x34(r3) -/* 802CAB78 D0 03 00 30 */ stfs f0, 0x30(r3) -/* 802CAB7C 3C 80 80 3D */ lis r4, sGuideData@ha /* 0x803CBCC0@ha */ -/* 802CAB80 38 04 BC C0 */ addi r0, r4, sGuideData@l /* 0x803CBCC0@l */ -/* 802CAB84 90 03 00 10 */ stw r0, 0x10(r3) -/* 802CAB88 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/__sinit_Z2WolfHowlMgr_cpp.s b/asm/Z2AudioLib/Z2WolfHowlMgr/__sinit_Z2WolfHowlMgr_cpp.s deleted file mode 100644 index 33825b9b4d2..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/__sinit_Z2WolfHowlMgr_cpp.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_802CBB7C: -/* 802CBB7C 3C 60 80 43 */ lis r3, sCorrectPhrase@ha /* 0x804341F8@ha */ -/* 802CBB80 38 C3 41 F8 */ addi r6, r3, sCorrectPhrase@l /* 0x804341F8@l */ -/* 802CBB84 3C A0 01 00 */ lis r5, 0x0100 /* 0x01000052@ha */ -/* 802CBB88 38 05 00 52 */ addi r0, r5, 0x0052 /* 0x01000052@l */ -/* 802CBB8C 90 06 00 00 */ stw r0, 0(r6) -/* 802CBB90 38 05 00 53 */ addi r0, r5, 0x53 -/* 802CBB94 38 66 00 00 */ addi r3, r6, 0 -/* 802CBB98 90 03 00 04 */ stw r0, 4(r3) -/* 802CBB9C 38 05 00 54 */ addi r0, r5, 0x54 -/* 802CBBA0 90 03 00 08 */ stw r0, 8(r3) -/* 802CBBA4 38 05 00 72 */ addi r0, r5, 0x72 -/* 802CBBA8 90 03 00 0C */ stw r0, 0xc(r3) -/* 802CBBAC 38 05 00 68 */ addi r0, r5, 0x68 -/* 802CBBB0 90 03 00 10 */ stw r0, 0x10(r3) -/* 802CBBB4 38 05 00 55 */ addi r0, r5, 0x55 -/* 802CBBB8 90 03 00 14 */ stw r0, 0x14(r3) -/* 802CBBBC 38 05 00 75 */ addi r0, r5, 0x75 -/* 802CBBC0 90 03 00 18 */ stw r0, 0x18(r3) -/* 802CBBC4 38 05 00 7C */ addi r0, r5, 0x7c -/* 802CBBC8 90 03 00 1C */ stw r0, 0x1c(r3) -/* 802CBBCC 38 05 00 7F */ addi r0, r5, 0x7f -/* 802CBBD0 90 03 00 20 */ stw r0, 0x20(r3) -/* 802CBBD4 38 80 FF FF */ li r4, -1 -/* 802CBBD8 90 86 00 24 */ stw r4, 0x24(r6) -/* 802CBBDC 38 66 00 24 */ addi r3, r6, 0x24 -/* 802CBBE0 90 83 00 04 */ stw r4, 4(r3) -/* 802CBBE4 38 05 00 5B */ addi r0, r5, 0x5b -/* 802CBBE8 90 03 00 08 */ stw r0, 8(r3) -/* 802CBBEC 38 05 00 71 */ addi r0, r5, 0x71 -/* 802CBBF0 90 03 00 0C */ stw r0, 0xc(r3) -/* 802CBBF4 38 05 00 67 */ addi r0, r5, 0x67 -/* 802CBBF8 90 03 00 10 */ stw r0, 0x10(r3) -/* 802CBBFC 38 05 00 5C */ addi r0, r5, 0x5c -/* 802CBC00 90 03 00 14 */ stw r0, 0x14(r3) -/* 802CBC04 38 05 00 74 */ addi r0, r5, 0x74 -/* 802CBC08 90 03 00 18 */ stw r0, 0x18(r3) -/* 802CBC0C 38 05 00 7B */ addi r0, r5, 0x7b -/* 802CBC10 90 03 00 1C */ stw r0, 0x1c(r3) -/* 802CBC14 38 05 00 7E */ addi r0, r5, 0x7e -/* 802CBC18 90 03 00 20 */ stw r0, 0x20(r3) -/* 802CBC1C 90 86 00 48 */ stw r4, 0x48(r6) -/* 802CBC20 38 66 00 48 */ addi r3, r6, 0x48 -/* 802CBC24 90 83 00 04 */ stw r4, 4(r3) -/* 802CBC28 90 83 00 08 */ stw r4, 8(r3) -/* 802CBC2C 38 05 00 73 */ addi r0, r5, 0x73 -/* 802CBC30 90 03 00 0C */ stw r0, 0xc(r3) -/* 802CBC34 38 05 00 69 */ addi r0, r5, 0x69 -/* 802CBC38 90 03 00 10 */ stw r0, 0x10(r3) -/* 802CBC3C 38 05 00 66 */ addi r0, r5, 0x66 -/* 802CBC40 90 03 00 14 */ stw r0, 0x14(r3) -/* 802CBC44 38 05 00 76 */ addi r0, r5, 0x76 -/* 802CBC48 90 03 00 18 */ stw r0, 0x18(r3) -/* 802CBC4C 38 05 00 7D */ addi r0, r5, 0x7d -/* 802CBC50 90 03 00 1C */ stw r0, 0x1c(r3) -/* 802CBC54 38 05 00 80 */ addi r0, r5, 0x80 -/* 802CBC58 90 03 00 20 */ stw r0, 0x20(r3) -/* 802CBC5C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/calcPitchMod__13Z2WolfHowlMgrFff.s b/asm/Z2AudioLib/Z2WolfHowlMgr/calcPitchMod__13Z2WolfHowlMgrFff.s deleted file mode 100644 index f7cb9a3a452..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/calcPitchMod__13Z2WolfHowlMgrFff.s +++ /dev/null @@ -1,137 +0,0 @@ -lbl_802CACD4: -/* 802CACD4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802CACD8 7C 08 02 A6 */ mflr r0 -/* 802CACDC 90 01 00 44 */ stw r0, 0x44(r1) -/* 802CACE0 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 802CACE4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 802CACE8 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 802CACEC F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 802CACF0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802CACF4 7C 7F 1B 78 */ mr r31, r3 -/* 802CACF8 FF C0 10 90 */ fmr f30, f2 -/* 802CACFC C3 E2 C4 64 */ lfs f31, lit_3486(r2) -/* 802CAD00 4B FF FF B1 */ bl getNowPitch__13Z2WolfHowlMgrFv -/* 802CAD04 D0 3F 00 20 */ stfs f1, 0x20(r31) -/* 802CAD08 88 1F 00 8C */ lbz r0, 0x8c(r31) -/* 802CAD0C 28 00 00 00 */ cmplwi r0, 0 -/* 802CAD10 41 82 00 5C */ beq lbl_802CAD6C -/* 802CAD14 C8 22 C4 70 */ lfd f1, lit_3530(r2) -/* 802CAD18 90 01 00 0C */ stw r0, 0xc(r1) -/* 802CAD1C 3C 00 43 30 */ lis r0, 0x4330 -/* 802CAD20 90 01 00 08 */ stw r0, 8(r1) -/* 802CAD24 C8 01 00 08 */ lfd f0, 8(r1) -/* 802CAD28 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802CAD2C C0 42 C4 68 */ lfs f2, lit_3527(r2) -/* 802CAD30 C0 62 C4 60 */ lfs f3, lit_3485(r2) -/* 802CAD34 C0 82 C4 64 */ lfs f4, lit_3486(r2) -/* 802CAD38 C0 A2 C4 78 */ lfs f5, lit_3589(r2) -/* 802CAD3C FC C0 20 90 */ fmr f6, f4 -/* 802CAD40 38 60 00 00 */ li r3, 0 -/* 802CAD44 4B FD E9 B1 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802CAD48 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 802CAD4C EC 20 00 72 */ fmuls f1, f0, f1 -/* 802CAD50 80 7F 00 00 */ lwz r3, 0(r31) -/* 802CAD54 28 03 00 00 */ cmplwi r3, 0 -/* 802CAD58 41 82 01 58 */ beq lbl_802CAEB0 -/* 802CAD5C 38 63 00 48 */ addi r3, r3, 0x48 -/* 802CAD60 38 80 00 00 */ li r4, 0 -/* 802CAD64 4B FD 80 A9 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 802CAD68 48 00 01 48 */ b lbl_802CAEB0 -lbl_802CAD6C: -/* 802CAD6C 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 802CAD70 88 0D 83 0E */ lbz r0, data_8045088E(r13) -/* 802CAD74 7C 03 00 40 */ cmplw r3, r0 -/* 802CAD78 40 80 00 10 */ bge lbl_802CAD88 -/* 802CAD7C C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CAD80 D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 802CAD84 48 00 00 BC */ b lbl_802CAE40 -lbl_802CAD88: -/* 802CAD88 C0 A2 C4 64 */ lfs f5, lit_3486(r2) -/* 802CAD8C C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 802CAD90 C0 62 C4 60 */ lfs f3, lit_3485(r2) -/* 802CAD94 FC 01 18 40 */ fcmpo cr0, f1, f3 -/* 802CAD98 40 80 00 1C */ bge lbl_802CADB4 -/* 802CAD9C C0 42 C4 7C */ lfs f2, lit_3590(r2) -/* 802CADA0 C0 8D 83 00 */ lfs f4, cPitchDown(r13) -/* 802CADA4 38 60 00 00 */ li r3, 0 -/* 802CADA8 4B FD E8 E5 */ bl linearTransform__6Z2CalcFfffffb -/* 802CADAC FC A0 08 90 */ fmr f5, f1 -/* 802CADB0 48 00 00 1C */ b lbl_802CADCC -lbl_802CADB4: -/* 802CADB4 40 81 00 18 */ ble lbl_802CADCC -/* 802CADB8 FC 40 28 90 */ fmr f2, f5 -/* 802CADBC C0 8D 83 08 */ lfs f4, cPitchUp(r13) -/* 802CADC0 38 60 00 00 */ li r3, 0 -/* 802CADC4 4B FD E8 C9 */ bl linearTransform__6Z2CalcFfffffb -/* 802CADC8 FC A0 08 90 */ fmr f5, f1 -lbl_802CADCC: -/* 802CADCC C0 0D 83 04 */ lfs f0, cPitchCenter(r13) -/* 802CADD0 EC 05 00 32 */ fmuls f0, f5, f0 -/* 802CADD4 C3 FF 00 24 */ lfs f31, 0x24(r31) -/* 802CADD8 EC 40 F8 28 */ fsubs f2, f0, f31 -/* 802CADDC C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CADE0 FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 802CADE4 40 82 00 08 */ bne lbl_802CADEC -/* 802CADE8 48 00 00 58 */ b lbl_802CAE40 -lbl_802CADEC: -/* 802CADEC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802CADF0 40 81 00 2C */ ble lbl_802CAE1C -/* 802CADF4 88 0D 83 0C */ lbz r0, struct_8045088C+0x0(r13) -/* 802CADF8 C8 22 C4 70 */ lfd f1, lit_3530(r2) -/* 802CADFC 90 01 00 0C */ stw r0, 0xc(r1) -/* 802CAE00 3C 00 43 30 */ lis r0, 0x4330 -/* 802CAE04 90 01 00 08 */ stw r0, 8(r1) -/* 802CAE08 C8 01 00 08 */ lfd f0, 8(r1) -/* 802CAE0C EC 00 08 28 */ fsubs f0, f0, f1 -/* 802CAE10 EC 02 00 24 */ fdivs f0, f2, f0 -/* 802CAE14 EF FF 00 2A */ fadds f31, f31, f0 -/* 802CAE18 48 00 00 28 */ b lbl_802CAE40 -lbl_802CAE1C: -/* 802CAE1C 88 0D 83 0D */ lbz r0, struct_8045088C+0x1(r13) -/* 802CAE20 C8 22 C4 70 */ lfd f1, lit_3530(r2) -/* 802CAE24 90 01 00 0C */ stw r0, 0xc(r1) -/* 802CAE28 3C 00 43 30 */ lis r0, 0x4330 -/* 802CAE2C 90 01 00 08 */ stw r0, 8(r1) -/* 802CAE30 C8 01 00 08 */ lfd f0, 8(r1) -/* 802CAE34 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802CAE38 EC 02 00 24 */ fdivs f0, f2, f0 -/* 802CAE3C EF FF 00 2A */ fadds f31, f31, f0 -lbl_802CAE40: -/* 802CAE40 D3 FF 00 24 */ stfs f31, 0x24(r31) -/* 802CAE44 FC 20 F0 90 */ fmr f1, f30 -/* 802CAE48 C0 42 C4 60 */ lfs f2, lit_3485(r2) -/* 802CAE4C C0 62 C4 64 */ lfs f3, lit_3486(r2) -/* 802CAE50 FC 80 18 90 */ fmr f4, f3 -/* 802CAE54 C0 AD 83 10 */ lfs f5, cR_FlatWidth(r13) -/* 802CAE58 38 60 00 01 */ li r3, 1 -/* 802CAE5C 4B FD E8 31 */ bl linearTransform__6Z2CalcFfffffb -/* 802CAE60 C0 7F 00 28 */ lfs f3, 0x28(r31) -/* 802CAE64 EC 41 18 28 */ fsubs f2, f1, f3 -/* 802CAE68 88 0D 83 14 */ lbz r0, struct_80450894+0x0(r13) -/* 802CAE6C C8 22 C4 70 */ lfd f1, lit_3530(r2) -/* 802CAE70 90 01 00 0C */ stw r0, 0xc(r1) -/* 802CAE74 3C 00 43 30 */ lis r0, 0x4330 -/* 802CAE78 90 01 00 08 */ stw r0, 8(r1) -/* 802CAE7C C8 01 00 08 */ lfd f0, 8(r1) -/* 802CAE80 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802CAE84 EC 02 00 24 */ fdivs f0, f2, f0 -/* 802CAE88 EC 03 00 2A */ fadds f0, f3, f0 -/* 802CAE8C D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 802CAE90 EF FF 00 32 */ fmuls f31, f31, f0 -/* 802CAE94 80 7F 00 00 */ lwz r3, 0(r31) -/* 802CAE98 28 03 00 00 */ cmplwi r3, 0 -/* 802CAE9C 41 82 00 14 */ beq lbl_802CAEB0 -/* 802CAEA0 38 63 00 48 */ addi r3, r3, 0x48 -/* 802CAEA4 FC 20 F8 90 */ fmr f1, f31 -/* 802CAEA8 38 80 00 00 */ li r4, 0 -/* 802CAEAC 4B FD 7F 61 */ bl movePitch__18JAISoundParamsMoveFfUl -lbl_802CAEB0: -/* 802CAEB0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 802CAEB4 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 802CAEB8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 802CAEBC CB C1 00 20 */ lfd f30, 0x20(r1) -/* 802CAEC0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802CAEC4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802CAEC8 7C 08 03 A6 */ mtlr r0 -/* 802CAECC 38 21 00 40 */ addi r1, r1, 0x40 -/* 802CAED0 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/calcVolumeMod__13Z2WolfHowlMgrFf.s b/asm/Z2AudioLib/Z2WolfHowlMgr/calcVolumeMod__13Z2WolfHowlMgrFf.s deleted file mode 100644 index 5ba869df6a1..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/calcVolumeMod__13Z2WolfHowlMgrFf.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_802CABEC: -/* 802CABEC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CABF0 7C 08 02 A6 */ mflr r0 -/* 802CABF4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CABF8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802CABFC 7C 7F 1B 78 */ mr r31, r3 -/* 802CAC00 80 83 00 00 */ lwz r4, 0(r3) -/* 802CAC04 28 04 00 00 */ cmplwi r4, 0 -/* 802CAC08 41 82 00 94 */ beq lbl_802CAC9C -/* 802CAC0C 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 802CAC10 88 0D 83 0E */ lbz r0, data_8045088E(r13) -/* 802CAC14 7C 03 00 40 */ cmplw r3, r0 -/* 802CAC18 40 80 00 18 */ bge lbl_802CAC30 -/* 802CAC1C 38 64 00 48 */ addi r3, r4, 0x48 -/* 802CAC20 C0 22 C4 64 */ lfs f1, lit_3486(r2) -/* 802CAC24 38 80 00 00 */ li r4, 0 -/* 802CAC28 4B FD 81 8D */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802CAC2C 48 00 00 70 */ b lbl_802CAC9C -lbl_802CAC30: -/* 802CAC30 C0 C2 C4 64 */ lfs f6, lit_3486(r2) -/* 802CAC34 88 1F 00 8C */ lbz r0, 0x8c(r31) -/* 802CAC38 28 00 00 00 */ cmplwi r0, 0 -/* 802CAC3C 41 82 00 38 */ beq lbl_802CAC74 -/* 802CAC40 C8 22 C4 70 */ lfd f1, lit_3530(r2) -/* 802CAC44 90 01 00 0C */ stw r0, 0xc(r1) -/* 802CAC48 3C 00 43 30 */ lis r0, 0x4330 -/* 802CAC4C 90 01 00 08 */ stw r0, 8(r1) -/* 802CAC50 C8 01 00 08 */ lfd f0, 8(r1) -/* 802CAC54 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802CAC58 C0 42 C4 68 */ lfs f2, lit_3527(r2) -/* 802CAC5C C0 62 C4 60 */ lfs f3, lit_3485(r2) -/* 802CAC60 C0 82 C4 6C */ lfs f4, lit_3528(r2) -/* 802CAC64 FC A0 18 90 */ fmr f5, f3 -/* 802CAC68 38 60 00 01 */ li r3, 1 -/* 802CAC6C 4B FD EA 89 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802CAC70 FC C0 08 90 */ fmr f6, f1 -lbl_802CAC74: -/* 802CAC74 D0 DF 00 18 */ stfs f6, 0x18(r31) -/* 802CAC78 80 7F 00 00 */ lwz r3, 0(r31) -/* 802CAC7C 28 03 00 00 */ cmplwi r3, 0 -/* 802CAC80 41 82 00 14 */ beq lbl_802CAC94 -/* 802CAC84 38 63 00 48 */ addi r3, r3, 0x48 -/* 802CAC88 C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 802CAC8C 38 80 00 00 */ li r4, 0 -/* 802CAC90 4B FD 81 25 */ bl moveVolume__18JAISoundParamsMoveFfUl -lbl_802CAC94: -/* 802CAC94 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 802CAC98 D0 1F 00 1C */ stfs f0, 0x1c(r31) -lbl_802CAC9C: -/* 802CAC9C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802CACA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CACA4 7C 08 03 A6 */ mtlr r0 -/* 802CACA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CACAC 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s deleted file mode 100644 index 0b76eac9743..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s +++ /dev/null @@ -1,198 +0,0 @@ -lbl_802CB38C: -/* 802CB38C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802CB390 7C 08 02 A6 */ mflr r0 -/* 802CB394 90 01 00 34 */ stw r0, 0x34(r1) -/* 802CB398 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CB39C 48 09 6E 3D */ bl _savegpr_28 -/* 802CB3A0 7C 7F 1B 78 */ mr r31, r3 -/* 802CB3A4 88 63 00 8E */ lbz r3, 0x8e(r3) -/* 802CB3A8 7C 60 07 74 */ extsb r0, r3 -/* 802CB3AC 2C 00 FF FF */ cmpwi r0, -1 -/* 802CB3B0 41 82 00 10 */ beq lbl_802CB3C0 -/* 802CB3B4 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 802CB3B8 28 00 00 00 */ cmplwi r0, 0 -/* 802CB3BC 40 82 00 0C */ bne lbl_802CB3C8 -lbl_802CB3C0: -/* 802CB3C0 38 60 FF FF */ li r3, -1 -/* 802CB3C4 48 00 02 74 */ b lbl_802CB638 -lbl_802CB3C8: -/* 802CB3C8 80 AD 86 04 */ lwz r5, __OSReport_disable-0x14(r13) -/* 802CB3CC 38 80 00 00 */ li r4, 0 -/* 802CB3D0 80 05 00 08 */ lwz r0, 8(r5) -/* 802CB3D4 28 00 00 00 */ cmplwi r0, 0 -/* 802CB3D8 40 82 00 10 */ bne lbl_802CB3E8 -/* 802CB3DC 88 05 00 BA */ lbz r0, 0xba(r5) -/* 802CB3E0 28 00 00 00 */ cmplwi r0, 0 -/* 802CB3E4 41 82 00 08 */ beq lbl_802CB3EC -lbl_802CB3E8: -/* 802CB3E8 38 80 00 01 */ li r4, 1 -lbl_802CB3EC: -/* 802CB3EC 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802CB3F0 41 82 00 08 */ beq lbl_802CB3F8 -/* 802CB3F4 48 00 02 44 */ b lbl_802CB638 -lbl_802CB3F8: -/* 802CB3F8 80 9F 00 88 */ lwz r4, 0x88(r31) -/* 802CB3FC 28 04 00 00 */ cmplwi r4, 0 -/* 802CB400 40 82 00 20 */ bne lbl_802CB420 -/* 802CB404 A8 1F 00 90 */ lha r0, 0x90(r31) -/* 802CB408 2C 00 00 00 */ cmpwi r0, 0 -/* 802CB40C 40 81 00 0C */ ble lbl_802CB418 -/* 802CB410 38 00 FF FF */ li r0, -1 -/* 802CB414 B0 1F 00 90 */ sth r0, 0x90(r31) -lbl_802CB418: -/* 802CB418 38 60 FF FF */ li r3, -1 -/* 802CB41C 48 00 02 1C */ b lbl_802CB638 -lbl_802CB420: -/* 802CB420 A8 7F 00 90 */ lha r3, 0x90(r31) -/* 802CB424 A0 1F 00 BE */ lhz r0, 0xbe(r31) -/* 802CB428 7C 03 00 00 */ cmpw r3, r0 -/* 802CB42C 41 80 00 FC */ blt lbl_802CB528 -/* 802CB430 3B C0 00 00 */ li r30, 0 -/* 802CB434 3B A0 00 00 */ li r29, 0 -/* 802CB438 48 00 00 24 */ b lbl_802CB45C -lbl_802CB43C: -/* 802CB43C 7F E3 FB 78 */ mr r3, r31 -/* 802CB440 7F A4 EB 78 */ mr r4, r29 -/* 802CB444 4B FF FE DD */ bl getCorrectLine__13Z2WolfHowlMgrFUc -/* 802CB448 54 60 84 3E */ srwi r0, r3, 0x10 -/* 802CB44C B0 01 00 10 */ sth r0, 0x10(r1) -/* 802CB450 88 01 00 11 */ lbz r0, 0x11(r1) -/* 802CB454 7F DE 02 14 */ add r30, r30, r0 -/* 802CB458 3B BD 00 01 */ addi r29, r29, 1 -lbl_802CB45C: -/* 802CB45C 7F E3 FB 78 */ mr r3, r31 -/* 802CB460 4B FF FF 11 */ bl getCorrectLineNum__13Z2WolfHowlMgrFv -/* 802CB464 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 802CB468 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802CB46C 7C 00 18 40 */ cmplw r0, r3 -/* 802CB470 41 80 FF CC */ blt lbl_802CB43C -/* 802CB474 88 6D 83 0E */ lbz r3, data_8045088E(r13) -/* 802CB478 80 1F 00 88 */ lwz r0, 0x88(r31) -/* 802CB47C 7C 03 00 50 */ subf r0, r3, r0 -/* 802CB480 7C 00 F0 40 */ cmplw r0, r30 -/* 802CB484 40 80 00 0C */ bge lbl_802CB490 -/* 802CB488 38 60 FF FF */ li r3, -1 -/* 802CB48C 48 00 01 AC */ b lbl_802CB638 -lbl_802CB490: -/* 802CB490 38 00 00 0D */ li r0, 0xd -/* 802CB494 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CB498 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) -/* 802CB49C 38 81 00 14 */ addi r4, r1, 0x14 -/* 802CB4A0 38 A0 00 00 */ li r5, 0 -/* 802CB4A4 38 C0 00 00 */ li r6, 0 -/* 802CB4A8 38 E0 00 00 */ li r7, 0 -/* 802CB4AC C0 22 C4 64 */ lfs f1, lit_3486(r2) -/* 802CB4B0 FC 40 08 90 */ fmr f2, f1 -/* 802CB4B4 C0 62 C4 7C */ lfs f3, lit_3590(r2) -/* 802CB4B8 FC 80 18 90 */ fmr f4, f3 -/* 802CB4BC 39 00 00 00 */ li r8, 0 -/* 802CB4C0 4B FE 04 C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 802CB4C4 88 1F 00 8E */ lbz r0, 0x8e(r31) -/* 802CB4C8 7C 00 07 74 */ extsb r0, r0 -/* 802CB4CC 2C 00 00 02 */ cmpwi r0, 2 -/* 802CB4D0 40 81 00 30 */ ble lbl_802CB500 -/* 802CB4D4 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) -/* 802CB4D8 80 63 00 04 */ lwz r3, 4(r3) -/* 802CB4DC 2C 03 00 21 */ cmpwi r3, 0x21 -/* 802CB4E0 40 82 00 38 */ bne lbl_802CB518 -/* 802CB4E4 54 00 10 3A */ slwi r0, r0, 2 -/* 802CB4E8 3C 60 80 43 */ lis r3, sCorrectDuo@ha /* 0x80434240@ha */ -/* 802CB4EC 38 63 42 40 */ addi r3, r3, sCorrectDuo@l /* 0x80434240@l */ -/* 802CB4F0 7C 83 00 2E */ lwzx r4, r3, r0 -/* 802CB4F4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802CB4F8 4B FE 3F A5 */ bl subBgmStart__8Z2SeqMgrFUl -/* 802CB4FC 48 00 00 1C */ b lbl_802CB518 -lbl_802CB500: -/* 802CB500 54 00 10 3A */ slwi r0, r0, 2 -/* 802CB504 3C 60 80 43 */ lis r3, sCorrectPhrase@ha /* 0x804341F8@ha */ -/* 802CB508 38 63 41 F8 */ addi r3, r3, sCorrectPhrase@l /* 0x804341F8@l */ -/* 802CB50C 7C 83 00 2E */ lwzx r4, r3, r0 -/* 802CB510 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802CB514 4B FE 3F 89 */ bl subBgmStart__8Z2SeqMgrFUl -lbl_802CB518: -/* 802CB518 38 00 FF FF */ li r0, -1 -/* 802CB51C B0 1F 00 90 */ sth r0, 0x90(r31) -/* 802CB520 88 7F 00 8E */ lbz r3, 0x8e(r31) -/* 802CB524 48 00 01 14 */ b lbl_802CB638 -lbl_802CB528: -/* 802CB528 28 04 00 01 */ cmplwi r4, 1 -/* 802CB52C 40 82 00 18 */ bne lbl_802CB544 -/* 802CB530 38 00 00 00 */ li r0, 0 -/* 802CB534 B0 1F 00 90 */ sth r0, 0x90(r31) -/* 802CB538 98 1F 00 BA */ stb r0, 0xba(r31) -/* 802CB53C 98 1F 00 BC */ stb r0, 0xbc(r31) -/* 802CB540 48 00 00 F4 */ b lbl_802CB634 -lbl_802CB544: -/* 802CB544 88 0D 83 0E */ lbz r0, data_8045088E(r13) -/* 802CB548 7C 04 00 40 */ cmplw r4, r0 -/* 802CB54C 41 80 00 E8 */ blt lbl_802CB634 -/* 802CB550 7F A0 20 50 */ subf r29, r0, r4 -/* 802CB554 3B C0 00 00 */ li r30, 0 -/* 802CB558 3B 80 00 00 */ li r28, 0 -/* 802CB55C 48 00 00 24 */ b lbl_802CB580 -lbl_802CB560: -/* 802CB560 7F E3 FB 78 */ mr r3, r31 -/* 802CB564 7F 84 E3 78 */ mr r4, r28 -/* 802CB568 4B FF FD B9 */ bl getCorrectLine__13Z2WolfHowlMgrFUc -/* 802CB56C 54 60 84 3E */ srwi r0, r3, 0x10 -/* 802CB570 B0 01 00 0C */ sth r0, 0xc(r1) -/* 802CB574 88 01 00 0D */ lbz r0, 0xd(r1) -/* 802CB578 7F DE 02 14 */ add r30, r30, r0 -/* 802CB57C 3B 9C 00 01 */ addi r28, r28, 1 -lbl_802CB580: -/* 802CB580 57 83 06 3E */ clrlwi r3, r28, 0x18 -/* 802CB584 88 1F 00 BA */ lbz r0, 0xba(r31) -/* 802CB588 7C 03 00 40 */ cmplw r3, r0 -/* 802CB58C 40 81 FF D4 */ ble lbl_802CB560 -/* 802CB590 7C 1D F0 40 */ cmplw r29, r30 -/* 802CB594 40 81 00 80 */ ble lbl_802CB614 -/* 802CB598 7F E3 FB 78 */ mr r3, r31 -/* 802CB59C 4B FF FD D5 */ bl getCorrectLineNum__13Z2WolfHowlMgrFv -/* 802CB5A0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 802CB5A4 88 1F 00 BA */ lbz r0, 0xba(r31) -/* 802CB5A8 7C 00 18 40 */ cmplw r0, r3 -/* 802CB5AC 40 80 00 68 */ bge lbl_802CB614 -/* 802CB5B0 A8 7F 00 90 */ lha r3, 0x90(r31) -/* 802CB5B4 88 1F 00 BC */ lbz r0, 0xbc(r31) -/* 802CB5B8 7C 03 02 14 */ add r0, r3, r0 -/* 802CB5BC B0 1F 00 90 */ sth r0, 0x90(r31) -/* 802CB5C0 7F E3 FB 78 */ mr r3, r31 -/* 802CB5C4 88 9F 00 BA */ lbz r4, 0xba(r31) -/* 802CB5C8 4B FF FD 59 */ bl getCorrectLine__13Z2WolfHowlMgrFUc -/* 802CB5CC 54 60 84 3E */ srwi r0, r3, 0x10 -/* 802CB5D0 B0 01 00 08 */ sth r0, 8(r1) -/* 802CB5D4 88 9F 00 BC */ lbz r4, 0xbc(r31) -/* 802CB5D8 88 61 00 09 */ lbz r3, 9(r1) -/* 802CB5DC 38 00 00 06 */ li r0, 6 -/* 802CB5E0 7C 03 03 D6 */ divw r0, r3, r0 -/* 802CB5E4 7C 04 00 00 */ cmpw r4, r0 -/* 802CB5E8 40 81 00 14 */ ble lbl_802CB5FC -/* 802CB5EC A8 7F 00 90 */ lha r3, 0x90(r31) -/* 802CB5F0 88 0D 83 15 */ lbz r0, struct_80450894+0x1(r13) -/* 802CB5F4 7C 03 02 14 */ add r0, r3, r0 -/* 802CB5F8 B0 1F 00 90 */ sth r0, 0x90(r31) -lbl_802CB5FC: -/* 802CB5FC 88 7F 00 BA */ lbz r3, 0xba(r31) -/* 802CB600 38 03 00 01 */ addi r0, r3, 1 -/* 802CB604 98 1F 00 BA */ stb r0, 0xba(r31) -/* 802CB608 38 00 00 00 */ li r0, 0 -/* 802CB60C 98 1F 00 BC */ stb r0, 0xbc(r31) -/* 802CB610 48 00 00 24 */ b lbl_802CB634 -lbl_802CB614: -/* 802CB614 7F E3 FB 78 */ mr r3, r31 -/* 802CB618 48 00 00 39 */ bl getOnLineNum__13Z2WolfHowlMgrFv -/* 802CB61C 7C 60 07 74 */ extsb r0, r3 -/* 802CB620 2C 00 FF FF */ cmpwi r0, -1 -/* 802CB624 40 81 00 10 */ ble lbl_802CB634 -/* 802CB628 88 7F 00 BC */ lbz r3, 0xbc(r31) -/* 802CB62C 38 03 00 01 */ addi r0, r3, 1 -/* 802CB630 98 1F 00 BC */ stb r0, 0xbc(r31) -lbl_802CB634: -/* 802CB634 38 60 FF FF */ li r3, -1 -lbl_802CB638: -/* 802CB638 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CB63C 48 09 6B E9 */ bl _restgpr_28 -/* 802CB640 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802CB644 7C 08 03 A6 */ mtlr r0 -/* 802CB648 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CB64C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/getCorrectLineNum__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/getCorrectLineNum__13Z2WolfHowlMgrFv.s deleted file mode 100644 index 7b149baf38b..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/getCorrectLineNum__13Z2WolfHowlMgrFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802CB370: -/* 802CB370 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802CB374 28 03 00 00 */ cmplwi r3, 0 -/* 802CB378 41 82 00 0C */ beq lbl_802CB384 -/* 802CB37C 88 63 00 00 */ lbz r3, 0(r3) -/* 802CB380 4E 80 00 20 */ blr -lbl_802CB384: -/* 802CB384 38 60 00 00 */ li r3, 0 -/* 802CB388 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/getCorrectLine__13Z2WolfHowlMgrFUc.s b/asm/Z2AudioLib/Z2WolfHowlMgr/getCorrectLine__13Z2WolfHowlMgrFUc.s deleted file mode 100644 index 9eb846c0be6..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/getCorrectLine__13Z2WolfHowlMgrFUc.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_802CB320: -/* 802CB320 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CB324 80 A3 00 0C */ lwz r5, 0xc(r3) -/* 802CB328 28 05 00 00 */ cmplwi r5, 0 -/* 802CB32C 41 82 00 14 */ beq lbl_802CB340 -/* 802CB330 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 802CB334 88 05 00 00 */ lbz r0, 0(r5) -/* 802CB338 7C 03 00 40 */ cmplw r3, r0 -/* 802CB33C 41 80 00 1C */ blt lbl_802CB358 -lbl_802CB340: -/* 802CB340 38 00 00 00 */ li r0, 0 -/* 802CB344 98 01 00 08 */ stb r0, 8(r1) -/* 802CB348 98 01 00 09 */ stb r0, 9(r1) -/* 802CB34C A0 01 00 08 */ lhz r0, 8(r1) -/* 802CB350 54 03 80 1E */ slwi r3, r0, 0x10 -/* 802CB354 48 00 00 14 */ b lbl_802CB368 -lbl_802CB358: -/* 802CB358 80 65 00 04 */ lwz r3, 4(r5) -/* 802CB35C 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e -/* 802CB360 7C 03 02 2E */ lhzx r0, r3, r0 -/* 802CB364 54 03 80 1E */ slwi r3, r0, 0x10 -lbl_802CB368: -/* 802CB368 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CB36C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/getNowInputValue__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/getNowInputValue__13Z2WolfHowlMgrFv.s deleted file mode 100644 index ce3405a5ff4..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/getNowInputValue__13Z2WolfHowlMgrFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802CACCC: -/* 802CACCC C0 23 00 14 */ lfs f1, 0x14(r3) -/* 802CACD0 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/getNowPitch__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/getNowPitch__13Z2WolfHowlMgrFv.s deleted file mode 100644 index d18fd0980b5..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/getNowPitch__13Z2WolfHowlMgrFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802CACB0: -/* 802CACB0 80 63 00 00 */ lwz r3, 0(r3) -/* 802CACB4 28 03 00 00 */ cmplwi r3, 0 -/* 802CACB8 41 82 00 0C */ beq lbl_802CACC4 -/* 802CACBC C0 23 00 50 */ lfs f1, 0x50(r3) -/* 802CACC0 4E 80 00 20 */ blr -lbl_802CACC4: -/* 802CACC4 C0 22 C4 64 */ lfs f1, lit_3486(r2) -/* 802CACC8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/getOnLineNum__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/getOnLineNum__13Z2WolfHowlMgrFv.s deleted file mode 100644 index 579cfcf9476..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/getOnLineNum__13Z2WolfHowlMgrFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_802CB650: -/* 802CB650 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CB654 7C 08 02 A6 */ mflr r0 -/* 802CB658 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CB65C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802CB660 7C 7F 1B 78 */ mr r31, r3 -/* 802CB664 88 83 00 BA */ lbz r4, 0xba(r3) -/* 802CB668 4B FF FC B9 */ bl getCorrectLine__13Z2WolfHowlMgrFUc -/* 802CB66C 54 60 84 3E */ srwi r0, r3, 0x10 -/* 802CB670 B0 01 00 08 */ sth r0, 8(r1) -/* 802CB674 88 01 00 08 */ lbz r0, 8(r1) -/* 802CB678 28 00 00 01 */ cmplwi r0, 1 -/* 802CB67C 40 82 00 14 */ bne lbl_802CB690 -/* 802CB680 C0 22 C4 64 */ lfs f1, lit_3486(r2) -/* 802CB684 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 802CB688 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 802CB68C 41 82 00 3C */ beq lbl_802CB6C8 -lbl_802CB690: -/* 802CB690 88 01 00 08 */ lbz r0, 8(r1) -/* 802CB694 28 00 00 02 */ cmplwi r0, 2 -/* 802CB698 40 82 00 14 */ bne lbl_802CB6AC -/* 802CB69C C0 22 C4 60 */ lfs f1, lit_3485(r2) -/* 802CB6A0 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 802CB6A4 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 802CB6A8 41 82 00 20 */ beq lbl_802CB6C8 -lbl_802CB6AC: -/* 802CB6AC 88 01 00 08 */ lbz r0, 8(r1) -/* 802CB6B0 28 00 00 03 */ cmplwi r0, 3 -/* 802CB6B4 40 82 00 20 */ bne lbl_802CB6D4 -/* 802CB6B8 C0 22 C4 7C */ lfs f1, lit_3590(r2) -/* 802CB6BC C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 802CB6C0 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 802CB6C4 40 82 00 10 */ bne lbl_802CB6D4 -lbl_802CB6C8: -/* 802CB6C8 88 1F 00 BA */ lbz r0, 0xba(r31) -/* 802CB6CC 7C 03 07 74 */ extsb r3, r0 -/* 802CB6D0 48 00 00 08 */ b lbl_802CB6D8 -lbl_802CB6D4: -/* 802CB6D4 38 60 FF FF */ li r3, -1 -lbl_802CB6D8: -/* 802CB6D8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802CB6DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CB6E0 7C 08 03 A6 */ mtlr r0 -/* 802CB6E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CB6E8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/resetState__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/resetState__13Z2WolfHowlMgrFv.s deleted file mode 100644 index aef25378409..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/resetState__13Z2WolfHowlMgrFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_802CAB8C: -/* 802CAB8C C0 22 C4 64 */ lfs f1, lit_3486(r2) -/* 802CAB90 D0 23 00 18 */ stfs f1, 0x18(r3) -/* 802CAB94 C0 0D 83 04 */ lfs f0, cPitchCenter(r13) -/* 802CAB98 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 802CAB9C D0 23 00 28 */ stfs f1, 0x28(r3) -/* 802CABA0 38 00 00 00 */ li r0, 0 -/* 802CABA4 90 03 00 88 */ stw r0, 0x88(r3) -/* 802CABA8 98 03 00 8C */ stb r0, 0x8c(r3) -/* 802CABAC 98 03 00 BA */ stb r0, 0xba(r3) -/* 802CABB0 38 A0 00 00 */ li r5, 0 -/* 802CABB4 C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CABB8 48 00 00 18 */ b lbl_802CABD0 -lbl_802CABBC: -/* 802CABBC 54 A0 15 BA */ rlwinm r0, r5, 2, 0x16, 0x1d -/* 802CABC0 7C 83 02 14 */ add r4, r3, r0 -/* 802CABC4 D0 04 00 38 */ stfs f0, 0x38(r4) -/* 802CABC8 D0 04 00 60 */ stfs f0, 0x60(r4) -/* 802CABCC 38 A5 00 01 */ addi r5, r5, 1 -lbl_802CABD0: -/* 802CABD0 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 802CABD4 28 00 00 0A */ cmplwi r0, 0xa -/* 802CABD8 41 80 FF E4 */ blt lbl_802CABBC -/* 802CABDC C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CABE0 D0 03 00 34 */ stfs f0, 0x34(r3) -/* 802CABE4 D0 03 00 30 */ stfs f0, 0x30(r3) -/* 802CABE8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData.s b/asm/Z2AudioLib/Z2WolfHowlMgr/setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData.s deleted file mode 100644 index 3c360b07e66..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_802CB100: -/* 802CB100 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802CB104 7C 08 02 A6 */ mflr r0 -/* 802CB108 90 01 00 34 */ stw r0, 0x34(r1) -/* 802CB10C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CB110 48 09 70 CD */ bl _savegpr_29 -/* 802CB114 7C 7F 1B 78 */ mr r31, r3 -/* 802CB118 7C 86 07 74 */ extsb r6, r4 -/* 802CB11C 88 03 00 8E */ lbz r0, 0x8e(r3) -/* 802CB120 7C 00 07 74 */ extsb r0, r0 -/* 802CB124 7C 06 00 00 */ cmpw r6, r0 -/* 802CB128 41 82 01 E0 */ beq lbl_802CB308 -/* 802CB12C 2C 06 FF FF */ cmpwi r6, -1 -/* 802CB130 40 82 00 18 */ bne lbl_802CB148 -/* 802CB134 38 00 FF FF */ li r0, -1 -/* 802CB138 98 1F 00 8E */ stb r0, 0x8e(r31) -/* 802CB13C 38 00 00 00 */ li r0, 0 -/* 802CB140 90 1F 00 0C */ stw r0, 0xc(r31) -/* 802CB144 48 00 01 C4 */ b lbl_802CB308 -lbl_802CB148: -/* 802CB148 28 05 00 00 */ cmplwi r5, 0 -/* 802CB14C 40 82 00 2C */ bne lbl_802CB178 -/* 802CB150 2C 06 00 09 */ cmpwi r6, 9 -/* 802CB154 41 80 00 18 */ blt lbl_802CB16C -/* 802CB158 38 00 FF FF */ li r0, -1 -/* 802CB15C 98 1F 00 8E */ stb r0, 0x8e(r31) -/* 802CB160 38 00 00 00 */ li r0, 0 -/* 802CB164 90 1F 00 0C */ stw r0, 0xc(r31) -/* 802CB168 48 00 01 A0 */ b lbl_802CB308 -lbl_802CB16C: -/* 802CB16C 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 802CB170 54 C0 18 38 */ slwi r0, r6, 3 -/* 802CB174 7C A3 02 14 */ add r5, r3, r0 -lbl_802CB178: -/* 802CB178 98 9F 00 8E */ stb r4, 0x8e(r31) -/* 802CB17C 90 BF 00 0C */ stw r5, 0xc(r31) -/* 802CB180 7C 80 07 74 */ extsb r0, r4 -/* 802CB184 2C 00 00 06 */ cmpwi r0, 6 -/* 802CB188 41 82 00 68 */ beq lbl_802CB1F0 -/* 802CB18C 40 80 00 1C */ bge lbl_802CB1A8 -/* 802CB190 2C 00 00 04 */ cmpwi r0, 4 -/* 802CB194 41 82 00 40 */ beq lbl_802CB1D4 -/* 802CB198 40 80 00 A8 */ bge lbl_802CB240 -/* 802CB19C 2C 00 00 03 */ cmpwi r0, 3 -/* 802CB1A0 40 80 00 18 */ bge lbl_802CB1B8 -/* 802CB1A4 48 00 00 9C */ b lbl_802CB240 -lbl_802CB1A8: -/* 802CB1A8 2C 00 00 08 */ cmpwi r0, 8 -/* 802CB1AC 41 82 00 78 */ beq lbl_802CB224 -/* 802CB1B0 40 80 00 90 */ bge lbl_802CB240 -/* 802CB1B4 48 00 00 54 */ b lbl_802CB208 -lbl_802CB1B8: -/* 802CB1B8 C0 02 C4 80 */ lfs f0, lit_3711(r2) -/* 802CB1BC D0 0D 83 08 */ stfs f0, cPitchUp(r13) -/* 802CB1C0 C0 02 C4 84 */ lfs f0, lit_3712(r2) -/* 802CB1C4 D0 0D 83 04 */ stfs f0, cPitchCenter(r13) -/* 802CB1C8 C0 02 C4 88 */ lfs f0, lit_3713(r2) -/* 802CB1CC D0 0D 83 00 */ stfs f0, cPitchDown(r13) -/* 802CB1D0 48 00 00 88 */ b lbl_802CB258 -lbl_802CB1D4: -/* 802CB1D4 C0 02 C4 8C */ lfs f0, lit_3714(r2) -/* 802CB1D8 D0 0D 83 08 */ stfs f0, cPitchUp(r13) -/* 802CB1DC C0 02 C4 90 */ lfs f0, lit_3715(r2) -/* 802CB1E0 D0 0D 83 04 */ stfs f0, cPitchCenter(r13) -/* 802CB1E4 C0 02 C4 94 */ lfs f0, lit_3716(r2) -/* 802CB1E8 D0 0D 83 00 */ stfs f0, cPitchDown(r13) -/* 802CB1EC 48 00 00 6C */ b lbl_802CB258 -lbl_802CB1F0: -/* 802CB1F0 C0 02 C4 98 */ lfs f0, lit_3717(r2) -/* 802CB1F4 D0 0D 83 08 */ stfs f0, cPitchUp(r13) -/* 802CB1F8 C0 02 C4 9C */ lfs f0, lit_3718(r2) -/* 802CB1FC D0 0D 83 04 */ stfs f0, cPitchCenter(r13) -/* 802CB200 D0 0D 83 00 */ stfs f0, cPitchDown(r13) -/* 802CB204 48 00 00 54 */ b lbl_802CB258 -lbl_802CB208: -/* 802CB208 C0 02 C4 8C */ lfs f0, lit_3714(r2) -/* 802CB20C D0 0D 83 08 */ stfs f0, cPitchUp(r13) -/* 802CB210 C0 02 C4 90 */ lfs f0, lit_3715(r2) -/* 802CB214 D0 0D 83 04 */ stfs f0, cPitchCenter(r13) -/* 802CB218 C0 02 C4 9C */ lfs f0, lit_3718(r2) -/* 802CB21C D0 0D 83 00 */ stfs f0, cPitchDown(r13) -/* 802CB220 48 00 00 38 */ b lbl_802CB258 -lbl_802CB224: -/* 802CB224 C0 02 C4 80 */ lfs f0, lit_3711(r2) -/* 802CB228 D0 0D 83 08 */ stfs f0, cPitchUp(r13) -/* 802CB22C C0 02 C4 90 */ lfs f0, lit_3715(r2) -/* 802CB230 D0 0D 83 04 */ stfs f0, cPitchCenter(r13) -/* 802CB234 C0 02 C4 A0 */ lfs f0, lit_3719(r2) -/* 802CB238 D0 0D 83 00 */ stfs f0, cPitchDown(r13) -/* 802CB23C 48 00 00 1C */ b lbl_802CB258 -lbl_802CB240: -/* 802CB240 C0 02 C4 A4 */ lfs f0, lit_3720(r2) -/* 802CB244 D0 0D 83 08 */ stfs f0, cPitchUp(r13) -/* 802CB248 C0 02 C4 64 */ lfs f0, lit_3486(r2) -/* 802CB24C D0 0D 83 04 */ stfs f0, cPitchCenter(r13) -/* 802CB250 C0 02 C4 9C */ lfs f0, lit_3718(r2) -/* 802CB254 D0 0D 83 00 */ stfs f0, cPitchDown(r13) -lbl_802CB258: -/* 802CB258 38 00 00 00 */ li r0, 0 -/* 802CB25C B0 1F 00 BE */ sth r0, 0xbe(r31) -/* 802CB260 3B C0 00 00 */ li r30, 0 -/* 802CB264 3B A0 00 00 */ li r29, 0 -/* 802CB268 48 00 00 78 */ b lbl_802CB2E0 -lbl_802CB26C: -/* 802CB26C 7F E3 FB 78 */ mr r3, r31 -/* 802CB270 7F A4 EB 78 */ mr r4, r29 -/* 802CB274 48 00 00 AD */ bl getCorrectLine__13Z2WolfHowlMgrFUc -/* 802CB278 54 60 84 3E */ srwi r0, r3, 0x10 -/* 802CB27C B0 01 00 10 */ sth r0, 0x10(r1) -/* 802CB280 88 01 00 11 */ lbz r0, 0x11(r1) -/* 802CB284 7F DE 02 14 */ add r30, r30, r0 -/* 802CB288 7F E3 FB 78 */ mr r3, r31 -/* 802CB28C 7F A4 EB 78 */ mr r4, r29 -/* 802CB290 48 00 00 91 */ bl getCorrectLine__13Z2WolfHowlMgrFUc -/* 802CB294 54 60 84 3E */ srwi r0, r3, 0x10 -/* 802CB298 B0 01 00 0C */ sth r0, 0xc(r1) -/* 802CB29C 88 01 00 0C */ lbz r0, 0xc(r1) -/* 802CB2A0 28 00 00 00 */ cmplwi r0, 0 -/* 802CB2A4 41 82 00 38 */ beq lbl_802CB2DC -/* 802CB2A8 A0 7F 00 BE */ lhz r3, 0xbe(r31) -/* 802CB2AC 88 0D 83 15 */ lbz r0, struct_80450894+0x1(r13) -/* 802CB2B0 7C 03 02 14 */ add r0, r3, r0 -/* 802CB2B4 B0 1F 00 BE */ sth r0, 0xbe(r31) -/* 802CB2B8 7F E3 FB 78 */ mr r3, r31 -/* 802CB2BC 7F A4 EB 78 */ mr r4, r29 -/* 802CB2C0 48 00 00 61 */ bl getCorrectLine__13Z2WolfHowlMgrFUc -/* 802CB2C4 54 60 84 3E */ srwi r0, r3, 0x10 -/* 802CB2C8 B0 01 00 08 */ sth r0, 8(r1) -/* 802CB2CC A0 7F 00 BE */ lhz r3, 0xbe(r31) -/* 802CB2D0 88 01 00 09 */ lbz r0, 9(r1) -/* 802CB2D4 7C 03 02 14 */ add r0, r3, r0 -/* 802CB2D8 B0 1F 00 BE */ sth r0, 0xbe(r31) -lbl_802CB2DC: -/* 802CB2DC 3B BD 00 01 */ addi r29, r29, 1 -lbl_802CB2E0: -/* 802CB2E0 7F E3 FB 78 */ mr r3, r31 -/* 802CB2E4 48 00 00 8D */ bl getCorrectLineNum__13Z2WolfHowlMgrFv -/* 802CB2E8 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 802CB2EC 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802CB2F0 7C 00 18 40 */ cmplw r0, r3 -/* 802CB2F4 41 80 FF 78 */ blt lbl_802CB26C -/* 802CB2F8 57 C3 F0 BE */ srwi r3, r30, 2 -/* 802CB2FC A0 1F 00 BE */ lhz r0, 0xbe(r31) -/* 802CB300 7C 03 00 50 */ subf r0, r3, r0 -/* 802CB304 B0 1F 00 BE */ sth r0, 0xbe(r31) -lbl_802CB308: -/* 802CB308 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CB30C 48 09 6F 1D */ bl _restgpr_29 -/* 802CB310 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802CB314 7C 08 03 A6 */ mtlr r0 -/* 802CB318 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CB31C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/skipCorrectDemo__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/skipCorrectDemo__13Z2WolfHowlMgrFv.s deleted file mode 100644 index ef0a1f25eaf..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/skipCorrectDemo__13Z2WolfHowlMgrFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802CBB58: -/* 802CBB58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CBB5C 7C 08 02 A6 */ mflr r0 -/* 802CBB60 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CBB64 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802CBB68 4B FE 77 15 */ bl stopWolfHowlSong__8Z2SeqMgrFv -/* 802CBB6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CBB70 7C 08 03 A6 */ mtlr r0 -/* 802CBB74 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CBB78 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/startGuideMelody__13Z2WolfHowlMgrFb.s b/asm/Z2AudioLib/Z2WolfHowlMgr/startGuideMelody__13Z2WolfHowlMgrFb.s deleted file mode 100644 index b7dbccaa40e..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/startGuideMelody__13Z2WolfHowlMgrFb.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_802CBA88: -/* 802CBA88 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CBA8C 7C 08 02 A6 */ mflr r0 -/* 802CBA90 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CBA94 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802CBA98 7C 7F 1B 78 */ mr r31, r3 -/* 802CBA9C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802CBAA0 C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CBAA4 D0 03 00 94 */ stfs f0, 0x94(r3) -/* 802CBAA8 D0 03 00 98 */ stfs f0, 0x98(r3) -/* 802CBAAC 38 00 00 00 */ li r0, 0 -/* 802CBAB0 90 03 00 A0 */ stw r0, 0xa0(r3) -/* 802CBAB4 D0 03 00 9C */ stfs f0, 0x9c(r3) -/* 802CBAB8 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802CBABC 41 82 00 40 */ beq lbl_802CBAFC -/* 802CBAC0 88 1F 00 8E */ lbz r0, 0x8e(r31) -/* 802CBAC4 7C 00 07 74 */ extsb r0, r0 -/* 802CBAC8 54 00 10 3A */ slwi r0, r0, 2 -/* 802CBACC 3C 60 80 43 */ lis r3, sWindStoneSound@ha /* 0x8043421C@ha */ -/* 802CBAD0 38 63 42 1C */ addi r3, r3, sWindStoneSound@l /* 0x8043421C@l */ -/* 802CBAD4 7C 03 00 2E */ lwzx r0, r3, r0 -/* 802CBAD8 90 01 00 08 */ stw r0, 8(r1) -/* 802CBADC 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) -/* 802CBAE0 38 81 00 08 */ addi r4, r1, 8 -/* 802CBAE4 38 BF 00 08 */ addi r5, r31, 8 -/* 802CBAE8 38 C0 00 00 */ li r6, 0 -/* 802CBAEC 81 83 00 00 */ lwz r12, 0(r3) -/* 802CBAF0 81 8C 00 08 */ lwz r12, 8(r12) -/* 802CBAF4 7D 89 03 A6 */ mtctr r12 -/* 802CBAF8 4E 80 04 21 */ bctrl -lbl_802CBAFC: -/* 802CBAFC 80 7F 00 08 */ lwz r3, 8(r31) -/* 802CBB00 28 03 00 00 */ cmplwi r3, 0 -/* 802CBB04 41 82 00 3C */ beq lbl_802CBB40 -/* 802CBB08 C0 22 C4 60 */ lfs f1, lit_3485(r2) -/* 802CBB0C D0 23 00 24 */ stfs f1, 0x24(r3) -/* 802CBB10 C0 02 C4 64 */ lfs f0, lit_3486(r2) -/* 802CBB14 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 802CBB18 D0 23 00 28 */ stfs f1, 0x28(r3) -/* 802CBB1C 38 00 00 00 */ li r0, 0 -/* 802CBB20 90 03 00 30 */ stw r0, 0x30(r3) -/* 802CBB24 D0 23 00 2C */ stfs f1, 0x2c(r3) -/* 802CBB28 80 7F 00 08 */ lwz r3, 8(r31) -/* 802CBB2C 38 80 00 1E */ li r4, 0x1e -/* 802CBB30 4B FD 69 AD */ bl stop__8JAISoundFUl -/* 802CBB34 80 7F 00 08 */ lwz r3, 8(r31) -/* 802CBB38 80 63 00 38 */ lwz r3, 0x38(r3) -/* 802CBB3C 48 00 00 08 */ b lbl_802CBB44 -lbl_802CBB40: -/* 802CBB40 38 60 00 00 */ li r3, 0 -lbl_802CBB44: -/* 802CBB44 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802CBB48 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CBB4C 7C 08 03 A6 */ mtlr r0 -/* 802CBB50 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CBB54 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/startWindStoneSound__13Z2WolfHowlMgrFScP3Vec.s b/asm/Z2AudioLib/Z2WolfHowlMgr/startWindStoneSound__13Z2WolfHowlMgrFScP3Vec.s deleted file mode 100644 index 0a8a367696e..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/startWindStoneSound__13Z2WolfHowlMgrFScP3Vec.s +++ /dev/null @@ -1,257 +0,0 @@ -lbl_802CB6EC: -/* 802CB6EC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802CB6F0 7C 08 02 A6 */ mflr r0 -/* 802CB6F4 90 01 00 44 */ stw r0, 0x44(r1) -/* 802CB6F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802CB6FC 48 09 6A E1 */ bl _savegpr_29 -/* 802CB700 7C 7D 1B 78 */ mr r29, r3 -/* 802CB704 7C 9E 23 78 */ mr r30, r4 -/* 802CB708 7C BF 2B 79 */ or. r31, r5, r5 -/* 802CB70C 41 82 03 64 */ beq lbl_802CBA70 -/* 802CB710 80 6D 8D E0 */ lwz r3, mLinkPtr__14Z2CreatureLink(r13) -/* 802CB714 28 03 00 00 */ cmplwi r3, 0 -/* 802CB718 41 82 03 58 */ beq lbl_802CBA70 -/* 802CB71C 80 03 00 04 */ lwz r0, 4(r3) -/* 802CB720 28 00 00 00 */ cmplwi r0, 0 -/* 802CB724 40 82 00 08 */ bne lbl_802CB72C -/* 802CB728 48 00 03 48 */ b lbl_802CBA70 -lbl_802CB72C: -/* 802CB72C 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) -/* 802CB730 E0 23 01 70 */ psq_l f1, 368(r3), 0, 0 /* qr0 */ -/* 802CB734 C0 03 01 78 */ lfs f0, 0x178(r3) -/* 802CB738 F0 21 00 14 */ psq_st f1, 20(r1), 0, 0 /* qr0 */ -/* 802CB73C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 802CB740 80 61 00 14 */ lwz r3, 0x14(r1) -/* 802CB744 80 01 00 18 */ lwz r0, 0x18(r1) -/* 802CB748 90 61 00 20 */ stw r3, 0x20(r1) -/* 802CB74C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CB750 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 802CB754 90 01 00 28 */ stw r0, 0x28(r1) -/* 802CB758 7F E3 FB 78 */ mr r3, r31 -/* 802CB75C 38 81 00 20 */ addi r4, r1, 0x20 -/* 802CB760 48 07 BC 3D */ bl PSVECSquareDistance -/* 802CB764 C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CB768 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802CB76C 40 81 00 58 */ ble lbl_802CB7C4 -/* 802CB770 FC 00 08 34 */ frsqrte f0, f1 -/* 802CB774 C8 82 C4 A8 */ lfd f4, lit_4032(r2) -/* 802CB778 FC 44 00 32 */ fmul f2, f4, f0 -/* 802CB77C C8 62 C4 B0 */ lfd f3, lit_4033(r2) -/* 802CB780 FC 00 00 32 */ fmul f0, f0, f0 -/* 802CB784 FC 01 00 32 */ fmul f0, f1, f0 -/* 802CB788 FC 03 00 28 */ fsub f0, f3, f0 -/* 802CB78C FC 02 00 32 */ fmul f0, f2, f0 -/* 802CB790 FC 44 00 32 */ fmul f2, f4, f0 -/* 802CB794 FC 00 00 32 */ fmul f0, f0, f0 -/* 802CB798 FC 01 00 32 */ fmul f0, f1, f0 -/* 802CB79C FC 03 00 28 */ fsub f0, f3, f0 -/* 802CB7A0 FC 02 00 32 */ fmul f0, f2, f0 -/* 802CB7A4 FC 44 00 32 */ fmul f2, f4, f0 -/* 802CB7A8 FC 00 00 32 */ fmul f0, f0, f0 -/* 802CB7AC FC 01 00 32 */ fmul f0, f1, f0 -/* 802CB7B0 FC 03 00 28 */ fsub f0, f3, f0 -/* 802CB7B4 FC 02 00 32 */ fmul f0, f2, f0 -/* 802CB7B8 FC 21 00 32 */ fmul f1, f1, f0 -/* 802CB7BC FC 20 08 18 */ frsp f1, f1 -/* 802CB7C0 48 00 00 88 */ b lbl_802CB848 -lbl_802CB7C4: -/* 802CB7C4 C8 02 C4 B8 */ lfd f0, lit_4034(r2) -/* 802CB7C8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802CB7CC 40 80 00 10 */ bge lbl_802CB7DC -/* 802CB7D0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 802CB7D4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 802CB7D8 48 00 00 70 */ b lbl_802CB848 -lbl_802CB7DC: -/* 802CB7DC D0 21 00 0C */ stfs f1, 0xc(r1) -/* 802CB7E0 80 81 00 0C */ lwz r4, 0xc(r1) -/* 802CB7E4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 802CB7E8 3C 00 7F 80 */ lis r0, 0x7f80 -/* 802CB7EC 7C 03 00 00 */ cmpw r3, r0 -/* 802CB7F0 41 82 00 14 */ beq lbl_802CB804 -/* 802CB7F4 40 80 00 40 */ bge lbl_802CB834 -/* 802CB7F8 2C 03 00 00 */ cmpwi r3, 0 -/* 802CB7FC 41 82 00 20 */ beq lbl_802CB81C -/* 802CB800 48 00 00 34 */ b lbl_802CB834 -lbl_802CB804: -/* 802CB804 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 802CB808 41 82 00 0C */ beq lbl_802CB814 -/* 802CB80C 38 00 00 01 */ li r0, 1 -/* 802CB810 48 00 00 28 */ b lbl_802CB838 -lbl_802CB814: -/* 802CB814 38 00 00 02 */ li r0, 2 -/* 802CB818 48 00 00 20 */ b lbl_802CB838 -lbl_802CB81C: -/* 802CB81C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 802CB820 41 82 00 0C */ beq lbl_802CB82C -/* 802CB824 38 00 00 05 */ li r0, 5 -/* 802CB828 48 00 00 10 */ b lbl_802CB838 -lbl_802CB82C: -/* 802CB82C 38 00 00 03 */ li r0, 3 -/* 802CB830 48 00 00 08 */ b lbl_802CB838 -lbl_802CB834: -/* 802CB834 38 00 00 04 */ li r0, 4 -lbl_802CB838: -/* 802CB838 2C 00 00 01 */ cmpwi r0, 1 -/* 802CB83C 40 82 00 0C */ bne lbl_802CB848 -/* 802CB840 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 802CB844 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_802CB848: -/* 802CB848 C0 02 C4 C0 */ lfs f0, lit_4035(r2) -/* 802CB84C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802CB850 40 81 00 18 */ ble lbl_802CB868 -/* 802CB854 80 7D 00 04 */ lwz r3, 4(r29) -/* 802CB858 28 03 00 00 */ cmplwi r3, 0 -/* 802CB85C 41 82 00 0C */ beq lbl_802CB868 -/* 802CB860 4B FD 6D 39 */ bl stop__8JAISoundFv -/* 802CB864 48 00 00 54 */ b lbl_802CB8B8 -lbl_802CB868: -/* 802CB868 C0 02 C4 C0 */ lfs f0, lit_4035(r2) -/* 802CB86C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802CB870 40 80 00 48 */ bge lbl_802CB8B8 -/* 802CB874 80 1D 00 04 */ lwz r0, 4(r29) -/* 802CB878 28 00 00 00 */ cmplwi r0, 0 -/* 802CB87C 40 82 00 3C */ bne lbl_802CB8B8 -/* 802CB880 7F C0 07 74 */ extsb r0, r30 -/* 802CB884 54 00 10 3A */ slwi r0, r0, 2 -/* 802CB888 3C 60 80 43 */ lis r3, sWindStoneSound@ha /* 0x8043421C@ha */ -/* 802CB88C 38 63 42 1C */ addi r3, r3, sWindStoneSound@l /* 0x8043421C@l */ -/* 802CB890 7C 03 00 2E */ lwzx r0, r3, r0 -/* 802CB894 90 01 00 10 */ stw r0, 0x10(r1) -/* 802CB898 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) -/* 802CB89C 38 81 00 10 */ addi r4, r1, 0x10 -/* 802CB8A0 38 BD 00 04 */ addi r5, r29, 4 -/* 802CB8A4 7F E6 FB 78 */ mr r6, r31 -/* 802CB8A8 81 83 00 00 */ lwz r12, 0(r3) -/* 802CB8AC 81 8C 00 08 */ lwz r12, 8(r12) -/* 802CB8B0 7D 89 03 A6 */ mtctr r12 -/* 802CB8B4 4E 80 04 21 */ bctrl -lbl_802CB8B8: -/* 802CB8B8 80 7D 00 04 */ lwz r3, 4(r29) -/* 802CB8BC 28 03 00 00 */ cmplwi r3, 0 -/* 802CB8C0 41 82 01 B0 */ beq lbl_802CBA70 -/* 802CB8C4 C0 22 C4 60 */ lfs f1, lit_3485(r2) -/* 802CB8C8 D0 23 00 24 */ stfs f1, 0x24(r3) -/* 802CB8CC C0 02 C4 64 */ lfs f0, lit_3486(r2) -/* 802CB8D0 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 802CB8D4 D0 23 00 28 */ stfs f1, 0x28(r3) -/* 802CB8D8 38 00 00 00 */ li r0, 0 -/* 802CB8DC 90 03 00 30 */ stw r0, 0x30(r3) -/* 802CB8E0 D0 23 00 2C */ stfs f1, 0x2c(r3) -/* 802CB8E4 80 7D 00 04 */ lwz r3, 4(r29) -/* 802CB8E8 38 80 00 1E */ li r4, 0x1e -/* 802CB8EC 4B FD 6B F1 */ bl stop__8JAISoundFUl -/* 802CB8F0 80 8D 8D E0 */ lwz r4, mLinkPtr__14Z2CreatureLink(r13) -/* 802CB8F4 88 04 00 C0 */ lbz r0, 0xc0(r4) -/* 802CB8F8 28 00 00 01 */ cmplwi r0, 1 -/* 802CB8FC 40 82 01 60 */ bne lbl_802CBA5C -/* 802CB900 7F E3 FB 78 */ mr r3, r31 -/* 802CB904 80 84 00 04 */ lwz r4, 4(r4) -/* 802CB908 48 07 BA 95 */ bl PSVECSquareDistance -/* 802CB90C C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CB910 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802CB914 40 81 00 58 */ ble lbl_802CB96C -/* 802CB918 FC 00 08 34 */ frsqrte f0, f1 -/* 802CB91C C8 82 C4 A8 */ lfd f4, lit_4032(r2) -/* 802CB920 FC 44 00 32 */ fmul f2, f4, f0 -/* 802CB924 C8 62 C4 B0 */ lfd f3, lit_4033(r2) -/* 802CB928 FC 00 00 32 */ fmul f0, f0, f0 -/* 802CB92C FC 01 00 32 */ fmul f0, f1, f0 -/* 802CB930 FC 03 00 28 */ fsub f0, f3, f0 -/* 802CB934 FC 02 00 32 */ fmul f0, f2, f0 -/* 802CB938 FC 44 00 32 */ fmul f2, f4, f0 -/* 802CB93C FC 00 00 32 */ fmul f0, f0, f0 -/* 802CB940 FC 01 00 32 */ fmul f0, f1, f0 -/* 802CB944 FC 03 00 28 */ fsub f0, f3, f0 -/* 802CB948 FC 02 00 32 */ fmul f0, f2, f0 -/* 802CB94C FC 44 00 32 */ fmul f2, f4, f0 -/* 802CB950 FC 00 00 32 */ fmul f0, f0, f0 -/* 802CB954 FC 01 00 32 */ fmul f0, f1, f0 -/* 802CB958 FC 03 00 28 */ fsub f0, f3, f0 -/* 802CB95C FC 02 00 32 */ fmul f0, f2, f0 -/* 802CB960 FC 21 00 32 */ fmul f1, f1, f0 -/* 802CB964 FC 20 08 18 */ frsp f1, f1 -/* 802CB968 48 00 00 88 */ b lbl_802CB9F0 -lbl_802CB96C: -/* 802CB96C C8 02 C4 B8 */ lfd f0, lit_4034(r2) -/* 802CB970 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802CB974 40 80 00 10 */ bge lbl_802CB984 -/* 802CB978 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 802CB97C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 802CB980 48 00 00 70 */ b lbl_802CB9F0 -lbl_802CB984: -/* 802CB984 D0 21 00 08 */ stfs f1, 8(r1) -/* 802CB988 80 81 00 08 */ lwz r4, 8(r1) -/* 802CB98C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 802CB990 3C 00 7F 80 */ lis r0, 0x7f80 -/* 802CB994 7C 03 00 00 */ cmpw r3, r0 -/* 802CB998 41 82 00 14 */ beq lbl_802CB9AC -/* 802CB99C 40 80 00 40 */ bge lbl_802CB9DC -/* 802CB9A0 2C 03 00 00 */ cmpwi r3, 0 -/* 802CB9A4 41 82 00 20 */ beq lbl_802CB9C4 -/* 802CB9A8 48 00 00 34 */ b lbl_802CB9DC -lbl_802CB9AC: -/* 802CB9AC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 802CB9B0 41 82 00 0C */ beq lbl_802CB9BC -/* 802CB9B4 38 00 00 01 */ li r0, 1 -/* 802CB9B8 48 00 00 28 */ b lbl_802CB9E0 -lbl_802CB9BC: -/* 802CB9BC 38 00 00 02 */ li r0, 2 -/* 802CB9C0 48 00 00 20 */ b lbl_802CB9E0 -lbl_802CB9C4: -/* 802CB9C4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 802CB9C8 41 82 00 0C */ beq lbl_802CB9D4 -/* 802CB9CC 38 00 00 05 */ li r0, 5 -/* 802CB9D0 48 00 00 10 */ b lbl_802CB9E0 -lbl_802CB9D4: -/* 802CB9D4 38 00 00 03 */ li r0, 3 -/* 802CB9D8 48 00 00 08 */ b lbl_802CB9E0 -lbl_802CB9DC: -/* 802CB9DC 38 00 00 04 */ li r0, 4 -lbl_802CB9E0: -/* 802CB9E0 2C 00 00 01 */ cmpwi r0, 1 -/* 802CB9E4 40 82 00 0C */ bne lbl_802CB9F0 -/* 802CB9E8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 802CB9EC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_802CB9F0: -/* 802CB9F0 C0 C2 C4 64 */ lfs f6, lit_3486(r2) -/* 802CB9F4 C0 42 C4 C4 */ lfs f2, lit_4036(r2) -/* 802CB9F8 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 802CB9FC 40 80 00 0C */ bge lbl_802CBA08 -/* 802CBA00 C0 C2 C4 60 */ lfs f6, lit_3485(r2) -/* 802CBA04 48 00 00 24 */ b lbl_802CBA28 -lbl_802CBA08: -/* 802CBA08 C0 62 C4 C8 */ lfs f3, lit_4037(r2) -/* 802CBA0C FC 01 18 40 */ fcmpo cr0, f1, f3 -/* 802CBA10 40 80 00 18 */ bge lbl_802CBA28 -/* 802CBA14 C0 82 C4 CC */ lfs f4, lit_4038(r2) -/* 802CBA18 C0 A2 C4 D0 */ lfs f5, lit_4039(r2) -/* 802CBA1C 38 60 00 00 */ li r3, 0 -/* 802CBA20 4B FD DC D5 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802CBA24 FC C0 08 90 */ fmr f6, f1 -lbl_802CBA28: -/* 802CBA28 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802CBA2C D0 C3 00 94 */ stfs f6, 0x94(r3) -/* 802CBA30 C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CBA34 D0 03 00 98 */ stfs f0, 0x98(r3) -/* 802CBA38 38 00 00 00 */ li r0, 0 -/* 802CBA3C 90 03 00 A0 */ stw r0, 0xa0(r3) -/* 802CBA40 D0 03 00 9C */ stfs f0, 0x9c(r3) -/* 802CBA44 80 7D 00 04 */ lwz r3, 4(r29) -/* 802CBA48 38 63 00 48 */ addi r3, r3, 0x48 -/* 802CBA4C C0 22 C4 D4 */ lfs f1, lit_4040(r2) -/* 802CBA50 38 80 00 00 */ li r4, 0 -/* 802CBA54 4B FD 73 61 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802CBA58 48 00 00 18 */ b lbl_802CBA70 -lbl_802CBA5C: -/* 802CBA5C 80 7D 00 04 */ lwz r3, 4(r29) -/* 802CBA60 38 63 00 48 */ addi r3, r3, 0x48 -/* 802CBA64 C0 22 C4 D8 */ lfs f1, lit_4041(r2) -/* 802CBA68 38 80 00 00 */ li r4, 0 -/* 802CBA6C 4B FD 73 49 */ bl moveVolume__18JAISoundParamsMoveFfUl -lbl_802CBA70: -/* 802CBA70 39 61 00 40 */ addi r11, r1, 0x40 -/* 802CBA74 48 09 67 B5 */ bl _restgpr_29 -/* 802CBA78 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802CBA7C 7C 08 03 A6 */ mtlr r0 -/* 802CBA80 38 21 00 40 */ addi r1, r1, 0x40 -/* 802CBA84 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s b/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s deleted file mode 100644 index 82b475d6cab..00000000000 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s +++ /dev/null @@ -1,155 +0,0 @@ -lbl_802CAED4: -/* 802CAED4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802CAED8 7C 08 02 A6 */ mflr r0 -/* 802CAEDC 90 01 00 34 */ stw r0, 0x34(r1) -/* 802CAEE0 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 802CAEE4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 802CAEE8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802CAEEC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 802CAEF0 7C 7F 1B 78 */ mr r31, r3 -/* 802CAEF4 7C 9E 23 78 */ mr r30, r4 -/* 802CAEF8 FF E0 18 90 */ fmr f31, f3 -/* 802CAEFC 88 03 00 8E */ lbz r0, 0x8e(r3) -/* 802CAF00 7C 00 07 74 */ extsb r0, r0 -/* 802CAF04 2C 00 00 01 */ cmpwi r0, 1 -/* 802CAF08 40 81 00 20 */ ble lbl_802CAF28 -/* 802CAF0C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802CAF10 C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CAF14 D0 03 00 94 */ stfs f0, 0x94(r3) -/* 802CAF18 D0 03 00 98 */ stfs f0, 0x98(r3) -/* 802CAF1C 38 00 00 00 */ li r0, 0 -/* 802CAF20 90 03 00 A0 */ stw r0, 0xa0(r3) -/* 802CAF24 D0 03 00 9C */ stfs f0, 0x9c(r3) -lbl_802CAF28: -/* 802CAF28 80 8D 86 04 */ lwz r4, __OSReport_disable-0x14(r13) -/* 802CAF2C 38 60 00 00 */ li r3, 0 -/* 802CAF30 80 04 00 08 */ lwz r0, 8(r4) -/* 802CAF34 28 00 00 00 */ cmplwi r0, 0 -/* 802CAF38 40 82 00 10 */ bne lbl_802CAF48 -/* 802CAF3C 88 04 00 BA */ lbz r0, 0xba(r4) -/* 802CAF40 28 00 00 00 */ cmplwi r0, 0 -/* 802CAF44 41 82 00 08 */ beq lbl_802CAF4C -lbl_802CAF48: -/* 802CAF48 38 60 00 01 */ li r3, 1 -lbl_802CAF4C: -/* 802CAF4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802CAF50 40 82 00 10 */ bne lbl_802CAF60 -/* 802CAF54 88 1F 00 8C */ lbz r0, 0x8c(r31) -/* 802CAF58 28 00 00 00 */ cmplwi r0, 0 -/* 802CAF5C 41 82 00 0C */ beq lbl_802CAF68 -lbl_802CAF60: -/* 802CAF60 3B C0 00 00 */ li r30, 0 -/* 802CAF64 48 00 00 70 */ b lbl_802CAFD4 -lbl_802CAF68: -/* 802CAF68 C0 0D 83 1C */ lfs f0, sStickCenter(r13) -/* 802CAF6C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802CAF70 40 81 00 28 */ ble lbl_802CAF98 -/* 802CAF74 FC 20 10 90 */ fmr f1, f2 -/* 802CAF78 FC 40 00 90 */ fmr f2, f0 -/* 802CAF7C C0 6D 83 18 */ lfs f3, sStickHigh(r13) -/* 802CAF80 C0 82 C4 60 */ lfs f4, lit_3485(r2) -/* 802CAF84 C0 A2 C4 64 */ lfs f5, lit_3486(r2) -/* 802CAF88 38 60 00 00 */ li r3, 0 -/* 802CAF8C 4B FD E7 01 */ bl linearTransform__6Z2CalcFfffffb -/* 802CAF90 D0 3F 00 14 */ stfs f1, 0x14(r31) -/* 802CAF94 48 00 00 40 */ b lbl_802CAFD4 -lbl_802CAF98: -/* 802CAF98 C0 A2 C4 7C */ lfs f5, lit_3590(r2) -/* 802CAF9C EC 05 00 32 */ fmuls f0, f5, f0 -/* 802CAFA0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802CAFA4 40 80 00 28 */ bge lbl_802CAFCC -/* 802CAFA8 FC 20 10 90 */ fmr f1, f2 -/* 802CAFAC FC 40 00 90 */ fmr f2, f0 -/* 802CAFB0 C0 0D 83 18 */ lfs f0, sStickHigh(r13) -/* 802CAFB4 EC 65 00 32 */ fmuls f3, f5, f0 -/* 802CAFB8 C0 82 C4 60 */ lfs f4, lit_3485(r2) -/* 802CAFBC 38 60 00 00 */ li r3, 0 -/* 802CAFC0 4B FD E6 CD */ bl linearTransform__6Z2CalcFfffffb -/* 802CAFC4 D0 3F 00 14 */ stfs f1, 0x14(r31) -/* 802CAFC8 48 00 00 0C */ b lbl_802CAFD4 -lbl_802CAFCC: -/* 802CAFCC C0 02 C4 60 */ lfs f0, lit_3485(r2) -/* 802CAFD0 D0 1F 00 14 */ stfs f0, 0x14(r31) -lbl_802CAFD4: -/* 802CAFD4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802CAFD8 41 82 00 6C */ beq lbl_802CB044 -/* 802CAFDC 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 802CAFE0 88 0D 83 0E */ lbz r0, data_8045088E(r13) -/* 802CAFE4 7C 03 00 40 */ cmplw r3, r0 -/* 802CAFE8 40 81 00 24 */ ble lbl_802CB00C -/* 802CAFEC 3C 60 00 01 */ lis r3, 0x0001 /* 0x00010035@ha */ -/* 802CAFF0 38 03 00 35 */ addi r0, r3, 0x0035 /* 0x00010035@l */ -/* 802CAFF4 90 01 00 0C */ stw r0, 0xc(r1) -/* 802CAFF8 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) -/* 802CAFFC 38 81 00 0C */ addi r4, r1, 0xc -/* 802CB000 7F E5 FB 78 */ mr r5, r31 -/* 802CB004 38 C0 00 00 */ li r6, 0 -/* 802CB008 4B FD 7F E5 */ bl func_802A2FEC -lbl_802CB00C: -/* 802CB00C 80 1F 00 00 */ lwz r0, 0(r31) -/* 802CB010 28 00 00 00 */ cmplwi r0, 0 -/* 802CB014 41 82 00 20 */ beq lbl_802CB034 -/* 802CB018 7F E3 FB 78 */ mr r3, r31 -/* 802CB01C C0 22 C4 60 */ lfs f1, lit_3485(r2) -/* 802CB020 FC 40 08 90 */ fmr f2, f1 -/* 802CB024 4B FF FC B1 */ bl calcPitchMod__13Z2WolfHowlMgrFff -/* 802CB028 7F E3 FB 78 */ mr r3, r31 -/* 802CB02C FC 20 F8 90 */ fmr f1, f31 -/* 802CB030 4B FF FB BD */ bl calcVolumeMod__13Z2WolfHowlMgrFf -lbl_802CB034: -/* 802CB034 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 802CB038 38 03 00 01 */ addi r0, r3, 1 -/* 802CB03C 90 1F 00 88 */ stw r0, 0x88(r31) -/* 802CB040 48 00 00 98 */ b lbl_802CB0D8 -lbl_802CB044: -/* 802CB044 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 802CB048 88 0D 83 0E */ lbz r0, data_8045088E(r13) -/* 802CB04C 7C 03 00 40 */ cmplw r3, r0 -/* 802CB050 40 81 00 80 */ ble lbl_802CB0D0 -/* 802CB054 88 1F 00 8C */ lbz r0, 0x8c(r31) -/* 802CB058 28 00 00 1E */ cmplwi r0, 0x1e -/* 802CB05C 40 80 00 68 */ bge lbl_802CB0C4 -/* 802CB060 3C 60 00 01 */ lis r3, 0x0001 /* 0x00010035@ha */ -/* 802CB064 38 03 00 35 */ addi r0, r3, 0x0035 /* 0x00010035@l */ -/* 802CB068 90 01 00 08 */ stw r0, 8(r1) -/* 802CB06C 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) -/* 802CB070 38 81 00 08 */ addi r4, r1, 8 -/* 802CB074 7F E5 FB 78 */ mr r5, r31 -/* 802CB078 38 C0 00 00 */ li r6, 0 -/* 802CB07C 4B FD 7F 71 */ bl func_802A2FEC -/* 802CB080 80 1F 00 00 */ lwz r0, 0(r31) -/* 802CB084 28 00 00 00 */ cmplwi r0, 0 -/* 802CB088 41 82 00 20 */ beq lbl_802CB0A8 -/* 802CB08C 7F E3 FB 78 */ mr r3, r31 -/* 802CB090 C0 22 C4 60 */ lfs f1, lit_3485(r2) -/* 802CB094 FC 40 08 90 */ fmr f2, f1 -/* 802CB098 4B FF FC 3D */ bl calcPitchMod__13Z2WolfHowlMgrFff -/* 802CB09C 7F E3 FB 78 */ mr r3, r31 -/* 802CB0A0 FC 20 F8 90 */ fmr f1, f31 -/* 802CB0A4 4B FF FB 49 */ bl calcVolumeMod__13Z2WolfHowlMgrFf -lbl_802CB0A8: -/* 802CB0A8 88 7F 00 8C */ lbz r3, 0x8c(r31) -/* 802CB0AC 38 03 00 01 */ addi r0, r3, 1 -/* 802CB0B0 98 1F 00 8C */ stb r0, 0x8c(r31) -/* 802CB0B4 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 802CB0B8 38 03 00 01 */ addi r0, r3, 1 -/* 802CB0BC 90 1F 00 88 */ stw r0, 0x88(r31) -/* 802CB0C0 48 00 00 18 */ b lbl_802CB0D8 -lbl_802CB0C4: -/* 802CB0C4 7F E3 FB 78 */ mr r3, r31 -/* 802CB0C8 4B FF FA C5 */ bl resetState__13Z2WolfHowlMgrFv -/* 802CB0CC 48 00 00 0C */ b lbl_802CB0D8 -lbl_802CB0D0: -/* 802CB0D0 7F E3 FB 78 */ mr r3, r31 -/* 802CB0D4 4B FF FA B9 */ bl resetState__13Z2WolfHowlMgrFv -lbl_802CB0D8: -/* 802CB0D8 7F E3 FB 78 */ mr r3, r31 -/* 802CB0DC 48 00 02 B1 */ bl checkLine__13Z2WolfHowlMgrFv -/* 802CB0E0 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 802CB0E4 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 802CB0E8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802CB0EC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802CB0F0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802CB0F4 7C 08 03 A6 */ mtlr r0 -/* 802CB0F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CB0FC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/ConvDzb__4cBgSFPv.s b/asm/d/bg/d_bg_s/ConvDzb__4cBgSFPv.s deleted file mode 100644 index 682665ac949..00000000000 --- a/asm/d/bg/d_bg_s/ConvDzb__4cBgSFPv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80074578: -/* 80074578 80 83 00 30 */ lwz r4, 0x30(r3) -/* 8007457C 54 80 00 01 */ rlwinm. r0, r4, 0, 0, 0 -/* 80074580 4C 82 00 20 */ bnelr -/* 80074584 64 80 80 00 */ oris r0, r4, 0x8000 -/* 80074588 90 03 00 30 */ stw r0, 0x30(r3) -/* 8007458C 48 00 00 08 */ b lbl_80074594 -/* 80074590 4E 80 00 20 */ blr -lbl_80074594: -/* 80074594 80 03 00 04 */ lwz r0, 4(r3) -/* 80074598 28 00 00 00 */ cmplwi r0, 0 -/* 8007459C 41 82 00 0C */ beq lbl_800745A8 -/* 800745A0 7C 00 1A 14 */ add r0, r0, r3 -/* 800745A4 90 03 00 04 */ stw r0, 4(r3) -lbl_800745A8: -/* 800745A8 80 03 00 0C */ lwz r0, 0xc(r3) -/* 800745AC 7C 00 1A 14 */ add r0, r0, r3 -/* 800745B0 90 03 00 0C */ stw r0, 0xc(r3) -/* 800745B4 80 03 00 14 */ lwz r0, 0x14(r3) -/* 800745B8 7C 00 1A 14 */ add r0, r0, r3 -/* 800745BC 90 03 00 14 */ stw r0, 0x14(r3) -/* 800745C0 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 800745C4 7C 00 1A 14 */ add r0, r0, r3 -/* 800745C8 90 03 00 1C */ stw r0, 0x1c(r3) -/* 800745CC 80 03 00 24 */ lwz r0, 0x24(r3) -/* 800745D0 7C 00 1A 14 */ add r0, r0, r3 -/* 800745D4 90 03 00 24 */ stw r0, 0x24(r3) -/* 800745D8 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 800745DC 7C 00 1A 14 */ add r0, r0, r3 -/* 800745E0 90 03 00 2C */ stw r0, 0x2c(r3) -/* 800745E4 38 C0 00 00 */ li r6, 0 -/* 800745E8 38 80 00 00 */ li r4, 0 -/* 800745EC 48 00 00 1C */ b lbl_80074608 -lbl_800745F0: -/* 800745F0 80 A3 00 24 */ lwz r5, 0x24(r3) -/* 800745F4 7C 05 20 2E */ lwzx r0, r5, r4 -/* 800745F8 7C 03 02 14 */ add r0, r3, r0 -/* 800745FC 7C 05 21 2E */ stwx r0, r5, r4 -/* 80074600 38 C6 00 01 */ addi r6, r6, 1 -/* 80074604 38 84 00 34 */ addi r4, r4, 0x34 -lbl_80074608: -/* 80074608 80 03 00 20 */ lwz r0, 0x20(r3) -/* 8007460C 7C 06 00 00 */ cmpw r6, r0 -/* 80074610 41 80 FF E0 */ blt lbl_800745F0 -/* 80074614 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetRoomId__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetRoomId__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index c7866572497..00000000000 --- a/asm/d/bg/d_bg_s/GetRoomId__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80075100: -/* 80075100 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075104 7C 08 02 A6 */ mflr r0 -/* 80075108 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007510C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075110 48 2E D0 CD */ bl _savegpr_29 -/* 80075114 7C 7D 1B 78 */ mr r29, r3 -/* 80075118 7C 9E 23 78 */ mr r30, r4 -/* 8007511C 7F C3 F3 78 */ mr r3, r30 -/* 80075120 48 1F 2F D9 */ bl ChkSetInfo__13cBgS_PolyInfoCFv -/* 80075124 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075128 40 82 00 0C */ bne lbl_80075134 -/* 8007512C 38 60 FF FF */ li r3, -1 -/* 80075130 48 00 00 54 */ b lbl_80075184 -lbl_80075134: -/* 80075134 A3 FE 00 02 */ lhz r31, 2(r30) -/* 80075138 7F A3 EB 78 */ mr r3, r29 -/* 8007513C 7F C4 F3 78 */ mr r4, r30 -/* 80075140 4B FF F5 21 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo -/* 80075144 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075148 40 82 00 0C */ bne lbl_80075154 -/* 8007514C 38 60 FF FF */ li r3, -1 -/* 80075150 48 00 00 34 */ b lbl_80075184 -lbl_80075154: -/* 80075154 1C 1F 00 14 */ mulli r0, r31, 0x14 -/* 80075158 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 8007515C 88 03 00 09 */ lbz r0, 9(r3) -/* 80075160 7C 03 03 78 */ mr r3, r0 -/* 80075164 2C 00 00 FF */ cmpwi r0, 0xff -/* 80075168 40 82 00 1C */ bne lbl_80075184 -/* 8007516C 7F A3 EB 78 */ mr r3, r29 -/* 80075170 7F C4 F3 78 */ mr r4, r30 -/* 80075174 4B FF F5 81 */ bl GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo -/* 80075178 2C 03 00 FF */ cmpwi r3, 0xff -/* 8007517C 40 82 00 08 */ bne lbl_80075184 -/* 80075180 38 60 FF FF */ li r3, -1 -lbl_80075184: -/* 80075184 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075188 48 2E D0 A1 */ bl _restgpr_29 -/* 8007518C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075190 7C 08 03 A6 */ mtlr r0 -/* 80075194 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075198 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s b/asm/d/bg/d_bg_s/PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s deleted file mode 100644 index 33be153ef60..00000000000 --- a/asm/d/bg/d_bg_s/PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80075C6C: -/* 80075C6C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075C70 7C 08 02 A6 */ mflr r0 -/* 80075C74 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075C78 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075C7C 48 2E C5 55 */ bl _savegpr_26 -/* 80075C80 7C 7A 1B 78 */ mr r26, r3 -/* 80075C84 7C BB 2B 78 */ mr r27, r5 -/* 80075C88 7C DC 33 78 */ mr r28, r6 -/* 80075C8C 7C FD 3B 78 */ mr r29, r7 -/* 80075C90 A0 04 00 02 */ lhz r0, 2(r4) -/* 80075C94 1F E0 00 14 */ mulli r31, r0, 0x14 -/* 80075C98 7F DA F8 2E */ lwzx r30, r26, r31 -/* 80075C9C 7F C3 F3 78 */ mr r3, r30 -/* 80075CA0 48 1F 25 35 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80075CA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075CA8 40 82 00 0C */ bne lbl_80075CB4 -/* 80075CAC 38 60 00 00 */ li r3, 0 -/* 80075CB0 48 00 00 44 */ b lbl_80075CF4 -lbl_80075CB4: -/* 80075CB4 7C 7A FA 14 */ add r3, r26, r31 -/* 80075CB8 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80075CBC 28 03 00 00 */ cmplwi r3, 0 -/* 80075CC0 40 82 00 0C */ bne lbl_80075CCC -/* 80075CC4 38 60 00 00 */ li r3, 0 -/* 80075CC8 48 00 00 2C */ b lbl_80075CF4 -lbl_80075CCC: -/* 80075CCC 81 9E 00 10 */ lwz r12, 0x10(r30) -/* 80075CD0 28 0C 00 00 */ cmplwi r12, 0 -/* 80075CD4 40 82 00 0C */ bne lbl_80075CE0 -/* 80075CD8 38 60 00 00 */ li r3, 0 -/* 80075CDC 48 00 00 18 */ b lbl_80075CF4 -lbl_80075CE0: -/* 80075CE0 7F 64 DB 78 */ mr r4, r27 -/* 80075CE4 7F 85 E3 78 */ mr r5, r28 -/* 80075CE8 7F A6 EB 78 */ mr r6, r29 -/* 80075CEC 7D 89 03 A6 */ mtctr r12 -/* 80075CF0 4E 80 04 21 */ bctrl -lbl_80075CF4: -/* 80075CF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075CF8 48 2E C5 25 */ bl _restgpr_26 -/* 80075CFC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075D00 7C 08 03 A6 */ mtlr r0 -/* 80075D04 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075D08 4E 80 00 20 */ blr diff --git a/asm/dolphin/mtx/quat/C_QUATRotAxisRad.s b/asm/dolphin/mtx/quat/C_QUATRotAxisRad.s deleted file mode 100644 index 12babc3285a..00000000000 --- a/asm/dolphin/mtx/quat/C_QUATRotAxisRad.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80347474: -/* 80347474 7C 08 02 A6 */ mflr r0 -/* 80347478 90 01 00 04 */ stw r0, 4(r1) -/* 8034747C 94 21 FF C8 */ stwu r1, -0x38(r1) -/* 80347480 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80347484 DB C1 00 28 */ stfd f30, 0x28(r1) -/* 80347488 FF C0 08 90 */ fmr f30, f1 -/* 8034748C 93 E1 00 24 */ stw r31, 0x24(r1) -/* 80347490 3B E3 00 00 */ addi r31, r3, 0 -/* 80347494 38 64 00 00 */ addi r3, r4, 0 -/* 80347498 38 81 00 14 */ addi r4, r1, 0x14 -/* 8034749C 4B FF FC 59 */ bl PSVECNormalize -/* 803474A0 C0 02 CB 58 */ lfs f0, lit_135(r2) -/* 803474A4 EF C0 07 B2 */ fmuls f30, f0, f30 -/* 803474A8 FC 20 F0 90 */ fmr f1, f30 -/* 803474AC 48 02 55 3D */ bl sinf -/* 803474B0 FF E0 08 90 */ fmr f31, f1 -/* 803474B4 FC 20 F0 90 */ fmr f1, f30 -/* 803474B8 48 02 55 55 */ bl cosf -/* 803474BC C0 01 00 14 */ lfs f0, 0x14(r1) -/* 803474C0 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 803474C4 D0 1F 00 00 */ stfs f0, 0(r31) -/* 803474C8 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 803474CC EC 1F 00 32 */ fmuls f0, f31, f0 -/* 803474D0 D0 1F 00 04 */ stfs f0, 4(r31) -/* 803474D4 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 803474D8 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 803474DC D0 1F 00 08 */ stfs f0, 8(r31) -/* 803474E0 D0 3F 00 0C */ stfs f1, 0xc(r31) -/* 803474E4 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 803474E8 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 803474EC CB C1 00 28 */ lfd f30, 0x28(r1) -/* 803474F0 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 803474F4 38 21 00 38 */ addi r1, r1, 0x38 -/* 803474F8 7C 08 03 A6 */ mtlr r0 -/* 803474FC 4E 80 00 20 */ blr diff --git a/asm/dolphin/mtx/quat/C_QUATSlerp.s b/asm/dolphin/mtx/quat/C_QUATSlerp.s deleted file mode 100644 index e1a079b16ae..00000000000 --- a/asm/dolphin/mtx/quat/C_QUATSlerp.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_80347500: -/* 80347500 7C 08 02 A6 */ mflr r0 -/* 80347504 90 01 00 04 */ stw r0, 4(r1) -/* 80347508 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8034750C DB E1 00 48 */ stfd f31, 0x48(r1) -/* 80347510 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 80347514 DB A1 00 38 */ stfd f29, 0x38(r1) -/* 80347518 FF A0 08 90 */ fmr f29, f1 -/* 8034751C DB 81 00 30 */ stfd f28, 0x30(r1) -/* 80347520 DB 61 00 28 */ stfd f27, 0x28(r1) -/* 80347524 93 E1 00 24 */ stw r31, 0x24(r1) -/* 80347528 7C BF 2B 78 */ mr r31, r5 -/* 8034752C 93 C1 00 20 */ stw r30, 0x20(r1) -/* 80347530 7C 9E 23 78 */ mr r30, r4 -/* 80347534 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 80347538 7C 7D 1B 78 */ mr r29, r3 -/* 8034753C C0 83 00 00 */ lfs f4, 0(r3) -/* 80347540 C0 64 00 00 */ lfs f3, 0(r4) -/* 80347544 C0 43 00 04 */ lfs f2, 4(r3) -/* 80347548 C0 24 00 04 */ lfs f1, 4(r4) -/* 8034754C EC 64 00 F2 */ fmuls f3, f4, f3 -/* 80347550 C0 83 00 08 */ lfs f4, 8(r3) -/* 80347554 EC 22 00 72 */ fmuls f1, f2, f1 -/* 80347558 C0 44 00 08 */ lfs f2, 8(r4) -/* 8034755C C0 C3 00 0C */ lfs f6, 0xc(r3) -/* 80347560 EC 44 00 B2 */ fmuls f2, f4, f2 -/* 80347564 C0 A4 00 0C */ lfs f5, 0xc(r4) -/* 80347568 EC 23 08 2A */ fadds f1, f3, f1 -/* 8034756C C0 02 CB 50 */ lfs f0, lit_130(r2) -/* 80347570 EC 66 01 72 */ fmuls f3, f6, f5 -/* 80347574 C3 C2 CB 54 */ lfs f30, lit_133(r2) -/* 80347578 EC 22 08 2A */ fadds f1, f2, f1 -/* 8034757C EC 23 08 2A */ fadds f1, f3, f1 -/* 80347580 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80347584 40 80 00 0C */ bge lbl_80347590 -/* 80347588 FC 20 08 50 */ fneg f1, f1 -/* 8034758C FF C0 F0 50 */ fneg f30, f30 -lbl_80347590: -/* 80347590 C0 02 CB 5C */ lfs f0, lit_261(r2) -/* 80347594 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80347598 4C 40 13 82 */ cror 2, 0, 2 -/* 8034759C 40 82 00 3C */ bne lbl_803475D8 -/* 803475A0 48 02 54 91 */ bl acosf -/* 803475A4 FF 60 08 90 */ fmr f27, f1 -/* 803475A8 48 02 54 41 */ bl sinf -/* 803475AC C0 02 CB 54 */ lfs f0, lit_133(r2) -/* 803475B0 FF 80 08 90 */ fmr f28, f1 -/* 803475B4 EC 00 E8 28 */ fsubs f0, f0, f29 -/* 803475B8 EC 20 06 F2 */ fmuls f1, f0, f27 -/* 803475BC 48 02 54 2D */ bl sinf -/* 803475C0 EF E1 E0 24 */ fdivs f31, f1, f28 -/* 803475C4 EC 3D 06 F2 */ fmuls f1, f29, f27 -/* 803475C8 48 02 54 21 */ bl sinf -/* 803475CC EC 01 E0 24 */ fdivs f0, f1, f28 -/* 803475D0 EF DE 00 32 */ fmuls f30, f30, f0 -/* 803475D4 48 00 00 10 */ b lbl_803475E4 -lbl_803475D8: -/* 803475D8 C0 02 CB 54 */ lfs f0, lit_133(r2) -/* 803475DC EF DE 07 72 */ fmuls f30, f30, f29 -/* 803475E0 EF E0 E8 28 */ fsubs f31, f0, f29 -lbl_803475E4: -/* 803475E4 C0 3D 00 00 */ lfs f1, 0(r29) -/* 803475E8 C0 1E 00 00 */ lfs f0, 0(r30) -/* 803475EC EC 3F 00 72 */ fmuls f1, f31, f1 -/* 803475F0 EC 1E 00 32 */ fmuls f0, f30, f0 -/* 803475F4 EC 01 00 2A */ fadds f0, f1, f0 -/* 803475F8 D0 1F 00 00 */ stfs f0, 0(r31) -/* 803475FC C0 3D 00 04 */ lfs f1, 4(r29) -/* 80347600 C0 1E 00 04 */ lfs f0, 4(r30) -/* 80347604 EC 3F 00 72 */ fmuls f1, f31, f1 -/* 80347608 EC 1E 00 32 */ fmuls f0, f30, f0 -/* 8034760C EC 01 00 2A */ fadds f0, f1, f0 -/* 80347610 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80347614 C0 3D 00 08 */ lfs f1, 8(r29) -/* 80347618 C0 1E 00 08 */ lfs f0, 8(r30) -/* 8034761C EC 3F 00 72 */ fmuls f1, f31, f1 -/* 80347620 EC 1E 00 32 */ fmuls f0, f30, f0 -/* 80347624 EC 01 00 2A */ fadds f0, f1, f0 -/* 80347628 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8034762C C0 3D 00 0C */ lfs f1, 0xc(r29) -/* 80347630 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 80347634 EC 3F 00 72 */ fmuls f1, f31, f1 -/* 80347638 EC 1E 00 32 */ fmuls f0, f30, f0 -/* 8034763C EC 01 00 2A */ fadds f0, f1, f0 -/* 80347640 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 80347644 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80347648 CB E1 00 48 */ lfd f31, 0x48(r1) -/* 8034764C CB C1 00 40 */ lfd f30, 0x40(r1) -/* 80347650 CB A1 00 38 */ lfd f29, 0x38(r1) -/* 80347654 CB 81 00 30 */ lfd f28, 0x30(r1) -/* 80347658 CB 61 00 28 */ lfd f27, 0x28(r1) -/* 8034765C 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 80347660 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 80347664 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 80347668 38 21 00 50 */ addi r1, r1, 0x50 -/* 8034766C 7C 08 03 A6 */ mtlr r0 -/* 80347670 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index cbc20652b69..11920298540 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -138,7 +138,7 @@ public: virtual void deleteObject(); private: - /* 0x90 */ // Z2RideSoundStarter mSoundStarter; + /* 0x90 */ // Z2RideSoundStarter mSoundStarter; /* 0x98 */ bool mLinkRiding; }; // Size: 0x9C @@ -162,7 +162,25 @@ public: private: /* 0x90 */ JSULink mLink; /* 0xA0 */ u8 mEnemyID; - /* 0xA1 */ u8 field_0xa1; + /* 0xA1 */ s8 field_0xa1; + /* 0xA2 */ bool mLinkSearch; + /* 0xA3 */ u8 field_0xa3; +}; // Size: 0xA4 + +class Z2CreatureCitizen : public Z2Creature { +public: + /* 802C0C10 */ Z2CreatureCitizen(); + /* 802C0C6C */ ~Z2CreatureCitizen(); + /* 802C0CE4 */ void init(Vec*, Vec*, u8, u8); + /* 802C0D04 */ virtual void deleteObject(); + /* 802C0D48 */ void setMdlType(s8, bool, bool); + /* 802C0E18 */ void playVoice(int); + /* 802C0ED8 */ virtual void startCreatureVoice(JAISoundID, s8); + +private: + /* 0x90 */ JSULink mLink; + /* 0xA0 */ s8 mCitizenID; + /* 0xA1 */ s8 field_0xa1; /* 0xA2 */ bool mLinkSearch; /* 0xA3 */ u8 field_0xa3; }; // Size: 0xA4 diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index 412bb5cbd4e..8c1c24d5a29 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/libs/Z2AudioLib/Z2Creature.cpp @@ -4,6 +4,10 @@ // #include "Z2AudioLib/Z2Creature.h" +#include "Z2AudioLib/Z2SceneMgr.h" +#include "Z2AudioLib/Z2SeMgr.h" +#include "Z2AudioLib/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2StatusMgr.h" #include "dol2asm.h" // @@ -14,11 +18,6 @@ struct Z2SpeechMgr2 { /* 802CCF88 */ void isMidnaSpeak(); }; -struct Z2SoundObjMgr { - /* 802C0074 */ void getEnemyID(char const*, JSULink*); - /* 802C0190 */ void removeEnemy(JSULink*); -}; - struct Z2SoundObjBeeGroup { /* 802C1D10 */ Z2SoundObjBeeGroup(); /* 802C1D4C */ void init(Vec*, u8); @@ -33,12 +32,6 @@ struct Z2SeqMgr { /* 802B4AFC */ void setBattleLastHit(u8); }; -struct Z2SeMgr { - /* 802AB93C */ void incrCrowdSize(); - /* 802AB960 */ void decrCrowdSize(); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - struct Z2CreatureSumomo { /* 802C1BE8 */ Z2CreatureSumomo(); /* 802C1C24 */ void playSumomoBgm(u32); @@ -70,16 +63,6 @@ struct Z2CreatureFM { /* 802C2290 */ void startChainSoundLevel(JAISoundID, u8, f32, u32, s8); }; -struct Z2CreatureCitizen { - /* 802C0C10 */ Z2CreatureCitizen(); - /* 802C0C6C */ ~Z2CreatureCitizen(); - /* 802C0CE4 */ void init(Vec*, Vec*, u8, u8); - /* 802C0D04 */ void deleteObject(); - /* 802C0D48 */ void setMdlType(s8, bool, bool); - /* 802C0E18 */ void playVoice(int); - /* 802C0ED8 */ void startCreatureVoice(JAISoundID, s8); -}; - struct Z2Calc { struct CurveSign {}; @@ -553,86 +536,62 @@ asm Z2Creature::~Z2Creature() { #pragma pop /* 802C04E8-802C0530 2BAE28 0048+00 4/2 2/2 0/0 .text deleteObject__10Z2CreatureFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::deleteObject() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/deleteObject__10Z2CreatureFv.s" +void Z2Creature::deleteObject() { + mSoundObjAnime.field_0x20 = NULL; + mSoundObjAnime.deleteObject(); + mSoundObjSimple1.deleteObject(); + mSoundObjSimple2.deleteObject(); } -#pragma pop /* 802C0530-802C05B0 2BAE70 0080+00 5/5 1/1 125/125 .text init__10Z2CreatureFP3VecP3VecUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/init__10Z2CreatureFP3VecP3VecUcUc.s" +void Z2Creature::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { + if (param_0) { + mSoundObjAnime.init(param_0, param_2); + mpPos = param_0; + } + if (param_1) { + mSoundObjSimple1.init(param_1, param_3); + } } -#pragma pop /* 802C05B0-802C0618 2BAEF0 0068+00 2/2 1/1 0/0 .text init__10Z2CreatureFP3VecP3VecP3VecUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::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__10Z2CreatureFP3VecP3VecP3VecUcUcUc.s" +void Z2Creature::init(Vec* param_0, Vec* param_1, Vec* param_2, u8 param_3, u8 param_4, + u8 param_5) { + init(param_0, param_1, param_3, param_4); + if (param_2) { + mSoundObjSimple2.init(param_2, param_5); + } } -#pragma pop /* 802C0618-802C0628 2BAF58 0010+00 7/0 2/0 0/0 .text * setSoundStarter__10Z2CreatureFP14Z2SoundStarter */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::setSoundStarter(Z2SoundStarter* param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/setSoundStarter__10Z2CreatureFP14Z2SoundStarter.s" +void Z2Creature::setSoundStarter(Z2SoundStarter* i_starter) { + mSoundObjAnime.setSoundStarter(i_starter); + mSoundObjSimple1.setSoundStarter(i_starter); + mSoundObjSimple2.setSoundStarter(i_starter); } -#pragma pop /* 802C0628-802C064C 2BAF68 0024+00 0/0 4/4 2/2 .text initAnime__10Z2CreatureFPvbff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::initAnime(void* param_0, bool param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/initAnime__10Z2CreatureFPvbff.s" +void Z2Creature::initAnime(void* param_0, bool param_1, f32 param_2, f32 param_3) { + mSoundObjAnime.initAnime(param_0, param_1, param_2, param_3); } -#pragma pop /* 802C064C-802C06D0 2BAF8C 0084+00 7/3 2/1 0/0 .text framework__10Z2CreatureFUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::framework(u32 param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/framework__10Z2CreatureFUlSc.s" +void Z2Creature::framework(u32 param_0, s8 param_1) { + mSoundObjAnime.framework(param_0, param_1); + mSoundObjSimple1.framework(param_0, param_1); + mSoundObjSimple2.framework(param_0, param_1); } -#pragma pop /* 802C06D0-802C06F4 2BB010 0024+00 0/0 3/3 2/2 .text updateAnime__10Z2CreatureFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::updateAnime(f32 param_0, f32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/updateAnime__10Z2CreatureFff.s" +void Z2Creature::updateAnime(f32 param_0, f32 param_1) { + mSoundObjAnime.updateAnime(param_0, param_1); } -#pragma pop /* 802C06F4-802C0720 2BB034 002C+00 0/0 0/0 7/7 .text stopAnime__10Z2CreatureFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::stopAnime() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/stopAnime__10Z2CreatureFv.s" +void Z2Creature::stopAnime() { + deleteObject(); } -#pragma pop /* ############################################################################################## */ /* 80455BD8-80455BDC 0041D8 0004+00 1/1 0/0 0/0 .sdata2 sAreaDefault */ @@ -766,36 +725,20 @@ asm void Z2Creature::startCreatureVoiceLevel(JAISoundID param_0, s8 param_1) { /* 802C0B70-802C0BAC 2BB4B0 003C+00 4/0 2/0 0/0 .text * startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::startCreatureExtraSound(JAISoundID param_0, u32 param_1, s8 param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc.s" +void Z2Creature::startCreatureExtraSound(JAISoundID param_0, u32 param_1, s8 param_2) { + mSoundObjSimple2.startSound(param_0, param_1, param_2); } -#pragma pop /* 802C0BAC-802C0BE8 2BB4EC 003C+00 4/0 2/0 0/0 .text * startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::startCreatureExtraSoundLevel(JAISoundID param_0, u32 param_1, s8 param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc.s" +void Z2Creature::startCreatureExtraSoundLevel(JAISoundID param_0, u32 param_1, s8 param_2) { + mSoundObjSimple2.startLevelSound(param_0, param_1, param_2); } -#pragma pop -/* 802C0BE8-802C0C10 2BB528 0028+00 4/0 2/0 0/0 .text startCollisionSE__10Z2CreatureFUlUl - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2Creature::startCollisionSE(u32 param_0, u32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCollisionSE__10Z2CreatureFUlUl.s" +/* 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); } -#pragma pop /* 802C0C10-802C0C6C 2BB550 005C+00 0/0 0/0 12/12 .text __ct__17Z2CreatureCitizenFv */ #pragma push @@ -818,25 +761,17 @@ asm Z2CreatureCitizen::~Z2CreatureCitizen() { #pragma pop /* 802C0CE4-802C0D04 2BB624 0020+00 0/0 2/2 7/7 .text init__17Z2CreatureCitizenFP3VecP3VecUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureCitizen::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/init__17Z2CreatureCitizenFP3VecP3VecUcUc.s" +void Z2CreatureCitizen::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { + Z2Creature::init(param_0, param_1, param_2, param_3); } -#pragma pop -/* 802C0D04-802C0D48 2BB644 0044+00 1/0 0/0 0/0 .text deleteObject__17Z2CreatureCitizenFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureCitizen::deleteObject() { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/deleteObject__17Z2CreatureCitizenFv.s" +/* 802C0D04-802C0D48 2BB644 0044+00 1/0 0/0 0/0 .text deleteObject__17Z2CreatureCitizenFv */ +void Z2CreatureCitizen::deleteObject() { + if (mLinkSearch == false) { + Z2GetSeMgr()->decrCrowdSize(); + } + Z2Creature::deleteObject(); } -#pragma pop /* 802C0D48-802C0E18 2BB688 00D0+00 0/0 2/2 4/4 .text setMdlType__17Z2CreatureCitizenFScbb */ #pragma push @@ -893,37 +828,24 @@ extern "C" asm void deleteObject__15Z2CreatureEnemyFv() { #pragma pop /* 802C1094-802C10B4 2BB9D4 0020+00 0/0 0/0 98/98 .text init__15Z2CreatureEnemyFP3VecP3VecUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/init__15Z2CreatureEnemyFP3VecP3VecUcUc.s" +void Z2CreatureEnemy::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { + Z2Creature::init(param_0, param_1, param_2, param_3); } -#pragma pop -/* 802C10B4-802C10D4 2BB9F4 0020+00 0/0 0/0 3/3 .text - * init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::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__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc.s" -} -#pragma pop - -/* 802C10D4-802C110C 2BBA14 0038+00 1/0 0/0 0/0 .text framework__15Z2CreatureEnemyFUlSc +/* 802C10B4-802C10D4 2BB9F4 0020+00 0/0 0/0 3/3 .text init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::framework(u32 param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/framework__15Z2CreatureEnemyFUlSc.s" +void Z2CreatureEnemy::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); +} + +/* 802C10D4-802C110C 2BBA14 0038+00 1/0 0/0 0/0 .text framework__15Z2CreatureEnemyFUlSc */ +void Z2CreatureEnemy::framework(u32 param_0, s8 param_1) { + if (field_0xa1 < 1) { + field_0xa1 += 1; + } + Z2Creature::framework(param_0, param_1); } -#pragma pop /* ############################################################################################## */ /* 80455C44-80455C48 004244 0004+00 1/1 0/0 0/0 .sdata2 @4090 */ @@ -1006,26 +928,15 @@ asm void Z2CreatureEnemy::startCreatureVoiceLevel(JAISoundID param_0, s8 param_1 /* 802C199C-802C19D8 2BC2DC 003C+00 3/0 0/0 0/0 .text * startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::startCreatureExtraSound(JAISoundID param_0, u32 param_1, s8 param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s" +void Z2CreatureEnemy::startCreatureExtraSound(JAISoundID param_0, u32 param_1, s8 param_2) { + mSoundObjSimple2.startSound(param_0, param_1, param_2); } -#pragma pop /* 802C19D8-802C1A14 2BC318 003C+00 3/0 0/0 0/0 .text * startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::startCreatureExtraSoundLevel(JAISoundID param_0, u32 param_1, - s8 param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s" +void Z2CreatureEnemy::startCreatureExtraSoundLevel(JAISoundID param_0, u32 param_1, s8 param_2) { + mSoundObjSimple2.startLevelSound(param_0, param_1, param_2); } -#pragma pop /* 802C1A14-802C1B7C 2BC354 0168+00 4/0 0/0 0/0 .text startCollisionSE__15Z2CreatureEnemyFUlUl */ #pragma push @@ -1038,14 +949,12 @@ asm void Z2CreatureEnemy::startCollisionSE(u32 param_0, u32 param_1) { #pragma pop /* 802C1B7C-802C1B90 2BC4BC 0014+00 0/0 0/0 55/55 .text setLinkSearch__15Z2CreatureEnemyFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureEnemy::setLinkSearch(bool param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2Creature/setLinkSearch__15Z2CreatureEnemyFb.s" +void Z2CreatureEnemy::setLinkSearch(bool b_search) { + if (field_0xa3 != 0) { + return; + } + mLinkSearch = b_search; } -#pragma pop /* 802C1B90-802C1BE8 2BC4D0 0058+00 0/0 0/0 72/72 .text setEnemyName__15Z2CreatureEnemyFPCc */ #pragma push @@ -1353,8 +1262,7 @@ 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 - */ +/* 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 @@ -1368,8 +1276,7 @@ static asm void Z2_B_zan_modPitch(Z2SoundHandlePool* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_Z2Creature_cpp() { - nofralloc +asm void __sinit_Z2Creature_cpp(){nofralloc #include "asm/Z2AudioLib/Z2Creature/__sinit_Z2Creature_cpp.s" } #pragma pop