diff --git a/asm/d/a/d_a_alink/checkEventRun__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkEventRun__9daAlink_cCFv.s deleted file mode 100644 index d022c155ed7..00000000000 --- a/asm/d/a/d_a_alink/checkEventRun__9daAlink_cCFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80115C20: -/* 80115C20 38 A0 00 00 */ li r5, 0 -/* 80115C24 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80115C28 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80115C2C 88 04 4F AD */ lbz r0, 0x4fad(r4) -/* 80115C30 28 00 00 00 */ cmplwi r0, 0 -/* 80115C34 40 82 00 10 */ bne lbl_80115C44 -/* 80115C38 A0 03 06 04 */ lhz r0, 0x604(r3) -/* 80115C3C 2C 00 00 00 */ cmpwi r0, 0 -/* 80115C40 41 82 00 08 */ beq lbl_80115C48 -lbl_80115C44: -/* 80115C44 38 A0 00 01 */ li r5, 1 -lbl_80115C48: -/* 80115C48 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80115C4C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkFastUnequip__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkFastUnequip__9daAlink_cFv.s deleted file mode 100644 index e18691a0850..00000000000 --- a/asm/d/a/d_a_alink/checkFastUnequip__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800B97EC: -/* 800B97EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B97F0 7C 08 02 A6 */ mflr r0 -/* 800B97F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B97F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B97FC 3B E0 00 00 */ li r31, 0 -/* 800B9800 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800B9804 28 00 00 00 */ cmplwi r0, 0 -/* 800B9808 41 82 00 18 */ beq lbl_800B9820 -/* 800B980C 28 00 00 3B */ cmplwi r0, 0x3b -/* 800B9810 41 82 00 10 */ beq lbl_800B9820 -/* 800B9814 48 05 C4 0D */ bl checkEventRun__9daAlink_cCFv -/* 800B9818 2C 03 00 00 */ cmpwi r3, 0 -/* 800B981C 41 82 00 08 */ beq lbl_800B9824 -lbl_800B9820: -/* 800B9820 3B E0 00 01 */ li r31, 1 -lbl_800B9824: -/* 800B9824 7F E3 FB 78 */ mr r3, r31 -/* 800B9828 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B982C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B9830 7C 08 03 A6 */ mtlr r0 -/* 800B9834 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B9838 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGoronRide__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkGoronRide__9daAlink_cFv.s deleted file mode 100644 index a9dffcc705b..00000000000 --- a/asm/d/a/d_a_alink/checkGoronRide__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800A2280: -/* 800A2280 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800A2284 7C 08 02 A6 */ mflr r0 -/* 800A2288 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A228C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800A2290 7C 7F 1B 78 */ mr r31, r3 -/* 800A2294 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 800A2298 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800A229C 41 82 00 34 */ beq lbl_800A22D0 -/* 800A22A0 38 7F 1A 60 */ addi r3, r31, 0x1a60 -/* 800A22A4 38 80 00 00 */ li r4, 0 -/* 800A22A8 4B FF FF 39 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi -/* 800A22AC 7C 60 07 34 */ extsh r0, r3 -/* 800A22B0 2C 00 00 21 */ cmpwi r0, 0x21 -/* 800A22B4 40 82 00 1C */ bne lbl_800A22D0 -/* 800A22B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800A22BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800A22C0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800A22C4 A0 9F 1A 62 */ lhz r4, 0x1a62(r31) -/* 800A22C8 4B FD 23 51 */ bl GetActorPointer__4cBgSCFi -/* 800A22CC 48 00 00 08 */ b lbl_800A22D4 -lbl_800A22D0: -/* 800A22D0 38 60 00 00 */ li r3, 0 -lbl_800A22D4: -/* 800A22D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800A22D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800A22DC 7C 08 03 A6 */ mtlr r0 -/* 800A22E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A22E4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/commonCheckNextAction__9daAlink_cFi.s b/asm/d/a/d_a_alink/commonCheckNextAction__9daAlink_cFi.s deleted file mode 100644 index 9fb0f852150..00000000000 --- a/asm/d/a/d_a_alink/commonCheckNextAction__9daAlink_cFi.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800BA09C: -/* 800BA09C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BA0A0 7C 08 02 A6 */ mflr r0 -/* 800BA0A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BA0A8 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800BA0AC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800BA0B0 41 82 00 0C */ beq lbl_800BA0BC -/* 800BA0B4 48 06 FA 91 */ bl checkNextActionWolf__9daAlink_cFi -/* 800BA0B8 48 00 00 08 */ b lbl_800BA0C0 -lbl_800BA0BC: -/* 800BA0BC 48 00 00 15 */ bl checkNextAction__9daAlink_cFi -lbl_800BA0C0: -/* 800BA0C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BA0C4 7C 08 03 A6 */ mtlr r0 -/* 800BA0C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BA0CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/commonLineCheck__9daAlink_cFP4cXyzP4cXyz.s b/asm/d/a/d_a_alink/commonLineCheck__9daAlink_cFP4cXyzP4cXyz.s deleted file mode 100644 index c04476d05de..00000000000 --- a/asm/d/a/d_a_alink/commonLineCheck__9daAlink_cFP4cXyzP4cXyz.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800A2198: -/* 800A2198 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800A219C 7C 08 02 A6 */ mflr r0 -/* 800A21A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A21A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800A21A8 7C 7F 1B 78 */ mr r31, r3 -/* 800A21AC 38 7F 1B 48 */ addi r3, r31, 0x1b48 -/* 800A21B0 7F E6 FB 78 */ mr r6, r31 -/* 800A21B4 4B FD 5B B1 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 800A21B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800A21BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800A21C0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800A21C4 38 9F 1B 48 */ addi r4, r31, 0x1b48 -/* 800A21C8 4B FD 21 ED */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 800A21CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800A21D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800A21D4 7C 08 03 A6 */ mtlr r0 -/* 800A21D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A21DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi.s b/asm/d/a/d_a_alink/getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi.s deleted file mode 100644 index 9cf56cceb63..00000000000 --- a/asm/d/a/d_a_alink/getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_800A21E0: -/* 800A21E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800A21E4 7C 08 02 A6 */ mflr r0 -/* 800A21E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A21EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800A21F0 93 C1 00 08 */ stw r30, 8(r1) -/* 800A21F4 7C 7E 1B 78 */ mr r30, r3 -/* 800A21F8 2C 04 00 00 */ cmpwi r4, 0 -/* 800A21FC 40 82 00 20 */ bne lbl_800A221C -/* 800A2200 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800A2204 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800A2208 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800A220C 7F C4 F3 78 */ mr r4, r30 -/* 800A2210 4B FD 24 51 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo -/* 800A2214 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800A2218 41 82 00 4C */ beq lbl_800A2264 -lbl_800A221C: -/* 800A221C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800A2220 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800A2224 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 800A2228 7F E3 FB 78 */ mr r3, r31 -/* 800A222C 7F C4 F3 78 */ mr r4, r30 -/* 800A2230 4B FD 29 11 */ bl ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo -/* 800A2234 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800A2238 41 82 00 2C */ beq lbl_800A2264 -/* 800A223C 7F E3 FB 78 */ mr r3, r31 -/* 800A2240 A0 9E 00 02 */ lhz r4, 2(r30) -/* 800A2244 4B FD 23 D5 */ bl GetActorPointer__4cBgSCFi -/* 800A2248 28 03 00 00 */ cmplwi r3, 0 -/* 800A224C 41 82 00 18 */ beq lbl_800A2264 -/* 800A2250 7F E3 FB 78 */ mr r3, r31 -/* 800A2254 A0 9E 00 02 */ lhz r4, 2(r30) -/* 800A2258 4B FD 23 C1 */ bl GetActorPointer__4cBgSCFi -/* 800A225C A8 63 00 08 */ lha r3, 8(r3) -/* 800A2260 48 00 00 08 */ b lbl_800A2268 -lbl_800A2264: -/* 800A2264 38 60 00 FD */ li r3, 0xfd -lbl_800A2268: -/* 800A2268 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800A226C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800A2270 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800A2274 7C 08 03 A6 */ mtlr r0 -/* 800A2278 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A227C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getStickAngleFromPlayerShape__9daAlink_cCFPs.s b/asm/d/a/d_a_alink/getStickAngleFromPlayerShape__9daAlink_cCFPs.s deleted file mode 100644 index dd3e36aeccc..00000000000 --- a/asm/d/a/d_a_alink/getStickAngleFromPlayerShape__9daAlink_cCFPs.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800A2160: -/* 800A2160 C0 23 33 AC */ lfs f1, 0x33ac(r3) -/* 800A2164 C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 800A2168 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800A216C 40 81 00 1C */ ble lbl_800A2188 -/* 800A2170 A8 A3 04 E6 */ lha r5, 0x4e6(r3) -/* 800A2174 A8 03 2F E2 */ lha r0, 0x2fe2(r3) -/* 800A2178 7C 05 00 50 */ subf r0, r5, r0 -/* 800A217C B0 04 00 00 */ sth r0, 0(r4) -/* 800A2180 38 60 00 01 */ li r3, 1 -/* 800A2184 4E 80 00 20 */ blr -lbl_800A2188: -/* 800A2188 38 00 00 00 */ li r0, 0 -/* 800A218C B0 04 00 00 */ sth r0, 0(r4) -/* 800A2190 38 60 00 00 */ li r3, 0 -/* 800A2194 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setIdxMask__9daAlink_cFPUsPUs.s b/asm/d/a/d_a_alink/setIdxMask__9daAlink_cFPUsPUs.s deleted file mode 100644 index d7fd0e99926..00000000000 --- a/asm/d/a/d_a_alink/setIdxMask__9daAlink_cFPUsPUs.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_800A3CE4: -/* 800A3CE4 A0 04 00 00 */ lhz r0, 0(r4) -/* 800A3CE8 28 00 FF FF */ cmplwi r0, 0xffff -/* 800A3CEC 4C 82 00 20 */ bnelr -/* 800A3CF0 A0 05 00 00 */ lhz r0, 0(r5) -/* 800A3CF4 54 03 A7 3F */ rlwinm. r3, r0, 0x14, 0x1c, 0x1f -/* 800A3CF8 54 00 05 3E */ clrlwi r0, r0, 0x14 -/* 800A3CFC B0 05 00 00 */ sth r0, 0(r5) -/* 800A3D00 4D 82 00 20 */ beqlr -/* 800A3D04 B0 64 00 00 */ sth r3, 0(r4) -/* 800A3D08 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setItemHeap__9daAlink_cFv.s b/asm/d/a/d_a_alink/setItemHeap__9daAlink_cFv.s deleted file mode 100644 index a29c1da9dd5..00000000000 --- a/asm/d/a/d_a_alink/setItemHeap__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800A3C8C: -/* 800A3C8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800A3C90 7C 08 02 A6 */ mflr r0 -/* 800A3C94 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A3C98 7C 64 1B 78 */ mr r4, r3 -/* 800A3C9C 80 03 05 80 */ lwz r0, 0x580(r3) -/* 800A3CA0 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 -/* 800A3CA4 40 82 00 1C */ bne lbl_800A3CC0 -/* 800A3CA8 88 04 2F A0 */ lbz r0, 0x2fa0(r4) -/* 800A3CAC 68 00 00 01 */ xori r0, r0, 1 -/* 800A3CB0 98 04 2F A0 */ stb r0, 0x2fa0(r4) -/* 800A3CB4 80 04 05 80 */ lwz r0, 0x580(r4) -/* 800A3CB8 60 00 40 00 */ ori r0, r0, 0x4000 -/* 800A3CBC 90 04 05 80 */ stw r0, 0x580(r4) -lbl_800A3CC0: -/* 800A3CC0 88 04 2F A0 */ lbz r0, 0x2fa0(r4) -/* 800A3CC4 1C 60 00 14 */ mulli r3, r0, 0x14 -/* 800A3CC8 38 63 21 B0 */ addi r3, r3, 0x21b0 -/* 800A3CCC 7C 64 1A 14 */ add r3, r4, r3 -/* 800A3CD0 48 0B B4 99 */ bl setAnimeHeap__14daPy_anmHeap_cFv -/* 800A3CD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800A3CD8 7C 08 03 A6 */ mtlr r0 -/* 800A3CDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A3CE0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setPlayerPosAndAngle__9daAlink_cFPA4_f.s b/asm/d/a/d_a_alink/setPlayerPosAndAngle__9daAlink_cFPA4_f.s deleted file mode 100644 index e25645aa50a..00000000000 --- a/asm/d/a/d_a_alink/setPlayerPosAndAngle__9daAlink_cFPA4_f.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_800B24F4: -/* 800B24F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B24F8 7C 08 02 A6 */ mflr r0 -/* 800B24FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B2500 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B2504 93 C1 00 08 */ stw r30, 8(r1) -/* 800B2508 7C 7E 1B 78 */ mr r30, r3 -/* 800B250C 7C 9F 23 78 */ mr r31, r4 -/* 800B2510 48 06 37 11 */ bl checkEventRun__9daAlink_cCFv -/* 800B2514 2C 03 00 00 */ cmpwi r3, 0 -/* 800B2518 40 82 00 10 */ bne lbl_800B2528 -/* 800B251C 88 1E 05 6A */ lbz r0, 0x56a(r30) -/* 800B2520 28 00 00 00 */ cmplwi r0, 0 -/* 800B2524 41 82 00 90 */ beq lbl_800B25B4 -lbl_800B2528: -/* 800B2528 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 800B252C D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 800B2530 C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 800B2534 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 800B2538 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 800B253C D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 800B2540 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 800B2544 D0 1E 04 BC */ stfs f0, 0x4bc(r30) -/* 800B2548 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 800B254C D0 1E 04 C0 */ stfs f0, 0x4c0(r30) -/* 800B2550 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 800B2554 D0 1E 04 C4 */ stfs f0, 0x4c4(r30) -/* 800B2558 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 800B255C D0 1E 37 98 */ stfs f0, 0x3798(r30) -/* 800B2560 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 800B2564 D0 1E 37 9C */ stfs f0, 0x379c(r30) -/* 800B2568 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 800B256C D0 1E 37 A0 */ stfs f0, 0x37a0(r30) -/* 800B2570 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 800B2574 64 00 00 80 */ oris r0, r0, 0x80 -/* 800B2578 90 1E 05 88 */ stw r0, 0x588(r30) -/* 800B257C 80 1E 05 90 */ lwz r0, 0x590(r30) -/* 800B2580 60 00 01 00 */ ori r0, r0, 0x100 -/* 800B2584 90 1E 05 90 */ stw r0, 0x590(r30) -/* 800B2588 7F E3 FB 78 */ mr r3, r31 -/* 800B258C 38 9E 04 E4 */ addi r4, r30, 0x4e4 -/* 800B2590 4B F5 A6 71 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz -/* 800B2594 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800B2598 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800B259C A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800B25A0 B0 1E 2F E6 */ sth r0, 0x2fe6(r30) -/* 800B25A4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800B25A8 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 800B25AC 38 7E 08 14 */ addi r3, r30, 0x814 -/* 800B25B0 48 1B 13 AD */ bl ClrCcMove__9cCcD_SttsFv -lbl_800B25B4: -/* 800B25B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B25B8 83 C1 00 08 */ lwz r30, 8(r1) -/* 800B25BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B25C0 7C 08 03 A6 */ mtlr r0 -/* 800B25C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B25C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setPlayerPosAndAngle__9daAlink_cFPC4cXyzPC5csXyz.s b/asm/d/a/d_a_alink/setPlayerPosAndAngle__9daAlink_cFPC4cXyzPC5csXyz.s deleted file mode 100644 index b69f4ade850..00000000000 --- a/asm/d/a/d_a_alink/setPlayerPosAndAngle__9daAlink_cFPC4cXyzPC5csXyz.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_800B23FC: -/* 800B23FC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800B2400 7C 08 02 A6 */ mflr r0 -/* 800B2404 90 01 00 24 */ stw r0, 0x24(r1) -/* 800B2408 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B240C 48 2A FD D1 */ bl _savegpr_29 -/* 800B2410 7C 7D 1B 78 */ mr r29, r3 -/* 800B2414 7C 9E 23 78 */ mr r30, r4 -/* 800B2418 7C BF 2B 78 */ mr r31, r5 -/* 800B241C 48 06 38 05 */ bl checkEventRun__9daAlink_cCFv -/* 800B2420 2C 03 00 00 */ cmpwi r3, 0 -/* 800B2424 40 82 00 10 */ bne lbl_800B2434 -/* 800B2428 88 1D 05 6A */ lbz r0, 0x56a(r29) -/* 800B242C 28 00 00 00 */ cmplwi r0, 0 -/* 800B2430 41 82 00 AC */ beq lbl_800B24DC -lbl_800B2434: -/* 800B2434 28 1E 00 00 */ cmplwi r30, 0 -/* 800B2438 41 82 00 6C */ beq lbl_800B24A4 -/* 800B243C C0 1E 00 00 */ lfs f0, 0(r30) -/* 800B2440 D0 1D 04 D0 */ stfs f0, 0x4d0(r29) -/* 800B2444 C0 1E 00 04 */ lfs f0, 4(r30) -/* 800B2448 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 800B244C C0 1E 00 08 */ lfs f0, 8(r30) -/* 800B2450 D0 1D 04 D8 */ stfs f0, 0x4d8(r29) -/* 800B2454 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 800B2458 D0 1D 04 BC */ stfs f0, 0x4bc(r29) -/* 800B245C C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 800B2460 D0 1D 04 C0 */ stfs f0, 0x4c0(r29) -/* 800B2464 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 800B2468 D0 1D 04 C4 */ stfs f0, 0x4c4(r29) -/* 800B246C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 800B2470 D0 1D 37 98 */ stfs f0, 0x3798(r29) -/* 800B2474 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 800B2478 D0 1D 37 9C */ stfs f0, 0x379c(r29) -/* 800B247C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 800B2480 D0 1D 37 A0 */ stfs f0, 0x37a0(r29) -/* 800B2484 80 1D 05 88 */ lwz r0, 0x588(r29) -/* 800B2488 64 00 00 80 */ oris r0, r0, 0x80 -/* 800B248C 90 1D 05 88 */ stw r0, 0x588(r29) -/* 800B2490 80 1D 05 90 */ lwz r0, 0x590(r29) -/* 800B2494 60 00 01 00 */ ori r0, r0, 0x100 -/* 800B2498 90 1D 05 90 */ stw r0, 0x590(r29) -/* 800B249C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800B24A0 D0 1D 04 FC */ stfs f0, 0x4fc(r29) -lbl_800B24A4: -/* 800B24A4 28 1F 00 00 */ cmplwi r31, 0 -/* 800B24A8 41 82 00 2C */ beq lbl_800B24D4 -/* 800B24AC A8 1F 00 00 */ lha r0, 0(r31) -/* 800B24B0 B0 1D 04 E4 */ sth r0, 0x4e4(r29) -/* 800B24B4 A8 1F 00 02 */ lha r0, 2(r31) -/* 800B24B8 B0 1D 04 E6 */ sth r0, 0x4e6(r29) -/* 800B24BC A8 1F 00 04 */ lha r0, 4(r31) -/* 800B24C0 B0 1D 04 E8 */ sth r0, 0x4e8(r29) -/* 800B24C4 A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 800B24C8 B0 1D 04 DE */ sth r0, 0x4de(r29) -/* 800B24CC A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 800B24D0 B0 1D 2F E6 */ sth r0, 0x2fe6(r29) -lbl_800B24D4: -/* 800B24D4 38 7D 08 14 */ addi r3, r29, 0x814 -/* 800B24D8 48 1B 14 85 */ bl ClrCcMove__9cCcD_SttsFv -lbl_800B24DC: -/* 800B24DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B24E0 48 2A FD 49 */ bl _restgpr_29 -/* 800B24E4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800B24E8 7C 08 03 A6 */ mtlr r0 -/* 800B24EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B24F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/cancelBoomerangLockActor__9daPy_py_cFP10fopAc_ac_c.s b/asm/d/a/d_a_player/cancelBoomerangLockActor__9daPy_py_cFP10fopAc_ac_c.s deleted file mode 100644 index aa1fb05061e..00000000000 --- a/asm/d/a/d_a_player/cancelBoomerangLockActor__9daPy_py_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8015F8E4: -/* 8015F8E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F8E8 7C 08 02 A6 */ mflr r0 -/* 8015F8EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F8F0 7C 64 1B 78 */ mr r4, r3 -/* 8015F8F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F8F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F8FC 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8015F900 4B F8 08 CD */ bl cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c -/* 8015F904 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F908 7C 08 03 A6 */ mtlr r0 -/* 8015F90C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F910 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/cancelFmChainGrab__9daPy_py_cFv.s b/asm/d/a/d_a_player/cancelFmChainGrab__9daPy_py_cFv.s deleted file mode 100644 index eb0cacd4c0a..00000000000 --- a/asm/d/a/d_a_player/cancelFmChainGrab__9daPy_py_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8015F4B8: -/* 8015F4B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F4BC 7C 08 02 A6 */ mflr r0 -/* 8015F4C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F4C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F4C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F4CC 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8015F4D0 38 00 00 00 */ li r0, 0 -/* 8015F4D4 98 03 2F A3 */ stb r0, 0x2fa3(r3) -/* 8015F4D8 38 63 28 44 */ addi r3, r3, 0x2844 -/* 8015F4DC 4B FF F8 21 */ bl clearData__16daPy_actorKeep_cFv -/* 8015F4E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F4E4 7C 08 03 A6 */ mtlr r0 -/* 8015F4E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F4EC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/checkBoomerangCharge__9daPy_py_cFv.s b/asm/d/a/d_a_player/checkBoomerangCharge__9daPy_py_cFv.s deleted file mode 100644 index c5807571b5d..00000000000 --- a/asm/d/a/d_a_player/checkBoomerangCharge__9daPy_py_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8015F89C: -/* 8015F89C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F8A0 7C 08 02 A6 */ mflr r0 -/* 8015F8A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F8A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F8AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F8B0 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8015F8B4 4B F8 09 91 */ bl checkBoomerangChargeEnd__9daAlink_cFv -/* 8015F8B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F8BC 7C 08 03 A6 */ mtlr r0 -/* 8015F8C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F8C4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/checkBottleItem__9daPy_py_cFi.s b/asm/d/a/d_a_player/checkBottleItem__9daPy_py_cFi.s deleted file mode 100644 index b8c38051578..00000000000 --- a/asm/d/a/d_a_player/checkBottleItem__9daPy_py_cFi.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8015EA88: -/* 8015EA88 38 00 00 00 */ li r0, 0 -/* 8015EA8C 2C 03 00 60 */ cmpwi r3, 0x60 -/* 8015EA90 41 80 00 0C */ blt lbl_8015EA9C -/* 8015EA94 2C 03 00 6C */ cmpwi r3, 0x6c -/* 8015EA98 40 81 00 34 */ ble lbl_8015EACC -lbl_8015EA9C: -/* 8015EA9C 2C 03 00 76 */ cmpwi r3, 0x76 -/* 8015EAA0 41 82 00 2C */ beq lbl_8015EACC -/* 8015EAA4 2C 03 00 74 */ cmpwi r3, 0x74 -/* 8015EAA8 41 82 00 24 */ beq lbl_8015EACC -/* 8015EAAC 2C 03 00 73 */ cmpwi r3, 0x73 -/* 8015EAB0 41 82 00 1C */ beq lbl_8015EACC -/* 8015EAB4 2C 03 00 9F */ cmpwi r3, 0x9f -/* 8015EAB8 41 82 00 14 */ beq lbl_8015EACC -/* 8015EABC 2C 03 00 77 */ cmpwi r3, 0x77 -/* 8015EAC0 41 80 00 10 */ blt lbl_8015EAD0 -/* 8015EAC4 2C 03 00 7F */ cmpwi r3, 0x7f -/* 8015EAC8 41 81 00 08 */ bgt lbl_8015EAD0 -lbl_8015EACC: -/* 8015EACC 38 00 00 01 */ li r0, 1 -lbl_8015EAD0: -/* 8015EAD0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8015EAD4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/checkCarryStartLightBallA__9daPy_py_cFv.s b/asm/d/a/d_a_player/checkCarryStartLightBallA__9daPy_py_cFv.s deleted file mode 100644 index a29c246b71d..00000000000 --- a/asm/d/a/d_a_player/checkCarryStartLightBallA__9daPy_py_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8015F698: -/* 8015F698 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F69C 7C 08 02 A6 */ mflr r0 -/* 8015F6A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F6A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8015F6A8 4B FF FF B9 */ bl checkRoomRestartStart__9daPy_py_cFv -/* 8015F6AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8015F6B0 40 82 00 54 */ bne lbl_8015F704 -/* 8015F6B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F6B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F6BC 37 E3 4E 20 */ addic. r31, r3, 0x4e20 -/* 8015F6C0 41 82 00 44 */ beq lbl_8015F704 -/* 8015F6C4 7F E3 FB 78 */ mr r3, r31 -/* 8015F6C8 81 9F 00 00 */ lwz r12, 0(r31) -/* 8015F6CC 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8015F6D0 7D 89 03 A6 */ mtctr r12 -/* 8015F6D4 4E 80 04 21 */ bctrl -/* 8015F6D8 28 03 00 00 */ cmplwi r3, 0 -/* 8015F6DC 41 82 00 28 */ beq lbl_8015F704 -/* 8015F6E0 7F E3 FB 78 */ mr r3, r31 -/* 8015F6E4 81 9F 00 00 */ lwz r12, 0(r31) -/* 8015F6E8 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8015F6EC 7D 89 03 A6 */ mtctr r12 -/* 8015F6F0 4E 80 04 21 */ bctrl -/* 8015F6F4 88 03 00 09 */ lbz r0, 9(r3) -/* 8015F6F8 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8015F6FC 2C 00 00 17 */ cmpwi r0, 0x17 -/* 8015F700 41 82 00 0C */ beq lbl_8015F70C -lbl_8015F704: -/* 8015F704 38 60 00 00 */ li r3, 0 -/* 8015F708 48 00 00 14 */ b lbl_8015F71C -lbl_8015F70C: -/* 8015F70C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F710 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F714 80 03 0D D0 */ lwz r0, 0xdd0(r3) -/* 8015F718 54 03 02 D6 */ rlwinm r3, r0, 0, 0xb, 0xb -lbl_8015F71C: -/* 8015F71C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8015F720 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F724 7C 08 03 A6 */ mtlr r0 -/* 8015F728 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F72C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/checkCarryStartLightBallB__9daPy_py_cFv.s b/asm/d/a/d_a_player/checkCarryStartLightBallB__9daPy_py_cFv.s deleted file mode 100644 index c3c41764e71..00000000000 --- a/asm/d/a/d_a_player/checkCarryStartLightBallB__9daPy_py_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8015F730: -/* 8015F730 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F734 7C 08 02 A6 */ mflr r0 -/* 8015F738 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F73C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8015F740 4B FF FF 21 */ bl checkRoomRestartStart__9daPy_py_cFv -/* 8015F744 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8015F748 40 82 00 54 */ bne lbl_8015F79C -/* 8015F74C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F750 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F754 37 E3 4E 20 */ addic. r31, r3, 0x4e20 -/* 8015F758 41 82 00 44 */ beq lbl_8015F79C -/* 8015F75C 7F E3 FB 78 */ mr r3, r31 -/* 8015F760 81 9F 00 00 */ lwz r12, 0(r31) -/* 8015F764 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8015F768 7D 89 03 A6 */ mtctr r12 -/* 8015F76C 4E 80 04 21 */ bctrl -/* 8015F770 28 03 00 00 */ cmplwi r3, 0 -/* 8015F774 41 82 00 28 */ beq lbl_8015F79C -/* 8015F778 7F E3 FB 78 */ mr r3, r31 -/* 8015F77C 81 9F 00 00 */ lwz r12, 0(r31) -/* 8015F780 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8015F784 7D 89 03 A6 */ mtctr r12 -/* 8015F788 4E 80 04 21 */ bctrl -/* 8015F78C 88 03 00 09 */ lbz r0, 9(r3) -/* 8015F790 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8015F794 2C 00 00 17 */ cmpwi r0, 0x17 -/* 8015F798 41 82 00 0C */ beq lbl_8015F7A4 -lbl_8015F79C: -/* 8015F79C 38 60 00 00 */ li r3, 0 -/* 8015F7A0 48 00 00 14 */ b lbl_8015F7B4 -lbl_8015F7A4: -/* 8015F7A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F7A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F7AC 80 03 0D D0 */ lwz r0, 0xdd0(r3) -/* 8015F7B0 54 03 03 18 */ rlwinm r3, r0, 0, 0xc, 0xc -lbl_8015F7B4: -/* 8015F7B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8015F7B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F7BC 7C 08 03 A6 */ mtlr r0 -/* 8015F7C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F7C4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/checkDrinkBottleItem__9daPy_py_cFi.s b/asm/d/a/d_a_player/checkDrinkBottleItem__9daPy_py_cFi.s deleted file mode 100644 index 80ba12255da..00000000000 --- a/asm/d/a/d_a_player/checkDrinkBottleItem__9daPy_py_cFi.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8015EAD8: -/* 8015EAD8 38 00 00 00 */ li r0, 0 -/* 8015EADC 2C 03 00 61 */ cmpwi r3, 0x61 -/* 8015EAE0 41 80 00 0C */ blt lbl_8015EAEC -/* 8015EAE4 2C 03 00 65 */ cmpwi r3, 0x65 -/* 8015EAE8 40 81 00 4C */ ble lbl_8015EB34 -lbl_8015EAEC: -/* 8015EAEC 2C 03 00 69 */ cmpwi r3, 0x69 -/* 8015EAF0 41 82 00 44 */ beq lbl_8015EB34 -/* 8015EAF4 2C 03 00 6A */ cmpwi r3, 0x6a -/* 8015EAF8 41 82 00 3C */ beq lbl_8015EB34 -/* 8015EAFC 2C 03 00 6B */ cmpwi r3, 0x6b -/* 8015EB00 41 82 00 34 */ beq lbl_8015EB34 -/* 8015EB04 2C 03 00 76 */ cmpwi r3, 0x76 -/* 8015EB08 41 82 00 2C */ beq lbl_8015EB34 -/* 8015EB0C 2C 03 00 9F */ cmpwi r3, 0x9f -/* 8015EB10 41 82 00 24 */ beq lbl_8015EB34 -/* 8015EB14 2C 03 00 73 */ cmpwi r3, 0x73 -/* 8015EB18 41 82 00 1C */ beq lbl_8015EB34 -/* 8015EB1C 2C 03 00 77 */ cmpwi r3, 0x77 -/* 8015EB20 41 80 00 18 */ blt lbl_8015EB38 -/* 8015EB24 2C 03 00 7B */ cmpwi r3, 0x7b -/* 8015EB28 41 82 00 10 */ beq lbl_8015EB38 -/* 8015EB2C 2C 03 00 7F */ cmpwi r3, 0x7f -/* 8015EB30 41 81 00 08 */ bgt lbl_8015EB38 -lbl_8015EB34: -/* 8015EB34 38 00 00 01 */ li r0, 1 -lbl_8015EB38: -/* 8015EB38 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8015EB3C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/checkFishingRodItem__9daPy_py_cFi.s b/asm/d/a/d_a_player/checkFishingRodItem__9daPy_py_cFi.s deleted file mode 100644 index f872a1b328a..00000000000 --- a/asm/d/a/d_a_player/checkFishingRodItem__9daPy_py_cFi.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8015EA20: -/* 8015EA20 38 00 00 00 */ li r0, 0 -/* 8015EA24 2C 03 00 4A */ cmpwi r3, 0x4a -/* 8015EA28 41 82 00 14 */ beq lbl_8015EA3C -/* 8015EA2C 2C 03 00 5B */ cmpwi r3, 0x5b -/* 8015EA30 41 80 00 10 */ blt lbl_8015EA40 -/* 8015EA34 2C 03 00 5F */ cmpwi r3, 0x5f -/* 8015EA38 41 81 00 08 */ bgt lbl_8015EA40 -lbl_8015EA3C: -/* 8015EA3C 38 00 00 01 */ li r0, 1 -lbl_8015EA40: -/* 8015EA40 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8015EA44 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/checkRoomRestartStart__9daPy_py_cFv.s b/asm/d/a/d_a_player/checkRoomRestartStart__9daPy_py_cFv.s deleted file mode 100644 index ead000b4759..00000000000 --- a/asm/d/a/d_a_player/checkRoomRestartStart__9daPy_py_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8015F660: -/* 8015F660 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F664 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F668 80 03 0D D0 */ lwz r0, 0xdd0(r3) -/* 8015F66C 54 00 07 3E */ clrlwi r0, r0, 0x1c -/* 8015F670 28 00 00 04 */ cmplwi r0, 4 -/* 8015F674 41 82 00 14 */ beq lbl_8015F688 -/* 8015F678 28 00 00 08 */ cmplwi r0, 8 -/* 8015F67C 41 82 00 0C */ beq lbl_8015F688 -/* 8015F680 28 00 00 05 */ cmplwi r0, 5 -/* 8015F684 40 82 00 0C */ bne lbl_8015F690 -lbl_8015F688: -/* 8015F688 38 60 00 01 */ li r3, 1 -/* 8015F68C 4E 80 00 20 */ blr -lbl_8015F690: -/* 8015F690 38 60 00 00 */ li r3, 0 -/* 8015F694 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/checkTradeItem__9daPy_py_cFi.s b/asm/d/a/d_a_player/checkTradeItem__9daPy_py_cFi.s deleted file mode 100644 index cd0d33792fd..00000000000 --- a/asm/d/a/d_a_player/checkTradeItem__9daPy_py_cFi.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8015EBD8: -/* 8015EBD8 38 00 00 00 */ li r0, 0 -/* 8015EBDC 2C 03 00 80 */ cmpwi r3, 0x80 -/* 8015EBE0 41 80 00 0C */ blt lbl_8015EBEC -/* 8015EBE4 2C 03 00 83 */ cmpwi r3, 0x83 -/* 8015EBE8 40 81 00 34 */ ble lbl_8015EC1C -lbl_8015EBEC: -/* 8015EBEC 2C 03 00 E9 */ cmpwi r3, 0xe9 -/* 8015EBF0 41 82 00 2C */ beq lbl_8015EC1C -/* 8015EBF4 2C 03 00 EA */ cmpwi r3, 0xea -/* 8015EBF8 41 82 00 24 */ beq lbl_8015EC1C -/* 8015EBFC 2C 03 00 EB */ cmpwi r3, 0xeb -/* 8015EC00 41 82 00 1C */ beq lbl_8015EC1C -/* 8015EC04 2C 03 00 90 */ cmpwi r3, 0x90 -/* 8015EC08 41 82 00 14 */ beq lbl_8015EC1C -/* 8015EC0C 2C 03 00 2D */ cmpwi r3, 0x2d -/* 8015EC10 41 82 00 0C */ beq lbl_8015EC1C -/* 8015EC14 2C 03 00 91 */ cmpwi r3, 0x91 -/* 8015EC18 40 82 00 08 */ bne lbl_8015EC20 -lbl_8015EC1C: -/* 8015EC1C 38 00 00 01 */ li r0, 1 -lbl_8015EC20: -/* 8015EC20 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8015EC24 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE.s b/asm/d/a/d_a_player/createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE.s deleted file mode 100644 index 7488dc28cfe..00000000000 --- a/asm/d/a/d_a_player/createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_8015EE00: -/* 8015EE00 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8015EE04 7C 08 02 A6 */ mflr r0 -/* 8015EE08 90 01 00 24 */ stw r0, 0x24(r1) -/* 8015EE0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015EE10 48 20 33 CD */ bl _savegpr_29 -/* 8015EE14 7C 7D 1B 78 */ mr r29, r3 -/* 8015EE18 7C 9E 23 78 */ mr r30, r4 -/* 8015EE1C 2C 1E 00 04 */ cmpwi r30, 4 -/* 8015EE20 40 82 00 0C */ bne lbl_8015EE2C -/* 8015EE24 83 FD 00 08 */ lwz r31, 8(r29) -/* 8015EE28 48 00 00 38 */ b lbl_8015EE60 -lbl_8015EE2C: -/* 8015EE2C 2C 1E 00 03 */ cmpwi r30, 3 -/* 8015EE30 40 82 00 0C */ bne lbl_8015EE3C -/* 8015EE34 3B E0 00 50 */ li r31, 0x50 -/* 8015EE38 48 00 00 28 */ b lbl_8015EE60 -lbl_8015EE3C: -/* 8015EE3C 2C 1E 00 00 */ cmpwi r30, 0 -/* 8015EE40 40 82 00 0C */ bne lbl_8015EE4C -/* 8015EE44 3B E0 00 40 */ li r31, 0x40 -/* 8015EE48 48 00 00 18 */ b lbl_8015EE60 -lbl_8015EE4C: -/* 8015EE4C 2C 1E 00 01 */ cmpwi r30, 1 -/* 8015EE50 40 82 00 0C */ bne lbl_8015EE5C -/* 8015EE54 3B E0 00 40 */ li r31, 0x40 -/* 8015EE58 48 00 00 08 */ b lbl_8015EE60 -lbl_8015EE5C: -/* 8015EE5C 3B E0 00 A0 */ li r31, 0xa0 -lbl_8015EE60: -/* 8015EE60 38 61 00 08 */ addi r3, r1, 8 -/* 8015EE64 7F E4 FB 78 */ mr r4, r31 -/* 8015EE68 38 A0 00 20 */ li r5, 0x20 -/* 8015EE6C 4B EB 01 89 */ bl mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl -/* 8015EE70 90 7D 00 10 */ stw r3, 0x10(r29) -/* 8015EE74 2C 1E 00 04 */ cmpwi r30, 4 -/* 8015EE78 40 82 00 10 */ bne lbl_8015EE88 -/* 8015EE7C 7F E3 FB 78 */ mr r3, r31 -/* 8015EE80 48 16 FE 45 */ bl __nwa__FUl -/* 8015EE84 48 00 00 D8 */ b lbl_8015EF5C -lbl_8015EE88: -/* 8015EE88 2C 1E 00 03 */ cmpwi r30, 3 -/* 8015EE8C 40 82 00 54 */ bne lbl_8015EEE0 -/* 8015EE90 38 60 00 2C */ li r3, 0x2c -/* 8015EE94 48 16 FD B9 */ bl __nw__FUl -/* 8015EE98 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8015EE9C 41 82 00 C0 */ beq lbl_8015EF5C -/* 8015EEA0 38 80 00 00 */ li r4, 0 -/* 8015EEA4 38 A0 00 00 */ li r5, 0 -/* 8015EEA8 38 C0 00 00 */ li r6, 0 -/* 8015EEAC 38 E0 00 00 */ li r7, 0 -/* 8015EEB0 48 1C 9F 91 */ bl __ct__15J3DAnmTransformFsPfPsPf -/* 8015EEB4 3C 60 80 3A */ lis r3, __vt__18J3DAnmTransformKey@ha /* 0x803A7C70@ha */ -/* 8015EEB8 38 03 7C 70 */ addi r0, r3, __vt__18J3DAnmTransformKey@l /* 0x803A7C70@l */ -/* 8015EEBC 90 1F 00 00 */ stw r0, 0(r31) -/* 8015EEC0 38 80 00 00 */ li r4, 0 -/* 8015EEC4 90 9F 00 20 */ stw r4, 0x20(r31) -/* 8015EEC8 90 9F 00 24 */ stw r4, 0x24(r31) -/* 8015EECC 3C 60 80 3A */ lis r3, __vt__18mDoExt_transAnmBas@ha /* 0x803A7C5C@ha */ -/* 8015EED0 38 03 7C 5C */ addi r0, r3, __vt__18mDoExt_transAnmBas@l /* 0x803A7C5C@l */ -/* 8015EED4 90 1F 00 00 */ stw r0, 0(r31) -/* 8015EED8 90 9F 00 28 */ stw r4, 0x28(r31) -/* 8015EEDC 48 00 00 80 */ b lbl_8015EF5C -lbl_8015EEE0: -/* 8015EEE0 2C 1E 00 00 */ cmpwi r30, 0 -/* 8015EEE4 40 82 00 44 */ bne lbl_8015EF28 -/* 8015EEE8 38 60 00 28 */ li r3, 0x28 -/* 8015EEEC 48 16 FD 61 */ bl __nw__FUl -/* 8015EEF0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8015EEF4 41 82 00 68 */ beq lbl_8015EF5C -/* 8015EEF8 38 80 00 00 */ li r4, 0 -/* 8015EEFC 38 A0 00 00 */ li r5, 0 -/* 8015EF00 38 C0 00 00 */ li r6, 0 -/* 8015EF04 38 E0 00 00 */ li r7, 0 -/* 8015EF08 48 1C 9F 39 */ bl __ct__15J3DAnmTransformFsPfPsPf -/* 8015EF0C 3C 60 80 3A */ lis r3, __vt__18J3DAnmTransformKey@ha /* 0x803A7C70@ha */ -/* 8015EF10 38 03 7C 70 */ addi r0, r3, __vt__18J3DAnmTransformKey@l /* 0x803A7C70@l */ -/* 8015EF14 90 1F 00 00 */ stw r0, 0(r31) -/* 8015EF18 38 00 00 00 */ li r0, 0 -/* 8015EF1C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 8015EF20 90 1F 00 24 */ stw r0, 0x24(r31) -/* 8015EF24 48 00 00 38 */ b lbl_8015EF5C -lbl_8015EF28: -/* 8015EF28 2C 1E 00 01 */ cmpwi r30, 1 -/* 8015EF2C 40 82 00 1C */ bne lbl_8015EF48 -/* 8015EF30 38 60 00 2C */ li r3, 0x2c -/* 8015EF34 48 16 FD 19 */ bl __nw__FUl -/* 8015EF38 28 03 00 00 */ cmplwi r3, 0 -/* 8015EF3C 41 82 00 20 */ beq lbl_8015EF5C -/* 8015EF40 48 1C BF 99 */ bl __ct__16J3DAnmTexPatternFv -/* 8015EF44 48 00 00 18 */ b lbl_8015EF5C -lbl_8015EF48: -/* 8015EF48 38 60 00 7C */ li r3, 0x7c -/* 8015EF4C 48 16 FD 01 */ bl __nw__FUl -/* 8015EF50 28 03 00 00 */ cmplwi r3, 0 -/* 8015EF54 41 82 00 08 */ beq lbl_8015EF5C -/* 8015EF58 48 1C AF 05 */ bl __ct__19J3DAnmTextureSRTKeyFv -lbl_8015EF5C: -/* 8015EF5C 80 61 00 08 */ lwz r3, 8(r1) -/* 8015EF60 4B EB 02 6D */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8015EF64 80 7D 00 10 */ lwz r3, 0x10(r29) -/* 8015EF68 4B EB 01 25 */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap -/* 8015EF6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015EF70 48 20 32 B9 */ bl _restgpr_29 -/* 8015EF74 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8015EF78 7C 08 03 A6 */ mtlr r0 -/* 8015EF7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015EF80 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/forceRestartRoom__9daPy_py_cFiUli.s b/asm/d/a/d_a_player/forceRestartRoom__9daPy_py_cFiUli.s deleted file mode 100644 index 7e053b79462..00000000000 --- a/asm/d/a/d_a_player/forceRestartRoom__9daPy_py_cFiUli.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8015F438: -/* 8015F438 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F43C 7C 08 02 A6 */ mflr r0 -/* 8015F440 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F444 7C 66 1B 78 */ mr r6, r3 -/* 8015F448 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F44C 38 E3 61 C0 */ addi r7, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F450 80 67 5D B4 */ lwz r3, 0x5db4(r7) -/* 8015F454 88 E7 4F AD */ lbz r7, 0x4fad(r7) -/* 8015F458 30 07 FF FF */ addic r0, r7, -1 -/* 8015F45C 7C 00 39 10 */ subfe r0, r0, r7 -/* 8015F460 54 07 06 3E */ clrlwi r7, r0, 0x18 -/* 8015F464 4B F5 EA FD */ bl startRestartRoom__9daAlink_cFUliii -/* 8015F468 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F46C 7C 08 03 A6 */ mtlr r0 -/* 8015F470 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F474 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/loadData__14daPy_anmHeap_cFUs.s b/asm/d/a/d_a_player/loadData__14daPy_anmHeap_cFUs.s deleted file mode 100644 index f840927f063..00000000000 --- a/asm/d/a/d_a_player/loadData__14daPy_anmHeap_cFUs.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_8015EF84: -/* 8015EF84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015EF88 7C 08 02 A6 */ mflr r0 -/* 8015EF8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015EF90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8015EF94 93 C1 00 08 */ stw r30, 8(r1) -/* 8015EF98 7C 7E 1B 78 */ mr r30, r3 -/* 8015EF9C 7C 86 23 78 */ mr r6, r4 -/* 8015EFA0 A0 03 00 04 */ lhz r0, 4(r3) -/* 8015EFA4 28 00 FF FF */ cmplwi r0, 0xffff -/* 8015EFA8 40 82 00 4C */ bne lbl_8015EFF4 -/* 8015EFAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015EFB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015EFB4 80 63 5C AC */ lwz r3, 0x5cac(r3) -/* 8015EFB8 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 8015EFBC 80 BE 00 08 */ lwz r5, 8(r30) -/* 8015EFC0 54 C6 04 3E */ clrlwi r6, r6, 0x10 -/* 8015EFC4 48 17 6F 09 */ bl readIdxResource__10JKRArchiveFPvUlUl -/* 8015EFC8 7F C3 F3 78 */ mr r3, r30 -/* 8015EFCC 48 00 01 9D */ bl setAnimeHeap__14daPy_anmHeap_cFv -/* 8015EFD0 7C 7F 1B 78 */ mr r31, r3 -/* 8015EFD4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8015EFD8 38 80 00 00 */ li r4, 0 -/* 8015EFDC 48 1D 8B 65 */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag -/* 8015EFE0 7C 7E 1B 78 */ mr r30, r3 -/* 8015EFE4 7F E3 FB 78 */ mr r3, r31 -/* 8015EFE8 4B EB 01 E5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8015EFEC 7F C3 F3 78 */ mr r3, r30 -/* 8015EFF0 48 00 00 60 */ b lbl_8015F050 -lbl_8015EFF4: -/* 8015EFF4 28 00 00 00 */ cmplwi r0, 0 -/* 8015EFF8 40 82 00 28 */ bne lbl_8015F020 -/* 8015EFFC 3C 60 80 40 */ lis r3, mDemoArcName__20dStage_roomControl_c@ha /* 0x80406194@ha */ -/* 8015F000 38 63 61 94 */ addi r3, r3, mDemoArcName__20dStage_roomControl_c@l /* 0x80406194@l */ -/* 8015F004 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F008 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F00C 3C A5 00 02 */ addis r5, r5, 2 -/* 8015F010 38 C0 00 80 */ li r6, 0x80 -/* 8015F014 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8015F018 4B ED D3 E9 */ bl getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci -/* 8015F01C 48 00 00 34 */ b lbl_8015F050 -lbl_8015F020: -/* 8015F020 3C 60 80 3C */ lis r3, arcName@ha /* 0x803BA0A0@ha */ -/* 8015F024 38 63 A0 A0 */ addi r3, r3, arcName@l /* 0x803BA0A0@l */ -/* 8015F028 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d -/* 8015F02C 7C 63 02 14 */ add r3, r3, r0 -/* 8015F030 80 63 FF FC */ lwz r3, -4(r3) -/* 8015F034 54 C4 04 3E */ clrlwi r4, r6, 0x10 -/* 8015F038 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F03C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F040 3C A5 00 02 */ addis r5, r5, 2 -/* 8015F044 38 C0 00 80 */ li r6, 0x80 -/* 8015F048 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8015F04C 4B ED D2 A1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -lbl_8015F050: -/* 8015F050 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8015F054 83 C1 00 08 */ lwz r30, 8(r1) -/* 8015F058 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F05C 7C 08 03 A6 */ mtlr r0 -/* 8015F060 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F064 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/mallocBuffer__14daPy_anmHeap_cFv.s b/asm/d/a/d_a_player/mallocBuffer__14daPy_anmHeap_cFv.s deleted file mode 100644 index 68735ad05be..00000000000 --- a/asm/d/a/d_a_player/mallocBuffer__14daPy_anmHeap_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8015EDC4: -/* 8015EDC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015EDC8 7C 08 02 A6 */ mflr r0 -/* 8015EDCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015EDD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8015EDD4 7C 7F 1B 78 */ mr r31, r3 -/* 8015EDD8 80 63 00 08 */ lwz r3, 8(r3) -/* 8015EDDC 38 80 00 20 */ li r4, 0x20 -/* 8015EDE0 48 16 FF 0D */ bl __nwa__FUli -/* 8015EDE4 90 7F 00 0C */ stw r3, 0xc(r31) -/* 8015EDE8 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8015EDEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8015EDF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015EDF4 7C 08 03 A6 */ mtlr r0 -/* 8015EDF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015EDFC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/setFmChainPos__9daPy_py_cFP10fopAc_ac_cP4cXyzi.s b/asm/d/a/d_a_player/setFmChainPos__9daPy_py_cFP10fopAc_ac_cP4cXyzi.s deleted file mode 100644 index 205e7e557dc..00000000000 --- a/asm/d/a/d_a_player/setFmChainPos__9daPy_py_cFP10fopAc_ac_cP4cXyzi.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8015F478: -/* 8015F478 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F47C 7C 08 02 A6 */ mflr r0 -/* 8015F480 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F484 7C 67 1B 78 */ mr r7, r3 -/* 8015F488 7C 80 23 78 */ mr r0, r4 -/* 8015F48C 7C A6 2B 78 */ mr r6, r5 -/* 8015F490 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F494 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F498 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8015F49C 7C E4 3B 78 */ mr r4, r7 -/* 8015F4A0 7C 05 03 78 */ mr r5, r0 -/* 8015F4A4 4B F8 86 49 */ bl setFmChainPosFromOut__9daAlink_cFP10fopAc_ac_cP4cXyzi -/* 8015F4A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F4AC 7C 08 03 A6 */ mtlr r0 -/* 8015F4B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F4B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/setLookPos__9daPy_py_cFP4cXyz.s b/asm/d/a/d_a_player/setLookPos__9daPy_py_cFP4cXyz.s deleted file mode 100644 index a7990c81777..00000000000 --- a/asm/d/a/d_a_player/setLookPos__9daPy_py_cFP4cXyz.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8015F4F0: -/* 8015F4F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F4F4 7C 08 02 A6 */ mflr r0 -/* 8015F4F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F4FC 7C 64 1B 78 */ mr r4, r3 -/* 8015F500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F508 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8015F50C 4B F4 12 39 */ bl setLookPosFromOut__9daAlink_cFP4cXyz -/* 8015F510 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F514 7C 08 03 A6 */ mtlr r0 -/* 8015F518 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F51C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/setMidnaFaceNum__9daPy_py_cFi.s b/asm/d/a/d_a_player/setMidnaFaceNum__9daPy_py_cFi.s deleted file mode 100644 index f2b517f8450..00000000000 --- a/asm/d/a/d_a_player/setMidnaFaceNum__9daPy_py_cFi.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8015F968: -/* 8015F968 80 8D 8A 98 */ lwz r4, m_midnaActor__9daPy_py_c(r13) -/* 8015F96C 28 04 00 00 */ cmplwi r4, 0 -/* 8015F970 4D 82 00 20 */ beqlr -/* 8015F974 98 64 08 49 */ stb r3, 0x849(r4) -/* 8015F978 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/setMidnaMotionNum__9daPy_py_cFi.s b/asm/d/a/d_a_player/setMidnaMotionNum__9daPy_py_cFi.s deleted file mode 100644 index 25b3473a83d..00000000000 --- a/asm/d/a/d_a_player/setMidnaMotionNum__9daPy_py_cFi.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8015F954: -/* 8015F954 80 8D 8A 98 */ lwz r4, m_midnaActor__9daPy_py_c(r13) -/* 8015F958 28 04 00 00 */ cmplwi r4, 0 -/* 8015F95C 4D 82 00 20 */ beqlr -/* 8015F960 98 64 08 48 */ stb r3, 0x848(r4) -/* 8015F964 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/setParamData__9daPy_py_cFiiii.s b/asm/d/a/d_a_player/setParamData__9daPy_py_cFiiii.s deleted file mode 100644 index 53d11652183..00000000000 --- a/asm/d/a/d_a_player/setParamData__9daPy_py_cFiiii.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8015EA0C: -/* 8015EA0C 54 80 63 E6 */ rlwinm r0, r4, 0xc, 0xf, 0x13 -/* 8015EA10 50 60 06 BE */ rlwimi r0, r3, 0, 0x1a, 0x1f -/* 8015EA14 50 A0 C0 0E */ rlwimi r0, r5, 0x18, 0, 7 -/* 8015EA18 7C C3 03 78 */ or r3, r6, r0 -/* 8015EA1C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/setPlayerDamage__9daPy_py_cFii.s b/asm/d/a/d_a_player/setPlayerDamage__9daPy_py_cFii.s deleted file mode 100644 index aded67b584f..00000000000 --- a/asm/d/a/d_a_player/setPlayerDamage__9daPy_py_cFii.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8015F914: -/* 8015F914 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F918 7C 08 02 A6 */ mflr r0 -/* 8015F91C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F920 7C 60 1B 78 */ mr r0, r3 -/* 8015F924 7C 86 23 78 */ mr r6, r4 -/* 8015F928 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F92C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F930 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8015F934 7C 04 03 78 */ mr r4, r0 -/* 8015F938 38 A0 00 00 */ li r5, 0 -/* 8015F93C 38 E0 00 00 */ li r7, 0 -/* 8015F940 4B F7 79 7D */ bl setDamagePoint__9daAlink_cFiiii -/* 8015F944 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F948 7C 08 03 A6 */ mtlr r0 -/* 8015F94C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F950 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/setPlayerSe__9daPy_py_cFUl.s b/asm/d/a/d_a_player/setPlayerSe__9daPy_py_cFUl.s deleted file mode 100644 index b2ff09ed4c6..00000000000 --- a/asm/d/a/d_a_player/setPlayerSe__9daPy_py_cFUl.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8015F520: -/* 8015F520 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F524 7C 08 02 A6 */ mflr r0 -/* 8015F528 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F52C 7C 64 1B 78 */ mr r4, r3 -/* 8015F530 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F534 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F538 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8015F53C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8015F540 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 8015F544 7D 89 03 A6 */ mtctr r12 -/* 8015F548 4E 80 04 21 */ bctrl -/* 8015F54C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F550 7C 08 03 A6 */ mtlr r0 -/* 8015F554 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F558 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/setSightImage__18daPy_sightPacket_cFP7ResTIMG.s b/asm/d/a/d_a_player/setSightImage__18daPy_sightPacket_cFP7ResTIMG.s deleted file mode 100644 index ab8567191ff..00000000000 --- a/asm/d/a/d_a_player/setSightImage__18daPy_sightPacket_cFP7ResTIMG.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8015F384: -/* 8015F384 90 83 00 44 */ stw r4, 0x44(r3) -/* 8015F388 80 04 00 1C */ lwz r0, 0x1c(r4) -/* 8015F38C 7C 04 02 14 */ add r0, r4, r0 -/* 8015F390 90 03 00 48 */ stw r0, 0x48(r3) -/* 8015F394 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/_create__9dMeter2_cFv.s b/asm/d/meter/d_meter2/_create__9dMeter2_cFv.s deleted file mode 100644 index 5c684a9eafd..00000000000 --- a/asm/d/meter/d_meter2/_create__9dMeter2_cFv.s +++ /dev/null @@ -1,480 +0,0 @@ -lbl_8021EA14: -/* 8021EA14 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8021EA18 7C 08 02 A6 */ mflr r0 -/* 8021EA1C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8021EA20 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021EA24 48 14 37 A9 */ bl _savegpr_25 -/* 8021EA28 7C 7F 1B 78 */ mr r31, r3 -/* 8021EA2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021EA30 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021EA34 38 7B 4E 20 */ addi r3, r27, 0x4e20 -/* 8021EA38 81 9B 4E 20 */ lwz r12, 0x4e20(r27) -/* 8021EA3C 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8021EA40 7D 89 03 A6 */ mtctr r12 -/* 8021EA44 4E 80 04 21 */ bctrl -/* 8021EA48 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8021EA4C 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 8021EA50 2C 00 00 01 */ cmpwi r0, 1 -/* 8021EA54 40 82 00 1C */ bne lbl_8021EA70 -/* 8021EA58 3C 60 00 06 */ lis r3, 0x0006 /* 0x0005A400@ha */ -/* 8021EA5C 38 63 A4 00 */ addi r3, r3, 0xA400 /* 0x0005A400@l */ -/* 8021EA60 38 80 00 00 */ li r4, 0 -/* 8021EA64 4B E0 19 39 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap -/* 8021EA68 90 7F 01 00 */ stw r3, 0x100(r31) -/* 8021EA6C 48 00 00 18 */ b lbl_8021EA84 -lbl_8021EA70: -/* 8021EA70 3C 60 00 06 */ lis r3, 0x0006 /* 0x00060800@ha */ -/* 8021EA74 38 63 08 00 */ addi r3, r3, 0x0800 /* 0x00060800@l */ -/* 8021EA78 38 80 00 00 */ li r4, 0 -/* 8021EA7C 4B E0 19 21 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap -/* 8021EA80 90 7F 01 00 */ stw r3, 0x100(r31) -lbl_8021EA84: -/* 8021EA84 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021EA88 4B DF 07 45 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8021EA8C 7C 7E 1B 78 */ mr r30, r3 -/* 8021EA90 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021EA94 48 0A FC F1 */ bl getTotalFreeSize__7JKRHeapFv -/* 8021EA98 38 7B 4E 00 */ addi r3, r27, 0x4e00 -/* 8021EA9C 3C 80 80 3A */ lis r4, d_meter_d_meter2__stringBase0@ha /* 0x80399338@ha */ -/* 8021EAA0 38 84 93 38 */ addi r4, r4, d_meter_d_meter2__stringBase0@l /* 0x80399338@l */ -/* 8021EAA4 48 14 9E F1 */ bl strcmp -/* 8021EAA8 2C 03 00 00 */ cmpwi r3, 0 -/* 8021EAAC 40 82 00 18 */ bne lbl_8021EAC4 -/* 8021EAB0 38 00 00 00 */ li r0, 0 -/* 8021EAB4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021EAB8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021EABC 98 03 00 BC */ stb r0, 0xbc(r3) -/* 8021EAC0 98 03 00 BB */ stb r0, 0xbb(r3) -lbl_8021EAC4: -/* 8021EAC4 38 60 00 00 */ li r3, 0 -/* 8021EAC8 90 7F 01 28 */ stw r3, 0x128(r31) -/* 8021EACC 80 1F 01 28 */ lwz r0, 0x128(r31) -/* 8021EAD0 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 8021EAD4 90 7F 01 24 */ stw r3, 0x124(r31) -/* 8021EAD8 98 7F 01 E5 */ stb r3, 0x1e5(r31) -/* 8021EADC B0 7F 01 B6 */ sth r3, 0x1b6(r31) -/* 8021EAE0 98 7F 01 E6 */ stb r3, 0x1e6(r31) -/* 8021EAE4 98 7F 01 E7 */ stb r3, 0x1e7(r31) -/* 8021EAE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021EAEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021EAF0 3B A3 00 F8 */ addi r29, r3, 0xf8 -/* 8021EAF4 88 03 00 F8 */ lbz r0, 0xf8(r3) -/* 8021EAF8 98 1F 01 FB */ stb r0, 0x1fb(r31) -/* 8021EAFC 3B 83 00 EC */ addi r28, r3, 0xec -/* 8021EB00 88 03 00 EC */ lbz r0, 0xec(r3) -/* 8021EB04 98 1F 01 DA */ stb r0, 0x1da(r31) -/* 8021EB08 38 00 00 32 */ li r0, 0x32 -/* 8021EB0C 98 1F 01 FC */ stb r0, 0x1fc(r31) -/* 8021EB10 88 03 00 F4 */ lbz r0, 0xf4(r3) -/* 8021EB14 98 1F 01 DB */ stb r0, 0x1db(r31) -/* 8021EB18 3B 20 00 00 */ li r25, 0 -/* 8021EB1C 3B 63 00 9C */ addi r27, r3, 0x9c -lbl_8021EB20: -/* 8021EB20 7F 63 DB 78 */ mr r3, r27 -/* 8021EB24 38 19 00 0F */ addi r0, r25, 0xf -/* 8021EB28 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021EB2C 38 A0 00 01 */ li r5, 1 -/* 8021EB30 4B E1 45 01 */ bl getItem__17dSv_player_item_cCFib -/* 8021EB34 7C 64 1B 78 */ mr r4, r3 -/* 8021EB38 7F A3 EB 78 */ mr r3, r29 -/* 8021EB3C 4B E1 55 BD */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8021EB40 7F 5F CA 14 */ add r26, r31, r25 -/* 8021EB44 98 7A 01 F6 */ stb r3, 0x1f6(r26) -/* 8021EB48 7F 83 E3 78 */ mr r3, r28 -/* 8021EB4C 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 8021EB50 4B E1 54 2D */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8021EB54 98 7A 01 F3 */ stb r3, 0x1f3(r26) -/* 8021EB58 3B 39 00 01 */ addi r25, r25, 1 -/* 8021EB5C 2C 19 00 03 */ cmpwi r25, 3 -/* 8021EB60 41 80 FF C0 */ blt lbl_8021EB20 -/* 8021EB64 3B 20 00 00 */ li r25, 0 -/* 8021EB68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021EB6C 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_8021EB70: -/* 8021EB70 7F 63 DB 78 */ mr r3, r27 -/* 8021EB74 7F 24 CB 78 */ mr r4, r25 -/* 8021EB78 4B E1 3E E5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8021EB7C 38 19 01 F9 */ addi r0, r25, 0x1f9 -/* 8021EB80 7C 7F 01 AE */ stbx r3, r31, r0 -/* 8021EB84 3B 39 00 01 */ addi r25, r25, 1 -/* 8021EB88 2C 19 00 02 */ cmpwi r25, 2 -/* 8021EB8C 41 80 FF E4 */ blt lbl_8021EB70 -/* 8021EB90 3B 20 00 00 */ li r25, 0 -lbl_8021EB94: -/* 8021EB94 7F 83 E3 78 */ mr r3, r28 -/* 8021EB98 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 8021EB9C 4B E1 54 95 */ bl getBottleNum__24dSv_player_item_record_cCFUc -/* 8021EBA0 38 19 01 EF */ addi r0, r25, 0x1ef -/* 8021EBA4 7C 7F 01 AE */ stbx r3, r31, r0 -/* 8021EBA8 3B 39 00 01 */ addi r25, r25, 1 -/* 8021EBAC 2C 19 00 04 */ cmpwi r25, 4 -/* 8021EBB0 41 80 FF E4 */ blt lbl_8021EB94 -/* 8021EBB4 38 80 00 00 */ li r4, 0 -/* 8021EBB8 98 9F 01 E8 */ stb r4, 0x1e8(r31) -/* 8021EBBC 98 9F 01 E9 */ stb r4, 0x1e9(r31) -/* 8021EBC0 98 9F 01 EA */ stb r4, 0x1ea(r31) -/* 8021EBC4 98 9F 01 EB */ stb r4, 0x1eb(r31) -/* 8021EBC8 7C 83 23 78 */ mr r3, r4 -/* 8021EBCC 38 00 00 05 */ li r0, 5 -/* 8021EBD0 7C 09 03 A6 */ mtctr r0 -lbl_8021EBD4: -/* 8021EBD4 38 03 01 B8 */ addi r0, r3, 0x1b8 -/* 8021EBD8 7C 9F 03 2E */ sthx r4, r31, r0 -/* 8021EBDC 38 63 00 02 */ addi r3, r3, 2 -/* 8021EBE0 42 00 FF F4 */ bdnz lbl_8021EBD4 -/* 8021EBE4 38 00 00 00 */ li r0, 0 -/* 8021EBE8 98 1F 01 EC */ stb r0, 0x1ec(r31) -/* 8021EBEC 98 1F 01 ED */ stb r0, 0x1ed(r31) -/* 8021EBF0 98 1F 01 EE */ stb r0, 0x1ee(r31) -/* 8021EBF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021EBF8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021EBFC A0 04 00 02 */ lhz r0, 2(r4) -/* 8021EC00 B0 1F 01 92 */ sth r0, 0x192(r31) -/* 8021EC04 A8 1F 01 92 */ lha r0, 0x192(r31) -/* 8021EC08 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8021EC0C B0 04 5E 16 */ sth r0, 0x5e16(r4) -/* 8021EC10 A0 04 00 00 */ lhz r0, 0(r4) -/* 8021EC14 B0 1F 01 94 */ sth r0, 0x194(r31) -/* 8021EC18 88 04 00 1B */ lbz r0, 0x1b(r4) -/* 8021EC1C B0 1F 01 96 */ sth r0, 0x196(r31) -/* 8021EC20 A8 1F 01 96 */ lha r0, 0x196(r31) -/* 8021EC24 B0 04 5D CE */ sth r0, 0x5dce(r4) -/* 8021EC28 88 04 00 1A */ lbz r0, 0x1a(r4) -/* 8021EC2C B0 1F 01 98 */ sth r0, 0x198(r31) -/* 8021EC30 A0 04 00 08 */ lhz r0, 8(r4) -/* 8021EC34 7C 00 07 34 */ extsh r0, r0 -/* 8021EC38 90 1F 01 9C */ stw r0, 0x19c(r31) -/* 8021EC3C 80 1F 01 9C */ lwz r0, 0x19c(r31) -/* 8021EC40 90 04 5D D8 */ stw r0, 0x5dd8(r4) -/* 8021EC44 A0 04 00 06 */ lhz r0, 6(r4) -/* 8021EC48 7C 00 07 34 */ extsh r0, r0 -/* 8021EC4C 90 1F 01 A0 */ stw r0, 0x1a0(r31) -/* 8021EC50 80 04 5D E0 */ lwz r0, 0x5de0(r4) -/* 8021EC54 90 1F 01 A4 */ stw r0, 0x1a4(r31) -/* 8021EC58 80 1F 01 A4 */ lwz r0, 0x1a4(r31) -/* 8021EC5C 90 04 5D E4 */ stw r0, 0x5de4(r4) -/* 8021EC60 80 04 5D E8 */ lwz r0, 0x5de8(r4) -/* 8021EC64 90 1F 01 A8 */ stw r0, 0x1a8(r31) -/* 8021EC68 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 8021EC6C D0 1F 01 30 */ stfs f0, 0x130(r31) -/* 8021EC70 38 64 01 14 */ addi r3, r4, 0x114 -/* 8021EC74 88 84 4E 0C */ lbz r4, 0x4e0c(r4) -/* 8021EC78 4B E1 56 C9 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 8021EC7C 98 7F 01 C2 */ stb r3, 0x1c2(r31) -/* 8021EC80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021EC84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021EC88 88 03 5E A1 */ lbz r0, 0x5ea1(r3) -/* 8021EC8C 98 1F 01 C3 */ stb r0, 0x1c3(r31) -/* 8021EC90 A0 03 00 04 */ lhz r0, 4(r3) -/* 8021EC94 B0 1F 01 B0 */ sth r0, 0x1b0(r31) -/* 8021EC98 88 03 09 74 */ lbz r0, 0x974(r3) -/* 8021EC9C B0 1F 01 B2 */ sth r0, 0x1b2(r31) -/* 8021ECA0 88 03 5E 24 */ lbz r0, 0x5e24(r3) -/* 8021ECA4 98 1F 01 C4 */ stb r0, 0x1c4(r31) -/* 8021ECA8 88 03 5E 4A */ lbz r0, 0x5e4a(r3) -/* 8021ECAC 54 00 FF FE */ rlwinm r0, r0, 0x1f, 0x1f, 0x1f -/* 8021ECB0 98 1F 01 DC */ stb r0, 0x1dc(r31) -/* 8021ECB4 38 60 00 00 */ li r3, 0 -/* 8021ECB8 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 8021ECBC 38 00 00 02 */ li r0, 2 -/* 8021ECC0 7C 09 03 A6 */ mtctr r0 -lbl_8021ECC4: -/* 8021ECC4 7C 9F 1A 14 */ add r4, r31, r3 -/* 8021ECC8 D0 04 01 34 */ stfs f0, 0x134(r4) -/* 8021ECCC D0 04 01 3C */ stfs f0, 0x13c(r4) -/* 8021ECD0 38 63 00 04 */ addi r3, r3, 4 -/* 8021ECD4 42 00 FF F0 */ bdnz lbl_8021ECC4 -/* 8021ECD8 C0 02 AF CC */ lfs f0, lit_4663(r2) -/* 8021ECDC D0 1F 01 44 */ stfs f0, 0x144(r31) -/* 8021ECE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021ECE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021ECE8 88 03 5E 1D */ lbz r0, 0x5e1d(r3) -/* 8021ECEC 98 1F 01 C5 */ stb r0, 0x1c5(r31) -/* 8021ECF0 38 00 00 00 */ li r0, 0 -/* 8021ECF4 98 1F 01 C6 */ stb r0, 0x1c6(r31) -/* 8021ECF8 88 03 5E 43 */ lbz r0, 0x5e43(r3) -/* 8021ECFC 54 00 FF FE */ rlwinm r0, r0, 0x1f, 0x1f, 0x1f -/* 8021ED00 98 1F 01 DD */ stb r0, 0x1dd(r31) -/* 8021ED04 38 60 00 00 */ li r3, 0 -/* 8021ED08 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 8021ED0C 38 00 00 02 */ li r0, 2 -/* 8021ED10 7C 09 03 A6 */ mtctr r0 -lbl_8021ED14: -/* 8021ED14 7C 9F 1A 14 */ add r4, r31, r3 -/* 8021ED18 D0 04 01 48 */ stfs f0, 0x148(r4) -/* 8021ED1C D0 04 01 50 */ stfs f0, 0x150(r4) -/* 8021ED20 38 63 00 04 */ addi r3, r3, 4 -/* 8021ED24 42 00 FF F0 */ bdnz lbl_8021ED14 -/* 8021ED28 C0 02 AF CC */ lfs f0, lit_4663(r2) -/* 8021ED2C D0 1F 01 58 */ stfs f0, 0x158(r31) -/* 8021ED30 38 80 00 00 */ li r4, 0 -/* 8021ED34 98 9F 01 E4 */ stb r4, 0x1e4(r31) -/* 8021ED38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021ED3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021ED40 88 03 00 14 */ lbz r0, 0x14(r3) -/* 8021ED44 98 1F 01 E2 */ stb r0, 0x1e2(r31) -/* 8021ED48 98 9F 01 E3 */ stb r4, 0x1e3(r31) -/* 8021ED4C 98 9F 01 FE */ stb r4, 0x1fe(r31) -/* 8021ED50 98 9F 01 FD */ stb r4, 0x1fd(r31) -/* 8021ED54 98 9F 01 FF */ stb r4, 0x1ff(r31) -/* 8021ED58 98 9F 02 00 */ stb r4, 0x200(r31) -/* 8021ED5C 98 9F 02 01 */ stb r4, 0x201(r31) -/* 8021ED60 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8021ED64 98 1F 01 C7 */ stb r0, 0x1c7(r31) -/* 8021ED68 88 03 5E 1C */ lbz r0, 0x5e1c(r3) -/* 8021ED6C 98 1F 01 C8 */ stb r0, 0x1c8(r31) -/* 8021ED70 88 03 5E 42 */ lbz r0, 0x5e42(r3) -/* 8021ED74 54 00 FF FE */ rlwinm r0, r0, 0x1f, 0x1f, 0x1f -/* 8021ED78 98 1F 01 DE */ stb r0, 0x1de(r31) -/* 8021ED7C 88 03 5E 5E */ lbz r0, 0x5e5e(r3) -/* 8021ED80 54 00 FF FE */ rlwinm r0, r0, 0x1f, 0x1f, 0x1f -/* 8021ED84 98 1F 01 DF */ stb r0, 0x1df(r31) -/* 8021ED88 88 03 5E 62 */ lbz r0, 0x5e62(r3) -/* 8021ED8C 54 00 FF FE */ rlwinm r0, r0, 0x1f, 0x1f, 0x1f -/* 8021ED90 98 1F 01 E0 */ stb r0, 0x1e0(r31) -/* 8021ED94 3B 20 00 00 */ li r25, 0 -lbl_8021ED98: -/* 8021ED98 7F 23 CB 78 */ mr r3, r25 -/* 8021ED9C 4B E0 F0 59 */ bl dComIfGp_setSelectItem__Fi -/* 8021EDA0 3B 39 00 01 */ addi r25, r25, 1 -/* 8021EDA4 2C 19 00 02 */ cmpwi r25, 2 -/* 8021EDA8 41 80 FF F0 */ blt lbl_8021ED98 -/* 8021EDAC 38 60 00 00 */ li r3, 0 -/* 8021EDB0 4B E0 F1 6D */ bl dComIfGp_getSelectItem__Fi -/* 8021EDB4 98 7F 01 D2 */ stb r3, 0x1d2(r31) -/* 8021EDB8 38 60 00 01 */ li r3, 1 -/* 8021EDBC 4B E0 F1 61 */ bl dComIfGp_getSelectItem__Fi -/* 8021EDC0 98 7F 01 D4 */ stb r3, 0x1d4(r31) -/* 8021EDC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021EDC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021EDCC 88 03 5E 5C */ lbz r0, 0x5e5c(r3) -/* 8021EDD0 98 1F 01 D3 */ stb r0, 0x1d3(r31) -/* 8021EDD4 88 03 5E 60 */ lbz r0, 0x5e60(r3) -/* 8021EDD8 98 1F 01 D5 */ stb r0, 0x1d5(r31) -/* 8021EDDC C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 8021EDE0 D0 1F 01 88 */ stfs f0, 0x188(r31) -/* 8021EDE4 D0 1F 01 8C */ stfs f0, 0x18c(r31) -/* 8021EDE8 3B 20 00 00 */ li r25, 0 -/* 8021EDEC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021EDF0 3B 63 01 88 */ addi r27, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_8021EDF4: -/* 8021EDF4 7F 63 DB 78 */ mr r3, r27 -/* 8021EDF8 7F 24 CB 78 */ mr r4, r25 -/* 8021EDFC 4B FF DB 55 */ bl isDirectUseItem__13dMeter2Info_cFi -/* 8021EE00 7F 5F CA 14 */ add r26, r31, r25 -/* 8021EE04 98 7A 01 D6 */ stb r3, 0x1d6(r26) -/* 8021EE08 7F 23 CB 78 */ mr r3, r25 -/* 8021EE0C 4B E0 F7 B5 */ bl dComIfGp_getSelectItemNum__Fi -/* 8021EE10 98 7A 01 D8 */ stb r3, 0x1d8(r26) -/* 8021EE14 3B 39 00 01 */ addi r25, r25, 1 -/* 8021EE18 2C 19 00 02 */ cmpwi r25, 2 -/* 8021EE1C 41 80 FF D8 */ blt lbl_8021EDF4 -/* 8021EE20 38 00 00 00 */ li r0, 0 -/* 8021EE24 98 1F 01 E1 */ stb r0, 0x1e1(r31) -/* 8021EE28 B0 1F 01 B4 */ sth r0, 0x1b4(r31) -/* 8021EE2C C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 8021EE30 D0 1F 01 5C */ stfs f0, 0x15c(r31) -/* 8021EE34 38 60 00 00 */ li r3, 0 -/* 8021EE38 38 00 00 04 */ li r0, 4 -/* 8021EE3C 7C 09 03 A6 */ mtctr r0 -lbl_8021EE40: -/* 8021EE40 7C 9F 1A 14 */ add r4, r31, r3 -/* 8021EE44 D0 04 01 60 */ stfs f0, 0x160(r4) -/* 8021EE48 D0 04 01 74 */ stfs f0, 0x174(r4) -/* 8021EE4C 38 63 00 04 */ addi r3, r3, 4 -/* 8021EE50 42 00 FF F0 */ bdnz lbl_8021EE40 -/* 8021EE54 38 80 00 00 */ li r4, 0 -/* 8021EE58 B0 9F 01 90 */ sth r4, 0x190(r31) -/* 8021EE5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021EE60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021EE64 88 03 5E 33 */ lbz r0, 0x5e33(r3) -/* 8021EE68 98 1F 01 C9 */ stb r0, 0x1c9(r31) -/* 8021EE6C 88 03 5E 26 */ lbz r0, 0x5e26(r3) -/* 8021EE70 98 1F 01 CA */ stb r0, 0x1ca(r31) -/* 8021EE74 88 03 5E 2F */ lbz r0, 0x5e2f(r3) -/* 8021EE78 98 1F 01 CB */ stb r0, 0x1cb(r31) -/* 8021EE7C 88 03 5E 32 */ lbz r0, 0x5e32(r3) -/* 8021EE80 98 1F 01 CC */ stb r0, 0x1cc(r31) -/* 8021EE84 88 03 5E 1F */ lbz r0, 0x5e1f(r3) -/* 8021EE88 98 1F 01 CD */ stb r0, 0x1cd(r31) -/* 8021EE8C 88 03 5E 21 */ lbz r0, 0x5e21(r3) -/* 8021EE90 98 1F 01 CE */ stb r0, 0x1ce(r31) -/* 8021EE94 88 03 5E 64 */ lbz r0, 0x5e64(r3) -/* 8021EE98 98 1F 01 CF */ stb r0, 0x1cf(r31) -/* 8021EE9C 88 03 5E 68 */ lbz r0, 0x5e68(r3) -/* 8021EEA0 98 1F 01 D0 */ stb r0, 0x1d0(r31) -/* 8021EEA4 88 03 5E 20 */ lbz r0, 0x5e20(r3) -/* 8021EEA8 98 1F 01 D1 */ stb r0, 0x1d1(r31) -/* 8021EEAC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021EEB0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021EEB4 A0 03 00 AE */ lhz r0, 0xae(r3) -/* 8021EEB8 54 00 E7 FE */ rlwinm r0, r0, 0x1c, 0x1f, 0x1f -/* 8021EEBC 90 1F 01 AC */ stw r0, 0x1ac(r31) -/* 8021EEC0 B0 9F 01 9A */ sth r4, 0x19a(r31) -/* 8021EEC4 38 60 08 64 */ li r3, 0x864 -/* 8021EEC8 48 0A FD 85 */ bl __nw__FUl -/* 8021EECC 7C 60 1B 79 */ or. r0, r3, r3 -/* 8021EED0 41 82 00 10 */ beq lbl_8021EEE0 -/* 8021EED4 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 8021EED8 4B FF 0B DD */ bl __ct__13dMeter2Draw_cFP10JKRExpHeap -/* 8021EEDC 7C 60 1B 78 */ mr r0, r3 -lbl_8021EEE0: -/* 8021EEE0 90 1F 01 0C */ stw r0, 0x10c(r31) -/* 8021EEE4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021EEE8 4B FF 6E C1 */ bl getNowLightDropRateCalc__13dMeter2Draw_cFv -/* 8021EEEC D0 3F 01 30 */ stfs f1, 0x130(r31) -/* 8021EEF0 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021EEF4 48 0A F8 91 */ bl getTotalFreeSize__7JKRHeapFv -/* 8021EEF8 3B 20 00 00 */ li r25, 0 -/* 8021EEFC 3B 80 00 00 */ li r28, 0 -lbl_8021EF00: -/* 8021EF00 80 1F 01 28 */ lwz r0, 0x128(r31) -/* 8021EF04 28 00 00 00 */ cmplwi r0, 0 -/* 8021EF08 40 82 01 48 */ bne lbl_8021F050 -/* 8021EF0C 38 1C 01 D2 */ addi r0, r28, 0x1d2 -/* 8021EF10 7C 1F 00 AE */ lbzx r0, r31, r0 -/* 8021EF14 28 00 00 50 */ cmplwi r0, 0x50 -/* 8021EF18 41 82 00 1C */ beq lbl_8021EF34 -/* 8021EF1C 28 00 00 70 */ cmplwi r0, 0x70 -/* 8021EF20 41 82 00 14 */ beq lbl_8021EF34 -/* 8021EF24 28 00 00 71 */ cmplwi r0, 0x71 -/* 8021EF28 41 82 00 0C */ beq lbl_8021EF34 -/* 8021EF2C 28 00 00 72 */ cmplwi r0, 0x72 -/* 8021EF30 40 82 00 30 */ bne lbl_8021EF60 -lbl_8021EF34: -/* 8021EF34 7F 23 CB 78 */ mr r3, r25 -/* 8021EF38 4B E0 F7 51 */ bl dComIfGp_getSelectItemMaxNum__Fi -/* 8021EF3C 54 7B 06 3E */ clrlwi r27, r3, 0x18 -/* 8021EF40 7F 23 CB 78 */ mr r3, r25 -/* 8021EF44 4B E0 F6 7D */ bl dComIfGp_getSelectItemNum__Fi -/* 8021EF48 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 8021EF4C 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021EF50 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 8021EF54 7F 66 DB 78 */ mr r6, r27 -/* 8021EF58 4B FF BC 2D */ bl setItemNum__13dMeter2Draw_cFUcUcUc -/* 8021EF5C 48 00 00 F4 */ b lbl_8021F050 -lbl_8021EF60: -/* 8021EF60 28 00 00 76 */ cmplwi r0, 0x76 -/* 8021EF64 40 82 00 30 */ bne lbl_8021EF94 -/* 8021EF68 7F 23 CB 78 */ mr r3, r25 -/* 8021EF6C 4B E0 F7 1D */ bl dComIfGp_getSelectItemMaxNum__Fi -/* 8021EF70 54 7B 06 3E */ clrlwi r27, r3, 0x18 -/* 8021EF74 7F 23 CB 78 */ mr r3, r25 -/* 8021EF78 4B E0 F6 49 */ bl dComIfGp_getSelectItemNum__Fi -/* 8021EF7C 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 8021EF80 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021EF84 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 8021EF88 7F 66 DB 78 */ mr r6, r27 -/* 8021EF8C 4B FF BB F9 */ bl setItemNum__13dMeter2Draw_cFUcUcUc -/* 8021EF90 48 00 00 C0 */ b lbl_8021F050 -lbl_8021EF94: -/* 8021EF94 28 00 00 43 */ cmplwi r0, 0x43 -/* 8021EF98 41 82 00 2C */ beq lbl_8021EFC4 -/* 8021EF9C 28 00 00 53 */ cmplwi r0, 0x53 -/* 8021EFA0 41 82 00 24 */ beq lbl_8021EFC4 -/* 8021EFA4 28 00 00 54 */ cmplwi r0, 0x54 -/* 8021EFA8 41 82 00 1C */ beq lbl_8021EFC4 -/* 8021EFAC 28 00 00 55 */ cmplwi r0, 0x55 -/* 8021EFB0 41 82 00 14 */ beq lbl_8021EFC4 -/* 8021EFB4 28 00 00 56 */ cmplwi r0, 0x56 -/* 8021EFB8 41 82 00 0C */ beq lbl_8021EFC4 -/* 8021EFBC 28 00 00 5A */ cmplwi r0, 0x5a -/* 8021EFC0 40 82 00 1C */ bne lbl_8021EFDC -lbl_8021EFC4: -/* 8021EFC4 88 DD 00 00 */ lbz r6, 0(r29) -/* 8021EFC8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021EFCC 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 8021EFD0 88 BF 01 DA */ lbz r5, 0x1da(r31) -/* 8021EFD4 4B FF BB B1 */ bl setItemNum__13dMeter2Draw_cFUcUcUc -/* 8021EFD8 48 00 00 78 */ b lbl_8021F050 -lbl_8021EFDC: -/* 8021EFDC 28 00 00 4B */ cmplwi r0, 0x4b -/* 8021EFE0 40 82 00 1C */ bne lbl_8021EFFC -/* 8021EFE4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021EFE8 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 8021EFEC 88 BF 01 DB */ lbz r5, 0x1db(r31) -/* 8021EFF0 38 C0 00 32 */ li r6, 0x32 -/* 8021EFF4 4B FF BB 91 */ bl setItemNum__13dMeter2Draw_cFUcUcUc -/* 8021EFF8 48 00 00 58 */ b lbl_8021F050 -lbl_8021EFFC: -/* 8021EFFC 28 00 00 59 */ cmplwi r0, 0x59 -/* 8021F000 40 82 00 50 */ bne lbl_8021F050 -/* 8021F004 7F 23 CB 78 */ mr r3, r25 -/* 8021F008 4B E0 F5 B9 */ bl dComIfGp_getSelectItemNum__Fi -/* 8021F00C 54 7A 06 3E */ clrlwi r26, r3, 0x18 -/* 8021F010 7F 23 CB 78 */ mr r3, r25 -/* 8021F014 4B E0 F6 75 */ bl dComIfGp_getSelectItemMaxNum__Fi -/* 8021F018 54 66 06 3E */ clrlwi r6, r3, 0x18 -/* 8021F01C 88 1F 01 DA */ lbz r0, 0x1da(r31) -/* 8021F020 7C 1A 00 40 */ cmplw r26, r0 -/* 8021F024 40 81 00 08 */ ble lbl_8021F02C -/* 8021F028 7C 1A 03 78 */ mr r26, r0 -lbl_8021F02C: -/* 8021F02C 88 7D 00 00 */ lbz r3, 0(r29) -/* 8021F030 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8021F034 7C 06 00 40 */ cmplw r6, r0 -/* 8021F038 40 80 00 08 */ bge lbl_8021F040 -/* 8021F03C 7C 66 1B 78 */ mr r6, r3 -lbl_8021F040: -/* 8021F040 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021F044 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 8021F048 7F 45 D3 78 */ mr r5, r26 -/* 8021F04C 4B FF BB 39 */ bl setItemNum__13dMeter2Draw_cFUcUcUc -lbl_8021F050: -/* 8021F050 3B 39 00 01 */ addi r25, r25, 1 -/* 8021F054 2C 19 00 02 */ cmpwi r25, 2 -/* 8021F058 3B 9C 00 02 */ addi r28, r28, 2 -/* 8021F05C 41 80 FE A4 */ blt lbl_8021EF00 -/* 8021F060 38 00 00 00 */ li r0, 0 -/* 8021F064 90 1F 01 20 */ stw r0, 0x120(r31) -/* 8021F068 4B FE E5 E9 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 8021F06C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021F070 41 82 00 2C */ beq lbl_8021F09C -/* 8021F074 38 60 00 34 */ li r3, 0x34 -/* 8021F078 48 0A FB D5 */ bl __nw__FUl -/* 8021F07C 7C 60 1B 79 */ or. r0, r3, r3 -/* 8021F080 41 82 00 14 */ beq lbl_8021F094 -/* 8021F084 80 9F 01 0C */ lwz r4, 0x10c(r31) -/* 8021F088 80 84 00 78 */ lwz r4, 0x78(r4) -/* 8021F08C 4B FE E8 BD */ bl __ct__11dMeterMap_cFP9J2DScreen -/* 8021F090 7C 60 1B 78 */ mr r0, r3 -lbl_8021F094: -/* 8021F094 90 1F 01 20 */ stw r0, 0x120(r31) -/* 8021F098 48 00 00 20 */ b lbl_8021F0B8 -lbl_8021F09C: -/* 8021F09C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021F0A0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021F0A4 88 03 00 BF */ lbz r0, 0xbf(r3) -/* 8021F0A8 28 00 00 02 */ cmplwi r0, 2 -/* 8021F0AC 40 82 00 0C */ bne lbl_8021F0B8 -/* 8021F0B0 38 00 00 00 */ li r0, 0 -/* 8021F0B4 98 03 00 BF */ stb r0, 0xbf(r3) -lbl_8021F0B8: -/* 8021F0B8 80 1F 01 20 */ lwz r0, 0x120(r31) -/* 8021F0BC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021F0C0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021F0C4 90 03 00 20 */ stw r0, 0x20(r3) -/* 8021F0C8 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021F0CC 48 0A F6 B9 */ bl getTotalFreeSize__7JKRHeapFv -/* 8021F0D0 38 60 50 00 */ li r3, 0x5000 -/* 8021F0D4 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 8021F0D8 4B E0 12 C5 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap -/* 8021F0DC 90 7F 01 04 */ stw r3, 0x104(r31) -/* 8021F0E0 38 00 00 00 */ li r0, 0 -/* 8021F0E4 90 1F 01 08 */ stw r0, 0x108(r31) -/* 8021F0E8 90 1F 01 10 */ stw r0, 0x110(r31) -/* 8021F0EC 90 1F 01 14 */ stw r0, 0x114(r31) -/* 8021F0F0 90 1F 01 18 */ stw r0, 0x118(r31) -/* 8021F0F4 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021F0F8 48 0A F6 8D */ bl getTotalFreeSize__7JKRHeapFv -/* 8021F0FC 38 00 00 00 */ li r0, 0 -/* 8021F100 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 8021F104 7F C3 F3 78 */ mr r3, r30 -/* 8021F108 4B DF 00 C5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8021F10C 38 60 00 04 */ li r3, 4 -/* 8021F110 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021F114 48 14 31 05 */ bl _restgpr_25 -/* 8021F118 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8021F11C 7C 08 03 A6 */ mtlr r0 -/* 8021F120 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021F124 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/_execute__9dMeter2_cFv.s b/asm/d/meter/d_meter2/_execute__9dMeter2_cFv.s deleted file mode 100644 index fd5992d20b8..00000000000 --- a/asm/d/meter/d_meter2/_execute__9dMeter2_cFv.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_8021F128: -/* 8021F128 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8021F12C 7C 08 02 A6 */ mflr r0 -/* 8021F130 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021F134 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021F138 48 14 30 A5 */ bl _savegpr_29 -/* 8021F13C 7C 7D 1B 78 */ mr r29, r3 -/* 8021F140 80 63 01 00 */ lwz r3, 0x100(r3) -/* 8021F144 4B DF 00 89 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8021F148 7C 7F 1B 78 */ mr r31, r3 -/* 8021F14C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F150 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F154 3B C3 01 00 */ addi r30, r3, 0x100 -/* 8021F158 7F C3 F3 78 */ mr r3, r30 -/* 8021F15C 38 80 00 00 */ li r4, 0 -/* 8021F160 4B E1 51 31 */ bl isCollectMirror__20dSv_player_collect_cCFUc -/* 8021F164 2C 03 00 00 */ cmpwi r3, 0 -/* 8021F168 40 82 00 2C */ bne lbl_8021F194 -/* 8021F16C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F170 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F174 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8021F178 38 80 54 20 */ li r4, 0x5420 -/* 8021F17C 4B E1 58 41 */ bl isEventBit__11dSv_event_cCFUs -/* 8021F180 2C 03 00 00 */ cmpwi r3, 0 -/* 8021F184 41 82 00 10 */ beq lbl_8021F194 -/* 8021F188 7F C3 F3 78 */ mr r3, r30 -/* 8021F18C 38 80 00 00 */ li r4, 0 -/* 8021F190 4B E1 50 E1 */ bl onCollectMirror__20dSv_player_collect_cFUc -lbl_8021F194: -/* 8021F194 7F C3 F3 78 */ mr r3, r30 -/* 8021F198 38 80 00 03 */ li r4, 3 -/* 8021F19C 4B E1 50 B1 */ bl isCollectCrystal__20dSv_player_collect_cCFUc -/* 8021F1A0 2C 03 00 00 */ cmpwi r3, 0 -/* 8021F1A4 40 82 00 2C */ bne lbl_8021F1D0 -/* 8021F1A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F1AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F1B0 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8021F1B4 38 80 54 10 */ li r4, 0x5410 -/* 8021F1B8 4B E1 58 05 */ bl isEventBit__11dSv_event_cCFUs -/* 8021F1BC 2C 03 00 00 */ cmpwi r3, 0 -/* 8021F1C0 41 82 00 10 */ beq lbl_8021F1D0 -/* 8021F1C4 7F C3 F3 78 */ mr r3, r30 -/* 8021F1C8 38 80 00 03 */ li r4, 3 -/* 8021F1CC 4B E1 50 61 */ bl onCollectCrystal__20dSv_player_collect_cFUc -lbl_8021F1D0: -/* 8021F1D0 7F A3 EB 78 */ mr r3, r29 -/* 8021F1D4 48 00 05 DD */ bl checkStatus__9dMeter2_cFv -/* 8021F1D8 80 7D 01 0C */ lwz r3, 0x10c(r29) -/* 8021F1DC 80 9D 01 24 */ lwz r4, 0x124(r29) -/* 8021F1E0 4B FF 21 7D */ bl exec__13dMeter2Draw_cFUl -/* 8021F1E4 7F A3 EB 78 */ mr r3, r29 -/* 8021F1E8 48 00 0B 79 */ bl moveLife__9dMeter2_cFv -/* 8021F1EC 7F A3 EB 78 */ mr r3, r29 -/* 8021F1F0 48 00 0F 91 */ bl moveKantera__9dMeter2_cFv -/* 8021F1F4 7F A3 EB 78 */ mr r3, r29 -/* 8021F1F8 48 00 13 25 */ bl moveOxygen__9dMeter2_cFv -/* 8021F1FC 7F A3 EB 78 */ mr r3, r29 -/* 8021F200 48 00 16 89 */ bl moveLightDrop__9dMeter2_cFv -/* 8021F204 7F A3 EB 78 */ mr r3, r29 -/* 8021F208 48 00 1A 29 */ bl moveRupee__9dMeter2_cFv -/* 8021F20C 7F A3 EB 78 */ mr r3, r29 -/* 8021F210 48 00 1E 9D */ bl moveKey__9dMeter2_cFv -/* 8021F214 7F A3 EB 78 */ mr r3, r29 -/* 8021F218 48 00 33 01 */ bl moveButtonXY__9dMeter2_cFv -/* 8021F21C 7F A3 EB 78 */ mr r3, r29 -/* 8021F220 48 00 20 25 */ bl moveButtonA__9dMeter2_cFv -/* 8021F224 7F A3 EB 78 */ mr r3, r29 -/* 8021F228 48 00 25 CD */ bl moveButtonB__9dMeter2_cFv -/* 8021F22C 7F A3 EB 78 */ mr r3, r29 -/* 8021F230 48 00 2C 99 */ bl moveButtonR__9dMeter2_cFv -/* 8021F234 7F A3 EB 78 */ mr r3, r29 -/* 8021F238 48 00 2D C9 */ bl moveButtonZ__9dMeter2_cFv -/* 8021F23C 7F A3 EB 78 */ mr r3, r29 -/* 8021F240 48 00 30 61 */ bl moveButton3D__9dMeter2_cFv -/* 8021F244 7F A3 EB 78 */ mr r3, r29 -/* 8021F248 48 00 31 1D */ bl moveButtonC__9dMeter2_cFv -/* 8021F24C 7F A3 EB 78 */ mr r3, r29 -/* 8021F250 48 00 32 45 */ bl moveButtonS__9dMeter2_cFv -/* 8021F254 7F A3 EB 78 */ mr r3, r29 -/* 8021F258 48 00 3C 31 */ bl moveButtonCross__9dMeter2_cFv -/* 8021F25C 7F A3 EB 78 */ mr r3, r29 -/* 8021F260 48 00 3E 99 */ bl moveTouchSubMenu__9dMeter2_cFv -/* 8021F264 7F A3 EB 78 */ mr r3, r29 -/* 8021F268 48 00 4B 99 */ bl moveBombNum__9dMeter2_cFv -/* 8021F26C 7F A3 EB 78 */ mr r3, r29 -/* 8021F270 48 00 50 E5 */ bl moveArrowNum__9dMeter2_cFv -/* 8021F274 7F A3 EB 78 */ mr r3, r29 -/* 8021F278 48 00 54 09 */ bl movePachinkoNum__9dMeter2_cFv -/* 8021F27C 7F A3 EB 78 */ mr r3, r29 -/* 8021F280 48 00 4F D9 */ bl moveBottleNum__9dMeter2_cFv -/* 8021F284 80 7D 01 20 */ lwz r3, 0x120(r29) -/* 8021F288 28 03 00 00 */ cmplwi r3, 0 -/* 8021F28C 41 82 00 10 */ beq lbl_8021F29C -/* 8021F290 80 9D 01 24 */ lwz r4, 0x124(r29) -/* 8021F294 4B FE EA 51 */ bl _move__11dMeterMap_cFUl -/* 8021F298 48 00 00 0C */ b lbl_8021F2A4 -lbl_8021F29C: -/* 8021F29C 80 7D 01 24 */ lwz r3, 0x124(r29) -/* 8021F2A0 4B FE F4 B5 */ bl meter_map_move__11dMeterMap_cFUl -lbl_8021F2A4: -/* 8021F2A4 7F A3 EB 78 */ mr r3, r29 -/* 8021F2A8 48 00 3E 55 */ bl moveSubContents__9dMeter2_cFv -/* 8021F2AC 7F A3 EB 78 */ mr r3, r29 -/* 8021F2B0 48 00 3F 19 */ bl move2DContents__9dMeter2_cFv -/* 8021F2B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F2B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F2BC 88 03 5E B5 */ lbz r0, 0x5eb5(r3) -/* 8021F2C0 28 00 00 00 */ cmplwi r0, 0 -/* 8021F2C4 40 82 00 1C */ bne lbl_8021F2E0 -/* 8021F2C8 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 8021F2CC 28 00 00 00 */ cmplwi r0, 0 -/* 8021F2D0 40 82 00 10 */ bne lbl_8021F2E0 -/* 8021F2D4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021F2D8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021F2DC 4B FF EA 05 */ bl decHotSpringTimer__13dMeter2Info_cFv -lbl_8021F2E0: -/* 8021F2E0 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 8021F2E4 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 8021F2E8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021F2EC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021F2F0 B0 03 00 AE */ sth r0, 0xae(r3) -/* 8021F2F4 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8021F2F8 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 -/* 8021F2FC B0 03 00 AE */ sth r0, 0xae(r3) -/* 8021F300 38 00 00 00 */ li r0, 0 -/* 8021F304 B0 03 00 B0 */ sth r0, 0xb0(r3) -/* 8021F308 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F30C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F310 98 03 5E 1F */ stb r0, 0x5e1f(r3) -/* 8021F314 98 03 5E 28 */ stb r0, 0x5e28(r3) -/* 8021F318 98 03 5E 45 */ stb r0, 0x5e45(r3) -/* 8021F31C 98 03 5E 21 */ stb r0, 0x5e21(r3) -/* 8021F320 98 03 5E 2A */ stb r0, 0x5e2a(r3) -/* 8021F324 98 03 5E 47 */ stb r0, 0x5e47(r3) -/* 8021F328 98 03 5E 64 */ stb r0, 0x5e64(r3) -/* 8021F32C 98 03 5E 65 */ stb r0, 0x5e65(r3) -/* 8021F330 98 03 5E 68 */ stb r0, 0x5e68(r3) -/* 8021F334 98 03 5E 69 */ stb r0, 0x5e69(r3) -/* 8021F338 98 03 5E 20 */ stb r0, 0x5e20(r3) -/* 8021F33C 98 03 5E 46 */ stb r0, 0x5e46(r3) -/* 8021F340 98 03 5E 2F */ stb r0, 0x5e2f(r3) -/* 8021F344 98 03 5E 30 */ stb r0, 0x5e30(r3) -/* 8021F348 98 03 5E 4C */ stb r0, 0x5e4c(r3) -/* 8021F34C 7F E3 FB 78 */ mr r3, r31 -/* 8021F350 4B DE FE 7D */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8021F354 38 60 00 01 */ li r3, 1 -/* 8021F358 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021F35C 48 14 2E CD */ bl _restgpr_29 -/* 8021F360 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8021F364 7C 08 03 A6 */ mtlr r0 -/* 8021F368 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021F36C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/dMeter2_Delete__FP9dMeter2_c.s b/asm/d/meter/d_meter2/dMeter2_Delete__FP9dMeter2_c.s deleted file mode 100644 index 96ffc3b69bf..00000000000 --- a/asm/d/meter/d_meter2/dMeter2_Delete__FP9dMeter2_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80225AE8: -/* 80225AE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80225AEC 7C 08 02 A6 */ mflr r0 -/* 80225AF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80225AF4 4B FF 99 A9 */ bl _delete__9dMeter2_cFv -/* 80225AF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80225AFC 7C 08 03 A6 */ mtlr r0 -/* 80225B00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80225B04 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/dMeter2_Draw__FP9dMeter2_c.s b/asm/d/meter/d_meter2/dMeter2_Draw__FP9dMeter2_c.s deleted file mode 100644 index fa8a5066ce5..00000000000 --- a/asm/d/meter/d_meter2/dMeter2_Draw__FP9dMeter2_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80225AA0: -/* 80225AA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80225AA4 7C 08 02 A6 */ mflr r0 -/* 80225AA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80225AAC 4B FF 98 C5 */ bl _draw__9dMeter2_cFv -/* 80225AB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80225AB4 7C 08 03 A6 */ mtlr r0 -/* 80225AB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80225ABC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/dMeter2_Execute__FP9dMeter2_c.s b/asm/d/meter/d_meter2/dMeter2_Execute__FP9dMeter2_c.s deleted file mode 100644 index ba09d9cdc1a..00000000000 --- a/asm/d/meter/d_meter2/dMeter2_Execute__FP9dMeter2_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80225AC0: -/* 80225AC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80225AC4 7C 08 02 A6 */ mflr r0 -/* 80225AC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80225ACC 4B FF 96 5D */ bl _execute__9dMeter2_cFv -/* 80225AD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80225AD4 7C 08 03 A6 */ mtlr r0 -/* 80225AD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80225ADC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/setLifeZero__9dMeter2_cFv.s b/asm/d/meter/d_meter2/setLifeZero__9dMeter2_cFv.s deleted file mode 100644 index d23f1b9b8df..00000000000 --- a/asm/d/meter/d_meter2/setLifeZero__9dMeter2_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8021F780: -/* 8021F780 38 00 00 01 */ li r0, 1 -/* 8021F784 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F788 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F78C B0 04 00 02 */ sth r0, 2(r4) -/* 8021F790 B0 03 01 92 */ sth r0, 0x192(r3) -/* 8021F794 C0 24 5D C0 */ lfs f1, 0x5dc0(r4) -/* 8021F798 C0 02 AF D0 */ lfs f0, lit_4837(r2) -/* 8021F79C EC 01 00 2A */ fadds f0, f1, f0 -/* 8021F7A0 D0 04 5D C0 */ stfs f0, 0x5dc0(r4) -/* 8021F7A4 38 00 00 00 */ li r0, 0 -/* 8021F7A8 98 04 5E B6 */ stb r0, 0x5eb6(r4) -/* 8021F7AC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_HIO/__sinit_d_meter_HIO_cpp.s b/asm/d/meter/d_meter_HIO/__sinit_d_meter_HIO_cpp.s deleted file mode 100644 index 802e6d12d3f..00000000000 --- a/asm/d/meter/d_meter_HIO/__sinit_d_meter_HIO_cpp.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80201284: -/* 80201284 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80201288 7C 08 02 A6 */ mflr r0 -/* 8020128C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80201290 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80201294 3C 60 80 43 */ lis r3, lit_3766@ha /* 0x8042EBB0@ha */ -/* 80201298 3B E3 EB B0 */ addi r31, r3, lit_3766@l /* 0x8042EBB0@l */ -/* 8020129C 38 6D 8B 30 */ la r3, g_menuHIO(r13) /* 804510B0-_SDA_BASE_ */ -/* 802012A0 4B FF D0 91 */ bl __ct__16dMeter_menuHIO_cFv -/* 802012A4 3C 80 80 20 */ lis r4, __dt__16dMeter_menuHIO_cFv@ha /* 0x8020123C@ha */ -/* 802012A8 38 84 12 3C */ addi r4, r4, __dt__16dMeter_menuHIO_cFv@l /* 0x8020123C@l */ -/* 802012AC 38 BF 00 00 */ addi r5, r31, 0 -/* 802012B0 48 16 09 75 */ bl __register_global_object -/* 802012B4 38 7F 00 18 */ addi r3, r31, 0x18 -/* 802012B8 4B FF E3 01 */ bl __ct__16dMeter_drawHIO_cFv -/* 802012BC 3C 80 80 20 */ lis r4, __dt__16dMeter_drawHIO_cFv@ha /* 0x80201128@ha */ -/* 802012C0 38 84 11 28 */ addi r4, r4, __dt__16dMeter_drawHIO_cFv@l /* 0x80201128@l */ -/* 802012C4 38 BF 00 0C */ addi r5, r31, 0xc -/* 802012C8 48 16 09 5D */ bl __register_global_object -/* 802012CC 38 7F 0F 4C */ addi r3, r31, 0xf4c -/* 802012D0 4B FF EE DD */ bl __ct__16dMeter_ringHIO_cFv -/* 802012D4 3C 80 80 20 */ lis r4, __dt__16dMeter_ringHIO_cFv@ha /* 0x802010E0@ha */ -/* 802012D8 38 84 10 E0 */ addi r4, r4, __dt__16dMeter_ringHIO_cFv@l /* 0x802010E0@l */ -/* 802012DC 38 BF 0F 40 */ addi r5, r31, 0xf40 -/* 802012E0 48 16 09 45 */ bl __register_global_object -/* 802012E4 38 7F 10 B0 */ addi r3, r31, 0x10b0 -/* 802012E8 4B FF F3 E1 */ bl __ct__16dMeter_fmapHIO_cFv -/* 802012EC 3C 80 80 20 */ lis r4, __dt__16dMeter_fmapHIO_cFv@ha /* 0x80200BCC@ha */ -/* 802012F0 38 84 0B CC */ addi r4, r4, __dt__16dMeter_fmapHIO_cFv@l /* 0x80200BCC@l */ -/* 802012F4 38 BF 10 A4 */ addi r5, r31, 0x10a4 -/* 802012F8 48 16 09 2D */ bl __register_global_object -/* 802012FC 38 7F 15 60 */ addi r3, r31, 0x1560 -/* 80201300 4B FF F9 D5 */ bl __ct__18dMeter_cursorHIO_cFv -/* 80201304 3C 80 80 20 */ lis r4, __dt__18dMeter_cursorHIO_cFv@ha /* 0x80201098@ha */ -/* 80201308 38 84 10 98 */ addi r4, r4, __dt__18dMeter_cursorHIO_cFv@l /* 0x80201098@l */ -/* 8020130C 38 BF 15 54 */ addi r5, r31, 0x1554 -/* 80201310 48 16 09 15 */ bl __register_global_object -/* 80201314 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80201318 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020131C 7C 08 03 A6 */ mtlr r0 -/* 80201320 38 21 00 10 */ addi r1, r1, 0x10 -/* 80201324 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/__ct__11dMeterMap_cFP9J2DScreen.s b/asm/d/meter/d_meter_map/__ct__11dMeterMap_cFP9J2DScreen.s deleted file mode 100644 index cc6e3a0b58f..00000000000 --- a/asm/d/meter/d_meter_map/__ct__11dMeterMap_cFP9J2DScreen.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8020D948: -/* 8020D948 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020D94C 7C 08 02 A6 */ mflr r0 -/* 8020D950 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020D954 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020D958 7C 7F 1B 78 */ mr r31, r3 -/* 8020D95C 3C A0 80 3A */ lis r5, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 8020D960 38 05 6F 88 */ addi r0, r5, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 8020D964 90 03 00 00 */ stw r0, 0(r3) -/* 8020D968 3C A0 80 3C */ lis r5, __vt__11dMeterMap_c@ha /* 0x803BF2F8@ha */ -/* 8020D96C 38 05 F2 F8 */ addi r0, r5, __vt__11dMeterMap_c@l /* 0x803BF2F8@l */ -/* 8020D970 90 03 00 00 */ stw r0, 0(r3) -/* 8020D974 48 00 00 79 */ bl _create__11dMeterMap_cFP9J2DScreen -/* 8020D978 7F E3 FB 78 */ mr r3, r31 -/* 8020D97C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8020D980 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020D984 7C 08 03 A6 */ mtlr r0 -/* 8020D988 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020D98C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/__dt__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/__dt__11dMeterMap_cFv.s deleted file mode 100644 index 46a9804abe6..00000000000 --- a/asm/d/meter/d_meter_map/__dt__11dMeterMap_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8020D990: -/* 8020D990 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020D994 7C 08 02 A6 */ mflr r0 -/* 8020D998 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020D99C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020D9A0 93 C1 00 08 */ stw r30, 8(r1) -/* 8020D9A4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8020D9A8 7C 9F 23 78 */ mr r31, r4 -/* 8020D9AC 41 82 00 24 */ beq lbl_8020D9D0 -/* 8020D9B0 3C 80 80 3C */ lis r4, __vt__11dMeterMap_c@ha /* 0x803BF2F8@ha */ -/* 8020D9B4 38 04 F2 F8 */ addi r0, r4, __vt__11dMeterMap_c@l /* 0x803BF2F8@l */ -/* 8020D9B8 90 1E 00 00 */ stw r0, 0(r30) -/* 8020D9BC 48 00 02 95 */ bl _delete__11dMeterMap_cFv -/* 8020D9C0 7F E0 07 35 */ extsh. r0, r31 -/* 8020D9C4 40 81 00 0C */ ble lbl_8020D9D0 -/* 8020D9C8 7F C3 F3 78 */ mr r3, r30 -/* 8020D9CC 48 0C 13 71 */ bl __dl__FPv -lbl_8020D9D0: -/* 8020D9D0 7F C3 F3 78 */ mr r3, r30 -/* 8020D9D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8020D9D8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8020D9DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020D9E0 7C 08 03 A6 */ mtlr r0 -/* 8020D9E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020D9E8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/_delete__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/_delete__11dMeterMap_cFv.s deleted file mode 100644 index 7d20c624412..00000000000 --- a/asm/d/meter/d_meter_map/_delete__11dMeterMap_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8020DC50: -/* 8020DC50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020DC54 7C 08 02 A6 */ mflr r0 -/* 8020DC58 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020DC5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020DC60 7C 7F 1B 78 */ mr r31, r3 -/* 8020DC64 80 63 00 04 */ lwz r3, 4(r3) -/* 8020DC68 28 03 00 00 */ cmplwi r3, 0 -/* 8020DC6C 41 82 00 1C */ beq lbl_8020DC88 -/* 8020DC70 41 82 00 18 */ beq lbl_8020DC88 -/* 8020DC74 38 80 00 01 */ li r4, 1 -/* 8020DC78 81 83 00 00 */ lwz r12, 0(r3) -/* 8020DC7C 81 8C 00 08 */ lwz r12, 8(r12) -/* 8020DC80 7D 89 03 A6 */ mtctr r12 -/* 8020DC84 4E 80 04 21 */ bctrl -lbl_8020DC88: -/* 8020DC88 80 7F 00 08 */ lwz r3, 8(r31) -/* 8020DC8C 28 03 00 00 */ cmplwi r3, 0 -/* 8020DC90 41 82 00 1C */ beq lbl_8020DCAC -/* 8020DC94 41 82 00 18 */ beq lbl_8020DCAC -/* 8020DC98 38 80 00 01 */ li r4, 1 -/* 8020DC9C 81 83 00 00 */ lwz r12, 0(r3) -/* 8020DCA0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8020DCA4 7D 89 03 A6 */ mtctr r12 -/* 8020DCA8 4E 80 04 21 */ bctrl -lbl_8020DCAC: -/* 8020DCAC 4B FF F9 A5 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 8020DCB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8020DCB4 41 82 00 1C */ beq lbl_8020DCD0 -/* 8020DCB8 88 1F 00 2D */ lbz r0, 0x2d(r31) -/* 8020DCBC 28 00 00 00 */ cmplwi r0, 0 -/* 8020DCC0 41 82 00 0C */ beq lbl_8020DCCC -/* 8020DCC4 4B E2 03 85 */ bl dComIfGp_mapShow__Fv -/* 8020DCC8 48 00 00 08 */ b lbl_8020DCD0 -lbl_8020DCCC: -/* 8020DCCC 4B E2 03 AD */ bl dComIfGp_mapHide__Fv -lbl_8020DCD0: -/* 8020DCD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8020DCD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020DCD8 7C 08 03 A6 */ mtlr r0 -/* 8020DCDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020DCE0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/_draw__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/_draw__11dMeterMap_cFv.s deleted file mode 100644 index c9364a88673..00000000000 --- a/asm/d/meter/d_meter_map/_draw__11dMeterMap_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8020DF1C: -/* 8020DF1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020DF20 7C 08 02 A6 */ mflr r0 -/* 8020DF24 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020DF28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020DF2C 7C 7F 1B 78 */ mr r31, r3 -/* 8020DF30 80 63 00 08 */ lwz r3, 8(r3) -/* 8020DF34 4B E1 CC 21 */ bl _draw__6dMap_cFv -/* 8020DF38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020DF3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020DF40 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 8020DF44 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 8020DF48 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 8020DF4C 7F E6 FB 78 */ mr r6, r31 -/* 8020DF50 4B E4 88 45 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 8020DF54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8020DF58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020DF5C 7C 08 03 A6 */ mtlr r0 -/* 8020DF60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020DF64 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/draw__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/draw__11dMeterMap_cFv.s deleted file mode 100644 index 53dd74f1d48..00000000000 --- a/asm/d/meter/d_meter_map/draw__11dMeterMap_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_8020DF68: -/* 8020DF68 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8020DF6C 7C 08 02 A6 */ mflr r0 -/* 8020DF70 90 01 00 54 */ stw r0, 0x54(r1) -/* 8020DF74 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8020DF78 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 8020DF7C DB C1 00 30 */ stfd f30, 0x30(r1) -/* 8020DF80 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 8020DF84 DB A1 00 20 */ stfd f29, 0x20(r1) -/* 8020DF88 F3 A1 00 28 */ psq_st f29, 40(r1), 0, 0 /* qr0 */ -/* 8020DF8C DB 81 00 10 */ stfd f28, 0x10(r1) -/* 8020DF90 F3 81 00 18 */ psq_st f28, 24(r1), 0, 0 /* qr0 */ -/* 8020DF94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020DF98 7C 7F 1B 78 */ mr r31, r3 -/* 8020DF9C 80 63 00 08 */ lwz r3, 8(r3) -/* 8020DFA0 28 03 00 00 */ cmplwi r3, 0 -/* 8020DFA4 41 82 00 98 */ beq lbl_8020E03C -/* 8020DFA8 88 03 00 31 */ lbz r0, 0x31(r3) -/* 8020DFAC 28 00 00 00 */ cmplwi r0, 0 -/* 8020DFB0 41 82 00 8C */ beq lbl_8020E03C -/* 8020DFB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020DFB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020DFBC 80 63 5F 50 */ lwz r3, 0x5f50(r3) -/* 8020DFC0 81 83 00 00 */ lwz r12, 0(r3) -/* 8020DFC4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8020DFC8 7D 89 03 A6 */ mtctr r12 -/* 8020DFCC 4E 80 04 21 */ bctrl -/* 8020DFD0 C3 FF 00 20 */ lfs f31, 0x20(r31) -/* 8020DFD4 C3 DF 00 24 */ lfs f30, 0x24(r31) -/* 8020DFD8 C3 BF 00 18 */ lfs f29, 0x18(r31) -/* 8020DFDC C3 9F 00 1C */ lfs f28, 0x1c(r31) -/* 8020DFE0 80 7F 00 04 */ lwz r3, 4(r31) -/* 8020DFE4 88 9F 00 2C */ lbz r4, 0x2c(r31) -/* 8020DFE8 81 83 00 00 */ lwz r12, 0(r3) -/* 8020DFEC 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 8020DFF0 7D 89 03 A6 */ mtctr r12 -/* 8020DFF4 4E 80 04 21 */ bctrl -/* 8020DFF8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8020DFFC FC 20 E8 90 */ fmr f1, f29 -/* 8020E000 FC 40 E0 90 */ fmr f2, f28 -/* 8020E004 FC 60 F8 90 */ fmr f3, f31 -/* 8020E008 FC 80 F0 90 */ fmr f4, f30 -/* 8020E00C 38 80 00 00 */ li r4, 0 -/* 8020E010 38 A0 00 00 */ li r5, 0 -/* 8020E014 38 C0 00 00 */ li r6, 0 -/* 8020E018 81 83 00 00 */ lwz r12, 0(r3) -/* 8020E01C 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 8020E020 7D 89 03 A6 */ mtctr r12 -/* 8020E024 4E 80 04 21 */ bctrl -/* 8020E028 80 7F 00 04 */ lwz r3, 4(r31) -/* 8020E02C 81 83 00 00 */ lwz r12, 0(r3) -/* 8020E030 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8020E034 7D 89 03 A6 */ mtctr r12 -/* 8020E038 4E 80 04 21 */ bctrl -lbl_8020E03C: -/* 8020E03C E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 8020E040 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 8020E044 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 8020E048 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 8020E04C E3 A1 00 28 */ psq_l f29, 40(r1), 0, 0 /* qr0 */ -/* 8020E050 CB A1 00 20 */ lfd f29, 0x20(r1) -/* 8020E054 E3 81 00 18 */ psq_l f28, 24(r1), 0, 0 /* qr0 */ -/* 8020E058 CB 81 00 10 */ lfd f28, 0x10(r1) -/* 8020E05C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8020E060 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8020E064 7C 08 03 A6 */ mtlr r0 -/* 8020E068 38 21 00 50 */ addi r1, r1, 0x50 -/* 8020E06C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/getMapDispEdgeBottomY_Layout__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/getMapDispEdgeBottomY_Layout__11dMeterMap_cFv.s deleted file mode 100644 index d3ce0bfaa04..00000000000 --- a/asm/d/meter/d_meter_map/getMapDispEdgeBottomY_Layout__11dMeterMap_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8020D690: -/* 8020D690 C0 22 AE 20 */ lfs f1, lit_4076(r2) -/* 8020D694 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/isDmapScreen__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/isDmapScreen__11dMeterMap_cFv.s deleted file mode 100644 index ef4e47d88d9..00000000000 --- a/asm/d/meter/d_meter_map/isDmapScreen__11dMeterMap_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8020E70C: -/* 8020E70C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020E710 7C 08 02 A6 */ mflr r0 -/* 8020E714 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020E718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020E71C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020E720 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8020E724 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8020E728 7D 89 03 A6 */ mtctr r12 -/* 8020E72C 4E 80 04 21 */ bctrl -/* 8020E730 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8020E734 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 8020E738 20 00 00 01 */ subfic r0, r0, 1 -/* 8020E73C 7C 00 00 34 */ cntlzw r0, r0 -/* 8020E740 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8020E744 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020E748 7C 08 03 A6 */ mtlr r0 -/* 8020E74C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020E750 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv.s deleted file mode 100644 index cfc3ec8712e..00000000000 --- a/asm/d/meter/d_meter_map/isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8020D650: -/* 8020D650 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020D654 7C 08 02 A6 */ mflr r0 -/* 8020D658 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020D65C 4B FF FE 41 */ bl isEnableDispMap__11dMeterMap_cFv -/* 8020D660 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8020D664 41 82 00 18 */ beq lbl_8020D67C -/* 8020D668 4B FF FE C1 */ bl getMapDispSizeTypeNo__11dMeterMap_cFv -/* 8020D66C 2C 03 00 00 */ cmpwi r3, 0 -/* 8020D670 41 82 00 0C */ beq lbl_8020D67C -/* 8020D674 38 60 00 01 */ li r3, 1 -/* 8020D678 48 00 00 08 */ b lbl_8020D680 -lbl_8020D67C: -/* 8020D67C 38 60 00 00 */ li r3, 0 -lbl_8020D680: -/* 8020D680 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020D684 7C 08 03 A6 */ mtlr r0 -/* 8020D688 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020D68C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/isEnableDispMap__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/isEnableDispMap__11dMeterMap_cFv.s deleted file mode 100644 index 27b1e18a7a6..00000000000 --- a/asm/d/meter/d_meter_map/isEnableDispMap__11dMeterMap_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8020D49C: -/* 8020D49C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020D4A0 7C 08 02 A6 */ mflr r0 -/* 8020D4A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020D4A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020D4AC 93 C1 00 08 */ stw r30, 8(r1) -/* 8020D4B0 3B C0 00 00 */ li r30, 0 -/* 8020D4B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020D4B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020D4BC 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8020D4C0 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8020D4C4 7D 89 03 A6 */ mtctr r12 -/* 8020D4C8 4E 80 04 21 */ bctrl -/* 8020D4CC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8020D4D0 41 82 00 20 */ beq lbl_8020D4F0 -/* 8020D4D4 48 00 00 55 */ bl getMapDispSizeTypeNo__11dMeterMap_cFv -/* 8020D4D8 2C 03 00 00 */ cmpwi r3, 0 -/* 8020D4DC 41 82 00 14 */ beq lbl_8020D4F0 -/* 8020D4E0 A0 1F 00 0A */ lhz r0, 0xa(r31) -/* 8020D4E4 54 03 9F 7E */ rlwinm r3, r0, 0x13, 0x1d, 0x1f -/* 8020D4E8 30 03 FF FF */ addic r0, r3, -1 -/* 8020D4EC 7F C0 19 10 */ subfe r30, r0, r3 -lbl_8020D4F0: -/* 8020D4F0 3B E0 00 00 */ li r31, 0 -/* 8020D4F4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8020D4F8 41 82 00 14 */ beq lbl_8020D50C -/* 8020D4FC 4B E3 22 5D */ bl isExistMapPathData__8dMpath_cFv -/* 8020D500 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8020D504 41 82 00 08 */ beq lbl_8020D50C -/* 8020D508 3B E0 00 01 */ li r31, 1 -lbl_8020D50C: -/* 8020D50C 7F E3 FB 78 */ mr r3, r31 -/* 8020D510 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8020D514 83 C1 00 08 */ lwz r30, 8(r1) -/* 8020D518 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020D51C 7C 08 03 A6 */ mtlr r0 -/* 8020D520 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020D524 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/isFmapScreen__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/isFmapScreen__11dMeterMap_cFv.s deleted file mode 100644 index c768d307878..00000000000 --- a/asm/d/meter/d_meter_map/isFmapScreen__11dMeterMap_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_8020E620: -/* 8020E620 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020E624 7C 08 02 A6 */ mflr r0 -/* 8020E628 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020E62C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020E630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020E634 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020E638 3B E3 4E 20 */ addi r31, r3, 0x4e20 -/* 8020E63C 7F E3 FB 78 */ mr r3, r31 -/* 8020E640 81 9F 00 00 */ lwz r12, 0(r31) -/* 8020E644 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8020E648 7D 89 03 A6 */ mtctr r12 -/* 8020E64C 4E 80 04 21 */ bctrl -/* 8020E650 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8020E654 54 00 07 7F */ clrlwi. r0, r0, 0x1d -/* 8020E658 41 82 00 94 */ beq lbl_8020E6EC -/* 8020E65C 7F E3 FB 78 */ mr r3, r31 -/* 8020E660 81 9F 00 00 */ lwz r12, 0(r31) -/* 8020E664 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8020E668 7D 89 03 A6 */ mtctr r12 -/* 8020E66C 4E 80 04 21 */ bctrl -/* 8020E670 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8020E674 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 8020E678 2C 00 00 05 */ cmpwi r0, 5 -/* 8020E67C 41 82 00 70 */ beq lbl_8020E6EC -/* 8020E680 7F E3 FB 78 */ mr r3, r31 -/* 8020E684 81 9F 00 00 */ lwz r12, 0(r31) -/* 8020E688 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8020E68C 7D 89 03 A6 */ mtctr r12 -/* 8020E690 4E 80 04 21 */ bctrl -/* 8020E694 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8020E698 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 8020E69C 2C 00 00 03 */ cmpwi r0, 3 -/* 8020E6A0 41 82 00 4C */ beq lbl_8020E6EC -/* 8020E6A4 7F E3 FB 78 */ mr r3, r31 -/* 8020E6A8 81 9F 00 00 */ lwz r12, 0(r31) -/* 8020E6AC 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8020E6B0 7D 89 03 A6 */ mtctr r12 -/* 8020E6B4 4E 80 04 21 */ bctrl -/* 8020E6B8 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8020E6BC 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 8020E6C0 2C 00 00 04 */ cmpwi r0, 4 -/* 8020E6C4 41 82 00 28 */ beq lbl_8020E6EC -/* 8020E6C8 7F E3 FB 78 */ mr r3, r31 -/* 8020E6CC 81 9F 00 00 */ lwz r12, 0(r31) -/* 8020E6D0 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8020E6D4 7D 89 03 A6 */ mtctr r12 -/* 8020E6D8 4E 80 04 21 */ bctrl -/* 8020E6DC A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8020E6E0 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 8020E6E4 2C 00 00 06 */ cmpwi r0, 6 -/* 8020E6E8 40 82 00 0C */ bne lbl_8020E6F4 -lbl_8020E6EC: -/* 8020E6EC 38 60 00 01 */ li r3, 1 -/* 8020E6F0 48 00 00 08 */ b lbl_8020E6F8 -lbl_8020E6F4: -/* 8020E6F4 38 60 00 00 */ li r3, 0 -lbl_8020E6F8: -/* 8020E6F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8020E6FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020E700 7C 08 03 A6 */ mtlr r0 -/* 8020E704 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020E708 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/isMapOpenCheck__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/isMapOpenCheck__11dMeterMap_cFv.s deleted file mode 100644 index b4a1f0adeff..00000000000 --- a/asm/d/meter/d_meter_map/isMapOpenCheck__11dMeterMap_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8020D900: -/* 8020D900 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020D904 7C 08 02 A6 */ mflr r0 -/* 8020D908 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020D90C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020D910 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020D914 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8020D918 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8020D91C 7D 89 03 A6 */ mtctr r12 -/* 8020D920 4E 80 04 21 */ bctrl -/* 8020D924 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8020D928 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 8020D92C 20 60 00 07 */ subfic r3, r0, 7 -/* 8020D930 30 03 FF FF */ addic r0, r3, -1 -/* 8020D934 7C 60 19 10 */ subfe r3, r0, r3 -/* 8020D938 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020D93C 7C 08 03 A6 */ mtlr r0 -/* 8020D940 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020D944 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/setDispPosInsideFlg_SE_On__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/setDispPosInsideFlg_SE_On__11dMeterMap_cFv.s deleted file mode 100644 index e85c98188be..00000000000 --- a/asm/d/meter/d_meter_map/setDispPosInsideFlg_SE_On__11dMeterMap_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8020D874: -/* 8020D874 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020D878 7C 08 02 A6 */ mflr r0 -/* 8020D87C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020D880 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020D884 7C 7F 1B 78 */ mr r31, r3 -/* 8020D888 4B FF FD C9 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 8020D88C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8020D890 41 82 00 18 */ beq lbl_8020D8A8 -/* 8020D894 4B E2 07 B5 */ bl dComIfGp_mapShow__Fv -/* 8020D898 38 00 00 01 */ li r0, 1 -/* 8020D89C 98 1F 00 2D */ stb r0, 0x2d(r31) -/* 8020D8A0 38 00 00 07 */ li r0, 7 -/* 8020D8A4 98 1F 00 2E */ stb r0, 0x2e(r31) -lbl_8020D8A8: -/* 8020D8A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8020D8AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020D8B0 7C 08 03 A6 */ mtlr r0 -/* 8020D8B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020D8B8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/setDispPosOutsideFlg_SE_On__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/setDispPosOutsideFlg_SE_On__11dMeterMap_cFv.s deleted file mode 100644 index c2afb7f3b29..00000000000 --- a/asm/d/meter/d_meter_map/setDispPosOutsideFlg_SE_On__11dMeterMap_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8020D8BC: -/* 8020D8BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020D8C0 7C 08 02 A6 */ mflr r0 -/* 8020D8C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020D8C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020D8CC 7C 7F 1B 78 */ mr r31, r3 -/* 8020D8D0 4B E2 07 A9 */ bl dComIfGp_mapHide__Fv -/* 8020D8D4 38 00 00 00 */ li r0, 0 -/* 8020D8D8 98 1F 00 2D */ stb r0, 0x2d(r31) -/* 8020D8DC 38 00 00 07 */ li r0, 7 -/* 8020D8E0 98 1F 00 2E */ stb r0, 0x2e(r31) -/* 8020D8E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8020D8E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020D8EC 7C 08 03 A6 */ mtlr r0 -/* 8020D8F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020D8F4 4E 80 00 20 */ blr