diff --git a/asm/msg/scrn/d_msg_scrn_kanban/__ct__16dMsgScrnKanban_cFP10JKRExpHeap.s b/asm/msg/scrn/d_msg_scrn_kanban/__ct__16dMsgScrnKanban_cFP10JKRExpHeap.s deleted file mode 100644 index ee31e523868..00000000000 --- a/asm/msg/scrn/d_msg_scrn_kanban/__ct__16dMsgScrnKanban_cFP10JKRExpHeap.s +++ /dev/null @@ -1,338 +0,0 @@ -lbl_80244E38: -/* 80244E38 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80244E3C 7C 08 02 A6 */ mflr r0 -/* 80244E40 90 01 00 34 */ stw r0, 0x34(r1) -/* 80244E44 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80244E48 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80244E4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244E50 48 11 D3 85 */ bl _savegpr_27 -/* 80244E54 7C 7F 1B 78 */ mr r31, r3 -/* 80244E58 7C 9B 23 78 */ mr r27, r4 -/* 80244E5C 4B FF 72 81 */ bl __ct__14dMsgScrnBase_cFv -/* 80244E60 3C 80 80 3C */ lis r4, __vt__16dMsgScrnKanban_c@ha /* 0x803C1240@ha */ -/* 80244E64 38 04 12 40 */ addi r0, r4, __vt__16dMsgScrnKanban_c@l /* 0x803C1240@l */ -/* 80244E68 90 1F 00 00 */ stw r0, 0(r31) -/* 80244E6C 28 1B 00 00 */ cmplwi r27, 0 -/* 80244E70 41 82 00 0C */ beq lbl_80244E7C -/* 80244E74 93 7F 00 D4 */ stw r27, 0xd4(r31) -/* 80244E78 48 00 00 10 */ b lbl_80244E88 -lbl_80244E7C: -/* 80244E7C 38 60 00 07 */ li r3, 7 -/* 80244E80 4B DE 95 51 */ bl dComIfGp_getSubHeap2D__Fi -/* 80244E84 90 7F 00 D4 */ stw r3, 0xd4(r31) -lbl_80244E88: -/* 80244E88 80 7F 00 D4 */ lwz r3, 0xd4(r31) -/* 80244E8C 48 08 98 F9 */ bl getTotalFreeSize__7JKRHeapFv -/* 80244E90 7F E3 FB 78 */ mr r3, r31 -/* 80244E94 4B FF 72 D9 */ bl init__14dMsgScrnBase_cFv -/* 80244E98 38 60 01 18 */ li r3, 0x118 -/* 80244E9C 48 08 9D B1 */ bl __nw__FUl -/* 80244EA0 7C 60 1B 79 */ or. r0, r3, r3 -/* 80244EA4 41 82 00 0C */ beq lbl_80244EB0 -/* 80244EA8 48 0B 35 F1 */ bl __ct__9J2DScreenFv -/* 80244EAC 7C 60 1B 78 */ mr r0, r3 -lbl_80244EB0: -/* 80244EB0 90 1F 00 04 */ stw r0, 4(r31) -/* 80244EB4 80 7F 00 04 */ lwz r3, 4(r31) -/* 80244EB8 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_kanban__stringBase0@ha /* 0x80399AB8@ha */ -/* 80244EBC 38 84 9A B8 */ addi r4, r4, msg_scrn_d_msg_scrn_kanban__stringBase0@l /* 0x80399AB8@l */ -/* 80244EC0 3C A0 01 02 */ lis r5, 0x102 -/* 80244EC4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80244EC8 3B A6 61 C0 */ addi r29, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80244ECC 80 DD 5C 74 */ lwz r6, 0x5c74(r29) -/* 80244ED0 48 0B 37 79 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 80244ED4 80 7F 00 04 */ lwz r3, 4(r31) -/* 80244ED8 48 01 02 11 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 80244EDC 38 60 00 04 */ li r3, 4 -/* 80244EE0 64 63 00 04 */ oris r3, r3, 4 -/* 80244EE4 7C 72 E3 A6 */ mtspr 0x392, r3 -/* 80244EE8 38 60 00 05 */ li r3, 5 -/* 80244EEC 64 63 00 05 */ oris r3, r3, 5 -/* 80244EF0 7C 73 E3 A6 */ mtspr 0x393, r3 -/* 80244EF4 38 60 00 06 */ li r3, 6 -/* 80244EF8 64 63 00 06 */ oris r3, r3, 6 -/* 80244EFC 7C 74 E3 A6 */ mtspr 0x394, r3 -/* 80244F00 38 60 00 07 */ li r3, 7 -/* 80244F04 64 63 00 07 */ oris r3, r3, 7 -/* 80244F08 7C 75 E3 A6 */ mtspr 0x395, r3 -/* 80244F0C 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_kanban__stringBase0@ha /* 0x80399AB8@ha */ -/* 80244F10 38 84 9A B8 */ addi r4, r4, msg_scrn_d_msg_scrn_kanban__stringBase0@l /* 0x80399AB8@l */ -/* 80244F14 38 64 00 19 */ addi r3, r4, 0x19 -/* 80244F18 80 9D 5C 74 */ lwz r4, 0x5c74(r29) -/* 80244F1C 48 08 F3 55 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80244F20 48 0C 3B 4D */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80244F24 90 7F 00 CC */ stw r3, 0xcc(r31) -/* 80244F28 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_kanban__stringBase0@ha /* 0x80399AB8@ha */ -/* 80244F2C 38 84 9A B8 */ addi r4, r4, msg_scrn_d_msg_scrn_kanban__stringBase0@l /* 0x80399AB8@l */ -/* 80244F30 38 64 00 32 */ addi r3, r4, 0x32 -/* 80244F34 80 9D 5C 74 */ lwz r4, 0x5c74(r29) -/* 80244F38 48 08 F3 39 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80244F3C 48 0C 3B 31 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80244F40 90 7F 00 D0 */ stw r3, 0xd0(r31) -/* 80244F44 80 7F 00 D0 */ lwz r3, 0xd0(r31) -/* 80244F48 80 9F 00 04 */ lwz r4, 4(r31) -/* 80244F4C 81 83 00 00 */ lwz r12, 0(r3) -/* 80244F50 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80244F54 7D 89 03 A6 */ mtctr r12 -/* 80244F58 4E 80 04 21 */ bctrl -/* 80244F5C C0 02 B2 C0 */ lfs f0, lit_3944(r2) -/* 80244F60 D0 1F 00 D8 */ stfs f0, 0xd8(r31) -/* 80244F64 38 60 00 6C */ li r3, 0x6c -/* 80244F68 48 08 9C E5 */ bl __nw__FUl -/* 80244F6C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80244F70 41 82 00 24 */ beq lbl_80244F94 -/* 80244F74 80 9F 00 04 */ lwz r4, 4(r31) -/* 80244F78 3C A0 73 69 */ lis r5, 0x7369 /* 0x73697A65@ha */ -/* 80244F7C 38 C5 7A 65 */ addi r6, r5, 0x7A65 /* 0x73697A65@l */ -/* 80244F80 38 A0 6E 5F */ li r5, 0x6e5f -/* 80244F84 38 E0 00 02 */ li r7, 2 -/* 80244F88 39 00 00 00 */ li r8, 0 -/* 80244F8C 48 00 E9 F9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80244F90 7C 60 1B 78 */ mr r0, r3 -lbl_80244F94: -/* 80244F94 90 1F 00 08 */ stw r0, 8(r31) -/* 80244F98 80 9F 00 08 */ lwz r4, 8(r31) -/* 80244F9C 80 64 00 04 */ lwz r3, 4(r4) -/* 80244FA0 80 9F 00 CC */ lwz r4, 0xcc(r31) -/* 80244FA4 81 83 00 00 */ lwz r12, 0(r3) -/* 80244FA8 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80244FAC 7D 89 03 A6 */ mtctr r12 -/* 80244FB0 4E 80 04 21 */ bctrl -/* 80244FB4 C0 02 B2 C4 */ lfs f0, lit_3945(r2) -/* 80244FB8 80 9F 00 CC */ lwz r4, 0xcc(r31) -/* 80244FBC D0 04 00 08 */ stfs f0, 8(r4) -/* 80244FC0 80 9F 00 08 */ lwz r4, 8(r31) -/* 80244FC4 80 64 00 04 */ lwz r3, 4(r4) -/* 80244FC8 48 0B 30 05 */ bl animationTransform__7J2DPaneFv -/* 80244FCC 80 9F 00 08 */ lwz r4, 8(r31) -/* 80244FD0 80 64 00 04 */ lwz r3, 4(r4) -/* 80244FD4 38 80 00 00 */ li r4, 0 -/* 80244FD8 81 83 00 00 */ lwz r12, 0(r3) -/* 80244FDC 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80244FE0 7D 89 03 A6 */ mtctr r12 -/* 80244FE4 4E 80 04 21 */ bctrl -/* 80244FE8 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80244FEC 38 A4 02 8C */ addi r5, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80244FF0 C0 25 00 AC */ lfs f1, 0xac(r5) -/* 80244FF4 80 9F 00 08 */ lwz r4, 8(r31) -/* 80244FF8 80 64 00 04 */ lwz r3, 4(r4) -/* 80244FFC C0 05 00 80 */ lfs f0, 0x80(r5) -/* 80245000 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80245004 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 80245008 81 83 00 00 */ lwz r12, 0(r3) -/* 8024500C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80245010 7D 89 03 A6 */ mtctr r12 -/* 80245014 4E 80 04 21 */ bctrl -/* 80245018 38 60 00 6C */ li r3, 0x6c -/* 8024501C 48 08 9C 31 */ bl __nw__FUl -/* 80245020 7C 60 1B 79 */ or. r0, r3, r3 -/* 80245024 41 82 00 24 */ beq lbl_80245048 -/* 80245028 80 9F 00 04 */ lwz r4, 4(r31) -/* 8024502C 3C A0 63 6B */ lis r5, 0x636B /* 0x636B5F62@ha */ -/* 80245030 38 C5 5F 62 */ addi r6, r5, 0x5F62 /* 0x636B5F62@l */ -/* 80245034 38 A0 62 61 */ li r5, 0x6261 -/* 80245038 38 E0 00 00 */ li r7, 0 -/* 8024503C 39 00 00 00 */ li r8, 0 -/* 80245040 48 00 E9 45 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80245044 7C 60 1B 78 */ mr r0, r3 -lbl_80245048: -/* 80245048 90 1F 00 C4 */ stw r0, 0xc4(r31) -/* 8024504C 38 60 00 6C */ li r3, 0x6c -/* 80245050 48 08 9B FD */ bl __nw__FUl -/* 80245054 7C 60 1B 79 */ or. r0, r3, r3 -/* 80245058 41 82 00 24 */ beq lbl_8024507C -/* 8024505C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80245060 3C A0 6F 74 */ lis r5, 0x6F74 /* 0x6F743030@ha */ -/* 80245064 38 C5 30 30 */ addi r6, r5, 0x3030 /* 0x6F743030@l */ -/* 80245068 38 A0 73 70 */ li r5, 0x7370 -/* 8024506C 38 E0 00 00 */ li r7, 0 -/* 80245070 39 00 00 00 */ li r8, 0 -/* 80245074 48 00 E9 11 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80245078 7C 60 1B 78 */ mr r0, r3 -lbl_8024507C: -/* 8024507C 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 80245080 80 9F 00 C8 */ lwz r4, 0xc8(r31) -/* 80245084 80 64 00 04 */ lwz r3, 4(r4) -/* 80245088 80 9F 00 D0 */ lwz r4, 0xd0(r31) -/* 8024508C 81 83 00 00 */ lwz r12, 0(r3) -/* 80245090 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 80245094 7D 89 03 A6 */ mtctr r12 -/* 80245098 4E 80 04 21 */ bctrl -/* 8024509C 3B 60 00 00 */ li r27, 0 -/* 802450A0 3B C0 00 00 */ li r30, 0 -/* 802450A4 3B A0 00 00 */ li r29, 0 -lbl_802450A8: -/* 802450A8 38 60 00 6C */ li r3, 0x6c -/* 802450AC 48 08 9B A1 */ bl __nw__FUl -/* 802450B0 7C 64 1B 79 */ or. r4, r3, r3 -/* 802450B4 41 82 00 2C */ beq lbl_802450E0 -/* 802450B8 80 9F 00 04 */ lwz r4, 4(r31) -/* 802450BC 3C A0 80 3A */ lis r5, t_tag@ha /* 0x80399AA0@ha */ -/* 802450C0 38 05 9A A0 */ addi r0, r5, t_tag@l /* 0x80399AA0@l */ -/* 802450C4 7C C0 EA 14 */ add r6, r0, r29 -/* 802450C8 80 A6 00 00 */ lwz r5, 0(r6) -/* 802450CC 80 C6 00 04 */ lwz r6, 4(r6) -/* 802450D0 38 E0 00 00 */ li r7, 0 -/* 802450D4 39 00 00 00 */ li r8, 0 -/* 802450D8 48 00 E8 AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802450DC 7C 64 1B 78 */ mr r4, r3 -lbl_802450E0: -/* 802450E0 38 1E 00 0C */ addi r0, r30, 0xc -/* 802450E4 7C 9F 01 2E */ stwx r4, r31, r0 -/* 802450E8 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 802450EC 83 84 00 04 */ lwz r28, 4(r4) -/* 802450F0 4B DC F9 01 */ bl mDoExt_getMesgFont__Fv -/* 802450F4 7C 64 1B 78 */ mr r4, r3 -/* 802450F8 7F 83 E3 78 */ mr r3, r28 -/* 802450FC 81 9C 00 00 */ lwz r12, 0(r28) -/* 80245100 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80245104 7D 89 03 A6 */ mtctr r12 -/* 80245108 4E 80 04 21 */ bctrl -/* 8024510C 3B 7B 00 01 */ addi r27, r27, 1 -/* 80245110 2C 1B 00 03 */ cmpwi r27, 3 -/* 80245114 3B DE 00 04 */ addi r30, r30, 4 -/* 80245118 3B BD 00 08 */ addi r29, r29, 8 -/* 8024511C 41 80 FF 8C */ blt lbl_802450A8 -/* 80245120 80 7F 00 04 */ lwz r3, 4(r31) -/* 80245124 3C 80 6C 69 */ lis r4, 0x6C69 /* 0x6C696E65@ha */ -/* 80245128 38 C4 6E 65 */ addi r6, r4, 0x6E65 /* 0x6C696E65@l */ -/* 8024512C 3C 80 00 6E */ lis r4, 0x006E /* 0x006E5F33@ha */ -/* 80245130 38 A4 5F 33 */ addi r5, r4, 0x5F33 /* 0x006E5F33@l */ -/* 80245134 81 83 00 00 */ lwz r12, 0(r3) -/* 80245138 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8024513C 7D 89 03 A6 */ mtctr r12 -/* 80245140 4E 80 04 21 */ bctrl -/* 80245144 38 00 00 00 */ li r0, 0 -/* 80245148 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8024514C 80 7F 00 04 */ lwz r3, 4(r31) -/* 80245150 3C 80 6C 69 */ lis r4, 0x6C69 /* 0x6C696E65@ha */ -/* 80245154 38 C4 6E 65 */ addi r6, r4, 0x6E65 /* 0x6C696E65@l */ -/* 80245158 3C 80 6E 5F */ lis r4, 0x6E5F /* 0x6E5F3366@ha */ -/* 8024515C 38 A4 33 66 */ addi r5, r4, 0x3366 /* 0x6E5F3366@l */ -/* 80245160 81 83 00 00 */ lwz r12, 0(r3) -/* 80245164 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80245168 7D 89 03 A6 */ mtctr r12 -/* 8024516C 4E 80 04 21 */ bctrl -/* 80245170 38 00 00 00 */ li r0, 0 -/* 80245174 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80245178 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024517C 3C 80 6C 69 */ lis r4, 0x6C69 /* 0x6C696E65@ha */ -/* 80245180 38 C4 6E 65 */ addi r6, r4, 0x6E65 /* 0x6C696E65@l */ -/* 80245184 3C 80 6E 5F */ lis r4, 0x6E5F /* 0x6E5F6534@ha */ -/* 80245188 38 A4 65 34 */ addi r5, r4, 0x6534 /* 0x6E5F6534@l */ -/* 8024518C 81 83 00 00 */ lwz r12, 0(r3) -/* 80245190 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80245194 7D 89 03 A6 */ mtctr r12 -/* 80245198 4E 80 04 21 */ bctrl -/* 8024519C 38 00 00 01 */ li r0, 1 -/* 802451A0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802451A4 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 802451A8 80 84 00 04 */ lwz r4, 4(r4) -/* 802451AC C0 04 01 1C */ lfs f0, 0x11c(r4) -/* 802451B0 D0 1F 00 58 */ stfs f0, 0x58(r31) -/* 802451B4 C0 04 01 20 */ lfs f0, 0x120(r4) -/* 802451B8 D0 1F 00 5C */ stfs f0, 0x5c(r31) -/* 802451BC 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 802451C0 80 84 00 04 */ lwz r4, 4(r4) -/* 802451C4 C0 24 00 28 */ lfs f1, 0x28(r4) -/* 802451C8 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 802451CC EC 01 00 28 */ fsubs f0, f1, f0 -/* 802451D0 D0 1F 00 74 */ stfs f0, 0x74(r31) -/* 802451D4 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 802451D8 80 84 00 04 */ lwz r4, 4(r4) -/* 802451DC C0 24 00 2C */ lfs f1, 0x2c(r4) -/* 802451E0 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 802451E4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802451E8 D0 1F 00 78 */ stfs f0, 0x78(r31) -/* 802451EC 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 802451F0 80 84 00 04 */ lwz r4, 4(r4) -/* 802451F4 C0 04 01 18 */ lfs f0, 0x118(r4) -/* 802451F8 D0 1F 00 7C */ stfs f0, 0x7c(r31) -/* 802451FC 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 80245200 80 84 00 04 */ lwz r4, 4(r4) -/* 80245204 C0 04 01 14 */ lfs f0, 0x114(r4) -/* 80245208 D0 1F 00 80 */ stfs f0, 0x80(r31) -/* 8024520C 3B 60 00 00 */ li r27, 0 -/* 80245210 3B C0 00 00 */ li r30, 0 -/* 80245214 C3 E2 B2 C8 */ lfs f31, lit_3946(r2) -lbl_80245218: -/* 80245218 38 1E 00 0C */ addi r0, r30, 0xc -/* 8024521C 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 80245220 80 84 00 04 */ lwz r4, 4(r4) -/* 80245224 C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 80245228 D0 04 01 18 */ stfs f0, 0x118(r4) -/* 8024522C 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 80245230 80 64 00 04 */ lwz r3, 4(r4) -/* 80245234 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80245238 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 8024523C EC 41 00 28 */ fsubs f2, f1, f0 -/* 80245240 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80245244 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80245248 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8024524C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80245250 81 83 00 00 */ lwz r12, 0(r3) -/* 80245254 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80245258 7D 89 03 A6 */ mtctr r12 -/* 8024525C 4E 80 04 21 */ bctrl -/* 80245260 3B 7B 00 01 */ addi r27, r27, 1 -/* 80245264 2C 1B 00 03 */ cmpwi r27, 3 -/* 80245268 3B DE 00 04 */ addi r30, r30, 4 -/* 8024526C 41 80 FF AC */ blt lbl_80245218 -/* 80245270 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80245274 48 00 F0 75 */ bl getGlobalPosX__8CPaneMgrFv -/* 80245278 D0 3F 00 64 */ stfs f1, 0x64(r31) -/* 8024527C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80245280 48 00 F0 E5 */ bl getGlobalPosY__8CPaneMgrFv -/* 80245284 D0 3F 00 68 */ stfs f1, 0x68(r31) -/* 80245288 C0 02 B2 C0 */ lfs f0, lit_3944(r2) -/* 8024528C D0 1F 00 B4 */ stfs f0, 0xb4(r31) -/* 80245290 3B 60 00 00 */ li r27, 0 -/* 80245294 3B C0 00 00 */ li r30, 0 -lbl_80245298: -/* 80245298 38 1E 00 28 */ addi r0, r30, 0x28 -/* 8024529C 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 802452A0 28 04 00 00 */ cmplwi r4, 0 -/* 802452A4 41 82 00 74 */ beq lbl_80245318 -/* 802452A8 80 84 00 04 */ lwz r4, 4(r4) -/* 802452AC C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 802452B0 D0 04 01 18 */ stfs f0, 0x118(r4) -/* 802452B4 2C 1B 00 00 */ cmpwi r27, 0 -/* 802452B8 40 82 00 24 */ bne lbl_802452DC -/* 802452BC 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 802452C0 80 84 00 04 */ lwz r4, 4(r4) -/* 802452C4 C0 04 01 1C */ lfs f0, 0x11c(r4) -/* 802452C8 D0 1F 00 60 */ stfs f0, 0x60(r31) -/* 802452CC 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 802452D0 80 84 00 04 */ lwz r4, 4(r4) -/* 802452D4 C0 04 01 14 */ lfs f0, 0x114(r4) -/* 802452D8 D0 1F 00 84 */ stfs f0, 0x84(r31) -lbl_802452DC: -/* 802452DC 38 1E 00 28 */ addi r0, r30, 0x28 -/* 802452E0 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 802452E4 80 64 00 04 */ lwz r3, 4(r4) -/* 802452E8 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802452EC C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802452F0 EC 41 00 28 */ fsubs f2, f1, f0 -/* 802452F4 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 802452F8 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802452FC EC 21 00 28 */ fsubs f1, f1, f0 -/* 80245300 C0 02 B2 C8 */ lfs f0, lit_3946(r2) -/* 80245304 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80245308 81 83 00 00 */ lwz r12, 0(r3) -/* 8024530C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80245310 7D 89 03 A6 */ mtctr r12 -/* 80245314 4E 80 04 21 */ bctrl -lbl_80245318: -/* 80245318 3B 7B 00 01 */ addi r27, r27, 1 -/* 8024531C 2C 1B 00 03 */ cmpwi r27, 3 -/* 80245320 3B DE 00 04 */ addi r30, r30, 4 -/* 80245324 41 80 FF 74 */ blt lbl_80245298 -/* 80245328 7F E3 FB 78 */ mr r3, r31 -/* 8024532C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80245330 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80245334 39 61 00 20 */ addi r11, r1, 0x20 -/* 80245338 48 11 CE E9 */ bl _restgpr_27 -/* 8024533C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80245340 7C 08 03 A6 */ mtlr r0 -/* 80245344 38 21 00 30 */ addi r1, r1, 0x30 -/* 80245348 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_kanban/__dt__16dMsgScrnKanban_cFv.s b/asm/msg/scrn/d_msg_scrn_kanban/__dt__16dMsgScrnKanban_cFv.s deleted file mode 100644 index 470de4db477..00000000000 --- a/asm/msg/scrn/d_msg_scrn_kanban/__dt__16dMsgScrnKanban_cFv.s +++ /dev/null @@ -1,131 +0,0 @@ -lbl_8024534C: -/* 8024534C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80245350 7C 08 02 A6 */ mflr r0 -/* 80245354 90 01 00 24 */ stw r0, 0x24(r1) -/* 80245358 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024535C 48 11 CE 79 */ bl _savegpr_27 -/* 80245360 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80245364 7C 9F 23 78 */ mr r31, r4 -/* 80245368 41 82 01 A4 */ beq lbl_8024550C -/* 8024536C 3C 60 80 3C */ lis r3, __vt__16dMsgScrnKanban_c@ha /* 0x803C1240@ha */ -/* 80245370 38 03 12 40 */ addi r0, r3, __vt__16dMsgScrnKanban_c@l /* 0x803C1240@l */ -/* 80245374 90 1E 00 00 */ stw r0, 0(r30) -/* 80245378 80 7E 00 04 */ lwz r3, 4(r30) -/* 8024537C 28 03 00 00 */ cmplwi r3, 0 -/* 80245380 41 82 00 18 */ beq lbl_80245398 -/* 80245384 38 80 00 01 */ li r4, 1 -/* 80245388 81 83 00 00 */ lwz r12, 0(r3) -/* 8024538C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80245390 7D 89 03 A6 */ mtctr r12 -/* 80245394 4E 80 04 21 */ bctrl -lbl_80245398: -/* 80245398 38 00 00 00 */ li r0, 0 -/* 8024539C 90 1E 00 04 */ stw r0, 4(r30) -/* 802453A0 80 7E 00 CC */ lwz r3, 0xcc(r30) -/* 802453A4 28 03 00 00 */ cmplwi r3, 0 -/* 802453A8 41 82 00 18 */ beq lbl_802453C0 -/* 802453AC 38 80 00 01 */ li r4, 1 -/* 802453B0 81 83 00 00 */ lwz r12, 0(r3) -/* 802453B4 81 8C 00 08 */ lwz r12, 8(r12) -/* 802453B8 7D 89 03 A6 */ mtctr r12 -/* 802453BC 4E 80 04 21 */ bctrl -lbl_802453C0: -/* 802453C0 38 00 00 00 */ li r0, 0 -/* 802453C4 90 1E 00 CC */ stw r0, 0xcc(r30) -/* 802453C8 80 7E 00 D0 */ lwz r3, 0xd0(r30) -/* 802453CC 28 03 00 00 */ cmplwi r3, 0 -/* 802453D0 41 82 00 18 */ beq lbl_802453E8 -/* 802453D4 38 80 00 01 */ li r4, 1 -/* 802453D8 81 83 00 00 */ lwz r12, 0(r3) -/* 802453DC 81 8C 00 08 */ lwz r12, 8(r12) -/* 802453E0 7D 89 03 A6 */ mtctr r12 -/* 802453E4 4E 80 04 21 */ bctrl -lbl_802453E8: -/* 802453E8 38 00 00 00 */ li r0, 0 -/* 802453EC 90 1E 00 D0 */ stw r0, 0xd0(r30) -/* 802453F0 80 7E 00 08 */ lwz r3, 8(r30) -/* 802453F4 28 03 00 00 */ cmplwi r3, 0 -/* 802453F8 41 82 00 18 */ beq lbl_80245410 -/* 802453FC 38 80 00 01 */ li r4, 1 -/* 80245400 81 83 00 00 */ lwz r12, 0(r3) -/* 80245404 81 8C 00 08 */ lwz r12, 8(r12) -/* 80245408 7D 89 03 A6 */ mtctr r12 -/* 8024540C 4E 80 04 21 */ bctrl -lbl_80245410: -/* 80245410 38 00 00 00 */ li r0, 0 -/* 80245414 90 1E 00 08 */ stw r0, 8(r30) -/* 80245418 80 7E 00 C4 */ lwz r3, 0xc4(r30) -/* 8024541C 28 03 00 00 */ cmplwi r3, 0 -/* 80245420 41 82 00 18 */ beq lbl_80245438 -/* 80245424 38 80 00 01 */ li r4, 1 -/* 80245428 81 83 00 00 */ lwz r12, 0(r3) -/* 8024542C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80245430 7D 89 03 A6 */ mtctr r12 -/* 80245434 4E 80 04 21 */ bctrl -lbl_80245438: -/* 80245438 38 00 00 00 */ li r0, 0 -/* 8024543C 90 1E 00 C4 */ stw r0, 0xc4(r30) -/* 80245440 80 7E 00 C8 */ lwz r3, 0xc8(r30) -/* 80245444 28 03 00 00 */ cmplwi r3, 0 -/* 80245448 41 82 00 18 */ beq lbl_80245460 -/* 8024544C 38 80 00 01 */ li r4, 1 -/* 80245450 81 83 00 00 */ lwz r12, 0(r3) -/* 80245454 81 8C 00 08 */ lwz r12, 8(r12) -/* 80245458 7D 89 03 A6 */ mtctr r12 -/* 8024545C 4E 80 04 21 */ bctrl -lbl_80245460: -/* 80245460 3B A0 00 00 */ li r29, 0 -/* 80245464 93 BE 00 C8 */ stw r29, 0xc8(r30) -/* 80245468 3B 60 00 00 */ li r27, 0 -lbl_8024546C: -/* 8024546C 7F 9E EA 14 */ add r28, r30, r29 -/* 80245470 80 7C 00 0C */ lwz r3, 0xc(r28) -/* 80245474 28 03 00 00 */ cmplwi r3, 0 -/* 80245478 41 82 00 18 */ beq lbl_80245490 -/* 8024547C 38 80 00 01 */ li r4, 1 -/* 80245480 81 83 00 00 */ lwz r12, 0(r3) -/* 80245484 81 8C 00 08 */ lwz r12, 8(r12) -/* 80245488 7D 89 03 A6 */ mtctr r12 -/* 8024548C 4E 80 04 21 */ bctrl -lbl_80245490: -/* 80245490 38 00 00 00 */ li r0, 0 -/* 80245494 90 1C 00 0C */ stw r0, 0xc(r28) -/* 80245498 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 8024549C 28 03 00 00 */ cmplwi r3, 0 -/* 802454A0 41 82 00 24 */ beq lbl_802454C4 -/* 802454A4 41 82 00 18 */ beq lbl_802454BC -/* 802454A8 38 80 00 01 */ li r4, 1 -/* 802454AC 81 83 00 00 */ lwz r12, 0(r3) -/* 802454B0 81 8C 00 08 */ lwz r12, 8(r12) -/* 802454B4 7D 89 03 A6 */ mtctr r12 -/* 802454B8 4E 80 04 21 */ bctrl -lbl_802454BC: -/* 802454BC 38 00 00 00 */ li r0, 0 -/* 802454C0 90 1C 00 28 */ stw r0, 0x28(r28) -lbl_802454C4: -/* 802454C4 3B 7B 00 01 */ addi r27, r27, 1 -/* 802454C8 2C 1B 00 03 */ cmpwi r27, 3 -/* 802454CC 3B BD 00 04 */ addi r29, r29, 4 -/* 802454D0 41 80 FF 9C */ blt lbl_8024546C -/* 802454D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802454D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802454DC 80 63 5C 74 */ lwz r3, 0x5c74(r3) -/* 802454E0 81 83 00 00 */ lwz r12, 0(r3) -/* 802454E4 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802454E8 7D 89 03 A6 */ mtctr r12 -/* 802454EC 4E 80 04 21 */ bctrl -/* 802454F0 7F C3 F3 78 */ mr r3, r30 -/* 802454F4 38 80 00 00 */ li r4, 0 -/* 802454F8 4B FF 6C 2D */ bl __dt__14dMsgScrnBase_cFv -/* 802454FC 7F E0 07 35 */ extsh. r0, r31 -/* 80245500 40 81 00 0C */ ble lbl_8024550C -/* 80245504 7F C3 F3 78 */ mr r3, r30 -/* 80245508 48 08 98 35 */ bl __dl__FPv -lbl_8024550C: -/* 8024550C 7F C3 F3 78 */ mr r3, r30 -/* 80245510 39 61 00 20 */ addi r11, r1, 0x20 -/* 80245514 48 11 CD 0D */ bl _restgpr_27 -/* 80245518 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024551C 7C 08 03 A6 */ mtlr r0 -/* 80245520 38 21 00 20 */ addi r1, r1, 0x20 -/* 80245524 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_kanban/draw__16dMsgScrnKanban_cFv.s b/asm/msg/scrn/d_msg_scrn_kanban/draw__16dMsgScrnKanban_cFv.s deleted file mode 100644 index 982995513ac..00000000000 --- a/asm/msg/scrn/d_msg_scrn_kanban/draw__16dMsgScrnKanban_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80245618: -/* 80245618 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024561C 7C 08 02 A6 */ mflr r0 -/* 80245620 90 01 00 14 */ stw r0, 0x14(r1) -/* 80245624 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80245628 93 C1 00 08 */ stw r30, 8(r1) -/* 8024562C 7C 7E 1B 78 */ mr r30, r3 -/* 80245630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80245634 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80245638 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 8024563C 7F E3 FB 78 */ mr r3, r31 -/* 80245640 81 9F 00 00 */ lwz r12, 0(r31) -/* 80245644 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80245648 7D 89 03 A6 */ mtctr r12 -/* 8024564C 4E 80 04 21 */ bctrl -/* 80245650 80 7E 00 04 */ lwz r3, 4(r30) -/* 80245654 C0 22 B2 C0 */ lfs f1, lit_3944(r2) -/* 80245658 FC 40 08 90 */ fmr f2, f1 -/* 8024565C 7F E4 FB 78 */ mr r4, r31 -/* 80245660 48 0B 38 75 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 80245664 80 7E 00 44 */ lwz r3, 0x44(r30) -/* 80245668 38 80 00 00 */ li r4, 0 -/* 8024566C C0 22 B2 C0 */ lfs f1, lit_3944(r2) -/* 80245670 FC 40 08 90 */ fmr f2, f1 -/* 80245674 C0 62 B2 C4 */ lfs f3, lit_3945(r2) -/* 80245678 81 83 00 00 */ lwz r12, 0(r3) -/* 8024567C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80245680 7D 89 03 A6 */ mtctr r12 -/* 80245684 4E 80 04 21 */ bctrl -/* 80245688 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024568C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80245690 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80245694 7C 08 03 A6 */ mtlr r0 -/* 80245698 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024569C 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_kanban/exec__16dMsgScrnKanban_cFv.s b/asm/msg/scrn/d_msg_scrn_kanban/exec__16dMsgScrnKanban_cFv.s deleted file mode 100644 index 600b19e2cfc..00000000000 --- a/asm/msg/scrn/d_msg_scrn_kanban/exec__16dMsgScrnKanban_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80245528: -/* 80245528 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024552C 7C 08 02 A6 */ mflr r0 -/* 80245530 90 01 00 24 */ stw r0, 0x24(r1) -/* 80245534 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80245538 7C 7F 1B 78 */ mr r31, r3 -/* 8024553C C0 23 00 D8 */ lfs f1, 0xd8(r3) -/* 80245540 C0 02 B2 C4 */ lfs f0, lit_3945(r2) -/* 80245544 EC 01 00 2A */ fadds f0, f1, f0 -/* 80245548 D0 03 00 D8 */ stfs f0, 0xd8(r3) -/* 8024554C 80 63 00 D0 */ lwz r3, 0xd0(r3) -/* 80245550 A8 03 00 06 */ lha r0, 6(r3) -/* 80245554 C0 5F 00 D8 */ lfs f2, 0xd8(r31) -/* 80245558 C8 22 B2 D0 */ lfd f1, lit_4033(r2) -/* 8024555C 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 80245560 90 61 00 0C */ stw r3, 0xc(r1) -/* 80245564 3C 00 43 30 */ lis r0, 0x4330 -/* 80245568 90 01 00 08 */ stw r0, 8(r1) -/* 8024556C C8 01 00 08 */ lfd f0, 8(r1) -/* 80245570 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80245574 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80245578 4C 41 13 82 */ cror 2, 1, 2 -/* 8024557C 40 82 00 1C */ bne lbl_80245598 -/* 80245580 90 61 00 0C */ stw r3, 0xc(r1) -/* 80245584 90 01 00 08 */ stw r0, 8(r1) -/* 80245588 C8 01 00 08 */ lfd f0, 8(r1) -/* 8024558C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80245590 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80245594 D0 1F 00 D8 */ stfs f0, 0xd8(r31) -lbl_80245598: -/* 80245598 C0 1F 00 D8 */ lfs f0, 0xd8(r31) -/* 8024559C 80 7F 00 D0 */ lwz r3, 0xd0(r31) -/* 802455A0 D0 03 00 08 */ stfs f0, 8(r3) -/* 802455A4 80 7F 00 04 */ lwz r3, 4(r31) -/* 802455A8 48 0B 40 E9 */ bl animation__9J2DScreenFv -/* 802455AC 7F E3 FB 78 */ mr r3, r31 -/* 802455B0 4B FF 6F C5 */ bl isTalkNow__14dMsgScrnBase_cFv -/* 802455B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802455B8 41 82 00 1C */ beq lbl_802455D4 -/* 802455BC 7F E3 FB 78 */ mr r3, r31 -/* 802455C0 C0 22 B2 C4 */ lfs f1, lit_3945(r2) -/* 802455C4 81 9F 00 00 */ lwz r12, 0(r31) -/* 802455C8 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 802455CC 7D 89 03 A6 */ mtctr r12 -/* 802455D0 4E 80 04 21 */ bctrl -lbl_802455D4: -/* 802455D4 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802455D8 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802455DC C0 24 00 AC */ lfs f1, 0xac(r4) -/* 802455E0 80 7F 00 08 */ lwz r3, 8(r31) -/* 802455E4 80 63 00 04 */ lwz r3, 4(r3) -/* 802455E8 C0 04 00 80 */ lfs f0, 0x80(r4) -/* 802455EC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802455F0 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 802455F4 81 83 00 00 */ lwz r12, 0(r3) -/* 802455F8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802455FC 7D 89 03 A6 */ mtctr r12 -/* 80245600 4E 80 04 21 */ bctrl -/* 80245604 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80245608 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024560C 7C 08 03 A6 */ mtlr r0 -/* 80245610 38 21 00 20 */ addi r1, r1, 0x20 -/* 80245614 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_kanban/fukiAlpha__16dMsgScrnKanban_cFf.s b/asm/msg/scrn/d_msg_scrn_kanban/fukiAlpha__16dMsgScrnKanban_cFf.s deleted file mode 100644 index db1f254bc04..00000000000 --- a/asm/msg/scrn/d_msg_scrn_kanban/fukiAlpha__16dMsgScrnKanban_cFf.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_802456A0: -/* 802456A0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802456A4 7C 08 02 A6 */ mflr r0 -/* 802456A8 90 01 00 34 */ stw r0, 0x34(r1) -/* 802456AC DB E1 00 20 */ stfd f31, 0x20(r1) -/* 802456B0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 802456B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802456B8 48 11 CB 21 */ bl _savegpr_28 -/* 802456BC 7C 7C 1B 78 */ mr r28, r3 -/* 802456C0 FF E0 08 90 */ fmr f31, f1 -/* 802456C4 80 63 00 C4 */ lwz r3, 0xc4(r3) -/* 802456C8 48 01 01 09 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802456CC 80 7C 00 08 */ lwz r3, 8(r28) -/* 802456D0 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802456D4 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802456D8 C0 04 00 28 */ lfs f0, 0x28(r4) -/* 802456DC EC 3F 00 32 */ fmuls f1, f31, f0 -/* 802456E0 48 01 00 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802456E4 80 7C 00 C8 */ lwz r3, 0xc8(r28) -/* 802456E8 FC 20 F8 90 */ fmr f1, f31 -/* 802456EC 48 01 00 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802456F0 3B A0 00 00 */ li r29, 0 -/* 802456F4 3B E0 00 00 */ li r31, 0 -lbl_802456F8: -/* 802456F8 7F DC FA 14 */ add r30, r28, r31 -/* 802456FC 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80245700 C0 1C 00 BC */ lfs f0, 0xbc(r28) -/* 80245704 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80245708 48 01 00 C9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8024570C 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80245710 28 03 00 00 */ cmplwi r3, 0 -/* 80245714 41 82 00 10 */ beq lbl_80245724 -/* 80245718 C0 1C 00 BC */ lfs f0, 0xbc(r28) -/* 8024571C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80245720 48 01 00 B1 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80245724: -/* 80245724 3B BD 00 01 */ addi r29, r29, 1 -/* 80245728 2C 1D 00 03 */ cmpwi r29, 3 -/* 8024572C 3B FF 00 04 */ addi r31, r31, 4 -/* 80245730 41 80 FF C8 */ blt lbl_802456F8 -/* 80245734 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80245738 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 8024573C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80245740 48 11 CA E5 */ bl _restgpr_28 -/* 80245744 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80245748 7C 08 03 A6 */ mtlr r0 -/* 8024574C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80245750 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_light/__ct__15dMsgScrnLight_cFUcUc.s b/asm/msg/scrn/d_msg_scrn_light/__ct__15dMsgScrnLight_cFUcUc.s deleted file mode 100644 index 7c43ddeb377..00000000000 --- a/asm/msg/scrn/d_msg_scrn_light/__ct__15dMsgScrnLight_cFUcUc.s +++ /dev/null @@ -1,119 +0,0 @@ -lbl_80245934: -/* 80245934 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80245938 7C 08 02 A6 */ mflr r0 -/* 8024593C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80245940 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80245944 93 C1 00 08 */ stw r30, 8(r1) -/* 80245948 7C 7F 1B 78 */ mr r31, r3 -/* 8024594C 3C C0 80 3C */ lis r6, __vt__15dMsgScrnLight_c@ha /* 0x803C1298@ha */ -/* 80245950 38 06 12 98 */ addi r0, r6, __vt__15dMsgScrnLight_c@l /* 0x803C1298@l */ -/* 80245954 90 03 00 00 */ stw r0, 0(r3) -/* 80245958 98 83 00 20 */ stb r4, 0x20(r3) -/* 8024595C 98 A3 00 21 */ stb r5, 0x21(r3) -/* 80245960 88 0D 8B 58 */ lbz r0, data_804510D8(r13) -/* 80245964 28 00 00 00 */ cmplwi r0, 0 -/* 80245968 40 82 00 14 */ bne lbl_8024597C -/* 8024596C 38 00 FF FF */ li r0, -1 -/* 80245970 3C A0 80 43 */ lis r5, g_MsgScrnLight_HIO_c@ha /* 0x804306D4@ha */ -/* 80245974 38 A5 06 D4 */ addi r5, r5, g_MsgScrnLight_HIO_c@l /* 0x804306D4@l */ -/* 80245978 98 05 00 04 */ stb r0, 4(r5) -lbl_8024597C: -/* 8024597C 88 AD 8B 58 */ lbz r5, data_804510D8(r13) -/* 80245980 38 05 00 01 */ addi r0, r5, 1 -/* 80245984 98 0D 8B 58 */ stb r0, data_804510D8(r13) -/* 80245988 3C A0 80 43 */ lis r5, g_MsgScrnLight_HIO_c@ha /* 0x804306D4@ha */ -/* 8024598C 38 65 06 D4 */ addi r3, r5, g_MsgScrnLight_HIO_c@l /* 0x804306D4@l */ -/* 80245990 4B FF FE 35 */ bl updateColor__19dMsgScrnLight_HIO_cFUc -/* 80245994 38 60 01 18 */ li r3, 0x118 -/* 80245998 48 08 92 B5 */ bl __nw__FUl -/* 8024599C 7C 60 1B 79 */ or. r0, r3, r3 -/* 802459A0 41 82 00 0C */ beq lbl_802459AC -/* 802459A4 48 0B 2A F5 */ bl __ct__9J2DScreenFv -/* 802459A8 7C 60 1B 78 */ mr r0, r3 -lbl_802459AC: -/* 802459AC 90 1F 00 04 */ stw r0, 4(r31) -/* 802459B0 80 7F 00 04 */ lwz r3, 4(r31) -/* 802459B4 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_light__stringBase0@ha /* 0x80399B08@ha */ -/* 802459B8 38 84 9B 08 */ addi r4, r4, msg_scrn_d_msg_scrn_light__stringBase0@l /* 0x80399B08@l */ -/* 802459BC 3C A0 00 02 */ lis r5, 2 -/* 802459C0 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802459C4 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802459C8 80 DE 5D 30 */ lwz r6, 0x5d30(r30) -/* 802459CC 48 0B 2C 7D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 802459D0 80 7F 00 04 */ lwz r3, 4(r31) -/* 802459D4 48 00 F7 15 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 802459D8 38 60 00 04 */ li r3, 4 -/* 802459DC 64 63 00 04 */ oris r3, r3, 4 -/* 802459E0 7C 72 E3 A6 */ mtspr 0x392, r3 -/* 802459E4 38 60 00 05 */ li r3, 5 -/* 802459E8 64 63 00 05 */ oris r3, r3, 5 -/* 802459EC 7C 73 E3 A6 */ mtspr 0x393, r3 -/* 802459F0 38 60 00 06 */ li r3, 6 -/* 802459F4 64 63 00 06 */ oris r3, r3, 6 -/* 802459F8 7C 74 E3 A6 */ mtspr 0x394, r3 -/* 802459FC 38 60 00 07 */ li r3, 7 -/* 80245A00 64 63 00 07 */ oris r3, r3, 7 -/* 80245A04 7C 75 E3 A6 */ mtspr 0x395, r3 -/* 80245A08 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_light__stringBase0@ha /* 0x80399B08@ha */ -/* 80245A0C 38 84 9B 08 */ addi r4, r4, msg_scrn_d_msg_scrn_light__stringBase0@l /* 0x80399B08@l */ -/* 80245A10 38 64 00 24 */ addi r3, r4, 0x24 -/* 80245A14 80 9E 5D 30 */ lwz r4, 0x5d30(r30) -/* 80245A18 48 08 E8 59 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80245A1C 48 0C 30 51 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80245A20 90 7F 00 08 */ stw r3, 8(r31) -/* 80245A24 C0 02 B2 D8 */ lfs f0, lit_3808(r2) -/* 80245A28 D0 1F 00 14 */ stfs f0, 0x14(r31) -/* 80245A2C 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_light__stringBase0@ha /* 0x80399B08@ha */ -/* 80245A30 38 84 9B 08 */ addi r4, r4, msg_scrn_d_msg_scrn_light__stringBase0@l /* 0x80399B08@l */ -/* 80245A34 38 64 00 48 */ addi r3, r4, 0x48 -/* 80245A38 80 9E 5D 30 */ lwz r4, 0x5d30(r30) -/* 80245A3C 48 08 E8 35 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80245A40 48 0C 30 2D */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80245A44 90 7F 00 0C */ stw r3, 0xc(r31) -/* 80245A48 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80245A4C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80245A50 81 83 00 00 */ lwz r12, 0(r3) -/* 80245A54 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80245A58 7D 89 03 A6 */ mtctr r12 -/* 80245A5C 4E 80 04 21 */ bctrl -/* 80245A60 C0 02 B2 D8 */ lfs f0, lit_3808(r2) -/* 80245A64 D0 1F 00 18 */ stfs f0, 0x18(r31) -/* 80245A68 38 60 00 6C */ li r3, 0x6c -/* 80245A6C 48 08 91 E1 */ bl __nw__FUl -/* 80245A70 7C 60 1B 79 */ or. r0, r3, r3 -/* 80245A74 41 82 00 24 */ beq lbl_80245A98 -/* 80245A78 80 9F 00 04 */ lwz r4, 4(r31) -/* 80245A7C 3C A0 79 61 */ lis r5, 0x7961 /* 0x79613030@ha */ -/* 80245A80 38 C5 30 30 */ addi r6, r5, 0x3030 /* 0x79613030@l */ -/* 80245A84 38 A0 6D 6F */ li r5, 0x6d6f -/* 80245A88 38 E0 00 00 */ li r7, 0 -/* 80245A8C 39 00 00 00 */ li r8, 0 -/* 80245A90 48 00 DE F5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80245A94 7C 60 1B 78 */ mr r0, r3 -lbl_80245A98: -/* 80245A98 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80245A9C 80 9F 00 10 */ lwz r4, 0x10(r31) -/* 80245AA0 80 64 00 04 */ lwz r3, 4(r4) -/* 80245AA4 80 9F 00 08 */ lwz r4, 8(r31) -/* 80245AA8 81 83 00 00 */ lwz r12, 0(r3) -/* 80245AAC 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80245AB0 7D 89 03 A6 */ mtctr r12 -/* 80245AB4 4E 80 04 21 */ bctrl -/* 80245AB8 80 9F 00 10 */ lwz r4, 0x10(r31) -/* 80245ABC 80 64 00 04 */ lwz r3, 4(r4) -/* 80245AC0 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 80245AC4 81 83 00 00 */ lwz r12, 0(r3) -/* 80245AC8 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 80245ACC 7D 89 03 A6 */ mtctr r12 -/* 80245AD0 4E 80 04 21 */ bctrl -/* 80245AD4 38 00 00 01 */ li r0, 1 -/* 80245AD8 98 1F 00 22 */ stb r0, 0x22(r31) -/* 80245ADC C0 02 B2 D8 */ lfs f0, lit_3808(r2) -/* 80245AE0 D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 80245AE4 7F E3 FB 78 */ mr r3, r31 -/* 80245AE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80245AEC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80245AF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80245AF4 7C 08 03 A6 */ mtlr r0 -/* 80245AF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80245AFC 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_light/__ct__19dMsgScrnLight_HIO_cFv.s b/asm/msg/scrn/d_msg_scrn_light/__ct__19dMsgScrnLight_HIO_cFv.s deleted file mode 100644 index b18550e9c1c..00000000000 --- a/asm/msg/scrn/d_msg_scrn_light/__ct__19dMsgScrnLight_HIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8024575C: -/* 8024575C 3C 80 80 3C */ lis r4, __vt__19dMsgScrnLight_HIO_c@ha /* 0x803C12A4@ha */ -/* 80245760 38 04 12 A4 */ addi r0, r4, __vt__19dMsgScrnLight_HIO_c@l /* 0x803C12A4@l */ -/* 80245764 90 03 00 00 */ stw r0, 0(r3) -/* 80245768 39 40 00 00 */ li r10, 0 -/* 8024576C 99 43 00 05 */ stb r10, 5(r3) -/* 80245770 39 80 00 00 */ li r12, 0 -/* 80245774 39 20 00 A0 */ li r9, 0xa0 -/* 80245778 39 00 00 87 */ li r8, 0x87 -/* 8024577C 38 E0 00 14 */ li r7, 0x14 -/* 80245780 38 C0 00 E1 */ li r6, 0xe1 -/* 80245784 38 A0 00 D2 */ li r5, 0xd2 -/* 80245788 38 80 00 6E */ li r4, 0x6e -/* 8024578C 38 00 00 09 */ li r0, 9 -/* 80245790 7C 09 03 A6 */ mtctr r0 -lbl_80245794: -/* 80245794 7D 63 62 14 */ add r11, r3, r12 -/* 80245798 99 2B 00 06 */ stb r9, 6(r11) -/* 8024579C 99 0B 00 18 */ stb r8, 0x18(r11) -/* 802457A0 98 EB 00 2A */ stb r7, 0x2a(r11) -/* 802457A4 99 4B 00 3C */ stb r10, 0x3c(r11) -/* 802457A8 98 CB 00 0F */ stb r6, 0xf(r11) -/* 802457AC 98 AB 00 21 */ stb r5, 0x21(r11) -/* 802457B0 98 8B 00 33 */ stb r4, 0x33(r11) -/* 802457B4 98 AB 00 45 */ stb r5, 0x45(r11) -/* 802457B8 39 8C 00 01 */ addi r12, r12, 1 -/* 802457BC 42 00 FF D8 */ bdnz lbl_80245794 -/* 802457C0 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_light/__dt__15dMsgScrnLight_cFv.s b/asm/msg/scrn/d_msg_scrn_light/__dt__15dMsgScrnLight_cFv.s deleted file mode 100644 index 8447cbfd4fd..00000000000 --- a/asm/msg/scrn/d_msg_scrn_light/__dt__15dMsgScrnLight_cFv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_80245B00: -/* 80245B00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80245B04 7C 08 02 A6 */ mflr r0 -/* 80245B08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80245B0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80245B10 93 C1 00 08 */ stw r30, 8(r1) -/* 80245B14 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80245B18 7C 9F 23 78 */ mr r31, r4 -/* 80245B1C 41 82 00 CC */ beq lbl_80245BE8 -/* 80245B20 3C 60 80 3C */ lis r3, __vt__15dMsgScrnLight_c@ha /* 0x803C1298@ha */ -/* 80245B24 38 03 12 98 */ addi r0, r3, __vt__15dMsgScrnLight_c@l /* 0x803C1298@l */ -/* 80245B28 90 1E 00 00 */ stw r0, 0(r30) -/* 80245B2C 88 6D 8B 58 */ lbz r3, data_804510D8(r13) -/* 80245B30 38 03 FF FF */ addi r0, r3, -1 -/* 80245B34 98 0D 8B 58 */ stb r0, data_804510D8(r13) -/* 80245B38 80 7E 00 04 */ lwz r3, 4(r30) -/* 80245B3C 28 03 00 00 */ cmplwi r3, 0 -/* 80245B40 41 82 00 18 */ beq lbl_80245B58 -/* 80245B44 38 80 00 01 */ li r4, 1 -/* 80245B48 81 83 00 00 */ lwz r12, 0(r3) -/* 80245B4C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80245B50 7D 89 03 A6 */ mtctr r12 -/* 80245B54 4E 80 04 21 */ bctrl -lbl_80245B58: -/* 80245B58 38 00 00 00 */ li r0, 0 -/* 80245B5C 90 1E 00 04 */ stw r0, 4(r30) -/* 80245B60 80 7E 00 08 */ lwz r3, 8(r30) -/* 80245B64 28 03 00 00 */ cmplwi r3, 0 -/* 80245B68 41 82 00 18 */ beq lbl_80245B80 -/* 80245B6C 38 80 00 01 */ li r4, 1 -/* 80245B70 81 83 00 00 */ lwz r12, 0(r3) -/* 80245B74 81 8C 00 08 */ lwz r12, 8(r12) -/* 80245B78 7D 89 03 A6 */ mtctr r12 -/* 80245B7C 4E 80 04 21 */ bctrl -lbl_80245B80: -/* 80245B80 38 00 00 00 */ li r0, 0 -/* 80245B84 90 1E 00 08 */ stw r0, 8(r30) -/* 80245B88 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80245B8C 28 03 00 00 */ cmplwi r3, 0 -/* 80245B90 41 82 00 18 */ beq lbl_80245BA8 -/* 80245B94 38 80 00 01 */ li r4, 1 -/* 80245B98 81 83 00 00 */ lwz r12, 0(r3) -/* 80245B9C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80245BA0 7D 89 03 A6 */ mtctr r12 -/* 80245BA4 4E 80 04 21 */ bctrl -lbl_80245BA8: -/* 80245BA8 38 00 00 00 */ li r0, 0 -/* 80245BAC 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80245BB0 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245BB4 28 03 00 00 */ cmplwi r3, 0 -/* 80245BB8 41 82 00 18 */ beq lbl_80245BD0 -/* 80245BBC 38 80 00 01 */ li r4, 1 -/* 80245BC0 81 83 00 00 */ lwz r12, 0(r3) -/* 80245BC4 81 8C 00 08 */ lwz r12, 8(r12) -/* 80245BC8 7D 89 03 A6 */ mtctr r12 -/* 80245BCC 4E 80 04 21 */ bctrl -lbl_80245BD0: -/* 80245BD0 38 00 00 00 */ li r0, 0 -/* 80245BD4 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80245BD8 7F E0 07 35 */ extsh. r0, r31 -/* 80245BDC 40 81 00 0C */ ble lbl_80245BE8 -/* 80245BE0 7F C3 F3 78 */ mr r3, r30 -/* 80245BE4 48 08 91 59 */ bl __dl__FPv -lbl_80245BE8: -/* 80245BE8 7F C3 F3 78 */ mr r3, r30 -/* 80245BEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80245BF0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80245BF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80245BF8 7C 08 03 A6 */ mtlr r0 -/* 80245BFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80245C00 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_light/__dt__19dMsgScrnLight_HIO_cFv.s b/asm/msg/scrn/d_msg_scrn_light/__dt__19dMsgScrnLight_HIO_cFv.s deleted file mode 100644 index 8f0ebe8e416..00000000000 --- a/asm/msg/scrn/d_msg_scrn_light/__dt__19dMsgScrnLight_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80246348: -/* 80246348 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024634C 7C 08 02 A6 */ mflr r0 -/* 80246350 90 01 00 14 */ stw r0, 0x14(r1) -/* 80246354 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80246358 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8024635C 41 82 00 1C */ beq lbl_80246378 -/* 80246360 3C A0 80 3C */ lis r5, __vt__19dMsgScrnLight_HIO_c@ha /* 0x803C12A4@ha */ -/* 80246364 38 05 12 A4 */ addi r0, r5, __vt__19dMsgScrnLight_HIO_c@l /* 0x803C12A4@l */ -/* 80246368 90 1F 00 00 */ stw r0, 0(r31) -/* 8024636C 7C 80 07 35 */ extsh. r0, r4 -/* 80246370 40 81 00 08 */ ble lbl_80246378 -/* 80246374 48 08 89 C9 */ bl __dl__FPv -lbl_80246378: -/* 80246378 7F E3 FB 78 */ mr r3, r31 -/* 8024637C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80246380 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80246384 7C 08 03 A6 */ mtlr r0 -/* 80246388 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024638C 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_light/__sinit_d_msg_scrn_light_cpp.s b/asm/msg/scrn/d_msg_scrn_light/__sinit_d_msg_scrn_light_cpp.s deleted file mode 100644 index 1cab920d074..00000000000 --- a/asm/msg/scrn/d_msg_scrn_light/__sinit_d_msg_scrn_light_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80246390: -/* 80246390 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80246394 7C 08 02 A6 */ mflr r0 -/* 80246398 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024639C 3C 60 80 43 */ lis r3, g_MsgScrnLight_HIO_c@ha /* 0x804306D4@ha */ -/* 802463A0 38 63 06 D4 */ addi r3, r3, g_MsgScrnLight_HIO_c@l /* 0x804306D4@l */ -/* 802463A4 4B FF F3 B9 */ bl __ct__19dMsgScrnLight_HIO_cFv -/* 802463A8 3C 80 80 24 */ lis r4, __dt__19dMsgScrnLight_HIO_cFv@ha /* 0x80246348@ha */ -/* 802463AC 38 84 63 48 */ addi r4, r4, __dt__19dMsgScrnLight_HIO_cFv@l /* 0x80246348@l */ -/* 802463B0 3C A0 80 43 */ lis r5, lit_3735@ha /* 0x804306C8@ha */ -/* 802463B4 38 A5 06 C8 */ addi r5, r5, lit_3735@l /* 0x804306C8@l */ -/* 802463B8 48 11 B8 6D */ bl __register_global_object -/* 802463BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802463C0 7C 08 03 A6 */ mtlr r0 -/* 802463C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802463C8 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_light/drawCommon__15dMsgScrnLight_cFfffff.s b/asm/msg/scrn/d_msg_scrn_light/drawCommon__15dMsgScrnLight_cFfffff.s deleted file mode 100644 index fac22d2e9a8..00000000000 --- a/asm/msg/scrn/d_msg_scrn_light/drawCommon__15dMsgScrnLight_cFfffff.s +++ /dev/null @@ -1,164 +0,0 @@ -lbl_802460DC: -/* 802460DC 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802460E0 7C 08 02 A6 */ mflr r0 -/* 802460E4 90 01 00 74 */ stw r0, 0x74(r1) -/* 802460E8 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 802460EC F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 802460F0 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 802460F4 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 802460F8 DB A1 00 40 */ stfd f29, 0x40(r1) -/* 802460FC F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* qr0 */ -/* 80246100 DB 81 00 30 */ stfd f28, 0x30(r1) -/* 80246104 F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 /* qr0 */ -/* 80246108 DB 61 00 20 */ stfd f27, 0x20(r1) -/* 8024610C F3 61 00 28 */ psq_st f27, 40(r1), 0, 0 /* qr0 */ -/* 80246110 DB 41 00 10 */ stfd f26, 0x10(r1) -/* 80246114 F3 41 00 18 */ psq_st f26, 24(r1), 0, 0 /* qr0 */ -/* 80246118 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024611C 93 C1 00 08 */ stw r30, 8(r1) -/* 80246120 7C 7E 1B 78 */ mr r30, r3 -/* 80246124 FF 40 08 90 */ fmr f26, f1 -/* 80246128 FF 60 10 90 */ fmr f27, f2 -/* 8024612C FF 80 18 90 */ fmr f28, f3 -/* 80246130 FF A0 20 90 */ fmr f29, f4 -/* 80246134 FF C0 28 90 */ fmr f30, f5 -/* 80246138 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024613C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80246140 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 80246144 7F E3 FB 78 */ mr r3, r31 -/* 80246148 81 9F 00 00 */ lwz r12, 0(r31) -/* 8024614C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80246150 7D 89 03 A6 */ mtctr r12 -/* 80246154 4E 80 04 21 */ bctrl -/* 80246158 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 8024615C 48 00 F6 CD */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 80246160 FF E0 08 90 */ fmr f31, f1 -/* 80246164 88 1E 00 21 */ lbz r0, 0x21(r30) -/* 80246168 28 00 00 03 */ cmplwi r0, 3 -/* 8024616C 41 82 00 0C */ beq lbl_80246178 -/* 80246170 28 00 00 05 */ cmplwi r0, 5 -/* 80246174 40 82 00 10 */ bne lbl_80246184 -lbl_80246178: -/* 80246178 C0 1E 00 1C */ lfs f0, 0x1c(r30) -/* 8024617C FC 1E 00 40 */ fcmpo cr0, f30, f0 -/* 80246180 41 80 00 20 */ blt lbl_802461A0 -lbl_80246184: -/* 80246184 28 00 00 03 */ cmplwi r0, 3 -/* 80246188 41 82 00 74 */ beq lbl_802461FC -/* 8024618C 28 00 00 05 */ cmplwi r0, 5 -/* 80246190 41 82 00 6C */ beq lbl_802461FC -/* 80246194 C0 02 B2 DC */ lfs f0, lit_3869(r2) -/* 80246198 FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 8024619C 41 82 00 60 */ beq lbl_802461FC -lbl_802461A0: -/* 802461A0 88 1E 00 22 */ lbz r0, 0x22(r30) -/* 802461A4 28 00 00 00 */ cmplwi r0, 0 -/* 802461A8 41 82 00 44 */ beq lbl_802461EC -/* 802461AC 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 802461B0 80 63 00 04 */ lwz r3, 4(r3) -/* 802461B4 38 80 00 00 */ li r4, 0 -/* 802461B8 81 83 00 00 */ lwz r12, 0(r3) -/* 802461BC 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 802461C0 7D 89 03 A6 */ mtctr r12 -/* 802461C4 4E 80 04 21 */ bctrl -/* 802461C8 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 802461CC 80 63 00 04 */ lwz r3, 4(r3) -/* 802461D0 38 80 00 00 */ li r4, 0 -/* 802461D4 81 83 00 00 */ lwz r12, 0(r3) -/* 802461D8 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 802461DC 7D 89 03 A6 */ mtctr r12 -/* 802461E0 4E 80 04 21 */ bctrl -/* 802461E4 38 00 00 00 */ li r0, 0 -/* 802461E8 98 1E 00 22 */ stb r0, 0x22(r30) -lbl_802461EC: -/* 802461EC 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 802461F0 EC 3F 07 B2 */ fmuls f1, f31, f30 -/* 802461F4 48 00 F5 DD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802461F8 48 00 00 50 */ b lbl_80246248 -lbl_802461FC: -/* 802461FC 88 1E 00 22 */ lbz r0, 0x22(r30) -/* 80246200 28 00 00 00 */ cmplwi r0, 0 -/* 80246204 40 82 00 44 */ bne lbl_80246248 -/* 80246208 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 8024620C 80 63 00 04 */ lwz r3, 4(r3) -/* 80246210 80 9E 00 08 */ lwz r4, 8(r30) -/* 80246214 81 83 00 00 */ lwz r12, 0(r3) -/* 80246218 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 8024621C 7D 89 03 A6 */ mtctr r12 -/* 80246220 4E 80 04 21 */ bctrl -/* 80246224 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80246228 80 63 00 04 */ lwz r3, 4(r3) -/* 8024622C 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 80246230 81 83 00 00 */ lwz r12, 0(r3) -/* 80246234 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 80246238 7D 89 03 A6 */ mtctr r12 -/* 8024623C 4E 80 04 21 */ bctrl -/* 80246240 38 00 00 01 */ li r0, 1 -/* 80246244 98 1E 00 22 */ stb r0, 0x22(r30) -lbl_80246248: -/* 80246248 88 1E 00 22 */ lbz r0, 0x22(r30) -/* 8024624C 28 00 00 00 */ cmplwi r0, 0 -/* 80246250 41 82 00 30 */ beq lbl_80246280 -/* 80246254 C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 80246258 80 7E 00 08 */ lwz r3, 8(r30) -/* 8024625C D0 03 00 08 */ stfs f0, 8(r3) -/* 80246260 C0 1E 00 18 */ lfs f0, 0x18(r30) -/* 80246264 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80246268 D0 03 00 08 */ stfs f0, 8(r3) -/* 8024626C 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80246270 80 63 00 04 */ lwz r3, 4(r3) -/* 80246274 48 0B 1D 59 */ bl animationTransform__7J2DPaneFv -/* 80246278 80 7E 00 04 */ lwz r3, 4(r30) -/* 8024627C 48 0B 34 15 */ bl animation__9J2DScreenFv -lbl_80246280: -/* 80246280 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80246284 80 63 00 04 */ lwz r3, 4(r3) -/* 80246288 D3 43 00 D4 */ stfs f26, 0xd4(r3) -/* 8024628C D3 63 00 D8 */ stfs f27, 0xd8(r3) -/* 80246290 81 83 00 00 */ lwz r12, 0(r3) -/* 80246294 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80246298 7D 89 03 A6 */ mtctr r12 -/* 8024629C 4E 80 04 21 */ bctrl -/* 802462A0 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 802462A4 C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 802462A8 C0 23 00 40 */ lfs f1, 0x40(r3) -/* 802462AC 80 63 00 04 */ lwz r3, 4(r3) -/* 802462B0 EC 00 07 32 */ fmuls f0, f0, f28 -/* 802462B4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802462B8 EC 01 07 72 */ fmuls f0, f1, f29 -/* 802462BC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802462C0 81 83 00 00 */ lwz r12, 0(r3) -/* 802462C4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802462C8 7D 89 03 A6 */ mtctr r12 -/* 802462CC 4E 80 04 21 */ bctrl -/* 802462D0 80 7E 00 04 */ lwz r3, 4(r30) -/* 802462D4 C0 22 B2 D8 */ lfs f1, lit_3808(r2) -/* 802462D8 FC 40 08 90 */ fmr f2, f1 -/* 802462DC 7F E4 FB 78 */ mr r4, r31 -/* 802462E0 48 0B 2B F5 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 802462E4 C0 02 B2 DC */ lfs f0, lit_3869(r2) -/* 802462E8 FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 802462EC 41 82 00 10 */ beq lbl_802462FC -/* 802462F0 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 802462F4 FC 20 F8 90 */ fmr f1, f31 -/* 802462F8 48 00 F4 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_802462FC: -/* 802462FC D3 DE 00 1C */ stfs f30, 0x1c(r30) -/* 80246300 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 80246304 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 80246308 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 8024630C CB C1 00 50 */ lfd f30, 0x50(r1) -/* 80246310 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* qr0 */ -/* 80246314 CB A1 00 40 */ lfd f29, 0x40(r1) -/* 80246318 E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 /* qr0 */ -/* 8024631C CB 81 00 30 */ lfd f28, 0x30(r1) -/* 80246320 E3 61 00 28 */ psq_l f27, 40(r1), 0, 0 /* qr0 */ -/* 80246324 CB 61 00 20 */ lfd f27, 0x20(r1) -/* 80246328 E3 41 00 18 */ psq_l f26, 24(r1), 0, 0 /* qr0 */ -/* 8024632C CB 41 00 10 */ lfd f26, 0x10(r1) -/* 80246330 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80246334 83 C1 00 08 */ lwz r30, 8(r1) -/* 80246338 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8024633C 7C 08 03 A6 */ mtlr r0 -/* 80246340 38 21 00 70 */ addi r1, r1, 0x70 -/* 80246344 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_light/draw__15dMsgScrnLight_cFPffffffUc.s b/asm/msg/scrn/d_msg_scrn_light/draw__15dMsgScrnLight_cFPffffffUc.s deleted file mode 100644 index c828b751ea8..00000000000 --- a/asm/msg/scrn/d_msg_scrn_light/draw__15dMsgScrnLight_cFPffffffUc.s +++ /dev/null @@ -1,237 +0,0 @@ -lbl_80245C04: -/* 80245C04 94 21 FF 20 */ stwu r1, -0xe0(r1) -/* 80245C08 7C 08 02 A6 */ mflr r0 -/* 80245C0C 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 80245C10 DB E1 00 D0 */ stfd f31, 0xd0(r1) -/* 80245C14 F3 E1 00 D8 */ psq_st f31, 216(r1), 0, 0 /* qr0 */ -/* 80245C18 DB C1 00 C0 */ stfd f30, 0xc0(r1) -/* 80245C1C F3 C1 00 C8 */ psq_st f30, 200(r1), 0, 0 /* qr0 */ -/* 80245C20 DB A1 00 B0 */ stfd f29, 0xb0(r1) -/* 80245C24 F3 A1 00 B8 */ psq_st f29, 184(r1), 0, 0 /* qr0 */ -/* 80245C28 DB 81 00 A0 */ stfd f28, 0xa0(r1) -/* 80245C2C F3 81 00 A8 */ psq_st f28, 168(r1), 0, 0 /* qr0 */ -/* 80245C30 DB 61 00 90 */ stfd f27, 0x90(r1) -/* 80245C34 F3 61 00 98 */ psq_st f27, 152(r1), 0, 0 /* qr0 */ -/* 80245C38 93 E1 00 8C */ stw r31, 0x8c(r1) -/* 80245C3C 93 C1 00 88 */ stw r30, 0x88(r1) -/* 80245C40 7C 7E 1B 78 */ mr r30, r3 -/* 80245C44 7C 9F 23 78 */ mr r31, r4 -/* 80245C48 FF 60 08 90 */ fmr f27, f1 -/* 80245C4C FF 80 10 90 */ fmr f28, f2 -/* 80245C50 FF A0 18 90 */ fmr f29, f3 -/* 80245C54 FF C0 20 90 */ fmr f30, f4 -/* 80245C58 FF E0 28 90 */ fmr f31, f5 -/* 80245C5C 3C 60 80 43 */ lis r3, g_MsgScrnLight_HIO_c@ha /* 0x804306D4@ha */ -/* 80245C60 38 63 06 D4 */ addi r3, r3, g_MsgScrnLight_HIO_c@l /* 0x804306D4@l */ -/* 80245C64 88 03 00 05 */ lbz r0, 5(r3) -/* 80245C68 28 00 00 00 */ cmplwi r0, 0 -/* 80245C6C 41 82 00 AC */ beq lbl_80245D18 -/* 80245C70 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 80245C74 28 00 00 09 */ cmplwi r0, 9 -/* 80245C78 40 80 00 6C */ bge lbl_80245CE4 -/* 80245C7C 7C 63 02 14 */ add r3, r3, r0 -/* 80245C80 88 03 00 0F */ lbz r0, 0xf(r3) -/* 80245C84 98 01 00 68 */ stb r0, 0x68(r1) -/* 80245C88 88 03 00 21 */ lbz r0, 0x21(r3) -/* 80245C8C 98 01 00 69 */ stb r0, 0x69(r1) -/* 80245C90 88 03 00 33 */ lbz r0, 0x33(r3) -/* 80245C94 98 01 00 6A */ stb r0, 0x6a(r1) -/* 80245C98 88 03 00 45 */ lbz r0, 0x45(r3) -/* 80245C9C 98 01 00 6B */ stb r0, 0x6b(r1) -/* 80245CA0 80 01 00 68 */ lwz r0, 0x68(r1) -/* 80245CA4 90 01 00 6C */ stw r0, 0x6c(r1) -/* 80245CA8 88 03 00 06 */ lbz r0, 6(r3) -/* 80245CAC 98 01 00 70 */ stb r0, 0x70(r1) -/* 80245CB0 88 03 00 18 */ lbz r0, 0x18(r3) -/* 80245CB4 98 01 00 71 */ stb r0, 0x71(r1) -/* 80245CB8 88 03 00 2A */ lbz r0, 0x2a(r3) -/* 80245CBC 98 01 00 72 */ stb r0, 0x72(r1) -/* 80245CC0 88 03 00 3C */ lbz r0, 0x3c(r3) -/* 80245CC4 98 01 00 73 */ stb r0, 0x73(r1) -/* 80245CC8 80 01 00 70 */ lwz r0, 0x70(r1) -/* 80245CCC 90 01 00 74 */ stw r0, 0x74(r1) -/* 80245CD0 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245CD4 38 81 00 74 */ addi r4, r1, 0x74 -/* 80245CD8 38 A1 00 6C */ addi r5, r1, 0x6c -/* 80245CDC 48 00 E7 7D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80245CE0 48 00 01 EC */ b lbl_80245ECC -lbl_80245CE4: -/* 80245CE4 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245CE8 80 03 00 58 */ lwz r0, 0x58(r3) -/* 80245CEC 90 01 00 58 */ stw r0, 0x58(r1) -/* 80245CF0 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80245CF4 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245CF8 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 80245CFC 90 01 00 60 */ stw r0, 0x60(r1) -/* 80245D00 90 01 00 64 */ stw r0, 0x64(r1) -/* 80245D04 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245D08 38 81 00 64 */ addi r4, r1, 0x64 -/* 80245D0C 38 A1 00 5C */ addi r5, r1, 0x5c -/* 80245D10 48 00 E7 49 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80245D14 48 00 01 B8 */ b lbl_80245ECC -lbl_80245D18: -/* 80245D18 88 1E 00 20 */ lbz r0, 0x20(r30) -/* 80245D1C 28 00 00 00 */ cmplwi r0, 0 -/* 80245D20 40 82 00 64 */ bne lbl_80245D84 -/* 80245D24 38 00 00 E1 */ li r0, 0xe1 -/* 80245D28 98 01 00 48 */ stb r0, 0x48(r1) -/* 80245D2C 38 00 00 D2 */ li r0, 0xd2 -/* 80245D30 98 01 00 49 */ stb r0, 0x49(r1) -/* 80245D34 38 00 00 6E */ li r0, 0x6e -/* 80245D38 98 01 00 4A */ stb r0, 0x4a(r1) -/* 80245D3C 38 60 00 A0 */ li r3, 0xa0 -/* 80245D40 98 61 00 4B */ stb r3, 0x4b(r1) -/* 80245D44 80 01 00 48 */ lwz r0, 0x48(r1) -/* 80245D48 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80245D4C 98 61 00 50 */ stb r3, 0x50(r1) -/* 80245D50 38 00 00 87 */ li r0, 0x87 -/* 80245D54 98 01 00 51 */ stb r0, 0x51(r1) -/* 80245D58 38 00 00 14 */ li r0, 0x14 -/* 80245D5C 98 01 00 52 */ stb r0, 0x52(r1) -/* 80245D60 38 00 00 00 */ li r0, 0 -/* 80245D64 98 01 00 53 */ stb r0, 0x53(r1) -/* 80245D68 80 01 00 50 */ lwz r0, 0x50(r1) -/* 80245D6C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80245D70 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245D74 38 81 00 54 */ addi r4, r1, 0x54 -/* 80245D78 38 A1 00 4C */ addi r5, r1, 0x4c -/* 80245D7C 48 00 E6 DD */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80245D80 48 00 01 4C */ b lbl_80245ECC -lbl_80245D84: -/* 80245D84 28 00 00 02 */ cmplwi r0, 2 -/* 80245D88 40 82 00 5C */ bne lbl_80245DE4 -/* 80245D8C 38 60 00 FF */ li r3, 0xff -/* 80245D90 98 61 00 38 */ stb r3, 0x38(r1) -/* 80245D94 98 61 00 39 */ stb r3, 0x39(r1) -/* 80245D98 38 00 00 6E */ li r0, 0x6e -/* 80245D9C 98 01 00 3A */ stb r0, 0x3a(r1) -/* 80245DA0 38 00 00 D2 */ li r0, 0xd2 -/* 80245DA4 98 01 00 3B */ stb r0, 0x3b(r1) -/* 80245DA8 80 01 00 38 */ lwz r0, 0x38(r1) -/* 80245DAC 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80245DB0 98 61 00 40 */ stb r3, 0x40(r1) -/* 80245DB4 98 61 00 41 */ stb r3, 0x41(r1) -/* 80245DB8 38 00 00 96 */ li r0, 0x96 -/* 80245DBC 98 01 00 42 */ stb r0, 0x42(r1) -/* 80245DC0 38 00 00 00 */ li r0, 0 -/* 80245DC4 98 01 00 43 */ stb r0, 0x43(r1) -/* 80245DC8 80 01 00 40 */ lwz r0, 0x40(r1) -/* 80245DCC 90 01 00 44 */ stw r0, 0x44(r1) -/* 80245DD0 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245DD4 38 81 00 44 */ addi r4, r1, 0x44 -/* 80245DD8 38 A1 00 3C */ addi r5, r1, 0x3c -/* 80245DDC 48 00 E6 7D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80245DE0 48 00 00 EC */ b lbl_80245ECC -lbl_80245DE4: -/* 80245DE4 28 00 00 01 */ cmplwi r0, 1 -/* 80245DE8 40 82 00 5C */ bne lbl_80245E44 -/* 80245DEC 38 A0 00 28 */ li r5, 0x28 -/* 80245DF0 98 A1 00 28 */ stb r5, 0x28(r1) -/* 80245DF4 38 80 00 6E */ li r4, 0x6e -/* 80245DF8 98 81 00 29 */ stb r4, 0x29(r1) -/* 80245DFC 38 60 00 B4 */ li r3, 0xb4 -/* 80245E00 98 61 00 2A */ stb r3, 0x2a(r1) -/* 80245E04 38 00 00 78 */ li r0, 0x78 -/* 80245E08 98 01 00 2B */ stb r0, 0x2b(r1) -/* 80245E0C 80 01 00 28 */ lwz r0, 0x28(r1) -/* 80245E10 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80245E14 98 A1 00 30 */ stb r5, 0x30(r1) -/* 80245E18 98 81 00 31 */ stb r4, 0x31(r1) -/* 80245E1C 98 61 00 32 */ stb r3, 0x32(r1) -/* 80245E20 38 00 00 00 */ li r0, 0 -/* 80245E24 98 01 00 33 */ stb r0, 0x33(r1) -/* 80245E28 80 01 00 30 */ lwz r0, 0x30(r1) -/* 80245E2C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80245E30 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245E34 38 81 00 34 */ addi r4, r1, 0x34 -/* 80245E38 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80245E3C 48 00 E6 1D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80245E40 48 00 00 8C */ b lbl_80245ECC -lbl_80245E44: -/* 80245E44 28 00 00 04 */ cmplwi r0, 4 -/* 80245E48 40 82 00 54 */ bne lbl_80245E9C -/* 80245E4C 38 A0 00 46 */ li r5, 0x46 -/* 80245E50 98 A1 00 18 */ stb r5, 0x18(r1) -/* 80245E54 38 80 00 96 */ li r4, 0x96 -/* 80245E58 98 81 00 19 */ stb r4, 0x19(r1) -/* 80245E5C 38 60 00 00 */ li r3, 0 -/* 80245E60 98 61 00 1A */ stb r3, 0x1a(r1) -/* 80245E64 98 81 00 1B */ stb r4, 0x1b(r1) -/* 80245E68 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80245E6C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80245E70 98 A1 00 20 */ stb r5, 0x20(r1) -/* 80245E74 98 81 00 21 */ stb r4, 0x21(r1) -/* 80245E78 98 61 00 22 */ stb r3, 0x22(r1) -/* 80245E7C 98 61 00 23 */ stb r3, 0x23(r1) -/* 80245E80 80 01 00 20 */ lwz r0, 0x20(r1) -/* 80245E84 90 01 00 24 */ stw r0, 0x24(r1) -/* 80245E88 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245E8C 38 81 00 24 */ addi r4, r1, 0x24 -/* 80245E90 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80245E94 48 00 E5 C5 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80245E98 48 00 00 34 */ b lbl_80245ECC -lbl_80245E9C: -/* 80245E9C 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245EA0 80 03 00 58 */ lwz r0, 0x58(r3) -/* 80245EA4 90 01 00 08 */ stw r0, 8(r1) -/* 80245EA8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80245EAC 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245EB0 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 80245EB4 90 01 00 10 */ stw r0, 0x10(r1) -/* 80245EB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80245EBC 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80245EC0 38 81 00 14 */ addi r4, r1, 0x14 -/* 80245EC4 38 A1 00 0C */ addi r5, r1, 0xc -/* 80245EC8 48 00 E5 91 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -lbl_80245ECC: -/* 80245ECC 88 1E 00 22 */ lbz r0, 0x22(r30) -/* 80245ED0 28 00 00 00 */ cmplwi r0, 0 -/* 80245ED4 41 82 00 60 */ beq lbl_80245F34 -/* 80245ED8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80245EDC C0 02 B2 DC */ lfs f0, lit_3869(r2) -/* 80245EE0 EC 01 00 2A */ fadds f0, f1, f0 -/* 80245EE4 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80245EE8 80 7E 00 08 */ lwz r3, 8(r30) -/* 80245EEC A8 03 00 06 */ lha r0, 6(r3) -/* 80245EF0 C0 5F 00 00 */ lfs f2, 0(r31) -/* 80245EF4 C8 22 B2 E0 */ lfd f1, lit_3871(r2) -/* 80245EF8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80245EFC 90 01 00 7C */ stw r0, 0x7c(r1) -/* 80245F00 3C 00 43 30 */ lis r0, 0x4330 -/* 80245F04 90 01 00 78 */ stw r0, 0x78(r1) -/* 80245F08 C8 01 00 78 */ lfd f0, 0x78(r1) -/* 80245F0C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80245F10 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80245F14 4C 41 13 82 */ cror 2, 1, 2 -/* 80245F18 40 82 00 0C */ bne lbl_80245F24 -/* 80245F1C C0 02 B2 D8 */ lfs f0, lit_3808(r2) -/* 80245F20 D0 1F 00 00 */ stfs f0, 0(r31) -lbl_80245F24: -/* 80245F24 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80245F28 D0 1E 00 14 */ stfs f0, 0x14(r30) -/* 80245F2C C0 1F 00 00 */ lfs f0, 0(r31) -/* 80245F30 D0 1E 00 18 */ stfs f0, 0x18(r30) -lbl_80245F34: -/* 80245F34 7F C3 F3 78 */ mr r3, r30 -/* 80245F38 FC 20 D8 90 */ fmr f1, f27 -/* 80245F3C FC 40 E0 90 */ fmr f2, f28 -/* 80245F40 FC 60 E8 90 */ fmr f3, f29 -/* 80245F44 FC 80 F0 90 */ fmr f4, f30 -/* 80245F48 FC A0 F8 90 */ fmr f5, f31 -/* 80245F4C 48 00 01 91 */ bl drawCommon__15dMsgScrnLight_cFfffff -/* 80245F50 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, 0 /* qr0 */ -/* 80245F54 CB E1 00 D0 */ lfd f31, 0xd0(r1) -/* 80245F58 E3 C1 00 C8 */ psq_l f30, 200(r1), 0, 0 /* qr0 */ -/* 80245F5C CB C1 00 C0 */ lfd f30, 0xc0(r1) -/* 80245F60 E3 A1 00 B8 */ psq_l f29, 184(r1), 0, 0 /* qr0 */ -/* 80245F64 CB A1 00 B0 */ lfd f29, 0xb0(r1) -/* 80245F68 E3 81 00 A8 */ psq_l f28, 168(r1), 0, 0 /* qr0 */ -/* 80245F6C CB 81 00 A0 */ lfd f28, 0xa0(r1) -/* 80245F70 E3 61 00 98 */ psq_l f27, 152(r1), 0, 0 /* qr0 */ -/* 80245F74 CB 61 00 90 */ lfd f27, 0x90(r1) -/* 80245F78 83 E1 00 8C */ lwz r31, 0x8c(r1) -/* 80245F7C 83 C1 00 88 */ lwz r30, 0x88(r1) -/* 80245F80 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 80245F84 7C 08 03 A6 */ mtlr r0 -/* 80245F88 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80245F8C 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_light/draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor.s b/asm/msg/scrn/d_msg_scrn_light/draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor.s deleted file mode 100644 index 299debe65f1..00000000000 --- a/asm/msg/scrn/d_msg_scrn_light/draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_80245F90: -/* 80245F90 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80245F94 7C 08 02 A6 */ mflr r0 -/* 80245F98 90 01 00 84 */ stw r0, 0x84(r1) -/* 80245F9C DB E1 00 70 */ stfd f31, 0x70(r1) -/* 80245FA0 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 80245FA4 DB C1 00 60 */ stfd f30, 0x60(r1) -/* 80245FA8 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 80245FAC DB A1 00 50 */ stfd f29, 0x50(r1) -/* 80245FB0 F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 /* qr0 */ -/* 80245FB4 DB 81 00 40 */ stfd f28, 0x40(r1) -/* 80245FB8 F3 81 00 48 */ psq_st f28, 72(r1), 0, 0 /* qr0 */ -/* 80245FBC DB 61 00 30 */ stfd f27, 0x30(r1) -/* 80245FC0 F3 61 00 38 */ psq_st f27, 56(r1), 0, 0 /* qr0 */ -/* 80245FC4 DB 41 00 20 */ stfd f26, 0x20(r1) -/* 80245FC8 F3 41 00 28 */ psq_st f26, 40(r1), 0, 0 /* qr0 */ -/* 80245FCC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80245FD0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80245FD4 7C 7E 1B 78 */ mr r30, r3 -/* 80245FD8 7C 9F 23 78 */ mr r31, r4 -/* 80245FDC FF 40 08 90 */ fmr f26, f1 -/* 80245FE0 FF 60 10 90 */ fmr f27, f2 -/* 80245FE4 FF 80 18 90 */ fmr f28, f3 -/* 80245FE8 FF A0 20 90 */ fmr f29, f4 -/* 80245FEC FF C0 28 90 */ fmr f30, f5 -/* 80245FF0 FF E0 30 90 */ fmr f31, f6 -/* 80245FF4 80 06 00 00 */ lwz r0, 0(r6) -/* 80245FF8 90 01 00 08 */ stw r0, 8(r1) -/* 80245FFC 80 05 00 00 */ lwz r0, 0(r5) -/* 80246000 90 01 00 0C */ stw r0, 0xc(r1) -/* 80246004 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80246008 38 81 00 0C */ addi r4, r1, 0xc -/* 8024600C 38 A1 00 08 */ addi r5, r1, 8 -/* 80246010 48 00 E4 49 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80246014 88 1E 00 22 */ lbz r0, 0x22(r30) -/* 80246018 28 00 00 00 */ cmplwi r0, 0 -/* 8024601C 41 82 00 5C */ beq lbl_80246078 -/* 80246020 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80246024 EC 00 F8 2A */ fadds f0, f0, f31 -/* 80246028 D0 1F 00 00 */ stfs f0, 0(r31) -/* 8024602C 80 7E 00 08 */ lwz r3, 8(r30) -/* 80246030 A8 03 00 06 */ lha r0, 6(r3) -/* 80246034 C0 5F 00 00 */ lfs f2, 0(r31) -/* 80246038 C8 22 B2 E0 */ lfd f1, lit_3871(r2) -/* 8024603C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80246040 90 01 00 14 */ stw r0, 0x14(r1) -/* 80246044 3C 00 43 30 */ lis r0, 0x4330 -/* 80246048 90 01 00 10 */ stw r0, 0x10(r1) -/* 8024604C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80246050 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80246054 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80246058 4C 41 13 82 */ cror 2, 1, 2 -/* 8024605C 40 82 00 0C */ bne lbl_80246068 -/* 80246060 C0 02 B2 D8 */ lfs f0, lit_3808(r2) -/* 80246064 D0 1F 00 00 */ stfs f0, 0(r31) -lbl_80246068: -/* 80246068 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8024606C D0 1E 00 14 */ stfs f0, 0x14(r30) -/* 80246070 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80246074 D0 1E 00 18 */ stfs f0, 0x18(r30) -lbl_80246078: -/* 80246078 7F C3 F3 78 */ mr r3, r30 -/* 8024607C FC 20 D0 90 */ fmr f1, f26 -/* 80246080 FC 40 D8 90 */ fmr f2, f27 -/* 80246084 FC 60 E0 90 */ fmr f3, f28 -/* 80246088 FC 80 E8 90 */ fmr f4, f29 -/* 8024608C FC A0 F0 90 */ fmr f5, f30 -/* 80246090 48 00 00 4D */ bl drawCommon__15dMsgScrnLight_cFfffff -/* 80246094 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 80246098 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 8024609C E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 802460A0 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 802460A4 E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 /* qr0 */ -/* 802460A8 CB A1 00 50 */ lfd f29, 0x50(r1) -/* 802460AC E3 81 00 48 */ psq_l f28, 72(r1), 0, 0 /* qr0 */ -/* 802460B0 CB 81 00 40 */ lfd f28, 0x40(r1) -/* 802460B4 E3 61 00 38 */ psq_l f27, 56(r1), 0, 0 /* qr0 */ -/* 802460B8 CB 61 00 30 */ lfd f27, 0x30(r1) -/* 802460BC E3 41 00 28 */ psq_l f26, 40(r1), 0, 0 /* qr0 */ -/* 802460C0 CB 41 00 20 */ lfd f26, 0x20(r1) -/* 802460C4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802460C8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802460CC 80 01 00 84 */ lwz r0, 0x84(r1) -/* 802460D0 7C 08 03 A6 */ mtlr r0 -/* 802460D4 38 21 00 80 */ addi r1, r1, 0x80 -/* 802460D8 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_light/updateColor__19dMsgScrnLight_HIO_cFUc.s b/asm/msg/scrn/d_msg_scrn_light/updateColor__19dMsgScrnLight_HIO_cFUc.s deleted file mode 100644 index e5422567ab3..00000000000 --- a/asm/msg/scrn/d_msg_scrn_light/updateColor__19dMsgScrnLight_HIO_cFUc.s +++ /dev/null @@ -1,102 +0,0 @@ -lbl_802457C4: -/* 802457C4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802457C8 2C 00 00 02 */ cmpwi r0, 2 -/* 802457CC 41 82 00 7C */ beq lbl_80245848 -/* 802457D0 40 80 00 14 */ bge lbl_802457E4 -/* 802457D4 2C 00 00 00 */ cmpwi r0, 0 -/* 802457D8 41 82 00 18 */ beq lbl_802457F0 -/* 802457DC 40 80 00 C0 */ bge lbl_8024589C -/* 802457E0 4E 80 00 20 */ blr -lbl_802457E4: -/* 802457E4 2C 00 00 04 */ cmpwi r0, 4 -/* 802457E8 41 82 01 04 */ beq lbl_802458EC -/* 802457EC 4E 80 00 20 */ blr -lbl_802457F0: -/* 802457F0 39 80 00 00 */ li r12, 0 -/* 802457F4 39 40 00 A0 */ li r10, 0xa0 -/* 802457F8 39 20 00 87 */ li r9, 0x87 -/* 802457FC 39 00 00 14 */ li r8, 0x14 -/* 80245800 38 E0 00 00 */ li r7, 0 -/* 80245804 38 C0 00 E1 */ li r6, 0xe1 -/* 80245808 38 A0 00 D2 */ li r5, 0xd2 -/* 8024580C 38 80 00 6E */ li r4, 0x6e -/* 80245810 38 00 00 09 */ li r0, 9 -/* 80245814 7C 09 03 A6 */ mtctr r0 -lbl_80245818: -/* 80245818 7D 63 62 14 */ add r11, r3, r12 -/* 8024581C 99 4B 00 06 */ stb r10, 6(r11) -/* 80245820 99 2B 00 18 */ stb r9, 0x18(r11) -/* 80245824 99 0B 00 2A */ stb r8, 0x2a(r11) -/* 80245828 98 EB 00 3C */ stb r7, 0x3c(r11) -/* 8024582C 98 CB 00 0F */ stb r6, 0xf(r11) -/* 80245830 98 AB 00 21 */ stb r5, 0x21(r11) -/* 80245834 98 8B 00 33 */ stb r4, 0x33(r11) -/* 80245838 99 4B 00 45 */ stb r10, 0x45(r11) -/* 8024583C 39 8C 00 01 */ addi r12, r12, 1 -/* 80245840 42 00 FF D8 */ bdnz lbl_80245818 -/* 80245844 4E 80 00 20 */ blr -lbl_80245848: -/* 80245848 39 60 00 00 */ li r11, 0 -/* 8024584C 39 20 00 FF */ li r9, 0xff -/* 80245850 39 00 00 FA */ li r8, 0xfa -/* 80245854 38 E0 00 96 */ li r7, 0x96 -/* 80245858 38 C0 00 00 */ li r6, 0 -/* 8024585C 38 A0 00 6E */ li r5, 0x6e -/* 80245860 38 80 00 D2 */ li r4, 0xd2 -/* 80245864 38 00 00 09 */ li r0, 9 -/* 80245868 7C 09 03 A6 */ mtctr r0 -lbl_8024586C: -/* 8024586C 7D 43 5A 14 */ add r10, r3, r11 -/* 80245870 99 2A 00 06 */ stb r9, 6(r10) -/* 80245874 99 0A 00 18 */ stb r8, 0x18(r10) -/* 80245878 98 EA 00 2A */ stb r7, 0x2a(r10) -/* 8024587C 98 CA 00 3C */ stb r6, 0x3c(r10) -/* 80245880 99 2A 00 0F */ stb r9, 0xf(r10) -/* 80245884 99 2A 00 21 */ stb r9, 0x21(r10) -/* 80245888 98 AA 00 33 */ stb r5, 0x33(r10) -/* 8024588C 98 8A 00 45 */ stb r4, 0x45(r10) -/* 80245890 39 6B 00 01 */ addi r11, r11, 1 -/* 80245894 42 00 FF D8 */ bdnz lbl_8024586C -/* 80245898 4E 80 00 20 */ blr -lbl_8024589C: -/* 8024589C 39 40 00 00 */ li r10, 0 -/* 802458A0 39 00 00 28 */ li r8, 0x28 -/* 802458A4 38 E0 00 6E */ li r7, 0x6e -/* 802458A8 38 C0 00 B4 */ li r6, 0xb4 -/* 802458AC 38 A0 00 00 */ li r5, 0 -/* 802458B0 38 80 00 78 */ li r4, 0x78 -/* 802458B4 38 00 00 09 */ li r0, 9 -/* 802458B8 7C 09 03 A6 */ mtctr r0 -lbl_802458BC: -/* 802458BC 7D 23 52 14 */ add r9, r3, r10 -/* 802458C0 99 09 00 06 */ stb r8, 6(r9) -/* 802458C4 98 E9 00 18 */ stb r7, 0x18(r9) -/* 802458C8 98 C9 00 2A */ stb r6, 0x2a(r9) -/* 802458CC 98 A9 00 3C */ stb r5, 0x3c(r9) -/* 802458D0 99 09 00 0F */ stb r8, 0xf(r9) -/* 802458D4 98 E9 00 21 */ stb r7, 0x21(r9) -/* 802458D8 98 C9 00 33 */ stb r6, 0x33(r9) -/* 802458DC 98 89 00 45 */ stb r4, 0x45(r9) -/* 802458E0 39 4A 00 01 */ addi r10, r10, 1 -/* 802458E4 42 00 FF D8 */ bdnz lbl_802458BC -/* 802458E8 4E 80 00 20 */ blr -lbl_802458EC: -/* 802458EC 39 00 00 00 */ li r8, 0 -/* 802458F0 38 C0 00 46 */ li r6, 0x46 -/* 802458F4 38 A0 00 96 */ li r5, 0x96 -/* 802458F8 38 80 00 00 */ li r4, 0 -/* 802458FC 38 00 00 09 */ li r0, 9 -/* 80245900 7C 09 03 A6 */ mtctr r0 -lbl_80245904: -/* 80245904 7C E3 42 14 */ add r7, r3, r8 -/* 80245908 98 C7 00 06 */ stb r6, 6(r7) -/* 8024590C 98 A7 00 18 */ stb r5, 0x18(r7) -/* 80245910 98 87 00 2A */ stb r4, 0x2a(r7) -/* 80245914 98 87 00 3C */ stb r4, 0x3c(r7) -/* 80245918 98 C7 00 0F */ stb r6, 0xf(r7) -/* 8024591C 98 A7 00 21 */ stb r5, 0x21(r7) -/* 80245920 98 87 00 33 */ stb r4, 0x33(r7) -/* 80245924 98 A7 00 45 */ stb r5, 0x45(r7) -/* 80245928 39 08 00 01 */ addi r8, r8, 1 -/* 8024592C 42 00 FF D8 */ bdnz lbl_80245904 -/* 80245930 4E 80 00 20 */ blr diff --git a/include/msg/scrn/d_msg_scrn_kanban.h b/include/msg/scrn/d_msg_scrn_kanban.h index 4a35f2dabeb..060abfd3ea9 100644 --- a/include/msg/scrn/d_msg_scrn_kanban.h +++ b/include/msg/scrn/d_msg_scrn_kanban.h @@ -2,5 +2,28 @@ #define MSG_SCRN_D_MSG_SCRN_KANBAN_H #include "dolphin/types.h" +#include "msg/scrn/d_msg_scrn_base.h" + +class JKRExpHeap; +class J2DAnmTransform; +class J2DAnmTextureSRTKey; +class CPaneMgr; + +struct dMsgScrnKanban_c : public dMsgScrnBase_c { + /* 80244E38 */ dMsgScrnKanban_c(JKRExpHeap*); + /* 8024534C */ ~dMsgScrnKanban_c(); + /* 80245528 */ void exec(); + /* 80245618 */ void draw(); + /* 802456A0 */ void fukiAlpha(f32); + /* 80245754 */ void fukiScale(f32); + /* 80245758 */ void fukiTrans(f32, f32); + + /* 0xC4 */ CPaneMgr* mpBack_c; + /* 0xC8 */ CPaneMgr* mpSpot_c; + /* 0xCC */ J2DAnmTransform* field_0xcc; + /* 0xD0 */ J2DAnmTextureSRTKey* field_0xd0; + /* 0xD4 */ JKRExpHeap* field_0xd4; + /* 0xD8 */ f32 field_0xd8; +}; #endif /* MSG_SCRN_D_MSG_SCRN_KANBAN_H */ diff --git a/include/msg/scrn/d_msg_scrn_light.h b/include/msg/scrn/d_msg_scrn_light.h index 5361c533b9e..17f60a20040 100644 --- a/include/msg/scrn/d_msg_scrn_light.h +++ b/include/msg/scrn/d_msg_scrn_light.h @@ -1,5 +1,49 @@ #ifndef MSG_SCRN_D_MSG_SCRN_LIGHT_H #define MSG_SCRN_D_MSG_SCRN_LIGHT_H +#include "dolphin/types.h" +#include "JSystem/JUtility/TColor.h" + +class J2DScreen; +class J2DAnmTransform; +class J2DAnmColor; +class CPaneMgr; + +struct dMsgScrnLight_c { + /* 80245934 */ dMsgScrnLight_c(u8, u8); + /* 80245B00 */ virtual ~dMsgScrnLight_c(); + /* 80245C04 */ void draw(f32*, f32, f32, f32, f32, f32, u8); + /* 80245F90 */ void draw(f32*, f32, f32, f32, f32, f32, f32, JUtility::TColor, + JUtility::TColor); + /* 802460DC */ void drawCommon(f32, f32, f32, f32, f32); + + /* 0x04 */ J2DScreen* mpScreen; + /* 0x08 */ J2DAnmTransform* field_0x8; + /* 0x0C */ J2DAnmColor* field_0xc; + /* 0x10 */ CPaneMgr* mpParent_c; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ u8 field_0x20; + /* 0x21 */ u8 field_0x21; + /* 0x22 */ u8 field_0x22; +}; + +struct dMsgScrnLight_HIO_c { + /* 8024575C */ dMsgScrnLight_HIO_c(); + /* 802457C4 */ void updateColor(u8); + /* 80246348 */ virtual ~dMsgScrnLight_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x05 */ u8 field_0x5; + /* 0x06 */ u8 field_0x6[9]; + /* 0x0F */ u8 field_0xf[9]; + /* 0x18 */ u8 field_0x18[9]; + /* 0x21 */ u8 field_0x21[9]; + /* 0x2A */ u8 field_0x2a[9]; + /* 0x33 */ u8 field_0x33[9]; + /* 0x3C */ u8 field_0x3c[9]; + /* 0x45 */ u8 field_0x45[9]; +}; #endif /* MSG_SCRN_D_MSG_SCRN_LIGHT_H */ diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index f3d3a997fa5..c32225200f7 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -249,7 +249,6 @@ s8 Z2WolfHowlMgr::startWolfHowlSound(f32 param_0, f32 param_1, bool param_2, f32 if (param_2) { if (mTimer > data_8045088E) { - //JVar7 = (JAISoundID)JAISoundID::JAISoundID(aJStack_34, 0x10035); Z2GetSoundStarter()->startLevelSound(0x10035, &field_0x00, NULL); } if (field_0x00) { diff --git a/src/msg/scrn/d_msg_scrn_kanban.cpp b/src/msg/scrn/d_msg_scrn_kanban.cpp index 03c13232028..b6c6156f70c 100644 --- a/src/msg/scrn/d_msg_scrn_kanban.cpp +++ b/src/msg/scrn/d_msg_scrn_kanban.cpp @@ -1,264 +1,161 @@ // -// Generated By: dol2asm -// Translation Unit: msg/scrn/d_msg_scrn_kanban +// d_msg_scrn_kanban // #include "msg/scrn/d_msg_scrn_kanban.h" -#include "dol2asm.h" - -// -// Types: -// - -struct JKRExpHeap {}; - -struct dMsgScrnKanban_c { - /* 80244E38 */ dMsgScrnKanban_c(JKRExpHeap*); - /* 8024534C */ ~dMsgScrnKanban_c(); - /* 80245528 */ void exec(); - /* 80245618 */ void draw(); - /* 802456A0 */ void fukiAlpha(f32); - /* 80245754 */ void fukiScale(f32); - /* 80245758 */ void fukiTrans(f32, f32); -}; - -struct dMsgScrnBase_c { - /* 80238C40 */ void setSelectRubyString(char*, char*, char*); - /* 80238C44 */ void setSelectString(char*, char*, char*); - /* 80238C48 */ bool selectAnimeMove(u8, u8, bool); - /* 80238C50 */ void selectAnimeInit(u8, u8, f32, u8); - /* 80238C54 */ void arwAnimeMove(); - /* 80238C58 */ void arwAnimeInit(); - /* 80238C5C */ void fukiPosCalc(u8); - /* 80238C60 */ bool isSelect(); - /* 80238C68 */ bool selectAnimeEnd(); - /* 80238C70 */ void dotAnimeMove(); - /* 80238C74 */ void dotAnimeInit(); - /* 8023C0DC */ dMsgScrnBase_c(); - /* 8023C124 */ ~dMsgScrnBase_c(); - /* 8023C16C */ void init(); - /* 8023C234 */ void multiDraw(); - /* 8023C300 */ void drawSelf(); - /* 8023C4F4 */ void fontAlpha(f32); - /* 8023C574 */ void isTalkNow(); -}; - -struct JKRHeap { - /* 802CE784 */ void getTotalFreeSize(); -}; - -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRArchive {}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - -struct J2DPane { - /* 802F7FCC */ void animationTransform(); -}; - -struct J2DAnmLoaderDataBase { - /* 80308A6C */ void load(void const*); -}; - -struct CPaneMgrAlpha { - /* 802557D0 */ void setAlphaRate(f32); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802542E8 */ void getGlobalPosX(); - /* 80254364 */ void getGlobalPosY(); -}; - -// -// Forward References: -// - -extern "C" void __ct__16dMsgScrnKanban_cFP10JKRExpHeap(); -extern "C" void __dt__16dMsgScrnKanban_cFv(); -extern "C" void exec__16dMsgScrnKanban_cFv(); -extern "C" void draw__16dMsgScrnKanban_cFv(); -extern "C" void fukiAlpha__16dMsgScrnKanban_cFf(); -extern "C" void fukiScale__16dMsgScrnKanban_cFf(); -extern "C" void fukiTrans__16dMsgScrnKanban_cFff(); -extern "C" extern char const* const msg_scrn_d_msg_scrn_kanban__stringBase0; +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRFileLoader.h" +#include "JSystem/JKernel/JKRArchive.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "d/pane/d_pane_class.h" +#include "d/com/d_com_inf_game.h" +#include "d/msg/d_msg_object.h" +#include "d/msg/d_msg_out_font.h" // // External References: // -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void dComIfGp_getSubHeap2D__Fi(); -extern "C" void setSelectRubyString__14dMsgScrnBase_cFPcPcPc(); -extern "C" void setSelectString__14dMsgScrnBase_cFPcPcPc(); -extern "C" bool selectAnimeMove__14dMsgScrnBase_cFUcUcb(); -extern "C" void selectAnimeInit__14dMsgScrnBase_cFUcUcfUc(); -extern "C" void arwAnimeMove__14dMsgScrnBase_cFv(); -extern "C" void arwAnimeInit__14dMsgScrnBase_cFv(); -extern "C" void fukiPosCalc__14dMsgScrnBase_cFUc(); -extern "C" bool isSelect__14dMsgScrnBase_cFv(); -extern "C" bool selectAnimeEnd__14dMsgScrnBase_cFv(); -extern "C" void dotAnimeMove__14dMsgScrnBase_cFv(); -extern "C" void dotAnimeInit__14dMsgScrnBase_cFv(); -extern "C" void __ct__14dMsgScrnBase_cFv(); -extern "C" void __dt__14dMsgScrnBase_cFv(); -extern "C" void init__14dMsgScrnBase_cFv(); -extern "C" void multiDraw__14dMsgScrnBase_cFv(); -extern "C" void drawSelf__14dMsgScrnBase_cFv(); -extern "C" void fontAlpha__14dMsgScrnBase_cFf(); -extern "C" void isTalkNow__14dMsgScrnBase_cFv(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void getGlobalPosX__8CPaneMgrFv(); -extern "C" void getGlobalPosY__8CPaneMgrFv(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void getTotalFreeSize__7JKRHeapFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(); -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 load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; - -// -// Declarations: -// +extern dMsgObject_HIO_c g_MsgObject_HIO_c; /* ############################################################################################## */ /* 80399AA0-80399AB8 026100 0018+00 1/1 0/0 0/0 .rodata t_tag$3768 */ -SECTION_RODATA static u8 const t_tag[24] = { - 0x6D, 0x67, 0x5F, 0x65, 0x34, 0x6C, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00, - 0x66, 0x34, 0x5F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x74, 0x34, 0x5F, 0x73, -}; -COMPILER_STRIP_GATE(0x80399AA0, &t_tag); - -/* 80399AB8-80399AB8 026118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399AB8 = "zelda_kanban_stone_a.blo"; -SECTION_DEAD static char const* const stringBase_80399AD1 = "zelda_kanban_stone_a.bck"; -SECTION_DEAD static char const* const stringBase_80399AEA = "zelda_kanban_stone_a.btk"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399B03 = "\0\0\0\0"; -#pragma pop - -/* 803C1240-803C1298 01E360 0058+00 2/2 0/0 0/0 .data __vt__16dMsgScrnKanban_c */ -SECTION_DATA extern void* __vt__16dMsgScrnKanban_c[22] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__16dMsgScrnKanban_cFv, - (void*)__dt__16dMsgScrnKanban_cFv, - (void*)exec__16dMsgScrnKanban_cFv, - (void*)multiDraw__14dMsgScrnBase_cFv, - (void*)drawSelf__14dMsgScrnBase_cFv, - (void*)setSelectString__14dMsgScrnBase_cFPcPcPc, - (void*)setSelectRubyString__14dMsgScrnBase_cFPcPcPc, - (void*)arwAnimeInit__14dMsgScrnBase_cFv, - (void*)arwAnimeMove__14dMsgScrnBase_cFv, - (void*)dotAnimeInit__14dMsgScrnBase_cFv, - (void*)dotAnimeMove__14dMsgScrnBase_cFv, - (void*)isSelect__14dMsgScrnBase_cFv, - (void*)selectAnimeInit__14dMsgScrnBase_cFUcUcfUc, - (void*)selectAnimeMove__14dMsgScrnBase_cFUcUcb, - (void*)selectAnimeEnd__14dMsgScrnBase_cFv, - (void*)fukiScale__16dMsgScrnKanban_cFf, - (void*)fukiTrans__16dMsgScrnKanban_cFff, - (void*)fukiAlpha__16dMsgScrnKanban_cFf, - (void*)fontAlpha__14dMsgScrnBase_cFf, - (void*)fukiPosCalc__14dMsgScrnBase_cFUc, -}; - -/* 80454CC0-80454CC4 0032C0 0004+00 2/2 0/0 0/0 .sdata2 @3944 */ -SECTION_SDATA2 static u8 lit_3944[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454CC4-80454CC8 0032C4 0004+00 3/3 0/0 0/0 .sdata2 @3945 */ -SECTION_SDATA2 static f32 lit_3945 = 1.0f; - -/* 80454CC8-80454CD0 0032C8 0004+04 1/1 0/0 0/0 .sdata2 @3946 */ -SECTION_SDATA2 static f32 lit_3946[1 + 1 /* padding */] = { - 6.0f / 5.0f, - /* padding */ - 0.0f, +static u64 const t_tag[3] = { + 'mg_e4lin', + 'f4_w', + 't4_s', }; /* 80244E38-8024534C 23F778 0514+00 0/0 1/1 0/0 .text __ct__16dMsgScrnKanban_cFP10JKRExpHeap */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_kanban/__ct__16dMsgScrnKanban_cFP10JKRExpHeap.s" +dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { + if (param_0 != NULL) { + field_0xd4 = param_0; + } else { + field_0xd4 = dComIfGp_getSubHeap2D(7); + } + s32 uVar14 = field_0xd4->getTotalFreeSize(); + init(); + mpScreen = new J2DScreen(); + JUT_ASSERT(43, mpScreen != 0); + bool fg = mpScreen->setPriority("zelda_kanban_stone_a.blo", 0x1020000, dComIfGp_getMsgArchive(2)); + JUT_ASSERT(45, fg != false); + dPaneClass_showNullPane(mpScreen); + OSInitFastCast(); + field_0xcc = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(JKRGetNameResource("zelda_kanban_stone_a.bck", dComIfGp_getMsgArchive(2))); + field_0xd0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(JKRGetNameResource("zelda_kanban_stone_a.btk", dComIfGp_getMsgArchive(2))); + field_0xd0->searchUpdateMaterialID(mpScreen); + field_0xd8 = 0.0f; + mpPmp_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL); + JUT_ASSERT(60, mpPmp_c != 0); + mpPmp_c->getPanePtr()->setAnimation(field_0xcc); + field_0xcc->setFrame(1.0f); + mpPmp_c->getPanePtr()->animationTransform(); + mpPmp_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + mpPmp_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY); + mpBack_c = new CPaneMgr(mpScreen, 'back_b', 0, NULL); + JUT_ASSERT(68, mpBack_c != 0); + mpSpot_c = new CPaneMgr(mpScreen, 'spot00', 0, NULL); + JUT_ASSERT(72, mpSpot_c != 0); + mpSpot_c->getPanePtr()->setAnimation(field_0xd0); + for (int i = 0; i < 3; i++) { + mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); + JUT_ASSERT(81, mpTm_c[i] != 0); + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); + } + mpScreen->search('n_3line')->hide(); + mpScreen->search('n_3fline')->hide(); + mpScreen->search('n_e4line')->show(); + ((J2DTextBox*) mpTm_c[0]->getPanePtr())->getFontSize(mFontSize); + mTBoxWidth = mpTm_c[0]->getSizeX(); + mTBoxHeight = mpTm_c[0]->getSizeY(); + mLineSpace = ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getLineSpace(); + mCharSpace = ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getCharSpace(); + for (int i = 0; i < 3; i = i + 1) { + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setLineSpace(mLineSpace); + mpTm_c[i]->resize(1.2f * mpTm_c[i]->getSizeX(), mpTm_c[i]->getSizeY()); + } + mTextBoxPosX = mpTm_c[0]->getGlobalPosX(); + mTextBoxPosY = mpTm_c[0]->CPaneMgr::getGlobalPosY(); + mTextBoxPosOffsetY = 0.0f; + for (int i = 0; i < 3; i++) { + if (mpTmr_c[i] != NULL) { + ((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setLineSpace(mLineSpace); + if (i == 0) { + J2DTextBox::TFontSize fontSize; + ((J2DTextBox*)mpTmr_c[0]->getPanePtr())->getFontSize(fontSize); + mRubySize = fontSize.mSizeX; + mRubyCharSpace = ((J2DTextBox*)mpTmr_c[0]->getPanePtr())->getCharSpace(); + } + mpTmr_c[i]->resize(1.2f * mpTmr_c[i]->getSizeX(), + mpTmr_c[i]->getSizeY()); + } + } + OS_REPORT("remain ===> %d\n", uVar14 - field_0xd4->getTotalFreeSize()); } -#pragma pop /* 8024534C-80245528 23FC8C 01DC+00 1/0 0/0 0/0 .text __dt__16dMsgScrnKanban_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnKanban_c::~dMsgScrnKanban_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_kanban/__dt__16dMsgScrnKanban_cFv.s" -} -#pragma pop +dMsgScrnKanban_c::~dMsgScrnKanban_c() { + delete mpScreen; + mpScreen = NULL; + delete field_0xcc; + field_0xcc = NULL; + delete field_0xd0; + field_0xd0 = NULL; + delete mpPmp_c; + mpPmp_c = NULL; + delete mpBack_c; + mpBack_c = NULL; + delete mpSpot_c; + mpSpot_c = NULL; -/* ############################################################################################## */ -/* 80454CD0-80454CD8 0032D0 0008+00 1/1 0/0 0/0 .sdata2 @4033 */ -SECTION_SDATA2 static f64 lit_4033 = 4503601774854144.0 /* cast s32 to float */; + for (int i = 0; i < 3; i++) { + delete mpTm_c[i]; + mpTm_c[i] = NULL; + if (mpTmr_c[i] != NULL) { + delete mpTmr_c[i]; + mpTmr_c[i] = NULL; + } + } + dComIfGp_getMsgArchive(2)->removeResourceAll(); +} /* 80245528-80245618 23FE68 00F0+00 1/0 0/0 0/0 .text exec__16dMsgScrnKanban_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnKanban_c::exec() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_kanban/exec__16dMsgScrnKanban_cFv.s" +void dMsgScrnKanban_c::exec() { + field_0xd8 += 1.0f; + if (field_0xd8 >= field_0xd0->getFrameMax()) { + field_0xd8 -= field_0xd0->getFrameMax(); + } + field_0xd0->setFrame(field_0xd8); + mpScreen->animation(); + if (isTalkNow()) { + fukiAlpha(1.0f); + } + mpPmp_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY); } -#pragma pop /* 80245618-802456A0 23FF58 0088+00 1/0 0/0 0/0 .text draw__16dMsgScrnKanban_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnKanban_c::draw() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_kanban/draw__16dMsgScrnKanban_cFv.s" +void dMsgScrnKanban_c::draw() { + J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort(); + grafContext->setup2D(); + mpScreen->draw(0.0f, 0.0f, grafContext); + mpOutFont->draw(NULL, 0.0f, 0.0f, 1.0f); } -#pragma pop /* 802456A0-80245754 23FFE0 00B4+00 1/0 0/0 0/0 .text fukiAlpha__16dMsgScrnKanban_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnKanban_c::fukiAlpha(f32 param_0) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_kanban/fukiAlpha__16dMsgScrnKanban_cFf.s" +void dMsgScrnKanban_c::fukiAlpha(f32 param_0) { + mpBack_c->setAlphaRate(param_0); + mpPmp_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxStoneAlphaP); + mpSpot_c->setAlphaRate(param_0); + for (int i = 0; i < 3; i++) { + mpTm_c[i]->setAlphaRate(param_0 * mCharAlphaRate); + if (mpTmr_c[i] != NULL) { + mpTmr_c[i]->setAlphaRate(param_0 * mCharAlphaRate); + } + } } -#pragma pop - /* 80245754-80245758 240094 0004+00 1/0 0/0 0/0 .text fukiScale__16dMsgScrnKanban_cFf */ void dMsgScrnKanban_c::fukiScale(f32 param_0) { /* empty function */ diff --git a/src/msg/scrn/d_msg_scrn_light.cpp b/src/msg/scrn/d_msg_scrn_light.cpp index ea30a183f94..d2a818683a2 100644 --- a/src/msg/scrn/d_msg_scrn_light.cpp +++ b/src/msg/scrn/d_msg_scrn_light.cpp @@ -1,258 +1,234 @@ // -// Generated By: dol2asm -// Translation Unit: msg/scrn/d_msg_scrn_light +// d_msg_scrn_light // #include "msg/scrn/d_msg_scrn_light.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/JKernel/JKRFileLoader.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRArchive.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "d/pane/d_pane_class.h" +#include "d/com/d_com_inf_game.h" -// -// Types: -// - -struct JUtility { - struct TColor {}; -}; - -struct dMsgScrnLight_c { - /* 80245934 */ dMsgScrnLight_c(u8, u8); - /* 80245B00 */ ~dMsgScrnLight_c(); - /* 80245C04 */ void draw(f32*, f32, f32, f32, f32, f32, u8); - /* 80245F90 */ void draw(f32*, f32, f32, f32, f32, f32, f32, JUtility::TColor, - JUtility::TColor); - /* 802460DC */ void drawCommon(f32, f32, f32, f32, f32); -}; - -struct dMsgScrnLight_HIO_c { - /* 8024575C */ dMsgScrnLight_HIO_c(); - /* 802457C4 */ void updateColor(u8); - /* 80246348 */ ~dMsgScrnLight_HIO_c(); -}; - -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRExpHeap {}; - -struct JKRArchive {}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - -struct J2DPane { - /* 802F7FCC */ void animationTransform(); -}; - -struct J2DAnmLoaderDataBase { - /* 80308A6C */ void load(void const*); -}; - -struct CPaneMgrAlpha { - /* 802557D0 */ void setAlphaRate(f32); - /* 80255828 */ void getAlphaRate(); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor); -}; - -// -// Forward References: -// - -extern "C" void __ct__19dMsgScrnLight_HIO_cFv(); -extern "C" void updateColor__19dMsgScrnLight_HIO_cFUc(); -extern "C" void __ct__15dMsgScrnLight_cFUcUc(); -extern "C" void __dt__15dMsgScrnLight_cFv(); -extern "C" void draw__15dMsgScrnLight_cFPffffffUc(); -extern "C" void draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void drawCommon__15dMsgScrnLight_cFfffff(); -extern "C" void __dt__19dMsgScrnLight_HIO_cFv(); -extern "C" void __sinit_d_msg_scrn_light_cpp(); -extern "C" extern char const* const msg_scrn_d_msg_scrn_light__stringBase0; - -// -// External References: -// - -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void getAlphaRate__13CPaneMgrAlphaFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(); -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 load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" void __register_global_object(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_804510D8[8]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C1298-803C12A4 01E3B8 000C+00 2/2 0/0 0/0 .data __vt__15dMsgScrnLight_c */ -SECTION_DATA extern void* __vt__15dMsgScrnLight_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15dMsgScrnLight_cFv, -}; - -/* 803C12A4-803C12B0 01E3C4 000C+00 2/2 0/0 0/0 .data __vt__19dMsgScrnLight_HIO_c */ -SECTION_DATA extern void* __vt__19dMsgScrnLight_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__19dMsgScrnLight_HIO_cFv, -}; +extern u8 data_804510D8[8]; /* 8024575C-802457C4 24009C 0068+00 1/1 0/0 0/0 .text __ct__19dMsgScrnLight_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnLight_HIO_c::dMsgScrnLight_HIO_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_light/__ct__19dMsgScrnLight_HIO_cFv.s" +dMsgScrnLight_HIO_c::dMsgScrnLight_HIO_c() { + field_0x5 = 0; + for (int i = 0; i < 9; i++) { + field_0x6[i] = 0xa0; + field_0x18[i] = 0x87; + field_0x2a[i] = 0x14; + field_0x3c[i] = 0x0; + field_0xf[i] = 0xe1; + field_0x21[i] = 0xd2; + field_0x33[i] = 0x6e; + field_0x45[i] = 0xd2; + } } -#pragma pop /* 802457C4-80245934 240104 0170+00 1/1 0/0 0/0 .text updateColor__19dMsgScrnLight_HIO_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnLight_HIO_c::updateColor(u8 param_0) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_light/updateColor__19dMsgScrnLight_HIO_cFUc.s" +void dMsgScrnLight_HIO_c::updateColor(u8 param_0) { + switch(param_0) { + case 0: + for (int i = 0; i < 9; i++) { + field_0x6[i] = 0xa0; + field_0x18[i] = 0x87; + field_0x2a[i] = 0x14; + field_0x3c[i] = 0x0; + field_0xf[i] = 0xe1; + field_0x21[i] = 0xd2; + field_0x33[i] = 0x6e; + field_0x45[i] = 0xa0; + } + break; + case 2: + for (int i = 0; i < 9; i++) { + field_0x6[i] = 0xff; + field_0x18[i] = 0xfa; + field_0x2a[i] = 0x96; + field_0x3c[i] = 0x0; + field_0xf[i] = 0xff; + field_0x21[i] = 0xff; + field_0x33[i] = 0x6e; + field_0x45[i] = 0xd2; + } + break; + case 1: + for (int i = 0; i < 9; i++) { + field_0x6[i] = 0x28; + field_0x18[i] = 0x6e; + field_0x2a[i] = 0xb4; + field_0x3c[i] = 0x0; + field_0xf[i] = 0x28; + field_0x21[i] = 0x6e; + field_0x33[i] = 0xb4; + field_0x45[i] = 0x78; + } + break; + case 4: + for (int i = 0; i < 9; i++) { + field_0x6[i] = 0x46; + field_0x18[i] = 0x96; + field_0x2a[i] = 0x0; + field_0x3c[i] = 0x0; + field_0xf[i] = 0x46; + field_0x21[i] = 0x96; + field_0x33[i] = 0x0; + field_0x45[i] = 0x96; + } + break; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80399B08-80399B08 026168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399B08 = "zelda_message_window_text_light.blo"; -SECTION_DEAD static char const* const stringBase_80399B2C = "zelda_message_window_text_light.bck"; -SECTION_DEAD static char const* const stringBase_80399B50 = "zelda_message_window_text_light.bpk"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399B74 = "\0\0\0"; -#pragma pop - -/* 804306C8-804306D4 05D3E8 000C+00 1/1 0/0 0/0 .bss @3735 */ -static u8 lit_3735[12]; /* 804306D4-80430728 05D3F4 0050+04 3/3 0/0 0/0 .bss g_MsgScrnLight_HIO_c */ -static u8 g_MsgScrnLight_HIO_c[80 + 4 /* padding */]; - -/* 80454CD8-80454CDC 0032D8 0004+00 4/4 0/0 0/0 .sdata2 @3808 */ -SECTION_SDATA2 static u8 lit_3808[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; +dMsgScrnLight_HIO_c g_MsgScrnLight_HIO_c; /* 80245934-80245B00 240274 01CC+00 0/0 4/4 1/1 .text __ct__15dMsgScrnLight_cFUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnLight_c::dMsgScrnLight_c(u8 param_0, u8 param_1) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_light/__ct__15dMsgScrnLight_cFUcUc.s" +dMsgScrnLight_c::dMsgScrnLight_c(u8 param_1, u8 param_2) { + field_0x20 = param_1; + field_0x21 = param_2; + if (data_804510D8[0] == 0) { + g_MsgScrnLight_HIO_c.field_0x4 = -1; + } + data_804510D8[0]++; + g_MsgScrnLight_HIO_c.updateColor(param_1); + mpScreen = new J2DScreen(); + JUT_ASSERT(250, mpScreen != 0); + bool fg = mpScreen->setPriority("zelda_message_window_text_light.blo", 0x20000, + dComIfGp_getMain2DArchive()); + JUT_ASSERT(254, fg != false); + dPaneClass_showNullPane(mpScreen); + OSInitFastCast(); + void* uVar7 = JKRGetNameResource("zelda_message_window_text_light.bck", dComIfGp_getMain2DArchive()); + field_0x8 = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(uVar7); + field_0x14 = 0.0f; + uVar7 = JKRGetNameResource("zelda_message_window_text_light.bpk", dComIfGp_getMain2DArchive()); + field_0xc = (J2DAnmColor*)J2DAnmLoaderDataBase::load(uVar7); + field_0xc->searchUpdateMaterialID(mpScreen); + field_0x18 = 0.0f; + mpParent_c = new CPaneMgr(mpScreen, 'moya00', 0, NULL); + JUT_ASSERT(269, mpParent_c != 0); + mpParent_c->getPanePtr()->setAnimation(field_0x8); + mpParent_c->getPanePtr()->setAnimation(field_0xc); + field_0x22 = 1; + field_0x1c = 0.0f; } -#pragma pop /* 80245B00-80245C04 240440 0104+00 1/0 0/0 0/0 .text __dt__15dMsgScrnLight_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnLight_c::~dMsgScrnLight_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_light/__dt__15dMsgScrnLight_cFv.s" +dMsgScrnLight_c::~dMsgScrnLight_c() { + data_804510D8[0]--; + delete mpScreen; + mpScreen = NULL; + delete field_0x8; + field_0x8 = NULL; + delete field_0xc; + field_0xc = NULL; + delete mpParent_c; + mpParent_c = NULL; } -#pragma pop - -/* ############################################################################################## */ -/* 80454CDC-80454CE0 0032DC 0004+00 2/2 0/0 0/0 .sdata2 @3869 */ -SECTION_SDATA2 static f32 lit_3869 = 1.0f; - -/* 80454CE0-80454CE8 0032E0 0008+00 2/2 0/0 0/0 .sdata2 @3871 */ -SECTION_SDATA2 static f64 lit_3871 = 4503601774854144.0 /* cast s32 to float */; /* 80245C04-80245F90 240544 038C+00 0/0 2/2 0/0 .text draw__15dMsgScrnLight_cFPffffffUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnLight_c::draw(f32* param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, - f32 param_5, u8 param_6) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_light/draw__15dMsgScrnLight_cFPffffffUc.s" +void dMsgScrnLight_c::draw(f32* param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5, + f32 param_6, u8 param_7) { + if (g_MsgScrnLight_HIO_c.field_0x5 != 0) { + if (param_7 < 9) { + mpParent_c->setBlackWhite(JUtility::TColor(g_MsgScrnLight_HIO_c.field_0x6[param_7], + g_MsgScrnLight_HIO_c.field_0x18[param_7], + g_MsgScrnLight_HIO_c.field_0x2a[param_7], + g_MsgScrnLight_HIO_c.field_0x3c[param_7]), + JUtility::TColor(g_MsgScrnLight_HIO_c.field_0xf[param_7], + g_MsgScrnLight_HIO_c.field_0x21[param_7], + g_MsgScrnLight_HIO_c.field_0x33[param_7], + g_MsgScrnLight_HIO_c.field_0x45[param_7])); + } else { + mpParent_c->setBlackWhite(mpParent_c->getInitBlack(), mpParent_c->getInitWhite()); + } + } else { + if (field_0x20 == 0) { + mpParent_c->setBlackWhite(JUtility::TColor(0xa0, 0x87, 0x14, 0), + JUtility::TColor(0xe1, 0xd2, 0x6e, 0xa0)); + } else if (field_0x20 == 2) { + mpParent_c->setBlackWhite(JUtility::TColor(0xff, 0xff, 0x96, 0), + JUtility::TColor(0xff, 0xff, 0x6e, 0xd2)); + } else if (field_0x20 == 1) { + mpParent_c->setBlackWhite(JUtility::TColor(0x28, 0x6e, 0xb4, 0), + JUtility::TColor(0x28, 0x6e, 0xb4, 0x78)); + } else if (field_0x20 == 4) { + mpParent_c->setBlackWhite(JUtility::TColor(0x46, 0x96, 0, 0), + JUtility::TColor(0x46, 0x96, 0, 0x96)); + } else { + mpParent_c->setBlackWhite(mpParent_c->getInitBlack(), mpParent_c->getInitWhite()); + } + } + if (field_0x22 != 0) { + *param_1 += 1.0f; + if (*param_1 >= field_0x8->getFrameMax()) { + *param_1 = 0.0f; + } + field_0x14 = *param_1; + field_0x18 = *param_1; + } + drawCommon(param_2, param_3, param_4, param_5, param_6); } -#pragma pop /* 80245F90-802460DC 2408D0 014C+00 0/0 1/1 1/1 .text * draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnLight_c::draw(f32* param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, - f32 param_5, f32 param_6, JUtility::TColor param_7, - JUtility::TColor param_8) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_light/draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor.s" +void dMsgScrnLight_c::draw(f32* param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5, + f32 param_6, f32 param_7, JUtility::TColor param_8, + JUtility::TColor param_9) { + mpParent_c->setBlackWhite(param_8, param_9); + if (field_0x22 != 0) { + *param_1 += param_7; + if (*param_1 >= field_0x8->getFrameMax()) { + *param_1 = 0.0f; + } + field_0x14 = *param_1; + field_0x18 = *param_1; + } + drawCommon(param_2, param_3, param_4, param_5, param_6); } -#pragma pop /* 802460DC-80246348 240A1C 026C+00 2/2 0/0 0/0 .text drawCommon__15dMsgScrnLight_cFfffff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnLight_c::drawCommon(f32 param_0, f32 param_1, f32 param_2, f32 param_3, - f32 param_4) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_light/drawCommon__15dMsgScrnLight_cFfffff.s" +void dMsgScrnLight_c::drawCommon(f32 param_1, f32 param_2, f32 param_3, f32 param_4, + f32 param_5) { + J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort(); + grafContext->setup2D(); + f32 dVar9 = mpParent_c->getAlphaRate(); + if (((field_0x21 == 3 || field_0x21 == 0x5) && + param_5 < field_0x1c) || + (field_0x21 != 3 && field_0x21 != 0x5 && 1.0f != param_5)) + { + if (field_0x22 != 0) { + mpParent_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + mpParent_c->getPanePtr()->setAnimation((J2DAnmColor*)NULL); + field_0x22 = 0; + } + mpParent_c->setAlphaRate(dVar9 * param_5); + } else if (field_0x22 == 0) { + mpParent_c->getPanePtr()->setAnimation(field_0x8); + mpParent_c->getPanePtr()->setAnimation(field_0xc); + field_0x22 = 01; + } + if (field_0x22 != 0) { + field_0x8->setFrame(field_0x14); + field_0xc->setFrame(field_0x18); + mpParent_c->getPanePtr()->animationTransform(); + mpScreen->animation(); + } + mpParent_c->translate(param_1, param_2); + f32 dVar11 = mpParent_c->getInitScaleX(); + f32 dVar12 = mpParent_c->getInitScaleY(); + mpParent_c->scale(dVar11 * param_3, dVar12 * param_4); + mpScreen->draw(0.0f, 0.0f, grafContext); + if (1.0f != param_5) { + mpParent_c->setAlphaRate(dVar9); + } + field_0x1c = param_5; } -#pragma pop - -/* 80246348-80246390 240C88 0048+00 2/1 0/0 0/0 .text __dt__19dMsgScrnLight_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnLight_HIO_c::~dMsgScrnLight_HIO_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_light/__dt__19dMsgScrnLight_HIO_cFv.s" -} -#pragma pop - -/* 80246390-802463CC 240CD0 003C+00 0/0 1/0 0/0 .text __sinit_d_msg_scrn_light_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_msg_scrn_light_cpp() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_light/__sinit_d_msg_scrn_light_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80246390, __sinit_d_msg_scrn_light_cpp); -#pragma pop /* 80399B08-80399B08 026168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */