diff --git a/asm/d/msg/d_msg_object/_delete__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/_delete__12dMsgObject_cFv.s deleted file mode 100644 index 9b606099ce5..00000000000 --- a/asm/d/msg/d_msg_object/_delete__12dMsgObject_cFv.s +++ /dev/null @@ -1,149 +0,0 @@ -lbl_80233AE8: -/* 80233AE8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80233AEC 7C 08 02 A6 */ mflr r0 -/* 80233AF0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80233AF4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80233AF8 48 12 E6 E5 */ bl _savegpr_29 -/* 80233AFC 7C 7F 1B 78 */ mr r31, r3 -/* 80233B00 83 C3 01 10 */ lwz r30, 0x110(r3) -/* 80233B04 48 00 00 44 */ b lbl_80233B48 -lbl_80233B08: -/* 80233B08 83 BE 00 0C */ lwz r29, 0xc(r30) -/* 80233B0C 93 A1 00 0C */ stw r29, 0xc(r1) -/* 80233B10 93 A1 00 08 */ stw r29, 8(r1) -/* 80233B14 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 80233B18 93 A1 00 18 */ stw r29, 0x18(r1) -/* 80233B1C 93 A1 00 14 */ stw r29, 0x14(r1) -/* 80233B20 38 61 00 10 */ addi r3, r1, 0x10 -/* 80233B24 38 9E 00 08 */ addi r4, r30, 8 -/* 80233B28 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80233B2C 48 0A 8F 2D */ bl erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iterator -/* 80233B30 38 7E 00 08 */ addi r3, r30, 8 -/* 80233B34 7F A4 EB 78 */ mr r4, r29 -/* 80233B38 81 9E 00 14 */ lwz r12, 0x14(r30) -/* 80233B3C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80233B40 7D 89 03 A6 */ mtctr r12 -/* 80233B44 4E 80 04 21 */ bctrl -lbl_80233B48: -/* 80233B48 80 1E 00 08 */ lwz r0, 8(r30) -/* 80233B4C 28 00 00 00 */ cmplwi r0, 0 -/* 80233B50 40 82 FF B8 */ bne lbl_80233B08 -/* 80233B54 38 00 00 00 */ li r0, 0 -/* 80233B58 90 1E 00 18 */ stw r0, 0x18(r30) -/* 80233B5C 90 1E 00 1C */ stw r0, 0x1c(r30) -/* 80233B60 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 80233B64 28 03 00 00 */ cmplwi r3, 0 -/* 80233B68 41 82 00 24 */ beq lbl_80233B8C -/* 80233B6C 41 82 00 18 */ beq lbl_80233B84 -/* 80233B70 38 80 00 01 */ li r4, 1 -/* 80233B74 81 83 00 00 */ lwz r12, 0(r3) -/* 80233B78 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80233B7C 7D 89 03 A6 */ mtctr r12 -/* 80233B80 4E 80 04 21 */ bctrl -lbl_80233B84: -/* 80233B84 38 00 00 00 */ li r0, 0 -/* 80233B88 90 1F 01 04 */ stw r0, 0x104(r31) -lbl_80233B8C: -/* 80233B8C 38 00 00 00 */ li r0, 0 -/* 80233B90 90 1F 01 30 */ stw r0, 0x130(r31) -/* 80233B94 90 1F 01 28 */ stw r0, 0x128(r31) -/* 80233B98 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 80233B9C 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80233BA0 28 03 00 00 */ cmplwi r3, 0 -/* 80233BA4 41 82 00 24 */ beq lbl_80233BC8 -/* 80233BA8 41 82 00 18 */ beq lbl_80233BC0 -/* 80233BAC 38 80 00 01 */ li r4, 1 -/* 80233BB0 81 83 00 00 */ lwz r12, 0(r3) -/* 80233BB4 81 8C 00 08 */ lwz r12, 8(r12) -/* 80233BB8 7D 89 03 A6 */ mtctr r12 -/* 80233BBC 4E 80 04 21 */ bctrl -lbl_80233BC0: -/* 80233BC0 38 00 00 00 */ li r0, 0 -/* 80233BC4 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_80233BC8: -/* 80233BC8 83 DF 01 10 */ lwz r30, 0x110(r31) -/* 80233BCC 28 1E 00 00 */ cmplwi r30, 0 -/* 80233BD0 41 82 00 18 */ beq lbl_80233BE8 -/* 80233BD4 38 7E 00 08 */ addi r3, r30, 8 -/* 80233BD8 38 80 FF FF */ li r4, -1 -/* 80233BDC 48 07 53 1D */ bl __dt__Q38JMessage18TResourceContainer10TCResourceFv -/* 80233BE0 7F C3 F3 78 */ mr r3, r30 -/* 80233BE4 48 09 B1 59 */ bl __dl__FPv -lbl_80233BE8: -/* 80233BE8 38 00 00 00 */ li r0, 0 -/* 80233BEC 90 1F 01 10 */ stw r0, 0x110(r31) -/* 80233BF0 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80233BF4 28 03 00 00 */ cmplwi r3, 0 -/* 80233BF8 41 82 00 18 */ beq lbl_80233C10 -/* 80233BFC 38 80 00 01 */ li r4, 1 -/* 80233C00 81 83 00 00 */ lwz r12, 0(r3) -/* 80233C04 81 8C 00 08 */ lwz r12, 8(r12) -/* 80233C08 7D 89 03 A6 */ mtctr r12 -/* 80233C0C 4E 80 04 21 */ bctrl -lbl_80233C10: -/* 80233C10 38 00 00 00 */ li r0, 0 -/* 80233C14 90 1F 01 18 */ stw r0, 0x118(r31) -/* 80233C18 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 80233C1C 28 03 00 00 */ cmplwi r3, 0 -/* 80233C20 41 82 00 18 */ beq lbl_80233C38 -/* 80233C24 38 80 00 01 */ li r4, 1 -/* 80233C28 81 83 00 00 */ lwz r12, 0(r3) -/* 80233C2C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80233C30 7D 89 03 A6 */ mtctr r12 -/* 80233C34 4E 80 04 21 */ bctrl -lbl_80233C38: -/* 80233C38 38 00 00 00 */ li r0, 0 -/* 80233C3C 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 80233C40 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 80233C44 28 03 00 00 */ cmplwi r3, 0 -/* 80233C48 41 82 00 18 */ beq lbl_80233C60 -/* 80233C4C 38 80 00 01 */ li r4, 1 -/* 80233C50 81 83 00 00 */ lwz r12, 0(r3) -/* 80233C54 81 8C 00 08 */ lwz r12, 8(r12) -/* 80233C58 7D 89 03 A6 */ mtctr r12 -/* 80233C5C 4E 80 04 21 */ bctrl -lbl_80233C60: -/* 80233C60 38 00 00 00 */ li r0, 0 -/* 80233C64 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80233C68 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 80233C6C 28 03 00 00 */ cmplwi r3, 0 -/* 80233C70 41 82 00 18 */ beq lbl_80233C88 -/* 80233C74 38 80 00 01 */ li r4, 1 -/* 80233C78 81 83 00 00 */ lwz r12, 0(r3) -/* 80233C7C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80233C80 7D 89 03 A6 */ mtctr r12 -/* 80233C84 4E 80 04 21 */ bctrl -lbl_80233C88: -/* 80233C88 38 00 00 00 */ li r0, 0 -/* 80233C8C 90 1F 01 24 */ stw r0, 0x124(r31) -/* 80233C90 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 80233C94 38 80 00 01 */ li r4, 1 -/* 80233C98 48 01 60 91 */ bl __dt__12dMsgString_cFv -/* 80233C9C 38 60 00 00 */ li r3, 0 -/* 80233CA0 90 7F 01 08 */ stw r3, 0x108(r31) -/* 80233CA4 80 1F 01 44 */ lwz r0, 0x144(r31) -/* 80233CA8 28 00 00 00 */ cmplwi r0, 0 -/* 80233CAC 41 82 00 08 */ beq lbl_80233CB4 -/* 80233CB0 90 7F 01 44 */ stw r3, 0x144(r31) -lbl_80233CB4: -/* 80233CB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80233CB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80233CBC 88 03 5E 8F */ lbz r0, 0x5e8f(r3) -/* 80233CC0 28 00 00 05 */ cmplwi r0, 5 -/* 80233CC4 40 82 00 14 */ bne lbl_80233CD8 -/* 80233CC8 38 60 00 07 */ li r3, 7 -/* 80233CCC 4B DF A4 BD */ bl dComIfGp_offHeapLockFlag__Fi -/* 80233CD0 38 60 00 08 */ li r3, 8 -/* 80233CD4 4B DF A4 B5 */ bl dComIfGp_offHeapLockFlag__Fi -lbl_80233CD8: -/* 80233CD8 38 00 00 00 */ li r0, 0 -/* 80233CDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80233CE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80233CE4 90 03 5D BC */ stw r0, 0x5dbc(r3) -/* 80233CE8 38 60 00 01 */ li r3, 1 -/* 80233CEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80233CF0 48 12 E5 39 */ bl _restgpr_29 -/* 80233CF4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80233CF8 7C 08 03 A6 */ mtlr r0 -/* 80233CFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80233D00 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/_draw__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/_draw__12dMsgObject_cFv.s deleted file mode 100644 index a88d48560b3..00000000000 --- a/asm/d/msg/d_msg_object/_draw__12dMsgObject_cFv.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_802339BC: -/* 802339BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802339C0 7C 08 02 A6 */ mflr r0 -/* 802339C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802339C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802339CC 93 C1 00 08 */ stw r30, 8(r1) -/* 802339D0 7C 7E 1B 78 */ mr r30, r3 -/* 802339D4 48 00 2F 25 */ bl getStatusLocal__12dMsgObject_cFv -/* 802339D8 54 60 04 3F */ clrlwi. r0, r3, 0x10 -/* 802339DC 41 82 00 98 */ beq lbl_80233A74 -/* 802339E0 28 00 00 01 */ cmplwi r0, 1 -/* 802339E4 41 82 00 90 */ beq lbl_80233A74 -/* 802339E8 28 00 00 0B */ cmplwi r0, 0xb -/* 802339EC 41 82 00 88 */ beq lbl_80233A74 -/* 802339F0 7F C3 F3 78 */ mr r3, r30 -/* 802339F4 48 00 41 75 */ bl isDraw__12dMsgObject_cFv -/* 802339F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802339FC 41 82 00 0C */ beq lbl_80233A08 -/* 80233A00 80 7E 01 14 */ lwz r3, 0x114(r30) -/* 80233A04 48 07 3C B9 */ bl render__Q28JMessage8TControlFv -lbl_80233A08: -/* 80233A08 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 80233A0C 28 03 00 00 */ cmplwi r3, 0 -/* 80233A10 41 82 00 64 */ beq lbl_80233A74 -/* 80233A14 80 9E 01 20 */ lwz r4, 0x120(r30) -/* 80233A18 83 E4 00 04 */ lwz r31, 4(r4) -/* 80233A1C 38 9F 0A 1C */ addi r4, r31, 0xa1c -/* 80233A20 38 BF 0C 1C */ addi r5, r31, 0xc1c -/* 80233A24 48 00 89 3D */ bl setString__14dMsgScrnBase_cFPcPc -/* 80233A28 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 80233A2C 38 9F 0E 1C */ addi r4, r31, 0xe1c -/* 80233A30 48 00 89 BD */ bl setRubyString__14dMsgScrnBase_cFPc -/* 80233A34 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 80233A38 38 9F 10 1C */ addi r4, r31, 0x101c -/* 80233A3C 38 BF 10 4E */ addi r5, r31, 0x104e -/* 80233A40 38 DF 10 80 */ addi r6, r31, 0x1080 -/* 80233A44 81 83 00 00 */ lwz r12, 0(r3) -/* 80233A48 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80233A4C 7D 89 03 A6 */ mtctr r12 -/* 80233A50 4E 80 04 21 */ bctrl -/* 80233A54 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 80233A58 38 9F 10 B2 */ addi r4, r31, 0x10b2 -/* 80233A5C 38 BF 11 02 */ addi r5, r31, 0x1102 -/* 80233A60 38 DF 11 52 */ addi r6, r31, 0x1152 -/* 80233A64 81 83 00 00 */ lwz r12, 0(r3) -/* 80233A68 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 80233A6C 7D 89 03 A6 */ mtctr r12 -/* 80233A70 4E 80 04 21 */ bctrl -lbl_80233A74: -/* 80233A74 80 DE 01 04 */ lwz r6, 0x104(r30) -/* 80233A78 28 06 00 00 */ cmplwi r6, 0 -/* 80233A7C 41 82 00 50 */ beq lbl_80233ACC -/* 80233A80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80233A84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80233A88 88 03 5E B5 */ lbz r0, 0x5eb5(r3) -/* 80233A8C 28 00 00 00 */ cmplwi r0, 0 -/* 80233A90 41 82 00 18 */ beq lbl_80233AA8 -/* 80233A94 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80233A98 38 83 00 AC */ addi r4, r3, 0xac -/* 80233A9C 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 80233AA0 4B E2 2C F5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80233AA4 48 00 00 14 */ b lbl_80233AB8 -lbl_80233AA8: -/* 80233AA8 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80233AAC 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 80233AB0 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80233AB4 4B E2 2C E1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_80233AB8: -/* 80233AB8 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 80233ABC 81 83 00 00 */ lwz r12, 0(r3) -/* 80233AC0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80233AC4 7D 89 03 A6 */ mtctr r12 -/* 80233AC8 4E 80 04 21 */ bctrl -lbl_80233ACC: -/* 80233ACC 38 60 00 01 */ li r3, 1 -/* 80233AD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80233AD4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80233AD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80233ADC 7C 08 03 A6 */ mtlr r0 -/* 80233AE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80233AE4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/addSelectBomBag__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/addSelectBomBag__12dMsgObject_cFUc.s deleted file mode 100644 index 42cda04c0e2..00000000000 --- a/asm/d/msg/d_msg_object/addSelectBomBag__12dMsgObject_cFUc.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802375E4: -/* 802375E4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802375E8 28 00 00 FF */ cmplwi r0, 0xff -/* 802375EC 40 82 00 08 */ bne lbl_802375F4 -/* 802375F0 88 83 01 93 */ lbz r4, 0x193(r3) -lbl_802375F4: -/* 802375F4 88 03 01 93 */ lbz r0, 0x193(r3) -/* 802375F8 7C A3 02 14 */ add r5, r3, r0 -/* 802375FC 98 85 01 90 */ stb r4, 0x190(r5) -/* 80237600 88 83 01 93 */ lbz r4, 0x193(r3) -/* 80237604 38 04 00 01 */ addi r0, r4, 1 -/* 80237608 98 03 01 93 */ stb r0, 0x193(r3) -/* 8023760C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/changeFlowGroup__12dMsgObject_cFl.s b/asm/d/msg/d_msg_object/changeFlowGroup__12dMsgObject_cFl.s deleted file mode 100644 index cbf2f3fb114..00000000000 --- a/asm/d/msg/d_msg_object/changeFlowGroup__12dMsgObject_cFl.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8023803C: -/* 8023803C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238040 7C 08 02 A6 */ mflr r0 -/* 80238044 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238048 7C 64 1B 78 */ mr r4, r3 -/* 8023804C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238050 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238054 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238058 4B FF EC 39 */ bl changeFlowGroupLocal__12dMsgObject_cFl -/* 8023805C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238060 7C 08 03 A6 */ mtlr r0 -/* 80238064 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238068 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/changeGroupLocal__12dMsgObject_cFs.s b/asm/d/msg/d_msg_object/changeGroupLocal__12dMsgObject_cFs.s deleted file mode 100644 index 65fb2ee3049..00000000000 --- a/asm/d/msg/d_msg_object/changeGroupLocal__12dMsgObject_cFs.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80236D0C: -/* 80236D0C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80236D10 7C 08 02 A6 */ mflr r0 -/* 80236D14 90 01 00 24 */ stw r0, 0x24(r1) -/* 80236D18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80236D1C 48 12 B4 C1 */ bl _savegpr_29 -/* 80236D20 7C 7E 1B 78 */ mr r30, r3 -/* 80236D24 7C 9F 23 78 */ mr r31, r4 -/* 80236D28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80236D2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80236D30 80 63 5E C8 */ lwz r3, 0x5ec8(r3) -/* 80236D34 4B DD 84 99 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 80236D38 7C 7D 1B 78 */ mr r29, r3 -/* 80236D3C A8 7E 01 6C */ lha r3, 0x16c(r30) -/* 80236D40 7F E0 07 34 */ extsh r0, r31 -/* 80236D44 7C 03 00 00 */ cmpw r3, r0 -/* 80236D48 41 82 00 7C */ beq lbl_80236DC4 -/* 80236D4C 88 1E 01 9C */ lbz r0, 0x19c(r30) -/* 80236D50 28 00 00 00 */ cmplwi r0, 0 -/* 80236D54 41 82 00 0C */ beq lbl_80236D60 -/* 80236D58 38 00 00 02 */ li r0, 2 -/* 80236D5C 98 1E 01 9C */ stb r0, 0x19c(r30) -lbl_80236D60: -/* 80236D60 7F E0 07 34 */ extsh r0, r31 -/* 80236D64 2C 00 00 01 */ cmpwi r0, 1 -/* 80236D68 41 80 00 2C */ blt lbl_80236D94 -/* 80236D6C A8 1E 01 6C */ lha r0, 0x16c(r30) -/* 80236D70 2C 00 00 00 */ cmpwi r0, 0 -/* 80236D74 40 82 00 0C */ bne lbl_80236D80 -/* 80236D78 38 00 00 01 */ li r0, 1 -/* 80236D7C 98 1E 01 9D */ stb r0, 0x19d(r30) -lbl_80236D80: -/* 80236D80 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80236D84 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80236D88 80 03 00 14 */ lwz r0, 0x14(r3) -/* 80236D8C 90 1E 01 30 */ stw r0, 0x130(r30) -/* 80236D90 48 00 00 0C */ b lbl_80236D9C -lbl_80236D94: -/* 80236D94 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 80236D98 90 1E 01 30 */ stw r0, 0x130(r30) -lbl_80236D9C: -/* 80236D9C A8 1E 01 6C */ lha r0, 0x16c(r30) -/* 80236DA0 2C 00 00 00 */ cmpwi r0, 0 -/* 80236DA4 41 80 00 1C */ blt lbl_80236DC0 -/* 80236DA8 80 1E 01 30 */ lwz r0, 0x130(r30) -/* 80236DAC 90 01 00 08 */ stw r0, 8(r1) -/* 80236DB0 80 7E 01 24 */ lwz r3, 0x124(r30) -/* 80236DB4 38 81 00 08 */ addi r4, r1, 8 -/* 80236DB8 38 A0 00 80 */ li r5, 0x80 -/* 80236DBC 48 0A 5B 55 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl -lbl_80236DC0: -/* 80236DC0 B3 FE 01 6C */ sth r31, 0x16c(r30) -lbl_80236DC4: -/* 80236DC4 7F A3 EB 78 */ mr r3, r29 -/* 80236DC8 4B DD 84 05 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 80236DCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80236DD0 48 12 B4 59 */ bl _restgpr_29 -/* 80236DD4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80236DD8 7C 08 03 A6 */ mtlr r0 -/* 80236DDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80236DE0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/changeGroup__12dMsgObject_cFs.s b/asm/d/msg/d_msg_object/changeGroup__12dMsgObject_cFs.s deleted file mode 100644 index b7b505677ee..00000000000 --- a/asm/d/msg/d_msg_object/changeGroup__12dMsgObject_cFs.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802380C4: -/* 802380C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802380C8 7C 08 02 A6 */ mflr r0 -/* 802380CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802380D0 7C 64 1B 78 */ mr r4, r3 -/* 802380D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802380D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802380DC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802380E0 4B FF EC 2D */ bl changeGroupLocal__12dMsgObject_cFs -/* 802380E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802380E8 7C 08 03 A6 */ mtlr r0 -/* 802380EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802380F0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_Delete__FP12dMsgObject_c.s b/asm/d/msg/d_msg_object/dMsgObject_Delete__FP12dMsgObject_c.s deleted file mode 100644 index 1b22ad401ce..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_Delete__FP12dMsgObject_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80237F60: -/* 80237F60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237F64 7C 08 02 A6 */ mflr r0 -/* 80237F68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237F6C 4B FF BB 7D */ bl _delete__12dMsgObject_cFv -/* 80237F70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237F74 7C 08 03 A6 */ mtlr r0 -/* 80237F78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237F7C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_Draw__FP12dMsgObject_c.s b/asm/d/msg/d_msg_object/dMsgObject_Draw__FP12dMsgObject_c.s deleted file mode 100644 index 1ed9797ee5f..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_Draw__FP12dMsgObject_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80237F18: -/* 80237F18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237F1C 7C 08 02 A6 */ mflr r0 -/* 80237F20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237F24 4B FF BA 99 */ bl _draw__12dMsgObject_cFv -/* 80237F28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237F2C 7C 08 03 A6 */ mtlr r0 -/* 80237F30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237F34 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_Execute__FP12dMsgObject_c.s b/asm/d/msg/d_msg_object/dMsgObject_Execute__FP12dMsgObject_c.s deleted file mode 100644 index 6953d339e1f..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_Execute__FP12dMsgObject_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80237F38: -/* 80237F38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237F3C 7C 08 02 A6 */ mflr r0 -/* 80237F40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237F44 4B FF B6 4D */ bl _execute__12dMsgObject_cFv -/* 80237F48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237F4C 7C 08 03 A6 */ mtlr r0 -/* 80237F50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237F54 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_addFundRaising__Fs.s b/asm/d/msg/d_msg_object/dMsgObject_addFundRaising__Fs.s deleted file mode 100644 index f3b6c9bf38b..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_addFundRaising__Fs.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_802389F8: -/* 802389F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802389FC 7C 08 02 A6 */ mflr r0 -/* 80238A00 90 01 00 24 */ stw r0, 0x24(r1) -/* 80238A04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80238A08 48 12 97 D5 */ bl _savegpr_29 -/* 80238A0C 7C 7D 1B 78 */ mr r29, r3 -/* 80238A10 4B FF FF 19 */ bl dMsgObject_getFundRaising__Fv -/* 80238A14 7C 1D 1A 14 */ add r0, r29, r3 -/* 80238A18 7C 1D 07 35 */ extsh. r29, r0 -/* 80238A1C 40 80 00 08 */ bge lbl_80238A24 -/* 80238A20 3B A0 00 00 */ li r29, 0 -lbl_80238A24: -/* 80238A24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238A28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238A2C 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 80238A30 7F C3 F3 78 */ mr r3, r30 -/* 80238A34 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000F9FF@ha */ -/* 80238A38 38 84 F9 FF */ addi r4, r4, 0xF9FF /* 0x0000F9FF@l */ -/* 80238A3C 57 BF 04 3E */ clrlwi r31, r29, 0x10 -/* 80238A40 57 A5 C6 3E */ rlwinm r5, r29, 0x18, 0x18, 0x1f -/* 80238A44 4B DF BF 9D */ bl setEventReg__11dSv_event_cFUsUc -/* 80238A48 7F C3 F3 78 */ mr r3, r30 -/* 80238A4C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FAFF@ha */ -/* 80238A50 38 84 FA FF */ addi r4, r4, 0xFAFF /* 0x0000FAFF@l */ -/* 80238A54 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80238A58 4B DF BF 89 */ bl setEventReg__11dSv_event_cFUsUc -/* 80238A5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80238A60 48 12 97 C9 */ bl _restgpr_29 -/* 80238A64 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80238A68 7C 08 03 A6 */ mtlr r0 -/* 80238A6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80238A70 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_addOffering__Fs.s b/asm/d/msg/d_msg_object/dMsgObject_addOffering__Fs.s deleted file mode 100644 index d0510496beb..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_addOffering__Fs.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80238ADC: -/* 80238ADC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238AE0 7C 08 02 A6 */ mflr r0 -/* 80238AE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238AE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80238AEC 93 C1 00 08 */ stw r30, 8(r1) -/* 80238AF0 7C 7E 1B 78 */ mr r30, r3 -/* 80238AF4 4B FF FF 81 */ bl dMsgObject_getOffering__Fv -/* 80238AF8 7C 1E 1A 14 */ add r0, r30, r3 -/* 80238AFC 7C 00 07 35 */ extsh. r0, r0 -/* 80238B00 40 80 00 08 */ bge lbl_80238B08 -/* 80238B04 38 00 00 00 */ li r0, 0 -lbl_80238B08: -/* 80238B08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238B0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238B10 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 80238B14 7F C3 F3 78 */ mr r3, r30 -/* 80238B18 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000F7FF@ha */ -/* 80238B1C 38 84 F7 FF */ addi r4, r4, 0xF7FF /* 0x0000F7FF@l */ -/* 80238B20 54 1F 04 3E */ clrlwi r31, r0, 0x10 -/* 80238B24 54 05 C6 3E */ rlwinm r5, r0, 0x18, 0x18, 0x1f -/* 80238B28 4B DF BE B9 */ bl setEventReg__11dSv_event_cFUsUc -/* 80238B2C 7F C3 F3 78 */ mr r3, r30 -/* 80238B30 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000F8FF@ha */ -/* 80238B34 38 84 F8 FF */ addi r4, r4, 0xF8FF /* 0x0000F8FF@l */ -/* 80238B38 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80238B3C 4B DF BE A5 */ bl setEventReg__11dSv_event_cFUsUc -/* 80238B40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80238B44 83 C1 00 08 */ lwz r30, 8(r1) -/* 80238B48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238B4C 7C 08 03 A6 */ mtlr r0 -/* 80238B50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238B54 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_addTotalPayment__Fs.s b/asm/d/msg/d_msg_object/dMsgObject_addTotalPayment__Fs.s deleted file mode 100644 index bb7869980a1..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_addTotalPayment__Fs.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80238894: -/* 80238894 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80238898 7C 08 02 A6 */ mflr r0 -/* 8023889C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802388A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802388A4 48 12 99 39 */ bl _savegpr_29 -/* 802388A8 7C 7D 1B 78 */ mr r29, r3 -/* 802388AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802388B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802388B4 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802388B8 A8 03 01 7C */ lha r0, 0x17c(r3) -/* 802388BC 7C 00 EA 14 */ add r0, r0, r29 -/* 802388C0 B0 03 01 7C */ sth r0, 0x17c(r3) -/* 802388C4 4B FF FF 01 */ bl dMsgObject_getTotalPayment__Fv -/* 802388C8 7C 1D 1A 14 */ add r0, r29, r3 -/* 802388CC 7C 1D 07 35 */ extsh. r29, r0 -/* 802388D0 40 80 00 08 */ bge lbl_802388D8 -/* 802388D4 3B A0 00 00 */ li r29, 0 -lbl_802388D8: -/* 802388D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802388DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802388E0 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 802388E4 7F C3 F3 78 */ mr r3, r30 -/* 802388E8 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FCFF@ha */ -/* 802388EC 38 84 FC FF */ addi r4, r4, 0xFCFF /* 0x0000FCFF@l */ -/* 802388F0 57 BF 04 3E */ clrlwi r31, r29, 0x10 -/* 802388F4 57 A5 C6 3E */ rlwinm r5, r29, 0x18, 0x18, 0x1f -/* 802388F8 4B DF C0 E9 */ bl setEventReg__11dSv_event_cFUsUc -/* 802388FC 7F C3 F3 78 */ mr r3, r30 -/* 80238900 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 80238904 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 80238908 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 8023890C 4B DF C0 D5 */ bl setEventReg__11dSv_event_cFUsUc -/* 80238910 39 61 00 20 */ addi r11, r1, 0x20 -/* 80238914 48 12 99 15 */ bl _restgpr_29 -/* 80238918 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8023891C 7C 08 03 A6 */ mtlr r0 -/* 80238920 38 21 00 20 */ addi r1, r1, 0x20 -/* 80238924 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_addTotalPrice__Fs.s b/asm/d/msg/d_msg_object/dMsgObject_addTotalPrice__Fs.s deleted file mode 100644 index 669a8f4a037..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_addTotalPrice__Fs.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80238730: -/* 80238730 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80238734 7C 08 02 A6 */ mflr r0 -/* 80238738 90 01 00 24 */ stw r0, 0x24(r1) -/* 8023873C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80238740 48 12 9A 9D */ bl _savegpr_29 -/* 80238744 7C 7D 1B 78 */ mr r29, r3 -/* 80238748 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023874C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238750 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238754 A8 03 01 7A */ lha r0, 0x17a(r3) -/* 80238758 7C 00 EA 14 */ add r0, r0, r29 -/* 8023875C B0 03 01 7A */ sth r0, 0x17a(r3) -/* 80238760 4B FF FF 01 */ bl dMsgObject_getTotalPrice__Fv -/* 80238764 7C 1D 1A 14 */ add r0, r29, r3 -/* 80238768 7C 1D 07 35 */ extsh. r29, r0 -/* 8023876C 40 80 00 08 */ bge lbl_80238774 -/* 80238770 3B A0 00 00 */ li r29, 0 -lbl_80238774: -/* 80238774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023877C 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 80238780 7F C3 F3 78 */ mr r3, r30 -/* 80238784 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FEFF@ha */ -/* 80238788 38 84 FE FF */ addi r4, r4, 0xFEFF /* 0x0000FEFF@l */ -/* 8023878C 57 BF 04 3E */ clrlwi r31, r29, 0x10 -/* 80238790 57 A5 C6 3E */ rlwinm r5, r29, 0x18, 0x18, 0x1f -/* 80238794 4B DF C2 4D */ bl setEventReg__11dSv_event_cFUsUc -/* 80238798 7F C3 F3 78 */ mr r3, r30 -/* 8023879C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FDFF@ha */ -/* 802387A0 38 84 FD FF */ addi r4, r4, 0xFDFF /* 0x0000FDFF@l */ -/* 802387A4 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 802387A8 4B DF C2 39 */ bl setEventReg__11dSv_event_cFUsUc -/* 802387AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802387B0 48 12 9A 79 */ bl _restgpr_29 -/* 802387B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802387B8 7C 08 03 A6 */ mtlr r0 -/* 802387BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802387C0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_getFundRaising__Fv.s b/asm/d/msg/d_msg_object/dMsgObject_getFundRaising__Fv.s deleted file mode 100644 index 749a279721a..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_getFundRaising__Fv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80238928: -/* 80238928 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023892C 7C 08 02 A6 */ mflr r0 -/* 80238930 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238934 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80238938 93 C1 00 08 */ stw r30, 8(r1) -/* 8023893C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238940 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238944 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 80238948 7F C3 F3 78 */ mr r3, r30 -/* 8023894C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000F9FF@ha */ -/* 80238950 38 84 F9 FF */ addi r4, r4, 0xF9FF /* 0x0000F9FF@l */ -/* 80238954 4B DF C0 B1 */ bl getEventReg__11dSv_event_cCFUs -/* 80238958 7C 7F 1B 78 */ mr r31, r3 -/* 8023895C 7F C3 F3 78 */ mr r3, r30 -/* 80238960 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FAFF@ha */ -/* 80238964 38 84 FA FF */ addi r4, r4, 0xFAFF /* 0x0000FAFF@l */ -/* 80238968 4B DF C0 9D */ bl getEventReg__11dSv_event_cCFUs -/* 8023896C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80238970 53 E0 44 2E */ rlwimi r0, r31, 8, 0x10, 0x17 -/* 80238974 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 80238978 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8023897C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80238980 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238984 7C 08 03 A6 */ mtlr r0 -/* 80238988 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023898C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_getOffering__Fv.s b/asm/d/msg/d_msg_object/dMsgObject_getOffering__Fv.s deleted file mode 100644 index 388a3966f9f..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_getOffering__Fv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80238A74: -/* 80238A74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238A78 7C 08 02 A6 */ mflr r0 -/* 80238A7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238A80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80238A84 93 C1 00 08 */ stw r30, 8(r1) -/* 80238A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238A90 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 80238A94 7F C3 F3 78 */ mr r3, r30 -/* 80238A98 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000F7FF@ha */ -/* 80238A9C 38 84 F7 FF */ addi r4, r4, 0xF7FF /* 0x0000F7FF@l */ -/* 80238AA0 4B DF BF 65 */ bl getEventReg__11dSv_event_cCFUs -/* 80238AA4 7C 7F 1B 78 */ mr r31, r3 -/* 80238AA8 7F C3 F3 78 */ mr r3, r30 -/* 80238AAC 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000F8FF@ha */ -/* 80238AB0 38 84 F8 FF */ addi r4, r4, 0xF8FF /* 0x0000F8FF@l */ -/* 80238AB4 4B DF BF 51 */ bl getEventReg__11dSv_event_cCFUs -/* 80238AB8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80238ABC 53 E0 44 2E */ rlwimi r0, r31, 8, 0x10, 0x17 -/* 80238AC0 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 80238AC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80238AC8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80238ACC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238AD0 7C 08 03 A6 */ mtlr r0 -/* 80238AD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238AD8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_getTotalPayment__Fv.s b/asm/d/msg/d_msg_object/dMsgObject_getTotalPayment__Fv.s deleted file mode 100644 index 50cca4787b8..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_getTotalPayment__Fv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_802387C4: -/* 802387C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802387C8 7C 08 02 A6 */ mflr r0 -/* 802387CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802387D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802387D4 93 C1 00 08 */ stw r30, 8(r1) -/* 802387D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802387DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802387E0 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 802387E4 7F C3 F3 78 */ mr r3, r30 -/* 802387E8 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FCFF@ha */ -/* 802387EC 38 84 FC FF */ addi r4, r4, 0xFCFF /* 0x0000FCFF@l */ -/* 802387F0 4B DF C2 15 */ bl getEventReg__11dSv_event_cCFUs -/* 802387F4 7C 7F 1B 78 */ mr r31, r3 -/* 802387F8 7F C3 F3 78 */ mr r3, r30 -/* 802387FC 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 80238800 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 80238804 4B DF C2 01 */ bl getEventReg__11dSv_event_cCFUs -/* 80238808 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8023880C 53 E0 44 2E */ rlwimi r0, r31, 8, 0x10, 0x17 -/* 80238810 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 80238814 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80238818 83 C1 00 08 */ lwz r30, 8(r1) -/* 8023881C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238820 7C 08 03 A6 */ mtlr r0 -/* 80238824 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238828 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_getTotalPrice__Fv.s b/asm/d/msg/d_msg_object/dMsgObject_getTotalPrice__Fv.s deleted file mode 100644 index 3d1c1d22447..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_getTotalPrice__Fv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80238660: -/* 80238660 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238664 7C 08 02 A6 */ mflr r0 -/* 80238668 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023866C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80238670 93 C1 00 08 */ stw r30, 8(r1) -/* 80238674 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238678 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023867C 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 80238680 7F C3 F3 78 */ mr r3, r30 -/* 80238684 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FEFF@ha */ -/* 80238688 38 84 FE FF */ addi r4, r4, 0xFEFF /* 0x0000FEFF@l */ -/* 8023868C 4B DF C3 79 */ bl getEventReg__11dSv_event_cCFUs -/* 80238690 7C 7F 1B 78 */ mr r31, r3 -/* 80238694 7F C3 F3 78 */ mr r3, r30 -/* 80238698 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FDFF@ha */ -/* 8023869C 38 84 FD FF */ addi r4, r4, 0xFDFF /* 0x0000FDFF@l */ -/* 802386A0 4B DF C3 65 */ bl getEventReg__11dSv_event_cCFUs -/* 802386A4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802386A8 53 E0 44 2E */ rlwimi r0, r31, 8, 0x10, 0x17 -/* 802386AC 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 802386B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802386B4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802386B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802386BC 7C 08 03 A6 */ mtlr r0 -/* 802386C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802386C4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_searchSSItem__FPvPv.s b/asm/d/msg/d_msg_object/dMsgObject_searchSSItem__FPvPv.s deleted file mode 100644 index 072a7d5d6f7..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_searchSSItem__FPvPv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80232A44: -/* 80232A44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80232A48 7C 08 02 A6 */ mflr r0 -/* 80232A4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80232A50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80232A54 93 C1 00 08 */ stw r30, 8(r1) -/* 80232A58 7C 7E 1B 78 */ mr r30, r3 -/* 80232A5C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80232A60 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80232A64 83 E4 5D AC */ lwz r31, 0x5dac(r4) -/* 80232A68 4B DE 62 79 */ bl fopAc_IsActor__FPv -/* 80232A6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80232A70 41 82 00 60 */ beq lbl_80232AD0 -/* 80232A74 A8 1E 00 08 */ lha r0, 8(r30) -/* 80232A78 2C 00 01 21 */ cmpwi r0, 0x121 -/* 80232A7C 40 82 00 54 */ bne lbl_80232AD0 -/* 80232A80 7F E3 FB 78 */ mr r3, r31 -/* 80232A84 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 80232A88 81 8C 00 FC */ lwz r12, 0xfc(r12) -/* 80232A8C 7D 89 03 A6 */ mtctr r12 -/* 80232A90 4E 80 04 21 */ bctrl -/* 80232A94 7C 7F 1B 78 */ mr r31, r3 -/* 80232A98 7F C3 F3 78 */ mr r3, r30 -/* 80232A9C 81 9E 05 68 */ lwz r12, 0x568(r30) -/* 80232AA0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80232AA4 7D 89 03 A6 */ mtctr r12 -/* 80232AA8 4E 80 04 21 */ bctrl -/* 80232AAC 7C 03 F8 40 */ cmplw r3, r31 -/* 80232AB0 40 82 00 20 */ bne lbl_80232AD0 -/* 80232AB4 7F C3 F3 78 */ mr r3, r30 -/* 80232AB8 81 9E 05 68 */ lwz r12, 0x568(r30) -/* 80232ABC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80232AC0 7D 89 03 A6 */ mtctr r12 -/* 80232AC4 4E 80 04 21 */ bctrl -/* 80232AC8 38 60 00 00 */ li r3, 0 -/* 80232ACC 48 00 00 08 */ b lbl_80232AD4 -lbl_80232AD0: -/* 80232AD0 38 60 00 00 */ li r3, 0 -lbl_80232AD4: -/* 80232AD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80232AD8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80232ADC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80232AE0 7C 08 03 A6 */ mtlr r0 -/* 80232AE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80232AE8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_setFundRaising__FUs.s b/asm/d/msg/d_msg_object/dMsgObject_setFundRaising__FUs.s deleted file mode 100644 index 76a25a7e19c..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_setFundRaising__FUs.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80238990: -/* 80238990 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238994 7C 08 02 A6 */ mflr r0 -/* 80238998 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023899C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802389A0 93 C1 00 08 */ stw r30, 8(r1) -/* 802389A4 7C 60 1B 78 */ mr r0, r3 -/* 802389A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802389AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802389B0 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 802389B4 7F C3 F3 78 */ mr r3, r30 -/* 802389B8 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000F9FF@ha */ -/* 802389BC 38 84 F9 FF */ addi r4, r4, 0xF9FF /* 0x0000F9FF@l */ -/* 802389C0 54 1F 04 3E */ clrlwi r31, r0, 0x10 -/* 802389C4 54 05 C6 3E */ rlwinm r5, r0, 0x18, 0x18, 0x1f -/* 802389C8 4B DF C0 19 */ bl setEventReg__11dSv_event_cFUsUc -/* 802389CC 7F C3 F3 78 */ mr r3, r30 -/* 802389D0 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FAFF@ha */ -/* 802389D4 38 84 FA FF */ addi r4, r4, 0xFAFF /* 0x0000FAFF@l */ -/* 802389D8 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 802389DC 4B DF C0 05 */ bl setEventReg__11dSv_event_cFUsUc -/* 802389E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802389E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802389E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802389EC 7C 08 03 A6 */ mtlr r0 -/* 802389F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802389F4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_setTotalPayment__FUs.s b/asm/d/msg/d_msg_object/dMsgObject_setTotalPayment__FUs.s deleted file mode 100644 index 08bc606377f..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_setTotalPayment__FUs.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8023882C: -/* 8023882C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238830 7C 08 02 A6 */ mflr r0 -/* 80238834 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238838 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023883C 93 C1 00 08 */ stw r30, 8(r1) -/* 80238840 7C 60 1B 78 */ mr r0, r3 -/* 80238844 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238848 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023884C 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 80238850 7F C3 F3 78 */ mr r3, r30 -/* 80238854 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FCFF@ha */ -/* 80238858 38 84 FC FF */ addi r4, r4, 0xFCFF /* 0x0000FCFF@l */ -/* 8023885C 54 1F 04 3E */ clrlwi r31, r0, 0x10 -/* 80238860 54 05 C6 3E */ rlwinm r5, r0, 0x18, 0x18, 0x1f -/* 80238864 4B DF C1 7D */ bl setEventReg__11dSv_event_cFUsUc -/* 80238868 7F C3 F3 78 */ mr r3, r30 -/* 8023886C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 80238870 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 80238874 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80238878 4B DF C1 69 */ bl setEventReg__11dSv_event_cFUsUc -/* 8023887C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80238880 83 C1 00 08 */ lwz r30, 8(r1) -/* 80238884 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238888 7C 08 03 A6 */ mtlr r0 -/* 8023888C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238890 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_setTotalPrice__FUs.s b/asm/d/msg/d_msg_object/dMsgObject_setTotalPrice__FUs.s deleted file mode 100644 index 6334f1bab0e..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_setTotalPrice__FUs.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_802386C8: -/* 802386C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802386CC 7C 08 02 A6 */ mflr r0 -/* 802386D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802386D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802386D8 93 C1 00 08 */ stw r30, 8(r1) -/* 802386DC 7C 60 1B 78 */ mr r0, r3 -/* 802386E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802386E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802386E8 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 802386EC 7F C3 F3 78 */ mr r3, r30 -/* 802386F0 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FEFF@ha */ -/* 802386F4 38 84 FE FF */ addi r4, r4, 0xFEFF /* 0x0000FEFF@l */ -/* 802386F8 54 1F 04 3E */ clrlwi r31, r0, 0x10 -/* 802386FC 54 05 C6 3E */ rlwinm r5, r0, 0x18, 0x18, 0x1f -/* 80238700 4B DF C2 E1 */ bl setEventReg__11dSv_event_cFUsUc -/* 80238704 7F C3 F3 78 */ mr r3, r30 -/* 80238708 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FDFF@ha */ -/* 8023870C 38 84 FD FF */ addi r4, r4, 0xFDFF /* 0x0000FDFF@l */ -/* 80238710 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80238714 4B DF C2 CD */ bl setEventReg__11dSv_event_cFUsUc -/* 80238718 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8023871C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80238720 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238724 7C 08 03 A6 */ mtlr r0 -/* 80238728 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023872C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/deleteProc__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/deleteProc__12dMsgObject_cFv.s deleted file mode 100644 index 0143538b637..00000000000 --- a/asm/d/msg/d_msg_object/deleteProc__12dMsgObject_cFv.s +++ /dev/null @@ -1,131 +0,0 @@ -lbl_80235EBC: -/* 80235EBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80235EC0 7C 08 02 A6 */ mflr r0 -/* 80235EC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80235EC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80235ECC 93 C1 00 08 */ stw r30, 8(r1) -/* 80235ED0 7C 7F 1B 78 */ mr r31, r3 -/* 80235ED4 80 63 01 48 */ lwz r3, 0x148(r3) -/* 80235ED8 28 03 00 00 */ cmplwi r3, 0 -/* 80235EDC 41 82 00 10 */ beq lbl_80235EEC -/* 80235EE0 4B DD 92 ED */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 80235EE4 38 00 00 00 */ li r0, 0 -/* 80235EE8 90 1F 01 48 */ stw r0, 0x148(r31) -lbl_80235EEC: -/* 80235EEC 7F E3 FB 78 */ mr r3, r31 -/* 80235EF0 38 80 00 01 */ li r4, 1 -/* 80235EF4 48 00 0A 19 */ bl delete_screen__12dMsgObject_cFb -/* 80235EF8 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 80235EFC 48 07 16 D9 */ bl reset__Q28JMessage8TControlFv -/* 80235F00 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 80235F04 80 83 00 04 */ lwz r4, 4(r3) -/* 80235F08 28 04 00 00 */ cmplwi r4, 0 -/* 80235F0C 41 82 00 0C */ beq lbl_80235F18 -/* 80235F10 38 00 00 00 */ li r0, 0 -/* 80235F14 90 04 00 08 */ stw r0, 8(r4) -lbl_80235F18: -/* 80235F18 80 83 00 08 */ lwz r4, 8(r3) -/* 80235F1C 28 04 00 00 */ cmplwi r4, 0 -/* 80235F20 41 82 00 0C */ beq lbl_80235F2C -/* 80235F24 38 00 00 00 */ li r0, 0 -/* 80235F28 90 04 00 08 */ stw r0, 8(r4) -lbl_80235F2C: -/* 80235F2C 38 00 00 00 */ li r0, 0 -/* 80235F30 90 03 00 10 */ stw r0, 0x10(r3) -/* 80235F34 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80235F38 4B FF 38 D9 */ bl resetCharCountBuffer__19jmessage_tReferenceFv -/* 80235F3C 38 00 00 00 */ li r0, 0 -/* 80235F40 B0 1F 01 7E */ sth r0, 0x17e(r31) -/* 80235F44 7F E3 FB 78 */ mr r3, r31 -/* 80235F48 48 00 18 01 */ bl updateEquipBombInfoLocal__12dMsgObject_cFv -/* 80235F4C 38 00 00 FF */ li r0, 0xff -/* 80235F50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80235F54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80235F58 98 03 5E 7C */ stb r0, 0x5e7c(r3) -/* 80235F5C 38 00 FF FF */ li r0, -1 -/* 80235F60 90 03 5E E8 */ stw r0, 0x5ee8(r3) -/* 80235F64 38 00 00 00 */ li r0, 0 -/* 80235F68 98 03 5E 7A */ stb r0, 0x5e7a(r3) -/* 80235F6C 98 03 5E 7B */ stb r0, 0x5e7b(r3) -/* 80235F70 90 03 5E EC */ stw r0, 0x5eec(r3) -/* 80235F74 48 00 19 F5 */ bl offCameraCancelFlag__12dMsgObject_cFv -/* 80235F78 38 60 00 FF */ li r3, 0xff -/* 80235F7C 48 00 25 71 */ bl setMsgOutputType__12dMsgObject_cFUc -/* 80235F80 38 80 00 00 */ li r4, 0 -/* 80235F84 98 9F 04 D2 */ stb r4, 0x4d2(r31) -/* 80235F88 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 80235F8C 83 C3 00 04 */ lwz r30, 4(r3) -/* 80235F90 88 1E 12 4C */ lbz r0, 0x124c(r30) -/* 80235F94 28 00 00 00 */ cmplwi r0, 0 -/* 80235F98 41 82 00 10 */ beq lbl_80235FA8 -/* 80235F9C 98 9E 12 4C */ stb r4, 0x124c(r30) -/* 80235FA0 48 00 23 29 */ bl offMsgSendControl__12dMsgObject_cFv -/* 80235FA4 48 00 23 A9 */ bl offMsgSend__12dMsgObject_cFv -lbl_80235FA8: -/* 80235FA8 88 1E 12 4D */ lbz r0, 0x124d(r30) -/* 80235FAC 28 00 00 00 */ cmplwi r0, 0 -/* 80235FB0 41 82 00 0C */ beq lbl_80235FBC -/* 80235FB4 38 00 00 00 */ li r0, 0 -/* 80235FB8 98 1E 12 4D */ stb r0, 0x124d(r30) -lbl_80235FBC: -/* 80235FBC 88 1F 04 CB */ lbz r0, 0x4cb(r31) -/* 80235FC0 28 00 00 00 */ cmplwi r0, 0 -/* 80235FC4 41 82 00 0C */ beq lbl_80235FD0 -/* 80235FC8 38 00 00 00 */ li r0, 0 -/* 80235FCC 98 1F 04 CB */ stb r0, 0x4cb(r31) -lbl_80235FD0: -/* 80235FD0 88 1F 04 CC */ lbz r0, 0x4cc(r31) -/* 80235FD4 28 00 00 00 */ cmplwi r0, 0 -/* 80235FD8 41 82 00 0C */ beq lbl_80235FE4 -/* 80235FDC 38 00 00 00 */ li r0, 0 -/* 80235FE0 98 1F 04 CC */ stb r0, 0x4cc(r31) -lbl_80235FE4: -/* 80235FE4 88 1F 04 D4 */ lbz r0, 0x4d4(r31) -/* 80235FE8 28 00 00 00 */ cmplwi r0, 0 -/* 80235FEC 41 82 00 0C */ beq lbl_80235FF8 -/* 80235FF0 38 00 00 00 */ li r0, 0 -/* 80235FF4 98 1F 04 D4 */ stb r0, 0x4d4(r31) -lbl_80235FF8: -/* 80235FF8 80 8D 88 84 */ lwz r4, m_control__7dDemo_c(r13) -/* 80235FFC 80 64 00 40 */ lwz r3, 0x40(r4) -/* 80236000 38 03 FF FF */ addi r0, r3, -1 -/* 80236004 90 04 00 40 */ stw r0, 0x40(r4) -/* 80236008 88 1F 04 CE */ lbz r0, 0x4ce(r31) -/* 8023600C 28 00 00 01 */ cmplwi r0, 1 -/* 80236010 40 82 00 18 */ bne lbl_80236028 -/* 80236014 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80236018 38 63 04 C4 */ addi r3, r3, 0x4c4 -/* 8023601C 48 08 00 E9 */ bl talkOut__11Z2StatusMgrFv -/* 80236020 38 00 00 00 */ li r0, 0 -/* 80236024 98 1F 04 CE */ stb r0, 0x4ce(r31) -lbl_80236028: -/* 80236028 38 00 00 00 */ li r0, 0 -/* 8023602C 90 1F 01 3C */ stw r0, 0x13c(r31) -/* 80236030 90 1F 01 40 */ stw r0, 0x140(r31) -/* 80236034 98 1F 04 D1 */ stb r0, 0x4d1(r31) -/* 80236038 7F E3 FB 78 */ mr r3, r31 -/* 8023603C 48 00 15 D5 */ bl resetSelectBomBag__12dMsgObject_cFv -/* 80236040 88 9F 01 A5 */ lbz r4, 0x1a5(r31) -/* 80236044 28 04 00 00 */ cmplwi r4, 0 -/* 80236048 41 82 00 20 */ beq lbl_80236068 -/* 8023604C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80236050 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80236054 A8 03 5D F4 */ lha r0, 0x5df4(r3) -/* 80236058 7C 00 22 14 */ add r0, r0, r4 -/* 8023605C B0 03 5D F4 */ sth r0, 0x5df4(r3) -/* 80236060 38 00 00 00 */ li r0, 0 -/* 80236064 98 1F 01 A5 */ stb r0, 0x1a5(r31) -lbl_80236068: -/* 80236068 38 00 00 FF */ li r0, 0xff -/* 8023606C 98 1F 01 9A */ stb r0, 0x19a(r31) -/* 80236070 38 60 00 00 */ li r3, 0 -/* 80236074 48 00 1A 15 */ bl setNowTalkFlowNo__12dMsgObject_cFs -/* 80236078 7F E3 FB 78 */ mr r3, r31 -/* 8023607C 38 80 00 01 */ li r4, 1 -/* 80236080 48 00 08 65 */ bl setStatusLocal__12dMsgObject_cFUs -/* 80236084 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80236088 83 C1 00 08 */ lwz r30, 8(r1) -/* 8023608C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80236090 7C 08 03 A6 */ mtlr r0 -/* 80236094 38 21 00 10 */ addi r1, r1, 0x10 -/* 80236098 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/delete_screen__12dMsgObject_cFb.s b/asm/d/msg/d_msg_object/delete_screen__12dMsgObject_cFb.s deleted file mode 100644 index 0fbec87c33e..00000000000 --- a/asm/d/msg/d_msg_object/delete_screen__12dMsgObject_cFb.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_8023690C: -/* 8023690C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80236910 7C 08 02 A6 */ mflr r0 -/* 80236914 90 01 00 14 */ stw r0, 0x14(r1) -/* 80236918 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023691C 93 C1 00 08 */ stw r30, 8(r1) -/* 80236920 7C 7E 1B 78 */ mr r30, r3 -/* 80236924 7C 9F 23 78 */ mr r31, r4 -/* 80236928 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 8023692C 28 03 00 00 */ cmplwi r3, 0 -/* 80236930 41 82 00 24 */ beq lbl_80236954 -/* 80236934 41 82 00 18 */ beq lbl_8023694C -/* 80236938 38 80 00 01 */ li r4, 1 -/* 8023693C 81 83 00 00 */ lwz r12, 0(r3) -/* 80236940 81 8C 00 08 */ lwz r12, 8(r12) -/* 80236944 7D 89 03 A6 */ mtctr r12 -/* 80236948 4E 80 04 21 */ bctrl -lbl_8023694C: -/* 8023694C 38 00 00 00 */ li r0, 0 -/* 80236950 90 1E 01 0C */ stw r0, 0x10c(r30) -lbl_80236954: -/* 80236954 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 80236958 28 03 00 00 */ cmplwi r3, 0 -/* 8023695C 41 82 00 48 */ beq lbl_802369A4 -/* 80236960 41 82 00 18 */ beq lbl_80236978 -/* 80236964 38 80 00 01 */ li r4, 1 -/* 80236968 81 83 00 00 */ lwz r12, 0(r3) -/* 8023696C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80236970 7D 89 03 A6 */ mtctr r12 -/* 80236974 4E 80 04 21 */ bctrl -lbl_80236978: -/* 80236978 38 00 00 00 */ li r0, 0 -/* 8023697C 90 1E 01 04 */ stw r0, 0x104(r30) -/* 80236980 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80236984 41 82 00 20 */ beq lbl_802369A4 -/* 80236988 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023698C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80236990 88 03 5E 8F */ lbz r0, 0x5e8f(r3) -/* 80236994 28 00 00 05 */ cmplwi r0, 5 -/* 80236998 40 82 00 0C */ bne lbl_802369A4 -/* 8023699C 38 60 00 07 */ li r3, 7 -/* 802369A0 4B DF 77 E9 */ bl dComIfGp_offHeapLockFlag__Fi -lbl_802369A4: -/* 802369A4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802369A8 41 82 00 18 */ beq lbl_802369C0 -/* 802369AC 80 1E 01 44 */ lwz r0, 0x144(r30) -/* 802369B0 28 00 00 00 */ cmplwi r0, 0 -/* 802369B4 41 82 00 0C */ beq lbl_802369C0 -/* 802369B8 38 00 00 00 */ li r0, 0 -/* 802369BC 90 1E 01 44 */ stw r0, 0x144(r30) -lbl_802369C0: -/* 802369C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802369C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802369C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802369CC 7C 08 03 A6 */ mtlr r0 -/* 802369D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802369D4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/demoMessageGroup__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/demoMessageGroup__12dMsgObject_cFv.s deleted file mode 100644 index 2d0fad65b35..00000000000 --- a/asm/d/msg/d_msg_object/demoMessageGroup__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8023806C: -/* 8023806C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238070 7C 08 02 A6 */ mflr r0 -/* 80238074 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023807C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238080 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238084 4B FF EC 51 */ bl demoMessageGroupLocal__12dMsgObject_cFv -/* 80238088 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023808C 7C 08 03 A6 */ mtlr r0 -/* 80238090 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238094 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/endFlowGroup__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/endFlowGroup__12dMsgObject_cFv.s deleted file mode 100644 index 23e65c02ba7..00000000000 --- a/asm/d/msg/d_msg_object/endFlowGroup__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80238098: -/* 80238098 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023809C 7C 08 02 A6 */ mflr r0 -/* 802380A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802380A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802380A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802380AC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802380B0 4B FF EC 51 */ bl endFlowGroupLocal__12dMsgObject_cFv -/* 802380B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802380B8 7C 08 03 A6 */ mtlr r0 -/* 802380BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802380C0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getActor__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getActor__12dMsgObject_cFv.s deleted file mode 100644 index e1e36d3a334..00000000000 --- a/asm/d/msg/d_msg_object/getActor__12dMsgObject_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8023819C: -/* 8023819C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802381A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802381A4 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802381A8 28 03 00 00 */ cmplwi r3, 0 -/* 802381AC 40 82 00 0C */ bne lbl_802381B8 -/* 802381B0 38 60 00 00 */ li r3, 0 -/* 802381B4 4E 80 00 20 */ blr -lbl_802381B8: -/* 802381B8 80 63 01 00 */ lwz r3, 0x100(r3) -/* 802381BC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getBombBuyPriceLocal__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/getBombBuyPriceLocal__12dMsgObject_cFUc.s deleted file mode 100644 index 4f153d0eb5b..00000000000 --- a/asm/d/msg/d_msg_object/getBombBuyPriceLocal__12dMsgObject_cFUc.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8023759C: -/* 8023759C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802375A0 2C 00 00 71 */ cmpwi r0, 0x71 -/* 802375A4 41 82 00 28 */ beq lbl_802375CC -/* 802375A8 40 80 00 10 */ bge lbl_802375B8 -/* 802375AC 2C 00 00 70 */ cmpwi r0, 0x70 -/* 802375B0 40 80 00 14 */ bge lbl_802375C4 -/* 802375B4 48 00 00 28 */ b lbl_802375DC -lbl_802375B8: -/* 802375B8 2C 00 00 73 */ cmpwi r0, 0x73 -/* 802375BC 40 80 00 20 */ bge lbl_802375DC -/* 802375C0 48 00 00 14 */ b lbl_802375D4 -lbl_802375C4: -/* 802375C4 38 60 00 0F */ li r3, 0xf -/* 802375C8 4E 80 00 20 */ blr -lbl_802375CC: -/* 802375CC 38 60 00 1E */ li r3, 0x1e -/* 802375D0 4E 80 00 20 */ blr -lbl_802375D4: -/* 802375D4 38 60 00 1E */ li r3, 0x1e -/* 802375D8 4E 80 00 20 */ blr -lbl_802375DC: -/* 802375DC 38 60 00 00 */ li r3, 0 -/* 802375E0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getBombName__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getBombName__12dMsgObject_cFv.s deleted file mode 100644 index 436b1539adb..00000000000 --- a/asm/d/msg/d_msg_object/getBombName__12dMsgObject_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8023738C: -/* 8023738C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80237390 7C 08 02 A6 */ mflr r0 -/* 80237394 90 01 00 24 */ stw r0, 0x24(r1) -/* 80237398 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023739C 48 12 AE 41 */ bl _savegpr_29 -/* 802373A0 7C 7D 1B 78 */ mr r29, r3 -/* 802373A4 48 00 10 9D */ bl getSelectCursorPos__12dMsgObject_cFv -/* 802373A8 88 1D 01 93 */ lbz r0, 0x193(r29) -/* 802373AC 28 00 00 00 */ cmplwi r0, 0 -/* 802373B0 41 82 00 14 */ beq lbl_802373C4 -/* 802373B4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802373B8 7C 7D 02 14 */ add r3, r29, r0 -/* 802373BC 88 83 01 90 */ lbz r4, 0x190(r3) -/* 802373C0 48 00 00 08 */ b lbl_802373C8 -lbl_802373C4: -/* 802373C4 7C 64 1B 78 */ mr r4, r3 -lbl_802373C8: -/* 802373C8 80 7D 01 28 */ lwz r3, 0x128(r29) -/* 802373CC 3B E3 00 20 */ addi r31, r3, 0x20 -/* 802373D0 80 03 00 24 */ lwz r0, 0x24(r3) -/* 802373D4 7F DF 02 14 */ add r30, r31, r0 -/* 802373D8 7F A3 EB 78 */ mr r3, r29 -/* 802373DC 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e -/* 802373E0 7C 9D 02 14 */ add r4, r29, r0 -/* 802373E4 A0 84 01 82 */ lhz r4, 0x182(r4) -/* 802373E8 38 84 01 65 */ addi r4, r4, 0x165 -/* 802373EC 4B FF CC E9 */ bl getMessageIndexAlways__12dMsgObject_cFUl -/* 802373F0 1C 03 00 14 */ mulli r0, r3, 0x14 -/* 802373F4 7C 7F 02 14 */ add r3, r31, r0 -/* 802373F8 80 63 00 10 */ lwz r3, 0x10(r3) -/* 802373FC 38 63 00 08 */ addi r3, r3, 8 -/* 80237400 7C 7E 1A 14 */ add r3, r30, r3 -/* 80237404 39 61 00 20 */ addi r11, r1, 0x20 -/* 80237408 48 12 AE 21 */ bl _restgpr_29 -/* 8023740C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80237410 7C 08 03 A6 */ mtlr r0 -/* 80237414 38 21 00 20 */ addi r1, r1, 0x20 -/* 80237418 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getIdx__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getIdx__12dMsgObject_cFv.s deleted file mode 100644 index 8a3c62f76bd..00000000000 --- a/asm/d/msg/d_msg_object/getIdx__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802381D4: -/* 802381D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802381D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802381DC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802381E0 80 63 01 60 */ lwz r3, 0x160(r3) -/* 802381E4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getInsectName__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getInsectName__12dMsgObject_cFv.s deleted file mode 100644 index 505d1277406..00000000000 --- a/asm/d/msg/d_msg_object/getInsectName__12dMsgObject_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8023741C: -/* 8023741C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237420 7C 08 02 A6 */ mflr r0 -/* 80237424 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237428 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023742C 93 C1 00 08 */ stw r30, 8(r1) -/* 80237430 80 83 01 28 */ lwz r4, 0x128(r3) -/* 80237434 3B E4 00 20 */ addi r31, r4, 0x20 -/* 80237438 80 04 00 24 */ lwz r0, 0x24(r4) -/* 8023743C 7F DF 02 14 */ add r30, r31, r0 -/* 80237440 88 83 01 94 */ lbz r4, 0x194(r3) -/* 80237444 38 84 01 65 */ addi r4, r4, 0x165 -/* 80237448 4B FF CC 8D */ bl getMessageIndexAlways__12dMsgObject_cFUl -/* 8023744C 1C 03 00 14 */ mulli r0, r3, 0x14 -/* 80237450 7C 7F 02 14 */ add r3, r31, r0 -/* 80237454 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80237458 38 63 00 08 */ addi r3, r3, 8 -/* 8023745C 7C 7E 1A 14 */ add r3, r30, r3 -/* 80237460 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80237464 83 C1 00 08 */ lwz r30, 8(r1) -/* 80237468 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023746C 7C 08 03 A6 */ mtlr r0 -/* 80237470 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237474 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getLetterName__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getLetterName__12dMsgObject_cFv.s deleted file mode 100644 index 5d63c7dca4d..00000000000 --- a/asm/d/msg/d_msg_object/getLetterName__12dMsgObject_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80237478: -/* 80237478 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023747C 7C 08 02 A6 */ mflr r0 -/* 80237480 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237484 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80237488 93 C1 00 08 */ stw r30, 8(r1) -/* 8023748C 80 83 01 28 */ lwz r4, 0x128(r3) -/* 80237490 3B E4 00 20 */ addi r31, r4, 0x20 -/* 80237494 80 04 00 24 */ lwz r0, 0x24(r4) -/* 80237498 7F DF 02 14 */ add r30, r31, r0 -/* 8023749C A0 83 01 88 */ lhz r4, 0x188(r3) -/* 802374A0 4B FF CC 35 */ bl getMessageIndexAlways__12dMsgObject_cFUl -/* 802374A4 1C 03 00 14 */ mulli r0, r3, 0x14 -/* 802374A8 7C 7F 02 14 */ add r3, r31, r0 -/* 802374AC 80 63 00 10 */ lwz r3, 0x10(r3) -/* 802374B0 38 63 00 08 */ addi r3, r3, 8 -/* 802374B4 7C 7E 1A 14 */ add r3, r30, r3 -/* 802374B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802374BC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802374C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802374C4 7C 08 03 A6 */ mtlr r0 -/* 802374C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802374CC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getMessageGroup__12dMsgObject_cFUl.s b/asm/d/msg/d_msg_object/getMessageGroup__12dMsgObject_cFUl.s deleted file mode 100644 index 0b44e1b57c0..00000000000 --- a/asm/d/msg/d_msg_object/getMessageGroup__12dMsgObject_cFUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8023413C: -/* 8023413C 38 60 00 00 */ li r3, 0 -/* 80234140 28 04 13 88 */ cmplwi r4, 0x1388 -/* 80234144 4C 81 00 20 */ blelr -/* 80234148 A8 6D 8B 48 */ lha r3, s_groupID(r13) -/* 8023414C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getMessageIDAlways__12dMsgObject_cFUl.s b/asm/d/msg/d_msg_object/getMessageIDAlways__12dMsgObject_cFUl.s deleted file mode 100644 index eafa6339612..00000000000 --- a/asm/d/msg/d_msg_object/getMessageIDAlways__12dMsgObject_cFUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80234128: -/* 80234128 80 63 01 28 */ lwz r3, 0x128(r3) -/* 8023412C 1C 04 00 14 */ mulli r0, r4, 0x14 -/* 80234130 7C 63 02 14 */ add r3, r3, r0 -/* 80234134 A0 63 00 34 */ lhz r3, 0x34(r3) -/* 80234138 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getMessageID__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getMessageID__12dMsgObject_cFv.s deleted file mode 100644 index 39cdbdf8da0..00000000000 --- a/asm/d/msg/d_msg_object/getMessageID__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802383D0: -/* 802383D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802383D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802383D8 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802383DC 80 63 01 54 */ lwz r3, 0x154(r3) -/* 802383E0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getMessageIndexAlways__12dMsgObject_cFUl.s b/asm/d/msg/d_msg_object/getMessageIndexAlways__12dMsgObject_cFUl.s deleted file mode 100644 index bc186b9ede9..00000000000 --- a/asm/d/msg/d_msg_object/getMessageIndexAlways__12dMsgObject_cFUl.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_802340D4: -/* 802340D4 38 E0 00 00 */ li r7, 0 -/* 802340D8 38 A0 00 00 */ li r5, 0 -/* 802340DC 80 C3 01 28 */ lwz r6, 0x128(r3) -/* 802340E0 39 06 00 20 */ addi r8, r6, 0x20 -/* 802340E4 A0 C6 00 28 */ lhz r6, 0x28(r6) -/* 802340E8 7C C9 03 A6 */ mtctr r6 -/* 802340EC 28 06 00 00 */ cmplwi r6, 0 -/* 802340F0 40 81 00 28 */ ble lbl_80234118 -lbl_802340F4: -/* 802340F4 38 05 00 14 */ addi r0, r5, 0x14 -/* 802340F8 7C 08 02 2E */ lhzx r0, r8, r0 -/* 802340FC 7C 00 20 40 */ cmplw r0, r4 -/* 80234100 40 82 00 0C */ bne lbl_8023410C -/* 80234104 7C E3 3B 78 */ mr r3, r7 -/* 80234108 48 00 00 10 */ b lbl_80234118 -lbl_8023410C: -/* 8023410C 38 E7 00 01 */ addi r7, r7, 1 -/* 80234110 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80234114 42 00 FF E0 */ bdnz lbl_802340F4 -lbl_80234118: -/* 80234118 7C 07 30 40 */ cmplw r7, r6 -/* 8023411C 4D 80 00 20 */ bltlr -/* 80234120 38 60 02 64 */ li r3, 0x264 -/* 80234124 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getMessageIndex__12dMsgObject_cFUl.s b/asm/d/msg/d_msg_object/getMessageIndex__12dMsgObject_cFUl.s deleted file mode 100644 index 0b0e98330e4..00000000000 --- a/asm/d/msg/d_msg_object/getMessageIndex__12dMsgObject_cFUl.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80233F84: -/* 80233F84 38 E0 00 00 */ li r7, 0 -/* 80233F88 38 A0 00 00 */ li r5, 0 -/* 80233F8C 80 C3 01 30 */ lwz r6, 0x130(r3) -/* 80233F90 39 06 00 20 */ addi r8, r6, 0x20 -/* 80233F94 A0 C6 00 28 */ lhz r6, 0x28(r6) -/* 80233F98 7C C9 03 A6 */ mtctr r6 -/* 80233F9C 28 06 00 00 */ cmplwi r6, 0 -/* 80233FA0 40 81 00 28 */ ble lbl_80233FC8 -lbl_80233FA4: -/* 80233FA4 38 05 00 14 */ addi r0, r5, 0x14 -/* 80233FA8 7C 08 02 2E */ lhzx r0, r8, r0 -/* 80233FAC 7C 00 20 40 */ cmplw r0, r4 -/* 80233FB0 40 82 00 0C */ bne lbl_80233FBC -/* 80233FB4 7C E3 3B 78 */ mr r3, r7 -/* 80233FB8 48 00 00 10 */ b lbl_80233FC8 -lbl_80233FBC: -/* 80233FBC 38 E7 00 01 */ addi r7, r7, 1 -/* 80233FC0 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80233FC4 42 00 FF E0 */ bdnz lbl_80233FA4 -lbl_80233FC8: -/* 80233FC8 7C 07 30 40 */ cmplw r7, r6 -/* 80233FCC 4D 80 00 20 */ bltlr -/* 80233FD0 38 60 02 64 */ li r3, 0x264 -/* 80233FD4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getMsgDtPtr__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getMsgDtPtr__12dMsgObject_cFv.s deleted file mode 100644 index 747cc837cd6..00000000000 --- a/asm/d/msg/d_msg_object/getMsgDtPtr__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80238174: -/* 80238174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238178 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023817C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238180 80 63 01 30 */ lwz r3, 0x130(r3) -/* 80238184 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getMsgOutputType__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getMsgOutputType__12dMsgObject_cFv.s deleted file mode 100644 index ecc9adc058f..00000000000 --- a/asm/d/msg/d_msg_object/getMsgOutputType__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80238500: -/* 80238500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238508 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8023850C 88 63 04 C8 */ lbz r3, 0x4c8(r3) -/* 80238510 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getNodeIdx__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getNodeIdx__12dMsgObject_cFv.s deleted file mode 100644 index 15b121919bd..00000000000 --- a/asm/d/msg/d_msg_object/getNodeIdx__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802381E8: -/* 802381E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802381EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802381F0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802381F4 A0 63 01 64 */ lhz r3, 0x164(r3) -/* 802381F8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getNowTalkFlowNo__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getNowTalkFlowNo__12dMsgObject_cFv.s deleted file mode 100644 index fabd0bd4588..00000000000 --- a/asm/d/msg/d_msg_object/getNowTalkFlowNo__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80237A9C: -/* 80237A9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237AA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237AA4 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80237AA8 A8 63 01 70 */ lha r3, 0x170(r3) -/* 80237AAC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getScrnDrawPtr__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getScrnDrawPtr__12dMsgObject_cFv.s deleted file mode 100644 index 8d3726a648d..00000000000 --- a/asm/d/msg/d_msg_object/getScrnDrawPtr__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80238258: -/* 80238258 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023825C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238260 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238264 80 63 01 04 */ lwz r3, 0x104(r3) -/* 80238268 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getSelectBombBagIDLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getSelectBombBagIDLocal__12dMsgObject_cFv.s deleted file mode 100644 index eab9036a169..00000000000 --- a/asm/d/msg/d_msg_object/getSelectBombBagIDLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8023763C: -/* 8023763C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237640 7C 08 02 A6 */ mflr r0 -/* 80237644 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237648 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023764C 7C 7F 1B 78 */ mr r31, r3 -/* 80237650 48 00 0D F1 */ bl getSelectCursorPos__12dMsgObject_cFv -/* 80237654 88 1F 01 93 */ lbz r0, 0x193(r31) -/* 80237658 28 00 00 00 */ cmplwi r0, 0 -/* 8023765C 41 82 00 10 */ beq lbl_8023766C -/* 80237660 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80237664 7C 7F 02 14 */ add r3, r31, r0 -/* 80237668 88 63 01 90 */ lbz r3, 0x190(r3) -lbl_8023766C: -/* 8023766C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80237670 7C 7F 02 14 */ add r3, r31, r0 -/* 80237674 88 63 01 8D */ lbz r3, 0x18d(r3) -/* 80237678 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8023767C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237680 7C 08 03 A6 */ mtlr r0 -/* 80237684 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237688 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getSelectBombNum__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getSelectBombNum__12dMsgObject_cFv.s deleted file mode 100644 index e71566c98db..00000000000 --- a/asm/d/msg/d_msg_object/getSelectBombNum__12dMsgObject_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_802374D0: -/* 802374D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802374D4 7C 08 02 A6 */ mflr r0 -/* 802374D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802374DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802374E0 7C 7F 1B 78 */ mr r31, r3 -/* 802374E4 48 00 0F 5D */ bl getSelectCursorPos__12dMsgObject_cFv -/* 802374E8 88 1F 01 93 */ lbz r0, 0x193(r31) -/* 802374EC 28 00 00 00 */ cmplwi r0, 0 -/* 802374F0 41 82 00 10 */ beq lbl_80237500 -/* 802374F4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802374F8 7C 7F 02 14 */ add r3, r31, r0 -/* 802374FC 88 63 01 90 */ lbz r3, 0x190(r3) -lbl_80237500: -/* 80237500 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80237504 7C 7F 02 14 */ add r3, r31, r0 -/* 80237508 88 63 01 8A */ lbz r3, 0x18a(r3) -/* 8023750C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80237510 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237514 7C 08 03 A6 */ mtlr r0 -/* 80237518 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023751C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getSelectCursorPosLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getSelectCursorPosLocal__12dMsgObject_cFv.s deleted file mode 100644 index e87a0499b7d..00000000000 --- a/asm/d/msg/d_msg_object/getSelectCursorPosLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80237E58: -/* 80237E58 80 63 01 20 */ lwz r3, 0x120(r3) -/* 80237E5C 80 63 00 04 */ lwz r3, 4(r3) -/* 80237E60 88 63 12 44 */ lbz r3, 0x1244(r3) -/* 80237E64 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getSelectCursorPos__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getSelectCursorPos__12dMsgObject_cFv.s deleted file mode 100644 index 6bbcbb293e9..00000000000 --- a/asm/d/msg/d_msg_object/getSelectCursorPos__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80238440: -/* 80238440 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238444 7C 08 02 A6 */ mflr r0 -/* 80238448 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023844C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238450 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238454 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238458 4B FF FA 01 */ bl getSelectCursorPosLocal__12dMsgObject_cFv -/* 8023845C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238460 7C 08 03 A6 */ mtlr r0 -/* 80238464 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238468 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getSelectWordFlag__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getSelectWordFlag__12dMsgObject_cFv.s deleted file mode 100644 index 1f791731876..00000000000 --- a/asm/d/msg/d_msg_object/getSelectWordFlag__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80238574: -/* 80238574 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238578 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023857C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238580 88 63 04 C6 */ lbz r3, 0x4c6(r3) -/* 80238584 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getSelectWord__12dMsgObject_cFi.s b/asm/d/msg/d_msg_object/getSelectWord__12dMsgObject_cFi.s deleted file mode 100644 index 8c0dc59c79b..00000000000 --- a/asm/d/msg/d_msg_object/getSelectWord__12dMsgObject_cFi.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80238528: -/* 80238528 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023852C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238530 80 04 5D BC */ lwz r0, 0x5dbc(r4) -/* 80238534 1C 63 00 C8 */ mulli r3, r3, 0xc8 -/* 80238538 38 63 02 6E */ addi r3, r3, 0x26e -/* 8023853C 7C 60 1A 14 */ add r3, r0, r3 -/* 80238540 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getSmellTypeMessageID__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getSmellTypeMessageID__12dMsgObject_cFv.s deleted file mode 100644 index b9036d84738..00000000000 --- a/asm/d/msg/d_msg_object/getSmellTypeMessageID__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802383E4: -/* 802383E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802383E8 7C 08 02 A6 */ mflr r0 -/* 802383EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802383F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802383F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802383F8 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802383FC 4B FF F9 DD */ bl getSmellTypeMessageIDLocal__12dMsgObject_cFv -/* 80238400 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238404 7C 08 03 A6 */ mtlr r0 -/* 80238408 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023840C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getStatusLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getStatusLocal__12dMsgObject_cFv.s deleted file mode 100644 index 902b0037cb1..00000000000 --- a/asm/d/msg/d_msg_object/getStatusLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802368F8: -/* 802368F8 80 63 01 20 */ lwz r3, 0x120(r3) -/* 802368FC 80 63 00 04 */ lwz r3, 4(r3) -/* 80236900 80 63 05 BC */ lwz r3, 0x5bc(r3) -/* 80236904 A0 63 00 00 */ lhz r3, 0(r3) -/* 80236908 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getStatus__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getStatus__12dMsgObject_cFv.s deleted file mode 100644 index 701d69a374e..00000000000 --- a/asm/d/msg/d_msg_object/getStatus__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8023822C: -/* 8023822C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238230 7C 08 02 A6 */ mflr r0 -/* 80238234 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238238 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023823C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238240 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238244 4B FF E6 B5 */ bl getStatusLocal__12dMsgObject_cFv -/* 80238248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023824C 7C 08 03 A6 */ mtlr r0 -/* 80238250 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238254 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs.s b/asm/d/msg/d_msg_object/getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs.s deleted file mode 100644 index d458127b043..00000000000 --- a/asm/d/msg/d_msg_object/getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_802380F4: -/* 802380F4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802380F8 7C 08 02 A6 */ mflr r0 -/* 802380FC 90 01 00 34 */ stw r0, 0x34(r1) -/* 80238100 39 61 00 30 */ addi r11, r1, 0x30 -/* 80238104 48 12 A0 D1 */ bl _savegpr_27 -/* 80238108 7C 7B 1B 78 */ mr r27, r3 -/* 8023810C 7C 9C 23 78 */ mr r28, r4 -/* 80238110 7C BD 2B 78 */ mr r29, r5 -/* 80238114 7C DE 33 78 */ mr r30, r6 -/* 80238118 7C FF 3B 78 */ mr r31, r7 -/* 8023811C 7D 0C 43 78 */ mr r12, r8 -/* 80238120 7D 2B 4B 78 */ mr r11, r9 -/* 80238124 80 01 00 38 */ lwz r0, 0x38(r1) -/* 80238128 91 41 00 08 */ stw r10, 8(r1) -/* 8023812C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80238130 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238134 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238138 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8023813C 7F 64 DB 78 */ mr r4, r27 -/* 80238140 7F 85 E3 78 */ mr r5, r28 -/* 80238144 7F A6 EB 78 */ mr r6, r29 -/* 80238148 7F C7 F3 78 */ mr r7, r30 -/* 8023814C 7F E8 FB 78 */ mr r8, r31 -/* 80238150 7D 89 63 78 */ mr r9, r12 -/* 80238154 7D 6A 5B 78 */ mr r10, r11 -/* 80238158 4B FF EC 8D */ bl getStringLocal__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs -/* 8023815C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80238160 48 12 A0 C1 */ bl _restgpr_27 -/* 80238164 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80238168 7C 08 03 A6 */ mtlr r0 -/* 8023816C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80238170 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getTalkHeap__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getTalkHeap__12dMsgObject_cFv.s deleted file mode 100644 index 67194b85e19..00000000000 --- a/asm/d/msg/d_msg_object/getTalkHeap__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80237B54: -/* 80237B54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237B58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237B5C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80237B60 80 63 01 44 */ lwz r3, 0x144(r3) -/* 80237B64 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getWord__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getWord__12dMsgObject_cFv.s deleted file mode 100644 index 18758de4732..00000000000 --- a/asm/d/msg/d_msg_object/getWord__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80238514: -/* 80238514 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238518 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023851C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238520 38 63 01 A6 */ addi r3, r3, 0x1a6 -/* 80238524 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getpTalkActor__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getpTalkActor__12dMsgObject_cFv.s deleted file mode 100644 index 57e5f200d86..00000000000 --- a/asm/d/msg/d_msg_object/getpTalkActor__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802381C0: -/* 802381C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802381C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802381C8 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802381CC 80 63 01 38 */ lwz r3, 0x138(r3) -/* 802381D0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/inputProc__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/inputProc__12dMsgObject_cFv.s deleted file mode 100644 index 5806fc18f05..00000000000 --- a/asm/d/msg/d_msg_object/inputProc__12dMsgObject_cFv.s +++ /dev/null @@ -1,136 +0,0 @@ -lbl_802358D4: -/* 802358D4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802358D8 7C 08 02 A6 */ mflr r0 -/* 802358DC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802358E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802358E4 48 12 C8 F1 */ bl _savegpr_27 -/* 802358E8 7C 7C 1B 78 */ mr r28, r3 -/* 802358EC 38 00 00 01 */ li r0, 1 -/* 802358F0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802358F4 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802358F8 98 1E 00 BD */ stb r0, 0xbd(r30) -/* 802358FC 80 7C 01 18 */ lwz r3, 0x118(r28) -/* 80235900 4B FF 3B A9 */ bl inputNumber__19jmessage_tReferenceFv -/* 80235904 7F 83 E3 78 */ mr r3, r28 -/* 80235908 48 00 10 D1 */ bl isSend__12dMsgObject_cFv -/* 8023590C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80235910 41 82 01 AC */ beq lbl_80235ABC -/* 80235914 38 00 00 00 */ li r0, 0 -/* 80235918 98 1C 01 99 */ stb r0, 0x199(r28) -/* 8023591C 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 80235920 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 80235924 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80235928 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 -/* 8023592C 41 82 01 58 */ beq lbl_80235A84 -/* 80235930 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80235934 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80235938 3B A3 0D D8 */ addi r29, r3, 0xdd8 -/* 8023593C 7F A3 EB 78 */ mr r3, r29 -/* 80235940 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 80235944 3B E4 90 C0 */ addi r31, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 80235948 A0 9F 00 A0 */ lhz r4, 0xa0(r31) -/* 8023594C 4B DF F0 71 */ bl isEventBit__11dSv_event_cCFUs -/* 80235950 7C 7B 1B 78 */ mr r27, r3 -/* 80235954 A8 1C 01 74 */ lha r0, 0x174(r28) -/* 80235958 2C 00 00 00 */ cmpwi r0, 0 -/* 8023595C 40 81 00 30 */ ble lbl_8023598C -/* 80235960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80235964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80235968 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8023596C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80235970 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80235974 A0 84 06 44 */ lhz r4, 0x644(r4) -/* 80235978 4B DF F0 45 */ bl isEventBit__11dSv_event_cCFUs -/* 8023597C 2C 03 00 00 */ cmpwi r3, 0 -/* 80235980 40 82 00 0C */ bne lbl_8023598C -/* 80235984 38 00 00 01 */ li r0, 1 -/* 80235988 98 1C 04 D0 */ stb r0, 0x4d0(r28) -lbl_8023598C: -/* 8023598C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80235990 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80235994 80 85 5D C4 */ lwz r4, 0x5dc4(r5) -/* 80235998 A8 7C 01 74 */ lha r3, 0x174(r28) -/* 8023599C 7C 03 00 D0 */ neg r0, r3 -/* 802359A0 7C 04 02 14 */ add r0, r4, r0 -/* 802359A4 90 05 5D C4 */ stw r0, 0x5dc4(r5) -/* 802359A8 2C 1B 00 00 */ cmpwi r27, 0 -/* 802359AC 41 82 00 AC */ beq lbl_80235A58 -/* 802359B0 7C 60 07 35 */ extsh. r0, r3 -/* 802359B4 40 81 00 94 */ ble lbl_80235A48 -/* 802359B8 48 00 30 41 */ bl dMsgObject_addFundRaising__Fs -/* 802359BC 48 00 2F 6D */ bl dMsgObject_getFundRaising__Fv -/* 802359C0 48 00 2F 69 */ bl dMsgObject_getFundRaising__Fv -/* 802359C4 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 802359C8 A8 1C 01 76 */ lha r0, 0x176(r28) -/* 802359CC 7C 03 00 00 */ cmpw r3, r0 -/* 802359D0 41 80 00 9C */ blt lbl_80235A6C -/* 802359D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802359D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802359DC 3B 63 07 F0 */ addi r27, r3, 0x7f0 -/* 802359E0 7F 63 DB 78 */ mr r3, r27 -/* 802359E4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 802359E8 3B E4 72 88 */ addi r31, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 802359EC A0 9F 00 F8 */ lhz r4, 0xf8(r31) -/* 802359F0 4B DF EF CD */ bl isEventBit__11dSv_event_cCFUs -/* 802359F4 2C 03 00 00 */ cmpwi r3, 0 -/* 802359F8 40 82 00 74 */ bne lbl_80235A6C -/* 802359FC 7F 63 DB 78 */ mr r3, r27 -/* 80235A00 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80235A04 3B A4 72 88 */ addi r29, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80235A08 A0 9D 02 F0 */ lhz r4, 0x2f0(r29) -/* 80235A0C 4B DF EF B1 */ bl isEventBit__11dSv_event_cCFUs -/* 80235A10 2C 03 00 00 */ cmpwi r3, 0 -/* 80235A14 40 82 00 1C */ bne lbl_80235A30 -/* 80235A18 7F 63 DB 78 */ mr r3, r27 -/* 80235A1C A0 9D 02 F0 */ lhz r4, 0x2f0(r29) -/* 80235A20 4B DF EF 6D */ bl onEventBit__11dSv_event_cFUs -/* 80235A24 38 60 00 00 */ li r3, 0 -/* 80235A28 48 00 2F 69 */ bl dMsgObject_setFundRaising__FUs -/* 80235A2C 48 00 00 40 */ b lbl_80235A6C -lbl_80235A30: -/* 80235A30 7F 63 DB 78 */ mr r3, r27 -/* 80235A34 A0 9F 00 F8 */ lhz r4, 0xf8(r31) -/* 80235A38 4B DF EF 55 */ bl onEventBit__11dSv_event_cFUs -/* 80235A3C 38 60 00 00 */ li r3, 0 -/* 80235A40 48 00 2F 51 */ bl dMsgObject_setFundRaising__FUs -/* 80235A44 48 00 00 28 */ b lbl_80235A6C -lbl_80235A48: -/* 80235A48 7F A3 EB 78 */ mr r3, r29 -/* 80235A4C A0 9F 00 A0 */ lhz r4, 0xa0(r31) -/* 80235A50 4B DF EF 55 */ bl offEventBit__11dSv_event_cFUs -/* 80235A54 48 00 00 18 */ b lbl_80235A6C -lbl_80235A58: -/* 80235A58 48 00 2E 3D */ bl dMsgObject_addTotalPayment__Fs -/* 80235A5C 3C 60 80 23 */ lis r3, dMsgObject_searchSSItem__FPvPv@ha /* 0x80232A44@ha */ -/* 80235A60 38 63 2A 44 */ addi r3, r3, dMsgObject_searchSSItem__FPvPv@l /* 0x80232A44@l */ -/* 80235A64 7F 84 E3 78 */ mr r4, r28 -/* 80235A68 4B DE B8 D1 */ bl fpcEx_Search__FPFPvPv_PvPv -lbl_80235A6C: -/* 80235A6C 38 00 00 00 */ li r0, 0 -/* 80235A70 98 1E 00 BD */ stb r0, 0xbd(r30) -/* 80235A74 7F 83 E3 78 */ mr r3, r28 -/* 80235A78 38 80 00 0E */ li r4, 0xe -/* 80235A7C 48 00 0E 69 */ bl setStatusLocal__12dMsgObject_cFUs -/* 80235A80 48 00 00 3C */ b lbl_80235ABC -lbl_80235A84: -/* 80235A84 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 80235A88 41 82 00 34 */ beq lbl_80235ABC -/* 80235A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80235A90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80235A94 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 80235A98 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 80235A9C 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 80235AA0 A0 84 00 A0 */ lhz r4, 0xa0(r4) -/* 80235AA4 4B DF EF 01 */ bl offEventBit__11dSv_event_cFUs -/* 80235AA8 38 00 00 00 */ li r0, 0 -/* 80235AAC 98 1E 00 BD */ stb r0, 0xbd(r30) -/* 80235AB0 7F 83 E3 78 */ mr r3, r28 -/* 80235AB4 38 80 00 0E */ li r4, 0xe -/* 80235AB8 48 00 0E 2D */ bl setStatusLocal__12dMsgObject_cFUs -lbl_80235ABC: -/* 80235ABC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80235AC0 48 12 C7 61 */ bl _restgpr_27 -/* 80235AC4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80235AC8 7C 08 03 A6 */ mtlr r0 -/* 80235ACC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80235AD0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isBossMessage__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isBossMessage__12dMsgObject_cFv.s deleted file mode 100644 index ad620824b65..00000000000 --- a/asm/d/msg/d_msg_object/isBossMessage__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802371F8: -/* 802371F8 88 03 01 9A */ lbz r0, 0x19a(r3) -/* 802371FC 20 00 00 13 */ subfic r0, r0, 0x13 -/* 80237200 7C 00 00 34 */ cntlzw r0, r0 -/* 80237204 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 80237208 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isCameraCancelFlag__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isCameraCancelFlag__12dMsgObject_cFv.s deleted file mode 100644 index f8d923cfd10..00000000000 --- a/asm/d/msg/d_msg_object/isCameraCancelFlag__12dMsgObject_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80237934: -/* 80237934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237938 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023793C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80237940 88 63 01 9E */ lbz r3, 0x19e(r3) -/* 80237944 30 03 FF FF */ addic r0, r3, -1 -/* 80237948 7C 60 19 10 */ subfe r3, r0, r3 -/* 8023794C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isDraw__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isDraw__12dMsgObject_cFv.s deleted file mode 100644 index 02b47893631..00000000000 --- a/asm/d/msg/d_msg_object/isDraw__12dMsgObject_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80237B68: -/* 80237B68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237B6C 7C 08 02 A6 */ mflr r0 -/* 80237B70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237B74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80237B78 7C 7F 1B 78 */ mr r31, r3 -/* 80237B7C 4B FF ED 7D */ bl getStatusLocal__12dMsgObject_cFv -/* 80237B80 54 60 04 3F */ clrlwi. r0, r3, 0x10 -/* 80237B84 41 82 00 60 */ beq lbl_80237BE4 -/* 80237B88 7F E3 FB 78 */ mr r3, r31 -/* 80237B8C 4B FF ED 6D */ bl getStatusLocal__12dMsgObject_cFv -/* 80237B90 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80237B94 28 00 00 01 */ cmplwi r0, 1 -/* 80237B98 41 82 00 4C */ beq lbl_80237BE4 -/* 80237B9C 88 1F 04 C7 */ lbz r0, 0x4c7(r31) -/* 80237BA0 28 00 00 00 */ cmplwi r0, 0 -/* 80237BA4 40 82 00 40 */ bne lbl_80237BE4 -/* 80237BA8 7F E3 FB 78 */ mr r3, r31 -/* 80237BAC 4B FF ED 4D */ bl getStatusLocal__12dMsgObject_cFv -/* 80237BB0 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80237BB4 28 00 00 0B */ cmplwi r0, 0xb -/* 80237BB8 41 82 00 2C */ beq lbl_80237BE4 -/* 80237BBC 7F E3 FB 78 */ mr r3, r31 -/* 80237BC0 4B FF ED 39 */ bl getStatusLocal__12dMsgObject_cFv -/* 80237BC4 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80237BC8 28 00 00 06 */ cmplwi r0, 6 -/* 80237BCC 40 82 00 10 */ bne lbl_80237BDC -/* 80237BD0 A0 1F 01 66 */ lhz r0, 0x166(r31) -/* 80237BD4 28 00 00 0F */ cmplwi r0, 0xf -/* 80237BD8 41 82 00 0C */ beq lbl_80237BE4 -lbl_80237BDC: -/* 80237BDC 38 60 00 01 */ li r3, 1 -/* 80237BE0 48 00 00 08 */ b lbl_80237BE8 -lbl_80237BE4: -/* 80237BE4 38 60 00 00 */ li r3, 0 -lbl_80237BE8: -/* 80237BE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80237BEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237BF0 7C 08 03 A6 */ mtlr r0 -/* 80237BF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237BF8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isHowlHearingModeLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isHowlHearingModeLocal__12dMsgObject_cFv.s deleted file mode 100644 index bea9923f013..00000000000 --- a/asm/d/msg/d_msg_object/isHowlHearingModeLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_802378D4: -/* 802378D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802378D8 7C 08 02 A6 */ mflr r0 -/* 802378DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802378E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802378E4 93 C1 00 08 */ stw r30, 8(r1) -/* 802378E8 7C 7E 1B 78 */ mr r30, r3 -/* 802378EC 3B E0 00 00 */ li r31, 0 -/* 802378F0 4B FF F7 F9 */ bl isHowlMessage__12dMsgObject_cFv -/* 802378F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802378F8 41 82 00 20 */ beq lbl_80237918 -/* 802378FC 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 80237900 28 03 00 00 */ cmplwi r3, 0 -/* 80237904 41 82 00 14 */ beq lbl_80237918 -/* 80237908 88 03 27 98 */ lbz r0, 0x2798(r3) -/* 8023790C 28 00 00 03 */ cmplwi r0, 3 -/* 80237910 40 82 00 08 */ bne lbl_80237918 -/* 80237914 3B E0 00 01 */ li r31, 1 -lbl_80237918: -/* 80237918 7F E3 FB 78 */ mr r3, r31 -/* 8023791C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80237920 83 C1 00 08 */ lwz r30, 8(r1) -/* 80237924 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237928 7C 08 03 A6 */ mtlr r0 -/* 8023792C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237930 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isKillMessageFlag__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isKillMessageFlag__12dMsgObject_cFv.s deleted file mode 100644 index 5b0f980a67e..00000000000 --- a/asm/d/msg/d_msg_object/isKillMessageFlag__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80237980: -/* 80237980 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237984 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237988 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8023798C 88 63 04 D2 */ lbz r3, 0x4d2(r3) -/* 80237990 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isMidonaMessage__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isMidonaMessage__12dMsgObject_cFv.s deleted file mode 100644 index 3f918f8fe22..00000000000 --- a/asm/d/msg/d_msg_object/isMidonaMessage__12dMsgObject_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_802370FC: -/* 802370FC 88 03 01 9A */ lbz r0, 0x19a(r3) -/* 80237100 28 00 00 0D */ cmplwi r0, 0xd -/* 80237104 40 82 00 2C */ bne lbl_80237130 -/* 80237108 80 63 01 18 */ lwz r3, 0x118(r3) -/* 8023710C A0 03 05 DE */ lhz r0, 0x5de(r3) -/* 80237110 28 00 07 D3 */ cmplwi r0, 0x7d3 -/* 80237114 41 82 00 14 */ beq lbl_80237128 -/* 80237118 28 00 07 F6 */ cmplwi r0, 0x7f6 -/* 8023711C 41 82 00 0C */ beq lbl_80237128 -/* 80237120 28 00 07 FA */ cmplwi r0, 0x7fa -/* 80237124 40 82 00 0C */ bne lbl_80237130 -lbl_80237128: -/* 80237128 38 60 00 01 */ li r3, 1 -/* 8023712C 4E 80 00 20 */ blr -lbl_80237130: -/* 80237130 38 60 00 00 */ li r3, 0 -/* 80237134 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isMidonaNormalTalkWait__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isMidonaNormalTalkWait__12dMsgObject_cFv.s deleted file mode 100644 index 2dd3d54637a..00000000000 --- a/asm/d/msg/d_msg_object/isMidonaNormalTalkWait__12dMsgObject_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80237138: -/* 80237138 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023713C 7C 08 02 A6 */ mflr r0 -/* 80237140 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237144 88 03 01 9A */ lbz r0, 0x19a(r3) -/* 80237148 28 00 00 0D */ cmplwi r0, 0xd -/* 8023714C 40 82 00 50 */ bne lbl_8023719C -/* 80237150 4B FF FF AD */ bl isMidonaMessage__12dMsgObject_cFv -/* 80237154 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80237158 40 82 00 44 */ bne lbl_8023719C -/* 8023715C 80 6D 8A 98 */ lwz r3, m_midnaActor__9daPy_py_c(r13) -/* 80237160 28 03 00 00 */ cmplwi r3, 0 -/* 80237164 41 82 00 30 */ beq lbl_80237194 -/* 80237168 38 00 00 00 */ li r0, 0 -/* 8023716C 88 63 08 4E */ lbz r3, 0x84e(r3) -/* 80237170 28 03 00 02 */ cmplwi r3, 2 -/* 80237174 41 82 00 0C */ beq lbl_80237180 -/* 80237178 28 03 00 01 */ cmplwi r3, 1 -/* 8023717C 40 82 00 08 */ bne lbl_80237184 -lbl_80237180: -/* 80237180 38 00 00 01 */ li r0, 1 -lbl_80237184: -/* 80237184 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80237188 40 82 00 0C */ bne lbl_80237194 -/* 8023718C 38 60 00 01 */ li r3, 1 -/* 80237190 48 00 00 10 */ b lbl_802371A0 -lbl_80237194: -/* 80237194 38 60 00 00 */ li r3, 0 -/* 80237198 48 00 00 08 */ b lbl_802371A0 -lbl_8023719C: -/* 8023719C 38 60 00 01 */ li r3, 1 -lbl_802371A0: -/* 802371A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802371A4 7C 08 03 A6 */ mtlr r0 -/* 802371A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802371AC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isMidonaTalkWait__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isMidonaTalkWait__12dMsgObject_cFv.s deleted file mode 100644 index 705a3e89332..00000000000 --- a/asm/d/msg/d_msg_object/isMidonaTalkWait__12dMsgObject_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802371B0: -/* 802371B0 80 8D 8A 98 */ lwz r4, m_midnaActor__9daPy_py_c(r13) -/* 802371B4 28 04 00 00 */ cmplwi r4, 0 -/* 802371B8 41 82 00 24 */ beq lbl_802371DC -/* 802371BC 38 60 00 00 */ li r3, 0 -/* 802371C0 88 04 08 4E */ lbz r0, 0x84e(r4) -/* 802371C4 28 00 00 02 */ cmplwi r0, 2 -/* 802371C8 41 82 00 0C */ beq lbl_802371D4 -/* 802371CC 28 00 00 01 */ cmplwi r0, 1 -/* 802371D0 4C 82 00 20 */ bnelr -lbl_802371D4: -/* 802371D4 38 60 00 01 */ li r3, 1 -/* 802371D8 4E 80 00 20 */ blr -lbl_802371DC: -/* 802371DC 38 60 00 00 */ li r3, 0 -/* 802371E0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isMouthCheckLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isMouthCheckLocal__12dMsgObject_cFv.s deleted file mode 100644 index de869532b10..00000000000 --- a/asm/d/msg/d_msg_object/isMouthCheckLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80237588: -/* 80237588 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 8023758C 88 63 00 B0 */ lbz r3, 0xb0(r3) -/* 80237590 30 03 FF FF */ addic r0, r3, -1 -/* 80237594 7C 60 19 10 */ subfe r3, r0, r3 -/* 80237598 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isMouthCheck__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isMouthCheck__12dMsgObject_cFv.s deleted file mode 100644 index 5e8de7b5a13..00000000000 --- a/asm/d/msg/d_msg_object/isMouthCheck__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802383A4: -/* 802383A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802383A8 7C 08 02 A6 */ mflr r0 -/* 802383AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802383B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802383B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802383B8 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802383BC 4B FF F1 CD */ bl isMouthCheckLocal__12dMsgObject_cFv -/* 802383C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802383C4 7C 08 03 A6 */ mtlr r0 -/* 802383C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802383CC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isMsgSendControlLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isMsgSendControlLocal__12dMsgObject_cFv.s deleted file mode 100644 index 929a8b01018..00000000000 --- a/asm/d/msg/d_msg_object/isMsgSendControlLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80237550: -/* 80237550 88 03 01 95 */ lbz r0, 0x195(r3) -/* 80237554 54 03 07 FE */ clrlwi r3, r0, 0x1f -/* 80237558 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isMsgSendControl__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isMsgSendControl__12dMsgObject_cFv.s deleted file mode 100644 index 0e42ceaac76..00000000000 --- a/asm/d/msg/d_msg_object/isMsgSendControl__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802382F4: -/* 802382F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802382F8 7C 08 02 A6 */ mflr r0 -/* 802382FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238300 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238304 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238308 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8023830C 4B FF F2 45 */ bl isMsgSendControlLocal__12dMsgObject_cFv -/* 80238310 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238314 7C 08 03 A6 */ mtlr r0 -/* 80238318 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023831C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isMsgSendLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isMsgSendLocal__12dMsgObject_cFv.s deleted file mode 100644 index b38856f2c9d..00000000000 --- a/asm/d/msg/d_msg_object/isMsgSendLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8023757C: -/* 8023757C 88 03 01 95 */ lbz r0, 0x195(r3) -/* 80237580 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f -/* 80237584 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isMsgSend__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isMsgSend__12dMsgObject_cFv.s deleted file mode 100644 index 8584af89e16..00000000000 --- a/asm/d/msg/d_msg_object/isMsgSend__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80238378: -/* 80238378 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023837C 7C 08 02 A6 */ mflr r0 -/* 80238380 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238384 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238388 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023838C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238390 4B FF F1 ED */ bl isMsgSendLocal__12dMsgObject_cFv -/* 80238394 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238398 7C 08 03 A6 */ mtlr r0 -/* 8023839C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802383A0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isPlaceMessage__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isPlaceMessage__12dMsgObject_cFv.s deleted file mode 100644 index c0a161fabe5..00000000000 --- a/asm/d/msg/d_msg_object/isPlaceMessage__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802371E4: -/* 802371E4 88 03 01 9A */ lbz r0, 0x19a(r3) -/* 802371E8 20 00 00 0C */ subfic r0, r0, 0xc -/* 802371EC 7C 00 00 34 */ cntlzw r0, r0 -/* 802371F0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 802371F4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isSaveMessage__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isSaveMessage__12dMsgObject_cFv.s deleted file mode 100644 index 11c64ea392d..00000000000 --- a/asm/d/msg/d_msg_object/isSaveMessage__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80237228: -/* 80237228 88 03 01 9A */ lbz r0, 0x19a(r3) -/* 8023722C 20 00 00 10 */ subfic r0, r0, 0x10 -/* 80237230 7C 00 00 34 */ cntlzw r0, r0 -/* 80237234 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 80237238 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isSend__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isSend__12dMsgObject_cFv.s deleted file mode 100644 index 79856dbf42b..00000000000 --- a/asm/d/msg/d_msg_object/isSend__12dMsgObject_cFv.s +++ /dev/null @@ -1,158 +0,0 @@ -lbl_802369D8: -/* 802369D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802369DC 7C 08 02 A6 */ mflr r0 -/* 802369E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802369E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802369E8 93 C1 00 08 */ stw r30, 8(r1) -/* 802369EC 7C 7F 1B 78 */ mr r31, r3 -/* 802369F0 38 00 00 00 */ li r0, 0 -/* 802369F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802369F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802369FC 98 03 5E 3C */ stb r0, 0x5e3c(r3) -/* 80236A00 98 03 5E 57 */ stb r0, 0x5e57(r3) -/* 80236A04 8B C3 5E 86 */ lbz r30, 0x5e86(r3) -/* 80236A08 28 1E 00 00 */ cmplwi r30, 0 -/* 80236A0C 41 82 00 08 */ beq lbl_80236A14 -/* 80236A10 98 03 5E 86 */ stb r0, 0x5e86(r3) -lbl_80236A14: -/* 80236A14 88 1F 04 C9 */ lbz r0, 0x4c9(r31) -/* 80236A18 28 00 00 00 */ cmplwi r0, 0 -/* 80236A1C 41 82 00 0C */ beq lbl_80236A28 -/* 80236A20 38 60 00 00 */ li r3, 0 -/* 80236A24 48 00 01 BC */ b lbl_80236BE0 -lbl_80236A28: -/* 80236A28 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 80236A2C 80 A3 00 04 */ lwz r5, 4(r3) -/* 80236A30 88 05 12 4C */ lbz r0, 0x124c(r5) -/* 80236A34 28 00 00 00 */ cmplwi r0, 0 -/* 80236A38 41 82 01 1C */ beq lbl_80236B54 -/* 80236A3C 28 00 00 03 */ cmplwi r0, 3 -/* 80236A40 40 82 00 2C */ bne lbl_80236A6C -/* 80236A44 48 00 19 35 */ bl isMsgSend__12dMsgObject_cFv -/* 80236A48 2C 03 00 00 */ cmpwi r3, 0 -/* 80236A4C 41 82 00 14 */ beq lbl_80236A60 -/* 80236A50 48 00 18 79 */ bl offMsgSendControl__12dMsgObject_cFv -/* 80236A54 48 00 18 F9 */ bl offMsgSend__12dMsgObject_cFv -/* 80236A58 38 60 00 01 */ li r3, 1 -/* 80236A5C 48 00 01 84 */ b lbl_80236BE0 -lbl_80236A60: -/* 80236A60 48 00 18 3D */ bl onMsgSendControl__12dMsgObject_cFv -/* 80236A64 38 60 00 00 */ li r3, 0 -/* 80236A68 48 00 01 78 */ b lbl_80236BE0 -lbl_80236A6C: -/* 80236A6C 28 00 00 04 */ cmplwi r0, 4 -/* 80236A70 40 82 00 20 */ bne lbl_80236A90 -/* 80236A74 A8 9F 01 7E */ lha r4, 0x17e(r31) -/* 80236A78 80 05 05 B4 */ lwz r0, 0x5b4(r5) -/* 80236A7C 38 60 FF FF */ li r3, -1 -/* 80236A80 7C 00 20 10 */ subfc r0, r0, r4 -/* 80236A84 7C 03 01 90 */ subfze r0, r3 -/* 80236A88 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80236A8C 48 00 01 54 */ b lbl_80236BE0 -lbl_80236A90: -/* 80236A90 28 00 00 05 */ cmplwi r0, 5 -/* 80236A94 40 82 00 54 */ bne lbl_80236AE8 -/* 80236A98 7F E3 FB 78 */ mr r3, r31 -/* 80236A9C 4B FF FE 5D */ bl getStatusLocal__12dMsgObject_cFv -/* 80236AA0 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80236AA4 28 00 00 15 */ cmplwi r0, 0x15 -/* 80236AA8 40 82 00 38 */ bne lbl_80236AE0 -/* 80236AAC 7F E3 FB 78 */ mr r3, r31 -/* 80236AB0 48 00 11 4D */ bl setButtonStatusLocal__12dMsgObject_cFv -/* 80236AB4 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 80236AB8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 80236ABC 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80236AC0 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 -/* 80236AC4 40 82 00 0C */ bne lbl_80236AD0 -/* 80236AC8 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 80236ACC 41 82 00 0C */ beq lbl_80236AD8 -lbl_80236AD0: -/* 80236AD0 38 60 00 02 */ li r3, 2 -/* 80236AD4 48 00 01 0C */ b lbl_80236BE0 -lbl_80236AD8: -/* 80236AD8 38 60 00 00 */ li r3, 0 -/* 80236ADC 48 00 01 04 */ b lbl_80236BE0 -lbl_80236AE0: -/* 80236AE0 38 60 00 01 */ li r3, 1 -/* 80236AE4 48 00 00 FC */ b lbl_80236BE0 -lbl_80236AE8: -/* 80236AE8 A8 65 05 D6 */ lha r3, 0x5d6(r5) -/* 80236AEC 2C 03 00 00 */ cmpwi r3, 0 -/* 80236AF0 40 81 00 10 */ ble lbl_80236B00 -/* 80236AF4 38 03 FF FF */ addi r0, r3, -1 -/* 80236AF8 B0 05 05 D6 */ sth r0, 0x5d6(r5) -/* 80236AFC 48 00 00 20 */ b lbl_80236B1C -lbl_80236B00: -/* 80236B00 28 00 00 06 */ cmplwi r0, 6 -/* 80236B04 40 82 00 10 */ bne lbl_80236B14 -/* 80236B08 38 00 00 00 */ li r0, 0 -/* 80236B0C 98 05 12 4C */ stb r0, 0x124c(r5) -/* 80236B10 48 00 00 0C */ b lbl_80236B1C -lbl_80236B14: -/* 80236B14 38 60 00 01 */ li r3, 1 -/* 80236B18 48 00 00 C8 */ b lbl_80236BE0 -lbl_80236B1C: -/* 80236B1C 88 05 12 4C */ lbz r0, 0x124c(r5) -/* 80236B20 28 00 00 02 */ cmplwi r0, 2 -/* 80236B24 40 82 00 98 */ bne lbl_80236BBC -/* 80236B28 7F E3 FB 78 */ mr r3, r31 -/* 80236B2C 48 00 10 D1 */ bl setButtonStatusLocal__12dMsgObject_cFv -/* 80236B30 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 80236B34 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 80236B38 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80236B3C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 -/* 80236B40 40 82 00 0C */ bne lbl_80236B4C -/* 80236B44 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 80236B48 41 82 00 74 */ beq lbl_80236BBC -lbl_80236B4C: -/* 80236B4C 38 60 00 02 */ li r3, 2 -/* 80236B50 48 00 00 90 */ b lbl_80236BE0 -lbl_80236B54: -/* 80236B54 7F E3 FB 78 */ mr r3, r31 -/* 80236B58 48 00 10 A5 */ bl setButtonStatusLocal__12dMsgObject_cFv -/* 80236B5C 7F E3 FB 78 */ mr r3, r31 -/* 80236B60 48 00 05 89 */ bl isHowlMessage__12dMsgObject_cFv -/* 80236B64 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80236B68 41 82 00 20 */ beq lbl_80236B88 -/* 80236B6C 48 00 18 0D */ bl isMsgSend__12dMsgObject_cFv -/* 80236B70 2C 03 00 00 */ cmpwi r3, 0 -/* 80236B74 41 82 00 48 */ beq lbl_80236BBC -/* 80236B78 48 00 17 51 */ bl offMsgSendControl__12dMsgObject_cFv -/* 80236B7C 48 00 17 D1 */ bl offMsgSend__12dMsgObject_cFv -/* 80236B80 38 60 00 02 */ li r3, 2 -/* 80236B84 48 00 00 5C */ b lbl_80236BE0 -lbl_80236B88: -/* 80236B88 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 80236B8C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 80236B90 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80236B94 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 -/* 80236B98 40 82 00 0C */ bne lbl_80236BA4 -/* 80236B9C 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 80236BA0 41 82 00 0C */ beq lbl_80236BAC -lbl_80236BA4: -/* 80236BA4 38 60 00 02 */ li r3, 2 -/* 80236BA8 48 00 00 38 */ b lbl_80236BE0 -lbl_80236BAC: -/* 80236BAC 28 1E 00 00 */ cmplwi r30, 0 -/* 80236BB0 41 82 00 0C */ beq lbl_80236BBC -/* 80236BB4 38 60 00 01 */ li r3, 1 -/* 80236BB8 48 00 00 28 */ b lbl_80236BE0 -lbl_80236BBC: -/* 80236BBC 88 1F 01 99 */ lbz r0, 0x199(r31) -/* 80236BC0 28 00 00 00 */ cmplwi r0, 0 -/* 80236BC4 40 82 00 10 */ bne lbl_80236BD4 -/* 80236BC8 88 1F 01 A3 */ lbz r0, 0x1a3(r31) -/* 80236BCC 28 00 00 00 */ cmplwi r0, 0 -/* 80236BD0 41 82 00 0C */ beq lbl_80236BDC -lbl_80236BD4: -/* 80236BD4 38 60 00 02 */ li r3, 2 -/* 80236BD8 48 00 00 08 */ b lbl_80236BE0 -lbl_80236BDC: -/* 80236BDC 38 60 00 00 */ li r3, 0 -lbl_80236BE0: -/* 80236BE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80236BE4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80236BE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80236BEC 7C 08 03 A6 */ mtlr r0 -/* 80236BF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80236BF4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isStaffMessage__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isStaffMessage__12dMsgObject_cFv.s deleted file mode 100644 index 3c8fa686744..00000000000 --- a/asm/d/msg/d_msg_object/isStaffMessage__12dMsgObject_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80237214: -/* 80237214 88 03 01 9A */ lbz r0, 0x19a(r3) -/* 80237218 20 00 00 07 */ subfic r0, r0, 7 -/* 8023721C 7C 00 00 34 */ cntlzw r0, r0 -/* 80237220 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 80237224 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/isTalkMessage__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isTalkMessage__12dMsgObject_cFv.s deleted file mode 100644 index ccb0659a218..00000000000 --- a/asm/d/msg/d_msg_object/isTalkMessage__12dMsgObject_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8023723C: -/* 8023723C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237240 7C 08 02 A6 */ mflr r0 -/* 80237244 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237248 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023724C 7C 7F 1B 78 */ mr r31, r3 -/* 80237250 4B FF FE 6D */ bl isKanbanMessage__12dMsgObject_cFv -/* 80237254 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80237258 40 82 00 54 */ bne lbl_802372AC -/* 8023725C 7F E3 FB 78 */ mr r3, r31 -/* 80237260 4B FF FF 85 */ bl isPlaceMessage__12dMsgObject_cFv -/* 80237264 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80237268 40 82 00 44 */ bne lbl_802372AC -/* 8023726C 7F E3 FB 78 */ mr r3, r31 -/* 80237270 4B FF FF 89 */ bl isBossMessage__12dMsgObject_cFv -/* 80237274 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80237278 40 82 00 34 */ bne lbl_802372AC -/* 8023727C 7F E3 FB 78 */ mr r3, r31 -/* 80237280 4B FF FF 8D */ bl isBookMessage__12dMsgObject_cFv -/* 80237284 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80237288 40 82 00 24 */ bne lbl_802372AC -/* 8023728C 7F E3 FB 78 */ mr r3, r31 -/* 80237290 4B FF FE 59 */ bl isHowlMessage__12dMsgObject_cFv -/* 80237294 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80237298 40 82 00 14 */ bne lbl_802372AC -/* 8023729C 7F E3 FB 78 */ mr r3, r31 -/* 802372A0 4B FF FF 75 */ bl isStaffMessage__12dMsgObject_cFv -/* 802372A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802372A8 41 82 00 0C */ beq lbl_802372B4 -lbl_802372AC: -/* 802372AC 38 60 00 00 */ li r3, 0 -/* 802372B0 48 00 00 08 */ b lbl_802372B8 -lbl_802372B4: -/* 802372B4 38 60 00 01 */ li r3, 1 -lbl_802372B8: -/* 802372B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802372BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802372C0 7C 08 03 A6 */ mtlr r0 -/* 802372C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802372C8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/offCameraCancelFlag__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/offCameraCancelFlag__12dMsgObject_cFv.s deleted file mode 100644 index 7329a1b7ef5..00000000000 --- a/asm/d/msg/d_msg_object/offCameraCancelFlag__12dMsgObject_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80237968: -/* 80237968 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023796C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237970 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80237974 38 00 00 00 */ li r0, 0 -/* 80237978 98 03 01 9E */ stb r0, 0x19e(r3) -/* 8023797C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/offMsgSendControlLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/offMsgSendControlLocal__12dMsgObject_cFv.s deleted file mode 100644 index b82cba49003..00000000000 --- a/asm/d/msg/d_msg_object/offMsgSendControlLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80237530: -/* 80237530 88 03 01 95 */ lbz r0, 0x195(r3) -/* 80237534 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 80237538 98 03 01 95 */ stb r0, 0x195(r3) -/* 8023753C 80 63 01 20 */ lwz r3, 0x120(r3) -/* 80237540 80 63 00 04 */ lwz r3, 4(r3) -/* 80237544 38 00 00 00 */ li r0, 0 -/* 80237548 98 03 12 4C */ stb r0, 0x124c(r3) -/* 8023754C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/offMsgSendControl__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/offMsgSendControl__12dMsgObject_cFv.s deleted file mode 100644 index 15d381db552..00000000000 --- a/asm/d/msg/d_msg_object/offMsgSendControl__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802382C8: -/* 802382C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802382CC 7C 08 02 A6 */ mflr r0 -/* 802382D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802382D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802382D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802382DC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802382E0 4B FF F2 51 */ bl offMsgSendControlLocal__12dMsgObject_cFv -/* 802382E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802382E8 7C 08 03 A6 */ mtlr r0 -/* 802382EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802382F0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/offMsgSendLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/offMsgSendLocal__12dMsgObject_cFv.s deleted file mode 100644 index 58042c165e4..00000000000 --- a/asm/d/msg/d_msg_object/offMsgSendLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8023756C: -/* 8023756C 88 03 01 95 */ lbz r0, 0x195(r3) -/* 80237570 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 80237574 98 03 01 95 */ stb r0, 0x195(r3) -/* 80237578 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/offMsgSend__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/offMsgSend__12dMsgObject_cFv.s deleted file mode 100644 index 371210c0d74..00000000000 --- a/asm/d/msg/d_msg_object/offMsgSend__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8023834C: -/* 8023834C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238350 7C 08 02 A6 */ mflr r0 -/* 80238354 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238358 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023835C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238360 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238364 4B FF F2 09 */ bl offMsgSendLocal__12dMsgObject_cFv -/* 80238368 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023836C 7C 08 03 A6 */ mtlr r0 -/* 80238370 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238374 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/onCameraCancelFlag__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/onCameraCancelFlag__12dMsgObject_cFv.s deleted file mode 100644 index f21219c1dab..00000000000 --- a/asm/d/msg/d_msg_object/onCameraCancelFlag__12dMsgObject_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80237950: -/* 80237950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237954 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237958 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8023795C 38 00 00 01 */ li r0, 1 -/* 80237960 98 03 01 9E */ stb r0, 0x19e(r3) -/* 80237964 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/onKillMessageFlag__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/onKillMessageFlag__12dMsgObject_cFv.s deleted file mode 100644 index db62b734184..00000000000 --- a/asm/d/msg/d_msg_object/onKillMessageFlag__12dMsgObject_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80237994: -/* 80237994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023799C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802379A0 38 00 00 01 */ li r0, 1 -/* 802379A4 98 03 04 D2 */ stb r0, 0x4d2(r3) -/* 802379A8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/onMsgSendControlLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/onMsgSendControlLocal__12dMsgObject_cFv.s deleted file mode 100644 index be3617d17c9..00000000000 --- a/asm/d/msg/d_msg_object/onMsgSendControlLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80237520: -/* 80237520 88 03 01 95 */ lbz r0, 0x195(r3) -/* 80237524 60 00 00 01 */ ori r0, r0, 1 -/* 80237528 98 03 01 95 */ stb r0, 0x195(r3) -/* 8023752C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/onMsgSendControl__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/onMsgSendControl__12dMsgObject_cFv.s deleted file mode 100644 index 65d3faee5d9..00000000000 --- a/asm/d/msg/d_msg_object/onMsgSendControl__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8023829C: -/* 8023829C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802382A0 7C 08 02 A6 */ mflr r0 -/* 802382A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802382A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802382AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802382B0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802382B4 4B FF F2 6D */ bl onMsgSendControlLocal__12dMsgObject_cFv -/* 802382B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802382BC 7C 08 03 A6 */ mtlr r0 -/* 802382C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802382C4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/onMsgSendLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/onMsgSendLocal__12dMsgObject_cFv.s deleted file mode 100644 index 87bcb224aac..00000000000 --- a/asm/d/msg/d_msg_object/onMsgSendLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8023755C: -/* 8023755C 88 03 01 95 */ lbz r0, 0x195(r3) -/* 80237560 60 00 00 02 */ ori r0, r0, 2 -/* 80237564 98 03 01 95 */ stb r0, 0x195(r3) -/* 80237568 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/onMsgSend__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/onMsgSend__12dMsgObject_cFv.s deleted file mode 100644 index 2146a8fffe4..00000000000 --- a/asm/d/msg/d_msg_object/onMsgSend__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80238320: -/* 80238320 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238324 7C 08 02 A6 */ mflr r0 -/* 80238328 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023832C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238330 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238334 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238338 4B FF F2 25 */ bl onMsgSendLocal__12dMsgObject_cFv -/* 8023833C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238340 7C 08 03 A6 */ mtlr r0 -/* 80238344 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238348 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c.s b/asm/d/msg/d_msg_object/readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c.s deleted file mode 100644 index ce858cbf148..00000000000 --- a/asm/d/msg/d_msg_object/readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8023800C: -/* 8023800C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238010 7C 08 02 A6 */ mflr r0 -/* 80238014 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238018 7C 64 1B 78 */ mr r4, r3 -/* 8023801C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238020 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238024 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238028 4B FF EB D1 */ bl readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c -/* 8023802C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238030 7C 08 03 A6 */ mtlr r0 -/* 80238034 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238038 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/resetSelectBomBag__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/resetSelectBomBag__12dMsgObject_cFv.s deleted file mode 100644 index 87f85cd4b79..00000000000 --- a/asm/d/msg/d_msg_object/resetSelectBomBag__12dMsgObject_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80237610: -/* 80237610 38 A0 00 00 */ li r5, 0 -/* 80237614 38 80 00 00 */ li r4, 0 -/* 80237618 38 00 00 03 */ li r0, 3 -/* 8023761C 7C 09 03 A6 */ mtctr r0 -lbl_80237620: -/* 80237620 38 05 01 90 */ addi r0, r5, 0x190 -/* 80237624 7C 83 01 AE */ stbx r4, r3, r0 -/* 80237628 38 A5 00 01 */ addi r5, r5, 1 -/* 8023762C 42 00 FF F4 */ bdnz lbl_80237620 -/* 80237630 38 00 00 00 */ li r0, 0 -/* 80237634 98 03 01 93 */ stb r0, 0x193(r3) -/* 80237638 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/selectEndProc__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/selectEndProc__12dMsgObject_cFv.s deleted file mode 100644 index b6b1af490f6..00000000000 --- a/asm/d/msg/d_msg_object/selectEndProc__12dMsgObject_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8023587C: -/* 8023587C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80235880 7C 08 02 A6 */ mflr r0 -/* 80235884 90 01 00 14 */ stw r0, 0x14(r1) -/* 80235888 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023588C 7C 7F 1B 78 */ mr r31, r3 -/* 80235890 80 63 01 04 */ lwz r3, 0x104(r3) -/* 80235894 81 83 00 00 */ lwz r12, 0(r3) -/* 80235898 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8023589C 7D 89 03 A6 */ mtctr r12 -/* 802358A0 4E 80 04 21 */ bctrl -/* 802358A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802358A8 41 82 00 18 */ beq lbl_802358C0 -/* 802358AC 38 00 00 01 */ li r0, 1 -/* 802358B0 98 1F 01 99 */ stb r0, 0x199(r31) -/* 802358B4 7F E3 FB 78 */ mr r3, r31 -/* 802358B8 38 80 00 0E */ li r4, 0xe -/* 802358BC 48 00 10 29 */ bl setStatusLocal__12dMsgObject_cFUs -lbl_802358C0: -/* 802358C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802358C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802358C8 7C 08 03 A6 */ mtlr r0 -/* 802358CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802358D0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setArrowNum__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/setArrowNum__12dMsgObject_cFUc.s deleted file mode 100644 index 8413e6df2ea..00000000000 --- a/asm/d/msg/d_msg_object/setArrowNum__12dMsgObject_cFUc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802384D8: -/* 802384D8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802384DC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802384E0 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 802384E4 98 64 01 A5 */ stb r3, 0x1a5(r4) -/* 802384E8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setButtonStatusLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/setButtonStatusLocal__12dMsgObject_cFv.s deleted file mode 100644 index f63725a2119..00000000000 --- a/asm/d/msg/d_msg_object/setButtonStatusLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,106 +0,0 @@ -lbl_80237BFC: -/* 80237BFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237C00 7C 08 02 A6 */ mflr r0 -/* 80237C04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237C08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80237C0C 93 C1 00 08 */ stw r30, 8(r1) -/* 80237C10 7C 7E 1B 78 */ mr r30, r3 -/* 80237C14 80 83 01 20 */ lwz r4, 0x120(r3) -/* 80237C18 83 E4 00 04 */ lwz r31, 4(r4) -/* 80237C1C 4B FF EC DD */ bl getStatusLocal__12dMsgObject_cFv -/* 80237C20 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 80237C24 A0 1E 01 68 */ lhz r0, 0x168(r30) -/* 80237C28 7C 00 18 40 */ cmplw r0, r3 -/* 80237C2C 40 82 01 44 */ bne lbl_80237D70 -/* 80237C30 88 1F 12 4C */ lbz r0, 0x124c(r31) -/* 80237C34 28 00 00 01 */ cmplwi r0, 1 -/* 80237C38 41 82 01 38 */ beq lbl_80237D70 -/* 80237C3C 28 00 00 03 */ cmplwi r0, 3 -/* 80237C40 41 82 01 30 */ beq lbl_80237D70 -/* 80237C44 28 00 00 04 */ cmplwi r0, 4 -/* 80237C48 41 82 01 28 */ beq lbl_80237D70 -/* 80237C4C 28 00 00 06 */ cmplwi r0, 6 -/* 80237C50 41 82 01 20 */ beq lbl_80237D70 -/* 80237C54 28 00 00 02 */ cmplwi r0, 2 -/* 80237C58 41 82 01 18 */ beq lbl_80237D70 -/* 80237C5C 7F C3 F3 78 */ mr r3, r30 -/* 80237C60 4B FF EC 99 */ bl getStatusLocal__12dMsgObject_cFv -/* 80237C64 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80237C68 28 00 00 10 */ cmplwi r0, 0x10 -/* 80237C6C 40 82 00 58 */ bne lbl_80237CC4 -/* 80237C70 7F C3 F3 78 */ mr r3, r30 -/* 80237C74 4B FF F4 75 */ bl isHowlMessage__12dMsgObject_cFv -/* 80237C78 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80237C7C 41 82 00 2C */ beq lbl_80237CA8 -/* 80237C80 38 00 00 05 */ li r0, 5 -/* 80237C84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237C88 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237C8C 98 04 5E 3C */ stb r0, 0x5e3c(r4) -/* 80237C90 38 60 00 00 */ li r3, 0 -/* 80237C94 98 64 5E 57 */ stb r3, 0x5e57(r4) -/* 80237C98 38 00 00 2A */ li r0, 0x2a -/* 80237C9C 98 04 5E 35 */ stb r0, 0x5e35(r4) -/* 80237CA0 98 64 5E 50 */ stb r3, 0x5e50(r4) -/* 80237CA4 48 00 00 CC */ b lbl_80237D70 -lbl_80237CA8: -/* 80237CA8 38 00 00 23 */ li r0, 0x23 -/* 80237CAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237CB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237CB4 98 03 5E 3C */ stb r0, 0x5e3c(r3) -/* 80237CB8 38 00 00 00 */ li r0, 0 -/* 80237CBC 98 03 5E 57 */ stb r0, 0x5e57(r3) -/* 80237CC0 48 00 00 B0 */ b lbl_80237D70 -lbl_80237CC4: -/* 80237CC4 7F C3 F3 78 */ mr r3, r30 -/* 80237CC8 4B FF EC 31 */ bl getStatusLocal__12dMsgObject_cFv -/* 80237CCC 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80237CD0 28 00 00 08 */ cmplwi r0, 8 -/* 80237CD4 41 82 00 2C */ beq lbl_80237D00 -/* 80237CD8 7F C3 F3 78 */ mr r3, r30 -/* 80237CDC 4B FF EC 1D */ bl getStatusLocal__12dMsgObject_cFv -/* 80237CE0 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80237CE4 28 00 00 09 */ cmplwi r0, 9 -/* 80237CE8 41 82 00 18 */ beq lbl_80237D00 -/* 80237CEC 7F C3 F3 78 */ mr r3, r30 -/* 80237CF0 4B FF EC 09 */ bl getStatusLocal__12dMsgObject_cFv -/* 80237CF4 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80237CF8 28 00 00 14 */ cmplwi r0, 0x14 -/* 80237CFC 40 82 00 20 */ bne lbl_80237D1C -lbl_80237D00: -/* 80237D00 38 00 00 22 */ li r0, 0x22 -/* 80237D04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237D08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237D0C 98 03 5E 3C */ stb r0, 0x5e3c(r3) -/* 80237D10 38 00 00 00 */ li r0, 0 -/* 80237D14 98 03 5E 57 */ stb r0, 0x5e57(r3) -/* 80237D18 48 00 00 58 */ b lbl_80237D70 -lbl_80237D1C: -/* 80237D1C 7F C3 F3 78 */ mr r3, r30 -/* 80237D20 4B FF EB D9 */ bl getStatusLocal__12dMsgObject_cFv -/* 80237D24 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80237D28 28 00 00 15 */ cmplwi r0, 0x15 -/* 80237D2C 40 82 00 2C */ bne lbl_80237D58 -/* 80237D30 38 00 00 22 */ li r0, 0x22 -/* 80237D34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237D38 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237D3C 98 04 5E 3C */ stb r0, 0x5e3c(r4) -/* 80237D40 38 60 00 00 */ li r3, 0 -/* 80237D44 98 64 5E 57 */ stb r3, 0x5e57(r4) -/* 80237D48 38 00 00 2A */ li r0, 0x2a -/* 80237D4C 98 04 5E 35 */ stb r0, 0x5e35(r4) -/* 80237D50 98 64 5E 50 */ stb r3, 0x5e50(r4) -/* 80237D54 48 00 00 1C */ b lbl_80237D70 -lbl_80237D58: -/* 80237D58 38 00 00 23 */ li r0, 0x23 -/* 80237D5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237D60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237D64 98 03 5E 3C */ stb r0, 0x5e3c(r3) -/* 80237D68 38 00 00 00 */ li r0, 0 -/* 80237D6C 98 03 5E 57 */ stb r0, 0x5e57(r3) -lbl_80237D70: -/* 80237D70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80237D74 83 C1 00 08 */ lwz r30, 8(r1) -/* 80237D78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237D7C 7C 08 03 A6 */ mtlr r0 -/* 80237D80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237D84 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setDemoMessageLocal__12dMsgObject_cFUl.s b/asm/d/msg/d_msg_object/setDemoMessageLocal__12dMsgObject_cFUl.s deleted file mode 100644 index 1fa7c6e9bc9..00000000000 --- a/asm/d/msg/d_msg_object/setDemoMessageLocal__12dMsgObject_cFUl.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80237D88: -/* 80237D88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237D8C 7C 08 02 A6 */ mflr r0 -/* 80237D90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237D94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80237D98 7C 9F 23 78 */ mr r31, r4 -/* 80237D9C 38 00 00 01 */ li r0, 1 -/* 80237DA0 98 03 04 CC */ stb r0, 0x4cc(r3) -/* 80237DA4 4B FF FB AD */ bl onCameraCancelFlag__12dMsgObject_cFv -/* 80237DA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237DAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237DB0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80237DB4 7F E4 FB 78 */ mr r4, r31 -/* 80237DB8 4B FF C3 71 */ bl getMessageIDAlways__12dMsgObject_cFUl -/* 80237DBC 38 80 03 E8 */ li r4, 0x3e8 -/* 80237DC0 4B DE 80 C5 */ bl fopMsgM_messageSet__FUlUl -/* 80237DC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80237DC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237DCC 7C 08 03 A6 */ mtlr r0 -/* 80237DD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237DD4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setDemoMessage__12dMsgObject_cFUl.s b/asm/d/msg/d_msg_object/setDemoMessage__12dMsgObject_cFUl.s deleted file mode 100644 index bc0a2d9a17c..00000000000 --- a/asm/d/msg/d_msg_object/setDemoMessage__12dMsgObject_cFUl.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80237AB0: -/* 80237AB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237AB4 7C 08 02 A6 */ mflr r0 -/* 80237AB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237ABC 7C 64 1B 78 */ mr r4, r3 -/* 80237AC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237AC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237AC8 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80237ACC 48 00 02 BD */ bl setDemoMessageLocal__12dMsgObject_cFUl -/* 80237AD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237AD4 7C 08 03 A6 */ mtlr r0 -/* 80237AD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237ADC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setEquipBombInfoLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/setEquipBombInfoLocal__12dMsgObject_cFv.s deleted file mode 100644 index f87be6ef869..00000000000 --- a/asm/d/msg/d_msg_object/setEquipBombInfoLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8023773C: -/* 8023773C 38 00 00 01 */ li r0, 1 -/* 80237740 98 03 04 D3 */ stb r0, 0x4d3(r3) -/* 80237744 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setInsectItemNo__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/setInsectItemNo__12dMsgObject_cFUc.s deleted file mode 100644 index ade14645b97..00000000000 --- a/asm/d/msg/d_msg_object/setInsectItemNo__12dMsgObject_cFUc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802384B0: -/* 802384B0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802384B4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802384B8 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 802384BC 98 64 01 94 */ stb r3, 0x194(r4) -/* 802384C0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setKillMessageFlagLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/setKillMessageFlagLocal__12dMsgObject_cFv.s deleted file mode 100644 index d0b2e21dc05..00000000000 --- a/asm/d/msg/d_msg_object/setKillMessageFlagLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_802379D8: -/* 802379D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802379DC 7C 08 02 A6 */ mflr r0 -/* 802379E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802379E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802379E8 7C 7F 1B 78 */ mr r31, r3 -/* 802379EC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802379F0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802379F4 88 04 4F AD */ lbz r0, 0x4fad(r4) -/* 802379F8 28 00 00 00 */ cmplwi r0, 0 -/* 802379FC 40 82 00 64 */ bne lbl_80237A60 -/* 80237A00 4B FF EE F9 */ bl getStatusLocal__12dMsgObject_cFv -/* 80237A04 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80237A08 28 00 00 01 */ cmplwi r0, 1 -/* 80237A0C 41 82 00 48 */ beq lbl_80237A54 -/* 80237A10 7F E3 FB 78 */ mr r3, r31 -/* 80237A14 4B FF EE E5 */ bl getStatusLocal__12dMsgObject_cFv -/* 80237A18 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80237A1C 28 00 00 0B */ cmplwi r0, 0xb -/* 80237A20 40 82 00 18 */ bne lbl_80237A38 -/* 80237A24 38 00 00 00 */ li r0, 0 -/* 80237A28 98 1F 04 CD */ stb r0, 0x4cd(r31) -/* 80237A2C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80237A30 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80237A34 4B FE 47 E5 */ bl resetFloatingMessage__13dMeter2Info_cFv -lbl_80237A38: -/* 80237A38 7F E3 FB 78 */ mr r3, r31 -/* 80237A3C 4B FF E4 81 */ bl deleteProc__12dMsgObject_cFv -/* 80237A40 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 80237A44 80 63 00 04 */ lwz r3, 4(r3) -/* 80237A48 38 00 00 00 */ li r0, 0 -/* 80237A4C 98 03 12 4D */ stb r0, 0x124d(r3) -/* 80237A50 48 00 00 10 */ b lbl_80237A60 -lbl_80237A54: -/* 80237A54 38 00 00 00 */ li r0, 0 -/* 80237A58 98 1F 04 CB */ stb r0, 0x4cb(r31) -/* 80237A5C 98 1F 04 CC */ stb r0, 0x4cc(r31) -lbl_80237A60: -/* 80237A60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80237A64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237A68 7C 08 03 A6 */ mtlr r0 -/* 80237A6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237A70 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setKillMessageFlag__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/setKillMessageFlag__12dMsgObject_cFv.s deleted file mode 100644 index 9df8805d24c..00000000000 --- a/asm/d/msg/d_msg_object/setKillMessageFlag__12dMsgObject_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802379AC: -/* 802379AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802379B0 7C 08 02 A6 */ mflr r0 -/* 802379B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802379B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802379BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802379C0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802379C4 48 00 00 15 */ bl setKillMessageFlagLocal__12dMsgObject_cFv -/* 802379C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802379CC 7C 08 03 A6 */ mtlr r0 -/* 802379D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802379D4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setLetterNameID__12dMsgObject_cFUs.s b/asm/d/msg/d_msg_object/setLetterNameID__12dMsgObject_cFUs.s deleted file mode 100644 index c3d437f9dba..00000000000 --- a/asm/d/msg/d_msg_object/setLetterNameID__12dMsgObject_cFUs.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802384C4: -/* 802384C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802384C8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802384CC 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 802384D0 B0 64 01 88 */ sth r3, 0x188(r4) -/* 802384D4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setMsgOutputType__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/setMsgOutputType__12dMsgObject_cFUc.s deleted file mode 100644 index 2fd2d7e2451..00000000000 --- a/asm/d/msg/d_msg_object/setMsgOutputType__12dMsgObject_cFUc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802384EC: -/* 802384EC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802384F0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802384F4 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 802384F8 98 64 04 C8 */ stb r3, 0x4c8(r4) -/* 802384FC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setNowTalkFlowNo__12dMsgObject_cFs.s b/asm/d/msg/d_msg_object/setNowTalkFlowNo__12dMsgObject_cFs.s deleted file mode 100644 index 648e7a65a37..00000000000 --- a/asm/d/msg/d_msg_object/setNowTalkFlowNo__12dMsgObject_cFs.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80237A88: -/* 80237A88 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237A8C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237A90 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 80237A94 B0 64 01 70 */ sth r3, 0x170(r4) -/* 80237A98 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setPortalMessageID__12dMsgObject_cFUs.s b/asm/d/msg/d_msg_object/setPortalMessageID__12dMsgObject_cFUs.s deleted file mode 100644 index 8c6e62ca0b2..00000000000 --- a/asm/d/msg/d_msg_object/setPortalMessageID__12dMsgObject_cFUs.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8023849C: -/* 8023849C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802384A0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802384A4 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 802384A8 B0 64 01 80 */ sth r3, 0x180(r4) -/* 802384AC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setProcessID__12dMsgObject_cFUi.s b/asm/d/msg/d_msg_object/setProcessID__12dMsgObject_cFUi.s deleted file mode 100644 index 95fa75eed6c..00000000000 --- a/asm/d/msg/d_msg_object/setProcessID__12dMsgObject_cFUi.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80238188: -/* 80238188 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023818C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238190 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 80238194 90 64 01 4C */ stw r3, 0x14c(r4) -/* 80238198 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setSelectCursorPos__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/setSelectCursorPos__12dMsgObject_cFUc.s deleted file mode 100644 index 8e438090b56..00000000000 --- a/asm/d/msg/d_msg_object/setSelectCursorPos__12dMsgObject_cFUc.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8023846C: -/* 8023846C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238470 7C 08 02 A6 */ mflr r0 -/* 80238474 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238478 7C 64 1B 78 */ mr r4, r3 -/* 8023847C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238480 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238484 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238488 4B FF F9 E1 */ bl setSelectCursorPosLocal__12dMsgObject_cFUc -/* 8023848C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238490 7C 08 03 A6 */ mtlr r0 -/* 80238494 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238498 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setSelectWordFlag__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/setSelectWordFlag__12dMsgObject_cFUc.s deleted file mode 100644 index 35e5e12a08f..00000000000 --- a/asm/d/msg/d_msg_object/setSelectWordFlag__12dMsgObject_cFUc.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80238544: -/* 80238544 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238548 7C 08 02 A6 */ mflr r0 -/* 8023854C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238550 7C 64 1B 78 */ mr r4, r3 -/* 80238554 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238558 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023855C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238560 4B FF F3 6D */ bl setSelectWordFlagLocal__12dMsgObject_cFUc -/* 80238564 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238568 7C 08 03 A6 */ mtlr r0 -/* 8023856C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238570 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setShopWaitTimer__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/setShopWaitTimer__12dMsgObject_cFUc.s deleted file mode 100644 index 73ff7ef3082..00000000000 --- a/asm/d/msg/d_msg_object/setShopWaitTimer__12dMsgObject_cFUc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802378B8: -/* 802378B8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802378BC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802378C0 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 802378C4 98 64 04 C9 */ stb r3, 0x4c9(r4) -/* 802378C8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setSmellTypeLocal__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/setSmellTypeLocal__12dMsgObject_cFUc.s deleted file mode 100644 index e1dd2418096..00000000000 --- a/asm/d/msg/d_msg_object/setSmellTypeLocal__12dMsgObject_cFUc.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80237E04: -/* 80237E04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237E08 7C 08 02 A6 */ mflr r0 -/* 80237E0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237E10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80237E14 7C 7F 1B 78 */ mr r31, r3 -/* 80237E18 98 83 01 A0 */ stb r4, 0x1a0(r3) -/* 80237E1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237E20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237E24 38 63 00 CC */ addi r3, r3, 0xcc -/* 80237E28 4B DF C0 39 */ bl onFirstBit__21dSv_player_get_item_cFUc -/* 80237E2C 88 9F 01 A0 */ lbz r4, 0x1a0(r31) -/* 80237E30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237E34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237E38 98 83 00 16 */ stb r4, 0x16(r3) -/* 80237E3C 38 60 00 02 */ li r3, 2 -/* 80237E40 4B DF 5E 85 */ bl dComIfGs_setSelectItemIndex__FiUc -/* 80237E44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80237E48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237E4C 7C 08 03 A6 */ mtlr r0 -/* 80237E50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237E54 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setSmellType__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/setSmellType__12dMsgObject_cFUc.s deleted file mode 100644 index bdc8d6d5bcb..00000000000 --- a/asm/d/msg/d_msg_object/setSmellType__12dMsgObject_cFUc.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80238410: -/* 80238410 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238414 7C 08 02 A6 */ mflr r0 -/* 80238418 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023841C 7C 64 1B 78 */ mr r4, r3 -/* 80238420 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238424 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238428 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8023842C 4B FF F9 D9 */ bl setSmellTypeLocal__12dMsgObject_cFUc -/* 80238430 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238434 7C 08 03 A6 */ mtlr r0 -/* 80238438 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023843C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setStatusLocal__12dMsgObject_cFUs.s b/asm/d/msg/d_msg_object/setStatusLocal__12dMsgObject_cFUs.s deleted file mode 100644 index c5611e73184..00000000000 --- a/asm/d/msg/d_msg_object/setStatusLocal__12dMsgObject_cFUs.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802368E4: -/* 802368E4 80 63 01 20 */ lwz r3, 0x120(r3) -/* 802368E8 80 63 00 04 */ lwz r3, 4(r3) -/* 802368EC 80 63 05 BC */ lwz r3, 0x5bc(r3) -/* 802368F0 B0 83 00 00 */ sth r4, 0(r3) -/* 802368F4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setStatus__12dMsgObject_cFUs.s b/asm/d/msg/d_msg_object/setStatus__12dMsgObject_cFUs.s deleted file mode 100644 index 403d042ab55..00000000000 --- a/asm/d/msg/d_msg_object/setStatus__12dMsgObject_cFUs.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802381FC: -/* 802381FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238200 7C 08 02 A6 */ mflr r0 -/* 80238204 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238208 7C 64 1B 78 */ mr r4, r3 -/* 8023820C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238210 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238214 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238218 4B FF E6 CD */ bl setStatusLocal__12dMsgObject_cFUs -/* 8023821C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238220 7C 08 03 A6 */ mtlr r0 -/* 80238224 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238228 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setTalkActor__12dMsgObject_cFP10fopAc_ac_c.s b/asm/d/msg/d_msg_object/setTalkActor__12dMsgObject_cFP10fopAc_ac_c.s deleted file mode 100644 index 91e36d39535..00000000000 --- a/asm/d/msg/d_msg_object/setTalkActor__12dMsgObject_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8023826C: -/* 8023826C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238270 7C 08 02 A6 */ mflr r0 -/* 80238274 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238278 7C 64 1B 78 */ mr r4, r3 -/* 8023827C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80238280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80238284 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238288 4B FF FC 89 */ bl setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c -/* 8023828C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238290 7C 08 03 A6 */ mtlr r0 -/* 80238294 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238298 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setTalkHeapLocal__12dMsgObject_cFPv.s b/asm/d/msg/d_msg_object/setTalkHeapLocal__12dMsgObject_cFPv.s deleted file mode 100644 index ce5ee0ea494..00000000000 --- a/asm/d/msg/d_msg_object/setTalkHeapLocal__12dMsgObject_cFPv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80237B10: -/* 80237B10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237B14 7C 08 02 A6 */ mflr r0 -/* 80237B18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237B1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80237B20 93 C1 00 08 */ stw r30, 8(r1) -/* 80237B24 7C 7E 1B 78 */ mr r30, r3 -/* 80237B28 7C 9F 23 79 */ or. r31, r4, r4 -/* 80237B2C 40 82 00 0C */ bne lbl_80237B38 -/* 80237B30 38 80 00 01 */ li r4, 1 -/* 80237B34 4B FF ED D9 */ bl delete_screen__12dMsgObject_cFb -lbl_80237B38: -/* 80237B38 93 FE 01 44 */ stw r31, 0x144(r30) -/* 80237B3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80237B40 83 C1 00 08 */ lwz r30, 8(r1) -/* 80237B44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237B48 7C 08 03 A6 */ mtlr r0 -/* 80237B4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237B50 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setTalkHeap__12dMsgObject_cFPv.s b/asm/d/msg/d_msg_object/setTalkHeap__12dMsgObject_cFPv.s deleted file mode 100644 index 1cb8316887b..00000000000 --- a/asm/d/msg/d_msg_object/setTalkHeap__12dMsgObject_cFPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80237AE0: -/* 80237AE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237AE4 7C 08 02 A6 */ mflr r0 -/* 80237AE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237AEC 7C 64 1B 78 */ mr r4, r3 -/* 80237AF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237AF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237AF8 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80237AFC 48 00 00 15 */ bl setTalkHeapLocal__12dMsgObject_cFPv -/* 80237B00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237B04 7C 08 03 A6 */ mtlr r0 -/* 80237B08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237B0C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setTalkPartner__12dMsgObject_cFP10fopAc_ac_c.s b/asm/d/msg/d_msg_object/setTalkPartner__12dMsgObject_cFP10fopAc_ac_c.s deleted file mode 100644 index 916fbaa9e46..00000000000 --- a/asm/d/msg/d_msg_object/setTalkPartner__12dMsgObject_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80237A74: -/* 80237A74 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80237A78 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80237A7C 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 80237A80 90 64 01 40 */ stw r3, 0x140(r4) -/* 80237A84 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/updateEquipBombInfoLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/updateEquipBombInfoLocal__12dMsgObject_cFv.s deleted file mode 100644 index e9c5d1e7294..00000000000 --- a/asm/d/msg/d_msg_object/updateEquipBombInfoLocal__12dMsgObject_cFv.s +++ /dev/null @@ -1,103 +0,0 @@ -lbl_80237748: -/* 80237748 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8023774C 7C 08 02 A6 */ mflr r0 -/* 80237750 90 01 00 34 */ stw r0, 0x34(r1) -/* 80237754 39 61 00 30 */ addi r11, r1, 0x30 -/* 80237758 48 12 AA 6D */ bl _savegpr_23 -/* 8023775C 7C 7C 1B 78 */ mr r28, r3 -/* 80237760 88 03 04 D3 */ lbz r0, 0x4d3(r3) -/* 80237764 28 00 00 00 */ cmplwi r0, 0 -/* 80237768 41 82 01 38 */ beq lbl_802378A0 -/* 8023776C 3B E0 00 01 */ li r31, 1 -/* 80237770 A8 0D 8B 48 */ lha r0, s_groupID(r13) -/* 80237774 2C 00 00 02 */ cmpwi r0, 2 -/* 80237778 40 82 00 24 */ bne lbl_8023779C -/* 8023777C A8 1C 01 70 */ lha r0, 0x170(r28) -/* 80237780 2C 00 01 6D */ cmpwi r0, 0x16d -/* 80237784 41 82 00 14 */ beq lbl_80237798 -/* 80237788 2C 00 01 6E */ cmpwi r0, 0x16e -/* 8023778C 41 82 00 0C */ beq lbl_80237798 -/* 80237790 2C 00 01 6F */ cmpwi r0, 0x16f -/* 80237794 40 82 00 08 */ bne lbl_8023779C -lbl_80237798: -/* 80237798 3B E0 00 00 */ li r31, 0 -lbl_8023779C: -/* 8023779C 3B C0 00 00 */ li r30, 0 -/* 802377A0 3B 60 00 00 */ li r27, 0 -/* 802377A4 3B A0 00 00 */ li r29, 0 -/* 802377A8 3B 40 00 00 */ li r26, 0 -/* 802377AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802377B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802377B4 3B 23 00 9C */ addi r25, r3, 0x9c -/* 802377B8 3B 03 00 EC */ addi r24, r3, 0xec -lbl_802377BC: -/* 802377BC 38 00 00 FF */ li r0, 0xff -/* 802377C0 7C 9C EA 14 */ add r4, r28, r29 -/* 802377C4 98 04 01 8D */ stb r0, 0x18d(r4) -/* 802377C8 38 60 00 00 */ li r3, 0 -/* 802377CC 38 1A 01 82 */ addi r0, r26, 0x182 -/* 802377D0 7C 7C 03 2E */ sthx r3, r28, r0 -/* 802377D4 98 64 01 8A */ stb r3, 0x18a(r4) -/* 802377D8 7F 23 CB 78 */ mr r3, r25 -/* 802377DC 38 9D 00 0F */ addi r4, r29, 0xf -/* 802377E0 38 A0 00 00 */ li r5, 0 -/* 802377E4 4B DF B8 4D */ bl getItem__17dSv_player_item_cCFib -/* 802377E8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802377EC 28 00 00 FF */ cmplwi r0, 0xff -/* 802377F0 41 82 00 54 */ beq lbl_80237844 -/* 802377F4 28 00 00 50 */ cmplwi r0, 0x50 -/* 802377F8 40 82 00 0C */ bne lbl_80237804 -/* 802377FC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80237800 41 82 00 44 */ beq lbl_80237844 -lbl_80237804: -/* 80237804 57 A4 06 3E */ clrlwi r4, r29, 0x18 -/* 80237808 7E FC F2 14 */ add r23, r28, r30 -/* 8023780C 9B B7 01 8D */ stb r29, 0x18d(r23) -/* 80237810 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 80237814 38 1B 01 82 */ addi r0, r27, 0x182 -/* 80237818 7C 7C 03 2E */ sthx r3, r28, r0 -/* 8023781C 28 03 00 50 */ cmplwi r3, 0x50 -/* 80237820 40 82 00 10 */ bne lbl_80237830 -/* 80237824 38 00 00 00 */ li r0, 0 -/* 80237828 98 17 01 8A */ stb r0, 0x18a(r23) -/* 8023782C 48 00 00 10 */ b lbl_8023783C -lbl_80237830: -/* 80237830 7F 03 C3 78 */ mr r3, r24 -/* 80237834 4B DF C7 49 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 80237838 98 77 01 8A */ stb r3, 0x18a(r23) -lbl_8023783C: -/* 8023783C 3B DE 00 01 */ addi r30, r30, 1 -/* 80237840 3B 7B 00 02 */ addi r27, r27, 2 -lbl_80237844: -/* 80237844 3B BD 00 01 */ addi r29, r29, 1 -/* 80237848 2C 1D 00 03 */ cmpwi r29, 3 -/* 8023784C 3B 5A 00 02 */ addi r26, r26, 2 -/* 80237850 41 80 FF 6C */ blt lbl_802377BC -/* 80237854 2C 1E 00 01 */ cmpwi r30, 1 -/* 80237858 40 82 00 40 */ bne lbl_80237898 -/* 8023785C 38 C0 00 01 */ li r6, 1 -/* 80237860 38 60 00 02 */ li r3, 2 -/* 80237864 38 00 00 02 */ li r0, 2 -/* 80237868 7C 09 03 A6 */ mtctr r0 -lbl_8023786C: -/* 8023786C 88 1C 01 8D */ lbz r0, 0x18d(r28) -/* 80237870 7C BC 32 14 */ add r5, r28, r6 -/* 80237874 98 05 01 8D */ stb r0, 0x18d(r5) -/* 80237878 A0 9C 01 82 */ lhz r4, 0x182(r28) -/* 8023787C 38 03 01 82 */ addi r0, r3, 0x182 -/* 80237880 7C 9C 03 2E */ sthx r4, r28, r0 -/* 80237884 88 1C 01 8A */ lbz r0, 0x18a(r28) -/* 80237888 98 05 01 8A */ stb r0, 0x18a(r5) -/* 8023788C 38 C6 00 01 */ addi r6, r6, 1 -/* 80237890 38 63 00 02 */ addi r3, r3, 2 -/* 80237894 42 00 FF D8 */ bdnz lbl_8023786C -lbl_80237898: -/* 80237898 38 00 00 00 */ li r0, 0 -/* 8023789C 98 1C 04 D3 */ stb r0, 0x4d3(r28) -lbl_802378A0: -/* 802378A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802378A4 48 12 A9 6D */ bl _restgpr_23 -/* 802378A8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802378AC 7C 08 03 A6 */ mtlr r0 -/* 802378B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802378B4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_string_base/__dt__16dMsgStringBase_cFv.s b/asm/d/msg/d_msg_string_base/__dt__16dMsgStringBase_cFv.s deleted file mode 100644 index b935448c8ec..00000000000 --- a/asm/d/msg/d_msg_string_base/__dt__16dMsgStringBase_cFv.s +++ /dev/null @@ -1,129 +0,0 @@ -lbl_80249528: -/* 80249528 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8024952C 7C 08 02 A6 */ mflr r0 -/* 80249530 90 01 00 34 */ stw r0, 0x34(r1) -/* 80249534 39 61 00 30 */ addi r11, r1, 0x30 -/* 80249538 48 11 8C A1 */ bl _savegpr_28 -/* 8024953C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80249540 7C 9F 23 78 */ mr r31, r4 -/* 80249544 41 82 01 A0 */ beq lbl_802496E4 -/* 80249548 3C 60 80 3C */ lis r3, __vt__16dMsgStringBase_c@ha /* 0x803C1478@ha */ -/* 8024954C 38 03 14 78 */ addi r0, r3, __vt__16dMsgStringBase_c@l /* 0x803C1478@l */ -/* 80249550 90 1E 00 00 */ stw r0, 0(r30) -/* 80249554 83 BE 00 04 */ lwz r29, 4(r30) -/* 80249558 48 00 00 44 */ b lbl_8024959C -lbl_8024955C: -/* 8024955C 83 9D 00 0C */ lwz r28, 0xc(r29) -/* 80249560 93 81 00 0C */ stw r28, 0xc(r1) -/* 80249564 93 81 00 08 */ stw r28, 8(r1) -/* 80249568 93 81 00 1C */ stw r28, 0x1c(r1) -/* 8024956C 93 81 00 18 */ stw r28, 0x18(r1) -/* 80249570 93 81 00 14 */ stw r28, 0x14(r1) -/* 80249574 38 61 00 10 */ addi r3, r1, 0x10 -/* 80249578 38 9D 00 08 */ addi r4, r29, 8 -/* 8024957C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80249580 48 09 34 D9 */ bl erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iterator -/* 80249584 38 7D 00 08 */ addi r3, r29, 8 -/* 80249588 7F 84 E3 78 */ mr r4, r28 -/* 8024958C 81 9D 00 14 */ lwz r12, 0x14(r29) -/* 80249590 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80249594 7D 89 03 A6 */ mtctr r12 -/* 80249598 4E 80 04 21 */ bctrl -lbl_8024959C: -/* 8024959C 80 1D 00 08 */ lwz r0, 8(r29) -/* 802495A0 28 00 00 00 */ cmplwi r0, 0 -/* 802495A4 40 82 FF B8 */ bne lbl_8024955C -/* 802495A8 38 00 00 00 */ li r0, 0 -/* 802495AC 90 1D 00 18 */ stw r0, 0x18(r29) -/* 802495B0 90 1D 00 1C */ stw r0, 0x1c(r29) -/* 802495B4 83 BE 00 04 */ lwz r29, 4(r30) -/* 802495B8 28 1D 00 00 */ cmplwi r29, 0 -/* 802495BC 41 82 00 18 */ beq lbl_802495D4 -/* 802495C0 38 7D 00 08 */ addi r3, r29, 8 -/* 802495C4 38 80 FF FF */ li r4, -1 -/* 802495C8 48 05 F9 31 */ bl __dt__Q38JMessage18TResourceContainer10TCResourceFv -/* 802495CC 7F A3 EB 78 */ mr r3, r29 -/* 802495D0 48 08 57 6D */ bl __dl__FPv -lbl_802495D4: -/* 802495D4 38 00 00 00 */ li r0, 0 -/* 802495D8 90 1E 00 04 */ stw r0, 4(r30) -/* 802495DC 80 7E 00 08 */ lwz r3, 8(r30) -/* 802495E0 28 03 00 00 */ cmplwi r3, 0 -/* 802495E4 41 82 00 18 */ beq lbl_802495FC -/* 802495E8 38 80 00 01 */ li r4, 1 -/* 802495EC 81 83 00 00 */ lwz r12, 0(r3) -/* 802495F0 81 8C 00 08 */ lwz r12, 8(r12) -/* 802495F4 7D 89 03 A6 */ mtctr r12 -/* 802495F8 4E 80 04 21 */ bctrl -lbl_802495FC: -/* 802495FC 38 00 00 00 */ li r0, 0 -/* 80249600 90 1E 00 08 */ stw r0, 8(r30) -/* 80249604 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80249608 28 03 00 00 */ cmplwi r3, 0 -/* 8024960C 41 82 00 18 */ beq lbl_80249624 -/* 80249610 38 80 00 01 */ li r4, 1 -/* 80249614 81 83 00 00 */ lwz r12, 0(r3) -/* 80249618 81 8C 00 08 */ lwz r12, 8(r12) -/* 8024961C 7D 89 03 A6 */ mtctr r12 -/* 80249620 4E 80 04 21 */ bctrl -lbl_80249624: -/* 80249624 38 00 00 00 */ li r0, 0 -/* 80249628 90 1E 00 0C */ stw r0, 0xc(r30) -/* 8024962C 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80249630 28 03 00 00 */ cmplwi r3, 0 -/* 80249634 41 82 00 18 */ beq lbl_8024964C -/* 80249638 38 80 00 01 */ li r4, 1 -/* 8024963C 81 83 00 00 */ lwz r12, 0(r3) -/* 80249640 81 8C 00 08 */ lwz r12, 8(r12) -/* 80249644 7D 89 03 A6 */ mtctr r12 -/* 80249648 4E 80 04 21 */ bctrl -lbl_8024964C: -/* 8024964C 38 00 00 00 */ li r0, 0 -/* 80249650 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80249654 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 80249658 28 03 00 00 */ cmplwi r3, 0 -/* 8024965C 41 82 00 18 */ beq lbl_80249674 -/* 80249660 38 80 00 01 */ li r4, 1 -/* 80249664 81 83 00 00 */ lwz r12, 0(r3) -/* 80249668 81 8C 00 08 */ lwz r12, 8(r12) -/* 8024966C 7D 89 03 A6 */ mtctr r12 -/* 80249670 4E 80 04 21 */ bctrl -lbl_80249674: -/* 80249674 38 00 00 00 */ li r0, 0 -/* 80249678 90 1E 00 14 */ stw r0, 0x14(r30) -/* 8024967C 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 80249680 28 03 00 00 */ cmplwi r3, 0 -/* 80249684 41 82 00 18 */ beq lbl_8024969C -/* 80249688 38 80 00 01 */ li r4, 1 -/* 8024968C 81 83 00 00 */ lwz r12, 0(r3) -/* 80249690 81 8C 00 08 */ lwz r12, 8(r12) -/* 80249694 7D 89 03 A6 */ mtctr r12 -/* 80249698 4E 80 04 21 */ bctrl -lbl_8024969C: -/* 8024969C 38 00 00 00 */ li r0, 0 -/* 802496A0 90 1E 00 18 */ stw r0, 0x18(r30) -/* 802496A4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 802496A8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 802496AC 80 03 00 10 */ lwz r0, 0x10(r3) -/* 802496B0 28 00 00 00 */ cmplwi r0, 0 -/* 802496B4 40 82 00 20 */ bne lbl_802496D4 -/* 802496B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802496BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802496C0 80 63 5C F4 */ lwz r3, 0x5cf4(r3) -/* 802496C4 81 83 00 00 */ lwz r12, 0(r3) -/* 802496C8 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802496CC 7D 89 03 A6 */ mtctr r12 -/* 802496D0 4E 80 04 21 */ bctrl -lbl_802496D4: -/* 802496D4 7F E0 07 35 */ extsh. r0, r31 -/* 802496D8 40 81 00 0C */ ble lbl_802496E4 -/* 802496DC 7F C3 F3 78 */ mr r3, r30 -/* 802496E0 48 08 56 5D */ bl __dl__FPv -lbl_802496E4: -/* 802496E4 7F C3 F3 78 */ mr r3, r30 -/* 802496E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802496EC 48 11 8B 39 */ bl _restgpr_28 -/* 802496F0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802496F4 7C 08 03 A6 */ mtlr r0 -/* 802496F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802496FC 4E 80 00 20 */ blr diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index 988a53cd1a6..bb334f57f9b 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -234,6 +234,7 @@ struct TLinkList : public TNodeLinkList { const_iterator end() const { return const_iterator(const_cast(this)->end()); } T& front() { return *begin(); } T& back() { return *--end(); } + void pop_front() { erase(TNodeLinkList::begin()); } void Push_front(T* element) { Insert(begin(), element); } void Push_back(T* element) { Insert(end(), element); } iterator Find(const T* element) { diff --git a/include/JSystem/JMessage/control.h b/include/JSystem/JMessage/control.h index 8bce73e8243..f2c95d233bc 100644 --- a/include/JSystem/JMessage/control.h +++ b/include/JSystem/JMessage/control.h @@ -28,6 +28,10 @@ struct TControl { (TProcessor*)pRenderingProcessor_; } + int setMessageCode(u32 code) { + return setMessageCode(code >> 16, code); + } + int setMessageCode_inReset_(TProcessor* pProcessor, u16 param_1, u16 param_2) { if (!setMessageCode_inSequence_(pProcessor, param_1, param_2)) { return 0; @@ -57,6 +61,13 @@ struct TControl { pResourceCache_ = NULL; } + void render_synchronize() { + if (isReady_render_()) { + field_0x20 = pszText_update_current_; + oStack_renderingProcessor_ = pRenderingProcessor_->oStack_; + } + } + /* 0x04 */ TSequenceProcessor* pSequenceProcessor_; /* 0x08 */ TRenderingProcessor* pRenderingProcessor_; /* 0x0C */ u16 messageCode_; diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h index b636820ba79..0d55e8d00fe 100644 --- a/include/JSystem/JMessage/processor.h +++ b/include/JSystem/JMessage/processor.h @@ -2,6 +2,7 @@ #define JMESSAGE_PROCESSOR_H #include "JSystem/JMessage/resource.h" +#include "algorithm.h" namespace JMessage { struct TResource; @@ -63,6 +64,14 @@ struct TProcessor { void pop() { upsz_--; } + TStack_& operator=(const TStack_& other) { + upsz_ = other.upsz_; + char** start = (char**)other.stack; + char** end = (char**)(other.stack + other.upsz_); + std::copy(start, end, stack); + return *this; + } + /* 0x0 */ u32 upsz_; // stack size /* 0x4 */ const char* stack[4]; }; // Size: 0x14 diff --git a/include/JSystem/JStudio/JStudio/stb.h b/include/JSystem/JStudio/JStudio/stb.h index 00b5e6fe17f..fe32991cfe5 100644 --- a/include/JSystem/JStudio/JStudio/stb.h +++ b/include/JSystem/JStudio/JStudio/stb.h @@ -143,6 +143,8 @@ public: TObject_control& referObject_control() { return mObject_control; } int getSuspend() const { return _54; } void setSuspend(s32 suspend) { mObject_control.setSuspend(suspend); } + void suspend(s32 param_0) { mObject_control.suspend(param_0); } + void unsuspend(s32 param_0) { suspend(-param_0); } private: /* 0x04 */ u32 _4; diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 2871bbd0d61..ccf7b0d0081 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -361,6 +361,9 @@ public: s16 getItemKeyNumCount() { return mItemKeyNumCount; } void clearNowAnimeID() { mNowAnimeID = -1; } void clearMesgCamInfoID() { mMesgCamInfo = -1; } + void clearBaseAnimeID() { mBaseAnimeID = 0; } + void clearFaceAnimeID() { mFaceAnimeID = 0; } + void clearMesgCamInfoBasicID() { mMesgCamInfoBasicID = 0; } void clearItemMaxLifeCount() { mItemMaxLifeCount = 0; } void clearItemMaxOilCount() { mItemMaxOilCount = 0; } void clearItemOilCount() { mItemOilCount = 0; } @@ -458,6 +461,8 @@ public: void setMsgDtArchive(int i, JKRArchive* arc) { mMsgDtArchive[i] = arc; } void setMsgCommonArchive(JKRArchive* arc) { mMsgCommonArchive = arc; } void setMsgArchive(int i, JKRArchive* arc) { mMsgArchive[i] = arc; } + void setMsgObjectClass(dMsgObject_c* obj) { mMsgObjectClass = obj; } + void setMesgCamInfoBasicID(int id) { mMesgCamInfoBasicID = id; } void setMesgCamInfoActor(fopAc_ac_c* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3, fopAc_ac_c* param_4, fopAc_ac_c* param_5, fopAc_ac_c* param_6, fopAc_ac_c* param_7, fopAc_ac_c* param_8, fopAc_ac_c* param_9, @@ -547,6 +552,7 @@ public: void show2dOff() { mShow2D = 0; } u8 show2dCheck() { return mShow2D; } s8 getLayerOld() { return mLayerOld; } + u8 checkMesgCancelButton() { return mMesgCancelButton; } void setMesgCancelButton(u8 button) { mMesgCancelButton = button; } void setMesgBgm(u8 param_0) { mMesgBgm = param_0; } int getMessageCountNumber() { return mMessageCountNum; } @@ -1251,6 +1257,10 @@ inline u8 dComIfGs_getCollectSmell() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectEquip(3); } +inline void dComIfGs_setCollectSmell(u8 smell) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(3, smell); +} + inline u8 dComIfGs_getPohSpiritNum() { return g_dComIfG_gameInfo.info.getPlayer().getCollect().getPohNum(); } @@ -2048,6 +2058,10 @@ inline dMsgObject_c* dComIfGp_getMsgObjectClass() { return g_dComIfG_gameInfo.play.getMsgObjectClass(); } +inline void dComIfGp_setMsgObjectClass(dMsgObject_c* obj) { + return g_dComIfG_gameInfo.play.setMsgObjectClass(obj); +} + inline camera_class* dComIfGp_getCamera(int idx) { return g_dComIfG_gameInfo.play.getCamera(idx); } @@ -2837,6 +2851,10 @@ inline void dComIfGp_setMesgCancelButton(u8 button) { g_dComIfG_gameInfo.play.setMesgCancelButton(button); } +inline u8 dComIfGp_checkMesgCancelButton() { + return g_dComIfG_gameInfo.play.checkMesgCancelButton(); +} + inline void dComIfGp_setMesgBgmOn() { g_dComIfG_gameInfo.play.setMesgBgm(1); } @@ -3086,8 +3104,8 @@ inline u8 dComIfGp_getMesgStatus() { return g_dComIfG_gameInfo.play.getMesgStatus(); } -inline void dComIfGp_setMesgCameraTagInfo(int param_0) { - g_dComIfG_gameInfo.play.setMesgCamInfoID(param_0); +inline void dComIfGp_setMesgCameraTagInfo(int id) { + g_dComIfG_gameInfo.play.setMesgCamInfoID(id); } inline void dComIfGp_setMesgCameraInfoActor(fopAc_ac_c* param_1, fopAc_ac_c* param_2, @@ -3101,6 +3119,10 @@ inline void dComIfGp_setMesgCameraInfoActor(fopAc_ac_c* param_1, fopAc_ac_c* par param_6, param_7, param_8, param_9, param_10); } +inline void dComIfGp_setMesgCameraAttrInfo(int param_1) { + g_dComIfG_gameInfo.play.setMesgCamInfoBasicID(param_1); +} + inline int dComIfGp_getMesgCameraInfo() { return g_dComIfG_gameInfo.play.getMesgCamInfo(); } @@ -3608,6 +3630,18 @@ inline void dComIfGp_clearMesgCameraTagInfo() { g_dComIfG_gameInfo.play.clearMesgCamInfoID(); } +inline void dComIfGp_clearMesgAnimeAttrInfo() { + g_dComIfG_gameInfo.play.clearBaseAnimeID(); +} + +inline void dComIfGp_clearMesgFaceAnimeAttrInfo() { + g_dComIfG_gameInfo.play.clearFaceAnimeID(); +} + +inline void dComIfGp_clearMesgCameraAttrInfo() { + g_dComIfG_gameInfo.play.clearMesgCamInfoBasicID(); +} + inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, const csXyz* param_4, const cXyz* param_5, u8 param_6, dPa_levelEcallBack* param_7, diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 4a23df2bfd5..21ef9324e8f 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -285,6 +285,7 @@ public: static void offStatus(u32 status) { m_status &= ~status; } static void setBranchData(const u8* p_data) { m_branchData = p_data; } static s16 getBranchId() { return m_branchId; } + static jmessage_tControl* getMesgControl() { return m_mesgControl; } static dDemo_camera_c* getCamera() { JUT_ASSERT(m_object != 0); diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 2062d5fbafe..88f64e4f97d 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -748,6 +748,10 @@ inline void dMeter2Info_set2DPosV(float posV) { g_meter2_info.set2DPosV(posV); } +inline void dMeter2Info_offShopTalkFlag() { + g_meter2_info.offShopTalkFlag(); +} + const char* dMeter2Info_getPlusTextureName(); const char* dMeter2Info_getNumberTextureName(int pIndex); void dMeter2Info_recieveLetter(); diff --git a/include/d/msg/d_msg_class.h b/include/d/msg/d_msg_class.h index bad00f58c95..7fb11c35fa5 100644 --- a/include/d/msg/d_msg_class.h +++ b/include/d/msg/d_msg_class.h @@ -11,7 +11,7 @@ class JUTFont; struct JMSMesgEntry_c { /* 0x00 */ u32 mStringOffset; /* 0x04 */ u16 mStringId; - /* 0x06 */ u16 field_0x04; + /* 0x06 */ u16 field_0x06; /* 0x08 */ u8 field_0x08; /* 0x09 */ u8 field_0x09; /* 0x0A */ u8 field_0x0a; @@ -30,6 +30,7 @@ struct JMSMesgHeader_c { /* 0x0A */ u16 entrySize; /* 0x0C */ u16 field_0xc; /* 0x0E */ u16 field_0xe; + /* 0x10 */ JMSMesgEntry_c entries[0]; }; // Size: 0x10 class STControl; @@ -98,6 +99,28 @@ struct jmessage_tReference : public JMessage::TReference { void setPageEndCount(s16 i_endCount) { mPageEndCount = i_endCount; } void onBombNameUseFlag() { mBombNameUseFlag = 1; } void onSelectRubyFlag(int i_flag) { mSelectRubyFlag |= (1 << i_flag); } + void setpStatus(u16* status) { mpStatus = status; } + void setObjectPtr(dMsgObject_c* ptr) { mpObjectPtr = ptr; } + void setCountBackUp() { mCharactor.mCountBackUp = mCharactor.field_0x40e; } + void setSelMsgPtr(char* ptr) { mpSelMsgPtr = ptr; } + void setPageNum(s16 pageNum) { mPageNum = pageNum; } + void setStopFlag(u8 flag) { mStopFlag = flag; } + void setStatus(u16 status) { *mpStatus = status; } + void setFont(JUTFont* font) { mpFont = font; } + void setFontSizeX(f32 x) { mFontSizeX = x; } + void setFontSizeY(f32 y) { mFontSizeY = y; } + void setRubySize(f32 size) { mRubySize = size; } + void setTBoxWidth(f32 width) { mTBoxWidth = width; } + void setTBoxHeight(f32 height) { mTBoxHeight = height; } + void setLineSpace(f32 space) { mLineSpace = space; } + void setCharSpace(f32 space) { mCharSpace = space; } + void setRubyCharSpace(f32 space) { mRubyCharSpace = space; } + void setSelFontSize(f32 size) { mSelFontSize = size; } + void setSelRubySize(f32 size) { mSelRubySize = size; } + void setSelTBoxWidth(f32 width) { mSelTBoxWidth = width; } + void setSelCharSpace(f32 space) { mSelCharSpace = space; } + void setSelRubyCharSpace(f32 space) { mSelRubyCharSpace = space; } + void decSendTimer() { mSendTimer--; } void setLineLength(int i_no, f32 i_strLen, f32 i_spaceLen) { mStrLength[i_no] = i_strLen; @@ -110,6 +133,13 @@ struct jmessage_tReference : public JMessage::TReference { } } + void addCharAllAlphaRate() { + mCharAllAlphaRate += mAddCharAllAlphaRate; + if (mCharAllAlphaRate > 1.0f) { + mCharAllAlphaRate = 1.0f; + } + } + dMsgObject_c* getObjectPtr() { return mpObjectPtr; } u8 getForm() { return mForm; } u8 getNowLightCount() { return mNowLightCount; } @@ -134,14 +164,37 @@ struct jmessage_tReference : public JMessage::TReference { f32 getSelRubyCharSpace() { return mSelRubyCharSpace; } f32 getRubySize() { return mRubySize; } f32 getRubyCharSpace() { return mRubyCharSpace; } + char* getSelTextPtr(int idx) { return mSelText[idx]; } + char* getSelRubyPtr(int idx) { return mSelRuby[idx]; } + char* getTextPtr() { return mText; } + char* getTextSPtr() { return mTextS; } + char* getRubyPtr() { return mRuby; } + u8 getSelectRubyFlag() { return mSelectRubyFlag; } + f32 getSelTBoxWidth() { return mSelTBoxWidth; } + u8 getSelectPos() { return mSelectPos; } + u16 getMsgID() { return mMsgID; } + bool isButtonTagStopFlag() { return mButtonTagStopFlag; } + u8 getStopFlag() { return mStopFlag; } + u8 getSendFlag() { return mSendFlag; } + u8 getFukiPosType() { return mFukiPosType; } + u16 getStatus() { return *mpStatus; } + u8 getArrange() { return mArrange; } + + struct CharSoundInfo { + u16 data[0x200]; + s16 field_0x40c; + s16 field_0x40e; + s16 mCountBackUp; + }; + CharSoundInfo getCharSoundInfo() { return mCharactor;} + u32 getDemoFrame() { return mDemoFrame; } + u32 getRevoMessageID() { return mRevoMessageID; } + f32 getCharAllAlphaRate() { return mCharAllAlphaRate; } /* 80228CB4 */ virtual ~jmessage_tReference(); /* 0x0008 */ STControl* mpStick; - /* 0x000C */ u16 mCharactor[0x200]; - /* 0x040C */ s16 field_0x40c; - /* 0x040E */ s16 field_0x40e; - /* 0x0410 */ s16 mCountBackUp; + /* 0x000C */ CharSoundInfo mCharactor; /* 0x0414 */ cXyz mActorPos; /* 0x0420 */ f32 mFontSizeX; /* 0x0424 */ f32 mFontSizeY; @@ -188,8 +241,8 @@ struct jmessage_tReference : public JMessage::TReference { /* 0x0A1C */ char mText[0x200]; /* 0x0C1C */ char mTextS[0x200]; /* 0x0E1C */ char mRuby[0x200]; - /* 0x101C */ u8 mSelText[3][50]; - /* 0x10B2 */ u8 mSelRuby[3][80]; + /* 0x101C */ char mSelText[3][50]; + /* 0x10B2 */ char mSelRuby[3][80]; /* 0x11A2 */ s8 mPageLine[40]; /* 0x11CA */ s8 mPageLineMax[40]; /* 0x11F2 */ u8 mPageType[40]; @@ -272,6 +325,9 @@ struct jmessage_tSequenceProcessor : public JMessage::TSequenceProcessor, /* 8022C8FC */ virtual bool do_jump_isReady(); /* 8022CBE4 */ virtual void do_jump(void const*, char const*); + u8 getMouthCheck() { return mMouthCheck; } + void setForceForm(u8 forceForm) { mForceForm = forceForm; } + /* 0x4C jmessage_tMeasureProcessor */ /* 0x9C */ const void* field_0x9c; /* 0xA0 */ const char* field_0xa0; @@ -330,6 +386,25 @@ struct jmessage_tRenderingProcessor : public JMessage::TRenderingProcessor { /* 8022D0A0 */ virtual void do_character(int); /* 8022D74C */ virtual bool do_tag(u32, void const*, u32); + void setTextInitPos(float x, float y) { + mTextInitPosX = x; + mTextInitPosY = y; + } + + void setTextScale(float x, float y) { + mTextInitScaleX = x; + mTextInitScaleY = y; + } + + void setSelTextInitPos(int idx, float x, float y) { + mSelTextInitPosX[idx] = x; + mSelTextInitPosY[idx] = y; + } + + void setTextInitOffsetPos(f32 offset) { mTextInitOffsetPos = offset; } + void setOutFont(COutFont_c* font) { mpOutFont = font; } + void setCharInfoPtr(CharInfo_c* info) { mCharInfoPtr = info; } + /* 0x038 */ COutFont_c* mpOutFont; /* 0x03C */ CharInfo_c* mCharInfoPtr; /* 0x040 */ s16* mpCharInfoCnt; diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index bcdb4128fe0..2fc80160115 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -16,17 +16,17 @@ struct jmessage_tSequenceProcessor; class dMsgObject_c : public msg_class { public: - /* 80233284 */ void _create(msg_class*); - /* 80233590 */ void _execute(); - /* 802339BC */ void _draw(); - /* 80233AE8 */ void _delete(); + /* 80233284 */ int _create(msg_class*); + /* 80233590 */ int _execute(); + /* 802339BC */ int _draw(); + /* 80233AE8 */ int _delete(); /* 80233D04 */ void setMessageIndex(u32, u32, bool); /* 80233E70 */ void setMessageIndexDemo(u32, bool); - /* 80233F84 */ int getMessageIndex(u32); - /* 80233FD8 */ void getRevoMessageIndex(u32); - /* 802340D4 */ void getMessageIndexAlways(u32); - /* 80234128 */ void getMessageIDAlways(u32); - /* 8023413C */ static s16 getMessageGroup(u32); + /* 80233F84 */ u32 getMessageIndex(u32); + /* 80233FD8 */ u32 getRevoMessageIndex(u32); + /* 802340D4 */ u32 getMessageIndexAlways(u32); + /* 80234128 */ u32 getMessageIDAlways(u32); + /* 8023413C */ s16 getMessageGroup(u32); /* 80234150 */ void waitProc(); /* 80234318 */ void openProc(); /* 802349D8 */ void outnowProc(); @@ -43,15 +43,15 @@ public: /* 802360A0 */ void talkStartInit(); /* 8023670C */ void fukiPosCalc(bool); /* 802368E4 */ void setStatusLocal(u16); - /* 802368F8 */ void getStatusLocal(); + /* 802368F8 */ u16 getStatusLocal(); /* 8023690C */ void delete_screen(bool); - /* 802369D8 */ void isSend(); + /* 802369D8 */ u8 isSend(); /* 80236BF8 */ void readMessageGroupLocal(mDoDvdThd_mountXArchive_c**); /* 80236C90 */ void changeFlowGroupLocal(s32); /* 80236CD4 */ void demoMessageGroupLocal(); /* 80236D00 */ void endFlowGroupLocal(); /* 80236D0C */ void changeGroupLocal(s16); - /* 80236DE4 */ void getStringLocal(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*, + /* 80236DE4 */ bool getStringLocal(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*, char*, char*, s16*); /* 802370A8 */ u8 isGetItemMessage(); /* 802370BC */ bool isKanbanMessage(); @@ -73,12 +73,12 @@ public: /* 802374D0 */ u8 getSelectBombNum(); /* 80237520 */ void onMsgSendControlLocal(); /* 80237530 */ void offMsgSendControlLocal(); - /* 80237550 */ void isMsgSendControlLocal(); + /* 80237550 */ int isMsgSendControlLocal(); /* 8023755C */ void onMsgSendLocal(); /* 8023756C */ void offMsgSendLocal(); - /* 8023757C */ void isMsgSendLocal(); - /* 80237588 */ void isMouthCheckLocal(); - /* 8023759C */ void getBombBuyPriceLocal(u8); + /* 8023757C */ int isMsgSendLocal(); + /* 80237588 */ bool isMouthCheckLocal(); + /* 8023759C */ int getBombBuyPriceLocal(u8); /* 802375E4 */ void addSelectBomBag(u8); /* 80237610 */ void resetSelectBomBag(); /* 8023763C */ u8 getSelectBombBagIDLocal(); @@ -88,26 +88,26 @@ public: /* 802378B8 */ static void setShopWaitTimer(u8); /* 802378CC */ void setSelectWordFlagLocal(u8); /* 802378D4 */ bool isHowlHearingModeLocal(); - /* 80237934 */ void isCameraCancelFlag(); - /* 80237950 */ void onCameraCancelFlag(); - /* 80237968 */ void offCameraCancelFlag(); + /* 80237934 */ static bool isCameraCancelFlag(); + /* 80237950 */ static void onCameraCancelFlag(); + /* 80237968 */ static void offCameraCancelFlag(); /* 80237980 */ static bool isKillMessageFlag(); /* 80237994 */ static void onKillMessageFlag(); /* 802379AC */ static void setKillMessageFlag(); /* 802379D8 */ void setKillMessageFlagLocal(); /* 80237A74 */ static void setTalkPartner(fopAc_ac_c*); /* 80237A88 */ static void setNowTalkFlowNo(s16); - /* 80237A9C */ void getNowTalkFlowNo(); - /* 80237AB0 */ void setDemoMessage(u32); + /* 80237A9C */ static s16 getNowTalkFlowNo(); + /* 80237AB0 */ static void setDemoMessage(u32); /* 80237AE0 */ static void setTalkHeap(void*); /* 80237B10 */ void setTalkHeapLocal(void*); /* 80237B54 */ static void* getTalkHeap(); - /* 80237B68 */ void isDraw(); + /* 80237B68 */ bool isDraw(); /* 80237BFC */ void setButtonStatusLocal(); /* 80237D88 */ void setDemoMessageLocal(u32); - /* 80237DD8 */ void getSmellTypeMessageIDLocal(); + /* 80237DD8 */ u16 getSmellTypeMessageIDLocal(); /* 80237E04 */ void setSmellTypeLocal(u8); - /* 80237E58 */ void getSelectCursorPosLocal(); + /* 80237E58 */ u8 getSelectCursorPosLocal(); /* 80237E68 */ void setSelectCursorPosLocal(u8); /* 80237F10 */ void setTalkActorLocal(fopAc_ac_c*); /* 8023800C */ static void readMessageGroup(mDoDvdThd_mountXArchive_c**); @@ -117,11 +117,11 @@ public: /* 802380C4 */ static void changeGroup(s16); /* 802380F4 */ static bool getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*, char*, char*, s16*); - /* 80238174 */ static u8* getMsgDtPtr(); + /* 80238174 */ static void* getMsgDtPtr(); /* 80238188 */ static void setProcessID(unsigned int); /* 8023819C */ static fopAc_ac_c* getActor(); /* 802381C0 */ static fopAc_ac_c* getpTalkActor(); - /* 802381D4 */ static u32 getIdx(); + /* 802381D4 */ static int getIdx(); /* 802381E8 */ static u16 getNodeIdx(); /* 802381FC */ static void setStatus(u16); /* 8023822C */ static u16 getStatus(); @@ -131,24 +131,24 @@ public: /* 802382C8 */ static void offMsgSendControl(); /* 802382F4 */ static int isMsgSendControl(); /* 80238320 */ static void onMsgSend(); - /* 8023834C */ void offMsgSend(); - /* 80238378 */ void isMsgSend(); + /* 8023834C */ static void offMsgSend(); + /* 80238378 */ static int isMsgSend(); /* 802383A4 */ static bool isMouthCheck(); /* 802383D0 */ static u32 getMessageID(); - /* 802383E4 */ u32 getSmellTypeMessageID(); + /* 802383E4 */ u16 getSmellTypeMessageID(); /* 80238410 */ static void setSmellType(u8); /* 80238440 */ static u8 getSelectCursorPos(); /* 8023846C */ static void setSelectCursorPos(u8); - /* 8023849C */ void setPortalMessageID(u16); - /* 802384B0 */ void setInsectItemNo(u8); + /* 8023849C */ static void setPortalMessageID(u16); + /* 802384B0 */ static void setInsectItemNo(u8); /* 802384C4 */ static void setLetterNameID(u16); /* 802384D8 */ static void setArrowNum(u8); - /* 802384EC */ void setMsgOutputType(u8); - /* 80238500 */ void getMsgOutputType(); + /* 802384EC */ static void setMsgOutputType(u8); + /* 80238500 */ static u8 getMsgOutputType(); /* 80238514 */ static const char* getWord(); - /* 80238528 */ void getSelectWord(int); + /* 80238528 */ static const char* getSelectWord(int); /* 80238544 */ static void setSelectWordFlag(u8); - /* 80238574 */ void getSelectWordFlag(); + /* 80238574 */ static u8 getSelectWordFlag(); /* 80238588 */ static bool isHowlHearingMode(); /* 802385B4 */ static u8 getSelectBombBagID(); /* 802385E0 */ static s16 getSelectBombPrice(); @@ -166,13 +166,34 @@ public: s16 getNowTotalPaymentLocal() { return mNowTotalPayment; } void setNowTotalPaymentLocal(s16 i_nowTotalPayment) { mNowTotalPayment = i_nowTotalPayment; } void onInputFlagLocal() { mInputFlag = 1; } - void offPaymentFlagLocal() { mPaymentFlag = 0; } + void offInputFlagLocal() { mInputFlag = 0; } + void offPaymentFlagLocal() { mPaymentFlag = false; } void offAutoMessageFlagLocal() { mAutoMessageFlag = 0; } void onAutoMessageFlagLocal() { mAutoMessageFlag = 1; } void setFundRaisingValueLocal(s16 i_value) { mFundRaisingValue = i_value; } u16 getPortalMessageIDLocal() { return mPortalMessageID; } bool isAutoMessageFlagLocal() { return mAutoMessageFlag; } bool isPaymentFlagLocal() { return mPaymentFlag; } + void onPaymentFlagLocal() { mPaymentFlag = true; } + s16 getNowTalkFlowNoLocal() { return mNowTalkFlowNo; } + void setNowTalkFlowNoLocal(s16 param_0) { mNowTalkFlowNo = param_0; } + void setTalkPartnerLocal(fopAc_ac_c* actor) { mpTalkPartner = actor; } + void onCameraCancelFlagLocal() { mCameraCancelFlag = true; } + void offCameraCancelFlagLocal() { mCameraCancelFlag = false; } + void onKillMessageFlagLocal() { mKillMessageFlag = true; } + void setProcessIDLocal(unsigned int id) { mProcessID = id; } + void setPortalMessageIDLocal(u16 msgID) { mPortalMessageID = msgID; } + void setInsectItemNoLocal(u8 itemNo) { mInsectItemNo = itemNo; } + void setLetterNameIDLocal(u16 nameID) { mLetterNameID = nameID; } + void setArrowNumLocal(u8 arrowNum) { mArrowNum = arrowNum; } + void setMsgOutputTypeLocal(u8 outputType) { mMsgOutputType = outputType; } + void addNowTotalPrice(s16 price) { addNowTotalPriceLocal(price); } + void addNowTotalPriceLocal(s16 price) { mNowTotalPrice += price; } + void addNowTotalPayment(s16 price) { addNowTotalPaymentLocal(price); } + void addNowTotalPaymentLocal(s16 price) { mNowTotalPayment += price; } + void setBombBagIDLocal(int idx, u8 id) { mBombBagID[idx] = id; } + void setBombMessageIDLocal(int idx, u16 id) { mBombMessageID[idx] = id; } + void setBombNumLocal(int idx, u8 id) { mBombNum[idx] = id; } u8 getSelectPushFlag() { return mSelectPushFlag; } u8 getSelectCancelPos() { return mSelectCancelPos; } @@ -187,10 +208,36 @@ public: void offAutoMessageFlag() { offAutoMessageFlagLocal(); } void onAutoMessageFlag() { onAutoMessageFlagLocal(); } void setFundRaisingValue(s16 i_value) { setFundRaisingValueLocal(i_value); } + s16 getFundRaisingValue() { return getFundRaisingValueLocal(); } + s16 getFundRaisingValueLocal() { return mFundRaisingValue; } u16 getPortalMessageID() { return getPortalMessageIDLocal(); } bool isAutoMessageFlag() { return isAutoMessageFlagLocal(); } bool isPaymentFlag() { return isPaymentFlagLocal(); } u8 getFukiKind() { return mFukiKind; } + bool isKillMessageFlagLocal() { return mKillMessageFlag; } + void offKillMessageFlagLocal() { mKillMessageFlag = false; } + void* getTalkHeapLocal() { return mpTalkHeap; } + u8 getSelectBomBag(int idx) { return getSelectBombBagLocal(idx); } + u8 getSelectBombBagLocal(int idx) { return mSelectBombBag[idx]; } + u8 getBombNumLocal(int idx) { return mBombNum[idx]; } + bool isCameraCancelFlagLocal() { return mCameraCancelFlag; } + void* getMsgDtPtrLocal() { return mpMsgDt; } + // TODO: The type return is unclear. Maybe msg_class*. + fopAc_ac_c* getActorLocal() { return (fopAc_ac_c*)field_0x100; } + fopAc_ac_c* getpTalkActorLocal() { return mpTalkActor; } + int getIdxLocal() { return mIdx; } + u16 getNodeIdxLocal() { return mNodeIdx; } + dMsgScrnBase_c* getScrnDrawPtrLocal() { return mpScrnDraw; } + u32 getMessageIDLocal() { return mMessageID; } + u8 getMsgOutputTypeLocal() { return mMsgOutputType; } + const char* getWordLocal() { return mWord; } + const char* getSelectWordLocal(int idx) { return mSelectWord[idx]; } + u8 getSelectWordFlagLocal() { return mSelectWordFlag; } + u16 getLetterNameIDLocal() { return mLetterNameID; } + u16 getInsectItemNoLocal() { return mInsectItemNo; } + u16 getBombMessageIDLocal(int idx) { return mBombMessageID[idx]; } + u8 getBombBagIDLocal(int idx) { return mBombBagID[idx]; } + u8 getArrowNumLocal() { return mArrowNum; } jmessage_tSequenceProcessor* getSequenceProcessor() { return mpSeqProc; } @@ -200,39 +247,40 @@ public: /* 0x108 */ dMsgString_c* mpMsgString; /* 0x10C */ COutFont_c* mpOutFont; /* 0x110 */ JMessage::TResourceContainer* mpResCont; - /* 0x114 */ JMessage::TControl* mpCtrl; + /* 0x114 */ jmessage_tControl* mpCtrl; /* 0x118 */ jmessage_tReference* mpRefer; /* 0x11C */ jmessage_tSequenceProcessor* mpSeqProc; /* 0x120 */ jmessage_tRenderingProcessor* mpRenProc; /* 0x124 */ JMessage::TParse* field_0x124; /* 0x128 */ void* mpMsgRes; - /* 0x12C */ u8 field_0x12c[4]; + /* 0x12C */ int field_0x12c; /* 0x130 */ void* mpMsgDt; /* 0x134 */ u8 field_0x134[4]; /* 0x138 */ fopAc_ac_c* mpTalkActor; - /* 0x13C */ int field_0x13c; + /* 0x13C */ fopAc_ac_c* field_0x13c; /* 0x140 */ fopAc_ac_c* mpTalkPartner; - /* 0x144 */ void* mpTalkHeap; - /* 0x148 */ int field_0x148; + /* 0x144 */ JKRExpHeap* mpTalkHeap; + /* 0x148 */ JKRHeap* field_0x148; /* 0x14C */ int mProcessID; /* 0x150 */ f32 field_0x150; - /* 0x154 */ int mMessageID; - /* 0x158 */ int field_0x158; - /* 0x15C */ int field_0x15c; + /* 0x154 */ u32 mMessageID; + /* 0x158 */ u32 field_0x158; + /* 0x15C */ u32 field_0x15c; /* 0x160 */ int mIdx; - /* 0x164 */ int mNodeIdx; + /* 0x164 */ u16 mNodeIdx; + /* 0x166 */ u16 field_0x166; /* 0x168 */ u16 field_0x168; - /* 0x16A */ u8 field_0x16a[2]; - /* 0x16C */ u16 field_0x16c; - /* 0x16E */ u16 field_0x16e; - /* 0x170 */ u16 mNowTalkFlowNo; - /* 0x172 */ u16 field_0x172; + /* 0x16A */ s16 field_0x16a; + /* 0x16C */ s16 field_0x16c; + /* 0x16E */ s16 field_0x16e; + /* 0x170 */ s16 mNowTalkFlowNo; + /* 0x172 */ s16 field_0x172; /* 0x174 */ s16 mInputValue; - /* 0x176 */ u16 mFundRaisingValue; + /* 0x176 */ s16 mFundRaisingValue; /* 0x178 */ u16 field_0x178; /* 0x17A */ s16 mNowTotalPrice; /* 0x17C */ s16 mNowTotalPayment; - /* 0x17E */ u16 field_0x17e; + /* 0x17E */ s16 field_0x17e; /* 0x180 */ u16 mPortalMessageID; /* 0x182 */ u16 mBombMessageID[3]; /* 0x188 */ u16 mLetterNameID; @@ -250,7 +298,7 @@ public: /* 0x19B */ u8 field_0x19b; /* 0x19C */ u8 mFlowChk; /* 0x19D */ u8 field_0x19d; - /* 0x19E */ u8 mCameraCancelFlag; + /* 0x19E */ bool mCameraCancelFlag; /* 0x19F */ u8 mInputFlag; /* 0x1A0 */ u8 mSmellType; /* 0x1A1 */ u8 mSelectCancelPos; @@ -270,9 +318,9 @@ public: /* 0x4CD */ u8 field_0x4cd; /* 0x4CE */ u8 field_0x4ce; /* 0x4CF */ u8 mAutoMessageFlag; - /* 0x4D0 */ u8 mPaymentFlag; + /* 0x4D0 */ bool mPaymentFlag; /* 0x4D1 */ u8 field_0x4d1; - /* 0x4D2 */ u8 mKillMessageFlag; + /* 0x4D2 */ bool mKillMessageFlag; /* 0x4D3 */ u8 mEquipBombInfo; /* 0x4D4 */ u8 field_0x4d4; }; @@ -304,6 +352,10 @@ inline bool dMsgObject_isKillMessageFlag() { return dMsgObject_c::isKillMessageFlag(); } +inline bool dMsgObject_isCameraCancelFlag() { + return dMsgObject_c::isCameraCancelFlag(); +} + inline u32 dMsgObject_getMessageID() { return dMsgObject_c::getMessageID(); } @@ -324,10 +376,22 @@ inline void dMsgObject_offMsgSendControl() { dMsgObject_getMsgObjectClass()->offMsgSendControl(); } +inline void dMsgObject_onMsgSendControl() { + dMsgObject_getMsgObjectClass()->onMsgSendControl(); +} + inline int dMsgObject_isMsgSendControl() { return dMsgObject_getMsgObjectClass()->isMsgSendControl(); } +inline int dMsgObject_isMsgSend() { + return dMsgObject_getMsgObjectClass()->isMsgSend(); +} + +inline void dMsgObject_offMsgSend() { + dMsgObject_getMsgObjectClass()->offMsgSend(); +} + inline const char* dMsgObject_getWord() { return dMsgObject_c::getWord(); } @@ -353,6 +417,14 @@ inline bool dMsgObject_getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* p param_7, param_8); } +inline void dMsgObject_onCameraCancelFlag() { + dMsgObject_c::onCameraCancelFlag(); +} + +inline void dMsgObject_offCameraCancelFlag() { + dMsgObject_c::offCameraCancelFlag(); +} + inline void dMsgObject_onKillMessageFlag() { dMsgObject_c::onKillMessageFlag(); } @@ -409,12 +481,16 @@ inline void dMsgObject_setTalkHeap(void* heap) { dMsgObject_c::setTalkHeap(heap); } +inline void dMsgObject_setMsgOutputType(u8 outputType) { + dMsgObject_getMsgObjectClass()->setMsgOutputType(outputType); +} + class dMsgObject_HowlHIO_c { public: /* 80232AEC */ dMsgObject_HowlHIO_c(); /* 80238B94 */ virtual ~dMsgObject_HowlHIO_c() {} - /* 0x04 */ s8 field_0x4; + /* 0x04 */ s32 field_0x4; /* 0x08 */ JUtility::TColor mHowlLineStartCol; /* 0x0C */ JUtility::TColor mHowlLineEndCol; /* 0x10 */ f32 mHighlightScale; @@ -524,10 +600,10 @@ public: /* 0x0E0 */ f32 mBoxItemTextPosX; /* 0x0E4 */ f32 mBoxItemTextPosY; /* 0x0E8 */ JUtility::TColor - mBoxStartBlack[10]; // talk, navi, midna, item, stone, wood, book, wolf, - /* 0x110 */ JUtility::TColor mBoxEndBlack[10]; - /* 0x138 */ JUtility::TColor mBoxStartWhite[10]; - /* 0x160 */ JUtility::TColor mBoxEndWhite[10]; + mBoxStartBlack[20]; // talk, navi, midna, item, stone, wood, book, wolf, + /* 0x110 */ //JUtility::TColor mBoxEndBlack[10]; + /* 0x138 */ JUtility::TColor mBoxStartWhite[20]; + /* 0x160 */ //JUtility::TColor mBoxEndWhite[10]; /* 0x188 */ JUtility::TColor mSelMsgInactiveCol; /* 0x18C */ f32 mStageTitleCharPosX; /* 0x190 */ f32 mBossNameCharPosX; @@ -567,15 +643,15 @@ public: /* 0x2F6 */ s16 mFlowIndex; /* 0x2F8 */ s16 mSaveSeqMsgIndex; /* 0x2FA */ s16 mSelWaitFrame; - /* 0x2FC */ u16 mBoxAppearBound; - /* 0x2FE */ u16 mBoxAppearFrame; - /* 0x300 */ u16 mWaitFrame; - /* 0x302 */ u16 mLightAppearFrame; - /* 0x304 */ u16 field_0x304; - /* 0x306 */ u16 mStageTitleFadeIn; - /* 0x308 */ u16 mStageTitleFadeOut; - /* 0x30A */ u16 mBossNameFadeIn; - /* 0x30C */ u16 mBossNameFadeOut; + /* 0x2FC */ s16 mBoxAppearBound; + /* 0x2FE */ s16 mBoxAppearFrame; + /* 0x300 */ s16 mWaitFrame; + /* 0x302 */ s16 mLightAppearFrame; + /* 0x304 */ s16 field_0x304; + /* 0x306 */ s16 mStageTitleFadeIn; + /* 0x308 */ s16 mStageTitleFadeOut; + /* 0x30A */ s16 mBossNameFadeIn; + /* 0x30C */ s16 mBossNameFadeOut; /* 0x30E */ u16 mStageTitleDisplayTime; /* 0x310 */ u16 mBossNameDisplayTime; /* 0x312 */ u16 mBatchDisplayWeight_3; diff --git a/include/d/msg/d_msg_scrn_base.h b/include/d/msg/d_msg_scrn_base.h index fc9f0e56636..904c4f2fb92 100644 --- a/include/d/msg/d_msg_scrn_base.h +++ b/include/d/msg/d_msg_scrn_base.h @@ -38,6 +38,32 @@ public: /* 8023C4F4 */ virtual void fontAlpha(f32); /* 80238C5C */ virtual void fukiPosCalc(u8); + f32 getSelTextBoxPosX(int idx) { return mSelTextBoxPosX[idx]; } + f32 getSelTextBoxPosY(int idx) { return mSelTextBoxPosY[idx]; } + f32 getTextBoxPosX() { return mTextBoxPosX; } + f32 getTextBoxPosY() { return mTextBoxPosY; } + f32 getTextBoxScaleX() { return mTextBoxScaleX; } + f32 getTextBoxScaleY() { return mTextBoxScaleY; } + f32 getTextBoxPosOffsetY() { return mTextBoxPosOffsetY; } + f32 getFontSizeX() { return mFontSize.mSizeX; } + f32 getFontSizeY() { return mFontSize.mSizeY; } + f32 getRubySize() { return mRubySize; } + f32 getTBoxWidth() { return mTBoxWidth; } + f32 getTBoxHeight() { return mTBoxHeight; } + f32 getLineSpace() { return mLineSpace; } + f32 getCharSpace() { return mCharSpace; } + f32 getRubyCharSpace() { return mRubyCharSpace; } + f32 getSelFontSize() { return mSelFontSize; } + f32 getSelRubySize() { return mSelRubySize; } + f32 getSelTBoxWidth() { return mSelTBoxWidth; } + f32 getSelCharSpace() { return mSelCharSpace; } + f32 getSelRubyCharSpace() { return mSelRubyCharSpace; } + CharInfo_c* getCharInfoPtr() { return mCharInfoPtr; } + void setCharAlphaRate(f32 rate) { mCharAlphaRate = rate; } + void setTextBoxPosOffsetY(f32 offset) { mTextBoxPosOffsetY = offset; } + void setMsgID(u16 msgID) { mMsgID = msgID; } + void setOutFont(COutFont_c* font) { mpOutFont = font; } + /* 0x04 */ J2DScreen* mpScreen; /* 0x08 */ CPaneMgr* mpPmP_c; /* 0x0C */ CPaneMgr* mpTm_c[7]; diff --git a/include/d/msg/d_msg_scrn_howl.h b/include/d/msg/d_msg_scrn_howl.h index ed654979b4f..88df8beb0ad 100644 --- a/include/d/msg/d_msg_scrn_howl.h +++ b/include/d/msg/d_msg_scrn_howl.h @@ -42,6 +42,8 @@ struct dMsgScrnHowl_c : public dMsgScrnBase_c { /* 80244304 */ u16 getGuideDataSize(); /* 8024438C */ u8 getGuideDataType(int); + bool isHearingMode() { return field_0x2798 == 3;} + /* 0x00C4 */ CPaneMgr* mpLineH[3]; /* 0x00D0 */ CPaneMgr* mpLineV[7]; /* 0x00EC */ CPaneMgr* mpLineAll; diff --git a/include/d/msg/d_msg_scrn_item.h b/include/d/msg/d_msg_scrn_item.h index 2ef77d16f85..e0f3ee596c9 100644 --- a/include/d/msg/d_msg_scrn_item.h +++ b/include/d/msg/d_msg_scrn_item.h @@ -2,5 +2,33 @@ #define MSG_SCRN_D_MSG_SCRN_ITEM_H #include "dolphin/types.h" +#include "d/msg/d_msg_scrn_base.h" + +struct dMsgScrnItem_c : public dMsgScrnBase_c { + /* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*); + /* 8023F51C */ ~dMsgScrnItem_c(); + /* 8023F888 */ void exec(); + /* 8023FB24 */ void drawSelf(); + /* 8023FF30 */ void arwAnimeInit(); + /* 8023FF54 */ void arwAnimeMove(); + /* 8023FF78 */ void dotAnimeInit(); + /* 8023FF9C */ void dotAnimeMove(); + /* 8023FFC0 */ void setSelectString(char*, char*, char*); + /* 8023FFE4 */ void setSelectRubyString(char*, char*, char*); + /* 80240008 */ bool isSelect(); + /* 8024002C */ void selectAnimeInit(u8, u8, f32, u8); + /* 8024005C */ bool selectAnimeMove(u8, u8, bool); + /* 80240080 */ bool selectAnimeEnd(); + /* 802400A4 */ void fukiScale(f32); + /* 802400A8 */ void fukiTrans(f32, f32); + /* 802400CC */ void fukiAlpha(f32); + /* 80240174 */ void fukiPosCalc(u8); + /* 8024074C */ void setBtk0Animation(J2DAnmTextureSRTKey*); + /* 802407E8 */ void setBpk0Animation(J2DAnmColor*); + /* 80240844 */ void setBpk1Animation(J2DAnmColor*); + /* 802408A4 */ void isOugiID(); + + u8 field_0xc4[0x1a0 - 0xc4]; +}; #endif /* MSG_SCRN_D_MSG_SCRN_ITEM_H */ diff --git a/include/d/msg/d_msg_scrn_talk.h b/include/d/msg/d_msg_scrn_talk.h index 41d7e19b266..ecde7432386 100644 --- a/include/d/msg/d_msg_scrn_talk.h +++ b/include/d/msg/d_msg_scrn_talk.h @@ -2,5 +2,29 @@ #define MSG_SCRN_D_MSG_SCRN_TALK_H #include "dolphin/types.h" +#include "d/msg/d_msg_scrn_base.h" + +struct dMsgScrnTalk_c : public dMsgScrnBase_c { + /* 80246FF0 */ dMsgScrnTalk_c(u8, u8, JKRExpHeap*); + /* 80247A90 */ ~dMsgScrnTalk_c(); + /* 80247D34 */ void exec(); + /* 80247E4C */ void drawSelf(); + /* 802480F0 */ void arwAnimeInit(); + /* 80248114 */ void arwAnimeMove(); + /* 80248138 */ void dotAnimeInit(); + /* 8024815C */ void dotAnimeMove(); + /* 80248180 */ void setSelectString(char*, char*, char*); + /* 802481AC */ void setSelectRubyString(char*, char*, char*); + /* 802481D8 */ bool isSelect(); + /* 8024820C */ void selectAnimeInit(u8, u8, f32, u8); + /* 80248244 */ bool selectAnimeMove(u8, u8, bool); + /* 80248278 */ bool selectAnimeEnd(); + /* 802482AC */ void fukiScale(f32); + /* 802482B0 */ void fukiTrans(f32, f32); + /* 802482B4 */ void fukiAlpha(f32); + /* 8024835C */ void fukiPosCalc(u8); + + u8 field_0xc4[0x48c - 0xc4]; +}; #endif /* MSG_SCRN_D_MSG_SCRN_TALK_H */ diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index e4734a7518b..33bf1f74bb6 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -252,4 +252,12 @@ inline void mDoAud_startFogSe() { g_mEnvSeMgr.startFogSe(); } +inline void mDoAud_talkOut() { + Z2AudioMgr::getInterface()->talkOut(); +} + +inline void mDoAud_talkIn() { + Z2AudioMgr::getInterface()->talkIn(); +} + #endif /* M_DO_M_DO_AUDIO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h b/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h index cd2610477aa..e501dc65f1a 100644 --- a/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h +++ b/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h @@ -198,7 +198,7 @@ namespace daObjMovebox { void off_switch2() const { fopAcM_offSwitch(this, prmZ_get_swSave2()); } static s16 M_dir_base[4]; - static const char* M_arcname[8]; + static const char* const M_arcname[8]; static const dCcD_SrcCyl M_cyl_src; static const daObjMovebox::Hio_c::Attr_c M_attr[8]; diff --git a/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp b/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp index 08d62456ec9..555585e19d7 100644 --- a/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp +++ b/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp @@ -592,7 +592,7 @@ extern "C" char const* const stringBase_804816E3; /* 80481104-80481124 -00001 0020+00 3/3 0/0 0/0 .rodata M_arcname__Q212daObjMovebox5Act_c */ -SECTION_RODATA const char* daObjMovebox::Act_c::M_arcname[8] = { +const char* const daObjMovebox::Act_c::M_arcname[8] = { "Kkiba_00", "Osiblk", "H_Box20", "A_SMBlock", "P_Lv4blk", "P_Lv4blk2", "H_OsiHaka", "dummy4", }; COMPILER_STRIP_GATE(0x80481104, &daObjMovebox::Act_c::M_arcname); diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index 0c1d9b25567..a92d45a261d 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -1203,26 +1203,26 @@ void jmessage_tReference::resetWord() { /* 80229768-80229788 2240A8 0020+00 3/3 0/0 0/0 .text setCharactor__19jmessage_tReferenceFUs */ void jmessage_tReference::setCharactor(u16 param_0) { - mCharactor[field_0x40c] = param_0; - field_0x40c++; + mCharactor.data[mCharactor.field_0x40c] = param_0; + mCharactor.field_0x40c++; } /* 80229788-802297B0 2240C8 0028+00 3/3 0/0 0/0 .text addCharactor__19jmessage_tReferenceFUs */ void jmessage_tReference::addCharactor(u16 param_0) { - if (param_0 == mCharactor[field_0x40e]) { - field_0x40e++; + if (param_0 == mCharactor.data[mCharactor.field_0x40e]) { + mCharactor.field_0x40e++; } } /* 802297B0-802297E4 2240F0 0034+00 3/3 0/0 0/0 .text resetCharactor__19jmessage_tReferenceFv */ void jmessage_tReference::resetCharactor() { for (int i = 0; i < 0x200; i++) { - mCharactor[i] = 0; + mCharactor.data[i] = 0; } - field_0x40c = 0; - field_0x40e = 0; - mCountBackUp = 0; + mCharactor.field_0x40c = 0; + mCharactor.field_0x40e = 0; + mCharactor.mCountBackUp = 0; } /* 802297E4-80229810 224124 002C+00 0/0 1/1 0/0 .text diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 6f7c26269f0..30973a52476 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -748,7 +748,7 @@ void dMsgFlow_c::setInitValueGroupChange(int param_1, fopAc_ac_c** param_2) { */ u8* dMsgFlow_c::getMsgDataBlock(char const* block_tag) { char tag[5] = {0}; - u8* dt_p = dMsgObject_c::getMsgDtPtr(); + u8* dt_p = (u8*)dMsgObject_c::getMsgDtPtr(); u8* block; u32 num; u32 i; diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index 90a5ae291ae..cb09ef276f5 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -4,80 +4,34 @@ // #include "d/msg/d_msg_object.h" -#include "stdio.h" -#include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_class.h" +#include "d/msg/d_msg_string.h" +#include "d/msg/d_msg_scrn_base.h" +#include "d/msg/d_msg_out_font.h" +#include "d/msg/d_msg_scrn_howl.h" +#include "d/msg/d_msg_scrn_jimaku.h" +#include "d/msg/d_msg_scrn_tree.h" +#include "d/msg/d_msg_scrn_kanban.h" +#include "d/msg/d_msg_scrn_item.h" +#include "d/msg/d_msg_scrn_staff.h" +#include "d/msg/d_msg_scrn_place.h" +#include "d/msg/d_msg_scrn_boss.h" +#include "d/msg/d_msg_scrn_talk.h" +#include "d/a/d_a_obj_ss_base.h" +#include "d/a/d_a_player.h" +#include "d/a/d_a_alink.h" +#include "d/d_demo.h" +#include "d/meter/d_meter2_info.h" +#include "d/meter/d_meter2.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" +#include "f_op/f_op_msg_mng.h" +#include "stdio.h" +#include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_lib.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "dol2asm.h" + #include "dolphin/types.h" - -// -// Types: -// - -struct dMsgString_c { - /* 80249C20 */ dMsgString_c(); - /* 80249D28 */ ~dMsgString_c(); -}; - -struct dMsgScrnTree_c { - /* 80248954 */ dMsgScrnTree_c(JUTFont*, JKRExpHeap*); -}; - -struct dMsgScrnTalk_c { - /* 80246FF0 */ dMsgScrnTalk_c(u8, u8, JKRExpHeap*); -}; - -struct dMsgScrnStaff_c { - /* 80246B34 */ dMsgScrnStaff_c(u8); -}; - -struct dMsgScrnPlace_c { - /* 802463CC */ dMsgScrnPlace_c(); -}; - -struct dMsgScrnKanban_c { - /* 80244E38 */ dMsgScrnKanban_c(JKRExpHeap*); -}; - -struct dMsgScrnJimaku_c { - /* 80244558 */ dMsgScrnJimaku_c(u8, JKRExpHeap*); -}; - -struct dMsgScrnItem_c { - /* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*); -}; - -struct dMsgScrnHowl_c { - /* 8024096C */ dMsgScrnHowl_c(); - /* 80242080 */ void isKeyCheck(); -}; - -struct dMsgScrnBoss_c { - /* 8023C5C8 */ dMsgScrnBoss_c(); -}; - -struct dMsgScrnBase_c { - /* 80238C3C */ void exec(); - /* 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(); - /* 8023C360 */ void setString(char*, char*); - /* 8023C3EC */ void setRubyString(char*); -}; - -struct dDemo_c { - static u8 m_control[4]; - static u8 m_mesgControl[4]; -}; - // // Forward References: // @@ -362,6 +316,9 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // +static void dMsgObject_addFundRaising(s16 param_0); +static void dMsgObject_addTotalPayment(s16 param_0); + /* ############################################################################################## */ /* 804510C8-804510D0 0005C8 0002+06 5/4 0/0 0/0 .sbss s_groupID */ static s16 s_groupID; @@ -372,14 +329,16 @@ s16 dMsgObject_getGroupID() { } /* 80232A44-80232AEC 22D384 00A8+00 1/1 0/0 0/0 .text dMsgObject_searchSSItem__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMsgObject_searchSSItem(void* param_0, void* param_1) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_searchSSItem__FPvPv.s" +static int dMsgObject_searchSSItem(void* param_1, void* param_2) { + daPy_py_c* player = daPy_getPlayerActorClass(); + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_SSITEM) { + if (static_cast(param_1)->getProcessID() == player->getGrabActorID()) { + static_cast(param_1)->setSoldOut(); + return 0; + } + } + return 0; } -#pragma pop /* ############################################################################################## */ /* 803C0AE8-803C0B4C -00001 0064+00 1/1 0/0 0/0 .data @4486 */ @@ -501,6 +460,55 @@ SECTION_SDATA2 static f32 lit_4084 = 1.0f; SECTION_SDATA2 static f32 lit_4085 = 11.0f / 5.0f; /* 80232AEC-80232D6C 22D42C 0280+00 1/1 0/0 0/0 .text __ct__20dMsgObject_HowlHIO_cFv */ +// Matches with literals +#ifdef NONMATCHING +dMsgObject_HowlHIO_c::dMsgObject_HowlHIO_c() { + mHighlightScale = 0.5f; + mHighlightMoyaR0.set(255, 255, 255, 255); + mHighlightMoyaR1.set(0, 0, 0, 0); + mHighlightMoyabsR0.set(200, 255, 200, 255); + mHighlightMoyabsR1.set(0, 255, 128, 0); + mHighlightPikaR0.set(0, 0, 0, 0); + mHighlightPikaR1.set(0, 0, 0, 0); + mAnmSpeed = 0.1f; + mHowlLineStartCol.set(150, 255, 210, 255); + mHowlLineEndCol.set(128, 128, 128, 255); + mGuideUpperBlack.set(0, 105, 150, 0); + mGuideUpperWhite.set(255, 255, 255, 255); + mGuideUpperAlpha = 0.3f; + mGuideMidBlack.set(0, 105, 130, 0); + mGuideMidWhite.set(255, 255, 255, 255); + mGuideMidAlpha = 0.3f; + mGuideLowerBlack.set(0, 90, 150, 0); + mGuideLowerWhite.set(255, 255, 255, 255); + mGuideLowerAlpha = 0.4f; + mAnswerUpperBlack.set(255, 255, 140, 0); + mAnswerUpperWhite.set(255, 255, 255, 255); + mAnswerUpperAlpha = 0.05f; + mAnswerMidBlack.set(255, 255, 140, 0); + mAnswerMidWhite.set(255, 255, 255, 255); + mAnswerMidAlpha = 0.05f; + mAnswerLowerBlack.set(255, 255, 140, 0); + mAnswerLowerWhite.set(255, 255, 255, 255); + mAnswerLowerAlpha = 0.05f; + mDotBlack.set(150, 210, 255, 0); + mDotWhite.set(255, 255, 255, 255); + mDotScale = 1.5f; + mWaveformLineLen = 15; + mWaveformDotLen = 35; + mDrawInterval = 2.0f; + mLineThickness = 0.5f; + mCrossPosX = 0.0f; + mCrossPosY = 0.0f; + mCrossScale = 1.0f; + mWindowPosX = 0.0f; + mWindowPosY = 0.0f; + mWindowScale = 1.0f; + mInputStartPoint = 0.0f; + mWaveformThickness = 12; + mLineSpaceOffset = 2.2f; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -509,6 +517,7 @@ asm dMsgObject_HowlHIO_c::dMsgObject_HowlHIO_c() { #include "asm/d/msg/d_msg_object/__ct__20dMsgObject_HowlHIO_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454AC8-80454ACC 0030C8 0004+00 1/1 0/0 0/0 .sdata2 @4127 */ @@ -579,6 +588,212 @@ SECTION_SDATA2 static f32 lit_4147[1 + 1 /* padding */] = { }; /* 80232D6C-80233284 22D6AC 0518+00 1/1 0/0 0/0 .text __ct__16dMsgObject_HIO_cFv */ +// Matches with literals +#ifdef NONMATCHING +dMsgObject_HIO_c::dMsgObject_HIO_c() { + mBoxMidna_fontSizeX = 23.0f; + mBoxMidna_fontSizeY = 22.0f; + field_0xc = 26.0f; + field_0x14 = 25.0f; + field_0x3c = 1.0f; + mBoxNaviAnmSpeed = 1.0f; + field_0x44 = 1.0f; + mBoxItemAnmSpeed = 1.0f; + field_0x4c = 1.0f; + field_0x50 = 1.0f; + field_0x54 = 1.0f; + mBoxWolfAnmSpeed = 0.7f; + mBoxTalkAlphaP = 0.9f; + mBoxNaviAlphaP = 0.2f; + mBoxMidnaAlphaP = 0.7f; + mBoxItemAlphaP = 0.3f; + mBoxStoneAlphaP = 0.4f; + mBoxWoodAlphaP = 0.4f; + mBoxBookAlphaP = 0.7f; + mBoxWolfAlphaP = 0.9f; + mSubtitleAlphaP = 1.0f; + mBoxItemHaloAlpha = 0.0f; + mBoxNaviHaloAlpha = 1.0f; + mBoxMidnaHaloAlpha = 1.0f; + mBoxWolfHaloAlpha = 0.3f; + mBoxTalkHaloAlpha = 1.0f; + mBoxTalkScaleX = 1.2f; + mBoxNaviScaleX = 1.0f; + mBoxMidnaScaleX = 1.0f; + mBoxItemScaleX = 1.05f; + mBoxStoneScaleX = 1.0f; + mBoxWoodScaleX = 1.0f; + mBoxBookScaleX = 1.0f; + mBoxWolfScaleX = 1.05f; + mStageTitleScaleX = 1.0f; + mSubtitleScaleX = 1.0f; + mBossNameScaleX = 1.0f; + mBoxTalkScaleY = 1.0f; + mBoxNaviScaleY = 1.0f; + mBoxMidnaScaleY = 1.0f; + mBoxItemScaleY = 0.97f; + mBoxStoneScaleY = 1.0f; + mBoxWoodScaleY = 1.0f; + mBoxBookScaleY = 1.0f; + mBoxWolfScaleY = 1.1f; + mStageTitleScaleY = 1.0f; + mSubtitleScaleY = 1.0f; + mBossNameScaleY = 1.0f; + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 10; j++) { + mChoicePos[i][j] = 0.0f; + mBoxPos[i][j] = 0.0f; + } + } + mBoxPos[2][0] = 30.0f; + mBoxPos[0][3] = 11.0f; + mPortalIconScale = 1.7f; + mTextPosX = 4.5f; + mTextPosY = 0.0f; + mStageTitleCharPosX = 0.0f; + mStageTitleCharPosY = -45.0f; + mStageTitleCharSizeX = 1.0f; + mStageTitleCharSizeY = 1.0f; + mStageTitleBasePosX = 0.0f; + mStageTitleBasePosY = -45.0f; + mStageTitleBaseSizeX = 1.0f; + mStageTitleBaseSizeY = 1.0f; + mStageTitleBaseAlpha = 1.0f; + mBossNameCharPosX = 0.0f; + mBossNameCharPosY = 0.0f; + mBossNameCharSizeX = 1.0f; + mBossNameCharSizeY = 1.0f; + mBossNameBasePosX = 0.0f; + mBossNameBasePosY = 0.0f; + mBossNameBaseSizeX = 1.0f; + mBossNameBaseSizeY = 1.0f; + mBossNameBaseAlpha = 1.0f; + mStageTitleDisplayType = 0; + mBoxItemSizeX = 0.75f; + mBoxItemSizeY = 0.75f; + mBoxItemPosX = -5.0f; + mBoxItemPosY = -1.0f; + mBoxItemTextSizeX = 0.95f; + mBoxItemTextSizeY = 0.95f; + mBoxItemTextPosX = -30.0f; + mBoxItemTextPosY = -1.0f; + for (int i = 0; i < 10; i++) { + mBoxStartBlack[i].set(0, 0, 0, 0); + mBoxStartWhite[i].set(200, 200, 200, 255); + mBoxStartBlack[i + 10].set(0, 0, 0, 0); + mBoxStartWhite[i + 10].set(0, 0, 0, 255); + } + mSelMsgInactiveCol.set(150, 150, 150, 255); + mMsgIndex = 0; + mFlowIndex = 0; + mSaveSeqMsgIndex = 0; + mSelWaitFrame = 10; + mBoxAppearBound = 240; + mBoxAppearFrame = 10; + mWaitFrame = 0; + mLightAppearFrame = 10; + field_0x304 = 5; + mStageTitleFadeIn = 10; + mStageTitleFadeOut = 10; + mBossNameFadeIn = 10; + mBossNameFadeOut = 10; + mStageTitleDisplayTime = 60; + mBossNameDisplayTime = 60; + mMsgDebug = 0; + mSaveSeqMsgDebug = 0; + mBatchDisplayWeight_3 = 30; + mCharDisplayWeight_5 = 3; + mBatchDisplayWeight_8 = 10; + mBatchDisplayWeight_9 = 30; + mTextColorDebug = 0; + mTextColorUpperR[0] = 0xff; + mTextColorUpperG[0] = 0xff; + mTextColorUpperB[0] = 0xff; + mTextColorLowerR[0] = 0xff; + mTextColorLowerG[0] = 0xff; + mTextColorLowerB[0] = 0xff; + mTextColorUpperR[1] = 0xf0; + mTextColorUpperG[1] = 0x78; + mTextColorUpperB[1] = 0x78; + mTextColorLowerR[1] = 0xf0; + mTextColorLowerG[1] = 0x78; + mTextColorLowerB[1] = 0x78; + mTextColorUpperR[2] = 0xaa; + mTextColorUpperG[2] = 0xdc; + mTextColorUpperB[2] = 0x8c; + mTextColorLowerR[2] = 0xaa; + mTextColorLowerG[2] = 0xdc; + mTextColorLowerB[2] = 0x8c; + mTextColorUpperR[3] = 0xa0; + mTextColorUpperG[3] = 0xb4; + mTextColorUpperB[3] = 0xdc; + mTextColorLowerR[3] = 0xa0; + mTextColorLowerG[3] = 0xb4; + mTextColorLowerB[3] = 0xdc; + mTextColorUpperR[4] = 0xdc; + mTextColorUpperG[4] = 0xdc; + mTextColorUpperB[4] = 0x82; + mTextColorLowerR[4] = 0xdc; + mTextColorLowerG[4] = 0xdc; + mTextColorLowerB[4] = 0x82; + mTextColorUpperR[5] = 0xb4; + mTextColorUpperG[5] = 0xc8; + mTextColorUpperB[5] = 0xe6; + mTextColorLowerR[5] = 0xb4; + mTextColorLowerG[5] = 0xc8; + mTextColorLowerB[5] = 0xe6; + mTextColorUpperR[6] = 0xc8; + mTextColorUpperG[6] = 0xa0; + mTextColorUpperB[6] = 0xdc; + mTextColorLowerR[6] = 0xc8; + mTextColorLowerG[6] = 0xa0; + mTextColorLowerB[6] = 0xdc; + mTextColorUpperR[7] = 0xff; + mTextColorUpperG[7] = 0xff; + mTextColorUpperB[7] = 0xff; + mTextColorLowerR[7] = 0xff; + mTextColorLowerG[7] = 0xff; + mTextColorLowerB[7] = 0xff; + mTextColorUpperR[8] = 0xdc; + mTextColorUpperG[8] = 0xaa; + mTextColorUpperB[8] = 0x78; + mTextColorLowerR[8] = 0xdc; + mTextColorLowerG[8] = 0xaa; + mTextColorLowerB[8] = 0x78; + mHaloDelayFrame = 0; + mDisplaySpeed = 1; + mHaloDelayFrameSpirit = 0; + mDisplaySpeedSpirit = 4; + mMessageDisplay = 0; + mPikariHaloDelay_spirit = 0; + mPikariScale = 1.5f; + mPikariMoyaR0.r = 0xff; + mPikariMoyaR0.g = 0xff; + mPikariMoyaR0.b = 0xff; + mPikariMoyaR0.a = 0x14; + mPikariMoyaR1.r = 0xdc; + mPikariMoyaR1.g = 0xb0; + mPikariMoyaR1.b = 0x8a; + mPikariMoyaR1.a = 0; + mPikariMoyabsR0.r = 0xff; + mPikariMoyabsR0.g = 0xff; + mPikariMoyabsR0.b = 0xff; + mPikariMoyabsR0.a = 30; + mPikariMoyabsR1.r = 0xc0; + mPikariMoyabsR1.g = 0x73; + mPikariMoyabsR1.b = 0; + mPikariMoyabsR1.a = 0; + mPikariPikaR0.r = 0xaf; + mPikariPikaR0.g = 0xdc; + mPikariPikaR0.b = 0xa0; + mPikariPikaR0.a = 0x8c; + mPikariPikaR1.r = 0x96; + mPikariPikaR1.g = 0xd2; + mPikariPikaR1.b = 0x78; + mPikariPikaR1.a = 0; + mPikariAnmSpeed = 0.3f; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -587,17 +802,119 @@ asm dMsgObject_HIO_c::dMsgObject_HIO_c() { #include "asm/d/msg/d_msg_object/__ct__16dMsgObject_HIO_cFv.s" } #pragma pop +#endif /* 80233284-80233590 22DBC4 030C+00 1/1 0/0 0/0 .text _create__12dMsgObject_cFP9msg_class */ +// Matches with literals +#ifdef NONMATCHING +int dMsgObject_c::_create(msg_class* param_1) { + field_0x124 = NULL; + field_0x100 = param_1; + field_0x16c = -1; + field_0x16e = -1; + mNowTalkFlowNo = 0; + mpTalkActor = NULL; + field_0x13c = 0; + mpTalkPartner = NULL; + mpTalkHeap = NULL; + field_0x148 = NULL; + mProcessID = 0xffffffff; + mIdx = 0; + mNodeIdx = 0xff; + field_0x198 = 0; + field_0x199 = 0; + mFukiKind = 0xff; + field_0x19b = 0; + mFlowChk = 0; + field_0x19d = 0; + mpMsgDt = NULL; + field_0x168 = 0; + mInputValue = 0; + mFundRaisingValue = 0; + field_0x178 = 0; + mNowTotalPrice = 0; + mNowTotalPayment = 0; + field_0x17e = 0; + mPortalMessageID = 0; + for (int i = 0; i < 3; i++) { + mBombMessageID[i] = 0; + mBombNum[i] = 0; + mBombBagID[i] = 0xff; + mSelectBombBag[i] = 0; + } + field_0x193 = 0; + mInsectItemNo = 0xc0; + mLetterNameID = 0; + mItemEquipButton = 0; + mSelectCancelPos = 0; + mArrowNum = 0; + mpMsgRes = dMeter2Info_getMsgResource(); + changeGroup(0); + mpOutFont = NULL; + mpScrnDraw = NULL; + mpResCont = new JMessage::TResourceContainer(); + JUT_ASSERT(1299, mpResCont != 0); + mpCtrl = dDemo_c::getMesgControl(); + JUT_ASSERT(1302, mpCtrl != 0); + mpRefer = new jmessage_tReference(); + JUT_ASSERT(1305, mpRefer != 0); + mpRefer->setpStatus(¶m_1->mMode); + mpSeqProc = new jmessage_tSequenceProcessor(mpRefer, mpCtrl); + JUT_ASSERT(1310, mpSeqProc != 0); + mpRenProc = new jmessage_tRenderingProcessor(mpRefer); + JUT_ASSERT(1313, mpRenProc != 0); + mpRefer->setResourceContainer(mpResCont); + mpCtrl->setSequenceProcessor(mpSeqProc); + mpCtrl->setRenderingProcessor(mpRenProc); + mpRefer->setObjectPtr(this); + field_0x124 = new JMessage::TParse(mpResCont); + field_0x124->parse(mpMsgDt, 0); + mpCtrl->reset(); + mpCtrl->resetResourceCache(); + mpRefer->resetCharCountBuffer(); + field_0x150 = 0.0f; + mCameraCancelFlag = 0; + mInputFlag = 0; + mSmellType = 0xff; + field_0x4ca = 0; + mNoDemoFlag = 0; + field_0x4cc = 0; + field_0x4cd = 0; + field_0x4ce = 0; + field_0x4d4 = 0; + field_0x4c7 = 0; + mMsgOutputType = 0xff; + mShopWaitTimer = 0; + mSelectPushFlag = 0; + field_0x1a3 = 0; + mAutoMessageFlag = 0; + mKillMessageFlag = false; + mEquipBombInfo = 0; + mPaymentFlag = 0; + field_0x4d1 = 0; + field_0x196 = 0; + mMsgSendControl = 0; + field_0x197 = 0; + mMessageID = 1000; + field_0x158 = mMessageID; + field_0x15c = 0; + field_0x172 = 0; + setStatusLocal(1); + mpMsgString = new dMsgString_c(); + JUT_ASSERT(1366, mpMsgString != 0); + return 4; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::_create(msg_class* param_0) { +asm int dMsgObject_c::_create(msg_class* param_0) { nofralloc #include "asm/d/msg/d_msg_object/_create__12dMsgObject_cFP9msg_class.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -620,40 +937,235 @@ SECTION_DEAD static char const* const stringBase_803996CE = ""; static u8 lit_4011[12]; /* 8043028C-8043069C 05CFAC 0410+00 7/7 51/51 0/0 .bss g_MsgObject_HIO_c */ -extern u8 g_MsgObject_HIO_c[1040]; +#ifdef NONMATCHING +dMsgObject_HIO_c g_MsgObject_HIO_c; +#else u8 g_MsgObject_HIO_c[1040]; +#endif /* 80233590-802339BC 22DED0 042C+00 2/1 0/0 0/0 .text _execute__12dMsgObject_cFv */ +// Matches with sinit +#ifdef NONMATCHING +int dMsgObject_c::_execute() { + field_0x4c7 = 0; + if (mpTalkHeap != NULL) { + field_0x148 = mDoExt_setCurrentHeap(mpTalkHeap); + } + if (isKillMessageFlagLocal()) { + if (getStatusLocal() != 1) { + setStatusLocal(19); + } else { + mNoDemoFlag = 0; + field_0x4cc = 0; + } + offKillMessageFlagLocal(); + } + dMeter2Info_decMsgKeyWaitTimer(); + field_0x4ca = mpCtrl->update(); + if (g_MsgObject_HIO_c.mMessageDisplay) { + if (mpRefer->getRevoMessageID() != 0) { + mpCtrl->reset(); + mpCtrl->resetResourceCache(); + mpRefer->resetCharCountBuffer(); + mpCtrl->setMessageCode(mpRefer->getRevoMessageID()); + mpRefer->setRevoMessageID(0); + jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference(); + strcpy(pRef->getTextPtr(), ""); + strcpy(pRef->getTextSPtr(), ""); + strcpy(pRef->getRubyPtr(), ""); + for (int i = 0; i < 3; i++) { + strcpy(pRef->getSelTextPtr(i), ""); + strcpy(pRef->getSelRubyPtr(i), ""); + } + } + field_0x4ca = mpCtrl->update(); + } + field_0x166 = getStatusLocal(); + mSelectPushFlag = 0; + switch (getStatusLocal()) { + case 1: + waitProc(); + break; + case 2: + openProc(); + break; + case 6: + outnowProc(); + break; + case 5: + outwaitProc(); + break; + case 7: + stopProc(); + break; + case 15: + continueProc(); + break; + case 8: + case 9: + case 20: + selectProc(); + break; + case 24: + selectEndProc(); + break; + case 21: + inputProc(); + break; + case 16: + finishProc(); + break; + case 17: + endProc(); + break; + case 19: + deleteProc(); + break; + case 11: + textmodeProc(); + break; + } + if (isDraw() && !isPlaceMessage()) { + if (mpRefer->getCharSoundInfo().field_0x40e != mpRefer->getCharSoundInfo().mCountBackUp) { + Z2GetSpeechMgr2()->setTextCount(mpRefer->getCharSoundInfo().field_0x40e); + mpRefer->setCountBackUp(); + } + } + + if (mpScrnDraw != NULL) { + mpScrnDraw->exec(); + } + + jmessage_tReference* procRef = (jmessage_tReference*)mpRenProc->getReference(); + if (field_0x17e < procRef->getDemoFrame()) { + field_0x17e++; + } + field_0x168 = getStatusLocal(); + setShopWaitTimerLocal(0); + if (field_0x148 != NULL) { + mDoExt_setCurrentHeap(field_0x148); + field_0x148 = NULL; + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::_execute() { +asm int dMsgObject_c::_execute() { nofralloc #include "asm/d/msg/d_msg_object/_execute__12dMsgObject_cFv.s" } #pragma pop +#endif /* 802339BC-80233AE8 22E2FC 012C+00 1/1 0/0 0/0 .text _draw__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::_draw() { - nofralloc -#include "asm/d/msg/d_msg_object/_draw__12dMsgObject_cFv.s" +int dMsgObject_c::_draw() { + u16 sVar7 = getStatusLocal(); + if (sVar7 != 0 && sVar7 != 1 && sVar7 != 0xb) { + if (isDraw()) { + mpCtrl->render(); + } + if (mpScrnDraw != NULL) { + jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference(); + mpScrnDraw->setString(pRef->getTextPtr(), pRef->getTextSPtr()); + mpScrnDraw->setRubyString(pRef->getRubyPtr()); + mpScrnDraw->setSelectString(pRef->getSelTextPtr(0), pRef->getSelTextPtr(1), + pRef->getSelTextPtr(2)); + mpScrnDraw->setSelectRubyString(pRef->getSelRubyPtr(0), pRef->getSelRubyPtr(1), + pRef->getSelRubyPtr(2)); + } + } + if (mpScrnDraw != NULL) { + if (dComIfGp_isPauseFlag()) { + dComIfGd_set2DOpaTop(mpScrnDraw); + } else { + dComIfGd_set2DOpa(mpScrnDraw); + } + mpScrnDraw->multiDraw(); + } + return 1; } -#pragma pop /* 80233AE8-80233D04 22E428 021C+00 1/1 0/0 0/0 .text _delete__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::_delete() { - nofralloc -#include "asm/d/msg/d_msg_object/_delete__12dMsgObject_cFv.s" +int dMsgObject_c::_delete() { + mpResCont->destroyResource_all(); + if (mpScrnDraw != NULL) { + delete mpScrnDraw; + mpScrnDraw = 0; + } + mpMsgDt = 0; + mpMsgRes = 0; + field_0x12c = 0; + if (mpOutFont != NULL) { + delete mpOutFont; + mpOutFont = NULL; + } + delete mpResCont; + mpResCont = NULL; + delete mpRefer; + mpRefer = NULL; + delete mpSeqProc; + mpSeqProc = NULL; + delete mpRenProc; + mpRenProc = NULL; + delete field_0x124; + field_0x124 = NULL; + delete mpMsgString; + mpMsgString = NULL; + if (mpTalkHeap != NULL) { + mpTalkHeap = NULL; + } + if (dComIfGp_isHeapLockFlag() == 5) { + dComIfGp_offHeapLockFlag(7); + dComIfGp_offHeapLockFlag(8); + } + dComIfGp_setMsgObjectClass(NULL); + return 1; } -#pragma pop /* 80233D04-80233E70 22E644 016C+00 2/2 2/2 0/0 .text setMessageIndex__12dMsgObject_cFUlUlb */ +// reg swap +#ifdef NONMATCHING +void dMsgObject_c::setMessageIndex(u32 param_1, u32 param_2, bool param_3) { + field_0x158 = param_1; + u32 revoIndex = getRevoMessageIndex(param_1); + if (field_0x4cc == 0) { + mNoDemoFlag = 1; + } + mMessageID = revoIndex; + field_0x15c = param_2; + field_0x4d1 = 0; + if (mpTalkPartner != field_0x13c && mpTalkPartner != NULL) { + dComIfGp_event_setTalkPartner(mpTalkPartner); + field_0x4d1 = 1; + field_0x13c = mpTalkPartner; + } + s16 groupID = getMessageGroup(mMessageID); + JUT_ASSERT(1736, groupID==s_groupID || groupID == 0) + changeGroup(groupID); + field_0x172 = 0; + mpRefer->setPageNum(field_0x172); + + JMSMesgHeader_c* pMsg = (JMSMesgHeader_c*)((char*)mpMsgDt + 0x20); + u8* iVar2 = (u8*)pMsg + pMsg->sectionSize; + dComIfGp_setMesgCameraAttrInfo(pMsg->entries[getMessageIndex(revoIndex)].field_0x0f); + if (field_0x15c == 1000) { + mpRefer->setSelMsgPtr(NULL); + } else { + u32 msgIndex = getMessageIndex(field_0x15c); + if (msgIndex == 0x264) { + mpRefer->setSelMsgPtr(NULL); + } else { + mpRefer->setSelMsgPtr(((char*)iVar2 + pMsg->entries[msgIndex].mStringOffset + 8)); + } + } + if (param_3) { + mpCtrl->setMessageID(mMessageID, 0, NULL); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -662,8 +1174,40 @@ asm void dMsgObject_c::setMessageIndex(u32 param_0, u32 param_1, bool param_2) { #include "asm/d/msg/d_msg_object/setMessageIndex__12dMsgObject_cFUlUlb.s" } #pragma pop +#endif /* 80233E70-80233F84 22E7B0 0114+00 1/1 1/1 0/0 .text setMessageIndexDemo__12dMsgObject_cFUlb */ +// reg swap +#ifdef NONMATCHING +void dMsgObject_c::setMessageIndexDemo(u32 param_1, bool param_2) { + field_0x158 = param_1; + int revoMsgIndex = getRevoMessageIndex(param_1); + mNoDemoFlag = 1; + field_0x4d4 = 1; + dMsgObject_onCameraCancelFlag(); + mMessageID = revoMsgIndex; + field_0x15c = 0x264; + field_0x4d1 = 0; + if (mpTalkPartner != field_0x13c && mpTalkPartner != NULL) { + dComIfGp_event_setTalkPartner(mpTalkPartner); + field_0x4d1 = 1; + field_0x13c = mpTalkPartner; + } + s16 groupID = getMessageGroup(mMessageID); + JUT_ASSERT(1804, groupID==s_groupID || groupID == 0); + changeGroup(groupID); + field_0x172 = 0; + mpRefer->setPageNum(field_0x172); + JMSMesgHeader_c* info_header_p = (JMSMesgHeader_c*)((char*)mpMsgDt + 0x20); + int ind = getMessageIndex(revoMsgIndex); + JMSMesgEntry_c* info_entries = (JMSMesgEntry_c*)((char*)info_header_p + 0x10); + dComIfGp_setMesgCameraAttrInfo(info_entries[ind].field_0x0f); + mpRefer->setSelMsgPtr(NULL); + if (param_2) { + mpCtrl->setMessageID(mMessageID, 0, NULL); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -672,60 +1216,148 @@ asm void dMsgObject_c::setMessageIndexDemo(u32 param_0, bool param_1) { #include "asm/d/msg/d_msg_object/setMessageIndexDemo__12dMsgObject_cFUlb.s" } #pragma pop +#endif /* 80233F84-80233FD8 22E8C4 0054+00 4/4 0/0 0/0 .text getMessageIndex__12dMsgObject_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgObject_c::getMessageIndex(u32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/getMessageIndex__12dMsgObject_cFUl.s" +u32 dMsgObject_c::getMessageIndex(u32 param_0) { + u32 i = 0; + JMSMesgHeader_c* pMsg = (JMSMesgHeader_c*)((char*)mpMsgDt + 0x20); + u32 msgIndexCount = *((u16*)((char*)mpMsgDt + 0x28)); + int rv; + for (; i < msgIndexCount; i++) { + if (pMsg->entries[i].mStringId == param_0) { + rv = i; + break; + } + } + if (i < msgIndexCount) { + return rv; + } + JUT_WARN(1848, "Message Index Not Exist!! %d", param_0) + return 612; } -#pragma pop /* 80233FD8-802340D4 22E918 00FC+00 2/2 0/0 0/0 .text getRevoMessageIndex__12dMsgObject_cFUl */ +// Matches with sinit +#ifdef NONMATCHING +u32 dMsgObject_c::getRevoMessageIndex(u32 param_1) { + if (!g_MsgObject_HIO_c.mMessageDisplay) { + return param_1; + } + u32 msgIndexCount; + JMSMesgHeader_c* pMsg; + int i = 0; + int rv; + s16 groupID = getMessageGroup(param_1); + JUT_ASSERT(1916, groupID==s_groupID || groupID == 0) + changeGroup(groupID); + pMsg = (JMSMesgHeader_c*)((char*)mpMsgDt + 0x20); + msgIndexCount = *((u16*)((char*)mpMsgDt + 0x28)); + for (; i < msgIndexCount; i++) { + if (pMsg->entries[i].mStringId == param_1) { + s8* ptr = (s8*)pMsg + pMsg->sectionSize + pMsg->entries[i].mStringOffset + 8; + if (ptr[0] == 26 && ptr[2] == 3 && (s8)ptr[4] == 0) { + rv = pMsg->entries[*(int*)(ptr + 5)].mStringId; + } else { + rv = param_1; + } + break; + } + } + + if (i >= msgIndexCount) { + JUT_WARN(1937, "Message Index Not Exist!! %d", param_0) + rv = 612; + } + return rv; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getRevoMessageIndex(u32 param_0) { +asm u32 dMsgObject_c::getRevoMessageIndex(u32 param_0) { nofralloc #include "asm/d/msg/d_msg_object/getRevoMessageIndex__12dMsgObject_cFUl.s" } #pragma pop +#endif /* 802340D4-80234128 22EA14 0054+00 3/3 0/0 0/0 .text getMessageIndexAlways__12dMsgObject_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::getMessageIndexAlways(u32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/getMessageIndexAlways__12dMsgObject_cFUl.s" +u32 dMsgObject_c::getMessageIndexAlways(u32 param_0) { + u32 i = 0; + JMSMesgHeader_c* pMsg = (JMSMesgHeader_c*)((char*)mpMsgRes + 0x20); + u32 msgIndexCount = *((u16*)((char*)mpMsgRes + 0x28)); + int rv; + for (; i < msgIndexCount; i++) { + if (pMsg->entries[i].mStringId == param_0) { + rv = i; + break; + } + } + if (i < msgIndexCount) { + return rv; + } + JUT_WARN(1972, "Message Index Not Exist!! %d", param_0) + return 612; } -#pragma pop /* 80234128-8023413C 22EA68 0014+00 1/1 0/0 0/0 .text getMessageIDAlways__12dMsgObject_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::getMessageIDAlways(u32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/getMessageIDAlways__12dMsgObject_cFUl.s" +u32 dMsgObject_c::getMessageIDAlways(u32 param_0) { + return ((JMSMesgHeader_c*)((u8*)mpMsgRes + 0x20))->entries[param_0].mStringId; } -#pragma pop /* 8023413C-80234150 22EA7C 0014+00 4/4 0/0 0/0 .text getMessageGroup__12dMsgObject_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s16 dMsgObject_c::getMessageGroup(u32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/getMessageGroup__12dMsgObject_cFUl.s" +s16 dMsgObject_c::getMessageGroup(u32 param_0) { + s16 messageGroup = 0; + OS_REPORT("getMessgeGroup! msg no====>%d\n", param_0); + if (param_0 > 5000) { + messageGroup = s_groupID; + } + return messageGroup; } -#pragma pop /* 80234150-80234318 22EA90 01C8+00 1/1 0/0 0/0 .text waitProc__12dMsgObject_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dMsgObject_c::waitProc() { + if (mNoDemoFlag || field_0x4cc) { + if (isMidonaNormalTalkWait()) { + if (dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 4) || + dMsgObject_isCameraCancelFlag() || dComIfGp_isPauseFlag()) + { + if (field_0x4ca) { + field_0x19d = 0; + dComIfGp_setMesgCancelButton(0); + offInputFlagLocal(); + setStatusLocal(2); + if (isTalkMessage()) { + mDoAud_seStart(Z2SE_SY_TALK_WIN_OPEN, 0, 0, 0); + } + } else { + if (mMessageID >= 0x47f && mMessageID <= 0x487) { + setMessageIndexDemo(mMessageID, true); + } else { + setMessageIndex(mMessageID, field_0x15c, true); + } + } + } + } + } else if (field_0x4ca) { + if (field_0x4cd) { + setStatusLocal(11); + } else { + dComIfGp_setMesgCancelButton(0); + offInputFlagLocal(); + setStatusLocal(2); + if (isTalkMessage()) { + mDoAud_seStart(Z2SE_SY_TALK_WIN_OPEN, 0, 0, 0); + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -734,12 +1366,117 @@ asm void dMsgObject_c::waitProc() { #include "asm/d/msg/d_msg_object/waitProc__12dMsgObject_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454B20-80454B28 003120 0008+00 6/6 0/0 0/0 .sdata2 @4965 */ SECTION_SDATA2 static f64 lit_4965 = 4503601774854144.0 /* cast s32 to float */; /* 80234318-802349D8 22EC58 06C0+00 1/1 0/0 0/0 .text openProc__12dMsgObject_cFv */ +// Matches with literals and sinit +#ifdef NONMATCHING +void dMsgObject_c::openProc() { + if (isMidonaMessage()) { + bool uVar12 = 0; + if (field_0x16a == 0) { + jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference(); + field_0x1a3 = 0; + if (mpRefer->getMsgID() == 0x7fa) { + mpScrnDraw->selectAnimeInit(3, pRef->getSelectPos(), pRef->getSelTBoxWidth(), + pRef->getSelectRubyFlag()); + } else { + mpScrnDraw->selectAnimeInit(2, pRef->getSelectPos() + 1, pRef->getSelTBoxWidth(), + pRef->getSelectRubyFlag()); + } + pRef->setStopFlag(0); + } else { + if (mDoCPd_c::getTrigA(0)) { + if (getSelectCursorPosLocal() != 0xff) { + field_0x1a3 = 1; + field_0x16a = 9; + } + } else if (mDoCPd_c::getTrigB(0) && getSelectCancelPos() != 0) { + setSelectCursorPosLocal(getSelectCancelPos() - 1); + uVar12 = 1; + field_0x1a3 = 2; + field_0x16a = 9; + } + if (mpRefer->getMsgID() == 0x7fa) { + mpScrnDraw->selectAnimeMove(2, getSelectCursorPosLocal(), uVar12); + } else { + if (getSelectCursorPosLocal() != 0xff) { + mpScrnDraw->selectAnimeMove(2, getSelectCursorPosLocal() + 1, uVar12); + } else { + mpScrnDraw->selectAnimeMove(2, getSelectCursorPosLocal(), uVar12); + } + } + } + } + field_0x16a++; + s16 sVar7; + if (isKanbanMessage()) { + sVar7 = g_MsgObject_HIO_c.mBoxAppearFrame; + f32 dVar15 = (f32)field_0x16a / g_MsgObject_HIO_c.mBoxAppearFrame; + mpScrnDraw->fukiScale(dVar15); + mpScrnDraw->fukiAlpha(dVar15); + mpOutFont->setAlphaRatio(dVar15); + } else if (isPlaceMessage() || isStaffMessage()) { + sVar7 = g_MsgObject_HIO_c.mStageTitleFadeIn; + f32 dVar15 = (f32)field_0x16a / g_MsgObject_HIO_c.mStageTitleFadeIn; + mpScrnDraw->fukiScale(dVar15); + mpScrnDraw->fukiAlpha(dVar15); + mpOutFont->setAlphaRatio(dVar15); + } else if (isBossMessage()) { + sVar7 = g_MsgObject_HIO_c.mBossNameFadeIn; + f32 dVar15 = (f32)field_0x16a / g_MsgObject_HIO_c.mBossNameFadeIn; + mpScrnDraw->fukiScale(dVar15); + mpScrnDraw->fukiAlpha(dVar15); + mpOutFont->setAlphaRatio(dVar15); + } else if (isBookMessage()) { + sVar7 = g_MsgObject_HIO_c.mBoxAppearFrame + g_MsgObject_HIO_c.mWaitFrame + + g_MsgObject_HIO_c.mLightAppearFrame; + if (field_0x16a <= g_MsgObject_HIO_c.mBoxAppearFrame) { + f32 dVar15 = (f32)field_0x16a / g_MsgObject_HIO_c.mBoxAppearFrame; + mpScrnDraw->fukiAlpha(dVar15); + mpOutFont->setAlphaRatio(dVar15); + } else { + mpScrnDraw->fukiAlpha(1.0f); + mpOutFont->setAlphaRatio(1.0f); + } + s16 sVar4 = g_MsgObject_HIO_c.mBoxAppearFrame + g_MsgObject_HIO_c.mWaitFrame; + if (field_0x16a >= sVar4 && field_0x16a <= sVar4 + g_MsgObject_HIO_c.mLightAppearFrame) { + f32 scale = (f32)(field_0x16a - sVar4); + scale /= g_MsgObject_HIO_c.mLightAppearFrame; + mpScrnDraw->fukiScale(scale); + } + } else { + sVar7 = g_MsgObject_HIO_c.mBoxAppearFrame; + f32 dVar14 = (f32)field_0x16a / sVar7; + mpScrnDraw->fukiScale(1.0f); + mpScrnDraw->fukiAlpha(dVar14); + mpOutFont->setAlphaRatio(dVar14); + } + mpRenProc->setTextInitPos(mpScrnDraw->getTextBoxPosX(), mpScrnDraw->getTextBoxPosY()); + mpRenProc->setTextScale(mpScrnDraw->getTextBoxScaleX(), mpScrnDraw->getTextBoxScaleY()); + if (field_0x16a >= sVar7) { + mpScrnDraw->fukiTrans(0.0f, 0.0f); + for (int i = 0; i < 3; i++) { + mpRenProc->setSelTextInitPos(i, mpScrnDraw->getSelTextBoxPosX(i), + mpScrnDraw->getSelTextBoxPosY(i)); + } + field_0x16a = 0; + if (isMidonaMessage()) { + if (mpRefer->getMsgID() == 0x7fa) { + setStatusLocal(9); + } else { + setStatusLocal(8); + } + } else { + setStatusLocal(6); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -748,12 +1485,81 @@ asm void dMsgObject_c::openProc() { #include "asm/d/msg/d_msg_object/openProc__12dMsgObject_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454B28-80454B2C 003128 0004+00 3/3 0/0 0/0 .sdata2 @5044 */ SECTION_SDATA2 static f32 lit_5044 = 10.0f; /* 802349D8-80234CCC 22F318 02F4+00 1/1 0/0 0/0 .text outnowProc__12dMsgObject_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dMsgObject_c::outnowProc() { + mpRefer->shiftCharCountBuffer(); + if (isBookMessage() && field_0x16a > 0) { + field_0x16a--; + f32 alpha = (10 - field_0x16a) / 10.0f; + mpScrnDraw->fontAlpha(alpha); + mpOutFont->setAlphaRatio(alpha); + if (field_0x16a > 0) { + return; + } + } + jmessage_tReference* pRef = + (jmessage_tReference*)mpRenProc->getReference(); + if (pRef->getCharAllAlphaRate() < 1.0f) { + if (mDoCPd_c::getTrigA(0)) { + pRef->setCharAllAlphaRate(1.0f); + } else { + pRef->addCharAllAlphaRate(); + } + f32 alpha = pRef->getCharAllAlphaRate(); + mpScrnDraw->setCharAlphaRate(alpha); + mpOutFont->setAlphaRatio(alpha); + } else if (mpRefer->isLightEnd()) { + if (pRef->isButtonTagStopFlag()) { + setButtonStatusLocal(); + mpScrnDraw->arwAnimeMove(); + } + if (pRef->getStopFlag() == 1) { + field_0x16a = 0; + field_0x196 = 0; + setStatusLocal(5); + pRef->setStopFlag(0); + } else if (pRef->getStopFlag() == 7) { + field_0x196 = 1; + if (mNoDemoFlag && !field_0x4d4) { + setStatusLocal(14); + } else { + field_0x199 = 0; + setStatusLocal(16); + } + pRef->setStopFlag(0); + } else if (pRef->getStopFlag() == 2) { + field_0x1a3 = 0; + setStatusLocal(8); + mpScrnDraw->selectAnimeInit(2, pRef->getSelectPos() + 1, + pRef->getSelTBoxWidth(), + pRef->getSelectRubyFlag()); + pRef->setStopFlag(0); + } else if (pRef->getStopFlag() == 3) { + field_0x1a3 = 0; + setStatusLocal(9); + mpScrnDraw->selectAnimeInit(3, pRef->getSelectPos(), + pRef->getSelTBoxWidth(), + pRef->getSelectRubyFlag()); + pRef->setStopFlag(0); + } else if (pRef->getStopFlag() == 4 || pRef->getStopFlag() == 5) { + field_0x1a3 = 0; + setStatusLocal(20); + pRef->setStopFlag(0); + } else if (pRef->getStopFlag() == 6) { + setStatusLocal(21); + pRef->setStopFlag(0); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -762,8 +1568,50 @@ asm void dMsgObject_c::outnowProc() { #include "asm/d/msg/d_msg_object/outnowProc__12dMsgObject_cFv.s" } #pragma pop +#endif /* 80234CCC-80234FF0 22F60C 0324+00 1/1 0/0 0/0 .text outwaitProc__12dMsgObject_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dMsgObject_c::outwaitProc() { + jmessage_tReference* pRef = + (jmessage_tReference*)mpRenProc->getReference(); + mpScrnDraw->arwAnimeMove(); + if (isBookMessage()) { + if (isSend() || field_0x16a > 0) { + field_0x16a++; + if (field_0x16a <= 10) { + f32 alpha = (10 - field_0x16a) / 10.0f; + mpScrnDraw->fontAlpha(alpha); + mpOutFont->setAlphaRatio(alpha); + if (field_0x16a >= 10) { + field_0x172++; + mpRefer->setPageNum(field_0x172); + mpCtrl->render_synchronize(); + pRef->pageSend(); + mpScrnDraw->arwAnimeInit(); + mpRenProc->resetRendering(); + field_0x199 = 0; + setStatusLocal(6); + } + } + } + } else if (isSend()) { + field_0x172++; + mpRefer->setPageNum(field_0x172); + mpCtrl->render_synchronize(); + pRef->pageSend(); + mAutoMessageFlag = 0; + mpScrnDraw->arwAnimeInit(); + mpRenProc->resetRendering(); + field_0x199 = 0; + setStatusLocal(6); + if (isTalkMessage() && mpRefer->getForm() != 1) { + mDoAud_seStart(daAlink_c::WANM_HOWL_END, 0, 0, 0); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -772,13 +1620,56 @@ asm void dMsgObject_c::outwaitProc() { #include "asm/d/msg/d_msg_object/outwaitProc__12dMsgObject_cFv.s" } #pragma pop +#endif /* 80234FF0-80234FF4 22F930 0004+00 1/1 0/0 0/0 .text stopProc__12dMsgObject_cFv */ void dMsgObject_c::stopProc() { - /* empty function */ } /* 80234FF4-8023531C 22F934 0328+00 1/1 0/0 0/0 .text continueProc__12dMsgObject_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dMsgObject_c::continueProc() { + jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference(); + if (pRef->getSendFlag() != 1 && pRef->getSendFlag() != 3 && pRef->getSendFlag() != 4 && + pRef->getSendFlag() != 6) + { + mpScrnDraw->arwAnimeMove(); + } + if (((mDoCPd_c::getTrigA(0) == 0 && mDoCPd_c::getTrigB(0) == 0) || !isHowlMessage()) && + isSend()) + { + mpCtrl->render_synchronize(); + mpCtrl->reset(); + mpCtrl->resetResourceCache(); + mpRefer->resetCharCountBuffer(); + field_0x17e = 0; + field_0x199 = 0; + updateEquipBombInfoLocal(); + offAutoMessageFlagLocal(); + setMessageIndex(field_0x100->mMsgID, field_0x100->field_0xf0, true); + mpScrnDraw->fukiPosCalc(pRef->getFukiPosType()); + strcpy(pRef->getTextPtr(), ""); + strcpy(pRef->getTextSPtr(), ""); + strcpy(pRef->getRubyPtr(), ""); + for (int i = 0; i < 3; i++) { + strcpy(pRef->getSelTextPtr(i), ""); + strcpy(pRef->getSelRubyPtr(i), ""); + } + mpScrnDraw->arwAnimeInit(); + mpRenProc->setTextInitPos(mpScrnDraw->getTextBoxPosX(), mpScrnDraw->getTextBoxPosY()); + mpRenProc->setTextScale(mpScrnDraw->getTextBoxScaleX(), mpScrnDraw->getTextBoxScaleY()); + for (int i = 0; i < 3; i++) { + mpRenProc->setSelTextInitPos(i, mpScrnDraw->getSelTextBoxPosX(i), mpScrnDraw->getSelTextBoxPosY(i)); + } + mpRenProc->resetRendering(); + setStatusLocal(6); + if (isTalkMessage() && mpRefer->getForm() != 1) { + mDoAud_seStart(daAlink_c::WANM_HOWL_END, 0, 0, 0); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -787,8 +1678,110 @@ asm void dMsgObject_c::continueProc() { #include "asm/d/msg/d_msg_object/continueProc__12dMsgObject_cFv.s" } #pragma pop +#endif /* 8023531C-8023587C 22FC5C 0560+00 1/1 0/0 0/0 .text selectProc__12dMsgObject_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dMsgObject_c::selectProc() { + bool uVar7 = false; + bool iVar8 = false; + if (!isMidonaMessage()) { + field_0x1a3 = 0; + } + if (mpScrnDraw->isSelect() || getStatusLocal() == 20) { + mpRefer->selectMessage(); + if (dMeter2Info_isShopTalkFlag()) { + dComIfGp_setAStatusForce(0x2a, 0); + } + } + if (mDoCPd_c::getTrigA(0)) { + if (getSelectCursorPosLocal() != 0xff) { + field_0x1a3 = 1; + } + } else if (mDoCPd_c::getTrigB(0) && + (((mpScrnDraw->isSelect() || getStatusLocal() == 20) && getSelectCancelPos() != 0))) + { + setSelectCursorPosLocal(getSelectCancelPos() - 1); + uVar7 = true; + if (getStatusLocal() == 8) { + if (getSelectCancelPos() <= 2) { + if (getSelectCursorPosLocal() != 0xff) { + mpScrnDraw->selectAnimeMove(2, getSelectCursorPosLocal() + 1, 1); + } else { + mpScrnDraw->selectAnimeMove(2, (int)getSelectCursorPosLocal(), 1); + } + } + } else if (getStatusLocal() == 9 && getSelectCancelPos() <= 3) { + mpScrnDraw->selectAnimeMove(3, getSelectCursorPosLocal(), 1); + } + field_0x1a3 = 2; + } + jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference(); + if (getStatusLocal() == 8) { + if (isMidonaMessage() && field_0x1a3 != 0) { + if (field_0x1a3 == 2 && getSelectCancelPos() == 3) { + iVar8 = true; + } else { + while (!iVar8) { + if (getSelectCursorPosLocal() != 0xff) { + iVar8 = + mpScrnDraw->selectAnimeMove(2, getSelectCursorPosLocal() + 1, uVar7); + } else { + iVar8 = + mpScrnDraw->selectAnimeMove(2, (int)getSelectCursorPosLocal(), uVar7); + } + } + } + } else if (field_0x1a3 == 2 && getSelectCancelPos() == 3) { + iVar8 = true; + } else if (getSelectCursorPosLocal() != 0xff) { + iVar8 = mpScrnDraw->selectAnimeMove(2, getSelectCursorPosLocal() + 1, uVar7); + } else { + iVar8 = mpScrnDraw->selectAnimeMove(2, (int)getSelectCursorPosLocal(), uVar7); + } + pRef->setStopFlag(0); + } else { + if (getStatusLocal() == 9) { + if (isMidonaMessage() && field_0x1a3 != 0) { + if (field_0x1a3 == 2 && getSelectCancelPos() == 4) { + iVar8 = true; + } else { + while (!iVar8) { + iVar8 = mpScrnDraw->selectAnimeMove(3, getSelectCursorPosLocal(), uVar7); + } + } + } else if (field_0x1a3 == 2 && getSelectCancelPos() == 4) { + iVar8 = true; + } else { + iVar8 = mpScrnDraw->selectAnimeMove(3, getSelectCursorPosLocal(), uVar7); + } + pRef->setStopFlag(0); + } else if (getStatusLocal() == 20) { + iVar8 = true; + } + } + field_0x100->mSelectedChoiceIdx = pRef->getSelectPos(); + if (isSend() && field_0x1a3 != 0 && iVar8) { + field_0x1a3 = 0; + if (mDoCPd_c::getTrigB(0)) { + mSelectPushFlag = 2; + } else { + mSelectPushFlag = 1; + } + setSelectCancelPosLocal(0); + field_0x16a = 0; + if (getStatusLocal() == 20) { + field_0x199 = 1; + setStatusLocal(14); + } else { + setStatusLocal(24); + } + dMeter2Info_set2DVibration(); + mDoAud_seStart(daAlink_c::WANM_ATTACK_POE_END, 0, 0, 0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -797,28 +1790,94 @@ asm void dMsgObject_c::selectProc() { #include "asm/d/msg/d_msg_object/selectProc__12dMsgObject_cFv.s" } #pragma pop +#endif /* 8023587C-802358D4 2301BC 0058+00 1/1 0/0 0/0 .text selectEndProc__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::selectEndProc() { - nofralloc -#include "asm/d/msg/d_msg_object/selectEndProc__12dMsgObject_cFv.s" +void dMsgObject_c::selectEndProc() { + if (mpScrnDraw->selectAnimeEnd()) { + field_0x199 = 1; + setStatusLocal(14); + } } -#pragma pop /* 802358D4-80235AD4 230214 0200+00 1/1 0/0 0/0 .text inputProc__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::inputProc() { - nofralloc -#include "asm/d/msg/d_msg_object/inputProc__12dMsgObject_cFv.s" +void dMsgObject_c::inputProc() { + dMeter2Info_onShopTalkFlag(); + mpRefer->inputNumber(); + if (isSend()) { + field_0x199 = 0; + if (mDoCPd_c::getTrigA(0)) { + BOOL iVar2 = dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[80]); + if (getInputValue() > 0 && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { + onPaymentFlagLocal(); + } + dComIfGp_setItemRupeeCount(-getInputValue()); + if (iVar2) { + if (getInputValue() > 0) { + dMsgObject_addFundRaising(getInputValue()); + getFundRaisingValue(); + dMsgObject_getFundRaising(); + if (dMsgObject_getFundRaising() >= getFundRaisingValue() && + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[124])) + { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[376])) { + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[376]); + dMsgObject_setFundRaising(0); + } else { + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[124]); + dMsgObject_setFundRaising(0); + } + } + } else { + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[80]); + } + } else { + dMsgObject_addTotalPayment(getInputValue()); + fpcM_Search((fpcLyIt_JudgeFunc)dMsgObject_searchSSItem, this); + } + dMeter2Info_offShopTalkFlag(); + setStatusLocal(14); + } else if (mDoCPd_c::getTrigB(0)) { + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[80]); + dMeter2Info_offShopTalkFlag(); + setStatusLocal(14); + } + } } -#pragma pop /* 80235AD4-80235CC0 230414 01EC+00 1/1 0/0 0/0 .text finishProc__12dMsgObject_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dMsgObject_c::finishProc() { + if (field_0x168 != 0x10 && mNoDemoFlag && isTalkMessage() && mpRefer->getForm() != 1) { + mDoAud_seStart(daAlink_c::WANM_FALL_LAND, 0, 0, 0); + } + mpRefer->selectMessage(); + jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference(); + if (pRef->getSendFlag() != 1 && pRef->getSendFlag() != 3 && pRef->getSendFlag() != 4 && + pRef->getSendFlag() != 6) + { + mpScrnDraw->dotAnimeMove(); + } + if (isHowlMessage() && ((dMsgScrnHowl_c*)mpScrnDraw)->isKeyCheck() && mDoCPd_c::getTrigB(0)) { + dMsgObject_onMsgSend(); + } + u8 sendRes = isSend(); + if (((mDoCPd_c::getTrigA(0) == 0 && + (mDoCPd_c::getTrigB(0) == 0 || ((dMsgScrnHowl_c*)mpScrnDraw)->isKeyCheck())) || + !isHowlMessage()) && sendRes != 0) + { + if (mpRefer->getMsgID() == 0xc4e) { + Z2GetAudioMgr()->changeBgmStatus(2); + } + field_0x16a = 0; + setStatusLocal(17); + if (isTalkMessage() && sendRes == 2) { + mDoAud_seStart(daAlink_c::WANM_ATTACK_POE_START, 0, 0, 0); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -827,8 +1886,44 @@ asm void dMsgObject_c::finishProc() { #include "asm/d/msg/d_msg_object/finishProc__12dMsgObject_cFv.s" } #pragma pop +#endif /* 80235CC0-80235EBC 230600 01FC+00 1/1 0/0 0/0 .text endProc__12dMsgObject_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dMsgObject_c::endProc() { + field_0x16a++; + s16 sVar4 = 5; + if (isKanbanMessage() || isBookMessage()) { + sVar4 = g_MsgObject_HIO_c.field_0x304; + } else if (isPlaceMessage() || isStaffMessage()) { + sVar4 = g_MsgObject_HIO_c.mStageTitleFadeOut; + } else if (isBossMessage()) { + sVar4 = g_MsgObject_HIO_c.mBossNameFadeOut; + } + f32 dVar6 = (f32)field_0x16a / sVar4; + mpScrnDraw->fukiAlpha(1.0f - dVar6); + if (isBookMessage()) { + mpScrnDraw->fukiScale(1.0f - dVar6); + } + mpOutFont->setAlphaRatio(1.0f - dVar6); + if (field_0x16a >= sVar4) { + mpScrnDraw->arwAnimeInit(); + mpScrnDraw->dotAnimeInit(); + if (mNoDemoFlag && !field_0x4d4) { + setStatusLocal(18); + } else { + setStatusLocal(19); + } + mMessageID = 0; + field_0x158 = mMessageID; + field_0x15c = 1000; + field_0x172 = 0; + field_0x199 = 0; + mpRefer->setPageNum(field_0x172); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -837,23 +1932,220 @@ asm void dMsgObject_c::endProc() { #include "asm/d/msg/d_msg_object/endProc__12dMsgObject_cFv.s" } #pragma pop +#endif /* 80235EBC-8023609C 2307FC 01E0+00 2/2 0/0 0/0 .text deleteProc__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::deleteProc() { - nofralloc -#include "asm/d/msg/d_msg_object/deleteProc__12dMsgObject_cFv.s" +void dMsgObject_c::deleteProc() { + if (field_0x148 != NULL) { + mDoExt_setCurrentHeap(field_0x148); + field_0x148 = NULL; + } + delete_screen(true); + mpCtrl->reset(); + mpCtrl->resetResourceCache(); + mpRefer->resetCharCountBuffer(); + field_0x17e = 0; + updateEquipBombInfoLocal(); + dComIfGp_clearMesgAnimeTagInfo(); + dComIfGp_clearMesgCameraTagInfo(); + dComIfGp_clearMesgAnimeAttrInfo(); + dComIfGp_clearMesgFaceAnimeAttrInfo(); + dComIfGp_clearMesgCameraAttrInfo(); + dMsgObject_offCameraCancelFlag(); + dMsgObject_setMsgOutputType(0xff); + offKillMessageFlagLocal(); + jmessage_tReference* pRef = + (jmessage_tReference*)mpRenProc->getReference(); + if (pRef->getSendFlag() != 0) { + pRef->setSendFlag(0); + dMsgObject_offMsgSendControl(); + dMsgObject_offMsgSend(); + } + if (pRef->getStopFlag() != 0) { + pRef->setStopFlag(0); + } + if (mNoDemoFlag != 0) { + mNoDemoFlag = 0; + } + if (field_0x4cc != 0) { + field_0x4cc = 0; + } + if (field_0x4d4 != 0) { + field_0x4d4 = 0; + } + dDemo_c::getControl()->unsuspend(1); + if (field_0x4ce == 1) { + mDoAud_talkOut(); + field_0x4ce = 0; + } + field_0x13c = NULL; + mpTalkPartner = NULL; + field_0x4d1 = 0; + resetSelectBomBag(); + if (getArrowNumLocal() != 0) { + dComIfGp_setItemArrowNumCount(getArrowNumLocal()); + setArrowNumLocal(0); + } + mFukiKind = 0xff; + dMsgObject_setNowTalkFlowNo(0); + setStatusLocal(1); } -#pragma pop /* 8023609C-802360A0 2309DC 0004+00 1/1 0/0 0/0 .text textmodeProc__12dMsgObject_cFv */ void dMsgObject_c::textmodeProc() { - /* empty function */ } /* 802360A0-8023670C 2309E0 066C+00 1/0 1/1 0/0 .text talkStartInit__12dMsgObject_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dMsgObject_c::talkStartInit() { + f32 dVar19 = 0.0f; + JUTFont* local_30 = mDoExt_getMesgFont(); + field_0x19b = 0; + bool bVar1 = false; + if (mFukiKind != mpRefer->getFukiKind()) { + if (mpScrnDraw != NULL) { + delete_screen(false); + dVar19 = 1.0f; + bVar1 = true; + } + mFukiKind = mpRefer->getFukiKind(); + } + if (dComIfGp_isHeapLockFlag() == 8 || + (dComIfGp_isHeapLockFlag() == 5 && dMeter2Info_isFloatingMessageVisible() && !field_0x4cd)) + { + dMeter2Info_getMeterClass()->emphasisButtonDelete(); + } + if (((dComIfGp_isHeapLockFlag() == 0 || (dComIfGp_isHeapLockFlag() == 5 && mFukiKind != 15)) || + (((dComIfGp_isHeapLockFlag() == 2 || + (dComIfGp_isHeapLockFlag() == 3 || dComIfGp_isHeapLockFlag() == 1)) && + field_0x4cd == 0 && mpTalkHeap != NULL))) && + (mpScrnDraw == NULL && dMeter2Info_getFloatingMessageID() != 0x13eb)) + { + if (!bVar1 && ((dComIfGp_isHeapLockFlag() == 0 || dComIfGp_isHeapLockFlag() == 5))) { + dComIfGp_setHeapLockFlag(7); + } + if (mpTalkHeap == NULL) { + mpTalkHeap = dComIfGp_getSubHeap2D(7); + } + mpTalkHeap->getTotalFreeSize(); + bool local_98 = false; + if (mpOutFont == NULL) { + OS_REPORT("free size (0x%x)=====> %d\n", :mDoExt_getCurrentHeap(), mDoExt_getCurrentHeap()->getTotalFreeSize()); + mpOutFont = new COutFont_c(0); + JUT_ASSERT(3035, mpOutFont != 0); + mpOutFont->createPane(); + mpRenProc->setOutFont(mpOutFont); + } + dMsgScrnBase_c* pData; + jmessage_tReference* pRef; + switch (mFukiKind) { + case 9: + pRef = (jmessage_tReference*)mpRenProc->getReference(); + pData = new dMsgScrnItem_c(pRef->getFukiPosType(), pRef->getForm(), mpTalkHeap); + JUT_ASSERT(3049, pData != 0); + mpScrnDraw = pData; + break; + case 2: + if (mFukiKind == 15) { + local_30 = mDoExt_getRubyFont(); + } + pData = new dMsgScrnTree_c(local_30, mpTalkHeap); + JUT_ASSERT(3061, pData != 0); + mpScrnDraw = pData; + break; + case 6: + pData = new dMsgScrnKanban_c(mpTalkHeap); + JUT_ASSERT(3069, pData != 0); + mpScrnDraw = pData; + break; + case 7: + pData = new dMsgScrnStaff_c(((jmessage_tReference*)mpRenProc->getReference())->getArrange()) + JUT_ASSERT(3083, pData != 0); + mpScrnDraw = pData; + break; + case 12: + pData = new dMsgScrnPlace_c(); + JUT_ASSERT(3092, pData != 0); + mpScrnDraw = pData; + break; + case 19: + pData = new dMsgScrnBoss_c(); + JUT_ASSERT(3100, pData != 0); + mpScrnDraw = pData; + break; + case 17: + pData = new dMsgScrnHowl_c(); + JUT_ASSERT(3108, pData != 0); + mpScrnDraw = pData; + local_98 = true; + break; + case 1: + case 5: + pRef = (jmessage_tReference*)mpRenProc->getReference(); + pData = new dMsgScrnJimaku_c(pRef->getForm(), mpTalkHeap); + JUT_ASSERT(3119, pData != 0); + mpScrnDraw = pData; + break; + case 10: + field_0x19b = 1; + default: + pRef = (jmessage_tReference*)mpRenProc->getReference(); + if (mpRefer->getMsgID() == 0x2a5) { + pData = new dMsgScrnItem_c(0, pRef->getForm(), mpTalkHeap); + JUT_ASSERT(3131, pData != 0); + mpScrnDraw = pData; + } else { + pData = new dMsgScrnTalk_c(pRef->getFukiPosType(), pRef->getForm(), mpTalkHeap); + JUT_ASSERT(3138, pData != 0); + mpScrnDraw = pData; + local_98 = true; + } + if (field_0x4ce == 0 && mFukiKind != 12) { + mDoAud_talkIn(); + field_0x4ce = 1; + } + break; + } + if (mpRefer->getMsgID() == 0xc73) { + Z2GetAudioMgr()->changeBgmStatus(1); + } + if (mpRefer->getMsgID() == 0xc46) { + Z2GetAudioMgr()->changeBgmStatus(1); + } + mpScrnDraw->setMsgID( mpRefer->getMsgID()); + mpScrnDraw->setOutFont(mpOutFont); + mpRefer->setFont(local_30); + mpRefer->setActorPos(field_0x100->mPos); + mpRefer->setFontSizeX(mpScrnDraw->getFontSizeX()); + mpRefer->setFontSizeY(mpScrnDraw->getFontSizeY()); + mpRefer->setRubySize(mpScrnDraw->getRubySize()); + mpRefer->setTBoxWidth(mpScrnDraw->getTBoxWidth()); + mpRefer->setTBoxHeight(mpScrnDraw->getTBoxHeight()); + mpRefer->setLineSpace(mpScrnDraw->getLineSpace()); + mpRefer->setCharSpace(mpScrnDraw->getCharSpace()); + mpRefer->setRubyCharSpace(mpScrnDraw->getRubyCharSpace()); + mpRefer->setSelFontSize(mpScrnDraw->getSelFontSize()); + mpRefer->setSelRubySize(mpScrnDraw->getSelRubySize()); + mpRefer->setSelTBoxWidth(mpScrnDraw->getSelTBoxWidth()); + mpRefer->setSelCharSpace(mpScrnDraw->getSelCharSpace()); + mpRefer->setSelRubyCharSpace(mpScrnDraw->getSelRubyCharSpace()); + mpRenProc->setCharInfoPtr(mpScrnDraw->getCharInfoPtr()); + field_0x16a = 0; + field_0x199 = 0; + mpScrnDraw->fukiScale(dVar19); + mpScrnDraw->fukiAlpha(dVar19); + mpOutFont->setAlphaRatio(dVar19); + fukiPosCalc(local_98); + mpScrnDraw->arwAnimeInit(); + mpScrnDraw->dotAnimeInit(); + mpScrnDraw->setString("", ""); + mpScrnDraw->setRubyString(""); + mpScrnDraw->setSelectString("", "", ""); + mpScrnDraw->setSelectRubyString("", "", ""); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -862,6 +2154,7 @@ asm void dMsgObject_c::talkStartInit() { #include "asm/d/msg/d_msg_object/talkStartInit__12dMsgObject_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454B2C-80454B30 00312C 0004+00 1/1 0/0 0/0 .sdata2 @5947 */ @@ -881,6 +2174,57 @@ SECTION_SDATA2 static f32 lit_5950[1 + 1 /* padding */] = { }; /* 8023670C-802368E4 23104C 01D8+00 1/1 0/0 0/0 .text fukiPosCalc__12dMsgObject_cFb */ +// Matches with literals +#ifdef NONMATCHING +void dMsgObject_c::fukiPosCalc(bool param_1) { + if (param_1) { + mpRenProc->setTextInitOffsetPos(mpScrnDraw->getTextBoxPosOffsetY()); + mpScrnDraw->setTextBoxPosOffsetY(0.0f); + } else { + jmessage_tReference* pRef = + (jmessage_tReference*)mpRenProc->getReference(); + u8 bVar4 = pRef->getFukiPosType(); + if (isKanbanMessage() || isBookMessage()) { + bVar4 = 3; + } else if (bVar4 == 3) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz local_3c; + cXyz cStack_48; + mDoLib_project(&player->eyePos, &cStack_48); + f32 temp; + if ((field_0x100->mPos == cXyz(0.0f, 0.0f, 0.0f))) { + temp = cStack_48.y; + } else { + mDoLib_project(&field_0x100->mPos, &local_3c); + if (local_3c.x >= 0.0f && local_3c.x <= 608.0f && local_3c.y >= 0.0f && + local_3c.y <= 448.0f) + { + temp = 0.5f * (cStack_48.y + local_3c.y); + } else { + temp = cStack_48.y; + } + } + if (temp < g_MsgObject_HIO_c.mBoxAppearBound) { + bVar4 = 0; + } else { + bVar4 = 1; + } + } + switch(bVar4) { + case 1: + mpScrnDraw->setTextBoxPosOffsetY(-200.0f); + break; + case 2: + mpScrnDraw->setTextBoxPosOffsetY(-100.0f); + break; + default: + mpScrnDraw->setTextBoxPosOffsetY(0.0f); + break; + } + mpRenProc->setTextInitOffsetPos(mpScrnDraw->getTextBoxPosOffsetY()); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -889,47 +2233,114 @@ asm void dMsgObject_c::fukiPosCalc(bool param_0) { #include "asm/d/msg/d_msg_object/fukiPosCalc__12dMsgObject_cFb.s" } #pragma pop +#endif /* 802368E4-802368F8 231224 0014+00 15/15 0/0 0/0 .text setStatusLocal__12dMsgObject_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setStatusLocal(u16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setStatusLocal__12dMsgObject_cFUs.s" +void dMsgObject_c::setStatusLocal(u16 status) { + ((jmessage_tReference*)mpRenProc->getReference())->setStatus(status); } -#pragma pop /* 802368F8-8023690C 231238 0014+00 9/9 0/0 0/0 .text getStatusLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::getStatusLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/getStatusLocal__12dMsgObject_cFv.s" +u16 dMsgObject_c::getStatusLocal() { + return ((jmessage_tReference*)mpRenProc->getReference())->getStatus(); } -#pragma pop /* 8023690C-802369D8 23124C 00CC+00 3/3 0/0 0/0 .text delete_screen__12dMsgObject_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::delete_screen(bool param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/delete_screen__12dMsgObject_cFb.s" +void dMsgObject_c::delete_screen(bool param_1) { + if (mpOutFont != NULL) { + delete mpOutFont; + mpOutFont = NULL; + } + if (mpScrnDraw != NULL) { + delete mpScrnDraw; + mpScrnDraw = NULL; + if (param_1 && dComIfGp_isHeapLockFlag() == 5) + { + dComIfGp_offHeapLockFlag(7); + } + } + if (param_1 && mpTalkHeap != NULL) { + mpTalkHeap = NULL; + } } -#pragma pop /* 802369D8-80236BF8 231318 0220+00 5/5 0/0 0/0 .text isSend__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::isSend() { - nofralloc -#include "asm/d/msg/d_msg_object/isSend__12dMsgObject_cFv.s" +u8 dMsgObject_c::isSend() { + dComIfGp_setDoStatusForce(0, 0); + u8 mesgCancelButton = dComIfGp_checkMesgCancelButton(); + if (mesgCancelButton) { + dComIfGp_setMesgCancelButton(0); + } + if (mShopWaitTimer != 0) { + return 0; + } + jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference(); + if (pRef->getSendFlag() != 0) { + if (pRef->getSendFlag() == 3) { + if (dMsgObject_isMsgSend()) { + dMsgObject_offMsgSendControl(); + dMsgObject_offMsgSend(); + return 1; + } + dMsgObject_onMsgSendControl(); + return 0; + } + if (pRef->getSendFlag() == 4) { + if (field_0x17e >= pRef->getDemoFrame()) { + return 1; + } + return 0; + } + if (pRef->getSendFlag() == 5) { + if (getStatusLocal() == 21) { + setButtonStatusLocal(); + if (mDoCPd_c::getTrigA(0) != 0 || mDoCPd_c::getTrigB(0) != 0) { + return 2; + } + return 0; + } else { + return 1; + } + } + if (pRef->getSendTimer() > 0) { + pRef->decSendTimer(); + } else { + if (pRef->getSendFlag() == 6) { + pRef->setSendFlag(0); + } else { + return 1; + } + } + if (pRef->getSendFlag() == 2) { + setButtonStatusLocal(); + if (mDoCPd_c::getTrigA(0) != 0 || mDoCPd_c::getTrigB(0) != 0) { + return 2; + } + } + } else { + setButtonStatusLocal(); + if (isHowlMessage()) { + if (dMsgObject_isMsgSend()) { + dMsgObject_offMsgSendControl(); + dMsgObject_offMsgSend(); + return 2; + } + } else { + if (mDoCPd_c::getTrigA(0) != 0 || mDoCPd_c::getTrigB(0) != 0) { + return 2; + } + if (mesgCancelButton) { + return 1; + } + } + } + if (field_0x199 || field_0x1a3) { + return 2; + } else { + return 0; + } } -#pragma pop /* 80236BF8-80236C90 231538 0098+00 1/1 0/0 0/0 .text * readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c */ @@ -968,27 +2379,114 @@ void dMsgObject_c::endFlowGroupLocal() { /* 80236D0C-80236DE4 23164C 00D8+00 1/1 0/0 0/0 .text changeGroupLocal__12dMsgObject_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::changeGroupLocal(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/changeGroupLocal__12dMsgObject_cFs.s" +void dMsgObject_c::changeGroupLocal(s16 param_1) { + JKRHeap* prevHeap = mDoExt_setCurrentHeap(dComIfGp_getMsgExpHeap()); + if (field_0x16c != param_1) { + if (mFlowChk != 0) { + JUT_ASSERT(3688, mFlowChk != 2); + mFlowChk = 2; + } + OS_REPORT("group change =====> %d\n", param_1); + if (param_1 >= 1) { + OS_REPORT("bmg data change =====> %d --> %d\n", field_0x16c, param_1); + if (field_0x16c == 0) { + field_0x19d = 1; + } + mpMsgDt = dMeter2Info_getStageMsgResource(); + } else { + mpMsgDt = mpMsgRes; + } + if (field_0x16c >= 0) { + field_0x124->parse(mpMsgDt, 0x80); + } + field_0x16c = param_1; + } + mDoExt_setCurrentHeap(prevHeap); } -#pragma pop /* 80236DE4-802370A8 231724 02C4+00 1/1 0/0 0/0 .text * getStringLocal__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs */ +// Matches with literals +#ifdef NONMATCHING +bool dMsgObject_c::getStringLocal(u32 param_1, J2DTextBox* param_2, J2DTextBox* param_3, + JUTFont* param_4, COutFont_c* param_5, char* param_6, + char* param_7, char* param_8, s16* param_9) { + if (field_0x4cd == 0) { + if (getStatusLocal() == 1) { + s16 groupID = getMessageGroup(param_1); + JUT_ASSERT(3740, groupID==s_groupID || groupID == 0); + changeGroup(groupID); + mpSeqProc->setForceForm(1); + mpRefer->setFont(param_4); + mpRenProc->setOutFont(param_5); + mpRefer->setActorPos(cXyz(0.0f, 0.0f, 0.0f)); + J2DTextBox::TFontSize fontSize; + param_2->getFontSize(fontSize); + mpRefer->setFontSizeX(fontSize.mSizeX); + mpRefer->setFontSizeY(fontSize.mSizeY); + if (param_3 != NULL) { + param_3->getFontSize(fontSize); + mpRefer->setRubySize(fontSize.mSizeX); + } else { + mpRefer->setRubySize(0.0f); + } + mpRefer->setTBoxWidth(param_2->getWidth()); + mpRefer->setTBoxHeight(param_2->getHeight()); + mpRefer->setLineSpace(param_2->getLineSpace()); + mpRefer->setCharSpace(param_2->getCharSpace()); + if (param_3 != NULL) { + mpRefer->setRubyCharSpace(param_3->getCharSpace()); + } else { + mpRefer->setRubyCharSpace(0.0f); + } + mpRenProc->setCharInfoPtr(NULL); + field_0x4cd = 1; + mpCtrl->setMessageID(param_1, 0, NULL); + } + } else { + jmessage_tReference* pRef = + (jmessage_tReference*)mpRenProc->getReference(); + if (getStatusLocal() == 11 && (pRef->getStopFlag() == 7 || pRef->getStopFlag() == 1)) + { + mpCtrl->render(); + if (param_9 != NULL) { + *param_9 = mpRefer->getCharSoundInfo().field_0x40e; + } + if (param_6 != NULL) { + strcpy(param_6, pRef->getTextPtr()); + } + if (param_7 != NULL) { + strcpy(param_7, pRef->getRubyPtr()); + } + if (param_8 != NULL) { + strcpy(param_8, pRef->getTextSPtr()); + } + mpCtrl->reset(); + mpCtrl->resetResourceCache(); + mpRefer->resetCharCountBuffer(); + dDemo_c::getControl()->unsuspend(1); + field_0x17e = 0; + updateEquipBombInfoLocal(); + field_0x4cd = 0; + pRef->setStopFlag(0); + setStatusLocal(1); + return true; + } + } + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getStringLocal(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2, +asm bool dMsgObject_c::getStringLocal(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2, JUTFont* param_3, COutFont_c* param_4, char* param_5, char* param_6, char* param_7, s16* param_8) { nofralloc #include "asm/d/msg/d_msg_object/getStringLocal__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs.s" } #pragma pop +#endif /* 802370A8-802370BC 2319E8 0014+00 0/0 1/1 0/0 .text isGetItemMessage__12dMsgObject_cFv */ @@ -1012,55 +2510,48 @@ u8 dMsgObject_c::isHowlMessage() { /* 802370FC-80237138 231A3C 003C+00 3/3 2/2 0/0 .text isMidonaMessage__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isMidonaMessage() { - nofralloc -#include "asm/d/msg/d_msg_object/isMidonaMessage__12dMsgObject_cFv.s" +bool dMsgObject_c::isMidonaMessage() { + if (mFukiKind == 13 && (mpRefer->getMsgID() == 0x7d3 || mpRefer->getMsgID() == 0x7f6 || + mpRefer->getMsgID() == 0x7fa)) + { + return 1; + } + return 0; } -#pragma pop /* 80237138-802371B0 231A78 0078+00 1/1 0/0 0/0 .text isMidonaNormalTalkWait__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isMidonaNormalTalkWait() { - nofralloc -#include "asm/d/msg/d_msg_object/isMidonaNormalTalkWait__12dMsgObject_cFv.s" +bool dMsgObject_c::isMidonaNormalTalkWait() { + if (mFukiKind == 13 && !isMidonaMessage()) { + daMidna_c* midna = daPy_py_c::getMidnaActor(); + if (midna != NULL && !midna->checkShadowModeTalkWait()) { + return true; + } else { + return false; + } + return false; + } + return true; } -#pragma pop /* 802371B0-802371E4 231AF0 0034+00 0/0 1/1 0/0 .text isMidonaTalkWait__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isMidonaTalkWait() { - nofralloc -#include "asm/d/msg/d_msg_object/isMidonaTalkWait__12dMsgObject_cFv.s" +bool dMsgObject_c::isMidonaTalkWait() { + daMidna_c* midna = daPy_py_c::getMidnaActor(); + if (midna != NULL) { + return midna->checkShadowModeTalkWait(); + } + return false; } -#pragma pop /* 802371E4-802371F8 231B24 0014+00 4/4 3/3 2/2 .text isPlaceMessage__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isPlaceMessage() { - nofralloc -#include "asm/d/msg/d_msg_object/isPlaceMessage__12dMsgObject_cFv.s" +bool dMsgObject_c::isPlaceMessage() { + return mFukiKind == 12 ? 1 : 0; } -#pragma pop /* 802371F8-8023720C 231B38 0014+00 3/3 2/2 0/0 .text isBossMessage__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isBossMessage() { - nofralloc -#include "asm/d/msg/d_msg_object/isBossMessage__12dMsgObject_cFv.s" +bool dMsgObject_c::isBossMessage() { + return mFukiKind == 19 ? 1 : 0; } -#pragma pop /* 8023720C-80237214 231B4C 0008+00 6/6 2/2 0/0 .text isBookMessage__12dMsgObject_cFv */ bool dMsgObject_c::isBookMessage() { @@ -1068,36 +2559,36 @@ bool dMsgObject_c::isBookMessage() { } /* 80237214-80237228 231B54 0014+00 3/3 2/2 0/0 .text isStaffMessage__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isStaffMessage() { - nofralloc -#include "asm/d/msg/d_msg_object/isStaffMessage__12dMsgObject_cFv.s" +bool dMsgObject_c::isStaffMessage() { + return mFukiKind == 7 ? 1 : 0; } -#pragma pop /* 80237228-8023723C 231B68 0014+00 0/0 1/1 0/0 .text isSaveMessage__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isSaveMessage() { - nofralloc -#include "asm/d/msg/d_msg_object/isSaveMessage__12dMsgObject_cFv.s" +bool dMsgObject_c::isSaveMessage() { + return mFukiKind == 16 ? 1 : 0; } -#pragma pop /* 8023723C-802372CC 231B7C 0090+00 4/4 0/0 0/0 .text isTalkMessage__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isTalkMessage() { - nofralloc -#include "asm/d/msg/d_msg_object/isTalkMessage__12dMsgObject_cFv.s" +bool dMsgObject_c::isTalkMessage() { + if (isKanbanMessage() || isPlaceMessage() || isBossMessage() || isBookMessage() || + isHowlMessage() || isStaffMessage()) { + return false; + } + return true; } -#pragma pop /* 802372CC-80237334 231C0C 0068+00 0/0 5/5 0/0 .text getSmellName__12dMsgObject_cFv */ +// regalloc +#ifdef NONMATCHING +const char* dMsgObject_c::getSmellName() { + JMSMesgHeader_c* info_header_p = (JMSMesgHeader_c*)((char*)mpMsgRes + 0x20); + char* data_ptr = (char*)info_header_p + info_header_p->sectionSize; + JMSMesgEntry_c* info_entries = (JMSMesgEntry_c*)((char*)info_header_p + 0x10); + + JMSMesgEntry_c* msg_entry = &info_entries[(u16)getMessageIndex(getSmellTypeMessageID())]; + return data_ptr + msg_entry->mStringOffset + 8; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1106,6 +2597,7 @@ asm const char* dMsgObject_c::getSmellName() { #include "asm/d/msg/d_msg_object/getSmellName__12dMsgObject_cFv.s" } #pragma pop +#endif /* 80237334-8023738C 231C74 0058+00 0/0 5/5 0/0 .text getPortalName__12dMsgObject_cFv */ const char* dMsgObject_c::getPortalName() { @@ -1118,161 +2610,149 @@ const char* dMsgObject_c::getPortalName() { } /* 8023738C-8023741C 231CCC 0090+00 0/0 5/5 0/0 .text getBombName__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm const char* dMsgObject_c::getBombName() { - nofralloc -#include "asm/d/msg/d_msg_object/getBombName__12dMsgObject_cFv.s" +const char* dMsgObject_c::getBombName() { + u8 i_selectPos = getSelectCursorPos(); + JUT_ASSERT(4075, i_selectPos >= 0 && i_selectPos < dSv_player_item_c::BOMB_BAG_MAX); + u8 i_cursorPos; + if (field_0x193 != 0) { + i_cursorPos = getSelectBomBag(i_selectPos); + } else { + i_cursorPos = i_selectPos; + } + JUT_ASSERT(4083, i_cursorPos >= 0 && i_cursorPos < dSv_player_item_c::BOMB_BAG_MAX); + JMSMesgHeader_c* info_header_p = (JMSMesgHeader_c*)((char*)mpMsgRes + 0x20); + char* data_ptr = (char*)info_header_p + info_header_p->sectionSize; + JMSMesgEntry_c* info_entries = (JMSMesgEntry_c*)((char*)info_header_p + 0x10); + + JMSMesgEntry_c* msg_entry = &info_entries[getMessageIndexAlways(getBombMessageIDLocal(i_cursorPos) + 0x165)]; + return data_ptr + msg_entry->mStringOffset + 8; } -#pragma pop /* 8023741C-80237478 231D5C 005C+00 0/0 5/5 0/0 .text getInsectName__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm const char* dMsgObject_c::getInsectName() { - nofralloc -#include "asm/d/msg/d_msg_object/getInsectName__12dMsgObject_cFv.s" +const char* dMsgObject_c::getInsectName() { + JMSMesgHeader_c* info_header_p = (JMSMesgHeader_c*)((char*)mpMsgRes + 0x20); + char* data_ptr = (char*)info_header_p + info_header_p->sectionSize; + JMSMesgEntry_c* info_entries = (JMSMesgEntry_c*)((char*)info_header_p + 0x10); + + JMSMesgEntry_c* msg_entry = &info_entries[getMessageIndexAlways(getInsectItemNoLocal() + 0x165)]; + return data_ptr + msg_entry->mStringOffset + 8; } -#pragma pop /* 80237478-802374D0 231DB8 0058+00 0/0 5/5 0/0 .text getLetterName__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm const char* dMsgObject_c::getLetterName() { - nofralloc -#include "asm/d/msg/d_msg_object/getLetterName__12dMsgObject_cFv.s" +const char* dMsgObject_c::getLetterName() { + JMSMesgHeader_c* info_header_p = (JMSMesgHeader_c*)((char*)mpMsgRes + 0x20); + char* data_ptr = (char*)info_header_p + info_header_p->sectionSize; + JMSMesgEntry_c* info_entries = (JMSMesgEntry_c*)((char*)info_header_p + 0x10); + + JMSMesgEntry_c* msg_entry = &info_entries[getMessageIndexAlways(getLetterNameIDLocal())]; + return data_ptr + msg_entry->mStringOffset + 8; } -#pragma pop /* 802374D0-80237520 231E10 0050+00 1/1 5/5 0/0 .text getSelectBombNum__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dMsgObject_c::getSelectBombNum() { - nofralloc -#include "asm/d/msg/d_msg_object/getSelectBombNum__12dMsgObject_cFv.s" +u8 dMsgObject_c::getSelectBombNum() { + u8 i_selectPos = getSelectCursorPos(); + JUT_ASSERT(4133, i_selectPos >= 0 && i_selectPos < dSv_player_item_c::BOMB_BAG_MAX) + if (field_0x193 != 0) { + i_selectPos = getSelectBomBag(i_selectPos); + } + return getBombNumLocal(i_selectPos); } -#pragma pop /* 80237520-80237530 231E60 0010+00 1/1 0/0 0/0 .text onMsgSendControlLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::onMsgSendControlLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/onMsgSendControlLocal__12dMsgObject_cFv.s" +void dMsgObject_c::onMsgSendControlLocal() { + mMsgSendControl |= 1; } -#pragma pop /* 80237530-80237550 231E70 0020+00 1/1 0/0 0/0 .text offMsgSendControlLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::offMsgSendControlLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/offMsgSendControlLocal__12dMsgObject_cFv.s" +void dMsgObject_c::offMsgSendControlLocal() { + mMsgSendControl &= ~1; + ((jmessage_tReference*)mpRenProc->getReference())->setSendFlag(0); } -#pragma pop /* 80237550-8023755C 231E90 000C+00 1/1 0/0 0/0 .text isMsgSendControlLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::isMsgSendControlLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/isMsgSendControlLocal__12dMsgObject_cFv.s" +int dMsgObject_c::isMsgSendControlLocal() { + return (mMsgSendControl & 1) != 0; } -#pragma pop /* 8023755C-8023756C 231E9C 0010+00 1/1 0/0 0/0 .text onMsgSendLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::onMsgSendLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/onMsgSendLocal__12dMsgObject_cFv.s" +void dMsgObject_c::onMsgSendLocal() { + mMsgSendControl |= 2; } -#pragma pop /* 8023756C-8023757C 231EAC 0010+00 1/1 0/0 0/0 .text offMsgSendLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::offMsgSendLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/offMsgSendLocal__12dMsgObject_cFv.s" +void dMsgObject_c::offMsgSendLocal() { + mMsgSendControl &= ~2; } -#pragma pop /* 8023757C-80237588 231EBC 000C+00 1/1 0/0 0/0 .text isMsgSendLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::isMsgSendLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/isMsgSendLocal__12dMsgObject_cFv.s" +int dMsgObject_c::isMsgSendLocal() { + return (mMsgSendControl & 2) != 0; } -#pragma pop /* 80237588-8023759C 231EC8 0014+00 1/1 0/0 0/0 .text isMouthCheckLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::isMouthCheckLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/isMouthCheckLocal__12dMsgObject_cFv.s" +bool dMsgObject_c::isMouthCheckLocal() { + return mpSeqProc->getMouthCheck() != 0; } -#pragma pop /* 8023759C-802375E4 231EDC 0048+00 1/1 0/0 0/0 .text getBombBuyPriceLocal__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::getBombBuyPriceLocal(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/getBombBuyPriceLocal__12dMsgObject_cFUc.s" +int dMsgObject_c::getBombBuyPriceLocal(u8 param_0) { + switch(param_0) { + case 0x70: + return 15; + case 0x71: + return 30; + case 0x72: + return 30; + default: + return 0; + } } -#pragma pop /* 802375E4-80237610 231F24 002C+00 0/0 1/1 0/0 .text addSelectBomBag__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::addSelectBomBag(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/addSelectBomBag__12dMsgObject_cFUc.s" +void dMsgObject_c::addSelectBomBag(u8 param_1) { + if (param_1 == 0xff) { + param_1 = field_0x193; + } + mSelectBombBag[field_0x193] = param_1; + field_0x193++; + OS_REPORT("addSelectBombBag ==> %d, %d\n", field_0x193, param_1); } -#pragma pop /* 80237610-8023763C 231F50 002C+00 1/1 1/1 0/0 .text resetSelectBomBag__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::resetSelectBomBag() { - nofralloc -#include "asm/d/msg/d_msg_object/resetSelectBomBag__12dMsgObject_cFv.s" +void dMsgObject_c::resetSelectBomBag() { + for (int i = 0; i < 3; i++) { + mSelectBombBag[i] = 0; + } + field_0x193 = 0; } -#pragma pop /* 8023763C-8023768C 231F7C 0050+00 1/1 0/0 0/0 .text getSelectBombBagIDLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dMsgObject_c::getSelectBombBagIDLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/getSelectBombBagIDLocal__12dMsgObject_cFv.s" +u8 dMsgObject_c::getSelectBombBagIDLocal() { + u8 i_selectPos = getSelectCursorPos(); + JUT_ASSERT(4253, i_selectPos >= 0 && i_selectPos < dSv_player_item_c::BOMB_BAG_MAX); + if (field_0x193 != 0) { + i_selectPos = getSelectBomBag(i_selectPos); + } + return getBombBagIDLocal(i_selectPos); } -#pragma pop /* 8023768C-8023773C 231FCC 00B0+00 1/1 0/0 0/0 .text getSelectBombPriceLocal__12dMsgObject_cFv */ +// tertiary condition issue +#ifdef NONMATCHING +s16 dMsgObject_c::getSelectBombPriceLocal() { + u8 i_selectPos = getSelectCursorPos(); + JUT_ASSERT(4276, i_selectPos >= 0 && i_selectPos < dSv_player_item_c::BOMB_BAG_MAX); + u8 i_cursorPos = field_0x193 != 0 ? getSelectBomBag(i_selectPos) : i_selectPos; + u16 uVar1 = getBombBuyPriceLocal(getBombMessageIDLocal(i_cursorPos)); + int num = getSelectBombNum(); + return (num * uVar1) / 10.0f; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1281,264 +2761,261 @@ asm s16 dMsgObject_c::getSelectBombPriceLocal() { #include "asm/d/msg/d_msg_object/getSelectBombPriceLocal__12dMsgObject_cFv.s" } #pragma pop +#endif /* 8023773C-80237748 23207C 000C+00 1/1 0/0 0/0 .text setEquipBombInfoLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setEquipBombInfoLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/setEquipBombInfoLocal__12dMsgObject_cFv.s" +void dMsgObject_c::setEquipBombInfoLocal() { + mEquipBombInfo = 1; } -#pragma pop /* 80237748-802378B8 232088 0170+00 3/3 0/0 0/0 .text updateEquipBombInfoLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::updateEquipBombInfoLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/updateEquipBombInfoLocal__12dMsgObject_cFv.s" +void dMsgObject_c::updateEquipBombInfoLocal() { + if (mEquipBombInfo == 0) { + return; + } + bool bVar1 = true; + if (s_groupID == 2 && (mNowTalkFlowNo == 365 || mNowTalkFlowNo == 366 || mNowTalkFlowNo == 367)) + { + bVar1 = false; + } + int iVar5 = 0; + for (int i = 0; (int)i < 3; i++) { + setBombBagIDLocal(i, 0xff); + setBombMessageIDLocal(i, 0); + setBombNumLocal(i, 0); + u8 bVar3 = dComIfGs_getItem(i + 15, 0); + if (bVar3 != 0xff && (bVar3 != 0x50 || bVar1)) { + setBombBagIDLocal(iVar5, i); + setBombMessageIDLocal(iVar5, bVar3); + if (bVar3 == 0x50) { + setBombNumLocal(iVar5, 0); + } else { + setBombNumLocal(iVar5, dComIfGs_getBombNum(i)); + } + iVar5++; + } + } + if (iVar5 == 1) { + for (int i = 1; i < 3; i++) { + setBombBagIDLocal(i, getBombBagIDLocal(0)); + setBombMessageIDLocal(i, getBombMessageIDLocal(0)); + setBombNumLocal(i, getBombNumLocal(0)); + } + } + mEquipBombInfo = 0; } -#pragma pop /* 802378B8-802378CC 2321F8 0014+00 0/0 1/1 0/0 .text setShopWaitTimer__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setShopWaitTimer(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setShopWaitTimer__12dMsgObject_cFUc.s" +void dMsgObject_c::setShopWaitTimer(u8 timer) { + dMsgObject_getMsgObjectClass()->setShopWaitTimerLocal(timer); } -#pragma pop /* 802378CC-802378D4 -00001 0008+00 0/0 0/0 0/0 .text setSelectWordFlagLocal__12dMsgObject_cFUc */ void dMsgObject_c::setSelectWordFlagLocal(u8 param_0) { - *(u8*)(((u8*)this) + 1222) /* this->field_0x4c6 */ = (u8)(param_0); + mSelectWordFlag = param_0; } /* 802378D4-80237934 232214 0060+00 1/1 0/0 0/0 .text isHowlHearingModeLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isHowlHearingModeLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/isHowlHearingModeLocal__12dMsgObject_cFv.s" +bool dMsgObject_c::isHowlHearingModeLocal() { + bool rv = false; + if (isHowlMessage() && mpScrnDraw != NULL && ((dMsgScrnHowl_c*)mpScrnDraw)->isHearingMode()) { + rv = true; + } + return rv; } -#pragma pop /* 80237934-80237950 232274 001C+00 1/1 0/0 0/0 .text isCameraCancelFlag__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::isCameraCancelFlag() { - nofralloc -#include "asm/d/msg/d_msg_object/isCameraCancelFlag__12dMsgObject_cFv.s" +bool dMsgObject_c::isCameraCancelFlag() { + return dMsgObject_getMsgObjectClass()->isCameraCancelFlagLocal() ? true : false; } -#pragma pop /* 80237950-80237968 232290 0018+00 2/2 0/0 0/0 .text onCameraCancelFlag__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::onCameraCancelFlag() { - nofralloc -#include "asm/d/msg/d_msg_object/onCameraCancelFlag__12dMsgObject_cFv.s" +void dMsgObject_c::onCameraCancelFlag() { + dMsgObject_getMsgObjectClass()->onCameraCancelFlagLocal(); } -#pragma pop /* 80237968-80237980 2322A8 0018+00 1/1 0/0 0/0 .text offCameraCancelFlag__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::offCameraCancelFlag() { - nofralloc -#include "asm/d/msg/d_msg_object/offCameraCancelFlag__12dMsgObject_cFv.s" +void dMsgObject_c::offCameraCancelFlag() { + dMsgObject_getMsgObjectClass()->offCameraCancelFlagLocal(); } -#pragma pop /* 80237980-80237994 2322C0 0014+00 0/0 1/1 0/0 .text isKillMessageFlag__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isKillMessageFlag() { - nofralloc -#include "asm/d/msg/d_msg_object/isKillMessageFlag__12dMsgObject_cFv.s" +bool dMsgObject_c::isKillMessageFlag() { + return dMsgObject_getMsgObjectClass()->isKillMessageFlagLocal(); } -#pragma pop /* 80237994-802379AC 2322D4 0018+00 0/0 2/2 3/3 .text onKillMessageFlag__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::onKillMessageFlag() { - nofralloc -#include "asm/d/msg/d_msg_object/onKillMessageFlag__12dMsgObject_cFv.s" +void dMsgObject_c::onKillMessageFlag() { + dMsgObject_getMsgObjectClass()->onKillMessageFlagLocal(); } -#pragma pop /* 802379AC-802379D8 2322EC 002C+00 0/0 2/2 0/0 .text setKillMessageFlag__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setKillMessageFlag() { - nofralloc -#include "asm/d/msg/d_msg_object/setKillMessageFlag__12dMsgObject_cFv.s" +void dMsgObject_c::setKillMessageFlag() { + dMsgObject_getMsgObjectClass()->setKillMessageFlagLocal(); } -#pragma pop /* 802379D8-80237A74 232318 009C+00 1/1 0/0 0/0 .text setKillMessageFlagLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setKillMessageFlagLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/setKillMessageFlagLocal__12dMsgObject_cFv.s" +void dMsgObject_c::setKillMessageFlagLocal() { + if (!dComIfGp_event_runCheck()) { + if (getStatusLocal() != 1) { + if (getStatusLocal() == 11) { + field_0x4cd = 0; + dMeter2Info_resetFloatingMessage(); + } + deleteProc(); + jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference(); + pRef->setStopFlag(0); + } else { + mNoDemoFlag = 0; + field_0x4cc = 0; + } + } } -#pragma pop /* 80237A74-80237A88 2323B4 0014+00 0/0 3/3 0/0 .text setTalkPartner__12dMsgObject_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setTalkPartner(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setTalkPartner__12dMsgObject_cFP10fopAc_ac_c.s" +void dMsgObject_c::setTalkPartner(fopAc_ac_c* param_0) { + dMsgObject_getMsgObjectClass()->setTalkPartnerLocal(param_0); } -#pragma pop /* 80237A88-80237A9C 2323C8 0014+00 1/1 2/2 0/0 .text setNowTalkFlowNo__12dMsgObject_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setNowTalkFlowNo(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setNowTalkFlowNo__12dMsgObject_cFs.s" +void dMsgObject_c::setNowTalkFlowNo(s16 param_0) { + dMsgObject_getMsgObjectClass()->setNowTalkFlowNoLocal(param_0); } -#pragma pop /* 80237A9C-80237AB0 2323DC 0014+00 0/0 0/0 1/1 .text getNowTalkFlowNo__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::getNowTalkFlowNo() { - nofralloc -#include "asm/d/msg/d_msg_object/getNowTalkFlowNo__12dMsgObject_cFv.s" +s16 dMsgObject_c::getNowTalkFlowNo() { + return dMsgObject_getMsgObjectClass()->getNowTalkFlowNoLocal(); } -#pragma pop /* 80237AB0-80237AE0 2323F0 0030+00 0/0 1/1 0/0 .text setDemoMessage__12dMsgObject_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setDemoMessage(u32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setDemoMessage__12dMsgObject_cFUl.s" +void dMsgObject_c::setDemoMessage(u32 param_0) { + dMsgObject_getMsgObjectClass()->setDemoMessageLocal(param_0); } -#pragma pop /* 80237AE0-80237B10 232420 0030+00 0/0 8/8 0/0 .text setTalkHeap__12dMsgObject_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setTalkHeap(void* param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setTalkHeap__12dMsgObject_cFPv.s" +void dMsgObject_c::setTalkHeap(void* param_0) { + dMsgObject_getMsgObjectClass()->setTalkHeapLocal(param_0); } -#pragma pop /* 80237B10-80237B54 232450 0044+00 1/1 0/0 0/0 .text setTalkHeapLocal__12dMsgObject_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setTalkHeapLocal(void* param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setTalkHeapLocal__12dMsgObject_cFPv.s" +void dMsgObject_c::setTalkHeapLocal(void* param_1) { + if (param_1 == NULL) { + delete_screen(true); + } + mpTalkHeap = (JKRExpHeap*)param_1; } -#pragma pop /* 80237B54-80237B68 232494 0014+00 0/0 2/2 0/0 .text getTalkHeap__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void* dMsgObject_c::getTalkHeap() { - nofralloc -#include "asm/d/msg/d_msg_object/getTalkHeap__12dMsgObject_cFv.s" +void* dMsgObject_c::getTalkHeap() { + return dMsgObject_getMsgObjectClass()->getTalkHeapLocal(); } -#pragma pop /* 80237B68-80237BFC 2324A8 0094+00 2/2 0/0 0/0 .text isDraw__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::isDraw() { - nofralloc -#include "asm/d/msg/d_msg_object/isDraw__12dMsgObject_cFv.s" +bool dMsgObject_c::isDraw() { + if ((getStatusLocal() != 0 && getStatusLocal() != 1 && field_0x4c7 == 0) && + (getStatusLocal() != 11 && (getStatusLocal() != 6 || field_0x166 != 15))) + { + return true; + } + return false; } -#pragma pop /* 80237BFC-80237D88 23253C 018C+00 2/2 0/0 0/0 .text setButtonStatusLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setButtonStatusLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/setButtonStatusLocal__12dMsgObject_cFv.s" +void dMsgObject_c::setButtonStatusLocal() { + jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference(); + if (field_0x168 == getStatusLocal() && (pRef->getSendFlag() != 1 && pRef->getSendFlag() != 3) && + pRef->getSendFlag() != 4 && pRef->getSendFlag() != 6 && pRef->getSendFlag() != 2) + { + if (getStatusLocal() == 0x10) { + if (isHowlMessage()) { + dComIfGp_setDoStatusForce(5, 0); + dComIfGp_setAStatusForce(42, 0); + } else { + dComIfGp_setDoStatusForce(35, 0); + } + } else if (getStatusLocal() == 8 || getStatusLocal() == 9 || + getStatusLocal() == 20) + { + dComIfGp_setDoStatusForce(0x22, 0); + } else if (getStatusLocal() == 21) { + dComIfGp_setDoStatusForce(0x22, 0); + dComIfGp_setAStatusForce(0x2a, 0); + } else { + dComIfGp_setDoStatusForce(0x23, 0); + } + } } -#pragma pop /* 80237D88-80237DD8 2326C8 0050+00 1/1 0/0 0/0 .text setDemoMessageLocal__12dMsgObject_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setDemoMessageLocal(u32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setDemoMessageLocal__12dMsgObject_cFUl.s" +void dMsgObject_c::setDemoMessageLocal(u32 param_1) { + field_0x4cc = 1; + dMsgObject_onCameraCancelFlag(); + fopMsgM_messageSet(dMsgObject_getMsgObjectClass()->getMessageIDAlways(param_1), 1000); } -#pragma pop /* 80237DD8-80237E04 232718 002C+00 1/1 0/0 0/0 .text getSmellTypeMessageIDLocal__12dMsgObject_cFv */ +// bgelr and bltlr issues. +#ifdef NONMATCHING +u16 dMsgObject_c::getSmellTypeMessageIDLocal() { + int msgId = 0; + int smell = dComIfGs_getCollectSmell(); + if (smell < SMELL_MEDICINE + 1 && smell >= SMELL_YELIA_POUCH) { + msgId = smell + 0x165; + } else { + if (dComIfGs_getCollectSmell() != -1) { + OS_REPORT("smell type ====> %d\n", dComIfGs_getCollectSmell()); + JUT_WARN(4858, "smell type no entry!"); + } + } + return msgId; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getSmellTypeMessageIDLocal() { +asm u16 dMsgObject_c::getSmellTypeMessageIDLocal() { nofralloc #include "asm/d/msg/d_msg_object/getSmellTypeMessageIDLocal__12dMsgObject_cFv.s" } #pragma pop +#endif /* 80237E04-80237E58 232744 0054+00 1/1 0/0 0/0 .text setSmellTypeLocal__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setSmellTypeLocal(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setSmellTypeLocal__12dMsgObject_cFUc.s" +void dMsgObject_c::setSmellTypeLocal(u8 smellType) { + mSmellType = smellType; + dComIfGs_onItemFirstBit(smellType); + dComIfGs_setCollectSmell(mSmellType); + dComIfGs_setSelectItemIndex(2, mSmellType); } -#pragma pop /* 80237E58-80237E68 232798 0010+00 3/3 0/0 0/0 .text getSelectCursorPosLocal__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::getSelectCursorPosLocal() { - nofralloc -#include "asm/d/msg/d_msg_object/getSelectCursorPosLocal__12dMsgObject_cFv.s" +u8 dMsgObject_c::getSelectCursorPosLocal() { + return ((jmessage_tReference*)mpRenProc->getReference())->getSelectPos(); } -#pragma pop /* 80237E68-80237F10 2327A8 00A8+00 3/3 0/0 0/0 .text setSelectCursorPosLocal__12dMsgObject_cFUc */ +// Matches with literals +#ifdef NONMATCHING +void dMsgObject_c::setSelectCursorPosLocal(u8 param_1) { + jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference(); + if (!dComIfGp_isPauseFlag() && param_1 != 0xff && pRef->getSelectPos() != param_1) { + Z2GetAudioMgr()->seStart(daAlink_c::WANM_ATTACK_POE, NULL, 1, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + } + pRef->setSelectPos(param_1); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1547,454 +3024,271 @@ asm void dMsgObject_c::setSelectCursorPosLocal(u8 param_0) { #include "asm/d/msg/d_msg_object/setSelectCursorPosLocal__12dMsgObject_cFUc.s" } #pragma pop +#endif /* 80237F10-80237F18 -00001 0008+00 0/0 0/0 0/0 .text * setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c */ -void dMsgObject_c::setTalkActorLocal(fopAc_ac_c* param_0) { - *(u32*)(((u8*)this) + 312) /* this->field_0x138 */ = (u32)(param_0); +void dMsgObject_c::setTalkActorLocal(fopAc_ac_c* actor) { + mpTalkActor = actor; } /* 80237F18-80237F38 232858 0020+00 1/0 0/0 0/0 .text dMsgObject_Draw__FP12dMsgObject_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMsgObject_Draw(dMsgObject_c* param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_Draw__FP12dMsgObject_c.s" +static int dMsgObject_Draw(dMsgObject_c* i_this) { + return i_this->_draw(); } -#pragma pop /* 80237F38-80237F58 232878 0020+00 1/0 0/0 0/0 .text dMsgObject_Execute__FP12dMsgObject_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMsgObject_Execute(dMsgObject_c* param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_Execute__FP12dMsgObject_c.s" +static int dMsgObject_Execute(dMsgObject_c* i_this) { + return i_this->_execute(); } -#pragma pop /* 80237F58-80237F60 232898 0008+00 1/0 0/0 0/0 .text dMsgObject_IsDelete__FP12dMsgObject_c */ -static bool dMsgObject_IsDelete(dMsgObject_c* param_0) { - return true; +static int dMsgObject_IsDelete(dMsgObject_c* i_this) { + return 1; } /* 80237F60-80237F80 2328A0 0020+00 1/0 0/0 0/0 .text dMsgObject_Delete__FP12dMsgObject_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMsgObject_Delete(dMsgObject_c* param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_Delete__FP12dMsgObject_c.s" +static int dMsgObject_Delete(dMsgObject_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80237F80-8023800C 2328C0 008C+00 1/0 0/0 0/0 .text dMsgObject_Create__FP9msg_class */ +// Matches with g_MsgObject_HIO_c +#ifdef NONMATCHING +int dMsgObject_Create(msg_class* param_1) { + dMsgObject_c* obj = static_cast(param_1); + dComIfGp_setMsgObjectClass(obj); + JKRHeap* prevHeap = mDoExt_setCurrentHeap(dComIfGp_getMsgExpHeap()); + dComIfGp_getMsgExpHeap()->getTotalFreeSize(); + fopMsgM_setStageLayer(param_1); + param_1->mMode = 0; + int rv = obj->_create(param_1); + g_MsgObject_HIO_c.field_0x4 = -1; + OS_REPORT("### msg object size =====> %d\n", dComIfGp_getMsgExpHeap()->getTotalFreeSize()); + mDoExt_setCurrentHeap(prevHeap); + return rv; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dMsgObject_Create(msg_class* param_0) { +static asm int dMsgObject_Create(msg_class* param_0) { nofralloc #include "asm/d/msg/d_msg_object/dMsgObject_Create__FP9msg_class.s" } #pragma pop +#endif /* 8023800C-8023803C 23294C 0030+00 0/0 1/1 0/0 .text * readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::readMessageGroup(mDoDvdThd_mountXArchive_c** param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c.s" +void dMsgObject_c::readMessageGroup(mDoDvdThd_mountXArchive_c** p_arcMount) { + dMsgObject_getMsgObjectClass()->readMessageGroupLocal(p_arcMount); } -#pragma pop /* 8023803C-8023806C 23297C 0030+00 0/0 3/3 0/0 .text changeFlowGroup__12dMsgObject_cFl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::changeFlowGroup(s32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/changeFlowGroup__12dMsgObject_cFl.s" +void dMsgObject_c::changeFlowGroup(s32 param_0) { + dMsgObject_getMsgObjectClass()->changeFlowGroupLocal(param_0); } -#pragma pop /* 8023806C-80238098 2329AC 002C+00 0/0 1/1 0/0 .text demoMessageGroup__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::demoMessageGroup() { - nofralloc -#include "asm/d/msg/d_msg_object/demoMessageGroup__12dMsgObject_cFv.s" +void dMsgObject_c::demoMessageGroup() { + dMsgObject_getMsgObjectClass()->demoMessageGroupLocal(); } -#pragma pop /* 80238098-802380C4 2329D8 002C+00 0/0 3/3 4/4 .text endFlowGroup__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::endFlowGroup() { - nofralloc -#include "asm/d/msg/d_msg_object/endFlowGroup__12dMsgObject_cFv.s" +void dMsgObject_c::endFlowGroup() { + dMsgObject_getMsgObjectClass()->endFlowGroupLocal(); } -#pragma pop /* 802380C4-802380F4 232A04 0030+00 7/7 0/0 0/0 .text changeGroup__12dMsgObject_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::changeGroup(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/changeGroup__12dMsgObject_cFs.s" +void dMsgObject_c::changeGroup(s16 param_0) { + dMsgObject_getMsgObjectClass()->changeGroupLocal(param_0); } -#pragma pop /* 802380F4-80238174 232A34 0080+00 0/0 2/2 0/0 .text * getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2, - JUTFont* param_3, COutFont_c* param_4, char* param_5, - char* param_6, char* param_7, s16* param_8) { - nofralloc -#include "asm/d/msg/d_msg_object/getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs.s" +bool dMsgObject_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2, + JUTFont* param_3, COutFont_c* param_4, char* param_5, char* param_6, + char* param_7, s16* param_8) { + return dMsgObject_getMsgObjectClass()->getStringLocal( + param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8); } -#pragma pop /* 80238174-80238188 232AB4 0014+00 0/0 1/1 0/0 .text getMsgDtPtr__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8* dMsgObject_c::getMsgDtPtr() { - nofralloc -#include "asm/d/msg/d_msg_object/getMsgDtPtr__12dMsgObject_cFv.s" +void* dMsgObject_c::getMsgDtPtr() { + return dMsgObject_getMsgObjectClass()->getMsgDtPtrLocal(); } -#pragma pop /* 80238188-8023819C 232AC8 0014+00 0/0 0/0 1/1 .text setProcessID__12dMsgObject_cFUi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setProcessID(unsigned int param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setProcessID__12dMsgObject_cFUi.s" +void dMsgObject_c::setProcessID(unsigned int id) { + dMsgObject_getMsgObjectClass()->setProcessIDLocal(id); } -#pragma pop /* 8023819C-802381C0 232ADC 0024+00 0/0 5/5 5/5 .text getActor__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm fopAc_ac_c* dMsgObject_c::getActor() { - nofralloc -#include "asm/d/msg/d_msg_object/getActor__12dMsgObject_cFv.s" +fopAc_ac_c* dMsgObject_c::getActor() { + if (dMsgObject_getMsgObjectClass() == NULL) { + return NULL; + } + return dMsgObject_getMsgObjectClass()->getActorLocal(); } -#pragma pop /* 802381C0-802381D4 232B00 0014+00 0/0 0/0 3/3 .text getpTalkActor__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm fopAc_ac_c* dMsgObject_c::getpTalkActor() { - nofralloc -#include "asm/d/msg/d_msg_object/getpTalkActor__12dMsgObject_cFv.s" +fopAc_ac_c* dMsgObject_c::getpTalkActor() { + return dMsgObject_getMsgObjectClass()->getpTalkActorLocal(); } -#pragma pop /* 802381D4-802381E8 232B14 0014+00 0/0 0/0 1/1 .text getIdx__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 dMsgObject_c::getIdx() { - nofralloc -#include "asm/d/msg/d_msg_object/getIdx__12dMsgObject_cFv.s" +int dMsgObject_c::getIdx() { + return dMsgObject_getMsgObjectClass()->getIdxLocal(); } -#pragma pop /* 802381E8-802381FC 232B28 0014+00 0/0 0/0 1/1 .text getNodeIdx__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 dMsgObject_c::getNodeIdx() { - nofralloc -#include "asm/d/msg/d_msg_object/getNodeIdx__12dMsgObject_cFv.s" +u16 dMsgObject_c::getNodeIdx() { + return dMsgObject_getMsgObjectClass()->getNodeIdxLocal(); } -#pragma pop /* 802381FC-8023822C 232B3C 0030+00 0/0 1/1 3/3 .text setStatus__12dMsgObject_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setStatus(u16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setStatus__12dMsgObject_cFUs.s" +void dMsgObject_c::setStatus(u16 status) { + dMsgObject_getMsgObjectClass()->setStatusLocal(status); } -#pragma pop /* 8023822C-80238258 232B6C 002C+00 0/0 40/40 22/22 .text getStatus__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 dMsgObject_c::getStatus() { - nofralloc -#include "asm/d/msg/d_msg_object/getStatus__12dMsgObject_cFv.s" +u16 dMsgObject_c::getStatus() { + return dMsgObject_getMsgObjectClass()->getStatusLocal(); } -#pragma pop /* 80238258-8023826C 232B98 0014+00 0/0 1/1 0/0 .text getScrnDrawPtr__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnBase_c* dMsgObject_c::getScrnDrawPtr() { - nofralloc -#include "asm/d/msg/d_msg_object/getScrnDrawPtr__12dMsgObject_cFv.s" +dMsgScrnBase_c* dMsgObject_c::getScrnDrawPtr() { + return dMsgObject_getMsgObjectClass()->getScrnDrawPtrLocal(); } -#pragma pop /* 8023826C-8023829C 232BAC 0030+00 0/0 1/1 0/0 .text setTalkActor__12dMsgObject_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setTalkActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setTalkActor__12dMsgObject_cFP10fopAc_ac_c.s" +void dMsgObject_c::setTalkActor(fopAc_ac_c* actor) { + dMsgObject_getMsgObjectClass()->setTalkActorLocal(actor); } -#pragma pop /* 8023829C-802382C8 232BDC 002C+00 1/1 0/0 0/0 .text onMsgSendControl__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::onMsgSendControl() { - nofralloc -#include "asm/d/msg/d_msg_object/onMsgSendControl__12dMsgObject_cFv.s" +void dMsgObject_c::onMsgSendControl() { + dMsgObject_getMsgObjectClass()->onMsgSendControlLocal(); } -#pragma pop /* 802382C8-802382F4 232C08 002C+00 2/2 2/2 2/2 .text offMsgSendControl__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::offMsgSendControl() { - nofralloc -#include "asm/d/msg/d_msg_object/offMsgSendControl__12dMsgObject_cFv.s" +void dMsgObject_c::offMsgSendControl() { + dMsgObject_getMsgObjectClass()->offMsgSendControlLocal(); } -#pragma pop /* 802382F4-80238320 232C34 002C+00 0/0 3/3 3/3 .text isMsgSendControl__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgObject_c::isMsgSendControl() { - nofralloc -#include "asm/d/msg/d_msg_object/isMsgSendControl__12dMsgObject_cFv.s" +int dMsgObject_c::isMsgSendControl() { + return dMsgObject_getMsgObjectClass()->isMsgSendControlLocal(); } -#pragma pop /* 80238320-8023834C 232C60 002C+00 1/1 2/2 1/1 .text onMsgSend__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::onMsgSend() { - nofralloc -#include "asm/d/msg/d_msg_object/onMsgSend__12dMsgObject_cFv.s" +void dMsgObject_c::onMsgSend() { + dMsgObject_getMsgObjectClass()->onMsgSendLocal(); } -#pragma pop /* 8023834C-80238378 232C8C 002C+00 2/2 0/0 0/0 .text offMsgSend__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::offMsgSend() { - nofralloc -#include "asm/d/msg/d_msg_object/offMsgSend__12dMsgObject_cFv.s" +void dMsgObject_c::offMsgSend() { + dMsgObject_getMsgObjectClass()->offMsgSendLocal(); } -#pragma pop /* 80238378-802383A4 232CB8 002C+00 1/1 0/0 0/0 .text isMsgSend__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::isMsgSend() { - nofralloc -#include "asm/d/msg/d_msg_object/isMsgSend__12dMsgObject_cFv.s" +int dMsgObject_c::isMsgSend() { + return dMsgObject_getMsgObjectClass()->isMsgSendLocal(); } -#pragma pop /* 802383A4-802383D0 232CE4 002C+00 0/0 2/2 6/6 .text isMouthCheck__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgObject_c::isMouthCheck() { - nofralloc -#include "asm/d/msg/d_msg_object/isMouthCheck__12dMsgObject_cFv.s" +bool dMsgObject_c::isMouthCheck() { + return dMsgObject_getMsgObjectClass()->isMouthCheckLocal(); } -#pragma pop /* 802383D0-802383E4 232D10 0014+00 0/0 9/9 0/0 .text getMessageID__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 dMsgObject_c::getMessageID() { - nofralloc -#include "asm/d/msg/d_msg_object/getMessageID__12dMsgObject_cFv.s" +u32 dMsgObject_c::getMessageID() { + return dMsgObject_getMsgObjectClass()->getMessageIDLocal(); } -#pragma pop /* 802383E4-80238410 232D24 002C+00 1/1 1/1 0/0 .text getSmellTypeMessageID__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 dMsgObject_c::getSmellTypeMessageID() { - nofralloc -#include "asm/d/msg/d_msg_object/getSmellTypeMessageID__12dMsgObject_cFv.s" +u16 dMsgObject_c::getSmellTypeMessageID() { + return dMsgObject_getMsgObjectClass()->getSmellTypeMessageIDLocal(); } -#pragma pop /* 80238410-80238440 232D50 0030+00 0/0 1/1 0/0 .text setSmellType__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setSmellType(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setSmellType__12dMsgObject_cFUc.s" +void dMsgObject_c::setSmellType(u8 smellType) { + dMsgObject_getMsgObjectClass()->setSmellTypeLocal(smellType); } -#pragma pop /* 80238440-8023846C 232D80 002C+00 4/4 0/0 7/7 .text getSelectCursorPos__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dMsgObject_c::getSelectCursorPos() { - nofralloc -#include "asm/d/msg/d_msg_object/getSelectCursorPos__12dMsgObject_cFv.s" +u8 dMsgObject_c::getSelectCursorPos() { + return dMsgObject_getMsgObjectClass()->getSelectCursorPosLocal(); } -#pragma pop /* 8023846C-8023849C 232DAC 0030+00 0/0 1/1 0/0 .text setSelectCursorPos__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setSelectCursorPos(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setSelectCursorPos__12dMsgObject_cFUc.s" +void dMsgObject_c::setSelectCursorPos(u8 pos) { + dMsgObject_getMsgObjectClass()->setSelectCursorPosLocal(pos); } -#pragma pop /* 8023849C-802384B0 232DDC 0014+00 0/0 2/2 0/0 .text setPortalMessageID__12dMsgObject_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setPortalMessageID(u16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setPortalMessageID__12dMsgObject_cFUs.s" +void dMsgObject_c::setPortalMessageID(u16 msgID) { + dMsgObject_getMsgObjectClass()->setPortalMessageIDLocal(msgID); } -#pragma pop /* 802384B0-802384C4 232DF0 0014+00 0/0 0/0 1/1 .text setInsectItemNo__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setInsectItemNo(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setInsectItemNo__12dMsgObject_cFUc.s" +void dMsgObject_c::setInsectItemNo(u8 itemNo) { + dMsgObject_getMsgObjectClass()->setInsectItemNoLocal(itemNo); } -#pragma pop /* 802384C4-802384D8 232E04 0014+00 0/0 1/1 0/0 .text setLetterNameID__12dMsgObject_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setLetterNameID(u16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setLetterNameID__12dMsgObject_cFUs.s" +void dMsgObject_c::setLetterNameID(u16 nameID) { + dMsgObject_getMsgObjectClass()->setLetterNameIDLocal(nameID); } -#pragma pop /* 802384D8-802384EC 232E18 0014+00 0/0 1/1 0/0 .text setArrowNum__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setArrowNum(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setArrowNum__12dMsgObject_cFUc.s" +void dMsgObject_c::setArrowNum(u8 arrowNum) { + dMsgObject_getMsgObjectClass()->setArrowNumLocal(arrowNum); } -#pragma pop /* 802384EC-80238500 232E2C 0014+00 1/1 0/0 0/0 .text setMsgOutputType__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setMsgOutputType(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setMsgOutputType__12dMsgObject_cFUc.s" +void dMsgObject_c::setMsgOutputType(u8 outputType) { + dMsgObject_getMsgObjectClass()->setMsgOutputTypeLocal(outputType); } -#pragma pop /* 80238500-80238514 232E40 0014+00 0/0 1/1 0/0 .text getMsgOutputType__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::getMsgOutputType() { - nofralloc -#include "asm/d/msg/d_msg_object/getMsgOutputType__12dMsgObject_cFv.s" +u8 dMsgObject_c::getMsgOutputType() { + return dMsgObject_getMsgObjectClass()->getMsgOutputTypeLocal(); } -#pragma pop /* 80238514-80238528 232E54 0014+00 0/0 5/5 0/0 .text getWord__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm const char* dMsgObject_c::getWord() { - nofralloc -#include "asm/d/msg/d_msg_object/getWord__12dMsgObject_cFv.s" +const char* dMsgObject_c::getWord() { + return dMsgObject_getMsgObjectClass()->getWordLocal(); } -#pragma pop /* 80238528-80238544 232E68 001C+00 0/0 1/1 0/0 .text getSelectWord__12dMsgObject_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::getSelectWord(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/getSelectWord__12dMsgObject_cFi.s" +const char* dMsgObject_c::getSelectWord(int idx) { + return dMsgObject_getMsgObjectClass()->getSelectWordLocal(idx); } -#pragma pop /* 80238544-80238574 232E84 0030+00 0/0 1/1 0/0 .text setSelectWordFlag__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setSelectWordFlag(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setSelectWordFlag__12dMsgObject_cFUc.s" +void dMsgObject_c::setSelectWordFlag(u8 flag) { + dMsgObject_getMsgObjectClass()->setSelectWordFlagLocal(flag); } -#pragma pop /* 80238574-80238588 232EB4 0014+00 0/0 3/3 0/0 .text getSelectWordFlag__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::getSelectWordFlag() { - nofralloc -#include "asm/d/msg/d_msg_object/getSelectWordFlag__12dMsgObject_cFv.s" +u8 dMsgObject_c::getSelectWordFlag() { + return dMsgObject_getMsgObjectClass()->getSelectWordFlagLocal(); } -#pragma pop /* 80238588-802385B4 232EC8 002C+00 0/0 1/1 0/0 .text isHowlHearingMode__12dMsgObject_cFv */ @@ -2029,114 +3323,92 @@ void dMsgObject_c::setSelectCancelPos(u8 pos) { } /* 80238660-802386C8 232FA0 0068+00 1/1 0/0 3/3 .text dMsgObject_getTotalPrice__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 dMsgObject_getTotalPrice() { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_getTotalPrice__Fv.s" +u16 dMsgObject_getTotalPrice() { + u8 high = dComIfGs_getEventReg(0xfeff); + u8 low = dComIfGs_getEventReg(0xfdff); + return (high << 8) | low; } -#pragma pop /* 802386C8-80238730 233008 0068+00 0/0 0/0 2/2 .text dMsgObject_setTotalPrice__FUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_setTotalPrice(u16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_setTotalPrice__FUs.s" +void dMsgObject_setTotalPrice(u16 price) { + dComIfGs_setEventReg(0xfeff, (price & 0xff00) >> 8); + dComIfGs_setEventReg(0xfdff, price & 0xff); } -#pragma pop /* 80238730-802387C4 233070 0094+00 0/0 0/0 4/4 .text dMsgObject_addTotalPrice__Fs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_addTotalPrice(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_addTotalPrice__Fs.s" +void dMsgObject_addTotalPrice(s16 price) { + dMsgObject_getMsgObjectClass()->addNowTotalPrice(price); + price += dMsgObject_getTotalPrice(); + if (price < 0) { + price = 0; + } + dComIfGs_setEventReg(0xfeff, ((u16)price & 0xff00) >> 8); + dComIfGs_setEventReg(0xfdff, (u16)price & 0xff); } -#pragma pop /* 802387C4-8023882C 233104 0068+00 1/1 0/0 4/4 .text dMsgObject_getTotalPayment__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 dMsgObject_getTotalPayment() { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_getTotalPayment__Fv.s" +u16 dMsgObject_getTotalPayment() { + u8 high = dComIfGs_getEventReg(0xfcff); + u8 low = dComIfGs_getEventReg(0xfbff); + return (high << 8) | low; } -#pragma pop /* 8023882C-80238894 23316C 0068+00 0/0 0/0 2/2 .text dMsgObject_setTotalPayment__FUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_setTotalPayment(u16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_setTotalPayment__FUs.s" +void dMsgObject_setTotalPayment(u16 price) { + dComIfGs_setEventReg(0xfcff, (price & 0xff00) >> 8); + dComIfGs_setEventReg(0xfbff, price & 0xff); } -#pragma pop /* 80238894-80238928 2331D4 0094+00 1/1 0/0 0/0 .text dMsgObject_addTotalPayment__Fs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMsgObject_addTotalPayment(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_addTotalPayment__Fs.s" +void dMsgObject_addTotalPayment(s16 price) { + dMsgObject_getMsgObjectClass()->addNowTotalPayment(price); + price += dMsgObject_getTotalPayment(); + if (price < 0) { + price = 0; + } + dComIfGs_setEventReg(0xfcff, ((u16)price & 0xff00) >> 8); + dComIfGs_setEventReg(0xfbff, (u16)price & 0xff); } -#pragma pop /* 80238928-80238990 233268 0068+00 2/2 4/4 0/0 .text dMsgObject_getFundRaising__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 dMsgObject_getFundRaising() { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_getFundRaising__Fv.s" +u16 dMsgObject_getFundRaising() { + u8 high = dComIfGs_getEventReg(0xf9ff); + u8 low = dComIfGs_getEventReg(0xfaff); + return (high << 8) | low; } -#pragma pop /* 80238990-802389F8 2332D0 0068+00 1/1 1/1 0/0 .text dMsgObject_setFundRaising__FUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_setFundRaising(u16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_setFundRaising__FUs.s" +void dMsgObject_setFundRaising(u16 price) { + dComIfGs_setEventReg(0xf9ff, (price & 0xff00) >> 8); + dComIfGs_setEventReg(0xfaff, price & 0xff); } -#pragma pop /* 802389F8-80238A74 233338 007C+00 1/1 0/0 0/0 .text dMsgObject_addFundRaising__Fs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMsgObject_addFundRaising(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_addFundRaising__Fs.s" +void dMsgObject_addFundRaising(s16 price) { + price += dMsgObject_getFundRaising(); + if (price < 0) { + price = 0; + } + dComIfGs_setEventReg(0xf9ff, ((u16)price & 0xff00) >> 8); + dComIfGs_setEventReg(0xfaff, (u16)price & 0xff); } -#pragma pop /* 80238A74-80238ADC 2333B4 0068+00 1/1 1/1 0/0 .text dMsgObject_getOffering__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 dMsgObject_getOffering() { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_getOffering__Fv.s" +u16 dMsgObject_getOffering() { + u8 high = dComIfGs_getEventReg(0xf7ff); + u8 low = dComIfGs_getEventReg(0xf8ff); + return (high << 8) | low; } -#pragma pop /* 80238ADC-80238B58 23341C 007C+00 0/0 1/1 0/0 .text dMsgObject_addOffering__Fs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_addOffering(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_addOffering__Fs.s" +void dMsgObject_addOffering(s16 price) { + s16 offering = price + dMsgObject_getOffering(); + if (offering < 0) { + offering = 0; + } + dComIfGs_setEventReg(0xf7ff, ((u16)offering & 0xff00) >> 8); + dComIfGs_setEventReg(0xf8ff, (u16)offering & 0xff); } -#pragma pop /* 80238B58-80238B94 233498 003C+00 0/0 1/0 0/0 .text __sinit_d_msg_object_cpp */ #pragma push diff --git a/src/d/msg/d_msg_scrn_item.cpp b/src/d/msg/d_msg_scrn_item.cpp index 76cd07ace07..db6dc629257 100644 --- a/src/d/msg/d_msg_scrn_item.cpp +++ b/src/d/msg/d_msg_scrn_item.cpp @@ -4,69 +4,16 @@ // #include "d/msg/d_msg_scrn_item.h" +#include "d/msg/d_msg_scrn_light.h" +#include "d/msg/d_msg_scrn_arrow.h" #include "dol2asm.h" // // Types: // -struct dMsgScrnLight_c { - /* 80245934 */ dMsgScrnLight_c(u8, u8); - /* 80245C04 */ void draw(f32*, f32, f32, f32, f32, f32, u8); -}; - -struct J2DAnmColor {}; - -struct J2DAnmTextureSRTKey {}; - struct JKRExpHeap {}; -struct dMsgScrnItem_c { - /* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*); - /* 8023F51C */ ~dMsgScrnItem_c(); - /* 8023F888 */ void exec(); - /* 8023FB24 */ void drawSelf(); - /* 8023FF30 */ void arwAnimeInit(); - /* 8023FF54 */ void arwAnimeMove(); - /* 8023FF78 */ void dotAnimeInit(); - /* 8023FF9C */ void dotAnimeMove(); - /* 8023FFC0 */ void setSelectString(char*, char*, char*); - /* 8023FFE4 */ void setSelectRubyString(char*, char*, char*); - /* 80240008 */ void isSelect(); - /* 8024002C */ void selectAnimeInit(u8, u8, f32, u8); - /* 8024005C */ void selectAnimeMove(u8, u8, bool); - /* 80240080 */ void selectAnimeEnd(); - /* 802400A4 */ void fukiScale(f32); - /* 802400A8 */ void fukiTrans(f32, f32); - /* 802400CC */ void fukiAlpha(f32); - /* 80240174 */ void fukiPosCalc(u8); - /* 8024074C */ void setBtk0Animation(J2DAnmTextureSRTKey*); - /* 802407E8 */ void setBpk0Animation(J2DAnmColor*); - /* 80240844 */ void setBpk1Animation(J2DAnmColor*); - /* 802408A4 */ void isOugiID(); -}; - -struct dMsgScrnBase_c { - /* 8023C0DC */ dMsgScrnBase_c(); - /* 8023C124 */ ~dMsgScrnBase_c(); - /* 8023C16C */ void init(); - /* 8023C234 */ void multiDraw(); - /* 8023C274 */ void draw(); - /* 8023C32C */ void drawOutFont(f32, f32, f32); - /* 8023C4F4 */ void fontAlpha(f32); - /* 8023C574 */ void isTalkNow(); -}; - -struct dMsgScrnArrow_c { - /* 8023B9B4 */ dMsgScrnArrow_c(); - /* 8023BDC0 */ void draw(); - /* 8023BDF8 */ void setPos(f32, f32); - /* 8023BE34 */ void arwAnimeInit(); - /* 8023BE90 */ void arwAnimeMove(); - /* 8023BFC4 */ void dotAnimeInit(); - /* 8023C010 */ void dotAnimeMove(); -}; - struct dMsgScrn3Select_c { /* 802390B4 */ dMsgScrn3Select_c(); /* 80239C64 */ void isSelect(); @@ -93,10 +40,6 @@ struct dMsgObject_c { struct ResTIMG {}; -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); -}; - struct dMeter2Info_c { /* 8021CF08 */ void readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*, J2DPicture*, void*, J2DPicture*, int); @@ -107,17 +50,6 @@ struct dItem_data { static void* item_resource[1530]; }; -struct Vec {}; - -struct cXyz { - /* 8026702C */ bool operator==(Vec const&) const; -}; - -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); -}; - struct JKRFileLoader { /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); }; @@ -135,13 +67,6 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; -struct J2DBasePosition {}; - -struct J2DPane { - /* 802F7100 */ void getBounds(); - /* 802F76F8 */ void setBasePosition(J2DBasePosition); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; @@ -192,7 +117,6 @@ extern "C" extern char const* const msg_scrn_d_msg_scrn_item__stringBase0; // External References: // -SECTION_INIT void memset(); extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void mDoLib_project__FP3VecP3Vec(); extern "C" void dComIfGp_getSubHeap2D__Fi(); @@ -461,7 +385,7 @@ asm void dMsgScrnItem_c::setSelectRubyString(char* param_0, char* param_1, char* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgScrnItem_c::isSelect() { +asm bool dMsgScrnItem_c::isSelect() { nofralloc #include "asm/msg/scrn/d_msg_scrn_item/isSelect__14dMsgScrnItem_cFv.s" } @@ -481,7 +405,7 @@ asm void dMsgScrnItem_c::selectAnimeInit(u8 param_0, u8 param_1, f32 param_2, u8 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgScrnItem_c::selectAnimeMove(u8 param_0, u8 param_1, bool param_2) { +asm bool dMsgScrnItem_c::selectAnimeMove(u8 param_0, u8 param_1, bool param_2) { nofralloc #include "asm/msg/scrn/d_msg_scrn_item/selectAnimeMove__14dMsgScrnItem_cFUcUcb.s" } @@ -492,7 +416,7 @@ asm void dMsgScrnItem_c::selectAnimeMove(u8 param_0, u8 param_1, bool param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgScrnItem_c::selectAnimeEnd() { +asm bool dMsgScrnItem_c::selectAnimeEnd() { nofralloc #include "asm/msg/scrn/d_msg_scrn_item/selectAnimeEnd__14dMsgScrnItem_cFv.s" } diff --git a/src/d/msg/d_msg_scrn_talk.cpp b/src/d/msg/d_msg_scrn_talk.cpp index 54afb485c0d..9e53bbebc0f 100644 --- a/src/d/msg/d_msg_scrn_talk.cpp +++ b/src/d/msg/d_msg_scrn_talk.cpp @@ -12,43 +12,11 @@ struct JKRExpHeap {}; -struct dMsgScrnTalk_c { - /* 80246FF0 */ dMsgScrnTalk_c(u8, u8, JKRExpHeap*); - /* 80247A90 */ ~dMsgScrnTalk_c(); - /* 80247D34 */ void exec(); - /* 80247E4C */ void drawSelf(); - /* 802480F0 */ void arwAnimeInit(); - /* 80248114 */ void arwAnimeMove(); - /* 80248138 */ void dotAnimeInit(); - /* 8024815C */ void dotAnimeMove(); - /* 80248180 */ void setSelectString(char*, char*, char*); - /* 802481AC */ void setSelectRubyString(char*, char*, char*); - /* 802481D8 */ void isSelect(); - /* 8024820C */ void selectAnimeInit(u8, u8, f32, u8); - /* 80248244 */ void selectAnimeMove(u8, u8, bool); - /* 80248278 */ void selectAnimeEnd(); - /* 802482AC */ void fukiScale(f32); - /* 802482B0 */ void fukiTrans(f32, f32); - /* 802482B4 */ void fukiAlpha(f32); - /* 8024835C */ void fukiPosCalc(u8); -}; - struct dMsgScrnLight_c { /* 80245934 */ dMsgScrnLight_c(u8, u8); /* 80245C04 */ void draw(f32*, f32, f32, f32, f32, f32, u8); }; -struct dMsgScrnBase_c { - /* 8023C0DC */ dMsgScrnBase_c(); - /* 8023C124 */ ~dMsgScrnBase_c(); - /* 8023C16C */ void init(); - /* 8023C234 */ void multiDraw(); - /* 8023C274 */ void draw(); - /* 8023C32C */ void drawOutFont(f32, f32, f32); - /* 8023C4F4 */ void fontAlpha(f32); - /* 8023C574 */ void isTalkNow(); -}; - struct dMsgScrnArrow_c { /* 8023B9B4 */ dMsgScrnArrow_c(); /* 8023BDC0 */ void draw(); @@ -82,32 +50,13 @@ struct dMsgObject_c { /* 8023819C */ void getActor(); }; -struct JUtility { - struct TColor {}; -}; - struct dMeter2Draw_c { /* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor, f32, u8); }; -struct Vec {}; - -struct cXyz { - /* 8026702C */ bool operator==(Vec const&) const; -}; - -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); -}; - struct JKRArchive {}; -struct J2DTextBox { - /* 8030074C */ void setString(s16, char const*, ...); -}; - struct J2DGrafContext {}; struct J2DScreen { @@ -116,10 +65,6 @@ struct J2DScreen { /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); }; -struct J2DPane { - /* 802F7100 */ void getBounds(); -}; - struct CPaneMgrAlpha { /* 802557D0 */ void setAlphaRate(f32); /* 80255828 */ void getAlphaRate(); @@ -162,7 +107,6 @@ extern "C" extern char const* const msg_scrn_d_msg_scrn_talk__stringBase0; // External References: // -SECTION_INIT void memset(); extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void mDoLib_project__FP3VecP3Vec(); extern "C" void dComIfGp_getSubHeap2D__Fi(); @@ -410,7 +354,7 @@ asm void dMsgScrnTalk_c::setSelectRubyString(char* param_0, char* param_1, char* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgScrnTalk_c::isSelect() { +asm bool dMsgScrnTalk_c::isSelect() { nofralloc #include "asm/msg/scrn/d_msg_scrn_talk/isSelect__14dMsgScrnTalk_cFv.s" } @@ -430,7 +374,7 @@ asm void dMsgScrnTalk_c::selectAnimeInit(u8 param_0, u8 param_1, f32 param_2, u8 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgScrnTalk_c::selectAnimeMove(u8 param_0, u8 param_1, bool param_2) { +asm bool dMsgScrnTalk_c::selectAnimeMove(u8 param_0, u8 param_1, bool param_2) { nofralloc #include "asm/msg/scrn/d_msg_scrn_talk/selectAnimeMove__14dMsgScrnTalk_cFUcUcb.s" } @@ -441,7 +385,7 @@ asm void dMsgScrnTalk_c::selectAnimeMove(u8 param_0, u8 param_1, bool param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgScrnTalk_c::selectAnimeEnd() { +asm bool dMsgScrnTalk_c::selectAnimeEnd() { nofralloc #include "asm/msg/scrn/d_msg_scrn_talk/selectAnimeEnd__14dMsgScrnTalk_cFv.s" } diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp index 7c43b8d2a15..9da653191c3 100644 --- a/src/d/msg/d_msg_string_base.cpp +++ b/src/d/msg/d_msg_string_base.cpp @@ -1,90 +1,14 @@ // -// Generated By: dol2asm -// Translation Unit: d/msg/d_msg_string_base +// d_msg_string_base // #include "d/msg/d_msg_string_base.h" #include "d/msg/d_msg_class.h" #include "d/com/d_com_inf_game.h" #include "d/meter/d_meter2_info.h" -#include "dol2asm.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/J2DGraph/J2DTextBox.h" -// -// Forward References: -// - -extern "C" void __ct__16dMsgStringBase_cFv(); -extern "C" void __dt__16dMsgStringBase_cFv(); -extern "C" void getResource__16dMsgStringBase_cFv(); -extern "C" void -getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc(); -extern "C" void -getStringPageLocal__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc(); -extern "C" void getPageMax__16dMsgStringBase_cFi(); -extern "C" void getMessageLocal__16dMsgStringBase_cFUlPc(); -extern "C" void drawFontLocal__16dMsgStringBase_cFP10J2DTextBoxUcffffUlUc(); -extern "C" void -getString__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc(); -extern "C" void -getStringPage__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc(); -extern "C" void getMessage__16dMsgStringBase_cFUlPc(); -extern "C" void resetStringLocal__16dMsgStringBase_cFP10J2DTextBox(); -extern "C" void drawOutFontLocal__16dMsgStringBase_cFP10J2DTextBoxf(); -extern "C" extern char const* const d_msg_d_msg_string_base__stringBase0; - -// -// External References: -// - -extern "C" void __ct__26jmessage_string_tReferenceFv(); -extern "C" void -init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc(); -extern "C" void getLineLength__26jmessage_string_tReferenceFi(); -extern "C" void __ct__24jmessage_string_tControlFv(); -extern "C" void -__ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl(); -extern "C" void __ct__35jmessage_string_tRenderingProcessorFPC26jmessage_string_tReference(); -extern "C" void reset__Q28JMessage8TControlFv(); -extern "C" void update__Q28JMessage8TControlFv(); -extern "C" void render__Q28JMessage8TControlFv(); -extern "C" void setMessageID__Q28JMessage8TControlFUlUlPb(); -extern "C" void __dt__Q38JMessage18TResourceContainer10TCResourceFv(); -extern "C" void __ct__Q28JMessage18TResourceContainerFv(); -extern "C" void __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive(); -extern "C" void parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl(); -extern "C" void erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iterator(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C1478-803C1498 01E598 0020+00 2/2 0/0 0/0 .data __vt__16dMsgStringBase_c */ -SECTION_DATA extern void* __vt__16dMsgStringBase_c[8] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)getString__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc, - (void*) - getStringPage__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc, - (void*)getMessage__16dMsgStringBase_cFUlPc, - (void*)resetStringLocal__16dMsgStringBase_cFP10J2DTextBox, - (void*)drawOutFontLocal__16dMsgStringBase_cFP10J2DTextBoxf, - (void*)drawFontLocal__16dMsgStringBase_cFP10J2DTextBoxUcffffUlUc, -}; - /* 802493B4-80249528 243CF4 0174+00 0/0 2/2 0/0 .text __ct__16dMsgStringBase_cFv */ dMsgStringBase_c::dMsgStringBase_c() { field_0x20 = 0; @@ -110,8 +34,6 @@ dMsgStringBase_c::dMsgStringBase_c() { } /* 80249528-80249700 243E68 01D8+00 0/0 1/1 0/0 .text __dt__16dMsgStringBase_cFv */ -// linklist begin/front/pop_front iterator stack -#ifdef NONMATCHING dMsgStringBase_c::~dMsgStringBase_c() { mpResCont->destroyResource_all(); delete mpResCont; @@ -132,16 +54,6 @@ dMsgStringBase_c::~dMsgStringBase_c() { dComIfGp_getMsgDtArchive(0)->removeResourceAll(); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgStringBase_c::~dMsgStringBase_c() { - nofralloc -#include "asm/d/msg/d_msg_string_base/__dt__16dMsgStringBase_cFv.s" -} -#pragma pop -#endif /* 80249700-80249768 244040 0068+00 1/1 2/2 0/0 .text getResource__16dMsgStringBase_cFv */ @@ -251,7 +163,6 @@ f32 dMsgStringBase_c::getMessageLocal(u32 param_1, char* param_2) { * drawFontLocal__16dMsgStringBase_cFP10J2DTextBoxUcffffUlUc */ void dMsgStringBase_c::drawFontLocal(J2DTextBox* param_0, u8 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5, u32 param_6, u8 param_7) { - /* empty function */ } /* 80249BB0-80249BD0 2444F0 0020+00 1/0 0/0 0/0 .text @@ -278,24 +189,15 @@ f32 dMsgStringBase_c::getMessage(u32 param_0, char* param_1) { /* 80249C18-80249C1C 244558 0004+00 1/0 0/0 0/0 .text * resetStringLocal__16dMsgStringBase_cFP10J2DTextBox */ void dMsgStringBase_c::resetStringLocal(J2DTextBox* param_0) { - /* empty function */ } /* 80249C1C-80249C20 24455C 0004+00 1/0 0/0 0/0 .text * drawOutFontLocal__16dMsgStringBase_cFP10J2DTextBoxf */ void dMsgStringBase_c::drawOutFontLocal(J2DTextBox* param_0, f32 param_1) { - /* empty function */ } /* ############################################################################################## */ /* 80399CA3-80399CB0 026303 0008+05 0/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399CA3 = "" - "\x1B" - "CR[%d]"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399CAB = "\0\0\0\0"; -#pragma pop +static char const* const stringBase_80399CA3 = "\x1B" "CR[%d]"; /* 80399C98-80399C98 0262F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */