diff --git a/Progress.md b/Progress.md index 1bd8025c11..cc8497a301 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 25.784308% | 927344 | 3596544 +.text | 26.374542% | 948572 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 33.608312% | 1351280 | 4020672 +Total | 34.136284% | 1372508 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 33.608312% | 1351280 | 4020672 +main.dol | 34.136284% | 1372508 | 4020672 RELs | 33.406154% | 3841816 | 11500324 -Total | 33.458523% | 5193096 | 15520996 +Total | 33.595292% | 5214324 | 15520996 ## RELs diff --git a/asm/d/meter/d_meter2/_delete__9dMeter2_cFv.s b/asm/d/meter/d_meter2/_delete__9dMeter2_cFv.s deleted file mode 100644 index bd27e9e4e3..0000000000 --- a/asm/d/meter/d_meter2/_delete__9dMeter2_cFv.s +++ /dev/null @@ -1,162 +0,0 @@ -lbl_8021F49C: -/* 8021F49C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8021F4A0 7C 08 02 A6 */ mflr r0 -/* 8021F4A4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021F4A8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8021F4AC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8021F4B0 7C 7E 1B 78 */ mr r30, r3 -/* 8021F4B4 80 63 01 00 */ lwz r3, 0x100(r3) -/* 8021F4B8 48 0A F2 CD */ bl getTotalFreeSize__7JKRHeapFv -/* 8021F4BC 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F4C0 4B DE FD 0D */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8021F4C4 7C 7F 1B 78 */ mr r31, r3 -/* 8021F4C8 88 1E 01 EA */ lbz r0, 0x1ea(r30) -/* 8021F4CC 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 8021F4D0 41 82 00 38 */ beq lbl_8021F508 -/* 8021F4D4 38 00 00 74 */ li r0, 0x74 -/* 8021F4D8 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021F4DC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8021F4E0 38 81 00 10 */ addi r4, r1, 0x10 -/* 8021F4E4 38 A0 00 00 */ li r5, 0 -/* 8021F4E8 38 C0 00 00 */ li r6, 0 -/* 8021F4EC 38 E0 00 00 */ li r7, 0 -/* 8021F4F0 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 8021F4F4 FC 40 08 90 */ fmr f2, f1 -/* 8021F4F8 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 8021F4FC FC 80 18 90 */ fmr f4, f3 -/* 8021F500 39 00 00 00 */ li r8, 0 -/* 8021F504 48 08 C4 81 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_8021F508: -/* 8021F508 88 1E 01 EA */ lbz r0, 0x1ea(r30) -/* 8021F50C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8021F510 41 82 00 38 */ beq lbl_8021F548 -/* 8021F514 38 00 00 76 */ li r0, 0x76 -/* 8021F518 90 01 00 0C */ stw r0, 0xc(r1) -/* 8021F51C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8021F520 38 81 00 0C */ addi r4, r1, 0xc -/* 8021F524 38 A0 00 00 */ li r5, 0 -/* 8021F528 38 C0 00 00 */ li r6, 0 -/* 8021F52C 38 E0 00 00 */ li r7, 0 -/* 8021F530 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 8021F534 FC 40 08 90 */ fmr f2, f1 -/* 8021F538 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 8021F53C FC 80 18 90 */ fmr f4, f3 -/* 8021F540 39 00 00 00 */ li r8, 0 -/* 8021F544 48 08 C4 41 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_8021F548: -/* 8021F548 88 1E 01 EB */ lbz r0, 0x1eb(r30) -/* 8021F54C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 8021F550 41 82 00 68 */ beq lbl_8021F5B8 -/* 8021F554 7F C3 F3 78 */ mr r3, r30 -/* 8021F558 48 00 64 A1 */ bl isArrowEquip__9dMeter2_cFv -/* 8021F55C 2C 03 00 00 */ cmpwi r3, 0 -/* 8021F560 40 82 00 14 */ bne lbl_8021F574 -/* 8021F564 7F C3 F3 78 */ mr r3, r30 -/* 8021F568 48 00 64 FD */ bl isPachinkoEquip__9dMeter2_cFv -/* 8021F56C 2C 03 00 00 */ cmpwi r3, 0 -/* 8021F570 41 82 00 48 */ beq lbl_8021F5B8 -lbl_8021F574: -/* 8021F574 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8021F578 4B FF BB 51 */ bl isButtonVisible__13dMeter2Draw_cFv -/* 8021F57C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021F580 41 82 00 38 */ beq lbl_8021F5B8 -/* 8021F584 38 00 00 1C */ li r0, 0x1c -/* 8021F588 90 01 00 08 */ stw r0, 8(r1) -/* 8021F58C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8021F590 38 81 00 08 */ addi r4, r1, 8 -/* 8021F594 38 A0 00 00 */ li r5, 0 -/* 8021F598 38 C0 00 00 */ li r6, 0 -/* 8021F59C 38 E0 00 00 */ li r7, 0 -/* 8021F5A0 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 8021F5A4 FC 40 08 90 */ fmr f2, f1 -/* 8021F5A8 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 8021F5AC FC 80 18 90 */ fmr f4, f3 -/* 8021F5B0 39 00 00 00 */ li r8, 0 -/* 8021F5B4 48 08 C3 D1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_8021F5B8: -/* 8021F5B8 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F5BC 48 0A F1 C9 */ bl getTotalFreeSize__7JKRHeapFv -/* 8021F5C0 80 7E 01 20 */ lwz r3, 0x120(r30) -/* 8021F5C4 28 03 00 00 */ cmplwi r3, 0 -/* 8021F5C8 41 82 00 24 */ beq lbl_8021F5EC -/* 8021F5CC 41 82 00 18 */ beq lbl_8021F5E4 -/* 8021F5D0 38 80 00 01 */ li r4, 1 -/* 8021F5D4 81 83 00 00 */ lwz r12, 0(r3) -/* 8021F5D8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8021F5DC 7D 89 03 A6 */ mtctr r12 -/* 8021F5E0 4E 80 04 21 */ bctrl -lbl_8021F5E4: -/* 8021F5E4 38 00 00 00 */ li r0, 0 -/* 8021F5E8 90 1E 01 20 */ stw r0, 0x120(r30) -lbl_8021F5EC: -/* 8021F5EC 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F5F0 48 0A F1 95 */ bl getTotalFreeSize__7JKRHeapFv -/* 8021F5F4 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 8021F5F8 4B DE FB D5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8021F5FC 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 8021F600 28 03 00 00 */ cmplwi r3, 0 -/* 8021F604 41 82 00 24 */ beq lbl_8021F628 -/* 8021F608 41 82 00 18 */ beq lbl_8021F620 -/* 8021F60C 38 80 00 01 */ li r4, 1 -/* 8021F610 81 83 00 00 */ lwz r12, 0(r3) -/* 8021F614 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8021F618 7D 89 03 A6 */ mtctr r12 -/* 8021F61C 4E 80 04 21 */ bctrl -lbl_8021F620: -/* 8021F620 38 00 00 00 */ li r0, 0 -/* 8021F624 90 1E 01 10 */ stw r0, 0x110(r30) -lbl_8021F628: -/* 8021F628 80 7E 01 14 */ lwz r3, 0x114(r30) -/* 8021F62C 28 03 00 00 */ cmplwi r3, 0 -/* 8021F630 41 82 00 24 */ beq lbl_8021F654 -/* 8021F634 41 82 00 18 */ beq lbl_8021F64C -/* 8021F638 38 80 00 01 */ li r4, 1 -/* 8021F63C 81 83 00 00 */ lwz r12, 0(r3) -/* 8021F640 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8021F644 7D 89 03 A6 */ mtctr r12 -/* 8021F648 4E 80 04 21 */ bctrl -lbl_8021F64C: -/* 8021F64C 38 00 00 00 */ li r0, 0 -/* 8021F650 90 1E 01 14 */ stw r0, 0x114(r30) -lbl_8021F654: -/* 8021F654 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F658 48 0A F1 2D */ bl getTotalFreeSize__7JKRHeapFv -/* 8021F65C 80 7E 01 1C */ lwz r3, 0x11c(r30) -/* 8021F660 28 03 00 00 */ cmplwi r3, 0 -/* 8021F664 41 82 00 24 */ beq lbl_8021F688 -/* 8021F668 41 82 00 18 */ beq lbl_8021F680 -/* 8021F66C 38 80 00 01 */ li r4, 1 -/* 8021F670 81 83 00 00 */ lwz r12, 0(r3) -/* 8021F674 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8021F678 7D 89 03 A6 */ mtctr r12 -/* 8021F67C 4E 80 04 21 */ bctrl -lbl_8021F680: -/* 8021F680 38 00 00 00 */ li r0, 0 -/* 8021F684 90 1E 01 1C */ stw r0, 0x11c(r30) -lbl_8021F688: -/* 8021F688 7F E3 FB 78 */ mr r3, r31 -/* 8021F68C 4B DE FB 41 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8021F690 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8021F694 28 03 00 00 */ cmplwi r3, 0 -/* 8021F698 41 82 00 18 */ beq lbl_8021F6B0 -/* 8021F69C 38 80 00 01 */ li r4, 1 -/* 8021F6A0 81 83 00 00 */ lwz r12, 0(r3) -/* 8021F6A4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8021F6A8 7D 89 03 A6 */ mtctr r12 -/* 8021F6AC 4E 80 04 21 */ bctrl -lbl_8021F6B0: -/* 8021F6B0 38 00 00 00 */ li r0, 0 -/* 8021F6B4 90 1E 01 0C */ stw r0, 0x10c(r30) -/* 8021F6B8 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 8021F6BC 4B E0 0D 25 */ bl fopMsgM_destroyExpHeap__FP10JKRExpHeap -/* 8021F6C0 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F6C4 4B E0 0D 1D */ bl fopMsgM_destroyExpHeap__FP10JKRExpHeap -/* 8021F6C8 7F C3 F3 78 */ mr r3, r30 -/* 8021F6CC 48 00 00 21 */ bl emphasisButtonDelete__9dMeter2_cFv -/* 8021F6D0 38 60 00 01 */ li r3, 1 -/* 8021F6D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8021F6D8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8021F6DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8021F6E0 7C 08 03 A6 */ mtlr r0 -/* 8021F6E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021F6E8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/alphaAnimeButtonCross__9dMeter2_cFv.s b/asm/d/meter/d_meter2/alphaAnimeButtonCross__9dMeter2_cFv.s deleted file mode 100644 index 63c4517f09..0000000000 --- a/asm/d/meter/d_meter2/alphaAnimeButtonCross__9dMeter2_cFv.s +++ /dev/null @@ -1,147 +0,0 @@ -lbl_802254C0: -/* 802254C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802254C4 7C 08 02 A6 */ mflr r0 -/* 802254C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802254CC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802254D0 7C 7F 1B 78 */ mr r31, r3 -/* 802254D4 80 83 01 24 */ lwz r4, 0x124(r3) -/* 802254D8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 -/* 802254DC 40 82 00 F8 */ bne lbl_802255D4 -/* 802254E0 54 80 06 73 */ rlwinm. r0, r4, 0, 0x19, 0x19 -/* 802254E4 41 82 00 30 */ beq lbl_80225514 -/* 802254E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802254EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802254F0 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 802254F4 28 00 00 00 */ cmplwi r0, 0 -/* 802254F8 41 82 00 10 */ beq lbl_80225508 -/* 802254FC A0 03 4F A4 */ lhz r0, 0x4fa4(r3) -/* 80225500 54 00 05 EE */ rlwinm r0, r0, 0, 0x17, 0x17 -/* 80225504 48 00 00 08 */ b lbl_8022550C -lbl_80225508: -/* 80225508 38 00 00 00 */ li r0, 0 -lbl_8022550C: -/* 8022550C 54 00 04 3F */ clrlwi. r0, r0, 0x10 -/* 80225510 40 82 00 C4 */ bne lbl_802255D4 -lbl_80225514: -/* 80225514 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80225518 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022551C 80 A3 5D AC */ lwz r5, 0x5dac(r3) -/* 80225520 38 00 00 00 */ li r0, 0 -/* 80225524 88 65 05 6A */ lbz r3, 0x56a(r5) -/* 80225528 28 03 00 00 */ cmplwi r3, 0 -/* 8022552C 41 82 00 10 */ beq lbl_8022553C -/* 80225530 28 03 00 26 */ cmplwi r3, 0x26 -/* 80225534 40 80 00 08 */ bge lbl_8022553C -/* 80225538 38 00 00 01 */ li r0, 1 -lbl_8022553C: -/* 8022553C 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80225540 40 82 00 94 */ bne lbl_802255D4 -/* 80225544 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17 -/* 80225548 40 82 00 8C */ bne lbl_802255D4 -/* 8022554C 54 80 06 31 */ rlwinm. r0, r4, 0, 0x18, 0x18 -/* 80225550 40 82 00 84 */ bne lbl_802255D4 -/* 80225554 54 80 00 43 */ rlwinm. r0, r4, 0, 1, 1 -/* 80225558 40 82 00 7C */ bne lbl_802255D4 -/* 8022555C 54 80 04 E7 */ rlwinm. r0, r4, 0, 0x13, 0x13 -/* 80225560 40 82 00 74 */ bne lbl_802255D4 -/* 80225564 54 80 02 D7 */ rlwinm. r0, r4, 0, 0xb, 0xb -/* 80225568 40 82 00 6C */ bne lbl_802255D4 -/* 8022556C 54 80 00 01 */ rlwinm. r0, r4, 0, 0, 0 -/* 80225570 40 82 00 64 */ bne lbl_802255D4 -/* 80225574 54 80 07 39 */ rlwinm. r0, r4, 0, 0x1c, 0x1c -/* 80225578 40 82 00 5C */ bne lbl_802255D4 -/* 8022557C 54 80 06 F7 */ rlwinm. r0, r4, 0, 0x1b, 0x1b -/* 80225580 40 82 00 54 */ bne lbl_802255D4 -/* 80225584 54 80 01 CF */ rlwinm. r0, r4, 0, 7, 7 -/* 80225588 40 82 00 4C */ bne lbl_802255D4 -/* 8022558C 54 80 06 B5 */ rlwinm. r0, r4, 0, 0x1a, 0x1a -/* 80225590 40 82 00 44 */ bne lbl_802255D4 -/* 80225594 54 80 01 4B */ rlwinm. r0, r4, 0, 5, 5 -/* 80225598 40 82 00 3C */ bne lbl_802255D4 -/* 8022559C 54 80 01 09 */ rlwinm. r0, r4, 0, 4, 4 -/* 802255A0 40 82 00 34 */ bne lbl_802255D4 -/* 802255A4 54 80 00 C7 */ rlwinm. r0, r4, 0, 3, 3 -/* 802255A8 40 82 00 2C */ bne lbl_802255D4 -/* 802255AC 54 80 00 85 */ rlwinm. r0, r4, 0, 2, 2 -/* 802255B0 40 82 00 24 */ bne lbl_802255D4 -/* 802255B4 80 05 05 80 */ lwz r0, 0x580(r5) -/* 802255B8 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 802255BC 40 82 00 18 */ bne lbl_802255D4 -/* 802255C0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802255C4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802255C8 A0 03 00 B0 */ lhz r0, 0xb0(r3) -/* 802255CC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 802255D0 41 82 00 58 */ beq lbl_80225628 -lbl_802255D4: -/* 802255D4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802255D8 4B FF 2D 61 */ bl setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv -/* 802255DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802255E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802255E4 A0 03 4F A0 */ lhz r0, 0x4fa0(r3) -/* 802255E8 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 802255EC 41 82 00 24 */ beq lbl_80225610 -/* 802255F0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802255F4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802255F8 A0 03 00 B0 */ lhz r0, 0xb0(r3) -/* 802255FC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80225600 40 82 00 10 */ bne lbl_80225610 -/* 80225604 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 80225608 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 8022560C 41 82 00 70 */ beq lbl_8022567C -lbl_80225610: -/* 80225610 A8 7F 01 90 */ lha r3, 0x190(r31) -/* 80225614 2C 03 00 00 */ cmpwi r3, 0 -/* 80225618 40 81 00 64 */ ble lbl_8022567C -/* 8022561C 38 03 FF FF */ addi r0, r3, -1 -/* 80225620 B0 1F 01 90 */ sth r0, 0x190(r31) -/* 80225624 48 00 00 58 */ b lbl_8022567C -lbl_80225628: -/* 80225628 A0 03 00 A2 */ lhz r0, 0xa2(r3) -/* 8022562C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80225630 40 82 00 10 */ bne lbl_80225640 -/* 80225634 4B FF 6B A9 */ bl isFloatingMessageVisible__13dMeter2Info_cFv -/* 80225638 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8022563C 41 82 00 24 */ beq lbl_80225660 -lbl_80225640: -/* 80225640 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80225644 4B FF 2C F5 */ bl setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv -/* 80225648 A8 7F 01 90 */ lha r3, 0x190(r31) -/* 8022564C 2C 03 00 05 */ cmpwi r3, 5 -/* 80225650 40 80 00 2C */ bge lbl_8022567C -/* 80225654 38 03 00 01 */ addi r0, r3, 1 -/* 80225658 B0 1F 01 90 */ sth r0, 0x190(r31) -/* 8022565C 48 00 00 20 */ b lbl_8022567C -lbl_80225660: -/* 80225660 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80225664 4B FF 2D 45 */ bl setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv -/* 80225668 A8 7F 01 90 */ lha r3, 0x190(r31) -/* 8022566C 2C 03 00 05 */ cmpwi r3, 5 -/* 80225670 40 80 00 0C */ bge lbl_8022567C -/* 80225674 38 03 00 01 */ addi r0, r3, 1 -/* 80225678 B0 1F 01 90 */ sth r0, 0x190(r31) -lbl_8022567C: -/* 8022567C 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 80225680 28 03 00 00 */ cmplwi r3, 0 -/* 80225684 41 82 00 44 */ beq lbl_802256C8 -/* 80225688 C0 42 B0 04 */ lfs f2, lit_9090(r2) -/* 8022568C A8 1F 01 90 */ lha r0, 0x190(r31) -/* 80225690 C8 22 AF D8 */ lfd f1, lit_5267(r2) -/* 80225694 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80225698 90 01 00 0C */ stw r0, 0xc(r1) -/* 8022569C 3C 00 43 30 */ lis r0, 0x4330 -/* 802256A0 90 01 00 08 */ stw r0, 8(r1) -/* 802256A4 C8 01 00 08 */ lfd f0, 8(r1) -/* 802256A8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802256AC EC 22 00 32 */ fmuls f1, f2, f0 -/* 802256B0 C0 02 B0 08 */ lfs f0, lit_9091(r2) -/* 802256B4 EC 01 00 24 */ fdivs f0, f1, f0 -/* 802256B8 FC 00 00 1E */ fctiwz f0, f0 -/* 802256BC D8 01 00 10 */ stfd f0, 0x10(r1) -/* 802256C0 80 81 00 14 */ lwz r4, 0x14(r1) -/* 802256C4 4B FE 82 35 */ bl setMapAlpha__11dMeterMap_cFUc -lbl_802256C8: -/* 802256C8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802256CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802256D0 7C 08 03 A6 */ mtlr r0 -/* 802256D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802256D8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/alphaAnimeButton__9dMeter2_cFv.s b/asm/d/meter/d_meter2/alphaAnimeButton__9dMeter2_cFv.s deleted file mode 100644 index 953a1186cb..0000000000 --- a/asm/d/meter/d_meter2/alphaAnimeButton__9dMeter2_cFv.s +++ /dev/null @@ -1,270 +0,0 @@ -lbl_802250F4: -/* 802250F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802250F8 7C 08 02 A6 */ mflr r0 -/* 802250FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80225100 39 61 00 20 */ addi r11, r1, 0x20 -/* 80225104 48 13 D0 D1 */ bl _savegpr_27 -/* 80225108 7C 7E 1B 78 */ mr r30, r3 -/* 8022510C 3B E0 00 00 */ li r31, 0 -/* 80225110 80 83 01 24 */ lwz r4, 0x124(r3) -/* 80225114 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 -/* 80225118 40 82 00 64 */ bne lbl_8022517C -/* 8022511C 54 85 05 EF */ rlwinm. r5, r4, 0, 0x17, 0x17 -/* 80225120 41 82 00 1C */ beq lbl_8022513C -/* 80225124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80225128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022512C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80225130 88 03 04 CF */ lbz r0, 0x4cf(r3) -/* 80225134 28 00 00 00 */ cmplwi r0, 0 -/* 80225138 40 82 00 44 */ bne lbl_8022517C -lbl_8022513C: -/* 8022513C 54 80 00 43 */ rlwinm. r0, r4, 0, 1, 1 -/* 80225140 41 82 00 0C */ beq lbl_8022514C -/* 80225144 28 05 00 00 */ cmplwi r5, 0 -/* 80225148 41 82 00 34 */ beq lbl_8022517C -lbl_8022514C: -/* 8022514C 54 80 00 01 */ rlwinm. r0, r4, 0, 0, 0 -/* 80225150 40 82 00 2C */ bne lbl_8022517C -/* 80225154 54 80 07 39 */ rlwinm. r0, r4, 0, 0x1c, 0x1c -/* 80225158 40 82 00 24 */ bne lbl_8022517C -/* 8022515C 54 80 06 F7 */ rlwinm. r0, r4, 0, 0x1b, 0x1b -/* 80225160 40 82 00 1C */ bne lbl_8022517C -/* 80225164 54 80 06 B5 */ rlwinm. r0, r4, 0, 0x1a, 0x1a -/* 80225168 40 82 00 14 */ bne lbl_8022517C -/* 8022516C 54 80 01 4B */ rlwinm. r0, r4, 0, 5, 5 -/* 80225170 40 82 00 0C */ bne lbl_8022517C -/* 80225174 54 80 00 C7 */ rlwinm. r0, r4, 0, 3, 3 -/* 80225178 41 82 00 20 */ beq lbl_80225198 -lbl_8022517C: -/* 8022517C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225180 4B FF 3E 9D */ bl setAlphaButtonAnimeMin__13dMeter2Draw_cFv -/* 80225184 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225188 4B FF 3F ED */ bl setAlphaButtonAAnimeMin__13dMeter2Draw_cFv -/* 8022518C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225190 4B FF 41 95 */ bl setAlphaButtonBAnimeMin__13dMeter2Draw_cFv -/* 80225194 48 00 00 AC */ b lbl_80225240 -lbl_80225198: -/* 80225198 54 80 01 CF */ rlwinm. r0, r4, 0, 7, 7 -/* 8022519C 40 82 00 78 */ bne lbl_80225214 -/* 802251A0 28 05 00 00 */ cmplwi r5, 0 -/* 802251A4 40 82 00 60 */ bne lbl_80225204 -/* 802251A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802251AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802251B0 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 802251B4 81 83 06 28 */ lwz r12, 0x628(r3) -/* 802251B8 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 802251BC 7D 89 03 A6 */ mtctr r12 -/* 802251C0 4E 80 04 21 */ bctrl -/* 802251C4 2C 03 00 00 */ cmpwi r3, 0 -/* 802251C8 40 82 00 3C */ bne lbl_80225204 -/* 802251CC 80 1E 01 24 */ lwz r0, 0x124(r30) -/* 802251D0 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 802251D4 41 82 00 40 */ beq lbl_80225214 -/* 802251D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802251DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802251E0 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 802251E4 28 00 00 00 */ cmplwi r0, 0 -/* 802251E8 41 82 00 10 */ beq lbl_802251F8 -/* 802251EC A0 03 4F A4 */ lhz r0, 0x4fa4(r3) -/* 802251F0 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 802251F4 48 00 00 08 */ b lbl_802251FC -lbl_802251F8: -/* 802251F8 38 00 00 00 */ li r0, 0 -lbl_802251FC: -/* 802251FC 54 00 04 3F */ clrlwi. r0, r0, 0x10 -/* 80225200 41 82 00 14 */ beq lbl_80225214 -lbl_80225204: -/* 80225204 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225208 4B FF 3E 15 */ bl setAlphaButtonAnimeMin__13dMeter2Draw_cFv -/* 8022520C 3B E0 00 01 */ li r31, 1 -/* 80225210 48 00 00 30 */ b lbl_80225240 -lbl_80225214: -/* 80225214 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80225218 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8022521C 88 03 00 E8 */ lbz r0, 0xe8(r3) -/* 80225220 28 00 00 00 */ cmplwi r0, 0 -/* 80225224 41 82 00 14 */ beq lbl_80225238 -/* 80225228 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022522C 4B FF 3D F1 */ bl setAlphaButtonAnimeMin__13dMeter2Draw_cFv -/* 80225230 3B E0 00 01 */ li r31, 1 -/* 80225234 48 00 00 0C */ b lbl_80225240 -lbl_80225238: -/* 80225238 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022523C 4B FF 3E 6D */ bl setAlphaButtonAnimeMax__13dMeter2Draw_cFv -lbl_80225240: -/* 80225240 38 00 00 00 */ li r0, 0 -/* 80225244 98 1E 01 E6 */ stb r0, 0x1e6(r30) -/* 80225248 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8022524C 28 00 00 01 */ cmplwi r0, 1 -/* 80225250 40 82 00 D4 */ bne lbl_80225324 -/* 80225254 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80225258 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8022525C 88 03 00 E8 */ lbz r0, 0xe8(r3) -/* 80225260 28 00 00 00 */ cmplwi r0, 0 -/* 80225264 41 82 00 10 */ beq lbl_80225274 -/* 80225268 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022526C 4B FF 3F 09 */ bl setAlphaButtonAAnimeMin__13dMeter2Draw_cFv -/* 80225270 48 00 00 80 */ b lbl_802252F0 -lbl_80225274: -/* 80225274 80 1E 01 24 */ lwz r0, 0x124(r30) -/* 80225278 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 8022527C 40 82 00 54 */ bne lbl_802252D0 -/* 80225280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80225284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80225288 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 8022528C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80225290 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 80225294 7D 89 03 A6 */ mtctr r12 -/* 80225298 4E 80 04 21 */ bctrl -/* 8022529C 2C 03 00 00 */ cmpwi r3, 0 -/* 802252A0 40 82 00 30 */ bne lbl_802252D0 -/* 802252A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802252A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802252AC 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 802252B0 28 00 00 00 */ cmplwi r0, 0 -/* 802252B4 41 82 00 10 */ beq lbl_802252C4 -/* 802252B8 A0 03 4F A4 */ lhz r0, 0x4fa4(r3) -/* 802252BC 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802252C0 48 00 00 08 */ b lbl_802252C8 -lbl_802252C4: -/* 802252C4 38 00 00 00 */ li r0, 0 -lbl_802252C8: -/* 802252C8 54 00 04 3F */ clrlwi. r0, r0, 0x10 -/* 802252CC 40 82 00 1C */ bne lbl_802252E8 -lbl_802252D0: -/* 802252D0 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802252D4 4B FF 3F 85 */ bl setAlphaButtonAAnimeMax__13dMeter2Draw_cFv -/* 802252D8 88 1E 01 E6 */ lbz r0, 0x1e6(r30) -/* 802252DC 60 00 00 01 */ ori r0, r0, 1 -/* 802252E0 98 1E 01 E6 */ stb r0, 0x1e6(r30) -/* 802252E4 48 00 00 0C */ b lbl_802252F0 -lbl_802252E8: -/* 802252E8 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802252EC 4B FF 3E 89 */ bl setAlphaButtonAAnimeMin__13dMeter2Draw_cFv -lbl_802252F0: -/* 802252F0 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802252F4 38 80 00 00 */ li r4, 0 -/* 802252F8 4B FF 69 C9 */ bl isBButtonShow__13dMeter2Draw_cFb -/* 802252FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80225300 41 82 00 1C */ beq lbl_8022531C -/* 80225304 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225308 4B FF 41 6D */ bl setAlphaButtonBAnimeMax__13dMeter2Draw_cFv -/* 8022530C 88 1E 01 E6 */ lbz r0, 0x1e6(r30) -/* 80225310 60 00 00 02 */ ori r0, r0, 2 -/* 80225314 98 1E 01 E6 */ stb r0, 0x1e6(r30) -/* 80225318 48 00 00 0C */ b lbl_80225324 -lbl_8022531C: -/* 8022531C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225320 4B FF 40 05 */ bl setAlphaButtonBAnimeMin__13dMeter2Draw_cFv -lbl_80225324: -/* 80225324 88 1E 01 E6 */ lbz r0, 0x1e6(r30) -/* 80225328 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8022532C 40 82 00 20 */ bne lbl_8022534C -/* 80225330 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225334 88 9E 01 C4 */ lbz r4, 0x1c4(r30) -/* 80225338 80 BE 01 24 */ lwz r5, 0x124(r30) -/* 8022533C 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 80225340 7C 00 00 34 */ cntlzw r0, r0 -/* 80225344 54 06 D9 7E */ srwi r6, r0, 5 -/* 80225348 4B FF 42 5D */ bl setButtonIconAAlpha__13dMeter2Draw_cFUcUlb -lbl_8022534C: -/* 8022534C 88 1E 01 E6 */ lbz r0, 0x1e6(r30) -/* 80225350 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80225354 40 82 00 20 */ bne lbl_80225374 -/* 80225358 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022535C 88 9E 01 C5 */ lbz r4, 0x1c5(r30) -/* 80225360 80 BE 01 24 */ lwz r5, 0x124(r30) -/* 80225364 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 80225368 7C 00 00 34 */ cntlzw r0, r0 -/* 8022536C 54 06 D9 7E */ srwi r6, r0, 5 -/* 80225370 4B FF 44 19 */ bl setButtonIconBAlpha__13dMeter2Draw_cFUcUlb -lbl_80225374: -/* 80225374 3B 60 00 00 */ li r27, 0 -/* 80225378 3B E0 00 00 */ li r31, 0 -/* 8022537C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80225380 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_80225384: -/* 80225384 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 80225388 7C 00 00 34 */ cntlzw r0, r0 -/* 8022538C 54 07 D9 7E */ srwi r7, r0, 5 -/* 80225390 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225394 7F 64 DB 78 */ mr r4, r27 -/* 80225398 3B 9F 01 D2 */ addi r28, r31, 0x1d2 -/* 8022539C 7C BE E0 AE */ lbzx r5, r30, r28 -/* 802253A0 80 DE 01 24 */ lwz r6, 0x124(r30) -/* 802253A4 4B FF 4A F5 */ bl setButtonIconAlpha__13dMeter2Draw_cFiUcUlb -/* 802253A8 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 802253AC 28 00 00 00 */ cmplwi r0, 0 -/* 802253B0 40 82 00 90 */ bne lbl_80225440 -/* 802253B4 88 1D 00 DD */ lbz r0, 0xdd(r29) -/* 802253B8 28 00 00 01 */ cmplwi r0, 1 -/* 802253BC 41 82 00 84 */ beq lbl_80225440 -/* 802253C0 7C 1E E0 AE */ lbzx r0, r30, r28 -/* 802253C4 28 00 00 43 */ cmplwi r0, 0x43 -/* 802253C8 41 82 00 64 */ beq lbl_8022542C -/* 802253CC 28 00 00 53 */ cmplwi r0, 0x53 -/* 802253D0 41 82 00 5C */ beq lbl_8022542C -/* 802253D4 28 00 00 54 */ cmplwi r0, 0x54 -/* 802253D8 41 82 00 54 */ beq lbl_8022542C -/* 802253DC 28 00 00 55 */ cmplwi r0, 0x55 -/* 802253E0 41 82 00 4C */ beq lbl_8022542C -/* 802253E4 28 00 00 56 */ cmplwi r0, 0x56 -/* 802253E8 41 82 00 44 */ beq lbl_8022542C -/* 802253EC 28 00 00 50 */ cmplwi r0, 0x50 -/* 802253F0 41 82 00 3C */ beq lbl_8022542C -/* 802253F4 28 00 00 70 */ cmplwi r0, 0x70 -/* 802253F8 41 82 00 34 */ beq lbl_8022542C -/* 802253FC 28 00 00 71 */ cmplwi r0, 0x71 -/* 80225400 41 82 00 2C */ beq lbl_8022542C -/* 80225404 28 00 00 72 */ cmplwi r0, 0x72 -/* 80225408 41 82 00 24 */ beq lbl_8022542C -/* 8022540C 28 00 00 5A */ cmplwi r0, 0x5a -/* 80225410 41 82 00 1C */ beq lbl_8022542C -/* 80225414 28 00 00 59 */ cmplwi r0, 0x59 -/* 80225418 41 82 00 14 */ beq lbl_8022542C -/* 8022541C 28 00 00 4B */ cmplwi r0, 0x4b -/* 80225420 41 82 00 0C */ beq lbl_8022542C -/* 80225424 28 00 00 76 */ cmplwi r0, 0x76 -/* 80225428 40 82 00 18 */ bne lbl_80225440 -lbl_8022542C: -/* 8022542C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225430 57 64 06 3E */ clrlwi r4, r27, 0x18 -/* 80225434 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80225438 4B FF 5A 91 */ bl drawItemNum__13dMeter2Draw_cFUcf -/* 8022543C 48 00 00 14 */ b lbl_80225450 -lbl_80225440: -/* 80225440 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225444 57 64 06 3E */ clrlwi r4, r27, 0x18 -/* 80225448 C0 22 AF C8 */ lfs f1, lit_4662(r2) -/* 8022544C 4B FF 5A 7D */ bl drawItemNum__13dMeter2Draw_cFUcf -lbl_80225450: -/* 80225450 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 80225454 28 00 00 00 */ cmplwi r0, 0 -/* 80225458 40 82 00 24 */ bne lbl_8022547C -/* 8022545C 7C 1E E0 AE */ lbzx r0, r30, r28 -/* 80225460 28 00 00 48 */ cmplwi r0, 0x48 -/* 80225464 40 82 00 18 */ bne lbl_8022547C -/* 80225468 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022546C 57 64 06 3E */ clrlwi r4, r27, 0x18 -/* 80225470 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80225474 4B FF 5B 05 */ bl drawKanteraMeter__13dMeter2Draw_cFUcf -/* 80225478 48 00 00 14 */ b lbl_8022548C -lbl_8022547C: -/* 8022547C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225480 57 64 06 3E */ clrlwi r4, r27, 0x18 -/* 80225484 C0 22 AF C8 */ lfs f1, lit_4662(r2) -/* 80225488 4B FF 5A F1 */ bl drawKanteraMeter__13dMeter2Draw_cFUcf -lbl_8022548C: -/* 8022548C 3B 7B 00 01 */ addi r27, r27, 1 -/* 80225490 2C 1B 00 02 */ cmpwi r27, 2 -/* 80225494 3B FF 00 02 */ addi r31, r31, 2 -/* 80225498 41 80 FE EC */ blt lbl_80225384 -/* 8022549C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802254A0 38 80 00 00 */ li r4, 0 -/* 802254A4 4B FF 32 E5 */ bl setAlphaButtonChange__13dMeter2Draw_cFb -/* 802254A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802254AC 48 13 CD 75 */ bl _restgpr_27 -/* 802254B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802254B4 7C 08 03 A6 */ mtlr r0 -/* 802254B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802254BC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/alphaAnimeKantera__9dMeter2_cFv.s b/asm/d/meter/d_meter2/alphaAnimeKantera__9dMeter2_cFv.s deleted file mode 100644 index 4892fa03b0..0000000000 --- a/asm/d/meter/d_meter2/alphaAnimeKantera__9dMeter2_cFv.s +++ /dev/null @@ -1,115 +0,0 @@ -lbl_80224A04: -/* 80224A04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80224A08 7C 08 02 A6 */ mflr r0 -/* 80224A0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80224A10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80224A14 93 C1 00 08 */ stw r30, 8(r1) -/* 80224A18 7C 7F 1B 78 */ mr r31, r3 -/* 80224A1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224A20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224A24 A0 03 00 06 */ lhz r0, 6(r3) -/* 80224A28 28 00 00 00 */ cmplwi r0, 0 -/* 80224A2C 41 82 01 48 */ beq lbl_80224B74 -/* 80224A30 38 63 00 9C */ addi r3, r3, 0x9c -/* 80224A34 38 80 00 01 */ li r4, 1 -/* 80224A38 38 A0 00 01 */ li r5, 1 -/* 80224A3C 4B E0 E5 F5 */ bl getItem__17dSv_player_item_cCFib -/* 80224A40 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80224A44 28 00 00 48 */ cmplwi r0, 0x48 -/* 80224A48 40 82 01 2C */ bne lbl_80224B74 -/* 80224A4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224A50 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224A54 80 7E 5D AC */ lwz r3, 0x5dac(r30) -/* 80224A58 38 80 00 00 */ li r4, 0 -/* 80224A5C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80224A60 81 8C 01 CC */ lwz r12, 0x1cc(r12) -/* 80224A64 7D 89 03 A6 */ mtctr r12 -/* 80224A68 4E 80 04 21 */ bctrl -/* 80224A6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80224A70 41 82 01 04 */ beq lbl_80224B74 -/* 80224A74 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 80224A78 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 -/* 80224A7C 40 82 00 F8 */ bne lbl_80224B74 -/* 80224A80 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 -/* 80224A84 41 82 00 30 */ beq lbl_80224AB4 -/* 80224A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224A90 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80224A94 28 00 00 00 */ cmplwi r0, 0 -/* 80224A98 41 82 00 10 */ beq lbl_80224AA8 -/* 80224A9C A0 03 4F A4 */ lhz r0, 0x4fa4(r3) -/* 80224AA0 54 00 05 6A */ rlwinm r0, r0, 0, 0x15, 0x15 -/* 80224AA4 48 00 00 08 */ b lbl_80224AAC -lbl_80224AA8: -/* 80224AA8 38 00 00 00 */ li r0, 0 -lbl_80224AAC: -/* 80224AAC 54 00 04 3F */ clrlwi. r0, r0, 0x10 -/* 80224AB0 40 82 00 C4 */ bne lbl_80224B74 -lbl_80224AB4: -/* 80224AB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224AB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224ABC 88 03 5E B7 */ lbz r0, 0x5eb7(r3) -/* 80224AC0 28 00 00 00 */ cmplwi r0, 0 -/* 80224AC4 40 82 00 B0 */ bne lbl_80224B74 -/* 80224AC8 80 9E 5D AC */ lwz r4, 0x5dac(r30) -/* 80224ACC 38 00 00 00 */ li r0, 0 -/* 80224AD0 88 64 05 6A */ lbz r3, 0x56a(r4) -/* 80224AD4 28 03 00 00 */ cmplwi r3, 0 -/* 80224AD8 41 82 00 10 */ beq lbl_80224AE8 -/* 80224ADC 28 03 00 26 */ cmplwi r3, 0x26 -/* 80224AE0 40 80 00 08 */ bge lbl_80224AE8 -/* 80224AE4 38 00 00 01 */ li r0, 1 -lbl_80224AE8: -/* 80224AE8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80224AEC 40 82 00 88 */ bne lbl_80224B74 -/* 80224AF0 88 04 05 6A */ lbz r0, 0x56a(r4) -/* 80224AF4 28 00 00 2D */ cmplwi r0, 0x2d -/* 80224AF8 40 82 00 30 */ bne lbl_80224B28 -/* 80224AFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224B00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224B04 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 80224B08 7F C3 F3 78 */ mr r3, r30 -/* 80224B0C 4B E0 80 B1 */ bl getTimerMode__14dComIfG_play_cFv -/* 80224B10 2C 03 00 03 */ cmpwi r3, 3 -/* 80224B14 41 82 00 60 */ beq lbl_80224B74 -/* 80224B18 7F C3 F3 78 */ mr r3, r30 -/* 80224B1C 4B E0 80 A1 */ bl getTimerMode__14dComIfG_play_cFv -/* 80224B20 2C 03 00 04 */ cmpwi r3, 4 -/* 80224B24 41 82 00 50 */ beq lbl_80224B74 -lbl_80224B28: -/* 80224B28 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 80224B2C 54 60 02 D7 */ rlwinm. r0, r3, 0, 0xb, 0xb -/* 80224B30 40 82 00 44 */ bne lbl_80224B74 -/* 80224B34 54 60 00 01 */ rlwinm. r0, r3, 0, 0, 0 -/* 80224B38 40 82 00 3C */ bne lbl_80224B74 -/* 80224B3C 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c -/* 80224B40 40 82 00 34 */ bne lbl_80224B74 -/* 80224B44 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b -/* 80224B48 40 82 00 2C */ bne lbl_80224B74 -/* 80224B4C 54 60 01 CF */ rlwinm. r0, r3, 0, 7, 7 -/* 80224B50 40 82 00 24 */ bne lbl_80224B74 -/* 80224B54 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a -/* 80224B58 40 82 00 1C */ bne lbl_80224B74 -/* 80224B5C 54 60 01 4B */ rlwinm. r0, r3, 0, 5, 5 -/* 80224B60 40 82 00 14 */ bne lbl_80224B74 -/* 80224B64 54 60 01 09 */ rlwinm. r0, r3, 0, 4, 4 -/* 80224B68 40 82 00 0C */ bne lbl_80224B74 -/* 80224B6C 54 60 00 C7 */ rlwinm. r0, r3, 0, 3, 3 -/* 80224B70 41 82 00 10 */ beq lbl_80224B80 -lbl_80224B74: -/* 80224B74 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224B78 4B FF 0B 69 */ bl setAlphaKanteraAnimeMin__13dMeter2Draw_cFv -/* 80224B7C 48 00 00 0C */ b lbl_80224B88 -lbl_80224B80: -/* 80224B80 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224B84 4B FF 0B D9 */ bl setAlphaKanteraAnimeMax__13dMeter2Draw_cFv -lbl_80224B88: -/* 80224B88 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224B8C 38 80 00 01 */ li r4, 1 -/* 80224B90 4B FF 0A 29 */ bl setAlphaKanteraChange__13dMeter2Draw_cFb -/* 80224B94 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80224B98 83 C1 00 08 */ lwz r30, 8(r1) -/* 80224B9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80224BA0 7C 08 03 A6 */ mtlr r0 -/* 80224BA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80224BA8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/alphaAnimeLife__9dMeter2_cFv.s b/asm/d/meter/d_meter2/alphaAnimeLife__9dMeter2_cFv.s deleted file mode 100644 index 861291cc64..0000000000 --- a/asm/d/meter/d_meter2/alphaAnimeLife__9dMeter2_cFv.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_802248E4: -/* 802248E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802248E8 7C 08 02 A6 */ mflr r0 -/* 802248EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802248F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802248F4 7C 7F 1B 78 */ mr r31, r3 -/* 802248F8 80 83 01 24 */ lwz r4, 0x124(r3) -/* 802248FC 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 -/* 80224900 40 82 00 C4 */ bne lbl_802249C4 -/* 80224904 54 80 06 73 */ rlwinm. r0, r4, 0, 0x19, 0x19 -/* 80224908 41 82 00 44 */ beq lbl_8022494C -/* 8022490C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224910 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224914 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80224918 28 00 00 00 */ cmplwi r0, 0 -/* 8022491C 41 82 00 10 */ beq lbl_8022492C -/* 80224920 A0 03 4F A4 */ lhz r0, 0x4fa4(r3) -/* 80224924 54 00 06 F6 */ rlwinm r0, r0, 0, 0x1b, 0x1b -/* 80224928 48 00 00 08 */ b lbl_80224930 -lbl_8022492C: -/* 8022492C 38 00 00 00 */ li r0, 0 -lbl_80224930: -/* 80224930 54 00 04 3F */ clrlwi. r0, r0, 0x10 -/* 80224934 41 82 00 18 */ beq lbl_8022494C -/* 80224938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022493C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224940 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 80224944 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80224948 41 82 00 7C */ beq lbl_802249C4 -lbl_8022494C: -/* 8022494C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224950 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224954 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80224958 38 00 00 00 */ li r0, 0 -/* 8022495C 88 63 05 6A */ lbz r3, 0x56a(r3) -/* 80224960 28 03 00 00 */ cmplwi r3, 0 -/* 80224964 41 82 00 10 */ beq lbl_80224974 -/* 80224968 28 03 00 26 */ cmplwi r3, 0x26 -/* 8022496C 40 80 00 08 */ bge lbl_80224974 -/* 80224970 38 00 00 01 */ li r0, 1 -lbl_80224974: -/* 80224974 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80224978 40 82 00 4C */ bne lbl_802249C4 -/* 8022497C 54 80 02 D7 */ rlwinm. r0, r4, 0, 0xb, 0xb -/* 80224980 40 82 00 44 */ bne lbl_802249C4 -/* 80224984 54 80 00 01 */ rlwinm. r0, r4, 0, 0, 0 -/* 80224988 40 82 00 3C */ bne lbl_802249C4 -/* 8022498C 54 80 07 39 */ rlwinm. r0, r4, 0, 0x1c, 0x1c -/* 80224990 40 82 00 34 */ bne lbl_802249C4 -/* 80224994 54 80 06 F7 */ rlwinm. r0, r4, 0, 0x1b, 0x1b -/* 80224998 40 82 00 2C */ bne lbl_802249C4 -/* 8022499C 54 80 01 CF */ rlwinm. r0, r4, 0, 7, 7 -/* 802249A0 40 82 00 24 */ bne lbl_802249C4 -/* 802249A4 54 80 06 B5 */ rlwinm. r0, r4, 0, 0x1a, 0x1a -/* 802249A8 40 82 00 1C */ bne lbl_802249C4 -/* 802249AC 54 80 01 4B */ rlwinm. r0, r4, 0, 5, 5 -/* 802249B0 40 82 00 14 */ bne lbl_802249C4 -/* 802249B4 54 80 01 09 */ rlwinm. r0, r4, 0, 4, 4 -/* 802249B8 40 82 00 0C */ bne lbl_802249C4 -/* 802249BC 54 80 00 C7 */ rlwinm. r0, r4, 0, 3, 3 -/* 802249C0 41 82 00 10 */ beq lbl_802249D0 -lbl_802249C4: -/* 802249C4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802249C8 4B FF 04 2D */ bl setAlphaLifeAnimeMin__13dMeter2Draw_cFv -/* 802249CC 48 00 00 18 */ b lbl_802249E4 -lbl_802249D0: -/* 802249D0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802249D4 4B FF 04 81 */ bl setAlphaLifeAnimeMax__13dMeter2Draw_cFv -/* 802249D8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802249DC 38 63 04 C4 */ addi r3, r3, 0x4c4 -/* 802249E0 48 09 15 91 */ bl heartGaugeOn__11Z2StatusMgrFv -lbl_802249E4: -/* 802249E4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802249E8 38 80 00 00 */ li r4, 0 -/* 802249EC 4B FF 02 35 */ bl setAlphaLifeChange__13dMeter2Draw_cFb -/* 802249F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802249F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802249F8 7C 08 03 A6 */ mtlr r0 -/* 802249FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80224A00 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/alphaAnimeLightDrop__9dMeter2_cFv.s b/asm/d/meter/d_meter2/alphaAnimeLightDrop__9dMeter2_cFv.s deleted file mode 100644 index b9c8bfd996..0000000000 --- a/asm/d/meter/d_meter2/alphaAnimeLightDrop__9dMeter2_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80224D6C: -/* 80224D6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80224D70 7C 08 02 A6 */ mflr r0 -/* 80224D74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80224D78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80224D7C 7C 7F 1B 78 */ mr r31, r3 -/* 80224D80 48 00 09 5D */ bl isShowLightDrop__9dMeter2_cFv -/* 80224D84 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80224D88 40 82 00 10 */ bne lbl_80224D98 -/* 80224D8C 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224D90 4B FF 10 B1 */ bl setAlphaLightDropAnimeMin__13dMeter2Draw_cFv -/* 80224D94 48 00 00 0C */ b lbl_80224DA0 -lbl_80224D98: -/* 80224D98 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224D9C 4B FF 11 ED */ bl setAlphaLightDropAnimeMax__13dMeter2Draw_cFv -lbl_80224DA0: -/* 80224DA0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224DA4 38 80 00 00 */ li r4, 0 -/* 80224DA8 4B FF 0F FD */ bl setAlphaLightDropChange__13dMeter2Draw_cFb -/* 80224DAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80224DB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80224DB4 7C 08 03 A6 */ mtlr r0 -/* 80224DB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80224DBC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/alphaAnimeOxygen__9dMeter2_cFv.s b/asm/d/meter/d_meter2/alphaAnimeOxygen__9dMeter2_cFv.s deleted file mode 100644 index 2c36167704..0000000000 --- a/asm/d/meter/d_meter2/alphaAnimeOxygen__9dMeter2_cFv.s +++ /dev/null @@ -1,121 +0,0 @@ -lbl_80224BAC: -/* 80224BAC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80224BB0 7C 08 02 A6 */ mflr r0 -/* 80224BB4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80224BB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80224BBC 48 13 D6 21 */ bl _savegpr_29 -/* 80224BC0 7C 7E 1B 78 */ mr r30, r3 -/* 80224BC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224BC8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224BCC 88 1F 5E B7 */ lbz r0, 0x5eb7(r31) -/* 80224BD0 28 00 00 00 */ cmplwi r0, 0 -/* 80224BD4 41 82 00 F0 */ beq lbl_80224CC4 -/* 80224BD8 80 7E 01 24 */ lwz r3, 0x124(r30) -/* 80224BDC 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 -/* 80224BE0 40 82 00 E4 */ bne lbl_80224CC4 -/* 80224BE4 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 -/* 80224BE8 41 82 00 28 */ beq lbl_80224C10 -/* 80224BEC 88 1F 4F AD */ lbz r0, 0x4fad(r31) -/* 80224BF0 28 00 00 00 */ cmplwi r0, 0 -/* 80224BF4 41 82 00 10 */ beq lbl_80224C04 -/* 80224BF8 A0 1F 4F A4 */ lhz r0, 0x4fa4(r31) -/* 80224BFC 54 00 05 28 */ rlwinm r0, r0, 0, 0x14, 0x14 -/* 80224C00 48 00 00 08 */ b lbl_80224C08 -lbl_80224C04: -/* 80224C04 38 00 00 00 */ li r0, 0 -lbl_80224C08: -/* 80224C08 54 00 04 3F */ clrlwi. r0, r0, 0x10 -/* 80224C0C 40 82 00 B8 */ bne lbl_80224CC4 -lbl_80224C10: -/* 80224C10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224C14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224C18 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 80224C1C 38 00 00 00 */ li r0, 0 -/* 80224C20 88 64 05 6A */ lbz r3, 0x56a(r4) -/* 80224C24 28 03 00 00 */ cmplwi r3, 0 -/* 80224C28 41 82 00 10 */ beq lbl_80224C38 -/* 80224C2C 28 03 00 26 */ cmplwi r3, 0x26 -/* 80224C30 40 80 00 08 */ bge lbl_80224C38 -/* 80224C34 38 00 00 01 */ li r0, 1 -lbl_80224C38: -/* 80224C38 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80224C3C 40 82 00 88 */ bne lbl_80224CC4 -/* 80224C40 88 04 05 6A */ lbz r0, 0x56a(r4) -/* 80224C44 28 00 00 2D */ cmplwi r0, 0x2d -/* 80224C48 40 82 00 30 */ bne lbl_80224C78 -/* 80224C4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224C50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224C54 3B A3 0F 38 */ addi r29, r3, 0xf38 -/* 80224C58 7F A3 EB 78 */ mr r3, r29 -/* 80224C5C 4B E0 7F 61 */ bl getTimerMode__14dComIfG_play_cFv -/* 80224C60 2C 03 00 03 */ cmpwi r3, 3 -/* 80224C64 41 82 00 60 */ beq lbl_80224CC4 -/* 80224C68 7F A3 EB 78 */ mr r3, r29 -/* 80224C6C 4B E0 7F 51 */ bl getTimerMode__14dComIfG_play_cFv -/* 80224C70 2C 03 00 04 */ cmpwi r3, 4 -/* 80224C74 41 82 00 50 */ beq lbl_80224CC4 -lbl_80224C78: -/* 80224C78 80 7E 01 24 */ lwz r3, 0x124(r30) -/* 80224C7C 54 60 02 D7 */ rlwinm. r0, r3, 0, 0xb, 0xb -/* 80224C80 40 82 00 44 */ bne lbl_80224CC4 -/* 80224C84 54 60 00 01 */ rlwinm. r0, r3, 0, 0, 0 -/* 80224C88 40 82 00 3C */ bne lbl_80224CC4 -/* 80224C8C 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c -/* 80224C90 40 82 00 34 */ bne lbl_80224CC4 -/* 80224C94 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b -/* 80224C98 40 82 00 2C */ bne lbl_80224CC4 -/* 80224C9C 54 60 01 CF */ rlwinm. r0, r3, 0, 7, 7 -/* 80224CA0 40 82 00 24 */ bne lbl_80224CC4 -/* 80224CA4 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a -/* 80224CA8 40 82 00 1C */ bne lbl_80224CC4 -/* 80224CAC 54 60 01 4B */ rlwinm. r0, r3, 0, 5, 5 -/* 80224CB0 40 82 00 14 */ bne lbl_80224CC4 -/* 80224CB4 54 60 01 09 */ rlwinm. r0, r3, 0, 4, 4 -/* 80224CB8 40 82 00 0C */ bne lbl_80224CC4 -/* 80224CBC 54 60 00 C7 */ rlwinm. r0, r3, 0, 3, 3 -/* 80224CC0 41 82 00 24 */ beq lbl_80224CE4 -lbl_80224CC4: -/* 80224CC4 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224CC8 4B FF 0D 51 */ bl setAlphaOxygenAnimeMin__13dMeter2Draw_cFv -/* 80224CCC 88 1F 5E B7 */ lbz r0, 0x5eb7(r31) -/* 80224CD0 28 00 00 00 */ cmplwi r0, 0 -/* 80224CD4 40 82 00 74 */ bne lbl_80224D48 -/* 80224CD8 38 00 00 00 */ li r0, 0 -/* 80224CDC 98 1E 01 E1 */ stb r0, 0x1e1(r30) -/* 80224CE0 48 00 00 68 */ b lbl_80224D48 -lbl_80224CE4: -/* 80224CE4 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224CE8 4B FF 0D AD */ bl setAlphaOxygenAnimeMax__13dMeter2Draw_cFv -/* 80224CEC 88 1E 01 E1 */ lbz r0, 0x1e1(r30) -/* 80224CF0 28 00 00 00 */ cmplwi r0, 0 -/* 80224CF4 40 82 00 54 */ bne lbl_80224D48 -/* 80224CF8 38 00 00 01 */ li r0, 1 -/* 80224CFC 98 1E 01 E1 */ stb r0, 0x1e1(r30) -/* 80224D00 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224D04 C0 23 06 04 */ lfs f1, 0x604(r3) -/* 80224D08 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 80224D0C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80224D10 40 81 00 38 */ ble lbl_80224D48 -/* 80224D14 38 00 00 28 */ li r0, 0x28 -/* 80224D18 90 01 00 08 */ stw r0, 8(r1) -/* 80224D1C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80224D20 38 81 00 08 */ addi r4, r1, 8 -/* 80224D24 38 A0 00 00 */ li r5, 0 -/* 80224D28 38 C0 00 00 */ li r6, 0 -/* 80224D2C 38 E0 00 00 */ li r7, 0 -/* 80224D30 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80224D34 FC 40 08 90 */ fmr f2, f1 -/* 80224D38 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 80224D3C FC 80 18 90 */ fmr f4, f3 -/* 80224D40 39 00 00 00 */ li r8, 0 -/* 80224D44 48 08 6C 41 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80224D48: -/* 80224D48 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224D4C 38 80 00 00 */ li r4, 0 -/* 80224D50 4B FF 0B A1 */ bl setAlphaOxygenChange__13dMeter2Draw_cFb -/* 80224D54 39 61 00 20 */ addi r11, r1, 0x20 -/* 80224D58 48 13 D4 D1 */ bl _restgpr_29 -/* 80224D5C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80224D60 7C 08 03 A6 */ mtlr r0 -/* 80224D64 38 21 00 20 */ addi r1, r1, 0x20 -/* 80224D68 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/check2DContents__9dMeter2_cFv.s b/asm/d/meter/d_meter2/check2DContents__9dMeter2_cFv.s deleted file mode 100644 index fd78409429..0000000000 --- a/asm/d/meter/d_meter2/check2DContents__9dMeter2_cFv.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_80223BC4: -/* 80223BC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80223BC8 7C 08 02 A6 */ mflr r0 -/* 80223BCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80223BD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80223BD4 7C 7F 1B 78 */ mr r31, r3 -/* 80223BD8 80 03 01 18 */ lwz r0, 0x118(r3) -/* 80223BDC 28 00 00 00 */ cmplwi r0, 0 -/* 80223BE0 40 82 00 FC */ bne lbl_80223CDC -/* 80223BE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80223BE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80223BEC 88 03 5E 8F */ lbz r0, 0x5e8f(r3) -/* 80223BF0 28 00 00 00 */ cmplwi r0, 0 -/* 80223BF4 41 82 00 0C */ beq lbl_80223C00 -/* 80223BF8 28 00 00 05 */ cmplwi r0, 5 -/* 80223BFC 40 82 01 F0 */ bne lbl_80223DEC -lbl_80223C00: -/* 80223C00 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80223C04 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80223C08 4B FF 85 D5 */ bl isFloatingMessageVisible__13dMeter2Info_cFv -/* 80223C0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80223C10 40 82 00 88 */ bne lbl_80223C98 -/* 80223C14 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80223C18 88 03 07 61 */ lbz r0, 0x761(r3) -/* 80223C1C 20 00 00 07 */ subfic r0, r0, 7 -/* 80223C20 7C 00 00 34 */ cntlzw r0, r0 -/* 80223C24 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 80223C28 40 82 00 70 */ bne lbl_80223C98 -/* 80223C2C 88 03 07 62 */ lbz r0, 0x762(r3) -/* 80223C30 28 00 00 07 */ cmplwi r0, 7 -/* 80223C34 41 82 00 64 */ beq lbl_80223C98 -/* 80223C38 88 03 07 6A */ lbz r0, 0x76a(r3) -/* 80223C3C 28 00 00 07 */ cmplwi r0, 7 -/* 80223C40 41 82 00 58 */ beq lbl_80223C98 -/* 80223C44 88 03 07 64 */ lbz r0, 0x764(r3) -/* 80223C48 28 00 00 07 */ cmplwi r0, 7 -/* 80223C4C 41 82 00 4C */ beq lbl_80223C98 -/* 80223C50 88 03 07 65 */ lbz r0, 0x765(r3) -/* 80223C54 28 00 00 07 */ cmplwi r0, 7 -/* 80223C58 41 82 00 40 */ beq lbl_80223C98 -/* 80223C5C 88 03 07 66 */ lbz r0, 0x766(r3) -/* 80223C60 28 00 00 07 */ cmplwi r0, 7 -/* 80223C64 41 82 00 34 */ beq lbl_80223C98 -/* 80223C68 88 03 07 67 */ lbz r0, 0x767(r3) -/* 80223C6C 28 00 00 07 */ cmplwi r0, 7 -/* 80223C70 41 82 00 28 */ beq lbl_80223C98 -/* 80223C74 88 03 07 68 */ lbz r0, 0x768(r3) -/* 80223C78 28 00 00 07 */ cmplwi r0, 7 -/* 80223C7C 41 82 00 1C */ beq lbl_80223C98 -/* 80223C80 88 03 07 69 */ lbz r0, 0x769(r3) -/* 80223C84 28 00 00 07 */ cmplwi r0, 7 -/* 80223C88 41 82 00 10 */ beq lbl_80223C98 -/* 80223C8C 88 03 07 63 */ lbz r0, 0x763(r3) -/* 80223C90 28 00 00 07 */ cmplwi r0, 7 -/* 80223C94 40 82 01 58 */ bne lbl_80223DEC -lbl_80223C98: -/* 80223C98 38 60 00 08 */ li r3, 8 -/* 80223C9C 4B E0 A4 45 */ bl dComIfGp_setHeapLockFlag__FUc -/* 80223CA0 80 1F 01 08 */ lwz r0, 0x108(r31) -/* 80223CA4 28 00 00 00 */ cmplwi r0, 0 -/* 80223CA8 40 82 00 14 */ bne lbl_80223CBC -/* 80223CAC 38 60 00 08 */ li r3, 8 -/* 80223CB0 4B E0 A7 21 */ bl dComIfGp_getSubHeap2D__Fi -/* 80223CB4 4B DE B5 19 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 80223CB8 90 7F 01 08 */ stw r3, 0x108(r31) -lbl_80223CBC: -/* 80223CBC 38 60 06 30 */ li r3, 0x630 -/* 80223CC0 48 0A AF 8D */ bl __nw__FUl -/* 80223CC4 7C 60 1B 79 */ or. r0, r3, r3 -/* 80223CC8 41 82 00 0C */ beq lbl_80223CD4 -/* 80223CCC 4B FD D6 5D */ bl __ct__14dMeterButton_cFv -/* 80223CD0 7C 60 1B 78 */ mr r0, r3 -lbl_80223CD4: -/* 80223CD4 90 1F 01 18 */ stw r0, 0x118(r31) -/* 80223CD8 48 00 01 14 */ b lbl_80223DEC -lbl_80223CDC: -/* 80223CDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80223CE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80223CE4 88 03 5E 8F */ lbz r0, 0x5e8f(r3) -/* 80223CE8 28 00 00 05 */ cmplwi r0, 5 -/* 80223CEC 40 82 01 00 */ bne lbl_80223DEC -/* 80223CF0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80223CF4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80223CF8 4B FF 84 E5 */ bl isFloatingMessageVisible__13dMeter2Info_cFv -/* 80223CFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80223D00 40 82 00 EC */ bne lbl_80223DEC -/* 80223D04 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80223D08 88 03 07 61 */ lbz r0, 0x761(r3) -/* 80223D0C 20 00 00 07 */ subfic r0, r0, 7 -/* 80223D10 7C 00 00 34 */ cntlzw r0, r0 -/* 80223D14 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 80223D18 40 82 00 D4 */ bne lbl_80223DEC -/* 80223D1C 88 03 07 62 */ lbz r0, 0x762(r3) -/* 80223D20 28 00 00 07 */ cmplwi r0, 7 -/* 80223D24 41 82 00 C8 */ beq lbl_80223DEC -/* 80223D28 88 03 07 6A */ lbz r0, 0x76a(r3) -/* 80223D2C 28 00 00 07 */ cmplwi r0, 7 -/* 80223D30 41 82 00 BC */ beq lbl_80223DEC -/* 80223D34 88 03 07 64 */ lbz r0, 0x764(r3) -/* 80223D38 28 00 00 07 */ cmplwi r0, 7 -/* 80223D3C 41 82 00 B0 */ beq lbl_80223DEC -/* 80223D40 88 03 07 65 */ lbz r0, 0x765(r3) -/* 80223D44 28 00 00 07 */ cmplwi r0, 7 -/* 80223D48 41 82 00 A4 */ beq lbl_80223DEC -/* 80223D4C 88 03 07 66 */ lbz r0, 0x766(r3) -/* 80223D50 28 00 00 07 */ cmplwi r0, 7 -/* 80223D54 41 82 00 98 */ beq lbl_80223DEC -/* 80223D58 88 03 07 67 */ lbz r0, 0x767(r3) -/* 80223D5C 28 00 00 07 */ cmplwi r0, 7 -/* 80223D60 41 82 00 8C */ beq lbl_80223DEC -/* 80223D64 88 03 07 68 */ lbz r0, 0x768(r3) -/* 80223D68 28 00 00 07 */ cmplwi r0, 7 -/* 80223D6C 41 82 00 80 */ beq lbl_80223DEC -/* 80223D70 88 03 07 69 */ lbz r0, 0x769(r3) -/* 80223D74 28 00 00 07 */ cmplwi r0, 7 -/* 80223D78 41 82 00 74 */ beq lbl_80223DEC -/* 80223D7C 88 03 07 63 */ lbz r0, 0x763(r3) -/* 80223D80 28 00 00 07 */ cmplwi r0, 7 -/* 80223D84 41 82 00 68 */ beq lbl_80223DEC -/* 80223D88 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223D8C 4B FE 56 E9 */ bl isClose__14dMeterButton_cFv -/* 80223D90 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80223D94 41 82 00 58 */ beq lbl_80223DEC -/* 80223D98 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223D9C 28 03 00 00 */ cmplwi r3, 0 -/* 80223DA0 41 82 00 18 */ beq lbl_80223DB8 -/* 80223DA4 38 80 00 01 */ li r4, 1 -/* 80223DA8 81 83 00 00 */ lwz r12, 0(r3) -/* 80223DAC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80223DB0 7D 89 03 A6 */ mtctr r12 -/* 80223DB4 4E 80 04 21 */ bctrl -lbl_80223DB8: -/* 80223DB8 38 00 00 00 */ li r0, 0 -/* 80223DBC 90 1F 01 18 */ stw r0, 0x118(r31) -/* 80223DC0 38 60 00 08 */ li r3, 8 -/* 80223DC4 4B E0 A6 0D */ bl dComIfGp_getSubHeap2D__Fi -/* 80223DC8 48 0A A8 05 */ bl freeAll__7JKRHeapFv -/* 80223DCC 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 80223DD0 28 03 00 00 */ cmplwi r3, 0 -/* 80223DD4 41 82 00 10 */ beq lbl_80223DE4 -/* 80223DD8 4B DE B3 F5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 80223DDC 38 00 00 00 */ li r0, 0 -/* 80223DE0 90 1F 01 08 */ stw r0, 0x108(r31) -lbl_80223DE4: -/* 80223DE4 38 60 00 08 */ li r3, 8 -/* 80223DE8 4B E0 A3 A1 */ bl dComIfGp_offHeapLockFlag__Fi -lbl_80223DEC: -/* 80223DEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80223DF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80223DF4 7C 08 03 A6 */ mtlr r0 -/* 80223DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80223DFC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/checkStatus__9dMeter2_cFv.s b/asm/d/meter/d_meter2/checkStatus__9dMeter2_cFv.s deleted file mode 100644 index 642f477ff2..0000000000 --- a/asm/d/meter/d_meter2/checkStatus__9dMeter2_cFv.s +++ /dev/null @@ -1,390 +0,0 @@ -lbl_8021F7B0: -/* 8021F7B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8021F7B4 7C 08 02 A6 */ mflr r0 -/* 8021F7B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021F7BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021F7C0 48 14 2A 1D */ bl _savegpr_29 -/* 8021F7C4 7C 7F 1B 78 */ mr r31, r3 -/* 8021F7C8 38 00 00 00 */ li r0, 0 -/* 8021F7CC 90 03 01 24 */ stw r0, 0x124(r3) -/* 8021F7D0 80 03 01 28 */ lwz r0, 0x128(r3) -/* 8021F7D4 90 03 01 2C */ stw r0, 0x12c(r3) -/* 8021F7D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F7DC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F7E0 80 64 5D B4 */ lwz r3, 0x5db4(r4) -/* 8021F7E4 80 03 05 74 */ lwz r0, 0x574(r3) -/* 8021F7E8 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6 -/* 8021F7EC 90 1F 01 28 */ stw r0, 0x128(r31) -/* 8021F7F0 88 04 5E B8 */ lbz r0, 0x5eb8(r4) -/* 8021F7F4 28 00 00 00 */ cmplwi r0, 0 -/* 8021F7F8 41 82 00 14 */ beq lbl_8021F80C -/* 8021F7FC 80 64 5D BC */ lwz r3, 0x5dbc(r4) -/* 8021F800 48 01 79 E5 */ bl isPlaceMessage__12dMsgObject_cFv -/* 8021F804 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021F808 41 82 00 14 */ beq lbl_8021F81C -lbl_8021F80C: -/* 8021F80C 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021F810 60 00 40 00 */ ori r0, r0, 0x4000 -/* 8021F814 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021F818 48 00 00 C4 */ b lbl_8021F8DC -lbl_8021F81C: -/* 8021F81C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F820 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F824 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8021F828 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8021F82C 41 82 00 20 */ beq lbl_8021F84C -/* 8021F830 88 03 5E 1D */ lbz r0, 0x5e1d(r3) -/* 8021F834 28 00 00 12 */ cmplwi r0, 0x12 -/* 8021F838 40 82 00 14 */ bne lbl_8021F84C -/* 8021F83C 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021F840 64 00 00 20 */ oris r0, r0, 0x20 -/* 8021F844 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021F848 48 00 00 94 */ b lbl_8021F8DC -lbl_8021F84C: -/* 8021F84C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F850 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F854 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 8021F858 28 00 00 00 */ cmplwi r0, 0 -/* 8021F85C 41 82 00 80 */ beq lbl_8021F8DC -/* 8021F860 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021F864 60 00 00 40 */ ori r0, r0, 0x40 -/* 8021F868 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021F86C 80 0D 88 B8 */ lwz r0, m_mode__7dDemo_c(r13) -/* 8021F870 2C 00 00 01 */ cmpwi r0, 1 -/* 8021F874 41 82 00 68 */ beq lbl_8021F8DC -/* 8021F878 88 03 5E 8F */ lbz r0, 0x5e8f(r3) -/* 8021F87C 28 00 00 06 */ cmplwi r0, 6 -/* 8021F880 41 82 00 5C */ beq lbl_8021F8DC -/* 8021F884 48 01 89 A9 */ bl getStatus__12dMsgObject_cFv -/* 8021F888 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8021F88C 20 60 00 01 */ subfic r3, r0, 1 -/* 8021F890 30 03 FF FF */ addic r0, r3, -1 -/* 8021F894 7C 00 19 10 */ subfe r0, r0, r3 -/* 8021F898 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8021F89C 41 82 00 40 */ beq lbl_8021F8DC -/* 8021F8A0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021F8A4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021F8A8 4B FF C9 35 */ bl isFloatingMessageVisible__13dMeter2Info_cFv -/* 8021F8AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021F8B0 40 82 00 2C */ bne lbl_8021F8DC -/* 8021F8B4 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021F8B8 60 00 01 00 */ ori r0, r0, 0x100 -/* 8021F8BC 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021F8C0 38 00 00 00 */ li r0, 0 -/* 8021F8C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F8C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F8CC 98 03 5E 1D */ stb r0, 0x5e1d(r3) -/* 8021F8D0 98 03 5E 43 */ stb r0, 0x5e43(r3) -/* 8021F8D4 98 03 5E 1C */ stb r0, 0x5e1c(r3) -/* 8021F8D8 98 03 5E 42 */ stb r0, 0x5e42(r3) -lbl_8021F8DC: -/* 8021F8DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F8E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F8E4 88 03 5E 8F */ lbz r0, 0x5e8f(r3) -/* 8021F8E8 28 00 00 06 */ cmplwi r0, 6 -/* 8021F8EC 41 82 00 68 */ beq lbl_8021F954 -/* 8021F8F0 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021F8F4 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 8021F8F8 40 82 00 5C */ bne lbl_8021F954 -/* 8021F8FC 48 01 89 31 */ bl getStatus__12dMsgObject_cFv -/* 8021F900 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8021F904 20 60 00 01 */ subfic r3, r0, 1 -/* 8021F908 30 03 FF FF */ addic r0, r3, -1 -/* 8021F90C 7C 00 19 10 */ subfe r0, r0, r3 -/* 8021F910 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8021F914 41 82 00 40 */ beq lbl_8021F954 -/* 8021F918 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021F91C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021F920 4B FF C8 BD */ bl isFloatingMessageVisible__13dMeter2Info_cFv -/* 8021F924 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021F928 40 82 00 2C */ bne lbl_8021F954 -/* 8021F92C 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021F930 60 00 01 00 */ ori r0, r0, 0x100 -/* 8021F934 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021F938 38 00 00 00 */ li r0, 0 -/* 8021F93C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F940 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F944 98 03 5E 1D */ stb r0, 0x5e1d(r3) -/* 8021F948 98 03 5E 43 */ stb r0, 0x5e43(r3) -/* 8021F94C 98 03 5E 1C */ stb r0, 0x5e1c(r3) -/* 8021F950 98 03 5E 42 */ stb r0, 0x5e42(r3) -lbl_8021F954: -/* 8021F954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F95C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) -/* 8021F960 28 00 00 00 */ cmplwi r0, 0 -/* 8021F964 40 82 02 1C */ bne lbl_8021FB80 -/* 8021F968 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021F96C 4B FF C2 B9 */ bl getCameraSubject__13dMeter2Draw_cFv -/* 8021F970 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021F974 41 82 00 14 */ beq lbl_8021F988 -/* 8021F978 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021F97C 64 00 40 00 */ oris r0, r0, 0x4000 -/* 8021F980 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021F984 48 00 00 20 */ b lbl_8021F9A4 -lbl_8021F988: -/* 8021F988 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021F98C 4B FF C2 C9 */ bl getItemSubject__13dMeter2Draw_cFv -/* 8021F990 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021F994 41 82 00 10 */ beq lbl_8021F9A4 -/* 8021F998 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021F99C 60 00 10 00 */ ori r0, r0, 0x1000 -/* 8021F9A0 90 1F 01 24 */ stw r0, 0x124(r31) -lbl_8021F9A4: -/* 8021F9A4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021F9A8 4B FF C3 05 */ bl getPlayerSubject__13dMeter2Draw_cFv -/* 8021F9AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021F9B0 41 82 00 10 */ beq lbl_8021F9C0 -/* 8021F9B4 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021F9B8 64 00 00 10 */ oris r0, r0, 0x10 -/* 8021F9BC 90 1F 01 24 */ stw r0, 0x124(r31) -lbl_8021F9C0: -/* 8021F9C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021F9C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021F9C8 38 83 5D 7C */ addi r4, r3, 0x5d7c -/* 8021F9CC 80 03 5D 7C */ lwz r0, 0x5d7c(r3) -/* 8021F9D0 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 8021F9D4 41 82 00 20 */ beq lbl_8021F9F4 -/* 8021F9D8 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021F9DC 64 00 80 00 */ oris r0, r0, 0x8000 -/* 8021F9E0 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021F9E4 38 00 00 12 */ li r0, 0x12 -/* 8021F9E8 98 03 5E 3C */ stb r0, 0x5e3c(r3) -/* 8021F9EC 38 00 00 02 */ li r0, 2 -/* 8021F9F0 98 03 5E 57 */ stb r0, 0x5e57(r3) -lbl_8021F9F4: -/* 8021F9F4 80 04 00 00 */ lwz r0, 0(r4) -/* 8021F9F8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8021F9FC 41 82 00 14 */ beq lbl_8021FA10 -/* 8021FA00 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FA04 60 00 00 80 */ ori r0, r0, 0x80 -/* 8021FA08 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FA0C 48 00 01 74 */ b lbl_8021FB80 -lbl_8021FA10: -/* 8021FA10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FA14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FA18 88 03 5D B0 */ lbz r0, 0x5db0(r3) -/* 8021FA1C 7C 00 07 74 */ extsb r0, r0 -/* 8021FA20 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 8021FA24 7C 04 00 2E */ lwzx r0, r4, r0 -/* 8021FA28 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 8021FA2C 41 82 00 2C */ beq lbl_8021FA58 -/* 8021FA30 4B F6 1C 11 */ bl dCam_getBody__Fv -/* 8021FA34 38 81 00 0A */ addi r4, r1, 0xa -/* 8021FA38 38 A1 00 08 */ addi r5, r1, 8 -/* 8021FA3C 4B F5 54 69 */ bl CalcSubjectAngle__9dCamera_cFPsPs -/* 8021FA40 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021FA44 41 82 00 14 */ beq lbl_8021FA58 -/* 8021FA48 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FA4C 64 00 20 00 */ oris r0, r0, 0x2000 -/* 8021FA50 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FA54 48 00 01 2C */ b lbl_8021FB80 -lbl_8021FA58: -/* 8021FA58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FA5C 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FA60 80 7D 5D AC */ lwz r3, 0x5dac(r29) -/* 8021FA64 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8021FA68 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 8021FA6C 7D 89 03 A6 */ mtctr r12 -/* 8021FA70 4E 80 04 21 */ bctrl -/* 8021FA74 28 03 00 00 */ cmplwi r3, 0 -/* 8021FA78 41 82 00 14 */ beq lbl_8021FA8C -/* 8021FA7C 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FA80 60 00 04 00 */ ori r0, r0, 0x400 -/* 8021FA84 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FA88 48 00 00 F8 */ b lbl_8021FB80 -lbl_8021FA8C: -/* 8021FA8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FA90 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FA94 80 1E 5F 18 */ lwz r0, 0x5f18(r30) -/* 8021FA98 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 -/* 8021FA9C 40 82 00 20 */ bne lbl_8021FABC -/* 8021FAA0 80 7D 5D AC */ lwz r3, 0x5dac(r29) -/* 8021FAA4 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8021FAA8 81 8C 01 98 */ lwz r12, 0x198(r12) -/* 8021FAAC 7D 89 03 A6 */ mtctr r12 -/* 8021FAB0 4E 80 04 21 */ bctrl -/* 8021FAB4 28 03 00 00 */ cmplwi r3, 0 -/* 8021FAB8 41 82 00 14 */ beq lbl_8021FACC -lbl_8021FABC: -/* 8021FABC 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FAC0 60 00 02 00 */ ori r0, r0, 0x200 -/* 8021FAC4 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FAC8 48 00 00 B8 */ b lbl_8021FB80 -lbl_8021FACC: -/* 8021FACC 80 9E 5F 18 */ lwz r4, 0x5f18(r30) -/* 8021FAD0 54 80 02 11 */ rlwinm. r0, r4, 0, 8, 8 -/* 8021FAD4 41 82 00 14 */ beq lbl_8021FAE8 -/* 8021FAD8 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FADC 60 00 08 00 */ ori r0, r0, 0x800 -/* 8021FAE0 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FAE4 48 00 00 9C */ b lbl_8021FB80 -lbl_8021FAE8: -/* 8021FAE8 54 80 02 D7 */ rlwinm. r0, r4, 0, 0xb, 0xb -/* 8021FAEC 41 82 00 14 */ beq lbl_8021FB00 -/* 8021FAF0 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FAF4 60 00 20 00 */ ori r0, r0, 0x2000 -/* 8021FAF8 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FAFC 48 00 00 84 */ b lbl_8021FB80 -lbl_8021FB00: -/* 8021FB00 3C 60 02 00 */ lis r3, 0x0200 /* 0x02000108@ha */ -/* 8021FB04 38 03 01 08 */ addi r0, r3, 0x0108 /* 0x02000108@l */ -/* 8021FB08 7C 80 00 39 */ and. r0, r4, r0 -/* 8021FB0C 41 82 00 14 */ beq lbl_8021FB20 -/* 8021FB10 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FB14 60 00 80 00 */ ori r0, r0, 0x8000 -/* 8021FB18 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FB1C 48 00 00 64 */ b lbl_8021FB80 -lbl_8021FB20: -/* 8021FB20 54 80 01 4B */ rlwinm. r0, r4, 0, 5, 5 -/* 8021FB24 41 82 00 14 */ beq lbl_8021FB38 -/* 8021FB28 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FB2C 64 00 00 01 */ oris r0, r0, 1 -/* 8021FB30 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FB34 48 00 00 4C */ b lbl_8021FB80 -lbl_8021FB38: -/* 8021FB38 80 7D 5D AC */ lwz r3, 0x5dac(r29) -/* 8021FB3C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8021FB40 81 8C 01 A0 */ lwz r12, 0x1a0(r12) -/* 8021FB44 7D 89 03 A6 */ mtctr r12 -/* 8021FB48 4E 80 04 21 */ bctrl -/* 8021FB4C 2C 03 00 00 */ cmpwi r3, 0 -/* 8021FB50 41 82 00 30 */ beq lbl_8021FB80 -/* 8021FB54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FB58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FB5C 80 63 5D B8 */ lwz r3, 0x5db8(r3) -/* 8021FB60 28 03 00 00 */ cmplwi r3, 0 -/* 8021FB64 41 82 00 1C */ beq lbl_8021FB80 -/* 8021FB68 80 03 17 44 */ lwz r0, 0x1744(r3) -/* 8021FB6C 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 -/* 8021FB70 40 82 00 10 */ bne lbl_8021FB80 -/* 8021FB74 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FB78 64 00 02 00 */ oris r0, r0, 0x200 -/* 8021FB7C 90 1F 01 24 */ stw r0, 0x124(r31) -lbl_8021FB80: -/* 8021FB80 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021FB84 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021FB88 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 8021FB8C 28 00 00 0A */ cmplwi r0, 0xa -/* 8021FB90 41 81 01 50 */ bgt lbl_8021FCE0 -/* 8021FB94 3C 60 80 3C */ lis r3, lit_5038@ha /* 0x803BFA28@ha */ -/* 8021FB98 38 63 FA 28 */ addi r3, r3, lit_5038@l /* 0x803BFA28@l */ -/* 8021FB9C 54 00 10 3A */ slwi r0, r0, 2 -/* 8021FBA0 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8021FBA4 7C 09 03 A6 */ mtctr r0 -/* 8021FBA8 4E 80 04 20 */ bctr -/* 8021FBAC 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FBB0 60 00 00 08 */ ori r0, r0, 8 -/* 8021FBB4 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FBB8 48 00 01 28 */ b lbl_8021FCE0 -/* 8021FBBC 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FBC0 60 00 00 10 */ ori r0, r0, 0x10 -/* 8021FBC4 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FBC8 48 00 01 18 */ b lbl_8021FCE0 -/* 8021FBCC 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FBD0 64 00 01 00 */ oris r0, r0, 0x100 -/* 8021FBD4 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FBD8 38 00 00 12 */ li r0, 0x12 -/* 8021FBDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FBE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FBE4 98 03 5E 1D */ stb r0, 0x5e1d(r3) -/* 8021FBE8 38 00 00 00 */ li r0, 0 -/* 8021FBEC 98 03 5E 43 */ stb r0, 0x5e43(r3) -/* 8021FBF0 98 03 5E 24 */ stb r0, 0x5e24(r3) -/* 8021FBF4 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 8021FBF8 98 03 5E 1C */ stb r0, 0x5e1c(r3) -/* 8021FBFC 98 03 5E 42 */ stb r0, 0x5e42(r3) -/* 8021FC00 48 00 00 E0 */ b lbl_8021FCE0 -/* 8021FC04 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FC08 60 00 00 20 */ ori r0, r0, 0x20 -/* 8021FC0C 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FC10 38 00 00 12 */ li r0, 0x12 -/* 8021FC14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FC18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FC1C 98 03 5E 1D */ stb r0, 0x5e1d(r3) -/* 8021FC20 38 00 00 00 */ li r0, 0 -/* 8021FC24 98 03 5E 43 */ stb r0, 0x5e43(r3) -/* 8021FC28 98 03 5E 24 */ stb r0, 0x5e24(r3) -/* 8021FC2C 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 8021FC30 98 03 5E 1C */ stb r0, 0x5e1c(r3) -/* 8021FC34 98 03 5E 42 */ stb r0, 0x5e42(r3) -/* 8021FC38 48 00 00 A8 */ b lbl_8021FCE0 -/* 8021FC3C 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FC40 64 00 04 00 */ oris r0, r0, 0x400 -/* 8021FC44 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FC48 38 00 00 12 */ li r0, 0x12 -/* 8021FC4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FC50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FC54 98 03 5E 1D */ stb r0, 0x5e1d(r3) -/* 8021FC58 38 00 00 00 */ li r0, 0 -/* 8021FC5C 98 03 5E 43 */ stb r0, 0x5e43(r3) -/* 8021FC60 98 03 5E 24 */ stb r0, 0x5e24(r3) -/* 8021FC64 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 8021FC68 98 03 5E 1C */ stb r0, 0x5e1c(r3) -/* 8021FC6C 98 03 5E 42 */ stb r0, 0x5e42(r3) -/* 8021FC70 48 00 00 70 */ b lbl_8021FCE0 -/* 8021FC74 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FC78 64 00 08 00 */ oris r0, r0, 0x800 -/* 8021FC7C 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FC80 38 00 00 12 */ li r0, 0x12 -/* 8021FC84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FC88 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FC8C 98 04 5E 1D */ stb r0, 0x5e1d(r4) -/* 8021FC90 38 60 00 00 */ li r3, 0 -/* 8021FC94 98 64 5E 43 */ stb r3, 0x5e43(r4) -/* 8021FC98 38 00 00 22 */ li r0, 0x22 -/* 8021FC9C 98 04 5E 24 */ stb r0, 0x5e24(r4) -/* 8021FCA0 98 64 5E 4A */ stb r3, 0x5e4a(r4) -/* 8021FCA4 98 64 5E 1C */ stb r3, 0x5e1c(r4) -/* 8021FCA8 98 64 5E 42 */ stb r3, 0x5e42(r4) -/* 8021FCAC 48 00 00 34 */ b lbl_8021FCE0 -/* 8021FCB0 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FCB4 64 00 10 00 */ oris r0, r0, 0x1000 -/* 8021FCB8 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FCBC 38 00 00 00 */ li r0, 0 -/* 8021FCC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FCC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FCC8 98 03 5E 1D */ stb r0, 0x5e1d(r3) -/* 8021FCCC 98 03 5E 43 */ stb r0, 0x5e43(r3) -/* 8021FCD0 98 03 5E 24 */ stb r0, 0x5e24(r3) -/* 8021FCD4 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 8021FCD8 98 03 5E 1C */ stb r0, 0x5e1c(r3) -/* 8021FCDC 98 03 5E 42 */ stb r0, 0x5e42(r3) -lbl_8021FCE0: -/* 8021FCE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FCE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FCE8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8021FCEC 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8021FCF0 7D 89 03 A6 */ mtctr r12 -/* 8021FCF4 4E 80 04 21 */ bctrl -/* 8021FCF8 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8021FCFC 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f -/* 8021FD00 2C 00 00 01 */ cmpwi r0, 1 -/* 8021FD04 41 82 00 18 */ beq lbl_8021FD1C -/* 8021FD08 40 80 00 08 */ bge lbl_8021FD10 -/* 8021FD0C 48 00 00 30 */ b lbl_8021FD3C -lbl_8021FD10: -/* 8021FD10 2C 00 00 03 */ cmpwi r0, 3 -/* 8021FD14 40 80 00 28 */ bge lbl_8021FD3C -/* 8021FD18 48 00 00 14 */ b lbl_8021FD2C -lbl_8021FD1C: -/* 8021FD1C 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FD20 60 00 00 04 */ ori r0, r0, 4 -/* 8021FD24 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FD28 48 00 00 20 */ b lbl_8021FD48 -lbl_8021FD2C: -/* 8021FD2C 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FD30 60 00 00 02 */ ori r0, r0, 2 -/* 8021FD34 90 1F 01 24 */ stw r0, 0x124(r31) -/* 8021FD38 48 00 00 10 */ b lbl_8021FD48 -lbl_8021FD3C: -/* 8021FD3C 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8021FD40 60 00 00 01 */ ori r0, r0, 1 -/* 8021FD44 90 1F 01 24 */ stw r0, 0x124(r31) -lbl_8021FD48: -/* 8021FD48 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021FD4C 48 14 24 DD */ bl _restgpr_29 -/* 8021FD50 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8021FD54 7C 08 03 A6 */ mtlr r0 -/* 8021FD58 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021FD5C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/checkSubContents__9dMeter2_cFv.s b/asm/d/meter/d_meter2/checkSubContents__9dMeter2_cFv.s deleted file mode 100644 index 3ef707bba3..0000000000 --- a/asm/d/meter/d_meter2/checkSubContents__9dMeter2_cFv.s +++ /dev/null @@ -1,279 +0,0 @@ -lbl_802237D4: -/* 802237D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802237D8 7C 08 02 A6 */ mflr r0 -/* 802237DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802237E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802237E4 93 C1 00 08 */ stw r30, 8(r1) -/* 802237E8 7C 7F 1B 78 */ mr r31, r3 -/* 802237EC 80 83 01 24 */ lwz r4, 0x124(r3) -/* 802237F0 54 80 06 31 */ rlwinm. r0, r4, 0, 0x18, 0x18 -/* 802237F4 41 82 00 44 */ beq lbl_80223838 -/* 802237F8 38 80 00 04 */ li r4, 4 -/* 802237FC 48 00 20 A5 */ bl killSubContents__9dMeter2_cFUc -/* 80223800 88 1F 01 E5 */ lbz r0, 0x1e5(r31) -/* 80223804 28 00 00 00 */ cmplwi r0, 0 -/* 80223808 40 82 03 A4 */ bne lbl_80223BAC -/* 8022380C 38 60 00 90 */ li r3, 0x90 -/* 80223810 48 0A B4 3D */ bl __nw__FUl -/* 80223814 7C 60 1B 79 */ or. r0, r3, r3 -/* 80223818 41 82 00 10 */ beq lbl_80223828 -/* 8022381C 38 80 00 00 */ li r4, 0 -/* 80223820 4B F6 FE 71 */ bl __ct__8dScope_cFUc -/* 80223824 7C 60 1B 78 */ mr r0, r3 -lbl_80223828: -/* 80223828 90 1F 01 10 */ stw r0, 0x110(r31) -/* 8022382C 38 00 00 04 */ li r0, 4 -/* 80223830 98 1F 01 E5 */ stb r0, 0x1e5(r31) -/* 80223834 48 00 03 78 */ b lbl_80223BAC -lbl_80223838: -/* 80223838 54 80 01 8D */ rlwinm. r0, r4, 0, 6, 6 -/* 8022383C 41 82 00 A4 */ beq lbl_802238E0 -/* 80223840 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80223844 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80223848 3B C3 4E 00 */ addi r30, r3, 0x4e00 -/* 8022384C 7F C3 F3 78 */ mr r3, r30 -/* 80223850 3C 80 80 3A */ lis r4, d_meter_d_meter2__stringBase0@ha /* 0x80399338@ha */ -/* 80223854 38 84 93 38 */ addi r4, r4, d_meter_d_meter2__stringBase0@l /* 0x80399338@l */ -/* 80223858 38 84 00 07 */ addi r4, r4, 7 -/* 8022385C 48 14 51 39 */ bl strcmp -/* 80223860 2C 03 00 00 */ cmpwi r3, 0 -/* 80223864 41 82 00 7C */ beq lbl_802238E0 -/* 80223868 7F C3 F3 78 */ mr r3, r30 -/* 8022386C 3C 80 80 3A */ lis r4, d_meter_d_meter2__stringBase0@ha /* 0x80399338@ha */ -/* 80223870 38 84 93 38 */ addi r4, r4, d_meter_d_meter2__stringBase0@l /* 0x80399338@l */ -/* 80223874 48 14 51 21 */ bl strcmp -/* 80223878 2C 03 00 00 */ cmpwi r3, 0 -/* 8022387C 40 82 00 14 */ bne lbl_80223890 -/* 80223880 38 60 00 00 */ li r3, 0 -/* 80223884 4B E0 90 F9 */ bl getLayerNo__14dComIfG_play_cFi -/* 80223888 2C 03 00 05 */ cmpwi r3, 5 -/* 8022388C 41 82 00 54 */ beq lbl_802238E0 -lbl_80223890: -/* 80223890 7F E3 FB 78 */ mr r3, r31 -/* 80223894 38 80 00 01 */ li r4, 1 -/* 80223898 48 00 20 09 */ bl killSubContents__9dMeter2_cFUc -/* 8022389C 88 1F 01 E5 */ lbz r0, 0x1e5(r31) -/* 802238A0 28 00 00 00 */ cmplwi r0, 0 -/* 802238A4 40 82 03 08 */ bne lbl_80223BAC -/* 802238A8 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 802238AC 48 0A AE D9 */ bl getTotalFreeSize__7JKRHeapFv -/* 802238B0 38 60 01 18 */ li r3, 0x118 -/* 802238B4 48 0A B3 99 */ bl __nw__FUl -/* 802238B8 7C 60 1B 79 */ or. r0, r3, r3 -/* 802238BC 41 82 00 14 */ beq lbl_802238D0 -/* 802238C0 80 9F 01 0C */ lwz r4, 0x10c(r31) -/* 802238C4 80 84 00 78 */ lwz r4, 0x78(r4) -/* 802238C8 4B FE 8A 59 */ bl __ct__15dMeterHakusha_cFPv -/* 802238CC 7C 60 1B 78 */ mr r0, r3 -lbl_802238D0: -/* 802238D0 90 1F 01 10 */ stw r0, 0x110(r31) -/* 802238D4 38 00 00 01 */ li r0, 1 -/* 802238D8 98 1F 01 E5 */ stb r0, 0x1e5(r31) -/* 802238DC 48 00 02 D0 */ b lbl_80223BAC -lbl_802238E0: -/* 802238E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802238E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802238E8 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 802238EC 38 00 00 00 */ li r0, 0 -/* 802238F0 88 63 05 6A */ lbz r3, 0x56a(r3) -/* 802238F4 28 03 00 00 */ cmplwi r3, 0 -/* 802238F8 41 82 00 10 */ beq lbl_80223908 -/* 802238FC 28 03 00 26 */ cmplwi r3, 0x26 -/* 80223900 40 80 00 08 */ bge lbl_80223908 -/* 80223904 38 00 00 01 */ li r0, 1 -lbl_80223908: -/* 80223908 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8022390C 41 82 00 80 */ beq lbl_8022398C -/* 80223910 7F E3 FB 78 */ mr r3, r31 -/* 80223914 38 80 00 05 */ li r4, 5 -/* 80223918 48 00 1F 89 */ bl killSubContents__9dMeter2_cFUc -/* 8022391C 88 1F 01 E5 */ lbz r0, 0x1e5(r31) -/* 80223920 28 00 00 00 */ cmplwi r0, 0 -/* 80223924 40 82 02 88 */ bne lbl_80223BAC -/* 80223928 38 60 00 2C */ li r3, 0x2c -/* 8022392C 48 0A B3 21 */ bl __nw__FUl -/* 80223930 7C 60 1B 79 */ or. r0, r3, r3 -/* 80223934 41 82 00 10 */ beq lbl_80223944 -/* 80223938 38 80 00 00 */ li r4, 0 -/* 8022393C 4B FE 75 51 */ bl __ct__14dMeterHaihai_cFUc -/* 80223940 7C 60 1B 78 */ mr r0, r3 -lbl_80223944: -/* 80223944 90 1F 01 10 */ stw r0, 0x110(r31) -/* 80223948 38 60 00 40 */ li r3, 0x40 -/* 8022394C 48 0A B3 01 */ bl __nw__FUl -/* 80223950 7C 60 1B 79 */ or. r0, r3, r3 -/* 80223954 41 82 00 18 */ beq lbl_8022396C -/* 80223958 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 8022395C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 80223960 80 84 00 8C */ lwz r4, 0x8c(r4) -/* 80223964 4B FE B3 FD */ bl __ct__14dMeterString_cFi -/* 80223968 7C 60 1B 78 */ mr r0, r3 -lbl_8022396C: -/* 8022396C 90 1F 01 14 */ stw r0, 0x114(r31) -/* 80223970 38 00 00 05 */ li r0, 5 -/* 80223974 98 1F 01 E5 */ stb r0, 0x1e5(r31) -/* 80223978 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8022397C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80223980 80 03 00 8C */ lwz r0, 0x8c(r3) -/* 80223984 B0 1F 01 B6 */ sth r0, 0x1b6(r31) -/* 80223988 48 00 02 24 */ b lbl_80223BAC -lbl_8022398C: -/* 8022398C 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 80223990 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 -/* 80223994 41 82 00 48 */ beq lbl_802239DC -/* 80223998 7F E3 FB 78 */ mr r3, r31 -/* 8022399C 38 80 00 02 */ li r4, 2 -/* 802239A0 48 00 1F 01 */ bl killSubContents__9dMeter2_cFUc -/* 802239A4 88 1F 01 E5 */ lbz r0, 0x1e5(r31) -/* 802239A8 28 00 00 00 */ cmplwi r0, 0 -/* 802239AC 40 82 02 00 */ bne lbl_80223BAC -/* 802239B0 38 60 00 2C */ li r3, 0x2c -/* 802239B4 48 0A B2 99 */ bl __nw__FUl -/* 802239B8 7C 60 1B 79 */ or. r0, r3, r3 -/* 802239BC 41 82 00 10 */ beq lbl_802239CC -/* 802239C0 38 80 00 00 */ li r4, 0 -/* 802239C4 4B FE 74 C9 */ bl __ct__14dMeterHaihai_cFUc -/* 802239C8 7C 60 1B 78 */ mr r0, r3 -lbl_802239CC: -/* 802239CC 90 1F 01 10 */ stw r0, 0x110(r31) -/* 802239D0 38 00 00 02 */ li r0, 2 -/* 802239D4 98 1F 01 E5 */ stb r0, 0x1e5(r31) -/* 802239D8 48 00 01 D4 */ b lbl_80223BAC -lbl_802239DC: -/* 802239DC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802239E0 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802239E4 80 1E 00 8C */ lwz r0, 0x8c(r30) -/* 802239E8 2C 00 00 00 */ cmpwi r0, 0 -/* 802239EC 41 82 00 48 */ beq lbl_80223A34 -/* 802239F0 7F E3 FB 78 */ mr r3, r31 -/* 802239F4 38 80 00 03 */ li r4, 3 -/* 802239F8 48 00 1E A9 */ bl killSubContents__9dMeter2_cFUc -/* 802239FC 88 1F 01 E5 */ lbz r0, 0x1e5(r31) -/* 80223A00 28 00 00 00 */ cmplwi r0, 0 -/* 80223A04 40 82 01 A8 */ bne lbl_80223BAC -/* 80223A08 38 60 00 40 */ li r3, 0x40 -/* 80223A0C 48 0A B2 41 */ bl __nw__FUl -/* 80223A10 7C 60 1B 79 */ or. r0, r3, r3 -/* 80223A14 41 82 00 10 */ beq lbl_80223A24 -/* 80223A18 80 9E 00 8C */ lwz r4, 0x8c(r30) -/* 80223A1C 4B FE B3 45 */ bl __ct__14dMeterString_cFi -/* 80223A20 7C 60 1B 78 */ mr r0, r3 -lbl_80223A24: -/* 80223A24 90 1F 01 10 */ stw r0, 0x110(r31) -/* 80223A28 38 00 00 03 */ li r0, 3 -/* 80223A2C 98 1F 01 E5 */ stb r0, 0x1e5(r31) -/* 80223A30 48 00 01 7C */ b lbl_80223BAC -lbl_80223A34: -/* 80223A34 88 1F 01 E5 */ lbz r0, 0x1e5(r31) -/* 80223A38 28 00 00 04 */ cmplwi r0, 4 -/* 80223A3C 40 82 00 E8 */ bne lbl_80223B24 -/* 80223A40 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 80223A44 28 03 00 00 */ cmplwi r3, 0 -/* 80223A48 40 82 00 10 */ bne lbl_80223A58 -/* 80223A4C 80 1F 01 14 */ lwz r0, 0x114(r31) -/* 80223A50 28 00 00 00 */ cmplwi r0, 0 -/* 80223A54 41 82 00 C4 */ beq lbl_80223B18 -lbl_80223A58: -/* 80223A58 3B C0 00 00 */ li r30, 0 -/* 80223A5C 28 03 00 00 */ cmplwi r3, 0 -/* 80223A60 41 82 00 48 */ beq lbl_80223AA8 -/* 80223A64 81 83 00 00 */ lwz r12, 0(r3) -/* 80223A68 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80223A6C 7D 89 03 A6 */ mtctr r12 -/* 80223A70 4E 80 04 21 */ bctrl -/* 80223A74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80223A78 41 82 00 30 */ beq lbl_80223AA8 -/* 80223A7C 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 80223A80 28 03 00 00 */ cmplwi r3, 0 -/* 80223A84 41 82 00 18 */ beq lbl_80223A9C -/* 80223A88 38 80 00 01 */ li r4, 1 -/* 80223A8C 81 83 00 00 */ lwz r12, 0(r3) -/* 80223A90 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80223A94 7D 89 03 A6 */ mtctr r12 -/* 80223A98 4E 80 04 21 */ bctrl -lbl_80223A9C: -/* 80223A9C 38 00 00 00 */ li r0, 0 -/* 80223AA0 90 1F 01 10 */ stw r0, 0x110(r31) -/* 80223AA4 3B C0 00 01 */ li r30, 1 -lbl_80223AA8: -/* 80223AA8 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 80223AAC 28 03 00 00 */ cmplwi r3, 0 -/* 80223AB0 41 82 00 48 */ beq lbl_80223AF8 -/* 80223AB4 81 83 00 00 */ lwz r12, 0(r3) -/* 80223AB8 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80223ABC 7D 89 03 A6 */ mtctr r12 -/* 80223AC0 4E 80 04 21 */ bctrl -/* 80223AC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80223AC8 41 82 00 30 */ beq lbl_80223AF8 -/* 80223ACC 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 80223AD0 28 03 00 00 */ cmplwi r3, 0 -/* 80223AD4 41 82 00 18 */ beq lbl_80223AEC -/* 80223AD8 38 80 00 01 */ li r4, 1 -/* 80223ADC 81 83 00 00 */ lwz r12, 0(r3) -/* 80223AE0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80223AE4 7D 89 03 A6 */ mtctr r12 -/* 80223AE8 4E 80 04 21 */ bctrl -lbl_80223AEC: -/* 80223AEC 38 00 00 00 */ li r0, 0 -/* 80223AF0 90 1F 01 14 */ stw r0, 0x114(r31) -/* 80223AF4 3B C0 00 01 */ li r30, 1 -lbl_80223AF8: -/* 80223AF8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80223AFC 41 82 00 B0 */ beq lbl_80223BAC -/* 80223B00 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 80223B04 48 0A AA C9 */ bl freeAll__7JKRHeapFv -/* 80223B08 38 00 00 00 */ li r0, 0 -/* 80223B0C 98 1F 01 E5 */ stb r0, 0x1e5(r31) -/* 80223B10 B0 1F 01 B6 */ sth r0, 0x1b6(r31) -/* 80223B14 48 00 00 98 */ b lbl_80223BAC -lbl_80223B18: -/* 80223B18 38 00 00 00 */ li r0, 0 -/* 80223B1C 98 1F 01 E5 */ stb r0, 0x1e5(r31) -/* 80223B20 48 00 00 8C */ b lbl_80223BAC -lbl_80223B24: -/* 80223B24 28 00 00 00 */ cmplwi r0, 0 -/* 80223B28 41 82 00 84 */ beq lbl_80223BAC -/* 80223B2C 38 00 00 00 */ li r0, 0 -/* 80223B30 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 80223B34 28 03 00 00 */ cmplwi r3, 0 -/* 80223B38 41 82 00 28 */ beq lbl_80223B60 -/* 80223B3C 41 82 00 18 */ beq lbl_80223B54 -/* 80223B40 38 80 00 01 */ li r4, 1 -/* 80223B44 81 83 00 00 */ lwz r12, 0(r3) -/* 80223B48 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80223B4C 7D 89 03 A6 */ mtctr r12 -/* 80223B50 4E 80 04 21 */ bctrl -lbl_80223B54: -/* 80223B54 38 00 00 00 */ li r0, 0 -/* 80223B58 90 1F 01 10 */ stw r0, 0x110(r31) -/* 80223B5C 38 00 00 01 */ li r0, 1 -lbl_80223B60: -/* 80223B60 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 80223B64 28 03 00 00 */ cmplwi r3, 0 -/* 80223B68 41 82 00 28 */ beq lbl_80223B90 -/* 80223B6C 41 82 00 18 */ beq lbl_80223B84 -/* 80223B70 38 80 00 01 */ li r4, 1 -/* 80223B74 81 83 00 00 */ lwz r12, 0(r3) -/* 80223B78 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80223B7C 7D 89 03 A6 */ mtctr r12 -/* 80223B80 4E 80 04 21 */ bctrl -lbl_80223B84: -/* 80223B84 38 00 00 00 */ li r0, 0 -/* 80223B88 90 1F 01 14 */ stw r0, 0x114(r31) -/* 80223B8C 38 00 00 01 */ li r0, 1 -lbl_80223B90: -/* 80223B90 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80223B94 41 82 00 0C */ beq lbl_80223BA0 -/* 80223B98 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 80223B9C 48 0A AA 31 */ bl freeAll__7JKRHeapFv -lbl_80223BA0: -/* 80223BA0 38 00 00 00 */ li r0, 0 -/* 80223BA4 98 1F 01 E5 */ stb r0, 0x1e5(r31) -/* 80223BA8 B0 1F 01 B6 */ sth r0, 0x1b6(r31) -lbl_80223BAC: -/* 80223BAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80223BB0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80223BB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80223BB8 7C 08 03 A6 */ mtlr r0 -/* 80223BBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80223BC0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/isKeyVisible__9dMeter2_cFv.s b/asm/d/meter/d_meter2/isKeyVisible__9dMeter2_cFv.s deleted file mode 100644 index 92d5ec8928..0000000000 --- a/asm/d/meter/d_meter2/isKeyVisible__9dMeter2_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80225960: -/* 80225960 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80225964 7C 08 02 A6 */ mflr r0 -/* 80225968 90 01 00 14 */ stw r0, 0x14(r1) -/* 8022596C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80225970 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80225974 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80225978 3B E3 4E 20 */ addi r31, r3, 0x4e20 -/* 8022597C 7F E3 FB 78 */ mr r3, r31 -/* 80225980 81 9F 00 00 */ lwz r12, 0(r31) -/* 80225984 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 80225988 7D 89 03 A6 */ mtctr r12 -/* 8022598C 4E 80 04 21 */ bctrl -/* 80225990 88 03 00 09 */ lbz r0, 9(r3) -/* 80225994 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80225998 41 82 00 48 */ beq lbl_802259E0 -/* 8022599C 7F E3 FB 78 */ mr r3, r31 -/* 802259A0 81 9F 00 00 */ lwz r12, 0(r31) -/* 802259A4 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 802259A8 7D 89 03 A6 */ mtctr r12 -/* 802259AC 4E 80 04 21 */ bctrl -/* 802259B0 80 03 00 0C */ lwz r0, 0xc(r3) -/* 802259B4 54 00 87 7F */ rlwinm. r0, r0, 0x10, 0x1d, 0x1f -/* 802259B8 40 82 00 20 */ bne lbl_802259D8 -/* 802259BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802259C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802259C4 88 63 09 74 */ lbz r3, 0x974(r3) -/* 802259C8 30 03 FF FF */ addic r0, r3, -1 -/* 802259CC 7C 00 19 10 */ subfe r0, r0, r3 -/* 802259D0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 802259D4 48 00 00 10 */ b lbl_802259E4 -lbl_802259D8: -/* 802259D8 38 60 00 01 */ li r3, 1 -/* 802259DC 48 00 00 08 */ b lbl_802259E4 -lbl_802259E0: -/* 802259E0 38 60 00 00 */ li r3, 0 -lbl_802259E4: -/* 802259E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802259E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802259EC 7C 08 03 A6 */ mtlr r0 -/* 802259F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802259F4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/move2DContents__9dMeter2_cFv.s b/asm/d/meter/d_meter2/move2DContents__9dMeter2_cFv.s deleted file mode 100644 index e09a2d8b96..0000000000 --- a/asm/d/meter/d_meter2/move2DContents__9dMeter2_cFv.s +++ /dev/null @@ -1,405 +0,0 @@ -lbl_802231C8: -/* 802231C8 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 802231CC 7C 08 02 A6 */ mflr r0 -/* 802231D0 90 01 00 84 */ stw r0, 0x84(r1) -/* 802231D4 39 61 00 80 */ addi r11, r1, 0x80 -/* 802231D8 48 13 EF DD */ bl _savegpr_19 -/* 802231DC 7C 7F 1B 78 */ mr r31, r3 -/* 802231E0 38 00 00 00 */ li r0, 0 -/* 802231E4 98 03 02 01 */ stb r0, 0x201(r3) -/* 802231E8 90 03 01 08 */ stw r0, 0x108(r3) -/* 802231EC 38 60 00 08 */ li r3, 8 -/* 802231F0 4B E0 B1 E1 */ bl dComIfGp_getSubHeap2D__Fi -/* 802231F4 28 03 00 00 */ cmplwi r3, 0 -/* 802231F8 41 82 00 0C */ beq lbl_80223204 -/* 802231FC 4B DE BF D1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 80223200 90 7F 01 08 */ stw r3, 0x108(r31) -lbl_80223204: -/* 80223204 7F E3 FB 78 */ mr r3, r31 -/* 80223208 48 00 09 BD */ bl check2DContents__9dMeter2_cFv -/* 8022320C 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 80223210 28 04 00 00 */ cmplwi r4, 0 -/* 80223214 41 82 05 98 */ beq lbl_802237AC -/* 80223218 3A 60 00 00 */ li r19, 0 -/* 8022321C 3B 60 00 00 */ li r27, 0 -/* 80223220 3A 80 00 00 */ li r20, 0 -/* 80223224 3B 80 00 00 */ li r28, 0 -/* 80223228 3A A0 00 00 */ li r21, 0 -/* 8022322C 3A C0 00 00 */ li r22, 0 -/* 80223230 3A E0 00 00 */ li r23, 0 -/* 80223234 3B 00 00 00 */ li r24, 0 -/* 80223238 3B 20 00 00 */ li r25, 0 -/* 8022323C 3B A0 00 00 */ li r29, 0 -/* 80223240 3B 40 00 00 */ li r26, 0 -/* 80223244 3B C0 00 02 */ li r30, 2 -/* 80223248 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8022324C 88 03 07 67 */ lbz r0, 0x767(r3) -/* 80223250 20 00 00 07 */ subfic r0, r0, 7 -/* 80223254 7C 00 00 34 */ cntlzw r0, r0 -/* 80223258 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 8022325C 41 82 00 40 */ beq lbl_8022329C -/* 80223260 A8 04 04 90 */ lha r0, 0x490(r4) -/* 80223264 2C 00 00 00 */ cmpwi r0, 0 -/* 80223268 41 81 00 34 */ bgt lbl_8022329C -/* 8022326C 88 9F 01 CC */ lbz r4, 0x1cc(r31) -/* 80223270 38 A0 00 00 */ li r5, 0 -/* 80223274 38 C0 00 00 */ li r6, 0 -/* 80223278 4B FF 70 7D */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 8022327C 7C 64 1B 78 */ mr r4, r3 -/* 80223280 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223284 38 A0 00 06 */ li r5, 6 -/* 80223288 38 C0 00 00 */ li r6, 0 -/* 8022328C 38 E0 00 00 */ li r7, 0 -/* 80223290 4B FE 63 31 */ bl setString__14dMeterButton_cFPcUcUcUc -/* 80223294 3A E0 00 01 */ li r23, 1 -/* 80223298 3B C0 00 00 */ li r30, 0 -lbl_8022329C: -/* 8022329C 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802232A0 88 03 07 62 */ lbz r0, 0x762(r3) -/* 802232A4 20 00 00 07 */ subfic r0, r0, 7 -/* 802232A8 7C 00 00 34 */ cntlzw r0, r0 -/* 802232AC 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802232B0 41 82 00 58 */ beq lbl_80223308 -/* 802232B4 88 03 07 65 */ lbz r0, 0x765(r3) -/* 802232B8 28 00 00 07 */ cmplwi r0, 7 -/* 802232BC 40 82 00 4C */ bne lbl_80223308 -/* 802232C0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802232C4 41 82 00 44 */ beq lbl_80223308 -/* 802232C8 88 9F 01 C5 */ lbz r4, 0x1c5(r31) -/* 802232CC 88 1F 01 CA */ lbz r0, 0x1ca(r31) -/* 802232D0 7C 04 00 40 */ cmplw r4, r0 -/* 802232D4 40 82 00 34 */ bne lbl_80223308 -/* 802232D8 38 A0 00 00 */ li r5, 0 -/* 802232DC 38 C0 00 00 */ li r6, 0 -/* 802232E0 4B FF 70 15 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 802232E4 7C 64 1B 78 */ mr r4, r3 -/* 802232E8 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 802232EC 38 A0 00 0D */ li r5, 0xd -/* 802232F0 20 1E 00 02 */ subfic r0, r30, 2 -/* 802232F4 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 802232F8 38 E0 00 00 */ li r7, 0 -/* 802232FC 4B FE 62 C5 */ bl setString__14dMeterButton_cFPcUcUcUc -/* 80223300 3B A0 00 01 */ li r29, 1 -/* 80223304 3B DE FF FE */ addi r30, r30, -2 -lbl_80223308: -/* 80223308 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 8022330C 40 82 00 68 */ bne lbl_80223374 -/* 80223310 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80223314 88 03 07 65 */ lbz r0, 0x765(r3) -/* 80223318 20 00 00 07 */ subfic r0, r0, 7 -/* 8022331C 7C 00 00 34 */ cntlzw r0, r0 -/* 80223320 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 80223324 41 82 00 50 */ beq lbl_80223374 -/* 80223328 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8022332C 41 82 00 48 */ beq lbl_80223374 -/* 80223330 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 80223334 A8 04 04 8C */ lha r0, 0x48c(r4) -/* 80223338 2C 00 00 00 */ cmpwi r0, 0 -/* 8022333C 41 81 00 38 */ bgt lbl_80223374 -/* 80223340 88 9F 01 CA */ lbz r4, 0x1ca(r31) -/* 80223344 38 A0 00 00 */ li r5, 0 -/* 80223348 38 C0 00 00 */ li r6, 0 -/* 8022334C 4B FF 6F A9 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 80223350 7C 64 1B 78 */ mr r4, r3 -/* 80223354 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223358 38 A0 00 04 */ li r5, 4 -/* 8022335C 20 1E 00 02 */ subfic r0, r30, 2 -/* 80223360 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80223364 38 E0 00 00 */ li r7, 0 -/* 80223368 4B FE 62 59 */ bl setString__14dMeterButton_cFPcUcUcUc -/* 8022336C 3A A0 00 01 */ li r21, 1 -/* 80223370 3B DE FF FF */ addi r30, r30, -1 -lbl_80223374: -/* 80223374 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80223378 88 03 07 66 */ lbz r0, 0x766(r3) -/* 8022337C 20 00 00 07 */ subfic r0, r0, 7 -/* 80223380 7C 00 00 34 */ cntlzw r0, r0 -/* 80223384 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 80223388 41 82 00 50 */ beq lbl_802233D8 -/* 8022338C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80223390 41 82 00 48 */ beq lbl_802233D8 -/* 80223394 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 80223398 A8 04 04 8E */ lha r0, 0x48e(r4) -/* 8022339C 2C 00 00 00 */ cmpwi r0, 0 -/* 802233A0 41 81 00 38 */ bgt lbl_802233D8 -/* 802233A4 88 9F 01 CB */ lbz r4, 0x1cb(r31) -/* 802233A8 38 A0 00 00 */ li r5, 0 -/* 802233AC 38 C0 00 00 */ li r6, 0 -/* 802233B0 4B FF 6F 45 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 802233B4 7C 64 1B 78 */ mr r4, r3 -/* 802233B8 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 802233BC 38 A0 00 05 */ li r5, 5 -/* 802233C0 20 1E 00 02 */ subfic r0, r30, 2 -/* 802233C4 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 802233C8 38 E0 00 00 */ li r7, 0 -/* 802233CC 4B FE 61 F5 */ bl setString__14dMeterButton_cFPcUcUcUc -/* 802233D0 3A C0 00 01 */ li r22, 1 -/* 802233D4 3B DE FF FF */ addi r30, r30, -1 -lbl_802233D8: -/* 802233D8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 802233DC 40 82 00 74 */ bne lbl_80223450 -/* 802233E0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802233E4 88 03 07 62 */ lbz r0, 0x762(r3) -/* 802233E8 20 00 00 07 */ subfic r0, r0, 7 -/* 802233EC 7C 00 00 34 */ cntlzw r0, r0 -/* 802233F0 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802233F4 41 82 00 5C */ beq lbl_80223450 -/* 802233F8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802233FC 41 82 00 54 */ beq lbl_80223450 -/* 80223400 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 80223404 A8 04 04 86 */ lha r0, 0x486(r4) -/* 80223408 2C 00 00 00 */ cmpwi r0, 0 -/* 8022340C 41 81 00 44 */ bgt lbl_80223450 -/* 80223410 88 9F 01 C5 */ lbz r4, 0x1c5(r31) -/* 80223414 20 04 00 4F */ subfic r0, r4, 0x4f -/* 80223418 7C 00 00 34 */ cntlzw r0, r0 -/* 8022341C 54 1B D9 7E */ srwi r27, r0, 5 -/* 80223420 38 A0 00 00 */ li r5, 0 -/* 80223424 38 C0 00 00 */ li r6, 0 -/* 80223428 4B FF 6E CD */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 8022342C 7C 64 1B 78 */ mr r4, r3 -/* 80223430 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223434 38 A0 00 01 */ li r5, 1 -/* 80223438 20 1E 00 02 */ subfic r0, r30, 2 -/* 8022343C 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80223440 57 67 06 3E */ clrlwi r7, r27, 0x18 -/* 80223444 4B FE 61 7D */ bl setString__14dMeterButton_cFPcUcUcUc -/* 80223448 3B 60 00 01 */ li r27, 1 -/* 8022344C 3B DE FF FF */ addi r30, r30, -1 -lbl_80223450: -/* 80223450 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80223454 88 03 07 69 */ lbz r0, 0x769(r3) -/* 80223458 20 00 00 07 */ subfic r0, r0, 7 -/* 8022345C 7C 00 00 34 */ cntlzw r0, r0 -/* 80223460 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 80223464 41 82 00 50 */ beq lbl_802234B4 -/* 80223468 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8022346C 41 82 00 48 */ beq lbl_802234B4 -/* 80223470 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 80223474 A8 04 04 94 */ lha r0, 0x494(r4) -/* 80223478 2C 00 00 00 */ cmpwi r0, 0 -/* 8022347C 41 81 00 38 */ bgt lbl_802234B4 -/* 80223480 88 9F 01 D5 */ lbz r4, 0x1d5(r31) -/* 80223484 38 A0 00 00 */ li r5, 0 -/* 80223488 38 C0 00 00 */ li r6, 0 -/* 8022348C 4B FF 6E 69 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 80223490 7C 64 1B 78 */ mr r4, r3 -/* 80223494 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223498 38 A0 00 08 */ li r5, 8 -/* 8022349C 20 1E 00 02 */ subfic r0, r30, 2 -/* 802234A0 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 802234A4 38 E0 00 00 */ li r7, 0 -/* 802234A8 4B FE 61 19 */ bl setString__14dMeterButton_cFPcUcUcUc -/* 802234AC 3B 20 00 01 */ li r25, 1 -/* 802234B0 3B DE FF FF */ addi r30, r30, -1 -lbl_802234B4: -/* 802234B4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802234B8 88 03 07 61 */ lbz r0, 0x761(r3) -/* 802234BC 20 00 00 07 */ subfic r0, r0, 7 -/* 802234C0 7C 00 00 34 */ cntlzw r0, r0 -/* 802234C4 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802234C8 41 82 00 50 */ beq lbl_80223518 -/* 802234CC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802234D0 41 82 00 48 */ beq lbl_80223518 -/* 802234D4 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 802234D8 A8 04 04 84 */ lha r0, 0x484(r4) -/* 802234DC 2C 00 00 00 */ cmpwi r0, 0 -/* 802234E0 41 81 00 38 */ bgt lbl_80223518 -/* 802234E4 88 9F 01 C4 */ lbz r4, 0x1c4(r31) -/* 802234E8 38 A0 00 00 */ li r5, 0 -/* 802234EC 38 C0 00 00 */ li r6, 0 -/* 802234F0 4B FF 6E 05 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 802234F4 7C 64 1B 78 */ mr r4, r3 -/* 802234F8 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 802234FC 38 A0 00 00 */ li r5, 0 -/* 80223500 20 1E 00 02 */ subfic r0, r30, 2 -/* 80223504 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80223508 38 E0 00 00 */ li r7, 0 -/* 8022350C 4B FE 60 B5 */ bl setString__14dMeterButton_cFPcUcUcUc -/* 80223510 3A 60 00 01 */ li r19, 1 -/* 80223514 3B DE FF FF */ addi r30, r30, -1 -lbl_80223518: -/* 80223518 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8022351C 88 03 07 64 */ lbz r0, 0x764(r3) -/* 80223520 20 00 00 07 */ subfic r0, r0, 7 -/* 80223524 7C 00 00 34 */ cntlzw r0, r0 -/* 80223528 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 8022352C 41 82 00 88 */ beq lbl_802235B4 -/* 80223530 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80223534 41 82 00 80 */ beq lbl_802235B4 -/* 80223538 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 8022353C A8 04 04 8A */ lha r0, 0x48a(r4) -/* 80223540 2C 00 00 00 */ cmpwi r0, 0 -/* 80223544 41 81 00 70 */ bgt lbl_802235B4 -/* 80223548 88 9F 01 C9 */ lbz r4, 0x1c9(r31) -/* 8022354C 28 04 00 08 */ cmplwi r4, 8 -/* 80223550 40 82 00 34 */ bne lbl_80223584 -/* 80223554 38 80 00 64 */ li r4, 0x64 -/* 80223558 38 A0 00 00 */ li r5, 0 -/* 8022355C 38 C0 00 00 */ li r6, 0 -/* 80223560 4B FF 6D 95 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 80223564 7C 64 1B 78 */ mr r4, r3 -/* 80223568 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 8022356C 38 A0 00 03 */ li r5, 3 -/* 80223570 20 1E 00 02 */ subfic r0, r30, 2 -/* 80223574 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80223578 38 E0 00 00 */ li r7, 0 -/* 8022357C 4B FE 60 45 */ bl setString__14dMeterButton_cFPcUcUcUc -/* 80223580 48 00 00 2C */ b lbl_802235AC -lbl_80223584: -/* 80223584 38 A0 00 00 */ li r5, 0 -/* 80223588 38 C0 00 00 */ li r6, 0 -/* 8022358C 4B FF 6D 69 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 80223590 7C 64 1B 78 */ mr r4, r3 -/* 80223594 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223598 38 A0 00 03 */ li r5, 3 -/* 8022359C 20 1E 00 02 */ subfic r0, r30, 2 -/* 802235A0 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 802235A4 38 E0 00 00 */ li r7, 0 -/* 802235A8 4B FE 60 19 */ bl setString__14dMeterButton_cFPcUcUcUc -lbl_802235AC: -/* 802235AC 3B 80 00 01 */ li r28, 1 -/* 802235B0 3B DE FF FF */ addi r30, r30, -1 -lbl_802235B4: -/* 802235B4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802235B8 88 03 07 6A */ lbz r0, 0x76a(r3) -/* 802235BC 20 00 00 07 */ subfic r0, r0, 7 -/* 802235C0 7C 00 00 34 */ cntlzw r0, r0 -/* 802235C4 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802235C8 41 82 00 50 */ beq lbl_80223618 -/* 802235CC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802235D0 41 82 00 48 */ beq lbl_80223618 -/* 802235D4 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 802235D8 A8 04 04 88 */ lha r0, 0x488(r4) -/* 802235DC 2C 00 00 00 */ cmpwi r0, 0 -/* 802235E0 41 81 00 38 */ bgt lbl_80223618 -/* 802235E4 88 9F 01 C8 */ lbz r4, 0x1c8(r31) -/* 802235E8 38 A0 00 00 */ li r5, 0 -/* 802235EC 38 C0 00 00 */ li r6, 0 -/* 802235F0 4B FF 6D 05 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 802235F4 7C 64 1B 78 */ mr r4, r3 -/* 802235F8 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 802235FC 38 A0 00 02 */ li r5, 2 -/* 80223600 20 1E 00 02 */ subfic r0, r30, 2 -/* 80223604 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80223608 38 E0 00 00 */ li r7, 0 -/* 8022360C 4B FE 5F B5 */ bl setString__14dMeterButton_cFPcUcUcUc -/* 80223610 3A 80 00 01 */ li r20, 1 -/* 80223614 3B DE FF FF */ addi r30, r30, -1 -lbl_80223618: -/* 80223618 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8022361C 88 03 07 68 */ lbz r0, 0x768(r3) -/* 80223620 20 00 00 07 */ subfic r0, r0, 7 -/* 80223624 7C 00 00 34 */ cntlzw r0, r0 -/* 80223628 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 8022362C 41 82 00 50 */ beq lbl_8022367C -/* 80223630 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80223634 41 82 00 48 */ beq lbl_8022367C -/* 80223638 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 8022363C A8 04 04 92 */ lha r0, 0x492(r4) -/* 80223640 2C 00 00 00 */ cmpwi r0, 0 -/* 80223644 41 81 00 38 */ bgt lbl_8022367C -/* 80223648 88 9F 01 D3 */ lbz r4, 0x1d3(r31) -/* 8022364C 38 A0 00 00 */ li r5, 0 -/* 80223650 38 C0 00 00 */ li r6, 0 -/* 80223654 4B FF 6C A1 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 80223658 7C 64 1B 78 */ mr r4, r3 -/* 8022365C 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223660 38 A0 00 07 */ li r5, 7 -/* 80223664 20 1E 00 02 */ subfic r0, r30, 2 -/* 80223668 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 8022366C 38 E0 00 00 */ li r7, 0 -/* 80223670 4B FE 5F 51 */ bl setString__14dMeterButton_cFPcUcUcUc -/* 80223674 3B 00 00 01 */ li r24, 1 -/* 80223678 3B DE FF FF */ addi r30, r30, -1 -lbl_8022367C: -/* 8022367C 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80223680 88 03 07 63 */ lbz r0, 0x763(r3) -/* 80223684 28 00 00 07 */ cmplwi r0, 7 -/* 80223688 40 82 00 5C */ bne lbl_802236E4 -/* 8022368C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80223690 41 82 00 54 */ beq lbl_802236E4 -/* 80223694 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223698 A8 03 04 AE */ lha r0, 0x4ae(r3) -/* 8022369C 2C 00 00 00 */ cmpwi r0, 0 -/* 802236A0 41 81 00 44 */ bgt lbl_802236E4 -/* 802236A4 4B FF AF BD */ bl dMeter2Info_is2DActiveTouchArea__Fv -/* 802236A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802236AC 40 82 00 38 */ bne lbl_802236E4 -/* 802236B0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802236B4 88 9F 01 D1 */ lbz r4, 0x1d1(r31) -/* 802236B8 38 A0 00 00 */ li r5, 0 -/* 802236BC 38 C0 00 00 */ li r6, 0 -/* 802236C0 4B FF 6C 35 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 802236C4 7C 64 1B 78 */ mr r4, r3 -/* 802236C8 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 802236CC 38 A0 00 15 */ li r5, 0x15 -/* 802236D0 20 1E 00 02 */ subfic r0, r30, 2 -/* 802236D4 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 802236D8 38 E0 00 00 */ li r7, 0 -/* 802236DC 4B FE 5E E5 */ bl setString__14dMeterButton_cFPcUcUcUc -/* 802236E0 3B 40 00 01 */ li r26, 1 -lbl_802236E4: -/* 802236E4 92 E1 00 08 */ stw r23, 8(r1) -/* 802236E8 93 01 00 0C */ stw r24, 0xc(r1) -/* 802236EC 93 21 00 10 */ stw r25, 0x10(r1) -/* 802236F0 38 00 00 00 */ li r0, 0 -/* 802236F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802236F8 90 01 00 18 */ stw r0, 0x18(r1) -/* 802236FC 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80223700 90 01 00 20 */ stw r0, 0x20(r1) -/* 80223704 93 A1 00 24 */ stw r29, 0x24(r1) -/* 80223708 90 01 00 28 */ stw r0, 0x28(r1) -/* 8022370C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80223710 90 01 00 30 */ stw r0, 0x30(r1) -/* 80223714 90 01 00 34 */ stw r0, 0x34(r1) -/* 80223718 90 01 00 38 */ stw r0, 0x38(r1) -/* 8022371C 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80223720 90 01 00 40 */ stw r0, 0x40(r1) -/* 80223724 93 41 00 44 */ stw r26, 0x44(r1) -/* 80223728 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 8022372C 80 9F 01 24 */ lwz r4, 0x124(r31) -/* 80223730 7E 65 9B 78 */ mr r5, r19 -/* 80223734 7F 66 DB 78 */ mr r6, r27 -/* 80223738 7E 87 A3 78 */ mr r7, r20 -/* 8022373C 7F 88 E3 78 */ mr r8, r28 -/* 80223740 7E A9 AB 78 */ mr r9, r21 -/* 80223744 7E CA B3 78 */ mr r10, r22 -/* 80223748 4B FD DC BD */ bl _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb -/* 8022374C 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80223750 40 82 00 54 */ bne lbl_802237A4 -/* 80223754 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80223758 40 82 00 4C */ bne lbl_802237A4 -/* 8022375C 56 80 06 3F */ clrlwi. r0, r20, 0x18 -/* 80223760 40 82 00 44 */ bne lbl_802237A4 -/* 80223764 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80223768 40 82 00 3C */ bne lbl_802237A4 -/* 8022376C 56 A0 06 3F */ clrlwi. r0, r21, 0x18 -/* 80223770 40 82 00 34 */ bne lbl_802237A4 -/* 80223774 56 C0 06 3F */ clrlwi. r0, r22, 0x18 -/* 80223778 40 82 00 2C */ bne lbl_802237A4 -/* 8022377C 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 80223780 40 82 00 24 */ bne lbl_802237A4 -/* 80223784 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 80223788 40 82 00 1C */ bne lbl_802237A4 -/* 8022378C 57 20 06 3F */ clrlwi. r0, r25, 0x18 -/* 80223790 40 82 00 14 */ bne lbl_802237A4 -/* 80223794 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80223798 40 82 00 0C */ bne lbl_802237A4 -/* 8022379C 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802237A0 41 82 00 0C */ beq lbl_802237AC -lbl_802237A4: -/* 802237A4 38 00 00 01 */ li r0, 1 -/* 802237A8 98 1F 02 01 */ stb r0, 0x201(r31) -lbl_802237AC: -/* 802237AC 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 802237B0 28 03 00 00 */ cmplwi r3, 0 -/* 802237B4 41 82 00 08 */ beq lbl_802237BC -/* 802237B8 4B DE BA 15 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -lbl_802237BC: -/* 802237BC 39 61 00 80 */ addi r11, r1, 0x80 -/* 802237C0 48 13 EA 41 */ bl _restgpr_19 -/* 802237C4 80 01 00 84 */ lwz r0, 0x84(r1) -/* 802237C8 7C 08 03 A6 */ mtlr r0 -/* 802237CC 38 21 00 80 */ addi r1, r1, 0x80 -/* 802237D0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveArrowNum__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveArrowNum__9dMeter2_cFv.s deleted file mode 100644 index 3e44ff28b1..0000000000 --- a/asm/d/meter/d_meter2/moveArrowNum__9dMeter2_cFv.s +++ /dev/null @@ -1,223 +0,0 @@ -lbl_80224354: -/* 80224354 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80224358 7C 08 02 A6 */ mflr r0 -/* 8022435C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80224360 39 61 00 30 */ addi r11, r1, 0x30 -/* 80224364 48 13 DE 71 */ bl _savegpr_27 -/* 80224368 7C 7E 1B 78 */ mr r30, r3 -/* 8022436C 3C 60 80 43 */ lis r3, g_mwHIO@ha /* 0x8042E86C@ha */ -/* 80224370 38 63 E8 6C */ addi r3, r3, g_mwHIO@l /* 0x8042E86C@l */ -/* 80224374 4B FD 5A A9 */ bl getArrowFlag__9dMw_HIO_cFv -/* 80224378 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8022437C 40 82 00 18 */ bne lbl_80224394 -/* 80224380 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80224384 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80224388 88 03 00 DD */ lbz r0, 0xdd(r3) -/* 8022438C 28 00 00 01 */ cmplwi r0, 1 -/* 80224390 40 82 00 44 */ bne lbl_802243D4 -lbl_80224394: -/* 80224394 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224398 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022439C 88 04 00 EC */ lbz r0, 0xec(r4) -/* 802243A0 88 64 00 F8 */ lbz r3, 0xf8(r4) -/* 802243A4 7C 03 00 40 */ cmplw r3, r0 -/* 802243A8 41 82 00 10 */ beq lbl_802243B8 -/* 802243AC A8 04 5D F4 */ lha r0, 0x5df4(r4) -/* 802243B0 7C 00 1A 14 */ add r0, r0, r3 -/* 802243B4 B0 04 5D F4 */ sth r0, 0x5df4(r4) -lbl_802243B8: -/* 802243B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802243BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802243C0 A8 03 5D F4 */ lha r0, 0x5df4(r3) -/* 802243C4 2C 00 00 00 */ cmpwi r0, 0 -/* 802243C8 40 80 00 0C */ bge lbl_802243D4 -/* 802243CC 38 00 00 00 */ li r0, 0 -/* 802243D0 B0 03 5D F4 */ sth r0, 0x5df4(r3) -lbl_802243D4: -/* 802243D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802243D8 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802243DC A8 C5 5D F4 */ lha r6, 0x5df4(r5) -/* 802243E0 7C C0 07 35 */ extsh. r0, r6 -/* 802243E4 40 82 00 24 */ bne lbl_80224408 -/* 802243E8 88 65 00 F8 */ lbz r3, 0xf8(r5) -/* 802243EC 88 1E 01 FB */ lbz r0, 0x1fb(r30) -/* 802243F0 7C 00 18 40 */ cmplw r0, r3 -/* 802243F4 40 82 00 14 */ bne lbl_80224408 -/* 802243F8 88 65 00 EC */ lbz r3, 0xec(r5) -/* 802243FC 88 1E 01 DA */ lbz r0, 0x1da(r30) -/* 80224400 7C 00 18 40 */ cmplw r0, r3 -/* 80224404 41 82 02 64 */ beq lbl_80224668 -lbl_80224408: -/* 80224408 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022440C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224410 88 04 00 EC */ lbz r0, 0xec(r4) -/* 80224414 7C 00 32 14 */ add r0, r0, r6 -/* 80224418 7C 06 07 35 */ extsh. r6, r0 -/* 8022441C 38 00 00 00 */ li r0, 0 -/* 80224420 B0 05 5D F4 */ sth r0, 0x5df4(r5) -/* 80224424 40 80 00 08 */ bge lbl_8022442C -/* 80224428 38 C0 00 00 */ li r6, 0 -lbl_8022442C: -/* 8022442C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224430 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224434 88 7F 00 F8 */ lbz r3, 0xf8(r31) -/* 80224438 7C C0 07 34 */ extsh r0, r6 -/* 8022443C 7C 00 18 00 */ cmpw r0, r3 -/* 80224440 40 81 00 08 */ ble lbl_80224448 -/* 80224444 7C 66 1B 78 */ mr r6, r3 -lbl_80224448: -/* 80224448 98 C4 00 EC */ stb r6, 0xec(r4) -/* 8022444C 88 1F 00 F8 */ lbz r0, 0xf8(r31) -/* 80224450 98 1E 01 FB */ stb r0, 0x1fb(r30) -/* 80224454 88 04 00 EC */ lbz r0, 0xec(r4) -/* 80224458 88 7E 01 DA */ lbz r3, 0x1da(r30) -/* 8022445C 7C 03 00 40 */ cmplw r3, r0 -/* 80224460 40 80 01 20 */ bge lbl_80224580 -/* 80224464 38 03 00 01 */ addi r0, r3, 1 -/* 80224468 98 1E 01 DA */ stb r0, 0x1da(r30) -/* 8022446C 88 1E 01 EB */ lbz r0, 0x1eb(r30) -/* 80224470 60 00 00 04 */ ori r0, r0, 4 -/* 80224474 98 1E 01 EB */ stb r0, 0x1eb(r30) -/* 80224478 88 BE 01 EB */ lbz r5, 0x1eb(r30) -/* 8022447C 54 A0 F7 FF */ rlwinm. r0, r5, 0x1e, 0x1f, 0x1f -/* 80224480 41 82 01 0C */ beq lbl_8022458C -/* 80224484 88 64 00 EC */ lbz r3, 0xec(r4) -/* 80224488 88 1E 01 DA */ lbz r0, 0x1da(r30) -/* 8022448C 7C 00 18 40 */ cmplw r0, r3 -/* 80224490 41 82 00 80 */ beq lbl_80224510 -/* 80224494 54 A0 07 FF */ clrlwi. r0, r5, 0x1f -/* 80224498 40 82 00 68 */ bne lbl_80224500 -/* 8022449C 7F C3 F3 78 */ mr r3, r30 -/* 802244A0 48 00 15 59 */ bl isArrowEquip__9dMeter2_cFv -/* 802244A4 2C 03 00 00 */ cmpwi r3, 0 -/* 802244A8 41 82 00 58 */ beq lbl_80224500 -/* 802244AC 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802244B0 4B FF 6C 19 */ bl isButtonVisible__13dMeter2Draw_cFv -/* 802244B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802244B8 41 82 00 48 */ beq lbl_80224500 -/* 802244BC 88 1E 01 EB */ lbz r0, 0x1eb(r30) -/* 802244C0 60 00 00 01 */ ori r0, r0, 1 -/* 802244C4 98 1E 01 EB */ stb r0, 0x1eb(r30) -/* 802244C8 38 00 00 1B */ li r0, 0x1b -/* 802244CC 90 01 00 0C */ stw r0, 0xc(r1) -/* 802244D0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802244D4 38 81 00 0C */ addi r4, r1, 0xc -/* 802244D8 38 A0 00 00 */ li r5, 0 -/* 802244DC 38 C0 00 00 */ li r6, 0 -/* 802244E0 38 E0 00 00 */ li r7, 0 -/* 802244E4 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 802244E8 FC 40 08 90 */ fmr f2, f1 -/* 802244EC C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 802244F0 FC 80 18 90 */ fmr f4, f3 -/* 802244F4 39 00 00 00 */ li r8, 0 -/* 802244F8 48 08 74 8D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 802244FC 48 00 00 90 */ b lbl_8022458C -lbl_80224500: -/* 80224500 88 1E 01 EB */ lbz r0, 0x1eb(r30) -/* 80224504 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 80224508 98 1E 01 EB */ stb r0, 0x1eb(r30) -/* 8022450C 48 00 00 80 */ b lbl_8022458C -lbl_80224510: -/* 80224510 7F C3 F3 78 */ mr r3, r30 -/* 80224514 48 00 14 E5 */ bl isArrowEquip__9dMeter2_cFv -/* 80224518 2C 03 00 00 */ cmpwi r3, 0 -/* 8022451C 41 82 00 48 */ beq lbl_80224564 -/* 80224520 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224524 4B FF 6B A5 */ bl isButtonVisible__13dMeter2Draw_cFv -/* 80224528 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8022452C 41 82 00 38 */ beq lbl_80224564 -/* 80224530 38 00 00 1C */ li r0, 0x1c -/* 80224534 90 01 00 08 */ stw r0, 8(r1) -/* 80224538 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8022453C 38 81 00 08 */ addi r4, r1, 8 -/* 80224540 38 A0 00 00 */ li r5, 0 -/* 80224544 38 C0 00 00 */ li r6, 0 -/* 80224548 38 E0 00 00 */ li r7, 0 -/* 8022454C C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80224550 FC 40 08 90 */ fmr f2, f1 -/* 80224554 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 80224558 FC 80 18 90 */ fmr f4, f3 -/* 8022455C 39 00 00 00 */ li r8, 0 -/* 80224560 48 08 74 25 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80224564: -/* 80224564 88 1E 01 EB */ lbz r0, 0x1eb(r30) -/* 80224568 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 8022456C 98 1E 01 EB */ stb r0, 0x1eb(r30) -/* 80224570 88 1E 01 EB */ lbz r0, 0x1eb(r30) -/* 80224574 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 80224578 98 1E 01 EB */ stb r0, 0x1eb(r30) -/* 8022457C 48 00 00 10 */ b lbl_8022458C -lbl_80224580: -/* 80224580 40 81 00 0C */ ble lbl_8022458C -/* 80224584 38 03 FF FF */ addi r0, r3, -1 -/* 80224588 98 1E 01 DA */ stb r0, 0x1da(r30) -lbl_8022458C: -/* 8022458C 3B 80 00 00 */ li r28, 0 -/* 80224590 3B A0 00 00 */ li r29, 0 -lbl_80224594: -/* 80224594 38 1D 01 D2 */ addi r0, r29, 0x1d2 -/* 80224598 7C 1E 00 AE */ lbzx r0, r30, r0 -/* 8022459C 28 00 00 43 */ cmplwi r0, 0x43 -/* 802245A0 41 82 00 2C */ beq lbl_802245CC -/* 802245A4 28 00 00 53 */ cmplwi r0, 0x53 -/* 802245A8 41 82 00 24 */ beq lbl_802245CC -/* 802245AC 28 00 00 54 */ cmplwi r0, 0x54 -/* 802245B0 41 82 00 1C */ beq lbl_802245CC -/* 802245B4 28 00 00 55 */ cmplwi r0, 0x55 -/* 802245B8 41 82 00 14 */ beq lbl_802245CC -/* 802245BC 28 00 00 56 */ cmplwi r0, 0x56 -/* 802245C0 41 82 00 0C */ beq lbl_802245CC -/* 802245C4 28 00 00 5A */ cmplwi r0, 0x5a -/* 802245C8 40 82 00 1C */ bne lbl_802245E4 -lbl_802245CC: -/* 802245CC 88 DF 00 F8 */ lbz r6, 0xf8(r31) -/* 802245D0 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802245D4 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 802245D8 88 BE 01 DA */ lbz r5, 0x1da(r30) -/* 802245DC 4B FF 65 A9 */ bl setItemNum__13dMeter2Draw_cFUcUcUc -/* 802245E0 48 00 00 78 */ b lbl_80224658 -lbl_802245E4: -/* 802245E4 28 00 00 4B */ cmplwi r0, 0x4b -/* 802245E8 40 82 00 1C */ bne lbl_80224604 -/* 802245EC 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802245F0 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 802245F4 88 BE 01 DB */ lbz r5, 0x1db(r30) -/* 802245F8 38 C0 00 32 */ li r6, 0x32 -/* 802245FC 4B FF 65 89 */ bl setItemNum__13dMeter2Draw_cFUcUcUc -/* 80224600 48 00 00 58 */ b lbl_80224658 -lbl_80224604: -/* 80224604 28 00 00 59 */ cmplwi r0, 0x59 -/* 80224608 40 82 00 50 */ bne lbl_80224658 -/* 8022460C 7F 83 E3 78 */ mr r3, r28 -/* 80224610 4B E0 9F B1 */ bl dComIfGp_getSelectItemNum__Fi -/* 80224614 54 7B 06 3E */ clrlwi r27, r3, 0x18 -/* 80224618 7F 83 E3 78 */ mr r3, r28 -/* 8022461C 4B E0 A0 6D */ bl dComIfGp_getSelectItemMaxNum__Fi -/* 80224620 54 66 06 3E */ clrlwi r6, r3, 0x18 -/* 80224624 88 1E 01 DA */ lbz r0, 0x1da(r30) -/* 80224628 7C 1B 00 40 */ cmplw r27, r0 -/* 8022462C 40 81 00 08 */ ble lbl_80224634 -/* 80224630 7C 1B 03 78 */ mr r27, r0 -lbl_80224634: -/* 80224634 88 7F 00 F8 */ lbz r3, 0xf8(r31) -/* 80224638 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8022463C 7C 06 00 40 */ cmplw r6, r0 -/* 80224640 40 80 00 08 */ bge lbl_80224648 -/* 80224644 7C 66 1B 78 */ mr r6, r3 -lbl_80224648: -/* 80224648 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022464C 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 80224650 7F 65 DB 78 */ mr r5, r27 -/* 80224654 4B FF 65 31 */ bl setItemNum__13dMeter2Draw_cFUcUcUc -lbl_80224658: -/* 80224658 3B 9C 00 01 */ addi r28, r28, 1 -/* 8022465C 2C 1C 00 02 */ cmpwi r28, 2 -/* 80224660 3B BD 00 02 */ addi r29, r29, 2 -/* 80224664 41 80 FF 30 */ blt lbl_80224594 -lbl_80224668: -/* 80224668 39 61 00 30 */ addi r11, r1, 0x30 -/* 8022466C 48 13 DB B5 */ bl _restgpr_27 -/* 80224670 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80224674 7C 08 03 A6 */ mtlr r0 -/* 80224678 38 21 00 30 */ addi r1, r1, 0x30 -/* 8022467C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveBombNum__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveBombNum__9dMeter2_cFv.s deleted file mode 100644 index 9edec213cc..0000000000 --- a/asm/d/meter/d_meter2/moveBombNum__9dMeter2_cFv.s +++ /dev/null @@ -1,303 +0,0 @@ -lbl_80223E00: -/* 80223E00 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80223E04 7C 08 02 A6 */ mflr r0 -/* 80223E08 90 01 00 44 */ stw r0, 0x44(r1) -/* 80223E0C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80223E10 48 13 E3 A1 */ bl _savegpr_18 -/* 80223E14 7C 75 1B 78 */ mr r21, r3 -/* 80223E18 3A E0 00 00 */ li r23, 0 -/* 80223E1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80223E20 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80223E24 3B 7D 00 9C */ addi r27, r29, 0x9c -/* 80223E28 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80223E2C 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80223E30 3B 5D 00 EC */ addi r26, r29, 0xec -/* 80223E34 3B 3D 00 F8 */ addi r25, r29, 0xf8 -/* 80223E38 3B 1D 0F 38 */ addi r24, r29, 0xf38 -lbl_80223E3C: -/* 80223E3C 7F 63 DB 78 */ mr r3, r27 -/* 80223E40 38 17 00 0F */ addi r0, r23, 0xf -/* 80223E44 54 13 06 3E */ clrlwi r19, r0, 0x18 -/* 80223E48 7E 64 9B 78 */ mr r4, r19 -/* 80223E4C 38 A0 00 01 */ li r5, 1 -/* 80223E50 4B E0 F1 E1 */ bl getItem__17dSv_player_item_cCFib -/* 80223E54 7C 7F 1B 78 */ mr r31, r3 -/* 80223E58 7F 63 DB 78 */ mr r3, r27 -/* 80223E5C 7E 64 9B 78 */ mr r4, r19 -/* 80223E60 38 A0 00 00 */ li r5, 0 -/* 80223E64 4B E0 F1 CD */ bl getItem__17dSv_player_item_cCFib -/* 80223E68 7C 7C 1B 78 */ mr r28, r3 -/* 80223E6C 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80223E70 28 00 00 FF */ cmplwi r0, 0xff -/* 80223E74 41 82 02 AC */ beq lbl_80224120 -/* 80223E78 28 00 00 50 */ cmplwi r0, 0x50 -/* 80223E7C 41 82 02 A4 */ beq lbl_80224120 -/* 80223E80 3C 60 80 43 */ lis r3, g_mwHIO@ha /* 0x8042E86C@ha */ -/* 80223E84 38 63 E8 6C */ addi r3, r3, g_mwHIO@l /* 0x8042E86C@l */ -/* 80223E88 4B FD 5F 8D */ bl getBombFlag__9dMw_HIO_cFv -/* 80223E8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80223E90 40 82 00 1C */ bne lbl_80223EAC -/* 80223E94 88 1E 00 DD */ lbz r0, 0xdd(r30) -/* 80223E98 28 00 00 01 */ cmplwi r0, 1 -/* 80223E9C 40 82 00 7C */ bne lbl_80223F18 -/* 80223EA0 88 1E 00 DC */ lbz r0, 0xdc(r30) -/* 80223EA4 7C 17 00 00 */ cmpw r23, r0 -/* 80223EA8 40 82 00 70 */ bne lbl_80223F18 -lbl_80223EAC: -/* 80223EAC 7F 43 D3 78 */ mr r3, r26 -/* 80223EB0 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223EB4 4B E1 00 C9 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 80223EB8 7C 73 1B 78 */ mr r19, r3 -/* 80223EBC 7F 23 CB 78 */ mr r3, r25 -/* 80223EC0 7F 84 E3 78 */ mr r4, r28 -/* 80223EC4 4B E1 02 35 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 80223EC8 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 80223ECC 56 60 06 3E */ clrlwi r0, r19, 0x18 -/* 80223ED0 7C 03 00 40 */ cmplw r3, r0 -/* 80223ED4 41 82 00 24 */ beq lbl_80223EF8 -/* 80223ED8 7F 23 CB 78 */ mr r3, r25 -/* 80223EDC 7F 84 E3 78 */ mr r4, r28 -/* 80223EE0 4B E1 02 19 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 80223EE4 7C 60 1B 78 */ mr r0, r3 -/* 80223EE8 7F 03 C3 78 */ mr r3, r24 -/* 80223EEC 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223EF0 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 80223EF4 4B E0 74 79 */ bl setItemBombNumCount__14dComIfG_play_cFUcs -lbl_80223EF8: -/* 80223EF8 7F 03 C3 78 */ mr r3, r24 -/* 80223EFC 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F00 4B E0 74 85 */ bl getItemBombNumCount__14dComIfG_play_cFUc -/* 80223F04 7C 60 07 35 */ extsh. r0, r3 -/* 80223F08 40 80 00 10 */ bge lbl_80223F18 -/* 80223F0C 7F 03 C3 78 */ mr r3, r24 -/* 80223F10 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F14 4B E0 74 81 */ bl clearItemBombNumCount__14dComIfG_play_cFUc -lbl_80223F18: -/* 80223F18 7F 03 C3 78 */ mr r3, r24 -/* 80223F1C 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F20 4B E0 74 65 */ bl getItemBombNumCount__14dComIfG_play_cFUc -/* 80223F24 7C 60 07 35 */ extsh. r0, r3 -/* 80223F28 40 82 00 40 */ bne lbl_80223F68 -/* 80223F2C 7F 43 D3 78 */ mr r3, r26 -/* 80223F30 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F34 4B E1 00 49 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 80223F38 7E 75 BA 14 */ add r19, r21, r23 -/* 80223F3C 88 93 01 F3 */ lbz r4, 0x1f3(r19) -/* 80223F40 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80223F44 7C 04 00 40 */ cmplw r4, r0 -/* 80223F48 40 82 00 20 */ bne lbl_80223F68 -/* 80223F4C 7F 23 CB 78 */ mr r3, r25 -/* 80223F50 7F 84 E3 78 */ mr r4, r28 -/* 80223F54 4B E1 01 A5 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 80223F58 88 93 01 F6 */ lbz r4, 0x1f6(r19) -/* 80223F5C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80223F60 7C 04 00 40 */ cmplw r4, r0 -/* 80223F64 41 82 01 F8 */ beq lbl_8022415C -lbl_80223F68: -/* 80223F68 7F 03 C3 78 */ mr r3, r24 -/* 80223F6C 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F70 4B E0 74 15 */ bl getItemBombNumCount__14dComIfG_play_cFUc -/* 80223F74 7C 73 1B 78 */ mr r19, r3 -/* 80223F78 7F 43 D3 78 */ mr r3, r26 -/* 80223F7C 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F80 4B E0 FF FD */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 80223F84 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80223F88 7C 00 9A 14 */ add r0, r0, r19 -/* 80223F8C 7C 16 07 34 */ extsh r22, r0 -/* 80223F90 7F 03 C3 78 */ mr r3, r24 -/* 80223F94 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F98 4B E0 73 FD */ bl clearItemBombNumCount__14dComIfG_play_cFUc -/* 80223F9C 7E C0 07 35 */ extsh. r0, r22 -/* 80223FA0 40 80 00 08 */ bge lbl_80223FA8 -/* 80223FA4 3A C0 00 00 */ li r22, 0 -lbl_80223FA8: -/* 80223FA8 7F 23 CB 78 */ mr r3, r25 -/* 80223FAC 7F 84 E3 78 */ mr r4, r28 -/* 80223FB0 4B E1 01 49 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 80223FB4 7E C4 07 34 */ extsh r4, r22 -/* 80223FB8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80223FBC 7C 04 00 00 */ cmpw r4, r0 -/* 80223FC0 40 81 00 14 */ ble lbl_80223FD4 -/* 80223FC4 7F 23 CB 78 */ mr r3, r25 -/* 80223FC8 7F 84 E3 78 */ mr r4, r28 -/* 80223FCC 4B E1 01 2D */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 80223FD0 54 76 06 3E */ clrlwi r22, r3, 0x18 -lbl_80223FD4: -/* 80223FD4 7E C0 07 35 */ extsh. r0, r22 -/* 80223FD8 40 82 00 C4 */ bne lbl_8022409C -/* 80223FDC 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80223FE0 28 00 00 59 */ cmplwi r0, 0x59 -/* 80223FE4 40 82 00 6C */ bne lbl_80224050 -/* 80223FE8 3A 40 00 00 */ li r18, 0 -/* 80223FEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80223FF0 3A 63 61 C0 */ addi r19, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80223FF4 3A 97 00 0F */ addi r20, r23, 0xf -lbl_80223FF8: -/* 80223FF8 7E 63 9B 78 */ mr r3, r19 -/* 80223FFC 7E 44 93 78 */ mr r4, r18 -/* 80224000 4B E0 EA 5D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80224004 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80224008 7C 14 00 00 */ cmpw r20, r0 -/* 8022400C 41 82 00 18 */ beq lbl_80224024 -/* 80224010 7E 43 93 78 */ mr r3, r18 -/* 80224014 4B E0 9D B5 */ bl dComIfGs_getMixItemIndex__Fi -/* 80224018 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8022401C 7C 14 00 00 */ cmpw r20, r0 -/* 80224020 40 82 00 24 */ bne lbl_80224044 -lbl_80224024: -/* 80224024 7E 43 93 78 */ mr r3, r18 -/* 80224028 38 80 00 FF */ li r4, 0xff -/* 8022402C 4B E0 9C DD */ bl dComIfGs_setMixItemIndex__FiUc -/* 80224030 7E 43 93 78 */ mr r3, r18 -/* 80224034 38 80 00 04 */ li r4, 4 -/* 80224038 4B E0 9C 8D */ bl dComIfGs_setSelectItemIndex__FiUc -/* 8022403C 7E 43 93 78 */ mr r3, r18 -/* 80224040 4B E0 9D B5 */ bl dComIfGp_setSelectItem__Fi -lbl_80224044: -/* 80224044 3A 52 00 01 */ addi r18, r18, 1 -/* 80224048 2C 12 00 02 */ cmpwi r18, 2 -/* 8022404C 41 80 FF AC */ blt lbl_80223FF8 -lbl_80224050: -/* 80224050 7F 63 DB 78 */ mr r3, r27 -/* 80224054 38 97 00 0F */ addi r4, r23, 0xf -/* 80224058 38 A0 00 50 */ li r5, 0x50 -/* 8022405C 4B E0 EF 5D */ bl setItem__17dSv_player_item_cFiUc -/* 80224060 3A 97 00 0F */ addi r20, r23, 0xf -/* 80224064 9A 9D 5E 7D */ stb r20, 0x5e7d(r29) -/* 80224068 38 00 00 50 */ li r0, 0x50 -/* 8022406C 98 1D 5E 7E */ stb r0, 0x5e7e(r29) -/* 80224070 3A 40 00 00 */ li r18, 0 -lbl_80224074: -/* 80224074 7E 43 93 78 */ mr r3, r18 -/* 80224078 4B E0 9C C5 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi -/* 8022407C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80224080 7C 14 00 00 */ cmpw r20, r0 -/* 80224084 40 82 00 0C */ bne lbl_80224090 -/* 80224088 7E 43 93 78 */ mr r3, r18 -/* 8022408C 4B E0 9D 69 */ bl dComIfGp_setSelectItem__Fi -lbl_80224090: -/* 80224090 3A 52 00 01 */ addi r18, r18, 1 -/* 80224094 2C 12 00 02 */ cmpwi r18, 2 -/* 80224098 41 80 FF DC */ blt lbl_80224074 -lbl_8022409C: -/* 8022409C 7F 43 D3 78 */ mr r3, r26 -/* 802240A0 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 802240A4 56 C5 06 3E */ clrlwi r5, r22, 0x18 -/* 802240A8 4B E0 FE C5 */ bl setBombNum__24dSv_player_item_record_cFUcUc -/* 802240AC 7F 23 CB 78 */ mr r3, r25 -/* 802240B0 7F 84 E3 78 */ mr r4, r28 -/* 802240B4 4B E1 00 45 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 802240B8 38 17 01 F6 */ addi r0, r23, 0x1f6 -/* 802240BC 7C 75 01 AE */ stbx r3, r21, r0 -/* 802240C0 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 802240C4 28 00 00 59 */ cmplwi r0, 0x59 -/* 802240C8 41 82 00 94 */ beq lbl_8022415C -/* 802240CC 3A 40 00 00 */ li r18, 0 -/* 802240D0 3B 97 00 0F */ addi r28, r23, 0xf -lbl_802240D4: -/* 802240D4 7E 43 93 78 */ mr r3, r18 -/* 802240D8 4B E0 9C 65 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi -/* 802240DC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802240E0 7C 1C 00 00 */ cmpw r28, r0 -/* 802240E4 40 82 00 2C */ bne lbl_80224110 -/* 802240E8 7E 43 93 78 */ mr r3, r18 -/* 802240EC 4B E0 A5 9D */ bl dComIfGp_getSelectItemMaxNum__Fi -/* 802240F0 54 76 06 3E */ clrlwi r22, r3, 0x18 -/* 802240F4 7E 43 93 78 */ mr r3, r18 -/* 802240F8 4B E0 A4 C9 */ bl dComIfGp_getSelectItemNum__Fi -/* 802240FC 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 80224100 80 75 01 0C */ lwz r3, 0x10c(r21) -/* 80224104 56 44 06 3E */ clrlwi r4, r18, 0x18 -/* 80224108 7E C6 B3 78 */ mr r6, r22 -/* 8022410C 4B FF 6A 79 */ bl setItemNum__13dMeter2Draw_cFUcUcUc -lbl_80224110: -/* 80224110 3A 52 00 01 */ addi r18, r18, 1 -/* 80224114 2C 12 00 02 */ cmpwi r18, 2 -/* 80224118 41 80 FF BC */ blt lbl_802240D4 -/* 8022411C 48 00 00 40 */ b lbl_8022415C -lbl_80224120: -/* 80224120 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80224124 28 00 00 50 */ cmplwi r0, 0x50 -/* 80224128 41 82 00 14 */ beq lbl_8022413C -/* 8022412C 7F 43 D3 78 */ mr r3, r26 -/* 80224130 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80224134 38 A0 00 00 */ li r5, 0 -/* 80224138 4B E0 FE 35 */ bl setBombNum__24dSv_player_item_record_cFUcUc -lbl_8022413C: -/* 8022413C 7F 03 C3 78 */ mr r3, r24 -/* 80224140 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80224144 4B E0 72 41 */ bl getItemBombNumCount__14dComIfG_play_cFUc -/* 80224148 7C 60 07 35 */ extsh. r0, r3 -/* 8022414C 41 82 00 10 */ beq lbl_8022415C -/* 80224150 7F 03 C3 78 */ mr r3, r24 -/* 80224154 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80224158 4B E0 72 3D */ bl clearItemBombNumCount__14dComIfG_play_cFUc -lbl_8022415C: -/* 8022415C 7F 43 D3 78 */ mr r3, r26 -/* 80224160 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80224164 4B E0 FE 19 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 80224168 3A 77 01 F3 */ addi r19, r23, 0x1f3 -/* 8022416C 7C 95 98 AE */ lbzx r4, r21, r19 -/* 80224170 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80224174 7C 04 00 40 */ cmplw r4, r0 -/* 80224178 41 82 00 14 */ beq lbl_8022418C -/* 8022417C 7F 43 D3 78 */ mr r3, r26 -/* 80224180 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80224184 4B E0 FD F9 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 80224188 7C 75 99 AE */ stbx r3, r21, r19 -lbl_8022418C: -/* 8022418C 3A F7 00 01 */ addi r23, r23, 1 -/* 80224190 2C 17 00 03 */ cmpwi r23, 3 -/* 80224194 41 80 FC A8 */ blt lbl_80223E3C -/* 80224198 3A 40 00 00 */ li r18, 0 -/* 8022419C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802241A0 3B 03 61 C0 */ addi r24, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_802241A4: -/* 802241A4 7F 03 C3 78 */ mr r3, r24 -/* 802241A8 7E 44 93 78 */ mr r4, r18 -/* 802241AC 4B E0 E8 B1 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 802241B0 3A 72 01 F9 */ addi r19, r18, 0x1f9 -/* 802241B4 7C 95 98 AE */ lbzx r4, r21, r19 -/* 802241B8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802241BC 7C 04 00 40 */ cmplw r4, r0 -/* 802241C0 41 82 00 74 */ beq lbl_80224234 -/* 802241C4 3A 80 00 00 */ li r20, 0 -/* 802241C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802241CC 3A E3 61 C0 */ addi r23, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_802241D0: -/* 802241D0 7E E3 BB 78 */ mr r3, r23 -/* 802241D4 7E 44 93 78 */ mr r4, r18 -/* 802241D8 4B E0 E8 85 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 802241DC 38 94 00 0F */ addi r4, r20, 0xf -/* 802241E0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802241E4 7C 04 00 00 */ cmpw r4, r0 -/* 802241E8 40 82 00 2C */ bne lbl_80224214 -/* 802241EC 7E 43 93 78 */ mr r3, r18 -/* 802241F0 4B E0 A4 99 */ bl dComIfGp_getSelectItemMaxNum__Fi -/* 802241F4 54 76 06 3E */ clrlwi r22, r3, 0x18 -/* 802241F8 7E 43 93 78 */ mr r3, r18 -/* 802241FC 4B E0 A3 C5 */ bl dComIfGp_getSelectItemNum__Fi -/* 80224200 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 80224204 80 75 01 0C */ lwz r3, 0x10c(r21) -/* 80224208 56 44 06 3E */ clrlwi r4, r18, 0x18 -/* 8022420C 7E C6 B3 78 */ mr r6, r22 -/* 80224210 4B FF 69 75 */ bl setItemNum__13dMeter2Draw_cFUcUcUc -lbl_80224214: -/* 80224214 3A 94 00 01 */ addi r20, r20, 1 -/* 80224218 2C 14 00 03 */ cmpwi r20, 3 -/* 8022421C 41 80 FF B4 */ blt lbl_802241D0 -/* 80224220 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224224 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224228 7E 44 93 78 */ mr r4, r18 -/* 8022422C 4B E0 E8 31 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80224230 7C 75 99 AE */ stbx r3, r21, r19 -lbl_80224234: -/* 80224234 3A 52 00 01 */ addi r18, r18, 1 -/* 80224238 2C 12 00 02 */ cmpwi r18, 2 -/* 8022423C 41 80 FF 68 */ blt lbl_802241A4 -/* 80224240 39 61 00 40 */ addi r11, r1, 0x40 -/* 80224244 48 13 DF B9 */ bl _restgpr_18 -/* 80224248 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8022424C 7C 08 03 A6 */ mtlr r0 -/* 80224250 38 21 00 40 */ addi r1, r1, 0x40 -/* 80224254 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveBottleNum__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveBottleNum__9dMeter2_cFv.s deleted file mode 100644 index 4b3d10e28c..0000000000 --- a/asm/d/meter/d_meter2/moveBottleNum__9dMeter2_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_80224258: -/* 80224258 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8022425C 7C 08 02 A6 */ mflr r0 -/* 80224260 90 01 00 34 */ stw r0, 0x34(r1) -/* 80224264 39 61 00 30 */ addi r11, r1, 0x30 -/* 80224268 48 13 DF 5D */ bl _savegpr_23 -/* 8022426C 7C 7E 1B 78 */ mr r30, r3 -/* 80224270 3B E0 00 00 */ li r31, 0 -/* 80224274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80224278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022427C 3B 43 00 9C */ addi r26, r3, 0x9c -/* 80224280 3B 23 00 EC */ addi r25, r3, 0xec -lbl_80224284: -/* 80224284 7F 43 D3 78 */ mr r3, r26 -/* 80224288 38 1F 00 0B */ addi r0, r31, 0xb -/* 8022428C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80224290 38 A0 00 01 */ li r5, 1 -/* 80224294 4B E0 ED 9D */ bl getItem__17dSv_player_item_cCFib -/* 80224298 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8022429C 28 00 00 76 */ cmplwi r0, 0x76 -/* 802242A0 40 82 00 90 */ bne lbl_80224330 -/* 802242A4 7F 23 CB 78 */ mr r3, r25 -/* 802242A8 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 802242AC 4B E0 FD 85 */ bl getBottleNum__24dSv_player_item_record_cCFUc -/* 802242B0 3B 1F 01 EF */ addi r24, r31, 0x1ef -/* 802242B4 7C 9E C0 AE */ lbzx r4, r30, r24 -/* 802242B8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802242BC 7C 04 00 40 */ cmplw r4, r0 -/* 802242C0 41 82 00 70 */ beq lbl_80224330 -/* 802242C4 3A E0 00 00 */ li r23, 0 -/* 802242C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802242CC 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802242D0 3B 9F 00 0B */ addi r28, r31, 0xb -lbl_802242D4: -/* 802242D4 7F 63 DB 78 */ mr r3, r27 -/* 802242D8 7E E4 BB 78 */ mr r4, r23 -/* 802242DC 4B E0 E7 81 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 802242E0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802242E4 7C 1C 00 00 */ cmpw r28, r0 -/* 802242E8 40 82 00 3C */ bne lbl_80224324 -/* 802242EC 7E E3 BB 78 */ mr r3, r23 -/* 802242F0 4B E0 A3 99 */ bl dComIfGp_getSelectItemMaxNum__Fi -/* 802242F4 54 7D 06 3E */ clrlwi r29, r3, 0x18 -/* 802242F8 7E E3 BB 78 */ mr r3, r23 -/* 802242FC 4B E0 A2 C5 */ bl dComIfGp_getSelectItemNum__Fi -/* 80224300 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 80224304 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224308 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 8022430C 7F A6 EB 78 */ mr r6, r29 -/* 80224310 4B FF 68 75 */ bl setItemNum__13dMeter2Draw_cFUcUcUc -/* 80224314 7F 23 CB 78 */ mr r3, r25 -/* 80224318 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 8022431C 4B E0 FD 15 */ bl getBottleNum__24dSv_player_item_record_cCFUc -/* 80224320 7C 7E C1 AE */ stbx r3, r30, r24 -lbl_80224324: -/* 80224324 3A F7 00 01 */ addi r23, r23, 1 -/* 80224328 2C 17 00 02 */ cmpwi r23, 2 -/* 8022432C 41 80 FF A8 */ blt lbl_802242D4 -lbl_80224330: -/* 80224330 3B FF 00 01 */ addi r31, r31, 1 -/* 80224334 2C 1F 00 04 */ cmpwi r31, 4 -/* 80224338 41 80 FF 4C */ blt lbl_80224284 -/* 8022433C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80224340 48 13 DE D1 */ bl _restgpr_23 -/* 80224344 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80224348 7C 08 03 A6 */ mtlr r0 -/* 8022434C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80224350 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveButton3D__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveButton3D__9dMeter2_cFv.s deleted file mode 100644 index aa3cc1b50d..0000000000 --- a/asm/d/meter/d_meter2/moveButton3D__9dMeter2_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_802222A0: -/* 802222A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802222A4 7C 08 02 A6 */ mflr r0 -/* 802222A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802222AC 7C 67 1B 78 */ mr r7, r3 -/* 802222B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802222B4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802222B8 88 A4 5E 3E */ lbz r5, 0x5e3e(r4) -/* 802222BC 28 05 00 00 */ cmplwi r5, 0 -/* 802222C0 41 82 00 3C */ beq lbl_802222FC -/* 802222C4 88 C4 5E 58 */ lbz r6, 0x5e58(r4) -/* 802222C8 28 05 00 6A */ cmplwi r5, 0x6a -/* 802222CC 40 82 00 08 */ bne lbl_802222D4 -/* 802222D0 38 C0 00 01 */ li r6, 1 -lbl_802222D4: -/* 802222D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802222D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802222DC 88 03 5E 2E */ lbz r0, 0x5e2e(r3) -/* 802222E0 98 A3 5E 26 */ stb r5, 0x5e26(r3) -/* 802222E4 98 03 5E 2D */ stb r0, 0x5e2d(r3) -/* 802222E8 98 C3 5E 4B */ stb r6, 0x5e4b(r3) -/* 802222EC 38 00 00 00 */ li r0, 0 -/* 802222F0 98 04 5E 3E */ stb r0, 0x5e3e(r4) -/* 802222F4 98 03 5E 2E */ stb r0, 0x5e2e(r3) -/* 802222F8 98 04 5E 58 */ stb r0, 0x5e58(r4) -lbl_802222FC: -/* 802222FC 88 07 01 CA */ lbz r0, 0x1ca(r7) -/* 80222300 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80222304 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80222308 88 83 5E 26 */ lbz r4, 0x5e26(r3) -/* 8022230C 7C 00 20 40 */ cmplw r0, r4 -/* 80222310 41 82 00 44 */ beq lbl_80222354 -/* 80222314 98 87 01 CA */ stb r4, 0x1ca(r7) -/* 80222318 88 07 01 CA */ lbz r0, 0x1ca(r7) -/* 8022231C 28 00 00 2D */ cmplwi r0, 0x2d -/* 80222320 41 82 00 0C */ beq lbl_8022232C -/* 80222324 28 00 00 2E */ cmplwi r0, 0x2e -/* 80222328 40 82 00 20 */ bne lbl_80222348 -lbl_8022232C: -/* 8022232C 98 03 5E 26 */ stb r0, 0x5e26(r3) -/* 80222330 38 00 00 05 */ li r0, 5 -/* 80222334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80222338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022233C 98 03 5E 2D */ stb r0, 0x5e2d(r3) -/* 80222340 38 00 00 01 */ li r0, 1 -/* 80222344 98 03 5E 4B */ stb r0, 0x5e4b(r3) -lbl_80222348: -/* 80222348 80 67 01 0C */ lwz r3, 0x10c(r7) -/* 8022234C 88 87 01 CA */ lbz r4, 0x1ca(r7) -/* 80222350 4B FF 55 B5 */ bl drawButton3D__13dMeter2Draw_cFUc -lbl_80222354: -/* 80222354 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80222358 7C 08 03 A6 */ mtlr r0 -/* 8022235C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80222360 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveButtonA__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveButtonA__9dMeter2_cFv.s deleted file mode 100644 index aa59b4c3ba..0000000000 --- a/asm/d/meter/d_meter2/moveButtonA__9dMeter2_cFv.s +++ /dev/null @@ -1,398 +0,0 @@ -lbl_80221244: -/* 80221244 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80221248 7C 08 02 A6 */ mflr r0 -/* 8022124C 90 01 00 74 */ stw r0, 0x74(r1) -/* 80221250 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80221254 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80221258 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 8022125C F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80221260 39 61 00 50 */ addi r11, r1, 0x50 -/* 80221264 48 14 0F 59 */ bl _savegpr_21 -/* 80221268 7C 7B 1B 78 */ mr r27, r3 -/* 8022126C 3B C0 00 00 */ li r30, 0 -/* 80221270 3B A0 00 00 */ li r29, 0 -/* 80221274 3B 80 00 00 */ li r28, 0 -/* 80221278 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022127C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221280 88 83 5E 3C */ lbz r4, 0x5e3c(r3) -/* 80221284 28 04 00 00 */ cmplwi r4, 0 -/* 80221288 41 82 00 1C */ beq lbl_802212A4 -/* 8022128C 88 03 5E 57 */ lbz r0, 0x5e57(r3) -/* 80221290 98 83 5E 24 */ stb r4, 0x5e24(r3) -/* 80221294 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 80221298 38 00 00 00 */ li r0, 0 -/* 8022129C 98 03 5E 3C */ stb r0, 0x5e3c(r3) -/* 802212A0 98 03 5E 57 */ stb r0, 0x5e57(r3) -lbl_802212A4: -/* 802212A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802212A8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802212AC 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 802212B0 38 00 00 00 */ li r0, 0 -/* 802212B4 88 63 05 6A */ lbz r3, 0x56a(r3) -/* 802212B8 28 03 00 00 */ cmplwi r3, 0 -/* 802212BC 41 82 00 10 */ beq lbl_802212CC -/* 802212C0 28 03 00 26 */ cmplwi r3, 0x26 -/* 802212C4 40 80 00 08 */ bge lbl_802212CC -/* 802212C8 38 00 00 01 */ li r0, 1 -lbl_802212CC: -/* 802212CC 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802212D0 41 82 00 50 */ beq lbl_80221320 -/* 802212D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802212D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802212DC 88 03 5E 24 */ lbz r0, 0x5e24(r3) -/* 802212E0 28 00 00 00 */ cmplwi r0, 0 -/* 802212E4 40 82 00 1C */ bne lbl_80221300 -/* 802212E8 38 00 00 15 */ li r0, 0x15 -/* 802212EC 98 03 5E 24 */ stb r0, 0x5e24(r3) -/* 802212F0 38 00 00 00 */ li r0, 0 -/* 802212F4 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 802212F8 3B 80 00 01 */ li r28, 1 -/* 802212FC 48 00 00 24 */ b lbl_80221320 -lbl_80221300: -/* 80221300 28 00 00 15 */ cmplwi r0, 0x15 -/* 80221304 40 82 00 1C */ bne lbl_80221320 -/* 80221308 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 8022130C 88 03 07 61 */ lbz r0, 0x761(r3) -/* 80221310 28 00 00 07 */ cmplwi r0, 7 -/* 80221314 41 82 00 0C */ beq lbl_80221320 -/* 80221318 3B A0 00 01 */ li r29, 1 -/* 8022131C 3B C0 00 01 */ li r30, 1 -lbl_80221320: -/* 80221320 88 1B 01 C4 */ lbz r0, 0x1c4(r27) -/* 80221324 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221328 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022132C 88 83 5E 24 */ lbz r4, 0x5e24(r3) -/* 80221330 7C 00 20 40 */ cmplw r0, r4 -/* 80221334 41 82 00 38 */ beq lbl_8022136C -/* 80221338 98 9B 01 C4 */ stb r4, 0x1c4(r27) -/* 8022133C 88 1B 01 C4 */ lbz r0, 0x1c4(r27) -/* 80221340 28 00 00 2D */ cmplwi r0, 0x2d -/* 80221344 41 82 00 0C */ beq lbl_80221350 -/* 80221348 28 00 00 2E */ cmplwi r0, 0x2e -/* 8022134C 40 82 00 18 */ bne lbl_80221364 -lbl_80221350: -/* 80221350 98 03 5E 24 */ stb r0, 0x5e24(r3) -/* 80221354 38 00 00 01 */ li r0, 1 -/* 80221358 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022135C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221360 98 03 5E 4A */ stb r0, 0x5e4a(r3) -lbl_80221364: -/* 80221364 3B A0 00 01 */ li r29, 1 -/* 80221368 3B C0 00 01 */ li r30, 1 -lbl_8022136C: -/* 8022136C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221370 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221374 88 03 5E 4A */ lbz r0, 0x5e4a(r3) -/* 80221378 54 04 07 BC */ rlwinm r4, r0, 0, 0x1e, 0x1e -/* 8022137C 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f -/* 80221380 88 1B 01 DC */ lbz r0, 0x1dc(r27) -/* 80221384 7C 00 18 40 */ cmplw r0, r3 -/* 80221388 41 82 00 18 */ beq lbl_802213A0 -/* 8022138C 30 04 FF FF */ addic r0, r4, -1 -/* 80221390 7C 00 21 10 */ subfe r0, r0, r4 -/* 80221394 98 1B 01 DC */ stb r0, 0x1dc(r27) -/* 80221398 3B A0 00 01 */ li r29, 1 -/* 8022139C 3B C0 00 01 */ li r30, 1 -lbl_802213A0: -/* 802213A0 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 802213A4 41 82 00 34 */ beq lbl_802213D8 -/* 802213A8 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 802213AC 88 03 07 61 */ lbz r0, 0x761(r3) -/* 802213B0 28 00 00 07 */ cmplwi r0, 7 -/* 802213B4 40 82 00 24 */ bne lbl_802213D8 -/* 802213B8 88 1B 01 FD */ lbz r0, 0x1fd(r27) -/* 802213BC 28 00 00 00 */ cmplwi r0, 0 -/* 802213C0 40 82 00 4C */ bne lbl_8022140C -/* 802213C4 3B A0 00 01 */ li r29, 1 -/* 802213C8 3B C0 00 01 */ li r30, 1 -/* 802213CC 38 00 00 01 */ li r0, 1 -/* 802213D0 98 1B 01 FD */ stb r0, 0x1fd(r27) -/* 802213D4 48 00 00 38 */ b lbl_8022140C -lbl_802213D8: -/* 802213D8 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 802213DC 40 82 00 30 */ bne lbl_8022140C -/* 802213E0 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 802213E4 88 03 07 61 */ lbz r0, 0x761(r3) -/* 802213E8 28 00 00 07 */ cmplwi r0, 7 -/* 802213EC 41 82 00 20 */ beq lbl_8022140C -/* 802213F0 88 1B 01 FD */ lbz r0, 0x1fd(r27) -/* 802213F4 28 00 00 01 */ cmplwi r0, 1 -/* 802213F8 40 82 00 14 */ bne lbl_8022140C -/* 802213FC 3B A0 00 01 */ li r29, 1 -/* 80221400 3B C0 00 01 */ li r30, 1 -/* 80221404 38 00 00 00 */ li r0, 0 -/* 80221408 98 1B 01 FD */ stb r0, 0x1fd(r27) -lbl_8022140C: -/* 8022140C C0 1B 02 B4 */ lfs f0, 0x2b4(r27) -/* 80221410 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221414 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221418 C0 23 00 A4 */ lfs f1, 0xa4(r3) -/* 8022141C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221420 41 82 00 0C */ beq lbl_8022142C -/* 80221424 D0 3B 02 B4 */ stfs f1, 0x2b4(r27) -/* 80221428 3B C0 00 01 */ li r30, 1 -lbl_8022142C: -/* 8022142C 38 60 00 00 */ li r3, 0 -/* 80221430 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221434 38 A4 EB C8 */ addi r5, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221438 38 00 00 02 */ li r0, 2 -/* 8022143C 7C 09 03 A6 */ mtctr r0 -lbl_80221440: -/* 80221440 38 03 02 E4 */ addi r0, r3, 0x2e4 -/* 80221444 7C 1B 04 2E */ lfsx f0, r27, r0 -/* 80221448 7C 85 1A 14 */ add r4, r5, r3 -/* 8022144C C0 24 00 B4 */ lfs f1, 0xb4(r4) -/* 80221450 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221454 41 82 00 0C */ beq lbl_80221460 -/* 80221458 7C 3B 05 2E */ stfsx f1, r27, r0 -/* 8022145C 3B C0 00 01 */ li r30, 1 -lbl_80221460: -/* 80221460 38 63 00 04 */ addi r3, r3, 4 -/* 80221464 42 00 FF DC */ bdnz lbl_80221440 -/* 80221468 C0 1B 02 B8 */ lfs f0, 0x2b8(r27) -/* 8022146C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221470 3B 23 EB C8 */ addi r25, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221474 C0 39 00 AC */ lfs f1, 0xac(r25) -/* 80221478 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8022147C 41 82 00 0C */ beq lbl_80221488 -/* 80221480 D0 3B 02 B8 */ stfs f1, 0x2b8(r27) -/* 80221484 3B C0 00 01 */ li r30, 1 -lbl_80221488: -/* 80221488 C0 1B 02 BC */ lfs f0, 0x2bc(r27) -/* 8022148C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221490 3B 03 EB C8 */ addi r24, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221494 C0 38 00 B0 */ lfs f1, 0xb0(r24) -/* 80221498 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8022149C 41 82 00 0C */ beq lbl_802214A8 -/* 802214A0 D0 3B 02 BC */ stfs f1, 0x2bc(r27) -/* 802214A4 3B C0 00 01 */ li r30, 1 -lbl_802214A8: -/* 802214A8 C0 1B 02 C0 */ lfs f0, 0x2c0(r27) -/* 802214AC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802214B0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802214B4 C0 23 02 B4 */ lfs f1, 0x2b4(r3) -/* 802214B8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802214BC 41 82 00 0C */ beq lbl_802214C8 -/* 802214C0 D0 3B 02 C0 */ stfs f1, 0x2c0(r27) -/* 802214C4 3B C0 00 01 */ li r30, 1 -lbl_802214C8: -/* 802214C8 C0 1B 02 C4 */ lfs f0, 0x2c4(r27) -/* 802214CC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802214D0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802214D4 C0 23 02 B8 */ lfs f1, 0x2b8(r3) -/* 802214D8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802214DC 41 82 00 0C */ beq lbl_802214E8 -/* 802214E0 D0 3B 02 C4 */ stfs f1, 0x2c4(r27) -/* 802214E4 3B C0 00 01 */ li r30, 1 -lbl_802214E8: -/* 802214E8 C0 1B 02 C8 */ lfs f0, 0x2c8(r27) -/* 802214EC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802214F0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802214F4 C0 23 02 BC */ lfs f1, 0x2bc(r3) -/* 802214F8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802214FC 41 82 00 0C */ beq lbl_80221508 -/* 80221500 D0 3B 02 C8 */ stfs f1, 0x2c8(r27) -/* 80221504 3B C0 00 01 */ li r30, 1 -lbl_80221508: -/* 80221508 7F 63 DB 78 */ mr r3, r27 -/* 8022150C 48 00 41 D1 */ bl isShowLightDrop__9dMeter2_cFv -/* 80221510 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80221514 41 82 00 30 */ beq lbl_80221544 -/* 80221518 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8022151C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221520 C0 03 00 E4 */ lfs f0, 0xe4(r3) -/* 80221524 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80221528 C0 03 00 E8 */ lfs f0, 0xe8(r3) -/* 8022152C D0 01 00 08 */ stfs f0, 8(r1) -/* 80221530 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 80221534 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80221538 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8022153C C3 E2 AF CC */ lfs f31, lit_4663(r2) -/* 80221540 48 00 00 B4 */ b lbl_802215F4 -lbl_80221544: -/* 80221544 88 7B 01 E6 */ lbz r3, 0x1e6(r27) -/* 80221548 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 8022154C 41 82 00 88 */ beq lbl_802215D4 -/* 80221550 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e -/* 80221554 41 82 00 40 */ beq lbl_80221594 -/* 80221558 38 60 00 00 */ li r3, 0 -/* 8022155C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221560 38 C4 EB C8 */ addi r6, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221564 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80221568 38 81 00 08 */ addi r4, r1, 8 -/* 8022156C 38 00 00 02 */ li r0, 2 -/* 80221570 7C 09 03 A6 */ mtctr r0 -lbl_80221574: -/* 80221574 7C E6 1A 14 */ add r7, r6, r3 -/* 80221578 C0 07 00 BC */ lfs f0, 0xbc(r7) -/* 8022157C 7C 05 1D 2E */ stfsx f0, r5, r3 -/* 80221580 C0 07 00 C4 */ lfs f0, 0xc4(r7) -/* 80221584 7C 04 1D 2E */ stfsx f0, r4, r3 -/* 80221588 38 63 00 04 */ addi r3, r3, 4 -/* 8022158C 42 00 FF E8 */ bdnz lbl_80221574 -/* 80221590 48 00 00 3C */ b lbl_802215CC -lbl_80221594: -/* 80221594 38 60 00 00 */ li r3, 0 -/* 80221598 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8022159C 38 C4 EB C8 */ addi r6, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802215A0 38 A1 00 10 */ addi r5, r1, 0x10 -/* 802215A4 38 81 00 08 */ addi r4, r1, 8 -/* 802215A8 38 00 00 02 */ li r0, 2 -/* 802215AC 7C 09 03 A6 */ mtctr r0 -lbl_802215B0: -/* 802215B0 7C E6 1A 14 */ add r7, r6, r3 -/* 802215B4 C0 07 00 D4 */ lfs f0, 0xd4(r7) -/* 802215B8 7C 05 1D 2E */ stfsx f0, r5, r3 -/* 802215BC C0 07 00 DC */ lfs f0, 0xdc(r7) -/* 802215C0 7C 04 1D 2E */ stfsx f0, r4, r3 -/* 802215C4 38 63 00 04 */ addi r3, r3, 4 -/* 802215C8 42 00 FF E8 */ bdnz lbl_802215B0 -lbl_802215CC: -/* 802215CC C3 E2 AF CC */ lfs f31, lit_4663(r2) -/* 802215D0 48 00 00 24 */ b lbl_802215F4 -lbl_802215D4: -/* 802215D4 C0 19 00 AC */ lfs f0, 0xac(r25) -/* 802215D8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802215DC C0 18 00 B0 */ lfs f0, 0xb0(r24) -/* 802215E0 D0 01 00 08 */ stfs f0, 8(r1) -/* 802215E4 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 802215E8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802215EC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802215F0 C3 E2 AF CC */ lfs f31, lit_4663(r2) -lbl_802215F4: -/* 802215F4 3A A0 00 00 */ li r21, 0 -/* 802215F8 3B 40 00 00 */ li r26, 0 -/* 802215FC 3B 01 00 10 */ addi r24, r1, 0x10 -/* 80221600 3B 21 00 08 */ addi r25, r1, 8 -lbl_80221604: -/* 80221604 7E FB D2 14 */ add r23, r27, r26 -/* 80221608 3A D7 01 34 */ addi r22, r23, 0x134 -/* 8022160C C0 17 01 34 */ lfs f0, 0x134(r23) -/* 80221610 7F D8 D4 2E */ lfsx f30, r24, r26 -/* 80221614 FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 80221618 41 82 00 3C */ beq lbl_80221654 -/* 8022161C 7E C3 B3 78 */ mr r3, r22 -/* 80221620 FC 20 F0 90 */ fmr f1, f30 -/* 80221624 C0 42 AF CC */ lfs f2, lit_4663(r2) -/* 80221628 C0 62 AF F0 */ lfs f3, lit_6051(r2) -/* 8022162C 48 04 E4 11 */ bl cLib_addCalc2__FPffff -/* 80221630 3B C0 00 01 */ li r30, 1 -/* 80221634 C0 16 00 00 */ lfs f0, 0(r22) -/* 80221638 EC 00 F0 28 */ fsubs f0, f0, f30 -/* 8022163C FC 00 02 10 */ fabs f0, f0 -/* 80221640 FC 20 00 18 */ frsp f1, f0 -/* 80221644 C0 02 AF E8 */ lfs f0, lit_5791(r2) -/* 80221648 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8022164C 40 80 00 08 */ bge lbl_80221654 -/* 80221650 D3 D6 00 00 */ stfs f30, 0(r22) -lbl_80221654: -/* 80221654 3A D7 01 3C */ addi r22, r23, 0x13c -/* 80221658 C0 17 01 3C */ lfs f0, 0x13c(r23) -/* 8022165C 7F D9 D4 2E */ lfsx f30, r25, r26 -/* 80221660 FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 80221664 41 82 00 3C */ beq lbl_802216A0 -/* 80221668 7E C3 B3 78 */ mr r3, r22 -/* 8022166C FC 20 F0 90 */ fmr f1, f30 -/* 80221670 C0 42 AF CC */ lfs f2, lit_4663(r2) -/* 80221674 C0 62 AF F0 */ lfs f3, lit_6051(r2) -/* 80221678 48 04 E3 C5 */ bl cLib_addCalc2__FPffff -/* 8022167C 3B C0 00 01 */ li r30, 1 -/* 80221680 C0 16 00 00 */ lfs f0, 0(r22) -/* 80221684 EC 00 F0 28 */ fsubs f0, f0, f30 -/* 80221688 FC 00 02 10 */ fabs f0, f0 -/* 8022168C FC 20 00 18 */ frsp f1, f0 -/* 80221690 C0 02 AF E8 */ lfs f0, lit_5791(r2) -/* 80221694 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80221698 40 80 00 08 */ bge lbl_802216A0 -/* 8022169C D3 D6 00 00 */ stfs f30, 0(r22) -lbl_802216A0: -/* 802216A0 3A B5 00 01 */ addi r21, r21, 1 -/* 802216A4 2C 15 00 02 */ cmpwi r21, 2 -/* 802216A8 3B 5A 00 04 */ addi r26, r26, 4 -/* 802216AC 41 80 FF 58 */ blt lbl_80221604 -/* 802216B0 C0 1B 01 44 */ lfs f0, 0x144(r27) -/* 802216B4 FC 00 F8 00 */ fcmpu cr0, f0, f31 -/* 802216B8 41 82 00 3C */ beq lbl_802216F4 -/* 802216BC 38 7B 01 44 */ addi r3, r27, 0x144 -/* 802216C0 FC 20 F8 90 */ fmr f1, f31 -/* 802216C4 C0 42 AF CC */ lfs f2, lit_4663(r2) -/* 802216C8 C0 62 AF F0 */ lfs f3, lit_6051(r2) -/* 802216CC 48 04 E3 71 */ bl cLib_addCalc2__FPffff -/* 802216D0 3B C0 00 01 */ li r30, 1 -/* 802216D4 C0 1B 01 44 */ lfs f0, 0x144(r27) -/* 802216D8 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 802216DC FC 00 02 10 */ fabs f0, f0 -/* 802216E0 FC 20 00 18 */ frsp f1, f0 -/* 802216E4 C0 02 AF F8 */ lfs f0, lit_6564(r2) -/* 802216E8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802216EC 40 80 00 08 */ bge lbl_802216F4 -/* 802216F0 D3 FB 01 44 */ stfs f31, 0x144(r27) -lbl_802216F4: -/* 802216F4 48 01 6B 39 */ bl getStatus__12dMsgObject_cFv -/* 802216F8 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 802216FC 20 60 00 01 */ subfic r3, r0, 1 -/* 80221700 30 03 FF FF */ addic r0, r3, -1 -/* 80221704 7C 00 19 10 */ subfe r0, r0, r3 -/* 80221708 88 7B 02 00 */ lbz r3, 0x200(r27) -/* 8022170C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80221710 7C 03 00 40 */ cmplw r3, r0 -/* 80221714 41 82 00 20 */ beq lbl_80221734 -/* 80221718 48 01 6B 15 */ bl getStatus__12dMsgObject_cFv -/* 8022171C 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80221720 20 60 00 01 */ subfic r3, r0, 1 -/* 80221724 30 03 FF FF */ addic r0, r3, -1 -/* 80221728 7C 00 19 10 */ subfe r0, r0, r3 -/* 8022172C 98 1B 02 00 */ stb r0, 0x200(r27) -/* 80221730 3B C0 00 01 */ li r30, 1 -lbl_80221734: -/* 80221734 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80221738 41 82 00 94 */ beq lbl_802217CC -/* 8022173C 3B 40 00 00 */ li r26, 0 -/* 80221740 80 1B 01 24 */ lwz r0, 0x124(r27) -/* 80221744 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80221748 40 82 00 3C */ bne lbl_80221784 -/* 8022174C 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 80221750 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80221754 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 80221758 7D 89 03 A6 */ mtctr r12 -/* 8022175C 4E 80 04 21 */ bctrl -/* 80221760 2C 03 00 00 */ cmpwi r3, 0 -/* 80221764 40 82 00 20 */ bne lbl_80221784 -/* 80221768 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 8022176C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80221770 81 8C 00 D0 */ lwz r12, 0xd0(r12) -/* 80221774 7D 89 03 A6 */ mtctr r12 -/* 80221778 4E 80 04 21 */ bctrl -/* 8022177C 2C 03 00 00 */ cmpwi r3, 0 -/* 80221780 41 82 00 08 */ beq lbl_80221788 -lbl_80221784: -/* 80221784 3B 40 00 01 */ li r26, 1 -lbl_80221788: -/* 80221788 57 43 06 3E */ clrlwi r3, r26, 0x18 -/* 8022178C 30 03 FF FF */ addic r0, r3, -1 -/* 80221790 7C C0 19 10 */ subfe r6, r0, r3 -/* 80221794 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 80221798 88 9B 01 C4 */ lbz r4, 0x1c4(r27) -/* 8022179C C0 3B 01 34 */ lfs f1, 0x134(r27) -/* 802217A0 C0 5B 01 3C */ lfs f2, 0x13c(r27) -/* 802217A4 C0 7B 01 38 */ lfs f3, 0x138(r27) -/* 802217A8 C0 9B 01 40 */ lfs f4, 0x140(r27) -/* 802217AC C0 BB 01 44 */ lfs f5, 0x144(r27) -/* 802217B0 7F A5 EB 78 */ mr r5, r29 -/* 802217B4 4B FF 55 F9 */ bl drawButtonA__13dMeter2Draw_cFUcfffffbb -/* 802217B8 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 802217BC 41 82 00 10 */ beq lbl_802217CC -/* 802217C0 38 00 00 00 */ li r0, 0 -/* 802217C4 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 802217C8 98 03 07 61 */ stb r0, 0x761(r3) -lbl_802217CC: -/* 802217CC E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 802217D0 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 802217D4 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 802217D8 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 802217DC 39 61 00 50 */ addi r11, r1, 0x50 -/* 802217E0 48 14 0A 29 */ bl _restgpr_21 -/* 802217E4 80 01 00 74 */ lwz r0, 0x74(r1) -/* 802217E8 7C 08 03 A6 */ mtlr r0 -/* 802217EC 38 21 00 70 */ addi r1, r1, 0x70 -/* 802217F0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveButtonB__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveButtonB__9dMeter2_cFv.s deleted file mode 100644 index ef1e13d25c..0000000000 --- a/asm/d/meter/d_meter2/moveButtonB__9dMeter2_cFv.s +++ /dev/null @@ -1,481 +0,0 @@ -lbl_802217F4: -/* 802217F4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802217F8 7C 08 02 A6 */ mflr r0 -/* 802217FC 90 01 00 74 */ stw r0, 0x74(r1) -/* 80221800 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80221804 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80221808 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 8022180C F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80221810 39 61 00 50 */ addi r11, r1, 0x50 -/* 80221814 48 14 09 A9 */ bl _savegpr_21 -/* 80221818 7C 7B 1B 78 */ mr r27, r3 -/* 8022181C 3B C0 00 00 */ li r30, 0 -/* 80221820 3B A0 00 00 */ li r29, 0 -/* 80221824 3B 80 00 00 */ li r28, 0 -/* 80221828 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022182C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221830 88 83 5E 35 */ lbz r4, 0x5e35(r3) -/* 80221834 28 04 00 00 */ cmplwi r4, 0 -/* 80221838 41 82 00 1C */ beq lbl_80221854 -/* 8022183C 88 03 5E 50 */ lbz r0, 0x5e50(r3) -/* 80221840 98 83 5E 1D */ stb r4, 0x5e1d(r3) -/* 80221844 98 03 5E 43 */ stb r0, 0x5e43(r3) -/* 80221848 38 00 00 00 */ li r0, 0 -/* 8022184C 98 03 5E 35 */ stb r0, 0x5e35(r3) -/* 80221850 98 03 5E 50 */ stb r0, 0x5e50(r3) -lbl_80221854: -/* 80221854 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221858 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022185C 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 80221860 38 00 00 00 */ li r0, 0 -/* 80221864 88 64 05 6A */ lbz r3, 0x56a(r4) -/* 80221868 28 03 00 00 */ cmplwi r3, 0 -/* 8022186C 41 82 00 10 */ beq lbl_8022187C -/* 80221870 28 03 00 26 */ cmplwi r3, 0x26 -/* 80221874 40 80 00 08 */ bge lbl_8022187C -/* 80221878 38 00 00 01 */ li r0, 1 -lbl_8022187C: -/* 8022187C 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80221880 41 82 00 64 */ beq lbl_802218E4 -/* 80221884 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221888 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022188C 88 03 5E 1D */ lbz r0, 0x5e1d(r3) -/* 80221890 28 00 00 00 */ cmplwi r0, 0 -/* 80221894 41 82 00 0C */ beq lbl_802218A0 -/* 80221898 28 00 00 26 */ cmplwi r0, 0x26 -/* 8022189C 40 82 00 24 */ bne lbl_802218C0 -lbl_802218A0: -/* 802218A0 38 00 00 44 */ li r0, 0x44 -/* 802218A4 98 03 5E 1D */ stb r0, 0x5e1d(r3) -/* 802218A8 38 00 00 00 */ li r0, 0 -/* 802218AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802218B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802218B4 98 03 5E 43 */ stb r0, 0x5e43(r3) -/* 802218B8 3B 80 00 01 */ li r28, 1 -/* 802218BC 48 00 00 68 */ b lbl_80221924 -lbl_802218C0: -/* 802218C0 28 00 00 44 */ cmplwi r0, 0x44 -/* 802218C4 40 82 00 60 */ bne lbl_80221924 -/* 802218C8 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 802218CC 88 03 07 62 */ lbz r0, 0x762(r3) -/* 802218D0 28 00 00 07 */ cmplwi r0, 7 -/* 802218D4 41 82 00 50 */ beq lbl_80221924 -/* 802218D8 3B A0 00 01 */ li r29, 1 -/* 802218DC 3B C0 00 01 */ li r30, 1 -/* 802218E0 48 00 00 44 */ b lbl_80221924 -lbl_802218E4: -/* 802218E4 88 04 05 6A */ lbz r0, 0x56a(r4) -/* 802218E8 28 00 00 2A */ cmplwi r0, 0x2a -/* 802218EC 41 82 00 24 */ beq lbl_80221910 -/* 802218F0 80 1B 01 24 */ lwz r0, 0x124(r27) -/* 802218F4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 802218F8 41 82 00 2C */ beq lbl_80221924 -/* 802218FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221900 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221904 88 03 5E 1D */ lbz r0, 0x5e1d(r3) -/* 80221908 28 00 00 26 */ cmplwi r0, 0x26 -/* 8022190C 40 82 00 18 */ bne lbl_80221924 -lbl_80221910: -/* 80221910 38 00 00 00 */ li r0, 0 -/* 80221914 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221918 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022191C 98 03 5E 1D */ stb r0, 0x5e1d(r3) -/* 80221920 98 03 5E 43 */ stb r0, 0x5e43(r3) -lbl_80221924: -/* 80221924 88 1B 01 C5 */ lbz r0, 0x1c5(r27) -/* 80221928 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022192C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221930 88 83 5E 1D */ lbz r4, 0x5e1d(r3) -/* 80221934 7C 00 20 40 */ cmplw r0, r4 -/* 80221938 41 82 00 38 */ beq lbl_80221970 -/* 8022193C 98 9B 01 C5 */ stb r4, 0x1c5(r27) -/* 80221940 88 1B 01 C5 */ lbz r0, 0x1c5(r27) -/* 80221944 28 00 00 2D */ cmplwi r0, 0x2d -/* 80221948 41 82 00 0C */ beq lbl_80221954 -/* 8022194C 28 00 00 2E */ cmplwi r0, 0x2e -/* 80221950 40 82 00 18 */ bne lbl_80221968 -lbl_80221954: -/* 80221954 98 03 5E 1D */ stb r0, 0x5e1d(r3) -/* 80221958 38 00 00 01 */ li r0, 1 -/* 8022195C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221964 98 03 5E 43 */ stb r0, 0x5e43(r3) -lbl_80221968: -/* 80221968 3B A0 00 01 */ li r29, 1 -/* 8022196C 3B C0 00 01 */ li r30, 1 -lbl_80221970: -/* 80221970 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221974 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221978 88 03 5E 43 */ lbz r0, 0x5e43(r3) -/* 8022197C 54 04 07 BC */ rlwinm r4, r0, 0, 0x1e, 0x1e -/* 80221980 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f -/* 80221984 88 1B 01 DD */ lbz r0, 0x1dd(r27) -/* 80221988 7C 00 18 40 */ cmplw r0, r3 -/* 8022198C 41 82 00 18 */ beq lbl_802219A4 -/* 80221990 30 04 FF FF */ addic r0, r4, -1 -/* 80221994 7C 00 21 10 */ subfe r0, r0, r4 -/* 80221998 98 1B 01 DD */ stb r0, 0x1dd(r27) -/* 8022199C 3B A0 00 01 */ li r29, 1 -/* 802219A0 3B C0 00 01 */ li r30, 1 -lbl_802219A4: -/* 802219A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802219A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802219AC 88 83 00 14 */ lbz r4, 0x14(r3) -/* 802219B0 88 7B 01 E2 */ lbz r3, 0x1e2(r27) -/* 802219B4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802219B8 7C 03 00 40 */ cmplw r3, r0 -/* 802219BC 41 82 00 10 */ beq lbl_802219CC -/* 802219C0 98 9B 01 E2 */ stb r4, 0x1e2(r27) -/* 802219C4 3B A0 00 01 */ li r29, 1 -/* 802219C8 3B C0 00 01 */ li r30, 1 -lbl_802219CC: -/* 802219CC 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 802219D0 41 82 00 34 */ beq lbl_80221A04 -/* 802219D4 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 802219D8 88 03 07 62 */ lbz r0, 0x762(r3) -/* 802219DC 28 00 00 07 */ cmplwi r0, 7 -/* 802219E0 40 82 00 24 */ bne lbl_80221A04 -/* 802219E4 88 1B 01 FE */ lbz r0, 0x1fe(r27) -/* 802219E8 28 00 00 00 */ cmplwi r0, 0 -/* 802219EC 40 82 00 4C */ bne lbl_80221A38 -/* 802219F0 3B A0 00 01 */ li r29, 1 -/* 802219F4 3B C0 00 01 */ li r30, 1 -/* 802219F8 38 00 00 01 */ li r0, 1 -/* 802219FC 98 1B 01 FE */ stb r0, 0x1fe(r27) -/* 80221A00 48 00 00 38 */ b lbl_80221A38 -lbl_80221A04: -/* 80221A04 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80221A08 40 82 00 30 */ bne lbl_80221A38 -/* 80221A0C 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 80221A10 88 03 07 62 */ lbz r0, 0x762(r3) -/* 80221A14 28 00 00 07 */ cmplwi r0, 7 -/* 80221A18 41 82 00 20 */ beq lbl_80221A38 -/* 80221A1C 88 1B 01 FE */ lbz r0, 0x1fe(r27) -/* 80221A20 28 00 00 01 */ cmplwi r0, 1 -/* 80221A24 40 82 00 14 */ bne lbl_80221A38 -/* 80221A28 3B A0 00 01 */ li r29, 1 -/* 80221A2C 3B C0 00 01 */ li r30, 1 -/* 80221A30 38 00 00 00 */ li r0, 0 -/* 80221A34 98 1B 01 FE */ stb r0, 0x1fe(r27) -lbl_80221A38: -/* 80221A38 C0 1B 02 CC */ lfs f0, 0x2cc(r27) -/* 80221A3C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221A40 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221A44 C0 23 00 EC */ lfs f1, 0xec(r3) -/* 80221A48 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221A4C 41 82 00 0C */ beq lbl_80221A58 -/* 80221A50 D0 3B 02 CC */ stfs f1, 0x2cc(r27) -/* 80221A54 3B C0 00 01 */ li r30, 1 -lbl_80221A58: -/* 80221A58 38 60 00 00 */ li r3, 0 -/* 80221A5C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221A60 38 A4 EB C8 */ addi r5, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221A64 38 00 00 02 */ li r0, 2 -/* 80221A68 7C 09 03 A6 */ mtctr r0 -lbl_80221A6C: -/* 80221A6C 38 03 02 EC */ addi r0, r3, 0x2ec -/* 80221A70 7C 1B 04 2E */ lfsx f0, r27, r0 -/* 80221A74 7C 85 1A 14 */ add r4, r5, r3 -/* 80221A78 C0 24 00 FC */ lfs f1, 0xfc(r4) -/* 80221A7C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221A80 41 82 00 0C */ beq lbl_80221A8C -/* 80221A84 7C 3B 05 2E */ stfsx f1, r27, r0 -/* 80221A88 3B C0 00 01 */ li r30, 1 -lbl_80221A8C: -/* 80221A8C 38 63 00 04 */ addi r3, r3, 4 -/* 80221A90 42 00 FF DC */ bdnz lbl_80221A6C -/* 80221A94 C0 1B 02 D0 */ lfs f0, 0x2d0(r27) -/* 80221A98 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221A9C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221AA0 C0 23 00 F4 */ lfs f1, 0xf4(r3) -/* 80221AA4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221AA8 41 82 00 0C */ beq lbl_80221AB4 -/* 80221AAC D0 3B 02 D0 */ stfs f1, 0x2d0(r27) -/* 80221AB0 3B C0 00 01 */ li r30, 1 -lbl_80221AB4: -/* 80221AB4 C0 1B 02 D4 */ lfs f0, 0x2d4(r27) -/* 80221AB8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221ABC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221AC0 C0 23 00 F8 */ lfs f1, 0xf8(r3) -/* 80221AC4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221AC8 41 82 00 0C */ beq lbl_80221AD4 -/* 80221ACC D0 3B 02 D4 */ stfs f1, 0x2d4(r27) -/* 80221AD0 3B C0 00 01 */ li r30, 1 -lbl_80221AD4: -/* 80221AD4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221AD8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221ADC 88 03 04 29 */ lbz r0, 0x429(r3) -/* 80221AE0 28 00 00 00 */ cmplwi r0, 0 -/* 80221AE4 41 82 00 08 */ beq lbl_80221AEC -/* 80221AE8 3B C0 00 01 */ li r30, 1 -lbl_80221AEC: -/* 80221AEC 38 60 00 00 */ li r3, 0 -/* 80221AF0 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221AF4 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221AF8 38 00 00 02 */ li r0, 2 -/* 80221AFC 7C 09 03 A6 */ mtctr r0 -lbl_80221B00: -/* 80221B00 7C DB 1A 14 */ add r6, r27, r3 -/* 80221B04 C0 06 02 F4 */ lfs f0, 0x2f4(r6) -/* 80221B08 7C A4 1A 14 */ add r5, r4, r3 -/* 80221B0C C0 25 02 20 */ lfs f1, 0x220(r5) -/* 80221B10 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221B14 41 82 00 0C */ beq lbl_80221B20 -/* 80221B18 D0 26 02 F4 */ stfs f1, 0x2f4(r6) -/* 80221B1C 3B C0 00 01 */ li r30, 1 -lbl_80221B20: -/* 80221B20 C0 06 02 FC */ lfs f0, 0x2fc(r6) -/* 80221B24 C0 25 02 28 */ lfs f1, 0x228(r5) -/* 80221B28 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221B2C 41 82 00 0C */ beq lbl_80221B38 -/* 80221B30 D0 26 02 FC */ stfs f1, 0x2fc(r6) -/* 80221B34 3B C0 00 01 */ li r30, 1 -lbl_80221B38: -/* 80221B38 C0 06 03 04 */ lfs f0, 0x304(r6) -/* 80221B3C C0 25 02 30 */ lfs f1, 0x230(r5) -/* 80221B40 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221B44 41 82 00 0C */ beq lbl_80221B50 -/* 80221B48 D0 26 03 04 */ stfs f1, 0x304(r6) -/* 80221B4C 3B C0 00 01 */ li r30, 1 -lbl_80221B50: -/* 80221B50 38 63 00 04 */ addi r3, r3, 4 -/* 80221B54 42 00 FF AC */ bdnz lbl_80221B00 -/* 80221B58 C0 1B 03 0C */ lfs f0, 0x30c(r27) -/* 80221B5C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221B60 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221B64 C0 23 02 D4 */ lfs f1, 0x2d4(r3) -/* 80221B68 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221B6C 41 82 00 0C */ beq lbl_80221B78 -/* 80221B70 D0 3B 03 0C */ stfs f1, 0x30c(r27) -/* 80221B74 3B C0 00 01 */ li r30, 1 -lbl_80221B78: -/* 80221B78 C0 1B 03 10 */ lfs f0, 0x310(r27) -/* 80221B7C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221B80 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221B84 C0 23 02 D8 */ lfs f1, 0x2d8(r3) -/* 80221B88 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221B8C 41 82 00 0C */ beq lbl_80221B98 -/* 80221B90 D0 3B 03 10 */ stfs f1, 0x310(r27) -/* 80221B94 3B C0 00 01 */ li r30, 1 -lbl_80221B98: -/* 80221B98 C0 1B 03 14 */ lfs f0, 0x314(r27) -/* 80221B9C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221BA0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221BA4 C0 23 02 DC */ lfs f1, 0x2dc(r3) -/* 80221BA8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221BAC 41 82 00 0C */ beq lbl_80221BB8 -/* 80221BB0 D0 3B 03 14 */ stfs f1, 0x314(r27) -/* 80221BB4 3B C0 00 01 */ li r30, 1 -lbl_80221BB8: -/* 80221BB8 7F 63 DB 78 */ mr r3, r27 -/* 80221BBC 48 00 3B 21 */ bl isShowLightDrop__9dMeter2_cFv -/* 80221BC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80221BC4 41 82 00 30 */ beq lbl_80221BF4 -/* 80221BC8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221BCC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221BD0 C0 03 01 1C */ lfs f0, 0x11c(r3) -/* 80221BD4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80221BD8 C0 03 01 20 */ lfs f0, 0x120(r3) -/* 80221BDC D0 01 00 08 */ stfs f0, 8(r1) -/* 80221BE0 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 80221BE4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80221BE8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80221BEC C3 E2 AF CC */ lfs f31, lit_4663(r2) -/* 80221BF0 48 00 00 B4 */ b lbl_80221CA4 -lbl_80221BF4: -/* 80221BF4 88 1B 01 E6 */ lbz r0, 0x1e6(r27) -/* 80221BF8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80221BFC 41 82 00 44 */ beq lbl_80221C40 -/* 80221C00 38 60 00 00 */ li r3, 0 -/* 80221C04 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221C08 38 C4 EB C8 */ addi r6, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221C0C 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80221C10 38 81 00 08 */ addi r4, r1, 8 -/* 80221C14 38 00 00 02 */ li r0, 2 -/* 80221C18 7C 09 03 A6 */ mtctr r0 -lbl_80221C1C: -/* 80221C1C 7C E6 1A 14 */ add r7, r6, r3 -/* 80221C20 C0 07 01 04 */ lfs f0, 0x104(r7) -/* 80221C24 7C 05 1D 2E */ stfsx f0, r5, r3 -/* 80221C28 C0 07 01 0C */ lfs f0, 0x10c(r7) -/* 80221C2C 7C 04 1D 2E */ stfsx f0, r4, r3 -/* 80221C30 38 63 00 04 */ addi r3, r3, 4 -/* 80221C34 42 00 FF E8 */ bdnz lbl_80221C1C -/* 80221C38 C3 E2 AF CC */ lfs f31, lit_4663(r2) -/* 80221C3C 48 00 00 68 */ b lbl_80221CA4 -lbl_80221C40: -/* 80221C40 38 C0 00 00 */ li r6, 0 -/* 80221C44 38 60 00 00 */ li r3, 0 -/* 80221C48 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221C4C 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221C50 C0 24 01 14 */ lfs f1, 0x114(r4) -/* 80221C54 C0 44 01 18 */ lfs f2, 0x118(r4) -/* 80221C58 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80221C5C 38 81 00 08 */ addi r4, r1, 8 -/* 80221C60 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 80221C64 38 00 00 02 */ li r0, 2 -/* 80221C68 7C 09 03 A6 */ mtctr r0 -lbl_80221C6C: -/* 80221C6C 80 1B 01 28 */ lwz r0, 0x128(r27) -/* 80221C70 28 00 00 00 */ cmplwi r0, 0 -/* 80221C74 41 82 00 18 */ beq lbl_80221C8C -/* 80221C78 2C 06 00 00 */ cmpwi r6, 0 -/* 80221C7C 40 82 00 10 */ bne lbl_80221C8C -/* 80221C80 7C 25 1D 2E */ stfsx f1, r5, r3 -/* 80221C84 7C 44 1D 2E */ stfsx f2, r4, r3 -/* 80221C88 48 00 00 0C */ b lbl_80221C94 -lbl_80221C8C: -/* 80221C8C 7C 05 1D 2E */ stfsx f0, r5, r3 -/* 80221C90 7C 04 1D 2E */ stfsx f0, r4, r3 -lbl_80221C94: -/* 80221C94 38 C6 00 01 */ addi r6, r6, 1 -/* 80221C98 38 63 00 04 */ addi r3, r3, 4 -/* 80221C9C 42 00 FF D0 */ bdnz lbl_80221C6C -/* 80221CA0 C3 E2 AF CC */ lfs f31, lit_4663(r2) -lbl_80221CA4: -/* 80221CA4 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 80221CA8 38 80 00 00 */ li r4, 0 -/* 80221CAC 4B FF A0 15 */ bl isBButtonShow__13dMeter2Draw_cFb -/* 80221CB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80221CB4 41 82 00 20 */ beq lbl_80221CD4 -/* 80221CB8 88 1B 01 FF */ lbz r0, 0x1ff(r27) -/* 80221CBC 28 00 00 00 */ cmplwi r0, 0 -/* 80221CC0 40 82 00 2C */ bne lbl_80221CEC -/* 80221CC4 38 00 00 01 */ li r0, 1 -/* 80221CC8 98 1B 01 FF */ stb r0, 0x1ff(r27) -/* 80221CCC 3B C0 00 01 */ li r30, 1 -/* 80221CD0 48 00 00 1C */ b lbl_80221CEC -lbl_80221CD4: -/* 80221CD4 88 1B 01 FF */ lbz r0, 0x1ff(r27) -/* 80221CD8 28 00 00 01 */ cmplwi r0, 1 -/* 80221CDC 40 82 00 10 */ bne lbl_80221CEC -/* 80221CE0 38 00 00 00 */ li r0, 0 -/* 80221CE4 98 1B 01 FF */ stb r0, 0x1ff(r27) -/* 80221CE8 3B C0 00 01 */ li r30, 1 -lbl_80221CEC: -/* 80221CEC 3A A0 00 00 */ li r21, 0 -/* 80221CF0 3B 40 00 00 */ li r26, 0 -/* 80221CF4 3B 01 00 10 */ addi r24, r1, 0x10 -/* 80221CF8 3B 21 00 08 */ addi r25, r1, 8 -lbl_80221CFC: -/* 80221CFC 7E FB D2 14 */ add r23, r27, r26 -/* 80221D00 3A D7 01 48 */ addi r22, r23, 0x148 -/* 80221D04 C0 17 01 48 */ lfs f0, 0x148(r23) -/* 80221D08 7F D8 D4 2E */ lfsx f30, r24, r26 -/* 80221D0C FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 80221D10 41 82 00 3C */ beq lbl_80221D4C -/* 80221D14 7E C3 B3 78 */ mr r3, r22 -/* 80221D18 FC 20 F0 90 */ fmr f1, f30 -/* 80221D1C C0 42 AF CC */ lfs f2, lit_4663(r2) -/* 80221D20 C0 62 AF F0 */ lfs f3, lit_6051(r2) -/* 80221D24 48 04 DD 19 */ bl cLib_addCalc2__FPffff -/* 80221D28 3B C0 00 01 */ li r30, 1 -/* 80221D2C C0 16 00 00 */ lfs f0, 0(r22) -/* 80221D30 EC 00 F0 28 */ fsubs f0, f0, f30 -/* 80221D34 FC 00 02 10 */ fabs f0, f0 -/* 80221D38 FC 20 00 18 */ frsp f1, f0 -/* 80221D3C C0 02 AF E8 */ lfs f0, lit_5791(r2) -/* 80221D40 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80221D44 40 80 00 08 */ bge lbl_80221D4C -/* 80221D48 D3 D6 00 00 */ stfs f30, 0(r22) -lbl_80221D4C: -/* 80221D4C 3A D7 01 50 */ addi r22, r23, 0x150 -/* 80221D50 C0 17 01 50 */ lfs f0, 0x150(r23) -/* 80221D54 7F D9 D4 2E */ lfsx f30, r25, r26 -/* 80221D58 FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 80221D5C 41 82 00 3C */ beq lbl_80221D98 -/* 80221D60 7E C3 B3 78 */ mr r3, r22 -/* 80221D64 FC 20 F0 90 */ fmr f1, f30 -/* 80221D68 C0 42 AF CC */ lfs f2, lit_4663(r2) -/* 80221D6C C0 62 AF F0 */ lfs f3, lit_6051(r2) -/* 80221D70 48 04 DC CD */ bl cLib_addCalc2__FPffff -/* 80221D74 3B C0 00 01 */ li r30, 1 -/* 80221D78 C0 16 00 00 */ lfs f0, 0(r22) -/* 80221D7C EC 00 F0 28 */ fsubs f0, f0, f30 -/* 80221D80 FC 00 02 10 */ fabs f0, f0 -/* 80221D84 FC 20 00 18 */ frsp f1, f0 -/* 80221D88 C0 02 AF E8 */ lfs f0, lit_5791(r2) -/* 80221D8C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80221D90 40 80 00 08 */ bge lbl_80221D98 -/* 80221D94 D3 D6 00 00 */ stfs f30, 0(r22) -lbl_80221D98: -/* 80221D98 3A B5 00 01 */ addi r21, r21, 1 -/* 80221D9C 2C 15 00 02 */ cmpwi r21, 2 -/* 80221DA0 3B 5A 00 04 */ addi r26, r26, 4 -/* 80221DA4 41 80 FF 58 */ blt lbl_80221CFC -/* 80221DA8 C0 1B 01 58 */ lfs f0, 0x158(r27) -/* 80221DAC FC 00 F8 00 */ fcmpu cr0, f0, f31 -/* 80221DB0 41 82 00 3C */ beq lbl_80221DEC -/* 80221DB4 38 7B 01 58 */ addi r3, r27, 0x158 -/* 80221DB8 FC 20 F8 90 */ fmr f1, f31 -/* 80221DBC C0 42 AF CC */ lfs f2, lit_4663(r2) -/* 80221DC0 C0 62 AF F0 */ lfs f3, lit_6051(r2) -/* 80221DC4 48 04 DC 79 */ bl cLib_addCalc2__FPffff -/* 80221DC8 3B C0 00 01 */ li r30, 1 -/* 80221DCC C0 1B 01 58 */ lfs f0, 0x158(r27) -/* 80221DD0 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 80221DD4 FC 00 02 10 */ fabs f0, f0 -/* 80221DD8 FC 20 00 18 */ frsp f1, f0 -/* 80221DDC C0 02 AF F8 */ lfs f0, lit_6564(r2) -/* 80221DE0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80221DE4 40 80 00 08 */ bge lbl_80221DEC -/* 80221DE8 D3 FB 01 58 */ stfs f31, 0x158(r27) -lbl_80221DEC: -/* 80221DEC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221DF0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80221DF4 88 03 05 68 */ lbz r0, 0x568(r3) -/* 80221DF8 28 00 00 00 */ cmplwi r0, 0 -/* 80221DFC 41 82 00 1C */ beq lbl_80221E18 -/* 80221E00 88 1B 04 BC */ lbz r0, 0x4bc(r27) -/* 80221E04 88 63 05 69 */ lbz r3, 0x569(r3) -/* 80221E08 7C 00 18 40 */ cmplw r0, r3 -/* 80221E0C 41 82 00 0C */ beq lbl_80221E18 -/* 80221E10 98 7B 04 BC */ stb r3, 0x4bc(r27) -/* 80221E14 3B C0 00 01 */ li r30, 1 -lbl_80221E18: -/* 80221E18 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 80221E1C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80221E20 81 8C 00 D0 */ lwz r12, 0xd0(r12) -/* 80221E24 7D 89 03 A6 */ mtctr r12 -/* 80221E28 4E 80 04 21 */ bctrl -/* 80221E2C 88 1B 01 C6 */ lbz r0, 0x1c6(r27) -/* 80221E30 7C 00 18 00 */ cmpw r0, r3 -/* 80221E34 41 82 00 20 */ beq lbl_80221E54 -/* 80221E38 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 80221E3C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80221E40 81 8C 00 D0 */ lwz r12, 0xd0(r12) -/* 80221E44 7D 89 03 A6 */ mtctr r12 -/* 80221E48 4E 80 04 21 */ bctrl -/* 80221E4C 98 7B 01 C6 */ stb r3, 0x1c6(r27) -/* 80221E50 3B C0 00 01 */ li r30, 1 -lbl_80221E54: -/* 80221E54 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80221E58 41 82 00 48 */ beq lbl_80221EA0 -/* 80221E5C 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 80221E60 88 9B 01 C5 */ lbz r4, 0x1c5(r27) -/* 80221E64 80 1B 01 28 */ lwz r0, 0x128(r27) -/* 80221E68 7C 00 00 34 */ cntlzw r0, r0 -/* 80221E6C 54 05 D9 7E */ srwi r5, r0, 5 -/* 80221E70 C0 3B 01 48 */ lfs f1, 0x148(r27) -/* 80221E74 C0 5B 01 50 */ lfs f2, 0x150(r27) -/* 80221E78 C0 7B 01 4C */ lfs f3, 0x14c(r27) -/* 80221E7C C0 9B 01 54 */ lfs f4, 0x154(r27) -/* 80221E80 C0 BB 01 58 */ lfs f5, 0x158(r27) -/* 80221E84 7F A6 EB 78 */ mr r6, r29 -/* 80221E88 4B FF 52 5D */ bl drawButtonB__13dMeter2Draw_cFUcbfffffb -/* 80221E8C 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80221E90 41 82 00 10 */ beq lbl_80221EA0 -/* 80221E94 38 00 00 00 */ li r0, 0 -/* 80221E98 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 80221E9C 98 03 07 62 */ stb r0, 0x762(r3) -lbl_80221EA0: -/* 80221EA0 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 80221EA4 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 80221EA8 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 80221EAC CB C1 00 50 */ lfd f30, 0x50(r1) -/* 80221EB0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80221EB4 48 14 03 55 */ bl _restgpr_21 -/* 80221EB8 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80221EBC 7C 08 03 A6 */ mtlr r0 -/* 80221EC0 38 21 00 70 */ addi r1, r1, 0x70 -/* 80221EC4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveButtonCross__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveButtonCross__9dMeter2_cFv.s deleted file mode 100644 index 678f63be81..0000000000 --- a/asm/d/meter/d_meter2/moveButtonCross__9dMeter2_cFv.s +++ /dev/null @@ -1,172 +0,0 @@ -lbl_80222E88: -/* 80222E88 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80222E8C 7C 08 02 A6 */ mflr r0 -/* 80222E90 90 01 00 44 */ stw r0, 0x44(r1) -/* 80222E94 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80222E98 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80222E9C DB C1 00 20 */ stfd f30, 0x20(r1) -/* 80222EA0 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 80222EA4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80222EA8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80222EAC 7C 7E 1B 78 */ mr r30, r3 -/* 80222EB0 3B E0 00 00 */ li r31, 0 -/* 80222EB4 C3 E2 AF C8 */ lfs f31, lit_4662(r2) -/* 80222EB8 C0 03 04 48 */ lfs f0, 0x448(r3) -/* 80222EBC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222EC0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222EC4 C0 23 04 00 */ lfs f1, 0x400(r3) -/* 80222EC8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222ECC 41 82 00 0C */ beq lbl_80222ED8 -/* 80222ED0 D0 3E 04 48 */ stfs f1, 0x448(r30) -/* 80222ED4 3B E0 00 01 */ li r31, 1 -lbl_80222ED8: -/* 80222ED8 C0 1E 04 4C */ lfs f0, 0x44c(r30) -/* 80222EDC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222EE0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222EE4 C0 23 04 04 */ lfs f1, 0x404(r3) -/* 80222EE8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222EEC 41 82 00 0C */ beq lbl_80222EF8 -/* 80222EF0 D0 3E 04 4C */ stfs f1, 0x44c(r30) -/* 80222EF4 3B E0 00 01 */ li r31, 1 -lbl_80222EF8: -/* 80222EF8 C0 1E 04 54 */ lfs f0, 0x454(r30) -/* 80222EFC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222F00 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222F04 C0 23 04 08 */ lfs f1, 0x408(r3) -/* 80222F08 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222F0C 41 82 00 0C */ beq lbl_80222F18 -/* 80222F10 D0 3E 04 54 */ stfs f1, 0x454(r30) -/* 80222F14 3B E0 00 01 */ li r31, 1 -lbl_80222F18: -/* 80222F18 C0 1E 04 58 */ lfs f0, 0x458(r30) -/* 80222F1C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222F20 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222F24 C0 23 04 0C */ lfs f1, 0x40c(r3) -/* 80222F28 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222F2C 41 82 00 0C */ beq lbl_80222F38 -/* 80222F30 D0 3E 04 58 */ stfs f1, 0x458(r30) -/* 80222F34 3B E0 00 01 */ li r31, 1 -lbl_80222F38: -/* 80222F38 C0 1E 04 50 */ lfs f0, 0x450(r30) -/* 80222F3C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222F40 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222F44 C0 23 03 FC */ lfs f1, 0x3fc(r3) -/* 80222F48 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222F4C 41 82 00 0C */ beq lbl_80222F58 -/* 80222F50 D0 3E 04 50 */ stfs f1, 0x450(r30) -/* 80222F54 3B E0 00 01 */ li r31, 1 -lbl_80222F58: -/* 80222F58 C0 1E 04 5C */ lfs f0, 0x45c(r30) -/* 80222F5C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222F60 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222F64 C0 23 04 10 */ lfs f1, 0x410(r3) -/* 80222F68 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222F6C 41 82 00 0C */ beq lbl_80222F78 -/* 80222F70 D0 3E 04 5C */ stfs f1, 0x45c(r30) -/* 80222F74 3B E0 00 01 */ li r31, 1 -lbl_80222F78: -/* 80222F78 80 7E 01 20 */ lwz r3, 0x120(r30) -/* 80222F7C 28 03 00 00 */ cmplwi r3, 0 -/* 80222F80 41 82 00 90 */ beq lbl_80223010 -/* 80222F84 4B FE A7 D9 */ bl getMapDispEdgeTop__11dMeterMap_cFv -/* 80222F88 FF E0 08 90 */ fmr f31, f1 -/* 80222F8C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80222F90 4B FF 52 A9 */ bl getButtonCrossParentInitTransY__13dMeter2Draw_cFv -/* 80222F94 EC 3F 08 28 */ fsubs f1, f31, f1 -/* 80222F98 C0 02 AF FC */ lfs f0, lit_7509(r2) -/* 80222F9C EC 21 00 28 */ fsubs f1, f1, f0 -/* 80222FA0 80 7E 01 20 */ lwz r3, 0x120(r30) -/* 80222FA4 88 03 00 2D */ lbz r0, 0x2d(r3) -/* 80222FA8 28 00 00 00 */ cmplwi r0, 0 -/* 80222FAC 41 82 00 3C */ beq lbl_80222FE8 -/* 80222FB0 A8 9E 01 B4 */ lha r4, 0x1b4(r30) -/* 80222FB4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222FB8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222FBC A8 03 04 20 */ lha r0, 0x420(r3) -/* 80222FC0 7C 04 00 00 */ cmpw r4, r0 -/* 80222FC4 40 80 00 14 */ bge lbl_80222FD8 -/* 80222FC8 38 04 00 01 */ addi r0, r4, 1 -/* 80222FCC B0 1E 01 B4 */ sth r0, 0x1b4(r30) -/* 80222FD0 3B E0 00 01 */ li r31, 1 -/* 80222FD4 48 00 00 08 */ b lbl_80222FDC -lbl_80222FD8: -/* 80222FD8 B0 1E 01 B4 */ sth r0, 0x1b4(r30) -lbl_80222FDC: -/* 80222FDC C0 1E 04 58 */ lfs f0, 0x458(r30) -/* 80222FE0 EF E0 08 2A */ fadds f31, f0, f1 -/* 80222FE4 48 00 00 2C */ b lbl_80223010 -lbl_80222FE8: -/* 80222FE8 A8 7E 01 B4 */ lha r3, 0x1b4(r30) -/* 80222FEC 2C 03 00 00 */ cmpwi r3, 0 -/* 80222FF0 40 81 00 14 */ ble lbl_80223004 -/* 80222FF4 38 03 FF FF */ addi r0, r3, -1 -/* 80222FF8 B0 1E 01 B4 */ sth r0, 0x1b4(r30) -/* 80222FFC 3B E0 00 01 */ li r31, 1 -/* 80223000 48 00 00 0C */ b lbl_8022300C -lbl_80223004: -/* 80223004 38 00 00 00 */ li r0, 0 -/* 80223008 B0 1E 01 B4 */ sth r0, 0x1b4(r30) -lbl_8022300C: -/* 8022300C C3 FE 04 4C */ lfs f31, 0x44c(r30) -lbl_80223010: -/* 80223010 C0 7E 04 48 */ lfs f3, 0x448(r30) -/* 80223014 A8 1E 01 B4 */ lha r0, 0x1b4(r30) -/* 80223018 C8 42 AF D8 */ lfd f2, lit_5267(r2) -/* 8022301C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80223020 90 01 00 0C */ stw r0, 0xc(r1) -/* 80223024 3C 80 43 30 */ lis r4, 0x4330 -/* 80223028 90 81 00 08 */ stw r4, 8(r1) -/* 8022302C C8 01 00 08 */ lfd f0, 8(r1) -/* 80223030 EC 20 10 28 */ fsubs f1, f0, f2 -/* 80223034 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80223038 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8022303C A8 03 04 20 */ lha r0, 0x420(r3) -/* 80223040 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80223044 90 01 00 14 */ stw r0, 0x14(r1) -/* 80223048 90 81 00 10 */ stw r4, 0x10(r1) -/* 8022304C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80223050 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80223054 EC 21 00 24 */ fdivs f1, f1, f0 -/* 80223058 C0 1E 04 54 */ lfs f0, 0x454(r30) -/* 8022305C EC 00 18 28 */ fsubs f0, f0, f3 -/* 80223060 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80223064 EF C3 00 2A */ fadds f30, f3, f0 -/* 80223068 C0 1E 01 5C */ lfs f0, 0x15c(r30) -/* 8022306C FC 00 F8 00 */ fcmpu cr0, f0, f31 -/* 80223070 41 82 00 3C */ beq lbl_802230AC -/* 80223074 38 7E 01 5C */ addi r3, r30, 0x15c -/* 80223078 FC 20 F8 90 */ fmr f1, f31 -/* 8022307C C0 42 AF EC */ lfs f2, lit_5933(r2) -/* 80223080 C0 62 B0 00 */ lfs f3, lit_7510(r2) -/* 80223084 48 04 C9 B9 */ bl cLib_addCalc2__FPffff -/* 80223088 C0 1E 01 5C */ lfs f0, 0x15c(r30) -/* 8022308C EC 00 F8 28 */ fsubs f0, f0, f31 -/* 80223090 FC 00 02 10 */ fabs f0, f0 -/* 80223094 FC 20 00 18 */ frsp f1, f0 -/* 80223098 C0 02 AF EC */ lfs f0, lit_5933(r2) -/* 8022309C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802230A0 40 80 00 08 */ bge lbl_802230A8 -/* 802230A4 D3 FE 01 5C */ stfs f31, 0x15c(r30) -lbl_802230A8: -/* 802230A8 3B E0 00 01 */ li r31, 1 -lbl_802230AC: -/* 802230AC 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 802230B0 28 00 00 01 */ cmplwi r0, 1 -/* 802230B4 40 82 00 14 */ bne lbl_802230C8 -/* 802230B8 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802230BC FC 20 F0 90 */ fmr f1, f30 -/* 802230C0 C0 5E 01 5C */ lfs f2, 0x15c(r30) -/* 802230C4 4B FF 51 91 */ bl drawButtonCross__13dMeter2Draw_cFff -lbl_802230C8: -/* 802230C8 7F C3 F3 78 */ mr r3, r30 -/* 802230CC 48 00 23 F5 */ bl alphaAnimeButtonCross__9dMeter2_cFv -/* 802230D0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 802230D4 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 802230D8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 802230DC CB C1 00 20 */ lfd f30, 0x20(r1) -/* 802230E0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802230E4 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802230E8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802230EC 7C 08 03 A6 */ mtlr r0 -/* 802230F0 38 21 00 40 */ addi r1, r1, 0x40 -/* 802230F4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveButtonR__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveButtonR__9dMeter2_cFv.s deleted file mode 100644 index 3be4d4ed20..0000000000 --- a/asm/d/meter/d_meter2/moveButtonR__9dMeter2_cFv.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_80221EC8: -/* 80221EC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80221ECC 7C 08 02 A6 */ mflr r0 -/* 80221ED0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80221ED4 7C 66 1B 78 */ mr r6, r3 -/* 80221ED8 39 00 00 00 */ li r8, 0 -/* 80221EDC 38 E0 00 00 */ li r7, 0 -/* 80221EE0 80 A3 01 28 */ lwz r5, 0x128(r3) -/* 80221EE4 28 05 00 00 */ cmplwi r5, 0 -/* 80221EE8 41 82 00 38 */ beq lbl_80221F20 -/* 80221EEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221EF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221EF4 88 83 00 16 */ lbz r4, 0x16(r3) -/* 80221EF8 88 66 01 C7 */ lbz r3, 0x1c7(r6) -/* 80221EFC 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80221F00 7C 03 00 40 */ cmplw r3, r0 -/* 80221F04 40 82 00 10 */ bne lbl_80221F14 -/* 80221F08 80 06 01 2C */ lwz r0, 0x12c(r6) -/* 80221F0C 7C 05 00 40 */ cmplw r5, r0 -/* 80221F10 41 82 00 10 */ beq lbl_80221F20 -lbl_80221F14: -/* 80221F14 98 86 01 C7 */ stb r4, 0x1c7(r6) -/* 80221F18 38 E0 00 01 */ li r7, 1 -/* 80221F1C 39 00 00 01 */ li r8, 1 -lbl_80221F20: -/* 80221F20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221F24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221F28 88 83 5E 34 */ lbz r4, 0x5e34(r3) -/* 80221F2C 28 04 00 00 */ cmplwi r4, 0 -/* 80221F30 41 82 00 1C */ beq lbl_80221F4C -/* 80221F34 88 03 5E 4F */ lbz r0, 0x5e4f(r3) -/* 80221F38 98 83 5E 1C */ stb r4, 0x5e1c(r3) -/* 80221F3C 98 03 5E 42 */ stb r0, 0x5e42(r3) -/* 80221F40 38 00 00 00 */ li r0, 0 -/* 80221F44 98 03 5E 34 */ stb r0, 0x5e34(r3) -/* 80221F48 98 03 5E 4F */ stb r0, 0x5e4f(r3) -lbl_80221F4C: -/* 80221F4C 88 06 01 C8 */ lbz r0, 0x1c8(r6) -/* 80221F50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221F54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221F58 88 83 5E 1C */ lbz r4, 0x5e1c(r3) -/* 80221F5C 7C 00 20 40 */ cmplw r0, r4 -/* 80221F60 41 82 00 38 */ beq lbl_80221F98 -/* 80221F64 98 86 01 C8 */ stb r4, 0x1c8(r6) -/* 80221F68 88 06 01 C8 */ lbz r0, 0x1c8(r6) -/* 80221F6C 28 00 00 2D */ cmplwi r0, 0x2d -/* 80221F70 41 82 00 0C */ beq lbl_80221F7C -/* 80221F74 28 00 00 2E */ cmplwi r0, 0x2e -/* 80221F78 40 82 00 18 */ bne lbl_80221F90 -lbl_80221F7C: -/* 80221F7C 98 03 5E 1C */ stb r0, 0x5e1c(r3) -/* 80221F80 38 00 00 01 */ li r0, 1 -/* 80221F84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221F88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221F8C 98 03 5E 42 */ stb r0, 0x5e42(r3) -lbl_80221F90: -/* 80221F90 38 E0 00 01 */ li r7, 1 -/* 80221F94 39 00 00 01 */ li r8, 1 -lbl_80221F98: -/* 80221F98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221F9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221FA0 88 03 5E 42 */ lbz r0, 0x5e42(r3) -/* 80221FA4 54 04 07 BC */ rlwinm r4, r0, 0, 0x1e, 0x1e -/* 80221FA8 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f -/* 80221FAC 88 06 01 DE */ lbz r0, 0x1de(r6) -/* 80221FB0 7C 00 18 40 */ cmplw r0, r3 -/* 80221FB4 41 82 00 18 */ beq lbl_80221FCC -/* 80221FB8 30 04 FF FF */ addic r0, r4, -1 -/* 80221FBC 7C 00 21 10 */ subfe r0, r0, r4 -/* 80221FC0 98 06 01 DE */ stb r0, 0x1de(r6) -/* 80221FC4 38 E0 00 01 */ li r7, 1 -/* 80221FC8 39 00 00 01 */ li r8, 1 -lbl_80221FCC: -/* 80221FCC 55 00 06 3F */ clrlwi. r0, r8, 0x18 -/* 80221FD0 41 82 00 20 */ beq lbl_80221FF0 -/* 80221FD4 80 66 01 0C */ lwz r3, 0x10c(r6) -/* 80221FD8 88 86 01 C7 */ lbz r4, 0x1c7(r6) -/* 80221FDC 88 A6 01 C8 */ lbz r5, 0x1c8(r6) -/* 80221FE0 80 06 01 28 */ lwz r0, 0x128(r6) -/* 80221FE4 7C 00 00 34 */ cntlzw r0, r0 -/* 80221FE8 54 06 D9 7E */ srwi r6, r0, 5 -/* 80221FEC 4B FF 56 61 */ bl drawButtonR__13dMeter2Draw_cFUcUcbb -lbl_80221FF0: -/* 80221FF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80221FF4 7C 08 03 A6 */ mtlr r0 -/* 80221FF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80221FFC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveButtonZ__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveButtonZ__9dMeter2_cFv.s deleted file mode 100644 index 08983218be..0000000000 --- a/asm/d/meter/d_meter2/moveButtonZ__9dMeter2_cFv.s +++ /dev/null @@ -1,188 +0,0 @@ -lbl_80222000: -/* 80222000 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80222004 7C 08 02 A6 */ mflr r0 -/* 80222008 90 01 00 14 */ stw r0, 0x14(r1) -/* 8022200C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80222010 93 C1 00 08 */ stw r30, 8(r1) -/* 80222014 7C 7F 1B 78 */ mr r31, r3 -/* 80222018 38 00 00 00 */ li r0, 0 -/* 8022201C C0 03 03 24 */ lfs f0, 0x324(r3) -/* 80222020 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222024 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222028 C0 23 01 74 */ lfs f1, 0x174(r3) -/* 8022202C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222030 41 82 00 0C */ beq lbl_8022203C -/* 80222034 D0 3F 03 24 */ stfs f1, 0x324(r31) -/* 80222038 38 00 00 01 */ li r0, 1 -lbl_8022203C: -/* 8022203C C0 1F 03 28 */ lfs f0, 0x328(r31) -/* 80222040 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222044 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222048 C0 23 01 7C */ lfs f1, 0x17c(r3) -/* 8022204C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222050 41 82 00 0C */ beq lbl_8022205C -/* 80222054 D0 3F 03 28 */ stfs f1, 0x328(r31) -/* 80222058 38 00 00 01 */ li r0, 1 -lbl_8022205C: -/* 8022205C C0 1F 03 2C */ lfs f0, 0x32c(r31) -/* 80222060 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222064 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222068 C0 23 01 80 */ lfs f1, 0x180(r3) -/* 8022206C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222070 41 82 00 0C */ beq lbl_8022207C -/* 80222074 D0 3F 03 2C */ stfs f1, 0x32c(r31) -/* 80222078 38 00 00 01 */ li r0, 1 -lbl_8022207C: -/* 8022207C C0 1F 03 84 */ lfs f0, 0x384(r31) -/* 80222080 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222084 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222088 C0 23 01 E0 */ lfs f1, 0x1e0(r3) -/* 8022208C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222090 41 82 00 0C */ beq lbl_8022209C -/* 80222094 D0 3F 03 84 */ stfs f1, 0x384(r31) -/* 80222098 38 00 00 01 */ li r0, 1 -lbl_8022209C: -/* 8022209C C0 1F 03 88 */ lfs f0, 0x388(r31) -/* 802220A0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802220A4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802220A8 C0 23 01 D8 */ lfs f1, 0x1d8(r3) -/* 802220AC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802220B0 41 82 00 0C */ beq lbl_802220BC -/* 802220B4 D0 3F 03 88 */ stfs f1, 0x388(r31) -/* 802220B8 38 00 00 01 */ li r0, 1 -lbl_802220BC: -/* 802220BC C0 1F 03 8C */ lfs f0, 0x38c(r31) -/* 802220C0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802220C4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802220C8 C0 23 01 DC */ lfs f1, 0x1dc(r3) -/* 802220CC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802220D0 41 82 00 0C */ beq lbl_802220DC -/* 802220D4 D0 3F 03 8C */ stfs f1, 0x38c(r31) -/* 802220D8 38 00 00 01 */ li r0, 1 -lbl_802220DC: -/* 802220DC C0 1F 03 E4 */ lfs f0, 0x3e4(r31) -/* 802220E0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802220E4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802220E8 C0 23 02 A0 */ lfs f1, 0x2a0(r3) -/* 802220EC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802220F0 41 82 00 0C */ beq lbl_802220FC -/* 802220F4 D0 3F 03 E4 */ stfs f1, 0x3e4(r31) -/* 802220F8 38 00 00 01 */ li r0, 1 -lbl_802220FC: -/* 802220FC C0 1F 03 E8 */ lfs f0, 0x3e8(r31) -/* 80222100 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222104 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222108 C0 23 02 A4 */ lfs f1, 0x2a4(r3) -/* 8022210C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222110 41 82 00 0C */ beq lbl_8022211C -/* 80222114 D0 3F 03 E8 */ stfs f1, 0x3e8(r31) -/* 80222118 38 00 00 01 */ li r0, 1 -lbl_8022211C: -/* 8022211C C0 1F 03 EC */ lfs f0, 0x3ec(r31) -/* 80222120 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222124 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222128 C0 23 02 A8 */ lfs f1, 0x2a8(r3) -/* 8022212C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222130 41 82 00 0C */ beq lbl_8022213C -/* 80222134 D0 3F 03 EC */ stfs f1, 0x3ec(r31) -/* 80222138 38 00 00 01 */ li r0, 1 -lbl_8022213C: -/* 8022213C C0 1F 03 30 */ lfs f0, 0x330(r31) -/* 80222140 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222144 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222148 C0 23 03 2C */ lfs f1, 0x32c(r3) -/* 8022214C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222150 41 82 00 0C */ beq lbl_8022215C -/* 80222154 D0 3F 03 30 */ stfs f1, 0x330(r31) -/* 80222158 38 00 00 01 */ li r0, 1 -lbl_8022215C: -/* 8022215C C0 1F 03 34 */ lfs f0, 0x334(r31) -/* 80222160 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222164 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222168 C0 23 03 30 */ lfs f1, 0x330(r3) -/* 8022216C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222170 41 82 00 0C */ beq lbl_8022217C -/* 80222174 D0 3F 03 34 */ stfs f1, 0x334(r31) -/* 80222178 38 00 00 01 */ li r0, 1 -lbl_8022217C: -/* 8022217C C0 1F 03 38 */ lfs f0, 0x338(r31) -/* 80222180 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80222184 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80222188 C0 23 03 34 */ lfs f1, 0x334(r3) -/* 8022218C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80222190 41 82 00 0C */ beq lbl_8022219C -/* 80222194 D0 3F 03 38 */ stfs f1, 0x338(r31) -/* 80222198 38 00 00 01 */ li r0, 1 -lbl_8022219C: -/* 8022219C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802221A0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802221A4 88 A4 5E 41 */ lbz r5, 0x5e41(r4) -/* 802221A8 28 05 00 00 */ cmplwi r5, 0 -/* 802221AC 41 82 00 1C */ beq lbl_802221C8 -/* 802221B0 88 64 5E 5B */ lbz r3, 0x5e5b(r4) -/* 802221B4 98 A4 5E 33 */ stb r5, 0x5e33(r4) -/* 802221B8 98 64 5E 4E */ stb r3, 0x5e4e(r4) -/* 802221BC 38 60 00 00 */ li r3, 0 -/* 802221C0 98 64 5E 41 */ stb r3, 0x5e41(r4) -/* 802221C4 98 64 5E 5B */ stb r3, 0x5e5b(r4) -lbl_802221C8: -/* 802221C8 88 9F 01 C9 */ lbz r4, 0x1c9(r31) -/* 802221CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802221D0 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802221D4 88 7E 5E 33 */ lbz r3, 0x5e33(r30) -/* 802221D8 7C 04 18 40 */ cmplw r4, r3 -/* 802221DC 40 82 00 0C */ bne lbl_802221E8 -/* 802221E0 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802221E4 41 82 00 3C */ beq lbl_80222220 -lbl_802221E8: -/* 802221E8 98 7F 01 C9 */ stb r3, 0x1c9(r31) -/* 802221EC 88 1F 01 C9 */ lbz r0, 0x1c9(r31) -/* 802221F0 28 00 00 2D */ cmplwi r0, 0x2d -/* 802221F4 41 82 00 0C */ beq lbl_80222200 -/* 802221F8 28 00 00 2E */ cmplwi r0, 0x2e -/* 802221FC 40 82 00 18 */ bne lbl_80222214 -lbl_80222200: -/* 80222200 98 1E 5E 33 */ stb r0, 0x5e33(r30) -/* 80222204 38 00 00 01 */ li r0, 1 -/* 80222208 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022220C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80222210 98 03 5E 4E */ stb r0, 0x5e4e(r3) -lbl_80222214: -/* 80222214 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80222218 88 9F 01 C9 */ lbz r4, 0x1c9(r31) -/* 8022221C 4B FF 54 D1 */ bl drawButtonZ__13dMeter2Draw_cFUc -lbl_80222220: -/* 80222220 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80222224 80 9F 01 24 */ lwz r4, 0x124(r31) -/* 80222228 4B FF 78 5D */ bl setButtonIconMidonaAlpha__13dMeter2Draw_cFUl -/* 8022222C 38 00 00 00 */ li r0, 0 -/* 80222230 98 1E 5E 33 */ stb r0, 0x5e33(r30) -/* 80222234 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80222238 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022223C 98 03 5E 4E */ stb r0, 0x5e4e(r3) -/* 80222240 88 A3 5E 38 */ lbz r5, 0x5e38(r3) -/* 80222244 28 05 00 00 */ cmplwi r5, 0 -/* 80222248 41 82 00 18 */ beq lbl_80222260 -/* 8022224C 88 83 5E 53 */ lbz r4, 0x5e53(r3) -/* 80222250 98 A3 5E 20 */ stb r5, 0x5e20(r3) -/* 80222254 98 83 5E 46 */ stb r4, 0x5e46(r3) -/* 80222258 98 03 5E 38 */ stb r0, 0x5e38(r3) -/* 8022225C 98 03 5E 53 */ stb r0, 0x5e53(r3) -lbl_80222260: -/* 80222260 88 1F 01 D1 */ lbz r0, 0x1d1(r31) -/* 80222264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80222268 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022226C 88 63 5E 20 */ lbz r3, 0x5e20(r3) -/* 80222270 7C 00 18 40 */ cmplw r0, r3 -/* 80222274 41 82 00 14 */ beq lbl_80222288 -/* 80222278 98 7F 01 D1 */ stb r3, 0x1d1(r31) -/* 8022227C 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80222280 88 9F 01 D1 */ lbz r4, 0x1d1(r31) -/* 80222284 4B FF 57 8D */ bl drawButtonBin__13dMeter2Draw_cFUc -lbl_80222288: -/* 80222288 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8022228C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80222290 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80222294 7C 08 03 A6 */ mtlr r0 -/* 80222298 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022229C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveKantera__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveKantera__9dMeter2_cFv.s deleted file mode 100644 index 8c809b40b5..0000000000 --- a/asm/d/meter/d_meter2/moveKantera__9dMeter2_cFv.s +++ /dev/null @@ -1,255 +0,0 @@ -lbl_80220180: -/* 80220180 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80220184 7C 08 02 A6 */ mflr r0 -/* 80220188 90 01 00 34 */ stw r0, 0x34(r1) -/* 8022018C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80220190 7C 7F 1B 78 */ mr r31, r3 -/* 80220194 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220198 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022019C A0 83 00 06 */ lhz r4, 6(r3) -/* 802201A0 38 E0 00 00 */ li r7, 0 -/* 802201A4 39 00 00 00 */ li r8, 0 -/* 802201A8 80 03 5D DC */ lwz r0, 0x5ddc(r3) -/* 802201AC 2C 00 00 00 */ cmpwi r0, 0 -/* 802201B0 41 82 00 50 */ beq lbl_80220200 -/* 802201B4 7C E4 02 14 */ add r7, r4, r0 -/* 802201B8 7C 07 20 00 */ cmpw r7, r4 -/* 802201BC 40 81 00 0C */ ble lbl_802201C8 -/* 802201C0 7C 87 23 78 */ mr r7, r4 -/* 802201C4 48 00 00 10 */ b lbl_802201D4 -lbl_802201C8: -/* 802201C8 2C 07 00 00 */ cmpwi r7, 0 -/* 802201CC 40 80 00 08 */ bge lbl_802201D4 -/* 802201D0 38 E0 00 00 */ li r7, 0 -lbl_802201D4: -/* 802201D4 B0 E3 00 06 */ sth r7, 6(r3) -/* 802201D8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802201DC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802201E0 A0 05 00 08 */ lhz r0, 8(r5) -/* 802201E4 80 85 5D D4 */ lwz r4, 0x5dd4(r5) -/* 802201E8 7C 00 38 50 */ subf r0, r0, r7 -/* 802201EC 7C 04 02 14 */ add r0, r4, r0 -/* 802201F0 90 05 5D D4 */ stw r0, 0x5dd4(r5) -/* 802201F4 38 00 00 00 */ li r0, 0 -/* 802201F8 90 03 5D DC */ stw r0, 0x5ddc(r3) -/* 802201FC 39 00 00 01 */ li r8, 1 -lbl_80220200: -/* 80220200 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220204 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220208 80 C5 5D D4 */ lwz r6, 0x5dd4(r5) -/* 8022020C 2C 06 00 00 */ cmpwi r6, 0 -/* 80220210 41 82 00 4C */ beq lbl_8022025C -/* 80220214 55 00 06 3F */ clrlwi. r0, r8, 0x18 -/* 80220218 40 82 00 08 */ bne lbl_80220220 -/* 8022021C A0 E3 00 06 */ lhz r7, 6(r3) -lbl_80220220: -/* 80220220 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220224 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220228 A0 04 00 08 */ lhz r0, 8(r4) -/* 8022022C 7C 00 32 14 */ add r0, r0, r6 -/* 80220230 7C 00 38 00 */ cmpw r0, r7 -/* 80220234 40 81 00 0C */ ble lbl_80220240 -/* 80220238 7C E0 3B 78 */ mr r0, r7 -/* 8022023C 48 00 00 10 */ b lbl_8022024C -lbl_80220240: -/* 80220240 2C 00 00 00 */ cmpwi r0, 0 -/* 80220244 40 80 00 08 */ bge lbl_8022024C -/* 80220248 38 00 00 00 */ li r0, 0 -lbl_8022024C: -/* 8022024C B0 04 00 08 */ sth r0, 8(r4) -/* 80220250 38 00 00 00 */ li r0, 0 -/* 80220254 90 05 5D D4 */ stw r0, 0x5dd4(r5) -/* 80220258 39 00 00 01 */ li r8, 1 -lbl_8022025C: -/* 8022025C A0 03 00 06 */ lhz r0, 6(r3) -/* 80220260 80 9F 01 A0 */ lwz r4, 0x1a0(r31) -/* 80220264 7C 04 00 00 */ cmpw r4, r0 -/* 80220268 41 82 00 50 */ beq lbl_802202B8 -/* 8022026C 40 80 00 28 */ bge lbl_80220294 -/* 80220270 38 04 00 C8 */ addi r0, r4, 0xc8 -/* 80220274 90 1F 01 A0 */ stw r0, 0x1a0(r31) -/* 80220278 A0 03 00 06 */ lhz r0, 6(r3) -/* 8022027C 80 9F 01 A0 */ lwz r4, 0x1a0(r31) -/* 80220280 7C 04 00 00 */ cmpw r4, r0 -/* 80220284 40 81 00 08 */ ble lbl_8022028C -/* 80220288 90 1F 01 A0 */ stw r0, 0x1a0(r31) -lbl_8022028C: -/* 8022028C 39 00 00 01 */ li r8, 1 -/* 80220290 48 00 00 28 */ b lbl_802202B8 -lbl_80220294: -/* 80220294 40 81 00 24 */ ble lbl_802202B8 -/* 80220298 38 04 FF 38 */ addi r0, r4, -200 -/* 8022029C 90 1F 01 A0 */ stw r0, 0x1a0(r31) -/* 802202A0 A0 03 00 06 */ lhz r0, 6(r3) -/* 802202A4 80 9F 01 A0 */ lwz r4, 0x1a0(r31) -/* 802202A8 7C 04 00 00 */ cmpw r4, r0 -/* 802202AC 40 80 00 08 */ bge lbl_802202B4 -/* 802202B0 90 1F 01 A0 */ stw r0, 0x1a0(r31) -lbl_802202B4: -/* 802202B4 39 00 00 01 */ li r8, 1 -lbl_802202B8: -/* 802202B8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802202BC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802202C0 A0 05 00 08 */ lhz r0, 8(r5) -/* 802202C4 80 9F 01 9C */ lwz r4, 0x19c(r31) -/* 802202C8 7C 04 00 00 */ cmpw r4, r0 -/* 802202CC 41 82 01 90 */ beq lbl_8022045C -/* 802202D0 40 80 00 84 */ bge lbl_80220354 -/* 802202D4 38 04 00 C8 */ addi r0, r4, 0xc8 -/* 802202D8 90 1F 01 9C */ stw r0, 0x19c(r31) -/* 802202DC A0 05 00 08 */ lhz r0, 8(r5) -/* 802202E0 80 7F 01 9C */ lwz r3, 0x19c(r31) -/* 802202E4 7C 03 00 00 */ cmpw r3, r0 -/* 802202E8 40 81 00 08 */ ble lbl_802202F0 -/* 802202EC 90 1F 01 9C */ stw r0, 0x19c(r31) -lbl_802202F0: -/* 802202F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802202F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802202F8 88 03 5E B7 */ lbz r0, 0x5eb7(r3) -/* 802202FC 28 00 00 00 */ cmplwi r0, 0 -/* 80220300 40 82 00 4C */ bne lbl_8022034C -/* 80220304 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80220308 C0 23 06 00 */ lfs f1, 0x600(r3) -/* 8022030C C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 80220310 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220314 40 81 00 38 */ ble lbl_8022034C -/* 80220318 38 00 00 25 */ li r0, 0x25 -/* 8022031C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80220320 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80220324 38 81 00 10 */ addi r4, r1, 0x10 -/* 80220328 38 A0 00 00 */ li r5, 0 -/* 8022032C 38 C0 00 00 */ li r6, 0 -/* 80220330 38 E0 00 00 */ li r7, 0 -/* 80220334 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80220338 FC 40 08 90 */ fmr f2, f1 -/* 8022033C C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 80220340 FC 80 18 90 */ fmr f4, f3 -/* 80220344 39 00 00 00 */ li r8, 0 -/* 80220348 48 08 C1 C5 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_8022034C: -/* 8022034C 39 00 00 01 */ li r8, 1 -/* 80220350 48 00 01 0C */ b lbl_8022045C -lbl_80220354: -/* 80220354 40 81 01 08 */ ble lbl_8022045C -/* 80220358 38 04 FF 38 */ addi r0, r4, -200 -/* 8022035C 90 1F 01 9C */ stw r0, 0x19c(r31) -/* 80220360 A0 05 00 08 */ lhz r0, 8(r5) -/* 80220364 80 9F 01 9C */ lwz r4, 0x19c(r31) -/* 80220368 7C 04 00 00 */ cmpw r4, r0 -/* 8022036C 40 80 00 08 */ bge lbl_80220374 -/* 80220370 90 1F 01 9C */ stw r0, 0x19c(r31) -lbl_80220374: -/* 80220374 80 1F 01 9C */ lwz r0, 0x19c(r31) -/* 80220378 2C 00 00 00 */ cmpwi r0, 0 -/* 8022037C 40 82 00 50 */ bne lbl_802203CC -/* 80220380 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80220384 C0 23 06 00 */ lfs f1, 0x600(r3) -/* 80220388 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 8022038C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220390 40 81 00 C8 */ ble lbl_80220458 -/* 80220394 38 00 00 27 */ li r0, 0x27 -/* 80220398 90 01 00 0C */ stw r0, 0xc(r1) -/* 8022039C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802203A0 38 81 00 0C */ addi r4, r1, 0xc -/* 802203A4 38 A0 00 00 */ li r5, 0 -/* 802203A8 38 C0 00 00 */ li r6, 0 -/* 802203AC 38 E0 00 00 */ li r7, 0 -/* 802203B0 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 802203B4 FC 40 08 90 */ fmr f2, f1 -/* 802203B8 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 802203BC FC 80 18 90 */ fmr f4, f3 -/* 802203C0 39 00 00 00 */ li r8, 0 -/* 802203C4 48 08 B5 C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 802203C8 48 00 00 90 */ b lbl_80220458 -lbl_802203CC: -/* 802203CC A0 63 00 06 */ lhz r3, 6(r3) -/* 802203D0 A0 05 00 08 */ lhz r0, 8(r5) -/* 802203D4 C8 42 AF E0 */ lfd f2, lit_5268(r2) -/* 802203D8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802203DC 3C 00 43 30 */ lis r0, 0x4330 -/* 802203E0 90 01 00 18 */ stw r0, 0x18(r1) -/* 802203E4 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802203E8 EC 20 10 28 */ fsubs f1, f0, f2 -/* 802203EC 90 61 00 24 */ stw r3, 0x24(r1) -/* 802203F0 90 01 00 20 */ stw r0, 0x20(r1) -/* 802203F4 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802203F8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802203FC EC 21 00 24 */ fdivs f1, f1, f0 -/* 80220400 C0 02 AF E8 */ lfs f0, lit_5791(r2) -/* 80220404 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220408 4C 40 13 82 */ cror 2, 0, 2 -/* 8022040C 40 82 00 4C */ bne lbl_80220458 -/* 80220410 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80220414 C0 23 06 00 */ lfs f1, 0x600(r3) -/* 80220418 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 8022041C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220420 40 81 00 38 */ ble lbl_80220458 -/* 80220424 38 00 00 26 */ li r0, 0x26 -/* 80220428 90 01 00 08 */ stw r0, 8(r1) -/* 8022042C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80220430 38 81 00 08 */ addi r4, r1, 8 -/* 80220434 38 A0 00 00 */ li r5, 0 -/* 80220438 38 C0 00 00 */ li r6, 0 -/* 8022043C 38 E0 00 00 */ li r7, 0 -/* 80220440 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80220444 FC 40 08 90 */ fmr f2, f1 -/* 80220448 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 8022044C FC 80 18 90 */ fmr f4, f3 -/* 80220450 39 00 00 00 */ li r8, 0 -/* 80220454 48 08 C0 B9 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80220458: -/* 80220458 39 00 00 01 */ li r8, 1 -lbl_8022045C: -/* 8022045C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220460 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220464 C0 24 00 60 */ lfs f1, 0x60(r4) -/* 80220468 C0 44 00 64 */ lfs f2, 0x64(r4) -/* 8022046C A8 1F 02 46 */ lha r0, 0x246(r31) -/* 80220470 A8 7F 01 94 */ lha r3, 0x194(r31) -/* 80220474 7C 00 18 00 */ cmpw r0, r3 -/* 80220478 41 82 00 0C */ beq lbl_80220484 -/* 8022047C B0 7F 02 46 */ sth r3, 0x246(r31) -/* 80220480 39 00 00 01 */ li r8, 1 -lbl_80220484: -/* 80220484 C0 1F 02 2C */ lfs f0, 0x22c(r31) -/* 80220488 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8022048C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220490 C0 63 00 54 */ lfs f3, 0x54(r3) -/* 80220494 FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 80220498 41 82 00 0C */ beq lbl_802204A4 -/* 8022049C D0 7F 02 2C */ stfs f3, 0x22c(r31) -/* 802204A0 39 00 00 01 */ li r8, 1 -lbl_802204A4: -/* 802204A4 C0 1F 02 30 */ lfs f0, 0x230(r31) -/* 802204A8 C0 64 00 60 */ lfs f3, 0x60(r4) -/* 802204AC FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 802204B0 41 82 00 0C */ beq lbl_802204BC -/* 802204B4 D0 7F 02 30 */ stfs f3, 0x230(r31) -/* 802204B8 39 00 00 01 */ li r8, 1 -lbl_802204BC: -/* 802204BC C0 1F 02 34 */ lfs f0, 0x234(r31) -/* 802204C0 C0 64 00 64 */ lfs f3, 0x64(r4) -/* 802204C4 FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 802204C8 41 82 00 0C */ beq lbl_802204D4 -/* 802204CC D0 7F 02 34 */ stfs f3, 0x234(r31) -/* 802204D0 39 00 00 01 */ li r8, 1 -lbl_802204D4: -/* 802204D4 55 00 06 3E */ clrlwi r0, r8, 0x18 -/* 802204D8 28 00 00 01 */ cmplwi r0, 1 -/* 802204DC 40 82 00 14 */ bne lbl_802204F0 -/* 802204E0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802204E4 80 9F 01 A0 */ lwz r4, 0x1a0(r31) -/* 802204E8 80 BF 01 9C */ lwz r5, 0x19c(r31) -/* 802204EC 4B FF 4F BD */ bl drawKantera__13dMeter2Draw_cFllff -lbl_802204F0: -/* 802204F0 7F E3 FB 78 */ mr r3, r31 -/* 802204F4 48 00 45 11 */ bl alphaAnimeKantera__9dMeter2_cFv -/* 802204F8 80 1F 01 9C */ lwz r0, 0x19c(r31) -/* 802204FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220500 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220504 90 03 5D D8 */ stw r0, 0x5dd8(r3) -/* 80220508 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8022050C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80220510 7C 08 03 A6 */ mtlr r0 -/* 80220514 38 21 00 30 */ addi r1, r1, 0x30 -/* 80220518 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveKey__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveKey__9dMeter2_cFv.s deleted file mode 100644 index 04338982e8..0000000000 --- a/asm/d/meter/d_meter2/moveKey__9dMeter2_cFv.s +++ /dev/null @@ -1,115 +0,0 @@ -lbl_802210AC: -/* 802210AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802210B0 7C 08 02 A6 */ mflr r0 -/* 802210B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802210B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802210BC 7C 7F 1B 78 */ mr r31, r3 -/* 802210C0 38 C0 00 00 */ li r6, 0 -/* 802210C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802210C8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802210CC A8 64 5D C8 */ lha r3, 0x5dc8(r4) -/* 802210D0 7C 60 07 35 */ extsh. r0, r3 -/* 802210D4 41 82 00 40 */ beq lbl_80221114 -/* 802210D8 88 04 09 74 */ lbz r0, 0x974(r4) -/* 802210DC 7C 00 1A 14 */ add r0, r0, r3 -/* 802210E0 7C 05 07 34 */ extsh r5, r0 -/* 802210E4 2C 05 00 63 */ cmpwi r5, 0x63 -/* 802210E8 40 81 00 0C */ ble lbl_802210F4 -/* 802210EC 38 A0 00 63 */ li r5, 0x63 -/* 802210F0 48 00 00 10 */ b lbl_80221100 -lbl_802210F4: -/* 802210F4 7C A0 07 35 */ extsh. r0, r5 -/* 802210F8 40 80 00 08 */ bge lbl_80221100 -/* 802210FC 38 A0 00 00 */ li r5, 0 -lbl_80221100: -/* 80221100 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221104 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221108 98 A3 09 74 */ stb r5, 0x974(r3) -/* 8022110C 38 00 00 00 */ li r0, 0 -/* 80221110 B0 04 5D C8 */ sth r0, 0x5dc8(r4) -lbl_80221114: -/* 80221114 A8 9F 01 B2 */ lha r4, 0x1b2(r31) -/* 80221118 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022111C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221120 88 03 09 74 */ lbz r0, 0x974(r3) -/* 80221124 7C 04 00 00 */ cmpw r4, r0 -/* 80221128 41 82 00 28 */ beq lbl_80221150 -/* 8022112C 40 80 00 14 */ bge lbl_80221140 -/* 80221130 38 04 00 01 */ addi r0, r4, 1 -/* 80221134 B0 1F 01 B2 */ sth r0, 0x1b2(r31) -/* 80221138 38 C0 00 01 */ li r6, 1 -/* 8022113C 48 00 00 14 */ b lbl_80221150 -lbl_80221140: -/* 80221140 40 81 00 10 */ ble lbl_80221150 -/* 80221144 38 04 FF FF */ addi r0, r4, -1 -/* 80221148 B0 1F 01 B2 */ sth r0, 0x1b2(r31) -/* 8022114C 38 C0 00 01 */ li r6, 1 -lbl_80221150: -/* 80221150 C0 1F 02 9C */ lfs f0, 0x29c(r31) -/* 80221154 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221158 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8022115C C0 23 03 5C */ lfs f1, 0x35c(r3) -/* 80221160 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221164 41 82 00 0C */ beq lbl_80221170 -/* 80221168 D0 3F 02 9C */ stfs f1, 0x29c(r31) -/* 8022116C 38 C0 00 01 */ li r6, 1 -lbl_80221170: -/* 80221170 C0 1F 02 A0 */ lfs f0, 0x2a0(r31) -/* 80221174 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221178 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8022117C C0 23 03 60 */ lfs f1, 0x360(r3) -/* 80221180 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221184 41 82 00 0C */ beq lbl_80221190 -/* 80221188 D0 3F 02 A0 */ stfs f1, 0x2a0(r31) -/* 8022118C 38 C0 00 01 */ li r6, 1 -lbl_80221190: -/* 80221190 C0 1F 02 A4 */ lfs f0, 0x2a4(r31) -/* 80221194 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221198 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8022119C C0 23 03 64 */ lfs f1, 0x364(r3) -/* 802211A0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802211A4 41 82 00 0C */ beq lbl_802211B0 -/* 802211A8 D0 3F 02 A4 */ stfs f1, 0x2a4(r31) -/* 802211AC 38 C0 00 01 */ li r6, 1 -lbl_802211B0: -/* 802211B0 C0 1F 02 A8 */ lfs f0, 0x2a8(r31) -/* 802211B4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802211B8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802211BC C0 23 03 8C */ lfs f1, 0x38c(r3) -/* 802211C0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802211C4 41 82 00 0C */ beq lbl_802211D0 -/* 802211C8 D0 3F 02 A8 */ stfs f1, 0x2a8(r31) -/* 802211CC 38 C0 00 01 */ li r6, 1 -lbl_802211D0: -/* 802211D0 C0 1F 02 AC */ lfs f0, 0x2ac(r31) -/* 802211D4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802211D8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802211DC C0 23 03 90 */ lfs f1, 0x390(r3) -/* 802211E0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802211E4 41 82 00 0C */ beq lbl_802211F0 -/* 802211E8 D0 3F 02 AC */ stfs f1, 0x2ac(r31) -/* 802211EC 38 C0 00 01 */ li r6, 1 -lbl_802211F0: -/* 802211F0 C0 1F 02 B0 */ lfs f0, 0x2b0(r31) -/* 802211F4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802211F8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802211FC C0 23 03 94 */ lfs f1, 0x394(r3) -/* 80221200 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221204 41 82 00 0C */ beq lbl_80221210 -/* 80221208 D0 3F 02 B0 */ stfs f1, 0x2b0(r31) -/* 8022120C 38 C0 00 01 */ li r6, 1 -lbl_80221210: -/* 80221210 54 C0 06 3E */ clrlwi r0, r6, 0x18 -/* 80221214 28 00 00 01 */ cmplwi r0, 1 -/* 80221218 40 82 00 10 */ bne lbl_80221228 -/* 8022121C 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80221220 A8 9F 01 B2 */ lha r4, 0x1b2(r31) -/* 80221224 4B FF 58 1D */ bl drawKey__13dMeter2Draw_cFs -lbl_80221228: -/* 80221228 7F E3 FB 78 */ mr r3, r31 -/* 8022122C 48 00 3D 45 */ bl alphaAnimeKey__9dMeter2_cFv -/* 80221230 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80221234 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80221238 7C 08 03 A6 */ mtlr r0 -/* 8022123C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80221240 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveLife__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveLife__9dMeter2_cFv.s deleted file mode 100644 index 6e57fa91c8..0000000000 --- a/asm/d/meter/d_meter2/moveLife__9dMeter2_cFv.s +++ /dev/null @@ -1,289 +0,0 @@ -lbl_8021FD60: -/* 8021FD60 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8021FD64 7C 08 02 A6 */ mflr r0 -/* 8021FD68 90 01 00 34 */ stw r0, 0x34(r1) -/* 8021FD6C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8021FD70 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8021FD74 7C 7E 1B 78 */ mr r30, r3 -/* 8021FD78 38 C0 00 00 */ li r6, 0 -/* 8021FD7C 38 00 00 00 */ li r0, 0 -/* 8021FD80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FD84 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FD88 A8 A4 5D CA */ lha r5, 0x5dca(r4) -/* 8021FD8C 7C A3 07 35 */ extsh. r3, r5 -/* 8021FD90 41 82 00 90 */ beq lbl_8021FE20 -/* 8021FD94 A0 04 00 00 */ lhz r0, 0(r4) -/* 8021FD98 7C 00 2A 14 */ add r0, r0, r5 -/* 8021FD9C 7C 05 07 34 */ extsh r5, r0 -/* 8021FDA0 2C 05 00 64 */ cmpwi r5, 0x64 -/* 8021FDA4 40 81 00 0C */ ble lbl_8021FDB0 -/* 8021FDA8 38 A0 00 64 */ li r5, 0x64 -/* 8021FDAC 48 00 00 10 */ b lbl_8021FDBC -lbl_8021FDB0: -/* 8021FDB0 2C 05 00 0F */ cmpwi r5, 0xf -/* 8021FDB4 40 80 00 08 */ bge lbl_8021FDBC -/* 8021FDB8 38 A0 00 0F */ li r5, 0xf -lbl_8021FDBC: -/* 8021FDBC 7C A3 07 34 */ extsh r3, r5 -/* 8021FDC0 38 00 00 05 */ li r0, 5 -/* 8021FDC4 7C 03 03 D6 */ divw r0, r3, r0 -/* 8021FDC8 54 00 10 3A */ slwi r0, r0, 2 -/* 8021FDCC 7C 06 07 34 */ extsh r6, r0 -/* 8021FDD0 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 8021FDD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FDD8 B4 03 61 C0 */ sthu r0, g_dComIfG_gameInfo@l(r3) /* 0x804061C0@l */ -/* 8021FDDC A0 03 00 02 */ lhz r0, 2(r3) -/* 8021FDE0 C0 43 5D C0 */ lfs f2, 0x5dc0(r3) -/* 8021FDE4 7C 00 30 50 */ subf r0, r0, r6 -/* 8021FDE8 7C 00 07 34 */ extsh r0, r0 -/* 8021FDEC C8 22 AF D8 */ lfd f1, lit_5267(r2) -/* 8021FDF0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8021FDF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021FDF8 3C 00 43 30 */ lis r0, 0x4330 -/* 8021FDFC 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021FE00 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8021FE04 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8021FE08 EC 02 00 2A */ fadds f0, f2, f0 -/* 8021FE0C D0 03 5D C0 */ stfs f0, 0x5dc0(r3) -/* 8021FE10 38 00 00 00 */ li r0, 0 -/* 8021FE14 98 03 5E B6 */ stb r0, 0x5eb6(r3) -/* 8021FE18 B0 04 5D CA */ sth r0, 0x5dca(r4) -/* 8021FE1C 38 00 00 01 */ li r0, 1 -lbl_8021FE20: -/* 8021FE20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FE24 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FE28 C0 25 5D C0 */ lfs f1, 0x5dc0(r5) -/* 8021FE2C C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 8021FE30 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8021FE34 41 82 00 C0 */ beq lbl_8021FEF4 -/* 8021FE38 88 65 5E B6 */ lbz r3, 0x5eb6(r5) -/* 8021FE3C 98 7E 01 EE */ stb r3, 0x1ee(r30) -/* 8021FE40 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8021FE44 40 82 00 18 */ bne lbl_8021FE5C -/* 8021FE48 A0 65 00 00 */ lhz r3, 0(r5) -/* 8021FE4C 38 00 00 05 */ li r0, 5 -/* 8021FE50 7C 03 03 D6 */ divw r0, r3, r0 -/* 8021FE54 54 00 10 3A */ slwi r0, r0, 2 -/* 8021FE58 7C 06 07 34 */ extsh r6, r0 -lbl_8021FE5C: -/* 8021FE5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FE60 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FE64 A0 04 00 02 */ lhz r0, 2(r4) -/* 8021FE68 C8 22 AF E0 */ lfd f1, lit_5268(r2) -/* 8021FE6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021FE70 3C 00 43 30 */ lis r0, 0x4330 -/* 8021FE74 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021FE78 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8021FE7C EC 20 08 28 */ fsubs f1, f0, f1 -/* 8021FE80 C0 05 5D C0 */ lfs f0, 0x5dc0(r5) -/* 8021FE84 EC 01 00 2A */ fadds f0, f1, f0 -/* 8021FE88 FC 00 00 1E */ fctiwz f0, f0 -/* 8021FE8C D8 01 00 18 */ stfd f0, 0x18(r1) -/* 8021FE90 80 E1 00 1C */ lwz r7, 0x1c(r1) -/* 8021FE94 7C E3 07 34 */ extsh r3, r7 -/* 8021FE98 7C C0 07 34 */ extsh r0, r6 -/* 8021FE9C 7C 03 00 00 */ cmpw r3, r0 -/* 8021FEA0 40 81 00 0C */ ble lbl_8021FEAC -/* 8021FEA4 7C C7 33 78 */ mr r7, r6 -/* 8021FEA8 48 00 00 10 */ b lbl_8021FEB8 -lbl_8021FEAC: -/* 8021FEAC 7C E0 07 35 */ extsh. r0, r7 -/* 8021FEB0 40 80 00 08 */ bge lbl_8021FEB8 -/* 8021FEB4 38 E0 00 00 */ li r7, 0 -lbl_8021FEB8: -/* 8021FEB8 54 E0 06 3E */ clrlwi r0, r7, 0x18 -/* 8021FEBC B0 04 00 02 */ sth r0, 2(r4) -/* 8021FEC0 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 8021FEC4 D0 05 5D C0 */ stfs f0, 0x5dc0(r5) -/* 8021FEC8 38 60 00 00 */ li r3, 0 -/* 8021FECC 98 65 5E B6 */ stb r3, 0x5eb6(r5) -/* 8021FED0 7C 04 03 78 */ mr r4, r0 -/* 8021FED4 A8 1E 01 92 */ lha r0, 0x192(r30) -/* 8021FED8 7C 00 20 00 */ cmpw r0, r4 -/* 8021FEDC 40 82 00 14 */ bne lbl_8021FEF0 -/* 8021FEE0 88 1E 01 EE */ lbz r0, 0x1ee(r30) -/* 8021FEE4 28 00 00 00 */ cmplwi r0, 0 -/* 8021FEE8 41 82 00 08 */ beq lbl_8021FEF0 -/* 8021FEEC 98 7E 01 EE */ stb r3, 0x1ee(r30) -lbl_8021FEF0: -/* 8021FEF0 38 00 00 01 */ li r0, 1 -lbl_8021FEF4: -/* 8021FEF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FEF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FEFC A0 63 00 00 */ lhz r3, 0(r3) -/* 8021FF00 A8 9E 01 94 */ lha r4, 0x194(r30) -/* 8021FF04 7C 04 18 00 */ cmpw r4, r3 -/* 8021FF08 41 82 00 38 */ beq lbl_8021FF40 -/* 8021FF0C 40 80 00 24 */ bge lbl_8021FF30 -/* 8021FF10 38 04 00 01 */ addi r0, r4, 1 -/* 8021FF14 B0 1E 01 94 */ sth r0, 0x194(r30) -/* 8021FF18 38 00 00 01 */ li r0, 1 -/* 8021FF1C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021FF20 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021FF24 98 03 00 E6 */ stb r0, 0xe6(r3) -/* 8021FF28 38 00 00 01 */ li r0, 1 -/* 8021FF2C 48 00 00 14 */ b lbl_8021FF40 -lbl_8021FF30: -/* 8021FF30 40 81 00 10 */ ble lbl_8021FF40 -/* 8021FF34 38 04 FF FF */ addi r0, r4, -1 -/* 8021FF38 B0 1E 01 94 */ sth r0, 0x194(r30) -/* 8021FF3C 38 00 00 01 */ li r0, 1 -lbl_8021FF40: -/* 8021FF40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021FF44 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021FF48 A0 7F 00 02 */ lhz r3, 2(r31) -/* 8021FF4C A8 9E 01 92 */ lha r4, 0x192(r30) -/* 8021FF50 7C 04 18 00 */ cmpw r4, r3 -/* 8021FF54 41 82 01 24 */ beq lbl_80220078 -/* 8021FF58 40 80 00 F8 */ bge lbl_80220050 -/* 8021FF5C 38 04 00 01 */ addi r0, r4, 1 -/* 8021FF60 B0 1E 01 92 */ sth r0, 0x192(r30) -/* 8021FF64 80 1F 5F 1C */ lwz r0, 0x5f1c(r31) -/* 8021FF68 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 8021FF6C 40 82 00 24 */ bne lbl_8021FF90 -/* 8021FF70 80 1F 5F 18 */ lwz r0, 0x5f18(r31) -/* 8021FF74 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 8021FF78 40 82 00 18 */ bne lbl_8021FF90 -/* 8021FF7C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021FF80 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021FF84 88 03 00 E6 */ lbz r0, 0xe6(r3) -/* 8021FF88 28 00 00 00 */ cmplwi r0, 0 -/* 8021FF8C 41 82 00 58 */ beq lbl_8021FFE4 -lbl_8021FF90: -/* 8021FF90 A8 7E 01 92 */ lha r3, 0x192(r30) -/* 8021FF94 54 60 F0 02 */ slwi r0, r3, 0x1e -/* 8021FF98 54 63 0F FE */ srwi r3, r3, 0x1f -/* 8021FF9C 7C 03 00 50 */ subf r0, r3, r0 -/* 8021FFA0 54 00 10 3E */ rotlwi r0, r0, 2 -/* 8021FFA4 7C 00 1A 15 */ add. r0, r0, r3 -/* 8021FFA8 40 82 00 7C */ bne lbl_80220024 -/* 8021FFAC 38 00 00 21 */ li r0, 0x21 -/* 8021FFB0 90 01 00 0C */ stw r0, 0xc(r1) -/* 8021FFB4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8021FFB8 38 81 00 0C */ addi r4, r1, 0xc -/* 8021FFBC 38 A0 00 00 */ li r5, 0 -/* 8021FFC0 38 C0 00 00 */ li r6, 0 -/* 8021FFC4 38 E0 00 00 */ li r7, 0 -/* 8021FFC8 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 8021FFCC FC 40 08 90 */ fmr f2, f1 -/* 8021FFD0 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 8021FFD4 FC 80 18 90 */ fmr f4, f3 -/* 8021FFD8 39 00 00 00 */ li r8, 0 -/* 8021FFDC 48 08 B9 A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8021FFE0 48 00 00 44 */ b lbl_80220024 -lbl_8021FFE4: -/* 8021FFE4 88 1E 01 EE */ lbz r0, 0x1ee(r30) -/* 8021FFE8 28 00 00 01 */ cmplwi r0, 1 -/* 8021FFEC 40 82 00 38 */ bne lbl_80220024 -/* 8021FFF0 38 00 00 21 */ li r0, 0x21 -/* 8021FFF4 90 01 00 08 */ stw r0, 8(r1) -/* 8021FFF8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8021FFFC 38 81 00 08 */ addi r4, r1, 8 -/* 80220000 38 A0 00 00 */ li r5, 0 -/* 80220004 38 C0 00 00 */ li r6, 0 -/* 80220008 38 E0 00 00 */ li r7, 0 -/* 8022000C C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80220010 FC 40 08 90 */ fmr f2, f1 -/* 80220014 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 80220018 FC 80 18 90 */ fmr f4, f3 -/* 8022001C 39 00 00 00 */ li r8, 0 -/* 80220020 48 08 B9 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80220024: -/* 80220024 A0 7F 00 02 */ lhz r3, 2(r31) -/* 80220028 A8 1E 01 92 */ lha r0, 0x192(r30) -/* 8022002C 7C 00 18 00 */ cmpw r0, r3 -/* 80220030 40 82 00 18 */ bne lbl_80220048 -/* 80220034 88 1E 01 EE */ lbz r0, 0x1ee(r30) -/* 80220038 28 00 00 00 */ cmplwi r0, 0 -/* 8022003C 41 82 00 0C */ beq lbl_80220048 -/* 80220040 38 00 00 00 */ li r0, 0 -/* 80220044 98 1E 01 EE */ stb r0, 0x1ee(r30) -lbl_80220048: -/* 80220048 38 00 00 01 */ li r0, 1 -/* 8022004C 48 00 00 48 */ b lbl_80220094 -lbl_80220050: -/* 80220050 40 81 00 44 */ ble lbl_80220094 -/* 80220054 38 04 FF FF */ addi r0, r4, -1 -/* 80220058 B0 1E 01 92 */ sth r0, 0x192(r30) -/* 8022005C 88 1E 01 EE */ lbz r0, 0x1ee(r30) -/* 80220060 28 00 00 00 */ cmplwi r0, 0 -/* 80220064 41 82 00 0C */ beq lbl_80220070 -/* 80220068 38 00 00 00 */ li r0, 0 -/* 8022006C 98 1E 01 EE */ stb r0, 0x1ee(r30) -lbl_80220070: -/* 80220070 38 00 00 01 */ li r0, 1 -/* 80220074 48 00 00 20 */ b lbl_80220094 -lbl_80220078: -/* 80220078 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8022007C 38 83 01 88 */ addi r4, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80220080 88 64 00 E6 */ lbz r3, 0xe6(r4) -/* 80220084 28 03 00 00 */ cmplwi r3, 0 -/* 80220088 41 82 00 0C */ beq lbl_80220094 -/* 8022008C 38 60 00 00 */ li r3, 0 -/* 80220090 98 64 00 E6 */ stb r3, 0xe6(r4) -lbl_80220094: -/* 80220094 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220098 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8022009C C0 23 00 28 */ lfs f1, 0x28(r3) -/* 802200A0 C0 43 00 2C */ lfs f2, 0x2c(r3) -/* 802200A4 C0 1E 02 04 */ lfs f0, 0x204(r30) -/* 802200A8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802200AC 41 82 00 0C */ beq lbl_802200B8 -/* 802200B0 D0 3E 02 04 */ stfs f1, 0x204(r30) -/* 802200B4 38 00 00 01 */ li r0, 1 -lbl_802200B8: -/* 802200B8 C0 1E 02 08 */ lfs f0, 0x208(r30) -/* 802200BC C0 63 00 2C */ lfs f3, 0x2c(r3) -/* 802200C0 FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 802200C4 41 82 00 0C */ beq lbl_802200D0 -/* 802200C8 D0 7E 02 08 */ stfs f3, 0x208(r30) -/* 802200CC 38 00 00 01 */ li r0, 1 -lbl_802200D0: -/* 802200D0 C0 1E 02 0C */ lfs f0, 0x20c(r30) -/* 802200D4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802200D8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802200DC C0 63 00 1C */ lfs f3, 0x1c(r3) -/* 802200E0 FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 802200E4 41 82 00 0C */ beq lbl_802200F0 -/* 802200E8 D0 7E 02 0C */ stfs f3, 0x20c(r30) -/* 802200EC 38 00 00 01 */ li r0, 1 -lbl_802200F0: -/* 802200F0 C0 1E 02 10 */ lfs f0, 0x210(r30) -/* 802200F4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802200F8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802200FC C0 63 00 30 */ lfs f3, 0x30(r3) -/* 80220100 FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 80220104 41 82 00 0C */ beq lbl_80220110 -/* 80220108 D0 7E 02 10 */ stfs f3, 0x210(r30) -/* 8022010C 38 00 00 01 */ li r0, 1 -lbl_80220110: -/* 80220110 C0 1E 02 14 */ lfs f0, 0x214(r30) -/* 80220114 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220118 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8022011C C0 63 00 38 */ lfs f3, 0x38(r3) -/* 80220120 FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 80220124 41 82 00 0C */ beq lbl_80220130 -/* 80220128 D0 7E 02 14 */ stfs f3, 0x214(r30) -/* 8022012C 38 00 00 01 */ li r0, 1 -lbl_80220130: -/* 80220130 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80220134 28 00 00 01 */ cmplwi r0, 1 -/* 80220138 40 82 00 14 */ bne lbl_8022014C -/* 8022013C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80220140 A8 9E 01 94 */ lha r4, 0x194(r30) -/* 80220144 A8 BE 01 92 */ lha r5, 0x192(r30) -/* 80220148 4B FF 48 AD */ bl drawLife__13dMeter2Draw_cFssff -lbl_8022014C: -/* 8022014C 7F C3 F3 78 */ mr r3, r30 -/* 80220150 48 00 47 95 */ bl alphaAnimeLife__9dMeter2_cFv -/* 80220154 A8 1E 01 92 */ lha r0, 0x192(r30) -/* 80220158 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8022015C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220160 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220164 B0 03 5E 16 */ sth r0, 0x5e16(r3) -/* 80220168 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8022016C 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80220170 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80220174 7C 08 03 A6 */ mtlr r0 -/* 80220178 38 21 00 30 */ addi r1, r1, 0x30 -/* 8022017C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveLightDrop__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveLightDrop__9dMeter2_cFv.s deleted file mode 100644 index f1024bf55a..0000000000 --- a/asm/d/meter/d_meter2/moveLightDrop__9dMeter2_cFv.s +++ /dev/null @@ -1,248 +0,0 @@ -lbl_80220888: -/* 80220888 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8022088C 7C 08 02 A6 */ mflr r0 -/* 80220890 90 01 00 74 */ stw r0, 0x74(r1) -/* 80220894 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80220898 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 8022089C DB C1 00 50 */ stfd f30, 0x50(r1) -/* 802208A0 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 802208A4 DB A1 00 40 */ stfd f29, 0x40(r1) -/* 802208A8 F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* qr0 */ -/* 802208AC DB 81 00 30 */ stfd f28, 0x30(r1) -/* 802208B0 F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 /* qr0 */ -/* 802208B4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802208B8 48 14 19 1D */ bl _savegpr_27 -/* 802208BC 7C 7B 1B 78 */ mr r27, r3 -/* 802208C0 3B A0 00 00 */ li r29, 0 -/* 802208C4 3B 80 00 00 */ li r28, 0 -/* 802208C8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802208CC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802208D0 88 03 0F 24 */ lbz r0, 0xf24(r3) -/* 802208D4 28 00 00 00 */ cmplwi r0, 0 -/* 802208D8 41 82 00 34 */ beq lbl_8022090C -/* 802208DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802208E0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802208E4 38 64 01 14 */ addi r3, r4, 0x114 -/* 802208E8 88 84 4E 0C */ lbz r4, 0x4e0c(r4) -/* 802208EC 4B E1 3A 55 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 802208F0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802208F4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802208F8 88 84 5E A1 */ lbz r4, 0x5ea1(r4) -/* 802208FC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80220900 7C 04 00 40 */ cmplw r4, r0 -/* 80220904 40 82 00 08 */ bne lbl_8022090C -/* 80220908 3B 80 00 02 */ li r28, 2 -lbl_8022090C: -/* 8022090C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220910 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220914 3B DF 01 14 */ addi r30, r31, 0x114 -/* 80220918 7F C3 F3 78 */ mr r3, r30 -/* 8022091C 88 9F 4E 0C */ lbz r4, 0x4e0c(r31) -/* 80220920 4B E1 3A 21 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 80220924 88 9B 01 C2 */ lbz r4, 0x1c2(r27) -/* 80220928 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8022092C 7C 04 00 40 */ cmplw r4, r0 -/* 80220930 41 82 00 CC */ beq lbl_802209FC -/* 80220934 7F C3 F3 78 */ mr r3, r30 -/* 80220938 88 9F 4E 0C */ lbz r4, 0x4e0c(r31) -/* 8022093C 4B E1 3A 05 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 80220940 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220944 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220948 88 84 5E A1 */ lbz r4, 0x5ea1(r4) -/* 8022094C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80220950 7C 04 00 40 */ cmplw r4, r0 -/* 80220954 40 82 00 40 */ bne lbl_80220994 -/* 80220958 3B 80 00 02 */ li r28, 2 -/* 8022095C 38 00 00 C7 */ li r0, 0xc7 -/* 80220960 90 01 00 0C */ stw r0, 0xc(r1) -/* 80220964 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80220968 38 81 00 0C */ addi r4, r1, 0xc -/* 8022096C 38 A0 00 00 */ li r5, 0 -/* 80220970 38 C0 00 00 */ li r6, 0 -/* 80220974 38 E0 00 00 */ li r7, 0 -/* 80220978 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 8022097C FC 40 08 90 */ fmr f2, f1 -/* 80220980 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 80220984 FC 80 18 90 */ fmr f4, f3 -/* 80220988 39 00 00 00 */ li r8, 0 -/* 8022098C 48 08 AF F9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80220990 48 00 00 58 */ b lbl_802209E8 -lbl_80220994: -/* 80220994 7F C3 F3 78 */ mr r3, r30 -/* 80220998 88 9F 4E 0C */ lbz r4, 0x4e0c(r31) -/* 8022099C 4B E1 39 A5 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 802209A0 88 9B 01 C2 */ lbz r4, 0x1c2(r27) -/* 802209A4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802209A8 7C 04 00 40 */ cmplw r4, r0 -/* 802209AC 40 80 00 3C */ bge lbl_802209E8 -/* 802209B0 3B 80 00 01 */ li r28, 1 -/* 802209B4 38 00 00 C6 */ li r0, 0xc6 -/* 802209B8 90 01 00 08 */ stw r0, 8(r1) -/* 802209BC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802209C0 38 81 00 08 */ addi r4, r1, 8 -/* 802209C4 38 A0 00 00 */ li r5, 0 -/* 802209C8 38 C0 00 00 */ li r6, 0 -/* 802209CC 38 E0 00 00 */ li r7, 0 -/* 802209D0 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 802209D4 FC 40 08 90 */ fmr f2, f1 -/* 802209D8 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 802209DC FC 80 18 90 */ fmr f4, f3 -/* 802209E0 39 00 00 00 */ li r8, 0 -/* 802209E4 48 08 AF A1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_802209E8: -/* 802209E8 7F C3 F3 78 */ mr r3, r30 -/* 802209EC 88 9F 4E 0C */ lbz r4, 0x4e0c(r31) -/* 802209F0 4B E1 39 51 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 802209F4 98 7B 01 C2 */ stb r3, 0x1c2(r27) -/* 802209F8 3B A0 00 01 */ li r29, 1 -lbl_802209FC: -/* 802209FC 88 1B 01 C3 */ lbz r0, 0x1c3(r27) -/* 80220A00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220A04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220A08 88 63 5E A1 */ lbz r3, 0x5ea1(r3) -/* 80220A0C 7C 00 18 40 */ cmplw r0, r3 -/* 80220A10 41 82 00 0C */ beq lbl_80220A1C -/* 80220A14 98 7B 01 C3 */ stb r3, 0x1c3(r27) -/* 80220A18 3B A0 00 01 */ li r29, 1 -lbl_80220A1C: -/* 80220A1C 80 1B 01 24 */ lwz r0, 0x124(r27) -/* 80220A20 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80220A24 40 82 00 58 */ bne lbl_80220A7C -/* 80220A28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220A2C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220A30 80 7E 5D AC */ lwz r3, 0x5dac(r30) -/* 80220A34 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80220A38 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 80220A3C 7D 89 03 A6 */ mtctr r12 -/* 80220A40 4E 80 04 21 */ bctrl -/* 80220A44 2C 03 00 00 */ cmpwi r3, 0 -/* 80220A48 40 82 00 34 */ bne lbl_80220A7C -/* 80220A4C 80 7E 5D AC */ lwz r3, 0x5dac(r30) -/* 80220A50 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80220A54 81 8C 00 D0 */ lwz r12, 0xd0(r12) -/* 80220A58 7D 89 03 A6 */ mtctr r12 -/* 80220A5C 4E 80 04 21 */ bctrl -/* 80220A60 2C 03 00 00 */ cmpwi r3, 0 -/* 80220A64 40 82 00 18 */ bne lbl_80220A7C -/* 80220A68 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80220A6C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80220A70 88 03 00 E8 */ lbz r0, 0xe8(r3) -/* 80220A74 28 00 00 00 */ cmplwi r0, 0 -/* 80220A78 41 82 00 20 */ beq lbl_80220A98 -lbl_80220A7C: -/* 80220A7C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220A80 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220A84 C3 A3 0E 90 */ lfs f29, 0xe90(r3) -/* 80220A88 C3 83 0E 98 */ lfs f28, 0xe98(r3) -/* 80220A8C C3 E3 0E 88 */ lfs f31, 0xe88(r3) -/* 80220A90 C3 C3 0E A8 */ lfs f30, 0xea8(r3) -/* 80220A94 48 00 00 1C */ b lbl_80220AB0 -lbl_80220A98: -/* 80220A98 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220A9C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220AA0 C3 A3 0E 8C */ lfs f29, 0xe8c(r3) -/* 80220AA4 C3 83 0E 94 */ lfs f28, 0xe94(r3) -/* 80220AA8 C3 E3 0E 84 */ lfs f31, 0xe84(r3) -/* 80220AAC C3 C3 0E A4 */ lfs f30, 0xea4(r3) -lbl_80220AB0: -/* 80220AB0 C0 1B 04 20 */ lfs f0, 0x420(r27) -/* 80220AB4 FC 00 E8 00 */ fcmpu cr0, f0, f29 -/* 80220AB8 41 82 00 3C */ beq lbl_80220AF4 -/* 80220ABC 38 7B 04 20 */ addi r3, r27, 0x420 -/* 80220AC0 FC 20 E8 90 */ fmr f1, f29 -/* 80220AC4 C0 42 AF CC */ lfs f2, lit_4663(r2) -/* 80220AC8 C0 62 AF F0 */ lfs f3, lit_6051(r2) -/* 80220ACC 48 04 EF 71 */ bl cLib_addCalc2__FPffff -/* 80220AD0 3B A0 00 01 */ li r29, 1 -/* 80220AD4 C0 1B 04 20 */ lfs f0, 0x420(r27) -/* 80220AD8 EC 00 E8 28 */ fsubs f0, f0, f29 -/* 80220ADC FC 00 02 10 */ fabs f0, f0 -/* 80220AE0 FC 20 00 18 */ frsp f1, f0 -/* 80220AE4 C0 02 AF E8 */ lfs f0, lit_5791(r2) -/* 80220AE8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220AEC 40 80 00 08 */ bge lbl_80220AF4 -/* 80220AF0 D3 BB 04 20 */ stfs f29, 0x420(r27) -lbl_80220AF4: -/* 80220AF4 C0 1B 04 24 */ lfs f0, 0x424(r27) -/* 80220AF8 FC 00 E0 00 */ fcmpu cr0, f0, f28 -/* 80220AFC 41 82 00 3C */ beq lbl_80220B38 -/* 80220B00 38 7B 04 24 */ addi r3, r27, 0x424 -/* 80220B04 FC 20 E0 90 */ fmr f1, f28 -/* 80220B08 C0 42 AF CC */ lfs f2, lit_4663(r2) -/* 80220B0C C0 62 AF F0 */ lfs f3, lit_6051(r2) -/* 80220B10 48 04 EF 2D */ bl cLib_addCalc2__FPffff -/* 80220B14 3B A0 00 01 */ li r29, 1 -/* 80220B18 C0 1B 04 24 */ lfs f0, 0x424(r27) -/* 80220B1C EC 00 E0 28 */ fsubs f0, f0, f28 -/* 80220B20 FC 00 02 10 */ fabs f0, f0 -/* 80220B24 FC 20 00 18 */ frsp f1, f0 -/* 80220B28 C0 02 AF E8 */ lfs f0, lit_5791(r2) -/* 80220B2C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220B30 40 80 00 08 */ bge lbl_80220B38 -/* 80220B34 D3 9B 04 24 */ stfs f28, 0x424(r27) -lbl_80220B38: -/* 80220B38 C0 1B 04 28 */ lfs f0, 0x428(r27) -/* 80220B3C FC 00 F8 00 */ fcmpu cr0, f0, f31 -/* 80220B40 41 82 00 3C */ beq lbl_80220B7C -/* 80220B44 38 7B 04 28 */ addi r3, r27, 0x428 -/* 80220B48 FC 20 F8 90 */ fmr f1, f31 -/* 80220B4C C0 42 AF F4 */ lfs f2, lit_6052(r2) -/* 80220B50 C0 62 AF CC */ lfs f3, lit_4663(r2) -/* 80220B54 48 04 EE E9 */ bl cLib_addCalc2__FPffff -/* 80220B58 3B A0 00 01 */ li r29, 1 -/* 80220B5C C0 1B 04 28 */ lfs f0, 0x428(r27) -/* 80220B60 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 80220B64 FC 00 02 10 */ fabs f0, f0 -/* 80220B68 FC 20 00 18 */ frsp f1, f0 -/* 80220B6C C0 02 AF E8 */ lfs f0, lit_5791(r2) -/* 80220B70 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220B74 40 80 00 08 */ bge lbl_80220B7C -/* 80220B78 D3 FB 04 28 */ stfs f31, 0x428(r27) -lbl_80220B7C: -/* 80220B7C C0 1B 04 2C */ lfs f0, 0x42c(r27) -/* 80220B80 FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 80220B84 41 82 00 3C */ beq lbl_80220BC0 -/* 80220B88 38 7B 04 2C */ addi r3, r27, 0x42c -/* 80220B8C FC 20 F0 90 */ fmr f1, f30 -/* 80220B90 C0 42 AF F4 */ lfs f2, lit_6052(r2) -/* 80220B94 C0 62 AF CC */ lfs f3, lit_4663(r2) -/* 80220B98 48 04 EE A5 */ bl cLib_addCalc2__FPffff -/* 80220B9C 3B A0 00 01 */ li r29, 1 -/* 80220BA0 C0 1B 04 2C */ lfs f0, 0x42c(r27) -/* 80220BA4 EC 00 F0 28 */ fsubs f0, f0, f30 -/* 80220BA8 FC 00 02 10 */ fabs f0, f0 -/* 80220BAC FC 20 00 18 */ frsp f1, f0 -/* 80220BB0 C0 02 AF E8 */ lfs f0, lit_5791(r2) -/* 80220BB4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220BB8 40 80 00 08 */ bge lbl_80220BC0 -/* 80220BBC D3 DB 04 2C */ stfs f30, 0x42c(r27) -lbl_80220BC0: -/* 80220BC0 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80220BC4 28 00 00 01 */ cmplwi r0, 1 -/* 80220BC8 40 82 00 28 */ bne lbl_80220BF0 -/* 80220BCC 80 7B 01 0C */ lwz r3, 0x10c(r27) -/* 80220BD0 88 9B 01 C2 */ lbz r4, 0x1c2(r27) -/* 80220BD4 88 BB 01 C3 */ lbz r5, 0x1c3(r27) -/* 80220BD8 C0 3B 04 20 */ lfs f1, 0x420(r27) -/* 80220BDC C0 5B 04 24 */ lfs f2, 0x424(r27) -/* 80220BE0 C0 7B 04 28 */ lfs f3, 0x428(r27) -/* 80220BE4 C0 9B 04 2C */ lfs f4, 0x42c(r27) -/* 80220BE8 7F 86 E3 78 */ mr r6, r28 -/* 80220BEC 4B FF 4F 2D */ bl drawLightDrop__13dMeter2Draw_cFUcUcffffUc -lbl_80220BF0: -/* 80220BF0 7F 63 DB 78 */ mr r3, r27 -/* 80220BF4 48 00 41 79 */ bl alphaAnimeLightDrop__9dMeter2_cFv -/* 80220BF8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 80220BFC CB E1 00 60 */ lfd f31, 0x60(r1) -/* 80220C00 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 80220C04 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 80220C08 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* qr0 */ -/* 80220C0C CB A1 00 40 */ lfd f29, 0x40(r1) -/* 80220C10 E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 /* qr0 */ -/* 80220C14 CB 81 00 30 */ lfd f28, 0x30(r1) -/* 80220C18 39 61 00 30 */ addi r11, r1, 0x30 -/* 80220C1C 48 14 16 05 */ bl _restgpr_27 -/* 80220C20 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80220C24 7C 08 03 A6 */ mtlr r0 -/* 80220C28 38 21 00 70 */ addi r1, r1, 0x70 -/* 80220C2C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveOxygen__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveOxygen__9dMeter2_cFv.s deleted file mode 100644 index cf2266880f..0000000000 --- a/asm/d/meter/d_meter2/moveOxygen__9dMeter2_cFv.s +++ /dev/null @@ -1,242 +0,0 @@ -lbl_8022051C: -/* 8022051C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80220520 7C 08 02 A6 */ mflr r0 -/* 80220524 90 01 00 44 */ stw r0, 0x44(r1) -/* 80220528 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022052C 48 14 1C A9 */ bl _savegpr_27 -/* 80220530 7C 7E 1B 78 */ mr r30, r3 -/* 80220534 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220538 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022053C 80 7F 5D E8 */ lwz r3, 0x5de8(r31) -/* 80220540 38 C0 00 00 */ li r6, 0 -/* 80220544 38 A0 00 00 */ li r5, 0 -/* 80220548 80 1F 5D F0 */ lwz r0, 0x5df0(r31) -/* 8022054C 2C 00 00 00 */ cmpwi r0, 0 -/* 80220550 41 82 00 54 */ beq lbl_802205A4 -/* 80220554 7C C3 02 14 */ add r6, r3, r0 -/* 80220558 7C 06 18 00 */ cmpw r6, r3 -/* 8022055C 40 81 00 0C */ ble lbl_80220568 -/* 80220560 7C 66 1B 78 */ mr r6, r3 -/* 80220564 48 00 00 10 */ b lbl_80220574 -lbl_80220568: -/* 80220568 2C 06 00 00 */ cmpwi r6, 0 -/* 8022056C 40 80 00 08 */ bge lbl_80220574 -/* 80220570 38 C0 00 00 */ li r6, 0 -lbl_80220574: -/* 80220574 54 C0 04 3E */ clrlwi r0, r6, 0x10 -/* 80220578 90 1F 5D E8 */ stw r0, 0x5de8(r31) -/* 8022057C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220580 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220584 80 64 5D EC */ lwz r3, 0x5dec(r4) -/* 80220588 80 04 5D E0 */ lwz r0, 0x5de0(r4) -/* 8022058C 7C 00 30 50 */ subf r0, r0, r6 -/* 80220590 7C 03 02 14 */ add r0, r3, r0 -/* 80220594 90 04 5D EC */ stw r0, 0x5dec(r4) -/* 80220598 38 00 00 00 */ li r0, 0 -/* 8022059C 90 1F 5D F0 */ stw r0, 0x5df0(r31) -/* 802205A0 38 A0 00 01 */ li r5, 1 -lbl_802205A4: -/* 802205A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802205A8 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802205AC 80 9C 5D EC */ lwz r4, 0x5dec(r28) -/* 802205B0 2C 04 00 00 */ cmpwi r4, 0 -/* 802205B4 41 82 00 C0 */ beq lbl_80220674 -/* 802205B8 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 802205BC 40 82 00 08 */ bne lbl_802205C4 -/* 802205C0 80 DF 5D E8 */ lwz r6, 0x5de8(r31) -lbl_802205C4: -/* 802205C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802205C8 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802205CC 80 BD 5D E0 */ lwz r5, 0x5de0(r29) -/* 802205D0 7F 65 22 14 */ add r27, r5, r4 -/* 802205D4 7C 1B 30 00 */ cmpw r27, r6 -/* 802205D8 40 81 00 0C */ ble lbl_802205E4 -/* 802205DC 7C DB 33 78 */ mr r27, r6 -/* 802205E0 48 00 00 10 */ b lbl_802205F0 -lbl_802205E4: -/* 802205E4 2C 1B 00 00 */ cmpwi r27, 0 -/* 802205E8 40 80 00 08 */ bge lbl_802205F0 -/* 802205EC 3B 60 00 00 */ li r27, 0 -lbl_802205F0: -/* 802205F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802205F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802205F8 88 03 5E B7 */ lbz r0, 0x5eb7(r3) -/* 802205FC 28 00 00 00 */ cmplwi r0, 0 -/* 80220600 41 82 00 60 */ beq lbl_80220660 -/* 80220604 80 1F 5D E8 */ lwz r0, 0x5de8(r31) -/* 80220608 7C 1B 00 00 */ cmpw r27, r0 -/* 8022060C 40 82 00 54 */ bne lbl_80220660 -/* 80220610 7C 05 00 00 */ cmpw r5, r0 -/* 80220614 40 80 00 4C */ bge lbl_80220660 -/* 80220618 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022061C C0 23 06 04 */ lfs f1, 0x604(r3) -/* 80220620 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 80220624 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220628 40 81 00 38 */ ble lbl_80220660 -/* 8022062C 38 00 00 2C */ li r0, 0x2c -/* 80220630 90 01 00 0C */ stw r0, 0xc(r1) -/* 80220634 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80220638 38 81 00 0C */ addi r4, r1, 0xc -/* 8022063C 38 A0 00 00 */ li r5, 0 -/* 80220640 38 C0 00 00 */ li r6, 0 -/* 80220644 38 E0 00 00 */ li r7, 0 -/* 80220648 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 8022064C FC 40 08 90 */ fmr f2, f1 -/* 80220650 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 80220654 FC 80 18 90 */ fmr f4, f3 -/* 80220658 39 00 00 00 */ li r8, 0 -/* 8022065C 48 08 B3 29 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80220660: -/* 80220660 57 60 04 3E */ clrlwi r0, r27, 0x10 -/* 80220664 90 1D 5D E0 */ stw r0, 0x5de0(r29) -/* 80220668 38 00 00 00 */ li r0, 0 -/* 8022066C 90 1C 5D EC */ stw r0, 0x5dec(r28) -/* 80220670 38 A0 00 01 */ li r5, 1 -lbl_80220674: -/* 80220674 80 7E 01 A8 */ lwz r3, 0x1a8(r30) -/* 80220678 80 1F 5D E8 */ lwz r0, 0x5de8(r31) -/* 8022067C 7C 03 00 00 */ cmpw r3, r0 -/* 80220680 41 82 00 50 */ beq lbl_802206D0 -/* 80220684 40 80 00 28 */ bge lbl_802206AC -/* 80220688 38 03 00 32 */ addi r0, r3, 0x32 -/* 8022068C 90 1E 01 A8 */ stw r0, 0x1a8(r30) -/* 80220690 80 1E 01 A8 */ lwz r0, 0x1a8(r30) -/* 80220694 80 7F 5D E8 */ lwz r3, 0x5de8(r31) -/* 80220698 7C 00 18 00 */ cmpw r0, r3 -/* 8022069C 40 81 00 08 */ ble lbl_802206A4 -/* 802206A0 90 7E 01 A8 */ stw r3, 0x1a8(r30) -lbl_802206A4: -/* 802206A4 38 A0 00 01 */ li r5, 1 -/* 802206A8 48 00 00 28 */ b lbl_802206D0 -lbl_802206AC: -/* 802206AC 40 81 00 24 */ ble lbl_802206D0 -/* 802206B0 38 03 FF CE */ addi r0, r3, -50 -/* 802206B4 90 1E 01 A8 */ stw r0, 0x1a8(r30) -/* 802206B8 80 1E 01 A8 */ lwz r0, 0x1a8(r30) -/* 802206BC 80 7F 5D E8 */ lwz r3, 0x5de8(r31) -/* 802206C0 7C 00 18 00 */ cmpw r0, r3 -/* 802206C4 40 80 00 08 */ bge lbl_802206CC -/* 802206C8 90 7E 01 A8 */ stw r3, 0x1a8(r30) -lbl_802206CC: -/* 802206CC 38 A0 00 01 */ li r5, 1 -lbl_802206D0: -/* 802206D0 80 9E 01 A4 */ lwz r4, 0x1a4(r30) -/* 802206D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802206D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802206DC 80 03 5D E0 */ lwz r0, 0x5de0(r3) -/* 802206E0 7C 04 00 00 */ cmpw r4, r0 -/* 802206E4 41 82 00 E0 */ beq lbl_802207C4 -/* 802206E8 40 80 00 28 */ bge lbl_80220710 -/* 802206EC 38 04 00 32 */ addi r0, r4, 0x32 -/* 802206F0 90 1E 01 A4 */ stw r0, 0x1a4(r30) -/* 802206F4 80 1E 01 A4 */ lwz r0, 0x1a4(r30) -/* 802206F8 80 63 5D E0 */ lwz r3, 0x5de0(r3) -/* 802206FC 7C 00 18 00 */ cmpw r0, r3 -/* 80220700 40 81 00 08 */ ble lbl_80220708 -/* 80220704 90 7E 01 A4 */ stw r3, 0x1a4(r30) -lbl_80220708: -/* 80220708 38 A0 00 01 */ li r5, 1 -/* 8022070C 48 00 00 B8 */ b lbl_802207C4 -lbl_80220710: -/* 80220710 40 81 00 B4 */ ble lbl_802207C4 -/* 80220714 38 04 FF CE */ addi r0, r4, -50 -/* 80220718 90 1E 01 A4 */ stw r0, 0x1a4(r30) -/* 8022071C 80 1E 01 A4 */ lwz r0, 0x1a4(r30) -/* 80220720 80 83 5D E0 */ lwz r4, 0x5de0(r3) -/* 80220724 7C 00 20 00 */ cmpw r0, r4 -/* 80220728 40 80 00 08 */ bge lbl_80220730 -/* 8022072C 90 9E 01 A4 */ stw r4, 0x1a4(r30) -lbl_80220730: -/* 80220730 80 03 5D E0 */ lwz r0, 0x5de0(r3) -/* 80220734 C8 42 AF D8 */ lfd f2, lit_5267(r2) -/* 80220738 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8022073C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80220740 3C 60 43 30 */ lis r3, 0x4330 -/* 80220744 90 61 00 10 */ stw r3, 0x10(r1) -/* 80220748 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8022074C EC 20 10 28 */ fsubs f1, f0, f2 -/* 80220750 80 1F 5D E8 */ lwz r0, 0x5de8(r31) -/* 80220754 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80220758 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8022075C 90 61 00 18 */ stw r3, 0x18(r1) -/* 80220760 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80220764 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80220768 EC 21 00 24 */ fdivs f1, f1, f0 -/* 8022076C C0 02 AF EC */ lfs f0, lit_5933(r2) -/* 80220770 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220774 40 81 00 4C */ ble lbl_802207C0 -/* 80220778 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022077C C0 23 06 04 */ lfs f1, 0x604(r3) -/* 80220780 C0 02 AF C8 */ lfs f0, lit_4662(r2) -/* 80220784 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80220788 40 81 00 38 */ ble lbl_802207C0 -/* 8022078C 38 00 00 29 */ li r0, 0x29 -/* 80220790 90 01 00 08 */ stw r0, 8(r1) -/* 80220794 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80220798 38 81 00 08 */ addi r4, r1, 8 -/* 8022079C 38 A0 00 00 */ li r5, 0 -/* 802207A0 38 C0 00 00 */ li r6, 0 -/* 802207A4 38 E0 00 00 */ li r7, 0 -/* 802207A8 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 802207AC FC 40 08 90 */ fmr f2, f1 -/* 802207B0 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 802207B4 FC 80 18 90 */ fmr f4, f3 -/* 802207B8 39 00 00 00 */ li r8, 0 -/* 802207BC 48 08 BD 51 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_802207C0: -/* 802207C0 38 A0 00 01 */ li r5, 1 -lbl_802207C4: -/* 802207C4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802207C8 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802207CC C0 24 00 74 */ lfs f1, 0x74(r4) -/* 802207D0 C0 44 00 78 */ lfs f2, 0x78(r4) -/* 802207D4 A8 1E 02 48 */ lha r0, 0x248(r30) -/* 802207D8 A8 7E 01 94 */ lha r3, 0x194(r30) -/* 802207DC 7C 00 18 00 */ cmpw r0, r3 -/* 802207E0 41 82 00 0C */ beq lbl_802207EC -/* 802207E4 B0 7E 02 48 */ sth r3, 0x248(r30) -/* 802207E8 38 A0 00 01 */ li r5, 1 -lbl_802207EC: -/* 802207EC C0 1E 02 38 */ lfs f0, 0x238(r30) -/* 802207F0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802207F4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802207F8 C0 63 00 68 */ lfs f3, 0x68(r3) -/* 802207FC FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 80220800 41 82 00 0C */ beq lbl_8022080C -/* 80220804 D0 7E 02 38 */ stfs f3, 0x238(r30) -/* 80220808 38 A0 00 01 */ li r5, 1 -lbl_8022080C: -/* 8022080C C0 1E 02 3C */ lfs f0, 0x23c(r30) -/* 80220810 C0 64 00 74 */ lfs f3, 0x74(r4) -/* 80220814 FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 80220818 41 82 00 0C */ beq lbl_80220824 -/* 8022081C D0 7E 02 3C */ stfs f3, 0x23c(r30) -/* 80220820 38 A0 00 01 */ li r5, 1 -lbl_80220824: -/* 80220824 C0 1E 02 40 */ lfs f0, 0x240(r30) -/* 80220828 C0 64 00 78 */ lfs f3, 0x78(r4) -/* 8022082C FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 80220830 41 82 00 0C */ beq lbl_8022083C -/* 80220834 D0 7E 02 40 */ stfs f3, 0x240(r30) -/* 80220838 38 A0 00 01 */ li r5, 1 -lbl_8022083C: -/* 8022083C 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 80220840 28 00 00 01 */ cmplwi r0, 1 -/* 80220844 40 82 00 14 */ bne lbl_80220858 -/* 80220848 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022084C 80 9E 01 A8 */ lwz r4, 0x1a8(r30) -/* 80220850 80 BE 01 A4 */ lwz r5, 0x1a4(r30) -/* 80220854 4B FF 4F 8D */ bl drawOxygen__13dMeter2Draw_cFllff -lbl_80220858: -/* 80220858 7F C3 F3 78 */ mr r3, r30 -/* 8022085C 48 00 43 51 */ bl alphaAnimeOxygen__9dMeter2_cFv -/* 80220860 80 1E 01 A4 */ lwz r0, 0x1a4(r30) -/* 80220864 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220868 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022086C 90 03 5D E4 */ stw r0, 0x5de4(r3) -/* 80220870 39 61 00 40 */ addi r11, r1, 0x40 -/* 80220874 48 14 19 AD */ bl _restgpr_27 -/* 80220878 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8022087C 7C 08 03 A6 */ mtlr r0 -/* 80220880 38 21 00 40 */ addi r1, r1, 0x40 -/* 80220884 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/movePachinkoNum__9dMeter2_cFv.s b/asm/d/meter/d_meter2/movePachinkoNum__9dMeter2_cFv.s deleted file mode 100644 index ab0cbc894c..0000000000 --- a/asm/d/meter/d_meter2/movePachinkoNum__9dMeter2_cFv.s +++ /dev/null @@ -1,167 +0,0 @@ -lbl_80224680: -/* 80224680 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80224684 7C 08 02 A6 */ mflr r0 -/* 80224688 90 01 00 24 */ stw r0, 0x24(r1) -/* 8022468C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80224690 48 13 DB 4D */ bl _savegpr_29 -/* 80224694 7C 7F 1B 78 */ mr r31, r3 -/* 80224698 3C 60 80 43 */ lis r3, g_mwHIO@ha /* 0x8042E86C@ha */ -/* 8022469C 38 63 E8 6C */ addi r3, r3, g_mwHIO@l /* 0x8042E86C@l */ -/* 802246A0 4B FD 57 85 */ bl getPachinkoFlag__9dMw_HIO_cFv -/* 802246A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802246A8 41 82 00 40 */ beq lbl_802246E8 -/* 802246AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802246B0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802246B4 88 04 00 F4 */ lbz r0, 0xf4(r4) -/* 802246B8 28 00 00 32 */ cmplwi r0, 0x32 -/* 802246BC 41 82 00 10 */ beq lbl_802246CC -/* 802246C0 A8 64 5D F6 */ lha r3, 0x5df6(r4) -/* 802246C4 38 03 00 32 */ addi r0, r3, 0x32 -/* 802246C8 B0 04 5D F6 */ sth r0, 0x5df6(r4) -lbl_802246CC: -/* 802246CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802246D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802246D4 A8 03 5D F6 */ lha r0, 0x5df6(r3) -/* 802246D8 2C 00 00 00 */ cmpwi r0, 0 -/* 802246DC 40 80 00 0C */ bge lbl_802246E8 -/* 802246E0 38 00 00 00 */ li r0, 0 -/* 802246E4 B0 03 5D F6 */ sth r0, 0x5df6(r3) -lbl_802246E8: -/* 802246E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802246EC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802246F0 A8 A4 5D F6 */ lha r5, 0x5df6(r4) -/* 802246F4 7C A0 07 35 */ extsh. r0, r5 -/* 802246F8 40 82 00 20 */ bne lbl_80224718 -/* 802246FC 88 1F 01 FC */ lbz r0, 0x1fc(r31) -/* 80224700 28 00 00 32 */ cmplwi r0, 0x32 -/* 80224704 40 82 00 14 */ bne lbl_80224718 -/* 80224708 88 64 00 F4 */ lbz r3, 0xf4(r4) -/* 8022470C 88 1F 01 DB */ lbz r0, 0x1db(r31) -/* 80224710 7C 00 18 40 */ cmplw r0, r3 -/* 80224714 41 82 01 B8 */ beq lbl_802248CC -lbl_80224718: -/* 80224718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022471C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80224720 88 03 00 F4 */ lbz r0, 0xf4(r3) -/* 80224724 7C 00 2A 14 */ add r0, r0, r5 -/* 80224728 7C 05 07 35 */ extsh. r5, r0 -/* 8022472C 38 00 00 00 */ li r0, 0 -/* 80224730 B0 04 5D F6 */ sth r0, 0x5df6(r4) -/* 80224734 40 80 00 08 */ bge lbl_8022473C -/* 80224738 38 A0 00 00 */ li r5, 0 -lbl_8022473C: -/* 8022473C 7C A0 07 34 */ extsh r0, r5 -/* 80224740 2C 00 00 32 */ cmpwi r0, 0x32 -/* 80224744 40 81 00 08 */ ble lbl_8022474C -/* 80224748 38 A0 00 32 */ li r5, 0x32 -lbl_8022474C: -/* 8022474C 98 A3 00 F4 */ stb r5, 0xf4(r3) -/* 80224750 38 00 00 32 */ li r0, 0x32 -/* 80224754 98 1F 01 FC */ stb r0, 0x1fc(r31) -/* 80224758 88 03 00 F4 */ lbz r0, 0xf4(r3) -/* 8022475C 88 9F 01 DB */ lbz r4, 0x1db(r31) -/* 80224760 7C 04 00 40 */ cmplw r4, r0 -/* 80224764 40 80 01 20 */ bge lbl_80224884 -/* 80224768 38 04 00 01 */ addi r0, r4, 1 -/* 8022476C 98 1F 01 DB */ stb r0, 0x1db(r31) -/* 80224770 88 1F 01 EB */ lbz r0, 0x1eb(r31) -/* 80224774 60 00 00 04 */ ori r0, r0, 4 -/* 80224778 98 1F 01 EB */ stb r0, 0x1eb(r31) -/* 8022477C 88 9F 01 EB */ lbz r4, 0x1eb(r31) -/* 80224780 54 80 F7 FF */ rlwinm. r0, r4, 0x1e, 0x1f, 0x1f -/* 80224784 41 82 01 0C */ beq lbl_80224890 -/* 80224788 88 63 00 F4 */ lbz r3, 0xf4(r3) -/* 8022478C 88 1F 01 DB */ lbz r0, 0x1db(r31) -/* 80224790 7C 00 18 40 */ cmplw r0, r3 -/* 80224794 41 82 00 80 */ beq lbl_80224814 -/* 80224798 54 80 07 FF */ clrlwi. r0, r4, 0x1f -/* 8022479C 40 82 00 68 */ bne lbl_80224804 -/* 802247A0 7F E3 FB 78 */ mr r3, r31 -/* 802247A4 48 00 12 C1 */ bl isPachinkoEquip__9dMeter2_cFv -/* 802247A8 2C 03 00 00 */ cmpwi r3, 0 -/* 802247AC 41 82 00 58 */ beq lbl_80224804 -/* 802247B0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802247B4 4B FF 69 15 */ bl isButtonVisible__13dMeter2Draw_cFv -/* 802247B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802247BC 41 82 00 48 */ beq lbl_80224804 -/* 802247C0 88 1F 01 EB */ lbz r0, 0x1eb(r31) -/* 802247C4 60 00 00 01 */ ori r0, r0, 1 -/* 802247C8 98 1F 01 EB */ stb r0, 0x1eb(r31) -/* 802247CC 38 00 00 1B */ li r0, 0x1b -/* 802247D0 90 01 00 0C */ stw r0, 0xc(r1) -/* 802247D4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802247D8 38 81 00 0C */ addi r4, r1, 0xc -/* 802247DC 38 A0 00 00 */ li r5, 0 -/* 802247E0 38 C0 00 00 */ li r6, 0 -/* 802247E4 38 E0 00 00 */ li r7, 0 -/* 802247E8 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 802247EC FC 40 08 90 */ fmr f2, f1 -/* 802247F0 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 802247F4 FC 80 18 90 */ fmr f4, f3 -/* 802247F8 39 00 00 00 */ li r8, 0 -/* 802247FC 48 08 71 89 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80224800 48 00 00 90 */ b lbl_80224890 -lbl_80224804: -/* 80224804 88 1F 01 EB */ lbz r0, 0x1eb(r31) -/* 80224808 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 8022480C 98 1F 01 EB */ stb r0, 0x1eb(r31) -/* 80224810 48 00 00 80 */ b lbl_80224890 -lbl_80224814: -/* 80224814 7F E3 FB 78 */ mr r3, r31 -/* 80224818 48 00 12 4D */ bl isPachinkoEquip__9dMeter2_cFv -/* 8022481C 2C 03 00 00 */ cmpwi r3, 0 -/* 80224820 41 82 00 48 */ beq lbl_80224868 -/* 80224824 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224828 4B FF 68 A1 */ bl isButtonVisible__13dMeter2Draw_cFv -/* 8022482C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80224830 41 82 00 38 */ beq lbl_80224868 -/* 80224834 38 00 00 1C */ li r0, 0x1c -/* 80224838 90 01 00 08 */ stw r0, 8(r1) -/* 8022483C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80224840 38 81 00 08 */ addi r4, r1, 8 -/* 80224844 38 A0 00 00 */ li r5, 0 -/* 80224848 38 C0 00 00 */ li r6, 0 -/* 8022484C 38 E0 00 00 */ li r7, 0 -/* 80224850 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80224854 FC 40 08 90 */ fmr f2, f1 -/* 80224858 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 8022485C FC 80 18 90 */ fmr f4, f3 -/* 80224860 39 00 00 00 */ li r8, 0 -/* 80224864 48 08 71 21 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80224868: -/* 80224868 88 1F 01 EB */ lbz r0, 0x1eb(r31) -/* 8022486C 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 80224870 98 1F 01 EB */ stb r0, 0x1eb(r31) -/* 80224874 88 1F 01 EB */ lbz r0, 0x1eb(r31) -/* 80224878 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 8022487C 98 1F 01 EB */ stb r0, 0x1eb(r31) -/* 80224880 48 00 00 10 */ b lbl_80224890 -lbl_80224884: -/* 80224884 40 81 00 0C */ ble lbl_80224890 -/* 80224888 38 04 FF FF */ addi r0, r4, -1 -/* 8022488C 98 1F 01 DB */ stb r0, 0x1db(r31) -lbl_80224890: -/* 80224890 3B A0 00 00 */ li r29, 0 -/* 80224894 3B C0 00 00 */ li r30, 0 -lbl_80224898: -/* 80224898 38 1E 01 D2 */ addi r0, r30, 0x1d2 -/* 8022489C 7C 1F 00 AE */ lbzx r0, r31, r0 -/* 802248A0 28 00 00 4B */ cmplwi r0, 0x4b -/* 802248A4 40 82 00 18 */ bne lbl_802248BC -/* 802248A8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802248AC 57 A4 06 3E */ clrlwi r4, r29, 0x18 -/* 802248B0 88 BF 01 DB */ lbz r5, 0x1db(r31) -/* 802248B4 38 C0 00 32 */ li r6, 0x32 -/* 802248B8 4B FF 62 CD */ bl setItemNum__13dMeter2Draw_cFUcUcUc -lbl_802248BC: -/* 802248BC 3B BD 00 01 */ addi r29, r29, 1 -/* 802248C0 2C 1D 00 02 */ cmpwi r29, 2 -/* 802248C4 3B DE 00 02 */ addi r30, r30, 2 -/* 802248C8 41 80 FF D0 */ blt lbl_80224898 -lbl_802248CC: -/* 802248CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802248D0 48 13 D9 59 */ bl _restgpr_29 -/* 802248D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802248D8 7C 08 03 A6 */ mtlr r0 -/* 802248DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802248E0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2/moveRupee__9dMeter2_cFv.s b/asm/d/meter/d_meter2/moveRupee__9dMeter2_cFv.s deleted file mode 100644 index 7775a61cf2..0000000000 --- a/asm/d/meter/d_meter2/moveRupee__9dMeter2_cFv.s +++ /dev/null @@ -1,312 +0,0 @@ -lbl_80220C30: -/* 80220C30 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80220C34 7C 08 02 A6 */ mflr r0 -/* 80220C38 90 01 00 24 */ stw r0, 0x24(r1) -/* 80220C3C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80220C40 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80220C44 7C 7E 1B 78 */ mr r30, r3 -/* 80220C48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220C4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220C50 4B E1 1E 59 */ bl getRupeeMax__21dSv_player_status_a_cCFv -/* 80220C54 7C 65 07 34 */ extsh r5, r3 -/* 80220C58 3B E0 00 00 */ li r31, 0 -/* 80220C5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220C60 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220C64 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80220C68 2C 03 00 00 */ cmpwi r3, 0 -/* 80220C6C 41 82 00 B0 */ beq lbl_80220D1C -/* 80220C70 A0 04 00 04 */ lhz r0, 4(r4) -/* 80220C74 7C 00 1A 14 */ add r0, r0, r3 -/* 80220C78 7C 06 07 34 */ extsh r6, r0 -/* 80220C7C 7C 06 28 00 */ cmpw r6, r5 -/* 80220C80 40 81 00 0C */ ble lbl_80220C8C -/* 80220C84 7C A6 2B 78 */ mr r6, r5 -/* 80220C88 48 00 00 10 */ b lbl_80220C98 -lbl_80220C8C: -/* 80220C8C 7C C0 07 35 */ extsh. r0, r6 -/* 80220C90 40 80 00 08 */ bge lbl_80220C98 -/* 80220C94 38 C0 00 00 */ li r6, 0 -lbl_80220C98: -/* 80220C98 54 C3 04 3E */ clrlwi r3, r6, 0x10 -/* 80220C9C B0 C4 00 04 */ sth r6, 4(r4) -/* 80220CA0 38 00 00 00 */ li r0, 0 -/* 80220CA4 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80220CA8 A8 1E 01 B0 */ lha r0, 0x1b0(r30) -/* 80220CAC 7C 00 18 50 */ subf r0, r0, r3 -/* 80220CB0 2C 00 00 05 */ cmpwi r0, 5 -/* 80220CB4 41 80 00 34 */ blt lbl_80220CE8 -/* 80220CB8 88 1E 01 EA */ lbz r0, 0x1ea(r30) -/* 80220CBC 60 00 00 04 */ ori r0, r0, 4 -/* 80220CC0 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220CC4 88 7E 01 EA */ lbz r3, 0x1ea(r30) -/* 80220CC8 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c -/* 80220CCC 41 82 00 50 */ beq lbl_80220D1C -/* 80220CD0 54 60 07 76 */ rlwinm r0, r3, 0, 0x1d, 0x1b -/* 80220CD4 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220CD8 88 1E 01 EA */ lbz r0, 0x1ea(r30) -/* 80220CDC 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 80220CE0 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220CE4 48 00 00 38 */ b lbl_80220D1C -lbl_80220CE8: -/* 80220CE8 2C 00 FF FB */ cmpwi r0, -5 -/* 80220CEC 41 81 00 30 */ bgt lbl_80220D1C -/* 80220CF0 88 1E 01 EA */ lbz r0, 0x1ea(r30) -/* 80220CF4 60 00 00 08 */ ori r0, r0, 8 -/* 80220CF8 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220CFC 88 7E 01 EA */ lbz r3, 0x1ea(r30) -/* 80220D00 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d -/* 80220D04 41 82 00 18 */ beq lbl_80220D1C -/* 80220D08 54 60 07 B8 */ rlwinm r0, r3, 0, 0x1e, 0x1c -/* 80220D0C 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220D10 88 1E 01 EA */ lbz r0, 0x1ea(r30) -/* 80220D14 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 80220D18 98 1E 01 EA */ stb r0, 0x1ea(r30) -lbl_80220D1C: -/* 80220D1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80220D20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80220D24 A0 03 00 04 */ lhz r0, 4(r3) -/* 80220D28 A8 9E 01 B0 */ lha r4, 0x1b0(r30) -/* 80220D2C 7C 04 00 00 */ cmpw r4, r0 -/* 80220D30 41 82 01 A0 */ beq lbl_80220ED0 -/* 80220D34 40 80 00 D0 */ bge lbl_80220E04 -/* 80220D38 38 04 00 01 */ addi r0, r4, 1 -/* 80220D3C B0 1E 01 B0 */ sth r0, 0x1b0(r30) -/* 80220D40 3B E0 00 01 */ li r31, 1 -/* 80220D44 88 9E 01 EA */ lbz r4, 0x1ea(r30) -/* 80220D48 54 80 F7 FF */ rlwinm. r0, r4, 0x1e, 0x1f, 0x1f -/* 80220D4C 41 82 01 84 */ beq lbl_80220ED0 -/* 80220D50 A0 63 00 04 */ lhz r3, 4(r3) -/* 80220D54 A8 1E 01 B0 */ lha r0, 0x1b0(r30) -/* 80220D58 7C 00 18 00 */ cmpw r0, r3 -/* 80220D5C 41 82 00 58 */ beq lbl_80220DB4 -/* 80220D60 54 80 07 FF */ clrlwi. r0, r4, 0x1f -/* 80220D64 40 82 00 44 */ bne lbl_80220DA8 -/* 80220D68 60 80 00 01 */ ori r0, r4, 1 -/* 80220D6C 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220D70 38 00 00 73 */ li r0, 0x73 -/* 80220D74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80220D78 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80220D7C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80220D80 38 A0 00 00 */ li r5, 0 -/* 80220D84 38 C0 00 00 */ li r6, 0 -/* 80220D88 38 E0 00 00 */ li r7, 0 -/* 80220D8C C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80220D90 FC 40 08 90 */ fmr f2, f1 -/* 80220D94 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 80220D98 FC 80 18 90 */ fmr f4, f3 -/* 80220D9C 39 00 00 00 */ li r8, 0 -/* 80220DA0 48 08 AB E5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80220DA4 48 00 01 2C */ b lbl_80220ED0 -lbl_80220DA8: -/* 80220DA8 54 80 06 3C */ rlwinm r0, r4, 0, 0x18, 0x1e -/* 80220DAC 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220DB0 48 00 01 20 */ b lbl_80220ED0 -lbl_80220DB4: -/* 80220DB4 38 00 00 74 */ li r0, 0x74 -/* 80220DB8 90 01 00 10 */ stw r0, 0x10(r1) -/* 80220DBC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80220DC0 38 81 00 10 */ addi r4, r1, 0x10 -/* 80220DC4 38 A0 00 00 */ li r5, 0 -/* 80220DC8 38 C0 00 00 */ li r6, 0 -/* 80220DCC 38 E0 00 00 */ li r7, 0 -/* 80220DD0 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80220DD4 FC 40 08 90 */ fmr f2, f1 -/* 80220DD8 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 80220DDC FC 80 18 90 */ fmr f4, f3 -/* 80220DE0 39 00 00 00 */ li r8, 0 -/* 80220DE4 48 08 AB A1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80220DE8 88 1E 01 EA */ lbz r0, 0x1ea(r30) -/* 80220DEC 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 80220DF0 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220DF4 88 1E 01 EA */ lbz r0, 0x1ea(r30) -/* 80220DF8 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 80220DFC 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220E00 48 00 00 D0 */ b lbl_80220ED0 -lbl_80220E04: -/* 80220E04 40 81 00 CC */ ble lbl_80220ED0 -/* 80220E08 38 04 FF FF */ addi r0, r4, -1 -/* 80220E0C B0 1E 01 B0 */ sth r0, 0x1b0(r30) -/* 80220E10 3B E0 00 01 */ li r31, 1 -/* 80220E14 88 9E 01 EA */ lbz r4, 0x1ea(r30) -/* 80220E18 54 80 EF FF */ rlwinm. r0, r4, 0x1d, 0x1f, 0x1f -/* 80220E1C 41 82 00 B4 */ beq lbl_80220ED0 -/* 80220E20 A0 63 00 04 */ lhz r3, 4(r3) -/* 80220E24 A8 1E 01 B0 */ lha r0, 0x1b0(r30) -/* 80220E28 7C 00 18 00 */ cmpw r0, r3 -/* 80220E2C 41 82 00 58 */ beq lbl_80220E84 -/* 80220E30 54 80 07 BD */ rlwinm. r0, r4, 0, 0x1e, 0x1e -/* 80220E34 40 82 00 44 */ bne lbl_80220E78 -/* 80220E38 60 80 00 02 */ ori r0, r4, 2 -/* 80220E3C 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220E40 38 00 00 75 */ li r0, 0x75 -/* 80220E44 90 01 00 0C */ stw r0, 0xc(r1) -/* 80220E48 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80220E4C 38 81 00 0C */ addi r4, r1, 0xc -/* 80220E50 38 A0 00 00 */ li r5, 0 -/* 80220E54 38 C0 00 00 */ li r6, 0 -/* 80220E58 38 E0 00 00 */ li r7, 0 -/* 80220E5C C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80220E60 FC 40 08 90 */ fmr f2, f1 -/* 80220E64 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 80220E68 FC 80 18 90 */ fmr f4, f3 -/* 80220E6C 39 00 00 00 */ li r8, 0 -/* 80220E70 48 08 AB 15 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80220E74 48 00 00 5C */ b lbl_80220ED0 -lbl_80220E78: -/* 80220E78 54 80 07 FA */ rlwinm r0, r4, 0, 0x1f, 0x1d -/* 80220E7C 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220E80 48 00 00 50 */ b lbl_80220ED0 -lbl_80220E84: -/* 80220E84 38 00 00 76 */ li r0, 0x76 -/* 80220E88 90 01 00 08 */ stw r0, 8(r1) -/* 80220E8C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80220E90 38 81 00 08 */ addi r4, r1, 8 -/* 80220E94 38 A0 00 00 */ li r5, 0 -/* 80220E98 38 C0 00 00 */ li r6, 0 -/* 80220E9C 38 E0 00 00 */ li r7, 0 -/* 80220EA0 C0 22 AF CC */ lfs f1, lit_4663(r2) -/* 80220EA4 FC 40 08 90 */ fmr f2, f1 -/* 80220EA8 C0 62 AF D0 */ lfs f3, lit_4837(r2) -/* 80220EAC FC 80 18 90 */ fmr f4, f3 -/* 80220EB0 39 00 00 00 */ li r8, 0 -/* 80220EB4 48 08 AA D1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80220EB8 88 1E 01 EA */ lbz r0, 0x1ea(r30) -/* 80220EBC 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b -/* 80220EC0 98 1E 01 EA */ stb r0, 0x1ea(r30) -/* 80220EC4 88 1E 01 EA */ lbz r0, 0x1ea(r30) -/* 80220EC8 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 80220ECC 98 1E 01 EA */ stb r0, 0x1ea(r30) -lbl_80220ED0: -/* 80220ED0 C0 1E 02 68 */ lfs f0, 0x268(r30) -/* 80220ED4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220ED8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220EDC C0 23 03 3C */ lfs f1, 0x33c(r3) -/* 80220EE0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80220EE4 41 82 00 0C */ beq lbl_80220EF0 -/* 80220EE8 D0 3E 02 68 */ stfs f1, 0x268(r30) -/* 80220EEC 3B E0 00 01 */ li r31, 1 -lbl_80220EF0: -/* 80220EF0 C0 1E 02 6C */ lfs f0, 0x26c(r30) -/* 80220EF4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220EF8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220EFC C0 23 03 40 */ lfs f1, 0x340(r3) -/* 80220F00 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80220F04 41 82 00 0C */ beq lbl_80220F10 -/* 80220F08 D0 3E 02 6C */ stfs f1, 0x26c(r30) -/* 80220F0C 3B E0 00 01 */ li r31, 1 -lbl_80220F10: -/* 80220F10 C0 1E 02 70 */ lfs f0, 0x270(r30) -/* 80220F14 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220F18 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220F1C C0 23 03 44 */ lfs f1, 0x344(r3) -/* 80220F20 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80220F24 41 82 00 0C */ beq lbl_80220F30 -/* 80220F28 D0 3E 02 70 */ stfs f1, 0x270(r30) -/* 80220F2C 3B E0 00 01 */ li r31, 1 -lbl_80220F30: -/* 80220F30 C0 1E 02 74 */ lfs f0, 0x274(r30) -/* 80220F34 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220F38 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220F3C C0 23 03 4C */ lfs f1, 0x34c(r3) -/* 80220F40 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80220F44 41 82 00 0C */ beq lbl_80220F50 -/* 80220F48 D0 3E 02 74 */ stfs f1, 0x274(r30) -/* 80220F4C 3B E0 00 01 */ li r31, 1 -lbl_80220F50: -/* 80220F50 C0 1E 02 78 */ lfs f0, 0x278(r30) -/* 80220F54 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220F58 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220F5C C0 23 03 50 */ lfs f1, 0x350(r3) -/* 80220F60 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80220F64 41 82 00 0C */ beq lbl_80220F70 -/* 80220F68 D0 3E 02 78 */ stfs f1, 0x278(r30) -/* 80220F6C 3B E0 00 01 */ li r31, 1 -lbl_80220F70: -/* 80220F70 C0 1E 02 7C */ lfs f0, 0x27c(r30) -/* 80220F74 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220F78 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220F7C C0 23 03 54 */ lfs f1, 0x354(r3) -/* 80220F80 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80220F84 41 82 00 0C */ beq lbl_80220F90 -/* 80220F88 D0 3E 02 7C */ stfs f1, 0x27c(r30) -/* 80220F8C 3B E0 00 01 */ li r31, 1 -lbl_80220F90: -/* 80220F90 C0 1E 02 80 */ lfs f0, 0x280(r30) -/* 80220F94 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220F98 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220F9C C0 23 03 74 */ lfs f1, 0x374(r3) -/* 80220FA0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80220FA4 41 82 00 0C */ beq lbl_80220FB0 -/* 80220FA8 D0 3E 02 80 */ stfs f1, 0x280(r30) -/* 80220FAC 3B E0 00 01 */ li r31, 1 -lbl_80220FB0: -/* 80220FB0 C0 1E 02 84 */ lfs f0, 0x284(r30) -/* 80220FB4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220FB8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220FBC C0 23 03 6C */ lfs f1, 0x36c(r3) -/* 80220FC0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80220FC4 41 82 00 0C */ beq lbl_80220FD0 -/* 80220FC8 D0 3E 02 84 */ stfs f1, 0x284(r30) -/* 80220FCC 3B E0 00 01 */ li r31, 1 -lbl_80220FD0: -/* 80220FD0 C0 1E 02 88 */ lfs f0, 0x288(r30) -/* 80220FD4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220FD8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220FDC C0 23 03 70 */ lfs f1, 0x370(r3) -/* 80220FE0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80220FE4 41 82 00 0C */ beq lbl_80220FF0 -/* 80220FE8 D0 3E 02 88 */ stfs f1, 0x288(r30) -/* 80220FEC 3B E0 00 01 */ li r31, 1 -lbl_80220FF0: -/* 80220FF0 C0 1E 02 8C */ lfs f0, 0x28c(r30) -/* 80220FF4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80220FF8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80220FFC C0 23 03 7C */ lfs f1, 0x37c(r3) -/* 80221000 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221004 41 82 00 0C */ beq lbl_80221010 -/* 80221008 D0 3E 02 8C */ stfs f1, 0x28c(r30) -/* 8022100C 3B E0 00 01 */ li r31, 1 -lbl_80221010: -/* 80221010 C0 1E 02 90 */ lfs f0, 0x290(r30) -/* 80221014 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221018 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8022101C C0 23 03 80 */ lfs f1, 0x380(r3) -/* 80221020 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221024 41 82 00 0C */ beq lbl_80221030 -/* 80221028 D0 3E 02 90 */ stfs f1, 0x290(r30) -/* 8022102C 3B E0 00 01 */ li r31, 1 -lbl_80221030: -/* 80221030 C0 1E 02 94 */ lfs f0, 0x294(r30) -/* 80221034 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80221038 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8022103C C0 23 03 84 */ lfs f1, 0x384(r3) -/* 80221040 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80221044 41 82 00 0C */ beq lbl_80221050 -/* 80221048 D0 3E 02 94 */ stfs f1, 0x294(r30) -/* 8022104C 3B E0 00 01 */ li r31, 1 -lbl_80221050: -/* 80221050 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80221054 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80221058 88 83 00 19 */ lbz r4, 0x19(r3) -/* 8022105C 88 7E 02 98 */ lbz r3, 0x298(r30) -/* 80221060 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80221064 7C 03 00 40 */ cmplw r3, r0 -/* 80221068 41 82 00 0C */ beq lbl_80221074 -/* 8022106C 98 9E 02 98 */ stb r4, 0x298(r30) -/* 80221070 3B E0 00 01 */ li r31, 1 -lbl_80221074: -/* 80221074 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80221078 28 00 00 01 */ cmplwi r0, 1 -/* 8022107C 40 82 00 10 */ bne lbl_8022108C -/* 80221080 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80221084 A8 9E 01 B0 */ lha r4, 0x1b0(r30) -/* 80221088 4B FF 52 A5 */ bl drawRupee__13dMeter2Draw_cFs -lbl_8022108C: -/* 8022108C 7F C3 F3 78 */ mr r3, r30 -/* 80221090 48 00 3D 31 */ bl alphaAnimeRupee__9dMeter2_cFv -/* 80221094 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80221098 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8022109C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802210A0 7C 08 03 A6 */ mtlr r0 -/* 802210A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802210A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/_delete__12daObjSMark_cFv.s b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/_delete__12daObjSMark_cFv.s new file mode 100644 index 0000000000..5c3a1400bd --- /dev/null +++ b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/_delete__12daObjSMark_cFv.s @@ -0,0 +1,14 @@ +lbl_8059A33C: +/* 8059A33C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8059A340 7C 08 02 A6 */ mflr r0 +/* 8059A344 90 01 00 14 */ stw r0, 0x14(r1) +/* 8059A348 3C 80 80 5A */ lis r4, l_arcName@ha /* 0x8059A410@ha */ +/* 8059A34C 38 84 A4 10 */ addi r4, r4, l_arcName@l /* 0x8059A410@l */ +/* 8059A350 80 84 00 00 */ lwz r4, 0(r4) +/* 8059A354 38 63 05 68 */ addi r3, r3, 0x568 +/* 8059A358 4B A9 2C B1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc +/* 8059A35C 38 60 00 01 */ li r3, 1 +/* 8059A360 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8059A364 7C 08 03 A6 */ mtlr r0 +/* 8059A368 38 21 00 10 */ addi r1, r1, 0x10 +/* 8059A36C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/daObjSMark_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/daObjSMark_Create__FP10fopAc_ac_c.s new file mode 100644 index 0000000000..941944da4f --- /dev/null +++ b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/daObjSMark_Create__FP10fopAc_ac_c.s @@ -0,0 +1,9 @@ +lbl_8059A3B0: +/* 8059A3B0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8059A3B4 7C 08 02 A6 */ mflr r0 +/* 8059A3B8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8059A3BC 4B FF FD AD */ bl create__12daObjSMark_cFv +/* 8059A3C0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8059A3C4 7C 08 03 A6 */ mtlr r0 +/* 8059A3C8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8059A3CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/daObjSMark_Delete__FP12daObjSMark_c.s b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/daObjSMark_Delete__FP12daObjSMark_c.s new file mode 100644 index 0000000000..d95003f89c --- /dev/null +++ b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/daObjSMark_Delete__FP12daObjSMark_c.s @@ -0,0 +1,9 @@ +lbl_8059A390: +/* 8059A390 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8059A394 7C 08 02 A6 */ mflr r0 +/* 8059A398 90 01 00 14 */ stw r0, 0x14(r1) +/* 8059A39C 4B FF FF A1 */ bl _delete__12daObjSMark_cFv +/* 8059A3A0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8059A3A4 7C 08 03 A6 */ mtlr r0 +/* 8059A3A8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8059A3AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/daObjSMark_Draw__FP12daObjSMark_c.s b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/daObjSMark_Draw__FP12daObjSMark_c.s new file mode 100644 index 0000000000..ab23993ecc --- /dev/null +++ b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/daObjSMark_Draw__FP12daObjSMark_c.s @@ -0,0 +1,9 @@ +lbl_8059A370: +/* 8059A370 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8059A374 7C 08 02 A6 */ mflr r0 +/* 8059A378 90 01 00 14 */ stw r0, 0x14(r1) +/* 8059A37C 4B FF FF 51 */ bl draw__12daObjSMark_cFv +/* 8059A380 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8059A384 7C 08 03 A6 */ mtlr r0 +/* 8059A388 38 21 00 10 */ addi r1, r1, 0x10 +/* 8059A38C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/initBaseMtx__12daObjSMark_cFv.s b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/initBaseMtx__12daObjSMark_cFv.s new file mode 100644 index 0000000000..1d83e0d5f6 --- /dev/null +++ b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/initBaseMtx__12daObjSMark_cFv.s @@ -0,0 +1,9 @@ +lbl_8059A018: +/* 8059A018 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8059A01C 7C 08 02 A6 */ mflr r0 +/* 8059A020 90 01 00 14 */ stw r0, 0x14(r1) +/* 8059A024 48 00 00 15 */ bl setBaseMtx__12daObjSMark_cFv +/* 8059A028 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8059A02C 7C 08 03 A6 */ mtlr r0 +/* 8059A030 38 21 00 10 */ addi r1, r1, 0x10 +/* 8059A034 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/setBaseMtx__12daObjSMark_cFv.s b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/setBaseMtx__12daObjSMark_cFv.s new file mode 100644 index 0000000000..b31c49d2f1 --- /dev/null +++ b/asm/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark/setBaseMtx__12daObjSMark_cFv.s @@ -0,0 +1,19 @@ +lbl_8059A038: +/* 8059A038 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8059A03C 7C 08 02 A6 */ mflr r0 +/* 8059A040 90 01 00 14 */ stw r0, 0x14(r1) +/* 8059A044 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8059A048 7C 7F 1B 78 */ mr r31, r3 +/* 8059A04C 38 7F 04 D0 */ addi r3, r31, 0x4d0 +/* 8059A050 4B A7 2D 15 */ bl transS__14mDoMtx_stack_cFRC4cXyz +/* 8059A054 38 7F 04 E4 */ addi r3, r31, 0x4e4 +/* 8059A058 4B A7 2E ED */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz +/* 8059A05C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ +/* 8059A060 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ +/* 8059A064 38 9F 07 E4 */ addi r4, r31, 0x7e4 +/* 8059A068 4B DA C4 49 */ bl PSMTXCopy +/* 8059A06C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8059A070 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8059A074 7C 08 03 A6 */ mtlr r0 +/* 8059A078 38 21 00 10 */ addi r1, r1, 0x10 +/* 8059A07C 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 3d2e298d6c..37f3eb7593 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -169,14 +169,31 @@ public: u8 getCStickStatusForce() { return mCStickStatusForce; } u8 getCStickSetFlagForce() { return mCStickSetFlagForce; } u8 getCStickDirectionForce() { return mCStickDirectionForce; } + u8 getDoStatusForce() { return mDoStatusForce; } + u8 getDoSetFlagForce() { return mDoSetFlagForce; } + u8 getAStatusForce() { return mAStatusForce; } + u8 getASetFlagForce() { return mASetFlagForce; } + u8 getRStatusForce() { return mRStatusForce; } + u8 getRSetFlagForce() { return mRSetFlagForce; } + u8 getZStatusForce() { return mZStatusForce; } + u8 getZSetFlagForce() { return mZSetFlagForce; } + u8 getBottleStatusForce() { return mBottleStatusForce; } + u8 getBottleSetFlagForce() { return mBottleSetFlagForce; } + u8 get3DStatusForce() { return m3DStatusForce; } + u8 get3DSetFlagForce() { return m3DSetFlagForce; } + u8 get3DDirectionForce() { return m3DDirectionForce; } + u8 getXStatusForce() { return mXStatusForce; } + u8 getXSetFlagForce() { return mXSetFlagForce; } + u8 getYStatusForce() { return mYStatusForce; } + u8 getYSetFlagForce() { return mYSetFlagForce; } u8 getFaceAnimeID() { return mFaceAnimeID; } u8 getBaseAnimeID() { return mBaseAnimeID; } bool isCStickSetFlag(u8 flag) { return mCStickSetFlag & flag; } - bool isDoSetFlag(u8 flag) { return flag & mDoSetFlag; } - bool isASetFlag(u8 flag) { return flag & mASetFlag; } - bool isRSetFlag(u8 flag) { return flag & mRSetFlag; } - bool isXSetFlag(u8 flag) { return flag & mXSetFlag; } - bool isYSetFlag(u8 flag) { return flag & mYSetFlag; } + bool isDoSetFlag(u8 flag) { return (mDoSetFlag & flag) ? true : false; } + bool isASetFlag(u8 flag) { return (mASetFlag & flag) ? true : false; } + bool isRSetFlag(u8 flag) { return (mRSetFlag & flag) ? true : false; } + bool isXSetFlag(u8 flag) { return (mXSetFlag & flag) ? true : false; } + bool isYSetFlag(u8 flag) { return (mYSetFlag & flag) ? true : false; } void setZStatus(u8 status, u8 flag) { mZStatus = status; @@ -203,16 +220,31 @@ public: mXSetFlag = flag; } + void setXStatusForce(u8 status, u8 flag) { + mXStatusForce = status; + mXSetFlagForce = flag; + } + void setYStatus(u8 status, u8 flag) { mYStatus = status; mYSetFlag = flag; } + void setYStatusForce(u8 status, u8 flag) { + mYStatusForce = status; + mYSetFlagForce = flag; + } + void setBottleStatus(u8 status, u8 flag) { mBottleStatus = status; mBottleSetFlag = flag; } + void setBottleStatusForce(u8 status, u8 flag) { + mBottleStatusForce = status; + mBottleSetFlagForce = flag; + } + void setNunStatus(u8 status, u8 param_1, u8 flag) { mNunStatus = status; field_0x4ef0 = param_1; @@ -263,6 +295,12 @@ public: m3DSetFlag = flag; } + void set3DStatusForce(u8 status, u8 direction, u8 flag) { + m3DStatusForce = status; + m3DDirectionForce = direction; + m3DSetFlagForce = flag; + } + void setDoStatusForce(u8 status, u8 flag) { mDoStatusForce = status; mDoSetFlagForce = flag; @@ -278,6 +316,11 @@ public: mRSetFlagForce = flag; } + void setZStatusForce(u8 status, u8 flag) { + mZStatusForce = status; + mZSetFlagForce = flag; + } + void setItemRupeeCount(s32 rupees) { mItemRupeeCount += rupees; } void setItemMagicCount(s16 magic) { mItemMagicCount += magic; } void setItemMaxMagicCount(s16 max) { mItemMaxMagicCount += max; } @@ -290,6 +333,7 @@ public: void setOxygenCount(s32 oxygen) { mOxygenCount += oxygen; } int getOxygen() { return mOxygen; } void setMaxOxygen(int max) { mMaxOxygen = max; } + void setOxygen(s32 i_oxygen) { mOxygen = i_oxygen; } int getMaxOxygen() { return mMaxOxygen; } int getNowOxygen() { return mNowOxygen; } void setItemNowLife(u16 life) { mItemNowLife = life; } @@ -299,9 +343,23 @@ public: s16 getItemMaxLifeCount() { return mItemMaxLifeCount; } f32 getItemLifeCount() { return mItemLifeCount; } s16 getItemMaxArrowNumCount() { return mItemMaxArrowNumCount; } + s16 getItemArrowNumCount() { return mItemArrowNumCount; } + s32 getItemMaxOilCount() { return mItemMaxOilCount; } + s32 getItemOilCount() { return mItemOilCount; } + s32 getMaxOxygenCount() { return mMaxOxygenCount; } + s32 getOxygenCount() { return mOxygenCount; } + s32 getItemRupeeCount() { return mItemRupeeCount; } + s16 getItemKeyNumCount() { return mItemKeyNumCount; } void clearNowAnimeID() { mNowAnimeID = -1; } void clearMesgCamInfoID() { mMesgCamInfo = -1; } void clearItemMaxLifeCount() { mItemMaxLifeCount = 0; } + void clearItemMaxOilCount() { mItemMaxOilCount = 0; } + void clearItemOilCount() { mItemOilCount = 0; } + void clearMaxOxygenCount() { mMaxOxygenCount = 0; } + void clearOxygenCount() { mOxygenCount = 0; } + void clearItemRupeeCount() { mItemRupeeCount = 0; } + void clearItemKeyNumCount() { mItemKeyNumCount = 0; } + void clearItemArrowNumCount() { mItemArrowNumCount = 0; } void clearItemLifeCount() { mItemLifeCount = 0.0f; mItemLifeCountType = 0; @@ -399,6 +457,7 @@ public: BOOL checkCameraAttentionStatus(int i, u32 flag) { return mCameraInfo[i].mCameraAttentionStatus & flag; } + u32 getCameraAttentionStatus(int i) { return mCameraInfo[i].mCameraAttentionStatus; } void setCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus = flag; } void onCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus |= flag; } void offCameraAttentionStatus(int i, u32 flag) { @@ -430,6 +489,7 @@ public: void setOxygenShowFlag(u8 flag) { mOxygenShowFlag = flag; } void show2dOn() { mShow2D = 1; } void show2dOff() { mShow2D = 0; } + u8 show2dCheck() { return mShow2D; } s8 getLayerOld() { return mLayerOld; } void setMesgCancelButton(u8 button) { mMesgCancelButton = button; } void setMesgBgm(u8 param_0) { mMesgBgm = param_0; } @@ -860,6 +920,7 @@ u16 dComIfGs_getRupee(); static u16 dComIfGs_getLife(); s8 dComIfGs_BossLife_public_Get(); u8 dComIfGs_checkGetInsectNum(); +u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx); inline void dComIfGs_init() { g_dComIfG_gameInfo.info.init(); @@ -1600,6 +1661,10 @@ inline void dComIfGs_addDeathCount() { g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().addDeathCount(); } +inline u8 dComIfGs_getWalletSize() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getWalletSize(); +} + void dComIfGp_setSelectItem(int index); s32 dComIfGp_offHeapLockFlag(int flag); void dComIfGp_createSubExpHeap2D(); @@ -1926,18 +1991,34 @@ inline void dComIfGp_setZStatus(u8 status, u8 flag) { g_dComIfG_gameInfo.play.setZStatus(status, flag); } +inline void dComIfGp_setZStatusForce(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setZStatusForce(status, flag); +} + inline void dComIfGp_set3DStatus(u8 status, u8 direction, u8 flag) { g_dComIfG_gameInfo.play.set3DStatus(status, direction, flag); } +inline void dComIfGp_set3DStatusForce(u8 status, u8 direction, u8 flag) { + g_dComIfG_gameInfo.play.set3DStatusForce(status, direction, flag); +} + inline void dComIfGp_setXStatus(u8 status, u8 flag) { g_dComIfG_gameInfo.play.setXStatus(status, flag); } +inline void dComIfGp_setXStatusForce(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setXStatusForce(status, flag); +} + inline void dComIfGp_setYStatus(u8 status, u8 flag) { g_dComIfG_gameInfo.play.setYStatus(status, flag); } +inline void dComIfGp_setYStatusForce(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setYStatusForce(status, flag); +} + inline void dComIfGp_setNunStatus(u8 status, u8 param_1, u8 flag) { g_dComIfG_gameInfo.play.setNunStatus(status, param_1, flag); } @@ -2050,6 +2131,74 @@ inline u8 dComIfGp_getSButtonSetFlagForce() { return g_dComIfG_gameInfo.play.getSButtonSetFlagForce(); } +inline u8 dComIfGp_getDoStatusForce() { + return g_dComIfG_gameInfo.play.getDoStatusForce(); +} + +inline u8 dComIfGp_getDoSetFlagForce() { + return g_dComIfG_gameInfo.play.getDoSetFlagForce(); +} + +inline u8 dComIfGp_getAStatusForce() { + return g_dComIfG_gameInfo.play.getAStatusForce(); +} + +inline u8 dComIfGp_getASetFlagForce() { + return g_dComIfG_gameInfo.play.getASetFlagForce(); +} + +inline u8 dComIfGp_getRStatusForce() { + return g_dComIfG_gameInfo.play.getRStatusForce(); +} + +inline u8 dComIfGp_getRSetFlagForce() { + return g_dComIfG_gameInfo.play.getRSetFlagForce(); +} + +inline u8 dComIfGp_getZStatusForce() { + return g_dComIfG_gameInfo.play.getZStatusForce(); +} + +inline u8 dComIfGp_getZSetFlagForce() { + return g_dComIfG_gameInfo.play.getZSetFlagForce(); +} + +inline u8 dComIfGp_getBottleStatusForce() { + return g_dComIfG_gameInfo.play.getBottleStatusForce(); +} + +inline u8 dComIfGp_getBottleSetFlagForce() { + return g_dComIfG_gameInfo.play.getBottleSetFlagForce(); +} + +inline u8 dComIfGp_getXStatusForce() { + return g_dComIfG_gameInfo.play.getXStatusForce(); +} + +inline u8 dComIfGp_getXSetFlagForce() { + return g_dComIfG_gameInfo.play.getXSetFlagForce(); +} + +inline u8 dComIfGp_getYStatusForce() { + return g_dComIfG_gameInfo.play.getYStatusForce(); +} + +inline u8 dComIfGp_getYSetFlagForce() { + return g_dComIfG_gameInfo.play.getYSetFlagForce(); +} + +inline u8 dComIfGp_get3DStatusForce() { + return g_dComIfG_gameInfo.play.get3DStatusForce(); +} + +inline u8 dComIfGp_get3DDirectionForce() { + return g_dComIfG_gameInfo.play.get3DDirectionForce(); +} + +inline u8 dComIfGp_get3DSetFlagForce() { + return g_dComIfG_gameInfo.play.get3DSetFlagForce(); +} + inline void dComIfGp_setItemMagicCount(s16 count) { g_dComIfG_gameInfo.play.setItemMagicCount(count); } @@ -2203,6 +2352,10 @@ inline f32 dComIfGp_getCameraZoomForcus(int i_no) { return g_dComIfG_gameInfo.play.getCameraZoomForcus(i_no); } +inline u32 dComIfGp_getCameraAttentionStatus(int i_no) { + return g_dComIfG_gameInfo.play.getCameraAttentionStatus(i_no); +} + inline void dComIfGp_clearPlayerStatus0(int param_0, u32 flag) { g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 0, flag); } @@ -2235,6 +2388,10 @@ inline void dComIfGp_setOxygenCount(s32 oxygen) { g_dComIfG_gameInfo.play.setOxygenCount(oxygen); } +inline void dComIfGp_setMaxOxygen(s32 i_oxygen) { + g_dComIfG_gameInfo.play.setMaxOxygen(i_oxygen); +} + inline s32 dComIfGp_getMaxOxygen() { return g_dComIfG_gameInfo.play.getMaxOxygen(); } @@ -2331,6 +2488,10 @@ inline void dComIfGp_2dShowOff() { g_dComIfG_gameInfo.play.show2dOff(); } +inline u8 dComIfGp_2dShowCheck() { + return g_dComIfG_gameInfo.play.show2dCheck(); +} + inline s16 dComIfGp_getItemMaxLifeCount() { return g_dComIfG_gameInfo.play.getItemMaxLifeCount(); } @@ -2343,14 +2504,78 @@ inline s16 dComIfGp_getItemMaxArrowNumCount() { return g_dComIfG_gameInfo.play.getItemMaxArrowNumCount(); } -inline void dComIfGp_clearItemMaxLifeCount() { - g_dComIfG_gameInfo.play.clearItemMaxLifeCount(); +inline s16 dComIfGp_getItemArrowNumCount() { + return g_dComIfG_gameInfo.play.getItemArrowNumCount(); +} + +inline s16 dComIfGp_getItemBombNumCount(u8 i_no) { + return g_dComIfG_gameInfo.play.getItemBombNumCount(i_no); +} + +inline s32 dComIfGp_getItemMaxOilCount() { + return g_dComIfG_gameInfo.play.getItemMaxOilCount(); +} + +inline s32 dComIfGp_getItemOilCount() { + return g_dComIfG_gameInfo.play.getItemOilCount(); +} + +inline s32 dComIfGp_getMaxOxygenCount() { + return g_dComIfG_gameInfo.play.getMaxOxygenCount(); +} + +inline s32 dComIfGp_getOxygenCount() { + return g_dComIfG_gameInfo.play.getOxygenCount(); +} + +inline s32 dComIfGp_getItemRupeeCount() { + return g_dComIfG_gameInfo.play.getItemRupeeCount(); +} + +inline void dComIfGp_clearItemRupeeCount() { + g_dComIfG_gameInfo.play.clearItemRupeeCount(); +} + +inline s16 dComIfGp_getItemKeyNumCount() { + return g_dComIfG_gameInfo.play.getItemKeyNumCount(); +} + +inline void dComIfGp_clearItemMaxOilCount() { + g_dComIfG_gameInfo.play.clearItemMaxOilCount(); +} + +inline void dComIfGp_clearItemBombNumCount(u8 i_no) { + g_dComIfG_gameInfo.play.clearItemBombNumCount(i_no); +} + +inline void dComIfGp_clearItemOilCount() { + g_dComIfG_gameInfo.play.clearItemOilCount(); +} + +inline void dComIfGp_clearMaxOxygenCount() { + g_dComIfG_gameInfo.play.clearMaxOxygenCount(); +} + +inline void dComIfGp_clearOxygenCount() { + g_dComIfG_gameInfo.play.clearOxygenCount(); +} + +inline void dComIfGp_clearItemKeyNumCount() { + g_dComIfG_gameInfo.play.clearItemKeyNumCount(); +} + +inline void dComIfGp_clearItemArrowNumCount() { + g_dComIfG_gameInfo.play.clearItemArrowNumCount(); } inline void dComIfGp_clearItemLifeCount() { g_dComIfG_gameInfo.play.clearItemLifeCount(); } +inline void dComIfGp_clearItemMaxLifeCount() { + g_dComIfG_gameInfo.play.clearItemMaxLifeCount(); +} + inline u8 dComIfGp_getItemLifeCountType() { return g_dComIfG_gameInfo.play.getItemLifeCountType(); } @@ -2523,6 +2748,10 @@ inline void i_dComIfGp_setBottleStatus(u8 param_0, u8 param_1) { g_dComIfG_gameInfo.play.setBottleStatus(param_0, param_1); } +inline void dComIfGp_setBottleStatusForce(u8 param_0, u8 param_1) { + g_dComIfG_gameInfo.play.setBottleStatusForce(param_0, param_1); +} + inline u8 i_dComIfGp_getDoStatus() { return g_dComIfG_gameInfo.play.getDoStatus(); } diff --git a/include/d/d_scope.h b/include/d/d_scope.h index e5bb5fabb2..7baec820fc 100644 --- a/include/d/d_scope.h +++ b/include/d/d_scope.h @@ -1,6 +1,54 @@ #ifndef D_D_SCOPE_H #define D_D_SCOPE_H -#include "dolphin/types.h" +#include "d/pane/d_pane_class.h" +#include "d/meter/d_meter2.h" + +class dScope_c : public dMeterSub_c { +public: + enum { + /* 0 */ PROC_OPEN, + /* 1 */ PROC_MOVE, + /* 2 */ PROC_CLOSE, + }; + + /* 80193690 */ dScope_c(u8); + /* 80193FB4 */ void open_init(); + /* 80193FD0 */ void open_proc(); + /* 80194048 */ void move_init(); + /* 8019404C */ void move_proc(); + /* 80194050 */ void close_init(); + /* 80194054 */ void close_proc(); + + /* 80193C68 */ virtual void draw(); + /* 8019396C */ virtual ~dScope_c(); + /* 80193B90 */ virtual int _execute(u32); + /* 80193FA0 */ virtual bool isDead(); + + /* 0x04 */ J2DScreen* mHawkEyeScrn; + /* 0x08 */ J2DScreen* mZoomInOutScrn; + /* 0x0C */ CPaneMgr* mHawkEyeRootPane; + /* 0x10 */ CPaneMgr* mZoomInOutRootPane; + /* 0x14 */ CPaneMgr* mHawkEyePanes[3]; + /* 0x20 */ CPaneMgr* mZoomInOutPanes[3][2]; + /* 0x38 */ J2DPicture* mpWipeTex; + /* 0x3C */ J2DPicture* mpBlackTex; + /* 0x40 */ u8 field_0x40[0x48 - 0x40]; + /* 0x48 */ JUtility::TColor field_0x48[2]; + /* 0x50 */ JUtility::TColor field_0x50[2]; + /* 0x58 */ u32 field_0x58; + /* 0x5C */ u32 field_0x5c; + /* 0x60 */ u8 field_0x60[0x78 - 0x60]; + /* 0x78 */ f32 mWidth; + /* 0x7C */ f32 mHeight; + /* 0x80 */ f32 mScale; + /* 0x84 */ f32 mAlpha; + /* 0x88 */ s16 mOpenTimer; + /* 0x8A */ s16 field_0x8a; + /* 0x8C */ u8 mProcess; + /* 0x8D */ u8 field_0x8d; + /* 0x8E */ u8 mIsDead; + /* 0x8F */ u8 field_0x8f; +}; #endif /* D_D_SCOPE_H */ diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 1a5d48ca69..a5bc5fc926 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1031,6 +1031,10 @@ inline int dStage_stagInfo_GetRangeDown(stage_stag_info_class* pstag) { return pstag->mRangeDown; } +inline u32 dStage_stagInfo_ChkKeyDisp(stage_stag_info_class* pstag) { + return pstag->field_0x09 & 1; +} + inline u32 dStage_sclsInfo_getSceneLayer(stage_scls_info_class* p_info) { return p_info->field_0xb & 0xF; } diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h index c959a4876b..087143a594 100644 --- a/include/d/meter/d_meter2.h +++ b/include/d/meter/d_meter2.h @@ -25,7 +25,7 @@ public: /* 8019411C */ virtual int _create(); /* 80194130 */ virtual int _execute(u32); /* 80194124 */ virtual int _delete(); - /* 80194138 */ virtual int isDead(); + /* 80194138 */ virtual bool isDead(); }; class dMeterButton_c : public dDlst_base_c { @@ -113,7 +113,7 @@ public: /* 802092C0 */ void setAlphaButtonOAnimeMax(int); /* 80209368 */ void setAlphaIconAnimeMin(); /* 802093D8 */ void setAlphaIconAnimeMax(); - /* 80209474 */ void isClose(); + /* 80209474 */ bool isClose(); /* 802095C0 */ void setString(char*, u8, u8, u8); /* 80209CEC */ void hideAll(); /* 80209D7C */ void getCenterPosCalc(u8, char*, int); @@ -125,7 +125,11 @@ public: /* 80202240 */ virtual void draw(); /* 80201370 */ virtual ~dMeterButton_c(); - /* 0x004 */ u8 field_0x4[0x630 - 0x4]; + bool isSetButton(u8 i_no) { return field_0x484[i_no] <= 0; } + + /* 0x004 */ u8 field_0x4[0x484 - 0x4]; + /* 0x48C */ s16 field_0x484[21]; + /* 0x4AE */ u8 field_0x4ae[0x630 - 0x4ae]; }; class dMeterString_c : public dMeterSub_c { @@ -141,6 +145,8 @@ public: /* 8020EE70 */ virtual int _create(); /* 8020F150 */ virtual int _execute(u32); /* 8020F49C */ virtual int _delete(); + + /* 0x04 */ u8 field_0x4[0x40 - 0x4]; }; class dMeterHaihai_c : public dMeterSub_c { @@ -164,6 +170,8 @@ public: /* 8020AF6C */ virtual int _create(); /* 8020B0F4 */ virtual int _execute(u32); /* 8020BDAC */ virtual int _delete(); + + u8 field_0x4[0x2c - 0x4]; }; class dMeter2_c : public msg_class { @@ -221,38 +229,40 @@ public: /* 802254C0 */ void alphaAnimeButtonCross(); /* 802256DC */ bool isShowLightDrop(); /* 802258A0 */ void killSubContents(u8); - /* 80225960 */ void isKeyVisible(); + /* 80225960 */ BOOL isKeyVisible(); /* 802259F8 */ int isArrowEquip(); /* 80225A64 */ int isPachinkoEquip(); void setNowLifeGauge(s16 life) { mNowLifeGauge = life; } void onArrowSoundBit(int bit) { mArrowSound |= (1 << bit); } void offArrowSoundBit(int bit) { mArrowSound &= ~(1 << bit); } - bool isArrowSoundBit(int bit) { return mArrowSound & (1 << bit); } + bool isArrowSoundBit(int bit) { return mArrowSound & (1 << bit) ? true : false; } void onRupeeSoundBit(int bit) { mRupeeSound |= (1 << bit); } void offRupeeSoundBit(int bit) { mRupeeSound &= ~(1 << bit); } bool isRupeeSoundBit(int bit) { return mRupeeSound & (1 << bit); } s16 getNowLifeGauge() { return mNowLifeGauge; } - u8 getSubContents() { return mSubContents; } + u8 getSubContents() { return mSubContentType; } u16 getSubContentsStringType() { return mSubContentsStringType; } + bool isShowFlag(int i_no) { return field_0x1e6 & (1 << i_no); } + void onShowFlag(int i_no) { field_0x1e6 |= (1 << i_no); } private: /* 0x0FC */ int field_0xfc; /* 0x100 */ JKRExpHeap* mpHeap; /* 0x104 */ JKRExpHeap* mpSubHeap; - /* 0x108 */ void* field_0x108; + /* 0x108 */ JKRHeap* field_0x108; /* 0x10C */ dMeter2Draw_c* mpMeterDraw; - /* 0x110 */ dMeterSub_c* mpMeterSub; - /* 0x114 */ dMeterString_c* mpMeterString; - /* 0x118 */ dMeterButton_c* mpMeterButton; + /* 0x110 */ dMeterSub_c* mpSubContents; + /* 0x114 */ dMeterString_c* mpSubSubContents; + /* 0x118 */ dMeterButton_c* mpEmpButton; /* 0x11C */ dMeterHaihai_c* field_0x11c; // type is a guess for now /* 0x120 */ dMeterMap_c* mpMap; - /* 0x124 */ u32 field_0x124; + /* 0x124 */ u32 mStatus; /* 0x128 */ u32 field_0x128; /* 0x12C */ int field_0x12c; /* 0x130 */ f32 field_0x130; - /* 0x134 */ f32 field_0x134[2]; - /* 0x13C */ f32 field_0x13c[2]; + /* 0x134 */ f32 mAButtonTalkPosX[2]; + /* 0x13C */ f32 mAButtonTalkPosY[2]; /* 0x144 */ f32 field_0x144; /* 0x148 */ f32 field_0x148[2]; /* 0x150 */ f32 field_0x150[2]; @@ -275,9 +285,9 @@ private: /* 0x1A4 */ int mNowOxygen; /* 0x1A8 */ int mMaxOxygen; /* 0x1AC */ int field_0x1ac; - /* 0x1B0 */ u16 mRupeeNum; - /* 0x1B2 */ u16 mKeyNum; - /* 0x1B4 */ u16 field_0x1b4; + /* 0x1B0 */ s16 mRupeeNum; + /* 0x1B2 */ s16 mKeyNum; + /* 0x1B4 */ s16 field_0x1b4; /* 0x1B6 */ u16 mSubContentsStringType; /* 0x1B8 */ u16 field_0x1b8[5]; /* 0x1C2 */ u8 mLightDropNum; @@ -310,7 +320,7 @@ private: /* 0x1E2 */ u8 mEquipSword; /* 0x1E3 */ u8 field_0x1e3; /* 0x1E4 */ u8 field_0x1e4; - /* 0x1E5 */ u8 mSubContents; + /* 0x1E5 */ u8 mSubContentType; /* 0x1E6 */ u8 field_0x1e6; /* 0x1E7 */ u8 field_0x1e7; /* 0x1E8 */ u8 field_0x1e8; @@ -319,7 +329,7 @@ private: /* 0x1EB */ u8 mArrowSound; /* 0x1EC */ u8 field_0x1ec; /* 0x1ED */ u8 field_0x1ed; - /* 0x1EE */ u8 field_0x1ee; + /* 0x1EE */ u8 mLifeCountType; /* 0x1EF */ u8 mBottleNum[4]; /* 0x1F3 */ u8 mBombNum[3]; /* 0x1F6 */ u8 mBombMax[3]; @@ -329,11 +339,113 @@ private: /* 0x1FF */ u8 field_0x1ff; /* 0x200 */ u8 field_0x200; /* 0x201 */ u8 field_0x201; - /* 0x204 */ f32 field_0x204; - /* 0x208 */ f32 field_0x208; - /* 0x20C */ f32 field_0x20c; - /* 0x210 */ f32 field_0x210; - /* 0x214 */ f32 field_0x214; + /* 0x204 */ f32 mLifeGaugePosX; + /* 0x208 */ f32 mLifeGaugePosY; + /* 0x20C */ f32 mLifeGaugeScale; + /* 0x210 */ f32 mHeartScale; + /* 0x214 */ f32 mLargeHeartScale; + /* 0x218 */ u8 field_0x218[0x22C - 0x218]; + /* 0x22C */ f32 mLanternMeterScale; + /* 0x230 */ f32 mLanternMeterPosX; + /* 0x234 */ f32 mLanternMeterPosY; + /* 0x238 */ f32 mOxygenMeterScale; + /* 0x23C */ f32 mOxygenMeterPosX; + /* 0x240 */ f32 mOxygenMeterPosY; + /* 0x244 */ u8 field_0x244[0x246 - 0x244]; + /* 0x246 */ s16 field_0x246; + /* 0x248 */ s16 field_0x248; + /* 0x24A */ u8 field_0x24a[0x268 - 0x24a]; + /* 0x268 */ f32 mRupeeKeyScale; + /* 0x26C */ f32 mRupeeKeyPosX; + /* 0x270 */ f32 mRupeeKeyPosY; + /* 0x274 */ f32 mRupeeScale; + /* 0x278 */ f32 mRupeePosX; + /* 0x27C */ f32 mRupeePosY; + /* 0x280 */ f32 mRupeeFramePosY; + /* 0x284 */ f32 mRupeeFrameScale; + /* 0x288 */ f32 mRupeeFramePosX; + /* 0x28C */ f32 mRupeeCountScale; + /* 0x290 */ f32 mRupeeCountPosX; + /* 0x294 */ f32 mRupeeCountPosY; + /* 0x298 */ u8 mWalletSize; + /* 0x29C */ f32 mKeyScale; + /* 0x2A0 */ f32 mKeyPosX; + /* 0x2A4 */ f32 mKeyPosY; + /* 0x2A8 */ f32 mKeyNumScale; + /* 0x2AC */ f32 mKeyNumPosX; + /* 0x2B0 */ f32 mKeyNumPosY; + /* 0x2B4 */ f32 mAButtonScale; + /* 0x2B8 */ f32 mAButtonPosX; + /* 0x2BC */ f32 mAButtonPosY; + /* 0x2C0 */ f32 mAButtonFontScale; + /* 0x2C4 */ f32 mAButtonFontPosX; + /* 0x2C8 */ f32 mAButtonFontPosY; + /* 0x2CC */ f32 field_0x2cc; + /* 0x2D0 */ f32 mBButtonPosX; + /* 0x2D4 */ f32 mBButtonPosY; + /* 0x2D8 */ u8 field_0x2d8[0x2e4 - 0x2d8]; + /* 0x2E4 */ f32 mAButtonTalkScale[2]; + /* 0x2EC */ f32 field_0x2ec[2]; + /* 0x2F4 */ f32 mBItemBaseScale[2]; + /* 0x2FC */ f32 mBItemBasePosX[2]; + /* 0x304 */ f32 mBItemBasePosY[2]; + /* 0x30C */ f32 mBButtonFontScale; + /* 0x310 */ f32 mBButtonFontPosX; + /* 0x314 */ f32 mBButtonFontPosY; + /* 0x318 */ u8 field_0x318[0x324 - 0x318]; + /* 0x324 */ f32 field_0x324; + /* 0x328 */ f32 field_0x328; + /* 0x32C */ f32 field_0x32c; + /* 0x330 */ f32 field_0x330; + /* 0x334 */ f32 field_0x334; + /* 0x338 */ f32 field_0x338; + /* 0x33C */ f32 field_0x33c; + /* 0x340 */ f32 field_0x340; + /* 0x344 */ f32 field_0x344; + /* 0x348 */ f32 field_0x348; + /* 0x34C */ f32 field_0x34c; + /* 0x350 */ f32 field_0x350; + /* 0x354 */ u8 field_0x354[0x360 - 0x354]; + /* 0x360 */ f32 field_0x360; + /* 0x364 */ f32 field_0x364; + /* 0x368 */ f32 field_0x368; + /* 0x36C */ f32 field_0x36c; + /* 0x370 */ f32 field_0x370; + /* 0x374 */ f32 field_0x374; + /* 0x378 */ u8 field_0x378[0x384 - 0x378]; + /* 0x384 */ f32 field_0x384; + /* 0x388 */ f32 field_0x388; + /* 0x38C */ f32 field_0x38c; + /* 0x390 */ f32 field_0x390[3]; + /* 0x39C */ f32 field_0x39c[2]; + /* 0x3A4 */ f32 field_0x3a4[2]; + /* 0x3AC */ f32 field_0x3ac[2]; + /* 0x3B4 */ f32 field_0x3b4[2]; + /* 0x3BC */ f32 field_0x3bc[2]; + /* 0x3C4 */ f32 field_0x3c4[2]; + /* 0x3CC */ u8 field_0x3cc[0x3e4 - 0x3CC]; + /* 0x3E4 */ f32 field_0x3e4; + /* 0x3E8 */ f32 field_0x3e8; + /* 0x3EC */ f32 field_0x3ec; + /* 0x3F0 */ f32 field_0x3f0; + /* 0x3F4 */ f32 field_0x3f4; + /* 0x3F8 */ f32 field_0x3f8; + /* 0x3FC */ u8 field_0x3fc[0x420 - 0x3fc]; + /* 0x420 */ f32 mVesselPosX; + /* 0x424 */ f32 mVesselPosY; + /* 0x428 */ f32 mVesselScale; + /* 0x42C */ f32 mVesselAlpha; + /* 0x430 */ f32 field_0x430; + /* 0x434 */ u8 field_0x434[0x448 - 0x434]; + /* 0x448 */ f32 mDPadButtonOFFPosX; + /* 0x44C */ f32 mDPadButtonOFFPosY; + /* 0x450 */ f32 mDPadButtonScale; + /* 0x454 */ f32 mDPadButtonONPosX; + /* 0x458 */ f32 mDPadButtonONPosY; + /* 0x45C */ f32 mDPadButtonLetterSpacing; + /* 0x460 */ u8 field_0x460[0x4bc - 0x460]; + /* 0x4BC */ u8 field_0x4bc; + /* 0x4BC */ u8 field_0x4bd; }; #endif /* D_METER_D_METER2_H */ diff --git a/include/d/meter/d_meter2_draw.h b/include/d/meter/d_meter2_draw.h index e5ae5b2d28..30676db42a 100644 --- a/include/d/meter/d_meter2_draw.h +++ b/include/d/meter/d_meter2_draw.h @@ -209,7 +209,7 @@ public: /* 802179C0 */ void drawButtonS(u8); /* 80217A10 */ void drawButtonBin(u8); /* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool); - /* 80218238 */ void getButtonCrossParentInitTransY(); + /* 80218238 */ f32 getButtonCrossParentInitTransY(); /* 80218254 */ void drawButtonCross(f32, f32); /* 80218338 */ void setAlphaButtonCrossAnimeMin(); /* 802183A8 */ void setAlphaButtonCrossAnimeMax(); @@ -229,7 +229,7 @@ public: /* 80219A84 */ void setButtonIconMidonaAlpha(u32); /* 80219E98 */ void setButtonIconAlpha(int, u8, u32, bool); /* 8021A29C */ ResTIMG* getNumberTexture(int); - /* 8021A2F4 */ void getActionString(u8, u8, u8*); + /* 8021A2F4 */ char* getActionString(u8, u8, u8*); /* 8021A468 */ void changeTextureItemB(u8); /* 8021A71C */ void changeTextureItemXY(int, u8); /* 8021A9C8 */ void setAlphaAnimeMin(CPaneMgrAlpha*, s16); @@ -244,16 +244,28 @@ public: /* 8021B810 */ void setItemParamB(u8); /* 8021BB6C */ bool getFishingType(); /* 8021BBB4 */ bool getCanoeFishing(); - /* 8021BC24 */ void getCameraSubject(); - /* 8021BC54 */ void getItemSubject(); + /* 8021BC24 */ bool getCameraSubject(); + /* 8021BC54 */ bool getItemSubject(); /* 8021BCAC */ bool getPlayerSubject(); - /* 8021BCC0 */ void isBButtonShow(bool); + /* 8021BCC0 */ bool isBButtonShow(bool); /* 8021BDD0 */ s16 getButtonTimer(); /* 802102F8 */ virtual ~dMeter2Draw_c(); J2DScreen* getMainScreenPtr() { return mpScreen; } bool isEmphasisC() { return field_0x766 == 7 ? true : false; } + f32 getMeterGaugeAlphaRate(u8 i_no) { return mMeterAlphaRate[i_no]; } + bool isEmphasisA() { return field_0x761 == 7 ? true : false; } + bool isEmphasisB() { return field_0x762 == 7 ? true : false; } + bool isEmphasisBin() { return field_0x763 == 7 ? true : false; } + bool isEmphasisZ() { return field_0x764 == 7 ? true : false; } + bool isEmphasis3D() { return field_0x765 == 7 ? true : false; } + bool isEmphasisS() { return field_0x767 == 7 ? true : false; } + bool isEmphasisX() { return field_0x768[0] == 7 ? true : false; } + bool isEmphasisY() { return field_0x768[1] == 7 ? true : false; } + bool isEmphasisR() { return field_0x768[2] == 7 ? true : false; } + void setEmphasisA(u8 param_0) { field_0x761 = param_0; } + void setEmphasisB(u8 param_0) { field_0x762 = param_0; } private: /* 0x004 */ f32 field_0x4; diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index c36d4dbdb6..085e504eac 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -52,7 +52,7 @@ public: void init(void); int setFloatingMessage(u16, s16, bool); int setFloatingFlow(u16, s16, bool); - int isFloatingMessageVisible(void); + bool isFloatingMessageVisible(void); int decFloatingMessageTimer(void); void resetFloatingMessage(void); void decMsgKeyWaitTimer(void); @@ -149,6 +149,8 @@ public: u32 getTimeMs() { return mTimeMs; } u8 getNowCount() { return mNowCount; } void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; } + u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; } + void resetDirectUseItem() { mDirectUseItem = 0; } public: /* 0x04 */ u8 unk4[4]; @@ -242,6 +244,7 @@ void dMeter2Info_set2DVibration(); void dMeter2Info_set2DVibrationM(); static void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bool pWakuVisible); static void dMeter2Info_offUseButton(int pButton); +bool dMeter2Info_is2DActiveTouchArea(); inline void dMeter2Info_Initialize() { g_meter2_info.init(); @@ -523,6 +526,18 @@ inline void dMeter2Info_setScopeZoomPointer(u8 param_0) { g_meter2_info.setScopeZoomPointer(param_0); } +inline bool dMeter2Info_isFloatingMessageVisible() { + return g_meter2_info.isFloatingMessageVisible(); +} + +inline u8 dMeter2Info_getItemExplainWindowStatus() { + return g_meter2_info.getItemExplainWindowStatus(); +} + +inline void dMeter2Info_resetDirectUseItem() { + g_meter2_info.resetDirectUseItem(); +} + char* dMeter2Info_getNumberTextureName(int pIndex); void dMeter2Info_recieveLetter(); u8 dMeter2Info_getNewLetterNum(); diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h index e4c2bb5841..d58a06ecf4 100644 --- a/include/d/meter/d_meter_HIO.h +++ b/include/d/meter/d_meter_HIO.h @@ -645,30 +645,22 @@ public: /* 0x0A8 */ f32 mAButtonAlpha; /* 0x0AC */ f32 mAButtonPosX; /* 0x0B0 */ f32 mAButtonPosY; - /* 0x0B4 */ f32 mAButtonTalkScale; - /* 0x0B8 */ f32 mAButtonFontTalkScale; - /* 0x0BC */ f32 mAButtonTalkPosX; - /* 0x0C0 */ f32 mAButtonFontTalkPosX; - /* 0x0C4 */ f32 mAButtonTalkPosY; - /* 0x0C8 */ f32 mAButtonFontTalkPosY; + /* 0x0B4 */ f32 mAButtonTalkScale[2]; + /* 0x0BC */ f32 mAButtonTalkPosX[2]; + /* 0x0C4 */ f32 mAButtonTalkPosY[2]; /* 0x0CC */ f32 mAButtonTalkAScale; /* 0x0D0 */ f32 mAButtonFontTalkAScale; - /* 0x0D4 */ f32 mAButtonTalkAPosX; - /* 0x0D8 */ f32 mAButtonFontTalkAPosX; - /* 0x0DC */ f32 mAButtonTalkAPosY; - /* 0x0E0 */ f32 mAButtonFontTalkAPosY; + /* 0x0D4 */ f32 mAButtonTalkAPosX[2]; + /* 0x0DC */ f32 mAButtonTalkAPosY[2]; /* 0x0E4 */ f32 mAButtonVesselPosX; /* 0x0E8 */ f32 mAButtonVesselPosY; /* 0x0EC */ f32 mBButtonScale; /* 0x0F0 */ f32 mBButtonAlpha; /* 0x0F4 */ f32 mBButtonPosX; /* 0x0F8 */ f32 mBButtonPosY; - /* 0x0FC */ f32 mBButtonTalkScale; - /* 0x100 */ f32 mBButtonFontTalkScale; - /* 0x104 */ f32 mBButtonTalkPosX; - /* 0x108 */ f32 mBButtonFontTalkPosX; - /* 0x10C */ f32 mBButtonTalkPosY; - /* 0x110 */ f32 mBButtonFontTalkPosY; + /* 0x0FC */ f32 mBButtonTalkScale[2]; + /* 0x104 */ f32 mBButtonTalkPosX[2]; + /* 0x10C */ f32 mBButtonTalkPosY[2]; /* 0x114 */ f32 mBButtonWolfPosX; /* 0x118 */ f32 mBButtonWolfPosY; /* 0x11C */ f32 mBButtonVesselPosX; @@ -738,19 +730,13 @@ public: /* 0x228 */ f32 mBItemBasePosX[2]; /* 0x230 */ f32 mBItemBasePosY[2]; /* 0x238 */ f32 mBItemBaseAlpha[2]; - /* 0x240 */ f32 mXButtonItemBaseScale; - /* 0x244 */ f32 mXButtonItemBaseNoItemScale; - /* 0x248 */ f32 mXButtonItemBasePosX; - /* 0x24C */ f32 mXButtonItemBaseNoItemPosX; - /* 0x250 */ f32 mXButtonItemBasePosY; - /* 0x254 */ f32 mXButtonItemBaseNoItemPosY; + /* 0x240 */ f32 mXButtonItemBaseScale[2]; + /* 0x248 */ f32 mXButtonItemBasePosX[2]; + /* 0x250 */ f32 mXButtonItemBasePosY[2]; /* 0x258 */ f32 mXButtonItemBaseAlpha[2]; - /* 0x260 */ f32 mYButtonItemBaseScale; - /* 0x264 */ f32 mYButtonItemBaseNoItemScale; - /* 0x268 */ f32 mYButtonItemBasePosX; - /* 0x26C */ f32 mYButtonItemBaseNoItemPosX; - /* 0x270 */ f32 mYButtonItemBasePosY; - /* 0x274 */ f32 mYButtonItemBaseNoItemPosY; + /* 0x260 */ f32 mYButtonItemBaseScale[2]; + /* 0x268 */ f32 mYButtonItemBasePosX[2]; + /* 0x270 */ f32 mYButtonItemBasePosY[2]; /* 0x278 */ f32 mYButtonItemBaseAlpha[2]; /* 0x280 */ f32 field_0x280; /* 0x284 */ f32 field_0x284; diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 8f9c3f73d0..e82c0ecc33 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -167,6 +167,7 @@ public: void onAutoMessageFlagLocal() { mAutoMessageFlag = 1; } void setFundRaisingValueLocal(s16 i_value) { mFundRaisingValue = i_value; } u16 getPortalMessageIDLocal() { return mPortalMessageID; } + bool isAutoMessageFlagLocal() { return mAutoMessageFlag; } u8 getSelectPushFlag() { return mSelectPushFlag; } u8 getSelectCancelPos() { return mSelectCancelPos; } @@ -179,6 +180,7 @@ public: void onAutoMessageFlag() { onAutoMessageFlagLocal(); } void setFundRaisingValue(s16 i_value) { setFundRaisingValueLocal(i_value); } u16 getPortalMessageID() { return getPortalMessageIDLocal(); } + bool isAutoMessageFlag() { return isAutoMessageFlagLocal(); } jmessage_tSequenceProcessor* getSequenceProcessor() { return mpSeqProc; } diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 532c728910..334cdcc389 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -392,15 +392,16 @@ public: u16 getRupeeMax() const; int isMagicFlag(u8 i_magic) const; - u16 getMaxLife() { return mMaxLife; } + u16 getMaxLife() const { return mMaxLife; } u16 getLife() const { return mLife; } u16 getRupee() const { return mRupee; } - u16 getOil() { return mOil; } + u16 getOil() const { return mOil; } u16 getMaxOil() const { return mMaxOil; } - u8& getMagic() { return mMagic; } - u8& getMaxMagic() { return mMaxMagic; } + u8 getMagic() const { return mMagic; } + u8 getMaxMagic() const { return mMaxMagic; } u8 getSelectEquip(int item) const { return mSelectEquip[item]; } u8 getTransformStatus() const { return mTransformStatus; } + u8 getWalletSize() const { return mWalletSize; } void setOil(u16 i_oil) { mOil = i_oil; } void setMaxOil(u16 i_maxOil) { mMaxOil = i_maxOil; } void setWalletSize(u8 i_size) { mWalletSize = i_size; } @@ -608,7 +609,7 @@ public: u8 getBombNum(u8 i_bombType) const; void setArrowNum(u8 i_maxNum) { mItemMax[ARROW_MAX] = i_maxNum; } - u8 getArrowNum() { return mItemMax[ARROW_MAX]; } + u8 getArrowNum() const { return mItemMax[ARROW_MAX]; } private: /* 0x0 */ u8 mItemMax[8]; diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index f3c77c5928..0e8767e166 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -116,6 +116,10 @@ inline void mDoAud_rainPlay(s32 enable) { g_mEnvSeMgr.startRainSe(enable, 0); } +inline void mDoAud_heartGaugeOn() { + Z2AudioMgr::getInterface()->mStatusMgr.heartGaugeOn(); +} + inline void mDoAud_mEnvse_framework() { g_mEnvSeMgr.framework(); } diff --git a/include/rel/d/a/d_a_horse/d_a_horse.h b/include/rel/d/a/d_a_horse/d_a_horse.h index 7e07e05ac1..4252b18e89 100644 --- a/include/rel/d/a/d_a_horse/d_a_horse.h +++ b/include/rel/d/a/d_a_horse/d_a_horse.h @@ -152,7 +152,7 @@ public: bool checkNoBombProc() const { return field_0x16b4 == 0 || field_0x16b4 == 1; } bool checkResetStateFlg0(daHorse_RFLG0 flag) const { return mResetStateFlg0 & flag; } bool checkEndResetStateFlg0(daHorse_ERFLG0 flag) { return mEndResetStateFlg0 & flag; } - bool checkStateFlg0(daHorse_FLG0 flag) { return mStateFlg0 & flag; } + bool checkStateFlg0(daHorse_FLG0 flag) const { return mStateFlg0 & flag; } f32 getNormalMaxSpeedF() { return mNormalMaxSpeedF; } void changeDemoMoveAngle(s16 angle) { mDemoMoveAngle = angle; } void setDemoStickR(f32 stick) { mDemoStickR = stick; } @@ -168,6 +168,7 @@ public: bool checkTurnStandCamera() const { return checkResetStateFlg0(TURN_STAND_CAMERA); } bool checkTurnStand() const { return checkResetStateFlg0(TURN_STAND); } + bool checkRodeoMode() const { return checkStateFlg0(RODEO_MODE); } static u8 const m_footJointTable[8]; static f32 const m_callLimitDistance2; diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 3b7d2ec08e..5f9bee44e7 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -8,57 +8,6 @@ #include "d/com/d_com_inf_game.h" #include "dol2asm.h" -// -// Types: -// - -class dScope_c : public dMeterSub_c { -public: - enum { - /* 0 */ PROC_OPEN, - /* 1 */ PROC_MOVE, - /* 2 */ PROC_CLOSE, - }; - - /* 80193690 */ dScope_c(u8); - /* 80193FB4 */ void open_init(); - /* 80193FD0 */ void open_proc(); - /* 80194048 */ void move_init(); - /* 8019404C */ void move_proc(); - /* 80194050 */ void close_init(); - /* 80194054 */ void close_proc(); - - /* 80193C68 */ virtual void draw(); - /* 8019396C */ virtual ~dScope_c(); - /* 80193B90 */ virtual int _execute(u32); - /* 80193FA0 */ virtual int isDead(); - - /* 0x04 */ J2DScreen* mHawkEyeScrn; - /* 0x08 */ J2DScreen* mZoomInOutScrn; - /* 0x0C */ CPaneMgr* mHawkEyeRootPane; - /* 0x10 */ CPaneMgr* mZoomInOutRootPane; - /* 0x14 */ CPaneMgr* mHawkEyePanes[3]; - /* 0x20 */ CPaneMgr* mZoomInOutPanes[3][2]; - /* 0x38 */ J2DPicture* mpWipeTex; - /* 0x3C */ J2DPicture* mpBlackTex; - /* 0x40 */ u8 field_0x40[0x48 - 0x40]; - /* 0x48 */ JUtility::TColor field_0x48[2]; - /* 0x50 */ JUtility::TColor field_0x50[2]; - /* 0x58 */ u32 field_0x58; - /* 0x5C */ u32 field_0x5c; - /* 0x60 */ u8 field_0x60[0x78 - 0x60]; - /* 0x78 */ f32 mWidth; - /* 0x7C */ f32 mHeight; - /* 0x80 */ f32 mScale; - /* 0x84 */ f32 mAlpha; - /* 0x88 */ s16 mOpenTimer; - /* 0x8A */ s16 field_0x8a; - /* 0x8C */ u8 mProcess; - /* 0x8D */ u8 field_0x8d; - /* 0x8E */ u8 mIsDead; - /* 0x8F */ u8 field_0x8f; -}; - // // Forward References: // @@ -339,8 +288,8 @@ extern "C" asm void draw__8dScope_cFv() { #endif /* 80193FA0-80193FB4 18E8E0 0014+00 1/0 0/0 0/0 .text isDead__8dScope_cFv */ -int dScope_c::isDead() { - return mIsDead != false; +bool dScope_c::isDead() { + return mIsDead != false ? 1 : 0; } /* 80193FB4-80193FD0 18E8F4 001C+00 1/0 0/0 0/0 .text open_init__8dScope_cFv */ diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp index 315b13bea9..8ea63fd654 100644 --- a/src/d/meter/d_meter2.cpp +++ b/src/d/meter/d_meter2.cpp @@ -4,29 +4,21 @@ // #include "d/meter/d_meter2.h" +#include "d/d_demo.h" +#include "d/d_scope.h" #include "d/d_timer.h" #include "d/menu/d_menu_window_HIO.h" #include "d/meter/d_meter_HIO.h" #include "dol2asm.h" -#include "dolphin/types.h" #include "f_op/f_op_msg.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_audio.h" +#include "rel/d/a/d_a_horse/d_a_horse.h" -// -// Types: -// - -struct dScope_c { - /* 80193690 */ dScope_c(u8); -}; - -struct dMeterHakusha_c { +struct dMeterHakusha_c : public dMeterSub_c { /* 8020C320 */ dMeterHakusha_c(void*); -}; -struct dDemo_c { - static u8 m_mode[4]; + u8 field_0x4[0x118 - 0x4]; }; // @@ -246,19 +238,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // -/* 804549C8-804549CC 002FC8 0004+00 9/9 0/0 0/0 .sdata2 @4662 */ -SECTION_SDATA2 static u8 lit_4662[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 804549CC-804549D0 002FCC 0004+00 13/13 0/0 0/0 .sdata2 @4663 */ -SECTION_SDATA2 static f32 lit_4663 = 1.0f; - /* 8021EA14-8021F128 219354 0714+00 1/1 0/0 0/0 .text _create__9dMeter2_cFv */ -// this can be cleaned up with float literals when everything else is decompiled int dMeter2_c::_create() { stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); if (dStage_stagInfo_GetUpButton(stag_info) == 1) { @@ -277,8 +257,8 @@ int dMeter2_c::_create() { field_0x128 = 0; field_0x12c = field_0x128; - field_0x124 = 0; - mSubContents = 0; + mStatus = 0; + mSubContentType = 0; mSubContentsStringType = 0; field_0x1e6 = 0; field_0x1e7 = 0; @@ -312,7 +292,7 @@ int dMeter2_c::_create() { field_0x1ec = 0; field_0x1ed = 0; - field_0x1ee = 0; + mLifeCountType = 0; mNowLifeGauge = i_dComIfGs_getLife(); dComIfGp_setItemNowLife((u8)mNowLifeGauge); @@ -334,7 +314,7 @@ int dMeter2_c::_create() { mMaxOxygen = dComIfGp_getMaxOxygen(); - field_0x130 = FLOAT_LABEL(lit_4662); + field_0x130 = 0.0f; u8 dark_area = dComIfGp_getStartStageDarkArea(); mLightDropNum = dComIfGs_getLightDropNum(dark_area); @@ -347,25 +327,21 @@ int dMeter2_c::_create() { mDoStatus = i_dComIfGp_getDoStatus(); mDoSetFlag = dComIfGp_isDoSetFlag(2); - int i = 0; - f32 temp0 = FLOAT_LABEL(lit_4662); - for (; i < 2; i++) { - field_0x134[i] = temp0; - field_0x13c[i] = temp0; + for (int i = 0; i < 2; i++) { + mAButtonTalkPosX[i] = 0.0f; + mAButtonTalkPosY[i] = 0.0f; } - field_0x144 = lit_4663; + field_0x144 = 1.0f; mAStatus = dComIfGp_getAStatus(); field_0x1c6 = 0; mASetFlag = dComIfGp_isASetFlag(2); - i = 0; - f32 temp1 = FLOAT_LABEL(lit_4662); - for (; i < 2; i++) { - field_0x148[i] = temp1; - field_0x150[i] = temp1; + for (int i = 0; i < 2; i++) { + field_0x148[i] = 0.0f; + field_0x150[i] = 0.0f; } - field_0x158 = lit_4663; + field_0x158 = 1.0f; field_0x1e4 = 0; mEquipSword = dComIfGs_getSelectEquipSword(); @@ -391,9 +367,8 @@ int dMeter2_c::_create() { mItemStatus[Y_ITEM] = dComIfGp_getSelectItem(1); mItemStatus[X_STATUS] = dComIfGp_getXStatus(); mItemStatus[Y_STATUS] = dComIfGp_getYStatus(); - f32 temp2 = FLOAT_LABEL(lit_4662); - field_0x188 = temp2; - field_0x18c = temp2; + field_0x188 = 0.0f; + field_0x18c = 0.0f; for (int i = 0; i < 2; i++) { field_0x1d6[i] = dMeter2Info_isDirectUseItem(i); @@ -402,13 +377,11 @@ int dMeter2_c::_create() { field_0x1e1 = 0; field_0x1b4 = 0; - - f32 temp3 = FLOAT_LABEL(lit_4662); - field_0x15c = temp3; + field_0x15c = 0.0f; for (int i = 0; i < 4; i++) { - field_0x160[i] = temp3; - field_0x174[i] = temp3; + field_0x160[i] = 0.0f; + field_0x174[i] = 0.0f; } field_0x190 = 0; @@ -433,7 +406,8 @@ int dMeter2_c::_create() { for (int i = 0; i < 2; i++) { if (field_0x128 == 0) { if (mItemStatus[i * 2] == BOMB_BAG_LV1 || mItemStatus[i * 2] == NORMAL_BOMB || - mItemStatus[i * 2] == WATER_BOMB || mItemStatus[i * 2] == POKE_BOMB) { + mItemStatus[i * 2] == WATER_BOMB || mItemStatus[i * 2] == POKE_BOMB) + { mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), dComIfGp_getSelectItemMaxNum(i)); } else if (mItemStatus[i * 2] == BEE_CHILD) { @@ -441,7 +415,8 @@ int dMeter2_c::_create() { dComIfGp_getSelectItemMaxNum(i)); } else if (mItemStatus[i * 2] == BOW || mItemStatus[i * 2] == LIGHT_ARROW || mItemStatus[i * 2] == ARROW_LV1 || mItemStatus[i * 2] == ARROW_LV2 || - mItemStatus[i * 2] == ARROW_LV3 || mItemStatus[i * 2] == HAWK_ARROW) { + mItemStatus[i * 2] == ARROW_LV3 || mItemStatus[i * 2] == HAWK_ARROW) + { mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax()); } else if (mItemStatus[i * 2] == PACHINKO) { mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); @@ -473,9 +448,9 @@ int dMeter2_c::_create() { mpHeap->getTotalFreeSize(); mpSubHeap = fopMsgM_createExpHeap(0x5000, mpHeap); field_0x108 = NULL; - mpMeterSub = NULL; - mpMeterString = NULL; - mpMeterButton = NULL; + mpSubContents = NULL; + mpSubSubContents = NULL; + mpEmpButton = NULL; mpHeap->getTotalFreeSize(); field_0x11c = NULL; @@ -487,16 +462,16 @@ int dMeter2_c::_create() { int dMeter2_c::_execute() { JKRHeap* heap = mDoExt_setCurrentHeap(mpHeap); - if (!dComIfGs_isCollectMirror(0) && i_dComIfGs_isEventBit(0x5420)) { + if (!dComIfGs_isCollectMirror(0) && i_dComIfGs_isEventBit(dSv_event_flag_c::F_0685)) { dComIfGs_onCollectMirror(0); } - if (!dComIfGs_isCollectCrystal(3) && i_dComIfGs_isEventBit(0x5410)) { + if (!dComIfGs_isCollectCrystal(3) && i_dComIfGs_isEventBit(dSv_event_flag_c::F_0686)) { dComIfGs_onCollectCrystal(3); } checkStatus(); - mpMeterDraw->exec(field_0x124); + mpMeterDraw->exec(mStatus); moveLife(); moveKantera(); @@ -520,9 +495,9 @@ int dMeter2_c::_execute() { moveBottleNum(); if (mpMap != NULL) { - mpMap->_move(field_0x124); + mpMap->_move(mStatus); } else { - dMeterMap_c::meter_map_move(field_0x124); + dMeterMap_c::meter_map_move(mStatus); } moveSubContents(); @@ -552,17 +527,17 @@ int dMeter2_c::_draw() { mpMap->_draw(); } - if (mpMeterSub != NULL) { - dComIfGd_set2DOpaTop(mpMeterSub); + if (mpSubContents != NULL) { + dComIfGd_set2DOpaTop(mpSubContents); } - if (mpMeterString != NULL) { - if (mSubContents == 5) { + if (mpSubSubContents != NULL) { + if (mSubContentType == 5) { if (mSubContentsStringType != 0) { - dComIfGd_set2DOpaTop(mpMeterString); + dComIfGd_set2DOpaTop(mpSubSubContents); } } else { - dComIfGd_set2DOpaTop(mpMeterString); + dComIfGd_set2DOpaTop(mpSubSubContents); } } @@ -572,23 +547,14 @@ int dMeter2_c::_draw() { dComIfGd_set2DOpaTop(mpMeterDraw); } - if (mpMeterButton != NULL) { - dComIfGd_set2DOpaTop(mpMeterButton); + if (mpEmpButton != NULL) { + dComIfGd_set2DOpaTop(mpEmpButton); } return 1; } -/* ############################################################################################## */ -/* 804549D0-804549D8 002FD0 0004+04 10/10 0/0 0/0 .sdata2 @4837 */ -SECTION_SDATA2 static f32 lit_4837[1 + 1 /* padding */] = { - -1.0f, - /* padding */ - 0.0f, -}; - /* 8021F49C-8021F6EC 219DDC 0250+00 1/1 0/0 0/0 .text _delete__9dMeter2_cFv */ -#ifdef NONMATCHING int dMeter2_c::_delete() { mpHeap->getTotalFreeSize(); JKRHeap* heap = mDoExt_setCurrentHeap(mpHeap); @@ -602,7 +568,8 @@ int dMeter2_c::_delete() { } if (isArrowSoundBit(2) && (isArrowEquip() || isPachinkoEquip()) && - mpMeterDraw->isButtonVisible()) { + mpMeterDraw->isButtonVisible()) + { mDoAud_seStart(Z2SE_CONSUM_INC_CNT_2, 0, 0, 0); } @@ -614,14 +581,14 @@ int dMeter2_c::_delete() { mpHeap->getTotalFreeSize(); mDoExt_setCurrentHeap(mpSubHeap); - if (mpMeterSub != NULL) { - delete mpMeterSub; - mpMeterSub = NULL; + if (mpSubContents != NULL) { + delete mpSubContents; + mpSubContents = NULL; } - if (mpMeterString != NULL) { - delete mpMeterString; - mpMeterString = NULL; + if (mpSubSubContents != NULL) { + delete mpSubSubContents; + mpSubSubContents = NULL; } mpHeap->getTotalFreeSize(); @@ -639,31 +606,22 @@ int dMeter2_c::_delete() { emphasisButtonDelete(); return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMeter2_c::_delete() { - nofralloc -#include "asm/d/meter/d_meter2/_delete__9dMeter2_cFv.s" -} -#pragma pop -#endif /* 8021F6EC-8021F780 21A02C 0094+00 1/1 5/5 0/0 .text emphasisButtonDelete__9dMeter2_cFv */ int dMeter2_c::emphasisButtonDelete() { - if (mpMeterButton != NULL) { + if (mpEmpButton != NULL) { JKRExpHeap* heap = dComIfGp_getSubHeap2D(8); - mpMeterButton->hideAll(); + mpEmpButton->hideAll(); if (heap != NULL) { - delete mpMeterButton; - mpMeterButton = NULL; + delete mpEmpButton; + mpEmpButton = NULL; heap->freeAll(); dComIfGp_offHeapLockFlag(8); } } + return 1; } @@ -671,90 +629,187 @@ int dMeter2_c::emphasisButtonDelete() { void dMeter2_c::setLifeZero() { dComIfGs_setLife(1); setNowLifeGauge(1); - i_dComIfGp_setItemLifeCount(lit_4837[0], 0); + i_dComIfGp_setItemLifeCount(-1.0f, 0); } -/* ############################################################################################## */ -/* 803BFA28-803BFA54 -00001 002C+00 1/1 0/0 0/0 .data @5038 */ -SECTION_DATA static void* lit_5038[11] = { - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x530), - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x3FC), - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x41C), - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x40C), - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x454), - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x48C), - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x454), - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x4C4), - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x500), - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x530), - (void*)(((char*)checkStatus__9dMeter2_cFv) + 0x40C), -}; - /* 8021F7B0-8021FD60 21A0F0 05B0+00 2/1 0/0 0/0 .text checkStatus__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::checkStatus() { - nofralloc -#include "asm/d/meter/d_meter2/checkStatus__9dMeter2_cFv.s" +void dMeter2_c::checkStatus() { + mStatus = 0; + field_0x12c = field_0x128; + + // supposed to be daPy_py_c::checkNowWolf, but it messes with reg alloc? + field_0x128 = ((daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR))->i_checkWolf(); + + if (!dComIfGp_2dShowCheck() || dMsgObject_getMsgObjectClass()->isPlaceMessage()) { + mStatus |= 0x4000; + } else if (i_dComIfGp_checkPlayerStatus1(0, 1) && dComIfGp_getAStatus() == 0x12) { + mStatus |= 0x200000; + } else if (i_dComIfGp_event_runCheck()) { + mStatus |= 0x40; + + if (dDemo_c::getMode() != 1 && dComIfGp_isHeapLockFlag() != 6 && + dMsgObject_isTalkNowCheck() && !dMeter2Info_isFloatingMessageVisible()) + { + mStatus |= 0x100; + dComIfGp_setAStatus(0, 0); + dComIfGp_setRStatus(0, 0); + } + } + + if (dComIfGp_isHeapLockFlag() != 6 && !(mStatus & 0x100) && dMsgObject_isTalkNowCheck() && + !dMeter2Info_isFloatingMessageVisible()) + { + mStatus |= 0x100; + dComIfGp_setAStatus(0, 0); + dComIfGp_setRStatus(0, 0); + } + + if (!dComIfGp_isPauseFlag()) { + if (mpMeterDraw->getCameraSubject()) { + mStatus |= 0x40000000; + } else if (mpMeterDraw->getItemSubject()) { + mStatus |= 0x1000; + } + + if (mpMeterDraw->getPlayerSubject()) { + mStatus |= 0x100000; + } + + if (dComIfGp_getCameraAttentionStatus(0) & 0x40000) { + mStatus |= 0x80000000; + dComIfGp_setDoStatusForce(0x12, 2); + } + + s16 sp8; + s16 spA; + + if (dComIfGp_checkCameraAttentionStatus(0, 8)) { + mStatus |= 0x80; + } else if (dComIfGp_checkCameraAttentionStatus(i_dComIfGp_getPlayerCameraID(0), 0x10) && + dCam_getBody()->CalcSubjectAngle(&sp8, &spA)) + { + mStatus |= 0x20000000; + } else if (daPy_getPlayerActorClass()->checkCanoeRide()) { + mStatus |= 0x400; + } else if (i_dComIfGp_checkPlayerStatus0(0, 0x8000000) || + daPy_getPlayerActorClass()->checkSpinnerRide()) + { + mStatus |= 0x200; + } else if (i_dComIfGp_checkPlayerStatus0(0, 0x800000)) { + mStatus |= 0x800; + } else if (i_dComIfGp_checkPlayerStatus0(0, 0x100000)) { + mStatus |= 0x2000; + } else if (i_dComIfGp_checkPlayerStatus0(0, 0x2000108)) { + mStatus |= 0x8000; + } else if (i_dComIfGp_checkPlayerStatus0(0, 0x4000000)) { + mStatus |= 0x10000; + } else if (daPy_getPlayerActorClass()->checkHorseRideNotReady() && + i_dComIfGp_getHorseActor() != NULL && + !i_dComIfGp_getHorseActor()->checkRodeoMode()) + { + mStatus |= 0x2000000; + } + } + + switch (dMeter2Info_getWindowStatus()) { + case 1: + mStatus |= 0x8; + break; + case 3: + case 10: + mStatus |= 0x10; + break; + case 2: + mStatus |= 0x1000000; + dComIfGp_setAStatus(0x12, 0); + dComIfGp_setDoStatus(0, 0); + dComIfGp_setRStatus(0, 0); + break; + case 4: + case 6: + mStatus |= 0x20; + dComIfGp_setAStatus(0x12, 0); + dComIfGp_setDoStatus(0, 0); + dComIfGp_setRStatus(0, 0); + break; + case 5: + mStatus |= 0x4000000; + dComIfGp_setAStatus(0x12, 0); + dComIfGp_setDoStatus(0, 0); + dComIfGp_setRStatus(0, 0); + break; + case 7: + mStatus |= 0x8000000; + dComIfGp_setAStatus(0x12, 0); + dComIfGp_setDoStatus(0x22, 0); + dComIfGp_setRStatus(0, 0); + break; + case 8: + mStatus |= 0x10000000; + dComIfGp_setAStatus(0, 0); + dComIfGp_setDoStatus(0, 0); + dComIfGp_setRStatus(0, 0); + break; + } + + switch (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo())) { + case ST_DUNGEON: + mStatus |= 0x4; + break; + case ST_ROOM: + mStatus |= 0x2; + break; + case ST_FIELD: + default: + mStatus |= 0x1; + break; + } } -#pragma pop - -/* ############################################################################################## */ -/* 804549D8-804549E0 002FD8 0008+00 4/4 0/0 0/0 .sdata2 @5267 */ -SECTION_SDATA2 static f64 lit_5267 = 4503601774854144.0 /* cast s32 to float */; - -/* 804549E0-804549E8 002FE0 0008+00 2/2 0/0 0/0 .sdata2 @5268 */ -SECTION_SDATA2 static f64 lit_5268 = 4503599627370496.0 /* cast u32 to float */; /* 8021FD60-80220180 21A6A0 0420+00 1/1 0/0 0/0 .text moveLife__9dMeter2_cFv */ -// small type issue -#ifdef NONMATCHING void dMeter2_c::moveLife() { s16 life_count = 0; - bool setDraw = false; - s16 temp_r5 = dComIfGp_getItemMaxLifeCount(); + bool draw_life = false; - if (temp_r5 != 0) { + if (dComIfGp_getItemMaxLifeCount() != 0) { s16 max_count = dComIfGs_getMaxLife() + dComIfGp_getItemMaxLifeCount(); if (max_count > 100) { max_count = 100; - } else { - if (max_count < 15) { - max_count = 15; - } + } else if (max_count < 15) { + max_count = 15; } life_count = (max_count / 5) * 4; dComIfGs_setMaxLife(max_count); + s16 current_life = life_count - i_dComIfGs_getLife(); i_dComIfGp_setItemLifeCount(current_life, 0); dComIfGp_clearItemMaxLifeCount(); - setDraw = true; + draw_life = true; } f32 item_life_count = dComIfGp_getItemLifeCount(); - if (item_life_count != FLOAT_LABEL(lit_4662)) { - field_0x1ee = dComIfGp_getItemLifeCountType(); - if (!setDraw) { + f32 tmp = 0.0f; + if (item_life_count != tmp) { + mLifeCountType = dComIfGp_getItemLifeCountType(); + if (!draw_life) { life_count = (dComIfGs_getMaxLife() / 5) * 4; } - s16 tmp = i_dComIfGs_getLife() + dComIfGp_getItemLifeCount(); - if (tmp > life_count) { - tmp = life_count; - } else if (tmp < 0) { - tmp = 0; + s16 new_life = i_dComIfGs_getLife() + dComIfGp_getItemLifeCount(); + if (new_life > life_count) { + new_life = life_count; + } else if (new_life < 0) { + new_life = 0; } - dComIfGs_setLife((u8)tmp); + dComIfGs_setLife((u8)new_life); dComIfGp_clearItemLifeCount(); - // extsh instead of mr - if (mNowLifeGauge == tmp && field_0x1ee != 0) { - field_0x1ee = 0; + if (mNowLifeGauge == i_dComIfGs_getLife() && mLifeCountType != 0) { + mLifeCountType = 0; } - setDraw = true; + draw_life = true; } u16 max_life = dComIfGs_getMaxLife(); @@ -762,10 +817,10 @@ void dMeter2_c::moveLife() { if (mMaxLife < max_life) { mMaxLife++; dMeter2Info_onLifeGaugeSE(); - setDraw = true; + draw_life = true; } else if (mMaxLife > max_life) { mMaxLife--; - setDraw = true; + draw_life = true; } } @@ -774,197 +829,1157 @@ void dMeter2_c::moveLife() { if (mNowLifeGauge < current_life) { mNowLifeGauge++; if (i_dComIfGp_checkPlayerStatus1(0, 0x2000) || - i_dComIfGp_checkPlayerStatus0(0, 0x20000000) || dMeter2Info_getLifeGaugeSE()) { + i_dComIfGp_checkPlayerStatus0(0, 0x20000000) || dMeter2Info_getLifeGaugeSE()) + { if (mNowLifeGauge % 4 == 0) { mDoAud_seStart(Z2SE_HP_GAUGE_INC, 0, 0, 0); } - } else { - if (field_0x1ee == 1) { - mDoAud_seStart(Z2SE_HP_GAUGE_INC, 0, 0, 0); - } + } else if (mLifeCountType == 1) { + mDoAud_seStart(Z2SE_HP_GAUGE_INC, 0, 0, 0); } u16 life = i_dComIfGs_getLife(); - if (mNowLifeGauge == life && field_0x1ee != 0) { - field_0x1ee = 0; + if (mNowLifeGauge == life && mLifeCountType != 0) { + mLifeCountType = 0; } - setDraw = true; + draw_life = true; } else if (mNowLifeGauge > current_life) { mNowLifeGauge--; - if (field_0x1ee != 0) { - field_0x1ee = 0; + if (mLifeCountType != 0) { + mLifeCountType = 0; } - setDraw = true; - } - } else { - if (dMeter2Info_getLifeGaugeSE()) { - dMeter2Info_offLifeGaugeSE(); + draw_life = true; } + } else if (dMeter2Info_getLifeGaugeSE()) { + dMeter2Info_offLifeGaugeSE(); } f32 life_gauge_x = g_drawHIO.mLifeGaugePosX; f32 life_gauge_y = g_drawHIO.mLifeGaugePosY; - if (field_0x204 != g_drawHIO.mLifeGaugePosX) { - field_0x204 = g_drawHIO.mLifeGaugePosX; - setDraw = true; + if (mLifeGaugePosX != g_drawHIO.mLifeGaugePosX) { + mLifeGaugePosX = g_drawHIO.mLifeGaugePosX; + draw_life = true; } - if (field_0x208 != g_drawHIO.mLifeGaugePosY) { - field_0x208 = g_drawHIO.mLifeGaugePosY; - setDraw = true; + if (mLifeGaugePosY != g_drawHIO.mLifeGaugePosY) { + mLifeGaugePosY = g_drawHIO.mLifeGaugePosY; + draw_life = true; } - if (field_0x20c != g_drawHIO.mLifeGaugeScale) { - field_0x20c = g_drawHIO.mLifeGaugeScale; - setDraw = true; + if (mLifeGaugeScale != g_drawHIO.mLifeGaugeScale) { + mLifeGaugeScale = g_drawHIO.mLifeGaugeScale; + draw_life = true; } - if (field_0x210 != g_drawHIO.mHeartScale) { - field_0x210 = g_drawHIO.mHeartScale; - setDraw = true; + if (mHeartScale != g_drawHIO.mHeartScale) { + mHeartScale = g_drawHIO.mHeartScale; + draw_life = true; } - if (field_0x214 != g_drawHIO.mLargeHeartScale) { - field_0x214 = g_drawHIO.mLargeHeartScale; - setDraw = true; + if (mLargeHeartScale != g_drawHIO.mLargeHeartScale) { + mLargeHeartScale = g_drawHIO.mLargeHeartScale; + draw_life = true; } - if (setDraw == true) { + if (draw_life == true) { mpMeterDraw->drawLife(mMaxLife, mNowLifeGauge, life_gauge_x, life_gauge_y); } + alphaAnimeLife(); dComIfGp_setItemNowLife((u8)mNowLifeGauge); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveLife() { - nofralloc -#include "asm/d/meter/d_meter2/moveLife__9dMeter2_cFv.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 804549E8-804549EC 002FE8 0004+00 4/4 0/0 0/0 .sdata2 @5791 */ -SECTION_SDATA2 static f32 lit_5791 = 1.0f / 10.0f; /* 80220180-8022051C 21AAC0 039C+00 1/1 0/0 0/0 .text moveKantera__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveKantera() { - nofralloc -#include "asm/d/meter/d_meter2/moveKantera__9dMeter2_cFv.s" -} -#pragma pop +void dMeter2_c::moveKantera() { + s32 var_r0; + s32 var_r7; + bool draw_kantera; -/* ############################################################################################## */ -/* 804549EC-804549F0 002FEC 0004+00 2/2 0/0 0/0 .sdata2 @5933 */ -SECTION_SDATA2 static f32 lit_5933 = 0.5f; + s32 max_oil = dComIfGs_getMaxOil(); + var_r7 = 0; + draw_kantera = false; + + if (dComIfGp_getItemMaxOilCount() != 0) { + var_r7 = dComIfGs_getMaxOil() + dComIfGp_getItemMaxOilCount(); + if (var_r7 > max_oil) { + var_r7 = max_oil; + } else if (var_r7 < 0) { + var_r7 = 0; + } + + dComIfGs_setMaxOil(var_r7); + dComIfGp_setItemOilCount(var_r7 - dComIfGs_getOil()); + dComIfGp_clearItemMaxOilCount(); + draw_kantera = true; + } + + if (dComIfGp_getItemOilCount() != 0) { + if (draw_kantera == 0) { + var_r7 = dComIfGs_getMaxOil(); + } + + var_r0 = dComIfGs_getOil() + dComIfGp_getItemOilCount(); + if (var_r0 > var_r7) { + var_r0 = var_r7; + } else if (var_r0 < 0) { + var_r0 = 0; + } + + dComIfGs_setOil(var_r0); + dComIfGp_clearItemOilCount(); + draw_kantera = true; + } + + if (mMaxOil != dComIfGs_getMaxOil()) { + if (mMaxOil < dComIfGs_getMaxOil()) { + mMaxOil += 200; + if (mMaxOil > dComIfGs_getMaxOil()) { + mMaxOil = dComIfGs_getMaxOil(); + } + draw_kantera = true; + } else if (mMaxOil > dComIfGs_getMaxOil()) { + mMaxOil -= 200; + if (mMaxOil < dComIfGs_getMaxOil()) { + mMaxOil = dComIfGs_getMaxOil(); + } + draw_kantera = true; + } + } + + if (mNowOil != dComIfGs_getOil()) { + if (mNowOil < dComIfGs_getOil()) { + mNowOil += 200; + if (mNowOil > dComIfGs_getOil()) { + mNowOil = dComIfGs_getOil(); + } + + if (!dComIfGp_getOxygenShowFlag() && mpMeterDraw->getMeterGaugeAlphaRate(1) > 0.0f) { + Z2GetAudioMgr()->mSeMgr.seStartLevel(Z2SE_OIL_METER_RECOVER, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + draw_kantera = true; + } else if (mNowOil > dComIfGs_getOil()) { + mNowOil -= 200; + if (mNowOil < dComIfGs_getOil()) { + mNowOil = dComIfGs_getOil(); + } + + if (mNowOil == 0) { + if (mpMeterDraw->getMeterGaugeAlphaRate(1) > 0.0f) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_OIL_METER_FINISH, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + } else if (((f32)dComIfGs_getOil() / (f32)dComIfGs_getMaxOil()) <= 0.1f && + mpMeterDraw->getMeterGaugeAlphaRate(1) > 0.0f) + { + Z2GetAudioMgr()->mSeMgr.seStartLevel(Z2SE_OIL_METER_LESS, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + + draw_kantera = true; + } + } + + f32 x_pos = g_drawHIO.mLanternMeterPosX; + f32 y_pos = g_drawHIO.mLanternMeterPosY; + + if (field_0x246 != mMaxLife) { + field_0x246 = mMaxLife; + draw_kantera = true; + } + + if (mLanternMeterScale != g_drawHIO.mLanternMeterScale) { + mLanternMeterScale = g_drawHIO.mLanternMeterScale; + draw_kantera = true; + } + + if (mLanternMeterPosX != g_drawHIO.mLanternMeterPosX) { + mLanternMeterPosX = g_drawHIO.mLanternMeterPosX; + draw_kantera = true; + } + + if (mLanternMeterPosY != g_drawHIO.mLanternMeterPosY) { + mLanternMeterPosY = g_drawHIO.mLanternMeterPosY; + draw_kantera = true; + } + + if (draw_kantera == true) { + mpMeterDraw->drawKantera(mMaxOil, mNowOil, x_pos, y_pos); + } + + alphaAnimeKantera(); + dComIfGp_setItemNowOil(mNowOil); +} /* 8022051C-80220888 21AE5C 036C+00 1/1 0/0 0/0 .text moveOxygen__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveOxygen() { - nofralloc -#include "asm/d/meter/d_meter2/moveOxygen__9dMeter2_cFv.s" +void dMeter2_c::moveOxygen() { + s32 var_r0; + s32 var_r7; + bool draw_oxygen; + + s32 var_r4 = dComIfGp_getMaxOxygen(); + var_r7 = 0; + draw_oxygen = false; + + if (dComIfGp_getMaxOxygenCount() != 0) { + var_r7 = dComIfGp_getMaxOxygen() + dComIfGp_getMaxOxygenCount(); + if (var_r7 > var_r4) { + var_r7 = var_r4; + } else if (var_r7 < 0) { + var_r7 = 0; + } + + dComIfGp_setMaxOxygen((u16)var_r7); + dComIfGp_setOxygenCount(var_r7 - dComIfGp_getOxygen()); + dComIfGp_clearMaxOxygenCount(); + draw_oxygen = true; + } + + if (dComIfGp_getOxygenCount() != 0) { + if (draw_oxygen == 0) { + var_r7 = dComIfGp_getMaxOxygen(); + } + + var_r0 = dComIfGp_getOxygen() + dComIfGp_getOxygenCount(); + if (var_r0 > var_r7) { + var_r0 = var_r7; + } else if (var_r0 < 0) { + var_r0 = 0; + } + + if (dComIfGp_getOxygenShowFlag() && var_r0 == dComIfGp_getMaxOxygen()) { + if (dComIfGp_getOxygen() < dComIfGp_getMaxOxygen() && + mpMeterDraw->getMeterGaugeAlphaRate(2) > 0.0f) + { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SWIM_TIMER_RECOVER, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + } + + dComIfGp_setOxygen((u16)var_r0); + dComIfGp_clearOxygenCount(); + draw_oxygen = true; + } + + if (mMaxOxygen != dComIfGp_getMaxOxygen()) { + if (mMaxOxygen < dComIfGp_getMaxOxygen()) { + mMaxOxygen += 50; + if (mMaxOxygen > dComIfGp_getMaxOxygen()) { + mMaxOxygen = dComIfGp_getMaxOxygen(); + } + draw_oxygen = true; + } else if (mMaxOxygen > dComIfGp_getMaxOxygen()) { + mMaxOxygen -= 50; + if (mMaxOxygen < dComIfGp_getMaxOxygen()) { + mMaxOxygen = dComIfGp_getMaxOxygen(); + } + draw_oxygen = true; + } + } + + if (mNowOxygen != dComIfGp_getOxygen()) { + if (mNowOxygen < dComIfGp_getOxygen()) { + mNowOxygen += 50; + if (mNowOxygen > dComIfGp_getOxygen()) { + mNowOxygen = dComIfGp_getOxygen(); + } + + draw_oxygen = true; + } else if (mNowOxygen > dComIfGp_getOxygen()) { + mNowOxygen -= 50; + if (mNowOxygen < dComIfGp_getOxygen()) { + mNowOxygen = dComIfGp_getOxygen(); + } + + if ((f32)dComIfGp_getOxygen() / (f32)dComIfGp_getMaxOxygen() > 0.5f && + mpMeterDraw->getMeterGaugeAlphaRate(2) > 0.0f) + { + Z2GetAudioMgr()->mSeMgr.seStartLevel(Z2SE_SWIM_TIMER_DEC, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + + draw_oxygen = true; + } + } + + f32 x_pos = g_drawHIO.mOxygenMeterPosX; + f32 y_pos = g_drawHIO.mOxygenMeterPosY; + + if (field_0x248 != mMaxLife) { + field_0x248 = mMaxLife; + draw_oxygen = true; + } + + if (mOxygenMeterScale != g_drawHIO.mOxygenMeterScale) { + mOxygenMeterScale = g_drawHIO.mOxygenMeterScale; + draw_oxygen = true; + } + + if (mOxygenMeterPosX != g_drawHIO.mOxygenMeterPosX) { + mOxygenMeterPosX = g_drawHIO.mOxygenMeterPosX; + draw_oxygen = true; + } + + if (mOxygenMeterPosY != g_drawHIO.mOxygenMeterPosY) { + mOxygenMeterPosY = g_drawHIO.mOxygenMeterPosY; + draw_oxygen = true; + } + + if (draw_oxygen == true) { + mpMeterDraw->drawOxygen(mMaxOxygen, mNowOxygen, x_pos, y_pos); + } + + alphaAnimeOxygen(); + dComIfGp_setNowOxygen(mNowOxygen); } -#pragma pop - -/* ############################################################################################## */ -/* 804549F0-804549F4 002FF0 0004+00 3/3 0/0 0/0 .sdata2 @6051 */ -SECTION_SDATA2 static f32 lit_6051 = 10.0f; - -/* 804549F4-804549F8 002FF4 0004+00 1/1 0/0 0/0 .sdata2 @6052 */ -SECTION_SDATA2 static f32 lit_6052 = 1.0f / 5.0f; /* 80220888-80220C30 21B1C8 03A8+00 1/1 0/0 0/0 .text moveLightDrop__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveLightDrop() { - nofralloc -#include "asm/d/meter/d_meter2/moveLightDrop__9dMeter2_cFv.s" +void dMeter2_c::moveLightDrop() { + f32 scale; + f32 alpha; + f32 pos_x; + f32 pos_y; + bool draw_lightdrop; + u8 var_r28; + + draw_lightdrop = false; + var_r28 = 0; + if (g_drawHIO.mLightDrop.mAnimDebug) { + u8 dark_level = dComIfGp_getStartStageDarkArea(); + if (dComIfGp_getNeedLightDropNum() == dComIfGs_getLightDropNum(dark_level)) { + var_r28 = 2; + } + } + + if (mLightDropNum != dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea())) { + if (dComIfGp_getNeedLightDropNum() == + dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea())) + { + var_r28 = 2; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_LIGHT_DROP_COMPLETE, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } else if (mLightDropNum < dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea())) { + var_r28 = 1; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_LIGHT_DROP_GET, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } + + mLightDropNum = dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()); + draw_lightdrop = true; + } + + if (mNeedLightDropNum != dComIfGp_getNeedLightDropNum()) { + mNeedLightDropNum = dComIfGp_getNeedLightDropNum(); + draw_lightdrop = true; + } + + if ((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() || + daPy_getPlayerActorClass()->checkGrassWhistle() || + g_meter2_info.mItemExplainWindowStatus != 0) + { + pos_x = g_drawHIO.mLightDrop.mVesselTalkPosX; + pos_y = g_drawHIO.mLightDrop.mVesselTalkPosY; + scale = g_drawHIO.mLightDrop.mVesselTalkScale; + alpha = g_drawHIO.mLightDrop.mVesselTalkAlpha; + } else { + pos_x = g_drawHIO.mLightDrop.mVesselPosX; + pos_y = g_drawHIO.mLightDrop.mVesselPosY; + scale = g_drawHIO.mLightDrop.mVesselScale; + alpha = g_drawHIO.mLightDrop.mVesselAlpha; + } + + if (mVesselPosX != pos_x) { + cLib_addCalc2(&mVesselPosX, pos_x, 1.0f, 10.0f); + draw_lightdrop = true; + if ((f32)fabs(mVesselPosX - pos_x) < 0.1f) { + mVesselPosX = pos_x; + } + } + + if (mVesselPosY != pos_y) { + cLib_addCalc2(&mVesselPosY, pos_y, 1.0f, 10.0f); + draw_lightdrop = true; + if ((f32)fabs(mVesselPosY - pos_y) < 0.1f) { + mVesselPosY = pos_y; + } + } + + if (mVesselScale != scale) { + cLib_addCalc2(&mVesselScale, scale, 0.2f, 1.0f); + draw_lightdrop = true; + if ((f32)fabs(mVesselScale - scale) < 0.1f) { + mVesselScale = scale; + } + } + + if (mVesselAlpha != alpha) { + cLib_addCalc2(&mVesselAlpha, alpha, 0.2f, 1.0f); + draw_lightdrop = true; + if ((f32)fabs(mVesselAlpha - alpha) < 0.1f) { + mVesselAlpha = alpha; + } + } + + if (draw_lightdrop == true) { + mpMeterDraw->drawLightDrop(mLightDropNum, mNeedLightDropNum, mVesselPosX, mVesselPosY, + mVesselScale, mVesselAlpha, var_r28); + } + + alphaAnimeLightDrop(); } -#pragma pop /* 80220C30-802210AC 21B570 047C+00 1/1 0/0 0/0 .text moveRupee__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveRupee() { - nofralloc -#include "asm/d/meter/d_meter2/moveRupee__9dMeter2_cFv.s" +void dMeter2_c::moveRupee() { + s16 temp_r5; + s16 var_r6; + s32 temp_r0; + bool draw_rupee; + + temp_r5 = dComIfGs_getRupeeMax(); + draw_rupee = false; + + // using dComIfGp_getItemRupeeCount() here swaps r3/r4 reg alloc? + if (g_dComIfG_gameInfo.play.mItemRupeeCount != 0) { + var_r6 = i_dComIfGs_getRupee() + dComIfGp_getItemRupeeCount(); + if (var_r6 > temp_r5) { + var_r6 = temp_r5; + } else if (var_r6 < 0) { + var_r6 = 0; + } + + dComIfGs_setRupee(var_r6); + dComIfGp_clearItemRupeeCount(); + temp_r0 = (u16)var_r6 - mRupeeNum; + + if (temp_r0 >= 5) { + onRupeeSoundBit(2); + if (isRupeeSoundBit(3)) { + offRupeeSoundBit(3); + offRupeeSoundBit(1); + } + } else if (temp_r0 <= -5) { + onRupeeSoundBit(3); + if (isRupeeSoundBit(2)) { + offRupeeSoundBit(2); + offRupeeSoundBit(0); + } + } + } + + if (mRupeeNum != i_dComIfGs_getRupee()) { + if (mRupeeNum < i_dComIfGs_getRupee()) { + mRupeeNum++; + draw_rupee = true; + + if (isRupeeSoundBit(2) & 1) { + if (mRupeeNum != i_dComIfGs_getRupee()) { + if (!isRupeeSoundBit(0)) { + onRupeeSoundBit(0); + mDoAud_seStart(Z2SE_LUPY_INC_CNT_1, NULL, 0, 0); + } else { + offRupeeSoundBit(0); + } + } else { + mDoAud_seStart(Z2SE_LUPY_INC_CNT_2, NULL, 0, 0); + offRupeeSoundBit(2); + offRupeeSoundBit(0); + } + } + } else if (mRupeeNum > i_dComIfGs_getRupee()) { + mRupeeNum--; + draw_rupee = true; + + if (isRupeeSoundBit(3) & 1) { + if (mRupeeNum != i_dComIfGs_getRupee()) { + if (!isRupeeSoundBit(1)) { + onRupeeSoundBit(1); + mDoAud_seStart(Z2SE_LUPY_DEC_CNT_1, NULL, 0, 0); + } else { + offRupeeSoundBit(1); + } + } else { + mDoAud_seStart(Z2SE_LUPY_DEC_CNT_2, NULL, 0, 0); + offRupeeSoundBit(3); + offRupeeSoundBit(1); + } + } + } + } + + if (mRupeeKeyScale != g_drawHIO.mRupeeKeyScale) { + mRupeeKeyScale = g_drawHIO.mRupeeKeyScale; + draw_rupee = true; + } + + if (mRupeeKeyPosX != g_drawHIO.mRupeeKeyPosX) { + mRupeeKeyPosX = g_drawHIO.mRupeeKeyPosX; + draw_rupee = true; + } + + if (mRupeeKeyPosY != g_drawHIO.mRupeeKeyPosY) { + mRupeeKeyPosY = g_drawHIO.mRupeeKeyPosY; + draw_rupee = true; + } + + if (mRupeeScale != g_drawHIO.mRupeeScale) { + mRupeeScale = g_drawHIO.mRupeeScale; + draw_rupee = true; + } + + if (mRupeePosX != g_drawHIO.mRupeePosX) { + mRupeePosX = g_drawHIO.mRupeePosX; + draw_rupee = true; + } + + if (mRupeePosY != g_drawHIO.mRupeePosY) { + mRupeePosY = g_drawHIO.mRupeePosY; + draw_rupee = true; + } + + if (mRupeeFramePosY != g_drawHIO.mRupeeFramePosY) { + mRupeeFramePosY = g_drawHIO.mRupeeFramePosY; + draw_rupee = true; + } + + if (mRupeeFrameScale != g_drawHIO.mRupeeFrameScale) { + mRupeeFrameScale = g_drawHIO.mRupeeFrameScale; + draw_rupee = true; + } + + if (mRupeeFramePosX != g_drawHIO.mRupeeFramePosX) { + mRupeeFramePosX = g_drawHIO.mRupeeFramePosX; + draw_rupee = true; + } + + if (mRupeeCountScale != g_drawHIO.mRupeeCountScale) { + mRupeeCountScale = g_drawHIO.mRupeeCountScale; + draw_rupee = true; + } + + if (mRupeeCountPosX != g_drawHIO.mRupeeCountPosX) { + mRupeeCountPosX = g_drawHIO.mRupeeCountPosX; + draw_rupee = true; + } + + if (mRupeeCountPosY != g_drawHIO.mRupeeCountPosY) { + mRupeeCountPosY = g_drawHIO.mRupeeCountPosY; + draw_rupee = true; + } + + if (mWalletSize != dComIfGs_getWalletSize()) { + mWalletSize = dComIfGs_getWalletSize(); + draw_rupee = true; + } + + if (draw_rupee == true) { + mpMeterDraw->drawRupee(mRupeeNum); + } + + alphaAnimeRupee(); } -#pragma pop /* 802210AC-80221244 21B9EC 0198+00 1/1 0/0 0/0 .text moveKey__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveKey() { - nofralloc -#include "asm/d/meter/d_meter2/moveKey__9dMeter2_cFv.s" -} -#pragma pop +void dMeter2_c::moveKey() { + s16 var_r5; + bool draw_key; -/* ############################################################################################## */ -/* 804549F8-804549FC 002FF8 0004+00 2/2 0/0 0/0 .sdata2 @6564 */ -SECTION_SDATA2 static f32 lit_6564 = 1.0f / 100.0f; + draw_key = false; + if (dComIfGp_getItemKeyNumCount() != 0) { + var_r5 = dComIfGs_getKeyNum() + dComIfGp_getItemKeyNumCount(); + if (var_r5 > 99) { + var_r5 = 99; + } else if (var_r5 < 0) { + var_r5 = 0; + } + + dComIfGs_setKeyNum(var_r5); + dComIfGp_clearItemKeyNumCount(); + } + + if (mKeyNum != dComIfGs_getKeyNum()) { + if (mKeyNum < dComIfGs_getKeyNum()) { + mKeyNum++; + draw_key = true; + } else if (mKeyNum > dComIfGs_getKeyNum()) { + mKeyNum--; + draw_key = true; + } + } + + if (mKeyScale != g_drawHIO.mKeyScale) { + mKeyScale = g_drawHIO.mKeyScale; + draw_key = true; + } + + if (mKeyPosX != g_drawHIO.mKeyPosX) { + mKeyPosX = g_drawHIO.mKeyPosX; + draw_key = true; + } + + if (mKeyPosY != g_drawHIO.mKeyPosY) { + mKeyPosY = g_drawHIO.mKeyPosY; + draw_key = true; + } + + if (mKeyNumScale != g_drawHIO.mKeyNumScale) { + mKeyNumScale = g_drawHIO.mKeyNumScale; + draw_key = true; + } + + if (mKeyNumPosX != g_drawHIO.mKeyNumPosX) { + mKeyNumPosX = g_drawHIO.mKeyNumPosX; + draw_key = true; + } + + if (mKeyNumPosY != g_drawHIO.mKeyNumPosY) { + mKeyNumPosY = g_drawHIO.mKeyNumPosY; + draw_key = true; + } + + if (draw_key == true) { + mpMeterDraw->drawKey(mKeyNum); + } + + alphaAnimeKey(); +} /* 80221244-802217F4 21BB84 05B0+00 1/1 0/0 0/0 .text moveButtonA__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveButtonA() { - nofralloc -#include "asm/d/meter/d_meter2/moveButtonA__9dMeter2_cFv.s" +void dMeter2_c::moveButtonA() { + f32 var_f31; + f32 pos_x[2]; + f32 pos_y[2]; + + bool draw_buttonA; + bool var_r29; + bool emphasis_a; + u8 temp_r0; + + draw_buttonA = false; + var_r29 = 0; + emphasis_a = false; + + if (dComIfGp_getDoStatusForce() != 0) { + dComIfGp_setDoStatus(dComIfGp_getDoStatusForce(), dComIfGp_getDoSetFlagForce()); + dComIfGp_setDoStatusForce(0, 0); + } + + if (daPy_getPlayerActorClass()->i_getSumouMode()) { + if (i_dComIfGp_getDoStatus() == 0) { + dComIfGp_setDoStatus(0x15, 0); + emphasis_a = true; + } else if (i_dComIfGp_getDoStatus() == 0x15 && !mpMeterDraw->isEmphasisA()) { + var_r29 = 1; + draw_buttonA = true; + } + } + + if (mDoStatus != i_dComIfGp_getDoStatus()) { + mDoStatus = i_dComIfGp_getDoStatus(); + + if (mDoStatus == 0x2D || mDoStatus == 0x2E) { + dComIfGp_setDoStatus(mDoStatus, 1); + } + + var_r29 = 1; + draw_buttonA = true; + } + + if (mDoSetFlag != dComIfGp_isDoSetFlag(2)) { + mDoSetFlag = dComIfGp_isDoSetFlag(2); + var_r29 = 1; + draw_buttonA = true; + } + + if (emphasis_a && mpMeterDraw->isEmphasisA()) { + if (field_0x1fd == 0) { + var_r29 = 1; + draw_buttonA = true; + field_0x1fd = 1; + } + } else if (!emphasis_a && !mpMeterDraw->isEmphasisA() && field_0x1fd == 1) { + var_r29 = 1; + draw_buttonA = true; + field_0x1fd = 0; + } + + if (mAButtonScale != g_drawHIO.mAButtonScale) { + mAButtonScale = g_drawHIO.mAButtonScale; + draw_buttonA = true; + } + + for (int i = 0; i < 2; i++) { + if (mAButtonTalkScale[i] != g_drawHIO.mAButtonTalkScale[i]) { + mAButtonTalkScale[i] = g_drawHIO.mAButtonTalkScale[i]; + draw_buttonA = true; + } + } + + if (mAButtonPosX != g_drawHIO.mAButtonPosX) { + mAButtonPosX = g_drawHIO.mAButtonPosX; + draw_buttonA = true; + } + + if (mAButtonPosY != g_drawHIO.mAButtonPosY) { + mAButtonPosY = g_drawHIO.mAButtonPosY; + draw_buttonA = true; + } + + if (mAButtonFontScale != g_drawHIO.mAButtonFontScale) { + mAButtonFontScale = g_drawHIO.mAButtonFontScale; + draw_buttonA = true; + } + + if (mAButtonFontPosX != g_drawHIO.mAButtonFontPosX) { + mAButtonFontPosX = g_drawHIO.mAButtonFontPosX; + draw_buttonA = true; + } + + if (mAButtonFontPosY != g_drawHIO.mAButtonFontPosY) { + mAButtonFontPosY = g_drawHIO.mAButtonFontPosY; + draw_buttonA = true; + } + + if (isShowLightDrop()) { + pos_x[0] = g_drawHIO.mAButtonVesselPosX; + pos_y[0] = g_drawHIO.mAButtonVesselPosY; + pos_x[1] = 0.0f; + pos_y[1] = 0.0f; + var_f31 = 1.0f; + } else if (isShowFlag(0)) { + if (isShowFlag(1)) { + for (int i = 0; i < 2; i++) { + pos_x[i] = g_drawHIO.mAButtonTalkPosX[i]; + pos_y[i] = g_drawHIO.mAButtonTalkPosY[i]; + } + } else { + for (int i = 0; i < 2; i++) { + pos_x[i] = g_drawHIO.mAButtonTalkAPosX[i]; + pos_y[i] = g_drawHIO.mAButtonTalkAPosY[i]; + } + } + var_f31 = 1.0f; + } else { + pos_x[0] = g_drawHIO.mAButtonPosX; + pos_y[0] = g_drawHIO.mAButtonPosY; + pos_x[1] = 0.0f; + pos_y[1] = 0.0f; + var_f31 = 1.0f; + } + + for (int i = 0; i < 2; i++) { + if (mAButtonTalkPosX[i] != pos_x[i]) { + cLib_addCalc2(&mAButtonTalkPosX[i], pos_x[i], 1.0f, 10.0f); + draw_buttonA = true; + if ((f32)fabs(mAButtonTalkPosX[i] - pos_x[i]) < 0.1f) { + mAButtonTalkPosX[i] = pos_x[i]; + } + } + + if (mAButtonTalkPosY[i] != pos_y[i]) { + cLib_addCalc2(&mAButtonTalkPosY[i], pos_y[i], 1.0f, 10.0f); + draw_buttonA = true; + if ((f32)fabs(mAButtonTalkPosY[i] - pos_y[i]) < 0.1f) { + mAButtonTalkPosY[i] = pos_y[i]; + } + } + } + + if (field_0x144 != var_f31) { + cLib_addCalc2(&field_0x144, var_f31, 1.0f, 10.0f); + draw_buttonA = true; + if ((f32)fabs(field_0x144 - var_f31) < 0.01f) { + field_0x144 = var_f31; + } + } + + if (field_0x200 != dMsgObject_isTalkNowCheck()) { + field_0x200 = dMsgObject_isTalkNowCheck(); + draw_buttonA = true; + } + + if (draw_buttonA) { + mpMeterDraw->drawButtonA(mDoStatus, mAButtonTalkPosX[0], mAButtonTalkPosY[0], + mAButtonTalkPosX[1], mAButtonTalkPosY[1], field_0x144, var_r29, + ((mStatus & 0x100) || + daPy_getPlayerActorClass()->checkHawkWait() || + daPy_getPlayerActorClass()->checkGrassWhistle()) != false); + + if (emphasis_a) { + mpMeterDraw->setEmphasisA(0); + } + } } -#pragma pop /* 802217F4-80221EC8 21C134 06D4+00 1/1 0/0 0/0 .text moveButtonB__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveButtonB() { - nofralloc -#include "asm/d/meter/d_meter2/moveButtonB__9dMeter2_cFv.s" +void dMeter2_c::moveButtonB() { + f32 var_f31; + f32 pos_x[2]; + f32 pos_y[2]; + + bool draw_buttonB; + bool var_r29; + bool emphasis_b; + u8 temp_r0; + + draw_buttonB = false; + var_r29 = 0; + emphasis_b = false; + + if (dComIfGp_getAStatusForce() != 0) { + dComIfGp_setAStatus(dComIfGp_getAStatusForce(), dComIfGp_getASetFlagForce()); + dComIfGp_setAStatusForce(0, 0); + } + + if (daPy_getPlayerActorClass()->i_getSumouMode()) { + if (dComIfGp_getAStatus() == 0 || dComIfGp_getAStatus() == 0x26) { + dComIfGp_setAStatus(0x44, 0); + emphasis_b = true; + } else if (dComIfGp_getAStatus() == 0x44 && !mpMeterDraw->isEmphasisB()) { + var_r29 = 1; + draw_buttonB = true; + } + } else if (daPy_getPlayerActorClass()->checkGoatStopGame() || + ((mStatus & 2) && dComIfGp_getAStatus() == 0x26)) + { + dComIfGp_setAStatus(0, 0); + } + + if (mAStatus != dComIfGp_getAStatus()) { + mAStatus = dComIfGp_getAStatus(); + + if (mAStatus == 0x2D || mAStatus == 0x2E) { + dComIfGp_setAStatus(mAStatus, 1); + } + + var_r29 = 1; + draw_buttonB = true; + } + + if (mASetFlag != dComIfGp_isASetFlag(2)) { + mASetFlag = dComIfGp_isASetFlag(2); + var_r29 = 1; + draw_buttonB = true; + } + + if (mEquipSword != dComIfGs_getSelectEquipSword()) { + mEquipSword = dComIfGs_getSelectEquipSword(); + var_r29 = 1; + draw_buttonB = true; + } + + if (emphasis_b && mpMeterDraw->isEmphasisB()) { + if (field_0x1fe == 0) { + var_r29 = 1; + draw_buttonB = true; + field_0x1fe = 1; + } + } else if (!emphasis_b && !mpMeterDraw->isEmphasisB() && field_0x1fe == 1) { + var_r29 = 1; + draw_buttonB = true; + field_0x1fe = 0; + } + + if (field_0x2cc != g_drawHIO.mBButtonScale) { + field_0x2cc = g_drawHIO.mBButtonScale; + draw_buttonB = true; + } + + for (int i = 0; i < 2; i++) { + if (field_0x2ec[i] != g_drawHIO.mBButtonTalkScale[i]) { + field_0x2ec[i] = g_drawHIO.mBButtonTalkScale[i]; + draw_buttonB = true; + } + } + + if (mBButtonPosX != g_drawHIO.mBButtonPosX) { + mBButtonPosX = g_drawHIO.mBButtonPosX; + draw_buttonB = true; + } + + if (mBButtonPosY != g_drawHIO.mBButtonPosY) { + mBButtonPosY = g_drawHIO.mBButtonPosY; + draw_buttonB = true; + } + + if (g_drawHIO.mButtonDebug[3]) { + draw_buttonB = true; + } + + for (int i = 0; i < 2; i++) { + if (mBItemBaseScale[i] != g_drawHIO.mBItemBaseScale[i]) { + mBItemBaseScale[i] = g_drawHIO.mBItemBaseScale[i]; + draw_buttonB = true; + } + + if (mBItemBasePosX[i] != g_drawHIO.mBItemBasePosX[i]) { + mBItemBasePosX[i] = g_drawHIO.mBItemBasePosX[i]; + draw_buttonB = true; + } + + if (mBItemBasePosY[i] != g_drawHIO.mBItemBasePosY[i]) { + mBItemBasePosY[i] = g_drawHIO.mBItemBasePosY[i]; + draw_buttonB = true; + } + } + + if (mBButtonFontScale != g_drawHIO.mBButtonFontScale) { + mBButtonFontScale = g_drawHIO.mBButtonFontScale; + draw_buttonB = true; + } + + if (mBButtonFontPosX != g_drawHIO.mBButtonFontPosX) { + mBButtonFontPosX = g_drawHIO.mBButtonFontPosX; + draw_buttonB = true; + } + + if (mBButtonFontPosY != g_drawHIO.mBButtonFontPosY) { + mBButtonFontPosY = g_drawHIO.mBButtonFontPosY; + draw_buttonB = true; + } + + if (isShowLightDrop()) { + pos_x[0] = g_drawHIO.mBButtonVesselPosX; + pos_y[0] = g_drawHIO.mBButtonVesselPosY; + pos_x[1] = 0.0f; + pos_y[1] = 0.0f; + var_f31 = 1.0f; + } else if (isShowFlag(1)) { + for (int i = 0; i < 2; i++) { + pos_x[i] = g_drawHIO.mBButtonTalkPosX[i]; + pos_y[i] = g_drawHIO.mBButtonTalkPosY[i]; + } + var_f31 = 1.0f; + } else { + for (int i = 0; i < 2; i++) { + if (field_0x128 != 0 && i == 0) { + pos_x[i] = g_drawHIO.mBButtonWolfPosX; + pos_y[i] = g_drawHIO.mBButtonWolfPosY; + } else { + pos_x[i] = 0.0f; + pos_y[i] = 0.0f; + } + } + var_f31 = 1.0f; + } + + if (mpMeterDraw->isBButtonShow(false)) { + if (field_0x1ff == 0) { + field_0x1ff = 1; + draw_buttonB = true; + } + } else if (field_0x1ff == 1) { + field_0x1ff = 0; + draw_buttonB = true; + } + + for (int i = 0; i < 2; i++) { + if (field_0x148[i] != pos_x[i]) { + cLib_addCalc2(&field_0x148[i], pos_x[i], 1.0f, 10.0f); + draw_buttonB = true; + if ((f32)fabs(field_0x148[i] - pos_x[i]) < 0.1f) { + field_0x148[i] = pos_x[i]; + } + } + + if (field_0x150[i] != pos_y[i]) { + cLib_addCalc2(&field_0x150[i], pos_y[i], 1.0f, 10.0f); + draw_buttonB = true; + if ((f32)fabs(field_0x150[i] - pos_y[i]) < 0.1f) { + field_0x150[i] = pos_y[i]; + } + } + } + + if (field_0x158 != var_f31) { + cLib_addCalc2(&field_0x158, var_f31, 1.0f, 10.0f); + draw_buttonB = true; + if ((f32)fabs(field_0x158 - var_f31) < 0.01f) { + field_0x158 = var_f31; + } + } + + if (g_drawHIO.mItemScaleAdjustON && field_0x4bc != g_drawHIO.mItemScalePercent) { + field_0x4bc = g_drawHIO.mItemScalePercent; + draw_buttonB = true; + } + + if (field_0x1c6 != daPy_getPlayerActorClass()->checkGrassWhistle()) { + field_0x1c6 = daPy_getPlayerActorClass()->checkGrassWhistle(); + draw_buttonB = true; + } + + if (draw_buttonB) { + mpMeterDraw->drawButtonB(mAStatus, field_0x128 == 0, field_0x148[0], field_0x150[0], + field_0x148[1], field_0x150[1], field_0x158, var_r29); + + if (emphasis_b) { + mpMeterDraw->setEmphasisB(0); + } + } } -#pragma pop /* 80221EC8-80222000 21C808 0138+00 1/1 0/0 0/0 .text moveButtonR__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveButtonR() { - nofralloc -#include "asm/d/meter/d_meter2/moveButtonR__9dMeter2_cFv.s" +void dMeter2_c::moveButtonR() { + bool var_r7; + bool draw_buttonR; + + draw_buttonR = false; + var_r7 = 0; + + if (field_0x128 != 0 && + (mCollectSmell != dComIfGs_getCollectSmell() || field_0x128 != field_0x12c)) + { + mCollectSmell = dComIfGs_getCollectSmell(); + var_r7 = 1; + draw_buttonR = true; + } + + if (dComIfGp_getRStatusForce() != 0) { + dComIfGp_setRStatus(dComIfGp_getRStatusForce(), dComIfGp_getRSetFlagForce()); + dComIfGp_setRStatusForce(0, 0); + } + + if (mRStatus != i_dComIfGp_getRStatus()) { + mRStatus = i_dComIfGp_getRStatus(); + + if (mRStatus == 0x2D || mRStatus == 0x2E) { + dComIfGp_setRStatus(mRStatus, 1); + } + + var_r7 = 1; + draw_buttonR = true; + } + + if (mRSetFlag != dComIfGp_isRSetFlag(2)) { + mRSetFlag = dComIfGp_isRSetFlag(2); + var_r7 = 1; + draw_buttonR = true; + } + + if (draw_buttonR) { + mpMeterDraw->drawButtonR(mCollectSmell, mRStatus, field_0x128 == 0, var_r7); + } } -#pragma pop /* 80222000-802222A0 21C940 02A0+00 1/1 0/0 0/0 .text moveButtonZ__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveButtonZ() { - nofralloc -#include "asm/d/meter/d_meter2/moveButtonZ__9dMeter2_cFv.s" +void dMeter2_c::moveButtonZ() { + bool draw_buttonZ = false; + + if (field_0x324 != g_drawHIO.mZButtonScale) { + field_0x324 = g_drawHIO.mZButtonScale; + draw_buttonZ = true; + } + + if (field_0x328 != g_drawHIO.mZButtonPosX) { + field_0x328 = g_drawHIO.mZButtonPosX; + draw_buttonZ = true; + } + + if (field_0x32c != g_drawHIO.mZButtonPosY) { + field_0x32c = g_drawHIO.mZButtonPosY; + draw_buttonZ = true; + } + + if (field_0x384 != g_drawHIO.mZButtonItemScale) { + field_0x384 = g_drawHIO.mZButtonItemScale; + draw_buttonZ = true; + } + + if (field_0x388 != g_drawHIO.mZButtonItemPosX) { + field_0x388 = g_drawHIO.mZButtonItemPosX; + draw_buttonZ = true; + } + + if (field_0x38c != g_drawHIO.mZButtonItemPosY) { + field_0x38c = g_drawHIO.mZButtonItemPosY; + draw_buttonZ = true; + } + + if (field_0x3e4 != g_drawHIO.mZButtonItemBaseScale) { + field_0x3e4 = g_drawHIO.mZButtonItemBaseScale; + draw_buttonZ = true; + } + + if (field_0x3e8 != g_drawHIO.mZButtonItemBasePosX) { + field_0x3e8 = g_drawHIO.mZButtonItemBasePosX; + draw_buttonZ = true; + } + + if (field_0x3ec != g_drawHIO.mZButtonItemBasePosY) { + field_0x3ec = g_drawHIO.mZButtonItemBasePosY; + draw_buttonZ = true; + } + + if (field_0x330 != g_drawHIO.mZButtonFontScale) { + field_0x330 = g_drawHIO.mZButtonFontScale; + draw_buttonZ = true; + } + + if (field_0x334 != g_drawHIO.mZButtonFontPosX) { + field_0x334 = g_drawHIO.mZButtonFontPosX; + draw_buttonZ = true; + } + + if (field_0x338 != g_drawHIO.mZButtonFontPosY) { + field_0x338 = g_drawHIO.mZButtonFontPosY; + draw_buttonZ = true; + } + + if (dComIfGp_getZStatusForce() != 0) { + dComIfGp_setZStatus(dComIfGp_getZStatusForce(), dComIfGp_getZSetFlagForce()); + dComIfGp_setZStatusForce(0, 0); + } + + if (mZStatus != dComIfGp_getZStatus() || draw_buttonZ) { + mZStatus = dComIfGp_getZStatus(); + + if (mZStatus == 0x2D || mZStatus == 0x2E) { + dComIfGp_setZStatus(mZStatus, 1); + } + + mpMeterDraw->drawButtonZ(mZStatus); + } + + mpMeterDraw->setButtonIconMidonaAlpha(mStatus); + dComIfGp_setZStatus(0, 0); + + if (dComIfGp_getBottleStatusForce() != 0) { + i_dComIfGp_setBottleStatus(dComIfGp_getBottleStatusForce(), + dComIfGp_getBottleSetFlagForce()); + dComIfGp_setBottleStatusForce(0, 0); + } + + if (mBottleStatus != dComIfGp_getBottleStatus()) { + mBottleStatus = dComIfGp_getBottleStatus(); + mpMeterDraw->drawButtonBin(mBottleStatus); + } } -#pragma pop /* 802222A0-80222364 21CBE0 00C4+00 1/1 0/0 0/0 .text moveButton3D__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveButton3D() { - nofralloc -#include "asm/d/meter/d_meter2/moveButton3D__9dMeter2_cFv.s" +void dMeter2_c::moveButton3D() { + u8 var_r6; + + if (dComIfGp_get3DStatusForce() != 0) { + var_r6 = dComIfGp_get3DSetFlagForce(); + if (dComIfGp_get3DStatusForce() == 0x6A) { + var_r6 = 1; + } + + dComIfGp_set3DStatus(dComIfGp_get3DStatusForce(), dComIfGp_get3DDirectionForce(), var_r6); + dComIfGp_set3DStatusForce(0, 0, 0); + } + + if (m3DStatus != dComIfGp_get3DStatus()) { + m3DStatus = dComIfGp_get3DStatus(); + + if (m3DStatus == 0x2D || m3DStatus == 0x2E) { + dComIfGp_set3DStatus(m3DStatus, 5, 1); + } + + mpMeterDraw->drawButton3D(m3DStatus); + } } -#pragma pop /* 80222364-80222494 21CCA4 0130+00 1/1 0/0 0/0 .text moveButtonC__9dMeter2_cFv */ void dMeter2_c::moveButtonC() { @@ -976,11 +1991,12 @@ void dMeter2_c::moveButtonC() { dComIfGp_setCStickStatusForce(0, 0, 0); } - if (mCStickStatus == dComIfGp_getCStickStatus() && - field_0x1ac == dMeter2Info_isUseButton(0x10)) { + if (mCStickStatus == dComIfGp_getCStickStatus() && field_0x1ac == dMeter2Info_isUseButton(0x10)) + { if ((!mpMeterDraw->isEmphasisC() || dComIfGp_isCStickSetFlag(2)) && (mpMeterDraw->isEmphasisC() || !dComIfGp_isCStickSetFlag(2)) && - field_0x19a == mpMeterDraw->getButtonTimer()) { + field_0x19a == mpMeterDraw->getButtonTimer()) + { return; } } @@ -1009,6 +2025,300 @@ void dMeter2_c::moveButtonS() { } /* 80222518-80222E88 21CE58 0970+00 1/1 0/0 0/0 .text moveButtonXY__9dMeter2_cFv */ +// single r26 / r29 reg swap +#ifdef NONMATCHING +void dMeter2_c::moveButtonXY() { + bool sp8[2]; + bool spC[2]; + + for (int i = 0; i < 2; i++) { + sp8[i] = 0; + spC[i] = 0; + } + + if (field_0x33c != g_drawHIO.mXButtonScale) { + field_0x33c = g_drawHIO.mXButtonScale; + sp8[0] = 1; + } + + if (field_0x340 != g_drawHIO.mXButtonPosX) { + field_0x340 = g_drawHIO.mXButtonPosX; + sp8[0] = 1; + } + + if (field_0x344 != g_drawHIO.mXButtonPosY) { + field_0x344 = g_drawHIO.mXButtonPosY; + sp8[0] = 1; + } + + if (field_0x348 != g_drawHIO.mYButtonScale) { + field_0x348 = g_drawHIO.mYButtonScale; + sp8[1] = 1; + } + + if (field_0x34c != g_drawHIO.mYButtonPosX) { + field_0x34c = g_drawHIO.mYButtonPosX; + sp8[1] = 1; + } + + if (field_0x350 != g_drawHIO.mYButtonPosY) { + field_0x350 = g_drawHIO.mYButtonPosY; + sp8[1] = 1; + } + + if (field_0x360 != g_drawHIO.mXButtonItemScale) { + field_0x360 = g_drawHIO.mXButtonItemScale; + sp8[0] = 1; + } + + if (field_0x364 != g_drawHIO.mXButtonItemPosX) { + field_0x364 = g_drawHIO.mXButtonItemPosX; + sp8[0] = 1; + } + + if (field_0x368 != g_drawHIO.mXButtonItemPosY) { + field_0x368 = g_drawHIO.mXButtonItemPosY; + sp8[0] = 1; + } + + if (field_0x36c != g_drawHIO.mYButtonItemScale) { + field_0x36c = g_drawHIO.mYButtonItemScale; + sp8[1] = 1; + } + + if (field_0x370 != g_drawHIO.mYButtonItemPosX) { + field_0x370 = g_drawHIO.mYButtonItemPosX; + sp8[1] = 1; + } + + if (field_0x374 != g_drawHIO.mYButtonItemPosY) { + field_0x374 = g_drawHIO.mYButtonItemPosY; + sp8[1] = 1; + } + + for (int i = 0; i < 2; i++) { + if (field_0x39c[i] != g_drawHIO.mXButtonItemBaseScale[i]) { + field_0x39c[i] = g_drawHIO.mXButtonItemBaseScale[i]; + sp8[0] = 1; + } + + if (field_0x3a4[i] != g_drawHIO.mXButtonItemBasePosX[i]) { + field_0x3a4[i] = g_drawHIO.mXButtonItemBasePosX[i]; + sp8[0] = 1; + } + + if (field_0x3ac[i] != g_drawHIO.mXButtonItemBasePosY[i]) { + field_0x3ac[i] = g_drawHIO.mXButtonItemBasePosY[i]; + sp8[0] = 1; + } + + if (field_0x3b4[i] != g_drawHIO.mYButtonItemBaseScale[i]) { + field_0x3b4[i] = g_drawHIO.mYButtonItemBaseScale[i]; + sp8[1] = 1; + } + + if (field_0x3bc[i] != g_drawHIO.mYButtonItemBasePosX[i]) { + field_0x3bc[i] = g_drawHIO.mYButtonItemBasePosX[i]; + sp8[1] = 1; + } + + if (field_0x3c4[i] != g_drawHIO.mYButtonItemBasePosY[i]) { + field_0x3c4[i] = g_drawHIO.mYButtonItemBasePosY[i]; + sp8[1] = 1; + } + } + + if (g_drawHIO.mItemScaleAdjustON && field_0x4bd != g_drawHIO.mItemScalePercent) { + field_0x4bd = g_drawHIO.mItemScalePercent; + + for (int i = 0; i < 2; i++) { + sp8[i] = 1; + } + } + + if (field_0x3f0 != g_drawHIO.mXYButtonFontScale) { + field_0x3f0 = g_drawHIO.mXYButtonFontScale; + + for (int i = 0; i < 2; i++) { + sp8[i] = 1; + } + } + + if (field_0x3f4 != g_drawHIO.mXYButtonFontPosX) { + field_0x3f4 = g_drawHIO.mXYButtonFontPosX; + + for (int i = 0; i < 2; i++) { + sp8[i] = 1; + } + } + + if (field_0x3f8 != g_drawHIO.mXYButtonFontPosY) { + field_0x3f8 = g_drawHIO.mXYButtonFontPosY; + + for (int i = 0; i < 2; i++) { + sp8[i] = 1; + } + } + + for (int i = 0; i < 3; i++) { + if (field_0x390[i] != g_drawHIO.mButtonItemRotation[i]) { + field_0x390[i] = g_drawHIO.mButtonItemRotation[i]; + sp8[i] = 1; + } + + if (g_drawHIO.mButtonDebug[i]) { + sp8[i] = 1; + } + + if (field_0x430 != g_drawHIO.field_0x54c) { + field_0x430 = g_drawHIO.field_0x54c; + sp8[i] = 1; + } + } + + for (int i = 0; i < 2; i++) { + if (field_0x128 != 0) { + if (field_0x128 != field_0x12c) { + spC[i] = 1; + sp8[i] = 1; + } + + if (i == 0) { + if (dComIfGp_getXStatusForce() != 0) { + dComIfGp_setXStatus(dComIfGp_getXStatusForce(), dComIfGp_getXSetFlagForce()); + dComIfGp_setXStatusForce(0, 0); + } + + if (mItemStatus[i][1] != dComIfGp_getXStatus()) { + mItemStatus[i][1] = dComIfGp_getXStatus(); + + if (mItemStatus[i][1] == 0x2D || mItemStatus[i][1] == 0x2E) { + dComIfGp_setXStatus(mItemStatus[i][1], 1); + } + + spC[i] = 1; + sp8[i] = 1; + } + + if (mXSetFlag[i] != dComIfGp_isXSetFlag(2)) { + mXSetFlag[i] = dComIfGp_isXSetFlag(2); + spC[i] = 1; + sp8[i] = 1; + } + } else if (i == 1) { + if (dComIfGp_getYStatusForce() != 0) { + dComIfGp_setYStatus(dComIfGp_getYStatusForce(), dComIfGp_getYSetFlagForce()); + dComIfGp_setYStatusForce(0, 0); + } + + if (mItemStatus[i][1] != dComIfGp_getYStatus()) { + mItemStatus[i][1] = dComIfGp_getYStatus(); + + if (mItemStatus[i][1] == 0x2D || mItemStatus[i][1] == 0x2E) { + dComIfGp_setYStatus(mItemStatus[i][1], 1); + } + + spC[i] = 1; + sp8[i] = 1; + } + + if (mXSetFlag[i] != dComIfGp_isYSetFlag(2)) { + mXSetFlag[i] = dComIfGp_isYSetFlag(2); + spC[i] = 1; + sp8[i] = 1; + } + } + } else { + if (mItemStatus[0][i] != dComIfGp_getSelectItem(i) || field_0x128 != field_0x12c) { + mItemStatus[0][i] = dComIfGp_getSelectItem(i); + spC[i] = 1; // + sp8[i] = 1; + } + + if (field_0x1d6[i][0] != dMeter2Info_isDirectUseItem(i)) { + field_0x1d6[i][0] = dMeter2Info_isDirectUseItem(i); + spC[i] = 1; // + sp8[i] = 1; + } + + if (mItemStatus[0][i] == 0x48) { + if (field_0x1ec == 0) { + if (dComIfGs_getOil() != 0) { + field_0x1ec = 1; + sp8[i] = 1; + } + } else { + if (dComIfGs_getOil() == 0) { + field_0x1ec = 0; + sp8[i] = 1; + } + } + } else if (mItemStatus[0][i] == 0x46) { + if (field_0x1ed == 0) { + if (daPy_getPlayerActorClass()->checkCopyRodTopUse()) { + field_0x1ed = 1; + sp8[i] = 1; + } + } else { + if (!daPy_getPlayerActorClass()->checkCopyRodTopUse()) { + field_0x1ed = 0; + sp8[i] = 1; + } + } + } else if (mItemStatus[0][i] == 0x50 || mItemStatus[0][i] == 0x70 || + mItemStatus[0][i] == 0x71 || mItemStatus[0][i] == 0x72) + { + if (sp8[i] != 0) { + mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), + dComIfGp_getSelectItemMaxNum(i)); + } + } else if (mItemStatus[0][i] == 0x76) { + if (field_0x1d6[i][2] != dComIfGp_getSelectItemNum(i)) { + field_0x1d6[i][2] = dComIfGp_getSelectItemNum(i); + sp8[i] = 1; + } + + if (sp8[i] != 0) { + mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), + dComIfGp_getSelectItemMaxNum(i)); + } + } else if (mItemStatus[0][i] == 0x43 || mItemStatus[0][i] == 0x53 || + mItemStatus[0][i] == 0x54 || mItemStatus[0][i] == 0x55 || + mItemStatus[0][i] == 0x56 || mItemStatus[0][i] == 0x5A) + { + if (sp8[i] != 0) { + mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax()); + } + } else if (mItemStatus[0][i] == 0x4B) { + if (sp8[i] != 0) { + mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); + } + } else if (mItemStatus[0][i] == 0x59) { + u8 var_r25 = dComIfGp_getSelectItemNum(i); + u8 var_r6_2 = dComIfGp_getSelectItemMaxNum(i); + + if (var_r25 > mArrowNum) { + var_r25 = mArrowNum; + } + + if (var_r6_2 < dComIfGs_getArrowMax()) { + var_r6_2 = dComIfGs_getArrowMax(); + } + + mpMeterDraw->setItemNum(i, var_r25, var_r6_2); + } + } + + if (sp8[i] != 0) { + mpMeterDraw->drawButtonXY(i, mItemStatus[i][0], mItemStatus[i][1], + field_0x128 == 0 ? true : false, spC[i]); + } + } + + alphaAnimeButton(); + dMeter2Info_resetDirectUseItem(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1017,133 +2327,617 @@ asm void dMeter2_c::moveButtonXY() { #include "asm/d/meter/d_meter2/moveButtonXY__9dMeter2_cFv.s" } #pragma pop - -/* ############################################################################################## */ -/* 804549FC-80454A00 002FFC 0004+00 1/1 0/0 0/0 .sdata2 @7509 */ -SECTION_SDATA2 static f32 lit_7509 = 15.0f; - -/* 80454A00-80454A04 003000 0004+00 1/1 0/0 0/0 .sdata2 @7510 */ -SECTION_SDATA2 static f32 lit_7510 = 50.0f; +#endif /* 80222E88-802230F8 21D7C8 0270+00 1/1 0/0 0/0 .text moveButtonCross__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveButtonCross() { - nofralloc -#include "asm/d/meter/d_meter2/moveButtonCross__9dMeter2_cFv.s" +void dMeter2_c::moveButtonCross() { + f32 temp_f1; + f32 temp_f30; + f32 temp_f31; + f32 var_f31; + bool draw_cross; + + draw_cross = false; + var_f31 = 0.0f; + + if (mDPadButtonOFFPosX != g_drawHIO.mDPadButtonOFFPosX) { + mDPadButtonOFFPosX = g_drawHIO.mDPadButtonOFFPosX; + draw_cross = true; + } + + if (mDPadButtonOFFPosY != g_drawHIO.mDPadButtonOFFPosY) { + mDPadButtonOFFPosY = g_drawHIO.mDPadButtonOFFPosY; + draw_cross = true; + } + + if (mDPadButtonONPosX != g_drawHIO.mDPadButtonONPosX) { + mDPadButtonONPosX = g_drawHIO.mDPadButtonONPosX; + draw_cross = true; + } + + if (mDPadButtonONPosY != g_drawHIO.mDPadButtonONPosY) { + mDPadButtonONPosY = g_drawHIO.mDPadButtonONPosY; + draw_cross = true; + } + + if (mDPadButtonScale != g_drawHIO.mDPadButtonScale) { + mDPadButtonScale = g_drawHIO.mDPadButtonScale; + draw_cross = true; + } + + if (mDPadButtonLetterSpacing != g_drawHIO.mDPadButtonLetterSpacing) { + mDPadButtonLetterSpacing = g_drawHIO.mDPadButtonLetterSpacing; + draw_cross = true; + } + + if (mpMap != NULL) { + temp_f31 = mpMap->getMapDispEdgeTop(); + temp_f1 = (temp_f31 - mpMeterDraw->getButtonCrossParentInitTransY()) - 15.0f; + + if (mpMap->isDispPosInsideFlg()) { + if (field_0x1b4 < g_drawHIO.mDPadButtonMoveFrame) { + field_0x1b4++; + draw_cross = true; + } else { + field_0x1b4 = g_drawHIO.mDPadButtonMoveFrame; + } + + var_f31 = mDPadButtonONPosY + temp_f1; + } else { + if (field_0x1b4 > 0) { + field_0x1b4--; + draw_cross = true; + } else { + field_0x1b4 = 0; + } + + var_f31 = mDPadButtonOFFPosY; + } + } + + temp_f30 = mDPadButtonOFFPosX + (((f32)field_0x1b4 / (f32)g_drawHIO.mDPadButtonMoveFrame) * + (mDPadButtonONPosX - mDPadButtonOFFPosX)); + if (field_0x15c != var_f31) { + cLib_addCalc2(&field_0x15c, var_f31, 0.5f, 50.0f); + if ((f32)fabs(field_0x15c - var_f31) < 0.5f) { + field_0x15c = var_f31; + } + draw_cross = true; + } + + if (draw_cross == true) { + mpMeterDraw->drawButtonCross(temp_f30, field_0x15c); + } + + alphaAnimeButtonCross(); } -#pragma pop /* 802230F8-802230FC 21DA38 0004+00 1/1 0/0 0/0 .text moveTouchSubMenu__9dMeter2_cFv */ -void dMeter2_c::moveTouchSubMenu() { - /* empty function */ -} +void dMeter2_c::moveTouchSubMenu() {} /* 802230FC-802231C8 21DA3C 00CC+00 1/1 0/0 0/0 .text moveSubContents__9dMeter2_cFv */ void dMeter2_c::moveSubContents() { JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); checkSubContents(); - if (mpMeterSub != NULL) { - mpMeterSub->_execute(field_0x124); + if (mpSubContents != NULL) { + mpSubContents->_execute(mStatus); } - if (mpMeterString != NULL) { - if (mSubContents == 5 && mSubContentsStringType != dMeter2Info_getMeterStringType()) { + if (mpSubSubContents != NULL) { + if (mSubContentType == 5 && mSubContentsStringType != dMeter2Info_getMeterStringType()) { mSubContentsStringType = dMeter2Info_getMeterStringType(); if (mSubContentsStringType != 0) { - mpMeterString->createString(mSubContentsStringType); + mpSubSubContents->createString(mSubContentsStringType); } } - mpMeterString->_execute(field_0x124); + mpSubSubContents->_execute(mStatus); } + mDoExt_setCurrentHeap(heap); } /* 802231C8-802237D4 21DB08 060C+00 1/1 0/0 0/0 .text move2DContents__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::move2DContents() { - nofralloc -#include "asm/d/meter/d_meter2/move2DContents__9dMeter2_cFv.s" -} -#pragma pop +void dMeter2_c::move2DContents() { + bool var_r19; + bool var_r27; + bool var_r20; + bool var_r28; + bool var_r21; + bool var_r22; + bool var_r23; + bool var_r24; + bool var_r25; + bool var_r29; + bool var_r26; + u8 var_r30; -/* ############################################################################################## */ -/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039933F = "F_SP103"; -#pragma pop + field_0x201 = 0; + field_0x108 = NULL; + + JKRHeap* temp_r3 = dComIfGp_getSubHeap2D(8); + if (temp_r3 != NULL) { + field_0x108 = mDoExt_setCurrentHeap(temp_r3); + } + + check2DContents(); + + if (mpEmpButton != NULL) { + var_r19 = 0; + var_r27 = 0; + var_r20 = 0; + var_r28 = 0; + var_r21 = 0; + var_r22 = 0; + var_r23 = 0; + var_r24 = 0; + var_r25 = 0; + var_r29 = 0; + var_r26 = 0; + var_r30 = 2; + + if (mpMeterDraw->isEmphasisS() && mpEmpButton->isSetButton(6)) { + mpEmpButton->setString(mpMeterDraw->getActionString(mSButtonStatus, 0, NULL), 6, 0, 0); + var_r23 = 1; + var_r30 = 0; + } + + if (mpMeterDraw->isEmphasisB() && mpMeterDraw->isEmphasis3D() && var_r30 != 0) { + if (mAStatus == m3DStatus) { + mpEmpButton->setString(mpMeterDraw->getActionString(mAStatus, 0, NULL), 13, + 2 - var_r30, 0); + var_r29 = 1; + var_r30 -= 2; + } + } + + if (var_r29 == 0) { + if (mpMeterDraw->isEmphasis3D() && var_r30 != 0 && mpEmpButton->isSetButton(4)) { + mpEmpButton->setString(mpMeterDraw->getActionString(m3DStatus, 0, NULL), 4, + 2 - var_r30, 0); + var_r21 = 1; + var_r30 -= 1; + } + } + + if (mpMeterDraw->isEmphasisC() && var_r30 != 0 && mpEmpButton->isSetButton(5)) { + mpEmpButton->setString(mpMeterDraw->getActionString(mCStickStatus, 0, NULL), 5, + 2 - var_r30, 0); + var_r22 = 1; + var_r30 -= 1; + } + + if (var_r29 == 0) { + if (mpMeterDraw->isEmphasisB() && var_r30 != 0 && mpEmpButton->isSetButton(1)) { + mpEmpButton->setString(mpMeterDraw->getActionString(mAStatus, 0, NULL), 1, + 2 - var_r30, mAStatus == 0x4F ? true : false); + var_r27 = 1; + var_r30 -= 1; + } + } + + if (mpMeterDraw->isEmphasisY() && var_r30 != 0 && mpEmpButton->isSetButton(8)) { + mpEmpButton->setString(mpMeterDraw->getActionString(mItemStatus[3], 0, NULL), 8, + 2 - var_r30, 0); + var_r25 = 1; + var_r30 -= 1; + } + + if (mpMeterDraw->isEmphasisA() && var_r30 != 0 && mpEmpButton->isSetButton(0)) { + mpEmpButton->setString(mpMeterDraw->getActionString(mDoStatus, 0, NULL), 0, 2 - var_r30, + 0); + var_r19 = 1; + var_r30 -= 1; + } + + if (mpMeterDraw->isEmphasisZ() && var_r30 != 0 && mpEmpButton->isSetButton(3)) { + if (mZStatus == 8) { + mpEmpButton->setString(mpMeterDraw->getActionString(100, 0, NULL), 3, 2 - var_r30, + 0); + } else { + mpEmpButton->setString(mpMeterDraw->getActionString(mZStatus, 0, NULL), 3, + 2 - var_r30, 0); + } + + var_r28 = 1; + var_r30 -= 1; + } + + if (mpMeterDraw->isEmphasisR() && var_r30 != 0 && mpEmpButton->isSetButton(2)) { + mpEmpButton->setString(mpMeterDraw->getActionString(mRStatus, 0, NULL), 2, 2 - var_r30, + 0); + var_r20 = 1; + var_r30 -= 1; + } + + if (mpMeterDraw->isEmphasisX() && var_r30 != 0 && mpEmpButton->isSetButton(7)) { + mpEmpButton->setString(mpMeterDraw->getActionString(mItemStatus[1], 0, NULL), 7, + 2 - var_r30, 0); + var_r24 = 1; + var_r30 -= 1; + } + + if (mpMeterDraw->isEmphasisBin() && var_r30 != 0 && mpEmpButton->isSetButton(21) && + !dMeter2Info_is2DActiveTouchArea()) + { + mpEmpButton->setString(mpMeterDraw->getActionString(mBottleStatus, 0, NULL), 21, + 2 - var_r30, 0); + var_r26 = 1; + } + + mpEmpButton->_execute(mStatus, var_r19, var_r27, var_r20, var_r28, var_r21, var_r22, + var_r23, var_r24, var_r25, false, false, false, false, var_r29, false, + false, false, false, false, false, false, var_r26); + + if ((var_r19 != 0) || (var_r27 != 0) || (var_r20 != 0) || (var_r28 != 0) || + (var_r21 != 0) || (var_r22 != 0) || (var_r23 != 0) || (var_r24 != 0) || + (var_r25 != 0) || (var_r29 != 0) || (var_r26 != 0)) + { + field_0x201 = 1; + } + } + + if (field_0x108 != NULL) { + mDoExt_setCurrentHeap(field_0x108); + } +} /* 802237D4-80223BC4 21E114 03F0+00 1/1 0/0 0/0 .text checkSubContents__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::checkSubContents() { - nofralloc -#include "asm/d/meter/d_meter2/checkSubContents__9dMeter2_cFv.s" +void dMeter2_c::checkSubContents() { + if (mStatus & 0x80) { + killSubContents(4); + + if (mSubContentType == 0) { + mpSubContents = new dScope_c(0); + mSubContentType = 4; + } + return; + } else if (mStatus & 0x2000000) { + if (strcmp(dComIfGp_getStartStageName(), "F_SP103") && + (strcmp(dComIfGp_getStartStageName(), "F_SP00") || dComIfG_play_c::getLayerNo(0) != 5)) + { + killSubContents(1); + + if (mSubContentType == 0) { + mpSubHeap->getTotalFreeSize(); + mpSubContents = new dMeterHakusha_c(mpMeterDraw->getMainScreenPtr()); + mSubContentType = 1; + } + return; + } + } + + if (daPy_getPlayerActorClass()->i_getSumouMode() != 0) { + killSubContents(5); + + if (mSubContentType == 0) { + mpSubContents = new dMeterHaihai_c(0); + mpSubSubContents = new dMeterString_c(dMeter2Info_getMeterStringType()); + mSubContentType = 5; + mSubContentsStringType = dMeter2Info_getMeterStringType(); + } + } else if (mStatus & 0x200) { + killSubContents(2); + + if (mSubContentType == 0) { + mpSubContents = new dMeterHaihai_c(0); + mSubContentType = 2; + } + } else if (dMeter2Info_getMeterStringType() != 0) { + killSubContents(3); + + if (mSubContentType == 0) { + mpSubContents = new dMeterString_c(dMeter2Info_getMeterStringType()); + mSubContentType = 3; + } + } else if (mSubContentType == 4) { + if (mpSubContents != NULL || mpSubSubContents != NULL) { + bool free_heap = false; + + if (mpSubContents != NULL && mpSubContents->isDead()) { + delete mpSubContents; + mpSubContents = NULL; + free_heap = true; + } + + if (mpSubSubContents != NULL && mpSubSubContents->isDead()) { + delete mpSubSubContents; + mpSubSubContents = NULL; + free_heap = true; + } + + if (free_heap) { + mpSubHeap->freeAll(); + mSubContentType = 0; + mSubContentsStringType = 0; + } + } else { + mSubContentType = 0; + } + } else if (mSubContentType != 0) { + bool free_heap = false; + + if (mpSubContents != NULL) { + delete mpSubContents; + mpSubContents = NULL; + free_heap = true; + } + + if (mpSubSubContents != NULL) { + delete mpSubSubContents; + mpSubSubContents = NULL; + free_heap = true; + } + + if (free_heap) { + mpSubHeap->freeAll(); + } + + mSubContentType = 0; + mSubContentsStringType = 0; + } } -#pragma pop /* 80223BC4-80223E00 21E504 023C+00 1/1 0/0 0/0 .text check2DContents__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::check2DContents() { - nofralloc -#include "asm/d/meter/d_meter2/check2DContents__9dMeter2_cFv.s" +void dMeter2_c::check2DContents() { + if (mpEmpButton == NULL) { + if ((dComIfGp_isHeapLockFlag() == 0 || dComIfGp_isHeapLockFlag() == 5) && + (dMeter2Info_isFloatingMessageVisible() || mpMeterDraw->isEmphasisA() || + mpMeterDraw->isEmphasisB() || mpMeterDraw->isEmphasisR() || + mpMeterDraw->isEmphasisZ() || mpMeterDraw->isEmphasis3D() || + mpMeterDraw->isEmphasisC() || mpMeterDraw->isEmphasisS() || + mpMeterDraw->isEmphasisX() || mpMeterDraw->isEmphasisY() || + mpMeterDraw->isEmphasisBin())) + { + dComIfGp_setHeapLockFlag(8); + + if (field_0x108 == NULL) { + field_0x108 = mDoExt_setCurrentHeap(dComIfGp_getSubHeap2D(8)); + } + + mpEmpButton = new dMeterButton_c(); + } + } else if (dComIfGp_isHeapLockFlag() == 5 && !dMeter2Info_isFloatingMessageVisible()) { + if (!mpMeterDraw->isEmphasisA() && !mpMeterDraw->isEmphasisB() && + !mpMeterDraw->isEmphasisR() && !mpMeterDraw->isEmphasisZ() && + !mpMeterDraw->isEmphasis3D() && !mpMeterDraw->isEmphasisC() && + !mpMeterDraw->isEmphasisS() && !mpMeterDraw->isEmphasisX() && + !mpMeterDraw->isEmphasisY() && !mpMeterDraw->isEmphasisBin() && mpEmpButton->isClose()) + { + delete mpEmpButton; + mpEmpButton = NULL; + dComIfGp_getSubHeap2D(8)->freeAll(); + + if (field_0x108 != NULL) { + mDoExt_setCurrentHeap(field_0x108); + field_0x108 = NULL; + } + + dComIfGp_offHeapLockFlag(8); + } + } } -#pragma pop /* 80223E00-80224258 21E740 0458+00 1/1 0/0 0/0 .text moveBombNum__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveBombNum() { - nofralloc -#include "asm/d/meter/d_meter2/moveBombNum__9dMeter2_cFv.s" +void dMeter2_c::moveBombNum() { + u8 temp_r28; + u8 temp_r31; + + for (int i = 0; i < 3; i++) { + s16 var_r22; + temp_r31 = dComIfGs_getItem((u8)(i + SLOT_15), true); + temp_r28 = dComIfGs_getItem((u8)(i + SLOT_15), false); + + if (temp_r31 != NO_ITEM && temp_r31 != BOMB_BAG_LV1) { + if (g_mwHIO.getBombFlag() || + (dMeter2Info_getMiniGameItemSetFlag() == 1 && i == dMeter2Info_getRentalBombBag())) + { + if (dComIfGs_getBombMax(temp_r28) != dComIfGs_getBombNum(i)) { + dComIfGp_setItemBombNumCount(i, dComIfGs_getBombMax(temp_r28)); + } + + if (dComIfGp_getItemBombNumCount(i) < 0) { + dComIfGp_clearItemBombNumCount(i); + } + } + + if (dComIfGp_getItemBombNumCount(i) != 0 || mBombNum[i] != dComIfGs_getBombNum(i) || + mBombMax[i] != dComIfGs_getBombMax(temp_r28)) + { + var_r22 = dComIfGs_getBombNum(i) + dComIfGp_getItemBombNumCount(i); + dComIfGp_clearItemBombNumCount(i); + + if (var_r22 < 0) { + var_r22 = 0; + } + + if (var_r22 > dComIfGs_getBombMax(temp_r28)) { + var_r22 = dComIfGs_getBombMax(temp_r28); + } + + if (var_r22 == 0) { + if (temp_r31 == BOMB_ARROW) { + for (int j = 0; j < 2; j++) { + if (i + SLOT_15 == dComIfGs_getSelectItemIndex(j) || + i + SLOT_15 == dComIfGs_getMixItemIndex(j)) + { + dComIfGs_setMixItemIndex(j, 0xFF); + dComIfGs_setSelectItemIndex(j, 4); + dComIfGp_setSelectItem(j); + } + } + } + dComIfGs_setItem(i + SLOT_15, BOMB_BAG_LV1); + dComIfGp_setItem(i + SLOT_15, BOMB_BAG_LV1); + + for (int j = 0; j < 2; j++) { + if (i + SLOT_15 == dComIfGs_getSelectMixItemNoArrowIndex(j)) { + dComIfGp_setSelectItem(j); + } + } + } + + dComIfGs_setBombNum(i, var_r22); + mBombMax[i] = dComIfGs_getBombMax(temp_r28); + + if (temp_r31 != BOMB_ARROW) { + for (int j = 0; j < 2; j++) { + if (i + SLOT_15 == dComIfGs_getSelectMixItemNoArrowIndex(j)) { + mpMeterDraw->setItemNum(j, dComIfGp_getSelectItemNum(j), + dComIfGp_getSelectItemMaxNum(j)); + } + } + } + } + } else { + if (temp_r31 != BOMB_BAG_LV1) { + dComIfGs_setBombNum(i, 0); + } + + if (dComIfGp_getItemBombNumCount(i) != 0) { + dComIfGp_clearItemBombNumCount(i); + } + } + + if (mBombNum[i] != dComIfGs_getBombNum(i)) { + mBombNum[i] = dComIfGs_getBombNum(i); + } + } + + for (int i = 0; i < 2; i++) { + if (mItemMaxNum[i] != dComIfGs_getSelectItemIndex(i)) { + for (int j = 0; j < 3; j++) { + if (j + SLOT_15 == dComIfGs_getSelectItemIndex(i)) { + mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), + dComIfGp_getSelectItemMaxNum(i)); + } + } + + mItemMaxNum[i] = dComIfGs_getSelectItemIndex(i); + } + } } -#pragma pop /* 80224258-80224354 21EB98 00FC+00 1/1 0/0 0/0 .text moveBottleNum__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveBottleNum() { - nofralloc -#include "asm/d/meter/d_meter2/moveBottleNum__9dMeter2_cFv.s" +void dMeter2_c::moveBottleNum() { + for (int i = 0; i < 4; i++) { + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == BEE_CHILD) { + if (mBottleNum[i] != dComIfGs_getBottleNum(i)) { + for (int j = 0; j < 2; j++) { + if (i + SLOT_11 == dComIfGs_getSelectItemIndex(j)) { + mpMeterDraw->setItemNum(j, dComIfGp_getSelectItemNum(j), + dComIfGp_getSelectItemMaxNum(j)); + mBottleNum[i] = dComIfGs_getBottleNum(i); + } + } + } + } + } } -#pragma pop /* 80224354-80224680 21EC94 032C+00 1/1 0/0 0/0 .text moveArrowNum__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::moveArrowNum() { - nofralloc -#include "asm/d/meter/d_meter2/moveArrowNum__9dMeter2_cFv.s" +void dMeter2_c::moveArrowNum() { + s16 var_r6; + int var_r28; + int i; + u8 var_r27; + u8 var_r6_2; + + if (g_mwHIO.getArrowFlag() || dMeter2Info_getMiniGameItemSetFlag() == 1) { + if (dComIfGs_getArrowMax() != dComIfGs_getArrowNum()) { + dComIfGp_setItemArrowNumCount(dComIfGs_getArrowMax()); + } + + if (dComIfGp_getItemArrowNumCount() < 0) { + dComIfGp_clearItemArrowNumCount(); + } + } + + if (dComIfGp_getItemArrowNumCount() != 0 || mItemMaxNum[2] != dComIfGs_getArrowMax() || + mArrowNum != dComIfGs_getArrowNum()) + { + var_r6 = dComIfGs_getArrowNum() + dComIfGp_getItemArrowNumCount(); + dComIfGp_clearItemArrowNumCount(); + + if (var_r6 < 0) { + var_r6 = 0; + } + + if (var_r6 > dComIfGs_getArrowMax()) { + var_r6 = dComIfGs_getArrowMax(); + } + + dComIfGs_setArrowNum(var_r6); + mItemMaxNum[2] = dComIfGs_getArrowMax(); + + if (mArrowNum < dComIfGs_getArrowNum()) { + mArrowNum++; + onArrowSoundBit(2); + + if (isArrowSoundBit(2)) { + if (mArrowNum != dComIfGs_getArrowNum()) { + if (!isArrowSoundBit(0) && isArrowEquip() && mpMeterDraw->isButtonVisible()) { + onArrowSoundBit(0); + mDoAud_seStart(Z2SE_CONSUM_INC_CNT_1, NULL, 0, 0); + } else { + offArrowSoundBit(0); + } + } else { + if (isArrowEquip() && mpMeterDraw->isButtonVisible()) { + mDoAud_seStart(Z2SE_CONSUM_INC_CNT_2, NULL, 0, 0); + } + offArrowSoundBit(2); + offArrowSoundBit(0); + } + } + } else if (mArrowNum > dComIfGs_getArrowNum()) { + mArrowNum--; + } + + i = 0; + var_r28 = 0; + for (; i < 2; i++, var_r28 += 2) { + if (mItemStatus[var_r28] == BOW || mItemStatus[var_r28] == LIGHT_ARROW || + mItemStatus[var_r28] == ARROW_LV1 || mItemStatus[var_r28] == ARROW_LV2 || + mItemStatus[var_r28] == ARROW_LV3 || mItemStatus[var_r28] == HAWK_ARROW) + { + mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax()); + } else if (mItemStatus[var_r28] == PACHINKO) { + mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); + } else if (mItemStatus[var_r28] == BOMB_ARROW) { + var_r27 = dComIfGp_getSelectItemNum(i); + var_r6_2 = dComIfGp_getSelectItemMaxNum(i); + + if (var_r27 > mArrowNum) { + var_r27 = mArrowNum; + } + + if (var_r6_2 < dComIfGs_getArrowMax()) { + var_r6_2 = dComIfGs_getArrowMax(); + } + + mpMeterDraw->setItemNum(i, var_r27, var_r6_2); + } + } + } } -#pragma pop /* 80224680-802248E4 21EFC0 0264+00 1/1 0/0 0/0 .text movePachinkoNum__9dMeter2_cFv */ -// matches with literals -#ifdef NONMATCHING void dMeter2_c::movePachinkoNum() { if (g_mwHIO.getPachinkoFlag()) { if (dComIfGs_getPachinkoNum() != dComIfGs_getPachinkoMax()) { u8 max = dComIfGs_getPachinkoMax(); dComIfGp_setItemPachinkoNumCount(max); } + if (dComIfGp_getItemPachinkoNumCount() < 0) { dComIfGp_clearItemPachinkoNumCount(); } } if (dComIfGp_getItemPachinkoNumCount() == 0 && mItemMaxNum[3] == dComIfGs_getPachinkoMax() && - mPachinkoNum == dComIfGs_getPachinkoNum()) { + mPachinkoNum == dComIfGs_getPachinkoNum()) + { return; } @@ -1190,57 +2984,89 @@ void dMeter2_c::movePachinkoNum() { } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::movePachinkoNum() { - nofralloc -#include "asm/d/meter/d_meter2/movePachinkoNum__9dMeter2_cFv.s" -} -#pragma pop -#endif /* 802248E4-80224A04 21F224 0120+00 1/1 0/0 0/0 .text alphaAnimeLife__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::alphaAnimeLife() { - nofralloc -#include "asm/d/meter/d_meter2/alphaAnimeLife__9dMeter2_cFv.s" +void dMeter2_c::alphaAnimeLife() { + if ((mStatus & 0x4000) || + ((mStatus & 0x40) && dComIfGp_event_checkHind(0x10) && + !i_dComIfGp_checkPlayerStatus1(0, 0x2000)) || + ((daPy_getPlayerActorClass()->i_getSumouMode() != 0) || (mStatus & 0x100000) || + (mStatus & 0x80000000) || (mStatus & 8) || (mStatus & 0x10) || (mStatus & 0x01000000) || + (mStatus & 0x20) || (mStatus & 0x04000000) || (mStatus & 0x08000000) || + (mStatus & 0x10000000))) + { + mpMeterDraw->setAlphaLifeAnimeMin(); + } else { + mpMeterDraw->setAlphaLifeAnimeMax(); + mDoAud_heartGaugeOn(); + } + + mpMeterDraw->setAlphaLifeChange(false); } -#pragma pop /* 80224A04-80224BAC 21F344 01A8+00 1/1 0/0 0/0 .text alphaAnimeKantera__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::alphaAnimeKantera() { - nofralloc -#include "asm/d/meter/d_meter2/alphaAnimeKantera__9dMeter2_cFv.s" +void dMeter2_c::alphaAnimeKantera() { + if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != KANTERA || + !daPy_getPlayerActorClass()->checkUseKandelaar(0) || (mStatus & 0x4000) || + ((mStatus & 0x40) && dComIfGp_event_checkHind(0x400)) || dComIfGp_getOxygenShowFlag() || + ((daPy_getPlayerActorClass()->i_getSumouMode() != 0) || + (daPy_getPlayerActorClass()->checkCanoeSlider() && + (dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4)) || + (mStatus & 0x100000) || (mStatus & 0x80000000) || (mStatus & 8) || (mStatus & 0x10) || + (mStatus & 0x01000000) || (mStatus & 0x20) || (mStatus & 0x04000000) || + (mStatus & 0x08000000) || (mStatus & 0x10000000))) + { + mpMeterDraw->setAlphaKanteraAnimeMin(); + } else { + mpMeterDraw->setAlphaKanteraAnimeMax(); + } + + mpMeterDraw->setAlphaKanteraChange(true); } -#pragma pop /* 80224BAC-80224D6C 21F4EC 01C0+00 1/1 0/0 0/0 .text alphaAnimeOxygen__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::alphaAnimeOxygen() { - nofralloc -#include "asm/d/meter/d_meter2/alphaAnimeOxygen__9dMeter2_cFv.s" +void dMeter2_c::alphaAnimeOxygen() { + if (!dComIfGp_getOxygenShowFlag() || (mStatus & 0x4000) || + ((mStatus & 0x40) && dComIfGp_event_checkHind(0x800)) || + ((daPy_getPlayerActorClass()->i_getSumouMode() != 0) || + (daPy_getPlayerActorClass()->checkCanoeSlider() && + (dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4)) || + (mStatus & 0x100000) || (mStatus & 0x80000000) || (mStatus & 8) || (mStatus & 0x10) || + (mStatus & 0x01000000) || (mStatus & 0x20) || (mStatus & 0x04000000) || + (mStatus & 0x08000000) || (mStatus & 0x10000000))) + { + mpMeterDraw->setAlphaOxygenAnimeMin(); + + if (!dComIfGp_getOxygenShowFlag()) { + field_0x1e1 = 0; + } + } else { + mpMeterDraw->setAlphaOxygenAnimeMax(); + + if (field_0x1e1 == 0) { + field_0x1e1 = 1; + + if (mpMeterDraw->getMeterGaugeAlphaRate(2) > 0.0f) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SWIM_TIMER_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } + } + } + + mpMeterDraw->setAlphaOxygenChange(false); } -#pragma pop /* 80224D6C-80224DC0 21F6AC 0054+00 1/1 0/0 0/0 .text alphaAnimeLightDrop__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::alphaAnimeLightDrop() { - nofralloc -#include "asm/d/meter/d_meter2/alphaAnimeLightDrop__9dMeter2_cFv.s" +void dMeter2_c::alphaAnimeLightDrop() { + if (!isShowLightDrop()) { + mpMeterDraw->setAlphaLightDropAnimeMin(); + } else { + mpMeterDraw->setAlphaLightDropAnimeMax(); + } + + mpMeterDraw->setAlphaLightDropChange(false); } -#pragma pop /* ############################################################################################## */ /* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -1261,6 +3087,24 @@ asm void dMeter2_c::alphaAnimeRupee() { } #pragma pop +/* void dMeter2_c::alphaAnimeRupee() { + if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x80)) || + ((daPy_getPlayerActorClass()->i_getSumouMode() != 0) || + (daPy_getPlayerActorClass()->checkCanoeSlider() && dComIfG_getTimerMode() == 4) || + (!strcmp(dComIfGp_getStartStageName(), "R_SP127") && dComIfGp_event_checkHind(0x80)) || + ((mStatus & 0x40000000) && ((mStatus & 0x100) || (mStatus & 0x1000))) || + (mStatus & 0x100000) || (mStatus & 0x100000) || (mStatus & 0x80000000) || (mStatus & 8) || + (mStatus & 0x10) || (mStatus & 0x01000000) || (mStatus & 0x20) || (mStatus & 0x04000000) || + (mStatus & 0x08000000) || (mStatus & 0x10000000)) || dMeter2Info_isSub2DStatus(1)) + { + mpMeterDraw->setAlphaRupeeAnimeMin(); + } else { + mpMeterDraw->setAlphaRupeeAnimeMax(); + } + + mpMeterDraw->setAlphaRupeeChange(false); +} */ + /* 80224F70-802250F4 21F8B0 0184+00 1/1 0/0 0/0 .text alphaAnimeKey__9dMeter2_cFv */ #pragma push #pragma optimization_level 0 @@ -1272,74 +3116,163 @@ asm void dMeter2_c::alphaAnimeKey() { #pragma pop /* 802250F4-802254C0 21FA34 03CC+00 1/1 0/0 0/0 .text alphaAnimeButton__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::alphaAnimeButton() { - nofralloc -#include "asm/d/meter/d_meter2/alphaAnimeButton__9dMeter2_cFv.s" +void dMeter2_c::alphaAnimeButton() { + u8 var_31; + var_31 = 0; + + if ((mStatus & 0x4000) || + ((mStatus & 0x100) && dMsgObject_getMsgObjectClass()->isAutoMessageFlag()) || + ((mStatus & 0x40000000) && !(mStatus & 0x100)) || (mStatus & 0x80000000) || (mStatus & 8) || + (mStatus & 0x10) || (mStatus & 0x20) || (mStatus & 0x04000000) || (mStatus & 0x10000000)) + { + mpMeterDraw->setAlphaButtonAnimeMin(); + mpMeterDraw->setAlphaButtonAAnimeMin(); + mpMeterDraw->setAlphaButtonBAnimeMin(); + } else if (!(mStatus & 0x1000000) && + ((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() || + (mStatus & 0x40) && dComIfGp_event_checkHind(1))) + { + mpMeterDraw->setAlphaButtonAnimeMin(); + var_31 = 1; + } else if (dMeter2Info_getItemExplainWindowStatus()) { + mpMeterDraw->setAlphaButtonAnimeMin(); + var_31 = 1; + } else { + mpMeterDraw->setAlphaButtonAnimeMax(); + } + + field_0x1e6 = 0; + + if (var_31 == 1) { + if (dMeter2Info_getItemExplainWindowStatus()) { + mpMeterDraw->setAlphaButtonAAnimeMin(); + } else if ((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() || + !dComIfGp_event_checkHind(2)) + { + mpMeterDraw->setAlphaButtonAAnimeMax(); + onShowFlag(0); + } else { + mpMeterDraw->setAlphaButtonAAnimeMin(); + } + + if (mpMeterDraw->isBButtonShow(false)) { + mpMeterDraw->setAlphaButtonBAnimeMax(); + onShowFlag(1); + } else { + mpMeterDraw->setAlphaButtonBAnimeMin(); + } + } + + if (!isShowFlag(0)) { + mpMeterDraw->setButtonIconAAlpha(mDoStatus, mStatus, field_0x128 == 0); + } + + if (!isShowFlag(1)) { + mpMeterDraw->setButtonIconBAlpha(mAStatus, mStatus, field_0x128 == 0); + } + + for (int i = 0; i < 2; i++) { + mpMeterDraw->setButtonIconAlpha(i, mItemStatus[i * 2], mStatus, + field_0x128 == 0 ? true : false); + + if (field_0x128 == 0 && dMeter2Info_getMiniGameItemSetFlag() != 1 && + (mItemStatus[i * 2] == BOW || mItemStatus[i * 2] == LIGHT_ARROW || + mItemStatus[i * 2] == ARROW_LV1 || mItemStatus[i * 2] == ARROW_LV2 || + mItemStatus[i * 2] == ARROW_LV3 || mItemStatus[i * 2] == BOMB_BAG_LV1 || + mItemStatus[i * 2] == NORMAL_BOMB || mItemStatus[i * 2] == WATER_BOMB || + mItemStatus[i * 2] == POKE_BOMB || mItemStatus[i * 2] == HAWK_ARROW || + mItemStatus[i * 2] == BOMB_ARROW || mItemStatus[i * 2] == PACHINKO || + mItemStatus[i * 2] == BEE_CHILD)) + { + mpMeterDraw->drawItemNum(i, 1.0f); + } else { + mpMeterDraw->drawItemNum(i, 0.0f); + } + + if (field_0x128 == 0 && mItemStatus[i * 2] == KANTERA) { + mpMeterDraw->drawKanteraMeter(i, 1.0f); + } else { + mpMeterDraw->drawKanteraMeter(i, 0.0f); + } + } + + mpMeterDraw->setAlphaButtonChange(false); } -#pragma pop - -/* ############################################################################################## */ -/* 80454A04-80454A08 003004 0004+00 1/1 0/0 0/0 .sdata2 @9090 */ -SECTION_SDATA2 static f32 lit_9090 = 255.0f; - -/* 80454A08-80454A10 003008 0004+04 1/1 0/0 0/0 .sdata2 @9091 */ -SECTION_SDATA2 static f32 lit_9091[1 + 1 /* padding */] = { - 5.0f, - /* padding */ - 0.0f, -}; /* 802254C0-802256DC 21FE00 021C+00 1/1 0/0 0/0 .text alphaAnimeButtonCross__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::alphaAnimeButtonCross() { - nofralloc -#include "asm/d/meter/d_meter2/alphaAnimeButtonCross__9dMeter2_cFv.s" +void dMeter2_c::alphaAnimeButtonCross() { + if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x100)) || + ((daPy_getPlayerActorClass()->i_getSumouMode() != 0) || (mStatus & 0x100) || + (mStatus & 0x80) || (mStatus & 0x40000000) || (mStatus & 0x1000) || (mStatus & 0x100000) || + (mStatus & 0x80000000) || (mStatus & 8) || (mStatus & 0x10) || (mStatus & 0x01000000) || + (mStatus & 0x20) || (mStatus & 0x04000000) || (mStatus & 0x08000000) || + (mStatus & 0x10000000) || (mStatus & 0x20000000)) || + daPy_getPlayerActorClass()->checkEnemyAttentionLock() || dMeter2Info_isGameStatus(1)) + { + mpMeterDraw->setAlphaButtonCrossAnimeMin(); + + if ((!i_dComIfGp_event_chkEventFlag(0x40) || dMeter2Info_isGameStatus(2) || + (mStatus & 0x100)) && + field_0x190 > 0) + { + field_0x190--; + } + } else if (dMeter2Info_isSub2DStatus(1) || dMeter2Info_isFloatingMessageVisible()) { + mpMeterDraw->setAlphaButtonCrossAnimeMin(); + + if (field_0x190 < 5) { + field_0x190++; + } + } else { + mpMeterDraw->setAlphaButtonCrossAnimeMax(); + + if (field_0x190 < 5) { + field_0x190++; + } + } + + if (mpMap != NULL) { + mpMap->setMapAlpha((field_0x190 * 255.0f) / 5.0f); + } } -#pragma pop /* 802256DC-802258A0 22001C 01C4+00 3/3 0/0 0/0 .text isShowLightDrop__9dMeter2_cFv */ bool dMeter2_c::isShowLightDrop() { if (!g_drawHIO.mLightDrop.mAnimDebug) { - if ((field_0x124 & 0x4000) || - !dComIfGs_isLightDropGetFlag(dComIfGp_getStartStageDarkArea()) || + if ((mStatus & 0x4000) || !dComIfGs_isLightDropGetFlag(dComIfGp_getStartStageDarkArea()) || dMeter2Info_getLightDropGetFlag(dComIfGp_getStartStageDarkArea()) <= 1 || - !dKy_darkworld_check() || ((field_0x124 & 0x40) && dComIfGp_event_checkHind(0x200)) || + !dKy_darkworld_check() || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x200)) || daPy_getPlayerActorClass()->i_getSumouMode() || (daPy_getPlayerActorClass()->checkCanoeSlider() && (dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4)) || - (field_0x124 & 0x40000000) || (field_0x124 & 0x00001000) || - (field_0x124 & 0x00100000) || (field_0x124 & 0x80000000) || - (field_0x124 & 0x00000100) || (field_0x124 & 0x00000080) || - (field_0x124 & 0x00000008) || (field_0x124 & 0x00000010) || - (field_0x124 & 0x01000000) || (field_0x124 & 0x00000020) || - (field_0x124 & 0x04000000) || (field_0x124 & 0x08000000) || - (field_0x124 & 0x10000000) || dMeter2Info_isSub2DStatus(1)) { + (mStatus & 0x40000000) || (mStatus & 0x00001000) || (mStatus & 0x00100000) || + (mStatus & 0x80000000) || (mStatus & 0x00000100) || (mStatus & 0x00000080) || + (mStatus & 0x00000008) || (mStatus & 0x00000010) || (mStatus & 0x01000000) || + (mStatus & 0x00000020) || (mStatus & 0x04000000) || (mStatus & 0x08000000) || + (mStatus & 0x10000000) || dMeter2Info_isSub2DStatus(1)) + { return false; } } + return true; } /* 802258A0-80225960 2201E0 00C0+00 1/1 0/0 0/0 .text killSubContents__9dMeter2_cFUc */ void dMeter2_c::killSubContents(u8 param_0) { - if (mSubContents != param_0 && mSubContents != 0) { + if (mSubContentType != param_0 && mSubContentType != 0) { bool free = false; - if (mpMeterSub != NULL) { - delete mpMeterSub; - mpMeterSub = NULL; + if (mpSubContents != NULL) { + delete mpSubContents; + mpSubContents = NULL; free = true; } - if (mpMeterString != NULL) { - delete mpMeterString; - mpMeterString = NULL; + if (mpSubSubContents != NULL) { + delete mpSubSubContents; + mpSubSubContents = NULL; free = true; } @@ -1347,20 +3280,23 @@ void dMeter2_c::killSubContents(u8 param_0) { mpSubHeap->freeAll(); } - mSubContents = 0; + mSubContentType = 0; mSubContentsStringType = 0; } } /* 80225960-802259F8 2202A0 0098+00 1/1 0/0 0/0 .text isKeyVisible__9dMeter2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2_c::isKeyVisible() { - nofralloc -#include "asm/d/meter/d_meter2/isKeyVisible__9dMeter2_cFv.s" +BOOL dMeter2_c::isKeyVisible() { + if (dStage_stagInfo_ChkKeyDisp(i_dComIfGp_getStage()->getStagInfo())) { + if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_FIELD) { + return dComIfGs_getKeyNum() != 0; + } else { + return true; + } + } + + return false; } -#pragma pop /* 802259F8-80225A64 220338 006C+00 2/2 0/0 0/0 .text isArrowEquip__9dMeter2_cFv */ int dMeter2_c::isArrowEquip() { @@ -1368,7 +3304,8 @@ int dMeter2_c::isArrowEquip() { if (mItemStatus[i * 2] == BOW || mItemStatus[i * 2] == LIGHT_ARROW || mItemStatus[i * 2] == ARROW_LV1 || mItemStatus[i * 2] == ARROW_LV2 || mItemStatus[i * 2] == ARROW_LV3 || mItemStatus[i * 2] == HAWK_ARROW || - mItemStatus[i * 2] == BOMB_ARROW) { + mItemStatus[i * 2] == BOMB_ARROW) + { return i + 1; } } @@ -1382,43 +3319,48 @@ int dMeter2_c::isPachinkoEquip() { return i + 1; } } + return 0; } /* 80225AA0-80225AC0 2203E0 0020+00 1/0 0/0 0/0 .text dMeter2_Draw__FP9dMeter2_c */ -static int dMeter2_Draw(dMeter2_c* p_meter) { - return p_meter->_draw(); +static int dMeter2_Draw(dMeter2_c* i_this) { + return i_this->_draw(); } /* 80225AC0-80225AE0 220400 0020+00 1/0 0/0 0/0 .text dMeter2_Execute__FP9dMeter2_c */ -static int dMeter2_Execute(dMeter2_c* p_meter) { - return p_meter->_execute(); +static int dMeter2_Execute(dMeter2_c* i_this) { + return i_this->_execute(); } /* 80225AE0-80225AE8 220420 0008+00 1/0 0/0 0/0 .text dMeter2_IsDelete__FP9dMeter2_c */ -static int dMeter2_IsDelete(dMeter2_c* p_meter) { +static int dMeter2_IsDelete(dMeter2_c* i_this) { return 1; } /* 80225AE8-80225B08 220428 0020+00 1/0 0/0 0/0 .text dMeter2_Delete__FP9dMeter2_c */ -static int dMeter2_Delete(dMeter2_c* p_meter) { - return p_meter->_delete(); +static int dMeter2_Delete(dMeter2_c* i_this) { + return i_this->_delete(); } /* 80225B08-80225BB8 220448 00B0+00 1/0 0/0 0/0 .text dMeter2_Create__FP9msg_class */ -static int dMeter2_Create(msg_class* meter) { - dMeter2Info_setMeterClass(static_cast(meter)); +static int dMeter2_Create(msg_class* i_this) { + dMeter2Info_setMeterClass(static_cast(i_this)); dComIfGp_2dShowOn(); - fopMsgM_Create(0x314, NULL, NULL); + fopMsgM_Create(PROC_MENUWINDOW, NULL, NULL); + g_drawHIO.field_0x4 = -1; g_ringHIO.field_0x4 = -1; g_fmapHIO.field_0x4 = -1; g_cursorHIO.field_0x4 = -1; - u32 id = fopMsgM_Create(0x313, NULL, NULL); + + u32 id = fopMsgM_Create(PROC_MSG_OBJECT, NULL, NULL); fopMsgM_setMessageID(id); + dTimer_createStockTimer(); - fopMsgM_setStageLayer(meter); - return static_cast(meter)->_create(); + fopMsgM_setStageLayer(i_this); + + return static_cast(i_this)->_create(); } /* ############################################################################################## */ @@ -1431,13 +3373,18 @@ SECTION_DATA static leafdraw_method_class l_dMeter2_Method = { /* 803BFA68-803BFA90 -00001 0028+00 0/0 0/0 1/0 .data g_profile_METER2 */ SECTION_DATA extern msg_process_profile_definition g_profile_METER2 = { - -3, 12, - -3, 0x0316, - 0, (process_method_class*)&g_fpcLf_Method, - 0x4C0, 0, - 0, &g_fopMsg_Method, - 0x0301, 0, - 0, &l_dMeter2_Method + -3, + 12, + -3, + PROC_METER2, + 0, + (process_method_class*)&g_fpcLf_Method, + sizeof(dMeter2_c), + 0, + 0, + &g_fopMsg_Method, + 0x0301, + 0, + 0, + &l_dMeter2_Method, }; - -/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp index 32d6b2b72e..3996be653e 100644 --- a/src/d/meter/d_meter2_draw.cpp +++ b/src/d/meter/d_meter2_draw.cpp @@ -2105,7 +2105,7 @@ asm void dMeter2Draw_c::drawButtonXY(int param_0, u8 param_1, u8 param_2, bool p #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMeter2Draw_c::getButtonCrossParentInitTransY() { +asm f32 dMeter2Draw_c::getButtonCrossParentInitTransY() { nofralloc #include "asm/d/meter/d_meter2_draw/getButtonCrossParentInitTransY__13dMeter2Draw_cFv.s" } @@ -2332,7 +2332,7 @@ static u8 i_text_buf[32]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMeter2Draw_c::getActionString(u8 param_0, u8 param_1, u8* param_2) { +asm char* dMeter2Draw_c::getActionString(u8 param_0, u8 param_1, u8* param_2) { nofralloc #include "asm/d/meter/d_meter2_draw/getActionString__13dMeter2Draw_cFUcUcPUc.s" } @@ -2687,7 +2687,7 @@ bool dMeter2Draw_c::getCanoeFishing() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMeter2Draw_c::getCameraSubject() { +asm bool dMeter2Draw_c::getCameraSubject() { nofralloc #include "asm/d/meter/d_meter2_draw/getCameraSubject__13dMeter2Draw_cFv.s" } @@ -2698,7 +2698,7 @@ asm void dMeter2Draw_c::getCameraSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMeter2Draw_c::getItemSubject() { +asm bool dMeter2Draw_c::getItemSubject() { nofralloc #include "asm/d/meter/d_meter2_draw/getItemSubject__13dMeter2Draw_cFv.s" } @@ -2714,7 +2714,7 @@ bool dMeter2Draw_c::getPlayerSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMeter2Draw_c::isBButtonShow(bool param_0) { +asm bool dMeter2Draw_c::isBButtonShow(bool param_0) { nofralloc #include "asm/d/meter/d_meter2_draw/isBButtonShow__13dMeter2Draw_cFb.s" } diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp index d34a0f812e..1220885d76 100644 --- a/src/d/meter/d_meter2_info.cpp +++ b/src/d/meter/d_meter2_info.cpp @@ -326,7 +326,7 @@ int dMeter2Info_c::setFloatingFlow(u16 flowID, s16 msgTimer, bool wakuVisible) { /* 8021C1DC-8021C1F0 216B1C 0014+00 0/0 4/4 0/0 .text isFloatingMessageVisible__13dMeter2Info_cFv */ -int dMeter2Info_c::isFloatingMessageVisible() { +bool dMeter2Info_c::isFloatingMessageVisible() { return mFloatingMessageTimer > 0; } diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp index d2a47d6bf0..d41a15a655 100644 --- a/src/d/meter/d_meter_HIO.cpp +++ b/src/d/meter/d_meter_HIO.cpp @@ -877,19 +877,19 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mAButtonAlpha = 1.0f; mAButtonPosX = 0.0f; mAButtonPosY = 0.0f; - mAButtonTalkScale = 1.0f; - mAButtonTalkPosX = 0.0f; - mAButtonTalkPosY = -63.0f; + mAButtonTalkScale[0] = 1.0f; + mAButtonTalkPosX[0] = 0.0f; + mAButtonTalkPosY[0] = -63.0f; mAButtonTalkAScale = 1.0f; - mAButtonTalkAPosX = 0.0f; - mAButtonTalkAPosY = -49.0f; + mAButtonTalkAPosX[0] = 0.0f; + mAButtonTalkAPosY[0] = -49.0f; - mAButtonFontTalkScale = 1.0f; - mAButtonFontTalkPosX = -20.0f; - mAButtonFontTalkPosY = -62.0f; + mAButtonTalkScale[1] = 1.0f; + mAButtonTalkPosX[1] = -20.0f; + mAButtonTalkPosY[1] = -62.0f; mAButtonFontTalkAScale = 1.0f; - mAButtonFontTalkAPosX = -20.0f; - mAButtonFontTalkAPosY = -48.0f; + mAButtonTalkAPosX[1] = -20.0f; + mAButtonTalkAPosY[1] = -48.0f; mAButtonVesselPosX = 0.0f; mAButtonVesselPosY = 0.0f; @@ -898,13 +898,13 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mBButtonAlpha = 1.0f; mBButtonPosX = -2.2f; mBButtonPosY = -1.3f; - mBButtonTalkScale = 1.0f; - mBButtonTalkPosX = 0.0f; - mBButtonTalkPosY = -62.0f; + mBButtonTalkScale[0] = 1.0f; + mBButtonTalkPosX[0] = 0.0f; + mBButtonTalkPosY[0] = -62.0f; - mBButtonFontTalkScale = 1.0f; - mBButtonFontTalkPosX = -9.2f; - mBButtonFontTalkPosY = -65.0f; + mBButtonTalkScale[1] = 1.0f; + mBButtonTalkPosX[1] = -9.2f; + mBButtonTalkPosY[1] = -65.0f; mBButtonWolfPosX = 0.0f; mBButtonWolfPosY = 0.0f; @@ -1014,24 +1014,24 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mBItemBaseAlpha[0] = 0.5f; mBItemBaseAlpha[1] = 0.5f; - mXButtonItemBaseScale = 1.5f; - mXButtonItemBasePosX = 14.0f; - mXButtonItemBasePosY = -12.0f; + mXButtonItemBaseScale[0] = 1.5f; + mXButtonItemBasePosX[0] = 14.0f; + mXButtonItemBasePosY[0] = -12.0f; mXButtonItemBaseAlpha[0] = 0.5f; - mXButtonItemBaseNoItemScale = 1.5f; - mXButtonItemBaseNoItemPosX = 0.0f; - mXButtonItemBaseNoItemPosY = 0.0f; + mXButtonItemBaseScale[1] = 1.5f; + mXButtonItemBasePosX[1] = 0.0f; + mXButtonItemBasePosY[1] = 0.0f; mXButtonItemBaseAlpha[1] = 1.0f; - mYButtonItemBaseScale = 1.5f; - mYButtonItemBasePosX = -15.0f; - mYButtonItemBasePosY = -12.0f; + mYButtonItemBaseScale[0] = 1.5f; + mYButtonItemBasePosX[0] = -15.0f; + mYButtonItemBasePosY[0] = -12.0f; mYButtonItemBaseAlpha[0] = 0.5f; - mYButtonItemBaseNoItemScale = 1.5f; - mYButtonItemBaseNoItemPosX = 0.0f; - mYButtonItemBaseNoItemPosY = 0.0f; + mYButtonItemBaseScale[1] = 1.5f; + mYButtonItemBasePosX[1] = 0.0f; + mYButtonItemBasePosY[1] = 0.0f; mYButtonItemBaseAlpha[1] = 0.5f; field_0x280 = 1.5f;