diff --git a/asm/d/meter/d_meter2_draw/__ct__13dMeter2Draw_cFP10JKRExpHeap.s b/asm/d/meter/d_meter2_draw/__ct__13dMeter2Draw_cFP10JKRExpHeap.s deleted file mode 100644 index 9170e4fc65..0000000000 --- a/asm/d/meter/d_meter2_draw/__ct__13dMeter2Draw_cFP10JKRExpHeap.s +++ /dev/null @@ -1,564 +0,0 @@ -lbl_8020FAB4: -/* 8020FAB4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8020FAB8 7C 08 02 A6 */ mflr r0 -/* 8020FABC 90 01 00 74 */ stw r0, 0x74(r1) -/* 8020FAC0 39 61 00 70 */ addi r11, r1, 0x70 -/* 8020FAC4 48 15 26 FD */ bl _savegpr_22 -/* 8020FAC8 7C 7F 1B 78 */ mr r31, r3 -/* 8020FACC 3C A0 80 3A */ lis r5, a_tag@ha /* 0x80398258@ha */ -/* 8020FAD0 3B 05 82 58 */ addi r24, r5, a_tag@l /* 0x80398258@l */ -/* 8020FAD4 3C A0 80 3A */ lis r5, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 8020FAD8 38 05 6F 88 */ addi r0, r5, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 8020FADC 90 03 00 00 */ stw r0, 0(r3) -/* 8020FAE0 3C A0 80 3C */ lis r5, __vt__13dMeter2Draw_c@ha /* 0x803BF750@ha */ -/* 8020FAE4 38 05 F7 50 */ addi r0, r5, __vt__13dMeter2Draw_c@l /* 0x803BF750@l */ -/* 8020FAE8 90 03 00 00 */ stw r0, 0(r3) -/* 8020FAEC 38 00 FF FF */ li r0, -1 -/* 8020FAF0 90 03 05 48 */ stw r0, 0x548(r3) -/* 8020FAF4 90 03 05 4C */ stw r0, 0x54c(r3) -/* 8020FAF8 90 83 00 74 */ stw r4, 0x74(r3) -/* 8020FAFC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020FB00 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020FB04 80 64 5E C8 */ lwz r3, 0x5ec8(r4) -/* 8020FB08 4B DF F6 C5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8020FB0C 7C 79 1B 78 */ mr r25, r3 -/* 8020FB10 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020FB14 3A E4 61 C0 */ addi r23, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020FB18 80 B7 5C F4 */ lwz r5, 0x5cf4(r23) -/* 8020FB1C 3C 80 52 4F */ lis r4, 0x524F /* 0x524F4F54@ha */ -/* 8020FB20 38 64 4F 54 */ addi r3, r4, 0x4F54 /* 0x524F4F54@l */ -/* 8020FB24 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8020FB28 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 8020FB2C 48 0C 60 0D */ bl getGlbResource__10JKRArchiveFUlPCcP10JKRArchive -/* 8020FB30 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 8020FB34 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 8020FB38 90 64 00 10 */ stw r3, 0x10(r4) -/* 8020FB3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020FB40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020FB44 83 44 5C F8 */ lwz r26, 0x5cf8(r4) -/* 8020FB48 48 02 2E F5 */ bl dMsgObject_getGroupID__Fv -/* 8020FB4C 7C 60 07 34 */ extsh r0, r3 -/* 8020FB50 54 00 10 3A */ slwi r0, r0, 2 -/* 8020FB54 3C 80 80 3C */ lis r4, bmg_filename@ha /* 0x803BF328@ha */ -/* 8020FB58 38 84 F3 28 */ addi r4, r4, bmg_filename@l /* 0x803BF328@l */ -/* 8020FB5C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8020FB60 3C A0 52 4F */ lis r5, 0x524F /* 0x524F4F54@ha */ -/* 8020FB64 38 65 4F 54 */ addi r3, r5, 0x4F54 /* 0x524F4F54@l */ -/* 8020FB68 7F 45 D3 78 */ mr r5, r26 -/* 8020FB6C 48 0C 5F CD */ bl getGlbResource__10JKRArchiveFUlPCcP10JKRArchive -/* 8020FB70 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 8020FB74 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 8020FB78 90 64 00 14 */ stw r3, 0x14(r4) -/* 8020FB7C 80 B7 5C F4 */ lwz r5, 0x5cf4(r23) -/* 8020FB80 3C 80 52 4F */ lis r4, 0x524F /* 0x524F4F54@ha */ -/* 8020FB84 38 64 4F 54 */ addi r3, r4, 0x4F54 /* 0x524F4F54@l */ -/* 8020FB88 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8020FB8C 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 8020FB90 38 84 00 6E */ addi r4, r4, 0x6e -/* 8020FB94 48 0C 5F A5 */ bl getGlbResource__10JKRArchiveFUlPCcP10JKRArchive -/* 8020FB98 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 8020FB9C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 8020FBA0 90 64 00 18 */ stw r3, 0x18(r4) -/* 8020FBA4 7F 23 CB 78 */ mr r3, r25 -/* 8020FBA8 4B DF F6 25 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8020FBAC 38 60 01 18 */ li r3, 0x118 -/* 8020FBB0 48 0B F0 9D */ bl __nw__FUl -/* 8020FBB4 7C 60 1B 79 */ or. r0, r3, r3 -/* 8020FBB8 41 82 00 0C */ beq lbl_8020FBC4 -/* 8020FBBC 48 0E 88 DD */ bl __ct__9J2DScreenFv -/* 8020FBC0 7C 60 1B 78 */ mr r0, r3 -lbl_8020FBC4: -/* 8020FBC4 90 1F 00 78 */ stw r0, 0x78(r31) -/* 8020FBC8 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 8020FBCC 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8020FBD0 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 8020FBD4 38 84 00 7B */ addi r4, r4, 0x7b -/* 8020FBD8 3C A0 00 02 */ lis r5, 2 -/* 8020FBDC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020FBE0 3A E6 61 C0 */ addi r23, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020FBE4 80 D7 5D 30 */ lwz r6, 0x5d30(r23) -/* 8020FBE8 48 0E 8A 61 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 8020FBEC 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 8020FBF0 48 04 54 F9 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 8020FBF4 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 8020FBF8 3C 80 69 6E */ lis r4, 0x696E /* 0x696E6735@ha */ -/* 8020FBFC 38 C4 67 35 */ addi r6, r4, 0x6735 /* 0x696E6735@l */ -/* 8020FC00 3C 80 6A 75 */ lis r4, 0x6A75 /* 0x6A755F72@ha */ -/* 8020FC04 38 A4 5F 72 */ addi r5, r4, 0x5F72 /* 0x6A755F72@l */ -/* 8020FC08 81 83 00 00 */ lwz r12, 0(r3) -/* 8020FC0C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8020FC10 7D 89 03 A6 */ mtctr r12 -/* 8020FC14 4E 80 04 21 */ bctrl -/* 8020FC18 3B 20 00 00 */ li r25, 0 -/* 8020FC1C 9B 23 00 B0 */ stb r25, 0xb0(r3) -/* 8020FC20 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8020FC24 D0 1F 07 3C */ stfs f0, 0x73c(r31) -/* 8020FC28 3A C0 00 00 */ li r22, 0 -lbl_8020FC2C: -/* 8020FC2C 38 60 00 10 */ li r3, 0x10 -/* 8020FC30 48 0B F0 1D */ bl __nw__FUl -/* 8020FC34 7C 64 1B 79 */ or. r4, r3, r3 -/* 8020FC38 41 82 00 0C */ beq lbl_8020FC44 -/* 8020FC3C 4B F9 EC FD */ bl __ct__15dKantera_icon_cFv -/* 8020FC40 7C 64 1B 78 */ mr r4, r3 -lbl_8020FC44: -/* 8020FC44 38 19 00 AC */ addi r0, r25, 0xac -/* 8020FC48 7C 9F 01 2E */ stwx r4, r31, r0 -/* 8020FC4C 3A D6 00 01 */ addi r22, r22, 1 -/* 8020FC50 2C 16 00 02 */ cmpwi r22, 2 -/* 8020FC54 3B 39 00 04 */ addi r25, r25, 4 -/* 8020FC58 41 80 FF D4 */ blt lbl_8020FC2C -/* 8020FC5C 38 60 01 18 */ li r3, 0x118 -/* 8020FC60 48 0B EF ED */ bl __nw__FUl -/* 8020FC64 7C 60 1B 79 */ or. r0, r3, r3 -/* 8020FC68 41 82 00 0C */ beq lbl_8020FC74 -/* 8020FC6C 48 0E 88 2D */ bl __ct__9J2DScreenFv -/* 8020FC70 7C 60 1B 78 */ mr r0, r3 -lbl_8020FC74: -/* 8020FC74 90 1F 00 7C */ stw r0, 0x7c(r31) -/* 8020FC78 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 8020FC7C 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8020FC80 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 8020FC84 38 84 00 90 */ addi r4, r4, 0x90 -/* 8020FC88 3C A0 00 02 */ lis r5, 2 -/* 8020FC8C 80 D7 5D 30 */ lwz r6, 0x5d30(r23) -/* 8020FC90 48 0E 89 B9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 8020FC94 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 8020FC98 48 04 54 51 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 8020FC9C 38 60 01 18 */ li r3, 0x118 -/* 8020FCA0 48 0B EF AD */ bl __nw__FUl -/* 8020FCA4 7C 60 1B 79 */ or. r0, r3, r3 -/* 8020FCA8 41 82 00 0C */ beq lbl_8020FCB4 -/* 8020FCAC 48 0E 87 ED */ bl __ct__9J2DScreenFv -/* 8020FCB0 7C 60 1B 78 */ mr r0, r3 -lbl_8020FCB4: -/* 8020FCB4 90 1F 00 80 */ stw r0, 0x80(r31) -/* 8020FCB8 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 8020FCBC 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8020FCC0 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 8020FCC4 38 84 00 AD */ addi r4, r4, 0xad -/* 8020FCC8 3C A0 00 02 */ lis r5, 2 -/* 8020FCCC 80 D7 5D 30 */ lwz r6, 0x5d30(r23) -/* 8020FCD0 48 0E 89 79 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 8020FCD4 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 8020FCD8 48 04 54 11 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 8020FCDC 38 60 00 6C */ li r3, 0x6c -/* 8020FCE0 48 0B EF 6D */ bl __nw__FUl -/* 8020FCE4 7C 60 1B 79 */ or. r0, r3, r3 -/* 8020FCE8 41 82 00 24 */ beq lbl_8020FD0C -/* 8020FCEC 80 9F 00 80 */ lwz r4, 0x80(r31) -/* 8020FCF0 3C A0 6B 61 */ lis r5, 0x6B61 /* 0x6B615F6E@ha */ -/* 8020FCF4 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x6B615F6E@l */ -/* 8020FCF8 38 A0 70 69 */ li r5, 0x7069 -/* 8020FCFC 38 E0 00 00 */ li r7, 0 -/* 8020FD00 39 00 00 00 */ li r8, 0 -/* 8020FD04 48 04 3C 81 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8020FD08 7C 60 1B 78 */ mr r0, r3 -lbl_8020FD0C: -/* 8020FD0C 90 1F 03 9C */ stw r0, 0x39c(r31) -/* 8020FD10 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 8020FD14 3C 80 6B 61 */ lis r4, 0x6B61 /* 0x6B613030@ha */ -/* 8020FD18 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x6B613030@l */ -/* 8020FD1C 38 A0 70 69 */ li r5, 0x7069 -/* 8020FD20 81 83 00 00 */ lwz r12, 0(r3) -/* 8020FD24 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8020FD28 7D 89 03 A6 */ mtctr r12 -/* 8020FD2C 4E 80 04 21 */ bctrl -/* 8020FD30 7C 64 1B 78 */ mr r4, r3 -/* 8020FD34 38 61 00 0C */ addi r3, r1, 0xc -/* 8020FD38 81 84 00 00 */ lwz r12, 0(r4) -/* 8020FD3C 81 8C 01 34 */ lwz r12, 0x134(r12) -/* 8020FD40 7D 89 03 A6 */ mtctr r12 -/* 8020FD44 4E 80 04 21 */ bctrl -/* 8020FD48 88 01 00 0C */ lbz r0, 0xc(r1) -/* 8020FD4C 98 1F 05 48 */ stb r0, 0x548(r31) -/* 8020FD50 88 01 00 0D */ lbz r0, 0xd(r1) -/* 8020FD54 98 1F 05 49 */ stb r0, 0x549(r31) -/* 8020FD58 88 01 00 0E */ lbz r0, 0xe(r1) -/* 8020FD5C 98 1F 05 4A */ stb r0, 0x54a(r31) -/* 8020FD60 88 01 00 0F */ lbz r0, 0xf(r1) -/* 8020FD64 98 1F 05 4B */ stb r0, 0x54b(r31) -/* 8020FD68 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 8020FD6C 3C 80 6B 61 */ lis r4, 0x6B61 /* 0x6B613030@ha */ -/* 8020FD70 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x6B613030@l */ -/* 8020FD74 38 A0 70 69 */ li r5, 0x7069 -/* 8020FD78 81 83 00 00 */ lwz r12, 0(r3) -/* 8020FD7C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8020FD80 7D 89 03 A6 */ mtctr r12 -/* 8020FD84 4E 80 04 21 */ bctrl -/* 8020FD88 7C 64 1B 78 */ mr r4, r3 -/* 8020FD8C 38 61 00 08 */ addi r3, r1, 8 -/* 8020FD90 81 84 00 00 */ lwz r12, 0(r4) -/* 8020FD94 81 8C 01 38 */ lwz r12, 0x138(r12) -/* 8020FD98 7D 89 03 A6 */ mtctr r12 -/* 8020FD9C 4E 80 04 21 */ bctrl -/* 8020FDA0 88 01 00 08 */ lbz r0, 8(r1) -/* 8020FDA4 98 1F 05 4C */ stb r0, 0x54c(r31) -/* 8020FDA8 88 01 00 09 */ lbz r0, 9(r1) -/* 8020FDAC 98 1F 05 4D */ stb r0, 0x54d(r31) -/* 8020FDB0 88 01 00 0A */ lbz r0, 0xa(r1) -/* 8020FDB4 98 1F 05 4E */ stb r0, 0x54e(r31) -/* 8020FDB8 88 01 00 0B */ lbz r0, 0xb(r1) -/* 8020FDBC 98 1F 05 4F */ stb r0, 0x54f(r31) -/* 8020FDC0 38 60 00 04 */ li r3, 4 -/* 8020FDC4 64 63 00 04 */ oris r3, r3, 4 -/* 8020FDC8 7C 72 E3 A6 */ mtspr 0x392, r3 -/* 8020FDCC 38 60 00 05 */ li r3, 5 -/* 8020FDD0 64 63 00 05 */ oris r3, r3, 5 -/* 8020FDD4 7C 73 E3 A6 */ mtspr 0x393, r3 -/* 8020FDD8 38 60 00 06 */ li r3, 6 -/* 8020FDDC 64 63 00 06 */ oris r3, r3, 6 -/* 8020FDE0 7C 74 E3 A6 */ mtspr 0x394, r3 -/* 8020FDE4 38 60 00 07 */ li r3, 7 -/* 8020FDE8 64 63 00 07 */ oris r3, r3, 7 -/* 8020FDEC 7C 75 E3 A6 */ mtspr 0x395, r3 -/* 8020FDF0 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8020FDF4 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 8020FDF8 38 64 00 C3 */ addi r3, r4, 0xc3 -/* 8020FDFC 80 97 5D 30 */ lwz r4, 0x5d30(r23) -/* 8020FE00 48 0C 44 71 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8020FE04 48 0F 8C 69 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 8020FE08 90 7F 05 34 */ stw r3, 0x534(r31) -/* 8020FE0C 7F E3 FB 78 */ mr r3, r31 -/* 8020FE10 C0 22 AE 84 */ lfs f1, lit_4183(r2) -/* 8020FE14 48 00 3E D9 */ bl playPikariBckAnimation__13dMeter2Draw_cFf -/* 8020FE18 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8020FE1C 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 8020FE20 38 64 00 D9 */ addi r3, r4, 0xd9 -/* 8020FE24 80 97 5D 30 */ lwz r4, 0x5d30(r23) -/* 8020FE28 48 0C 44 49 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8020FE2C 48 0F 8C 41 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 8020FE30 90 7F 05 38 */ stw r3, 0x538(r31) -/* 8020FE34 80 7F 05 38 */ lwz r3, 0x538(r31) -/* 8020FE38 80 9F 00 80 */ lwz r4, 0x80(r31) -/* 8020FE3C 81 83 00 00 */ lwz r12, 0(r3) -/* 8020FE40 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8020FE44 7D 89 03 A6 */ mtctr r12 -/* 8020FE48 4E 80 04 21 */ bctrl -/* 8020FE4C 7F E3 FB 78 */ mr r3, r31 -/* 8020FE50 C0 22 AE 84 */ lfs f1, lit_4183(r2) -/* 8020FE54 48 00 3F E9 */ bl playPikariBpkAnimation__13dMeter2Draw_cFf -/* 8020FE58 38 60 00 6C */ li r3, 0x6c -/* 8020FE5C 48 0B ED F1 */ bl __nw__FUl -/* 8020FE60 7C 60 1B 79 */ or. r0, r3, r3 -/* 8020FE64 41 82 00 24 */ beq lbl_8020FE88 -/* 8020FE68 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 8020FE6C 3C A0 5F 61 */ lis r5, 0x5F61 /* 0x5F616C6C@ha */ -/* 8020FE70 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x5F616C6C@l */ -/* 8020FE74 38 A0 00 6E */ li r5, 0x6e -/* 8020FE78 38 E0 00 02 */ li r7, 2 -/* 8020FE7C 39 00 00 00 */ li r8, 0 -/* 8020FE80 48 04 3B 05 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8020FE84 7C 60 1B 78 */ mr r0, r3 -lbl_8020FE88: -/* 8020FE88 90 1F 00 BC */ stw r0, 0xbc(r31) -/* 8020FE8C 3B 80 00 00 */ li r28, 0 -/* 8020FE90 3B 40 00 00 */ li r26, 0 -/* 8020FE94 3B 60 00 00 */ li r27, 0 -/* 8020FE98 3B C0 00 00 */ li r30, 0 -/* 8020FE9C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8020FEA0 3A E4 EB C8 */ addi r23, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8020FEA4 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8020FEA8 3B A4 88 D0 */ addi r29, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -lbl_8020FEAC: -/* 8020FEAC 38 60 00 6C */ li r3, 0x6c -/* 8020FEB0 48 0B ED 9D */ bl __nw__FUl -/* 8020FEB4 7C 60 1B 79 */ or. r0, r3, r3 -/* 8020FEB8 41 82 00 28 */ beq lbl_8020FEE0 -/* 8020FEBC 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 8020FEC0 38 18 00 00 */ addi r0, r24, 0 -/* 8020FEC4 7C C0 F2 14 */ add r6, r0, r30 -/* 8020FEC8 80 A6 00 00 */ lwz r5, 0(r6) -/* 8020FECC 80 C6 00 04 */ lwz r6, 4(r6) -/* 8020FED0 38 E0 00 00 */ li r7, 0 -/* 8020FED4 39 00 00 00 */ li r8, 0 -/* 8020FED8 48 04 3A AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8020FEDC 7C 60 1B 78 */ mr r0, r3 -lbl_8020FEE0: -/* 8020FEE0 7F 3F DA 14 */ add r25, r31, r27 -/* 8020FEE4 90 19 00 C0 */ stw r0, 0xc0(r25) -/* 8020FEE8 80 99 00 C0 */ lwz r4, 0xc0(r25) -/* 8020FEEC 80 64 00 04 */ lwz r3, 4(r4) -/* 8020FEF0 38 80 00 40 */ li r4, 0x40 -/* 8020FEF4 38 BD 00 EF */ addi r5, r29, 0xef -/* 8020FEF8 4C C6 31 82 */ crclr 6 -/* 8020FEFC 48 0F 08 51 */ bl setString__10J2DTextBoxFsPCce -/* 8020FF00 80 99 00 C0 */ lwz r4, 0xc0(r25) -/* 8020FF04 82 C4 00 04 */ lwz r22, 4(r4) -/* 8020FF08 4B E0 4A E9 */ bl mDoExt_getMesgFont__Fv -/* 8020FF0C 7C 64 1B 78 */ mr r4, r3 -/* 8020FF10 7E C3 B3 78 */ mr r3, r22 -/* 8020FF14 81 96 00 00 */ lwz r12, 0(r22) -/* 8020FF18 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 8020FF1C 7D 89 03 A6 */ mtctr r12 -/* 8020FF20 4E 80 04 21 */ bctrl -/* 8020FF24 80 99 00 C0 */ lwz r4, 0xc0(r25) -/* 8020FF28 80 84 00 04 */ lwz r4, 4(r4) -/* 8020FF2C C0 17 02 C4 */ lfs f0, 0x2c4(r23) -/* 8020FF30 D0 04 01 14 */ stfs f0, 0x114(r4) -/* 8020FF34 38 60 00 6C */ li r3, 0x6c -/* 8020FF38 48 0B ED 15 */ bl __nw__FUl -/* 8020FF3C 7C 60 1B 79 */ or. r0, r3, r3 -/* 8020FF40 41 82 00 28 */ beq lbl_8020FF68 -/* 8020FF44 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 8020FF48 38 18 00 28 */ addi r0, r24, 0x28 -/* 8020FF4C 7C C0 F2 14 */ add r6, r0, r30 -/* 8020FF50 80 A6 00 00 */ lwz r5, 0(r6) -/* 8020FF54 80 C6 00 04 */ lwz r6, 4(r6) -/* 8020FF58 38 E0 00 00 */ li r7, 0 -/* 8020FF5C 39 00 00 00 */ li r8, 0 -/* 8020FF60 48 04 3A 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8020FF64 7C 60 1B 78 */ mr r0, r3 -lbl_8020FF68: -/* 8020FF68 90 19 00 D4 */ stw r0, 0xd4(r25) -/* 8020FF6C 80 99 00 D4 */ lwz r4, 0xd4(r25) -/* 8020FF70 80 64 00 04 */ lwz r3, 4(r4) -/* 8020FF74 38 80 00 40 */ li r4, 0x40 -/* 8020FF78 38 BD 00 EF */ addi r5, r29, 0xef -/* 8020FF7C 4C C6 31 82 */ crclr 6 -/* 8020FF80 48 0F 07 CD */ bl setString__10J2DTextBoxFsPCce -/* 8020FF84 80 99 00 D4 */ lwz r4, 0xd4(r25) -/* 8020FF88 82 C4 00 04 */ lwz r22, 4(r4) -/* 8020FF8C 4B E0 4A 65 */ bl mDoExt_getMesgFont__Fv -/* 8020FF90 7C 64 1B 78 */ mr r4, r3 -/* 8020FF94 7E C3 B3 78 */ mr r3, r22 -/* 8020FF98 81 96 00 00 */ lwz r12, 0(r22) -/* 8020FF9C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 8020FFA0 7D 89 03 A6 */ mtctr r12 -/* 8020FFA4 4E 80 04 21 */ bctrl -/* 8020FFA8 38 60 00 6C */ li r3, 0x6c -/* 8020FFAC 48 0B EC A1 */ bl __nw__FUl -/* 8020FFB0 7C 60 1B 79 */ or. r0, r3, r3 -/* 8020FFB4 41 82 00 28 */ beq lbl_8020FFDC -/* 8020FFB8 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 8020FFBC 38 18 00 50 */ addi r0, r24, 0x50 -/* 8020FFC0 7C C0 F2 14 */ add r6, r0, r30 -/* 8020FFC4 80 A6 00 00 */ lwz r5, 0(r6) -/* 8020FFC8 80 C6 00 04 */ lwz r6, 4(r6) -/* 8020FFCC 38 E0 00 00 */ li r7, 0 -/* 8020FFD0 39 00 00 00 */ li r8, 0 -/* 8020FFD4 48 04 39 B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8020FFD8 7C 60 1B 78 */ mr r0, r3 -lbl_8020FFDC: -/* 8020FFDC 7F 3F D2 14 */ add r25, r31, r26 -/* 8020FFE0 90 19 00 F0 */ stw r0, 0xf0(r25) -/* 8020FFE4 80 99 00 F0 */ lwz r4, 0xf0(r25) -/* 8020FFE8 80 64 00 04 */ lwz r3, 4(r4) -/* 8020FFEC 38 80 00 40 */ li r4, 0x40 -/* 8020FFF0 38 BD 00 EF */ addi r5, r29, 0xef -/* 8020FFF4 4C C6 31 82 */ crclr 6 -/* 8020FFF8 48 0F 07 55 */ bl setString__10J2DTextBoxFsPCce -/* 8020FFFC 80 99 00 F0 */ lwz r4, 0xf0(r25) -/* 80210000 82 C4 00 04 */ lwz r22, 4(r4) -/* 80210004 4B E0 49 ED */ bl mDoExt_getMesgFont__Fv -/* 80210008 7C 64 1B 78 */ mr r4, r3 -/* 8021000C 7E C3 B3 78 */ mr r3, r22 -/* 80210010 81 96 00 00 */ lwz r12, 0(r22) -/* 80210014 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80210018 7D 89 03 A6 */ mtctr r12 -/* 8021001C 4E 80 04 21 */ bctrl -/* 80210020 38 60 00 6C */ li r3, 0x6c -/* 80210024 48 0B EC 29 */ bl __nw__FUl -/* 80210028 7C 60 1B 79 */ or. r0, r3, r3 -/* 8021002C 41 82 00 28 */ beq lbl_80210054 -/* 80210030 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80210034 38 18 00 78 */ addi r0, r24, 0x78 -/* 80210038 7C C0 F2 14 */ add r6, r0, r30 -/* 8021003C 80 A6 00 00 */ lwz r5, 0(r6) -/* 80210040 80 C6 00 04 */ lwz r6, 4(r6) -/* 80210044 38 E0 00 00 */ li r7, 0 -/* 80210048 39 00 00 00 */ li r8, 0 -/* 8021004C 48 04 39 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80210050 7C 60 1B 78 */ mr r0, r3 -lbl_80210054: -/* 80210054 90 19 00 E8 */ stw r0, 0xe8(r25) -/* 80210058 80 99 00 E8 */ lwz r4, 0xe8(r25) -/* 8021005C 80 64 00 04 */ lwz r3, 4(r4) -/* 80210060 38 80 00 40 */ li r4, 0x40 -/* 80210064 38 BD 00 EF */ addi r5, r29, 0xef -/* 80210068 4C C6 31 82 */ crclr 6 -/* 8021006C 48 0F 06 E1 */ bl setString__10J2DTextBoxFsPCce -/* 80210070 80 99 00 E8 */ lwz r4, 0xe8(r25) -/* 80210074 82 C4 00 04 */ lwz r22, 4(r4) -/* 80210078 4B E0 49 79 */ bl mDoExt_getMesgFont__Fv -/* 8021007C 7C 64 1B 78 */ mr r4, r3 -/* 80210080 7E C3 B3 78 */ mr r3, r22 -/* 80210084 81 96 00 00 */ lwz r12, 0(r22) -/* 80210088 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 8021008C 7D 89 03 A6 */ mtctr r12 -/* 80210090 4E 80 04 21 */ bctrl -/* 80210094 38 60 00 6C */ li r3, 0x6c -/* 80210098 48 0B EB B5 */ bl __nw__FUl -/* 8021009C 7C 60 1B 79 */ or. r0, r3, r3 -/* 802100A0 41 82 00 28 */ beq lbl_802100C8 -/* 802100A4 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 802100A8 38 18 00 A0 */ addi r0, r24, 0xa0 -/* 802100AC 7C C0 F2 14 */ add r6, r0, r30 -/* 802100B0 80 A6 00 00 */ lwz r5, 0(r6) -/* 802100B4 80 C6 00 04 */ lwz r6, 4(r6) -/* 802100B8 38 E0 00 00 */ li r7, 0 -/* 802100BC 39 00 00 00 */ li r8, 0 -/* 802100C0 48 04 38 C5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802100C4 7C 60 1B 78 */ mr r0, r3 -lbl_802100C8: -/* 802100C8 90 19 00 EC */ stw r0, 0xec(r25) -/* 802100CC 80 99 00 EC */ lwz r4, 0xec(r25) -/* 802100D0 80 64 00 04 */ lwz r3, 4(r4) -/* 802100D4 38 80 00 40 */ li r4, 0x40 -/* 802100D8 38 BD 00 EF */ addi r5, r29, 0xef -/* 802100DC 4C C6 31 82 */ crclr 6 -/* 802100E0 48 0F 06 6D */ bl setString__10J2DTextBoxFsPCce -/* 802100E4 80 99 00 EC */ lwz r4, 0xec(r25) -/* 802100E8 82 C4 00 04 */ lwz r22, 4(r4) -/* 802100EC 4B E0 49 05 */ bl mDoExt_getMesgFont__Fv -/* 802100F0 7C 64 1B 78 */ mr r4, r3 -/* 802100F4 7E C3 B3 78 */ mr r3, r22 -/* 802100F8 81 96 00 00 */ lwz r12, 0(r22) -/* 802100FC 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80210100 7D 89 03 A6 */ mtctr r12 -/* 80210104 4E 80 04 21 */ bctrl -/* 80210108 3B 9C 00 01 */ addi r28, r28, 1 -/* 8021010C 2C 1C 00 05 */ cmpwi r28, 5 -/* 80210110 3B 5A 00 0C */ addi r26, r26, 0xc -/* 80210114 3B 7B 00 04 */ addi r27, r27, 4 -/* 80210118 3B DE 00 08 */ addi r30, r30, 8 -/* 8021011C 41 80 FD 90 */ blt lbl_8020FEAC -/* 80210120 C0 02 AE 88 */ lfs f0, lit_4184(r2) -/* 80210124 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80210128 C0 02 AE 8C */ lfs f0, lit_4185(r2) -/* 8021012C D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80210130 38 80 00 00 */ li r4, 0 -/* 80210134 38 A0 00 00 */ li r5, 0 -/* 80210138 81 01 00 38 */ lwz r8, 0x38(r1) -/* 8021013C 80 E1 00 3C */ lwz r7, 0x3c(r1) -/* 80210140 C1 02 AE 80 */ lfs f8, lit_4182(r2) -/* 80210144 FC E0 40 90 */ fmr f7, f8 -/* 80210148 FC C0 40 90 */ fmr f6, f8 -/* 8021014C FC A0 40 90 */ fmr f5, f8 -/* 80210150 FC 80 40 90 */ fmr f4, f8 -/* 80210154 FC 60 40 90 */ fmr f3, f8 -/* 80210158 FC 40 40 90 */ fmr f2, f8 -/* 8021015C FC 20 40 90 */ fmr f1, f8 -/* 80210160 FC 00 40 90 */ fmr f0, f8 -/* 80210164 38 00 00 05 */ li r0, 5 -/* 80210168 7C 09 03 A6 */ mtctr r0 -lbl_8021016C: -/* 8021016C 91 01 00 30 */ stw r8, 0x30(r1) -/* 80210170 90 E1 00 34 */ stw r7, 0x34(r1) -/* 80210174 7D 3F 2A 14 */ add r9, r31, r5 -/* 80210178 80 C9 00 C0 */ lwz r6, 0xc0(r9) -/* 8021017C 80 C6 00 04 */ lwz r6, 4(r6) -/* 80210180 C1 21 00 34 */ lfs f9, 0x34(r1) -/* 80210184 C1 41 00 30 */ lfs f10, 0x30(r1) -/* 80210188 FC 0A 40 40 */ fcmpo cr0, f10, f8 -/* 8021018C 40 81 00 08 */ ble lbl_80210194 -/* 80210190 48 00 00 08 */ b lbl_80210198 -lbl_80210194: -/* 80210194 FD 40 40 90 */ fmr f10, f8 -lbl_80210198: -/* 80210198 D1 46 01 1C */ stfs f10, 0x11c(r6) -/* 8021019C FC 09 40 40 */ fcmpo cr0, f9, f8 -/* 802101A0 40 81 00 08 */ ble lbl_802101A8 -/* 802101A4 48 00 00 08 */ b lbl_802101AC -lbl_802101A8: -/* 802101A8 FD 20 40 90 */ fmr f9, f8 -lbl_802101AC: -/* 802101AC D1 26 01 20 */ stfs f9, 0x120(r6) -/* 802101B0 91 01 00 28 */ stw r8, 0x28(r1) -/* 802101B4 90 E1 00 2C */ stw r7, 0x2c(r1) -/* 802101B8 80 C9 00 D4 */ lwz r6, 0xd4(r9) -/* 802101BC 80 C6 00 04 */ lwz r6, 4(r6) -/* 802101C0 C1 21 00 2C */ lfs f9, 0x2c(r1) -/* 802101C4 C1 41 00 28 */ lfs f10, 0x28(r1) -/* 802101C8 FC 0A 38 40 */ fcmpo cr0, f10, f7 -/* 802101CC 40 81 00 08 */ ble lbl_802101D4 -/* 802101D0 48 00 00 08 */ b lbl_802101D8 -lbl_802101D4: -/* 802101D4 FD 40 38 90 */ fmr f10, f7 -lbl_802101D8: -/* 802101D8 D1 46 01 1C */ stfs f10, 0x11c(r6) -/* 802101DC FC 09 30 40 */ fcmpo cr0, f9, f6 -/* 802101E0 40 81 00 08 */ ble lbl_802101E8 -/* 802101E4 48 00 00 08 */ b lbl_802101EC -lbl_802101E8: -/* 802101E8 FD 20 30 90 */ fmr f9, f6 -lbl_802101EC: -/* 802101EC D1 26 01 20 */ stfs f9, 0x120(r6) -/* 802101F0 91 01 00 20 */ stw r8, 0x20(r1) -/* 802101F4 90 E1 00 24 */ stw r7, 0x24(r1) -/* 802101F8 7D 3F 22 14 */ add r9, r31, r4 -/* 802101FC 80 C9 00 E8 */ lwz r6, 0xe8(r9) -/* 80210200 80 C6 00 04 */ lwz r6, 4(r6) -/* 80210204 C1 21 00 24 */ lfs f9, 0x24(r1) -/* 80210208 C1 41 00 20 */ lfs f10, 0x20(r1) -/* 8021020C FC 0A 28 40 */ fcmpo cr0, f10, f5 -/* 80210210 40 81 00 08 */ ble lbl_80210218 -/* 80210214 48 00 00 08 */ b lbl_8021021C -lbl_80210218: -/* 80210218 FD 40 28 90 */ fmr f10, f5 -lbl_8021021C: -/* 8021021C D1 46 01 1C */ stfs f10, 0x11c(r6) -/* 80210220 FC 09 20 40 */ fcmpo cr0, f9, f4 -/* 80210224 40 81 00 08 */ ble lbl_8021022C -/* 80210228 48 00 00 08 */ b lbl_80210230 -lbl_8021022C: -/* 8021022C FD 20 20 90 */ fmr f9, f4 -lbl_80210230: -/* 80210230 D1 26 01 20 */ stfs f9, 0x120(r6) -/* 80210234 91 01 00 18 */ stw r8, 0x18(r1) -/* 80210238 90 E1 00 1C */ stw r7, 0x1c(r1) -/* 8021023C 80 C9 00 EC */ lwz r6, 0xec(r9) -/* 80210240 80 C6 00 04 */ lwz r6, 4(r6) -/* 80210244 C1 21 00 1C */ lfs f9, 0x1c(r1) -/* 80210248 C1 41 00 18 */ lfs f10, 0x18(r1) -/* 8021024C FC 0A 18 40 */ fcmpo cr0, f10, f3 -/* 80210250 40 81 00 08 */ ble lbl_80210258 -/* 80210254 48 00 00 08 */ b lbl_8021025C -lbl_80210258: -/* 80210258 FD 40 18 90 */ fmr f10, f3 -lbl_8021025C: -/* 8021025C D1 46 01 1C */ stfs f10, 0x11c(r6) -/* 80210260 FC 09 10 40 */ fcmpo cr0, f9, f2 -/* 80210264 40 81 00 08 */ ble lbl_8021026C -/* 80210268 48 00 00 08 */ b lbl_80210270 -lbl_8021026C: -/* 8021026C FD 20 10 90 */ fmr f9, f2 -lbl_80210270: -/* 80210270 D1 26 01 20 */ stfs f9, 0x120(r6) -/* 80210274 91 01 00 10 */ stw r8, 0x10(r1) -/* 80210278 90 E1 00 14 */ stw r7, 0x14(r1) -/* 8021027C 80 C9 00 F0 */ lwz r6, 0xf0(r9) -/* 80210280 80 C6 00 04 */ lwz r6, 4(r6) -/* 80210284 C1 21 00 14 */ lfs f9, 0x14(r1) -/* 80210288 C1 41 00 10 */ lfs f10, 0x10(r1) -/* 8021028C FC 0A 08 40 */ fcmpo cr0, f10, f1 -/* 80210290 40 81 00 08 */ ble lbl_80210298 -/* 80210294 48 00 00 08 */ b lbl_8021029C -lbl_80210298: -/* 80210298 FD 40 08 90 */ fmr f10, f1 -lbl_8021029C: -/* 8021029C D1 46 01 1C */ stfs f10, 0x11c(r6) -/* 802102A0 FC 09 00 40 */ fcmpo cr0, f9, f0 -/* 802102A4 40 81 00 08 */ ble lbl_802102AC -/* 802102A8 48 00 00 08 */ b lbl_802102B0 -lbl_802102AC: -/* 802102AC FD 20 00 90 */ fmr f9, f0 -lbl_802102B0: -/* 802102B0 D1 26 01 20 */ stfs f9, 0x120(r6) -/* 802102B4 38 84 00 0C */ addi r4, r4, 0xc -/* 802102B8 38 A5 00 04 */ addi r5, r5, 4 -/* 802102BC 42 00 FE B0 */ bdnz lbl_8021016C -/* 802102C0 7F E3 FB 78 */ mr r3, r31 -/* 802102C4 48 00 0C ED */ bl init__13dMeter2Draw_cFv -/* 802102C8 38 00 00 00 */ li r0, 0 -/* 802102CC 90 1F 00 A8 */ stw r0, 0xa8(r31) -/* 802102D0 90 1F 01 E4 */ stw r0, 0x1e4(r31) -/* 802102D4 90 1F 02 FC */ stw r0, 0x2fc(r31) -/* 802102D8 90 1F 03 6C */ stw r0, 0x36c(r31) -/* 802102DC 7F E3 FB 78 */ mr r3, r31 -/* 802102E0 39 61 00 70 */ addi r11, r1, 0x70 -/* 802102E4 48 15 1F 29 */ bl _restgpr_22 -/* 802102E8 80 01 00 74 */ lwz r0, 0x74(r1) -/* 802102EC 7C 08 03 A6 */ mtlr r0 -/* 802102F0 38 21 00 70 */ addi r1, r1, 0x70 -/* 802102F4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/changeTextureItemB__13dMeter2Draw_cFUc.s b/asm/d/meter/d_meter2_draw/changeTextureItemB__13dMeter2Draw_cFUc.s deleted file mode 100644 index 97815412ef..0000000000 --- a/asm/d/meter/d_meter2_draw/changeTextureItemB__13dMeter2Draw_cFUc.s +++ /dev/null @@ -1,183 +0,0 @@ -lbl_8021A468: -/* 8021A468 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8021A46C 7C 08 02 A6 */ mflr r0 -/* 8021A470 90 01 00 54 */ stw r0, 0x54(r1) -/* 8021A474 39 61 00 50 */ addi r11, r1, 0x50 -/* 8021A478 48 14 7D 65 */ bl _savegpr_29 -/* 8021A47C 7C 7D 1B 78 */ mr r29, r3 -/* 8021A480 7C 9E 23 78 */ mr r30, r4 -/* 8021A484 3B E0 00 00 */ li r31, 0 -/* 8021A488 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8021A48C 28 03 00 58 */ cmplwi r3, 0x58 -/* 8021A490 40 82 00 0C */ bne lbl_8021A49C -/* 8021A494 3B E0 00 02 */ li r31, 2 -/* 8021A498 48 00 00 28 */ b lbl_8021A4C0 -lbl_8021A49C: -/* 8021A49C 38 1E FF D8 */ addi r0, r30, -40 -/* 8021A4A0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8021A4A4 28 00 00 01 */ cmplwi r0, 1 -/* 8021A4A8 40 81 00 14 */ ble lbl_8021A4BC -/* 8021A4AC 28 03 00 3F */ cmplwi r3, 0x3f -/* 8021A4B0 41 82 00 0C */ beq lbl_8021A4BC -/* 8021A4B4 28 03 00 49 */ cmplwi r3, 0x49 -/* 8021A4B8 40 82 00 08 */ bne lbl_8021A4C0 -lbl_8021A4BC: -/* 8021A4BC 3B E0 00 01 */ li r31, 1 -lbl_8021A4C0: -/* 8021A4C0 88 1D 07 6B */ lbz r0, 0x76b(r29) -/* 8021A4C4 28 00 00 00 */ cmplwi r0, 0 -/* 8021A4C8 40 82 00 10 */ bne lbl_8021A4D8 -/* 8021A4CC 38 00 00 01 */ li r0, 1 -/* 8021A4D0 98 1D 07 6B */ stb r0, 0x76b(r29) -/* 8021A4D4 48 00 00 0C */ b lbl_8021A4E0 -lbl_8021A4D8: -/* 8021A4D8 38 00 00 00 */ li r0, 0 -/* 8021A4DC 98 1D 07 6B */ stb r0, 0x76b(r29) -lbl_8021A4E0: -/* 8021A4E0 7F A3 EB 78 */ mr r3, r29 -/* 8021A4E4 7F C4 F3 78 */ mr r4, r30 -/* 8021A4E8 48 00 13 29 */ bl setItemParamB__13dMeter2Draw_cFUc -/* 8021A4EC 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 8021A4F0 80 C3 00 04 */ lwz r6, 4(r3) -/* 8021A4F4 88 1D 07 6B */ lbz r0, 0x76b(r29) -/* 8021A4F8 54 00 18 38 */ slwi r0, r0, 3 -/* 8021A4FC 7C FD 02 14 */ add r7, r29, r0 -/* 8021A500 80 A7 04 E4 */ lwz r5, 0x4e4(r7) -/* 8021A504 38 00 00 00 */ li r0, 0 -/* 8021A508 90 01 00 08 */ stw r0, 8(r1) -/* 8021A50C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8021A510 38 00 FF FF */ li r0, -1 -/* 8021A514 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021A518 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021A51C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021A520 7F C4 F3 78 */ mr r4, r30 -/* 8021A524 80 E7 04 E8 */ lwz r7, 0x4e8(r7) -/* 8021A528 81 1D 05 14 */ lwz r8, 0x514(r29) -/* 8021A52C 39 20 00 00 */ li r9, 0 -/* 8021A530 39 40 00 00 */ li r10, 0 -/* 8021A534 48 00 29 D5 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei -/* 8021A538 2C 03 00 01 */ cmpwi r3, 1 -/* 8021A53C 41 81 00 14 */ bgt lbl_8021A550 -/* 8021A540 38 00 00 00 */ li r0, 0 -/* 8021A544 80 7D 05 14 */ lwz r3, 0x514(r29) -/* 8021A548 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8021A54C 48 00 00 10 */ b lbl_8021A55C -lbl_8021A550: -/* 8021A550 38 00 00 01 */ li r0, 1 -/* 8021A554 80 7D 05 14 */ lwz r3, 0x514(r29) -/* 8021A558 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_8021A55C: -/* 8021A55C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021A560 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021A564 88 03 05 68 */ lbz r0, 0x568(r3) -/* 8021A568 28 00 00 01 */ cmplwi r0, 1 -/* 8021A56C 40 82 00 2C */ bne lbl_8021A598 -/* 8021A570 88 03 05 69 */ lbz r0, 0x569(r3) -/* 8021A574 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 8021A578 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8021A57C 3C 00 43 30 */ lis r0, 0x4330 -/* 8021A580 90 01 00 18 */ stw r0, 0x18(r1) -/* 8021A584 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8021A588 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8021A58C C0 02 AE D8 */ lfs f0, lit_8548(r2) -/* 8021A590 EC 81 00 24 */ fdivs f4, f1, f0 -/* 8021A594 48 00 00 3C */ b lbl_8021A5D0 -lbl_8021A598: -/* 8021A598 3C 60 80 3B */ lis r3, item_resource__10dItem_data@ha /* 0x803AC5A0@ha */ -/* 8021A59C 38 63 C5 A0 */ addi r3, r3, item_resource__10dItem_data@l /* 0x803AC5A0@l */ -/* 8021A5A0 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8021A5A4 1C 00 00 18 */ mulli r0, r0, 0x18 -/* 8021A5A8 7C 63 02 14 */ add r3, r3, r0 -/* 8021A5AC 88 03 00 12 */ lbz r0, 0x12(r3) -/* 8021A5B0 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 8021A5B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021A5B8 3C 00 43 30 */ lis r0, 0x4330 -/* 8021A5BC 90 01 00 20 */ stw r0, 0x20(r1) -/* 8021A5C0 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 8021A5C4 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8021A5C8 C0 02 AE D8 */ lfs f0, lit_8548(r2) -/* 8021A5CC EC 81 00 24 */ fdivs f4, f1, f0 -lbl_8021A5D0: -/* 8021A5D0 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 8021A5D4 C0 23 00 34 */ lfs f1, 0x34(r3) -/* 8021A5D8 88 1D 07 6B */ lbz r0, 0x76b(r29) -/* 8021A5DC 54 00 18 38 */ slwi r0, r0, 3 -/* 8021A5E0 7C 7D 02 14 */ add r3, r29, r0 -/* 8021A5E4 80 63 04 E4 */ lwz r3, 0x4e4(r3) -/* 8021A5E8 A0 03 00 02 */ lhz r0, 2(r3) -/* 8021A5EC C8 42 AE C0 */ lfd f2, lit_6293(r2) -/* 8021A5F0 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8021A5F4 3C 80 43 30 */ lis r4, 0x4330 -/* 8021A5F8 90 81 00 28 */ stw r4, 0x28(r1) -/* 8021A5FC C8 01 00 28 */ lfd f0, 0x28(r1) -/* 8021A600 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8021A604 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8021A608 C0 22 AE DC */ lfs f1, lit_8549(r2) -/* 8021A60C EC 00 08 24 */ fdivs f0, f0, f1 -/* 8021A610 EC 04 00 32 */ fmuls f0, f4, f0 -/* 8021A614 D0 1D 06 E4 */ stfs f0, 0x6e4(r29) -/* 8021A618 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 8021A61C C0 63 00 38 */ lfs f3, 0x38(r3) -/* 8021A620 88 1D 07 6B */ lbz r0, 0x76b(r29) -/* 8021A624 54 00 18 38 */ slwi r0, r0, 3 -/* 8021A628 7C 7D 02 14 */ add r3, r29, r0 -/* 8021A62C 80 63 04 E4 */ lwz r3, 0x4e4(r3) -/* 8021A630 A0 03 00 04 */ lhz r0, 4(r3) -/* 8021A634 90 01 00 34 */ stw r0, 0x34(r1) -/* 8021A638 90 81 00 30 */ stw r4, 0x30(r1) -/* 8021A63C C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8021A640 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8021A644 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 8021A648 EC 00 08 24 */ fdivs f0, f0, f1 -/* 8021A64C EC 04 00 32 */ fmuls f0, f4, f0 -/* 8021A650 D0 1D 06 E8 */ stfs f0, 0x6e8(r29) -/* 8021A654 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 8021A658 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 8021A65C C0 22 AE 94 */ lfs f1, lit_4922(r2) -/* 8021A660 C0 1D 06 E4 */ lfs f0, 0x6e4(r29) -/* 8021A664 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8021A668 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8021A66C D0 1D 06 DC */ stfs f0, 0x6dc(r29) -/* 8021A670 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 8021A674 C0 43 00 38 */ lfs f2, 0x38(r3) -/* 8021A678 C0 1D 06 E8 */ lfs f0, 0x6e8(r29) -/* 8021A67C EC 02 00 28 */ fsubs f0, f2, f0 -/* 8021A680 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8021A684 D0 1D 06 E0 */ stfs f0, 0x6e0(r29) -/* 8021A688 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 8021A68C 80 63 00 04 */ lwz r3, 4(r3) -/* 8021A690 C0 3D 06 E4 */ lfs f1, 0x6e4(r29) -/* 8021A694 C0 5D 06 E8 */ lfs f2, 0x6e8(r29) -/* 8021A698 81 83 00 00 */ lwz r12, 0(r3) -/* 8021A69C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021A6A0 7D 89 03 A6 */ mtctr r12 -/* 8021A6A4 4E 80 04 21 */ bctrl -/* 8021A6A8 57 E5 10 3A */ slwi r5, r31, 2 -/* 8021A6AC 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 8021A6B0 C0 5D 06 DC */ lfs f2, 0x6dc(r29) -/* 8021A6B4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021A6B8 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021A6BC 7C 80 2A 14 */ add r4, r0, r5 -/* 8021A6C0 C0 24 01 84 */ lfs f1, 0x184(r4) -/* 8021A6C4 C0 1D 06 EC */ lfs f0, 0x6ec(r29) -/* 8021A6C8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8021A6CC EC 22 00 2A */ fadds f1, f2, f0 -/* 8021A6D0 C0 7D 06 E0 */ lfs f3, 0x6e0(r29) -/* 8021A6D4 C0 44 01 90 */ lfs f2, 0x190(r4) -/* 8021A6D8 C0 1D 06 F0 */ lfs f0, 0x6f0(r29) -/* 8021A6DC EC 02 00 2A */ fadds f0, f2, f0 -/* 8021A6E0 EC 43 00 2A */ fadds f2, f3, f0 -/* 8021A6E4 48 03 9E CD */ bl paneTrans__8CPaneMgrFff -/* 8021A6E8 80 7D 05 14 */ lwz r3, 0x514(r29) -/* 8021A6EC C0 3D 06 E4 */ lfs f1, 0x6e4(r29) -/* 8021A6F0 C0 5D 06 E8 */ lfs f2, 0x6e8(r29) -/* 8021A6F4 81 83 00 00 */ lwz r12, 0(r3) -/* 8021A6F8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021A6FC 7D 89 03 A6 */ mtctr r12 -/* 8021A700 4E 80 04 21 */ bctrl -/* 8021A704 39 61 00 50 */ addi r11, r1, 0x50 -/* 8021A708 48 14 7B 21 */ bl _restgpr_29 -/* 8021A70C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8021A710 7C 08 03 A6 */ mtlr r0 -/* 8021A714 38 21 00 50 */ addi r1, r1, 0x50 -/* 8021A718 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/changeTextureItemXY__13dMeter2Draw_cFiUc.s b/asm/d/meter/d_meter2_draw/changeTextureItemXY__13dMeter2Draw_cFiUc.s deleted file mode 100644 index 85010784c5..0000000000 --- a/asm/d/meter/d_meter2_draw/changeTextureItemXY__13dMeter2Draw_cFiUc.s +++ /dev/null @@ -1,181 +0,0 @@ -lbl_8021A71C: -/* 8021A71C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8021A720 7C 08 02 A6 */ mflr r0 -/* 8021A724 90 01 00 64 */ stw r0, 0x64(r1) -/* 8021A728 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021A72C 48 14 7A A1 */ bl _savegpr_25 -/* 8021A730 7C 79 1B 78 */ mr r25, r3 -/* 8021A734 7C 9A 23 78 */ mr r26, r4 -/* 8021A738 7C BB 2B 78 */ mr r27, r5 -/* 8021A73C 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 8021A740 28 00 00 53 */ cmplwi r0, 0x53 -/* 8021A744 40 82 00 08 */ bne lbl_8021A74C -/* 8021A748 3B 60 00 43 */ li r27, 0x43 -lbl_8021A74C: -/* 8021A74C 7F F9 D2 14 */ add r31, r25, r26 -/* 8021A750 88 1F 07 6C */ lbz r0, 0x76c(r31) -/* 8021A754 28 00 00 00 */ cmplwi r0, 0 -/* 8021A758 40 82 00 10 */ bne lbl_8021A768 -/* 8021A75C 38 00 00 01 */ li r0, 1 -/* 8021A760 98 1F 07 6C */ stb r0, 0x76c(r31) -/* 8021A764 48 00 00 0C */ b lbl_8021A770 -lbl_8021A768: -/* 8021A768 38 00 00 00 */ li r0, 0 -/* 8021A76C 98 1F 07 6C */ stb r0, 0x76c(r31) -lbl_8021A770: -/* 8021A770 57 5E 10 3A */ slwi r30, r26, 2 -/* 8021A774 7F B9 F2 14 */ add r29, r25, r30 -/* 8021A778 80 7D 03 2C */ lwz r3, 0x32c(r29) -/* 8021A77C 80 C3 00 04 */ lwz r6, 4(r3) -/* 8021A780 57 48 20 36 */ slwi r8, r26, 4 -/* 8021A784 7F 99 42 14 */ add r28, r25, r8 -/* 8021A788 88 1F 07 6C */ lbz r0, 0x76c(r31) -/* 8021A78C 54 07 18 38 */ slwi r7, r0, 3 -/* 8021A790 3B 9C 04 F4 */ addi r28, r28, 0x4f4 -/* 8021A794 7C BC 38 2E */ lwzx r5, r28, r7 -/* 8021A798 38 00 00 00 */ li r0, 0 -/* 8021A79C 90 01 00 08 */ stw r0, 8(r1) -/* 8021A7A0 90 01 00 0C */ stw r0, 0xc(r1) -/* 8021A7A4 38 00 FF FF */ li r0, -1 -/* 8021A7A8 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021A7AC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021A7B0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021A7B4 7F 64 DB 78 */ mr r4, r27 -/* 8021A7B8 7C 19 42 14 */ add r0, r25, r8 -/* 8021A7BC 7C E0 3A 14 */ add r7, r0, r7 -/* 8021A7C0 80 E7 04 F8 */ lwz r7, 0x4f8(r7) -/* 8021A7C4 81 1D 05 18 */ lwz r8, 0x518(r29) -/* 8021A7C8 39 20 00 00 */ li r9, 0 -/* 8021A7CC 39 40 00 00 */ li r10, 0 -/* 8021A7D0 48 00 27 39 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei -/* 8021A7D4 2C 03 00 01 */ cmpwi r3, 1 -/* 8021A7D8 41 81 00 14 */ bgt lbl_8021A7EC -/* 8021A7DC 38 00 00 00 */ li r0, 0 -/* 8021A7E0 80 7D 05 18 */ lwz r3, 0x518(r29) -/* 8021A7E4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8021A7E8 48 00 00 10 */ b lbl_8021A7F8 -lbl_8021A7EC: -/* 8021A7EC 38 00 00 01 */ li r0, 1 -/* 8021A7F0 80 7D 05 18 */ lwz r3, 0x518(r29) -/* 8021A7F4 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_8021A7F8: -/* 8021A7F8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021A7FC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021A800 88 03 05 68 */ lbz r0, 0x568(r3) -/* 8021A804 28 00 00 01 */ cmplwi r0, 1 -/* 8021A808 40 82 00 2C */ bne lbl_8021A834 -/* 8021A80C 88 03 05 69 */ lbz r0, 0x569(r3) -/* 8021A810 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 8021A814 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8021A818 3C 00 43 30 */ lis r0, 0x4330 -/* 8021A81C 90 01 00 18 */ stw r0, 0x18(r1) -/* 8021A820 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8021A824 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8021A828 C0 02 AE D8 */ lfs f0, lit_8548(r2) -/* 8021A82C EC 81 00 24 */ fdivs f4, f1, f0 -/* 8021A830 48 00 00 3C */ b lbl_8021A86C -lbl_8021A834: -/* 8021A834 3C 60 80 3B */ lis r3, item_resource__10dItem_data@ha /* 0x803AC5A0@ha */ -/* 8021A838 38 63 C5 A0 */ addi r3, r3, item_resource__10dItem_data@l /* 0x803AC5A0@l */ -/* 8021A83C 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 8021A840 1C 00 00 18 */ mulli r0, r0, 0x18 -/* 8021A844 7C 63 02 14 */ add r3, r3, r0 -/* 8021A848 88 03 00 12 */ lbz r0, 0x12(r3) -/* 8021A84C C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 8021A850 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021A854 3C 00 43 30 */ lis r0, 0x4330 -/* 8021A858 90 01 00 20 */ stw r0, 0x20(r1) -/* 8021A85C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 8021A860 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8021A864 C0 02 AE D8 */ lfs f0, lit_8548(r2) -/* 8021A868 EC 81 00 24 */ fdivs f4, f1, f0 -lbl_8021A86C: -/* 8021A86C 80 7D 03 2C */ lwz r3, 0x32c(r29) -/* 8021A870 C0 23 00 34 */ lfs f1, 0x34(r3) -/* 8021A874 88 1F 07 6C */ lbz r0, 0x76c(r31) -/* 8021A878 54 00 18 38 */ slwi r0, r0, 3 -/* 8021A87C 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8021A880 A0 03 00 02 */ lhz r0, 2(r3) -/* 8021A884 C8 42 AE C0 */ lfd f2, lit_6293(r2) -/* 8021A888 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8021A88C 3C 80 43 30 */ lis r4, 0x4330 -/* 8021A890 90 81 00 28 */ stw r4, 0x28(r1) -/* 8021A894 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 8021A898 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8021A89C EC 00 00 72 */ fmuls f0, f0, f1 -/* 8021A8A0 C0 22 AE DC */ lfs f1, lit_8549(r2) -/* 8021A8A4 EC 00 08 24 */ fdivs f0, f0, f1 -/* 8021A8A8 EC 04 00 32 */ fmuls f0, f4, f0 -/* 8021A8AC 7F 79 F2 14 */ add r27, r25, r30 -/* 8021A8B0 D0 1B 06 C4 */ stfs f0, 0x6c4(r27) -/* 8021A8B4 80 7D 03 2C */ lwz r3, 0x32c(r29) -/* 8021A8B8 C0 63 00 38 */ lfs f3, 0x38(r3) -/* 8021A8BC 88 1F 07 6C */ lbz r0, 0x76c(r31) -/* 8021A8C0 54 00 18 38 */ slwi r0, r0, 3 -/* 8021A8C4 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8021A8C8 A0 03 00 04 */ lhz r0, 4(r3) -/* 8021A8CC 90 01 00 34 */ stw r0, 0x34(r1) -/* 8021A8D0 90 81 00 30 */ stw r4, 0x30(r1) -/* 8021A8D4 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8021A8D8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8021A8DC EC 00 00 F2 */ fmuls f0, f0, f3 -/* 8021A8E0 EC 00 08 24 */ fdivs f0, f0, f1 -/* 8021A8E4 EC 04 00 32 */ fmuls f0, f4, f0 -/* 8021A8E8 D0 1B 06 D0 */ stfs f0, 0x6d0(r27) -/* 8021A8EC 80 7D 03 2C */ lwz r3, 0x32c(r29) -/* 8021A8F0 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 8021A8F4 C0 22 AE 94 */ lfs f1, lit_4922(r2) -/* 8021A8F8 C0 1B 06 C4 */ lfs f0, 0x6c4(r27) -/* 8021A8FC EC 02 00 28 */ fsubs f0, f2, f0 -/* 8021A900 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8021A904 D0 1B 06 AC */ stfs f0, 0x6ac(r27) -/* 8021A908 80 7D 03 2C */ lwz r3, 0x32c(r29) -/* 8021A90C C0 43 00 38 */ lfs f2, 0x38(r3) -/* 8021A910 C0 1B 06 D0 */ lfs f0, 0x6d0(r27) -/* 8021A914 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8021A918 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8021A91C D0 1B 06 B8 */ stfs f0, 0x6b8(r27) -/* 8021A920 80 7D 03 2C */ lwz r3, 0x32c(r29) -/* 8021A924 80 63 00 04 */ lwz r3, 4(r3) -/* 8021A928 C0 3B 06 C4 */ lfs f1, 0x6c4(r27) -/* 8021A92C C0 5B 06 D0 */ lfs f2, 0x6d0(r27) -/* 8021A930 81 83 00 00 */ lwz r12, 0(r3) -/* 8021A934 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021A938 7D 89 03 A6 */ mtctr r12 -/* 8021A93C 3B DB 06 AC */ addi r30, r27, 0x6ac -/* 8021A940 3B 9B 06 B8 */ addi r28, r27, 0x6b8 -/* 8021A944 4E 80 04 21 */ bctrl -/* 8021A948 2C 1A 00 00 */ cmpwi r26, 0 -/* 8021A94C 40 82 00 28 */ bne lbl_8021A974 -/* 8021A950 80 7D 03 2C */ lwz r3, 0x32c(r29) -/* 8021A954 C0 39 00 04 */ lfs f1, 4(r25) -/* 8021A958 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8021A95C EC 21 00 2A */ fadds f1, f1, f0 -/* 8021A960 C0 59 00 08 */ lfs f2, 8(r25) -/* 8021A964 C0 1C 00 00 */ lfs f0, 0(r28) -/* 8021A968 EC 42 00 2A */ fadds f2, f2, f0 -/* 8021A96C 48 03 9C 45 */ bl paneTrans__8CPaneMgrFff -/* 8021A970 48 00 00 24 */ b lbl_8021A994 -lbl_8021A974: -/* 8021A974 80 7D 03 2C */ lwz r3, 0x32c(r29) -/* 8021A978 C0 39 00 20 */ lfs f1, 0x20(r25) -/* 8021A97C C0 1E 00 00 */ lfs f0, 0(r30) -/* 8021A980 EC 21 00 2A */ fadds f1, f1, f0 -/* 8021A984 C0 59 00 24 */ lfs f2, 0x24(r25) -/* 8021A988 C0 1C 00 00 */ lfs f0, 0(r28) -/* 8021A98C EC 42 00 2A */ fadds f2, f2, f0 -/* 8021A990 48 03 9C 21 */ bl paneTrans__8CPaneMgrFff -lbl_8021A994: -/* 8021A994 80 7D 05 18 */ lwz r3, 0x518(r29) -/* 8021A998 C0 3B 06 C4 */ lfs f1, 0x6c4(r27) -/* 8021A99C C0 5B 06 D0 */ lfs f2, 0x6d0(r27) -/* 8021A9A0 81 83 00 00 */ lwz r12, 0(r3) -/* 8021A9A4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021A9A8 7D 89 03 A6 */ mtctr r12 -/* 8021A9AC 4E 80 04 21 */ bctrl -/* 8021A9B0 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021A9B4 48 14 78 65 */ bl _restgpr_25 -/* 8021A9B8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8021A9BC 7C 08 03 A6 */ mtlr r0 -/* 8021A9C0 38 21 00 60 */ addi r1, r1, 0x60 -/* 8021A9C4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/changeTextureLife__13dMeter2Draw_cFibUc.s b/asm/d/meter/d_meter2_draw/changeTextureLife__13dMeter2Draw_cFibUc.s deleted file mode 100644 index 6f7efc0dc5..0000000000 --- a/asm/d/meter/d_meter2_draw/changeTextureLife__13dMeter2Draw_cFibUc.s +++ /dev/null @@ -1,145 +0,0 @@ -lbl_802147CC: -/* 802147CC 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802147D0 7C 08 02 A6 */ mflr r0 -/* 802147D4 90 01 00 54 */ stw r0, 0x54(r1) -/* 802147D8 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 802147DC F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 802147E0 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 802147E4 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 802147E8 DB A1 00 20 */ stfd f29, 0x20(r1) -/* 802147EC F3 A1 00 28 */ psq_st f29, 40(r1), 0, 0 /* qr0 */ -/* 802147F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802147F4 48 14 D9 DD */ bl _savegpr_26 -/* 802147F8 7C 7E 1B 78 */ mr r30, r3 -/* 802147FC 7C 9F 23 78 */ mr r31, r4 -/* 80214800 7C DA 33 78 */ mr r26, r6 -/* 80214804 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 80214808 41 82 01 A0 */ beq lbl_802149A8 -/* 8021480C 57 40 06 3E */ clrlwi r0, r26, 0x18 -/* 80214810 28 00 00 FF */ cmplwi r0, 0xff -/* 80214814 40 82 00 24 */ bne lbl_80214838 -/* 80214818 57 FC 18 38 */ slwi r28, r31, 3 -/* 8021481C 7C 7E E2 14 */ add r3, r30, r28 -/* 80214820 80 63 03 A0 */ lwz r3, 0x3a0(r3) -/* 80214824 48 04 0D A5 */ bl show__13CPaneMgrAlphaFv -/* 80214828 7C 7E E2 14 */ add r3, r30, r28 -/* 8021482C 80 63 03 A4 */ lwz r3, 0x3a4(r3) -/* 80214830 48 04 0D 99 */ bl show__13CPaneMgrAlphaFv -/* 80214834 48 00 01 90 */ b lbl_802149C4 -lbl_80214838: -/* 80214838 57 FC 18 38 */ slwi r28, r31, 3 -/* 8021483C 7C 7E E2 14 */ add r3, r30, r28 -/* 80214840 80 63 03 A0 */ lwz r3, 0x3a0(r3) -/* 80214844 48 04 0D C5 */ bl hide__13CPaneMgrAlphaFv -/* 80214848 7C 7E E2 14 */ add r3, r30, r28 -/* 8021484C 80 63 03 A4 */ lwz r3, 0x3a4(r3) -/* 80214850 48 04 0D B9 */ bl hide__13CPaneMgrAlphaFv -/* 80214854 3B 60 00 00 */ li r27, 0 -/* 80214858 3B A0 00 00 */ li r29, 0 -/* 8021485C 57 5C 06 3E */ clrlwi r28, r26, 0x18 -lbl_80214860: -/* 80214860 7C 1B E0 00 */ cmpw r27, r28 -/* 80214864 40 82 00 38 */ bne lbl_8021489C -/* 80214868 80 7E 00 78 */ lwz r3, 0x78(r30) -/* 8021486C 3C 80 80 3A */ lis r4, tag_bigh@ha /* 0x80398878@ha */ -/* 80214870 38 04 88 78 */ addi r0, r4, tag_bigh@l /* 0x80398878@l */ -/* 80214874 7C 80 EA 14 */ add r4, r0, r29 -/* 80214878 80 A4 00 00 */ lwz r5, 0(r4) -/* 8021487C 80 C4 00 04 */ lwz r6, 4(r4) -/* 80214880 81 83 00 00 */ lwz r12, 0(r3) -/* 80214884 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214888 7D 89 03 A6 */ mtctr r12 -/* 8021488C 4E 80 04 21 */ bctrl -/* 80214890 38 00 00 01 */ li r0, 1 -/* 80214894 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80214898 48 00 00 34 */ b lbl_802148CC -lbl_8021489C: -/* 8021489C 80 7E 00 78 */ lwz r3, 0x78(r30) -/* 802148A0 3C 80 80 3A */ lis r4, tag_bigh@ha /* 0x80398878@ha */ -/* 802148A4 38 04 88 78 */ addi r0, r4, tag_bigh@l /* 0x80398878@l */ -/* 802148A8 7C 80 EA 14 */ add r4, r0, r29 -/* 802148AC 80 A4 00 00 */ lwz r5, 0(r4) -/* 802148B0 80 C4 00 04 */ lwz r6, 4(r4) -/* 802148B4 81 83 00 00 */ lwz r12, 0(r3) -/* 802148B8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802148BC 7D 89 03 A6 */ mtctr r12 -/* 802148C0 4E 80 04 21 */ bctrl -/* 802148C4 38 00 00 00 */ li r0, 0 -/* 802148C8 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_802148CC: -/* 802148CC 3B 7B 00 01 */ addi r27, r27, 1 -/* 802148D0 2C 1B 00 04 */ cmpwi r27, 4 -/* 802148D4 3B BD 00 08 */ addi r29, r29, 8 -/* 802148D8 41 80 FF 88 */ blt lbl_80214860 -/* 802148DC 57 E0 10 3A */ slwi r0, r31, 2 -/* 802148E0 7F BE 02 14 */ add r29, r30, r0 -/* 802148E4 80 7D 01 28 */ lwz r3, 0x128(r29) -/* 802148E8 80 63 00 04 */ lwz r3, 4(r3) -/* 802148EC C3 E3 00 D8 */ lfs f31, 0xd8(r3) -/* 802148F0 80 7E 00 78 */ lwz r3, 0x78(r30) -/* 802148F4 38 00 00 0A */ li r0, 0xa -/* 802148F8 7C 1F 03 D6 */ divw r0, r31, r0 -/* 802148FC 54 05 18 38 */ slwi r5, r0, 3 -/* 80214900 3C 80 80 3A */ lis r4, tag_du@ha /* 0x80398898@ha */ -/* 80214904 38 04 88 98 */ addi r0, r4, tag_du@l /* 0x80398898@l */ -/* 80214908 7F 80 2A 14 */ add r28, r0, r5 -/* 8021490C 80 BC 00 00 */ lwz r5, 0(r28) -/* 80214910 80 DC 00 04 */ lwz r6, 4(r28) -/* 80214914 81 83 00 00 */ lwz r12, 0(r3) -/* 80214918 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8021491C 7D 89 03 A6 */ mtctr r12 -/* 80214920 4E 80 04 21 */ bctrl -/* 80214924 C3 C3 00 D8 */ lfs f30, 0xd8(r3) -/* 80214928 80 7E 00 78 */ lwz r3, 0x78(r30) -/* 8021492C 3C 80 80 3A */ lis r4, tag_du@ha /* 0x80398898@ha */ -/* 80214930 84 A4 88 98 */ lwzu r5, tag_du@l(r4) /* 0x80398898@l */ -/* 80214934 80 C4 00 04 */ lwz r6, 4(r4) -/* 80214938 81 83 00 00 */ lwz r12, 0(r3) -/* 8021493C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214940 7D 89 03 A6 */ mtctr r12 -/* 80214944 4E 80 04 21 */ bctrl -/* 80214948 C3 A3 00 D4 */ lfs f29, 0xd4(r3) -/* 8021494C 80 7E 00 78 */ lwz r3, 0x78(r30) -/* 80214950 80 BC 00 00 */ lwz r5, 0(r28) -/* 80214954 80 DC 00 04 */ lwz r6, 4(r28) -/* 80214958 81 83 00 00 */ lwz r12, 0(r3) -/* 8021495C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214960 7D 89 03 A6 */ mtctr r12 -/* 80214964 4E 80 04 21 */ bctrl -/* 80214968 C0 03 00 D4 */ lfs f0, 0xd4(r3) -/* 8021496C 80 7D 01 28 */ lwz r3, 0x128(r29) -/* 80214970 80 63 00 04 */ lwz r3, 4(r3) -/* 80214974 C0 23 00 D4 */ lfs f1, 0xd4(r3) -/* 80214978 80 7E 01 C8 */ lwz r3, 0x1c8(r30) -/* 8021497C 80 63 00 04 */ lwz r3, 4(r3) -/* 80214980 EC 00 E8 28 */ fsubs f0, f0, f29 -/* 80214984 EC 01 00 2A */ fadds f0, f1, f0 -/* 80214988 D0 03 00 D4 */ stfs f0, 0xd4(r3) -/* 8021498C EC 1E F8 2A */ fadds f0, f30, f31 -/* 80214990 D0 03 00 D8 */ stfs f0, 0xd8(r3) -/* 80214994 81 83 00 00 */ lwz r12, 0(r3) -/* 80214998 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8021499C 7D 89 03 A6 */ mtctr r12 -/* 802149A0 4E 80 04 21 */ bctrl -/* 802149A4 48 00 00 20 */ b lbl_802149C4 -lbl_802149A8: -/* 802149A8 57 FC 18 38 */ slwi r28, r31, 3 -/* 802149AC 7C 7E E2 14 */ add r3, r30, r28 -/* 802149B0 80 63 03 A0 */ lwz r3, 0x3a0(r3) -/* 802149B4 48 04 0C 55 */ bl hide__13CPaneMgrAlphaFv -/* 802149B8 7C 7E E2 14 */ add r3, r30, r28 -/* 802149BC 80 63 03 A4 */ lwz r3, 0x3a4(r3) -/* 802149C0 48 04 0C 49 */ bl hide__13CPaneMgrAlphaFv -lbl_802149C4: -/* 802149C4 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 802149C8 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 802149CC E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 802149D0 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 802149D4 E3 A1 00 28 */ psq_l f29, 40(r1), 0, 0 /* qr0 */ -/* 802149D8 CB A1 00 20 */ lfd f29, 0x20(r1) -/* 802149DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802149E0 48 14 D8 3D */ bl _restgpr_26 -/* 802149E4 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802149E8 7C 08 03 A6 */ mtlr r0 -/* 802149EC 38 21 00 50 */ addi r1, r1, 0x50 -/* 802149F0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawButton3D__13dMeter2Draw_cFUc.s b/asm/d/meter/d_meter2_draw/drawButton3D__13dMeter2Draw_cFUc.s deleted file mode 100644 index 8c516de8af..0000000000 --- a/asm/d/meter/d_meter2_draw/drawButton3D__13dMeter2Draw_cFUc.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80217904: -/* 80217904 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80217908 7C 08 02 A6 */ mflr r0 -/* 8021790C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80217910 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80217914 93 C1 00 08 */ stw r30, 8(r1) -/* 80217918 7C 7E 1B 78 */ mr r30, r3 -/* 8021791C 7C 9F 23 78 */ mr r31, r4 -/* 80217920 38 A0 00 01 */ li r5, 1 -/* 80217924 38 DE 07 65 */ addi r6, r30, 0x765 -/* 80217928 48 00 29 CD */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 8021792C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80217930 41 82 00 0C */ beq lbl_8021793C -/* 80217934 38 00 00 07 */ li r0, 7 -/* 80217938 98 1E 07 65 */ stb r0, 0x765(r30) -lbl_8021793C: -/* 8021793C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80217940 83 C1 00 08 */ lwz r30, 8(r1) -/* 80217944 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80217948 7C 08 03 A6 */ mtlr r0 -/* 8021794C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80217950 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawButtonA__13dMeter2Draw_cFUcfffffbb.s b/asm/d/meter/d_meter2_draw/drawButtonA__13dMeter2Draw_cFUcfffffbb.s deleted file mode 100644 index f2e72cb4e1..0000000000 --- a/asm/d/meter/d_meter2_draw/drawButtonA__13dMeter2Draw_cFUcfffffbb.s +++ /dev/null @@ -1,224 +0,0 @@ -lbl_80216DAC: -/* 80216DAC 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80216DB0 7C 08 02 A6 */ mflr r0 -/* 80216DB4 90 01 00 94 */ stw r0, 0x94(r1) -/* 80216DB8 DB E1 00 80 */ stfd f31, 0x80(r1) -/* 80216DBC F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 80216DC0 DB C1 00 70 */ stfd f30, 0x70(r1) -/* 80216DC4 F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 /* qr0 */ -/* 80216DC8 DB A1 00 60 */ stfd f29, 0x60(r1) -/* 80216DCC F3 A1 00 68 */ psq_st f29, 104(r1), 0, 0 /* qr0 */ -/* 80216DD0 DB 81 00 50 */ stfd f28, 0x50(r1) -/* 80216DD4 F3 81 00 58 */ psq_st f28, 88(r1), 0, 0 /* qr0 */ -/* 80216DD8 DB 61 00 40 */ stfd f27, 0x40(r1) -/* 80216DDC F3 61 00 48 */ psq_st f27, 72(r1), 0, 0 /* qr0 */ -/* 80216DE0 DB 41 00 30 */ stfd f26, 0x30(r1) -/* 80216DE4 F3 41 00 38 */ psq_st f26, 56(r1), 0, 0 /* qr0 */ -/* 80216DE8 DB 21 00 20 */ stfd f25, 0x20(r1) -/* 80216DEC F3 21 00 28 */ psq_st f25, 40(r1), 0, 0 /* qr0 */ -/* 80216DF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80216DF4 48 14 B3 E1 */ bl _savegpr_27 -/* 80216DF8 7C 7C 1B 78 */ mr r28, r3 -/* 80216DFC 7C 9D 23 78 */ mr r29, r4 -/* 80216E00 FF 20 08 90 */ fmr f25, f1 -/* 80216E04 FF 40 10 90 */ fmr f26, f2 -/* 80216E08 FF 60 18 90 */ fmr f27, f3 -/* 80216E0C FF 80 20 90 */ fmr f28, f4 -/* 80216E10 FF A0 28 90 */ fmr f29, f5 -/* 80216E14 7C BE 2B 78 */ mr r30, r5 -/* 80216E18 7C DB 33 78 */ mr r27, r6 -/* 80216E1C 38 A0 00 01 */ li r5, 1 -/* 80216E20 38 DC 07 61 */ addi r6, r28, 0x761 -/* 80216E24 48 00 34 D1 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 80216E28 7C 7F 1B 78 */ mr r31, r3 -/* 80216E2C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216E30 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216E34 C3 E3 00 A4 */ lfs f31, 0xa4(r3) -/* 80216E38 C3 C3 02 B4 */ lfs f30, 0x2b4(r3) -/* 80216E3C 7F 83 E3 78 */ mr r3, r28 -/* 80216E40 38 80 00 00 */ li r4, 0 -/* 80216E44 48 00 4E 7D */ bl isBButtonShow__13dMeter2Draw_cFb -/* 80216E48 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80216E4C 41 82 00 18 */ beq lbl_80216E64 -/* 80216E50 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216E54 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216E58 C3 E3 00 B4 */ lfs f31, 0xb4(r3) -/* 80216E5C C3 C3 00 B8 */ lfs f30, 0xb8(r3) -/* 80216E60 48 00 00 1C */ b lbl_80216E7C -lbl_80216E64: -/* 80216E64 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80216E68 41 82 00 14 */ beq lbl_80216E7C -/* 80216E6C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216E70 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216E74 C3 E3 00 CC */ lfs f31, 0xcc(r3) -/* 80216E78 C3 C3 00 D0 */ lfs f30, 0xd0(r3) -lbl_80216E7C: -/* 80216E7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80216E80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80216E84 88 63 5E 4A */ lbz r3, 0x5e4a(r3) -/* 80216E88 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f -/* 80216E8C 40 82 00 0C */ bne lbl_80216E98 -/* 80216E90 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d -/* 80216E94 41 82 00 0C */ beq lbl_80216EA0 -lbl_80216E98: -/* 80216E98 38 00 00 07 */ li r0, 7 -/* 80216E9C 98 1C 07 61 */ stb r0, 0x761(r28) -lbl_80216EA0: -/* 80216EA0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80216EA4 41 82 00 6C */ beq lbl_80216F10 -/* 80216EA8 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80216EAC 28 00 00 25 */ cmplwi r0, 0x25 -/* 80216EB0 40 82 00 38 */ bne lbl_80216EE8 -/* 80216EB4 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80216EB8 C0 1C 06 08 */ lfs f0, 0x608(r28) -/* 80216EBC FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80216EC0 40 82 00 1C */ bne lbl_80216EDC -/* 80216EC4 C0 22 AE 98 */ lfs f1, lit_4923(r2) -/* 80216EC8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216ECC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216ED0 C0 03 04 90 */ lfs f0, 0x490(r3) -/* 80216ED4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80216ED8 D0 1C 06 08 */ stfs f0, 0x608(r28) -lbl_80216EDC: -/* 80216EDC 38 00 00 01 */ li r0, 1 -/* 80216EE0 98 1C 07 59 */ stb r0, 0x759(r28) -/* 80216EE4 48 00 00 2C */ b lbl_80216F10 -lbl_80216EE8: -/* 80216EE8 28 00 00 00 */ cmplwi r0, 0 -/* 80216EEC 41 82 00 1C */ beq lbl_80216F08 -/* 80216EF0 C0 22 AE 98 */ lfs f1, lit_4923(r2) -/* 80216EF4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216EF8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216EFC C0 03 04 90 */ lfs f0, 0x490(r3) -/* 80216F00 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80216F04 D0 1C 06 08 */ stfs f0, 0x608(r28) -lbl_80216F08: -/* 80216F08 38 00 00 00 */ li r0, 0 -/* 80216F0C 98 1C 07 59 */ stb r0, 0x759(r28) -lbl_80216F10: -/* 80216F10 88 1F 00 00 */ lbz r0, 0(r31) -/* 80216F14 7C 00 07 75 */ extsb. r0, r0 -/* 80216F18 41 82 00 48 */ beq lbl_80216F60 -/* 80216F1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80216F20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80216F24 88 83 5E 24 */ lbz r4, 0x5e24(r3) -/* 80216F28 88 03 5E 1D */ lbz r0, 0x5e1d(r3) -/* 80216F2C 7C 04 00 40 */ cmplw r4, r0 -/* 80216F30 41 82 00 10 */ beq lbl_80216F40 -/* 80216F34 88 03 5E 35 */ lbz r0, 0x5e35(r3) -/* 80216F38 7C 04 00 40 */ cmplw r4, r0 -/* 80216F3C 40 82 00 10 */ bne lbl_80216F4C -lbl_80216F40: -/* 80216F40 88 1C 07 61 */ lbz r0, 0x761(r28) -/* 80216F44 28 00 00 07 */ cmplwi r0, 7 -/* 80216F48 41 82 00 18 */ beq lbl_80216F60 -lbl_80216F4C: -/* 80216F4C 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F50 48 03 E6 79 */ bl show__13CPaneMgrAlphaFv -/* 80216F54 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F58 48 03 E6 71 */ bl show__13CPaneMgrAlphaFv -/* 80216F5C 48 00 00 0C */ b lbl_80216F68 -lbl_80216F60: -/* 80216F60 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F64 48 03 E6 A5 */ bl hide__13CPaneMgrAlphaFv -lbl_80216F68: -/* 80216F68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80216F6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80216F70 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80216F74 38 00 00 00 */ li r0, 0 -/* 80216F78 88 63 05 6A */ lbz r3, 0x56a(r3) -/* 80216F7C 28 03 00 00 */ cmplwi r3, 0 -/* 80216F80 41 82 00 10 */ beq lbl_80216F90 -/* 80216F84 28 03 00 26 */ cmplwi r3, 0x26 -/* 80216F88 40 80 00 08 */ bge lbl_80216F90 -/* 80216F8C 38 00 00 01 */ li r0, 1 -lbl_80216F90: -/* 80216F90 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80216F94 41 82 00 58 */ beq lbl_80216FEC -/* 80216F98 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F9C 48 03 E6 2D */ bl show__13CPaneMgrAlphaFv -/* 80216FA0 7F 83 E3 78 */ mr r3, r28 -/* 80216FA4 38 80 00 15 */ li r4, 0x15 -/* 80216FA8 38 A0 00 01 */ li r5, 1 -/* 80216FAC 38 C0 00 00 */ li r6, 0 -/* 80216FB0 48 00 33 45 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 80216FB4 7C 7E 1B 78 */ mr r30, r3 -/* 80216FB8 3B E0 00 00 */ li r31, 0 -/* 80216FBC 3B A0 00 00 */ li r29, 0 -lbl_80216FC0: -/* 80216FC0 38 1D 00 C0 */ addi r0, r29, 0xc0 -/* 80216FC4 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 80216FC8 80 63 00 04 */ lwz r3, 4(r3) -/* 80216FCC 48 0E 96 8D */ bl getStringPtr__10J2DTextBoxCFv -/* 80216FD0 7F C4 F3 78 */ mr r4, r30 -/* 80216FD4 48 15 1B 59 */ bl strcpy -/* 80216FD8 3B FF 00 01 */ addi r31, r31, 1 -/* 80216FDC 2C 1F 00 05 */ cmpwi r31, 5 -/* 80216FE0 3B BD 00 04 */ addi r29, r29, 4 -/* 80216FE4 41 80 FF DC */ blt lbl_80216FC0 -/* 80216FE8 48 00 00 34 */ b lbl_8021701C -lbl_80216FEC: -/* 80216FEC 3B C0 00 00 */ li r30, 0 -/* 80216FF0 3B A0 00 00 */ li r29, 0 -lbl_80216FF4: -/* 80216FF4 38 1D 00 C0 */ addi r0, r29, 0xc0 -/* 80216FF8 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 80216FFC 80 63 00 04 */ lwz r3, 4(r3) -/* 80217000 48 0E 96 59 */ bl getStringPtr__10J2DTextBoxCFv -/* 80217004 7F E4 FB 78 */ mr r4, r31 -/* 80217008 48 15 1B 25 */ bl strcpy -/* 8021700C 3B DE 00 01 */ addi r30, r30, 1 -/* 80217010 2C 1E 00 05 */ cmpwi r30, 5 -/* 80217014 3B BD 00 04 */ addi r29, r29, 4 -/* 80217018 41 80 FF DC */ blt lbl_80216FF4 -lbl_8021701C: -/* 8021701C 80 7C 03 00 */ lwz r3, 0x300(r28) -/* 80217020 80 63 00 04 */ lwz r3, 4(r3) -/* 80217024 EC 1F 07 72 */ fmuls f0, f31, f29 -/* 80217028 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8021702C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80217030 81 83 00 00 */ lwz r12, 0(r3) -/* 80217034 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80217038 7D 89 03 A6 */ mtctr r12 -/* 8021703C 4E 80 04 21 */ bctrl -/* 80217040 80 7C 03 00 */ lwz r3, 0x300(r28) -/* 80217044 FC 20 C8 90 */ fmr f1, f25 -/* 80217048 FC 40 D0 90 */ fmr f2, f26 -/* 8021704C 48 03 D5 65 */ bl paneTrans__8CPaneMgrFff -/* 80217050 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80217054 80 63 00 04 */ lwz r3, 4(r3) -/* 80217058 EC 1E 07 72 */ fmuls f0, f30, f29 -/* 8021705C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80217060 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80217064 81 83 00 00 */ lwz r12, 0(r3) -/* 80217068 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8021706C 7D 89 03 A6 */ mtctr r12 -/* 80217070 4E 80 04 21 */ bctrl -/* 80217074 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80217078 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021707C 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217080 C0 04 02 B8 */ lfs f0, 0x2b8(r4) -/* 80217084 EC 20 D8 2A */ fadds f1, f0, f27 -/* 80217088 C0 04 02 BC */ lfs f0, 0x2bc(r4) -/* 8021708C EC 40 E0 2A */ fadds f2, f0, f28 -/* 80217090 48 03 D5 21 */ bl paneTrans__8CPaneMgrFff -/* 80217094 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 80217098 CB E1 00 80 */ lfd f31, 0x80(r1) -/* 8021709C E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 /* qr0 */ -/* 802170A0 CB C1 00 70 */ lfd f30, 0x70(r1) -/* 802170A4 E3 A1 00 68 */ psq_l f29, 104(r1), 0, 0 /* qr0 */ -/* 802170A8 CB A1 00 60 */ lfd f29, 0x60(r1) -/* 802170AC E3 81 00 58 */ psq_l f28, 88(r1), 0, 0 /* qr0 */ -/* 802170B0 CB 81 00 50 */ lfd f28, 0x50(r1) -/* 802170B4 E3 61 00 48 */ psq_l f27, 72(r1), 0, 0 /* qr0 */ -/* 802170B8 CB 61 00 40 */ lfd f27, 0x40(r1) -/* 802170BC E3 41 00 38 */ psq_l f26, 56(r1), 0, 0 /* qr0 */ -/* 802170C0 CB 41 00 30 */ lfd f26, 0x30(r1) -/* 802170C4 E3 21 00 28 */ psq_l f25, 40(r1), 0, 0 /* qr0 */ -/* 802170C8 CB 21 00 20 */ lfd f25, 0x20(r1) -/* 802170CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802170D0 48 14 B1 51 */ bl _restgpr_27 -/* 802170D4 80 01 00 94 */ lwz r0, 0x94(r1) -/* 802170D8 7C 08 03 A6 */ mtlr r0 -/* 802170DC 38 21 00 90 */ addi r1, r1, 0x90 -/* 802170E0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawButtonB__13dMeter2Draw_cFUcbfffffb.s b/asm/d/meter/d_meter2_draw/drawButtonB__13dMeter2Draw_cFUcbfffffb.s deleted file mode 100644 index abbfbce9de..0000000000 --- a/asm/d/meter/d_meter2_draw/drawButtonB__13dMeter2Draw_cFUcbfffffb.s +++ /dev/null @@ -1,366 +0,0 @@ -lbl_802170E4: -/* 802170E4 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 802170E8 7C 08 02 A6 */ mflr r0 -/* 802170EC 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 802170F0 DB E1 00 90 */ stfd f31, 0x90(r1) -/* 802170F4 F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 /* qr0 */ -/* 802170F8 DB C1 00 80 */ stfd f30, 0x80(r1) -/* 802170FC F3 C1 00 88 */ psq_st f30, 136(r1), 0, 0 /* qr0 */ -/* 80217100 DB A1 00 70 */ stfd f29, 0x70(r1) -/* 80217104 F3 A1 00 78 */ psq_st f29, 120(r1), 0, 0 /* qr0 */ -/* 80217108 DB 81 00 60 */ stfd f28, 0x60(r1) -/* 8021710C F3 81 00 68 */ psq_st f28, 104(r1), 0, 0 /* qr0 */ -/* 80217110 DB 61 00 50 */ stfd f27, 0x50(r1) -/* 80217114 F3 61 00 58 */ psq_st f27, 88(r1), 0, 0 /* qr0 */ -/* 80217118 DB 41 00 40 */ stfd f26, 0x40(r1) -/* 8021711C F3 41 00 48 */ psq_st f26, 72(r1), 0, 0 /* qr0 */ -/* 80217120 DB 21 00 30 */ stfd f25, 0x30(r1) -/* 80217124 F3 21 00 38 */ psq_st f25, 56(r1), 0, 0 /* qr0 */ -/* 80217128 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021712C 48 14 B0 A1 */ bl _savegpr_25 -/* 80217130 7C 7A 1B 78 */ mr r26, r3 -/* 80217134 7C 9B 23 78 */ mr r27, r4 -/* 80217138 7C BC 2B 78 */ mr r28, r5 -/* 8021713C FF 20 08 90 */ fmr f25, f1 -/* 80217140 FF 40 10 90 */ fmr f26, f2 -/* 80217144 FF 60 18 90 */ fmr f27, f3 -/* 80217148 FF 80 20 90 */ fmr f28, f4 -/* 8021714C FF A0 28 90 */ fmr f29, f5 -/* 80217150 7C DD 33 78 */ mr r29, r6 -/* 80217154 3B E0 00 00 */ li r31, 0 -/* 80217158 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021715C 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217160 C3 E4 00 EC */ lfs f31, 0xec(r4) -/* 80217164 C3 C4 02 D4 */ lfs f30, 0x2d4(r4) -/* 80217168 38 80 00 01 */ li r4, 1 -/* 8021716C 48 00 4B 55 */ bl isBButtonShow__13dMeter2Draw_cFb -/* 80217170 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80217174 41 82 00 14 */ beq lbl_80217188 -/* 80217178 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021717C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217180 C3 E3 00 FC */ lfs f31, 0xfc(r3) -/* 80217184 C3 C3 01 00 */ lfs f30, 0x100(r3) -lbl_80217188: -/* 80217188 D3 3A 06 EC */ stfs f25, 0x6ec(r26) -/* 8021718C D3 5A 06 F0 */ stfs f26, 0x6f0(r26) -/* 80217190 7F 43 D3 78 */ mr r3, r26 -/* 80217194 7F 64 DB 78 */ mr r4, r27 -/* 80217198 38 A0 00 01 */ li r5, 1 -/* 8021719C 38 DA 07 62 */ addi r6, r26, 0x762 -/* 802171A0 48 00 31 55 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 802171A4 7C 7E 1B 78 */ mr r30, r3 -/* 802171A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802171AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802171B0 88 63 5E 43 */ lbz r3, 0x5e43(r3) -/* 802171B4 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f -/* 802171B8 40 82 00 0C */ bne lbl_802171C4 -/* 802171BC 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d -/* 802171C0 41 82 00 0C */ beq lbl_802171CC -lbl_802171C4: -/* 802171C4 38 00 00 07 */ li r0, 7 -/* 802171C8 98 1A 07 62 */ stb r0, 0x762(r26) -lbl_802171CC: -/* 802171CC 88 1E 00 00 */ lbz r0, 0(r30) -/* 802171D0 7C 00 07 75 */ extsb. r0, r0 -/* 802171D4 41 82 00 58 */ beq lbl_8021722C -/* 802171D8 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 802171DC 41 82 00 50 */ beq lbl_8021722C -/* 802171E0 28 00 00 2E */ cmplwi r0, 0x2e -/* 802171E4 41 82 00 48 */ beq lbl_8021722C -/* 802171E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802171EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802171F0 88 83 5E 24 */ lbz r4, 0x5e24(r3) -/* 802171F4 28 04 00 00 */ cmplwi r4, 0 -/* 802171F8 41 82 00 28 */ beq lbl_80217220 -/* 802171FC 88 03 5E 1D */ lbz r0, 0x5e1d(r3) -/* 80217200 7C 04 00 40 */ cmplw r4, r0 -/* 80217204 41 82 00 10 */ beq lbl_80217214 -/* 80217208 88 03 5E 35 */ lbz r0, 0x5e35(r3) -/* 8021720C 7C 04 00 40 */ cmplw r4, r0 -/* 80217210 40 82 00 10 */ bne lbl_80217220 -lbl_80217214: -/* 80217214 88 1A 07 62 */ lbz r0, 0x762(r26) -/* 80217218 28 00 00 07 */ cmplwi r0, 7 -/* 8021721C 41 82 00 10 */ beq lbl_8021722C -lbl_80217220: -/* 80217220 80 7A 03 50 */ lwz r3, 0x350(r26) -/* 80217224 48 03 E3 A5 */ bl show__13CPaneMgrAlphaFv -/* 80217228 48 00 00 0C */ b lbl_80217234 -lbl_8021722C: -/* 8021722C 80 7A 03 50 */ lwz r3, 0x350(r26) -/* 80217230 48 03 E3 D9 */ bl hide__13CPaneMgrAlphaFv -lbl_80217234: -/* 80217234 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80217238 41 82 00 7C */ beq lbl_802172B4 -/* 8021723C 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 80217240 28 00 00 10 */ cmplwi r0, 0x10 -/* 80217244 40 82 00 38 */ bne lbl_8021727C -/* 80217248 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 8021724C C0 1A 06 0C */ lfs f0, 0x60c(r26) -/* 80217250 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80217254 40 82 00 1C */ bne lbl_80217270 -/* 80217258 C0 22 AE 98 */ lfs f1, lit_4923(r2) -/* 8021725C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217260 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217264 C0 03 04 A4 */ lfs f0, 0x4a4(r3) -/* 80217268 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8021726C D0 1A 06 0C */ stfs f0, 0x60c(r26) -lbl_80217270: -/* 80217270 38 00 00 01 */ li r0, 1 -/* 80217274 98 1A 07 5A */ stb r0, 0x75a(r26) -/* 80217278 48 00 00 3C */ b lbl_802172B4 -lbl_8021727C: -/* 8021727C 28 00 00 00 */ cmplwi r0, 0 -/* 80217280 41 82 00 2C */ beq lbl_802172AC -/* 80217284 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80217288 C0 1A 06 0C */ lfs f0, 0x60c(r26) -/* 8021728C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80217290 40 82 00 1C */ bne lbl_802172AC -/* 80217294 C0 22 AE 98 */ lfs f1, lit_4923(r2) -/* 80217298 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021729C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802172A0 C0 03 04 A4 */ lfs f0, 0x4a4(r3) -/* 802172A4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802172A8 D0 1A 06 0C */ stfs f0, 0x60c(r26) -lbl_802172AC: -/* 802172AC 38 00 00 00 */ li r0, 0 -/* 802172B0 98 1A 07 5A */ stb r0, 0x75a(r26) -lbl_802172B4: -/* 802172B4 3B 20 00 00 */ li r25, 0 -/* 802172B8 3B A0 00 00 */ li r29, 0 -lbl_802172BC: -/* 802172BC 38 1D 00 D4 */ addi r0, r29, 0xd4 -/* 802172C0 7C 7A 00 2E */ lwzx r3, r26, r0 -/* 802172C4 80 63 00 04 */ lwz r3, 4(r3) -/* 802172C8 48 0E 93 91 */ bl getStringPtr__10J2DTextBoxCFv -/* 802172CC 7F C4 F3 78 */ mr r4, r30 -/* 802172D0 48 15 18 5D */ bl strcpy -/* 802172D4 3B 39 00 01 */ addi r25, r25, 1 -/* 802172D8 2C 19 00 05 */ cmpwi r25, 5 -/* 802172DC 3B BD 00 04 */ addi r29, r29, 4 -/* 802172E0 41 80 FF DC */ blt lbl_802172BC -/* 802172E4 57 63 06 3E */ clrlwi r3, r27, 0x18 -/* 802172E8 28 03 00 26 */ cmplwi r3, 0x26 -/* 802172EC 41 82 00 0C */ beq lbl_802172F8 -/* 802172F0 28 03 00 2E */ cmplwi r3, 0x2e -/* 802172F4 40 82 00 C8 */ bne lbl_802173BC -lbl_802172F8: -/* 802172F8 80 7A 00 78 */ lwz r3, 0x78(r26) -/* 802172FC 3C 80 5F 62 */ lis r4, 0x5F62 /* 0x5F625F6E@ha */ -/* 80217300 38 C4 5F 6E */ addi r6, r4, 0x5F6E /* 0x5F625F6E@l */ -/* 80217304 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */ -/* 80217308 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */ -/* 8021730C 81 83 00 00 */ lwz r12, 0(r3) -/* 80217310 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80217314 7D 89 03 A6 */ mtctr r12 -/* 80217318 4E 80 04 21 */ bctrl -/* 8021731C 38 00 00 01 */ li r0, 1 -/* 80217320 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80217324 3B E0 00 01 */ li r31, 1 -/* 80217328 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021732C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80217330 88 85 00 14 */ lbz r4, 0x14(r5) -/* 80217334 88 7A 07 6F */ lbz r3, 0x76f(r26) -/* 80217338 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8021733C 7C 03 00 40 */ cmplw r3, r0 -/* 80217340 41 82 01 04 */ beq lbl_80217444 -/* 80217344 98 9A 07 6F */ stb r4, 0x76f(r26) -/* 80217348 88 05 00 14 */ lbz r0, 0x14(r5) -/* 8021734C 2C 00 00 3F */ cmpwi r0, 0x3f -/* 80217350 41 82 00 28 */ beq lbl_80217378 -/* 80217354 40 80 00 18 */ bge lbl_8021736C -/* 80217358 2C 00 00 2A */ cmpwi r0, 0x2a -/* 8021735C 40 80 00 2C */ bge lbl_80217388 -/* 80217360 2C 00 00 28 */ cmpwi r0, 0x28 -/* 80217364 40 80 00 14 */ bge lbl_80217378 -/* 80217368 48 00 00 20 */ b lbl_80217388 -lbl_8021736C: -/* 8021736C 2C 00 00 49 */ cmpwi r0, 0x49 -/* 80217370 41 82 00 08 */ beq lbl_80217378 -/* 80217374 48 00 00 14 */ b lbl_80217388 -lbl_80217378: -/* 80217378 7F 43 D3 78 */ mr r3, r26 -/* 8021737C 88 9A 07 6F */ lbz r4, 0x76f(r26) -/* 80217380 48 00 30 E9 */ bl changeTextureItemB__13dMeter2Draw_cFUc -/* 80217384 48 00 00 C0 */ b lbl_80217444 -lbl_80217388: -/* 80217388 80 7A 00 78 */ lwz r3, 0x78(r26) -/* 8021738C 3C 80 5F 62 */ lis r4, 0x5F62 /* 0x5F625F6E@ha */ -/* 80217390 38 C4 5F 6E */ addi r6, r4, 0x5F6E /* 0x5F625F6E@l */ -/* 80217394 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */ -/* 80217398 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */ -/* 8021739C 81 83 00 00 */ lwz r12, 0(r3) -/* 802173A0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802173A4 7D 89 03 A6 */ mtctr r12 -/* 802173A8 4E 80 04 21 */ bctrl -/* 802173AC 38 00 00 00 */ li r0, 0 -/* 802173B0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802173B4 3B E0 00 00 */ li r31, 0 -/* 802173B8 48 00 00 8C */ b lbl_80217444 -lbl_802173BC: -/* 802173BC 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 802173C0 28 00 00 01 */ cmplwi r0, 1 -/* 802173C4 40 82 00 54 */ bne lbl_80217418 -/* 802173C8 28 03 00 4F */ cmplwi r3, 0x4f -/* 802173CC 40 82 00 4C */ bne lbl_80217418 -/* 802173D0 80 7A 00 78 */ lwz r3, 0x78(r26) -/* 802173D4 3C 80 5F 62 */ lis r4, 0x5F62 /* 0x5F625F6E@ha */ -/* 802173D8 38 C4 5F 6E */ addi r6, r4, 0x5F6E /* 0x5F625F6E@l */ -/* 802173DC 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */ -/* 802173E0 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */ -/* 802173E4 81 83 00 00 */ lwz r12, 0(r3) -/* 802173E8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802173EC 7D 89 03 A6 */ mtctr r12 -/* 802173F0 4E 80 04 21 */ bctrl -/* 802173F4 38 00 00 01 */ li r0, 1 -/* 802173F8 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802173FC 38 00 00 58 */ li r0, 0x58 -/* 80217400 98 1A 07 6F */ stb r0, 0x76f(r26) -/* 80217404 7F 43 D3 78 */ mr r3, r26 -/* 80217408 38 80 00 58 */ li r4, 0x58 -/* 8021740C 48 00 30 5D */ bl changeTextureItemB__13dMeter2Draw_cFUc -/* 80217410 3B E0 00 02 */ li r31, 2 -/* 80217414 48 00 00 30 */ b lbl_80217444 -lbl_80217418: -/* 80217418 80 7A 00 78 */ lwz r3, 0x78(r26) -/* 8021741C 3C 80 5F 62 */ lis r4, 0x5F62 /* 0x5F625F6E@ha */ -/* 80217420 38 C4 5F 6E */ addi r6, r4, 0x5F6E /* 0x5F625F6E@l */ -/* 80217424 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */ -/* 80217428 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */ -/* 8021742C 81 83 00 00 */ lwz r12, 0(r3) -/* 80217430 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80217434 7D 89 03 A6 */ mtctr r12 -/* 80217438 4E 80 04 21 */ bctrl -/* 8021743C 38 00 00 00 */ li r0, 0 -/* 80217440 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_80217444: -/* 80217444 80 7A 03 28 */ lwz r3, 0x328(r26) -/* 80217448 80 63 00 04 */ lwz r3, 4(r3) -/* 8021744C C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80217450 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80217454 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80217458 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 8021745C C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80217460 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80217464 C0 02 AE 94 */ lfs f0, lit_4922(r2) -/* 80217468 EC 20 00 72 */ fmuls f1, f0, f1 -/* 8021746C EC 40 00 B2 */ fmuls f2, f0, f2 -/* 80217470 38 80 00 7A */ li r4, 0x7a -/* 80217474 3C A0 80 43 */ lis r5, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217478 38 05 EB C8 */ addi r0, r5, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021747C 57 FB 10 3A */ slwi r27, r31, 2 -/* 80217480 7C A0 DA 14 */ add r5, r0, r27 -/* 80217484 C0 65 01 9C */ lfs f3, 0x19c(r5) -/* 80217488 48 0D FD 55 */ bl rotate__7J2DPaneFff13J2DRotateAxisf -/* 8021748C EC 1F 07 72 */ fmuls f0, f31, f29 -/* 80217490 D0 1A 07 30 */ stfs f0, 0x730(r26) -/* 80217494 C0 3A 07 30 */ lfs f1, 0x730(r26) -/* 80217498 C0 1A 07 34 */ lfs f0, 0x734(r26) -/* 8021749C EC 01 00 32 */ fmuls f0, f1, f0 -/* 802174A0 80 7A 03 04 */ lwz r3, 0x304(r26) -/* 802174A4 80 63 00 04 */ lwz r3, 4(r3) -/* 802174A8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802174AC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802174B0 81 83 00 00 */ lwz r12, 0(r3) -/* 802174B4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802174B8 7D 89 03 A6 */ mtctr r12 -/* 802174BC 4E 80 04 21 */ bctrl -/* 802174C0 80 7A 03 04 */ lwz r3, 0x304(r26) -/* 802174C4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802174C8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802174CC C0 04 00 F4 */ lfs f0, 0xf4(r4) -/* 802174D0 EC 20 C8 2A */ fadds f1, f0, f25 -/* 802174D4 C0 04 00 F8 */ lfs f0, 0xf8(r4) -/* 802174D8 EC 40 D0 2A */ fadds f2, f0, f26 -/* 802174DC 48 03 D0 D5 */ bl paneTrans__8CPaneMgrFff -/* 802174E0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802174E4 38 03 EB C8 */ addi r0, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802174E8 7C 60 DA 14 */ add r3, r0, r27 -/* 802174EC C0 03 01 A8 */ lfs f0, 0x1a8(r3) -/* 802174F0 EC 00 07 72 */ fmuls f0, f0, f29 -/* 802174F4 D0 1A 07 28 */ stfs f0, 0x728(r26) -/* 802174F8 C0 3A 07 28 */ lfs f1, 0x728(r26) -/* 802174FC C0 1A 07 34 */ lfs f0, 0x734(r26) -/* 80217500 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80217504 80 7A 03 28 */ lwz r3, 0x328(r26) -/* 80217508 80 63 00 04 */ lwz r3, 4(r3) -/* 8021750C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80217510 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80217514 81 83 00 00 */ lwz r12, 0(r3) -/* 80217518 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8021751C 7D 89 03 A6 */ mtctr r12 -/* 80217520 4E 80 04 21 */ bctrl -/* 80217524 80 7A 03 28 */ lwz r3, 0x328(r26) -/* 80217528 C0 3A 06 DC */ lfs f1, 0x6dc(r26) -/* 8021752C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217530 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217534 7C 80 DA 14 */ add r4, r0, r27 -/* 80217538 C0 04 01 84 */ lfs f0, 0x184(r4) -/* 8021753C EC 00 C8 2A */ fadds f0, f0, f25 -/* 80217540 EC 21 00 2A */ fadds f1, f1, f0 -/* 80217544 C0 5A 06 E0 */ lfs f2, 0x6e0(r26) -/* 80217548 C0 04 01 90 */ lfs f0, 0x190(r4) -/* 8021754C EC 00 D0 2A */ fadds f0, f0, f26 -/* 80217550 EC 42 00 2A */ fadds f2, f2, f0 -/* 80217554 48 03 D0 5D */ bl paneTrans__8CPaneMgrFff -/* 80217558 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021755C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217560 C0 03 02 20 */ lfs f0, 0x220(r3) -/* 80217564 EC 00 07 72 */ fmuls f0, f0, f29 -/* 80217568 D0 1A 07 2C */ stfs f0, 0x72c(r26) -/* 8021756C C0 3A 07 2C */ lfs f1, 0x72c(r26) -/* 80217570 C0 1A 07 34 */ lfs f0, 0x734(r26) -/* 80217574 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80217578 80 7A 03 18 */ lwz r3, 0x318(r26) -/* 8021757C 80 63 00 04 */ lwz r3, 4(r3) -/* 80217580 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80217584 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80217588 81 83 00 00 */ lwz r12, 0(r3) -/* 8021758C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80217590 7D 89 03 A6 */ mtctr r12 -/* 80217594 4E 80 04 21 */ bctrl -/* 80217598 80 7A 03 18 */ lwz r3, 0x318(r26) -/* 8021759C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802175A0 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802175A4 C0 04 02 28 */ lfs f0, 0x228(r4) -/* 802175A8 EC 20 C8 2A */ fadds f1, f0, f25 -/* 802175AC C0 04 02 30 */ lfs f0, 0x230(r4) -/* 802175B0 EC 40 D0 2A */ fadds f2, f0, f26 -/* 802175B4 48 03 CF FD */ bl paneTrans__8CPaneMgrFff -/* 802175B8 80 7A 03 50 */ lwz r3, 0x350(r26) -/* 802175BC 80 63 00 04 */ lwz r3, 4(r3) -/* 802175C0 EC 1E 07 72 */ fmuls f0, f30, f29 -/* 802175C4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802175C8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802175CC 81 83 00 00 */ lwz r12, 0(r3) -/* 802175D0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802175D4 7D 89 03 A6 */ mtctr r12 -/* 802175D8 4E 80 04 21 */ bctrl -/* 802175DC 80 7A 03 50 */ lwz r3, 0x350(r26) -/* 802175E0 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802175E4 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802175E8 C0 04 02 D8 */ lfs f0, 0x2d8(r4) -/* 802175EC EC 20 D8 2A */ fadds f1, f0, f27 -/* 802175F0 C0 04 02 DC */ lfs f0, 0x2dc(r4) -/* 802175F4 EC 40 E0 2A */ fadds f2, f0, f28 -/* 802175F8 48 03 CF B9 */ bl paneTrans__8CPaneMgrFff -/* 802175FC E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* qr0 */ -/* 80217600 CB E1 00 90 */ lfd f31, 0x90(r1) -/* 80217604 E3 C1 00 88 */ psq_l f30, 136(r1), 0, 0 /* qr0 */ -/* 80217608 CB C1 00 80 */ lfd f30, 0x80(r1) -/* 8021760C E3 A1 00 78 */ psq_l f29, 120(r1), 0, 0 /* qr0 */ -/* 80217610 CB A1 00 70 */ lfd f29, 0x70(r1) -/* 80217614 E3 81 00 68 */ psq_l f28, 104(r1), 0, 0 /* qr0 */ -/* 80217618 CB 81 00 60 */ lfd f28, 0x60(r1) -/* 8021761C E3 61 00 58 */ psq_l f27, 88(r1), 0, 0 /* qr0 */ -/* 80217620 CB 61 00 50 */ lfd f27, 0x50(r1) -/* 80217624 E3 41 00 48 */ psq_l f26, 72(r1), 0, 0 /* qr0 */ -/* 80217628 CB 41 00 40 */ lfd f26, 0x40(r1) -/* 8021762C E3 21 00 38 */ psq_l f25, 56(r1), 0, 0 /* qr0 */ -/* 80217630 CB 21 00 30 */ lfd f25, 0x30(r1) -/* 80217634 39 61 00 30 */ addi r11, r1, 0x30 -/* 80217638 48 14 AB E1 */ bl _restgpr_25 -/* 8021763C 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 80217640 7C 08 03 A6 */ mtlr r0 -/* 80217644 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80217648 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawButtonBin__13dMeter2Draw_cFUc.s b/asm/d/meter/d_meter2_draw/drawButtonBin__13dMeter2Draw_cFUc.s deleted file mode 100644 index 45dd9c1e92..0000000000 --- a/asm/d/meter/d_meter2_draw/drawButtonBin__13dMeter2Draw_cFUc.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80217A10: -/* 80217A10 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80217A14 7C 08 02 A6 */ mflr r0 -/* 80217A18 90 01 00 24 */ stw r0, 0x24(r1) -/* 80217A1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80217A20 48 14 A7 B5 */ bl _savegpr_27 -/* 80217A24 7C 7B 1B 78 */ mr r27, r3 -/* 80217A28 7C 9C 23 78 */ mr r28, r4 -/* 80217A2C 3B C0 00 00 */ li r30, 0 -/* 80217A30 3B A0 00 00 */ li r29, 0 -/* 80217A34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80217A38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80217A3C 3B E3 00 9C */ addi r31, r3, 0x9c -lbl_80217A40: -/* 80217A40 7F E3 FB 78 */ mr r3, r31 -/* 80217A44 38 1D 00 0B */ addi r0, r29, 0xb -/* 80217A48 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80217A4C 38 A0 00 01 */ li r5, 1 -/* 80217A50 4B E1 B5 E1 */ bl getItem__17dSv_player_item_cCFib -/* 80217A54 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80217A58 28 00 00 FF */ cmplwi r0, 0xff -/* 80217A5C 41 82 00 08 */ beq lbl_80217A64 -/* 80217A60 3B DE 00 01 */ addi r30, r30, 1 -lbl_80217A64: -/* 80217A64 3B BD 00 01 */ addi r29, r29, 1 -/* 80217A68 2C 1D 00 04 */ cmpwi r29, 4 -/* 80217A6C 41 80 FF D4 */ blt lbl_80217A40 -/* 80217A70 2C 1E 00 00 */ cmpwi r30, 0 -/* 80217A74 41 82 00 28 */ beq lbl_80217A9C -/* 80217A78 7F 63 DB 78 */ mr r3, r27 -/* 80217A7C 7F 84 E3 78 */ mr r4, r28 -/* 80217A80 38 A0 00 01 */ li r5, 1 -/* 80217A84 38 DB 07 63 */ addi r6, r27, 0x763 -/* 80217A88 48 00 28 6D */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 80217A8C 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80217A90 41 82 00 0C */ beq lbl_80217A9C -/* 80217A94 38 00 00 07 */ li r0, 7 -/* 80217A98 98 1B 07 63 */ stb r0, 0x763(r27) -lbl_80217A9C: -/* 80217A9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80217AA0 48 14 A7 81 */ bl _restgpr_27 -/* 80217AA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80217AA8 7C 08 03 A6 */ mtlr r0 -/* 80217AAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80217AB0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawButtonC__13dMeter2Draw_cFUcb.s b/asm/d/meter/d_meter2_draw/drawButtonC__13dMeter2Draw_cFUcb.s deleted file mode 100644 index ecc32bc6f2..0000000000 --- a/asm/d/meter/d_meter2_draw/drawButtonC__13dMeter2Draw_cFUcb.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80217954: -/* 80217954 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80217958 7C 08 02 A6 */ mflr r0 -/* 8021795C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80217960 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80217964 93 C1 00 08 */ stw r30, 8(r1) -/* 80217968 7C 7E 1B 78 */ mr r30, r3 -/* 8021796C 7C 9F 23 78 */ mr r31, r4 -/* 80217970 38 A0 00 01 */ li r5, 1 -/* 80217974 38 DE 07 66 */ addi r6, r30, 0x766 -/* 80217978 48 00 29 7D */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 8021797C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80217980 41 82 00 28 */ beq lbl_802179A8 -/* 80217984 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80217988 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021798C 88 63 5E 4C */ lbz r3, 0x5e4c(r3) -/* 80217990 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f -/* 80217994 40 82 00 0C */ bne lbl_802179A0 -/* 80217998 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d -/* 8021799C 41 82 00 0C */ beq lbl_802179A8 -lbl_802179A0: -/* 802179A0 38 00 00 07 */ li r0, 7 -/* 802179A4 98 1E 07 66 */ stb r0, 0x766(r30) -lbl_802179A8: -/* 802179A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802179AC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802179B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802179B4 7C 08 03 A6 */ mtlr r0 -/* 802179B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802179BC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawButtonCross__13dMeter2Draw_cFff.s b/asm/d/meter/d_meter2_draw/drawButtonCross__13dMeter2Draw_cFff.s deleted file mode 100644 index bee044670f..0000000000 --- a/asm/d/meter/d_meter2_draw/drawButtonCross__13dMeter2Draw_cFff.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80218254: -/* 80218254 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80218258 7C 08 02 A6 */ mflr r0 -/* 8021825C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80218260 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80218264 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80218268 DB C1 00 10 */ stfd f30, 0x10(r1) -/* 8021826C F3 C1 00 18 */ psq_st f30, 24(r1), 0, 0 /* qr0 */ -/* 80218270 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80218274 93 C1 00 08 */ stw r30, 8(r1) -/* 80218278 7C 7E 1B 78 */ mr r30, r3 -/* 8021827C FF C0 08 90 */ fmr f30, f1 -/* 80218280 FF E0 10 90 */ fmr f31, f2 -/* 80218284 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218288 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021828C C0 03 03 FC */ lfs f0, 0x3fc(r3) -/* 80218290 80 7E 03 68 */ lwz r3, 0x368(r30) -/* 80218294 80 63 00 04 */ lwz r3, 4(r3) -/* 80218298 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8021829C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802182A0 81 83 00 00 */ lwz r12, 0(r3) -/* 802182A4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802182A8 7D 89 03 A6 */ mtctr r12 -/* 802182AC 4E 80 04 21 */ bctrl -/* 802182B0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802182B4 3B E3 EB C8 */ addi r31, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802182B8 C0 1F 04 10 */ lfs f0, 0x410(r31) -/* 802182BC 80 7E 03 60 */ lwz r3, 0x360(r30) -/* 802182C0 80 63 00 04 */ lwz r3, 4(r3) -/* 802182C4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802182C8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802182CC 81 83 00 00 */ lwz r12, 0(r3) -/* 802182D0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802182D4 7D 89 03 A6 */ mtctr r12 -/* 802182D8 4E 80 04 21 */ bctrl -/* 802182DC C0 1F 04 10 */ lfs f0, 0x410(r31) -/* 802182E0 80 7E 03 64 */ lwz r3, 0x364(r30) -/* 802182E4 80 63 00 04 */ lwz r3, 4(r3) -/* 802182E8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802182EC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802182F0 81 83 00 00 */ lwz r12, 0(r3) -/* 802182F4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802182F8 7D 89 03 A6 */ mtctr r12 -/* 802182FC 4E 80 04 21 */ bctrl -/* 80218300 80 7E 03 68 */ lwz r3, 0x368(r30) -/* 80218304 FC 20 F0 90 */ fmr f1, f30 -/* 80218308 FC 40 F8 90 */ fmr f2, f31 -/* 8021830C 48 03 C2 A5 */ bl paneTrans__8CPaneMgrFff -/* 80218310 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80218314 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80218318 E3 C1 00 18 */ psq_l f30, 24(r1), 0, 0 /* qr0 */ -/* 8021831C CB C1 00 10 */ lfd f30, 0x10(r1) -/* 80218320 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80218324 83 C1 00 08 */ lwz r30, 8(r1) -/* 80218328 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8021832C 7C 08 03 A6 */ mtlr r0 -/* 80218330 38 21 00 30 */ addi r1, r1, 0x30 -/* 80218334 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawButtonR__13dMeter2Draw_cFUcUcbb.s b/asm/d/meter/d_meter2_draw/drawButtonR__13dMeter2Draw_cFUcUcbb.s deleted file mode 100644 index cf2ae131e6..0000000000 --- a/asm/d/meter/d_meter2_draw/drawButtonR__13dMeter2Draw_cFUcUcbb.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8021764C: -/* 8021764C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80217650 7C 08 02 A6 */ mflr r0 -/* 80217654 90 01 00 14 */ stw r0, 0x14(r1) -/* 80217658 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021765C 93 C1 00 08 */ stw r30, 8(r1) -/* 80217660 7C 7E 1B 78 */ mr r30, r3 -/* 80217664 7C BF 2B 78 */ mr r31, r5 -/* 80217668 80 63 00 78 */ lwz r3, 0x78(r3) -/* 8021766C 3C 80 5F 72 */ lis r4, 0x5F72 /* 0x5F725F6E@ha */ -/* 80217670 38 C4 5F 6E */ addi r6, r4, 0x5F6E /* 0x5F725F6E@l */ -/* 80217674 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */ -/* 80217678 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */ -/* 8021767C 81 83 00 00 */ lwz r12, 0(r3) -/* 80217680 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80217684 7D 89 03 A6 */ mtctr r12 -/* 80217688 4E 80 04 21 */ bctrl -/* 8021768C 38 00 00 00 */ li r0, 0 -/* 80217690 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80217694 80 7E 03 5C */ lwz r3, 0x35c(r30) -/* 80217698 48 03 DF 31 */ bl show__13CPaneMgrAlphaFv -/* 8021769C 7F C3 F3 78 */ mr r3, r30 -/* 802176A0 7F E4 FB 78 */ mr r4, r31 -/* 802176A4 38 A0 00 01 */ li r5, 1 -/* 802176A8 38 DE 07 6A */ addi r6, r30, 0x76a -/* 802176AC 48 00 2C 49 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 802176B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802176B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802176B8 88 63 5E 42 */ lbz r3, 0x5e42(r3) -/* 802176BC 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f -/* 802176C0 40 82 00 0C */ bne lbl_802176CC -/* 802176C4 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d -/* 802176C8 41 82 00 0C */ beq lbl_802176D4 -lbl_802176CC: -/* 802176CC 38 00 00 07 */ li r0, 7 -/* 802176D0 98 1E 07 6A */ stb r0, 0x76a(r30) -lbl_802176D4: -/* 802176D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802176D8 83 C1 00 08 */ lwz r30, 8(r1) -/* 802176DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802176E0 7C 08 03 A6 */ mtlr r0 -/* 802176E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802176E8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawButtonXY__13dMeter2Draw_cFiUcUcbb.s b/asm/d/meter/d_meter2_draw/drawButtonXY__13dMeter2Draw_cFiUcUcbb.s deleted file mode 100644 index 48965f1355..0000000000 --- a/asm/d/meter/d_meter2_draw/drawButtonXY__13dMeter2Draw_cFiUcUcbb.s +++ /dev/null @@ -1,506 +0,0 @@ -lbl_80217AB4: -/* 80217AB4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80217AB8 7C 08 02 A6 */ mflr r0 -/* 80217ABC 90 01 00 44 */ stw r0, 0x44(r1) -/* 80217AC0 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80217AC4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80217AC8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80217ACC 48 14 A7 01 */ bl _savegpr_25 -/* 80217AD0 7C 7F 1B 78 */ mr r31, r3 -/* 80217AD4 7C 9B 23 78 */ mr r27, r4 -/* 80217AD8 7C B9 2B 78 */ mr r25, r5 -/* 80217ADC 7C DC 33 78 */ mr r28, r6 -/* 80217AE0 7D 1D 43 78 */ mr r29, r8 -/* 80217AE4 54 E0 06 3F */ clrlwi. r0, r7, 0x18 -/* 80217AE8 40 82 02 44 */ bne lbl_80217D2C -/* 80217AEC 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80217AF0 57 65 18 38 */ slwi r5, r27, 3 -/* 80217AF4 3C 80 80 3A */ lis r4, tag_7361@ha /* 0x803988A8@ha */ -/* 80217AF8 38 04 88 A8 */ addi r0, r4, tag_7361@l /* 0x803988A8@l */ -/* 80217AFC 7C 80 2A 14 */ add r4, r0, r5 -/* 80217B00 80 A4 00 00 */ lwz r5, 0(r4) -/* 80217B04 80 C4 00 04 */ lwz r6, 4(r4) -/* 80217B08 81 83 00 00 */ lwz r12, 0(r3) -/* 80217B0C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80217B10 7D 89 03 A6 */ mtctr r12 -/* 80217B14 4E 80 04 21 */ bctrl -/* 80217B18 38 00 00 00 */ li r0, 0 -/* 80217B1C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80217B20 2C 1B 00 00 */ cmpwi r27, 0 -/* 80217B24 40 82 00 20 */ bne lbl_80217B44 -/* 80217B28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80217B2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80217B30 88 03 5E 5E */ lbz r0, 0x5e5e(r3) -/* 80217B34 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f -/* 80217B38 54 00 FF FE */ rlwinm r0, r0, 0x1f, 0x1f, 0x1f -/* 80217B3C 7C 1A 1B 78 */ or r26, r0, r3 -/* 80217B40 48 00 00 24 */ b lbl_80217B64 -lbl_80217B44: -/* 80217B44 2C 1B 00 01 */ cmpwi r27, 1 -/* 80217B48 40 82 00 1C */ bne lbl_80217B64 -/* 80217B4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80217B50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80217B54 88 03 5E 62 */ lbz r0, 0x5e62(r3) -/* 80217B58 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f -/* 80217B5C 54 00 FF FE */ rlwinm r0, r0, 0x1f, 0x1f, 0x1f -/* 80217B60 7C 1A 1B 78 */ or r26, r0, r3 -lbl_80217B64: -/* 80217B64 7F E3 FB 78 */ mr r3, r31 -/* 80217B68 7F 84 E3 78 */ mr r4, r28 -/* 80217B6C 38 A0 00 01 */ li r5, 1 -/* 80217B70 38 DB 07 68 */ addi r6, r27, 0x768 -/* 80217B74 7C DF 32 14 */ add r6, r31, r6 -/* 80217B78 48 00 27 7D */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 80217B7C 7C 7E 1B 78 */ mr r30, r3 -/* 80217B80 2C 1A 00 00 */ cmpwi r26, 0 -/* 80217B84 41 82 00 10 */ beq lbl_80217B94 -/* 80217B88 38 00 00 07 */ li r0, 7 -/* 80217B8C 7C 7F DA 14 */ add r3, r31, r27 -/* 80217B90 98 03 07 68 */ stb r0, 0x768(r3) -lbl_80217B94: -/* 80217B94 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80217B98 41 82 00 84 */ beq lbl_80217C1C -/* 80217B9C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80217BA0 28 00 00 10 */ cmplwi r0, 0x10 -/* 80217BA4 40 82 00 44 */ bne lbl_80217BE8 -/* 80217BA8 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80217BAC 57 60 10 3A */ slwi r0, r27, 2 -/* 80217BB0 7C 9F 02 14 */ add r4, r31, r0 -/* 80217BB4 C0 04 06 20 */ lfs f0, 0x620(r4) -/* 80217BB8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80217BBC 40 82 00 1C */ bne lbl_80217BD8 -/* 80217BC0 C0 22 AE 98 */ lfs f1, lit_4923(r2) -/* 80217BC4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217BC8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217BCC C0 03 04 7C */ lfs f0, 0x47c(r3) -/* 80217BD0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80217BD4 D0 04 06 20 */ stfs f0, 0x620(r4) -lbl_80217BD8: -/* 80217BD8 38 00 00 01 */ li r0, 1 -/* 80217BDC 7C 7F DA 14 */ add r3, r31, r27 -/* 80217BE0 98 03 07 5C */ stb r0, 0x75c(r3) -/* 80217BE4 48 00 00 38 */ b lbl_80217C1C -lbl_80217BE8: -/* 80217BE8 28 00 00 00 */ cmplwi r0, 0 -/* 80217BEC 41 82 00 24 */ beq lbl_80217C10 -/* 80217BF0 C0 22 AE 98 */ lfs f1, lit_4923(r2) -/* 80217BF4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217BF8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217BFC C0 03 04 7C */ lfs f0, 0x47c(r3) -/* 80217C00 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80217C04 57 60 10 3A */ slwi r0, r27, 2 -/* 80217C08 7C 7F 02 14 */ add r3, r31, r0 -/* 80217C0C D0 03 06 20 */ stfs f0, 0x620(r3) -lbl_80217C10: -/* 80217C10 38 00 00 00 */ li r0, 0 -/* 80217C14 7C 7F DA 14 */ add r3, r31, r27 -/* 80217C18 98 03 07 5C */ stb r0, 0x75c(r3) -lbl_80217C1C: -/* 80217C1C 88 1E 00 00 */ lbz r0, 0(r30) -/* 80217C20 7C 00 07 75 */ extsb. r0, r0 -/* 80217C24 41 82 00 18 */ beq lbl_80217C3C -/* 80217C28 57 60 10 3A */ slwi r0, r27, 2 -/* 80217C2C 7C 7F 02 14 */ add r3, r31, r0 -/* 80217C30 80 63 03 54 */ lwz r3, 0x354(r3) -/* 80217C34 48 03 D9 95 */ bl show__13CPaneMgrAlphaFv -/* 80217C38 48 00 00 14 */ b lbl_80217C4C -lbl_80217C3C: -/* 80217C3C 57 60 10 3A */ slwi r0, r27, 2 -/* 80217C40 7C 7F 02 14 */ add r3, r31, r0 -/* 80217C44 80 63 03 54 */ lwz r3, 0x354(r3) -/* 80217C48 48 03 D9 C1 */ bl hide__13CPaneMgrAlphaFv -lbl_80217C4C: -/* 80217C4C 3B 20 00 00 */ li r25, 0 -/* 80217C50 3B 80 00 00 */ li r28, 0 -/* 80217C54 57 7A 10 3A */ slwi r26, r27, 2 -/* 80217C58 7F BF D2 14 */ add r29, r31, r26 -lbl_80217C5C: -/* 80217C5C 38 1C 00 E8 */ addi r0, r28, 0xe8 -/* 80217C60 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80217C64 80 63 00 04 */ lwz r3, 4(r3) -/* 80217C68 48 0E 89 F1 */ bl getStringPtr__10J2DTextBoxCFv -/* 80217C6C 7F C4 F3 78 */ mr r4, r30 -/* 80217C70 48 15 0E BD */ bl strcpy -/* 80217C74 3B 39 00 01 */ addi r25, r25, 1 -/* 80217C78 2C 19 00 05 */ cmpwi r25, 5 -/* 80217C7C 3B 9C 00 0C */ addi r28, r28, 0xc -/* 80217C80 41 80 FF DC */ blt lbl_80217C5C -/* 80217C84 2C 1B 00 00 */ cmpwi r27, 0 -/* 80217C88 40 82 00 50 */ bne lbl_80217CD8 -/* 80217C8C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217C90 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217C94 C0 03 02 F4 */ lfs f0, 0x2f4(r3) -/* 80217C98 7F 5F D2 14 */ add r26, r31, r26 -/* 80217C9C 80 7A 03 54 */ lwz r3, 0x354(r26) -/* 80217CA0 80 63 00 04 */ lwz r3, 4(r3) -/* 80217CA4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80217CA8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80217CAC 81 83 00 00 */ lwz r12, 0(r3) -/* 80217CB0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80217CB4 7D 89 03 A6 */ mtctr r12 -/* 80217CB8 4E 80 04 21 */ bctrl -/* 80217CBC 80 7A 03 54 */ lwz r3, 0x354(r26) -/* 80217CC0 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217CC4 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217CC8 C0 24 02 F8 */ lfs f1, 0x2f8(r4) -/* 80217CCC C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80217CD0 48 03 C8 E1 */ bl paneTrans__8CPaneMgrFff -/* 80217CD4 48 00 05 44 */ b lbl_80218218 -lbl_80217CD8: -/* 80217CD8 2C 1B 00 01 */ cmpwi r27, 1 -/* 80217CDC 40 82 05 3C */ bne lbl_80218218 -/* 80217CE0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217CE4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217CE8 C0 03 02 F4 */ lfs f0, 0x2f4(r3) -/* 80217CEC 7F 5F D2 14 */ add r26, r31, r26 -/* 80217CF0 80 7A 03 54 */ lwz r3, 0x354(r26) -/* 80217CF4 80 63 00 04 */ lwz r3, 4(r3) -/* 80217CF8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80217CFC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80217D00 81 83 00 00 */ lwz r12, 0(r3) -/* 80217D04 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80217D08 7D 89 03 A6 */ mtctr r12 -/* 80217D0C 4E 80 04 21 */ bctrl -/* 80217D10 80 7A 03 54 */ lwz r3, 0x354(r26) -/* 80217D14 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217D18 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217D1C C0 24 02 F8 */ lfs f1, 0x2f8(r4) -/* 80217D20 C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80217D24 48 03 C8 8D */ bl paneTrans__8CPaneMgrFff -/* 80217D28 48 00 04 F0 */ b lbl_80218218 -lbl_80217D2C: -/* 80217D2C 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80217D30 57 65 18 38 */ slwi r5, r27, 3 -/* 80217D34 3C 80 80 3A */ lis r4, tag_7361@ha /* 0x803988A8@ha */ -/* 80217D38 38 04 88 A8 */ addi r0, r4, tag_7361@l /* 0x803988A8@l */ -/* 80217D3C 7F 40 2A 14 */ add r26, r0, r5 -/* 80217D40 80 BA 00 00 */ lwz r5, 0(r26) -/* 80217D44 80 DA 00 04 */ lwz r6, 4(r26) -/* 80217D48 81 83 00 00 */ lwz r12, 0(r3) -/* 80217D4C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80217D50 7D 89 03 A6 */ mtctr r12 -/* 80217D54 4E 80 04 21 */ bctrl -/* 80217D58 38 00 00 01 */ li r0, 1 -/* 80217D5C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80217D60 57 7C 10 3A */ slwi r28, r27, 2 -/* 80217D64 7F DF E2 14 */ add r30, r31, r28 -/* 80217D68 80 7E 03 54 */ lwz r3, 0x354(r30) -/* 80217D6C 48 03 D8 9D */ bl hide__13CPaneMgrAlphaFv -/* 80217D70 57 20 06 3E */ clrlwi r0, r25, 0x18 -/* 80217D74 28 00 00 FF */ cmplwi r0, 0xff -/* 80217D78 41 82 00 0C */ beq lbl_80217D84 -/* 80217D7C 28 00 00 00 */ cmplwi r0, 0 -/* 80217D80 40 82 00 30 */ bne lbl_80217DB0 -lbl_80217D84: -/* 80217D84 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80217D88 80 BA 00 00 */ lwz r5, 0(r26) -/* 80217D8C 80 DA 00 04 */ lwz r6, 4(r26) -/* 80217D90 81 83 00 00 */ lwz r12, 0(r3) -/* 80217D94 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80217D98 7D 89 03 A6 */ mtctr r12 -/* 80217D9C 4E 80 04 21 */ bctrl -/* 80217DA0 38 00 00 00 */ li r0, 0 -/* 80217DA4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80217DA8 3B A0 00 01 */ li r29, 1 -/* 80217DAC 48 00 00 3C */ b lbl_80217DE8 -lbl_80217DB0: -/* 80217DB0 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80217DB4 80 BA 00 00 */ lwz r5, 0(r26) -/* 80217DB8 80 DA 00 04 */ lwz r6, 4(r26) -/* 80217DBC 81 83 00 00 */ lwz r12, 0(r3) -/* 80217DC0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80217DC4 7D 89 03 A6 */ mtctr r12 -/* 80217DC8 4E 80 04 21 */ bctrl -/* 80217DCC 38 00 00 01 */ li r0, 1 -/* 80217DD0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80217DD4 7F E3 FB 78 */ mr r3, r31 -/* 80217DD8 7F 64 DB 78 */ mr r4, r27 -/* 80217DDC 7F 25 CB 78 */ mr r5, r25 -/* 80217DE0 48 00 29 3D */ bl changeTextureItemXY__13dMeter2Draw_cFiUc -/* 80217DE4 3B A0 00 00 */ li r29, 0 -lbl_80217DE8: -/* 80217DE8 2C 1B 00 01 */ cmpwi r27, 1 -/* 80217DEC 41 82 00 30 */ beq lbl_80217E1C -/* 80217DF0 40 80 00 10 */ bge lbl_80217E00 -/* 80217DF4 2C 1B 00 00 */ cmpwi r27, 0 -/* 80217DF8 40 80 00 14 */ bge lbl_80217E0C -/* 80217DFC 48 00 00 3C */ b lbl_80217E38 -lbl_80217E00: -/* 80217E00 2C 1B 00 03 */ cmpwi r27, 3 -/* 80217E04 40 80 00 34 */ bge lbl_80217E38 -/* 80217E08 48 00 00 24 */ b lbl_80217E2C -lbl_80217E0C: -/* 80217E0C 7F E3 FB 78 */ mr r3, r31 -/* 80217E10 7F 24 CB 78 */ mr r4, r25 -/* 80217E14 48 00 32 F1 */ bl setItemParamX__13dMeter2Draw_cFUc -/* 80217E18 48 00 00 20 */ b lbl_80217E38 -lbl_80217E1C: -/* 80217E1C 7F E3 FB 78 */ mr r3, r31 -/* 80217E20 7F 24 CB 78 */ mr r4, r25 -/* 80217E24 48 00 35 41 */ bl setItemParamY__13dMeter2Draw_cFUc -/* 80217E28 48 00 00 10 */ b lbl_80217E38 -lbl_80217E2C: -/* 80217E2C 7F E3 FB 78 */ mr r3, r31 -/* 80217E30 7F 24 CB 78 */ mr r4, r25 -/* 80217E34 48 00 37 7D */ bl setItemParamZ__13dMeter2Draw_cFUc -lbl_80217E38: -/* 80217E38 7C 7F E2 14 */ add r3, r31, r28 -/* 80217E3C 80 63 03 2C */ lwz r3, 0x32c(r3) -/* 80217E40 80 63 00 04 */ lwz r3, 4(r3) -/* 80217E44 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80217E48 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80217E4C EC 41 00 28 */ fsubs f2, f1, f0 -/* 80217E50 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80217E54 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80217E58 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80217E5C C0 02 AE 94 */ lfs f0, lit_4922(r2) -/* 80217E60 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80217E64 EC 40 00 B2 */ fmuls f2, f0, f2 -/* 80217E68 38 80 00 7A */ li r4, 0x7a -/* 80217E6C 1C 1B 00 1C */ mulli r0, r27, 0x1c -/* 80217E70 7C BF 02 14 */ add r5, r31, r0 -/* 80217E74 C0 65 00 10 */ lfs f3, 0x10(r5) -/* 80217E78 48 0D F3 65 */ bl rotate__7J2DPaneFff13J2DRotateAxisf -/* 80217E7C 2C 1B 00 00 */ cmpwi r27, 0 -/* 80217E80 40 82 01 CC */ bne lbl_8021804C -/* 80217E84 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217E88 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217E8C C0 03 01 44 */ lfs f0, 0x144(r3) -/* 80217E90 80 7F 03 0C */ lwz r3, 0x30c(r31) -/* 80217E94 80 63 00 04 */ lwz r3, 4(r3) -/* 80217E98 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80217E9C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80217EA0 81 83 00 00 */ lwz r12, 0(r3) -/* 80217EA4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80217EA8 7D 89 03 A6 */ mtctr r12 -/* 80217EAC 4E 80 04 21 */ bctrl -/* 80217EB0 80 7F 03 0C */ lwz r3, 0x30c(r31) -/* 80217EB4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217EB8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217EBC C0 24 01 4C */ lfs f1, 0x14c(r4) -/* 80217EC0 C0 44 01 50 */ lfs f2, 0x150(r4) -/* 80217EC4 48 03 C6 ED */ bl paneTrans__8CPaneMgrFff -/* 80217EC8 C3 FF 00 0C */ lfs f31, 0xc(r31) -/* 80217ECC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80217ED0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80217ED4 38 80 00 00 */ li r4, 0 -/* 80217ED8 48 00 4A 79 */ bl isDirectUseItem__13dMeter2Info_cFi -/* 80217EDC 88 1F 07 73 */ lbz r0, 0x773(r31) -/* 80217EE0 7C 00 18 00 */ cmpw r0, r3 -/* 80217EE4 41 82 00 58 */ beq lbl_80217F3C -/* 80217EE8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80217EEC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80217EF0 38 80 00 00 */ li r4, 0 -/* 80217EF4 48 00 4A 5D */ bl isDirectUseItem__13dMeter2Info_cFi -/* 80217EF8 98 7F 07 73 */ stb r3, 0x773(r31) -/* 80217EFC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80217F00 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80217F04 38 80 00 00 */ li r4, 0 -/* 80217F08 48 00 4A 49 */ bl isDirectUseItem__13dMeter2Info_cFi -/* 80217F0C 2C 03 00 00 */ cmpwi r3, 0 -/* 80217F10 41 82 00 2C */ beq lbl_80217F3C -/* 80217F14 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80217F18 C0 1F 06 10 */ lfs f0, 0x610(r31) -/* 80217F1C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80217F20 40 82 00 1C */ bne lbl_80217F3C -/* 80217F24 C0 22 AE 98 */ lfs f1, lit_4923(r2) -/* 80217F28 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217F2C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217F30 C0 03 04 E0 */ lfs f0, 0x4e0(r3) -/* 80217F34 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80217F38 D0 1F 06 10 */ stfs f0, 0x610(r31) -lbl_80217F3C: -/* 80217F3C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80217F40 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80217F44 38 80 00 00 */ li r4, 0 -/* 80217F48 48 00 4A 09 */ bl isDirectUseItem__13dMeter2Info_cFi -/* 80217F4C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217F50 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217F54 C0 03 05 4C */ lfs f0, 0x54c(r3) -/* 80217F58 EF FF 00 32 */ fmuls f31, f31, f0 -/* 80217F5C 80 7F 03 2C */ lwz r3, 0x32c(r31) -/* 80217F60 80 63 00 04 */ lwz r3, 4(r3) -/* 80217F64 D3 E3 00 CC */ stfs f31, 0xcc(r3) -/* 80217F68 D3 E3 00 D0 */ stfs f31, 0xd0(r3) -/* 80217F6C 81 83 00 00 */ lwz r12, 0(r3) -/* 80217F70 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80217F74 7D 89 03 A6 */ mtctr r12 -/* 80217F78 4E 80 04 21 */ bctrl -/* 80217F7C 80 7F 03 2C */ lwz r3, 0x32c(r31) -/* 80217F80 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80217F84 C0 1F 06 AC */ lfs f0, 0x6ac(r31) -/* 80217F88 EC 21 00 2A */ fadds f1, f1, f0 -/* 80217F8C C0 5F 00 08 */ lfs f2, 8(r31) -/* 80217F90 C0 1F 06 B8 */ lfs f0, 0x6b8(r31) -/* 80217F94 EC 42 00 2A */ fadds f2, f2, f0 -/* 80217F98 48 03 C6 19 */ bl paneTrans__8CPaneMgrFff -/* 80217F9C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217FA0 38 03 EB C8 */ addi r0, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217FA4 57 BA 10 3A */ slwi r26, r29, 2 -/* 80217FA8 7C 60 D2 14 */ add r3, r0, r26 -/* 80217FAC C0 03 02 40 */ lfs f0, 0x240(r3) -/* 80217FB0 80 7F 03 1C */ lwz r3, 0x31c(r31) -/* 80217FB4 80 63 00 04 */ lwz r3, 4(r3) -/* 80217FB8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80217FBC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80217FC0 81 83 00 00 */ lwz r12, 0(r3) -/* 80217FC4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80217FC8 7D 89 03 A6 */ mtctr r12 -/* 80217FCC 4E 80 04 21 */ bctrl -/* 80217FD0 80 7F 03 1C */ lwz r3, 0x31c(r31) -/* 80217FD4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217FD8 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217FDC 7C 80 D2 14 */ add r4, r0, r26 -/* 80217FE0 C0 24 02 48 */ lfs f1, 0x248(r4) -/* 80217FE4 C0 44 02 50 */ lfs f2, 0x250(r4) -/* 80217FE8 48 03 C5 C9 */ bl paneTrans__8CPaneMgrFff -/* 80217FEC 80 7F 03 1C */ lwz r3, 0x31c(r31) -/* 80217FF0 7C 9F D2 14 */ add r4, r31, r26 -/* 80217FF4 C0 24 08 1C */ lfs f1, 0x81c(r4) -/* 80217FF8 C0 1F 07 F0 */ lfs f0, 0x7f0(r31) -/* 80217FFC EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218000 48 03 D7 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80218004 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218008 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021800C C0 03 02 F4 */ lfs f0, 0x2f4(r3) -/* 80218010 80 7E 03 54 */ lwz r3, 0x354(r30) -/* 80218014 80 63 00 04 */ lwz r3, 4(r3) -/* 80218018 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8021801C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80218020 81 83 00 00 */ lwz r12, 0(r3) -/* 80218024 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80218028 7D 89 03 A6 */ mtctr r12 -/* 8021802C 4E 80 04 21 */ bctrl -/* 80218030 80 7E 03 54 */ lwz r3, 0x354(r30) -/* 80218034 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218038 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021803C C0 24 02 F8 */ lfs f1, 0x2f8(r4) -/* 80218040 C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80218044 48 03 C5 6D */ bl paneTrans__8CPaneMgrFff -/* 80218048 48 00 01 D0 */ b lbl_80218218 -lbl_8021804C: -/* 8021804C 2C 1B 00 01 */ cmpwi r27, 1 -/* 80218050 40 82 01 C8 */ bne lbl_80218218 -/* 80218054 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218058 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021805C C0 03 01 54 */ lfs f0, 0x154(r3) -/* 80218060 80 7F 03 10 */ lwz r3, 0x310(r31) -/* 80218064 80 63 00 04 */ lwz r3, 4(r3) -/* 80218068 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8021806C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80218070 81 83 00 00 */ lwz r12, 0(r3) -/* 80218074 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80218078 7D 89 03 A6 */ mtctr r12 -/* 8021807C 4E 80 04 21 */ bctrl -/* 80218080 80 7F 03 10 */ lwz r3, 0x310(r31) -/* 80218084 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218088 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021808C C0 24 01 5C */ lfs f1, 0x15c(r4) -/* 80218090 C0 44 01 60 */ lfs f2, 0x160(r4) -/* 80218094 48 03 C5 1D */ bl paneTrans__8CPaneMgrFff -/* 80218098 C3 FF 00 28 */ lfs f31, 0x28(r31) -/* 8021809C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802180A0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802180A4 38 80 00 01 */ li r4, 1 -/* 802180A8 48 00 48 A9 */ bl isDirectUseItem__13dMeter2Info_cFi -/* 802180AC 88 1F 07 74 */ lbz r0, 0x774(r31) -/* 802180B0 7C 00 18 00 */ cmpw r0, r3 -/* 802180B4 41 82 00 58 */ beq lbl_8021810C -/* 802180B8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802180BC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802180C0 38 80 00 01 */ li r4, 1 -/* 802180C4 48 00 48 8D */ bl isDirectUseItem__13dMeter2Info_cFi -/* 802180C8 98 7F 07 74 */ stb r3, 0x774(r31) -/* 802180CC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802180D0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802180D4 38 80 00 01 */ li r4, 1 -/* 802180D8 48 00 48 79 */ bl isDirectUseItem__13dMeter2Info_cFi -/* 802180DC 2C 03 00 00 */ cmpwi r3, 0 -/* 802180E0 41 82 00 2C */ beq lbl_8021810C -/* 802180E4 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 802180E8 C0 1F 06 14 */ lfs f0, 0x614(r31) -/* 802180EC FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 802180F0 40 82 00 1C */ bne lbl_8021810C -/* 802180F4 C0 22 AE 98 */ lfs f1, lit_4923(r2) -/* 802180F8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802180FC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218100 C0 03 04 E0 */ lfs f0, 0x4e0(r3) -/* 80218104 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80218108 D0 1F 06 14 */ stfs f0, 0x614(r31) -lbl_8021810C: -/* 8021810C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80218110 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80218114 38 80 00 01 */ li r4, 1 -/* 80218118 48 00 48 39 */ bl isDirectUseItem__13dMeter2Info_cFi -/* 8021811C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218120 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218124 C0 03 05 4C */ lfs f0, 0x54c(r3) -/* 80218128 EF FF 00 32 */ fmuls f31, f31, f0 -/* 8021812C 80 7F 03 30 */ lwz r3, 0x330(r31) -/* 80218130 80 63 00 04 */ lwz r3, 4(r3) -/* 80218134 D3 E3 00 CC */ stfs f31, 0xcc(r3) -/* 80218138 D3 E3 00 D0 */ stfs f31, 0xd0(r3) -/* 8021813C 81 83 00 00 */ lwz r12, 0(r3) -/* 80218140 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80218144 7D 89 03 A6 */ mtctr r12 -/* 80218148 4E 80 04 21 */ bctrl -/* 8021814C 80 7F 03 30 */ lwz r3, 0x330(r31) -/* 80218150 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80218154 C0 1F 06 B0 */ lfs f0, 0x6b0(r31) -/* 80218158 EC 21 00 2A */ fadds f1, f1, f0 -/* 8021815C C0 5F 00 24 */ lfs f2, 0x24(r31) -/* 80218160 C0 1F 06 BC */ lfs f0, 0x6bc(r31) -/* 80218164 EC 42 00 2A */ fadds f2, f2, f0 -/* 80218168 48 03 C4 49 */ bl paneTrans__8CPaneMgrFff -/* 8021816C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218170 38 03 EB C8 */ addi r0, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218174 57 BA 10 3A */ slwi r26, r29, 2 -/* 80218178 7C 60 D2 14 */ add r3, r0, r26 -/* 8021817C C0 03 02 60 */ lfs f0, 0x260(r3) -/* 80218180 80 7F 03 20 */ lwz r3, 0x320(r31) -/* 80218184 80 63 00 04 */ lwz r3, 4(r3) -/* 80218188 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8021818C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80218190 81 83 00 00 */ lwz r12, 0(r3) -/* 80218194 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80218198 7D 89 03 A6 */ mtctr r12 -/* 8021819C 4E 80 04 21 */ bctrl -/* 802181A0 80 7F 03 20 */ lwz r3, 0x320(r31) -/* 802181A4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802181A8 38 04 EB C8 */ addi r0, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802181AC 7C 80 D2 14 */ add r4, r0, r26 -/* 802181B0 C0 24 02 68 */ lfs f1, 0x268(r4) -/* 802181B4 C0 44 02 70 */ lfs f2, 0x270(r4) -/* 802181B8 48 03 C3 F9 */ bl paneTrans__8CPaneMgrFff -/* 802181BC 80 7F 03 20 */ lwz r3, 0x320(r31) -/* 802181C0 7C 9F D2 14 */ add r4, r31, r26 -/* 802181C4 C0 24 08 24 */ lfs f1, 0x824(r4) -/* 802181C8 C0 1F 07 F0 */ lfs f0, 0x7f0(r31) -/* 802181CC EC 21 00 32 */ fmuls f1, f1, f0 -/* 802181D0 48 03 D6 01 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802181D4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802181D8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802181DC C0 03 02 F4 */ lfs f0, 0x2f4(r3) -/* 802181E0 80 7E 03 54 */ lwz r3, 0x354(r30) -/* 802181E4 80 63 00 04 */ lwz r3, 4(r3) -/* 802181E8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802181EC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802181F0 81 83 00 00 */ lwz r12, 0(r3) -/* 802181F4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802181F8 7D 89 03 A6 */ mtctr r12 -/* 802181FC 4E 80 04 21 */ bctrl -/* 80218200 80 7E 03 54 */ lwz r3, 0x354(r30) -/* 80218204 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218208 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021820C C0 24 02 F8 */ lfs f1, 0x2f8(r4) -/* 80218210 C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80218214 48 03 C3 9D */ bl paneTrans__8CPaneMgrFff -lbl_80218218: -/* 80218218 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8021821C CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80218220 39 61 00 30 */ addi r11, r1, 0x30 -/* 80218224 48 14 9F F5 */ bl _restgpr_25 -/* 80218228 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8021822C 7C 08 03 A6 */ mtlr r0 -/* 80218230 38 21 00 40 */ addi r1, r1, 0x40 -/* 80218234 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawButtonZ__13dMeter2Draw_cFUc.s b/asm/d/meter/d_meter2_draw/drawButtonZ__13dMeter2Draw_cFUc.s deleted file mode 100644 index c11addca9c..0000000000 --- a/asm/d/meter/d_meter2_draw/drawButtonZ__13dMeter2Draw_cFUc.s +++ /dev/null @@ -1,141 +0,0 @@ -lbl_802176EC: -/* 802176EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802176F0 7C 08 02 A6 */ mflr r0 -/* 802176F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802176F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802176FC 48 14 AA DD */ bl _savegpr_28 -/* 80217700 7C 7F 1B 78 */ mr r31, r3 -/* 80217704 7C 9C 23 78 */ mr r28, r4 -/* 80217708 38 A0 00 01 */ li r5, 1 -/* 8021770C 38 DF 07 64 */ addi r6, r31, 0x764 -/* 80217710 48 00 2B E5 */ bl getActionString__13dMeter2Draw_cFUcUcPUc -/* 80217714 7C 7D 1B 78 */ mr r29, r3 -/* 80217718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021771C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80217720 88 63 5E 4E */ lbz r3, 0x5e4e(r3) -/* 80217724 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f -/* 80217728 40 82 00 0C */ bne lbl_80217734 -/* 8021772C 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d -/* 80217730 41 82 00 0C */ beq lbl_8021773C -lbl_80217734: -/* 80217734 38 00 00 07 */ li r0, 7 -/* 80217738 98 1F 07 64 */ stb r0, 0x764(r31) -lbl_8021773C: -/* 8021773C 57 83 06 3E */ clrlwi r3, r28, 0x18 -/* 80217740 28 03 00 27 */ cmplwi r3, 0x27 -/* 80217744 40 82 00 18 */ bne lbl_8021775C -/* 80217748 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 8021774C 48 03 DE BD */ bl hide__13CPaneMgrAlphaFv -/* 80217750 80 7F 03 08 */ lwz r3, 0x308(r31) -/* 80217754 48 03 DE B5 */ bl hide__13CPaneMgrAlphaFv -/* 80217758 48 00 00 44 */ b lbl_8021779C -lbl_8021775C: -/* 8021775C 88 1D 00 00 */ lbz r0, 0(r29) -/* 80217760 7C 00 07 75 */ extsb. r0, r0 -/* 80217764 41 82 00 28 */ beq lbl_8021778C -/* 80217768 28 03 00 2F */ cmplwi r3, 0x2f -/* 8021776C 41 82 00 20 */ beq lbl_8021778C -/* 80217770 28 03 00 08 */ cmplwi r3, 8 -/* 80217774 41 82 00 18 */ beq lbl_8021778C -/* 80217778 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 8021777C 48 03 DE 4D */ bl show__13CPaneMgrAlphaFv -/* 80217780 80 7F 03 08 */ lwz r3, 0x308(r31) -/* 80217784 48 03 DE 85 */ bl hide__13CPaneMgrAlphaFv -/* 80217788 48 00 00 14 */ b lbl_8021779C -lbl_8021778C: -/* 8021778C 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 80217790 48 03 DE 79 */ bl hide__13CPaneMgrAlphaFv -/* 80217794 80 7F 03 08 */ lwz r3, 0x308(r31) -/* 80217798 48 03 DE 31 */ bl show__13CPaneMgrAlphaFv -lbl_8021779C: -/* 8021779C 3B 80 00 00 */ li r28, 0 -/* 802177A0 3B C0 00 00 */ li r30, 0 -lbl_802177A4: -/* 802177A4 38 1E 00 F0 */ addi r0, r30, 0xf0 -/* 802177A8 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 802177AC 80 63 00 04 */ lwz r3, 4(r3) -/* 802177B0 48 0E 8E A9 */ bl getStringPtr__10J2DTextBoxCFv -/* 802177B4 7F A4 EB 78 */ mr r4, r29 -/* 802177B8 48 15 13 75 */ bl strcpy -/* 802177BC 3B 9C 00 01 */ addi r28, r28, 1 -/* 802177C0 2C 1C 00 05 */ cmpwi r28, 5 -/* 802177C4 3B DE 00 0C */ addi r30, r30, 0xc -/* 802177C8 41 80 FF DC */ blt lbl_802177A4 -/* 802177CC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802177D0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802177D4 C0 03 01 74 */ lfs f0, 0x174(r3) -/* 802177D8 80 7F 03 14 */ lwz r3, 0x314(r31) -/* 802177DC 80 63 00 04 */ lwz r3, 4(r3) -/* 802177E0 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802177E4 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802177E8 81 83 00 00 */ lwz r12, 0(r3) -/* 802177EC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802177F0 7D 89 03 A6 */ mtctr r12 -/* 802177F4 4E 80 04 21 */ bctrl -/* 802177F8 80 7F 03 14 */ lwz r3, 0x314(r31) -/* 802177FC 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217800 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217804 C0 24 01 7C */ lfs f1, 0x17c(r4) -/* 80217808 C0 44 01 80 */ lfs f2, 0x180(r4) -/* 8021780C 48 03 CD A5 */ bl paneTrans__8CPaneMgrFff -/* 80217810 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217814 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217818 C0 03 01 E0 */ lfs f0, 0x1e0(r3) -/* 8021781C 80 7F 03 34 */ lwz r3, 0x334(r31) -/* 80217820 80 63 00 04 */ lwz r3, 4(r3) -/* 80217824 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80217828 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8021782C 81 83 00 00 */ lwz r12, 0(r3) -/* 80217830 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80217834 7D 89 03 A6 */ mtctr r12 -/* 80217838 4E 80 04 21 */ bctrl -/* 8021783C 80 7F 03 34 */ lwz r3, 0x334(r31) -/* 80217840 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217844 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80217848 C0 24 01 D8 */ lfs f1, 0x1d8(r4) -/* 8021784C C0 1F 06 B4 */ lfs f0, 0x6b4(r31) -/* 80217850 EC 21 00 2A */ fadds f1, f1, f0 -/* 80217854 C0 44 01 DC */ lfs f2, 0x1dc(r4) -/* 80217858 C0 1F 06 C0 */ lfs f0, 0x6c0(r31) -/* 8021785C EC 42 00 2A */ fadds f2, f2, f0 -/* 80217860 48 03 CD 51 */ bl paneTrans__8CPaneMgrFff -/* 80217864 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217868 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021786C C0 03 02 A0 */ lfs f0, 0x2a0(r3) -/* 80217870 80 7F 03 24 */ lwz r3, 0x324(r31) -/* 80217874 80 63 00 04 */ lwz r3, 4(r3) -/* 80217878 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8021787C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80217880 81 83 00 00 */ lwz r12, 0(r3) -/* 80217884 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80217888 7D 89 03 A6 */ mtctr r12 -/* 8021788C 4E 80 04 21 */ bctrl -/* 80217890 80 7F 03 24 */ lwz r3, 0x324(r31) -/* 80217894 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80217898 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021789C C0 24 02 A4 */ lfs f1, 0x2a4(r4) -/* 802178A0 C0 44 02 A8 */ lfs f2, 0x2a8(r4) -/* 802178A4 48 03 CD 0D */ bl paneTrans__8CPaneMgrFff -/* 802178A8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802178AC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802178B0 C0 03 03 2C */ lfs f0, 0x32c(r3) -/* 802178B4 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 802178B8 80 63 00 04 */ lwz r3, 4(r3) -/* 802178BC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802178C0 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802178C4 81 83 00 00 */ lwz r12, 0(r3) -/* 802178C8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802178CC 7D 89 03 A6 */ mtctr r12 -/* 802178D0 4E 80 04 21 */ bctrl -/* 802178D4 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 802178D8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802178DC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802178E0 C0 24 03 30 */ lfs f1, 0x330(r4) -/* 802178E4 C0 44 03 34 */ lfs f2, 0x334(r4) -/* 802178E8 48 03 CC C9 */ bl paneTrans__8CPaneMgrFff -/* 802178EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802178F0 48 14 A9 35 */ bl _restgpr_28 -/* 802178F4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802178F8 7C 08 03 A6 */ mtlr r0 -/* 802178FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80217900 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawItemNum__13dMeter2Draw_cFUcf.s b/asm/d/meter/d_meter2_draw/drawItemNum__13dMeter2Draw_cFUcf.s deleted file mode 100644 index d283cb8af6..0000000000 --- a/asm/d/meter/d_meter2_draw/drawItemNum__13dMeter2Draw_cFUcf.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8021AEC8: -/* 8021AEC8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8021AECC 7C 08 02 A6 */ mflr r0 -/* 8021AED0 90 01 00 34 */ stw r0, 0x34(r1) -/* 8021AED4 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 8021AED8 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 8021AEDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021AEE0 48 14 72 F9 */ bl _savegpr_28 -/* 8021AEE4 7C 7C 1B 78 */ mr r28, r3 -/* 8021AEE8 7C 9E 23 78 */ mr r30, r4 -/* 8021AEEC C0 02 AE 84 */ lfs f0, lit_4183(r2) -/* 8021AEF0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8021AEF4 40 82 00 14 */ bne lbl_8021AF08 -/* 8021AEF8 57 C0 15 BA */ rlwinm r0, r30, 2, 0x16, 0x1d -/* 8021AEFC 7C 7C 02 14 */ add r3, r28, r0 -/* 8021AF00 80 63 03 2C */ lwz r3, 0x32c(r3) -/* 8021AF04 48 03 A9 25 */ bl getAlphaRate__13CPaneMgrAlphaFv -lbl_8021AF08: -/* 8021AF08 3B A0 00 00 */ li r29, 0 -/* 8021AF0C 3B E0 00 00 */ li r31, 0 -/* 8021AF10 C0 02 AE CC */ lfs f0, lit_8207(r2) -/* 8021AF14 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8021AF18 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8021AF1C 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8021AF20 7F DC 02 14 */ add r30, r28, r0 -/* 8021AF24 FF E0 00 1E */ fctiwz f31, f0 -lbl_8021AF28: -/* 8021AF28 38 1F 00 84 */ addi r0, r31, 0x84 -/* 8021AF2C 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 8021AF30 DB E1 00 08 */ stfd f31, 8(r1) -/* 8021AF34 80 81 00 0C */ lwz r4, 0xc(r1) -/* 8021AF38 81 83 00 00 */ lwz r12, 0(r3) -/* 8021AF3C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 8021AF40 7D 89 03 A6 */ mtctr r12 -/* 8021AF44 4E 80 04 21 */ bctrl -/* 8021AF48 3B BD 00 01 */ addi r29, r29, 1 -/* 8021AF4C 2C 1D 00 03 */ cmpwi r29, 3 -/* 8021AF50 3B FF 00 04 */ addi r31, r31, 4 -/* 8021AF54 41 80 FF D4 */ blt lbl_8021AF28 -/* 8021AF58 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 8021AF5C CB E1 00 20 */ lfd f31, 0x20(r1) -/* 8021AF60 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021AF64 48 14 72 C1 */ bl _restgpr_28 -/* 8021AF68 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8021AF6C 7C 08 03 A6 */ mtlr r0 -/* 8021AF70 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021AF74 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawKanteraMeter__13dMeter2Draw_cFUcf.s b/asm/d/meter/d_meter2_draw/drawKanteraMeter__13dMeter2Draw_cFUcf.s deleted file mode 100644 index 9d10886ed2..0000000000 --- a/asm/d/meter/d_meter2_draw/drawKanteraMeter__13dMeter2Draw_cFUcf.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_8021AF78: -/* 8021AF78 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8021AF7C 7C 08 02 A6 */ mflr r0 -/* 8021AF80 90 01 00 74 */ stw r0, 0x74(r1) -/* 8021AF84 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 8021AF88 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 8021AF8C 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021AF90 48 14 72 4D */ bl _savegpr_29 -/* 8021AF94 7C 7D 1B 78 */ mr r29, r3 -/* 8021AF98 FF E0 08 90 */ fmr f31, f1 -/* 8021AF9C 54 9E 15 BA */ rlwinm r30, r4, 2, 0x16, 0x1d -/* 8021AFA0 7C 7D F2 14 */ add r3, r29, r30 -/* 8021AFA4 83 E3 03 2C */ lwz r31, 0x32c(r3) -/* 8021AFA8 80 62 D1 90 */ lwz r3, lit_8746(r2) -/* 8021AFAC 80 02 D1 94 */ lwz r0, data_80456B94(r2) -/* 8021AFB0 90 61 00 10 */ stw r3, 0x10(r1) -/* 8021AFB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021AFB8 80 62 D1 98 */ lwz r3, lit_8747(r2) -/* 8021AFBC 80 02 D1 9C */ lwz r0, data_80456B9C(r2) -/* 8021AFC0 90 61 00 08 */ stw r3, 8(r1) -/* 8021AFC4 90 01 00 0C */ stw r0, 0xc(r1) -/* 8021AFC8 C0 02 AE 84 */ lfs f0, lit_4183(r2) -/* 8021AFCC FC 00 F8 00 */ fcmpu cr0, f0, f31 -/* 8021AFD0 40 82 00 10 */ bne lbl_8021AFE0 -/* 8021AFD4 7F E3 FB 78 */ mr r3, r31 -/* 8021AFD8 48 03 A8 51 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021AFDC FF E0 08 90 */ fmr f31, f1 -lbl_8021AFE0: -/* 8021AFE0 38 61 00 24 */ addi r3, r1, 0x24 -/* 8021AFE4 80 9F 00 04 */ lwz r4, 4(r31) -/* 8021AFE8 38 A0 00 00 */ li r5, 0 -/* 8021AFEC 48 0D C9 BD */ bl getGlbVtx__7J2DPaneCFUc -/* 8021AFF0 80 61 00 24 */ lwz r3, 0x24(r1) -/* 8021AFF4 80 01 00 28 */ lwz r0, 0x28(r1) -/* 8021AFF8 90 61 00 3C */ stw r3, 0x3c(r1) -/* 8021AFFC 90 01 00 40 */ stw r0, 0x40(r1) -/* 8021B000 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8021B004 90 01 00 44 */ stw r0, 0x44(r1) -/* 8021B008 38 61 00 18 */ addi r3, r1, 0x18 -/* 8021B00C 80 9F 00 04 */ lwz r4, 4(r31) -/* 8021B010 38 A0 00 03 */ li r5, 3 -/* 8021B014 48 0D C9 95 */ bl getGlbVtx__7J2DPaneCFUc -/* 8021B018 80 61 00 18 */ lwz r3, 0x18(r1) -/* 8021B01C 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8021B020 90 61 00 30 */ stw r3, 0x30(r1) -/* 8021B024 90 01 00 34 */ stw r0, 0x34(r1) -/* 8021B028 80 01 00 20 */ lwz r0, 0x20(r1) -/* 8021B02C 90 01 00 38 */ stw r0, 0x38(r1) -/* 8021B030 7F FD F2 14 */ add r31, r29, r30 -/* 8021B034 80 7F 00 AC */ lwz r3, 0xac(r31) -/* 8021B038 C0 62 AE E0 */ lfs f3, lit_8774(r2) -/* 8021B03C C0 42 AE 94 */ lfs f2, lit_4922(r2) -/* 8021B040 C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 8021B044 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 8021B048 EC 01 00 2A */ fadds f0, f1, f0 -/* 8021B04C EC 02 00 32 */ fmuls f0, f2, f0 -/* 8021B050 EC 23 00 2A */ fadds f1, f3, f0 -/* 8021B054 38 81 00 10 */ addi r4, r1, 0x10 -/* 8021B058 7C 04 F4 2E */ lfsx f0, r4, r30 -/* 8021B05C EC 21 00 2A */ fadds f1, f1, f0 -/* 8021B060 C0 41 00 34 */ lfs f2, 0x34(r1) -/* 8021B064 38 81 00 08 */ addi r4, r1, 8 -/* 8021B068 7C 04 F4 2E */ lfsx f0, r4, r30 -/* 8021B06C EC 42 00 2A */ fadds f2, f2, f0 -/* 8021B070 4B F9 3B 31 */ bl setPos__15dKantera_icon_cFff -/* 8021B074 80 7F 00 AC */ lwz r3, 0xac(r31) -/* 8021B078 C0 22 AE E4 */ lfs f1, lit_8775(r2) -/* 8021B07C FC 40 08 90 */ fmr f2, f1 -/* 8021B080 4B F9 3B 75 */ bl setScale__15dKantera_icon_cFff -/* 8021B084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021B088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021B08C A0 A3 00 08 */ lhz r5, 8(r3) -/* 8021B090 A0 83 00 06 */ lhz r4, 6(r3) -/* 8021B094 80 7F 00 AC */ lwz r3, 0xac(r31) -/* 8021B098 4B F9 3B AD */ bl setNowGauge__15dKantera_icon_cFUsUs -/* 8021B09C 80 7F 00 AC */ lwz r3, 0xac(r31) -/* 8021B0A0 FC 20 F8 90 */ fmr f1, f31 -/* 8021B0A4 4B F9 3A D9 */ bl setAlphaRate__15dKantera_icon_cFf -/* 8021B0A8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 8021B0AC CB E1 00 60 */ lfd f31, 0x60(r1) -/* 8021B0B0 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021B0B4 48 14 71 75 */ bl _restgpr_29 -/* 8021B0B8 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8021B0BC 7C 08 03 A6 */ mtlr r0 -/* 8021B0C0 38 21 00 70 */ addi r1, r1, 0x70 -/* 8021B0C4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawKanteraScreen__13dMeter2Draw_cFUc.s b/asm/d/meter/d_meter2_draw/drawKanteraScreen__13dMeter2Draw_cFUc.s deleted file mode 100644 index cd7cc14448..0000000000 --- a/asm/d/meter/d_meter2_draw/drawKanteraScreen__13dMeter2Draw_cFUc.s +++ /dev/null @@ -1,254 +0,0 @@ -lbl_80214EB4: -/* 80214EB4 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80214EB8 7C 08 02 A6 */ mflr r0 -/* 80214EBC 90 01 00 94 */ stw r0, 0x94(r1) -/* 80214EC0 39 61 00 90 */ addi r11, r1, 0x90 -/* 80214EC4 48 14 D3 11 */ bl _savegpr_27 -/* 80214EC8 7C 7C 1B 78 */ mr r28, r3 -/* 80214ECC 7C 9B 23 78 */ mr r27, r4 -/* 80214ED0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80214ED4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80214ED8 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 80214EDC 80 7C 01 CC */ lwz r3, 0x1cc(r28) -/* 80214EE0 54 9D 15 BA */ rlwinm r29, r4, 2, 0x16, 0x1d -/* 80214EE4 7F DC EA 14 */ add r30, r28, r29 -/* 80214EE8 C0 3E 05 FC */ lfs f1, 0x5fc(r30) -/* 80214EEC 48 04 08 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80214EF0 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80214EF4 40 82 00 4C */ bne lbl_80214F40 -/* 80214EF8 80 7C 01 D8 */ lwz r3, 0x1d8(r28) -/* 80214EFC 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 80214F00 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80214F04 38 00 00 FF */ li r0, 0xff -/* 80214F08 98 01 00 5F */ stb r0, 0x5f(r1) -/* 80214F0C 80 03 00 58 */ lwz r0, 0x58(r3) -/* 80214F10 90 01 00 50 */ stw r0, 0x50(r1) -/* 80214F14 90 01 00 54 */ stw r0, 0x54(r1) -/* 80214F18 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 80214F1C 90 01 00 58 */ stw r0, 0x58(r1) -/* 80214F20 80 7C 01 D8 */ lwz r3, 0x1d8(r28) -/* 80214F24 38 81 00 58 */ addi r4, r1, 0x58 -/* 80214F28 38 A1 00 54 */ addi r5, r1, 0x54 -/* 80214F2C 48 03 F5 2D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80214F30 7F 83 E3 78 */ mr r3, r28 -/* 80214F34 38 80 00 01 */ li r4, 1 -/* 80214F38 48 00 04 49 */ bl setAlphaMagicChange__13dMeter2Draw_cFb -/* 80214F3C 48 00 02 7C */ b lbl_802151B8 -lbl_80214F40: -/* 80214F40 28 00 00 01 */ cmplwi r0, 1 -/* 80214F44 40 82 00 68 */ bne lbl_80214FAC -/* 80214F48 38 00 00 E6 */ li r0, 0xe6 -/* 80214F4C 98 01 00 40 */ stb r0, 0x40(r1) -/* 80214F50 38 00 00 AA */ li r0, 0xaa -/* 80214F54 98 01 00 41 */ stb r0, 0x41(r1) -/* 80214F58 38 00 00 00 */ li r0, 0 -/* 80214F5C 98 01 00 42 */ stb r0, 0x42(r1) -/* 80214F60 38 60 00 FF */ li r3, 0xff -/* 80214F64 98 61 00 43 */ stb r3, 0x43(r1) -/* 80214F68 80 01 00 40 */ lwz r0, 0x40(r1) -/* 80214F6C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80214F70 98 61 00 48 */ stb r3, 0x48(r1) -/* 80214F74 98 61 00 49 */ stb r3, 0x49(r1) -/* 80214F78 38 00 00 8C */ li r0, 0x8c -/* 80214F7C 98 01 00 4A */ stb r0, 0x4a(r1) -/* 80214F80 98 61 00 4B */ stb r3, 0x4b(r1) -/* 80214F84 80 01 00 48 */ lwz r0, 0x48(r1) -/* 80214F88 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80214F8C 80 7C 01 D8 */ lwz r3, 0x1d8(r28) -/* 80214F90 38 81 00 4C */ addi r4, r1, 0x4c -/* 80214F94 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80214F98 48 03 F4 C1 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80214F9C 7F 83 E3 78 */ mr r3, r28 -/* 80214FA0 38 80 00 01 */ li r4, 1 -/* 80214FA4 48 00 06 15 */ bl setAlphaKanteraChange__13dMeter2Draw_cFb -/* 80214FA8 48 00 02 10 */ b lbl_802151B8 -lbl_80214FAC: -/* 80214FAC 28 00 00 02 */ cmplwi r0, 2 -/* 80214FB0 40 82 02 08 */ bne lbl_802151B8 -/* 80214FB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80214FB8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80214FBC 80 04 5D E0 */ lwz r0, 0x5de0(r4) -/* 80214FC0 C8 42 AE A0 */ lfd f2, lit_4925(r2) -/* 80214FC4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80214FC8 90 01 00 64 */ stw r0, 0x64(r1) -/* 80214FCC 3C 60 43 30 */ lis r3, 0x4330 -/* 80214FD0 90 61 00 60 */ stw r3, 0x60(r1) -/* 80214FD4 C8 01 00 60 */ lfd f0, 0x60(r1) -/* 80214FD8 EC 20 10 28 */ fsubs f1, f0, f2 -/* 80214FDC 80 04 5D E8 */ lwz r0, 0x5de8(r4) -/* 80214FE0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80214FE4 90 01 00 6C */ stw r0, 0x6c(r1) -/* 80214FE8 90 61 00 68 */ stw r3, 0x68(r1) -/* 80214FEC C8 01 00 68 */ lfd f0, 0x68(r1) -/* 80214FF0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80214FF4 EC 21 00 24 */ fdivs f1, f1, f0 -/* 80214FF8 C0 02 AE B4 */ lfs f0, lit_6143(r2) -/* 80214FFC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80215000 4C 40 13 82 */ cror 2, 0, 2 -/* 80215004 40 82 00 A4 */ bne lbl_802150A8 -/* 80215008 38 60 00 FF */ li r3, 0xff -/* 8021500C 98 61 00 30 */ stb r3, 0x30(r1) -/* 80215010 38 00 00 0A */ li r0, 0xa -/* 80215014 98 01 00 31 */ stb r0, 0x31(r1) -/* 80215018 98 01 00 32 */ stb r0, 0x32(r1) -/* 8021501C 98 61 00 33 */ stb r3, 0x33(r1) -/* 80215020 80 01 00 30 */ lwz r0, 0x30(r1) -/* 80215024 90 01 00 34 */ stw r0, 0x34(r1) -/* 80215028 98 61 00 38 */ stb r3, 0x38(r1) -/* 8021502C 38 00 00 64 */ li r0, 0x64 -/* 80215030 98 01 00 39 */ stb r0, 0x39(r1) -/* 80215034 98 01 00 3A */ stb r0, 0x3a(r1) -/* 80215038 98 61 00 3B */ stb r3, 0x3b(r1) -/* 8021503C 80 01 00 38 */ lwz r0, 0x38(r1) -/* 80215040 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80215044 80 7C 01 D8 */ lwz r3, 0x1d8(r28) -/* 80215048 38 81 00 3C */ addi r4, r1, 0x3c -/* 8021504C 38 A1 00 34 */ addi r5, r1, 0x34 -/* 80215050 48 03 F4 09 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80215054 7F 83 E3 78 */ mr r3, r28 -/* 80215058 80 9C 05 3C */ lwz r4, 0x53c(r28) -/* 8021505C 4B FF EE 39 */ bl playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor -/* 80215060 C0 3E 05 FC */ lfs f1, 0x5fc(r30) -/* 80215064 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80215068 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8021506C 40 81 01 40 */ ble lbl_802151AC -/* 80215070 38 00 00 2B */ li r0, 0x2b -/* 80215074 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80215078 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8021507C 38 81 00 2C */ addi r4, r1, 0x2c -/* 80215080 38 A0 00 00 */ li r5, 0 -/* 80215084 38 C0 00 00 */ li r6, 0 -/* 80215088 38 E0 00 00 */ li r7, 0 -/* 8021508C C0 22 AE 84 */ lfs f1, lit_4183(r2) -/* 80215090 FC 40 08 90 */ fmr f2, f1 -/* 80215094 C0 62 AE B0 */ lfs f3, lit_5786(r2) -/* 80215098 FC 80 18 90 */ fmr f4, f3 -/* 8021509C 39 00 00 00 */ li r8, 0 -/* 802150A0 48 09 74 6D */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 802150A4 48 00 01 08 */ b lbl_802151AC -lbl_802150A8: -/* 802150A8 C0 02 AE 94 */ lfs f0, lit_4922(r2) -/* 802150AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802150B0 4C 40 13 82 */ cror 2, 0, 2 -/* 802150B4 40 82 00 A8 */ bne lbl_8021515C -/* 802150B8 38 00 00 50 */ li r0, 0x50 -/* 802150BC 98 01 00 1C */ stb r0, 0x1c(r1) -/* 802150C0 38 00 00 B4 */ li r0, 0xb4 -/* 802150C4 98 01 00 1D */ stb r0, 0x1d(r1) -/* 802150C8 38 60 00 FF */ li r3, 0xff -/* 802150CC 98 61 00 1E */ stb r3, 0x1e(r1) -/* 802150D0 98 61 00 1F */ stb r3, 0x1f(r1) -/* 802150D4 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 802150D8 90 01 00 20 */ stw r0, 0x20(r1) -/* 802150DC 38 00 00 C8 */ li r0, 0xc8 -/* 802150E0 98 01 00 24 */ stb r0, 0x24(r1) -/* 802150E4 98 01 00 25 */ stb r0, 0x25(r1) -/* 802150E8 98 61 00 26 */ stb r3, 0x26(r1) -/* 802150EC 98 61 00 27 */ stb r3, 0x27(r1) -/* 802150F0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802150F4 90 01 00 28 */ stw r0, 0x28(r1) -/* 802150F8 80 7C 01 D8 */ lwz r3, 0x1d8(r28) -/* 802150FC 38 81 00 28 */ addi r4, r1, 0x28 -/* 80215100 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80215104 48 03 F3 55 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80215108 7F 83 E3 78 */ mr r3, r28 -/* 8021510C 80 9C 05 40 */ lwz r4, 0x540(r28) -/* 80215110 4B FF ED 85 */ bl playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor -/* 80215114 C0 3E 05 FC */ lfs f1, 0x5fc(r30) -/* 80215118 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021511C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80215120 40 81 00 8C */ ble lbl_802151AC -/* 80215124 38 00 00 2A */ li r0, 0x2a -/* 80215128 90 01 00 18 */ stw r0, 0x18(r1) -/* 8021512C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80215130 38 81 00 18 */ addi r4, r1, 0x18 -/* 80215134 38 A0 00 00 */ li r5, 0 -/* 80215138 38 C0 00 00 */ li r6, 0 -/* 8021513C 38 E0 00 00 */ li r7, 0 -/* 80215140 C0 22 AE 84 */ lfs f1, lit_4183(r2) -/* 80215144 FC 40 08 90 */ fmr f2, f1 -/* 80215148 C0 62 AE B0 */ lfs f3, lit_5786(r2) -/* 8021514C FC 80 18 90 */ fmr f4, f3 -/* 80215150 39 00 00 00 */ li r8, 0 -/* 80215154 48 09 73 B9 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80215158 48 00 00 54 */ b lbl_802151AC -lbl_8021515C: -/* 8021515C 38 00 00 50 */ li r0, 0x50 -/* 80215160 98 01 00 08 */ stb r0, 8(r1) -/* 80215164 38 00 00 B4 */ li r0, 0xb4 -/* 80215168 98 01 00 09 */ stb r0, 9(r1) -/* 8021516C 38 60 00 FF */ li r3, 0xff -/* 80215170 98 61 00 0A */ stb r3, 0xa(r1) -/* 80215174 98 61 00 0B */ stb r3, 0xb(r1) -/* 80215178 80 01 00 08 */ lwz r0, 8(r1) -/* 8021517C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80215180 38 00 00 C8 */ li r0, 0xc8 -/* 80215184 98 01 00 10 */ stb r0, 0x10(r1) -/* 80215188 98 01 00 11 */ stb r0, 0x11(r1) -/* 8021518C 98 61 00 12 */ stb r3, 0x12(r1) -/* 80215190 98 61 00 13 */ stb r3, 0x13(r1) -/* 80215194 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80215198 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021519C 80 7C 01 D8 */ lwz r3, 0x1d8(r28) -/* 802151A0 38 81 00 14 */ addi r4, r1, 0x14 -/* 802151A4 38 A1 00 0C */ addi r5, r1, 0xc -/* 802151A8 48 03 F2 B1 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -lbl_802151AC: -/* 802151AC 7F 83 E3 78 */ mr r3, r28 -/* 802151B0 38 80 00 01 */ li r4, 1 -/* 802151B4 48 00 07 3D */ bl setAlphaOxygenChange__13dMeter2Draw_cFb -lbl_802151B8: -/* 802151B8 80 7C 01 D8 */ lwz r3, 0x1d8(r28) -/* 802151BC 80 63 00 04 */ lwz r3, 4(r3) -/* 802151C0 7C 9C EA 14 */ add r4, r28, r29 -/* 802151C4 C0 24 05 84 */ lfs f1, 0x584(r4) -/* 802151C8 C0 44 05 90 */ lfs f2, 0x590(r4) -/* 802151CC 81 83 00 00 */ lwz r12, 0(r3) -/* 802151D0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802151D4 7D 89 03 A6 */ mtctr r12 -/* 802151D8 4E 80 04 21 */ bctrl -/* 802151DC 80 7C 01 DC */ lwz r3, 0x1dc(r28) -/* 802151E0 80 63 00 04 */ lwz r3, 4(r3) -/* 802151E4 7C 9C EA 14 */ add r4, r28, r29 -/* 802151E8 C0 24 05 9C */ lfs f1, 0x59c(r4) -/* 802151EC C0 44 05 A8 */ lfs f2, 0x5a8(r4) -/* 802151F0 81 83 00 00 */ lwz r12, 0(r3) -/* 802151F4 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802151F8 7D 89 03 A6 */ mtctr r12 -/* 802151FC 4E 80 04 21 */ bctrl -/* 80215200 80 7C 01 D0 */ lwz r3, 0x1d0(r28) -/* 80215204 80 63 00 04 */ lwz r3, 4(r3) -/* 80215208 7C 9C EA 14 */ add r4, r28, r29 -/* 8021520C C0 24 05 B4 */ lfs f1, 0x5b4(r4) -/* 80215210 C0 44 05 C0 */ lfs f2, 0x5c0(r4) -/* 80215214 81 83 00 00 */ lwz r12, 0(r3) -/* 80215218 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021521C 7D 89 03 A6 */ mtctr r12 -/* 80215220 4E 80 04 21 */ bctrl -/* 80215224 7C 9C EA 14 */ add r4, r28, r29 -/* 80215228 C0 24 05 D8 */ lfs f1, 0x5d8(r4) -/* 8021522C 80 7C 01 CC */ lwz r3, 0x1cc(r28) -/* 80215230 80 63 00 04 */ lwz r3, 4(r3) -/* 80215234 C0 04 05 CC */ lfs f0, 0x5cc(r4) -/* 80215238 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8021523C D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 80215240 81 83 00 00 */ lwz r12, 0(r3) -/* 80215244 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80215248 7D 89 03 A6 */ mtctr r12 -/* 8021524C 4E 80 04 21 */ bctrl -/* 80215250 80 7C 01 CC */ lwz r3, 0x1cc(r28) -/* 80215254 7C 9C EA 14 */ add r4, r28, r29 -/* 80215258 C0 24 05 E4 */ lfs f1, 0x5e4(r4) -/* 8021525C C0 44 05 F0 */ lfs f2, 0x5f0(r4) -/* 80215260 48 03 F3 51 */ bl paneTrans__8CPaneMgrFff -/* 80215264 80 7C 00 7C */ lwz r3, 0x7c(r28) -/* 80215268 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 8021526C FC 40 08 90 */ fmr f2, f1 -/* 80215270 7F E4 FB 78 */ mr r4, r31 -/* 80215274 48 0E 3C 61 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 80215278 39 61 00 90 */ addi r11, r1, 0x90 -/* 8021527C 48 14 CF A5 */ bl _restgpr_27 -/* 80215280 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80215284 7C 08 03 A6 */ mtlr r0 -/* 80215288 38 21 00 90 */ addi r1, r1, 0x90 -/* 8021528C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawKantera__13dMeter2Draw_cFllff.s b/asm/d/meter/d_meter2_draw/drawKantera__13dMeter2Draw_cFllff.s deleted file mode 100644 index 9f394ec3b7..0000000000 --- a/asm/d/meter/d_meter2_draw/drawKantera__13dMeter2Draw_cFllff.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_802154A8: -/* 802154A8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802154AC 80 C3 01 D4 */ lwz r6, 0x1d4(r3) -/* 802154B0 C0 06 00 24 */ lfs f0, 0x24(r6) -/* 802154B4 80 C3 01 DC */ lwz r6, 0x1dc(r3) -/* 802154B8 C0 66 00 24 */ lfs f3, 0x24(r6) -/* 802154BC EC C3 00 28 */ fsubs f6, f3, f0 -/* 802154C0 C0 E2 AE 80 */ lfs f7, lit_4182(r2) -/* 802154C4 FC 80 38 90 */ fmr f4, f7 -/* 802154C8 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802154CC 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802154D0 A0 06 00 06 */ lhz r0, 6(r6) -/* 802154D4 54 06 04 3F */ clrlwi. r6, r0, 0x10 -/* 802154D8 41 82 00 60 */ beq lbl_80215538 -/* 802154DC C8 A2 AE A0 */ lfd f5, lit_4925(r2) -/* 802154E0 6C A0 80 00 */ xoris r0, r5, 0x8000 -/* 802154E4 90 01 00 0C */ stw r0, 0xc(r1) -/* 802154E8 3C A0 43 30 */ lis r5, 0x4330 -/* 802154EC 90 A1 00 08 */ stw r5, 8(r1) -/* 802154F0 C8 01 00 08 */ lfd f0, 8(r1) -/* 802154F4 EC 60 28 28 */ fsubs f3, f0, f5 -/* 802154F8 C8 82 AE C0 */ lfd f4, lit_6293(r2) -/* 802154FC 90 C1 00 14 */ stw r6, 0x14(r1) -/* 80215500 90 A1 00 10 */ stw r5, 0x10(r1) -/* 80215504 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80215508 EC 00 20 28 */ fsubs f0, f0, f4 -/* 8021550C EC E3 00 24 */ fdivs f7, f3, f0 -/* 80215510 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 80215514 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80215518 90 A1 00 18 */ stw r5, 0x18(r1) -/* 8021551C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80215520 EC 60 28 28 */ fsubs f3, f0, f5 -/* 80215524 90 C1 00 24 */ stw r6, 0x24(r1) -/* 80215528 90 A1 00 20 */ stw r5, 0x20(r1) -/* 8021552C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80215530 EC 00 20 28 */ fsubs f0, f0, f4 -/* 80215534 EC 83 00 24 */ fdivs f4, f3, f0 -lbl_80215538: -/* 80215538 80 83 01 D8 */ lwz r4, 0x1d8(r3) -/* 8021553C C0 04 00 34 */ lfs f0, 0x34(r4) -/* 80215540 EC 07 00 32 */ fmuls f0, f7, f0 -/* 80215544 D0 03 05 88 */ stfs f0, 0x588(r3) -/* 80215548 80 83 01 D8 */ lwz r4, 0x1d8(r3) -/* 8021554C C0 04 00 38 */ lfs f0, 0x38(r4) -/* 80215550 D0 03 05 94 */ stfs f0, 0x594(r3) -/* 80215554 80 83 01 D4 */ lwz r4, 0x1d4(r3) -/* 80215558 C0 64 00 24 */ lfs f3, 0x24(r4) -/* 8021555C EC 06 01 32 */ fmuls f0, f6, f4 -/* 80215560 EC 00 18 2A */ fadds f0, f0, f3 -/* 80215564 D0 03 05 A0 */ stfs f0, 0x5a0(r3) -/* 80215568 80 83 01 D4 */ lwz r4, 0x1d4(r3) -/* 8021556C C0 04 00 28 */ lfs f0, 0x28(r4) -/* 80215570 D0 03 05 AC */ stfs f0, 0x5ac(r3) -/* 80215574 80 83 01 D0 */ lwz r4, 0x1d0(r3) -/* 80215578 C0 04 00 34 */ lfs f0, 0x34(r4) -/* 8021557C EC 04 00 32 */ fmuls f0, f4, f0 -/* 80215580 D0 03 05 B8 */ stfs f0, 0x5b8(r3) -/* 80215584 80 83 01 D0 */ lwz r4, 0x1d0(r3) -/* 80215588 C0 04 00 38 */ lfs f0, 0x38(r4) -/* 8021558C D0 03 05 C4 */ stfs f0, 0x5c4(r3) -/* 80215590 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80215594 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80215598 C0 04 00 54 */ lfs f0, 0x54(r4) -/* 8021559C D0 03 05 D0 */ stfs f0, 0x5d0(r3) -/* 802155A0 C0 04 00 54 */ lfs f0, 0x54(r4) -/* 802155A4 D0 03 05 DC */ stfs f0, 0x5dc(r3) -/* 802155A8 D0 23 05 E8 */ stfs f1, 0x5e8(r3) -/* 802155AC D0 43 05 F4 */ stfs f2, 0x5f4(r3) -/* 802155B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802155B4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawKey__13dMeter2Draw_cFs.s b/asm/d/meter/d_meter2_draw/drawKey__13dMeter2Draw_cFs.s deleted file mode 100644 index 649cbc2027..0000000000 --- a/asm/d/meter/d_meter2_draw/drawKey__13dMeter2Draw_cFs.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80216A40: -/* 80216A40 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80216A44 7C 08 02 A6 */ mflr r0 -/* 80216A48 90 01 00 24 */ stw r0, 0x24(r1) -/* 80216A4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80216A50 48 14 B7 85 */ bl _savegpr_27 -/* 80216A54 7C 7B 1B 78 */ mr r27, r3 -/* 80216A58 7C 80 07 34 */ extsh r0, r4 -/* 80216A5C 2C 00 00 05 */ cmpwi r0, 5 -/* 80216A60 40 81 00 08 */ ble lbl_80216A68 -/* 80216A64 38 80 00 05 */ li r4, 5 -lbl_80216A68: -/* 80216A68 3B 80 00 00 */ li r28, 0 -/* 80216A6C 3B E0 00 00 */ li r31, 0 -/* 80216A70 7C 9E 07 34 */ extsh r30, r4 -lbl_80216A74: -/* 80216A74 7C 1C F0 00 */ cmpw r28, r30 -/* 80216A78 40 80 00 24 */ bge lbl_80216A9C -/* 80216A7C 3B BF 02 E4 */ addi r29, r31, 0x2e4 -/* 80216A80 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216A84 48 03 EB C9 */ bl isVisible__13CPaneMgrAlphaFv -/* 80216A88 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80216A8C 40 82 00 30 */ bne lbl_80216ABC -/* 80216A90 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216A94 48 03 EB 35 */ bl show__13CPaneMgrAlphaFv -/* 80216A98 48 00 00 24 */ b lbl_80216ABC -lbl_80216A9C: -/* 80216A9C 3B BF 02 E4 */ addi r29, r31, 0x2e4 -/* 80216AA0 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216AA4 48 03 EB A9 */ bl isVisible__13CPaneMgrAlphaFv -/* 80216AA8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80216AAC 28 00 00 01 */ cmplwi r0, 1 -/* 80216AB0 40 82 00 0C */ bne lbl_80216ABC -/* 80216AB4 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216AB8 48 03 EB 51 */ bl hide__13CPaneMgrAlphaFv -lbl_80216ABC: -/* 80216ABC 3B 9C 00 01 */ addi r28, r28, 1 -/* 80216AC0 2C 1C 00 05 */ cmpwi r28, 5 -/* 80216AC4 3B FF 00 04 */ addi r31, r31, 4 -/* 80216AC8 41 80 FF AC */ blt lbl_80216A74 -/* 80216ACC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216AD0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216AD4 C0 03 03 5C */ lfs f0, 0x35c(r3) -/* 80216AD8 80 7B 02 E0 */ lwz r3, 0x2e0(r27) -/* 80216ADC 80 63 00 04 */ lwz r3, 4(r3) -/* 80216AE0 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80216AE4 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80216AE8 81 83 00 00 */ lwz r12, 0(r3) -/* 80216AEC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80216AF0 7D 89 03 A6 */ mtctr r12 -/* 80216AF4 4E 80 04 21 */ bctrl -/* 80216AF8 80 7B 02 E0 */ lwz r3, 0x2e0(r27) -/* 80216AFC 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216B00 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216B04 C0 24 03 60 */ lfs f1, 0x360(r4) -/* 80216B08 C0 44 03 64 */ lfs f2, 0x364(r4) -/* 80216B0C 48 03 DA A5 */ bl paneTrans__8CPaneMgrFff -/* 80216B10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80216B14 48 14 B7 0D */ bl _restgpr_27 -/* 80216B18 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80216B1C 7C 08 03 A6 */ mtlr r0 -/* 80216B20 38 21 00 20 */ addi r1, r1, 0x20 -/* 80216B24 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawLife__13dMeter2Draw_cFssff.s b/asm/d/meter/d_meter2_draw/drawLife__13dMeter2Draw_cFssff.s deleted file mode 100644 index 0b01f9a589..0000000000 --- a/asm/d/meter/d_meter2_draw/drawLife__13dMeter2Draw_cFssff.s +++ /dev/null @@ -1,151 +0,0 @@ -lbl_802149F4: -/* 802149F4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802149F8 7C 08 02 A6 */ mflr r0 -/* 802149FC 90 01 00 44 */ stw r0, 0x44(r1) -/* 80214A00 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80214A04 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80214A08 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 80214A0C F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 80214A10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80214A14 48 14 D7 BD */ bl _savegpr_26 -/* 80214A18 7C 7F 1B 78 */ mr r31, r3 -/* 80214A1C FF C0 08 90 */ fmr f30, f1 -/* 80214A20 FF E0 10 90 */ fmr f31, f2 -/* 80214A24 7C 83 07 34 */ extsh r3, r4 -/* 80214A28 38 00 00 05 */ li r0, 5 -/* 80214A2C 7C 03 03 D6 */ divw r0, r3, r0 -/* 80214A30 7C 1C 07 34 */ extsh r28, r0 -/* 80214A34 7C A4 07 34 */ extsh r4, r5 -/* 80214A38 7C 80 16 70 */ srawi r0, r4, 2 -/* 80214A3C 7C 00 01 94 */ addze r0, r0 -/* 80214A40 7C 1D 07 34 */ extsh r29, r0 -/* 80214A44 54 80 F0 02 */ slwi r0, r4, 0x1e -/* 80214A48 54 83 0F FE */ srwi r3, r4, 0x1f -/* 80214A4C 7C 03 00 50 */ subf r0, r3, r0 -/* 80214A50 54 00 10 3E */ rotlwi r0, r0, 2 -/* 80214A54 7C 00 1A 14 */ add r0, r0, r3 -/* 80214A58 7C 1B 07 34 */ extsh r27, r0 -/* 80214A5C 57 80 10 3A */ slwi r0, r28, 2 -/* 80214A60 7C 04 00 00 */ cmpw r4, r0 -/* 80214A64 40 82 00 08 */ bne lbl_80214A6C -/* 80214A68 3B 60 00 00 */ li r27, 0 -lbl_80214A6C: -/* 80214A6C 7F 60 07 35 */ extsh. r0, r27 -/* 80214A70 40 82 00 08 */ bne lbl_80214A78 -/* 80214A74 3B BD FF FF */ addi r29, r29, -1 -lbl_80214A78: -/* 80214A78 7C A0 07 35 */ extsh. r0, r5 -/* 80214A7C 40 82 00 10 */ bne lbl_80214A8C -/* 80214A80 80 7F 01 C8 */ lwz r3, 0x1c8(r31) -/* 80214A84 48 04 0B 85 */ bl hide__13CPaneMgrAlphaFv -/* 80214A88 48 00 00 0C */ b lbl_80214A94 -lbl_80214A8C: -/* 80214A8C 80 7F 01 C8 */ lwz r3, 0x1c8(r31) -/* 80214A90 48 04 0B 39 */ bl show__13CPaneMgrAlphaFv -lbl_80214A94: -/* 80214A94 3B 40 00 00 */ li r26, 0 -/* 80214A98 3B C0 00 00 */ li r30, 0 -/* 80214A9C 7F BD 07 34 */ extsh r29, r29 -lbl_80214AA0: -/* 80214AA0 7C 1A E0 00 */ cmpw r26, r28 -/* 80214AA4 40 80 00 64 */ bge lbl_80214B08 -/* 80214AA8 38 1E 01 28 */ addi r0, r30, 0x128 -/* 80214AAC 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80214AB0 48 04 0B 19 */ bl show__13CPaneMgrAlphaFv -/* 80214AB4 7C 1A E8 00 */ cmpw r26, r29 -/* 80214AB8 40 82 00 1C */ bne lbl_80214AD4 -/* 80214ABC 7F E3 FB 78 */ mr r3, r31 -/* 80214AC0 7F 44 D3 78 */ mr r4, r26 -/* 80214AC4 38 A0 00 01 */ li r5, 1 -/* 80214AC8 57 66 06 3E */ clrlwi r6, r27, 0x18 -/* 80214ACC 4B FF FD 01 */ bl changeTextureLife__13dMeter2Draw_cFibUc -/* 80214AD0 48 00 00 58 */ b lbl_80214B28 -lbl_80214AD4: -/* 80214AD4 40 80 00 1C */ bge lbl_80214AF0 -/* 80214AD8 7F E3 FB 78 */ mr r3, r31 -/* 80214ADC 7F 44 D3 78 */ mr r4, r26 -/* 80214AE0 38 A0 00 01 */ li r5, 1 -/* 80214AE4 38 C0 00 FF */ li r6, 0xff -/* 80214AE8 4B FF FC E5 */ bl changeTextureLife__13dMeter2Draw_cFibUc -/* 80214AEC 48 00 00 3C */ b lbl_80214B28 -lbl_80214AF0: -/* 80214AF0 7F E3 FB 78 */ mr r3, r31 -/* 80214AF4 7F 44 D3 78 */ mr r4, r26 -/* 80214AF8 38 A0 00 00 */ li r5, 0 -/* 80214AFC 38 C0 00 FF */ li r6, 0xff -/* 80214B00 4B FF FC CD */ bl changeTextureLife__13dMeter2Draw_cFibUc -/* 80214B04 48 00 00 24 */ b lbl_80214B28 -lbl_80214B08: -/* 80214B08 38 1E 01 28 */ addi r0, r30, 0x128 -/* 80214B0C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80214B10 48 04 0A F9 */ bl hide__13CPaneMgrAlphaFv -/* 80214B14 7F E3 FB 78 */ mr r3, r31 -/* 80214B18 7F 44 D3 78 */ mr r4, r26 -/* 80214B1C 38 A0 00 00 */ li r5, 0 -/* 80214B20 38 C0 00 FF */ li r6, 0xff -/* 80214B24 4B FF FC A9 */ bl changeTextureLife__13dMeter2Draw_cFibUc -lbl_80214B28: -/* 80214B28 3B 5A 00 01 */ addi r26, r26, 1 -/* 80214B2C 2C 1A 00 14 */ cmpwi r26, 0x14 -/* 80214B30 3B DE 00 04 */ addi r30, r30, 4 -/* 80214B34 41 80 FF 6C */ blt lbl_80214AA0 -/* 80214B38 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80214B3C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80214B40 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80214B44 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 80214B48 80 63 00 04 */ lwz r3, 4(r3) -/* 80214B4C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80214B50 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80214B54 81 83 00 00 */ lwz r12, 0(r3) -/* 80214B58 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80214B5C 7D 89 03 A6 */ mtctr r12 -/* 80214B60 4E 80 04 21 */ bctrl -/* 80214B64 3B 40 00 00 */ li r26, 0 -/* 80214B68 3B C0 00 00 */ li r30, 0 -/* 80214B6C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80214B70 3B A3 EB C8 */ addi r29, r3, g_drawHIO@l /* 0x8042EBC8@l */ -lbl_80214B74: -/* 80214B74 C0 1D 00 30 */ lfs f0, 0x30(r29) -/* 80214B78 38 1E 01 78 */ addi r0, r30, 0x178 -/* 80214B7C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80214B80 80 63 00 04 */ lwz r3, 4(r3) -/* 80214B84 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80214B88 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80214B8C 81 83 00 00 */ lwz r12, 0(r3) -/* 80214B90 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80214B94 7D 89 03 A6 */ mtctr r12 -/* 80214B98 4E 80 04 21 */ bctrl -/* 80214B9C 3B 5A 00 01 */ addi r26, r26, 1 -/* 80214BA0 2C 1A 00 14 */ cmpwi r26, 0x14 -/* 80214BA4 3B DE 00 04 */ addi r30, r30, 4 -/* 80214BA8 41 80 FF CC */ blt lbl_80214B74 -/* 80214BAC 3B 40 00 00 */ li r26, 0 -/* 80214BB0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80214BB4 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -lbl_80214BB8: -/* 80214BB8 C0 1E 00 38 */ lfs f0, 0x38(r30) -/* 80214BBC 80 7F 01 C8 */ lwz r3, 0x1c8(r31) -/* 80214BC0 80 63 00 04 */ lwz r3, 4(r3) -/* 80214BC4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80214BC8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80214BCC 81 83 00 00 */ lwz r12, 0(r3) -/* 80214BD0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80214BD4 7D 89 03 A6 */ mtctr r12 -/* 80214BD8 4E 80 04 21 */ bctrl -/* 80214BDC 3B 5A 00 01 */ addi r26, r26, 1 -/* 80214BE0 2C 1A 00 14 */ cmpwi r26, 0x14 -/* 80214BE4 41 80 FF D4 */ blt lbl_80214BB8 -/* 80214BE8 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 80214BEC FC 20 F0 90 */ fmr f1, f30 -/* 80214BF0 FC 40 F8 90 */ fmr f2, f31 -/* 80214BF4 48 03 F9 BD */ bl paneTrans__8CPaneMgrFff -/* 80214BF8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 80214BFC CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80214C00 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 80214C04 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 80214C08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80214C0C 48 14 D6 11 */ bl _restgpr_26 -/* 80214C10 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80214C14 7C 08 03 A6 */ mtlr r0 -/* 80214C18 38 21 00 40 */ addi r1, r1, 0x40 -/* 80214C1C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawLightDrop__13dMeter2Draw_cFUcUcffffUc.s b/asm/d/meter/d_meter2_draw/drawLightDrop__13dMeter2Draw_cFUcUcffffUc.s deleted file mode 100644 index 384753a86a..0000000000 --- a/asm/d/meter/d_meter2_draw/drawLightDrop__13dMeter2Draw_cFUcUcffffUc.s +++ /dev/null @@ -1,171 +0,0 @@ -lbl_80215B18: -/* 80215B18 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80215B1C 7C 08 02 A6 */ mflr r0 -/* 80215B20 90 01 00 84 */ stw r0, 0x84(r1) -/* 80215B24 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 80215B28 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 80215B2C DB C1 00 60 */ stfd f30, 0x60(r1) -/* 80215B30 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 80215B34 DB A1 00 50 */ stfd f29, 0x50(r1) -/* 80215B38 F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 /* qr0 */ -/* 80215B3C DB 81 00 40 */ stfd f28, 0x40(r1) -/* 80215B40 F3 81 00 48 */ psq_st f28, 72(r1), 0, 0 /* qr0 */ -/* 80215B44 39 61 00 40 */ addi r11, r1, 0x40 -/* 80215B48 48 14 C6 85 */ bl _savegpr_25 -/* 80215B4C 7C 7A 1B 78 */ mr r26, r3 -/* 80215B50 FF C0 08 90 */ fmr f30, f1 -/* 80215B54 FF E0 10 90 */ fmr f31, f2 -/* 80215B58 FF 80 18 90 */ fmr f28, f3 -/* 80215B5C FF A0 20 90 */ fmr f29, f4 -/* 80215B60 7C DB 33 78 */ mr r27, r6 -/* 80215B64 3B 80 00 00 */ li r28, 0 -/* 80215B68 3B 20 00 00 */ li r25, 0 -/* 80215B6C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80215B70 3B E3 EB C8 */ addi r31, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80215B74 54 9D 06 3E */ clrlwi r29, r4, 0x18 -lbl_80215B78: -/* 80215B78 7F DA CA 14 */ add r30, r26, r25 -/* 80215B7C 80 7E 01 F0 */ lwz r3, 0x1f0(r30) -/* 80215B80 28 03 00 00 */ cmplwi r3, 0 -/* 80215B84 41 82 00 28 */ beq lbl_80215BAC -/* 80215B88 C0 1F 0E C4 */ lfs f0, 0xec4(r31) -/* 80215B8C 80 63 00 04 */ lwz r3, 4(r3) -/* 80215B90 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80215B94 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80215B98 81 83 00 00 */ lwz r12, 0(r3) -/* 80215B9C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80215BA0 7D 89 03 A6 */ mtctr r12 -/* 80215BA4 4E 80 04 21 */ bctrl -/* 80215BA8 48 00 00 4C */ b lbl_80215BF4 -lbl_80215BAC: -/* 80215BAC C0 1F 0E C4 */ lfs f0, 0xec4(r31) -/* 80215BB0 80 7E 01 F4 */ lwz r3, 0x1f4(r30) -/* 80215BB4 80 63 00 04 */ lwz r3, 4(r3) -/* 80215BB8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80215BBC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80215BC0 81 83 00 00 */ lwz r12, 0(r3) -/* 80215BC4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80215BC8 7D 89 03 A6 */ mtctr r12 -/* 80215BCC 4E 80 04 21 */ bctrl -/* 80215BD0 C0 1F 0E C4 */ lfs f0, 0xec4(r31) -/* 80215BD4 80 7E 01 F8 */ lwz r3, 0x1f8(r30) -/* 80215BD8 80 63 00 04 */ lwz r3, 4(r3) -/* 80215BDC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80215BE0 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80215BE4 81 83 00 00 */ lwz r12, 0(r3) -/* 80215BE8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80215BEC 7D 89 03 A6 */ mtctr r12 -/* 80215BF0 4E 80 04 21 */ bctrl -lbl_80215BF4: -/* 80215BF4 7C 1C E8 00 */ cmpw r28, r29 -/* 80215BF8 40 80 00 58 */ bge lbl_80215C50 -/* 80215BFC 80 1F 0E B4 */ lwz r0, 0xeb4(r31) -/* 80215C00 90 01 00 10 */ stw r0, 0x10(r1) -/* 80215C04 80 1F 0E B8 */ lwz r0, 0xeb8(r31) -/* 80215C08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80215C0C 80 7E 01 F4 */ lwz r3, 0x1f4(r30) -/* 80215C10 80 63 00 04 */ lwz r3, 4(r3) -/* 80215C14 38 81 00 14 */ addi r4, r1, 0x14 -/* 80215C18 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80215C1C 81 83 00 00 */ lwz r12, 0(r3) -/* 80215C20 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80215C24 7D 89 03 A6 */ mtctr r12 -/* 80215C28 4E 80 04 21 */ bctrl -/* 80215C2C 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C30 48 03 FB F9 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80215C34 80 7E 01 F4 */ lwz r3, 0x1f4(r30) -/* 80215C38 48 03 FB 99 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80215C3C 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C40 48 03 FB E9 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80215C44 80 7E 01 F8 */ lwz r3, 0x1f8(r30) -/* 80215C48 48 03 FB 89 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80215C4C 48 00 00 64 */ b lbl_80215CB0 -lbl_80215C50: -/* 80215C50 80 1F 0E BC */ lwz r0, 0xebc(r31) -/* 80215C54 90 01 00 08 */ stw r0, 8(r1) -/* 80215C58 80 1F 0E C0 */ lwz r0, 0xec0(r31) -/* 80215C5C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80215C60 80 7E 01 F4 */ lwz r3, 0x1f4(r30) -/* 80215C64 80 63 00 04 */ lwz r3, 4(r3) -/* 80215C68 38 81 00 0C */ addi r4, r1, 0xc -/* 80215C6C 38 A1 00 08 */ addi r5, r1, 8 -/* 80215C70 81 83 00 00 */ lwz r12, 0(r3) -/* 80215C74 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80215C78 7D 89 03 A6 */ mtctr r12 -/* 80215C7C 4E 80 04 21 */ bctrl -/* 80215C80 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C84 48 03 FB A5 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80215C88 C0 02 AE C8 */ lfs f0, lit_6524(r2) -/* 80215C8C EC 20 00 72 */ fmuls f1, f0, f1 -/* 80215C90 80 7E 01 F4 */ lwz r3, 0x1f4(r30) -/* 80215C94 48 03 FB 3D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80215C98 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C9C 48 03 FB 8D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80215CA0 C0 02 AE C8 */ lfs f0, lit_6524(r2) -/* 80215CA4 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80215CA8 80 7E 01 F8 */ lwz r3, 0x1f8(r30) -/* 80215CAC 48 03 FB 25 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80215CB0: -/* 80215CB0 3B 9C 00 01 */ addi r28, r28, 1 -/* 80215CB4 2C 1C 00 10 */ cmpwi r28, 0x10 -/* 80215CB8 3B 39 00 0C */ addi r25, r25, 0xc -/* 80215CBC 41 80 FE BC */ blt lbl_80215B78 -/* 80215CC0 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 80215CC4 28 00 00 01 */ cmplwi r0, 1 -/* 80215CC8 40 82 00 30 */ bne lbl_80215CF8 -/* 80215CCC 9B 7A 07 60 */ stb r27, 0x760(r26) -/* 80215CD0 38 00 FF FF */ li r0, -1 -/* 80215CD4 B0 1A 07 56 */ sth r0, 0x756(r26) -/* 80215CD8 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80215CDC 57 A0 10 3A */ slwi r0, r29, 2 -/* 80215CE0 7C 7A 02 14 */ add r3, r26, r0 -/* 80215CE4 C0 03 06 28 */ lfs f0, 0x628(r3) -/* 80215CE8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80215CEC 40 82 00 0C */ bne lbl_80215CF8 -/* 80215CF0 C0 02 AE 98 */ lfs f0, lit_4923(r2) -/* 80215CF4 D0 03 06 28 */ stfs f0, 0x628(r3) -lbl_80215CF8: -/* 80215CF8 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 80215CFC 28 00 00 02 */ cmplwi r0, 2 -/* 80215D00 40 82 00 28 */ bne lbl_80215D28 -/* 80215D04 9B 7A 07 60 */ stb r27, 0x760(r26) -/* 80215D08 38 00 00 00 */ li r0, 0 -/* 80215D0C B0 1A 07 56 */ sth r0, 0x756(r26) -/* 80215D10 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80215D14 C0 1A 06 2C */ lfs f0, 0x62c(r26) -/* 80215D18 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80215D1C 40 82 00 0C */ bne lbl_80215D28 -/* 80215D20 C0 02 AE 98 */ lfs f0, lit_4923(r2) -/* 80215D24 D0 1A 06 2C */ stfs f0, 0x62c(r26) -lbl_80215D28: -/* 80215D28 D3 BA 06 FC */ stfs f29, 0x6fc(r26) -/* 80215D2C D3 9A 06 F4 */ stfs f28, 0x6f4(r26) -/* 80215D30 C0 3A 06 F4 */ lfs f1, 0x6f4(r26) -/* 80215D34 C0 1A 06 F8 */ lfs f0, 0x6f8(r26) -/* 80215D38 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80215D3C 80 7A 01 E0 */ lwz r3, 0x1e0(r26) -/* 80215D40 80 63 00 04 */ lwz r3, 4(r3) -/* 80215D44 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80215D48 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80215D4C 81 83 00 00 */ lwz r12, 0(r3) -/* 80215D50 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80215D54 7D 89 03 A6 */ mtctr r12 -/* 80215D58 4E 80 04 21 */ bctrl -/* 80215D5C 80 7A 01 E0 */ lwz r3, 0x1e0(r26) -/* 80215D60 FC 20 F0 90 */ fmr f1, f30 -/* 80215D64 FC 40 F8 90 */ fmr f2, f31 -/* 80215D68 48 03 E8 49 */ bl paneTrans__8CPaneMgrFff -/* 80215D6C E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 80215D70 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 80215D74 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 80215D78 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 80215D7C E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 /* qr0 */ -/* 80215D80 CB A1 00 50 */ lfd f29, 0x50(r1) -/* 80215D84 E3 81 00 48 */ psq_l f28, 72(r1), 0, 0 /* qr0 */ -/* 80215D88 CB 81 00 40 */ lfd f28, 0x40(r1) -/* 80215D8C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80215D90 48 14 C4 89 */ bl _restgpr_25 -/* 80215D94 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80215D98 7C 08 03 A6 */ mtlr r0 -/* 80215D9C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80215DA0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawMagic__13dMeter2Draw_cFssff.s b/asm/d/meter/d_meter2_draw/drawMagic__13dMeter2Draw_cFssff.s deleted file mode 100644 index a173e866a4..0000000000 --- a/asm/d/meter/d_meter2_draw/drawMagic__13dMeter2Draw_cFssff.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80215290: -/* 80215290 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80215294 80 C3 01 D4 */ lwz r6, 0x1d4(r3) -/* 80215298 C0 66 00 24 */ lfs f3, 0x24(r6) -/* 8021529C 80 C3 01 DC */ lwz r6, 0x1dc(r3) -/* 802152A0 C0 C6 00 24 */ lfs f6, 0x24(r6) -/* 802152A4 80 C3 01 D8 */ lwz r6, 0x1d8(r3) -/* 802152A8 C0 86 00 34 */ lfs f4, 0x34(r6) -/* 802152AC 7C A0 07 34 */ extsh r0, r5 -/* 802152B0 C8 A2 AE A0 */ lfd f5, lit_4925(r2) -/* 802152B4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802152B8 90 01 00 0C */ stw r0, 0xc(r1) -/* 802152BC 3C C0 43 30 */ lis r6, 0x4330 -/* 802152C0 90 C1 00 08 */ stw r6, 8(r1) -/* 802152C4 C8 01 00 08 */ lfd f0, 8(r1) -/* 802152C8 EC 00 28 28 */ fsubs f0, f0, f5 -/* 802152CC EC 00 01 32 */ fmuls f0, f0, f4 -/* 802152D0 C0 82 AE B8 */ lfs f4, lit_6175(r2) -/* 802152D4 EC 00 01 32 */ fmuls f0, f0, f4 -/* 802152D8 D0 03 05 84 */ stfs f0, 0x584(r3) -/* 802152DC 80 A3 01 D8 */ lwz r5, 0x1d8(r3) -/* 802152E0 C0 05 00 38 */ lfs f0, 0x38(r5) -/* 802152E4 D0 03 05 90 */ stfs f0, 0x590(r3) -/* 802152E8 80 A3 01 D4 */ lwz r5, 0x1d4(r3) -/* 802152EC C0 E5 00 24 */ lfs f7, 0x24(r5) -/* 802152F0 EC 66 18 28 */ fsubs f3, f6, f3 -/* 802152F4 7C 80 07 34 */ extsh r0, r4 -/* 802152F8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802152FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80215300 90 C1 00 10 */ stw r6, 0x10(r1) -/* 80215304 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80215308 EC 00 28 28 */ fsubs f0, f0, f5 -/* 8021530C EC 03 00 32 */ fmuls f0, f3, f0 -/* 80215310 EC 00 01 32 */ fmuls f0, f0, f4 -/* 80215314 EC 00 38 2A */ fadds f0, f0, f7 -/* 80215318 D0 03 05 9C */ stfs f0, 0x59c(r3) -/* 8021531C 80 83 01 D4 */ lwz r4, 0x1d4(r3) -/* 80215320 C0 04 00 28 */ lfs f0, 0x28(r4) -/* 80215324 D0 03 05 A8 */ stfs f0, 0x5a8(r3) -/* 80215328 80 83 01 D0 */ lwz r4, 0x1d0(r3) -/* 8021532C C0 64 00 34 */ lfs f3, 0x34(r4) -/* 80215330 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80215334 90 C1 00 18 */ stw r6, 0x18(r1) -/* 80215338 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8021533C EC 00 28 28 */ fsubs f0, f0, f5 -/* 80215340 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 80215344 EC 00 01 32 */ fmuls f0, f0, f4 -/* 80215348 D0 03 05 B4 */ stfs f0, 0x5b4(r3) -/* 8021534C 80 83 01 D0 */ lwz r4, 0x1d0(r3) -/* 80215350 C0 04 00 38 */ lfs f0, 0x38(r4) -/* 80215354 D0 03 05 C0 */ stfs f0, 0x5c0(r3) -/* 80215358 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021535C 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80215360 C0 04 00 40 */ lfs f0, 0x40(r4) -/* 80215364 D0 03 05 CC */ stfs f0, 0x5cc(r3) -/* 80215368 C0 04 00 40 */ lfs f0, 0x40(r4) -/* 8021536C D0 03 05 D8 */ stfs f0, 0x5d8(r3) -/* 80215370 D0 23 05 E4 */ stfs f1, 0x5e4(r3) -/* 80215374 D0 43 05 F0 */ stfs f2, 0x5f0(r3) -/* 80215378 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021537C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawOxygen__13dMeter2Draw_cFllff.s b/asm/d/meter/d_meter2_draw/drawOxygen__13dMeter2Draw_cFllff.s deleted file mode 100644 index 259acf6e67..0000000000 --- a/asm/d/meter/d_meter2_draw/drawOxygen__13dMeter2Draw_cFllff.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_802157E0: -/* 802157E0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802157E4 80 C3 01 D4 */ lwz r6, 0x1d4(r3) -/* 802157E8 C0 06 00 24 */ lfs f0, 0x24(r6) -/* 802157EC 80 C3 01 DC */ lwz r6, 0x1dc(r3) -/* 802157F0 C0 66 00 24 */ lfs f3, 0x24(r6) -/* 802157F4 EC A3 00 28 */ fsubs f5, f3, f0 -/* 802157F8 C0 C2 AE 80 */ lfs f6, lit_4182(r2) -/* 802157FC FC 80 30 90 */ fmr f4, f6 -/* 80215800 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80215804 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80215808 80 E6 5D E8 */ lwz r7, 0x5de8(r6) -/* 8021580C 2C 07 00 00 */ cmpwi r7, 0 -/* 80215810 40 81 00 60 */ ble lbl_80215870 -/* 80215814 C8 82 AE A0 */ lfd f4, lit_4925(r2) -/* 80215818 6C A0 80 00 */ xoris r0, r5, 0x8000 -/* 8021581C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80215820 3C C0 43 30 */ lis r6, 0x4330 -/* 80215824 90 C1 00 08 */ stw r6, 8(r1) -/* 80215828 C8 01 00 08 */ lfd f0, 8(r1) -/* 8021582C EC 60 20 28 */ fsubs f3, f0, f4 -/* 80215830 6C E5 80 00 */ xoris r5, r7, 0x8000 -/* 80215834 90 A1 00 14 */ stw r5, 0x14(r1) -/* 80215838 90 C1 00 10 */ stw r6, 0x10(r1) -/* 8021583C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80215840 EC 00 20 28 */ fsubs f0, f0, f4 -/* 80215844 EC C3 00 24 */ fdivs f6, f3, f0 -/* 80215848 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 8021584C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80215850 90 C1 00 18 */ stw r6, 0x18(r1) -/* 80215854 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80215858 EC 60 20 28 */ fsubs f3, f0, f4 -/* 8021585C 90 A1 00 24 */ stw r5, 0x24(r1) -/* 80215860 90 C1 00 20 */ stw r6, 0x20(r1) -/* 80215864 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80215868 EC 00 20 28 */ fsubs f0, f0, f4 -/* 8021586C EC 83 00 24 */ fdivs f4, f3, f0 -lbl_80215870: -/* 80215870 80 83 01 D8 */ lwz r4, 0x1d8(r3) -/* 80215874 C0 04 00 34 */ lfs f0, 0x34(r4) -/* 80215878 EC 06 00 32 */ fmuls f0, f6, f0 -/* 8021587C D0 03 05 8C */ stfs f0, 0x58c(r3) -/* 80215880 80 83 01 D8 */ lwz r4, 0x1d8(r3) -/* 80215884 C0 04 00 38 */ lfs f0, 0x38(r4) -/* 80215888 D0 03 05 98 */ stfs f0, 0x598(r3) -/* 8021588C 80 83 01 D4 */ lwz r4, 0x1d4(r3) -/* 80215890 C0 64 00 24 */ lfs f3, 0x24(r4) -/* 80215894 EC 05 01 32 */ fmuls f0, f5, f4 -/* 80215898 EC 00 18 2A */ fadds f0, f0, f3 -/* 8021589C D0 03 05 A4 */ stfs f0, 0x5a4(r3) -/* 802158A0 80 83 01 D4 */ lwz r4, 0x1d4(r3) -/* 802158A4 C0 04 00 28 */ lfs f0, 0x28(r4) -/* 802158A8 D0 03 05 B0 */ stfs f0, 0x5b0(r3) -/* 802158AC 80 83 01 D0 */ lwz r4, 0x1d0(r3) -/* 802158B0 C0 04 00 34 */ lfs f0, 0x34(r4) -/* 802158B4 EC 04 00 32 */ fmuls f0, f4, f0 -/* 802158B8 D0 03 05 BC */ stfs f0, 0x5bc(r3) -/* 802158BC 80 83 01 D0 */ lwz r4, 0x1d0(r3) -/* 802158C0 C0 04 00 38 */ lfs f0, 0x38(r4) -/* 802158C4 D0 03 05 C8 */ stfs f0, 0x5c8(r3) -/* 802158C8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802158CC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802158D0 C0 04 00 68 */ lfs f0, 0x68(r4) -/* 802158D4 D0 03 05 D4 */ stfs f0, 0x5d4(r3) -/* 802158D8 C0 04 00 68 */ lfs f0, 0x68(r4) -/* 802158DC D0 03 05 E0 */ stfs f0, 0x5e0(r3) -/* 802158E0 D0 23 05 EC */ stfs f1, 0x5ec(r3) -/* 802158E4 D0 43 05 F8 */ stfs f2, 0x5f8(r3) -/* 802158E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802158EC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/drawRupee__13dMeter2Draw_cFs.s b/asm/d/meter/d_meter2_draw/drawRupee__13dMeter2Draw_cFs.s deleted file mode 100644 index a1d6da3cd9..0000000000 --- a/asm/d/meter/d_meter2_draw/drawRupee__13dMeter2Draw_cFs.s +++ /dev/null @@ -1,219 +0,0 @@ -lbl_8021632C: -/* 8021632C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80216330 7C 08 02 A6 */ mflr r0 -/* 80216334 90 01 00 34 */ stw r0, 0x34(r1) -/* 80216338 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021633C 48 14 BE 8D */ bl _savegpr_24 -/* 80216340 7C 7F 1B 78 */ mr r31, r3 -/* 80216344 7C 98 23 78 */ mr r24, r4 -/* 80216348 80 63 02 D8 */ lwz r3, 0x2d8(r3) -/* 8021634C 48 03 F2 BD */ bl hide__13CPaneMgrAlphaFv -/* 80216350 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80216354 48 03 F2 B5 */ bl hide__13CPaneMgrAlphaFv -/* 80216358 7F 03 07 34 */ extsh r3, r24 -/* 8021635C 38 00 03 E8 */ li r0, 0x3e8 -/* 80216360 7F 43 03 D6 */ divw r26, r3, r0 -/* 80216364 7C 1A 01 D6 */ mullw r0, r26, r0 -/* 80216368 7F C0 18 50 */ subf r30, r0, r3 -/* 8021636C 2C 03 03 E8 */ cmpwi r3, 0x3e8 -/* 80216370 40 80 00 18 */ bge lbl_80216388 -/* 80216374 80 7F 02 D8 */ lwz r3, 0x2d8(r31) -/* 80216378 48 03 F2 91 */ bl hide__13CPaneMgrAlphaFv -/* 8021637C 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80216380 48 03 F2 89 */ bl hide__13CPaneMgrAlphaFv -/* 80216384 48 00 00 64 */ b lbl_802163E8 -lbl_80216388: -/* 80216388 80 7F 02 D8 */ lwz r3, 0x2d8(r31) -/* 8021638C 48 03 F2 3D */ bl show__13CPaneMgrAlphaFv -/* 80216390 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80216394 48 03 F2 35 */ bl show__13CPaneMgrAlphaFv -/* 80216398 7F E3 FB 78 */ mr r3, r31 -/* 8021639C 7F 44 D3 78 */ mr r4, r26 -/* 802163A0 48 00 3E FD */ bl getNumberTexture__13dMeter2Draw_cFi -/* 802163A4 7C 7A 1B 78 */ mr r26, r3 -/* 802163A8 80 7F 02 D8 */ lwz r3, 0x2d8(r31) -/* 802163AC 80 63 00 04 */ lwz r3, 4(r3) -/* 802163B0 7F 44 D3 78 */ mr r4, r26 -/* 802163B4 38 A0 00 00 */ li r5, 0 -/* 802163B8 81 83 00 00 */ lwz r12, 0(r3) -/* 802163BC 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 802163C0 7D 89 03 A6 */ mtctr r12 -/* 802163C4 4E 80 04 21 */ bctrl -/* 802163C8 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 802163CC 80 63 00 04 */ lwz r3, 4(r3) -/* 802163D0 7F 44 D3 78 */ mr r4, r26 -/* 802163D4 38 A0 00 00 */ li r5, 0 -/* 802163D8 81 83 00 00 */ lwz r12, 0(r3) -/* 802163DC 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 802163E0 7D 89 03 A6 */ mtctr r12 -/* 802163E4 4E 80 04 21 */ bctrl -lbl_802163E8: -/* 802163E8 38 00 00 64 */ li r0, 0x64 -/* 802163EC 7C 9E 03 D6 */ divw r4, r30, r0 -/* 802163F0 7C 04 01 D6 */ mullw r0, r4, r0 -/* 802163F4 7F C0 F0 50 */ subf r30, r0, r30 -/* 802163F8 7F E3 FB 78 */ mr r3, r31 -/* 802163FC 48 00 3E A1 */ bl getNumberTexture__13dMeter2Draw_cFi -/* 80216400 7C 7A 1B 78 */ mr r26, r3 -/* 80216404 80 7F 02 D0 */ lwz r3, 0x2d0(r31) -/* 80216408 80 63 00 04 */ lwz r3, 4(r3) -/* 8021640C 7F 44 D3 78 */ mr r4, r26 -/* 80216410 38 A0 00 00 */ li r5, 0 -/* 80216414 81 83 00 00 */ lwz r12, 0(r3) -/* 80216418 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 8021641C 7D 89 03 A6 */ mtctr r12 -/* 80216420 4E 80 04 21 */ bctrl -/* 80216424 80 7F 02 D4 */ lwz r3, 0x2d4(r31) -/* 80216428 80 63 00 04 */ lwz r3, 4(r3) -/* 8021642C 7F 44 D3 78 */ mr r4, r26 -/* 80216430 38 A0 00 00 */ li r5, 0 -/* 80216434 81 83 00 00 */ lwz r12, 0(r3) -/* 80216438 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 8021643C 7D 89 03 A6 */ mtctr r12 -/* 80216440 4E 80 04 21 */ bctrl -/* 80216444 38 00 00 0A */ li r0, 0xa -/* 80216448 7C 9E 03 D6 */ divw r4, r30, r0 -/* 8021644C 7C 04 01 D6 */ mullw r0, r4, r0 -/* 80216450 7F C0 F0 50 */ subf r30, r0, r30 -/* 80216454 7F E3 FB 78 */ mr r3, r31 -/* 80216458 48 00 3E 45 */ bl getNumberTexture__13dMeter2Draw_cFi -/* 8021645C 7C 7A 1B 78 */ mr r26, r3 -/* 80216460 80 7F 02 C8 */ lwz r3, 0x2c8(r31) -/* 80216464 80 63 00 04 */ lwz r3, 4(r3) -/* 80216468 7F 44 D3 78 */ mr r4, r26 -/* 8021646C 38 A0 00 00 */ li r5, 0 -/* 80216470 81 83 00 00 */ lwz r12, 0(r3) -/* 80216474 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 80216478 7D 89 03 A6 */ mtctr r12 -/* 8021647C 4E 80 04 21 */ bctrl -/* 80216480 80 7F 02 CC */ lwz r3, 0x2cc(r31) -/* 80216484 80 63 00 04 */ lwz r3, 4(r3) -/* 80216488 7F 44 D3 78 */ mr r4, r26 -/* 8021648C 38 A0 00 00 */ li r5, 0 -/* 80216490 81 83 00 00 */ lwz r12, 0(r3) -/* 80216494 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 80216498 7D 89 03 A6 */ mtctr r12 -/* 8021649C 4E 80 04 21 */ bctrl -/* 802164A0 7F E3 FB 78 */ mr r3, r31 -/* 802164A4 7F C4 F3 78 */ mr r4, r30 -/* 802164A8 48 00 3D F5 */ bl getNumberTexture__13dMeter2Draw_cFi -/* 802164AC 7C 7A 1B 78 */ mr r26, r3 -/* 802164B0 80 7F 02 C0 */ lwz r3, 0x2c0(r31) -/* 802164B4 80 63 00 04 */ lwz r3, 4(r3) -/* 802164B8 7F 44 D3 78 */ mr r4, r26 -/* 802164BC 38 A0 00 00 */ li r5, 0 -/* 802164C0 81 83 00 00 */ lwz r12, 0(r3) -/* 802164C4 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 802164C8 7D 89 03 A6 */ mtctr r12 -/* 802164CC 4E 80 04 21 */ bctrl -/* 802164D0 80 7F 02 C4 */ lwz r3, 0x2c4(r31) -/* 802164D4 80 63 00 04 */ lwz r3, 4(r3) -/* 802164D8 7F 44 D3 78 */ mr r4, r26 -/* 802164DC 38 A0 00 00 */ li r5, 0 -/* 802164E0 81 83 00 00 */ lwz r12, 0(r3) -/* 802164E4 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 802164E8 7D 89 03 A6 */ mtctr r12 -/* 802164EC 4E 80 04 21 */ bctrl -/* 802164F0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802164F4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802164F8 C0 23 03 3C */ lfs f1, 0x33c(r3) -/* 802164FC C0 1F 07 18 */ lfs f0, 0x718(r31) -/* 80216500 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80216504 80 7F 02 B0 */ lwz r3, 0x2b0(r31) -/* 80216508 80 63 00 04 */ lwz r3, 4(r3) -/* 8021650C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80216510 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80216514 81 83 00 00 */ lwz r12, 0(r3) -/* 80216518 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8021651C 7D 89 03 A6 */ mtctr r12 -/* 80216520 4E 80 04 21 */ bctrl -/* 80216524 80 7F 02 B0 */ lwz r3, 0x2b0(r31) -/* 80216528 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021652C 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216530 C0 24 03 40 */ lfs f1, 0x340(r4) -/* 80216534 C0 44 03 44 */ lfs f2, 0x344(r4) -/* 80216538 48 03 E0 79 */ bl paneTrans__8CPaneMgrFff -/* 8021653C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216540 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216544 C0 03 03 4C */ lfs f0, 0x34c(r3) -/* 80216548 80 7F 02 B4 */ lwz r3, 0x2b4(r31) -/* 8021654C 80 63 00 04 */ lwz r3, 4(r3) -/* 80216550 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80216554 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80216558 81 83 00 00 */ lwz r12, 0(r3) -/* 8021655C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80216560 7D 89 03 A6 */ mtctr r12 -/* 80216564 4E 80 04 21 */ bctrl -/* 80216568 80 7F 02 B4 */ lwz r3, 0x2b4(r31) -/* 8021656C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216570 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216574 C0 24 03 50 */ lfs f1, 0x350(r4) -/* 80216578 C0 44 03 54 */ lfs f2, 0x354(r4) -/* 8021657C 48 03 E0 35 */ bl paneTrans__8CPaneMgrFff -/* 80216580 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216584 3B A3 EB C8 */ addi r29, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216588 C0 1D 03 74 */ lfs f0, 0x374(r29) -/* 8021658C 80 7F 02 B8 */ lwz r3, 0x2b8(r31) -/* 80216590 80 63 00 04 */ lwz r3, 4(r3) -/* 80216594 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80216598 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8021659C 81 83 00 00 */ lwz r12, 0(r3) -/* 802165A0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802165A4 7D 89 03 A6 */ mtctr r12 -/* 802165A8 4E 80 04 21 */ bctrl -/* 802165AC 80 7F 02 B8 */ lwz r3, 0x2b8(r31) -/* 802165B0 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802165B4 3B 84 EB C8 */ addi r28, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802165B8 C0 3C 03 6C */ lfs f1, 0x36c(r28) -/* 802165BC C0 5C 03 70 */ lfs f2, 0x370(r28) -/* 802165C0 48 03 DF F1 */ bl paneTrans__8CPaneMgrFff -/* 802165C4 C0 1D 03 74 */ lfs f0, 0x374(r29) -/* 802165C8 80 7F 02 BC */ lwz r3, 0x2bc(r31) -/* 802165CC 80 63 00 04 */ lwz r3, 4(r3) -/* 802165D0 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802165D4 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802165D8 81 83 00 00 */ lwz r12, 0(r3) -/* 802165DC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802165E0 7D 89 03 A6 */ mtctr r12 -/* 802165E4 4E 80 04 21 */ bctrl -/* 802165E8 80 7F 02 BC */ lwz r3, 0x2bc(r31) -/* 802165EC C0 3C 03 6C */ lfs f1, 0x36c(r28) -/* 802165F0 C0 5C 03 70 */ lfs f2, 0x370(r28) -/* 802165F4 48 03 DF BD */ bl paneTrans__8CPaneMgrFff -/* 802165F8 3B 20 00 00 */ li r25, 0 -/* 802165FC 3B C0 00 00 */ li r30, 0 -/* 80216600 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216604 3B 83 EB C8 */ addi r28, r3, g_drawHIO@l /* 0x8042EBC8@l */ -lbl_80216608: -/* 80216608 3B 00 00 00 */ li r24, 0 -/* 8021660C 3B A0 00 00 */ li r29, 0 -/* 80216610 7F 7F F2 14 */ add r27, r31, r30 -lbl_80216614: -/* 80216614 C0 1C 03 7C */ lfs f0, 0x37c(r28) -/* 80216618 3B 5D 02 C0 */ addi r26, r29, 0x2c0 -/* 8021661C 7C 7B D0 2E */ lwzx r3, r27, r26 -/* 80216620 80 63 00 04 */ lwz r3, 4(r3) -/* 80216624 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80216628 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8021662C 81 83 00 00 */ lwz r12, 0(r3) -/* 80216630 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80216634 7D 89 03 A6 */ mtctr r12 -/* 80216638 4E 80 04 21 */ bctrl -/* 8021663C 7C 7B D0 2E */ lwzx r3, r27, r26 -/* 80216640 C0 3C 03 80 */ lfs f1, 0x380(r28) -/* 80216644 C0 5C 03 84 */ lfs f2, 0x384(r28) -/* 80216648 48 03 DF 69 */ bl paneTrans__8CPaneMgrFff -/* 8021664C 3B 18 00 01 */ addi r24, r24, 1 -/* 80216650 2C 18 00 02 */ cmpwi r24, 2 -/* 80216654 3B BD 00 04 */ addi r29, r29, 4 -/* 80216658 41 80 FF BC */ blt lbl_80216614 -/* 8021665C 3B 39 00 01 */ addi r25, r25, 1 -/* 80216660 2C 19 00 04 */ cmpwi r25, 4 -/* 80216664 3B DE 00 08 */ addi r30, r30, 8 -/* 80216668 41 80 FF A0 */ blt lbl_80216608 -/* 8021666C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80216670 48 14 BB A5 */ bl _restgpr_24 -/* 80216674 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80216678 7C 08 03 A6 */ mtlr r0 -/* 8021667C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80216680 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/draw__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/draw__13dMeter2Draw_cFv.s deleted file mode 100644 index 5728f1b625..0000000000 --- a/asm/d/meter/d_meter2_draw/draw__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,460 +0,0 @@ -lbl_8021151C: -/* 8021151C 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 80211520 7C 08 02 A6 */ mflr r0 -/* 80211524 90 01 01 24 */ stw r0, 0x124(r1) -/* 80211528 DB E1 01 10 */ stfd f31, 0x110(r1) -/* 8021152C F3 E1 01 18 */ psq_st f31, 280(r1), 0, 0 /* qr0 */ -/* 80211530 DB C1 01 00 */ stfd f30, 0x100(r1) -/* 80211534 F3 C1 01 08 */ psq_st f30, 264(r1), 0, 0 /* qr0 */ -/* 80211538 DB A1 00 F0 */ stfd f29, 0xf0(r1) -/* 8021153C F3 A1 00 F8 */ psq_st f29, 248(r1), 0, 0 /* qr0 */ -/* 80211540 DB 81 00 E0 */ stfd f28, 0xe0(r1) -/* 80211544 F3 81 00 E8 */ psq_st f28, 232(r1), 0, 0 /* qr0 */ -/* 80211548 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8021154C 48 15 0C 71 */ bl _savegpr_21 -/* 80211550 7C 79 1B 78 */ mr r25, r3 -/* 80211554 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80211558 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021155C 82 A3 5F 50 */ lwz r21, 0x5f50(r3) -/* 80211560 7E A3 AB 78 */ mr r3, r21 -/* 80211564 81 95 00 00 */ lwz r12, 0(r21) -/* 80211568 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021156C 7D 89 03 A6 */ mtctr r12 -/* 80211570 4E 80 04 21 */ bctrl -/* 80211574 80 79 00 78 */ lwz r3, 0x78(r25) -/* 80211578 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 8021157C FC 40 08 90 */ fmr f2, f1 -/* 80211580 7E A4 AB 78 */ mr r4, r21 -/* 80211584 48 0E 79 51 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 80211588 7F 23 CB 78 */ mr r3, r25 -/* 8021158C 38 80 00 01 */ li r4, 1 -/* 80211590 48 00 39 25 */ bl drawKanteraScreen__13dMeter2Draw_cFUc -/* 80211594 7F 23 CB 78 */ mr r3, r25 -/* 80211598 38 80 00 02 */ li r4, 2 -/* 8021159C 48 00 39 19 */ bl drawKanteraScreen__13dMeter2Draw_cFUc -/* 802115A0 3B 60 00 00 */ li r27, 0 -/* 802115A4 3A E0 00 00 */ li r23, 0 -/* 802115A8 3B 00 00 00 */ li r24, 0 -/* 802115AC 3B 40 00 00 */ li r26, 0 -lbl_802115B0: -/* 802115B0 3B 9A 03 2C */ addi r28, r26, 0x32c -/* 802115B4 7C 19 E0 2E */ lwzx r0, r25, r28 -/* 802115B8 28 00 00 00 */ cmplwi r0, 0 -/* 802115BC 41 82 01 24 */ beq lbl_802116E0 -/* 802115C0 3B E0 00 00 */ li r31, 0 -/* 802115C4 3A C0 00 00 */ li r22, 0 -/* 802115C8 7F B9 C2 14 */ add r29, r25, r24 -/* 802115CC 7F D9 BA 14 */ add r30, r25, r23 -/* 802115D0 C3 E2 AE 90 */ lfs f31, lit_4921(r2) -/* 802115D4 C3 82 AE 94 */ lfs f28, lit_4922(r2) -/* 802115D8 CB A2 AE A0 */ lfd f29, lit_4925(r2) -/* 802115DC 3E A0 43 30 */ lis r21, 0x4330 -lbl_802115E0: -/* 802115E0 C0 1D 00 1C */ lfs f0, 0x1c(r29) -/* 802115E4 EF DF 00 32 */ fmuls f30, f31, f0 -/* 802115E8 7C 79 E0 2E */ lwzx r3, r25, r28 -/* 802115EC 80 83 00 04 */ lwz r4, 4(r3) -/* 802115F0 38 61 00 84 */ addi r3, r1, 0x84 -/* 802115F4 38 A0 00 00 */ li r5, 0 -/* 802115F8 48 0E 63 B1 */ bl getGlbVtx__7J2DPaneCFUc -/* 802115FC 80 61 00 84 */ lwz r3, 0x84(r1) -/* 80211600 80 01 00 88 */ lwz r0, 0x88(r1) -/* 80211604 90 61 00 9C */ stw r3, 0x9c(r1) -/* 80211608 90 01 00 A0 */ stw r0, 0xa0(r1) -/* 8021160C 80 01 00 8C */ lwz r0, 0x8c(r1) -/* 80211610 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 80211614 7C 79 E0 2E */ lwzx r3, r25, r28 -/* 80211618 80 83 00 04 */ lwz r4, 4(r3) -/* 8021161C 38 61 00 78 */ addi r3, r1, 0x78 -/* 80211620 38 A0 00 03 */ li r5, 3 -/* 80211624 48 0E 63 85 */ bl getGlbVtx__7J2DPaneCFUc -/* 80211628 80 61 00 78 */ lwz r3, 0x78(r1) -/* 8021162C 80 01 00 7C */ lwz r0, 0x7c(r1) -/* 80211630 90 61 00 90 */ stw r3, 0x90(r1) -/* 80211634 90 01 00 94 */ stw r0, 0x94(r1) -/* 80211638 80 01 00 80 */ lwz r0, 0x80(r1) -/* 8021163C 90 01 00 98 */ stw r0, 0x98(r1) -/* 80211640 7C 79 E0 2E */ lwzx r3, r25, r28 -/* 80211644 80 63 00 04 */ lwz r3, 4(r3) -/* 80211648 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 8021164C C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80211650 EC 81 00 28 */ fsubs f4, f1, f0 -/* 80211654 38 16 00 84 */ addi r0, r22, 0x84 -/* 80211658 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 8021165C C0 5D 00 14 */ lfs f2, 0x14(r29) -/* 80211660 C0 21 00 9C */ lfs f1, 0x9c(r1) -/* 80211664 C0 01 00 90 */ lfs f0, 0x90(r1) -/* 80211668 EC 01 00 2A */ fadds f0, f1, f0 -/* 8021166C EC 3C 00 32 */ fmuls f1, f28, f0 -/* 80211670 6F E0 80 00 */ xoris r0, r31, 0x8000 -/* 80211674 90 01 00 AC */ stw r0, 0xac(r1) -/* 80211678 92 A1 00 A8 */ stw r21, 0xa8(r1) -/* 8021167C C8 01 00 A8 */ lfd f0, 0xa8(r1) -/* 80211680 EC 00 E8 28 */ fsubs f0, f0, f29 -/* 80211684 EC 1E 00 32 */ fmuls f0, f30, f0 -/* 80211688 EC 01 00 2A */ fadds f0, f1, f0 -/* 8021168C EC 22 00 2A */ fadds f1, f2, f0 -/* 80211690 C0 7D 00 18 */ lfs f3, 0x18(r29) -/* 80211694 C0 41 00 A0 */ lfs f2, 0xa0(r1) -/* 80211698 C0 01 00 94 */ lfs f0, 0x94(r1) -/* 8021169C EC 02 00 2A */ fadds f0, f2, f0 -/* 802116A0 EC 1C 00 32 */ fmuls f0, f28, f0 -/* 802116A4 EC 00 20 2A */ fadds f0, f0, f4 -/* 802116A8 EC 43 00 2A */ fadds f2, f3, f0 -/* 802116AC FC 60 F0 90 */ fmr f3, f30 -/* 802116B0 FC 80 F0 90 */ fmr f4, f30 -/* 802116B4 38 80 00 00 */ li r4, 0 -/* 802116B8 38 A0 00 00 */ li r5, 0 -/* 802116BC 38 C0 00 00 */ li r6, 0 -/* 802116C0 81 83 00 00 */ lwz r12, 0(r3) -/* 802116C4 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 802116C8 7D 89 03 A6 */ mtctr r12 -/* 802116CC 4E 80 04 21 */ bctrl -/* 802116D0 3B FF 00 01 */ addi r31, r31, 1 -/* 802116D4 2C 1F 00 03 */ cmpwi r31, 3 -/* 802116D8 3A D6 00 04 */ addi r22, r22, 4 -/* 802116DC 41 80 FF 04 */ blt lbl_802115E0 -lbl_802116E0: -/* 802116E0 3B 7B 00 01 */ addi r27, r27, 1 -/* 802116E4 2C 1B 00 02 */ cmpwi r27, 2 -/* 802116E8 3A F7 00 0C */ addi r23, r23, 0xc -/* 802116EC 3B 18 00 1C */ addi r24, r24, 0x1c -/* 802116F0 3B 5A 00 04 */ addi r26, r26, 4 -/* 802116F4 41 80 FE BC */ blt lbl_802115B0 -/* 802116F8 3A A0 00 00 */ li r21, 0 -/* 802116FC 3A E0 00 00 */ li r23, 0 -lbl_80211700: -/* 80211700 38 17 00 AC */ addi r0, r23, 0xac -/* 80211704 7C 79 00 2E */ lwzx r3, r25, r0 -/* 80211708 80 63 00 04 */ lwz r3, 4(r3) -/* 8021170C 81 83 00 00 */ lwz r12, 0(r3) -/* 80211710 81 8C 00 08 */ lwz r12, 8(r12) -/* 80211714 7D 89 03 A6 */ mtctr r12 -/* 80211718 4E 80 04 21 */ bctrl -/* 8021171C 3A B5 00 01 */ addi r21, r21, 1 -/* 80211720 2C 15 00 02 */ cmpwi r21, 2 -/* 80211724 3A F7 00 04 */ addi r23, r23, 4 -/* 80211728 41 80 FF D8 */ blt lbl_80211700 -/* 8021172C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80211730 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80211734 88 03 5E B5 */ lbz r0, 0x5eb5(r3) -/* 80211738 28 00 00 00 */ cmplwi r0, 0 -/* 8021173C 40 82 01 60 */ bne lbl_8021189C -/* 80211740 80 79 02 F8 */ lwz r3, 0x2f8(r25) -/* 80211744 48 04 40 E5 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80211748 C0 42 AE 80 */ lfs f2, lit_4182(r2) -/* 8021174C FC 02 08 00 */ fcmpu cr0, f2, f1 -/* 80211750 41 82 01 4C */ beq lbl_8021189C -/* 80211754 C0 19 06 08 */ lfs f0, 0x608(r25) -/* 80211758 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 8021175C 40 81 00 58 */ ble lbl_802117B4 -/* 80211760 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80211764 39 43 EB C8 */ addi r10, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80211768 80 0A 04 88 */ lwz r0, 0x488(r10) -/* 8021176C 90 01 00 68 */ stw r0, 0x68(r1) -/* 80211770 80 0A 04 8C */ lwz r0, 0x48c(r10) -/* 80211774 90 01 00 6C */ stw r0, 0x6c(r1) -/* 80211778 80 0A 04 80 */ lwz r0, 0x480(r10) -/* 8021177C 90 01 00 70 */ stw r0, 0x70(r1) -/* 80211780 80 0A 04 84 */ lwz r0, 0x484(r10) -/* 80211784 90 01 00 74 */ stw r0, 0x74(r1) -/* 80211788 7F 23 CB 78 */ mr r3, r25 -/* 8021178C 80 99 03 38 */ lwz r4, 0x338(r25) -/* 80211790 38 B9 06 08 */ addi r5, r25, 0x608 -/* 80211794 C0 2A 03 C4 */ lfs f1, 0x3c4(r10) -/* 80211798 38 C1 00 74 */ addi r6, r1, 0x74 -/* 8021179C 38 E1 00 70 */ addi r7, r1, 0x70 -/* 802117A0 39 01 00 6C */ addi r8, r1, 0x6c -/* 802117A4 39 21 00 68 */ addi r9, r1, 0x68 -/* 802117A8 C0 4A 04 90 */ lfs f2, 0x490(r10) -/* 802117AC 89 59 07 59 */ lbz r10, 0x759(r25) -/* 802117B0 48 00 28 41 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -lbl_802117B4: -/* 802117B4 C0 39 06 0C */ lfs f1, 0x60c(r25) -/* 802117B8 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 802117BC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802117C0 40 81 00 58 */ ble lbl_80211818 -/* 802117C4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802117C8 39 43 EB C8 */ addi r10, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802117CC 80 0A 04 9C */ lwz r0, 0x49c(r10) -/* 802117D0 90 01 00 58 */ stw r0, 0x58(r1) -/* 802117D4 80 0A 04 A0 */ lwz r0, 0x4a0(r10) -/* 802117D8 90 01 00 5C */ stw r0, 0x5c(r1) -/* 802117DC 80 0A 04 94 */ lwz r0, 0x494(r10) -/* 802117E0 90 01 00 60 */ stw r0, 0x60(r1) -/* 802117E4 80 0A 04 98 */ lwz r0, 0x498(r10) -/* 802117E8 90 01 00 64 */ stw r0, 0x64(r1) -/* 802117EC 7F 23 CB 78 */ mr r3, r25 -/* 802117F0 80 99 03 3C */ lwz r4, 0x33c(r25) -/* 802117F4 38 B9 06 0C */ addi r5, r25, 0x60c -/* 802117F8 C0 2A 03 C8 */ lfs f1, 0x3c8(r10) -/* 802117FC 38 C1 00 64 */ addi r6, r1, 0x64 -/* 80211800 38 E1 00 60 */ addi r7, r1, 0x60 -/* 80211804 39 01 00 5C */ addi r8, r1, 0x5c -/* 80211808 39 21 00 58 */ addi r9, r1, 0x58 -/* 8021180C C0 4A 04 A4 */ lfs f2, 0x4a4(r10) -/* 80211810 89 59 07 5A */ lbz r10, 0x75a(r25) -/* 80211814 48 00 27 DD */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -lbl_80211818: -/* 80211818 3A A0 00 00 */ li r21, 0 -/* 8021181C 3A E0 00 00 */ li r23, 0 -/* 80211820 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80211824 3A C3 EB C8 */ addi r22, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80211828 C3 C2 AE 80 */ lfs f30, lit_4182(r2) -lbl_8021182C: -/* 8021182C 7C B9 BA 14 */ add r5, r25, r23 -/* 80211830 C0 05 06 20 */ lfs f0, 0x620(r5) -/* 80211834 FC 00 F0 40 */ fcmpo cr0, f0, f30 -/* 80211838 40 81 00 54 */ ble lbl_8021188C -/* 8021183C 80 16 04 74 */ lwz r0, 0x474(r22) -/* 80211840 90 01 00 48 */ stw r0, 0x48(r1) -/* 80211844 80 16 04 78 */ lwz r0, 0x478(r22) -/* 80211848 90 01 00 4C */ stw r0, 0x4c(r1) -/* 8021184C 80 16 04 6C */ lwz r0, 0x46c(r22) -/* 80211850 90 01 00 50 */ stw r0, 0x50(r1) -/* 80211854 80 16 04 70 */ lwz r0, 0x470(r22) -/* 80211858 90 01 00 54 */ stw r0, 0x54(r1) -/* 8021185C 7F 23 CB 78 */ mr r3, r25 -/* 80211860 80 85 03 40 */ lwz r4, 0x340(r5) -/* 80211864 38 A5 06 20 */ addi r5, r5, 0x620 -/* 80211868 C0 36 03 DC */ lfs f1, 0x3dc(r22) -/* 8021186C 38 C1 00 54 */ addi r6, r1, 0x54 -/* 80211870 38 E1 00 50 */ addi r7, r1, 0x50 -/* 80211874 39 01 00 4C */ addi r8, r1, 0x4c -/* 80211878 39 21 00 48 */ addi r9, r1, 0x48 -/* 8021187C C0 56 04 7C */ lfs f2, 0x47c(r22) -/* 80211880 38 15 07 5C */ addi r0, r21, 0x75c -/* 80211884 7D 59 00 AE */ lbzx r10, r25, r0 -/* 80211888 48 00 27 69 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -lbl_8021188C: -/* 8021188C 3A B5 00 01 */ addi r21, r21, 1 -/* 80211890 2C 15 00 02 */ cmpwi r21, 2 -/* 80211894 3A F7 00 04 */ addi r23, r23, 4 -/* 80211898 41 80 FF 94 */ blt lbl_8021182C -lbl_8021189C: -/* 8021189C 80 79 01 E0 */ lwz r3, 0x1e0(r25) -/* 802118A0 48 04 3F 89 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802118A4 C0 42 AE 80 */ lfs f2, lit_4182(r2) -/* 802118A8 FC 02 08 00 */ fcmpu cr0, f2, f1 -/* 802118AC 41 82 02 A4 */ beq lbl_80211B50 -/* 802118B0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802118B4 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802118B8 C3 84 0F 14 */ lfs f28, 0xf14(r4) -/* 802118BC C3 A4 0E E4 */ lfs f29, 0xee4(r4) -/* 802118C0 A8 79 07 56 */ lha r3, 0x756(r25) -/* 802118C4 7C 60 07 35 */ extsh. r0, r3 -/* 802118C8 41 80 00 E4 */ blt lbl_802119AC -/* 802118CC C3 A4 0E E8 */ lfs f29, 0xee8(r4) -/* 802118D0 A8 04 0E CE */ lha r0, 0xece(r4) -/* 802118D4 1C A0 00 0F */ mulli r5, r0, 0xf -/* 802118D8 7C 03 28 00 */ cmpw r3, r5 -/* 802118DC 41 81 00 4C */ bgt lbl_80211928 -/* 802118E0 7C 83 03 D6 */ divw r4, r3, r0 -/* 802118E4 7C 04 01 D6 */ mullw r0, r4, r0 -/* 802118E8 7C 00 18 51 */ subf. r0, r0, r3 -/* 802118EC 40 82 00 20 */ bne lbl_8021190C -/* 802118F0 54 80 10 3A */ slwi r0, r4, 2 -/* 802118F4 7C 79 02 14 */ add r3, r25, r0 -/* 802118F8 C0 03 06 2C */ lfs f0, 0x62c(r3) -/* 802118FC FC 02 00 00 */ fcmpu cr0, f2, f0 -/* 80211900 40 82 00 0C */ bne lbl_8021190C -/* 80211904 C0 02 AE 98 */ lfs f0, lit_4923(r2) -/* 80211908 D0 03 06 2C */ stfs f0, 0x62c(r3) -lbl_8021190C: -/* 8021190C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80211910 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80211914 C3 83 0F 18 */ lfs f28, 0xf18(r3) -/* 80211918 A8 79 07 56 */ lha r3, 0x756(r25) -/* 8021191C 38 03 00 01 */ addi r0, r3, 1 -/* 80211920 B0 19 07 56 */ sth r0, 0x756(r25) -/* 80211924 48 00 00 88 */ b lbl_802119AC -lbl_80211928: -/* 80211928 38 A5 00 01 */ addi r5, r5, 1 -/* 8021192C 7C 03 28 00 */ cmpw r3, r5 -/* 80211930 40 82 00 28 */ bne lbl_80211958 -/* 80211934 C0 19 06 68 */ lfs f0, 0x668(r25) -/* 80211938 FC 02 00 00 */ fcmpu cr0, f2, f0 -/* 8021193C 40 82 00 0C */ bne lbl_80211948 -/* 80211940 38 03 00 01 */ addi r0, r3, 1 -/* 80211944 B0 19 07 56 */ sth r0, 0x756(r25) -lbl_80211948: -/* 80211948 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021194C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80211950 C3 83 0F 18 */ lfs f28, 0xf18(r3) -/* 80211954 48 00 00 58 */ b lbl_802119AC -lbl_80211958: -/* 80211958 A8 04 0E D0 */ lha r0, 0xed0(r4) -/* 8021195C 7C 00 2A 14 */ add r0, r0, r5 -/* 80211960 7C 03 00 00 */ cmpw r3, r0 -/* 80211964 41 80 00 40 */ blt lbl_802119A4 -/* 80211968 38 60 00 00 */ li r3, 0 -/* 8021196C C0 22 AE 98 */ lfs f1, lit_4923(r2) -/* 80211970 EC 41 E8 28 */ fsubs f2, f1, f29 -/* 80211974 38 00 00 10 */ li r0, 0x10 -/* 80211978 7C 09 03 A6 */ mtctr r0 -lbl_8021197C: -/* 8021197C 7C B9 1A 14 */ add r5, r25, r3 -/* 80211980 D0 45 06 2C */ stfs f2, 0x62c(r5) -/* 80211984 C0 04 0F 0C */ lfs f0, 0xf0c(r4) -/* 80211988 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8021198C D0 05 06 6C */ stfs f0, 0x66c(r5) -/* 80211990 38 63 00 04 */ addi r3, r3, 4 -/* 80211994 42 00 FF E8 */ bdnz lbl_8021197C -/* 80211998 38 00 FF FF */ li r0, -1 -/* 8021199C B0 19 07 56 */ sth r0, 0x756(r25) -/* 802119A0 48 00 00 0C */ b lbl_802119AC -lbl_802119A4: -/* 802119A4 38 03 00 01 */ addi r0, r3, 1 -/* 802119A8 B0 19 07 56 */ sth r0, 0x756(r25) -lbl_802119AC: -/* 802119AC 3B 40 00 00 */ li r26, 0 -/* 802119B0 3B 00 00 00 */ li r24, 0 -/* 802119B4 3A E0 00 00 */ li r23, 0 -/* 802119B8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802119BC 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802119C0 3B BE 0F 10 */ addi r29, r30, 0xf10 -/* 802119C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802119C8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802119CC 3B 9F 01 14 */ addi r28, r31, 0x114 -/* 802119D0 C3 C2 AE 80 */ lfs f30, lit_4182(r2) -lbl_802119D4: -/* 802119D4 7F 79 BA 14 */ add r27, r25, r23 -/* 802119D8 C0 1B 06 6C */ lfs f0, 0x66c(r27) -/* 802119DC FC 00 F0 40 */ fcmpo cr0, f0, f30 -/* 802119E0 40 81 00 A0 */ ble lbl_80211A80 -/* 802119E4 80 1E 0F 00 */ lwz r0, 0xf00(r30) -/* 802119E8 90 01 00 38 */ stw r0, 0x38(r1) -/* 802119EC 80 1E 0F 08 */ lwz r0, 0xf08(r30) -/* 802119F0 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802119F4 80 1E 0E F0 */ lwz r0, 0xef0(r30) -/* 802119F8 90 01 00 40 */ stw r0, 0x40(r1) -/* 802119FC 80 1E 0E F8 */ lwz r0, 0xef8(r30) -/* 80211A00 90 01 00 44 */ stw r0, 0x44(r1) -/* 80211A04 7F 23 CB 78 */ mr r3, r25 -/* 80211A08 3A B8 01 F4 */ addi r21, r24, 0x1f4 -/* 80211A0C 7C 99 A8 2E */ lwzx r4, r25, r21 -/* 80211A10 7F A5 EB 78 */ mr r5, r29 -/* 80211A14 C0 3E 0F 20 */ lfs f1, 0xf20(r30) -/* 80211A18 38 C1 00 44 */ addi r6, r1, 0x44 -/* 80211A1C 38 E1 00 40 */ addi r7, r1, 0x40 -/* 80211A20 39 01 00 3C */ addi r8, r1, 0x3c -/* 80211A24 39 21 00 38 */ addi r9, r1, 0x38 -/* 80211A28 FC 40 F0 90 */ fmr f2, f30 -/* 80211A2C 39 40 00 03 */ li r10, 3 -/* 80211A30 48 00 25 C1 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -/* 80211A34 80 1E 0E FC */ lwz r0, 0xefc(r30) -/* 80211A38 90 01 00 28 */ stw r0, 0x28(r1) -/* 80211A3C 80 1E 0F 04 */ lwz r0, 0xf04(r30) -/* 80211A40 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80211A44 80 1E 0E EC */ lwz r0, 0xeec(r30) -/* 80211A48 90 01 00 30 */ stw r0, 0x30(r1) -/* 80211A4C 80 1E 0E F4 */ lwz r0, 0xef4(r30) -/* 80211A50 90 01 00 34 */ stw r0, 0x34(r1) -/* 80211A54 7F 23 CB 78 */ mr r3, r25 -/* 80211A58 7C 99 A8 2E */ lwzx r4, r25, r21 -/* 80211A5C 38 BB 06 6C */ addi r5, r27, 0x66c -/* 80211A60 C0 3E 0F 1C */ lfs f1, 0xf1c(r30) -/* 80211A64 38 C1 00 34 */ addi r6, r1, 0x34 -/* 80211A68 38 E1 00 30 */ addi r7, r1, 0x30 -/* 80211A6C 39 01 00 2C */ addi r8, r1, 0x2c -/* 80211A70 39 21 00 28 */ addi r9, r1, 0x28 -/* 80211A74 C0 5E 0F 0C */ lfs f2, 0xf0c(r30) -/* 80211A78 39 40 00 03 */ li r10, 3 -/* 80211A7C 48 00 25 75 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -lbl_80211A80: -/* 80211A80 88 1E 0F 24 */ lbz r0, 0xf24(r30) -/* 80211A84 28 00 00 00 */ cmplwi r0, 0 -/* 80211A88 41 82 00 28 */ beq lbl_80211AB0 -/* 80211A8C 7F 83 E3 78 */ mr r3, r28 -/* 80211A90 88 9F 4E 0C */ lbz r4, 0x4e0c(r31) -/* 80211A94 4B E2 28 AD */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 80211A98 88 9F 5E A1 */ lbz r4, 0x5ea1(r31) -/* 80211A9C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80211AA0 7C 04 00 40 */ cmplw r4, r0 -/* 80211AA4 41 82 00 0C */ beq lbl_80211AB0 -/* 80211AA8 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80211AAC D0 1B 06 6C */ stfs f0, 0x66c(r27) -lbl_80211AB0: -/* 80211AB0 3B 5A 00 01 */ addi r26, r26, 1 -/* 80211AB4 2C 1A 00 10 */ cmpwi r26, 0x10 -/* 80211AB8 3B 18 00 0C */ addi r24, r24, 0xc -/* 80211ABC 3A F7 00 04 */ addi r23, r23, 4 -/* 80211AC0 41 80 FF 14 */ blt lbl_802119D4 -/* 80211AC4 3A A0 00 00 */ li r21, 0 -/* 80211AC8 3B 40 00 00 */ li r26, 0 -/* 80211ACC 3B 60 00 00 */ li r27, 0 -/* 80211AD0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80211AD4 3A C3 EB C8 */ addi r22, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80211AD8 C3 C2 AE 80 */ lfs f30, lit_4182(r2) -lbl_80211ADC: -/* 80211ADC 7C B9 DA 14 */ add r5, r25, r27 -/* 80211AE0 C0 05 06 2C */ lfs f0, 0x62c(r5) -/* 80211AE4 FC 00 F0 40 */ fcmpo cr0, f0, f30 -/* 80211AE8 40 81 00 54 */ ble lbl_80211B3C -/* 80211AEC 80 16 0E DC */ lwz r0, 0xedc(r22) -/* 80211AF0 90 01 00 18 */ stw r0, 0x18(r1) -/* 80211AF4 80 16 0E E0 */ lwz r0, 0xee0(r22) -/* 80211AF8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80211AFC 80 16 0E D4 */ lwz r0, 0xed4(r22) -/* 80211B00 90 01 00 20 */ stw r0, 0x20(r1) -/* 80211B04 80 16 0E D8 */ lwz r0, 0xed8(r22) -/* 80211B08 90 01 00 24 */ stw r0, 0x24(r1) -/* 80211B0C 7F 23 CB 78 */ mr r3, r25 -/* 80211B10 38 1A 01 F4 */ addi r0, r26, 0x1f4 -/* 80211B14 7C 99 00 2E */ lwzx r4, r25, r0 -/* 80211B18 38 A5 06 2C */ addi r5, r5, 0x62c -/* 80211B1C FC 20 E0 90 */ fmr f1, f28 -/* 80211B20 38 C1 00 24 */ addi r6, r1, 0x24 -/* 80211B24 38 E1 00 20 */ addi r7, r1, 0x20 -/* 80211B28 39 01 00 1C */ addi r8, r1, 0x1c -/* 80211B2C 39 21 00 18 */ addi r9, r1, 0x18 -/* 80211B30 FC 40 E8 90 */ fmr f2, f29 -/* 80211B34 89 59 07 5F */ lbz r10, 0x75f(r25) -/* 80211B38 48 00 24 B9 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -lbl_80211B3C: -/* 80211B3C 3A B5 00 01 */ addi r21, r21, 1 -/* 80211B40 2C 15 00 10 */ cmpwi r21, 0x10 -/* 80211B44 3B 5A 00 0C */ addi r26, r26, 0xc -/* 80211B48 3B 7B 00 04 */ addi r27, r27, 4 -/* 80211B4C 41 80 FF 90 */ blt lbl_80211ADC -lbl_80211B50: -/* 80211B50 C0 39 07 38 */ lfs f1, 0x738(r25) -/* 80211B54 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80211B58 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80211B5C 40 81 00 58 */ ble lbl_80211BB4 -/* 80211B60 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80211B64 39 43 EB C8 */ addi r10, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80211B68 80 0A 04 EC */ lwz r0, 0x4ec(r10) -/* 80211B6C 90 01 00 08 */ stw r0, 8(r1) -/* 80211B70 80 0A 04 F0 */ lwz r0, 0x4f0(r10) -/* 80211B74 90 01 00 0C */ stw r0, 0xc(r1) -/* 80211B78 80 0A 04 E4 */ lwz r0, 0x4e4(r10) -/* 80211B7C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80211B80 80 0A 04 E8 */ lwz r0, 0x4e8(r10) -/* 80211B84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80211B88 7F 23 CB 78 */ mr r3, r25 -/* 80211B8C 80 99 03 08 */ lwz r4, 0x308(r25) -/* 80211B90 38 B9 07 38 */ addi r5, r25, 0x738 -/* 80211B94 C0 2A 03 E8 */ lfs f1, 0x3e8(r10) -/* 80211B98 38 C1 00 14 */ addi r6, r1, 0x14 -/* 80211B9C 38 E1 00 10 */ addi r7, r1, 0x10 -/* 80211BA0 39 01 00 0C */ addi r8, r1, 0xc -/* 80211BA4 39 21 00 08 */ addi r9, r1, 8 -/* 80211BA8 C0 4A 04 F4 */ lfs f2, 0x4f4(r10) -/* 80211BAC 39 40 00 03 */ li r10, 3 -/* 80211BB0 48 00 24 41 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -lbl_80211BB4: -/* 80211BB4 E3 E1 01 18 */ psq_l f31, 280(r1), 0, 0 /* qr0 */ -/* 80211BB8 CB E1 01 10 */ lfd f31, 0x110(r1) -/* 80211BBC E3 C1 01 08 */ psq_l f30, 264(r1), 0, 0 /* qr0 */ -/* 80211BC0 CB C1 01 00 */ lfd f30, 0x100(r1) -/* 80211BC4 E3 A1 00 F8 */ psq_l f29, 248(r1), 0, 0 /* qr0 */ -/* 80211BC8 CB A1 00 F0 */ lfd f29, 0xf0(r1) -/* 80211BCC E3 81 00 E8 */ psq_l f28, 232(r1), 0, 0 /* qr0 */ -/* 80211BD0 CB 81 00 E0 */ lfd f28, 0xe0(r1) -/* 80211BD4 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 80211BD8 48 15 06 31 */ bl _restgpr_21 -/* 80211BDC 80 01 01 24 */ lwz r0, 0x124(r1) -/* 80211BE0 7C 08 03 A6 */ mtlr r0 -/* 80211BE4 38 21 01 20 */ addi r1, r1, 0x120 -/* 80211BE8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/func_80213FF0.s b/asm/d/meter/d_meter2_draw/func_80213FF0.s deleted file mode 100644 index b4ba32eec9..0000000000 --- a/asm/d/meter/d_meter2_draw/func_80213FF0.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80213FF0: -/* 80213FF0 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80213FF4 7C 08 02 A6 */ mflr r0 -/* 80213FF8 90 01 00 74 */ stw r0, 0x74(r1) -/* 80213FFC DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80214000 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80214004 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 80214008 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 8021400C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80214010 48 14 E1 BD */ bl _savegpr_25 -/* 80214014 7C 79 1B 78 */ mr r25, r3 -/* 80214018 7C BA 2B 78 */ mr r26, r5 -/* 8021401C FF C0 08 90 */ fmr f30, f1 -/* 80214020 7C DB 33 78 */ mr r27, r6 -/* 80214024 7C FC 3B 78 */ mr r28, r7 -/* 80214028 7D 1D 43 78 */ mr r29, r8 -/* 8021402C 7D 3E 4B 78 */ mr r30, r9 -/* 80214030 FF E0 10 90 */ fmr f31, f2 -/* 80214034 7D 5F 53 78 */ mr r31, r10 -/* 80214038 38 61 00 18 */ addi r3, r1, 0x18 -/* 8021403C 80 A4 00 04 */ lwz r5, 4(r4) -/* 80214040 38 C0 00 00 */ li r6, 0 -/* 80214044 38 E0 00 00 */ li r7, 0 -/* 80214048 48 04 0E 75 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 8021404C 80 61 00 18 */ lwz r3, 0x18(r1) -/* 80214050 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80214054 90 61 00 24 */ stw r3, 0x24(r1) -/* 80214058 90 01 00 28 */ stw r0, 0x28(r1) -/* 8021405C 80 01 00 20 */ lwz r0, 0x20(r1) -/* 80214060 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80214064 80 1E 00 00 */ lwz r0, 0(r30) -/* 80214068 90 01 00 08 */ stw r0, 8(r1) -/* 8021406C 80 1D 00 00 */ lwz r0, 0(r29) -/* 80214070 90 01 00 0C */ stw r0, 0xc(r1) -/* 80214074 80 1C 00 00 */ lwz r0, 0(r28) -/* 80214078 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021407C 80 1B 00 00 */ lwz r0, 0(r27) -/* 80214080 90 01 00 14 */ stw r0, 0x14(r1) -/* 80214084 7F 23 CB 78 */ mr r3, r25 -/* 80214088 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 8021408C C0 41 00 28 */ lfs f2, 0x28(r1) -/* 80214090 7F 44 D3 78 */ mr r4, r26 -/* 80214094 FC 60 F0 90 */ fmr f3, f30 -/* 80214098 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8021409C 38 C1 00 10 */ addi r6, r1, 0x10 -/* 802140A0 38 E1 00 0C */ addi r7, r1, 0xc -/* 802140A4 39 01 00 08 */ addi r8, r1, 8 -/* 802140A8 FC 80 F8 90 */ fmr f4, f31 -/* 802140AC 7F E9 FB 78 */ mr r9, r31 -/* 802140B0 48 00 00 2D */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -/* 802140B4 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 802140B8 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 802140BC E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 802140C0 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 802140C4 39 61 00 50 */ addi r11, r1, 0x50 -/* 802140C8 48 14 E1 51 */ bl _restgpr_25 -/* 802140CC 80 01 00 74 */ lwz r0, 0x74(r1) -/* 802140D0 7C 08 03 A6 */ mtlr r0 -/* 802140D4 38 21 00 70 */ addi r1, r1, 0x70 -/* 802140D8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/func_802140DC.s b/asm/d/meter/d_meter2_draw/func_802140DC.s deleted file mode 100644 index a52f135603..0000000000 --- a/asm/d/meter/d_meter2_draw/func_802140DC.s +++ /dev/null @@ -1,356 +0,0 @@ -lbl_802140DC: -/* 802140DC 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 802140E0 7C 08 02 A6 */ mflr r0 -/* 802140E4 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 802140E8 DB E1 00 90 */ stfd f31, 0x90(r1) -/* 802140EC F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 /* qr0 */ -/* 802140F0 DB C1 00 80 */ stfd f30, 0x80(r1) -/* 802140F4 F3 C1 00 88 */ psq_st f30, 136(r1), 0, 0 /* qr0 */ -/* 802140F8 DB A1 00 70 */ stfd f29, 0x70(r1) -/* 802140FC F3 A1 00 78 */ psq_st f29, 120(r1), 0, 0 /* qr0 */ -/* 80214100 DB 81 00 60 */ stfd f28, 0x60(r1) -/* 80214104 F3 81 00 68 */ psq_st f28, 104(r1), 0, 0 /* qr0 */ -/* 80214108 DB 61 00 50 */ stfd f27, 0x50(r1) -/* 8021410C F3 61 00 58 */ psq_st f27, 88(r1), 0, 0 /* qr0 */ -/* 80214110 39 61 00 50 */ addi r11, r1, 0x50 -/* 80214114 48 14 E0 B9 */ bl _savegpr_25 -/* 80214118 7C 79 1B 78 */ mr r25, r3 -/* 8021411C FF 60 08 90 */ fmr f27, f1 -/* 80214120 FF 80 10 90 */ fmr f28, f2 -/* 80214124 7C 9A 23 78 */ mr r26, r4 -/* 80214128 FF A0 18 90 */ fmr f29, f3 -/* 8021412C 7C BB 2B 78 */ mr r27, r5 -/* 80214130 7C DC 33 78 */ mr r28, r6 -/* 80214134 7C FD 3B 78 */ mr r29, r7 -/* 80214138 7D 1E 43 78 */ mr r30, r8 -/* 8021413C FF C0 20 90 */ fmr f30, f4 -/* 80214140 7D 3F 4B 78 */ mr r31, r9 -/* 80214144 C3 E2 AE A8 */ lfs f31, lit_5784(r2) -/* 80214148 55 20 06 3E */ clrlwi r0, r9, 0x18 -/* 8021414C 28 00 00 04 */ cmplwi r0, 4 -/* 80214150 40 82 00 B4 */ bne lbl_80214204 -/* 80214154 C3 E2 AE AC */ lfs f31, lit_5785(r2) -/* 80214158 80 79 00 80 */ lwz r3, 0x80(r25) -/* 8021415C 3C 80 79 61 */ lis r4, 0x7961 /* 0x79613030@ha */ -/* 80214160 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x79613030@l */ -/* 80214164 38 A0 6D 6F */ li r5, 0x6d6f -/* 80214168 81 83 00 00 */ lwz r12, 0(r3) -/* 8021416C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214170 7D 89 03 A6 */ mtctr r12 -/* 80214174 4E 80 04 21 */ bctrl -/* 80214178 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 8021417C 28 00 00 00 */ cmplwi r0, 0 -/* 80214180 41 82 00 2C */ beq lbl_802141AC -/* 80214184 80 79 00 80 */ lwz r3, 0x80(r25) -/* 80214188 3C 80 79 61 */ lis r4, 0x7961 /* 0x79613030@ha */ -/* 8021418C 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x79613030@l */ -/* 80214190 38 A0 6D 6F */ li r5, 0x6d6f -/* 80214194 81 83 00 00 */ lwz r12, 0(r3) -/* 80214198 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8021419C 7D 89 03 A6 */ mtctr r12 -/* 802141A0 4E 80 04 21 */ bctrl -/* 802141A4 38 00 00 00 */ li r0, 0 -/* 802141A8 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_802141AC: -/* 802141AC 80 79 00 80 */ lwz r3, 0x80(r25) -/* 802141B0 3C 80 79 61 */ lis r4, 0x7961 /* 0x79616273@ha */ -/* 802141B4 38 C4 62 73 */ addi r6, r4, 0x6273 /* 0x79616273@l */ -/* 802141B8 38 A0 6D 6F */ li r5, 0x6d6f -/* 802141BC 81 83 00 00 */ lwz r12, 0(r3) -/* 802141C0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802141C4 7D 89 03 A6 */ mtctr r12 -/* 802141C8 4E 80 04 21 */ bctrl -/* 802141CC 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 802141D0 28 00 00 00 */ cmplwi r0, 0 -/* 802141D4 41 82 00 D8 */ beq lbl_802142AC -/* 802141D8 80 79 00 80 */ lwz r3, 0x80(r25) -/* 802141DC 3C 80 79 61 */ lis r4, 0x7961 /* 0x79616273@ha */ -/* 802141E0 38 C4 62 73 */ addi r6, r4, 0x6273 /* 0x79616273@l */ -/* 802141E4 38 A0 6D 6F */ li r5, 0x6d6f -/* 802141E8 81 83 00 00 */ lwz r12, 0(r3) -/* 802141EC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802141F0 7D 89 03 A6 */ mtctr r12 -/* 802141F4 4E 80 04 21 */ bctrl -/* 802141F8 38 00 00 00 */ li r0, 0 -/* 802141FC 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80214200 48 00 00 AC */ b lbl_802142AC -lbl_80214204: -/* 80214204 80 79 00 80 */ lwz r3, 0x80(r25) -/* 80214208 3C 80 79 61 */ lis r4, 0x7961 /* 0x79613030@ha */ -/* 8021420C 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x79613030@l */ -/* 80214210 38 A0 6D 6F */ li r5, 0x6d6f -/* 80214214 81 83 00 00 */ lwz r12, 0(r3) -/* 80214218 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8021421C 7D 89 03 A6 */ mtctr r12 -/* 80214220 4E 80 04 21 */ bctrl -/* 80214224 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 80214228 28 00 00 00 */ cmplwi r0, 0 -/* 8021422C 40 82 00 2C */ bne lbl_80214258 -/* 80214230 80 79 00 80 */ lwz r3, 0x80(r25) -/* 80214234 3C 80 79 61 */ lis r4, 0x7961 /* 0x79613030@ha */ -/* 80214238 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x79613030@l */ -/* 8021423C 38 A0 6D 6F */ li r5, 0x6d6f -/* 80214240 81 83 00 00 */ lwz r12, 0(r3) -/* 80214244 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214248 7D 89 03 A6 */ mtctr r12 -/* 8021424C 4E 80 04 21 */ bctrl -/* 80214250 38 00 00 01 */ li r0, 1 -/* 80214254 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_80214258: -/* 80214258 80 79 00 80 */ lwz r3, 0x80(r25) -/* 8021425C 3C 80 79 61 */ lis r4, 0x7961 /* 0x79616273@ha */ -/* 80214260 38 C4 62 73 */ addi r6, r4, 0x6273 /* 0x79616273@l */ -/* 80214264 38 A0 6D 6F */ li r5, 0x6d6f -/* 80214268 81 83 00 00 */ lwz r12, 0(r3) -/* 8021426C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214270 7D 89 03 A6 */ mtctr r12 -/* 80214274 4E 80 04 21 */ bctrl -/* 80214278 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 8021427C 28 00 00 00 */ cmplwi r0, 0 -/* 80214280 40 82 00 2C */ bne lbl_802142AC -/* 80214284 80 79 00 80 */ lwz r3, 0x80(r25) -/* 80214288 3C 80 79 61 */ lis r4, 0x7961 /* 0x79616273@ha */ -/* 8021428C 38 C4 62 73 */ addi r6, r4, 0x6273 /* 0x79616273@l */ -/* 80214290 38 A0 6D 6F */ li r5, 0x6d6f -/* 80214294 81 83 00 00 */ lwz r12, 0(r3) -/* 80214298 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8021429C 7D 89 03 A6 */ mtctr r12 -/* 802142A0 4E 80 04 21 */ bctrl -/* 802142A4 38 00 00 01 */ li r0, 1 -/* 802142A8 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_802142AC: -/* 802142AC 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 802142B0 28 00 00 03 */ cmplwi r0, 3 -/* 802142B4 41 82 00 3C */ beq lbl_802142F0 -/* 802142B8 28 00 00 04 */ cmplwi r0, 4 -/* 802142BC 41 82 00 34 */ beq lbl_802142F0 -/* 802142C0 28 00 00 05 */ cmplwi r0, 5 -/* 802142C4 41 82 00 2C */ beq lbl_802142F0 -/* 802142C8 48 02 3F 65 */ bl getStatus__12dMsgObject_cFv -/* 802142CC 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 802142D0 20 60 00 01 */ subfic r3, r0, 1 -/* 802142D4 30 03 FF FF */ addic r0, r3, -1 -/* 802142D8 7C 00 19 10 */ subfe r0, r0, r3 -/* 802142DC 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802142E0 41 82 00 10 */ beq lbl_802142F0 -/* 802142E4 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 802142E8 D0 1A 00 00 */ stfs f0, 0(r26) -/* 802142EC 48 00 03 00 */ b lbl_802145EC -lbl_802142F0: -/* 802142F0 C0 1A 00 00 */ lfs f0, 0(r26) -/* 802142F4 EC 00 F0 2A */ fadds f0, f0, f30 -/* 802142F8 D0 1A 00 00 */ stfs f0, 0(r26) -/* 802142FC C0 1A 00 00 */ lfs f0, 0(r26) -/* 80214300 FC 00 F8 40 */ fcmpo cr0, f0, f31 -/* 80214304 40 81 00 34 */ ble lbl_80214338 -/* 80214308 38 1F FF FF */ addi r0, r31, -1 -/* 8021430C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80214310 28 00 00 01 */ cmplwi r0, 1 -/* 80214314 40 81 00 10 */ ble lbl_80214324 -/* 80214318 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8021431C 28 00 00 03 */ cmplwi r0, 3 -/* 80214320 40 82 00 10 */ bne lbl_80214330 -lbl_80214324: -/* 80214324 C0 02 AE 98 */ lfs f0, lit_4923(r2) -/* 80214328 D0 1A 00 00 */ stfs f0, 0(r26) -/* 8021432C 48 00 00 0C */ b lbl_80214338 -lbl_80214330: -/* 80214330 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80214334 D0 1A 00 00 */ stfs f0, 0(r26) -lbl_80214338: -/* 80214338 C0 02 AE 98 */ lfs f0, lit_4923(r2) -/* 8021433C C0 3A 00 00 */ lfs f1, 0(r26) -/* 80214340 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80214344 40 82 00 48 */ bne lbl_8021438C -/* 80214348 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8021434C 28 00 00 01 */ cmplwi r0, 1 -/* 80214350 40 82 00 3C */ bne lbl_8021438C -/* 80214354 38 00 00 0F */ li r0, 0xf -/* 80214358 90 01 00 0C */ stw r0, 0xc(r1) -/* 8021435C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80214360 38 81 00 0C */ addi r4, r1, 0xc -/* 80214364 38 A0 00 00 */ li r5, 0 -/* 80214368 38 C0 00 00 */ li r6, 0 -/* 8021436C 38 E0 00 00 */ li r7, 0 -/* 80214370 C0 22 AE 84 */ lfs f1, lit_4183(r2) -/* 80214374 FC 40 08 90 */ fmr f2, f1 -/* 80214378 C0 62 AE B0 */ lfs f3, lit_5786(r2) -/* 8021437C FC 80 18 90 */ fmr f4, f3 -/* 80214380 39 00 00 00 */ li r8, 0 -/* 80214384 48 09 76 01 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80214388 48 00 00 50 */ b lbl_802143D8 -lbl_8021438C: -/* 8021438C C0 02 AE 98 */ lfs f0, lit_4923(r2) -/* 80214390 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80214394 40 82 00 44 */ bne lbl_802143D8 -/* 80214398 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8021439C 28 00 00 02 */ cmplwi r0, 2 -/* 802143A0 40 82 00 38 */ bne lbl_802143D8 -/* 802143A4 38 00 00 B7 */ li r0, 0xb7 -/* 802143A8 90 01 00 08 */ stw r0, 8(r1) -/* 802143AC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802143B0 38 81 00 08 */ addi r4, r1, 8 -/* 802143B4 38 A0 00 00 */ li r5, 0 -/* 802143B8 38 C0 00 00 */ li r6, 0 -/* 802143BC 38 E0 00 00 */ li r7, 0 -/* 802143C0 C0 22 AE 84 */ lfs f1, lit_4183(r2) -/* 802143C4 FC 40 08 90 */ fmr f2, f1 -/* 802143C8 C0 62 AE B0 */ lfs f3, lit_5786(r2) -/* 802143CC FC 80 18 90 */ fmr f4, f3 -/* 802143D0 39 00 00 00 */ li r8, 0 -/* 802143D4 48 09 75 B1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_802143D8: -/* 802143D8 7F 23 CB 78 */ mr r3, r25 -/* 802143DC C0 3A 00 00 */ lfs f1, 0(r26) -/* 802143E0 4B FF F9 0D */ bl playPikariBckAnimation__13dMeter2Draw_cFf -/* 802143E4 7F 23 CB 78 */ mr r3, r25 -/* 802143E8 C0 3A 00 00 */ lfs f1, 0(r26) -/* 802143EC 4B FF FA 51 */ bl playPikariBpkAnimation__13dMeter2Draw_cFf -/* 802143F0 80 79 03 9C */ lwz r3, 0x39c(r25) -/* 802143F4 80 63 00 04 */ lwz r3, 4(r3) -/* 802143F8 D3 63 00 D4 */ stfs f27, 0xd4(r3) -/* 802143FC D3 83 00 D8 */ stfs f28, 0xd8(r3) -/* 80214400 81 83 00 00 */ lwz r12, 0(r3) -/* 80214404 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80214408 7D 89 03 A6 */ mtctr r12 -/* 8021440C 4E 80 04 21 */ bctrl -/* 80214410 80 79 03 9C */ lwz r3, 0x39c(r25) -/* 80214414 80 63 00 04 */ lwz r3, 4(r3) -/* 80214418 C0 23 00 D0 */ lfs f1, 0xd0(r3) -/* 8021441C C0 03 00 CC */ lfs f0, 0xcc(r3) -/* 80214420 EC 1D 00 32 */ fmuls f0, f29, f0 -/* 80214424 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80214428 EC 1D 00 72 */ fmuls f0, f29, f1 -/* 8021442C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80214430 81 83 00 00 */ lwz r12, 0(r3) -/* 80214434 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80214438 7D 89 03 A6 */ mtctr r12 -/* 8021443C 4E 80 04 21 */ bctrl -/* 80214440 80 79 00 80 */ lwz r3, 0x80(r25) -/* 80214444 3C 80 79 61 */ lis r4, 0x7961 /* 0x79613030@ha */ -/* 80214448 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x79613030@l */ -/* 8021444C 38 A0 6D 6F */ li r5, 0x6d6f -/* 80214450 81 83 00 00 */ lwz r12, 0(r3) -/* 80214454 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214458 7D 89 03 A6 */ mtctr r12 -/* 8021445C 4E 80 04 21 */ bctrl -/* 80214460 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 80214464 28 00 00 00 */ cmplwi r0, 0 -/* 80214468 41 82 00 4C */ beq lbl_802144B4 -/* 8021446C 80 1C 00 00 */ lwz r0, 0(r28) -/* 80214470 90 01 00 28 */ stw r0, 0x28(r1) -/* 80214474 80 1B 00 00 */ lwz r0, 0(r27) -/* 80214478 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8021447C 80 79 00 80 */ lwz r3, 0x80(r25) -/* 80214480 3C 80 79 61 */ lis r4, 0x7961 /* 0x79613030@ha */ -/* 80214484 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x79613030@l */ -/* 80214488 38 A0 6D 6F */ li r5, 0x6d6f -/* 8021448C 81 83 00 00 */ lwz r12, 0(r3) -/* 80214490 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214494 7D 89 03 A6 */ mtctr r12 -/* 80214498 4E 80 04 21 */ bctrl -/* 8021449C 38 81 00 2C */ addi r4, r1, 0x2c -/* 802144A0 38 A1 00 28 */ addi r5, r1, 0x28 -/* 802144A4 81 83 00 00 */ lwz r12, 0(r3) -/* 802144A8 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 802144AC 7D 89 03 A6 */ mtctr r12 -/* 802144B0 4E 80 04 21 */ bctrl -lbl_802144B4: -/* 802144B4 80 79 00 80 */ lwz r3, 0x80(r25) -/* 802144B8 3C 80 79 61 */ lis r4, 0x7961 /* 0x79616273@ha */ -/* 802144BC 38 C4 62 73 */ addi r6, r4, 0x6273 /* 0x79616273@l */ -/* 802144C0 38 A0 6D 6F */ li r5, 0x6d6f -/* 802144C4 81 83 00 00 */ lwz r12, 0(r3) -/* 802144C8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802144CC 7D 89 03 A6 */ mtctr r12 -/* 802144D0 4E 80 04 21 */ bctrl -/* 802144D4 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 802144D8 28 00 00 00 */ cmplwi r0, 0 -/* 802144DC 41 82 00 4C */ beq lbl_80214528 -/* 802144E0 80 1E 00 00 */ lwz r0, 0(r30) -/* 802144E4 90 01 00 20 */ stw r0, 0x20(r1) -/* 802144E8 80 1D 00 00 */ lwz r0, 0(r29) -/* 802144EC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802144F0 80 79 00 80 */ lwz r3, 0x80(r25) -/* 802144F4 3C 80 79 61 */ lis r4, 0x7961 /* 0x79616273@ha */ -/* 802144F8 38 C4 62 73 */ addi r6, r4, 0x6273 /* 0x79616273@l */ -/* 802144FC 38 A0 6D 6F */ li r5, 0x6d6f -/* 80214500 81 83 00 00 */ lwz r12, 0(r3) -/* 80214504 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214508 7D 89 03 A6 */ mtctr r12 -/* 8021450C 4E 80 04 21 */ bctrl -/* 80214510 38 81 00 24 */ addi r4, r1, 0x24 -/* 80214514 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80214518 81 83 00 00 */ lwz r12, 0(r3) -/* 8021451C 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80214520 7D 89 03 A6 */ mtctr r12 -/* 80214524 4E 80 04 21 */ bctrl -lbl_80214528: -/* 80214528 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8021452C 28 00 00 04 */ cmplwi r0, 4 -/* 80214530 41 82 00 50 */ beq lbl_80214580 -/* 80214534 80 19 05 48 */ lwz r0, 0x548(r25) -/* 80214538 90 01 00 18 */ stw r0, 0x18(r1) -/* 8021453C 80 19 05 48 */ lwz r0, 0x548(r25) -/* 80214540 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80214544 80 79 00 80 */ lwz r3, 0x80(r25) -/* 80214548 3C 80 6B 61 */ lis r4, 0x6B61 /* 0x6B613030@ha */ -/* 8021454C 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x6B613030@l */ -/* 80214550 38 A0 70 69 */ li r5, 0x7069 -/* 80214554 81 83 00 00 */ lwz r12, 0(r3) -/* 80214558 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8021455C 7D 89 03 A6 */ mtctr r12 -/* 80214560 4E 80 04 21 */ bctrl -/* 80214564 38 81 00 1C */ addi r4, r1, 0x1c -/* 80214568 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8021456C 81 83 00 00 */ lwz r12, 0(r3) -/* 80214570 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80214574 7D 89 03 A6 */ mtctr r12 -/* 80214578 4E 80 04 21 */ bctrl -/* 8021457C 48 00 00 54 */ b lbl_802145D0 -lbl_80214580: -/* 80214580 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80214584 38 63 02 8C */ addi r3, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80214588 80 03 02 E4 */ lwz r0, 0x2e4(r3) -/* 8021458C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80214590 80 03 02 E8 */ lwz r0, 0x2e8(r3) -/* 80214594 90 01 00 14 */ stw r0, 0x14(r1) -/* 80214598 80 79 00 80 */ lwz r3, 0x80(r25) -/* 8021459C 3C 80 6B 61 */ lis r4, 0x6B61 /* 0x6B613030@ha */ -/* 802145A0 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x6B613030@l */ -/* 802145A4 38 A0 70 69 */ li r5, 0x7069 -/* 802145A8 81 83 00 00 */ lwz r12, 0(r3) -/* 802145AC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802145B0 7D 89 03 A6 */ mtctr r12 -/* 802145B4 4E 80 04 21 */ bctrl -/* 802145B8 38 81 00 14 */ addi r4, r1, 0x14 -/* 802145BC 38 A1 00 10 */ addi r5, r1, 0x10 -/* 802145C0 81 83 00 00 */ lwz r12, 0(r3) -/* 802145C4 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 802145C8 7D 89 03 A6 */ mtctr r12 -/* 802145CC 4E 80 04 21 */ bctrl -lbl_802145D0: -/* 802145D0 80 79 00 80 */ lwz r3, 0x80(r25) -/* 802145D4 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 802145D8 FC 40 08 90 */ fmr f2, f1 -/* 802145DC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802145E0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802145E4 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 802145E8 48 0E 48 ED */ bl draw__9J2DScreenFffPC14J2DGrafContext -lbl_802145EC: -/* 802145EC E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* qr0 */ -/* 802145F0 CB E1 00 90 */ lfd f31, 0x90(r1) -/* 802145F4 E3 C1 00 88 */ psq_l f30, 136(r1), 0, 0 /* qr0 */ -/* 802145F8 CB C1 00 80 */ lfd f30, 0x80(r1) -/* 802145FC E3 A1 00 78 */ psq_l f29, 120(r1), 0, 0 /* qr0 */ -/* 80214600 CB A1 00 70 */ lfd f29, 0x70(r1) -/* 80214604 E3 81 00 68 */ psq_l f28, 104(r1), 0, 0 /* qr0 */ -/* 80214608 CB 81 00 60 */ lfd f28, 0x60(r1) -/* 8021460C E3 61 00 58 */ psq_l f27, 88(r1), 0, 0 /* qr0 */ -/* 80214610 CB 61 00 50 */ lfd f27, 0x50(r1) -/* 80214614 39 61 00 50 */ addi r11, r1, 0x50 -/* 80214618 48 14 DC 01 */ bl _restgpr_25 -/* 8021461C 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 80214620 7C 08 03 A6 */ mtlr r0 -/* 80214624 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80214628 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/func_8021462C.s b/asm/d/meter/d_meter2_draw/func_8021462C.s deleted file mode 100644 index 50df3cb0ce..0000000000 --- a/asm/d/meter/d_meter2_draw/func_8021462C.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_8021462C: -/* 8021462C 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80214630 7C 08 02 A6 */ mflr r0 -/* 80214634 90 01 00 74 */ stw r0, 0x74(r1) -/* 80214638 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 8021463C F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80214640 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 80214644 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80214648 DB A1 00 40 */ stfd f29, 0x40(r1) -/* 8021464C F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* qr0 */ -/* 80214650 DB 81 00 30 */ stfd f28, 0x30(r1) -/* 80214654 F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 /* qr0 */ -/* 80214658 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021465C 48 14 DB 79 */ bl _savegpr_27 -/* 80214660 7C 7B 1B 78 */ mr r27, r3 -/* 80214664 FF 80 08 90 */ fmr f28, f1 -/* 80214668 FF A0 10 90 */ fmr f29, f2 -/* 8021466C FF C0 18 90 */ fmr f30, f3 -/* 80214670 FF E0 20 90 */ fmr f31, f4 -/* 80214674 7C 9C 23 78 */ mr r28, r4 -/* 80214678 7C BD 2B 78 */ mr r29, r5 -/* 8021467C 7C DE 33 78 */ mr r30, r6 -/* 80214680 7C FF 3B 78 */ mr r31, r7 -/* 80214684 FC 20 F0 90 */ fmr f1, f30 -/* 80214688 4B FF F6 65 */ bl playPikariBckAnimation__13dMeter2Draw_cFf -/* 8021468C 7F 63 DB 78 */ mr r3, r27 -/* 80214690 FC 20 F0 90 */ fmr f1, f30 -/* 80214694 4B FF F7 A9 */ bl playPikariBpkAnimation__13dMeter2Draw_cFf -/* 80214698 80 7B 03 9C */ lwz r3, 0x39c(r27) -/* 8021469C 80 63 00 04 */ lwz r3, 4(r3) -/* 802146A0 D3 83 00 D4 */ stfs f28, 0xd4(r3) -/* 802146A4 D3 A3 00 D8 */ stfs f29, 0xd8(r3) -/* 802146A8 81 83 00 00 */ lwz r12, 0(r3) -/* 802146AC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802146B0 7D 89 03 A6 */ mtctr r12 -/* 802146B4 4E 80 04 21 */ bctrl -/* 802146B8 80 7B 03 9C */ lwz r3, 0x39c(r27) -/* 802146BC 80 63 00 04 */ lwz r3, 4(r3) -/* 802146C0 C0 23 00 D0 */ lfs f1, 0xd0(r3) -/* 802146C4 C0 03 00 CC */ lfs f0, 0xcc(r3) -/* 802146C8 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 802146CC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802146D0 EC 1F 00 72 */ fmuls f0, f31, f1 -/* 802146D4 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802146D8 81 83 00 00 */ lwz r12, 0(r3) -/* 802146DC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802146E0 7D 89 03 A6 */ mtctr r12 -/* 802146E4 4E 80 04 21 */ bctrl -/* 802146E8 80 1D 00 00 */ lwz r0, 0(r29) -/* 802146EC 90 01 00 10 */ stw r0, 0x10(r1) -/* 802146F0 80 1C 00 00 */ lwz r0, 0(r28) -/* 802146F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802146F8 80 7B 00 80 */ lwz r3, 0x80(r27) -/* 802146FC 3C 80 79 61 */ lis r4, 0x7961 /* 0x79613030@ha */ -/* 80214700 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x79613030@l */ -/* 80214704 38 A0 6D 6F */ li r5, 0x6d6f -/* 80214708 81 83 00 00 */ lwz r12, 0(r3) -/* 8021470C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214710 7D 89 03 A6 */ mtctr r12 -/* 80214714 4E 80 04 21 */ bctrl -/* 80214718 38 81 00 14 */ addi r4, r1, 0x14 -/* 8021471C 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80214720 81 83 00 00 */ lwz r12, 0(r3) -/* 80214724 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80214728 7D 89 03 A6 */ mtctr r12 -/* 8021472C 4E 80 04 21 */ bctrl -/* 80214730 80 1F 00 00 */ lwz r0, 0(r31) -/* 80214734 90 01 00 08 */ stw r0, 8(r1) -/* 80214738 80 1E 00 00 */ lwz r0, 0(r30) -/* 8021473C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80214740 80 7B 00 80 */ lwz r3, 0x80(r27) -/* 80214744 3C 80 79 61 */ lis r4, 0x7961 /* 0x79616273@ha */ -/* 80214748 38 C4 62 73 */ addi r6, r4, 0x6273 /* 0x79616273@l */ -/* 8021474C 38 A0 6D 6F */ li r5, 0x6d6f -/* 80214750 81 83 00 00 */ lwz r12, 0(r3) -/* 80214754 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80214758 7D 89 03 A6 */ mtctr r12 -/* 8021475C 4E 80 04 21 */ bctrl -/* 80214760 38 81 00 0C */ addi r4, r1, 0xc -/* 80214764 38 A1 00 08 */ addi r5, r1, 8 -/* 80214768 81 83 00 00 */ lwz r12, 0(r3) -/* 8021476C 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80214770 7D 89 03 A6 */ mtctr r12 -/* 80214774 4E 80 04 21 */ bctrl -/* 80214778 80 7B 00 80 */ lwz r3, 0x80(r27) -/* 8021477C C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80214780 FC 40 08 90 */ fmr f2, f1 -/* 80214784 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80214788 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021478C 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 80214790 48 0E 47 45 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 80214794 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 80214798 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 8021479C E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 802147A0 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 802147A4 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* qr0 */ -/* 802147A8 CB A1 00 40 */ lfd f29, 0x40(r1) -/* 802147AC E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 /* qr0 */ -/* 802147B0 CB 81 00 30 */ lfd f28, 0x30(r1) -/* 802147B4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802147B8 48 14 DA 69 */ bl _restgpr_27 -/* 802147BC 80 01 00 74 */ lwz r0, 0x74(r1) -/* 802147C0 7C 08 03 A6 */ mtlr r0 -/* 802147C4 38 21 00 70 */ addi r1, r1, 0x70 -/* 802147C8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/getActionString__13dMeter2Draw_cFUcUcPUc.s b/asm/d/meter/d_meter2_draw/getActionString__13dMeter2Draw_cFUcUcPUc.s deleted file mode 100644 index a7dd2bfced..0000000000 --- a/asm/d/meter/d_meter2_draw/getActionString__13dMeter2Draw_cFUcUcPUc.s +++ /dev/null @@ -1,101 +0,0 @@ -lbl_8021A2F4: -/* 8021A2F4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8021A2F8 7C 08 02 A6 */ mflr r0 -/* 8021A2FC 90 01 00 44 */ stw r0, 0x44(r1) -/* 8021A300 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021A304 48 14 7E D5 */ bl _savegpr_28 -/* 8021A308 7C 9D 23 78 */ mr r29, r4 -/* 8021A30C 7C BC 2B 78 */ mr r28, r5 -/* 8021A310 7C DF 33 78 */ mr r31, r6 -/* 8021A314 3C 60 80 43 */ lis r3, i_text_buf@ha /* 0x80430158@ha */ -/* 8021A318 38 63 01 58 */ addi r3, r3, i_text_buf@l /* 0x80430158@l */ -/* 8021A31C 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8021A320 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 8021A324 38 84 00 EF */ addi r4, r4, 0xef -/* 8021A328 48 14 E8 05 */ bl strcpy -/* 8021A32C 28 1F 00 00 */ cmplwi r31, 0 -/* 8021A330 41 82 00 0C */ beq lbl_8021A33C -/* 8021A334 38 00 00 01 */ li r0, 1 -/* 8021A338 98 1F 00 00 */ stb r0, 0(r31) -lbl_8021A33C: -/* 8021A33C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8021A340 28 00 00 81 */ cmplwi r0, 0x81 -/* 8021A344 40 82 00 80 */ bne lbl_8021A3C4 -/* 8021A348 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021A34C 3B A3 EB C8 */ addi r29, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021A350 80 9D 02 C8 */ lwz r4, 0x2c8(r29) -/* 8021A354 2C 04 00 00 */ cmpwi r4, 0 -/* 8021A358 41 82 00 F0 */ beq lbl_8021A448 -/* 8021A35C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8021A360 28 00 00 01 */ cmplwi r0, 1 -/* 8021A364 40 82 00 20 */ bne lbl_8021A384 -/* 8021A368 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021A36C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021A370 3C A0 80 43 */ lis r5, i_text_buf@ha /* 0x80430158@ha */ -/* 8021A374 38 A5 01 58 */ addi r5, r5, i_text_buf@l /* 0x80430158@l */ -/* 8021A378 38 C1 00 1C */ addi r6, r1, 0x1c -/* 8021A37C 48 00 1F F5 */ bl getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 8021A380 48 00 00 1C */ b lbl_8021A39C -lbl_8021A384: -/* 8021A384 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021A388 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021A38C 3C A0 80 43 */ lis r5, i_text_buf@ha /* 0x80430158@ha */ -/* 8021A390 38 A5 01 58 */ addi r5, r5, i_text_buf@l /* 0x80430158@l */ -/* 8021A394 38 C1 00 1C */ addi r6, r1, 0x1c -/* 8021A398 48 00 21 AD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -lbl_8021A39C: -/* 8021A39C 28 1F 00 00 */ cmplwi r31, 0 -/* 8021A3A0 41 82 00 A8 */ beq lbl_8021A448 -/* 8021A3A4 88 01 00 26 */ lbz r0, 0x26(r1) -/* 8021A3A8 98 1F 00 00 */ stb r0, 0(r31) -/* 8021A3AC 80 1D 02 C8 */ lwz r0, 0x2c8(r29) -/* 8021A3B0 2C 00 03 E6 */ cmpwi r0, 0x3e6 -/* 8021A3B4 40 82 00 94 */ bne lbl_8021A448 -/* 8021A3B8 38 00 00 07 */ li r0, 7 -/* 8021A3BC 98 1F 00 00 */ stb r0, 0(r31) -/* 8021A3C0 48 00 00 88 */ b lbl_8021A448 -lbl_8021A3C4: -/* 8021A3C4 28 00 00 82 */ cmplwi r0, 0x82 -/* 8021A3C8 40 80 00 80 */ bge lbl_8021A448 -/* 8021A3CC 57 BD 15 BA */ rlwinm r29, r29, 2, 0x16, 0x1d -/* 8021A3D0 3C 60 80 3C */ lis r3, i_action_num@ha /* 0x803BF350@ha */ -/* 8021A3D4 3B C3 F3 50 */ addi r30, r3, i_action_num@l /* 0x803BF350@l */ -/* 8021A3D8 7C 9E E8 2E */ lwzx r4, r30, r29 -/* 8021A3DC 28 04 00 00 */ cmplwi r4, 0 -/* 8021A3E0 41 82 00 68 */ beq lbl_8021A448 -/* 8021A3E4 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8021A3E8 28 00 00 01 */ cmplwi r0, 1 -/* 8021A3EC 40 82 00 20 */ bne lbl_8021A40C -/* 8021A3F0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021A3F4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021A3F8 3C A0 80 43 */ lis r5, i_text_buf@ha /* 0x80430158@ha */ -/* 8021A3FC 38 A5 01 58 */ addi r5, r5, i_text_buf@l /* 0x80430158@l */ -/* 8021A400 38 C1 00 08 */ addi r6, r1, 8 -/* 8021A404 48 00 1F 6D */ bl getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 8021A408 48 00 00 1C */ b lbl_8021A424 -lbl_8021A40C: -/* 8021A40C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021A410 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021A414 3C A0 80 43 */ lis r5, i_text_buf@ha /* 0x80430158@ha */ -/* 8021A418 38 A5 01 58 */ addi r5, r5, i_text_buf@l /* 0x80430158@l */ -/* 8021A41C 38 C1 00 08 */ addi r6, r1, 8 -/* 8021A420 48 00 21 25 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -lbl_8021A424: -/* 8021A424 28 1F 00 00 */ cmplwi r31, 0 -/* 8021A428 41 82 00 20 */ beq lbl_8021A448 -/* 8021A42C 88 01 00 12 */ lbz r0, 0x12(r1) -/* 8021A430 98 1F 00 00 */ stb r0, 0(r31) -/* 8021A434 7C 1E E8 2E */ lwzx r0, r30, r29 -/* 8021A438 28 00 03 E6 */ cmplwi r0, 0x3e6 -/* 8021A43C 40 82 00 0C */ bne lbl_8021A448 -/* 8021A440 38 00 00 07 */ li r0, 7 -/* 8021A444 98 1F 00 00 */ stb r0, 0(r31) -lbl_8021A448: -/* 8021A448 3C 60 80 43 */ lis r3, i_text_buf@ha /* 0x80430158@ha */ -/* 8021A44C 38 63 01 58 */ addi r3, r3, i_text_buf@l /* 0x80430158@l */ -/* 8021A450 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021A454 48 14 7D D1 */ bl _restgpr_28 -/* 8021A458 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8021A45C 7C 08 03 A6 */ mtlr r0 -/* 8021A460 38 21 00 40 */ addi r1, r1, 0x40 -/* 8021A464 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/getButtonCrossParentInitTransY__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/getButtonCrossParentInitTransY__13dMeter2Draw_cFv.s deleted file mode 100644 index afe6073507..0000000000 --- a/asm/d/meter/d_meter2_draw/getButtonCrossParentInitTransY__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80218238: -/* 80218238 80 63 03 68 */ lwz r3, 0x368(r3) -/* 8021823C C0 43 00 28 */ lfs f2, 0x28(r3) -/* 80218240 C0 22 AE 94 */ lfs f1, lit_4922(r2) -/* 80218244 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 80218248 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8021824C EC 22 00 2A */ fadds f1, f2, f0 -/* 80218250 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/getCameraSubject__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/getCameraSubject__13dMeter2Draw_cFv.s deleted file mode 100644 index 0c5d0ac0f7..0000000000 --- a/asm/d/meter/d_meter2_draw/getCameraSubject__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8021BC24: -/* 8021BC24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021BC28 7C 08 02 A6 */ mflr r0 -/* 8021BC2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BC30 4B F6 5A 11 */ bl dCam_getBody__Fv -/* 8021BC34 80 03 01 A4 */ lwz r0, 0x1a4(r3) -/* 8021BC38 20 00 00 04 */ subfic r0, r0, 4 -/* 8021BC3C 7C 00 00 34 */ cntlzw r0, r0 -/* 8021BC40 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8021BC44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021BC48 7C 08 03 A6 */ mtlr r0 -/* 8021BC4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021BC50 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/getItemSubject__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/getItemSubject__13dMeter2Draw_cFv.s deleted file mode 100644 index 059c870fbb..0000000000 --- a/asm/d/meter/d_meter2_draw/getItemSubject__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8021BC54: -/* 8021BC54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021BC58 7C 08 02 A6 */ mflr r0 -/* 8021BC5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BC60 4B F6 59 E1 */ bl dCam_getBody__Fv -/* 8021BC64 80 03 01 A4 */ lwz r0, 0x1a4(r3) -/* 8021BC68 2C 00 00 04 */ cmpwi r0, 4 -/* 8021BC6C 41 82 00 2C */ beq lbl_8021BC98 -/* 8021BC70 4B F6 59 D1 */ bl dCam_getBody__Fv -/* 8021BC74 80 03 01 A4 */ lwz r0, 0x1a4(r3) -/* 8021BC78 2C 00 00 07 */ cmpwi r0, 7 -/* 8021BC7C 41 82 00 14 */ beq lbl_8021BC90 -/* 8021BC80 4B F6 59 C1 */ bl dCam_getBody__Fv -/* 8021BC84 80 03 01 A4 */ lwz r0, 0x1a4(r3) -/* 8021BC88 2C 00 00 08 */ cmpwi r0, 8 -/* 8021BC8C 40 82 00 0C */ bne lbl_8021BC98 -lbl_8021BC90: -/* 8021BC90 38 60 00 01 */ li r3, 1 -/* 8021BC94 48 00 00 08 */ b lbl_8021BC9C -lbl_8021BC98: -/* 8021BC98 38 60 00 00 */ li r3, 0 -lbl_8021BC9C: -/* 8021BC9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021BCA0 7C 08 03 A6 */ mtlr r0 -/* 8021BCA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021BCA8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/getNowLightDropRateCalc__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/getNowLightDropRateCalc__13dMeter2Draw_cFv.s deleted file mode 100644 index d60d87093f..0000000000 --- a/asm/d/meter/d_meter2_draw/getNowLightDropRateCalc__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80215DA8: -/* 80215DA8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80215DAC 7C 08 02 A6 */ mflr r0 -/* 80215DB0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80215DB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80215DB8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80215DBC 38 64 01 14 */ addi r3, r4, 0x114 -/* 80215DC0 88 84 4E 0C */ lbz r4, 0x4e0c(r4) -/* 80215DC4 4B E1 E5 7D */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 80215DC8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80215DCC C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 80215DD0 90 01 00 0C */ stw r0, 0xc(r1) -/* 80215DD4 3C 80 43 30 */ lis r4, 0x4330 -/* 80215DD8 90 81 00 08 */ stw r4, 8(r1) -/* 80215DDC C8 01 00 08 */ lfd f0, 8(r1) -/* 80215DE0 EC 40 08 28 */ fsubs f2, f0, f1 -/* 80215DE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80215DE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80215DEC 88 03 5E A1 */ lbz r0, 0x5ea1(r3) -/* 80215DF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80215DF4 90 81 00 10 */ stw r4, 0x10(r1) -/* 80215DF8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80215DFC EC 20 08 28 */ fsubs f1, f0, f1 -/* 80215E00 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80215E04 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80215E08 4C 40 13 82 */ cror 2, 0, 2 -/* 80215E0C 40 82 00 0C */ bne lbl_80215E18 -/* 80215E10 FC 20 00 90 */ fmr f1, f0 -/* 80215E14 48 00 00 1C */ b lbl_80215E30 -lbl_80215E18: -/* 80215E18 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 80215E1C 4C 41 13 82 */ cror 2, 1, 2 -/* 80215E20 40 82 00 0C */ bne lbl_80215E2C -/* 80215E24 C0 22 AE 84 */ lfs f1, lit_4183(r2) -/* 80215E28 48 00 00 08 */ b lbl_80215E30 -lbl_80215E2C: -/* 80215E2C EC 22 08 24 */ fdivs f1, f2, f1 -lbl_80215E30: -/* 80215E30 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80215E34 7C 08 03 A6 */ mtlr r0 -/* 80215E38 38 21 00 20 */ addi r1, r1, 0x20 -/* 80215E3C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/initButtonCross__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/initButtonCross__13dMeter2Draw_cFv.s deleted file mode 100644 index 58289bd9c0..0000000000 --- a/asm/d/meter/d_meter2_draw/initButtonCross__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,506 +0,0 @@ -lbl_8021350C: -/* 8021350C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80213510 7C 08 02 A6 */ mflr r0 -/* 80213514 90 01 00 14 */ stw r0, 0x14(r1) -/* 80213518 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021351C 93 C1 00 08 */ stw r30, 8(r1) -/* 80213520 7C 7F 1B 78 */ mr r31, r3 -/* 80213524 38 60 00 6C */ li r3, 0x6c -/* 80213528 48 0B B7 25 */ bl __nw__FUl -/* 8021352C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80213530 41 82 00 24 */ beq lbl_80213554 -/* 80213534 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80213538 3C A0 6A 69 */ lis r5, 0x6A69 /* 0x6A695F6E@ha */ -/* 8021353C 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x6A695F6E@l */ -/* 80213540 38 A0 6A 75 */ li r5, 0x6a75 -/* 80213544 38 E0 00 02 */ li r7, 2 -/* 80213548 39 00 00 00 */ li r8, 0 -/* 8021354C 48 04 04 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80213550 7C 60 1B 78 */ mr r0, r3 -lbl_80213554: -/* 80213554 90 1F 03 68 */ stw r0, 0x368(r31) -/* 80213558 4B E0 14 99 */ bl mDoExt_getMesgFont__Fv -/* 8021355C 7C 7E 1B 78 */ mr r30, r3 -/* 80213560 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213564 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7530@ha */ -/* 80213568 38 C4 75 30 */ addi r6, r4, 0x7530 /* 0x5F6A7530@l */ -/* 8021356C 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213570 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213574 81 83 00 00 */ lwz r12, 0(r3) -/* 80213578 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8021357C 7D 89 03 A6 */ mtctr r12 -/* 80213580 4E 80 04 21 */ bctrl -/* 80213584 7F C4 F3 78 */ mr r4, r30 -/* 80213588 81 83 00 00 */ lwz r12, 0(r3) -/* 8021358C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80213590 7D 89 03 A6 */ mtctr r12 -/* 80213594 4E 80 04 21 */ bctrl -/* 80213598 4B E0 14 59 */ bl mDoExt_getMesgFont__Fv -/* 8021359C 7C 7E 1B 78 */ mr r30, r3 -/* 802135A0 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 802135A4 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7531@ha */ -/* 802135A8 38 C4 75 31 */ addi r6, r4, 0x7531 /* 0x5F6A7531@l */ -/* 802135AC 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 802135B0 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 802135B4 81 83 00 00 */ lwz r12, 0(r3) -/* 802135B8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802135BC 7D 89 03 A6 */ mtctr r12 -/* 802135C0 4E 80 04 21 */ bctrl -/* 802135C4 7F C4 F3 78 */ mr r4, r30 -/* 802135C8 81 83 00 00 */ lwz r12, 0(r3) -/* 802135CC 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 802135D0 7D 89 03 A6 */ mtctr r12 -/* 802135D4 4E 80 04 21 */ bctrl -/* 802135D8 4B E0 14 19 */ bl mDoExt_getMesgFont__Fv -/* 802135DC 7C 7E 1B 78 */ mr r30, r3 -/* 802135E0 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 802135E4 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7532@ha */ -/* 802135E8 38 C4 75 32 */ addi r6, r4, 0x7532 /* 0x5F6A7532@l */ -/* 802135EC 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 802135F0 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 802135F4 81 83 00 00 */ lwz r12, 0(r3) -/* 802135F8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802135FC 7D 89 03 A6 */ mtctr r12 -/* 80213600 4E 80 04 21 */ bctrl -/* 80213604 7F C4 F3 78 */ mr r4, r30 -/* 80213608 81 83 00 00 */ lwz r12, 0(r3) -/* 8021360C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80213610 7D 89 03 A6 */ mtctr r12 -/* 80213614 4E 80 04 21 */ bctrl -/* 80213618 4B E0 13 D9 */ bl mDoExt_getMesgFont__Fv -/* 8021361C 7C 7E 1B 78 */ mr r30, r3 -/* 80213620 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213624 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7533@ha */ -/* 80213628 38 C4 75 33 */ addi r6, r4, 0x7533 /* 0x5F6A7533@l */ -/* 8021362C 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213630 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213634 81 83 00 00 */ lwz r12, 0(r3) -/* 80213638 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8021363C 7D 89 03 A6 */ mtctr r12 -/* 80213640 4E 80 04 21 */ bctrl -/* 80213644 7F C4 F3 78 */ mr r4, r30 -/* 80213648 81 83 00 00 */ lwz r12, 0(r3) -/* 8021364C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80213650 7D 89 03 A6 */ mtctr r12 -/* 80213654 4E 80 04 21 */ bctrl -/* 80213658 4B E0 13 99 */ bl mDoExt_getMesgFont__Fv -/* 8021365C 7C 7E 1B 78 */ mr r30, r3 -/* 80213660 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213664 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7534@ha */ -/* 80213668 38 C4 75 34 */ addi r6, r4, 0x7534 /* 0x5F6A7534@l */ -/* 8021366C 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213670 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213674 81 83 00 00 */ lwz r12, 0(r3) -/* 80213678 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8021367C 7D 89 03 A6 */ mtctr r12 -/* 80213680 4E 80 04 21 */ bctrl -/* 80213684 7F C4 F3 78 */ mr r4, r30 -/* 80213688 81 83 00 00 */ lwz r12, 0(r3) -/* 8021368C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80213690 7D 89 03 A6 */ mtctr r12 -/* 80213694 4E 80 04 21 */ bctrl -/* 80213698 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 8021369C 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7530@ha */ -/* 802136A0 38 C4 75 30 */ addi r6, r4, 0x7530 /* 0x5F6A7530@l */ -/* 802136A4 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 802136A8 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 802136AC 81 83 00 00 */ lwz r12, 0(r3) -/* 802136B0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802136B4 7D 89 03 A6 */ mtctr r12 -/* 802136B8 4E 80 04 21 */ bctrl -/* 802136BC 38 80 00 40 */ li r4, 0x40 -/* 802136C0 3C A0 80 3A */ lis r5, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 802136C4 38 A5 88 D0 */ addi r5, r5, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 802136C8 38 A5 00 EF */ addi r5, r5, 0xef -/* 802136CC 4C C6 31 82 */ crclr 6 -/* 802136D0 48 0E D0 7D */ bl setString__10J2DTextBoxFsPCce -/* 802136D4 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 802136D8 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7531@ha */ -/* 802136DC 38 C4 75 31 */ addi r6, r4, 0x7531 /* 0x5F6A7531@l */ -/* 802136E0 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 802136E4 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 802136E8 81 83 00 00 */ lwz r12, 0(r3) -/* 802136EC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802136F0 7D 89 03 A6 */ mtctr r12 -/* 802136F4 4E 80 04 21 */ bctrl -/* 802136F8 38 80 00 40 */ li r4, 0x40 -/* 802136FC 3C A0 80 3A */ lis r5, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 80213700 38 A5 88 D0 */ addi r5, r5, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 80213704 38 A5 00 EF */ addi r5, r5, 0xef -/* 80213708 4C C6 31 82 */ crclr 6 -/* 8021370C 48 0E D0 41 */ bl setString__10J2DTextBoxFsPCce -/* 80213710 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213714 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7532@ha */ -/* 80213718 38 C4 75 32 */ addi r6, r4, 0x7532 /* 0x5F6A7532@l */ -/* 8021371C 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213720 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213724 81 83 00 00 */ lwz r12, 0(r3) -/* 80213728 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8021372C 7D 89 03 A6 */ mtctr r12 -/* 80213730 4E 80 04 21 */ bctrl -/* 80213734 38 80 00 40 */ li r4, 0x40 -/* 80213738 3C A0 80 3A */ lis r5, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8021373C 38 A5 88 D0 */ addi r5, r5, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 80213740 38 A5 00 EF */ addi r5, r5, 0xef -/* 80213744 4C C6 31 82 */ crclr 6 -/* 80213748 48 0E D0 05 */ bl setString__10J2DTextBoxFsPCce -/* 8021374C 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213750 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7533@ha */ -/* 80213754 38 C4 75 33 */ addi r6, r4, 0x7533 /* 0x5F6A7533@l */ -/* 80213758 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 8021375C 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213760 81 83 00 00 */ lwz r12, 0(r3) -/* 80213764 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213768 7D 89 03 A6 */ mtctr r12 -/* 8021376C 4E 80 04 21 */ bctrl -/* 80213770 38 80 00 40 */ li r4, 0x40 -/* 80213774 3C A0 80 3A */ lis r5, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 80213778 38 A5 88 D0 */ addi r5, r5, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 8021377C 38 A5 00 EF */ addi r5, r5, 0xef -/* 80213780 4C C6 31 82 */ crclr 6 -/* 80213784 48 0E CF C9 */ bl setString__10J2DTextBoxFsPCce -/* 80213788 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 8021378C 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7534@ha */ -/* 80213790 38 C4 75 34 */ addi r6, r4, 0x7534 /* 0x5F6A7534@l */ -/* 80213794 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213798 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 8021379C 81 83 00 00 */ lwz r12, 0(r3) -/* 802137A0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802137A4 7D 89 03 A6 */ mtctr r12 -/* 802137A8 4E 80 04 21 */ bctrl -/* 802137AC 38 80 00 40 */ li r4, 0x40 -/* 802137B0 3C A0 80 3A */ lis r5, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 802137B4 38 A5 88 D0 */ addi r5, r5, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 802137B8 38 A5 00 EF */ addi r5, r5, 0xef -/* 802137BC 4C C6 31 82 */ crclr 6 -/* 802137C0 48 0E CF 8D */ bl setString__10J2DTextBoxFsPCce -/* 802137C4 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 802137C8 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7530@ha */ -/* 802137CC 38 C4 75 30 */ addi r6, r4, 0x7530 /* 0x5F6A7530@l */ -/* 802137D0 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 802137D4 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 802137D8 81 83 00 00 */ lwz r12, 0(r3) -/* 802137DC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802137E0 7D 89 03 A6 */ mtctr r12 -/* 802137E4 4E 80 04 21 */ bctrl -/* 802137E8 48 0E CE 71 */ bl getStringPtr__10J2DTextBoxCFv -/* 802137EC 7C 65 1B 78 */ mr r5, r3 -/* 802137F0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802137F4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802137F8 38 80 00 61 */ li r4, 0x61 -/* 802137FC 38 C0 00 00 */ li r6, 0 -/* 80213800 48 00 8A 51 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80213804 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213808 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7531@ha */ -/* 8021380C 38 C4 75 31 */ addi r6, r4, 0x7531 /* 0x5F6A7531@l */ -/* 80213810 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213814 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213818 81 83 00 00 */ lwz r12, 0(r3) -/* 8021381C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213820 7D 89 03 A6 */ mtctr r12 -/* 80213824 4E 80 04 21 */ bctrl -/* 80213828 48 0E CE 31 */ bl getStringPtr__10J2DTextBoxCFv -/* 8021382C 7C 65 1B 78 */ mr r5, r3 -/* 80213830 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80213834 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80213838 38 80 00 61 */ li r4, 0x61 -/* 8021383C 38 C0 00 00 */ li r6, 0 -/* 80213840 48 00 8A 11 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80213844 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213848 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7532@ha */ -/* 8021384C 38 C4 75 32 */ addi r6, r4, 0x7532 /* 0x5F6A7532@l */ -/* 80213850 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213854 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213858 81 83 00 00 */ lwz r12, 0(r3) -/* 8021385C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213860 7D 89 03 A6 */ mtctr r12 -/* 80213864 4E 80 04 21 */ bctrl -/* 80213868 48 0E CD F1 */ bl getStringPtr__10J2DTextBoxCFv -/* 8021386C 7C 65 1B 78 */ mr r5, r3 -/* 80213870 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80213874 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80213878 38 80 00 61 */ li r4, 0x61 -/* 8021387C 38 C0 00 00 */ li r6, 0 -/* 80213880 48 00 89 D1 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80213884 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213888 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7533@ha */ -/* 8021388C 38 C4 75 33 */ addi r6, r4, 0x7533 /* 0x5F6A7533@l */ -/* 80213890 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213894 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213898 81 83 00 00 */ lwz r12, 0(r3) -/* 8021389C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802138A0 7D 89 03 A6 */ mtctr r12 -/* 802138A4 4E 80 04 21 */ bctrl -/* 802138A8 48 0E CD B1 */ bl getStringPtr__10J2DTextBoxCFv -/* 802138AC 7C 65 1B 78 */ mr r5, r3 -/* 802138B0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802138B4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802138B8 38 80 00 61 */ li r4, 0x61 -/* 802138BC 38 C0 00 00 */ li r6, 0 -/* 802138C0 48 00 89 91 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 802138C4 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 802138C8 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7534@ha */ -/* 802138CC 38 C4 75 34 */ addi r6, r4, 0x7534 /* 0x5F6A7534@l */ -/* 802138D0 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 802138D4 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 802138D8 81 83 00 00 */ lwz r12, 0(r3) -/* 802138DC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802138E0 7D 89 03 A6 */ mtctr r12 -/* 802138E4 4E 80 04 21 */ bctrl -/* 802138E8 48 0E CD 71 */ bl getStringPtr__10J2DTextBoxCFv -/* 802138EC 7C 65 1B 78 */ mr r5, r3 -/* 802138F0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802138F4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802138F8 38 80 00 61 */ li r4, 0x61 -/* 802138FC 38 C0 00 00 */ li r6, 0 -/* 80213900 48 00 89 51 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80213904 4B E0 10 ED */ bl mDoExt_getMesgFont__Fv -/* 80213908 7C 7E 1B 78 */ mr r30, r3 -/* 8021390C 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213910 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7535@ha */ -/* 80213914 38 C4 75 35 */ addi r6, r4, 0x7535 /* 0x5F6A7535@l */ -/* 80213918 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 8021391C 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213920 81 83 00 00 */ lwz r12, 0(r3) -/* 80213924 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213928 7D 89 03 A6 */ mtctr r12 -/* 8021392C 4E 80 04 21 */ bctrl -/* 80213930 7F C4 F3 78 */ mr r4, r30 -/* 80213934 81 83 00 00 */ lwz r12, 0(r3) -/* 80213938 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 8021393C 7D 89 03 A6 */ mtctr r12 -/* 80213940 4E 80 04 21 */ bctrl -/* 80213944 4B E0 10 AD */ bl mDoExt_getMesgFont__Fv -/* 80213948 7C 7E 1B 78 */ mr r30, r3 -/* 8021394C 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213950 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7536@ha */ -/* 80213954 38 C4 75 36 */ addi r6, r4, 0x7536 /* 0x5F6A7536@l */ -/* 80213958 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 8021395C 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213960 81 83 00 00 */ lwz r12, 0(r3) -/* 80213964 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213968 7D 89 03 A6 */ mtctr r12 -/* 8021396C 4E 80 04 21 */ bctrl -/* 80213970 7F C4 F3 78 */ mr r4, r30 -/* 80213974 81 83 00 00 */ lwz r12, 0(r3) -/* 80213978 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 8021397C 7D 89 03 A6 */ mtctr r12 -/* 80213980 4E 80 04 21 */ bctrl -/* 80213984 4B E0 10 6D */ bl mDoExt_getMesgFont__Fv -/* 80213988 7C 7E 1B 78 */ mr r30, r3 -/* 8021398C 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213990 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7537@ha */ -/* 80213994 38 C4 75 37 */ addi r6, r4, 0x7537 /* 0x5F6A7537@l */ -/* 80213998 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 8021399C 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 802139A0 81 83 00 00 */ lwz r12, 0(r3) -/* 802139A4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802139A8 7D 89 03 A6 */ mtctr r12 -/* 802139AC 4E 80 04 21 */ bctrl -/* 802139B0 7F C4 F3 78 */ mr r4, r30 -/* 802139B4 81 83 00 00 */ lwz r12, 0(r3) -/* 802139B8 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 802139BC 7D 89 03 A6 */ mtctr r12 -/* 802139C0 4E 80 04 21 */ bctrl -/* 802139C4 4B E0 10 2D */ bl mDoExt_getMesgFont__Fv -/* 802139C8 7C 7E 1B 78 */ mr r30, r3 -/* 802139CC 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 802139D0 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7538@ha */ -/* 802139D4 38 C4 75 38 */ addi r6, r4, 0x7538 /* 0x5F6A7538@l */ -/* 802139D8 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 802139DC 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 802139E0 81 83 00 00 */ lwz r12, 0(r3) -/* 802139E4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802139E8 7D 89 03 A6 */ mtctr r12 -/* 802139EC 4E 80 04 21 */ bctrl -/* 802139F0 7F C4 F3 78 */ mr r4, r30 -/* 802139F4 81 83 00 00 */ lwz r12, 0(r3) -/* 802139F8 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 802139FC 7D 89 03 A6 */ mtctr r12 -/* 80213A00 4E 80 04 21 */ bctrl -/* 80213A04 4B E0 0F ED */ bl mDoExt_getMesgFont__Fv -/* 80213A08 7C 7E 1B 78 */ mr r30, r3 -/* 80213A0C 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213A10 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7539@ha */ -/* 80213A14 38 C4 75 39 */ addi r6, r4, 0x7539 /* 0x5F6A7539@l */ -/* 80213A18 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213A1C 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213A20 81 83 00 00 */ lwz r12, 0(r3) -/* 80213A24 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213A28 7D 89 03 A6 */ mtctr r12 -/* 80213A2C 4E 80 04 21 */ bctrl -/* 80213A30 7F C4 F3 78 */ mr r4, r30 -/* 80213A34 81 83 00 00 */ lwz r12, 0(r3) -/* 80213A38 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80213A3C 7D 89 03 A6 */ mtctr r12 -/* 80213A40 4E 80 04 21 */ bctrl -/* 80213A44 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213A48 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7535@ha */ -/* 80213A4C 38 C4 75 35 */ addi r6, r4, 0x7535 /* 0x5F6A7535@l */ -/* 80213A50 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213A54 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213A58 81 83 00 00 */ lwz r12, 0(r3) -/* 80213A5C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213A60 7D 89 03 A6 */ mtctr r12 -/* 80213A64 4E 80 04 21 */ bctrl -/* 80213A68 38 80 00 40 */ li r4, 0x40 -/* 80213A6C 3C A0 80 3A */ lis r5, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 80213A70 38 A5 88 D0 */ addi r5, r5, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 80213A74 38 A5 00 EF */ addi r5, r5, 0xef -/* 80213A78 4C C6 31 82 */ crclr 6 -/* 80213A7C 48 0E CC D1 */ bl setString__10J2DTextBoxFsPCce -/* 80213A80 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213A84 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7536@ha */ -/* 80213A88 38 C4 75 36 */ addi r6, r4, 0x7536 /* 0x5F6A7536@l */ -/* 80213A8C 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213A90 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213A94 81 83 00 00 */ lwz r12, 0(r3) -/* 80213A98 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213A9C 7D 89 03 A6 */ mtctr r12 -/* 80213AA0 4E 80 04 21 */ bctrl -/* 80213AA4 38 80 00 40 */ li r4, 0x40 -/* 80213AA8 3C A0 80 3A */ lis r5, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 80213AAC 38 A5 88 D0 */ addi r5, r5, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 80213AB0 38 A5 00 EF */ addi r5, r5, 0xef -/* 80213AB4 4C C6 31 82 */ crclr 6 -/* 80213AB8 48 0E CC 95 */ bl setString__10J2DTextBoxFsPCce -/* 80213ABC 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213AC0 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7537@ha */ -/* 80213AC4 38 C4 75 37 */ addi r6, r4, 0x7537 /* 0x5F6A7537@l */ -/* 80213AC8 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213ACC 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213AD0 81 83 00 00 */ lwz r12, 0(r3) -/* 80213AD4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213AD8 7D 89 03 A6 */ mtctr r12 -/* 80213ADC 4E 80 04 21 */ bctrl -/* 80213AE0 38 80 00 40 */ li r4, 0x40 -/* 80213AE4 3C A0 80 3A */ lis r5, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 80213AE8 38 A5 88 D0 */ addi r5, r5, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 80213AEC 38 A5 00 EF */ addi r5, r5, 0xef -/* 80213AF0 4C C6 31 82 */ crclr 6 -/* 80213AF4 48 0E CC 59 */ bl setString__10J2DTextBoxFsPCce -/* 80213AF8 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213AFC 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7538@ha */ -/* 80213B00 38 C4 75 38 */ addi r6, r4, 0x7538 /* 0x5F6A7538@l */ -/* 80213B04 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213B08 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213B0C 81 83 00 00 */ lwz r12, 0(r3) -/* 80213B10 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213B14 7D 89 03 A6 */ mtctr r12 -/* 80213B18 4E 80 04 21 */ bctrl -/* 80213B1C 38 80 00 40 */ li r4, 0x40 -/* 80213B20 3C A0 80 3A */ lis r5, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 80213B24 38 A5 88 D0 */ addi r5, r5, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 80213B28 38 A5 00 EF */ addi r5, r5, 0xef -/* 80213B2C 4C C6 31 82 */ crclr 6 -/* 80213B30 48 0E CC 1D */ bl setString__10J2DTextBoxFsPCce -/* 80213B34 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213B38 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7539@ha */ -/* 80213B3C 38 C4 75 39 */ addi r6, r4, 0x7539 /* 0x5F6A7539@l */ -/* 80213B40 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213B44 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213B48 81 83 00 00 */ lwz r12, 0(r3) -/* 80213B4C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213B50 7D 89 03 A6 */ mtctr r12 -/* 80213B54 4E 80 04 21 */ bctrl -/* 80213B58 38 80 00 40 */ li r4, 0x40 -/* 80213B5C 3C A0 80 3A */ lis r5, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 80213B60 38 A5 88 D0 */ addi r5, r5, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 80213B64 38 A5 00 EF */ addi r5, r5, 0xef -/* 80213B68 4C C6 31 82 */ crclr 6 -/* 80213B6C 48 0E CB E1 */ bl setString__10J2DTextBoxFsPCce -/* 80213B70 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213B74 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7535@ha */ -/* 80213B78 38 C4 75 35 */ addi r6, r4, 0x7535 /* 0x5F6A7535@l */ -/* 80213B7C 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213B80 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213B84 81 83 00 00 */ lwz r12, 0(r3) -/* 80213B88 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213B8C 7D 89 03 A6 */ mtctr r12 -/* 80213B90 4E 80 04 21 */ bctrl -/* 80213B94 48 0E CA C5 */ bl getStringPtr__10J2DTextBoxCFv -/* 80213B98 7C 65 1B 78 */ mr r5, r3 -/* 80213B9C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80213BA0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80213BA4 38 80 00 62 */ li r4, 0x62 -/* 80213BA8 38 C0 00 00 */ li r6, 0 -/* 80213BAC 48 00 86 A5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80213BB0 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213BB4 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7536@ha */ -/* 80213BB8 38 C4 75 36 */ addi r6, r4, 0x7536 /* 0x5F6A7536@l */ -/* 80213BBC 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213BC0 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213BC4 81 83 00 00 */ lwz r12, 0(r3) -/* 80213BC8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213BCC 7D 89 03 A6 */ mtctr r12 -/* 80213BD0 4E 80 04 21 */ bctrl -/* 80213BD4 48 0E CA 85 */ bl getStringPtr__10J2DTextBoxCFv -/* 80213BD8 7C 65 1B 78 */ mr r5, r3 -/* 80213BDC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80213BE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80213BE4 38 80 00 62 */ li r4, 0x62 -/* 80213BE8 38 C0 00 00 */ li r6, 0 -/* 80213BEC 48 00 86 65 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80213BF0 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213BF4 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7537@ha */ -/* 80213BF8 38 C4 75 37 */ addi r6, r4, 0x7537 /* 0x5F6A7537@l */ -/* 80213BFC 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213C00 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213C04 81 83 00 00 */ lwz r12, 0(r3) -/* 80213C08 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213C0C 7D 89 03 A6 */ mtctr r12 -/* 80213C10 4E 80 04 21 */ bctrl -/* 80213C14 48 0E CA 45 */ bl getStringPtr__10J2DTextBoxCFv -/* 80213C18 7C 65 1B 78 */ mr r5, r3 -/* 80213C1C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80213C20 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80213C24 38 80 00 62 */ li r4, 0x62 -/* 80213C28 38 C0 00 00 */ li r6, 0 -/* 80213C2C 48 00 86 25 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80213C30 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213C34 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7538@ha */ -/* 80213C38 38 C4 75 38 */ addi r6, r4, 0x7538 /* 0x5F6A7538@l */ -/* 80213C3C 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213C40 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213C44 81 83 00 00 */ lwz r12, 0(r3) -/* 80213C48 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213C4C 7D 89 03 A6 */ mtctr r12 -/* 80213C50 4E 80 04 21 */ bctrl -/* 80213C54 48 0E CA 05 */ bl getStringPtr__10J2DTextBoxCFv -/* 80213C58 7C 65 1B 78 */ mr r5, r3 -/* 80213C5C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80213C60 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80213C64 38 80 00 62 */ li r4, 0x62 -/* 80213C68 38 C0 00 00 */ li r6, 0 -/* 80213C6C 48 00 85 E5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80213C70 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80213C74 3C 80 5F 6A */ lis r4, 0x5F6A /* 0x5F6A7539@ha */ -/* 80213C78 38 C4 75 39 */ addi r6, r4, 0x7539 /* 0x5F6A7539@l */ -/* 80213C7C 3C 80 63 6F */ lis r4, 0x636F /* 0x636F6E74@ha */ -/* 80213C80 38 A4 6E 74 */ addi r5, r4, 0x6E74 /* 0x636F6E74@l */ -/* 80213C84 81 83 00 00 */ lwz r12, 0(r3) -/* 80213C88 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213C8C 7D 89 03 A6 */ mtctr r12 -/* 80213C90 4E 80 04 21 */ bctrl -/* 80213C94 48 0E C9 C5 */ bl getStringPtr__10J2DTextBoxCFv -/* 80213C98 7C 65 1B 78 */ mr r5, r3 -/* 80213C9C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80213CA0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80213CA4 38 80 00 62 */ li r4, 0x62 -/* 80213CA8 38 C0 00 00 */ li r6, 0 -/* 80213CAC 48 00 85 A5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80213CB0 80 7F 03 68 */ lwz r3, 0x368(r31) -/* 80213CB4 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80213CB8 48 04 1B 19 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80213CBC 7F E3 FB 78 */ mr r3, r31 -/* 80213CC0 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80213CC4 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80213CC8 C0 24 04 00 */ lfs f1, 0x400(r4) -/* 80213CCC C0 44 04 04 */ lfs f2, 0x404(r4) -/* 80213CD0 48 00 45 85 */ bl drawButtonCross__13dMeter2Draw_cFff -/* 80213CD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80213CD8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80213CDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80213CE0 7C 08 03 A6 */ mtlr r0 -/* 80213CE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80213CE8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/initButton__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/initButton__13dMeter2Draw_cFv.s deleted file mode 100644 index 57608bff41..0000000000 --- a/asm/d/meter/d_meter2_draw/initButton__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,957 +0,0 @@ -lbl_802126E4: -/* 802126E4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802126E8 7C 08 02 A6 */ mflr r0 -/* 802126EC 90 01 00 74 */ stw r0, 0x74(r1) -/* 802126F0 39 61 00 70 */ addi r11, r1, 0x70 -/* 802126F4 48 14 FA CD */ bl _savegpr_22 -/* 802126F8 7C 7F 1B 78 */ mr r31, r3 -/* 802126FC 38 60 00 01 */ li r3, 1 -/* 80212700 98 7F 07 61 */ stb r3, 0x761(r31) -/* 80212704 98 7F 07 62 */ stb r3, 0x762(r31) -/* 80212708 98 7F 07 63 */ stb r3, 0x763(r31) -/* 8021270C 98 7F 07 64 */ stb r3, 0x764(r31) -/* 80212710 98 7F 07 65 */ stb r3, 0x765(r31) -/* 80212714 98 7F 07 66 */ stb r3, 0x766(r31) -/* 80212718 98 7F 07 67 */ stb r3, 0x767(r31) -/* 8021271C 38 80 00 00 */ li r4, 0 -/* 80212720 38 00 00 03 */ li r0, 3 -/* 80212724 7C 09 03 A6 */ mtctr r0 -lbl_80212728: -/* 80212728 38 04 07 68 */ addi r0, r4, 0x768 -/* 8021272C 7C 7F 01 AE */ stbx r3, r31, r0 -/* 80212730 38 84 00 01 */ addi r4, r4, 1 -/* 80212734 42 00 FF F4 */ bdnz lbl_80212728 -/* 80212738 3B 20 00 00 */ li r25, 0 -/* 8021273C 3B 60 00 00 */ li r27, 0 -lbl_80212740: -/* 80212740 3B A0 00 00 */ li r29, 0 -/* 80212744 3B 80 00 00 */ li r28, 0 -/* 80212748 7F 5F DA 14 */ add r26, r31, r27 -lbl_8021274C: -/* 8021274C 80 7F 00 74 */ lwz r3, 0x74(r31) -/* 80212750 38 80 0C 00 */ li r4, 0xc00 -/* 80212754 38 A0 00 20 */ li r5, 0x20 -/* 80212758 48 0B BD 7D */ bl alloc__7JKRHeapFUli -/* 8021275C 38 1C 04 E4 */ addi r0, r28, 0x4e4 -/* 80212760 7C 7A 01 2E */ stwx r3, r26, r0 -/* 80212764 3B BD 00 01 */ addi r29, r29, 1 -/* 80212768 2C 1D 00 02 */ cmpwi r29, 2 -/* 8021276C 3B 9C 00 04 */ addi r28, r28, 4 -/* 80212770 41 80 FF DC */ blt lbl_8021274C -/* 80212774 3B 39 00 01 */ addi r25, r25, 1 -/* 80212778 2C 19 00 02 */ cmpwi r25, 2 -/* 8021277C 3B 7B 00 08 */ addi r27, r27, 8 -/* 80212780 41 80 FF C0 */ blt lbl_80212740 -/* 80212784 3B 00 00 00 */ li r24, 0 -/* 80212788 3B 60 00 00 */ li r27, 0 -/* 8021278C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80212790 3B 43 01 88 */ addi r26, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_80212794: -/* 80212794 7F 43 D3 78 */ mr r3, r26 -/* 80212798 7F 04 C3 78 */ mr r4, r24 -/* 8021279C 48 00 A1 B5 */ bl isDirectUseItem__13dMeter2Info_cFi -/* 802127A0 7C 9F C2 14 */ add r4, r31, r24 -/* 802127A4 98 64 07 73 */ stb r3, 0x773(r4) -/* 802127A8 38 00 00 00 */ li r0, 0 -/* 802127AC 98 04 07 6C */ stb r0, 0x76c(r4) -/* 802127B0 3A E0 00 00 */ li r23, 0 -/* 802127B4 3B 80 00 00 */ li r28, 0 -/* 802127B8 7F 3F DA 14 */ add r25, r31, r27 -lbl_802127BC: -/* 802127BC 3A C0 00 00 */ li r22, 0 -/* 802127C0 3B A0 00 00 */ li r29, 0 -/* 802127C4 7F D9 E2 14 */ add r30, r25, r28 -lbl_802127C8: -/* 802127C8 80 7F 00 74 */ lwz r3, 0x74(r31) -/* 802127CC 38 80 0C 00 */ li r4, 0xc00 -/* 802127D0 38 A0 00 20 */ li r5, 0x20 -/* 802127D4 48 0B BD 01 */ bl alloc__7JKRHeapFUli -/* 802127D8 38 1D 04 F4 */ addi r0, r29, 0x4f4 -/* 802127DC 7C 7E 01 2E */ stwx r3, r30, r0 -/* 802127E0 3A D6 00 01 */ addi r22, r22, 1 -/* 802127E4 2C 16 00 02 */ cmpwi r22, 2 -/* 802127E8 3B BD 00 04 */ addi r29, r29, 4 -/* 802127EC 41 80 FF DC */ blt lbl_802127C8 -/* 802127F0 3A F7 00 01 */ addi r23, r23, 1 -/* 802127F4 2C 17 00 02 */ cmpwi r23, 2 -/* 802127F8 3B 9C 00 08 */ addi r28, r28, 8 -/* 802127FC 41 80 FF C0 */ blt lbl_802127BC -/* 80212800 3B 18 00 01 */ addi r24, r24, 1 -/* 80212804 2C 18 00 02 */ cmpwi r24, 2 -/* 80212808 3B 7B 00 10 */ addi r27, r27, 0x10 -/* 8021280C 41 80 FF 88 */ blt lbl_80212794 -/* 80212810 38 60 00 6C */ li r3, 0x6c -/* 80212814 48 0B C4 39 */ bl __nw__FUl -/* 80212818 7C 60 1B 79 */ or. r0, r3, r3 -/* 8021281C 41 82 00 28 */ beq lbl_80212844 -/* 80212820 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212824 3C A0 74 6D */ lis r5, 0x746D /* 0x746D5F70@ha */ -/* 80212828 38 C5 5F 70 */ addi r6, r5, 0x5F70 /* 0x746D5F70@l */ -/* 8021282C 3C A0 00 62 */ lis r5, 0x0062 /* 0x00625F69@ha */ -/* 80212830 38 A5 5F 69 */ addi r5, r5, 0x5F69 /* 0x00625F69@l */ -/* 80212834 38 E0 00 00 */ li r7, 0 -/* 80212838 39 00 00 00 */ li r8, 0 -/* 8021283C 48 04 11 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212840 7C 60 1B 78 */ mr r0, r3 -lbl_80212844: -/* 80212844 90 1F 03 28 */ stw r0, 0x328(r31) -/* 80212848 80 7F 03 28 */ lwz r3, 0x328(r31) -/* 8021284C 80 63 00 04 */ lwz r3, 4(r3) -/* 80212850 38 80 00 04 */ li r4, 4 -/* 80212854 48 0E 4E A5 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212858 80 7F 03 28 */ lwz r3, 0x328(r31) -/* 8021285C 48 04 2D 6D */ bl show__13CPaneMgrAlphaFv -/* 80212860 C0 02 AE 84 */ lfs f0, lit_4183(r2) -/* 80212864 D0 1F 07 28 */ stfs f0, 0x728(r31) -/* 80212868 D0 1F 07 34 */ stfs f0, 0x734(r31) -/* 8021286C 38 00 00 00 */ li r0, 0 -/* 80212870 98 1F 07 6B */ stb r0, 0x76b(r31) -/* 80212874 98 1F 07 6F */ stb r0, 0x76f(r31) -/* 80212878 38 00 00 FF */ li r0, 0xff -/* 8021287C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80212880 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80212884 98 03 00 17 */ stb r0, 0x17(r3) -/* 80212888 98 1F 07 70 */ stb r0, 0x770(r31) -/* 8021288C 88 03 00 17 */ lbz r0, 0x17(r3) -/* 80212890 98 1F 07 71 */ stb r0, 0x771(r31) -/* 80212894 38 60 01 50 */ li r3, 0x150 -/* 80212898 48 0B C3 B5 */ bl __nw__FUl -/* 8021289C 7C 7A 1B 79 */ or. r26, r3, r3 -/* 802128A0 41 82 00 68 */ beq lbl_80212908 -/* 802128A4 80 7F 03 28 */ lwz r3, 0x328(r31) -/* 802128A8 80 63 00 04 */ lwz r3, 4(r3) -/* 802128AC 38 80 00 00 */ li r4, 0 -/* 802128B0 81 83 00 00 */ lwz r12, 0(r3) -/* 802128B4 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 802128B8 7D 89 03 A6 */ mtctr r12 -/* 802128BC 4E 80 04 21 */ bctrl -/* 802128C0 81 03 00 20 */ lwz r8, 0x20(r3) -/* 802128C4 80 7F 03 28 */ lwz r3, 0x328(r31) -/* 802128C8 C0 23 00 38 */ lfs f1, 0x38(r3) -/* 802128CC C0 43 00 34 */ lfs f2, 0x34(r3) -/* 802128D0 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 802128D4 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 802128D8 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 802128DC D0 41 00 40 */ stfs f2, 0x40(r1) -/* 802128E0 D0 21 00 44 */ stfs f1, 0x44(r1) -/* 802128E4 7F 43 D3 78 */ mr r3, r26 -/* 802128E8 3C 80 6D 5F */ lis r4, 0x6D5F /* 0x6D5F7070@ha */ -/* 802128EC 38 C4 70 70 */ addi r6, r4, 0x7070 /* 0x6D5F7070@l */ -/* 802128F0 3C 80 62 5F */ lis r4, 0x625F /* 0x625F6974@ha */ -/* 802128F4 38 A4 69 74 */ addi r5, r4, 0x6974 /* 0x625F6974@l */ -/* 802128F8 38 E1 00 38 */ addi r7, r1, 0x38 -/* 802128FC 39 20 00 00 */ li r9, 0 -/* 80212900 48 0E 9F 01 */ bl func_802FC800 -/* 80212904 7C 7A 1B 78 */ mr r26, r3 -lbl_80212908: -/* 80212908 93 5F 05 14 */ stw r26, 0x514(r31) -/* 8021290C 80 7F 05 14 */ lwz r3, 0x514(r31) -/* 80212910 38 80 00 04 */ li r4, 4 -/* 80212914 48 0E 4D E5 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212918 80 7F 03 28 */ lwz r3, 0x328(r31) -/* 8021291C 80 63 00 04 */ lwz r3, 4(r3) -/* 80212920 80 9F 05 14 */ lwz r4, 0x514(r31) -/* 80212924 48 0E 3D 49 */ bl appendChild__7J2DPaneFP7J2DPane -/* 80212928 38 60 00 6C */ li r3, 0x6c -/* 8021292C 48 0B C3 21 */ bl __nw__FUl -/* 80212930 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212934 41 82 00 28 */ beq lbl_8021295C -/* 80212938 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 8021293C 3C A0 74 6D */ lis r5, 0x746D /* 0x746D5F70@ha */ -/* 80212940 38 C5 5F 70 */ addi r6, r5, 0x5F70 /* 0x746D5F70@l */ -/* 80212944 3C A0 00 78 */ lis r5, 0x0078 /* 0x00785F69@ha */ -/* 80212948 38 A5 5F 69 */ addi r5, r5, 0x5F69 /* 0x00785F69@l */ -/* 8021294C 38 E0 00 00 */ li r7, 0 -/* 80212950 39 00 00 00 */ li r8, 0 -/* 80212954 48 04 10 31 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212958 7C 60 1B 78 */ mr r0, r3 -lbl_8021295C: -/* 8021295C 90 1F 03 2C */ stw r0, 0x32c(r31) -/* 80212960 80 7F 03 2C */ lwz r3, 0x32c(r31) -/* 80212964 80 63 00 04 */ lwz r3, 4(r3) -/* 80212968 38 80 00 04 */ li r4, 4 -/* 8021296C 48 0E 4D 8D */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212970 80 1F 03 2C */ lwz r0, 0x32c(r31) -/* 80212974 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80212978 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021297C 90 03 00 28 */ stw r0, 0x28(r3) -/* 80212980 38 60 00 6C */ li r3, 0x6c -/* 80212984 48 0B C2 C9 */ bl __nw__FUl -/* 80212988 7C 60 1B 79 */ or. r0, r3, r3 -/* 8021298C 41 82 00 28 */ beq lbl_802129B4 -/* 80212990 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212994 3C A0 74 6D */ lis r5, 0x746D /* 0x746D5F70@ha */ -/* 80212998 38 C5 5F 70 */ addi r6, r5, 0x5F70 /* 0x746D5F70@l */ -/* 8021299C 3C A0 00 79 */ lis r5, 0x0079 /* 0x00795F69@ha */ -/* 802129A0 38 A5 5F 69 */ addi r5, r5, 0x5F69 /* 0x00795F69@l */ -/* 802129A4 38 E0 00 00 */ li r7, 0 -/* 802129A8 39 00 00 00 */ li r8, 0 -/* 802129AC 48 04 0F D9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802129B0 7C 60 1B 78 */ mr r0, r3 -lbl_802129B4: -/* 802129B4 90 1F 03 30 */ stw r0, 0x330(r31) -/* 802129B8 80 7F 03 30 */ lwz r3, 0x330(r31) -/* 802129BC 80 63 00 04 */ lwz r3, 4(r3) -/* 802129C0 38 80 00 04 */ li r4, 4 -/* 802129C4 48 0E 4D 35 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 802129C8 80 1F 03 30 */ lwz r0, 0x330(r31) -/* 802129CC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802129D0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802129D4 90 03 00 2C */ stw r0, 0x2c(r3) -/* 802129D8 38 00 00 00 */ li r0, 0 -/* 802129DC 90 1F 03 34 */ stw r0, 0x334(r31) -/* 802129E0 90 1F 03 38 */ stw r0, 0x338(r31) -/* 802129E4 38 60 01 50 */ li r3, 0x150 -/* 802129E8 48 0B C2 65 */ bl __nw__FUl -/* 802129EC 7C 7A 1B 79 */ or. r26, r3, r3 -/* 802129F0 41 82 00 68 */ beq lbl_80212A58 -/* 802129F4 80 7F 03 2C */ lwz r3, 0x32c(r31) -/* 802129F8 80 63 00 04 */ lwz r3, 4(r3) -/* 802129FC 38 80 00 00 */ li r4, 0 -/* 80212A00 81 83 00 00 */ lwz r12, 0(r3) -/* 80212A04 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 80212A08 7D 89 03 A6 */ mtctr r12 -/* 80212A0C 4E 80 04 21 */ bctrl -/* 80212A10 81 03 00 20 */ lwz r8, 0x20(r3) -/* 80212A14 80 7F 03 2C */ lwz r3, 0x32c(r31) -/* 80212A18 C0 23 00 38 */ lfs f1, 0x38(r3) -/* 80212A1C C0 43 00 34 */ lfs f2, 0x34(r3) -/* 80212A20 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80212A24 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80212A28 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80212A2C D0 41 00 30 */ stfs f2, 0x30(r1) -/* 80212A30 D0 21 00 34 */ stfs f1, 0x34(r1) -/* 80212A34 7F 43 D3 78 */ mr r3, r26 -/* 80212A38 3C 80 6D 5F */ lis r4, 0x6D5F /* 0x6D5F7070@ha */ -/* 80212A3C 38 C4 70 70 */ addi r6, r4, 0x7070 /* 0x6D5F7070@l */ -/* 80212A40 3C 80 78 5F */ lis r4, 0x785F /* 0x785F6974@ha */ -/* 80212A44 38 A4 69 74 */ addi r5, r4, 0x6974 /* 0x785F6974@l */ -/* 80212A48 38 E1 00 28 */ addi r7, r1, 0x28 -/* 80212A4C 39 20 00 00 */ li r9, 0 -/* 80212A50 48 0E 9D B1 */ bl func_802FC800 -/* 80212A54 7C 7A 1B 78 */ mr r26, r3 -lbl_80212A58: -/* 80212A58 93 5F 05 18 */ stw r26, 0x518(r31) -/* 80212A5C 80 7F 05 18 */ lwz r3, 0x518(r31) -/* 80212A60 38 80 00 04 */ li r4, 4 -/* 80212A64 48 0E 4C 95 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212A68 80 7F 03 2C */ lwz r3, 0x32c(r31) -/* 80212A6C 80 63 00 04 */ lwz r3, 4(r3) -/* 80212A70 80 9F 05 18 */ lwz r4, 0x518(r31) -/* 80212A74 48 0E 3B F9 */ bl appendChild__7J2DPaneFP7J2DPane -/* 80212A78 38 60 01 50 */ li r3, 0x150 -/* 80212A7C 48 0B C1 D1 */ bl __nw__FUl -/* 80212A80 7C 7A 1B 79 */ or. r26, r3, r3 -/* 80212A84 41 82 00 68 */ beq lbl_80212AEC -/* 80212A88 80 7F 03 30 */ lwz r3, 0x330(r31) -/* 80212A8C 80 63 00 04 */ lwz r3, 4(r3) -/* 80212A90 38 80 00 00 */ li r4, 0 -/* 80212A94 81 83 00 00 */ lwz r12, 0(r3) -/* 80212A98 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 80212A9C 7D 89 03 A6 */ mtctr r12 -/* 80212AA0 4E 80 04 21 */ bctrl -/* 80212AA4 81 03 00 20 */ lwz r8, 0x20(r3) -/* 80212AA8 80 7F 03 30 */ lwz r3, 0x330(r31) -/* 80212AAC C0 23 00 38 */ lfs f1, 0x38(r3) -/* 80212AB0 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 80212AB4 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80212AB8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80212ABC D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80212AC0 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80212AC4 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80212AC8 7F 43 D3 78 */ mr r3, r26 -/* 80212ACC 3C 80 6D 5F */ lis r4, 0x6D5F /* 0x6D5F7070@ha */ -/* 80212AD0 38 C4 70 70 */ addi r6, r4, 0x7070 /* 0x6D5F7070@l */ -/* 80212AD4 3C 80 79 5F */ lis r4, 0x795F /* 0x795F6974@ha */ -/* 80212AD8 38 A4 69 74 */ addi r5, r4, 0x6974 /* 0x795F6974@l */ -/* 80212ADC 38 E1 00 18 */ addi r7, r1, 0x18 -/* 80212AE0 39 20 00 00 */ li r9, 0 -/* 80212AE4 48 0E 9D 1D */ bl func_802FC800 -/* 80212AE8 7C 7A 1B 78 */ mr r26, r3 -lbl_80212AEC: -/* 80212AEC 93 5F 05 1C */ stw r26, 0x51c(r31) -/* 80212AF0 80 7F 05 1C */ lwz r3, 0x51c(r31) -/* 80212AF4 38 80 00 04 */ li r4, 4 -/* 80212AF8 48 0E 4C 01 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212AFC 80 7F 03 30 */ lwz r3, 0x330(r31) -/* 80212B00 80 63 00 04 */ lwz r3, 4(r3) -/* 80212B04 80 9F 05 1C */ lwz r4, 0x51c(r31) -/* 80212B08 48 0E 3B 65 */ bl appendChild__7J2DPaneFP7J2DPane -/* 80212B0C 38 60 00 6C */ li r3, 0x6c -/* 80212B10 48 0B C1 3D */ bl __nw__FUl -/* 80212B14 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212B18 41 82 00 28 */ beq lbl_80212B40 -/* 80212B1C 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212B20 3C A0 74 6D */ lis r5, 0x746D /* 0x746D5F70@ha */ -/* 80212B24 38 C5 5F 70 */ addi r6, r5, 0x5F70 /* 0x746D5F70@l */ -/* 80212B28 3C A0 00 72 */ lis r5, 0x0072 /* 0x00725F69@ha */ -/* 80212B2C 38 A5 5F 69 */ addi r5, r5, 0x5F69 /* 0x00725F69@l */ -/* 80212B30 38 E0 00 00 */ li r7, 0 -/* 80212B34 39 00 00 00 */ li r8, 0 -/* 80212B38 48 04 0E 4D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212B3C 7C 60 1B 78 */ mr r0, r3 -lbl_80212B40: -/* 80212B40 90 1F 03 34 */ stw r0, 0x334(r31) -/* 80212B44 80 7F 03 34 */ lwz r3, 0x334(r31) -/* 80212B48 80 63 00 04 */ lwz r3, 4(r3) -/* 80212B4C 38 80 00 04 */ li r4, 4 -/* 80212B50 48 0E 4B A9 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212B54 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 80212B58 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80212B5C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80212B60 90 03 00 30 */ stw r0, 0x30(r3) -/* 80212B64 38 60 01 50 */ li r3, 0x150 -/* 80212B68 48 0B C0 E5 */ bl __nw__FUl -/* 80212B6C 7C 7A 1B 79 */ or. r26, r3, r3 -/* 80212B70 41 82 00 68 */ beq lbl_80212BD8 -/* 80212B74 80 7F 03 34 */ lwz r3, 0x334(r31) -/* 80212B78 80 63 00 04 */ lwz r3, 4(r3) -/* 80212B7C 38 80 00 00 */ li r4, 0 -/* 80212B80 81 83 00 00 */ lwz r12, 0(r3) -/* 80212B84 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 80212B88 7D 89 03 A6 */ mtctr r12 -/* 80212B8C 4E 80 04 21 */ bctrl -/* 80212B90 81 03 00 20 */ lwz r8, 0x20(r3) -/* 80212B94 80 7F 03 34 */ lwz r3, 0x334(r31) -/* 80212B98 C0 23 00 38 */ lfs f1, 0x38(r3) -/* 80212B9C C0 43 00 34 */ lfs f2, 0x34(r3) -/* 80212BA0 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80212BA4 D0 01 00 08 */ stfs f0, 8(r1) -/* 80212BA8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80212BAC D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80212BB0 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80212BB4 7F 43 D3 78 */ mr r3, r26 -/* 80212BB8 3C 80 6D 5F */ lis r4, 0x6D5F /* 0x6D5F7070@ha */ -/* 80212BBC 38 C4 70 70 */ addi r6, r4, 0x7070 /* 0x6D5F7070@l */ -/* 80212BC0 3C 80 72 5F */ lis r4, 0x725F /* 0x725F6974@ha */ -/* 80212BC4 38 A4 69 74 */ addi r5, r4, 0x6974 /* 0x725F6974@l */ -/* 80212BC8 38 E1 00 08 */ addi r7, r1, 8 -/* 80212BCC 39 20 00 00 */ li r9, 0 -/* 80212BD0 48 0E 9C 31 */ bl func_802FC800 -/* 80212BD4 7C 7A 1B 78 */ mr r26, r3 -lbl_80212BD8: -/* 80212BD8 93 5F 05 20 */ stw r26, 0x520(r31) -/* 80212BDC 80 7F 05 20 */ lwz r3, 0x520(r31) -/* 80212BE0 38 80 00 04 */ li r4, 4 -/* 80212BE4 48 0E 4B 15 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212BE8 80 7F 03 34 */ lwz r3, 0x334(r31) -/* 80212BEC 80 63 00 04 */ lwz r3, 4(r3) -/* 80212BF0 80 9F 05 20 */ lwz r4, 0x520(r31) -/* 80212BF4 48 0E 3A 79 */ bl appendChild__7J2DPaneFP7J2DPane -/* 80212BF8 38 60 00 6C */ li r3, 0x6c -/* 80212BFC 48 0B C0 51 */ bl __nw__FUl -/* 80212C00 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212C04 41 82 00 28 */ beq lbl_80212C2C -/* 80212C08 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212C0C 3C A0 69 67 */ lis r5, 0x6967 /* 0x69676874@ha */ -/* 80212C10 38 C5 68 74 */ addi r6, r5, 0x6874 /* 0x69676874@l */ -/* 80212C14 3C A0 00 62 */ lis r5, 0x0062 /* 0x00625F6C@ha */ -/* 80212C18 38 A5 5F 6C */ addi r5, r5, 0x5F6C /* 0x00625F6C@l */ -/* 80212C1C 38 E0 00 00 */ li r7, 0 -/* 80212C20 39 00 00 00 */ li r8, 0 -/* 80212C24 48 04 0D 61 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212C28 7C 60 1B 78 */ mr r0, r3 -lbl_80212C2C: -/* 80212C2C 90 1F 03 18 */ stw r0, 0x318(r31) -/* 80212C30 80 7F 03 18 */ lwz r3, 0x318(r31) -/* 80212C34 80 63 00 04 */ lwz r3, 4(r3) -/* 80212C38 38 80 00 04 */ li r4, 4 -/* 80212C3C 48 0E 4A BD */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212C40 C0 02 AE 84 */ lfs f0, lit_4183(r2) -/* 80212C44 D0 1F 07 2C */ stfs f0, 0x72c(r31) -/* 80212C48 80 7F 03 18 */ lwz r3, 0x318(r31) -/* 80212C4C 48 04 29 BD */ bl hide__13CPaneMgrAlphaFv -/* 80212C50 38 60 00 6C */ li r3, 0x6c -/* 80212C54 48 0B BF F9 */ bl __nw__FUl -/* 80212C58 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212C5C 41 82 00 28 */ beq lbl_80212C84 -/* 80212C60 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212C64 3C A0 69 67 */ lis r5, 0x6967 /* 0x69676874@ha */ -/* 80212C68 38 C5 68 74 */ addi r6, r5, 0x6874 /* 0x69676874@l */ -/* 80212C6C 3C A0 00 78 */ lis r5, 0x0078 /* 0x00785F6C@ha */ -/* 80212C70 38 A5 5F 6C */ addi r5, r5, 0x5F6C /* 0x00785F6C@l */ -/* 80212C74 38 E0 00 00 */ li r7, 0 -/* 80212C78 39 00 00 00 */ li r8, 0 -/* 80212C7C 48 04 0D 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212C80 7C 60 1B 78 */ mr r0, r3 -lbl_80212C84: -/* 80212C84 90 1F 03 1C */ stw r0, 0x31c(r31) -/* 80212C88 80 7F 03 1C */ lwz r3, 0x31c(r31) -/* 80212C8C 80 63 00 04 */ lwz r3, 4(r3) -/* 80212C90 38 80 00 04 */ li r4, 4 -/* 80212C94 48 0E 4A 65 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212C98 80 7F 03 1C */ lwz r3, 0x31c(r31) -/* 80212C9C 48 04 29 6D */ bl hide__13CPaneMgrAlphaFv -/* 80212CA0 38 60 00 6C */ li r3, 0x6c -/* 80212CA4 48 0B BF A9 */ bl __nw__FUl -/* 80212CA8 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212CAC 41 82 00 28 */ beq lbl_80212CD4 -/* 80212CB0 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212CB4 3C A0 69 67 */ lis r5, 0x6967 /* 0x69676874@ha */ -/* 80212CB8 38 C5 68 74 */ addi r6, r5, 0x6874 /* 0x69676874@l */ -/* 80212CBC 3C A0 00 79 */ lis r5, 0x0079 /* 0x00795F6C@ha */ -/* 80212CC0 38 A5 5F 6C */ addi r5, r5, 0x5F6C /* 0x00795F6C@l */ -/* 80212CC4 38 E0 00 00 */ li r7, 0 -/* 80212CC8 39 00 00 00 */ li r8, 0 -/* 80212CCC 48 04 0C B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212CD0 7C 60 1B 78 */ mr r0, r3 -lbl_80212CD4: -/* 80212CD4 90 1F 03 20 */ stw r0, 0x320(r31) -/* 80212CD8 80 7F 03 20 */ lwz r3, 0x320(r31) -/* 80212CDC 80 63 00 04 */ lwz r3, 4(r3) -/* 80212CE0 38 80 00 04 */ li r4, 4 -/* 80212CE4 48 0E 4A 15 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212CE8 80 7F 03 20 */ lwz r3, 0x320(r31) -/* 80212CEC 48 04 29 1D */ bl hide__13CPaneMgrAlphaFv -/* 80212CF0 38 60 00 6C */ li r3, 0x6c -/* 80212CF4 48 0B BF 59 */ bl __nw__FUl -/* 80212CF8 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212CFC 41 82 00 28 */ beq lbl_80212D24 -/* 80212D00 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212D04 3C A0 69 67 */ lis r5, 0x6967 /* 0x69676874@ha */ -/* 80212D08 38 C5 68 74 */ addi r6, r5, 0x6874 /* 0x69676874@l */ -/* 80212D0C 3C A0 00 72 */ lis r5, 0x0072 /* 0x00725F6C@ha */ -/* 80212D10 38 A5 5F 6C */ addi r5, r5, 0x5F6C /* 0x00725F6C@l */ -/* 80212D14 38 E0 00 00 */ li r7, 0 -/* 80212D18 39 00 00 00 */ li r8, 0 -/* 80212D1C 48 04 0C 69 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212D20 7C 60 1B 78 */ mr r0, r3 -lbl_80212D24: -/* 80212D24 90 1F 03 24 */ stw r0, 0x324(r31) -/* 80212D28 80 7F 03 24 */ lwz r3, 0x324(r31) -/* 80212D2C 80 63 00 04 */ lwz r3, 4(r3) -/* 80212D30 38 80 00 04 */ li r4, 4 -/* 80212D34 48 0E 49 C5 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 80212D38 80 7F 03 24 */ lwz r3, 0x324(r31) -/* 80212D3C 48 04 28 CD */ bl hide__13CPaneMgrAlphaFv -/* 80212D40 38 60 00 6C */ li r3, 0x6c -/* 80212D44 48 0B BF 09 */ bl __nw__FUl -/* 80212D48 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212D4C 41 82 00 28 */ beq lbl_80212D74 -/* 80212D50 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212D54 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F61@ha */ -/* 80212D58 38 C5 5F 61 */ addi r6, r5, 0x5F61 /* 0x78745F61@l */ -/* 80212D5C 3C A0 62 5F */ lis r5, 0x625F /* 0x625F7465@ha */ -/* 80212D60 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x625F7465@l */ -/* 80212D64 38 E0 00 00 */ li r7, 0 -/* 80212D68 39 00 00 00 */ li r8, 0 -/* 80212D6C 48 04 0C 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212D70 7C 60 1B 78 */ mr r0, r3 -lbl_80212D74: -/* 80212D74 90 1F 03 38 */ stw r0, 0x338(r31) -/* 80212D78 38 60 00 6C */ li r3, 0x6c -/* 80212D7C 48 0B BE D1 */ bl __nw__FUl -/* 80212D80 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212D84 41 82 00 28 */ beq lbl_80212DAC -/* 80212D88 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212D8C 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F62@ha */ -/* 80212D90 38 C5 5F 62 */ addi r6, r5, 0x5F62 /* 0x78745F62@l */ -/* 80212D94 3C A0 62 5F */ lis r5, 0x625F /* 0x625F7465@ha */ -/* 80212D98 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x625F7465@l */ -/* 80212D9C 38 E0 00 00 */ li r7, 0 -/* 80212DA0 39 00 00 00 */ li r8, 0 -/* 80212DA4 48 04 0B E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212DA8 7C 60 1B 78 */ mr r0, r3 -lbl_80212DAC: -/* 80212DAC 90 1F 03 3C */ stw r0, 0x33c(r31) -/* 80212DB0 38 60 00 6C */ li r3, 0x6c -/* 80212DB4 48 0B BE 99 */ bl __nw__FUl -/* 80212DB8 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212DBC 41 82 00 28 */ beq lbl_80212DE4 -/* 80212DC0 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212DC4 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F78@ha */ -/* 80212DC8 38 C5 5F 78 */ addi r6, r5, 0x5F78 /* 0x78745F78@l */ -/* 80212DCC 3C A0 62 5F */ lis r5, 0x625F /* 0x625F7465@ha */ -/* 80212DD0 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x625F7465@l */ -/* 80212DD4 38 E0 00 00 */ li r7, 0 -/* 80212DD8 39 00 00 00 */ li r8, 0 -/* 80212DDC 48 04 0B A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212DE0 7C 60 1B 78 */ mr r0, r3 -lbl_80212DE4: -/* 80212DE4 90 1F 03 40 */ stw r0, 0x340(r31) -/* 80212DE8 38 60 00 6C */ li r3, 0x6c -/* 80212DEC 48 0B BE 61 */ bl __nw__FUl -/* 80212DF0 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212DF4 41 82 00 28 */ beq lbl_80212E1C -/* 80212DF8 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212DFC 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F79@ha */ -/* 80212E00 38 C5 5F 79 */ addi r6, r5, 0x5F79 /* 0x78745F79@l */ -/* 80212E04 3C A0 62 5F */ lis r5, 0x625F /* 0x625F7465@ha */ -/* 80212E08 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x625F7465@l */ -/* 80212E0C 38 E0 00 00 */ li r7, 0 -/* 80212E10 39 00 00 00 */ li r8, 0 -/* 80212E14 48 04 0B 71 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212E18 7C 60 1B 78 */ mr r0, r3 -lbl_80212E1C: -/* 80212E1C 90 1F 03 44 */ stw r0, 0x344(r31) -/* 80212E20 38 00 00 00 */ li r0, 0 -/* 80212E24 90 1F 03 48 */ stw r0, 0x348(r31) -/* 80212E28 38 60 00 6C */ li r3, 0x6c -/* 80212E2C 48 0B BE 21 */ bl __nw__FUl -/* 80212E30 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212E34 41 82 00 28 */ beq lbl_80212E5C -/* 80212E38 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212E3C 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F6E@ha */ -/* 80212E40 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x78745F6E@l */ -/* 80212E44 3C A0 61 5F */ lis r5, 0x615F /* 0x615F7465@ha */ -/* 80212E48 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x615F7465@l */ -/* 80212E4C 38 E0 00 00 */ li r7, 0 -/* 80212E50 39 00 00 00 */ li r8, 0 -/* 80212E54 48 04 0B 31 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212E58 7C 60 1B 78 */ mr r0, r3 -lbl_80212E5C: -/* 80212E5C 90 1F 03 4C */ stw r0, 0x34c(r31) -/* 80212E60 38 60 00 6C */ li r3, 0x6c -/* 80212E64 48 0B BD E9 */ bl __nw__FUl -/* 80212E68 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212E6C 41 82 00 28 */ beq lbl_80212E94 -/* 80212E70 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212E74 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F6E@ha */ -/* 80212E78 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x78745F6E@l */ -/* 80212E7C 3C A0 62 5F */ lis r5, 0x625F /* 0x625F7465@ha */ -/* 80212E80 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x625F7465@l */ -/* 80212E84 38 E0 00 00 */ li r7, 0 -/* 80212E88 39 00 00 00 */ li r8, 0 -/* 80212E8C 48 04 0A F9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212E90 7C 60 1B 78 */ mr r0, r3 -lbl_80212E94: -/* 80212E94 90 1F 03 50 */ stw r0, 0x350(r31) -/* 80212E98 38 60 00 6C */ li r3, 0x6c -/* 80212E9C 48 0B BD B1 */ bl __nw__FUl -/* 80212EA0 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212EA4 41 82 00 28 */ beq lbl_80212ECC -/* 80212EA8 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212EAC 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F6E@ha */ -/* 80212EB0 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x78745F6E@l */ -/* 80212EB4 3C A0 7A 5F */ lis r5, 0x7A5F /* 0x7A5F7465@ha */ -/* 80212EB8 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x7A5F7465@l */ -/* 80212EBC 38 E0 00 00 */ li r7, 0 -/* 80212EC0 39 00 00 00 */ li r8, 0 -/* 80212EC4 48 04 0A C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212EC8 7C 60 1B 78 */ mr r0, r3 -lbl_80212ECC: -/* 80212ECC 90 1F 03 5C */ stw r0, 0x35c(r31) -/* 80212ED0 38 60 00 6C */ li r3, 0x6c -/* 80212ED4 48 0B BD 79 */ bl __nw__FUl -/* 80212ED8 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212EDC 41 82 00 28 */ beq lbl_80212F04 -/* 80212EE0 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212EE4 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F6E@ha */ -/* 80212EE8 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x78745F6E@l */ -/* 80212EEC 3C A0 78 5F */ lis r5, 0x785F /* 0x785F7465@ha */ -/* 80212EF0 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x785F7465@l */ -/* 80212EF4 38 E0 00 00 */ li r7, 0 -/* 80212EF8 39 00 00 00 */ li r8, 0 -/* 80212EFC 48 04 0A 89 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212F00 7C 60 1B 78 */ mr r0, r3 -lbl_80212F04: -/* 80212F04 90 1F 03 54 */ stw r0, 0x354(r31) -/* 80212F08 38 60 00 6C */ li r3, 0x6c -/* 80212F0C 48 0B BD 41 */ bl __nw__FUl -/* 80212F10 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212F14 41 82 00 28 */ beq lbl_80212F3C -/* 80212F18 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212F1C 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F6E@ha */ -/* 80212F20 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x78745F6E@l */ -/* 80212F24 3C A0 79 5F */ lis r5, 0x795F /* 0x795F7465@ha */ -/* 80212F28 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x795F7465@l */ -/* 80212F2C 38 E0 00 00 */ li r7, 0 -/* 80212F30 39 00 00 00 */ li r8, 0 -/* 80212F34 48 04 0A 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212F38 7C 60 1B 78 */ mr r0, r3 -lbl_80212F3C: -/* 80212F3C 90 1F 03 58 */ stw r0, 0x358(r31) -/* 80212F40 38 60 00 6C */ li r3, 0x6c -/* 80212F44 48 0B BD 09 */ bl __nw__FUl -/* 80212F48 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212F4C 41 82 00 28 */ beq lbl_80212F74 -/* 80212F50 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212F54 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F6E@ha */ -/* 80212F58 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x78745F6E@l */ -/* 80212F5C 3C A0 69 5F */ lis r5, 0x695F /* 0x695F7465@ha */ -/* 80212F60 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x695F7465@l */ -/* 80212F64 38 E0 00 02 */ li r7, 2 -/* 80212F68 39 00 00 00 */ li r8, 0 -/* 80212F6C 48 04 0A 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212F70 7C 60 1B 78 */ mr r0, r3 -lbl_80212F74: -/* 80212F74 90 1F 03 60 */ stw r0, 0x360(r31) -/* 80212F78 38 60 00 6C */ li r3, 0x6c -/* 80212F7C 48 0B BC D1 */ bl __nw__FUl -/* 80212F80 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212F84 41 82 00 28 */ beq lbl_80212FAC -/* 80212F88 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212F8C 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F6E@ha */ -/* 80212F90 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x78745F6E@l */ -/* 80212F94 3C A0 6D 5F */ lis r5, 0x6D5F /* 0x6D5F7465@ha */ -/* 80212F98 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x6D5F7465@l */ -/* 80212F9C 38 E0 00 02 */ li r7, 2 -/* 80212FA0 39 00 00 00 */ li r8, 0 -/* 80212FA4 48 04 09 E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212FA8 7C 60 1B 78 */ mr r0, r3 -lbl_80212FAC: -/* 80212FAC 90 1F 03 64 */ stw r0, 0x364(r31) -/* 80212FB0 3B A0 00 00 */ li r29, 0 -/* 80212FB4 3B 80 00 00 */ li r28, 0 -/* 80212FB8 3B 60 00 00 */ li r27, 0 -/* 80212FBC 3C 60 80 3A */ lis r3, juji_i_tag@ha /* 0x80398828@ha */ -/* 80212FC0 3B C3 88 28 */ addi r30, r3, juji_i_tag@l /* 0x80398828@l */ -/* 80212FC4 3C 60 80 3A */ lis r3, juji_m_tag@ha /* 0x80398850@ha */ -/* 80212FC8 3B 43 88 50 */ addi r26, r3, juji_m_tag@l /* 0x80398850@l */ -lbl_80212FCC: -/* 80212FCC 7F 3E DA 14 */ add r25, r30, r27 -/* 80212FD0 80 19 00 00 */ lwz r0, 0(r25) -/* 80212FD4 80 79 00 04 */ lwz r3, 4(r25) -/* 80212FD8 38 80 00 00 */ li r4, 0 -/* 80212FDC 7C 63 22 78 */ xor r3, r3, r4 -/* 80212FE0 7C 00 22 78 */ xor r0, r0, r4 -/* 80212FE4 7C 60 03 79 */ or. r0, r3, r0 -/* 80212FE8 41 82 00 3C */ beq lbl_80213024 -/* 80212FEC 38 60 00 6C */ li r3, 0x6c -/* 80212FF0 48 0B BC 5D */ bl __nw__FUl -/* 80212FF4 7C 64 1B 79 */ or. r4, r3, r3 -/* 80212FF8 41 82 00 20 */ beq lbl_80213018 -/* 80212FFC 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80213000 80 B9 00 00 */ lwz r5, 0(r25) -/* 80213004 80 D9 00 04 */ lwz r6, 4(r25) -/* 80213008 38 E0 00 00 */ li r7, 0 -/* 8021300C 39 00 00 00 */ li r8, 0 -/* 80213010 48 04 09 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80213014 7C 64 1B 78 */ mr r4, r3 -lbl_80213018: -/* 80213018 38 1C 04 90 */ addi r0, r28, 0x490 -/* 8021301C 7C 9F 01 2E */ stwx r4, r31, r0 -/* 80213020 48 00 00 0C */ b lbl_8021302C -lbl_80213024: -/* 80213024 38 1C 04 90 */ addi r0, r28, 0x490 -/* 80213028 7C 9F 01 2E */ stwx r4, r31, r0 -lbl_8021302C: -/* 8021302C 7F 3A DA 14 */ add r25, r26, r27 -/* 80213030 80 19 00 00 */ lwz r0, 0(r25) -/* 80213034 80 79 00 04 */ lwz r3, 4(r25) -/* 80213038 38 80 00 00 */ li r4, 0 -/* 8021303C 7C 63 22 78 */ xor r3, r3, r4 -/* 80213040 7C 00 22 78 */ xor r0, r0, r4 -/* 80213044 7C 60 03 79 */ or. r0, r3, r0 -/* 80213048 41 82 00 3C */ beq lbl_80213084 -/* 8021304C 38 60 00 6C */ li r3, 0x6c -/* 80213050 48 0B BB FD */ bl __nw__FUl -/* 80213054 7C 64 1B 79 */ or. r4, r3, r3 -/* 80213058 41 82 00 20 */ beq lbl_80213078 -/* 8021305C 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80213060 80 B9 00 00 */ lwz r5, 0(r25) -/* 80213064 80 D9 00 04 */ lwz r6, 4(r25) -/* 80213068 38 E0 00 00 */ li r7, 0 -/* 8021306C 39 00 00 00 */ li r8, 0 -/* 80213070 48 04 09 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80213074 7C 64 1B 78 */ mr r4, r3 -lbl_80213078: -/* 80213078 38 1C 04 A4 */ addi r0, r28, 0x4a4 -/* 8021307C 7C 9F 01 2E */ stwx r4, r31, r0 -/* 80213080 48 00 00 0C */ b lbl_8021308C -lbl_80213084: -/* 80213084 38 1C 04 A4 */ addi r0, r28, 0x4a4 -/* 80213088 7C 9F 01 2E */ stwx r4, r31, r0 -lbl_8021308C: -/* 8021308C 3B BD 00 01 */ addi r29, r29, 1 -/* 80213090 2C 1D 00 05 */ cmpwi r29, 5 -/* 80213094 3B 9C 00 04 */ addi r28, r28, 4 -/* 80213098 3B 7B 00 08 */ addi r27, r27, 8 -/* 8021309C 41 80 FF 30 */ blt lbl_80212FCC -/* 802130A0 80 7F 03 54 */ lwz r3, 0x354(r31) -/* 802130A4 48 04 25 65 */ bl hide__13CPaneMgrAlphaFv -/* 802130A8 80 7F 03 58 */ lwz r3, 0x358(r31) -/* 802130AC 48 04 25 5D */ bl hide__13CPaneMgrAlphaFv -/* 802130B0 38 60 00 6C */ li r3, 0x6c -/* 802130B4 48 0B BB 99 */ bl __nw__FUl -/* 802130B8 7C 60 1B 79 */ or. r0, r3, r3 -/* 802130BC 41 82 00 24 */ beq lbl_802130E0 -/* 802130C0 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 802130C4 3C A0 6E 74 */ lis r5, 0x6E74 /* 0x6E745F6E@ha */ -/* 802130C8 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x6E745F6E@l */ -/* 802130CC 38 A0 63 6F */ li r5, 0x636f -/* 802130D0 38 E0 00 02 */ li r7, 2 -/* 802130D4 39 00 00 00 */ li r8, 0 -/* 802130D8 48 04 08 AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802130DC 7C 60 1B 78 */ mr r0, r3 -lbl_802130E0: -/* 802130E0 90 1F 02 F8 */ stw r0, 0x2f8(r31) -/* 802130E4 38 60 00 6C */ li r3, 0x6c -/* 802130E8 48 0B BB 65 */ bl __nw__FUl -/* 802130EC 7C 60 1B 79 */ or. r0, r3, r3 -/* 802130F0 41 82 00 24 */ beq lbl_80213114 -/* 802130F4 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 802130F8 3C A0 74 6E */ lis r5, 0x746E /* 0x746E5F6E@ha */ -/* 802130FC 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x746E5F6E@l */ -/* 80213100 38 A0 61 62 */ li r5, 0x6162 -/* 80213104 38 E0 00 02 */ li r7, 2 -/* 80213108 39 00 00 00 */ li r8, 0 -/* 8021310C 48 04 08 79 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80213110 7C 60 1B 78 */ mr r0, r3 -lbl_80213114: -/* 80213114 90 1F 03 00 */ stw r0, 0x300(r31) -/* 80213118 38 60 00 6C */ li r3, 0x6c -/* 8021311C 48 0B BB 31 */ bl __nw__FUl -/* 80213120 7C 60 1B 79 */ or. r0, r3, r3 -/* 80213124 41 82 00 24 */ beq lbl_80213148 -/* 80213128 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 8021312C 3C A0 74 6E */ lis r5, 0x746E /* 0x746E5F6E@ha */ -/* 80213130 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x746E5F6E@l */ -/* 80213134 38 A0 62 62 */ li r5, 0x6262 -/* 80213138 38 E0 00 02 */ li r7, 2 -/* 8021313C 39 00 00 00 */ li r8, 0 -/* 80213140 48 04 08 45 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80213144 7C 60 1B 78 */ mr r0, r3 -lbl_80213148: -/* 80213148 90 1F 03 04 */ stw r0, 0x304(r31) -/* 8021314C C0 02 AE 84 */ lfs f0, lit_4183(r2) -/* 80213150 D0 1F 07 30 */ stfs f0, 0x730(r31) -/* 80213154 38 60 00 6C */ li r3, 0x6c -/* 80213158 48 0B BA F5 */ bl __nw__FUl -/* 8021315C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80213160 41 82 00 28 */ beq lbl_80213188 -/* 80213164 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80213168 3C A0 6E 61 */ lis r5, 0x6E61 /* 0x6E615F6E@ha */ -/* 8021316C 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x6E615F6E@l */ -/* 80213170 3C A0 6D 69 */ lis r5, 0x6D69 /* 0x6D69646F@ha */ -/* 80213174 38 A5 64 6F */ addi r5, r5, 0x646F /* 0x6D69646F@l */ -/* 80213178 38 E0 00 02 */ li r7, 2 -/* 8021317C 39 00 00 00 */ li r8, 0 -/* 80213180 48 04 08 05 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80213184 7C 60 1B 78 */ mr r0, r3 -lbl_80213188: -/* 80213188 90 1F 03 08 */ stw r0, 0x308(r31) -/* 8021318C C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80213190 D0 1F 07 20 */ stfs f0, 0x720(r31) -/* 80213194 D0 1F 07 24 */ stfs f0, 0x724(r31) -/* 80213198 D0 1F 07 38 */ stfs f0, 0x738(r31) -/* 8021319C 38 00 00 00 */ li r0, 0 -/* 802131A0 B0 1F 07 40 */ sth r0, 0x740(r31) -/* 802131A4 38 60 00 6C */ li r3, 0x6c -/* 802131A8 48 0B BA A5 */ bl __nw__FUl -/* 802131AC 7C 60 1B 79 */ or. r0, r3, r3 -/* 802131B0 41 82 00 24 */ beq lbl_802131D4 -/* 802131B4 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 802131B8 3C A0 74 6E */ lis r5, 0x746E /* 0x746E5F6E@ha */ -/* 802131BC 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x746E5F6E@l */ -/* 802131C0 38 A0 78 62 */ li r5, 0x7862 -/* 802131C4 38 E0 00 02 */ li r7, 2 -/* 802131C8 39 00 00 00 */ li r8, 0 -/* 802131CC 48 04 07 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802131D0 7C 60 1B 78 */ mr r0, r3 -lbl_802131D4: -/* 802131D4 90 1F 03 0C */ stw r0, 0x30c(r31) -/* 802131D8 38 60 00 6C */ li r3, 0x6c -/* 802131DC 48 0B BA 71 */ bl __nw__FUl -/* 802131E0 7C 60 1B 79 */ or. r0, r3, r3 -/* 802131E4 41 82 00 24 */ beq lbl_80213208 -/* 802131E8 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 802131EC 3C A0 74 6E */ lis r5, 0x746E /* 0x746E5F6E@ha */ -/* 802131F0 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x746E5F6E@l */ -/* 802131F4 38 A0 79 62 */ li r5, 0x7962 -/* 802131F8 38 E0 00 02 */ li r7, 2 -/* 802131FC 39 00 00 00 */ li r8, 0 -/* 80213200 48 04 07 85 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80213204 7C 60 1B 78 */ mr r0, r3 -lbl_80213208: -/* 80213208 90 1F 03 10 */ stw r0, 0x310(r31) -/* 8021320C 38 60 00 6C */ li r3, 0x6c -/* 80213210 48 0B BA 3D */ bl __nw__FUl -/* 80213214 7C 60 1B 79 */ or. r0, r3, r3 -/* 80213218 41 82 00 24 */ beq lbl_8021323C -/* 8021321C 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80213220 3C A0 74 6E */ lis r5, 0x746E /* 0x746E5F6E@ha */ -/* 80213224 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x746E5F6E@l */ -/* 80213228 38 A0 7A 62 */ li r5, 0x7a62 -/* 8021322C 38 E0 00 02 */ li r7, 2 -/* 80213230 39 00 00 00 */ li r8, 0 -/* 80213234 48 04 07 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80213238 7C 60 1B 78 */ mr r0, r3 -lbl_8021323C: -/* 8021323C 90 1F 03 14 */ stw r0, 0x314(r31) -/* 80213240 38 60 00 1C */ li r3, 0x1c -/* 80213244 48 0B BA 09 */ bl __nw__FUl -/* 80213248 7C 60 1B 79 */ or. r0, r3, r3 -/* 8021324C 41 82 00 24 */ beq lbl_80213270 -/* 80213250 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80213254 3C A0 7A 75 */ lis r5, 0x7A75 /* 0x7A755F6E@ha */ -/* 80213258 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x7A755F6E@l */ -/* 8021325C 38 A0 00 75 */ li r5, 0x75 -/* 80213260 38 E0 00 02 */ li r7, 2 -/* 80213264 39 00 00 00 */ li r8, 0 -/* 80213268 48 04 21 95 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 8021326C 7C 60 1B 78 */ mr r0, r3 -lbl_80213270: -/* 80213270 90 1F 04 B8 */ stw r0, 0x4b8(r31) -/* 80213274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80213278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021327C 83 43 5D 30 */ lwz r26, 0x5d30(r3) -/* 80213280 38 60 00 00 */ li r3, 0 -/* 80213284 48 00 B0 45 */ bl dMeter2Info_getNumberTextureName__Fi -/* 80213288 7C 65 1B 78 */ mr r5, r3 -/* 8021328C 7F 43 D3 78 */ mr r3, r26 -/* 80213290 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 80213294 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 80213298 81 9A 00 00 */ lwz r12, 0(r26) -/* 8021329C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802132A0 7D 89 03 A6 */ mtctr r12 -/* 802132A4 4E 80 04 21 */ bctrl -/* 802132A8 7C 76 1B 78 */ mr r22, r3 -/* 802132AC 3A E0 00 00 */ li r23, 0 -/* 802132B0 3B A0 00 00 */ li r29, 0 -lbl_802132B4: -/* 802132B4 3B 00 00 00 */ li r24, 0 -/* 802132B8 3B C0 00 00 */ li r30, 0 -/* 802132BC 7F 3F EA 14 */ add r25, r31, r29 -lbl_802132C0: -/* 802132C0 38 60 01 50 */ li r3, 0x150 -/* 802132C4 48 0B B9 89 */ bl __nw__FUl -/* 802132C8 7C 64 1B 79 */ or. r4, r3, r3 -/* 802132CC 41 82 00 10 */ beq lbl_802132DC -/* 802132D0 7E C4 B3 78 */ mr r4, r22 -/* 802132D4 48 0E 94 35 */ bl __ct__10J2DPictureFPC7ResTIMG -/* 802132D8 7C 64 1B 78 */ mr r4, r3 -lbl_802132DC: -/* 802132DC 38 1E 00 84 */ addi r0, r30, 0x84 -/* 802132E0 7C 99 01 2E */ stwx r4, r25, r0 -/* 802132E4 3B 18 00 01 */ addi r24, r24, 1 -/* 802132E8 2C 18 00 03 */ cmpwi r24, 3 -/* 802132EC 3B DE 00 04 */ addi r30, r30, 4 -/* 802132F0 41 80 FF D0 */ blt lbl_802132C0 -/* 802132F4 3A F7 00 01 */ addi r23, r23, 1 -/* 802132F8 2C 17 00 02 */ cmpwi r23, 2 -/* 802132FC 3B BD 00 0C */ addi r29, r29, 0xc -/* 80213300 41 80 FF B4 */ blt lbl_802132B4 -/* 80213304 38 00 00 28 */ li r0, 0x28 -/* 80213308 98 1F 07 6F */ stb r0, 0x76f(r31) -/* 8021330C 7F E3 FB 78 */ mr r3, r31 -/* 80213310 88 9F 07 6F */ lbz r4, 0x76f(r31) -/* 80213314 48 00 71 55 */ bl changeTextureItemB__13dMeter2Draw_cFUc -/* 80213318 38 E0 00 00 */ li r7, 0 -/* 8021331C 38 60 00 00 */ li r3, 0 -/* 80213320 38 A0 00 00 */ li r5, 0 -lbl_80213324: -/* 80213324 38 80 00 00 */ li r4, 0 -/* 80213328 7C DF 1A 14 */ add r6, r31, r3 -/* 8021332C 38 00 00 02 */ li r0, 2 -/* 80213330 7C 09 03 A6 */ mtctr r0 -lbl_80213334: -/* 80213334 38 04 05 24 */ addi r0, r4, 0x524 -/* 80213338 7C A6 01 2E */ stwx r5, r6, r0 -/* 8021333C 38 84 00 04 */ addi r4, r4, 4 -/* 80213340 42 00 FF F4 */ bdnz lbl_80213334 -/* 80213344 38 E7 00 01 */ addi r7, r7, 1 -/* 80213348 2C 07 00 02 */ cmpwi r7, 2 -/* 8021334C 38 63 00 08 */ addi r3, r3, 8 -/* 80213350 41 80 FF D4 */ blt lbl_80213324 -/* 80213354 38 60 00 00 */ li r3, 0 -/* 80213358 38 80 00 00 */ li r4, 0 -/* 8021335C 38 00 00 03 */ li r0, 3 -/* 80213360 7C 09 03 A6 */ mtctr r0 -lbl_80213364: -/* 80213364 38 03 00 9C */ addi r0, r3, 0x9c -/* 80213368 7C 9F 01 2E */ stwx r4, r31, r0 -/* 8021336C 38 63 00 04 */ addi r3, r3, 4 -/* 80213370 42 00 FF F4 */ bdnz lbl_80213364 -/* 80213374 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80213378 D0 1F 05 60 */ stfs f0, 0x560(r31) -/* 8021337C D0 1F 05 5C */ stfs f0, 0x55c(r31) -/* 80213380 D0 1F 05 68 */ stfs f0, 0x568(r31) -/* 80213384 D0 1F 05 64 */ stfs f0, 0x564(r31) -/* 80213388 D0 1F 05 6C */ stfs f0, 0x56c(r31) -/* 8021338C D0 1F 05 74 */ stfs f0, 0x574(r31) -/* 80213390 D0 1F 05 70 */ stfs f0, 0x570(r31) -/* 80213394 D0 1F 05 7C */ stfs f0, 0x57c(r31) -/* 80213398 D0 1F 05 78 */ stfs f0, 0x578(r31) -/* 8021339C D0 1F 05 80 */ stfs f0, 0x580(r31) -/* 802133A0 38 00 00 00 */ li r0, 0 -/* 802133A4 B0 1F 07 54 */ sth r0, 0x754(r31) -/* 802133A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802133AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802133B0 8B 43 5E 5C */ lbz r26, 0x5e5c(r3) -/* 802133B4 38 60 00 00 */ li r3, 0 -/* 802133B8 4B E1 AB 65 */ bl dComIfGp_getSelectItem__Fi -/* 802133BC 7C 65 1B 78 */ mr r5, r3 -/* 802133C0 7F E3 FB 78 */ mr r3, r31 -/* 802133C4 38 80 00 00 */ li r4, 0 -/* 802133C8 7F 46 D3 78 */ mr r6, r26 -/* 802133CC 38 E0 00 01 */ li r7, 1 -/* 802133D0 39 00 00 00 */ li r8, 0 -/* 802133D4 48 00 46 E1 */ bl drawButtonXY__13dMeter2Draw_cFiUcUcbb -/* 802133D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802133DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802133E0 8B 43 5E 60 */ lbz r26, 0x5e60(r3) -/* 802133E4 38 60 00 01 */ li r3, 1 -/* 802133E8 4B E1 AB 35 */ bl dComIfGp_getSelectItem__Fi -/* 802133EC 7C 65 1B 78 */ mr r5, r3 -/* 802133F0 7F E3 FB 78 */ mr r3, r31 -/* 802133F4 38 80 00 01 */ li r4, 1 -/* 802133F8 7F 46 D3 78 */ mr r6, r26 -/* 802133FC 38 E0 00 01 */ li r7, 1 -/* 80213400 39 00 00 00 */ li r8, 0 -/* 80213404 48 00 46 B1 */ bl drawButtonXY__13dMeter2Draw_cFiUcUcbb -/* 80213408 7F E3 FB 78 */ mr r3, r31 -/* 8021340C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80213410 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80213414 88 84 5E 24 */ lbz r4, 0x5e24(r4) -/* 80213418 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 8021341C FC 40 08 90 */ fmr f2, f1 -/* 80213420 FC 60 08 90 */ fmr f3, f1 -/* 80213424 FC 80 08 90 */ fmr f4, f1 -/* 80213428 C0 A2 AE 84 */ lfs f5, lit_4183(r2) -/* 8021342C 38 A0 00 00 */ li r5, 0 -/* 80213430 38 C0 00 00 */ li r6, 0 -/* 80213434 48 00 39 79 */ bl drawButtonA__13dMeter2Draw_cFUcfffffbb -/* 80213438 7F E3 FB 78 */ mr r3, r31 -/* 8021343C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80213440 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80213444 88 84 5E 1D */ lbz r4, 0x5e1d(r4) -/* 80213448 38 A0 00 01 */ li r5, 1 -/* 8021344C C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80213450 FC 40 08 90 */ fmr f2, f1 -/* 80213454 FC 60 08 90 */ fmr f3, f1 -/* 80213458 FC 80 08 90 */ fmr f4, f1 -/* 8021345C C0 A2 AE 84 */ lfs f5, lit_4183(r2) -/* 80213460 38 C0 00 00 */ li r6, 0 -/* 80213464 48 00 3C 81 */ bl drawButtonB__13dMeter2Draw_cFUcbfffffb -/* 80213468 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021346C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80213470 88 85 00 16 */ lbz r4, 0x16(r5) -/* 80213474 7F E3 FB 78 */ mr r3, r31 -/* 80213478 88 A5 5E 1C */ lbz r5, 0x5e1c(r5) -/* 8021347C 38 C0 00 01 */ li r6, 1 -/* 80213480 38 E0 00 00 */ li r7, 0 -/* 80213484 48 00 41 C9 */ bl drawButtonR__13dMeter2Draw_cFUcUcbb -/* 80213488 7F E3 FB 78 */ mr r3, r31 -/* 8021348C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80213490 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80213494 88 84 5E 33 */ lbz r4, 0x5e33(r4) -/* 80213498 48 00 42 55 */ bl drawButtonZ__13dMeter2Draw_cFUc -/* 8021349C 7F E3 FB 78 */ mr r3, r31 -/* 802134A0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802134A4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802134A8 88 84 5E 26 */ lbz r4, 0x5e26(r4) -/* 802134AC 48 00 44 59 */ bl drawButton3D__13dMeter2Draw_cFUc -/* 802134B0 7F E3 FB 78 */ mr r3, r31 -/* 802134B4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802134B8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802134BC 88 84 5E 2F */ lbz r4, 0x5e2f(r4) -/* 802134C0 38 A0 00 01 */ li r5, 1 -/* 802134C4 48 00 44 91 */ bl drawButtonC__13dMeter2Draw_cFUcb -/* 802134C8 7F E3 FB 78 */ mr r3, r31 -/* 802134CC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802134D0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802134D4 88 84 5E 32 */ lbz r4, 0x5e32(r4) -/* 802134D8 48 00 44 E9 */ bl drawButtonS__13dMeter2Draw_cFUc -/* 802134DC 7F E3 FB 78 */ mr r3, r31 -/* 802134E0 38 80 00 01 */ li r4, 1 -/* 802134E4 48 00 52 A5 */ bl setAlphaButtonChange__13dMeter2Draw_cFb -/* 802134E8 80 7F 02 F8 */ lwz r3, 0x2f8(r31) -/* 802134EC C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 802134F0 48 04 22 E1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802134F4 39 61 00 70 */ addi r11, r1, 0x70 -/* 802134F8 48 14 ED 15 */ bl _restgpr_22 -/* 802134FC 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80213500 7C 08 03 A6 */ mtlr r0 -/* 80213504 38 21 00 70 */ addi r1, r1, 0x70 -/* 80213508 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/initLife__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/initLife__13dMeter2Draw_cFv.s deleted file mode 100644 index 75c2174f69..0000000000 --- a/asm/d/meter/d_meter2_draw/initLife__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,169 +0,0 @@ -lbl_80211BEC: -/* 80211BEC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80211BF0 7C 08 02 A6 */ mflr r0 -/* 80211BF4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80211BF8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80211BFC 48 15 05 D1 */ bl _savegpr_25 -/* 80211C00 7C 7C 1B 78 */ mr r28, r3 -/* 80211C04 3C 60 80 3A */ lis r3, a_tag@ha /* 0x80398258@ha */ -/* 80211C08 3B C3 82 58 */ addi r30, r3, a_tag@l /* 0x80398258@l */ -/* 80211C0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80211C10 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80211C14 A3 5F 00 02 */ lhz r26, 2(r31) -/* 80211C18 4B E1 C0 91 */ bl dComIfGs_getMaxLifeGauge__Fv -/* 80211C1C 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 80211C20 57 40 04 3E */ clrlwi r0, r26, 0x10 -/* 80211C24 7C 00 18 40 */ cmplw r0, r3 -/* 80211C28 40 81 00 0C */ ble lbl_80211C34 -/* 80211C2C 4B E1 C0 7D */ bl dComIfGs_getMaxLifeGauge__Fv -/* 80211C30 B0 7F 00 02 */ sth r3, 2(r31) -lbl_80211C34: -/* 80211C34 38 60 00 6C */ li r3, 0x6c -/* 80211C38 48 0B D0 15 */ bl __nw__FUl -/* 80211C3C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211C40 41 82 00 28 */ beq lbl_80211C68 -/* 80211C44 80 9C 00 78 */ lwz r4, 0x78(r28) -/* 80211C48 3C A0 72 74 */ lis r5, 0x7274 /* 0x72745F6E@ha */ -/* 80211C4C 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x72745F6E@l */ -/* 80211C50 3C A0 00 68 */ lis r5, 0x0068 /* 0x00686561@ha */ -/* 80211C54 38 A5 65 61 */ addi r5, r5, 0x6561 /* 0x00686561@l */ -/* 80211C58 38 E0 00 02 */ li r7, 2 -/* 80211C5C 39 00 00 00 */ li r8, 0 -/* 80211C60 48 04 1D 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80211C64 7C 60 1B 78 */ mr r0, r3 -lbl_80211C68: -/* 80211C68 90 1C 01 24 */ stw r0, 0x124(r28) -/* 80211C6C 3B A0 00 00 */ li r29, 0 -/* 80211C70 3B 60 00 00 */ li r27, 0 -/* 80211C74 3B 40 00 00 */ li r26, 0 -lbl_80211C78: -/* 80211C78 38 60 00 6C */ li r3, 0x6c -/* 80211C7C 48 0B CF D1 */ bl __nw__FUl -/* 80211C80 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211C84 41 82 00 28 */ beq lbl_80211CAC -/* 80211C88 80 9C 00 78 */ lwz r4, 0x78(r28) -/* 80211C8C 38 1E 00 C8 */ addi r0, r30, 0xc8 -/* 80211C90 7C C0 D2 14 */ add r6, r0, r26 -/* 80211C94 80 A6 00 00 */ lwz r5, 0(r6) -/* 80211C98 80 C6 00 04 */ lwz r6, 4(r6) -/* 80211C9C 38 E0 00 00 */ li r7, 0 -/* 80211CA0 39 00 00 00 */ li r8, 0 -/* 80211CA4 48 04 1C E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80211CA8 7C 60 1B 78 */ mr r0, r3 -lbl_80211CAC: -/* 80211CAC 7F 3C DA 14 */ add r25, r28, r27 -/* 80211CB0 90 19 01 28 */ stw r0, 0x128(r25) -/* 80211CB4 38 60 00 6C */ li r3, 0x6c -/* 80211CB8 48 0B CF 95 */ bl __nw__FUl -/* 80211CBC 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211CC0 41 82 00 28 */ beq lbl_80211CE8 -/* 80211CC4 80 9C 00 78 */ lwz r4, 0x78(r28) -/* 80211CC8 38 1E 01 68 */ addi r0, r30, 0x168 -/* 80211CCC 7C C0 D2 14 */ add r6, r0, r26 -/* 80211CD0 80 A6 00 00 */ lwz r5, 0(r6) -/* 80211CD4 80 C6 00 04 */ lwz r6, 4(r6) -/* 80211CD8 38 E0 00 02 */ li r7, 2 -/* 80211CDC 39 00 00 00 */ li r8, 0 -/* 80211CE0 48 04 1C A5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80211CE4 7C 60 1B 78 */ mr r0, r3 -lbl_80211CE8: -/* 80211CE8 90 19 01 78 */ stw r0, 0x178(r25) -/* 80211CEC 38 60 00 1C */ li r3, 0x1c -/* 80211CF0 48 0B CF 5D */ bl __nw__FUl -/* 80211CF4 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211CF8 41 82 00 28 */ beq lbl_80211D20 -/* 80211CFC 80 9C 00 78 */ lwz r4, 0x78(r28) -/* 80211D00 38 1E 02 08 */ addi r0, r30, 0x208 -/* 80211D04 7C C0 D2 14 */ add r6, r0, r26 -/* 80211D08 80 A6 00 00 */ lwz r5, 0(r6) -/* 80211D0C 80 C6 00 04 */ lwz r6, 4(r6) -/* 80211D10 38 E0 00 02 */ li r7, 2 -/* 80211D14 39 00 00 00 */ li r8, 0 -/* 80211D18 48 04 36 E5 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 80211D1C 7C 60 1B 78 */ mr r0, r3 -lbl_80211D20: -/* 80211D20 90 19 04 40 */ stw r0, 0x440(r25) -/* 80211D24 38 60 00 1C */ li r3, 0x1c -/* 80211D28 48 0B CF 25 */ bl __nw__FUl -/* 80211D2C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211D30 41 82 00 28 */ beq lbl_80211D58 -/* 80211D34 80 9C 00 78 */ lwz r4, 0x78(r28) -/* 80211D38 38 1E 02 A8 */ addi r0, r30, 0x2a8 -/* 80211D3C 7C C0 D2 14 */ add r6, r0, r26 -/* 80211D40 80 A6 00 00 */ lwz r5, 0(r6) -/* 80211D44 80 C6 00 04 */ lwz r6, 4(r6) -/* 80211D48 38 E0 00 00 */ li r7, 0 -/* 80211D4C 39 00 00 00 */ li r8, 0 -/* 80211D50 48 04 36 AD */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 80211D54 7C 60 1B 78 */ mr r0, r3 -lbl_80211D58: -/* 80211D58 7F 3C D2 14 */ add r25, r28, r26 -/* 80211D5C 90 19 03 A0 */ stw r0, 0x3a0(r25) -/* 80211D60 38 60 00 1C */ li r3, 0x1c -/* 80211D64 48 0B CE E9 */ bl __nw__FUl -/* 80211D68 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211D6C 41 82 00 28 */ beq lbl_80211D94 -/* 80211D70 80 9C 00 78 */ lwz r4, 0x78(r28) -/* 80211D74 38 1E 03 48 */ addi r0, r30, 0x348 -/* 80211D78 7C C0 D2 14 */ add r6, r0, r26 -/* 80211D7C 80 A6 00 00 */ lwz r5, 0(r6) -/* 80211D80 80 C6 00 04 */ lwz r6, 4(r6) -/* 80211D84 38 E0 00 00 */ li r7, 0 -/* 80211D88 39 00 00 00 */ li r8, 0 -/* 80211D8C 48 04 36 71 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 80211D90 7C 60 1B 78 */ mr r0, r3 -lbl_80211D94: -/* 80211D94 90 19 03 A4 */ stw r0, 0x3a4(r25) -/* 80211D98 3B BD 00 01 */ addi r29, r29, 1 -/* 80211D9C 2C 1D 00 14 */ cmpwi r29, 0x14 -/* 80211DA0 3B 7B 00 04 */ addi r27, r27, 4 -/* 80211DA4 3B 5A 00 08 */ addi r26, r26, 8 -/* 80211DA8 41 80 FE D0 */ blt lbl_80211C78 -/* 80211DAC 38 60 00 6C */ li r3, 0x6c -/* 80211DB0 48 0B CE 9D */ bl __nw__FUl -/* 80211DB4 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211DB8 41 82 00 24 */ beq lbl_80211DDC -/* 80211DBC 80 9C 00 78 */ lwz r4, 0x78(r28) -/* 80211DC0 3C A0 67 68 */ lis r5, 0x6768 /* 0x67685F6E@ha */ -/* 80211DC4 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x67685F6E@l */ -/* 80211DC8 38 A0 62 69 */ li r5, 0x6269 -/* 80211DCC 38 E0 00 02 */ li r7, 2 -/* 80211DD0 39 00 00 00 */ li r8, 0 -/* 80211DD4 48 04 1B B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80211DD8 7C 60 1B 78 */ mr r0, r3 -lbl_80211DDC: -/* 80211DDC 90 1C 01 C8 */ stw r0, 0x1c8(r28) -/* 80211DE0 80 7C 01 24 */ lwz r3, 0x124(r28) -/* 80211DE4 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80211DE8 48 04 39 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80211DEC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80211DF0 38 A3 EB C8 */ addi r5, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80211DF4 C0 25 00 08 */ lfs f1, 8(r5) -/* 80211DF8 C0 42 AE 80 */ lfs f2, lit_4182(r2) -/* 80211DFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80211E00 A0 83 61 C0 */ lhz r4, g_dComIfG_gameInfo@l(r3) /* 0x804061C0@l */ -/* 80211E04 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 80211E08 28 00 00 32 */ cmplwi r0, 0x32 -/* 80211E0C 41 81 00 08 */ bgt lbl_80211E14 -/* 80211E10 C0 45 00 0C */ lfs f2, 0xc(r5) -lbl_80211E14: -/* 80211E14 A0 1F 00 02 */ lhz r0, 2(r31) -/* 80211E18 7F 83 E3 78 */ mr r3, r28 -/* 80211E1C 7C 84 07 34 */ extsh r4, r4 -/* 80211E20 7C 05 07 34 */ extsh r5, r0 -/* 80211E24 3C C0 80 43 */ lis r6, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80211E28 38 C6 EB C8 */ addi r6, r6, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80211E2C C0 06 00 28 */ lfs f0, 0x28(r6) -/* 80211E30 EC 20 08 2A */ fadds f1, f0, f1 -/* 80211E34 C0 06 00 2C */ lfs f0, 0x2c(r6) -/* 80211E38 EC 40 10 2A */ fadds f2, f0, f2 -/* 80211E3C 48 00 2B B9 */ bl drawLife__13dMeter2Draw_cFssff -/* 80211E40 7F 83 E3 78 */ mr r3, r28 -/* 80211E44 38 80 00 01 */ li r4, 1 -/* 80211E48 48 00 2D D9 */ bl setAlphaLifeChange__13dMeter2Draw_cFb -/* 80211E4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80211E50 48 15 03 C9 */ bl _restgpr_25 -/* 80211E54 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80211E58 7C 08 03 A6 */ mtlr r0 -/* 80211E5C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80211E60 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/initLightDrop__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/initLightDrop__13dMeter2Draw_cFv.s deleted file mode 100644 index c9f628a47d..0000000000 --- a/asm/d/meter/d_meter2_draw/initLightDrop__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_80212190: -/* 80212190 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80212194 7C 08 02 A6 */ mflr r0 -/* 80212198 90 01 00 34 */ stw r0, 0x34(r1) -/* 8021219C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802121A0 48 15 00 2D */ bl _savegpr_25 -/* 802121A4 7C 7E 1B 78 */ mr r30, r3 -/* 802121A8 3C 60 80 3A */ lis r3, a_tag@ha /* 0x80398258@ha */ -/* 802121AC 3B 63 82 58 */ addi r27, r3, a_tag@l /* 0x80398258@l */ -/* 802121B0 38 60 00 6C */ li r3, 0x6c -/* 802121B4 48 0B CA 99 */ bl __nw__FUl -/* 802121B8 7C 60 1B 79 */ or. r0, r3, r3 -/* 802121BC 41 82 00 28 */ beq lbl_802121E4 -/* 802121C0 80 9E 00 78 */ lwz r4, 0x78(r30) -/* 802121C4 3C A0 74 61 */ lis r5, 0x7461 /* 0x74615F6E@ha */ -/* 802121C8 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x74615F6E@l */ -/* 802121CC 3C A0 73 5F */ lis r5, 0x735F /* 0x735F7475@ha */ -/* 802121D0 38 A5 74 75 */ addi r5, r5, 0x7475 /* 0x735F7475@l */ -/* 802121D4 38 E0 00 02 */ li r7, 2 -/* 802121D8 39 00 00 00 */ li r8, 0 -/* 802121DC 48 04 17 A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802121E0 7C 60 1B 78 */ mr r0, r3 -lbl_802121E4: -/* 802121E4 90 1E 01 E0 */ stw r0, 0x1e0(r30) -/* 802121E8 3B 40 00 00 */ li r26, 0 -/* 802121EC 3B E0 00 00 */ li r31, 0 -/* 802121F0 3B A0 00 00 */ li r29, 0 -lbl_802121F4: -/* 802121F4 38 60 00 6C */ li r3, 0x6c -/* 802121F8 48 0B CA 55 */ bl __nw__FUl -/* 802121FC 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212200 41 82 00 28 */ beq lbl_80212228 -/* 80212204 80 9E 00 78 */ lwz r4, 0x78(r30) -/* 80212208 38 1B 03 E8 */ addi r0, r27, 0x3e8 -/* 8021220C 7C C0 EA 14 */ add r6, r0, r29 -/* 80212210 80 A6 00 00 */ lwz r5, 0(r6) -/* 80212214 80 C6 00 04 */ lwz r6, 4(r6) -/* 80212218 38 E0 00 00 */ li r7, 0 -/* 8021221C 39 00 00 00 */ li r8, 0 -/* 80212220 48 04 17 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212224 7C 60 1B 78 */ mr r0, r3 -lbl_80212228: -/* 80212228 7F 9E FA 14 */ add r28, r30, r31 -/* 8021222C 90 1C 01 F0 */ stw r0, 0x1f0(r28) -/* 80212230 38 60 00 6C */ li r3, 0x6c -/* 80212234 48 0B CA 19 */ bl __nw__FUl -/* 80212238 7C 60 1B 79 */ or. r0, r3, r3 -/* 8021223C 41 82 00 28 */ beq lbl_80212264 -/* 80212240 80 9E 00 78 */ lwz r4, 0x78(r30) -/* 80212244 38 1B 04 68 */ addi r0, r27, 0x468 -/* 80212248 7C C0 EA 14 */ add r6, r0, r29 -/* 8021224C 80 A6 00 00 */ lwz r5, 0(r6) -/* 80212250 80 C6 00 04 */ lwz r6, 4(r6) -/* 80212254 38 E0 00 00 */ li r7, 0 -/* 80212258 39 00 00 00 */ li r8, 0 -/* 8021225C 48 04 17 29 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212260 7C 60 1B 78 */ mr r0, r3 -lbl_80212264: -/* 80212264 90 1C 01 F4 */ stw r0, 0x1f4(r28) -/* 80212268 38 60 00 6C */ li r3, 0x6c -/* 8021226C 48 0B C9 E1 */ bl __nw__FUl -/* 80212270 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212274 41 82 00 28 */ beq lbl_8021229C -/* 80212278 80 9E 00 78 */ lwz r4, 0x78(r30) -/* 8021227C 38 1B 04 E8 */ addi r0, r27, 0x4e8 -/* 80212280 7C C0 EA 14 */ add r6, r0, r29 -/* 80212284 80 A6 00 00 */ lwz r5, 0(r6) -/* 80212288 80 C6 00 04 */ lwz r6, 4(r6) -/* 8021228C 38 E0 00 00 */ li r7, 0 -/* 80212290 39 00 00 00 */ li r8, 0 -/* 80212294 48 04 16 F1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212298 7C 60 1B 78 */ mr r0, r3 -lbl_8021229C: -/* 8021229C 90 1C 01 F8 */ stw r0, 0x1f8(r28) -/* 802122A0 3B 5A 00 01 */ addi r26, r26, 1 -/* 802122A4 2C 1A 00 10 */ cmpwi r26, 0x10 -/* 802122A8 3B FF 00 0C */ addi r31, r31, 0xc -/* 802122AC 3B BD 00 08 */ addi r29, r29, 8 -/* 802122B0 41 80 FF 44 */ blt lbl_802121F4 -/* 802122B4 38 60 00 6C */ li r3, 0x6c -/* 802122B8 48 0B C9 95 */ bl __nw__FUl -/* 802122BC 7C 60 1B 79 */ or. r0, r3, r3 -/* 802122C0 41 82 00 24 */ beq lbl_802122E4 -/* 802122C4 80 9E 00 78 */ lwz r4, 0x78(r30) -/* 802122C8 3C A0 74 61 */ lis r5, 0x7461 /* 0x74615F6E@ha */ -/* 802122CC 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x74615F6E@l */ -/* 802122D0 38 A0 74 75 */ li r5, 0x7475 -/* 802122D4 38 E0 00 02 */ li r7, 2 -/* 802122D8 39 00 00 00 */ li r8, 0 -/* 802122DC 48 04 16 A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802122E0 7C 60 1B 78 */ mr r0, r3 -lbl_802122E4: -/* 802122E4 90 1E 01 E8 */ stw r0, 0x1e8(r30) -/* 802122E8 38 60 00 6C */ li r3, 0x6c -/* 802122EC 48 0B C9 61 */ bl __nw__FUl -/* 802122F0 7C 60 1B 79 */ or. r0, r3, r3 -/* 802122F4 41 82 00 24 */ beq lbl_80212318 -/* 802122F8 80 9E 00 78 */ lwz r4, 0x78(r30) -/* 802122FC 3C A0 6E 75 */ lis r5, 0x6E75 /* 0x6E756C6C@ha */ -/* 80212300 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x6E756C6C@l */ -/* 80212304 38 A0 73 5F */ li r5, 0x735f -/* 80212308 38 E0 00 02 */ li r7, 2 -/* 8021230C 39 00 00 00 */ li r8, 0 -/* 80212310 48 04 16 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212314 7C 60 1B 78 */ mr r0, r3 -lbl_80212318: -/* 80212318 90 1E 01 EC */ stw r0, 0x1ec(r30) -/* 8021231C 80 7E 01 E0 */ lwz r3, 0x1e0(r30) -/* 80212320 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80212324 48 04 34 AD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80212328 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021232C D0 1E 06 FC */ stfs f0, 0x6fc(r30) -/* 80212330 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80212334 3B E3 EB C8 */ addi r31, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80212338 C0 1F 0E 84 */ lfs f0, 0xe84(r31) -/* 8021233C D0 1E 06 F4 */ stfs f0, 0x6f4(r30) -/* 80212340 C0 02 AE 84 */ lfs f0, lit_4183(r2) -/* 80212344 D0 1E 06 F8 */ stfs f0, 0x6f8(r30) -/* 80212348 3B 20 00 00 */ li r25, 0 -/* 8021234C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80212350 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80212354 3B 43 01 14 */ addi r26, r3, 0x114 -/* 80212358 3B 60 00 FF */ li r27, 0xff -/* 8021235C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80212360 3B 83 01 88 */ addi r28, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80212364 3B A0 00 00 */ li r29, 0 -lbl_80212368: -/* 80212368 7F 43 D3 78 */ mr r3, r26 -/* 8021236C 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 80212370 4B E2 20 2D */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc -/* 80212374 2C 03 00 00 */ cmpwi r3, 0 -/* 80212378 41 82 00 10 */ beq lbl_80212388 -/* 8021237C 7C 7C CA 14 */ add r3, r28, r25 -/* 80212380 9B 63 00 E3 */ stb r27, 0xe3(r3) -/* 80212384 48 00 00 0C */ b lbl_80212390 -lbl_80212388: -/* 80212388 7C 7C CA 14 */ add r3, r28, r25 -/* 8021238C 9B A3 00 E3 */ stb r29, 0xe3(r3) -lbl_80212390: -/* 80212390 3B 39 00 01 */ addi r25, r25, 1 -/* 80212394 2C 19 00 03 */ cmpwi r25, 3 -/* 80212398 41 80 FF D0 */ blt lbl_80212368 -/* 8021239C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802123A0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802123A4 8B 64 5E A1 */ lbz r27, 0x5ea1(r4) -/* 802123A8 7F 43 D3 78 */ mr r3, r26 -/* 802123AC 88 84 4E 0C */ lbz r4, 0x4e0c(r4) -/* 802123B0 4B E2 1F 91 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 802123B4 7C 64 1B 78 */ mr r4, r3 -/* 802123B8 7F C3 F3 78 */ mr r3, r30 -/* 802123BC 7F 65 DB 78 */ mr r5, r27 -/* 802123C0 3C C0 80 43 */ lis r6, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802123C4 38 C6 EB C8 */ addi r6, r6, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802123C8 C0 26 0E 8C */ lfs f1, 0xe8c(r6) -/* 802123CC C0 46 0E 94 */ lfs f2, 0xe94(r6) -/* 802123D0 C0 7F 0E 84 */ lfs f3, 0xe84(r31) -/* 802123D4 C0 86 0E A4 */ lfs f4, 0xea4(r6) -/* 802123D8 38 C0 00 00 */ li r6, 0 -/* 802123DC 48 00 37 3D */ bl drawLightDrop__13dMeter2Draw_cFUcUcffffUc -/* 802123E0 7F C3 F3 78 */ mr r3, r30 -/* 802123E4 38 80 00 01 */ li r4, 1 -/* 802123E8 48 00 39 BD */ bl setAlphaLightDropChange__13dMeter2Draw_cFb -/* 802123EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802123F0 48 14 FE 29 */ bl _restgpr_25 -/* 802123F4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802123F8 7C 08 03 A6 */ mtlr r0 -/* 802123FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80212400 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/initMagic__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/initMagic__13dMeter2Draw_cFv.s deleted file mode 100644 index 0b658741c1..0000000000 --- a/asm/d/meter/d_meter2_draw/initMagic__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,211 +0,0 @@ -lbl_80211E64: -/* 80211E64 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80211E68 7C 08 02 A6 */ mflr r0 -/* 80211E6C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80211E70 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80211E74 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80211E78 DB C1 00 10 */ stfd f30, 0x10(r1) -/* 80211E7C F3 C1 00 18 */ psq_st f30, 24(r1), 0, 0 /* qr0 */ -/* 80211E80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80211E84 93 C1 00 08 */ stw r30, 8(r1) -/* 80211E88 7C 7F 1B 78 */ mr r31, r3 -/* 80211E8C C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80211E90 D0 03 05 50 */ stfs f0, 0x550(r3) -/* 80211E94 D0 03 05 54 */ stfs f0, 0x554(r3) -/* 80211E98 38 60 00 6C */ li r3, 0x6c -/* 80211E9C 48 0B CD B1 */ bl __nw__FUl -/* 80211EA0 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211EA4 41 82 00 28 */ beq lbl_80211ECC -/* 80211EA8 80 9F 00 7C */ lwz r4, 0x7c(r31) -/* 80211EAC 3C A0 69 63 */ lis r5, 0x6963 /* 0x69635F6E@ha */ -/* 80211EB0 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x69635F6E@l */ -/* 80211EB4 3C A0 00 6D */ lis r5, 0x006D /* 0x006D6167@ha */ -/* 80211EB8 38 A5 61 67 */ addi r5, r5, 0x6167 /* 0x006D6167@l */ -/* 80211EBC 38 E0 00 02 */ li r7, 2 -/* 80211EC0 39 00 00 00 */ li r8, 0 -/* 80211EC4 48 04 1A C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80211EC8 7C 60 1B 78 */ mr r0, r3 -lbl_80211ECC: -/* 80211ECC 90 1F 01 CC */ stw r0, 0x1cc(r31) -/* 80211ED0 38 60 00 6C */ li r3, 0x6c -/* 80211ED4 48 0B CD 79 */ bl __nw__FUl -/* 80211ED8 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211EDC 41 82 00 28 */ beq lbl_80211F04 -/* 80211EE0 80 9F 00 7C */ lwz r4, 0x7c(r31) -/* 80211EE4 3C A0 62 61 */ lis r5, 0x6261 /* 0x62617365@ha */ -/* 80211EE8 38 C5 73 65 */ addi r6, r5, 0x7365 /* 0x62617365@l */ -/* 80211EEC 3C A0 00 6D */ lis r5, 0x006D /* 0x006D6D5F@ha */ -/* 80211EF0 38 A5 6D 5F */ addi r5, r5, 0x6D5F /* 0x006D6D5F@l */ -/* 80211EF4 38 E0 00 00 */ li r7, 0 -/* 80211EF8 39 00 00 00 */ li r8, 0 -/* 80211EFC 48 04 1A 89 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80211F00 7C 60 1B 78 */ mr r0, r3 -lbl_80211F04: -/* 80211F04 90 1F 01 D0 */ stw r0, 0x1d0(r31) -/* 80211F08 38 60 00 6C */ li r3, 0x6c -/* 80211F0C 48 0B CD 41 */ bl __nw__FUl -/* 80211F10 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211F14 41 82 00 28 */ beq lbl_80211F3C -/* 80211F18 80 9F 00 7C */ lwz r4, 0x7c(r31) -/* 80211F1C 3C A0 5F 6C */ lis r5, 0x5F6C /* 0x5F6C5F6E@ha */ -/* 80211F20 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x5F6C5F6E@l */ -/* 80211F24 3C A0 00 6D */ lis r5, 0x006D /* 0x006D5F77@ha */ -/* 80211F28 38 A5 5F 77 */ addi r5, r5, 0x5F77 /* 0x006D5F77@l */ -/* 80211F2C 38 E0 00 02 */ li r7, 2 -/* 80211F30 39 00 00 00 */ li r8, 0 -/* 80211F34 48 04 1A 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80211F38 7C 60 1B 78 */ mr r0, r3 -lbl_80211F3C: -/* 80211F3C 90 1F 01 D4 */ stw r0, 0x1d4(r31) -/* 80211F40 38 60 00 6C */ li r3, 0x6c -/* 80211F44 48 0B CD 09 */ bl __nw__FUl -/* 80211F48 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211F4C 41 82 00 28 */ beq lbl_80211F74 -/* 80211F50 80 9F 00 7C */ lwz r4, 0x7c(r31) -/* 80211F54 3C A0 5F 72 */ lis r5, 0x5F72 /* 0x5F725F6E@ha */ -/* 80211F58 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x5F725F6E@l */ -/* 80211F5C 3C A0 00 6D */ lis r5, 0x006D /* 0x006D5F77@ha */ -/* 80211F60 38 A5 5F 77 */ addi r5, r5, 0x5F77 /* 0x006D5F77@l */ -/* 80211F64 38 E0 00 02 */ li r7, 2 -/* 80211F68 39 00 00 00 */ li r8, 0 -/* 80211F6C 48 04 1A 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80211F70 7C 60 1B 78 */ mr r0, r3 -lbl_80211F74: -/* 80211F74 90 1F 01 DC */ stw r0, 0x1dc(r31) -/* 80211F78 38 60 00 6C */ li r3, 0x6c -/* 80211F7C 48 0B CC D1 */ bl __nw__FUl -/* 80211F80 7C 60 1B 79 */ or. r0, r3, r3 -/* 80211F84 41 82 00 24 */ beq lbl_80211FA8 -/* 80211F88 80 9F 00 7C */ lwz r4, 0x7c(r31) -/* 80211F8C 3C A0 6D 5F */ lis r5, 0x6D5F /* 0x6D5F3030@ha */ -/* 80211F90 38 C5 30 30 */ addi r6, r5, 0x3030 /* 0x6D5F3030@l */ -/* 80211F94 38 A0 00 6D */ li r5, 0x6d -/* 80211F98 38 E0 00 00 */ li r7, 0 -/* 80211F9C 39 00 00 00 */ li r8, 0 -/* 80211FA0 48 04 19 E5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80211FA4 7C 60 1B 78 */ mr r0, r3 -lbl_80211FA8: -/* 80211FA8 90 1F 01 D8 */ stw r0, 0x1d8(r31) -/* 80211FAC 38 60 00 04 */ li r3, 4 -/* 80211FB0 64 63 00 04 */ oris r3, r3, 4 -/* 80211FB4 7C 72 E3 A6 */ mtspr 0x392, r3 -/* 80211FB8 38 60 00 05 */ li r3, 5 -/* 80211FBC 64 63 00 05 */ oris r3, r3, 5 -/* 80211FC0 7C 73 E3 A6 */ mtspr 0x393, r3 -/* 80211FC4 38 60 00 06 */ li r3, 6 -/* 80211FC8 64 63 00 06 */ oris r3, r3, 6 -/* 80211FCC 7C 74 E3 A6 */ mtspr 0x394, r3 -/* 80211FD0 38 60 00 07 */ li r3, 7 -/* 80211FD4 64 63 00 07 */ oris r3, r3, 7 -/* 80211FD8 7C 75 E3 A6 */ mtspr 0x395, r3 -/* 80211FDC 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 80211FE0 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 80211FE4 38 64 00 F0 */ addi r3, r4, 0xf0 -/* 80211FE8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80211FEC 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80211FF0 80 9E 5D 30 */ lwz r4, 0x5d30(r30) -/* 80211FF4 48 0C 22 7D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80211FF8 48 0F 6A 75 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80211FFC 90 7F 05 3C */ stw r3, 0x53c(r31) -/* 80212000 80 7F 05 3C */ lwz r3, 0x53c(r31) -/* 80212004 80 9F 00 7C */ lwz r4, 0x7c(r31) -/* 80212008 81 83 00 00 */ lwz r12, 0(r3) -/* 8021200C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80212010 7D 89 03 A6 */ mtctr r12 -/* 80212014 4E 80 04 21 */ bctrl -/* 80212018 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 8021201C 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 80212020 38 64 01 15 */ addi r3, r4, 0x115 -/* 80212024 80 9E 5D 30 */ lwz r4, 0x5d30(r30) -/* 80212028 48 0C 22 49 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8021202C 48 0F 6A 41 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80212030 90 7F 05 40 */ stw r3, 0x540(r31) -/* 80212034 80 7F 05 40 */ lwz r3, 0x540(r31) -/* 80212038 80 9F 00 7C */ lwz r4, 0x7c(r31) -/* 8021203C 81 83 00 00 */ lwz r12, 0(r3) -/* 80212040 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80212044 7D 89 03 A6 */ mtctr r12 -/* 80212048 4E 80 04 21 */ bctrl -/* 8021204C 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */ -/* 80212050 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */ -/* 80212054 38 64 01 3A */ addi r3, r4, 0x13a -/* 80212058 80 9E 5D 30 */ lwz r4, 0x5d30(r30) -/* 8021205C 48 0C 22 15 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80212060 48 0F 6A 0D */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80212064 90 7F 05 44 */ stw r3, 0x544(r31) -/* 80212068 80 7F 05 44 */ lwz r3, 0x544(r31) -/* 8021206C 80 9F 00 7C */ lwz r4, 0x7c(r31) -/* 80212070 81 83 00 00 */ lwz r12, 0(r3) -/* 80212074 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80212078 7D 89 03 A6 */ mtctr r12 -/* 8021207C 4E 80 04 21 */ bctrl -/* 80212080 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80212084 D0 3F 05 58 */ stfs f1, 0x558(r31) -/* 80212088 80 7F 01 CC */ lwz r3, 0x1cc(r31) -/* 8021208C 48 04 37 45 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80212090 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80212094 38 A4 EB C8 */ addi r5, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80212098 C3 E5 00 08 */ lfs f31, 8(r5) -/* 8021209C C3 C2 AE 80 */ lfs f30, lit_4182(r2) -/* 802120A0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802120A4 A0 04 61 C0 */ lhz r0, g_dComIfG_gameInfo@l(r4) /* 0x804061C0@l */ -/* 802120A8 28 00 00 32 */ cmplwi r0, 0x32 -/* 802120AC 41 81 00 08 */ bgt lbl_802120B4 -/* 802120B0 C3 C5 00 0C */ lfs f30, 0xc(r5) -lbl_802120B4: -/* 802120B4 38 80 00 00 */ li r4, 0 -/* 802120B8 38 A0 00 00 */ li r5, 0 -/* 802120BC C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 802120C0 7C A6 2B 78 */ mr r6, r5 -/* 802120C4 38 00 00 03 */ li r0, 3 -/* 802120C8 7C 09 03 A6 */ mtctr r0 -lbl_802120CC: -/* 802120CC 38 05 05 FC */ addi r0, r5, 0x5fc -/* 802120D0 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 802120D4 38 04 07 42 */ addi r0, r4, 0x742 -/* 802120D8 7C DF 03 2E */ sthx r6, r31, r0 -/* 802120DC 38 84 00 02 */ addi r4, r4, 2 -/* 802120E0 38 A5 00 04 */ addi r5, r5, 4 -/* 802120E4 42 00 FF E8 */ bdnz lbl_802120CC -/* 802120E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802120EC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802120F0 88 A4 00 1B */ lbz r5, 0x1b(r4) -/* 802120F4 88 84 00 1A */ lbz r4, 0x1a(r4) -/* 802120F8 7F E3 FB 78 */ mr r3, r31 -/* 802120FC 3C C0 80 43 */ lis r6, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80212100 38 C6 EB C8 */ addi r6, r6, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80212104 C0 06 00 4C */ lfs f0, 0x4c(r6) -/* 80212108 EC 20 F8 2A */ fadds f1, f0, f31 -/* 8021210C C0 06 00 50 */ lfs f0, 0x50(r6) -/* 80212110 EC 40 F0 2A */ fadds f2, f0, f30 -/* 80212114 48 00 31 7D */ bl drawMagic__13dMeter2Draw_cFssff -/* 80212118 7F E3 FB 78 */ mr r3, r31 -/* 8021211C 38 80 00 01 */ li r4, 1 -/* 80212120 48 00 32 61 */ bl setAlphaMagicChange__13dMeter2Draw_cFb -/* 80212124 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80212128 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021212C A0 A4 00 08 */ lhz r5, 8(r4) -/* 80212130 A0 84 00 06 */ lhz r4, 6(r4) -/* 80212134 7F E3 FB 78 */ mr r3, r31 -/* 80212138 3C C0 80 43 */ lis r6, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021213C 38 C6 EB C8 */ addi r6, r6, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80212140 C0 06 00 60 */ lfs f0, 0x60(r6) -/* 80212144 EC 20 F8 2A */ fadds f1, f0, f31 -/* 80212148 C0 46 00 10 */ lfs f2, 0x10(r6) -/* 8021214C C0 06 00 64 */ lfs f0, 0x64(r6) -/* 80212150 EC 00 F0 2A */ fadds f0, f0, f30 -/* 80212154 EC 42 00 2A */ fadds f2, f2, f0 -/* 80212158 48 00 33 51 */ bl drawKantera__13dMeter2Draw_cFllff -/* 8021215C 7F E3 FB 78 */ mr r3, r31 -/* 80212160 38 80 00 01 */ li r4, 1 -/* 80212164 48 00 34 55 */ bl setAlphaKanteraChange__13dMeter2Draw_cFb -/* 80212168 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 8021216C CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80212170 E3 C1 00 18 */ psq_l f30, 24(r1), 0, 0 /* qr0 */ -/* 80212174 CB C1 00 10 */ lfd f30, 0x10(r1) -/* 80212178 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021217C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80212180 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80212184 7C 08 03 A6 */ mtlr r0 -/* 80212188 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021218C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/initRupeeKey__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/initRupeeKey__13dMeter2Draw_cFv.s deleted file mode 100644 index 507d97f2da..0000000000 --- a/asm/d/meter/d_meter2_draw/initRupeeKey__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,195 +0,0 @@ -lbl_80212404: -/* 80212404 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80212408 7C 08 02 A6 */ mflr r0 -/* 8021240C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80212410 39 61 00 20 */ addi r11, r1, 0x20 -/* 80212414 48 14 FD BD */ bl _savegpr_26 -/* 80212418 7C 7F 1B 78 */ mr r31, r3 -/* 8021241C 3C 60 80 3A */ lis r3, a_tag@ha /* 0x80398258@ha */ -/* 80212420 3B C3 82 58 */ addi r30, r3, a_tag@l /* 0x80398258@l */ -/* 80212424 38 60 00 6C */ li r3, 0x6c -/* 80212428 48 0B C8 25 */ bl __nw__FUl -/* 8021242C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212430 41 82 00 24 */ beq lbl_80212454 -/* 80212434 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212438 3C A0 5F 6B */ lis r5, 0x5F6B /* 0x5F6B5F6E@ha */ -/* 8021243C 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x5F6B5F6E@l */ -/* 80212440 38 A0 00 72 */ li r5, 0x72 -/* 80212444 38 E0 00 02 */ li r7, 2 -/* 80212448 39 00 00 00 */ li r8, 0 -/* 8021244C 48 04 15 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212450 7C 60 1B 78 */ mr r0, r3 -lbl_80212454: -/* 80212454 90 1F 02 B0 */ stw r0, 0x2b0(r31) -/* 80212458 C0 02 AE 84 */ lfs f0, lit_4183(r2) -/* 8021245C D0 1F 07 18 */ stfs f0, 0x718(r31) -/* 80212460 3B 60 00 00 */ li r27, 0 -/* 80212464 3B 80 00 00 */ li r28, 0 -lbl_80212468: -/* 80212468 38 60 00 6C */ li r3, 0x6c -/* 8021246C 48 0B C7 E1 */ bl __nw__FUl -/* 80212470 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212474 41 82 00 28 */ beq lbl_8021249C -/* 80212478 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 8021247C 38 1E 05 68 */ addi r0, r30, 0x568 -/* 80212480 7C C0 E2 14 */ add r6, r0, r28 -/* 80212484 80 A6 00 00 */ lwz r5, 0(r6) -/* 80212488 80 C6 00 04 */ lwz r6, 4(r6) -/* 8021248C 38 E0 00 00 */ li r7, 0 -/* 80212490 39 00 00 00 */ li r8, 0 -/* 80212494 48 04 14 F1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212498 7C 60 1B 78 */ mr r0, r3 -lbl_8021249C: -/* 8021249C 7F BF E2 14 */ add r29, r31, r28 -/* 802124A0 90 1D 02 C0 */ stw r0, 0x2c0(r29) -/* 802124A4 80 7D 02 C0 */ lwz r3, 0x2c0(r29) -/* 802124A8 80 63 00 04 */ lwz r3, 4(r3) -/* 802124AC 38 80 00 04 */ li r4, 4 -/* 802124B0 48 0E 52 49 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 802124B4 38 60 00 6C */ li r3, 0x6c -/* 802124B8 48 0B C7 95 */ bl __nw__FUl -/* 802124BC 7C 60 1B 79 */ or. r0, r3, r3 -/* 802124C0 41 82 00 28 */ beq lbl_802124E8 -/* 802124C4 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 802124C8 38 1E 05 88 */ addi r0, r30, 0x588 -/* 802124CC 7C C0 E2 14 */ add r6, r0, r28 -/* 802124D0 80 A6 00 00 */ lwz r5, 0(r6) -/* 802124D4 80 C6 00 04 */ lwz r6, 4(r6) -/* 802124D8 38 E0 00 00 */ li r7, 0 -/* 802124DC 39 00 00 00 */ li r8, 0 -/* 802124E0 48 04 14 A5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802124E4 7C 60 1B 78 */ mr r0, r3 -lbl_802124E8: -/* 802124E8 90 1D 02 C4 */ stw r0, 0x2c4(r29) -/* 802124EC 80 7D 02 C4 */ lwz r3, 0x2c4(r29) -/* 802124F0 80 63 00 04 */ lwz r3, 4(r3) -/* 802124F4 38 80 00 04 */ li r4, 4 -/* 802124F8 48 0E 52 01 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 802124FC 3B 7B 00 01 */ addi r27, r27, 1 -/* 80212500 2C 1B 00 04 */ cmpwi r27, 4 -/* 80212504 3B 9C 00 08 */ addi r28, r28, 8 -/* 80212508 41 80 FF 60 */ blt lbl_80212468 -/* 8021250C 38 60 00 6C */ li r3, 0x6c -/* 80212510 48 0B C7 3D */ bl __nw__FUl -/* 80212514 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212518 41 82 00 24 */ beq lbl_8021253C -/* 8021251C 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212520 3C A0 70 69 */ lis r5, 0x7069 /* 0x70695F6E@ha */ -/* 80212524 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x70695F6E@l */ -/* 80212528 38 A0 72 75 */ li r5, 0x7275 -/* 8021252C 38 E0 00 02 */ li r7, 2 -/* 80212530 39 00 00 00 */ li r8, 0 -/* 80212534 48 04 14 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212538 7C 60 1B 78 */ mr r0, r3 -lbl_8021253C: -/* 8021253C 90 1F 02 B4 */ stw r0, 0x2b4(r31) -/* 80212540 38 60 00 6C */ li r3, 0x6c -/* 80212544 48 0B C7 09 */ bl __nw__FUl -/* 80212548 7C 60 1B 79 */ or. r0, r3, r3 -/* 8021254C 41 82 00 28 */ beq lbl_80212574 -/* 80212550 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 80212554 3C A0 75 5F */ lis r5, 0x755F /* 0x755F726E@ha */ -/* 80212558 38 C5 72 6E */ addi r6, r5, 0x726E /* 0x755F726E@l */ -/* 8021255C 3C A0 6D 6F */ lis r5, 0x6D6F /* 0x6D6F796F@ha */ -/* 80212560 38 A5 79 6F */ addi r5, r5, 0x796F /* 0x6D6F796F@l */ -/* 80212564 38 E0 00 02 */ li r7, 2 -/* 80212568 39 00 00 00 */ li r8, 0 -/* 8021256C 48 04 14 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212570 7C 60 1B 78 */ mr r0, r3 -lbl_80212574: -/* 80212574 90 1F 02 B8 */ stw r0, 0x2b8(r31) -/* 80212578 38 60 00 6C */ li r3, 0x6c -/* 8021257C 48 0B C6 D1 */ bl __nw__FUl -/* 80212580 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212584 41 82 00 28 */ beq lbl_802125AC -/* 80212588 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 8021258C 3C A0 75 5F */ lis r5, 0x755F /* 0x755F6C6E@ha */ -/* 80212590 38 C5 6C 6E */ addi r6, r5, 0x6C6E /* 0x755F6C6E@l */ -/* 80212594 3C A0 6D 6F */ lis r5, 0x6D6F /* 0x6D6F796F@ha */ -/* 80212598 38 A5 79 6F */ addi r5, r5, 0x796F /* 0x6D6F796F@l */ -/* 8021259C 38 E0 00 02 */ li r7, 2 -/* 802125A0 39 00 00 00 */ li r8, 0 -/* 802125A4 48 04 13 E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802125A8 7C 60 1B 78 */ mr r0, r3 -lbl_802125AC: -/* 802125AC 90 1F 02 BC */ stw r0, 0x2bc(r31) -/* 802125B0 80 7F 02 B4 */ lwz r3, 0x2b4(r31) -/* 802125B4 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 802125B8 48 04 32 19 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802125BC 80 7F 02 B8 */ lwz r3, 0x2b8(r31) -/* 802125C0 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 802125C4 48 04 32 0D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802125C8 80 7F 02 BC */ lwz r3, 0x2bc(r31) -/* 802125CC C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 802125D0 48 04 32 01 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802125D4 3B 40 00 00 */ li r26, 0 -/* 802125D8 3B A0 00 00 */ li r29, 0 -/* 802125DC 3B 80 00 00 */ li r28, 0 -lbl_802125E0: -/* 802125E0 38 60 00 6C */ li r3, 0x6c -/* 802125E4 48 0B C6 69 */ bl __nw__FUl -/* 802125E8 7C 60 1B 79 */ or. r0, r3, r3 -/* 802125EC 41 82 00 28 */ beq lbl_80212614 -/* 802125F0 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 802125F4 38 1E 05 A8 */ addi r0, r30, 0x5a8 -/* 802125F8 7C C0 E2 14 */ add r6, r0, r28 -/* 802125FC 80 A6 00 00 */ lwz r5, 0(r6) -/* 80212600 80 C6 00 04 */ lwz r6, 4(r6) -/* 80212604 38 E0 00 00 */ li r7, 0 -/* 80212608 39 00 00 00 */ li r8, 0 -/* 8021260C 48 04 13 79 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212610 7C 60 1B 78 */ mr r0, r3 -lbl_80212614: -/* 80212614 3B 7D 02 E4 */ addi r27, r29, 0x2e4 -/* 80212618 7C 1F D9 2E */ stwx r0, r31, r27 -/* 8021261C 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 80212620 80 63 00 04 */ lwz r3, 4(r3) -/* 80212624 38 80 00 04 */ li r4, 4 -/* 80212628 48 0E 50 D1 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 8021262C 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 80212630 48 04 2F D9 */ bl hide__13CPaneMgrAlphaFv -/* 80212634 3B 5A 00 01 */ addi r26, r26, 1 -/* 80212638 2C 1A 00 05 */ cmpwi r26, 5 -/* 8021263C 3B BD 00 04 */ addi r29, r29, 4 -/* 80212640 3B 9C 00 08 */ addi r28, r28, 8 -/* 80212644 41 80 FF 9C */ blt lbl_802125E0 -/* 80212648 38 60 00 6C */ li r3, 0x6c -/* 8021264C 48 0B C6 01 */ bl __nw__FUl -/* 80212650 7C 60 1B 79 */ or. r0, r3, r3 -/* 80212654 41 82 00 24 */ beq lbl_80212678 -/* 80212658 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 8021265C 3C A0 65 79 */ lis r5, 0x6579 /* 0x65795F6E@ha */ -/* 80212660 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x65795F6E@l */ -/* 80212664 38 A0 00 6B */ li r5, 0x6b -/* 80212668 38 E0 00 02 */ li r7, 2 -/* 8021266C 39 00 00 00 */ li r8, 0 -/* 80212670 48 04 13 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80212674 7C 60 1B 78 */ mr r0, r3 -lbl_80212678: -/* 80212678 90 1F 02 E0 */ stw r0, 0x2e0(r31) -/* 8021267C 80 7F 02 E0 */ lwz r3, 0x2e0(r31) -/* 80212680 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80212684 48 04 31 4D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80212688 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021268C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80212690 A0 03 00 04 */ lhz r0, 4(r3) -/* 80212694 7F E3 FB 78 */ mr r3, r31 -/* 80212698 7C 04 07 34 */ extsh r4, r0 -/* 8021269C 48 00 3C 91 */ bl drawRupee__13dMeter2Draw_cFs -/* 802126A0 7F E3 FB 78 */ mr r3, r31 -/* 802126A4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802126A8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802126AC 88 84 09 74 */ lbz r4, 0x974(r4) -/* 802126B0 48 00 43 91 */ bl drawKey__13dMeter2Draw_cFs -/* 802126B4 7F E3 FB 78 */ mr r3, r31 -/* 802126B8 38 80 00 01 */ li r4, 1 -/* 802126BC 48 00 3F C9 */ bl setAlphaRupeeChange__13dMeter2Draw_cFb -/* 802126C0 7F E3 FB 78 */ mr r3, r31 -/* 802126C4 38 80 00 01 */ li r4, 1 -/* 802126C8 48 00 44 61 */ bl setAlphaKeyChange__13dMeter2Draw_cFb -/* 802126CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802126D0 48 14 FB 4D */ bl _restgpr_26 -/* 802126D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802126D8 7C 08 03 A6 */ mtlr r0 -/* 802126DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802126E0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/isBButtonShow__13dMeter2Draw_cFb.s b/asm/d/meter/d_meter2_draw/isBButtonShow__13dMeter2Draw_cFb.s deleted file mode 100644 index d3450987ee..0000000000 --- a/asm/d/meter/d_meter2_draw/isBButtonShow__13dMeter2Draw_cFb.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_8021BCC0: -/* 8021BCC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021BCC4 7C 08 02 A6 */ mflr r0 -/* 8021BCC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BCCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021BCD0 93 C1 00 08 */ stw r30, 8(r1) -/* 8021BCD4 7C 9E 23 78 */ mr r30, r4 -/* 8021BCD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021BCDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021BCE0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8021BCE4 28 03 00 00 */ cmplwi r3, 0 -/* 8021BCE8 40 82 00 0C */ bne lbl_8021BCF4 -/* 8021BCEC 38 60 00 00 */ li r3, 0 -/* 8021BCF0 48 00 00 C8 */ b lbl_8021BDB8 -lbl_8021BCF4: -/* 8021BCF4 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021BCF8 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 8021BCFC 88 04 00 BD */ lbz r0, 0xbd(r4) -/* 8021BD00 28 00 00 00 */ cmplwi r0, 0 -/* 8021BD04 40 82 00 A8 */ bne lbl_8021BDAC -/* 8021BD08 48 01 B3 E1 */ bl isHowlMessage__12dMsgObject_cFv -/* 8021BD0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021BD10 40 82 00 9C */ bne lbl_8021BDAC -/* 8021BD14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021BD18 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021BD1C 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 8021BD20 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8021BD24 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 8021BD28 7D 89 03 A6 */ mtctr r12 -/* 8021BD2C 4E 80 04 21 */ bctrl -/* 8021BD30 2C 03 00 00 */ cmpwi r3, 0 -/* 8021BD34 40 82 00 78 */ bne lbl_8021BDAC -/* 8021BD38 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021BD3C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021BD40 88 03 00 E8 */ lbz r0, 0xe8(r3) -/* 8021BD44 28 00 00 00 */ cmplwi r0, 0 -/* 8021BD48 40 82 00 64 */ bne lbl_8021BDAC -/* 8021BD4C 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 8021BD50 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8021BD54 81 8C 00 D0 */ lwz r12, 0xd0(r12) -/* 8021BD58 7D 89 03 A6 */ mtctr r12 -/* 8021BD5C 4E 80 04 21 */ bctrl -/* 8021BD60 2C 03 00 00 */ cmpwi r3, 0 -/* 8021BD64 41 82 00 0C */ beq lbl_8021BD70 -/* 8021BD68 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8021BD6C 40 82 00 40 */ bne lbl_8021BDAC -lbl_8021BD70: -/* 8021BD70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021BD74 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021BD78 88 64 4F AD */ lbz r3, 0x4fad(r4) -/* 8021BD7C 30 03 FF FF */ addic r0, r3, -1 -/* 8021BD80 7C 00 19 10 */ subfe r0, r0, r3 -/* 8021BD84 54 03 06 3F */ clrlwi. r3, r0, 0x18 -/* 8021BD88 41 82 00 10 */ beq lbl_8021BD98 -/* 8021BD8C A0 04 4F A4 */ lhz r0, 0x4fa4(r4) -/* 8021BD90 54 00 07 7A */ rlwinm r0, r0, 0, 0x1d, 0x1d -/* 8021BD94 48 00 00 08 */ b lbl_8021BD9C -lbl_8021BD98: -/* 8021BD98 38 00 00 00 */ li r0, 0 -lbl_8021BD9C: -/* 8021BD9C 54 00 04 3F */ clrlwi. r0, r0, 0x10 -/* 8021BDA0 40 82 00 14 */ bne lbl_8021BDB4 -/* 8021BDA4 2C 03 00 00 */ cmpwi r3, 0 -/* 8021BDA8 41 82 00 0C */ beq lbl_8021BDB4 -lbl_8021BDAC: -/* 8021BDAC 38 60 00 01 */ li r3, 1 -/* 8021BDB0 48 00 00 08 */ b lbl_8021BDB8 -lbl_8021BDB4: -/* 8021BDB4 38 60 00 00 */ li r3, 0 -lbl_8021BDB8: -/* 8021BDB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021BDBC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8021BDC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021BDC4 7C 08 03 A6 */ mtlr r0 -/* 8021BDC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021BDCC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor.s b/asm/d/meter/d_meter2_draw/playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor.s deleted file mode 100644 index 816a476984..0000000000 --- a/asm/d/meter/d_meter2_draw/playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor.s +++ /dev/null @@ -1,92 +0,0 @@ -lbl_80213E94: -/* 80213E94 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80213E98 7C 08 02 A6 */ mflr r0 -/* 80213E9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80213EA0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80213EA4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80213EA8 7C 7E 1B 78 */ mr r30, r3 -/* 80213EAC 7C 9F 23 79 */ or. r31, r4, r4 -/* 80213EB0 41 82 00 18 */ beq lbl_80213EC8 -/* 80213EB4 80 7E 01 D8 */ lwz r3, 0x1d8(r30) -/* 80213EB8 80 63 00 04 */ lwz r3, 4(r3) -/* 80213EBC 88 03 00 B2 */ lbz r0, 0xb2(r3) -/* 80213EC0 28 00 00 00 */ cmplwi r0, 0 -/* 80213EC4 40 82 00 3C */ bne lbl_80213F00 -lbl_80213EC8: -/* 80213EC8 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 80213ECC 3C 80 6D 5F */ lis r4, 0x6D5F /* 0x6D5F3030@ha */ -/* 80213ED0 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x6D5F3030@l */ -/* 80213ED4 38 A0 00 6D */ li r5, 0x6d -/* 80213ED8 81 83 00 00 */ lwz r12, 0(r3) -/* 80213EDC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213EE0 7D 89 03 A6 */ mtctr r12 -/* 80213EE4 4E 80 04 21 */ bctrl -/* 80213EE8 38 80 00 00 */ li r4, 0 -/* 80213EEC 81 83 00 00 */ lwz r12, 0(r3) -/* 80213EF0 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 80213EF4 7D 89 03 A6 */ mtctr r12 -/* 80213EF8 4E 80 04 21 */ bctrl -/* 80213EFC 48 00 00 DC */ b lbl_80213FD8 -lbl_80213F00: -/* 80213F00 C0 3E 05 58 */ lfs f1, 0x558(r30) -/* 80213F04 C0 02 AE 84 */ lfs f0, lit_4183(r2) -/* 80213F08 EC 01 00 2A */ fadds f0, f1, f0 -/* 80213F0C D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80213F10 C0 5E 05 58 */ lfs f2, 0x558(r30) -/* 80213F14 A8 9F 00 06 */ lha r4, 6(r31) -/* 80213F18 C8 22 AE A0 */ lfd f1, lit_4925(r2) -/* 80213F1C 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 80213F20 90 01 00 0C */ stw r0, 0xc(r1) -/* 80213F24 3C 60 43 30 */ lis r3, 0x4330 -/* 80213F28 90 61 00 08 */ stw r3, 8(r1) -/* 80213F2C C8 01 00 08 */ lfd f0, 8(r1) -/* 80213F30 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80213F34 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80213F38 4C 41 13 82 */ cror 2, 1, 2 -/* 80213F3C 40 82 00 24 */ bne lbl_80213F60 -/* 80213F40 7C 80 07 34 */ extsh r0, r4 -/* 80213F44 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80213F48 90 01 00 0C */ stw r0, 0xc(r1) -/* 80213F4C 90 61 00 08 */ stw r3, 8(r1) -/* 80213F50 C8 01 00 08 */ lfd f0, 8(r1) -/* 80213F54 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80213F58 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80213F5C D0 1E 05 58 */ stfs f0, 0x558(r30) -lbl_80213F60: -/* 80213F60 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 80213F64 3C 80 6D 5F */ lis r4, 0x6D5F /* 0x6D5F3030@ha */ -/* 80213F68 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x6D5F3030@l */ -/* 80213F6C 38 A0 00 6D */ li r5, 0x6d -/* 80213F70 81 83 00 00 */ lwz r12, 0(r3) -/* 80213F74 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213F78 7D 89 03 A6 */ mtctr r12 -/* 80213F7C 4E 80 04 21 */ bctrl -/* 80213F80 7F E4 FB 78 */ mr r4, r31 -/* 80213F84 81 83 00 00 */ lwz r12, 0(r3) -/* 80213F88 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 80213F8C 7D 89 03 A6 */ mtctr r12 -/* 80213F90 4E 80 04 21 */ bctrl -/* 80213F94 C0 1E 05 58 */ lfs f0, 0x558(r30) -/* 80213F98 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80213F9C 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 80213FA0 48 0E 56 F1 */ bl animation__9J2DScreenFv -/* 80213FA4 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 80213FA8 3C 80 6D 5F */ lis r4, 0x6D5F /* 0x6D5F3030@ha */ -/* 80213FAC 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x6D5F3030@l */ -/* 80213FB0 38 A0 00 6D */ li r5, 0x6d -/* 80213FB4 81 83 00 00 */ lwz r12, 0(r3) -/* 80213FB8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80213FBC 7D 89 03 A6 */ mtctr r12 -/* 80213FC0 4E 80 04 21 */ bctrl -/* 80213FC4 38 80 00 00 */ li r4, 0 -/* 80213FC8 81 83 00 00 */ lwz r12, 0(r3) -/* 80213FCC 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 80213FD0 7D 89 03 A6 */ mtctr r12 -/* 80213FD4 4E 80 04 21 */ bctrl -lbl_80213FD8: -/* 80213FD8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80213FDC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80213FE0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80213FE4 7C 08 03 A6 */ mtlr r0 -/* 80213FE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80213FEC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas.s b/asm/d/meter/d_meter2_draw/setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas.s deleted file mode 100644 index 20a083b2ba..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8021AAA4: -/* 8021AAA4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8021AAA8 7C 08 02 A6 */ mflr r0 -/* 8021AAAC 90 01 00 34 */ stw r0, 0x34(r1) -/* 8021AAB0 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 8021AAB4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 8021AAB8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8021AABC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8021AAC0 7C 9E 23 78 */ mr r30, r4 -/* 8021AAC4 7C BF 2B 78 */ mr r31, r5 -/* 8021AAC8 7F C3 F3 78 */ mr r3, r30 -/* 8021AACC 48 03 AD 5D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021AAD0 FF E0 08 90 */ fmr f31, f1 -/* 8021AAD4 A8 9E 00 16 */ lha r4, 0x16(r30) -/* 8021AAD8 7F E3 07 34 */ extsh r3, r31 -/* 8021AADC 7C 04 18 00 */ cmpw r4, r3 -/* 8021AAE0 41 80 00 24 */ blt lbl_8021AB04 -/* 8021AAE4 7F C3 F3 78 */ mr r3, r30 -/* 8021AAE8 48 03 AD 41 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021AAEC FC 1F 08 00 */ fcmpu cr0, f31, f1 -/* 8021AAF0 41 82 00 74 */ beq lbl_8021AB64 -/* 8021AAF4 7F C3 F3 78 */ mr r3, r30 -/* 8021AAF8 FC 20 F8 90 */ fmr f1, f31 -/* 8021AAFC 48 03 AC D5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8021AB00 48 00 00 64 */ b lbl_8021AB64 -lbl_8021AB04: -/* 8021AB04 38 84 00 01 */ addi r4, r4, 1 -/* 8021AB08 7C 80 07 34 */ extsh r0, r4 -/* 8021AB0C 7C 00 18 00 */ cmpw r0, r3 -/* 8021AB10 40 81 00 08 */ ble lbl_8021AB18 -/* 8021AB14 7F E4 FB 78 */ mr r4, r31 -lbl_8021AB18: -/* 8021AB18 B0 9E 00 16 */ sth r4, 0x16(r30) -/* 8021AB1C 7F C3 F3 78 */ mr r3, r30 -/* 8021AB20 7C 80 07 34 */ extsh r0, r4 -/* 8021AB24 C8 42 AE A0 */ lfd f2, lit_4925(r2) -/* 8021AB28 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8021AB2C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8021AB30 3C 80 43 30 */ lis r4, 0x4330 -/* 8021AB34 90 81 00 08 */ stw r4, 8(r1) -/* 8021AB38 C8 01 00 08 */ lfd f0, 8(r1) -/* 8021AB3C EC 20 10 28 */ fsubs f1, f0, f2 -/* 8021AB40 7F E0 07 34 */ extsh r0, r31 -/* 8021AB44 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8021AB48 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021AB4C 90 81 00 10 */ stw r4, 0x10(r1) -/* 8021AB50 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8021AB54 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8021AB58 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8021AB5C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 8021AB60 48 03 AC 71 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_8021AB64: -/* 8021AB64 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 8021AB68 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 8021AB6C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8021AB70 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8021AB74 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8021AB78 7C 08 03 A6 */ mtlr r0 -/* 8021AB7C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021AB80 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas.s b/asm/d/meter/d_meter2_draw/setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas.s deleted file mode 100644 index 71a54489e3..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8021A9C8: -/* 8021A9C8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8021A9CC 7C 08 02 A6 */ mflr r0 -/* 8021A9D0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021A9D4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8021A9D8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8021A9DC 7C 9E 23 78 */ mr r30, r4 -/* 8021A9E0 7C BF 2B 78 */ mr r31, r5 -/* 8021A9E4 7F C3 F3 78 */ mr r3, r30 -/* 8021A9E8 48 03 AE 41 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021A9EC A8 7E 00 16 */ lha r3, 0x16(r30) -/* 8021A9F0 7C 64 1B 78 */ mr r4, r3 -/* 8021A9F4 7F E0 07 34 */ extsh r0, r31 -/* 8021A9F8 7C 03 00 00 */ cmpw r3, r0 -/* 8021A9FC 40 81 00 08 */ ble lbl_8021AA04 -/* 8021AA00 7F E4 FB 78 */ mr r4, r31 -lbl_8021AA04: -/* 8021AA04 7C 80 07 35 */ extsh. r0, r4 -/* 8021AA08 41 81 00 28 */ bgt lbl_8021AA30 -/* 8021AA0C 7F C3 F3 78 */ mr r3, r30 -/* 8021AA10 48 03 AE 19 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021AA14 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021AA18 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8021AA1C 41 82 00 70 */ beq lbl_8021AA8C -/* 8021AA20 7F C3 F3 78 */ mr r3, r30 -/* 8021AA24 FC 20 00 90 */ fmr f1, f0 -/* 8021AA28 48 03 AD A9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8021AA2C 48 00 00 60 */ b lbl_8021AA8C -lbl_8021AA30: -/* 8021AA30 38 84 FF FF */ addi r4, r4, -1 -/* 8021AA34 7C 80 07 35 */ extsh. r0, r4 -/* 8021AA38 40 80 00 08 */ bge lbl_8021AA40 -/* 8021AA3C 38 80 00 00 */ li r4, 0 -lbl_8021AA40: -/* 8021AA40 B0 9E 00 16 */ sth r4, 0x16(r30) -/* 8021AA44 7F C3 F3 78 */ mr r3, r30 -/* 8021AA48 7C 80 07 34 */ extsh r0, r4 -/* 8021AA4C C8 62 AE A0 */ lfd f3, lit_4925(r2) -/* 8021AA50 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8021AA54 90 01 00 0C */ stw r0, 0xc(r1) -/* 8021AA58 3C 80 43 30 */ lis r4, 0x4330 -/* 8021AA5C 90 81 00 08 */ stw r4, 8(r1) -/* 8021AA60 C8 01 00 08 */ lfd f0, 8(r1) -/* 8021AA64 EC 40 18 28 */ fsubs f2, f0, f3 -/* 8021AA68 7F E0 07 34 */ extsh r0, r31 -/* 8021AA6C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8021AA70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021AA74 90 81 00 10 */ stw r4, 0x10(r1) -/* 8021AA78 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8021AA7C EC 00 18 28 */ fsubs f0, f0, f3 -/* 8021AA80 EC 02 00 24 */ fdivs f0, f2, f0 -/* 8021AA84 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021AA88 48 03 AD 49 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_8021AA8C: -/* 8021AA8C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8021AA90 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8021AA94 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8021AA98 7C 08 03 A6 */ mtlr r0 -/* 8021AA9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021AAA0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonAAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonAAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index 49c0085544..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonAAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80219258: -/* 80219258 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8021925C 7C 08 02 A6 */ mflr r0 -/* 80219260 90 01 00 24 */ stw r0, 0x24(r1) -/* 80219264 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219268 48 14 8F 6D */ bl _savegpr_27 -/* 8021926C 7C 7B 1B 78 */ mr r27, r3 -/* 80219270 80 63 03 00 */ lwz r3, 0x300(r3) -/* 80219274 48 03 C5 B5 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219278 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021927C 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219280 C0 7E 00 A8 */ lfs f3, 0xa8(r30) -/* 80219284 C0 5E 00 18 */ lfs f2, 0x18(r30) -/* 80219288 C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 8021928C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80219290 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80219294 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80219298 41 82 00 20 */ beq lbl_802192B8 -/* 8021929C 80 7B 03 00 */ lwz r3, 0x300(r27) -/* 802192A0 FC 20 00 90 */ fmr f1, f0 -/* 802192A4 48 03 C5 2D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802192A8 7F 63 DB 78 */ mr r3, r27 -/* 802192AC 80 9B 03 00 */ lwz r4, 0x300(r27) -/* 802192B0 38 A0 00 05 */ li r5, 5 -/* 802192B4 48 00 17 F1 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_802192B8: -/* 802192B8 3B 80 00 00 */ li r28, 0 -/* 802192BC 3B E0 00 00 */ li r31, 0 -lbl_802192C0: -/* 802192C0 3B BF 00 C0 */ addi r29, r31, 0xc0 -/* 802192C4 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802192C8 48 03 C5 61 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802192CC C0 5E 00 18 */ lfs f2, 0x18(r30) -/* 802192D0 C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 802192D4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802192D8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802192DC 41 82 00 20 */ beq lbl_802192FC -/* 802192E0 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802192E4 FC 20 00 90 */ fmr f1, f0 -/* 802192E8 48 03 C4 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802192EC 7F 63 DB 78 */ mr r3, r27 -/* 802192F0 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 802192F4 38 A0 00 05 */ li r5, 5 -/* 802192F8 48 00 17 AD */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_802192FC: -/* 802192FC 3B 9C 00 01 */ addi r28, r28, 1 -/* 80219300 2C 1C 00 05 */ cmpwi r28, 5 -/* 80219304 3B FF 00 04 */ addi r31, r31, 4 -/* 80219308 41 80 FF B8 */ blt lbl_802192C0 -/* 8021930C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219310 48 14 8F 11 */ bl _restgpr_27 -/* 80219314 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80219318 7C 08 03 A6 */ mtlr r0 -/* 8021931C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80219320 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonAAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonAAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index fe942c3b88..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonAAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80219174: -/* 80219174 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80219178 7C 08 02 A6 */ mflr r0 -/* 8021917C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80219180 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80219184 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80219188 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021918C 48 14 90 49 */ bl _savegpr_27 -/* 80219190 7C 7B 1B 78 */ mr r27, r3 -/* 80219194 80 63 03 00 */ lwz r3, 0x300(r3) -/* 80219198 48 03 C6 91 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021919C C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 802191A0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802191A4 41 82 00 38 */ beq lbl_802191DC -/* 802191A8 80 7B 03 00 */ lwz r3, 0x300(r27) -/* 802191AC 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802191B0 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802191B4 C0 44 00 A8 */ lfs f2, 0xa8(r4) -/* 802191B8 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 802191BC C0 04 00 84 */ lfs f0, 0x84(r4) -/* 802191C0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802191C4 EC 22 00 32 */ fmuls f1, f2, f0 -/* 802191C8 48 03 C6 09 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802191CC 7F 63 DB 78 */ mr r3, r27 -/* 802191D0 80 9B 03 00 */ lwz r4, 0x300(r27) -/* 802191D4 38 A0 00 05 */ li r5, 5 -/* 802191D8 48 00 17 F1 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_802191DC: -/* 802191DC 3B 80 00 00 */ li r28, 0 -/* 802191E0 3B E0 00 00 */ li r31, 0 -/* 802191E4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802191E8 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802191EC C3 E2 AE 80 */ lfs f31, lit_4182(r2) -lbl_802191F0: -/* 802191F0 3B BF 00 C0 */ addi r29, r31, 0xc0 -/* 802191F4 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802191F8 48 03 C6 31 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802191FC FC 1F 08 00 */ fcmpu cr0, f31, f1 -/* 80219200 41 82 00 28 */ beq lbl_80219228 -/* 80219204 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80219208 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 8021920C C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 80219210 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80219214 48 03 C5 BD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80219218 7F 63 DB 78 */ mr r3, r27 -/* 8021921C 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 80219220 38 A0 00 05 */ li r5, 5 -/* 80219224 48 00 17 A5 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80219228: -/* 80219228 3B 9C 00 01 */ addi r28, r28, 1 -/* 8021922C 2C 1C 00 05 */ cmpwi r28, 5 -/* 80219230 3B FF 00 04 */ addi r31, r31, 4 -/* 80219234 41 80 FF BC */ blt lbl_802191F0 -/* 80219238 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 8021923C CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80219240 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219244 48 14 8F DD */ bl _restgpr_27 -/* 80219248 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8021924C 7C 08 03 A6 */ mtlr r0 -/* 80219250 38 21 00 30 */ addi r1, r1, 0x30 -/* 80219254 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index e963b746c2..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_802190A8: -/* 802190A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802190AC 7C 08 02 A6 */ mflr r0 -/* 802190B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802190B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802190B8 7C 7F 1B 78 */ mr r31, r3 -/* 802190BC 80 63 02 F8 */ lwz r3, 0x2f8(r3) -/* 802190C0 48 03 C7 69 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802190C4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802190C8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802190CC C0 43 00 18 */ lfs f2, 0x18(r3) -/* 802190D0 C0 03 00 84 */ lfs f0, 0x84(r3) -/* 802190D4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802190D8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802190DC 41 82 00 44 */ beq lbl_80219120 -/* 802190E0 80 7F 02 F8 */ lwz r3, 0x2f8(r31) -/* 802190E4 FC 20 00 90 */ fmr f1, f0 -/* 802190E8 48 03 C6 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802190EC 7F E3 FB 78 */ mr r3, r31 -/* 802190F0 80 9F 02 F8 */ lwz r4, 0x2f8(r31) -/* 802190F4 38 A0 00 05 */ li r5, 5 -/* 802190F8 48 00 19 AD */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -/* 802190FC 80 1F 04 B8 */ lwz r0, 0x4b8(r31) -/* 80219100 28 00 00 00 */ cmplwi r0, 0 -/* 80219104 41 82 00 1C */ beq lbl_80219120 -/* 80219108 80 7F 02 F8 */ lwz r3, 0x2f8(r31) -/* 8021910C 48 03 C7 1D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219110 C0 1F 08 38 */ lfs f0, 0x838(r31) -/* 80219114 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80219118 80 7F 04 B8 */ lwz r3, 0x4b8(r31) -/* 8021911C 48 03 C6 B5 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80219120: -/* 80219120 80 7F 02 F8 */ lwz r3, 0x2f8(r31) -/* 80219124 A8 03 00 16 */ lha r0, 0x16(r3) -/* 80219128 2C 00 00 05 */ cmpwi r0, 5 -/* 8021912C 40 82 00 34 */ bne lbl_80219160 -/* 80219130 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80219134 38 83 01 88 */ addi r4, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80219138 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021913C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80219140 88 03 4E 0C */ lbz r0, 0x4e0c(r3) -/* 80219144 7C 00 07 74 */ extsb r0, r0 -/* 80219148 7C 64 02 14 */ add r3, r4, r0 -/* 8021914C 8C 03 00 E3 */ lbzu r0, 0xe3(r3) -/* 80219150 28 00 00 01 */ cmplwi r0, 1 -/* 80219154 40 82 00 0C */ bne lbl_80219160 -/* 80219158 38 00 00 02 */ li r0, 2 -/* 8021915C 98 03 00 00 */ stb r0, 0(r3) -lbl_80219160: -/* 80219160 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80219164 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80219168 7C 08 03 A6 */ mtlr r0 -/* 8021916C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80219170 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index a260ad24ff..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8021901C: -/* 8021901C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80219020 7C 08 02 A6 */ mflr r0 -/* 80219024 90 01 00 14 */ stw r0, 0x14(r1) -/* 80219028 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021902C 7C 7F 1B 78 */ mr r31, r3 -/* 80219030 80 63 02 F8 */ lwz r3, 0x2f8(r3) -/* 80219034 48 03 C7 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219038 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021903C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80219040 41 82 00 54 */ beq lbl_80219094 -/* 80219044 80 7F 02 F8 */ lwz r3, 0x2f8(r31) -/* 80219048 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021904C 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219050 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80219054 C0 04 00 84 */ lfs f0, 0x84(r4) -/* 80219058 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021905C 48 03 C7 75 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80219060 7F E3 FB 78 */ mr r3, r31 -/* 80219064 80 9F 02 F8 */ lwz r4, 0x2f8(r31) -/* 80219068 38 A0 00 05 */ li r5, 5 -/* 8021906C 48 00 19 5D */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -/* 80219070 80 1F 04 B8 */ lwz r0, 0x4b8(r31) -/* 80219074 28 00 00 00 */ cmplwi r0, 0 -/* 80219078 41 82 00 1C */ beq lbl_80219094 -/* 8021907C 80 7F 02 F8 */ lwz r3, 0x2f8(r31) -/* 80219080 48 03 C7 A9 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219084 C0 1F 08 38 */ lfs f0, 0x838(r31) -/* 80219088 EC 20 00 72 */ fmuls f1, f0, f1 -/* 8021908C 80 7F 04 B8 */ lwz r3, 0x4b8(r31) -/* 80219090 48 03 C7 41 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80219094: -/* 80219094 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80219098 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021909C 7C 08 03 A6 */ mtlr r0 -/* 802190A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802190A4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonBAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonBAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index b8c17878ff..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonBAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_80219474: -/* 80219474 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80219478 7C 08 02 A6 */ mflr r0 -/* 8021947C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80219480 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219484 48 14 8D 51 */ bl _savegpr_27 -/* 80219488 7C 7B 1B 78 */ mr r27, r3 -/* 8021948C 80 63 03 04 */ lwz r3, 0x304(r3) -/* 80219490 48 03 C3 99 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219494 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219498 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021949C C0 7E 00 F0 */ lfs f3, 0xf0(r30) -/* 802194A0 C0 5E 00 18 */ lfs f2, 0x18(r30) -/* 802194A4 C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 802194A8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802194AC EC 03 00 32 */ fmuls f0, f3, f0 -/* 802194B0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802194B4 41 82 00 4C */ beq lbl_80219500 -/* 802194B8 80 7B 03 04 */ lwz r3, 0x304(r27) -/* 802194BC FC 20 00 90 */ fmr f1, f0 -/* 802194C0 48 03 C3 11 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802194C4 7F 63 DB 78 */ mr r3, r27 -/* 802194C8 80 9B 03 04 */ lwz r4, 0x304(r27) -/* 802194CC 38 A0 00 05 */ li r5, 5 -/* 802194D0 48 00 15 D5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -/* 802194D4 80 7B 03 18 */ lwz r3, 0x318(r27) -/* 802194D8 C0 5E 00 F0 */ lfs f2, 0xf0(r30) -/* 802194DC C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 802194E0 C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 802194E4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802194E8 EC 22 00 32 */ fmuls f1, f2, f0 -/* 802194EC 48 03 C2 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802194F0 7F 63 DB 78 */ mr r3, r27 -/* 802194F4 80 9B 03 18 */ lwz r4, 0x318(r27) -/* 802194F8 38 A0 00 05 */ li r5, 5 -/* 802194FC 48 00 15 A9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80219500: -/* 80219500 80 7B 03 28 */ lwz r3, 0x328(r27) -/* 80219504 48 03 C3 25 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219508 C0 5E 00 18 */ lfs f2, 0x18(r30) -/* 8021950C C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 80219510 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80219514 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80219518 41 82 00 20 */ beq lbl_80219538 -/* 8021951C 80 7B 03 28 */ lwz r3, 0x328(r27) -/* 80219520 FC 20 00 90 */ fmr f1, f0 -/* 80219524 48 03 C2 AD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80219528 7F 63 DB 78 */ mr r3, r27 -/* 8021952C 80 9B 03 28 */ lwz r4, 0x328(r27) -/* 80219530 38 A0 00 05 */ li r5, 5 -/* 80219534 48 00 15 71 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80219538: -/* 80219538 3B 80 00 00 */ li r28, 0 -/* 8021953C 3B E0 00 00 */ li r31, 0 -lbl_80219540: -/* 80219540 3B BF 00 D4 */ addi r29, r31, 0xd4 -/* 80219544 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80219548 48 03 C2 E1 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021954C C0 5E 00 18 */ lfs f2, 0x18(r30) -/* 80219550 C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 80219554 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80219558 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8021955C 41 82 00 20 */ beq lbl_8021957C -/* 80219560 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80219564 FC 20 00 90 */ fmr f1, f0 -/* 80219568 48 03 C2 69 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8021956C 7F 63 DB 78 */ mr r3, r27 -/* 80219570 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 80219574 38 A0 00 05 */ li r5, 5 -/* 80219578 48 00 15 2D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_8021957C: -/* 8021957C 3B 9C 00 01 */ addi r28, r28, 1 -/* 80219580 2C 1C 00 05 */ cmpwi r28, 5 -/* 80219584 3B FF 00 04 */ addi r31, r31, 4 -/* 80219588 41 80 FF B8 */ blt lbl_80219540 -/* 8021958C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219590 48 14 8C 91 */ bl _restgpr_27 -/* 80219594 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80219598 7C 08 03 A6 */ mtlr r0 -/* 8021959C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802195A0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonBAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonBAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index d4a2cc9f1d..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonBAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_80219324: -/* 80219324 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80219328 7C 08 02 A6 */ mflr r0 -/* 8021932C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80219330 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80219334 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80219338 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021933C 48 14 8E 99 */ bl _savegpr_27 -/* 80219340 7C 7B 1B 78 */ mr r27, r3 -/* 80219344 80 63 03 04 */ lwz r3, 0x304(r3) -/* 80219348 48 03 C4 E1 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021934C C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80219350 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80219354 41 82 00 64 */ beq lbl_802193B8 -/* 80219358 80 7B 03 04 */ lwz r3, 0x304(r27) -/* 8021935C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219360 3B C4 EB C8 */ addi r30, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219364 C0 5E 00 F0 */ lfs f2, 0xf0(r30) -/* 80219368 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 8021936C C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 80219370 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80219374 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80219378 48 03 C4 59 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8021937C 7F 63 DB 78 */ mr r3, r27 -/* 80219380 80 9B 03 04 */ lwz r4, 0x304(r27) -/* 80219384 38 A0 00 05 */ li r5, 5 -/* 80219388 48 00 16 41 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -/* 8021938C 80 7B 03 18 */ lwz r3, 0x318(r27) -/* 80219390 C0 5E 00 F0 */ lfs f2, 0xf0(r30) -/* 80219394 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 80219398 C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 8021939C EC 01 00 32 */ fmuls f0, f1, f0 -/* 802193A0 EC 22 00 32 */ fmuls f1, f2, f0 -/* 802193A4 48 03 C4 2D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802193A8 7F 63 DB 78 */ mr r3, r27 -/* 802193AC 80 9B 03 18 */ lwz r4, 0x318(r27) -/* 802193B0 38 A0 00 05 */ li r5, 5 -/* 802193B4 48 00 16 15 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_802193B8: -/* 802193B8 80 7B 03 28 */ lwz r3, 0x328(r27) -/* 802193BC 48 03 C4 6D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802193C0 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 802193C4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802193C8 41 82 00 30 */ beq lbl_802193F8 -/* 802193CC 80 7B 03 28 */ lwz r3, 0x328(r27) -/* 802193D0 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802193D4 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802193D8 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 802193DC C0 04 00 84 */ lfs f0, 0x84(r4) -/* 802193E0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802193E4 48 03 C3 ED */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802193E8 7F 63 DB 78 */ mr r3, r27 -/* 802193EC 80 9B 03 28 */ lwz r4, 0x328(r27) -/* 802193F0 38 A0 00 05 */ li r5, 5 -/* 802193F4 48 00 15 D5 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_802193F8: -/* 802193F8 3B 80 00 00 */ li r28, 0 -/* 802193FC 3B E0 00 00 */ li r31, 0 -/* 80219400 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219404 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219408 C3 E2 AE 80 */ lfs f31, lit_4182(r2) -lbl_8021940C: -/* 8021940C 3B BF 00 D4 */ addi r29, r31, 0xd4 -/* 80219410 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80219414 48 03 C4 15 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219418 FC 1F 08 00 */ fcmpu cr0, f31, f1 -/* 8021941C 41 82 00 28 */ beq lbl_80219444 -/* 80219420 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80219424 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 80219428 C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 8021942C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80219430 48 03 C3 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80219434 7F 63 DB 78 */ mr r3, r27 -/* 80219438 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 8021943C 38 A0 00 05 */ li r5, 5 -/* 80219440 48 00 15 89 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80219444: -/* 80219444 3B 9C 00 01 */ addi r28, r28, 1 -/* 80219448 2C 1C 00 05 */ cmpwi r28, 5 -/* 8021944C 3B FF 00 04 */ addi r31, r31, 4 -/* 80219450 41 80 FF BC */ blt lbl_8021940C -/* 80219454 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80219458 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 8021945C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219460 48 14 8D C1 */ bl _restgpr_27 -/* 80219464 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80219468 7C 08 03 A6 */ mtlr r0 -/* 8021946C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80219470 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonChange__13dMeter2Draw_cFb.s b/asm/d/meter/d_meter2_draw/setAlphaButtonChange__13dMeter2Draw_cFb.s deleted file mode 100644 index 39cfdd11f7..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonChange__13dMeter2Draw_cFb.s +++ /dev/null @@ -1,612 +0,0 @@ -lbl_80218788: -/* 80218788 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 8021878C 7C 08 02 A6 */ mflr r0 -/* 80218790 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 80218794 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80218798 48 14 9A 0D */ bl _savegpr_15 -/* 8021879C 7C 72 1B 78 */ mr r18, r3 -/* 802187A0 7C 93 23 78 */ mr r19, r4 -/* 802187A4 3B A0 00 00 */ li r29, 0 -/* 802187A8 3B 80 00 00 */ li r28, 0 -/* 802187AC 3B 60 00 00 */ li r27, 0 -/* 802187B0 3B 40 00 00 */ li r26, 0 -/* 802187B4 3B 20 00 00 */ li r25, 0 -/* 802187B8 3B 00 00 00 */ li r24, 0 -/* 802187BC 3A E0 00 00 */ li r23, 0 -/* 802187C0 3A C0 00 00 */ li r22, 0 -/* 802187C4 3A A0 00 00 */ li r21, 0 -/* 802187C8 3A 80 00 00 */ li r20, 0 -/* 802187CC C0 03 07 F0 */ lfs f0, 0x7f0(r3) -/* 802187D0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802187D4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802187D8 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 802187DC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802187E0 40 82 00 0C */ bne lbl_802187EC -/* 802187E4 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 802187E8 41 82 00 0C */ beq lbl_802187F4 -lbl_802187EC: -/* 802187EC D0 32 07 F0 */ stfs f1, 0x7f0(r18) -/* 802187F0 3B A0 00 01 */ li r29, 1 -lbl_802187F4: -/* 802187F4 C0 12 07 F4 */ lfs f0, 0x7f4(r18) -/* 802187F8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802187FC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218800 C0 23 00 84 */ lfs f1, 0x84(r3) -/* 80218804 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218808 40 82 00 0C */ bne lbl_80218814 -/* 8021880C 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218810 41 82 00 0C */ beq lbl_8021881C -lbl_80218814: -/* 80218814 D0 32 07 F0 */ stfs f1, 0x7f0(r18) -/* 80218818 3B A0 00 01 */ li r29, 1 -lbl_8021881C: -/* 8021881C C0 12 07 FC */ lfs f0, 0x7fc(r18) -/* 80218820 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218824 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218828 C0 23 00 A8 */ lfs f1, 0xa8(r3) -/* 8021882C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218830 40 82 00 0C */ bne lbl_8021883C -/* 80218834 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218838 41 82 00 0C */ beq lbl_80218844 -lbl_8021883C: -/* 8021883C D0 32 07 FC */ stfs f1, 0x7fc(r18) -/* 80218840 3B 80 00 01 */ li r28, 1 -lbl_80218844: -/* 80218844 C0 12 08 00 */ lfs f0, 0x800(r18) -/* 80218848 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021884C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218850 C0 23 00 F0 */ lfs f1, 0xf0(r3) -/* 80218854 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218858 40 82 00 0C */ bne lbl_80218864 -/* 8021885C 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218860 41 82 00 0C */ beq lbl_8021886C -lbl_80218864: -/* 80218864 D0 32 08 00 */ stfs f1, 0x800(r18) -/* 80218868 3B 60 00 01 */ li r27, 1 -lbl_8021886C: -/* 8021886C C0 12 08 04 */ lfs f0, 0x804(r18) -/* 80218870 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218874 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218878 C0 23 01 48 */ lfs f1, 0x148(r3) -/* 8021887C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218880 40 82 00 0C */ bne lbl_8021888C -/* 80218884 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218888 41 82 00 0C */ beq lbl_80218894 -lbl_8021888C: -/* 8021888C D0 32 08 04 */ stfs f1, 0x804(r18) -/* 80218890 3B 40 00 01 */ li r26, 1 -lbl_80218894: -/* 80218894 C0 12 08 08 */ lfs f0, 0x808(r18) -/* 80218898 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021889C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802188A0 C0 23 01 58 */ lfs f1, 0x158(r3) -/* 802188A4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802188A8 40 82 00 0C */ bne lbl_802188B4 -/* 802188AC 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 802188B0 41 82 00 0C */ beq lbl_802188BC -lbl_802188B4: -/* 802188B4 D0 32 08 08 */ stfs f1, 0x808(r18) -/* 802188B8 3B 20 00 01 */ li r25, 1 -lbl_802188BC: -/* 802188BC C0 12 08 0C */ lfs f0, 0x80c(r18) -/* 802188C0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802188C4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802188C8 C0 23 01 68 */ lfs f1, 0x168(r3) -/* 802188CC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802188D0 40 82 00 0C */ bne lbl_802188DC -/* 802188D4 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 802188D8 41 82 00 08 */ beq lbl_802188E0 -lbl_802188DC: -/* 802188DC D0 32 08 0C */ stfs f1, 0x80c(r18) -lbl_802188E0: -/* 802188E0 C0 12 08 10 */ lfs f0, 0x810(r18) -/* 802188E4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802188E8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802188EC C0 23 01 78 */ lfs f1, 0x178(r3) -/* 802188F0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802188F4 40 82 00 0C */ bne lbl_80218900 -/* 802188F8 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 802188FC 41 82 00 0C */ beq lbl_80218908 -lbl_80218900: -/* 80218900 D0 32 08 10 */ stfs f1, 0x810(r18) -/* 80218904 3B 00 00 01 */ li r24, 1 -lbl_80218908: -/* 80218908 3B C0 00 00 */ li r30, 0 -/* 8021890C 3B E0 00 00 */ li r31, 0 -/* 80218910 7F EF FB 78 */ mr r15, r31 -/* 80218914 3A 01 00 44 */ addi r16, r1, 0x44 -/* 80218918 3A 20 00 01 */ li r17, 1 -lbl_8021891C: -/* 8021891C 38 1F 03 54 */ addi r0, r31, 0x354 -/* 80218920 7C 72 00 2E */ lwzx r3, r18, r0 -/* 80218924 48 03 CD 29 */ bl isVisible__13CPaneMgrAlphaFv -/* 80218928 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021892C 41 82 00 0C */ beq lbl_80218938 -/* 80218930 7D F0 F9 2E */ stwx r15, r16, r31 -/* 80218934 48 00 00 08 */ b lbl_8021893C -lbl_80218938: -/* 80218938 7E 30 F9 2E */ stwx r17, r16, r31 -lbl_8021893C: -/* 8021893C 3B DE 00 01 */ addi r30, r30, 1 -/* 80218940 2C 1E 00 02 */ cmpwi r30, 2 -/* 80218944 3B FF 00 04 */ addi r31, r31, 4 -/* 80218948 41 80 FF D4 */ blt lbl_8021891C -/* 8021894C 38 00 00 00 */ li r0, 0 -/* 80218950 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80218954 90 01 00 50 */ stw r0, 0x50(r1) -/* 80218958 54 04 10 3A */ slwi r4, r0, 2 -/* 8021895C 7C B2 22 14 */ add r5, r18, r4 -/* 80218960 C0 05 08 14 */ lfs f0, 0x814(r5) -/* 80218964 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218968 38 03 EB C8 */ addi r0, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021896C 7C 60 22 14 */ add r3, r0, r4 -/* 80218970 C0 23 02 38 */ lfs f1, 0x238(r3) -/* 80218974 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218978 40 82 00 0C */ bne lbl_80218984 -/* 8021897C 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218980 41 82 00 08 */ beq lbl_80218988 -lbl_80218984: -/* 80218984 D0 25 08 14 */ stfs f1, 0x814(r5) -lbl_80218988: -/* 80218988 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8021898C 54 04 10 3A */ slwi r4, r0, 2 -/* 80218990 7F F2 22 14 */ add r31, r18, r4 -/* 80218994 C0 1F 08 1C */ lfs f0, 0x81c(r31) -/* 80218998 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021899C 38 03 EB C8 */ addi r0, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802189A0 7C 60 22 14 */ add r3, r0, r4 -/* 802189A4 C0 23 02 58 */ lfs f1, 0x258(r3) -/* 802189A8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802189AC 40 82 00 0C */ bne lbl_802189B8 -/* 802189B0 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 802189B4 41 82 00 0C */ beq lbl_802189C0 -lbl_802189B8: -/* 802189B8 D0 3F 08 1C */ stfs f1, 0x81c(r31) -/* 802189BC 3A E0 00 01 */ li r23, 1 -lbl_802189C0: -/* 802189C0 80 01 00 48 */ lwz r0, 0x48(r1) -/* 802189C4 54 04 10 3A */ slwi r4, r0, 2 -/* 802189C8 7F D2 22 14 */ add r30, r18, r4 -/* 802189CC C0 1E 08 24 */ lfs f0, 0x824(r30) -/* 802189D0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802189D4 38 03 EB C8 */ addi r0, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802189D8 7C 60 22 14 */ add r3, r0, r4 -/* 802189DC C0 23 02 78 */ lfs f1, 0x278(r3) -/* 802189E0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802189E4 40 82 00 0C */ bne lbl_802189F0 -/* 802189E8 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 802189EC 41 82 00 0C */ beq lbl_802189F8 -lbl_802189F0: -/* 802189F0 D0 3E 08 24 */ stfs f1, 0x824(r30) -/* 802189F4 3A C0 00 01 */ li r22, 1 -lbl_802189F8: -/* 802189F8 C0 12 08 34 */ lfs f0, 0x834(r18) -/* 802189FC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218A00 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218A04 C0 23 02 AC */ lfs f1, 0x2ac(r3) -/* 80218A08 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218A0C 40 82 00 0C */ bne lbl_80218A18 -/* 80218A10 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218A14 41 82 00 0C */ beq lbl_80218A20 -lbl_80218A18: -/* 80218A18 D0 32 08 34 */ stfs f1, 0x834(r18) -/* 80218A1C 3A 80 00 01 */ li r20, 1 -lbl_80218A20: -/* 80218A20 C0 12 08 38 */ lfs f0, 0x838(r18) -/* 80218A24 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218A28 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218A2C C0 23 02 B0 */ lfs f1, 0x2b0(r3) -/* 80218A30 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218A34 40 82 00 0C */ bne lbl_80218A40 -/* 80218A38 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218A3C 41 82 00 0C */ beq lbl_80218A48 -lbl_80218A40: -/* 80218A40 D0 32 08 38 */ stfs f1, 0x838(r18) -/* 80218A44 3A A0 00 01 */ li r21, 1 -lbl_80218A48: -/* 80218A48 C0 12 07 F8 */ lfs f0, 0x7f8(r18) -/* 80218A4C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218A50 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218A54 C0 23 00 A0 */ lfs f1, 0xa0(r3) -/* 80218A58 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218A5C 40 82 00 0C */ bne lbl_80218A68 -/* 80218A60 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218A64 41 82 00 08 */ beq lbl_80218A6C -lbl_80218A68: -/* 80218A68 D0 32 07 F8 */ stfs f1, 0x7f8(r18) -lbl_80218A6C: -/* 80218A6C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80218A70 40 82 00 14 */ bne lbl_80218A84 -/* 80218A74 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80218A78 40 82 00 0C */ bne lbl_80218A84 -/* 80218A7C 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218A80 41 82 00 18 */ beq lbl_80218A98 -lbl_80218A84: -/* 80218A84 80 72 03 00 */ lwz r3, 0x300(r18) -/* 80218A88 C0 32 07 FC */ lfs f1, 0x7fc(r18) -/* 80218A8C C0 12 07 F0 */ lfs f0, 0x7f0(r18) -/* 80218A90 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218A94 48 03 CD 3D */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80218A98: -/* 80218A98 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80218A9C 40 82 00 14 */ bne lbl_80218AB0 -/* 80218AA0 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80218AA4 40 82 00 0C */ bne lbl_80218AB0 -/* 80218AA8 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218AAC 41 82 00 18 */ beq lbl_80218AC4 -lbl_80218AB0: -/* 80218AB0 80 72 03 04 */ lwz r3, 0x304(r18) -/* 80218AB4 C0 32 08 00 */ lfs f1, 0x800(r18) -/* 80218AB8 C0 12 07 F0 */ lfs f0, 0x7f0(r18) -/* 80218ABC EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218AC0 48 03 CD 11 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80218AC4: -/* 80218AC4 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80218AC8 40 82 00 14 */ bne lbl_80218ADC -/* 80218ACC 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 80218AD0 40 82 00 0C */ bne lbl_80218ADC -/* 80218AD4 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218AD8 41 82 00 18 */ beq lbl_80218AF0 -lbl_80218ADC: -/* 80218ADC 80 72 03 0C */ lwz r3, 0x30c(r18) -/* 80218AE0 C0 32 08 04 */ lfs f1, 0x804(r18) -/* 80218AE4 C0 12 07 F0 */ lfs f0, 0x7f0(r18) -/* 80218AE8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218AEC 48 03 CC E5 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80218AF0: -/* 80218AF0 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80218AF4 40 82 00 14 */ bne lbl_80218B08 -/* 80218AF8 57 20 06 3F */ clrlwi. r0, r25, 0x18 -/* 80218AFC 40 82 00 0C */ bne lbl_80218B08 -/* 80218B00 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218B04 41 82 00 18 */ beq lbl_80218B1C -lbl_80218B08: -/* 80218B08 80 72 03 10 */ lwz r3, 0x310(r18) -/* 80218B0C C0 32 08 08 */ lfs f1, 0x808(r18) -/* 80218B10 C0 12 07 F0 */ lfs f0, 0x7f0(r18) -/* 80218B14 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B18 48 03 CC B9 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80218B1C: -/* 80218B1C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80218B20 40 82 00 14 */ bne lbl_80218B34 -/* 80218B24 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 80218B28 40 82 00 0C */ bne lbl_80218B34 -/* 80218B2C 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218B30 41 82 00 18 */ beq lbl_80218B48 -lbl_80218B34: -/* 80218B34 80 72 03 14 */ lwz r3, 0x314(r18) -/* 80218B38 C0 32 08 10 */ lfs f1, 0x810(r18) -/* 80218B3C C0 12 07 F0 */ lfs f0, 0x7f0(r18) -/* 80218B40 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B44 48 03 CC 8D */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80218B48: -/* 80218B48 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80218B4C 40 82 00 14 */ bne lbl_80218B60 -/* 80218B50 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 80218B54 40 82 00 0C */ bne lbl_80218B60 -/* 80218B58 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218B5C 41 82 00 18 */ beq lbl_80218B74 -lbl_80218B60: -/* 80218B60 80 72 03 1C */ lwz r3, 0x31c(r18) -/* 80218B64 C0 3F 08 1C */ lfs f1, 0x81c(r31) -/* 80218B68 C0 12 07 F0 */ lfs f0, 0x7f0(r18) -/* 80218B6C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B70 48 03 CC 61 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80218B74: -/* 80218B74 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80218B78 40 82 00 14 */ bne lbl_80218B8C -/* 80218B7C 56 C0 06 3F */ clrlwi. r0, r22, 0x18 -/* 80218B80 40 82 00 0C */ bne lbl_80218B8C -/* 80218B84 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218B88 41 82 00 18 */ beq lbl_80218BA0 -lbl_80218B8C: -/* 80218B8C 80 72 03 20 */ lwz r3, 0x320(r18) -/* 80218B90 C0 3E 08 24 */ lfs f1, 0x824(r30) -/* 80218B94 C0 12 07 F0 */ lfs f0, 0x7f0(r18) -/* 80218B98 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B9C 48 03 CC 35 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80218BA0: -/* 80218BA0 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80218BA4 40 82 00 0C */ bne lbl_80218BB0 -/* 80218BA8 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218BAC 41 82 00 24 */ beq lbl_80218BD0 -lbl_80218BB0: -/* 80218BB0 80 72 03 24 */ lwz r3, 0x324(r18) -/* 80218BB4 80 01 00 4C */ lwz r0, 0x4c(r1) -/* 80218BB8 54 00 10 3A */ slwi r0, r0, 2 -/* 80218BBC 7C 92 02 14 */ add r4, r18, r0 -/* 80218BC0 C0 24 08 2C */ lfs f1, 0x82c(r4) -/* 80218BC4 C0 12 07 F0 */ lfs f0, 0x7f0(r18) -/* 80218BC8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218BCC 48 03 CC 05 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80218BD0: -/* 80218BD0 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80218BD4 40 82 00 14 */ bne lbl_80218BE8 -/* 80218BD8 56 80 06 3F */ clrlwi. r0, r20, 0x18 -/* 80218BDC 40 82 00 0C */ bne lbl_80218BE8 -/* 80218BE0 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218BE4 41 82 00 18 */ beq lbl_80218BFC -lbl_80218BE8: -/* 80218BE8 80 72 03 24 */ lwz r3, 0x324(r18) -/* 80218BEC C0 32 08 34 */ lfs f1, 0x834(r18) -/* 80218BF0 C0 12 07 F0 */ lfs f0, 0x7f0(r18) -/* 80218BF4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218BF8 48 03 CB D9 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80218BFC: -/* 80218BFC 80 72 04 B8 */ lwz r3, 0x4b8(r18) -/* 80218C00 28 03 00 00 */ cmplwi r3, 0 -/* 80218C04 41 82 00 2C */ beq lbl_80218C30 -/* 80218C08 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80218C0C 40 82 00 14 */ bne lbl_80218C20 -/* 80218C10 56 A0 06 3F */ clrlwi. r0, r21, 0x18 -/* 80218C14 40 82 00 0C */ bne lbl_80218C20 -/* 80218C18 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218C1C 41 82 00 14 */ beq lbl_80218C30 -lbl_80218C20: -/* 80218C20 C0 32 08 38 */ lfs f1, 0x838(r18) -/* 80218C24 C0 12 07 F0 */ lfs f0, 0x7f0(r18) -/* 80218C28 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218C2C 48 03 CB A5 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80218C30: -/* 80218C30 C0 12 08 3C */ lfs f0, 0x83c(r18) -/* 80218C34 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218C38 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218C3C C0 23 02 C4 */ lfs f1, 0x2c4(r3) -/* 80218C40 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218C44 40 82 00 0C */ bne lbl_80218C50 -/* 80218C48 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218C4C 41 82 00 30 */ beq lbl_80218C7C -lbl_80218C50: -/* 80218C50 D0 32 08 3C */ stfs f1, 0x83c(r18) -/* 80218C54 38 60 00 00 */ li r3, 0 -/* 80218C58 38 00 00 05 */ li r0, 5 -/* 80218C5C 7C 09 03 A6 */ mtctr r0 -lbl_80218C60: -/* 80218C60 38 03 00 C0 */ addi r0, r3, 0xc0 -/* 80218C64 7C 92 00 2E */ lwzx r4, r18, r0 -/* 80218C68 80 84 00 04 */ lwz r4, 4(r4) -/* 80218C6C C0 12 08 3C */ lfs f0, 0x83c(r18) -/* 80218C70 D0 04 01 14 */ stfs f0, 0x114(r4) -/* 80218C74 38 63 00 04 */ addi r3, r3, 4 -/* 80218C78 42 00 FF E8 */ bdnz lbl_80218C60 -lbl_80218C7C: -/* 80218C7C 88 12 08 4C */ lbz r0, 0x84c(r18) -/* 80218C80 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218C84 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218C88 88 A4 02 C0 */ lbz r5, 0x2c0(r4) -/* 80218C8C 7C 00 28 40 */ cmplw r0, r5 -/* 80218C90 40 82 00 3C */ bne lbl_80218CCC -/* 80218C94 88 72 08 4D */ lbz r3, 0x84d(r18) -/* 80218C98 88 04 02 C1 */ lbz r0, 0x2c1(r4) -/* 80218C9C 7C 03 00 40 */ cmplw r3, r0 -/* 80218CA0 40 82 00 2C */ bne lbl_80218CCC -/* 80218CA4 88 72 08 4E */ lbz r3, 0x84e(r18) -/* 80218CA8 88 04 02 C2 */ lbz r0, 0x2c2(r4) -/* 80218CAC 7C 03 00 40 */ cmplw r3, r0 -/* 80218CB0 40 82 00 1C */ bne lbl_80218CCC -/* 80218CB4 88 72 08 4F */ lbz r3, 0x84f(r18) -/* 80218CB8 88 04 02 C3 */ lbz r0, 0x2c3(r4) -/* 80218CBC 7C 03 00 40 */ cmplw r3, r0 -/* 80218CC0 40 82 00 0C */ bne lbl_80218CCC -/* 80218CC4 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218CC8 41 82 00 80 */ beq lbl_80218D48 -lbl_80218CCC: -/* 80218CCC 98 B2 08 4C */ stb r5, 0x84c(r18) -/* 80218CD0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218CD4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218CD8 88 03 02 C1 */ lbz r0, 0x2c1(r3) -/* 80218CDC 98 12 08 4D */ stb r0, 0x84d(r18) -/* 80218CE0 88 03 02 C2 */ lbz r0, 0x2c2(r3) -/* 80218CE4 98 12 08 4E */ stb r0, 0x84e(r18) -/* 80218CE8 88 03 02 C3 */ lbz r0, 0x2c3(r3) -/* 80218CEC 98 12 08 4F */ stb r0, 0x84f(r18) -/* 80218CF0 80 04 02 C0 */ lwz r0, 0x2c0(r4) -/* 80218CF4 90 01 00 18 */ stw r0, 0x18(r1) -/* 80218CF8 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80218CFC 90 01 00 40 */ stw r0, 0x40(r1) -/* 80218D00 80 72 00 D0 */ lwz r3, 0xd0(r18) -/* 80218D04 80 63 00 04 */ lwz r3, 4(r3) -/* 80218D08 88 01 00 40 */ lbz r0, 0x40(r1) -/* 80218D0C 98 03 01 04 */ stb r0, 0x104(r3) -/* 80218D10 88 01 00 41 */ lbz r0, 0x41(r1) -/* 80218D14 98 03 01 05 */ stb r0, 0x105(r3) -/* 80218D18 88 01 00 42 */ lbz r0, 0x42(r1) -/* 80218D1C 98 03 01 06 */ stb r0, 0x106(r3) -/* 80218D20 88 01 00 43 */ lbz r0, 0x43(r1) -/* 80218D24 98 03 01 07 */ stb r0, 0x107(r3) -/* 80218D28 88 01 00 3C */ lbz r0, 0x3c(r1) -/* 80218D2C 98 03 01 08 */ stb r0, 0x108(r3) -/* 80218D30 88 01 00 3D */ lbz r0, 0x3d(r1) -/* 80218D34 98 03 01 09 */ stb r0, 0x109(r3) -/* 80218D38 88 01 00 3E */ lbz r0, 0x3e(r1) -/* 80218D3C 98 03 01 0A */ stb r0, 0x10a(r3) -/* 80218D40 88 01 00 3F */ lbz r0, 0x3f(r1) -/* 80218D44 98 03 01 0B */ stb r0, 0x10b(r3) -lbl_80218D48: -/* 80218D48 88 12 08 50 */ lbz r0, 0x850(r18) -/* 80218D4C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218D50 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218D54 88 A4 02 E0 */ lbz r5, 0x2e0(r4) -/* 80218D58 7C 00 28 40 */ cmplw r0, r5 -/* 80218D5C 40 82 00 3C */ bne lbl_80218D98 -/* 80218D60 88 72 08 51 */ lbz r3, 0x851(r18) -/* 80218D64 88 04 02 E1 */ lbz r0, 0x2e1(r4) -/* 80218D68 7C 03 00 40 */ cmplw r3, r0 -/* 80218D6C 40 82 00 2C */ bne lbl_80218D98 -/* 80218D70 88 72 08 52 */ lbz r3, 0x852(r18) -/* 80218D74 88 04 02 E2 */ lbz r0, 0x2e2(r4) -/* 80218D78 7C 03 00 40 */ cmplw r3, r0 -/* 80218D7C 40 82 00 1C */ bne lbl_80218D98 -/* 80218D80 88 72 08 53 */ lbz r3, 0x853(r18) -/* 80218D84 88 04 02 E3 */ lbz r0, 0x2e3(r4) -/* 80218D88 7C 03 00 40 */ cmplw r3, r0 -/* 80218D8C 40 82 00 0C */ bne lbl_80218D98 -/* 80218D90 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218D94 41 82 00 80 */ beq lbl_80218E14 -lbl_80218D98: -/* 80218D98 98 B2 08 50 */ stb r5, 0x850(r18) -/* 80218D9C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218DA0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218DA4 88 03 02 E1 */ lbz r0, 0x2e1(r3) -/* 80218DA8 98 12 08 51 */ stb r0, 0x851(r18) -/* 80218DAC 88 03 02 E2 */ lbz r0, 0x2e2(r3) -/* 80218DB0 98 12 08 52 */ stb r0, 0x852(r18) -/* 80218DB4 88 03 02 E3 */ lbz r0, 0x2e3(r3) -/* 80218DB8 98 12 08 53 */ stb r0, 0x853(r18) -/* 80218DBC 80 04 02 E0 */ lwz r0, 0x2e0(r4) -/* 80218DC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80218DC4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80218DC8 90 01 00 38 */ stw r0, 0x38(r1) -/* 80218DCC 80 72 00 E4 */ lwz r3, 0xe4(r18) -/* 80218DD0 80 63 00 04 */ lwz r3, 4(r3) -/* 80218DD4 88 01 00 38 */ lbz r0, 0x38(r1) -/* 80218DD8 98 03 01 04 */ stb r0, 0x104(r3) -/* 80218DDC 88 01 00 39 */ lbz r0, 0x39(r1) -/* 80218DE0 98 03 01 05 */ stb r0, 0x105(r3) -/* 80218DE4 88 01 00 3A */ lbz r0, 0x3a(r1) -/* 80218DE8 98 03 01 06 */ stb r0, 0x106(r3) -/* 80218DEC 88 01 00 3B */ lbz r0, 0x3b(r1) -/* 80218DF0 98 03 01 07 */ stb r0, 0x107(r3) -/* 80218DF4 88 01 00 34 */ lbz r0, 0x34(r1) -/* 80218DF8 98 03 01 08 */ stb r0, 0x108(r3) -/* 80218DFC 88 01 00 35 */ lbz r0, 0x35(r1) -/* 80218E00 98 03 01 09 */ stb r0, 0x109(r3) -/* 80218E04 88 01 00 36 */ lbz r0, 0x36(r1) -/* 80218E08 98 03 01 0A */ stb r0, 0x10a(r3) -/* 80218E0C 88 01 00 37 */ lbz r0, 0x37(r1) -/* 80218E10 98 03 01 0B */ stb r0, 0x10b(r3) -lbl_80218E14: -/* 80218E14 88 12 08 58 */ lbz r0, 0x858(r18) -/* 80218E18 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218E1C 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218E20 88 A4 03 38 */ lbz r5, 0x338(r4) -/* 80218E24 7C 00 28 40 */ cmplw r0, r5 -/* 80218E28 40 82 00 3C */ bne lbl_80218E64 -/* 80218E2C 88 72 08 59 */ lbz r3, 0x859(r18) -/* 80218E30 88 04 03 39 */ lbz r0, 0x339(r4) -/* 80218E34 7C 03 00 40 */ cmplw r3, r0 -/* 80218E38 40 82 00 2C */ bne lbl_80218E64 -/* 80218E3C 88 72 08 5A */ lbz r3, 0x85a(r18) -/* 80218E40 88 04 03 3A */ lbz r0, 0x33a(r4) -/* 80218E44 7C 03 00 40 */ cmplw r3, r0 -/* 80218E48 40 82 00 1C */ bne lbl_80218E64 -/* 80218E4C 88 72 08 5B */ lbz r3, 0x85b(r18) -/* 80218E50 88 04 03 3B */ lbz r0, 0x33b(r4) -/* 80218E54 7C 03 00 40 */ cmplw r3, r0 -/* 80218E58 40 82 00 0C */ bne lbl_80218E64 -/* 80218E5C 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218E60 41 82 00 80 */ beq lbl_80218EE0 -lbl_80218E64: -/* 80218E64 98 B2 08 58 */ stb r5, 0x858(r18) -/* 80218E68 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218E6C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218E70 88 03 03 39 */ lbz r0, 0x339(r3) -/* 80218E74 98 12 08 59 */ stb r0, 0x859(r18) -/* 80218E78 88 03 03 3A */ lbz r0, 0x33a(r3) -/* 80218E7C 98 12 08 5A */ stb r0, 0x85a(r18) -/* 80218E80 88 03 03 3B */ lbz r0, 0x33b(r3) -/* 80218E84 98 12 08 5B */ stb r0, 0x85b(r18) -/* 80218E88 80 04 03 38 */ lwz r0, 0x338(r4) -/* 80218E8C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80218E90 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80218E94 90 01 00 30 */ stw r0, 0x30(r1) -/* 80218E98 80 72 01 20 */ lwz r3, 0x120(r18) -/* 80218E9C 80 63 00 04 */ lwz r3, 4(r3) -/* 80218EA0 88 01 00 30 */ lbz r0, 0x30(r1) -/* 80218EA4 98 03 01 04 */ stb r0, 0x104(r3) -/* 80218EA8 88 01 00 31 */ lbz r0, 0x31(r1) -/* 80218EAC 98 03 01 05 */ stb r0, 0x105(r3) -/* 80218EB0 88 01 00 32 */ lbz r0, 0x32(r1) -/* 80218EB4 98 03 01 06 */ stb r0, 0x106(r3) -/* 80218EB8 88 01 00 33 */ lbz r0, 0x33(r1) -/* 80218EBC 98 03 01 07 */ stb r0, 0x107(r3) -/* 80218EC0 88 01 00 2C */ lbz r0, 0x2c(r1) -/* 80218EC4 98 03 01 08 */ stb r0, 0x108(r3) -/* 80218EC8 88 01 00 2D */ lbz r0, 0x2d(r1) -/* 80218ECC 98 03 01 09 */ stb r0, 0x109(r3) -/* 80218ED0 88 01 00 2E */ lbz r0, 0x2e(r1) -/* 80218ED4 98 03 01 0A */ stb r0, 0x10a(r3) -/* 80218ED8 88 01 00 2F */ lbz r0, 0x2f(r1) -/* 80218EDC 98 03 01 0B */ stb r0, 0x10b(r3) -lbl_80218EE0: -/* 80218EE0 88 12 08 5C */ lbz r0, 0x85c(r18) -/* 80218EE4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218EE8 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218EEC 88 A4 03 00 */ lbz r5, 0x300(r4) -/* 80218EF0 7C 00 28 40 */ cmplw r0, r5 -/* 80218EF4 40 82 00 3C */ bne lbl_80218F30 -/* 80218EF8 88 72 08 5D */ lbz r3, 0x85d(r18) -/* 80218EFC 88 04 03 01 */ lbz r0, 0x301(r4) -/* 80218F00 7C 03 00 40 */ cmplw r3, r0 -/* 80218F04 40 82 00 2C */ bne lbl_80218F30 -/* 80218F08 88 72 08 5E */ lbz r3, 0x85e(r18) -/* 80218F0C 88 04 03 02 */ lbz r0, 0x302(r4) -/* 80218F10 7C 03 00 40 */ cmplw r3, r0 -/* 80218F14 40 82 00 1C */ bne lbl_80218F30 -/* 80218F18 88 72 08 5F */ lbz r3, 0x85f(r18) -/* 80218F1C 88 04 03 03 */ lbz r0, 0x303(r4) -/* 80218F20 7C 03 00 40 */ cmplw r3, r0 -/* 80218F24 40 82 00 0C */ bne lbl_80218F30 -/* 80218F28 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 80218F2C 41 82 00 D8 */ beq lbl_80219004 -lbl_80218F30: -/* 80218F30 98 B2 08 5C */ stb r5, 0x85c(r18) -/* 80218F34 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218F38 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218F3C 88 03 03 01 */ lbz r0, 0x301(r3) -/* 80218F40 98 12 08 5D */ stb r0, 0x85d(r18) -/* 80218F44 88 03 03 02 */ lbz r0, 0x302(r3) -/* 80218F48 98 12 08 5E */ stb r0, 0x85e(r18) -/* 80218F4C 88 03 03 03 */ lbz r0, 0x303(r3) -/* 80218F50 98 12 08 5F */ stb r0, 0x85f(r18) -/* 80218F54 80 04 03 00 */ lwz r0, 0x300(r4) -/* 80218F58 90 01 00 0C */ stw r0, 0xc(r1) -/* 80218F5C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80218F60 90 01 00 28 */ stw r0, 0x28(r1) -/* 80218F64 80 72 01 18 */ lwz r3, 0x118(r18) -/* 80218F68 80 63 00 04 */ lwz r3, 4(r3) -/* 80218F6C 88 01 00 28 */ lbz r0, 0x28(r1) -/* 80218F70 98 03 01 04 */ stb r0, 0x104(r3) -/* 80218F74 88 01 00 29 */ lbz r0, 0x29(r1) -/* 80218F78 98 03 01 05 */ stb r0, 0x105(r3) -/* 80218F7C 88 01 00 2A */ lbz r0, 0x2a(r1) -/* 80218F80 98 03 01 06 */ stb r0, 0x106(r3) -/* 80218F84 88 01 00 2B */ lbz r0, 0x2b(r1) -/* 80218F88 98 03 01 07 */ stb r0, 0x107(r3) -/* 80218F8C 88 01 00 24 */ lbz r0, 0x24(r1) -/* 80218F90 98 03 01 08 */ stb r0, 0x108(r3) -/* 80218F94 88 01 00 25 */ lbz r0, 0x25(r1) -/* 80218F98 98 03 01 09 */ stb r0, 0x109(r3) -/* 80218F9C 88 01 00 26 */ lbz r0, 0x26(r1) -/* 80218FA0 98 03 01 0A */ stb r0, 0x10a(r3) -/* 80218FA4 88 01 00 27 */ lbz r0, 0x27(r1) -/* 80218FA8 98 03 01 0B */ stb r0, 0x10b(r3) -/* 80218FAC 80 04 03 00 */ lwz r0, 0x300(r4) -/* 80218FB0 90 01 00 08 */ stw r0, 8(r1) -/* 80218FB4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80218FB8 90 01 00 20 */ stw r0, 0x20(r1) -/* 80218FBC 80 72 01 1C */ lwz r3, 0x11c(r18) -/* 80218FC0 80 63 00 04 */ lwz r3, 4(r3) -/* 80218FC4 88 01 00 20 */ lbz r0, 0x20(r1) -/* 80218FC8 98 03 01 04 */ stb r0, 0x104(r3) -/* 80218FCC 88 01 00 21 */ lbz r0, 0x21(r1) -/* 80218FD0 98 03 01 05 */ stb r0, 0x105(r3) -/* 80218FD4 88 01 00 22 */ lbz r0, 0x22(r1) -/* 80218FD8 98 03 01 06 */ stb r0, 0x106(r3) -/* 80218FDC 88 01 00 23 */ lbz r0, 0x23(r1) -/* 80218FE0 98 03 01 07 */ stb r0, 0x107(r3) -/* 80218FE4 88 01 00 1C */ lbz r0, 0x1c(r1) -/* 80218FE8 98 03 01 08 */ stb r0, 0x108(r3) -/* 80218FEC 88 01 00 1D */ lbz r0, 0x1d(r1) -/* 80218FF0 98 03 01 09 */ stb r0, 0x109(r3) -/* 80218FF4 88 01 00 1E */ lbz r0, 0x1e(r1) -/* 80218FF8 98 03 01 0A */ stb r0, 0x10a(r3) -/* 80218FFC 88 01 00 1F */ lbz r0, 0x1f(r1) -/* 80219000 98 03 01 0B */ stb r0, 0x10b(r3) -lbl_80219004: -/* 80219004 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80219008 48 14 91 E9 */ bl _restgpr_15 -/* 8021900C 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 80219010 7C 08 03 A6 */ mtlr r0 -/* 80219014 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80219018 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index f1d42d600f..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_802183A8: -/* 802183A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802183AC 7C 08 02 A6 */ mflr r0 -/* 802183B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802183B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802183B8 7C 7F 1B 78 */ mr r31, r3 -/* 802183BC 80 63 03 68 */ lwz r3, 0x368(r3) -/* 802183C0 48 03 D4 69 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802183C4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802183C8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802183CC C0 03 00 18 */ lfs f0, 0x18(r3) -/* 802183D0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802183D4 41 82 00 20 */ beq lbl_802183F4 -/* 802183D8 80 7F 03 68 */ lwz r3, 0x368(r31) -/* 802183DC FC 20 00 90 */ fmr f1, f0 -/* 802183E0 48 03 D3 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802183E4 7F E3 FB 78 */ mr r3, r31 -/* 802183E8 80 9F 03 68 */ lwz r4, 0x368(r31) -/* 802183EC 38 A0 00 05 */ li r5, 5 -/* 802183F0 48 00 26 B5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_802183F4: -/* 802183F4 48 00 62 95 */ bl dMeter2Info_isItemOpenCheck__Fv -/* 802183F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802183FC 41 82 00 10 */ beq lbl_8021840C -/* 80218400 7F E3 FB 78 */ mr r3, r31 -/* 80218404 48 00 01 21 */ bl setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv -/* 80218408 48 00 00 0C */ b lbl_80218414 -lbl_8021840C: -/* 8021840C 7F E3 FB 78 */ mr r3, r31 -/* 80218410 48 00 00 39 */ bl setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv -lbl_80218414: -/* 80218414 48 00 62 55 */ bl dMeter2Info_isMapOpenCheck__Fv -/* 80218418 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021841C 41 82 00 10 */ beq lbl_8021842C -/* 80218420 7F E3 FB 78 */ mr r3, r31 -/* 80218424 48 00 02 A1 */ bl setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv -/* 80218428 48 00 00 0C */ b lbl_80218434 -lbl_8021842C: -/* 8021842C 7F E3 FB 78 */ mr r3, r31 -/* 80218430 48 00 01 B9 */ bl setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv -lbl_80218434: -/* 80218434 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80218438 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021843C 7C 08 03 A6 */ mtlr r0 -/* 80218440 38 21 00 10 */ addi r1, r1, 0x10 -/* 80218444 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index 564dddff20..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80218338: -/* 80218338 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021833C 7C 08 02 A6 */ mflr r0 -/* 80218340 90 01 00 14 */ stw r0, 0x14(r1) -/* 80218344 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80218348 7C 7F 1B 78 */ mr r31, r3 -/* 8021834C 80 63 03 68 */ lwz r3, 0x368(r3) -/* 80218350 48 03 D4 D9 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80218354 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80218358 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8021835C 41 82 00 28 */ beq lbl_80218384 -/* 80218360 80 7F 03 68 */ lwz r3, 0x368(r31) -/* 80218364 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218368 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021836C C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80218370 48 03 D4 61 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80218374 7F E3 FB 78 */ mr r3, r31 -/* 80218378 80 9F 03 68 */ lwz r4, 0x368(r31) -/* 8021837C 38 A0 00 05 */ li r5, 5 -/* 80218380 48 00 26 49 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80218384: -/* 80218384 7F E3 FB 78 */ mr r3, r31 -/* 80218388 48 00 00 C1 */ bl setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv -/* 8021838C 7F E3 FB 78 */ mr r3, r31 -/* 80218390 48 00 02 59 */ bl setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv -/* 80218394 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80218398 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021839C 7C 08 03 A6 */ mtlr r0 -/* 802183A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802183A4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index 451e5c15c4..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80218524: -/* 80218524 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80218528 7C 08 02 A6 */ mflr r0 -/* 8021852C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80218530 39 61 00 20 */ addi r11, r1, 0x20 -/* 80218534 48 14 9C A1 */ bl _savegpr_27 -/* 80218538 7C 7B 1B 78 */ mr r27, r3 -/* 8021853C 80 63 03 60 */ lwz r3, 0x360(r3) -/* 80218540 48 03 D2 E9 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80218544 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218548 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021854C C0 5E 00 18 */ lfs f2, 0x18(r30) -/* 80218550 C0 1E 04 18 */ lfs f0, 0x418(r30) -/* 80218554 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80218558 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8021855C 41 82 00 20 */ beq lbl_8021857C -/* 80218560 80 7B 03 60 */ lwz r3, 0x360(r27) -/* 80218564 FC 20 00 90 */ fmr f1, f0 -/* 80218568 48 03 D2 69 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8021856C 7F 63 DB 78 */ mr r3, r27 -/* 80218570 80 9B 03 60 */ lwz r4, 0x360(r27) -/* 80218574 38 A0 00 05 */ li r5, 5 -/* 80218578 48 00 25 2D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_8021857C: -/* 8021857C 3B 80 00 00 */ li r28, 0 -/* 80218580 3B E0 00 00 */ li r31, 0 -lbl_80218584: -/* 80218584 3B BF 04 90 */ addi r29, r31, 0x490 -/* 80218588 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 8021858C 28 03 00 00 */ cmplwi r3, 0 -/* 80218590 41 82 00 30 */ beq lbl_802185C0 -/* 80218594 48 03 D2 95 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80218598 C0 1E 00 18 */ lfs f0, 0x18(r30) -/* 8021859C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802185A0 41 82 00 20 */ beq lbl_802185C0 -/* 802185A4 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802185A8 FC 20 00 90 */ fmr f1, f0 -/* 802185AC 48 03 D2 25 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802185B0 7F 63 DB 78 */ mr r3, r27 -/* 802185B4 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 802185B8 38 A0 00 05 */ li r5, 5 -/* 802185BC 48 00 24 E9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_802185C0: -/* 802185C0 3B 9C 00 01 */ addi r28, r28, 1 -/* 802185C4 2C 1C 00 05 */ cmpwi r28, 5 -/* 802185C8 3B FF 00 04 */ addi r31, r31, 4 -/* 802185CC 41 80 FF B8 */ blt lbl_80218584 -/* 802185D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802185D4 48 14 9C 4D */ bl _restgpr_27 -/* 802185D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802185DC 7C 08 03 A6 */ mtlr r0 -/* 802185E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802185E4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index 8c6abaf179..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80218448: -/* 80218448 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8021844C 7C 08 02 A6 */ mflr r0 -/* 80218450 90 01 00 34 */ stw r0, 0x34(r1) -/* 80218454 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80218458 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 8021845C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80218460 48 14 9D 75 */ bl _savegpr_27 -/* 80218464 7C 7B 1B 78 */ mr r27, r3 -/* 80218468 80 63 03 60 */ lwz r3, 0x360(r3) -/* 8021846C 48 03 D3 BD */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80218470 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80218474 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218478 41 82 00 30 */ beq lbl_802184A8 -/* 8021847C 80 7B 03 60 */ lwz r3, 0x360(r27) -/* 80218480 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218484 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218488 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 8021848C C0 04 04 18 */ lfs f0, 0x418(r4) -/* 80218490 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218494 48 03 D3 3D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80218498 7F 63 DB 78 */ mr r3, r27 -/* 8021849C 80 9B 03 60 */ lwz r4, 0x360(r27) -/* 802184A0 38 A0 00 05 */ li r5, 5 -/* 802184A4 48 00 25 25 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_802184A8: -/* 802184A8 3B 80 00 00 */ li r28, 0 -/* 802184AC 3B E0 00 00 */ li r31, 0 -/* 802184B0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802184B4 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802184B8 C3 E2 AE 80 */ lfs f31, lit_4182(r2) -lbl_802184BC: -/* 802184BC 3B BF 04 90 */ addi r29, r31, 0x490 -/* 802184C0 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802184C4 28 03 00 00 */ cmplwi r3, 0 -/* 802184C8 41 82 00 2C */ beq lbl_802184F4 -/* 802184CC 48 03 D3 5D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802184D0 FC 1F 08 00 */ fcmpu cr0, f31, f1 -/* 802184D4 41 82 00 20 */ beq lbl_802184F4 -/* 802184D8 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802184DC C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 802184E0 48 03 D2 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802184E4 7F 63 DB 78 */ mr r3, r27 -/* 802184E8 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 802184EC 38 A0 00 05 */ li r5, 5 -/* 802184F0 48 00 24 D9 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_802184F4: -/* 802184F4 3B 9C 00 01 */ addi r28, r28, 1 -/* 802184F8 2C 1C 00 05 */ cmpwi r28, 5 -/* 802184FC 3B FF 00 04 */ addi r31, r31, 4 -/* 80218500 41 80 FF BC */ blt lbl_802184BC -/* 80218504 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80218508 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 8021850C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80218510 48 14 9D 11 */ bl _restgpr_27 -/* 80218514 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80218518 7C 08 03 A6 */ mtlr r0 -/* 8021851C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80218520 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index 020985746c..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_802186C4: -/* 802186C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802186C8 7C 08 02 A6 */ mflr r0 -/* 802186CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802186D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802186D4 48 14 9B 01 */ bl _savegpr_27 -/* 802186D8 7C 7B 1B 78 */ mr r27, r3 -/* 802186DC 80 63 03 64 */ lwz r3, 0x364(r3) -/* 802186E0 48 03 D1 49 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802186E4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802186E8 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802186EC C0 5E 00 18 */ lfs f2, 0x18(r30) -/* 802186F0 C0 1E 04 1C */ lfs f0, 0x41c(r30) -/* 802186F4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802186F8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802186FC 41 82 00 20 */ beq lbl_8021871C -/* 80218700 80 7B 03 64 */ lwz r3, 0x364(r27) -/* 80218704 FC 20 00 90 */ fmr f1, f0 -/* 80218708 48 03 D0 C9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8021870C 7F 63 DB 78 */ mr r3, r27 -/* 80218710 80 9B 03 64 */ lwz r4, 0x364(r27) -/* 80218714 38 A0 00 05 */ li r5, 5 -/* 80218718 48 00 23 8D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_8021871C: -/* 8021871C 3B 80 00 00 */ li r28, 0 -/* 80218720 3B E0 00 00 */ li r31, 0 -lbl_80218724: -/* 80218724 3B BF 04 A4 */ addi r29, r31, 0x4a4 -/* 80218728 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 8021872C 28 03 00 00 */ cmplwi r3, 0 -/* 80218730 41 82 00 30 */ beq lbl_80218760 -/* 80218734 48 03 D0 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80218738 C0 1E 00 18 */ lfs f0, 0x18(r30) -/* 8021873C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218740 41 82 00 20 */ beq lbl_80218760 -/* 80218744 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80218748 FC 20 00 90 */ fmr f1, f0 -/* 8021874C 48 03 D0 85 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80218750 7F 63 DB 78 */ mr r3, r27 -/* 80218754 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 80218758 38 A0 00 05 */ li r5, 5 -/* 8021875C 48 00 23 49 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80218760: -/* 80218760 3B 9C 00 01 */ addi r28, r28, 1 -/* 80218764 2C 1C 00 05 */ cmpwi r28, 5 -/* 80218768 3B FF 00 04 */ addi r31, r31, 4 -/* 8021876C 41 80 FF B8 */ blt lbl_80218724 -/* 80218770 39 61 00 20 */ addi r11, r1, 0x20 -/* 80218774 48 14 9A AD */ bl _restgpr_27 -/* 80218778 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8021877C 7C 08 03 A6 */ mtlr r0 -/* 80218780 38 21 00 20 */ addi r1, r1, 0x20 -/* 80218784 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index 64eb60234c..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_802185E8: -/* 802185E8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802185EC 7C 08 02 A6 */ mflr r0 -/* 802185F0 90 01 00 34 */ stw r0, 0x34(r1) -/* 802185F4 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 802185F8 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 802185FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80218600 48 14 9B D5 */ bl _savegpr_27 -/* 80218604 7C 7B 1B 78 */ mr r27, r3 -/* 80218608 80 63 03 64 */ lwz r3, 0x364(r3) -/* 8021860C 48 03 D2 1D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80218610 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80218614 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80218618 41 82 00 30 */ beq lbl_80218648 -/* 8021861C 80 7B 03 64 */ lwz r3, 0x364(r27) -/* 80218620 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218624 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218628 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 8021862C C0 04 04 1C */ lfs f0, 0x41c(r4) -/* 80218630 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218634 48 03 D1 9D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80218638 7F 63 DB 78 */ mr r3, r27 -/* 8021863C 80 9B 03 64 */ lwz r4, 0x364(r27) -/* 80218640 38 A0 00 05 */ li r5, 5 -/* 80218644 48 00 23 85 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80218648: -/* 80218648 3B 80 00 00 */ li r28, 0 -/* 8021864C 3B E0 00 00 */ li r31, 0 -/* 80218650 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80218654 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80218658 C3 E2 AE 80 */ lfs f31, lit_4182(r2) -lbl_8021865C: -/* 8021865C 3B BF 04 A4 */ addi r29, r31, 0x4a4 -/* 80218660 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80218664 28 03 00 00 */ cmplwi r3, 0 -/* 80218668 41 82 00 2C */ beq lbl_80218694 -/* 8021866C 48 03 D1 BD */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80218670 FC 1F 08 00 */ fcmpu cr0, f31, f1 -/* 80218674 41 82 00 20 */ beq lbl_80218694 -/* 80218678 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 8021867C C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 80218680 48 03 D1 51 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80218684 7F 63 DB 78 */ mr r3, r27 -/* 80218688 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 8021868C 38 A0 00 05 */ li r5, 5 -/* 80218690 48 00 23 39 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80218694: -/* 80218694 3B 9C 00 01 */ addi r28, r28, 1 -/* 80218698 2C 1C 00 05 */ cmpwi r28, 5 -/* 8021869C 3B FF 00 04 */ addi r31, r31, 4 -/* 802186A0 41 80 FF BC */ blt lbl_8021865C -/* 802186A4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 802186A8 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 802186AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802186B0 48 14 9B 71 */ bl _restgpr_27 -/* 802186B4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802186B8 7C 08 03 A6 */ mtlr r0 -/* 802186BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802186C0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaKanteraAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaKanteraAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index 2841ad1c72..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaKanteraAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8021575C: -/* 8021575C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80215760 A8 83 07 44 */ lha r4, 0x744(r3) -/* 80215764 2C 04 00 05 */ cmpwi r4, 5 -/* 80215768 41 80 00 18 */ blt lbl_80215780 -/* 8021576C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80215770 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80215774 C0 04 00 18 */ lfs f0, 0x18(r4) -/* 80215778 D0 03 06 00 */ stfs f0, 0x600(r3) -/* 8021577C 48 00 00 5C */ b lbl_802157D8 -lbl_80215780: -/* 80215780 38 04 00 01 */ addi r0, r4, 1 -/* 80215784 B0 03 07 44 */ sth r0, 0x744(r3) -/* 80215788 A8 03 07 44 */ lha r0, 0x744(r3) -/* 8021578C 2C 00 00 05 */ cmpwi r0, 5 -/* 80215790 40 81 00 0C */ ble lbl_8021579C -/* 80215794 38 00 00 05 */ li r0, 5 -/* 80215798 B0 03 07 44 */ sth r0, 0x744(r3) -lbl_8021579C: -/* 8021579C A8 03 07 44 */ lha r0, 0x744(r3) -/* 802157A0 C8 22 AE A0 */ lfd f1, lit_4925(r2) -/* 802157A4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802157A8 90 01 00 0C */ stw r0, 0xc(r1) -/* 802157AC 3C 00 43 30 */ lis r0, 0x4330 -/* 802157B0 90 01 00 08 */ stw r0, 8(r1) -/* 802157B4 C8 01 00 08 */ lfd f0, 8(r1) -/* 802157B8 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802157BC C0 02 AE BC */ lfs f0, lit_6210(r2) -/* 802157C0 EC 21 00 24 */ fdivs f1, f1, f0 -/* 802157C4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802157C8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802157CC C0 04 00 18 */ lfs f0, 0x18(r4) -/* 802157D0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802157D4 D0 03 06 00 */ stfs f0, 0x600(r3) -lbl_802157D8: -/* 802157D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802157DC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaKanteraAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaKanteraAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index 909d1f6a3c..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaKanteraAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_802156E0: -/* 802156E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802156E4 A8 83 07 44 */ lha r4, 0x744(r3) -/* 802156E8 2C 04 00 00 */ cmpwi r4, 0 -/* 802156EC 41 81 00 10 */ bgt lbl_802156FC -/* 802156F0 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 802156F4 D0 03 06 00 */ stfs f0, 0x600(r3) -/* 802156F8 48 00 00 5C */ b lbl_80215754 -lbl_802156FC: -/* 802156FC 38 04 FF FF */ addi r0, r4, -1 -/* 80215700 B0 03 07 44 */ sth r0, 0x744(r3) -/* 80215704 A8 03 07 44 */ lha r0, 0x744(r3) -/* 80215708 2C 00 00 00 */ cmpwi r0, 0 -/* 8021570C 40 80 00 0C */ bge lbl_80215718 -/* 80215710 38 00 00 00 */ li r0, 0 -/* 80215714 B0 03 07 44 */ sth r0, 0x744(r3) -lbl_80215718: -/* 80215718 A8 03 07 44 */ lha r0, 0x744(r3) -/* 8021571C C8 22 AE A0 */ lfd f1, lit_4925(r2) -/* 80215720 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80215724 90 01 00 0C */ stw r0, 0xc(r1) -/* 80215728 3C 00 43 30 */ lis r0, 0x4330 -/* 8021572C 90 01 00 08 */ stw r0, 8(r1) -/* 80215730 C8 01 00 08 */ lfd f0, 8(r1) -/* 80215734 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80215738 C0 02 AE BC */ lfs f0, lit_6210(r2) -/* 8021573C EC 21 00 24 */ fdivs f1, f1, f0 -/* 80215740 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80215744 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80215748 C0 04 00 18 */ lfs f0, 0x18(r4) -/* 8021574C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80215750 D0 03 06 00 */ stfs f0, 0x600(r3) -lbl_80215754: -/* 80215754 38 21 00 10 */ addi r1, r1, 0x10 -/* 80215758 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaKeyAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaKeyAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index 0b7c2861d0..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaKeyAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80216D2C: -/* 80216D2C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80216D30 7C 08 02 A6 */ mflr r0 -/* 80216D34 90 01 00 24 */ stw r0, 0x24(r1) -/* 80216D38 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80216D3C F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80216D40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80216D44 7C 7F 1B 78 */ mr r31, r3 -/* 80216D48 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216D4C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216D50 C0 43 03 68 */ lfs f2, 0x368(r3) -/* 80216D54 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80216D58 C0 03 03 48 */ lfs f0, 0x348(r3) -/* 80216D5C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80216D60 EF E2 00 32 */ fmuls f31, f2, f0 -/* 80216D64 80 7F 02 E0 */ lwz r3, 0x2e0(r31) -/* 80216D68 48 03 EA C1 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80216D6C FC 1F 08 00 */ fcmpu cr0, f31, f1 -/* 80216D70 41 82 00 20 */ beq lbl_80216D90 -/* 80216D74 80 7F 02 E0 */ lwz r3, 0x2e0(r31) -/* 80216D78 FC 20 F8 90 */ fmr f1, f31 -/* 80216D7C 48 03 EA 55 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80216D80 7F E3 FB 78 */ mr r3, r31 -/* 80216D84 80 9F 02 E0 */ lwz r4, 0x2e0(r31) -/* 80216D88 38 A0 00 05 */ li r5, 5 -/* 80216D8C 48 00 3D 19 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80216D90: -/* 80216D90 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80216D94 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80216D98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80216D9C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80216DA0 7C 08 03 A6 */ mtlr r0 -/* 80216DA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80216DA8 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaKeyAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaKeyAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index 1080726fd9..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaKeyAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80216CA8: -/* 80216CA8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80216CAC 7C 08 02 A6 */ mflr r0 -/* 80216CB0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80216CB4 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80216CB8 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80216CBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80216CC0 7C 7F 1B 78 */ mr r31, r3 -/* 80216CC4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216CC8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216CCC C0 43 03 68 */ lfs f2, 0x368(r3) -/* 80216CD0 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80216CD4 C0 03 03 48 */ lfs f0, 0x348(r3) -/* 80216CD8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80216CDC EF E2 00 32 */ fmuls f31, f2, f0 -/* 80216CE0 80 7F 02 E0 */ lwz r3, 0x2e0(r31) -/* 80216CE4 48 03 EB 45 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80216CE8 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80216CEC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80216CF0 41 82 00 20 */ beq lbl_80216D10 -/* 80216CF4 80 7F 02 E0 */ lwz r3, 0x2e0(r31) -/* 80216CF8 FC 20 F8 90 */ fmr f1, f31 -/* 80216CFC 48 03 EA D5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80216D00 7F E3 FB 78 */ mr r3, r31 -/* 80216D04 80 9F 02 E0 */ lwz r4, 0x2e0(r31) -/* 80216D08 38 A0 00 05 */ li r5, 5 -/* 80216D0C 48 00 3C BD */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80216D10: -/* 80216D10 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80216D14 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80216D18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80216D1C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80216D20 7C 08 03 A6 */ mtlr r0 -/* 80216D24 38 21 00 20 */ addi r1, r1, 0x20 -/* 80216D28 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaKeyChange__13dMeter2Draw_cFb.s b/asm/d/meter/d_meter2_draw/setAlphaKeyChange__13dMeter2Draw_cFb.s deleted file mode 100644 index 08fdb82de9..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaKeyChange__13dMeter2Draw_cFb.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_80216B28: -/* 80216B28 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80216B2C 7C 08 02 A6 */ mflr r0 -/* 80216B30 90 01 00 24 */ stw r0, 0x24(r1) -/* 80216B34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80216B38 48 14 B6 9D */ bl _savegpr_27 -/* 80216B3C 7C 7B 1B 78 */ mr r27, r3 -/* 80216B40 7C 9C 23 78 */ mr r28, r4 -/* 80216B44 3B E0 00 00 */ li r31, 0 -/* 80216B48 3B C0 00 00 */ li r30, 0 -/* 80216B4C 38 80 00 00 */ li r4, 0 -/* 80216B50 3B A0 00 00 */ li r29, 0 -/* 80216B54 C0 03 07 E0 */ lfs f0, 0x7e0(r3) -/* 80216B58 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216B5C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216B60 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80216B64 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80216B68 40 82 00 0C */ bne lbl_80216B74 -/* 80216B6C 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80216B70 41 82 00 0C */ beq lbl_80216B7C -lbl_80216B74: -/* 80216B74 D0 3B 07 E0 */ stfs f1, 0x7e0(r27) -/* 80216B78 3B E0 00 01 */ li r31, 1 -lbl_80216B7C: -/* 80216B7C C0 1B 07 E4 */ lfs f0, 0x7e4(r27) -/* 80216B80 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216B84 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216B88 C0 23 03 48 */ lfs f1, 0x348(r3) -/* 80216B8C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80216B90 40 82 00 0C */ bne lbl_80216B9C -/* 80216B94 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80216B98 41 82 00 0C */ beq lbl_80216BA4 -lbl_80216B9C: -/* 80216B9C D0 3B 07 E4 */ stfs f1, 0x7e4(r27) -/* 80216BA0 3B C0 00 01 */ li r30, 1 -lbl_80216BA4: -/* 80216BA4 C0 1B 07 E8 */ lfs f0, 0x7e8(r27) -/* 80216BA8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216BAC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216BB0 C0 23 03 68 */ lfs f1, 0x368(r3) -/* 80216BB4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80216BB8 40 82 00 0C */ bne lbl_80216BC4 -/* 80216BBC 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80216BC0 41 82 00 0C */ beq lbl_80216BCC -lbl_80216BC4: -/* 80216BC4 D0 3B 07 E8 */ stfs f1, 0x7e8(r27) -/* 80216BC8 38 80 00 01 */ li r4, 1 -lbl_80216BCC: -/* 80216BCC C0 1B 07 EC */ lfs f0, 0x7ec(r27) -/* 80216BD0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216BD4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216BD8 C0 23 03 98 */ lfs f1, 0x398(r3) -/* 80216BDC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80216BE0 40 82 00 0C */ bne lbl_80216BEC -/* 80216BE4 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80216BE8 41 82 00 0C */ beq lbl_80216BF4 -lbl_80216BEC: -/* 80216BEC D0 3B 07 EC */ stfs f1, 0x7ec(r27) -/* 80216BF0 3B A0 00 01 */ li r29, 1 -lbl_80216BF4: -/* 80216BF4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80216BF8 40 82 00 1C */ bne lbl_80216C14 -/* 80216BFC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80216C00 40 82 00 14 */ bne lbl_80216C14 -/* 80216C04 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 80216C08 40 82 00 0C */ bne lbl_80216C14 -/* 80216C0C 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80216C10 41 82 00 20 */ beq lbl_80216C30 -lbl_80216C14: -/* 80216C14 80 7B 02 E0 */ lwz r3, 0x2e0(r27) -/* 80216C18 C0 5B 07 E0 */ lfs f2, 0x7e0(r27) -/* 80216C1C C0 3B 07 E8 */ lfs f1, 0x7e8(r27) -/* 80216C20 C0 1B 07 E4 */ lfs f0, 0x7e4(r27) -/* 80216C24 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80216C28 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80216C2C 48 03 EB A5 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80216C30: -/* 80216C30 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80216C34 40 82 00 1C */ bne lbl_80216C50 -/* 80216C38 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80216C3C 40 82 00 14 */ bne lbl_80216C50 -/* 80216C40 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80216C44 40 82 00 0C */ bne lbl_80216C50 -/* 80216C48 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80216C4C 41 82 00 44 */ beq lbl_80216C90 -lbl_80216C50: -/* 80216C50 3B A0 00 00 */ li r29, 0 -/* 80216C54 3B 80 00 00 */ li r28, 0 -lbl_80216C58: -/* 80216C58 38 1C 02 E4 */ addi r0, r28, 0x2e4 -/* 80216C5C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 80216C60 C0 7B 07 E0 */ lfs f3, 0x7e0(r27) -/* 80216C64 C0 5B 07 E4 */ lfs f2, 0x7e4(r27) -/* 80216C68 C0 3B 07 EC */ lfs f1, 0x7ec(r27) -/* 80216C6C C0 1B 07 E8 */ lfs f0, 0x7e8(r27) -/* 80216C70 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80216C74 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80216C78 EC 23 00 32 */ fmuls f1, f3, f0 -/* 80216C7C 48 03 EB 55 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80216C80 3B BD 00 01 */ addi r29, r29, 1 -/* 80216C84 2C 1D 00 05 */ cmpwi r29, 5 -/* 80216C88 3B 9C 00 04 */ addi r28, r28, 4 -/* 80216C8C 41 80 FF CC */ blt lbl_80216C58 -lbl_80216C90: -/* 80216C90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80216C94 48 14 B5 8D */ bl _restgpr_27 -/* 80216C98 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80216C9C 7C 08 03 A6 */ mtlr r0 -/* 80216CA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80216CA4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaLifeAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaLifeAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index f42fe6864a..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaLifeAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80214E54: -/* 80214E54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80214E58 7C 08 02 A6 */ mflr r0 -/* 80214E5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80214E60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80214E64 7C 7F 1B 78 */ mr r31, r3 -/* 80214E68 80 63 01 24 */ lwz r3, 0x124(r3) -/* 80214E6C 48 04 09 BD */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80214E70 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80214E74 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80214E78 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80214E7C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80214E80 41 82 00 20 */ beq lbl_80214EA0 -/* 80214E84 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 80214E88 FC 20 00 90 */ fmr f1, f0 -/* 80214E8C 48 04 09 45 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80214E90 7F E3 FB 78 */ mr r3, r31 -/* 80214E94 80 9F 01 24 */ lwz r4, 0x124(r31) -/* 80214E98 38 A0 00 05 */ li r5, 5 -/* 80214E9C 48 00 5C 09 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80214EA0: -/* 80214EA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80214EA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80214EA8 7C 08 03 A6 */ mtlr r0 -/* 80214EAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80214EB0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaLifeAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaLifeAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index ad3c494dfd..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaLifeAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80214DF4: -/* 80214DF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80214DF8 7C 08 02 A6 */ mflr r0 -/* 80214DFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80214E00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80214E04 7C 7F 1B 78 */ mr r31, r3 -/* 80214E08 80 63 01 24 */ lwz r3, 0x124(r3) -/* 80214E0C 48 04 0A 1D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80214E10 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80214E14 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80214E18 41 82 00 28 */ beq lbl_80214E40 -/* 80214E1C 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 80214E20 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80214E24 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80214E28 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80214E2C 48 04 09 A5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80214E30 7F E3 FB 78 */ mr r3, r31 -/* 80214E34 80 9F 01 24 */ lwz r4, 0x124(r31) -/* 80214E38 38 A0 00 05 */ li r5, 5 -/* 80214E3C 48 00 5B 8D */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80214E40: -/* 80214E40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80214E44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80214E48 7C 08 03 A6 */ mtlr r0 -/* 80214E4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80214E50 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaLifeChange__13dMeter2Draw_cFb.s b/asm/d/meter/d_meter2_draw/setAlphaLifeChange__13dMeter2Draw_cFb.s deleted file mode 100644 index 369835c380..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaLifeChange__13dMeter2Draw_cFb.s +++ /dev/null @@ -1,136 +0,0 @@ -lbl_80214C20: -/* 80214C20 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80214C24 7C 08 02 A6 */ mflr r0 -/* 80214C28 90 01 00 34 */ stw r0, 0x34(r1) -/* 80214C2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80214C30 48 14 D5 9D */ bl _savegpr_25 -/* 80214C34 7C 7A 1B 78 */ mr r26, r3 -/* 80214C38 7C 9B 23 78 */ mr r27, r4 -/* 80214C3C 3B E0 00 00 */ li r31, 0 -/* 80214C40 3B C0 00 00 */ li r30, 0 -/* 80214C44 3B A0 00 00 */ li r29, 0 -/* 80214C48 3B 80 00 00 */ li r28, 0 -/* 80214C4C 80 63 01 24 */ lwz r3, 0x124(r3) -/* 80214C50 48 04 0B D9 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80214C54 C0 1A 07 90 */ lfs f0, 0x790(r26) -/* 80214C58 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80214C5C 40 82 00 0C */ bne lbl_80214C68 -/* 80214C60 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80214C64 41 82 00 14 */ beq lbl_80214C78 -lbl_80214C68: -/* 80214C68 80 7A 01 24 */ lwz r3, 0x124(r26) -/* 80214C6C 48 04 0B BD */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80214C70 D0 3A 07 90 */ stfs f1, 0x790(r26) -/* 80214C74 3B E0 00 01 */ li r31, 1 -lbl_80214C78: -/* 80214C78 C0 1A 07 94 */ lfs f0, 0x794(r26) -/* 80214C7C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80214C80 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80214C84 C0 23 00 20 */ lfs f1, 0x20(r3) -/* 80214C88 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80214C8C 40 82 00 0C */ bne lbl_80214C98 -/* 80214C90 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80214C94 41 82 00 0C */ beq lbl_80214CA0 -lbl_80214C98: -/* 80214C98 D0 3A 07 94 */ stfs f1, 0x794(r26) -/* 80214C9C 3B C0 00 01 */ li r30, 1 -lbl_80214CA0: -/* 80214CA0 C0 1A 07 9C */ lfs f0, 0x79c(r26) -/* 80214CA4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80214CA8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80214CAC C0 23 00 34 */ lfs f1, 0x34(r3) -/* 80214CB0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80214CB4 40 82 00 0C */ bne lbl_80214CC0 -/* 80214CB8 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80214CBC 41 82 00 0C */ beq lbl_80214CC8 -lbl_80214CC0: -/* 80214CC0 D0 3A 07 9C */ stfs f1, 0x79c(r26) -/* 80214CC4 3B C0 00 01 */ li r30, 1 -lbl_80214CC8: -/* 80214CC8 C0 1A 07 98 */ lfs f0, 0x798(r26) -/* 80214CCC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80214CD0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80214CD4 C0 23 00 24 */ lfs f1, 0x24(r3) -/* 80214CD8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80214CDC 40 82 00 0C */ bne lbl_80214CE8 -/* 80214CE0 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80214CE4 41 82 00 0C */ beq lbl_80214CF0 -lbl_80214CE8: -/* 80214CE8 D0 3A 07 98 */ stfs f1, 0x798(r26) -/* 80214CEC 3B A0 00 01 */ li r29, 1 -lbl_80214CF0: -/* 80214CF0 C0 1A 07 A0 */ lfs f0, 0x7a0(r26) -/* 80214CF4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80214CF8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80214CFC C0 23 00 3C */ lfs f1, 0x3c(r3) -/* 80214D00 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80214D04 40 82 00 0C */ bne lbl_80214D10 -/* 80214D08 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80214D0C 41 82 00 0C */ beq lbl_80214D18 -lbl_80214D10: -/* 80214D10 D0 3A 07 A0 */ stfs f1, 0x7a0(r26) -/* 80214D14 3B 80 00 01 */ li r28, 1 -lbl_80214D18: -/* 80214D18 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80214D1C 40 82 00 14 */ bne lbl_80214D30 -/* 80214D20 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80214D24 40 82 00 0C */ bne lbl_80214D30 -/* 80214D28 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80214D2C 41 82 00 3C */ beq lbl_80214D68 -lbl_80214D30: -/* 80214D30 3B 20 00 00 */ li r25, 0 -/* 80214D34 3B C0 00 00 */ li r30, 0 -lbl_80214D38: -/* 80214D38 38 1E 01 78 */ addi r0, r30, 0x178 -/* 80214D3C 7C 7A 00 2E */ lwzx r3, r26, r0 -/* 80214D40 C0 5A 07 90 */ lfs f2, 0x790(r26) -/* 80214D44 C0 3A 07 9C */ lfs f1, 0x79c(r26) -/* 80214D48 C0 1A 07 94 */ lfs f0, 0x794(r26) -/* 80214D4C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80214D50 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80214D54 48 04 0A 7D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80214D58 3B 39 00 01 */ addi r25, r25, 1 -/* 80214D5C 2C 19 00 14 */ cmpwi r25, 0x14 -/* 80214D60 3B DE 00 04 */ addi r30, r30, 4 -/* 80214D64 41 80 FF D4 */ blt lbl_80214D38 -lbl_80214D68: -/* 80214D68 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80214D6C 40 82 00 14 */ bne lbl_80214D80 -/* 80214D70 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80214D74 40 82 00 0C */ bne lbl_80214D80 -/* 80214D78 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80214D7C 41 82 00 34 */ beq lbl_80214DB0 -lbl_80214D80: -/* 80214D80 3B 20 00 00 */ li r25, 0 -/* 80214D84 3B A0 00 00 */ li r29, 0 -lbl_80214D88: -/* 80214D88 38 1D 04 40 */ addi r0, r29, 0x440 -/* 80214D8C 7C 7A 00 2E */ lwzx r3, r26, r0 -/* 80214D90 C0 3A 07 98 */ lfs f1, 0x798(r26) -/* 80214D94 C0 1A 07 90 */ lfs f0, 0x790(r26) -/* 80214D98 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80214D9C 48 04 0A 35 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80214DA0 3B 39 00 01 */ addi r25, r25, 1 -/* 80214DA4 2C 19 00 14 */ cmpwi r25, 0x14 -/* 80214DA8 3B BD 00 04 */ addi r29, r29, 4 -/* 80214DAC 41 80 FF DC */ blt lbl_80214D88 -lbl_80214DB0: -/* 80214DB0 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80214DB4 40 82 00 14 */ bne lbl_80214DC8 -/* 80214DB8 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80214DBC 40 82 00 0C */ bne lbl_80214DC8 -/* 80214DC0 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80214DC4 41 82 00 18 */ beq lbl_80214DDC -lbl_80214DC8: -/* 80214DC8 80 7A 01 C8 */ lwz r3, 0x1c8(r26) -/* 80214DCC C0 3A 07 A0 */ lfs f1, 0x7a0(r26) -/* 80214DD0 C0 1A 07 90 */ lfs f0, 0x790(r26) -/* 80214DD4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80214DD8 48 04 09 F9 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80214DDC: -/* 80214DDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80214DE0 48 14 D4 39 */ bl _restgpr_25 -/* 80214DE4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80214DE8 7C 08 03 A6 */ mtlr r0 -/* 80214DEC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80214DF0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaLightDropAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaLightDropAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index d7115ad291..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaLightDropAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,248 +0,0 @@ -lbl_80215F88: -/* 80215F88 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80215F8C 7C 08 02 A6 */ mflr r0 -/* 80215F90 90 01 00 64 */ stw r0, 0x64(r1) -/* 80215F94 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80215F98 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80215F9C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80215FA0 48 14 C2 2D */ bl _savegpr_25 -/* 80215FA4 7C 7D 1B 78 */ mr r29, r3 -/* 80215FA8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80215FAC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80215FB0 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80215FB4 C0 1D 06 FC */ lfs f0, 0x6fc(r29) -/* 80215FB8 EF E1 00 32 */ fmuls f31, f1, f0 -/* 80215FBC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80215FC0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80215FC4 3B C3 00 E3 */ addi r30, r3, 0xe3 -/* 80215FC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80215FCC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80215FD0 88 1F 4E 0C */ lbz r0, 0x4e0c(r31) -/* 80215FD4 7C 00 07 74 */ extsb r0, r0 -/* 80215FD8 7C 1E 00 AE */ lbzx r0, r30, r0 -/* 80215FDC 28 00 00 01 */ cmplwi r0, 1 -/* 80215FE0 40 81 01 A4 */ ble lbl_80216184 -/* 80215FE4 28 00 00 FF */ cmplwi r0, 0xff -/* 80215FE8 41 82 01 9C */ beq lbl_80216184 -/* 80215FEC 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80215FF0 A8 03 00 16 */ lha r0, 0x16(r3) -/* 80215FF4 7C 00 07 35 */ extsh. r0, r0 -/* 80215FF8 40 82 00 38 */ bne lbl_80216030 -/* 80215FFC 38 00 00 C5 */ li r0, 0xc5 -/* 80216000 90 01 00 08 */ stw r0, 8(r1) -/* 80216004 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80216008 38 81 00 08 */ addi r4, r1, 8 -/* 8021600C 38 A0 00 00 */ li r5, 0 -/* 80216010 38 C0 00 00 */ li r6, 0 -/* 80216014 38 E0 00 00 */ li r7, 0 -/* 80216018 C0 22 AE 84 */ lfs f1, lit_4183(r2) -/* 8021601C FC 40 08 90 */ fmr f2, f1 -/* 80216020 C0 62 AE B0 */ lfs f3, lit_5786(r2) -/* 80216024 FC 80 18 90 */ fmr f4, f3 -/* 80216028 39 00 00 00 */ li r8, 0 -/* 8021602C 48 09 59 59 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80216030: -/* 80216030 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216034 48 03 F7 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80216038 FC 1F 08 00 */ fcmpu cr0, f31, f1 -/* 8021603C 41 82 00 68 */ beq lbl_802160A4 -/* 80216040 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216044 FC 20 F8 90 */ fmr f1, f31 -/* 80216048 48 03 F7 89 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8021604C 7F A3 EB 78 */ mr r3, r29 -/* 80216050 80 9D 01 E0 */ lwz r4, 0x1e0(r29) -/* 80216054 3C A0 80 43 */ lis r5, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216058 38 A5 EB C8 */ addi r5, r5, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021605C A8 A5 0E CC */ lha r5, 0xecc(r5) -/* 80216060 48 00 4A 45 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -/* 80216064 3B 40 00 00 */ li r26, 0 -/* 80216068 3B 80 00 00 */ li r28, 0 -/* 8021606C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216070 3B 63 EB C8 */ addi r27, r3, g_drawHIO@l /* 0x8042EBC8@l */ -lbl_80216074: -/* 80216074 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216078 48 03 F7 B1 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021607C 7C 7B E2 14 */ add r3, r27, r28 -/* 80216080 C0 03 0E AC */ lfs f0, 0xeac(r3) -/* 80216084 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80216088 38 1C 01 E8 */ addi r0, r28, 0x1e8 -/* 8021608C 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80216090 48 03 F7 41 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80216094 3B 5A 00 01 */ addi r26, r26, 1 -/* 80216098 2C 1A 00 02 */ cmpwi r26, 2 -/* 8021609C 3B 9C 00 04 */ addi r28, r28, 4 -/* 802160A0 41 80 FF D4 */ blt lbl_80216074 -lbl_802160A4: -/* 802160A4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802160A8 3B 63 EB C8 */ addi r27, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802160AC A8 9B 0E CC */ lha r4, 0xecc(r27) -/* 802160B0 2C 04 00 01 */ cmpwi r4, 1 -/* 802160B4 40 81 00 74 */ ble lbl_80216128 -/* 802160B8 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 802160BC A8 03 00 16 */ lha r0, 0x16(r3) -/* 802160C0 C0 82 AE 84 */ lfs f4, lit_4183(r2) -/* 802160C4 C0 1B 0E C8 */ lfs f0, 0xec8(r27) -/* 802160C8 EC 60 20 28 */ fsubs f3, f0, f4 -/* 802160CC C8 42 AE A0 */ lfd f2, lit_4925(r2) -/* 802160D0 6C 84 80 00 */ xoris r4, r4, 0x8000 -/* 802160D4 90 81 00 14 */ stw r4, 0x14(r1) -/* 802160D8 3C 60 43 30 */ lis r3, 0x4330 -/* 802160DC 90 61 00 10 */ stw r3, 0x10(r1) -/* 802160E0 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802160E4 EC 20 10 28 */ fsubs f1, f0, f2 -/* 802160E8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802160EC 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802160F0 90 61 00 18 */ stw r3, 0x18(r1) -/* 802160F4 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802160F8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802160FC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80216100 EC 23 00 32 */ fmuls f1, f3, f0 -/* 80216104 90 81 00 24 */ stw r4, 0x24(r1) -/* 80216108 90 61 00 20 */ stw r3, 0x20(r1) -/* 8021610C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80216110 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80216114 EC 00 20 28 */ fsubs f0, f0, f4 -/* 80216118 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8021611C EC 04 00 2A */ fadds f0, f4, f0 -/* 80216120 D0 1D 06 F8 */ stfs f0, 0x6f8(r29) -/* 80216124 48 00 00 0C */ b lbl_80216130 -lbl_80216128: -/* 80216128 C0 02 AE 84 */ lfs f0, lit_4183(r2) -/* 8021612C D0 1D 06 F8 */ stfs f0, 0x6f8(r29) -lbl_80216130: -/* 80216130 C0 3D 06 F4 */ lfs f1, 0x6f4(r29) -/* 80216134 C0 1D 06 F8 */ lfs f0, 0x6f8(r29) -/* 80216138 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8021613C 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216140 80 63 00 04 */ lwz r3, 4(r3) -/* 80216144 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80216148 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8021614C 81 83 00 00 */ lwz r12, 0(r3) -/* 80216150 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80216154 7D 89 03 A6 */ mtctr r12 -/* 80216158 4E 80 04 21 */ bctrl -/* 8021615C 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216160 A8 63 00 16 */ lha r3, 0x16(r3) -/* 80216164 A8 1B 0E CC */ lha r0, 0xecc(r27) -/* 80216168 7C 00 18 00 */ cmpw r0, r3 -/* 8021616C 40 82 01 08 */ bne lbl_80216274 -/* 80216170 38 60 00 FF */ li r3, 0xff -/* 80216174 88 1F 4E 0C */ lbz r0, 0x4e0c(r31) -/* 80216178 7C 00 07 74 */ extsb r0, r0 -/* 8021617C 7C 7E 01 AE */ stbx r3, r30, r0 -/* 80216180 48 00 00 F4 */ b lbl_80216274 -lbl_80216184: -/* 80216184 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216188 48 03 F6 A1 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021618C FC 1F 08 00 */ fcmpu cr0, f31, f1 -/* 80216190 41 82 00 64 */ beq lbl_802161F4 -/* 80216194 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216198 FC 20 F8 90 */ fmr f1, f31 -/* 8021619C 48 03 F6 35 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802161A0 7F A3 EB 78 */ mr r3, r29 -/* 802161A4 80 9D 01 E0 */ lwz r4, 0x1e0(r29) -/* 802161A8 38 A0 00 05 */ li r5, 5 -/* 802161AC 48 00 48 F9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -/* 802161B0 3B 40 00 00 */ li r26, 0 -/* 802161B4 3B C0 00 00 */ li r30, 0 -/* 802161B8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802161BC 3B 63 EB C8 */ addi r27, r3, g_drawHIO@l /* 0x8042EBC8@l */ -lbl_802161C0: -/* 802161C0 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 802161C4 48 03 F6 65 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802161C8 7C 7B F2 14 */ add r3, r27, r30 -/* 802161CC C0 03 0E AC */ lfs f0, 0xeac(r3) -/* 802161D0 EC 20 00 72 */ fmuls f1, f0, f1 -/* 802161D4 38 1E 01 E8 */ addi r0, r30, 0x1e8 -/* 802161D8 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 802161DC 48 03 F5 F5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802161E0 3B 5A 00 01 */ addi r26, r26, 1 -/* 802161E4 2C 1A 00 02 */ cmpwi r26, 2 -/* 802161E8 3B DE 00 04 */ addi r30, r30, 4 -/* 802161EC 41 80 FF D4 */ blt lbl_802161C0 -/* 802161F0 48 00 00 84 */ b lbl_80216274 -lbl_802161F4: -/* 802161F4 3B 20 00 00 */ li r25, 0 -/* 802161F8 3B C0 00 00 */ li r30, 0 -/* 802161FC CB E2 AE C0 */ lfd f31, lit_6293(r2) -/* 80216200 3F 60 43 30 */ lis r27, 0x4330 -/* 80216204 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216208 3B 83 EB C8 */ addi r28, r3, g_drawHIO@l /* 0x8042EBC8@l */ -lbl_8021620C: -/* 8021620C 38 99 08 60 */ addi r4, r25, 0x860 -/* 80216210 7C 1D 20 AE */ lbzx r0, r29, r4 -/* 80216214 90 01 00 24 */ stw r0, 0x24(r1) -/* 80216218 93 61 00 20 */ stw r27, 0x20(r1) -/* 8021621C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80216220 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 80216224 7C 7C F2 14 */ add r3, r28, r30 -/* 80216228 3B 43 0E AC */ addi r26, r3, 0xeac -/* 8021622C C0 23 0E AC */ lfs f1, 0xeac(r3) -/* 80216230 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80216234 41 82 00 30 */ beq lbl_80216264 -/* 80216238 FC 00 08 1E */ fctiwz f0, f1 -/* 8021623C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80216240 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80216244 7C 1D 21 AE */ stbx r0, r29, r4 -/* 80216248 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 8021624C 48 03 F5 DD */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80216250 C0 1A 00 00 */ lfs f0, 0(r26) -/* 80216254 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80216258 38 1E 01 E8 */ addi r0, r30, 0x1e8 -/* 8021625C 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80216260 48 03 F5 71 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80216264: -/* 80216264 3B 39 00 01 */ addi r25, r25, 1 -/* 80216268 2C 19 00 02 */ cmpwi r25, 2 -/* 8021626C 3B DE 00 04 */ addi r30, r30, 4 -/* 80216270 41 80 FF 9C */ blt lbl_8021620C -lbl_80216274: -/* 80216274 3B 20 00 00 */ li r25, 0 -/* 80216278 3B C0 00 00 */ li r30, 0 -/* 8021627C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80216280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80216284 3B 63 01 14 */ addi r27, r3, 0x114 -lbl_80216288: -/* 80216288 7F 63 DB 78 */ mr r3, r27 -/* 8021628C 88 9F 4E 0C */ lbz r4, 0x4e0c(r31) -/* 80216290 4B E1 E0 B1 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 80216294 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80216298 7C 19 00 00 */ cmpw r25, r0 -/* 8021629C 40 80 00 2C */ bge lbl_802162C8 -/* 802162A0 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162A4 48 03 F5 85 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802162A8 7F 5D F2 14 */ add r26, r29, r30 -/* 802162AC 80 7A 01 F4 */ lwz r3, 0x1f4(r26) -/* 802162B0 48 03 F5 21 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802162B4 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162B8 48 03 F5 71 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802162BC 80 7A 01 F8 */ lwz r3, 0x1f8(r26) -/* 802162C0 48 03 F5 11 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802162C4 48 00 00 38 */ b lbl_802162FC -lbl_802162C8: -/* 802162C8 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162CC 48 03 F5 5D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802162D0 C0 02 AE C8 */ lfs f0, lit_6524(r2) -/* 802162D4 EC 20 00 72 */ fmuls f1, f0, f1 -/* 802162D8 7F 5D F2 14 */ add r26, r29, r30 -/* 802162DC 80 7A 01 F4 */ lwz r3, 0x1f4(r26) -/* 802162E0 48 03 F4 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802162E4 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162E8 48 03 F5 41 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802162EC C0 02 AE C8 */ lfs f0, lit_6524(r2) -/* 802162F0 EC 20 00 72 */ fmuls f1, f0, f1 -/* 802162F4 80 7A 01 F8 */ lwz r3, 0x1f8(r26) -/* 802162F8 48 03 F4 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_802162FC: -/* 802162FC 3B 39 00 01 */ addi r25, r25, 1 -/* 80216300 2C 19 00 10 */ cmpwi r25, 0x10 -/* 80216304 3B DE 00 0C */ addi r30, r30, 0xc -/* 80216308 41 80 FF 80 */ blt lbl_80216288 -/* 8021630C E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 80216310 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 80216314 39 61 00 50 */ addi r11, r1, 0x50 -/* 80216318 48 14 BF 01 */ bl _restgpr_25 -/* 8021631C 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80216320 7C 08 03 A6 */ mtlr r0 -/* 80216324 38 21 00 60 */ addi r1, r1, 0x60 -/* 80216328 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaLightDropAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaLightDropAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index af09f98eec..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaLightDropAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_80215E40: -/* 80215E40 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80215E44 7C 08 02 A6 */ mflr r0 -/* 80215E48 90 01 00 24 */ stw r0, 0x24(r1) -/* 80215E4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80215E50 48 14 C3 81 */ bl _savegpr_26 -/* 80215E54 7C 7F 1B 78 */ mr r31, r3 -/* 80215E58 80 63 01 E0 */ lwz r3, 0x1e0(r3) -/* 80215E5C 48 03 F9 CD */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80215E60 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80215E64 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80215E68 41 82 01 08 */ beq lbl_80215F70 -/* 80215E6C 80 7F 01 E0 */ lwz r3, 0x1e0(r31) -/* 80215E70 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80215E74 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80215E78 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80215E7C C0 1F 06 FC */ lfs f0, 0x6fc(r31) -/* 80215E80 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80215E84 48 03 F9 4D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80215E88 7F E3 FB 78 */ mr r3, r31 -/* 80215E8C 80 9F 01 E0 */ lwz r4, 0x1e0(r31) -/* 80215E90 38 A0 00 05 */ li r5, 5 -/* 80215E94 48 00 4B 35 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -/* 80215E98 3B 60 00 00 */ li r27, 0 -/* 80215E9C 3B C0 00 00 */ li r30, 0 -/* 80215EA0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80215EA4 3B A3 EB C8 */ addi r29, r3, g_drawHIO@l /* 0x8042EBC8@l */ -lbl_80215EA8: -/* 80215EA8 80 7F 01 E0 */ lwz r3, 0x1e0(r31) -/* 80215EAC 48 03 F9 7D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80215EB0 7C 7D F2 14 */ add r3, r29, r30 -/* 80215EB4 C0 03 0E AC */ lfs f0, 0xeac(r3) -/* 80215EB8 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80215EBC 38 1E 01 E8 */ addi r0, r30, 0x1e8 -/* 80215EC0 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80215EC4 48 03 F9 0D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80215EC8 3B 7B 00 01 */ addi r27, r27, 1 -/* 80215ECC 2C 1B 00 02 */ cmpwi r27, 2 -/* 80215ED0 3B DE 00 04 */ addi r30, r30, 4 -/* 80215ED4 41 80 FF D4 */ blt lbl_80215EA8 -/* 80215ED8 3B 40 00 00 */ li r26, 0 -/* 80215EDC 3B C0 00 00 */ li r30, 0 -/* 80215EE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80215EE4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80215EE8 3B 9D 01 14 */ addi r28, r29, 0x114 -lbl_80215EEC: -/* 80215EEC 7F 83 E3 78 */ mr r3, r28 -/* 80215EF0 88 9D 4E 0C */ lbz r4, 0x4e0c(r29) -/* 80215EF4 4B E1 E4 4D */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 80215EF8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80215EFC 7C 1A 00 00 */ cmpw r26, r0 -/* 80215F00 40 80 00 2C */ bge lbl_80215F2C -/* 80215F04 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F08 48 03 F9 21 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80215F0C 7F 7F F2 14 */ add r27, r31, r30 -/* 80215F10 80 7B 01 F4 */ lwz r3, 0x1f4(r27) -/* 80215F14 48 03 F8 BD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80215F18 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F1C 48 03 F9 0D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80215F20 80 7B 01 F8 */ lwz r3, 0x1f8(r27) -/* 80215F24 48 03 F8 AD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80215F28 48 00 00 38 */ b lbl_80215F60 -lbl_80215F2C: -/* 80215F2C 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F30 48 03 F8 F9 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80215F34 C0 02 AE C8 */ lfs f0, lit_6524(r2) -/* 80215F38 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80215F3C 7F 7F F2 14 */ add r27, r31, r30 -/* 80215F40 80 7B 01 F4 */ lwz r3, 0x1f4(r27) -/* 80215F44 48 03 F8 8D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80215F48 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F4C 48 03 F8 DD */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80215F50 C0 02 AE C8 */ lfs f0, lit_6524(r2) -/* 80215F54 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80215F58 80 7B 01 F8 */ lwz r3, 0x1f8(r27) -/* 80215F5C 48 03 F8 75 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80215F60: -/* 80215F60 3B 5A 00 01 */ addi r26, r26, 1 -/* 80215F64 2C 1A 00 10 */ cmpwi r26, 0x10 -/* 80215F68 3B DE 00 0C */ addi r30, r30, 0xc -/* 80215F6C 41 80 FF 80 */ blt lbl_80215EEC -lbl_80215F70: -/* 80215F70 39 61 00 20 */ addi r11, r1, 0x20 -/* 80215F74 48 14 C2 A9 */ bl _restgpr_26 -/* 80215F78 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80215F7C 7C 08 03 A6 */ mtlr r0 -/* 80215F80 38 21 00 20 */ addi r1, r1, 0x20 -/* 80215F84 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaOxygenAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaOxygenAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index d35429b6ce..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaOxygenAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80215A94: -/* 80215A94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80215A98 A8 83 07 46 */ lha r4, 0x746(r3) -/* 80215A9C 2C 04 00 05 */ cmpwi r4, 5 -/* 80215AA0 41 80 00 18 */ blt lbl_80215AB8 -/* 80215AA4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80215AA8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80215AAC C0 04 00 18 */ lfs f0, 0x18(r4) -/* 80215AB0 D0 03 06 04 */ stfs f0, 0x604(r3) -/* 80215AB4 48 00 00 5C */ b lbl_80215B10 -lbl_80215AB8: -/* 80215AB8 38 04 00 01 */ addi r0, r4, 1 -/* 80215ABC B0 03 07 46 */ sth r0, 0x746(r3) -/* 80215AC0 A8 03 07 46 */ lha r0, 0x746(r3) -/* 80215AC4 2C 00 00 05 */ cmpwi r0, 5 -/* 80215AC8 40 81 00 0C */ ble lbl_80215AD4 -/* 80215ACC 38 00 00 05 */ li r0, 5 -/* 80215AD0 B0 03 07 46 */ sth r0, 0x746(r3) -lbl_80215AD4: -/* 80215AD4 A8 03 07 46 */ lha r0, 0x746(r3) -/* 80215AD8 C8 22 AE A0 */ lfd f1, lit_4925(r2) -/* 80215ADC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80215AE0 90 01 00 0C */ stw r0, 0xc(r1) -/* 80215AE4 3C 00 43 30 */ lis r0, 0x4330 -/* 80215AE8 90 01 00 08 */ stw r0, 8(r1) -/* 80215AEC C8 01 00 08 */ lfd f0, 8(r1) -/* 80215AF0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80215AF4 C0 02 AE BC */ lfs f0, lit_6210(r2) -/* 80215AF8 EC 21 00 24 */ fdivs f1, f1, f0 -/* 80215AFC 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80215B00 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80215B04 C0 04 00 18 */ lfs f0, 0x18(r4) -/* 80215B08 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80215B0C D0 03 06 04 */ stfs f0, 0x604(r3) -lbl_80215B10: -/* 80215B10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80215B14 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaOxygenAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaOxygenAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index a6d4940e7b..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaOxygenAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80215A18: -/* 80215A18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80215A1C A8 83 07 46 */ lha r4, 0x746(r3) -/* 80215A20 2C 04 00 00 */ cmpwi r4, 0 -/* 80215A24 41 81 00 10 */ bgt lbl_80215A34 -/* 80215A28 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80215A2C D0 03 06 04 */ stfs f0, 0x604(r3) -/* 80215A30 48 00 00 5C */ b lbl_80215A8C -lbl_80215A34: -/* 80215A34 38 04 FF FF */ addi r0, r4, -1 -/* 80215A38 B0 03 07 46 */ sth r0, 0x746(r3) -/* 80215A3C A8 03 07 46 */ lha r0, 0x746(r3) -/* 80215A40 2C 00 00 00 */ cmpwi r0, 0 -/* 80215A44 40 80 00 0C */ bge lbl_80215A50 -/* 80215A48 38 00 00 00 */ li r0, 0 -/* 80215A4C B0 03 07 46 */ sth r0, 0x746(r3) -lbl_80215A50: -/* 80215A50 A8 03 07 46 */ lha r0, 0x746(r3) -/* 80215A54 C8 22 AE A0 */ lfd f1, lit_4925(r2) -/* 80215A58 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80215A5C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80215A60 3C 00 43 30 */ lis r0, 0x4330 -/* 80215A64 90 01 00 08 */ stw r0, 8(r1) -/* 80215A68 C8 01 00 08 */ lfd f0, 8(r1) -/* 80215A6C EC 20 08 28 */ fsubs f1, f0, f1 -/* 80215A70 C0 02 AE BC */ lfs f0, lit_6210(r2) -/* 80215A74 EC 21 00 24 */ fdivs f1, f1, f0 -/* 80215A78 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80215A7C 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80215A80 C0 04 00 18 */ lfs f0, 0x18(r4) -/* 80215A84 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80215A88 D0 03 06 04 */ stfs f0, 0x604(r3) -lbl_80215A8C: -/* 80215A8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80215A90 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaRupeeAnimeMax__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaRupeeAnimeMax__13dMeter2Draw_cFv.s deleted file mode 100644 index 378e9c3095..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaRupeeAnimeMax__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80216990: -/* 80216990 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80216994 7C 08 02 A6 */ mflr r0 -/* 80216998 90 01 00 34 */ stw r0, 0x34(r1) -/* 8021699C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802169A0 48 14 B8 35 */ bl _savegpr_27 -/* 802169A4 7C 7B 1B 78 */ mr r27, r3 -/* 802169A8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802169AC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802169B0 C0 43 03 58 */ lfs f2, 0x358(r3) -/* 802169B4 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 802169B8 C0 03 03 48 */ lfs f0, 0x348(r3) -/* 802169BC EC 21 00 32 */ fmuls f1, f1, f0 -/* 802169C0 EC 02 00 72 */ fmuls f0, f2, f1 -/* 802169C4 D0 01 00 08 */ stfs f0, 8(r1) -/* 802169C8 C0 03 03 78 */ lfs f0, 0x378(r3) -/* 802169CC EC 00 00 72 */ fmuls f0, f0, f1 -/* 802169D0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802169D4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802169D8 3B 80 00 00 */ li r28, 0 -/* 802169DC 3B E0 00 00 */ li r31, 0 -/* 802169E0 3B C1 00 08 */ addi r30, r1, 8 -lbl_802169E4: -/* 802169E4 3B BF 02 B4 */ addi r29, r31, 0x2b4 -/* 802169E8 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802169EC 48 03 EE 3D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 802169F0 7C 1E FC 2E */ lfsx f0, r30, r31 -/* 802169F4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802169F8 41 82 00 20 */ beq lbl_80216A18 -/* 802169FC 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216A00 FC 20 00 90 */ fmr f1, f0 -/* 80216A04 48 03 ED CD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80216A08 7F 63 DB 78 */ mr r3, r27 -/* 80216A0C 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 80216A10 38 A0 00 05 */ li r5, 5 -/* 80216A14 48 00 40 91 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80216A18: -/* 80216A18 3B 9C 00 01 */ addi r28, r28, 1 -/* 80216A1C 2C 1C 00 03 */ cmpwi r28, 3 -/* 80216A20 3B FF 00 04 */ addi r31, r31, 4 -/* 80216A24 41 80 FF C0 */ blt lbl_802169E4 -/* 80216A28 39 61 00 30 */ addi r11, r1, 0x30 -/* 80216A2C 48 14 B7 F5 */ bl _restgpr_27 -/* 80216A30 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80216A34 7C 08 03 A6 */ mtlr r0 -/* 80216A38 38 21 00 30 */ addi r1, r1, 0x30 -/* 80216A3C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaRupeeAnimeMin__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/setAlphaRupeeAnimeMin__13dMeter2Draw_cFv.s deleted file mode 100644 index 0fa73aabec..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaRupeeAnimeMin__13dMeter2Draw_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_802168D0: -/* 802168D0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802168D4 7C 08 02 A6 */ mflr r0 -/* 802168D8 90 01 00 44 */ stw r0, 0x44(r1) -/* 802168DC DB E1 00 30 */ stfd f31, 0x30(r1) -/* 802168E0 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 802168E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802168E8 48 14 B8 ED */ bl _savegpr_27 -/* 802168EC 7C 7B 1B 78 */ mr r27, r3 -/* 802168F0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802168F4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802168F8 C0 43 03 58 */ lfs f2, 0x358(r3) -/* 802168FC C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80216900 C0 03 03 48 */ lfs f0, 0x348(r3) -/* 80216904 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80216908 EC 02 00 72 */ fmuls f0, f2, f1 -/* 8021690C D0 01 00 08 */ stfs f0, 8(r1) -/* 80216910 C0 03 03 78 */ lfs f0, 0x378(r3) -/* 80216914 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80216918 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8021691C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80216920 3B 80 00 00 */ li r28, 0 -/* 80216924 3B E0 00 00 */ li r31, 0 -/* 80216928 3B C1 00 08 */ addi r30, r1, 8 -/* 8021692C C3 E2 AE 80 */ lfs f31, lit_4182(r2) -lbl_80216930: -/* 80216930 3B BF 02 B4 */ addi r29, r31, 0x2b4 -/* 80216934 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216938 48 03 EE F1 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021693C FC 1F 08 00 */ fcmpu cr0, f31, f1 -/* 80216940 41 82 00 20 */ beq lbl_80216960 -/* 80216944 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216948 7C 3E FC 2E */ lfsx f1, r30, r31 -/* 8021694C 48 03 EE 85 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80216950 7F 63 DB 78 */ mr r3, r27 -/* 80216954 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 80216958 38 A0 00 05 */ li r5, 5 -/* 8021695C 48 00 40 6D */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas -lbl_80216960: -/* 80216960 3B 9C 00 01 */ addi r28, r28, 1 -/* 80216964 2C 1C 00 03 */ cmpwi r28, 3 -/* 80216968 3B FF 00 04 */ addi r31, r31, 4 -/* 8021696C 41 80 FF C4 */ blt lbl_80216930 -/* 80216970 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 80216974 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80216978 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021697C 48 14 B8 A5 */ bl _restgpr_27 -/* 80216980 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80216984 7C 08 03 A6 */ mtlr r0 -/* 80216988 38 21 00 40 */ addi r1, r1, 0x40 -/* 8021698C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setAlphaRupeeChange__13dMeter2Draw_cFb.s b/asm/d/meter/d_meter2_draw/setAlphaRupeeChange__13dMeter2Draw_cFb.s deleted file mode 100644 index 664ea576fe..0000000000 --- a/asm/d/meter/d_meter2_draw/setAlphaRupeeChange__13dMeter2Draw_cFb.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_80216684: -/* 80216684 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80216688 7C 08 02 A6 */ mflr r0 -/* 8021668C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80216690 39 61 00 30 */ addi r11, r1, 0x30 -/* 80216694 48 14 BB 39 */ bl _savegpr_25 -/* 80216698 7C 79 1B 78 */ mr r25, r3 -/* 8021669C 7C 9A 23 78 */ mr r26, r4 -/* 802166A0 3B E0 00 00 */ li r31, 0 -/* 802166A4 3B C0 00 00 */ li r30, 0 -/* 802166A8 3B A0 00 00 */ li r29, 0 -/* 802166AC 3B 80 00 00 */ li r28, 0 -/* 802166B0 3B 60 00 00 */ li r27, 0 -/* 802166B4 C0 03 07 CC */ lfs f0, 0x7cc(r3) -/* 802166B8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802166BC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802166C0 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 802166C4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802166C8 40 82 00 0C */ bne lbl_802166D4 -/* 802166CC 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802166D0 41 82 00 0C */ beq lbl_802166DC -lbl_802166D4: -/* 802166D4 D0 39 07 CC */ stfs f1, 0x7cc(r25) -/* 802166D8 3B E0 00 01 */ li r31, 1 -lbl_802166DC: -/* 802166DC C0 19 07 D0 */ lfs f0, 0x7d0(r25) -/* 802166E0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802166E4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802166E8 C0 23 03 48 */ lfs f1, 0x348(r3) -/* 802166EC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 802166F0 40 82 00 0C */ bne lbl_802166FC -/* 802166F4 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802166F8 41 82 00 0C */ beq lbl_80216704 -lbl_802166FC: -/* 802166FC D0 39 07 D0 */ stfs f1, 0x7d0(r25) -/* 80216700 3B C0 00 01 */ li r30, 1 -lbl_80216704: -/* 80216704 C0 19 07 D4 */ lfs f0, 0x7d4(r25) -/* 80216708 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021670C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216710 C0 23 03 58 */ lfs f1, 0x358(r3) -/* 80216714 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80216718 40 82 00 0C */ bne lbl_80216724 -/* 8021671C 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 80216720 41 82 00 0C */ beq lbl_8021672C -lbl_80216724: -/* 80216724 D0 39 07 D4 */ stfs f1, 0x7d4(r25) -/* 80216728 3B A0 00 01 */ li r29, 1 -lbl_8021672C: -/* 8021672C C0 19 07 D8 */ lfs f0, 0x7d8(r25) -/* 80216730 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80216734 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216738 C0 23 03 78 */ lfs f1, 0x378(r3) -/* 8021673C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80216740 40 82 00 0C */ bne lbl_8021674C -/* 80216744 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 80216748 41 82 00 0C */ beq lbl_80216754 -lbl_8021674C: -/* 8021674C D0 39 07 D8 */ stfs f1, 0x7d8(r25) -/* 80216750 3B 80 00 01 */ li r28, 1 -lbl_80216754: -/* 80216754 C0 19 07 DC */ lfs f0, 0x7dc(r25) -/* 80216758 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021675C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80216760 C0 23 03 88 */ lfs f1, 0x388(r3) -/* 80216764 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80216768 40 82 00 0C */ bne lbl_80216774 -/* 8021676C 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 80216770 41 82 00 0C */ beq lbl_8021677C -lbl_80216774: -/* 80216774 D0 39 07 DC */ stfs f1, 0x7dc(r25) -/* 80216778 3B 60 00 01 */ li r27, 1 -lbl_8021677C: -/* 8021677C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80216780 40 82 00 14 */ bne lbl_80216794 -/* 80216784 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80216788 40 82 00 0C */ bne lbl_80216794 -/* 8021678C 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 80216790 41 82 00 18 */ beq lbl_802167A8 -lbl_80216794: -/* 80216794 80 79 02 B0 */ lwz r3, 0x2b0(r25) -/* 80216798 C0 39 07 CC */ lfs f1, 0x7cc(r25) -/* 8021679C C0 19 07 D0 */ lfs f0, 0x7d0(r25) -/* 802167A0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802167A4 48 03 F0 2D */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_802167A8: -/* 802167A8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802167AC 40 82 00 1C */ bne lbl_802167C8 -/* 802167B0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802167B4 40 82 00 14 */ bne lbl_802167C8 -/* 802167B8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 802167BC 40 82 00 0C */ bne lbl_802167C8 -/* 802167C0 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802167C4 41 82 00 20 */ beq lbl_802167E4 -lbl_802167C8: -/* 802167C8 80 79 02 B4 */ lwz r3, 0x2b4(r25) -/* 802167CC C0 59 07 D0 */ lfs f2, 0x7d0(r25) -/* 802167D0 C0 39 07 D4 */ lfs f1, 0x7d4(r25) -/* 802167D4 C0 19 07 CC */ lfs f0, 0x7cc(r25) -/* 802167D8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802167DC EC 22 00 32 */ fmuls f1, f2, f0 -/* 802167E0 48 03 EF F1 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_802167E4: -/* 802167E4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802167E8 40 82 00 1C */ bne lbl_80216804 -/* 802167EC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802167F0 40 82 00 14 */ bne lbl_80216804 -/* 802167F4 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 802167F8 40 82 00 0C */ bne lbl_80216804 -/* 802167FC 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 80216800 41 82 00 3C */ beq lbl_8021683C -lbl_80216804: -/* 80216804 80 79 02 B8 */ lwz r3, 0x2b8(r25) -/* 80216808 C0 59 07 D0 */ lfs f2, 0x7d0(r25) -/* 8021680C C0 39 07 D8 */ lfs f1, 0x7d8(r25) -/* 80216810 C0 19 07 CC */ lfs f0, 0x7cc(r25) -/* 80216814 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80216818 EC 22 00 32 */ fmuls f1, f2, f0 -/* 8021681C 48 03 EF B5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80216820 80 79 02 BC */ lwz r3, 0x2bc(r25) -/* 80216824 C0 59 07 D0 */ lfs f2, 0x7d0(r25) -/* 80216828 C0 39 07 D8 */ lfs f1, 0x7d8(r25) -/* 8021682C C0 19 07 CC */ lfs f0, 0x7cc(r25) -/* 80216830 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80216834 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80216838 48 03 EF 99 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_8021683C: -/* 8021683C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80216840 40 82 00 1C */ bne lbl_8021685C -/* 80216844 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80216848 40 82 00 14 */ bne lbl_8021685C -/* 8021684C 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80216850 40 82 00 0C */ bne lbl_8021685C -/* 80216854 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 80216858 41 82 00 60 */ beq lbl_802168B8 -lbl_8021685C: -/* 8021685C 3B A0 00 00 */ li r29, 0 -/* 80216860 3B 40 00 00 */ li r26, 0 -lbl_80216864: -/* 80216864 3B C0 00 00 */ li r30, 0 -/* 80216868 3B 60 00 00 */ li r27, 0 -/* 8021686C 7F 99 D2 14 */ add r28, r25, r26 -lbl_80216870: -/* 80216870 38 1B 02 C0 */ addi r0, r27, 0x2c0 -/* 80216874 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 80216878 C0 79 07 D0 */ lfs f3, 0x7d0(r25) -/* 8021687C C0 59 07 CC */ lfs f2, 0x7cc(r25) -/* 80216880 C0 39 07 DC */ lfs f1, 0x7dc(r25) -/* 80216884 C0 19 07 D4 */ lfs f0, 0x7d4(r25) -/* 80216888 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8021688C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80216890 EC 23 00 32 */ fmuls f1, f3, f0 -/* 80216894 48 03 EF 3D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80216898 3B DE 00 01 */ addi r30, r30, 1 -/* 8021689C 2C 1E 00 02 */ cmpwi r30, 2 -/* 802168A0 3B 7B 00 04 */ addi r27, r27, 4 -/* 802168A4 41 80 FF CC */ blt lbl_80216870 -/* 802168A8 3B BD 00 01 */ addi r29, r29, 1 -/* 802168AC 2C 1D 00 04 */ cmpwi r29, 4 -/* 802168B0 3B 5A 00 08 */ addi r26, r26, 8 -/* 802168B4 41 80 FF B0 */ blt lbl_80216864 -lbl_802168B8: -/* 802168B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802168BC 48 14 B9 5D */ bl _restgpr_25 -/* 802168C0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802168C4 7C 08 03 A6 */ mtlr r0 -/* 802168C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802168CC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setButtonIconAAlpha__13dMeter2Draw_cFUcUlb.s b/asm/d/meter/d_meter2_draw/setButtonIconAAlpha__13dMeter2Draw_cFUcUlb.s deleted file mode 100644 index 7566b14d1f..0000000000 --- a/asm/d/meter/d_meter2_draw/setButtonIconAAlpha__13dMeter2Draw_cFUcUlb.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_802195A4: -/* 802195A4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802195A8 7C 08 02 A6 */ mflr r0 -/* 802195AC 90 01 00 74 */ stw r0, 0x74(r1) -/* 802195B0 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 802195B4 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 802195B8 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 802195BC F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 802195C0 39 61 00 50 */ addi r11, r1, 0x50 -/* 802195C4 48 14 8C 0D */ bl _savegpr_26 -/* 802195C8 7C 7E 1B 78 */ mr r30, r3 -/* 802195CC 80 63 03 00 */ lwz r3, 0x300(r3) -/* 802195D0 48 03 C0 7D */ bl isVisible__13CPaneMgrAlphaFv -/* 802195D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802195D8 41 82 01 88 */ beq lbl_80219760 -/* 802195DC 80 7E 03 00 */ lwz r3, 0x300(r30) -/* 802195E0 88 03 00 18 */ lbz r0, 0x18(r3) -/* 802195E4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802195E8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802195EC C0 43 00 A8 */ lfs f2, 0xa8(r3) -/* 802195F0 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 802195F4 C0 03 00 84 */ lfs f0, 0x84(r3) -/* 802195F8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802195FC EC 42 00 32 */ fmuls f2, f2, f0 -/* 80219600 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 80219604 90 01 00 0C */ stw r0, 0xc(r1) -/* 80219608 3C 00 43 30 */ lis r0, 0x4330 -/* 8021960C 90 01 00 08 */ stw r0, 8(r1) -/* 80219610 C8 01 00 08 */ lfd f0, 8(r1) -/* 80219614 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80219618 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8021961C FC 00 00 1E */ fctiwz f0, f0 -/* 80219620 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80219624 83 61 00 14 */ lwz r27, 0x14(r1) -/* 80219628 80 7E 02 F8 */ lwz r3, 0x2f8(r30) -/* 8021962C 48 03 C1 FD */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219630 FF E0 08 90 */ fmr f31, f1 -/* 80219634 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80219638 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021963C A0 1F 00 AE */ lhz r0, 0xae(r31) -/* 80219640 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80219644 40 82 00 24 */ bne lbl_80219668 -/* 80219648 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021964C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80219650 88 03 5E 4A */ lbz r0, 0x5e4a(r3) -/* 80219654 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 80219658 40 82 00 10 */ bne lbl_80219668 -/* 8021965C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219660 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219664 8B 63 04 2B */ lbz r27, 0x42b(r3) -lbl_80219668: -/* 80219668 80 7E 03 00 */ lwz r3, 0x300(r30) -/* 8021966C 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 80219670 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 80219674 90 01 00 14 */ stw r0, 0x14(r1) -/* 80219678 3C 00 43 30 */ lis r0, 0x4330 -/* 8021967C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80219680 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80219684 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80219688 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8021968C FC 00 00 1E */ fctiwz f0, f0 -/* 80219690 D8 01 00 08 */ stfd f0, 8(r1) -/* 80219694 80 81 00 0C */ lwz r4, 0xc(r1) -/* 80219698 81 83 00 00 */ lwz r12, 0(r3) -/* 8021969C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802196A0 7D 89 03 A6 */ mtctr r12 -/* 802196A4 4E 80 04 21 */ bctrl -/* 802196A8 3B 40 00 00 */ li r26, 0 -/* 802196AC 3B A0 00 00 */ li r29, 0 -/* 802196B0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802196B4 3B 63 EB C8 */ addi r27, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802196B8 CB C2 AE C0 */ lfd f30, lit_6293(r2) -/* 802196BC 3F 80 43 30 */ lis r28, 0x4330 -lbl_802196C0: -/* 802196C0 38 1D 00 C0 */ addi r0, r29, 0xc0 -/* 802196C4 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 802196C8 88 83 00 18 */ lbz r4, 0x18(r3) -/* 802196CC A0 1F 00 AE */ lhz r0, 0xae(r31) -/* 802196D0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 802196D4 40 82 00 48 */ bne lbl_8021971C -/* 802196D8 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 802196DC 90 81 00 14 */ stw r4, 0x14(r1) -/* 802196E0 3C 80 43 30 */ lis r4, 0x4330 -/* 802196E4 90 81 00 10 */ stw r4, 0x10(r1) -/* 802196E8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802196EC EC 40 08 28 */ fsubs f2, f0, f1 -/* 802196F0 88 1B 04 2C */ lbz r0, 0x42c(r27) -/* 802196F4 90 01 00 0C */ stw r0, 0xc(r1) -/* 802196F8 90 81 00 08 */ stw r4, 8(r1) -/* 802196FC C8 01 00 08 */ lfd f0, 8(r1) -/* 80219700 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80219704 C0 02 AE CC */ lfs f0, lit_8207(r2) -/* 80219708 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8021970C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80219710 FC 00 00 1E */ fctiwz f0, f0 -/* 80219714 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80219718 80 81 00 1C */ lwz r4, 0x1c(r1) -lbl_8021971C: -/* 8021971C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80219720 90 01 00 24 */ stw r0, 0x24(r1) -/* 80219724 93 81 00 20 */ stw r28, 0x20(r1) -/* 80219728 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 8021972C EC 00 F0 28 */ fsubs f0, f0, f30 -/* 80219730 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80219734 FC 00 00 1E */ fctiwz f0, f0 -/* 80219738 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 8021973C 80 81 00 2C */ lwz r4, 0x2c(r1) -/* 80219740 81 83 00 00 */ lwz r12, 0(r3) -/* 80219744 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80219748 7D 89 03 A6 */ mtctr r12 -/* 8021974C 4E 80 04 21 */ bctrl -/* 80219750 3B 5A 00 01 */ addi r26, r26, 1 -/* 80219754 2C 1A 00 05 */ cmpwi r26, 5 -/* 80219758 3B BD 00 04 */ addi r29, r29, 4 -/* 8021975C 41 80 FF 64 */ blt lbl_802196C0 -lbl_80219760: -/* 80219760 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 80219764 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 80219768 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 8021976C CB C1 00 50 */ lfd f30, 0x50(r1) -/* 80219770 39 61 00 50 */ addi r11, r1, 0x50 -/* 80219774 48 14 8A A9 */ bl _restgpr_26 -/* 80219778 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8021977C 7C 08 03 A6 */ mtlr r0 -/* 80219780 38 21 00 70 */ addi r1, r1, 0x70 -/* 80219784 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setButtonIconAlpha__13dMeter2Draw_cFiUcUlb.s b/asm/d/meter/d_meter2_draw/setButtonIconAlpha__13dMeter2Draw_cFiUcUlb.s deleted file mode 100644 index bc38d94afb..0000000000 --- a/asm/d/meter/d_meter2_draw/setButtonIconAlpha__13dMeter2Draw_cFiUcUlb.s +++ /dev/null @@ -1,274 +0,0 @@ -lbl_80219E98: -/* 80219E98 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80219E9C 7C 08 02 A6 */ mflr r0 -/* 80219EA0 90 01 00 84 */ stw r0, 0x84(r1) -/* 80219EA4 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 80219EA8 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 80219EAC DB C1 00 60 */ stfd f30, 0x60(r1) -/* 80219EB0 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 80219EB4 39 61 00 60 */ addi r11, r1, 0x60 -/* 80219EB8 48 14 83 11 */ bl _savegpr_24 -/* 80219EBC 7C 78 1B 78 */ mr r24, r3 -/* 80219EC0 7C 99 23 78 */ mr r25, r4 -/* 80219EC4 54 9F 10 3A */ slwi r31, r4, 2 -/* 80219EC8 7F D8 FA 14 */ add r30, r24, r31 -/* 80219ECC 80 7E 03 2C */ lwz r3, 0x32c(r30) -/* 80219ED0 48 03 B7 7D */ bl isVisible__13CPaneMgrAlphaFv -/* 80219ED4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80219ED8 40 82 00 24 */ bne lbl_80219EFC -/* 80219EDC 80 7E 03 1C */ lwz r3, 0x31c(r30) -/* 80219EE0 48 03 B7 6D */ bl isVisible__13CPaneMgrAlphaFv -/* 80219EE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80219EE8 40 82 00 14 */ bne lbl_80219EFC -/* 80219EEC 80 7E 03 0C */ lwz r3, 0x30c(r30) -/* 80219EF0 48 03 B7 5D */ bl isVisible__13CPaneMgrAlphaFv -/* 80219EF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80219EF8 41 82 03 7C */ beq lbl_8021A274 -lbl_80219EFC: -/* 80219EFC C3 C2 AE 84 */ lfs f30, lit_4183(r2) -/* 80219F00 3B 40 00 01 */ li r26, 1 -/* 80219F04 80 7E 03 2C */ lwz r3, 0x32c(r30) -/* 80219F08 48 03 B7 45 */ bl isVisible__13CPaneMgrAlphaFv -/* 80219F0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80219F10 41 82 00 08 */ beq lbl_80219F18 -/* 80219F14 3B 40 00 00 */ li r26, 0 -lbl_80219F18: -/* 80219F18 2C 19 00 00 */ cmpwi r25, 0 -/* 80219F1C 40 82 00 30 */ bne lbl_80219F4C -/* 80219F20 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219F24 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219F28 C0 43 01 48 */ lfs f2, 0x148(r3) -/* 80219F2C C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80219F30 C0 03 00 84 */ lfs f0, 0x84(r3) -/* 80219F34 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80219F38 EC 42 00 32 */ fmuls f2, f2, f0 -/* 80219F3C 57 40 10 3A */ slwi r0, r26, 2 -/* 80219F40 7C 63 02 14 */ add r3, r3, r0 -/* 80219F44 C3 C3 02 58 */ lfs f30, 0x258(r3) -/* 80219F48 48 00 00 54 */ b lbl_80219F9C -lbl_80219F4C: -/* 80219F4C 2C 19 00 01 */ cmpwi r25, 1 -/* 80219F50 40 82 00 30 */ bne lbl_80219F80 -/* 80219F54 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219F58 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219F5C C0 43 01 58 */ lfs f2, 0x158(r3) -/* 80219F60 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80219F64 C0 03 00 84 */ lfs f0, 0x84(r3) -/* 80219F68 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80219F6C EC 42 00 32 */ fmuls f2, f2, f0 -/* 80219F70 57 40 10 3A */ slwi r0, r26, 2 -/* 80219F74 7C 63 02 14 */ add r3, r3, r0 -/* 80219F78 C3 C3 02 78 */ lfs f30, 0x278(r3) -/* 80219F7C 48 00 00 20 */ b lbl_80219F9C -lbl_80219F80: -/* 80219F80 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219F84 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219F88 C0 43 01 78 */ lfs f2, 0x178(r3) -/* 80219F8C C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80219F90 C0 03 00 84 */ lfs f0, 0x84(r3) -/* 80219F94 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80219F98 EC 42 00 32 */ fmuls f2, f2, f0 -lbl_80219F9C: -/* 80219F9C 80 7E 03 2C */ lwz r3, 0x32c(r30) -/* 80219FA0 8B 83 00 18 */ lbz r28, 0x18(r3) -/* 80219FA4 7F B8 FA 14 */ add r29, r24, r31 -/* 80219FA8 80 7D 03 1C */ lwz r3, 0x31c(r29) -/* 80219FAC 88 03 00 18 */ lbz r0, 0x18(r3) -/* 80219FB0 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 80219FB4 90 01 00 0C */ stw r0, 0xc(r1) -/* 80219FB8 3C 00 43 30 */ lis r0, 0x4330 -/* 80219FBC 90 01 00 08 */ stw r0, 8(r1) -/* 80219FC0 C8 01 00 08 */ lfd f0, 8(r1) -/* 80219FC4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80219FC8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80219FCC EC 1E 00 32 */ fmuls f0, f30, f0 -/* 80219FD0 FC 00 00 1E */ fctiwz f0, f0 -/* 80219FD4 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80219FD8 83 61 00 14 */ lwz r27, 0x14(r1) -/* 80219FDC 80 7D 03 0C */ lwz r3, 0x30c(r29) -/* 80219FE0 88 63 00 18 */ lbz r3, 0x18(r3) -/* 80219FE4 90 61 00 1C */ stw r3, 0x1c(r1) -/* 80219FE8 90 01 00 18 */ stw r0, 0x18(r1) -/* 80219FEC C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80219FF0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80219FF4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80219FF8 FC 00 00 1E */ fctiwz f0, f0 -/* 80219FFC D8 01 00 20 */ stfd f0, 0x20(r1) -/* 8021A000 83 41 00 24 */ lwz r26, 0x24(r1) -/* 8021A004 80 78 02 F8 */ lwz r3, 0x2f8(r24) -/* 8021A008 48 03 B8 21 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 8021A00C FF E0 08 90 */ fmr f31, f1 -/* 8021A010 2C 19 00 00 */ cmpwi r25, 0 -/* 8021A014 40 82 00 50 */ bne lbl_8021A064 -/* 8021A018 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021A01C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021A020 A0 03 00 AE */ lhz r0, 0xae(r3) -/* 8021A024 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 8021A028 40 82 00 8C */ bne lbl_8021A0B4 -/* 8021A02C 7F 03 C3 78 */ mr r3, r24 -/* 8021A030 48 00 1B 3D */ bl getFishingType__13dMeter2Draw_cFv -/* 8021A034 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021A038 41 82 00 0C */ beq lbl_8021A044 -/* 8021A03C 3B 80 00 00 */ li r28, 0 -/* 8021A040 48 00 00 10 */ b lbl_8021A050 -lbl_8021A044: -/* 8021A044 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021A048 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021A04C 8B 83 04 2A */ lbz r28, 0x42a(r3) -lbl_8021A050: -/* 8021A050 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021A054 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021A058 8B 63 04 2A */ lbz r27, 0x42a(r3) -/* 8021A05C 8B 43 04 2B */ lbz r26, 0x42b(r3) -/* 8021A060 48 00 00 54 */ b lbl_8021A0B4 -lbl_8021A064: -/* 8021A064 2C 19 00 01 */ cmpwi r25, 1 -/* 8021A068 40 82 00 4C */ bne lbl_8021A0B4 -/* 8021A06C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021A070 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021A074 A0 03 00 AE */ lhz r0, 0xae(r3) -/* 8021A078 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8021A07C 40 82 00 38 */ bne lbl_8021A0B4 -/* 8021A080 7F 03 C3 78 */ mr r3, r24 -/* 8021A084 48 00 1A E9 */ bl getFishingType__13dMeter2Draw_cFv -/* 8021A088 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021A08C 41 82 00 0C */ beq lbl_8021A098 -/* 8021A090 3B 80 00 00 */ li r28, 0 -/* 8021A094 48 00 00 10 */ b lbl_8021A0A4 -lbl_8021A098: -/* 8021A098 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021A09C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021A0A0 8B 83 04 2A */ lbz r28, 0x42a(r3) -lbl_8021A0A4: -/* 8021A0A4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021A0A8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021A0AC 8B 63 04 2A */ lbz r27, 0x42a(r3) -/* 8021A0B0 8B 43 04 2B */ lbz r26, 0x42b(r3) -lbl_8021A0B4: -/* 8021A0B4 80 7E 03 2C */ lwz r3, 0x32c(r30) -/* 8021A0B8 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8021A0BC C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 8021A0C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021A0C4 3C 00 43 30 */ lis r0, 0x4330 -/* 8021A0C8 90 01 00 20 */ stw r0, 0x20(r1) -/* 8021A0CC C8 01 00 20 */ lfd f0, 0x20(r1) -/* 8021A0D0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8021A0D4 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8021A0D8 FC 00 00 1E */ fctiwz f0, f0 -/* 8021A0DC D8 01 00 18 */ stfd f0, 0x18(r1) -/* 8021A0E0 80 81 00 1C */ lwz r4, 0x1c(r1) -/* 8021A0E4 81 83 00 00 */ lwz r12, 0(r3) -/* 8021A0E8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8021A0EC 7D 89 03 A6 */ mtctr r12 -/* 8021A0F0 4E 80 04 21 */ bctrl -/* 8021A0F4 80 7D 03 1C */ lwz r3, 0x31c(r29) -/* 8021A0F8 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 8021A0FC C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 8021A100 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021A104 3C 00 43 30 */ lis r0, 0x4330 -/* 8021A108 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021A10C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8021A110 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8021A114 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8021A118 FC 00 00 1E */ fctiwz f0, f0 -/* 8021A11C D8 01 00 08 */ stfd f0, 8(r1) -/* 8021A120 80 81 00 0C */ lwz r4, 0xc(r1) -/* 8021A124 81 83 00 00 */ lwz r12, 0(r3) -/* 8021A128 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8021A12C 7D 89 03 A6 */ mtctr r12 -/* 8021A130 4E 80 04 21 */ bctrl -/* 8021A134 80 7D 03 0C */ lwz r3, 0x30c(r29) -/* 8021A138 57 40 06 3E */ clrlwi r0, r26, 0x18 -/* 8021A13C C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 8021A140 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8021A144 3C 00 43 30 */ lis r0, 0x4330 -/* 8021A148 90 01 00 28 */ stw r0, 0x28(r1) -/* 8021A14C C8 01 00 28 */ lfd f0, 0x28(r1) -/* 8021A150 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8021A154 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8021A158 FC 00 00 1E */ fctiwz f0, f0 -/* 8021A15C D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8021A160 80 81 00 34 */ lwz r4, 0x34(r1) -/* 8021A164 81 83 00 00 */ lwz r12, 0(r3) -/* 8021A168 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8021A16C 7D 89 03 A6 */ mtctr r12 -/* 8021A170 4E 80 04 21 */ bctrl -/* 8021A174 3B 40 00 01 */ li r26, 1 -/* 8021A178 2C 19 00 00 */ cmpwi r25, 0 -/* 8021A17C 40 82 00 20 */ bne lbl_8021A19C -/* 8021A180 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021A184 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021A188 A0 03 00 AE */ lhz r0, 0xae(r3) -/* 8021A18C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 8021A190 40 82 00 2C */ bne lbl_8021A1BC -/* 8021A194 3B 40 00 00 */ li r26, 0 -/* 8021A198 48 00 00 24 */ b lbl_8021A1BC -lbl_8021A19C: -/* 8021A19C 2C 19 00 01 */ cmpwi r25, 1 -/* 8021A1A0 40 82 00 1C */ bne lbl_8021A1BC -/* 8021A1A4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021A1A8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8021A1AC A0 03 00 AE */ lhz r0, 0xae(r3) -/* 8021A1B0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8021A1B4 40 82 00 08 */ bne lbl_8021A1BC -/* 8021A1B8 3B 40 00 00 */ li r26, 0 -lbl_8021A1BC: -/* 8021A1BC 3B A0 00 00 */ li r29, 0 -/* 8021A1C0 3B 20 00 00 */ li r25, 0 -/* 8021A1C4 7F 98 FA 14 */ add r28, r24, r31 -/* 8021A1C8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021A1CC 3B 63 EB C8 */ addi r27, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021A1D0 CB C2 AE C0 */ lfd f30, lit_6293(r2) -/* 8021A1D4 3F 00 43 30 */ lis r24, 0x4330 -lbl_8021A1D8: -/* 8021A1D8 38 19 00 E8 */ addi r0, r25, 0xe8 -/* 8021A1DC 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8021A1E0 88 03 00 18 */ lbz r0, 0x18(r3) -/* 8021A1E4 2C 1A 00 00 */ cmpwi r26, 0 -/* 8021A1E8 40 82 00 48 */ bne lbl_8021A230 -/* 8021A1EC C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 8021A1F0 90 01 00 34 */ stw r0, 0x34(r1) -/* 8021A1F4 3C 80 43 30 */ lis r4, 0x4330 -/* 8021A1F8 90 81 00 30 */ stw r4, 0x30(r1) -/* 8021A1FC C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8021A200 EC 40 08 28 */ fsubs f2, f0, f1 -/* 8021A204 88 1B 04 2C */ lbz r0, 0x42c(r27) -/* 8021A208 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8021A20C 90 81 00 28 */ stw r4, 0x28(r1) -/* 8021A210 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 8021A214 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8021A218 C0 02 AE CC */ lfs f0, lit_8207(r2) -/* 8021A21C EC 01 00 24 */ fdivs f0, f1, f0 -/* 8021A220 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8021A224 FC 00 00 1E */ fctiwz f0, f0 -/* 8021A228 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 8021A22C 80 01 00 24 */ lwz r0, 0x24(r1) -lbl_8021A230: -/* 8021A230 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8021A234 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8021A238 93 01 00 18 */ stw r24, 0x18(r1) -/* 8021A23C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8021A240 EC 00 F0 28 */ fsubs f0, f0, f30 -/* 8021A244 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8021A248 FC 00 00 1E */ fctiwz f0, f0 -/* 8021A24C D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8021A250 80 81 00 14 */ lwz r4, 0x14(r1) -/* 8021A254 81 83 00 00 */ lwz r12, 0(r3) -/* 8021A258 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8021A25C 7D 89 03 A6 */ mtctr r12 -/* 8021A260 4E 80 04 21 */ bctrl -/* 8021A264 3B BD 00 01 */ addi r29, r29, 1 -/* 8021A268 2C 1D 00 05 */ cmpwi r29, 5 -/* 8021A26C 3B 39 00 0C */ addi r25, r25, 0xc -/* 8021A270 41 80 FF 68 */ blt lbl_8021A1D8 -lbl_8021A274: -/* 8021A274 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 8021A278 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 8021A27C E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 8021A280 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 8021A284 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021A288 48 14 7F 8D */ bl _restgpr_24 -/* 8021A28C 80 01 00 84 */ lwz r0, 0x84(r1) -/* 8021A290 7C 08 03 A6 */ mtlr r0 -/* 8021A294 38 21 00 80 */ addi r1, r1, 0x80 -/* 8021A298 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setButtonIconBAlpha__13dMeter2Draw_cFUcUlb.s b/asm/d/meter/d_meter2_draw/setButtonIconBAlpha__13dMeter2Draw_cFUcUlb.s deleted file mode 100644 index 7655e6ba46..0000000000 --- a/asm/d/meter/d_meter2_draw/setButtonIconBAlpha__13dMeter2Draw_cFUcUlb.s +++ /dev/null @@ -1,200 +0,0 @@ -lbl_80219788: -/* 80219788 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 8021978C 7C 08 02 A6 */ mflr r0 -/* 80219790 90 01 00 84 */ stw r0, 0x84(r1) -/* 80219794 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 80219798 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 8021979C DB C1 00 60 */ stfd f30, 0x60(r1) -/* 802197A0 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 802197A4 39 61 00 60 */ addi r11, r1, 0x60 -/* 802197A8 48 14 8A 25 */ bl _savegpr_25 -/* 802197AC 7C 7D 1B 78 */ mr r29, r3 -/* 802197B0 7C DE 33 78 */ mr r30, r6 -/* 802197B4 80 63 03 28 */ lwz r3, 0x328(r3) -/* 802197B8 48 03 BE 95 */ bl isVisible__13CPaneMgrAlphaFv -/* 802197BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802197C0 40 82 00 24 */ bne lbl_802197E4 -/* 802197C4 80 7D 03 18 */ lwz r3, 0x318(r29) -/* 802197C8 48 03 BE 85 */ bl isVisible__13CPaneMgrAlphaFv -/* 802197CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802197D0 40 82 00 14 */ bne lbl_802197E4 -/* 802197D4 80 7D 03 04 */ lwz r3, 0x304(r29) -/* 802197D8 48 03 BE 75 */ bl isVisible__13CPaneMgrAlphaFv -/* 802197DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802197E0 41 82 02 7C */ beq lbl_80219A5C -lbl_802197E4: -/* 802197E4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802197E8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802197EC C0 43 00 F0 */ lfs f2, 0xf0(r3) -/* 802197F0 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 802197F4 C0 03 00 84 */ lfs f0, 0x84(r3) -/* 802197F8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802197FC EF C2 00 32 */ fmuls f30, f2, f0 -/* 80219800 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 80219804 48 03 BE 49 */ bl isVisible__13CPaneMgrAlphaFv -/* 80219808 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8021980C 41 82 00 0C */ beq lbl_80219818 -/* 80219810 C0 5D 08 14 */ lfs f2, 0x814(r29) -/* 80219814 48 00 00 08 */ b lbl_8021981C -lbl_80219818: -/* 80219818 C0 5D 08 18 */ lfs f2, 0x818(r29) -lbl_8021981C: -/* 8021981C 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 80219820 8B 23 00 18 */ lbz r25, 0x18(r3) -/* 80219824 80 7D 03 18 */ lwz r3, 0x318(r29) -/* 80219828 88 03 00 18 */ lbz r0, 0x18(r3) -/* 8021982C C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 80219830 90 01 00 0C */ stw r0, 0xc(r1) -/* 80219834 3C 00 43 30 */ lis r0, 0x4330 -/* 80219838 90 01 00 08 */ stw r0, 8(r1) -/* 8021983C C8 01 00 08 */ lfd f0, 8(r1) -/* 80219840 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80219844 EC 1E 00 32 */ fmuls f0, f30, f0 -/* 80219848 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8021984C FC 00 00 1E */ fctiwz f0, f0 -/* 80219850 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80219854 83 41 00 14 */ lwz r26, 0x14(r1) -/* 80219858 80 7D 03 04 */ lwz r3, 0x304(r29) -/* 8021985C 88 63 00 18 */ lbz r3, 0x18(r3) -/* 80219860 90 61 00 1C */ stw r3, 0x1c(r1) -/* 80219864 90 01 00 18 */ stw r0, 0x18(r1) -/* 80219868 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8021986C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80219870 EC 1E 00 32 */ fmuls f0, f30, f0 -/* 80219874 FC 00 00 1E */ fctiwz f0, f0 -/* 80219878 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 8021987C 83 61 00 24 */ lwz r27, 0x24(r1) -/* 80219880 80 7D 02 F8 */ lwz r3, 0x2f8(r29) -/* 80219884 48 03 BF A5 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219888 FF E0 08 90 */ fmr f31, f1 -/* 8021988C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80219890 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80219894 A0 1F 00 AE */ lhz r0, 0xae(r31) -/* 80219898 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f -/* 8021989C 40 82 00 28 */ bne lbl_802198C4 -/* 802198A0 A0 1F 00 A2 */ lhz r0, 0xa2(r31) -/* 802198A4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 802198A8 40 82 00 1C */ bne lbl_802198C4 -/* 802198AC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802198B0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802198B4 88 03 04 2A */ lbz r0, 0x42a(r3) -/* 802198B8 7C 19 03 78 */ mr r25, r0 -/* 802198BC 7C 1A 03 78 */ mr r26, r0 -/* 802198C0 8B 63 04 2B */ lbz r27, 0x42b(r3) -lbl_802198C4: -/* 802198C4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802198C8 40 82 00 08 */ bne lbl_802198D0 -/* 802198CC 3B 40 00 00 */ li r26, 0 -lbl_802198D0: -/* 802198D0 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 802198D4 57 20 06 3E */ clrlwi r0, r25, 0x18 -/* 802198D8 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 802198DC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802198E0 3C 00 43 30 */ lis r0, 0x4330 -/* 802198E4 90 01 00 20 */ stw r0, 0x20(r1) -/* 802198E8 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802198EC EC 00 08 28 */ fsubs f0, f0, f1 -/* 802198F0 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 802198F4 FC 00 00 1E */ fctiwz f0, f0 -/* 802198F8 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 802198FC 80 81 00 1C */ lwz r4, 0x1c(r1) -/* 80219900 81 83 00 00 */ lwz r12, 0(r3) -/* 80219904 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80219908 7D 89 03 A6 */ mtctr r12 -/* 8021990C 4E 80 04 21 */ bctrl -/* 80219910 80 7D 03 18 */ lwz r3, 0x318(r29) -/* 80219914 57 40 06 3E */ clrlwi r0, r26, 0x18 -/* 80219918 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 8021991C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80219920 3C 00 43 30 */ lis r0, 0x4330 -/* 80219924 90 01 00 10 */ stw r0, 0x10(r1) -/* 80219928 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8021992C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80219930 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80219934 FC 00 00 1E */ fctiwz f0, f0 -/* 80219938 D8 01 00 08 */ stfd f0, 8(r1) -/* 8021993C 80 81 00 0C */ lwz r4, 0xc(r1) -/* 80219940 81 83 00 00 */ lwz r12, 0(r3) -/* 80219944 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80219948 7D 89 03 A6 */ mtctr r12 -/* 8021994C 4E 80 04 21 */ bctrl -/* 80219950 80 7D 03 04 */ lwz r3, 0x304(r29) -/* 80219954 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 80219958 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 8021995C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80219960 3C 00 43 30 */ lis r0, 0x4330 -/* 80219964 90 01 00 28 */ stw r0, 0x28(r1) -/* 80219968 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 8021996C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80219970 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80219974 FC 00 00 1E */ fctiwz f0, f0 -/* 80219978 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8021997C 80 81 00 34 */ lwz r4, 0x34(r1) -/* 80219980 81 83 00 00 */ lwz r12, 0(r3) -/* 80219984 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80219988 7D 89 03 A6 */ mtctr r12 -/* 8021998C 4E 80 04 21 */ bctrl -/* 80219990 3B C0 00 00 */ li r30, 0 -/* 80219994 3B 80 00 00 */ li r28, 0 -/* 80219998 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8021999C 3B 23 01 88 */ addi r25, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802199A0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 802199A4 3B 43 EB C8 */ addi r26, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 802199A8 CB C2 AE C0 */ lfd f30, lit_6293(r2) -/* 802199AC 3F 60 43 30 */ lis r27, 0x4330 -lbl_802199B0: -/* 802199B0 38 1C 00 D4 */ addi r0, r28, 0xd4 -/* 802199B4 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 802199B8 88 83 00 18 */ lbz r4, 0x18(r3) -/* 802199BC A0 1F 00 AE */ lhz r0, 0xae(r31) -/* 802199C0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 802199C4 40 82 00 54 */ bne lbl_80219A18 -/* 802199C8 A0 19 00 A2 */ lhz r0, 0xa2(r25) -/* 802199CC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 802199D0 40 82 00 48 */ bne lbl_80219A18 -/* 802199D4 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 802199D8 90 81 00 34 */ stw r4, 0x34(r1) -/* 802199DC 3C 80 43 30 */ lis r4, 0x4330 -/* 802199E0 90 81 00 30 */ stw r4, 0x30(r1) -/* 802199E4 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 802199E8 EC 40 08 28 */ fsubs f2, f0, f1 -/* 802199EC 88 1A 04 2C */ lbz r0, 0x42c(r26) -/* 802199F0 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802199F4 90 81 00 28 */ stw r4, 0x28(r1) -/* 802199F8 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802199FC EC 20 08 28 */ fsubs f1, f0, f1 -/* 80219A00 C0 02 AE CC */ lfs f0, lit_8207(r2) -/* 80219A04 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80219A08 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80219A0C FC 00 00 1E */ fctiwz f0, f0 -/* 80219A10 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80219A14 80 81 00 24 */ lwz r4, 0x24(r1) -lbl_80219A18: -/* 80219A18 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80219A1C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80219A20 93 61 00 30 */ stw r27, 0x30(r1) -/* 80219A24 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80219A28 EC 00 F0 28 */ fsubs f0, f0, f30 -/* 80219A2C EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80219A30 FC 00 00 1E */ fctiwz f0, f0 -/* 80219A34 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80219A38 80 81 00 2C */ lwz r4, 0x2c(r1) -/* 80219A3C 81 83 00 00 */ lwz r12, 0(r3) -/* 80219A40 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80219A44 7D 89 03 A6 */ mtctr r12 -/* 80219A48 4E 80 04 21 */ bctrl -/* 80219A4C 3B DE 00 01 */ addi r30, r30, 1 -/* 80219A50 2C 1E 00 05 */ cmpwi r30, 5 -/* 80219A54 3B 9C 00 04 */ addi r28, r28, 4 -/* 80219A58 41 80 FF 58 */ blt lbl_802199B0 -lbl_80219A5C: -/* 80219A5C E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 80219A60 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 80219A64 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 80219A68 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 80219A6C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80219A70 48 14 87 A9 */ bl _restgpr_25 -/* 80219A74 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80219A78 7C 08 03 A6 */ mtlr r0 -/* 80219A7C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80219A80 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setButtonIconMidonaAlpha__13dMeter2Draw_cFUl.s b/asm/d/meter/d_meter2_draw/setButtonIconMidonaAlpha__13dMeter2Draw_cFUl.s deleted file mode 100644 index 8ee17c1208..0000000000 --- a/asm/d/meter/d_meter2_draw/setButtonIconMidonaAlpha__13dMeter2Draw_cFUl.s +++ /dev/null @@ -1,277 +0,0 @@ -lbl_80219A84: -/* 80219A84 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80219A88 7C 08 02 A6 */ mflr r0 -/* 80219A8C 90 01 00 64 */ stw r0, 0x64(r1) -/* 80219A90 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80219A94 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80219A98 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 80219A9C F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 80219AA0 DB A1 00 30 */ stfd f29, 0x30(r1) -/* 80219AA4 F3 A1 00 38 */ psq_st f29, 56(r1), 0, 0 /* qr0 */ -/* 80219AA8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80219AAC 48 14 87 2D */ bl _savegpr_28 -/* 80219AB0 7C 7D 1B 78 */ mr r29, r3 -/* 80219AB4 7C 9E 23 78 */ mr r30, r4 -/* 80219AB8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219ABC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219AC0 C0 03 01 24 */ lfs f0, 0x124(r3) -/* 80219AC4 80 7D 03 08 */ lwz r3, 0x308(r29) -/* 80219AC8 80 63 00 04 */ lwz r3, 4(r3) -/* 80219ACC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80219AD0 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 80219AD4 81 83 00 00 */ lwz r12, 0(r3) -/* 80219AD8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80219ADC 7D 89 03 A6 */ mtctr r12 -/* 80219AE0 4E 80 04 21 */ bctrl -/* 80219AE4 80 7D 03 08 */ lwz r3, 0x308(r29) -/* 80219AE8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219AEC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219AF0 C0 24 01 2C */ lfs f1, 0x12c(r4) -/* 80219AF4 C0 44 01 30 */ lfs f2, 0x130(r4) -/* 80219AF8 48 03 AA B9 */ bl paneTrans__8CPaneMgrFff -/* 80219AFC 80 7D 03 08 */ lwz r3, 0x308(r29) -/* 80219B00 48 03 BB 4D */ bl isVisible__13CPaneMgrAlphaFv -/* 80219B04 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80219B08 41 82 02 44 */ beq lbl_80219D4C -/* 80219B0C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219B10 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219B14 C0 43 01 28 */ lfs f2, 0x128(r3) -/* 80219B18 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80219B1C C0 03 00 84 */ lfs f0, 0x84(r3) -/* 80219B20 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80219B24 EF C2 00 32 */ fmuls f30, f2, f0 -/* 80219B28 80 7D 03 08 */ lwz r3, 0x308(r29) -/* 80219B2C 88 03 00 18 */ lbz r0, 0x18(r3) -/* 80219B30 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 80219B34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80219B38 3C 00 43 30 */ lis r0, 0x4330 -/* 80219B3C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80219B40 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80219B44 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80219B48 C0 02 AE CC */ lfs f0, lit_8207(r2) -/* 80219B4C EF A1 00 24 */ fdivs f29, f1, f0 -/* 80219B50 80 7D 02 F8 */ lwz r3, 0x2f8(r29) -/* 80219B54 48 03 BC D5 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219B58 FF E0 08 90 */ fmr f31, f1 -/* 80219B5C 3B E0 00 01 */ li r31, 1 -/* 80219B60 7F A3 EB 78 */ mr r3, r29 -/* 80219B64 48 00 20 51 */ bl getCanoeFishing__13dMeter2Draw_cFv -/* 80219B68 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80219B6C 40 82 00 60 */ bne lbl_80219BCC -/* 80219B70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80219B74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80219B78 3B 83 07 F0 */ addi r28, r3, 0x7f0 -/* 80219B7C 7F 83 E3 78 */ mr r3, r28 -/* 80219B80 38 80 05 40 */ li r4, 0x540 -/* 80219B84 4B E1 AE 39 */ bl isEventBit__11dSv_event_cCFUs -/* 80219B88 2C 03 00 00 */ cmpwi r3, 0 -/* 80219B8C 40 82 00 18 */ bne lbl_80219BA4 -/* 80219B90 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80219B94 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80219B98 A0 03 00 AE */ lhz r0, 0xae(r3) -/* 80219B9C 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 -/* 80219BA0 41 82 00 2C */ beq lbl_80219BCC -lbl_80219BA4: -/* 80219BA4 7F 83 E3 78 */ mr r3, r28 -/* 80219BA8 38 80 0C 10 */ li r4, 0xc10 -/* 80219BAC 4B E1 AE 11 */ bl isEventBit__11dSv_event_cCFUs -/* 80219BB0 2C 03 00 00 */ cmpwi r3, 0 -/* 80219BB4 41 82 00 18 */ beq lbl_80219BCC -/* 80219BB8 7F 83 E3 78 */ mr r3, r28 -/* 80219BBC 38 80 61 40 */ li r4, 0x6140 -/* 80219BC0 4B E1 AD FD */ bl isEventBit__11dSv_event_cCFUs -/* 80219BC4 2C 03 00 00 */ cmpwi r3, 0 -/* 80219BC8 41 82 00 0C */ beq lbl_80219BD4 -lbl_80219BCC: -/* 80219BCC C3 A2 AE 80 */ lfs f29, lit_4182(r2) -/* 80219BD0 48 00 00 E8 */ b lbl_80219CB8 -lbl_80219BD4: -/* 80219BD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80219BD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80219BDC 88 03 5E B5 */ lbz r0, 0x5eb5(r3) -/* 80219BE0 28 00 00 00 */ cmplwi r0, 0 -/* 80219BE4 41 82 00 0C */ beq lbl_80219BF0 -/* 80219BE8 C3 A2 AE 80 */ lfs f29, lit_4182(r2) -/* 80219BEC 48 00 00 CC */ b lbl_80219CB8 -lbl_80219BF0: -/* 80219BF0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80219BF4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80219BF8 A0 03 00 AE */ lhz r0, 0xae(r3) -/* 80219BFC 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 -/* 80219C00 40 82 00 34 */ bne lbl_80219C34 -/* 80219C04 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219C08 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219C0C 88 03 04 2A */ lbz r0, 0x42a(r3) -/* 80219C10 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 80219C14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80219C18 3C 00 43 30 */ lis r0, 0x4330 -/* 80219C1C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80219C20 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80219C24 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80219C28 C0 02 AE CC */ lfs f0, lit_8207(r2) -/* 80219C2C EF A1 00 24 */ fdivs f29, f1, f0 -/* 80219C30 48 00 00 88 */ b lbl_80219CB8 -lbl_80219C34: -/* 80219C34 88 1D 07 64 */ lbz r0, 0x764(r29) -/* 80219C38 28 00 00 07 */ cmplwi r0, 7 -/* 80219C3C 40 82 00 7C */ bne lbl_80219CB8 -/* 80219C40 57 C0 00 43 */ rlwinm. r0, r30, 0, 1, 1 -/* 80219C44 40 82 00 74 */ bne lbl_80219CB8 -/* 80219C48 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80219C4C FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 80219C50 40 81 00 68 */ ble lbl_80219CB8 -/* 80219C54 C0 1D 07 38 */ lfs f0, 0x738(r29) -/* 80219C58 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80219C5C 40 82 00 0C */ bne lbl_80219C68 -/* 80219C60 C0 02 AE 98 */ lfs f0, lit_4923(r2) -/* 80219C64 D0 1D 07 38 */ stfs f0, 0x738(r29) -lbl_80219C68: -/* 80219C68 C0 22 AE 98 */ lfs f1, lit_4923(r2) -/* 80219C6C C0 1D 07 38 */ lfs f0, 0x738(r29) -/* 80219C70 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80219C74 40 82 00 3C */ bne lbl_80219CB0 -/* 80219C78 38 00 00 77 */ li r0, 0x77 -/* 80219C7C 90 01 00 08 */ stw r0, 8(r1) -/* 80219C80 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80219C84 38 81 00 08 */ addi r4, r1, 8 -/* 80219C88 38 A0 00 00 */ li r5, 0 -/* 80219C8C 38 C0 00 00 */ li r6, 0 -/* 80219C90 38 E0 00 00 */ li r7, 0 -/* 80219C94 C0 22 AE 84 */ lfs f1, lit_4183(r2) -/* 80219C98 FC 40 08 90 */ fmr f2, f1 -/* 80219C9C C0 62 AE B0 */ lfs f3, lit_5786(r2) -/* 80219CA0 FC 80 18 90 */ fmr f4, f3 -/* 80219CA4 39 00 00 00 */ li r8, 0 -/* 80219CA8 48 09 1C DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80219CAC 48 00 4D 25 */ bl dMeter2Info_set2DVibration__Fv -lbl_80219CB0: -/* 80219CB0 D3 BD 07 20 */ stfs f29, 0x720(r29) -/* 80219CB4 3B E0 00 00 */ li r31, 0 -lbl_80219CB8: -/* 80219CB8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80219CBC 41 82 00 58 */ beq lbl_80219D14 -/* 80219CC0 C0 22 AE 80 */ lfs f1, lit_4182(r2) -/* 80219CC4 C0 1D 07 38 */ lfs f0, 0x738(r29) -/* 80219CC8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80219CCC 41 82 00 08 */ beq lbl_80219CD4 -/* 80219CD0 D0 3D 07 38 */ stfs f1, 0x738(r29) -lbl_80219CD4: -/* 80219CD4 C0 1D 07 20 */ lfs f0, 0x720(r29) -/* 80219CD8 FC 00 E8 00 */ fcmpu cr0, f0, f29 -/* 80219CDC 41 82 00 38 */ beq lbl_80219D14 -/* 80219CE0 38 7D 07 20 */ addi r3, r29, 0x720 -/* 80219CE4 FC 20 E8 90 */ fmr f1, f29 -/* 80219CE8 C0 42 AE D0 */ lfs f2, lit_8359(r2) -/* 80219CEC C0 62 AE 94 */ lfs f3, lit_4922(r2) -/* 80219CF0 48 05 5D 4D */ bl cLib_addCalc2__FPffff -/* 80219CF4 C0 1D 07 20 */ lfs f0, 0x720(r29) -/* 80219CF8 EC 00 E8 28 */ fsubs f0, f0, f29 -/* 80219CFC FC 00 02 10 */ fabs f0, f0 -/* 80219D00 FC 20 00 18 */ frsp f1, f0 -/* 80219D04 C0 02 AE D4 */ lfs f0, lit_8360(r2) -/* 80219D08 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80219D0C 40 80 00 08 */ bge lbl_80219D14 -/* 80219D10 D3 BD 07 20 */ stfs f29, 0x720(r29) -lbl_80219D14: -/* 80219D14 80 7D 03 08 */ lwz r3, 0x308(r29) -/* 80219D18 C0 22 AE CC */ lfs f1, lit_8207(r2) -/* 80219D1C C0 1D 07 20 */ lfs f0, 0x720(r29) -/* 80219D20 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80219D24 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80219D28 EC 1E 00 32 */ fmuls f0, f30, f0 -/* 80219D2C FC 00 00 1E */ fctiwz f0, f0 -/* 80219D30 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80219D34 80 81 00 14 */ lwz r4, 0x14(r1) -/* 80219D38 81 83 00 00 */ lwz r12, 0(r3) -/* 80219D3C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80219D40 7D 89 03 A6 */ mtctr r12 -/* 80219D44 4E 80 04 21 */ bctrl -/* 80219D48 48 00 00 0C */ b lbl_80219D54 -lbl_80219D4C: -/* 80219D4C C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 80219D50 D0 1D 07 20 */ stfs f0, 0x720(r29) -lbl_80219D54: -/* 80219D54 80 7D 03 14 */ lwz r3, 0x314(r29) -/* 80219D58 88 03 00 18 */ lbz r0, 0x18(r3) -/* 80219D5C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219D60 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219D64 C0 43 01 78 */ lfs f2, 0x178(r3) -/* 80219D68 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80219D6C C0 03 00 84 */ lfs f0, 0x84(r3) -/* 80219D70 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80219D74 EC 42 00 32 */ fmuls f2, f2, f0 -/* 80219D78 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 80219D7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80219D80 3C 00 43 30 */ lis r0, 0x4330 -/* 80219D84 90 01 00 10 */ stw r0, 0x10(r1) -/* 80219D88 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80219D8C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80219D90 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80219D94 C0 02 AE CC */ lfs f0, lit_8207(r2) -/* 80219D98 EF A1 00 24 */ fdivs f29, f1, f0 -/* 80219D9C 80 7D 02 F8 */ lwz r3, 0x2f8(r29) -/* 80219DA0 48 03 BA 89 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80219DA4 FF C0 08 90 */ fmr f30, f1 -/* 80219DA8 57 C0 01 CF */ rlwinm. r0, r30, 0, 7, 7 -/* 80219DAC 41 82 00 0C */ beq lbl_80219DB8 -/* 80219DB0 C3 A2 AE 80 */ lfs f29, lit_4182(r2) -/* 80219DB4 48 00 00 44 */ b lbl_80219DF8 -lbl_80219DB8: -/* 80219DB8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80219DBC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80219DC0 A0 03 00 AE */ lhz r0, 0xae(r3) -/* 80219DC4 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 -/* 80219DC8 40 82 00 30 */ bne lbl_80219DF8 -/* 80219DCC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 80219DD0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 80219DD4 88 03 04 2B */ lbz r0, 0x42b(r3) -/* 80219DD8 C8 22 AE C0 */ lfd f1, lit_6293(r2) -/* 80219DDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80219DE0 3C 00 43 30 */ lis r0, 0x4330 -/* 80219DE4 90 01 00 10 */ stw r0, 0x10(r1) -/* 80219DE8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80219DEC EC 20 08 28 */ fsubs f1, f0, f1 -/* 80219DF0 C0 02 AE CC */ lfs f0, lit_8207(r2) -/* 80219DF4 EF A1 00 24 */ fdivs f29, f1, f0 -lbl_80219DF8: -/* 80219DF8 C0 1D 07 24 */ lfs f0, 0x724(r29) -/* 80219DFC FC 00 E8 00 */ fcmpu cr0, f0, f29 -/* 80219E00 41 82 00 38 */ beq lbl_80219E38 -/* 80219E04 38 7D 07 24 */ addi r3, r29, 0x724 -/* 80219E08 FC 20 E8 90 */ fmr f1, f29 -/* 80219E0C C0 42 AE D0 */ lfs f2, lit_8359(r2) -/* 80219E10 C0 62 AE 94 */ lfs f3, lit_4922(r2) -/* 80219E14 48 05 5C 29 */ bl cLib_addCalc2__FPffff -/* 80219E18 C0 1D 07 24 */ lfs f0, 0x724(r29) -/* 80219E1C EC 00 E8 28 */ fsubs f0, f0, f29 -/* 80219E20 FC 00 02 10 */ fabs f0, f0 -/* 80219E24 FC 20 00 18 */ frsp f1, f0 -/* 80219E28 C0 02 AE D4 */ lfs f0, lit_8360(r2) -/* 80219E2C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80219E30 40 80 00 08 */ bge lbl_80219E38 -/* 80219E34 D3 BD 07 24 */ stfs f29, 0x724(r29) -lbl_80219E38: -/* 80219E38 80 7D 03 14 */ lwz r3, 0x314(r29) -/* 80219E3C C0 22 AE CC */ lfs f1, lit_8207(r2) -/* 80219E40 C0 1D 07 24 */ lfs f0, 0x724(r29) -/* 80219E44 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80219E48 EC 00 07 B2 */ fmuls f0, f0, f30 -/* 80219E4C FC 00 00 1E */ fctiwz f0, f0 -/* 80219E50 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80219E54 80 81 00 14 */ lwz r4, 0x14(r1) -/* 80219E58 81 83 00 00 */ lwz r12, 0(r3) -/* 80219E5C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80219E60 7D 89 03 A6 */ mtctr r12 -/* 80219E64 4E 80 04 21 */ bctrl -/* 80219E68 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 80219E6C CB E1 00 50 */ lfd f31, 0x50(r1) -/* 80219E70 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 80219E74 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 80219E78 E3 A1 00 38 */ psq_l f29, 56(r1), 0, 0 /* qr0 */ -/* 80219E7C CB A1 00 30 */ lfd f29, 0x30(r1) -/* 80219E80 39 61 00 30 */ addi r11, r1, 0x30 -/* 80219E84 48 14 83 A1 */ bl _restgpr_28 -/* 80219E88 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80219E8C 7C 08 03 A6 */ mtlr r0 -/* 80219E90 38 21 00 60 */ addi r1, r1, 0x60 -/* 80219E94 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setItemNum__13dMeter2Draw_cFUcUcUc.s b/asm/d/meter/d_meter2_draw/setItemNum__13dMeter2Draw_cFUcUcUc.s deleted file mode 100644 index a305546ba0..0000000000 --- a/asm/d/meter/d_meter2_draw/setItemNum__13dMeter2Draw_cFUcUcUc.s +++ /dev/null @@ -1,217 +0,0 @@ -lbl_8021AB84: -/* 8021AB84 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8021AB88 7C 08 02 A6 */ mflr r0 -/* 8021AB8C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8021AB90 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021AB94 48 14 76 35 */ bl _savegpr_24 -/* 8021AB98 7C 7F 1B 78 */ mr r31, r3 -/* 8021AB9C 7C BC 2B 78 */ mr r28, r5 -/* 8021ABA0 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 8021ABA4 54 C0 06 3E */ clrlwi r0, r6, 0x18 -/* 8021ABA8 7C 03 00 40 */ cmplw r3, r0 -/* 8021ABAC 40 81 00 08 */ ble lbl_8021ABB4 -/* 8021ABB0 7C DC 33 78 */ mr r28, r6 -lbl_8021ABB4: -/* 8021ABB4 38 00 FF FF */ li r0, -1 -/* 8021ABB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021ABBC 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021ABC0 57 83 06 3E */ clrlwi r3, r28, 0x18 -/* 8021ABC4 54 C0 06 3E */ clrlwi r0, r6, 0x18 -/* 8021ABC8 7C 03 00 40 */ cmplw r3, r0 -/* 8021ABCC 40 82 00 3C */ bne lbl_8021AC08 -/* 8021ABD0 38 00 00 1E */ li r0, 0x1e -/* 8021ABD4 98 01 00 14 */ stb r0, 0x14(r1) -/* 8021ABD8 98 01 00 15 */ stb r0, 0x15(r1) -/* 8021ABDC 98 01 00 16 */ stb r0, 0x16(r1) -/* 8021ABE0 38 00 00 00 */ li r0, 0 -/* 8021ABE4 98 01 00 17 */ stb r0, 0x17(r1) -/* 8021ABE8 38 60 00 FF */ li r3, 0xff -/* 8021ABEC 98 61 00 10 */ stb r3, 0x10(r1) -/* 8021ABF0 38 00 00 C8 */ li r0, 0xc8 -/* 8021ABF4 98 01 00 11 */ stb r0, 0x11(r1) -/* 8021ABF8 38 00 00 32 */ li r0, 0x32 -/* 8021ABFC 98 01 00 12 */ stb r0, 0x12(r1) -/* 8021AC00 98 61 00 13 */ stb r3, 0x13(r1) -/* 8021AC04 48 00 00 68 */ b lbl_8021AC6C -lbl_8021AC08: -/* 8021AC08 28 03 00 00 */ cmplwi r3, 0 -/* 8021AC0C 40 82 00 38 */ bne lbl_8021AC44 -/* 8021AC10 38 00 00 1E */ li r0, 0x1e -/* 8021AC14 98 01 00 14 */ stb r0, 0x14(r1) -/* 8021AC18 98 01 00 15 */ stb r0, 0x15(r1) -/* 8021AC1C 98 01 00 16 */ stb r0, 0x16(r1) -/* 8021AC20 38 00 00 00 */ li r0, 0 -/* 8021AC24 98 01 00 17 */ stb r0, 0x17(r1) -/* 8021AC28 38 00 00 B4 */ li r0, 0xb4 -/* 8021AC2C 98 01 00 10 */ stb r0, 0x10(r1) -/* 8021AC30 98 01 00 11 */ stb r0, 0x11(r1) -/* 8021AC34 98 01 00 12 */ stb r0, 0x12(r1) -/* 8021AC38 38 00 00 FF */ li r0, 0xff -/* 8021AC3C 98 01 00 13 */ stb r0, 0x13(r1) -/* 8021AC40 48 00 00 2C */ b lbl_8021AC6C -lbl_8021AC44: -/* 8021AC44 38 00 00 00 */ li r0, 0 -/* 8021AC48 98 01 00 14 */ stb r0, 0x14(r1) -/* 8021AC4C 98 01 00 15 */ stb r0, 0x15(r1) -/* 8021AC50 98 01 00 16 */ stb r0, 0x16(r1) -/* 8021AC54 98 01 00 17 */ stb r0, 0x17(r1) -/* 8021AC58 38 00 00 FF */ li r0, 0xff -/* 8021AC5C 98 01 00 10 */ stb r0, 0x10(r1) -/* 8021AC60 98 01 00 11 */ stb r0, 0x11(r1) -/* 8021AC64 98 01 00 12 */ stb r0, 0x12(r1) -/* 8021AC68 98 01 00 13 */ stb r0, 0x13(r1) -lbl_8021AC6C: -/* 8021AC6C 3B 00 00 00 */ li r24, 0 -/* 8021AC70 3B A0 00 00 */ li r29, 0 -/* 8021AC74 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8021AC78 1F C0 00 0C */ mulli r30, r0, 0xc -/* 8021AC7C 7F 3F F2 14 */ add r25, r31, r30 -/* 8021AC80 83 41 00 10 */ lwz r26, 0x10(r1) -/* 8021AC84 83 61 00 14 */ lwz r27, 0x14(r1) -lbl_8021AC88: -/* 8021AC88 93 41 00 08 */ stw r26, 8(r1) -/* 8021AC8C 93 61 00 0C */ stw r27, 0xc(r1) -/* 8021AC90 38 1D 00 84 */ addi r0, r29, 0x84 -/* 8021AC94 7C 79 00 2E */ lwzx r3, r25, r0 -/* 8021AC98 38 81 00 0C */ addi r4, r1, 0xc -/* 8021AC9C 38 A1 00 08 */ addi r5, r1, 8 -/* 8021ACA0 81 83 00 00 */ lwz r12, 0(r3) -/* 8021ACA4 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 8021ACA8 7D 89 03 A6 */ mtctr r12 -/* 8021ACAC 4E 80 04 21 */ bctrl -/* 8021ACB0 3B 18 00 01 */ addi r24, r24, 1 -/* 8021ACB4 2C 18 00 03 */ cmpwi r24, 3 -/* 8021ACB8 3B BD 00 04 */ addi r29, r29, 4 -/* 8021ACBC 41 80 FF CC */ blt lbl_8021AC88 -/* 8021ACC0 57 9C 06 3E */ clrlwi r28, r28, 0x18 -/* 8021ACC4 28 1C 00 64 */ cmplwi r28, 0x64 -/* 8021ACC8 40 80 00 C8 */ bge lbl_8021AD90 -/* 8021ACCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021ACD0 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021ACD4 83 5D 5D 30 */ lwz r26, 0x5d30(r29) -/* 8021ACD8 38 00 00 0A */ li r0, 0xa -/* 8021ACDC 7C 7C 03 D6 */ divw r3, r28, r0 -/* 8021ACE0 48 00 35 E9 */ bl dMeter2Info_getNumberTextureName__Fi -/* 8021ACE4 7C 65 1B 78 */ mr r5, r3 -/* 8021ACE8 7F 43 D3 78 */ mr r3, r26 -/* 8021ACEC 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 8021ACF0 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 8021ACF4 81 9A 00 00 */ lwz r12, 0(r26) -/* 8021ACF8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021ACFC 7D 89 03 A6 */ mtctr r12 -/* 8021AD00 4E 80 04 21 */ bctrl -/* 8021AD04 7C 64 1B 78 */ mr r4, r3 -/* 8021AD08 7C 7F F2 14 */ add r3, r31, r30 -/* 8021AD0C 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8021AD10 38 A0 00 00 */ li r5, 0 -/* 8021AD14 81 83 00 00 */ lwz r12, 0(r3) -/* 8021AD18 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 8021AD1C 7D 89 03 A6 */ mtctr r12 -/* 8021AD20 4E 80 04 21 */ bctrl -/* 8021AD24 83 5D 5D 30 */ lwz r26, 0x5d30(r29) -/* 8021AD28 38 60 00 0A */ li r3, 0xa -/* 8021AD2C 7C 1C 1B D6 */ divw r0, r28, r3 -/* 8021AD30 7C 00 19 D6 */ mullw r0, r0, r3 -/* 8021AD34 7C 60 E0 50 */ subf r3, r0, r28 -/* 8021AD38 48 00 35 91 */ bl dMeter2Info_getNumberTextureName__Fi -/* 8021AD3C 7C 65 1B 78 */ mr r5, r3 -/* 8021AD40 7F 43 D3 78 */ mr r3, r26 -/* 8021AD44 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 8021AD48 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 8021AD4C 81 9A 00 00 */ lwz r12, 0(r26) -/* 8021AD50 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021AD54 7D 89 03 A6 */ mtctr r12 -/* 8021AD58 4E 80 04 21 */ bctrl -/* 8021AD5C 7C 64 1B 78 */ mr r4, r3 -/* 8021AD60 7C 7F F2 14 */ add r3, r31, r30 -/* 8021AD64 80 63 00 88 */ lwz r3, 0x88(r3) -/* 8021AD68 38 A0 00 00 */ li r5, 0 -/* 8021AD6C 81 83 00 00 */ lwz r12, 0(r3) -/* 8021AD70 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 8021AD74 7D 89 03 A6 */ mtctr r12 -/* 8021AD78 4E 80 04 21 */ bctrl -/* 8021AD7C 38 00 00 00 */ li r0, 0 -/* 8021AD80 7C 7F F2 14 */ add r3, r31, r30 -/* 8021AD84 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 8021AD88 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8021AD8C 48 00 01 24 */ b lbl_8021AEB0 -lbl_8021AD90: -/* 8021AD90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021AD94 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021AD98 83 5D 5D 30 */ lwz r26, 0x5d30(r29) -/* 8021AD9C 38 00 00 64 */ li r0, 0x64 -/* 8021ADA0 7C 7C 03 D6 */ divw r3, r28, r0 -/* 8021ADA4 48 00 35 25 */ bl dMeter2Info_getNumberTextureName__Fi -/* 8021ADA8 7C 65 1B 78 */ mr r5, r3 -/* 8021ADAC 7F 43 D3 78 */ mr r3, r26 -/* 8021ADB0 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 8021ADB4 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 8021ADB8 81 9A 00 00 */ lwz r12, 0(r26) -/* 8021ADBC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021ADC0 7D 89 03 A6 */ mtctr r12 -/* 8021ADC4 4E 80 04 21 */ bctrl -/* 8021ADC8 7C 64 1B 78 */ mr r4, r3 -/* 8021ADCC 7C 7F F2 14 */ add r3, r31, r30 -/* 8021ADD0 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8021ADD4 38 A0 00 00 */ li r5, 0 -/* 8021ADD8 81 83 00 00 */ lwz r12, 0(r3) -/* 8021ADDC 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 8021ADE0 7D 89 03 A6 */ mtctr r12 -/* 8021ADE4 4E 80 04 21 */ bctrl -/* 8021ADE8 38 60 00 64 */ li r3, 0x64 -/* 8021ADEC 7C 1C 1B D6 */ divw r0, r28, r3 -/* 8021ADF0 7C 00 19 D6 */ mullw r0, r0, r3 -/* 8021ADF4 7C 00 E0 50 */ subf r0, r0, r28 -/* 8021ADF8 54 1C 06 3E */ clrlwi r28, r0, 0x18 -/* 8021ADFC 83 5D 5D 30 */ lwz r26, 0x5d30(r29) -/* 8021AE00 38 00 00 0A */ li r0, 0xa -/* 8021AE04 7C 7C 03 D6 */ divw r3, r28, r0 -/* 8021AE08 48 00 34 C1 */ bl dMeter2Info_getNumberTextureName__Fi -/* 8021AE0C 7C 65 1B 78 */ mr r5, r3 -/* 8021AE10 7F 43 D3 78 */ mr r3, r26 -/* 8021AE14 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 8021AE18 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 8021AE1C 81 9A 00 00 */ lwz r12, 0(r26) -/* 8021AE20 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021AE24 7D 89 03 A6 */ mtctr r12 -/* 8021AE28 4E 80 04 21 */ bctrl -/* 8021AE2C 7C 64 1B 78 */ mr r4, r3 -/* 8021AE30 7C 7F F2 14 */ add r3, r31, r30 -/* 8021AE34 80 63 00 88 */ lwz r3, 0x88(r3) -/* 8021AE38 38 A0 00 00 */ li r5, 0 -/* 8021AE3C 81 83 00 00 */ lwz r12, 0(r3) -/* 8021AE40 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 8021AE44 7D 89 03 A6 */ mtctr r12 -/* 8021AE48 4E 80 04 21 */ bctrl -/* 8021AE4C 83 5D 5D 30 */ lwz r26, 0x5d30(r29) -/* 8021AE50 38 60 00 0A */ li r3, 0xa -/* 8021AE54 7C 1C 1B D6 */ divw r0, r28, r3 -/* 8021AE58 7C 00 19 D6 */ mullw r0, r0, r3 -/* 8021AE5C 7C 60 E0 50 */ subf r3, r0, r28 -/* 8021AE60 48 00 34 69 */ bl dMeter2Info_getNumberTextureName__Fi -/* 8021AE64 7C 65 1B 78 */ mr r5, r3 -/* 8021AE68 7F 43 D3 78 */ mr r3, r26 -/* 8021AE6C 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 8021AE70 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 8021AE74 81 9A 00 00 */ lwz r12, 0(r26) -/* 8021AE78 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8021AE7C 7D 89 03 A6 */ mtctr r12 -/* 8021AE80 4E 80 04 21 */ bctrl -/* 8021AE84 7C 64 1B 78 */ mr r4, r3 -/* 8021AE88 7F 3F F2 14 */ add r25, r31, r30 -/* 8021AE8C 80 79 00 8C */ lwz r3, 0x8c(r25) -/* 8021AE90 38 A0 00 00 */ li r5, 0 -/* 8021AE94 81 83 00 00 */ lwz r12, 0(r3) -/* 8021AE98 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 8021AE9C 7D 89 03 A6 */ mtctr r12 -/* 8021AEA0 4E 80 04 21 */ bctrl -/* 8021AEA4 38 00 00 01 */ li r0, 1 -/* 8021AEA8 80 79 00 8C */ lwz r3, 0x8c(r25) -/* 8021AEAC 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_8021AEB0: -/* 8021AEB0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021AEB4 48 14 73 61 */ bl _restgpr_24 -/* 8021AEB8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8021AEBC 7C 08 03 A6 */ mtlr r0 -/* 8021AEC0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8021AEC4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setItemParamB__13dMeter2Draw_cFUc.s b/asm/d/meter/d_meter2_draw/setItemParamB__13dMeter2Draw_cFUc.s deleted file mode 100644 index 26693c8337..0000000000 --- a/asm/d/meter/d_meter2_draw/setItemParamB__13dMeter2Draw_cFUc.s +++ /dev/null @@ -1,220 +0,0 @@ -lbl_8021B810: -/* 8021B810 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021B814 7C 08 02 A6 */ mflr r0 -/* 8021B818 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021B81C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021B820 93 C1 00 08 */ stw r30, 8(r1) -/* 8021B824 7C 7E 1B 78 */ mr r30, r3 -/* 8021B828 7C 9F 23 78 */ mr r31, r4 -/* 8021B82C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021B830 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021B834 88 03 04 29 */ lbz r0, 0x429(r3) -/* 8021B838 28 00 00 00 */ cmplwi r0, 0 -/* 8021B83C 41 82 00 40 */ beq lbl_8021B87C -/* 8021B840 C0 03 01 84 */ lfs f0, 0x184(r3) -/* 8021B844 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021B848 C0 03 01 90 */ lfs f0, 0x190(r3) -/* 8021B84C D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021B850 C0 03 01 A8 */ lfs f0, 0x1a8(r3) -/* 8021B854 D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021B858 C0 03 01 9C */ lfs f0, 0x19c(r3) -/* 8021B85C D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021B860 C0 03 01 FC */ lfs f0, 0x1fc(r3) -/* 8021B864 D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021B868 C0 03 02 0C */ lfs f0, 0x20c(r3) -/* 8021B86C D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021B870 C0 03 02 1C */ lfs f0, 0x21c(r3) -/* 8021B874 D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021B878 48 00 02 DC */ b lbl_8021BB54 -lbl_8021B87C: -/* 8021B87C 7F E3 FB 78 */ mr r3, r31 -/* 8021B880 4B E7 FE 89 */ bl isBottleItem__FUc -/* 8021B884 2C 03 00 00 */ cmpwi r3, 0 -/* 8021B888 41 82 00 40 */ beq lbl_8021B8C8 -/* 8021B88C C0 02 AF 54 */ lfs f0, lit_9089(r2) -/* 8021B890 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021B894 C0 02 AF 58 */ lfs f0, lit_9090(r2) -/* 8021B898 D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021B89C C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021B8A0 D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021B8A4 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B8A8 D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021B8AC C0 02 AF 28 */ lfs f0, lit_9025(r2) -/* 8021B8B0 D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021B8B4 C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021B8B8 D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021B8BC C0 02 AF 44 */ lfs f0, lit_9049(r2) -/* 8021B8C0 D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021B8C4 48 00 02 90 */ b lbl_8021BB54 -lbl_8021B8C8: -/* 8021B8C8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8021B8CC 38 03 FF D3 */ addi r0, r3, -45 -/* 8021B8D0 28 00 00 63 */ cmplwi r0, 0x63 -/* 8021B8D4 41 81 02 40 */ bgt lbl_8021BB14 -/* 8021B8D8 3C 60 80 3C */ lis r3, lit_9106@ha /* 0x803BF5C0@ha */ -/* 8021B8DC 38 63 F5 C0 */ addi r3, r3, lit_9106@l /* 0x803BF5C0@l */ -/* 8021B8E0 54 00 10 3A */ slwi r0, r0, 2 -/* 8021B8E4 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8021B8E8 7C 09 03 A6 */ mtctr r0 -/* 8021B8EC 4E 80 04 20 */ bctr -/* 8021B8F0 C0 02 AF 54 */ lfs f0, lit_9089(r2) -/* 8021B8F4 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021B8F8 C0 02 AF 58 */ lfs f0, lit_9090(r2) -/* 8021B8FC D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021B900 C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021B904 D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021B908 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B90C D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021B910 C0 02 AF 28 */ lfs f0, lit_9025(r2) -/* 8021B914 D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021B918 C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021B91C D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021B920 C0 02 AF 44 */ lfs f0, lit_9049(r2) -/* 8021B924 D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021B928 48 00 02 2C */ b lbl_8021BB54 -/* 8021B92C C0 02 AF 5C */ lfs f0, lit_9091(r2) -/* 8021B930 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021B934 C0 02 AF 60 */ lfs f0, lit_9092(r2) -/* 8021B938 D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021B93C C0 02 AF 3C */ lfs f0, lit_9047(r2) -/* 8021B940 D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021B944 C0 02 AE 88 */ lfs f0, lit_4184(r2) -/* 8021B948 D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021B94C C0 02 AF 28 */ lfs f0, lit_9025(r2) -/* 8021B950 D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021B954 C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021B958 D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021B95C C0 02 AF 44 */ lfs f0, lit_9049(r2) -/* 8021B960 D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021B964 48 00 01 F0 */ b lbl_8021BB54 -/* 8021B968 C0 02 AF 64 */ lfs f0, lit_9093(r2) -/* 8021B96C D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021B970 C0 02 AF 68 */ lfs f0, lit_9094(r2) -/* 8021B974 D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021B978 C0 02 AF 3C */ lfs f0, lit_9047(r2) -/* 8021B97C D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021B980 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B984 D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021B988 C0 02 AF 28 */ lfs f0, lit_9025(r2) -/* 8021B98C D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021B990 C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021B994 D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021B998 C0 02 AF 44 */ lfs f0, lit_9049(r2) -/* 8021B99C D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021B9A0 48 00 01 B4 */ b lbl_8021BB54 -/* 8021B9A4 C0 02 AF 6C */ lfs f0, lit_9095(r2) -/* 8021B9A8 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021B9AC C0 02 AF 70 */ lfs f0, lit_9096(r2) -/* 8021B9B0 D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021B9B4 C0 02 AF 3C */ lfs f0, lit_9047(r2) -/* 8021B9B8 D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021B9BC C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B9C0 D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021B9C4 C0 02 AF 28 */ lfs f0, lit_9025(r2) -/* 8021B9C8 D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021B9CC C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021B9D0 D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021B9D4 C0 02 AF 48 */ lfs f0, lit_9050(r2) -/* 8021B9D8 D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021B9DC 48 00 01 78 */ b lbl_8021BB54 -/* 8021B9E0 C0 02 AF 74 */ lfs f0, lit_9097(r2) -/* 8021B9E4 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021B9E8 C0 02 AF 70 */ lfs f0, lit_9096(r2) -/* 8021B9EC D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021B9F0 C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021B9F4 D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021B9F8 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B9FC D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021BA00 C0 02 AF 4C */ lfs f0, lit_9051(r2) -/* 8021BA04 D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021BA08 C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021BA0C D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021BA10 C0 02 AF 48 */ lfs f0, lit_9050(r2) -/* 8021BA14 D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021BA18 48 00 01 3C */ b lbl_8021BB54 -/* 8021BA1C C0 02 AF 78 */ lfs f0, lit_9098(r2) -/* 8021BA20 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021BA24 C0 02 AF 70 */ lfs f0, lit_9096(r2) -/* 8021BA28 D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021BA2C C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021BA30 D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021BA34 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021BA38 D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021BA3C C0 02 AF 4C */ lfs f0, lit_9051(r2) -/* 8021BA40 D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021BA44 C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021BA48 D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021BA4C C0 02 AF 48 */ lfs f0, lit_9050(r2) -/* 8021BA50 D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021BA54 48 00 01 00 */ b lbl_8021BB54 -/* 8021BA58 C0 02 AF 7C */ lfs f0, lit_9099(r2) -/* 8021BA5C D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021BA60 C0 02 AF 70 */ lfs f0, lit_9096(r2) -/* 8021BA64 D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021BA68 C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021BA6C D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021BA70 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021BA74 D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021BA78 C0 02 AF 80 */ lfs f0, lit_9100(r2) -/* 8021BA7C D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021BA80 C0 02 AF 84 */ lfs f0, lit_9101(r2) -/* 8021BA84 D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021BA88 C0 02 AF 48 */ lfs f0, lit_9050(r2) -/* 8021BA8C D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021BA90 48 00 00 C4 */ b lbl_8021BB54 -/* 8021BA94 C0 02 AF 88 */ lfs f0, lit_9102(r2) -/* 8021BA98 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021BA9C C0 02 AF 8C */ lfs f0, lit_9103(r2) -/* 8021BAA0 D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021BAA4 C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021BAA8 D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021BAAC C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021BAB0 D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021BAB4 C0 02 AF 4C */ lfs f0, lit_9051(r2) -/* 8021BAB8 D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021BABC C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021BAC0 D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021BAC4 C0 02 AF 48 */ lfs f0, lit_9050(r2) -/* 8021BAC8 D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021BACC 48 00 00 88 */ b lbl_8021BB54 -/* 8021BAD0 C0 02 AF 90 */ lfs f0, lit_9104(r2) -/* 8021BAD4 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021BAD8 C0 02 AF 94 */ lfs f0, lit_9105(r2) -/* 8021BADC D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021BAE0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021BAE4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021BAE8 C0 03 01 A8 */ lfs f0, 0x1a8(r3) -/* 8021BAEC D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021BAF0 C0 03 01 9C */ lfs f0, 0x19c(r3) -/* 8021BAF4 D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021BAF8 C0 03 01 FC */ lfs f0, 0x1fc(r3) -/* 8021BAFC D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021BB00 C0 03 02 0C */ lfs f0, 0x20c(r3) -/* 8021BB04 D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021BB08 C0 03 02 1C */ lfs f0, 0x21c(r3) -/* 8021BB0C D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8021BB10 48 00 00 44 */ b lbl_8021BB54 -lbl_8021BB14: -/* 8021BB14 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021BB18 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021BB1C C0 03 01 84 */ lfs f0, 0x184(r3) -/* 8021BB20 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8021BB24 C0 03 01 90 */ lfs f0, 0x190(r3) -/* 8021BB28 D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 8021BB2C C0 03 01 A8 */ lfs f0, 0x1a8(r3) -/* 8021BB30 D0 1E 00 60 */ stfs f0, 0x60(r30) -/* 8021BB34 C0 03 01 9C */ lfs f0, 0x19c(r3) -/* 8021BB38 D0 1E 00 64 */ stfs f0, 0x64(r30) -/* 8021BB3C C0 03 01 FC */ lfs f0, 0x1fc(r3) -/* 8021BB40 D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8021BB44 C0 03 02 0C */ lfs f0, 0x20c(r3) -/* 8021BB48 D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8021BB4C C0 03 02 1C */ lfs f0, 0x21c(r3) -/* 8021BB50 D0 1E 00 70 */ stfs f0, 0x70(r30) -lbl_8021BB54: -/* 8021BB54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021BB58 83 C1 00 08 */ lwz r30, 8(r1) -/* 8021BB5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021BB60 7C 08 03 A6 */ mtlr r0 -/* 8021BB64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021BB68 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setItemParamX__13dMeter2Draw_cFUc.s b/asm/d/meter/d_meter2_draw/setItemParamX__13dMeter2Draw_cFUc.s deleted file mode 100644 index e00cf5ca1d..0000000000 --- a/asm/d/meter/d_meter2_draw/setItemParamX__13dMeter2Draw_cFUc.s +++ /dev/null @@ -1,157 +0,0 @@ -lbl_8021B104: -/* 8021B104 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021B108 7C 08 02 A6 */ mflr r0 -/* 8021B10C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021B110 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021B114 7C 7F 1B 78 */ mr r31, r3 -/* 8021B118 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021B11C 38 A3 EB C8 */ addi r5, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021B120 88 05 04 26 */ lbz r0, 0x426(r5) -/* 8021B124 28 00 00 00 */ cmplwi r0, 0 -/* 8021B128 41 82 00 40 */ beq lbl_8021B168 -/* 8021B12C C0 05 01 B4 */ lfs f0, 0x1b4(r5) -/* 8021B130 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8021B134 C0 05 01 B8 */ lfs f0, 0x1b8(r5) -/* 8021B138 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8021B13C C0 05 01 BC */ lfs f0, 0x1bc(r5) -/* 8021B140 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 8021B144 C0 05 01 E4 */ lfs f0, 0x1e4(r5) -/* 8021B148 D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 8021B14C C0 05 01 F0 */ lfs f0, 0x1f0(r5) -/* 8021B150 D0 1F 00 14 */ stfs f0, 0x14(r31) -/* 8021B154 C0 05 02 00 */ lfs f0, 0x200(r5) -/* 8021B158 D0 1F 00 18 */ stfs f0, 0x18(r31) -/* 8021B15C C0 05 02 10 */ lfs f0, 0x210(r5) -/* 8021B160 D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 8021B164 48 00 01 EC */ b lbl_8021B350 -lbl_8021B168: -/* 8021B168 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8021B16C 38 03 FF C0 */ addi r0, r3, -64 -/* 8021B170 28 00 00 08 */ cmplwi r0, 8 -/* 8021B174 41 81 01 48 */ bgt lbl_8021B2BC -/* 8021B178 3C 60 80 3C */ lis r3, lit_9008@ha /* 0x803BF554@ha */ -/* 8021B17C 38 63 F5 54 */ addi r3, r3, lit_9008@l /* 0x803BF554@l */ -/* 8021B180 54 00 10 3A */ slwi r0, r0, 2 -/* 8021B184 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8021B188 7C 09 03 A6 */ mtctr r0 -/* 8021B18C 4E 80 04 20 */ bctr -/* 8021B190 C0 02 AE E8 */ lfs f0, lit_8992(r2) -/* 8021B194 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8021B198 C0 02 AE EC */ lfs f0, lit_8993(r2) -/* 8021B19C D0 1F 00 08 */ stfs f0, 8(r31) -/* 8021B1A0 C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021B1A4 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 8021B1A8 C0 02 AE 88 */ lfs f0, lit_4184(r2) -/* 8021B1AC D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 8021B1B0 C0 02 AE F4 */ lfs f0, lit_8995(r2) -/* 8021B1B4 D0 1F 00 14 */ stfs f0, 0x14(r31) -/* 8021B1B8 C0 02 AE F8 */ lfs f0, lit_8996(r2) -/* 8021B1BC D0 1F 00 18 */ stfs f0, 0x18(r31) -/* 8021B1C0 C0 02 AE FC */ lfs f0, lit_8997(r2) -/* 8021B1C4 D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 8021B1C8 48 00 01 88 */ b lbl_8021B350 -/* 8021B1CC C0 02 AF 00 */ lfs f0, lit_8998(r2) -/* 8021B1D0 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8021B1D4 C0 02 AF 04 */ lfs f0, lit_8999(r2) -/* 8021B1D8 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8021B1DC C0 02 AF 08 */ lfs f0, lit_9000(r2) -/* 8021B1E0 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 8021B1E4 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B1E8 D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 8021B1EC C0 02 AE F4 */ lfs f0, lit_8995(r2) -/* 8021B1F0 D0 1F 00 14 */ stfs f0, 0x14(r31) -/* 8021B1F4 C0 02 AE F8 */ lfs f0, lit_8996(r2) -/* 8021B1F8 D0 1F 00 18 */ stfs f0, 0x18(r31) -/* 8021B1FC C0 02 AE FC */ lfs f0, lit_8997(r2) -/* 8021B200 D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 8021B204 48 00 01 4C */ b lbl_8021B350 -/* 8021B208 C0 02 AE E8 */ lfs f0, lit_8992(r2) -/* 8021B20C D0 1F 00 04 */ stfs f0, 4(r31) -/* 8021B210 C0 02 AF 04 */ lfs f0, lit_8999(r2) -/* 8021B214 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8021B218 C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021B21C D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 8021B220 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B224 D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 8021B228 C0 02 AE F4 */ lfs f0, lit_8995(r2) -/* 8021B22C D0 1F 00 14 */ stfs f0, 0x14(r31) -/* 8021B230 C0 02 AE F8 */ lfs f0, lit_8996(r2) -/* 8021B234 D0 1F 00 18 */ stfs f0, 0x18(r31) -/* 8021B238 C0 02 AE FC */ lfs f0, lit_8997(r2) -/* 8021B23C D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 8021B240 48 00 01 10 */ b lbl_8021B350 -/* 8021B244 C0 02 AE 88 */ lfs f0, lit_4184(r2) -/* 8021B248 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8021B24C C0 02 AF 04 */ lfs f0, lit_8999(r2) -/* 8021B250 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8021B254 C0 02 AF 0C */ lfs f0, lit_9001(r2) -/* 8021B258 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 8021B25C C0 02 AF 10 */ lfs f0, lit_9002(r2) -/* 8021B260 D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 8021B264 C0 02 AE F4 */ lfs f0, lit_8995(r2) -/* 8021B268 D0 1F 00 14 */ stfs f0, 0x14(r31) -/* 8021B26C C0 02 AE F8 */ lfs f0, lit_8996(r2) -/* 8021B270 D0 1F 00 18 */ stfs f0, 0x18(r31) -/* 8021B274 C0 02 AE FC */ lfs f0, lit_8997(r2) -/* 8021B278 D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 8021B27C 48 00 00 D4 */ b lbl_8021B350 -/* 8021B280 C0 02 AF 14 */ lfs f0, lit_9003(r2) -/* 8021B284 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8021B288 C0 02 AF 18 */ lfs f0, lit_9004(r2) -/* 8021B28C D0 1F 00 08 */ stfs f0, 8(r31) -/* 8021B290 C0 05 01 BC */ lfs f0, 0x1bc(r5) -/* 8021B294 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 8021B298 C0 05 01 E4 */ lfs f0, 0x1e4(r5) -/* 8021B29C D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 8021B2A0 C0 05 01 F0 */ lfs f0, 0x1f0(r5) -/* 8021B2A4 D0 1F 00 14 */ stfs f0, 0x14(r31) -/* 8021B2A8 C0 05 02 00 */ lfs f0, 0x200(r5) -/* 8021B2AC D0 1F 00 18 */ stfs f0, 0x18(r31) -/* 8021B2B0 C0 05 02 10 */ lfs f0, 0x210(r5) -/* 8021B2B4 D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 8021B2B8 48 00 00 98 */ b lbl_8021B350 -lbl_8021B2BC: -/* 8021B2BC 7C 83 23 78 */ mr r3, r4 -/* 8021B2C0 4B E8 04 49 */ bl isBottleItem__FUc -/* 8021B2C4 2C 03 00 00 */ cmpwi r3, 0 -/* 8021B2C8 41 82 00 48 */ beq lbl_8021B310 -/* 8021B2CC C0 02 AF 1C */ lfs f0, lit_9005(r2) -/* 8021B2D0 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8021B2D4 C0 02 AF 20 */ lfs f0, lit_9006(r2) -/* 8021B2D8 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8021B2DC C0 02 AF 24 */ lfs f0, lit_9007(r2) -/* 8021B2E0 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 8021B2E4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021B2E8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021B2EC C0 03 01 E4 */ lfs f0, 0x1e4(r3) -/* 8021B2F0 D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 8021B2F4 C0 03 01 F0 */ lfs f0, 0x1f0(r3) -/* 8021B2F8 D0 1F 00 14 */ stfs f0, 0x14(r31) -/* 8021B2FC C0 03 02 00 */ lfs f0, 0x200(r3) -/* 8021B300 D0 1F 00 18 */ stfs f0, 0x18(r31) -/* 8021B304 C0 03 02 10 */ lfs f0, 0x210(r3) -/* 8021B308 D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 8021B30C 48 00 00 44 */ b lbl_8021B350 -lbl_8021B310: -/* 8021B310 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021B314 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021B318 C0 03 01 B4 */ lfs f0, 0x1b4(r3) -/* 8021B31C D0 1F 00 04 */ stfs f0, 4(r31) -/* 8021B320 C0 03 01 B8 */ lfs f0, 0x1b8(r3) -/* 8021B324 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8021B328 C0 03 01 BC */ lfs f0, 0x1bc(r3) -/* 8021B32C D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 8021B330 C0 03 01 E4 */ lfs f0, 0x1e4(r3) -/* 8021B334 D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 8021B338 C0 03 01 F0 */ lfs f0, 0x1f0(r3) -/* 8021B33C D0 1F 00 14 */ stfs f0, 0x14(r31) -/* 8021B340 C0 03 02 00 */ lfs f0, 0x200(r3) -/* 8021B344 D0 1F 00 18 */ stfs f0, 0x18(r31) -/* 8021B348 C0 03 02 10 */ lfs f0, 0x210(r3) -/* 8021B34C D0 1F 00 1C */ stfs f0, 0x1c(r31) -lbl_8021B350: -/* 8021B350 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021B354 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021B358 7C 08 03 A6 */ mtlr r0 -/* 8021B35C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021B360 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setItemParamY__13dMeter2Draw_cFUc.s b/asm/d/meter/d_meter2_draw/setItemParamY__13dMeter2Draw_cFUc.s deleted file mode 100644 index cf6a3a44e2..0000000000 --- a/asm/d/meter/d_meter2_draw/setItemParamY__13dMeter2Draw_cFUc.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_8021B364: -/* 8021B364 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021B368 7C 08 02 A6 */ mflr r0 -/* 8021B36C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021B370 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021B374 7C 7F 1B 78 */ mr r31, r3 -/* 8021B378 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021B37C 38 A3 EB C8 */ addi r5, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021B380 88 05 04 27 */ lbz r0, 0x427(r5) -/* 8021B384 28 00 00 00 */ cmplwi r0, 0 -/* 8021B388 41 82 00 40 */ beq lbl_8021B3C8 -/* 8021B38C C0 05 01 C0 */ lfs f0, 0x1c0(r5) -/* 8021B390 D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8021B394 C0 05 01 C4 */ lfs f0, 0x1c4(r5) -/* 8021B398 D0 1F 00 24 */ stfs f0, 0x24(r31) -/* 8021B39C C0 05 01 C8 */ lfs f0, 0x1c8(r5) -/* 8021B3A0 D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 8021B3A4 C0 05 01 E8 */ lfs f0, 0x1e8(r5) -/* 8021B3A8 D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 8021B3AC C0 05 01 F4 */ lfs f0, 0x1f4(r5) -/* 8021B3B0 D0 1F 00 30 */ stfs f0, 0x30(r31) -/* 8021B3B4 C0 05 02 04 */ lfs f0, 0x204(r5) -/* 8021B3B8 D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 8021B3BC C0 05 02 14 */ lfs f0, 0x214(r5) -/* 8021B3C0 D0 1F 00 38 */ stfs f0, 0x38(r31) -/* 8021B3C4 48 00 01 D8 */ b lbl_8021B59C -lbl_8021B3C8: -/* 8021B3C8 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8021B3CC 38 03 FF C0 */ addi r0, r3, -64 -/* 8021B3D0 28 00 00 08 */ cmplwi r0, 8 -/* 8021B3D4 41 81 01 34 */ bgt lbl_8021B508 -/* 8021B3D8 3C 60 80 3C */ lis r3, lit_9030@ha /* 0x803BF578@ha */ -/* 8021B3DC 38 63 F5 78 */ addi r3, r3, lit_9030@l /* 0x803BF578@l */ -/* 8021B3E0 54 00 10 3A */ slwi r0, r0, 2 -/* 8021B3E4 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8021B3E8 7C 09 03 A6 */ mtctr r0 -/* 8021B3EC 4E 80 04 20 */ bctr -/* 8021B3F0 C0 02 AF 28 */ lfs f0, lit_9025(r2) -/* 8021B3F4 D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8021B3F8 C0 02 AF 2C */ lfs f0, lit_9026(r2) -/* 8021B3FC D0 1F 00 24 */ stfs f0, 0x24(r31) -/* 8021B400 C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021B404 D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 8021B408 C0 02 AE 88 */ lfs f0, lit_4184(r2) -/* 8021B40C D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 8021B410 C0 02 AE F8 */ lfs f0, lit_8996(r2) -/* 8021B414 D0 1F 00 30 */ stfs f0, 0x30(r31) -/* 8021B418 D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 8021B41C C0 02 AE FC */ lfs f0, lit_8997(r2) -/* 8021B420 D0 1F 00 38 */ stfs f0, 0x38(r31) -/* 8021B424 48 00 01 78 */ b lbl_8021B59C -/* 8021B428 C0 02 AF 1C */ lfs f0, lit_9005(r2) -/* 8021B42C D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8021B430 C0 02 AF 30 */ lfs f0, lit_9027(r2) -/* 8021B434 D0 1F 00 24 */ stfs f0, 0x24(r31) -/* 8021B438 C0 02 AF 08 */ lfs f0, lit_9000(r2) -/* 8021B43C D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 8021B440 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B444 D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 8021B448 C0 02 AE F8 */ lfs f0, lit_8996(r2) -/* 8021B44C D0 1F 00 30 */ stfs f0, 0x30(r31) -/* 8021B450 D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 8021B454 C0 02 AE FC */ lfs f0, lit_8997(r2) -/* 8021B458 D0 1F 00 38 */ stfs f0, 0x38(r31) -/* 8021B45C 48 00 01 40 */ b lbl_8021B59C -/* 8021B460 C0 02 AF 2C */ lfs f0, lit_9026(r2) -/* 8021B464 D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8021B468 D0 1F 00 24 */ stfs f0, 0x24(r31) -/* 8021B46C C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021B470 D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 8021B474 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B478 D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 8021B47C C0 02 AE F8 */ lfs f0, lit_8996(r2) -/* 8021B480 D0 1F 00 30 */ stfs f0, 0x30(r31) -/* 8021B484 D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 8021B488 C0 02 AE FC */ lfs f0, lit_8997(r2) -/* 8021B48C D0 1F 00 38 */ stfs f0, 0x38(r31) -/* 8021B490 48 00 01 0C */ b lbl_8021B59C -/* 8021B494 C0 02 AF 34 */ lfs f0, lit_9028(r2) -/* 8021B498 D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8021B49C C0 02 AE F4 */ lfs f0, lit_8995(r2) -/* 8021B4A0 D0 1F 00 24 */ stfs f0, 0x24(r31) -/* 8021B4A4 C0 02 AF 0C */ lfs f0, lit_9001(r2) -/* 8021B4A8 D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 8021B4AC C0 02 AF 10 */ lfs f0, lit_9002(r2) -/* 8021B4B0 D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 8021B4B4 C0 02 AE F8 */ lfs f0, lit_8996(r2) -/* 8021B4B8 D0 1F 00 30 */ stfs f0, 0x30(r31) -/* 8021B4BC D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 8021B4C0 C0 02 AE FC */ lfs f0, lit_8997(r2) -/* 8021B4C4 D0 1F 00 38 */ stfs f0, 0x38(r31) -/* 8021B4C8 48 00 00 D4 */ b lbl_8021B59C -/* 8021B4CC C0 02 AF 38 */ lfs f0, lit_9029(r2) -/* 8021B4D0 D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8021B4D4 C0 05 01 C4 */ lfs f0, 0x1c4(r5) -/* 8021B4D8 D0 1F 00 24 */ stfs f0, 0x24(r31) -/* 8021B4DC C0 05 01 C8 */ lfs f0, 0x1c8(r5) -/* 8021B4E0 D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 8021B4E4 C0 05 01 E8 */ lfs f0, 0x1e8(r5) -/* 8021B4E8 D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 8021B4EC C0 05 01 F4 */ lfs f0, 0x1f4(r5) -/* 8021B4F0 D0 1F 00 30 */ stfs f0, 0x30(r31) -/* 8021B4F4 C0 05 02 04 */ lfs f0, 0x204(r5) -/* 8021B4F8 D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 8021B4FC C0 05 02 14 */ lfs f0, 0x214(r5) -/* 8021B500 D0 1F 00 38 */ stfs f0, 0x38(r31) -/* 8021B504 48 00 00 98 */ b lbl_8021B59C -lbl_8021B508: -/* 8021B508 7C 83 23 78 */ mr r3, r4 -/* 8021B50C 4B E8 01 FD */ bl isBottleItem__FUc -/* 8021B510 2C 03 00 00 */ cmpwi r3, 0 -/* 8021B514 41 82 00 48 */ beq lbl_8021B55C -/* 8021B518 C0 02 AE C8 */ lfs f0, lit_6524(r2) -/* 8021B51C D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8021B520 C0 02 AF 20 */ lfs f0, lit_9006(r2) -/* 8021B524 D0 1F 00 24 */ stfs f0, 0x24(r31) -/* 8021B528 C0 02 AF 24 */ lfs f0, lit_9007(r2) -/* 8021B52C D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 8021B530 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021B534 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021B538 C0 03 01 E8 */ lfs f0, 0x1e8(r3) -/* 8021B53C D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 8021B540 C0 03 01 F4 */ lfs f0, 0x1f4(r3) -/* 8021B544 D0 1F 00 30 */ stfs f0, 0x30(r31) -/* 8021B548 C0 03 02 04 */ lfs f0, 0x204(r3) -/* 8021B54C D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 8021B550 C0 03 02 14 */ lfs f0, 0x214(r3) -/* 8021B554 D0 1F 00 38 */ stfs f0, 0x38(r31) -/* 8021B558 48 00 00 44 */ b lbl_8021B59C -lbl_8021B55C: -/* 8021B55C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021B560 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021B564 C0 03 01 C0 */ lfs f0, 0x1c0(r3) -/* 8021B568 D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8021B56C C0 03 01 C4 */ lfs f0, 0x1c4(r3) -/* 8021B570 D0 1F 00 24 */ stfs f0, 0x24(r31) -/* 8021B574 C0 03 01 C8 */ lfs f0, 0x1c8(r3) -/* 8021B578 D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 8021B57C C0 03 01 E8 */ lfs f0, 0x1e8(r3) -/* 8021B580 D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 8021B584 C0 03 01 F4 */ lfs f0, 0x1f4(r3) -/* 8021B588 D0 1F 00 30 */ stfs f0, 0x30(r31) -/* 8021B58C C0 03 02 04 */ lfs f0, 0x204(r3) -/* 8021B590 D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 8021B594 C0 03 02 14 */ lfs f0, 0x214(r3) -/* 8021B598 D0 1F 00 38 */ stfs f0, 0x38(r31) -lbl_8021B59C: -/* 8021B59C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021B5A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021B5A4 7C 08 03 A6 */ mtlr r0 -/* 8021B5A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021B5AC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_draw/setItemParamZ__13dMeter2Draw_cFUc.s b/asm/d/meter/d_meter2_draw/setItemParamZ__13dMeter2Draw_cFUc.s deleted file mode 100644 index e6f50fa287..0000000000 --- a/asm/d/meter/d_meter2_draw/setItemParamZ__13dMeter2Draw_cFUc.s +++ /dev/null @@ -1,157 +0,0 @@ -lbl_8021B5B0: -/* 8021B5B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021B5B4 7C 08 02 A6 */ mflr r0 -/* 8021B5B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021B5BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021B5C0 7C 7F 1B 78 */ mr r31, r3 -/* 8021B5C4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021B5C8 38 A3 EB C8 */ addi r5, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021B5CC 88 05 04 28 */ lbz r0, 0x428(r5) -/* 8021B5D0 28 00 00 00 */ cmplwi r0, 0 -/* 8021B5D4 41 82 00 40 */ beq lbl_8021B614 -/* 8021B5D8 C0 05 01 CC */ lfs f0, 0x1cc(r5) -/* 8021B5DC D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 8021B5E0 C0 05 01 D0 */ lfs f0, 0x1d0(r5) -/* 8021B5E4 D0 1F 00 40 */ stfs f0, 0x40(r31) -/* 8021B5E8 C0 05 01 D4 */ lfs f0, 0x1d4(r5) -/* 8021B5EC D0 1F 00 44 */ stfs f0, 0x44(r31) -/* 8021B5F0 C0 05 01 EC */ lfs f0, 0x1ec(r5) -/* 8021B5F4 D0 1F 00 48 */ stfs f0, 0x48(r31) -/* 8021B5F8 C0 05 01 F8 */ lfs f0, 0x1f8(r5) -/* 8021B5FC D0 1F 00 4C */ stfs f0, 0x4c(r31) -/* 8021B600 C0 05 02 08 */ lfs f0, 0x208(r5) -/* 8021B604 D0 1F 00 50 */ stfs f0, 0x50(r31) -/* 8021B608 C0 05 02 18 */ lfs f0, 0x218(r5) -/* 8021B60C D0 1F 00 54 */ stfs f0, 0x54(r31) -/* 8021B610 48 00 01 EC */ b lbl_8021B7FC -lbl_8021B614: -/* 8021B614 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8021B618 38 03 FF C0 */ addi r0, r3, -64 -/* 8021B61C 28 00 00 08 */ cmplwi r0, 8 -/* 8021B620 41 81 01 48 */ bgt lbl_8021B768 -/* 8021B624 3C 60 80 3C */ lis r3, lit_9053@ha /* 0x803BF59C@ha */ -/* 8021B628 38 63 F5 9C */ addi r3, r3, lit_9053@l /* 0x803BF59C@l */ -/* 8021B62C 54 00 10 3A */ slwi r0, r0, 2 -/* 8021B630 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8021B634 7C 09 03 A6 */ mtctr r0 -/* 8021B638 4E 80 04 20 */ bctr -/* 8021B63C C0 02 AE E8 */ lfs f0, lit_8992(r2) -/* 8021B640 D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 8021B644 C0 02 AF 2C */ lfs f0, lit_9026(r2) -/* 8021B648 D0 1F 00 40 */ stfs f0, 0x40(r31) -/* 8021B64C C0 02 AF 3C */ lfs f0, lit_9047(r2) -/* 8021B650 D0 1F 00 44 */ stfs f0, 0x44(r31) -/* 8021B654 C0 02 AE 88 */ lfs f0, lit_4184(r2) -/* 8021B658 D0 1F 00 48 */ stfs f0, 0x48(r31) -/* 8021B65C C0 02 AF 28 */ lfs f0, lit_9025(r2) -/* 8021B660 D0 1F 00 4C */ stfs f0, 0x4c(r31) -/* 8021B664 C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021B668 D0 1F 00 50 */ stfs f0, 0x50(r31) -/* 8021B66C C0 02 AF 44 */ lfs f0, lit_9049(r2) -/* 8021B670 D0 1F 00 54 */ stfs f0, 0x54(r31) -/* 8021B674 48 00 01 88 */ b lbl_8021B7FC -/* 8021B678 C0 02 AF 1C */ lfs f0, lit_9005(r2) -/* 8021B67C D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 8021B680 C0 02 AF 2C */ lfs f0, lit_9026(r2) -/* 8021B684 D0 1F 00 40 */ stfs f0, 0x40(r31) -/* 8021B688 C0 02 AF 3C */ lfs f0, lit_9047(r2) -/* 8021B68C D0 1F 00 44 */ stfs f0, 0x44(r31) -/* 8021B690 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B694 D0 1F 00 48 */ stfs f0, 0x48(r31) -/* 8021B698 C0 02 AF 28 */ lfs f0, lit_9025(r2) -/* 8021B69C D0 1F 00 4C */ stfs f0, 0x4c(r31) -/* 8021B6A0 C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021B6A4 D0 1F 00 50 */ stfs f0, 0x50(r31) -/* 8021B6A8 C0 02 AF 44 */ lfs f0, lit_9049(r2) -/* 8021B6AC D0 1F 00 54 */ stfs f0, 0x54(r31) -/* 8021B6B0 48 00 01 4C */ b lbl_8021B7FC -/* 8021B6B4 C0 02 AF 30 */ lfs f0, lit_9027(r2) -/* 8021B6B8 D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 8021B6BC C0 02 AF 00 */ lfs f0, lit_8998(r2) -/* 8021B6C0 D0 1F 00 40 */ stfs f0, 0x40(r31) -/* 8021B6C4 C0 02 AF 3C */ lfs f0, lit_9047(r2) -/* 8021B6C8 D0 1F 00 44 */ stfs f0, 0x44(r31) -/* 8021B6CC C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B6D0 D0 1F 00 48 */ stfs f0, 0x48(r31) -/* 8021B6D4 C0 02 AF 28 */ lfs f0, lit_9025(r2) -/* 8021B6D8 D0 1F 00 4C */ stfs f0, 0x4c(r31) -/* 8021B6DC C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021B6E0 D0 1F 00 50 */ stfs f0, 0x50(r31) -/* 8021B6E4 C0 02 AF 48 */ lfs f0, lit_9050(r2) -/* 8021B6E8 D0 1F 00 54 */ stfs f0, 0x54(r31) -/* 8021B6EC 48 00 01 10 */ b lbl_8021B7FC -/* 8021B6F0 C0 02 AE F4 */ lfs f0, lit_8995(r2) -/* 8021B6F4 D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 8021B6F8 C0 02 AF 2C */ lfs f0, lit_9026(r2) -/* 8021B6FC D0 1F 00 40 */ stfs f0, 0x40(r31) -/* 8021B700 C0 02 AE F0 */ lfs f0, lit_8994(r2) -/* 8021B704 D0 1F 00 44 */ stfs f0, 0x44(r31) -/* 8021B708 C0 02 AE 80 */ lfs f0, lit_4182(r2) -/* 8021B70C D0 1F 00 48 */ stfs f0, 0x48(r31) -/* 8021B710 C0 02 AF 4C */ lfs f0, lit_9051(r2) -/* 8021B714 D0 1F 00 4C */ stfs f0, 0x4c(r31) -/* 8021B718 C0 02 AF 40 */ lfs f0, lit_9048(r2) -/* 8021B71C D0 1F 00 50 */ stfs f0, 0x50(r31) -/* 8021B720 C0 02 AF 48 */ lfs f0, lit_9050(r2) -/* 8021B724 D0 1F 00 54 */ stfs f0, 0x54(r31) -/* 8021B728 48 00 00 D4 */ b lbl_8021B7FC -/* 8021B72C C0 02 AF 30 */ lfs f0, lit_9027(r2) -/* 8021B730 D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 8021B734 C0 02 AF 34 */ lfs f0, lit_9028(r2) -/* 8021B738 D0 1F 00 40 */ stfs f0, 0x40(r31) -/* 8021B73C C0 05 01 D4 */ lfs f0, 0x1d4(r5) -/* 8021B740 D0 1F 00 44 */ stfs f0, 0x44(r31) -/* 8021B744 C0 05 01 EC */ lfs f0, 0x1ec(r5) -/* 8021B748 D0 1F 00 48 */ stfs f0, 0x48(r31) -/* 8021B74C C0 05 01 F8 */ lfs f0, 0x1f8(r5) -/* 8021B750 D0 1F 00 4C */ stfs f0, 0x4c(r31) -/* 8021B754 C0 05 02 08 */ lfs f0, 0x208(r5) -/* 8021B758 D0 1F 00 50 */ stfs f0, 0x50(r31) -/* 8021B75C C0 05 02 18 */ lfs f0, 0x218(r5) -/* 8021B760 D0 1F 00 54 */ stfs f0, 0x54(r31) -/* 8021B764 48 00 00 98 */ b lbl_8021B7FC -lbl_8021B768: -/* 8021B768 7C 83 23 78 */ mr r3, r4 -/* 8021B76C 4B E7 FF 9D */ bl isBottleItem__FUc -/* 8021B770 2C 03 00 00 */ cmpwi r3, 0 -/* 8021B774 41 82 00 48 */ beq lbl_8021B7BC -/* 8021B778 C0 02 AF 50 */ lfs f0, lit_9052(r2) -/* 8021B77C D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 8021B780 C0 02 AE 88 */ lfs f0, lit_4184(r2) -/* 8021B784 D0 1F 00 40 */ stfs f0, 0x40(r31) -/* 8021B788 C0 02 AF 24 */ lfs f0, lit_9007(r2) -/* 8021B78C D0 1F 00 44 */ stfs f0, 0x44(r31) -/* 8021B790 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021B794 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021B798 C0 03 01 EC */ lfs f0, 0x1ec(r3) -/* 8021B79C D0 1F 00 48 */ stfs f0, 0x48(r31) -/* 8021B7A0 C0 03 01 F8 */ lfs f0, 0x1f8(r3) -/* 8021B7A4 D0 1F 00 4C */ stfs f0, 0x4c(r31) -/* 8021B7A8 C0 03 02 08 */ lfs f0, 0x208(r3) -/* 8021B7AC D0 1F 00 50 */ stfs f0, 0x50(r31) -/* 8021B7B0 C0 03 02 18 */ lfs f0, 0x218(r3) -/* 8021B7B4 D0 1F 00 54 */ stfs f0, 0x54(r31) -/* 8021B7B8 48 00 00 44 */ b lbl_8021B7FC -lbl_8021B7BC: -/* 8021B7BC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 8021B7C0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 8021B7C4 C0 03 01 CC */ lfs f0, 0x1cc(r3) -/* 8021B7C8 D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 8021B7CC C0 03 01 D0 */ lfs f0, 0x1d0(r3) -/* 8021B7D0 D0 1F 00 40 */ stfs f0, 0x40(r31) -/* 8021B7D4 C0 03 01 D4 */ lfs f0, 0x1d4(r3) -/* 8021B7D8 D0 1F 00 44 */ stfs f0, 0x44(r31) -/* 8021B7DC C0 03 01 EC */ lfs f0, 0x1ec(r3) -/* 8021B7E0 D0 1F 00 48 */ stfs f0, 0x48(r31) -/* 8021B7E4 C0 03 01 F8 */ lfs f0, 0x1f8(r3) -/* 8021B7E8 D0 1F 00 4C */ stfs f0, 0x4c(r31) -/* 8021B7EC C0 03 02 08 */ lfs f0, 0x208(r3) -/* 8021B7F0 D0 1F 00 50 */ stfs f0, 0x50(r31) -/* 8021B7F4 C0 03 02 18 */ lfs f0, 0x218(r3) -/* 8021B7F8 D0 1F 00 54 */ stfs f0, 0x54(r31) -lbl_8021B7FC: -/* 8021B7FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021B800 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021B804 7C 08 03 A6 */ mtlr r0 -/* 8021B808 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021B80C 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 ec5e5b0353..6fa7a50ffd 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1810,6 +1810,14 @@ inline void dComIfGs_setEquipBottleItemEmpty(u8 i_curItem) { g_dComIfG_gameInfo.info.getPlayer().getItem().setEquipBottleItemEmpty(i_curItem); } +inline u8 dComIfGs_getBButtonItemKey() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectEquip(4); +} + +inline void dComIfGs_setBButtonItemKey(u8 i_itemNo) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(4, i_itemNo); +} + void dComIfGp_setSelectItem(int index); s32 dComIfGp_offHeapLockFlag(int flag); void dComIfGp_createSubExpHeap2D(); diff --git a/include/d/d_camera.h b/include/d/d_camera.h index bedb8faa0e..9119e1df9b 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -356,6 +356,7 @@ public: bool Active() { return field_0x24 == 0; } f32 TrimHeight() { return mTrimHeight; } int Type() { return mCurType; } + int Mode() { return mNextMode; } bool i_chkFlag(u32 i_flag) { return mEventFlags & i_flag; } void i_setFlag(u32 i_flag) { mEventFlags |= i_flag; } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index f55599eeb0..4aee38d448 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -55,18 +55,6 @@ private: /* 0x34 */ f32 field_0x34; }; // Size: 0x38 -class dDlst_FileInfo_c : public dDlst_base_c { -public: - dDlst_FileInfo_c() {} - virtual void draw(); - virtual ~dDlst_FileInfo_c(); // inlined - - /* 0x04 */ J2DScreen* Scr; - /* 0x08 */ JUTFont* mFont; - /* 0x0C */ J2DPane* mBasePane; - /* 0x10 */ J2DPane* field_0x10; -}; - class dDlst_2D_c : public dDlst_base_c { public: /* 80053A00 */ dDlst_2D_c(ResTIMG* image, s16 posX, s16 posY, s16 width, s16 height, u8 alpha); diff --git a/include/d/file/d_file_sel_info.h b/include/d/file/d_file_sel_info.h index 0e8bcbd134..cb9460259e 100644 --- a/include/d/file/d_file_sel_info.h +++ b/include/d/file/d_file_sel_info.h @@ -3,6 +3,18 @@ #include "d/d_drawlist.h" +class dDlst_FileInfo_c : public dDlst_base_c { +public: + dDlst_FileInfo_c() {} + virtual void draw(); + virtual ~dDlst_FileInfo_c() {} + + /* 0x04 */ J2DScreen* Scr; + /* 0x08 */ JUTFont* mFont; + /* 0x0C */ J2DPane* mBasePane; + /* 0x10 */ J2DPane* field_0x10; +}; + class CPaneMgrAlpha; class dSv_save_c; @@ -20,6 +32,10 @@ public: /* 801924A0 */ virtual ~dFile_info_c(); + // fake? needed to get vtable size correct + virtual void dummy() = 0; + virtual void dummy2() = 0; + void setBasePane(J2DPane* pane) { mFileInfo.mBasePane = pane; } CPaneMgrAlpha* getDatBase() { return mDatBase; } CPaneMgrAlpha* getNoDatBase() { return mNoDatBase; } diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h index 4817e1916c..52a26cdd00 100644 --- a/include/d/meter/d_meter2.h +++ b/include/d/meter/d_meter2.h @@ -123,8 +123,8 @@ private: /* 0x128 */ u32 field_0x128; /* 0x12C */ int field_0x12c; /* 0x130 */ f32 field_0x130; - /* 0x134 */ f32 mAButtonTalkPosX[2]; - /* 0x13C */ f32 mAButtonTalkPosY[2]; + /* 0x134 */ f32 mButtonATalkPosX[2]; + /* 0x13C */ f32 mButtonATalkPosY[2]; /* 0x144 */ f32 field_0x144; /* 0x148 */ f32 field_0x148[2]; /* 0x150 */ f32 field_0x150[2]; @@ -236,24 +236,24 @@ private: /* 0x2A8 */ f32 mKeyNumScale; /* 0x2AC */ f32 mKeyNumPosX; /* 0x2B0 */ f32 mKeyNumPosY; - /* 0x2B4 */ f32 mAButtonScale; - /* 0x2B8 */ f32 mAButtonPosX; - /* 0x2BC */ f32 mAButtonPosY; - /* 0x2C0 */ f32 mAButtonFontScale; - /* 0x2C4 */ f32 mAButtonFontPosX; - /* 0x2C8 */ f32 mAButtonFontPosY; + /* 0x2B4 */ f32 mButtonAScale; + /* 0x2B8 */ f32 mButtonAPosX; + /* 0x2BC */ f32 mButtonAPosY; + /* 0x2C0 */ f32 mButtonATextScale; + /* 0x2C4 */ f32 mButtonATextPosX; + /* 0x2C8 */ f32 mButtonATextPosY; /* 0x2CC */ f32 field_0x2cc; - /* 0x2D0 */ f32 mBButtonPosX; - /* 0x2D4 */ f32 mBButtonPosY; + /* 0x2D0 */ f32 mButtonBPosX; + /* 0x2D4 */ f32 mButtonBPosY; /* 0x2D8 */ u8 field_0x2d8[0x2e4 - 0x2d8]; - /* 0x2E4 */ f32 mAButtonTalkScale[2]; + /* 0x2E4 */ f32 mButtonATalkScale[2]; /* 0x2EC */ f32 field_0x2ec[2]; - /* 0x2F4 */ f32 mBItemBaseScale[2]; - /* 0x2FC */ f32 mBItemBasePosX[2]; - /* 0x304 */ f32 mBItemBasePosY[2]; - /* 0x30C */ f32 mBButtonFontScale; - /* 0x310 */ f32 mBButtonFontPosX; - /* 0x314 */ f32 mBButtonFontPosY; + /* 0x2F4 */ f32 mItemBBaseScale[2]; + /* 0x2FC */ f32 mItemBBasePosX[2]; + /* 0x304 */ f32 mItemBBasePosY[2]; + /* 0x30C */ f32 mButtonBFontScale; + /* 0x310 */ f32 mButtonBFontPosX; + /* 0x314 */ f32 mButtonBFontPosY; /* 0x318 */ u8 field_0x318[0x324 - 0x318]; /* 0x324 */ f32 field_0x324; /* 0x328 */ f32 field_0x328; @@ -299,12 +299,12 @@ private: /* 0x42C */ f32 mVesselAlpha; /* 0x430 */ f32 field_0x430; /* 0x434 */ u8 field_0x434[0x448 - 0x434]; - /* 0x448 */ f32 mDPadButtonOFFPosX; - /* 0x44C */ f32 mDPadButtonOFFPosY; - /* 0x450 */ f32 mDPadButtonScale; - /* 0x454 */ f32 mDPadButtonONPosX; - /* 0x458 */ f32 mDPadButtonONPosY; - /* 0x45C */ f32 mDPadButtonLetterSpacing; + /* 0x448 */ f32 mButtonCrossOFFPosX; + /* 0x44C */ f32 mButtonCrossOFFPosY; + /* 0x450 */ f32 mButtonCrossScale; + /* 0x454 */ f32 mButtonCrossONPosX; + /* 0x458 */ f32 mButtonCrossONPosY; + /* 0x45C */ f32 mButtonCrossTextScale; /* 0x460 */ u8 field_0x460[0x4bc - 0x460]; /* 0x4BC */ u8 field_0x4bc; /* 0x4BC */ u8 field_0x4bd; diff --git a/include/d/meter/d_meter2_draw.h b/include/d/meter/d_meter2_draw.h index 3876ee56f1..235cb94145 100644 --- a/include/d/meter/d_meter2_draw.h +++ b/include/d/meter/d_meter2_draw.h @@ -153,6 +153,23 @@ class dKantera_icon_c; class dMeter2Draw_c : public dDlst_base_c { public: + enum { + SELECT_X_e, + SELECT_Y_e, + SELECT_Z_e, + SELECT_MAX_e = 2, + }; + + struct item_params { + /* 0x00 */ f32 pos_x; + /* 0x04 */ f32 pos_y; + /* 0x08 */ f32 scale; + /* 0x0C */ f32 rotation; + /* 0x10 */ f32 num_pos_x; + /* 0x14 */ f32 num_pos_y; + /* 0x18 */ f32 num_scale; + }; + /* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*); /* 80210FB0 */ void init(); /* 8021135C */ void exec(u32); @@ -213,19 +230,19 @@ public: /* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool); /* 80218238 */ f32 getButtonCrossParentInitTransY(); /* 80218254 */ void drawButtonCross(f32, f32); - /* 80218338 */ void setAlphaButtonCrossAnimeMin(); - /* 802183A8 */ void setAlphaButtonCrossAnimeMax(); - /* 80218448 */ void setAlphaButtonCrossItemAnimeMin(); - /* 80218524 */ void setAlphaButtonCrossItemAnimeMax(); - /* 802185E8 */ void setAlphaButtonCrossMapAnimeMin(); - /* 802186C4 */ void setAlphaButtonCrossMapAnimeMax(); - /* 80218788 */ void setAlphaButtonChange(bool); - /* 8021901C */ void setAlphaButtonAnimeMin(); - /* 802190A8 */ void setAlphaButtonAnimeMax(); - /* 80219174 */ void setAlphaButtonAAnimeMin(); - /* 80219258 */ void setAlphaButtonAAnimeMax(); - /* 80219324 */ void setAlphaButtonBAnimeMin(); - /* 80219474 */ void setAlphaButtonBAnimeMax(); + /* 80218338 */ void setAlphButtonACrossAnimeMin(); + /* 802183A8 */ void setAlphButtonACrossAnimeMax(); + /* 80218448 */ void setAlphButtonACrossItemAnimeMin(); + /* 80218524 */ void setAlphButtonACrossItemAnimeMax(); + /* 802185E8 */ void setAlphButtonACrossMapAnimeMin(); + /* 802186C4 */ void setAlphButtonACrossMapAnimeMax(); + /* 80218788 */ void setAlphButtonAChange(bool); + /* 8021901C */ void setAlphButtonAAnimeMin(); + /* 802190A8 */ void setAlphButtonAAnimeMax(); + /* 80219174 */ void setAlphButtonAAAnimeMin(); + /* 80219258 */ void setAlphButtonAAAnimeMax(); + /* 80219324 */ void setAlphButtonABAnimeMin(); + /* 80219474 */ void setAlphButtonABAnimeMax(); /* 802195A4 */ void setButtonIconAAlpha(u8, u32, bool); /* 80219788 */ void setButtonIconBAlpha(u8, u32, bool); /* 80219A84 */ void setButtonIconMidonaAlpha(u32); @@ -249,7 +266,7 @@ public: /* 8021BC24 */ bool getCameraSubject(); /* 8021BC54 */ bool getItemSubject(); /* 8021BCAC */ bool getPlayerSubject(); - /* 8021BCC0 */ bool isBButtonShow(bool); + /* 8021BCC0 */ bool isButtonBShow(bool); /* 8021BDD0 */ s16 getButtonTimer(); /* 802102F8 */ virtual ~dMeter2Draw_c(); @@ -270,39 +287,12 @@ public: void setEmphasisB(u8 param_0) { field_0x762 = param_0; } private: - /* 0x004 */ f32 field_0x4; - /* 0x008 */ f32 field_0x8; - /* 0x00C */ f32 field_0xc; - /* 0x010 */ f32 field_0x10; - /* 0x014 */ f32 field_0x14; - /* 0x028 */ f32 field_0x18; - /* 0x01C */ f32 field_0x1c; - /* 0x020 */ f32 field_0x20; - /* 0x024 */ f32 field_0x24; - /* 0x028 */ f32 field_0x28; - /* 0x02C */ f32 field_0x2c; - /* 0x030 */ f32 field_0x30; - /* 0x034 */ f32 field_0x34; - /* 0x038 */ f32 field_0x38; - /* 0x03C */ f32 field_0x3c; - /* 0x040 */ f32 field_0x40; - /* 0x044 */ f32 field_0x44; - /* 0x048 */ f32 field_0x48; - /* 0x04C */ f32 field_0x4c; - /* 0x050 */ f32 field_0x50; - /* 0x054 */ f32 field_0x54; - /* 0x058 */ f32 field_0x58; - /* 0x05C */ f32 field_0x5c; - /* 0x060 */ f32 field_0x60; - /* 0x064 */ f32 field_0x64; - /* 0x068 */ f32 field_0x68; - /* 0x06C */ f32 field_0x6c; - /* 0x070 */ f32 field_0x70; - /* 0x074 */ JKRExpHeap* mp_heap; + /* 0x004 */ item_params mItemParams[4]; + /* 0x074 */ JKRExpHeap* heap; /* 0x078 */ J2DScreen* mpScreen; /* 0x07C */ J2DScreen* mpKanteraScreen; /* 0x080 */ J2DScreen* mpPikariScreen; - /* 0x084 */ J2DScreen* mpItemNumTex[2][3]; + /* 0x084 */ J2DPicture* mpItemNumTex[2][3]; /* 0x09C */ CPaneMgr* field_0x9c[3]; /* 0x0A8 */ int field_0xa8; /* 0x0AC */ dKantera_icon_c* mpKanteraMeter[2]; @@ -313,7 +303,7 @@ private: /* 0x0E8 */ CPaneMgr* mpXYText[5][3]; /* 0x124 */ CPaneMgr* mpLifeParent; /* 0x128 */ CPaneMgr* mpLifeParts[20]; - /* 0x178 */ CPaneMgr* mpHeartMask[20]; + /* 0x178 */ CPaneMgr* mpHeartMark[20]; /* 0x1C8 */ CPaneMgr* mpBigHeart; /* 0x1CC */ CPaneMgr* mpMagicParent; /* 0x1D0 */ CPaneMgr* mpMagicBase; @@ -352,22 +342,22 @@ private: /* 0x36C */ int field_0x36c; /* 0x370 */ u8 field_0x370[0x2C]; /* 0x39C */ CPaneMgr* mpPikariParent; - /* 0x3A0 */ CPaneMgr* mpLifeTexture[20][2]; - /* 0x440 */ CPaneMgr* mpHeartBase[20]; + /* 0x3A0 */ CPaneMgrAlpha* mpLifeTexture[20][2]; + /* 0x440 */ CPaneMgrAlpha* mpHeartBase[20]; /* 0x490 */ CPaneMgr* mpJujiI[5]; /* 0x4A4 */ CPaneMgr* mpJujiM[5]; - /* 0x4B8 */ CPaneMgr* mpUzu; + /* 0x4B8 */ CPaneMgrAlpha* mpUzu; /* 0x4BC */ u8 field_0x4bc[0x28]; - /* 0x4E4 */ JKRHeap* mpItemBTex[2][2]; - /* 0x4F4 */ JKRHeap* mpItemXYTex[2][2][2]; + /* 0x4E4 */ ResTIMG* mpItemBTex[2][2]; + /* 0x4F4 */ ResTIMG* mpItemXYTex[2][2][2]; /* 0x514 */ J2DPicture* mpItemBPane; /* 0x518 */ J2DPicture* mpItemXYPane[3]; /* 0x524 */ int field_0x524[2][2]; /* 0x534 */ J2DAnmTransformKey* mPikariBck; /* 0x538 */ J2DAnmColorKey* mPikariBpk; /* 0x53C */ J2DAnmColorKey* mpOxygenBpk[3]; - /* 0x548 */ JUtility::TColor field_0x548; - /* 0x54C */ JUtility::TColor field_0x54c; + /* 0x548 */ JUtility::TColor mPikariBlack; + /* 0x54C */ JUtility::TColor mPikariWhite; /* 0x550 */ f32 field_0x550; /* 0x554 */ f32 field_0x554; /* 0x558 */ f32 field_0x558; @@ -409,13 +399,13 @@ private: /* 0x6E8 */ f32 field_0x6e8; /* 0x6EC */ f32 field_0x6ec; /* 0x6F0 */ f32 field_0x6f0; - /* 0x6F4 */ f32 field_0x6f4; + /* 0x6F4 */ f32 mLightDropVesselScale; /* 0x6F8 */ f32 field_0x6f8; /* 0x6FC */ f32 field_0x6fc; /* 0x700 */ u8 field_0x700[0x18]; /* 0x718 */ f32 field_0x718; /* 0x71C */ u8 field_0x71c[4]; - /* 0x720 */ f32 mZButtonAlpha; + /* 0x720 */ f32 mButtonZAlpha; /* 0x724 */ f32 field_0x724; /* 0x728 */ f32 field_0x728; /* 0x72C */ f32 field_0x72c; @@ -446,22 +436,22 @@ private: /* 0x76B */ u8 field_0x76b; /* 0x76C */ u8 field_0x76c[2]; /* 0x76E */ u8 field_0x76e; - /* 0x76F */ u8 field_0x76f; + /* 0x76F */ u8 mButtonBItem; /* 0x770 */ u8 field_0x770; /* 0x771 */ u8 field_0x771; /* 0x772 */ u8 field_0x772; /* 0x773 */ u8 field_0x773[2]; - /* 0x778 */ f32 mHUDScale; - /* 0x77C */ f32 mHUDAlpha; + /* 0x778 */ f32 mParentScale; + /* 0x77C */ f32 mParentAlpha; /* 0x780 */ f32 mButtonsPosX; /* 0x784 */ f32 mButtonsPosY; /* 0x788 */ f32 mButtonsScale; /* 0x78C */ f32 field_0x78c; - /* 0x790 */ f32 field_0x790; - /* 0x794 */ f32 mLifeGaugeHeartAlpha; - /* 0x798 */ f32 mLifeGaugeBaseAlpha; + /* 0x790 */ f32 mLifeParentAlpha; + /* 0x794 */ f32 mLifeParentHeartAlpha; + /* 0x798 */ f32 mHeartBaseAlpha; /* 0x79C */ f32 mHeartAlpha; - /* 0x7A0 */ f32 mLargeHeartAlpha; + /* 0x7A0 */ f32 mBigHeartAlpha; /* 0x7A4 */ f32 field_0x7a4; /* 0x7A8 */ f32 mMagicMeterAlpha; /* 0x7AC */ f32 mMagicMeterFrameAlpha; @@ -484,44 +474,28 @@ private: /* 0x7F0 */ f32 field_0x7f0; /* 0x7F4 */ f32 mMainHUDButtonsAlpha; /* 0x7F8 */ f32 mButtonDisplayBackAlpha; - /* 0x7FC */ f32 mAButtonAlpha; - /* 0x800 */ f32 mBButtonAlpha; - /* 0x804 */ f32 mXButtonAlpha; - /* 0x808 */ f32 mYButtonAlpha; + /* 0x7FC */ f32 mButtonAAlpha; + /* 0x800 */ f32 mButtonBAlpha; + /* 0x804 */ f32 mButtonXAlpha; + /* 0x808 */ f32 mButtonYAlpha; /* 0x80C */ f32 field_0x80c; /* 0x810 */ f32 field_0x810; - /* 0x814 */ f32 mBItemBaseAlpha[2]; - /* 0x81C */ f32 mXButtonItemBaseAlpha[2]; - /* 0x824 */ f32 mYButtonItemBaseAlpha[2]; + /* 0x814 */ f32 mItemBBaseAlpha[2]; + /* 0x81C */ f32 mButtonXItemBaseAlpha[2]; + /* 0x824 */ f32 mButtonYItemBaseAlpha[2]; /* 0x82C */ f32 field_0x82c[2]; - /* 0x834 */ f32 mZButtonItemBaseAlpha; + /* 0x834 */ f32 mButtonZItemBaseAlpha; /* 0x838 */ f32 mButtonBaseAlpha; - /* 0x83C */ f32 mAButtonFontSpacing; - /* 0x840 */ f32 mDPadButtonAlpha; - /* 0x844 */ f32 mDPadButtonITEMAlpha; - /* 0x848 */ f32 mDPadButtonMAPAlpha; - /* 0x84C */ u8 field_0x84c; - /* 0x84D */ u8 field_0x84d; - /* 0x84E */ u8 field_0x84e; - /* 0x84F */ u8 field_0x84f; - /* 0x850 */ u8 field_0x850; - /* 0x851 */ u8 field_0x851; - /* 0x852 */ u8 field_0x852; - /* 0x853 */ u8 field_0x853; - /* 0x854 */ u8 field_0x854; - /* 0x855 */ u8 field_0x855; - /* 0x856 */ u8 field_0x856; - /* 0x857 */ u8 field_0x857; - /* 0x858 */ u8 field_0x858; - /* 0x859 */ u8 field_0x859; - /* 0x85A */ u8 field_0x85a; - /* 0x85B */ u8 field_0x85b; - /* 0x85C */ u8 field_0x85c; - /* 0x85D */ u8 field_0x85d; - /* 0x85E */ u8 field_0x85e; - /* 0x85F */ u8 field_0x85f; - /* 0x860 */ u8 field_0x860; - /* 0x861 */ u8 field_0x861; + /* 0x83C */ f32 mButtonATextSpacing; + /* 0x840 */ f32 mButtonCrossAlpha; + /* 0x844 */ f32 mButtonCrossITEMAlpha; + /* 0x848 */ f32 mButtonCrossMAPAlpha; + /* 0x84C */ GXColor mButtonATextColor; + /* 0x850 */ GXColor mButtonBTextColor; + /* 0x854 */ GXColor field_0x854; + /* 0x858 */ GXColor mButtonZTextColor; + /* 0x85C */ GXColor mButtonXYTextColor; + /* 0x860 */ u8 field_0x860[2]; }; #endif /* D_METER_D_METER2_DRAW_H */ diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 26cfa5ef4b..2ea00aaf79 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -164,6 +164,8 @@ public: s16 getFloatingMessageTimer() { return mFloatingMessageTimer; } u16 getFloatingMessageID() { return mFloatingMessageID; } s16 getHorseLifeCount() { return mHorseLifeCount; } + void setMeterItemPanePtr(int i_no, CPaneMgr* i_pane) { mMeterItemPanePtr[i_no] = i_pane; } + bool isShopTalkFlag() { return mShopTalkFlag != false; } u8 getCollectCursorPosX() { return mCollectCursorPosX; } u8 getCollectCursorPosY() { return mCollectCursorPosY; } void setCollectCursorPosXY(u8 x, u8 y) { @@ -294,6 +296,10 @@ inline void dMeter2Info_getStringKanji(u32 param_0, char* param_1, JMSMesgEntry_ g_meter2_info.getStringKanji(param_0, param_1, param_2); } +inline void dMeter2Info_getStringKana(u32 param_0, char* param_1, JMSMesgEntry_c* param_2) { + g_meter2_info.getStringKana(param_0, param_1, param_2); +} + inline f32 dMeter2Info_getStringLength(JUTFont* param_0, f32 param_1, f32 param_2, char* param_3) { return g_meter2_info.getStringLength(param_0, param_1, param_2, param_3); } @@ -671,10 +677,20 @@ inline void dMeter2Info_resetMeterString() { g_meter2_info.resetMeterString(); } +inline void dMeter2Info_setMeterItemPanePtr(int i_no, CPaneMgr* i_pane) { + g_meter2_info.setMeterItemPanePtr(i_no, i_pane); +} + +inline bool dMeter2Info_isShopTalkFlag() { + return g_meter2_info.isShopTalkFlag(); +} + const char* dMeter2Info_getNumberTextureName(int pIndex); void dMeter2Info_recieveLetter(); u8 dMeter2Info_getNewLetterNum(); int dMeter2Info_setNewLetterSender(); +bool dMeter2Info_isItemOpenCheck(); +bool dMeter2Info_isMapOpenCheck(); #endif /* D_METER_D_METER2_INFO_H */ diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h index a40d824432..754679bb8c 100644 --- a/include/d/meter/d_meter_HIO.h +++ b/include/d/meter/d_meter_HIO.h @@ -46,18 +46,18 @@ public: /* 0x3C */ f32 mHeartVesselPosX; /* 0x40 */ f32 mHeartVesselPosY; /* 0x44 */ f32 mHeartVesselScale; - /* 0x48 */ f32 mAButtonPosX; - /* 0x4C */ f32 mAButtonPosY; - /* 0x50 */ f32 mAButtonScale; - /* 0x54 */ f32 mBButtonPosX; - /* 0x58 */ f32 mBButtonPosY; - /* 0x5C */ f32 mBButtonScale; - /* 0x60 */ f32 mAButtonTextPosX; - /* 0x64 */ f32 mAButtonTextPosY; - /* 0x68 */ f32 mAButtonTextScale; - /* 0x6C */ f32 mBButtonTextPosX; - /* 0x70 */ f32 mBButtonTextPosY; - /* 0x74 */ f32 mBButtonTextScale; + /* 0x48 */ f32 mButtonAPosX; + /* 0x4C */ f32 mButtonAPosY; + /* 0x50 */ f32 mButtonAScale; + /* 0x54 */ f32 mButtonBPosX; + /* 0x58 */ f32 mButtonBPosY; + /* 0x5C */ f32 mButtonBScale; + /* 0x60 */ f32 mButtonATextPosX; + /* 0x64 */ f32 mButtonATextPosY; + /* 0x68 */ f32 mButtonATextScale; + /* 0x6C */ f32 mButtonBTextPosX; + /* 0x70 */ f32 mButtonBTextPosY; + /* 0x74 */ f32 mButtonBTextScale; /* 0x78 */ JUtility::TColor mVesselBack[2]; /* 0x80 */ JUtility::TColor mVesselFront[2]; /* 0x88 */ f32 mHeartPiecePosX; @@ -289,18 +289,18 @@ public: /* 0x008 */ f32 mEmpButtonPosX; /* 0x00C */ f32 mEmpButtonPosY; /* 0x010 */ f32 mEmpButtonScale; - /* 0x014 */ f32 mAButtonPosX; - /* 0x018 */ f32 mAButtonPosY; - /* 0x01C */ f32 mAButtonScale; - /* 0x020 */ f32 mBButtonPosX; - /* 0x024 */ f32 mBButtonPosY; - /* 0x028 */ f32 mBButtonScale; + /* 0x014 */ f32 mButtonAPosX; + /* 0x018 */ f32 mButtonAPosY; + /* 0x01C */ f32 mButtonAScale; + /* 0x020 */ f32 mButtonBPosX; + /* 0x024 */ f32 mButtonBPosY; + /* 0x028 */ f32 mButtonBScale; /* 0x02C */ f32 mRButtonPosX; /* 0x030 */ f32 mRButtonPosY; /* 0x034 */ f32 mRButtonScale; - /* 0x038 */ f32 mZButtonPosX; - /* 0x03C */ f32 mZButtonPosY; - /* 0x040 */ f32 mZButtonScale; + /* 0x038 */ f32 mButtonZPosX; + /* 0x03C */ f32 mButtonZPosY; + /* 0x040 */ f32 mButtonZScale; /* 0x044 */ f32 m3DButtonPosX; /* 0x048 */ f32 m3DButtonPosY; /* 0x04C */ f32 m3DButtonScale; @@ -310,12 +310,12 @@ public: /* 0x05C */ f32 mSButtonPosX; /* 0x060 */ f32 mSButtonPosY; /* 0x064 */ f32 mSButtonScale; - /* 0x068 */ f32 mXButtonPosX; - /* 0x06C */ f32 mXButtonPosY; - /* 0x070 */ f32 mXButtonScale; - /* 0x074 */ f32 mYButtonPosX; - /* 0x078 */ f32 mYButtonPosY; - /* 0x07C */ f32 mYButtonScale; + /* 0x068 */ f32 mButtonXPosX; + /* 0x06C */ f32 mButtonXPosY; + /* 0x070 */ f32 mButtonXScale; + /* 0x074 */ f32 mButtonYPosX; + /* 0x078 */ f32 mButtonYPosY; + /* 0x07C */ f32 mButtonYScale; /* 0x080 */ f32 mNunchukPosX; /* 0x084 */ f32 mNunchukPosY; /* 0x088 */ f32 mNunchukScale; @@ -325,9 +325,9 @@ public: /* 0x098 */ f32 mWiimoteLRPosX; /* 0x09C */ f32 mWiimoteLRPosY; /* 0x0A0 */ f32 mWiimoteLRScale; - /* 0x0A4 */ f32 mNunchukZButtonPosX; - /* 0x0A8 */ f32 mNunchukZButtonPosY; - /* 0x0AC */ f32 mNunchukZButtonScale; + /* 0x0A4 */ f32 mNunchukButtonZPosX; + /* 0x0A8 */ f32 mNunchukButtonZPosY; + /* 0x0AC */ f32 mNunchukButtonZScale; /* 0x0B0 */ f32 mNunchukCButtonPosX; /* 0x0B4 */ f32 mNunchukCButtonPosY; /* 0x0B8 */ f32 mNunchukCButtonScale; @@ -349,9 +349,9 @@ public: /* 0x0F8 */ f32 mNunchukAttackPosX; /* 0x0FC */ f32 mNunchukAttackPosY; /* 0x100 */ f32 mNunchukAttackScale; - /* 0x104 */ f32 mABButtonPosX; - /* 0x108 */ f32 mABButtonPosY; - /* 0x10C */ f32 mABButtonScale; + /* 0x104 */ f32 mAButtonBPosX; + /* 0x108 */ f32 mAButtonBPosY; + /* 0x10C */ f32 mAButtonBScale; /* 0x110 */ f32 mBottleIconPosX; /* 0x114 */ f32 mBottleIconPosY; /* 0x118 */ f32 mBottleIconScale; @@ -399,30 +399,30 @@ public: /* 0x1D0 */ f32 mPointerONScale; /* 0x1D4 */ f32 mPointerOFFScale; /* 0x1D8 */ s16 mPointerONAnimFrame; - /* 0x1DC */ f32 mHighlightScale; - /* 0x1E0 */ JUtility::TColor mHighlightFrontInner; - /* 0x1E4 */ JUtility::TColor mHighlightFrontOuter; - /* 0x1E8 */ JUtility::TColor mHighlightBackInner; - /* 0x1EC */ JUtility::TColor mHighlightBackOuter; - /* 0x1F0 */ f32 mHighlightAnimSpeed; - /* 0x1F4 */ f32 mHighlightFastScale; - /* 0x1F8 */ JUtility::TColor mHighlightFastFrontInner; - /* 0x1FC */ JUtility::TColor mHighlightFastFrontOuter; - /* 0x200 */ JUtility::TColor mHighlightFastBackInner; - /* 0x204 */ JUtility::TColor mHighlightFastBackOuter; - /* 0x208 */ f32 mHighlightFastAnimSpeed; - /* 0x20C */ f32 mHighlightListenScale; - /* 0x210 */ JUtility::TColor mHighlightListenFrontInner; - /* 0x214 */ JUtility::TColor mHighlightListenFrontOuter; - /* 0x218 */ JUtility::TColor mHighlightListenBackInner; - /* 0x21C */ JUtility::TColor mHighlightListenBackOuter; - /* 0x220 */ f32 mHighlightListenAnimSpeed; - /* 0x224 */ f32 mHighlightRepeatHitScale; - /* 0x228 */ JUtility::TColor mHighlightRepeatHitFrontInner; - /* 0x22C */ JUtility::TColor mHighlightRepeatHitFrontOuter; - /* 0x230 */ JUtility::TColor mHighlightRepeatHitBackInner; - /* 0x234 */ JUtility::TColor mHighlightRepeatHitBackOuter; - /* 0x238 */ f32 mHighlightRepeatHitAnimSpeed; + /* 0x1DC */ f32 mPikariScale; + /* 0x1E0 */ JUtility::TColor mPikariFrontInner; + /* 0x1E4 */ JUtility::TColor mPikariFrontOuter; + /* 0x1E8 */ JUtility::TColor mPikariBackInner; + /* 0x1EC */ JUtility::TColor mPikariBackOuter; + /* 0x1F0 */ f32 mPikariAnimSpeed; + /* 0x1F4 */ f32 mPikariFastScale; + /* 0x1F8 */ JUtility::TColor mPikariFastFrontInner; + /* 0x1FC */ JUtility::TColor mPikariFastFrontOuter; + /* 0x200 */ JUtility::TColor mPikariFastBackInner; + /* 0x204 */ JUtility::TColor mPikariFastBackOuter; + /* 0x208 */ f32 mPikariFastAnimSpeed; + /* 0x20C */ f32 mPikariListenScale; + /* 0x210 */ JUtility::TColor mPikariListenFrontInner; + /* 0x214 */ JUtility::TColor mPikariListenFrontOuter; + /* 0x218 */ JUtility::TColor mPikariListenBackInner; + /* 0x21C */ JUtility::TColor mPikariListenBackOuter; + /* 0x220 */ f32 mPikariListenAnimSpeed; + /* 0x224 */ f32 mPikariRepeatHitScale; + /* 0x228 */ JUtility::TColor mPikariRepeatHitFrontInner; + /* 0x22C */ JUtility::TColor mPikariRepeatHitFrontOuter; + /* 0x230 */ JUtility::TColor mPikariRepeatHitBackInner; + /* 0x234 */ JUtility::TColor mPikariRepeatHitBackOuter; + /* 0x238 */ f32 mPikariRepeatHitAnimSpeed; /* 0x23C */ f32 mRepeatHitScale; /* 0x240 */ s16 mRepeatHitFrameNum; /* 0x244 */ f32 mDisplaySpace; @@ -509,22 +509,22 @@ public: /* 0x118 */ f32 mGetInTextAnimSpeed; /* 0x11C */ s16 mGetInTextWaitFrames; /* 0x11E */ s16 mGetInTextAlphaFrames; - /* 0x120 */ f32 mGetInHighlightScale; - /* 0x124 */ JUtility::TColor mGetInHighlightFrontInner; - /* 0x128 */ JUtility::TColor mGetInHighlightFrontOuter; - /* 0x12C */ JUtility::TColor mGetInHighlightBackInner; - /* 0x130 */ JUtility::TColor mGetInHighlightBackOuter; - /* 0x134 */ f32 mGetInHighlightAnimSpeed; - /* 0x138 */ s16 mGetInHighlightAppearFrames; + /* 0x120 */ f32 mGetInPikariScale; + /* 0x124 */ JUtility::TColor mGetInPikariFrontInner; + /* 0x128 */ JUtility::TColor mGetInPikariFrontOuter; + /* 0x12C */ JUtility::TColor mGetInPikariBackInner; + /* 0x130 */ JUtility::TColor mGetInPikariBackOuter; + /* 0x134 */ f32 mGetInPikariAnimSpeed; + /* 0x138 */ s16 mGetInPikariAppearFrames; /* 0x13A */ u8 mGetInTextLocation; - /* 0x13C */ f32 mStartHighlightScale; - /* 0x140 */ JUtility::TColor mStartHighlightFrontInner; - /* 0x144 */ JUtility::TColor mStartHighlightFrontOuter; - /* 0x148 */ JUtility::TColor mStartHighlightBackInner; - /* 0x14C */ JUtility::TColor mStartHighlightBackOuter; - /* 0x150 */ f32 mStartHighlightAnimSpeed; - /* 0x154 */ s16 mStartHighlightAppearFrames; - /* 0x156 */ s16 mStartHighlightDisplayFrames; + /* 0x13C */ f32 mStartPikariScale; + /* 0x140 */ JUtility::TColor mStartPikariFrontInner; + /* 0x144 */ JUtility::TColor mStartPikariFrontOuter; + /* 0x148 */ JUtility::TColor mStartPikariBackInner; + /* 0x14C */ JUtility::TColor mStartPikariBackOuter; + /* 0x150 */ f32 mStartPikariAnimSpeed; + /* 0x154 */ s16 mStartPikariAppearFrames; + /* 0x156 */ s16 mStartPikariDisplayFrames; /* 0x158 */ s16 mReadyGo; /* 0x15A */ s16 field_0x15a; /* 0x15C */ f32 mReadyFightTextSizeX; @@ -534,13 +534,13 @@ public: /* 0x16C */ f32 mReadyFightTextAnimSpeed; /* 0x170 */ s16 mReadyFightTextWaitFrames; /* 0x172 */ s16 field_0x172; - /* 0x174 */ f32 mReadyFightHighlightScale; - /* 0x178 */ JUtility::TColor mReadyFightHighlightFrontInner; - /* 0x17C */ JUtility::TColor mReadyFightHighlightFrontOuter; - /* 0x180 */ JUtility::TColor mReadyFightHighlightBackInner; - /* 0x184 */ JUtility::TColor mReadyFightHighlightBackOuter; - /* 0x188 */ f32 mReadyFightHighlightAnimSpeed; - /* 0x18C */ s16 mReadyFightHighlightAppearFrames; + /* 0x174 */ f32 mReadyFightPikariScale; + /* 0x178 */ JUtility::TColor mReadyFightPikariFrontInner; + /* 0x17C */ JUtility::TColor mReadyFightPikariFrontOuter; + /* 0x180 */ JUtility::TColor mReadyFightPikariBackInner; + /* 0x184 */ JUtility::TColor mReadyFightPikariBackOuter; + /* 0x188 */ f32 mReadyFightPikariAnimSpeed; + /* 0x18C */ s16 mReadyFightPikariAppearFrames; }; // Size: 0x190 class dMeter_drawLightDropHIO_c { @@ -558,9 +558,7 @@ public: /* 0x1C */ f32 mVesselTalkPosY; /* 0x20 */ f32 mVesselPosX_4x3; /* 0x24 */ f32 mVesselPosY_4x3; - /* 0x28 */ f32 mVesselAlpha; - /* 0x2C */ f32 mVesselTalkAlpha; - /* 0x30 */ f32 mVesselDecorAlpha; + /* 0x28 */ f32 mVesselAlpha[3]; /* 0x34 */ f32 mDropAlpha; /* 0x38 */ JUtility::TColor mDropOnColorWhite; /* 0x3C */ JUtility::TColor mDropOnColorBlack; @@ -569,25 +567,25 @@ public: /* 0x48 */ f32 mDropScale; /* 0x4C */ f32 mDropGetScale; /* 0x50 */ s16 mDropGetScaleAnimFrameNum; - /* 0x52 */ s16 mHighlightInterval; + /* 0x52 */ s16 mPikariInterval; /* 0x54 */ s16 field_0x54; /* 0x56 */ s16 field_0x56; - /* 0x58 */ JUtility::TColor mDropHighlightFrontInner; - /* 0x5C */ JUtility::TColor mDropHighlightFrontOuter; - /* 0x60 */ JUtility::TColor mDropHighlightBackInner; - /* 0x64 */ JUtility::TColor mDropHighlightBackOuter; - /* 0x68 */ f32 mDropHighlightAnimSpeed; - /* 0x6C */ f32 mDropHighlightAnimSpeed_Completed; - /* 0x70 */ JUtility::TColor mHighlightLoopFrontInner[2]; - /* 0x78 */ JUtility::TColor mHighlightLoopFrontOuter[2]; - /* 0x80 */ JUtility::TColor mHighlightLoopBackInner[2]; - /* 0x88 */ JUtility::TColor mHighlightLoopBackOuter[2]; - /* 0x90 */ f32 mHighlightLoopAnimSpeed; - /* 0x94 */ f32 mHighlightLoopBackStopFrame; - /* 0x98 */ f32 mHighlightScaleNormal; - /* 0x9C */ f32 mHighlightScaleComplete; - /* 0xA0 */ f32 mHighlightLoopScale; - /* 0xA4 */ f32 mHighlightLoopBackScale; + /* 0x58 */ JUtility::TColor mDropPikariFrontInner; + /* 0x5C */ JUtility::TColor mDropPikariFrontOuter; + /* 0x60 */ JUtility::TColor mDropPikariBackInner; + /* 0x64 */ JUtility::TColor mDropPikariBackOuter; + /* 0x68 */ f32 mDropPikariAnimSpeed; + /* 0x6C */ f32 mDropPikariAnimSpeed_Completed; + /* 0x70 */ JUtility::TColor mPikariLoopFrontInner[2]; + /* 0x78 */ JUtility::TColor mPikariLoopFrontOuter[2]; + /* 0x80 */ JUtility::TColor mPikariLoopBackInner[2]; + /* 0x88 */ JUtility::TColor mPikariLoopBackOuter[2]; + /* 0x90 */ f32 mPikariLoopAnimSpeed; + /* 0x94 */ f32 mPikariLoopBackStopFrame; + /* 0x98 */ f32 mPikariScaleNormal; + /* 0x9C */ f32 mPikariScaleComplete; + /* 0xA0 */ f32 mPikariLoopScale; + /* 0xA4 */ f32 mPikariLoopBackScale; /* 0xA8 */ u8 mAnimDebug; }; // Size: 0xAC @@ -601,17 +599,17 @@ public: /* 0x008 */ f32 mLifeTopPosX; /* 0x00C */ f32 mLifeTopPosY; /* 0x010 */ f32 mNoMagicPosY; - /* 0x014 */ f32 mHUDScale; - /* 0x018 */ f32 mHUDAlpha; - /* 0x01C */ f32 mLifeGaugeScale; - /* 0x020 */ f32 mLifeGaugeHeartAlpha; - /* 0x024 */ f32 mLifeGaugeBaseAlpha; + /* 0x014 */ f32 mParentScale; + /* 0x018 */ f32 mParentAlpha; + /* 0x01C */ f32 mLifeParentScale; + /* 0x020 */ f32 mLifeParentHeartAlpha; + /* 0x024 */ f32 mHeartBaseAlpha; /* 0x028 */ f32 mLifeGaugePosX; /* 0x02C */ f32 mLifeGaugePosY; - /* 0x030 */ f32 mHeartScale; + /* 0x030 */ f32 mHeartMarkScale; /* 0x034 */ f32 mHeartAlpha; - /* 0x038 */ f32 mLargeHeartScale; - /* 0x03C */ f32 mLargeHeartAlpha; + /* 0x038 */ f32 mBigHeartScale; + /* 0x03C */ f32 mBigHeartAlpha; /* 0x040 */ f32 mMagicMeterScale; /* 0x044 */ f32 mMagicMeterAlpha; /* 0x048 */ f32 mMagicMeterFrameAlpha; @@ -637,30 +635,30 @@ public: /* 0x098 */ f32 mRingHUDButtonsPosY; /* 0x09C */ f32 mButtonDisplayBackScale; /* 0x0A0 */ f32 mButtonDisplayBackAlpha; - /* 0x0A4 */ f32 mAButtonScale; - /* 0x0A8 */ f32 mAButtonAlpha; - /* 0x0AC */ f32 mAButtonPosX; - /* 0x0B0 */ f32 mAButtonPosY; - /* 0x0B4 */ f32 mAButtonTalkScale[2]; - /* 0x0BC */ f32 mAButtonTalkPosX[2]; - /* 0x0C4 */ f32 mAButtonTalkPosY[2]; - /* 0x0CC */ f32 mAButtonTalkAScale; - /* 0x0D0 */ f32 mAButtonFontTalkAScale; - /* 0x0D4 */ f32 mAButtonTalkAPosX[2]; - /* 0x0DC */ f32 mAButtonTalkAPosY[2]; - /* 0x0E4 */ f32 mAButtonVesselPosX; - /* 0x0E8 */ f32 mAButtonVesselPosY; - /* 0x0EC */ f32 mBButtonScale; - /* 0x0F0 */ f32 mBButtonAlpha; - /* 0x0F4 */ f32 mBButtonPosX; - /* 0x0F8 */ f32 mBButtonPosY; - /* 0x0FC */ f32 mBButtonTalkScale[2]; - /* 0x104 */ f32 mBButtonTalkPosX[2]; - /* 0x10C */ f32 mBButtonTalkPosY[2]; - /* 0x114 */ f32 mBButtonWolfPosX; - /* 0x118 */ f32 mBButtonWolfPosY; - /* 0x11C */ f32 mBButtonVesselPosX; - /* 0x120 */ f32 mBButtonVesselPosY; + /* 0x0A4 */ f32 mButtonAScale; + /* 0x0A8 */ f32 mButtonAAlpha; + /* 0x0AC */ f32 mButtonAPosX; + /* 0x0B0 */ f32 mButtonAPosY; + /* 0x0B4 */ f32 mButtonATalkScale[2]; + /* 0x0BC */ f32 mButtonATalkPosX[2]; + /* 0x0C4 */ f32 mButtonATalkPosY[2]; + /* 0x0CC */ f32 mButtonATalkAScale; + /* 0x0D0 */ f32 mButtonATextTalkAScale; + /* 0x0D4 */ f32 mButtonATalkAPosX[2]; + /* 0x0DC */ f32 mButtonATalkAPosY[2]; + /* 0x0E4 */ f32 mButtonAVesselPosX; + /* 0x0E8 */ f32 mButtonAVesselPosY; + /* 0x0EC */ f32 mButtonBScale; + /* 0x0F0 */ f32 mButtonBAlpha; + /* 0x0F4 */ f32 mButtonBPosX; + /* 0x0F8 */ f32 mButtonBPosY; + /* 0x0FC */ f32 mButtonBTalkScale[2]; + /* 0x104 */ f32 mButtonBTalkPosX[2]; + /* 0x10C */ f32 mButtonBTalkPosY[2]; + /* 0x114 */ f32 mButtonBWolfPosX; + /* 0x118 */ f32 mButtonBWolfPosY; + /* 0x11C */ f32 mButtonBVesselPosX; + /* 0x120 */ f32 mButtonBVesselPosY; /* 0x124 */ f32 mMidnaIconScale; /* 0x128 */ f32 mMidnaIconAlpha; /* 0x12C */ f32 mMidnaIconPosX; @@ -669,71 +667,63 @@ public: /* 0x138 */ f32 field_0x138; /* 0x13C */ f32 field_0x13c; /* 0x140 */ f32 field_0x140; - /* 0x144 */ f32 mXButtonScale; - /* 0x148 */ f32 mXButtonAlpha; - /* 0x14C */ f32 mXButtonPosX; - /* 0x150 */ f32 mXButtonPosY; - /* 0x154 */ f32 mYButtonScale; - /* 0x158 */ f32 mYButtonAlpha; - /* 0x15C */ f32 mYButtonPosX; - /* 0x160 */ f32 mYButtonPosY; + /* 0x144 */ f32 mButtonXScale; + /* 0x148 */ f32 mButtonXAlpha; + /* 0x14C */ f32 mButtonXPosX; + /* 0x150 */ f32 mButtonXPosY; + /* 0x154 */ f32 mButtonYScale; + /* 0x158 */ f32 mButtonYAlpha; + /* 0x15C */ f32 mButtonYPosX; + /* 0x160 */ f32 mButtonYPosY; /* 0x164 */ f32 field_0x164; /* 0x168 */ f32 field_0x168; /* 0x16C */ f32 field_0x16c; /* 0x170 */ f32 field_0x170; - /* 0x174 */ f32 mZButtonScale; - /* 0x178 */ f32 mZButtonAlpha; - /* 0x17C */ f32 mZButtonPosX; - /* 0x180 */ f32 mZButtonPosY; - /* 0x184 */ f32 mBButtonItemPosX; - /* 0x188 */ f32 mBButtonSwordPosX; - /* 0x18C */ f32 mBButtonFishingPosX; - /* 0x190 */ f32 mBButtonItemPosY; - /* 0x194 */ f32 mBButtonSwordPosY; - /* 0x198 */ f32 mBButtonFishingPosY; - /* 0x19C */ f32 mBButtonItemRotation; - /* 0x1A0 */ f32 mBButtonSwordRotation; - /* 0x1A4 */ f32 mBButtonFishingRotation; - /* 0x1A8 */ f32 mBButtonItemScale; - /* 0x1AC */ f32 mBButtonSwordScale; - /* 0x1B0 */ f32 mBButtonFishingScale; - /* 0x1B4 */ f32 mXButtonItemPosX; - /* 0x1B8 */ f32 mXButtonItemPosY; - /* 0x1BC */ f32 mXButtonItemScale; - /* 0x1C0 */ f32 mYButtonItemPosX; - /* 0x1C4 */ f32 mYButtonItemPosY; - /* 0x1C8 */ f32 mYButtonItemScale; + /* 0x174 */ f32 mButtonZScale; + /* 0x178 */ f32 mButtonZAlpha; + /* 0x17C */ f32 mButtonZPosX; + /* 0x180 */ f32 mButtonZPosY; + /* 0x184 */ f32 mButtonBItemPosX[3]; + /* 0x190 */ f32 mButtonBItemPosY[3]; + /* 0x19C */ f32 mButtonBItemRotation[3]; + /* 0x1A8 */ f32 mButtonBItemScale[3]; + /* 0x1B4 */ f32 mButtonXItemPosX; + /* 0x1B8 */ f32 mButtonXItemPosY; + /* 0x1BC */ f32 mButtonXItemScale; + /* 0x1C0 */ f32 mButtonYItemPosX; + /* 0x1C4 */ f32 mButtonYItemPosY; + /* 0x1C8 */ f32 mButtonYItemScale; /* 0x1CC */ f32 field_0x1cc; /* 0x1D0 */ f32 field_0x1d0; /* 0x1D4 */ f32 field_0x1d4; - /* 0x1D8 */ f32 mZButtonItemPosX; - /* 0x1DC */ f32 mZButtonItemPosY; - /* 0x1E0 */ f32 mZButtonItemScale; + /* 0x1D8 */ f32 mButtonZItemPosX; + /* 0x1DC */ f32 mButtonZItemPosY; + /* 0x1E0 */ f32 mButtonZItemScale; /* 0x1E4 */ f32 mButtonItemRotation[3]; /* 0x1F0 */ f32 mXItemNumPosX; /* 0x1F4 */ f32 mYItemNumPosX; /* 0x1F8 */ f32 field_0x1f8; - /* 0x1FC */ f32 mBItemNumPosX; + /* 0x1FC */ f32 mItemBNumPosX; /* 0x200 */ f32 mXItemNumPosY; /* 0x204 */ f32 mYItemNumPosY; /* 0x208 */ f32 field_0x208; - /* 0x20C */ f32 mBItemNumPosY; + /* 0x20C */ f32 mItemBNumPosY; /* 0x210 */ f32 mXItemNumScale; /* 0x214 */ f32 mYItemNumScale; /* 0x218 */ f32 field_0x218; - /* 0x21C */ f32 mBItemNumScale; - /* 0x220 */ f32 mBItemBaseScale[2]; - /* 0x228 */ f32 mBItemBasePosX[2]; - /* 0x230 */ f32 mBItemBasePosY[2]; - /* 0x238 */ f32 mBItemBaseAlpha[2]; - /* 0x240 */ f32 mXButtonItemBaseScale[2]; - /* 0x248 */ f32 mXButtonItemBasePosX[2]; - /* 0x250 */ f32 mXButtonItemBasePosY[2]; - /* 0x258 */ f32 mXButtonItemBaseAlpha[2]; - /* 0x260 */ f32 mYButtonItemBaseScale[2]; - /* 0x268 */ f32 mYButtonItemBasePosX[2]; - /* 0x270 */ f32 mYButtonItemBasePosY[2]; - /* 0x278 */ f32 mYButtonItemBaseAlpha[2]; + /* 0x21C */ f32 mItemBNumScale; + /* 0x220 */ f32 mItemBBaseScale[2]; + /* 0x228 */ f32 mItemBBasePosX[2]; + /* 0x230 */ f32 mItemBBasePosY[2]; + /* 0x238 */ f32 mItemBBaseAlpha[2]; + /* 0x240 */ f32 mButtonXItemBaseScale[2]; + /* 0x248 */ f32 mButtonXItemBasePosX[2]; + /* 0x250 */ f32 mButtonXItemBasePosY[2]; + /* 0x258 */ f32 mButtonXItemBaseAlpha[2]; + /* 0x260 */ f32 mButtonYItemBaseScale[2]; + /* 0x268 */ f32 mButtonYItemBasePosX[2]; + /* 0x270 */ f32 mButtonYItemBasePosY[2]; + /* 0x278 */ f32 mButtonYItemBaseAlpha[2]; /* 0x280 */ f32 field_0x280; /* 0x284 */ f32 field_0x284; /* 0x288 */ f32 field_0x288; @@ -741,31 +731,31 @@ public: /* 0x290 */ f32 field_0x290; /* 0x294 */ f32 field_0x294; /* 0x298 */ f32 field_0x298[2]; - /* 0x2A0 */ f32 mZButtonItemBaseScale; - /* 0x2A4 */ f32 mZButtonItemBasePosX; - /* 0x2A8 */ f32 mZButtonItemBasePosY; - /* 0x2AC */ f32 mZButtonItemBaseAlpha; + /* 0x2A0 */ f32 mButtonZItemBaseScale; + /* 0x2A4 */ f32 mButtonZItemBasePosX; + /* 0x2A8 */ f32 mButtonZItemBasePosY; + /* 0x2AC */ f32 mButtonZItemBaseAlpha; /* 0x2B0 */ f32 mButtonBaseAlpha; - /* 0x2B4 */ f32 mAButtonFontScale; - /* 0x2B8 */ f32 mAButtonFontPosX; - /* 0x2BC */ f32 mAButtonFontPosY; - /* 0x2C0 */ JUtility::TColor mAButtonFontColor; - /* 0x2C4 */ f32 mAButtonFontSpacing; - /* 0x2C8 */ s32 mAButtonFontActionID; + /* 0x2B4 */ f32 mButtonATextScale; + /* 0x2B8 */ f32 mButtonATextPosX; + /* 0x2BC */ f32 mButtonATextPosY; + /* 0x2C0 */ JUtility::TColor mButtonATextColor; + /* 0x2C4 */ f32 mButtonATextSpacing; + /* 0x2C8 */ s32 mButtonATextActionID; /* 0x2CC */ u32 field_0x2cc; - /* 0x2D0 */ bool mAButtonTextDebug; - /* 0x2D4 */ f32 mBButtonFontScale; - /* 0x2D8 */ f32 mBButtonFontPosX; - /* 0x2DC */ f32 mBButtonFontPosY; - /* 0x2E0 */ JUtility::TColor mBButtonFontColor; + /* 0x2D0 */ bool mButtonATextDebug; + /* 0x2D4 */ f32 mButtonBFontScale; + /* 0x2D8 */ f32 mButtonBFontPosX; + /* 0x2DC */ f32 mButtonBFontPosY; + /* 0x2E0 */ JUtility::TColor mButtonBFontColor; /* 0x2E4 */ f32 field_0x2e4; /* 0x2E8 */ f32 field_0x2e8; /* 0x2EC */ f32 field_0x2ec; /* 0x2F0 */ JUtility::TColor field_0x2f0; - /* 0x2F4 */ f32 mXYButtonFontScale; - /* 0x2F8 */ f32 mXYButtonFontPosX; - /* 0x2FC */ f32 mXYButtonFontPosY; - /* 0x300 */ JUtility::TColor mXYButtonFontColor; + /* 0x2F4 */ f32 mButtonXYTextScale; + /* 0x2F8 */ f32 mButtonXYTextPosX; + /* 0x2FC */ f32 mButtonXYTextPosY; + /* 0x300 */ JUtility::TColor mButtonXYTextColor; /* 0x304 */ f32 field_0x304; /* 0x308 */ f32 field_0x308; /* 0x30C */ f32 field_0x30c; @@ -776,10 +766,10 @@ public: /* 0x320 */ f32 field_0x320; /* 0x324 */ f32 field_0x324; /* 0x328 */ f32 field_0x328; - /* 0x32C */ f32 mZButtonFontScale; - /* 0x330 */ f32 mZButtonFontPosX; - /* 0x334 */ f32 mZButtonFontPosY; - /* 0x338 */ JUtility::TColor mZButtonFontColor; + /* 0x32C */ f32 mButtonZFontScale; + /* 0x330 */ f32 mButtonZFontPosX; + /* 0x334 */ f32 mButtonZFontPosY; + /* 0x338 */ JUtility::TColor mButtonZFontColor; /* 0x33C */ f32 mRupeeKeyScale; /* 0x340 */ f32 mRupeeKeyPosX; /* 0x344 */ f32 mRupeeKeyPosY; @@ -811,72 +801,72 @@ public: /* 0x3AC */ f32 mSpurBarScale; /* 0x3B0 */ f32 mSpurBarPosX; /* 0x3B4 */ f32 mSpurBarPosY; - /* 0x3B8 */ f32 mAButtonHorsePosX; - /* 0x3BC */ f32 mAButtonHorsePosY; - /* 0x3C0 */ f32 mAButtonHorseScale; - /* 0x3C4 */ f32 mAButtonHighlightScale; - /* 0x3C8 */ f32 mBButtonHighlightScale; + /* 0x3B8 */ f32 mButtonAHorsePosX; + /* 0x3BC */ f32 mButtonAHorsePosY; + /* 0x3C0 */ f32 mButtonAHorseScale; + /* 0x3C4 */ f32 mButtonAPikariScale; + /* 0x3C8 */ f32 mButtonBPikariScale; /* 0x3CC */ f32 field_0x3cc; /* 0x3D0 */ f32 field_0x3d0; /* 0x3D4 */ f32 field_0x3d4; - /* 0x3D8 */ f32 mZButtonHighlightScale; - /* 0x3DC */ f32 mXYButtonHighlightScale; - /* 0x3E0 */ f32 mSpurIconHighlightScale; - /* 0x3E4 */ f32 mSpurIconReviveHighlightScale; - /* 0x3E8 */ f32 mMidnaIconHighlightScale; + /* 0x3D8 */ f32 mButtonZPikariScale; + /* 0x3DC */ f32 mButtonXYPikariScale; + /* 0x3E0 */ f32 mSpurIconPikariScale; + /* 0x3E4 */ f32 mSpurIconRevivePikariScale; + /* 0x3E8 */ f32 mMidnaIconPikariScale; /* 0x3EC */ s16 mMidnaIconFlashRate; /* 0x3F0 */ f32 field_0x3f0; /* 0x3F4 */ f32 field_0x3f4; /* 0x3F8 */ f32 field_0x3f8; - /* 0x3FC */ f32 mDPadButtonScale; - /* 0x400 */ f32 mDPadButtonOFFPosX; - /* 0x404 */ f32 mDPadButtonOFFPosY; - /* 0x408 */ f32 mDPadButtonONPosX; - /* 0x40C */ f32 mDPadButtonONPosY; - /* 0x410 */ f32 mDPadButtonLetterSpacing; - /* 0x414 */ f32 mDPadButtonAlpha; - /* 0x418 */ f32 mDPadButtonITEMAlpha; - /* 0x41C */ f32 mDPadButtonMAPAlpha; - /* 0x420 */ s16 mDPadButtonMoveFrame; + /* 0x3FC */ f32 mButtonCrossScale; + /* 0x400 */ f32 mButtonCrossOFFPosX; + /* 0x404 */ f32 mButtonCrossOFFPosY; + /* 0x408 */ f32 mButtonCrossONPosX; + /* 0x40C */ f32 mButtonCrossONPosY; + /* 0x410 */ f32 mButtonCrossTextScale; + /* 0x414 */ f32 mButtonCrossAlpha; + /* 0x418 */ f32 mButtonCrossITEMAlpha; + /* 0x41C */ f32 mButtonCrossMAPAlpha; + /* 0x420 */ s16 mButtonCrossMoveFrame; /* 0x422 */ s16 field_0x422; /* 0x424 */ s16 field_0x424; /* 0x426 */ bool mButtonDebug[4]; - /* 0x42A */ u8 mXYButtonsItemDimAlpha; - /* 0x42B */ u8 mXYButtonsBaseDimAlpha; + /* 0x42A */ u8 mButtonXYItemDimAlpha; + /* 0x42B */ u8 mButtonXYBaseDimAlpha; /* 0x42C */ u8 field_0x42c; /* 0x42D */ u8 mMaxSpurAmount; /* 0x42E */ bool mSpurDebug; /* 0x42F */ bool field_0x42f; - /* 0x430 */ JUtility::TColor mSpurIconHighlightFrontInner; - /* 0x434 */ JUtility::TColor mSpurIconHighlightFrontOuter; - /* 0x438 */ JUtility::TColor mSpurIconHighlightBackInner; - /* 0x43C */ JUtility::TColor mSpurIconHighlightBackOuter; - /* 0x440 */ f32 mSpurIconHighlightAnimSpeed; - /* 0x444 */ JUtility::TColor mSpurIconReviveHighlightFrontInner; - /* 0x448 */ JUtility::TColor mSpurIconReviveHighlightFrontOuter; - /* 0x44C */ JUtility::TColor mSpurIconReviveHighlightBackInner; - /* 0x450 */ JUtility::TColor mSpurIconReviveHighlightBackOuter; - /* 0x454 */ f32 mSpurIconReviveHighlightAnimSpeed; - /* 0x458 */ JUtility::TColor mZButtonHighlightFrontInner; - /* 0x45C */ JUtility::TColor mZButtonHighlightFrontOuter; - /* 0x460 */ JUtility::TColor mZButtonHighlightBackInner; - /* 0x464 */ JUtility::TColor mZButtonHighlightBackOuter; - /* 0x468 */ f32 mZButtonHighlightAnimSpeed; - /* 0x46C */ JUtility::TColor mXYButtonHighlightFrontInner; - /* 0x470 */ JUtility::TColor mXYButtonHighlightFrontOuter; - /* 0x474 */ JUtility::TColor mXYButtonHighlightBackInner; - /* 0x478 */ JUtility::TColor mXYButtonHighlightBackOuter; - /* 0x47C */ f32 mXYButtonHighlightAnimSpeed; - /* 0x480 */ JUtility::TColor mAButtonHighlightFrontInner; - /* 0x484 */ JUtility::TColor mAButtonHighlightFrontOuter; - /* 0x488 */ JUtility::TColor mAButtonHighlightBackInner; - /* 0x48C */ JUtility::TColor mAButtonHighlightBackOuter; - /* 0x490 */ f32 mAButtonHighlightAnimSpeed; - /* 0x494 */ JUtility::TColor mBButtonHighlightFrontInner; - /* 0x498 */ JUtility::TColor mBButtonHighlightFrontOuter; - /* 0x49C */ JUtility::TColor mBButtonHighlightBackInner; - /* 0x4A0 */ JUtility::TColor mBButtonHighlightBackOuter; - /* 0x4A4 */ f32 mBButtonHighlightAnimSpeed; + /* 0x430 */ JUtility::TColor mSpurIconPikariFrontInner; + /* 0x434 */ JUtility::TColor mSpurIconPikariFrontOuter; + /* 0x438 */ JUtility::TColor mSpurIconPikariBackInner; + /* 0x43C */ JUtility::TColor mSpurIconPikariBackOuter; + /* 0x440 */ f32 mSpurIconPikariAnimSpeed; + /* 0x444 */ JUtility::TColor mSpurIconRevivePikariFrontInner; + /* 0x448 */ JUtility::TColor mSpurIconRevivePikariFrontOuter; + /* 0x44C */ JUtility::TColor mSpurIconRevivePikariBackInner; + /* 0x450 */ JUtility::TColor mSpurIconRevivePikariBackOuter; + /* 0x454 */ f32 mSpurIconRevivePikariAnimSpeed; + /* 0x458 */ JUtility::TColor mButtonZPikariFrontInner; + /* 0x45C */ JUtility::TColor mButtonZPikariFrontOuter; + /* 0x460 */ JUtility::TColor mButtonZPikariBackInner; + /* 0x464 */ JUtility::TColor mButtonZPikariBackOuter; + /* 0x468 */ f32 mButtonZPikariAnimSpeed; + /* 0x46C */ JUtility::TColor mButtonXYPikariFrontInner; + /* 0x470 */ JUtility::TColor mButtonXYPikariFrontOuter; + /* 0x474 */ JUtility::TColor mButtonXYPikariBackInner; + /* 0x478 */ JUtility::TColor mButtonXYPikariBackOuter; + /* 0x47C */ f32 mButtonXYPikariAnimSpeed; + /* 0x480 */ JUtility::TColor mButtonAPikariFrontInner; + /* 0x484 */ JUtility::TColor mButtonAPikariFrontOuter; + /* 0x488 */ JUtility::TColor mButtonAPikariBackInner; + /* 0x48C */ JUtility::TColor mButtonAPikariBackOuter; + /* 0x490 */ f32 mButtonAPikariAnimSpeed; + /* 0x494 */ JUtility::TColor mButtonBPikariFrontInner; + /* 0x498 */ JUtility::TColor mButtonBPikariFrontOuter; + /* 0x49C */ JUtility::TColor mButtonBPikariBackInner; + /* 0x4A0 */ JUtility::TColor mButtonBPikariBackOuter; + /* 0x4A4 */ f32 mButtonBPikariAnimSpeed; /* 0x4A8 */ JUtility::TColor field_0x4a8; /* 0x4AC */ JUtility::TColor field_0x4ac; /* 0x4B0 */ JUtility::TColor field_0x4b0; @@ -892,11 +882,11 @@ public: /* 0x4D8 */ JUtility::TColor field_0x4d8; /* 0x4DC */ JUtility::TColor field_0x4dc; /* 0x4E0 */ f32 field_0x4e0; - /* 0x4E4 */ JUtility::TColor mMidnaIconHighlightFrontInner; - /* 0x4E8 */ JUtility::TColor mMidnaIconHighlightFrontOuter; - /* 0x4EC */ JUtility::TColor mMidnaIconHighlightBackInner; - /* 0x4F0 */ JUtility::TColor mMidnaIconHighlightBackOuter; - /* 0x4F4 */ f32 mMidnaIconHighlightAnimSpeed; + /* 0x4E4 */ JUtility::TColor mMidnaIconPikariFrontInner; + /* 0x4E8 */ JUtility::TColor mMidnaIconPikariFrontOuter; + /* 0x4EC */ JUtility::TColor mMidnaIconPikariBackInner; + /* 0x4F0 */ JUtility::TColor mMidnaIconPikariBackOuter; + /* 0x4F4 */ f32 mMidnaIconPikariAnimSpeed; /* 0x4F8 */ f32 mScrollArrowScaleX; /* 0x4FC */ f32 mScrollArrowScaleY; /* 0x500 */ f32 mScrollArrowBPKAnimSpeed; @@ -996,12 +986,12 @@ public: /* 0x054 */ f32 mGuidePosX[10]; /* 0x07C */ f32 mGuidePosY[10]; /* 0x0A4 */ f32 mGuideScale[10]; - /* 0x0CC */ f32 mHighlightScale; - /* 0x0D0 */ JUtility::TColor mHighlightFrontInner; - /* 0x0D4 */ JUtility::TColor mHighlightFrontOuter; - /* 0x0D8 */ JUtility::TColor mHighlightBackInner; - /* 0x0DC */ JUtility::TColor mHighlightBackOuter; - /* 0x0E0 */ f32 mHighlightAnimSpeed; + /* 0x0CC */ f32 mPikariScale; + /* 0x0D0 */ JUtility::TColor mPikariFrontInner; + /* 0x0D4 */ JUtility::TColor mPikariFrontOuter; + /* 0x0D8 */ JUtility::TColor mPikariBackInner; + /* 0x0DC */ JUtility::TColor mPikariBackOuter; + /* 0x0E0 */ f32 mPikariAnimSpeed; /* 0x0E4 */ f32 mSelectPosX; /* 0x0E8 */ f32 mSelectPosY; /* 0x0EC */ f32 mSelectScaleX; @@ -1270,24 +1260,24 @@ public: /* 0x118 */ f32 mDoIconPosX; /* 0x11C */ f32 mDoIconPosY; /* 0x120 */ f32 mDoIconScale; - /* 0x124 */ f32 mZButtonPosX; - /* 0x128 */ f32 mZButtonPosY; - /* 0x12C */ f32 mZButtonScale; - /* 0x130 */ f32 mAButtonPosX; - /* 0x134 */ f32 mAButtonPosY; - /* 0x138 */ f32 mAButtonScale; - /* 0x13C */ f32 mBButtonPosX; - /* 0x140 */ f32 mBButtonPosY; - /* 0x144 */ f32 mBButtonScale; - /* 0x148 */ f32 mZButtonTextPosX; - /* 0x14C */ f32 mZButtonTextPosY; - /* 0x150 */ f32 mZButtonTextScale; - /* 0x154 */ f32 mAButtonTextPosX; - /* 0x158 */ f32 mAButtonTextPosY; - /* 0x15C */ f32 mAButtonTextScale; - /* 0x160 */ f32 mBButtonTextPosX; - /* 0x164 */ f32 mBButtonTextPosY; - /* 0x168 */ f32 mBButtonTextScale; + /* 0x124 */ f32 mButtonZPosX; + /* 0x128 */ f32 mButtonZPosY; + /* 0x12C */ f32 mButtonZScale; + /* 0x130 */ f32 mButtonAPosX; + /* 0x134 */ f32 mButtonAPosY; + /* 0x138 */ f32 mButtonAScale; + /* 0x13C */ f32 mButtonBPosX; + /* 0x140 */ f32 mButtonBPosY; + /* 0x144 */ f32 mButtonBScale; + /* 0x148 */ f32 mButtonZTextPosX; + /* 0x14C */ f32 mButtonZTextPosY; + /* 0x150 */ f32 mButtonZTextScale; + /* 0x154 */ f32 mButtonATextPosX; + /* 0x158 */ f32 mButtonATextPosY; + /* 0x15C */ f32 mButtonATextScale; + /* 0x160 */ f32 mButtonBTextPosX; + /* 0x164 */ f32 mButtonBTextPosY; + /* 0x168 */ f32 mButtonBTextScale; /* 0x16C */ f32 mRegionImagePosX[8]; /* 0x18C */ f32 mRegionImagePosZ[8]; /* 0x1AC */ f32 mRegionImageScale[8]; diff --git a/include/d/pane/d_pane_class.h b/include/d/pane/d_pane_class.h index 8b8b06dc63..87fa3c194b 100644 --- a/include/d/pane/d_pane_class.h +++ b/include/d/pane/d_pane_class.h @@ -72,6 +72,12 @@ public: f32 getInitScaleX() { return mInitScale.x; } f32 getInitScaleY() { return mInitScale.y; } + f32 getScaleX() { return mPane->getScaleX(); } + f32 getScaleY() { return mPane->getScaleY(); } + + f32 getTranslateX() { return mPane->getTranslateX(); } + f32 getTranslateY() { return mPane->getTranslateY(); } + JUtility::TColor getInitBlack() { return mInitBlack; } JUtility::TColor getInitWhite() { return mInitWhite; } diff --git a/include/d/pane/d_pane_class_alpha.h b/include/d/pane/d_pane_class_alpha.h index 7eee29f379..e2f8a8d042 100644 --- a/include/d/pane/d_pane_class_alpha.h +++ b/include/d/pane/d_pane_class_alpha.h @@ -31,6 +31,7 @@ public: u8 getAlpha() { return getPanePtr()->getAlpha(); } s16 getAlphaTimer() { return mAlphaTimer; } void alphaAnimeStart(s16 start) { mAlphaTimer = start; } + u8 getInitAlpha() { return mInitAlpha; } /* 0x04 */ J2DPane* mPane; /* 0x08 */ JKRExpHeap* heap; diff --git a/obj_files.mk b/obj_files.mk index b70dfa94fa..24f8f5c20e 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -1055,4 +1055,5 @@ O_FILES_SYM_ON := \ $(BUILD_DIR)/libs/JSystem/JAudio2/JAUAudioArcLoader.o \ $(BUILD_DIR)/libs/Z2AudioLib/Z2AudioArcLoader.o \ $(BUILD_DIR)/src/d/bg/d_bg_s_grp_pass_chk.o \ + $(BUILD_DIR)/src/d/file/d_file_sel_info.o \ \ No newline at end of file diff --git a/src/d/file/d_file_sel_info.cpp b/src/d/file/d_file_sel_info.cpp index a10f442e75..d6dbfa10f1 100644 --- a/src/d/file/d_file_sel_info.cpp +++ b/src/d/file/d_file_sel_info.cpp @@ -1,164 +1,24 @@ -// -// Generated By: dol2asm -// Translation Unit: d/file/d_file_sel_info -// +/** + * d_file_sel_info.cpp + * File Select Screen File Info + */ #include "d/file/d_file_sel_info.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" -#include "stdio.h" #include "d/com/d_com_inf_game.h" #include "d/meter/d_meter2_info.h" #include "d/pane/d_pane_class.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void __ct__12dFile_info_cFP10JKRArchiveUc(); -extern "C" void __dt__12dFile_info_cFv(); -extern "C" void screenSet__12dFile_info_cFv(); -extern "C" void setSaveData__12dFile_info_cFP10dSv_save_ciUc(); -extern "C" void setHeartCnt__12dFile_info_cFP10dSv_save_c(); -extern "C" void setSaveDate__12dFile_info_cFP10dSv_save_c(); -extern "C" void setPlayTime__12dFile_info_cFP10dSv_save_c(); -extern "C" void modeWait__12dFile_info_cFv(); -extern "C" void modeMove__12dFile_info_cFv(); -extern "C" void _draw__12dFile_info_cFv(); -extern "C" void draw__16dDlst_FileInfo_cFv(); -extern "C" void __sinit_d_file_sel_info_cpp(); -extern "C" void __dt__16dDlst_FileInfo_cFv(); -extern "C" extern char const* const d_file_d_file_sel_info__stringBase0; - -// -// External References: -// - -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void mDoExt_removeMesgFont__Fv(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(); -extern "C" void __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap(); -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 getStringPtr__10J2DTextBoxCFv(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" void __div2i(); -extern "C" void __mod2i(); -extern "C" extern void* __vt__12dDlst_base_c[3]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803948B8 = "zelda_file_select_info_text.blo"; -SECTION_DEAD static char const* const stringBase_803948D8 = ""; -SECTION_DEAD static char const* const stringBase_803948D9 = "tt_heart_00.bti"; -#pragma pop +#include "stdio.h" /* 803BB498-803BB4A8 0185B8 000C+04 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 803BB4A8-803BB548 0185C8 00A0+00 1/1 0/0 0/0 .data l_htag$3879 */ -SECTION_DATA static u64 l_htag[20] = { - 'hear_20', 'hear_21', 'hear_22', 'hear_23', 'hear_24', 'hear_25', 'hear_26', - 'hear_27', 'hear_28', 'hear_29', 'hear_30', 'hear_31', 'hear_32', 'hear_33', - 'hear_34', 'hear_35', 'hear_36', 'hear_37', 'hear_38', 'hear_39', -}; - -/* 803BB548-803BB558 -00001 0010+00 1/1 0/0 0/0 .data amariheartTex$3880 */ -SECTION_DATA static const char* amariheartTex[4] = { - "tt_heart_00.bti", - "tt_heart_00.bti", - "tt_heart_00.bti", - "tt_heart_00.bti", -}; - -/* 803BB558-803BB564 -00001 000C+00 0/1 0/0 0/0 .data @3953 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3953[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__12dFile_info_cFv, -}; -#pragma pop - -/* 803BB564-803BB570 -00001 000C+00 0/1 0/0 0/0 .data @3954 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3954[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeMove__12dFile_info_cFv, -}; -#pragma pop - -/* 803BB570-803BB588 018690 0018+00 0/1 0/0 0/0 .data fileWarningProc */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 fileWarningProc[24] = { +static u8 cNullVec__6Z2Calc[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803BB588-803BB598 0186A8 0010+00 3/3 0/0 0/0 .data __vt__16dDlst_FileInfo_c */ -SECTION_DATA extern void* __vt__16dDlst_FileInfo_c[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__16dDlst_FileInfo_cFv, - (void*)__dt__16dDlst_FileInfo_cFv, -}; - -/* 803BB598-803BB5B0 0186B8 000C+0C 2/2 0/0 0/0 .data __vt__12dFile_info_c */ -SECTION_DATA extern void* __vt__12dFile_info_c[3 + 3 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dFile_info_cFv, - /* padding */ - NULL, - NULL, - NULL, }; /* 80192434-801924A0 18CD74 006C+00 0/0 3/3 0/0 .text __ct__12dFile_info_cFP10JKRArchiveUc */ -dFile_info_c::dFile_info_c(JKRArchive* arc, u8 param_1) { - mArchive = arc; +dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { + mArchive = i_archive; field_0x22 = param_1; mFileInfo.mBasePane = NULL; screenSet(); @@ -166,7 +26,6 @@ dFile_info_c::dFile_info_c(JKRArchive* arc, u8 param_1) { } /* 801924A0-80192570 18CDE0 00D0+00 1/0 0/0 0/0 .text __dt__12dFile_info_cFv */ -#ifdef NONMATCHING dFile_info_c::~dFile_info_c() { delete mFileInfo.Scr; delete mDatBase; @@ -174,21 +33,12 @@ dFile_info_c::~dFile_info_c() { mDoExt_removeMesgFont(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dFile_info_c::~dFile_info_c() { -extern "C" asm void __dt__12dFile_info_cFv() { - nofralloc -#include "asm/d/file/d_file_sel_info/__dt__12dFile_info_cFv.s" -} -#pragma pop -#endif /* 80192570-80192954 18CEB0 03E4+00 1/1 0/0 0/0 .text screenSet__12dFile_info_cFv */ void dFile_info_c::screenSet() { mFileInfo.Scr = new J2DScreen(); + JUT_ASSERT(mFileInfo.Scr != 0); + mFileInfo.Scr->setPriority("zelda_file_select_info_text.blo", 0x1100000, mArchive); mFileInfo.mFont = mDoExt_getMesgFont(); mFileInfo.Scr->search('w_cp_ef1')->hide(); @@ -196,47 +46,47 @@ void dFile_info_c::screenSet() { mDatBase = new CPaneMgrAlpha(mFileInfo.Scr, 'w_dat_i1', 2, NULL); mNoDatBase = new CPaneMgrAlpha(mFileInfo.Scr, 'w_nda_i1', 2, NULL); - J2DTextBox* tboxs[4]; - tboxs[0] = (J2DTextBox*)mFileInfo.Scr->search('f_s_t_02'); - tboxs[1] = (J2DTextBox*)mFileInfo.Scr->search('f_p_t_02'); + J2DTextBox* info_text[4]; + info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_s_t_02'); + info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_p_t_02'); mFileInfo.Scr->search('w_s_t_01')->hide(); mFileInfo.Scr->search('w_p_t_01')->hide(); for (int i = 0; i < 2; i++) { - tboxs[i]->setFont(mFileInfo.mFont); - tboxs[i]->setString(0x20, ""); + info_text[i]->setFont(mFileInfo.mFont); + info_text[i]->setString(0x20, ""); } - dMeter2Info_getString(0x3D0, tboxs[0]->getStringPtr(), NULL); // Save time - dMeter2Info_getString(0x3D1, tboxs[1]->getStringPtr(), NULL); // Total play time + dMeter2Info_getString(0x3D0, info_text[0]->getStringPtr(), NULL); // Save time + dMeter2Info_getString(0x3D1, info_text[1]->getStringPtr(), NULL); // Total play time - tboxs[0] = (J2DTextBox*)mFileInfo.Scr->search('f_name01'); - tboxs[1] = (J2DTextBox*)mFileInfo.Scr->search('f_new_1'); + info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_name01'); + info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_new_1'); mFileInfo.Scr->search('w_name01')->hide(); mFileInfo.Scr->search('w_new_1')->hide(); - tboxs[2] = (J2DTextBox*)mFileInfo.Scr->search('w_time01'); - tboxs[3] = (J2DTextBox*)mFileInfo.Scr->search('w_ptim01'); + info_text[2] = (J2DTextBox*)mFileInfo.Scr->search('w_time01'); + info_text[3] = (J2DTextBox*)mFileInfo.Scr->search('w_ptim01'); for (int i = 0; i < 4; i++) { - tboxs[i]->setFont(mFileInfo.mFont); - tboxs[i]->setString(0x40, ""); + info_text[i]->setFont(mFileInfo.mFont); + info_text[i]->setString(0x40, ""); } - mPlayerName = tboxs[0]->getStringPtr(); - mSaveStatus = tboxs[1]->getStringPtr(); - mSaveDate = tboxs[2]->getStringPtr(); - mPlayTime = tboxs[3]->getStringPtr(); + mPlayerName = info_text[0]->getStringPtr(); + mSaveStatus = info_text[1]->getStringPtr(); + mSaveDate = info_text[2]->getStringPtr(); + mPlayTime = info_text[3]->getStringPtr(); } /* 80192954-80192AA0 18D294 014C+00 0/0 3/3 0/0 .text setSaveData__12dFile_info_cFP10dSv_save_ciUc */ -int dFile_info_c::setSaveData(dSv_save_c* save, int checksumValid, u8 data_num) { - if (checksumValid) { - char* player_name = save->getPlayer().getPlayerInfo().getLinkName(); - if (*player_name == NULL) { - if (field_0x22 == 1 && data_num == dComIfGs_getDataNum()) { - save->getPlayer().getPlayerStatusA().setLife(i_dComIfGs_getLife()); - setHeartCnt(save); - save->getPlayer().getPlayerStatusA().setLife(12); +int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_dataNo) { + if (i_validChksum) { + char* player_name = i_savedata->getPlayer().getPlayerInfo().getLinkName(); + if (*player_name == 0) { + if (field_0x22 == 1 && i_dataNo == dComIfGs_getDataNum()) { + i_savedata->getPlayer().getPlayerStatusA().setLife(i_dComIfGs_getLife()); + setHeartCnt(i_savedata); + i_savedata->getPlayer().getPlayerStatusA().setLife(12); strcpy(mPlayerName, dComIfGs_getPlayerName()); strcpy(mSaveDate, ""); strcpy(mPlayTime, ""); @@ -247,10 +97,10 @@ int dFile_info_c::setSaveData(dSv_save_c* save, int checksumValid, u8 data_num) return 1; } } else { - setHeartCnt(save); + setHeartCnt(i_savedata); strcpy(mPlayerName, player_name); - setSaveDate(save); - setPlayTime(save); + setSaveDate(i_savedata); + setPlayTime(i_savedata); return 0; } } else { @@ -260,46 +110,63 @@ int dFile_info_c::setSaveData(dSv_save_c* save, int checksumValid, u8 data_num) } /* 80192AA0-80192C08 18D3E0 0168+00 1/1 0/0 0/0 .text setHeartCnt__12dFile_info_cFP10dSv_save_c */ -void dFile_info_c::setHeartCnt(dSv_save_c* save) { - u16 life = save->getPlayer().getPlayerStatusA().getLife(); - s32 count = (life & 0xffff) / 5; +void dFile_info_c::setHeartCnt(dSv_save_c* i_savedata) { + static u64 l_htag[] = { + 'hear_20', 'hear_21', 'hear_22', 'hear_23', 'hear_24', 'hear_25', 'hear_26', + 'hear_27', 'hear_28', 'hear_29', 'hear_30', 'hear_31', 'hear_32', 'hear_33', + 'hear_34', 'hear_35', 'hear_36', 'hear_37', 'hear_38', 'hear_39', + }; + + static const char* amariheartTex[] = { + "tt_heart_00.bti", + "tt_heart_00.bti", + "tt_heart_00.bti", + "tt_heart_00.bti", + }; + + u16 life = i_savedata->getPlayer().getPlayerStatusA().getLife(); + s32 count = (life & 0xFFFF) / 5; s32 quarter_count = life % 5; if (quarter_count != 0) { count++; } - J2DPicture* heartP[20]; + J2DPicture* heart_tex[20]; for (int i = 0; i < 20; i++) { - heartP[i] = (J2DPicture*)mFileInfo.Scr->search(l_htag[i]); + heart_tex[i] = (J2DPicture*)mFileInfo.Scr->search(l_htag[i]); - if (i < save->getPlayer().getPlayerStatusA().getMaxLife() / 5) { - heartP[i]->show(); + if (i < i_savedata->getPlayer().getPlayerStatusA().getMaxLife() / 5) { + heart_tex[i]->show(); if (i < count) { if (quarter_count != 0 && i == count - 1) { - heartP[i]->changeTexture(amariheartTex[quarter_count - 1], 0); + heart_tex[i]->changeTexture(amariheartTex[quarter_count - 1], 0); } else { - heartP[i]->changeTexture("tt_heart_00.bti", 0); + heart_tex[i]->changeTexture("tt_heart_00.bti", 0); } } else { - heartP[i]->changeTexture("tt_heart_00.bti", 0); + heart_tex[i]->changeTexture("tt_heart_00.bti", 0); } } else { - heartP[i]->hide(); + heart_tex[i]->hide(); } } } +/* 803BB570-803BB588 018690 0018+00 0/1 0/0 0/0 .data fileWarningProc */ +typedef void (dFile_info_c::*procFunc)(); +procFunc fileWarningProc[] = {&dFile_info_c::modeWait, &dFile_info_c::modeMove}; + /* 80192C08-80192C70 18D548 0068+00 1/1 0/0 0/0 .text setSaveDate__12dFile_info_cFP10dSv_save_c */ -void dFile_info_c::setSaveDate(dSv_save_c* save) { +void dFile_info_c::setSaveDate(dSv_save_c* i_savedata) { OSCalendarTime time; - OSTicksToCalendarTime(save->getPlayer().getPlayerStatusB().getDateIpl(), &time); + OSTicksToCalendarTime(i_savedata->getPlayer().getPlayerStatusB().getDateIpl(), &time); sprintf(mSaveDate, "%02d/%02d/%d %02d:%02d", time.month + 1, time.day_of_month, time.year, time.hours, time.minutes); } /* 80192C70-80192D58 18D5B0 00E8+00 1/1 0/0 0/0 .text setPlayTime__12dFile_info_cFP10dSv_save_c */ -void dFile_info_c::setPlayTime(dSv_save_c* save) { - s64 time = save->getPlayer().getPlayerInfo().getTotalTime() / (OS_BUS_CLOCK / 4); +void dFile_info_c::setPlayTime(dSv_save_c* i_savedata) { + s64 time = i_savedata->getPlayer().getPlayerInfo().getTotalTime() / (OS_BUS_CLOCK / 4); // 3599940 = 999:59 in seconds if (time >= 3599940) { @@ -312,85 +179,30 @@ void dFile_info_c::setPlayTime(dSv_save_c* save) { } /* 80192D58-80192D5C 18D698 0004+00 1/0 0/0 0/0 .text modeWait__12dFile_info_cFv */ -void dFile_info_c::modeWait() { - /* empty function */ -} +void dFile_info_c::modeWait() {} /* 80192D5C-80192D60 18D69C 0004+00 1/0 0/0 0/0 .text modeMove__12dFile_info_cFv */ -void dFile_info_c::modeMove() { - /* empty function */ -} +void dFile_info_c::modeMove() {} /* 80192D60-80192D9C 18D6A0 003C+00 0/0 2/2 0/0 .text _draw__12dFile_info_cFv */ void dFile_info_c::_draw() { dComIfGd_set2DOpa(&mFileInfo); } -/* ############################################################################################## */ -/* 804539F8-804539FC 001FF8 0004+00 1/1 0/0 0/0 .sdata2 @4000 */ -SECTION_SDATA2 static f32 lit_4000 = 1.0f; - -/* 804539FC-80453A00 001FFC 0004+00 1/1 0/0 0/0 .sdata2 @4001 */ -SECTION_SDATA2 static u8 lit_4001[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 80192D9C-80192E88 18D6DC 00EC+00 1/0 0/0 0/0 .text draw__16dDlst_FileInfo_cFv */ -// vtable order issue -#ifdef NONMATCHING void dDlst_FileInfo_c::draw() { Mtx m; - J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort(); + J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort(); if (mBasePane != NULL) { - MtxP glbMtx2 = mBasePane->getGlbMtx(); - // Fake match - MtxP glbMtx = (MtxP)&glbMtx2[0][0]; + // fake match? + MtxP glb_mtx = (MtxP)&mBasePane->getGlbMtx()[0][0]; + MTXScale(m, mBasePane->getWidth() / field_0x10->getWidth(), - mBasePane->getHeight() / field_0x10->getHeight(), 1.0f); - MTXConcat(glbMtx, m, glbMtx); - Scr->search('Nm_02')->setMtx(glbMtx); + mBasePane->getHeight() / field_0x10->getHeight(), 1.0f); + MTXConcat(glb_mtx, m, glb_mtx); + Scr->search('Nm_02')->setMtx(glb_mtx); } - Scr->draw(0.0f, 0.0f, ctx); -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm void dDlst_FileInfo_c::draw() { -extern "C" asm void draw__16dDlst_FileInfo_cFv() { - nofralloc -#include "asm/d/file/d_file_sel_info/draw__16dDlst_FileInfo_cFv.s" -} -#pragma pop -#endif -/* 80192E88-80192EC8 18D7C8 0040+00 0/0 1/0 0/0 .text __sinit_d_file_sel_info_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_file_sel_info_cpp() { - nofralloc -#include "asm/d/file/d_file_sel_info/__sinit_d_file_sel_info_cpp.s" + Scr->draw(0.0f, 0.0f, graf_ctx); } -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80192E88, __sinit_d_file_sel_info_cpp); -#pragma pop - -/* 80192EC8-80192F10 18D808 0048+00 1/0 0/0 0/0 .text __dt__16dDlst_FileInfo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDlst_FileInfo_c::~dDlst_FileInfo_c() { - nofralloc -#include "asm/d/file/d_file_sel_info/__dt__16dDlst_FileInfo_cFv.s" -} -#pragma pop - -/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_calibration.cpp b/src/d/menu/d_menu_calibration.cpp index f32a093fc9..cd469b5fb2 100644 --- a/src/d/menu/d_menu_calibration.cpp +++ b/src/d/menu/d_menu_calibration.cpp @@ -316,31 +316,31 @@ void dMenu_Calibration_c::setHIO(bool i_useHIO) { if (g_drawHIO.mCollectScreen.mButtonDebugON || i_useHIO) { if (field_0x94 != NULL) { - field_0x94->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX, - g_drawHIO.mCollectScreen.mAButtonPosY); - field_0x94->scale(g_drawHIO.mCollectScreen.mAButtonScale, - g_drawHIO.mCollectScreen.mAButtonScale); + field_0x94->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX, + g_drawHIO.mCollectScreen.mButtonAPosY); + field_0x94->scale(g_drawHIO.mCollectScreen.mButtonAScale, + g_drawHIO.mCollectScreen.mButtonAScale); } if (field_0x98 != NULL) { - field_0x98->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX, - g_drawHIO.mCollectScreen.mBButtonPosY); - field_0x98->scale(g_drawHIO.mCollectScreen.mBButtonScale, - g_drawHIO.mCollectScreen.mBButtonScale); + field_0x98->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX, + g_drawHIO.mCollectScreen.mButtonBPosY); + field_0x98->scale(g_drawHIO.mCollectScreen.mButtonBScale, + g_drawHIO.mCollectScreen.mButtonBScale); } if (field_0x9c != NULL) { - field_0x9c->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX, - g_drawHIO.mCollectScreen.mAButtonTextPosY); - field_0x9c->scale(g_drawHIO.mCollectScreen.mAButtonTextScale, - g_drawHIO.mCollectScreen.mAButtonTextScale); + field_0x9c->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX, + g_drawHIO.mCollectScreen.mButtonATextPosY); + field_0x9c->scale(g_drawHIO.mCollectScreen.mButtonATextScale, + g_drawHIO.mCollectScreen.mButtonATextScale); } if (field_0xa0 != NULL) { - field_0xa0->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX, - g_drawHIO.mCollectScreen.mBButtonTextPosY); - field_0xa0->scale(g_drawHIO.mCollectScreen.mBButtonTextScale, - g_drawHIO.mCollectScreen.mBButtonTextScale); + field_0xa0->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX, + g_drawHIO.mCollectScreen.mButtonBTextPosY); + field_0xa0->scale(g_drawHIO.mCollectScreen.mButtonBTextScale, + g_drawHIO.mCollectScreen.mButtonBTextScale); } } } diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index aca4b506b5..e349c882c3 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -2344,28 +2344,28 @@ void dMenu_Collect2D_c::setHIO(bool i_useHIO) { if (g_drawHIO.mCollectScreen.mButtonDebugON || i_useHIO) { if (mpButtonAB[0] != NULL) { - mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX, - g_drawHIO.mCollectScreen.mAButtonPosY); - mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mAButtonScale, - g_drawHIO.mCollectScreen.mAButtonScale); + mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX, + g_drawHIO.mCollectScreen.mButtonAPosY); + mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mButtonAScale, + g_drawHIO.mCollectScreen.mButtonAScale); } if (mpButtonAB[1] != NULL) { - mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX, - g_drawHIO.mCollectScreen.mBButtonPosY); - mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mBButtonScale, - g_drawHIO.mCollectScreen.mBButtonScale); + mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX, + g_drawHIO.mCollectScreen.mButtonBPosY); + mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mButtonBScale, + g_drawHIO.mCollectScreen.mButtonBScale); } if (mpButtonText[0] != NULL) { - mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX, - g_drawHIO.mCollectScreen.mAButtonTextPosY); - mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mAButtonTextScale, - g_drawHIO.mCollectScreen.mAButtonTextScale); + mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX, + g_drawHIO.mCollectScreen.mButtonATextPosY); + mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mButtonATextScale, + g_drawHIO.mCollectScreen.mButtonATextScale); } if (mpButtonText[1] != NULL) { - mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX, - g_drawHIO.mCollectScreen.mBButtonTextPosY); - mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale, - g_drawHIO.mCollectScreen.mBButtonTextScale); + mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX, + g_drawHIO.mCollectScreen.mButtonBTextPosY); + mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mButtonBTextScale, + g_drawHIO.mCollectScreen.mButtonBTextScale); } } } diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp index 777af5ce77..c33e749198 100644 --- a/src/d/menu/d_menu_fishing.cpp +++ b/src/d/menu/d_menu_fishing.cpp @@ -624,28 +624,28 @@ void dMenu_Fishing_c::setHIO(bool param_0) { } if (g_drawHIO.mCollectScreen.mButtonDebugON != false || param_0) { if (mpButtonAB[0] != NULL) { - mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX, - g_drawHIO.mCollectScreen.mAButtonPosY); - mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mAButtonScale, - g_drawHIO.mCollectScreen.mAButtonScale); + mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX, + g_drawHIO.mCollectScreen.mButtonAPosY); + mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mButtonAScale, + g_drawHIO.mCollectScreen.mButtonAScale); } if (mpButtonAB[1] != NULL) { - mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX, - g_drawHIO.mCollectScreen.mBButtonPosY); - mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mBButtonScale, - g_drawHIO.mCollectScreen.mBButtonScale); + mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX, + g_drawHIO.mCollectScreen.mButtonBPosY); + mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mButtonBScale, + g_drawHIO.mCollectScreen.mButtonBScale); } if (mpButtonText[0] != NULL) { - mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX, - g_drawHIO.mCollectScreen.mAButtonTextPosY); - mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mAButtonTextScale, - g_drawHIO.mCollectScreen.mAButtonTextScale); + mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX, + g_drawHIO.mCollectScreen.mButtonATextPosY); + mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mButtonATextScale, + g_drawHIO.mCollectScreen.mButtonATextScale); } if (mpButtonText[1] != NULL) { - mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX, - g_drawHIO.mCollectScreen.mBButtonTextPosY); - mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale, - g_drawHIO.mCollectScreen.mBButtonTextScale); + mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX, + g_drawHIO.mCollectScreen.mButtonBTextPosY); + mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mButtonBTextScale, + g_drawHIO.mCollectScreen.mButtonBTextScale); } } } diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index a95bcddafb..4bc23043bc 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -897,28 +897,28 @@ void dMenu_Insect_c::setHIO(bool i_useHIO) { } if (g_drawHIO.mCollectScreen.mButtonDebugON != false || i_useHIO) { if (mpButtonAB[0]) { - mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX, - g_drawHIO.mCollectScreen.mAButtonPosY); - mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mAButtonScale, - g_drawHIO.mCollectScreen.mAButtonScale); + mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX, + g_drawHIO.mCollectScreen.mButtonAPosY); + mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mButtonAScale, + g_drawHIO.mCollectScreen.mButtonAScale); } if (mpButtonAB[1]) { - mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX, - g_drawHIO.mCollectScreen.mBButtonPosY); - mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mBButtonScale, - g_drawHIO.mCollectScreen.mBButtonScale); + mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX, + g_drawHIO.mCollectScreen.mButtonBPosY); + mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mButtonBScale, + g_drawHIO.mCollectScreen.mButtonBScale); } if (mpButtonText[0]) { - mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX, - g_drawHIO.mCollectScreen.mAButtonTextPosY); - mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mAButtonTextScale, - g_drawHIO.mCollectScreen.mAButtonTextScale); + mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX, + g_drawHIO.mCollectScreen.mButtonATextPosY); + mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mButtonATextScale, + g_drawHIO.mCollectScreen.mButtonATextScale); } if (mpButtonText[1]) { - mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX, - g_drawHIO.mCollectScreen.mBButtonTextPosY); - mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale, - g_drawHIO.mCollectScreen.mBButtonTextScale); + mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX, + g_drawHIO.mCollectScreen.mButtonBTextPosY); + mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mButtonBTextScale, + g_drawHIO.mCollectScreen.mButtonBTextScale); } } } diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp index a6fc42ab08..d97e751e7e 100644 --- a/src/d/menu/d_menu_option.cpp +++ b/src/d/menu/d_menu_option.cpp @@ -3024,27 +3024,27 @@ void dMenu_Option_c::setHIO(bool i_useHIO) { } if (g_drawHIO.mCollectScreen.mButtonDebugON != false || i_useHIO) { if (mpButtonAB[0] != NULL) { - mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX, - g_drawHIO.mCollectScreen.mAButtonPosY); - f32 AButtonScale = g_drawHIO.mCollectScreen.mAButtonScale; + mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX, + g_drawHIO.mCollectScreen.mButtonAPosY); + f32 AButtonScale = g_drawHIO.mCollectScreen.mButtonAScale; mpButtonAB[0]->scale(AButtonScale, AButtonScale); } if (mpButtonAB[1] != NULL) { - mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX, - g_drawHIO.mCollectScreen.mBButtonPosY); - f32 BButtonScale = g_drawHIO.mCollectScreen.mBButtonScale; + mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX, + g_drawHIO.mCollectScreen.mButtonBPosY); + f32 BButtonScale = g_drawHIO.mCollectScreen.mButtonBScale; mpButtonAB[1]->scale(BButtonScale, BButtonScale); } if (mpButtonText[0] != NULL) { - mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX, - g_drawHIO.mCollectScreen.mAButtonTextPosY); - f32 AButtonTextScale = g_drawHIO.mCollectScreen.mAButtonTextScale; + mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX, + g_drawHIO.mCollectScreen.mButtonATextPosY); + f32 AButtonTextScale = g_drawHIO.mCollectScreen.mButtonATextScale; mpButtonText[0]->scale(AButtonTextScale, AButtonTextScale); } if (mpButtonText[1] != NULL) { - mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX, - g_drawHIO.mCollectScreen.mBButtonTextPosY); - f32 BButtonTextScale = g_drawHIO.mCollectScreen.mBButtonTextScale; + mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX, + g_drawHIO.mCollectScreen.mButtonBTextPosY); + f32 BButtonTextScale = g_drawHIO.mCollectScreen.mButtonBTextScale; mpButtonText[1]->scale(BButtonTextScale, BButtonTextScale); } } diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index 7aac5dd8aa..756415815e 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -777,28 +777,28 @@ void dMenu_Skill_c::setHIO(bool i_useHIO) { } if (g_drawHIO.mCollectScreen.mButtonDebugON != false || i_useHIO) { if (mpButtonAB[0]) { - mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX, - g_drawHIO.mCollectScreen.mAButtonPosY); - mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mAButtonScale, - g_drawHIO.mCollectScreen.mAButtonScale); + mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX, + g_drawHIO.mCollectScreen.mButtonAPosY); + mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mButtonAScale, + g_drawHIO.mCollectScreen.mButtonAScale); } if (mpButtonAB[1]) { - mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX, - g_drawHIO.mCollectScreen.mBButtonPosY); - mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mBButtonScale, - g_drawHIO.mCollectScreen.mBButtonScale); + mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX, + g_drawHIO.mCollectScreen.mButtonBPosY); + mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mButtonBScale, + g_drawHIO.mCollectScreen.mButtonBScale); } if (mpButtonText[0]) { - mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX, - g_drawHIO.mCollectScreen.mAButtonTextPosY); - mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mAButtonTextScale, - g_drawHIO.mCollectScreen.mAButtonTextScale); + mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX, + g_drawHIO.mCollectScreen.mButtonATextPosY); + mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mButtonATextScale, + g_drawHIO.mCollectScreen.mButtonATextScale); } if (mpButtonText[1]) { - mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX, - g_drawHIO.mCollectScreen.mBButtonTextPosY); - mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale, - g_drawHIO.mCollectScreen.mBButtonTextScale); + mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX, + g_drawHIO.mCollectScreen.mButtonBTextPosY); + mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mButtonBTextScale, + g_drawHIO.mCollectScreen.mButtonBTextScale); } } } diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp index 88ada9d964..c07d5da2f9 100644 --- a/src/d/meter/d_meter2.cpp +++ b/src/d/meter/d_meter2.cpp @@ -181,15 +181,15 @@ extern "C" void drawButtonBin__13dMeter2Draw_cFUc(); extern "C" void drawButtonXY__13dMeter2Draw_cFiUcUcbb(); extern "C" void getButtonCrossParentInitTransY__13dMeter2Draw_cFv(); extern "C" void drawButtonCross__13dMeter2Draw_cFff(); -extern "C" void setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonChange__13dMeter2Draw_cFb(); -extern "C" void setAlphaButtonAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonAnimeMax__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonAAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonAAnimeMax__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonBAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonBAnimeMax__13dMeter2Draw_cFv(); +extern "C" void setAlphButtonACrossAnimeMin__13dMeter2Draw_cFv(); +extern "C" void setAlphButtonACrossAnimeMax__13dMeter2Draw_cFv(); +extern "C" void setAlphButtonAChange__13dMeter2Draw_cFb(); +extern "C" void setAlphButtonAAnimeMin__13dMeter2Draw_cFv(); +extern "C" void setAlphButtonAAnimeMax__13dMeter2Draw_cFv(); +extern "C" void setAlphButtonAAAnimeMin__13dMeter2Draw_cFv(); +extern "C" void setAlphButtonAAAnimeMax__13dMeter2Draw_cFv(); +extern "C" void setAlphButtonABAnimeMin__13dMeter2Draw_cFv(); +extern "C" void setAlphButtonABAnimeMax__13dMeter2Draw_cFv(); extern "C" void setButtonIconAAlpha__13dMeter2Draw_cFUcUlb(); extern "C" void setButtonIconBAlpha__13dMeter2Draw_cFUcUlb(); extern "C" void setButtonIconMidonaAlpha__13dMeter2Draw_cFUl(); @@ -202,7 +202,7 @@ extern "C" void isButtonVisible__13dMeter2Draw_cFv(); extern "C" void getCameraSubject__13dMeter2Draw_cFv(); extern "C" void getItemSubject__13dMeter2Draw_cFv(); extern "C" void getPlayerSubject__13dMeter2Draw_cFv(); -extern "C" void isBButtonShow__13dMeter2Draw_cFb(); +extern "C" void isButtonBShow__13dMeter2Draw_cFb(); extern "C" void getButtonTimer__13dMeter2Draw_cFv(); extern "C" void isFloatingMessageVisible__13dMeter2Info_cFv(); extern "C" void isDirectUseItem__13dMeter2Info_cFi(); @@ -329,8 +329,8 @@ int dMeter2_c::_create() { mDoSetFlag = dComIfGp_isDoSetFlag(2); for (int i = 0; i < 2; i++) { - mAButtonTalkPosX[i] = 0.0f; - mAButtonTalkPosY[i] = 0.0f; + mButtonATalkPosX[i] = 0.0f; + mButtonATalkPosY[i] = 0.0f; } field_0x144 = 1.0f; @@ -868,18 +868,18 @@ void dMeter2_c::moveLife() { draw_life = true; } - if (mLifeGaugeScale != g_drawHIO.mLifeGaugeScale) { - mLifeGaugeScale = g_drawHIO.mLifeGaugeScale; + if (mLifeGaugeScale != g_drawHIO.mLifeParentScale) { + mLifeGaugeScale = g_drawHIO.mLifeParentScale; draw_life = true; } - if (mHeartScale != g_drawHIO.mHeartScale) { - mHeartScale = g_drawHIO.mHeartScale; + if (mHeartScale != g_drawHIO.mHeartMarkScale) { + mHeartScale = g_drawHIO.mHeartMarkScale; draw_life = true; } - if (mLargeHeartScale != g_drawHIO.mLargeHeartScale) { - mLargeHeartScale = g_drawHIO.mLargeHeartScale; + if (mLargeHeartScale != g_drawHIO.mBigHeartScale) { + mLargeHeartScale = g_drawHIO.mBigHeartScale; draw_life = true; } @@ -1182,12 +1182,12 @@ void dMeter2_c::moveLightDrop() { pos_x = g_drawHIO.mLightDrop.mVesselTalkPosX; pos_y = g_drawHIO.mLightDrop.mVesselTalkPosY; scale = g_drawHIO.mLightDrop.mVesselTalkScale; - alpha = g_drawHIO.mLightDrop.mVesselTalkAlpha; + alpha = g_drawHIO.mLightDrop.mVesselAlpha[1]; } else { pos_x = g_drawHIO.mLightDrop.mVesselPosX; pos_y = g_drawHIO.mLightDrop.mVesselPosY; scale = g_drawHIO.mLightDrop.mVesselScale; - alpha = g_drawHIO.mLightDrop.mVesselAlpha; + alpha = g_drawHIO.mLightDrop.mVesselAlpha[0]; } if (mVesselPosX != pos_x) { @@ -1504,84 +1504,84 @@ void dMeter2_c::moveButtonA() { field_0x1fd = 0; } - if (mAButtonScale != g_drawHIO.mAButtonScale) { - mAButtonScale = g_drawHIO.mAButtonScale; + if (mButtonAScale != g_drawHIO.mButtonAScale) { + mButtonAScale = g_drawHIO.mButtonAScale; draw_buttonA = true; } for (int i = 0; i < 2; i++) { - if (mAButtonTalkScale[i] != g_drawHIO.mAButtonTalkScale[i]) { - mAButtonTalkScale[i] = g_drawHIO.mAButtonTalkScale[i]; + if (mButtonATalkScale[i] != g_drawHIO.mButtonATalkScale[i]) { + mButtonATalkScale[i] = g_drawHIO.mButtonATalkScale[i]; draw_buttonA = true; } } - if (mAButtonPosX != g_drawHIO.mAButtonPosX) { - mAButtonPosX = g_drawHIO.mAButtonPosX; + if (mButtonAPosX != g_drawHIO.mButtonAPosX) { + mButtonAPosX = g_drawHIO.mButtonAPosX; draw_buttonA = true; } - if (mAButtonPosY != g_drawHIO.mAButtonPosY) { - mAButtonPosY = g_drawHIO.mAButtonPosY; + if (mButtonAPosY != g_drawHIO.mButtonAPosY) { + mButtonAPosY = g_drawHIO.mButtonAPosY; draw_buttonA = true; } - if (mAButtonFontScale != g_drawHIO.mAButtonFontScale) { - mAButtonFontScale = g_drawHIO.mAButtonFontScale; + if (mButtonATextScale != g_drawHIO.mButtonATextScale) { + mButtonATextScale = g_drawHIO.mButtonATextScale; draw_buttonA = true; } - if (mAButtonFontPosX != g_drawHIO.mAButtonFontPosX) { - mAButtonFontPosX = g_drawHIO.mAButtonFontPosX; + if (mButtonATextPosX != g_drawHIO.mButtonATextPosX) { + mButtonATextPosX = g_drawHIO.mButtonATextPosX; draw_buttonA = true; } - if (mAButtonFontPosY != g_drawHIO.mAButtonFontPosY) { - mAButtonFontPosY = g_drawHIO.mAButtonFontPosY; + if (mButtonATextPosY != g_drawHIO.mButtonATextPosY) { + mButtonATextPosY = g_drawHIO.mButtonATextPosY; draw_buttonA = true; } if (isShowLightDrop()) { - pos_x[0] = g_drawHIO.mAButtonVesselPosX; - pos_y[0] = g_drawHIO.mAButtonVesselPosY; + pos_x[0] = g_drawHIO.mButtonAVesselPosX; + pos_y[0] = g_drawHIO.mButtonAVesselPosY; pos_x[1] = 0.0f; pos_y[1] = 0.0f; var_f31 = 1.0f; } else if (isShowFlag(0)) { if (isShowFlag(1)) { for (int i = 0; i < 2; i++) { - pos_x[i] = g_drawHIO.mAButtonTalkPosX[i]; - pos_y[i] = g_drawHIO.mAButtonTalkPosY[i]; + pos_x[i] = g_drawHIO.mButtonATalkPosX[i]; + pos_y[i] = g_drawHIO.mButtonATalkPosY[i]; } } else { for (int i = 0; i < 2; i++) { - pos_x[i] = g_drawHIO.mAButtonTalkAPosX[i]; - pos_y[i] = g_drawHIO.mAButtonTalkAPosY[i]; + pos_x[i] = g_drawHIO.mButtonATalkAPosX[i]; + pos_y[i] = g_drawHIO.mButtonATalkAPosY[i]; } } var_f31 = 1.0f; } else { - pos_x[0] = g_drawHIO.mAButtonPosX; - pos_y[0] = g_drawHIO.mAButtonPosY; + pos_x[0] = g_drawHIO.mButtonAPosX; + pos_y[0] = g_drawHIO.mButtonAPosY; pos_x[1] = 0.0f; pos_y[1] = 0.0f; var_f31 = 1.0f; } for (int i = 0; i < 2; i++) { - if (mAButtonTalkPosX[i] != pos_x[i]) { - cLib_addCalc2(&mAButtonTalkPosX[i], pos_x[i], 1.0f, 10.0f); + if (mButtonATalkPosX[i] != pos_x[i]) { + cLib_addCalc2(&mButtonATalkPosX[i], pos_x[i], 1.0f, 10.0f); draw_buttonA = true; - if ((f32)fabs(mAButtonTalkPosX[i] - pos_x[i]) < 0.1f) { - mAButtonTalkPosX[i] = pos_x[i]; + if ((f32)fabs(mButtonATalkPosX[i] - pos_x[i]) < 0.1f) { + mButtonATalkPosX[i] = pos_x[i]; } } - if (mAButtonTalkPosY[i] != pos_y[i]) { - cLib_addCalc2(&mAButtonTalkPosY[i], pos_y[i], 1.0f, 10.0f); + if (mButtonATalkPosY[i] != pos_y[i]) { + cLib_addCalc2(&mButtonATalkPosY[i], pos_y[i], 1.0f, 10.0f); draw_buttonA = true; - if ((f32)fabs(mAButtonTalkPosY[i] - pos_y[i]) < 0.1f) { - mAButtonTalkPosY[i] = pos_y[i]; + if ((f32)fabs(mButtonATalkPosY[i] - pos_y[i]) < 0.1f) { + mButtonATalkPosY[i] = pos_y[i]; } } } @@ -1600,8 +1600,8 @@ void dMeter2_c::moveButtonA() { } if (draw_buttonA) { - mpMeterDraw->drawButtonA(mDoStatus, mAButtonTalkPosX[0], mAButtonTalkPosY[0], - mAButtonTalkPosX[1], mAButtonTalkPosY[1], field_0x144, var_r29, + mpMeterDraw->drawButtonA(mDoStatus, mButtonATalkPosX[0], mButtonATalkPosY[0], + mButtonATalkPosX[1], mButtonATalkPosY[1], field_0x144, var_r29, ((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() || daPy_getPlayerActorClass()->checkGrassWhistle()) != false); @@ -1681,25 +1681,25 @@ void dMeter2_c::moveButtonB() { field_0x1fe = 0; } - if (field_0x2cc != g_drawHIO.mBButtonScale) { - field_0x2cc = g_drawHIO.mBButtonScale; + if (field_0x2cc != g_drawHIO.mButtonBScale) { + field_0x2cc = g_drawHIO.mButtonBScale; draw_buttonB = true; } for (int i = 0; i < 2; i++) { - if (field_0x2ec[i] != g_drawHIO.mBButtonTalkScale[i]) { - field_0x2ec[i] = g_drawHIO.mBButtonTalkScale[i]; + if (field_0x2ec[i] != g_drawHIO.mButtonBTalkScale[i]) { + field_0x2ec[i] = g_drawHIO.mButtonBTalkScale[i]; draw_buttonB = true; } } - if (mBButtonPosX != g_drawHIO.mBButtonPosX) { - mBButtonPosX = g_drawHIO.mBButtonPosX; + if (mButtonBPosX != g_drawHIO.mButtonBPosX) { + mButtonBPosX = g_drawHIO.mButtonBPosX; draw_buttonB = true; } - if (mBButtonPosY != g_drawHIO.mBButtonPosY) { - mBButtonPosY = g_drawHIO.mBButtonPosY; + if (mButtonBPosY != g_drawHIO.mButtonBPosY) { + mButtonBPosY = g_drawHIO.mButtonBPosY; draw_buttonB = true; } @@ -1708,54 +1708,54 @@ void dMeter2_c::moveButtonB() { } for (int i = 0; i < 2; i++) { - if (mBItemBaseScale[i] != g_drawHIO.mBItemBaseScale[i]) { - mBItemBaseScale[i] = g_drawHIO.mBItemBaseScale[i]; + if (mItemBBaseScale[i] != g_drawHIO.mItemBBaseScale[i]) { + mItemBBaseScale[i] = g_drawHIO.mItemBBaseScale[i]; draw_buttonB = true; } - if (mBItemBasePosX[i] != g_drawHIO.mBItemBasePosX[i]) { - mBItemBasePosX[i] = g_drawHIO.mBItemBasePosX[i]; + if (mItemBBasePosX[i] != g_drawHIO.mItemBBasePosX[i]) { + mItemBBasePosX[i] = g_drawHIO.mItemBBasePosX[i]; draw_buttonB = true; } - if (mBItemBasePosY[i] != g_drawHIO.mBItemBasePosY[i]) { - mBItemBasePosY[i] = g_drawHIO.mBItemBasePosY[i]; + if (mItemBBasePosY[i] != g_drawHIO.mItemBBasePosY[i]) { + mItemBBasePosY[i] = g_drawHIO.mItemBBasePosY[i]; draw_buttonB = true; } } - if (mBButtonFontScale != g_drawHIO.mBButtonFontScale) { - mBButtonFontScale = g_drawHIO.mBButtonFontScale; + if (mButtonBFontScale != g_drawHIO.mButtonBFontScale) { + mButtonBFontScale = g_drawHIO.mButtonBFontScale; draw_buttonB = true; } - if (mBButtonFontPosX != g_drawHIO.mBButtonFontPosX) { - mBButtonFontPosX = g_drawHIO.mBButtonFontPosX; + if (mButtonBFontPosX != g_drawHIO.mButtonBFontPosX) { + mButtonBFontPosX = g_drawHIO.mButtonBFontPosX; draw_buttonB = true; } - if (mBButtonFontPosY != g_drawHIO.mBButtonFontPosY) { - mBButtonFontPosY = g_drawHIO.mBButtonFontPosY; + if (mButtonBFontPosY != g_drawHIO.mButtonBFontPosY) { + mButtonBFontPosY = g_drawHIO.mButtonBFontPosY; draw_buttonB = true; } if (isShowLightDrop()) { - pos_x[0] = g_drawHIO.mBButtonVesselPosX; - pos_y[0] = g_drawHIO.mBButtonVesselPosY; + pos_x[0] = g_drawHIO.mButtonBVesselPosX; + pos_y[0] = g_drawHIO.mButtonBVesselPosY; pos_x[1] = 0.0f; pos_y[1] = 0.0f; var_f31 = 1.0f; } else if (isShowFlag(1)) { for (int i = 0; i < 2; i++) { - pos_x[i] = g_drawHIO.mBButtonTalkPosX[i]; - pos_y[i] = g_drawHIO.mBButtonTalkPosY[i]; + pos_x[i] = g_drawHIO.mButtonBTalkPosX[i]; + pos_y[i] = g_drawHIO.mButtonBTalkPosY[i]; } var_f31 = 1.0f; } else { for (int i = 0; i < 2; i++) { if (field_0x128 != 0 && i == 0) { - pos_x[i] = g_drawHIO.mBButtonWolfPosX; - pos_y[i] = g_drawHIO.mBButtonWolfPosY; + pos_x[i] = g_drawHIO.mButtonBWolfPosX; + pos_y[i] = g_drawHIO.mButtonBWolfPosY; } else { pos_x[i] = 0.0f; pos_y[i] = 0.0f; @@ -1764,7 +1764,7 @@ void dMeter2_c::moveButtonB() { var_f31 = 1.0f; } - if (mpMeterDraw->isBButtonShow(false)) { + if (mpMeterDraw->isButtonBShow(false)) { if (field_0x1ff == 0) { field_0x1ff = 1; draw_buttonB = true; @@ -1867,63 +1867,63 @@ void dMeter2_c::moveButtonR() { void dMeter2_c::moveButtonZ() { bool draw_buttonZ = false; - if (field_0x324 != g_drawHIO.mZButtonScale) { - field_0x324 = g_drawHIO.mZButtonScale; + if (field_0x324 != g_drawHIO.mButtonZScale) { + field_0x324 = g_drawHIO.mButtonZScale; draw_buttonZ = true; } - if (field_0x328 != g_drawHIO.mZButtonPosX) { - field_0x328 = g_drawHIO.mZButtonPosX; + if (field_0x328 != g_drawHIO.mButtonZPosX) { + field_0x328 = g_drawHIO.mButtonZPosX; draw_buttonZ = true; } - if (field_0x32c != g_drawHIO.mZButtonPosY) { - field_0x32c = g_drawHIO.mZButtonPosY; + if (field_0x32c != g_drawHIO.mButtonZPosY) { + field_0x32c = g_drawHIO.mButtonZPosY; draw_buttonZ = true; } - if (field_0x384 != g_drawHIO.mZButtonItemScale) { - field_0x384 = g_drawHIO.mZButtonItemScale; + if (field_0x384 != g_drawHIO.mButtonZItemScale) { + field_0x384 = g_drawHIO.mButtonZItemScale; draw_buttonZ = true; } - if (field_0x388 != g_drawHIO.mZButtonItemPosX) { - field_0x388 = g_drawHIO.mZButtonItemPosX; + if (field_0x388 != g_drawHIO.mButtonZItemPosX) { + field_0x388 = g_drawHIO.mButtonZItemPosX; draw_buttonZ = true; } - if (field_0x38c != g_drawHIO.mZButtonItemPosY) { - field_0x38c = g_drawHIO.mZButtonItemPosY; + if (field_0x38c != g_drawHIO.mButtonZItemPosY) { + field_0x38c = g_drawHIO.mButtonZItemPosY; draw_buttonZ = true; } - if (field_0x3e4 != g_drawHIO.mZButtonItemBaseScale) { - field_0x3e4 = g_drawHIO.mZButtonItemBaseScale; + if (field_0x3e4 != g_drawHIO.mButtonZItemBaseScale) { + field_0x3e4 = g_drawHIO.mButtonZItemBaseScale; draw_buttonZ = true; } - if (field_0x3e8 != g_drawHIO.mZButtonItemBasePosX) { - field_0x3e8 = g_drawHIO.mZButtonItemBasePosX; + if (field_0x3e8 != g_drawHIO.mButtonZItemBasePosX) { + field_0x3e8 = g_drawHIO.mButtonZItemBasePosX; draw_buttonZ = true; } - if (field_0x3ec != g_drawHIO.mZButtonItemBasePosY) { - field_0x3ec = g_drawHIO.mZButtonItemBasePosY; + if (field_0x3ec != g_drawHIO.mButtonZItemBasePosY) { + field_0x3ec = g_drawHIO.mButtonZItemBasePosY; draw_buttonZ = true; } - if (field_0x330 != g_drawHIO.mZButtonFontScale) { - field_0x330 = g_drawHIO.mZButtonFontScale; + if (field_0x330 != g_drawHIO.mButtonZFontScale) { + field_0x330 = g_drawHIO.mButtonZFontScale; draw_buttonZ = true; } - if (field_0x334 != g_drawHIO.mZButtonFontPosX) { - field_0x334 = g_drawHIO.mZButtonFontPosX; + if (field_0x334 != g_drawHIO.mButtonZFontPosX) { + field_0x334 = g_drawHIO.mButtonZFontPosX; draw_buttonZ = true; } - if (field_0x338 != g_drawHIO.mZButtonFontPosY) { - field_0x338 = g_drawHIO.mZButtonFontPosY; + if (field_0x338 != g_drawHIO.mButtonZFontPosY) { + field_0x338 = g_drawHIO.mButtonZFontPosY; draw_buttonZ = true; } @@ -2035,94 +2035,94 @@ void dMeter2_c::moveButtonXY() { spC[i] = 0; } - if (field_0x33c != g_drawHIO.mXButtonScale) { - field_0x33c = g_drawHIO.mXButtonScale; + if (field_0x33c != g_drawHIO.mButtonXScale) { + field_0x33c = g_drawHIO.mButtonXScale; sp8[0] = 1; } - if (field_0x340 != g_drawHIO.mXButtonPosX) { - field_0x340 = g_drawHIO.mXButtonPosX; + if (field_0x340 != g_drawHIO.mButtonXPosX) { + field_0x340 = g_drawHIO.mButtonXPosX; sp8[0] = 1; } - if (field_0x344 != g_drawHIO.mXButtonPosY) { - field_0x344 = g_drawHIO.mXButtonPosY; + if (field_0x344 != g_drawHIO.mButtonXPosY) { + field_0x344 = g_drawHIO.mButtonXPosY; sp8[0] = 1; } - if (field_0x348 != g_drawHIO.mYButtonScale) { - field_0x348 = g_drawHIO.mYButtonScale; + if (field_0x348 != g_drawHIO.mButtonYScale) { + field_0x348 = g_drawHIO.mButtonYScale; sp8[1] = 1; } - if (field_0x34c != g_drawHIO.mYButtonPosX) { - field_0x34c = g_drawHIO.mYButtonPosX; + if (field_0x34c != g_drawHIO.mButtonYPosX) { + field_0x34c = g_drawHIO.mButtonYPosX; sp8[1] = 1; } - if (field_0x350 != g_drawHIO.mYButtonPosY) { - field_0x350 = g_drawHIO.mYButtonPosY; + if (field_0x350 != g_drawHIO.mButtonYPosY) { + field_0x350 = g_drawHIO.mButtonYPosY; sp8[1] = 1; } - if (field_0x360 != g_drawHIO.mXButtonItemScale) { - field_0x360 = g_drawHIO.mXButtonItemScale; + if (field_0x360 != g_drawHIO.mButtonXItemScale) { + field_0x360 = g_drawHIO.mButtonXItemScale; sp8[0] = 1; } - if (field_0x364 != g_drawHIO.mXButtonItemPosX) { - field_0x364 = g_drawHIO.mXButtonItemPosX; + if (field_0x364 != g_drawHIO.mButtonXItemPosX) { + field_0x364 = g_drawHIO.mButtonXItemPosX; sp8[0] = 1; } - if (field_0x368 != g_drawHIO.mXButtonItemPosY) { - field_0x368 = g_drawHIO.mXButtonItemPosY; + if (field_0x368 != g_drawHIO.mButtonXItemPosY) { + field_0x368 = g_drawHIO.mButtonXItemPosY; sp8[0] = 1; } - if (field_0x36c != g_drawHIO.mYButtonItemScale) { - field_0x36c = g_drawHIO.mYButtonItemScale; + if (field_0x36c != g_drawHIO.mButtonYItemScale) { + field_0x36c = g_drawHIO.mButtonYItemScale; sp8[1] = 1; } - if (field_0x370 != g_drawHIO.mYButtonItemPosX) { - field_0x370 = g_drawHIO.mYButtonItemPosX; + if (field_0x370 != g_drawHIO.mButtonYItemPosX) { + field_0x370 = g_drawHIO.mButtonYItemPosX; sp8[1] = 1; } - if (field_0x374 != g_drawHIO.mYButtonItemPosY) { - field_0x374 = g_drawHIO.mYButtonItemPosY; + if (field_0x374 != g_drawHIO.mButtonYItemPosY) { + field_0x374 = g_drawHIO.mButtonYItemPosY; sp8[1] = 1; } for (int i = 0; i < 2; i++) { - if (field_0x39c[i] != g_drawHIO.mXButtonItemBaseScale[i]) { - field_0x39c[i] = g_drawHIO.mXButtonItemBaseScale[i]; + if (field_0x39c[i] != g_drawHIO.mButtonXItemBaseScale[i]) { + field_0x39c[i] = g_drawHIO.mButtonXItemBaseScale[i]; sp8[0] = 1; } - if (field_0x3a4[i] != g_drawHIO.mXButtonItemBasePosX[i]) { - field_0x3a4[i] = g_drawHIO.mXButtonItemBasePosX[i]; + if (field_0x3a4[i] != g_drawHIO.mButtonXItemBasePosX[i]) { + field_0x3a4[i] = g_drawHIO.mButtonXItemBasePosX[i]; sp8[0] = 1; } - if (field_0x3ac[i] != g_drawHIO.mXButtonItemBasePosY[i]) { - field_0x3ac[i] = g_drawHIO.mXButtonItemBasePosY[i]; + if (field_0x3ac[i] != g_drawHIO.mButtonXItemBasePosY[i]) { + field_0x3ac[i] = g_drawHIO.mButtonXItemBasePosY[i]; sp8[0] = 1; } - if (field_0x3b4[i] != g_drawHIO.mYButtonItemBaseScale[i]) { - field_0x3b4[i] = g_drawHIO.mYButtonItemBaseScale[i]; + if (field_0x3b4[i] != g_drawHIO.mButtonYItemBaseScale[i]) { + field_0x3b4[i] = g_drawHIO.mButtonYItemBaseScale[i]; sp8[1] = 1; } - if (field_0x3bc[i] != g_drawHIO.mYButtonItemBasePosX[i]) { - field_0x3bc[i] = g_drawHIO.mYButtonItemBasePosX[i]; + if (field_0x3bc[i] != g_drawHIO.mButtonYItemBasePosX[i]) { + field_0x3bc[i] = g_drawHIO.mButtonYItemBasePosX[i]; sp8[1] = 1; } - if (field_0x3c4[i] != g_drawHIO.mYButtonItemBasePosY[i]) { - field_0x3c4[i] = g_drawHIO.mYButtonItemBasePosY[i]; + if (field_0x3c4[i] != g_drawHIO.mButtonYItemBasePosY[i]) { + field_0x3c4[i] = g_drawHIO.mButtonYItemBasePosY[i]; sp8[1] = 1; } } @@ -2135,24 +2135,24 @@ void dMeter2_c::moveButtonXY() { } } - if (field_0x3f0 != g_drawHIO.mXYButtonFontScale) { - field_0x3f0 = g_drawHIO.mXYButtonFontScale; + if (field_0x3f0 != g_drawHIO.mButtonXYTextScale) { + field_0x3f0 = g_drawHIO.mButtonXYTextScale; for (int i = 0; i < 2; i++) { sp8[i] = 1; } } - if (field_0x3f4 != g_drawHIO.mXYButtonFontPosX) { - field_0x3f4 = g_drawHIO.mXYButtonFontPosX; + if (field_0x3f4 != g_drawHIO.mButtonXYTextPosX) { + field_0x3f4 = g_drawHIO.mButtonXYTextPosX; for (int i = 0; i < 2; i++) { sp8[i] = 1; } } - if (field_0x3f8 != g_drawHIO.mXYButtonFontPosY) { - field_0x3f8 = g_drawHIO.mXYButtonFontPosY; + if (field_0x3f8 != g_drawHIO.mButtonXYTextPosY) { + field_0x3f8 = g_drawHIO.mButtonXYTextPosY; for (int i = 0; i < 2; i++) { sp8[i] = 1; @@ -2329,33 +2329,33 @@ void dMeter2_c::moveButtonCross() { draw_cross = false; var_f31 = 0.0f; - if (mDPadButtonOFFPosX != g_drawHIO.mDPadButtonOFFPosX) { - mDPadButtonOFFPosX = g_drawHIO.mDPadButtonOFFPosX; + if (mButtonCrossOFFPosX != g_drawHIO.mButtonCrossOFFPosX) { + mButtonCrossOFFPosX = g_drawHIO.mButtonCrossOFFPosX; draw_cross = true; } - if (mDPadButtonOFFPosY != g_drawHIO.mDPadButtonOFFPosY) { - mDPadButtonOFFPosY = g_drawHIO.mDPadButtonOFFPosY; + if (mButtonCrossOFFPosY != g_drawHIO.mButtonCrossOFFPosY) { + mButtonCrossOFFPosY = g_drawHIO.mButtonCrossOFFPosY; draw_cross = true; } - if (mDPadButtonONPosX != g_drawHIO.mDPadButtonONPosX) { - mDPadButtonONPosX = g_drawHIO.mDPadButtonONPosX; + if (mButtonCrossONPosX != g_drawHIO.mButtonCrossONPosX) { + mButtonCrossONPosX = g_drawHIO.mButtonCrossONPosX; draw_cross = true; } - if (mDPadButtonONPosY != g_drawHIO.mDPadButtonONPosY) { - mDPadButtonONPosY = g_drawHIO.mDPadButtonONPosY; + if (mButtonCrossONPosY != g_drawHIO.mButtonCrossONPosY) { + mButtonCrossONPosY = g_drawHIO.mButtonCrossONPosY; draw_cross = true; } - if (mDPadButtonScale != g_drawHIO.mDPadButtonScale) { - mDPadButtonScale = g_drawHIO.mDPadButtonScale; + if (mButtonCrossScale != g_drawHIO.mButtonCrossScale) { + mButtonCrossScale = g_drawHIO.mButtonCrossScale; draw_cross = true; } - if (mDPadButtonLetterSpacing != g_drawHIO.mDPadButtonLetterSpacing) { - mDPadButtonLetterSpacing = g_drawHIO.mDPadButtonLetterSpacing; + if (mButtonCrossTextScale != g_drawHIO.mButtonCrossTextScale) { + mButtonCrossTextScale = g_drawHIO.mButtonCrossTextScale; draw_cross = true; } @@ -2364,14 +2364,14 @@ void dMeter2_c::moveButtonCross() { temp_f1 = (temp_f31 - mpMeterDraw->getButtonCrossParentInitTransY()) - 15.0f; if (mpMap->isDispPosInsideFlg()) { - if (field_0x1b4 < g_drawHIO.mDPadButtonMoveFrame) { + if (field_0x1b4 < g_drawHIO.mButtonCrossMoveFrame) { field_0x1b4++; draw_cross = true; } else { - field_0x1b4 = g_drawHIO.mDPadButtonMoveFrame; + field_0x1b4 = g_drawHIO.mButtonCrossMoveFrame; } - var_f31 = mDPadButtonONPosY + temp_f1; + var_f31 = mButtonCrossONPosY + temp_f1; } else { if (field_0x1b4 > 0) { field_0x1b4--; @@ -2380,12 +2380,12 @@ void dMeter2_c::moveButtonCross() { field_0x1b4 = 0; } - var_f31 = mDPadButtonOFFPosY; + var_f31 = mButtonCrossOFFPosY; } } - temp_f30 = mDPadButtonOFFPosX + (((f32)field_0x1b4 / (f32)g_drawHIO.mDPadButtonMoveFrame) * - (mDPadButtonONPosX - mDPadButtonOFFPosX)); + temp_f30 = mButtonCrossOFFPosX + (((f32)field_0x1b4 / (f32)g_drawHIO.mButtonCrossMoveFrame) * + (mButtonCrossONPosX - mButtonCrossOFFPosX)); if (field_0x15c != var_f31) { cLib_addCalc2(&field_0x15c, var_f31, 0.5f, 50.0f); if ((f32)fabs(field_0x15c - var_f31) < 0.5f) { @@ -3139,41 +3139,41 @@ void dMeter2_c::alphaAnimeButton() { ((mStatus & 0x40000000) && !(mStatus & 0x100)) || (mStatus & 0x80000000) || (mStatus & 8) || (mStatus & 0x10) || (mStatus & 0x20) || (mStatus & 0x04000000) || (mStatus & 0x10000000)) { - mpMeterDraw->setAlphaButtonAnimeMin(); - mpMeterDraw->setAlphaButtonAAnimeMin(); - mpMeterDraw->setAlphaButtonBAnimeMin(); + mpMeterDraw->setAlphButtonAAnimeMin(); + mpMeterDraw->setAlphButtonAAAnimeMin(); + mpMeterDraw->setAlphButtonABAnimeMin(); } else if (!(mStatus & 0x1000000) && ((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() || (mStatus & 0x40) && dComIfGp_event_checkHind(1))) { - mpMeterDraw->setAlphaButtonAnimeMin(); + mpMeterDraw->setAlphButtonAAnimeMin(); var_31 = 1; } else if (dMeter2Info_getItemExplainWindowStatus()) { - mpMeterDraw->setAlphaButtonAnimeMin(); + mpMeterDraw->setAlphButtonAAnimeMin(); var_31 = 1; } else { - mpMeterDraw->setAlphaButtonAnimeMax(); + mpMeterDraw->setAlphButtonAAnimeMax(); } field_0x1e6 = 0; if (var_31 == 1) { if (dMeter2Info_getItemExplainWindowStatus()) { - mpMeterDraw->setAlphaButtonAAnimeMin(); + mpMeterDraw->setAlphButtonAAAnimeMin(); } else if ((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() || !dComIfGp_event_checkHind(2)) { - mpMeterDraw->setAlphaButtonAAnimeMax(); + mpMeterDraw->setAlphButtonAAAnimeMax(); onShowFlag(0); } else { - mpMeterDraw->setAlphaButtonAAnimeMin(); + mpMeterDraw->setAlphButtonAAAnimeMin(); } - if (mpMeterDraw->isBButtonShow(false)) { - mpMeterDraw->setAlphaButtonBAnimeMax(); + if (mpMeterDraw->isButtonBShow(false)) { + mpMeterDraw->setAlphButtonABAnimeMax(); onShowFlag(1); } else { - mpMeterDraw->setAlphaButtonBAnimeMin(); + mpMeterDraw->setAlphButtonABAnimeMin(); } } @@ -3210,7 +3210,7 @@ void dMeter2_c::alphaAnimeButton() { } } - mpMeterDraw->setAlphaButtonChange(false); + mpMeterDraw->setAlphButtonAChange(false); } /* 802254C0-802256DC 21FE00 021C+00 1/1 0/0 0/0 .text alphaAnimeButtonCross__9dMeter2_cFv @@ -3224,7 +3224,7 @@ void dMeter2_c::alphaAnimeButtonCross() { (mStatus & 0x10000000) || (mStatus & 0x20000000)) || daPy_getPlayerActorClass()->checkEnemyAttentionLock() || dMeter2Info_isGameStatus(1)) { - mpMeterDraw->setAlphaButtonCrossAnimeMin(); + mpMeterDraw->setAlphButtonACrossAnimeMin(); if ((!i_dComIfGp_event_chkEventFlag(0x40) || dMeter2Info_isGameStatus(2) || (mStatus & 0x100)) && @@ -3233,13 +3233,13 @@ void dMeter2_c::alphaAnimeButtonCross() { field_0x190--; } } else if (dMeter2Info_isSub2DStatus(1) || dMeter2Info_isFloatingMessageVisible()) { - mpMeterDraw->setAlphaButtonCrossAnimeMin(); + mpMeterDraw->setAlphButtonACrossAnimeMin(); if (field_0x190 < 5) { field_0x190++; } } else { - mpMeterDraw->setAlphaButtonCrossAnimeMax(); + mpMeterDraw->setAlphButtonACrossAnimeMax(); if (field_0x190 < 5) { field_0x190++; diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp index cdb9ea4ac4..294948af33 100644 --- a/src/d/meter/d_meter2_draw.cpp +++ b/src/d/meter/d_meter2_draw.cpp @@ -1,478 +1,41 @@ -// -// Generated By: dol2asm -// Translation Unit: d/meter/d_meter2_draw -// +/** + * d_meter2_draw.cpp + * Main HUD drawing + */ #include "d/meter/d_meter2_draw.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 "d/a/d_a_alink.h" +#include "d/d_item.h" +#include "d/d_item_data.h" #include "d/d_kantera_icon_meter.h" #include "d/meter/d_meter_HIO.h" +#include "d/msg/d_msg_class.h" #include "d/msg/d_msg_object.h" #include "d/pane/d_pane_class.h" -#include "dol2asm.h" -#include "dolphin/types.h" -#include "global.h" -// -// Forward References: -// - -extern "C" void __ct__13dMeter2Draw_cFP10JKRExpHeap(); -extern "C" void __dt__13dMeter2Draw_cFv(); -extern "C" void init__13dMeter2Draw_cFv(); -extern "C" void exec__13dMeter2Draw_cFUl(); -extern "C" void draw__13dMeter2Draw_cFv(); -extern "C" void initLife__13dMeter2Draw_cFv(); -extern "C" void initMagic__13dMeter2Draw_cFv(); -extern "C" void initLightDrop__13dMeter2Draw_cFv(); -extern "C" void initRupeeKey__13dMeter2Draw_cFv(); -extern "C" void initButton__13dMeter2Draw_cFv(); -extern "C" void initButtonCross__13dMeter2Draw_cFv(); -extern "C" void playPikariBckAnimation__13dMeter2Draw_cFf(); -extern "C" void setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor(); -extern "C" void playPikariBpkAnimation__13dMeter2Draw_cFf(); -extern "C" void playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor(); -extern "C" void -drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc(); -extern "C" void -drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc(); -extern "C" void -drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void changeTextureLife__13dMeter2Draw_cFibUc(); -extern "C" void drawLife__13dMeter2Draw_cFssff(); -extern "C" void setAlphaLifeChange__13dMeter2Draw_cFb(); -extern "C" void setAlphaLifeAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaLifeAnimeMax__13dMeter2Draw_cFv(); -extern "C" void drawKanteraScreen__13dMeter2Draw_cFUc(); -extern "C" void drawMagic__13dMeter2Draw_cFssff(); -extern "C" void setAlphaMagicChange__13dMeter2Draw_cFb(); -extern "C" void drawKantera__13dMeter2Draw_cFllff(); -extern "C" void setAlphaKanteraChange__13dMeter2Draw_cFb(); -extern "C" void setAlphaKanteraAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaKanteraAnimeMax__13dMeter2Draw_cFv(); -extern "C" void drawOxygen__13dMeter2Draw_cFllff(); -extern "C" void setAlphaOxygenChange__13dMeter2Draw_cFb(); -extern "C" void setAlphaOxygenAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaOxygenAnimeMax__13dMeter2Draw_cFv(); -extern "C" void drawLightDrop__13dMeter2Draw_cFUcUcffffUc(); -extern "C" void setAlphaLightDropChange__13dMeter2Draw_cFb(); -extern "C" void getNowLightDropRateCalc__13dMeter2Draw_cFv(); -extern "C" void setAlphaLightDropAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaLightDropAnimeMax__13dMeter2Draw_cFv(); -extern "C" void drawRupee__13dMeter2Draw_cFs(); -extern "C" void setAlphaRupeeChange__13dMeter2Draw_cFb(); -extern "C" void setAlphaRupeeAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaRupeeAnimeMax__13dMeter2Draw_cFv(); -extern "C" void drawKey__13dMeter2Draw_cFs(); -extern "C" void setAlphaKeyChange__13dMeter2Draw_cFb(); -extern "C" void setAlphaKeyAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaKeyAnimeMax__13dMeter2Draw_cFv(); -extern "C" void drawButtonA__13dMeter2Draw_cFUcfffffbb(); -extern "C" void drawButtonB__13dMeter2Draw_cFUcbfffffb(); -extern "C" void drawButtonR__13dMeter2Draw_cFUcUcbb(); -extern "C" void drawButtonZ__13dMeter2Draw_cFUc(); -extern "C" void drawButton3D__13dMeter2Draw_cFUc(); -extern "C" void drawButtonC__13dMeter2Draw_cFUcb(); -extern "C" void drawButtonS__13dMeter2Draw_cFUc(); -extern "C" void drawButtonBin__13dMeter2Draw_cFUc(); -extern "C" void drawButtonXY__13dMeter2Draw_cFiUcUcbb(); -extern "C" void getButtonCrossParentInitTransY__13dMeter2Draw_cFv(); -extern "C" void drawButtonCross__13dMeter2Draw_cFff(); -extern "C" void setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonChange__13dMeter2Draw_cFb(); -extern "C" void setAlphaButtonAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonAnimeMax__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonAAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonAAnimeMax__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonBAnimeMin__13dMeter2Draw_cFv(); -extern "C" void setAlphaButtonBAnimeMax__13dMeter2Draw_cFv(); -extern "C" void setButtonIconAAlpha__13dMeter2Draw_cFUcUlb(); -extern "C" void setButtonIconBAlpha__13dMeter2Draw_cFUcUlb(); -extern "C" void setButtonIconMidonaAlpha__13dMeter2Draw_cFUl(); -extern "C" void setButtonIconAlpha__13dMeter2Draw_cFiUcUlb(); -extern "C" void getNumberTexture__13dMeter2Draw_cFi(); -extern "C" void getActionString__13dMeter2Draw_cFUcUcPUc(); -extern "C" void changeTextureItemB__13dMeter2Draw_cFUc(); -extern "C" void changeTextureItemXY__13dMeter2Draw_cFiUc(); -extern "C" void setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas(); -extern "C" void setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas(); -extern "C" void setItemNum__13dMeter2Draw_cFUcUcUc(); -extern "C" void drawItemNum__13dMeter2Draw_cFUcf(); -extern "C" void drawKanteraMeter__13dMeter2Draw_cFUcf(); -extern "C" void isButtonVisible__13dMeter2Draw_cFv(); -extern "C" void setItemParamX__13dMeter2Draw_cFUc(); -extern "C" void setItemParamY__13dMeter2Draw_cFUc(); -extern "C" void setItemParamZ__13dMeter2Draw_cFUc(); -extern "C" void setItemParamB__13dMeter2Draw_cFUc(); -extern "C" void getFishingType__13dMeter2Draw_cFv(); -extern "C" void getCanoeFishing__13dMeter2Draw_cFv(); -extern "C" void getCameraSubject__13dMeter2Draw_cFv(); -extern "C" void getItemSubject__13dMeter2Draw_cFv(); -extern "C" void getPlayerSubject__13dMeter2Draw_cFv(); -extern "C" void isBButtonShow__13dMeter2Draw_cFb(); -extern "C" void getButtonTimer__13dMeter2Draw_cFv(); -extern "C" extern char const* const d_meter_d_meter2_draw__stringBase0; - -// -// External References: -// - -extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void dComIfGs_getMaxLifeGauge__Fv(); -extern "C" void dComIfGp_getSelectItem__Fi(); -extern "C" void getItem__17dSv_player_item_cCFib(); -extern "C" void getLightDropNum__16dSv_light_drop_cCFUc(); -extern "C" void isLightDropGetFlag__16dSv_light_drop_cCFUc(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void isBottleItem__FUc(); -extern "C" void dCam_getBody__Fv(); -extern "C" void __ct__15dKantera_icon_cFv(); -extern "C" void setAlphaRate__15dKantera_icon_cFf(); -extern "C" void setPos__15dKantera_icon_cFff(); -extern "C" void setScale__15dKantera_icon_cFff(); -extern "C" void setNowGauge__15dKantera_icon_cFUsUs(); -extern "C" void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(); -extern "C" void getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(); -extern "C" void getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(); -extern "C" void isDirectUseItem__13dMeter2Info_cFi(); -extern "C" void -readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei(); -extern "C" void dMeter2Info_getNumberTextureName__Fi(); -extern "C" void dMeter2Info_isMapOpenCheck__Fv(); -extern "C" void dMeter2Info_isItemOpenCheck__Fv(); -extern "C" void dMeter2Info_set2DVibration__Fv(); -extern "C" void dMsgObject_getGroupID__Fv(); -extern "C" void isHowlMessage__12dMsgObject_cFv(); -extern "C" void getStatus__12dMsgObject_cFv(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void paneTrans__8CPaneMgrFff(); -extern "C" void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void show__13CPaneMgrAlphaFv(); -extern "C" void hide__13CPaneMgrAlphaFv(); -extern "C" void isVisible__13CPaneMgrAlphaFv(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void getAlphaRate__13CPaneMgrAlphaFv(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void alloc__7JKRHeapFUli(); -extern "C" void free__7JKRHeapFPv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(); -extern "C" void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive(); -extern "C" void appendChild__7J2DPaneFP7J2DPane(); -extern "C" void rotate__7J2DPaneFff13J2DRotateAxisf(); -extern "C" void setBasePosition__7J2DPaneF15J2DBasePosition(); -extern "C" void getGlbVtx__7J2DPaneCFUc(); -extern "C" void animationTransform__7J2DPaneFv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); -extern "C" void animation__9J2DScreenFv(); -extern "C" void __ct__10J2DPictureFPC7ResTIMG(); -extern "C" void func_802FC800(); -extern "C" void getStringPtr__10J2DTextBoxCFv(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" void _savegpr_15(); -extern "C" void _savegpr_20(); -extern "C" void _savegpr_21(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_15(); -extern "C" void _restgpr_20(); -extern "C" void _restgpr_21(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" void* item_resource__10dItem_data[1530]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80398258-80398280 0248B8 0028+00 4/4 0/0 0/0 .rodata a_tag$3949 */ -static u64 const a_tag[5] = { - 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at', -}; - -/* 80398280-803982A8 0248E0 0028+00 0/1 0/0 0/0 .rodata b_tag$3950 */ -#pragma push -#pragma force_active on -static u64 const b_tag[5] = { - 'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt', -}; -#pragma pop - -/* 803982A8-803982D0 024908 0028+00 0/1 0/0 0/0 .rodata z_tag$3951 */ -#pragma push -#pragma force_active on -static u64 const z_tag[5] = { - 'cont_zt1', 'cont_zt2', 'cont_zt3', 'cont_zt4', 'cont_rt', -}; -#pragma pop - -/* 803982D0-803982F8 024930 0028+00 0/1 0/0 0/0 .rodata x_tag$3952 */ -#pragma push -#pragma force_active on -static u64 const x_tag[5] = { - 'cont_xt1', 'cont_xt2', 'cont_xt3', 'cont_xt4', 'cont_xt5', -}; -#pragma pop - -/* 803982F8-80398320 024958 0028+00 0/1 0/0 0/0 .rodata y_tag$3953 */ -#pragma push -#pragma force_active on -static u64 const y_tag[5] = { - 'cont_yt1', 'cont_yt2', 'cont_yt3', 'cont_yt4', 'cont_yt5', -}; -#pragma pop - -/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803988D0 = "zel_00.bmg"; -SECTION_DEAD static char const* const stringBase_803988DB = "zel_01.bmg"; -SECTION_DEAD static char const* const stringBase_803988E6 = "zel_02.bmg"; -SECTION_DEAD static char const* const stringBase_803988F1 = "zel_03.bmg"; -SECTION_DEAD static char const* const stringBase_803988FC = "zel_04.bmg"; -SECTION_DEAD static char const* const stringBase_80398907 = "zel_05.bmg"; -SECTION_DEAD static char const* const stringBase_80398912 = "zel_06.bmg"; -SECTION_DEAD static char const* const stringBase_8039891D = "zel_07.bmg"; -SECTION_DEAD static char const* const stringBase_80398928 = "zel_08.bmg"; -SECTION_DEAD static char const* const stringBase_80398933 = "zel_99.bmg"; -SECTION_DEAD static char const* const stringBase_8039893E = "zel_unit.bmg"; -SECTION_DEAD static char const* const stringBase_8039894B = "zelda_game_image.blo"; -SECTION_DEAD static char const* const stringBase_80398960 = "zelda_game_image_kantera.blo"; -SECTION_DEAD static char const* const stringBase_8039897D = "zelda_icon_pikari.blo"; -SECTION_DEAD static char const* const stringBase_80398993 = "zelda_icon_pikari.bck"; -SECTION_DEAD static char const* const stringBase_803989A9 = "zelda_icon_pikari.bpk"; -SECTION_DEAD static char const* const stringBase_803989BF = ""; -#pragma pop - -/* 803BF328-803BF350 -00001 0028+00 1/1 0/0 0/0 .data bmg_filename$3954 */ -SECTION_DATA static const char* bmg_filename[10] = { - "zel_00.bmg", "zel_01.bmg", "zel_02.bmg", "zel_03.bmg", "zel_04.bmg", - "zel_05.bmg", "zel_06.bmg", "zel_07.bmg", "zel_08.bmg", "zel_99.bmg", -}; - -/* 803BF350-803BF554 01C470 0204+00 1/1 0/0 0/0 .data i_action_num$8471 */ -SECTION_DATA static int i_action_num[129] = { - 0, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1387, 1009, 1010, 1011, 1012, 1013, 1014, - 1015, 1033, 1016, 1017, 1018, 1019, 1020, 1045, 1022, 1026, 1027, 1028, 1029, 1030, 1024, - 1031, 1025, 1023, 1045, 1036, 1032, 93, 0, 0, 0, 1035, 1034, 1037, 1038, 1039, - 1040, 1041, 998, 1042, 1043, 1044, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, - 1055, 1056, 1057, 1058, 1059, 1070, 1060, 1061, 1062, 1063, 1064, 1067, 1065, 1066, 1211, - 1069, 1021, 1072, 1073, 0, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, - 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1092, 1093, 1094, 1095, 1096, 1904, 1097, 1098, - 1099, 1100, 1150, 1149, 1148, 1377, 1147, 1145, 1146, 1161, 1162, 1163, 1164, 1165, 1166, - 1144, 982, 983, 1143, 1160, 1319, 1314, 1399, 1008, -}; - -/* 803BF554-803BF578 -00001 0024+00 1/1 0/0 0/0 .data @9008 */ -SECTION_DATA static void* lit_9008[9] = { - (void*)(((char*)setItemParamX__13dMeter2Draw_cFUc) + 0x8C), - (void*)(((char*)setItemParamX__13dMeter2Draw_cFUc) + 0x1B8), - (void*)(((char*)setItemParamX__13dMeter2Draw_cFUc) + 0x1B8), - (void*)(((char*)setItemParamX__13dMeter2Draw_cFUc) + 0xC8), - (void*)(((char*)setItemParamX__13dMeter2Draw_cFUc) + 0x140), - (void*)(((char*)setItemParamX__13dMeter2Draw_cFUc) + 0x104), - (void*)(((char*)setItemParamX__13dMeter2Draw_cFUc) + 0x1B8), - (void*)(((char*)setItemParamX__13dMeter2Draw_cFUc) + 0x1B8), - (void*)(((char*)setItemParamX__13dMeter2Draw_cFUc) + 0x17C), -}; - -/* 803BF578-803BF59C -00001 0024+00 1/1 0/0 0/0 .data @9030 */ -SECTION_DATA static void* lit_9030[9] = { - (void*)(((char*)setItemParamY__13dMeter2Draw_cFUc) + 0x8C), - (void*)(((char*)setItemParamY__13dMeter2Draw_cFUc) + 0x1A4), - (void*)(((char*)setItemParamY__13dMeter2Draw_cFUc) + 0x1A4), - (void*)(((char*)setItemParamY__13dMeter2Draw_cFUc) + 0xC4), - (void*)(((char*)setItemParamY__13dMeter2Draw_cFUc) + 0x130), - (void*)(((char*)setItemParamY__13dMeter2Draw_cFUc) + 0xFC), - (void*)(((char*)setItemParamY__13dMeter2Draw_cFUc) + 0x1A4), - (void*)(((char*)setItemParamY__13dMeter2Draw_cFUc) + 0x1A4), - (void*)(((char*)setItemParamY__13dMeter2Draw_cFUc) + 0x168), -}; - -/* 803BF59C-803BF5C0 -00001 0024+00 1/1 0/0 0/0 .data @9053 */ -SECTION_DATA static void* lit_9053[9] = { - (void*)(((char*)setItemParamZ__13dMeter2Draw_cFUc) + 0x8C), - (void*)(((char*)setItemParamZ__13dMeter2Draw_cFUc) + 0x1B8), - (void*)(((char*)setItemParamZ__13dMeter2Draw_cFUc) + 0x1B8), - (void*)(((char*)setItemParamZ__13dMeter2Draw_cFUc) + 0xC8), - (void*)(((char*)setItemParamZ__13dMeter2Draw_cFUc) + 0x140), - (void*)(((char*)setItemParamZ__13dMeter2Draw_cFUc) + 0x104), - (void*)(((char*)setItemParamZ__13dMeter2Draw_cFUc) + 0x1B8), - (void*)(((char*)setItemParamZ__13dMeter2Draw_cFUc) + 0x1B8), - (void*)(((char*)setItemParamZ__13dMeter2Draw_cFUc) + 0x17C), -}; - -/* 803BF5C0-803BF750 -00001 0190+00 1/1 0/0 0/0 .data @9106 */ -SECTION_DATA static void* lit_9106[100] = { - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x248), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x1D0), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x11C), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x1D0), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x20C), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x158), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x284), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x194), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x20C), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x20C), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x2C0), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0xE0), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x248), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x248), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0xE0), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0xE0), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0xE0), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0xE0), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0xE0), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x248), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x248), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x248), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0xE0), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x304), - (void*)(((char*)setItemParamB__13dMeter2Draw_cFUc) + 0x248), -}; - -/* 803BF750-803BF760 01C870 0010+00 2/2 0/0 0/0 .data __vt__13dMeter2Draw_c */ -SECTION_DATA extern void* __vt__13dMeter2Draw_c[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__13dMeter2Draw_cFv, - (void*)__dt__13dMeter2Draw_cFv, -}; - -/* 80454880-80454884 002E80 0004+00 38/38 0/0 0/0 .sdata2 @4182 */ -SECTION_SDATA2 static u8 lit_4182[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454884-80454888 002E84 0004+00 14/14 0/0 0/0 .sdata2 @4183 */ -SECTION_SDATA2 static f32 lit_4183 = 1.0f; - -/* 80454888-8045488C 002E88 0004+00 5/5 0/0 0/0 .sdata2 @4184 */ -SECTION_SDATA2 static f32 lit_4184 = 17.0f; - -/* 8045488C-80454890 002E8C 0004+00 1/1 0/0 0/0 .sdata2 @4185 */ -SECTION_SDATA2 static f32 lit_4185 = 20.0f; +extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c; /* 8020FAB4-802102F8 20A3F4 0844+00 0/0 1/1 0/0 .text __ct__13dMeter2Draw_cFP10JKRExpHeap */ -#ifdef NONMATCHING -dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* p_heap) { - mp_heap = p_heap; +dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { + OS_REPORT("enter dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n"); + + heap = mp_heap; JKRHeap* heap = mDoExt_setCurrentHeap(dComIfGp_getMsgExpHeap()); void* msg_res = JKRGetTypeResource('ROOT', "zel_00.bmg", dComIfGp_getMsgDtArchive(0)); dMeter2Info_setMsgResource(msg_res); + static const char* bmg_filename[] = { + "zel_00.bmg", "zel_01.bmg", "zel_02.bmg", "zel_03.bmg", "zel_04.bmg", + "zel_05.bmg", "zel_06.bmg", "zel_07.bmg", "zel_08.bmg", "zel_99.bmg", + }; + void* stg_msg_res = JKRGetTypeResource('ROOT', bmg_filename[dMsgObject_getGroupID()], dComIfGp_getMsgDtArchive(1)); dMeter2Info_setStageMsgResource(stg_msg_res); @@ -482,65 +45,94 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* p_heap) { mDoExt_setCurrentHeap(heap); mpScreen = new J2DScreen(); - mpScreen->setPriority("zelda_game_image.blo", 0x20000, dComIfGp_getMain2DArchive()); + JUT_ASSERT(mpScreen != 0); + bool fg = mpScreen->setPriority("zelda_game_image.blo", 0x20000, dComIfGp_getMain2DArchive()); + JUT_ASSERT(fg != false); dPaneClass_showNullPane(mpScreen); - mpScreen->search('ju_ring5')->hide(); + mpScreen->search('ju_ring5')->hide(); field_0x73c = 0.0f; + for (int i = 0; i < 2; i++) { mpKanteraMeter[i] = new dKantera_icon_c(); + JUT_ASSERT(mpKanteraMeter[i] != 0); } + mpKanteraScreen = new J2DScreen(); - mpKanteraScreen->setPriority("zelda_game_image_kantera.blo", 0x20000, - dComIfGp_getMain2DArchive()); + JUT_ASSERT(mpKanteraScreen != 0); + fg = mpKanteraScreen->setPriority("zelda_game_image_kantera.blo", 0x20000, + dComIfGp_getMain2DArchive()); + JUT_ASSERT(fg != false); dPaneClass_showNullPane(mpKanteraScreen); mpPikariScreen = new J2DScreen(); - mpPikariScreen->setPriority("zelda_icon_pikari.blo", 0x20000, dComIfGp_getMain2DArchive()); + JUT_ASSERT(mpPikariScreen != 0); + fg = mpPikariScreen->setPriority("zelda_icon_pikari.blo", 0x20000, dComIfGp_getMain2DArchive()); + JUT_ASSERT(fg != false); dPaneClass_showNullPane(mpPikariScreen); + mpPikariParent = new CPaneMgr(mpPikariScreen, 'pika_n', 0, NULL); - field_0x548 = ((J2DPicture*)mpPikariScreen->search('pika00'))->getBlack(); - field_0x54c = ((J2DPicture*)mpPikariScreen->search('pika00'))->getWhite(); + JUT_ASSERT(mpPikariParent != 0); + mPikariBlack = static_cast(mpPikariScreen->search('pika00'))->getBlack(); + mPikariWhite = static_cast(mpPikariScreen->search('pika00'))->getWhite(); + i_OSInitFastCast(); void* pikari_bck = JKRGetNameResource("zelda_icon_pikari.bck", dComIfGp_getMain2DArchive()); mPikariBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(pikari_bck); playPikariBckAnimation(1.0f); + void* pikari_bpk = JKRGetNameResource("zelda_icon_pikari.bpk", dComIfGp_getMain2DArchive()); mPikariBpk = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(pikari_bpk); mPikariBpk->searchUpdateMaterialID(mpPikariScreen); playPikariBpkAnimation(1.0f); mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + JUT_ASSERT(mpParent != 0); + + static u64 const a_tag[] = {'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at'}; + static u64 const b_tag[] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'}; + static u64 const z_tag[] = {'cont_zt1', 'cont_zt2', 'cont_zt3', 'cont_zt4', 'cont_rt'}; + static u64 const x_tag[] = {'cont_xt1', 'cont_xt2', 'cont_xt3', 'cont_xt4', 'cont_xt5'}; + static u64 const y_tag[] = {'cont_yt1', 'cont_yt2', 'cont_yt3', 'cont_yt4', 'cont_yt5'}; + for (int i = 0; i < 5; i++) { mpAText[i] = new CPaneMgr(mpScreen, a_tag[i], 0, NULL); - ((J2DTextBox*)mpAText[i]->getPanePtr())->setString(64, ""); - ((J2DTextBox*)mpAText[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpAText[i]->getPanePtr())->setCharSpace(g_drawHIO.mAButtonFontSpacing); + JUT_ASSERT(mpAText[i] != 0); + static_cast(mpAText[i]->getPanePtr())->setString(64, ""); + static_cast(mpAText[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); + static_cast(mpAText[i]->getPanePtr()) + ->setCharSpace(g_drawHIO.mButtonATextSpacing); mpBText[i] = new CPaneMgr(mpScreen, b_tag[i], 0, NULL); - ((J2DTextBox*)mpBText[i]->getPanePtr())->setString(64, ""); - ((J2DTextBox*)mpBText[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); + JUT_ASSERT(mpBText[i] != 0); + static_cast(mpBText[i]->getPanePtr())->setString(64, ""); + static_cast(mpBText[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); mpXYText[i][2] = new CPaneMgr(mpScreen, z_tag[i], 0, NULL); - ((J2DTextBox*)mpXYText[i][2]->getPanePtr())->setString(64, ""); - ((J2DTextBox*)mpXYText[i][2]->getPanePtr())->setFont(mDoExt_getMesgFont()); + JUT_ASSERT(mpXYText[i][2] != 0); + static_cast(mpXYText[i][2]->getPanePtr())->setString(64, ""); + static_cast(mpXYText[i][2]->getPanePtr())->setFont(mDoExt_getMesgFont()); mpXYText[i][0] = new CPaneMgr(mpScreen, x_tag[i], 0, NULL); - ((J2DTextBox*)mpXYText[i][0]->getPanePtr())->setString(64, ""); - ((J2DTextBox*)mpXYText[i][0]->getPanePtr())->setFont(mDoExt_getMesgFont()); + JUT_ASSERT(mpXYText[i][0] != 0); + static_cast(mpXYText[i][0]->getPanePtr())->setString(64, ""); + static_cast(mpXYText[i][0]->getPanePtr())->setFont(mDoExt_getMesgFont()); mpXYText[i][1] = new CPaneMgr(mpScreen, y_tag[i], 0, NULL); - ((J2DTextBox*)mpXYText[i][1]->getPanePtr())->setString(64, ""); - ((J2DTextBox*)mpXYText[i][1]->getPanePtr())->setFont(mDoExt_getMesgFont()); + JUT_ASSERT(mpXYText[i][1] != 0); + static_cast(mpXYText[i][1]->getPanePtr())->setString(64, ""); + static_cast(mpXYText[i][1]->getPanePtr())->setFont(mDoExt_getMesgFont()); } - J2DTextBox::TFontSize font_size = {lit_4184, lit_4185}; + J2DTextBox::TFontSize font_size; + font_size.mSizeX = 17.0f; + font_size.mSizeY = 20.0f; for (int i = 0; i < 5; i++) { - ((J2DTextBox*)mpAText[i]->getPanePtr())->setFontSize(font_size); - ((J2DTextBox*)mpBText[i]->getPanePtr())->setFontSize(font_size); - ((J2DTextBox*)mpXYText[i][2]->getPanePtr())->setFontSize(font_size); - ((J2DTextBox*)mpXYText[i][0]->getPanePtr())->setFontSize(font_size); - ((J2DTextBox*)mpXYText[i][1]->getPanePtr())->setFontSize(font_size); + static_cast(mpAText[i]->getPanePtr())->setFontSize(font_size); + static_cast(mpBText[i]->getPanePtr())->setFontSize(font_size); + static_cast(mpXYText[i][0]->getPanePtr())->setFontSize(font_size); + static_cast(mpXYText[i][1]->getPanePtr())->setFontSize(font_size); + static_cast(mpXYText[i][2]->getPanePtr())->setFontSize(font_size); } init(); @@ -548,17 +140,9 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* p_heap) { field_0x1e4 = 0; field_0x2fc = 0; field_0x36c = 0; + + OS_REPORT("exit dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n"); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/__ct__13dMeter2Draw_cFP10JKRExpHeap.s" -} -#pragma pop -#endif /* 802102F8-80210FB0 20AC38 0CB8+00 1/0 0/0 0/0 .text __dt__13dMeter2Draw_cFv */ dMeter2Draw_c::~dMeter2Draw_c() { @@ -612,8 +196,8 @@ dMeter2Draw_c::~dMeter2Draw_c() { delete mpLifeParts[i]; mpLifeParts[i] = NULL; - delete mpHeartMask[i]; - mpHeartMask[i] = NULL; + delete mpHeartMark[i]; + mpHeartMark[i] = NULL; delete mpHeartBase[i]; mpHeartBase[i] = NULL; @@ -691,7 +275,7 @@ dMeter2Draw_c::~dMeter2Draw_c() { for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { - mp_heap->free(mpItemBTex[i][j]); + heap->free(mpItemBTex[i][j]); mpItemBTex[i][j] = NULL; } } @@ -699,7 +283,7 @@ dMeter2Draw_c::~dMeter2Draw_c() { for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { for (int k = 0; k < 2; k++) { - mp_heap->free(mpItemXYTex[i][j][k]); + heap->free(mpItemXYTex[i][j][k]); mpItemXYTex[i][j][k] = NULL; } } @@ -819,20 +403,18 @@ dMeter2Draw_c::~dMeter2Draw_c() { /* 80210FB0-8021135C 20B8F0 03AC+00 1/1 0/0 0/0 .text init__13dMeter2Draw_cFv */ void dMeter2Draw_c::init() { - f32 tmp_0 = FLOAT_LABEL(lit_4182); - field_0x608 = tmp_0; - field_0x60c = tmp_0; + field_0x608 = 0.0f; + field_0x60c = 0.0f; for (int i = 0; i < 3; i++) { - field_0x620[i] = tmp_0; - field_0x610[i] = tmp_0; + field_0x620[i] = 0.0f; + field_0x610[i] = 0.0f; } - f32 tmp_0_1 = FLOAT_LABEL(lit_4182); - field_0x61c = tmp_0_1; + field_0x61c = 0.0f; for (int i = 0; i < 16; i++) { - field_0x62c[i] = tmp_0_1; - field_0x66c[i] = tmp_0_1; + field_0x62c[i] = 0.0f; + field_0x66c[i] = 0.0f; } field_0x759 = 0; @@ -843,100 +425,101 @@ void dMeter2Draw_c::init() { field_0x75f = 0; field_0x756 = -1; - field_0x760 = 0; - int j = 0; - f32 tmp_0_3 = FLOAT_LABEL(lit_4182); - for (; j < 3; j++) { - field_0x6ac[j] = tmp_0_3; - field_0x6b8[j] = tmp_0_3; - field_0x6c4[j] = tmp_0_3; - field_0x6d0[j] = tmp_0_3; + for (int j = 0; j < 3; j++) { + field_0x6ac[j] = 0.0f; + field_0x6b8[j] = 0.0f; + field_0x6c4[j] = 0.0f; + field_0x6d0[j] = 0.0f; } - f32 tmp_0_4 = FLOAT_LABEL(lit_4182); - field_0x6dc = tmp_0_4; - field_0x6e0 = tmp_0_4; - field_0x6e4 = tmp_0_4; - field_0x6e8 = tmp_0_4; - field_0x6ec = tmp_0_4; - field_0x6f0 = tmp_0_4; - mHUDScale = g_drawHIO.mHUDScale; - mHUDAlpha = g_drawHIO.mHUDAlpha; - mButtonsPosX = tmp_0_4; - mButtonsPosY = tmp_0_4; - mButtonsScale = lit_4183; + field_0x6dc = 0.0f; + field_0x6e0 = 0.0f; + field_0x6e4 = 0.0f; + field_0x6e8 = 0.0f; + field_0x6ec = 0.0f; + field_0x6f0 = 0.0f; + mParentScale = g_drawHIO.mParentScale; + mParentAlpha = g_drawHIO.mParentAlpha; + mButtonsPosX = 0.0f; + mButtonsPosY = 0.0f; + mButtonsScale = 1.0f; field_0x78c = g_drawHIO.mButtonDisplayBackScale; - field_0x790 = tmp_0_4; - mLifeGaugeHeartAlpha = g_drawHIO.mLifeGaugeHeartAlpha; - mLifeGaugeBaseAlpha = g_drawHIO.mLifeGaugeBaseAlpha; + mLifeParentAlpha = 0.0f; + mLifeParentHeartAlpha = g_drawHIO.mLifeParentHeartAlpha; + mHeartBaseAlpha = g_drawHIO.mHeartBaseAlpha; mHeartAlpha = g_drawHIO.mHeartAlpha; - mLargeHeartAlpha = g_drawHIO.mLargeHeartAlpha; - field_0x7a4 = tmp_0_4; + mBigHeartAlpha = g_drawHIO.mBigHeartAlpha; + field_0x7a4 = 0.0f; mMagicMeterAlpha = g_drawHIO.mMagicMeterAlpha; mMagicMeterFrameAlpha = g_drawHIO.mMagicMeterFrameAlpha; - field_0x7b0 = tmp_0_4; + field_0x7b0 = 0.0f; mLanternMeterAlpha = g_drawHIO.mLanternMeterAlpha; mLanternMeterFrameAlpha = g_drawHIO.mLanternMeterFrameAlpha; - field_0x7bc = tmp_0_4; + field_0x7bc = 0.0f; mOxygenMeterAlpha = g_drawHIO.mOxygenMeterAlpha; mOxygenMeterFrameAlpha = g_drawHIO.mOxygenMeterFrameAlpha; - field_0x7c8 = tmp_0_4; - field_0x861 = 0; - field_0x860 = 0; - field_0x7cc = g_drawHIO.mHUDAlpha; + field_0x7c8 = 0.0f; + field_0x860[1] = 0; + field_0x860[0] = 0; + field_0x7cc = g_drawHIO.mParentAlpha; field_0x7d0 = g_drawHIO.mRupeeKeyAlpha; mRupeeAlpha = g_drawHIO.mRupeeAlpha; mRupeeFrameAlpha = g_drawHIO.mRupeeFrameAlpha; mRupeeCountAlpha = g_drawHIO.mRupeeCountAlpha; - field_0x7e0 = g_drawHIO.mHUDAlpha; + field_0x7e0 = g_drawHIO.mParentAlpha; field_0x7e4 = g_drawHIO.mRupeeKeyAlpha; mKeyAlpha = g_drawHIO.mKeyAlpha; mKeyNumAlpha = g_drawHIO.mKeyNumAlpha; - field_0x7f0 = g_drawHIO.mHUDAlpha; + field_0x7f0 = g_drawHIO.mParentAlpha; mMainHUDButtonsAlpha = g_drawHIO.mMainHUDButtonsAlpha; mButtonDisplayBackAlpha = g_drawHIO.mButtonDisplayBackAlpha; - mAButtonAlpha = g_drawHIO.mAButtonAlpha; - mBButtonAlpha = g_drawHIO.mBButtonAlpha; - mXButtonAlpha = g_drawHIO.mXButtonAlpha; - mYButtonAlpha = g_drawHIO.mYButtonAlpha; + mButtonAAlpha = g_drawHIO.mButtonAAlpha; + mButtonBAlpha = g_drawHIO.mButtonBAlpha; + mButtonXAlpha = g_drawHIO.mButtonXAlpha; + mButtonYAlpha = g_drawHIO.mButtonYAlpha; field_0x80c = g_drawHIO.field_0x168; - field_0x810 = g_drawHIO.mZButtonAlpha; + field_0x810 = g_drawHIO.mButtonZAlpha; for (int i = 0; i < 2; i++) { - mBItemBaseAlpha[i] = g_drawHIO.mBItemBaseAlpha[i]; - mXButtonItemBaseAlpha[i] = g_drawHIO.mXButtonItemBaseAlpha[i]; - mYButtonItemBaseAlpha[i] = g_drawHIO.mYButtonItemBaseAlpha[i]; + mItemBBaseAlpha[i] = g_drawHIO.mItemBBaseAlpha[i]; + mButtonXItemBaseAlpha[i] = g_drawHIO.mButtonXItemBaseAlpha[i]; + mButtonYItemBaseAlpha[i] = g_drawHIO.mButtonYItemBaseAlpha[i]; field_0x82c[i] = g_drawHIO.field_0x298[i]; } - mZButtonItemBaseAlpha = g_drawHIO.mZButtonItemBaseAlpha; + mButtonZItemBaseAlpha = g_drawHIO.mButtonZItemBaseAlpha; mButtonBaseAlpha = g_drawHIO.mButtonBaseAlpha; - mAButtonFontSpacing = g_drawHIO.mAButtonFontSpacing; - mDPadButtonAlpha = g_drawHIO.mDPadButtonAlpha; - mDPadButtonITEMAlpha = g_drawHIO.mDPadButtonITEMAlpha; - mDPadButtonMAPAlpha = g_drawHIO.mDPadButtonMAPAlpha; - field_0x84c = g_drawHIO.mAButtonFontColor.r; - field_0x84d = g_drawHIO.mAButtonFontColor.g; - field_0x84e = g_drawHIO.mAButtonFontColor.b; - field_0x84f = g_drawHIO.mAButtonFontColor.a; - field_0x850 = g_drawHIO.mBButtonFontColor.r; - field_0x851 = g_drawHIO.mBButtonFontColor.g; - field_0x852 = g_drawHIO.mBButtonFontColor.b; - field_0x853 = g_drawHIO.mBButtonFontColor.a; - field_0x854 = g_drawHIO.field_0x2f0.r; - field_0x855 = g_drawHIO.field_0x2f0.g; - field_0x856 = g_drawHIO.field_0x2f0.b; - field_0x857 = g_drawHIO.field_0x2f0.a; - field_0x858 = g_drawHIO.mZButtonFontColor.r; - field_0x859 = g_drawHIO.mZButtonFontColor.g; - field_0x85a = g_drawHIO.mZButtonFontColor.b; - field_0x85b = g_drawHIO.mZButtonFontColor.a; - field_0x85c = g_drawHIO.mXYButtonFontColor.r; - field_0x85d = g_drawHIO.mXYButtonFontColor.g; - field_0x85e = g_drawHIO.mXYButtonFontColor.b; - field_0x85f = g_drawHIO.mXYButtonFontColor.a; + mButtonATextSpacing = g_drawHIO.mButtonATextSpacing; + mButtonCrossAlpha = g_drawHIO.mButtonCrossAlpha; + mButtonCrossITEMAlpha = g_drawHIO.mButtonCrossITEMAlpha; + mButtonCrossMAPAlpha = g_drawHIO.mButtonCrossMAPAlpha; + + mButtonATextColor.r = g_drawHIO.mButtonATextColor.r; + mButtonATextColor.g = g_drawHIO.mButtonATextColor.g; + mButtonATextColor.b = g_drawHIO.mButtonATextColor.b; + mButtonATextColor.a = g_drawHIO.mButtonATextColor.a; + + mButtonBTextColor.r = g_drawHIO.mButtonBFontColor.r; + mButtonBTextColor.g = g_drawHIO.mButtonBFontColor.g; + mButtonBTextColor.b = g_drawHIO.mButtonBFontColor.b; + mButtonBTextColor.a = g_drawHIO.mButtonBFontColor.a; + + field_0x854.r = g_drawHIO.field_0x2f0.r; + field_0x854.g = g_drawHIO.field_0x2f0.g; + field_0x854.b = g_drawHIO.field_0x2f0.b; + field_0x854.a = g_drawHIO.field_0x2f0.a; + + mButtonZTextColor.r = g_drawHIO.mButtonZFontColor.r; + mButtonZTextColor.g = g_drawHIO.mButtonZFontColor.g; + mButtonZTextColor.b = g_drawHIO.mButtonZFontColor.b; + mButtonZTextColor.a = g_drawHIO.mButtonZFontColor.a; + + mButtonXYTextColor.r = g_drawHIO.mButtonXYTextColor.r; + mButtonXYTextColor.g = g_drawHIO.mButtonXYTextColor.g; + mButtonXYTextColor.b = g_drawHIO.mButtonXYTextColor.b; + mButtonXYTextColor.a = g_drawHIO.mButtonXYTextColor.a; setItemParamX(0); setItemParamY(0); @@ -953,14 +536,14 @@ void dMeter2Draw_c::init() { /* 8021135C-8021151C 20BC9C 01C0+00 0/0 1/1 0/0 .text exec__13dMeter2Draw_cFUl */ void dMeter2Draw_c::exec(u32 i_status) { - if (mHUDScale != g_drawHIO.mHUDScale) { - mHUDScale = g_drawHIO.mHUDScale; - mpParent->scale(g_drawHIO.mHUDScale, g_drawHIO.mHUDScale); + if (mParentScale != g_drawHIO.mParentScale) { + mParentScale = g_drawHIO.mParentScale; + mpParent->scale(g_drawHIO.mParentScale, g_drawHIO.mParentScale); } - if (mHUDAlpha != g_drawHIO.mHUDAlpha) { - mHUDAlpha = g_drawHIO.mHUDAlpha; - mpParent->setAlphaRate(g_drawHIO.mHUDAlpha); + if (mParentAlpha != g_drawHIO.mParentAlpha) { + mParentAlpha = g_drawHIO.mParentAlpha; + mpParent->setAlphaRate(g_drawHIO.mParentAlpha); } if (i_status & 0x1000000) { @@ -992,39 +575,28 @@ void dMeter2Draw_c::exec(u32 i_status) { } } -/* ############################################################################################## */ -/* 80454890-80454894 002E90 0004+00 1/1 0/0 0/0 .sdata2 @4921 */ -SECTION_SDATA2 static f32 lit_4921 = 16.0f; - -/* 80454894-80454898 002E94 0004+00 9/9 0/0 0/0 .sdata2 @4922 */ -SECTION_SDATA2 static f32 lit_4922 = 0.5f; - -/* 80454898-804548A0 002E98 0004+04 7/7 0/0 0/0 .sdata2 @4923 */ -SECTION_SDATA2 static f32 lit_4923[1 + 1 /* padding */] = { - 18.0f, - /* padding */ - 0.0f, -}; - -/* 804548A0-804548A8 002EA0 0008+00 13/13 0/0 0/0 .sdata2 @4925 */ -SECTION_SDATA2 static f64 lit_4925 = 4503601774854144.0 /* cast s32 to float */; - /* 8021151C-80211BEC 20BE5C 06D0+00 1/0 0/0 0/0 .text draw__13dMeter2Draw_cFv */ -#ifdef NONMATCHING void dMeter2Draw_c::draw() { - J2DGrafContext* graf = dComIfGp_getCurrentGrafPort(); + J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort(); + graf_ctx->setup2D(); - mpScreen->draw(0.0f, 0.0f, graf); + mpScreen->draw(0.0f, 0.0f, graf_ctx); drawKanteraScreen(1); drawKanteraScreen(2); for (int i = 0; i < 2; i++) { if (mpItemXY[i] != NULL) { for (int j = 0; j < 3; j++) { - JGeometry::TVec3 vtx1 = pane->getPanePtr()->getGlbVtx(0); - JGeometry::TVec3 vtx2 = pane->getPanePtr()->getGlbVtx(3); + f32 temp_f30 = mItemParams[i].num_scale * 16.0f; - // mpItemNumTex[i][j]-> + JGeometry::TVec3 vtx0 = mpItemXY[i]->getPanePtr()->getGlbVtx(0); + JGeometry::TVec3 vtx3 = mpItemXY[i]->getPanePtr()->getGlbVtx(3); + + mpItemNumTex[i][j]->draw(mItemParams[i].num_pos_x + + (((vtx0.x + vtx3.x) * 0.5f) + (temp_f30 * j)), + mItemParams[i].num_pos_y + + (((vtx0.y + vtx3.y) * 0.5f) + mpItemXY[i]->getSizeY()), + temp_f30, temp_f30, false, false, false); } } } @@ -1035,164 +607,209 @@ void dMeter2Draw_c::draw() { if (!dComIfGp_isPauseFlag() && mpButtonParent->getAlphaRate() != 0.0f) { if (field_0x608 > 0.0f) { - drawPikari(mpBTextA, &field_0x608, g_drawHIO.mAButtonHighlightScale, - g_drawHIO.mAButtonHighlightFrontOuter, g_drawHIO.mAButtonHighlightFrontInner, - g_drawHIO.mAButtonHighlightBackOuter, g_drawHIO.mAButtonHighlightBackInner, - g_drawHIO.mAButtonHighlightAnimSpeed, field_0x759); + drawPikari(mpBTextA, &field_0x608, g_drawHIO.mButtonAPikariScale, + g_drawHIO.mButtonAPikariFrontOuter, g_drawHIO.mButtonAPikariFrontInner, + g_drawHIO.mButtonAPikariBackOuter, g_drawHIO.mButtonAPikariBackInner, + g_drawHIO.mButtonAPikariAnimSpeed, field_0x759); } if (field_0x60c > 0.0f) { - drawPikari(mpBTextB, &field_0x60c, g_drawHIO.mBButtonHighlightScale, - g_drawHIO.mBButtonHighlightFrontOuter, g_drawHIO.mBButtonHighlightFrontInner, - g_drawHIO.mBButtonHighlightBackOuter, g_drawHIO.mBButtonHighlightBackInner, - g_drawHIO.mBButtonHighlightAnimSpeed, field_0x75a); + drawPikari(mpBTextB, &field_0x60c, g_drawHIO.mButtonBPikariScale, + g_drawHIO.mButtonBPikariFrontOuter, g_drawHIO.mButtonBPikariFrontInner, + g_drawHIO.mButtonBPikariBackOuter, g_drawHIO.mButtonBPikariBackInner, + g_drawHIO.mButtonBPikariAnimSpeed, field_0x75a); } for (int i = 0; i < 2; i++) { - if (field_0x60c > 0.0f) { - drawPikari(mpBTextXY[i], &field_0x620[i], g_drawHIO.mXYButtonHighlightScale, - g_drawHIO.mXYButtonHighlightFrontOuter, g_drawHIO.mXYButtonHighlightFrontInner, - g_drawHIO.mXYButtonHighlightBackOuter, g_drawHIO.XYButtonHighlightBackInner, - g_drawHIO.mXYButtonHighlightAnimSpeed, field_0x768[i]); + if (field_0x620[i] > 0.0f) { + drawPikari(mpBTextXY[i], &field_0x620[i], g_drawHIO.mButtonXYPikariScale, + g_drawHIO.mButtonXYPikariFrontOuter, g_drawHIO.mButtonXYPikariFrontInner, + g_drawHIO.mButtonXYPikariBackOuter, g_drawHIO.mButtonXYPikariBackInner, + g_drawHIO.mButtonXYPikariAnimSpeed, field_0x75c[i]); } } } - // TODO + if (mpLightDropParent->getAlphaRate() != 0.0f) { + f32 var_f28 = g_drawHIO.mLightDrop.mPikariScaleNormal; + f32 var_f29 = g_drawHIO.mLightDrop.mDropPikariAnimSpeed; + + if (field_0x756 >= 0) { + var_f29 = g_drawHIO.mLightDrop.mDropPikariAnimSpeed_Completed; + int temp_r5_2 = g_drawHIO.mLightDrop.mPikariInterval * 15; + + if (field_0x756 <= temp_r5_2) { + int temp_r4 = (field_0x756 % g_drawHIO.mLightDrop.mPikariInterval); + int temp_r3_5 = field_0x756 / g_drawHIO.mLightDrop.mPikariInterval; + + if (temp_r4 == 0 && field_0x62c[temp_r3_5] == 0.0f) { + field_0x62c[temp_r3_5] = 18.0f; + } + + var_f28 = g_drawHIO.mLightDrop.mPikariScaleComplete; + field_0x756++; + } else { + int temp_r5_3 = temp_r5_2 + 1; + + if (field_0x756 == temp_r5_3) { + if (field_0x62c[15] == 0.0f) { + field_0x756++; + } + + var_f28 = g_drawHIO.mLightDrop.mPikariScaleComplete; + } else if (field_0x756 >= g_drawHIO.mLightDrop.field_0x54 + temp_r5_3) { + for (int i = 0; i < 16; i++) { + field_0x62c[i] = 18.0f - var_f29; + field_0x66c[i] = 18.0f - g_drawHIO.mLightDrop.mPikariLoopAnimSpeed; + } + + field_0x756 = -1; + } else { + field_0x756++; + } + } + } + + for (int i = 0; i < 16; i++) { + if (field_0x66c[i] > 0.0f) { + drawPikari(mpSIParts[i][1], &g_drawHIO.mLightDrop.mPikariLoopBackStopFrame, + g_drawHIO.mLightDrop.mPikariLoopBackScale, + g_drawHIO.mLightDrop.mPikariLoopFrontOuter[1], + g_drawHIO.mLightDrop.mPikariLoopFrontInner[1], + g_drawHIO.mLightDrop.mPikariLoopBackOuter[1], + g_drawHIO.mLightDrop.mPikariLoopBackInner[1], 0.0f, 3); + drawPikari(mpSIParts[i][1], &field_0x66c[i], g_drawHIO.mLightDrop.mPikariLoopScale, + g_drawHIO.mLightDrop.mPikariLoopFrontOuter[0], + g_drawHIO.mLightDrop.mPikariLoopFrontInner[0], + g_drawHIO.mLightDrop.mPikariLoopBackOuter[0], + g_drawHIO.mLightDrop.mPikariLoopBackInner[0], + g_drawHIO.mLightDrop.mPikariLoopAnimSpeed, 3); + } + + if (g_drawHIO.mLightDrop.mAnimDebug) { + if (dComIfGp_getNeedLightDropNum() != + dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea())) + { + field_0x66c[i] = 0.0f; + } + } + } + + for (int i = 0; i < 16; i++) { + if (field_0x62c[i] > 0.0f) { + drawPikari(mpSIParts[i][1], &field_0x62c[i], var_f28, + g_drawHIO.mLightDrop.mDropPikariFrontOuter, + g_drawHIO.mLightDrop.mDropPikariFrontInner, + g_drawHIO.mLightDrop.mDropPikariBackOuter, + g_drawHIO.mLightDrop.mDropPikariBackInner, var_f29, field_0x75f); + } + } + } + + if (field_0x738 > 0.0f) { + drawPikari(mpButtonMidona, &field_0x738, g_drawHIO.mMidnaIconPikariScale, + g_drawHIO.mMidnaIconPikariFrontOuter, g_drawHIO.mMidnaIconPikariFrontInner, + g_drawHIO.mMidnaIconPikariBackOuter, g_drawHIO.mMidnaIconPikariBackInner, + g_drawHIO.mMidnaIconPikariAnimSpeed, 3); + } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::draw() { - nofralloc -#include "asm/d/meter/d_meter2_draw/draw__13dMeter2Draw_cFv.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80398320-803983C0 024980 00A0+00 0/1 0/0 0/0 .rodata life_tag$4931 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const life_tag[160] = { - 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x30, 0x30, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x30, 0x31, - 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x30, 0x33, - 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x30, 0x34, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x30, 0x35, - 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x30, 0x37, - 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x30, 0x38, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x30, 0x39, - 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x30, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x31, - 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x33, - 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x35, - 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x36, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x37, - 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x38, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x39, -}; -COMPILER_STRIP_GATE(0x80398320, &life_tag); -#pragma pop - -/* 803983C0-80398460 024A20 00A0+00 0/1 0/0 0/0 .rodata mark_tag$4932 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const mark_tag[160] = { - 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x30, 0x30, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x30, 0x31, - 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x30, 0x32, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x30, 0x33, - 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x30, 0x34, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x30, 0x35, - 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x30, 0x36, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x30, 0x37, - 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x30, 0x38, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x30, 0x39, - 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x30, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x31, - 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x32, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x33, - 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x34, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x35, - 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x36, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x37, - 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x38, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x39, -}; -COMPILER_STRIP_GATE(0x803983C0, &mark_tag); -#pragma pop - -/* 80398460-80398500 024AC0 00A0+00 0/1 0/0 0/0 .rodata base_tag$4933 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const base_tag[160] = { - 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x30, 0x30, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x30, 0x31, - 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x30, 0x32, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x30, 0x33, - 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x30, 0x34, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x30, 0x35, - 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x30, 0x36, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x30, 0x37, - 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x30, 0x38, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x30, 0x39, - 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x30, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x31, - 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x32, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x33, - 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x34, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x35, - 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x36, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x37, - 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x38, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x39, -}; -COMPILER_STRIP_GATE(0x80398460, &base_tag); -#pragma pop - -/* 80398500-803985A0 024B60 00A0+00 0/1 0/0 0/0 .rodata lifet1_tag$4934 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lifet1_tag[160] = { - 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x30, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x31, 0x73, - 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x32, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x33, 0x73, - 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x34, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x35, 0x73, - 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x36, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x37, 0x73, - 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x38, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x39, 0x73, - 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x30, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x31, 0x73, - 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x32, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x33, 0x73, - 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x34, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x35, 0x73, - 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x36, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x37, 0x73, - 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x38, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x39, 0x73, -}; -COMPILER_STRIP_GATE(0x80398500, &lifet1_tag); -#pragma pop - -/* 803985A0-80398640 024C00 00A0+00 0/1 0/0 0/0 .rodata lifet2_tag$4935 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lifet2_tag[160] = { - 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x30, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x31, - 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x32, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x33, - 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x34, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x35, - 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x36, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x37, - 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x38, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x30, 0x39, - 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x30, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x31, - 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x32, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x33, - 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x34, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x35, - 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x36, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x37, - 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x38, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x39, -}; -COMPILER_STRIP_GATE(0x803985A0, &lifet2_tag); -#pragma pop /* 80211BEC-80211E64 20C52C 0278+00 1/1 0/0 0/0 .text initLife__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::initLife() { - nofralloc -#include "asm/d/meter/d_meter2_draw/initLife__13dMeter2Draw_cFv.s" -} -#pragma pop +void dMeter2Draw_c::initLife() { + if (i_dComIfGs_getLife() > dComIfGs_getMaxLifeGauge()) { + // "●●●●●●Heart Count adjust======>%d, %d\n" + OS_REPORT("●●●●●●ハートの数調整======>%d, %d\n", i_dComIfGs_getLife(), + dComIfGs_getMaxLifeGauge()); + dComIfGs_setLife(dComIfGs_getMaxLifeGauge()); + } -/* ############################################################################################## */ -/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803989C0 = "zelda_game_image_sanso_10percent.bpk"; -SECTION_DEAD static char const* const stringBase_803989E5 = "zelda_game_image_sanso_25percent.bpk"; -SECTION_DEAD static char const* const stringBase_80398A0A = "zelda_game_image_sanso_50percent.bpk"; -#pragma pop + static u64 const life_tag[] = { + 'hpb_00', 'hpb_01', 'hpb_02', 'hpb_03', 'hpb_04', 'hpb_05', 'hpb_06', + 'hpb_07', 'hpb_08', 'hpb_09', 'hpb_10', 'hpb_11', 'hpb_12', 'hpb_13', + 'hpb_14', 'hpb_15', 'hpb_16', 'hpb_17', 'hpb_18', 'hpb_19', + }; + + static u64 const mark_tag[] = { + 'heartn00', 'heartn01', 'heartn02', 'heartn03', 'heartn04', 'heartn05', 'heartn06', + 'heartn07', 'heartn08', 'heartn09', 'heartn10', 'heartn11', 'heartn12', 'heartn13', + 'heartn14', 'heartn15', 'heartn16', 'heartn17', 'heartn18', 'heartn19', + }; + + static u64 const base_tag[] = { + 'h_ba_n00', 'h_ba_n01', 'h_ba_n02', 'h_ba_n03', 'h_ba_n04', 'h_ba_n05', 'h_ba_n06', + 'h_ba_n07', 'h_ba_n08', 'h_ba_n09', 'h_ba_n10', 'h_ba_n11', 'h_ba_n12', 'h_ba_n13', + 'h_ba_n14', 'h_ba_n15', 'h_ba_n16', 'h_ba_n17', 'h_ba_n18', 'h_ba_n19', + }; + + static u64 const lifet1_tag[] = { + 'hear_00s', 'hear_01s', 'hear_02s', 'hear_03s', 'hear_04s', 'hear_05s', 'hear_06s', + 'hear_07s', 'hear_08s', 'hear_09s', 'hear_10s', 'hear_11s', 'hear_12s', 'hear_13s', + 'hear_14s', 'hear_15s', 'hear_16s', 'hear_17s', 'hear_18s', 'hear_19s', + }; + + static u64 const lifet2_tag[] = { + 'hear_00', 'hear_01', 'hear_02', 'hear_03', 'hear_04', 'hear_05', 'hear_06', + 'hear_07', 'hear_08', 'hear_09', 'hear_10', 'hear_11', 'hear_12', 'hear_13', + 'hear_14', 'hear_15', 'hear_16', 'hear_17', 'hear_18', 'hear_19', + }; + + mpLifeParent = new CPaneMgr(mpScreen, 'heart_n', 2, NULL); + JUT_ASSERT(mpLifeParent != 0); + + for (int i = 0; i < 20; i++) { + mpLifeParts[i] = new CPaneMgr(mpScreen, life_tag[i], 0, NULL); + JUT_ASSERT(mpLifeParts[i] != 0); + + mpHeartMark[i] = new CPaneMgr(mpScreen, mark_tag[i], 2, NULL); + JUT_ASSERT(mpHeartMark[i] != 0); + + mpHeartBase[i] = new CPaneMgrAlpha(mpScreen, base_tag[i], 2, NULL); + JUT_ASSERT(mpHeartBase[i] != 0); + + mpLifeTexture[i][0] = new CPaneMgrAlpha(mpScreen, lifet1_tag[i], 0, NULL); + JUT_ASSERT(mpLifeTexture[i][0] != 0); + + mpLifeTexture[i][1] = new CPaneMgrAlpha(mpScreen, lifet2_tag[i], 0, NULL); + JUT_ASSERT(mpLifeTexture[i][1] != 0); + } + + mpBigHeart = new CPaneMgr(mpScreen, 'bigh_n', 2, NULL); + JUT_ASSERT(mpBigHeart != 0); + + mpLifeParent->setAlphaRate(0.0f); + + f32 var_f1 = g_drawHIO.mLifeTopPosX; + f32 var_f2 = 0.0f; + + if (dComIfGs_getMaxLife() <= 50) { + var_f2 = g_drawHIO.mLifeTopPosY; + } + + drawLife(dComIfGs_getMaxLife(), i_dComIfGs_getLife(), g_drawHIO.mLifeGaugePosX + var_f1, + g_drawHIO.mLifeGaugePosY + var_f2); + setAlphaLifeChange(true); +} /* 80211E64-80212190 20C7A4 032C+00 1/1 0/0 0/0 .text initMagic__13dMeter2Draw_cFv */ -// matches with literals -#ifdef NONMATCHING void dMeter2Draw_c::initMagic() { field_0x550 = 0.0f; field_0x554 = 0.0f; mpMagicParent = new CPaneMgr(mpKanteraScreen, 'magic_n', 2, NULL); + JUT_ASSERT(mpMagicParent != 0); + mpMagicBase = new CPaneMgr(mpKanteraScreen, 'mm_base', 0, NULL); + JUT_ASSERT(mpMagicBase != 0); + mpMagicFrameL = new CPaneMgr(mpKanteraScreen, 'm_w_l_n', 2, NULL); - mpMagicFrameR = new CPaneMgr(mpKanteraScreen, 'm_w_r_n', 2, NULL); + JUT_ASSERT(mpMagicFrameL != 0); + + mpMagicFrameR = + new CPaneMgr(mpKanteraScreen, 'm_w_r_n', 2, NULL) JUT_ASSERT(mpMagicFrameR != 0); + mpMagicMeter = new CPaneMgr(mpKanteraScreen, 'mm_00', 0, NULL); + JUT_ASSERT(mpMagicMeter != 0); + i_OSInitFastCast(); void* res = JKRFileLoader::getGlbResource("zelda_game_image_sanso_10percent.bpk", @@ -1231,323 +848,730 @@ void dMeter2Draw_c::initMagic() { g_drawHIO.mMagicMeterPosY + offsetY); setAlphaMagicChange(true); - drawKantera((u16)dComIfGs_getMaxOil(), (u16)dComIfGs_getOil(), - g_drawHIO.mLanternMeterPosX + offsetX, + drawKantera(dComIfGs_getMaxOil(), dComIfGs_getOil(), g_drawHIO.mLanternMeterPosX + offsetX, g_drawHIO.mNoMagicPosY + (g_drawHIO.mLanternMeterPosY + offsetY)); setAlphaKanteraChange(true); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::initMagic() { - nofralloc -#include "asm/d/meter/d_meter2_draw/initMagic__13dMeter2Draw_cFv.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80398640-803986C0 024CA0 0080+00 0/1 0/0 0/0 .rodata tuta_0$5094 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const tuta_0[128] = { - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x31, - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x33, - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x34, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x35, - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x37, - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x39, - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x30, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x31, - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x33, - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x35, -}; -COMPILER_STRIP_GATE(0x80398640, &tuta_0); -#pragma pop - -/* 803986C0-80398740 024D20 0080+00 0/1 0/0 0/0 .rodata tuta_1$5095 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const tuta_1[128] = { - 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x30, 0x30, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x30, 0x31, - 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x30, 0x33, - 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x30, 0x34, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x30, 0x35, - 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x30, 0x37, - 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x30, 0x38, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x30, 0x39, - 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x30, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x31, - 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x33, - 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x35, -}; -COMPILER_STRIP_GATE(0x803986C0, &tuta_1); -#pragma pop - -/* 80398740-803987C0 024DA0 0080+00 0/1 0/0 0/0 .rodata tuta_2$5096 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const tuta_2[128] = { - 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x30, 0x30, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x30, 0x31, - 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x30, 0x33, - 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x30, 0x34, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x30, 0x35, - 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x30, 0x37, - 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x30, 0x38, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x30, 0x39, - 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x30, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x31, - 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x33, - 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x35, -}; -COMPILER_STRIP_GATE(0x80398740, &tuta_2); -#pragma pop /* 80212190-80212404 20CAD0 0274+00 1/1 0/0 0/0 .text initLightDrop__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::initLightDrop() { - nofralloc -#include "asm/d/meter/d_meter2_draw/initLightDrop__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::initLightDrop() { + mpLightDropParent = new CPaneMgr(mpScreen, 's_tuta_n', 2, NULL); + JUT_ASSERT(mpLightDropParent != 0); + + static u64 const tuta_0[] = { + 's_00', 's_01', 's_02', 's_03', 's_04', 's_05', 's_06', 's_07', + 's_08', 's_09', 's_10', 's_11', 's_12', 's_13', 's_14', 's_15', + }; + + static u64 const tuta_1[] = { + 'sl_00', 'sl_01', 'sl_02', 'sl_03', 'sl_04', 'sl_05', 'sl_06', 'sl_07', + 'sl_08', 'sl_09', 'sl_10', 'sl_11', 'sl_12', 'sl_13', 'sl_14', 'sl_15', + }; + + static u64 const tuta_2[] = { + 'scp_00', 'scp_01', 'scp_02', 'scp_03', 'scp_04', 'scp_05', 'scp_06', 'scp_07', + 'scp_08', 'scp_09', 'scp_10', 'scp_11', 'scp_12', 'scp_13', 'scp_14', 'scp_15', + }; + + for (int i = 0; i < 16; i++) { + mpSIParts[i][0] = new CPaneMgr(mpScreen, tuta_0[i], 0, NULL); + JUT_ASSERT(mpSIParts[i][0] != 0); + + mpSIParts[i][1] = new CPaneMgr(mpScreen, tuta_1[i], 0, NULL); + JUT_ASSERT(mpSIParts[i][1] != 0); + + mpSIParts[i][2] = new CPaneMgr(mpScreen, tuta_2[i], 0, NULL); + JUT_ASSERT(mpSIParts[i][2] != 0); + } + + mpSIParent[0] = new CPaneMgr(mpScreen, 'tuta_n', 2, NULL); + JUT_ASSERT(mpSIParent[0] != 0); + + mpSIParent[1] = new CPaneMgr(mpScreen, 's_null', 2, NULL); + JUT_ASSERT(mpSIParent[1] != 0); + + mpLightDropParent->setAlphaRate(0.0f); + field_0x6fc = 0.0f; + mLightDropVesselScale = g_drawHIO.mLightDrop.mVesselScale; + field_0x6f8 = 1.0f; + + for (int i = 0; i < 3; i++) { + if (dComIfGs_isLightDropGetFlag(i)) { + dMeter2Info_setLightDropGetFlag(i, 0xFF); + } else { + dMeter2Info_setLightDropGetFlag(i, 0); + } + } + + drawLightDrop(dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()), + dComIfGp_getNeedLightDropNum(), g_drawHIO.mLightDrop.mVesselPosX, + g_drawHIO.mLightDrop.mVesselPosY, g_drawHIO.mLightDrop.mVesselScale, + g_drawHIO.mLightDrop.mVesselAlpha[0], 0); + setAlphaLightDropChange(true); } -#pragma pop - -/* ############################################################################################## */ -/* 803987C0-803987E0 024E20 0020+00 0/1 0/0 0/0 .rodata rupeet1_tag$5152 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const rupeet1_tag[32] = { - 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x31, 0x5F, 0x73, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x32, 0x5F, 0x73, - 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x33, 0x5F, 0x73, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x34, 0x5F, 0x73, -}; -COMPILER_STRIP_GATE(0x803987C0, &rupeet1_tag); -#pragma pop - -/* 803987E0-80398800 024E40 0020+00 0/1 0/0 0/0 .rodata rupeet2_tag$5153 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const rupeet2_tag[32] = { - 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x32, - 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x33, 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x34, -}; -COMPILER_STRIP_GATE(0x803987E0, &rupeet2_tag); -#pragma pop - -/* 80398800-80398828 024E60 0028+00 0/1 0/0 0/0 .rodata key_tag$5165 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const key_tag[40] = { - 0x00, 0x6B, 0x65, 0x79, 0x5F, 0x6E, 0x75, 0x6C, 0x00, 0x6B, 0x5F, 0x6E, 0x5F, 0x31, - 0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E, 0x5F, 0x32, 0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E, - 0x5F, 0x33, 0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E, 0x5F, 0x34, 0x5F, 0x6E, -}; -COMPILER_STRIP_GATE(0x80398800, &key_tag); -#pragma pop /* 80212404-802126E4 20CD44 02E0+00 1/1 0/0 0/0 .text initRupeeKey__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::initRupeeKey() { - nofralloc -#include "asm/d/meter/d_meter2_draw/initRupeeKey__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::initRupeeKey() { + mpRupeeKeyParent = new CPaneMgr(mpScreen, 'r_k_n', 2, NULL); + JUT_ASSERT(mpRupeeKeyParent != 0); + field_0x718 = 1.0f; + + static u64 const rupeet1_tag[] = {'r_n_1_s', 'r_n_2_s', 'r_n_3_s', 'r_n_4_s'}; + static u64 const rupeet2_tag[] = {'r_n_1', 'r_n_2', 'r_n_3', 'r_n_4'}; + + for (int i = 0; i < 4; i++) { + mpRupeeTexture[i][0] = new CPaneMgr(mpScreen, rupeet1_tag[i], 0, NULL); + JUT_ASSERT(mpRupeeTexture[i][0] != 0); + mpRupeeTexture[i][0]->getPanePtr()->setBasePosition(J2DBasePosition_4); + + mpRupeeTexture[i][1] = new CPaneMgr(mpScreen, rupeet2_tag[i], 0, NULL); + JUT_ASSERT(mpRupeeTexture[i][1] != 0); + mpRupeeTexture[i][1]->getPanePtr()->setBasePosition(J2DBasePosition_4); + } + + mpRupeeParent[0] = new CPaneMgr(mpScreen, 'rupi_n', 2, NULL); + JUT_ASSERT(mpRupeeParent[0] != 0); + + mpRupeeParent[1] = new CPaneMgr(mpScreen, 'moyou_rn', 2, NULL); + JUT_ASSERT(mpRupeeParent[1] != 0); + + mpRupeeParent[2] = new CPaneMgr(mpScreen, 'moyou_ln', 2, NULL); + JUT_ASSERT(mpRupeeParent[2] != 0); + + mpRupeeParent[0]->setAlphaRate(0.0f); + mpRupeeParent[1]->setAlphaRate(0.0f); + mpRupeeParent[2]->setAlphaRate(0.0f); + + static u64 const key_tag[] = {'key_nul', 'k_n_1_n', 'k_n_2_n', 'k_n_3_n', 'k_n_4_n'}; + + for (int i = 0; i < 5; i++) { + mpKeyTexture[i] = new CPaneMgr(mpScreen, key_tag[i], 0, NULL); + JUT_ASSERT(mpKeyTexture[i] != 0); + mpKeyTexture[i]->getPanePtr()->setBasePosition(J2DBasePosition_4); + mpKeyTexture[i]->hide(); + } + + mpKeyParent = new CPaneMgr(mpScreen, 'key_n', 2, NULL); + JUT_ASSERT(mpKeyParent != 0); + mpKeyParent->setAlphaRate(0.0f); + + drawRupee(i_dComIfGs_getRupee()); + drawKey(dComIfGs_getKeyNum()); + setAlphaRupeeChange(true); + setAlphaKeyChange(true); } -#pragma pop - -/* ############################################################################################## */ -/* 80398828-80398850 024E88 0028+00 1/1 0/0 0/0 .rodata juji_i_tag$5269 */ -SECTION_RODATA static u8 const juji_i_tag[40] = { - 0x6A, 0x75, 0x5F, 0x72, 0x69, 0x6E, 0x67, 0x34, 0x00, 0x79, 0x61, 0x6A, 0x69, 0x5F, - 0x30, 0x30, 0x00, 0x79, 0x61, 0x6A, 0x69, 0x5F, 0x30, 0x31, 0x6A, 0x75, 0x5F, 0x72, - 0x69, 0x6E, 0x67, 0x32, 0x6A, 0x75, 0x5F, 0x72, 0x69, 0x6E, 0x67, 0x34, -}; -COMPILER_STRIP_GATE(0x80398828, &juji_i_tag); - -/* 80398850-80398878 024EB0 0028+00 1/1 0/0 0/0 .rodata juji_m_tag$5270 */ -SECTION_RODATA static u8 const juji_m_tag[40] = { - 0x6A, 0x75, 0x5F, 0x72, 0x69, 0x6E, 0x67, 0x33, 0x00, 0x79, 0x61, 0x6A, 0x69, 0x5F, - 0x30, 0x32, 0x00, 0x79, 0x61, 0x6A, 0x69, 0x5F, 0x30, 0x33, 0x6A, 0x75, 0x5F, 0x72, - 0x69, 0x6E, 0x67, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80398850, &juji_m_tag); /* 802126E4-8021350C 20D024 0E28+00 1/1 0/0 0/0 .text initButton__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::initButton() { - nofralloc -#include "asm/d/meter/d_meter2_draw/initButton__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::initButton() { + field_0x761 = 1; + field_0x762 = 1; + field_0x763 = 1; + field_0x764 = 1; + field_0x765 = 1; + field_0x766 = 1; + field_0x767 = 1; + + for (int i = 0; i < 3; i++) { + field_0x768[i] = 1; + } + + for (int i = 0; i < 2; i++) { + for (int j = 0; j < 2; j++) { + mpItemBTex[i][j] = (ResTIMG*)heap->alloc(0xC00, 0x20); + JUT_ASSERT(mpItemBTex[i][j] != 0); + } + } + + for (int i = 0; i < 2; i++) { + field_0x773[i] = dMeter2Info_isDirectUseItem(i); + field_0x76c[i] = 0; + + for (int j = 0; j < 2; j++) { + for (int k = 0; k < 2; k++) { + mpItemXYTex[i][j][k] = (ResTIMG*)heap->alloc(0xC00, 0x20); + JUT_ASSERT(mpItemXYTex[i][j][k] != 0); + } + } + } + + mpItemB = new CPaneMgr(mpScreen, 'b_itm_p', 0, NULL); + JUT_ASSERT(mpItemB != 0); + mpItemB->getPanePtr()->setBasePosition(J2DBasePosition_4); + mpItemB->show(); + + field_0x728 = 1.0f; + field_0x734 = 1.0f; + field_0x76b = 0; + mButtonBItem = 0; + + dComIfGs_setBButtonItemKey(0xFF); + field_0x770 = 0xFF; + field_0x771 = dComIfGs_getBButtonItemKey(); + + mpItemBPane = new J2DPicture( + 'b_itm_pp', + JGeometry::TBox2(0.0f, 0.0f, mpItemB->getInitSizeX(), mpItemB->getInitSizeY()), + static_cast(mpItemB->getPanePtr())->getTexture(0)->getTexInfo(), NULL); + JUT_ASSERT(mpItemBPane != 0); + mpItemBPane->setBasePosition(J2DBasePosition_4); + mpItemB->getPanePtr()->appendChild(mpItemBPane); + + mpItemXY[0] = new CPaneMgr(mpScreen, 'x_itm_p', 0, NULL); + JUT_ASSERT(mpItemXY[0] != 0); + mpItemXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4); + dMeter2Info_setMeterItemPanePtr(0, mpItemXY[0]); + + mpItemXY[1] = new CPaneMgr(mpScreen, 'y_itm_p', 0, NULL); + JUT_ASSERT(mpItemXY[1] != 0); + mpItemXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4); + dMeter2Info_setMeterItemPanePtr(1, mpItemXY[1]); + + mpItemR = NULL; + mpBTextA = NULL; + + mpItemXYPane[0] = new J2DPicture( + 'x_itm_pp', + JGeometry::TBox2(0.0f, 0.0f, mpItemXY[0]->getInitSizeX(), mpItemXY[0]->getInitSizeY()), + static_cast(mpItemXY[0]->getPanePtr())->getTexture(0)->getTexInfo(), NULL); + JUT_ASSERT(mpItemXYPane[0] != 0); + mpItemXYPane[0]->setBasePosition(J2DBasePosition_4); + mpItemXY[0]->getPanePtr()->appendChild(mpItemXYPane[0]); + + mpItemXYPane[1] = new J2DPicture( + 'y_itm_pp', + JGeometry::TBox2(0.0f, 0.0f, mpItemXY[1]->getInitSizeX(), mpItemXY[1]->getInitSizeY()), + static_cast(mpItemXY[1]->getPanePtr())->getTexture(0)->getTexInfo(), NULL); + JUT_ASSERT(mpItemXYPane[1] != 0); + mpItemXYPane[1]->setBasePosition(J2DBasePosition_4); + mpItemXY[1]->getPanePtr()->appendChild(mpItemXYPane[1]); + + mpItemR = new CPaneMgr(mpScreen, 'r_itm_p', 0, NULL); + JUT_ASSERT(mpItemR != 0); + mpItemR->getPanePtr()->setBasePosition(J2DBasePosition_4); + dMeter2Info_setMeterItemPanePtr(2, mpItemR); + + mpItemXYPane[2] = new J2DPicture( + 'r_itm_pp', + JGeometry::TBox2(0.0f, 0.0f, mpItemR->getInitSizeX(), mpItemR->getInitSizeY()), + static_cast(mpItemR->getPanePtr())->getTexture(0)->getTexInfo(), NULL); + JUT_ASSERT(mpItemXYPane[2] != 0); + mpItemXYPane[2]->setBasePosition(J2DBasePosition_4); + mpItemR->getPanePtr()->appendChild(mpItemXYPane[2]); + + mpLightB = new CPaneMgr(mpScreen, 'b_light', 0, NULL); + JUT_ASSERT(mpLightB != 0); + mpLightB->getPanePtr()->setBasePosition(J2DBasePosition_4); + field_0x72c = 1.0f; + mpLightB->hide(); + + mpLightXY[0] = new CPaneMgr(mpScreen, 'x_light', 0, NULL); + JUT_ASSERT(mpLightXY[0] != 0); + mpLightXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4); + mpLightXY[0]->hide(); + + mpLightXY[1] = new CPaneMgr(mpScreen, 'y_light', 0, NULL); + JUT_ASSERT(mpLightXY[1] != 0); + mpLightXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4); + mpLightXY[1]->hide(); + + mpLightXY[2] = new CPaneMgr(mpScreen, 'r_light', 0, NULL); + JUT_ASSERT(mpLightXY[2] != 0); + mpLightXY[2]->getPanePtr()->setBasePosition(J2DBasePosition_4); + mpLightXY[2]->hide(); + + mpBTextA = new CPaneMgr(mpScreen, 'b_text_a', 0, NULL); + JUT_ASSERT(mpBTextA != 0); + + mpBTextB = new CPaneMgr(mpScreen, 'b_text_b', 0, NULL); + JUT_ASSERT(mpBTextB != 0); + + mpBTextXY[0] = new CPaneMgr(mpScreen, 'b_text_x', 0, NULL); + JUT_ASSERT(mpBTextXY[0] != 0); + + mpBTextXY[1] = new CPaneMgr(mpScreen, 'b_text_y', 0, NULL); + JUT_ASSERT(mpBTextXY[1] != 0); + + mpBTextXY[2] = NULL; + + mpTextA = new CPaneMgr(mpScreen, 'a_text_n', 0, NULL); + JUT_ASSERT(mpTextA != 0); + + mpTextB = new CPaneMgr(mpScreen, 'b_text_n', 0, NULL); + JUT_ASSERT(mpTextB != 0); + + mpTextXY[2] = new CPaneMgr(mpScreen, 'z_text_n', 0, NULL); + JUT_ASSERT(mpTextXY[2] != 0); + + mpTextXY[0] = new CPaneMgr(mpScreen, 'x_text_n', 0, NULL); + JUT_ASSERT(mpTextXY[0] != 0); + + mpTextXY[1] = new CPaneMgr(mpScreen, 'y_text_n', 0, NULL); + JUT_ASSERT(mpTextXY[1] != 0); + + mpTextI = new CPaneMgr(mpScreen, 'i_text_n', 2, NULL); + JUT_ASSERT(mpTextI != 0); + + mpTextM = new CPaneMgr(mpScreen, 'm_text_n', 2, NULL); + JUT_ASSERT(mpTextM != 0); + + static u64 const juji_i_tag[] = {'ju_ring4', 'yaji_00', 'yaji_01', 'ju_ring2', 'ju_ring4'}; + static u64 const juji_m_tag[] = {'ju_ring3', 'yaji_02', 'yaji_03', 'ju_ring3', 0}; + + for (int i = 0; i < 5; i++) { + if (juji_i_tag[i] != 0) { + mpJujiI[i] = new CPaneMgr(mpScreen, juji_i_tag[i], 0, NULL); + JUT_ASSERT(mpJujiI[i] != 0); + } else { + mpJujiI[i] = NULL; + } + + if (juji_m_tag[i] != 0) { + mpJujiM[i] = new CPaneMgr(mpScreen, juji_m_tag[i], 0, NULL); + JUT_ASSERT(mpJujiM[i] != 0); + } else { + mpJujiM[i] = NULL; + } + } + + mpTextXY[0]->hide(); + mpTextXY[1]->hide(); + + mpButtonParent = new CPaneMgr(mpScreen, 'cont_n', 2, NULL); + JUT_ASSERT(mpButtonParent != 0); + + mpButtonA = new CPaneMgr(mpScreen, 'abtn_n', 2, NULL); + JUT_ASSERT(mpButtonA != 0); + + mpButtonB = new CPaneMgr(mpScreen, 'bbtn_n', 2, NULL); + JUT_ASSERT(mpButtonB != 0); + field_0x730 = 1.0f; + + mpButtonMidona = new CPaneMgr(mpScreen, 'midona_n', 2, NULL); + JUT_ASSERT(mpButtonMidona != 0); + mButtonZAlpha = 0.0f; + field_0x724 = 0.0f; + field_0x738 = 0.0f; + field_0x740 = 0; + + mpButtonXY[0] = new CPaneMgr(mpScreen, 'xbtn_n', 2, NULL); + JUT_ASSERT(mpButtonXY[0] != 0); + + mpButtonXY[1] = new CPaneMgr(mpScreen, 'ybtn_n', 2, NULL); + JUT_ASSERT(mpButtonXY[1] != 0); + + mpButtonXY[2] = new CPaneMgr(mpScreen, 'zbtn_n', 2, NULL); + JUT_ASSERT(mpButtonXY[2] != 0); + + mpUzu = new CPaneMgrAlpha(mpScreen, 'uzu_n', 2, NULL); + JUT_ASSERT(mpUzu != 0); + + ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(0)); + for (int i = 0; i < 2; i++) { + for (int j = 0; j < 3; j++) { + mpItemNumTex[i][j] = new J2DPicture(timg); + JUT_ASSERT(mpItemNumTex[i][j] != 0); + } + } + + mButtonBItem = SWORD; + changeTextureItemB(mButtonBItem); + + for (int i = 0; i < 2; i++) { + for (int j = 0; j < 2; j++) { + field_0x524[i][j] = NULL; + } + } + + for (int i = 0; i < 3; i++) { + field_0x9c[i] = NULL; + } + + field_0x560 = 0.0f; + field_0x55c = 0.0f; + field_0x568 = 0.0f; + field_0x564 = 0.0f; + field_0x56c = 0.0f; + field_0x574 = 0.0f; + field_0x570 = 0.0f; + field_0x57c = 0.0f; + field_0x578 = 0.0f; + field_0x580 = 0.0f; + field_0x754 = 0; + + drawButtonXY(0, dComIfGp_getSelectItem(0), dComIfGp_getXStatus(), true, false); + drawButtonXY(1, dComIfGp_getSelectItem(1), dComIfGp_getYStatus(), true, false); + drawButtonA(i_dComIfGp_getDoStatus(), 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, false, false); + drawButtonB(dComIfGp_getAStatus(), true, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, false); + drawButtonR(dComIfGs_getCollectSmell(), i_dComIfGp_getRStatus(), true, false); + drawButtonZ(dComIfGp_getZStatus()); + drawButton3D(dComIfGp_get3DStatus()); + drawButtonC(dComIfGp_getCStickStatus(), true); + drawButtonS(dComIfGp_getSButtonStatus()); + + setAlphButtonAChange(true); + mpButtonParent->setAlphaRate(0.0f); } -#pragma pop /* 8021350C-80213CEC 20DE4C 07E0+00 1/1 0/0 0/0 .text initButtonCross__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::initButtonCross() { - nofralloc -#include "asm/d/meter/d_meter2_draw/initButtonCross__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::initButtonCross() { + mpButtonCrossParent = new CPaneMgr(mpScreen, 'juji_n', 2, NULL); + JUT_ASSERT(mpButtonCrossParent != 0); + + static_cast(mpScreen->search('cont_ju0'))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search('cont_ju1'))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search('cont_ju2'))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search('cont_ju3'))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search('cont_ju4'))->setFont(mDoExt_getMesgFont()); + + static_cast(mpScreen->search('cont_ju0'))->setString(0x40, ""); + static_cast(mpScreen->search('cont_ju1'))->setString(0x40, ""); + static_cast(mpScreen->search('cont_ju2'))->setString(0x40, ""); + static_cast(mpScreen->search('cont_ju3'))->setString(0x40, ""); + static_cast(mpScreen->search('cont_ju4'))->setString(0x40, ""); + + dMeter2Info_getString( + 0x61, static_cast(mpScreen->search('cont_ju0'))->getStringPtr(), NULL); + dMeter2Info_getString( + 0x61, static_cast(mpScreen->search('cont_ju1'))->getStringPtr(), NULL); + dMeter2Info_getString( + 0x61, static_cast(mpScreen->search('cont_ju2'))->getStringPtr(), NULL); + dMeter2Info_getString( + 0x61, static_cast(mpScreen->search('cont_ju3'))->getStringPtr(), NULL); + dMeter2Info_getString( + 0x61, static_cast(mpScreen->search('cont_ju4'))->getStringPtr(), NULL); + + static_cast(mpScreen->search('cont_ju5'))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search('cont_ju6'))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search('cont_ju7'))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search('cont_ju8'))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search('cont_ju9'))->setFont(mDoExt_getMesgFont()); + + static_cast(mpScreen->search('cont_ju5'))->setString(0x40, ""); + static_cast(mpScreen->search('cont_ju6'))->setString(0x40, ""); + static_cast(mpScreen->search('cont_ju7'))->setString(0x40, ""); + static_cast(mpScreen->search('cont_ju8'))->setString(0x40, ""); + static_cast(mpScreen->search('cont_ju9'))->setString(0x40, ""); + + dMeter2Info_getString( + 0x62, static_cast(mpScreen->search('cont_ju5'))->getStringPtr(), NULL); + dMeter2Info_getString( + 0x62, static_cast(mpScreen->search('cont_ju6'))->getStringPtr(), NULL); + dMeter2Info_getString( + 0x62, static_cast(mpScreen->search('cont_ju7'))->getStringPtr(), NULL); + dMeter2Info_getString( + 0x62, static_cast(mpScreen->search('cont_ju8'))->getStringPtr(), NULL); + dMeter2Info_getString( + 0x62, static_cast(mpScreen->search('cont_ju9'))->getStringPtr(), NULL); + + mpButtonCrossParent->setAlphaRate(0.0f); + drawButtonCross(g_drawHIO.mButtonCrossOFFPosX, g_drawHIO.mButtonCrossOFFPosY); } -#pragma pop /* 80213CEC-80213D6C 20E62C 0080+00 3/3 0/0 0/0 .text playPikariBckAnimation__13dMeter2Draw_cFf */ -void dMeter2Draw_c::playPikariBckAnimation(f32 frame) { +void dMeter2Draw_c::playPikariBckAnimation(f32 i_frame) { mpPikariParent->getPanePtr()->setAnimation(mPikariBck); - mPikariBck->setFrame(frame); + mPikariBck->setFrame(i_frame); mpPikariParent->getPanePtr()->animationTransform(); mpPikariParent->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); } /* 80213D6C-80213E3C 20E6AC 00D0+00 1/1 0/0 0/0 .text * setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor */ -void dMeter2Draw_c::setPikariBpkAnimation(J2DAnmColor* p_anmcolor) { - mpPikariScreen->search('pika00')->setAnimation(p_anmcolor); - mpPikariScreen->search('moya00')->setAnimation(p_anmcolor); - mpPikariScreen->search('moyabs')->setAnimation(p_anmcolor); +void dMeter2Draw_c::setPikariBpkAnimation(J2DAnmColor* i_bpk) { + mpPikariScreen->search('pika00')->setAnimation(i_bpk); + mpPikariScreen->search('moya00')->setAnimation(i_bpk); + mpPikariScreen->search('moyabs')->setAnimation(i_bpk); } /* 80213E3C-80213E94 20E77C 0058+00 3/3 0/0 0/0 .text playPikariBpkAnimation__13dMeter2Draw_cFf */ -void dMeter2Draw_c::playPikariBpkAnimation(f32 frame) { +void dMeter2Draw_c::playPikariBpkAnimation(f32 i_frame) { setPikariBpkAnimation(mPikariBpk); - mPikariBpk->setFrame(frame); + mPikariBpk->setFrame(i_frame); mpPikariScreen->animation(); setPikariBpkAnimation(NULL); } /* 80213E94-80213FF0 20E7D4 015C+00 1/1 0/0 0/0 .text * playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::playOxygenBpkAnimation(J2DAnmColor* param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor.s" +void dMeter2Draw_c::playOxygenBpkAnimation(J2DAnmColor* i_bpk) { + if (i_bpk == NULL || mpMagicMeter->getAlpha() == 0) { + mpKanteraScreen->search('mm_00')->setAnimation((J2DAnmColor*)NULL); + } else { + field_0x558++; + if (field_0x558 >= i_bpk->getFrameMax()) { + field_0x558 -= i_bpk->getFrameMax(); + } + + mpKanteraScreen->search('mm_00')->setAnimation(i_bpk); + i_bpk->setFrame(field_0x558); + mpKanteraScreen->animation(); + + mpKanteraScreen->search('mm_00')->setAnimation((J2DAnmColor*)NULL); + } } -#pragma pop /* 80213FF0-802140DC 20E930 00EC+00 1/1 0/0 0/0 .text * drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawPikari(CPaneMgr* param_0, f32* param_1, f32 param_2, - JUtility::TColor param_3, JUtility::TColor param_4, - JUtility::TColor param_5, JUtility::TColor param_6, f32 param_7, - u8 param_8) { - nofralloc -#include "asm/d/meter/d_meter2_draw/func_80213FF0.s" +void dMeter2Draw_c::drawPikari(CPaneMgr* i_pane, f32* i_framep, f32 i_scale, + JUtility::TColor i_moyaBlack, JUtility::TColor i_moyaWhite, + JUtility::TColor i_moyabsBlack, JUtility::TColor i_moyabsWhite, + f32 param_7, u8 param_8) { + Vec pos = i_pane->getGlobalVtxCenter(false, 0); + drawPikari(pos.x, pos.y, i_framep, i_scale, i_moyaBlack, i_moyaWhite, i_moyabsBlack, + i_moyabsWhite, param_7, param_8); } -#pragma pop - -/* ############################################################################################## */ -/* 804548A8-804548AC 002EA8 0004+00 1/1 0/0 0/0 .sdata2 @5784 */ -SECTION_SDATA2 static f32 lit_5784 = 28.0f; - -/* 804548AC-804548B0 002EAC 0004+00 1/1 0/0 0/0 .sdata2 @5785 */ -SECTION_SDATA2 static f32 lit_5785 = 24.0f; - -/* 804548B0-804548B4 002EB0 0004+00 4/4 0/0 0/0 .sdata2 @5786 */ -SECTION_SDATA2 static f32 lit_5786 = -1.0f; /* 802140DC-8021462C 20EA1C 0550+00 1/1 6/6 0/0 .text * drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawPikari(f32 param_0, f32 param_1, f32* param_2, f32 param_3, - JUtility::TColor param_4, JUtility::TColor param_5, - JUtility::TColor param_6, JUtility::TColor param_7, f32 param_8, - u8 param_9) { - nofralloc -#include "asm/d/meter/d_meter2_draw/func_802140DC.s" +void dMeter2Draw_c::drawPikari(f32 i_posX, f32 i_posY, f32* i_framep, f32 i_scale, + JUtility::TColor i_moyaBlack, JUtility::TColor i_moyaWhite, + JUtility::TColor i_moyabsBlack, JUtility::TColor i_moyabsWhite, + f32 param_8, u8 param_9) { + f32 var_f31 = 28.0f; + + if (param_9 == 4) { + var_f31 = 24.0f; + if (mpPikariScreen->search('moya00')->isVisible()) { + mpPikariScreen->search('moya00')->hide(); + } + + if (mpPikariScreen->search('moyabs')->isVisible()) { + mpPikariScreen->search('moyabs')->hide(); + } + } else { + if (!mpPikariScreen->search('moya00')->isVisible()) { + mpPikariScreen->search('moya00')->show(); + } + + if (!mpPikariScreen->search('moyabs')->isVisible()) { + mpPikariScreen->search('moyabs')->show(); + } + } + + if (param_9 != 3 && param_9 != 4 && param_9 != 5 && dMsgObject_isTalkNowCheck()) { + *i_framep = 0.0f; + } else { + *i_framep += param_8; + if (*i_framep > var_f31) { + if (param_9 == 1 || param_9 == 2 || param_9 == 3) { + *i_framep = 18.0f; + } else { + *i_framep = 0.0f; + } + } + + if (*i_framep == 18.0f && param_9 == 1) { + mDoAud_seStart(Z2SE_NAVI_BLINK, NULL, 0, 0); + } else if (*i_framep == 18.0f && param_9 == 2) { + mDoAud_seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0); + } + + playPikariBckAnimation(*i_framep); + playPikariBpkAnimation(*i_framep); + + mpPikariParent->getPanePtr()->translate(i_posX, i_posY); + mpPikariParent->scale(i_scale * mpPikariParent->getScaleX(), + i_scale * mpPikariParent->getScaleY()); + + if (mpPikariScreen->search('moya00')->isVisible()) { + static_cast(mpPikariScreen->search('moya00')) + ->setBlackWhite(i_moyaBlack, i_moyaWhite); + } + + if (mpPikariScreen->search('moyabs')->isVisible()) { + static_cast(mpPikariScreen->search('moyabs')) + ->setBlackWhite(i_moyabsBlack, i_moyabsWhite); + } + + if (param_9 != 4) { + static_cast(mpPikariScreen->search('pika00')) + ->setBlackWhite(mPikariBlack, mPikariBlack); + } else { + static_cast(mpPikariScreen->search('pika00')) + ->setBlackWhite(g_MsgObject_HIO_c.mPikariPikaR1, g_MsgObject_HIO_c.mPikariPikaR0); + } + + mpPikariScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort()); + } } -#pragma pop /* 8021462C-802147CC 20EF6C 01A0+00 0/0 1/1 0/0 .text * drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawPikariHakusha(f32 param_0, f32 param_1, f32 param_2, f32 param_3, - JUtility::TColor param_4, JUtility::TColor param_5, - JUtility::TColor param_6, JUtility::TColor param_7) { - nofralloc -#include "asm/d/meter/d_meter2_draw/func_8021462C.s" +void dMeter2Draw_c::drawPikariHakusha(f32 i_posX, f32 i_posY, f32 i_frame, f32 i_scale, + JUtility::TColor i_moyaBlack, JUtility::TColor i_moyaWhite, + JUtility::TColor i_moyabsBlack, + JUtility::TColor i_moyabsWhite) { + playPikariBckAnimation(i_frame); + playPikariBpkAnimation(i_frame); + + mpPikariParent->getPanePtr()->translate(i_posX, i_posY); + mpPikariParent->scale(i_scale * mpPikariParent->getScaleX(), + i_scale * mpPikariParent->getScaleY()); + + static_cast(mpPikariScreen->search('moya00')) + ->setBlackWhite(i_moyaBlack, i_moyaWhite); + static_cast(mpPikariScreen->search('moyabs')) + ->setBlackWhite(i_moyabsBlack, i_moyabsWhite); + + mpPikariScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort()); } -#pragma pop - -/* ############################################################################################## */ -/* 80398878-80398898 024ED8 0020+00 1/1 0/0 0/0 .rodata tag_bigh$5851 */ -SECTION_RODATA static u8 const tag_bigh[32] = { - 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x30, 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x31, - 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x32, 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x33, -}; -COMPILER_STRIP_GATE(0x80398878, &tag_bigh); - -/* 80398898-803988A8 024EF8 0010+00 1/1 0/0 0/0 .rodata tag_du$5852 */ -SECTION_RODATA static u8 const tag_du[16] = { - 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x6C, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x75, 0x6E, -}; -COMPILER_STRIP_GATE(0x80398898, &tag_du); /* 802147CC-802149F4 20F10C 0228+00 1/1 0/0 0/0 .text changeTextureLife__13dMeter2Draw_cFibUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::changeTextureLife(int param_0, bool param_1, u8 param_2) { - nofralloc -#include "asm/d/meter/d_meter2_draw/changeTextureLife__13dMeter2Draw_cFibUc.s" +void dMeter2Draw_c::changeTextureLife(int i_no, bool param_1, u8 i_quarterNum) { + if (param_1) { + if (i_quarterNum == 0xFF) { + mpLifeTexture[i_no][0]->show(); + mpLifeTexture[i_no][1]->show(); + } else { + mpLifeTexture[i_no][0]->hide(); + mpLifeTexture[i_no][1]->hide(); + + static u64 const tag_bigh[] = {'bigh_00', 'bigh_01', 'bigh_02', 'bigh_03'}; + + for (int i = 0; i < 4; i++) { + if (i == i_quarterNum) { + mpScreen->search(tag_bigh[i])->show(); + } else { + mpScreen->search(tag_bigh[i])->hide(); + } + } + + static u64 const tag_du[] = {'heart_ln', 'heart_un'}; + + mpBigHeart->translate(mpLifeParts[i_no]->getTranslateX() + + (mpScreen->search(tag_du[i_no / 10])->getTranslateX() - + mpScreen->search(tag_du[0])->getTranslateX()), + mpScreen->search(tag_du[i_no / 10])->getTranslateY() + + mpLifeParts[i_no]->getTranslateY()); + } + } else { + mpLifeTexture[i_no][0]->hide(); + mpLifeTexture[i_no][1]->hide(); + } } -#pragma pop /* 802149F4-80214C20 20F334 022C+00 1/1 1/1 0/0 .text drawLife__13dMeter2Draw_cFssff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawLife(s16 param_0, s16 param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawLife__13dMeter2Draw_cFssff.s" +void dMeter2Draw_c::drawLife(s16 i_maxLife, s16 i_life, f32 i_posX, f32 i_posY) { + s16 max_heart_cnt = i_maxLife / 5; + s16 heart_cnt = i_life / 4; + s16 heart_quarters = i_life % 4; + if (i_life == max_heart_cnt * 4) { + heart_quarters = 0; + } + + if (heart_quarters == 0) { + heart_cnt--; + } + + if (i_life == 0) { + mpBigHeart->hide(); + } else { + mpBigHeart->show(); + } + + for (int i = 0; i < 20; i++) { + if (i < max_heart_cnt) { + mpLifeParts[i]->show(); + + if (i == heart_cnt) { + changeTextureLife(i, true, heart_quarters); + } else if (i < heart_cnt) { + changeTextureLife(i, true, 0xFF); + } else { + changeTextureLife(i, false, 0xFF); + } + } else { + mpLifeParts[i]->hide(); + changeTextureLife(i, false, 0xFF); + } + } + + mpLifeParent->scale(g_drawHIO.mLifeParentScale, g_drawHIO.mLifeParentScale); + + for (int i = 0; i < 20; i++) { + mpHeartMark[i]->scale(g_drawHIO.mHeartMarkScale, g_drawHIO.mHeartMarkScale); + } + + for (int i = 0; i < 20; i++) { + mpBigHeart->scale(g_drawHIO.mBigHeartScale, g_drawHIO.mBigHeartScale); + } + + mpLifeParent->paneTrans(i_posX, i_posY); } -#pragma pop /* 80214C20-80214DF4 20F560 01D4+00 1/1 1/1 0/0 .text setAlphaLifeChange__13dMeter2Draw_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaLifeChange(bool param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaLifeChange__13dMeter2Draw_cFb.s" +void dMeter2Draw_c::setAlphaLifeChange(bool param_0) { + bool var_r31 = false; + bool var_r30 = false; + bool var_r29 = false; + bool var_r28 = false; + + if (mLifeParentAlpha != mpLifeParent->getAlphaRate() || param_0) { + mLifeParentAlpha = mpLifeParent->getAlphaRate(); + var_r31 = true; + } + + if (mLifeParentHeartAlpha != g_drawHIO.mLifeParentHeartAlpha || param_0) { + mLifeParentHeartAlpha = g_drawHIO.mLifeParentHeartAlpha; + var_r30 = true; + } + + if (mHeartAlpha != g_drawHIO.mHeartAlpha || param_0) { + mHeartAlpha = g_drawHIO.mHeartAlpha; + var_r30 = true; + } + + if (mHeartBaseAlpha != g_drawHIO.mHeartBaseAlpha || param_0) { + mHeartBaseAlpha = g_drawHIO.mHeartBaseAlpha; + var_r29 = true; + } + + if (mBigHeartAlpha != g_drawHIO.mBigHeartAlpha || param_0) { + mBigHeartAlpha = g_drawHIO.mBigHeartAlpha; + var_r28 = true; + } + + if (var_r31 || var_r30 || param_0) { + for (int i = 0; i < 20; i++) { + mpHeartMark[i]->setAlphaRate((mHeartAlpha * mLifeParentHeartAlpha) * mLifeParentAlpha); + } + } + + if (var_r31 || var_r29 || param_0) { + for (int i = 0; i < 20; i++) { + mpHeartBase[i]->setAlphaRate(mHeartBaseAlpha * mLifeParentAlpha); + } + } + + if (var_r31 || var_r28 || param_0) { + mpBigHeart->setAlphaRate(mBigHeartAlpha * mLifeParentAlpha); + } } -#pragma pop /* 80214DF4-80214E54 20F734 0060+00 0/0 1/1 0/0 .text setAlphaLifeAnimeMin__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaLifeAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaLifeAnimeMin__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::setAlphaLifeAnimeMin() { + if (mpLifeParent->getAlphaRate() != 0.0f) { + mpLifeParent->setAlphaRate(g_drawHIO.mParentAlpha); + setAlphaAnimeMin(mpLifeParent, 5); + } } -#pragma pop /* 80214E54-80214EB4 20F794 0060+00 0/0 1/1 0/0 .text setAlphaLifeAnimeMax__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaLifeAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaLifeAnimeMax__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::setAlphaLifeAnimeMax() { + if (mpLifeParent->getAlphaRate() != g_drawHIO.mParentAlpha) { + mpLifeParent->setAlphaRate(g_drawHIO.mParentAlpha); + setAlphaAnimeMax(mpLifeParent, 5); + } } -#pragma pop - -/* ############################################################################################## */ -/* 804548B4-804548B8 002EB4 0004+00 1/1 0/0 0/0 .sdata2 @6143 */ -SECTION_SDATA2 static f32 lit_6143 = 0.25f; /* 80214EB4-80215290 20F7F4 03DC+00 1/1 0/0 0/0 .text drawKanteraScreen__13dMeter2Draw_cFUc */ -// matches with literals -#ifdef NONMATCHING void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) { - J2DGrafContext* graf = dComIfGp_getCurrentGrafPort(); + J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort(); mpMagicParent->setAlphaRate(mMeterAlphaRate[i_meterType]); @@ -1570,8 +1594,8 @@ void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) { playOxygenBpkAnimation(mpOxygenBpk[0]); if (mMeterAlphaRate[i_meterType] > 0.0f) { - Z2GetAudioMgr()->seStartLevel(Z2SE_SWIM_TIMER_BLINK_2, NULL, 0, 0, 1.0f, - 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->seStartLevel(Z2SE_SWIM_TIMER_BLINK_2, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); } } else if (oxygen_percent <= 0.5f) { mpMagicMeter->setBlackWhite(JUtility::TColor(200, 200, 255, 255), @@ -1579,8 +1603,8 @@ void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) { playOxygenBpkAnimation(mpOxygenBpk[1]); if (mMeterAlphaRate[i_meterType] > 0.0f) { - Z2GetAudioMgr()->seStartLevel(Z2SE_SWIM_TIMER_BLINK_1, NULL, 0, 0, 1.0f, - 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->seStartLevel(Z2SE_SWIM_TIMER_BLINK_1, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); } } else { mpMagicMeter->setBlackWhite(JUtility::TColor(200, 200, 255, 255), @@ -1595,55 +1619,29 @@ void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) { mpMagicBase->resize(field_0x5b4[i_meterType], field_0x5c0[i_meterType]); mpMagicParent->scale(field_0x5cc[i_meterType], field_0x5d8[i_meterType]); mpMagicParent->paneTrans(field_0x5e4[i_meterType], field_0x5f0[i_meterType]); - mpKanteraScreen->draw(0.0f, 0.0f, graf); + mpKanteraScreen->draw(0.0f, 0.0f, graf_ctx); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawKanteraScreen(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawKanteraScreen__13dMeter2Draw_cFUc.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 804548B8-804548BC 002EB8 0004+00 1/1 0/0 0/0 .sdata2 @6175 */ -SECTION_SDATA2 static f32 lit_6175 = 0.03125f; /* 80215290-80215380 20FBD0 00F0+00 1/1 0/0 0/0 .text drawMagic__13dMeter2Draw_cFssff */ -#ifdef NONMATCHING -void dMeter2Draw_c::drawMagic(s16 i_maxMagic, s16 i_nowMagic, f32 i_xPos, f32 i_yPos) { - f32 frameL_posX = mpMagicFrameL->getInitPosX(); - f32 frameR_posX = mpMagicFrameR->getInitPosX(); +void dMeter2Draw_c::drawMagic(s16 i_max, s16 i_magic, f32 i_posX, f32 i_posY) { + f32 temp_f30 = mpMagicFrameL->getInitPosX(); + f32 temp_f31 = mpMagicFrameR->getInitPosX() - temp_f30; - field_0x584[0] = (mpMagicMeter->getInitSizeX() * i_nowMagic) * 0.03125f; + field_0x584[0] = i_magic * mpMagicMeter->getInitSizeX() / 32; field_0x590[0] = mpMagicMeter->getInitSizeY(); - field_0x59c[0] = - ((f32)i_maxMagic * (frameR_posX - frameL_posX)) * 0.03125f + mpMagicFrameL->getInitPosX(); + field_0x59c[0] = (temp_f31 * (f32)i_max / 32) + mpMagicFrameL->getInitPosX(); field_0x5a8[0] = mpMagicFrameL->getInitPosY(); - field_0x5b4[0] = (f32)i_maxMagic * mpMagicBase->getInitSizeX() * 0.03125f; + field_0x5b4[0] = (f32)i_max * mpMagicBase->getInitSizeX() / 32; field_0x5c0[0] = mpMagicBase->getInitSizeY(); field_0x5cc[0] = g_drawHIO.mMagicMeterScale; field_0x5d8[0] = g_drawHIO.mMagicMeterScale; - field_0x5e4[0] = i_xPos; - field_0x5f0[0] = i_yPos; + field_0x5e4[0] = i_posX; + field_0x5f0[0] = i_posY; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawMagic(s16 i_maxMagic, s16 i_nowMagic, f32 i_xPos, f32 i_yPos) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawMagic__13dMeter2Draw_cFssff.s" -} -#pragma pop -#endif /* 80215380-802154A8 20FCC0 0128+00 2/2 0/0 0/0 .text setAlphaMagicChange__13dMeter2Draw_cFb */ void dMeter2Draw_c::setAlphaMagicChange(bool i_forceSet) { @@ -1676,23 +1674,34 @@ void dMeter2Draw_c::setAlphaMagicChange(bool i_forceSet) { } } -/* ############################################################################################## */ -/* 804548BC-804548C0 002EBC 0004+00 4/4 0/0 0/0 .sdata2 @6210 */ -SECTION_SDATA2 static f32 lit_6210 = 5.0f; - -/* 804548C0-804548C8 002EC0 0008+00 9/9 0/0 0/0 .sdata2 @6293 */ -SECTION_SDATA2 static f64 lit_6293 = 4503599627370496.0 /* cast u32 to float */; +// Fake function to fix float literal order +static f32 dummyLiteralOrder() { + return 5.0f; +} /* 802154A8-802155B8 20FDE8 0110+00 1/1 1/1 0/0 .text drawKantera__13dMeter2Draw_cFllff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawKantera(s32 i_maxOil, s32 i_nowOil, f32 i_xPos, f32 i_yPos) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawKantera__13dMeter2Draw_cFllff.s" +void dMeter2Draw_c::drawKantera(s32 i_max, s32 i_oil, f32 i_posX, f32 i_posY) { + f32 var_f6 = mpMagicFrameR->getInitPosX() - mpMagicFrameL->getInitPosX(); + f32 var_f7 = 0.0f; + f32 var_f4 = 0.0f; + + if (dComIfGs_getMaxOil() != 0) { + var_f7 = (f32)i_oil / (f32)dComIfGs_getMaxOil(); + var_f4 = (f32)i_max / (f32)dComIfGs_getMaxOil(); + } + + field_0x584[1] = var_f7 * mpMagicMeter->getInitSizeX(); + field_0x590[1] = mpMagicMeter->getInitSizeY(); + field_0x59c[1] = (var_f6 * var_f4) + mpMagicFrameL->getInitPosX(); + field_0x5a8[1] = mpMagicFrameL->getInitPosY(); + field_0x5b4[1] = var_f4 * mpMagicBase->getInitSizeX(); + field_0x5c0[1] = mpMagicBase->getInitSizeY(); + field_0x5cc[1] = g_drawHIO.mLanternMeterScale; + field_0x5d8[1] = g_drawHIO.mLanternMeterScale; + field_0x5e4[1] = i_posX; + field_0x5f0[1] = i_posY; } -#pragma pop /* 802155B8-802156E0 20FEF8 0128+00 2/2 1/1 0/0 .text setAlphaKanteraChange__13dMeter2Draw_cFb */ void dMeter2Draw_c::setAlphaKanteraChange(bool i_forceSet) { @@ -1727,8 +1736,6 @@ void dMeter2Draw_c::setAlphaKanteraChange(bool i_forceSet) { /* 802156E0-8021575C 210020 007C+00 0/0 1/1 0/0 .text setAlphaKanteraAnimeMin__13dMeter2Draw_cFv */ -// matches with literals -#ifdef NONMATCHING void dMeter2Draw_c::setAlphaKanteraAnimeMin() { if (field_0x742[1] <= 0) { mMeterAlphaRate[1] = 0.0f; @@ -1738,56 +1745,47 @@ void dMeter2Draw_c::setAlphaKanteraAnimeMin() { field_0x742[1] = 0; } - mMeterAlphaRate[1] = (field_0x742[1] / 5.0f) * g_drawHIO.mHUDAlpha; + mMeterAlphaRate[1] = (field_0x742[1] / 5.0f) * g_drawHIO.mParentAlpha; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaKanteraAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaKanteraAnimeMin__13dMeter2Draw_cFv.s" -} -#pragma pop -#endif /* 8021575C-802157E0 21009C 0084+00 0/0 1/1 0/0 .text setAlphaKanteraAnimeMax__13dMeter2Draw_cFv */ -// matches with literals -#ifdef NONMATCHING void dMeter2Draw_c::setAlphaKanteraAnimeMax() { if (field_0x742[1] >= 5) { - mMeterAlphaRate[1] = g_drawHIO.mHUDAlpha; + mMeterAlphaRate[1] = g_drawHIO.mParentAlpha; } else { field_0x742[1]++; if (field_0x742[1] > 5) { field_0x742[1] = 5; } - mMeterAlphaRate[1] = (field_0x742[1] / 5.0f) * g_drawHIO.mHUDAlpha; + mMeterAlphaRate[1] = (field_0x742[1] / 5.0f) * g_drawHIO.mParentAlpha; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaKanteraAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaKanteraAnimeMax__13dMeter2Draw_cFv.s" -} -#pragma pop -#endif /* 802157E0-802158F0 210120 0110+00 0/0 1/1 0/0 .text drawOxygen__13dMeter2Draw_cFllff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawOxygen(s32 param_0, s32 param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawOxygen__13dMeter2Draw_cFllff.s" +void dMeter2Draw_c::drawOxygen(s32 i_max, s32 i_oxygen, f32 i_posX, f32 i_posY) { + f32 var_f6 = mpMagicFrameR->getInitPosX() - mpMagicFrameL->getInitPosX(); + f32 var_f7 = 0.0f; + f32 var_f4 = 0.0f; + + if (dComIfGp_getMaxOxygen() > 0) { + var_f7 = (f32)i_oxygen / (f32)dComIfGp_getMaxOxygen(); + var_f4 = (f32)i_max / (f32)dComIfGp_getMaxOxygen(); + } + + field_0x584[2] = var_f7 * mpMagicMeter->getInitSizeX(); + field_0x590[2] = mpMagicMeter->getInitSizeY(); + field_0x59c[2] = (var_f6 * var_f4) + mpMagicFrameL->getInitPosX(); + field_0x5a8[2] = mpMagicFrameL->getInitPosY(); + field_0x5b4[2] = var_f4 * mpMagicBase->getInitSizeX(); + field_0x5c0[2] = mpMagicBase->getInitSizeY(); + field_0x5cc[2] = g_drawHIO.mOxygenMeterScale; + field_0x5d8[2] = g_drawHIO.mOxygenMeterScale; + field_0x5e4[2] = i_posX; + field_0x5f0[2] = i_posY; } -#pragma pop /* 802158F0-80215A18 210230 0128+00 1/1 1/1 0/0 .text setAlphaOxygenChange__13dMeter2Draw_cFb */ void dMeter2Draw_c::setAlphaOxygenChange(bool i_forceSet) { @@ -1821,8 +1819,6 @@ void dMeter2Draw_c::setAlphaOxygenChange(bool i_forceSet) { } /* 80215A18-80215A94 210358 007C+00 0/0 1/1 0/0 .text setAlphaOxygenAnimeMin__13dMeter2Draw_cFv */ -// matches with literals -#ifdef NONMATCHING void dMeter2Draw_c::setAlphaOxygenAnimeMin() { if (field_0x742[2] <= 0) { mMeterAlphaRate[2] = 0.0f; @@ -1832,494 +1828,1483 @@ void dMeter2Draw_c::setAlphaOxygenAnimeMin() { field_0x742[2] = 0; } - mMeterAlphaRate[2] = (field_0x742[2] / 5.0f) * g_drawHIO.mHUDAlpha; + mMeterAlphaRate[2] = (field_0x742[2] / 5.0f) * g_drawHIO.mParentAlpha; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaOxygenAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaOxygenAnimeMin__13dMeter2Draw_cFv.s" -} -#pragma pop -#endif /* 80215A94-80215B18 2103D4 0084+00 0/0 1/1 0/0 .text setAlphaOxygenAnimeMax__13dMeter2Draw_cFv */ -// matches with literals -#ifdef NONMATCHING void dMeter2Draw_c::setAlphaOxygenAnimeMax() { if (field_0x742[2] >= 5) { - mMeterAlphaRate[2] = g_drawHIO.mHUDAlpha; + mMeterAlphaRate[2] = g_drawHIO.mParentAlpha; } else { field_0x742[2]++; if (field_0x742[2] > 5) { field_0x742[2] = 5; } - mMeterAlphaRate[2] = (field_0x742[2] / 5.0f) * g_drawHIO.mHUDAlpha; + mMeterAlphaRate[2] = (field_0x742[2] / 5.0f) * g_drawHIO.mParentAlpha; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaOxygenAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaOxygenAnimeMax__13dMeter2Draw_cFv.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 804548C8-804548CC 002EC8 0004+00 4/4 0/0 0/0 .sdata2 @6524 */ -SECTION_SDATA2 static f32 lit_6524 = 3.0f / 10.0f; /* 80215B18-80215DA4 210458 028C+00 1/1 1/1 0/0 .text drawLightDrop__13dMeter2Draw_cFUcUcffffUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawLightDrop(u8 param_0, u8 param_1, f32 param_2, f32 param_3, f32 param_4, - f32 param_5, u8 param_6) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawLightDrop__13dMeter2Draw_cFUcUcffffUc.s" +void dMeter2Draw_c::drawLightDrop(u8 i_num, u8 i_needNum, f32 i_posX, f32 i_posY, f32 i_vesselScale, + f32 param_5, u8 param_6) { + for (int i = 0; i < 16; i++) { + if (mpSIParts[i][0] != NULL) { + mpSIParts[i][0]->scale(g_drawHIO.mLightDrop.mDropScale, + g_drawHIO.mLightDrop.mDropScale); + } else { + mpSIParts[i][1]->scale(g_drawHIO.mLightDrop.mDropScale, + g_drawHIO.mLightDrop.mDropScale); + mpSIParts[i][2]->scale(g_drawHIO.mLightDrop.mDropScale, + g_drawHIO.mLightDrop.mDropScale); + } + + if (i < i_num) { + static_cast(mpSIParts[i][1]->getPanePtr()) + ->setBlackWhite(g_drawHIO.mLightDrop.mDropOnColorBlack, + g_drawHIO.mLightDrop.mDropOnColorWhite); + mpSIParts[i][1]->setAlphaRate(mpSIParent[1]->getAlphaRate()); + mpSIParts[i][2]->setAlphaRate(mpSIParent[1]->getAlphaRate()); + } else { + static_cast(mpSIParts[i][1]->getPanePtr()) + ->setBlackWhite(g_drawHIO.mLightDrop.mDropOffColorBlack, + g_drawHIO.mLightDrop.mDropOffColorWhite); + mpSIParts[i][1]->setAlphaRate(mpSIParent[1]->getAlphaRate() * 0.3f); + mpSIParts[i][2]->setAlphaRate(mpSIParent[1]->getAlphaRate() * 0.3f); + } + } + + if (param_6 == 1) { + field_0x760 = param_6; + field_0x756 = -1; + + if (field_0x620[i_num + 2] == 0.0f) { + field_0x620[i_num + 2] = 18.0f; + } + } + + if (param_6 == 2) { + field_0x760 = param_6; + field_0x756 = 0; + + if (field_0x62c[0] == 0.0f) { + field_0x62c[0] = 18.0f; + } + } + + field_0x6fc = param_5; + mLightDropVesselScale = i_vesselScale; + mpLightDropParent->scale(mLightDropVesselScale * field_0x6f8, + mLightDropVesselScale * field_0x6f8); + mpLightDropParent->paneTrans(i_posX, i_posY); } -#pragma pop /* 80215DA4-80215DA8 2106E4 0004+00 1/1 1/1 0/0 .text setAlphaLightDropChange__13dMeter2Draw_cFb */ -void dMeter2Draw_c::setAlphaLightDropChange(bool param_0) {} +void dMeter2Draw_c::setAlphaLightDropChange(bool unused) {} /* 80215DA8-80215E40 2106E8 0098+00 0/0 1/1 0/0 .text getNowLightDropRateCalc__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMeter2Draw_c::getNowLightDropRateCalc() { - nofralloc -#include "asm/d/meter/d_meter2_draw/getNowLightDropRateCalc__13dMeter2Draw_cFv.s" +f32 dMeter2Draw_c::getNowLightDropRateCalc() { + f32 drop_num = dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()); + f32 need_drop_num = dComIfGp_getNeedLightDropNum(); + f32 rate; + + if (need_drop_num <= 0) { + rate = 0.0f; + } else if (drop_num >= need_drop_num) { + rate = 1.0f; + } else { + rate = drop_num / need_drop_num; + } + + return rate; } -#pragma pop /* 80215E40-80215F88 210780 0148+00 0/0 1/1 0/0 .text setAlphaLightDropAnimeMin__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaLightDropAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaLightDropAnimeMin__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::setAlphaLightDropAnimeMin() { + if (mpLightDropParent->getAlphaRate() != 0.0f) { + mpLightDropParent->setAlphaRate(g_drawHIO.mParentAlpha * field_0x6fc); + setAlphaAnimeMin(mpLightDropParent, 5); + + for (int i = 0; i < 2; i++) { + mpSIParent[i]->setAlphaRate(g_drawHIO.mLightDrop.mVesselAlpha[i + 2] * + mpLightDropParent->getAlphaRate()); + } + + for (int i = 0; i < 16; i++) { + if (i < dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea())) { + mpSIParts[i][1]->setAlphaRate(mpSIParent[1]->getAlphaRate()); + mpSIParts[i][2]->setAlphaRate(mpSIParent[1]->getAlphaRate()); + } else { + mpSIParts[i][1]->setAlphaRate(mpSIParent[1]->getAlphaRate() * 0.3f); + mpSIParts[i][2]->setAlphaRate(mpSIParent[1]->getAlphaRate() * 0.3f); + } + } + } } -#pragma pop /* 80215F88-8021632C 2108C8 03A4+00 0/0 1/1 0/0 .text setAlphaLightDropAnimeMax__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaLightDropAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaLightDropAnimeMax__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::setAlphaLightDropAnimeMax() { + f32 temp_f31 = g_drawHIO.mParentAlpha * field_0x6fc; + + if (dMeter2Info_getLightDropGetFlag(dComIfGp_getStartStageDarkArea()) > 1 && + dMeter2Info_getLightDropGetFlag(dComIfGp_getStartStageDarkArea()) != 0xFF) + { + if (mpLightDropParent->getAlphaTimer() == 0) { + Z2GetAudioMgr()->seStart(Z2SE_SY_LIGHT_POT_EQUIP, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + } + + if (temp_f31 != mpLightDropParent->getAlphaRate()) { + mpLightDropParent->setAlphaRate(temp_f31); + setAlphaAnimeMax(mpLightDropParent, g_drawHIO.mLightDrop.mDropGetScaleAnimFrameNum); + + for (int i = 0; i < 2; i++) { + mpSIParent[i]->setAlphaRate(g_drawHIO.mLightDrop.mVesselAlpha[i + 2] * + mpLightDropParent->getAlphaRate()); + } + } + + if (g_drawHIO.mLightDrop.mDropGetScaleAnimFrameNum > 1) { + field_0x6f8 = 1.0f + (((g_drawHIO.mLightDrop.mDropGetScale - 1.0f) * + ((f32)g_drawHIO.mLightDrop.mDropGetScaleAnimFrameNum - + (f32)mpLightDropParent->getAlphaTimer())) / + ((f32)g_drawHIO.mLightDrop.mDropGetScaleAnimFrameNum - 1.0f)); + } else { + field_0x6f8 = 1.0f; + } + + mpLightDropParent->scale(mLightDropVesselScale * field_0x6f8, + mLightDropVesselScale * field_0x6f8); + + if (g_drawHIO.mLightDrop.mDropGetScaleAnimFrameNum == mpLightDropParent->getAlphaTimer()) { + dMeter2Info_setLightDropGetFlag(dComIfGp_getStartStageDarkArea(), 0xFF); + } + } else if (temp_f31 != mpLightDropParent->getAlphaRate()) { + mpLightDropParent->setAlphaRate(temp_f31); + setAlphaAnimeMax(mpLightDropParent, 5); + + for (int i = 0; i < 2; i++) { + mpSIParent[i]->setAlphaRate(g_drawHIO.mLightDrop.mVesselAlpha[i + 2] * + mpLightDropParent->getAlphaRate()); + } + } else { + for (int i = 0; i < 2; i++) { + if (field_0x860[i] != g_drawHIO.mLightDrop.mVesselAlpha[i + 2]) { + field_0x860[i] = g_drawHIO.mLightDrop.mVesselAlpha[i + 2]; + mpSIParent[i]->setAlphaRate(g_drawHIO.mLightDrop.mVesselAlpha[i + 2] * + mpLightDropParent->getAlphaRate()); + } + } + } + + for (int i = 0; i < 16; i++) { + if (i < dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea())) { + mpSIParts[i][1]->setAlphaRate(mpSIParent[1]->getAlphaRate()); + mpSIParts[i][2]->setAlphaRate(mpSIParent[1]->getAlphaRate()); + } else { + mpSIParts[i][1]->setAlphaRate(mpSIParent[1]->getAlphaRate() * 0.3f); + mpSIParts[i][2]->setAlphaRate(mpSIParent[1]->getAlphaRate() * 0.3f); + } + } } -#pragma pop /* 8021632C-80216684 210C6C 0358+00 1/1 1/1 0/0 .text drawRupee__13dMeter2Draw_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawRupee(s16 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawRupee__13dMeter2Draw_cFs.s" +void dMeter2Draw_c::drawRupee(s16 i_rupeeNum) { + mpRupeeTexture[3][0]->hide(); + mpRupeeTexture[3][1]->hide(); + + // digits are descending order (3, 2, 1, 0) + int digit_3 = i_rupeeNum / 1000; + int num = i_rupeeNum % 1000; + + if (i_rupeeNum < 1000) { + mpRupeeTexture[3][0]->hide(); + mpRupeeTexture[3][1]->hide(); + } else { + mpRupeeTexture[3][0]->show(); + mpRupeeTexture[3][1]->show(); + + ResTIMG* timg = getNumberTexture(digit_3); + static_cast(mpRupeeTexture[3][0]->getPanePtr())->changeTexture(timg, 0); + static_cast(mpRupeeTexture[3][1]->getPanePtr())->changeTexture(timg, 0); + } + int digit_2 = num / 100; + num %= 100; + + ResTIMG* timg = getNumberTexture(digit_2); + static_cast(mpRupeeTexture[2][0]->getPanePtr())->changeTexture(timg, 0); + static_cast(mpRupeeTexture[2][1]->getPanePtr())->changeTexture(timg, 0); + + int digit_1 = num / 10; + num %= 10; + + timg = getNumberTexture(digit_1); + static_cast(mpRupeeTexture[1][0]->getPanePtr())->changeTexture(timg, 0); + static_cast(mpRupeeTexture[1][1]->getPanePtr())->changeTexture(timg, 0); + + timg = getNumberTexture(num); + static_cast(mpRupeeTexture[0][0]->getPanePtr())->changeTexture(timg, 0); + static_cast(mpRupeeTexture[0][1]->getPanePtr())->changeTexture(timg, 0); + + mpRupeeKeyParent->scale(g_drawHIO.mRupeeKeyScale * field_0x718, + g_drawHIO.mRupeeKeyScale * field_0x718); + mpRupeeKeyParent->paneTrans(g_drawHIO.mRupeeKeyPosX, g_drawHIO.mRupeeKeyPosY); + + mpRupeeParent[0]->scale(g_drawHIO.mRupeeScale, g_drawHIO.mRupeeScale); + mpRupeeParent[0]->paneTrans(g_drawHIO.mRupeePosX, g_drawHIO.mRupeePosY); + + mpRupeeParent[1]->scale(g_drawHIO.mRupeeFramePosY, g_drawHIO.mRupeeFramePosY); + mpRupeeParent[1]->paneTrans(g_drawHIO.mRupeeFrameScale, g_drawHIO.mRupeeFramePosX); + + mpRupeeParent[2]->scale(g_drawHIO.mRupeeFramePosY, g_drawHIO.mRupeeFramePosY); + mpRupeeParent[2]->paneTrans(g_drawHIO.mRupeeFrameScale, g_drawHIO.mRupeeFramePosX); + + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 2; j++) { + mpRupeeTexture[i][j]->scale(g_drawHIO.mRupeeCountScale, g_drawHIO.mRupeeCountScale); + mpRupeeTexture[i][j]->paneTrans(g_drawHIO.mRupeeCountPosX, g_drawHIO.mRupeeCountPosY); + } + } } -#pragma pop /* 80216684-802168D0 210FC4 024C+00 1/1 1/1 0/0 .text setAlphaRupeeChange__13dMeter2Draw_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaRupeeChange(bool param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaRupeeChange__13dMeter2Draw_cFb.s" +void dMeter2Draw_c::setAlphaRupeeChange(bool param_0) { + bool set_parent = false; + bool set_rupeekey = false; + bool set_rupee = false; + bool set_rupeeframe = false; + bool set_rupeecount = false; + + if (field_0x7cc != g_drawHIO.mParentAlpha || param_0) { + field_0x7cc = g_drawHIO.mParentAlpha; + set_parent = true; + } + + if (field_0x7d0 != g_drawHIO.mRupeeKeyAlpha || param_0) { + field_0x7d0 = g_drawHIO.mRupeeKeyAlpha; + set_rupeekey = true; + } + + if (mRupeeAlpha != g_drawHIO.mRupeeAlpha || param_0) { + mRupeeAlpha = g_drawHIO.mRupeeAlpha; + set_rupee = true; + } + + if (mRupeeFrameAlpha != g_drawHIO.mRupeeFrameAlpha || param_0) { + mRupeeFrameAlpha = g_drawHIO.mRupeeFrameAlpha; + set_rupeeframe = true; + } + + if (mRupeeCountAlpha != g_drawHIO.mRupeeCountAlpha || param_0) { + mRupeeCountAlpha = g_drawHIO.mRupeeCountAlpha; + set_rupeecount = true; + } + + if (set_parent || set_rupeekey || param_0) { + mpRupeeKeyParent->setAlphaRate(field_0x7cc * field_0x7d0); + } + + if (set_parent || set_rupeekey || set_rupee || param_0) { + mpRupeeParent[0]->setAlphaRate(field_0x7d0 * (mRupeeAlpha * field_0x7cc)); + } + + if (set_parent || set_rupeekey || set_rupeeframe || param_0) { + mpRupeeParent[1]->setAlphaRate(field_0x7d0 * (mRupeeFrameAlpha * field_0x7cc)); + mpRupeeParent[2]->setAlphaRate(field_0x7d0 * (mRupeeFrameAlpha * field_0x7cc)); + } + + if (set_parent || set_rupeekey || set_rupeecount || param_0) { + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 2; j++) { + mpRupeeTexture[i][j]->setAlphaRate( + field_0x7d0 * (field_0x7cc * (mRupeeCountAlpha * mRupeeAlpha))); + } + } + } } -#pragma pop /* 802168D0-80216990 211210 00C0+00 0/0 1/1 0/0 .text setAlphaRupeeAnimeMin__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaRupeeAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaRupeeAnimeMin__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::setAlphaRupeeAnimeMin() { + f32 alphas[3]; + alphas[0] = g_drawHIO.mRupeeAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha); + alphas[1] = g_drawHIO.mRupeeFrameAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha); + alphas[2] = alphas[1]; + + for (int i = 0; i < 3; i++) { + if (mpRupeeParent[i]->getAlphaRate() != 0.0f) { + mpRupeeParent[i]->setAlphaRate(alphas[i]); + setAlphaAnimeMin(mpRupeeParent[i], 5); + } + } } -#pragma pop /* 80216990-80216A40 2112D0 00B0+00 0/0 1/1 0/0 .text setAlphaRupeeAnimeMax__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaRupeeAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaRupeeAnimeMax__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::setAlphaRupeeAnimeMax() { + f32 alphas[3]; + alphas[0] = g_drawHIO.mRupeeAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha); + alphas[1] = g_drawHIO.mRupeeFrameAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha); + alphas[2] = alphas[1]; + + for (int i = 0; i < 3; i++) { + if (mpRupeeParent[i]->getAlphaRate() != alphas[i]) { + mpRupeeParent[i]->setAlphaRate(alphas[i]); + setAlphaAnimeMax(mpRupeeParent[i], 5); + } + } } -#pragma pop /* 80216A40-80216B28 211380 00E8+00 1/1 1/1 0/0 .text drawKey__13dMeter2Draw_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawKey(s16 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawKey__13dMeter2Draw_cFs.s" +void dMeter2Draw_c::drawKey(s16 i_keyNum) { + if (i_keyNum > 5) { + i_keyNum = 5; + } + + for (int i = 0; i < 5; i++) { + if (i < i_keyNum) { + if (mpKeyTexture[i]->isVisible() == false) { + mpKeyTexture[i]->show(); + } + } else { + if (mpKeyTexture[i]->isVisible() == true) { + mpKeyTexture[i]->hide(); + } + } + } + + mpKeyParent->scale(g_drawHIO.mKeyScale, g_drawHIO.mKeyScale); + mpKeyParent->paneTrans(g_drawHIO.mKeyPosX, g_drawHIO.mKeyPosY); } -#pragma pop /* 80216B28-80216CA8 211468 0180+00 1/1 1/1 0/0 .text setAlphaKeyChange__13dMeter2Draw_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaKeyChange(bool param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaKeyChange__13dMeter2Draw_cFb.s" +void dMeter2Draw_c::setAlphaKeyChange(bool param_0) { + bool set_parent = false; + bool set_rupeekey = false; + bool set_key = false; + bool set_keynum = false; + + if (field_0x7e0 != g_drawHIO.mParentAlpha || param_0) { + field_0x7e0 = g_drawHIO.mParentAlpha; + set_parent = true; + } + + if (field_0x7e4 != g_drawHIO.mRupeeKeyAlpha || param_0) { + field_0x7e4 = g_drawHIO.mRupeeKeyAlpha; + set_rupeekey = true; + } + + if (mKeyAlpha != g_drawHIO.mKeyAlpha || param_0) { + mKeyAlpha = g_drawHIO.mKeyAlpha; + set_key = true; + } + + if (mKeyNumAlpha != g_drawHIO.mKeyNumAlpha || param_0) { + mKeyNumAlpha = g_drawHIO.mKeyNumAlpha; + set_keynum = true; + } + + if (set_parent || set_rupeekey || set_key || param_0) { + mpKeyParent->setAlphaRate(field_0x7e0 * (mKeyAlpha * field_0x7e4)); + } + + if (set_parent || set_rupeekey || set_keynum || param_0) { + for (int i = 0; i < 5; i++) { + mpKeyTexture[i]->setAlphaRate(field_0x7e0 * (field_0x7e4 * (mKeyNumAlpha * mKeyAlpha))); + } + } } -#pragma pop /* 80216CA8-80216D2C 2115E8 0084+00 0/0 1/1 0/0 .text setAlphaKeyAnimeMin__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaKeyAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaKeyAnimeMin__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::setAlphaKeyAnimeMin() { + f32 alpha = g_drawHIO.mKeyAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha); + + if (mpKeyParent->getAlphaRate() != 0.0f) { + mpKeyParent->setAlphaRate(alpha); + setAlphaAnimeMin(mpKeyParent, 5); + } } -#pragma pop /* 80216D2C-80216DAC 21166C 0080+00 0/0 1/1 0/0 .text setAlphaKeyAnimeMax__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaKeyAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaKeyAnimeMax__13dMeter2Draw_cFv.s" +void dMeter2Draw_c::setAlphaKeyAnimeMax() { + f32 alpha = g_drawHIO.mKeyAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha); + + if (mpKeyParent->getAlphaRate() != alpha) { + mpKeyParent->setAlphaRate(alpha); + setAlphaAnimeMax(mpKeyParent, 5); + } } -#pragma pop /* 80216DAC-802170E4 2116EC 0338+00 1/1 1/1 0/0 .text drawButtonA__13dMeter2Draw_cFUcfffffbb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawButtonA(u8 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, - f32 param_5, bool param_6, bool param_7) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawButtonA__13dMeter2Draw_cFUcfffffbb.s" +void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textPosX, f32 i_textPosY, + f32 i_scale, bool param_6, bool param_7) { + char* mp_string = getActionString(i_action, 1, &field_0x761); + f32 var_f31 = g_drawHIO.mButtonAScale; + f32 var_f30 = g_drawHIO.mButtonATextScale; + + if (isButtonBShow(false)) { + var_f31 = g_drawHIO.mButtonATalkScale[0]; + var_f30 = g_drawHIO.mButtonATalkScale[1]; + } else if (param_7) { + var_f31 = g_drawHIO.mButtonATalkAScale; + var_f30 = g_drawHIO.mButtonATextTalkAScale; + } + + if (dComIfGp_isDoSetFlag(2) || dComIfGp_isDoSetFlag(4)) { + field_0x761 = 7; + } + + if (param_6) { + if (i_action == 0x25) { + if (field_0x608 == 0.0f) { + field_0x608 = 18.0f - g_drawHIO.mButtonAPikariAnimSpeed; + } + field_0x759 = 1; + } else { + if (i_action != 0) { + field_0x608 = 18.0f - g_drawHIO.mButtonAPikariAnimSpeed; + } + field_0x759 = 0; + } + } + + if (*mp_string != 0 && ((i_dComIfGp_getDoStatus() != dComIfGp_getAStatus() && + i_dComIfGp_getDoStatus() != dComIfGp_getAStatusForce()) || + !isEmphasisA())) + { + mpTextA->show(); + mpTextA->show(); + } else { + mpTextA->hide(); + } + + JUT_ASSERT(std::strlen(mp_string) < (64)); + + if (daPy_getPlayerActorClass()->i_getSumouMode()) { + mpTextA->show(); + mp_string = getActionString(0x15, 1, NULL); + + for (int i = 0; i < 5; i++) { + strcpy(static_cast(mpAText[i]->getPanePtr())->getStringPtr(), mp_string); + } + } else { + for (int i = 0; i < 5; i++) { + strcpy(static_cast(mpAText[i]->getPanePtr())->getStringPtr(), mp_string); + } + } + + mpButtonA->scale(var_f31 * i_scale, var_f31 * i_scale); + mpButtonA->paneTrans(i_posX, i_posY); + mpTextA->scale(var_f30 * i_scale, var_f30 * i_scale); + mpTextA->paneTrans(g_drawHIO.mButtonATextPosX + i_textPosX, + g_drawHIO.mButtonATextPosY + i_textPosY); } -#pragma pop /* 802170E4-8021764C 211A24 0568+00 1/1 1/1 0/0 .text drawButtonB__13dMeter2Draw_cFUcbfffffb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawButtonB(u8 param_0, bool param_1, f32 param_2, f32 param_3, f32 param_4, - f32 param_5, f32 param_6, bool param_7) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawButtonB__13dMeter2Draw_cFUcbfffffb.s" +void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_posY, f32 i_textPosX, + f32 i_textPosY, f32 i_scale, bool param_7) { + int var_r31 = 0; + f32 var_f31 = g_drawHIO.mButtonBScale; + f32 var_f30 = g_drawHIO.mButtonBFontScale; + + if (isButtonBShow(true)) { + var_f31 = g_drawHIO.mButtonBTalkScale[0]; + var_f30 = g_drawHIO.mButtonBTalkScale[1]; + } + + field_0x6ec = i_posX; + field_0x6f0 = i_posY; + + char* mp_string = getActionString(i_action, 1, &field_0x762); + + if (dComIfGp_isASetFlag(2) || dComIfGp_isASetFlag(4)) { + field_0x762 = 7; + } + + if (*mp_string != 0 && i_action != 0 && i_action != 0x2E && + ((i_dComIfGp_getDoStatus() == 0 || + (i_dComIfGp_getDoStatus() != dComIfGp_getAStatus() && + i_dComIfGp_getDoStatus() != dComIfGp_getAStatusForce())) || + !isEmphasisB())) + { + mpTextB->show(); + } else { + mpTextB->hide(); + } + + if (param_7) { + if (i_action == 0x10) { + if (field_0x60c == 0.0f) { + field_0x60c = 18.0f - g_drawHIO.mButtonBPikariAnimSpeed; + } + field_0x75a = 1; + } else { + if (i_action != 0 && field_0x60c == 0.0f) { + field_0x60c = 18.0f - g_drawHIO.mButtonBPikariAnimSpeed; + } + field_0x75a = 0; + } + } + + JUT_ASSERT(std::strlen(mp_string) < (64)); + + for (int i = 0; i < 5; i++) { + strcpy(static_cast(mpBText[i]->getPanePtr())->getStringPtr(), mp_string); + } + + if (i_action == 0x26 || i_action == 0x2E) { + mpScreen->search('item_b_n')->show(); + var_r31 = 1; + + if (mButtonBItem != dComIfGs_getSelectEquipSword()) { + mButtonBItem = dComIfGs_getSelectEquipSword(); + + switch (dComIfGs_getSelectEquipSword()) { + case WOOD_STICK: + case SWORD: + case MASTER_SWORD: + case LIGHT_SWORD: + changeTextureItemB(mButtonBItem); + break; + default: + mpScreen->search('item_b_n')->hide(); + var_r31 = 0; + } + } + } else if (param_1 == true && i_action == 0x4F) { + mpScreen->search('item_b_n')->show(); + mButtonBItem = LURE_ROD; + changeTextureItemB(LURE_ROD); + var_r31 = 2; + } else { + mpScreen->search('item_b_n')->hide(); + } + + mpItemB->getPanePtr()->rotate(mpItemB->getSizeX() * 0.5f, mpItemB->getSizeY() * 0.5f, ROTATE_Z, + g_drawHIO.mButtonBItemRotation[var_r31]); + + field_0x730 = var_f31 * i_scale; + mpButtonB->scale(field_0x730 * field_0x734, field_0x730 * field_0x734); + mpButtonB->paneTrans(g_drawHIO.mButtonBPosX + i_posX, g_drawHIO.mButtonBPosY + i_posY); + + field_0x728 = g_drawHIO.mButtonBItemScale[var_r31] * i_scale; + mpItemB->scale(field_0x728 * field_0x734, field_0x728 * field_0x734); + mpItemB->paneTrans(field_0x6dc + (g_drawHIO.mButtonBItemPosX[var_r31] + i_posX), + field_0x6e0 + (g_drawHIO.mButtonBItemPosY[var_r31] + i_posY)); + + field_0x72c = g_drawHIO.mItemBBaseScale[0] * i_scale; + mpLightB->scale(field_0x72c * field_0x734, field_0x72c * field_0x734); + mpLightB->paneTrans(g_drawHIO.mItemBBasePosX[0] + i_posX, g_drawHIO.mItemBBasePosY[0] + i_posY); + + mpTextB->scale(var_f30 * i_scale, var_f30 * i_scale); + mpTextB->paneTrans(g_drawHIO.mButtonBFontPosX + i_textPosX, + g_drawHIO.mButtonBFontPosY + i_textPosY); } -#pragma pop /* 8021764C-802176EC 211F8C 00A0+00 1/1 1/1 0/0 .text drawButtonR__13dMeter2Draw_cFUcUcbb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawButtonR(u8 param_0, u8 param_1, bool param_2, bool param_3) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawButtonR__13dMeter2Draw_cFUcUcbb.s" +void dMeter2Draw_c::drawButtonR(u8 unused0, u8 i_action, bool unused1, bool unused2) { + mpScreen->search('item_r_n')->hide(); + mpTextXY[2]->show(); + + getActionString(i_action, 1, &field_0x768[2]); + if (dComIfGp_isRSetFlag(2) || dComIfGp_isRSetFlag(4)) { + field_0x768[2] = 7; + } } -#pragma pop /* 802176EC-80217904 21202C 0218+00 1/1 1/1 0/0 .text drawButtonZ__13dMeter2Draw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawButtonZ(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawButtonZ__13dMeter2Draw_cFUc.s" +void dMeter2Draw_c::drawButtonZ(u8 i_action) { + char* mp_string = getActionString(i_action, 1, &field_0x764); + + if (dComIfGp_isZSetFlag(2) || dComIfGp_isZSetFlag(4)) { + field_0x764 = 7; + } + + if (i_action == 0x27) { + mpTextXY[2]->hide(); + mpButtonMidona->hide(); + } else if (*mp_string != 0 && i_action != 0x2F && i_action != 8) { + mpTextXY[2]->show(); + mpButtonMidona->hide(); + } else { + mpTextXY[2]->hide(); + mpButtonMidona->show(); + } + + JUT_ASSERT(std::strlen(mp_string) < (64)); + + for (int i = 0; i < 5; i++) { + strcpy(static_cast(mpXYText[i][2]->getPanePtr())->getStringPtr(), mp_string); + } + + mpButtonXY[2]->scale(g_drawHIO.mButtonZScale, g_drawHIO.mButtonZScale); + mpButtonXY[2]->paneTrans(g_drawHIO.mButtonZPosX, g_drawHIO.mButtonZPosY); + + mpItemR->scale(g_drawHIO.mButtonZItemScale, g_drawHIO.mButtonZItemScale); + mpItemR->paneTrans(g_drawHIO.mButtonZItemPosX + field_0x6ac[2], + g_drawHIO.mButtonZItemPosY + field_0x6b8[2]); + + mpLightXY[2]->scale(g_drawHIO.mButtonZItemBaseScale, g_drawHIO.mButtonZItemBaseScale); + mpLightXY[2]->paneTrans(g_drawHIO.mButtonZItemBasePosX, g_drawHIO.mButtonZItemBasePosY); + + mpTextXY[2]->scale(g_drawHIO.mButtonZFontScale, g_drawHIO.mButtonZFontScale); + mpTextXY[2]->paneTrans(g_drawHIO.mButtonZFontPosX, g_drawHIO.mButtonZFontPosY); } -#pragma pop /* 80217904-80217954 212244 0050+00 1/1 1/1 0/0 .text drawButton3D__13dMeter2Draw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawButton3D(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawButton3D__13dMeter2Draw_cFUc.s" +void dMeter2Draw_c::drawButton3D(u8 i_action) { + getActionString(i_action, 1, &field_0x765); + if (i_action != 0) { + field_0x765 = 7; + } } -#pragma pop /* 80217954-802179C0 212294 006C+00 1/1 1/1 0/0 .text drawButtonC__13dMeter2Draw_cFUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawButtonC(u8 param_0, bool param_1) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawButtonC__13dMeter2Draw_cFUcb.s" +void dMeter2Draw_c::drawButtonC(u8 i_action, bool unused) { + getActionString(i_action, 1, &field_0x766); + if (i_action != 0 && (dComIfGp_isCStickSetFlag(2) & 1 || dComIfGp_isCStickSetFlag(4))) { + field_0x766 = 7; + } } -#pragma pop /* 802179C0-80217A10 212300 0050+00 1/1 1/1 0/0 .text drawButtonS__13dMeter2Draw_cFUc */ -void dMeter2Draw_c::drawButtonS(u8 param_0) { - getActionString(param_0, 1, &field_0x767); - if (param_0 != 0) { +void dMeter2Draw_c::drawButtonS(u8 i_action) { + getActionString(i_action, 1, &field_0x767); + if (i_action != 0) { field_0x767 = 7; } } /* 80217A10-80217AB4 212350 00A4+00 0/0 1/1 0/0 .text drawButtonBin__13dMeter2Draw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawButtonBin(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawButtonBin__13dMeter2Draw_cFUc.s" -} -#pragma pop +void dMeter2Draw_c::drawButtonBin(u8 i_action) { + int bottle_num = 0; + for (int i = 0; i < 4; i++) { + if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != NO_ITEM) { + bottle_num++; + } + } -/* ############################################################################################## */ -/* 803988A8-803988B8 024F08 0010+00 1/1 0/0 0/0 .rodata tag$7361 */ -SECTION_RODATA static u8 const tag_7361[16] = { - 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x78, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x79, 0x5F, 0x6E, -}; -COMPILER_STRIP_GATE(0x803988A8, &tag_7361); + if (bottle_num != 0) { + getActionString(i_action, 1, &field_0x763); + if (i_action != 0) { + field_0x763 = 7; + } + } +} /* 80217AB4-80218238 2123F4 0784+00 1/1 1/1 0/0 .text drawButtonXY__13dMeter2Draw_cFiUcUcbb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawButtonXY(int param_0, u8 param_1, u8 param_2, bool param_3, - bool param_4) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawButtonXY__13dMeter2Draw_cFiUcUcbb.s" +void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_3, bool param_4) { + JUT_ASSERT(i_no < SELECT_MAX_e); + + static u64 const tag[] = {'item_x_n', 'item_y_n'}; + + if (!param_3) { + mpScreen->search(tag[i_no])->hide(); + + int var_r26; + if (i_no == SELECT_X_e) { + var_r26 = dComIfGp_isXSetFlag(2) | dComIfGp_isXSetFlag(4); + } else if (i_no == SELECT_Y_e) { + var_r26 = dComIfGp_isYSetFlag(2) | dComIfGp_isYSetFlag(4); + } + + char* mp_string = getActionString(i_action, 1, &field_0x768[i_no]); + if (var_r26) { + field_0x768[i_no] = 7; + } + + if (param_4) { + if (i_action == 0x10) { + if (field_0x620[i_no] == 0.0f) { + field_0x620[i_no] = 18.0f - g_drawHIO.mButtonXYPikariAnimSpeed; + } + + field_0x75c[i_no] = 1; + } else { + if (i_action != 0) { + field_0x620[i_no] = 18.0f - g_drawHIO.mButtonXYPikariAnimSpeed; + } + + field_0x75c[i_no] = 0; + } + } + + if (*mp_string != 0) { + mpTextXY[i_no]->show(); + } else { + mpTextXY[i_no]->hide(); + } + + JUT_ASSERT(std::strlen(mp_string) < (64)); + + for (int i = 0; i < 5; i++) { + strcpy(static_cast(mpXYText[i][i_no]->getPanePtr())->getStringPtr(), + mp_string); + } + + if (i_no == SELECT_X_e) { + mpTextXY[i_no]->scale(g_drawHIO.mButtonXYTextScale, g_drawHIO.mButtonXYTextScale); + mpTextXY[i_no]->paneTrans(g_drawHIO.mButtonXYTextPosX, g_drawHIO.mButtonXYTextPosY); + } else if (i_no == SELECT_Y_e) { + mpTextXY[i_no]->scale(g_drawHIO.mButtonXYTextScale, g_drawHIO.mButtonXYTextScale); + mpTextXY[i_no]->paneTrans(g_drawHIO.mButtonXYTextPosX, g_drawHIO.mButtonXYTextPosY); + } + } else { + mpScreen->search(tag[i_no])->show(); + mpTextXY[i_no]->hide(); + + int var_r29; + if (i_itemNo == NO_ITEM || i_itemNo == 0) { + mpScreen->search(tag[i_no])->hide(); + var_r29 = 1; + } else { + mpScreen->search(tag[i_no])->show(); + changeTextureItemXY(i_no, i_itemNo); + var_r29 = 0; + } + + switch (i_no) { + case SELECT_X_e: + setItemParamX(i_itemNo); + break; + case SELECT_Y_e: + setItemParamY(i_itemNo); + break; + case SELECT_Z_e: + setItemParamZ(i_itemNo); + break; + } + + mpItemXY[i_no]->getPanePtr()->rotate(mpItemXY[i_no]->getSizeX() * 0.5f, + mpItemXY[i_no]->getSizeY() * 0.5f, ROTATE_Z, + mItemParams[i_no].rotation); + + if (i_no == SELECT_X_e) { + mpButtonXY[0]->scale(g_drawHIO.mButtonXScale, g_drawHIO.mButtonXScale); + mpButtonXY[0]->paneTrans(g_drawHIO.mButtonXPosX, g_drawHIO.mButtonXPosY); + f32 temp_f31 = mItemParams[SELECT_X_e].scale; + + if (field_0x773[0] != dMeter2Info_isDirectUseItem(0)) { + field_0x773[0] = dMeter2Info_isDirectUseItem(0); + + if (dMeter2Info_isDirectUseItem(0) && field_0x610[0] == 0.0f) { + field_0x610[0] = 18.0f - g_drawHIO.field_0x4e0; + } + } + + dMeter2Info_isDirectUseItem(0); + + temp_f31 *= g_drawHIO.field_0x54c; + mpItemXY[0]->scale(temp_f31, temp_f31); + mpItemXY[0]->paneTrans(mItemParams[SELECT_X_e].pos_x + field_0x6ac[0], + mItemParams[SELECT_X_e].pos_y + field_0x6b8[0]); + + mpLightXY[0]->scale(g_drawHIO.mButtonXItemBaseScale[var_r29], + g_drawHIO.mButtonXItemBaseScale[var_r29]); + mpLightXY[0]->paneTrans(g_drawHIO.mButtonXItemBasePosX[var_r29], + g_drawHIO.mButtonXItemBasePosY[var_r29]); + mpLightXY[0]->setAlphaRate(mButtonXItemBaseAlpha[var_r29] * field_0x7f0); + + mpTextXY[i_no]->scale(g_drawHIO.mButtonXYTextScale, g_drawHIO.mButtonXYTextScale); + mpTextXY[i_no]->paneTrans(g_drawHIO.mButtonXYTextPosX, g_drawHIO.mButtonXYTextPosY); + } else if (i_no == SELECT_Y_e) { + mpButtonXY[1]->scale(g_drawHIO.mButtonYScale, g_drawHIO.mButtonYScale); + mpButtonXY[1]->paneTrans(g_drawHIO.mButtonYPosX, g_drawHIO.mButtonYPosY); + f32 temp_f31 = mItemParams[SELECT_Y_e].scale; + + if (field_0x773[1] != dMeter2Info_isDirectUseItem(1)) { + field_0x773[1] = dMeter2Info_isDirectUseItem(1); + + if (dMeter2Info_isDirectUseItem(1) && field_0x610[1] == 0.0f) { + field_0x610[1] = 18.0f - g_drawHIO.field_0x4e0; + } + } + + dMeter2Info_isDirectUseItem(1); + + temp_f31 *= g_drawHIO.field_0x54c; + mpItemXY[1]->scale(temp_f31, temp_f31); + mpItemXY[1]->paneTrans(mItemParams[SELECT_Y_e].pos_x + field_0x6ac[1], + mItemParams[SELECT_Y_e].pos_y + field_0x6b8[1]); + + mpLightXY[1]->scale(g_drawHIO.mButtonYItemBaseScale[var_r29], + g_drawHIO.mButtonYItemBaseScale[var_r29]); + mpLightXY[1]->paneTrans(g_drawHIO.mButtonYItemBasePosX[var_r29], + g_drawHIO.mButtonYItemBasePosY[var_r29]); + mpLightXY[1]->setAlphaRate(mButtonYItemBaseAlpha[var_r29] * field_0x7f0); + + mpTextXY[i_no]->scale(g_drawHIO.mButtonXYTextScale, g_drawHIO.mButtonXYTextScale); + mpTextXY[i_no]->paneTrans(g_drawHIO.mButtonXYTextPosX, g_drawHIO.mButtonXYTextPosY); + } + } } -#pragma pop /* 80218238-80218254 212B78 001C+00 0/0 1/1 0/0 .text * getButtonCrossParentInitTransY__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMeter2Draw_c::getButtonCrossParentInitTransY() { - nofralloc -#include "asm/d/meter/d_meter2_draw/getButtonCrossParentInitTransY__13dMeter2Draw_cFv.s" +f32 dMeter2Draw_c::getButtonCrossParentInitTransY() { + return mpButtonCrossParent->getInitCenterPosY(); } -#pragma pop /* 80218254-80218338 212B94 00E4+00 1/1 1/1 0/0 .text drawButtonCross__13dMeter2Draw_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawButtonCross(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawButtonCross__13dMeter2Draw_cFff.s" +void dMeter2Draw_c::drawButtonCross(f32 i_posX, f32 i_posY) { + mpButtonCrossParent->scale(g_drawHIO.mButtonCrossScale, g_drawHIO.mButtonCrossScale); + mpTextI->scale(g_drawHIO.mButtonCrossTextScale, g_drawHIO.mButtonCrossTextScale); + mpTextM->scale(g_drawHIO.mButtonCrossTextScale, g_drawHIO.mButtonCrossTextScale); + mpButtonCrossParent->paneTrans(i_posX, i_posY); } -#pragma pop /* 80218338-802183A8 212C78 0070+00 0/0 1/1 0/0 .text - * setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonCrossAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv.s" + * setAlphButtonACrossAnimeMin__13dMeter2Draw_cFv */ +void dMeter2Draw_c::setAlphButtonACrossAnimeMin() { + if (mpButtonCrossParent->getAlphaRate() != 0.0f) { + mpButtonCrossParent->setAlphaRate(g_drawHIO.mParentAlpha); + setAlphaAnimeMin(mpButtonCrossParent, 5); + } + + setAlphButtonACrossItemAnimeMin(); + setAlphButtonACrossMapAnimeMin(); } -#pragma pop /* 802183A8-80218448 212CE8 00A0+00 0/0 1/1 0/0 .text - * setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonCrossAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv.s" + * setAlphButtonACrossAnimeMax__13dMeter2Draw_cFv */ +void dMeter2Draw_c::setAlphButtonACrossAnimeMax() { + if (g_drawHIO.mParentAlpha != mpButtonCrossParent->getAlphaRate()) { + mpButtonCrossParent->setAlphaRate(g_drawHIO.mParentAlpha); + setAlphaAnimeMax(mpButtonCrossParent, 5); + } + + if (dMeter2Info_isItemOpenCheck()) { + setAlphButtonACrossItemAnimeMax(); + } else { + setAlphButtonACrossItemAnimeMin(); + } + + if (dMeter2Info_isMapOpenCheck()) { + setAlphButtonACrossMapAnimeMax(); + } else { + setAlphButtonACrossMapAnimeMin(); + } } -#pragma pop /* 80218448-80218524 212D88 00DC+00 2/2 0/0 0/0 .text - * setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv.s" + * setAlphButtonACrossItemAnimeMin__13dMeter2Draw_cFv */ +void dMeter2Draw_c::setAlphButtonACrossItemAnimeMin() { + if (mpTextI->getAlphaRate() != 0.0f) { + mpTextI->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha); + setAlphaAnimeMin(mpTextI, 5); + } + + for (int i = 0; i < 5; i++) { + if (mpJujiI[i] != NULL && mpJujiI[i]->getAlphaRate() != 0.0f) { + mpJujiI[i]->setAlphaRate(g_drawHIO.mParentAlpha); + setAlphaAnimeMin(mpJujiI[i], 5); + } + } } -#pragma pop /* 80218524-802185E8 212E64 00C4+00 1/1 0/0 0/0 .text - * setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv.s" + * setAlphButtonACrossItemAnimeMax__13dMeter2Draw_cFv */ +void dMeter2Draw_c::setAlphButtonACrossItemAnimeMax() { + if (g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha != mpTextI->getAlphaRate()) { + mpTextI->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha); + setAlphaAnimeMax(mpTextI, 5); + } + + for (int i = 0; i < 5; i++) { + if (mpJujiI[i] != NULL && mpJujiI[i]->getAlphaRate() != g_drawHIO.mParentAlpha) { + mpJujiI[i]->setAlphaRate(g_drawHIO.mParentAlpha); + setAlphaAnimeMax(mpJujiI[i], 5); + } + } } -#pragma pop /* 802185E8-802186C4 212F28 00DC+00 2/2 0/0 0/0 .text - * setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv.s" + * setAlphButtonACrossMapAnimeMin__13dMeter2Draw_cFv */ +void dMeter2Draw_c::setAlphButtonACrossMapAnimeMin() { + if (mpTextM->getAlphaRate() != 0.0f) { + mpTextM->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha); + setAlphaAnimeMin(mpTextM, 5); + } + + for (int i = 0; i < 5; i++) { + if (mpJujiM[i] != NULL && mpJujiM[i]->getAlphaRate() != 0.0f) { + mpJujiM[i]->setAlphaRate(g_drawHIO.mParentAlpha); + setAlphaAnimeMin(mpJujiM[i], 5); + } + } } -#pragma pop /* 802186C4-80218788 213004 00C4+00 1/1 0/0 0/0 .text - * setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv.s" -} -#pragma pop + * setAlphButtonACrossMapAnimeMax__13dMeter2Draw_cFv */ +void dMeter2Draw_c::setAlphButtonACrossMapAnimeMax() { + if (g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha != mpTextM->getAlphaRate()) { + mpTextM->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha); + setAlphaAnimeMax(mpTextM, 5); + } -/* 80218788-8021901C 2130C8 0894+00 1/1 1/1 0/0 .text setAlphaButtonChange__13dMeter2Draw_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonChange(bool param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonChange__13dMeter2Draw_cFb.s" + for (int i = 0; i < 5; i++) { + if (mpJujiM[i] != NULL && mpJujiM[i]->getAlphaRate() != g_drawHIO.mParentAlpha) { + mpJujiM[i]->setAlphaRate(g_drawHIO.mParentAlpha); + setAlphaAnimeMax(mpJujiM[i], 5); + } + } } -#pragma pop -/* 8021901C-802190A8 21395C 008C+00 0/0 1/1 0/0 .text setAlphaButtonAnimeMin__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonAnimeMin__13dMeter2Draw_cFv.s" +/* 80218788-8021901C 2130C8 0894+00 1/1 1/1 0/0 .text setAlphButtonAChange__13dMeter2Draw_cFb */ +void dMeter2Draw_c::setAlphButtonAChange(bool param_0) { + bool set_parent = false; + bool set_buttonA = false; + bool set_buttonB = false; + bool set_buttonX = false; + bool set_buttonY = false; + bool set_buttonZ = false; + bool set_buttonXItem = false; + bool set_buttonYItem = false; + bool set_buttonBase = false; + bool set_buttonZItem = false; + + if (field_0x7f0 != g_drawHIO.mParentAlpha || param_0) { + field_0x7f0 = g_drawHIO.mParentAlpha; + set_parent = true; + } + + if (mMainHUDButtonsAlpha != g_drawHIO.mMainHUDButtonsAlpha || param_0) { + field_0x7f0 = g_drawHIO.mMainHUDButtonsAlpha; + set_parent = true; + } + + if (mButtonAAlpha != g_drawHIO.mButtonAAlpha || param_0) { + mButtonAAlpha = g_drawHIO.mButtonAAlpha; + set_buttonA = true; + } + + if (mButtonBAlpha != g_drawHIO.mButtonBAlpha || param_0) { + mButtonBAlpha = g_drawHIO.mButtonBAlpha; + set_buttonB = true; + } + + if (mButtonXAlpha != g_drawHIO.mButtonXAlpha || param_0) { + mButtonXAlpha = g_drawHIO.mButtonXAlpha; + set_buttonX = true; + } + + if (mButtonYAlpha != g_drawHIO.mButtonYAlpha || param_0) { + mButtonYAlpha = g_drawHIO.mButtonYAlpha; + set_buttonY = true; + } + + if (field_0x80c != g_drawHIO.field_0x168 || param_0) { + field_0x80c = g_drawHIO.field_0x168; + } + + if (field_0x810 != g_drawHIO.mButtonZAlpha || param_0) { + field_0x810 = g_drawHIO.mButtonZAlpha; + set_buttonZ = true; + } + + int sp44[4]; + for (int i = 0; i < 2; i++) { + if (mpTextXY[i]->isVisible()) { + sp44[i] = 0; + } else { + sp44[i] = 1; + } + } + sp44[2] = 0; + sp44[3] = 0; + + if (mItemBBaseAlpha[sp44[3]] != g_drawHIO.mItemBBaseAlpha[sp44[3]] || param_0) { + mItemBBaseAlpha[sp44[3]] = g_drawHIO.mItemBBaseAlpha[sp44[3]]; + } + + if (mButtonXItemBaseAlpha[sp44[0]] != g_drawHIO.mButtonXItemBaseAlpha[sp44[0]] || param_0) { + mButtonXItemBaseAlpha[sp44[0]] = g_drawHIO.mButtonXItemBaseAlpha[sp44[0]]; + set_buttonXItem = true; + } + + if (mButtonYItemBaseAlpha[sp44[1]] != g_drawHIO.mButtonYItemBaseAlpha[sp44[1]] || param_0) { + mButtonYItemBaseAlpha[sp44[1]] = g_drawHIO.mButtonYItemBaseAlpha[sp44[1]]; + set_buttonYItem = true; + } + + if (mButtonZItemBaseAlpha != g_drawHIO.mButtonZItemBaseAlpha || param_0) { + mButtonZItemBaseAlpha = g_drawHIO.mButtonZItemBaseAlpha; + set_buttonZItem = true; + } + + if (mButtonBaseAlpha != g_drawHIO.mButtonBaseAlpha || param_0) { + mButtonBaseAlpha = g_drawHIO.mButtonBaseAlpha; + set_buttonBase = true; + } + + if (mButtonDisplayBackAlpha != g_drawHIO.mButtonDisplayBackAlpha || param_0) { + mButtonDisplayBackAlpha = g_drawHIO.mButtonDisplayBackAlpha; + } + + if (set_parent || set_buttonA || param_0) { + mpButtonA->setAlphaRate(mButtonAAlpha * field_0x7f0); + } + + if (set_parent || set_buttonB || param_0) { + mpButtonB->setAlphaRate(mButtonBAlpha * field_0x7f0); + } + + if (set_parent || set_buttonX || param_0) { + mpButtonXY[0]->setAlphaRate(mButtonXAlpha * field_0x7f0); + } + + if (set_parent || set_buttonY || param_0) { + mpButtonXY[1]->setAlphaRate(mButtonYAlpha * field_0x7f0); + } + + if (set_parent || set_buttonZ || param_0) { + mpButtonXY[2]->setAlphaRate(field_0x810 * field_0x7f0); + } + + if (set_parent || set_buttonXItem || param_0) { + mpLightXY[0]->setAlphaRate(mButtonXItemBaseAlpha[sp44[0]] * field_0x7f0); + } + + if (set_parent || set_buttonYItem || param_0) { + mpLightXY[1]->setAlphaRate(mButtonYItemBaseAlpha[sp44[1]] * field_0x7f0); + } + + if (set_parent || param_0) { + mpLightXY[2]->setAlphaRate(field_0x82c[sp44[2]] * field_0x7f0); + } + + if (set_parent || set_buttonZItem || param_0) { + mpLightXY[2]->setAlphaRate(mButtonZItemBaseAlpha * field_0x7f0); + } + + if (mpUzu != NULL && (set_parent || set_buttonBase || param_0)) { + mpUzu->setAlphaRate(mButtonBaseAlpha * field_0x7f0); + } + + if (mButtonATextSpacing != g_drawHIO.mButtonATextSpacing || param_0) { + mButtonATextSpacing = g_drawHIO.mButtonATextSpacing; + + for (int i = 0; i < 5; i++) { + static_cast(mpAText[i]->getPanePtr())->setCharSpace(mButtonATextSpacing); + } + } + + if (mButtonATextColor.r != g_drawHIO.mButtonATextColor.r || + mButtonATextColor.g != g_drawHIO.mButtonATextColor.g || + mButtonATextColor.b != g_drawHIO.mButtonATextColor.b || + mButtonATextColor.a != g_drawHIO.mButtonATextColor.a || param_0) + { + mButtonATextColor.r = g_drawHIO.mButtonATextColor.r; + mButtonATextColor.g = g_drawHIO.mButtonATextColor.g; + mButtonATextColor.b = g_drawHIO.mButtonATextColor.b; + mButtonATextColor.a = g_drawHIO.mButtonATextColor.a; + + static_cast(mpAText[4]->getPanePtr()) + ->setFontColor(g_drawHIO.mButtonATextColor, g_drawHIO.mButtonATextColor); + } + + if (mButtonBTextColor.r != g_drawHIO.mButtonBFontColor.r || + mButtonBTextColor.g != g_drawHIO.mButtonBFontColor.g || + mButtonBTextColor.b != g_drawHIO.mButtonBFontColor.b || + mButtonBTextColor.a != g_drawHIO.mButtonBFontColor.a || param_0) + { + mButtonBTextColor.r = g_drawHIO.mButtonBFontColor.r; + mButtonBTextColor.g = g_drawHIO.mButtonBFontColor.g; + mButtonBTextColor.b = g_drawHIO.mButtonBFontColor.b; + mButtonBTextColor.a = g_drawHIO.mButtonBFontColor.a; + + static_cast(mpBText[4]->getPanePtr()) + ->setFontColor(g_drawHIO.mButtonBFontColor, g_drawHIO.mButtonBFontColor); + } + + if (mButtonZTextColor.r != g_drawHIO.mButtonZFontColor.r || + mButtonZTextColor.g != g_drawHIO.mButtonZFontColor.g || + mButtonZTextColor.b != g_drawHIO.mButtonZFontColor.b || + mButtonZTextColor.a != g_drawHIO.mButtonZFontColor.a || param_0) + { + mButtonZTextColor.r = g_drawHIO.mButtonZFontColor.r; + mButtonZTextColor.g = g_drawHIO.mButtonZFontColor.g; + mButtonZTextColor.b = g_drawHIO.mButtonZFontColor.b; + mButtonZTextColor.a = g_drawHIO.mButtonZFontColor.a; + + static_cast(mpXYText[4][2]->getPanePtr()) + ->setFontColor(g_drawHIO.mButtonZFontColor, g_drawHIO.mButtonZFontColor); + } + + if (mButtonXYTextColor.r != g_drawHIO.mButtonXYTextColor.r || + mButtonXYTextColor.g != g_drawHIO.mButtonXYTextColor.g || + mButtonXYTextColor.b != g_drawHIO.mButtonXYTextColor.b || + mButtonXYTextColor.a != g_drawHIO.mButtonXYTextColor.a || param_0) + { + mButtonXYTextColor.r = g_drawHIO.mButtonXYTextColor.r; + mButtonXYTextColor.g = g_drawHIO.mButtonXYTextColor.g; + mButtonXYTextColor.b = g_drawHIO.mButtonXYTextColor.b; + mButtonXYTextColor.a = g_drawHIO.mButtonXYTextColor.a; + + static_cast(mpXYText[4][0]->getPanePtr()) + ->setFontColor(g_drawHIO.mButtonXYTextColor, g_drawHIO.mButtonXYTextColor); + + static_cast(mpXYText[4][1]->getPanePtr()) + ->setFontColor(g_drawHIO.mButtonXYTextColor, g_drawHIO.mButtonXYTextColor); + } } -#pragma pop -/* 802190A8-80219174 2139E8 00CC+00 0/0 1/1 0/0 .text setAlphaButtonAnimeMax__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonAnimeMax__13dMeter2Draw_cFv.s" +/* 8021901C-802190A8 21395C 008C+00 0/0 1/1 0/0 .text setAlphButtonAAnimeMin__13dMeter2Draw_cFv */ +void dMeter2Draw_c::setAlphButtonAAnimeMin() { + if (mpButtonParent->getAlphaRate() != 0.0f) { + mpButtonParent->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + setAlphaAnimeMin(mpButtonParent, 5); + + if (mpUzu != NULL) { + mpUzu->setAlphaRate(mButtonBaseAlpha * mpButtonParent->getAlphaRate()); + } + } } -#pragma pop -/* 80219174-80219258 213AB4 00E4+00 0/0 1/1 0/0 .text setAlphaButtonAAnimeMin__13dMeter2Draw_cFv +/* 802190A8-80219174 2139E8 00CC+00 0/0 1/1 0/0 .text setAlphButtonAAnimeMax__13dMeter2Draw_cFv */ +void dMeter2Draw_c::setAlphButtonAAnimeMax() { + if (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha != mpButtonParent->getAlphaRate()) { + mpButtonParent->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + setAlphaAnimeMax(mpButtonParent, 5); + + if (mpUzu != NULL) { + mpUzu->setAlphaRate(mButtonBaseAlpha * mpButtonParent->getAlphaRate()); + } + } + + if (mpButtonParent->getAlphaTimer() == 5) { + if (dMeter2Info_getLightDropGetFlag(dComIfGp_getStartStageDarkArea()) == 1) { + dMeter2Info_setLightDropGetFlag(dComIfGp_getStartStageDarkArea(), 2); + } + } +} + +/* 80219174-80219258 213AB4 00E4+00 0/0 1/1 0/0 .text setAlphButtonAAAnimeMin__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonAAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonAAnimeMin__13dMeter2Draw_cFv.s" -} -#pragma pop +void dMeter2Draw_c::setAlphButtonAAAnimeMin() { + if (mpButtonA->getAlphaRate() != 0.0f) { + mpButtonA->setAlphaRate(g_drawHIO.mButtonAAlpha * + (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha)); + setAlphaAnimeMin(mpButtonA, 5); + } -/* 80219258-80219324 213B98 00CC+00 0/0 1/1 0/0 .text setAlphaButtonAAnimeMax__13dMeter2Draw_cFv + for (int i = 0; i < 5; i++) { + if (mpAText[i]->getAlphaRate() != 0.0f) { + mpAText[i]->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + setAlphaAnimeMin(mpAText[i], 5); + } + } +} + +/* 80219258-80219324 213B98 00CC+00 0/0 1/1 0/0 .text setAlphButtonAAAnimeMax__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonAAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonAAnimeMax__13dMeter2Draw_cFv.s" -} -#pragma pop +void dMeter2Draw_c::setAlphButtonAAAnimeMax() { + if (g_drawHIO.mButtonAAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha) != + mpButtonA->getAlphaRate()) + { + mpButtonA->setAlphaRate(g_drawHIO.mButtonAAlpha * + (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha)); + setAlphaAnimeMax(mpButtonA, 5); + } -/* 80219324-80219474 213C64 0150+00 0/0 1/1 0/0 .text setAlphaButtonBAnimeMin__13dMeter2Draw_cFv + for (int i = 0; i < 5; i++) { + if (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha != mpAText[i]->getAlphaRate()) { + mpAText[i]->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + setAlphaAnimeMax(mpAText[i], 5); + } + } +} + +/* 80219324-80219474 213C64 0150+00 0/0 1/1 0/0 .text setAlphButtonABAnimeMin__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonBAnimeMin() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonBAnimeMin__13dMeter2Draw_cFv.s" -} -#pragma pop +void dMeter2Draw_c::setAlphButtonABAnimeMin() { + if (mpButtonB->getAlphaRate() != 0.0f) { + mpButtonB->setAlphaRate(g_drawHIO.mButtonBAlpha * + (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha)); + setAlphaAnimeMin(mpButtonB, 5); -/* 80219474-802195A4 213DB4 0130+00 0/0 1/1 0/0 .text setAlphaButtonBAnimeMax__13dMeter2Draw_cFv + mpLightB->setAlphaRate(g_drawHIO.mButtonBAlpha * + (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha)); + setAlphaAnimeMin(mpLightB, 5); + } + + if (mpItemB->getAlphaRate() != 0.0f) { + mpItemB->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + setAlphaAnimeMin(mpItemB, 5); + } + + for (int i = 0; i < 5; i++) { + if (mpBText[i]->getAlphaRate() != 0.0f) { + mpBText[i]->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + setAlphaAnimeMin(mpBText[i], 5); + } + } +} + +/* 80219474-802195A4 213DB4 0130+00 0/0 1/1 0/0 .text setAlphButtonABAnimeMax__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaButtonBAnimeMax() { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaButtonBAnimeMax__13dMeter2Draw_cFv.s" -} -#pragma pop +void dMeter2Draw_c::setAlphButtonABAnimeMax() { + if (mpButtonB->getAlphaRate() != + g_drawHIO.mButtonBAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha)) + { + mpButtonB->setAlphaRate(g_drawHIO.mButtonBAlpha * + (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha)); + setAlphaAnimeMax(mpButtonB, 5); -/* ############################################################################################## */ -/* 804548CC-804548D0 002ECC 0004+00 5/5 0/0 0/0 .sdata2 @8207 */ -SECTION_SDATA2 static f32 lit_8207 = 255.0f; + mpLightB->setAlphaRate(g_drawHIO.mButtonBAlpha * + (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha)); + setAlphaAnimeMax(mpLightB, 5); + } + + if (mpItemB->getAlphaRate() != g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha) { + mpItemB->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + setAlphaAnimeMax(mpItemB, 5); + } + + for (int i = 0; i < 5; i++) { + if (mpBText[i]->getAlphaRate() != g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha) { + mpBText[i]->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + setAlphaAnimeMax(mpBText[i], 5); + } + } +} /* 802195A4-80219788 213EE4 01E4+00 0/0 1/1 0/0 .text setButtonIconAAlpha__13dMeter2Draw_cFUcUlb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setButtonIconAAlpha(u8 param_0, u32 param_1, bool param_2) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setButtonIconAAlpha__13dMeter2Draw_cFUcUlb.s" +void dMeter2Draw_c::setButtonIconAAlpha(u8 unused0, u32 unused1, bool unused2) { + if (mpButtonA->isVisible()) { + u8 alpha = g_drawHIO.mButtonAAlpha * + (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha) * + (f32)mpButtonA->getInitAlpha(); + f32 alpha_rate = mpButtonParent->getAlphaRate(); + + if (!dMeter2Info_isUseButton(1) && !dComIfGp_isDoSetFlag(4)) { + alpha = g_drawHIO.mButtonXYBaseDimAlpha; + } + + mpButtonA->setAlpha(alpha * alpha_rate); + + for (int i = 0; i < 5; i++) { + u8 alpha = mpAText[i]->getInitAlpha(); + if (!dMeter2Info_isUseButton(1)) { + alpha = (f32)alpha * ((f32)g_drawHIO.field_0x42c / 255.0f); + } + + mpAText[i]->setAlpha(alpha * alpha_rate); + } + } } -#pragma pop /* 80219788-80219A84 2140C8 02FC+00 0/0 1/1 0/0 .text setButtonIconBAlpha__13dMeter2Draw_cFUcUlb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setButtonIconBAlpha(u8 param_0, u32 param_1, bool param_2) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setButtonIconBAlpha__13dMeter2Draw_cFUcUlb.s" +void dMeter2Draw_c::setButtonIconBAlpha(u8 unused0, u32 unused1, bool param_2) { + if (mpItemB->isVisible() || mpLightB->isVisible() || mpButtonB->isVisible()) { + f32 temp_f30 = + g_drawHIO.mButtonBAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + + f32 var_f2; + if (mpItemB->isVisible()) { + var_f2 = mItemBBaseAlpha[0]; + } else { + var_f2 = mItemBBaseAlpha[1]; + } + + u8 var_r25 = mpItemB->getInitAlpha(); + u8 var_r26 = var_f2 * (temp_f30 * (f32)mpLightB->getInitAlpha()); + u8 var_r27 = temp_f30 * (f32)mpButtonB->getInitAlpha(); + f32 temp_f31 = mpButtonParent->getAlphaRate(); + + if (!(dMeter2Info_isUseButton(2) & 1) && !dMeter2Info_isSub2DStatus(1)) { + var_r25 = g_drawHIO.mButtonXYItemDimAlpha; + var_r26 = g_drawHIO.mButtonXYItemDimAlpha; + var_r27 = g_drawHIO.mButtonXYBaseDimAlpha; + } + + if (!param_2) { + var_r26 = 0; + } + + mpItemB->setAlpha(var_r25 * temp_f31); + mpLightB->setAlpha(var_r26 * temp_f31); + mpButtonB->setAlpha(var_r27 * temp_f31); + + for (int i = 0; i < 5; i++) { + u8 alpha = mpBText[i]->getInitAlpha(); + if (!dMeter2Info_isUseButton(2) && !dMeter2Info_isSub2DStatus(1)) { + alpha = (f32)alpha * ((f32)g_drawHIO.field_0x42c / 255.0f); + } + + mpBText[i]->setAlpha(alpha * temp_f31); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 804548D0-804548D4 002ED0 0004+00 1/1 0/0 0/0 .sdata2 @8359 */ -SECTION_SDATA2 static f32 lit_8359 = 2.0f / 5.0f; - -/* 804548D4-804548D8 002ED4 0004+00 1/1 0/0 0/0 .sdata2 @8360 */ -SECTION_SDATA2 static f32 lit_8360 = 1.0f / 10.0f; /* 80219A84-80219E98 2143C4 0414+00 0/0 1/1 0/0 .text setButtonIconMidonaAlpha__13dMeter2Draw_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setButtonIconMidonaAlpha(u32 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setButtonIconMidonaAlpha__13dMeter2Draw_cFUl.s" +void dMeter2Draw_c::setButtonIconMidonaAlpha(u32 param_0) { + mpButtonMidona->scale(g_drawHIO.mMidnaIconScale, g_drawHIO.mMidnaIconScale); + mpButtonMidona->paneTrans(g_drawHIO.mMidnaIconPosX, g_drawHIO.mMidnaIconPosY); + + if (mpButtonMidona->isVisible()) { + f32 temp_f30 = + g_drawHIO.mMidnaIconAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + f32 var_f29 = (f32)mpButtonMidona->getInitAlpha() / 255.0f; + f32 temp_f31 = mpButtonParent->getAlphaRate(); + bool var_r31 = 1; + + if (getCanoeFishing() || + (!i_dComIfGs_isEventBit(0x0540) && !dMeter2Info_isUseButton(0x800)) || + !i_dComIfGs_isEventBit(0x0C10) || i_dComIfGs_isEventBit(0x6140)) + { + var_f29 = 0.0f; + } else if (dComIfGp_isPauseFlag()) { + var_f29 = 0.0f; + } else if (!dMeter2Info_isUseButton(0x800)) { + var_f29 = g_drawHIO.mButtonXYItemDimAlpha / 255.0f; + } else if (isEmphasisZ() && !(param_0 & 0x40000000) && temp_f31 > 0.0f) { + if (field_0x738 == 0.0f) { + field_0x738 = 18.0f; + } + + if (field_0x738 == 18.0f) { + mDoAud_seStart(Z2SE_SY_HINT_BUTTON_BLINK, NULL, 0, 0); + dMeter2Info_set2DVibration(); + } + + mButtonZAlpha = var_f29; + var_r31 = 0; + } + + if (var_r31) { + if (field_0x738 != 0.0f) { + field_0x738 = 0.0f; + } + + if (mButtonZAlpha != var_f29) { + cLib_addCalc2(&mButtonZAlpha, var_f29, 0.4f, 0.5f); + + if (fabsf(mButtonZAlpha - var_f29) < 0.1f) { + mButtonZAlpha = var_f29; + } + } + } + + mpButtonMidona->setAlpha(temp_f30 * (255.0f * mButtonZAlpha * temp_f31)); + } else { + mButtonZAlpha = 0.0f; + } + + f32 var_f29_2 = + (g_drawHIO.mButtonZAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha) * + (f32)mpButtonXY[2]->getInitAlpha()) / + 255.0f; + f32 temp_f30_2 = mpButtonParent->getAlphaRate(); + if (param_0 & 0x1000000) { + var_f29_2 = 0.0f; + } else if (!dMeter2Info_isUseButton(0x800)) { + var_f29_2 = (f32)g_drawHIO.mButtonXYBaseDimAlpha / 255.0f; + } + + if (field_0x724 != var_f29_2) { + cLib_addCalc2(&field_0x724, var_f29_2, 0.4f, 0.5f); + + if (fabsf(field_0x724 - var_f29_2) < 0.1f) { + field_0x724 = var_f29_2; + } + } + + mpButtonXY[2]->setAlpha(255.0f * field_0x724 * temp_f30_2); } -#pragma pop /* 80219E98-8021A29C 2147D8 0404+00 0/0 1/1 0/0 .text setButtonIconAlpha__13dMeter2Draw_cFiUcUlb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setButtonIconAlpha(int param_0, u8 param_1, u32 param_2, bool param_3) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setButtonIconAlpha__13dMeter2Draw_cFiUcUlb.s" +void dMeter2Draw_c::setButtonIconAlpha(int i_no, u8 unused0, u32 unused1, bool unused2) { + JUT_ASSERT(i_no < SELECT_MAX_e); + + if (mpItemXY[i_no]->isVisible() || mpLightXY[i_no]->isVisible() || + mpButtonXY[i_no]->isVisible()) + { + f32 var_f30 = 1.0f; + + int var_r26 = 1; + if (mpItemXY[i_no]->isVisible()) { + var_r26 = 0; + } + + f32 var_f2; + if (i_no == 0) { + var_f2 = + g_drawHIO.mButtonXAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + var_f30 = g_drawHIO.mButtonXItemBaseAlpha[var_r26]; + } else if (i_no == 1) { + var_f2 = + g_drawHIO.mButtonYAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + var_f30 = g_drawHIO.mButtonYItemBaseAlpha[var_r26]; + } else { + var_f2 = + g_drawHIO.mButtonZAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); + } + + u8 var_r28 = mpItemXY[i_no]->getInitAlpha(); + u8 var_r27 = var_f30 * (var_f2 * (f32)mpLightXY[i_no]->getInitAlpha()); + u8 var_r26_2 = var_f2 * (f32)mpButtonXY[i_no]->getInitAlpha(); + f32 temp_f31 = mpButtonParent->getAlphaRate(); + + if (i_no == 0) { + if (!dMeter2Info_isUseButton(4)) { + if (getFishingType()) { + var_r28 = 0; + } else { + var_r28 = g_drawHIO.mButtonXYItemDimAlpha; + } + + var_r27 = g_drawHIO.mButtonXYItemDimAlpha; + var_r26_2 = g_drawHIO.mButtonXYBaseDimAlpha; + } + } else if (i_no == 1) { + if (!dMeter2Info_isUseButton(8)) { + if (getFishingType()) { + var_r28 = 0; + } else { + var_r28 = g_drawHIO.mButtonXYItemDimAlpha; + } + + var_r27 = g_drawHIO.mButtonXYItemDimAlpha; + var_r26_2 = g_drawHIO.mButtonXYBaseDimAlpha; + } + } + + mpItemXY[i_no]->setAlpha((f32)var_r28 * temp_f31); + mpLightXY[i_no]->setAlpha((f32)var_r27 * temp_f31); + mpButtonXY[i_no]->setAlpha((f32)var_r26_2 * temp_f31); + + int var_r26_3 = 1; + if (i_no == 0) { + if (!dMeter2Info_isUseButton(4)) { + var_r26_3 = 0; + } + } else if (i_no == 1) { + if (!dMeter2Info_isUseButton(8)) { + var_r26_3 = 0; + } + } + + for (int i = 0; i < 5; i++) { + u8 var_r0 = mpXYText[i][i_no]->getInitAlpha(); + if (!var_r26_3) { + var_r0 = (f32)var_r0 * (g_drawHIO.field_0x42c / 255.0f); + } + + mpXYText[i][i_no]->setAlpha((f32)var_r0 * temp_f31); + } + } } -#pragma pop /* 8021A29C-8021A2F4 214BDC 0058+00 1/1 0/0 0/0 .text getNumberTexture__13dMeter2Draw_cFi */ @@ -2328,325 +3313,680 @@ ResTIMG* dMeter2Draw_c::getNumberTexture(int i) { dMeter2Info_getNumberTextureName(i)); } -/* ############################################################################################## */ -/* 80430158-80430178 05CE78 0020+00 1/1 0/0 0/0 .bss i_text_buf$8454 */ -static u8 i_text_buf[32]; - /* 8021A2F4-8021A468 214C34 0174+00 9/9 1/1 0/0 .text getActionString__13dMeter2Draw_cFUcUcPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm char* dMeter2Draw_c::getActionString(u8 param_0, u8 param_1, u8* param_2) { - nofralloc -#include "asm/d/meter/d_meter2_draw/getActionString__13dMeter2Draw_cFUcUcPUc.s" +char* dMeter2Draw_c::getActionString(u8 i_action, u8 i_type, u8* param_2) { + static u32 i_action_num[] = { + 0, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1387, 1009, 1010, 1011, 1012, 1013, 1014, + 1015, 1033, 1016, 1017, 1018, 1019, 1020, 1045, 1022, 1026, 1027, 1028, 1029, 1030, 1024, + 1031, 1025, 1023, 1045, 1036, 1032, 93, 0, 0, 0, 1035, 1034, 1037, 1038, 1039, + 1040, 1041, 998, 1042, 1043, 1044, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, + 1055, 1056, 1057, 1058, 1059, 1070, 1060, 1061, 1062, 1063, 1064, 1067, 1065, 1066, 1211, + 1069, 1021, 1072, 1073, 0, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, + 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1092, 1093, 1094, 1095, 1096, 1904, 1097, 1098, + 1099, 1100, 1150, 1149, 1148, 1377, 1147, 1145, 1146, 1161, 1162, 1163, 1164, 1165, 1166, + 1144, 982, 983, 1143, 1160, 1319, 1314, 1399, 1008, + }; + + static char i_text_buf[32]; + strcpy(i_text_buf, ""); + + if (param_2 != NULL) { + *param_2 = 1; + } + + if (i_action == 0x81) { + if (g_drawHIO.mButtonATextActionID != 0) { + JMSMesgEntry_c mesg_entry; + + if (i_type == 1) { + dMeter2Info_getStringKana(g_drawHIO.mButtonATextActionID, i_text_buf, &mesg_entry); + } else { + dMeter2Info_getStringKanji(g_drawHIO.mButtonATextActionID, i_text_buf, &mesg_entry); + } + + if (param_2 != NULL) { + *param_2 = mesg_entry.field_0x0a; + + if (g_drawHIO.mButtonATextActionID == 0x3E6) { + *param_2 = 7; + } + } + } + } else if (i_action < 0x82 && i_action_num[i_action] != 0) { + JMSMesgEntry_c mesg_entry; + + if (i_type == 1) { + dMeter2Info_getStringKana(i_action_num[i_action], i_text_buf, &mesg_entry); + } else { + dMeter2Info_getStringKanji(i_action_num[i_action], i_text_buf, &mesg_entry); + } + + if (param_2 != NULL) { + *param_2 = mesg_entry.field_0x0a; + + if (i_action_num[i_action] == 0x3E6) { + *param_2 = 7; + } + } + } + + return i_text_buf; } -#pragma pop - -/* ############################################################################################## */ -/* 804548D8-804548DC 002ED8 0004+00 2/2 0/0 0/0 .sdata2 @8548 */ -SECTION_SDATA2 static f32 lit_8548 = 100.0f; - -/* 804548DC-804548E0 002EDC 0004+00 2/2 0/0 0/0 .sdata2 @8549 */ -SECTION_SDATA2 static f32 lit_8549 = 48.0f; /* 8021A468-8021A71C 214DA8 02B4+00 2/2 0/0 0/0 .text changeTextureItemB__13dMeter2Draw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::changeTextureItemB(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/changeTextureItemB__13dMeter2Draw_cFUc.s" +void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) { + int var_r31 = 0; + if (i_itemNo == LURE_ROD) { + var_r31 = 2; + } else if (i_itemNo == SWORD || i_itemNo == MASTER_SWORD || i_itemNo == WOOD_STICK || + i_itemNo == LIGHT_SWORD) + { + var_r31 = 1; + } + + if (field_0x76b == 0) { + field_0x76b = 1; + } else { + field_0x76b = 0; + } + + setItemParamB(i_itemNo); + if (dMeter2Info_readItemTexture(i_itemNo, mpItemBTex[field_0x76b][0], + (J2DPicture*)mpItemB->getPanePtr(), mpItemBTex[field_0x76b][1], + mpItemBPane, NULL, NULL, NULL, NULL, -1) <= 1) + { + mpItemBPane->hide(); + } else { + mpItemBPane->show(); + } + + f32 var_f4; + if (g_drawHIO.mItemScaleAdjustON == true) { + var_f4 = g_drawHIO.mItemScalePercent / 100.0f; + } else { + var_f4 = dItem_data::getTexScale(i_itemNo) / 100.0f; + } + + field_0x6e4 = var_f4 * ((mpItemBTex[field_0x76b][0]->width * mpItemB->getInitSizeX()) / 48.0f); + field_0x6e8 = var_f4 * ((mpItemBTex[field_0x76b][0]->height * mpItemB->getInitSizeY()) / 48.0f); + field_0x6dc = (mpItemB->getInitSizeX() - field_0x6e4) * 0.5f; + field_0x6e0 = (mpItemB->getInitSizeY() - field_0x6e8) * 0.5f; + mpItemB->resize(field_0x6e4, field_0x6e8); + mpItemB->paneTrans(field_0x6dc + (g_drawHIO.mButtonBItemPosX[var_r31] + field_0x6ec), + field_0x6e0 + (g_drawHIO.mButtonBItemPosY[var_r31] + field_0x6f0)); + + mpItemBPane->resize(field_0x6e4, field_0x6e8); } -#pragma pop /* 8021A71C-8021A9C8 21505C 02AC+00 1/1 0/0 0/0 .text changeTextureItemXY__13dMeter2Draw_cFiUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::changeTextureItemXY(int param_0, u8 param_1) { - nofralloc -#include "asm/d/meter/d_meter2_draw/changeTextureItemXY__13dMeter2Draw_cFiUc.s" +void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) { + JUT_ASSERT(i_no < SELECT_MAX_e); + + if (i_itemNo == LIGHT_ARROW) { + i_itemNo = BOW; + } + + if (field_0x76c[i_no] == 0) { + field_0x76c[i_no] = 1; + } else { + field_0x76c[i_no] = 0; + } + + if (dMeter2Info_readItemTexture(i_itemNo, mpItemXYTex[i_no][field_0x76c[i_no]][0], + (J2DPicture*)mpItemXY[i_no]->getPanePtr(), + mpItemXYTex[i_no][field_0x76c[i_no]][1], mpItemXYPane[i_no], + NULL, NULL, NULL, NULL, -1) <= 1) + { + mpItemXYPane[i_no]->hide(); + } else { + mpItemXYPane[i_no]->show(); + } + + f32 var_f4; + if (g_drawHIO.mItemScaleAdjustON == true) { + var_f4 = g_drawHIO.mItemScalePercent / 100.0f; + } else { + var_f4 = dItem_data::getTexScale(i_itemNo) / 100.0f; + } + + field_0x6c4[i_no] = + var_f4 * + ((mpItemXYTex[i_no][field_0x76c[i_no]][0]->width * mpItemXY[i_no]->getInitSizeX()) / 48.0f); + field_0x6d0[i_no] = + var_f4 * + ((mpItemXYTex[i_no][field_0x76c[i_no]][0]->height * mpItemXY[i_no]->getInitSizeY()) / + 48.0f); + field_0x6ac[i_no] = (mpItemXY[i_no]->getInitSizeX() - field_0x6c4[i_no]) * 0.5f; + field_0x6b8[i_no] = (mpItemXY[i_no]->getInitSizeY() - field_0x6d0[i_no]) * 0.5f; + mpItemXY[i_no]->resize(field_0x6c4[i_no], field_0x6d0[i_no]); + + if (i_no == SELECT_X_e) { + mpItemXY[i_no]->paneTrans(mItemParams[SELECT_X_e].pos_x + field_0x6ac[i_no], + mItemParams[SELECT_X_e].pos_y + field_0x6b8[i_no]); + } else { + mpItemXY[i_no]->paneTrans(mItemParams[SELECT_Y_e].pos_x + field_0x6ac[i_no], + mItemParams[SELECT_Y_e].pos_y + field_0x6b8[i_no]); + } + + mpItemXYPane[i_no]->resize(field_0x6c4[i_no], field_0x6d0[i_no]); } -#pragma pop /* 8021A9C8-8021AAA4 215308 00DC+00 10/10 2/2 0/0 .text * setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaAnimeMin(CPaneMgrAlpha* param_0, s16 param_1) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas.s" +void dMeter2Draw_c::setAlphaAnimeMin(CPaneMgrAlpha* i_pane, s16 i_min) { + f32 alpha_rate = i_pane->getAlphaRate(); + s16 alpha_timer = i_pane->getAlphaTimer(); + if (alpha_timer > i_min) { + alpha_timer = i_min; + } + + if (alpha_timer <= 0) { + if (i_pane->getAlphaRate() != 0.0f) { + i_pane->setAlphaRate(0.0f); + } + } else { + alpha_timer--; + if (alpha_timer < 0) { + alpha_timer = 0; + } + + i_pane->alphaAnimeStart(alpha_timer); + i_pane->setAlphaRate(alpha_rate * ((f32)alpha_timer / (f32)i_min)); + } } -#pragma pop /* 8021AAA4-8021AB84 2153E4 00E0+00 10/10 23/23 0/0 .text * setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setAlphaAnimeMax(CPaneMgrAlpha* param_0, s16 param_1) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas.s" +void dMeter2Draw_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane, s16 i_max) { + f32 alpha_rate = i_pane->getAlphaRate(); + s16 alpha_timer = i_pane->getAlphaTimer(); + + if (alpha_timer >= i_max) { + if (i_pane->getAlphaRate() != alpha_rate) { + i_pane->setAlphaRate(alpha_rate); + } + } else { + alpha_timer++; + if (alpha_timer > i_max) { + alpha_timer = i_max; + } + + i_pane->alphaAnimeStart(alpha_timer); + i_pane->setAlphaRate(alpha_rate * ((f32)alpha_timer / (f32)i_max)); + } } -#pragma pop /* 8021AB84-8021AEC8 2154C4 0344+00 0/0 6/6 0/0 .text setItemNum__13dMeter2Draw_cFUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setItemNum(u8 param_0, u8 param_1, u8 param_2) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setItemNum__13dMeter2Draw_cFUcUcUc.s" -} -#pragma pop +void dMeter2Draw_c::setItemNum(u8 i_button, u8 i_num, u8 i_max) { + JUT_ASSERT(i_button < SELECT_MAX_e); -/* 8021AEC8-8021AF78 215808 00B0+00 0/0 1/1 0/0 .text drawItemNum__13dMeter2Draw_cFUcf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawItemNum(u8 param_0, f32 param_1) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawItemNum__13dMeter2Draw_cFUcf.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804548E0-804548E4 002EE0 0004+00 1/1 0/0 0/0 .sdata2 @8774 */ -SECTION_SDATA2 static f32 lit_8774 = 9.0f; - -/* 804548E4-804548E8 002EE4 0004+00 1/1 0/0 0/0 .sdata2 @8775 */ -SECTION_SDATA2 static f32 lit_8775 = 3.0f / 5.0f; - -/* 80456B90-80456B94 000030 0004+00 1/1 0/0 0/0 .sbss2 @8746 */ -SECTION_SBSS2 static u8 lit_8746[4]; - -/* 80456B94-80456B98 000034 0004+00 1/1 0/0 0/0 .sbss2 None */ -SECTION_SBSS2 static u8 data_80456B94[4]; - -/* 80456B98-80456B9C 000038 0004+00 1/1 0/0 0/0 .sbss2 @8747 */ -SECTION_SBSS2 static u8 lit_8747[4]; - -/* 80456B9C-80456BA0 00003C 0004+00 1/1 0/0 0/0 .sbss2 None */ -SECTION_SBSS2 static u8 data_80456B9C[4]; - -/* 8021AF78-8021B0C8 2158B8 0150+00 0/0 1/1 0/0 .text drawKanteraMeter__13dMeter2Draw_cFUcf */ -#ifdef NONMATCHING -void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) { - CPaneMgr* pane = mpItemXY[i_button]; - f32 local_74[2] = {0.0f}; - f32 local_68[2] = {0.0f}; - - if (i_alphaRate == 1.0f) { - i_alphaRate = pane->getAlphaRate(); + if (i_num > i_max) { + i_num = i_max; } - JGeometry::TVec3 vtx1 = pane->getPanePtr()->getGlbVtx(0); - JGeometry::TVec3 vtx2 = pane->getPanePtr()->getGlbVtx(3); + JUtility::TColor black; + JUtility::TColor white; - mpKanteraMeter[i_button]->setPos((vtx1.x + vtx2.x) * 0.5f + 9.0f + local_74[i_button], - vtx2.y + local_68[i_button]); + if (i_num == i_max) { + black.set(30, 30, 30, 0); + white.set(255, 200, 50, 255); + } else if (i_num == 0) { + black.set(30, 30, 30, 0); + white.set(180, 180, 180, 255); + } else { + black.set(0, 0, 0, 0); + white.set(255, 255, 255, 255); + } + + for (int i = 0; i < 3; i++) { + mpItemNumTex[i_button][i]->setBlackWhite(black, white); + } + + if (i_num < 100) { + ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(i_num / 10)); + mpItemNumTex[i_button][0]->changeTexture(timg, 0); + + timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(i_num % 10)); + mpItemNumTex[i_button][1]->changeTexture(timg, 0); + + mpItemNumTex[i_button][2]->hide(); + } else { + ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(i_num / 100)); + mpItemNumTex[i_button][0]->changeTexture(timg, 0); + + i_num = i_num % 100; + timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(i_num / 10)); + + mpItemNumTex[i_button][1]->changeTexture(timg, 0); + + timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(i_num % 10)); + mpItemNumTex[i_button][2]->changeTexture(timg, 0); + + mpItemNumTex[i_button][2]->show(); + } +} + +/* 8021AEC8-8021AF78 215808 00B0+00 0/0 1/1 0/0 .text drawItemNum__13dMeter2Draw_cFUcf */ +void dMeter2Draw_c::drawItemNum(u8 i_button, f32 i_alpha) { + JUT_ASSERT(i_button < SELECT_MAX_e); + + if (i_alpha == 1.0f) { + i_alpha = mpItemXY[i_button]->getAlphaRate(); + } + + for (int i = 0; i < 3; i++) { + mpItemNumTex[i_button][i]->setAlpha(i_alpha * 255.0f); + } +} + +/* 8021AF78-8021B0C8 2158B8 0150+00 0/0 1/1 0/0 .text drawKanteraMeter__13dMeter2Draw_cFUcf */ +void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) { + JUT_ASSERT(i_button < SELECT_MAX_e); + + CPaneMgr* pane = mpItemXY[i_button]; + f32 sp10[2] = {0.0f}; + f32 sp8[2] = {0.0f}; + + if (i_alphaRate == 1.0f) { + i_alphaRate = mpItemXY[i_button]->getAlphaRate(); + } + + JGeometry::TVec3 vtx0 = pane->getPanePtr()->getGlbVtx(0); + JGeometry::TVec3 vtx3 = pane->getPanePtr()->getGlbVtx(3); + + mpKanteraMeter[i_button]->setPos(((vtx0.x + vtx3.x) * 0.5f) + 9.0f + sp10[i_button], + vtx3.y + sp8[i_button]); mpKanteraMeter[i_button]->setScale(0.6f, 0.6f); mpKanteraMeter[i_button]->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil()); mpKanteraMeter[i_button]->setAlphaRate(i_alphaRate); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::drawKanteraMeter(u8 param_0, f32 param_1) { - nofralloc -#include "asm/d/meter/d_meter2_draw/drawKanteraMeter__13dMeter2Draw_cFUcf.s" -} -#pragma pop -#endif /* 8021B0C8-8021B104 215A08 003C+00 0/0 3/3 0/0 .text isButtonVisible__13dMeter2Draw_cFv */ u8 dMeter2Draw_c::isButtonVisible() { - return (mpButtonParent->getAlphaRate() == FLOAT_LABEL(lit_4182)) ^ 1; + return (mpButtonParent->getAlphaRate() == 0.0f) ^ 1; } -/* ############################################################################################## */ -/* 804548E8-804548EC 002EE8 0004+00 2/2 0/0 0/0 .sdata2 @8992 */ -SECTION_SDATA2 static f32 lit_8992 = 4.0f; - -/* 804548EC-804548F0 002EEC 0004+00 1/1 0/0 0/0 .sdata2 @8993 */ -SECTION_SDATA2 static f32 lit_8993 = -11.0f; - -/* 804548F0-804548F4 002EF0 0004+00 4/4 0/0 0/0 .sdata2 @8994 */ -SECTION_SDATA2 static f32 lit_8994 = 17.0f / 10.0f; - -/* 804548F4-804548F8 002EF4 0004+00 3/3 0/0 0/0 .sdata2 @8995 */ -SECTION_SDATA2 static f32 lit_8995 = -4.0f; - -/* 804548F8-804548FC 002EF8 0004+00 2/2 0/0 0/0 .sdata2 @8996 */ -SECTION_SDATA2 static f32 lit_8996 = -46.0f / 5.0f; - -/* 804548FC-80454900 002EFC 0004+00 2/2 0/0 0/0 .sdata2 @8997 */ -SECTION_SDATA2 static f32 lit_8997 = 19.0f / 20.0f; - -/* 80454900-80454904 002F00 0004+00 2/2 0/0 0/0 .sdata2 @8998 */ -SECTION_SDATA2 static f32 lit_8998 = 46.0f / 5.0f; - -/* 80454904-80454908 002F04 0004+00 1/1 0/0 0/0 .sdata2 @8999 */ -SECTION_SDATA2 static f32 lit_8999 = -14.0f; - -/* 80454908-8045490C 002F08 0004+00 2/2 0/0 0/0 .sdata2 @9000 */ -SECTION_SDATA2 static f32 lit_9000 = 2.0f; - -/* 8045490C-80454910 002F0C 0004+00 2/2 0/0 0/0 .sdata2 @9001 */ -SECTION_SDATA2 static f32 lit_9001 = 1.5f; - -/* 80454910-80454914 002F10 0004+00 2/2 0/0 0/0 .sdata2 @9002 */ -SECTION_SDATA2 static f32 lit_9002 = 350.0f; - -/* 80454914-80454918 002F14 0004+00 1/1 0/0 0/0 .sdata2 @9003 */ -SECTION_SDATA2 static f32 lit_9003 = -2.0f; - -/* 80454918-8045491C 002F18 0004+00 1/1 0/0 0/0 .sdata2 @9004 */ -SECTION_SDATA2 static f32 lit_9004 = -15.0f; - -/* 8045491C-80454920 002F1C 0004+00 3/3 0/0 0/0 .sdata2 @9005 */ -SECTION_SDATA2 static f32 lit_9005 = -13.0f / 10.0f; - -/* 80454920-80454924 002F20 0004+00 2/2 0/0 0/0 .sdata2 @9006 */ -SECTION_SDATA2 static f32 lit_9006 = -16.0f; - -/* 80454924-80454928 002F24 0004+00 3/3 0/0 0/0 .sdata2 @9007 */ -SECTION_SDATA2 static f32 lit_9007 = 1.888888955116272f; - /* 8021B104-8021B364 215A44 0260+00 3/2 0/0 0/0 .text setItemParamX__13dMeter2Draw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setItemParamX(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setItemParamX__13dMeter2Draw_cFUc.s" +void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { + if (g_drawHIO.mButtonDebug[0]) { + mItemParams[SELECT_X_e].pos_x = g_drawHIO.mButtonXItemPosX; + mItemParams[SELECT_X_e].pos_y = g_drawHIO.mButtonXItemPosY; + mItemParams[SELECT_X_e].scale = g_drawHIO.mButtonXItemScale; + mItemParams[SELECT_X_e].rotation = g_drawHIO.mButtonItemRotation[0]; + mItemParams[SELECT_X_e].num_pos_x = g_drawHIO.mXItemNumPosX; + mItemParams[SELECT_X_e].num_pos_y = g_drawHIO.mXItemNumPosY; + mItemParams[SELECT_X_e].num_scale = g_drawHIO.mXItemNumScale; + } else { + switch (i_itemNo) { + case BOOMERANG: + mItemParams[SELECT_X_e].pos_x = 4.0f; + mItemParams[SELECT_X_e].pos_y = -11.0f; + mItemParams[SELECT_X_e].scale = 1.7f; + mItemParams[SELECT_X_e].rotation = 17.0f; + mItemParams[SELECT_X_e].num_pos_x = -4.0f; + mItemParams[SELECT_X_e].num_pos_y = -9.2f; + mItemParams[SELECT_X_e].num_scale = 0.95f; + break; + case BOW: + mItemParams[SELECT_X_e].pos_x = 9.2f; + mItemParams[SELECT_X_e].pos_y = -14.0f; + mItemParams[SELECT_X_e].scale = 2.0f; + mItemParams[SELECT_X_e].rotation = 0.0f; + mItemParams[SELECT_X_e].num_pos_x = -4.0f; + mItemParams[SELECT_X_e].num_pos_y = -9.2f; + mItemParams[SELECT_X_e].num_scale = 0.95f; + break; + case HVY_BOOTS: + mItemParams[SELECT_X_e].pos_x = 4.0f; + mItemParams[SELECT_X_e].pos_y = -14.0f; + mItemParams[SELECT_X_e].scale = 1.7f; + mItemParams[SELECT_X_e].rotation = 0.0f; + mItemParams[SELECT_X_e].num_pos_x = -4.0f; + mItemParams[SELECT_X_e].num_pos_y = -9.2f; + mItemParams[SELECT_X_e].num_scale = 0.95f; + break; + case HOOKSHOT: + mItemParams[SELECT_X_e].pos_x = 17.0f; + mItemParams[SELECT_X_e].pos_y = -14.0f; + mItemParams[SELECT_X_e].scale = 1.5f; + mItemParams[SELECT_X_e].rotation = 350.0f; + mItemParams[SELECT_X_e].num_pos_x = -4.0f; + mItemParams[SELECT_X_e].num_pos_y = -9.2f; + mItemParams[SELECT_X_e].num_scale = 0.95f; + break; + case KANTERA: + mItemParams[SELECT_X_e].pos_x = -2.0f; + mItemParams[SELECT_X_e].pos_y = -15.0f; + mItemParams[SELECT_X_e].scale = g_drawHIO.mButtonXItemScale; + mItemParams[SELECT_X_e].rotation = g_drawHIO.mButtonItemRotation[0]; + mItemParams[SELECT_X_e].num_pos_x = g_drawHIO.mXItemNumPosX; + mItemParams[SELECT_X_e].num_pos_y = g_drawHIO.mXItemNumPosY; + mItemParams[SELECT_X_e].num_scale = g_drawHIO.mXItemNumScale; + break; + default: + if (isBottleItem(i_itemNo)) { + mItemParams[SELECT_X_e].pos_x = -1.3f; + mItemParams[SELECT_X_e].pos_y = -16.0f; + mItemParams[SELECT_X_e].scale = 1.888889f; + mItemParams[SELECT_X_e].rotation = g_drawHIO.mButtonItemRotation[0]; + mItemParams[SELECT_X_e].num_pos_x = g_drawHIO.mXItemNumPosX; + mItemParams[SELECT_X_e].num_pos_y = g_drawHIO.mXItemNumPosY; + mItemParams[SELECT_X_e].num_scale = g_drawHIO.mXItemNumScale; + } else { + mItemParams[SELECT_X_e].pos_x = g_drawHIO.mButtonXItemPosX; + mItemParams[SELECT_X_e].pos_y = g_drawHIO.mButtonXItemPosY; + mItemParams[SELECT_X_e].scale = g_drawHIO.mButtonXItemScale; + mItemParams[SELECT_X_e].rotation = g_drawHIO.mButtonItemRotation[0]; + mItemParams[SELECT_X_e].num_pos_x = g_drawHIO.mXItemNumPosX; + mItemParams[SELECT_X_e].num_pos_y = g_drawHIO.mXItemNumPosY; + mItemParams[SELECT_X_e].num_scale = g_drawHIO.mXItemNumScale; + } + break; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80454928-8045492C 002F28 0004+00 3/3 0/0 0/0 .sdata2 @9025 */ -SECTION_SDATA2 static f32 lit_9025 = 14.0f; - -/* 8045492C-80454930 002F2C 0004+00 2/2 0/0 0/0 .sdata2 @9026 */ -SECTION_SDATA2 static f32 lit_9026 = 13.0f / 10.0f; - -/* 80454930-80454934 002F30 0004+00 2/2 0/0 0/0 .sdata2 @9027 */ -SECTION_SDATA2 static f32 lit_9027 = -33.0f / 5.0f; - -/* 80454934-80454938 002F34 0004+00 2/2 0/0 0/0 .sdata2 @9028 */ -SECTION_SDATA2 static f32 lit_9028 = 33.0f / 5.0f; - -/* 80454938-8045493C 002F38 0004+00 1/1 0/0 0/0 .sdata2 @9029 */ -SECTION_SDATA2 static f32 lit_9029 = -9.0f / 5.0f; /* 8021B364-8021B5B0 215CA4 024C+00 3/2 0/0 0/0 .text setItemParamY__13dMeter2Draw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setItemParamY(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setItemParamY__13dMeter2Draw_cFUc.s" +void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { + if (g_drawHIO.mButtonDebug[1]) { + mItemParams[SELECT_Y_e].pos_x = g_drawHIO.mButtonYItemPosX; + mItemParams[SELECT_Y_e].pos_y = g_drawHIO.mButtonYItemPosY; + mItemParams[SELECT_Y_e].scale = g_drawHIO.mButtonYItemScale; + mItemParams[SELECT_Y_e].rotation = g_drawHIO.mButtonItemRotation[1]; + mItemParams[SELECT_Y_e].num_pos_x = g_drawHIO.mYItemNumPosX; + mItemParams[SELECT_Y_e].num_pos_y = g_drawHIO.mYItemNumPosY; + mItemParams[SELECT_Y_e].num_scale = g_drawHIO.mYItemNumScale; + } else { + switch (i_itemNo) { + case BOOMERANG: + mItemParams[SELECT_Y_e].pos_x = 14.0f; + mItemParams[SELECT_Y_e].pos_y = 1.3f; + mItemParams[SELECT_Y_e].scale = 1.7f; + mItemParams[SELECT_Y_e].rotation = 17.0f; + mItemParams[SELECT_Y_e].num_pos_x = -9.2f; + mItemParams[SELECT_Y_e].num_pos_y = -9.2f; + mItemParams[SELECT_Y_e].num_scale = 0.95f; + break; + case BOW: + mItemParams[SELECT_Y_e].pos_x = -1.3f; + mItemParams[SELECT_Y_e].pos_y = -6.6f; + mItemParams[SELECT_Y_e].scale = 2.0f; + mItemParams[SELECT_Y_e].rotation = 0.0f; + mItemParams[SELECT_Y_e].num_pos_x = -9.2f; + mItemParams[SELECT_Y_e].num_pos_y = -9.2f; + mItemParams[SELECT_Y_e].num_scale = 0.95f; + break; + case HVY_BOOTS: + mItemParams[SELECT_Y_e].pos_x = 1.3f; + mItemParams[SELECT_Y_e].pos_y = 1.3f; + mItemParams[SELECT_Y_e].scale = 1.7f; + mItemParams[SELECT_Y_e].rotation = 0.0f; + mItemParams[SELECT_Y_e].num_pos_x = -9.2f; + mItemParams[SELECT_Y_e].num_pos_y = -9.2f; + mItemParams[SELECT_Y_e].num_scale = 0.95f; + break; + case HOOKSHOT: + mItemParams[SELECT_Y_e].pos_x = 6.6f; + mItemParams[SELECT_Y_e].pos_y = -4.0f; + mItemParams[SELECT_Y_e].scale = 1.5f; + mItemParams[SELECT_Y_e].rotation = 350.0f; + mItemParams[SELECT_Y_e].num_pos_x = -9.2f; + mItemParams[SELECT_Y_e].num_pos_y = -9.2f; + mItemParams[SELECT_Y_e].num_scale = 0.95f; + break; + case KANTERA: + mItemParams[SELECT_Y_e].pos_x = -1.8f; + mItemParams[SELECT_Y_e].pos_y = g_drawHIO.mButtonYItemPosY; + mItemParams[SELECT_Y_e].scale = g_drawHIO.mButtonYItemScale; + mItemParams[SELECT_Y_e].rotation = g_drawHIO.mButtonItemRotation[1]; + mItemParams[SELECT_Y_e].num_pos_x = g_drawHIO.mYItemNumPosX; + mItemParams[SELECT_Y_e].num_pos_y = g_drawHIO.mYItemNumPosY; + mItemParams[SELECT_Y_e].num_scale = g_drawHIO.mYItemNumScale; + break; + default: + if (isBottleItem(i_itemNo)) { + mItemParams[SELECT_Y_e].pos_x = 0.3f; + mItemParams[SELECT_Y_e].pos_y = -16.0f; + mItemParams[SELECT_Y_e].scale = 1.888889f; + mItemParams[SELECT_Y_e].rotation = g_drawHIO.mButtonItemRotation[1]; + mItemParams[SELECT_Y_e].num_pos_x = g_drawHIO.mYItemNumPosX; + mItemParams[SELECT_Y_e].num_pos_y = g_drawHIO.mYItemNumPosY; + mItemParams[SELECT_Y_e].num_scale = g_drawHIO.mYItemNumScale; + } else { + mItemParams[SELECT_Y_e].pos_x = g_drawHIO.mButtonYItemPosX; + mItemParams[SELECT_Y_e].pos_y = g_drawHIO.mButtonYItemPosY; + mItemParams[SELECT_Y_e].scale = g_drawHIO.mButtonYItemScale; + mItemParams[SELECT_Y_e].rotation = g_drawHIO.mButtonItemRotation[1]; + mItemParams[SELECT_Y_e].num_pos_x = g_drawHIO.mYItemNumPosX; + mItemParams[SELECT_Y_e].num_pos_y = g_drawHIO.mYItemNumPosY; + mItemParams[SELECT_Y_e].num_scale = g_drawHIO.mYItemNumScale; + } + break; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 8045493C-80454940 002F3C 0004+00 2/2 0/0 0/0 .sdata2 @9047 */ -SECTION_SDATA2 static f32 lit_9047 = 11.0f / 5.0f; - -/* 80454940-80454944 002F40 0004+00 2/2 0/0 0/0 .sdata2 @9048 */ -SECTION_SDATA2 static f32 lit_9048 = -30.0f; - -/* 80454944-80454948 002F44 0004+00 2/2 0/0 0/0 .sdata2 @9049 */ -SECTION_SDATA2 static f32 lit_9049 = 0.75f; - -/* 80454948-8045494C 002F48 0004+00 2/2 0/0 0/0 .sdata2 @9050 */ -SECTION_SDATA2 static f32 lit_9050 = 4.0f / 5.0f; - -/* 8045494C-80454950 002F4C 0004+00 2/2 0/0 0/0 .sdata2 @9051 */ -SECTION_SDATA2 static f32 lit_9051 = 7.0f / 5.0f; - -/* 80454950-80454954 002F50 0004+00 1/1 0/0 0/0 .sdata2 @9052 */ -SECTION_SDATA2 static f32 lit_9052 = -3.5f; /* 8021B5B0-8021B810 215EF0 0260+00 3/2 0/0 0/0 .text setItemParamZ__13dMeter2Draw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setItemParamZ(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setItemParamZ__13dMeter2Draw_cFUc.s" +void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { + if (g_drawHIO.mButtonDebug[2]) { + mItemParams[SELECT_Z_e].pos_x = g_drawHIO.field_0x1cc; + mItemParams[SELECT_Z_e].pos_y = g_drawHIO.field_0x1d0; + mItemParams[SELECT_Z_e].scale = g_drawHIO.field_0x1d4; + mItemParams[SELECT_Z_e].rotation = g_drawHIO.mButtonItemRotation[2]; + mItemParams[SELECT_Z_e].num_pos_x = g_drawHIO.field_0x1f8; + mItemParams[SELECT_Z_e].num_pos_y = g_drawHIO.field_0x208; + mItemParams[SELECT_Z_e].num_scale = g_drawHIO.field_0x218; + } else { + switch (i_itemNo) { + case BOOMERANG: + mItemParams[SELECT_Z_e].pos_x = 4.0f; + mItemParams[SELECT_Z_e].pos_y = 1.3f; + mItemParams[SELECT_Z_e].scale = 2.2f; + mItemParams[SELECT_Z_e].rotation = 17.0f; + mItemParams[SELECT_Z_e].num_pos_x = 14.0f; + mItemParams[SELECT_Z_e].num_pos_y = -30.0f; + mItemParams[SELECT_Z_e].num_scale = 0.75f; + break; + case BOW: + mItemParams[SELECT_Z_e].pos_x = -1.3f; + mItemParams[SELECT_Z_e].pos_y = 1.3f; + mItemParams[SELECT_Z_e].scale = 2.2f; + mItemParams[SELECT_Z_e].rotation = 0.0f; + mItemParams[SELECT_Z_e].num_pos_x = 14.0f; + mItemParams[SELECT_Z_e].num_pos_y = -30.0f; + mItemParams[SELECT_Z_e].num_scale = 0.75f; + break; + case HVY_BOOTS: + mItemParams[SELECT_Z_e].pos_x = -6.6f; + mItemParams[SELECT_Z_e].pos_y = 9.2f; + mItemParams[SELECT_Z_e].scale = 2.2f; + mItemParams[SELECT_Z_e].rotation = 0.0f; + mItemParams[SELECT_Z_e].num_pos_x = 14.0f; + mItemParams[SELECT_Z_e].num_pos_y = -30.0f; + mItemParams[SELECT_Z_e].num_scale = 0.8f; + break; + case HOOKSHOT: + mItemParams[SELECT_Z_e].pos_x = -4.0f; + mItemParams[SELECT_Z_e].pos_y = 1.3f; + mItemParams[SELECT_Z_e].scale = 1.7f; + mItemParams[SELECT_Z_e].rotation = 0.0f; + mItemParams[SELECT_Z_e].num_pos_x = 1.4f; + mItemParams[SELECT_Z_e].num_pos_y = -30.0f; + mItemParams[SELECT_Z_e].num_scale = 0.8f; + break; + case KANTERA: + mItemParams[SELECT_Z_e].pos_x = -6.6f; + mItemParams[SELECT_Z_e].pos_y = 6.6f; + mItemParams[SELECT_Z_e].scale = g_drawHIO.field_0x1d4; + mItemParams[SELECT_Z_e].rotation = g_drawHIO.mButtonItemRotation[2]; + mItemParams[SELECT_Z_e].num_pos_x = g_drawHIO.field_0x1f8; + mItemParams[SELECT_Z_e].num_pos_y = g_drawHIO.field_0x208; + mItemParams[SELECT_Z_e].num_scale = g_drawHIO.field_0x218; + break; + default: + if (isBottleItem(i_itemNo)) { + mItemParams[SELECT_Z_e].pos_x = -3.5f; + mItemParams[SELECT_Z_e].pos_y = 17.0f; + mItemParams[SELECT_Z_e].scale = 1.888889f; + mItemParams[SELECT_Z_e].rotation = g_drawHIO.mButtonItemRotation[2]; + mItemParams[SELECT_Z_e].num_pos_x = g_drawHIO.field_0x1f8; + mItemParams[SELECT_Z_e].num_pos_y = g_drawHIO.field_0x208; + mItemParams[SELECT_Z_e].num_scale = g_drawHIO.field_0x218; + } else { + mItemParams[SELECT_Z_e].pos_x = g_drawHIO.field_0x1cc; + mItemParams[SELECT_Z_e].pos_y = g_drawHIO.field_0x1d0; + mItemParams[SELECT_Z_e].scale = g_drawHIO.field_0x1d4; + mItemParams[SELECT_Z_e].rotation = g_drawHIO.mButtonItemRotation[2]; + mItemParams[SELECT_Z_e].num_pos_x = g_drawHIO.field_0x1f8; + mItemParams[SELECT_Z_e].num_pos_y = g_drawHIO.field_0x208; + mItemParams[SELECT_Z_e].num_scale = g_drawHIO.field_0x218; + } + break; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80454954-80454958 002F54 0004+00 1/1 0/0 0/0 .sdata2 @9089 */ -SECTION_SDATA2 static f32 lit_9089 = 17.299999237060547f; - -/* 80454958-8045495C 002F58 0004+00 1/1 0/0 0/0 .sdata2 @9090 */ -SECTION_SDATA2 static f32 lit_9090 = -46.79999923706055f; - -/* 8045495C-80454960 002F5C 0004+00 1/1 0/0 0/0 .sdata2 @9091 */ -SECTION_SDATA2 static f32 lit_9091 = 26.0f; - -/* 80454960-80454964 002F60 0004+00 1/1 0/0 0/0 .sdata2 @9092 */ -SECTION_SDATA2 static f32 lit_9092 = -54.70000076293945f; - -/* 80454964-80454968 002F64 0004+00 1/1 0/0 0/0 .sdata2 @9093 */ -SECTION_SDATA2 static f32 lit_9093 = 20.700000762939453f; - -/* 80454968-8045496C 002F68 0004+00 1/1 0/0 0/0 .sdata2 @9094 */ -SECTION_SDATA2 static f32 lit_9094 = -55.70000076293945f; - -/* 8045496C-80454970 002F6C 0004+00 1/1 0/0 0/0 .sdata2 @9095 */ -SECTION_SDATA2 static f32 lit_9095 = 77.0f / 5.0f; - -/* 80454970-80454974 002F70 0004+00 1/1 0/0 0/0 .sdata2 @9096 */ -SECTION_SDATA2 static f32 lit_9096 = -47.79999923706055f; - -/* 80454974-80454978 002F74 0004+00 1/1 0/0 0/0 .sdata2 @9097 */ -SECTION_SDATA2 static f32 lit_9097 = 23.299999237060547f; - -/* 80454978-8045497C 002F78 0004+00 1/1 0/0 0/0 .sdata2 @9098 */ -SECTION_SDATA2 static f32 lit_9098 = 29.299999237060547f; - -/* 8045497C-80454980 002F7C 0004+00 1/1 0/0 0/0 .sdata2 @9099 */ -SECTION_SDATA2 static f32 lit_9099 = 20.299999237060547f; - -/* 80454980-80454984 002F80 0004+00 1/1 0/0 0/0 .sdata2 @9100 */ -SECTION_SDATA2 static f32 lit_9100 = 12.0f; - -/* 80454984-80454988 002F84 0004+00 1/1 0/0 0/0 .sdata2 @9101 */ -SECTION_SDATA2 static f32 lit_9101 = -22.0f; - -/* 80454988-8045498C 002F88 0004+00 1/1 0/0 0/0 .sdata2 @9102 */ -SECTION_SDATA2 static f32 lit_9102 = 21.0f; - -/* 8045498C-80454990 002F8C 0004+00 1/1 0/0 0/0 .sdata2 @9103 */ -SECTION_SDATA2 static f32 lit_9103 = -46.70000076293945f; - -/* 80454990-80454994 002F90 0004+00 1/1 0/0 0/0 .sdata2 @9104 */ -SECTION_SDATA2 static f32 lit_9104 = 19.0f; - -/* 80454994-80454998 002F94 0004+00 1/1 0/0 0/0 .sdata2 @9105 */ -SECTION_SDATA2 static f32 lit_9105 = -45.0f; /* 8021B810-8021BB6C 216150 035C+00 3/2 0/0 0/0 .text setItemParamB__13dMeter2Draw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Draw_c::setItemParamB(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/setItemParamB__13dMeter2Draw_cFUc.s" +void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { + if (g_drawHIO.mButtonDebug[3]) { + mItemParams[3].pos_x = g_drawHIO.mButtonBItemPosX[0]; + mItemParams[3].pos_y = g_drawHIO.mButtonBItemPosY[0]; + mItemParams[3].scale = g_drawHIO.mButtonBItemScale[0]; + mItemParams[3].rotation = g_drawHIO.mButtonBItemRotation[0]; + mItemParams[3].num_pos_x = g_drawHIO.mItemBNumPosX; + mItemParams[3].num_pos_y = g_drawHIO.mItemBNumPosY; + mItemParams[3].num_scale = g_drawHIO.mItemBNumScale; + } else { + if (isBottleItem(i_itemNo)) { + mItemParams[3].pos_x = 17.3f; + mItemParams[3].pos_y = -46.8f; + mItemParams[3].scale = 1.7f; + mItemParams[3].rotation = 0.0f; + mItemParams[3].num_pos_x = 14.0f; + mItemParams[3].num_pos_y = -30.0f; + mItemParams[3].num_scale = 0.75f; + } else { + switch (i_itemNo) { + case LURE_ROD: + case BEE_ROD: + case JEWEL_ROD: + case JEWEL_BEE_ROD: + case JEWEL_WORM_ROD: + case HORSE_FLUTE: + case FISHING_ROD_1: + mItemParams[3].pos_x = 17.3f; + mItemParams[3].pos_y = -46.8f; + mItemParams[3].scale = 1.7f; + mItemParams[3].rotation = 0.0f; + mItemParams[3].num_pos_x = 14.0f; + mItemParams[3].num_pos_y = -30.0f; + mItemParams[3].num_scale = 0.75f; + break; + case BOOMERANG: + mItemParams[3].pos_x = 26.0f; + mItemParams[3].pos_y = -54.7f; + mItemParams[3].scale = 2.2f; + mItemParams[3].rotation = 17.0f; + mItemParams[3].num_pos_x = 14.0f; + mItemParams[3].num_pos_y = -30.0f; + mItemParams[3].num_scale = 0.75f; + break; + case BOW: + mItemParams[3].pos_x = 20.7f; + mItemParams[3].pos_y = -55.7f; + mItemParams[3].scale = 2.2f; + mItemParams[3].rotation = 0.0f; + mItemParams[3].num_pos_x = 14.0f; + mItemParams[3].num_pos_y = -30.0f; + mItemParams[3].num_scale = 0.75f; + break; + case HVY_BOOTS: + mItemParams[3].pos_x = 15.4f; + mItemParams[3].pos_y = -47.8f; + mItemParams[3].scale = 2.2f; + mItemParams[3].rotation = 0.0f; + mItemParams[3].num_pos_x = 14.0f; + mItemParams[3].num_pos_y = -30.0f; + mItemParams[3].num_scale = 0.8f; + break; + case SPINNER: + case HAWK_EYE: + mItemParams[3].pos_x = 23.3f; + mItemParams[3].pos_y = -47.8f; + mItemParams[3].scale = 1.7f; + mItemParams[3].rotation = 0.0f; + mItemParams[3].num_pos_x = 1.4f; + mItemParams[3].num_pos_y = -30.0f; + mItemParams[3].num_scale = 0.8f; + break; + case COPY_ROD: + case W_HOOKSHOT: + case IRONBALL: + mItemParams[3].pos_x = 29.3f; + mItemParams[3].pos_y = -47.8f; + mItemParams[3].scale = 1.7f; + mItemParams[3].rotation = 0.0f; + mItemParams[3].num_pos_x = 1.4f; + mItemParams[3].num_pos_y = -30.0f; + mItemParams[3].num_scale = 0.8f; + break; + case PACHINKO: + case BOMB_BAG_LV1: + case NORMAL_BOMB: + case WATER_BOMB: + case POKE_BOMB: + case RAFRELS_MEMO: + case TKS_LETTER: + mItemParams[3].pos_x = 20.3f; + mItemParams[3].pos_y = -47.8f; + mItemParams[3].scale = 1.7f; + mItemParams[3].rotation = 0.0f; + mItemParams[3].num_pos_x = 12.0f; + mItemParams[3].num_pos_y = -22.0f; + mItemParams[3].num_scale = 0.8f; + break; + case HOOKSHOT: + mItemParams[3].pos_x = 21.0f; + mItemParams[3].pos_y = -46.7f; + mItemParams[3].scale = 1.7f; + mItemParams[3].rotation = 0.0f; + mItemParams[3].num_pos_x = 1.4f; + mItemParams[3].num_pos_y = -30.0f; + mItemParams[3].num_scale = 0.8f; + break; + case KANTERA: + mItemParams[3].pos_x = 19.0f; + mItemParams[3].pos_y = -45.0f; + mItemParams[3].scale = g_drawHIO.mButtonBItemScale[0]; + mItemParams[3].rotation = g_drawHIO.mButtonBItemRotation[0]; + mItemParams[3].num_pos_x = g_drawHIO.mItemBNumPosX; + mItemParams[3].num_pos_y = g_drawHIO.mItemBNumPosY; + mItemParams[3].num_scale = g_drawHIO.mItemBNumScale; + break; + default: + mItemParams[3].pos_x = g_drawHIO.mButtonBItemPosX[0]; + mItemParams[3].pos_y = g_drawHIO.mButtonBItemPosY[0]; + mItemParams[3].scale = g_drawHIO.mButtonBItemScale[0]; + mItemParams[3].rotation = g_drawHIO.mButtonBItemRotation[0]; + mItemParams[3].num_pos_x = g_drawHIO.mItemBNumPosX; + mItemParams[3].num_pos_y = g_drawHIO.mItemBNumPosY; + mItemParams[3].num_scale = g_drawHIO.mItemBNumScale; + break; + } + } + } } -#pragma pop /* 8021BB6C-8021BBB4 2164AC 0048+00 1/1 0/0 0/0 .text getFishingType__13dMeter2Draw_cFv */ @@ -2658,18 +3998,9 @@ bool dMeter2Draw_c::getFishingType() { } } -/* ############################################################################################## */ -/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80398A2F = "tt_heart_00.bti"; -SECTION_DEAD static char const* const stringBase_80398A3F = "tt_heart_01.bti"; -SECTION_DEAD static char const* const stringBase_80398A4F = "tt_heart_02.bti"; -SECTION_DEAD static char const* const stringBase_80398A5F = "tt_heart_03.bti"; -SECTION_DEAD static char const* const stringBase_80398A6F = "F_SP127"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80398A77 = ""; -#pragma pop +// unused +static const char* tex_name[] = {"tt_heart_00.bti", "tt_heart_01.bti", "tt_heart_02.bti", + "tt_heart_03.bti"}; /* 8021BBB4-8021BC24 2164F4 0070+00 2/2 1/1 0/0 .text getCanoeFishing__13dMeter2Draw_cFv */ @@ -2685,25 +4016,20 @@ bool dMeter2Draw_c::getCanoeFishing() { /* 8021BC24-8021BC54 216564 0030+00 0/0 1/1 0/0 .text getCameraSubject__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMeter2Draw_c::getCameraSubject() { - nofralloc -#include "asm/d/meter/d_meter2_draw/getCameraSubject__13dMeter2Draw_cFv.s" +bool dMeter2Draw_c::getCameraSubject() { + return dCam_getBody()->Mode() == 4 ? TRUE : FALSE; } -#pragma pop /* 8021BC54-8021BCAC 216594 0058+00 0/0 1/1 0/0 .text getItemSubject__13dMeter2Draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMeter2Draw_c::getItemSubject() { - nofralloc -#include "asm/d/meter/d_meter2_draw/getItemSubject__13dMeter2Draw_cFv.s" +bool dMeter2Draw_c::getItemSubject() { + if (dCam_getBody()->Mode() != 4 && (dCam_getBody()->Mode() == 7 || dCam_getBody()->Mode() == 8)) + { + return true; + } + + return false; } -#pragma pop /* 8021BCAC-8021BCC0 2165EC 0014+00 0/0 1/1 0/0 .text getPlayerSubject__13dMeter2Draw_cFv */ @@ -2711,15 +4037,22 @@ bool dMeter2Draw_c::getPlayerSubject() { return i_dComIfGp_checkPlayerStatus0(0, 0x8000000); } -/* 8021BCC0-8021BDD0 216600 0110+00 2/2 2/2 0/0 .text isBButtonShow__13dMeter2Draw_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMeter2Draw_c::isBButtonShow(bool param_0) { - nofralloc -#include "asm/d/meter/d_meter2_draw/isBButtonShow__13dMeter2Draw_cFb.s" +/* 8021BCC0-8021BDD0 216600 0110+00 2/2 2/2 0/0 .text isButtonBShow__13dMeter2Draw_cFb */ +bool dMeter2Draw_c::isButtonBShow(bool param_0) { + if (dMsgObject_getMsgObjectClass() == NULL) { + return false; + } + + if (dMeter2Info_isShopTalkFlag() || dMsgObject_getMsgObjectClass()->isHowlMessage() || + daPy_getPlayerActorClass()->checkHawkWait() || dMeter2Info_getItemExplainWindowStatus() || + (daPy_getPlayerActorClass()->checkGrassWhistle() && param_0) || + (!dComIfGp_event_checkHind(4) && i_dComIfGp_event_runCheck())) + { + return true; + } + + return false; } -#pragma pop /* 8021BDD0-8021BDDC 216710 000C+00 0/0 1/1 0/0 .text getButtonTimer__13dMeter2Draw_cFv */ @@ -2727,15 +4060,10 @@ s16 dMeter2Draw_c::getButtonTimer() { return mpButtonParent->getAlphaTimer(); } -/* ############################################################################################## */ /* 803988B8-803988D0 024F18 0018+00 0/0 0/0 0/0 .rodata tag$7759 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const tag_7759[24] = { - 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x78, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D, - 0x5F, 0x79, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6A, 0x5F, 0x6E, +// unused +static u64 const tag_7759[] = { + 'item_x_n', + 'item_y_n', + 'item_j_n', }; -COMPILER_STRIP_GATE(0x803988B8, &tag_7759); -#pragma pop - -/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp index 7979d920a4..9ab770a442 100644 --- a/src/d/meter/d_meter_HIO.cpp +++ b/src/d/meter/d_meter_HIO.cpp @@ -38,18 +38,18 @@ dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c() { mHeartPiecePosY = 0.0f; mHeartPieceScale = 1.0f; mButtonDebugON = false; - mAButtonPosX = -22.3f; - mAButtonPosY = 24.9f; - mAButtonScale = 1.3f; - mBButtonPosX = -22.3f; - mBButtonPosY = 25.0f; - mBButtonScale = 1.3f; - mAButtonTextPosX = -24.9f; - mAButtonTextPosY = 24.9f; - mAButtonTextScale = 1.1f; - mBButtonTextPosX = -27.5f; - mBButtonTextPosY = 26.0f; - mBButtonTextScale = 1.1f; + mButtonAPosX = -22.3f; + mButtonAPosY = 24.9f; + mButtonAScale = 1.3f; + mButtonBPosX = -22.3f; + mButtonBPosY = 25.0f; + mButtonBScale = 1.3f; + mButtonATextPosX = -24.9f; + mButtonATextPosY = 24.9f; + mButtonATextScale = 1.1f; + mButtonBTextPosX = -27.5f; + mButtonBTextPosY = 26.0f; + mButtonBTextScale = 1.1f; mColorDebugON = false; mVesselBack[VESSEL_HEART].set(0, 0, 0, 0); mVesselFront[VESSEL_HEART].set(250, 250, 210, 220); @@ -285,33 +285,33 @@ dMeter_drawSkillHIO_c::dMeter_drawSkillHIO_c() { /* 801FEAF0-801FEFF0 1F9430 0500+00 1/1 0/0 0/0 .text __ct__25dMeter_drawEmpButtonHIO_cFv */ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { - mHighlightScale = 2.5f; - mHighlightFrontInner.set(255, 255, 255, 185); - mHighlightFrontOuter.set(0, 155, 0, 0); - mHighlightBackInner.set(255, 255, 255, 87); - mHighlightBackOuter.set(0, 115, 0, 0); - mHighlightAnimSpeed = 0.772705f; + mPikariScale = 2.5f; + mPikariFrontInner.set(255, 255, 255, 185); + mPikariFrontOuter.set(0, 155, 0, 0); + mPikariBackInner.set(255, 255, 255, 87); + mPikariBackOuter.set(0, 115, 0, 0); + mPikariAnimSpeed = 0.772705f; - mHighlightFastScale = 3.0f; - mHighlightFastFrontInner.set(255, 255, 255, 255); - mHighlightFastFrontOuter.set(220, 220, 215, 0); - mHighlightFastBackInner.set(255, 255, 190, 255); - mHighlightFastBackOuter.set(200, 200, 210, 0); - mHighlightFastAnimSpeed = 2.0f; + mPikariFastScale = 3.0f; + mPikariFastFrontInner.set(255, 255, 255, 255); + mPikariFastFrontOuter.set(220, 220, 215, 0); + mPikariFastBackInner.set(255, 255, 190, 255); + mPikariFastBackOuter.set(200, 200, 210, 0); + mPikariFastAnimSpeed = 2.0f; - mHighlightListenScale = 1.0f; - mHighlightListenFrontInner.set(255, 255, 255, 185); - mHighlightListenFrontOuter.set(0, 155, 0, 0); - mHighlightListenBackInner.set(255, 255, 255, 87); - mHighlightListenBackOuter.set(0, 115, 0, 0); - mHighlightListenAnimSpeed = 0.3f; + mPikariListenScale = 1.0f; + mPikariListenFrontInner.set(255, 255, 255, 185); + mPikariListenFrontOuter.set(0, 155, 0, 0); + mPikariListenBackInner.set(255, 255, 255, 87); + mPikariListenBackOuter.set(0, 115, 0, 0); + mPikariListenAnimSpeed = 0.3f; - mHighlightRepeatHitScale = 2.5f; - mHighlightRepeatHitFrontInner.set(255, 255, 255, 185); - mHighlightRepeatHitFrontOuter.set(0, 155, 0, 0); - mHighlightRepeatHitBackInner.set(255, 255, 255, 87); - mHighlightRepeatHitBackOuter.set(0, 115, 0, 0); - mHighlightRepeatHitAnimSpeed = 1.1f; + mPikariRepeatHitScale = 2.5f; + mPikariRepeatHitFrontInner.set(255, 255, 255, 185); + mPikariRepeatHitFrontOuter.set(0, 155, 0, 0); + mPikariRepeatHitBackInner.set(255, 255, 255, 87); + mPikariRepeatHitBackOuter.set(0, 115, 0, 0); + mPikariRepeatHitAnimSpeed = 1.1f; mRepeatHitScale = 1.15f; mRepeatHitFrameNum = 4; @@ -324,21 +324,21 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mEmpButtonPosY = 175.0f; mEmpButtonScale = 1.0f; - mAButtonPosX = 0.0f; - mAButtonPosY = 0.0f; - mAButtonScale = 1.0f; + mButtonAPosX = 0.0f; + mButtonAPosY = 0.0f; + mButtonAScale = 1.0f; - mBButtonPosX = 0.0f; - mBButtonPosY = 0.0f; - mBButtonScale = 1.0f; + mButtonBPosX = 0.0f; + mButtonBPosY = 0.0f; + mButtonBScale = 1.0f; mRButtonPosX = 0.0f; mRButtonPosY = 0.0f; mRButtonScale = 1.0f; - mZButtonPosX = 0.0f; - mZButtonPosY = 0.0f; - mZButtonScale = 1.0f; + mButtonZPosX = 0.0f; + mButtonZPosY = 0.0f; + mButtonZScale = 1.0f; m3DButtonPosX = 0.0f; m3DButtonPosY = 0.0f; @@ -352,13 +352,13 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mSButtonPosY = -392.0f; mSButtonScale = 0.9f; - mXButtonPosX = 0.0f; - mXButtonPosY = 0.0f; - mXButtonScale = 1.0f; + mButtonXPosX = 0.0f; + mButtonXPosY = 0.0f; + mButtonXScale = 1.0f; - mYButtonPosX = 0.0f; - mYButtonPosY = 0.0f; - mYButtonScale = 1.0f; + mButtonYPosX = 0.0f; + mButtonYPosY = 0.0f; + mButtonYScale = 1.0f; mNunchukPosX = 0.0f; mNunchukPosY = 0.0f; @@ -396,13 +396,13 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mNunchukAttackPosY = 0.0f; mNunchukAttackScale = 1.0f; - mABButtonPosX = 0.0f; - mABButtonPosY = 0.0f; - mABButtonScale = 1.0f; + mAButtonBPosX = 0.0f; + mAButtonBPosY = 0.0f; + mAButtonBScale = 1.0f; - mNunchukZButtonPosX = 0.0f; - mNunchukZButtonPosY = 0.0f; - mNunchukZButtonScale = 1.0f; + mNunchukButtonZPosX = 0.0f; + mNunchukButtonZPosY = 0.0f; + mNunchukButtonZScale = 1.0f; mNunchukCButtonPosX = 0.0f; mNunchukCButtonPosY = 0.0f; @@ -559,23 +559,23 @@ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() { mGetInTextAnimSpeed = 1.0f; mGetInTextWaitFrames = 10; mGetInTextAlphaFrames = 10; - mGetInHighlightAppearFrames = 30; - mGetInHighlightScale = 1.8f; - mGetInHighlightFrontInner.set(255, 255, 167, 80); - mGetInHighlightFrontOuter.set(220, 110, 30, 0); - mGetInHighlightBackInner.set(255, 255, 190, 90); - mGetInHighlightBackOuter.set(170, 110, 0, 0); - mGetInHighlightAnimSpeed = 0.6f; + mGetInPikariAppearFrames = 30; + mGetInPikariScale = 1.8f; + mGetInPikariFrontInner.set(255, 255, 167, 80); + mGetInPikariFrontOuter.set(220, 110, 30, 0); + mGetInPikariBackInner.set(255, 255, 190, 90); + mGetInPikariBackOuter.set(170, 110, 0, 0); + mGetInPikariAnimSpeed = 0.6f; mGetInTextLocation = 0; - mStartHighlightAppearFrames = 30; - mStartHighlightScale = 1.8f; - mStartHighlightFrontInner.set(255, 255, 167, 80); - mStartHighlightFrontOuter.set(220, 110, 30, 0); - mStartHighlightBackInner.set(255, 255, 190, 90); - mStartHighlightBackOuter.set(170, 110, 0, 0); - mStartHighlightAnimSpeed = 0.6f; - mStartHighlightDisplayFrames = 30; + mStartPikariAppearFrames = 30; + mStartPikariScale = 1.8f; + mStartPikariFrontInner.set(255, 255, 167, 80); + mStartPikariFrontOuter.set(220, 110, 30, 0); + mStartPikariBackInner.set(255, 255, 190, 90); + mStartPikariBackOuter.set(170, 110, 0, 0); + mStartPikariAnimSpeed = 0.6f; + mStartPikariDisplayFrames = 30; mReadyFightTextSizeX = 1.0f; mReadyFightTextSizeY = 1.0f; @@ -584,13 +584,13 @@ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() { mReadyFightTextAnimSpeed = 1.0f; mReadyFightTextWaitFrames = 10; field_0x172 = 10; - mReadyFightHighlightAppearFrames = 30; - mReadyFightHighlightScale = 1.8f; - mReadyFightHighlightFrontInner.set(255, 255, 167, 80); - mReadyFightHighlightFrontOuter.set(220, 110, 30, 0); - mReadyFightHighlightBackInner.set(255, 255, 190, 90); - mReadyFightHighlightBackOuter.set(170, 110, 0, 0); - mReadyFightHighlightAnimSpeed = 0.6f; + mReadyFightPikariAppearFrames = 30; + mReadyFightPikariScale = 1.8f; + mReadyFightPikariFrontInner.set(255, 255, 167, 80); + mReadyFightPikariFrontOuter.set(220, 110, 30, 0); + mReadyFightPikariBackInner.set(255, 255, 190, 90); + mReadyFightPikariBackOuter.set(170, 110, 0, 0); + mReadyFightPikariAnimSpeed = 0.6f; } /* 801FF31C-801FF5B8 1F9C5C 029C+00 1/1 0/0 0/0 .text __ct__25dMeter_drawLightDropHIO_cFv @@ -601,19 +601,19 @@ dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() { mVesselPosY = 11.0f; mVesselPosX_4x3 = -20.0f; mVesselPosY_4x3 = 6.6f; - mVesselAlpha = 1.0f; + mVesselAlpha[0] = 1.0f; mVesselTalkScale = 0.76f; mVesselTalkPosX = 20.0f; mVesselTalkPosY = -35.0f; - mVesselTalkAlpha = 0.5f; + mVesselAlpha[1] = 0.5f; mDropGetScale = 2.5f; mDropGetScaleAnimFrameNum = 20; mDropScale = 1.0f; - mHighlightInterval = 1; + mPikariInterval = 1; field_0x54 = 0xFFF1; - mVesselDecorAlpha = 0.5f; + mVesselAlpha[2] = 0.5f; mDropAlpha = 1.0f; mDropOnColorBlack.set(30, 255, 255, 0); @@ -621,28 +621,28 @@ dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() { mDropOffColorBlack.set(0, 0, 0, 0); mDropOffColorWhite.set(255, 255, 255, 255); - mHighlightLoopScale = 0.6f; - mHighlightLoopFrontInner[0].set(255, 255, 255, 255); - mHighlightLoopFrontOuter[0].set(0, 0, 0, 0); - mHighlightLoopBackInner[0].set(255, 255, 255, 255); - mHighlightLoopBackOuter[0].set(126, 238, 218, 0); - mHighlightLoopAnimSpeed = 0.2f; + mPikariLoopScale = 0.6f; + mPikariLoopFrontInner[0].set(255, 255, 255, 255); + mPikariLoopFrontOuter[0].set(0, 0, 0, 0); + mPikariLoopBackInner[0].set(255, 255, 255, 255); + mPikariLoopBackOuter[0].set(126, 238, 218, 0); + mPikariLoopAnimSpeed = 0.2f; - mHighlightLoopBackScale = 0.7f; - mHighlightLoopFrontInner[1].set(255, 255, 255, 255); - mHighlightLoopFrontOuter[1].set(0, 0, 0, 0); - mHighlightLoopBackInner[1].set(255, 255, 255, 255); - mHighlightLoopBackOuter[1].set(126, 238, 218, 0); - mHighlightLoopBackStopFrame = 19.0f; + mPikariLoopBackScale = 0.7f; + mPikariLoopFrontInner[1].set(255, 255, 255, 255); + mPikariLoopFrontOuter[1].set(0, 0, 0, 0); + mPikariLoopBackInner[1].set(255, 255, 255, 255); + mPikariLoopBackOuter[1].set(126, 238, 218, 0); + mPikariLoopBackStopFrame = 19.0f; - mDropHighlightFrontInner.set(255, 255, 255, 255); - mDropHighlightFrontOuter.set(0, 0, 0, 0); - mDropHighlightBackInner.set(255, 255, 255, 255); - mDropHighlightBackOuter.set(126, 238, 218, 0); - mDropHighlightAnimSpeed = 0.1f; - mDropHighlightAnimSpeed_Completed = 0.6f; - mHighlightScaleNormal = 1.3f; - mHighlightScaleComplete = 0.3f; + mDropPikariFrontInner.set(255, 255, 255, 255); + mDropPikariFrontOuter.set(0, 0, 0, 0); + mDropPikariBackInner.set(255, 255, 255, 255); + mDropPikariBackOuter.set(126, 238, 218, 0); + mDropPikariAnimSpeed = 0.1f; + mDropPikariAnimSpeed_Completed = 0.6f; + mPikariScaleNormal = 1.3f; + mPikariScaleComplete = 0.3f; mAnimDebug = 0; } @@ -653,19 +653,19 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mNoMagicPosY = -15.0f; - mHUDScale = 1.0f; - mHUDAlpha = 1.0f; + mParentScale = 1.0f; + mParentAlpha = 1.0f; - mLifeGaugeScale = 1.0f; - mLifeGaugeHeartAlpha = 1.0f; - mLifeGaugeBaseAlpha = 0.4f; + mLifeParentScale = 1.0f; + mLifeParentHeartAlpha = 1.0f; + mHeartBaseAlpha = 0.4f; mLifeGaugePosX = 5.0f; mLifeGaugePosY = 18.0f; - mHeartScale = 1.0f; + mHeartMarkScale = 1.0f; mHeartAlpha = 0.7f; - mLargeHeartScale = 1.0f; - mLargeHeartAlpha = 1.0f; + mBigHeartScale = 1.0f; + mBigHeartAlpha = 1.0f; mMagicMeterScale = 0.7f; mMagicMeterAlpha = 1.0f; @@ -698,44 +698,44 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mButtonDisplayBackScale = 1.0f; mButtonDisplayBackAlpha = 1.0f; - mAButtonScale = 1.1f; - mAButtonAlpha = 1.0f; - mAButtonPosX = 0.0f; - mAButtonPosY = 0.0f; - mAButtonTalkScale[0] = 1.0f; - mAButtonTalkPosX[0] = 0.0f; - mAButtonTalkPosY[0] = -63.0f; - mAButtonTalkAScale = 1.0f; - mAButtonTalkAPosX[0] = 0.0f; - mAButtonTalkAPosY[0] = -49.0f; + mButtonAScale = 1.1f; + mButtonAAlpha = 1.0f; + mButtonAPosX = 0.0f; + mButtonAPosY = 0.0f; + mButtonATalkScale[0] = 1.0f; + mButtonATalkPosX[0] = 0.0f; + mButtonATalkPosY[0] = -63.0f; + mButtonATalkAScale = 1.0f; + mButtonATalkAPosX[0] = 0.0f; + mButtonATalkAPosY[0] = -49.0f; - mAButtonTalkScale[1] = 1.0f; - mAButtonTalkPosX[1] = -20.0f; - mAButtonTalkPosY[1] = -62.0f; - mAButtonFontTalkAScale = 1.0f; - mAButtonTalkAPosX[1] = -20.0f; - mAButtonTalkAPosY[1] = -48.0f; + mButtonATalkScale[1] = 1.0f; + mButtonATalkPosX[1] = -20.0f; + mButtonATalkPosY[1] = -62.0f; + mButtonATextTalkAScale = 1.0f; + mButtonATalkAPosX[1] = -20.0f; + mButtonATalkAPosY[1] = -48.0f; - mAButtonVesselPosX = 0.0f; - mAButtonVesselPosY = 0.0f; + mButtonAVesselPosX = 0.0f; + mButtonAVesselPosY = 0.0f; - mBButtonScale = 1.1f; - mBButtonAlpha = 1.0f; - mBButtonPosX = -2.2f; - mBButtonPosY = -1.3f; - mBButtonTalkScale[0] = 1.0f; - mBButtonTalkPosX[0] = 0.0f; - mBButtonTalkPosY[0] = -62.0f; + mButtonBScale = 1.1f; + mButtonBAlpha = 1.0f; + mButtonBPosX = -2.2f; + mButtonBPosY = -1.3f; + mButtonBTalkScale[0] = 1.0f; + mButtonBTalkPosX[0] = 0.0f; + mButtonBTalkPosY[0] = -62.0f; - mBButtonTalkScale[1] = 1.0f; - mBButtonTalkPosX[1] = -9.2f; - mBButtonTalkPosY[1] = -65.0f; + mButtonBTalkScale[1] = 1.0f; + mButtonBTalkPosX[1] = -9.2f; + mButtonBTalkPosY[1] = -65.0f; - mBButtonWolfPosX = 0.0f; - mBButtonWolfPosY = 0.0f; + mButtonBWolfPosX = 0.0f; + mButtonBWolfPosY = 0.0f; - mBButtonVesselPosX = 0.0f; - mBButtonVesselPosY = 0.0f; + mButtonBVesselPosX = 0.0f; + mButtonBVesselPosY = 0.0f; mMidnaIconScale = 1.1f; mMidnaIconAlpha = 1.0f; @@ -747,15 +747,15 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { field_0x13c = 0.0f; field_0x140 = 0.0f; - mXButtonScale = 1.0f; - mXButtonAlpha = 0.9f; - mXButtonPosX = 0.0f; - mXButtonPosY = 0.0f; + mButtonXScale = 1.0f; + mButtonXAlpha = 0.9f; + mButtonXPosX = 0.0f; + mButtonXPosY = 0.0f; - mYButtonScale = 1.0f; - mYButtonAlpha = 0.9f; - mYButtonPosX = 0.0f; - mYButtonPosY = 0.0f; + mButtonYScale = 1.0f; + mButtonYAlpha = 0.9f; + mButtonYPosX = 0.0f; + mButtonYPosY = 0.0f; field_0x164 = 1.5f; field_0x168 = 1.0f; @@ -774,33 +774,33 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { field_0x324 = 0.0f; field_0x328 = 0.0f; - mZButtonScale = 1.0f; - mZButtonAlpha = 0.9f; - mZButtonPosX = 0.0f; - mZButtonPosY = 0.0f; + mButtonZScale = 1.0f; + mButtonZAlpha = 0.9f; + mButtonZPosX = 0.0f; + mButtonZPosY = 0.0f; - mBButtonItemPosX = 3.0f; - mBButtonItemPosY = 18.0f; - mBButtonItemRotation = 0.0f; - mBButtonItemScale = 1.4f; + mButtonBItemPosX[0] = 3.0f; + mButtonBItemPosY[0] = 18.0f; + mButtonBItemRotation[0] = 0.0f; + mButtonBItemScale[0] = 1.4f; - mBButtonSwordPosX = 17.0f; - mBButtonSwordPosY = 25.0f; - mBButtonSwordRotation = 76.0f; - mBButtonSwordScale = 2.3f; + mButtonBItemPosX[1] = 17.0f; + mButtonBItemPosY[1] = 25.0f; + mButtonBItemRotation[1] = 76.0f; + mButtonBItemScale[1] = 2.3f; - mBButtonFishingPosX = 4.0f; - mBButtonFishingPosY = 22.0f; - mBButtonFishingRotation = 20.0f; - mBButtonFishingScale = 2.1f; + mButtonBItemPosX[2] = 4.0f; + mButtonBItemPosY[2] = 22.0f; + mButtonBItemRotation[2] = 20.0f; + mButtonBItemScale[2] = 2.1f; - mXButtonItemPosX = 4.0f; - mXButtonItemPosY = -14.0f; - mXButtonItemScale = 1.5f; + mButtonXItemPosX = 4.0f; + mButtonXItemPosY = -14.0f; + mButtonXItemScale = 1.5f; - mYButtonItemPosX = 0.0f; - mYButtonItemPosY = 0.0f; - mYButtonItemScale = 1.5f; + mButtonYItemPosX = 0.0f; + mButtonYItemPosY = 0.0f; + mButtonYItemScale = 1.5f; field_0x1cc = 0.0f; field_0x1d0 = 0.0f; @@ -818,46 +818,46 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { field_0x208 = 0.0f; field_0x218 = 1.0f; - mBItemNumPosX = 0.0f; - mBItemNumPosY = 0.0f; - mBItemNumScale = 1.0f; + mItemBNumPosX = 0.0f; + mItemBNumPosY = 0.0f; + mItemBNumScale = 1.0f; for (int i = 0; i < 3; i++) { mButtonItemRotation[i] = 0.0f; } - mZButtonItemPosX = 0.0f; - mZButtonItemPosY = 0.0f; - mZButtonItemScale = 1.0f; + mButtonZItemPosX = 0.0f; + mButtonZItemPosY = 0.0f; + mButtonZItemScale = 1.0f; for (int i = 0; i < 2; i++) { - mBItemBaseScale[i] = 1.0f; - mBItemBasePosX[i] = 0.0f; - mBItemBasePosY[i] = 0.0f; + mItemBBaseScale[i] = 1.0f; + mItemBBasePosX[i] = 0.0f; + mItemBBasePosY[i] = 0.0f; } - mBItemBaseAlpha[0] = 0.5f; - mBItemBaseAlpha[1] = 0.5f; + mItemBBaseAlpha[0] = 0.5f; + mItemBBaseAlpha[1] = 0.5f; - mXButtonItemBaseScale[0] = 1.5f; - mXButtonItemBasePosX[0] = 14.0f; - mXButtonItemBasePosY[0] = -12.0f; - mXButtonItemBaseAlpha[0] = 0.5f; + mButtonXItemBaseScale[0] = 1.5f; + mButtonXItemBasePosX[0] = 14.0f; + mButtonXItemBasePosY[0] = -12.0f; + mButtonXItemBaseAlpha[0] = 0.5f; - mXButtonItemBaseScale[1] = 1.5f; - mXButtonItemBasePosX[1] = 0.0f; - mXButtonItemBasePosY[1] = 0.0f; - mXButtonItemBaseAlpha[1] = 1.0f; + mButtonXItemBaseScale[1] = 1.5f; + mButtonXItemBasePosX[1] = 0.0f; + mButtonXItemBasePosY[1] = 0.0f; + mButtonXItemBaseAlpha[1] = 1.0f; - mYButtonItemBaseScale[0] = 1.5f; - mYButtonItemBasePosX[0] = -15.0f; - mYButtonItemBasePosY[0] = -12.0f; - mYButtonItemBaseAlpha[0] = 0.5f; + mButtonYItemBaseScale[0] = 1.5f; + mButtonYItemBasePosX[0] = -15.0f; + mButtonYItemBasePosY[0] = -12.0f; + mButtonYItemBaseAlpha[0] = 0.5f; - mYButtonItemBaseScale[1] = 1.5f; - mYButtonItemBasePosX[1] = 0.0f; - mYButtonItemBasePosY[1] = 0.0f; - mYButtonItemBaseAlpha[1] = 0.5f; + mButtonYItemBaseScale[1] = 1.5f; + mButtonYItemBasePosX[1] = 0.0f; + mButtonYItemBasePosY[1] = 0.0f; + mButtonYItemBaseAlpha[1] = 0.5f; field_0x280 = 1.5f; field_0x288 = 0.0f; @@ -869,42 +869,42 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { field_0x294 = 4.0f; field_0x298[1] = 1.0f; - mZButtonItemBaseScale = 1.0f; - mZButtonItemBasePosX = 0.0f; - mZButtonItemBasePosY = 0.0f; - mZButtonItemBaseAlpha = 0.5f; + mButtonZItemBaseScale = 1.0f; + mButtonZItemBasePosX = 0.0f; + mButtonZItemBasePosY = 0.0f; + mButtonZItemBaseAlpha = 0.5f; mButtonBaseAlpha = 0.55f; - mAButtonFontActionID = 1001; + mButtonATextActionID = 1001; field_0x2cc = 1001; - mAButtonTextDebug = false; + mButtonATextDebug = false; - mAButtonFontSpacing = 1.0f; - mAButtonFontScale = 1.0f; - mAButtonFontPosX = 0.0f; - mAButtonFontPosY = 0.0f; - mAButtonFontColor.set(255, 255, 255, 255); + mButtonATextSpacing = 1.0f; + mButtonATextScale = 1.0f; + mButtonATextPosX = 0.0f; + mButtonATextPosY = 0.0f; + mButtonATextColor.set(255, 255, 255, 255); - mBButtonFontScale = 1.0f; - mBButtonFontPosX = -8.0f; - mBButtonFontPosY = 4.0f; - mBButtonFontColor.set(255, 255, 255, 255); + mButtonBFontScale = 1.0f; + mButtonBFontPosX = -8.0f; + mButtonBFontPosY = 4.0f; + mButtonBFontColor.set(255, 255, 255, 255); field_0x2e4 = 1.0f; field_0x2e8 = 0.0f; field_0x2ec = 0.0f; field_0x2f0.set(255, 255, 255, 255); - mXYButtonFontScale = 1.0f; - mXYButtonFontPosX = 0.0f; - mXYButtonFontPosY = 0.0f; - mXYButtonFontColor.set(255, 255, 255, 255); + mButtonXYTextScale = 1.0f; + mButtonXYTextPosX = 0.0f; + mButtonXYTextPosY = 0.0f; + mButtonXYTextColor.set(255, 255, 255, 255); - mZButtonFontScale = 1.0f; - mZButtonFontPosX = 0.0f; - mZButtonFontPosY = -4.7f; - mZButtonFontColor.set(255, 255, 255, 255); + mButtonZFontScale = 1.0f; + mButtonZFontPosX = 0.0f; + mButtonZFontPosY = -4.7f; + mButtonZFontColor.set(255, 255, 255, 255); mRupeeKeyScale = 1.0f; mRupeeKeyPosX = 9.2f; @@ -945,37 +945,37 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mSpurBarPosX = 6.6f; mSpurBarPosY = -1.3f; - mAButtonHorsePosX = 2.2f; - mAButtonHorsePosY = 0.0f; - mAButtonHorseScale = 0.85f; + mButtonAHorsePosX = 2.2f; + mButtonAHorsePosY = 0.0f; + mButtonAHorseScale = 0.85f; - mAButtonHighlightScale = 1.5f; - mBButtonHighlightScale = 0.7f; + mButtonAPikariScale = 1.5f; + mButtonBPikariScale = 0.7f; field_0x3cc = 1.0f; - mZButtonHighlightScale = 1.2f; - mXYButtonHighlightScale = 1.2f; - mMidnaIconHighlightScale = 1.0f; - mSpurIconHighlightScale = 2.5f; - mSpurIconReviveHighlightScale = 1.3f; + mButtonZPikariScale = 1.2f; + mButtonXYPikariScale = 1.2f; + mMidnaIconPikariScale = 1.0f; + mSpurIconPikariScale = 2.5f; + mSpurIconRevivePikariScale = 1.3f; field_0x3f0 = 0.0f; field_0x3f4 = 0.0f; field_0x3f8 = 1.0f; - mDPadButtonScale = 0.9f; - mDPadButtonOFFPosX = 12.0f; - mDPadButtonOFFPosY = 0.0f; - mDPadButtonONPosX = 12.0f; - mDPadButtonONPosY = 0.0f; - mDPadButtonLetterSpacing = 0.9f; - mDPadButtonAlpha = 1.0f; - mDPadButtonITEMAlpha = 1.0f; - mDPadButtonMAPAlpha = 1.0f; - mDPadButtonMoveFrame = 5; + mButtonCrossScale = 0.9f; + mButtonCrossOFFPosX = 12.0f; + mButtonCrossOFFPosY = 0.0f; + mButtonCrossONPosX = 12.0f; + mButtonCrossONPosY = 0.0f; + mButtonCrossTextScale = 0.9f; + mButtonCrossAlpha = 1.0f; + mButtonCrossITEMAlpha = 1.0f; + mButtonCrossMAPAlpha = 1.0f; + mButtonCrossMoveFrame = 5; field_0x422 = 10; field_0x424 = 20; - mXYButtonsItemDimAlpha = 128; - mXYButtonsBaseDimAlpha = 128; + mButtonXYItemDimAlpha = 128; + mButtonXYBaseDimAlpha = 128; field_0x42c = 128; for (int i = 0; i < 4; i++) { @@ -984,41 +984,41 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mMaxSpurAmount = 6; - mSpurIconHighlightFrontInner.set(255, 255, 255, 255); - mSpurIconHighlightFrontOuter.set(140, 232, 228, 0); - mSpurIconHighlightBackInner.set(255, 255, 190, 255); - mSpurIconHighlightBackOuter.set(55, 215, 90, 0); - mSpurIconHighlightAnimSpeed = 1.5f; + mSpurIconPikariFrontInner.set(255, 255, 255, 255); + mSpurIconPikariFrontOuter.set(140, 232, 228, 0); + mSpurIconPikariBackInner.set(255, 255, 190, 255); + mSpurIconPikariBackOuter.set(55, 215, 90, 0); + mSpurIconPikariAnimSpeed = 1.5f; - mSpurIconReviveHighlightFrontInner.set(255, 255, 255, 255); - mSpurIconReviveHighlightFrontOuter.set(220, 110, 30, 0); - mSpurIconReviveHighlightBackInner.set(255, 255, 190, 255); - mSpurIconReviveHighlightBackOuter.set(170, 110, 0, 0); - mSpurIconReviveHighlightAnimSpeed = 0.5f; + mSpurIconRevivePikariFrontInner.set(255, 255, 255, 255); + mSpurIconRevivePikariFrontOuter.set(220, 110, 30, 0); + mSpurIconRevivePikariBackInner.set(255, 255, 190, 255); + mSpurIconRevivePikariBackOuter.set(170, 110, 0, 0); + mSpurIconRevivePikariAnimSpeed = 0.5f; - mZButtonHighlightFrontInner.set(255, 255, 255, 255); - mZButtonHighlightFrontOuter.set(0, 0, 0, 0); - mZButtonHighlightBackInner.set(255, 255, 255, 255); - mZButtonHighlightBackOuter.set(160, 160, 110, 0); - mZButtonHighlightAnimSpeed = 0.4f; + mButtonZPikariFrontInner.set(255, 255, 255, 255); + mButtonZPikariFrontOuter.set(0, 0, 0, 0); + mButtonZPikariBackInner.set(255, 255, 255, 255); + mButtonZPikariBackOuter.set(160, 160, 110, 0); + mButtonZPikariAnimSpeed = 0.4f; - mXYButtonHighlightFrontInner.set(255, 255, 255, 255); - mXYButtonHighlightFrontOuter.set(0, 0, 0, 0); - mXYButtonHighlightBackInner.set(255, 255, 255, 255); - mXYButtonHighlightBackOuter.set(160, 160, 110, 0); - mXYButtonHighlightAnimSpeed = 0.4f; + mButtonXYPikariFrontInner.set(255, 255, 255, 255); + mButtonXYPikariFrontOuter.set(0, 0, 0, 0); + mButtonXYPikariBackInner.set(255, 255, 255, 255); + mButtonXYPikariBackOuter.set(160, 160, 110, 0); + mButtonXYPikariAnimSpeed = 0.4f; - mAButtonHighlightFrontInner.set(255, 255, 255, 160); - mAButtonHighlightFrontOuter.set(0, 0, 0, 0); - mAButtonHighlightBackInner.set(255, 255, 255, 128); - mAButtonHighlightBackOuter.set(0, 255, 0, 0); - mAButtonHighlightAnimSpeed = 0.4f; + mButtonAPikariFrontInner.set(255, 255, 255, 160); + mButtonAPikariFrontOuter.set(0, 0, 0, 0); + mButtonAPikariBackInner.set(255, 255, 255, 128); + mButtonAPikariBackOuter.set(0, 255, 0, 0); + mButtonAPikariAnimSpeed = 0.4f; - mBButtonHighlightFrontInner.set(255, 180, 180, 160); - mBButtonHighlightFrontOuter.set(0, 0, 0, 0); - mBButtonHighlightBackInner.set(255, 255, 255, 128); - mBButtonHighlightBackOuter.set(255, 0, 0, 0); - mBButtonHighlightAnimSpeed = 0.4f; + mButtonBPikariFrontInner.set(255, 180, 180, 160); + mButtonBPikariFrontOuter.set(0, 0, 0, 0); + mButtonBPikariBackInner.set(255, 255, 255, 128); + mButtonBPikariBackOuter.set(255, 0, 0, 0); + mButtonBPikariAnimSpeed = 0.4f; field_0x4a8.set(255, 180, 180, 160); field_0x4ac.set(0, 0, 0, 0); @@ -1040,11 +1040,11 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { field_0x4e0 = 0.4f; field_0x3d4 = 0.7f; - mMidnaIconHighlightFrontInner.set(200, 235, 255, 255); - mMidnaIconHighlightFrontOuter.set(0, 0, 0, 0); - mMidnaIconHighlightBackInner.set(255, 255, 255, 255); - mMidnaIconHighlightBackOuter.set(140, 200, 125, 0); - mMidnaIconHighlightAnimSpeed = 0.5f; + mMidnaIconPikariFrontInner.set(200, 235, 255, 255); + mMidnaIconPikariFrontOuter.set(0, 0, 0, 0); + mMidnaIconPikariBackInner.set(255, 255, 255, 255); + mMidnaIconPikariBackOuter.set(140, 200, 125, 0); + mMidnaIconPikariAnimSpeed = 0.5f; mMidnaIconFlashRate = 50; mScrollArrowScaleX = 1.0f; @@ -1197,12 +1197,12 @@ dMeter_ringHIO_c::dMeter_ringHIO_c() { mRingScaleH = 1.5f; mRingScaleV = 1.5f; - mHighlightScale = 2.5f; - mHighlightFrontInner.set(255, 255, 255, 185); - mHighlightFrontOuter.set(0, 155, 0, 0); - mHighlightBackInner.set(255, 255, 255, 87); - mHighlightBackOuter.set(0, 115, 0, 0); - mHighlightAnimSpeed = 0.772705f; + mPikariScale = 2.5f; + mPikariFrontInner.set(255, 255, 255, 185); + mPikariFrontOuter.set(0, 155, 0, 0); + mPikariBackInner.set(255, 255, 255, 87); + mPikariBackOuter.set(0, 115, 0, 0); + mPikariAnimSpeed = 0.772705f; mCursorInitSpeed = 5000; mCursorMax = 10000; @@ -1429,29 +1429,29 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() { mDoIconScale = 0.9f; mButtonDebugON = false; - mZButtonPosX = 25.0f; - mZButtonPosY = 25.0f; - mZButtonScale = 0.92f; + mButtonZPosX = 25.0f; + mButtonZPosY = 25.0f; + mButtonZScale = 0.92f; - mAButtonPosX = -0.5f; - mAButtonPosY = 1.0f; - mAButtonScale = 0.92f; + mButtonAPosX = -0.5f; + mButtonAPosY = 1.0f; + mButtonAScale = 0.92f; - mBButtonPosX = -1.0f; - mBButtonPosY = -1.0f; - mBButtonScale = 1.05f; + mButtonBPosX = -1.0f; + mButtonBPosY = -1.0f; + mButtonBScale = 1.05f; - mZButtonTextPosX = 20.0f; - mZButtonTextPosY = 12.0f; - mZButtonTextScale = 0.95f; + mButtonZTextPosX = 20.0f; + mButtonZTextPosY = 12.0f; + mButtonZTextScale = 0.95f; - mAButtonTextPosX = -7.5f; - mAButtonTextPosY = 8.0f; - mAButtonTextScale = 0.95f; + mButtonATextPosX = -7.5f; + mButtonATextPosY = 8.0f; + mButtonATextScale = 0.95f; - mBButtonTextPosX = -7.0f; - mBButtonTextPosY = 5.0f; - mBButtonTextScale = 0.95f; + mButtonBTextPosX = -7.0f; + mButtonBTextPosY = 5.0f; + mButtonBTextScale = 0.95f; mMapBlink[WORLD_VIEW].mSelectedRegion.mBlack.set(29, 24, 0, 0); mMapBlink[WORLD_VIEW].mSelectedRegion.mWhite.set(255, 255, 255, 255); diff --git a/src/d/meter/d_meter_button.cpp b/src/d/meter/d_meter_button.cpp index e5089e222e..6f574070a5 100644 --- a/src/d/meter/d_meter_button.cpp +++ b/src/d/meter/d_meter_button.cpp @@ -274,7 +274,7 @@ void dMeterButton_c::draw() { var_r23 = 1; if (field_0x4b8[i] == 0 && field_0x4bc[i] == 0) { - field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mHighlightRepeatHitAnimSpeed; + field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mPikariRepeatHitAnimSpeed; } s16 temp_r6 = g_drawHIO.mEmpButton.mRepeatHitFrameNum; @@ -309,7 +309,7 @@ void dMeterButton_c::draw() { { var_r22 = 1; if (field_0x2e8[i] <= 0.0f) { - field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mHighlightListenAnimSpeed; + field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mPikariListenAnimSpeed; } } @@ -369,46 +369,46 @@ void dMeterButton_c::draw() { if (daPy_getPlayerActorClass()->i_getSumouMode()) { dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( vtx.x, vtx.y, &field_0x2e8[i], 1.8f, - g_drawHIO.mEmpButton.mHighlightListenFrontOuter, - g_drawHIO.mEmpButton.mHighlightListenFrontInner, - g_drawHIO.mEmpButton.mHighlightListenBackOuter, - g_drawHIO.mEmpButton.mHighlightListenBackInner, - g_drawHIO.mEmpButton.mHighlightListenAnimSpeed, 3); + g_drawHIO.mEmpButton.mPikariListenFrontOuter, + g_drawHIO.mEmpButton.mPikariListenFrontInner, + g_drawHIO.mEmpButton.mPikariListenBackOuter, + g_drawHIO.mEmpButton.mPikariListenBackInner, + g_drawHIO.mEmpButton.mPikariListenAnimSpeed, 3); } else { dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( vtx.x, vtx.y, &field_0x2e8[i], - g_drawHIO.mEmpButton.mHighlightListenScale, - g_drawHIO.mEmpButton.mHighlightListenFrontOuter, - g_drawHIO.mEmpButton.mHighlightListenFrontInner, - g_drawHIO.mEmpButton.mHighlightListenBackOuter, - g_drawHIO.mEmpButton.mHighlightListenBackInner, - g_drawHIO.mEmpButton.mHighlightListenAnimSpeed, 3); + g_drawHIO.mEmpButton.mPikariListenScale, + g_drawHIO.mEmpButton.mPikariListenFrontOuter, + g_drawHIO.mEmpButton.mPikariListenFrontInner, + g_drawHIO.mEmpButton.mPikariListenBackOuter, + g_drawHIO.mEmpButton.mPikariListenBackInner, + g_drawHIO.mEmpButton.mPikariListenAnimSpeed, 3); } } else if (var_r23) { dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( vtx.x, vtx.y, &field_0x2e8[i], - g_drawHIO.mEmpButton.mHighlightRepeatHitScale, - g_drawHIO.mEmpButton.mHighlightRepeatHitFrontOuter, - g_drawHIO.mEmpButton.mHighlightRepeatHitFrontInner, - g_drawHIO.mEmpButton.mHighlightRepeatHitBackOuter, - g_drawHIO.mEmpButton.mHighlightRepeatHitBackInner, - g_drawHIO.mEmpButton.mHighlightRepeatHitAnimSpeed, 0); + g_drawHIO.mEmpButton.mPikariRepeatHitScale, + g_drawHIO.mEmpButton.mPikariRepeatHitFrontOuter, + g_drawHIO.mEmpButton.mPikariRepeatHitFrontInner, + g_drawHIO.mEmpButton.mPikariRepeatHitBackOuter, + g_drawHIO.mEmpButton.mPikariRepeatHitBackInner, + g_drawHIO.mEmpButton.mPikariRepeatHitAnimSpeed, 0); } else if (isFastSet(i)) { dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( - vtx.x, vtx.y, &field_0x2e8[i], g_drawHIO.mEmpButton.mHighlightFastScale, - g_drawHIO.mEmpButton.mHighlightFastFrontOuter, - g_drawHIO.mEmpButton.mHighlightFastFrontInner, - g_drawHIO.mEmpButton.mHighlightFastBackOuter, - g_drawHIO.mEmpButton.mHighlightFastBackInner, - g_drawHIO.mEmpButton.mHighlightFastAnimSpeed, 0); + vtx.x, vtx.y, &field_0x2e8[i], g_drawHIO.mEmpButton.mPikariFastScale, + g_drawHIO.mEmpButton.mPikariFastFrontOuter, + g_drawHIO.mEmpButton.mPikariFastFrontInner, + g_drawHIO.mEmpButton.mPikariFastBackOuter, + g_drawHIO.mEmpButton.mPikariFastBackInner, + g_drawHIO.mEmpButton.mPikariFastAnimSpeed, 0); } else { dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( - vtx.x, vtx.y, &field_0x2e8[i], g_drawHIO.mEmpButton.mHighlightScale, - g_drawHIO.mEmpButton.mHighlightFrontOuter, - g_drawHIO.mEmpButton.mHighlightFrontInner, - g_drawHIO.mEmpButton.mHighlightBackOuter, - g_drawHIO.mEmpButton.mHighlightBackInner, - g_drawHIO.mEmpButton.mHighlightAnimSpeed, 0); + vtx.x, vtx.y, &field_0x2e8[i], g_drawHIO.mEmpButton.mPikariScale, + g_drawHIO.mEmpButton.mPikariFrontOuter, + g_drawHIO.mEmpButton.mPikariFrontInner, + g_drawHIO.mEmpButton.mPikariBackOuter, + g_drawHIO.mEmpButton.mPikariBackInner, + g_drawHIO.mEmpButton.mPikariAnimSpeed, 0); } } } @@ -1559,32 +1559,32 @@ void dMeterButton_c::updateButton() { mpParent->scale(mParentScale, mParentScale); } - if (mButtonAPosX != g_drawHIO.mEmpButton.mAButtonPosX || - mButtonAPosY != g_drawHIO.mEmpButton.mAButtonPosY) + if (mButtonAPosX != g_drawHIO.mEmpButton.mButtonAPosX || + mButtonAPosY != g_drawHIO.mEmpButton.mButtonAPosY) { - mButtonAPosX = g_drawHIO.mEmpButton.mAButtonPosX; - mButtonAPosY = g_drawHIO.mEmpButton.mAButtonPosY; + mButtonAPosX = g_drawHIO.mEmpButton.mButtonAPosX; + mButtonAPosY = g_drawHIO.mEmpButton.mButtonAPosY; paneTrans(mpButtonA, field_0x304[0] + (mButtonAPosX + field_0x18c[0]), mButtonAPosY, 0xFF); } - if (mButtonAScale != g_drawHIO.mEmpButton.mAButtonScale) { - mButtonAScale = g_drawHIO.mEmpButton.mAButtonScale; + if (mButtonAScale != g_drawHIO.mEmpButton.mButtonAScale) { + mButtonAScale = g_drawHIO.mEmpButton.mButtonAScale; if (!dComIfGp_isDoSetFlag(4)) { mpButtonA->scale(mButtonAScale, mButtonAScale); } } - if (mButtonBPosX != g_drawHIO.mEmpButton.mBButtonPosX || - mButtonBPosY != g_drawHIO.mEmpButton.mBButtonPosY) + if (mButtonBPosX != g_drawHIO.mEmpButton.mButtonBPosX || + mButtonBPosY != g_drawHIO.mEmpButton.mButtonBPosY) { - mButtonBPosX = g_drawHIO.mEmpButton.mBButtonPosX; - mButtonBPosY = g_drawHIO.mEmpButton.mBButtonPosY; + mButtonBPosX = g_drawHIO.mEmpButton.mButtonBPosX; + mButtonBPosY = g_drawHIO.mEmpButton.mButtonBPosY; paneTrans(mpButtonB, field_0x304[1] + (mButtonBPosX + field_0x18c[1]), mButtonBPosY, 0xFF); } - if (mButtonBScale != g_drawHIO.mEmpButton.mBButtonScale) { - mButtonBScale = g_drawHIO.mEmpButton.mBButtonScale; + if (mButtonBScale != g_drawHIO.mEmpButton.mButtonBScale) { + mButtonBScale = g_drawHIO.mEmpButton.mButtonBScale; mpButtonB->scale(mButtonBScale, mButtonBScale); } @@ -1603,16 +1603,16 @@ void dMeterButton_c::updateButton() { mpButtonR->scale(mButtonRScale, mButtonRScale); } - if (mButtonZPosX != g_drawHIO.mEmpButton.mZButtonPosX || - mButtonZPosY != g_drawHIO.mEmpButton.mZButtonPosY) + if (mButtonZPosX != g_drawHIO.mEmpButton.mButtonZPosX || + mButtonZPosY != g_drawHIO.mEmpButton.mButtonZPosY) { - mButtonZPosX = g_drawHIO.mEmpButton.mZButtonPosX; - mButtonZPosY = g_drawHIO.mEmpButton.mZButtonPosY; + mButtonZPosX = g_drawHIO.mEmpButton.mButtonZPosX; + mButtonZPosY = g_drawHIO.mEmpButton.mButtonZPosY; paneTrans(mpButtonZ, field_0x304[3] + (mButtonZPosX + field_0x18c[3]), mButtonZPosY, 0xFF); } - if (mButtonZScale != g_drawHIO.mEmpButton.mZButtonScale) { - mButtonZScale = g_drawHIO.mEmpButton.mZButtonScale; + if (mButtonZScale != g_drawHIO.mEmpButton.mButtonZScale) { + mButtonZScale = g_drawHIO.mEmpButton.mButtonZScale; mpButtonZ->scale(mButtonZScale, mButtonZScale); } @@ -1660,30 +1660,30 @@ void dMeterButton_c::updateButton() { mpButtonS->scale(mButtonSScale, mButtonSScale); } - if (mButtonXPosX != g_drawHIO.mEmpButton.mXButtonPosX || - mButtonXPosY != g_drawHIO.mEmpButton.mXButtonPosY) + if (mButtonXPosX != g_drawHIO.mEmpButton.mButtonXPosX || + mButtonXPosY != g_drawHIO.mEmpButton.mButtonXPosY) { - mButtonXPosX = g_drawHIO.mEmpButton.mXButtonPosX; - mButtonXPosY = g_drawHIO.mEmpButton.mXButtonPosY; + mButtonXPosX = g_drawHIO.mEmpButton.mButtonXPosX; + mButtonXPosY = g_drawHIO.mEmpButton.mButtonXPosY; paneTrans(mpButtonX, field_0x304[7] + (mButtonXPosX + field_0x18c[7]), mButtonXPosY, 0xFF); } - if (mButtonXScale != g_drawHIO.mEmpButton.mXButtonScale) { - mButtonXScale = g_drawHIO.mEmpButton.mXButtonScale; + if (mButtonXScale != g_drawHIO.mEmpButton.mButtonXScale) { + mButtonXScale = g_drawHIO.mEmpButton.mButtonXScale; mpButtonX->scale(mButtonXScale, mButtonXScale); } - if (mButtonYPosX != g_drawHIO.mEmpButton.mYButtonPosX || - mButtonYPosY != g_drawHIO.mEmpButton.mYButtonPosY) + if (mButtonYPosX != g_drawHIO.mEmpButton.mButtonYPosX || + mButtonYPosY != g_drawHIO.mEmpButton.mButtonYPosY) { - mButtonYPosX = g_drawHIO.mEmpButton.mYButtonPosX; - mButtonYPosY = g_drawHIO.mEmpButton.mYButtonPosY; + mButtonYPosX = g_drawHIO.mEmpButton.mButtonYPosX; + mButtonYPosY = g_drawHIO.mEmpButton.mButtonYPosY; paneTrans(mpButtonY, field_0x304[8] + (mButtonXPosX + field_0x18c[8]), mButtonYPosY, 0xFF); } - if (mButtonYScale != g_drawHIO.mEmpButton.mYButtonScale) { - mButtonYScale = g_drawHIO.mEmpButton.mYButtonScale; + if (mButtonYScale != g_drawHIO.mEmpButton.mButtonYScale) { + mButtonYScale = g_drawHIO.mEmpButton.mButtonYScale; mpButtonY->scale(mButtonYScale, mButtonYScale); } @@ -3355,9 +3355,9 @@ void dMeterButton_c::pikariCheck() { (dComIfGp_isNunCSetFlag(1) && field_0x4be[i] == BUTTON_NUNC_e) || (dComIfGp_isBottleSetFlag(1) && field_0x4be[i] == BUTTON_BIN_e)) { - field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mHighlightFastAnimSpeed; + field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mPikariFastAnimSpeed; } else { - field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mHighlightAnimSpeed; + field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mPikariAnimSpeed; } } diff --git a/src/d/meter/d_meter_hakusha.cpp b/src/d/meter/d_meter_hakusha.cpp index 3cc39553dd..3e915f49f6 100644 --- a/src/d/meter/d_meter_hakusha.cpp +++ b/src/d/meter/d_meter_hakusha.cpp @@ -80,8 +80,8 @@ int dMeterHakusha_c::_create() { mpButtonA->setAlphaRate(0.0f); mpButtonScreen->search('info_n')->translate(0.0f, 0.0f); - field_0x100 = g_drawHIO.mAButtonHorsePosX; - field_0x104 = g_drawHIO.mAButtonHorsePosY; + field_0x100 = g_drawHIO.mButtonAHorsePosX; + field_0x104 = g_drawHIO.mButtonAHorsePosY; if (strcmp(dComIfGp_getStartStageName(), "F_SP108") == 0) { mpHakushaParent->paneTrans(g_drawHIO.mSpurBarPosX + 28.4f, g_drawHIO.mSpurBarPosY); @@ -90,8 +90,8 @@ int dMeterHakusha_c::_create() { } mpHakushaParent->scale(g_drawHIO.mSpurBarScale, g_drawHIO.mSpurBarScale); - mpButtonA->paneTrans(g_drawHIO.mAButtonHorsePosX, g_drawHIO.mAButtonHorsePosY); - mpButtonA->scale(g_drawHIO.mAButtonHorseScale, g_drawHIO.mAButtonHorseScale); + mpButtonA->paneTrans(g_drawHIO.mButtonAHorsePosX, g_drawHIO.mButtonAHorsePosY); + mpButtonA->scale(g_drawHIO.mButtonAHorseScale, g_drawHIO.mButtonAHorseScale); mpHakushaOn->scale(g_drawHIO.mSpurIconScale, g_drawHIO.mSpurIconScale); mpHakushaOff->scale(g_drawHIO.mUsedSpurIconScale, g_drawHIO.mUsedSpurIconScale); @@ -138,17 +138,17 @@ void dMeterHakusha_c::draw() { if (mHakushaStatus[i] == 0) { dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikariHakusha( - center.x, center.y, mHakushaAnimFrame[i], g_drawHIO.mSpurIconHighlightScale, - g_drawHIO.mSpurIconHighlightFrontOuter, g_drawHIO.mSpurIconHighlightFrontInner, - g_drawHIO.mSpurIconHighlightBackOuter, g_drawHIO.mSpurIconHighlightBackInner); + center.x, center.y, mHakushaAnimFrame[i], g_drawHIO.mSpurIconPikariScale, + g_drawHIO.mSpurIconPikariFrontOuter, g_drawHIO.mSpurIconPikariFrontInner, + g_drawHIO.mSpurIconPikariBackOuter, g_drawHIO.mSpurIconPikariBackInner); } else { dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikariHakusha( center.x, center.y, mHakushaAnimFrame[i], - g_drawHIO.mSpurIconReviveHighlightScale, - g_drawHIO.mSpurIconReviveHighlightFrontOuter, - g_drawHIO.mSpurIconReviveHighlightFrontInner, - g_drawHIO.mSpurIconReviveHighlightBackOuter, - g_drawHIO.mSpurIconReviveHighlightBackInner); + g_drawHIO.mSpurIconRevivePikariScale, + g_drawHIO.mSpurIconRevivePikariFrontOuter, + g_drawHIO.mSpurIconRevivePikariFrontInner, + g_drawHIO.mSpurIconRevivePikariBackOuter, + g_drawHIO.mSpurIconRevivePikariBackInner); } } } @@ -219,11 +219,11 @@ void dMeterHakusha_c::updateHakusha() { if (mHakushaNum != dMeter2Info_getHorseLifeCount()) { if (mHakushaNum > dMeter2Info_getHorseLifeCount()) { mHakushaAnimFrame[dMeter2Info_getHorseLifeCount()] = - 18.0f - g_drawHIO.mSpurIconHighlightAnimSpeed; + 18.0f - g_drawHIO.mSpurIconPikariAnimSpeed; mHakushaStatus[dMeter2Info_getHorseLifeCount()] = 0; } else if (mHakushaNum < dMeter2Info_getHorseLifeCount()) { for (int i = mHakushaNum; i < dMeter2Info_getHorseLifeCount(); i++) { - mHakushaAnimFrame[i] = 18.0f - g_drawHIO.mSpurIconReviveHighlightAnimSpeed; + mHakushaAnimFrame[i] = 18.0f - g_drawHIO.mSpurIconRevivePikariAnimSpeed; mHakushaStatus[i] = 1; } } @@ -234,9 +234,9 @@ void dMeterHakusha_c::updateHakusha() { for (int i = 0; i < getHakushaNum(); i++) { if (mHakushaAnimFrame[i] > 0.0f) { if (mHakushaStatus[i] == 0) { - mHakushaAnimFrame[i] += g_drawHIO.mSpurIconHighlightAnimSpeed; + mHakushaAnimFrame[i] += g_drawHIO.mSpurIconPikariAnimSpeed; } else { - mHakushaAnimFrame[i] += g_drawHIO.mSpurIconReviveHighlightAnimSpeed; + mHakushaAnimFrame[i] += g_drawHIO.mSpurIconRevivePikariAnimSpeed; } if (mHakushaAnimFrame[i] > 28.0f) { @@ -280,8 +280,8 @@ void dMeterHakusha_c::updateHakusha() { mButtonAPosY = abtn_y_offset + field_0x104; if (g_drawHIO.mSpurDebug) { - field_0x100 = g_drawHIO.mAButtonHorsePosX; - field_0x104 = g_drawHIO.mAButtonHorsePosY; + field_0x100 = g_drawHIO.mButtonAHorsePosX; + field_0x104 = g_drawHIO.mButtonAHorsePosY; if (strcmp(dComIfGp_getStartStageName(), "F_SP108") == 0) { mpHakushaParent->paneTrans(g_drawHIO.mSpurBarPosX + 28.4f, g_drawHIO.mSpurBarPosY); @@ -290,8 +290,8 @@ void dMeterHakusha_c::updateHakusha() { } mpHakushaParent->scale(g_drawHIO.mSpurBarScale, g_drawHIO.mSpurBarScale); - mpButtonA->paneTrans(g_drawHIO.mAButtonHorsePosX, g_drawHIO.mAButtonHorsePosY); - mpButtonA->scale(g_drawHIO.mAButtonHorseScale, g_drawHIO.mAButtonHorseScale); + mpButtonA->paneTrans(g_drawHIO.mButtonAHorsePosX, g_drawHIO.mButtonAHorsePosY); + mpButtonA->scale(g_drawHIO.mButtonAHorseScale, g_drawHIO.mButtonAHorseScale); mpHakushaOn->scale(g_drawHIO.mSpurIconScale, g_drawHIO.mSpurIconScale); mpHakushaOff->scale(g_drawHIO.mUsedSpurIconScale, g_drawHIO.mUsedSpurIconScale); diff --git a/src/d/meter/d_meter_string.cpp b/src/d/meter/d_meter_string.cpp index 5da94a0b02..004a3f559f 100644 --- a/src/d/meter/d_meter_string.cpp +++ b/src/d/meter/d_meter_string.cpp @@ -131,9 +131,9 @@ void dMeterString_c::draw() { if (mPikariAnimFrame > 0.0f) { drawPikari(); } else if (mPikariAnimFrame == -1.0f && - mAnimFrame > g_drawHIO.mMiniGame.mReadyFightHighlightAppearFrames) + mAnimFrame > g_drawHIO.mMiniGame.mReadyFightPikariAppearFrames) { - mPikariAnimFrame = 18.0f - g_drawHIO.mMiniGame.mReadyFightHighlightAnimSpeed; + mPikariAnimFrame = 18.0f - g_drawHIO.mMiniGame.mReadyFightPikariAnimSpeed; } if (mAnimFrame >= var_f31) { @@ -247,12 +247,12 @@ void dMeterString_c::drawPikari() { if (c != 0x20 && c != 0x8140) { dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( (temp_f24 / 2) + (var_f25 + var_f29), center.y, &frame, - g_drawHIO.mMiniGame.mReadyFightHighlightScale, - g_drawHIO.mMiniGame.mReadyFightHighlightFrontOuter, - g_drawHIO.mMiniGame.mReadyFightHighlightFrontInner, - g_drawHIO.mMiniGame.mReadyFightHighlightBackOuter, - g_drawHIO.mMiniGame.mReadyFightHighlightBackInner, - g_drawHIO.mMiniGame.mReadyFightHighlightAnimSpeed, 0); + g_drawHIO.mMiniGame.mReadyFightPikariScale, + g_drawHIO.mMiniGame.mReadyFightPikariFrontOuter, + g_drawHIO.mMiniGame.mReadyFightPikariFrontInner, + g_drawHIO.mMiniGame.mReadyFightPikariBackOuter, + g_drawHIO.mMiniGame.mReadyFightPikariBackInner, + g_drawHIO.mMiniGame.mReadyFightPikariAnimSpeed, 0); } var_f29 += temp_f24;