diff --git a/asm/d/d_bright_check/__ct__14dBrightCheck_cFP10JKRArchive.s b/asm/d/d_bright_check/__ct__14dBrightCheck_cFP10JKRArchive.s deleted file mode 100644 index a2e1518e7c9..00000000000 --- a/asm/d/d_bright_check/__ct__14dBrightCheck_cFP10JKRArchive.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80192F10: -/* 80192F10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80192F14 7C 08 02 A6 */ mflr r0 -/* 80192F18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80192F1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80192F20 7C 7F 1B 78 */ mr r31, r3 -/* 80192F24 3C 60 80 3C */ lis r3, __vt__14dBrightCheck_c@ha /* 0x803BB5FC@ha */ -/* 80192F28 38 03 B5 FC */ addi r0, r3, __vt__14dBrightCheck_c@l /* 0x803BB5FC@l */ -/* 80192F2C 90 1F 00 00 */ stw r0, 0(r31) -/* 80192F30 3C 60 80 3A */ lis r3, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 80192F34 38 03 6F 88 */ addi r0, r3, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 80192F38 90 1F 00 08 */ stw r0, 8(r31) -/* 80192F3C 3C 60 80 3C */ lis r3, __vt__19dDlst_BrightCheck_c@ha /* 0x803BB5EC@ha */ -/* 80192F40 38 03 B5 EC */ addi r0, r3, __vt__19dDlst_BrightCheck_c@l /* 0x803BB5EC@l */ -/* 80192F44 90 1F 00 08 */ stw r0, 8(r31) -/* 80192F48 90 9F 00 04 */ stw r4, 4(r31) -/* 80192F4C 38 60 00 2C */ li r3, 0x2c -/* 80192F50 48 13 BC FD */ bl __nw__FUl -/* 80192F54 7C 60 1B 79 */ or. r0, r3, r3 -/* 80192F58 41 82 00 0C */ beq lbl_80192F64 -/* 80192F5C 48 0B 6C C5 */ bl __ct__12dMsgString_cFv -/* 80192F60 7C 60 1B 78 */ mr r0, r3 -lbl_80192F64: -/* 80192F64 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80192F68 7F E3 FB 78 */ mr r3, r31 -/* 80192F6C 48 00 00 C5 */ bl screenSet__14dBrightCheck_cFv -/* 80192F70 38 00 00 00 */ li r0, 0 -/* 80192F74 98 1F 00 19 */ stb r0, 0x19(r31) -/* 80192F78 38 00 00 01 */ li r0, 1 -/* 80192F7C 98 1F 00 18 */ stb r0, 0x18(r31) -/* 80192F80 7F E3 FB 78 */ mr r3, r31 -/* 80192F84 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80192F88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80192F8C 7C 08 03 A6 */ mtlr r0 -/* 80192F90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80192F94 4E 80 00 20 */ blr diff --git a/asm/d/d_bright_check/__dt__14dBrightCheck_cFv.s b/asm/d/d_bright_check/__dt__14dBrightCheck_cFv.s deleted file mode 100644 index bfa221b262e..00000000000 --- a/asm/d/d_bright_check/__dt__14dBrightCheck_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80192F98: -/* 80192F98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80192F9C 7C 08 02 A6 */ mflr r0 -/* 80192FA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80192FA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80192FA8 93 C1 00 08 */ stw r30, 8(r1) -/* 80192FAC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80192FB0 7C 9F 23 78 */ mr r31, r4 -/* 80192FB4 41 82 00 60 */ beq lbl_80193014 -/* 80192FB8 3C 60 80 3C */ lis r3, __vt__14dBrightCheck_c@ha /* 0x803BB5FC@ha */ -/* 80192FBC 38 03 B5 FC */ addi r0, r3, __vt__14dBrightCheck_c@l /* 0x803BB5FC@l */ -/* 80192FC0 90 1E 00 00 */ stw r0, 0(r30) -/* 80192FC4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80192FC8 28 03 00 00 */ cmplwi r3, 0 -/* 80192FCC 41 82 00 18 */ beq lbl_80192FE4 -/* 80192FD0 38 80 00 01 */ li r4, 1 -/* 80192FD4 81 83 00 00 */ lwz r12, 0(r3) -/* 80192FD8 81 8C 00 08 */ lwz r12, 8(r12) -/* 80192FDC 7D 89 03 A6 */ mtctr r12 -/* 80192FE0 4E 80 04 21 */ bctrl -lbl_80192FE4: -/* 80192FE4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 80192FE8 38 80 00 01 */ li r4, 1 -/* 80192FEC 48 0B 6D 3D */ bl __dt__12dMsgString_cFv -/* 80192FF0 34 1E 00 08 */ addic. r0, r30, 8 -/* 80192FF4 41 82 00 10 */ beq lbl_80193004 -/* 80192FF8 3C 60 80 3C */ lis r3, __vt__19dDlst_BrightCheck_c@ha /* 0x803BB5EC@ha */ -/* 80192FFC 38 03 B5 EC */ addi r0, r3, __vt__19dDlst_BrightCheck_c@l /* 0x803BB5EC@l */ -/* 80193000 90 1E 00 08 */ stw r0, 8(r30) -lbl_80193004: -/* 80193004 7F E0 07 35 */ extsh. r0, r31 -/* 80193008 40 81 00 0C */ ble lbl_80193014 -/* 8019300C 7F C3 F3 78 */ mr r3, r30 -/* 80193010 48 13 BD 2D */ bl __dl__FPv -lbl_80193014: -/* 80193014 7F C3 F3 78 */ mr r3, r30 -/* 80193018 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8019301C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80193020 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80193024 7C 08 03 A6 */ mtlr r0 -/* 80193028 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019302C 4E 80 00 20 */ blr diff --git a/asm/d/d_bright_check/__dt__19dDlst_BrightCheck_cFv.s b/asm/d/d_bright_check/__dt__19dDlst_BrightCheck_cFv.s deleted file mode 100644 index f4bc53d3b7f..00000000000 --- a/asm/d/d_bright_check/__dt__19dDlst_BrightCheck_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80193648: -/* 80193648 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019364C 7C 08 02 A6 */ mflr r0 -/* 80193650 90 01 00 14 */ stw r0, 0x14(r1) -/* 80193654 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80193658 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8019365C 41 82 00 1C */ beq lbl_80193678 -/* 80193660 3C A0 80 3C */ lis r5, __vt__19dDlst_BrightCheck_c@ha /* 0x803BB5EC@ha */ -/* 80193664 38 05 B5 EC */ addi r0, r5, __vt__19dDlst_BrightCheck_c@l /* 0x803BB5EC@l */ -/* 80193668 90 1F 00 00 */ stw r0, 0(r31) -/* 8019366C 7C 80 07 35 */ extsh. r0, r4 -/* 80193670 40 81 00 08 */ ble lbl_80193678 -/* 80193674 48 13 B6 C9 */ bl __dl__FPv -lbl_80193678: -/* 80193678 7F E3 FB 78 */ mr r3, r31 -/* 8019367C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80193680 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80193684 7C 08 03 A6 */ mtlr r0 -/* 80193688 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019368C 4E 80 00 20 */ blr diff --git a/asm/d/d_bright_check/__sinit_d_bright_check_cpp.s b/asm/d/d_bright_check/__sinit_d_bright_check_cpp.s deleted file mode 100644 index 02422642c59..00000000000 --- a/asm/d/d_bright_check/__sinit_d_bright_check_cpp.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80193608: -/* 80193608 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803BB5B0@ha */ -/* 8019360C 38 A3 B5 B0 */ addi r5, r3, cNullVec__6Z2Calc@l /* 0x803BB5B0@l */ -/* 80193610 80 65 00 0C */ lwz r3, 0xc(r5) -/* 80193614 80 05 00 10 */ lwz r0, 0x10(r5) -/* 80193618 90 65 00 24 */ stw r3, 0x24(r5) -/* 8019361C 90 05 00 28 */ stw r0, 0x28(r5) -/* 80193620 80 05 00 14 */ lwz r0, 0x14(r5) -/* 80193624 90 05 00 2C */ stw r0, 0x2c(r5) -/* 80193628 38 85 00 24 */ addi r4, r5, 0x24 -/* 8019362C 80 65 00 18 */ lwz r3, 0x18(r5) -/* 80193630 80 05 00 1C */ lwz r0, 0x1c(r5) -/* 80193634 90 64 00 0C */ stw r3, 0xc(r4) -/* 80193638 90 04 00 10 */ stw r0, 0x10(r4) -/* 8019363C 80 05 00 20 */ lwz r0, 0x20(r5) -/* 80193640 90 04 00 14 */ stw r0, 0x14(r4) -/* 80193644 4E 80 00 20 */ blr diff --git a/asm/d/d_bright_check/_draw__14dBrightCheck_cFv.s b/asm/d/d_bright_check/_draw__14dBrightCheck_cFv.s deleted file mode 100644 index 97641f1df3c..00000000000 --- a/asm/d/d_bright_check/_draw__14dBrightCheck_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80193594: -/* 80193594 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80193598 7C 08 02 A6 */ mflr r0 -/* 8019359C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801935A0 7C 66 1B 78 */ mr r6, r3 -/* 801935A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801935A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801935AC 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801935B0 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801935B4 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801935B8 38 C6 00 08 */ addi r6, r6, 8 -/* 801935BC 4B EC 31 D9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 801935C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801935C4 7C 08 03 A6 */ mtlr r0 -/* 801935C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801935CC 4E 80 00 20 */ blr diff --git a/asm/d/d_bright_check/draw__19dDlst_BrightCheck_cFv.s b/asm/d/d_bright_check/draw__19dDlst_BrightCheck_cFv.s deleted file mode 100644 index ae4c066b578..00000000000 --- a/asm/d/d_bright_check/draw__19dDlst_BrightCheck_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_801935D0: -/* 801935D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801935D4 7C 08 02 A6 */ mflr r0 -/* 801935D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801935DC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801935E0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801935E4 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 801935E8 80 63 00 04 */ lwz r3, 4(r3) -/* 801935EC C0 22 A0 00 */ lfs f1, lit_3792(r2) -/* 801935F0 FC 40 08 90 */ fmr f2, f1 -/* 801935F4 48 16 58 E1 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 801935F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801935FC 7C 08 03 A6 */ mtlr r0 -/* 80193600 38 21 00 10 */ addi r1, r1, 0x10 -/* 80193604 4E 80 00 20 */ blr diff --git a/asm/d/d_bright_check/screenSet__14dBrightCheck_cFv.s b/asm/d/d_bright_check/screenSet__14dBrightCheck_cFv.s deleted file mode 100644 index f899740a6f8..00000000000 --- a/asm/d/d_bright_check/screenSet__14dBrightCheck_cFv.s +++ /dev/null @@ -1,306 +0,0 @@ -lbl_80193030: -/* 80193030 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80193034 7C 08 02 A6 */ mflr r0 -/* 80193038 90 01 00 64 */ stw r0, 0x64(r1) -/* 8019303C DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80193040 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80193044 39 61 00 50 */ addi r11, r1, 0x50 -/* 80193048 48 1C F1 79 */ bl _savegpr_22 -/* 8019304C 7C 7E 1B 78 */ mr r30, r3 -/* 80193050 3C 60 80 39 */ lis r3, tv_btnA@ha /* 0x80394910@ha */ -/* 80193054 3B E3 49 10 */ addi r31, r3, tv_btnA@l /* 0x80394910@l */ -/* 80193058 38 60 01 18 */ li r3, 0x118 -/* 8019305C 48 13 BB F1 */ bl __nw__FUl -/* 80193060 7C 60 1B 79 */ or. r0, r3, r3 -/* 80193064 41 82 00 0C */ beq lbl_80193070 -/* 80193068 48 16 54 31 */ bl __ct__9J2DScreenFv -/* 8019306C 7C 60 1B 78 */ mr r0, r3 -lbl_80193070: -/* 80193070 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80193074 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80193078 3C 80 80 39 */ lis r4, d_d_bright_check__stringBase0@ha /* 0x803949D8@ha */ -/* 8019307C 38 84 49 D8 */ addi r4, r4, d_d_bright_check__stringBase0@l /* 0x803949D8@l */ -/* 80193080 3C A0 01 10 */ lis r5, 0x110 -/* 80193084 80 DE 00 04 */ lwz r6, 4(r30) -/* 80193088 48 16 55 C1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 8019308C 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80193090 3C 80 74 6E */ lis r4, 0x746E /* 0x746E5F6E@ha */ -/* 80193094 38 C4 5F 6E */ addi r6, r4, 0x5F6E /* 0x746E5F6E@l */ -/* 80193098 3C 80 67 5F */ lis r4, 0x675F /* 0x675F6162@ha */ -/* 8019309C 38 A4 61 62 */ addi r5, r4, 0x6162 /* 0x675F6162@l */ -/* 801930A0 81 83 00 00 */ lwz r12, 0(r3) -/* 801930A4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801930A8 7D 89 03 A6 */ mtctr r12 -/* 801930AC 4E 80 04 21 */ bctrl -/* 801930B0 38 00 00 00 */ li r0, 0 -/* 801930B4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801930B8 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801930BC 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F743030@ha */ -/* 801930C0 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x5F743030@l */ -/* 801930C4 38 A0 00 66 */ li r5, 0x66 -/* 801930C8 81 83 00 00 */ lwz r12, 0(r3) -/* 801930CC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801930D0 7D 89 03 A6 */ mtctr r12 -/* 801930D4 4E 80 04 21 */ bctrl -/* 801930D8 7C 77 1B 78 */ mr r23, r3 -/* 801930DC 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801930E0 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F743030@ha */ -/* 801930E4 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x5F743030@l */ -/* 801930E8 38 A0 00 66 */ li r5, 0x66 -/* 801930EC 81 83 00 00 */ lwz r12, 0(r3) -/* 801930F0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801930F4 7D 89 03 A6 */ mtctr r12 -/* 801930F8 4E 80 04 21 */ bctrl -/* 801930FC 38 00 00 01 */ li r0, 1 -/* 80193100 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80193104 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80193108 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F743030@ha */ -/* 8019310C 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x5F743030@l */ -/* 80193110 38 A0 00 74 */ li r5, 0x74 -/* 80193114 81 83 00 00 */ lwz r12, 0(r3) -/* 80193118 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8019311C 7D 89 03 A6 */ mtctr r12 -/* 80193120 4E 80 04 21 */ bctrl -/* 80193124 38 00 00 00 */ li r0, 0 -/* 80193128 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8019312C 4B E8 19 D9 */ bl mDoExt_getRubyFont__Fv -/* 80193130 7C 64 1B 78 */ mr r4, r3 -/* 80193134 7E E3 BB 78 */ mr r3, r23 -/* 80193138 81 97 00 00 */ lwz r12, 0(r23) -/* 8019313C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80193140 7D 89 03 A6 */ mtctr r12 -/* 80193144 4E 80 04 21 */ bctrl -/* 80193148 7E E3 BB 78 */ mr r3, r23 -/* 8019314C 38 80 00 40 */ li r4, 0x40 -/* 80193150 3C A0 80 39 */ lis r5, d_d_bright_check__stringBase0@ha /* 0x803949D8@ha */ -/* 80193154 38 A5 49 D8 */ addi r5, r5, d_d_bright_check__stringBase0@l /* 0x803949D8@l */ -/* 80193158 38 A5 00 17 */ addi r5, r5, 0x17 -/* 8019315C 4C C6 31 82 */ crclr 6 -/* 80193160 48 16 D5 ED */ bl setString__10J2DTextBoxFsPCce -/* 80193164 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 80193168 38 80 05 5C */ li r4, 0x55c -/* 8019316C 7E E5 BB 78 */ mr r5, r23 -/* 80193170 38 C0 00 00 */ li r6, 0 -/* 80193174 38 E0 00 00 */ li r7, 0 -/* 80193178 39 00 00 00 */ li r8, 0 -/* 8019317C 39 20 00 00 */ li r9, 0 -/* 80193180 81 83 00 00 */ lwz r12, 0(r3) -/* 80193184 81 8C 00 08 */ lwz r12, 8(r12) -/* 80193188 7D 89 03 A6 */ mtctr r12 -/* 8019318C 4E 80 04 21 */ bctrl -/* 80193190 3A C0 00 00 */ li r22, 0 -/* 80193194 3B A0 00 00 */ li r29, 0 -/* 80193198 3B 80 00 00 */ li r28, 0 -/* 8019319C 3B 3F 00 28 */ addi r25, r31, 0x28 -/* 801931A0 3B 01 00 08 */ addi r24, r1, 8 -/* 801931A4 3B 5F 00 00 */ addi r26, r31, 0 -/* 801931A8 3C 60 80 39 */ lis r3, d_d_bright_check__stringBase0@ha /* 0x803949D8@ha */ -/* 801931AC 3B 63 49 D8 */ addi r27, r3, d_d_bright_check__stringBase0@l /* 0x803949D8@l */ -lbl_801931B0: -/* 801931B0 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801931B4 7C D9 E2 14 */ add r6, r25, r28 -/* 801931B8 80 A6 00 00 */ lwz r5, 0(r6) -/* 801931BC 80 C6 00 04 */ lwz r6, 4(r6) -/* 801931C0 81 83 00 00 */ lwz r12, 0(r3) -/* 801931C4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801931C8 7D 89 03 A6 */ mtctr r12 -/* 801931CC 4E 80 04 21 */ bctrl -/* 801931D0 7C 78 E9 2E */ stwx r3, r24, r29 -/* 801931D4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801931D8 7C DA E2 14 */ add r6, r26, r28 -/* 801931DC 80 A6 00 00 */ lwz r5, 0(r6) -/* 801931E0 80 C6 00 04 */ lwz r6, 4(r6) -/* 801931E4 81 83 00 00 */ lwz r12, 0(r3) -/* 801931E8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801931EC 7D 89 03 A6 */ mtctr r12 -/* 801931F0 4E 80 04 21 */ bctrl -/* 801931F4 38 00 00 00 */ li r0, 0 -/* 801931F8 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801931FC 4B E8 17 F5 */ bl mDoExt_getMesgFont__Fv -/* 80193200 7C 64 1B 78 */ mr r4, r3 -/* 80193204 7E F8 E8 2E */ lwzx r23, r24, r29 -/* 80193208 7E E3 BB 78 */ mr r3, r23 -/* 8019320C 81 97 00 00 */ lwz r12, 0(r23) -/* 80193210 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80193214 7D 89 03 A6 */ mtctr r12 -/* 80193218 4E 80 04 21 */ bctrl -/* 8019321C 7E E3 BB 78 */ mr r3, r23 -/* 80193220 38 80 00 40 */ li r4, 0x40 -/* 80193224 38 BB 00 17 */ addi r5, r27, 0x17 -/* 80193228 4C C6 31 82 */ crclr 6 -/* 8019322C 48 16 D5 21 */ bl setString__10J2DTextBoxFsPCce -/* 80193230 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 80193234 38 80 05 64 */ li r4, 0x564 -/* 80193238 7E E5 BB 78 */ mr r5, r23 -/* 8019323C 38 C0 00 00 */ li r6, 0 -/* 80193240 38 E0 00 00 */ li r7, 0 -/* 80193244 39 00 00 00 */ li r8, 0 -/* 80193248 39 20 00 00 */ li r9, 0 -/* 8019324C 81 83 00 00 */ lwz r12, 0(r3) -/* 80193250 81 8C 00 08 */ lwz r12, 8(r12) -/* 80193254 7D 89 03 A6 */ mtctr r12 -/* 80193258 4E 80 04 21 */ bctrl -/* 8019325C 3A D6 00 01 */ addi r22, r22, 1 -/* 80193260 2C 16 00 05 */ cmpwi r22, 5 -/* 80193264 3B BD 00 04 */ addi r29, r29, 4 -/* 80193268 3B 9C 00 08 */ addi r28, r28, 8 -/* 8019326C 41 80 FF 44 */ blt lbl_801931B0 -/* 80193270 3A C0 00 00 */ li r22, 0 -/* 80193274 3B A0 00 00 */ li r29, 0 -/* 80193278 3B 7F 00 A0 */ addi r27, r31, 0xa0 -/* 8019327C 3B 80 00 00 */ li r28, 0 -lbl_80193280: -/* 80193280 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80193284 7C DB EA 14 */ add r6, r27, r29 -/* 80193288 80 A6 00 00 */ lwz r5, 0(r6) -/* 8019328C 80 C6 00 04 */ lwz r6, 4(r6) -/* 80193290 81 83 00 00 */ lwz r12, 0(r3) -/* 80193294 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80193298 7D 89 03 A6 */ mtctr r12 -/* 8019329C 4E 80 04 21 */ bctrl -/* 801932A0 9B 83 00 B0 */ stb r28, 0xb0(r3) -/* 801932A4 3A D6 00 01 */ addi r22, r22, 1 -/* 801932A8 2C 16 00 05 */ cmpwi r22, 5 -/* 801932AC 3B BD 00 08 */ addi r29, r29, 8 -/* 801932B0 41 80 FF D0 */ blt lbl_80193280 -/* 801932B4 3A C0 00 00 */ li r22, 0 -/* 801932B8 3B A0 00 00 */ li r29, 0 -/* 801932BC 3B 9F 00 50 */ addi r28, r31, 0x50 -/* 801932C0 C3 E2 A0 00 */ lfs f31, lit_3792(r2) -lbl_801932C4: -/* 801932C4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801932C8 7C DC EA 14 */ add r6, r28, r29 -/* 801932CC 80 A6 00 00 */ lwz r5, 0(r6) -/* 801932D0 80 C6 00 04 */ lwz r6, 4(r6) -/* 801932D4 81 83 00 00 */ lwz r12, 0(r3) -/* 801932D8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801932DC 7D 89 03 A6 */ mtctr r12 -/* 801932E0 4E 80 04 21 */ bctrl -/* 801932E4 7C 77 1B 78 */ mr r23, r3 -/* 801932E8 4B E8 17 09 */ bl mDoExt_getMesgFont__Fv -/* 801932EC 7C 64 1B 78 */ mr r4, r3 -/* 801932F0 7E E3 BB 78 */ mr r3, r23 -/* 801932F4 81 97 00 00 */ lwz r12, 0(r23) -/* 801932F8 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801932FC 7D 89 03 A6 */ mtctr r12 -/* 80193300 4E 80 04 21 */ bctrl -/* 80193304 D3 F7 01 14 */ stfs f31, 0x114(r23) -/* 80193308 2C 16 00 02 */ cmpwi r22, 2 -/* 8019330C 40 80 00 50 */ bge lbl_8019335C -/* 80193310 7E E3 BB 78 */ mr r3, r23 -/* 80193314 38 80 01 00 */ li r4, 0x100 -/* 80193318 3C A0 80 39 */ lis r5, d_d_bright_check__stringBase0@ha /* 0x803949D8@ha */ -/* 8019331C 38 A5 49 D8 */ addi r5, r5, d_d_bright_check__stringBase0@l /* 0x803949D8@l */ -/* 80193320 38 A5 00 17 */ addi r5, r5, 0x17 -/* 80193324 4C C6 31 82 */ crclr 6 -/* 80193328 48 16 D4 25 */ bl setString__10J2DTextBoxFsPCce -/* 8019332C 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 80193330 38 80 05 58 */ li r4, 0x558 -/* 80193334 7E E5 BB 78 */ mr r5, r23 -/* 80193338 38 C0 00 00 */ li r6, 0 -/* 8019333C 38 E0 00 00 */ li r7, 0 -/* 80193340 39 00 00 00 */ li r8, 0 -/* 80193344 39 20 00 00 */ li r9, 0 -/* 80193348 81 83 00 00 */ lwz r12, 0(r3) -/* 8019334C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80193350 7D 89 03 A6 */ mtctr r12 -/* 80193354 4E 80 04 21 */ bctrl -/* 80193358 48 00 01 48 */ b lbl_801934A0 -lbl_8019335C: -/* 8019335C 2C 16 00 04 */ cmpwi r22, 4 -/* 80193360 40 80 00 50 */ bge lbl_801933B0 -/* 80193364 7E E3 BB 78 */ mr r3, r23 -/* 80193368 38 80 01 00 */ li r4, 0x100 -/* 8019336C 3C A0 80 39 */ lis r5, d_d_bright_check__stringBase0@ha /* 0x803949D8@ha */ -/* 80193370 38 A5 49 D8 */ addi r5, r5, d_d_bright_check__stringBase0@l /* 0x803949D8@l */ -/* 80193374 38 A5 00 17 */ addi r5, r5, 0x17 -/* 80193378 4C C6 31 82 */ crclr 6 -/* 8019337C 48 16 D3 D1 */ bl setString__10J2DTextBoxFsPCce -/* 80193380 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 80193384 38 80 05 57 */ li r4, 0x557 -/* 80193388 7E E5 BB 78 */ mr r5, r23 -/* 8019338C 38 C0 00 00 */ li r6, 0 -/* 80193390 38 E0 00 00 */ li r7, 0 -/* 80193394 39 00 00 00 */ li r8, 0 -/* 80193398 39 20 00 00 */ li r9, 0 -/* 8019339C 81 83 00 00 */ lwz r12, 0(r3) -/* 801933A0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801933A4 7D 89 03 A6 */ mtctr r12 -/* 801933A8 4E 80 04 21 */ bctrl -/* 801933AC 48 00 00 F4 */ b lbl_801934A0 -lbl_801933B0: -/* 801933B0 2C 16 00 06 */ cmpwi r22, 6 -/* 801933B4 40 80 00 50 */ bge lbl_80193404 -/* 801933B8 7E E3 BB 78 */ mr r3, r23 -/* 801933BC 38 80 01 00 */ li r4, 0x100 -/* 801933C0 3C A0 80 39 */ lis r5, d_d_bright_check__stringBase0@ha /* 0x803949D8@ha */ -/* 801933C4 38 A5 49 D8 */ addi r5, r5, d_d_bright_check__stringBase0@l /* 0x803949D8@l */ -/* 801933C8 38 A5 00 17 */ addi r5, r5, 0x17 -/* 801933CC 4C C6 31 82 */ crclr 6 -/* 801933D0 48 16 D3 7D */ bl setString__10J2DTextBoxFsPCce -/* 801933D4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801933D8 38 80 05 59 */ li r4, 0x559 -/* 801933DC 7E E5 BB 78 */ mr r5, r23 -/* 801933E0 38 C0 00 00 */ li r6, 0 -/* 801933E4 38 E0 00 00 */ li r7, 0 -/* 801933E8 39 00 00 00 */ li r8, 0 -/* 801933EC 39 20 00 00 */ li r9, 0 -/* 801933F0 81 83 00 00 */ lwz r12, 0(r3) -/* 801933F4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801933F8 7D 89 03 A6 */ mtctr r12 -/* 801933FC 4E 80 04 21 */ bctrl -/* 80193400 48 00 00 A0 */ b lbl_801934A0 -lbl_80193404: -/* 80193404 2C 16 00 08 */ cmpwi r22, 8 -/* 80193408 40 80 00 50 */ bge lbl_80193458 -/* 8019340C 7E E3 BB 78 */ mr r3, r23 -/* 80193410 38 80 01 00 */ li r4, 0x100 -/* 80193414 3C A0 80 39 */ lis r5, d_d_bright_check__stringBase0@ha /* 0x803949D8@ha */ -/* 80193418 38 A5 49 D8 */ addi r5, r5, d_d_bright_check__stringBase0@l /* 0x803949D8@l */ -/* 8019341C 38 A5 00 17 */ addi r5, r5, 0x17 -/* 80193420 4C C6 31 82 */ crclr 6 -/* 80193424 48 16 D3 29 */ bl setString__10J2DTextBoxFsPCce -/* 80193428 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 8019342C 38 80 05 5A */ li r4, 0x55a -/* 80193430 7E E5 BB 78 */ mr r5, r23 -/* 80193434 38 C0 00 00 */ li r6, 0 -/* 80193438 38 E0 00 00 */ li r7, 0 -/* 8019343C 39 00 00 00 */ li r8, 0 -/* 80193440 39 20 00 00 */ li r9, 0 -/* 80193444 81 83 00 00 */ lwz r12, 0(r3) -/* 80193448 81 8C 00 08 */ lwz r12, 8(r12) -/* 8019344C 7D 89 03 A6 */ mtctr r12 -/* 80193450 4E 80 04 21 */ bctrl -/* 80193454 48 00 00 4C */ b lbl_801934A0 -lbl_80193458: -/* 80193458 7E E3 BB 78 */ mr r3, r23 -/* 8019345C 38 80 01 00 */ li r4, 0x100 -/* 80193460 3C A0 80 39 */ lis r5, d_d_bright_check__stringBase0@ha /* 0x803949D8@ha */ -/* 80193464 38 A5 49 D8 */ addi r5, r5, d_d_bright_check__stringBase0@l /* 0x803949D8@l */ -/* 80193468 38 A5 00 17 */ addi r5, r5, 0x17 -/* 8019346C 4C C6 31 82 */ crclr 6 -/* 80193470 48 16 D2 DD */ bl setString__10J2DTextBoxFsPCce -/* 80193474 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 80193478 38 80 05 5B */ li r4, 0x55b -/* 8019347C 7E E5 BB 78 */ mr r5, r23 -/* 80193480 38 C0 00 00 */ li r6, 0 -/* 80193484 38 E0 00 00 */ li r7, 0 -/* 80193488 39 00 00 00 */ li r8, 0 -/* 8019348C 39 20 00 00 */ li r9, 0 -/* 80193490 81 83 00 00 */ lwz r12, 0(r3) -/* 80193494 81 8C 00 08 */ lwz r12, 8(r12) -/* 80193498 7D 89 03 A6 */ mtctr r12 -/* 8019349C 4E 80 04 21 */ bctrl -lbl_801934A0: -/* 801934A0 3A D6 00 01 */ addi r22, r22, 1 -/* 801934A4 2C 16 00 0A */ cmpwi r22, 0xa -/* 801934A8 3B BD 00 08 */ addi r29, r29, 8 -/* 801934AC 41 80 FE 18 */ blt lbl_801932C4 -/* 801934B0 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 801934B4 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 801934B8 39 61 00 50 */ addi r11, r1, 0x50 -/* 801934BC 48 1C ED 51 */ bl _restgpr_22 -/* 801934C0 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801934C4 7C 08 03 A6 */ mtlr r0 -/* 801934C8 38 21 00 60 */ addi r1, r1, 0x60 -/* 801934CC 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/__ct__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/__ct__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index 31e4d2d4e14..00000000000 --- a/asm/d/d_timer/__ct__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8025DB38: -/* 8025DB38 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 8025DB3C 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 8025DB40 90 03 00 00 */ stw r0, 0(r3) -/* 8025DB44 3C 80 80 3C */ lis r4, __vt__21dDlst_TimerScrnDraw_c@ha /* 0x803C3420@ha */ -/* 8025DB48 38 04 34 20 */ addi r0, r4, __vt__21dDlst_TimerScrnDraw_c@l /* 0x803C3420@l */ -/* 8025DB4C 90 03 00 00 */ stw r0, 0(r3) -/* 8025DB50 38 C0 00 00 */ li r6, 0 -/* 8025DB54 98 C3 03 E2 */ stb r6, 0x3e2(r3) -/* 8025DB58 98 C3 03 DD */ stb r6, 0x3dd(r3) -/* 8025DB5C 90 C3 03 D8 */ stw r6, 0x3d8(r3) -/* 8025DB60 38 00 FF FF */ li r0, -1 -/* 8025DB64 90 03 03 CC */ stw r0, 0x3cc(r3) -/* 8025DB68 90 03 03 D0 */ stw r0, 0x3d0(r3) -/* 8025DB6C 90 C3 03 D4 */ stw r6, 0x3d4(r3) -/* 8025DB70 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DB74 38 A4 EB C8 */ addi r5, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DB78 88 03 03 DD */ lbz r0, 0x3dd(r3) -/* 8025DB7C 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DB80 7C 85 02 14 */ add r4, r5, r0 -/* 8025DB84 C0 04 0A BC */ lfs f0, 0xabc(r4) -/* 8025DB88 D0 03 03 B0 */ stfs f0, 0x3b0(r3) -/* 8025DB8C 88 03 03 DD */ lbz r0, 0x3dd(r3) -/* 8025DB90 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DB94 7C 85 02 14 */ add r4, r5, r0 -/* 8025DB98 C0 04 0A F8 */ lfs f0, 0xaf8(r4) -/* 8025DB9C D0 03 03 B4 */ stfs f0, 0x3b4(r3) -/* 8025DBA0 88 03 03 DD */ lbz r0, 0x3dd(r3) -/* 8025DBA4 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DBA8 7C 85 02 14 */ add r4, r5, r0 -/* 8025DBAC C0 04 0B 34 */ lfs f0, 0xb34(r4) -/* 8025DBB0 D0 03 03 B8 */ stfs f0, 0x3b8(r3) -/* 8025DBB4 88 03 03 DD */ lbz r0, 0x3dd(r3) -/* 8025DBB8 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DBBC 7C 85 02 14 */ add r4, r5, r0 -/* 8025DBC0 C0 04 0B 70 */ lfs f0, 0xb70(r4) -/* 8025DBC4 D0 03 03 BC */ stfs f0, 0x3bc(r3) -/* 8025DBC8 98 C3 03 DE */ stb r6, 0x3de(r3) -/* 8025DBCC 98 C3 03 DF */ stb r6, 0x3df(r3) -/* 8025DBD0 98 C3 03 E0 */ stb r6, 0x3e0(r3) -/* 8025DBD4 38 00 00 01 */ li r0, 1 -/* 8025DBD8 98 03 03 E1 */ stb r0, 0x3e1(r3) -/* 8025DBDC 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/__dt__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/__dt__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index d7bab53c67d..00000000000 --- a/asm/d/d_timer/__dt__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80261394: -/* 80261394 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80261398 7C 08 02 A6 */ mflr r0 -/* 8026139C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802613A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802613A4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802613A8 41 82 00 1C */ beq lbl_802613C4 -/* 802613AC 3C A0 80 3C */ lis r5, __vt__21dDlst_TimerScrnDraw_c@ha /* 0x803C3420@ha */ -/* 802613B0 38 05 34 20 */ addi r0, r5, __vt__21dDlst_TimerScrnDraw_c@l /* 0x803C3420@l */ -/* 802613B4 90 1F 00 00 */ stw r0, 0(r31) -/* 802613B8 7C 80 07 35 */ extsh. r0, r4 -/* 802613BC 40 81 00 08 */ ble lbl_802613C4 -/* 802613C0 48 06 D9 7D */ bl __dl__FPv -lbl_802613C4: -/* 802613C4 7F E3 FB 78 */ mr r3, r31 -/* 802613C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802613CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802613D0 7C 08 03 A6 */ mtlr r0 -/* 802613D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802613D8 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/_create__8dTimer_cFv.s b/asm/d/d_timer/_create__8dTimer_cFv.s deleted file mode 100644 index d579f0f02a6..00000000000 --- a/asm/d/d_timer/_create__8dTimer_cFv.s +++ /dev/null @@ -1,339 +0,0 @@ -lbl_8025CA0C: -/* 8025CA0C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025CA10 7C 08 02 A6 */ mflr r0 -/* 8025CA14 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025CA18 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025CA1C 48 10 57 BD */ bl _savegpr_28 -/* 8025CA20 7C 7F 1B 78 */ mr r31, r3 -/* 8025CA24 38 7F 01 08 */ addi r3, r31, 0x108 -/* 8025CA28 3C 80 80 3A */ lis r4, d_d_timer__stringBase0@ha /* 0x8039A3D8@ha */ -/* 8025CA2C 38 84 A3 D8 */ addi r4, r4, d_d_timer__stringBase0@l /* 0x8039A3D8@l */ -/* 8025CA30 4B DD 04 8D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8025CA34 2C 03 00 04 */ cmpwi r3, 4 -/* 8025CA38 40 82 04 B4 */ bne lbl_8025CEEC -/* 8025CA3C 7F E3 FB 78 */ mr r3, r31 -/* 8025CA40 4B DC 30 05 */ bl fopMsgM_GetAppend__FPv -/* 8025CA44 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8025CA48 40 82 00 0C */ bne lbl_8025CA54 -/* 8025CA4C 38 60 00 05 */ li r3, 5 -/* 8025CA50 48 00 04 9C */ b lbl_8025CEEC -lbl_8025CA54: -/* 8025CA54 3C 60 80 3A */ lis r3, d_d_timer__stringBase0@ha /* 0x8039A3D8@ha */ -/* 8025CA58 38 63 A3 D8 */ addi r3, r3, d_d_timer__stringBase0@l /* 0x8039A3D8@l */ -/* 8025CA5C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025CA60 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025CA64 3C 84 00 02 */ addis r4, r4, 2 -/* 8025CA68 38 A0 00 80 */ li r5, 0x80 -/* 8025CA6C 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8025CA70 4B DD F7 75 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci -/* 8025CA74 7C 7D 1B 78 */ mr r29, r3 -/* 8025CA78 80 03 00 14 */ lwz r0, 0x14(r3) -/* 8025CA7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025CA80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025CA84 90 03 5C E0 */ stw r0, 0x5ce0(r3) -/* 8025CA88 3C 60 00 01 */ lis r3, 0x0001 /* 0x00011000@ha */ -/* 8025CA8C 38 63 10 00 */ addi r3, r3, 0x1000 /* 0x00011000@l */ -/* 8025CA90 38 80 00 00 */ li r4, 0 -/* 8025CA94 4B DC 39 09 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap -/* 8025CA98 90 7F 01 00 */ stw r3, 0x100(r31) -/* 8025CA9C 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8025CAA0 4B DB 27 2D */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8025CAA4 7C 7C 1B 78 */ mr r28, r3 -/* 8025CAA8 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8025CAAC 28 03 00 00 */ cmplwi r3, 0 -/* 8025CAB0 41 82 00 70 */ beq lbl_8025CB20 -/* 8025CAB4 48 07 1C D1 */ bl getTotalFreeSize__7JKRHeapFv -/* 8025CAB8 38 60 03 E4 */ li r3, 0x3e4 -/* 8025CABC 48 07 21 91 */ bl __nw__FUl -/* 8025CAC0 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025CAC4 41 82 00 0C */ beq lbl_8025CAD0 -/* 8025CAC8 48 00 10 71 */ bl __ct__21dDlst_TimerScrnDraw_cFv -/* 8025CACC 7C 60 1B 78 */ mr r0, r3 -lbl_8025CAD0: -/* 8025CAD0 90 1F 00 FC */ stw r0, 0xfc(r31) -/* 8025CAD4 80 9E 00 1C */ lwz r4, 0x1c(r30) -/* 8025CAD8 2C 04 00 0A */ cmpwi r4, 0xa -/* 8025CADC 40 82 00 2C */ bne lbl_8025CB08 -/* 8025CAE0 83 BD 00 14 */ lwz r29, 0x14(r29) -/* 8025CAE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025CAE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025CAEC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8025CAF0 4B DD 00 CD */ bl getTimerMode__14dComIfG_play_cFv -/* 8025CAF4 7C 64 1B 78 */ mr r4, r3 -/* 8025CAF8 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CAFC 7F A5 EB 78 */ mr r5, r29 -/* 8025CB00 48 00 14 BD */ bl setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive -/* 8025CB04 48 00 00 10 */ b lbl_8025CB14 -lbl_8025CB08: -/* 8025CB08 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CB0C 80 BD 00 14 */ lwz r5, 0x14(r29) -/* 8025CB10 48 00 14 AD */ bl setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive -lbl_8025CB14: -/* 8025CB14 7F 83 E3 78 */ mr r3, r28 -/* 8025CB18 4B DB 26 B5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8025CB1C 48 00 00 10 */ b lbl_8025CB2C -lbl_8025CB20: -/* 8025CB20 38 60 00 05 */ li r3, 5 -/* 8025CB24 48 00 03 C8 */ b lbl_8025CEEC -/* 8025CB28 48 00 03 C4 */ b lbl_8025CEEC -lbl_8025CB2C: -/* 8025CB2C 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CB30 88 9E 00 24 */ lbz r4, 0x24(r30) -/* 8025CB34 48 00 2F 91 */ bl setShowType__21dDlst_TimerScrnDraw_cFUc -/* 8025CB38 80 1E 00 1C */ lwz r0, 0x1c(r30) -/* 8025CB3C 2C 00 00 0A */ cmpwi r0, 0xa -/* 8025CB40 40 82 01 B0 */ bne lbl_8025CCF0 -/* 8025CB44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025CB48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025CB4C 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 8025CB50 7F C3 F3 78 */ mr r3, r30 -/* 8025CB54 4B DD 00 69 */ bl getTimerMode__14dComIfG_play_cFv -/* 8025CB58 90 7F 01 54 */ stw r3, 0x154(r31) -/* 8025CB5C 7F C3 F3 78 */ mr r3, r30 -/* 8025CB60 4B DD 00 4D */ bl getTimerLimitTimeMs__14dComIfG_play_cFv -/* 8025CB64 3C 80 80 00 */ lis r4, 0x8000 /* 0x800000F8@ha */ -/* 8025CB68 80 04 00 F8 */ lwz r0, 0x00F8(r4) /* 0x800000F8@l */ -/* 8025CB6C 54 04 F0 BE */ srwi r4, r0, 2 -/* 8025CB70 38 00 03 E8 */ li r0, 0x3e8 -/* 8025CB74 7C E4 03 96 */ divwu r7, r4, r0 -/* 8025CB78 38 A0 00 00 */ li r5, 0 -/* 8025CB7C 7C 60 FE 70 */ srawi r0, r3, 0x1f -/* 8025CB80 7C 87 18 16 */ mulhwu r4, r7, r3 -/* 8025CB84 7C A5 19 D6 */ mullw r5, r5, r3 -/* 8025CB88 7C C7 19 D6 */ mullw r6, r7, r3 -/* 8025CB8C 7C 07 01 D6 */ mullw r0, r7, r0 -/* 8025CB90 7C 64 2A 14 */ add r3, r4, r5 -/* 8025CB94 7C 63 02 14 */ add r3, r3, r0 -/* 8025CB98 90 DF 01 44 */ stw r6, 0x144(r31) -/* 8025CB9C 90 7F 01 40 */ stw r3, 0x140(r31) -/* 8025CBA0 4B DD 5C 65 */ bl getTime__11dLib_time_cFv -/* 8025CBA4 90 9F 01 14 */ stw r4, 0x114(r31) -/* 8025CBA8 90 7F 01 10 */ stw r3, 0x110(r31) -/* 8025CBAC 90 9F 01 1C */ stw r4, 0x11c(r31) -/* 8025CBB0 90 7F 01 18 */ stw r3, 0x118(r31) -/* 8025CBB4 7F C3 F3 78 */ mr r3, r30 -/* 8025CBB8 4B DC FF E5 */ bl getTimerNowTimeMs__14dComIfG_play_cFv -/* 8025CBBC 81 1F 01 10 */ lwz r8, 0x110(r31) -/* 8025CBC0 81 3F 01 14 */ lwz r9, 0x114(r31) -/* 8025CBC4 3C 80 80 00 */ lis r4, 0x8000 /* 0x800000F8@ha */ -/* 8025CBC8 80 04 00 F8 */ lwz r0, 0x00F8(r4) /* 0x800000F8@l */ -/* 8025CBCC 54 04 F0 BE */ srwi r4, r0, 2 -/* 8025CBD0 38 00 03 E8 */ li r0, 0x3e8 -/* 8025CBD4 7C E4 03 96 */ divwu r7, r4, r0 -/* 8025CBD8 38 C0 00 00 */ li r6, 0 -/* 8025CBDC 7C 60 FE 70 */ srawi r0, r3, 0x1f -/* 8025CBE0 7C 87 18 16 */ mulhwu r4, r7, r3 -/* 8025CBE4 7C A6 19 D6 */ mullw r5, r6, r3 -/* 8025CBE8 7C 67 19 D6 */ mullw r3, r7, r3 -/* 8025CBEC 7C 07 01 D6 */ mullw r0, r7, r0 -/* 8025CBF0 7C 84 2A 14 */ add r4, r4, r5 -/* 8025CBF4 7C 84 02 14 */ add r4, r4, r0 -/* 8025CBF8 7C 63 48 10 */ subfc r3, r3, r9 -/* 8025CBFC 7C 04 41 10 */ subfe r0, r4, r8 -/* 8025CC00 90 7F 01 14 */ stw r3, 0x114(r31) -/* 8025CC04 90 1F 01 10 */ stw r0, 0x110(r31) -/* 8025CC08 98 DF 01 6C */ stb r6, 0x16c(r31) -/* 8025CC0C 7F C3 F3 78 */ mr r3, r30 -/* 8025CC10 4B DC FF AD */ bl getTimerMode__14dComIfG_play_cFv -/* 8025CC14 90 7F 01 54 */ stw r3, 0x154(r31) -/* 8025CC18 7F E3 FB 78 */ mr r3, r31 -/* 8025CC1C 48 00 0D D5 */ bl getTimeMs__8dTimer_cFv -/* 8025CC20 7C 64 1B 78 */ mr r4, r3 -/* 8025CC24 7F C3 F3 78 */ mr r3, r30 -/* 8025CC28 4B DC FF 6D */ bl setTimerNowTimeMs__14dComIfG_play_cFi -/* 8025CC2C 7F E3 FB 78 */ mr r3, r31 -/* 8025CC30 48 00 0E 25 */ bl getLimitTimeMs__8dTimer_cFv -/* 8025CC34 7C 64 1B 78 */ mr r4, r3 -/* 8025CC38 7F C3 F3 78 */ mr r3, r30 -/* 8025CC3C 4B DC FF 69 */ bl setTimerLimitTimeMs__14dComIfG_play_cFi -/* 8025CC40 7F C3 F3 78 */ mr r3, r30 -/* 8025CC44 80 9F 01 54 */ lwz r4, 0x154(r31) -/* 8025CC48 4B DC FF 6D */ bl setTimerMode__14dComIfG_play_cFi -/* 8025CC4C 7F C3 F3 78 */ mr r3, r30 -/* 8025CC50 7F E4 FB 78 */ mr r4, r31 -/* 8025CC54 4B DC FF 81 */ bl setTimerPtr__14dComIfG_play_cFP8dTimer_c -/* 8025CC58 7F E3 FB 78 */ mr r3, r31 -/* 8025CC5C 38 80 00 0A */ li r4, 0xa -/* 8025CC60 48 00 0B 61 */ bl stock_start__8dTimer_cFs -/* 8025CC64 80 1F 01 54 */ lwz r0, 0x154(r31) -/* 8025CC68 2C 00 00 05 */ cmpwi r0, 5 -/* 8025CC6C 41 82 00 6C */ beq lbl_8025CCD8 -/* 8025CC70 40 80 00 14 */ bge lbl_8025CC84 -/* 8025CC74 2C 00 00 03 */ cmpwi r0, 3 -/* 8025CC78 41 82 00 18 */ beq lbl_8025CC90 -/* 8025CC7C 40 80 00 2C */ bge lbl_8025CCA8 -/* 8025CC80 48 00 01 10 */ b lbl_8025CD90 -lbl_8025CC84: -/* 8025CC84 2C 00 00 07 */ cmpwi r0, 7 -/* 8025CC88 40 80 01 08 */ bge lbl_8025CD90 -/* 8025CC8C 48 00 00 34 */ b lbl_8025CCC0 -lbl_8025CC90: -/* 8025CC90 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CC94 C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 8025CC98 D0 03 03 C0 */ stfs f0, 0x3c0(r3) -/* 8025CC9C C0 02 B5 44 */ lfs f0, lit_3920(r2) -/* 8025CCA0 D0 03 03 C4 */ stfs f0, 0x3c4(r3) -/* 8025CCA4 48 00 00 EC */ b lbl_8025CD90 -lbl_8025CCA8: -/* 8025CCA8 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CCAC C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 8025CCB0 D0 03 03 C0 */ stfs f0, 0x3c0(r3) -/* 8025CCB4 C0 02 B5 44 */ lfs f0, lit_3920(r2) -/* 8025CCB8 D0 03 03 C4 */ stfs f0, 0x3c4(r3) -/* 8025CCBC 48 00 00 D4 */ b lbl_8025CD90 -lbl_8025CCC0: -/* 8025CCC0 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CCC4 C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 8025CCC8 D0 03 03 C0 */ stfs f0, 0x3c0(r3) -/* 8025CCCC C0 02 B5 44 */ lfs f0, lit_3920(r2) -/* 8025CCD0 D0 03 03 C4 */ stfs f0, 0x3c4(r3) -/* 8025CCD4 48 00 00 BC */ b lbl_8025CD90 -lbl_8025CCD8: -/* 8025CCD8 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CCDC C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 8025CCE0 D0 03 03 C0 */ stfs f0, 0x3c0(r3) -/* 8025CCE4 C0 02 B5 44 */ lfs f0, lit_3920(r2) -/* 8025CCE8 D0 03 03 C4 */ stfs f0, 0x3c4(r3) -/* 8025CCEC 48 00 00 A4 */ b lbl_8025CD90 -lbl_8025CCF0: -/* 8025CCF0 90 1F 01 54 */ stw r0, 0x154(r31) -/* 8025CCF4 80 DE 00 20 */ lwz r6, 0x20(r30) -/* 8025CCF8 38 A0 00 00 */ li r5, 0 -/* 8025CCFC 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 8025CD00 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 8025CD04 54 03 F0 BE */ srwi r3, r0, 2 -/* 8025CD08 38 00 03 E8 */ li r0, 0x3e8 -/* 8025CD0C 7C 83 03 96 */ divwu r4, r3, r0 -/* 8025CD10 7C 06 20 16 */ mulhwu r0, r6, r4 -/* 8025CD14 7C 65 21 D6 */ mullw r3, r5, r4 -/* 8025CD18 7C 60 1A 14 */ add r3, r0, r3 -/* 8025CD1C 7C 06 29 D6 */ mullw r0, r6, r5 -/* 8025CD20 7C 86 21 D6 */ mullw r4, r6, r4 -/* 8025CD24 7C 03 02 14 */ add r0, r3, r0 -/* 8025CD28 90 9F 01 44 */ stw r4, 0x144(r31) -/* 8025CD2C 90 1F 01 40 */ stw r0, 0x140(r31) -/* 8025CD30 90 BF 01 14 */ stw r5, 0x114(r31) -/* 8025CD34 90 BF 01 10 */ stw r5, 0x110(r31) -/* 8025CD38 90 BF 01 1C */ stw r5, 0x11c(r31) -/* 8025CD3C 90 BF 01 18 */ stw r5, 0x118(r31) -/* 8025CD40 98 BF 01 6C */ stb r5, 0x16c(r31) -/* 8025CD44 7F E3 FB 78 */ mr r3, r31 -/* 8025CD48 48 00 0C A9 */ bl getTimeMs__8dTimer_cFv -/* 8025CD4C 7C 64 1B 78 */ mr r4, r3 -/* 8025CD50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025CD54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025CD58 3B A3 0F 38 */ addi r29, r3, 0xf38 -/* 8025CD5C 7F A3 EB 78 */ mr r3, r29 -/* 8025CD60 4B DC FE 35 */ bl setTimerNowTimeMs__14dComIfG_play_cFi -/* 8025CD64 7F E3 FB 78 */ mr r3, r31 -/* 8025CD68 48 00 0C ED */ bl getLimitTimeMs__8dTimer_cFv -/* 8025CD6C 7C 64 1B 78 */ mr r4, r3 -/* 8025CD70 7F A3 EB 78 */ mr r3, r29 -/* 8025CD74 4B DC FE 31 */ bl setTimerLimitTimeMs__14dComIfG_play_cFi -/* 8025CD78 7F A3 EB 78 */ mr r3, r29 -/* 8025CD7C 80 9F 01 54 */ lwz r4, 0x154(r31) -/* 8025CD80 4B DC FE 35 */ bl setTimerMode__14dComIfG_play_cFi -/* 8025CD84 7F A3 EB 78 */ mr r3, r29 -/* 8025CD88 7F E4 FB 78 */ mr r4, r31 -/* 8025CD8C 4B DC FE 49 */ bl setTimerPtr__14dComIfG_play_cFP8dTimer_c -lbl_8025CD90: -/* 8025CD90 80 1F 01 54 */ lwz r0, 0x154(r31) -/* 8025CD94 2C 00 00 07 */ cmpwi r0, 7 -/* 8025CD98 41 82 00 30 */ beq lbl_8025CDC8 -/* 8025CD9C 40 80 00 10 */ bge lbl_8025CDAC -/* 8025CDA0 2C 00 00 02 */ cmpwi r0, 2 -/* 8025CDA4 41 82 00 24 */ beq lbl_8025CDC8 -/* 8025CDA8 48 00 00 2C */ b lbl_8025CDD4 -lbl_8025CDAC: -/* 8025CDAC 2C 00 00 09 */ cmpwi r0, 9 -/* 8025CDB0 40 80 00 24 */ bge lbl_8025CDD4 -/* 8025CDB4 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CDB8 48 00 1D 69 */ bl hideDenominator__21dDlst_TimerScrnDraw_cFv -/* 8025CDBC 38 00 00 02 */ li r0, 2 -/* 8025CDC0 98 1F 01 6D */ stb r0, 0x16d(r31) -/* 8025CDC4 48 00 00 20 */ b lbl_8025CDE4 -lbl_8025CDC8: -/* 8025CDC8 38 00 00 00 */ li r0, 0 -/* 8025CDCC 98 1F 01 6D */ stb r0, 0x16d(r31) -/* 8025CDD0 48 00 00 14 */ b lbl_8025CDE4 -lbl_8025CDD4: -/* 8025CDD4 38 00 00 01 */ li r0, 1 -/* 8025CDD8 98 1F 01 6D */ stb r0, 0x16d(r31) -/* 8025CDDC 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CDE0 48 00 1D 41 */ bl hideDenominator__21dDlst_TimerScrnDraw_cFv -lbl_8025CDE4: -/* 8025CDE4 88 1F 01 6D */ lbz r0, 0x16d(r31) -/* 8025CDE8 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CDEC 98 03 03 DD */ stb r0, 0x3dd(r3) -/* 8025CDF0 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CDF4 88 03 03 E2 */ lbz r0, 0x3e2(r3) -/* 8025CDF8 28 00 00 00 */ cmplwi r0, 0 -/* 8025CDFC 41 82 00 30 */ beq lbl_8025CE2C -/* 8025CE00 88 1F 01 6D */ lbz r0, 0x16d(r31) -/* 8025CE04 28 00 00 00 */ cmplwi r0, 0 -/* 8025CE08 40 82 00 24 */ bne lbl_8025CE2C -/* 8025CE0C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025CE10 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025CE14 C0 24 0B 84 */ lfs f1, 0xb84(r4) -/* 8025CE18 C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 8025CE1C EC 21 00 2A */ fadds f1, f1, f0 -/* 8025CE20 C0 44 0B 88 */ lfs f2, 0xb88(r4) -/* 8025CE24 48 00 2C 49 */ bl setCounterPos__21dDlst_TimerScrnDraw_cFff -/* 8025CE28 48 00 00 2C */ b lbl_8025CE54 -lbl_8025CE2C: -/* 8025CE2C 88 1F 01 6D */ lbz r0, 0x16d(r31) -/* 8025CE30 54 05 10 3A */ slwi r5, r0, 2 -/* 8025CE34 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025CE38 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025CE3C 7C 80 2A 14 */ add r4, r0, r5 -/* 8025CE40 C0 24 0A E0 */ lfs f1, 0xae0(r4) -/* 8025CE44 C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 8025CE48 EC 21 00 2A */ fadds f1, f1, f0 -/* 8025CE4C C0 44 0A EC */ lfs f2, 0xaec(r4) -/* 8025CE50 48 00 2C 1D */ bl setCounterPos__21dDlst_TimerScrnDraw_cFff -lbl_8025CE54: -/* 8025CE54 88 1F 01 6D */ lbz r0, 0x16d(r31) -/* 8025CE58 54 05 10 3A */ slwi r5, r0, 2 -/* 8025CE5C 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CE60 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025CE64 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025CE68 7C 80 2A 14 */ add r4, r0, r5 -/* 8025CE6C C0 24 0B 58 */ lfs f1, 0xb58(r4) -/* 8025CE70 C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 8025CE74 EC 21 00 2A */ fadds f1, f1, f0 -/* 8025CE78 C0 44 0B 64 */ lfs f2, 0xb64(r4) -/* 8025CE7C 48 00 2C 1D */ bl setImagePos__21dDlst_TimerScrnDraw_cFff -/* 8025CE80 88 1F 01 6D */ lbz r0, 0x16d(r31) -/* 8025CE84 54 05 10 3A */ slwi r5, r0, 2 -/* 8025CE88 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CE8C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025CE90 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025CE94 7C 80 2A 14 */ add r4, r0, r5 -/* 8025CE98 C0 24 0B 1C */ lfs f1, 0xb1c(r4) -/* 8025CE9C C0 44 0B 28 */ lfs f2, 0xb28(r4) -/* 8025CEA0 48 00 2B 8D */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff -/* 8025CEA4 38 60 00 00 */ li r3, 0 -/* 8025CEA8 90 7F 01 24 */ stw r3, 0x124(r31) -/* 8025CEAC 90 7F 01 20 */ stw r3, 0x120(r31) -/* 8025CEB0 90 7F 01 2C */ stw r3, 0x12c(r31) -/* 8025CEB4 90 7F 01 28 */ stw r3, 0x128(r31) -/* 8025CEB8 90 7F 01 34 */ stw r3, 0x134(r31) -/* 8025CEBC 90 7F 01 30 */ stw r3, 0x130(r31) -/* 8025CEC0 90 7F 01 3C */ stw r3, 0x13c(r31) -/* 8025CEC4 90 7F 01 38 */ stw r3, 0x138(r31) -/* 8025CEC8 98 7F 01 6A */ stb r3, 0x16a(r31) -/* 8025CECC 98 7F 01 6B */ stb r3, 0x16b(r31) -/* 8025CED0 38 00 00 78 */ li r0, 0x78 -/* 8025CED4 90 1F 01 58 */ stw r0, 0x158(r31) -/* 8025CED8 90 7F 01 5C */ stw r3, 0x15c(r31) -/* 8025CEDC 98 7F 01 6E */ stb r3, 0x16e(r31) -/* 8025CEE0 90 7F 01 64 */ stw r3, 0x164(r31) -/* 8025CEE4 90 7F 01 60 */ stw r3, 0x160(r31) -/* 8025CEE8 38 60 00 04 */ li r3, 4 -lbl_8025CEEC: -/* 8025CEEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025CEF0 48 10 53 35 */ bl _restgpr_28 -/* 8025CEF4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025CEF8 7C 08 03 A6 */ mtlr r0 -/* 8025CEFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025CF00 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/_delete__8dTimer_cFv.s b/asm/d/d_timer/_delete__8dTimer_cFv.s deleted file mode 100644 index ac3d4897346..00000000000 --- a/asm/d/d_timer/_delete__8dTimer_cFv.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_8025D3BC: -/* 8025D3BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025D3C0 7C 08 02 A6 */ mflr r0 -/* 8025D3C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025D3C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025D3CC 93 C1 00 08 */ stw r30, 8(r1) -/* 8025D3D0 7C 7F 1B 78 */ mr r31, r3 -/* 8025D3D4 80 63 01 00 */ lwz r3, 0x100(r3) -/* 8025D3D8 28 03 00 00 */ cmplwi r3, 0 -/* 8025D3DC 41 82 00 5C */ beq lbl_8025D438 -/* 8025D3E0 4B DB 1D ED */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8025D3E4 7C 7E 1B 78 */ mr r30, r3 -/* 8025D3E8 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8025D3EC 48 07 13 99 */ bl getTotalFreeSize__7JKRHeapFv -/* 8025D3F0 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D3F4 48 00 18 69 */ bl deleteScreen__21dDlst_TimerScrnDraw_cFv -/* 8025D3F8 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D3FC 28 03 00 00 */ cmplwi r3, 0 -/* 8025D400 41 82 00 18 */ beq lbl_8025D418 -/* 8025D404 38 80 00 01 */ li r4, 1 -/* 8025D408 81 83 00 00 */ lwz r12, 0(r3) -/* 8025D40C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8025D410 7D 89 03 A6 */ mtctr r12 -/* 8025D414 4E 80 04 21 */ bctrl -lbl_8025D418: -/* 8025D418 38 00 00 00 */ li r0, 0 -/* 8025D41C 90 1F 00 FC */ stw r0, 0xfc(r31) -/* 8025D420 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8025D424 4B DC 2F BD */ bl fopMsgM_destroyExpHeap__FP10JKRExpHeap -/* 8025D428 38 00 00 00 */ li r0, 0 -/* 8025D42C 90 1F 01 00 */ stw r0, 0x100(r31) -/* 8025D430 7F C3 F3 78 */ mr r3, r30 -/* 8025D434 4B DB 1D 99 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -lbl_8025D438: -/* 8025D438 80 1F 01 54 */ lwz r0, 0x154(r31) -/* 8025D43C 2C 00 00 03 */ cmpwi r0, 3 -/* 8025D440 41 82 00 0C */ beq lbl_8025D44C -/* 8025D444 2C 00 00 04 */ cmpwi r0, 4 -/* 8025D448 40 82 00 5C */ bne lbl_8025D4A4 -lbl_8025D44C: -/* 8025D44C 88 1F 01 6C */ lbz r0, 0x16c(r31) -/* 8025D450 28 00 00 08 */ cmplwi r0, 8 -/* 8025D454 41 82 00 50 */ beq lbl_8025D4A4 -/* 8025D458 28 00 00 07 */ cmplwi r0, 7 -/* 8025D45C 41 82 00 48 */ beq lbl_8025D4A4 -/* 8025D460 7F E3 FB 78 */ mr r3, r31 -/* 8025D464 48 00 05 8D */ bl getTimeMs__8dTimer_cFv -/* 8025D468 7C 64 1B 78 */ mr r4, r3 -/* 8025D46C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025D470 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025D474 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 8025D478 7F C3 F3 78 */ mr r3, r30 -/* 8025D47C 4B DC F7 19 */ bl setTimerNowTimeMs__14dComIfG_play_cFi -/* 8025D480 7F E3 FB 78 */ mr r3, r31 -/* 8025D484 48 00 05 D1 */ bl getLimitTimeMs__8dTimer_cFv -/* 8025D488 7C 64 1B 78 */ mr r4, r3 -/* 8025D48C 7F C3 F3 78 */ mr r3, r30 -/* 8025D490 4B DC F7 15 */ bl setTimerLimitTimeMs__14dComIfG_play_cFi -/* 8025D494 7F C3 F3 78 */ mr r3, r30 -/* 8025D498 80 9F 01 54 */ lwz r4, 0x154(r31) -/* 8025D49C 4B DC F7 19 */ bl setTimerMode__14dComIfG_play_cFi -/* 8025D4A0 48 00 00 34 */ b lbl_8025D4D4 -lbl_8025D4A4: -/* 8025D4A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025D4A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025D4AC 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 8025D4B0 7F C3 F3 78 */ mr r3, r30 -/* 8025D4B4 38 80 00 00 */ li r4, 0 -/* 8025D4B8 4B DC F6 DD */ bl setTimerNowTimeMs__14dComIfG_play_cFi -/* 8025D4BC 7F C3 F3 78 */ mr r3, r30 -/* 8025D4C0 38 80 00 00 */ li r4, 0 -/* 8025D4C4 4B DC F6 E1 */ bl setTimerLimitTimeMs__14dComIfG_play_cFi -/* 8025D4C8 7F C3 F3 78 */ mr r3, r30 -/* 8025D4CC 38 80 FF FF */ li r4, -1 -/* 8025D4D0 4B DC F6 E5 */ bl setTimerMode__14dComIfG_play_cFi -lbl_8025D4D4: -/* 8025D4D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025D4D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025D4DC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8025D4E0 38 80 00 00 */ li r4, 0 -/* 8025D4E4 4B DC F6 F1 */ bl setTimerPtr__14dComIfG_play_cFP8dTimer_c -/* 8025D4E8 38 7F 01 08 */ addi r3, r31, 0x108 -/* 8025D4EC 3C 80 80 3A */ lis r4, d_d_timer__stringBase0@ha /* 0x8039A3D8@ha */ -/* 8025D4F0 38 84 A3 D8 */ addi r4, r4, d_d_timer__stringBase0@l /* 0x8039A3D8@l */ -/* 8025D4F4 4B DC FB 15 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8025D4F8 38 00 00 00 */ li r0, 0 -/* 8025D4FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025D500 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025D504 90 03 5C E0 */ stw r0, 0x5ce0(r3) -/* 8025D508 38 60 00 01 */ li r3, 1 -/* 8025D50C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025D510 83 C1 00 08 */ lwz r30, 8(r1) -/* 8025D514 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025D518 7C 08 03 A6 */ mtlr r0 -/* 8025D51C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025D520 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/_execute__8dTimer_cFv.s b/asm/d/d_timer/_execute__8dTimer_cFv.s deleted file mode 100644 index 05f41c1b85a..00000000000 --- a/asm/d/d_timer/_execute__8dTimer_cFv.s +++ /dev/null @@ -1,297 +0,0 @@ -lbl_8025CF04: -/* 8025CF04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025CF08 7C 08 02 A6 */ mflr r0 -/* 8025CF0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025CF10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025CF14 93 C1 00 08 */ stw r30, 8(r1) -/* 8025CF18 7C 7F 1B 78 */ mr r31, r3 -/* 8025CF1C 80 03 01 54 */ lwz r0, 0x154(r3) -/* 8025CF20 2C 00 00 06 */ cmpwi r0, 6 -/* 8025CF24 40 82 00 1C */ bne lbl_8025CF40 -/* 8025CF28 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025CF2C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025CF30 A0 04 00 02 */ lhz r0, 2(r4) -/* 8025CF34 28 00 00 00 */ cmplwi r0, 0 -/* 8025CF38 40 82 00 08 */ bne lbl_8025CF40 -/* 8025CF3C 4B DC 2B 11 */ bl fopMsgM_Delete__FPv -lbl_8025CF40: -/* 8025CF40 88 1F 01 6A */ lbz r0, 0x16a(r31) -/* 8025CF44 28 00 00 01 */ cmplwi r0, 1 -/* 8025CF48 41 82 02 20 */ beq lbl_8025D168 -/* 8025CF4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025CF50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025CF54 88 03 5E B5 */ lbz r0, 0x5eb5(r3) -/* 8025CF58 28 00 00 00 */ cmplwi r0, 0 -/* 8025CF5C 40 82 00 20 */ bne lbl_8025CF7C -/* 8025CF60 4B FD B2 CD */ bl getStatus__12dMsgObject_cFv -/* 8025CF64 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8025CF68 20 60 00 01 */ subfic r3, r0, 1 -/* 8025CF6C 30 03 FF FF */ addic r0, r3, -1 -/* 8025CF70 7C 00 19 10 */ subfe r0, r0, r3 -/* 8025CF74 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8025CF78 41 82 00 10 */ beq lbl_8025CF88 -lbl_8025CF7C: -/* 8025CF7C 7F E3 FB 78 */ mr r3, r31 -/* 8025CF80 38 80 00 02 */ li r4, 2 -/* 8025CF84 48 00 08 65 */ bl stop__8dTimer_cFUc -lbl_8025CF88: -/* 8025CF88 7F E3 FB 78 */ mr r3, r31 -/* 8025CF8C 48 00 0B 11 */ bl getRestTimeMs__8dTimer_cFv -/* 8025CF90 90 7F 01 50 */ stw r3, 0x150(r31) -/* 8025CF94 88 1F 01 6C */ lbz r0, 0x16c(r31) -/* 8025CF98 2C 00 00 04 */ cmpwi r0, 4 -/* 8025CF9C 41 82 00 CC */ beq lbl_8025D068 -/* 8025CFA0 40 80 00 18 */ bge lbl_8025CFB8 -/* 8025CFA4 2C 00 00 02 */ cmpwi r0, 2 -/* 8025CFA8 40 80 00 7C */ bge lbl_8025D024 -/* 8025CFAC 2C 00 00 00 */ cmpwi r0, 0 -/* 8025CFB0 40 80 00 10 */ bge lbl_8025CFC0 -/* 8025CFB4 48 00 01 A0 */ b lbl_8025D154 -lbl_8025CFB8: -/* 8025CFB8 2C 00 00 06 */ cmpwi r0, 6 -/* 8025CFBC 40 80 01 98 */ bge lbl_8025D154 -lbl_8025CFC0: -/* 8025CFC0 38 00 00 00 */ li r0, 0 -/* 8025CFC4 90 1F 01 14 */ stw r0, 0x114(r31) -/* 8025CFC8 90 1F 01 10 */ stw r0, 0x110(r31) -/* 8025CFCC 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 8025CFD0 90 1F 01 18 */ stw r0, 0x118(r31) -/* 8025CFD4 88 1F 01 6C */ lbz r0, 0x16c(r31) -/* 8025CFD8 28 00 00 01 */ cmplwi r0, 1 -/* 8025CFDC 41 82 00 0C */ beq lbl_8025CFE8 -/* 8025CFE0 28 00 00 05 */ cmplwi r0, 5 -/* 8025CFE4 40 82 02 40 */ bne lbl_8025D224 -lbl_8025CFE8: -/* 8025CFE8 A8 7F 01 68 */ lha r3, 0x168(r31) -/* 8025CFEC 38 03 FF FF */ addi r0, r3, -1 -/* 8025CFF0 B0 1F 01 68 */ sth r0, 0x168(r31) -/* 8025CFF4 7C 00 07 35 */ extsh. r0, r0 -/* 8025CFF8 41 81 02 2C */ bgt lbl_8025D224 -/* 8025CFFC 88 1F 01 6C */ lbz r0, 0x16c(r31) -/* 8025D000 28 00 00 05 */ cmplwi r0, 5 -/* 8025D004 40 82 00 10 */ bne lbl_8025D014 -/* 8025D008 7F E3 FB 78 */ mr r3, r31 -/* 8025D00C 48 00 06 FD */ bl stock_start__8dTimer_cFv -/* 8025D010 48 00 02 14 */ b lbl_8025D224 -lbl_8025D014: -/* 8025D014 7F E3 FB 78 */ mr r3, r31 -/* 8025D018 80 9F 01 54 */ lwz r4, 0x154(r31) -/* 8025D01C 48 00 05 1D */ bl start__8dTimer_cFi -/* 8025D020 48 00 02 04 */ b lbl_8025D224 -lbl_8025D024: -/* 8025D024 A8 7F 01 68 */ lha r3, 0x168(r31) -/* 8025D028 38 03 FF FF */ addi r0, r3, -1 -/* 8025D02C B0 1F 01 68 */ sth r0, 0x168(r31) -/* 8025D030 7C 00 07 35 */ extsh. r0, r0 -/* 8025D034 41 81 00 0C */ bgt lbl_8025D040 -/* 8025D038 38 00 00 04 */ li r0, 4 -/* 8025D03C 98 1F 01 6C */ stb r0, 0x16c(r31) -lbl_8025D040: -/* 8025D040 88 1F 01 6C */ lbz r0, 0x16c(r31) -/* 8025D044 28 00 00 02 */ cmplwi r0, 2 -/* 8025D048 40 82 01 DC */ bne lbl_8025D224 -/* 8025D04C 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D050 48 00 3A 59 */ bl checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv -/* 8025D054 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8025D058 41 82 01 CC */ beq lbl_8025D224 -/* 8025D05C 38 00 00 03 */ li r0, 3 -/* 8025D060 98 1F 01 6C */ stb r0, 0x16c(r31) -/* 8025D064 48 00 01 C0 */ b lbl_8025D224 -lbl_8025D068: -/* 8025D068 4B DD 57 9D */ bl getTime__11dLib_time_cFv -/* 8025D06C 90 9F 01 1C */ stw r4, 0x11c(r31) -/* 8025D070 90 7F 01 18 */ stw r3, 0x118(r31) -/* 8025D074 7F E3 FB 78 */ mr r3, r31 -/* 8025D078 48 00 09 79 */ bl getTimeMs__8dTimer_cFv -/* 8025D07C 7C 64 1B 78 */ mr r4, r3 -/* 8025D080 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025D084 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025D088 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 8025D08C 7F C3 F3 78 */ mr r3, r30 -/* 8025D090 4B DC FB 05 */ bl setTimerNowTimeMs__14dComIfG_play_cFi -/* 8025D094 7F E3 FB 78 */ mr r3, r31 -/* 8025D098 48 00 09 BD */ bl getLimitTimeMs__8dTimer_cFv -/* 8025D09C 7C 64 1B 78 */ mr r4, r3 -/* 8025D0A0 7F C3 F3 78 */ mr r3, r30 -/* 8025D0A4 4B DC FB 01 */ bl setTimerLimitTimeMs__14dComIfG_play_cFi -/* 8025D0A8 7F E3 FB 78 */ mr r3, r31 -/* 8025D0AC 48 00 09 F1 */ bl getRestTimeMs__8dTimer_cFv -/* 8025D0B0 2C 03 00 00 */ cmpwi r3, 0 -/* 8025D0B4 41 81 00 44 */ bgt lbl_8025D0F8 -/* 8025D0B8 80 9F 01 40 */ lwz r4, 0x140(r31) -/* 8025D0BC 80 BF 01 44 */ lwz r5, 0x144(r31) -/* 8025D0C0 80 1F 01 10 */ lwz r0, 0x110(r31) -/* 8025D0C4 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 8025D0C8 7C 65 18 14 */ addc r3, r5, r3 -/* 8025D0CC 7C 04 01 14 */ adde r0, r4, r0 -/* 8025D0D0 90 7F 01 1C */ stw r3, 0x11c(r31) -/* 8025D0D4 90 1F 01 18 */ stw r0, 0x118(r31) -/* 8025D0D8 38 00 00 00 */ li r0, 0 -/* 8025D0DC 90 1F 01 3C */ stw r0, 0x13c(r31) -/* 8025D0E0 90 1F 01 38 */ stw r0, 0x138(r31) -/* 8025D0E4 7F E3 FB 78 */ mr r3, r31 -/* 8025D0E8 48 00 09 09 */ bl getTimeMs__8dTimer_cFv -/* 8025D0EC 7C 64 1B 78 */ mr r4, r3 -/* 8025D0F0 7F C3 F3 78 */ mr r3, r30 -/* 8025D0F4 4B DC FA A1 */ bl setTimerNowTimeMs__14dComIfG_play_cFi -lbl_8025D0F8: -/* 8025D0F8 80 1F 01 54 */ lwz r0, 0x154(r31) -/* 8025D0FC 2C 00 00 03 */ cmpwi r0, 3 -/* 8025D100 41 82 00 1C */ beq lbl_8025D11C -/* 8025D104 2C 00 00 04 */ cmpwi r0, 4 -/* 8025D108 41 82 00 14 */ beq lbl_8025D11C -/* 8025D10C 2C 00 00 06 */ cmpwi r0, 6 -/* 8025D110 41 82 00 0C */ beq lbl_8025D11C -/* 8025D114 2C 00 00 05 */ cmpwi r0, 5 -/* 8025D118 40 82 01 0C */ bne lbl_8025D224 -lbl_8025D11C: -/* 8025D11C 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D120 C0 43 03 C4 */ lfs f2, 0x3c4(r3) -/* 8025D124 C0 22 B5 44 */ lfs f1, lit_3920(r2) -/* 8025D128 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 8025D12C 40 80 00 F8 */ bge lbl_8025D224 -/* 8025D130 C0 02 B5 48 */ lfs f0, lit_4050(r2) -/* 8025D134 EC 42 00 2A */ fadds f2, f2, f0 -/* 8025D138 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 8025D13C 40 81 00 08 */ ble lbl_8025D144 -/* 8025D140 FC 40 08 90 */ fmr f2, f1 -lbl_8025D144: -/* 8025D144 C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 8025D148 D0 03 03 C0 */ stfs f0, 0x3c0(r3) -/* 8025D14C D0 43 03 C4 */ stfs f2, 0x3c4(r3) -/* 8025D150 48 00 00 D4 */ b lbl_8025D224 -lbl_8025D154: -/* 8025D154 80 1F 01 20 */ lwz r0, 0x120(r31) -/* 8025D158 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 8025D15C 90 7F 01 1C */ stw r3, 0x11c(r31) -/* 8025D160 90 1F 01 18 */ stw r0, 0x118(r31) -/* 8025D164 48 00 00 C0 */ b lbl_8025D224 -lbl_8025D168: -/* 8025D168 88 1F 01 6B */ lbz r0, 0x16b(r31) -/* 8025D16C 28 00 00 02 */ cmplwi r0, 2 -/* 8025D170 40 82 00 40 */ bne lbl_8025D1B0 -/* 8025D174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025D178 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025D17C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) -/* 8025D180 28 00 00 00 */ cmplwi r0, 0 -/* 8025D184 40 82 00 2C */ bne lbl_8025D1B0 -/* 8025D188 4B FD B0 A5 */ bl getStatus__12dMsgObject_cFv -/* 8025D18C 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8025D190 20 60 00 01 */ subfic r3, r0, 1 -/* 8025D194 30 03 FF FF */ addic r0, r3, -1 -/* 8025D198 7C 00 19 10 */ subfe r0, r0, r3 -/* 8025D19C 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8025D1A0 40 82 00 10 */ bne lbl_8025D1B0 -/* 8025D1A4 7F E3 FB 78 */ mr r3, r31 -/* 8025D1A8 38 80 00 02 */ li r4, 2 -/* 8025D1AC 48 00 06 C1 */ bl restart__8dTimer_cFUc -lbl_8025D1B0: -/* 8025D1B0 88 1F 01 6B */ lbz r0, 0x16b(r31) -/* 8025D1B4 28 00 00 03 */ cmplwi r0, 3 -/* 8025D1B8 40 82 00 6C */ bne lbl_8025D224 -/* 8025D1BC A8 7F 01 68 */ lha r3, 0x168(r31) -/* 8025D1C0 38 03 FF FF */ addi r0, r3, -1 -/* 8025D1C4 B0 1F 01 68 */ sth r0, 0x168(r31) -/* 8025D1C8 A8 9F 01 68 */ lha r4, 0x168(r31) -/* 8025D1CC 7C 80 07 35 */ extsh. r0, r4 -/* 8025D1D0 41 81 00 1C */ bgt lbl_8025D1EC -/* 8025D1D4 38 00 00 00 */ li r0, 0 -/* 8025D1D8 B0 1F 01 68 */ sth r0, 0x168(r31) -/* 8025D1DC 7F E3 FB 78 */ mr r3, r31 -/* 8025D1E0 38 80 00 03 */ li r4, 3 -/* 8025D1E4 48 00 06 89 */ bl restart__8dTimer_cFUc -/* 8025D1E8 48 00 00 3C */ b lbl_8025D224 -lbl_8025D1EC: -/* 8025D1EC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025D1F0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025D1F4 A8 03 0B EA */ lha r0, 0xbea(r3) -/* 8025D1F8 7C 04 00 00 */ cmpw r4, r0 -/* 8025D1FC 40 82 00 28 */ bne lbl_8025D224 -/* 8025D200 38 00 00 00 */ li r0, 0 -/* 8025D204 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D208 98 03 03 DC */ stb r0, 0x3dc(r3) -/* 8025D20C 80 1F 01 54 */ lwz r0, 0x154(r31) -/* 8025D210 2C 00 00 03 */ cmpwi r0, 3 -/* 8025D214 41 82 00 10 */ beq lbl_8025D224 -/* 8025D218 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D21C 38 80 05 2D */ li r4, 0x52d -/* 8025D220 48 00 33 55 */ bl createStart__21dDlst_TimerScrnDraw_cFUs -lbl_8025D224: -/* 8025D224 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D228 48 00 09 B9 */ bl setHIO__21dDlst_TimerScrnDraw_cFv -/* 8025D22C 88 1F 01 6C */ lbz r0, 0x16c(r31) -/* 8025D230 28 00 00 08 */ cmplwi r0, 8 -/* 8025D234 40 82 00 24 */ bne lbl_8025D258 -/* 8025D238 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D23C 48 00 2D 5D */ bl closeAnime__21dDlst_TimerScrnDraw_cFv -/* 8025D240 2C 03 00 00 */ cmpwi r3, 0 -/* 8025D244 41 82 00 30 */ beq lbl_8025D274 -/* 8025D248 7F E3 FB 78 */ mr r3, r31 -/* 8025D24C 4B DC 28 01 */ bl fopMsgM_Delete__FPv -/* 8025D250 38 60 00 01 */ li r3, 1 -/* 8025D254 48 00 00 D0 */ b lbl_8025D324 -lbl_8025D258: -/* 8025D258 28 00 00 06 */ cmplwi r0, 6 -/* 8025D25C 40 82 00 18 */ bne lbl_8025D274 -/* 8025D260 80 7F 01 58 */ lwz r3, 0x158(r31) -/* 8025D264 2C 03 00 00 */ cmpwi r3, 0 -/* 8025D268 40 81 00 0C */ ble lbl_8025D274 -/* 8025D26C 38 03 FF FF */ addi r0, r3, -1 -/* 8025D270 90 1F 01 58 */ stw r0, 0x158(r31) -lbl_8025D274: -/* 8025D274 88 1F 01 6C */ lbz r0, 0x16c(r31) -/* 8025D278 28 00 00 00 */ cmplwi r0, 0 -/* 8025D27C 41 82 00 2C */ beq lbl_8025D2A8 -/* 8025D280 28 00 00 02 */ cmplwi r0, 2 -/* 8025D284 41 82 00 24 */ beq lbl_8025D2A8 -/* 8025D288 80 7F 01 5C */ lwz r3, 0x15c(r31) -/* 8025D28C 2C 03 00 05 */ cmpwi r3, 5 -/* 8025D290 40 81 00 10 */ ble lbl_8025D2A0 -/* 8025D294 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D298 48 00 28 DD */ bl anime__21dDlst_TimerScrnDraw_cFv -/* 8025D29C 48 00 00 0C */ b lbl_8025D2A8 -lbl_8025D2A0: -/* 8025D2A0 38 03 00 01 */ addi r0, r3, 1 -/* 8025D2A4 90 1F 01 5C */ stw r0, 0x15c(r31) -lbl_8025D2A8: -/* 8025D2A8 80 1F 01 54 */ lwz r0, 0x154(r31) -/* 8025D2AC 2C 00 00 02 */ cmpwi r0, 2 -/* 8025D2B0 41 82 00 2C */ beq lbl_8025D2DC -/* 8025D2B4 2C 00 00 07 */ cmpwi r0, 7 -/* 8025D2B8 41 82 00 24 */ beq lbl_8025D2DC -/* 8025D2BC 2C 00 00 03 */ cmpwi r0, 3 -/* 8025D2C0 41 82 00 1C */ beq lbl_8025D2DC -/* 8025D2C4 2C 00 00 04 */ cmpwi r0, 4 -/* 8025D2C8 41 82 00 14 */ beq lbl_8025D2DC -/* 8025D2CC 2C 00 00 05 */ cmpwi r0, 5 -/* 8025D2D0 41 82 00 0C */ beq lbl_8025D2DC -/* 8025D2D4 2C 00 00 00 */ cmpwi r0, 0 -/* 8025D2D8 40 82 00 1C */ bne lbl_8025D2F4 -lbl_8025D2DC: -/* 8025D2DC 7F E3 FB 78 */ mr r3, r31 -/* 8025D2E0 48 00 07 11 */ bl getTimeMs__8dTimer_cFv -/* 8025D2E4 7C 64 1B 78 */ mr r4, r3 -/* 8025D2E8 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D2EC 48 00 1C 05 */ bl setTimer__21dDlst_TimerScrnDraw_cFi -/* 8025D2F0 48 00 00 18 */ b lbl_8025D308 -lbl_8025D2F4: -/* 8025D2F4 7F E3 FB 78 */ mr r3, r31 -/* 8025D2F8 48 00 07 A5 */ bl getRestTimeMs__8dTimer_cFv -/* 8025D2FC 7C 64 1B 78 */ mr r4, r3 -/* 8025D300 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D304 48 00 1B ED */ bl setTimer__21dDlst_TimerScrnDraw_cFi -lbl_8025D308: -/* 8025D308 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D30C 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 8025D310 38 A4 01 88 */ addi r5, r4, g_meter2_info@l /* 0x80430188@l */ -/* 8025D314 88 85 00 BC */ lbz r4, 0xbc(r5) -/* 8025D318 88 A5 00 BB */ lbz r5, 0xbb(r5) -/* 8025D31C 48 00 1E 65 */ bl setCounter__21dDlst_TimerScrnDraw_cFUcUc -/* 8025D320 38 60 00 01 */ li r3, 1 -lbl_8025D324: -/* 8025D324 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025D328 83 C1 00 08 */ lwz r30, 8(r1) -/* 8025D32C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025D330 7C 08 03 A6 */ mtlr r0 -/* 8025D334 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025D338 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/anime__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/anime__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index 93ed8793a33..00000000000 --- a/asm/d/d_timer/anime__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,276 +0,0 @@ -lbl_8025FB74: -/* 8025FB74 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8025FB78 7C 08 02 A6 */ mflr r0 -/* 8025FB7C 90 01 00 64 */ stw r0, 0x64(r1) -/* 8025FB80 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 8025FB84 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 8025FB88 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 8025FB8C F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 8025FB90 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025FB94 48 10 26 49 */ bl _savegpr_29 -/* 8025FB98 7C 7D 1B 78 */ mr r29, r3 -/* 8025FB9C 88 03 03 DE */ lbz r0, 0x3de(r3) -/* 8025FBA0 28 00 00 00 */ cmplwi r0, 0 -/* 8025FBA4 40 82 03 CC */ bne lbl_8025FF70 -/* 8025FBA8 80 7D 03 D8 */ lwz r3, 0x3d8(r29) -/* 8025FBAC 3B C2 B5 60 */ la r30, animeFrame(r2) /* 80454F60-_SDA2_BASE_ */ -/* 8025FBB0 A8 1E 00 04 */ lha r0, 4(r30) -/* 8025FBB4 7C 03 00 00 */ cmpw r3, r0 -/* 8025FBB8 41 81 00 10 */ bgt lbl_8025FBC8 -/* 8025FBBC 38 03 00 01 */ addi r0, r3, 1 -/* 8025FBC0 90 1D 03 D8 */ stw r0, 0x3d8(r29) -/* 8025FBC4 48 00 00 0C */ b lbl_8025FBD0 -lbl_8025FBC8: -/* 8025FBC8 38 00 00 01 */ li r0, 1 -/* 8025FBCC 98 1D 03 DE */ stb r0, 0x3de(r29) -lbl_8025FBD0: -/* 8025FBD0 80 1D 03 D8 */ lwz r0, 0x3d8(r29) -/* 8025FBD4 3B E2 B5 60 */ la r31, animeFrame(r2) /* 80454F60-_SDA2_BASE_ */ -/* 8025FBD8 A8 9F 00 02 */ lha r4, 2(r31) -/* 8025FBDC 7C 00 20 00 */ cmpw r0, r4 -/* 8025FBE0 41 81 01 AC */ bgt lbl_8025FD8C -/* 8025FBE4 7C 00 07 34 */ extsh r0, r0 -/* 8025FBE8 C8 62 B5 58 */ lfd f3, lit_4627(r2) -/* 8025FBEC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8025FBF0 90 01 00 0C */ stw r0, 0xc(r1) -/* 8025FBF4 3C 60 43 30 */ lis r3, 0x4330 -/* 8025FBF8 90 61 00 08 */ stw r3, 8(r1) -/* 8025FBFC C8 01 00 08 */ lfd f0, 8(r1) -/* 8025FC00 EC 20 18 28 */ fsubs f1, f0, f3 -/* 8025FC04 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025FC08 90 61 00 10 */ stw r3, 0x10(r1) -/* 8025FC0C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8025FC10 EC 00 18 28 */ fsubs f0, f0, f3 -/* 8025FC14 EC 41 00 32 */ fmuls f2, f1, f0 -/* 8025FC18 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 8025FC1C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8025FC20 90 61 00 18 */ stw r3, 0x18(r1) -/* 8025FC24 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8025FC28 EC 20 18 28 */ fsubs f1, f0, f3 -/* 8025FC2C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025FC30 90 61 00 20 */ stw r3, 0x20(r1) -/* 8025FC34 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 8025FC38 EC 00 18 28 */ fsubs f0, f0, f3 -/* 8025FC3C EC 01 00 32 */ fmuls f0, f1, f0 -/* 8025FC40 EF E2 00 24 */ fdivs f31, f2, f0 -/* 8025FC44 C0 22 B5 68 */ lfs f1, lit_5094(r2) -/* 8025FC48 C0 02 B5 4C */ lfs f0, lit_4124(r2) -/* 8025FC4C EC 00 F8 28 */ fsubs f0, f0, f31 -/* 8025FC50 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025FC54 80 1D 00 18 */ lwz r0, 0x18(r29) -/* 8025FC58 28 00 00 00 */ cmplwi r0, 0 -/* 8025FC5C 41 82 01 18 */ beq lbl_8025FD74 -/* 8025FC60 88 1D 03 E2 */ lbz r0, 0x3e2(r29) -/* 8025FC64 28 00 00 00 */ cmplwi r0, 0 -/* 8025FC68 41 82 00 30 */ beq lbl_8025FC98 -/* 8025FC6C 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FC70 28 00 00 00 */ cmplwi r0, 0 -/* 8025FC74 40 82 00 24 */ bne lbl_8025FC98 -/* 8025FC78 7F A3 EB 78 */ mr r3, r29 -/* 8025FC7C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FC80 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FC84 C0 04 0B 84 */ lfs f0, 0xb84(r4) -/* 8025FC88 EC 20 08 2A */ fadds f1, f0, f1 -/* 8025FC8C C0 44 0B 88 */ lfs f2, 0xb88(r4) -/* 8025FC90 4B FF FD 9D */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff -/* 8025FC94 48 00 00 2C */ b lbl_8025FCC0 -lbl_8025FC98: -/* 8025FC98 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FC9C 54 05 10 3A */ slwi r5, r0, 2 -/* 8025FCA0 7F A3 EB 78 */ mr r3, r29 -/* 8025FCA4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FCA8 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FCAC 7C 80 2A 14 */ add r4, r0, r5 -/* 8025FCB0 C0 04 0A E0 */ lfs f0, 0xae0(r4) -/* 8025FCB4 EC 20 08 2A */ fadds f1, f0, f1 -/* 8025FCB8 C0 44 0A EC */ lfs f2, 0xaec(r4) -/* 8025FCBC 4B FF FD 71 */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff -lbl_8025FCC0: -/* 8025FCC0 80 7D 00 18 */ lwz r3, 0x18(r29) -/* 8025FCC4 C0 3D 03 B0 */ lfs f1, 0x3b0(r29) -/* 8025FCC8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FCCC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FCD0 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FCD4 54 00 10 3A */ slwi r0, r0, 2 -/* 8025FCD8 7C 84 02 14 */ add r4, r4, r0 -/* 8025FCDC C0 04 0A F8 */ lfs f0, 0xaf8(r4) -/* 8025FCE0 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 8025FCE4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025FCE8 4B FF 5A E9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025FCEC 88 1D 03 E2 */ lbz r0, 0x3e2(r29) -/* 8025FCF0 28 00 00 00 */ cmplwi r0, 0 -/* 8025FCF4 41 82 00 44 */ beq lbl_8025FD38 -/* 8025FCF8 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FCFC 28 00 00 00 */ cmplwi r0, 0 -/* 8025FD00 40 82 00 38 */ bne lbl_8025FD38 -/* 8025FD04 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FD08 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FD0C C0 24 0B 80 */ lfs f1, 0xb80(r4) -/* 8025FD10 80 7D 00 18 */ lwz r3, 0x18(r29) -/* 8025FD14 80 63 00 04 */ lwz r3, 4(r3) -/* 8025FD18 C0 04 0B 7C */ lfs f0, 0xb7c(r4) -/* 8025FD1C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8025FD20 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 8025FD24 81 83 00 00 */ lwz r12, 0(r3) -/* 8025FD28 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8025FD2C 7D 89 03 A6 */ mtctr r12 -/* 8025FD30 4E 80 04 21 */ bctrl -/* 8025FD34 48 00 00 40 */ b lbl_8025FD74 -lbl_8025FD38: -/* 8025FD38 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FD3C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FD40 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FD44 54 00 10 3A */ slwi r0, r0, 2 -/* 8025FD48 7C 83 02 14 */ add r4, r3, r0 -/* 8025FD4C C0 24 0A D4 */ lfs f1, 0xad4(r4) -/* 8025FD50 80 7D 00 18 */ lwz r3, 0x18(r29) -/* 8025FD54 80 63 00 04 */ lwz r3, 4(r3) -/* 8025FD58 C0 04 0A C8 */ lfs f0, 0xac8(r4) -/* 8025FD5C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8025FD60 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 8025FD64 81 83 00 00 */ lwz r12, 0(r3) -/* 8025FD68 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8025FD6C 7D 89 03 A6 */ mtctr r12 -/* 8025FD70 4E 80 04 21 */ bctrl -lbl_8025FD74: -/* 8025FD74 80 7D 03 D8 */ lwz r3, 0x3d8(r29) -/* 8025FD78 A8 1F 00 02 */ lha r0, 2(r31) -/* 8025FD7C 7C 03 00 00 */ cmpw r3, r0 -/* 8025FD80 40 82 00 0C */ bne lbl_8025FD8C -/* 8025FD84 38 00 00 01 */ li r0, 1 -/* 8025FD88 98 1D 03 DF */ stb r0, 0x3df(r29) -lbl_8025FD8C: -/* 8025FD8C 80 7D 03 D8 */ lwz r3, 0x3d8(r29) -/* 8025FD90 A8 82 B5 60 */ lha r4, animeFrame(r2) -/* 8025FD94 7C 03 20 00 */ cmpw r3, r4 -/* 8025FD98 40 81 01 D8 */ ble lbl_8025FF70 -/* 8025FD9C A8 1E 00 04 */ lha r0, 4(r30) -/* 8025FDA0 7C 03 00 00 */ cmpw r3, r0 -/* 8025FDA4 41 81 01 CC */ bgt lbl_8025FF70 -/* 8025FDA8 7C 04 18 50 */ subf r0, r4, r3 -/* 8025FDAC 7C 00 07 34 */ extsh r0, r0 -/* 8025FDB0 A8 9F 00 02 */ lha r4, 2(r31) -/* 8025FDB4 C8 62 B5 58 */ lfd f3, lit_4627(r2) -/* 8025FDB8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8025FDBC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025FDC0 3C 60 43 30 */ lis r3, 0x4330 -/* 8025FDC4 90 61 00 20 */ stw r3, 0x20(r1) -/* 8025FDC8 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 8025FDCC EC 20 18 28 */ fsubs f1, f0, f3 -/* 8025FDD0 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8025FDD4 90 61 00 18 */ stw r3, 0x18(r1) -/* 8025FDD8 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8025FDDC EC 00 18 28 */ fsubs f0, f0, f3 -/* 8025FDE0 EC 41 00 32 */ fmuls f2, f1, f0 -/* 8025FDE4 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 8025FDE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025FDEC 90 61 00 10 */ stw r3, 0x10(r1) -/* 8025FDF0 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8025FDF4 EC 20 18 28 */ fsubs f1, f0, f3 -/* 8025FDF8 90 01 00 0C */ stw r0, 0xc(r1) -/* 8025FDFC 90 61 00 08 */ stw r3, 8(r1) -/* 8025FE00 C8 01 00 08 */ lfd f0, 8(r1) -/* 8025FE04 EC 00 18 28 */ fsubs f0, f0, f3 -/* 8025FE08 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8025FE0C EF E2 00 24 */ fdivs f31, f2, f0 -/* 8025FE10 C0 22 B5 68 */ lfs f1, lit_5094(r2) -/* 8025FE14 C0 02 B5 4C */ lfs f0, lit_4124(r2) -/* 8025FE18 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 8025FE1C EF C1 00 32 */ fmuls f30, f1, f0 -/* 8025FE20 80 1D 00 14 */ lwz r0, 0x14(r29) -/* 8025FE24 28 00 00 00 */ cmplwi r0, 0 -/* 8025FE28 41 82 00 94 */ beq lbl_8025FEBC -/* 8025FE2C 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FE30 54 05 10 3A */ slwi r5, r0, 2 -/* 8025FE34 7F A3 EB 78 */ mr r3, r29 -/* 8025FE38 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FE3C 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FE40 7C 80 2A 14 */ add r4, r0, r5 -/* 8025FE44 C0 04 0B 1C */ lfs f0, 0xb1c(r4) -/* 8025FE48 EC 20 F0 2A */ fadds f1, f0, f30 -/* 8025FE4C C0 44 0B 28 */ lfs f2, 0xb28(r4) -/* 8025FE50 4B FF FC 1D */ bl setCounterPos__21dDlst_TimerScrnDraw_cFff -/* 8025FE54 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 8025FE58 C0 3D 03 B0 */ lfs f1, 0x3b0(r29) -/* 8025FE5C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FE60 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FE64 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FE68 54 00 10 3A */ slwi r0, r0, 2 -/* 8025FE6C 7C 84 02 14 */ add r4, r4, r0 -/* 8025FE70 C0 04 0B 34 */ lfs f0, 0xb34(r4) -/* 8025FE74 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 8025FE78 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025FE7C 4B FF 59 55 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025FE80 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FE84 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FE88 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FE8C 54 00 10 3A */ slwi r0, r0, 2 -/* 8025FE90 7C 83 02 14 */ add r4, r3, r0 -/* 8025FE94 C0 24 0B 10 */ lfs f1, 0xb10(r4) -/* 8025FE98 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 8025FE9C 80 63 00 04 */ lwz r3, 4(r3) -/* 8025FEA0 C0 04 0B 04 */ lfs f0, 0xb04(r4) -/* 8025FEA4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8025FEA8 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 8025FEAC 81 83 00 00 */ lwz r12, 0(r3) -/* 8025FEB0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8025FEB4 7D 89 03 A6 */ mtctr r12 -/* 8025FEB8 4E 80 04 21 */ bctrl -lbl_8025FEBC: -/* 8025FEBC 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 8025FEC0 28 00 00 00 */ cmplwi r0, 0 -/* 8025FEC4 41 82 00 94 */ beq lbl_8025FF58 -/* 8025FEC8 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FECC 54 05 10 3A */ slwi r5, r0, 2 -/* 8025FED0 7F A3 EB 78 */ mr r3, r29 -/* 8025FED4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FED8 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FEDC 7C 80 2A 14 */ add r4, r0, r5 -/* 8025FEE0 C0 04 0B 58 */ lfs f0, 0xb58(r4) -/* 8025FEE4 EC 20 F0 2A */ fadds f1, f0, f30 -/* 8025FEE8 C0 44 0B 64 */ lfs f2, 0xb64(r4) -/* 8025FEEC 4B FF FB AD */ bl setImagePos__21dDlst_TimerScrnDraw_cFff -/* 8025FEF0 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 8025FEF4 C0 3D 03 B0 */ lfs f1, 0x3b0(r29) -/* 8025FEF8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FEFC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FF00 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FF04 54 00 10 3A */ slwi r0, r0, 2 -/* 8025FF08 7C 84 02 14 */ add r4, r4, r0 -/* 8025FF0C C0 04 0B 70 */ lfs f0, 0xb70(r4) -/* 8025FF10 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 8025FF14 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025FF18 4B FF 58 B9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025FF1C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025FF20 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025FF24 88 1D 03 DD */ lbz r0, 0x3dd(r29) -/* 8025FF28 54 00 10 3A */ slwi r0, r0, 2 -/* 8025FF2C 7C 83 02 14 */ add r4, r3, r0 -/* 8025FF30 C0 24 0B 4C */ lfs f1, 0xb4c(r4) -/* 8025FF34 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 8025FF38 80 63 00 04 */ lwz r3, 4(r3) -/* 8025FF3C C0 04 0B 40 */ lfs f0, 0xb40(r4) -/* 8025FF40 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8025FF44 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 8025FF48 81 83 00 00 */ lwz r12, 0(r3) -/* 8025FF4C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8025FF50 7D 89 03 A6 */ mtctr r12 -/* 8025FF54 4E 80 04 21 */ bctrl -lbl_8025FF58: -/* 8025FF58 80 7D 03 D8 */ lwz r3, 0x3d8(r29) -/* 8025FF5C A8 1E 00 04 */ lha r0, 4(r30) -/* 8025FF60 7C 03 00 00 */ cmpw r3, r0 -/* 8025FF64 40 82 00 0C */ bne lbl_8025FF70 -/* 8025FF68 38 00 00 01 */ li r0, 1 -/* 8025FF6C 98 1D 03 E0 */ stb r0, 0x3e0(r29) -lbl_8025FF70: -/* 8025FF70 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 8025FF74 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 8025FF78 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 8025FF7C CB C1 00 40 */ lfd f30, 0x40(r1) -/* 8025FF80 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025FF84 48 10 22 A5 */ bl _restgpr_29 -/* 8025FF88 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8025FF8C 7C 08 03 A6 */ mtlr r0 -/* 8025FF90 38 21 00 60 */ addi r1, r1, 0x60 -/* 8025FF94 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei.s b/asm/d/d_timer/changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei.s deleted file mode 100644 index 9afb06c3c32..00000000000 --- a/asm/d/d_timer/changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8025EE24: -/* 8025EE24 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025EE28 7C 08 02 A6 */ mflr r0 -/* 8025EE2C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025EE30 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025EE34 48 10 33 A5 */ bl _savegpr_28 -/* 8025EE38 7C 7C 1B 78 */ mr r28, r3 -/* 8025EE3C 7C 9D 23 78 */ mr r29, r4 -/* 8025EE40 7C BE 2B 79 */ or. r30, r5, r5 -/* 8025EE44 41 80 00 0C */ blt lbl_8025EE50 -/* 8025EE48 2C 1E 00 0A */ cmpwi r30, 0xa -/* 8025EE4C 41 80 00 08 */ blt lbl_8025EE54 -lbl_8025EE50: -/* 8025EE50 3B C0 00 00 */ li r30, 0 -lbl_8025EE54: -/* 8025EE54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025EE58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025EE5C 83 E3 5D 30 */ lwz r31, 0x5d30(r3) -/* 8025EE60 7F 83 E3 78 */ mr r3, r28 -/* 8025EE64 7F C4 F3 78 */ mr r4, r30 -/* 8025EE68 48 00 00 65 */ bl getNumber__21dDlst_TimerScrnDraw_cFi -/* 8025EE6C 7C 65 1B 78 */ mr r5, r3 -/* 8025EE70 7F E3 FB 78 */ mr r3, r31 -/* 8025EE74 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 8025EE78 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 8025EE7C 81 9F 00 00 */ lwz r12, 0(r31) -/* 8025EE80 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8025EE84 7D 89 03 A6 */ mtctr r12 -/* 8025EE88 4E 80 04 21 */ bctrl -/* 8025EE8C 7F 83 E3 78 */ mr r3, r28 -/* 8025EE90 7F C4 F3 78 */ mr r4, r30 -/* 8025EE94 48 00 00 39 */ bl getNumber__21dDlst_TimerScrnDraw_cFi -/* 8025EE98 7C 64 1B 78 */ mr r4, r3 -/* 8025EE9C 7F A3 EB 78 */ mr r3, r29 -/* 8025EEA0 38 A0 00 00 */ li r5, 0 -/* 8025EEA4 81 9D 00 00 */ lwz r12, 0(r29) -/* 8025EEA8 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8025EEAC 7D 89 03 A6 */ mtctr r12 -/* 8025EEB0 4E 80 04 21 */ bctrl -/* 8025EEB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025EEB8 48 10 33 6D */ bl _restgpr_28 -/* 8025EEBC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025EEC0 7C 08 03 A6 */ mtlr r0 -/* 8025EEC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025EEC8 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index dbdde168392..00000000000 --- a/asm/d/d_timer/checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80260AA8: -/* 80260AA8 88 03 00 8C */ lbz r0, 0x8c(r3) -/* 80260AAC 28 00 00 01 */ cmplwi r0, 1 -/* 80260AB0 40 82 00 1C */ bne lbl_80260ACC -/* 80260AB4 C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 80260AB8 C0 03 00 84 */ lfs f0, 0x84(r3) -/* 80260ABC FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80260AC0 40 82 00 0C */ bne lbl_80260ACC -/* 80260AC4 38 60 00 01 */ li r3, 1 -/* 80260AC8 4E 80 00 20 */ blr -lbl_80260ACC: -/* 80260ACC 38 60 00 00 */ li r3, 0 -/* 80260AD0 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/closeAnime__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/closeAnime__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index ca0be1889ba..00000000000 --- a/asm/d/d_timer/closeAnime__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,154 +0,0 @@ -lbl_8025FF98: -/* 8025FF98 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8025FF9C 7C 08 02 A6 */ mflr r0 -/* 8025FFA0 90 01 00 54 */ stw r0, 0x54(r1) -/* 8025FFA4 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8025FFA8 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 8025FFAC DB C1 00 30 */ stfd f30, 0x30(r1) -/* 8025FFB0 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 8025FFB4 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8025FFB8 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8025FFBC 7C 7E 1B 78 */ mr r30, r3 -/* 8025FFC0 3B E0 00 00 */ li r31, 0 -/* 8025FFC4 80 83 03 D8 */ lwz r4, 0x3d8(r3) -/* 8025FFC8 38 04 00 01 */ addi r0, r4, 1 -/* 8025FFCC 90 03 03 D8 */ stw r0, 0x3d8(r3) -/* 8025FFD0 80 A3 03 D8 */ lwz r5, 0x3d8(r3) -/* 8025FFD4 2C 05 00 07 */ cmpwi r5, 7 -/* 8025FFD8 41 81 01 D0 */ bgt lbl_802601A8 -/* 8025FFDC 7C A0 07 34 */ extsh r0, r5 -/* 8025FFE0 C8 62 B5 58 */ lfd f3, lit_4627(r2) -/* 8025FFE4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8025FFE8 90 01 00 0C */ stw r0, 0xc(r1) -/* 8025FFEC 3C 80 43 30 */ lis r4, 0x4330 -/* 8025FFF0 90 81 00 08 */ stw r4, 8(r1) -/* 8025FFF4 C8 01 00 08 */ lfd f0, 8(r1) -/* 8025FFF8 EC 20 18 28 */ fsubs f1, f0, f3 -/* 8025FFFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80260000 90 81 00 10 */ stw r4, 0x10(r1) -/* 80260004 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80260008 EC 00 18 28 */ fsubs f0, f0, f3 -/* 8026000C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80260010 C0 42 B5 6C */ lfs f2, lit_5143(r2) -/* 80260014 EC 80 10 24 */ fdivs f4, f0, f2 -/* 80260018 20 05 00 07 */ subfic r0, r5, 7 -/* 8026001C 7C 00 07 34 */ extsh r0, r0 -/* 80260020 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80260024 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80260028 90 81 00 18 */ stw r4, 0x18(r1) -/* 8026002C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80260030 EC 20 18 28 */ fsubs f1, f0, f3 -/* 80260034 90 01 00 24 */ stw r0, 0x24(r1) -/* 80260038 90 81 00 20 */ stw r4, 0x20(r1) -/* 8026003C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80260040 EC 00 18 28 */ fsubs f0, f0, f3 -/* 80260044 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80260048 EF E0 10 24 */ fdivs f31, f0, f2 -/* 8026004C C0 02 B5 68 */ lfs f0, lit_5094(r2) -/* 80260050 EF C0 01 32 */ fmuls f30, f0, f4 -/* 80260054 80 1E 00 18 */ lwz r0, 0x18(r30) -/* 80260058 28 00 00 00 */ cmplwi r0, 0 -/* 8026005C 41 82 00 8C */ beq lbl_802600E8 -/* 80260060 88 1E 03 E2 */ lbz r0, 0x3e2(r30) -/* 80260064 28 00 00 00 */ cmplwi r0, 0 -/* 80260068 41 82 00 2C */ beq lbl_80260094 -/* 8026006C 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 80260070 28 00 00 00 */ cmplwi r0, 0 -/* 80260074 40 82 00 20 */ bne lbl_80260094 -/* 80260078 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8026007C 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80260080 C0 04 0B 84 */ lfs f0, 0xb84(r4) -/* 80260084 EC 20 F0 2A */ fadds f1, f0, f30 -/* 80260088 C0 44 0B 88 */ lfs f2, 0xb88(r4) -/* 8026008C 4B FF F9 A1 */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff -/* 80260090 48 00 00 2C */ b lbl_802600BC -lbl_80260094: -/* 80260094 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 80260098 54 05 10 3A */ slwi r5, r0, 2 -/* 8026009C 7F C3 F3 78 */ mr r3, r30 -/* 802600A0 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802600A4 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802600A8 7C 80 2A 14 */ add r4, r0, r5 -/* 802600AC C0 04 0A E0 */ lfs f0, 0xae0(r4) -/* 802600B0 EC 20 F0 2A */ fadds f1, f0, f30 -/* 802600B4 C0 44 0A EC */ lfs f2, 0xaec(r4) -/* 802600B8 4B FF F9 75 */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff -lbl_802600BC: -/* 802600BC 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 802600C0 C0 3E 03 B0 */ lfs f1, 0x3b0(r30) -/* 802600C4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802600C8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802600CC 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 802600D0 54 00 10 3A */ slwi r0, r0, 2 -/* 802600D4 7C 84 02 14 */ add r4, r4, r0 -/* 802600D8 C0 04 0A F8 */ lfs f0, 0xaf8(r4) -/* 802600DC EC 1F 00 32 */ fmuls f0, f31, f0 -/* 802600E0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802600E4 4B FF 56 ED */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_802600E8: -/* 802600E8 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 802600EC 28 00 00 00 */ cmplwi r0, 0 -/* 802600F0 41 82 00 58 */ beq lbl_80260148 -/* 802600F4 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 802600F8 54 05 10 3A */ slwi r5, r0, 2 -/* 802600FC 7F C3 F3 78 */ mr r3, r30 -/* 80260100 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80260104 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80260108 7C 80 2A 14 */ add r4, r0, r5 -/* 8026010C C0 04 0B 1C */ lfs f0, 0xb1c(r4) -/* 80260110 EC 20 F0 2A */ fadds f1, f0, f30 -/* 80260114 C0 44 0B 28 */ lfs f2, 0xb28(r4) -/* 80260118 4B FF F9 55 */ bl setCounterPos__21dDlst_TimerScrnDraw_cFff -/* 8026011C 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 80260120 C0 3E 03 B0 */ lfs f1, 0x3b0(r30) -/* 80260124 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80260128 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8026012C 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 80260130 54 00 10 3A */ slwi r0, r0, 2 -/* 80260134 7C 84 02 14 */ add r4, r4, r0 -/* 80260138 C0 04 0B 34 */ lfs f0, 0xb34(r4) -/* 8026013C EC 1F 00 32 */ fmuls f0, f31, f0 -/* 80260140 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80260144 4B FF 56 8D */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80260148: -/* 80260148 80 1E 00 1C */ lwz r0, 0x1c(r30) -/* 8026014C 28 00 00 00 */ cmplwi r0, 0 -/* 80260150 41 82 00 58 */ beq lbl_802601A8 -/* 80260154 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 80260158 54 05 10 3A */ slwi r5, r0, 2 -/* 8026015C 7F C3 F3 78 */ mr r3, r30 -/* 80260160 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80260164 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80260168 7C 80 2A 14 */ add r4, r0, r5 -/* 8026016C C0 04 0B 58 */ lfs f0, 0xb58(r4) -/* 80260170 EC 20 F0 2A */ fadds f1, f0, f30 -/* 80260174 C0 44 0B 64 */ lfs f2, 0xb64(r4) -/* 80260178 4B FF F9 21 */ bl setImagePos__21dDlst_TimerScrnDraw_cFff -/* 8026017C 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 80260180 C0 3E 03 B0 */ lfs f1, 0x3b0(r30) -/* 80260184 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80260188 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8026018C 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 80260190 54 00 10 3A */ slwi r0, r0, 2 -/* 80260194 7C 84 02 14 */ add r4, r4, r0 -/* 80260198 C0 04 0B 70 */ lfs f0, 0xb70(r4) -/* 8026019C EC 1F 00 32 */ fmuls f0, f31, f0 -/* 802601A0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802601A4 4B FF 56 2D */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_802601A8: -/* 802601A8 80 1E 03 D8 */ lwz r0, 0x3d8(r30) -/* 802601AC 2C 00 00 07 */ cmpwi r0, 7 -/* 802601B0 41 80 00 08 */ blt lbl_802601B8 -/* 802601B4 3B E0 00 01 */ li r31, 1 -lbl_802601B8: -/* 802601B8 7F E3 FB 78 */ mr r3, r31 -/* 802601BC E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 802601C0 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 802601C4 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 802601C8 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 802601CC 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 802601D0 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 802601D4 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802601D8 7C 08 03 A6 */ mtlr r0 -/* 802601DC 38 21 00 50 */ addi r1, r1, 0x50 -/* 802601E0 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/createGetIn__21dDlst_TimerScrnDraw_cF4cXyz.s b/asm/d/d_timer/createGetIn__21dDlst_TimerScrnDraw_cF4cXyz.s deleted file mode 100644 index 1e8a623e784..00000000000 --- a/asm/d/d_timer/createGetIn__21dDlst_TimerScrnDraw_cF4cXyz.s +++ /dev/null @@ -1,242 +0,0 @@ -lbl_802601E4: -/* 802601E4 94 21 FF 20 */ stwu r1, -0xe0(r1) -/* 802601E8 7C 08 02 A6 */ mflr r0 -/* 802601EC 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 802601F0 DB E1 00 D0 */ stfd f31, 0xd0(r1) -/* 802601F4 F3 E1 00 D8 */ psq_st f31, 216(r1), 0, 0 /* qr0 */ -/* 802601F8 DB C1 00 C0 */ stfd f30, 0xc0(r1) -/* 802601FC F3 C1 00 C8 */ psq_st f30, 200(r1), 0, 0 /* qr0 */ -/* 80260200 93 E1 00 BC */ stw r31, 0xbc(r1) -/* 80260204 93 C1 00 B8 */ stw r30, 0xb8(r1) -/* 80260208 7C 7E 1B 78 */ mr r30, r3 -/* 8026020C 7C 9F 23 78 */ mr r31, r4 -/* 80260210 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80260214 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80260218 38 80 03 E4 */ li r4, 0x3e4 -/* 8026021C 38 A1 00 40 */ addi r5, r1, 0x40 -/* 80260220 38 C0 00 00 */ li r6, 0 -/* 80260224 4B FB C0 2D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80260228 80 7E 00 08 */ lwz r3, 8(r30) -/* 8026022C 3C 80 69 6E */ lis r4, 0x696E /* 0x696E5F73@ha */ -/* 80260230 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x696E5F73@l */ -/* 80260234 3C 80 67 65 */ lis r4, 0x6765 /* 0x6765745F@ha */ -/* 80260238 38 A4 74 5F */ addi r5, r4, 0x745F /* 0x6765745F@l */ -/* 8026023C 81 83 00 00 */ lwz r12, 0(r3) -/* 80260240 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80260244 7D 89 03 A6 */ mtctr r12 -/* 80260248 4E 80 04 21 */ bctrl -/* 8026024C 48 0A 04 0D */ bl getStringPtr__10J2DTextBoxCFv -/* 80260250 38 81 00 40 */ addi r4, r1, 0x40 -/* 80260254 48 10 88 D9 */ bl strcpy -/* 80260258 80 7E 00 08 */ lwz r3, 8(r30) -/* 8026025C 3C 80 74 5F */ lis r4, 0x745F /* 0x745F696E@ha */ -/* 80260260 38 C4 69 6E */ addi r6, r4, 0x696E /* 0x745F696E@l */ -/* 80260264 38 A0 67 65 */ li r5, 0x6765 -/* 80260268 81 83 00 00 */ lwz r12, 0(r3) -/* 8026026C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80260270 7D 89 03 A6 */ mtctr r12 -/* 80260274 4E 80 04 21 */ bctrl -/* 80260278 48 0A 03 E1 */ bl getStringPtr__10J2DTextBoxCFv -/* 8026027C 38 81 00 40 */ addi r4, r1, 0x40 -/* 80260280 48 10 88 AD */ bl strcpy -/* 80260284 88 1E 03 DC */ lbz r0, 0x3dc(r30) -/* 80260288 28 00 00 32 */ cmplwi r0, 0x32 -/* 8026028C 40 80 02 BC */ bge lbl_80260548 -/* 80260290 C0 02 B5 70 */ lfs f0, lit_5227(r2) -/* 80260294 54 00 25 36 */ rlwinm r0, r0, 4, 0x14, 0x1b -/* 80260298 7C 7E 02 14 */ add r3, r30, r0 -/* 8026029C D0 03 00 80 */ stfs f0, 0x80(r3) -/* 802602A0 C0 02 B5 50 */ lfs f0, lit_4125(r2) -/* 802602A4 88 1E 03 DC */ lbz r0, 0x3dc(r30) -/* 802602A8 54 00 20 36 */ slwi r0, r0, 4 -/* 802602AC 7C 7E 02 14 */ add r3, r30, r0 -/* 802602B0 D0 03 00 84 */ stfs f0, 0x84(r3) -/* 802602B4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802602B8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802602BC 88 03 0B CA */ lbz r0, 0xbca(r3) -/* 802602C0 28 00 00 01 */ cmplwi r0, 1 -/* 802602C4 40 82 00 48 */ bne lbl_8026030C -/* 802602C8 C0 1F 00 00 */ lfs f0, 0(r31) -/* 802602CC FC 00 00 1E */ fctiwz f0, f0 -/* 802602D0 D8 01 00 A8 */ stfd f0, 0xa8(r1) -/* 802602D4 80 81 00 AC */ lwz r4, 0xac(r1) -/* 802602D8 88 1E 03 DC */ lbz r0, 0x3dc(r30) -/* 802602DC 54 00 20 36 */ slwi r0, r0, 4 -/* 802602E0 7C 7E 02 14 */ add r3, r30, r0 -/* 802602E4 B0 83 00 88 */ sth r4, 0x88(r3) -/* 802602E8 C0 1F 00 04 */ lfs f0, 4(r31) -/* 802602EC FC 00 00 1E */ fctiwz f0, f0 -/* 802602F0 D8 01 00 B0 */ stfd f0, 0xb0(r1) -/* 802602F4 80 81 00 B4 */ lwz r4, 0xb4(r1) -/* 802602F8 88 1E 03 DC */ lbz r0, 0x3dc(r30) -/* 802602FC 54 00 20 36 */ slwi r0, r0, 4 -/* 80260300 7C 7E 02 14 */ add r3, r30, r0 -/* 80260304 B0 83 00 8A */ sth r4, 0x8a(r3) -/* 80260308 48 00 01 E4 */ b lbl_802604EC -lbl_8026030C: -/* 8026030C 38 80 00 00 */ li r4, 0 -/* 80260310 38 61 00 0C */ addi r3, r1, 0xc -/* 80260314 38 00 00 32 */ li r0, 0x32 -/* 80260318 7C 09 03 A6 */ mtctr r0 -lbl_8026031C: -/* 8026031C 98 83 00 00 */ stb r4, 0(r3) -/* 80260320 38 63 00 01 */ addi r3, r3, 1 -/* 80260324 42 00 FF F8 */ bdnz lbl_8026031C -/* 80260328 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8026032C 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80260330 A8 04 0B AE */ lha r0, 0xbae(r4) -/* 80260334 C8 62 B5 58 */ lfd f3, lit_4627(r2) -/* 80260338 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8026033C 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 80260340 3C 60 43 30 */ lis r3, 0x4330 -/* 80260344 90 61 00 B0 */ stw r3, 0xb0(r1) -/* 80260348 C8 01 00 B0 */ lfd f0, 0xb0(r1) -/* 8026034C EC 40 18 28 */ fsubs f2, f0, f3 -/* 80260350 C0 22 B5 74 */ lfs f1, lit_5228(r2) -/* 80260354 A8 04 0B AC */ lha r0, 0xbac(r4) -/* 80260358 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8026035C 90 01 00 AC */ stw r0, 0xac(r1) -/* 80260360 90 61 00 A8 */ stw r3, 0xa8(r1) -/* 80260364 C8 01 00 A8 */ lfd f0, 0xa8(r1) -/* 80260368 EC 00 18 28 */ fsubs f0, f0, f3 -/* 8026036C EC 01 00 2A */ fadds f0, f1, f0 -/* 80260370 EC 42 00 2A */ fadds f2, f2, f0 -/* 80260374 38 60 00 00 */ li r3, 0 -/* 80260378 88 DE 03 DC */ lbz r6, 0x3dc(r30) -/* 8026037C C0 02 B5 70 */ lfs f0, lit_5227(r2) -/* 80260380 38 00 00 01 */ li r0, 1 -/* 80260384 38 81 00 0C */ addi r4, r1, 0xc -/* 80260388 7C C9 03 A6 */ mtctr r6 -/* 8026038C 2C 06 00 00 */ cmpwi r6, 0 -/* 80260390 40 81 00 34 */ ble lbl_802603C4 -lbl_80260394: -/* 80260394 7C BE 1A 14 */ add r5, r30, r3 -/* 80260398 C0 25 00 80 */ lfs f1, 0x80(r5) -/* 8026039C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802603A0 40 81 00 1C */ ble lbl_802603BC -/* 802603A4 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 802603A8 40 80 00 14 */ bge lbl_802603BC -/* 802603AC 88 A5 00 8D */ lbz r5, 0x8d(r5) -/* 802603B0 28 05 00 FF */ cmplwi r5, 0xff -/* 802603B4 41 82 00 08 */ beq lbl_802603BC -/* 802603B8 7C 04 29 AE */ stbx r0, r4, r5 -lbl_802603BC: -/* 802603BC 38 63 00 10 */ addi r3, r3, 0x10 -/* 802603C0 42 00 FF D4 */ bdnz lbl_80260394 -lbl_802603C4: -/* 802603C4 38 80 00 00 */ li r4, 0 -/* 802603C8 38 61 00 0C */ addi r3, r1, 0xc -/* 802603CC 38 00 00 32 */ li r0, 0x32 -/* 802603D0 7C 09 03 A6 */ mtctr r0 -lbl_802603D4: -/* 802603D4 88 03 00 00 */ lbz r0, 0(r3) -/* 802603D8 28 00 00 00 */ cmplwi r0, 0 -/* 802603DC 40 82 00 14 */ bne lbl_802603F0 -/* 802603E0 54 C0 25 36 */ rlwinm r0, r6, 4, 0x14, 0x1b -/* 802603E4 7C 7E 02 14 */ add r3, r30, r0 -/* 802603E8 98 83 00 8D */ stb r4, 0x8d(r3) -/* 802603EC 48 00 00 10 */ b lbl_802603FC -lbl_802603F0: -/* 802603F0 38 84 00 01 */ addi r4, r4, 1 -/* 802603F4 38 63 00 01 */ addi r3, r3, 1 -/* 802603F8 42 00 FF DC */ bdnz lbl_802603D4 -lbl_802603FC: -/* 802603FC C3 E2 B5 40 */ lfs f31, lit_3919(r2) -/* 80260400 FF C0 F8 90 */ fmr f30, f31 -/* 80260404 88 1E 03 DC */ lbz r0, 0x3dc(r30) -/* 80260408 54 00 20 36 */ slwi r0, r0, 4 -/* 8026040C 7C 7E 02 14 */ add r3, r30, r0 -/* 80260410 88 03 00 8D */ lbz r0, 0x8d(r3) -/* 80260414 28 00 00 08 */ cmplwi r0, 8 -/* 80260418 41 81 00 6C */ bgt lbl_80260484 -/* 8026041C 3C 60 80 3C */ lis r3, lit_5239@ha /* 0x803C33C0@ha */ -/* 80260420 38 63 33 C0 */ addi r3, r3, lit_5239@l /* 0x803C33C0@l */ -/* 80260424 54 00 10 3A */ slwi r0, r0, 2 -/* 80260428 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8026042C 7C 09 03 A6 */ mtctr r0 -/* 80260430 4E 80 04 20 */ bctr -/* 80260434 C3 E2 B5 78 */ lfs f31, lit_5229(r2) -/* 80260438 48 00 00 64 */ b lbl_8026049C -/* 8026043C C3 E2 B5 7C */ lfs f31, lit_5230(r2) -/* 80260440 48 00 00 5C */ b lbl_8026049C -/* 80260444 C3 C2 B5 80 */ lfs f30, lit_5231(r2) -/* 80260448 48 00 00 54 */ b lbl_8026049C -/* 8026044C C3 E2 B5 78 */ lfs f31, lit_5229(r2) -/* 80260450 C3 C2 B5 80 */ lfs f30, lit_5231(r2) -/* 80260454 48 00 00 48 */ b lbl_8026049C -/* 80260458 C3 E2 B5 7C */ lfs f31, lit_5230(r2) -/* 8026045C C3 C2 B5 80 */ lfs f30, lit_5231(r2) -/* 80260460 48 00 00 3C */ b lbl_8026049C -/* 80260464 C3 C2 B5 68 */ lfs f30, lit_5094(r2) -/* 80260468 48 00 00 34 */ b lbl_8026049C -/* 8026046C C3 E2 B5 78 */ lfs f31, lit_5229(r2) -/* 80260470 C3 C2 B5 84 */ lfs f30, lit_5232(r2) -/* 80260474 48 00 00 28 */ b lbl_8026049C -/* 80260478 C3 E2 B5 7C */ lfs f31, lit_5230(r2) -/* 8026047C C3 C2 B5 84 */ lfs f30, lit_5232(r2) -/* 80260480 48 00 00 1C */ b lbl_8026049C -lbl_80260484: -/* 80260484 C0 22 B5 88 */ lfs f1, lit_5233(r2) -/* 80260488 48 00 75 05 */ bl cM_rndFX__Ff -/* 8026048C FF E0 08 90 */ fmr f31, f1 -/* 80260490 C0 22 B5 8C */ lfs f1, lit_5234(r2) -/* 80260494 48 00 74 F9 */ bl cM_rndFX__Ff -/* 80260498 FF C0 08 90 */ fmr f30, f1 -lbl_8026049C: -/* 8026049C C0 22 B5 90 */ lfs f1, lit_5235(r2) -/* 802604A0 48 00 74 ED */ bl cM_rndFX__Ff -/* 802604A4 EC 1F 08 2A */ fadds f0, f31, f1 -/* 802604A8 FC 00 00 1E */ fctiwz f0, f0 -/* 802604AC D8 01 00 B0 */ stfd f0, 0xb0(r1) -/* 802604B0 80 81 00 B4 */ lwz r4, 0xb4(r1) -/* 802604B4 88 1E 03 DC */ lbz r0, 0x3dc(r30) -/* 802604B8 54 00 20 36 */ slwi r0, r0, 4 -/* 802604BC 7C 7E 02 14 */ add r3, r30, r0 -/* 802604C0 B0 83 00 88 */ sth r4, 0x88(r3) -/* 802604C4 C0 22 B5 90 */ lfs f1, lit_5235(r2) -/* 802604C8 48 00 74 C5 */ bl cM_rndFX__Ff -/* 802604CC EC 1E 08 2A */ fadds f0, f30, f1 -/* 802604D0 FC 00 00 1E */ fctiwz f0, f0 -/* 802604D4 D8 01 00 A8 */ stfd f0, 0xa8(r1) -/* 802604D8 80 81 00 AC */ lwz r4, 0xac(r1) -/* 802604DC 88 1E 03 DC */ lbz r0, 0x3dc(r30) -/* 802604E0 54 00 20 36 */ slwi r0, r0, 4 -/* 802604E4 7C 7E 02 14 */ add r3, r30, r0 -/* 802604E8 B0 83 00 8A */ sth r4, 0x8a(r3) -lbl_802604EC: -/* 802604EC 38 80 00 00 */ li r4, 0 -/* 802604F0 88 1E 03 DC */ lbz r0, 0x3dc(r30) -/* 802604F4 54 00 20 36 */ slwi r0, r0, 4 -/* 802604F8 7C 7E 02 14 */ add r3, r30, r0 -/* 802604FC 98 83 00 8C */ stb r4, 0x8c(r3) -/* 80260500 38 00 00 4B */ li r0, 0x4b -/* 80260504 90 01 00 08 */ stw r0, 8(r1) -/* 80260508 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8026050C 38 81 00 08 */ addi r4, r1, 8 -/* 80260510 38 A0 00 00 */ li r5, 0 -/* 80260514 38 C0 00 00 */ li r6, 0 -/* 80260518 38 E0 00 00 */ li r7, 0 -/* 8026051C C0 22 B5 4C */ lfs f1, lit_4124(r2) -/* 80260520 FC 40 08 90 */ fmr f2, f1 -/* 80260524 C0 62 B5 50 */ lfs f3, lit_4125(r2) -/* 80260528 FC 80 18 90 */ fmr f4, f3 -/* 8026052C 39 00 00 00 */ li r8, 0 -/* 80260530 48 04 B4 55 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80260534 88 7E 03 DC */ lbz r3, 0x3dc(r30) -/* 80260538 38 03 00 01 */ addi r0, r3, 1 -/* 8026053C 98 1E 03 DC */ stb r0, 0x3dc(r30) -/* 80260540 38 60 00 01 */ li r3, 1 -/* 80260544 48 00 00 08 */ b lbl_8026054C -lbl_80260548: -/* 80260548 38 60 00 00 */ li r3, 0 -lbl_8026054C: -/* 8026054C E3 E1 00 D8 */ psq_l f31, 216(r1), 0, 0 /* qr0 */ -/* 80260550 CB E1 00 D0 */ lfd f31, 0xd0(r1) -/* 80260554 E3 C1 00 C8 */ psq_l f30, 200(r1), 0, 0 /* qr0 */ -/* 80260558 CB C1 00 C0 */ lfd f30, 0xc0(r1) -/* 8026055C 83 E1 00 BC */ lwz r31, 0xbc(r1) -/* 80260560 83 C1 00 B8 */ lwz r30, 0xb8(r1) -/* 80260564 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 80260568 7C 08 03 A6 */ mtlr r0 -/* 8026056C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80260570 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/createGetIn__8dTimer_cF4cXyz.s b/asm/d/d_timer/createGetIn__8dTimer_cF4cXyz.s deleted file mode 100644 index 3fb343cdd68..00000000000 --- a/asm/d/d_timer/createGetIn__8dTimer_cF4cXyz.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_802613DC: -/* 802613DC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802613E0 7C 08 02 A6 */ mflr r0 -/* 802613E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802613E8 C0 04 00 00 */ lfs f0, 0(r4) -/* 802613EC D0 01 00 08 */ stfs f0, 8(r1) -/* 802613F0 C0 04 00 04 */ lfs f0, 4(r4) -/* 802613F4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802613F8 C0 04 00 08 */ lfs f0, 8(r4) -/* 802613FC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80261400 80 63 00 FC */ lwz r3, 0xfc(r3) -/* 80261404 38 81 00 08 */ addi r4, r1, 8 -/* 80261408 4B FF ED DD */ bl createGetIn__21dDlst_TimerScrnDraw_cF4cXyz -/* 8026140C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80261410 7C 08 03 A6 */ mtlr r0 -/* 80261414 38 21 00 20 */ addi r1, r1, 0x20 -/* 80261418 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/createStart__21dDlst_TimerScrnDraw_cFUs.s b/asm/d/d_timer/createStart__21dDlst_TimerScrnDraw_cFUs.s deleted file mode 100644 index 2ee1b4ec94e..00000000000 --- a/asm/d/d_timer/createStart__21dDlst_TimerScrnDraw_cFUs.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80260574: -/* 80260574 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80260578 7C 08 02 A6 */ mflr r0 -/* 8026057C 90 01 00 84 */ stw r0, 0x84(r1) -/* 80260580 93 E1 00 7C */ stw r31, 0x7c(r1) -/* 80260584 7C 7F 1B 78 */ mr r31, r3 -/* 80260588 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8026058C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80260590 54 84 04 3E */ clrlwi r4, r4, 0x10 -/* 80260594 38 A1 00 08 */ addi r5, r1, 8 -/* 80260598 38 C0 00 00 */ li r6, 0 -/* 8026059C 4B FB BC B5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 802605A0 80 7F 00 08 */ lwz r3, 8(r31) -/* 802605A4 3C 80 69 6E */ lis r4, 0x696E /* 0x696E5F73@ha */ -/* 802605A8 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x696E5F73@l */ -/* 802605AC 3C 80 67 65 */ lis r4, 0x6765 /* 0x6765745F@ha */ -/* 802605B0 38 A4 74 5F */ addi r5, r4, 0x745F /* 0x6765745F@l */ -/* 802605B4 81 83 00 00 */ lwz r12, 0(r3) -/* 802605B8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802605BC 7D 89 03 A6 */ mtctr r12 -/* 802605C0 4E 80 04 21 */ bctrl -/* 802605C4 48 0A 00 95 */ bl getStringPtr__10J2DTextBoxCFv -/* 802605C8 38 81 00 08 */ addi r4, r1, 8 -/* 802605CC 48 10 85 61 */ bl strcpy -/* 802605D0 80 7F 00 08 */ lwz r3, 8(r31) -/* 802605D4 3C 80 74 5F */ lis r4, 0x745F /* 0x745F696E@ha */ -/* 802605D8 38 C4 69 6E */ addi r6, r4, 0x696E /* 0x745F696E@l */ -/* 802605DC 38 A0 67 65 */ li r5, 0x6765 -/* 802605E0 81 83 00 00 */ lwz r12, 0(r3) -/* 802605E4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802605E8 7D 89 03 A6 */ mtctr r12 -/* 802605EC 4E 80 04 21 */ bctrl -/* 802605F0 48 0A 00 69 */ bl getStringPtr__10J2DTextBoxCFv -/* 802605F4 38 81 00 08 */ addi r4, r1, 8 -/* 802605F8 48 10 85 35 */ bl strcpy -/* 802605FC 88 1F 03 DC */ lbz r0, 0x3dc(r31) -/* 80260600 28 00 00 00 */ cmplwi r0, 0 -/* 80260604 40 82 00 74 */ bne lbl_80260678 -/* 80260608 C0 02 B5 70 */ lfs f0, lit_5227(r2) -/* 8026060C 54 00 25 36 */ rlwinm r0, r0, 4, 0x14, 0x1b -/* 80260610 7C 7F 02 14 */ add r3, r31, r0 -/* 80260614 D0 03 00 80 */ stfs f0, 0x80(r3) -/* 80260618 C0 02 B5 50 */ lfs f0, lit_4125(r2) -/* 8026061C 88 1F 03 DC */ lbz r0, 0x3dc(r31) -/* 80260620 54 00 20 36 */ slwi r0, r0, 4 -/* 80260624 7C 7F 02 14 */ add r3, r31, r0 -/* 80260628 D0 03 00 84 */ stfs f0, 0x84(r3) -/* 8026062C 38 80 00 00 */ li r4, 0 -/* 80260630 88 1F 03 DC */ lbz r0, 0x3dc(r31) -/* 80260634 54 00 20 36 */ slwi r0, r0, 4 -/* 80260638 7C 7F 02 14 */ add r3, r31, r0 -/* 8026063C B0 83 00 88 */ sth r4, 0x88(r3) -/* 80260640 88 1F 03 DC */ lbz r0, 0x3dc(r31) -/* 80260644 54 00 20 36 */ slwi r0, r0, 4 -/* 80260648 7C 7F 02 14 */ add r3, r31, r0 -/* 8026064C B0 83 00 8A */ sth r4, 0x8a(r3) -/* 80260650 38 80 00 01 */ li r4, 1 -/* 80260654 88 1F 03 DC */ lbz r0, 0x3dc(r31) -/* 80260658 54 00 20 36 */ slwi r0, r0, 4 -/* 8026065C 7C 7F 02 14 */ add r3, r31, r0 -/* 80260660 98 83 00 8C */ stb r4, 0x8c(r3) -/* 80260664 88 7F 03 DC */ lbz r3, 0x3dc(r31) -/* 80260668 38 03 00 01 */ addi r0, r3, 1 -/* 8026066C 98 1F 03 DC */ stb r0, 0x3dc(r31) -/* 80260670 38 60 00 01 */ li r3, 1 -/* 80260674 48 00 00 08 */ b lbl_8026067C -lbl_80260678: -/* 80260678 38 60 00 00 */ li r3, 0 -lbl_8026067C: -/* 8026067C 83 E1 00 7C */ lwz r31, 0x7c(r1) -/* 80260680 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80260684 7C 08 03 A6 */ mtlr r0 -/* 80260688 38 21 00 80 */ addi r1, r1, 0x80 -/* 8026068C 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/deleteScreen__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/deleteScreen__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index 0715810c4ab..00000000000 --- a/asm/d/d_timer/deleteScreen__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,129 +0,0 @@ -lbl_8025EC5C: -/* 8025EC5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025EC60 7C 08 02 A6 */ mflr r0 -/* 8025EC64 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025EC68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025EC6C 7C 7F 1B 78 */ mr r31, r3 -/* 8025EC70 80 63 00 04 */ lwz r3, 4(r3) -/* 8025EC74 28 03 00 00 */ cmplwi r3, 0 -/* 8025EC78 41 82 00 18 */ beq lbl_8025EC90 -/* 8025EC7C 38 80 00 01 */ li r4, 1 -/* 8025EC80 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EC84 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025EC88 7D 89 03 A6 */ mtctr r12 -/* 8025EC8C 4E 80 04 21 */ bctrl -lbl_8025EC90: -/* 8025EC90 38 00 00 00 */ li r0, 0 -/* 8025EC94 90 1F 00 04 */ stw r0, 4(r31) -/* 8025EC98 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 8025EC9C 28 03 00 00 */ cmplwi r3, 0 -/* 8025ECA0 41 82 00 24 */ beq lbl_8025ECC4 -/* 8025ECA4 41 82 00 18 */ beq lbl_8025ECBC -/* 8025ECA8 38 80 00 01 */ li r4, 1 -/* 8025ECAC 81 83 00 00 */ lwz r12, 0(r3) -/* 8025ECB0 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025ECB4 7D 89 03 A6 */ mtctr r12 -/* 8025ECB8 4E 80 04 21 */ bctrl -lbl_8025ECBC: -/* 8025ECBC 38 00 00 00 */ li r0, 0 -/* 8025ECC0 90 1F 00 10 */ stw r0, 0x10(r31) -lbl_8025ECC4: -/* 8025ECC4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8025ECC8 28 03 00 00 */ cmplwi r3, 0 -/* 8025ECCC 41 82 00 24 */ beq lbl_8025ECF0 -/* 8025ECD0 41 82 00 18 */ beq lbl_8025ECE8 -/* 8025ECD4 38 80 00 01 */ li r4, 1 -/* 8025ECD8 81 83 00 00 */ lwz r12, 0(r3) -/* 8025ECDC 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025ECE0 7D 89 03 A6 */ mtctr r12 -/* 8025ECE4 4E 80 04 21 */ bctrl -lbl_8025ECE8: -/* 8025ECE8 38 00 00 00 */ li r0, 0 -/* 8025ECEC 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_8025ECF0: -/* 8025ECF0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8025ECF4 28 03 00 00 */ cmplwi r3, 0 -/* 8025ECF8 41 82 00 24 */ beq lbl_8025ED1C -/* 8025ECFC 41 82 00 18 */ beq lbl_8025ED14 -/* 8025ED00 38 80 00 01 */ li r4, 1 -/* 8025ED04 81 83 00 00 */ lwz r12, 0(r3) -/* 8025ED08 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025ED0C 7D 89 03 A6 */ mtctr r12 -/* 8025ED10 4E 80 04 21 */ bctrl -lbl_8025ED14: -/* 8025ED14 38 00 00 00 */ li r0, 0 -/* 8025ED18 90 1F 00 14 */ stw r0, 0x14(r31) -lbl_8025ED1C: -/* 8025ED1C 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 8025ED20 28 03 00 00 */ cmplwi r3, 0 -/* 8025ED24 41 82 00 24 */ beq lbl_8025ED48 -/* 8025ED28 41 82 00 18 */ beq lbl_8025ED40 -/* 8025ED2C 38 80 00 01 */ li r4, 1 -/* 8025ED30 81 83 00 00 */ lwz r12, 0(r3) -/* 8025ED34 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025ED38 7D 89 03 A6 */ mtctr r12 -/* 8025ED3C 4E 80 04 21 */ bctrl -lbl_8025ED40: -/* 8025ED40 38 00 00 00 */ li r0, 0 -/* 8025ED44 90 1F 00 1C */ stw r0, 0x1c(r31) -lbl_8025ED48: -/* 8025ED48 80 7F 00 08 */ lwz r3, 8(r31) -/* 8025ED4C 28 03 00 00 */ cmplwi r3, 0 -/* 8025ED50 41 82 00 18 */ beq lbl_8025ED68 -/* 8025ED54 38 80 00 01 */ li r4, 1 -/* 8025ED58 81 83 00 00 */ lwz r12, 0(r3) -/* 8025ED5C 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025ED60 7D 89 03 A6 */ mtctr r12 -/* 8025ED64 4E 80 04 21 */ bctrl -lbl_8025ED68: -/* 8025ED68 38 00 00 00 */ li r0, 0 -/* 8025ED6C 90 1F 00 08 */ stw r0, 8(r31) -/* 8025ED70 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8025ED74 28 03 00 00 */ cmplwi r3, 0 -/* 8025ED78 41 82 00 18 */ beq lbl_8025ED90 -/* 8025ED7C 38 80 00 01 */ li r4, 1 -/* 8025ED80 81 83 00 00 */ lwz r12, 0(r3) -/* 8025ED84 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025ED88 7D 89 03 A6 */ mtctr r12 -/* 8025ED8C 4E 80 04 21 */ bctrl -lbl_8025ED90: -/* 8025ED90 38 00 00 00 */ li r0, 0 -/* 8025ED94 90 1F 00 0C */ stw r0, 0xc(r31) -/* 8025ED98 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 8025ED9C 28 03 00 00 */ cmplwi r3, 0 -/* 8025EDA0 41 82 00 18 */ beq lbl_8025EDB8 -/* 8025EDA4 38 80 00 01 */ li r4, 1 -/* 8025EDA8 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EDAC 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025EDB0 7D 89 03 A6 */ mtctr r12 -/* 8025EDB4 4E 80 04 21 */ bctrl -lbl_8025EDB8: -/* 8025EDB8 38 00 00 00 */ li r0, 0 -/* 8025EDBC 90 1F 00 20 */ stw r0, 0x20(r31) -/* 8025EDC0 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 8025EDC4 28 03 00 00 */ cmplwi r3, 0 -/* 8025EDC8 41 82 00 18 */ beq lbl_8025EDE0 -/* 8025EDCC 38 80 00 01 */ li r4, 1 -/* 8025EDD0 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EDD4 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025EDD8 7D 89 03 A6 */ mtctr r12 -/* 8025EDDC 4E 80 04 21 */ bctrl -lbl_8025EDE0: -/* 8025EDE0 38 00 00 00 */ li r0, 0 -/* 8025EDE4 90 1F 00 24 */ stw r0, 0x24(r31) -/* 8025EDE8 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 8025EDEC 28 03 00 00 */ cmplwi r3, 0 -/* 8025EDF0 41 82 00 18 */ beq lbl_8025EE08 -/* 8025EDF4 38 80 00 01 */ li r4, 1 -/* 8025EDF8 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EDFC 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025EE00 7D 89 03 A6 */ mtctr r12 -/* 8025EE04 4E 80 04 21 */ bctrl -lbl_8025EE08: -/* 8025EE08 38 00 00 00 */ li r0, 0 -/* 8025EE0C 90 1F 00 28 */ stw r0, 0x28(r31) -/* 8025EE10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025EE14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025EE18 7C 08 03 A6 */ mtlr r0 -/* 8025EE1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025EE20 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/drawPikari__21dDlst_TimerScrnDraw_cFi.s b/asm/d/d_timer/drawPikari__21dDlst_TimerScrnDraw_cFi.s deleted file mode 100644 index 57b750579b4..00000000000 --- a/asm/d/d_timer/drawPikari__21dDlst_TimerScrnDraw_cFi.s +++ /dev/null @@ -1,247 +0,0 @@ -lbl_80260B54: -/* 80260B54 94 21 FE F0 */ stwu r1, -0x110(r1) -/* 80260B58 7C 08 02 A6 */ mflr r0 -/* 80260B5C 90 01 01 14 */ stw r0, 0x114(r1) -/* 80260B60 DB E1 01 00 */ stfd f31, 0x100(r1) -/* 80260B64 F3 E1 01 08 */ psq_st f31, 264(r1), 0, 0 /* qr0 */ -/* 80260B68 DB C1 00 F0 */ stfd f30, 0xf0(r1) -/* 80260B6C F3 C1 00 F8 */ psq_st f30, 248(r1), 0, 0 /* qr0 */ -/* 80260B70 DB A1 00 E0 */ stfd f29, 0xe0(r1) -/* 80260B74 F3 A1 00 E8 */ psq_st f29, 232(r1), 0, 0 /* qr0 */ -/* 80260B78 DB 81 00 D0 */ stfd f28, 0xd0(r1) -/* 80260B7C F3 81 00 D8 */ psq_st f28, 216(r1), 0, 0 /* qr0 */ -/* 80260B80 DB 61 00 C0 */ stfd f27, 0xc0(r1) -/* 80260B84 F3 61 00 C8 */ psq_st f27, 200(r1), 0, 0 /* qr0 */ -/* 80260B88 DB 41 00 B0 */ stfd f26, 0xb0(r1) -/* 80260B8C F3 41 00 B8 */ psq_st f26, 184(r1), 0, 0 /* qr0 */ -/* 80260B90 DB 21 00 A0 */ stfd f25, 0xa0(r1) -/* 80260B94 F3 21 00 A8 */ psq_st f25, 168(r1), 0, 0 /* qr0 */ -/* 80260B98 DB 01 00 90 */ stfd f24, 0x90(r1) -/* 80260B9C F3 01 00 98 */ psq_st f24, 152(r1), 0, 0 /* qr0 */ -/* 80260BA0 39 61 00 90 */ addi r11, r1, 0x90 -/* 80260BA4 48 10 16 19 */ bl _savegpr_21 -/* 80260BA8 7C 7F 1B 78 */ mr r31, r3 -/* 80260BAC 54 9A 20 36 */ slwi r26, r4, 4 -/* 80260BB0 7F 3F D2 14 */ add r25, r31, r26 -/* 80260BB4 C3 79 00 84 */ lfs f27, 0x84(r25) -/* 80260BB8 80 83 00 28 */ lwz r4, 0x28(r3) -/* 80260BBC 38 61 00 34 */ addi r3, r1, 0x34 -/* 80260BC0 80 A4 00 04 */ lwz r5, 4(r4) -/* 80260BC4 38 C0 00 00 */ li r6, 0 -/* 80260BC8 38 E0 00 00 */ li r7, 0 -/* 80260BCC 4B FF 42 F1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 80260BD0 80 61 00 34 */ lwz r3, 0x34(r1) -/* 80260BD4 80 01 00 38 */ lwz r0, 0x38(r1) -/* 80260BD8 90 61 00 40 */ stw r3, 0x40(r1) -/* 80260BDC 90 01 00 44 */ stw r0, 0x44(r1) -/* 80260BE0 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80260BE4 90 01 00 48 */ stw r0, 0x48(r1) -/* 80260BE8 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 80260BEC 80 63 00 04 */ lwz r3, 4(r3) -/* 80260BF0 48 09 FA 69 */ bl getStringPtr__10J2DTextBoxCFv -/* 80260BF4 7C 7B 1B 78 */ mr r27, r3 -/* 80260BF8 3B 00 00 00 */ li r24, 0 -/* 80260BFC C3 A2 B5 40 */ lfs f29, lit_3919(r2) -/* 80260C00 FF 40 E8 90 */ fmr f26, f29 -/* 80260C04 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 80260C08 80 63 00 04 */ lwz r3, 4(r3) -/* 80260C0C C3 C3 01 1C */ lfs f30, 0x11c(r3) -/* 80260C10 4B DB 3D E1 */ bl mDoExt_getMesgFont__Fv -/* 80260C14 7C 77 1B 78 */ mr r23, r3 -/* 80260C18 C3 22 B5 4C */ lfs f25, lit_4124(r2) -/* 80260C1C 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 80260C20 80 63 00 04 */ lwz r3, 4(r3) -/* 80260C24 48 00 00 10 */ b lbl_80260C34 -lbl_80260C28: -/* 80260C28 C0 03 00 CC */ lfs f0, 0xcc(r3) -/* 80260C2C EF 39 00 32 */ fmuls f25, f25, f0 -/* 80260C30 48 09 6E CD */ bl getParentPane__7J2DPaneFv -lbl_80260C34: -/* 80260C34 28 03 00 00 */ cmplwi r3, 0 -/* 80260C38 40 82 FF F0 */ bne lbl_80260C28 -/* 80260C3C CB 82 B5 58 */ lfd f28, lit_4627(r2) -/* 80260C40 3F 80 43 30 */ lis r28, 0x4330 -/* 80260C44 48 00 00 90 */ b lbl_80260CD4 -lbl_80260C48: -/* 80260C48 7F 00 07 35 */ extsh. r0, r24 -/* 80260C4C 40 81 00 18 */ ble lbl_80260C64 -/* 80260C50 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 80260C54 80 63 00 04 */ lwz r3, 4(r3) -/* 80260C58 C0 03 01 14 */ lfs f0, 0x114(r3) -/* 80260C5C EC 19 00 32 */ fmuls f0, f25, f0 -/* 80260C60 EF BD 00 2A */ fadds f29, f29, f0 -lbl_80260C64: -/* 80260C64 7E E3 BB 78 */ mr r3, r23 -/* 80260C68 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80260C6C 38 A1 00 0C */ addi r5, r1, 0xc -/* 80260C70 81 97 00 00 */ lwz r12, 0(r23) -/* 80260C74 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80260C78 7D 89 03 A6 */ mtctr r12 -/* 80260C7C 4E 80 04 21 */ bctrl -/* 80260C80 8B A1 00 0D */ lbz r29, 0xd(r1) -/* 80260C84 7E E3 BB 78 */ mr r3, r23 -/* 80260C88 81 97 00 00 */ lwz r12, 0(r23) -/* 80260C8C 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80260C90 7D 89 03 A6 */ mtctr r12 -/* 80260C94 4E 80 04 21 */ bctrl -/* 80260C98 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 80260C9C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80260CA0 93 81 00 50 */ stw r28, 0x50(r1) -/* 80260CA4 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 80260CA8 EC 20 E0 28 */ fsubs f1, f0, f28 -/* 80260CAC 6F A0 80 00 */ xoris r0, r29, 0x8000 -/* 80260CB0 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80260CB4 93 81 00 58 */ stw r28, 0x58(r1) -/* 80260CB8 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 80260CBC EC 00 E0 28 */ fsubs f0, f0, f28 -/* 80260CC0 EC 00 08 24 */ fdivs f0, f0, f1 -/* 80260CC4 EC 1E 00 32 */ fmuls f0, f30, f0 -/* 80260CC8 EC 19 00 32 */ fmuls f0, f25, f0 -/* 80260CCC EF BD 00 2A */ fadds f29, f29, f0 -/* 80260CD0 3B 18 00 01 */ addi r24, r24, 1 -lbl_80260CD4: -/* 80260CD4 7F 00 07 34 */ extsh r0, r24 -/* 80260CD8 7C 9B 00 AE */ lbzx r4, r27, r0 -/* 80260CDC 7C 80 07 75 */ extsb. r0, r4 -/* 80260CE0 40 82 FF 68 */ bne lbl_80260C48 -/* 80260CE4 C0 21 00 40 */ lfs f1, 0x40(r1) -/* 80260CE8 C0 02 B5 98 */ lfs f0, lit_5326(r2) -/* 80260CEC EC 1D 00 32 */ fmuls f0, f29, f0 -/* 80260CF0 EF 81 00 28 */ fsubs f28, f1, f0 -/* 80260CF4 3B 00 00 00 */ li r24, 0 -/* 80260CF8 3B 5A 00 8C */ addi r26, r26, 0x8c -/* 80260CFC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80260D00 3B 83 EB C8 */ addi r28, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80260D04 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80260D08 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80260D0C C3 A1 00 44 */ lfs f29, 0x44(r1) -/* 80260D10 CB E2 B5 58 */ lfd f31, lit_4627(r2) -/* 80260D14 3F C0 43 30 */ lis r30, 0x4330 -/* 80260D18 48 00 01 7C */ b lbl_80260E94 -lbl_80260D1C: -/* 80260D1C 7F 00 07 35 */ extsh. r0, r24 -/* 80260D20 40 81 00 18 */ ble lbl_80260D38 -/* 80260D24 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 80260D28 80 63 00 04 */ lwz r3, 4(r3) -/* 80260D2C C0 03 01 14 */ lfs f0, 0x114(r3) -/* 80260D30 EC 19 00 32 */ fmuls f0, f25, f0 -/* 80260D34 EF 5A 00 2A */ fadds f26, f26, f0 -lbl_80260D38: -/* 80260D38 54 95 06 3E */ clrlwi r21, r4, 0x18 -/* 80260D3C 7E E3 BB 78 */ mr r3, r23 -/* 80260D40 7E A4 AB 78 */ mr r4, r21 -/* 80260D44 38 A1 00 08 */ addi r5, r1, 8 -/* 80260D48 81 97 00 00 */ lwz r12, 0(r23) -/* 80260D4C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80260D50 7D 89 03 A6 */ mtctr r12 -/* 80260D54 4E 80 04 21 */ bctrl -/* 80260D58 8A C1 00 09 */ lbz r22, 9(r1) -/* 80260D5C 7E E3 BB 78 */ mr r3, r23 -/* 80260D60 81 97 00 00 */ lwz r12, 0(r23) -/* 80260D64 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80260D68 7D 89 03 A6 */ mtctr r12 -/* 80260D6C 4E 80 04 21 */ bctrl -/* 80260D70 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 80260D74 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80260D78 93 C1 00 58 */ stw r30, 0x58(r1) -/* 80260D7C C8 01 00 58 */ lfd f0, 0x58(r1) -/* 80260D80 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 80260D84 6E C0 80 00 */ xoris r0, r22, 0x8000 -/* 80260D88 90 01 00 54 */ stw r0, 0x54(r1) -/* 80260D8C 93 C1 00 50 */ stw r30, 0x50(r1) -/* 80260D90 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 80260D94 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 80260D98 EC 00 08 24 */ fdivs f0, f0, f1 -/* 80260D9C EC 1E 00 32 */ fmuls f0, f30, f0 -/* 80260DA0 EF 19 00 32 */ fmuls f24, f25, f0 -/* 80260DA4 2C 15 00 20 */ cmpwi r21, 0x20 -/* 80260DA8 41 82 00 E4 */ beq lbl_80260E8C -/* 80260DAC 3C 15 00 00 */ addis r0, r21, 0 -/* 80260DB0 28 00 81 40 */ cmplwi r0, 0x8140 -/* 80260DB4 41 82 00 D8 */ beq lbl_80260E8C -/* 80260DB8 D3 61 00 30 */ stfs f27, 0x30(r1) -/* 80260DBC 7C 1F D0 AE */ lbzx r0, r31, r26 -/* 80260DC0 28 00 00 00 */ cmplwi r0, 0 -/* 80260DC4 40 82 00 68 */ bne lbl_80260E2C -/* 80260DC8 80 1C 0B BC */ lwz r0, 0xbbc(r28) -/* 80260DCC 90 01 00 20 */ stw r0, 0x20(r1) -/* 80260DD0 80 1C 0B C0 */ lwz r0, 0xbc0(r28) -/* 80260DD4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80260DD8 80 1C 0B B4 */ lwz r0, 0xbb4(r28) -/* 80260DDC 90 01 00 28 */ stw r0, 0x28(r1) -/* 80260DE0 80 1C 0B B8 */ lwz r0, 0xbb8(r28) -/* 80260DE4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80260DE8 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 80260DEC 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 80260DF0 C0 02 B5 98 */ lfs f0, lit_5326(r2) -/* 80260DF4 EC 38 00 32 */ fmuls f1, f24, f0 -/* 80260DF8 EC 1C D0 2A */ fadds f0, f28, f26 -/* 80260DFC EC 21 00 2A */ fadds f1, f1, f0 -/* 80260E00 FC 40 E8 90 */ fmr f2, f29 -/* 80260E04 38 81 00 30 */ addi r4, r1, 0x30 -/* 80260E08 C0 7C 0B B0 */ lfs f3, 0xbb0(r28) -/* 80260E0C 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80260E10 38 C1 00 28 */ addi r6, r1, 0x28 -/* 80260E14 38 E1 00 24 */ addi r7, r1, 0x24 -/* 80260E18 39 01 00 20 */ addi r8, r1, 0x20 -/* 80260E1C C0 9C 0B C4 */ lfs f4, 0xbc4(r28) -/* 80260E20 39 20 00 00 */ li r9, 0 -/* 80260E24 4B FB 32 B9 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -/* 80260E28 48 00 00 64 */ b lbl_80260E8C -lbl_80260E2C: -/* 80260E2C 80 1C 0B D8 */ lwz r0, 0xbd8(r28) -/* 80260E30 90 01 00 10 */ stw r0, 0x10(r1) -/* 80260E34 80 1C 0B DC */ lwz r0, 0xbdc(r28) -/* 80260E38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80260E3C 80 1C 0B D0 */ lwz r0, 0xbd0(r28) -/* 80260E40 90 01 00 18 */ stw r0, 0x18(r1) -/* 80260E44 80 1C 0B D4 */ lwz r0, 0xbd4(r28) -/* 80260E48 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80260E4C 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 80260E50 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 80260E54 C0 02 B5 98 */ lfs f0, lit_5326(r2) -/* 80260E58 EC 38 00 32 */ fmuls f1, f24, f0 -/* 80260E5C EC 1C D0 2A */ fadds f0, f28, f26 -/* 80260E60 EC 21 00 2A */ fadds f1, f1, f0 -/* 80260E64 FC 40 E8 90 */ fmr f2, f29 -/* 80260E68 38 81 00 30 */ addi r4, r1, 0x30 -/* 80260E6C C0 7C 0B CC */ lfs f3, 0xbcc(r28) -/* 80260E70 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80260E74 38 C1 00 18 */ addi r6, r1, 0x18 -/* 80260E78 38 E1 00 14 */ addi r7, r1, 0x14 -/* 80260E7C 39 01 00 10 */ addi r8, r1, 0x10 -/* 80260E80 C0 9C 0B E0 */ lfs f4, 0xbe0(r28) -/* 80260E84 39 20 00 00 */ li r9, 0 -/* 80260E88 4B FB 32 55 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -lbl_80260E8C: -/* 80260E8C EF 5A C0 2A */ fadds f26, f26, f24 -/* 80260E90 3B 18 00 01 */ addi r24, r24, 1 -lbl_80260E94: -/* 80260E94 7F 00 07 34 */ extsh r0, r24 -/* 80260E98 7C 9B 00 AE */ lbzx r4, r27, r0 -/* 80260E9C 7C 80 07 75 */ extsb. r0, r4 -/* 80260EA0 40 82 FE 7C */ bne lbl_80260D1C -/* 80260EA4 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80260EA8 D0 19 00 84 */ stfs f0, 0x84(r25) -/* 80260EAC E3 E1 01 08 */ psq_l f31, 264(r1), 0, 0 /* qr0 */ -/* 80260EB0 CB E1 01 00 */ lfd f31, 0x100(r1) -/* 80260EB4 E3 C1 00 F8 */ psq_l f30, 248(r1), 0, 0 /* qr0 */ -/* 80260EB8 CB C1 00 F0 */ lfd f30, 0xf0(r1) -/* 80260EBC E3 A1 00 E8 */ psq_l f29, 232(r1), 0, 0 /* qr0 */ -/* 80260EC0 CB A1 00 E0 */ lfd f29, 0xe0(r1) -/* 80260EC4 E3 81 00 D8 */ psq_l f28, 216(r1), 0, 0 /* qr0 */ -/* 80260EC8 CB 81 00 D0 */ lfd f28, 0xd0(r1) -/* 80260ECC E3 61 00 C8 */ psq_l f27, 200(r1), 0, 0 /* qr0 */ -/* 80260ED0 CB 61 00 C0 */ lfd f27, 0xc0(r1) -/* 80260ED4 E3 41 00 B8 */ psq_l f26, 184(r1), 0, 0 /* qr0 */ -/* 80260ED8 CB 41 00 B0 */ lfd f26, 0xb0(r1) -/* 80260EDC E3 21 00 A8 */ psq_l f25, 168(r1), 0, 0 /* qr0 */ -/* 80260EE0 CB 21 00 A0 */ lfd f25, 0xa0(r1) -/* 80260EE4 E3 01 00 98 */ psq_l f24, 152(r1), 0, 0 /* qr0 */ -/* 80260EE8 CB 01 00 90 */ lfd f24, 0x90(r1) -/* 80260EEC 39 61 00 90 */ addi r11, r1, 0x90 -/* 80260EF0 48 10 13 19 */ bl _restgpr_21 -/* 80260EF4 80 01 01 14 */ lwz r0, 0x114(r1) -/* 80260EF8 7C 08 03 A6 */ mtlr r0 -/* 80260EFC 38 21 01 10 */ addi r1, r1, 0x110 -/* 80260F00 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/draw__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/draw__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index 2552ca815c5..00000000000 --- a/asm/d/d_timer/draw__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,274 +0,0 @@ -lbl_80260690: -/* 80260690 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80260694 7C 08 02 A6 */ mflr r0 -/* 80260698 90 01 00 84 */ stw r0, 0x84(r1) -/* 8026069C DB E1 00 70 */ stfd f31, 0x70(r1) -/* 802606A0 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 802606A4 DB C1 00 60 */ stfd f30, 0x60(r1) -/* 802606A8 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 802606AC DB A1 00 50 */ stfd f29, 0x50(r1) -/* 802606B0 F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 /* qr0 */ -/* 802606B4 39 61 00 50 */ addi r11, r1, 0x50 -/* 802606B8 48 10 1B 19 */ bl _savegpr_26 -/* 802606BC 7C 7B 1B 78 */ mr r27, r3 -/* 802606C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802606C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802606C8 83 C3 5F 50 */ lwz r30, 0x5f50(r3) -/* 802606CC 7F C3 F3 78 */ mr r3, r30 -/* 802606D0 81 9E 00 00 */ lwz r12, 0(r30) -/* 802606D4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802606D8 7D 89 03 A6 */ mtctr r12 -/* 802606DC 4E 80 04 21 */ bctrl -/* 802606E0 80 7B 00 04 */ lwz r3, 4(r27) -/* 802606E4 C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 802606E8 FC 40 08 90 */ fmr f2, f1 -/* 802606EC 7F C4 F3 78 */ mr r4, r30 -/* 802606F0 48 09 87 E5 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 802606F4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802606F8 3B E3 EB C8 */ addi r31, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802606FC A8 1F 0B AE */ lha r0, 0xbae(r31) -/* 80260700 C8 62 B5 58 */ lfd f3, lit_4627(r2) -/* 80260704 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80260708 90 01 00 0C */ stw r0, 0xc(r1) -/* 8026070C 3C 60 43 30 */ lis r3, 0x4330 -/* 80260710 90 61 00 08 */ stw r3, 8(r1) -/* 80260714 C8 01 00 08 */ lfd f0, 8(r1) -/* 80260718 EC 40 18 28 */ fsubs f2, f0, f3 -/* 8026071C C0 22 B5 74 */ lfs f1, lit_5228(r2) -/* 80260720 A8 1F 0B AC */ lha r0, 0xbac(r31) -/* 80260724 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80260728 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026072C 90 61 00 10 */ stw r3, 0x10(r1) -/* 80260730 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80260734 EC 00 18 28 */ fsubs f0, f0, f3 -/* 80260738 EC 01 00 2A */ fadds f0, f1, f0 -/* 8026073C EF C2 00 2A */ fadds f30, f2, f0 -/* 80260740 3B 80 00 00 */ li r28, 0 -/* 80260744 3B 40 00 00 */ li r26, 0 -/* 80260748 C3 E2 B5 40 */ lfs f31, lit_3919(r2) -lbl_8026074C: -/* 8026074C 7F BB D2 14 */ add r29, r27, r26 -/* 80260750 C0 7D 00 80 */ lfs f3, 0x80(r29) -/* 80260754 FC 03 F8 40 */ fcmpo cr0, f3, f31 -/* 80260758 40 81 03 10 */ ble lbl_80260A68 -/* 8026075C FC 03 F0 40 */ fcmpo cr0, f3, f30 -/* 80260760 40 80 03 08 */ bge lbl_80260A68 -/* 80260764 C3 A2 B5 4C */ lfs f29, lit_4124(r2) -/* 80260768 C0 22 B5 74 */ lfs f1, lit_5228(r2) -/* 8026076C FC 03 08 40 */ fcmpo cr0, f3, f1 -/* 80260770 40 80 00 30 */ bge lbl_802607A0 -/* 80260774 C0 1F 0B A8 */ lfs f0, 0xba8(r31) -/* 80260778 EC 03 00 2A */ fadds f0, f3, f0 -/* 8026077C D0 1D 00 80 */ stfs f0, 0x80(r29) -/* 80260780 C0 1D 00 80 */ lfs f0, 0x80(r29) -/* 80260784 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80260788 40 81 00 08 */ ble lbl_80260790 -/* 8026078C D0 3D 00 80 */ stfs f1, 0x80(r29) -lbl_80260790: -/* 80260790 7F 63 DB 78 */ mr r3, r27 -/* 80260794 C0 3D 00 80 */ lfs f1, 0x80(r29) -/* 80260798 48 00 03 3D */ bl playBckAnimation__21dDlst_TimerScrnDraw_cFf -/* 8026079C 48 00 00 D8 */ b lbl_80260874 -lbl_802607A0: -/* 802607A0 A8 1F 0B AC */ lha r0, 0xbac(r31) -/* 802607A4 C8 42 B5 58 */ lfd f2, lit_4627(r2) -/* 802607A8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802607AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802607B0 3C 00 43 30 */ lis r0, 0x4330 -/* 802607B4 90 01 00 10 */ stw r0, 0x10(r1) -/* 802607B8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802607BC EC 00 10 28 */ fsubs f0, f0, f2 -/* 802607C0 EC 01 00 2A */ fadds f0, f1, f0 -/* 802607C4 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 802607C8 40 80 00 18 */ bge lbl_802607E0 -/* 802607CC EC 03 E8 2A */ fadds f0, f3, f29 -/* 802607D0 D0 1D 00 80 */ stfs f0, 0x80(r29) -/* 802607D4 7F 63 DB 78 */ mr r3, r27 -/* 802607D8 48 00 02 FD */ bl playBckAnimation__21dDlst_TimerScrnDraw_cFf -/* 802607DC 48 00 00 98 */ b lbl_80260874 -lbl_802607E0: -/* 802607E0 FC 03 F0 40 */ fcmpo cr0, f3, f30 -/* 802607E4 40 80 00 90 */ bge lbl_80260874 -/* 802607E8 EC 03 E8 2A */ fadds f0, f3, f29 -/* 802607EC D0 1D 00 80 */ stfs f0, 0x80(r29) -/* 802607F0 7F 63 DB 78 */ mr r3, r27 -/* 802607F4 48 00 02 E1 */ bl playBckAnimation__21dDlst_TimerScrnDraw_cFf -/* 802607F8 C0 1D 00 80 */ lfs f0, 0x80(r29) -/* 802607FC EC 1E 00 28 */ fsubs f0, f30, f0 -/* 80260800 FC 00 00 1E */ fctiwz f0, f0 -/* 80260804 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80260808 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026080C A8 9F 0B AE */ lha r4, 0xbae(r31) -/* 80260810 7C 00 07 34 */ extsh r0, r0 -/* 80260814 C8 62 B5 58 */ lfd f3, lit_4627(r2) -/* 80260818 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8026081C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80260820 3C 60 43 30 */ lis r3, 0x4330 -/* 80260824 90 61 00 08 */ stw r3, 8(r1) -/* 80260828 C8 01 00 08 */ lfd f0, 8(r1) -/* 8026082C EC 20 18 28 */ fsubs f1, f0, f3 -/* 80260830 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80260834 90 61 00 18 */ stw r3, 0x18(r1) -/* 80260838 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8026083C EC 00 18 28 */ fsubs f0, f0, f3 -/* 80260840 EC 41 00 32 */ fmuls f2, f1, f0 -/* 80260844 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 80260848 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026084C 90 61 00 20 */ stw r3, 0x20(r1) -/* 80260850 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80260854 EC 20 18 28 */ fsubs f1, f0, f3 -/* 80260858 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8026085C 90 61 00 28 */ stw r3, 0x28(r1) -/* 80260860 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80260864 EC 00 18 28 */ fsubs f0, f0, f3 -/* 80260868 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8026086C EC 02 00 24 */ fdivs f0, f2, f0 -/* 80260870 FF A0 00 90 */ fmr f29, f0 -lbl_80260874: -/* 80260874 80 7B 00 20 */ lwz r3, 0x20(r27) -/* 80260878 FC 20 E8 90 */ fmr f1, f29 -/* 8026087C 4B FF 4F 55 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80260880 88 1F 0B CA */ lbz r0, 0xbca(r31) -/* 80260884 28 00 00 01 */ cmplwi r0, 1 -/* 80260888 40 82 00 70 */ bne lbl_802608F8 -/* 8026088C A8 1D 00 8A */ lha r0, 0x8a(r29) -/* 80260890 C8 42 B5 58 */ lfd f2, lit_4627(r2) -/* 80260894 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80260898 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8026089C 3C 80 43 30 */ lis r4, 0x4330 -/* 802608A0 90 81 00 28 */ stw r4, 0x28(r1) -/* 802608A4 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802608A8 EC 20 10 28 */ fsubs f1, f0, f2 -/* 802608AC C0 1F 0B A4 */ lfs f0, 0xba4(r31) -/* 802608B0 EC 61 00 2A */ fadds f3, f1, f0 -/* 802608B4 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 802608B8 80 63 00 04 */ lwz r3, 4(r3) -/* 802608BC A8 1D 00 88 */ lha r0, 0x88(r29) -/* 802608C0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802608C4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802608C8 90 81 00 20 */ stw r4, 0x20(r1) -/* 802608CC C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802608D0 EC 20 10 28 */ fsubs f1, f0, f2 -/* 802608D4 C0 1F 0B A0 */ lfs f0, 0xba0(r31) -/* 802608D8 EC 01 00 2A */ fadds f0, f1, f0 -/* 802608DC D0 03 00 D4 */ stfs f0, 0xd4(r3) -/* 802608E0 D0 63 00 D8 */ stfs f3, 0xd8(r3) -/* 802608E4 81 83 00 00 */ lwz r12, 0(r3) -/* 802608E8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802608EC 7D 89 03 A6 */ mtctr r12 -/* 802608F0 4E 80 04 21 */ bctrl -/* 802608F4 48 00 00 84 */ b lbl_80260978 -lbl_802608F8: -/* 802608F8 C0 3D 00 80 */ lfs f1, 0x80(r29) -/* 802608FC C0 02 B5 70 */ lfs f0, lit_5227(r2) -/* 80260900 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80260904 C0 22 B5 94 */ lfs f1, lit_5325(r2) -/* 80260908 C0 02 B5 98 */ lfs f0, lit_5326(r2) -/* 8026090C EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80260910 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80260914 EC 61 00 32 */ fmuls f3, f1, f0 -/* 80260918 2C 1C 00 00 */ cmpwi r28, 0 -/* 8026091C 40 82 00 08 */ bne lbl_80260924 -/* 80260920 C0 62 B5 40 */ lfs f3, lit_3919(r2) -lbl_80260924: -/* 80260924 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 80260928 A8 1D 00 88 */ lha r0, 0x88(r29) -/* 8026092C C8 42 B5 58 */ lfd f2, lit_4627(r2) -/* 80260930 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80260934 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80260938 3C 80 43 30 */ lis r4, 0x4330 -/* 8026093C 90 81 00 28 */ stw r4, 0x28(r1) -/* 80260940 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80260944 EC 20 10 28 */ fsubs f1, f0, f2 -/* 80260948 C0 1F 0B A0 */ lfs f0, 0xba0(r31) -/* 8026094C EC 21 00 2A */ fadds f1, f1, f0 -/* 80260950 A8 1D 00 8A */ lha r0, 0x8a(r29) -/* 80260954 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80260958 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026095C 90 81 00 20 */ stw r4, 0x20(r1) -/* 80260960 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80260964 EC 40 10 28 */ fsubs f2, f0, f2 -/* 80260968 C0 1F 0B A4 */ lfs f0, 0xba4(r31) -/* 8026096C EC 02 00 2A */ fadds f0, f2, f0 -/* 80260970 EC 40 18 28 */ fsubs f2, f0, f3 -/* 80260974 4B FF 3C 3D */ bl paneTrans__8CPaneMgrFff -lbl_80260978: -/* 80260978 C0 3F 0B 9C */ lfs f1, 0xb9c(r31) -/* 8026097C 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 80260980 80 63 00 04 */ lwz r3, 4(r3) -/* 80260984 C0 1F 0B 98 */ lfs f0, 0xb98(r31) -/* 80260988 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8026098C D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 80260990 81 83 00 00 */ lwz r12, 0(r3) -/* 80260994 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80260998 7D 89 03 A6 */ mtctr r12 -/* 8026099C 4E 80 04 21 */ bctrl -/* 802609A0 80 7B 00 08 */ lwz r3, 8(r27) -/* 802609A4 C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 802609A8 FC 40 08 90 */ fmr f2, f1 -/* 802609AC 7F C4 F3 78 */ mr r4, r30 -/* 802609B0 48 09 85 25 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 802609B4 C0 3D 00 84 */ lfs f1, 0x84(r29) -/* 802609B8 C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 802609BC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802609C0 40 81 00 14 */ ble lbl_802609D4 -/* 802609C4 7F 63 DB 78 */ mr r3, r27 -/* 802609C8 7F 84 E3 78 */ mr r4, r28 -/* 802609CC 48 00 01 89 */ bl drawPikari__21dDlst_TimerScrnDraw_cFi -/* 802609D0 48 00 00 98 */ b lbl_80260A68 -lbl_802609D4: -/* 802609D4 C0 02 B5 50 */ lfs f0, lit_4125(r2) -/* 802609D8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802609DC 40 82 00 8C */ bne lbl_80260A68 -/* 802609E0 88 1D 00 8C */ lbz r0, 0x8c(r29) -/* 802609E4 28 00 00 00 */ cmplwi r0, 0 -/* 802609E8 40 82 00 44 */ bne lbl_80260A2C -/* 802609EC C0 5D 00 80 */ lfs f2, 0x80(r29) -/* 802609F0 A8 1F 0B C8 */ lha r0, 0xbc8(r31) -/* 802609F4 C8 22 B5 58 */ lfd f1, lit_4627(r2) -/* 802609F8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802609FC 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80260A00 3C 00 43 30 */ lis r0, 0x4330 -/* 80260A04 90 01 00 28 */ stw r0, 0x28(r1) -/* 80260A08 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80260A0C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80260A10 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80260A14 40 81 00 54 */ ble lbl_80260A68 -/* 80260A18 C0 22 B5 9C */ lfs f1, lit_5327(r2) -/* 80260A1C C0 1F 0B C4 */ lfs f0, 0xbc4(r31) -/* 80260A20 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80260A24 D0 1D 00 84 */ stfs f0, 0x84(r29) -/* 80260A28 48 00 00 40 */ b lbl_80260A68 -lbl_80260A2C: -/* 80260A2C C0 5D 00 80 */ lfs f2, 0x80(r29) -/* 80260A30 A8 1F 0B E4 */ lha r0, 0xbe4(r31) -/* 80260A34 C8 22 B5 58 */ lfd f1, lit_4627(r2) -/* 80260A38 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80260A3C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80260A40 3C 00 43 30 */ lis r0, 0x4330 -/* 80260A44 90 01 00 28 */ stw r0, 0x28(r1) -/* 80260A48 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80260A4C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80260A50 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80260A54 40 81 00 14 */ ble lbl_80260A68 -/* 80260A58 C0 22 B5 9C */ lfs f1, lit_5327(r2) -/* 80260A5C C0 1F 0B E0 */ lfs f0, 0xbe0(r31) -/* 80260A60 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80260A64 D0 1D 00 84 */ stfs f0, 0x84(r29) -lbl_80260A68: -/* 80260A68 3B 9C 00 01 */ addi r28, r28, 1 -/* 80260A6C 2C 1C 00 33 */ cmpwi r28, 0x33 -/* 80260A70 3B 5A 00 10 */ addi r26, r26, 0x10 -/* 80260A74 41 80 FC D8 */ blt lbl_8026074C -/* 80260A78 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 80260A7C CB E1 00 70 */ lfd f31, 0x70(r1) -/* 80260A80 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 80260A84 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 80260A88 E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 /* qr0 */ -/* 80260A8C CB A1 00 50 */ lfd f29, 0x50(r1) -/* 80260A90 39 61 00 50 */ addi r11, r1, 0x50 -/* 80260A94 48 10 17 89 */ bl _restgpr_26 -/* 80260A98 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80260A9C 7C 08 03 A6 */ mtlr r0 -/* 80260AA0 38 21 00 80 */ addi r1, r1, 0x80 -/* 80260AA4 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/getRestTimeMs__8dTimer_cFv.s b/asm/d/d_timer/getRestTimeMs__8dTimer_cFv.s deleted file mode 100644 index f49de494f71..00000000000 --- a/asm/d/d_timer/getRestTimeMs__8dTimer_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8025DA9C: -/* 8025DA9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025DAA0 7C 08 02 A6 */ mflr r0 -/* 8025DAA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025DAA8 80 A3 01 18 */ lwz r5, 0x118(r3) -/* 8025DAAC 80 C3 01 1C */ lwz r6, 0x11c(r3) -/* 8025DAB0 80 03 01 10 */ lwz r0, 0x110(r3) -/* 8025DAB4 80 83 01 14 */ lwz r4, 0x114(r3) -/* 8025DAB8 7C C4 30 10 */ subfc r6, r4, r6 -/* 8025DABC 7C A0 29 10 */ subfe r5, r0, r5 -/* 8025DAC0 80 03 01 38 */ lwz r0, 0x138(r3) -/* 8025DAC4 80 83 01 3C */ lwz r4, 0x13c(r3) -/* 8025DAC8 7C 84 30 10 */ subfc r4, r4, r6 -/* 8025DACC 7C A0 29 10 */ subfe r5, r0, r5 -/* 8025DAD0 80 03 01 40 */ lwz r0, 0x140(r3) -/* 8025DAD4 80 63 01 44 */ lwz r3, 0x144(r3) -/* 8025DAD8 7C 84 18 10 */ subfc r4, r4, r3 -/* 8025DADC 7C 65 01 10 */ subfe r3, r5, r0 -/* 8025DAE0 3C A0 80 00 */ lis r5, 0x8000 /* 0x800000F8@ha */ -/* 8025DAE4 80 05 00 F8 */ lwz r0, 0x00F8(r5) /* 0x800000F8@l */ -/* 8025DAE8 54 05 F0 BE */ srwi r5, r0, 2 -/* 8025DAEC 38 00 03 E8 */ li r0, 0x3e8 -/* 8025DAF0 7C C5 03 96 */ divwu r6, r5, r0 -/* 8025DAF4 38 A0 00 00 */ li r5, 0 -/* 8025DAF8 48 10 48 2D */ bl __div2i -/* 8025DAFC 7C 83 23 78 */ mr r3, r4 -/* 8025DB00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025DB04 7C 08 03 A6 */ mtlr r0 -/* 8025DB08 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025DB0C 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/hideDenominator__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/hideDenominator__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index ccb8dbff595..00000000000 --- a/asm/d/d_timer/hideDenominator__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_8025EB20: -/* 8025EB20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025EB24 7C 08 02 A6 */ mflr r0 -/* 8025EB28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025EB2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025EB30 93 C1 00 08 */ stw r30, 8(r1) -/* 8025EB34 7C 7E 1B 78 */ mr r30, r3 -/* 8025EB38 39 00 00 00 */ li r8, 0 -/* 8025EB3C 38 60 00 00 */ li r3, 0 -/* 8025EB40 38 A0 00 00 */ li r5, 0 -lbl_8025EB44: -/* 8025EB44 38 80 00 00 */ li r4, 0 -/* 8025EB48 7C DE 1A 14 */ add r6, r30, r3 -/* 8025EB4C 38 00 00 02 */ li r0, 2 -/* 8025EB50 7C 09 03 A6 */ mtctr r0 -lbl_8025EB54: -/* 8025EB54 38 04 00 5C */ addi r0, r4, 0x5c -/* 8025EB58 7C E6 00 2E */ lwzx r7, r6, r0 -/* 8025EB5C 28 07 00 00 */ cmplwi r7, 0 -/* 8025EB60 41 82 00 08 */ beq lbl_8025EB68 -/* 8025EB64 98 A7 00 B0 */ stb r5, 0xb0(r7) -lbl_8025EB68: -/* 8025EB68 38 84 00 04 */ addi r4, r4, 4 -/* 8025EB6C 42 00 FF E8 */ bdnz lbl_8025EB54 -/* 8025EB70 39 08 00 01 */ addi r8, r8, 1 -/* 8025EB74 2C 08 00 02 */ cmpwi r8, 2 -/* 8025EB78 38 63 00 08 */ addi r3, r3, 8 -/* 8025EB7C 41 80 FF C8 */ blt lbl_8025EB44 -/* 8025EB80 80 1E 03 C8 */ lwz r0, 0x3c8(r30) -/* 8025EB84 2C 00 00 08 */ cmpwi r0, 8 -/* 8025EB88 40 82 00 58 */ bne lbl_8025EBE0 -/* 8025EB8C 80 7E 00 04 */ lwz r3, 4(r30) -/* 8025EB90 3C 80 73 6C */ lis r4, 0x736C /* 0x736C5F73@ha */ -/* 8025EB94 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x736C5F73@l */ -/* 8025EB98 38 A0 6E 5F */ li r5, 0x6e5f -/* 8025EB9C 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EBA0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025EBA4 7D 89 03 A6 */ mtctr r12 -/* 8025EBA8 4E 80 04 21 */ bctrl -/* 8025EBAC 38 00 00 00 */ li r0, 0 -/* 8025EBB0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8025EBB4 80 7E 00 04 */ lwz r3, 4(r30) -/* 8025EBB8 3C 80 6E 5F */ lis r4, 0x6E5F /* 0x6E5F736C@ha */ -/* 8025EBBC 38 C4 73 6C */ addi r6, r4, 0x736C /* 0x6E5F736C@l */ -/* 8025EBC0 38 A0 00 00 */ li r5, 0 -/* 8025EBC4 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EBC8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025EBCC 7D 89 03 A6 */ mtctr r12 -/* 8025EBD0 4E 80 04 21 */ bctrl -/* 8025EBD4 38 00 00 00 */ li r0, 0 -/* 8025EBD8 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8025EBDC 48 00 00 68 */ b lbl_8025EC44 -lbl_8025EBE0: -/* 8025EBE0 80 7E 00 04 */ lwz r3, 4(r30) -/* 8025EBE4 3C 80 73 6C */ lis r4, 0x736C /* 0x736C5F73@ha */ -/* 8025EBE8 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x736C5F73@l */ -/* 8025EBEC 38 A0 63 5F */ li r5, 0x635f -/* 8025EBF0 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EBF4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025EBF8 7D 89 03 A6 */ mtctr r12 -/* 8025EBFC 4E 80 04 21 */ bctrl -/* 8025EC00 7C 7F 1B 78 */ mr r31, r3 -/* 8025EC04 80 7E 00 04 */ lwz r3, 4(r30) -/* 8025EC08 3C 80 63 5F */ lis r4, 0x635F /* 0x635F736C@ha */ -/* 8025EC0C 38 C4 73 6C */ addi r6, r4, 0x736C /* 0x635F736C@l */ -/* 8025EC10 38 A0 00 00 */ li r5, 0 -/* 8025EC14 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EC18 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025EC1C 7D 89 03 A6 */ mtctr r12 -/* 8025EC20 4E 80 04 21 */ bctrl -/* 8025EC24 28 1F 00 00 */ cmplwi r31, 0 -/* 8025EC28 41 82 00 0C */ beq lbl_8025EC34 -/* 8025EC2C 38 00 00 00 */ li r0, 0 -/* 8025EC30 98 1F 00 B0 */ stb r0, 0xb0(r31) -lbl_8025EC34: -/* 8025EC34 28 03 00 00 */ cmplwi r3, 0 -/* 8025EC38 41 82 00 0C */ beq lbl_8025EC44 -/* 8025EC3C 38 00 00 00 */ li r0, 0 -/* 8025EC40 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_8025EC44: -/* 8025EC44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025EC48 83 C1 00 08 */ lwz r30, 8(r1) -/* 8025EC4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025EC50 7C 08 03 A6 */ mtlr r0 -/* 8025EC54 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025EC58 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/playBckAnimation__21dDlst_TimerScrnDraw_cFf.s b/asm/d/d_timer/playBckAnimation__21dDlst_TimerScrnDraw_cFf.s deleted file mode 100644 index dc72f6868b1..00000000000 --- a/asm/d/d_timer/playBckAnimation__21dDlst_TimerScrnDraw_cFf.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80260AD4: -/* 80260AD4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80260AD8 7C 08 02 A6 */ mflr r0 -/* 80260ADC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80260AE0 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 80260AE4 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80260AE8 7C 7F 1B 78 */ mr r31, r3 -/* 80260AEC FF E0 08 90 */ fmr f31, f1 -/* 80260AF0 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80260AF4 80 63 00 04 */ lwz r3, 4(r3) -/* 80260AF8 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 80260AFC 81 83 00 00 */ lwz r12, 0(r3) -/* 80260B00 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80260B04 7D 89 03 A6 */ mtctr r12 -/* 80260B08 4E 80 04 21 */ bctrl -/* 80260B0C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80260B10 D3 E3 00 08 */ stfs f31, 8(r3) -/* 80260B14 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80260B18 80 63 00 04 */ lwz r3, 4(r3) -/* 80260B1C 48 09 74 B1 */ bl animationTransform__7J2DPaneFv -/* 80260B20 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80260B24 80 63 00 04 */ lwz r3, 4(r3) -/* 80260B28 38 80 00 00 */ li r4, 0 -/* 80260B2C 81 83 00 00 */ lwz r12, 0(r3) -/* 80260B30 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80260B34 7D 89 03 A6 */ mtctr r12 -/* 80260B38 4E 80 04 21 */ bctrl -/* 80260B3C CB E1 00 18 */ lfd f31, 0x18(r1) -/* 80260B40 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80260B44 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80260B48 7C 08 03 A6 */ mtlr r0 -/* 80260B4C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80260B50 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setCounterPos__21dDlst_TimerScrnDraw_cFff.s b/asm/d/d_timer/setCounterPos__21dDlst_TimerScrnDraw_cFff.s deleted file mode 100644 index abe4edd9fb6..00000000000 --- a/asm/d/d_timer/setCounterPos__21dDlst_TimerScrnDraw_cFff.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025FA6C: -/* 8025FA6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025FA70 7C 08 02 A6 */ mflr r0 -/* 8025FA74 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025FA78 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8025FA7C 28 03 00 00 */ cmplwi r3, 0 -/* 8025FA80 41 82 00 08 */ beq lbl_8025FA88 -/* 8025FA84 4B FF 4B 2D */ bl paneTrans__8CPaneMgrFff -lbl_8025FA88: -/* 8025FA88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025FA8C 7C 08 03 A6 */ mtlr r0 -/* 8025FA90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025FA94 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setCounter__21dDlst_TimerScrnDraw_cFUcUc.s b/asm/d/d_timer/setCounter__21dDlst_TimerScrnDraw_cFUcUc.s deleted file mode 100644 index 27e4047351d..00000000000 --- a/asm/d/d_timer/setCounter__21dDlst_TimerScrnDraw_cFUcUc.s +++ /dev/null @@ -1,572 +0,0 @@ -lbl_8025F180: -/* 8025F180 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 8025F184 7C 08 02 A6 */ mflr r0 -/* 8025F188 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 8025F18C 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 8025F190 48 10 30 39 */ bl _savegpr_24 -/* 8025F194 7C 79 1B 78 */ mr r25, r3 -/* 8025F198 7C BA 2B 78 */ mr r26, r5 -/* 8025F19C 3B C0 00 00 */ li r30, 0 -/* 8025F1A0 80 63 03 D4 */ lwz r3, 0x3d4(r3) -/* 8025F1A4 2C 03 00 00 */ cmpwi r3, 0 -/* 8025F1A8 40 81 00 10 */ ble lbl_8025F1B8 -/* 8025F1AC 38 03 FF FF */ addi r0, r3, -1 -/* 8025F1B0 90 19 03 D4 */ stw r0, 0x3d4(r25) -/* 8025F1B4 3B C0 00 01 */ li r30, 1 -lbl_8025F1B8: -/* 8025F1B8 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 8025F1BC 80 79 03 CC */ lwz r3, 0x3cc(r25) -/* 8025F1C0 7C 04 18 00 */ cmpw r4, r3 -/* 8025F1C4 40 82 00 0C */ bne lbl_8025F1D0 -/* 8025F1C8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8025F1CC 41 82 04 D8 */ beq lbl_8025F6A4 -lbl_8025F1D0: -/* 8025F1D0 7C 04 18 00 */ cmpw r4, r3 -/* 8025F1D4 40 80 00 30 */ bge lbl_8025F204 -/* 8025F1D8 80 79 03 CC */ lwz r3, 0x3cc(r25) -/* 8025F1DC 38 03 FF FF */ addi r0, r3, -1 -/* 8025F1E0 90 19 03 CC */ stw r0, 0x3cc(r25) -/* 8025F1E4 80 19 03 C8 */ lwz r0, 0x3c8(r25) -/* 8025F1E8 2C 00 00 03 */ cmpwi r0, 3 -/* 8025F1EC 41 82 00 0C */ beq lbl_8025F1F8 -/* 8025F1F0 2C 00 00 04 */ cmpwi r0, 4 -/* 8025F1F4 40 82 00 34 */ bne lbl_8025F228 -lbl_8025F1F8: -/* 8025F1F8 38 00 00 3C */ li r0, 0x3c -/* 8025F1FC 90 19 03 D4 */ stw r0, 0x3d4(r25) -/* 8025F200 48 00 00 28 */ b lbl_8025F228 -lbl_8025F204: -/* 8025F204 40 81 00 24 */ ble lbl_8025F228 -/* 8025F208 80 79 03 CC */ lwz r3, 0x3cc(r25) -/* 8025F20C 38 03 00 01 */ addi r0, r3, 1 -/* 8025F210 90 19 03 CC */ stw r0, 0x3cc(r25) -/* 8025F214 80 19 03 D4 */ lwz r0, 0x3d4(r25) -/* 8025F218 2C 00 00 00 */ cmpwi r0, 0 -/* 8025F21C 40 81 00 0C */ ble lbl_8025F228 -/* 8025F220 38 00 00 00 */ li r0, 0 -/* 8025F224 90 19 03 D4 */ stw r0, 0x3d4(r25) -lbl_8025F228: -/* 8025F228 80 19 03 CC */ lwz r0, 0x3cc(r25) -/* 8025F22C 2C 00 00 00 */ cmpwi r0, 0 -/* 8025F230 40 80 00 0C */ bge lbl_8025F23C -/* 8025F234 38 00 00 00 */ li r0, 0 -/* 8025F238 90 19 03 CC */ stw r0, 0x3cc(r25) -lbl_8025F23C: -/* 8025F23C 80 19 03 CC */ lwz r0, 0x3cc(r25) -/* 8025F240 2C 00 00 63 */ cmpwi r0, 0x63 -/* 8025F244 40 81 00 0C */ ble lbl_8025F250 -/* 8025F248 38 00 00 63 */ li r0, 0x63 -/* 8025F24C 90 19 03 CC */ stw r0, 0x3cc(r25) -lbl_8025F250: -/* 8025F250 80 B9 03 CC */ lwz r5, 0x3cc(r25) -/* 8025F254 38 80 00 0A */ li r4, 0xa -/* 8025F258 7C 05 23 D6 */ divw r0, r5, r4 -/* 8025F25C 7C 00 21 D6 */ mullw r0, r0, r4 -/* 8025F260 7F A0 28 50 */ subf r29, r0, r5 -/* 8025F264 38 60 00 64 */ li r3, 0x64 -/* 8025F268 7C 05 1B D6 */ divw r0, r5, r3 -/* 8025F26C 7C 00 19 D6 */ mullw r0, r0, r3 -/* 8025F270 7C 00 28 50 */ subf r0, r0, r5 -/* 8025F274 7F 80 23 D6 */ divw r28, r0, r4 -/* 8025F278 3B 60 00 00 */ li r27, 0 -/* 8025F27C 3B 00 00 00 */ li r24, 0 -lbl_8025F280: -/* 8025F280 7F F9 C2 14 */ add r31, r25, r24 -/* 8025F284 80 9F 00 74 */ lwz r4, 0x74(r31) -/* 8025F288 28 04 00 00 */ cmplwi r4, 0 -/* 8025F28C 41 82 02 00 */ beq lbl_8025F48C -/* 8025F290 7F 23 CB 78 */ mr r3, r25 -/* 8025F294 7F A5 EB 78 */ mr r5, r29 -/* 8025F298 4B FF FB 8D */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei -/* 8025F29C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8025F2A0 41 82 01 EC */ beq lbl_8025F48C -/* 8025F2A4 80 19 03 D4 */ lwz r0, 0x3d4(r25) -/* 8025F2A8 2C 00 00 00 */ cmpwi r0, 0 -/* 8025F2AC 40 81 00 F4 */ ble lbl_8025F3A0 -/* 8025F2B0 38 80 00 FF */ li r4, 0xff -/* 8025F2B4 98 81 00 68 */ stb r4, 0x68(r1) -/* 8025F2B8 98 81 00 69 */ stb r4, 0x69(r1) -/* 8025F2BC 98 81 00 6A */ stb r4, 0x6a(r1) -/* 8025F2C0 98 81 00 6B */ stb r4, 0x6b(r1) -/* 8025F2C4 80 01 00 68 */ lwz r0, 0x68(r1) -/* 8025F2C8 90 01 00 6C */ stw r0, 0x6c(r1) -/* 8025F2CC 98 81 00 70 */ stb r4, 0x70(r1) -/* 8025F2D0 98 81 00 71 */ stb r4, 0x71(r1) -/* 8025F2D4 98 81 00 72 */ stb r4, 0x72(r1) -/* 8025F2D8 98 81 00 73 */ stb r4, 0x73(r1) -/* 8025F2DC 80 01 00 70 */ lwz r0, 0x70(r1) -/* 8025F2E0 90 01 00 74 */ stw r0, 0x74(r1) -/* 8025F2E4 98 81 00 78 */ stb r4, 0x78(r1) -/* 8025F2E8 38 60 00 00 */ li r3, 0 -/* 8025F2EC 98 61 00 79 */ stb r3, 0x79(r1) -/* 8025F2F0 98 61 00 7A */ stb r3, 0x7a(r1) -/* 8025F2F4 98 81 00 7B */ stb r4, 0x7b(r1) -/* 8025F2F8 80 01 00 78 */ lwz r0, 0x78(r1) -/* 8025F2FC 90 01 00 7C */ stw r0, 0x7c(r1) -/* 8025F300 98 81 00 80 */ stb r4, 0x80(r1) -/* 8025F304 98 61 00 81 */ stb r3, 0x81(r1) -/* 8025F308 98 61 00 82 */ stb r3, 0x82(r1) -/* 8025F30C 98 81 00 83 */ stb r4, 0x83(r1) -/* 8025F310 80 01 00 80 */ lwz r0, 0x80(r1) -/* 8025F314 90 01 00 84 */ stw r0, 0x84(r1) -/* 8025F318 80 7F 00 74 */ lwz r3, 0x74(r31) -/* 8025F31C 88 01 00 84 */ lbz r0, 0x84(r1) -/* 8025F320 98 03 01 38 */ stb r0, 0x138(r3) -/* 8025F324 88 01 00 85 */ lbz r0, 0x85(r1) -/* 8025F328 98 03 01 39 */ stb r0, 0x139(r3) -/* 8025F32C 88 01 00 86 */ lbz r0, 0x86(r1) -/* 8025F330 98 03 01 3A */ stb r0, 0x13a(r3) -/* 8025F334 88 01 00 87 */ lbz r0, 0x87(r1) -/* 8025F338 98 03 01 3B */ stb r0, 0x13b(r3) -/* 8025F33C 88 01 00 7C */ lbz r0, 0x7c(r1) -/* 8025F340 98 03 01 3C */ stb r0, 0x13c(r3) -/* 8025F344 88 01 00 7D */ lbz r0, 0x7d(r1) -/* 8025F348 98 03 01 3D */ stb r0, 0x13d(r3) -/* 8025F34C 88 01 00 7E */ lbz r0, 0x7e(r1) -/* 8025F350 98 03 01 3E */ stb r0, 0x13e(r3) -/* 8025F354 88 01 00 7F */ lbz r0, 0x7f(r1) -/* 8025F358 98 03 01 3F */ stb r0, 0x13f(r3) -/* 8025F35C 88 01 00 74 */ lbz r0, 0x74(r1) -/* 8025F360 98 03 01 40 */ stb r0, 0x140(r3) -/* 8025F364 88 01 00 75 */ lbz r0, 0x75(r1) -/* 8025F368 98 03 01 41 */ stb r0, 0x141(r3) -/* 8025F36C 88 01 00 76 */ lbz r0, 0x76(r1) -/* 8025F370 98 03 01 42 */ stb r0, 0x142(r3) -/* 8025F374 88 01 00 77 */ lbz r0, 0x77(r1) -/* 8025F378 98 03 01 43 */ stb r0, 0x143(r3) -/* 8025F37C 88 01 00 6C */ lbz r0, 0x6c(r1) -/* 8025F380 98 03 01 44 */ stb r0, 0x144(r3) -/* 8025F384 88 01 00 6D */ lbz r0, 0x6d(r1) -/* 8025F388 98 03 01 45 */ stb r0, 0x145(r3) -/* 8025F38C 88 01 00 6E */ lbz r0, 0x6e(r1) -/* 8025F390 98 03 01 46 */ stb r0, 0x146(r3) -/* 8025F394 88 01 00 6F */ lbz r0, 0x6f(r1) -/* 8025F398 98 03 01 47 */ stb r0, 0x147(r3) -/* 8025F39C 48 00 00 F0 */ b lbl_8025F48C -lbl_8025F3A0: -/* 8025F3A0 38 80 00 FF */ li r4, 0xff -/* 8025F3A4 98 81 00 48 */ stb r4, 0x48(r1) -/* 8025F3A8 98 81 00 49 */ stb r4, 0x49(r1) -/* 8025F3AC 98 81 00 4A */ stb r4, 0x4a(r1) -/* 8025F3B0 98 81 00 4B */ stb r4, 0x4b(r1) -/* 8025F3B4 80 01 00 48 */ lwz r0, 0x48(r1) -/* 8025F3B8 90 01 00 4C */ stw r0, 0x4c(r1) -/* 8025F3BC 98 81 00 50 */ stb r4, 0x50(r1) -/* 8025F3C0 98 81 00 51 */ stb r4, 0x51(r1) -/* 8025F3C4 98 81 00 52 */ stb r4, 0x52(r1) -/* 8025F3C8 98 81 00 53 */ stb r4, 0x53(r1) -/* 8025F3CC 80 01 00 50 */ lwz r0, 0x50(r1) -/* 8025F3D0 90 01 00 54 */ stw r0, 0x54(r1) -/* 8025F3D4 98 81 00 58 */ stb r4, 0x58(r1) -/* 8025F3D8 98 81 00 59 */ stb r4, 0x59(r1) -/* 8025F3DC 38 60 00 00 */ li r3, 0 -/* 8025F3E0 98 61 00 5A */ stb r3, 0x5a(r1) -/* 8025F3E4 98 81 00 5B */ stb r4, 0x5b(r1) -/* 8025F3E8 80 01 00 58 */ lwz r0, 0x58(r1) -/* 8025F3EC 90 01 00 5C */ stw r0, 0x5c(r1) -/* 8025F3F0 98 81 00 60 */ stb r4, 0x60(r1) -/* 8025F3F4 98 81 00 61 */ stb r4, 0x61(r1) -/* 8025F3F8 98 61 00 62 */ stb r3, 0x62(r1) -/* 8025F3FC 98 81 00 63 */ stb r4, 0x63(r1) -/* 8025F400 80 01 00 60 */ lwz r0, 0x60(r1) -/* 8025F404 90 01 00 64 */ stw r0, 0x64(r1) -/* 8025F408 80 7F 00 74 */ lwz r3, 0x74(r31) -/* 8025F40C 88 01 00 64 */ lbz r0, 0x64(r1) -/* 8025F410 98 03 01 38 */ stb r0, 0x138(r3) -/* 8025F414 88 01 00 65 */ lbz r0, 0x65(r1) -/* 8025F418 98 03 01 39 */ stb r0, 0x139(r3) -/* 8025F41C 88 01 00 66 */ lbz r0, 0x66(r1) -/* 8025F420 98 03 01 3A */ stb r0, 0x13a(r3) -/* 8025F424 88 01 00 67 */ lbz r0, 0x67(r1) -/* 8025F428 98 03 01 3B */ stb r0, 0x13b(r3) -/* 8025F42C 88 01 00 5C */ lbz r0, 0x5c(r1) -/* 8025F430 98 03 01 3C */ stb r0, 0x13c(r3) -/* 8025F434 88 01 00 5D */ lbz r0, 0x5d(r1) -/* 8025F438 98 03 01 3D */ stb r0, 0x13d(r3) -/* 8025F43C 88 01 00 5E */ lbz r0, 0x5e(r1) -/* 8025F440 98 03 01 3E */ stb r0, 0x13e(r3) -/* 8025F444 88 01 00 5F */ lbz r0, 0x5f(r1) -/* 8025F448 98 03 01 3F */ stb r0, 0x13f(r3) -/* 8025F44C 88 01 00 54 */ lbz r0, 0x54(r1) -/* 8025F450 98 03 01 40 */ stb r0, 0x140(r3) -/* 8025F454 88 01 00 55 */ lbz r0, 0x55(r1) -/* 8025F458 98 03 01 41 */ stb r0, 0x141(r3) -/* 8025F45C 88 01 00 56 */ lbz r0, 0x56(r1) -/* 8025F460 98 03 01 42 */ stb r0, 0x142(r3) -/* 8025F464 88 01 00 57 */ lbz r0, 0x57(r1) -/* 8025F468 98 03 01 43 */ stb r0, 0x143(r3) -/* 8025F46C 88 01 00 4C */ lbz r0, 0x4c(r1) -/* 8025F470 98 03 01 44 */ stb r0, 0x144(r3) -/* 8025F474 88 01 00 4D */ lbz r0, 0x4d(r1) -/* 8025F478 98 03 01 45 */ stb r0, 0x145(r3) -/* 8025F47C 88 01 00 4E */ lbz r0, 0x4e(r1) -/* 8025F480 98 03 01 46 */ stb r0, 0x146(r3) -/* 8025F484 88 01 00 4F */ lbz r0, 0x4f(r1) -/* 8025F488 98 03 01 47 */ stb r0, 0x147(r3) -lbl_8025F48C: -/* 8025F48C 80 9F 00 6C */ lwz r4, 0x6c(r31) -/* 8025F490 28 04 00 00 */ cmplwi r4, 0 -/* 8025F494 41 82 02 00 */ beq lbl_8025F694 -/* 8025F498 7F 23 CB 78 */ mr r3, r25 -/* 8025F49C 7F 85 E3 78 */ mr r5, r28 -/* 8025F4A0 4B FF F9 85 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei -/* 8025F4A4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8025F4A8 41 82 01 EC */ beq lbl_8025F694 -/* 8025F4AC 80 19 03 D4 */ lwz r0, 0x3d4(r25) -/* 8025F4B0 2C 00 00 00 */ cmpwi r0, 0 -/* 8025F4B4 40 81 00 F4 */ ble lbl_8025F5A8 -/* 8025F4B8 38 80 00 FF */ li r4, 0xff -/* 8025F4BC 98 81 00 28 */ stb r4, 0x28(r1) -/* 8025F4C0 98 81 00 29 */ stb r4, 0x29(r1) -/* 8025F4C4 98 81 00 2A */ stb r4, 0x2a(r1) -/* 8025F4C8 98 81 00 2B */ stb r4, 0x2b(r1) -/* 8025F4CC 80 01 00 28 */ lwz r0, 0x28(r1) -/* 8025F4D0 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8025F4D4 98 81 00 30 */ stb r4, 0x30(r1) -/* 8025F4D8 98 81 00 31 */ stb r4, 0x31(r1) -/* 8025F4DC 98 81 00 32 */ stb r4, 0x32(r1) -/* 8025F4E0 98 81 00 33 */ stb r4, 0x33(r1) -/* 8025F4E4 80 01 00 30 */ lwz r0, 0x30(r1) -/* 8025F4E8 90 01 00 34 */ stw r0, 0x34(r1) -/* 8025F4EC 98 81 00 38 */ stb r4, 0x38(r1) -/* 8025F4F0 38 60 00 00 */ li r3, 0 -/* 8025F4F4 98 61 00 39 */ stb r3, 0x39(r1) -/* 8025F4F8 98 61 00 3A */ stb r3, 0x3a(r1) -/* 8025F4FC 98 81 00 3B */ stb r4, 0x3b(r1) -/* 8025F500 80 01 00 38 */ lwz r0, 0x38(r1) -/* 8025F504 90 01 00 3C */ stw r0, 0x3c(r1) -/* 8025F508 98 81 00 40 */ stb r4, 0x40(r1) -/* 8025F50C 98 61 00 41 */ stb r3, 0x41(r1) -/* 8025F510 98 61 00 42 */ stb r3, 0x42(r1) -/* 8025F514 98 81 00 43 */ stb r4, 0x43(r1) -/* 8025F518 80 01 00 40 */ lwz r0, 0x40(r1) -/* 8025F51C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8025F520 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8025F524 88 01 00 44 */ lbz r0, 0x44(r1) -/* 8025F528 98 03 01 38 */ stb r0, 0x138(r3) -/* 8025F52C 88 01 00 45 */ lbz r0, 0x45(r1) -/* 8025F530 98 03 01 39 */ stb r0, 0x139(r3) -/* 8025F534 88 01 00 46 */ lbz r0, 0x46(r1) -/* 8025F538 98 03 01 3A */ stb r0, 0x13a(r3) -/* 8025F53C 88 01 00 47 */ lbz r0, 0x47(r1) -/* 8025F540 98 03 01 3B */ stb r0, 0x13b(r3) -/* 8025F544 88 01 00 3C */ lbz r0, 0x3c(r1) -/* 8025F548 98 03 01 3C */ stb r0, 0x13c(r3) -/* 8025F54C 88 01 00 3D */ lbz r0, 0x3d(r1) -/* 8025F550 98 03 01 3D */ stb r0, 0x13d(r3) -/* 8025F554 88 01 00 3E */ lbz r0, 0x3e(r1) -/* 8025F558 98 03 01 3E */ stb r0, 0x13e(r3) -/* 8025F55C 88 01 00 3F */ lbz r0, 0x3f(r1) -/* 8025F560 98 03 01 3F */ stb r0, 0x13f(r3) -/* 8025F564 88 01 00 34 */ lbz r0, 0x34(r1) -/* 8025F568 98 03 01 40 */ stb r0, 0x140(r3) -/* 8025F56C 88 01 00 35 */ lbz r0, 0x35(r1) -/* 8025F570 98 03 01 41 */ stb r0, 0x141(r3) -/* 8025F574 88 01 00 36 */ lbz r0, 0x36(r1) -/* 8025F578 98 03 01 42 */ stb r0, 0x142(r3) -/* 8025F57C 88 01 00 37 */ lbz r0, 0x37(r1) -/* 8025F580 98 03 01 43 */ stb r0, 0x143(r3) -/* 8025F584 88 01 00 2C */ lbz r0, 0x2c(r1) -/* 8025F588 98 03 01 44 */ stb r0, 0x144(r3) -/* 8025F58C 88 01 00 2D */ lbz r0, 0x2d(r1) -/* 8025F590 98 03 01 45 */ stb r0, 0x145(r3) -/* 8025F594 88 01 00 2E */ lbz r0, 0x2e(r1) -/* 8025F598 98 03 01 46 */ stb r0, 0x146(r3) -/* 8025F59C 88 01 00 2F */ lbz r0, 0x2f(r1) -/* 8025F5A0 98 03 01 47 */ stb r0, 0x147(r3) -/* 8025F5A4 48 00 00 F0 */ b lbl_8025F694 -lbl_8025F5A8: -/* 8025F5A8 38 80 00 FF */ li r4, 0xff -/* 8025F5AC 98 81 00 08 */ stb r4, 8(r1) -/* 8025F5B0 98 81 00 09 */ stb r4, 9(r1) -/* 8025F5B4 98 81 00 0A */ stb r4, 0xa(r1) -/* 8025F5B8 98 81 00 0B */ stb r4, 0xb(r1) -/* 8025F5BC 80 01 00 08 */ lwz r0, 8(r1) -/* 8025F5C0 90 01 00 0C */ stw r0, 0xc(r1) -/* 8025F5C4 98 81 00 10 */ stb r4, 0x10(r1) -/* 8025F5C8 98 81 00 11 */ stb r4, 0x11(r1) -/* 8025F5CC 98 81 00 12 */ stb r4, 0x12(r1) -/* 8025F5D0 98 81 00 13 */ stb r4, 0x13(r1) -/* 8025F5D4 80 01 00 10 */ lwz r0, 0x10(r1) -/* 8025F5D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025F5DC 98 81 00 18 */ stb r4, 0x18(r1) -/* 8025F5E0 98 81 00 19 */ stb r4, 0x19(r1) -/* 8025F5E4 38 60 00 00 */ li r3, 0 -/* 8025F5E8 98 61 00 1A */ stb r3, 0x1a(r1) -/* 8025F5EC 98 81 00 1B */ stb r4, 0x1b(r1) -/* 8025F5F0 80 01 00 18 */ lwz r0, 0x18(r1) -/* 8025F5F4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8025F5F8 98 81 00 20 */ stb r4, 0x20(r1) -/* 8025F5FC 98 81 00 21 */ stb r4, 0x21(r1) -/* 8025F600 98 61 00 22 */ stb r3, 0x22(r1) -/* 8025F604 98 81 00 23 */ stb r4, 0x23(r1) -/* 8025F608 80 01 00 20 */ lwz r0, 0x20(r1) -/* 8025F60C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025F610 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8025F614 88 01 00 24 */ lbz r0, 0x24(r1) -/* 8025F618 98 03 01 38 */ stb r0, 0x138(r3) -/* 8025F61C 88 01 00 25 */ lbz r0, 0x25(r1) -/* 8025F620 98 03 01 39 */ stb r0, 0x139(r3) -/* 8025F624 88 01 00 26 */ lbz r0, 0x26(r1) -/* 8025F628 98 03 01 3A */ stb r0, 0x13a(r3) -/* 8025F62C 88 01 00 27 */ lbz r0, 0x27(r1) -/* 8025F630 98 03 01 3B */ stb r0, 0x13b(r3) -/* 8025F634 88 01 00 1C */ lbz r0, 0x1c(r1) -/* 8025F638 98 03 01 3C */ stb r0, 0x13c(r3) -/* 8025F63C 88 01 00 1D */ lbz r0, 0x1d(r1) -/* 8025F640 98 03 01 3D */ stb r0, 0x13d(r3) -/* 8025F644 88 01 00 1E */ lbz r0, 0x1e(r1) -/* 8025F648 98 03 01 3E */ stb r0, 0x13e(r3) -/* 8025F64C 88 01 00 1F */ lbz r0, 0x1f(r1) -/* 8025F650 98 03 01 3F */ stb r0, 0x13f(r3) -/* 8025F654 88 01 00 14 */ lbz r0, 0x14(r1) -/* 8025F658 98 03 01 40 */ stb r0, 0x140(r3) -/* 8025F65C 88 01 00 15 */ lbz r0, 0x15(r1) -/* 8025F660 98 03 01 41 */ stb r0, 0x141(r3) -/* 8025F664 88 01 00 16 */ lbz r0, 0x16(r1) -/* 8025F668 98 03 01 42 */ stb r0, 0x142(r3) -/* 8025F66C 88 01 00 17 */ lbz r0, 0x17(r1) -/* 8025F670 98 03 01 43 */ stb r0, 0x143(r3) -/* 8025F674 88 01 00 0C */ lbz r0, 0xc(r1) -/* 8025F678 98 03 01 44 */ stb r0, 0x144(r3) -/* 8025F67C 88 01 00 0D */ lbz r0, 0xd(r1) -/* 8025F680 98 03 01 45 */ stb r0, 0x145(r3) -/* 8025F684 88 01 00 0E */ lbz r0, 0xe(r1) -/* 8025F688 98 03 01 46 */ stb r0, 0x146(r3) -/* 8025F68C 88 01 00 0F */ lbz r0, 0xf(r1) -/* 8025F690 98 03 01 47 */ stb r0, 0x147(r3) -lbl_8025F694: -/* 8025F694 3B 7B 00 01 */ addi r27, r27, 1 -/* 8025F698 2C 1B 00 02 */ cmpwi r27, 2 -/* 8025F69C 3B 18 00 04 */ addi r24, r24, 4 -/* 8025F6A0 41 80 FB E0 */ blt lbl_8025F280 -lbl_8025F6A4: -/* 8025F6A4 57 40 06 3E */ clrlwi r0, r26, 0x18 -/* 8025F6A8 80 79 03 D0 */ lwz r3, 0x3d0(r25) -/* 8025F6AC 7C 00 18 00 */ cmpw r0, r3 -/* 8025F6B0 41 82 00 B8 */ beq lbl_8025F768 -/* 8025F6B4 40 80 00 10 */ bge lbl_8025F6C4 -/* 8025F6B8 38 03 FF FF */ addi r0, r3, -1 -/* 8025F6BC 90 19 03 D0 */ stw r0, 0x3d0(r25) -/* 8025F6C0 48 00 00 0C */ b lbl_8025F6CC -lbl_8025F6C4: -/* 8025F6C4 38 03 00 01 */ addi r0, r3, 1 -/* 8025F6C8 90 19 03 D0 */ stw r0, 0x3d0(r25) -lbl_8025F6CC: -/* 8025F6CC 80 19 03 D0 */ lwz r0, 0x3d0(r25) -/* 8025F6D0 2C 00 00 00 */ cmpwi r0, 0 -/* 8025F6D4 40 80 00 0C */ bge lbl_8025F6E0 -/* 8025F6D8 38 00 00 00 */ li r0, 0 -/* 8025F6DC 90 19 03 D0 */ stw r0, 0x3d0(r25) -lbl_8025F6E0: -/* 8025F6E0 80 19 03 D0 */ lwz r0, 0x3d0(r25) -/* 8025F6E4 2C 00 00 63 */ cmpwi r0, 0x63 -/* 8025F6E8 40 81 00 0C */ ble lbl_8025F6F4 -/* 8025F6EC 38 00 00 63 */ li r0, 0x63 -/* 8025F6F0 90 19 03 D0 */ stw r0, 0x3d0(r25) -lbl_8025F6F4: -/* 8025F6F4 80 B9 03 D0 */ lwz r5, 0x3d0(r25) -/* 8025F6F8 38 80 00 0A */ li r4, 0xa -/* 8025F6FC 7C 05 23 D6 */ divw r0, r5, r4 -/* 8025F700 7C 00 21 D6 */ mullw r0, r0, r4 -/* 8025F704 7F 60 28 50 */ subf r27, r0, r5 -/* 8025F708 38 60 00 64 */ li r3, 0x64 -/* 8025F70C 7C 05 1B D6 */ divw r0, r5, r3 -/* 8025F710 7C 00 19 D6 */ mullw r0, r0, r3 -/* 8025F714 7C 00 28 50 */ subf r0, r0, r5 -/* 8025F718 7F 80 23 D6 */ divw r28, r0, r4 -/* 8025F71C 3B A0 00 00 */ li r29, 0 -/* 8025F720 3B 40 00 00 */ li r26, 0 -lbl_8025F724: -/* 8025F724 7F 19 D2 14 */ add r24, r25, r26 -/* 8025F728 80 98 00 64 */ lwz r4, 0x64(r24) -/* 8025F72C 28 04 00 00 */ cmplwi r4, 0 -/* 8025F730 41 82 00 10 */ beq lbl_8025F740 -/* 8025F734 7F 23 CB 78 */ mr r3, r25 -/* 8025F738 7F 65 DB 78 */ mr r5, r27 -/* 8025F73C 4B FF F6 E9 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei -lbl_8025F740: -/* 8025F740 80 98 00 5C */ lwz r4, 0x5c(r24) -/* 8025F744 28 04 00 00 */ cmplwi r4, 0 -/* 8025F748 41 82 00 10 */ beq lbl_8025F758 -/* 8025F74C 7F 23 CB 78 */ mr r3, r25 -/* 8025F750 7F 85 E3 78 */ mr r5, r28 -/* 8025F754 4B FF F6 D1 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei -lbl_8025F758: -/* 8025F758 3B BD 00 01 */ addi r29, r29, 1 -/* 8025F75C 2C 1D 00 02 */ cmpwi r29, 2 -/* 8025F760 3B 5A 00 04 */ addi r26, r26, 4 -/* 8025F764 41 80 FF C0 */ blt lbl_8025F724 -lbl_8025F768: -/* 8025F768 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025F76C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025F770 88 03 4F AC */ lbz r0, 0x4fac(r3) -/* 8025F774 28 00 00 01 */ cmplwi r0, 1 -/* 8025F778 40 82 00 10 */ bne lbl_8025F788 -/* 8025F77C 88 19 03 E0 */ lbz r0, 0x3e0(r25) -/* 8025F780 28 00 00 00 */ cmplwi r0, 0 -/* 8025F784 40 82 00 10 */ bne lbl_8025F794 -lbl_8025F788: -/* 8025F788 88 19 03 E1 */ lbz r0, 0x3e1(r25) -/* 8025F78C 28 00 00 00 */ cmplwi r0, 0 -/* 8025F790 40 82 01 30 */ bne lbl_8025F8C0 -lbl_8025F794: -/* 8025F794 80 79 00 14 */ lwz r3, 0x14(r25) -/* 8025F798 28 03 00 00 */ cmplwi r3, 0 -/* 8025F79C 41 82 00 8C */ beq lbl_8025F828 -/* 8025F7A0 AB 03 00 16 */ lha r24, 0x16(r3) -/* 8025F7A4 2C 18 00 05 */ cmpwi r24, 5 -/* 8025F7A8 40 80 00 80 */ bge lbl_8025F828 -/* 8025F7AC C0 99 03 B0 */ lfs f4, 0x3b0(r25) -/* 8025F7B0 C0 62 B5 4C */ lfs f3, lit_4124(r2) -/* 8025F7B4 38 18 00 01 */ addi r0, r24, 1 -/* 8025F7B8 7C 00 07 34 */ extsh r0, r0 -/* 8025F7BC C8 42 B5 58 */ lfd f2, lit_4627(r2) -/* 8025F7C0 6C 04 80 00 */ xoris r4, r0, 0x8000 -/* 8025F7C4 90 81 00 8C */ stw r4, 0x8c(r1) -/* 8025F7C8 3C 00 43 30 */ lis r0, 0x4330 -/* 8025F7CC 90 01 00 88 */ stw r0, 0x88(r1) -/* 8025F7D0 C8 01 00 88 */ lfd f0, 0x88(r1) -/* 8025F7D4 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8025F7D8 90 81 00 94 */ stw r4, 0x94(r1) -/* 8025F7DC 90 01 00 90 */ stw r0, 0x90(r1) -/* 8025F7E0 C8 01 00 90 */ lfd f0, 0x90(r1) -/* 8025F7E4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8025F7E8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025F7EC C0 02 B5 48 */ lfs f0, lit_4050(r2) -/* 8025F7F0 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8025F7F4 EC 23 00 28 */ fsubs f1, f3, f0 -/* 8025F7F8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025F7FC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025F800 88 19 03 DD */ lbz r0, 0x3dd(r25) -/* 8025F804 54 00 10 3A */ slwi r0, r0, 2 -/* 8025F808 7C 84 02 14 */ add r4, r4, r0 -/* 8025F80C C0 04 0B 34 */ lfs f0, 0xb34(r4) -/* 8025F810 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8025F814 EC 24 00 32 */ fmuls f1, f4, f0 -/* 8025F818 4B FF 5F B9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025F81C 38 18 00 01 */ addi r0, r24, 1 -/* 8025F820 80 79 00 14 */ lwz r3, 0x14(r25) -/* 8025F824 B0 03 00 16 */ sth r0, 0x16(r3) -lbl_8025F828: -/* 8025F828 80 79 00 1C */ lwz r3, 0x1c(r25) -/* 8025F82C 28 03 00 00 */ cmplwi r3, 0 -/* 8025F830 41 82 01 B8 */ beq lbl_8025F9E8 -/* 8025F834 AB 03 00 16 */ lha r24, 0x16(r3) -/* 8025F838 2C 18 00 05 */ cmpwi r24, 5 -/* 8025F83C 40 80 01 AC */ bge lbl_8025F9E8 -/* 8025F840 C0 99 03 B0 */ lfs f4, 0x3b0(r25) -/* 8025F844 C0 62 B5 4C */ lfs f3, lit_4124(r2) -/* 8025F848 38 18 00 01 */ addi r0, r24, 1 -/* 8025F84C 7C 00 07 34 */ extsh r0, r0 -/* 8025F850 C8 42 B5 58 */ lfd f2, lit_4627(r2) -/* 8025F854 6C 04 80 00 */ xoris r4, r0, 0x8000 -/* 8025F858 90 81 00 94 */ stw r4, 0x94(r1) -/* 8025F85C 3C 00 43 30 */ lis r0, 0x4330 -/* 8025F860 90 01 00 90 */ stw r0, 0x90(r1) -/* 8025F864 C8 01 00 90 */ lfd f0, 0x90(r1) -/* 8025F868 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8025F86C 90 81 00 8C */ stw r4, 0x8c(r1) -/* 8025F870 90 01 00 88 */ stw r0, 0x88(r1) -/* 8025F874 C8 01 00 88 */ lfd f0, 0x88(r1) -/* 8025F878 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8025F87C EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025F880 C0 02 B5 48 */ lfs f0, lit_4050(r2) -/* 8025F884 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8025F888 EC 23 00 28 */ fsubs f1, f3, f0 -/* 8025F88C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025F890 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025F894 88 19 03 DD */ lbz r0, 0x3dd(r25) -/* 8025F898 54 00 10 3A */ slwi r0, r0, 2 -/* 8025F89C 7C 84 02 14 */ add r4, r4, r0 -/* 8025F8A0 C0 04 0B 70 */ lfs f0, 0xb70(r4) -/* 8025F8A4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8025F8A8 EC 24 00 32 */ fmuls f1, f4, f0 -/* 8025F8AC 4B FF 5F 25 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025F8B0 38 18 00 01 */ addi r0, r24, 1 -/* 8025F8B4 80 79 00 1C */ lwz r3, 0x1c(r25) -/* 8025F8B8 B0 03 00 16 */ sth r0, 0x16(r3) -/* 8025F8BC 48 00 01 2C */ b lbl_8025F9E8 -lbl_8025F8C0: -/* 8025F8C0 80 79 00 14 */ lwz r3, 0x14(r25) -/* 8025F8C4 28 03 00 00 */ cmplwi r3, 0 -/* 8025F8C8 41 82 00 8C */ beq lbl_8025F954 -/* 8025F8CC AB 03 00 16 */ lha r24, 0x16(r3) -/* 8025F8D0 7F 00 07 35 */ extsh. r0, r24 -/* 8025F8D4 40 81 00 80 */ ble lbl_8025F954 -/* 8025F8D8 C0 99 03 B0 */ lfs f4, 0x3b0(r25) -/* 8025F8DC C0 62 B5 4C */ lfs f3, lit_4124(r2) -/* 8025F8E0 38 18 FF FF */ addi r0, r24, -1 -/* 8025F8E4 7C 00 07 34 */ extsh r0, r0 -/* 8025F8E8 C8 42 B5 58 */ lfd f2, lit_4627(r2) -/* 8025F8EC 6C 04 80 00 */ xoris r4, r0, 0x8000 -/* 8025F8F0 90 81 00 94 */ stw r4, 0x94(r1) -/* 8025F8F4 3C 00 43 30 */ lis r0, 0x4330 -/* 8025F8F8 90 01 00 90 */ stw r0, 0x90(r1) -/* 8025F8FC C8 01 00 90 */ lfd f0, 0x90(r1) -/* 8025F900 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8025F904 90 81 00 8C */ stw r4, 0x8c(r1) -/* 8025F908 90 01 00 88 */ stw r0, 0x88(r1) -/* 8025F90C C8 01 00 88 */ lfd f0, 0x88(r1) -/* 8025F910 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8025F914 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025F918 C0 02 B5 48 */ lfs f0, lit_4050(r2) -/* 8025F91C EC 01 00 24 */ fdivs f0, f1, f0 -/* 8025F920 EC 23 00 28 */ fsubs f1, f3, f0 -/* 8025F924 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025F928 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025F92C 88 19 03 DD */ lbz r0, 0x3dd(r25) -/* 8025F930 54 00 10 3A */ slwi r0, r0, 2 -/* 8025F934 7C 84 02 14 */ add r4, r4, r0 -/* 8025F938 C0 04 0B 34 */ lfs f0, 0xb34(r4) -/* 8025F93C EC 01 00 32 */ fmuls f0, f1, f0 -/* 8025F940 EC 24 00 32 */ fmuls f1, f4, f0 -/* 8025F944 4B FF 5E 8D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025F948 38 18 FF FF */ addi r0, r24, -1 -/* 8025F94C 80 79 00 14 */ lwz r3, 0x14(r25) -/* 8025F950 B0 03 00 16 */ sth r0, 0x16(r3) -lbl_8025F954: -/* 8025F954 80 79 00 1C */ lwz r3, 0x1c(r25) -/* 8025F958 28 03 00 00 */ cmplwi r3, 0 -/* 8025F95C 41 82 00 8C */ beq lbl_8025F9E8 -/* 8025F960 AB 03 00 16 */ lha r24, 0x16(r3) -/* 8025F964 7F 00 07 35 */ extsh. r0, r24 -/* 8025F968 40 81 00 80 */ ble lbl_8025F9E8 -/* 8025F96C C0 99 03 B0 */ lfs f4, 0x3b0(r25) -/* 8025F970 C0 62 B5 4C */ lfs f3, lit_4124(r2) -/* 8025F974 38 18 FF FF */ addi r0, r24, -1 -/* 8025F978 7C 00 07 34 */ extsh r0, r0 -/* 8025F97C C8 42 B5 58 */ lfd f2, lit_4627(r2) -/* 8025F980 6C 04 80 00 */ xoris r4, r0, 0x8000 -/* 8025F984 90 81 00 94 */ stw r4, 0x94(r1) -/* 8025F988 3C 00 43 30 */ lis r0, 0x4330 -/* 8025F98C 90 01 00 90 */ stw r0, 0x90(r1) -/* 8025F990 C8 01 00 90 */ lfd f0, 0x90(r1) -/* 8025F994 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8025F998 90 81 00 8C */ stw r4, 0x8c(r1) -/* 8025F99C 90 01 00 88 */ stw r0, 0x88(r1) -/* 8025F9A0 C8 01 00 88 */ lfd f0, 0x88(r1) -/* 8025F9A4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8025F9A8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025F9AC C0 02 B5 48 */ lfs f0, lit_4050(r2) -/* 8025F9B0 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8025F9B4 EC 23 00 28 */ fsubs f1, f3, f0 -/* 8025F9B8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025F9BC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025F9C0 88 19 03 DD */ lbz r0, 0x3dd(r25) -/* 8025F9C4 54 00 10 3A */ slwi r0, r0, 2 -/* 8025F9C8 7C 84 02 14 */ add r4, r4, r0 -/* 8025F9CC C0 04 0B 70 */ lfs f0, 0xb70(r4) -/* 8025F9D0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8025F9D4 EC 24 00 32 */ fmuls f1, f4, f0 -/* 8025F9D8 4B FF 5D F9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025F9DC 38 18 FF FF */ addi r0, r24, -1 -/* 8025F9E0 80 79 00 1C */ lwz r3, 0x1c(r25) -/* 8025F9E4 B0 03 00 16 */ sth r0, 0x16(r3) -lbl_8025F9E8: -/* 8025F9E8 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 8025F9EC 48 10 28 29 */ bl _restgpr_24 -/* 8025F9F0 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 8025F9F4 7C 08 03 A6 */ mtlr r0 -/* 8025F9F8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8025F9FC 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setHIO__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/setHIO__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index 580706a788b..00000000000 --- a/asm/d/d_timer/setHIO__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,263 +0,0 @@ -lbl_8025DBE0: -/* 8025DBE0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025DBE4 7C 08 02 A6 */ mflr r0 -/* 8025DBE8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025DBEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025DBF0 48 10 45 ED */ bl _savegpr_29 -/* 8025DBF4 7C 7E 1B 78 */ mr r30, r3 -/* 8025DBF8 3B E0 00 00 */ li r31, 0 -/* 8025DBFC 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8025DC00 28 00 00 00 */ cmplwi r0, 0 -/* 8025DC04 41 82 00 BC */ beq lbl_8025DCC0 -/* 8025DC08 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DC0C 54 05 10 3A */ slwi r5, r0, 2 -/* 8025DC10 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DC14 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DC18 7C 80 2A 14 */ add r4, r0, r5 -/* 8025DC1C C0 24 0A A4 */ lfs f1, 0xaa4(r4) -/* 8025DC20 C0 44 0A B0 */ lfs f2, 0xab0(r4) -/* 8025DC24 48 00 1D DD */ bl setParentPos__21dDlst_TimerScrnDraw_cFff -/* 8025DC28 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DC2C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DC30 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DC34 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DC38 7C 63 02 14 */ add r3, r3, r0 -/* 8025DC3C C0 03 0A 98 */ lfs f0, 0xa98(r3) -/* 8025DC40 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 8025DC44 80 63 00 04 */ lwz r3, 4(r3) -/* 8025DC48 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8025DC4C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8025DC50 81 83 00 00 */ lwz r12, 0(r3) -/* 8025DC54 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8025DC58 7D 89 03 A6 */ mtctr r12 -/* 8025DC5C 4E 80 04 21 */ bctrl -/* 8025DC60 88 1E 03 DF */ lbz r0, 0x3df(r30) -/* 8025DC64 28 00 00 00 */ cmplwi r0, 0 -/* 8025DC68 41 82 00 58 */ beq lbl_8025DCC0 -/* 8025DC6C 88 1E 03 E0 */ lbz r0, 0x3e0(r30) -/* 8025DC70 28 00 00 00 */ cmplwi r0, 0 -/* 8025DC74 41 82 00 4C */ beq lbl_8025DCC0 -/* 8025DC78 C0 1E 03 B0 */ lfs f0, 0x3b0(r30) -/* 8025DC7C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DC80 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DC84 3B A3 0A BC */ addi r29, r3, 0xabc -/* 8025DC88 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DC8C 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DC90 7C 3D 04 2E */ lfsx f1, r29, r0 -/* 8025DC94 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8025DC98 41 82 00 28 */ beq lbl_8025DCC0 -/* 8025DC9C 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 8025DCA0 28 03 00 00 */ cmplwi r3, 0 -/* 8025DCA4 41 82 00 08 */ beq lbl_8025DCAC -/* 8025DCA8 4B FF 7B 29 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_8025DCAC: -/* 8025DCAC 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DCB0 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DCB4 7C 1D 04 2E */ lfsx f0, r29, r0 -/* 8025DCB8 D0 1E 03 B0 */ stfs f0, 0x3b0(r30) -/* 8025DCBC 3B E0 00 01 */ li r31, 1 -lbl_8025DCC0: -/* 8025DCC0 80 1E 00 18 */ lwz r0, 0x18(r30) -/* 8025DCC4 28 00 00 00 */ cmplwi r0, 0 -/* 8025DCC8 41 82 01 44 */ beq lbl_8025DE0C -/* 8025DCCC 88 1E 03 E2 */ lbz r0, 0x3e2(r30) -/* 8025DCD0 28 00 00 00 */ cmplwi r0, 0 -/* 8025DCD4 41 82 00 2C */ beq lbl_8025DD00 -/* 8025DCD8 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DCDC 28 00 00 00 */ cmplwi r0, 0 -/* 8025DCE0 40 82 00 20 */ bne lbl_8025DD00 -/* 8025DCE4 7F C3 F3 78 */ mr r3, r30 -/* 8025DCE8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DCEC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DCF0 C0 24 0B 84 */ lfs f1, 0xb84(r4) -/* 8025DCF4 C0 44 0B 88 */ lfs f2, 0xb88(r4) -/* 8025DCF8 48 00 1D 35 */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff -/* 8025DCFC 48 00 00 28 */ b lbl_8025DD24 -lbl_8025DD00: -/* 8025DD00 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DD04 54 05 10 3A */ slwi r5, r0, 2 -/* 8025DD08 7F C3 F3 78 */ mr r3, r30 -/* 8025DD0C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DD10 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DD14 7C 80 2A 14 */ add r4, r0, r5 -/* 8025DD18 C0 24 0A E0 */ lfs f1, 0xae0(r4) -/* 8025DD1C C0 44 0A EC */ lfs f2, 0xaec(r4) -/* 8025DD20 48 00 1D 0D */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff -lbl_8025DD24: -/* 8025DD24 88 1E 03 E2 */ lbz r0, 0x3e2(r30) -/* 8025DD28 28 00 00 00 */ cmplwi r0, 0 -/* 8025DD2C 41 82 00 44 */ beq lbl_8025DD70 -/* 8025DD30 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DD34 28 00 00 00 */ cmplwi r0, 0 -/* 8025DD38 40 82 00 38 */ bne lbl_8025DD70 -/* 8025DD3C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DD40 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DD44 C0 24 0B 80 */ lfs f1, 0xb80(r4) -/* 8025DD48 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 8025DD4C 80 63 00 04 */ lwz r3, 4(r3) -/* 8025DD50 C0 04 0B 7C */ lfs f0, 0xb7c(r4) -/* 8025DD54 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8025DD58 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 8025DD5C 81 83 00 00 */ lwz r12, 0(r3) -/* 8025DD60 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8025DD64 7D 89 03 A6 */ mtctr r12 -/* 8025DD68 4E 80 04 21 */ bctrl -/* 8025DD6C 48 00 00 40 */ b lbl_8025DDAC -lbl_8025DD70: -/* 8025DD70 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DD74 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DD78 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DD7C 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DD80 7C 83 02 14 */ add r4, r3, r0 -/* 8025DD84 C0 24 0A D4 */ lfs f1, 0xad4(r4) -/* 8025DD88 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 8025DD8C 80 63 00 04 */ lwz r3, 4(r3) -/* 8025DD90 C0 04 0A C8 */ lfs f0, 0xac8(r4) -/* 8025DD94 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8025DD98 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 8025DD9C 81 83 00 00 */ lwz r12, 0(r3) -/* 8025DDA0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8025DDA4 7D 89 03 A6 */ mtctr r12 -/* 8025DDA8 4E 80 04 21 */ bctrl -lbl_8025DDAC: -/* 8025DDAC 88 1E 03 DF */ lbz r0, 0x3df(r30) -/* 8025DDB0 28 00 00 00 */ cmplwi r0, 0 -/* 8025DDB4 41 82 00 58 */ beq lbl_8025DE0C -/* 8025DDB8 C0 1E 03 B4 */ lfs f0, 0x3b4(r30) -/* 8025DDBC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DDC0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DDC4 3B A3 0A F8 */ addi r29, r3, 0xaf8 -/* 8025DDC8 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DDCC 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DDD0 7C 3D 04 2E */ lfsx f1, r29, r0 -/* 8025DDD4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8025DDD8 40 82 00 0C */ bne lbl_8025DDE4 -/* 8025DDDC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 8025DDE0 41 82 00 2C */ beq lbl_8025DE0C -lbl_8025DDE4: -/* 8025DDE4 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 8025DDE8 28 03 00 00 */ cmplwi r3, 0 -/* 8025DDEC 41 82 00 10 */ beq lbl_8025DDFC -/* 8025DDF0 C0 1E 03 B0 */ lfs f0, 0x3b0(r30) -/* 8025DDF4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025DDF8 4B FF 79 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_8025DDFC: -/* 8025DDFC 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DE00 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DE04 7C 1D 04 2E */ lfsx f0, r29, r0 -/* 8025DE08 D0 1E 03 B4 */ stfs f0, 0x3b4(r30) -lbl_8025DE0C: -/* 8025DE0C 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 8025DE10 28 00 00 00 */ cmplwi r0, 0 -/* 8025DE14 41 82 00 C4 */ beq lbl_8025DED8 -/* 8025DE18 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DE1C 54 05 10 3A */ slwi r5, r0, 2 -/* 8025DE20 7F C3 F3 78 */ mr r3, r30 -/* 8025DE24 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DE28 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DE2C 7C 80 2A 14 */ add r4, r0, r5 -/* 8025DE30 C0 24 0B 1C */ lfs f1, 0xb1c(r4) -/* 8025DE34 C0 44 0B 28 */ lfs f2, 0xb28(r4) -/* 8025DE38 48 00 1C 35 */ bl setCounterPos__21dDlst_TimerScrnDraw_cFff -/* 8025DE3C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DE40 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DE44 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DE48 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DE4C 7C 83 02 14 */ add r4, r3, r0 -/* 8025DE50 C0 24 0B 10 */ lfs f1, 0xb10(r4) -/* 8025DE54 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 8025DE58 80 63 00 04 */ lwz r3, 4(r3) -/* 8025DE5C C0 04 0B 04 */ lfs f0, 0xb04(r4) -/* 8025DE60 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8025DE64 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 8025DE68 81 83 00 00 */ lwz r12, 0(r3) -/* 8025DE6C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8025DE70 7D 89 03 A6 */ mtctr r12 -/* 8025DE74 4E 80 04 21 */ bctrl -/* 8025DE78 88 1E 03 E0 */ lbz r0, 0x3e0(r30) -/* 8025DE7C 28 00 00 00 */ cmplwi r0, 0 -/* 8025DE80 41 82 00 58 */ beq lbl_8025DED8 -/* 8025DE84 C0 1E 03 B8 */ lfs f0, 0x3b8(r30) -/* 8025DE88 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DE8C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DE90 3B A3 0B 34 */ addi r29, r3, 0xb34 -/* 8025DE94 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DE98 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DE9C 7C 3D 04 2E */ lfsx f1, r29, r0 -/* 8025DEA0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8025DEA4 40 82 00 0C */ bne lbl_8025DEB0 -/* 8025DEA8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 8025DEAC 41 82 00 2C */ beq lbl_8025DED8 -lbl_8025DEB0: -/* 8025DEB0 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 8025DEB4 28 03 00 00 */ cmplwi r3, 0 -/* 8025DEB8 41 82 00 10 */ beq lbl_8025DEC8 -/* 8025DEBC C0 1E 03 B0 */ lfs f0, 0x3b0(r30) -/* 8025DEC0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025DEC4 4B FF 79 0D */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_8025DEC8: -/* 8025DEC8 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DECC 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DED0 7C 1D 04 2E */ lfsx f0, r29, r0 -/* 8025DED4 D0 1E 03 B8 */ stfs f0, 0x3b8(r30) -lbl_8025DED8: -/* 8025DED8 80 1E 00 1C */ lwz r0, 0x1c(r30) -/* 8025DEDC 28 00 00 00 */ cmplwi r0, 0 -/* 8025DEE0 41 82 00 C4 */ beq lbl_8025DFA4 -/* 8025DEE4 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DEE8 54 05 10 3A */ slwi r5, r0, 2 -/* 8025DEEC 7F C3 F3 78 */ mr r3, r30 -/* 8025DEF0 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DEF4 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DEF8 7C 80 2A 14 */ add r4, r0, r5 -/* 8025DEFC C0 24 0B 58 */ lfs f1, 0xb58(r4) -/* 8025DF00 C0 44 0B 64 */ lfs f2, 0xb64(r4) -/* 8025DF04 48 00 1B 95 */ bl setImagePos__21dDlst_TimerScrnDraw_cFff -/* 8025DF08 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DF0C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DF10 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DF14 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DF18 7C 83 02 14 */ add r4, r3, r0 -/* 8025DF1C C0 24 0B 4C */ lfs f1, 0xb4c(r4) -/* 8025DF20 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 8025DF24 80 63 00 04 */ lwz r3, 4(r3) -/* 8025DF28 C0 04 0B 40 */ lfs f0, 0xb40(r4) -/* 8025DF2C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8025DF30 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 8025DF34 81 83 00 00 */ lwz r12, 0(r3) -/* 8025DF38 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8025DF3C 7D 89 03 A6 */ mtctr r12 -/* 8025DF40 4E 80 04 21 */ bctrl -/* 8025DF44 88 1E 03 E0 */ lbz r0, 0x3e0(r30) -/* 8025DF48 28 00 00 00 */ cmplwi r0, 0 -/* 8025DF4C 41 82 00 58 */ beq lbl_8025DFA4 -/* 8025DF50 C0 1E 03 BC */ lfs f0, 0x3bc(r30) -/* 8025DF54 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025DF58 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025DF5C 3B A3 0B 70 */ addi r29, r3, 0xb70 -/* 8025DF60 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DF64 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DF68 7C 3D 04 2E */ lfsx f1, r29, r0 -/* 8025DF6C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8025DF70 40 82 00 0C */ bne lbl_8025DF7C -/* 8025DF74 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 8025DF78 41 82 00 2C */ beq lbl_8025DFA4 -lbl_8025DF7C: -/* 8025DF7C 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 8025DF80 28 03 00 00 */ cmplwi r3, 0 -/* 8025DF84 41 82 00 10 */ beq lbl_8025DF94 -/* 8025DF88 C0 1E 03 B0 */ lfs f0, 0x3b0(r30) -/* 8025DF8C EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025DF90 4B FF 78 41 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_8025DF94: -/* 8025DF94 88 1E 03 DD */ lbz r0, 0x3dd(r30) -/* 8025DF98 54 00 10 3A */ slwi r0, r0, 2 -/* 8025DF9C 7C 1D 04 2E */ lfsx f0, r29, r0 -/* 8025DFA0 D0 1E 03 BC */ stfs f0, 0x3bc(r30) -lbl_8025DFA4: -/* 8025DFA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025DFA8 48 10 42 81 */ bl _restgpr_29 -/* 8025DFAC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025DFB0 7C 08 03 A6 */ mtlr r0 -/* 8025DFB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025DFB8 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setImagePos__21dDlst_TimerScrnDraw_cFff.s b/asm/d/d_timer/setImagePos__21dDlst_TimerScrnDraw_cFff.s deleted file mode 100644 index b9526a61021..00000000000 --- a/asm/d/d_timer/setImagePos__21dDlst_TimerScrnDraw_cFff.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025FA98: -/* 8025FA98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025FA9C 7C 08 02 A6 */ mflr r0 -/* 8025FAA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025FAA4 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8025FAA8 28 03 00 00 */ cmplwi r3, 0 -/* 8025FAAC 41 82 00 08 */ beq lbl_8025FAB4 -/* 8025FAB0 4B FF 4B 01 */ bl paneTrans__8CPaneMgrFff -lbl_8025FAB4: -/* 8025FAB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025FAB8 7C 08 03 A6 */ mtlr r0 -/* 8025FABC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025FAC0 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setParentPos__21dDlst_TimerScrnDraw_cFff.s b/asm/d/d_timer/setParentPos__21dDlst_TimerScrnDraw_cFff.s deleted file mode 100644 index ffc152288d4..00000000000 --- a/asm/d/d_timer/setParentPos__21dDlst_TimerScrnDraw_cFff.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025FA00: -/* 8025FA00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025FA04 7C 08 02 A6 */ mflr r0 -/* 8025FA08 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025FA0C 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8025FA10 28 03 00 00 */ cmplwi r3, 0 -/* 8025FA14 41 82 00 08 */ beq lbl_8025FA1C -/* 8025FA18 4B FF 4B 99 */ bl paneTrans__8CPaneMgrFff -lbl_8025FA1C: -/* 8025FA1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025FA20 7C 08 03 A6 */ mtlr r0 -/* 8025FA24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025FA28 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setScreenBase__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/setScreenBase__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index bd2c7e49560..00000000000 --- a/asm/d/d_timer/setScreenBase__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,272 +0,0 @@ -lbl_8025E240: -/* 8025E240 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025E244 7C 08 02 A6 */ mflr r0 -/* 8025E248 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025E24C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025E250 7C 7F 1B 78 */ mr r31, r3 -/* 8025E254 38 60 01 18 */ li r3, 0x118 -/* 8025E258 48 07 09 F5 */ bl __nw__FUl -/* 8025E25C 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E260 41 82 00 0C */ beq lbl_8025E26C -/* 8025E264 48 09 A2 35 */ bl __ct__9J2DScreenFv -/* 8025E268 7C 60 1B 78 */ mr r0, r3 -lbl_8025E26C: -/* 8025E26C 90 1F 00 04 */ stw r0, 4(r31) -/* 8025E270 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E274 3C 80 80 3A */ lis r4, d_d_timer__stringBase0@ha /* 0x8039A3D8@ha */ -/* 8025E278 38 84 A3 D8 */ addi r4, r4, d_d_timer__stringBase0@l /* 0x8039A3D8@l */ -/* 8025E27C 38 84 00 46 */ addi r4, r4, 0x46 -/* 8025E280 3C A0 00 02 */ lis r5, 2 -/* 8025E284 80 DF 00 7C */ lwz r6, 0x7c(r31) -/* 8025E288 48 09 A3 C1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 8025E28C 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E290 4B FF 6E 59 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 8025E294 38 00 00 00 */ li r0, 0 -/* 8025E298 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8025E29C 38 60 00 6C */ li r3, 0x6c -/* 8025E2A0 48 07 09 AD */ bl __nw__FUl -/* 8025E2A4 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E2A8 41 82 00 24 */ beq lbl_8025E2CC -/* 8025E2AC 80 9F 00 04 */ lwz r4, 4(r31) -/* 8025E2B0 3C A0 6F 77 */ lis r5, 0x6F77 /* 0x6F775F6E@ha */ -/* 8025E2B4 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x6F775F6E@l */ -/* 8025E2B8 38 A0 00 63 */ li r5, 0x63 -/* 8025E2BC 38 E0 00 02 */ li r7, 2 -/* 8025E2C0 39 00 00 00 */ li r8, 0 -/* 8025E2C4 4B FF 56 C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E2C8 7C 60 1B 78 */ mr r0, r3 -lbl_8025E2CC: -/* 8025E2CC 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8025E2D0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8025E2D4 C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 8025E2D8 4B FF 74 F9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025E2DC 38 60 00 6C */ li r3, 0x6c -/* 8025E2E0 48 07 09 6D */ bl __nw__FUl -/* 8025E2E4 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E2E8 41 82 00 24 */ beq lbl_8025E30C -/* 8025E2EC 80 9F 00 04 */ lwz r4, 4(r31) -/* 8025E2F0 3C A0 6D 65 */ lis r5, 0x6D65 /* 0x6D655F6E@ha */ -/* 8025E2F4 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x6D655F6E@l */ -/* 8025E2F8 38 A0 74 69 */ li r5, 0x7469 -/* 8025E2FC 38 E0 00 02 */ li r7, 2 -/* 8025E300 39 00 00 00 */ li r8, 0 -/* 8025E304 4B FF 56 81 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E308 7C 60 1B 78 */ mr r0, r3 -lbl_8025E30C: -/* 8025E30C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8025E310 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8025E314 C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 8025E318 4B FF 74 B9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025E31C 38 60 00 6C */ li r3, 0x6c -/* 8025E320 48 07 09 2D */ bl __nw__FUl -/* 8025E324 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E328 41 82 00 28 */ beq lbl_8025E350 -/* 8025E32C 80 9F 00 04 */ lwz r4, 4(r31) -/* 8025E330 3C A0 5F 69 */ lis r5, 0x5F69 /* 0x5F695F6E@ha */ -/* 8025E334 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x5F695F6E@l */ -/* 8025E338 3C A0 00 63 */ lis r5, 0x0063 /* 0x00636F77@ha */ -/* 8025E33C 38 A5 6F 77 */ addi r5, r5, 0x6F77 /* 0x00636F77@l */ -/* 8025E340 38 E0 00 02 */ li r7, 2 -/* 8025E344 39 00 00 00 */ li r8, 0 -/* 8025E348 4B FF 56 3D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E34C 7C 60 1B 78 */ mr r0, r3 -lbl_8025E350: -/* 8025E350 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 8025E354 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 8025E358 C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 8025E35C 4B FF 74 75 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025E360 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E364 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F32@ha */ -/* 8025E368 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x5F6E5F32@l */ -/* 8025E36C 38 A0 00 63 */ li r5, 0x63 -/* 8025E370 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E374 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E378 7D 89 03 A6 */ mtctr r12 -/* 8025E37C 4E 80 04 21 */ bctrl -/* 8025E380 90 7F 00 5C */ stw r3, 0x5c(r31) -/* 8025E384 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E388 3C 80 5F 32 */ lis r4, 0x5F32 /* 0x5F325F73@ha */ -/* 8025E38C 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F325F73@l */ -/* 8025E390 3C 80 00 63 */ lis r4, 0x0063 /* 0x00635F6E@ha */ -/* 8025E394 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x00635F6E@l */ -/* 8025E398 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E39C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E3A0 7D 89 03 A6 */ mtctr r12 -/* 8025E3A4 4E 80 04 21 */ bctrl -/* 8025E3A8 90 7F 00 60 */ stw r3, 0x60(r31) -/* 8025E3AC 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E3B0 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F31@ha */ -/* 8025E3B4 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x5F6E5F31@l */ -/* 8025E3B8 38 A0 00 63 */ li r5, 0x63 -/* 8025E3BC 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E3C0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E3C4 7D 89 03 A6 */ mtctr r12 -/* 8025E3C8 4E 80 04 21 */ bctrl -/* 8025E3CC 90 7F 00 64 */ stw r3, 0x64(r31) -/* 8025E3D0 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E3D4 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F73@ha */ -/* 8025E3D8 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F315F73@l */ -/* 8025E3DC 3C 80 00 63 */ lis r4, 0x0063 /* 0x00635F6E@ha */ -/* 8025E3E0 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x00635F6E@l */ -/* 8025E3E4 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E3E8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E3EC 7D 89 03 A6 */ mtctr r12 -/* 8025E3F0 4E 80 04 21 */ bctrl -/* 8025E3F4 90 7F 00 68 */ stw r3, 0x68(r31) -/* 8025E3F8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E3FC 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F34@ha */ -/* 8025E400 38 C4 5F 34 */ addi r6, r4, 0x5F34 /* 0x5F6E5F34@l */ -/* 8025E404 38 A0 00 63 */ li r5, 0x63 -/* 8025E408 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E40C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E410 7D 89 03 A6 */ mtctr r12 -/* 8025E414 4E 80 04 21 */ bctrl -/* 8025E418 90 7F 00 6C */ stw r3, 0x6c(r31) -/* 8025E41C 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E420 3C 80 5F 34 */ lis r4, 0x5F34 /* 0x5F345F73@ha */ -/* 8025E424 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F345F73@l */ -/* 8025E428 3C 80 00 63 */ lis r4, 0x0063 /* 0x00635F6E@ha */ -/* 8025E42C 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x00635F6E@l */ -/* 8025E430 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E434 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E438 7D 89 03 A6 */ mtctr r12 -/* 8025E43C 4E 80 04 21 */ bctrl -/* 8025E440 90 7F 00 70 */ stw r3, 0x70(r31) -/* 8025E444 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E448 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F33@ha */ -/* 8025E44C 38 C4 5F 33 */ addi r6, r4, 0x5F33 /* 0x5F6E5F33@l */ -/* 8025E450 38 A0 00 63 */ li r5, 0x63 -/* 8025E454 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E458 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E45C 7D 89 03 A6 */ mtctr r12 -/* 8025E460 4E 80 04 21 */ bctrl -/* 8025E464 90 7F 00 74 */ stw r3, 0x74(r31) -/* 8025E468 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E46C 3C 80 5F 33 */ lis r4, 0x5F33 /* 0x5F335F73@ha */ -/* 8025E470 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F335F73@l */ -/* 8025E474 3C 80 00 63 */ lis r4, 0x0063 /* 0x00635F6E@ha */ -/* 8025E478 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x00635F6E@l */ -/* 8025E47C 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E480 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E484 7D 89 03 A6 */ mtctr r12 -/* 8025E488 4E 80 04 21 */ bctrl -/* 8025E48C 90 7F 00 78 */ stw r3, 0x78(r31) -/* 8025E490 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E494 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F36@ha */ -/* 8025E498 38 C4 5F 36 */ addi r6, r4, 0x5F36 /* 0x5F6E5F36@l */ -/* 8025E49C 38 A0 00 74 */ li r5, 0x74 -/* 8025E4A0 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E4A4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E4A8 7D 89 03 A6 */ mtctr r12 -/* 8025E4AC 4E 80 04 21 */ bctrl -/* 8025E4B0 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 8025E4B4 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E4B8 3C 80 5F 36 */ lis r4, 0x5F36 /* 0x5F365F73@ha */ -/* 8025E4BC 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F365F73@l */ -/* 8025E4C0 3C 80 00 74 */ lis r4, 0x0074 /* 0x00745F6E@ha */ -/* 8025E4C4 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x00745F6E@l */ -/* 8025E4C8 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E4CC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E4D0 7D 89 03 A6 */ mtctr r12 -/* 8025E4D4 4E 80 04 21 */ bctrl -/* 8025E4D8 90 7F 00 30 */ stw r3, 0x30(r31) -/* 8025E4DC 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E4E0 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F35@ha */ -/* 8025E4E4 38 C4 5F 35 */ addi r6, r4, 0x5F35 /* 0x5F6E5F35@l */ -/* 8025E4E8 38 A0 00 74 */ li r5, 0x74 -/* 8025E4EC 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E4F0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E4F4 7D 89 03 A6 */ mtctr r12 -/* 8025E4F8 4E 80 04 21 */ bctrl -/* 8025E4FC 90 7F 00 34 */ stw r3, 0x34(r31) -/* 8025E500 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E504 3C 80 5F 35 */ lis r4, 0x5F35 /* 0x5F355F73@ha */ -/* 8025E508 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F355F73@l */ -/* 8025E50C 3C 80 00 74 */ lis r4, 0x0074 /* 0x00745F6E@ha */ -/* 8025E510 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x00745F6E@l */ -/* 8025E514 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E518 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E51C 7D 89 03 A6 */ mtctr r12 -/* 8025E520 4E 80 04 21 */ bctrl -/* 8025E524 90 7F 00 38 */ stw r3, 0x38(r31) -/* 8025E528 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E52C 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F34@ha */ -/* 8025E530 38 C4 5F 34 */ addi r6, r4, 0x5F34 /* 0x5F6E5F34@l */ -/* 8025E534 38 A0 00 74 */ li r5, 0x74 -/* 8025E538 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E53C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E540 7D 89 03 A6 */ mtctr r12 -/* 8025E544 4E 80 04 21 */ bctrl -/* 8025E548 90 7F 00 3C */ stw r3, 0x3c(r31) -/* 8025E54C 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E550 3C 80 5F 34 */ lis r4, 0x5F34 /* 0x5F345F73@ha */ -/* 8025E554 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F345F73@l */ -/* 8025E558 3C 80 00 74 */ lis r4, 0x0074 /* 0x00745F6E@ha */ -/* 8025E55C 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x00745F6E@l */ -/* 8025E560 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E564 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E568 7D 89 03 A6 */ mtctr r12 -/* 8025E56C 4E 80 04 21 */ bctrl -/* 8025E570 90 7F 00 40 */ stw r3, 0x40(r31) -/* 8025E574 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E578 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F33@ha */ -/* 8025E57C 38 C4 5F 33 */ addi r6, r4, 0x5F33 /* 0x5F6E5F33@l */ -/* 8025E580 38 A0 00 74 */ li r5, 0x74 -/* 8025E584 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E588 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E58C 7D 89 03 A6 */ mtctr r12 -/* 8025E590 4E 80 04 21 */ bctrl -/* 8025E594 90 7F 00 44 */ stw r3, 0x44(r31) -/* 8025E598 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E59C 3C 80 5F 33 */ lis r4, 0x5F33 /* 0x5F335F73@ha */ -/* 8025E5A0 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F335F73@l */ -/* 8025E5A4 3C 80 00 74 */ lis r4, 0x0074 /* 0x00745F6E@ha */ -/* 8025E5A8 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x00745F6E@l */ -/* 8025E5AC 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E5B0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E5B4 7D 89 03 A6 */ mtctr r12 -/* 8025E5B8 4E 80 04 21 */ bctrl -/* 8025E5BC 90 7F 00 48 */ stw r3, 0x48(r31) -/* 8025E5C0 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E5C4 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F32@ha */ -/* 8025E5C8 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x5F6E5F32@l */ -/* 8025E5CC 38 A0 00 74 */ li r5, 0x74 -/* 8025E5D0 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E5D4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E5D8 7D 89 03 A6 */ mtctr r12 -/* 8025E5DC 4E 80 04 21 */ bctrl -/* 8025E5E0 90 7F 00 4C */ stw r3, 0x4c(r31) -/* 8025E5E4 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E5E8 3C 80 5F 32 */ lis r4, 0x5F32 /* 0x5F325F73@ha */ -/* 8025E5EC 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F325F73@l */ -/* 8025E5F0 3C 80 00 74 */ lis r4, 0x0074 /* 0x00745F6E@ha */ -/* 8025E5F4 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x00745F6E@l */ -/* 8025E5F8 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E5FC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E600 7D 89 03 A6 */ mtctr r12 -/* 8025E604 4E 80 04 21 */ bctrl -/* 8025E608 90 7F 00 50 */ stw r3, 0x50(r31) -/* 8025E60C 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E610 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F31@ha */ -/* 8025E614 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x5F6E5F31@l */ -/* 8025E618 38 A0 00 74 */ li r5, 0x74 -/* 8025E61C 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E620 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E624 7D 89 03 A6 */ mtctr r12 -/* 8025E628 4E 80 04 21 */ bctrl -/* 8025E62C 90 7F 00 54 */ stw r3, 0x54(r31) -/* 8025E630 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E634 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F73@ha */ -/* 8025E638 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F315F73@l */ -/* 8025E63C 3C 80 00 74 */ lis r4, 0x0074 /* 0x00745F6E@ha */ -/* 8025E640 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x00745F6E@l */ -/* 8025E644 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E648 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E64C 7D 89 03 A6 */ mtctr r12 -/* 8025E650 4E 80 04 21 */ bctrl -/* 8025E654 90 7F 00 58 */ stw r3, 0x58(r31) -/* 8025E658 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025E65C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025E660 7C 08 03 A6 */ mtlr r0 -/* 8025E664 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025E668 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setScreenBoatRace__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/setScreenBoatRace__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index 2a97ea1bc8c..00000000000 --- a/asm/d/d_timer/setScreenBoatRace__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,156 +0,0 @@ -lbl_8025E66C: -/* 8025E66C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025E670 7C 08 02 A6 */ mflr r0 -/* 8025E674 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025E678 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025E67C 7C 7F 1B 78 */ mr r31, r3 -/* 8025E680 38 60 01 18 */ li r3, 0x118 -/* 8025E684 48 07 05 C9 */ bl __nw__FUl -/* 8025E688 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E68C 41 82 00 0C */ beq lbl_8025E698 -/* 8025E690 48 09 9E 09 */ bl __ct__9J2DScreenFv -/* 8025E694 7C 60 1B 78 */ mr r0, r3 -lbl_8025E698: -/* 8025E698 90 1F 00 04 */ stw r0, 4(r31) -/* 8025E69C 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E6A0 3C 80 80 3A */ lis r4, d_d_timer__stringBase0@ha /* 0x8039A3D8@ha */ -/* 8025E6A4 38 84 A3 D8 */ addi r4, r4, d_d_timer__stringBase0@l /* 0x8039A3D8@l */ -/* 8025E6A8 38 84 00 64 */ addi r4, r4, 0x64 -/* 8025E6AC 3C A0 00 02 */ lis r5, 2 -/* 8025E6B0 80 DF 00 7C */ lwz r6, 0x7c(r31) -/* 8025E6B4 48 09 9F 95 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 8025E6B8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E6BC 4B FF 6A 2D */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 8025E6C0 38 60 00 6C */ li r3, 0x6c -/* 8025E6C4 48 07 05 89 */ bl __nw__FUl -/* 8025E6C8 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E6CC 41 82 00 28 */ beq lbl_8025E6F4 -/* 8025E6D0 80 9F 00 04 */ lwz r4, 4(r31) -/* 8025E6D4 3C A0 63 6F */ lis r5, 0x636F /* 0x636F5F6E@ha */ -/* 8025E6D8 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x636F5F6E@l */ -/* 8025E6DC 3C A0 00 74 */ lis r5, 0x0074 /* 0x0074615F@ha */ -/* 8025E6E0 38 A5 61 5F */ addi r5, r5, 0x615F /* 0x0074615F@l */ -/* 8025E6E4 38 E0 00 02 */ li r7, 2 -/* 8025E6E8 39 00 00 00 */ li r8, 0 -/* 8025E6EC 4B FF 52 99 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E6F0 7C 60 1B 78 */ mr r0, r3 -lbl_8025E6F4: -/* 8025E6F4 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8025E6F8 38 60 00 6C */ li r3, 0x6c -/* 8025E6FC 48 07 05 51 */ bl __nw__FUl -/* 8025E700 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E704 41 82 00 24 */ beq lbl_8025E728 -/* 8025E708 80 9F 00 04 */ lwz r4, 4(r31) -/* 8025E70C 3C A0 75 6D */ lis r5, 0x756D /* 0x756D5F6E@ha */ -/* 8025E710 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x756D5F6E@l */ -/* 8025E714 38 A0 00 6E */ li r5, 0x6e -/* 8025E718 38 E0 00 02 */ li r7, 2 -/* 8025E71C 39 00 00 00 */ li r8, 0 -/* 8025E720 4B FF 52 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E724 7C 60 1B 78 */ mr r0, r3 -lbl_8025E728: -/* 8025E728 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8025E72C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8025E730 C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 8025E734 4B FF 70 9D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025E738 38 00 00 00 */ li r0, 0 -/* 8025E73C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8025E740 38 60 00 6C */ li r3, 0x6c -/* 8025E744 48 07 05 09 */ bl __nw__FUl -/* 8025E748 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E74C 41 82 00 28 */ beq lbl_8025E774 -/* 8025E750 80 9F 00 04 */ lwz r4, 4(r31) -/* 8025E754 3C A0 65 74 */ lis r5, 0x6574 /* 0x65745F6E@ha */ -/* 8025E758 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x65745F6E@l */ -/* 8025E75C 3C A0 74 61 */ lis r5, 0x7461 /* 0x74617267@ha */ -/* 8025E760 38 A5 72 67 */ addi r5, r5, 0x7267 /* 0x74617267@l */ -/* 8025E764 38 E0 00 02 */ li r7, 2 -/* 8025E768 39 00 00 00 */ li r8, 0 -/* 8025E76C 4B FF 52 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E770 7C 60 1B 78 */ mr r0, r3 -lbl_8025E774: -/* 8025E774 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 8025E778 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 8025E77C C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 8025E780 4B FF 70 51 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025E784 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E788 3C 80 72 67 */ lis r4, 0x7267 /* 0x72676574@ha */ -/* 8025E78C 38 C4 65 74 */ addi r6, r4, 0x6574 /* 0x72676574@l */ -/* 8025E790 3C 80 77 5F */ lis r4, 0x775F /* 0x775F7461@ha */ -/* 8025E794 38 A4 74 61 */ addi r5, r4, 0x7461 /* 0x775F7461@l */ -/* 8025E798 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E79C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E7A0 7D 89 03 A6 */ mtctr r12 -/* 8025E7A4 4E 80 04 21 */ bctrl -/* 8025E7A8 38 00 00 00 */ li r0, 0 -/* 8025E7AC 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8025E7B0 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E7B4 3C 80 72 67 */ lis r4, 0x7267 /* 0x72676574@ha */ -/* 8025E7B8 38 C4 65 74 */ addi r6, r4, 0x6574 /* 0x72676574@l */ -/* 8025E7BC 38 A0 74 61 */ li r5, 0x7461 -/* 8025E7C0 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E7C4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E7C8 7D 89 03 A6 */ mtctr r12 -/* 8025E7CC 4E 80 04 21 */ bctrl -/* 8025E7D0 38 00 00 01 */ li r0, 1 -/* 8025E7D4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8025E7D8 38 E0 00 00 */ li r7, 0 -/* 8025E7DC 38 60 00 00 */ li r3, 0 -/* 8025E7E0 38 A0 00 00 */ li r5, 0 -lbl_8025E7E4: -/* 8025E7E4 38 80 00 00 */ li r4, 0 -/* 8025E7E8 7C DF 1A 14 */ add r6, r31, r3 -/* 8025E7EC 38 00 00 02 */ li r0, 2 -/* 8025E7F0 7C 09 03 A6 */ mtctr r0 -lbl_8025E7F4: -/* 8025E7F4 38 04 00 5C */ addi r0, r4, 0x5c -/* 8025E7F8 7C A6 01 2E */ stwx r5, r6, r0 -/* 8025E7FC 38 84 00 04 */ addi r4, r4, 4 -/* 8025E800 42 00 FF F4 */ bdnz lbl_8025E7F4 -/* 8025E804 38 E7 00 01 */ addi r7, r7, 1 -/* 8025E808 2C 07 00 02 */ cmpwi r7, 2 -/* 8025E80C 38 63 00 08 */ addi r3, r3, 8 -/* 8025E810 41 80 FF D4 */ blt lbl_8025E7E4 -/* 8025E814 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E818 3C 80 75 6D */ lis r4, 0x756D /* 0x756D5F31@ha */ -/* 8025E81C 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x756D5F31@l */ -/* 8025E820 38 A0 00 6E */ li r5, 0x6e -/* 8025E824 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E828 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E82C 7D 89 03 A6 */ mtctr r12 -/* 8025E830 4E 80 04 21 */ bctrl -/* 8025E834 90 7F 00 6C */ stw r3, 0x6c(r31) -/* 8025E838 38 00 00 00 */ li r0, 0 -/* 8025E83C 90 1F 00 70 */ stw r0, 0x70(r31) -/* 8025E840 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E844 3C 80 75 6D */ lis r4, 0x756D /* 0x756D5F30@ha */ -/* 8025E848 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x756D5F30@l */ -/* 8025E84C 38 A0 00 6E */ li r5, 0x6e -/* 8025E850 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E854 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E858 7D 89 03 A6 */ mtctr r12 -/* 8025E85C 4E 80 04 21 */ bctrl -/* 8025E860 90 7F 00 74 */ stw r3, 0x74(r31) -/* 8025E864 38 A0 00 00 */ li r5, 0 -/* 8025E868 90 BF 00 78 */ stw r5, 0x78(r31) -/* 8025E86C 38 E0 00 00 */ li r7, 0 -/* 8025E870 38 60 00 00 */ li r3, 0 -lbl_8025E874: -/* 8025E874 38 80 00 00 */ li r4, 0 -/* 8025E878 7C DF 1A 14 */ add r6, r31, r3 -/* 8025E87C 38 00 00 02 */ li r0, 2 -/* 8025E880 7C 09 03 A6 */ mtctr r0 -lbl_8025E884: -/* 8025E884 38 04 00 2C */ addi r0, r4, 0x2c -/* 8025E888 7C A6 01 2E */ stwx r5, r6, r0 -/* 8025E88C 38 84 00 04 */ addi r4, r4, 4 -/* 8025E890 42 00 FF F4 */ bdnz lbl_8025E884 -/* 8025E894 38 E7 00 01 */ addi r7, r7, 1 -/* 8025E898 2C 07 00 06 */ cmpwi r7, 6 -/* 8025E89C 38 63 00 08 */ addi r3, r3, 8 -/* 8025E8A0 41 80 FF D4 */ blt lbl_8025E874 -/* 8025E8A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025E8A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025E8AC 7C 08 03 A6 */ mtlr r0 -/* 8025E8B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025E8B4 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setScreenRider__21dDlst_TimerScrnDraw_cFv.s b/asm/d/d_timer/setScreenRider__21dDlst_TimerScrnDraw_cFv.s deleted file mode 100644 index e365074a86c..00000000000 --- a/asm/d/d_timer/setScreenRider__21dDlst_TimerScrnDraw_cFv.s +++ /dev/null @@ -1,160 +0,0 @@ -lbl_8025E8B8: -/* 8025E8B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025E8BC 7C 08 02 A6 */ mflr r0 -/* 8025E8C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025E8C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025E8C8 7C 7F 1B 78 */ mr r31, r3 -/* 8025E8CC 38 60 01 18 */ li r3, 0x118 -/* 8025E8D0 48 07 03 7D */ bl __nw__FUl -/* 8025E8D4 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E8D8 41 82 00 0C */ beq lbl_8025E8E4 -/* 8025E8DC 48 09 9B BD */ bl __ct__9J2DScreenFv -/* 8025E8E0 7C 60 1B 78 */ mr r0, r3 -lbl_8025E8E4: -/* 8025E8E4 90 1F 00 04 */ stw r0, 4(r31) -/* 8025E8E8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E8EC 3C 80 80 3A */ lis r4, d_d_timer__stringBase0@ha /* 0x8039A3D8@ha */ -/* 8025E8F0 38 84 A3 D8 */ addi r4, r4, d_d_timer__stringBase0@l /* 0x8039A3D8@l */ -/* 8025E8F4 38 84 00 89 */ addi r4, r4, 0x89 -/* 8025E8F8 3C A0 00 02 */ lis r5, 2 -/* 8025E8FC 80 DF 00 7C */ lwz r6, 0x7c(r31) -/* 8025E900 48 09 9D 49 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 8025E904 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E908 4B FF 67 E1 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 8025E90C 38 00 00 00 */ li r0, 0 -/* 8025E910 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8025E914 38 60 00 6C */ li r3, 0x6c -/* 8025E918 48 07 03 35 */ bl __nw__FUl -/* 8025E91C 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E920 41 82 00 24 */ beq lbl_8025E944 -/* 8025E924 80 9F 00 04 */ lwz r4, 4(r31) -/* 8025E928 3C A0 75 6D */ lis r5, 0x756D /* 0x756D5F6E@ha */ -/* 8025E92C 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x756D5F6E@l */ -/* 8025E930 38 A0 00 6E */ li r5, 0x6e -/* 8025E934 38 E0 00 02 */ li r7, 2 -/* 8025E938 39 00 00 00 */ li r8, 0 -/* 8025E93C 4B FF 50 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E940 7C 60 1B 78 */ mr r0, r3 -lbl_8025E944: -/* 8025E944 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8025E948 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8025E94C C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 8025E950 4B FF 6E 81 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025E954 38 00 00 00 */ li r0, 0 -/* 8025E958 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8025E95C 38 60 00 6C */ li r3, 0x6c -/* 8025E960 48 07 02 ED */ bl __nw__FUl -/* 8025E964 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E968 41 82 00 28 */ beq lbl_8025E990 -/* 8025E96C 80 9F 00 04 */ lwz r4, 4(r31) -/* 8025E970 3C A0 5F 69 */ lis r5, 0x5F69 /* 0x5F695F6E@ha */ -/* 8025E974 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x5F695F6E@l */ -/* 8025E978 3C A0 00 72 */ lis r5, 0x0072 /* 0x00726964@ha */ -/* 8025E97C 38 A5 69 64 */ addi r5, r5, 0x6964 /* 0x00726964@l */ -/* 8025E980 38 E0 00 02 */ li r7, 2 -/* 8025E984 39 00 00 00 */ li r8, 0 -/* 8025E988 4B FF 4F FD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E98C 7C 60 1B 78 */ mr r0, r3 -lbl_8025E990: -/* 8025E990 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 8025E994 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 8025E998 C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 8025E99C 4B FF 6E 35 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025E9A0 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E9A4 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F32@ha */ -/* 8025E9A8 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x5F6E5F32@l */ -/* 8025E9AC 38 A0 00 6E */ li r5, 0x6e -/* 8025E9B0 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E9B4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E9B8 7D 89 03 A6 */ mtctr r12 -/* 8025E9BC 4E 80 04 21 */ bctrl -/* 8025E9C0 90 7F 00 5C */ stw r3, 0x5c(r31) -/* 8025E9C4 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E9C8 3C 80 5F 32 */ lis r4, 0x5F32 /* 0x5F325F73@ha */ -/* 8025E9CC 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F325F73@l */ -/* 8025E9D0 3C 80 00 6E */ lis r4, 0x006E /* 0x006E5F6E@ha */ -/* 8025E9D4 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x006E5F6E@l */ -/* 8025E9D8 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E9DC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E9E0 7D 89 03 A6 */ mtctr r12 -/* 8025E9E4 4E 80 04 21 */ bctrl -/* 8025E9E8 90 7F 00 60 */ stw r3, 0x60(r31) -/* 8025E9EC 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E9F0 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F31@ha */ -/* 8025E9F4 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x5F6E5F31@l */ -/* 8025E9F8 38 A0 00 6E */ li r5, 0x6e -/* 8025E9FC 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EA00 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025EA04 7D 89 03 A6 */ mtctr r12 -/* 8025EA08 4E 80 04 21 */ bctrl -/* 8025EA0C 90 7F 00 64 */ stw r3, 0x64(r31) -/* 8025EA10 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025EA14 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F73@ha */ -/* 8025EA18 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F315F73@l */ -/* 8025EA1C 3C 80 00 6E */ lis r4, 0x006E /* 0x006E5F6E@ha */ -/* 8025EA20 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x006E5F6E@l */ -/* 8025EA24 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EA28 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025EA2C 7D 89 03 A6 */ mtctr r12 -/* 8025EA30 4E 80 04 21 */ bctrl -/* 8025EA34 90 7F 00 68 */ stw r3, 0x68(r31) -/* 8025EA38 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025EA3C 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F34@ha */ -/* 8025EA40 38 C4 5F 34 */ addi r6, r4, 0x5F34 /* 0x5F6E5F34@l */ -/* 8025EA44 38 A0 00 6E */ li r5, 0x6e -/* 8025EA48 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EA4C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025EA50 7D 89 03 A6 */ mtctr r12 -/* 8025EA54 4E 80 04 21 */ bctrl -/* 8025EA58 90 7F 00 6C */ stw r3, 0x6c(r31) -/* 8025EA5C 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025EA60 3C 80 5F 34 */ lis r4, 0x5F34 /* 0x5F345F73@ha */ -/* 8025EA64 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F345F73@l */ -/* 8025EA68 3C 80 00 6E */ lis r4, 0x006E /* 0x006E5F6E@ha */ -/* 8025EA6C 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x006E5F6E@l */ -/* 8025EA70 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EA74 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025EA78 7D 89 03 A6 */ mtctr r12 -/* 8025EA7C 4E 80 04 21 */ bctrl -/* 8025EA80 90 7F 00 70 */ stw r3, 0x70(r31) -/* 8025EA84 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025EA88 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E5F33@ha */ -/* 8025EA8C 38 C4 5F 33 */ addi r6, r4, 0x5F33 /* 0x5F6E5F33@l */ -/* 8025EA90 38 A0 00 6E */ li r5, 0x6e -/* 8025EA94 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EA98 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025EA9C 7D 89 03 A6 */ mtctr r12 -/* 8025EAA0 4E 80 04 21 */ bctrl -/* 8025EAA4 90 7F 00 74 */ stw r3, 0x74(r31) -/* 8025EAA8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025EAAC 3C 80 5F 33 */ lis r4, 0x5F33 /* 0x5F335F73@ha */ -/* 8025EAB0 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x5F335F73@l */ -/* 8025EAB4 3C 80 00 6E */ lis r4, 0x006E /* 0x006E5F6E@ha */ -/* 8025EAB8 38 A4 5F 6E */ addi r5, r4, 0x5F6E /* 0x006E5F6E@l */ -/* 8025EABC 81 83 00 00 */ lwz r12, 0(r3) -/* 8025EAC0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025EAC4 7D 89 03 A6 */ mtctr r12 -/* 8025EAC8 4E 80 04 21 */ bctrl -/* 8025EACC 90 7F 00 78 */ stw r3, 0x78(r31) -/* 8025EAD0 38 E0 00 00 */ li r7, 0 -/* 8025EAD4 38 60 00 00 */ li r3, 0 -/* 8025EAD8 38 A0 00 00 */ li r5, 0 -lbl_8025EADC: -/* 8025EADC 38 80 00 00 */ li r4, 0 -/* 8025EAE0 7C DF 1A 14 */ add r6, r31, r3 -/* 8025EAE4 38 00 00 02 */ li r0, 2 -/* 8025EAE8 7C 09 03 A6 */ mtctr r0 -lbl_8025EAEC: -/* 8025EAEC 38 04 00 2C */ addi r0, r4, 0x2c -/* 8025EAF0 7C A6 01 2E */ stwx r5, r6, r0 -/* 8025EAF4 38 84 00 04 */ addi r4, r4, 4 -/* 8025EAF8 42 00 FF F4 */ bdnz lbl_8025EAEC -/* 8025EAFC 38 E7 00 01 */ addi r7, r7, 1 -/* 8025EB00 2C 07 00 06 */ cmpwi r7, 6 -/* 8025EB04 38 63 00 08 */ addi r3, r3, 8 -/* 8025EB08 41 80 FF D4 */ blt lbl_8025EADC -/* 8025EB0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025EB10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025EB14 7C 08 03 A6 */ mtlr r0 -/* 8025EB18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025EB1C 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive.s b/asm/d/d_timer/setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive.s deleted file mode 100644 index 56a69b0ede2..00000000000 --- a/asm/d/d_timer/setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive.s +++ /dev/null @@ -1,171 +0,0 @@ -lbl_8025DFBC: -/* 8025DFBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025DFC0 7C 08 02 A6 */ mflr r0 -/* 8025DFC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025DFC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025DFCC 93 C1 00 08 */ stw r30, 8(r1) -/* 8025DFD0 7C 7F 1B 78 */ mr r31, r3 -/* 8025DFD4 90 83 03 C8 */ stw r4, 0x3c8(r3) -/* 8025DFD8 90 A3 00 7C */ stw r5, 0x7c(r3) -/* 8025DFDC 80 03 03 C8 */ lwz r0, 0x3c8(r3) -/* 8025DFE0 2C 00 00 03 */ cmpwi r0, 3 -/* 8025DFE4 41 82 00 0C */ beq lbl_8025DFF0 -/* 8025DFE8 2C 00 00 04 */ cmpwi r0, 4 -/* 8025DFEC 40 82 00 10 */ bne lbl_8025DFFC -lbl_8025DFF0: -/* 8025DFF0 7F E3 FB 78 */ mr r3, r31 -/* 8025DFF4 48 00 06 79 */ bl setScreenBoatRace__21dDlst_TimerScrnDraw_cFv -/* 8025DFF8 48 00 00 18 */ b lbl_8025E010 -lbl_8025DFFC: -/* 8025DFFC 2C 00 00 08 */ cmpwi r0, 8 -/* 8025E000 40 82 00 0C */ bne lbl_8025E00C -/* 8025E004 48 00 08 B5 */ bl setScreenRider__21dDlst_TimerScrnDraw_cFv -/* 8025E008 48 00 00 08 */ b lbl_8025E010 -lbl_8025E00C: -/* 8025E00C 48 00 02 35 */ bl setScreenBase__21dDlst_TimerScrnDraw_cFv -lbl_8025E010: -/* 8025E010 7F E3 FB 78 */ mr r3, r31 -/* 8025E014 38 80 00 03 */ li r4, 3 -/* 8025E018 48 00 1A AD */ bl setShowType__21dDlst_TimerScrnDraw_cFUc -/* 8025E01C 38 60 01 18 */ li r3, 0x118 -/* 8025E020 48 07 0C 2D */ bl __nw__FUl -/* 8025E024 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E028 41 82 00 0C */ beq lbl_8025E034 -/* 8025E02C 48 09 A4 6D */ bl __ct__9J2DScreenFv -/* 8025E030 7C 60 1B 78 */ mr r0, r3 -lbl_8025E034: -/* 8025E034 90 1F 00 08 */ stw r0, 8(r31) -/* 8025E038 80 7F 00 08 */ lwz r3, 8(r31) -/* 8025E03C 3C 80 80 3A */ lis r4, d_d_timer__stringBase0@ha /* 0x8039A3D8@ha */ -/* 8025E040 38 84 A3 D8 */ addi r4, r4, d_d_timer__stringBase0@l /* 0x8039A3D8@l */ -/* 8025E044 38 84 00 06 */ addi r4, r4, 6 -/* 8025E048 3C A0 00 02 */ lis r5, 2 -/* 8025E04C 80 DF 00 7C */ lwz r6, 0x7c(r31) -/* 8025E050 48 09 A5 F9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 8025E054 80 7F 00 08 */ lwz r3, 8(r31) -/* 8025E058 4B FF 70 91 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 8025E05C 38 60 00 04 */ li r3, 4 -/* 8025E060 64 63 00 04 */ oris r3, r3, 4 -/* 8025E064 7C 72 E3 A6 */ mtspr 0x392, r3 -/* 8025E068 38 60 00 05 */ li r3, 5 -/* 8025E06C 64 63 00 05 */ oris r3, r3, 5 -/* 8025E070 7C 73 E3 A6 */ mtspr 0x393, r3 -/* 8025E074 38 60 00 06 */ li r3, 6 -/* 8025E078 64 63 00 06 */ oris r3, r3, 6 -/* 8025E07C 7C 74 E3 A6 */ mtspr 0x394, r3 -/* 8025E080 38 60 00 07 */ li r3, 7 -/* 8025E084 64 63 00 07 */ oris r3, r3, 7 -/* 8025E088 7C 75 E3 A6 */ mtspr 0x395, r3 -/* 8025E08C 3C 80 80 3A */ lis r4, d_d_timer__stringBase0@ha /* 0x8039A3D8@ha */ -/* 8025E090 38 84 A3 D8 */ addi r4, r4, d_d_timer__stringBase0@l /* 0x8039A3D8@l */ -/* 8025E094 38 64 00 26 */ addi r3, r4, 0x26 -/* 8025E098 80 9F 00 7C */ lwz r4, 0x7c(r31) -/* 8025E09C 48 07 61 D5 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8025E0A0 48 0A A9 CD */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 8025E0A4 90 7F 00 0C */ stw r3, 0xc(r31) -/* 8025E0A8 38 60 00 6C */ li r3, 0x6c -/* 8025E0AC 48 07 0B A1 */ bl __nw__FUl -/* 8025E0B0 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E0B4 41 82 00 28 */ beq lbl_8025E0DC -/* 8025E0B8 80 9F 00 08 */ lwz r4, 8(r31) -/* 8025E0BC 3C A0 69 6E */ lis r5, 0x696E /* 0x696E5F6E@ha */ -/* 8025E0C0 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x696E5F6E@l */ -/* 8025E0C4 3C A0 67 65 */ lis r5, 0x6765 /* 0x6765745F@ha */ -/* 8025E0C8 38 A5 74 5F */ addi r5, r5, 0x745F /* 0x6765745F@l */ -/* 8025E0CC 38 E0 00 02 */ li r7, 2 -/* 8025E0D0 39 00 00 00 */ li r8, 0 -/* 8025E0D4 4B FF 58 B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E0D8 7C 60 1B 78 */ mr r0, r3 -lbl_8025E0DC: -/* 8025E0DC 90 1F 00 20 */ stw r0, 0x20(r31) -/* 8025E0E0 38 60 00 6C */ li r3, 0x6c -/* 8025E0E4 48 07 0B 69 */ bl __nw__FUl -/* 8025E0E8 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E0EC 41 82 00 24 */ beq lbl_8025E110 -/* 8025E0F0 80 9F 00 08 */ lwz r4, 8(r31) -/* 8025E0F4 3C A0 5F 61 */ lis r5, 0x5F61 /* 0x5F616C6C@ha */ -/* 8025E0F8 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x5F616C6C@l */ -/* 8025E0FC 38 A0 00 6E */ li r5, 0x6e -/* 8025E100 38 E0 00 00 */ li r7, 0 -/* 8025E104 39 00 00 00 */ li r8, 0 -/* 8025E108 4B FF 58 7D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E10C 7C 60 1B 78 */ mr r0, r3 -lbl_8025E110: -/* 8025E110 90 1F 00 24 */ stw r0, 0x24(r31) -/* 8025E114 38 60 00 6C */ li r3, 0x6c -/* 8025E118 48 07 0B 35 */ bl __nw__FUl -/* 8025E11C 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025E120 41 82 00 24 */ beq lbl_8025E144 -/* 8025E124 80 9F 00 08 */ lwz r4, 8(r31) -/* 8025E128 3C A0 74 5F */ lis r5, 0x745F /* 0x745F696E@ha */ -/* 8025E12C 38 C5 69 6E */ addi r6, r5, 0x696E /* 0x745F696E@l */ -/* 8025E130 38 A0 67 65 */ li r5, 0x6765 -/* 8025E134 38 E0 00 00 */ li r7, 0 -/* 8025E138 39 00 00 00 */ li r8, 0 -/* 8025E13C 4B FF 58 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8025E140 7C 60 1B 78 */ mr r0, r3 -lbl_8025E144: -/* 8025E144 90 1F 00 28 */ stw r0, 0x28(r31) -/* 8025E148 4B DB 68 A9 */ bl mDoExt_getMesgFont__Fv -/* 8025E14C 7C 7E 1B 78 */ mr r30, r3 -/* 8025E150 80 7F 00 08 */ lwz r3, 8(r31) -/* 8025E154 3C 80 69 6E */ lis r4, 0x696E /* 0x696E5F73@ha */ -/* 8025E158 38 C4 5F 73 */ addi r6, r4, 0x5F73 /* 0x696E5F73@l */ -/* 8025E15C 3C 80 67 65 */ lis r4, 0x6765 /* 0x6765745F@ha */ -/* 8025E160 38 A4 74 5F */ addi r5, r4, 0x745F /* 0x6765745F@l */ -/* 8025E164 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E168 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E16C 7D 89 03 A6 */ mtctr r12 -/* 8025E170 4E 80 04 21 */ bctrl -/* 8025E174 7F C4 F3 78 */ mr r4, r30 -/* 8025E178 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E17C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 8025E180 7D 89 03 A6 */ mtctr r12 -/* 8025E184 4E 80 04 21 */ bctrl -/* 8025E188 4B DB 68 69 */ bl mDoExt_getMesgFont__Fv -/* 8025E18C 7C 7E 1B 78 */ mr r30, r3 -/* 8025E190 80 7F 00 08 */ lwz r3, 8(r31) -/* 8025E194 3C 80 74 5F */ lis r4, 0x745F /* 0x745F696E@ha */ -/* 8025E198 38 C4 69 6E */ addi r6, r4, 0x696E /* 0x745F696E@l */ -/* 8025E19C 38 A0 67 65 */ li r5, 0x6765 -/* 8025E1A0 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E1A4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8025E1A8 7D 89 03 A6 */ mtctr r12 -/* 8025E1AC 4E 80 04 21 */ bctrl -/* 8025E1B0 7F C4 F3 78 */ mr r4, r30 -/* 8025E1B4 81 83 00 00 */ lwz r12, 0(r3) -/* 8025E1B8 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 8025E1BC 7D 89 03 A6 */ mtctr r12 -/* 8025E1C0 4E 80 04 21 */ bctrl -/* 8025E1C4 38 80 00 00 */ li r4, 0 -/* 8025E1C8 C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 8025E1CC 7C 88 23 78 */ mr r8, r4 -/* 8025E1D0 7C 87 23 78 */ mr r7, r4 -/* 8025E1D4 7C 86 23 78 */ mr r6, r4 -/* 8025E1D8 38 A0 00 FF */ li r5, 0xff -/* 8025E1DC 38 00 00 33 */ li r0, 0x33 -/* 8025E1E0 7C 09 03 A6 */ mtctr r0 -lbl_8025E1E4: -/* 8025E1E4 7D 3F 22 14 */ add r9, r31, r4 -/* 8025E1E8 D0 09 00 80 */ stfs f0, 0x80(r9) -/* 8025E1EC D0 09 00 84 */ stfs f0, 0x84(r9) -/* 8025E1F0 B1 09 00 88 */ sth r8, 0x88(r9) -/* 8025E1F4 B0 E9 00 8A */ sth r7, 0x8a(r9) -/* 8025E1F8 98 C9 00 8C */ stb r6, 0x8c(r9) -/* 8025E1FC 98 A9 00 8D */ stb r5, 0x8d(r9) -/* 8025E200 38 84 00 10 */ addi r4, r4, 0x10 -/* 8025E204 42 00 FF E0 */ bdnz lbl_8025E1E4 -/* 8025E208 38 00 00 00 */ li r0, 0 -/* 8025E20C 98 1F 03 DC */ stb r0, 0x3dc(r31) -/* 8025E210 7F E3 FB 78 */ mr r3, r31 -/* 8025E214 C0 22 B5 40 */ lfs f1, lit_3919(r2) -/* 8025E218 48 00 28 BD */ bl playBckAnimation__21dDlst_TimerScrnDraw_cFf -/* 8025E21C C0 02 B5 40 */ lfs f0, lit_3919(r2) -/* 8025E220 D0 1F 03 C4 */ stfs f0, 0x3c4(r31) -/* 8025E224 D0 1F 03 C0 */ stfs f0, 0x3c0(r31) -/* 8025E228 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025E22C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8025E230 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025E234 7C 08 03 A6 */ mtlr r0 -/* 8025E238 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025E23C 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setShowType__21dDlst_TimerScrnDraw_cFUc.s b/asm/d/d_timer/setShowType__21dDlst_TimerScrnDraw_cFUc.s deleted file mode 100644 index 10061e766cb..00000000000 --- a/asm/d/d_timer/setShowType__21dDlst_TimerScrnDraw_cFUc.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8025FAC4: -/* 8025FAC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025FAC8 7C 08 02 A6 */ mflr r0 -/* 8025FACC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025FAD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025FAD4 93 C1 00 08 */ stw r30, 8(r1) -/* 8025FAD8 7C 7E 1B 78 */ mr r30, r3 -/* 8025FADC 7C 9F 23 78 */ mr r31, r4 -/* 8025FAE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025FAE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025FAE8 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8025FAEC 4B DC D0 D9 */ bl setTimerType__14dComIfG_play_cFUc -/* 8025FAF0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 8025FAF4 28 03 00 00 */ cmplwi r3, 0 -/* 8025FAF8 41 82 00 18 */ beq lbl_8025FB10 -/* 8025FAFC 57 E0 07 FF */ clrlwi. r0, r31, 0x1f -/* 8025FB00 41 82 00 0C */ beq lbl_8025FB0C -/* 8025FB04 4B FF 5A C5 */ bl show__13CPaneMgrAlphaFv -/* 8025FB08 48 00 00 08 */ b lbl_8025FB10 -lbl_8025FB0C: -/* 8025FB0C 4B FF 5A FD */ bl hide__13CPaneMgrAlphaFv -lbl_8025FB10: -/* 8025FB10 57 E0 07 BD */ rlwinm. r0, r31, 0, 0x1e, 0x1e -/* 8025FB14 41 82 00 28 */ beq lbl_8025FB3C -/* 8025FB18 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 8025FB1C 28 03 00 00 */ cmplwi r3, 0 -/* 8025FB20 41 82 00 08 */ beq lbl_8025FB28 -/* 8025FB24 4B FF 5A A5 */ bl show__13CPaneMgrAlphaFv -lbl_8025FB28: -/* 8025FB28 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 8025FB2C 28 03 00 00 */ cmplwi r3, 0 -/* 8025FB30 41 82 00 2C */ beq lbl_8025FB5C -/* 8025FB34 4B FF 5A 95 */ bl show__13CPaneMgrAlphaFv -/* 8025FB38 48 00 00 24 */ b lbl_8025FB5C -lbl_8025FB3C: -/* 8025FB3C 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 8025FB40 28 03 00 00 */ cmplwi r3, 0 -/* 8025FB44 41 82 00 08 */ beq lbl_8025FB4C -/* 8025FB48 4B FF 5A C1 */ bl hide__13CPaneMgrAlphaFv -lbl_8025FB4C: -/* 8025FB4C 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 8025FB50 28 03 00 00 */ cmplwi r3, 0 -/* 8025FB54 41 82 00 08 */ beq lbl_8025FB5C -/* 8025FB58 4B FF 5A B1 */ bl hide__13CPaneMgrAlphaFv -lbl_8025FB5C: -/* 8025FB5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025FB60 83 C1 00 08 */ lwz r30, 8(r1) -/* 8025FB64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025FB68 7C 08 03 A6 */ mtlr r0 -/* 8025FB6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025FB70 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setTimerPos__21dDlst_TimerScrnDraw_cFff.s b/asm/d/d_timer/setTimerPos__21dDlst_TimerScrnDraw_cFff.s deleted file mode 100644 index 0daf24b0019..00000000000 --- a/asm/d/d_timer/setTimerPos__21dDlst_TimerScrnDraw_cFff.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8025FA2C: -/* 8025FA2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025FA30 7C 08 02 A6 */ mflr r0 -/* 8025FA34 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025FA38 7C 64 1B 78 */ mr r4, r3 -/* 8025FA3C 80 63 00 18 */ lwz r3, 0x18(r3) -/* 8025FA40 28 03 00 00 */ cmplwi r3, 0 -/* 8025FA44 41 82 00 18 */ beq lbl_8025FA5C -/* 8025FA48 C0 04 03 C0 */ lfs f0, 0x3c0(r4) -/* 8025FA4C EC 21 00 2A */ fadds f1, f1, f0 -/* 8025FA50 C0 04 03 C4 */ lfs f0, 0x3c4(r4) -/* 8025FA54 EC 42 00 2A */ fadds f2, f2, f0 -/* 8025FA58 4B FF 4B 59 */ bl paneTrans__8CPaneMgrFff -lbl_8025FA5C: -/* 8025FA5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025FA60 7C 08 03 A6 */ mtlr r0 -/* 8025FA64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025FA68 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/setTimer__21dDlst_TimerScrnDraw_cFi.s b/asm/d/d_timer/setTimer__21dDlst_TimerScrnDraw_cFi.s deleted file mode 100644 index 98edf7aeae5..00000000000 --- a/asm/d/d_timer/setTimer__21dDlst_TimerScrnDraw_cFi.s +++ /dev/null @@ -1,177 +0,0 @@ -lbl_8025EEF0: -/* 8025EEF0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8025EEF4 7C 08 02 A6 */ mflr r0 -/* 8025EEF8 90 01 00 44 */ stw r0, 0x44(r1) -/* 8025EEFC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025EF00 48 10 32 C1 */ bl _savegpr_22 -/* 8025EF04 7C 79 1B 78 */ mr r25, r3 -/* 8025EF08 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8025EF0C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8025EF10 90 83 00 84 */ stw r4, 0x84(r3) -/* 8025EF14 38 00 03 E8 */ li r0, 0x3e8 -/* 8025EF18 7C A4 03 D6 */ divw r5, r4, r0 -/* 8025EF1C 1C 05 03 E8 */ mulli r0, r5, 0x3e8 -/* 8025EF20 7C C0 20 50 */ subf r6, r0, r4 -/* 8025EF24 38 00 00 3C */ li r0, 0x3c -/* 8025EF28 7C 85 03 D6 */ divw r4, r5, r0 -/* 8025EF2C 1C 04 00 3C */ mulli r0, r4, 0x3c -/* 8025EF30 7C A0 28 50 */ subf r5, r0, r5 -/* 8025EF34 2C 04 00 63 */ cmpwi r4, 0x63 -/* 8025EF38 40 81 00 10 */ ble lbl_8025EF48 -/* 8025EF3C 38 80 00 63 */ li r4, 0x63 -/* 8025EF40 38 A0 00 3B */ li r5, 0x3b -/* 8025EF44 38 C0 03 E7 */ li r6, 0x3e7 -lbl_8025EF48: -/* 8025EF48 3B 40 00 00 */ li r26, 0 -/* 8025EF4C 3B 00 00 00 */ li r24, 0 -/* 8025EF50 38 60 00 0A */ li r3, 0xa -/* 8025EF54 7F E4 1B D6 */ divw r31, r4, r3 -/* 8025EF58 7C 1F 19 D6 */ mullw r0, r31, r3 -/* 8025EF5C 7F C0 20 50 */ subf r30, r0, r4 -/* 8025EF60 7F A5 1B D6 */ divw r29, r5, r3 -/* 8025EF64 7C 1D 19 D6 */ mullw r0, r29, r3 -/* 8025EF68 7F 80 28 50 */ subf r28, r0, r5 -/* 8025EF6C 38 00 00 64 */ li r0, 0x64 -/* 8025EF70 7F 66 03 D6 */ divw r27, r6, r0 -/* 8025EF74 7C 1B 01 D6 */ mullw r0, r27, r0 -/* 8025EF78 7C 00 30 50 */ subf r0, r0, r6 -/* 8025EF7C 7E E0 1B D6 */ divw r23, r0, r3 -lbl_8025EF80: -/* 8025EF80 7E D9 C2 14 */ add r22, r25, r24 -/* 8025EF84 80 96 00 2C */ lwz r4, 0x2c(r22) -/* 8025EF88 28 04 00 00 */ cmplwi r4, 0 -/* 8025EF8C 41 82 00 10 */ beq lbl_8025EF9C -/* 8025EF90 7F 23 CB 78 */ mr r3, r25 -/* 8025EF94 7F E5 FB 78 */ mr r5, r31 -/* 8025EF98 4B FF FE 8D */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei -lbl_8025EF9C: -/* 8025EF9C 80 96 00 34 */ lwz r4, 0x34(r22) -/* 8025EFA0 28 04 00 00 */ cmplwi r4, 0 -/* 8025EFA4 41 82 00 10 */ beq lbl_8025EFB4 -/* 8025EFA8 7F 23 CB 78 */ mr r3, r25 -/* 8025EFAC 7F C5 F3 78 */ mr r5, r30 -/* 8025EFB0 4B FF FE 75 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei -lbl_8025EFB4: -/* 8025EFB4 80 96 00 3C */ lwz r4, 0x3c(r22) -/* 8025EFB8 28 04 00 00 */ cmplwi r4, 0 -/* 8025EFBC 41 82 00 10 */ beq lbl_8025EFCC -/* 8025EFC0 7F 23 CB 78 */ mr r3, r25 -/* 8025EFC4 7F A5 EB 78 */ mr r5, r29 -/* 8025EFC8 4B FF FE 5D */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei -lbl_8025EFCC: -/* 8025EFCC 80 96 00 44 */ lwz r4, 0x44(r22) -/* 8025EFD0 28 04 00 00 */ cmplwi r4, 0 -/* 8025EFD4 41 82 00 10 */ beq lbl_8025EFE4 -/* 8025EFD8 7F 23 CB 78 */ mr r3, r25 -/* 8025EFDC 7F 85 E3 78 */ mr r5, r28 -/* 8025EFE0 4B FF FE 45 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei -lbl_8025EFE4: -/* 8025EFE4 80 96 00 4C */ lwz r4, 0x4c(r22) -/* 8025EFE8 28 04 00 00 */ cmplwi r4, 0 -/* 8025EFEC 41 82 00 10 */ beq lbl_8025EFFC -/* 8025EFF0 7F 23 CB 78 */ mr r3, r25 -/* 8025EFF4 7F 65 DB 78 */ mr r5, r27 -/* 8025EFF8 4B FF FE 2D */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei -lbl_8025EFFC: -/* 8025EFFC 80 96 00 54 */ lwz r4, 0x54(r22) -/* 8025F000 28 04 00 00 */ cmplwi r4, 0 -/* 8025F004 41 82 00 10 */ beq lbl_8025F014 -/* 8025F008 7F 23 CB 78 */ mr r3, r25 -/* 8025F00C 7E E5 BB 78 */ mr r5, r23 -/* 8025F010 4B FF FE 15 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei -lbl_8025F014: -/* 8025F014 3B 5A 00 01 */ addi r26, r26, 1 -/* 8025F018 2C 1A 00 02 */ cmpwi r26, 2 -/* 8025F01C 3B 18 00 04 */ addi r24, r24, 4 -/* 8025F020 41 80 FF 60 */ blt lbl_8025EF80 -/* 8025F024 80 79 00 18 */ lwz r3, 0x18(r25) -/* 8025F028 28 03 00 00 */ cmplwi r3, 0 -/* 8025F02C 41 82 01 3C */ beq lbl_8025F168 -/* 8025F030 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025F034 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025F038 88 04 4F AC */ lbz r0, 0x4fac(r4) -/* 8025F03C 28 00 00 01 */ cmplwi r0, 1 -/* 8025F040 40 82 00 10 */ bne lbl_8025F050 -/* 8025F044 88 19 03 DF */ lbz r0, 0x3df(r25) -/* 8025F048 28 00 00 00 */ cmplwi r0, 0 -/* 8025F04C 40 82 00 10 */ bne lbl_8025F05C -lbl_8025F050: -/* 8025F050 88 19 03 E1 */ lbz r0, 0x3e1(r25) -/* 8025F054 28 00 00 00 */ cmplwi r0, 0 -/* 8025F058 40 82 00 8C */ bne lbl_8025F0E4 -lbl_8025F05C: -/* 8025F05C A8 83 00 16 */ lha r4, 0x16(r3) -/* 8025F060 2C 04 00 05 */ cmpwi r4, 5 -/* 8025F064 40 80 01 04 */ bge lbl_8025F168 -/* 8025F068 3A C4 00 01 */ addi r22, r4, 1 -/* 8025F06C 7E C0 07 34 */ extsh r0, r22 -/* 8025F070 20 00 00 05 */ subfic r0, r0, 5 -/* 8025F074 7C 00 07 34 */ extsh r0, r0 -/* 8025F078 C8 42 B5 58 */ lfd f2, lit_4627(r2) -/* 8025F07C 6C 04 80 00 */ xoris r4, r0, 0x8000 -/* 8025F080 90 81 00 0C */ stw r4, 0xc(r1) -/* 8025F084 3C 00 43 30 */ lis r0, 0x4330 -/* 8025F088 90 01 00 08 */ stw r0, 8(r1) -/* 8025F08C C8 01 00 08 */ lfd f0, 8(r1) -/* 8025F090 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8025F094 90 81 00 14 */ stw r4, 0x14(r1) -/* 8025F098 90 01 00 10 */ stw r0, 0x10(r1) -/* 8025F09C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8025F0A0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8025F0A4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025F0A8 C0 02 B5 48 */ lfs f0, lit_4050(r2) -/* 8025F0AC EC 41 00 24 */ fdivs f2, f1, f0 -/* 8025F0B0 C0 39 03 B0 */ lfs f1, 0x3b0(r25) -/* 8025F0B4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025F0B8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025F0BC 88 19 03 DD */ lbz r0, 0x3dd(r25) -/* 8025F0C0 54 00 10 3A */ slwi r0, r0, 2 -/* 8025F0C4 7C 84 02 14 */ add r4, r4, r0 -/* 8025F0C8 C0 04 0A F8 */ lfs f0, 0xaf8(r4) -/* 8025F0CC EC 02 00 32 */ fmuls f0, f2, f0 -/* 8025F0D0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025F0D4 4B FF 66 FD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025F0D8 80 79 00 18 */ lwz r3, 0x18(r25) -/* 8025F0DC B2 C3 00 16 */ sth r22, 0x16(r3) -/* 8025F0E0 48 00 00 88 */ b lbl_8025F168 -lbl_8025F0E4: -/* 8025F0E4 A8 83 00 16 */ lha r4, 0x16(r3) -/* 8025F0E8 7C 80 07 35 */ extsh. r0, r4 -/* 8025F0EC 40 81 00 7C */ ble lbl_8025F168 -/* 8025F0F0 3A C4 FF FF */ addi r22, r4, -1 -/* 8025F0F4 7E C0 07 34 */ extsh r0, r22 -/* 8025F0F8 20 00 00 05 */ subfic r0, r0, 5 -/* 8025F0FC 7C 00 07 34 */ extsh r0, r0 -/* 8025F100 C8 42 B5 58 */ lfd f2, lit_4627(r2) -/* 8025F104 6C 04 80 00 */ xoris r4, r0, 0x8000 -/* 8025F108 90 81 00 14 */ stw r4, 0x14(r1) -/* 8025F10C 3C 00 43 30 */ lis r0, 0x4330 -/* 8025F110 90 01 00 10 */ stw r0, 0x10(r1) -/* 8025F114 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8025F118 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8025F11C 90 81 00 0C */ stw r4, 0xc(r1) -/* 8025F120 90 01 00 08 */ stw r0, 8(r1) -/* 8025F124 C8 01 00 08 */ lfd f0, 8(r1) -/* 8025F128 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8025F12C EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025F130 C0 02 B5 48 */ lfs f0, lit_4050(r2) -/* 8025F134 EC 41 00 24 */ fdivs f2, f1, f0 -/* 8025F138 C0 39 03 B0 */ lfs f1, 0x3b0(r25) -/* 8025F13C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025F140 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025F144 88 19 03 DD */ lbz r0, 0x3dd(r25) -/* 8025F148 54 00 10 3A */ slwi r0, r0, 2 -/* 8025F14C 7C 84 02 14 */ add r4, r4, r0 -/* 8025F150 C0 04 0A F8 */ lfs f0, 0xaf8(r4) -/* 8025F154 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8025F158 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025F15C 4B FF 66 75 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8025F160 80 79 00 18 */ lwz r3, 0x18(r25) -/* 8025F164 B2 C3 00 16 */ sth r22, 0x16(r3) -lbl_8025F168: -/* 8025F168 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025F16C 48 10 30 A1 */ bl _restgpr_22 -/* 8025F170 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8025F174 7C 08 03 A6 */ mtlr r0 -/* 8025F178 38 21 00 40 */ addi r1, r1, 0x40 -/* 8025F17C 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/start__8dTimer_cFi.s b/asm/d/d_timer/start__8dTimer_cFi.s deleted file mode 100644 index 43b66ec30f8..00000000000 --- a/asm/d/d_timer/start__8dTimer_cFi.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_8025D538: -/* 8025D538 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025D53C 7C 08 02 A6 */ mflr r0 -/* 8025D540 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025D544 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025D548 93 C1 00 08 */ stw r30, 8(r1) -/* 8025D54C 7C 7E 1B 78 */ mr r30, r3 -/* 8025D550 7C 9F 23 78 */ mr r31, r4 -/* 8025D554 88 03 01 6C */ lbz r0, 0x16c(r3) -/* 8025D558 28 00 00 00 */ cmplwi r0, 0 -/* 8025D55C 41 82 00 0C */ beq lbl_8025D568 -/* 8025D560 28 00 00 01 */ cmplwi r0, 1 -/* 8025D564 40 82 00 98 */ bne lbl_8025D5FC -lbl_8025D568: -/* 8025D568 38 00 00 04 */ li r0, 4 -/* 8025D56C 98 1E 01 6C */ stb r0, 0x16c(r30) -/* 8025D570 4B DD 52 95 */ bl getTime__11dLib_time_cFv -/* 8025D574 90 9E 01 14 */ stw r4, 0x114(r30) -/* 8025D578 90 7E 01 10 */ stw r3, 0x110(r30) -/* 8025D57C 90 9E 01 1C */ stw r4, 0x11c(r30) -/* 8025D580 90 7E 01 18 */ stw r3, 0x118(r30) -/* 8025D584 38 1F FF FD */ addi r0, r31, -3 -/* 8025D588 28 00 00 01 */ cmplwi r0, 1 -/* 8025D58C 40 81 00 14 */ ble lbl_8025D5A0 -/* 8025D590 2C 1F 00 06 */ cmpwi r31, 6 -/* 8025D594 41 82 00 0C */ beq lbl_8025D5A0 -/* 8025D598 2C 1F 00 05 */ cmpwi r31, 5 -/* 8025D59C 40 82 00 58 */ bne lbl_8025D5F4 -lbl_8025D5A0: -/* 8025D5A0 7F C3 F3 78 */ mr r3, r30 -/* 8025D5A4 38 80 00 03 */ li r4, 3 -/* 8025D5A8 48 00 02 41 */ bl stop__8dTimer_cFUc -/* 8025D5AC 2C 1F 00 03 */ cmpwi r31, 3 -/* 8025D5B0 41 82 00 2C */ beq lbl_8025D5DC -/* 8025D5B4 80 7E 00 FC */ lwz r3, 0xfc(r30) -/* 8025D5B8 38 80 05 15 */ li r4, 0x515 -/* 8025D5BC 48 00 2F B9 */ bl createStart__21dDlst_TimerScrnDraw_cFUs -/* 8025D5C0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025D5C4 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025D5C8 A8 64 0B E8 */ lha r3, 0xbe8(r4) -/* 8025D5CC A8 04 0B EA */ lha r0, 0xbea(r4) -/* 8025D5D0 7C 03 02 14 */ add r0, r3, r0 -/* 8025D5D4 B0 1E 01 68 */ sth r0, 0x168(r30) -/* 8025D5D8 48 00 00 14 */ b lbl_8025D5EC -lbl_8025D5DC: -/* 8025D5DC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025D5E0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025D5E4 A8 03 0B EA */ lha r0, 0xbea(r3) -/* 8025D5E8 B0 1E 01 68 */ sth r0, 0x168(r30) -lbl_8025D5EC: -/* 8025D5EC 38 00 00 01 */ li r0, 1 -/* 8025D5F0 98 1E 01 6E */ stb r0, 0x16e(r30) -lbl_8025D5F4: -/* 8025D5F4 38 60 00 01 */ li r3, 1 -/* 8025D5F8 48 00 00 08 */ b lbl_8025D600 -lbl_8025D5FC: -/* 8025D5FC 38 60 00 00 */ li r3, 0 -lbl_8025D600: -/* 8025D600 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025D604 83 C1 00 08 */ lwz r30, 8(r1) -/* 8025D608 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025D60C 7C 08 03 A6 */ mtlr r0 -/* 8025D610 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025D614 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/start__8dTimer_cFis.s b/asm/d/d_timer/start__8dTimer_cFis.s deleted file mode 100644 index 37d9fdc15e7..00000000000 --- a/asm/d/d_timer/start__8dTimer_cFis.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_8025D618: -/* 8025D618 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025D61C 7C 08 02 A6 */ mflr r0 -/* 8025D620 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025D624 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025D628 7C 7F 1B 78 */ mr r31, r3 -/* 8025D62C 7C A0 07 34 */ extsh r0, r5 -/* 8025D630 2C 00 FF FF */ cmpwi r0, -1 -/* 8025D634 40 82 00 74 */ bne lbl_8025D6A8 -/* 8025D638 88 1F 01 6C */ lbz r0, 0x16c(r31) -/* 8025D63C 28 00 00 00 */ cmplwi r0, 0 -/* 8025D640 40 82 00 60 */ bne lbl_8025D6A0 -/* 8025D644 2C 04 00 02 */ cmpwi r4, 2 -/* 8025D648 41 82 00 0C */ beq lbl_8025D654 -/* 8025D64C 2C 04 00 07 */ cmpwi r4, 7 -/* 8025D650 40 82 00 10 */ bne lbl_8025D660 -lbl_8025D654: -/* 8025D654 7C 83 23 78 */ mr r3, r4 -/* 8025D658 38 80 03 E3 */ li r4, 0x3e3 -/* 8025D65C 48 00 3B 2D */ bl dTimer_createStart2D__FlUs -lbl_8025D660: -/* 8025D660 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8025D664 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8025D668 A8 03 0B E6 */ lha r0, 0xbe6(r3) -/* 8025D66C B0 1F 01 68 */ sth r0, 0x168(r31) -/* 8025D670 38 00 00 04 */ li r0, 4 -/* 8025D674 98 1F 01 6C */ stb r0, 0x16c(r31) -/* 8025D678 4B DD 51 8D */ bl getTime__11dLib_time_cFv -/* 8025D67C 90 9F 01 14 */ stw r4, 0x114(r31) -/* 8025D680 90 7F 01 10 */ stw r3, 0x110(r31) -/* 8025D684 90 9F 01 1C */ stw r4, 0x11c(r31) -/* 8025D688 90 7F 01 18 */ stw r3, 0x118(r31) -/* 8025D68C 7F E3 FB 78 */ mr r3, r31 -/* 8025D690 38 80 00 04 */ li r4, 4 -/* 8025D694 48 00 01 55 */ bl stop__8dTimer_cFUc -/* 8025D698 38 00 00 02 */ li r0, 2 -/* 8025D69C 98 1F 01 6C */ stb r0, 0x16c(r31) -lbl_8025D6A0: -/* 8025D6A0 38 60 00 01 */ li r3, 1 -/* 8025D6A4 48 00 00 50 */ b lbl_8025D6F4 -lbl_8025D6A8: -/* 8025D6A8 88 1F 01 6C */ lbz r0, 0x16c(r31) -/* 8025D6AC 28 00 00 00 */ cmplwi r0, 0 -/* 8025D6B0 40 82 00 40 */ bne lbl_8025D6F0 -/* 8025D6B4 B0 BF 01 68 */ sth r5, 0x168(r31) -/* 8025D6B8 38 00 00 01 */ li r0, 1 -/* 8025D6BC 98 1F 01 6C */ stb r0, 0x16c(r31) -/* 8025D6C0 38 04 FF FD */ addi r0, r4, -3 -/* 8025D6C4 28 00 00 01 */ cmplwi r0, 1 -/* 8025D6C8 40 81 00 14 */ ble lbl_8025D6DC -/* 8025D6CC 2C 04 00 06 */ cmpwi r4, 6 -/* 8025D6D0 41 82 00 0C */ beq lbl_8025D6DC -/* 8025D6D4 2C 04 00 05 */ cmpwi r4, 5 -/* 8025D6D8 40 82 00 10 */ bne lbl_8025D6E8 -lbl_8025D6DC: -/* 8025D6DC 7F E3 FB 78 */ mr r3, r31 -/* 8025D6E0 38 80 00 03 */ li r4, 3 -/* 8025D6E4 48 00 01 05 */ bl stop__8dTimer_cFUc -lbl_8025D6E8: -/* 8025D6E8 38 60 00 01 */ li r3, 1 -/* 8025D6EC 48 00 00 08 */ b lbl_8025D6F4 -lbl_8025D6F0: -/* 8025D6F0 38 60 00 00 */ li r3, 0 -lbl_8025D6F4: -/* 8025D6F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025D6F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025D6FC 7C 08 03 A6 */ mtlr r0 -/* 8025D700 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025D704 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/stock_start__8dTimer_cFv.s b/asm/d/d_timer/stock_start__8dTimer_cFv.s deleted file mode 100644 index ad17e9e05f4..00000000000 --- a/asm/d/d_timer/stock_start__8dTimer_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8025D708: -/* 8025D708 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025D70C 7C 08 02 A6 */ mflr r0 -/* 8025D710 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025D714 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025D718 7C 7F 1B 78 */ mr r31, r3 -/* 8025D71C 88 03 01 6C */ lbz r0, 0x16c(r3) -/* 8025D720 28 00 00 05 */ cmplwi r0, 5 -/* 8025D724 40 82 00 84 */ bne lbl_8025D7A8 -/* 8025D728 38 00 00 04 */ li r0, 4 -/* 8025D72C 98 1F 01 6C */ stb r0, 0x16c(r31) -/* 8025D730 4B DD 50 D5 */ bl getTime__11dLib_time_cFv -/* 8025D734 90 9F 01 14 */ stw r4, 0x114(r31) -/* 8025D738 90 7F 01 10 */ stw r3, 0x110(r31) -/* 8025D73C 90 9F 01 1C */ stw r4, 0x11c(r31) -/* 8025D740 90 7F 01 18 */ stw r3, 0x118(r31) -/* 8025D744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025D748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025D74C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8025D750 4B DC F4 4D */ bl getTimerNowTimeMs__14dComIfG_play_cFv -/* 8025D754 80 FF 01 10 */ lwz r7, 0x110(r31) -/* 8025D758 81 1F 01 14 */ lwz r8, 0x114(r31) -/* 8025D75C 3C 80 80 00 */ lis r4, 0x8000 /* 0x800000F8@ha */ -/* 8025D760 80 04 00 F8 */ lwz r0, 0x00F8(r4) /* 0x800000F8@l */ -/* 8025D764 54 04 F0 BE */ srwi r4, r0, 2 -/* 8025D768 38 00 03 E8 */ li r0, 0x3e8 -/* 8025D76C 7C C4 03 96 */ divwu r6, r4, r0 -/* 8025D770 38 A0 00 00 */ li r5, 0 -/* 8025D774 7C 60 FE 70 */ srawi r0, r3, 0x1f -/* 8025D778 7C 86 18 16 */ mulhwu r4, r6, r3 -/* 8025D77C 7C A5 19 D6 */ mullw r5, r5, r3 -/* 8025D780 7C 66 19 D6 */ mullw r3, r6, r3 -/* 8025D784 7C 06 01 D6 */ mullw r0, r6, r0 -/* 8025D788 7C 84 2A 14 */ add r4, r4, r5 -/* 8025D78C 7C 84 02 14 */ add r4, r4, r0 -/* 8025D790 7C 63 40 10 */ subfc r3, r3, r8 -/* 8025D794 7C 04 39 10 */ subfe r0, r4, r7 -/* 8025D798 90 7F 01 14 */ stw r3, 0x114(r31) -/* 8025D79C 90 1F 01 10 */ stw r0, 0x110(r31) -/* 8025D7A0 38 60 00 01 */ li r3, 1 -/* 8025D7A4 48 00 00 08 */ b lbl_8025D7AC -lbl_8025D7A8: -/* 8025D7A8 38 60 00 00 */ li r3, 0 -lbl_8025D7AC: -/* 8025D7AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025D7B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025D7B4 7C 08 03 A6 */ mtlr r0 -/* 8025D7B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025D7BC 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 3f9eddb370e..86f902daa0f 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -838,10 +838,26 @@ inline dTimer_c* dComIfG_getTimerPtr() { return g_dComIfG_gameInfo.play.getTimerPtr(); } +inline void dComIfG_setTimerPtr(dTimer_c* i_ptr) { + g_dComIfG_gameInfo.play.setTimerPtr(i_ptr); +} + +inline void dComIfG_setTimerType(u8 i_type) { + g_dComIfG_gameInfo.play.setTimerType(i_type); +} + inline u8 dComIfG_getTimerType() { return g_dComIfG_gameInfo.play.getTimerType(); } +inline int dComIfG_getTimerLimitTimeMs() { + return g_dComIfG_gameInfo.play.getTimerLimitTimeMs(); +} + +inline void dComIfG_setTimerLimitTimeMs(int i_time) { + g_dComIfG_gameInfo.play.setTimerLimitTimeMs(i_time); +} + inline int dComIfG_setObjectRes(const char* name, u8 param_1, JKRHeap* heap) { return g_dComIfG_gameInfo.mResControl.setObjectRes(name, param_1, heap); } @@ -3216,6 +3232,10 @@ inline void dComIfGp_event_setCullRate(f32 f) { g_dComIfG_gameInfo.play.getEvent().setCullRate(f); } +inline u8 dComIfGp_event_getMode() { + return g_dComIfG_gameInfo.play.getEvent().getMode(); +} + inline int i_dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2) { return dComIfGp_getPEvtManager()->getMyStaffId(pName, pActor, param_2); } diff --git a/include/d/d_bright_check.h b/include/d/d_bright_check.h index 48072530d69..c9cf9722908 100644 --- a/include/d/d_bright_check.h +++ b/include/d/d_bright_check.h @@ -3,21 +3,44 @@ #include "d/com/d_com_inf_game.h" -// class dBrightCheck_c { -// public: -// /* 80192F10 */ dBrightCheck_c(JKRArchive*); -// /* 80192F98 */ ~dBrightCheck_c(); -// /* 80193030 */ void screenSet(); -// /* 801934D0 */ void _move(); -// /* 80193508 */ void modeWait(); -// /* 8019350C */ void modeMove(); -// /* 80193594 */ void _draw(); +class dMsgString_c; -// bool isEnd() { return mEnd; } +class dDlst_BrightCheck_c : public dDlst_base_c { +public: + /* 801935D0 */ virtual void draw(); + /* 80193648 */ virtual ~dDlst_BrightCheck_c() {} -// void* vtable; -// /* 0x04 */ u8 field_0x4[0x15]; -// /* 0x19 */ bool mEnd; -// }; + /* 0x04 */ J2DScreen* Scr; + /* 0x08 */ u8 field_0x8[0xC - 0x8]; + /* 0x0C */ dMsgString_c* mMsgString; +}; + +class dBrightCheck_c { +public: + enum Mode_e { + MODE_WAIT_e, + MODE_MOVE_e, + }; + + /* 80192F10 */ dBrightCheck_c(JKRArchive*); + /* 80192F98 */ virtual ~dBrightCheck_c(); + + // TODO: probably fake, probably going to break some other function + // need to figure out this weird vtable padding issue + virtual void dummy() = 0; + virtual void dummy2() = 0; + virtual void dummy3() = 0; + + /* 80193030 */ void screenSet(); + /* 801934D0 */ void _move(); + /* 80193508 */ void modeWait(); + /* 8019350C */ void modeMove(); + /* 80193594 */ void _draw(); + + /* 0x04 */ JKRArchive* mArchive; + /* 0x08 */ dDlst_BrightCheck_c mBrightCheck; + /* 0x18 */ u8 mMode; + /* 0x19 */ u8 mCompleteCheck; +}; #endif /* D_D_BRIGHT_CHECK_H */ diff --git a/include/d/d_timer.h b/include/d/d_timer.h index bd5c0b7ee60..fce6bed8c40 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -3,7 +3,6 @@ #include "d/msg/d_msg_object.h" #include "dolphin/os/OSTime.h" -#include "dolphin/types.h" #include "f_op/f_op_msg.h" class CPaneMgr; @@ -17,11 +16,11 @@ int dTimer_getRestTimeMs(); class dDlst_TimerScrnDraw_c : public dDlst_base_c { public: - struct dDlst_TimerScrnDraw_UnkData { - /* 0x0 */ f32 field_0x0; - /* 0x4 */ f32 field_0x4; - /* 0x8 */ u16 field_0x8; - /* 0xA */ u16 field_0xa; + struct getin_info { + /* 0x0 */ f32 bck_frame; + /* 0x4 */ f32 pikari_frame; + /* 0x8 */ s16 pos_x; + /* 0xA */ s16 pos_y; /* 0xC */ u8 field_0xc; /* 0xD */ u8 field_0xd; }; // Size: 0x10 @@ -44,10 +43,10 @@ public: /* 8025FA98 */ void setImagePos(f32, f32); /* 8025FAC4 */ void setShowType(u8); /* 8025FB74 */ void anime(); - /* 8025FF98 */ void closeAnime(); - /* 802601E4 */ void createGetIn(cXyz); + /* 8025FF98 */ BOOL closeAnime(); + /* 802601E4 */ int createGetIn(cXyz); /* 80260574 */ s32 createStart(u16); - /* 80260AA8 */ void checkStartAnimeEnd(); + /* 80260AA8 */ bool checkStartAnimeEnd(); /* 80260AD4 */ void playBckAnimation(f32); /* 80260B54 */ void drawPikari(int); @@ -56,11 +55,25 @@ public: void show() { mTimerVisible = 1; } void hide() { mTimerVisible = 0; } + void setHIOType(u8 i_type) { mHIOType = i_type; } + u8 getHIOType() { return field_0x3e2; } + f32 getTimerTransY() { return mTimerTransY; } + void resetCowID() { mCowID = 0; } + bool isVisible() { return mTimerVisible; } + + f32 acc(s16 param_0, s16 param_1, s16 param_2) { + return ((f32)(param_1 - param_2) * (f32)(param_1 - param_2)) / ((f32)(param_0 - param_2) * (f32)(param_0 - param_2)); + } + + void setTimerTrans(f32 x, f32 y) { + mTimerTransX = x; + mTimerTransY = y; + } private: /* 0x004 */ J2DScreen* mpScreen; /* 0x008 */ J2DScreen* mpGetInScreen; - /* 0x00C */ void* mpGetInBck; + /* 0x00C */ J2DAnmTransform* mpGetInBck; /* 0x010 */ CPaneMgr* mpParent; /* 0x014 */ CPaneMgr* mpCowParent; /* 0x018 */ CPaneMgr* mpTimeParent; @@ -70,16 +83,14 @@ private: /* 0x028 */ CPaneMgr* mpGetInText; /* 0x02C */ J2DPane* mTimerText[6][2]; /* 0x05C */ J2DPane* field_0x5c[2][2]; - /* 0x06C */ J2DPane* field_0x6c; - /* 0x070 */ J2DPane* field_0x70; - /* 0x074 */ J2DPane* field_0x74; - /* 0x078 */ J2DPane* field_0x78; + /* 0x06C */ J2DPicture* field_0x6c[2]; + /* 0x074 */ J2DPicture* field_0x74[2]; /* 0x07C */ JKRArchive* mpArchive; - /* 0x080 */ dDlst_TimerScrnDraw_UnkData field_0x80[51]; - /* 0x3B0 */ f32 field_0x3B0; - /* 0x3B4 */ f32 field_0x3B4; - /* 0x3B8 */ f32 field_0x3B8; - /* 0x3BC */ f32 field_0x3BC; + /* 0x080 */ getin_info m_getin_info[51]; + /* 0x3B0 */ f32 mParentAlpha; + /* 0x3B4 */ f32 mTimerAlpha; + /* 0x3B8 */ f32 mCounterAlpha; + /* 0x3BC */ f32 mImageAlpha; /* 0x3C0 */ f32 mTimerTransX; /* 0x3C4 */ f32 mTimerTransY; /* 0x3C8 */ s32 field_0x3C8; @@ -88,23 +99,23 @@ private: /* 0x3D4 */ int field_0x3D4; /* 0x3D8 */ int field_0x3D8; /* 0x3DC */ u8 mCowID; - /* 0x3DD */ u8 field_0x3DD; + /* 0x3DD */ u8 mHIOType; /* 0x3DE */ u8 field_0x3DE; /* 0x3DF */ u8 field_0x3DF; /* 0x3E0 */ u8 field_0x3E0; /* 0x3E1 */ u8 mTimerVisible; - /* 0x3E2 */ u8 mHIOType; + /* 0x3E2 */ u8 field_0x3e2; }; class dTimer_c : public msg_class { public: - /* 8025CA0C */ void _create(); - /* 8025CF04 */ void _execute(); + /* 8025CA0C */ int _create(); + /* 8025CF04 */ int _execute(); /* 8025D33C */ int _draw(); - /* 8025D3BC */ void _delete(); + /* 8025D3BC */ int _delete(); /* 8025D524 */ int deleteCheck(); - /* 8025D618 */ void start(int, s16); - /* 8025D538 */ void start(int); + /* 8025D618 */ int start(int, s16); + /* 8025D538 */ int start(int); /* 8025D7C0 */ int stock_start(s16); /* 8025D708 */ bool stock_start(); /* 8025D7E8 */ int stop(u8); @@ -118,37 +129,40 @@ public: /* 802613DC */ int createGetIn(cXyz); s32 createStart(u16 param_0) { return mp_tm_scrn->createStart(param_0); } - void show() { mp_tm_scrn->show(); } - void hide() { mp_tm_scrn->hide(); } + void setShowType(u8 i_type) { mp_tm_scrn->setShowType(i_type); } + void setCounterPos(f32 param_0, f32 param_1) { mp_tm_scrn->setCounterPos(param_0, param_1); } + void setImagePos(f32 param_0, f32 param_1) { mp_tm_scrn->setImagePos(param_0, param_1); } + void setTimerPos(f32 param_0, f32 param_1) { mp_tm_scrn->setTimerPos(param_0, param_1); } - u8 isReadyFlag() { return mIsReady; } + u8 isReadyFlag() { return m_is_ready; } private: /* 0x0FC */ dDlst_TimerScrnDraw_c* mp_tm_scrn; - /* 0x100 */ JKRExpHeap* mpHeap; + /* 0x100 */ JKRExpHeap* mp_heap; /* 0x104 */ u8 field_0x104[4]; - /* 0x108 */ request_of_phase_process_class mPhase; - /* 0x110 */ OSTime mTime1; - /* 0x118 */ OSTime mTime2; - /* 0x120 */ OSTime mTime6; - /* 0x128 */ u8 field_0x128; - /* 0x130 */ OSTime mTime3; - /* 0x138 */ OSTime mTime5; + /* 0x108 */ request_of_phase_process_class m_phase; + /* 0x110 */ OSTime m_start_time; + /* 0x118 */ OSTime m_time; + /* 0x120 */ OSTime field_0x120; + /* 0x128 */ OSTime field_0x128; + /* 0x130 */ OSTime field_0x130; + /* 0x138 */ OSTime field_0x138; /* 0x140 */ OSTime mLimitTime; - /* 0x148 */ u8 field_0x148[12]; - /* 0x154 */ int mTimerMode; + /* 0x148 */ u8 field_0x148[0x150 - 0x148]; + /* 0x150 */ int field_0x150; + /* 0x154 */ int m_timer_mode; /* 0x158 */ int field_0x158; - /* 0x15C */ u8 field_0x15c[8]; - /* 0x164 */ u8 mSeIdx; - /* 0x165 */ u8 field_0x165[3]; + /* 0x15C */ int field_0x15c; + /* 0x160 */ int field_0x160; + /* 0x164 */ int m_se_idx; /* 0x168 */ s16 field_0x168; /* 0x16A */ u8 field_0x16A; /* 0x16B */ u8 field_0x16B; - /* 0x16C */ u8 mDeleteCheck; - /* 0x16C */ u8 field_0x16D; - /* 0x16E */ u8 mIsReady; + /* 0x16C */ u8 m_mode; + /* 0x16D */ u8 field_0x16D; + /* 0x16E */ u8 m_is_ready; }; #endif /* D_D_TIMER_H */ diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 2ea00aaf794..b268b166ec2 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -150,8 +150,10 @@ public: void setMsgKeyWaitTimer(s16 i_waitTimer) { mMsgKeyWaitTimer = i_waitTimer; } u32 getMsgTimeMs() { return mMsgTimeMs; } void setMsgTimeMs(u32 msgTime) { mMsgTimeMs = msgTime; } + void setTimeMs(s32 i_time) { mTimeMs = i_time; } u32 getTimeMs() { return mTimeMs; } u8 getNowCount() { return mNowCount; } + u8 getMaxCount() { return mMaxCount; } void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; } u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; } void setItemExplainWindowStatus(u8 i_value) { mItemExplainWindowStatus = i_value; } @@ -196,7 +198,7 @@ public: /* 0x78 */ f32 m2DPosH; /* 0x7C */ f32 m2DPosV; /* 0x80 */ f32 unk128; - /* 0x84 */ u32 mTimeMs; + /* 0x84 */ s32 mTimeMs; /* 0x88 */ u32 mMsgTimeMs; /* 0x8C */ s32 mMeterString; /* 0x90 */ u32 mTempBits; @@ -593,10 +595,18 @@ inline void dMeter2Info_setMsgTimeMs(u32 msgTime) { g_meter2_info.setMsgTimeMs(msgTime); } +inline void dMeter2Info_setTimeMs(s32 i_time) { + g_meter2_info.setTimeMs(i_time); +} + inline u8 dMeter2Info_getNowCount() { return g_meter2_info.getNowCount(); } +inline u8 dMeter2Info_getMaxCount() { + return g_meter2_info.getMaxCount(); +} + inline void dMeter2Info_setScopeZoomPointer(u8 param_0) { g_meter2_info.setScopeZoomPointer(param_0); } diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h index 754679bb8ca..4aa4df97fff 100644 --- a/include/d/meter/d_meter_HIO.h +++ b/include/d/meter/d_meter_HIO.h @@ -438,68 +438,30 @@ public: /* 0x000 */ // vtable /* 0x004 */ u8 field_0x4[4]; - /* 0x008 */ f32 field_0x8; - /* 0x00C */ f32 mRiverRideTargetCounterSizeY; - /* 0x010 */ f32 field_0x10; - /* 0x014 */ f32 field_0x14; - /* 0x018 */ f32 mRiverRideTargetCounterPosX; - /* 0x01C */ f32 field_0x1c; - /* 0x020 */ f32 field_0x20; - /* 0x024 */ f32 mRiverRideTargetCounterPosY; - /* 0x028 */ f32 field_0x28; - /* 0x02C */ f32 field_0x2c; - /* 0x030 */ f32 mRiverRideTargetCounterAlpha; - /* 0x034 */ f32 field_0x34; - /* 0x038 */ f32 mGoatTimerSizeX; - /* 0x03C */ f32 field_0x3c; - /* 0x040 */ f32 field_0x40; - /* 0x044 */ f32 mGoatTimerSizeY; - /* 0x048 */ f32 field_0x48; - /* 0x04C */ f32 field_0x4c; - /* 0x050 */ f32 mGoatTimerPosX; - /* 0x054 */ f32 field_0x54; - /* 0x058 */ f32 field_0x58; - /* 0x05C */ f32 mGoatTimerPosY; - /* 0x060 */ f32 field_0x60; - /* 0x064 */ f32 field_0x64; - /* 0x068 */ f32 mGoatTimerAlpha; - /* 0x06C */ f32 field_0x6c; - /* 0x070 */ f32 field_0x70; - /* 0x074 */ f32 mGoatCounterSizeX; - /* 0x078 */ f32 mRiverRideCounterSizeX; - /* 0x07C */ f32 mRiderGameCounterSizeX; - /* 0x080 */ f32 mGoatCounterSizeY; - /* 0x084 */ f32 mRiverRideCounterSizeY; - /* 0x088 */ f32 mRiderGameCounterSizeY; - /* 0x08C */ f32 mGoatCounterPosX; - /* 0x090 */ f32 mRiverRideCounterPosX; - /* 0x094 */ f32 mRiderGameCounterPosX; - /* 0x098 */ f32 mGoatCounterPosY; - /* 0x09C */ f32 mRiverRideCounterPosY; - /* 0x0A0 */ f32 mRiderGameCounterPosY; - /* 0x0A4 */ f32 mGoatCounterAlpha; - /* 0x0A8 */ f32 mRiverRideCounterAlpha; - /* 0x0AC */ f32 mRiderGameCounterAlpha; - /* 0x0B0 */ f32 mGoatIconSizeX; - /* 0x0B4 */ f32 mRiverRideTargetIconSizeX; - /* 0x0B8 */ f32 mRiderGameIconSizeX; - /* 0x0BC */ f32 mGoatIconSizeY; - /* 0x0C0 */ f32 mRiverRideTargetIconSizeY; - /* 0x0C4 */ f32 mRiderGameIconSizeY; - /* 0x0C8 */ f32 mGoatIconPosX; - /* 0x0CC */ f32 mRiverRideTargetIconPosX; - /* 0x0D0 */ f32 mRiderGameIconPosX; - /* 0x0D4 */ f32 mGoatIconPosY; - /* 0x0D8 */ f32 mRiverRideTargetIconPosY; - /* 0x0DC */ f32 mRiderGameIconPosY; - /* 0x0E0 */ f32 mGoatIconAlpha; - /* 0x0E4 */ f32 mRiverRideTargetIconAlpha; - /* 0x0E8 */ f32 mRiderGameIconAlpha; - /* 0x0EC */ f32 mGoatTimerSizeX_4x3; - /* 0x0F0 */ f32 mGoatTimerSizeY_4x3; - /* 0x0F4 */ f32 mGoatTimerPosX_4x3; - /* 0x0F8 */ f32 mGoatTimerPosY_4x3; - /* 0x0FC */ f32 mGoatIconPosX_4x3; + /* 0x008 */ f32 field_0x8[3]; + /* 0x014 */ f32 field_0x14[3]; + /* 0x020 */ f32 field_0x20[3]; + /* 0x02C */ f32 field_0x2c[3]; + /* 0x038 */ f32 mTimerSizeX[3]; + /* 0x044 */ f32 mTimerSizeY[3]; + /* 0x050 */ f32 mTimerPosX[3]; + /* 0x05C */ f32 mTimerPosY[3]; + /* 0x068 */ f32 mTimerAlpha[3]; + /* 0x074 */ f32 mCounterSizeX[3]; + /* 0x080 */ f32 mCounterSizeY[3]; + /* 0x08C */ f32 mCounterPosX[3]; + /* 0x098 */ f32 mCounterPosY[3]; + /* 0x0A4 */ f32 mCounterAlpha[3]; + /* 0x0B0 */ f32 mIconSizeX[3]; + /* 0x0BC */ f32 mIconSizeY[3]; + /* 0x0C8 */ f32 mIconPosX[3]; + /* 0x0D4 */ f32 mIconPosY[3]; + /* 0x0E0 */ f32 mIconAlpha[3]; + /* 0x0EC */ f32 mTimerSizeX_4x3; + /* 0x0F0 */ f32 mTimerSizeY_4x3; + /* 0x0F4 */ f32 mTimerPosX_4x3; + /* 0x0F8 */ f32 mTimerPosY_4x3; + /* 0x0FC */ f32 mIconPosX_4x3; /* 0x100 */ f32 mRiverRideIconPosX_4x3; /* 0x104 */ f32 mRiderGameIconPosX_4x3; /* 0x108 */ f32 mGetInTextSizeX; diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index 8f981ceee0f..dd4cc9f39e1 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -22,15 +22,10 @@ struct fopMsg_prm_class { /* 0x18 */ int field_0x18; }; // Size: 0x1C -struct fopMsg_prm_timer { - /* 0x00 */ int field_0x0; - /* 0x04 */ cXyz field_0x4; - /* 0x10 */ int field_0x10; - /* 0x14 */ int field_0x14; - /* 0x18 */ u32 field_0x18; - /* 0x1C */ int field_0x1c; - /* 0x20 */ u32 field_0x20; - /* 0x24 */ u8 field_0x24; +struct fopMsg_prm_timer : public fopMsg_prm_class { + /* 0x1C */ int timer_mode; + /* 0x20 */ u32 limit_ms; + /* 0x24 */ u8 type; /* 0x25 */ u8 field_0x25; /* 0x28 */ f32 field_0x28; /* 0x2C */ f32 field_0x2c; @@ -57,11 +52,12 @@ msg_class* fopMsgM_SearchByID(unsigned int param_0); char* fopMsgM_messageGet(char* msg, u32 string_id); s32 fop_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc); -inline s32 fopMsgM_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, + +inline s32 fopMsgM_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, u8 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8, - fopMsgCreateFunc createFunc) { - return fop_Timer_create(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, - param_8, createFunc); + fopMsgCreateFunc i_createFunc) { + return fop_Timer_create(i_procName, i_mode, i_limitMs, i_type, param_4, param_5, param_6, + param_7, param_8, i_createFunc); } #endif diff --git a/obj_files.mk b/obj_files.mk index f942cadb684..782654596be 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -1068,4 +1068,5 @@ O_FILES_SYM_ON := \ $(BUILD_DIR)/src/d/file/d_file_sel_warning.o \ $(BUILD_DIR)/src/d/d_gameover.o \ $(BUILD_DIR)/src/d/menu/d_menu_save.o \ + $(BUILD_DIR)/src/d/d_bright_check.o \ \ No newline at end of file diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index 848d0ef0d08..4180434c8c4 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -1,400 +1,138 @@ -// -// Generated By: dol2asm -// Translation Unit: d/d_bright_check -// +/** + * d_bright_check.cpp + * + */ #include "d/d_bright_check.h" -#include "dol2asm.h" -#include "d/msg/d_msg_string.h" -#include "m_Do/m_Do_controller_pad.h" -#include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRArchive.h" +#include "d/msg/d_msg_string.h" +#include "m_Do/m_Do_controller_pad.h" -// -// Types: -// - -struct dDlst_BrightCheck_c -#ifdef NONMATCHING -: public dDlst_base_c -#endif -{ - #ifdef NONMATCHING - /* 801935D0 */ virtual void draw(); - /* 80193648 */ virtual ~dDlst_BrightCheck_c() {}; - #else - /* 801935D0 */ void draw(); - /* 80193648 */ ~dDlst_BrightCheck_c(); - void* vtable; - #endif - J2DScreen* mScreen; -}; - -struct dBrightCheck_c { - /* 80192F10 */ dBrightCheck_c(JKRArchive*); - #ifdef NONMATCHING - /* 80192F98 */ virtual ~dBrightCheck_c(); - #else - void * vtable; - /* 80192F98 */ ~dBrightCheck_c(); - #endif - /* 80193030 */ void screenSet(); - /* 801934D0 */ void _move(); - /* 80193508 */ void modeWait(); - /* 8019350C */ void modeMove(); - /* 80193594 */ void _draw(); - - /* 0x04 */ JKRArchive* mArchive; - /* 0x08 */ dDlst_BrightCheck_c mDlstBrightCheck; - /* 0x10 */ u8 field_0x10[4]; - /* 0x14 */ dMsgString_c* mMsgString; - /* 0x18 */ u8 field_0x18; - /* 0x19 */ u8 field_0x19; -}; - -// -// Forward References: -// - -extern "C" void __ct__14dBrightCheck_cFP10JKRArchive(); -extern "C" void __dt__14dBrightCheck_cFv(); -extern "C" void screenSet__14dBrightCheck_cFv(); -extern "C" void _move__14dBrightCheck_cFv(); -extern "C" void modeWait__14dBrightCheck_cFv(); -extern "C" void modeMove__14dBrightCheck_cFv(); -extern "C" void _draw__14dBrightCheck_cFv(); -extern "C" void draw__19dDlst_BrightCheck_cFv(); -extern "C" void __sinit_d_bright_check_cpp(); -extern "C" void __dt__19dDlst_BrightCheck_cFv(); -extern "C" extern char const* const d_d_bright_check__stringBase0; - -// -// External References: -// - -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void mDoExt_getRubyFont__Fv(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void __ct__12dMsgString_cFv(); -extern "C" void __dt__12dMsgString_cFv(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_22(); -extern "C" void _restgpr_22(); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ /* 803BB5B0-803BB5BC 0186D0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -typedef void (dBrightCheck_c::*BrightCheckFunc)(); - -#ifdef NONMATCHING -SECTION_DATA static BrightCheckFunc brightChackProc[2] = { - &dBrightCheck_c::modeWait, &dBrightCheck_c::modeMove, -}; -#else -/* 803BB5BC-803BB5C8 -00001 000C+00 0/1 0/0 0/0 .data @3797 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3797[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__14dBrightCheck_cFv, -}; -#pragma pop - -/* 803BB5C8-803BB5D4 -00001 000C+00 0/1 0/0 0/0 .data @3798 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3798[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeMove__14dBrightCheck_cFv, -}; -#pragma pop - /* 803BB5D4-803BB5EC 0186F4 0018+00 1/2 0/0 0/0 .data brightChackProc */ -SECTION_DATA static u8 brightChackProc[24] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +typedef void (dBrightCheck_c::*procFunc)(); +static procFunc brightChackProc[] = { + &dBrightCheck_c::modeWait, + &dBrightCheck_c::modeMove, }; -/* 803BB5EC-803BB5FC 01870C 0010+00 3/3 0/0 0/0 .data __vt__19dDlst_BrightCheck_c */ -SECTION_DATA extern void* __vt__19dDlst_BrightCheck_c[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__19dDlst_BrightCheck_cFv, - (void*)__dt__19dDlst_BrightCheck_cFv, -}; - -/* 803BB5FC-803BB618 01871C 000C+10 2/2 0/0 0/0 .data __vt__14dBrightCheck_c */ -SECTION_DATA extern void* __vt__14dBrightCheck_c[3 + 4 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14dBrightCheck_cFv, - /* padding */ - NULL, - NULL, - NULL, - NULL, -}; - -#endif - /* 80192F10-80192F98 18D850 0088+00 0/0 1/1 0/0 .text __ct__14dBrightCheck_cFP10JKRArchive */ -// Matches without vtables -#ifdef NONMATCHING -dBrightCheck_c::dBrightCheck_c(JKRArchive* param_0) { - mArchive = param_0; - mMsgString = new dMsgString_c(); +dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) { + mArchive = i_archive; + mBrightCheck.mMsgString = new dMsgString_c(); + JUT_ASSERT(mBrightCheck.mMsgString != 0); + screenSet(); - field_0x19 = 0; - field_0x18 = 1; + mCompleteCheck = false; + mMode = MODE_MOVE_e; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBrightCheck_c::dBrightCheck_c(JKRArchive* param_0) { - nofralloc -#include "asm/d/d_bright_check/__ct__14dBrightCheck_cFP10JKRArchive.s" -} -#pragma pop -#endif /* 80192F98-80193030 18D8D8 0098+00 1/0 0/0 0/0 .text __dt__14dBrightCheck_cFv */ -#ifdef NONMATCHING dBrightCheck_c::~dBrightCheck_c() { - delete mDlstBrightCheck.mScreen; - delete mMsgString; + delete mBrightCheck.Scr; + delete mBrightCheck.mMsgString; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBrightCheck_c::~dBrightCheck_c() { - nofralloc -#include "asm/d/d_bright_check/__dt__14dBrightCheck_cFv.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80394910-80394938 020F70 0028+00 1/1 0/0 0/0 .rodata tv_btnA$3744 */ -SECTION_RODATA static u64 const tv_btnA[5] = { - 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at', -}; -COMPILER_STRIP_GATE(0x80394910, &tv_btnA); - -/* 80394938-80394960 020F98 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$3745 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u64 const ftv_btnA[5] = { - 'font_a1', 'font_at2', 'font_at3' , 'font_at4', 'font_at', -}; -COMPILER_STRIP_GATE(0x80394938, &ftv_btnA); -#pragma pop - -/* 80394960-803949B0 020FC0 0050+00 0/1 0/0 0/0 .rodata txTV$3751 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u64 const txTV[10] = { - 'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101', 'menu_t01', 'menu_t71', - 'menu_t3', 'menu_t81', 'menu_t4', -}; -COMPILER_STRIP_GATE(0x80394960, &txTV); -#pragma pop - -/* 803949B0-803949D8 021010 0028+00 0/1 0/0 0/0 .rodata txTVhide$3752 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u64 const txTVhide[5] = { - 'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n', -}; -COMPILER_STRIP_GATE(0x803949B0, &txTVhide); -#pragma pop - -/* 803949D8-803949D8 021038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803949D8 = "zelda_option_check.blo"; -SECTION_DEAD static char const* const stringBase_803949EF = ""; -#pragma pop - -/* 80453A00-80453A04 002000 0004+00 2/2 0/0 0/0 .sdata2 @3792 */ -SECTION_SDATA2 static u8 lit_3792[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; /* 80193030-801934D0 18D970 04A0+00 1/1 0/0 0/0 .text screenSet__14dBrightCheck_cFv */ -// matches with literals -#ifdef NONMATCHING void dBrightCheck_c::screenSet() { - mDlstBrightCheck.mScreen = new J2DScreen(); - mDlstBrightCheck.mScreen->setPriority("zelda_option_check.blo", 0x1100000, mArchive); - mDlstBrightCheck.mScreen->search('g_abtn_n')->hide(); - J2DTextBox* textBox = (J2DTextBox*)mDlstBrightCheck.mScreen->search('f_t00'); - mDlstBrightCheck.mScreen->search('f_t00')->show(); - mDlstBrightCheck.mScreen->search('t_t00')->hide(); - textBox->setFont(mDoExt_getRubyFont()); - textBox->setString(0x40, ""); - mMsgString->getString(0x55c, textBox, NULL, NULL, NULL, 0); + static u64 const tv_btnA[] = { + 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at', + }; - J2DTextBox* texts[5]; + static u64 const ftv_btnA[] = { + 'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at', + }; + + static u64 const txTV[] = { + 'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101', + 'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4', + }; + + static u64 const txTVhide[] = { + 'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n', + }; + + mBrightCheck.Scr = new J2DScreen(); + JUT_ASSERT(mBrightCheck.Scr != 0); + mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive); + + mBrightCheck.Scr->search('g_abtn_n')->hide(); + J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('f_t00'); + mBrightCheck.Scr->search('f_t00')->show(); + mBrightCheck.Scr->search('t_t00')->hide(); + + settings_text->setFont(mDoExt_getRubyFont()); + settings_text->setString(0x40, ""); + mBrightCheck.mMsgString->getString(0x55C, settings_text, NULL, NULL, NULL, 0); // "TV Settings" + + J2DTextBox* btna_text[5]; for (int i = 0; i < 5; i++) { - texts[i] = (J2DTextBox*)mDlstBrightCheck.mScreen->search(ftv_btnA[i]); - mDlstBrightCheck.mScreen->search(tv_btnA[i])->hide(); - texts[i]->setFont(mDoExt_getMesgFont()); - texts[i]->setString(0x40, ""); - mMsgString->getString(0x564, texts[i], NULL, NULL, NULL, 0); + btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(ftv_btnA[i]); + mBrightCheck.Scr->search(tv_btnA[i])->hide(); + btna_text[i]->setFont(mDoExt_getMesgFont()); + btna_text[i]->setString(0x40, ""); + mBrightCheck.mMsgString->getString(0x564, btna_text[i], NULL, NULL, NULL, 0); // "Complete" } for (int i = 0; i < 5; i++) { - mDlstBrightCheck.mScreen->search(txTVhide[i])->hide(); + mBrightCheck.Scr->search(txTVhide[i])->hide(); } for (int i = 0; i < 10; i++) { - textBox = (J2DTextBox*)mDlstBrightCheck.mScreen->search(txTV[i]); - textBox->setFont(mDoExt_getMesgFont()); - textBox->setCharSpace(0.0f); + J2DTextBox* check_text = (J2DTextBox*)mBrightCheck.Scr->search(txTV[i]); + check_text->setFont(mDoExt_getMesgFont()); + check_text->setCharSpace(0.0f); if (i < 2) { - textBox->setString(0x100, ""); - mMsgString->getString(0x558, textBox, NULL, NULL, NULL, 0); + check_text->setString(0x100, ""); + mBrightCheck.mMsgString->getString(0x558, check_text, NULL, NULL, NULL, 0); } else if (i < 4) { - textBox->setString(0x100, ""); - mMsgString->getString(0x557, textBox, NULL, NULL, NULL, 0); + check_text->setString(0x100, ""); + mBrightCheck.mMsgString->getString(0x557, check_text, NULL, NULL, NULL, 0); } else if (i < 6) { - textBox->setString(0x100, ""); - mMsgString->getString(0x559, textBox, NULL, NULL, NULL, 0); + check_text->setString(0x100, ""); + mBrightCheck.mMsgString->getString(0x559, check_text, NULL, NULL, NULL, 0); } else if (i < 8) { - textBox->setString(0x100, ""); - mMsgString->getString(0x55a, textBox, NULL, NULL, NULL, 0); + check_text->setString(0x100, ""); + mBrightCheck.mMsgString->getString(0x55A, check_text, NULL, NULL, NULL, 0); } else { - textBox->setString(0x100, ""); - mMsgString->getString(0x55b, textBox, NULL, NULL, NULL, 0); + check_text->setString(0x100, ""); + mBrightCheck.mMsgString->getString(0x55B, check_text, NULL, NULL, NULL, 0); } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBrightCheck_c::screenSet() { - nofralloc -#include "asm/d/d_bright_check/screenSet__14dBrightCheck_cFv.s" -} -#pragma pop -#endif /* 801934D0-80193508 18DE10 0038+00 0/0 1/1 0/0 .text _move__14dBrightCheck_cFv */ void dBrightCheck_c::_move() { - (this->*(((BrightCheckFunc*)brightChackProc)[field_0x18]))(); + (this->*brightChackProc[mMode])(); } /* 80193508-8019350C 18DE48 0004+00 1/0 0/0 0/0 .text modeWait__14dBrightCheck_cFv */ -void dBrightCheck_c::modeWait() { - /* empty function */ -} - -/* ############################################################################################## */ -/* 80453A04-80453A08 002004 0004+00 1/1 0/0 0/0 .sdata2 @3821 */ -SECTION_SDATA2 static f32 lit_3821 = 1.0f; - -/* 80453A08-80453A10 002008 0004+04 1/1 0/0 0/0 .sdata2 @3822 */ -SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = { - -1.0f, - /* padding */ - 0.0f, -}; +void dBrightCheck_c::modeWait() {} /* 8019350C-80193594 18DE4C 0088+00 1/0 0/0 0/0 .text modeMove__14dBrightCheck_cFv */ void dBrightCheck_c::modeMove() { if (mDoCPd_c::getTrigA(PAD_1) || mDoCPd_c::getTrigStart(PAD_1)) { - mDoAud_seStart(1, 0, 0, 0); - field_0x19 = 1; - field_0x18 = 0; + mDoAud_seStart(Z2SE_ENTER_GAME, NULL, 0, 0); + mCompleteCheck = true; + mMode = MODE_WAIT_e; } } /* 80193594-801935D0 18DED4 003C+00 0/0 1/1 0/0 .text _draw__14dBrightCheck_cFv */ -// Matches with mDlstBrightCheck inheritance -#ifdef NONMATCHING void dBrightCheck_c::_draw() { - dComIfGd_set2DOpa(&mDlstBrightCheck); + dComIfGd_set2DOpa(&mBrightCheck); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBrightCheck_c::_draw() { - nofralloc -#include "asm/d/d_bright_check/_draw__14dBrightCheck_cFv.s" -} -#pragma pop -#endif /* 801935D0-80193608 18DF10 0038+00 1/0 0/0 0/0 .text draw__19dDlst_BrightCheck_cFv */ -// Matches with literals -#ifdef NONMATCHING void dDlst_BrightCheck_c::draw() { - J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort(); - mScreen->draw(0.0f, 0.0f, grafContext); + J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort(); + Scr->draw(0.0f, 0.0f, graf_ctx); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_BrightCheck_c::draw() { - nofralloc -#include "asm/d/d_bright_check/draw__19dDlst_BrightCheck_cFv.s" -} -#pragma pop -#endif - -/* 80193608-80193648 18DF48 0040+00 0/0 1/0 0/0 .text __sinit_d_bright_check_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_bright_check_cpp() { - nofralloc -#include "asm/d/d_bright_check/__sinit_d_bright_check_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80193608, __sinit_d_bright_check_cpp); -#pragma pop - -/* 80193648-80193690 18DF88 0048+00 1/0 0/0 0/0 .text __dt__19dDlst_BrightCheck_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDlst_BrightCheck_c::~dDlst_BrightCheck_c() { - nofralloc -#include "asm/d/d_bright_check/__dt__19dDlst_BrightCheck_cFv.s" -} -#pragma pop - -/* 803949D8-803949D8 021038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 62995ced087..4c8dd71345d 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -1,199 +1,291 @@ -// -// Generated By: dol2asm -// Translation Unit: d/d_timer -// +/** + * d_timer.cpp + * Minigame HUD Timer / Counter + */ #include "d/d_timer.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JUtility/JUTFont.h" +#include "SSystem/SComponent/c_math.h" #include "d/d_lib.h" #include "d/d_procname.h" +#include "d/meter/d_meter2.h" +#include "d/meter/d_meter2_draw.h" #include "d/meter/d_meter2_info.h" +#include "d/meter/d_meter_HIO.h" +#include "d/pane/d_pane_class.h" #include "dol2asm.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_lib.h" -// -// Forward References: -// - -extern "C" void _create__8dTimer_cFv(); -extern "C" void _execute__8dTimer_cFv(); -extern "C" void _draw__8dTimer_cFv(); -extern "C" void _delete__8dTimer_cFv(); -extern "C" void deleteCheck__8dTimer_cFv(); -extern "C" void start__8dTimer_cFi(); -extern "C" void start__8dTimer_cFis(); -extern "C" void stock_start__8dTimer_cFv(); -extern "C" void stock_start__8dTimer_cFs(); -extern "C" void stop__8dTimer_cFUc(); -extern "C" void restart__8dTimer_cFUc(); -extern "C" void end__8dTimer_cFi(); -extern "C" void deleteRequest__8dTimer_cFv(); -extern "C" void getTimeMs__8dTimer_cFv(); -extern "C" void getLimitTimeMs__8dTimer_cFv(); -extern "C" void getRestTimeMs__8dTimer_cFv(); -extern "C" void isStart__8dTimer_cFv(); -extern "C" void __ct__21dDlst_TimerScrnDraw_cFv(); -extern "C" void setHIO__21dDlst_TimerScrnDraw_cFv(); -extern "C" void setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive(); -extern "C" void setScreenBase__21dDlst_TimerScrnDraw_cFv(); -extern "C" void setScreenBoatRace__21dDlst_TimerScrnDraw_cFv(); -extern "C" void setScreenRider__21dDlst_TimerScrnDraw_cFv(); -extern "C" void hideDenominator__21dDlst_TimerScrnDraw_cFv(); -extern "C" void deleteScreen__21dDlst_TimerScrnDraw_cFv(); -extern "C" void changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei(); -extern "C" void getNumber__21dDlst_TimerScrnDraw_cFi(); -extern "C" void setTimer__21dDlst_TimerScrnDraw_cFi(); -extern "C" void setCounter__21dDlst_TimerScrnDraw_cFUcUc(); -extern "C" void setParentPos__21dDlst_TimerScrnDraw_cFff(); -extern "C" void setTimerPos__21dDlst_TimerScrnDraw_cFff(); -extern "C" void setCounterPos__21dDlst_TimerScrnDraw_cFff(); -extern "C" void setImagePos__21dDlst_TimerScrnDraw_cFff(); -extern "C" void setShowType__21dDlst_TimerScrnDraw_cFUc(); -extern "C" void anime__21dDlst_TimerScrnDraw_cFv(); -extern "C" void closeAnime__21dDlst_TimerScrnDraw_cFv(); -extern "C" void createGetIn__21dDlst_TimerScrnDraw_cF4cXyz(); -extern "C" void createStart__21dDlst_TimerScrnDraw_cFUs(); -extern "C" void draw__21dDlst_TimerScrnDraw_cFv(); -extern "C" void checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv(); -extern "C" void playBckAnimation__21dDlst_TimerScrnDraw_cFf(); -extern "C" void drawPikari__21dDlst_TimerScrnDraw_cFi(); -extern "C" static void dTimer_Draw__FP8dTimer_c(); -extern "C" static void dTimer_Execute__FP8dTimer_c(); -extern "C" static bool dTimer_IsDelete__FP8dTimer_c(); -extern "C" static void dTimer_Delete__FP8dTimer_c(); -extern "C" static void dTimer_Create__FP9msg_class(); -extern "C" void dTimer_createTimer__FlUlUcUcffff(); -extern "C" void dTimer_createStockTimer__Fv(); -extern "C" void dTimer_createGetIn2D__Fl4cXyz(); -extern "C" static void dTimer_createStart2D__FlUs(); -extern "C" void dTimer_isStart__Fv(); -extern "C" void dTimer_getRestTimeMs__Fv(); -extern "C" void dTimer_show__Fv(); -extern "C" void dTimer_hide__Fv(); -extern "C" void dTimer_isReadyFlag__Fv(); -extern "C" void __dt__21dDlst_TimerScrnDraw_cFv(); -extern "C" void createGetIn__8dTimer_cF4cXyz(); -extern "C" extern char const* const d_d_timer__stringBase0; - -// -// External References: -// - -extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void mDoLib_project__FP3VecP3Vec(); -extern "C" void fopMsgM_GetAppend__FPv(); -extern "C" void fopMsgM_Delete__FPv(); -extern "C" void fop_Timer_create__FsUcUlUcUcffffPFPv_i(); -extern "C" void fopMsgM_createExpHeap__FUlP7JKRHeap(); -extern "C" void fopMsgM_destroyExpHeap__FP10JKRExpHeap(); -extern "C" void setTimerNowTimeMs__14dComIfG_play_cFi(); -extern "C" void getTimerNowTimeMs__14dComIfG_play_cFv(); -extern "C" void setTimerLimitTimeMs__14dComIfG_play_cFi(); -extern "C" void getTimerLimitTimeMs__14dComIfG_play_cFv(); -extern "C" void setTimerMode__14dComIfG_play_cFi(); -extern "C" void getTimerMode__14dComIfG_play_cFv(); -extern "C" void setTimerType__14dComIfG_play_cFUc(); -extern "C" void getTimerType__14dComIfG_play_cFv(); -extern "C" void setTimerPtr__14dComIfG_play_cFP8dTimer_c(); -extern "C" void getTimerPtr__14dComIfG_play_cFv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getTime__11dLib_time_cFv(); -extern "C" void getResInfo__14dRes_control_cFPCcP11dRes_info_ci(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void -drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc(); -extern "C" void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(); -extern "C" void dMeter2Info_getNumberTextureName__Fi(); -extern "C" void getStatus__12dMsgObject_cFv(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void paneTrans__8CPaneMgrFff(); -extern "C" void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void show__13CPaneMgrAlphaFv(); -extern "C" void hide__13CPaneMgrAlphaFv(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void cM_rndFX__Ff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void getTotalFreeSize__7JKRHeapFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(); -extern "C" void getParentPane__7J2DPaneFv(); -extern "C" void animationTransform__7J2DPaneFv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); -extern "C" void getStringPtr__10J2DTextBoxCFv(); -extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" void _savefpr_28(); -extern "C" void _restfpr_28(); -extern "C" void _savegpr_21(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_21(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" void __div2i(); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A3D8 = "Timer"; -#pragma pop - -/* 80454F40-80454F44 003540 0004+00 10/10 0/0 0/0 .sdata2 @3919 */ -SECTION_SDATA2 static u8 lit_3919[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454F44-80454F48 003544 0004+00 2/2 0/0 0/0 .sdata2 @3920 */ -SECTION_SDATA2 static f32 lit_3920 = 145.0f; +static int dTimer_createStart2D(s32 param_0, u16 param_1); /* 8025CA0C-8025CF04 25734C 04F8+00 1/1 0/0 0/0 .text _create__8dTimer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_c::_create() { - nofralloc -#include "asm/d/d_timer/_create__8dTimer_cFv.s" -} -#pragma pop +int dTimer_c::_create() { + int phase_state = dComIfG_resLoad(&m_phase, "Timer"); -/* ############################################################################################## */ -/* 80454F48-80454F4C 003548 0004+00 3/3 0/0 0/0 .sdata2 @4050 */ -SECTION_SDATA2 static f32 lit_4050 = 25.0f; + fopMsg_prm_timer* appen; + if (phase_state == cPhs_COMPLEATE_e) { + appen = (fopMsg_prm_timer*)fopMsgM_GetAppend(this); + if (appen == NULL) { + return cPhs_ERROR_e; + } + + dRes_info_c* resInfo = dComIfG_getObjectResInfo("Timer"); + JUT_ASSERT(resInfo != 0); + dComIfGp_setAllMapArchive(resInfo->getArchive()); + + mp_heap = fopMsgM_createExpHeap(0x11000, NULL); + JKRHeap* prev_heap = mDoExt_setCurrentHeap(mp_heap); + if (mp_heap != NULL) { + mp_heap->getTotalFreeSize(); + + mp_tm_scrn = new dDlst_TimerScrnDraw_c(); + JUT_ASSERT(mp_tm_scrn != 0); + + if (appen->timer_mode == 10) { + mp_tm_scrn->setScreen(dComIfG_getTimerMode(), resInfo->getArchive()); + } else { + mp_tm_scrn->setScreen(appen->timer_mode, resInfo->getArchive()); + } + + mDoExt_setCurrentHeap(prev_heap); + } else { + return cPhs_ERROR_e; + } + } else { + return phase_state; + } + + setShowType(appen->type); + + if (appen->timer_mode == 10) { + m_timer_mode = dComIfG_getTimerMode(); + mLimitTime = OSMillisecondsToTicks((OSTime)dComIfG_getTimerLimitTimeMs()); + + m_time = m_start_time = dLib_time_c::getTime(); + m_start_time -= OSMillisecondsToTicks((OSTime)dComIfG_getTimerNowTimeMs()); + + m_mode = 0; + m_timer_mode = dComIfG_getTimerMode(); + + dComIfG_setTimerNowTimeMs(getTimeMs()); + dComIfG_setTimerLimitTimeMs(getLimitTimeMs()); + dComIfG_setTimerMode(m_timer_mode); + dComIfG_setTimerPtr(this); + + stock_start(10); + + switch (m_timer_mode) { + case 3: + mp_tm_scrn->setTimerTrans(0.0f, 145.0f); + break; + case 4: + mp_tm_scrn->setTimerTrans(0.0f, 145.0f); + break; + case 6: + mp_tm_scrn->setTimerTrans(0.0f, 145.0f); + break; + case 5: + mp_tm_scrn->setTimerTrans(0.0f, 145.0f); + break; + } + } else { + m_timer_mode = appen->timer_mode; + OS_REPORT("limit Ms = %d\n", appen->limit_ms); + + mLimitTime = OSMillisecondsToTicks((OSTime)appen->limit_ms); + m_start_time = 0; + m_time = 0; + m_mode = 0; + + dComIfG_setTimerNowTimeMs(getTimeMs()); + dComIfG_setTimerLimitTimeMs(getLimitTimeMs()); + dComIfG_setTimerMode(m_timer_mode); + dComIfG_setTimerPtr(this); + } + + switch (m_timer_mode) { + case 8: + mp_tm_scrn->hideDenominator(); + field_0x16D = 2; + break; + case 7: + case 2: + field_0x16D = 0; + break; + default: + field_0x16D = 1; + mp_tm_scrn->hideDenominator(); + break; + } + + mp_tm_scrn->setHIOType(field_0x16D); + + if (mp_tm_scrn->getHIOType() != 0 && field_0x16D == 0) { + f32 var_f0 = 0.0f; + setCounterPos(g_drawHIO.mMiniGame.mTimerPosX_4x3 + var_f0, + g_drawHIO.mMiniGame.mTimerPosY_4x3); + } else { + f32 var_f0 = 0.0f; + setCounterPos(g_drawHIO.mMiniGame.mTimerPosX[field_0x16D] + var_f0, + g_drawHIO.mMiniGame.mTimerPosY[field_0x16D]); + } + + f32 var_f0 = 0.0f; + setImagePos(g_drawHIO.mMiniGame.mIconPosX[field_0x16D] + var_f0, + g_drawHIO.mMiniGame.mIconPosY[field_0x16D]); + setTimerPos(g_drawHIO.mMiniGame.mCounterPosX[field_0x16D], + g_drawHIO.mMiniGame.mCounterPosY[field_0x16D]); + + field_0x120 = 0; + field_0x128 = 0; + field_0x130 = 0; + field_0x138 = 0; + field_0x16A = 0; + field_0x16B = 0; + field_0x158 = 120; + field_0x15c = 0; + m_is_ready = 0; + m_se_idx = 0; + field_0x160 = 0; + + OS_REPORT("\n\n\nm_se_idx = %d\n\n\n", m_se_idx); + return cPhs_COMPLEATE_e; +} /* 8025CF04-8025D33C 257844 0438+00 1/1 0/0 0/0 .text _execute__8dTimer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_c::_execute() { - nofralloc -#include "asm/d/d_timer/_execute__8dTimer_cFv.s" +int dTimer_c::_execute() { + if (m_timer_mode == 6 && i_dComIfGs_getLife() == 0) { + fopMsgM_Delete(this); + } + + if (field_0x16A != 1) { + if (dComIfGp_isPauseFlag() || dMsgObject_isTalkNowCheck()) { + stop(2); + } + + field_0x150 = getRestTimeMs(); + + switch (m_mode) { + case 0: + case 1: + case 5: + m_start_time = 0; + m_time = 0; + + if (m_mode == 1 || m_mode == 5) { + if (--field_0x168 <= 0) { + if (m_mode == 5) { + stock_start(); + } else { + start(m_timer_mode); + } + } + } + break; + case 2: + case 3: + if (--field_0x168 <= 0) { + m_mode = 4; + } + + if (m_mode == 2 && mp_tm_scrn->checkStartAnimeEnd()) { + m_mode = 3; + } + break; + case 4: + m_time = dLib_time_c::getTime(); + dComIfG_setTimerNowTimeMs(getTimeMs()); + dComIfG_setTimerLimitTimeMs(getLimitTimeMs()); + + if (getRestTimeMs() <= 0) { + m_time = mLimitTime + m_start_time; + field_0x138 = 0; + dComIfG_setTimerNowTimeMs(getTimeMs()); + } + + if (m_timer_mode == 3 || m_timer_mode == 4 || m_timer_mode == 6 || m_timer_mode == 5) { + f32 pos_y = mp_tm_scrn->getTimerTransY(); + if (pos_y < 145.0f) { + pos_y += 25.0f; + if (pos_y > 145.0f) { + pos_y = 145.0f; + } + + mp_tm_scrn->setTimerTrans(0.0f, pos_y); + } + } + break; + default: + m_time = field_0x120; + } + } else { + if (field_0x16B == 2 && !dComIfGp_isPauseFlag() && !dMsgObject_isTalkNowCheck()) { + restart(2); + } + + if (field_0x16B == 3) { + field_0x168--; + + if (field_0x168 <= 0) { + field_0x168 = 0; + restart(3); + } else if (field_0x168 == g_drawHIO.mMiniGame.field_0x15a) { + mp_tm_scrn->resetCowID(); + + if (m_timer_mode != 3) { + createStart(0x52D); // "GO!" + } + } + } + } + + mp_tm_scrn->setHIO(); + + if (m_mode == 8) { + if (mp_tm_scrn->closeAnime()) { + fopMsgM_Delete(this); + return 1; + } + } else if (m_mode == 6 && field_0x158 > 0) { + field_0x158--; + } + + if (m_mode != 0 && m_mode != 2) { + if (field_0x15c > 5) { + mp_tm_scrn->anime(); + } else { + field_0x15c++; + } + } + + if (m_timer_mode == 2 || m_timer_mode == 7 || m_timer_mode == 3 || m_timer_mode == 4 || + m_timer_mode == 5 || m_timer_mode == 0) + { + mp_tm_scrn->setTimer(getTimeMs()); + } else { + mp_tm_scrn->setTimer(getRestTimeMs()); + } + + mp_tm_scrn->setCounter(dMeter2Info_getNowCount(), dMeter2Info_getMaxCount()); + return 1; +} + +// Helper functions to set float literal order +static f32 dummyLiteralOrder() { + return 1.0f; +} + +static f32 dummyLiteralOrder2() { + return -1.0f; } -#pragma pop /* 8025D33C-8025D3BC 257C7C 0080+00 1/1 0/0 0/0 .text _draw__8dTimer_cFv */ - int dTimer_c::_draw() { if (dComIfGp_isPauseFlag() || dMsgObject_isTalkNowCheck()) { return 1; @@ -204,69 +296,115 @@ int dTimer_c::_draw() { } /* 8025D3BC-8025D524 257CFC 0168+00 1/1 0/0 0/0 .text _delete__8dTimer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_c::_delete() { - nofralloc -#include "asm/d/d_timer/_delete__8dTimer_cFv.s" +int dTimer_c::_delete() { + if (mp_heap != NULL) { + JKRHeap* prev_heap = mDoExt_setCurrentHeap(mp_heap); + mp_heap->getTotalFreeSize(); + + mp_tm_scrn->deleteScreen(); + delete mp_tm_scrn; + mp_tm_scrn = NULL; + + fopMsgM_destroyExpHeap(mp_heap); + mp_heap = NULL; + mDoExt_setCurrentHeap(prev_heap); + } + + if ((m_timer_mode == 3 || m_timer_mode == 4) && m_mode != 8 && m_mode != 7) { + dComIfG_setTimerNowTimeMs(getTimeMs()); + dComIfG_setTimerLimitTimeMs(getLimitTimeMs()); + dComIfG_setTimerMode(m_timer_mode); + } else { + dComIfG_setTimerNowTimeMs(0); + dComIfG_setTimerLimitTimeMs(0); + dComIfG_setTimerMode(-1); + } + + dComIfG_setTimerPtr(NULL); + dComIfG_resDelete(&m_phase, "Timer"); + dComIfGp_setAllMapArchive(NULL); + return 1; } -#pragma pop /* 8025D524-8025D538 257E64 0014+00 0/0 1/1 0/0 .text deleteCheck__8dTimer_cFv */ int dTimer_c::deleteCheck() { - return mDeleteCheck == 7; + return m_mode == 7; } /* 8025D538-8025D618 257E78 00E0+00 1/1 1/1 0/0 .text start__8dTimer_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_c::start(int param_0) { - nofralloc -#include "asm/d/d_timer/start__8dTimer_cFi.s" +int dTimer_c::start(int i_timer_mode) { + if (m_mode == 0 || m_mode == 1) { + m_mode = 4; + m_time = m_start_time = dLib_time_c::getTime(); + + if (i_timer_mode == 3 || i_timer_mode == 4 || i_timer_mode == 6 || i_timer_mode == 5) { + stop(3); + + if (i_timer_mode != 3) { + createStart(0x515); // "READY?" + field_0x168 = g_drawHIO.mMiniGame.mReadyGo + g_drawHIO.mMiniGame.field_0x15a; + } else { + field_0x168 = g_drawHIO.mMiniGame.field_0x15a; + } + + m_is_ready = 1; + } + return 1; + } + + return 0; } -#pragma pop /* 8025D618-8025D708 257F58 00F0+00 0/0 1/1 0/0 .text start__8dTimer_cFis */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_c::start(int param_0, s16 param_1) { - nofralloc -#include "asm/d/d_timer/start__8dTimer_cFis.s" +int dTimer_c::start(int i_timer_mode, s16 param_1) { + if (param_1 == -1) { + if (m_mode == 0) { + if (i_timer_mode == 2 || i_timer_mode == 7) { + dTimer_createStart2D(i_timer_mode, 0x3E3); + } + + field_0x168 = g_drawHIO.mMiniGame.mStartPikariDisplayFrames; + m_mode = 4; + m_time = m_start_time = dLib_time_c::getTime(); + + stop(4); + m_mode = 2; + } + return 1; + } else if (m_mode == 0) { + field_0x168 = param_1; + m_mode = 1; + + if (i_timer_mode == 3 || i_timer_mode == 4 || i_timer_mode == 6 || i_timer_mode == 5) { + stop(3); + } + return 1; + } + + return 0; } -#pragma pop /* 8025D708-8025D7C0 258048 00B8+00 1/1 0/0 0/0 .text stock_start__8dTimer_cFv */ -#ifdef NONMATCHING bool dTimer_c::stock_start() { - if (mDeleteCheck == 5) { - mDeleteCheck = 4; - OSTime current_time = dLib_time_c::getTime(); - mTime1 = current_time; - mTime2 = current_time; + if (m_mode == 5) { + m_mode = 4; - mTime1 -= OS_TIMER_CLOCK_MS * dComIfG_getTimerNowTimeMs(); + OSTime current_time = dLib_time_c::getTime(); + m_start_time = current_time; + m_time = current_time; + + m_start_time -= OSMillisecondsToTicks((OSTime)dComIfG_getTimerNowTimeMs()); + return true; } - return mDeleteCheck == 5; + + return false; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dTimer_c::stock_start() { - nofralloc -#include "asm/d/d_timer/stock_start__8dTimer_cFv.s" -} -#pragma pop -#endif /* 8025D7C0-8025D7E8 258100 0028+00 1/1 0/0 0/0 .text stock_start__8dTimer_cFs */ int dTimer_c::stock_start(s16 param_0) { - if (mDeleteCheck == 0) { + if (m_mode == 0) { field_0x168 = param_0; - mDeleteCheck = 5; + m_mode = 5; return 1; } @@ -277,10 +415,10 @@ int dTimer_c::stock_start(s16 param_0) { int dTimer_c::stop(u8 param_0) { if (field_0x16A == 1 || field_0x16B != 0) { return 0; - } else if (mDeleteCheck != 4) { + } else if (m_mode != 4) { return 0; } else { - mTime3 = dLib_time_c::getTime(); + field_0x130 = dLib_time_c::getTime(); field_0x16A = 1; field_0x16B = param_0; return 1; @@ -291,11 +429,11 @@ int dTimer_c::stop(u8 param_0) { int dTimer_c::restart(u8 param_0) { if (field_0x16A != 1 || field_0x16B != param_0) { return 0; - } else if (mDeleteCheck != 4 && mDeleteCheck != 2) { + } else if (m_mode != 4 && m_mode != 2) { return 0; } else { - mTime2 = dLib_time_c::getTime(); - mTime5 += mTime2 - mTime3; + m_time = dLib_time_c::getTime(); + field_0x138 += m_time - field_0x130; field_0x16A = 0; field_0x16B = 0; return 1; @@ -304,13 +442,13 @@ int dTimer_c::restart(u8 param_0) { /* 8025D920-8025D9E0 258260 00C0+00 0/0 1/1 0/0 .text end__8dTimer_cFi */ int dTimer_c::end(int param_0) { - if (mDeleteCheck != 4) { + if (m_mode != 4) { return 0; } - mTime6 = dLib_time_c::getTime(); - mDeleteCheck = 6; - dComIfG_setTimerNowTimeMs((mTime6 - mTime1 - mTime5) / OS_TIMER_CLOCK_MS); + field_0x120 = dLib_time_c::getTime(); + m_mode = 6; + dComIfG_setTimerNowTimeMs(OSTicksToMilliseconds(field_0x120 - m_start_time - field_0x138)); if (param_0 != -1) { field_0x158 = param_0; @@ -321,517 +459,1121 @@ int dTimer_c::end(int param_0) { /* 8025D9E0-8025D9F0 258320 0010+00 0/0 1/1 0/0 .text deleteRequest__8dTimer_cFv */ int dTimer_c::deleteRequest() { - mDeleteCheck = 8; + m_mode = 8; return 1; } /* 8025D9F0-8025DA54 258330 0064+00 3/3 0/0 0/0 .text getTimeMs__8dTimer_cFv */ int dTimer_c::getTimeMs() { - return (mTime2 - mTime1 - mTime5) / OS_TIMER_CLOCK_MS; + return OSTicksToMilliseconds(m_time - m_start_time - field_0x138); } /* 8025DA54-8025DA9C 258394 0048+00 3/3 0/0 0/0 .text getLimitTimeMs__8dTimer_cFv */ int dTimer_c::getLimitTimeMs() { - return mLimitTime / OS_TIMER_CLOCK_MS; + return OSTicksToMilliseconds(mLimitTime); } /* 8025DA9C-8025DB10 2583DC 0074+00 2/2 0/0 1/1 .text getRestTimeMs__8dTimer_cFv */ -#ifdef NONMATCHING -// regs swapped int dTimer_c::getRestTimeMs() { - OSTime tmpTime2 = mTime2 - mTime1 - mTime5; - // OSTime tmpTime = (mTime5) - mLimitTime; - - return (tmpTime2 - mLimitTime) / OS_TIMER_CLOCK_MS; + OSTime step0 = m_time - m_start_time - field_0x138; + step0 = mLimitTime - step0; + return OSTicksToMilliseconds(step0); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dTimer_c::getRestTimeMs() { - nofralloc -#include "asm/d/d_timer/getRestTimeMs__8dTimer_cFv.s" -} -#pragma pop -#endif /* 8025DB10-8025DB38 258450 0028+00 1/1 0/0 4/4 .text isStart__8dTimer_cFv */ int dTimer_c::isStart() { - if (field_0x16A != 1 && mDeleteCheck == 4) { + if (field_0x16A != 1 && m_mode == 4) { return 1; } return 0; } -/* ############################################################################################## */ -/* 803C33C0-803C33E4 -00001 0024+00 1/1 0/0 0/0 .data @5239 */ -SECTION_DATA static void* lit_5239[9] = { - (void*)(((char*)createGetIn__21dDlst_TimerScrnDraw_cF4cXyz) + 0x2B8), - (void*)(((char*)createGetIn__21dDlst_TimerScrnDraw_cF4cXyz) + 0x250), - (void*)(((char*)createGetIn__21dDlst_TimerScrnDraw_cF4cXyz) + 0x258), - (void*)(((char*)createGetIn__21dDlst_TimerScrnDraw_cF4cXyz) + 0x260), - (void*)(((char*)createGetIn__21dDlst_TimerScrnDraw_cF4cXyz) + 0x268), - (void*)(((char*)createGetIn__21dDlst_TimerScrnDraw_cF4cXyz) + 0x274), - (void*)(((char*)createGetIn__21dDlst_TimerScrnDraw_cF4cXyz) + 0x280), - (void*)(((char*)createGetIn__21dDlst_TimerScrnDraw_cF4cXyz) + 0x288), - (void*)(((char*)createGetIn__21dDlst_TimerScrnDraw_cF4cXyz) + 0x294), -}; - -/* 803C33E4-803C33F8 -00001 0014+00 1/0 0/0 0/0 .data l_dTimer_Method */ -SECTION_DATA static void* l_dTimer_Method[5] = { - (void*)dTimer_Create__FP9msg_class, (void*)dTimer_Delete__FP8dTimer_c, - (void*)dTimer_Execute__FP8dTimer_c, (void*)dTimer_IsDelete__FP8dTimer_c, - (void*)dTimer_Draw__FP8dTimer_c, -}; - -/* 803C33F8-803C3420 -00001 0028+00 0/0 0/0 1/0 .data g_profile_TIMER */ -SECTION_DATA extern void* g_profile_TIMER[10] = { - (void*)0xFFFFFFFD, (void*)0x000CFFFD, - (void*)0x03150000, (void*)&g_fpcLf_Method, - (void*)0x00000170, (void*)NULL, - (void*)NULL, (void*)&g_fopMsg_Method, - (void*)0x03000000, (void*)&l_dTimer_Method, -}; - -/* 803C3420-803C3430 020540 0010+00 2/2 0/0 0/0 .data __vt__21dDlst_TimerScrnDraw_c */ -SECTION_DATA extern void* __vt__21dDlst_TimerScrnDraw_c[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__21dDlst_TimerScrnDraw_cFv, - (void*)__dt__21dDlst_TimerScrnDraw_cFv, -}; /* 8025DB38-8025DBE0 258478 00A8+00 1/1 0/0 0/0 .text __ct__21dDlst_TimerScrnDraw_cFv */ -#ifdef NONMATCHING dDlst_TimerScrnDraw_c::dDlst_TimerScrnDraw_c() { - mTimerVisible = 0; - field_0x3DD = 0; + field_0x3e2 = 0; + mHIOType = 0; field_0x3D8 = 0; field_0x3CC = -1; field_0x3D0 = -1; field_0x3D4 = 0; - field_0x3B0 = 0; // fix - field_0x3B4 = 0; // fix - field_0x3B8 = 0; // fix - field_0x3BC = 0; // fix + mParentAlpha = g_drawHIO.mMiniGame.field_0x2c[mHIOType]; + mTimerAlpha = g_drawHIO.mMiniGame.mTimerAlpha[mHIOType]; + mCounterAlpha = g_drawHIO.mMiniGame.mCounterAlpha[mHIOType]; + mImageAlpha = g_drawHIO.mMiniGame.mIconAlpha[mHIOType]; field_0x3DE = 0; field_0x3DF = 0; field_0x3E0 = 0; - field_0x3E1 = 1; + show(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDlst_TimerScrnDraw_c::dDlst_TimerScrnDraw_c() { - nofralloc -#include "asm/d/d_timer/__ct__21dDlst_TimerScrnDraw_cFv.s" -} -#pragma pop -#endif /* 8025DBE0-8025DFBC 258520 03DC+00 1/1 0/0 0/0 .text setHIO__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setHIO() { - nofralloc -#include "asm/d/d_timer/setHIO__21dDlst_TimerScrnDraw_cFv.s" -} -#pragma pop +void dDlst_TimerScrnDraw_c::setHIO() { + bool var_r31 = false; -/* ############################################################################################## */ -/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A3DE = "zelda_game_image_cow_get_in.blo"; -SECTION_DEAD static char const* const stringBase_8039A3FE = "zelda_game_image_cow_get_in.bck"; -#pragma pop + if (mpParent != NULL) { + setParentPos(g_drawHIO.mMiniGame.field_0x14[mHIOType], + g_drawHIO.mMiniGame.field_0x20[mHIOType]); + + mpParent->scale(g_drawHIO.mMiniGame.field_0x8[mHIOType], + g_drawHIO.mMiniGame.field_0x8[mHIOType]); + + if (field_0x3DF != 0 && field_0x3E0 != 0 && + mParentAlpha != g_drawHIO.mMiniGame.field_0x2c[mHIOType]) + { + if (mpParent != NULL) { + mpParent->setAlphaRate(g_drawHIO.mMiniGame.field_0x2c[mHIOType]); + } + + mParentAlpha = g_drawHIO.mMiniGame.field_0x2c[mHIOType]; + var_r31 = true; + } + } + + if (mpTimeParent != NULL) { + if (field_0x3e2 != 0 && mHIOType == 0) { + setTimerPos(g_drawHIO.mMiniGame.mTimerPosX_4x3, g_drawHIO.mMiniGame.mTimerPosY_4x3); + } else { + setTimerPos(g_drawHIO.mMiniGame.mTimerPosX[mHIOType], + g_drawHIO.mMiniGame.mTimerPosY[mHIOType]); + } + + if (field_0x3e2 != 0 && mHIOType == 0) { + mpTimeParent->scale(g_drawHIO.mMiniGame.mTimerSizeX_4x3, + g_drawHIO.mMiniGame.mTimerSizeY_4x3); + } else { + mpTimeParent->scale(g_drawHIO.mMiniGame.mTimerSizeX[mHIOType], + g_drawHIO.mMiniGame.mTimerSizeY[mHIOType]); + } + + if (field_0x3DF != 0) { + if (mTimerAlpha != g_drawHIO.mMiniGame.mTimerAlpha[mHIOType] || var_r31) { + if (mpTimeParent != NULL) { + mpTimeParent->setAlphaRate(g_drawHIO.mMiniGame.mTimerAlpha[mHIOType] * + mParentAlpha); + } + + mTimerAlpha = g_drawHIO.mMiniGame.mTimerAlpha[mHIOType]; + } + } + } + + if (mpCowParent != NULL) { + setCounterPos(g_drawHIO.mMiniGame.mCounterPosX[mHIOType], + g_drawHIO.mMiniGame.mCounterPosY[mHIOType]); + mpCowParent->scale(g_drawHIO.mMiniGame.mCounterSizeX[mHIOType], + g_drawHIO.mMiniGame.mCounterSizeY[mHIOType]); + + if (field_0x3E0 != 0) { + if (mCounterAlpha != g_drawHIO.mMiniGame.mCounterAlpha[mHIOType] || var_r31) { + if (mpCowParent != NULL) { + mpCowParent->setAlphaRate(g_drawHIO.mMiniGame.mCounterAlpha[mHIOType] * + mParentAlpha); + } + + mCounterAlpha = g_drawHIO.mMiniGame.mCounterAlpha[mHIOType]; + } + } + } + + if (mpImageParent != NULL) { + setImagePos(g_drawHIO.mMiniGame.mIconPosX[mHIOType], + g_drawHIO.mMiniGame.mIconPosY[mHIOType]); + mpImageParent->scale(g_drawHIO.mMiniGame.mIconSizeX[mHIOType], + g_drawHIO.mMiniGame.mIconSizeY[mHIOType]); + + if (field_0x3E0 != 0) { + if (mImageAlpha != g_drawHIO.mMiniGame.mIconAlpha[mHIOType] || var_r31) { + if (mpImageParent != NULL) { + mpImageParent->setAlphaRate(g_drawHIO.mMiniGame.mIconAlpha[mHIOType] * + mParentAlpha); + } + + mImageAlpha = g_drawHIO.mMiniGame.mIconAlpha[mHIOType]; + } + } + } +} /* 8025DFBC-8025E240 2588FC 0284+00 1/1 0/0 0/0 .text * setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* param_1) { - nofralloc -#include "asm/d/d_timer/setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive.s" -} -#pragma pop +void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { + field_0x3C8 = param_0; + mpArchive = i_archive; -/* ############################################################################################## */ -/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A41E = "zelda_game_image_cow_game.blo"; -#pragma pop + if (field_0x3C8 == 3 || field_0x3C8 == 4) { + setScreenBoatRace(); + } else if (field_0x3C8 == 8) { + setScreenRider(); + } else { + setScreenBase(); + } + + setShowType(3); + + mpGetInScreen = new J2DScreen(); + JUT_ASSERT(mpGetInScreen != 0); + + bool fg = mpGetInScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpArchive); + JUT_ASSERT(fg != false); + dPaneClass_showNullPane(mpGetInScreen); + + i_OSInitFastCast(); + mpGetInBck = (J2DAnmTransform*)J2DAnmLoaderDataBase::load( + JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpArchive)); + + mpGetInParent = new CPaneMgr(mpGetInScreen, 'get_in_n', 2, NULL); + JUT_ASSERT(mpGetInParent != 0); + + mpGetInRoot = new CPaneMgr(mpGetInScreen, 'n_all', 0, NULL); + JUT_ASSERT(mpGetInRoot != 0); + + mpGetInText = new CPaneMgr(mpGetInScreen, 'get_in', 0, NULL); + JUT_ASSERT(mpGetInText != 0); + + static_cast(mpGetInScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont()); + static_cast(mpGetInScreen->search('get_in'))->setFont(mDoExt_getMesgFont()); + + for (int i = 0; i < 51; i++) { + m_getin_info[i].bck_frame = 0.0f; + m_getin_info[i].pikari_frame = 0.0f; + m_getin_info[i].pos_x = 0; + m_getin_info[i].pos_y = 0; + m_getin_info[i].field_0xc = 0; + m_getin_info[i].field_0xd = 0xFF; + } + + mCowID = 0; + playBckAnimation(0.0f); + mTimerTransY = 0.0f; + mTimerTransX = 0.0f; +} /* 8025E240-8025E66C 258B80 042C+00 1/1 0/0 0/0 .text setScreenBase__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setScreenBase() { - nofralloc -#include "asm/d/d_timer/setScreenBase__21dDlst_TimerScrnDraw_cFv.s" -} -#pragma pop +void dDlst_TimerScrnDraw_c::setScreenBase() { + mpScreen = new J2DScreen(); + JUT_ASSERT(mpScreen != 0); -/* ############################################################################################## */ -/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A43C = "zelda_game_image_zora_kawakudari.blo"; -#pragma pop + bool fg = mpScreen->setPriority("zelda_game_image_cow_game.blo", 0x20000, mpArchive); + JUT_ASSERT(fg != false); + dPaneClass_showNullPane(mpScreen); + + mpParent = NULL; + + mpCowParent = new CPaneMgr(mpScreen, 'cow_n', 2, NULL); + JUT_ASSERT(mpCowParent != 0); + mpCowParent->setAlphaRate(0.0f); + + mpTimeParent = new CPaneMgr(mpScreen, 'time_n', 2, NULL); + JUT_ASSERT(mpTimeParent != 0); + mpTimeParent->setAlphaRate(0.0f); + + mpImageParent = new CPaneMgr(mpScreen, 'cow_i_n', 2, NULL); + JUT_ASSERT(mpImageParent != 0); + mpImageParent->setAlphaRate(0.0f); + + field_0x5c[0][0] = mpScreen->search('c_n_2'); + field_0x5c[0][1] = mpScreen->search('c_n_2_s'); + field_0x5c[1][0] = mpScreen->search('c_n_1'); + field_0x5c[1][1] = mpScreen->search('c_n_1_s'); + + field_0x6c[0] = static_cast(mpScreen->search('c_n_4')); + field_0x6c[1] = static_cast(mpScreen->search('c_n_4_s')); + field_0x74[0] = static_cast(mpScreen->search('c_n_3')); + field_0x74[1] = static_cast(mpScreen->search('c_n_3_s')); + + mTimerText[0][0] = mpScreen->search('t_n_6'); + mTimerText[0][1] = mpScreen->search('t_n_6_s'); + mTimerText[1][0] = mpScreen->search('t_n_5'); + mTimerText[1][1] = mpScreen->search('t_n_5_s'); + mTimerText[2][0] = mpScreen->search('t_n_4'); + mTimerText[2][1] = mpScreen->search('t_n_4_s'); + mTimerText[3][0] = mpScreen->search('t_n_3'); + mTimerText[3][1] = mpScreen->search('t_n_3_s'); + mTimerText[4][0] = mpScreen->search('t_n_2'); + mTimerText[4][1] = mpScreen->search('t_n_2_s'); + mTimerText[5][0] = mpScreen->search('t_n_1'); + mTimerText[5][1] = mpScreen->search('t_n_1_s'); +} /* 8025E66C-8025E8B8 258FAC 024C+00 1/1 0/0 0/0 .text setScreenBoatRace__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setScreenBoatRace() { - nofralloc -#include "asm/d/d_timer/setScreenBoatRace__21dDlst_TimerScrnDraw_cFv.s" -} -#pragma pop +void dDlst_TimerScrnDraw_c::setScreenBoatRace() { + mpScreen = new J2DScreen(); + JUT_ASSERT(mpScreen != 0); -/* ############################################################################################## */ -/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A461 = "zelda_game_image_rider.blo"; -#pragma pop + bool fg = mpScreen->setPriority("zelda_game_image_zora_kawakudari.blo", 0x20000, mpArchive); + JUT_ASSERT(fg != false); + dPaneClass_showNullPane(mpScreen); + + mpParent = new CPaneMgr(mpScreen, 'ta_co_n', 2, NULL); + JUT_ASSERT(mpParent != 0); + + mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL); + JUT_ASSERT(mpCowParent != 0); + mpCowParent->setAlphaRate(0.0f); + + mpTimeParent = NULL; + + mpImageParent = new CPaneMgr(mpScreen, 'target_n', 2, NULL); + JUT_ASSERT(mpImageParent != 0); + mpImageParent->setAlphaRate(0.0f); + + mpScreen->search('w_target')->hide(); + mpScreen->search('target')->show(); + + for (int i = 0; i < 2; i++) { + for (int j = 0; j < 2; j++) { + field_0x5c[i][j] = NULL; + } + } + + field_0x6c[0] = static_cast(mpScreen->search('num_1')); + field_0x6c[1] = NULL; + field_0x74[0] = static_cast(mpScreen->search('num_0')); + field_0x74[1] = NULL; + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 2; j++) { + mTimerText[i][j] = NULL; + } + } +} /* 8025E8B8-8025EB20 2591F8 0268+00 1/1 0/0 0/0 .text setScreenRider__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setScreenRider() { - nofralloc -#include "asm/d/d_timer/setScreenRider__21dDlst_TimerScrnDraw_cFv.s" +void dDlst_TimerScrnDraw_c::setScreenRider() { + mpScreen = new J2DScreen(); + JUT_ASSERT(mpScreen != 0); + + bool fg = mpScreen->setPriority("zelda_game_image_rider.blo", 0x20000, mpArchive); + JUT_ASSERT(fg != false); + dPaneClass_showNullPane(mpScreen); + + mpParent = NULL; + + mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL); + JUT_ASSERT(mpCowParent != 0); + mpCowParent->setAlphaRate(0.0f); + + mpTimeParent = NULL; + + mpImageParent = new CPaneMgr(mpScreen, 'rid_i_n', 2, NULL); + JUT_ASSERT(mpImageParent != 0); + mpImageParent->setAlphaRate(0.0f); + + field_0x5c[0][0] = mpScreen->search('n_n_2'); + field_0x5c[0][1] = mpScreen->search('n_n_2_s'); + field_0x5c[1][0] = mpScreen->search('n_n_1'); + field_0x5c[1][1] = mpScreen->search('n_n_1_s'); + + field_0x6c[0] = static_cast(mpScreen->search('n_n_4')); + field_0x6c[1] = static_cast(mpScreen->search('n_n_4_s')); + field_0x74[0] = static_cast(mpScreen->search('n_n_3')); + field_0x74[1] = static_cast(mpScreen->search('n_n_3_s')); + + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 2; j++) { + mTimerText[i][j] = NULL; + } + } } -#pragma pop /* 8025EB20-8025EC5C 259460 013C+00 1/1 0/0 0/0 .text hideDenominator__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::hideDenominator() { - nofralloc -#include "asm/d/d_timer/hideDenominator__21dDlst_TimerScrnDraw_cFv.s" +void dDlst_TimerScrnDraw_c::hideDenominator() { + for (int i = 0; i < 2; i++) { + for (int j = 0; j < 2; j++) { + if (field_0x5c[i][j] != NULL) { + field_0x5c[i][j]->hide(); + } + } + } + + if (field_0x3C8 == 8) { + mpScreen->search('n_sl_s')->hide(); + mpScreen->search('n_sl')->hide(); + } else { + J2DPane* sl_s = mpScreen->search('c_sl_s'); + J2DPane* sl = mpScreen->search('c_sl'); + + if (sl_s != NULL) { + sl_s->hide(); + } + + if (sl != NULL) { + sl->hide(); + } + } } -#pragma pop /* 8025EC5C-8025EE24 25959C 01C8+00 1/1 0/0 0/0 .text deleteScreen__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::deleteScreen() { - nofralloc -#include "asm/d/d_timer/deleteScreen__21dDlst_TimerScrnDraw_cFv.s" +void dDlst_TimerScrnDraw_c::deleteScreen() { + delete mpScreen; + mpScreen = NULL; + + if (mpParent != NULL) { + delete mpParent; + mpParent = NULL; + } + + if (mpTimeParent != NULL) { + delete mpTimeParent; + mpTimeParent = NULL; + } + + if (mpCowParent != NULL) { + delete mpCowParent; + mpCowParent = NULL; + } + + if (mpImageParent != NULL) { + delete mpImageParent; + mpImageParent = NULL; + } + + delete mpGetInScreen; + mpGetInScreen = NULL; + + delete mpGetInBck; + mpGetInBck = NULL; + + delete mpGetInParent; + mpGetInParent = NULL; + + delete mpGetInRoot; + mpGetInRoot = NULL; + + delete mpGetInText; + mpGetInText = NULL; } -#pragma pop /* 8025EE24-8025EECC 259764 00A8+00 2/2 0/0 0/0 .text * changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::changeNumberTexture(J2DPane* param_0, int param_1) { - nofralloc -#include "asm/d/d_timer/changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei.s" +void dDlst_TimerScrnDraw_c::changeNumberTexture(J2DPane* i_pane, int i_num) { + if (i_num < 0 || i_num >= 10) { + i_num = 0; + } + + dComIfGp_getMain2DArchive()->getResource('TIMG', getNumber(i_num)); + static_cast(i_pane)->changeTexture(getNumber(i_num), 0); } -#pragma pop /* 8025EECC-8025EEF0 25980C 0024+00 1/1 0/0 0/0 .text getNumber__21dDlst_TimerScrnDraw_cFi */ -const char* dDlst_TimerScrnDraw_c::getNumber(int pIndex) { - return dMeter2Info_getNumberTextureName(pIndex); +const char* dDlst_TimerScrnDraw_c::getNumber(int i_num) { + return dMeter2Info_getNumberTextureName(i_num); } -/* ############################################################################################## */ -/* 80454F4C-80454F50 00354C 0004+00 5/5 0/0 0/0 .sdata2 @4124 */ -SECTION_SDATA2 static f32 lit_4124 = 1.0f; - -/* 80454F50-80454F58 003550 0004+04 3/3 0/0 0/0 .sdata2 @4125 */ -SECTION_SDATA2 static f32 lit_4125[1 + 1 /* padding */] = { - -1.0f, - /* padding */ - 0.0f, -}; - -/* 80454F58-80454F60 003558 0008+00 7/7 0/0 0/0 .sdata2 @4627 */ -SECTION_SDATA2 static f64 lit_4627 = 4503601774854144.0 /* cast s32 to float */; - /* 8025EEF0-8025F180 259830 0290+00 1/1 0/0 0/0 .text setTimer__21dDlst_TimerScrnDraw_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setTimer(int param_0) { - nofralloc -#include "asm/d/d_timer/setTimer__21dDlst_TimerScrnDraw_cFi.s" +void dDlst_TimerScrnDraw_c::setTimer(int i_time) { + int min; + int sec; + int ms; + dMeter2Info_setTimeMs(i_time); + + sec = (i_time / 1000); + ms = i_time - sec * 1000; + min = sec / 60; + sec = sec - min * 60; + + if (min > 99) { + min = 99; + sec = 59; + ms = 999; + } + + for (int i = 0; i < 2; i++) { + if (mTimerText[0][i] != NULL) { + changeNumberTexture(mTimerText[0][i], min / 10); + } + + if (mTimerText[1][i] != NULL) { + changeNumberTexture(mTimerText[1][i], min % 10); + } + + if (mTimerText[2][i] != NULL) { + changeNumberTexture(mTimerText[2][i], sec / 10); + } + + if (mTimerText[3][i] != NULL) { + changeNumberTexture(mTimerText[3][i], sec % 10); + } + + if (mTimerText[4][i] != NULL) { + changeNumberTexture(mTimerText[4][i], ms / 100); + } + + if (mTimerText[5][i] != NULL) { + changeNumberTexture(mTimerText[5][i], (ms % 100) / 10); + } + } + + if (mpTimeParent != NULL) { + if ((dComIfGp_event_getMode() == 1 && field_0x3DF != 0) || !isVisible()) { + s16 alpha_time = mpTimeParent->getAlphaTimer(); + if (alpha_time < 5) { + f32 temp_f0 = acc(5, 5 - (s16)(alpha_time + 1), 0); + mpTimeParent->setAlphaRate(mParentAlpha * + (temp_f0 * g_drawHIO.mMiniGame.mTimerAlpha[mHIOType])); + mpTimeParent->alphaAnimeStart(alpha_time + 1); + } + } else { + s16 alpha_time = mpTimeParent->getAlphaTimer(); + if (alpha_time > 0) { + f32 temp_f0 = acc(5, 5 - (s16)(alpha_time - 1), 0); + mpTimeParent->setAlphaRate(mParentAlpha * + (temp_f0 * g_drawHIO.mMiniGame.mTimerAlpha[mHIOType])); + mpTimeParent->alphaAnimeStart(alpha_time - 1); + } + } + } } -#pragma pop /* 8025F180-8025FA00 259AC0 0880+00 1/1 0/0 0/0 .text setCounter__21dDlst_TimerScrnDraw_cFUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setCounter(u8 param_0, u8 param_1) { - nofralloc -#include "asm/d/d_timer/setCounter__21dDlst_TimerScrnDraw_cFUcUc.s" +void dDlst_TimerScrnDraw_c::setCounter(u8 i_count, u8 i_max) { + bool var_r30 = false; + + if (field_0x3D4 > 0) { + field_0x3D4--; + var_r30 = true; + } + + if (i_count != field_0x3CC || var_r30) { + if (i_count < field_0x3CC) { + field_0x3CC--; + + if (field_0x3C8 == 3 || field_0x3C8 == 4) { + field_0x3D4 = 60; + } + } else if (i_count > field_0x3CC) { + field_0x3CC++; + + if (field_0x3D4 > 0) { + field_0x3D4 = 0; + } + } + + if (field_0x3CC < 0) { + field_0x3CC = 0; + } + + if (field_0x3CC > 99) { + field_0x3CC = 99; + } + + int temp_r29 = field_0x3CC % 10; + int temp_r28 = (field_0x3CC % 100) / 10; + + for (int i = 0; i < 2; i++) { + if (field_0x74[i] != NULL) { + changeNumberTexture(field_0x74[i], temp_r29); + + if (var_r30) { + if (field_0x3D4 > 0) { + field_0x74[i]->setCornerColor(JUtility::TColor(255, 0, 0, 255), + JUtility::TColor(255, 0, 0, 255), + JUtility::TColor(255, 255, 255, 255), + JUtility::TColor(255, 255, 255, 255)); + } else { + field_0x74[i]->setCornerColor(JUtility::TColor(255, 255, 0, 255), + JUtility::TColor(255, 255, 0, 255), + JUtility::TColor(255, 255, 255, 255), + JUtility::TColor(255, 255, 255, 255)); + } + } + } + + if (field_0x6c[i] != NULL) { + changeNumberTexture(field_0x6c[i], temp_r28); + + if (var_r30) { + if (field_0x3D4 > 0) { + field_0x6c[i]->setCornerColor(JUtility::TColor(255, 0, 0, 255), + JUtility::TColor(255, 0, 0, 255), + JUtility::TColor(255, 255, 255, 255), + JUtility::TColor(255, 255, 255, 255)); + } else { + field_0x6c[i]->setCornerColor(JUtility::TColor(255, 255, 0, 255), + JUtility::TColor(255, 255, 0, 255), + JUtility::TColor(255, 255, 255, 255), + JUtility::TColor(255, 255, 255, 255)); + } + } + } + } + } + + if (i_max != field_0x3D0) { + if (i_max < field_0x3D0) { + field_0x3D0--; + } else { + field_0x3D0++; + } + + if (field_0x3D0 < 0) { + field_0x3D0 = 0; + } + + if (field_0x3D0 > 99) { + field_0x3D0 = 99; + } + + int temp_r27 = field_0x3D0 % 10; + int temp_r28_2 = (field_0x3D0 % 100) / 10; + + for (int i = 0; i < 2; i++) { + if (field_0x5c[1][i] != NULL) { + changeNumberTexture(field_0x5c[1][i], temp_r27); + } + + if (field_0x5c[0][i] != NULL) { + changeNumberTexture(field_0x5c[0][i], temp_r28_2); + } + } + } + + if ((dComIfGp_event_getMode() == 1 && field_0x3E0 != 0) || !isVisible()) { + if (mpCowParent != NULL) { + s16 alpha_time = mpCowParent->getAlphaTimer(); + + if (alpha_time < 5) { + alpha_time++; + f32 var_f0 = 1.0f - acc(5, alpha_time, 0); + mpCowParent->setAlphaRate(mParentAlpha * + (var_f0 * g_drawHIO.mMiniGame.mCounterAlpha[mHIOType])); + mpCowParent->alphaAnimeStart(alpha_time); + } + } + + if (mpImageParent != NULL) { + s16 alpha_time = mpImageParent->getAlphaTimer(); + + if (alpha_time < 5) { + alpha_time++; + f32 var_f0 = 1.0f - acc(5, alpha_time, 0); + mpImageParent->setAlphaRate(mParentAlpha * + (var_f0 * g_drawHIO.mMiniGame.mIconAlpha[mHIOType])); + mpImageParent->alphaAnimeStart(alpha_time); + } + } + } else { + if (mpCowParent != NULL) { + s16 alpha_time = mpCowParent->getAlphaTimer(); + + if (alpha_time > 0) { + alpha_time--; + f32 var_f0 = 1.0f - acc(5, alpha_time, 0); + mpCowParent->setAlphaRate(mParentAlpha * + (var_f0 * g_drawHIO.mMiniGame.mCounterAlpha[mHIOType])); + mpCowParent->alphaAnimeStart(alpha_time); + } + } + + if (mpImageParent != NULL) { + s16 alpha_time = mpImageParent->getAlphaTimer(); + + if (alpha_time > 0) { + alpha_time--; + f32 var_f0 = 1.0f - acc(5, alpha_time, 0); + mpImageParent->setAlphaRate(mParentAlpha * + (var_f0 * g_drawHIO.mMiniGame.mIconAlpha[mHIOType])); + mpImageParent->alphaAnimeStart(alpha_time); + } + } + } } -#pragma pop /* 8025FA00-8025FA2C 25A340 002C+00 1/1 0/0 0/0 .text setParentPos__21dDlst_TimerScrnDraw_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setParentPos(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/d_timer/setParentPos__21dDlst_TimerScrnDraw_cFff.s" +void dDlst_TimerScrnDraw_c::setParentPos(f32 i_posX, f32 i_posY) { + if (mpParent != NULL) { + mpParent->paneTrans(i_posX, i_posY); + } } -#pragma pop /* 8025FA2C-8025FA6C 25A36C 0040+00 4/4 0/0 0/0 .text setTimerPos__21dDlst_TimerScrnDraw_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setTimerPos(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/d_timer/setTimerPos__21dDlst_TimerScrnDraw_cFff.s" +void dDlst_TimerScrnDraw_c::setTimerPos(f32 i_posX, f32 i_posY) { + if (mpTimeParent != NULL) { + mpTimeParent->paneTrans(i_posX + mTimerTransX, i_posY + mTimerTransY); + } } -#pragma pop /* 8025FA6C-8025FA98 25A3AC 002C+00 4/4 0/0 0/0 .text setCounterPos__21dDlst_TimerScrnDraw_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setCounterPos(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/d_timer/setCounterPos__21dDlst_TimerScrnDraw_cFff.s" +void dDlst_TimerScrnDraw_c::setCounterPos(f32 i_posX, f32 i_posY) { + if (mpCowParent != NULL) { + mpCowParent->paneTrans(i_posX, i_posY); + } } -#pragma pop /* 8025FA98-8025FAC4 25A3D8 002C+00 4/4 0/0 0/0 .text setImagePos__21dDlst_TimerScrnDraw_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setImagePos(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/d_timer/setImagePos__21dDlst_TimerScrnDraw_cFff.s" +void dDlst_TimerScrnDraw_c::setImagePos(f32 i_posX, f32 i_posY) { + if (mpImageParent != NULL) { + mpImageParent->paneTrans(i_posX, i_posY); + } } -#pragma pop /* 8025FAC4-8025FB74 25A404 00B0+00 2/2 0/0 0/0 .text setShowType__21dDlst_TimerScrnDraw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::setShowType(u8 param_0) { - nofralloc -#include "asm/d/d_timer/setShowType__21dDlst_TimerScrnDraw_cFUc.s" +void dDlst_TimerScrnDraw_c::setShowType(u8 i_type) { + dComIfG_setTimerType(i_type); + + if (mpTimeParent != NULL) { + if (i_type & 1) { + mpTimeParent->show(); + } else { + mpTimeParent->hide(); + } + } + + if (i_type & 2) { + if (mpCowParent != NULL) { + mpCowParent->show(); + } + + if (mpImageParent != NULL) { + mpImageParent->show(); + } + } else { + if (mpCowParent != NULL) { + mpCowParent->hide(); + } + + if (mpImageParent != NULL) { + mpImageParent->hide(); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80454F60-80454F68 003560 0006+02 1/1 0/0 0/0 .sdata2 animeFrame$5017 */ -SECTION_SDATA2 static u8 animeFrame[6 + 2 /* padding */] = { - 0x00, - 0x07, - 0x00, - 0x0F, - 0x00, - 0x16, - /* padding */ - 0x00, - 0x00, -}; - -/* 80454F68-80454F6C 003568 0004+00 3/3 0/0 0/0 .sdata2 @5094 */ -SECTION_SDATA2 static f32 lit_5094 = -50.0f; /* 8025FB74-8025FF98 25A4B4 0424+00 1/1 0/0 0/0 .text anime__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::anime() { - nofralloc -#include "asm/d/d_timer/anime__21dDlst_TimerScrnDraw_cFv.s" -} -#pragma pop +void dDlst_TimerScrnDraw_c::anime() { + static const s16 animeFrame[] = {7, 15, 22}; -/* ############################################################################################## */ -/* 80454F6C-80454F70 00356C 0004+00 1/1 0/0 0/0 .sdata2 @5143 */ -SECTION_SDATA2 static f32 lit_5143 = 49.0f; + if (field_0x3DE == 0) { + if (field_0x3D8 <= animeFrame[2]) { + field_0x3D8++; + } else { + field_0x3DE = 1; + } + + if (field_0x3D8 <= animeFrame[1]) { + f32 temp_f31 = acc(animeFrame[1], field_0x3D8, 0); + f32 temp_f1 = (1.0f - temp_f31) * -50.0f; + + if (mpTimeParent != NULL) { + if (field_0x3e2 != 0 && mHIOType == 0) { + setTimerPos(g_drawHIO.mMiniGame.mTimerPosX_4x3 + temp_f1, + g_drawHIO.mMiniGame.mTimerPosY_4x3); + } else { + setTimerPos(g_drawHIO.mMiniGame.mTimerPosX[mHIOType] + temp_f1, + g_drawHIO.mMiniGame.mTimerPosY[mHIOType]); + } + + mpTimeParent->setAlphaRate(mParentAlpha * + (temp_f31 * g_drawHIO.mMiniGame.mTimerAlpha[mHIOType])); + + if (field_0x3e2 != 0 && mHIOType == 0) { + mpTimeParent->scale(g_drawHIO.mMiniGame.mTimerSizeX_4x3, + g_drawHIO.mMiniGame.mTimerSizeY_4x3); + } else { + mpTimeParent->scale(g_drawHIO.mMiniGame.mTimerSizeX[mHIOType], + g_drawHIO.mMiniGame.mTimerSizeY[mHIOType]); + } + } + + if (field_0x3D8 == animeFrame[1]) { + field_0x3DF = 1; + } + } + + if (field_0x3D8 > animeFrame[0] && field_0x3D8 <= animeFrame[2]) { + f32 temp_f31 = acc(animeFrame[1], field_0x3D8 - animeFrame[0], 0); + f32 temp_f1 = (1.0f - temp_f31) * -50.0f; + + if (mpCowParent != NULL) { + setCounterPos(g_drawHIO.mMiniGame.mCounterPosX[mHIOType] + temp_f1, + g_drawHIO.mMiniGame.mCounterPosY[mHIOType]); + mpCowParent->setAlphaRate(mParentAlpha * + (temp_f31 * g_drawHIO.mMiniGame.mCounterAlpha[mHIOType])); + mpCowParent->scale(g_drawHIO.mMiniGame.mCounterSizeX[mHIOType], + g_drawHIO.mMiniGame.mCounterSizeY[mHIOType]); + } + + if (mpImageParent != NULL) { + setImagePos(g_drawHIO.mMiniGame.mIconPosX[mHIOType] + temp_f1, + g_drawHIO.mMiniGame.mIconPosY[mHIOType]); + mpImageParent->setAlphaRate(mParentAlpha * + (temp_f31 * g_drawHIO.mMiniGame.mIconAlpha[mHIOType])); + mpImageParent->scale(g_drawHIO.mMiniGame.mIconSizeX[mHIOType], + g_drawHIO.mMiniGame.mIconSizeY[mHIOType]); + } + + if (field_0x3D8 == animeFrame[2]) { + field_0x3E0 = 1; + } + } + } +} /* 8025FF98-802601E4 25A8D8 024C+00 1/1 0/0 0/0 .text closeAnime__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::closeAnime() { - nofralloc -#include "asm/d/d_timer/closeAnime__21dDlst_TimerScrnDraw_cFv.s" +BOOL dDlst_TimerScrnDraw_c::closeAnime() { + BOOL var_r31 = false; + field_0x3D8++; + + if (field_0x3D8 <= 7) { + f32 temp_f31 = acc(7, field_0x3D8, 0); + f32 temp_f30 = acc(7, 7 - field_0x3D8, 0); + f32 temp_f1 = temp_f31 * -50.0f; + + if (mpTimeParent != NULL) { + if (field_0x3e2 != 0 && mHIOType == 0) { + setTimerPos(g_drawHIO.mMiniGame.mTimerPosX_4x3 + temp_f1, + g_drawHIO.mMiniGame.mTimerPosY_4x3); + } else { + setTimerPos(g_drawHIO.mMiniGame.mTimerPosX[mHIOType] + temp_f1, + g_drawHIO.mMiniGame.mTimerPosY[mHIOType]); + } + + mpTimeParent->setAlphaRate(mParentAlpha * + (temp_f30 * g_drawHIO.mMiniGame.mTimerAlpha[mHIOType])); + } + + if (mpCowParent != NULL) { + setCounterPos(g_drawHIO.mMiniGame.mCounterPosX[mHIOType] + temp_f1, + g_drawHIO.mMiniGame.mCounterPosY[mHIOType]); + mpCowParent->setAlphaRate(mParentAlpha * + (temp_f30 * g_drawHIO.mMiniGame.mCounterAlpha[mHIOType])); + } + + if (mpImageParent != NULL) { + setImagePos(g_drawHIO.mMiniGame.mIconPosX[mHIOType] + temp_f1, + g_drawHIO.mMiniGame.mIconPosY[mHIOType]); + mpImageParent->setAlphaRate(mParentAlpha * + (temp_f30 * g_drawHIO.mMiniGame.mIconAlpha[mHIOType])); + } + } + + if (field_0x3D8 >= 7) { + var_r31 = true; + } + + return var_r31; } -#pragma pop - -/* ############################################################################################## */ -/* 80454F70-80454F74 003570 0004+00 3/3 0/0 0/0 .sdata2 @5227 */ -SECTION_SDATA2 static f32 lit_5227 = 40.0f; - -/* 80454F74-80454F78 003574 0004+00 2/2 0/0 0/0 .sdata2 @5228 */ -SECTION_SDATA2 static f32 lit_5228 = 60.0f; - -/* 80454F78-80454F7C 003578 0004+00 1/1 0/0 0/0 .sdata2 @5229 */ -SECTION_SDATA2 static f32 lit_5229 = -100.0f; - -/* 80454F7C-80454F80 00357C 0004+00 1/1 0/0 0/0 .sdata2 @5230 */ -SECTION_SDATA2 static f32 lit_5230 = 100.0f; - -/* 80454F80-80454F84 003580 0004+00 1/1 0/0 0/0 .sdata2 @5231 */ -SECTION_SDATA2 static f32 lit_5231 = 75.0f; - -/* 80454F84-80454F88 003584 0004+00 1/1 0/0 0/0 .sdata2 @5232 */ -SECTION_SDATA2 static f32 lit_5232 = -75.0f; - -/* 80454F88-80454F8C 003588 0004+00 1/1 0/0 0/0 .sdata2 @5233 */ -SECTION_SDATA2 static f32 lit_5233 = 200.0f; - -/* 80454F8C-80454F90 00358C 0004+00 1/1 0/0 0/0 .sdata2 @5234 */ -SECTION_SDATA2 static f32 lit_5234 = 150.0f; - -/* 80454F90-80454F94 003590 0004+00 1/1 0/0 0/0 .sdata2 @5235 */ -SECTION_SDATA2 static f32 lit_5235 = 20.0f; /* 802601E4-80260574 25AB24 0390+00 2/1 0/0 0/0 .text createGetIn__21dDlst_TimerScrnDraw_cF4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::createGetIn(cXyz param_0) { - nofralloc -#include "asm/d/d_timer/createGetIn__21dDlst_TimerScrnDraw_cF4cXyz.s" +int dDlst_TimerScrnDraw_c::createGetIn(cXyz i_pos) { + char string[104]; + dMeter2Info_getString(0x3E4, string, NULL); // "GOAT IN!" + strcpy(static_cast(mpGetInScreen->search('get_in_s'))->getStringPtr(), string); + strcpy(static_cast(mpGetInScreen->search('get_in'))->getStringPtr(), string); + + if (mCowID < 50) { + m_getin_info[mCowID].bck_frame = 40.0f; + m_getin_info[mCowID].pikari_frame = -1.0f; + + if (g_drawHIO.mMiniGame.mGetInTextLocation == 1) { + m_getin_info[mCowID].pos_x = i_pos.x; + m_getin_info[mCowID].pos_y = i_pos.y; + } else { + u8 spC[50]; + for (int i = 0; i < 50; i++) { + spC[i] = 0; + } + + f32 temp = (f32)g_drawHIO.mMiniGame.mGetInTextAlphaFrames + + ((f32)g_drawHIO.mMiniGame.mGetInTextWaitFrames + 60.0f); + + for (int i = 0; i < mCowID; i++) { + if (m_getin_info[i].bck_frame > 40.0f && m_getin_info[i].bck_frame < temp) { + if (m_getin_info[i].field_0xd != 0xFF) { + spC[m_getin_info[i].field_0xd] = 1; + } + } + } + + for (int i = 0; i < 50; i++) { + if (spC[i] == 0) { + m_getin_info[mCowID].field_0xd = i; + break; + } + } + + f32 pos_x = 0.0f; + f32 pos_y = 0.0f; + switch (m_getin_info[mCowID].field_0xd) { + case 0: + break; + case 1: + pos_x = -100.0f; + break; + case 2: + pos_x = 100.0f; + break; + case 3: + pos_y = 75.0f; + break; + case 4: + pos_x = -100.0f; + pos_y = 75.0f; + break; + case 5: + pos_x = 100.0f; + pos_y = 75.0f; + break; + case 6: + pos_y = -50.0f; + break; + case 7: + pos_x = -100.0f; + pos_y = -75.0f; + break; + case 8: + pos_x = 100.0f; + pos_y = -75.0f; + break; + default: + pos_x = cM_rndFX(200.0f); + pos_y = cM_rndFX(150.0f); + break; + } + + m_getin_info[mCowID].pos_x = pos_x + cM_rndFX(20.0f); + m_getin_info[mCowID].pos_y = pos_y + cM_rndFX(20.0f); + } + + m_getin_info[mCowID].field_0xc = 0; + Z2GetAudioMgr()->seStart(Z2SE_SY_COW_GET_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + mCowID++; + return 1; + } + + return 0; } -#pragma pop /* 80260574-80260690 25AEB4 011C+00 3/3 0/0 0/0 .text createStart__21dDlst_TimerScrnDraw_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 dDlst_TimerScrnDraw_c::createStart(u16 param_0) { - nofralloc -#include "asm/d/d_timer/createStart__21dDlst_TimerScrnDraw_cFUs.s" +s32 dDlst_TimerScrnDraw_c::createStart(u16 i_messageID) { + char string[112]; + dMeter2Info_getString(i_messageID, string, NULL); + strcpy(static_cast(mpGetInScreen->search('get_in_s'))->getStringPtr(), string); + strcpy(static_cast(mpGetInScreen->search('get_in'))->getStringPtr(), string); + + if (mCowID == 0) { + m_getin_info[mCowID].bck_frame = 40.0f; + m_getin_info[mCowID].pikari_frame = -1.0f; + m_getin_info[mCowID].pos_x = 0; + m_getin_info[mCowID].pos_y = 0; + m_getin_info[mCowID].field_0xc = 1; + mCowID++; + return 1; + } + + return 0; } -#pragma pop - -/* ############################################################################################## */ -/* 80454F94-80454F98 003594 0004+00 1/1 0/0 0/0 .sdata2 @5325 */ -SECTION_SDATA2 static f32 lit_5325 = 3.0f / 20.0f; - -/* 80454F98-80454F9C 003598 0004+00 2/2 0/0 0/0 .sdata2 @5326 */ -SECTION_SDATA2 static f32 lit_5326 = 0.5f; - -/* 80454F9C-80454FA0 00359C 0004+00 1/1 0/0 0/0 .sdata2 @5327 */ -SECTION_SDATA2 static f32 lit_5327 = 18.0f; /* 80260690-80260AA8 25AFD0 0418+00 1/0 0/0 0/0 .text draw__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::draw() { - nofralloc -#include "asm/d/d_timer/draw__21dDlst_TimerScrnDraw_cFv.s" +void dDlst_TimerScrnDraw_c::draw() { + J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort(); + graf_ctx->setup2D(); + + mpScreen->draw(0.0f, 0.0f, graf_ctx); + + f32 temp = (f32)g_drawHIO.mMiniGame.mGetInTextAlphaFrames + + ((f32)g_drawHIO.mMiniGame.mGetInTextWaitFrames + 60.0f); + + for (int i = 0; i < 51; i++) { + if (m_getin_info[i].bck_frame > 0.0f && m_getin_info[i].bck_frame < temp) { + f32 var_f29 = 1.0f; + + if (m_getin_info[i].bck_frame < 60.0f) { + m_getin_info[i].bck_frame += g_drawHIO.mMiniGame.mGetInTextAnimSpeed; + if (m_getin_info[i].bck_frame > 60.0f) { + m_getin_info[i].bck_frame = 60.0f; + } + + playBckAnimation(m_getin_info[i].bck_frame); + } else if (m_getin_info[i].bck_frame < g_drawHIO.mMiniGame.mGetInTextWaitFrames + 60.0f) + { + m_getin_info[i].bck_frame++; + playBckAnimation(60.0f); + } else if (m_getin_info[i].bck_frame < temp) { + m_getin_info[i].bck_frame++; + playBckAnimation(60.0f); + + var_f29 = acc(g_drawHIO.mMiniGame.mGetInTextAlphaFrames, + temp - m_getin_info[i].bck_frame, 0); + } + + mpGetInParent->setAlphaRate(var_f29); + + if (g_drawHIO.mMiniGame.mGetInTextLocation == 1) { + mpGetInRoot->translate(m_getin_info[i].pos_x + g_drawHIO.mMiniGame.mGetInTextPosX, + m_getin_info[i].pos_y + g_drawHIO.mMiniGame.mGetInTextPosY); + } else { + f32 temp_f2 = m_getin_info[i].bck_frame - 40.0f; + f32 var_f3 = ((temp_f2 * 0.5f) * temp_f2) * 0.15f; + if (i == 0) { + var_f3 = 0.0f; + } + + mpGetInRoot->paneTrans( + m_getin_info[i].pos_x + g_drawHIO.mMiniGame.mGetInTextPosX, + (m_getin_info[i].pos_y + g_drawHIO.mMiniGame.mGetInTextPosY) - var_f3); + } + + mpGetInRoot->scale(g_drawHIO.mMiniGame.mGetInTextSizeX, + g_drawHIO.mMiniGame.mGetInTextSizeY); + mpGetInScreen->draw(0.0f, 0.0f, graf_ctx); + + if (m_getin_info[i].pikari_frame > 0.0f) { + drawPikari(i); + } else if (m_getin_info[i].pikari_frame == -1.0f) { + if (m_getin_info[i].field_0xc == 0) { + if (m_getin_info[i].bck_frame > g_drawHIO.mMiniGame.mGetInPikariAppearFrames) { + m_getin_info[i].pikari_frame = + 18.0f - g_drawHIO.mMiniGame.mGetInPikariAnimSpeed; + } + } else if (m_getin_info[i].bck_frame > g_drawHIO.mMiniGame.mStartPikariAppearFrames) + { + m_getin_info[i].pikari_frame = + 18.0f - g_drawHIO.mMiniGame.mStartPikariAnimSpeed; + } + } + } + } } -#pragma pop /* 80260AA8-80260AD4 25B3E8 002C+00 1/1 0/0 0/0 .text * checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::checkStartAnimeEnd() { - nofralloc -#include "asm/d/d_timer/checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv.s" +bool dDlst_TimerScrnDraw_c::checkStartAnimeEnd() { + if (m_getin_info[0].field_0xc == 1 && m_getin_info[0].pikari_frame == 0.0f) { + return true; + } + + return false; } -#pragma pop /* 80260AD4-80260B54 25B414 0080+00 2/2 0/0 0/0 .text playBckAnimation__21dDlst_TimerScrnDraw_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::playBckAnimation(f32 param_0) { - nofralloc -#include "asm/d/d_timer/playBckAnimation__21dDlst_TimerScrnDraw_cFf.s" +void dDlst_TimerScrnDraw_c::playBckAnimation(f32 i_frame) { + mpGetInParent->getPanePtr()->setAnimation(mpGetInBck); + mpGetInBck->setFrame(i_frame); + + mpGetInParent->getPanePtr()->animationTransform(); + mpGetInParent->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); } -#pragma pop /* 80260B54-80260F04 25B494 03B0+00 1/1 0/0 0/0 .text drawPikari__21dDlst_TimerScrnDraw_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::drawPikari(int param_0) { - nofralloc -#include "asm/d/d_timer/drawPikari__21dDlst_TimerScrnDraw_cFi.s" +void dDlst_TimerScrnDraw_c::drawPikari(int i_no) { + f32 temp_f28; + f32 anim_frame; + f32 var_f26; + f32 var_f29; + + anim_frame = m_getin_info[i_no].pikari_frame; + Vec center = mpGetInText->getGlobalVtxCenter(false, 0); + char* string = static_cast(mpGetInText->getPanePtr())->getStringPtr(); + s16 str_idx = 0; + + var_f29 = 0.0f; + var_f26 = 0.0f; + J2DTextBox::TFontSize font_size; + static_cast(mpGetInText->getPanePtr())->getFontSize(font_size); + JUTFont* font_p = mDoExt_getMesgFont(); + + f32 var_f25 = 1.0f; + for (J2DPane* pane = mpGetInText->getPanePtr(); pane != NULL; pane = pane->getParentPane()) { + var_f25 *= pane->getScaleX(); + } + + for (; string[str_idx] != 0; str_idx++) { + if (str_idx > 0) { + var_f29 += + var_f25 * static_cast(mpGetInText->getPanePtr())->getCharSpace(); + } + + int c = string[str_idx] & 0xFF; + + var_f29 += + var_f25 * (font_size.mSizeX * ((f32)font_p->getWidth(c) / (f32)font_p->getCellWidth())); + } + + temp_f28 = center.x - (var_f29 / 2); + f32 frame; + + for (str_idx = 0; string[str_idx] != 0; str_idx++) { + if (str_idx > 0) { + var_f26 += + var_f25 * static_cast(mpGetInText->getPanePtr())->getCharSpace(); + } + + int c = string[str_idx] & 0xFF; + + f32 temp_f24 = + var_f25 * (font_size.mSizeX * ((f32)font_p->getWidth(c) / (f32)font_p->getCellWidth())); + if (c != 0x20 && c != 0x8140) { + frame = anim_frame; + if (m_getin_info[i_no].field_0xc == 0) { + dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( + (temp_f24 / 2) + (temp_f28 + var_f26), center.y, &frame, + g_drawHIO.mMiniGame.mGetInPikariScale, + g_drawHIO.mMiniGame.mGetInPikariFrontOuter, + g_drawHIO.mMiniGame.mGetInPikariFrontInner, + g_drawHIO.mMiniGame.mGetInPikariBackOuter, + g_drawHIO.mMiniGame.mGetInPikariBackInner, + g_drawHIO.mMiniGame.mGetInPikariAnimSpeed, 0); + } else { + dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( + (temp_f24 / 2) + (temp_f28 + var_f26), center.y, &frame, + g_drawHIO.mMiniGame.mStartPikariScale, + g_drawHIO.mMiniGame.mStartPikariFrontOuter, + g_drawHIO.mMiniGame.mStartPikariFrontInner, + g_drawHIO.mMiniGame.mStartPikariBackOuter, + g_drawHIO.mMiniGame.mStartPikariBackInner, + g_drawHIO.mMiniGame.mStartPikariAnimSpeed, 0); + } + } + + var_f26 += temp_f24; + } + + m_getin_info[i_no].pikari_frame = frame; } -#pragma pop /* 80260F04-80260F24 25B844 0020+00 1/0 0/0 0/0 .text dTimer_Draw__FP8dTimer_c */ -static void dTimer_Draw(dTimer_c* i_this) { - i_this->_draw(); +static int dTimer_Draw(dTimer_c* i_this) { + return i_this->_draw(); } /* 80260F24-80260F44 25B864 0020+00 1/0 0/0 0/0 .text dTimer_Execute__FP8dTimer_c */ -static void dTimer_Execute(dTimer_c* i_this) { - i_this->_execute(); +static int dTimer_Execute(dTimer_c* i_this) { + return i_this->_execute(); } /* 80260F44-80260F4C 25B884 0008+00 1/0 0/0 0/0 .text dTimer_IsDelete__FP8dTimer_c */ -static bool dTimer_IsDelete(dTimer_c* i_this) { - return true; +static int dTimer_IsDelete(dTimer_c* i_this) { + return 1; } /* 80260F4C-80260F6C 25B88C 0020+00 1/0 0/0 0/0 .text dTimer_Delete__FP8dTimer_c */ -static void dTimer_Delete(dTimer_c* i_this) { - i_this->_delete(); +static int dTimer_Delete(dTimer_c* i_this) { + return i_this->_delete(); } /* 80260F6C-80260F8C 25B8AC 0020+00 1/0 0/0 0/0 .text dTimer_Create__FP9msg_class */ -static void dTimer_Create(msg_class* i_this) { - ((dTimer_c*)i_this)->_create(); +static int dTimer_Create(msg_class* i_this) { + return static_cast(i_this)->_create(); } /* 80260F8C-80261034 25B8CC 00A8+00 0/0 1/1 9/9 .text dTimer_createTimer__FlUlUcUcffff */ -s32 dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f32 param_4, f32 param_5, +s32 dTimer_createTimer(s32 i_mode, u32 i_limitMs, u8 i_type, u8 param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7) { if (dComIfG_getTimerMode() == -1) { - return fopMsgM_Timer_create(PROC_TIMER, param_0, param_1, param_2, param_3, param_4, - param_5, param_6, param_7, 0); + return fopMsgM_Timer_create(PROC_TIMER, i_mode, i_limitMs, i_type, param_3, param_4, + param_5, param_6, param_7, NULL); } return -1; } -/* ############################################################################################## */ -/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A47C = "F_SP115"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A484 = "\0\0\0"; -#pragma pop - -/* 80454FA0-80454FA4 0035A0 0004+00 1/1 0/0 0/0 .sdata2 @5544 */ -SECTION_SDATA2 static f32 lit_5544 = 221.0f; - -/* 80454FA4-80454FA8 0035A4 0004+00 1/1 0/0 0/0 .sdata2 @5545 */ -SECTION_SDATA2 static f32 lit_5545 = 439.0f; - -/* 80454FA8-80454FAC 0035A8 0004+00 1/1 0/0 0/0 .sdata2 @5546 */ -SECTION_SDATA2 static f32 lit_5546 = 32.0f; - -/* 80454FAC-80454FB0 0035AC 0004+00 1/1 0/0 0/0 .sdata2 @5547 */ -SECTION_SDATA2 static f32 lit_5547 = 419.0f; /* 80261034-80261100 25B974 00CC+00 0/0 1/1 0/0 .text dTimer_createStockTimer__Fv */ s32 dTimer_createStockTimer() { @@ -843,9 +1585,8 @@ s32 dTimer_createStockTimer() { return -1; } else { u8 timer_type = dComIfG_getTimerType(); - return fopMsgM_Timer_create(PROC_TIMER, 10, 0, timer_type, 0, FLOAT_LABEL(lit_5544), - FLOAT_LABEL(lit_5545), FLOAT_LABEL(lit_5546), - FLOAT_LABEL(lit_5547), 0); + return fopMsgM_Timer_create(PROC_TIMER, 10, 0, timer_type, 0, 221.0f, 439.0f, 32.0f, + 419.0f, NULL); } } else { return -1; @@ -853,11 +1594,11 @@ s32 dTimer_createStockTimer() { } /* 80261100-80261188 25BA40 0088+00 0/0 0/0 1/1 .text dTimer_createGetIn2D__Fl4cXyz */ -u32 dTimer_createGetIn2D(s32 param_0, cXyz param_1) { - if (dComIfG_getTimerPtr()) { - cXyz tmp; - mDoLib_project(¶m_1, &tmp); - param_0 = dComIfG_getTimerPtr()->createGetIn(tmp); +u32 dTimer_createGetIn2D(s32 param_0, cXyz i_pos) { + if (dComIfG_getTimerPtr() != NULL) { + cXyz proj_pos; + mDoLib_project(&i_pos, &proj_pos); + param_0 = dComIfG_getTimerPtr()->createGetIn(proj_pos); } else { param_0 = 0; } @@ -867,7 +1608,7 @@ u32 dTimer_createGetIn2D(s32 param_0, cXyz param_1) { /* 80261188-802611F0 25BAC8 0068+00 1/1 0/0 0/0 .text dTimer_createStart2D__FlUs */ static int dTimer_createStart2D(s32 param_0, u16 param_1) { - if (dComIfG_getTimerPtr()) { + if (dComIfG_getTimerPtr() != NULL) { param_0 = dComIfG_getTimerPtr()->createStart(param_1); } else { param_0 = 0; @@ -878,7 +1619,7 @@ static int dTimer_createStart2D(s32 param_0, u16 param_1) { /* 802611F0-80261244 25BB30 0054+00 0/0 0/0 5/5 .text dTimer_isStart__Fv */ int dTimer_isStart() { - if (dComIfG_getTimerPtr()) { + if (dComIfG_getTimerPtr() != NULL) { return dComIfG_getTimerPtr()->isStart(); } @@ -887,7 +1628,7 @@ int dTimer_isStart() { /* 80261244-80261298 25BB84 0054+00 0/0 0/0 2/2 .text dTimer_getRestTimeMs__Fv */ int dTimer_getRestTimeMs() { - if (dComIfG_getTimerPtr()) { + if (dComIfG_getTimerPtr() != NULL) { return dComIfG_getTimerPtr()->getRestTimeMs(); } @@ -896,21 +1637,21 @@ int dTimer_getRestTimeMs() { /* 80261298-802612EC 25BBD8 0054+00 0/0 0/0 2/2 .text dTimer_show__Fv */ void dTimer_show() { - if (dComIfG_getTimerPtr()) { + if (dComIfG_getTimerPtr() != NULL) { dComIfG_getTimerPtr()->show(); } } /* 802612EC-80261340 25BC2C 0054+00 0/0 0/0 2/2 .text dTimer_hide__Fv */ void dTimer_hide() { - if (dComIfG_getTimerPtr()) { + if (dComIfG_getTimerPtr() != NULL) { dComIfG_getTimerPtr()->hide(); } } /* 80261340-80261394 25BC80 0054+00 0/0 0/0 1/1 .text dTimer_isReadyFlag__Fv */ u32 dTimer_isReadyFlag() { - if (dComIfG_getTimerPtr()) { + if (dComIfG_getTimerPtr() != NULL) { return dComIfG_getTimerPtr()->isReadyFlag(); } @@ -918,23 +1659,31 @@ u32 dTimer_isReadyFlag() { } /* 80261394-802613DC 25BCD4 0048+00 1/0 0/0 0/0 .text __dt__21dDlst_TimerScrnDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDlst_TimerScrnDraw_c::~dDlst_TimerScrnDraw_c() { - nofralloc -#include "asm/d/d_timer/__dt__21dDlst_TimerScrnDraw_cFv.s" -} -#pragma pop +dDlst_TimerScrnDraw_c::~dDlst_TimerScrnDraw_c() {} /* 802613DC-8026141C 25BD1C 0040+00 1/1 0/0 0/0 .text createGetIn__8dTimer_cF4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dTimer_c::createGetIn(cXyz param_0) { - nofralloc -#include "asm/d/d_timer/createGetIn__8dTimer_cF4cXyz.s" +int dTimer_c::createGetIn(cXyz i_pos) { + return mp_tm_scrn->createGetIn(i_pos); } -#pragma pop -/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 803C33E4-803C33F8 -00001 0014+00 1/0 0/0 0/0 .data l_dTimer_Method */ +static leafdraw_method_class l_dTimer_Method = { + (process_method_func)dTimer_Create, (process_method_func)dTimer_Delete, + (process_method_func)dTimer_Execute, (process_method_func)dTimer_IsDelete, + (process_method_func)dTimer_Draw, +}; + +/* 803C33F8-803C3420 -00001 0028+00 0/0 0/0 1/0 .data g_profile_TIMER */ +extern msg_process_profile_definition g_profile_TIMER = { + fpcLy_CURRENT_e, + 12, + fpcPi_CURRENT_e, + PROC_TIMER, + (process_method_class*)&g_fpcLf_Method, + sizeof(dTimer_c), + 0, + 0, + &g_fopMsg_Method, + 768, + &l_dTimer_Method, +}; \ No newline at end of file diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp index 9ab770a442d..bd26300bfd5 100644 --- a/src/d/meter/d_meter_HIO.cpp +++ b/src/d/meter/d_meter_HIO.cpp @@ -474,80 +474,80 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { /* 801FEFF0-801FF31C 1F9930 032C+00 1/1 0/0 0/0 .text __ct__24dMeter_drawMiniGameHIO_cFv */ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() { - field_0x8 = 1.0f; - field_0x14 = 0.0f; - field_0x20 = 0.0f; - field_0x2c = 1.0f; + field_0x8[0] = 1.0f; + field_0x14[0] = 0.0f; + field_0x20[0] = 0.0f; + field_0x2c[0] = 1.0f; - mGoatTimerSizeX = 1.2f; - mGoatTimerSizeY = 0.9f; - mGoatTimerPosX = 207.0f; - mGoatTimerPosY = -43.0f; - mGoatTimerAlpha = 0.5f; - mGoatTimerSizeX_4x3 = 1.2f; - mGoatTimerSizeY_4x3 = 0.9f; - mGoatTimerPosX_4x3 = 207.0f; - mGoatTimerPosY_4x3 = -43.0f; + mTimerSizeX[0] = 1.2f; + mTimerSizeY[0] = 0.9f; + mTimerPosX[0] = 207.0f; + mTimerPosY[0] = -43.0f; + mTimerAlpha[0] = 0.5f; + mTimerSizeX_4x3 = 1.2f; + mTimerSizeY_4x3 = 0.9f; + mTimerPosX_4x3 = 207.0f; + mTimerPosY_4x3 = -43.0f; - mGoatCounterSizeX = 1.1f; - mGoatCounterSizeY = 0.9f; - mGoatCounterPosX = 17.0f; - mGoatCounterPosY = 317.0f; - mGoatCounterAlpha = 0.7f; + mCounterSizeX[0] = 1.1f; + mCounterSizeY[0] = 0.9f; + mCounterPosX[0] = 17.0f; + mCounterPosY[0] = 317.0f; + mCounterAlpha[0] = 0.7f; - mGoatIconSizeX = 0.75f; - mGoatIconSizeY = 0.75f; - mGoatIconPosX = -275.0f; - mGoatIconPosX_4x3 = -275.0f; - mGoatIconPosY = 76.0f; - mGoatIconAlpha = 0.9f; + mIconSizeX[0] = 0.75f; + mIconSizeY[0] = 0.75f; + mIconPosX[0] = -275.0f; + mIconPosX_4x3 = -275.0f; + mIconPosY[0] = 76.0f; + mIconAlpha[0] = 0.9f; - mRiverRideTargetCounterSizeY = 1.0f; - mRiverRideTargetCounterPosX = -22.0f; + field_0x8[1] = 1.0f; + field_0x14[1] = -22.0f; mRiverRideIconPosX_4x3 = -30.0f; - mRiverRideTargetCounterPosY = 0.0f; - mRiverRideTargetCounterAlpha = 1.0f; + field_0x20[1] = 0.0f; + field_0x2c[1] = 1.0f; - field_0x3c = 1.4f; - field_0x48 = 1.0f; - field_0x54 = 198.0f; - field_0x60 = 160.0f; - field_0x6c = 0.5f; + mTimerSizeX[1] = 1.4f; + mTimerSizeY[1] = 1.0f; + mTimerPosX[1] = 198.0f; + mTimerPosY[1] = 160.0f; + mTimerAlpha[1] = 0.5f; - mRiverRideCounterSizeX = 1.1f; - mRiverRideCounterSizeY = 0.95f; - mRiverRideCounterPosX = 28.0f; - mRiverRideCounterPosY = -18.0f; - mRiverRideCounterAlpha = 0.7f; + mCounterSizeX[1] = 1.1f; + mCounterSizeY[1] = 0.95f; + mCounterPosX[1] = 28.0f; + mCounterPosY[1] = -18.0f; + mCounterAlpha[1] = 0.7f; - mRiverRideTargetIconSizeX = 0.9f; - mRiverRideTargetIconSizeY = 0.9f; - mRiverRideTargetIconPosX = 23.0f; - mRiverRideTargetIconPosY = -16.0f; - mRiverRideTargetIconAlpha = 0.9f; + mIconSizeX[1] = 0.9f; + mIconSizeY[1] = 0.9f; + mIconPosX[1] = 23.0f; + mIconPosY[1] = -16.0f; + mIconAlpha[1] = 0.9f; - field_0x10 = 1.0f; - field_0x1c = 0.0f; - field_0x28 = 0.0f; - field_0x34 = 1.0f; - field_0x40 = 1.4f; - field_0x4c = 1.0f; - field_0x58 = 198.0f; - field_0x64 = -30.0f; - field_0x70 = 0.5f; + field_0x8[2] = 1.0f; + field_0x14[2] = 0.0f; + field_0x20[2] = 0.0f; + field_0x2c[2] = 1.0f; + mTimerSizeX[2] = 1.4f; + mTimerSizeY[2] = 1.0f; + mTimerPosX[2] = 198.0f; + mTimerPosY[2] = -30.0f; + mTimerAlpha[2] = 0.5f; - mRiderGameCounterSizeX = 1.1f; - mRiderGameCounterSizeY = 0.95f; - mRiderGameCounterPosX = 267.0f; - mRiderGameCounterPosY = 288.0f; - mRiderGameCounterAlpha = 0.7f; + mCounterSizeX[2] = 1.1f; + mCounterSizeY[2] = 0.95f; + mCounterPosX[2] = 267.0f; + mCounterPosY[2] = 288.0f; + mCounterAlpha[2] = 0.7f; - mRiderGameIconSizeX = 0.75f; - mRiderGameIconSizeY = 0.75f; - mRiderGameIconPosX = -29.0f; + mIconSizeX[2] = 0.75f; + mIconSizeY[2] = 0.75f; + mIconPosX[2] = -29.0f; mRiderGameIconPosX_4x3 = -26.0f; - mRiderGameIconPosY = 50.0f; - mRiderGameIconAlpha = 0.9f; + mIconPosY[2] = 50.0f; + mIconAlpha[2] = 0.9f; mReadyGo = 60; field_0x15a = 10; diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 6c498ffe28b..5c955e7a625 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -102,31 +102,30 @@ static fopMsg_prm_class* createAppend(fopAc_ac_c* i_actor, cXyz* i_pos, u32* i_m /* 8001FB50-8001FC4C 01A490 00FC+00 1/1 0/0 0/0 .text createTimerAppend__FiUlUcUcffffUi */ -static fopMsg_prm_timer* createTimerAppend(int param_0, u32 param_1, u8 param_2, u8 param_3, +static fopMsg_prm_timer* createTimerAppend(int i_mode, u32 i_limitMs, u8 i_type, u8 param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7, unsigned int param_8) { - fopMsg_prm_timer* timer = (fopMsg_prm_timer*)cMl::memalignB(-4, 0x38); + fopMsg_prm_timer* appen = (fopMsg_prm_timer*)cMl::memalignB(-4, sizeof(fopMsg_prm_timer)); - if (timer == NULL) { - timer = NULL; + if (appen == NULL) { + appen = NULL; } else { - timer->field_0x0 = 0; - timer->field_0x10 = 0; - timer->field_0x14 = 0; - cXyz pos(FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902)); - timer->field_0x4 = pos; - timer->field_0x18 = param_8; - timer->field_0x1c = param_0; - timer->field_0x20 = param_1; - timer->field_0x24 = param_2; - timer->field_0x25 = param_3; - timer->field_0x28 = param_4; - timer->field_0x2c = param_5; - timer->field_0x30 = param_6; - timer->field_0x34 = param_7; + appen->mpActor = 0; + appen->mMsgID = 0; + appen->field_0x14 = 0; + appen->mPos = cXyz(FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902)); + appen->field_0x18 = param_8; + appen->timer_mode = i_mode; + appen->limit_ms = i_limitMs; + appen->type = i_type; + appen->field_0x25 = param_3; + appen->field_0x28 = param_4; + appen->field_0x2c = param_5; + appen->field_0x30 = param_6; + appen->field_0x34 = param_7; } - return timer; + return appen; } /* 8001FC4C-8001FCC0 01A58C 0074+00 0/0 1/1 0/0 .text @@ -143,16 +142,16 @@ s32 fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* param_3 } /* 8001FCC0-8001FD34 01A600 0074+00 0/0 2/2 0/0 .text fop_Timer_create__FsUcUlUcUcffffPFPv_i */ -s32 fop_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5, - f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc) { - fopMsg_prm_timer* timer_prm = createTimerAppend(param_1, param_2, param_3, param_4, param_5, +s32 fop_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, u8 param_4, f32 param_5, + f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc i_createFunc) { + fopMsg_prm_timer* timer_prm = createTimerAppend(i_mode, i_limitMs, i_type, param_4, param_5, param_6, param_7, param_8, -1); if (timer_prm == NULL) { return -1; } - return fpcSCtRq_Request(fpcLy_CurrentLayer(), param_0, (stdCreateFunc)createFunc, NULL, + return fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, (stdCreateFunc)i_createFunc, NULL, timer_prm); }