diff --git a/asm/JSystem/JAudio2/JASCmdStack/__dt__Q210JASPortCmd9TPortHeadFv.s b/asm/JSystem/JAudio2/JASCmdStack/__dt__Q210JASPortCmd9TPortHeadFv.s deleted file mode 100644 index 18d04ed9888..00000000000 --- a/asm/JSystem/JAudio2/JASCmdStack/__dt__Q210JASPortCmd9TPortHeadFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_802911D0: -/* 802911D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802911D4 7C 08 02 A6 */ mflr r0 -/* 802911D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802911DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802911E0 93 C1 00 08 */ stw r30, 8(r1) -/* 802911E4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802911E8 7C 9F 23 78 */ mr r31, r4 -/* 802911EC 41 82 00 20 */ beq lbl_8029120C -/* 802911F0 41 82 00 0C */ beq lbl_802911FC -/* 802911F4 38 80 00 00 */ li r4, 0 -/* 802911F8 48 04 AC B5 */ bl __dt__10JSUPtrListFv -lbl_802911FC: -/* 802911FC 7F E0 07 35 */ extsh. r0, r31 -/* 80291200 40 81 00 0C */ ble lbl_8029120C -/* 80291204 7F C3 F3 78 */ mr r3, r30 -/* 80291208 48 03 DB 35 */ bl __dl__FPv -lbl_8029120C: -/* 8029120C 7F C3 F3 78 */ mr r3, r30 -/* 80291210 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80291214 83 C1 00 08 */ lwz r30, 8(r1) -/* 80291218 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8029121C 7C 08 03 A6 */ mtlr r0 -/* 80291220 38 21 00 10 */ addi r1, r1, 0x10 -/* 80291224 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASCmdStack/__sinit_JASCmdStack_cpp.s b/asm/JSystem/JAudio2/JASCmdStack/__sinit_JASCmdStack_cpp.s deleted file mode 100644 index 47324baa912..00000000000 --- a/asm/JSystem/JAudio2/JASCmdStack/__sinit_JASCmdStack_cpp.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8029116C: -/* 8029116C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80291170 7C 08 02 A6 */ mflr r0 -/* 80291174 90 01 00 14 */ stw r0, 0x14(r1) -/* 80291178 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8029117C 3C 60 80 43 */ lis r3, lit_80@ha /* 0x80431678@ha */ -/* 80291180 3B E3 16 78 */ addi r31, r3, lit_80@l /* 0x80431678@l */ -/* 80291184 38 7F 00 0C */ addi r3, r31, 0xc -/* 80291188 48 04 AD 8D */ bl initiate__10JSUPtrListFv -/* 8029118C 38 7F 00 0C */ addi r3, r31, 0xc -/* 80291190 3C 80 80 29 */ lis r4, __dt__Q210JASPortCmd9TPortHeadFv@ha /* 0x802911D0@ha */ -/* 80291194 38 84 11 D0 */ addi r4, r4, __dt__Q210JASPortCmd9TPortHeadFv@l /* 0x802911D0@l */ -/* 80291198 38 BF 00 00 */ addi r5, r31, 0 -/* 8029119C 48 0D 0A 89 */ bl __register_global_object -/* 802911A0 38 7F 00 24 */ addi r3, r31, 0x24 -/* 802911A4 48 04 AD 71 */ bl initiate__10JSUPtrListFv -/* 802911A8 38 7F 00 24 */ addi r3, r31, 0x24 -/* 802911AC 3C 80 80 29 */ lis r4, __dt__Q210JASPortCmd9TPortHeadFv@ha /* 0x802911D0@ha */ -/* 802911B0 38 84 11 D0 */ addi r4, r4, __dt__Q210JASPortCmd9TPortHeadFv@l /* 0x802911D0@l */ -/* 802911B4 38 BF 00 18 */ addi r5, r31, 0x18 -/* 802911B8 48 0D 0A 6D */ bl __register_global_object -/* 802911BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802911C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802911C4 7C 08 03 A6 */ mtlr r0 -/* 802911C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802911CC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASCmdStack/execAllCommand__10JASPortCmdFv.s b/asm/JSystem/JAudio2/JASCmdStack/execAllCommand__10JASPortCmdFv.s deleted file mode 100644 index f5116a11433..00000000000 --- a/asm/JSystem/JAudio2/JASCmdStack/execAllCommand__10JASPortCmdFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80291060: -/* 80291060 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80291064 7C 08 02 A6 */ mflr r0 -/* 80291068 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029106C 3C 60 80 43 */ lis r3, sCommandListOnce__10JASPortCmd@ha /* 0x80431684@ha */ -/* 80291070 38 63 16 84 */ addi r3, r3, sCommandListOnce__10JASPortCmd@l /* 0x80431684@l */ -/* 80291074 48 00 00 21 */ bl execCommandOnce__Q210JASPortCmd9TPortHeadFv -/* 80291078 3C 60 80 43 */ lis r3, sCommandListStay__10JASPortCmd@ha /* 0x8043169C@ha */ -/* 8029107C 38 63 16 9C */ addi r3, r3, sCommandListStay__10JASPortCmd@l /* 0x8043169C@l */ -/* 80291080 48 00 00 8D */ bl execCommandStay__Q210JASPortCmd9TPortHeadFv -/* 80291084 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80291088 7C 08 03 A6 */ mtlr r0 -/* 8029108C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80291090 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASCmdStack/execCommandOnce__Q210JASPortCmd9TPortHeadFv.s b/asm/JSystem/JAudio2/JASCmdStack/execCommandOnce__Q210JASPortCmd9TPortHeadFv.s deleted file mode 100644 index 0bc861ea732..00000000000 --- a/asm/JSystem/JAudio2/JASCmdStack/execCommandOnce__Q210JASPortCmd9TPortHeadFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80291094: -/* 80291094 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80291098 7C 08 02 A6 */ mflr r0 -/* 8029109C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802910A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802910A4 48 0D 11 39 */ bl _savegpr_29 -/* 802910A8 7C 7D 1B 78 */ mr r29, r3 -/* 802910AC 48 0A C6 49 */ bl OSDisableInterrupts -/* 802910B0 90 61 00 08 */ stw r3, 8(r1) -/* 802910B4 83 DD 00 00 */ lwz r30, 0(r29) -/* 802910B8 48 00 00 2C */ b lbl_802910E4 -lbl_802910BC: -/* 802910BC 83 FE 00 0C */ lwz r31, 0xc(r30) -/* 802910C0 80 9E 00 00 */ lwz r4, 0(r30) -/* 802910C4 80 64 00 14 */ lwz r3, 0x14(r4) -/* 802910C8 81 84 00 10 */ lwz r12, 0x10(r4) -/* 802910CC 7D 89 03 A6 */ mtctr r12 -/* 802910D0 4E 80 04 21 */ bctrl -/* 802910D4 7F A3 EB 78 */ mr r3, r29 -/* 802910D8 7F C4 F3 78 */ mr r4, r30 -/* 802910DC 48 04 B0 81 */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802910E0 7F FE FB 78 */ mr r30, r31 -lbl_802910E4: -/* 802910E4 28 1E 00 00 */ cmplwi r30, 0 -/* 802910E8 40 82 FF D4 */ bne lbl_802910BC -/* 802910EC 80 61 00 08 */ lwz r3, 8(r1) -/* 802910F0 48 0A C6 2D */ bl OSRestoreInterrupts -/* 802910F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802910F8 48 0D 11 31 */ bl _restgpr_29 -/* 802910FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80291100 7C 08 03 A6 */ mtlr r0 -/* 80291104 38 21 00 20 */ addi r1, r1, 0x20 -/* 80291108 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASCmdStack/execCommandStay__Q210JASPortCmd9TPortHeadFv.s b/asm/JSystem/JAudio2/JASCmdStack/execCommandStay__Q210JASPortCmd9TPortHeadFv.s deleted file mode 100644 index 31a646bd368..00000000000 --- a/asm/JSystem/JAudio2/JASCmdStack/execCommandStay__Q210JASPortCmd9TPortHeadFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8029110C: -/* 8029110C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80291110 7C 08 02 A6 */ mflr r0 -/* 80291114 90 01 00 24 */ stw r0, 0x24(r1) -/* 80291118 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8029111C 7C 7F 1B 78 */ mr r31, r3 -/* 80291120 48 0A C5 D5 */ bl OSDisableInterrupts -/* 80291124 90 61 00 08 */ stw r3, 8(r1) -/* 80291128 83 FF 00 00 */ lwz r31, 0(r31) -/* 8029112C 48 00 00 1C */ b lbl_80291148 -lbl_80291130: -/* 80291130 80 9F 00 00 */ lwz r4, 0(r31) -/* 80291134 80 64 00 14 */ lwz r3, 0x14(r4) -/* 80291138 81 84 00 10 */ lwz r12, 0x10(r4) -/* 8029113C 7D 89 03 A6 */ mtctr r12 -/* 80291140 4E 80 04 21 */ bctrl -/* 80291144 83 FF 00 0C */ lwz r31, 0xc(r31) -lbl_80291148: -/* 80291148 28 1F 00 00 */ cmplwi r31, 0 -/* 8029114C 40 82 FF E4 */ bne lbl_80291130 -/* 80291150 80 61 00 08 */ lwz r3, 8(r1) -/* 80291154 48 0A C5 C9 */ bl OSRestoreInterrupts -/* 80291158 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8029115C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80291160 7C 08 03 A6 */ mtlr r0 -/* 80291164 38 21 00 20 */ addi r1, r1, 0x20 -/* 80291168 4E 80 00 20 */ blr diff --git a/asm/JSystem/JGadget/std-vector/__dt__Q27JGadget20TVector_pointer_voidFv.s b/asm/JSystem/JGadget/std-vector/__dt__Q27JGadget20TVector_pointer_voidFv.s deleted file mode 100644 index ea8a0e20e9c..00000000000 --- a/asm/JSystem/JGadget/std-vector/__dt__Q27JGadget20TVector_pointer_voidFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_802DCCFC: -/* 802DCCFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DCD00 7C 08 02 A6 */ mflr r0 -/* 802DCD04 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DCD08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DCD0C 93 C1 00 08 */ stw r30, 8(r1) -/* 802DCD10 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802DCD14 7C 9F 23 78 */ mr r31, r4 -/* 802DCD18 41 82 00 70 */ beq lbl_802DCD88 -/* 802DCD1C 41 82 00 5C */ beq lbl_802DCD78 -/* 802DCD20 80 7E 00 08 */ lwz r3, 8(r30) -/* 802DCD24 80 9E 00 04 */ lwz r4, 4(r30) -/* 802DCD28 38 03 00 03 */ addi r0, r3, 3 -/* 802DCD2C 7C 03 00 50 */ subf r0, r3, r0 -/* 802DCD30 54 00 F0 BE */ srwi r0, r0, 2 -/* 802DCD34 7C 09 03 A6 */ mtctr r0 -/* 802DCD38 7C 03 18 40 */ cmplw r3, r3 -/* 802DCD3C 40 80 00 18 */ bge lbl_802DCD54 -lbl_802DCD40: -/* 802DCD40 80 03 00 00 */ lwz r0, 0(r3) -/* 802DCD44 90 04 00 00 */ stw r0, 0(r4) -/* 802DCD48 38 63 00 04 */ addi r3, r3, 4 -/* 802DCD4C 38 84 00 04 */ addi r4, r4, 4 -/* 802DCD50 42 00 FF F0 */ bdnz lbl_802DCD40 -lbl_802DCD54: -/* 802DCD54 80 1E 00 08 */ lwz r0, 8(r30) -/* 802DCD58 7C 83 23 78 */ mr r3, r4 -/* 802DCD5C 48 00 00 08 */ b lbl_802DCD64 -lbl_802DCD60: -/* 802DCD60 38 63 00 04 */ addi r3, r3, 4 -lbl_802DCD64: -/* 802DCD64 7C 03 00 40 */ cmplw r3, r0 -/* 802DCD68 40 82 FF F8 */ bne lbl_802DCD60 -/* 802DCD6C 90 9E 00 08 */ stw r4, 8(r30) -/* 802DCD70 80 7E 00 04 */ lwz r3, 4(r30) -/* 802DCD74 4B FF 1F C9 */ bl __dl__FPv -lbl_802DCD78: -/* 802DCD78 7F E0 07 35 */ extsh. r0, r31 -/* 802DCD7C 40 81 00 0C */ ble lbl_802DCD88 -/* 802DCD80 7F C3 F3 78 */ mr r3, r30 -/* 802DCD84 4B FF 1F B9 */ bl __dl__FPv -lbl_802DCD88: -/* 802DCD88 7F C3 F3 78 */ mr r3, r30 -/* 802DCD8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DCD90 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DCD94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DCD98 7C 08 03 A6 */ mtlr r0 -/* 802DCD9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DCDA0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JGadget/std-vector/erase__Q27JGadget20TVector_pointer_voidFPPvPPv.s b/asm/JSystem/JGadget/std-vector/erase__Q27JGadget20TVector_pointer_voidFPPvPPv.s deleted file mode 100644 index bc56393ccdd..00000000000 --- a/asm/JSystem/JGadget/std-vector/erase__Q27JGadget20TVector_pointer_voidFPPvPPv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_802DCDC4: -/* 802DCDC4 80 C3 00 08 */ lwz r6, 8(r3) -/* 802DCDC8 7C 87 23 78 */ mr r7, r4 -/* 802DCDCC 38 06 00 03 */ addi r0, r6, 3 -/* 802DCDD0 7C 05 00 50 */ subf r0, r5, r0 -/* 802DCDD4 54 00 F0 BE */ srwi r0, r0, 2 -/* 802DCDD8 7C 09 03 A6 */ mtctr r0 -/* 802DCDDC 7C 05 30 40 */ cmplw r5, r6 -/* 802DCDE0 40 80 00 18 */ bge lbl_802DCDF8 -lbl_802DCDE4: -/* 802DCDE4 80 05 00 00 */ lwz r0, 0(r5) -/* 802DCDE8 90 07 00 00 */ stw r0, 0(r7) -/* 802DCDEC 38 A5 00 04 */ addi r5, r5, 4 -/* 802DCDF0 38 E7 00 04 */ addi r7, r7, 4 -/* 802DCDF4 42 00 FF F0 */ bdnz lbl_802DCDE4 -lbl_802DCDF8: -/* 802DCDF8 80 03 00 08 */ lwz r0, 8(r3) -/* 802DCDFC 7C E5 3B 78 */ mr r5, r7 -/* 802DCE00 48 00 00 08 */ b lbl_802DCE08 -lbl_802DCE04: -/* 802DCE04 38 A5 00 04 */ addi r5, r5, 4 -lbl_802DCE08: -/* 802DCE08 7C 05 00 40 */ cmplw r5, r0 -/* 802DCE0C 40 82 FF F8 */ bne lbl_802DCE04 -/* 802DCE10 90 E3 00 08 */ stw r7, 8(r3) -/* 802DCE14 7C 83 23 78 */ mr r3, r4 -/* 802DCE18 4E 80 00 20 */ blr diff --git a/asm/JSystem/JGadget/std-vector/extend_default__Q27JGadget6vectorFUlUlUl.s b/asm/JSystem/JGadget/std-vector/extend_default__Q27JGadget6vectorFUlUlUl.s deleted file mode 100644 index 0dc134c2f3d..00000000000 --- a/asm/JSystem/JGadget/std-vector/extend_default__Q27JGadget6vectorFUlUlUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802DCCC8: -/* 802DCCC8 54 83 08 3C */ slwi r3, r4, 1 -/* 802DCCCC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JGadget/std-vector/func_802DCCD0.s b/asm/JSystem/JGadget/std-vector/func_802DCCD0.s deleted file mode 100644 index e1757a9b4d3..00000000000 --- a/asm/JSystem/JGadget/std-vector/func_802DCCD0.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802DCCD0: -/* 802DCCD0 88 04 00 00 */ lbz r0, 0(r4) -/* 802DCCD4 98 03 00 00 */ stb r0, 0(r3) -/* 802DCCD8 38 80 00 00 */ li r4, 0 -/* 802DCCDC 90 83 00 04 */ stw r4, 4(r3) -/* 802DCCE0 80 03 00 04 */ lwz r0, 4(r3) -/* 802DCCE4 90 03 00 08 */ stw r0, 8(r3) -/* 802DCCE8 90 83 00 0C */ stw r4, 0xc(r3) -/* 802DCCEC 3C 80 80 2E */ lis r4, extend_default__Q27JGadget6vectorFUlUlUl@ha /* 0x802DCCC8@ha */ -/* 802DCCF0 38 04 CC C8 */ addi r0, r4, extend_default__Q27JGadget6vectorFUlUlUl@l /* 0x802DCCC8@l */ -/* 802DCCF4 90 03 00 10 */ stw r0, 0x10(r3) -/* 802DCCF8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SceneMgr/framework__10Z2SceneMgrFv.s b/asm/Z2AudioLib/Z2SceneMgr/framework__10Z2SceneMgrFv.s index baa89ba8af8..5c72c13ee25 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/framework__10Z2SceneMgrFv.s +++ b/asm/Z2AudioLib/Z2SceneMgr/framework__10Z2SceneMgrFv.s @@ -47,7 +47,7 @@ lbl_802B9CE4: /* 802B9CF8 28 00 00 03 */ cmplwi r0, 3 /* 802B9CFC 41 82 00 30 */ beq lbl_802B9D2C /* 802B9D00 80 7F 00 08 */ lwz r3, 8(r31) -/* 802B9D04 88 0D 82 E3 */ lbz r0, struct_80450860+0x3(r13) +/* 802B9D04 88 0D 82 E3 */ lbz r0, struct_80450863+0x0(r13) /* 802B9D08 7C 03 00 00 */ cmpw r3, r0 /* 802B9D0C 40 82 00 20 */ bne lbl_802B9D2C /* 802B9D10 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) diff --git a/asm/Z2AudioLib/Z2SeqMgr/bgmStreamPrepare__8Z2SeqMgrFUl.s b/asm/Z2AudioLib/Z2SeqMgr/bgmStreamPrepare__8Z2SeqMgrFUl.s index ca21a5a84ed..5bc86bb6b97 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/bgmStreamPrepare__8Z2SeqMgrFUl.s +++ b/asm/Z2AudioLib/Z2SeqMgr/bgmStreamPrepare__8Z2SeqMgrFUl.s @@ -90,7 +90,7 @@ lbl_802AFCD8: /* 802AFCD8 80 7F 00 00 */ lwz r3, 0(r31) /* 802AFCDC 28 03 00 00 */ cmplwi r3, 0 /* 802AFCE0 41 82 00 F4 */ beq lbl_802AFDD4 -/* 802AFCE4 88 8D 82 E2 */ lbz r4, struct_80450860+0x2(r13) +/* 802AFCE4 88 8D 82 E2 */ lbz r4, struct_80450862+0x0(r13) /* 802AFCE8 4B FF 27 F5 */ bl stop__8JAISoundFUl /* 802AFCEC 48 00 00 E8 */ b lbl_802AFDD4 lbl_802AFCF0: @@ -131,7 +131,7 @@ lbl_802AFD60: /* 802AFD6C 38 84 02 6A */ addi r4, r4, 0x26a /* 802AFD70 48 00 64 79 */ bl setDemoName__11Z2StatusMgrFPc lbl_802AFD74: -/* 802AFD74 88 0D 82 E2 */ lbz r0, struct_80450860+0x2(r13) +/* 802AFD74 88 0D 82 E2 */ lbz r0, struct_80450862+0x0(r13) /* 802AFD78 28 00 00 00 */ cmplwi r0, 0 /* 802AFD7C 41 82 00 40 */ beq lbl_802AFDBC /* 802AFD80 C0 1F 00 64 */ lfs f0, 0x64(r31) diff --git a/asm/Z2AudioLib/Z2SeqMgr/changeFishingBgm__8Z2SeqMgrFl.s b/asm/Z2AudioLib/Z2SeqMgr/changeFishingBgm__8Z2SeqMgrFl.s index 90990996bbd..c7506877102 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/changeFishingBgm__8Z2SeqMgrFl.s +++ b/asm/Z2AudioLib/Z2SeqMgr/changeFishingBgm__8Z2SeqMgrFl.s @@ -31,7 +31,7 @@ lbl_802B2AE0: /* 802B2AEC 7F E3 FB 78 */ mr r3, r31 /* 802B2AF0 4B FF CD 95 */ bl subBgmStop__8Z2SeqMgrFv lbl_802B2AF4: -/* 802B2AF4 88 6D 82 E2 */ lbz r3, struct_80450860+0x2(r13) +/* 802B2AF4 88 6D 82 E2 */ lbz r3, struct_80450862+0x0(r13) /* 802B2AF8 C0 62 BF 98 */ lfs f3, lit_3372(r2) /* 802B2AFC D0 7F 00 34 */ stfs f3, 0x34(r31) /* 802B2B00 C0 02 BF 9C */ lfs f0, lit_3373(r2) diff --git a/asm/Z2AudioLib/Z2SeqMgr/fanfareFramework__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/fanfareFramework__8Z2SeqMgrFv.s index 2c982c3e10c..2fae572b57f 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/fanfareFramework__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/fanfareFramework__8Z2SeqMgrFv.s @@ -256,7 +256,7 @@ lbl_802B31E4: lbl_802B31E8: /* 802B31E8 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 802B31EC 41 82 00 68 */ beq lbl_802B3254 -/* 802B31F0 88 0D 82 E1 */ lbz r0, struct_80450860+0x1(r13) +/* 802B31F0 88 0D 82 E1 */ lbz r0, struct_80450861+0x0(r13) /* 802B31F4 28 00 00 00 */ cmplwi r0, 0 /* 802B31F8 41 82 00 40 */ beq lbl_802B3238 /* 802B31FC C0 1F 00 54 */ lfs f0, 0x54(r31) diff --git a/asm/Z2AudioLib/Z2SeqMgr/processBgmFramework__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/processBgmFramework__8Z2SeqMgrFv.s index 38b8395f351..6d385f116f9 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/processBgmFramework__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/processBgmFramework__8Z2SeqMgrFv.s @@ -27,7 +27,7 @@ lbl_802B3404: lbl_802B3408: /* 802B3408 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 802B340C 41 82 00 68 */ beq lbl_802B3474 -/* 802B3410 88 0D 82 E1 */ lbz r0, struct_80450860+0x1(r13) +/* 802B3410 88 0D 82 E1 */ lbz r0, struct_80450861+0x0(r13) /* 802B3414 28 00 00 00 */ cmplwi r0, 0 /* 802B3418 41 82 00 40 */ beq lbl_802B3458 /* 802B341C C0 1F 00 64 */ lfs f0, 0x64(r31) @@ -83,7 +83,7 @@ lbl_802B34CC: lbl_802B34D0: /* 802B34D0 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 802B34D4 41 82 00 68 */ beq lbl_802B353C -/* 802B34D8 88 0D 82 E1 */ lbz r0, struct_80450860+0x1(r13) +/* 802B34D8 88 0D 82 E1 */ lbz r0, struct_80450861+0x0(r13) /* 802B34DC 28 00 00 00 */ cmplwi r0, 0 /* 802B34E0 41 82 00 40 */ beq lbl_802B3520 /* 802B34E4 C0 1F 00 14 */ lfs f0, 0x14(r31) diff --git a/asm/Z2AudioLib/Z2SeqMgr/setBattleBgmOff__8Z2SeqMgrFb.s b/asm/Z2AudioLib/Z2SeqMgr/setBattleBgmOff__8Z2SeqMgrFb.s index eb07f2917a5..ee821017cf2 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/setBattleBgmOff__8Z2SeqMgrFb.s +++ b/asm/Z2AudioLib/Z2SeqMgr/setBattleBgmOff__8Z2SeqMgrFb.s @@ -38,8 +38,8 @@ lbl_802B41DC: /* 802B41E4 40 82 00 14 */ bne lbl_802B41F8 lbl_802B41E8: /* 802B41E8 7F C3 F3 78 */ mr r3, r30 -/* 802B41EC 88 8D 82 E2 */ lbz r4, struct_80450860+0x2(r13) -/* 802B41F0 88 AD 82 E1 */ lbz r5, struct_80450860+0x1(r13) +/* 802B41EC 88 8D 82 E2 */ lbz r4, struct_80450862+0x0(r13) +/* 802B41F0 88 AD 82 E1 */ lbz r5, struct_80450861+0x0(r13) /* 802B41F4 48 00 10 11 */ bl stopBattleBgm__8Z2SeqMgrFUcUc lbl_802B41F8: /* 802B41F8 88 1E 00 D0 */ lbz r0, 0xd0(r30) diff --git a/asm/Z2AudioLib/Z2SeqMgr/setBattleDistState__8Z2SeqMgrFUc.s b/asm/Z2AudioLib/Z2SeqMgr/setBattleDistState__8Z2SeqMgrFUc.s index 40cc5178e6a..25d145d7d53 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/setBattleDistState__8Z2SeqMgrFUc.s +++ b/asm/Z2AudioLib/Z2SeqMgr/setBattleDistState__8Z2SeqMgrFUc.s @@ -255,8 +255,8 @@ lbl_802B4804: /* 802B4814 40 82 00 14 */ bne lbl_802B4828 lbl_802B4818: /* 802B4818 7F C3 F3 78 */ mr r3, r30 -/* 802B481C 88 8D 82 E2 */ lbz r4, struct_80450860+0x2(r13) -/* 802B4820 88 AD 82 E1 */ lbz r5, struct_80450860+0x1(r13) +/* 802B481C 88 8D 82 E2 */ lbz r4, struct_80450862+0x0(r13) +/* 802B4820 88 AD 82 E1 */ lbz r5, struct_80450861+0x0(r13) /* 802B4824 48 00 09 E1 */ bl stopBattleBgm__8Z2SeqMgrFUcUc lbl_802B4828: /* 802B4828 9B FE 00 BE */ stb r31, 0xbe(r30) diff --git a/asm/Z2AudioLib/Z2SeqMgr/setBattleSeqState__8Z2SeqMgrFUc.s b/asm/Z2AudioLib/Z2SeqMgr/setBattleSeqState__8Z2SeqMgrFUc.s index 80413bbc351..4760495a34a 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/setBattleSeqState__8Z2SeqMgrFUc.s +++ b/asm/Z2AudioLib/Z2SeqMgr/setBattleSeqState__8Z2SeqMgrFUc.s @@ -19,8 +19,8 @@ lbl_802B4844: /* 802B4888 41 82 02 5C */ beq lbl_802B4AE4 /* 802B488C 28 00 00 00 */ cmplwi r0, 0 /* 802B4890 40 82 00 14 */ bne lbl_802B48A4 -/* 802B4894 88 8D 82 E2 */ lbz r4, struct_80450860+0x2(r13) -/* 802B4898 88 AD 82 E1 */ lbz r5, struct_80450860+0x1(r13) +/* 802B4894 88 8D 82 E2 */ lbz r4, struct_80450862+0x0(r13) +/* 802B4898 88 AD 82 E1 */ lbz r5, struct_80450861+0x0(r13) /* 802B489C 48 00 09 69 */ bl stopBattleBgm__8Z2SeqMgrFUcUc /* 802B48A0 48 00 02 44 */ b lbl_802B4AE4 lbl_802B48A4: diff --git a/asm/Z2AudioLib/Z2SeqMgr/startBattleBgm__8Z2SeqMgrFb.s b/asm/Z2AudioLib/Z2SeqMgr/startBattleBgm__8Z2SeqMgrFb.s index e911f195952..1f93e2c602a 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/startBattleBgm__8Z2SeqMgrFb.s +++ b/asm/Z2AudioLib/Z2SeqMgr/startBattleBgm__8Z2SeqMgrFb.s @@ -75,7 +75,7 @@ lbl_802B4F5C: /* 802B4FC0 3B 40 00 00 */ li r26, 0 lbl_802B4FC4: /* 802B4FC4 7F 40 07 34 */ extsh r0, r26 -/* 802B4FC8 88 8D 82 E1 */ lbz r4, struct_80450860+0x1(r13) +/* 802B4FC8 88 8D 82 E1 */ lbz r4, struct_80450861+0x0(r13) /* 802B4FCC 7C 00 20 00 */ cmpw r0, r4 /* 802B4FD0 40 81 00 08 */ ble lbl_802B4FD8 /* 802B4FD4 7C 9A 23 78 */ mr r26, r4 @@ -95,7 +95,7 @@ lbl_802B4FFC: /* 802B5004 54 1F 06 3E */ clrlwi r31, r0, 0x18 /* 802B5008 7C 60 0E 70 */ srawi r0, r3, 1 /* 802B500C 7C 60 01 94 */ addze r3, r0 -/* 802B5010 88 0D 82 E2 */ lbz r0, struct_80450860+0x2(r13) +/* 802B5010 88 0D 82 E2 */ lbz r0, struct_80450862+0x0(r13) /* 802B5014 7C 03 00 50 */ subf r0, r3, r0 /* 802B5018 54 1E 06 3E */ clrlwi r30, r0, 0x18 /* 802B501C 88 1C 00 D0 */ lbz r0, 0xd0(r28) diff --git a/asm/Z2AudioLib/Z2SeqMgr/stopBattleBgm__8Z2SeqMgrFUcUc.s b/asm/Z2AudioLib/Z2SeqMgr/stopBattleBgm__8Z2SeqMgrFUcUc.s index a10ae0bf48d..80175fc1f25 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/stopBattleBgm__8Z2SeqMgrFUcUc.s +++ b/asm/Z2AudioLib/Z2SeqMgr/stopBattleBgm__8Z2SeqMgrFUcUc.s @@ -20,7 +20,7 @@ lbl_802B5240: /* 802B5248 38 E0 00 00 */ li r7, 0 lbl_802B524C: /* 802B524C 7C E0 07 34 */ extsh r0, r7 -/* 802B5250 88 CD 82 E1 */ lbz r6, struct_80450860+0x1(r13) +/* 802B5250 88 CD 82 E1 */ lbz r6, struct_80450861+0x0(r13) /* 802B5254 7C 00 30 00 */ cmpw r0, r6 /* 802B5258 40 81 00 08 */ ble lbl_802B5260 /* 802B525C 7C C7 33 78 */ mr r7, r6 @@ -40,7 +40,7 @@ lbl_802B527C: /* 802B5288 7C E5 07 34 */ extsh r5, r7 /* 802B528C 7C 06 2A 14 */ add r0, r6, r5 /* 802B5290 54 06 06 3F */ clrlwi. r6, r0, 0x18 -/* 802B5294 88 8D 82 E2 */ lbz r4, struct_80450860+0x2(r13) +/* 802B5294 88 8D 82 E2 */ lbz r4, struct_80450862+0x0(r13) /* 802B5298 7C A0 0E 70 */ srawi r0, r5, 1 /* 802B529C 7C 00 01 94 */ addze r0, r0 /* 802B52A0 7C 04 02 14 */ add r0, r4, r0 diff --git a/asm/Z2AudioLib/Z2SeqMgr/subBgmStart__8Z2SeqMgrFUl.s b/asm/Z2AudioLib/Z2SeqMgr/subBgmStart__8Z2SeqMgrFUl.s index cfc4b486616..736394688f1 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/subBgmStart__8Z2SeqMgrFUl.s +++ b/asm/Z2AudioLib/Z2SeqMgr/subBgmStart__8Z2SeqMgrFUl.s @@ -46,7 +46,7 @@ lbl_802AF51C: /* 802AF540 38 84 02 6A */ addi r4, r4, 0x26a /* 802AF544 48 00 6C A5 */ bl setDemoName__11Z2StatusMgrFPc /* 802AF548 3B 80 00 00 */ li r28, 0 -/* 802AF54C 8B ED 82 E2 */ lbz r31, struct_80450860+0x2(r13) +/* 802AF54C 8B ED 82 E2 */ lbz r31, struct_80450862+0x0(r13) /* 802AF550 48 00 00 E0 */ b lbl_802AF630 /* 802AF554 3B 80 00 00 */ li r28, 0 /* 802AF558 3B E0 00 78 */ li r31, 0x78 @@ -102,11 +102,11 @@ lbl_802AF5E8: /* 802AF614 3B E0 00 14 */ li r31, 0x14 /* 802AF618 48 00 00 18 */ b lbl_802AF630 /* 802AF61C 3B 80 00 00 */ li r28, 0 -/* 802AF620 8B ED 82 E2 */ lbz r31, struct_80450860+0x2(r13) +/* 802AF620 8B ED 82 E2 */ lbz r31, struct_80450862+0x0(r13) /* 802AF624 48 00 00 0C */ b lbl_802AF630 lbl_802AF628: -/* 802AF628 8B 8D 82 E1 */ lbz r28, struct_80450860+0x1(r13) -/* 802AF62C 8B ED 82 E2 */ lbz r31, struct_80450860+0x2(r13) +/* 802AF628 8B 8D 82 E1 */ lbz r28, struct_80450861+0x0(r13) +/* 802AF62C 8B ED 82 E2 */ lbz r31, struct_80450862+0x0(r13) lbl_802AF630: /* 802AF630 80 7D 00 04 */ lwz r3, 4(r29) /* 802AF634 28 03 00 00 */ cmplwi r3, 0 diff --git a/asm/Z2AudioLib/Z2SeqMgr/subBgmStopInner__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/subBgmStopInner__8Z2SeqMgrFv.s index 2bf662518d5..5b9e44b476e 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/subBgmStopInner__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/subBgmStopInner__8Z2SeqMgrFv.s @@ -11,7 +11,7 @@ lbl_802AF9D0: /* 802AF9F4 80 7E 00 04 */ lwz r3, 4(r30) /* 802AF9F8 28 03 00 00 */ cmplwi r3, 0 /* 802AF9FC 41 82 01 80 */ beq lbl_802AFB7C -/* 802AFA00 8B ED 82 E2 */ lbz r31, struct_80450860+0x2(r13) +/* 802AFA00 8B ED 82 E2 */ lbz r31, struct_80450862+0x0(r13) /* 802AFA04 41 82 00 10 */ beq lbl_802AFA14 /* 802AFA08 80 83 00 18 */ lwz r4, 0x18(r3) /* 802AFA0C 90 81 00 08 */ stw r4, 8(r1) @@ -90,7 +90,7 @@ lbl_802AFAFC: /* 802AFB04 4B FF 29 D9 */ bl stop__8JAISoundFUl /* 802AFB08 38 7E 00 04 */ addi r3, r30, 4 /* 802AFB0C 4B FF 26 79 */ bl releaseSound__14JAISoundHandleFv -/* 802AFB10 88 0D 82 E2 */ lbz r0, struct_80450860+0x2(r13) +/* 802AFB10 88 0D 82 E2 */ lbz r0, struct_80450862+0x0(r13) /* 802AFB14 28 00 00 00 */ cmplwi r0, 0 /* 802AFB18 41 82 00 40 */ beq lbl_802AFB58 /* 802AFB1C C0 1E 00 14 */ lfs f0, 0x14(r30) diff --git a/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s b/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s deleted file mode 100644 index acfcf318f85..00000000000 --- a/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s +++ /dev/null @@ -1,91 +0,0 @@ -lbl_802B5F7C: -/* 802B5F7C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802B5F80 7C 08 02 A6 */ mflr r0 -/* 802B5F84 90 01 00 24 */ stw r0, 0x24(r1) -/* 802B5F88 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802B5F8C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802B5F90 88 04 4F AD */ lbz r0, 0x4fad(r4) -/* 802B5F94 28 00 00 00 */ cmplwi r0, 0 -/* 802B5F98 40 82 01 24 */ bne lbl_802B60BC -/* 802B5F9C 88 83 00 2D */ lbz r4, 0x2d(r3) -/* 802B5FA0 28 04 00 00 */ cmplwi r4, 0 -/* 802B5FA4 41 82 01 18 */ beq lbl_802B60BC -/* 802B5FA8 88 0D 8B A4 */ lbz r0, pauseTimer__9dScnPly_c+0x0(r13) -/* 802B5FAC 7C 00 07 75 */ extsb. r0, r0 -/* 802B5FB0 40 82 00 0C */ bne lbl_802B5FBC -/* 802B5FB4 38 04 FF FF */ addi r0, r4, -1 -/* 802B5FB8 98 03 00 2D */ stb r0, 0x2d(r3) -lbl_802B5FBC: -/* 802B5FBC 80 6D 8D E0 */ lwz r3, mLinkPtr__14Z2CreatureLink(r13) -/* 802B5FC0 28 03 00 00 */ cmplwi r3, 0 -/* 802B5FC4 41 82 00 F8 */ beq lbl_802B60BC -/* 802B5FC8 88 83 00 C3 */ lbz r4, 0xc3(r3) -/* 802B5FCC 28 04 00 00 */ cmplwi r4, 0 -/* 802B5FD0 41 82 00 EC */ beq lbl_802B60BC -/* 802B5FD4 80 AD 86 04 */ lwz r5, __OSReport_disable-0x14(r13) -/* 802B5FD8 38 60 00 00 */ li r3, 0 -/* 802B5FDC 80 05 00 08 */ lwz r0, 8(r5) -/* 802B5FE0 28 00 00 00 */ cmplwi r0, 0 -/* 802B5FE4 40 82 00 10 */ bne lbl_802B5FF4 -/* 802B5FE8 88 05 00 BA */ lbz r0, 0xba(r5) -/* 802B5FEC 28 00 00 00 */ cmplwi r0, 0 -/* 802B5FF0 41 82 00 08 */ beq lbl_802B5FF8 -lbl_802B5FF4: -/* 802B5FF4 38 60 00 01 */ li r3, 1 -lbl_802B5FF8: -/* 802B5FF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802B5FFC 40 82 00 C0 */ bne lbl_802B60BC -/* 802B6000 28 04 00 02 */ cmplwi r4, 2 -/* 802B6004 41 81 00 3C */ bgt lbl_802B6040 -/* 802B6008 38 00 00 36 */ li r0, 0x36 -/* 802B600C 90 01 00 10 */ stw r0, 0x10(r1) -/* 802B6010 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) -/* 802B6014 38 81 00 10 */ addi r4, r1, 0x10 -/* 802B6018 38 A0 00 00 */ li r5, 0 -/* 802B601C 38 C0 00 00 */ li r6, 0 -/* 802B6020 38 E0 00 00 */ li r7, 0 -/* 802B6024 C0 22 C0 20 */ lfs f1, lit_3467(r2) -/* 802B6028 FC 40 08 90 */ fmr f2, f1 -/* 802B602C C0 62 C0 24 */ lfs f3, lit_3468(r2) -/* 802B6030 FC 80 18 90 */ fmr f4, f3 -/* 802B6034 39 00 00 00 */ li r8, 0 -/* 802B6038 4B FF 64 D5 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 802B603C 48 00 00 80 */ b lbl_802B60BC -lbl_802B6040: -/* 802B6040 28 04 00 04 */ cmplwi r4, 4 -/* 802B6044 41 81 00 3C */ bgt lbl_802B6080 -/* 802B6048 38 00 00 35 */ li r0, 0x35 -/* 802B604C 90 01 00 0C */ stw r0, 0xc(r1) -/* 802B6050 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) -/* 802B6054 38 81 00 0C */ addi r4, r1, 0xc -/* 802B6058 38 A0 00 00 */ li r5, 0 -/* 802B605C 38 C0 00 00 */ li r6, 0 -/* 802B6060 38 E0 00 00 */ li r7, 0 -/* 802B6064 C0 22 C0 20 */ lfs f1, lit_3467(r2) -/* 802B6068 FC 40 08 90 */ fmr f2, f1 -/* 802B606C C0 62 C0 24 */ lfs f3, lit_3468(r2) -/* 802B6070 FC 80 18 90 */ fmr f4, f3 -/* 802B6074 39 00 00 00 */ li r8, 0 -/* 802B6078 4B FF 64 95 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 802B607C 48 00 00 40 */ b lbl_802B60BC -lbl_802B6080: -/* 802B6080 28 04 00 06 */ cmplwi r4, 6 -/* 802B6084 41 81 00 38 */ bgt lbl_802B60BC -/* 802B6088 38 00 00 34 */ li r0, 0x34 -/* 802B608C 90 01 00 08 */ stw r0, 8(r1) -/* 802B6090 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) -/* 802B6094 38 81 00 08 */ addi r4, r1, 8 -/* 802B6098 38 A0 00 00 */ li r5, 0 -/* 802B609C 38 C0 00 00 */ li r6, 0 -/* 802B60A0 38 E0 00 00 */ li r7, 0 -/* 802B60A4 C0 22 C0 20 */ lfs f1, lit_3467(r2) -/* 802B60A8 FC 40 08 90 */ fmr f2, f1 -/* 802B60AC C0 62 C0 24 */ lfs f3, lit_3468(r2) -/* 802B60B0 FC 80 18 90 */ fmr f4, f3 -/* 802B60B4 39 00 00 00 */ li r8, 0 -/* 802B60B8 4B FF 64 55 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_802B60BC: -/* 802B60BC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802B60C0 7C 08 03 A6 */ mtlr r0 -/* 802B60C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B60C8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2StatusMgr/setCameraInWaterDepth__11Z2StatusMgrFf.s b/asm/Z2AudioLib/Z2StatusMgr/setCameraInWaterDepth__11Z2StatusMgrFf.s deleted file mode 100644 index 4c9c0110462..00000000000 --- a/asm/Z2AudioLib/Z2StatusMgr/setCameraInWaterDepth__11Z2StatusMgrFf.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_802B6788: -/* 802B6788 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802B678C 7C 08 02 A6 */ mflr r0 -/* 802B6790 90 01 00 24 */ stw r0, 0x24(r1) -/* 802B6794 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 802B6798 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 802B679C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802B67A0 7C 7F 1B 78 */ mr r31, r3 -/* 802B67A4 FF E0 08 90 */ fmr f31, f1 -/* 802B67A8 C0 42 C0 1C */ lfs f2, lit_3396(r2) -/* 802B67AC FC 02 F8 00 */ fcmpu cr0, f2, f31 -/* 802B67B0 40 82 00 18 */ bne lbl_802B67C8 -/* 802B67B4 D0 5F 00 1C */ stfs f2, 0x1c(r31) -/* 802B67B8 80 6D 85 C0 */ lwz r3, __OSReport_disable-0x58(r13) -/* 802B67BC 38 80 00 00 */ li r4, 0 -/* 802B67C0 48 00 46 89 */ bl setUnderWaterFx__11Z2FxLineMgrFb -/* 802B67C4 48 00 00 5C */ b lbl_802B6820 -lbl_802B67C8: -/* 802B67C8 80 6D 8D E0 */ lwz r3, mLinkPtr__14Z2CreatureLink(r13) -/* 802B67CC 28 03 00 00 */ cmplwi r3, 0 -/* 802B67D0 41 82 00 50 */ beq lbl_802B6820 -/* 802B67D4 88 03 00 CB */ lbz r0, 0xcb(r3) -/* 802B67D8 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f -/* 802B67DC 41 82 00 44 */ beq lbl_802B6820 -/* 802B67E0 C0 62 C0 30 */ lfs f3, lit_3798(r2) -/* 802B67E4 FC 1F 18 40 */ fcmpo cr0, f31, f3 -/* 802B67E8 4C 41 13 82 */ cror 2, 1, 2 -/* 802B67EC 40 82 00 10 */ bne lbl_802B67FC -/* 802B67F0 C0 02 C0 20 */ lfs f0, lit_3467(r2) -/* 802B67F4 D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 802B67F8 48 00 00 1C */ b lbl_802B6814 -lbl_802B67FC: -/* 802B67FC C0 82 C0 34 */ lfs f4, lit_3799(r2) -/* 802B6800 FC A0 10 90 */ fmr f5, f2 -/* 802B6804 C0 C2 C0 20 */ lfs f6, lit_3467(r2) -/* 802B6808 38 60 00 00 */ li r3, 0 -/* 802B680C 4B FF 2E E9 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign -/* 802B6810 D0 3F 00 1C */ stfs f1, 0x1c(r31) -lbl_802B6814: -/* 802B6814 80 6D 85 C0 */ lwz r3, __OSReport_disable-0x58(r13) -/* 802B6818 38 80 00 01 */ li r4, 1 -/* 802B681C 48 00 46 2D */ bl setUnderWaterFx__11Z2FxLineMgrFb -lbl_802B6820: -/* 802B6820 D3 FF 00 18 */ stfs f31, 0x18(r31) -/* 802B6824 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 802B6828 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 802B682C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802B6830 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802B6834 7C 08 03 A6 */ mtlr r0 -/* 802B6838 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B683C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2StatusMgr/setDemoName__11Z2StatusMgrFPc.s b/asm/Z2AudioLib/Z2StatusMgr/setDemoName__11Z2StatusMgrFPc.s deleted file mode 100644 index cf1009431eb..00000000000 --- a/asm/Z2AudioLib/Z2StatusMgr/setDemoName__11Z2StatusMgrFPc.s +++ /dev/null @@ -1,357 +0,0 @@ -lbl_802B61E8: -/* 802B61E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802B61EC 7C 08 02 A6 */ mflr r0 -/* 802B61F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802B61F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802B61F8 48 0A BF E5 */ bl _savegpr_29 -/* 802B61FC 7C 7D 1B 78 */ mr r29, r3 -/* 802B6200 7C 9E 23 78 */ mr r30, r4 -/* 802B6204 88 03 00 2C */ lbz r0, 0x2c(r3) -/* 802B6208 28 00 00 0B */ cmplwi r0, 0xb -/* 802B620C 40 82 00 20 */ bne lbl_802B622C -/* 802B6210 38 00 00 00 */ li r0, 0 -/* 802B6214 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6218 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) -/* 802B621C 88 03 00 1C */ lbz r0, 0x1c(r3) -/* 802B6220 28 00 00 00 */ cmplwi r0, 0 -/* 802B6224 41 82 00 08 */ beq lbl_802B622C -/* 802B6228 48 00 40 6D */ bl sceneBgmStart__10Z2SceneMgrFv -lbl_802B622C: -/* 802B622C 28 1E 00 00 */ cmplwi r30, 0 -/* 802B6230 40 82 00 E0 */ bne lbl_802B6310 -/* 802B6234 88 1D 00 2C */ lbz r0, 0x2c(r29) -/* 802B6238 28 00 00 03 */ cmplwi r0, 3 -/* 802B623C 40 82 00 14 */ bne lbl_802B6250 -/* 802B6240 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802B6244 38 80 00 00 */ li r4, 0 -/* 802B6248 4B FF DF 1D */ bl setBattleBgmOff__8Z2SeqMgrFb -/* 802B624C 48 00 00 AC */ b lbl_802B62F8 -lbl_802B6250: -/* 802B6250 28 00 00 04 */ cmplwi r0, 4 -/* 802B6254 40 82 00 7C */ bne lbl_802B62D0 -/* 802B6258 88 6D 82 E1 */ lbz r3, struct_80450860+0x1(r13) -/* 802B625C 80 8D 86 04 */ lwz r4, __OSReport_disable-0x14(r13) -/* 802B6260 C0 62 C0 20 */ lfs f3, lit_3467(r2) -/* 802B6264 D0 64 00 34 */ stfs f3, 0x34(r4) -/* 802B6268 C0 02 C0 1C */ lfs f0, lit_3396(r2) -/* 802B626C D0 04 00 38 */ stfs f0, 0x38(r4) -/* 802B6270 38 00 00 00 */ li r0, 0 -/* 802B6274 90 04 00 40 */ stw r0, 0x40(r4) -/* 802B6278 D0 04 00 3C */ stfs f0, 0x3c(r4) -/* 802B627C 28 03 00 00 */ cmplwi r3, 0 -/* 802B6280 41 82 00 3C */ beq lbl_802B62BC -/* 802B6284 C0 04 00 44 */ lfs f0, 0x44(r4) -/* 802B6288 90 64 00 50 */ stw r3, 0x50(r4) -/* 802B628C EC 43 00 28 */ fsubs f2, f3, f0 -/* 802B6290 80 04 00 50 */ lwz r0, 0x50(r4) -/* 802B6294 C8 22 C0 28 */ lfd f1, lit_3731(r2) -/* 802B6298 90 01 00 0C */ stw r0, 0xc(r1) -/* 802B629C 3C 00 43 30 */ lis r0, 0x4330 -/* 802B62A0 90 01 00 08 */ stw r0, 8(r1) -/* 802B62A4 C8 01 00 08 */ lfd f0, 8(r1) -/* 802B62A8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802B62AC EC 02 00 24 */ fdivs f0, f2, f0 -/* 802B62B0 D0 04 00 48 */ stfs f0, 0x48(r4) -/* 802B62B4 D0 64 00 4C */ stfs f3, 0x4c(r4) -/* 802B62B8 48 00 00 40 */ b lbl_802B62F8 -lbl_802B62BC: -/* 802B62BC D0 64 00 44 */ stfs f3, 0x44(r4) -/* 802B62C0 D0 04 00 48 */ stfs f0, 0x48(r4) -/* 802B62C4 90 04 00 50 */ stw r0, 0x50(r4) -/* 802B62C8 D0 04 00 4C */ stfs f0, 0x4c(r4) -/* 802B62CC 48 00 00 2C */ b lbl_802B62F8 -lbl_802B62D0: -/* 802B62D0 28 00 00 05 */ cmplwi r0, 5 -/* 802B62D4 40 82 00 10 */ bne lbl_802B62E4 -/* 802B62D8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802B62DC 4B FF 95 A9 */ bl subBgmStop__8Z2SeqMgrFv -/* 802B62E0 48 00 00 18 */ b lbl_802B62F8 -lbl_802B62E4: -/* 802B62E4 28 00 00 09 */ cmplwi r0, 9 -/* 802B62E8 40 82 00 10 */ bne lbl_802B62F8 -/* 802B62EC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802B62F0 38 80 00 3C */ li r4, 0x3c -/* 802B62F4 4B FF 9B E9 */ bl bgmStreamStop__8Z2SeqMgrFUl -lbl_802B62F8: -/* 802B62F8 88 1D 00 2C */ lbz r0, 0x2c(r29) -/* 802B62FC 28 00 00 08 */ cmplwi r0, 8 -/* 802B6300 41 82 04 04 */ beq lbl_802B6704 -/* 802B6304 38 00 00 00 */ li r0, 0 -/* 802B6308 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B630C 48 00 03 F8 */ b lbl_802B6704 -lbl_802B6310: -/* 802B6310 3B E0 00 00 */ li r31, 0 -/* 802B6314 88 1D 00 2C */ lbz r0, 0x2c(r29) -/* 802B6318 28 00 00 08 */ cmplwi r0, 8 -/* 802B631C 40 82 00 2C */ bne lbl_802B6348 -/* 802B6320 7F C3 F3 78 */ mr r3, r30 -/* 802B6324 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B6328 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B632C 38 84 02 6A */ addi r4, r4, 0x26a -/* 802B6330 48 0B 26 65 */ bl strcmp -/* 802B6334 2C 03 00 00 */ cmpwi r3, 0 -/* 802B6338 40 82 03 CC */ bne lbl_802B6704 -/* 802B633C 38 00 00 00 */ li r0, 0 -/* 802B6340 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6344 48 00 03 C0 */ b lbl_802B6704 -lbl_802B6348: -/* 802B6348 7F C3 F3 78 */ mr r3, r30 -/* 802B634C 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B6350 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6354 38 84 02 74 */ addi r4, r4, 0x274 -/* 802B6358 48 0B 26 3D */ bl strcmp -/* 802B635C 2C 03 00 00 */ cmpwi r3, 0 -/* 802B6360 41 82 00 20 */ beq lbl_802B6380 -/* 802B6364 7F C3 F3 78 */ mr r3, r30 -/* 802B6368 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B636C 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6370 38 84 02 7C */ addi r4, r4, 0x27c -/* 802B6374 48 0B 26 21 */ bl strcmp -/* 802B6378 2C 03 00 00 */ cmpwi r3, 0 -/* 802B637C 40 82 00 10 */ bne lbl_802B638C -lbl_802B6380: -/* 802B6380 38 00 00 0B */ li r0, 0xb -/* 802B6384 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6388 48 00 03 7C */ b lbl_802B6704 -lbl_802B638C: -/* 802B638C 7F C3 F3 78 */ mr r3, r30 -/* 802B6390 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B6394 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6398 38 84 02 84 */ addi r4, r4, 0x284 -/* 802B639C 48 0B 25 F9 */ bl strcmp -/* 802B63A0 2C 03 00 00 */ cmpwi r3, 0 -/* 802B63A4 41 82 00 20 */ beq lbl_802B63C4 -/* 802B63A8 7F C3 F3 78 */ mr r3, r30 -/* 802B63AC 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B63B0 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B63B4 38 84 02 8E */ addi r4, r4, 0x28e -/* 802B63B8 48 0B 25 DD */ bl strcmp -/* 802B63BC 2C 03 00 00 */ cmpwi r3, 0 -/* 802B63C0 40 82 00 50 */ bne lbl_802B6410 -lbl_802B63C4: -/* 802B63C4 38 00 00 04 */ li r0, 4 -/* 802B63C8 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B63CC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802B63D0 C0 03 00 44 */ lfs f0, 0x44(r3) -/* 802B63D4 38 00 00 1E */ li r0, 0x1e -/* 802B63D8 90 03 00 50 */ stw r0, 0x50(r3) -/* 802B63DC C0 62 C0 1C */ lfs f3, lit_3396(r2) -/* 802B63E0 EC 43 00 28 */ fsubs f2, f3, f0 -/* 802B63E4 80 03 00 50 */ lwz r0, 0x50(r3) -/* 802B63E8 C8 22 C0 28 */ lfd f1, lit_3731(r2) -/* 802B63EC 90 01 00 0C */ stw r0, 0xc(r1) -/* 802B63F0 3C 00 43 30 */ lis r0, 0x4330 -/* 802B63F4 90 01 00 08 */ stw r0, 8(r1) -/* 802B63F8 C8 01 00 08 */ lfd f0, 8(r1) -/* 802B63FC EC 00 08 28 */ fsubs f0, f0, f1 -/* 802B6400 EC 02 00 24 */ fdivs f0, f2, f0 -/* 802B6404 D0 03 00 48 */ stfs f0, 0x48(r3) -/* 802B6408 D0 63 00 4C */ stfs f3, 0x4c(r3) -/* 802B640C 48 00 02 F8 */ b lbl_802B6704 -lbl_802B6410: -/* 802B6410 7F C3 F3 78 */ mr r3, r30 -/* 802B6414 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B6418 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B641C 38 84 02 98 */ addi r4, r4, 0x298 -/* 802B6420 48 0B 25 75 */ bl strcmp -/* 802B6424 2C 03 00 00 */ cmpwi r3, 0 -/* 802B6428 40 82 00 24 */ bne lbl_802B644C -/* 802B642C 38 00 00 0C */ li r0, 0xc -/* 802B6430 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6434 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) -/* 802B6438 38 63 03 EC */ addi r3, r3, 0x3ec -/* 802B643C C0 22 C0 1C */ lfs f1, lit_3396(r2) -/* 802B6440 38 80 00 00 */ li r4, 0 -/* 802B6444 4B FE C9 71 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802B6448 48 00 02 BC */ b lbl_802B6704 -lbl_802B644C: -/* 802B644C 7F C3 F3 78 */ mr r3, r30 -/* 802B6450 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B6454 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6458 38 84 02 A2 */ addi r4, r4, 0x2a2 -/* 802B645C 38 A0 00 06 */ li r5, 6 -/* 802B6460 48 0B 24 F5 */ bl strncmp -/* 802B6464 2C 03 00 00 */ cmpwi r3, 0 -/* 802B6468 40 82 00 20 */ bne lbl_802B6488 -/* 802B646C 38 00 00 0D */ li r0, 0xd -/* 802B6470 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6474 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) -/* 802B6478 C0 22 C0 1C */ lfs f1, lit_3396(r2) -/* 802B647C 38 80 00 00 */ li r4, 0 -/* 802B6480 4B FF 75 75 */ bl seMoveVolumeAll__7Z2SeMgrFfUl -/* 802B6484 48 00 02 80 */ b lbl_802B6704 -lbl_802B6488: -/* 802B6488 7F C3 F3 78 */ mr r3, r30 -/* 802B648C 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B6490 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6494 38 84 02 A9 */ addi r4, r4, 0x2a9 -/* 802B6498 38 A0 00 04 */ li r5, 4 -/* 802B649C 48 0B 24 B9 */ bl strncmp -/* 802B64A0 2C 03 00 00 */ cmpwi r3, 0 -/* 802B64A4 40 82 00 10 */ bne lbl_802B64B4 -/* 802B64A8 38 00 00 02 */ li r0, 2 -/* 802B64AC 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B64B0 48 00 02 54 */ b lbl_802B6704 -lbl_802B64B4: -/* 802B64B4 7F C3 F3 78 */ mr r3, r30 -/* 802B64B8 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B64BC 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B64C0 38 84 02 AE */ addi r4, r4, 0x2ae -/* 802B64C4 48 0B 24 D1 */ bl strcmp -/* 802B64C8 2C 03 00 00 */ cmpwi r3, 0 -/* 802B64CC 40 82 00 10 */ bne lbl_802B64DC -/* 802B64D0 38 00 00 08 */ li r0, 8 -/* 802B64D4 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B64D8 48 00 02 2C */ b lbl_802B6704 -lbl_802B64DC: -/* 802B64DC 7F C3 F3 78 */ mr r3, r30 -/* 802B64E0 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B64E4 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B64E8 38 84 02 6A */ addi r4, r4, 0x26a -/* 802B64EC 48 0B 24 A9 */ bl strcmp -/* 802B64F0 2C 03 00 00 */ cmpwi r3, 0 -/* 802B64F4 40 82 00 10 */ bne lbl_802B6504 -/* 802B64F8 38 00 00 00 */ li r0, 0 -/* 802B64FC 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6500 48 00 02 04 */ b lbl_802B6704 -lbl_802B6504: -/* 802B6504 7F C3 F3 78 */ mr r3, r30 -/* 802B6508 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B650C 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6510 38 84 02 BA */ addi r4, r4, 0x2ba -/* 802B6514 48 0B 24 81 */ bl strcmp -/* 802B6518 2C 03 00 00 */ cmpwi r3, 0 -/* 802B651C 40 82 00 10 */ bne lbl_802B652C -/* 802B6520 38 00 00 06 */ li r0, 6 -/* 802B6524 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6528 48 00 01 DC */ b lbl_802B6704 -lbl_802B652C: -/* 802B652C 7F C3 F3 78 */ mr r3, r30 -/* 802B6530 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B6534 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6538 38 84 02 C6 */ addi r4, r4, 0x2c6 -/* 802B653C 48 0B 24 59 */ bl strcmp -/* 802B6540 2C 03 00 00 */ cmpwi r3, 0 -/* 802B6544 40 82 00 10 */ bne lbl_802B6554 -/* 802B6548 38 00 00 07 */ li r0, 7 -/* 802B654C 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6550 48 00 01 B4 */ b lbl_802B6704 -lbl_802B6554: -/* 802B6554 7F C3 F3 78 */ mr r3, r30 -/* 802B6558 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B655C 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6560 38 84 02 D0 */ addi r4, r4, 0x2d0 -/* 802B6564 48 0B 24 31 */ bl strcmp -/* 802B6568 2C 03 00 00 */ cmpwi r3, 0 -/* 802B656C 40 82 00 10 */ bne lbl_802B657C -/* 802B6570 38 00 00 0A */ li r0, 0xa -/* 802B6574 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6578 48 00 01 8C */ b lbl_802B6704 -lbl_802B657C: -/* 802B657C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) -/* 802B6580 80 63 00 04 */ lwz r3, 4(r3) -/* 802B6584 38 03 FF FC */ addi r0, r3, -4 -/* 802B6588 28 00 00 2D */ cmplwi r0, 0x2d -/* 802B658C 41 81 01 44 */ bgt lbl_802B66D0 -/* 802B6590 3C 60 80 3D */ lis r3, lit_3732@ha /* 0x803CA508@ha */ -/* 802B6594 38 63 A5 08 */ addi r3, r3, lit_3732@l /* 0x803CA508@l */ -/* 802B6598 54 00 10 3A */ slwi r0, r0, 2 -/* 802B659C 7C 03 00 2E */ lwzx r0, r3, r0 -/* 802B65A0 7C 09 03 A6 */ mtctr r0 -/* 802B65A4 4E 80 04 20 */ bctr -/* 802B65A8 7F C3 F3 78 */ mr r3, r30 -/* 802B65AC 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B65B0 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B65B4 38 84 02 D9 */ addi r4, r4, 0x2d9 -/* 802B65B8 48 0B 23 DD */ bl strcmp -/* 802B65BC 2C 03 00 00 */ cmpwi r3, 0 -/* 802B65C0 40 82 01 10 */ bne lbl_802B66D0 -/* 802B65C4 38 00 00 05 */ li r0, 5 -/* 802B65C8 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B65CC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802B65D0 3C 80 01 00 */ lis r4, 0x0100 /* 0x01000056@ha */ -/* 802B65D4 38 84 00 56 */ addi r4, r4, 0x0056 /* 0x01000056@l */ -/* 802B65D8 4B FF 8E C5 */ bl subBgmStart__8Z2SeqMgrFUl -/* 802B65DC 48 00 00 F4 */ b lbl_802B66D0 -/* 802B65E0 7F C3 F3 78 */ mr r3, r30 -/* 802B65E4 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B65E8 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B65EC 38 84 02 E3 */ addi r4, r4, 0x2e3 -/* 802B65F0 48 0B 23 A5 */ bl strcmp -/* 802B65F4 2C 03 00 00 */ cmpwi r3, 0 -/* 802B65F8 40 82 00 D8 */ bne lbl_802B66D0 -/* 802B65FC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802B6600 3C 80 02 00 */ lis r4, 0x0200 /* 0x0200005F@ha */ -/* 802B6604 38 84 00 5F */ addi r4, r4, 0x005F /* 0x0200005F@l */ -/* 802B6608 4B FF 95 8D */ bl bgmStreamPrepare__8Z2SeqMgrFUl -/* 802B660C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802B6610 4B FF 98 09 */ bl bgmStreamPlay__8Z2SeqMgrFv -/* 802B6614 38 00 00 09 */ li r0, 9 -/* 802B6618 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B661C 48 00 00 B4 */ b lbl_802B66D0 -/* 802B6620 7F C3 F3 78 */ mr r3, r30 -/* 802B6624 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B6628 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B662C 38 84 02 ED */ addi r4, r4, 0x2ed -/* 802B6630 48 0B 23 65 */ bl strcmp -/* 802B6634 2C 03 00 00 */ cmpwi r3, 0 -/* 802B6638 40 82 00 98 */ bne lbl_802B66D0 -/* 802B663C 3B E0 00 01 */ li r31, 1 -/* 802B6640 48 00 00 90 */ b lbl_802B66D0 -/* 802B6644 7F C3 F3 78 */ mr r3, r30 -/* 802B6648 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B664C 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6650 38 84 02 FA */ addi r4, r4, 0x2fa -/* 802B6654 48 0B 23 41 */ bl strcmp -/* 802B6658 2C 03 00 00 */ cmpwi r3, 0 -/* 802B665C 40 82 00 74 */ bne lbl_802B66D0 -/* 802B6660 3B E0 00 01 */ li r31, 1 -/* 802B6664 48 00 00 6C */ b lbl_802B66D0 -/* 802B6668 7F C3 F3 78 */ mr r3, r30 -/* 802B666C 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B6670 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6674 38 84 03 06 */ addi r4, r4, 0x306 -/* 802B6678 48 0B 23 1D */ bl strcmp -/* 802B667C 2C 03 00 00 */ cmpwi r3, 0 -/* 802B6680 40 82 00 50 */ bne lbl_802B66D0 -/* 802B6684 3B E0 00 01 */ li r31, 1 -/* 802B6688 48 00 00 48 */ b lbl_802B66D0 -/* 802B668C 7F C3 F3 78 */ mr r3, r30 -/* 802B6690 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B6694 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B6698 38 84 03 10 */ addi r4, r4, 0x310 -/* 802B669C 48 0B 22 F9 */ bl strcmp -/* 802B66A0 2C 03 00 00 */ cmpwi r3, 0 -/* 802B66A4 40 82 00 2C */ bne lbl_802B66D0 -/* 802B66A8 3B E0 00 01 */ li r31, 1 -/* 802B66AC 48 00 00 24 */ b lbl_802B66D0 -/* 802B66B0 7F C3 F3 78 */ mr r3, r30 -/* 802B66B4 3C 80 80 3A */ lis r4, Z2StatusMgr__stringBase0@ha /* 0x8039BC88@ha */ -/* 802B66B8 38 84 BC 88 */ addi r4, r4, Z2StatusMgr__stringBase0@l /* 0x8039BC88@l */ -/* 802B66BC 38 84 02 D9 */ addi r4, r4, 0x2d9 -/* 802B66C0 48 0B 22 D5 */ bl strcmp -/* 802B66C4 2C 03 00 00 */ cmpwi r3, 0 -/* 802B66C8 40 82 00 08 */ bne lbl_802B66D0 -/* 802B66CC 3B E0 00 01 */ li r31, 1 -lbl_802B66D0: -/* 802B66D0 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802B66D4 41 82 00 1C */ beq lbl_802B66F0 -/* 802B66D8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) -/* 802B66DC 38 80 00 01 */ li r4, 1 -/* 802B66E0 4B FF DA 85 */ bl setBattleBgmOff__8Z2SeqMgrFb -/* 802B66E4 38 00 00 03 */ li r0, 3 -/* 802B66E8 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B66EC 48 00 00 18 */ b lbl_802B6704 -lbl_802B66F0: -/* 802B66F0 88 1D 00 2C */ lbz r0, 0x2c(r29) -/* 802B66F4 28 00 00 00 */ cmplwi r0, 0 -/* 802B66F8 40 82 00 0C */ bne lbl_802B6704 -/* 802B66FC 38 00 00 01 */ li r0, 1 -/* 802B6700 98 1D 00 2C */ stb r0, 0x2c(r29) -lbl_802B6704: -/* 802B6704 39 61 00 20 */ addi r11, r1, 0x20 -/* 802B6708 48 0A BB 21 */ bl _restgpr_29 -/* 802B670C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802B6710 7C 08 03 A6 */ mtlr r0 -/* 802B6714 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B6718 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_sel_info/__dt__12dFile_info_cFv.s b/asm/d/file/d_file_sel_info/__dt__12dFile_info_cFv.s deleted file mode 100644 index d93d2483038..00000000000 --- a/asm/d/file/d_file_sel_info/__dt__12dFile_info_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_801924A0: -/* 801924A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801924A4 7C 08 02 A6 */ mflr r0 -/* 801924A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801924AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801924B0 93 C1 00 08 */ stw r30, 8(r1) -/* 801924B4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 801924B8 7C 9F 23 78 */ mr r31, r4 -/* 801924BC 41 82 00 98 */ beq lbl_80192554 -/* 801924C0 3C 60 80 3C */ lis r3, __vt__12dFile_info_c@ha /* 0x803BB598@ha */ -/* 801924C4 38 03 B5 98 */ addi r0, r3, __vt__12dFile_info_c@l /* 0x803BB598@l */ -/* 801924C8 90 1E 00 00 */ stw r0, 0(r30) -/* 801924CC 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801924D0 28 03 00 00 */ cmplwi r3, 0 -/* 801924D4 41 82 00 18 */ beq lbl_801924EC -/* 801924D8 38 80 00 01 */ li r4, 1 -/* 801924DC 81 83 00 00 */ lwz r12, 0(r3) -/* 801924E0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801924E4 7D 89 03 A6 */ mtctr r12 -/* 801924E8 4E 80 04 21 */ bctrl -lbl_801924EC: -/* 801924EC 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 801924F0 28 03 00 00 */ cmplwi r3, 0 -/* 801924F4 41 82 00 18 */ beq lbl_8019250C -/* 801924F8 38 80 00 01 */ li r4, 1 -/* 801924FC 81 83 00 00 */ lwz r12, 0(r3) -/* 80192500 81 8C 00 08 */ lwz r12, 8(r12) -/* 80192504 7D 89 03 A6 */ mtctr r12 -/* 80192508 4E 80 04 21 */ bctrl -lbl_8019250C: -/* 8019250C 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80192510 28 03 00 00 */ cmplwi r3, 0 -/* 80192514 41 82 00 18 */ beq lbl_8019252C -/* 80192518 38 80 00 01 */ li r4, 1 -/* 8019251C 81 83 00 00 */ lwz r12, 0(r3) -/* 80192520 81 8C 00 08 */ lwz r12, 8(r12) -/* 80192524 7D 89 03 A6 */ mtctr r12 -/* 80192528 4E 80 04 21 */ bctrl -lbl_8019252C: -/* 8019252C 4B E8 25 01 */ bl mDoExt_removeMesgFont__Fv -/* 80192530 34 1E 00 08 */ addic. r0, r30, 8 -/* 80192534 41 82 00 10 */ beq lbl_80192544 -/* 80192538 3C 60 80 3C */ lis r3, __vt__16dDlst_FileInfo_c@ha /* 0x803BB588@ha */ -/* 8019253C 38 03 B5 88 */ addi r0, r3, __vt__16dDlst_FileInfo_c@l /* 0x803BB588@l */ -/* 80192540 90 1E 00 08 */ stw r0, 8(r30) -lbl_80192544: -/* 80192544 7F E0 07 35 */ extsh. r0, r31 -/* 80192548 40 81 00 0C */ ble lbl_80192554 -/* 8019254C 7F C3 F3 78 */ mr r3, r30 -/* 80192550 48 13 C7 ED */ bl __dl__FPv -lbl_80192554: -/* 80192554 7F C3 F3 78 */ mr r3, r30 -/* 80192558 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8019255C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80192560 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80192564 7C 08 03 A6 */ mtlr r0 -/* 80192568 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019256C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_sel_info/__dt__16dDlst_FileInfo_cFv.s b/asm/d/file/d_file_sel_info/__dt__16dDlst_FileInfo_cFv.s deleted file mode 100644 index f3bdc9d71a7..00000000000 --- a/asm/d/file/d_file_sel_info/__dt__16dDlst_FileInfo_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80192EC8: -/* 80192EC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80192ECC 7C 08 02 A6 */ mflr r0 -/* 80192ED0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80192ED4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80192ED8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80192EDC 41 82 00 1C */ beq lbl_80192EF8 -/* 80192EE0 3C A0 80 3C */ lis r5, __vt__16dDlst_FileInfo_c@ha /* 0x803BB588@ha */ -/* 80192EE4 38 05 B5 88 */ addi r0, r5, __vt__16dDlst_FileInfo_c@l /* 0x803BB588@l */ -/* 80192EE8 90 1F 00 00 */ stw r0, 0(r31) -/* 80192EEC 7C 80 07 35 */ extsh. r0, r4 -/* 80192EF0 40 81 00 08 */ ble lbl_80192EF8 -/* 80192EF4 48 13 BE 49 */ bl __dl__FPv -lbl_80192EF8: -/* 80192EF8 7F E3 FB 78 */ mr r3, r31 -/* 80192EFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80192F00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80192F04 7C 08 03 A6 */ mtlr r0 -/* 80192F08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80192F0C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_sel_info/__sinit_d_file_sel_info_cpp.s b/asm/d/file/d_file_sel_info/__sinit_d_file_sel_info_cpp.s deleted file mode 100644 index 145f9e4952b..00000000000 --- a/asm/d/file/d_file_sel_info/__sinit_d_file_sel_info_cpp.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80192E88: -/* 80192E88 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803BB498@ha */ -/* 80192E8C 38 A3 B4 98 */ addi r5, r3, cNullVec__6Z2Calc@l /* 0x803BB498@l */ -/* 80192E90 80 65 00 C0 */ lwz r3, 0xc0(r5) -/* 80192E94 80 05 00 C4 */ lwz r0, 0xc4(r5) -/* 80192E98 90 65 00 D8 */ stw r3, 0xd8(r5) -/* 80192E9C 90 05 00 DC */ stw r0, 0xdc(r5) -/* 80192EA0 80 05 00 C8 */ lwz r0, 0xc8(r5) -/* 80192EA4 90 05 00 E0 */ stw r0, 0xe0(r5) -/* 80192EA8 38 85 00 D8 */ addi r4, r5, 0xd8 -/* 80192EAC 80 65 00 CC */ lwz r3, 0xcc(r5) -/* 80192EB0 80 05 00 D0 */ lwz r0, 0xd0(r5) -/* 80192EB4 90 64 00 0C */ stw r3, 0xc(r4) -/* 80192EB8 90 04 00 10 */ stw r0, 0x10(r4) -/* 80192EBC 80 05 00 D4 */ lwz r0, 0xd4(r5) -/* 80192EC0 90 04 00 14 */ stw r0, 0x14(r4) -/* 80192EC4 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_sel_info/draw__16dDlst_FileInfo_cFv.s b/asm/d/file/d_file_sel_info/draw__16dDlst_FileInfo_cFv.s deleted file mode 100644 index a14415667fc..00000000000 --- a/asm/d/file/d_file_sel_info/draw__16dDlst_FileInfo_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80192D9C: -/* 80192D9C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80192DA0 7C 08 02 A6 */ mflr r0 -/* 80192DA4 90 01 00 54 */ stw r0, 0x54(r1) -/* 80192DA8 39 61 00 50 */ addi r11, r1, 0x50 -/* 80192DAC 48 1C F4 31 */ bl _savegpr_29 -/* 80192DB0 7C 7D 1B 78 */ mr r29, r3 -/* 80192DB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80192DB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80192DBC 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 80192DC0 80 7D 00 0C */ lwz r3, 0xc(r29) -/* 80192DC4 28 03 00 00 */ cmplwi r3, 0 -/* 80192DC8 41 82 00 94 */ beq lbl_80192E5C -/* 80192DCC 38 03 00 80 */ addi r0, r3, 0x80 -/* 80192DD0 7C 1E 03 78 */ mr r30, r0 -/* 80192DD4 80 9D 00 10 */ lwz r4, 0x10(r29) -/* 80192DD8 C0 24 00 2C */ lfs f1, 0x2c(r4) -/* 80192DDC C0 04 00 24 */ lfs f0, 0x24(r4) -/* 80192DE0 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80192DE4 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80192DE8 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80192DEC EC 61 00 28 */ fsubs f3, f1, f0 -/* 80192DF0 C0 24 00 28 */ lfs f1, 0x28(r4) -/* 80192DF4 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 80192DF8 EC 81 00 28 */ fsubs f4, f1, f0 -/* 80192DFC C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80192E00 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80192E04 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80192E08 38 61 00 08 */ addi r3, r1, 8 -/* 80192E0C EC 20 20 24 */ fdivs f1, f0, f4 -/* 80192E10 EC 43 10 24 */ fdivs f2, f3, f2 -/* 80192E14 C0 62 9F F8 */ lfs f3, lit_4000(r2) -/* 80192E18 48 1B 3B 51 */ bl PSMTXScale -/* 80192E1C 7F C3 F3 78 */ mr r3, r30 -/* 80192E20 38 81 00 08 */ addi r4, r1, 8 -/* 80192E24 7F C5 F3 78 */ mr r5, r30 -/* 80192E28 48 1B 36 BD */ bl PSMTXConcat -/* 80192E2C 80 7D 00 04 */ lwz r3, 4(r29) -/* 80192E30 3C 80 6D 5F */ lis r4, 0x6D5F /* 0x6D5F3032@ha */ -/* 80192E34 38 C4 30 32 */ addi r6, r4, 0x3032 /* 0x6D5F3032@l */ -/* 80192E38 38 A0 00 4E */ li r5, 0x4e -/* 80192E3C 81 83 00 00 */ lwz r12, 0(r3) -/* 80192E40 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80192E44 7D 89 03 A6 */ mtctr r12 -/* 80192E48 4E 80 04 21 */ bctrl -/* 80192E4C 7C 64 1B 78 */ mr r4, r3 -/* 80192E50 7F C3 F3 78 */ mr r3, r30 -/* 80192E54 38 84 00 50 */ addi r4, r4, 0x50 -/* 80192E58 48 1B 36 59 */ bl PSMTXCopy -lbl_80192E5C: -/* 80192E5C 80 7D 00 04 */ lwz r3, 4(r29) -/* 80192E60 C0 22 9F FC */ lfs f1, lit_4001(r2) -/* 80192E64 FC 40 08 90 */ fmr f2, f1 -/* 80192E68 7F E4 FB 78 */ mr r4, r31 -/* 80192E6C 48 16 60 69 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 80192E70 39 61 00 50 */ addi r11, r1, 0x50 -/* 80192E74 48 1C F3 B5 */ bl _restgpr_29 -/* 80192E78 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80192E7C 7C 08 03 A6 */ mtlr r0 -/* 80192E80 38 21 00 50 */ addi r1, r1, 0x50 -/* 80192E84 4E 80 00 20 */ blr diff --git a/include/JSystem/JAudio2/JASCmdStack.h b/include/JSystem/JAudio2/JASCmdStack.h index a7473cbc1b7..5bf14b286d6 100644 --- a/include/JSystem/JAudio2/JASCmdStack.h +++ b/include/JSystem/JAudio2/JASCmdStack.h @@ -2,5 +2,46 @@ #define JASCMDSTACK_H #include "dolphin/types.h" +#include "JSystem/JSupport/JSUList.h" + +class JASTrack; + +struct JASPortArgs { + JASTrack* _00; + u32 _04; + u32 _08; + f32 _0C; + f32 _10; + f32 _14; + f32 _18; + f32 _1C; + f32 _20; + u32 _24; + f32 _28; +}; + +struct JASPortCmd : JSULink { + typedef void (*Command)(JASPortArgs*); + + struct TPortHead : JSUList { + inline TPortHead() + : JSUList() + { + } + + ~TPortHead() {} + + void execCommandOnce(); + void execCommandStay(); + }; + + /* 80291060 */ static void execAllCommand(); + + Command _10; + JASPortArgs* _14; + + static TPortHead sCommandListOnce; + static TPortHead sCommandListStay; +}; #endif /* JASCMDSTACK_H */ diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 45128bc3b0f..b924d5e97e1 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -80,6 +80,7 @@ public: bool isRiding() const { return mRiding; } void i_setLinkState(u8 i_state) { mLinkState = i_state; } Z2SoundObjSimple& getKantera() { return mKantera; } + u8 getLinkHp() const { return mLinkHp; } static Z2CreatureLink* mLinkPtr; diff --git a/include/Z2AudioLib/Z2Param.h b/include/Z2AudioLib/Z2Param.h index 819c825092d..d384e22a767 100644 --- a/include/Z2AudioLib/Z2Param.h +++ b/include/Z2AudioLib/Z2Param.h @@ -42,4 +42,9 @@ struct Z2Param { static f32 ENEMY_LASTHIT_MUTE_VOLUME; }; +extern u8 struct_80450860; +extern u8 struct_80450861; +extern u8 struct_80450862; +extern u8 struct_80450863; + #endif /* Z2PARAM_H */ diff --git a/include/Z2AudioLib/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr.h index 1f6d9d5ebd9..15a0e3c410c 100644 --- a/include/Z2AudioLib/Z2SceneMgr.h +++ b/include/Z2AudioLib/Z2SceneMgr.h @@ -30,6 +30,7 @@ public: bool isSceneExist() const { return sceneExist; } int getCurrentSceneNum() const { return sceneNum; } + bool isInGame() const { return inGame; } private: /* 0x00 */ long BGM_ID; diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h index 3d44016e1f4..c29d1d72b8e 100644 --- a/include/Z2AudioLib/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr.h @@ -13,8 +13,12 @@ struct TTransition { struct Z2SoundFader { void move(f32 vol, u32 count) { - mIntensity = vol; - mTransition.zero(); + if (count != 0) { + mTransition.set(vol, mIntensity, count); + } else { + mIntensity = vol; + mTransition.zero(); + } } /* 0x0 */ float mIntensity; @@ -85,6 +89,10 @@ public: void i_bgmAllUnMute(u32 count) { mAllBgmMaster.move(1.0f, count); } + void i_muteSceneBgm(u32 count, f32 vol) { + field_0x44.move(vol, count); + } + void i_unMuteSceneBgm(u32 count) { mBgmPause.move(1.0f, 0); field_0x44.move(1.0f, count); diff --git a/libs/JSystem/JAudio2/JASCmdStack.cpp b/libs/JSystem/JAudio2/JASCmdStack.cpp index 15c03835084..52669b0c313 100644 --- a/libs/JSystem/JAudio2/JASCmdStack.cpp +++ b/libs/JSystem/JAudio2/JASCmdStack.cpp @@ -1,135 +1,42 @@ // -// Generated By: dol2asm -// Translation Unit: JASCmdStack +// JASCmdStack // #include "JSystem/JAudio2/JASCmdStack.h" -#include "dol2asm.h" - -// -// Types: -// - -struct JSUPtrLink {}; - -struct JSUPtrList { - /* 802DBEAC */ ~JSUPtrList(); - /* 802DBF14 */ void initiate(); - /* 802DC15C */ void remove(JSUPtrLink*); -}; - -struct JASPortCmd { - struct TPortHead { - /* 80291094 */ void execCommandOnce(); - /* 8029110C */ void execCommandStay(); - /* 802911D0 */ ~TPortHead(); - }; - - /* 80291060 */ void execAllCommand(); - - static u8 sCommandListOnce[12]; - static u8 sCommandListStay[12]; -}; - -// -// Forward References: -// - -extern "C" void execAllCommand__10JASPortCmdFv(); -extern "C" void execCommandOnce__Q210JASPortCmd9TPortHeadFv(); -extern "C" void execCommandStay__Q210JASPortCmd9TPortHeadFv(); -extern "C" void __sinit_JASCmdStack_cpp(); -extern "C" void __dt__Q210JASPortCmd9TPortHeadFv(); -extern "C" u8 sCommandListOnce__10JASPortCmd[12]; -extern "C" u8 sCommandListStay__10JASPortCmd[12]; - -// -// External References: -// - -extern "C" void __dl__FPv(); -extern "C" void __dt__10JSUPtrListFv(); -extern "C" void initiate__10JSUPtrListFv(); -extern "C" void remove__10JSUPtrListFP10JSUPtrLink(); -extern "C" void OSDisableInterrupts(); -extern "C" void OSRestoreInterrupts(); -extern "C" void __register_global_object(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80431678-80431684 05E398 000C+00 1/1 0/0 0/0 .bss @80 */ -static u8 lit_80[12]; +#include "dolphin/os/OS.h" /* 80431684-80431690 05E3A4 000C+00 1/2 0/0 0/0 .bss sCommandListOnce__10JASPortCmd */ -u8 JASPortCmd::sCommandListOnce[12]; - -/* 80431690-8043169C 05E3B0 000C+00 0/1 0/0 0/0 .bss @82 */ -#pragma push -#pragma force_active on -static u8 lit_82[12]; -#pragma pop +JASPortCmd::TPortHead JASPortCmd::sCommandListOnce; /* 8043169C-804316A8 05E3BC 000C+00 1/2 0/0 0/0 .bss sCommandListStay__10JASPortCmd */ -u8 JASPortCmd::sCommandListStay[12]; +JASPortCmd::TPortHead JASPortCmd::sCommandListStay; /* 80291060-80291094 28B9A0 0034+00 0/0 1/1 0/0 .text execAllCommand__10JASPortCmdFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASPortCmd::execAllCommand() { - nofralloc -#include "asm/JSystem/JAudio2/JASCmdStack/execAllCommand__10JASPortCmdFv.s" +void JASPortCmd::execAllCommand() { + sCommandListOnce.execCommandOnce(); + sCommandListStay.execCommandStay(); } -#pragma pop /* 80291094-8029110C 28B9D4 0078+00 1/1 0/0 0/0 .text execCommandOnce__Q210JASPortCmd9TPortHeadFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASPortCmd::TPortHead::execCommandOnce() { - nofralloc -#include "asm/JSystem/JAudio2/JASCmdStack/execCommandOnce__Q210JASPortCmd9TPortHeadFv.s" +void JASPortCmd::TPortHead::execCommandOnce() { + volatile BOOL interrupts = OSDisableInterrupts(); + JSULink* next; + for (JSULink* link = getFirst(); link != NULL; link = next) { + next = link->getNext(); + link->getObject()->_10(link->getObject()->_14); + remove(link); + } + OSRestoreInterrupts(interrupts); } -#pragma pop /* 8029110C-8029116C 28BA4C 0060+00 1/1 0/0 0/0 .text execCommandStay__Q210JASPortCmd9TPortHeadFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASPortCmd::TPortHead::execCommandStay() { - nofralloc -#include "asm/JSystem/JAudio2/JASCmdStack/execCommandStay__Q210JASPortCmd9TPortHeadFv.s" +void JASPortCmd::TPortHead::execCommandStay() { + volatile int interrupts = OSDisableInterrupts(); + for (JSULink* link = getFirst(); link != NULL; link = link->getNext()) { + link->getObject()->_10(link->getObject()->_14); + } + OSRestoreInterrupts(interrupts); } -#pragma pop -/* 8029116C-802911D0 28BAAC 0064+00 0/0 1/0 0/0 .text __sinit_JASCmdStack_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_JASCmdStack_cpp() { - nofralloc -#include "asm/JSystem/JAudio2/JASCmdStack/__sinit_JASCmdStack_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8029116C, __sinit_JASCmdStack_cpp); -#pragma pop - -/* 802911D0-80291228 28BB10 0058+00 1/1 0/0 0/0 .text __dt__Q210JASPortCmd9TPortHeadFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JASPortCmd::TPortHead::~TPortHead() { - nofralloc -#include "asm/JSystem/JAudio2/JASCmdStack/__dt__Q210JASPortCmd9TPortHeadFv.s" -} -#pragma pop diff --git a/libs/JSystem/JGadget/std-vector.cpp b/libs/JSystem/JGadget/std-vector.cpp index ccca33afe22..9f88dfb221a 100644 --- a/libs/JSystem/JGadget/std-vector.cpp +++ b/libs/JSystem/JGadget/std-vector.cpp @@ -5,6 +5,8 @@ #include "JSystem/JGadget/std-vector.h" #include "dolphin/types.h" +#include "algorithm.h" +#include "msl_memory.h" // // Types: @@ -12,23 +14,170 @@ namespace JGadget { struct vector { - /* 802DCCC8 */ void extend_default(u32, u32, u32); + /* 802DCCC8 */ static u32 extend_default(u32, u32, u32); }; -template -struct TAllocator {}; +template +struct TAllocator { + void destroy(T* item) {} + void deallocate(T* mem, u32 size) { + DeallocateRaw(mem); + } + void DeallocateRaw(T* mem) { + delete mem; + } + T* allocate(u32 count, void *param_2) { + return AllocateRaw(count * sizeof(T)); + } + T* AllocateRaw(u32 size) { + return (T*)new char[size]; + } + + u8 field_0x0; +}; /* TAllocator */ struct TAllocator__template0 {}; -struct TVector_pointer_void { - /* 802DCCD0 */ TVector_pointer_void(JGadget::TAllocator const&); - /* 802DCCFC */ ~TVector_pointer_void(); - /* 802DCDA4 */ void insert(void**, void* const&); - /* 802DCDC4 */ void erase(void**, void**); -}; +typedef u32 (*extendFunc)(u32, u32, u32); -template -struct TVector {}; +template > +struct TVector { + struct TDestructed_deallocate_ { + TDestructed_deallocate_(Allocator* allocator, T* addr) { + mAllocator = allocator; + mAddr = addr; + } + void set(T* addr) { + mAddr = addr; + } + inline ~TDestructed_deallocate_() { + mAllocator->deallocate(mAddr, 0); + } + Allocator* mAllocator; + T* mAddr; + }; + + TVector(Allocator const& param_0) { + field_0x0 = param_0; + pBegin_ = NULL; + pEnd_ = pBegin_; + mCapacity = 0; + pfnExtend_ = JGadget::vector::extend_default; + } + + ~TVector() { + clear(); + field_0x0.deallocate(pBegin_, 0); + } + + T* insert(T* pos, const T& val) { + u32 diff = (u32)pos - (u32)begin(); + insert(pos, 1, val); + return pBegin_ + diff; + } + + void insert(T* pos, u32 count, const T& val) { + if (count != 0) { + T* this_00 = Insert_raw(pos, count); + if (this_00 != end()) { + std::uninitialized_fill_n(this_00, count, val); + } + } + } + + T* Insert_raw(T* pos, u32 count) { + if (count == 0) { + return pos; + } + if (mCapacity < count + size()) { + u32 uVar4 = GetSize_extend_(count); + T* ppvVar5 = field_0x0.allocate(uVar4, NULL); + if (ppvVar5 == NULL) { + pos = end(); + } else { + TDestructed_deallocate_ aTStack_30(&field_0x0, ppvVar5); + T* ppvVar6 = std::uninitialized_copy(pBegin_, pos, ppvVar5); + std::uninitialized_copy(pos, pEnd_, ppvVar6 + count); + DestroyElement_all_(); + aTStack_30.set(pBegin_); + u32 uVar2 = (u32)pEnd_ - (u32)pBegin_; + pEnd_ = ppvVar5 + count + (uVar2 / 4); + pBegin_ = ppvVar5; + mCapacity = uVar4; + pos = ppvVar6; + } + } else { + T* ppvVar5 = pos + count; + if (ppvVar5 < pEnd_) { + T* ppvVar6 = pEnd_ - count; + std::uninitialized_copy(ppvVar6, pEnd_, pEnd_); + std::copy_backward(pos, ppvVar6, pEnd_); + DestroyElement_(pos, ppvVar5); + pEnd_ += count; + } else { + std::uninitialized_copy(pos, pEnd_, ppvVar5); + DestroyElement_(pos, pEnd_); + pEnd_ += count; + } + } + return pos; + } + + T* begin() { + return pBegin_; + } + + T* end() { + return pEnd_; + } + + u32 size() { + if (pBegin_ == 0) { + return 0; + } + return ((u32)pEnd_ - (u32)pBegin_) / 4; + } + + u32 capacity() { return mCapacity; } + + u32 GetSize_extend_(u32 count) { + u32 iVar2 = size(); + u32 uVar3 = capacity(); + u32 uVar4 = pfnExtend_(uVar3, iVar2, count); + if (uVar4 < iVar2 + count) { + uVar4 = iVar2 + count; + } + return uVar4; + } + + void DestroyElement_(T* start, T* end) { + for (; start != end; start++) { + field_0x0.destroy(start); + } + } + + void DestroyElement_all_() { + DestroyElement_(pBegin_, pEnd_); + } + + T* erase(T* start, T* end) { + T* vectorEnd = pEnd_; + T* ppvVar3 = std::copy(end, vectorEnd, start); + DestroyElement_(ppvVar3, pEnd_); + pEnd_ = ppvVar3; + return start; + } + + void clear() { + erase(begin(), end()); + } + + Allocator field_0x0; + T* pBegin_; + T* pEnd_; + u32 mCapacity; + extendFunc pfnExtend_; +}; /* TVector> */ struct TVector__template0 { /* 802DD130 */ void func_802DD130(void* _this, void**, void* const&); @@ -36,6 +185,13 @@ struct TVector__template0 { /* 802DCE8C */ void func_802DCE8C(void* _this, void**, u32); }; +struct TVector_pointer_void : public TVector { + /* 802DCCD0 */ TVector_pointer_void(JGadget::TAllocator const&); + /* 802DCCFC */ ~TVector_pointer_void(); + /* 802DCDA4 */ void insert(void**, void* const&); + /* 802DCDC4 */ void** erase(void**, void**); +}; + }; // namespace JGadget // @@ -67,38 +223,27 @@ extern "C" void _restgpr_29(); // /* 802DCCC8-802DCCD0 2D7608 0008+00 1/1 0/0 0/0 .text extend_default__Q27JGadget6vectorFUlUlUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JGadget::vector::extend_default(u32 param_0, u32 param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JGadget/std-vector/extend_default__Q27JGadget6vectorFUlUlUl.s" +u32 JGadget::vector::extend_default(u32 param_0, u32 param_1, u32 param_2) { + return param_1 << 1; } -#pragma pop /* 802DCCD0-802DCCFC 2D7610 002C+00 0/0 1/1 0/0 .text * __ct__Q27JGadget20TVector_pointer_voidFRCQ27JGadget14TAllocator */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JGadget::TVector_pointer_void::TVector_pointer_void(JGadget::TAllocator const& param_0) { - nofralloc -#include "asm/JSystem/JGadget/std-vector/func_802DCCD0.s" +JGadget::TVector_pointer_void::TVector_pointer_void(JGadget::TAllocator const& param_0) : TVector(param_0) { } -#pragma pop /* 802DCCFC-802DCDA4 2D763C 00A8+00 0/0 2/2 0/0 .text __dt__Q27JGadget20TVector_pointer_voidFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JGadget::TVector_pointer_void::~TVector_pointer_void() { - nofralloc -#include "asm/JSystem/JGadget/std-vector/__dt__Q27JGadget20TVector_pointer_voidFv.s" +JGadget::TVector_pointer_void::~TVector_pointer_void() { } -#pragma pop /* 802DCDA4-802DCDC4 2D76E4 0020+00 0/0 1/1 0/0 .text * insert__Q27JGadget20TVector_pointer_voidFPPvRCPv */ +// the entire function chain needs work +#ifdef NONMATCHING +void JGadget::TVector_pointer_void::insert(void** param_0, void* const& param_1) { + TVector::insert(param_0, param_1); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -107,17 +252,13 @@ asm void JGadget::TVector_pointer_void::insert(void** param_0, void* const& para #include "asm/JSystem/JGadget/std-vector/insert__Q27JGadget20TVector_pointer_voidFPPvRCPv.s" } #pragma pop +#endif /* 802DCDC4-802DCE1C 2D7704 0058+00 0/0 1/1 0/0 .text * erase__Q27JGadget20TVector_pointer_voidFPPvPPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JGadget::TVector_pointer_void::erase(void** param_0, void** param_1) { - nofralloc -#include "asm/JSystem/JGadget/std-vector/erase__Q27JGadget20TVector_pointer_voidFPPvPPv.s" +void** JGadget::TVector_pointer_void::erase(void** param_0, void** param_1) { + return TVector::erase(param_0, param_1); } -#pragma pop /* 802DCE1C-802DCE8C 2D775C 0070+00 1/1 0/0 0/0 .text * insert__Q27JGadget38TVector>FPPvUlRCPv */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h index 9ffe9187668..1a5bd7385f9 100644 --- a/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h @@ -43,6 +43,24 @@ void fill(ForwardIt first, ForwardIt last, const T& value) { *first = value; } } + +template +inline OutputIt copy(InputIt first, InputIt last, + OutputIt d_first) { + for (; first < last; ++first, ++d_first) { + *d_first = *first; + } + return d_first; +} + +template +inline BidirIt2 copy_backward(BidirIt1 first, BidirIt1 last, BidirIt2 d_last) { + while (first != last) { + *(--d_last) = *(--last); + } + return d_last; +} + } // namespace std #endif diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h new file mode 100644 index 00000000000..4a99da9a477 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h @@ -0,0 +1,24 @@ +#ifndef MSL_MEMORY_H_ +#define MSL_MEMORY_H_ + +namespace std { + +template +inline ForwardIt uninitialized_fill_n(ForwardIt first, Size count, const T& value) { + for (; count > 0; ++first, (void) --count) { + *first = value; + } + return first; +} + +template +inline NoThrowForwardIt uninitialized_copy(InputIt first, InputIt last, NoThrowForwardIt d_first) { + for (; first != last; ++first, ++d_first) { + *d_first = *first; + } + return d_first; +} + +} + +#endif diff --git a/libs/Z2AudioLib/Z2Param.cpp b/libs/Z2AudioLib/Z2Param.cpp index 686c10517e4..84f9cee2979 100644 --- a/libs/Z2AudioLib/Z2Param.cpp +++ b/libs/Z2AudioLib/Z2Param.cpp @@ -123,17 +123,10 @@ f32 Z2Param::VOL_SE_OBJECT_PAUSING = 72.0f / 127.0f; f32 Z2Param::VOL_SE_ATMOSPHERE_PAUSING = 72.0f / 127.0f; /* 80450860-80450864 -00001 0004+00 0/0 15/15 0/0 .sdata None */ -extern u8 struct_80450860[4]; -u8 struct_80450860[4] = { - /* 80450860 0001+00 data_80450860 None */ - 0x21, - /* 80450861 0001+00 data_80450861 None */ - 0x3C, - /* 80450862 0001+00 data_80450862 None */ - 0x3C, - /* 80450863 0001+00 data_80450863 None */ - 0x1E, -}; +u8 struct_80450860 = 0x21; +u8 struct_80450861 = 0x3C; +u8 struct_80450862 = 0x3C; +u8 struct_80450863 = 0x1E; /* 80450864-80450868 -00001 0004+00 0/0 2/2 0/0 .sdata None */ extern u8 struct_80450864[4]; diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 57ec4423470..2df20f2842f 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -7,6 +7,7 @@ #include "Z2AudioLib/Z2SoundMgr.h" #include "Z2AudioLib/Z2SeqMgr.h" #include "Z2AudioLib/Z2SeMgr.h" +#include "Z2AudioLib/Z2Param.h" #include "dol2asm.h" #include "global.h" @@ -141,7 +142,6 @@ extern "C" void _restgpr_16(); extern "C" void _restgpr_29(); extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450860[4]; extern "C" extern u8 data_80450B3C[4]; extern "C" extern u8 data_80450B40[4]; extern "C" extern u8 data_80450B48[4]; diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp index 6bc5a36c188..d6bb9791158 100644 --- a/libs/Z2AudioLib/Z2SeqMgr.cpp +++ b/libs/Z2AudioLib/Z2SeqMgr.cpp @@ -4,6 +4,7 @@ // #include "Z2AudioLib/Z2SeqMgr.h" +#include "Z2AudioLib/Z2Param.h" #include "dol2asm.h" // @@ -32,13 +33,6 @@ struct Z2SceneMgr { /* 802B68E0 */ void setSceneExist(bool); }; -struct Z2Param { - static f32 VOL_BGM_DEFAULT; - static f32 VOL_BGM_TALKING; - static f32 VOL_BGM_PAUSING; - static f32 ENEMY_LASTHIT_MUTE_VOLUME; -}; - struct Z2CreatureLink { static u8 mLinkPtr[4 + 4 /* padding */]; }; @@ -151,7 +145,6 @@ extern "C" void _restgpr_29(); extern "C" f32 VOL_BGM_DEFAULT__7Z2Param; extern "C" f32 VOL_BGM_TALKING__7Z2Param; extern "C" f32 VOL_BGM_PAUSING__7Z2Param; -extern "C" extern u8 struct_80450860[4]; extern "C" extern u8 struct_80450864[4]; extern "C" extern u8 struct_80450868[4]; extern "C" extern u32 data_8045086C; diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp index d5e468f2566..0db1b0cecd5 100644 --- a/libs/Z2AudioLib/Z2StatusMgr.cpp +++ b/libs/Z2AudioLib/Z2StatusMgr.cpp @@ -1,84 +1,14 @@ // -// Generated By: dol2asm -// Translation Unit: Z2StatusMgr +// Z2StatusMgr // #include "Z2AudioLib/Z2StatusMgr.h" +#include "Z2AudioLib/Z2Creature.h" +#include "Z2AudioLib/Z2Param.h" #include "d/com/d_com_inf_game.h" +#include "d/s/d_s_play.h" #include "dol2asm.h" -// -// Forward References: -// - -extern "C" void __ct__11Z2StatusMgrFv(); -extern "C" void heartGaugeOn__11Z2StatusMgrFv(); -extern "C" void processHeartGaugeSound__11Z2StatusMgrFv(); -extern "C" void talkIn__11Z2StatusMgrFv(); -extern "C" void talkOut__11Z2StatusMgrFv(); -extern "C" void menuIn__11Z2StatusMgrFv(); -extern "C" void menuOut__11Z2StatusMgrFv(); -extern "C" bool isMovieDemo__11Z2StatusMgrFv(); -extern "C" void setDemoName__11Z2StatusMgrFPc(); -extern "C" void processTime__11Z2StatusMgrFv(); -extern "C" bool checkDayTime__11Z2StatusMgrFv(); -extern "C" void setEventBit__11Z2StatusMgrFPv(); -extern "C" void setCameraPolygonPos__11Z2StatusMgrFP3Vec(); -extern "C" void setCameraGroupInfo__11Z2StatusMgrFUc(); -extern "C" void setCameraInWaterDepth__11Z2StatusMgrFf(); -extern "C" extern char const* const Z2StatusMgr__stringBase0; - -// -// External References: -// - -extern "C" void moveVolume__18JAISoundParamsMoveFfUl(); -extern "C" void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seMoveVolumeAll__7Z2SeMgrFfUl(); -extern "C" void talkInSe__7Z2SeMgrFv(); -extern "C" void talkOutSe__7Z2SeMgrFv(); -extern "C" void menuInSe__7Z2SeMgrFv(); -extern "C" void subBgmStart__8Z2SeqMgrFUl(); -extern "C" void subBgmStop__8Z2SeqMgrFv(); -extern "C" void bgmStreamPrepare__8Z2SeqMgrFUl(); -extern "C" void bgmStreamPlay__8Z2SeqMgrFv(); -extern "C" void bgmStreamStop__8Z2SeqMgrFUl(); -extern "C" void talkInBgm__8Z2SeqMgrFv(); -extern "C" void talkOutBgm__8Z2SeqMgrFv(); -extern "C" void menuInBgm__8Z2SeqMgrFv(); -extern "C" void menuOutBgm__8Z2SeqMgrFv(); -extern "C" void setBattleBgmOff__8Z2SeqMgrFb(); -extern "C" void sceneBgmStart__10Z2SceneMgrFv(); -extern "C" void setUnderWaterFx__11Z2FxLineMgrFb(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern u8 struct_80450860[4]; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern Z2SeqMgr* data_80450B84; -extern "C" extern Z2SeMgr* data_80450B88; -extern "C" extern u8 pauseTimer__9dScnPly_c[4]; -extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; -extern "C" extern u8 __OSReport_disable; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80455A18-80455A1C 004018 0004+00 1/1 0/0 0/0 .sdata2 @3395 */ -SECTION_SDATA2 static f32 lit_3395 = 10000000.0f; - -/* 80455A1C-80455A20 00401C 0004+00 3/3 0/0 0/0 .sdata2 @3396 */ -SECTION_SDATA2 static u8 lit_3396[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 802B5F1C-802B5F70 2B085C 0054+00 0/0 1/1 0/0 .text __ct__11Z2StatusMgrFv */ Z2StatusMgr::Z2StatusMgr() : JASGlobalInstance(this) { mHour = 0; @@ -90,14 +20,12 @@ Z2StatusMgr::Z2StatusMgr() : JASGlobalInstance(this) { mIsMenuIn = false; mCameraMapInfo = 0; - f32 temp_f0 = lit_3395; - mPolygonPosition.x = temp_f0; - mPolygonPosition.y = temp_f0; - mPolygonPosition.z = temp_f0; + mPolygonPosition.x = 10000000.0f; + mPolygonPosition.y = 10000000.0f; + mPolygonPosition.z = 10000000.0f; - f32 temp_f0_2 = FLOAT_LABEL(lit_3396); - mUnderwaterDepth = temp_f0_2; - mCameraInWaterDepthRatio = temp_f0_2; + mUnderwaterDepth = 0.0f; + mCameraInWaterDepthRatio = 0.0f; mDemoStatus = 0; mHeartGaugeOn = 0; @@ -108,22 +36,32 @@ void Z2StatusMgr::heartGaugeOn() { mHeartGaugeOn = 2; } -/* ############################################################################################## */ -/* 80455A20-80455A24 004020 0004+00 3/3 0/0 0/0 .sdata2 @3467 */ -SECTION_SDATA2 static f32 lit_3467 = 1.0f; - -/* 80455A24-80455A28 004024 0004+00 1/1 0/0 0/0 .sdata2 @3468 */ -SECTION_SDATA2 static f32 lit_3468 = -1.0f; - /* 802B5F7C-802B60CC 2B08BC 0150+00 0/0 1/1 0/0 .text processHeartGaugeSound__11Z2StatusMgrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2StatusMgr::processHeartGaugeSound() { - nofralloc -#include "asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s" +void Z2StatusMgr::processHeartGaugeSound() { + if (!i_dComIfGp_event_runCheck() && mHeartGaugeOn != 0) { + if (dScnPly_c::isPause()) { + mHeartGaugeOn--; + } + + if (Z2GetLink() == NULL) { + return; + } + u32 linkHp = Z2GetLink()->getLinkHp(); + if (linkHp == 0) { + return; + } + if (Z2GetSeqMgr()->isItemGetDemo()) { + return; + } + if (linkHp <= 2) { + Z2GetSeMgr()->seStartLevel(Z2SE_ALMOST_DIE_ALERM_3, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else if (linkHp <= 4) { + Z2GetSeMgr()->seStartLevel(Z2SE_ALMOST_DIE_ALERM_2, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else if (linkHp <= 6) { + Z2GetSeMgr()->seStartLevel(Z2SE_ALMOST_DIE_ALERM_1, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } } -#pragma pop /* 802B60CC-802B6104 2B0A0C 0038+00 0/0 1/1 0/0 .text talkIn__11Z2StatusMgrFv */ void Z2StatusMgr::talkIn() { @@ -247,90 +185,109 @@ SECTION_DEAD static char const* const stringBase_8039BED6 = "D_SB07"; SECTION_DEAD static char const* const stringBase_8039BEDD = "D_SB08"; SECTION_DEAD static char const* const stringBase_8039BEE4 = "D_SB09"; SECTION_DEAD static char const* const stringBase_8039BEEB = "D_SB10"; -SECTION_DEAD static char const* const stringBase_8039BEF2 = "force_end"; -SECTION_DEAD static char const* const stringBase_8039BEFC = "SAVEREQ"; -SECTION_DEAD static char const* const stringBase_8039BF04 = "SAVEGID"; -SECTION_DEAD static char const* const stringBase_8039BF0C = "demo36_01"; -SECTION_DEAD static char const* const stringBase_8039BF16 = "demo36_02"; -SECTION_DEAD static char const* const stringBase_8039BF20 = "demo37_01"; -SECTION_DEAD static char const* const stringBase_8039BF2A = "demo31"; -SECTION_DEAD static char const* const stringBase_8039BF31 = "demo"; -SECTION_DEAD static char const* const stringBase_8039BF36 = "force_start"; -SECTION_DEAD static char const* const stringBase_8039BF42 = "KAGO_HIKARI"; -SECTION_DEAD static char const* const stringBase_8039BF4E = "KAGO_YAMI"; -SECTION_DEAD static char const* const stringBase_8039BF58 = "HYRULEOP"; -SECTION_DEAD static char const* const stringBase_8039BF61 = "R00_start"; -SECTION_DEAD static char const* const stringBase_8039BF6B = "B_W_START"; -SECTION_DEAD static char const* const stringBase_8039BF75 = "L0_rampart01"; -SECTION_DEAD static char const* const stringBase_8039BF82 = "R22-opening"; -SECTION_DEAD static char const* const stringBase_8039BF8E = "R01-start"; -SECTION_DEAD static char const* const stringBase_8039BF98 = "LV3R00OP"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039BFA1 = "\0\0\0\0\0\0"; + #pragma pop -/* 803CA508-803CA5C0 -00001 00B8+00 1/1 0/0 0/0 .data @3732 */ -SECTION_DATA static void* lit_3732[46] = { - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x438), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x3F8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x3C0), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x45C), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x480), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4A4), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4C8), -}; - -/* 80455A28-80455A30 004028 0008+00 1/1 0/0 0/0 .sdata2 @3731 */ -SECTION_SDATA2 static f64 lit_3731 = 4503599627370496.0 /* cast u32 to float */; - /* 802B61E8-802B671C 2B0B28 0534+00 1/0 7/7 11/11 .text setDemoName__11Z2StatusMgrFPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2StatusMgr::setDemoName(char* param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2StatusMgr/setDemoName__11Z2StatusMgrFPc.s" +void Z2StatusMgr::setDemoName(char* demoName) { + if (mDemoStatus == 11) { + mDemoStatus = 0; + if (Z2GetSceneMgr()->isInGame()) { + Z2GetSceneMgr()->sceneBgmStart(); + } + } + if (demoName == NULL) { + if (mDemoStatus == 3) { + Z2GetSeqMgr()->setBattleBgmOff(false); + } else if (mDemoStatus == 4) { + Z2GetSeqMgr()->i_unMuteSceneBgm(struct_80450861); + } else if (mDemoStatus == 5) { + Z2GetSeqMgr()->subBgmStop(); + } else if (mDemoStatus == 9) { + Z2GetSeqMgr()->bgmStreamStop(0x3c); + } + if (mDemoStatus != 8) { + mDemoStatus = 0; + } + } else { + bool bVar1 = false; + if (mDemoStatus == 8) { + if (strcmp(demoName, "force_end") == 0) { + mDemoStatus = 0; + } + } else if (strcmp(demoName, "SAVEREQ") == 0 || strcmp(demoName, "SAVEGID") == 0) { + mDemoStatus = 11; + } else if (strcmp(demoName, "demo36_01") == 0 || strcmp(demoName, "demo36_02") == 0) { + mDemoStatus = 4; + Z2GetSeqMgr()->i_muteSceneBgm(0x1e, 0.0f); + } else if (strcmp(demoName, "demo37_01") == 0) { + mDemoStatus = 12; + Z2GetSoundMgr()->getSeMgr()->getCategory(9)->getParams()->moveVolume(0.0f, 0); + } else if (strncmp(demoName, "demo31", 6) == 0) { + mDemoStatus = 13; + Z2GetSeMgr()->seMoveVolumeAll(0.0f, 0); + } else if (strncmp(demoName, "demo", 4) == 0) { + mDemoStatus = 2; + } else if (strcmp(demoName, "force_start") == 0) { + mDemoStatus = 8; + } else if (strcmp(demoName, "force_end") == 0) { + mDemoStatus = 0; + } else if (strcmp(demoName, "KAGO_HIKARI") == 0) { + mDemoStatus = 6; + } else if (strcmp(demoName, "KAGO_YAMI") == 0) { + mDemoStatus = 7; + } else if (strcmp(demoName, "HYRULEOP") == 0) { + mDemoStatus = 10; + } else { + switch (Z2GetSceneMgr()->getCurrentSceneNum()) { + case 0xe: + if (strcmp(demoName, "R00_start") == 0) { + mDemoStatus = 5; + Z2GetSeqMgr()->subBgmStart(Z2BGM_HIDDEN_VIL_D1); + } + break; + case 5: + if (strcmp(demoName, "B_W_START") == 0) { + Z2GetSeqMgr()->bgmStreamPrepare(0x200005f); + Z2GetSeqMgr()->bgmStreamPlay(); + mDemoStatus = 9; + } + break; + case 4: + if (strcmp(demoName, "L0_rampart01") == 0) { + bVar1 = true; + } + break; + case 0x28: + if (strcmp(demoName, "R22-opening") == 0) { + bVar1 = true; + } + break; + case 0x2b: + if (strcmp(demoName, "R01-start") == 0) { + bVar1 = true; + } + break; + case 0x2e: + if (strcmp(demoName, "LV3R00OP") == 0) { + bVar1 = true; + } + break; + case 0x31: + if (strcmp(demoName, "R00_start") == 0) { + bVar1 = true; + } + break; + } + if (bVar1) { + Z2GetSeqMgr()->setBattleBgmOff(true); + mDemoStatus = 3; + } else if (mDemoStatus == 0) { + mDemoStatus = 1; + } + } + } } -#pragma pop /* 802B671C-802B6734 2B105C 0018+00 0/0 1/1 0/0 .text processTime__11Z2StatusMgrFv */ void Z2StatusMgr::processTime() { @@ -362,21 +319,25 @@ void Z2StatusMgr::setCameraPolygonPos(Vec* i_polygonPos) { /* 802B6784-802B6788 2B10C4 0004+00 0/0 1/1 0/0 .text setCameraGroupInfo__11Z2StatusMgrFUc */ void Z2StatusMgr::setCameraGroupInfo(u8) {} -/* ############################################################################################## */ -/* 80455A30-80455A34 004030 0004+00 1/1 0/0 0/0 .sdata2 @3798 */ -SECTION_SDATA2 static f32 lit_3798 = 2000.0f; - -/* 80455A34-80455A38 004034 0004+00 1/1 0/0 0/0 .sdata2 @3799 */ -SECTION_SDATA2 static f32 lit_3799 = 1.0f / 5.0f; - /* 802B6788-802B6840 2B10C8 00B8+00 0/0 2/2 0/0 .text setCameraInWaterDepth__11Z2StatusMgrFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2StatusMgr::setCameraInWaterDepth(f32 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2StatusMgr/setCameraInWaterDepth__11Z2StatusMgrFf.s" +void Z2StatusMgr::setCameraInWaterDepth(f32 depth) { + if (0.0f == depth) { + mCameraInWaterDepthRatio = 0.0f; + Z2GetFxLineMgr()->setUnderWaterFx(false); + } else { + if (Z2GetLink() != NULL) { + if (Z2GetLink()->isInWater()) { + if (depth >= 2000.0f) { + mCameraInWaterDepthRatio = 1.0f; + } else { + mCameraInWaterDepthRatio = + Z2Calc::getParamByExp(depth, 0.0f, 2000.0f, 0.2f, 0.0f, 1.0f, Z2Calc::CURVE_SIGN_0); + } + Z2GetFxLineMgr()->setUnderWaterFx(true); + } + } + } + mUnderwaterDepth = depth; } -#pragma pop /* 8039BC88-8039BC88 0282E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index 93aa6f93aa2..6b965835d97 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -1,6 +1,5 @@ // -// Generated By: dol2asm -// Translation Unit: Z2WolfHowlMgr +// Z2WolfHowlMgr // #include "Z2AudioLib/Z2WolfHowlMgr.h" @@ -14,22 +13,6 @@ #include "dolphin/os/OS.h" #include "d/d_demo.h" -// -// Types: -// - -// -// Forward References: -// - -// -// External References: -// - -// -// Declarations: -// - /* ############################################################################################## */ /* 804508A0-804508A8 000320 0008+00 1/0 0/0 0/0 .sdata sHowlTobikusa */ extern SongNote sHowlTobikusa[4]; diff --git a/obj_files.mk b/obj_files.mk index 24f8f5c20e7..6a21135ee70 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -1054,6 +1054,7 @@ O_FILES_SYM_ON := \ $(BUILD_DIR)/libs/JSystem/JUtility/JUTResFont.o \ $(BUILD_DIR)/libs/JSystem/JAudio2/JAUAudioArcLoader.o \ $(BUILD_DIR)/libs/Z2AudioLib/Z2AudioArcLoader.o \ + $(BUILD_DIR)/libs/Z2AudioLib/JASCmdStack.o \ $(BUILD_DIR)/src/d/bg/d_bg_s_grp_pass_chk.o \ $(BUILD_DIR)/src/d/file/d_file_sel_info.o \ \ No newline at end of file