diff --git a/asm/d/a/d_a_itembase/CreateItemHeap__12daItemBase_cFPCcsssssss.s b/asm/d/a/d_a_itembase/CreateItemHeap__12daItemBase_cFPCcsssssss.s deleted file mode 100644 index 9b6688d4f5..0000000000 --- a/asm/d/a/d_a_itembase/CreateItemHeap__12daItemBase_cFPCcsssssss.s +++ /dev/null @@ -1,294 +0,0 @@ -lbl_8014475C: -/* 8014475C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80144760 7C 08 02 A6 */ mflr r0 -/* 80144764 90 01 00 44 */ stw r0, 0x44(r1) -/* 80144768 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014476C 48 21 DA 51 */ bl _savegpr_21 -/* 80144770 7C 7F 1B 78 */ mr r31, r3 -/* 80144774 7C 9E 23 78 */ mr r30, r4 -/* 80144778 7C D7 33 78 */ mr r23, r6 -/* 8014477C 7C F8 3B 78 */ mr r24, r7 -/* 80144780 7D 19 43 78 */ mr r25, r8 -/* 80144784 7D 5A 53 78 */ mr r26, r10 -/* 80144788 AB 61 00 4A */ lha r27, 0x4a(r1) -/* 8014478C 7F C3 F3 78 */ mr r3, r30 -/* 80144790 7C A4 07 34 */ extsh r4, r5 -/* 80144794 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80144798 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014479C 3F 85 00 02 */ addis r28, r5, 2 -/* 801447A0 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 801447A4 7F 85 E3 78 */ mr r5, r28 -/* 801447A8 38 C0 00 80 */ li r6, 0x80 -/* 801447AC 4B EF 7B 41 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 801447B0 7C 7D 1B 78 */ mr r29, r3 -/* 801447B4 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000084@ha */ -/* 801447B8 3A C3 00 84 */ addi r22, r3, 0x0084 /* 0x11000084@l */ -/* 801447BC 3E A0 00 08 */ lis r21, 8 -/* 801447C0 7E E0 07 35 */ extsh. r0, r23 -/* 801447C4 40 81 00 08 */ ble lbl_801447CC -/* 801447C8 62 D6 02 00 */ ori r22, r22, 0x200 -lbl_801447CC: -/* 801447CC 7F 00 07 35 */ extsh. r0, r24 -/* 801447D0 40 81 00 08 */ ble lbl_801447D8 -/* 801447D4 62 D6 00 01 */ ori r22, r22, 1 -lbl_801447D8: -/* 801447D8 7F 60 07 35 */ extsh. r0, r27 -/* 801447DC 40 81 00 08 */ ble lbl_801447E4 -/* 801447E0 66 D6 00 02 */ oris r22, r22, 2 -lbl_801447E4: -/* 801447E4 7F E3 FB 78 */ mr r3, r31 -/* 801447E8 38 80 00 04 */ li r4, 4 -/* 801447EC 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 801447F0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801447F4 7D 89 03 A6 */ mtctr r12 -/* 801447F8 4E 80 04 21 */ bctrl -/* 801447FC 2C 03 00 00 */ cmpwi r3, 0 -/* 80144800 41 82 00 08 */ beq lbl_80144808 -/* 80144804 3A A0 00 00 */ li r21, 0 -lbl_80144808: -/* 80144808 7F A3 EB 78 */ mr r3, r29 -/* 8014480C 7E A4 AB 78 */ mr r4, r21 -/* 80144810 7E C5 B3 78 */ mr r5, r22 -/* 80144814 4B ED 04 41 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80144818 90 7F 05 74 */ stw r3, 0x574(r31) -/* 8014481C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 80144820 28 00 00 00 */ cmplwi r0, 0 -/* 80144824 40 82 00 0C */ bne lbl_80144830 -/* 80144828 38 60 00 00 */ li r3, 0 -/* 8014482C 48 00 03 50 */ b lbl_80144B7C -lbl_80144830: -/* 80144830 38 00 00 00 */ li r0, 0 -/* 80144834 90 1F 05 78 */ stw r0, 0x578(r31) -/* 80144838 7E E0 07 35 */ extsh. r0, r23 -/* 8014483C 40 81 00 88 */ ble lbl_801448C4 -/* 80144840 7F C3 F3 78 */ mr r3, r30 -/* 80144844 7E E4 07 34 */ extsh r4, r23 -/* 80144848 7F 85 E3 78 */ mr r5, r28 -/* 8014484C 38 C0 00 80 */ li r6, 0x80 -/* 80144850 4B EF 7A 9D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80144854 7C 75 1B 78 */ mr r21, r3 -/* 80144858 38 60 00 18 */ li r3, 0x18 -/* 8014485C 48 18 A3 F1 */ bl __nw__FUl -/* 80144860 7C 77 1B 79 */ or. r23, r3, r3 -/* 80144864 41 82 00 20 */ beq lbl_80144884 -/* 80144868 3C 80 80 3A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 8014486C 38 04 33 54 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80144870 90 17 00 00 */ stw r0, 0(r23) -/* 80144874 38 80 00 00 */ li r4, 0 -/* 80144878 48 1E 3B 85 */ bl init__12J3DFrameCtrlFs -/* 8014487C 38 00 00 00 */ li r0, 0 -/* 80144880 90 17 00 14 */ stw r0, 0x14(r23) -lbl_80144884: -/* 80144884 92 FF 05 78 */ stw r23, 0x578(r31) -/* 80144888 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 8014488C 28 03 00 00 */ cmplwi r3, 0 -/* 80144890 41 82 00 2C */ beq lbl_801448BC -/* 80144894 38 9D 00 58 */ addi r4, r29, 0x58 -/* 80144898 7E A5 AB 78 */ mr r5, r21 -/* 8014489C 38 C0 00 01 */ li r6, 1 -/* 801448A0 38 E0 00 02 */ li r7, 2 -/* 801448A4 C0 22 99 A8 */ lfs f1, lit_3881(r2) -/* 801448A8 39 00 00 00 */ li r8, 0 -/* 801448AC 39 20 FF FF */ li r9, -1 -/* 801448B0 4B EC 8D 8D */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 801448B4 2C 03 00 00 */ cmpwi r3, 0 -/* 801448B8 40 82 00 0C */ bne lbl_801448C4 -lbl_801448BC: -/* 801448BC 38 60 00 00 */ li r3, 0 -/* 801448C0 48 00 02 BC */ b lbl_80144B7C -lbl_801448C4: -/* 801448C4 38 00 00 00 */ li r0, 0 -/* 801448C8 90 1F 05 7C */ stw r0, 0x57c(r31) -/* 801448CC 7F 00 07 35 */ extsh. r0, r24 -/* 801448D0 40 81 00 88 */ ble lbl_80144958 -/* 801448D4 7F C3 F3 78 */ mr r3, r30 -/* 801448D8 7F 04 07 34 */ extsh r4, r24 -/* 801448DC 7F 85 E3 78 */ mr r5, r28 -/* 801448E0 38 C0 00 80 */ li r6, 0x80 -/* 801448E4 4B EF 7A 09 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 801448E8 7C 75 1B 78 */ mr r21, r3 -/* 801448EC 38 60 00 18 */ li r3, 0x18 -/* 801448F0 48 18 A3 5D */ bl __nw__FUl -/* 801448F4 7C 77 1B 79 */ or. r23, r3, r3 -/* 801448F8 41 82 00 20 */ beq lbl_80144918 -/* 801448FC 3C 80 80 3A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80144900 38 04 33 54 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80144904 90 17 00 00 */ stw r0, 0(r23) -/* 80144908 38 80 00 00 */ li r4, 0 -/* 8014490C 48 1E 3A F1 */ bl init__12J3DFrameCtrlFs -/* 80144910 38 00 00 00 */ li r0, 0 -/* 80144914 90 17 00 14 */ stw r0, 0x14(r23) -lbl_80144918: -/* 80144918 92 FF 05 7C */ stw r23, 0x57c(r31) -/* 8014491C 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80144920 28 03 00 00 */ cmplwi r3, 0 -/* 80144924 41 82 00 2C */ beq lbl_80144950 -/* 80144928 38 9D 00 58 */ addi r4, r29, 0x58 -/* 8014492C 7E A5 AB 78 */ mr r5, r21 -/* 80144930 38 C0 00 01 */ li r6, 1 -/* 80144934 38 E0 00 02 */ li r7, 2 -/* 80144938 C0 22 99 A8 */ lfs f1, lit_3881(r2) -/* 8014493C 39 00 00 00 */ li r8, 0 -/* 80144940 39 20 FF FF */ li r9, -1 -/* 80144944 4B EC 8B 39 */ bl init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss -/* 80144948 2C 03 00 00 */ cmpwi r3, 0 -/* 8014494C 40 82 00 0C */ bne lbl_80144958 -lbl_80144950: -/* 80144950 38 60 00 00 */ li r3, 0 -/* 80144954 48 00 02 28 */ b lbl_80144B7C -lbl_80144958: -/* 80144958 38 00 00 00 */ li r0, 0 -/* 8014495C 90 1F 05 84 */ stw r0, 0x584(r31) -/* 80144960 7F 20 07 35 */ extsh. r0, r25 -/* 80144964 40 81 00 88 */ ble lbl_801449EC -/* 80144968 7F C3 F3 78 */ mr r3, r30 -/* 8014496C 7F 24 07 34 */ extsh r4, r25 -/* 80144970 7F 85 E3 78 */ mr r5, r28 -/* 80144974 38 C0 00 80 */ li r6, 0x80 -/* 80144978 4B EF 79 75 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8014497C 7C 75 1B 78 */ mr r21, r3 -/* 80144980 38 60 00 1C */ li r3, 0x1c -/* 80144984 48 18 A2 C9 */ bl __nw__FUl -/* 80144988 7C 77 1B 79 */ or. r23, r3, r3 -/* 8014498C 41 82 00 20 */ beq lbl_801449AC -/* 80144990 3C 80 80 3A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80144994 38 04 33 54 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80144998 90 17 00 00 */ stw r0, 0(r23) -/* 8014499C 38 80 00 00 */ li r4, 0 -/* 801449A0 48 1E 3A 5D */ bl init__12J3DFrameCtrlFs -/* 801449A4 38 00 00 00 */ li r0, 0 -/* 801449A8 90 17 00 18 */ stw r0, 0x18(r23) -lbl_801449AC: -/* 801449AC 92 FF 05 84 */ stw r23, 0x584(r31) -/* 801449B0 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 801449B4 28 03 00 00 */ cmplwi r3, 0 -/* 801449B8 41 82 00 2C */ beq lbl_801449E4 -/* 801449BC 7E A4 AB 78 */ mr r4, r21 -/* 801449C0 38 A0 00 01 */ li r5, 1 -/* 801449C4 38 C0 00 02 */ li r6, 2 -/* 801449C8 C0 22 99 A8 */ lfs f1, lit_3881(r2) -/* 801449CC 38 E0 00 00 */ li r7, 0 -/* 801449D0 39 00 FF FF */ li r8, -1 -/* 801449D4 39 20 00 00 */ li r9, 0 -/* 801449D8 4B EC 8E 05 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 801449DC 2C 03 00 00 */ cmpwi r3, 0 -/* 801449E0 40 82 00 0C */ bne lbl_801449EC -lbl_801449E4: -/* 801449E4 38 60 00 00 */ li r3, 0 -/* 801449E8 48 00 01 94 */ b lbl_80144B7C -lbl_801449EC: -/* 801449EC 38 00 00 00 */ li r0, 0 -/* 801449F0 90 1F 05 80 */ stw r0, 0x580(r31) -/* 801449F4 7F 40 07 35 */ extsh. r0, r26 -/* 801449F8 40 81 00 B0 */ ble lbl_80144AA8 -/* 801449FC 7F C3 F3 78 */ mr r3, r30 -/* 80144A00 7F 44 07 34 */ extsh r4, r26 -/* 80144A04 7F 85 E3 78 */ mr r5, r28 -/* 80144A08 38 C0 00 80 */ li r6, 0x80 -/* 80144A0C 4B EF 78 E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80144A10 7C 75 1B 78 */ mr r21, r3 -/* 80144A14 7F E3 FB 78 */ mr r3, r31 -/* 80144A18 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144A1C 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80144A20 7D 89 03 A6 */ mtctr r12 -/* 80144A24 4E 80 04 21 */ bctrl -/* 80144A28 3A C0 00 01 */ li r22, 1 -/* 80144A2C 7C 60 07 74 */ extsb r0, r3 -/* 80144A30 2C 00 FF FF */ cmpwi r0, -1 -/* 80144A34 41 82 00 08 */ beq lbl_80144A3C -/* 80144A38 3A C0 00 00 */ li r22, 0 -lbl_80144A3C: -/* 80144A3C 38 60 00 18 */ li r3, 0x18 -/* 80144A40 48 18 A2 0D */ bl __nw__FUl -/* 80144A44 7C 77 1B 79 */ or. r23, r3, r3 -/* 80144A48 41 82 00 20 */ beq lbl_80144A68 -/* 80144A4C 3C 80 80 3A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80144A50 38 04 33 54 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80144A54 90 17 00 00 */ stw r0, 0(r23) -/* 80144A58 38 80 00 00 */ li r4, 0 -/* 80144A5C 48 1E 39 A1 */ bl init__12J3DFrameCtrlFs -/* 80144A60 38 00 00 00 */ li r0, 0 -/* 80144A64 90 17 00 14 */ stw r0, 0x14(r23) -lbl_80144A68: -/* 80144A68 92 FF 05 80 */ stw r23, 0x580(r31) -/* 80144A6C 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80144A70 28 03 00 00 */ cmplwi r3, 0 -/* 80144A74 41 82 00 2C */ beq lbl_80144AA0 -/* 80144A78 38 9D 00 58 */ addi r4, r29, 0x58 -/* 80144A7C 7E A5 AB 78 */ mr r5, r21 -/* 80144A80 7E C6 B3 78 */ mr r6, r22 -/* 80144A84 38 E0 00 02 */ li r7, 2 -/* 80144A88 C0 22 99 A8 */ lfs f1, lit_3881(r2) -/* 80144A8C 39 00 00 00 */ li r8, 0 -/* 80144A90 39 20 FF FF */ li r9, -1 -/* 80144A94 4B EC 8C 79 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80144A98 2C 03 00 00 */ cmpwi r3, 0 -/* 80144A9C 40 82 00 0C */ bne lbl_80144AA8 -lbl_80144AA0: -/* 80144AA0 38 60 00 00 */ li r3, 0 -/* 80144AA4 48 00 00 D8 */ b lbl_80144B7C -lbl_80144AA8: -/* 80144AA8 38 00 00 00 */ li r0, 0 -/* 80144AAC 90 1F 05 88 */ stw r0, 0x588(r31) -/* 80144AB0 7F 60 07 35 */ extsh. r0, r27 -/* 80144AB4 40 81 00 88 */ ble lbl_80144B3C -/* 80144AB8 7F C3 F3 78 */ mr r3, r30 -/* 80144ABC 7F 64 DB 78 */ mr r4, r27 -/* 80144AC0 7F 85 E3 78 */ mr r5, r28 -/* 80144AC4 38 C0 00 80 */ li r6, 0x80 -/* 80144AC8 4B EF 78 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80144ACC 7C 75 1B 78 */ mr r21, r3 -/* 80144AD0 38 60 00 18 */ li r3, 0x18 -/* 80144AD4 48 18 A1 79 */ bl __nw__FUl -/* 80144AD8 7C 77 1B 79 */ or. r23, r3, r3 -/* 80144ADC 41 82 00 20 */ beq lbl_80144AFC -/* 80144AE0 3C 80 80 3A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80144AE4 38 04 33 54 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80144AE8 90 17 00 00 */ stw r0, 0(r23) -/* 80144AEC 38 80 00 00 */ li r4, 0 -/* 80144AF0 48 1E 39 0D */ bl init__12J3DFrameCtrlFs -/* 80144AF4 38 00 00 00 */ li r0, 0 -/* 80144AF8 90 17 00 14 */ stw r0, 0x14(r23) -lbl_80144AFC: -/* 80144AFC 92 FF 05 88 */ stw r23, 0x588(r31) -/* 80144B00 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80144B04 28 03 00 00 */ cmplwi r3, 0 -/* 80144B08 41 82 00 2C */ beq lbl_80144B34 -/* 80144B0C 38 9D 00 58 */ addi r4, r29, 0x58 -/* 80144B10 7E A5 AB 78 */ mr r5, r21 -/* 80144B14 38 C0 00 01 */ li r6, 1 -/* 80144B18 38 E0 00 02 */ li r7, 2 -/* 80144B1C C0 22 99 A8 */ lfs f1, lit_3881(r2) -/* 80144B20 39 00 00 00 */ li r8, 0 -/* 80144B24 39 20 FF FF */ li r9, -1 -/* 80144B28 4B EC 8A 25 */ bl init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss -/* 80144B2C 2C 03 00 00 */ cmpwi r3, 0 -/* 80144B30 40 82 00 0C */ bne lbl_80144B3C -lbl_80144B34: -/* 80144B34 38 60 00 00 */ li r3, 0 -/* 80144B38 48 00 00 44 */ b lbl_80144B7C -lbl_80144B3C: -/* 80144B3C 7F E3 FB 78 */ mr r3, r31 -/* 80144B40 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144B44 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80144B48 7D 89 03 A6 */ mtctr r12 -/* 80144B4C 4E 80 04 21 */ bctrl -/* 80144B50 2C 03 00 00 */ cmpwi r3, 0 -/* 80144B54 40 82 00 0C */ bne lbl_80144B60 -/* 80144B58 38 60 00 00 */ li r3, 0 -/* 80144B5C 48 00 00 20 */ b lbl_80144B7C -lbl_80144B60: -/* 80144B60 7F E3 FB 78 */ mr r3, r31 -/* 80144B64 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144B68 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 80144B6C 7D 89 03 A6 */ mtctr r12 -/* 80144B70 4E 80 04 21 */ bctrl -/* 80144B74 30 03 FF FF */ addic r0, r3, -1 -/* 80144B78 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80144B7C: -/* 80144B7C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80144B80 48 21 D6 89 */ bl _restgpr_21 -/* 80144B84 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80144B88 7C 08 03 A6 */ mtlr r0 -/* 80144B8C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80144B90 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/DeleteBase__12daItemBase_cFPCc.s b/asm/d/a/d_a_itembase/DeleteBase__12daItemBase_cFPCc.s deleted file mode 100644 index 2f6b9ee314..0000000000 --- a/asm/d/a/d_a_itembase/DeleteBase__12daItemBase_cFPCc.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80144724: -/* 80144724 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80144728 7C 08 02 A6 */ mflr r0 -/* 8014472C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80144730 38 63 05 6C */ addi r3, r3, 0x56c -/* 80144734 4B EE 88 D5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80144738 38 60 00 01 */ li r3, 1 -/* 8014473C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80144740 7C 08 03 A6 */ mtlr r0 -/* 80144744 38 21 00 10 */ addi r1, r1, 0x10 -/* 80144748 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/DrawBase__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/DrawBase__12daItemBase_cFv.s deleted file mode 100644 index 73a21af937..0000000000 --- a/asm/d/a/d_a_itembase/DrawBase__12daItemBase_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80144B94: -/* 80144B94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80144B98 7C 08 02 A6 */ mflr r0 -/* 80144B9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80144BA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80144BA4 7C 7F 1B 78 */ mr r31, r3 -/* 80144BA8 81 83 05 68 */ lwz r12, 0x568(r3) -/* 80144BAC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80144BB0 7D 89 03 A6 */ mtctr r12 -/* 80144BB4 4E 80 04 21 */ bctrl -/* 80144BB8 7F E3 FB 78 */ mr r3, r31 -/* 80144BBC 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144BC0 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80144BC4 7D 89 03 A6 */ mtctr r12 -/* 80144BC8 4E 80 04 21 */ bctrl -/* 80144BCC 7F E3 FB 78 */ mr r3, r31 -/* 80144BD0 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144BD4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80144BD8 7D 89 03 A6 */ mtctr r12 -/* 80144BDC 4E 80 04 21 */ bctrl -/* 80144BE0 7F E3 FB 78 */ mr r3, r31 -/* 80144BE4 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144BE8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80144BEC 7D 89 03 A6 */ mtctr r12 -/* 80144BF0 4E 80 04 21 */ bctrl -/* 80144BF4 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80144BF8 4B EC 90 CD */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80144BFC 7F E3 FB 78 */ mr r3, r31 -/* 80144C00 48 00 00 A1 */ bl setListEnd__12daItemBase_cFv -/* 80144C04 7F E3 FB 78 */ mr r3, r31 -/* 80144C08 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144C0C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80144C10 7D 89 03 A6 */ mtctr r12 -/* 80144C14 4E 80 04 21 */ bctrl -/* 80144C18 38 60 00 01 */ li r3, 1 -/* 80144C1C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80144C20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80144C24 7C 08 03 A6 */ mtlr r0 -/* 80144C28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80144C2C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/RotateYBase__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/RotateYBase__12daItemBase_cFv.s deleted file mode 100644 index 640f40472a..0000000000 --- a/asm/d/a/d_a_itembase/RotateYBase__12daItemBase_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80144C30: -/* 80144C30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80144C34 7C 08 02 A6 */ mflr r0 -/* 80144C38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80144C3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80144C40 7C 7F 1B 78 */ mr r31, r3 -/* 80144C44 48 01 64 75 */ bl getData__12daItemBase_cFv -/* 80144C48 A8 83 00 1C */ lha r4, 0x1c(r3) -/* 80144C4C 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 80144C50 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 80144C54 7C 00 23 D6 */ divw r0, r0, r4 -/* 80144C58 7C 03 07 34 */ extsh r3, r0 -/* 80144C5C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80144C60 7C 00 1A 14 */ add r0, r0, r3 -/* 80144C64 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 80144C68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80144C6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80144C70 7C 08 03 A6 */ mtlr r0 -/* 80144C74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80144C78 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/animEntry__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/animEntry__12daItemBase_cFv.s deleted file mode 100644 index b66abe7123..0000000000 --- a/asm/d/a/d_a_itembase/animEntry__12daItemBase_cFv.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_80144EDC: -/* 80144EDC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80144EE0 7C 08 02 A6 */ mflr r0 -/* 80144EE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80144EE8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80144EEC 7C 7F 1B 78 */ mr r31, r3 -/* 80144EF0 80 03 05 80 */ lwz r0, 0x580(r3) -/* 80144EF4 28 00 00 00 */ cmplwi r0, 0 -/* 80144EF8 41 82 00 6C */ beq lbl_80144F64 -/* 80144EFC 81 83 05 68 */ lwz r12, 0x568(r3) -/* 80144F00 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80144F04 7D 89 03 A6 */ mtctr r12 -/* 80144F08 4E 80 04 21 */ bctrl -/* 80144F0C 7C 60 07 74 */ extsb r0, r3 -/* 80144F10 2C 00 FF FF */ cmpwi r0, -1 -/* 80144F14 41 82 00 38 */ beq lbl_80144F4C -/* 80144F18 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80144F1C 80 83 00 04 */ lwz r4, 4(r3) -/* 80144F20 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80144F24 38 84 00 58 */ addi r4, r4, 0x58 -/* 80144F28 C8 22 99 C0 */ lfd f1, lit_4041(r2) -/* 80144F2C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80144F30 90 01 00 0C */ stw r0, 0xc(r1) -/* 80144F34 3C 00 43 30 */ lis r0, 0x4330 -/* 80144F38 90 01 00 08 */ stw r0, 8(r1) -/* 80144F3C C8 01 00 08 */ lfd f0, 8(r1) -/* 80144F40 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80144F44 4B EC 88 65 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80144F48 48 00 00 1C */ b lbl_80144F64 -lbl_80144F4C: -/* 80144F4C 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80144F50 80 83 00 04 */ lwz r4, 4(r3) -/* 80144F54 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80144F58 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80144F5C 38 84 00 58 */ addi r4, r4, 0x58 -/* 80144F60 4B EC 88 49 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -lbl_80144F64: -/* 80144F64 80 1F 05 88 */ lwz r0, 0x588(r31) -/* 80144F68 28 00 00 00 */ cmplwi r0, 0 -/* 80144F6C 41 82 00 60 */ beq lbl_80144FCC -/* 80144F70 7F E3 FB 78 */ mr r3, r31 -/* 80144F74 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144F78 81 8C 00 34 */ lwz r12, 0x34(r12) -/* 80144F7C 7D 89 03 A6 */ mtctr r12 -/* 80144F80 4E 80 04 21 */ bctrl -/* 80144F84 7C 65 07 74 */ extsb r5, r3 -/* 80144F88 2C 05 FF FF */ cmpwi r5, -1 -/* 80144F8C 41 82 00 1C */ beq lbl_80144FA8 -/* 80144F90 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80144F94 80 83 00 04 */ lwz r4, 4(r3) -/* 80144F98 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80144F9C 38 84 00 58 */ addi r4, r4, 0x58 -/* 80144FA0 4B EC 86 49 */ bl entry__13mDoExt_btpAnmFP16J3DMaterialTables -/* 80144FA4 48 00 00 28 */ b lbl_80144FCC -lbl_80144FA8: -/* 80144FA8 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80144FAC 80 83 00 04 */ lwz r4, 4(r3) -/* 80144FB0 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80144FB4 38 84 00 58 */ addi r4, r4, 0x58 -/* 80144FB8 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 80144FBC FC 00 00 1E */ fctiwz f0, f0 -/* 80144FC0 D8 01 00 08 */ stfd f0, 8(r1) -/* 80144FC4 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 80144FC8 4B EC 86 21 */ bl entry__13mDoExt_btpAnmFP16J3DMaterialTables -lbl_80144FCC: -/* 80144FCC 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80144FD0 28 03 00 00 */ cmplwi r3, 0 -/* 80144FD4 41 82 00 18 */ beq lbl_80144FEC -/* 80144FD8 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80144FDC 80 84 00 04 */ lwz r4, 4(r4) -/* 80144FE0 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80144FE4 38 84 00 58 */ addi r4, r4, 0x58 -/* 80144FE8 4B EC 86 F1 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -lbl_80144FEC: -/* 80144FEC 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 80144FF0 28 03 00 00 */ cmplwi r3, 0 -/* 80144FF4 41 82 00 14 */ beq lbl_80145008 -/* 80144FF8 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80144FFC 80 84 00 04 */ lwz r4, 4(r4) -/* 80145000 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80145004 4B EC 89 C9 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -lbl_80145008: -/* 80145008 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 8014500C 28 03 00 00 */ cmplwi r3, 0 -/* 80145010 41 82 00 18 */ beq lbl_80145028 -/* 80145014 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80145018 80 84 00 04 */ lwz r4, 4(r4) -/* 8014501C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80145020 38 84 00 58 */ addi r4, r4, 0x58 -/* 80145024 4B EC 84 F5 */ bl entry__13mDoExt_bpkAnmFP16J3DMaterialTablef -lbl_80145028: -/* 80145028 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8014502C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80145030 7C 08 03 A6 */ mtlr r0 -/* 80145034 38 21 00 20 */ addi r1, r1, 0x20 -/* 80145038 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/animPlay__12daItemBase_cFffffff.s b/asm/d/a/d_a_itembase/animPlay__12daItemBase_cFffffff.s deleted file mode 100644 index 0a9e292ffb..0000000000 --- a/asm/d/a/d_a_itembase/animPlay__12daItemBase_cFffffff.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8014503C: -/* 8014503C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80145040 7C 08 02 A6 */ mflr r0 -/* 80145044 90 01 00 44 */ stw r0, 0x44(r1) -/* 80145048 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014504C 48 21 D0 F1 */ bl _savefpr_27 -/* 80145050 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80145054 7C 7F 1B 78 */ mr r31, r3 -/* 80145058 FF 60 08 90 */ fmr f27, f1 -/* 8014505C FF 80 10 90 */ fmr f28, f2 -/* 80145060 FF A0 18 90 */ fmr f29, f3 -/* 80145064 FF C0 28 90 */ fmr f30, f5 -/* 80145068 FF E0 30 90 */ fmr f31, f6 -/* 8014506C 80 03 05 80 */ lwz r0, 0x580(r3) -/* 80145070 28 00 00 00 */ cmplwi r0, 0 -/* 80145074 41 82 00 30 */ beq lbl_801450A4 -/* 80145078 81 83 05 68 */ lwz r12, 0x568(r3) -/* 8014507C 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80145080 7D 89 03 A6 */ mtctr r12 -/* 80145084 4E 80 04 21 */ bctrl -/* 80145088 7C 60 07 74 */ extsb r0, r3 -/* 8014508C 2C 00 FF FF */ cmpwi r0, -1 -/* 80145090 40 82 00 14 */ bne lbl_801450A4 -/* 80145094 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80145098 D3 C3 00 0C */ stfs f30, 0xc(r3) -/* 8014509C 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 801450A0 4B EC 83 89 */ bl play__14mDoExt_baseAnmFv -lbl_801450A4: -/* 801450A4 80 1F 05 88 */ lwz r0, 0x588(r31) -/* 801450A8 28 00 00 00 */ cmplwi r0, 0 -/* 801450AC 41 82 00 34 */ beq lbl_801450E0 -/* 801450B0 7F E3 FB 78 */ mr r3, r31 -/* 801450B4 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 801450B8 81 8C 00 34 */ lwz r12, 0x34(r12) -/* 801450BC 7D 89 03 A6 */ mtctr r12 -/* 801450C0 4E 80 04 21 */ bctrl -/* 801450C4 7C 60 07 74 */ extsb r0, r3 -/* 801450C8 2C 00 FF FF */ cmpwi r0, -1 -/* 801450CC 40 82 00 14 */ bne lbl_801450E0 -/* 801450D0 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 801450D4 D3 E3 00 0C */ stfs f31, 0xc(r3) -/* 801450D8 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 801450DC 4B EC 83 4D */ bl play__14mDoExt_baseAnmFv -lbl_801450E0: -/* 801450E0 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 801450E4 28 03 00 00 */ cmplwi r3, 0 -/* 801450E8 41 82 00 10 */ beq lbl_801450F8 -/* 801450EC D3 63 00 0C */ stfs f27, 0xc(r3) -/* 801450F0 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 801450F4 4B EC 83 35 */ bl play__14mDoExt_baseAnmFv -lbl_801450F8: -/* 801450F8 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 801450FC 28 03 00 00 */ cmplwi r3, 0 -/* 80145100 41 82 00 10 */ beq lbl_80145110 -/* 80145104 D3 83 00 0C */ stfs f28, 0xc(r3) -/* 80145108 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 8014510C 4B EC 83 1D */ bl play__14mDoExt_baseAnmFv -lbl_80145110: -/* 80145110 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 80145114 28 03 00 00 */ cmplwi r3, 0 -/* 80145118 41 82 00 10 */ beq lbl_80145128 -/* 8014511C D3 A3 00 0C */ stfs f29, 0xc(r3) -/* 80145120 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 80145124 4B EC 83 05 */ bl play__14mDoExt_baseAnmFv -lbl_80145128: -/* 80145128 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014512C 48 21 D0 5D */ bl _restfpr_27 -/* 80145130 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80145134 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80145138 7C 08 03 A6 */ mtlr r0 -/* 8014513C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80145140 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/chkFlag__12daItemBase_cFi.s b/asm/d/a/d_a_itembase/chkFlag__12daItemBase_cFi.s deleted file mode 100644 index 6c5ca9fa0e..0000000000 --- a/asm/d/a/d_a_itembase/chkFlag__12daItemBase_cFi.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80145144: -/* 80145144 3C A0 80 3B */ lis r5, item_info__10dItem_data@ha /* 0x803AED78@ha */ -/* 80145148 38 A5 ED 78 */ addi r5, r5, item_info__10dItem_data@l /* 0x803AED78@l */ -/* 8014514C 88 03 09 2A */ lbz r0, 0x92a(r3) -/* 80145150 54 00 10 3A */ slwi r0, r0, 2 -/* 80145154 7C 65 02 14 */ add r3, r5, r0 -/* 80145158 88 03 00 03 */ lbz r0, 3(r3) -/* 8014515C 7C 83 00 38 */ and r3, r4, r0 -/* 80145160 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/getBtpFrm__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/getBtpFrm__12daItemBase_cFv.s deleted file mode 100644 index 1674911315..0000000000 --- a/asm/d/a/d_a_itembase/getBtpFrm__12daItemBase_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80145180: -/* 80145180 3C 80 80 3B */ lis r4, item_resource__10dItem_data@ha /* 0x803AC5A0@ha */ -/* 80145184 38 84 C5 A0 */ addi r4, r4, item_resource__10dItem_data@l /* 0x803AC5A0@l */ -/* 80145188 88 03 09 2A */ lbz r0, 0x92a(r3) -/* 8014518C 1C 00 00 18 */ mulli r0, r0, 0x18 -/* 80145190 7C 64 02 14 */ add r3, r4, r0 -/* 80145194 88 63 00 0F */ lbz r3, 0xf(r3) -/* 80145198 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/getCollisionH__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/getCollisionH__12daItemBase_cFv.s deleted file mode 100644 index f5312929e2..0000000000 --- a/asm/d/a/d_a_itembase/getCollisionH__12daItemBase_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801451B4: -/* 801451B4 3C 80 80 3B */ lis r4, item_info__10dItem_data@ha /* 0x803AED78@ha */ -/* 801451B8 38 84 ED 78 */ addi r4, r4, item_info__10dItem_data@l /* 0x803AED78@l */ -/* 801451BC 88 03 09 2A */ lbz r0, 0x92a(r3) -/* 801451C0 54 00 10 3A */ slwi r0, r0, 2 -/* 801451C4 7C 64 02 14 */ add r3, r4, r0 -/* 801451C8 88 63 00 01 */ lbz r3, 1(r3) -/* 801451CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/getCollisionR__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/getCollisionR__12daItemBase_cFv.s deleted file mode 100644 index a87cf4c8f6..0000000000 --- a/asm/d/a/d_a_itembase/getCollisionR__12daItemBase_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801451D0: -/* 801451D0 3C 80 80 3B */ lis r4, item_info__10dItem_data@ha /* 0x803AED78@ha */ -/* 801451D4 38 84 ED 78 */ addi r4, r4, item_info__10dItem_data@l /* 0x803AED78@l */ -/* 801451D8 88 03 09 2A */ lbz r0, 0x92a(r3) -/* 801451DC 54 00 10 3A */ slwi r0, r0, 2 -/* 801451E0 7C 64 02 14 */ add r3, r4, r0 -/* 801451E4 88 63 00 02 */ lbz r3, 2(r3) -/* 801451E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/getShadowSize__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/getShadowSize__12daItemBase_cFv.s deleted file mode 100644 index a75f19feab..0000000000 --- a/asm/d/a/d_a_itembase/getShadowSize__12daItemBase_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_8014519C: -/* 8014519C 88 03 09 2A */ lbz r0, 0x92a(r3) -/* 801451A0 54 00 10 3A */ slwi r0, r0, 2 -/* 801451A4 3C 60 80 3B */ lis r3, item_info__10dItem_data@ha /* 0x803AED78@ha */ -/* 801451A8 38 63 ED 78 */ addi r3, r3, item_info__10dItem_data@l /* 0x803AED78@l */ -/* 801451AC 7C 63 00 AE */ lbzx r3, r3, r0 -/* 801451B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/getTevFrm__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/getTevFrm__12daItemBase_cFv.s deleted file mode 100644 index 84a146a036..0000000000 --- a/asm/d/a/d_a_itembase/getTevFrm__12daItemBase_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80145164: -/* 80145164 3C 80 80 3B */ lis r4, item_resource__10dItem_data@ha /* 0x803AC5A0@ha */ -/* 80145168 38 84 C5 A0 */ addi r4, r4, item_resource__10dItem_data@l /* 0x803AC5A0@l */ -/* 8014516C 88 03 09 2A */ lbz r0, 0x92a(r3) -/* 80145170 1C 00 00 18 */ mulli r0, r0, 0x18 -/* 80145174 7C 64 02 14 */ add r3, r4, r0 -/* 80145178 88 63 00 0E */ lbz r3, 0xe(r3) -/* 8014517C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/setListEnd__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/setListEnd__12daItemBase_cFv.s deleted file mode 100644 index 050f003f7d..0000000000 --- a/asm/d/a/d_a_itembase/setListEnd__12daItemBase_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80144CA0: -/* 80144CA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80144CA4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80144CA8 80 04 5F 80 */ lwz r0, 0x5f80(r4) -/* 80144CAC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80144CB0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80144CB4 90 03 00 48 */ stw r0, 0x48(r3) -/* 80144CB8 80 04 5F 84 */ lwz r0, 0x5f84(r4) -/* 80144CBC 90 03 00 4C */ stw r0, 0x4c(r3) -/* 80144CC0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/setListStart__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/setListStart__12daItemBase_cFv.s deleted file mode 100644 index 2664e45cdd..0000000000 --- a/asm/d/a/d_a_itembase/setListStart__12daItemBase_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80144C7C: -/* 80144C7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80144C80 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80144C84 80 04 5F 88 */ lwz r0, 0x5f88(r4) -/* 80144C88 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80144C8C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80144C90 90 03 00 48 */ stw r0, 0x48(r3) -/* 80144C94 80 04 5F 8C */ lwz r0, 0x5f8c(r4) -/* 80144C98 90 03 00 4C */ stw r0, 0x4c(r3) -/* 80144C9C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/setShadow__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/setShadow__12daItemBase_cFv.s deleted file mode 100644 index 2d42f73d52..0000000000 --- a/asm/d/a/d_a_itembase/setShadow__12daItemBase_cFv.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_80144D70: -/* 80144D70 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80144D74 7C 08 02 A6 */ mflr r0 -/* 80144D78 90 01 00 34 */ stw r0, 0x34(r1) -/* 80144D7C DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80144D80 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80144D84 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80144D88 7C 7F 1B 78 */ mr r31, r3 -/* 80144D8C 81 83 05 68 */ lwz r12, 0x568(r3) -/* 80144D90 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 80144D94 7D 89 03 A6 */ mtctr r12 -/* 80144D98 4E 80 04 21 */ bctrl -/* 80144D9C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80144DA0 C8 22 99 B8 */ lfd f1, lit_3955(r2) -/* 80144DA4 90 01 00 0C */ stw r0, 0xc(r1) -/* 80144DA8 3C 00 43 30 */ lis r0, 0x4330 -/* 80144DAC 90 01 00 08 */ stw r0, 8(r1) -/* 80144DB0 C8 01 00 08 */ lfd f0, 8(r1) -/* 80144DB4 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80144DB8 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80144DBC EF E0 00 72 */ fmuls f31, f0, f1 -/* 80144DC0 7F E3 FB 78 */ mr r3, r31 -/* 80144DC4 38 80 00 10 */ li r4, 0x10 -/* 80144DC8 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144DCC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80144DD0 7D 89 03 A6 */ mtctr r12 -/* 80144DD4 4E 80 04 21 */ bctrl -/* 80144DD8 2C 03 00 00 */ cmpwi r3, 0 -/* 80144DDC 40 82 00 68 */ bne lbl_80144E44 -/* 80144DE0 7F E3 FB 78 */ mr r3, r31 -/* 80144DE4 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144DE8 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 80144DEC 7D 89 03 A6 */ mtctr r12 -/* 80144DF0 4E 80 04 21 */ bctrl -/* 80144DF4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80144DF8 C8 22 99 B8 */ lfd f1, lit_3955(r2) -/* 80144DFC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80144E00 3C 00 43 30 */ lis r0, 0x4330 -/* 80144E04 90 01 00 08 */ stw r0, 8(r1) -/* 80144E08 C8 01 00 08 */ lfd f0, 8(r1) -/* 80144E0C EC 20 08 28 */ fsubs f1, f0, f1 -/* 80144E10 C0 02 99 AC */ lfs f0, lit_3952(r2) -/* 80144E14 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80144E18 41 82 00 A8 */ beq lbl_80144EC0 -/* 80144E1C 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80144E20 C0 3F 06 24 */ lfs f1, 0x624(r31) -/* 80144E24 FC 40 F8 90 */ fmr f2, f31 -/* 80144E28 38 9F 06 7C */ addi r4, r31, 0x67c -/* 80144E2C 38 A0 00 00 */ li r5, 0 -/* 80144E30 C0 62 99 A8 */ lfs f3, lit_3881(r2) -/* 80144E34 3C C0 80 42 */ lis r6, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80144E38 38 C6 48 D0 */ addi r6, r6, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80144E3C 4B EE 82 79 */ bl dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj -/* 80144E40 48 00 00 80 */ b lbl_80144EC0 -lbl_80144E44: -/* 80144E44 7F E3 FB 78 */ mr r3, r31 -/* 80144E48 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80144E4C 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 80144E50 7D 89 03 A6 */ mtctr r12 -/* 80144E54 4E 80 04 21 */ bctrl -/* 80144E58 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80144E5C C8 22 99 B8 */ lfd f1, lit_3955(r2) -/* 80144E60 90 01 00 0C */ stw r0, 0xc(r1) -/* 80144E64 3C 00 43 30 */ lis r0, 0x4330 -/* 80144E68 90 01 00 08 */ stw r0, 8(r1) -/* 80144E6C C8 01 00 08 */ lfd f0, 8(r1) -/* 80144E70 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80144E74 C0 02 99 AC */ lfs f0, lit_3952(r2) -/* 80144E78 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80144E7C 40 82 00 08 */ bne lbl_80144E84 -/* 80144E80 C0 22 99 B0 */ lfs f1, lit_3953(r2) -lbl_80144E84: -/* 80144E84 80 7F 09 1C */ lwz r3, 0x91c(r31) -/* 80144E88 38 80 00 03 */ li r4, 3 -/* 80144E8C 80 BF 05 74 */ lwz r5, 0x574(r31) -/* 80144E90 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 80144E94 C0 42 99 AC */ lfs f2, lit_3952(r2) -/* 80144E98 C0 7F 04 D4 */ lfs f3, 0x4d4(r31) -/* 80144E9C C0 9F 06 24 */ lfs f4, 0x624(r31) -/* 80144EA0 38 FF 06 7C */ addi r7, r31, 0x67c -/* 80144EA4 39 1F 01 0C */ addi r8, r31, 0x10c -/* 80144EA8 39 20 00 00 */ li r9, 0 -/* 80144EAC C0 A2 99 A8 */ lfs f5, lit_3881(r2) -/* 80144EB0 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80144EB4 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80144EB8 4B EE 9A 59 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 80144EBC 90 7F 09 1C */ stw r3, 0x91c(r31) -lbl_80144EC0: -/* 80144EC0 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80144EC4 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80144EC8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80144ECC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80144ED0 7C 08 03 A6 */ mtlr r0 -/* 80144ED4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80144ED8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/setTevStr__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/setTevStr__12daItemBase_cFv.s deleted file mode 100644 index 3a33a9d02b..0000000000 --- a/asm/d/a/d_a_itembase/setTevStr__12daItemBase_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80144D18: -/* 80144D18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80144D1C 7C 08 02 A6 */ mflr r0 -/* 80144D20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80144D24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80144D28 7C 7F 1B 78 */ mr r31, r3 -/* 80144D2C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80144D30 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80144D34 38 80 00 00 */ li r4, 0 -/* 80144D38 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80144D3C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80144D40 48 05 EA 85 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80144D44 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80144D48 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80144D4C 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80144D50 80 84 00 04 */ lwz r4, 4(r4) -/* 80144D54 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80144D58 48 06 00 49 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80144D5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80144D60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80144D64 7C 08 03 A6 */ mtlr r0 -/* 80144D68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80144D6C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase/settingBeforeDraw__12daItemBase_cFv.s b/asm/d/a/d_a_itembase/settingBeforeDraw__12daItemBase_cFv.s deleted file mode 100644 index a27907bcee..0000000000 --- a/asm/d/a/d_a_itembase/settingBeforeDraw__12daItemBase_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80144CC4: -/* 80144CC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80144CC8 7C 08 02 A6 */ mflr r0 -/* 80144CCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80144CD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80144CD4 7C 7F 1B 78 */ mr r31, r3 -/* 80144CD8 38 80 00 04 */ li r4, 4 -/* 80144CDC 81 83 05 68 */ lwz r12, 0x568(r3) -/* 80144CE0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80144CE4 7D 89 03 A6 */ mtctr r12 -/* 80144CE8 4E 80 04 21 */ bctrl -/* 80144CEC 2C 03 00 00 */ cmpwi r3, 0 -/* 80144CF0 41 82 00 14 */ beq lbl_80144D04 -/* 80144CF4 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80144CF8 80 83 00 04 */ lwz r4, 4(r3) -/* 80144CFC 7F E3 FB 78 */ mr r3, r31 -/* 80144D00 4B ED 87 2D */ bl fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData -lbl_80144D04: -/* 80144D04 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80144D08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80144D0C 7C 08 03 A6 */ mtlr r0 -/* 80144D10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80144D14 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase_static/CheckFieldItemCreateHeap__FP10fopAc_ac_c.s b/asm/d/a/d_a_itembase_static/CheckFieldItemCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 456b1b9c99..0000000000 --- a/asm/d/a/d_a_itembase_static/CheckFieldItemCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80037B78: -/* 80037B78 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80037B7C 7C 08 02 A6 */ mflr r0 -/* 80037B80 90 01 00 24 */ stw r0, 0x24(r1) -/* 80037B84 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80037B88 7C 7F 1B 78 */ mr r31, r3 -/* 80037B8C 4B FF FE D1 */ bl getItemNo__12daItemBase_cFv -/* 80037B90 54 66 25 36 */ rlwinm r6, r3, 4, 0x14, 0x1b -/* 80037B94 38 00 FF FF */ li r0, -1 -/* 80037B98 90 01 00 08 */ stw r0, 8(r1) -/* 80037B9C 7F E3 FB 78 */ mr r3, r31 -/* 80037BA0 3C 80 80 3B */ lis r4, field_item_res__10dItem_data@ha /* 0x803ADD88@ha */ -/* 80037BA4 38 A4 DD 88 */ addi r5, r4, field_item_res__10dItem_data@l /* 0x803ADD88@l */ -/* 80037BA8 7C 85 30 2E */ lwzx r4, r5, r6 -/* 80037BAC 7D 45 32 14 */ add r10, r5, r6 -/* 80037BB0 A8 AA 00 04 */ lha r5, 4(r10) -/* 80037BB4 38 C0 FF FF */ li r6, -1 -/* 80037BB8 38 E0 FF FF */ li r7, -1 -/* 80037BBC A9 0A 00 06 */ lha r8, 6(r10) -/* 80037BC0 39 20 FF FF */ li r9, -1 -/* 80037BC4 A9 4A 00 08 */ lha r10, 8(r10) -/* 80037BC8 48 10 CB 95 */ bl CreateItemHeap__12daItemBase_cFPCcsssssss -/* 80037BCC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80037BD0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80037BD4 7C 08 03 A6 */ mtlr r0 -/* 80037BD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80037BDC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_itembase_static/CheckItemCreateHeap__FP10fopAc_ac_c.s b/asm/d/a/d_a_itembase_static/CheckItemCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 67a7729899..0000000000 --- a/asm/d/a/d_a_itembase_static/CheckItemCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80037B0C: -/* 80037B0C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80037B10 7C 08 02 A6 */ mflr r0 -/* 80037B14 90 01 00 24 */ stw r0, 0x24(r1) -/* 80037B18 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80037B1C 7C 7F 1B 78 */ mr r31, r3 -/* 80037B20 4B FF FF 3D */ bl getItemNo__12daItemBase_cFv -/* 80037B24 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80037B28 1C A0 00 18 */ mulli r5, r0, 0x18 -/* 80037B2C 3C 60 80 3B */ lis r3, item_resource__10dItem_data@ha /* 0x803AC5A0@ha */ -/* 80037B30 38 83 C5 A0 */ addi r4, r3, item_resource__10dItem_data@l /* 0x803AC5A0@l */ -/* 80037B34 7D 44 2A 14 */ add r10, r4, r5 -/* 80037B38 A8 0A 00 0C */ lha r0, 0xc(r10) -/* 80037B3C 90 01 00 08 */ stw r0, 8(r1) -/* 80037B40 7F E3 FB 78 */ mr r3, r31 -/* 80037B44 7C 84 28 2E */ lwzx r4, r4, r5 -/* 80037B48 A8 AA 00 04 */ lha r5, 4(r10) -/* 80037B4C A8 CA 00 06 */ lha r6, 6(r10) -/* 80037B50 38 E0 FF FF */ li r7, -1 -/* 80037B54 A9 0A 00 08 */ lha r8, 8(r10) -/* 80037B58 39 20 FF FF */ li r9, -1 -/* 80037B5C A9 4A 00 0A */ lha r10, 0xa(r10) -/* 80037B60 48 10 CB FD */ bl CreateItemHeap__12daItemBase_cFPCcsssssss -/* 80037B64 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80037B68 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80037B6C 7C 08 03 A6 */ mtlr r0 -/* 80037B70 38 21 00 20 */ addi r1, r1, 0x20 -/* 80037B74 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__19dComIfG_resLoader_cFv.s b/asm/d/com/d_com_inf_game/__ct__19dComIfG_resLoader_cFv.s deleted file mode 100644 index 4bc8b5497e..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__19dComIfG_resLoader_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002F314: -/* 8002F314 38 00 00 00 */ li r0, 0 -/* 8002F318 90 03 00 00 */ stw r0, 0(r3) -/* 8002F31C 90 03 00 08 */ stw r0, 8(r3) -/* 8002F320 98 03 00 0C */ stb r0, 0xc(r3) -/* 8002F324 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__19dComIfG_resLoader_cFv.s b/asm/d/com/d_com_inf_game/__dt__19dComIfG_resLoader_cFv.s deleted file mode 100644 index ac48e1962d..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__19dComIfG_resLoader_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8002F328: -/* 8002F328 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002F32C 7C 08 02 A6 */ mflr r0 -/* 8002F330 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002F334 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F338 48 33 2E 9D */ bl _savegpr_27 -/* 8002F33C 7C 7B 1B 79 */ or. r27, r3, r3 -/* 8002F340 7C 9C 23 78 */ mr r28, r4 -/* 8002F344 41 82 00 54 */ beq lbl_8002F398 -/* 8002F348 80 1B 00 00 */ lwz r0, 0(r27) -/* 8002F34C 28 00 00 00 */ cmplwi r0, 0 -/* 8002F350 41 82 00 38 */ beq lbl_8002F388 -/* 8002F354 8B BB 00 0C */ lbz r29, 0xc(r27) -/* 8002F358 3B C0 00 02 */ li r30, 2 -/* 8002F35C 57 BF 10 3A */ slwi r31, r29, 2 -/* 8002F360 48 00 00 20 */ b lbl_8002F380 -lbl_8002F364: -/* 8002F364 38 7B 00 04 */ addi r3, r27, 4 -/* 8002F368 80 9B 00 00 */ lwz r4, 0(r27) -/* 8002F36C 7C 84 F8 2E */ lwzx r4, r4, r31 -/* 8002F370 4B FF DC 99 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8002F374 93 DB 00 08 */ stw r30, 8(r27) -/* 8002F378 3B BD FF FF */ addi r29, r29, -1 -/* 8002F37C 3B FF FF FC */ addi r31, r31, -4 -lbl_8002F380: -/* 8002F380 2C 1D 00 00 */ cmpwi r29, 0 -/* 8002F384 40 80 FF E0 */ bge lbl_8002F364 -lbl_8002F388: -/* 8002F388 7F 80 07 35 */ extsh. r0, r28 -/* 8002F38C 40 81 00 0C */ ble lbl_8002F398 -/* 8002F390 7F 63 DB 78 */ mr r3, r27 -/* 8002F394 48 29 F9 A9 */ bl __dl__FPv -lbl_8002F398: -/* 8002F398 7F 63 DB 78 */ mr r3, r27 -/* 8002F39C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F3A0 48 33 2E 81 */ bl _restgpr_27 -/* 8002F3A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002F3A8 7C 08 03 A6 */ mtlr r0 -/* 8002F3AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002F3B0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc.s b/asm/d/com/d_com_inf_game/addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc.s deleted file mode 100644 index 22acf4687b..0000000000 --- a/asm/d/com/d_com_inf_game/addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8002CAF0: -/* 8002CAF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CAF4 7C 08 02 A6 */ mflr r0 -/* 8002CAF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CAFC 80 63 4E 08 */ lwz r3, 0x4e08(r3) -/* 8002CB00 28 03 00 00 */ cmplwi r3, 0 -/* 8002CB04 41 82 00 18 */ beq lbl_8002CB1C -/* 8002CB08 48 01 C4 69 */ bl addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc -/* 8002CB0C 2C 03 00 00 */ cmpwi r3, 0 -/* 8002CB10 41 82 00 0C */ beq lbl_8002CB1C -/* 8002CB14 38 60 00 01 */ li r3, 1 -/* 8002CB18 48 00 00 08 */ b lbl_8002CB20 -lbl_8002CB1C: -/* 8002CB1C 38 60 FF FF */ li r3, -1 -lbl_8002CB20: -/* 8002CB20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CB24 7C 08 03 A6 */ mtlr r0 -/* 8002CB28 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CB2C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/createParticle__14dComIfG_play_cFv.s b/asm/d/com/d_com_inf_game/createParticle__14dComIfG_play_cFv.s deleted file mode 100644 index c1e83e4cd3..0000000000 --- a/asm/d/com/d_com_inf_game/createParticle__14dComIfG_play_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8002C9D8: -/* 8002C9D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002C9DC 7C 08 02 A6 */ mflr r0 -/* 8002C9E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002C9E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002C9E8 7C 7F 1B 78 */ mr r31, r3 -/* 8002C9EC 38 60 12 18 */ li r3, 0x1218 -/* 8002C9F0 48 2A 22 5D */ bl __nw__FUl -/* 8002C9F4 7C 60 1B 79 */ or. r0, r3, r3 -/* 8002C9F8 41 82 00 0C */ beq lbl_8002CA04 -/* 8002C9FC 48 01 F0 D1 */ bl __ct__13dPa_control_cFv -/* 8002CA00 7C 60 1B 78 */ mr r0, r3 -lbl_8002CA04: -/* 8002CA04 90 1F 4E 04 */ stw r0, 0x4e04(r31) -/* 8002CA08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002CA0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CA10 7C 08 03 A6 */ mtlr r0 -/* 8002CA14 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CA18 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/createSimpleModel__14dComIfG_play_cFv.s b/asm/d/com/d_com_inf_game/createSimpleModel__14dComIfG_play_cFv.s deleted file mode 100644 index be360a2d3e..0000000000 --- a/asm/d/com/d_com_inf_game/createSimpleModel__14dComIfG_play_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8002CA1C: -/* 8002CA1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CA20 7C 08 02 A6 */ mflr r0 -/* 8002CA24 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CA28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002CA2C 7C 7F 1B 78 */ mr r31, r3 -/* 8002CA30 80 03 4E 08 */ lwz r0, 0x4e08(r3) -/* 8002CA34 28 00 00 00 */ cmplwi r0, 0 -/* 8002CA38 40 82 00 20 */ bne lbl_8002CA58 -/* 8002CA3C 38 60 10 48 */ li r3, 0x1048 -/* 8002CA40 48 2A 22 0D */ bl __nw__FUl -/* 8002CA44 7C 60 1B 79 */ or. r0, r3, r3 -/* 8002CA48 41 82 00 0C */ beq lbl_8002CA54 -/* 8002CA4C 48 01 C2 69 */ bl __ct__15dSmplMdl_draw_cFv -/* 8002CA50 7C 60 1B 78 */ mr r0, r3 -lbl_8002CA54: -/* 8002CA54 90 1F 4E 08 */ stw r0, 0x4e08(r31) -lbl_8002CA58: -/* 8002CA58 80 7F 4E 08 */ lwz r3, 0x4e08(r31) -/* 8002CA5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002CA60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CA64 7C 08 03 A6 */ mtlr r0 -/* 8002CA68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CA6C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_changeOpeningScene__FP11scene_classs.s b/asm/d/com/d_com_inf_game/dComIfG_changeOpeningScene__FP11scene_classs.s deleted file mode 100644 index f429cac4a0..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_changeOpeningScene__FP11scene_classs.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8002CC54: -/* 8002CC54 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002CC58 7C 08 02 A6 */ mflr r0 -/* 8002CC5C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002CC60 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8002CC64 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8002CC68 7C 7E 1B 78 */ mr r30, r3 -/* 8002CC6C 7C 9F 23 78 */ mr r31, r4 -/* 8002CC70 38 00 00 00 */ li r0, 0 -/* 8002CC74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002CC78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002CC7C 98 03 4E 1C */ stb r0, 0x4e1c(r3) -/* 8002CC80 3C 60 80 38 */ lis r3, d_com_d_com_inf_game__stringBase0@ha /* 0x80378F38@ha */ -/* 8002CC84 38 63 8F 38 */ addi r3, r3, d_com_d_com_inf_game__stringBase0@l /* 0x80378F38@l */ -/* 8002CC88 38 63 01 0B */ addi r3, r3, 0x10b -/* 8002CC8C 38 80 00 64 */ li r4, 0x64 -/* 8002CC90 38 A0 00 00 */ li r5, 0 -/* 8002CC94 38 C0 00 0A */ li r6, 0xa -/* 8002CC98 48 00 08 BD */ bl dComIfGp_setNextStage__FPCcsScSc -/* 8002CC9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002CCA0 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002CCA4 38 65 4E 0E */ addi r3, r5, 0x4e0e -/* 8002CCA8 88 05 4E 18 */ lbz r0, 0x4e18(r5) -/* 8002CCAC 7C 04 07 74 */ extsb r4, r0 -/* 8002CCB0 88 05 4E 19 */ lbz r0, 0x4e19(r5) -/* 8002CCB4 7C 05 07 74 */ extsb r5, r0 -/* 8002CCB8 4B FD A5 05 */ bl mDoAud_setSceneName__FPCcll -/* 8002CCBC 38 00 00 00 */ li r0, 0 -/* 8002CCC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002CCC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002CCC8 90 03 0D C8 */ stw r0, 0xdc8(r3) -/* 8002CCCC 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 8002CCD0 80 03 00 04 */ lwz r0, 4(r3) -/* 8002CCD4 2C 00 00 01 */ cmpwi r0, 1 -/* 8002CCD8 40 82 00 30 */ bne lbl_8002CD08 -/* 8002CCDC 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 8002CCE0 90 01 00 0C */ stw r0, 0xc(r1) -/* 8002CCE4 90 01 00 08 */ stw r0, 8(r1) -/* 8002CCE8 88 01 00 08 */ lbz r0, 8(r1) -/* 8002CCEC 98 03 00 0C */ stb r0, 0xc(r3) -/* 8002CCF0 88 01 00 09 */ lbz r0, 9(r1) -/* 8002CCF4 98 03 00 0D */ stb r0, 0xd(r3) -/* 8002CCF8 88 01 00 0A */ lbz r0, 0xa(r1) -/* 8002CCFC 98 03 00 0E */ stb r0, 0xe(r3) -/* 8002CD00 88 01 00 0B */ lbz r0, 0xb(r1) -/* 8002CD04 98 03 00 0F */ stb r0, 0xf(r3) -lbl_8002CD08: -/* 8002CD08 7F C3 F3 78 */ mr r3, r30 -/* 8002CD0C 7F E4 FB 78 */ mr r4, r31 -/* 8002CD10 38 A0 00 00 */ li r5, 0 -/* 8002CD14 38 C0 00 1E */ li r6, 0x1e -/* 8002CD18 4B FF 1F C9 */ bl fopScnM_ChangeReq__FP11scene_classssUs -/* 8002CD1C 7F E3 FB 78 */ mr r3, r31 -/* 8002CD20 38 80 00 00 */ li r4, 0 -/* 8002CD24 4B FF 20 A9 */ bl fopScnM_ReRequest__FsUl -/* 8002CD28 38 60 00 01 */ li r3, 1 -/* 8002CD2C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8002CD30 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8002CD34 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002CD38 7C 08 03 A6 */ mtlr r0 -/* 8002CD3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002CD40 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_resDelete__FP30request_of_phase_process_classPCc.s b/asm/d/com/d_com_inf_game/dComIfG_resDelete__FP30request_of_phase_process_classPCc.s deleted file mode 100644 index 1a2a9ceeb3..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_resDelete__FP30request_of_phase_process_classPCc.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8002D008: -/* 8002D008 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D00C 7C 08 02 A6 */ mflr r0 -/* 8002D010 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D014 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002D018 7C 7F 1B 78 */ mr r31, r3 -/* 8002D01C 80 03 00 04 */ lwz r0, 4(r3) -/* 8002D020 2C 00 00 02 */ cmpwi r0, 2 -/* 8002D024 41 82 00 0C */ beq lbl_8002D030 -/* 8002D028 38 60 00 00 */ li r3, 0 -/* 8002D02C 48 00 00 2C */ b lbl_8002D058 -lbl_8002D030: -/* 8002D030 7C 83 23 78 */ mr r3, r4 -/* 8002D034 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D038 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D03C 3C 84 00 02 */ addis r4, r4, 2 -/* 8002D040 38 A0 00 80 */ li r5, 0x80 -/* 8002D044 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8002D048 48 00 F1 4D */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci -/* 8002D04C 38 00 00 00 */ li r0, 0 -/* 8002D050 90 1F 00 04 */ stw r0, 4(r31) -/* 8002D054 38 60 00 01 */ li r3, 1 -lbl_8002D058: -/* 8002D058 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002D05C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D060 7C 08 03 A6 */ mtlr r0 -/* 8002D064 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D068 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_resLoad__FP30request_of_phase_process_classPCc.s b/asm/d/com/d_com_inf_game/dComIfG_resLoad__FP30request_of_phase_process_classPCc.s deleted file mode 100644 index 77874cdf3c..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_resLoad__FP30request_of_phase_process_classPCc.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8002CEBC: -/* 8002CEBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CEC0 7C 08 02 A6 */ mflr r0 -/* 8002CEC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CEC8 7C 85 23 78 */ mr r5, r4 -/* 8002CECC 80 03 00 04 */ lwz r0, 4(r3) -/* 8002CED0 2C 00 00 02 */ cmpwi r0, 2 -/* 8002CED4 40 82 00 0C */ bne lbl_8002CEE0 -/* 8002CED8 38 60 00 04 */ li r3, 4 -/* 8002CEDC 48 00 00 10 */ b lbl_8002CEEC -lbl_8002CEE0: -/* 8002CEE0 3C 80 80 3A */ lis r4, l_method_5017@ha /* 0x803A71B8@ha */ -/* 8002CEE4 38 84 71 B8 */ addi r4, r4, l_method_5017@l /* 0x803A71B8@l */ -/* 8002CEE8 48 00 2C 39 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv -lbl_8002CEEC: -/* 8002CEEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CEF0 7C 08 03 A6 */ mtlr r0 -/* 8002CEF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CEF8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap.s b/asm/d/com/d_com_inf_game/dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap.s deleted file mode 100644 index 07540d5fd5..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8002CFC0: -/* 8002CFC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CFC4 7C 08 02 A6 */ mflr r0 -/* 8002CFC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CFCC 80 03 00 04 */ lwz r0, 4(r3) -/* 8002CFD0 2C 00 00 02 */ cmpwi r0, 2 -/* 8002CFD4 40 82 00 0C */ bne lbl_8002CFE0 -/* 8002CFD8 38 60 00 04 */ li r3, 4 -/* 8002CFDC 48 00 00 1C */ b lbl_8002CFF8 -lbl_8002CFE0: -/* 8002CFE0 90 81 00 08 */ stw r4, 8(r1) -/* 8002CFE4 90 A1 00 0C */ stw r5, 0xc(r1) -/* 8002CFE8 3C 80 80 3A */ lis r4, l_method_5051@ha /* 0x803A71C4@ha */ -/* 8002CFEC 38 84 71 C4 */ addi r4, r4, l_method_5051@l /* 0x803A71C4@l */ -/* 8002CFF0 38 A1 00 08 */ addi r5, r1, 8 -/* 8002CFF4 48 00 2B 2D */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv -lbl_8002CFF8: -/* 8002CFF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CFFC 7C 08 03 A6 */ mtlr r0 -/* 8002D000 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D004 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_resetToOpening__FP11scene_class.s b/asm/d/com/d_com_inf_game/dComIfG_resetToOpening__FP11scene_class.s deleted file mode 100644 index 4c47223e74..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_resetToOpening__FP11scene_class.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8002CD44: -/* 8002CD44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CD48 7C 08 02 A6 */ mflr r0 -/* 8002CD4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CD50 80 8D 86 F8 */ lwz r4, mResetData__6mDoRst(r13) -/* 8002CD54 88 04 00 11 */ lbz r0, 0x11(r4) -/* 8002CD58 2C 00 00 00 */ cmpwi r0, 0 -/* 8002CD5C 40 82 00 20 */ bne lbl_8002CD7C -/* 8002CD60 80 04 00 00 */ lwz r0, 0(r4) -/* 8002CD64 2C 00 00 00 */ cmpwi r0, 0 -/* 8002CD68 41 82 00 14 */ beq lbl_8002CD7C -/* 8002CD6C 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 8002CD70 80 04 00 04 */ lwz r0, 4(r4) -/* 8002CD74 2C 00 00 02 */ cmpwi r0, 2 -/* 8002CD78 40 82 00 0C */ bne lbl_8002CD84 -lbl_8002CD7C: -/* 8002CD7C 38 60 00 00 */ li r3, 0 -/* 8002CD80 48 00 00 28 */ b lbl_8002CDA8 -lbl_8002CD84: -/* 8002CD84 38 80 00 0C */ li r4, 0xc -/* 8002CD88 4B FF FE CD */ bl dComIfG_changeOpeningScene__FP11scene_classs -/* 8002CD8C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8002CD90 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 8002CD94 38 80 00 1E */ li r4, 0x1e -/* 8002CD98 38 A0 00 00 */ li r5, 0 -/* 8002CD9C 48 28 26 6D */ bl bgmStop__8Z2SeqMgrFUll -/* 8002CDA0 4B FD A4 E5 */ bl mDoAud_resetProcess__Fv -/* 8002CDA4 38 60 00 01 */ li r3, 1 -lbl_8002CDA8: -/* 8002CDA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CDAC 7C 08 03 A6 */ mtlr r0 -/* 8002CDB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CDB4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj.s b/asm/d/com/d_com_inf_game/dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj.s deleted file mode 100644 index f64d320e5a..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8002E910: -/* 8002E910 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002E914 7C 08 02 A6 */ mflr r0 -/* 8002E918 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E91C 7C 6A 1B 78 */ mr r10, r3 -/* 8002E920 7C 89 23 78 */ mr r9, r4 -/* 8002E924 7C A0 2B 78 */ mr r0, r5 -/* 8002E928 7C C7 33 78 */ mr r7, r6 -/* 8002E92C C0 02 83 00 */ lfs f0, lit_5090(r2) -/* 8002E930 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8002E934 4C 40 13 82 */ cror 2, 0, 2 -/* 8002E938 40 82 00 0C */ bne lbl_8002E944 -/* 8002E93C 38 60 00 00 */ li r3, 0 -/* 8002E940 48 00 00 24 */ b lbl_8002E964 -lbl_8002E944: -/* 8002E944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E948 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E94C 38 63 61 C0 */ addi r3, r3, 0x61c0 -/* 8002E950 7D 44 53 78 */ mr r4, r10 -/* 8002E954 7D 25 4B 78 */ mr r5, r9 -/* 8002E958 7C 06 03 78 */ mr r6, r0 -/* 8002E95C EC 43 20 28 */ fsubs f2, f3, f4 -/* 8002E960 48 02 73 15 */ bl setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c -lbl_8002E964: -/* 8002E964 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E968 7C 08 03 A6 */ mtlr r0 -/* 8002E96C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E970 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj.s b/asm/d/com/d_com_inf_game/dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj.s deleted file mode 100644 index 6407bc3680..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8002D0B4: -/* 8002D0B4 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8002D0B8 7C 08 02 A6 */ mflr r0 -/* 8002D0BC 90 01 00 64 */ stw r0, 0x64(r1) -/* 8002D0C0 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 8002D0C4 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 8002D0C8 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 8002D0CC F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 8002D0D0 DB A1 00 30 */ stfd f29, 0x30(r1) -/* 8002D0D4 F3 A1 00 38 */ psq_st f29, 56(r1), 0, 0 /* qr0 */ -/* 8002D0D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002D0DC 48 33 50 FD */ bl _savegpr_28 -/* 8002D0E0 7C 7C 1B 78 */ mr r28, r3 -/* 8002D0E4 FF A0 08 90 */ fmr f29, f1 -/* 8002D0E8 FF C0 10 90 */ fmr f30, f2 -/* 8002D0EC 7C 9D 23 78 */ mr r29, r4 -/* 8002D0F0 7C BE 2B 78 */ mr r30, r5 -/* 8002D0F4 FF E0 18 90 */ fmr f31, f3 -/* 8002D0F8 7C DF 33 78 */ mr r31, r6 -/* 8002D0FC 7F A3 EB 78 */ mr r3, r29 -/* 8002D100 48 23 AF F9 */ bl ChkSetInfo__13cBgS_PolyInfoCFv -/* 8002D104 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8002D108 41 82 00 70 */ beq lbl_8002D178 -/* 8002D10C C0 02 83 00 */ lfs f0, lit_5090(r2) -/* 8002D110 FC 00 E8 00 */ fcmpu cr0, f0, f29 -/* 8002D114 41 82 00 64 */ beq lbl_8002D178 -/* 8002D118 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8002D11C 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8002D120 90 01 00 18 */ stw r0, 0x18(r1) -/* 8002D124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D12C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8002D130 7F A4 EB 78 */ mr r4, r29 -/* 8002D134 38 A1 00 08 */ addi r5, r1, 8 -/* 8002D138 48 04 76 0D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 8002D13C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D140 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D144 38 63 61 C0 */ addi r3, r3, 0x61c0 -/* 8002D148 7F 84 E3 78 */ mr r4, r28 -/* 8002D14C FC 20 E8 90 */ fmr f1, f29 -/* 8002D150 FC 40 F0 90 */ fmr f2, f30 -/* 8002D154 38 A1 00 08 */ addi r5, r1, 8 -/* 8002D158 7F C6 F3 78 */ mr r6, r30 -/* 8002D15C FC 60 F8 90 */ fmr f3, f31 -/* 8002D160 7F E7 FB 78 */ mr r7, r31 -/* 8002D164 48 02 8E 21 */ bl setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj -/* 8002D168 3C 80 80 3A */ lis r4, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8002D16C 38 04 37 C0 */ addi r0, r4, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8002D170 90 01 00 18 */ stw r0, 0x18(r1) -/* 8002D174 48 00 00 08 */ b lbl_8002D17C -lbl_8002D178: -/* 8002D178 38 60 00 00 */ li r3, 0 -lbl_8002D17C: -/* 8002D17C E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 8002D180 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 8002D184 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 8002D188 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 8002D18C E3 A1 00 38 */ psq_l f29, 56(r1), 0, 0 /* qr0 */ -/* 8002D190 CB A1 00 30 */ lfd f29, 0x30(r1) -/* 8002D194 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002D198 48 33 50 8D */ bl _restgpr_28 -/* 8002D19C 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8002D1A0 7C 08 03 A6 */ mtlr r0 -/* 8002D1A4 38 21 00 60 */ addi r1, r1, 0x60 -/* 8002D1A8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_getMapTrans__FiPfPfPs.s b/asm/d/com/d_com_inf_game/dComIfGp_getMapTrans__FiPfPfPs.s deleted file mode 100644 index a25a4a3252..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_getMapTrans__FiPfPfPs.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8002D1AC: -/* 8002D1AC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002D1B0 7C 08 02 A6 */ mflr r0 -/* 8002D1B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002D1B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002D1BC 48 33 50 1D */ bl _savegpr_28 -/* 8002D1C0 7C 7C 1B 78 */ mr r28, r3 -/* 8002D1C4 7C 9D 23 78 */ mr r29, r4 -/* 8002D1C8 7C BE 2B 78 */ mr r30, r5 -/* 8002D1CC 7C DF 33 78 */ mr r31, r6 -/* 8002D1D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D1D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D1D8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8002D1DC 81 8C 01 2C */ lwz r12, 0x12c(r12) -/* 8002D1E0 7D 89 03 A6 */ mtctr r12 -/* 8002D1E4 4E 80 04 21 */ bctrl -/* 8002D1E8 28 03 00 00 */ cmplwi r3, 0 -/* 8002D1EC 40 82 00 0C */ bne lbl_8002D1F8 -/* 8002D1F0 38 60 00 00 */ li r3, 0 -/* 8002D1F4 48 00 00 50 */ b lbl_8002D244 -lbl_8002D1F8: -/* 8002D1F8 80 83 00 04 */ lwz r4, 4(r3) -/* 8002D1FC 80 03 00 00 */ lwz r0, 0(r3) -/* 8002D200 7C 09 03 A6 */ mtctr r0 -/* 8002D204 2C 00 00 00 */ cmpwi r0, 0 -/* 8002D208 40 81 00 38 */ ble lbl_8002D240 -lbl_8002D20C: -/* 8002D20C 88 04 00 0A */ lbz r0, 0xa(r4) -/* 8002D210 7C 1C 00 00 */ cmpw r28, r0 -/* 8002D214 40 82 00 24 */ bne lbl_8002D238 -/* 8002D218 C0 04 00 00 */ lfs f0, 0(r4) -/* 8002D21C D0 1D 00 00 */ stfs f0, 0(r29) -/* 8002D220 C0 04 00 04 */ lfs f0, 4(r4) -/* 8002D224 D0 1E 00 00 */ stfs f0, 0(r30) -/* 8002D228 A8 04 00 08 */ lha r0, 8(r4) -/* 8002D22C B0 1F 00 00 */ sth r0, 0(r31) -/* 8002D230 38 60 00 01 */ li r3, 1 -/* 8002D234 48 00 00 10 */ b lbl_8002D244 -lbl_8002D238: -/* 8002D238 38 84 00 0C */ addi r4, r4, 0xc -/* 8002D23C 42 00 FF D0 */ bdnz lbl_8002D20C -lbl_8002D240: -/* 8002D240 38 60 00 00 */ li r3, 0 -lbl_8002D244: -/* 8002D244 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002D248 48 33 4F DD */ bl _restgpr_28 -/* 8002D24C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002D250 7C 08 03 A6 */ mtlr r0 -/* 8002D254 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002D258 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_getNowLevel__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_getNowLevel__Fv.s deleted file mode 100644 index a1a628750d..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_getNowLevel__Fv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8002EE60: -/* 8002EE60 38 00 FF FF */ li r0, -1 -/* 8002EE64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EE68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EE6C 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8002EE70 28 03 00 00 */ cmplwi r3, 0 -/* 8002EE74 41 82 00 0C */ beq lbl_8002EE80 -/* 8002EE78 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 8002EE7C 7C 00 07 74 */ extsb r0, r0 -lbl_8002EE80: -/* 8002EE80 2C 00 00 00 */ cmpwi r0, 0 -/* 8002EE84 40 80 00 14 */ bge lbl_8002EE98 -/* 8002EE88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EE8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EE90 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 8002EE94 7C 00 07 74 */ extsb r0, r0 -lbl_8002EE98: -/* 8002EE98 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8002EE9C 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 8002EEA0 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 8002EEA4 7C 63 02 14 */ add r3, r3, r0 -/* 8002EEA8 88 63 03 F9 */ lbz r3, 0x3f9(r3) -/* 8002EEAC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_getRoomArrow__Fi.s b/asm/d/com/d_com_inf_game/dComIfGp_getRoomArrow__Fi.s deleted file mode 100644 index 457cf72b70..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_getRoomArrow__Fi.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8002D2AC: -/* 8002D2AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D2B0 7C 08 02 A6 */ mflr r0 -/* 8002D2B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D2B8 7C 64 1B 78 */ mr r4, r3 -/* 8002D2BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D2C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D2C4 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8002D2C8 4B FF 70 BD */ bl getStatusRoomDt__20dStage_roomControl_cFi -/* 8002D2CC 28 03 00 00 */ cmplwi r3, 0 -/* 8002D2D0 40 82 00 0C */ bne lbl_8002D2DC -/* 8002D2D4 38 60 00 00 */ li r3, 0 -/* 8002D2D8 48 00 00 14 */ b lbl_8002D2EC -lbl_8002D2DC: -/* 8002D2DC 81 83 00 00 */ lwz r12, 0(r3) -/* 8002D2E0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8002D2E4 7D 89 03 A6 */ mtctr r12 -/* 8002D2E8 4E 80 04 21 */ bctrl -lbl_8002D2EC: -/* 8002D2EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D2F0 7C 08 03 A6 */ mtlr r0 -/* 8002D2F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D2F8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_getRoomCamera__Fi.s b/asm/d/com/d_com_inf_game/dComIfGp_getRoomCamera__Fi.s deleted file mode 100644 index 28acbc462d..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_getRoomCamera__Fi.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8002D25C: -/* 8002D25C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D260 7C 08 02 A6 */ mflr r0 -/* 8002D264 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D268 7C 64 1B 78 */ mr r4, r3 -/* 8002D26C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D270 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D274 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8002D278 4B FF 71 0D */ bl getStatusRoomDt__20dStage_roomControl_cFi -/* 8002D27C 28 03 00 00 */ cmplwi r3, 0 -/* 8002D280 40 82 00 0C */ bne lbl_8002D28C -/* 8002D284 38 60 00 00 */ li r3, 0 -/* 8002D288 48 00 00 14 */ b lbl_8002D29C -lbl_8002D28C: -/* 8002D28C 81 83 00 00 */ lwz r12, 0(r3) -/* 8002D290 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8002D294 7D 89 03 A6 */ mtctr r12 -/* 8002D298 4E 80 04 21 */ bctrl -lbl_8002D29C: -/* 8002D29C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D2A0 7C 08 03 A6 */ mtlr r0 -/* 8002D2A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D2A8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_getSelectItem__Fi.s b/asm/d/com/d_com_inf_game/dComIfGp_getSelectItem__Fi.s deleted file mode 100644 index afa95312e2..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_getSelectItem__Fi.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_8002DF1C: -/* 8002DF1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002DF20 7C 08 02 A6 */ mflr r0 -/* 8002DF24 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002DF28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002DF2C 93 C1 00 08 */ stw r30, 8(r1) -/* 8002DF30 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8002DF34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DF38 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DF3C 7C 60 F2 14 */ add r3, r0, r30 -/* 8002DF40 8B E3 5E 6C */ lbz r31, 0x5e6c(r3) -/* 8002DF44 41 82 00 0C */ beq lbl_8002DF50 -/* 8002DF48 2C 1E 00 01 */ cmpwi r30, 1 -/* 8002DF4C 40 82 00 E0 */ bne lbl_8002E02C -lbl_8002DF50: -/* 8002DF50 7F C3 F3 78 */ mr r3, r30 -/* 8002DF54 4B FF FE 75 */ bl dComIfGs_getMixItemIndex__Fi -/* 8002DF58 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002DF5C 28 00 00 FF */ cmplwi r0, 0xff -/* 8002DF60 41 82 00 CC */ beq lbl_8002E02C -/* 8002DF64 7F C3 F3 78 */ mr r3, r30 -/* 8002DF68 4B FF FE 61 */ bl dComIfGs_getMixItemIndex__Fi -/* 8002DF6C 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8002DF70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DF74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DF78 38 63 00 9C */ addi r3, r3, 0x9c -/* 8002DF7C 38 A0 00 00 */ li r5, 0 -/* 8002DF80 48 00 50 B1 */ bl getItem__17dSv_player_item_cCFib -/* 8002DF84 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002DF88 28 00 00 43 */ cmplwi r0, 0x43 -/* 8002DF8C 40 82 00 10 */ bne lbl_8002DF9C -/* 8002DF90 7F E3 FB 78 */ mr r3, r31 -/* 8002DF94 3B E0 00 43 */ li r31, 0x43 -/* 8002DF98 48 00 00 14 */ b lbl_8002DFAC -lbl_8002DF9C: -/* 8002DF9C 28 00 00 4A */ cmplwi r0, 0x4a -/* 8002DFA0 40 82 00 0C */ bne lbl_8002DFAC -/* 8002DFA4 7F E3 FB 78 */ mr r3, r31 -/* 8002DFA8 3B E0 00 4A */ li r31, 0x4a -lbl_8002DFAC: -/* 8002DFAC 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8002DFB0 28 00 00 43 */ cmplwi r0, 0x43 -/* 8002DFB4 40 82 00 34 */ bne lbl_8002DFE8 -/* 8002DFB8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002DFBC 2C 00 00 70 */ cmpwi r0, 0x70 -/* 8002DFC0 40 80 00 10 */ bge lbl_8002DFD0 -/* 8002DFC4 2C 00 00 3E */ cmpwi r0, 0x3e -/* 8002DFC8 41 82 00 18 */ beq lbl_8002DFE0 -/* 8002DFCC 48 00 00 60 */ b lbl_8002E02C -lbl_8002DFD0: -/* 8002DFD0 2C 00 00 73 */ cmpwi r0, 0x73 -/* 8002DFD4 40 80 00 58 */ bge lbl_8002E02C -/* 8002DFD8 3B E0 00 59 */ li r31, 0x59 -/* 8002DFDC 48 00 00 50 */ b lbl_8002E02C -lbl_8002DFE0: -/* 8002DFE0 3B E0 00 5A */ li r31, 0x5a -/* 8002DFE4 48 00 00 48 */ b lbl_8002E02C -lbl_8002DFE8: -/* 8002DFE8 28 00 00 4A */ cmplwi r0, 0x4a -/* 8002DFEC 40 82 00 40 */ bne lbl_8002E02C -/* 8002DFF0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002DFF4 2C 00 00 74 */ cmpwi r0, 0x74 -/* 8002DFF8 41 82 00 28 */ beq lbl_8002E020 -/* 8002DFFC 40 80 00 10 */ bge lbl_8002E00C -/* 8002E000 2C 00 00 3D */ cmpwi r0, 0x3d -/* 8002E004 41 82 00 24 */ beq lbl_8002E028 -/* 8002E008 48 00 00 24 */ b lbl_8002E02C -lbl_8002E00C: -/* 8002E00C 2C 00 00 76 */ cmpwi r0, 0x76 -/* 8002E010 41 82 00 08 */ beq lbl_8002E018 -/* 8002E014 48 00 00 18 */ b lbl_8002E02C -lbl_8002E018: -/* 8002E018 3B E0 00 5B */ li r31, 0x5b -/* 8002E01C 48 00 00 10 */ b lbl_8002E02C -lbl_8002E020: -/* 8002E020 3B E0 00 5D */ li r31, 0x5d -/* 8002E024 48 00 00 08 */ b lbl_8002E02C -lbl_8002E028: -/* 8002E028 3B E0 00 5C */ li r31, 0x5c -lbl_8002E02C: -/* 8002E02C 7F E3 FB 78 */ mr r3, r31 -/* 8002E030 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002E034 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002E038 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E03C 7C 08 03 A6 */ mtlr r0 -/* 8002E040 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E044 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_setSelectItemNum__Fis.s b/asm/d/com/d_com_inf_game/dComIfGp_setSelectItemNum__Fis.s deleted file mode 100644 index 9a8ddd02a6..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_setSelectItemNum__Fis.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_8002E714: -/* 8002E714 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002E718 7C 08 02 A6 */ mflr r0 -/* 8002E71C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002E720 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E724 48 33 3A B5 */ bl _savegpr_28 -/* 8002E728 7C 7C 1B 78 */ mr r28, r3 -/* 8002E72C 7C 9F 23 78 */ mr r31, r4 -/* 8002E730 4B FF F7 ED */ bl dComIfGp_getSelectItem__Fi -/* 8002E734 7C 7D 1B 78 */ mr r29, r3 -/* 8002E738 38 1D FF 90 */ addi r0, r29, -112 -/* 8002E73C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8002E740 28 00 00 02 */ cmplwi r0, 2 -/* 8002E744 40 81 00 10 */ ble lbl_8002E754 -/* 8002E748 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8002E74C 28 00 00 59 */ cmplwi r0, 0x59 -/* 8002E750 40 82 00 68 */ bne lbl_8002E7B8 -lbl_8002E754: -/* 8002E754 7F 83 E3 78 */ mr r3, r28 -/* 8002E758 4B FF F5 E5 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi -/* 8002E75C 38 03 FF F1 */ addi r0, r3, -15 -/* 8002E760 54 1C 06 3E */ clrlwi r28, r0, 0x18 -/* 8002E764 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E768 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E76C 3B C3 00 F8 */ addi r30, r3, 0xf8 -/* 8002E770 7F C3 F3 78 */ mr r3, r30 -/* 8002E774 7F A4 EB 78 */ mr r4, r29 -/* 8002E778 48 00 59 81 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8002E77C 7F E4 07 34 */ extsh r4, r31 -/* 8002E780 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002E784 7C 04 00 00 */ cmpw r4, r0 -/* 8002E788 40 81 00 14 */ ble lbl_8002E79C -/* 8002E78C 7F C3 F3 78 */ mr r3, r30 -/* 8002E790 7F A4 EB 78 */ mr r4, r29 -/* 8002E794 48 00 59 65 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8002E798 54 7F 06 3E */ clrlwi r31, r3, 0x18 -lbl_8002E79C: -/* 8002E79C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E7A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E7A4 38 63 00 EC */ addi r3, r3, 0xec -/* 8002E7A8 7F 84 E3 78 */ mr r4, r28 -/* 8002E7AC 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 8002E7B0 48 00 57 BD */ bl setBombNum__24dSv_player_item_record_cFUcUc -/* 8002E7B4 48 00 00 70 */ b lbl_8002E824 -lbl_8002E7B8: -/* 8002E7B8 28 00 00 4B */ cmplwi r0, 0x4b -/* 8002E7BC 40 82 00 14 */ bne lbl_8002E7D0 -/* 8002E7C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E7C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E7C8 9B E3 00 F4 */ stb r31, 0xf4(r3) -/* 8002E7CC 48 00 00 58 */ b lbl_8002E824 -lbl_8002E7D0: -/* 8002E7D0 28 00 00 76 */ cmplwi r0, 0x76 -/* 8002E7D4 40 82 00 50 */ bne lbl_8002E824 -/* 8002E7D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E7DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E7E0 7F 84 E3 78 */ mr r4, r28 -/* 8002E7E4 48 00 42 79 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8002E7E8 38 03 FF F5 */ addi r0, r3, -11 -/* 8002E7EC 54 1C 06 3E */ clrlwi r28, r0, 0x18 -/* 8002E7F0 4B FF FD C9 */ bl dComIfGs_getBottleMax__Fv -/* 8002E7F4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8002E7F8 7F E0 07 34 */ extsh r0, r31 -/* 8002E7FC 7C 00 18 00 */ cmpw r0, r3 -/* 8002E800 40 81 00 0C */ ble lbl_8002E80C -/* 8002E804 4B FF FD B5 */ bl dComIfGs_getBottleMax__Fv -/* 8002E808 54 7F 06 3E */ clrlwi r31, r3, 0x18 -lbl_8002E80C: -/* 8002E80C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E810 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E814 38 63 00 EC */ addi r3, r3, 0xec -/* 8002E818 7F 84 E3 78 */ mr r4, r28 -/* 8002E81C 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 8002E820 48 00 57 6D */ bl setBottleNum__24dSv_player_item_record_cFUcUc -lbl_8002E824: -/* 8002E824 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E828 48 33 39 FD */ bl _restgpr_28 -/* 8002E82C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002E830 7C 08 03 A6 */ mtlr r0 -/* 8002E834 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002E838 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_Wolf_Change_Check__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_Wolf_Change_Check__Fv.s deleted file mode 100644 index b20a582262..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_Wolf_Change_Check__Fv.s +++ /dev/null @@ -1,128 +0,0 @@ -lbl_8002F810: -/* 8002F810 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002F814 7C 08 02 A6 */ mflr r0 -/* 8002F818 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002F81C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002F820 93 C1 00 08 */ stw r30, 8(r1) -/* 8002F824 3B E0 00 00 */ li r31, 0 -/* 8002F828 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F82C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F830 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8002F834 38 80 0D 04 */ li r4, 0xd04 -/* 8002F838 48 00 51 85 */ bl isEventBit__11dSv_event_cCFUs -/* 8002F83C 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F840 41 82 00 14 */ beq lbl_8002F854 -/* 8002F844 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F848 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F84C 8B E3 00 1E */ lbz r31, 0x1e(r3) -/* 8002F850 48 00 00 CC */ b lbl_8002F91C -lbl_8002F854: -/* 8002F854 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F858 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F85C 3B C3 00 28 */ addi r30, r3, 0x28 -/* 8002F860 7F C3 F3 78 */ mr r3, r30 -/* 8002F864 38 80 00 00 */ li r4, 0 -/* 8002F868 48 00 33 85 */ bl isTransformLV__21dSv_player_status_b_cCFi -/* 8002F86C 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F870 41 82 00 20 */ beq lbl_8002F890 -/* 8002F874 7F C3 F3 78 */ mr r3, r30 -/* 8002F878 38 80 00 00 */ li r4, 0 -/* 8002F87C 48 00 33 35 */ bl isDarkClearLV__21dSv_player_status_b_cCFi -/* 8002F880 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F884 40 82 00 0C */ bne lbl_8002F890 -/* 8002F888 3B E0 00 01 */ li r31, 1 -/* 8002F88C 48 00 00 90 */ b lbl_8002F91C -lbl_8002F890: -/* 8002F890 7F C3 F3 78 */ mr r3, r30 -/* 8002F894 38 80 00 01 */ li r4, 1 -/* 8002F898 48 00 33 55 */ bl isTransformLV__21dSv_player_status_b_cCFi -/* 8002F89C 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F8A0 41 82 00 20 */ beq lbl_8002F8C0 -/* 8002F8A4 7F C3 F3 78 */ mr r3, r30 -/* 8002F8A8 38 80 00 01 */ li r4, 1 -/* 8002F8AC 48 00 33 05 */ bl isDarkClearLV__21dSv_player_status_b_cCFi -/* 8002F8B0 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F8B4 40 82 00 0C */ bne lbl_8002F8C0 -/* 8002F8B8 3B E0 00 01 */ li r31, 1 -/* 8002F8BC 48 00 00 60 */ b lbl_8002F91C -lbl_8002F8C0: -/* 8002F8C0 7F C3 F3 78 */ mr r3, r30 -/* 8002F8C4 38 80 00 02 */ li r4, 2 -/* 8002F8C8 48 00 33 25 */ bl isTransformLV__21dSv_player_status_b_cCFi -/* 8002F8CC 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F8D0 41 82 00 20 */ beq lbl_8002F8F0 -/* 8002F8D4 7F C3 F3 78 */ mr r3, r30 -/* 8002F8D8 38 80 00 02 */ li r4, 2 -/* 8002F8DC 48 00 32 D5 */ bl isDarkClearLV__21dSv_player_status_b_cCFi -/* 8002F8E0 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F8E4 40 82 00 0C */ bne lbl_8002F8F0 -/* 8002F8E8 3B E0 00 01 */ li r31, 1 -/* 8002F8EC 48 00 00 30 */ b lbl_8002F91C -lbl_8002F8F0: -/* 8002F8F0 7F C3 F3 78 */ mr r3, r30 -/* 8002F8F4 38 80 00 03 */ li r4, 3 -/* 8002F8F8 48 00 32 F5 */ bl isTransformLV__21dSv_player_status_b_cCFi -/* 8002F8FC 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F900 41 82 00 1C */ beq lbl_8002F91C -/* 8002F904 7F C3 F3 78 */ mr r3, r30 -/* 8002F908 38 80 00 03 */ li r4, 3 -/* 8002F90C 48 00 32 A5 */ bl isDarkClearLV__21dSv_player_status_b_cCFi -/* 8002F910 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F914 40 82 00 08 */ bne lbl_8002F91C -/* 8002F918 3B E0 00 01 */ li r31, 1 -lbl_8002F91C: -/* 8002F91C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F920 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F924 3B C3 4E 00 */ addi r30, r3, 0x4e00 -/* 8002F928 7F C3 F3 78 */ mr r3, r30 -/* 8002F92C 3C 80 80 38 */ lis r4, d_com_d_com_inf_game__stringBase0@ha /* 0x80378F38@ha */ -/* 8002F930 38 84 8F 38 */ addi r4, r4, d_com_d_com_inf_game__stringBase0@l /* 0x80378F38@l */ -/* 8002F934 38 84 00 AD */ addi r4, r4, 0xad -/* 8002F938 48 33 90 5D */ bl strcmp -/* 8002F93C 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F940 40 82 00 40 */ bne lbl_8002F980 -/* 8002F944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F948 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F94C 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 8002F950 2C 00 00 02 */ cmpwi r0, 2 -/* 8002F954 40 82 00 2C */ bne lbl_8002F980 -/* 8002F958 A8 03 4E 08 */ lha r0, 0x4e08(r3) -/* 8002F95C 2C 00 00 0A */ cmpwi r0, 0xa -/* 8002F960 40 82 00 20 */ bne lbl_8002F980 -/* 8002F964 38 63 09 58 */ addi r3, r3, 0x958 -/* 8002F968 38 80 00 0C */ li r4, 0xc -/* 8002F96C 48 00 4E F5 */ bl isSwitch__12dSv_memBit_cCFi -/* 8002F970 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F974 40 82 00 0C */ bne lbl_8002F980 -/* 8002F978 3B E0 00 00 */ li r31, 0 -/* 8002F97C 48 00 00 58 */ b lbl_8002F9D4 -lbl_8002F980: -/* 8002F980 7F C3 F3 78 */ mr r3, r30 -/* 8002F984 3C 80 80 38 */ lis r4, d_com_d_com_inf_game__stringBase0@ha /* 0x80378F38@ha */ -/* 8002F988 38 84 8F 38 */ addi r4, r4, d_com_d_com_inf_game__stringBase0@l /* 0x80378F38@l */ -/* 8002F98C 38 84 00 AD */ addi r4, r4, 0xad -/* 8002F990 48 33 90 05 */ bl strcmp -/* 8002F994 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F998 40 82 00 3C */ bne lbl_8002F9D4 -/* 8002F99C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F9A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F9A4 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 8002F9A8 2C 00 00 09 */ cmpwi r0, 9 -/* 8002F9AC 40 82 00 28 */ bne lbl_8002F9D4 -/* 8002F9B0 A8 03 4E 08 */ lha r0, 0x4e08(r3) -/* 8002F9B4 2C 00 00 0A */ cmpwi r0, 0xa -/* 8002F9B8 40 82 00 1C */ bne lbl_8002F9D4 -/* 8002F9BC 38 63 09 58 */ addi r3, r3, 0x958 -/* 8002F9C0 38 80 00 0D */ li r4, 0xd -/* 8002F9C4 48 00 4E 9D */ bl isSwitch__12dSv_memBit_cCFi -/* 8002F9C8 2C 03 00 00 */ cmpwi r3, 0 -/* 8002F9CC 40 82 00 08 */ bne lbl_8002F9D4 -/* 8002F9D0 3B E0 00 00 */ li r31, 0 -lbl_8002F9D4: -/* 8002F9D4 7F E3 FB 78 */ mr r3, r31 -/* 8002F9D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002F9DC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002F9E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002F9E4 7C 08 03 A6 */ mtlr r0 -/* 8002F9E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F9EC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_gameStart__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_gameStart__Fv.s deleted file mode 100644 index 93722fcf00..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_gameStart__Fv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8002E974: -/* 8002E974 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002E978 7C 08 02 A6 */ mflr r0 -/* 8002E97C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E980 38 C0 00 00 */ li r6, 0 -/* 8002E984 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E988 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E98C 98 C3 4E 1C */ stb r6, 0x4e1c(r3) -/* 8002E990 38 63 00 58 */ addi r3, r3, 0x58 -/* 8002E994 88 03 00 09 */ lbz r0, 9(r3) -/* 8002E998 7C 05 07 74 */ extsb r5, r0 -/* 8002E99C 88 83 00 08 */ lbz r4, 8(r3) -/* 8002E9A0 90 C1 00 08 */ stw r6, 8(r1) -/* 8002E9A4 90 C1 00 0C */ stw r6, 0xc(r1) -/* 8002E9A8 38 C0 FF FF */ li r6, -1 -/* 8002E9AC C0 22 83 04 */ lfs f1, lit_5226(r2) -/* 8002E9B0 38 E0 00 00 */ li r7, 0 -/* 8002E9B4 39 00 00 01 */ li r8, 1 -/* 8002E9B8 39 20 00 00 */ li r9, 0 -/* 8002E9BC 39 40 00 00 */ li r10, 0 -/* 8002E9C0 4B FF E9 3D */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii -/* 8002E9C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E9C8 7C 08 03 A6 */ mtlr r0 -/* 8002E9CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E9D0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_getSelectMixItemNoArrowIndex__Fi.s b/asm/d/com/d_com_inf_game/dComIfGs_getSelectMixItemNoArrowIndex__Fi.s deleted file mode 100644 index 72194d52e4..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_getSelectMixItemNoArrowIndex__Fi.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8002DD3C: -/* 8002DD3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002DD40 7C 08 02 A6 */ mflr r0 -/* 8002DD44 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002DD48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002DD4C 93 C1 00 08 */ stw r30, 8(r1) -/* 8002DD50 7C 7E 1B 78 */ mr r30, r3 -/* 8002DD54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DD58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DD5C 7F C4 F3 78 */ mr r4, r30 -/* 8002DD60 48 00 4C FD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8002DD64 7C 7F 1B 78 */ mr r31, r3 -/* 8002DD68 7F C3 F3 78 */ mr r3, r30 -/* 8002DD6C 48 00 00 5D */ bl dComIfGs_getMixItemIndex__Fi -/* 8002DD70 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8002DD74 28 00 00 0F */ cmplwi r0, 0xf -/* 8002DD78 41 80 00 14 */ blt lbl_8002DD8C -/* 8002DD7C 28 00 00 12 */ cmplwi r0, 0x12 -/* 8002DD80 40 80 00 0C */ bge lbl_8002DD8C -/* 8002DD84 7F E3 FB 78 */ mr r3, r31 -/* 8002DD88 48 00 00 28 */ b lbl_8002DDB0 -lbl_8002DD8C: -/* 8002DD8C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002DD90 28 00 00 FF */ cmplwi r0, 0xff -/* 8002DD94 41 82 00 18 */ beq lbl_8002DDAC -/* 8002DD98 28 00 00 0F */ cmplwi r0, 0xf -/* 8002DD9C 41 80 00 10 */ blt lbl_8002DDAC -/* 8002DDA0 28 00 00 12 */ cmplwi r0, 0x12 -/* 8002DDA4 40 80 00 08 */ bge lbl_8002DDAC -/* 8002DDA8 48 00 00 08 */ b lbl_8002DDB0 -lbl_8002DDAC: -/* 8002DDAC 38 60 00 FF */ li r3, 0xff -lbl_8002DDB0: -/* 8002DDB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002DDB4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002DDB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002DDBC 7C 08 03 A6 */ mtlr r0 -/* 8002DDC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002DDC4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_getWarpPlayerPos__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_getWarpPlayerPos__Fv.s deleted file mode 100644 index f9bbc6940f..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_getWarpPlayerPos__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8002F2BC: -/* 8002F2BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F2C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F2C4 38 63 00 80 */ addi r3, r3, 0x80 -/* 8002F2C8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_staffroll_next_go__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_staffroll_next_go__Fv.s deleted file mode 100644 index 9c217d7b73..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_staffroll_next_go__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002FCF4: -/* 8002FCF4 38 00 00 01 */ li r0, 1 -/* 8002FCF8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8002FCFC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8002FD00 98 03 13 0C */ stb r0, 0x130c(r3) -/* 8002FD04 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_staffroll_next_go_check__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_staffroll_next_go_check__Fv.s deleted file mode 100644 index c87a7e1070..0000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_staffroll_next_go_check__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8002FD08: -/* 8002FD08 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8002FD0C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8002FD10 88 63 13 0C */ lbz r3, 0x130c(r3) -/* 8002FD14 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/deleteSimpleModel__14dComIfG_play_cFv.s b/asm/d/com/d_com_inf_game/deleteSimpleModel__14dComIfG_play_cFv.s deleted file mode 100644 index 745659f2e0..0000000000 --- a/asm/d/com/d_com_inf_game/deleteSimpleModel__14dComIfG_play_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8002CA70: -/* 8002CA70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CA74 7C 08 02 A6 */ mflr r0 -/* 8002CA78 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CA7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002CA80 7C 7F 1B 78 */ mr r31, r3 -/* 8002CA84 80 63 4E 08 */ lwz r3, 0x4e08(r3) -/* 8002CA88 28 03 00 00 */ cmplwi r3, 0 -/* 8002CA8C 41 82 00 24 */ beq lbl_8002CAB0 -/* 8002CA90 41 82 00 18 */ beq lbl_8002CAA8 -/* 8002CA94 38 80 00 01 */ li r4, 1 -/* 8002CA98 81 83 00 00 */ lwz r12, 0(r3) -/* 8002CA9C 81 8C 00 08 */ lwz r12, 8(r12) -/* 8002CAA0 7D 89 03 A6 */ mtctr r12 -/* 8002CAA4 4E 80 04 21 */ bctrl -lbl_8002CAA8: -/* 8002CAA8 38 00 00 00 */ li r0, 0 -/* 8002CAAC 90 1F 4E 08 */ stw r0, 0x4e08(r31) -lbl_8002CAB0: -/* 8002CAB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002CAB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CAB8 7C 08 03 A6 */ mtlr r0 -/* 8002CABC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CAC0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/drawSimpleModel__14dComIfG_play_cFv.s b/asm/d/com/d_com_inf_game/drawSimpleModel__14dComIfG_play_cFv.s deleted file mode 100644 index a5845c9cd2..0000000000 --- a/asm/d/com/d_com_inf_game/drawSimpleModel__14dComIfG_play_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8002CAC4: -/* 8002CAC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CAC8 7C 08 02 A6 */ mflr r0 -/* 8002CACC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CAD0 80 63 4E 08 */ lwz r3, 0x4e08(r3) -/* 8002CAD4 28 03 00 00 */ cmplwi r3, 0 -/* 8002CAD8 41 82 00 08 */ beq lbl_8002CAE0 -/* 8002CADC 48 01 C3 31 */ bl draw__15dSmplMdl_draw_cFv -lbl_8002CAE0: -/* 8002CAE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CAE4 7C 08 03 A6 */ mtlr r0 -/* 8002CAE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CAEC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/entrySimpleModel__14dComIfG_play_cFP8J3DModeli.s b/asm/d/com/d_com_inf_game/entrySimpleModel__14dComIfG_play_cFP8J3DModeli.s deleted file mode 100644 index bdd0a9455b..0000000000 --- a/asm/d/com/d_com_inf_game/entrySimpleModel__14dComIfG_play_cFP8J3DModeli.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8002CB68: -/* 8002CB68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CB6C 7C 08 02 A6 */ mflr r0 -/* 8002CB70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CB74 80 63 4E 08 */ lwz r3, 0x4e08(r3) -/* 8002CB78 28 03 00 00 */ cmplwi r3, 0 -/* 8002CB7C 41 82 00 08 */ beq lbl_8002CB84 -/* 8002CB80 48 01 C3 3D */ bl entry__15dSmplMdl_draw_cFP8J3DModeli -lbl_8002CB84: -/* 8002CB84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CB88 7C 08 03 A6 */ mtlr r0 -/* 8002CB8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CB90 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/getLayerNo__14dComIfG_play_cFi.s b/asm/d/com/d_com_inf_game/getLayerNo__14dComIfG_play_cFi.s deleted file mode 100644 index 40e156b288..0000000000 --- a/asm/d/com/d_com_inf_game/getLayerNo__14dComIfG_play_cFi.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8002C97C: -/* 8002C97C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002C980 7C 08 02 A6 */ mflr r0 -/* 8002C984 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002C988 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) -/* 8002C98C 7C 00 07 74 */ extsb r0, r0 -/* 8002C990 7C 04 03 78 */ mr r4, r0 -/* 8002C994 2C 00 FF FF */ cmpwi r0, -1 -/* 8002C998 41 81 00 18 */ bgt lbl_8002C9B0 -/* 8002C99C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002C9A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002C9A4 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 8002C9A8 7C 00 07 74 */ extsb r0, r0 -/* 8002C9AC 7C 04 03 78 */ mr r4, r0 -lbl_8002C9B0: -/* 8002C9B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002C9B4 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002C9B8 38 65 4E 00 */ addi r3, r5, 0x4e00 -/* 8002C9BC 88 05 4E 0B */ lbz r0, 0x4e0b(r5) -/* 8002C9C0 7C 05 07 74 */ extsb r5, r0 -/* 8002C9C4 4B FF FF 8D */ bl getLayerNo_common__14dComIfG_play_cFPCcii -/* 8002C9C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002C9CC 7C 08 03 A6 */ mtlr r0 -/* 8002C9D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002C9D4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/load__19dComIfG_resLoader_cFPPCcP7JKRHeap.s b/asm/d/com/d_com_inf_game/load__19dComIfG_resLoader_cFPPCcP7JKRHeap.s deleted file mode 100644 index b285eae0b2..0000000000 --- a/asm/d/com/d_com_inf_game/load__19dComIfG_resLoader_cFPPCcP7JKRHeap.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8002F3B4: -/* 8002F3B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002F3B8 7C 08 02 A6 */ mflr r0 -/* 8002F3BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002F3C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002F3C4 7C 7F 1B 78 */ mr r31, r3 -/* 8002F3C8 90 83 00 00 */ stw r4, 0(r3) -/* 8002F3CC 38 7F 00 04 */ addi r3, r31, 4 -/* 8002F3D0 80 9F 00 00 */ lwz r4, 0(r31) -/* 8002F3D4 88 1F 00 0C */ lbz r0, 0xc(r31) -/* 8002F3D8 54 00 10 3A */ slwi r0, r0, 2 -/* 8002F3DC 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8002F3E0 4B FF DB E1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap -/* 8002F3E4 2C 03 00 04 */ cmpwi r3, 4 -/* 8002F3E8 40 82 00 38 */ bne lbl_8002F420 -/* 8002F3EC 80 9F 00 00 */ lwz r4, 0(r31) -/* 8002F3F0 88 BF 00 0C */ lbz r5, 0xc(r31) -/* 8002F3F4 54 A0 10 3A */ slwi r0, r5, 2 -/* 8002F3F8 7C 84 02 14 */ add r4, r4, r0 -/* 8002F3FC 80 84 00 04 */ lwz r4, 4(r4) -/* 8002F400 88 04 00 00 */ lbz r0, 0(r4) -/* 8002F404 7C 00 07 75 */ extsb. r0, r0 -/* 8002F408 41 82 00 18 */ beq lbl_8002F420 -/* 8002F40C 38 05 00 01 */ addi r0, r5, 1 -/* 8002F410 98 1F 00 0C */ stb r0, 0xc(r31) -/* 8002F414 38 00 00 00 */ li r0, 0 -/* 8002F418 90 1F 00 08 */ stw r0, 8(r31) -/* 8002F41C 38 60 00 00 */ li r3, 0 -lbl_8002F420: -/* 8002F420 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002F424 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002F428 7C 08 03 A6 */ mtlr r0 -/* 8002F42C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F430 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai.s b/asm/d/com/d_com_inf_game/removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai.s deleted file mode 100644 index 8c7794021b..0000000000 --- a/asm/d/com/d_com_inf_game/removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8002CB30: -/* 8002CB30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CB34 7C 08 02 A6 */ mflr r0 -/* 8002CB38 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CB3C 80 63 4E 08 */ lwz r3, 0x4e08(r3) -/* 8002CB40 28 03 00 00 */ cmplwi r3, 0 -/* 8002CB44 41 82 00 10 */ beq lbl_8002CB54 -/* 8002CB48 48 01 C5 11 */ bl removeModel__15dSmplMdl_draw_cFP12J3DModelDatai -/* 8002CB4C 38 60 00 01 */ li r3, 1 -/* 8002CB50 48 00 00 08 */ b lbl_8002CB58 -lbl_8002CB54: -/* 8002CB54 38 60 00 00 */ li r3, 0 -lbl_8002CB58: -/* 8002CB58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CB5C 7C 08 03 A6 */ mtlr r0 -/* 8002CB60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CB64 4E 80 00 20 */ blr diff --git a/asm/d/d_item/isBottleItem__FUc.s b/asm/d/d_item/isBottleItem__FUc.s deleted file mode 100644 index 18db966d7f..0000000000 --- a/asm/d/d_item/isBottleItem__FUc.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8009B708: -/* 8009B708 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B70C 2C 00 00 9D */ cmpwi r0, 0x9d -/* 8009B710 41 82 00 5C */ beq lbl_8009B76C -/* 8009B714 40 80 00 3C */ bge lbl_8009B750 -/* 8009B718 2C 00 00 75 */ cmpwi r0, 0x75 -/* 8009B71C 41 82 00 58 */ beq lbl_8009B774 -/* 8009B720 40 80 00 24 */ bge lbl_8009B744 -/* 8009B724 2C 00 00 6D */ cmpwi r0, 0x6d -/* 8009B728 40 80 00 10 */ bge lbl_8009B738 -/* 8009B72C 2C 00 00 60 */ cmpwi r0, 0x60 -/* 8009B730 40 80 00 3C */ bge lbl_8009B76C -/* 8009B734 48 00 00 40 */ b lbl_8009B774 -lbl_8009B738: -/* 8009B738 2C 00 00 73 */ cmpwi r0, 0x73 -/* 8009B73C 40 80 00 30 */ bge lbl_8009B76C -/* 8009B740 48 00 00 34 */ b lbl_8009B774 -lbl_8009B744: -/* 8009B744 2C 00 00 80 */ cmpwi r0, 0x80 -/* 8009B748 40 80 00 2C */ bge lbl_8009B774 -/* 8009B74C 48 00 00 20 */ b lbl_8009B76C -lbl_8009B750: -/* 8009B750 2C 00 00 EF */ cmpwi r0, 0xef -/* 8009B754 40 80 00 10 */ bge lbl_8009B764 -/* 8009B758 2C 00 00 9F */ cmpwi r0, 0x9f -/* 8009B75C 41 82 00 10 */ beq lbl_8009B76C -/* 8009B760 48 00 00 14 */ b lbl_8009B774 -lbl_8009B764: -/* 8009B764 2C 00 00 F3 */ cmpwi r0, 0xf3 -/* 8009B768 40 80 00 0C */ bge lbl_8009B774 -lbl_8009B76C: -/* 8009B76C 38 60 00 01 */ li r3, 1 -/* 8009B770 4E 80 00 20 */ blr -lbl_8009B774: -/* 8009B774 38 60 00 00 */ li r3, 0 -/* 8009B778 4E 80 00 20 */ blr diff --git a/asm/d/d_model/__ct__6dMdl_cFv.s b/asm/d/d_model/__ct__6dMdl_cFv.s deleted file mode 100644 index ac630029b8..0000000000 --- a/asm/d/d_model/__ct__6dMdl_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009C930: -/* 8009C930 3C 80 80 3D */ lis r4, __vt__9J3DPacket@ha /* 0x803CD97C@ha */ -/* 8009C934 38 04 D9 7C */ addi r0, r4, __vt__9J3DPacket@l /* 0x803CD97C@l */ -/* 8009C938 90 03 00 00 */ stw r0, 0(r3) -/* 8009C93C 38 A0 00 00 */ li r5, 0 -/* 8009C940 90 A3 00 04 */ stw r5, 4(r3) -/* 8009C944 90 A3 00 08 */ stw r5, 8(r3) -/* 8009C948 90 A3 00 0C */ stw r5, 0xc(r3) -/* 8009C94C 3C 80 80 3B */ lis r4, __vt__6dMdl_c@ha /* 0x803AF978@ha */ -/* 8009C950 38 04 F9 78 */ addi r0, r4, __vt__6dMdl_c@l /* 0x803AF978@l */ -/* 8009C954 90 03 00 00 */ stw r0, 0(r3) -/* 8009C958 90 A3 00 10 */ stw r5, 0x10(r3) -/* 8009C95C B0 A3 00 18 */ sth r5, 0x18(r3) -/* 8009C960 4E 80 00 20 */ blr diff --git a/asm/d/d_model/__dt__6dMdl_cFv.s b/asm/d/d_model/__dt__6dMdl_cFv.s deleted file mode 100644 index 01d9a34ff1..0000000000 --- a/asm/d/d_model/__dt__6dMdl_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8009C808: -/* 8009C808 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009C80C 7C 08 02 A6 */ mflr r0 -/* 8009C810 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009C814 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009C818 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8009C81C 41 82 00 30 */ beq lbl_8009C84C -/* 8009C820 3C 60 80 3B */ lis r3, __vt__6dMdl_c@ha /* 0x803AF978@ha */ -/* 8009C824 38 03 F9 78 */ addi r0, r3, __vt__6dMdl_c@l /* 0x803AF978@l */ -/* 8009C828 90 1F 00 00 */ stw r0, 0(r31) -/* 8009C82C 41 82 00 10 */ beq lbl_8009C83C -/* 8009C830 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */ -/* 8009C834 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */ -/* 8009C838 90 1F 00 00 */ stw r0, 0(r31) -lbl_8009C83C: -/* 8009C83C 7C 80 07 35 */ extsh. r0, r4 -/* 8009C840 40 81 00 0C */ ble lbl_8009C84C -/* 8009C844 7F E3 FB 78 */ mr r3, r31 -/* 8009C848 48 23 24 F5 */ bl __dl__FPv -lbl_8009C84C: -/* 8009C84C 7F E3 FB 78 */ mr r3, r31 -/* 8009C850 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009C854 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009C858 7C 08 03 A6 */ mtlr r0 -/* 8009C85C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009C860 4E 80 00 20 */ blr diff --git a/asm/d/d_model/create__10dMdl_mng_cFv.s b/asm/d/d_model/create__10dMdl_mng_cFv.s deleted file mode 100644 index e3f2209646..0000000000 --- a/asm/d/d_model/create__10dMdl_mng_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8009C7AC: -/* 8009C7AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009C7B0 7C 08 02 A6 */ mflr r0 -/* 8009C7B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009C7B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009C7BC 38 60 00 84 */ li r3, 0x84 -/* 8009C7C0 48 23 24 8D */ bl __nw__FUl -/* 8009C7C4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8009C7C8 41 82 00 28 */ beq lbl_8009C7F0 -/* 8009C7CC 3C 80 80 0A */ lis r4, __ct__6dMdl_cFv@ha /* 0x8009C930@ha */ -/* 8009C7D0 38 84 C9 30 */ addi r4, r4, __ct__6dMdl_cFv@l /* 0x8009C930@l */ -/* 8009C7D4 3C A0 80 0A */ lis r5, __dt__6dMdl_cFv@ha /* 0x8009C808@ha */ -/* 8009C7D8 38 A5 C8 08 */ addi r5, r5, __dt__6dMdl_cFv@l /* 0x8009C808@l */ -/* 8009C7DC 38 C0 00 20 */ li r6, 0x20 -/* 8009C7E0 38 E0 00 04 */ li r7, 4 -/* 8009C7E4 48 2C 55 7D */ bl __construct_array -/* 8009C7E8 38 00 00 00 */ li r0, 0 -/* 8009C7EC 98 1F 00 80 */ stb r0, 0x80(r31) -lbl_8009C7F0: -/* 8009C7F0 93 ED 8A 20 */ stw r31, m_myObj__10dMdl_mng_c(r13) -/* 8009C7F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009C7F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009C7FC 7C 08 03 A6 */ mtlr r0 -/* 8009C800 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009C804 4E 80 00 20 */ blr diff --git a/asm/d/d_model/create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c.s b/asm/d/d_model/create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c.s deleted file mode 100644 index 223f972ca5..0000000000 --- a/asm/d/d_model/create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_8009C650: -/* 8009C650 90 83 00 10 */ stw r4, 0x10(r3) -/* 8009C654 B0 A3 00 18 */ sth r5, 0x18(r3) -/* 8009C658 90 C3 00 14 */ stw r6, 0x14(r3) -/* 8009C65C 38 00 00 00 */ li r0, 0 -/* 8009C660 98 03 00 1A */ stb r0, 0x1a(r3) -/* 8009C664 4E 80 00 20 */ blr diff --git a/asm/d/d_model/draw__6dMdl_cFv.s b/asm/d/d_model/draw__6dMdl_cFv.s deleted file mode 100644 index 7584e92307..0000000000 --- a/asm/d/d_model/draw__6dMdl_cFv.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_8009C4FC: -/* 8009C4FC 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8009C500 7C 08 02 A6 */ mflr r0 -/* 8009C504 90 01 00 64 */ stw r0, 0x64(r1) -/* 8009C508 39 61 00 60 */ addi r11, r1, 0x60 -/* 8009C50C 48 2C 5C CD */ bl _savegpr_28 -/* 8009C510 7C 7F 1B 78 */ mr r31, r3 -/* 8009C514 80 83 00 10 */ lwz r4, 0x10(r3) -/* 8009C518 80 04 00 A0 */ lwz r0, 0xa0(r4) -/* 8009C51C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8009C520 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8009C524 90 03 01 0C */ stw r0, 0x10c(r3) -/* 8009C528 80 04 00 A4 */ lwz r0, 0xa4(r4) -/* 8009C52C 90 03 01 10 */ stw r0, 0x110(r3) -/* 8009C530 80 04 00 AC */ lwz r0, 0xac(r4) -/* 8009C534 90 03 01 14 */ stw r0, 0x114(r3) -/* 8009C538 38 00 00 00 */ li r0, 0 -/* 8009C53C 90 0D 90 50 */ stw r0, sOldVcdVatCmd__8J3DShape(r13) -/* 8009C540 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 8009C544 80 63 00 60 */ lwz r3, 0x60(r3) -/* 8009C548 A0 1F 00 18 */ lhz r0, 0x18(r31) -/* 8009C54C 54 00 10 3A */ slwi r0, r0, 2 -/* 8009C550 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8009C554 83 A3 00 08 */ lwz r29, 8(r3) -/* 8009C558 81 83 00 00 */ lwz r12, 0(r3) -/* 8009C55C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8009C560 7D 89 03 A6 */ mtctr r12 -/* 8009C564 4E 80 04 21 */ bctrl -/* 8009C568 7F A3 EB 78 */ mr r3, r29 -/* 8009C56C 48 27 8D 95 */ bl loadPreDrawSetting__8J3DShapeCFv -/* 8009C570 80 02 D1 70 */ lwz r0, lit_3621(r2) -/* 8009C574 90 01 00 10 */ stw r0, 0x10(r1) -/* 8009C578 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8009C57C A8 03 03 48 */ lha r0, 0x348(r3) -/* 8009C580 98 01 00 10 */ stb r0, 0x10(r1) -/* 8009C584 A8 03 03 4A */ lha r0, 0x34a(r3) -/* 8009C588 98 01 00 11 */ stb r0, 0x11(r1) -/* 8009C58C A8 03 03 4C */ lha r0, 0x34c(r3) -/* 8009C590 98 01 00 12 */ stb r0, 0x12(r1) -/* 8009C594 A8 03 03 4E */ lha r0, 0x34e(r3) -/* 8009C598 98 01 00 13 */ stb r0, 0x13(r1) -/* 8009C59C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 8009C5A0 90 01 00 0C */ stw r0, 0xc(r1) -/* 8009C5A4 38 60 00 04 */ li r3, 4 -/* 8009C5A8 38 81 00 0C */ addi r4, r1, 0xc -/* 8009C5AC 48 2C 13 B5 */ bl GXSetChanAmbColor -/* 8009C5B0 80 0D 80 88 */ lwz r0, g_whiteColor(r13) -/* 8009C5B4 90 01 00 08 */ stw r0, 8(r1) -/* 8009C5B8 38 60 00 04 */ li r3, 4 -/* 8009C5BC 38 81 00 08 */ addi r4, r1, 8 -/* 8009C5C0 48 2C 14 89 */ bl GXSetChanMatColor -/* 8009C5C4 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8009C5C8 48 10 A8 D5 */ bl dKy_setLight_nowroom_actor__FP12dKy_tevstr_c -/* 8009C5CC 48 10 AF F5 */ bl dKy_setLight_again__Fv -/* 8009C5D0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8009C5D4 48 10 C0 7D */ bl dKy_GxFog_tevstr_set__FP12dKy_tevstr_c -/* 8009C5D8 83 9F 00 1C */ lwz r28, 0x1c(r31) -/* 8009C5DC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8009C5E0 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8009C5E4 48 00 00 44 */ b lbl_8009C628 -lbl_8009C5E8: -/* 8009C5E8 7F C3 F3 78 */ mr r3, r30 -/* 8009C5EC 7F 84 E3 78 */ mr r4, r28 -/* 8009C5F0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8009C5F4 48 2A 9E F1 */ bl PSMTXConcat -/* 8009C5F8 38 61 00 14 */ addi r3, r1, 0x14 -/* 8009C5FC 38 80 00 00 */ li r4, 0 -/* 8009C600 48 2C 3C 4D */ bl GXLoadPosMtxImm -/* 8009C604 38 61 00 14 */ addi r3, r1, 0x14 -/* 8009C608 38 80 00 00 */ li r4, 0 -/* 8009C60C 48 2C 3C 91 */ bl GXLoadNrmMtxImm -/* 8009C610 7F A3 EB 78 */ mr r3, r29 -/* 8009C614 81 9D 00 00 */ lwz r12, 0(r29) -/* 8009C618 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8009C61C 7D 89 03 A6 */ mtctr r12 -/* 8009C620 4E 80 04 21 */ bctrl -/* 8009C624 83 9C 00 30 */ lwz r28, 0x30(r28) -lbl_8009C628: -/* 8009C628 28 1C 00 00 */ cmplwi r28, 0 -/* 8009C62C 40 82 FF BC */ bne lbl_8009C5E8 -/* 8009C630 38 00 00 00 */ li r0, 0 -/* 8009C634 98 1F 00 1A */ stb r0, 0x1a(r31) -/* 8009C638 39 61 00 60 */ addi r11, r1, 0x60 -/* 8009C63C 48 2C 5B E9 */ bl _restgpr_28 -/* 8009C640 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8009C644 7C 08 03 A6 */ mtlr r0 -/* 8009C648 38 21 00 60 */ addi r1, r1, 0x60 -/* 8009C64C 4E 80 00 20 */ blr diff --git a/asm/d/d_model/entryObj__6dMdl_cFP10dMdl_obj_c.s b/asm/d/d_model/entryObj__6dMdl_cFP10dMdl_obj_c.s deleted file mode 100644 index 719a4a469a..0000000000 --- a/asm/d/d_model/entryObj__6dMdl_cFP10dMdl_obj_c.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8009C668: -/* 8009C668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009C66C 7C 08 02 A6 */ mflr r0 -/* 8009C670 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009C674 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009C678 93 C1 00 08 */ stw r30, 8(r1) -/* 8009C67C 7C 7E 1B 78 */ mr r30, r3 -/* 8009C680 7C 9F 23 78 */ mr r31, r4 -/* 8009C684 88 03 00 1A */ lbz r0, 0x1a(r3) -/* 8009C688 28 00 00 00 */ cmplwi r0, 0 -/* 8009C68C 40 82 00 2C */ bne lbl_8009C6B8 -/* 8009C690 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009C694 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009C698 80 63 5F 90 */ lwz r3, 0x5f90(r3) -/* 8009C69C 7F C4 F3 78 */ mr r4, r30 -/* 8009C6A0 38 A0 00 00 */ li r5, 0 -/* 8009C6A4 48 28 8D E9 */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs -/* 8009C6A8 38 00 00 01 */ li r0, 1 -/* 8009C6AC 98 1E 00 1A */ stb r0, 0x1a(r30) -/* 8009C6B0 38 00 00 00 */ li r0, 0 -/* 8009C6B4 90 1E 00 1C */ stw r0, 0x1c(r30) -lbl_8009C6B8: -/* 8009C6B8 80 1E 00 1C */ lwz r0, 0x1c(r30) -/* 8009C6BC 90 1F 00 30 */ stw r0, 0x30(r31) -/* 8009C6C0 93 FE 00 1C */ stw r31, 0x1c(r30) -/* 8009C6C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009C6C8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8009C6CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009C6D0 7C 08 03 A6 */ mtlr r0 -/* 8009C6D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009C6D8 4E 80 00 20 */ blr diff --git a/asm/d/d_model/entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c.s b/asm/d/d_model/entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c.s deleted file mode 100644 index 45a761db7d..0000000000 --- a/asm/d/d_model/entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8009C724: -/* 8009C724 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8009C728 7C 08 02 A6 */ mflr r0 -/* 8009C72C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8009C730 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C734 48 2C 5A A1 */ bl _savegpr_27 -/* 8009C738 7C 7B 1B 78 */ mr r27, r3 -/* 8009C73C 7C 9C 23 78 */ mr r28, r4 -/* 8009C740 7C BD 2B 78 */ mr r29, r5 -/* 8009C744 7C DE 33 78 */ mr r30, r6 -/* 8009C748 4B FF FF 95 */ bl search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c -/* 8009C74C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8009C750 40 82 00 40 */ bne lbl_8009C790 -/* 8009C754 88 1B 00 80 */ lbz r0, 0x80(r27) -/* 8009C758 28 00 00 04 */ cmplwi r0, 4 -/* 8009C75C 41 80 00 0C */ blt lbl_8009C768 -/* 8009C760 38 60 00 00 */ li r3, 0 -/* 8009C764 48 00 00 30 */ b lbl_8009C794 -lbl_8009C768: -/* 8009C768 54 00 2C F4 */ rlwinm r0, r0, 5, 0x13, 0x1a -/* 8009C76C 7F FB 02 14 */ add r31, r27, r0 -/* 8009C770 7F E3 FB 78 */ mr r3, r31 -/* 8009C774 7F 84 E3 78 */ mr r4, r28 -/* 8009C778 7F A5 EB 78 */ mr r5, r29 -/* 8009C77C 7F C6 F3 78 */ mr r6, r30 -/* 8009C780 4B FF FE D1 */ bl create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c -/* 8009C784 88 7B 00 80 */ lbz r3, 0x80(r27) -/* 8009C788 38 03 00 01 */ addi r0, r3, 1 -/* 8009C78C 98 1B 00 80 */ stb r0, 0x80(r27) -lbl_8009C790: -/* 8009C790 7F E3 FB 78 */ mr r3, r31 -lbl_8009C794: -/* 8009C794 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C798 48 2C 5A 89 */ bl _restgpr_27 -/* 8009C79C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8009C7A0 7C 08 03 A6 */ mtlr r0 -/* 8009C7A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009C7A8 4E 80 00 20 */ blr diff --git a/asm/d/d_model/remove__10dMdl_mng_cFv.s b/asm/d/d_model/remove__10dMdl_mng_cFv.s deleted file mode 100644 index 448067fd87..0000000000 --- a/asm/d/d_model/remove__10dMdl_mng_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8009C864: -/* 8009C864 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009C868 7C 08 02 A6 */ mflr r0 -/* 8009C86C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009C870 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009C874 83 ED 8A 20 */ lwz r31, m_myObj__10dMdl_mng_c(r13) -/* 8009C878 28 1F 00 00 */ cmplwi r31, 0 -/* 8009C87C 41 82 00 30 */ beq lbl_8009C8AC -/* 8009C880 41 82 00 24 */ beq lbl_8009C8A4 -/* 8009C884 7F E3 FB 78 */ mr r3, r31 -/* 8009C888 3C 80 80 0A */ lis r4, __dt__6dMdl_cFv@ha /* 0x8009C808@ha */ -/* 8009C88C 38 84 C8 08 */ addi r4, r4, __dt__6dMdl_cFv@l /* 0x8009C808@l */ -/* 8009C890 38 A0 00 20 */ li r5, 0x20 -/* 8009C894 38 C0 00 04 */ li r6, 4 -/* 8009C898 48 2C 54 51 */ bl __destroy_arr -/* 8009C89C 7F E3 FB 78 */ mr r3, r31 -/* 8009C8A0 48 23 24 9D */ bl __dl__FPv -lbl_8009C8A4: -/* 8009C8A4 38 00 00 00 */ li r0, 0 -/* 8009C8A8 90 0D 8A 20 */ stw r0, m_myObj__10dMdl_mng_c(r13) -lbl_8009C8AC: -/* 8009C8AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009C8B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009C8B4 7C 08 03 A6 */ mtlr r0 -/* 8009C8B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009C8BC 4E 80 00 20 */ blr diff --git a/asm/d/d_model/reset__10dMdl_mng_cFv.s b/asm/d/d_model/reset__10dMdl_mng_cFv.s deleted file mode 100644 index 5225391c51..0000000000 --- a/asm/d/d_model/reset__10dMdl_mng_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_8009C8C0: -/* 8009C8C0 80 6D 8A 20 */ lwz r3, m_myObj__10dMdl_mng_c(r13) -/* 8009C8C4 28 03 00 00 */ cmplwi r3, 0 -/* 8009C8C8 4D 82 00 20 */ beqlr -/* 8009C8CC 38 00 00 00 */ li r0, 0 -/* 8009C8D0 98 03 00 80 */ stb r0, 0x80(r3) -/* 8009C8D4 4E 80 00 20 */ blr diff --git a/asm/d/d_model/search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c.s b/asm/d/d_model/search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c.s deleted file mode 100644 index df0d8d9bf1..0000000000 --- a/asm/d/d_model/search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8009C6DC: -/* 8009C6DC 88 03 00 80 */ lbz r0, 0x80(r3) -/* 8009C6E0 54 A5 04 3E */ clrlwi r5, r5, 0x10 -/* 8009C6E4 7C 09 03 A6 */ mtctr r0 -/* 8009C6E8 2C 00 00 00 */ cmpwi r0, 0 -/* 8009C6EC 40 81 00 30 */ ble lbl_8009C71C -lbl_8009C6F0: -/* 8009C6F0 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8009C6F4 7C 00 20 40 */ cmplw r0, r4 -/* 8009C6F8 40 82 00 1C */ bne lbl_8009C714 -/* 8009C6FC A0 03 00 18 */ lhz r0, 0x18(r3) -/* 8009C700 7C 05 00 40 */ cmplw r5, r0 -/* 8009C704 40 82 00 10 */ bne lbl_8009C714 -/* 8009C708 80 03 00 14 */ lwz r0, 0x14(r3) -/* 8009C70C 7C 00 30 40 */ cmplw r0, r6 -/* 8009C710 4D 82 00 20 */ beqlr -lbl_8009C714: -/* 8009C714 38 63 00 20 */ addi r3, r3, 0x20 -/* 8009C718 42 00 FF D8 */ bdnz lbl_8009C6F0 -lbl_8009C71C: -/* 8009C71C 38 60 00 00 */ li r3, 0 -/* 8009C720 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/__ct__12diff_model_cFv.s b/asm/d/d_simple_model/__ct__12diff_model_cFv.s deleted file mode 100644 index b7cdbf1ed1..0000000000 --- a/asm/d/d_simple_model/__ct__12diff_model_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80048D60: -/* 80048D60 38 00 00 00 */ li r0, 0 -/* 80048D64 90 03 00 00 */ stw r0, 0(r3) -/* 80048D68 90 03 00 04 */ stw r0, 4(r3) -/* 80048D6C 90 03 00 08 */ stw r0, 8(r3) -/* 80048D70 90 03 00 0C */ stw r0, 0xc(r3) -/* 80048D74 38 00 00 3F */ li r0, 0x3f -/* 80048D78 98 03 00 11 */ stb r0, 0x11(r3) -/* 80048D7C 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/__ct__15dSmplMdl_draw_cFv.s b/asm/d/d_simple_model/__ct__15dSmplMdl_draw_cFv.s deleted file mode 100644 index ea438a34d7..0000000000 --- a/asm/d/d_simple_model/__ct__15dSmplMdl_draw_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80048CB4: -/* 80048CB4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80048CB8 7C 08 02 A6 */ mflr r0 -/* 80048CBC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80048CC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048CC4 48 31 95 19 */ bl _savegpr_29 -/* 80048CC8 7C 7D 1B 78 */ mr r29, r3 -/* 80048CCC 3C 60 80 3B */ lis r3, __vt__15dSmplMdl_draw_c@ha /* 0x803A82F8@ha */ -/* 80048CD0 38 03 82 F8 */ addi r0, r3, __vt__15dSmplMdl_draw_c@l /* 0x803A82F8@l */ -/* 80048CD4 90 1D 00 00 */ stw r0, 0(r29) -/* 80048CD8 38 7D 00 04 */ addi r3, r29, 4 -/* 80048CDC 3C 80 80 05 */ lis r4, __ct__12diff_model_cFv@ha /* 0x80048D60@ha */ -/* 80048CE0 38 84 8D 60 */ addi r4, r4, __ct__12diff_model_cFv@l /* 0x80048D60@l */ -/* 80048CE4 38 A0 00 00 */ li r5, 0 -/* 80048CE8 38 C0 00 14 */ li r6, 0x14 -/* 80048CEC 38 E0 00 08 */ li r7, 8 -/* 80048CF0 48 31 90 71 */ bl __construct_array -/* 80048CF4 3B C0 00 00 */ li r30, 0 -/* 80048CF8 3B E0 00 00 */ li r31, 0 -lbl_80048CFC: -/* 80048CFC 38 7F 00 04 */ addi r3, r31, 4 -/* 80048D00 7C 7D 1A 14 */ add r3, r29, r3 -/* 80048D04 48 00 06 65 */ bl init__12diff_model_cFv -/* 80048D08 3B DE 00 01 */ addi r30, r30, 1 -/* 80048D0C 2C 1E 00 08 */ cmpwi r30, 8 -/* 80048D10 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80048D14 41 80 FF E8 */ blt lbl_80048CFC -/* 80048D18 38 60 00 00 */ li r3, 0 -/* 80048D1C 38 80 00 00 */ li r4, 0 -/* 80048D20 38 00 01 F4 */ li r0, 0x1f4 -/* 80048D24 7C 09 03 A6 */ mtctr r0 -lbl_80048D28: -/* 80048D28 7C BD 1A 14 */ add r5, r29, r3 -/* 80048D2C 90 85 00 A8 */ stw r4, 0xa8(r5) -/* 80048D30 90 85 00 AC */ stw r4, 0xac(r5) -/* 80048D34 38 63 00 08 */ addi r3, r3, 8 -/* 80048D38 42 00 FF F0 */ bdnz lbl_80048D28 -/* 80048D3C 38 00 00 00 */ li r0, 0 -/* 80048D40 90 1D 00 A4 */ stw r0, 0xa4(r29) -/* 80048D44 7F A3 EB 78 */ mr r3, r29 -/* 80048D48 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048D4C 48 31 94 DD */ bl _restgpr_29 -/* 80048D50 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80048D54 7C 08 03 A6 */ mtlr r0 -/* 80048D58 38 21 00 20 */ addi r1, r1, 0x20 -/* 80048D5C 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/__dt__15dSmplMdl_draw_cFv.s b/asm/d/d_simple_model/__dt__15dSmplMdl_draw_cFv.s deleted file mode 100644 index 68af208a81..0000000000 --- a/asm/d/d_simple_model/__dt__15dSmplMdl_draw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80048D80: -/* 80048D80 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80048D84 7C 08 02 A6 */ mflr r0 -/* 80048D88 90 01 00 24 */ stw r0, 0x24(r1) -/* 80048D8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048D90 48 31 94 49 */ bl _savegpr_28 -/* 80048D94 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80048D98 7C 9D 23 78 */ mr r29, r4 -/* 80048D9C 41 82 00 54 */ beq lbl_80048DF0 -/* 80048DA0 3C 60 80 3B */ lis r3, __vt__15dSmplMdl_draw_c@ha /* 0x803A82F8@ha */ -/* 80048DA4 38 03 82 F8 */ addi r0, r3, __vt__15dSmplMdl_draw_c@l /* 0x803A82F8@l */ -/* 80048DA8 90 1C 00 00 */ stw r0, 0(r28) -/* 80048DAC 3B C0 00 00 */ li r30, 0 -/* 80048DB0 3B E0 00 00 */ li r31, 0 -lbl_80048DB4: -/* 80048DB4 7C 7C FA 14 */ add r3, r28, r31 -/* 80048DB8 80 03 00 08 */ lwz r0, 8(r3) -/* 80048DBC 28 00 00 00 */ cmplwi r0, 0 -/* 80048DC0 41 82 00 10 */ beq lbl_80048DD0 -/* 80048DC4 38 63 00 04 */ addi r3, r3, 4 -/* 80048DC8 38 80 00 01 */ li r4, 1 -/* 80048DCC 48 00 04 45 */ bl remove__12diff_model_cFi -lbl_80048DD0: -/* 80048DD0 3B DE 00 01 */ addi r30, r30, 1 -/* 80048DD4 2C 1E 00 08 */ cmpwi r30, 8 -/* 80048DD8 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80048DDC 41 80 FF D8 */ blt lbl_80048DB4 -/* 80048DE0 7F A0 07 35 */ extsh. r0, r29 -/* 80048DE4 40 81 00 0C */ ble lbl_80048DF0 -/* 80048DE8 7F 83 E3 78 */ mr r3, r28 -/* 80048DEC 48 28 5F 51 */ bl __dl__FPv -lbl_80048DF0: -/* 80048DF0 7F 83 E3 78 */ mr r3, r28 -/* 80048DF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048DF8 48 31 94 2D */ bl _restgpr_28 -/* 80048DFC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80048E00 7C 08 03 A6 */ mtlr r0 -/* 80048E04 38 21 00 20 */ addi r1, r1, 0x20 -/* 80048E08 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc.s b/asm/d/d_simple_model/addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc.s deleted file mode 100644 index 71553df4bb..0000000000 --- a/asm/d/d_simple_model/addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80048F70: -/* 80048F70 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80048F74 7C 08 02 A6 */ mflr r0 -/* 80048F78 90 01 00 34 */ stw r0, 0x34(r1) -/* 80048F7C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80048F80 48 31 92 4D */ bl _savegpr_25 -/* 80048F84 7C 79 1B 78 */ mr r25, r3 -/* 80048F88 7C 9A 23 78 */ mr r26, r4 -/* 80048F8C 7C BB 2B 78 */ mr r27, r5 -/* 80048F90 7C DC 33 78 */ mr r28, r6 -/* 80048F94 3B A0 00 00 */ li r29, 0 -/* 80048F98 3B E0 00 00 */ li r31, 0 -lbl_80048F9C: -/* 80048F9C 3B DF 00 04 */ addi r30, r31, 4 -/* 80048FA0 7F D9 F2 14 */ add r30, r25, r30 -/* 80048FA4 7F C3 F3 78 */ mr r3, r30 -/* 80048FA8 7F 44 D3 78 */ mr r4, r26 -/* 80048FAC 7F 65 DB 78 */ mr r5, r27 -/* 80048FB0 48 00 03 D9 */ bl isSame__12diff_model_cFP12J3DModelDatai -/* 80048FB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80048FB8 41 82 00 24 */ beq lbl_80048FDC -/* 80048FBC 7F C3 F3 78 */ mr r3, r30 -/* 80048FC0 7F 44 D3 78 */ mr r4, r26 -/* 80048FC4 7F 65 DB 78 */ mr r5, r27 -/* 80048FC8 7F 86 E3 78 */ mr r6, r28 -/* 80048FCC 48 00 01 21 */ bl create__12diff_model_cFP12J3DModelDataiUc -/* 80048FD0 30 03 FF FF */ addic r0, r3, -1 -/* 80048FD4 7C 60 19 10 */ subfe r3, r0, r3 -/* 80048FD8 48 00 00 68 */ b lbl_80049040 -lbl_80048FDC: -/* 80048FDC 3B BD 00 01 */ addi r29, r29, 1 -/* 80048FE0 2C 1D 00 08 */ cmpwi r29, 8 -/* 80048FE4 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80048FE8 41 80 FF B4 */ blt lbl_80048F9C -/* 80048FEC 3B A0 00 00 */ li r29, 0 -/* 80048FF0 3B E0 00 00 */ li r31, 0 -lbl_80048FF4: -/* 80048FF4 3B DF 00 04 */ addi r30, r31, 4 -/* 80048FF8 7F D9 F2 14 */ add r30, r25, r30 -/* 80048FFC 7F C3 F3 78 */ mr r3, r30 -/* 80049000 48 00 01 F5 */ bl getModelData__12diff_model_cFv -/* 80049004 28 03 00 00 */ cmplwi r3, 0 -/* 80049008 40 82 00 24 */ bne lbl_8004902C -/* 8004900C 7F C3 F3 78 */ mr r3, r30 -/* 80049010 7F 44 D3 78 */ mr r4, r26 -/* 80049014 7F 65 DB 78 */ mr r5, r27 -/* 80049018 7F 86 E3 78 */ mr r6, r28 -/* 8004901C 48 00 00 D1 */ bl create__12diff_model_cFP12J3DModelDataiUc -/* 80049020 30 03 FF FF */ addic r0, r3, -1 -/* 80049024 7C 60 19 10 */ subfe r3, r0, r3 -/* 80049028 48 00 00 18 */ b lbl_80049040 -lbl_8004902C: -/* 8004902C 3B BD 00 01 */ addi r29, r29, 1 -/* 80049030 2C 1D 00 08 */ cmpwi r29, 8 -/* 80049034 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80049038 41 80 FF BC */ blt lbl_80048FF4 -/* 8004903C 38 60 00 00 */ li r3, 0 -lbl_80049040: -/* 80049040 39 61 00 30 */ addi r11, r1, 0x30 -/* 80049044 48 31 91 D5 */ bl _restgpr_25 -/* 80049048 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8004904C 7C 08 03 A6 */ mtlr r0 -/* 80049050 38 21 00 30 */ addi r1, r1, 0x30 -/* 80049054 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/create__12diff_model_cFP12J3DModelDataiUc.s b/asm/d/d_simple_model/create__12diff_model_cFP12J3DModelDataiUc.s deleted file mode 100644 index 56329c3a0d..0000000000 --- a/asm/d/d_simple_model/create__12diff_model_cFP12J3DModelDataiUc.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_800490EC: -/* 800490EC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800490F0 7C 08 02 A6 */ mflr r0 -/* 800490F4 90 01 00 34 */ stw r0, 0x34(r1) -/* 800490F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800490FC 48 31 90 DD */ bl _savegpr_28 -/* 80049100 7C 7C 1B 78 */ mr r28, r3 -/* 80049104 7C 9D 23 78 */ mr r29, r4 -/* 80049108 7C BE 2B 78 */ mr r30, r5 -/* 8004910C 7C DF 33 78 */ mr r31, r6 -/* 80049110 80 03 00 00 */ lwz r0, 0(r3) -/* 80049114 28 00 00 00 */ cmplwi r0, 0 -/* 80049118 40 82 00 AC */ bne lbl_800491C4 -/* 8004911C 38 60 20 00 */ li r3, 0x2000 -/* 80049120 38 80 00 20 */ li r4, 0x20 -/* 80049124 4B FC 5F 21 */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl -/* 80049128 90 7C 00 00 */ stw r3, 0(r28) -/* 8004912C 80 1C 00 00 */ lwz r0, 0(r28) -/* 80049130 28 00 00 00 */ cmplwi r0, 0 -/* 80049134 41 82 00 A4 */ beq lbl_800491D8 -/* 80049138 7F A3 EB 78 */ mr r3, r29 -/* 8004913C 3C 80 00 08 */ lis r4, 8 -/* 80049140 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80049144 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80049148 4B FC BB 0D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8004914C 90 7C 00 04 */ stw r3, 4(r28) -/* 80049150 80 7C 00 04 */ lwz r3, 4(r28) -/* 80049154 28 03 00 00 */ cmplwi r3, 0 -/* 80049158 40 82 00 18 */ bne lbl_80049170 -/* 8004915C 7F 83 E3 78 */ mr r3, r28 -/* 80049160 38 80 00 01 */ li r4, 1 -/* 80049164 48 00 00 AD */ bl remove__12diff_model_cFi -/* 80049168 4B FC 60 8D */ bl mDoExt_restoreCurrentHeap__Fv -/* 8004916C 48 00 00 6C */ b lbl_800491D8 -lbl_80049170: -/* 80049170 C0 02 85 38 */ lfs f0, lit_3763(r2) -/* 80049174 D0 01 00 08 */ stfs f0, 8(r1) -/* 80049178 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8004917C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80049180 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80049184 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80049188 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 8004918C 3C 60 80 3A */ lis r3, g_mDoMtx_identity@ha /* 0x803A2FD8@ha */ -/* 80049190 38 63 2F D8 */ addi r3, r3, g_mDoMtx_identity@l /* 0x803A2FD8@l */ -/* 80049194 80 9C 00 04 */ lwz r4, 4(r28) -/* 80049198 38 84 00 24 */ addi r4, r4, 0x24 -/* 8004919C 48 2F D3 15 */ bl PSMTXCopy -/* 800491A0 80 7C 00 08 */ lwz r3, 8(r28) -/* 800491A4 38 03 00 01 */ addi r0, r3, 1 -/* 800491A8 90 1C 00 08 */ stw r0, 8(r28) -/* 800491AC 80 7C 00 00 */ lwz r3, 0(r28) -/* 800491B0 4B FC 5F A9 */ bl mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap -/* 800491B4 9B DC 00 11 */ stb r30, 0x11(r28) -/* 800491B8 9B FC 00 10 */ stb r31, 0x10(r28) -/* 800491BC 38 60 00 01 */ li r3, 1 -/* 800491C0 48 00 00 1C */ b lbl_800491DC -lbl_800491C4: -/* 800491C4 80 7C 00 08 */ lwz r3, 8(r28) -/* 800491C8 38 03 00 01 */ addi r0, r3, 1 -/* 800491CC 90 1C 00 08 */ stw r0, 8(r28) -/* 800491D0 38 60 00 01 */ li r3, 1 -/* 800491D4 48 00 00 08 */ b lbl_800491DC -lbl_800491D8: -/* 800491D8 38 60 00 00 */ li r3, 0 -lbl_800491DC: -/* 800491DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800491E0 48 31 90 45 */ bl _restgpr_28 -/* 800491E4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800491E8 7C 08 03 A6 */ mtlr r0 -/* 800491EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800491F0 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/dSmplMdl_modelUpdateDL__FP8J3DModel.s b/asm/d/d_simple_model/dSmplMdl_modelUpdateDL__FP8J3DModel.s deleted file mode 100644 index 1c157f350d..0000000000 --- a/asm/d/d_simple_model/dSmplMdl_modelUpdateDL__FP8J3DModel.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80048C54: -/* 80048C54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80048C58 7C 08 02 A6 */ mflr r0 -/* 80048C5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80048C60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80048C64 7C 7F 1B 78 */ mr r31, r3 -/* 80048C68 81 83 00 00 */ lwz r12, 0(r3) -/* 80048C6C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80048C70 7D 89 03 A6 */ mtctr r12 -/* 80048C74 4E 80 04 21 */ bctrl -/* 80048C78 7F E3 FB 78 */ mr r3, r31 -/* 80048C7C 81 9F 00 00 */ lwz r12, 0(r31) -/* 80048C80 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80048C84 7D 89 03 A6 */ mtctr r12 -/* 80048C88 4E 80 04 21 */ bctrl -/* 80048C8C 7F E3 FB 78 */ mr r3, r31 -/* 80048C90 81 9F 00 00 */ lwz r12, 0(r31) -/* 80048C94 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80048C98 7D 89 03 A6 */ mtctr r12 -/* 80048C9C 4E 80 04 21 */ bctrl -/* 80048CA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80048CA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80048CA8 7C 08 03 A6 */ mtlr r0 -/* 80048CAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80048CB0 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/draw__12diff_model_cFv.s b/asm/d/d_simple_model/draw__12diff_model_cFv.s deleted file mode 100644 index 08d53b8109..0000000000 --- a/asm/d/d_simple_model/draw__12diff_model_cFv.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_80049270: -/* 80049270 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80049274 7C 08 02 A6 */ mflr r0 -/* 80049278 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004927C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80049280 93 C1 00 08 */ stw r30, 8(r1) -/* 80049284 7C 7E 1B 78 */ mr r30, r3 -/* 80049288 83 E3 00 0C */ lwz r31, 0xc(r3) -/* 8004928C 28 1F 00 00 */ cmplwi r31, 0 -/* 80049290 41 82 00 C0 */ beq lbl_80049350 -/* 80049294 48 00 01 69 */ bl getRoomNo__12diff_model_cFv -/* 80049298 3C 80 80 3F */ lis r4, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8004929C 38 84 60 94 */ addi r4, r4, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 800492A0 1C 03 04 04 */ mulli r0, r3, 0x404 -/* 800492A4 7C 64 02 14 */ add r3, r4, r0 -/* 800492A8 88 03 03 F4 */ lbz r0, 0x3f4(r3) -/* 800492AC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800492B0 41 82 00 A0 */ beq lbl_80049350 -/* 800492B4 7F C3 F3 78 */ mr r3, r30 -/* 800492B8 48 00 01 45 */ bl getRoomNo__12diff_model_cFv -/* 800492BC 1C 83 04 04 */ mulli r4, r3, 0x404 -/* 800492C0 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 800492C4 38 03 60 94 */ addi r0, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 800492C8 7C 60 22 14 */ add r3, r0, r4 -/* 800492CC 38 A3 00 6C */ addi r5, r3, 0x6c -/* 800492D0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 800492D4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 800492D8 80 9E 00 04 */ lwz r4, 4(r30) -/* 800492DC 80 84 00 04 */ lwz r4, 4(r4) -/* 800492E0 48 15 BA C1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 800492E4 88 1E 00 10 */ lbz r0, 0x10(r30) -/* 800492E8 28 00 00 01 */ cmplwi r0, 1 -/* 800492EC 40 82 00 34 */ bne lbl_80049320 -/* 800492F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800492F4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800492F8 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 800492FC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80049300 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80049304 90 03 00 48 */ stw r0, 0x48(r3) -/* 80049308 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 8004930C 90 03 00 4C */ stw r0, 0x4c(r3) -/* 80049310 48 00 00 10 */ b lbl_80049320 -lbl_80049314: -/* 80049314 80 7F 00 00 */ lwz r3, 0(r31) -/* 80049318 4B FF F9 3D */ bl dSmplMdl_modelUpdateDL__FP8J3DModel -/* 8004931C 83 FF 00 04 */ lwz r31, 4(r31) -lbl_80049320: -/* 80049320 28 1F 00 00 */ cmplwi r31, 0 -/* 80049324 40 82 FF F0 */ bne lbl_80049314 -/* 80049328 80 7E 00 04 */ lwz r3, 4(r30) -/* 8004932C 4B FC 49 99 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80049330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80049334 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80049338 80 04 5F 80 */ lwz r0, 0x5f80(r4) -/* 8004933C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80049340 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80049344 90 03 00 48 */ stw r0, 0x48(r3) -/* 80049348 80 04 5F 84 */ lwz r0, 0x5f84(r4) -/* 8004934C 90 03 00 4C */ stw r0, 0x4c(r3) -lbl_80049350: -/* 80049350 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80049354 83 C1 00 08 */ lwz r30, 8(r1) -/* 80049358 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8004935C 7C 08 03 A6 */ mtlr r0 -/* 80049360 38 21 00 10 */ addi r1, r1, 0x10 -/* 80049364 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/draw__15dSmplMdl_draw_cFv.s b/asm/d/d_simple_model/draw__15dSmplMdl_draw_cFv.s deleted file mode 100644 index 5521d2c3a4..0000000000 --- a/asm/d/d_simple_model/draw__15dSmplMdl_draw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80048E0C: -/* 80048E0C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80048E10 7C 08 02 A6 */ mflr r0 -/* 80048E14 90 01 00 24 */ stw r0, 0x24(r1) -/* 80048E18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048E1C 48 31 93 C1 */ bl _savegpr_29 -/* 80048E20 7C 7D 1B 78 */ mr r29, r3 -/* 80048E24 3B C0 00 00 */ li r30, 0 -/* 80048E28 3B E0 00 00 */ li r31, 0 -lbl_80048E2C: -/* 80048E2C 7C 7D FA 14 */ add r3, r29, r31 -/* 80048E30 80 03 00 08 */ lwz r0, 8(r3) -/* 80048E34 28 00 00 00 */ cmplwi r0, 0 -/* 80048E38 41 82 00 0C */ beq lbl_80048E44 -/* 80048E3C 38 63 00 04 */ addi r3, r3, 4 -/* 80048E40 48 00 04 31 */ bl draw__12diff_model_cFv -lbl_80048E44: -/* 80048E44 3B DE 00 01 */ addi r30, r30, 1 -/* 80048E48 2C 1E 00 08 */ cmpwi r30, 8 -/* 80048E4C 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80048E50 41 80 FF DC */ blt lbl_80048E2C -/* 80048E54 38 80 00 00 */ li r4, 0 -/* 80048E58 90 9D 00 A4 */ stw r4, 0xa4(r29) -/* 80048E5C 38 60 00 00 */ li r3, 0 -/* 80048E60 38 00 01 F4 */ li r0, 0x1f4 -/* 80048E64 7C 09 03 A6 */ mtctr r0 -lbl_80048E68: -/* 80048E68 7C BD 1A 14 */ add r5, r29, r3 -/* 80048E6C 90 85 00 A8 */ stw r4, 0xa8(r5) -/* 80048E70 90 85 00 AC */ stw r4, 0xac(r5) -/* 80048E74 38 63 00 08 */ addi r3, r3, 8 -/* 80048E78 42 00 FF F0 */ bdnz lbl_80048E68 -/* 80048E7C 3B C0 00 00 */ li r30, 0 -/* 80048E80 3B E0 00 00 */ li r31, 0 -lbl_80048E84: -/* 80048E84 38 7F 00 04 */ addi r3, r31, 4 -/* 80048E88 7C 7D 1A 14 */ add r3, r29, r3 -/* 80048E8C 38 80 00 00 */ li r4, 0 -/* 80048E90 48 00 05 79 */ bl insert__12diff_model_cFP11modelList_c -/* 80048E94 3B DE 00 01 */ addi r30, r30, 1 -/* 80048E98 2C 1E 00 08 */ cmpwi r30, 8 -/* 80048E9C 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80048EA0 41 80 FF E4 */ blt lbl_80048E84 -/* 80048EA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048EA8 48 31 93 81 */ bl _restgpr_29 -/* 80048EAC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80048EB0 7C 08 03 A6 */ mtlr r0 -/* 80048EB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80048EB8 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/entry__15dSmplMdl_draw_cFP8J3DModeli.s b/asm/d/d_simple_model/entry__15dSmplMdl_draw_cFP8J3DModeli.s deleted file mode 100644 index 5ff5aa8720..0000000000 --- a/asm/d/d_simple_model/entry__15dSmplMdl_draw_cFP8J3DModeli.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80048EBC: -/* 80048EBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80048EC0 7C 08 02 A6 */ mflr r0 -/* 80048EC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80048EC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048ECC 48 31 93 05 */ bl _savegpr_26 -/* 80048ED0 7C 7A 1B 78 */ mr r26, r3 -/* 80048ED4 7C 9B 23 79 */ or. r27, r4, r4 -/* 80048ED8 7C BC 2B 78 */ mr r28, r5 -/* 80048EDC 41 82 00 7C */ beq lbl_80048F58 -/* 80048EE0 80 1A 00 A4 */ lwz r0, 0xa4(r26) -/* 80048EE4 2C 00 01 F4 */ cmpwi r0, 0x1f4 -/* 80048EE8 40 80 00 70 */ bge lbl_80048F58 -/* 80048EEC 54 03 18 38 */ slwi r3, r0, 3 -/* 80048EF0 38 03 00 A8 */ addi r0, r3, 0xa8 -/* 80048EF4 7F 7A 01 2E */ stwx r27, r26, r0 -/* 80048EF8 3B A0 00 00 */ li r29, 0 -/* 80048EFC 3B E0 00 00 */ li r31, 0 -lbl_80048F00: -/* 80048F00 3B DF 00 04 */ addi r30, r31, 4 -/* 80048F04 7F DA F2 14 */ add r30, r26, r30 -/* 80048F08 7F C3 F3 78 */ mr r3, r30 -/* 80048F0C 80 9B 00 04 */ lwz r4, 4(r27) -/* 80048F10 7F 85 E3 78 */ mr r5, r28 -/* 80048F14 48 00 04 75 */ bl isSame__12diff_model_cFP12J3DModelDatai -/* 80048F18 2C 03 00 00 */ cmpwi r3, 0 -/* 80048F1C 41 82 00 20 */ beq lbl_80048F3C -/* 80048F20 7F C3 F3 78 */ mr r3, r30 -/* 80048F24 80 1A 00 A4 */ lwz r0, 0xa4(r26) -/* 80048F28 54 04 18 38 */ slwi r4, r0, 3 -/* 80048F2C 38 84 00 A8 */ addi r4, r4, 0xa8 -/* 80048F30 7C 9A 22 14 */ add r4, r26, r4 -/* 80048F34 48 00 04 D5 */ bl insert__12diff_model_cFP11modelList_c -/* 80048F38 48 00 00 14 */ b lbl_80048F4C -lbl_80048F3C: -/* 80048F3C 3B BD 00 01 */ addi r29, r29, 1 -/* 80048F40 2C 1D 00 08 */ cmpwi r29, 8 -/* 80048F44 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80048F48 41 80 FF B8 */ blt lbl_80048F00 -lbl_80048F4C: -/* 80048F4C 80 7A 00 A4 */ lwz r3, 0xa4(r26) -/* 80048F50 38 03 00 01 */ addi r0, r3, 1 -/* 80048F54 90 1A 00 A4 */ stw r0, 0xa4(r26) -lbl_80048F58: -/* 80048F58 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048F5C 48 31 92 C1 */ bl _restgpr_26 -/* 80048F60 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80048F64 7C 08 03 A6 */ mtlr r0 -/* 80048F68 38 21 00 20 */ addi r1, r1, 0x20 -/* 80048F6C 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/getModelData__12diff_model_cFv.s b/asm/d/d_simple_model/getModelData__12diff_model_cFv.s deleted file mode 100644 index be57e27d9c..0000000000 --- a/asm/d/d_simple_model/getModelData__12diff_model_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800491F4: -/* 800491F4 80 63 00 04 */ lwz r3, 4(r3) -/* 800491F8 28 03 00 00 */ cmplwi r3, 0 -/* 800491FC 41 82 00 0C */ beq lbl_80049208 -/* 80049200 80 63 00 04 */ lwz r3, 4(r3) -/* 80049204 4E 80 00 20 */ blr -lbl_80049208: -/* 80049208 38 60 00 00 */ li r3, 0 -/* 8004920C 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/getRoomNo__12diff_model_cFv.s b/asm/d/d_simple_model/getRoomNo__12diff_model_cFv.s deleted file mode 100644 index cb2266b6b7..0000000000 --- a/asm/d/d_simple_model/getRoomNo__12diff_model_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800493FC: -/* 800493FC 88 63 00 11 */ lbz r3, 0x11(r3) -/* 80049400 7C 63 07 74 */ extsb r3, r3 -/* 80049404 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/init__12diff_model_cFv.s b/asm/d/d_simple_model/init__12diff_model_cFv.s deleted file mode 100644 index 93b8c8266b..0000000000 --- a/asm/d/d_simple_model/init__12diff_model_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80049368: -/* 80049368 38 00 00 00 */ li r0, 0 -/* 8004936C 90 03 00 04 */ stw r0, 4(r3) -/* 80049370 90 03 00 00 */ stw r0, 0(r3) -/* 80049374 90 03 00 0C */ stw r0, 0xc(r3) -/* 80049378 90 03 00 08 */ stw r0, 8(r3) -/* 8004937C 38 00 00 3F */ li r0, 0x3f -/* 80049380 98 03 00 11 */ stb r0, 0x11(r3) -/* 80049384 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/insert__12diff_model_cFP11modelList_c.s b/asm/d/d_simple_model/insert__12diff_model_cFP11modelList_c.s deleted file mode 100644 index bfe7017649..0000000000 --- a/asm/d/d_simple_model/insert__12diff_model_cFP11modelList_c.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80049408: -/* 80049408 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8004940C 90 83 00 0C */ stw r4, 0xc(r3) -/* 80049410 28 04 00 00 */ cmplwi r4, 0 -/* 80049414 4D 82 00 20 */ beqlr -/* 80049418 90 04 00 04 */ stw r0, 4(r4) -/* 8004941C 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/isSame__12diff_model_cFP12J3DModelDatai.s b/asm/d/d_simple_model/isSame__12diff_model_cFP12J3DModelDatai.s deleted file mode 100644 index 5b6c6c6b61..0000000000 --- a/asm/d/d_simple_model/isSame__12diff_model_cFP12J3DModelDatai.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80049388: -/* 80049388 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8004938C 7C 08 02 A6 */ mflr r0 -/* 80049390 90 01 00 24 */ stw r0, 0x24(r1) -/* 80049394 39 61 00 20 */ addi r11, r1, 0x20 -/* 80049398 48 31 8E 41 */ bl _savegpr_28 -/* 8004939C 7C 7C 1B 78 */ mr r28, r3 -/* 800493A0 7C 9D 23 78 */ mr r29, r4 -/* 800493A4 7C BE 2B 78 */ mr r30, r5 -/* 800493A8 80 03 00 04 */ lwz r0, 4(r3) -/* 800493AC 28 00 00 00 */ cmplwi r0, 0 -/* 800493B0 41 82 00 30 */ beq lbl_800493E0 -/* 800493B4 3B E0 00 00 */ li r31, 0 -/* 800493B8 4B FF FE 3D */ bl getModelData__12diff_model_cFv -/* 800493BC 7C 03 E8 40 */ cmplw r3, r29 -/* 800493C0 40 82 00 18 */ bne lbl_800493D8 -/* 800493C4 7F 83 E3 78 */ mr r3, r28 -/* 800493C8 48 00 00 35 */ bl getRoomNo__12diff_model_cFv -/* 800493CC 7C 1E 18 00 */ cmpw r30, r3 -/* 800493D0 40 82 00 08 */ bne lbl_800493D8 -/* 800493D4 3B E0 00 01 */ li r31, 1 -lbl_800493D8: -/* 800493D8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800493DC 48 00 00 08 */ b lbl_800493E4 -lbl_800493E0: -/* 800493E0 38 60 00 00 */ li r3, 0 -lbl_800493E4: -/* 800493E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800493E8 48 31 8E 3D */ bl _restgpr_28 -/* 800493EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800493F0 7C 08 03 A6 */ mtlr r0 -/* 800493F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800493F8 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/removeModel__15dSmplMdl_draw_cFP12J3DModelDatai.s b/asm/d/d_simple_model/removeModel__15dSmplMdl_draw_cFP12J3DModelDatai.s deleted file mode 100644 index b2a00ef1ab..0000000000 --- a/asm/d/d_simple_model/removeModel__15dSmplMdl_draw_cFP12J3DModelDatai.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80049058: -/* 80049058 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8004905C 7C 08 02 A6 */ mflr r0 -/* 80049060 90 01 00 24 */ stw r0, 0x24(r1) -/* 80049064 39 61 00 20 */ addi r11, r1, 0x20 -/* 80049068 48 31 91 69 */ bl _savegpr_26 -/* 8004906C 7C 7A 1B 78 */ mr r26, r3 -/* 80049070 7C 9B 23 79 */ or. r27, r4, r4 -/* 80049074 7C BC 2B 78 */ mr r28, r5 -/* 80049078 40 82 00 0C */ bne lbl_80049084 -/* 8004907C 38 60 00 00 */ li r3, 0 -/* 80049080 48 00 00 54 */ b lbl_800490D4 -lbl_80049084: -/* 80049084 3B A0 00 00 */ li r29, 0 -/* 80049088 3B E0 00 00 */ li r31, 0 -lbl_8004908C: -/* 8004908C 3B DF 00 04 */ addi r30, r31, 4 -/* 80049090 7F DA F2 14 */ add r30, r26, r30 -/* 80049094 7F C3 F3 78 */ mr r3, r30 -/* 80049098 7F 64 DB 78 */ mr r4, r27 -/* 8004909C 7F 85 E3 78 */ mr r5, r28 -/* 800490A0 48 00 02 E9 */ bl isSame__12diff_model_cFP12J3DModelDatai -/* 800490A4 2C 03 00 00 */ cmpwi r3, 0 -/* 800490A8 41 82 00 18 */ beq lbl_800490C0 -/* 800490AC 7F C3 F3 78 */ mr r3, r30 -/* 800490B0 38 80 00 00 */ li r4, 0 -/* 800490B4 48 00 01 5D */ bl remove__12diff_model_cFi -/* 800490B8 38 60 00 00 */ li r3, 0 -/* 800490BC 48 00 00 18 */ b lbl_800490D4 -lbl_800490C0: -/* 800490C0 3B BD 00 01 */ addi r29, r29, 1 -/* 800490C4 2C 1D 00 08 */ cmpwi r29, 8 -/* 800490C8 3B FF 00 14 */ addi r31, r31, 0x14 -/* 800490CC 41 80 FF C0 */ blt lbl_8004908C -/* 800490D0 38 60 00 00 */ li r3, 0 -lbl_800490D4: -/* 800490D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800490D8 48 31 91 45 */ bl _restgpr_26 -/* 800490DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800490E0 7C 08 03 A6 */ mtlr r0 -/* 800490E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800490E8 4E 80 00 20 */ blr diff --git a/asm/d/d_simple_model/remove__12diff_model_cFi.s b/asm/d/d_simple_model/remove__12diff_model_cFi.s deleted file mode 100644 index d3994a1456..0000000000 --- a/asm/d/d_simple_model/remove__12diff_model_cFi.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80049210: -/* 80049210 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80049214 7C 08 02 A6 */ mflr r0 -/* 80049218 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004921C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80049220 7C 7F 1B 78 */ mr r31, r3 -/* 80049224 80 63 00 08 */ lwz r3, 8(r3) -/* 80049228 38 03 FF FF */ addi r0, r3, -1 -/* 8004922C 90 1F 00 08 */ stw r0, 8(r31) -/* 80049230 80 1F 00 08 */ lwz r0, 8(r31) -/* 80049234 2C 00 00 00 */ cmpwi r0, 0 -/* 80049238 41 82 00 0C */ beq lbl_80049244 -/* 8004923C 2C 04 00 00 */ cmpwi r4, 0 -/* 80049240 41 82 00 1C */ beq lbl_8004925C -lbl_80049244: -/* 80049244 80 7F 00 00 */ lwz r3, 0(r31) -/* 80049248 28 03 00 00 */ cmplwi r3, 0 -/* 8004924C 41 82 00 10 */ beq lbl_8004925C -/* 80049250 4B FC 5F 3D */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap -/* 80049254 7F E3 FB 78 */ mr r3, r31 -/* 80049258 48 00 01 11 */ bl init__12diff_model_cFv -lbl_8004925C: -/* 8004925C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80049260 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80049264 7C 08 03 A6 */ mtlr r0 -/* 80049268 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004926C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/add__Q220dStage_roomControl_c9roomDzs_cFUcUc.s b/asm/d/d_stage/add__Q220dStage_roomControl_c9roomDzs_cFUcUc.s deleted file mode 100644 index 6edd2bbfff..0000000000 --- a/asm/d/d_stage/add__Q220dStage_roomControl_c9roomDzs_cFUcUc.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80024B44: -/* 80024B44 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80024B48 7C 08 02 A6 */ mflr r0 -/* 80024B4C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80024B50 39 61 00 30 */ addi r11, r1, 0x30 -/* 80024B54 48 33 D6 85 */ bl _savegpr_28 -/* 80024B58 7C A6 2B 78 */ mr r6, r5 -/* 80024B5C 88 03 00 00 */ lbz r0, 0(r3) -/* 80024B60 28 00 00 00 */ cmplwi r0, 0 -/* 80024B64 40 82 00 0C */ bne lbl_80024B70 -/* 80024B68 38 60 00 00 */ li r3, 0 -/* 80024B6C 48 00 00 98 */ b lbl_80024C04 -lbl_80024B70: -/* 80024B70 83 A3 00 04 */ lwz r29, 4(r3) -/* 80024B74 54 9E 15 BA */ rlwinm r30, r4, 2, 0x16, 0x1d -/* 80024B78 7C 1D F0 2E */ lwzx r0, r29, r30 -/* 80024B7C 28 00 00 00 */ cmplwi r0, 0 -/* 80024B80 40 82 00 80 */ bne lbl_80024C00 -/* 80024B84 38 61 00 08 */ addi r3, r1, 8 -/* 80024B88 3C 80 80 38 */ lis r4, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80024B8C 38 84 8A 50 */ addi r4, r4, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80024B90 38 84 00 C6 */ addi r4, r4, 0xc6 -/* 80024B94 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80024B98 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80024B9C 38 A5 4E 00 */ addi r5, r5, 0x4e00 -/* 80024BA0 54 C6 06 3E */ clrlwi r6, r6, 0x18 -/* 80024BA4 4C C6 31 82 */ crclr 6 -/* 80024BA8 48 34 19 35 */ bl sprintf -/* 80024BAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80024BB0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80024BB4 80 7F 5C 68 */ lwz r3, 0x5c68(r31) -/* 80024BB8 38 81 00 08 */ addi r4, r1, 8 -/* 80024BBC 48 00 DB 7D */ bl dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc -/* 80024BC0 7C 7C 1B 78 */ mr r28, r3 -/* 80024BC4 4B FE A2 29 */ bl mDoExt_getArchiveHeap__Fv -/* 80024BC8 7F 84 E3 78 */ mr r4, r28 -/* 80024BCC 38 A0 FF E0 */ li r5, -32 -/* 80024BD0 48 2A 99 05 */ bl alloc__7JKRHeapFUli -/* 80024BD4 7C 7D F1 2E */ stwx r3, r29, r30 -/* 80024BD8 7C 9D F0 2E */ lwzx r4, r29, r30 -/* 80024BDC 28 04 00 00 */ cmplwi r4, 0 -/* 80024BE0 41 82 00 20 */ beq lbl_80024C00 -/* 80024BE4 80 7F 5C 68 */ lwz r3, 0x5c68(r31) -/* 80024BE8 7F 85 E3 78 */ mr r5, r28 -/* 80024BEC 38 C1 00 08 */ addi r6, r1, 8 -/* 80024BF0 81 83 00 00 */ lwz r12, 0(r3) -/* 80024BF4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80024BF8 7D 89 03 A6 */ mtctr r12 -/* 80024BFC 4E 80 04 21 */ bctrl -lbl_80024C00: -/* 80024C00 7C 7D F0 2E */ lwzx r3, r29, r30 -lbl_80024C04: -/* 80024C04 39 61 00 30 */ addi r11, r1, 0x30 -/* 80024C08 48 33 D6 1D */ bl _restgpr_28 -/* 80024C0C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80024C10 7C 08 03 A6 */ mtlr r0 -/* 80024C14 38 21 00 30 */ addi r1, r1, 0x30 -/* 80024C18 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/createRoomScene__Fi.s b/asm/d/d_stage/createRoomScene__Fi.s deleted file mode 100644 index 4569d77b8a..0000000000 --- a/asm/d/d_stage/createRoomScene__Fi.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80024460: -/* 80024460 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80024464 7C 08 02 A6 */ mflr r0 -/* 80024468 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002446C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80024470 93 C1 00 08 */ stw r30, 8(r1) -/* 80024474 7C 7E 1B 78 */ mr r30, r3 -/* 80024478 38 60 00 04 */ li r3, 4 -/* 8002447C 38 80 FF FC */ li r4, -4 -/* 80024480 38 A0 00 00 */ li r5, 0 -/* 80024484 48 2A 9F F1 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 80024488 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002448C 40 82 00 0C */ bne lbl_80024498 -/* 80024490 38 60 00 00 */ li r3, 0 -/* 80024494 48 00 00 3C */ b lbl_800244D0 -lbl_80024498: -/* 80024498 93 DF 00 00 */ stw r30, 0(r31) -/* 8002449C 38 60 00 12 */ li r3, 0x12 -/* 800244A0 38 80 7F FF */ li r4, 0x7fff -/* 800244A4 38 A0 00 00 */ li r5, 0 -/* 800244A8 7F E6 FB 78 */ mr r6, r31 -/* 800244AC 4B FF A8 D9 */ bl fopScnM_CreateReq__FssUsUl -/* 800244B0 2C 03 00 00 */ cmpwi r3, 0 -/* 800244B4 40 82 00 18 */ bne lbl_800244CC -/* 800244B8 7F E3 FB 78 */ mr r3, r31 -/* 800244BC 38 80 00 00 */ li r4, 0 -/* 800244C0 48 2A A0 41 */ bl free__7JKRHeapFPvP7JKRHeap -/* 800244C4 38 60 00 00 */ li r3, 0 -/* 800244C8 48 00 00 08 */ b lbl_800244D0 -lbl_800244CC: -/* 800244CC 38 60 00 01 */ li r3, 1 -lbl_800244D0: -/* 800244D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800244D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800244D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800244DC 7C 08 03 A6 */ mtlr r0 -/* 800244E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800244E4 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/create__Q220dStage_roomControl_c9roomDzs_cFUc.s b/asm/d/d_stage/create__Q220dStage_roomControl_c9roomDzs_cFUc.s deleted file mode 100644 index df8164abc1..0000000000 --- a/asm/d/d_stage/create__Q220dStage_roomControl_c9roomDzs_cFUc.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80024A34: -/* 80024A34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80024A38 7C 08 02 A6 */ mflr r0 -/* 80024A3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80024A40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80024A44 93 C1 00 08 */ stw r30, 8(r1) -/* 80024A48 7C 7E 1B 78 */ mr r30, r3 -/* 80024A4C 7C 9F 23 78 */ mr r31, r4 -/* 80024A50 4B FE A3 9D */ bl mDoExt_getArchiveHeap__Fv -/* 80024A54 7C 64 1B 78 */ mr r4, r3 -/* 80024A58 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d -/* 80024A5C 38 A0 FF FC */ li r5, -4 -/* 80024A60 48 2A A2 B1 */ bl __nwa__FUlP7JKRHeapi -/* 80024A64 90 7E 00 04 */ stw r3, 4(r30) -/* 80024A68 80 1E 00 04 */ lwz r0, 4(r30) -/* 80024A6C 28 00 00 00 */ cmplwi r0, 0 -/* 80024A70 41 82 00 34 */ beq lbl_80024AA4 -/* 80024A74 7C 05 03 78 */ mr r5, r0 -/* 80024A78 38 C0 00 00 */ li r6, 0 -/* 80024A7C 38 80 00 00 */ li r4, 0 -/* 80024A80 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80024A84 48 00 00 10 */ b lbl_80024A94 -lbl_80024A88: -/* 80024A88 90 85 00 00 */ stw r4, 0(r5) -/* 80024A8C 38 A5 00 04 */ addi r5, r5, 4 -/* 80024A90 38 C6 00 01 */ addi r6, r6, 1 -lbl_80024A94: -/* 80024A94 54 C3 06 3E */ clrlwi r3, r6, 0x18 -/* 80024A98 7C 03 00 40 */ cmplw r3, r0 -/* 80024A9C 41 80 FF EC */ blt lbl_80024A88 -/* 80024AA0 9B FE 00 00 */ stb r31, 0(r30) -lbl_80024AA4: -/* 80024AA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80024AA8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80024AAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80024AB0 7C 08 03 A6 */ mtlr r0 -/* 80024AB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80024AB8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dKankyo_create__Fv.s b/asm/d/d_stage/dKankyo_create__Fv.s deleted file mode 100644 index 49e6bb4515..0000000000 --- a/asm/d/d_stage/dKankyo_create__Fv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80026898: -/* 80026898 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002689C 7C 08 02 A6 */ mflr r0 -/* 800268A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800268A4 38 60 00 13 */ li r3, 0x13 -/* 800268A8 38 80 00 00 */ li r4, 0 -/* 800268AC 38 A0 00 00 */ li r5, 0 -/* 800268B0 38 C0 00 00 */ li r6, 0 -/* 800268B4 38 E0 00 00 */ li r7, 0 -/* 800268B8 4B FF 8F 61 */ bl fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i -/* 800268BC 38 60 03 11 */ li r3, 0x311 -/* 800268C0 38 80 00 00 */ li r4, 0 -/* 800268C4 38 A0 00 00 */ li r5, 0 -/* 800268C8 38 C0 00 00 */ li r6, 0 -/* 800268CC 38 E0 00 00 */ li r7, 0 -/* 800268D0 4B FF 8F 49 */ bl fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i -/* 800268D4 38 60 03 12 */ li r3, 0x312 -/* 800268D8 38 80 00 00 */ li r4, 0 -/* 800268DC 38 A0 00 00 */ li r5, 0 -/* 800268E0 38 C0 00 00 */ li r6, 0 -/* 800268E4 38 E0 00 00 */ li r7, 0 -/* 800268E8 4B FF 8F 31 */ bl fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i -/* 800268EC 38 60 00 15 */ li r3, 0x15 -/* 800268F0 38 80 00 00 */ li r4, 0 -/* 800268F4 38 A0 00 00 */ li r5, 0 -/* 800268F8 38 C0 00 00 */ li r6, 0 -/* 800268FC 38 E0 00 00 */ li r7, 0 -/* 80026900 4B FF 8F 19 */ bl fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i -/* 80026904 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026908 7C 08 03 A6 */ mtlr r0 -/* 8002690C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026910 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_Create__Fv.s b/asm/d/d_stage/dStage_Create__Fv.s deleted file mode 100644 index 4b62ac35e0..0000000000 --- a/asm/d/d_stage/dStage_Create__Fv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80026D38: -/* 80026D38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026D3C 7C 08 02 A6 */ mflr r0 -/* 80026D40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026D44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80026D48 3C 60 80 38 */ lis r3, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80026D4C 38 63 8A 50 */ addi r3, r3, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80026D50 38 63 01 19 */ addi r3, r3, 0x119 -/* 80026D54 48 00 86 E1 */ bl dComIfG_getStageRes__FPCc -/* 80026D58 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026D5C 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026D60 38 9F 4E 20 */ addi r4, r31, 0x4e20 -/* 80026D64 4B FF FD F5 */ bl dStage_dt_c_stageLoader__FPvP11dStage_dt_c -/* 80026D68 48 00 A8 3D */ bl execute__7daSus_cFv -/* 80026D6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026D70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026D74 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 80026D78 7C 03 07 75 */ extsb. r3, r0 -/* 80026D7C 41 80 00 08 */ blt lbl_80026D84 -/* 80026D80 4B FF DF 91 */ bl dStage_roomInit__Fi -lbl_80026D84: -/* 80026D84 38 00 00 00 */ li r0, 0 -/* 80026D88 3C 60 80 40 */ lis r3, mDemoArcName__20dStage_roomControl_c@ha /* 0x80406194@ha */ -/* 80026D8C 98 03 61 94 */ stb r0, mDemoArcName__20dStage_roomControl_c@l(r3) /* 0x80406194@l */ -/* 80026D90 4B FF FB 09 */ bl dKankyo_create__Fv -/* 80026D94 3C 60 80 38 */ lis r3, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80026D98 38 63 8A 50 */ addi r3, r3, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80026D9C 38 63 01 23 */ addi r3, r3, 0x123 -/* 80026DA0 48 00 86 95 */ bl dComIfG_getStageRes__FPCc -/* 80026DA4 28 03 00 00 */ cmplwi r3, 0 -/* 80026DA8 41 82 00 34 */ beq lbl_80026DDC -/* 80026DAC 4B FF A9 49 */ bl fpcLy_CurrentLayer__Fv -/* 80026DB0 38 80 02 DA */ li r4, 0x2da -/* 80026DB4 38 A0 00 00 */ li r5, 0 -/* 80026DB8 38 C0 00 00 */ li r6, 0 -/* 80026DBC 38 E0 00 00 */ li r7, 0 -/* 80026DC0 4B FF CF D5 */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv -/* 80026DC4 4B FF A9 31 */ bl fpcLy_CurrentLayer__Fv -/* 80026DC8 38 80 02 DB */ li r4, 0x2db -/* 80026DCC 38 A0 00 00 */ li r5, 0 -/* 80026DD0 38 C0 00 00 */ li r6, 0 -/* 80026DD4 38 E0 00 00 */ li r7, 0 -/* 80026DD8 4B FF CF BD */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv -lbl_80026DDC: -/* 80026DDC 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80026DE0 48 01 F9 31 */ bl create__16dEvent_manager_cFv -/* 80026DE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80026DE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026DEC 7C 08 03 A6 */ mtlr r0 -/* 80026DF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026DF4 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_Delete__Fv.s b/asm/d/d_stage/dStage_Delete__Fv.s deleted file mode 100644 index f4ca45ffe0..0000000000 --- a/asm/d/d_stage/dStage_Delete__Fv.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_80026DF8: -/* 80026DF8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80026DFC 7C 08 02 A6 */ mflr r0 -/* 80026E00 90 01 00 24 */ stw r0, 0x24(r1) -/* 80026E04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026E08 48 33 B3 D5 */ bl _savegpr_29 -/* 80026E0C 3C 60 80 40 */ lis r3, mDemoArcName__20dStage_roomControl_c@ha /* 0x80406194@ha */ -/* 80026E10 8C 03 61 94 */ lbzu r0, mDemoArcName__20dStage_roomControl_c@l(r3) /* 0x80406194@l */ -/* 80026E14 7C 00 07 75 */ extsb. r0, r0 -/* 80026E18 41 82 00 1C */ beq lbl_80026E34 -/* 80026E1C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026E20 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026E24 3C 84 00 02 */ addis r4, r4, 2 -/* 80026E28 38 A0 00 80 */ li r5, 0x80 -/* 80026E2C 38 84 C2 F8 */ addi r4, r4, -15624 -/* 80026E30 48 01 53 65 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci -lbl_80026E34: -/* 80026E34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026E38 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026E3C 3B DF 4E 20 */ addi r30, r31, 0x4e20 -/* 80026E40 7F C3 F3 78 */ mr r3, r30 -/* 80026E44 81 9E 00 00 */ lwz r12, 0(r30) -/* 80026E48 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 80026E4C 7D 89 03 A6 */ mtctr r12 -/* 80026E50 4E 80 04 21 */ bctrl -/* 80026E54 88 03 00 09 */ lbz r0, 9(r3) -/* 80026E58 54 04 FE FE */ rlwinm r4, r0, 0x1f, 0x1b, 0x1f -/* 80026E5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026E60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026E64 48 00 E2 8D */ bl putSave__10dSv_info_cFi -/* 80026E68 38 6D 87 F4 */ la r3, m_roomDzs__20dStage_roomControl_c(r13) /* 80450D74-_SDA_BASE_ */ -/* 80026E6C 4B FF DC 51 */ bl remove__Q220dStage_roomControl_c9roomDzs_cFv -/* 80026E70 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80026E74 80 03 00 00 */ lwz r0, 0(r3) -/* 80026E78 2C 00 00 00 */ cmpwi r0, 0 -/* 80026E7C 40 82 00 2C */ bne lbl_80026EA8 -/* 80026E80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026E84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026E88 88 03 4E 1C */ lbz r0, 0x4e1c(r3) -/* 80026E8C 7C 00 07 75 */ extsb. r0, r0 -/* 80026E90 41 82 00 18 */ beq lbl_80026EA8 -/* 80026E94 38 7F 4E 0E */ addi r3, r31, 0x4e0e -/* 80026E98 38 9F 4E 00 */ addi r4, r31, 0x4e00 -/* 80026E9C 48 34 1A F9 */ bl strcmp -/* 80026EA0 2C 03 00 00 */ cmpwi r3, 0 -/* 80026EA4 41 82 00 C4 */ beq lbl_80026F68 -lbl_80026EA8: -/* 80026EA8 4B FF DA 01 */ bl destroyMemoryBlock__20dStage_roomControl_cFv -/* 80026EAC 7F C3 F3 78 */ mr r3, r30 -/* 80026EB0 81 9E 00 00 */ lwz r12, 0(r30) -/* 80026EB4 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 80026EB8 7D 89 03 A6 */ mtctr r12 -/* 80026EBC 4E 80 04 21 */ bctrl -/* 80026EC0 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80026EC4 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f -/* 80026EC8 28 00 00 01 */ cmplwi r0, 1 -/* 80026ECC 40 82 00 48 */ bne lbl_80026F14 -/* 80026ED0 3C 60 80 38 */ lis r3, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80026ED4 38 63 8A 50 */ addi r3, r3, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80026ED8 38 63 01 32 */ addi r3, r3, 0x132 -/* 80026EDC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026EE0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026EE4 3C 84 00 02 */ addis r4, r4, 2 -/* 80026EE8 38 84 D4 F8 */ addi r4, r4, -11016 -/* 80026EEC 38 A0 00 40 */ li r5, 0x40 -/* 80026EF0 48 01 52 F5 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci -/* 80026EF4 38 00 00 58 */ li r0, 0x58 -/* 80026EF8 98 03 00 00 */ stb r0, 0(r3) -/* 80026EFC 7F C3 F3 78 */ mr r3, r30 -/* 80026F00 81 9E 00 00 */ lwz r12, 0(r30) -/* 80026F04 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80026F08 7D 89 03 A6 */ mtctr r12 -/* 80026F0C 4E 80 04 21 */ bctrl -/* 80026F10 48 00 00 58 */ b lbl_80026F68 -lbl_80026F14: -/* 80026F14 3C 60 80 38 */ lis r3, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80026F18 38 63 8A 50 */ addi r3, r3, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80026F1C 38 63 01 32 */ addi r3, r3, 0x132 -/* 80026F20 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026F24 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026F28 3C 84 00 02 */ addis r4, r4, 2 -/* 80026F2C 3B A4 D4 F8 */ addi r29, r4, -11016 -/* 80026F30 7F A4 EB 78 */ mr r4, r29 -/* 80026F34 38 A0 00 40 */ li r5, 0x40 -/* 80026F38 48 01 52 5D */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci -/* 80026F3C 3C 60 80 38 */ lis r3, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80026F40 38 63 8A 50 */ addi r3, r3, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80026F44 38 63 00 E3 */ addi r3, r3, 0xe3 -/* 80026F48 7F A4 EB 78 */ mr r4, r29 -/* 80026F4C 38 A0 00 40 */ li r5, 0x40 -/* 80026F50 48 01 52 45 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci -/* 80026F54 7F C3 F3 78 */ mr r3, r30 -/* 80026F58 81 9E 00 00 */ lwz r12, 0(r30) -/* 80026F5C 81 8C 01 34 */ lwz r12, 0x134(r12) -/* 80026F60 7D 89 03 A6 */ mtctr r12 -/* 80026F64 4E 80 04 21 */ bctrl -lbl_80026F68: -/* 80026F68 3C 60 80 38 */ lis r3, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80026F6C 38 63 8A 50 */ addi r3, r3, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80026F70 38 63 01 39 */ addi r3, r3, 0x139 -/* 80026F74 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026F78 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026F7C 3F A4 00 02 */ addis r29, r4, 2 -/* 80026F80 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80026F84 7F A4 EB 78 */ mr r4, r29 -/* 80026F88 38 A0 00 80 */ li r5, 0x80 -/* 80026F8C 48 01 52 09 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci -/* 80026F90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026F94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026F98 80 63 5D 88 */ lwz r3, 0x5d88(r3) -/* 80026F9C 7F A4 EB 78 */ mr r4, r29 -/* 80026FA0 38 A0 00 80 */ li r5, 0x80 -/* 80026FA4 48 01 51 F1 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci -/* 80026FA8 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80026FAC 48 01 FC 61 */ bl remove__16dEvent_manager_cFv -/* 80026FB0 7F C3 F3 78 */ mr r3, r30 -/* 80026FB4 81 9E 00 00 */ lwz r12, 0(r30) -/* 80026FB8 81 8C 00 08 */ lwz r12, 8(r12) -/* 80026FBC 7D 89 03 A6 */ mtctr r12 -/* 80026FC0 4E 80 04 21 */ bctrl -/* 80026FC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026FC8 48 33 B2 61 */ bl _restgpr_29 -/* 80026FCC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80026FD0 7C 08 03 A6 */ mtlr r0 -/* 80026FD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80026FD8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_RoomCheck__FP11cBgS_GndChk.s b/asm/d/d_stage/dStage_RoomCheck__FP11cBgS_GndChk.s deleted file mode 100644 index 3f24bc4501..0000000000 --- a/asm/d/d_stage/dStage_RoomCheck__FP11cBgS_GndChk.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80026FE8: -/* 80026FE8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80026FEC 7C 08 02 A6 */ mflr r0 -/* 80026FF0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80026FF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026FF8 48 33 B1 E5 */ bl _savegpr_29 -/* 80026FFC 7C 64 1B 79 */ or. r4, r3, r3 -/* 80027000 8B ED 80 70 */ lbz r31, data_804505F0(r13) -/* 80027004 7F FF 07 74 */ extsb r31, r31 -/* 80027008 40 82 00 0C */ bne lbl_80027014 -/* 8002700C 7F E4 FB 78 */ mr r4, r31 -/* 80027010 48 00 00 1C */ b lbl_8002702C -lbl_80027014: -/* 80027014 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80027018 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002701C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80027020 38 84 00 14 */ addi r4, r4, 0x14 -/* 80027024 48 04 E0 DD */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80027028 7C 64 1B 78 */ mr r4, r3 -lbl_8002702C: -/* 8002702C 2C 04 00 00 */ cmpwi r4, 0 -/* 80027030 40 80 00 0C */ bge lbl_8002703C -/* 80027034 38 60 00 00 */ li r3, 0 -/* 80027038 48 00 00 AC */ b lbl_800270E4 -lbl_8002703C: -/* 8002703C 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) -/* 80027040 7C 00 07 74 */ extsb r0, r0 -/* 80027044 7C 04 00 00 */ cmpw r4, r0 -/* 80027048 41 82 00 14 */ beq lbl_8002705C -/* 8002704C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80027050 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80027054 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 80027058 4B FF D6 C5 */ bl zoneCountCheck__20dStage_roomControl_cCFi -lbl_8002705C: -/* 8002705C 2C 1F 00 00 */ cmpwi r31, 0 -/* 80027060 40 80 00 0C */ bge lbl_8002706C -/* 80027064 8B ED 87 E4 */ lbz r31, struct_80450D64+0x0(r13) -/* 80027068 7F FF 07 74 */ extsb r31, r31 -lbl_8002706C: -/* 8002706C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80027070 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80027074 38 7D 4E 20 */ addi r3, r29, 0x4e20 -/* 80027078 81 9D 4E 20 */ lwz r12, 0x4e20(r29) -/* 8002707C 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80027080 7D 89 03 A6 */ mtctr r12 -/* 80027084 4E 80 04 21 */ bctrl -/* 80027088 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8002708C 41 82 00 54 */ beq lbl_800270E0 -/* 80027090 80 1E 00 00 */ lwz r0, 0(r30) -/* 80027094 7C 00 F8 00 */ cmpw r0, r31 -/* 80027098 40 81 00 48 */ ble lbl_800270E0 -/* 8002709C 80 7E 00 04 */ lwz r3, 4(r30) -/* 800270A0 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) -/* 800270A4 7C 00 07 74 */ extsb r0, r0 -/* 800270A8 54 00 10 3A */ slwi r0, r0, 2 -/* 800270AC 7C 63 00 2E */ lwzx r3, r3, r0 -/* 800270B0 88 03 00 02 */ lbz r0, 2(r3) -/* 800270B4 54 03 07 BE */ clrlwi r3, r0, 0x1e -/* 800270B8 4B FF DC F9 */ bl SetTimePass__20dStage_roomControl_cFi -/* 800270BC 80 7E 00 04 */ lwz r3, 4(r30) -/* 800270C0 57 E0 10 3A */ slwi r0, r31, 2 -/* 800270C4 7C A3 00 2E */ lwzx r5, r3, r0 -/* 800270C8 38 7D 4E C4 */ addi r3, r29, 0x4ec4 -/* 800270CC 88 85 00 00 */ lbz r4, 0(r5) -/* 800270D0 80 A5 00 04 */ lwz r5, 4(r5) -/* 800270D4 38 C0 00 00 */ li r6, 0 -/* 800270D8 4B FF D4 45 */ bl loadRoom__20dStage_roomControl_cFiPUcb -/* 800270DC 48 00 00 08 */ b lbl_800270E4 -lbl_800270E0: -/* 800270E0 38 60 00 01 */ li r3, 1 -lbl_800270E4: -/* 800270E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800270E8 48 33 B1 41 */ bl _restgpr_29 -/* 800270EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800270F0 7C 08 03 A6 */ mtlr r0 -/* 800270F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800270F8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 31c2ebfa47..0000000000 --- a/asm/d/d_stage/dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80024174: -/* 80024174 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80024178 7C 08 02 A6 */ mflr r0 -/* 8002417C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80024180 38 84 00 04 */ addi r4, r4, 4 -/* 80024184 4B FF FE F5 */ bl dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class -/* 80024188 38 60 00 01 */ li r3, 1 -/* 8002418C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80024190 7C 08 03 A6 */ mtlr r0 -/* 80024194 38 21 00 10 */ addi r1, r1, 0x10 -/* 80024198 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 1cfa7c266d..0000000000 --- a/asm/d/d_stage/dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_8002586C: -/* 8002586C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80025870 7C 08 02 A6 */ mflr r0 -/* 80025874 90 01 00 24 */ stw r0, 0x24(r1) -/* 80025878 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002587C 48 33 C9 59 */ bl _savegpr_27 -/* 80025880 7C 7B 1B 78 */ mr r27, r3 -/* 80025884 7C 9C 23 78 */ mr r28, r4 -/* 80025888 83 C4 00 08 */ lwz r30, 8(r4) -/* 8002588C 3B A0 00 00 */ li r29, 0 -/* 80025890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80025894 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80025898 48 00 00 98 */ b lbl_80025930 -lbl_8002589C: -/* 8002589C 7F E3 FB 78 */ mr r3, r31 -/* 800258A0 A0 9E 00 1E */ lhz r4, 0x1e(r30) -/* 800258A4 88 BB 00 04 */ lbz r5, 4(r27) -/* 800258A8 7C A5 07 74 */ extsb r5, r5 -/* 800258AC 48 00 FE 79 */ bl isActor__10dSv_info_cCFii -/* 800258B0 2C 03 00 00 */ cmpwi r3, 0 -/* 800258B4 40 82 00 74 */ bne lbl_80025928 -/* 800258B8 88 7B 00 04 */ lbz r3, 4(r27) -/* 800258BC 38 9E 00 0C */ addi r4, r30, 0xc -/* 800258C0 48 00 BB 75 */ bl check__7daSus_cFScRC4cXyz -/* 800258C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800258C8 40 82 00 60 */ bne lbl_80025928 -/* 800258CC 4B FF 41 DD */ bl fopAcM_CreateAppend__Fv -/* 800258D0 7C 64 1B 79 */ or. r4, r3, r3 -/* 800258D4 41 82 00 54 */ beq lbl_80025928 -/* 800258D8 80 1E 00 08 */ lwz r0, 8(r30) -/* 800258DC 90 04 00 00 */ stw r0, 0(r4) -/* 800258E0 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 800258E4 D0 04 00 04 */ stfs f0, 4(r4) -/* 800258E8 C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 800258EC D0 04 00 08 */ stfs f0, 8(r4) -/* 800258F0 C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 800258F4 D0 04 00 0C */ stfs f0, 0xc(r4) -/* 800258F8 A8 1E 00 18 */ lha r0, 0x18(r30) -/* 800258FC B0 04 00 10 */ sth r0, 0x10(r4) -/* 80025900 A8 1E 00 1A */ lha r0, 0x1a(r30) -/* 80025904 B0 04 00 12 */ sth r0, 0x12(r4) -/* 80025908 A8 1E 00 1C */ lha r0, 0x1c(r30) -/* 8002590C B0 04 00 14 */ sth r0, 0x14(r4) -/* 80025910 A0 1E 00 1E */ lhz r0, 0x1e(r30) -/* 80025914 B0 04 00 16 */ sth r0, 0x16(r4) -/* 80025918 88 1B 00 04 */ lbz r0, 4(r27) -/* 8002591C 98 04 00 21 */ stb r0, 0x21(r4) -/* 80025920 7F C3 F3 78 */ mr r3, r30 -/* 80025924 4B FF F5 D9 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class -lbl_80025928: -/* 80025928 3B DE 00 20 */ addi r30, r30, 0x20 -/* 8002592C 3B BD 00 01 */ addi r29, r29, 1 -lbl_80025930: -/* 80025930 80 1C 00 04 */ lwz r0, 4(r28) -/* 80025934 7C 1D 00 00 */ cmpw r29, r0 -/* 80025938 41 80 FF 64 */ blt lbl_8002589C -/* 8002593C 38 60 00 01 */ li r3, 1 -/* 80025940 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025944 48 33 C8 DD */ bl _restgpr_27 -/* 80025948 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002594C 7C 08 03 A6 */ mtlr r0 -/* 80025950 38 21 00 20 */ addi r1, r1, 0x20 -/* 80025954 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_actorInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_actorInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index e57a0755eb..0000000000 --- a/asm/d/d_stage/dStage_actorInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80025A38: -/* 80025A38 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80025A3C 7C 08 02 A6 */ mflr r0 -/* 80025A40 90 01 00 24 */ stw r0, 0x24(r1) -/* 80025A44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025A48 48 33 C7 8D */ bl _savegpr_27 -/* 80025A4C 7C 7B 1B 78 */ mr r27, r3 -/* 80025A50 7C 9C 23 78 */ mr r28, r4 -/* 80025A54 83 C4 00 08 */ lwz r30, 8(r4) -/* 80025A58 3B A0 00 00 */ li r29, 0 -/* 80025A5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80025A60 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80025A64 48 00 00 98 */ b lbl_80025AFC -lbl_80025A68: -/* 80025A68 7F E3 FB 78 */ mr r3, r31 -/* 80025A6C A0 9E 00 1E */ lhz r4, 0x1e(r30) -/* 80025A70 88 BB 00 04 */ lbz r5, 4(r27) -/* 80025A74 7C A5 07 74 */ extsb r5, r5 -/* 80025A78 48 00 FC AD */ bl isActor__10dSv_info_cCFii -/* 80025A7C 2C 03 00 00 */ cmpwi r3, 0 -/* 80025A80 40 82 00 74 */ bne lbl_80025AF4 -/* 80025A84 88 7B 00 04 */ lbz r3, 4(r27) -/* 80025A88 38 9E 00 0C */ addi r4, r30, 0xc -/* 80025A8C 48 00 B9 A9 */ bl check__7daSus_cFScRC4cXyz -/* 80025A90 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80025A94 40 82 00 60 */ bne lbl_80025AF4 -/* 80025A98 4B FF 40 11 */ bl fopAcM_CreateAppend__Fv -/* 80025A9C 7C 64 1B 79 */ or. r4, r3, r3 -/* 80025AA0 41 82 00 54 */ beq lbl_80025AF4 -/* 80025AA4 80 1E 00 08 */ lwz r0, 8(r30) -/* 80025AA8 90 04 00 00 */ stw r0, 0(r4) -/* 80025AAC C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 80025AB0 D0 04 00 04 */ stfs f0, 4(r4) -/* 80025AB4 C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 80025AB8 D0 04 00 08 */ stfs f0, 8(r4) -/* 80025ABC C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 80025AC0 D0 04 00 0C */ stfs f0, 0xc(r4) -/* 80025AC4 A8 1E 00 18 */ lha r0, 0x18(r30) -/* 80025AC8 B0 04 00 10 */ sth r0, 0x10(r4) -/* 80025ACC A8 1E 00 1A */ lha r0, 0x1a(r30) -/* 80025AD0 B0 04 00 12 */ sth r0, 0x12(r4) -/* 80025AD4 A8 1E 00 1C */ lha r0, 0x1c(r30) -/* 80025AD8 B0 04 00 14 */ sth r0, 0x14(r4) -/* 80025ADC A0 1E 00 1E */ lhz r0, 0x1e(r30) -/* 80025AE0 B0 04 00 16 */ sth r0, 0x16(r4) -/* 80025AE4 88 1B 00 04 */ lbz r0, 4(r27) -/* 80025AE8 98 04 00 21 */ stb r0, 0x21(r4) -/* 80025AEC 7F C3 F3 78 */ mr r3, r30 -/* 80025AF0 4B FF F4 0D */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class -lbl_80025AF4: -/* 80025AF4 3B DE 00 20 */ addi r30, r30, 0x20 -/* 80025AF8 3B BD 00 01 */ addi r29, r29, 1 -lbl_80025AFC: -/* 80025AFC 80 1C 00 04 */ lwz r0, 4(r28) -/* 80025B00 7C 1D 00 00 */ cmpw r29, r0 -/* 80025B04 41 80 FF 64 */ blt lbl_80025A68 -/* 80025B08 38 60 00 01 */ li r3, 1 -/* 80025B0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025B10 48 33 C7 11 */ bl _restgpr_27 -/* 80025B14 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80025B18 7C 08 03 A6 */ mtlr r0 -/* 80025B1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80025B20 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_actorInit_always__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_actorInit_always__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 8903922723..0000000000 --- a/asm/d/d_stage/dStage_actorInit_always__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80025B24: -/* 80025B24 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80025B28 7C 08 02 A6 */ mflr r0 -/* 80025B2C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80025B30 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025B34 48 33 C6 A1 */ bl _savegpr_27 -/* 80025B38 7C 7B 1B 78 */ mr r27, r3 -/* 80025B3C 7C 9C 23 78 */ mr r28, r4 -/* 80025B40 83 C4 00 08 */ lwz r30, 8(r4) -/* 80025B44 3B A0 00 00 */ li r29, 0 -/* 80025B48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80025B4C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80025B50 48 00 00 84 */ b lbl_80025BD4 -lbl_80025B54: -/* 80025B54 7F E3 FB 78 */ mr r3, r31 -/* 80025B58 A0 9E 00 1E */ lhz r4, 0x1e(r30) -/* 80025B5C 88 BB 00 04 */ lbz r5, 4(r27) -/* 80025B60 7C A5 07 74 */ extsb r5, r5 -/* 80025B64 48 00 FB C1 */ bl isActor__10dSv_info_cCFii -/* 80025B68 2C 03 00 00 */ cmpwi r3, 0 -/* 80025B6C 40 82 00 60 */ bne lbl_80025BCC -/* 80025B70 4B FF 3F 39 */ bl fopAcM_CreateAppend__Fv -/* 80025B74 7C 64 1B 79 */ or. r4, r3, r3 -/* 80025B78 41 82 00 54 */ beq lbl_80025BCC -/* 80025B7C 80 1E 00 08 */ lwz r0, 8(r30) -/* 80025B80 90 04 00 00 */ stw r0, 0(r4) -/* 80025B84 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 80025B88 D0 04 00 04 */ stfs f0, 4(r4) -/* 80025B8C C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 80025B90 D0 04 00 08 */ stfs f0, 8(r4) -/* 80025B94 C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 80025B98 D0 04 00 0C */ stfs f0, 0xc(r4) -/* 80025B9C A8 1E 00 18 */ lha r0, 0x18(r30) -/* 80025BA0 B0 04 00 10 */ sth r0, 0x10(r4) -/* 80025BA4 A8 1E 00 1A */ lha r0, 0x1a(r30) -/* 80025BA8 B0 04 00 12 */ sth r0, 0x12(r4) -/* 80025BAC A8 1E 00 1C */ lha r0, 0x1c(r30) -/* 80025BB0 B0 04 00 14 */ sth r0, 0x14(r4) -/* 80025BB4 A0 1E 00 1E */ lhz r0, 0x1e(r30) -/* 80025BB8 B0 04 00 16 */ sth r0, 0x16(r4) -/* 80025BBC 88 1B 00 04 */ lbz r0, 4(r27) -/* 80025BC0 98 04 00 21 */ stb r0, 0x21(r4) -/* 80025BC4 7F C3 F3 78 */ mr r3, r30 -/* 80025BC8 4B FF F3 35 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class -lbl_80025BCC: -/* 80025BCC 3B DE 00 20 */ addi r30, r30, 0x20 -/* 80025BD0 3B BD 00 01 */ addi r29, r29, 1 -lbl_80025BD4: -/* 80025BD4 80 1C 00 04 */ lwz r0, 4(r28) -/* 80025BD8 7C 1D 00 00 */ cmpw r29, r0 -/* 80025BDC 41 80 FF 78 */ blt lbl_80025B54 -/* 80025BE0 38 60 00 01 */ li r3, 1 -/* 80025BE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025BE8 48 33 C6 39 */ bl _restgpr_27 -/* 80025BEC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80025BF0 7C 08 03 A6 */ mtlr r0 -/* 80025BF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80025BF8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_cameraCreate__FP24stage_camera2_data_classii.s b/asm/d/d_stage/dStage_cameraCreate__FP24stage_camera2_data_classii.s deleted file mode 100644 index 6bf25af85d..0000000000 --- a/asm/d/d_stage/dStage_cameraCreate__FP24stage_camera2_data_classii.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80024F98: -/* 80024F98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80024F9C 7C 08 02 A6 */ mflr r0 -/* 80024FA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80024FA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80024FA8 93 C1 00 08 */ stw r30, 8(r1) -/* 80024FAC 7C 9E 23 78 */ mr r30, r4 -/* 80024FB0 7C BF 2B 78 */ mr r31, r5 -/* 80024FB4 38 60 FF FC */ li r3, -4 -/* 80024FB8 38 80 00 18 */ li r4, 0x18 -/* 80024FBC 48 23 E2 6D */ bl memalignB__3cMlFiUl -/* 80024FC0 7C 65 1B 79 */ or. r5, r3, r3 -/* 80024FC4 41 82 00 24 */ beq lbl_80024FE8 -/* 80024FC8 C0 02 82 90 */ lfs f0, lit_4270(r2) -/* 80024FCC D0 05 00 04 */ stfs f0, 4(r5) -/* 80024FD0 D0 05 00 08 */ stfs f0, 8(r5) -/* 80024FD4 D0 05 00 04 */ stfs f0, 4(r5) -/* 80024FD8 93 E5 00 00 */ stw r31, 0(r5) -/* 80024FDC 7F C3 F3 78 */ mr r3, r30 -/* 80024FE0 38 80 03 0D */ li r4, 0x30d -/* 80024FE4 4B FF 93 2D */ bl fopCamM_Create__FisPv -lbl_80024FE8: -/* 80024FE8 38 60 00 01 */ li r3, 1 -/* 80024FEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80024FF0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80024FF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80024FF8 7C 08 03 A6 */ mtlr r0 -/* 80024FFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025000 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_cameraInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_cameraInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 17030552e8..0000000000 --- a/asm/d/d_stage/dStage_cameraInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800252B8: -/* 800252B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800252BC 7C 08 02 A6 */ mflr r0 -/* 800252C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800252C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800252C8 3B E4 00 04 */ addi r31, r4, 4 -/* 800252CC 7F E4 FB 78 */ mr r4, r31 -/* 800252D0 81 83 00 00 */ lwz r12, 0(r3) -/* 800252D4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 800252D8 7D 89 03 A6 */ mtctr r12 -/* 800252DC 4E 80 04 21 */ bctrl -/* 800252E0 80 7F 00 04 */ lwz r3, 4(r31) -/* 800252E4 38 80 00 00 */ li r4, 0 -/* 800252E8 38 A0 00 00 */ li r5, 0 -/* 800252EC 4B FF FC AD */ bl dStage_cameraCreate__FP24stage_camera2_data_classii -/* 800252F0 38 60 00 01 */ li r3, 1 -/* 800252F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800252F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800252FC 7C 08 03 A6 */ mtlr r0 -/* 80025300 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025304 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs.s b/asm/d/d_stage/dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs.s deleted file mode 100644 index 2d4c8dadc4..0000000000 --- a/asm/d/d_stage/dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800270FC: -/* 800270FC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80027100 7C 08 02 A6 */ mflr r0 -/* 80027104 90 01 00 24 */ stw r0, 0x24(r1) -/* 80027108 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 8002710C 39 61 00 18 */ addi r11, r1, 0x18 -/* 80027110 48 33 B0 CD */ bl _savegpr_29 -/* 80027114 7C 60 1B 78 */ mr r0, r3 -/* 80027118 FF E0 08 90 */ fmr f31, f1 -/* 8002711C 7C 9D 23 78 */ mr r29, r4 -/* 80027120 7C BE 2B 78 */ mr r30, r5 -/* 80027124 7C DF 33 78 */ mr r31, r6 -/* 80027128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002712C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80027130 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80027134 7C 04 03 78 */ mr r4, r0 -/* 80027138 48 04 DA 61 */ bl GetExitId__4dBgSFRC13cBgS_PolyInfo -/* 8002713C FC 20 F8 90 */ fmr f1, f31 -/* 80027140 7F A4 EB 78 */ mr r4, r29 -/* 80027144 7F C5 F3 78 */ mr r5, r30 -/* 80027148 7F E6 FB 78 */ mr r6, r31 -/* 8002714C 38 E0 FF FF */ li r7, -1 -/* 80027150 48 00 00 21 */ bl dStage_changeScene__FifUlScsi -/* 80027154 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 80027158 39 61 00 18 */ addi r11, r1, 0x18 -/* 8002715C 48 33 B0 CD */ bl _restgpr_29 -/* 80027160 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80027164 7C 08 03 A6 */ mtlr r0 -/* 80027168 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002716C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_dmapInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_dmapInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index b93996d788..0000000000 --- a/asm/d/d_stage/dStage_dmapInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80026730: -/* 80026730 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026734 7C 08 02 A6 */ mflr r0 -/* 80026738 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002673C 81 83 00 00 */ lwz r12, 0(r3) -/* 80026740 81 8C 01 4C */ lwz r12, 0x14c(r12) -/* 80026744 7D 89 03 A6 */ mtctr r12 -/* 80026748 38 84 00 04 */ addi r4, r4, 4 -/* 8002674C 4E 80 04 21 */ bctrl -/* 80026750 38 60 00 01 */ li r3, 1 -/* 80026754 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026758 7C 08 03 A6 */ mtlr r0 -/* 8002675C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026760 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_doorInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_doorInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index bef8f25639..0000000000 --- a/asm/d/d_stage/dStage_doorInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80025CDC: -/* 80025CDC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80025CE0 7C 08 02 A6 */ mflr r0 -/* 80025CE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80025CE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025CEC 48 33 C4 ED */ bl _savegpr_28 -/* 80025CF0 7C 7C 1B 78 */ mr r28, r3 -/* 80025CF4 7C 9D 23 78 */ mr r29, r4 -/* 80025CF8 83 E4 00 08 */ lwz r31, 8(r4) -/* 80025CFC 3B C0 00 00 */ li r30, 0 -/* 80025D00 48 00 00 80 */ b lbl_80025D80 -lbl_80025D04: -/* 80025D04 4B FF 3D A5 */ bl fopAcM_CreateAppend__Fv -/* 80025D08 7C 64 1B 79 */ or. r4, r3, r3 -/* 80025D0C 41 82 00 6C */ beq lbl_80025D78 -/* 80025D10 80 1F 00 08 */ lwz r0, 8(r31) -/* 80025D14 90 04 00 00 */ stw r0, 0(r4) -/* 80025D18 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80025D1C D0 04 00 04 */ stfs f0, 4(r4) -/* 80025D20 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 80025D24 D0 04 00 08 */ stfs f0, 8(r4) -/* 80025D28 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80025D2C D0 04 00 0C */ stfs f0, 0xc(r4) -/* 80025D30 A8 1F 00 18 */ lha r0, 0x18(r31) -/* 80025D34 B0 04 00 10 */ sth r0, 0x10(r4) -/* 80025D38 A8 1F 00 1A */ lha r0, 0x1a(r31) -/* 80025D3C B0 04 00 12 */ sth r0, 0x12(r4) -/* 80025D40 A8 1F 00 1C */ lha r0, 0x1c(r31) -/* 80025D44 B0 04 00 14 */ sth r0, 0x14(r4) -/* 80025D48 A0 1F 00 1E */ lhz r0, 0x1e(r31) -/* 80025D4C B0 04 00 16 */ sth r0, 0x16(r4) -/* 80025D50 88 1C 00 04 */ lbz r0, 4(r28) -/* 80025D54 98 04 00 21 */ stb r0, 0x21(r4) -/* 80025D58 88 1F 00 20 */ lbz r0, 0x20(r31) -/* 80025D5C 98 04 00 18 */ stb r0, 0x18(r4) -/* 80025D60 88 1F 00 21 */ lbz r0, 0x21(r31) -/* 80025D64 98 04 00 19 */ stb r0, 0x19(r4) -/* 80025D68 88 1F 00 22 */ lbz r0, 0x22(r31) -/* 80025D6C 98 04 00 1A */ stb r0, 0x1a(r4) -/* 80025D70 7F E3 FB 78 */ mr r3, r31 -/* 80025D74 4B FF F1 89 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class -lbl_80025D78: -/* 80025D78 3B FF 00 24 */ addi r31, r31, 0x24 -/* 80025D7C 3B DE 00 01 */ addi r30, r30, 1 -lbl_80025D80: -/* 80025D80 80 1D 00 04 */ lwz r0, 4(r29) -/* 80025D84 7C 1E 00 00 */ cmpw r30, r0 -/* 80025D88 41 80 FF 7C */ blt lbl_80025D04 -/* 80025D8C 38 60 00 01 */ li r3, 1 -/* 80025D90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025D94 48 33 C4 91 */ bl _restgpr_28 -/* 80025D98 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80025D9C 7C 08 03 A6 */ mtlr r0 -/* 80025DA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80025DA4 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei.s b/asm/d/d_stage/dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei.s deleted file mode 100644 index 70c6e04a21..0000000000 --- a/asm/d/d_stage/dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_800260B4: -/* 800260B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800260B8 7C 08 02 A6 */ mflr r0 -/* 800260BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800260C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800260C4 48 33 C1 0D */ bl _savegpr_26 -/* 800260C8 7C 7A 1B 79 */ or. r26, r3, r3 -/* 800260CC 7C 9B 23 78 */ mr r27, r4 -/* 800260D0 7C BC 2B 78 */ mr r28, r5 -/* 800260D4 7C DD 33 78 */ mr r29, r6 -/* 800260D8 41 82 00 78 */ beq lbl_80026150 -/* 800260DC 3B C0 00 00 */ li r30, 0 -/* 800260E0 3B E0 00 00 */ li r31, 0 -/* 800260E4 48 00 00 60 */ b lbl_80026144 -lbl_800260E8: -/* 800260E8 38 9A 00 04 */ addi r4, r26, 4 -/* 800260EC 7C BC FA 14 */ add r5, r28, r31 -/* 800260F0 80 1A 00 00 */ lwz r0, 0(r26) -/* 800260F4 7C 09 03 A6 */ mtctr r0 -/* 800260F8 2C 00 00 00 */ cmpwi r0, 0 -/* 800260FC 40 81 00 40 */ ble lbl_8002613C -lbl_80026100: -/* 80026100 80 64 00 00 */ lwz r3, 0(r4) -/* 80026104 80 05 00 00 */ lwz r0, 0(r5) -/* 80026108 7C 03 00 00 */ cmpw r3, r0 -/* 8002610C 40 82 00 28 */ bne lbl_80026134 -/* 80026110 81 85 00 08 */ lwz r12, 8(r5) -/* 80026114 28 0C 00 00 */ cmplwi r12, 0 -/* 80026118 41 82 00 24 */ beq lbl_8002613C -/* 8002611C 7F 63 DB 78 */ mr r3, r27 -/* 80026120 80 A4 00 04 */ lwz r5, 4(r4) -/* 80026124 7F 46 D3 78 */ mr r6, r26 -/* 80026128 7D 89 03 A6 */ mtctr r12 -/* 8002612C 4E 80 04 21 */ bctrl -/* 80026130 48 00 00 0C */ b lbl_8002613C -lbl_80026134: -/* 80026134 38 84 00 0C */ addi r4, r4, 0xc -/* 80026138 42 00 FF C8 */ bdnz lbl_80026100 -lbl_8002613C: -/* 8002613C 3B DE 00 01 */ addi r30, r30, 1 -/* 80026140 3B FF 00 0C */ addi r31, r31, 0xc -lbl_80026144: -/* 80026144 7C 1E E8 00 */ cmpw r30, r29 -/* 80026148 41 80 FF A0 */ blt lbl_800260E8 -/* 8002614C 48 00 00 18 */ b lbl_80026164 -lbl_80026150: -/* 80026150 3C 60 80 38 */ lis r3, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80026154 38 63 8A 50 */ addi r3, r3, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80026158 38 63 00 EA */ addi r3, r3, 0xea -/* 8002615C 4C C6 31 82 */ crclr 6 -/* 80026160 4B FE 0A AD */ bl OSReport_Error -lbl_80026164: -/* 80026164 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026168 48 33 C0 B5 */ bl _restgpr_26 -/* 8002616C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80026170 7C 08 03 A6 */ mtlr r0 -/* 80026174 38 21 00 20 */ addi r1, r1, 0x20 -/* 80026178 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c.s b/asm/d/d_stage/dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c.s deleted file mode 100644 index 22b6343e59..0000000000 --- a/asm/d/d_stage/dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80026C8C: -/* 80026C8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026C90 7C 08 02 A6 */ mflr r0 -/* 80026C94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026C98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80026C9C 93 C1 00 08 */ stw r30, 8(r1) -/* 80026CA0 7C 7E 1B 78 */ mr r30, r3 -/* 80026CA4 7C 9F 23 78 */ mr r31, r4 -/* 80026CA8 4B FF F6 B5 */ bl dStage_dt_c_offsetToPtr__FPv -/* 80026CAC 7F C3 F3 78 */ mr r3, r30 -/* 80026CB0 7F E4 FB 78 */ mr r4, r31 -/* 80026CB4 3C A0 80 3A */ lis r5, l_funcTable_5178@ha /* 0x803A68FC@ha */ -/* 80026CB8 38 A5 68 FC */ addi r5, r5, l_funcTable_5178@l /* 0x803A68FC@l */ -/* 80026CBC 38 C0 00 03 */ li r6, 3 -/* 80026CC0 4B FF F3 F5 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -/* 80026CC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80026CC8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80026CCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026CD0 7C 08 03 A6 */ mtlr r0 -/* 80026CD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026CD8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_dt_c_offsetToPtr__FPv.s b/asm/d/d_stage/dStage_dt_c_offsetToPtr__FPv.s deleted file mode 100644 index 4df12fdd41..0000000000 --- a/asm/d/d_stage/dStage_dt_c_offsetToPtr__FPv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8002635C: -/* 8002635C 38 A3 00 04 */ addi r5, r3, 4 -/* 80026360 38 C0 00 00 */ li r6, 0 -/* 80026364 3C 80 80 00 */ lis r4, 0x8000 -/* 80026368 48 00 00 28 */ b lbl_80026390 -lbl_8002636C: -/* 8002636C 80 05 00 08 */ lwz r0, 8(r5) -/* 80026370 28 00 00 00 */ cmplwi r0, 0 -/* 80026374 41 82 00 14 */ beq lbl_80026388 -/* 80026378 7C 00 20 40 */ cmplw r0, r4 -/* 8002637C 40 80 00 0C */ bge lbl_80026388 -/* 80026380 7C 00 1A 14 */ add r0, r0, r3 -/* 80026384 90 05 00 08 */ stw r0, 8(r5) -lbl_80026388: -/* 80026388 38 A5 00 0C */ addi r5, r5, 0xc -/* 8002638C 38 C6 00 01 */ addi r6, r6, 1 -lbl_80026390: -/* 80026390 80 03 00 00 */ lwz r0, 0(r3) -/* 80026394 7C 06 00 00 */ cmpw r6, r0 -/* 80026398 41 80 FF D4 */ blt lbl_8002636C -/* 8002639C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_dt_c_roomLoader__FPvP11dStage_dt_ci.s b/asm/d/d_stage/dStage_dt_c_roomLoader__FPvP11dStage_dt_ci.s deleted file mode 100644 index 9a9570db51..0000000000 --- a/asm/d/d_stage/dStage_dt_c_roomLoader__FPvP11dStage_dt_ci.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80026BBC: -/* 80026BBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80026BC0 7C 08 02 A6 */ mflr r0 -/* 80026BC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80026BC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026BCC 48 33 B6 11 */ bl _savegpr_29 -/* 80026BD0 7C 7D 1B 78 */ mr r29, r3 -/* 80026BD4 7C 9E 23 78 */ mr r30, r4 -/* 80026BD8 7C BF 2B 78 */ mr r31, r5 -/* 80026BDC 4B FF F7 81 */ bl dStage_dt_c_offsetToPtr__FPv -/* 80026BE0 7F C3 F3 78 */ mr r3, r30 -/* 80026BE4 81 9E 00 00 */ lwz r12, 0(r30) -/* 80026BE8 81 8C 00 08 */ lwz r12, 8(r12) -/* 80026BEC 7D 89 03 A6 */ mtctr r12 -/* 80026BF0 4E 80 04 21 */ bctrl -/* 80026BF4 7F A3 EB 78 */ mr r3, r29 -/* 80026BF8 7F C4 F3 78 */ mr r4, r30 -/* 80026BFC 3C A0 80 3A */ lis r5, l_funcTable_5168@ha /* 0x803A67F4@ha */ -/* 80026C00 38 A5 67 F4 */ addi r5, r5, l_funcTable_5168@l /* 0x803A67F4@l */ -/* 80026C04 38 C0 00 0E */ li r6, 0xe -/* 80026C08 4B FF F4 AD */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -/* 80026C0C 7F A3 EB 78 */ mr r3, r29 -/* 80026C10 7F C4 F3 78 */ mr r4, r30 -/* 80026C14 7F E5 FB 78 */ mr r5, r31 -/* 80026C18 4B FF FD 9D */ bl layerTableLoader__FPvP11dStage_dt_ci -/* 80026C1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026C20 48 33 B6 09 */ bl _restgpr_29 -/* 80026C24 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80026C28 7C 08 03 A6 */ mtlr r0 -/* 80026C2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80026C30 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci.s b/asm/d/d_stage/dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci.s deleted file mode 100644 index 5d0d78b0b4..0000000000 --- a/asm/d/d_stage/dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80026C34: -/* 80026C34 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80026C38 7C 08 02 A6 */ mflr r0 -/* 80026C3C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80026C40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026C44 48 33 B5 99 */ bl _savegpr_29 -/* 80026C48 7C 7D 1B 78 */ mr r29, r3 -/* 80026C4C 7C 9E 23 78 */ mr r30, r4 -/* 80026C50 7C BF 2B 78 */ mr r31, r5 -/* 80026C54 3C A0 80 3A */ lis r5, l_funcTable_5173@ha /* 0x803A689C@ha */ -/* 80026C58 38 A5 68 9C */ addi r5, r5, l_funcTable_5173@l /* 0x803A689C@l */ -/* 80026C5C 38 C0 00 08 */ li r6, 8 -/* 80026C60 4B FF F4 55 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -/* 80026C64 7F A3 EB 78 */ mr r3, r29 -/* 80026C68 7F C4 F3 78 */ mr r4, r30 -/* 80026C6C 7F E5 FB 78 */ mr r5, r31 -/* 80026C70 4B FF FE 81 */ bl layerActorLoader__FPvP11dStage_dt_ci -/* 80026C74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026C78 48 33 B5 B1 */ bl _restgpr_29 -/* 80026C7C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80026C80 7C 08 03 A6 */ mtlr r0 -/* 80026C84 38 21 00 20 */ addi r1, r1, 0x20 -/* 80026C88 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_dt_c_stageLoader__FPvP11dStage_dt_c.s b/asm/d/d_stage/dStage_dt_c_stageLoader__FPvP11dStage_dt_c.s deleted file mode 100644 index 97f57e0520..0000000000 --- a/asm/d/d_stage/dStage_dt_c_stageLoader__FPvP11dStage_dt_c.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80026B58: -/* 80026B58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026B5C 7C 08 02 A6 */ mflr r0 -/* 80026B60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026B64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80026B68 93 C1 00 08 */ stw r30, 8(r1) -/* 80026B6C 7C 7E 1B 78 */ mr r30, r3 -/* 80026B70 7C 9F 23 78 */ mr r31, r4 -/* 80026B74 3C A0 80 3A */ lis r5, l_funcTable_5163@ha /* 0x803A66BC@ha */ -/* 80026B78 38 A5 66 BC */ addi r5, r5, l_funcTable_5163@l /* 0x803A66BC@l */ -/* 80026B7C 38 C0 00 1A */ li r6, 0x1a -/* 80026B80 4B FF F5 35 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -/* 80026B84 7F C3 F3 78 */ mr r3, r30 -/* 80026B88 7F E4 FB 78 */ mr r4, r31 -/* 80026B8C 38 A0 FF FF */ li r5, -1 -/* 80026B90 4B FF FE 25 */ bl layerTableLoader__FPvP11dStage_dt_ci -/* 80026B94 7F C3 F3 78 */ mr r3, r30 -/* 80026B98 7F E4 FB 78 */ mr r4, r31 -/* 80026B9C 38 A0 FF FF */ li r5, -1 -/* 80026BA0 4B FF FF 51 */ bl layerActorLoader__FPvP11dStage_dt_ci -/* 80026BA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80026BA8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80026BAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026BB0 7C 08 03 A6 */ mtlr r0 -/* 80026BB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026BB8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_elstInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_elstInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index dbabde42bc..0000000000 --- a/asm/d/d_stage/dStage_elstInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80026844: -/* 80026844 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026848 7C 08 02 A6 */ mflr r0 -/* 8002684C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026850 38 84 00 04 */ addi r4, r4, 4 -/* 80026854 2C 05 00 00 */ cmpwi r5, 0 -/* 80026858 40 82 00 1C */ bne lbl_80026874 -/* 8002685C 38 80 00 00 */ li r4, 0 -/* 80026860 81 83 00 00 */ lwz r12, 0(r3) -/* 80026864 81 8C 01 6C */ lwz r12, 0x16c(r12) -/* 80026868 7D 89 03 A6 */ mtctr r12 -/* 8002686C 4E 80 04 21 */ bctrl -/* 80026870 48 00 00 14 */ b lbl_80026884 -lbl_80026874: -/* 80026874 81 83 00 00 */ lwz r12, 0(r3) -/* 80026878 81 8C 01 6C */ lwz r12, 0x16c(r12) -/* 8002687C 7D 89 03 A6 */ mtctr r12 -/* 80026880 4E 80 04 21 */ bctrl -lbl_80026884: -/* 80026884 38 60 00 01 */ li r3, 1 -/* 80026888 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002688C 7C 08 03 A6 */ mtlr r0 -/* 80026890 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026894 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_envrInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_envrInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 9afeab98cf..0000000000 --- a/asm/d/d_stage/dStage_envrInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80025500: -/* 80025500 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80025504 7C 08 02 A6 */ mflr r0 -/* 80025508 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002550C 80 84 00 08 */ lwz r4, 8(r4) -/* 80025510 81 83 00 00 */ lwz r12, 0(r3) -/* 80025514 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 80025518 7D 89 03 A6 */ mtctr r12 -/* 8002551C 4E 80 04 21 */ bctrl -/* 80025520 38 60 00 01 */ li r3, 1 -/* 80025524 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80025528 7C 08 03 A6 */ mtlr r0 -/* 8002552C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025530 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_filiInfo2Init__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_filiInfo2Init__FP11dStage_dt_cPviPv.s deleted file mode 100644 index ba8adbbd2c..0000000000 --- a/asm/d/d_stage/dStage_filiInfo2Init__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80025534: -/* 80025534 2C 05 00 00 */ cmpwi r5, 0 -/* 80025538 40 82 00 0C */ bne lbl_80025544 -/* 8002553C 38 60 00 01 */ li r3, 1 -/* 80025540 4E 80 00 20 */ blr -lbl_80025544: -/* 80025544 80 A4 00 08 */ lwz r5, 8(r4) -/* 80025548 3C 80 80 3F */ lis r4, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8002554C 38 84 60 94 */ addi r4, r4, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 80025550 88 03 00 04 */ lbz r0, 4(r3) -/* 80025554 7C 00 07 74 */ extsb r0, r0 -/* 80025558 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 8002555C 7C 64 02 14 */ add r3, r4, r0 -/* 80025560 90 A3 00 20 */ stw r5, 0x20(r3) -/* 80025564 38 60 00 01 */ li r3, 1 -/* 80025568 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_filiInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_filiInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 5f0878576b..0000000000 --- a/asm/d/d_stage/dStage_filiInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8002558C: -/* 8002558C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80025590 7C 08 02 A6 */ mflr r0 -/* 80025594 90 01 00 14 */ stw r0, 0x14(r1) -/* 80025598 2C 05 00 00 */ cmpwi r5, 0 -/* 8002559C 40 82 00 1C */ bne lbl_800255B8 -/* 800255A0 38 80 00 00 */ li r4, 0 -/* 800255A4 81 83 00 00 */ lwz r12, 0(r3) -/* 800255A8 81 8C 01 08 */ lwz r12, 0x108(r12) -/* 800255AC 7D 89 03 A6 */ mtctr r12 -/* 800255B0 4E 80 04 21 */ bctrl -/* 800255B4 48 00 00 18 */ b lbl_800255CC -lbl_800255B8: -/* 800255B8 80 84 00 08 */ lwz r4, 8(r4) -/* 800255BC 81 83 00 00 */ lwz r12, 0(r3) -/* 800255C0 81 8C 01 08 */ lwz r12, 0x108(r12) -/* 800255C4 7D 89 03 A6 */ mtctr r12 -/* 800255C8 4E 80 04 21 */ bctrl -lbl_800255CC: -/* 800255CC 38 60 00 01 */ li r3, 1 -/* 800255D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800255D4 7C 08 03 A6 */ mtlr r0 -/* 800255D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800255DC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_floorInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_floorInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 1b29f4479d..0000000000 --- a/asm/d/d_stage/dStage_floorInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800261E4: -/* 800261E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800261E8 7C 08 02 A6 */ mflr r0 -/* 800261EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800261F0 81 83 00 00 */ lwz r12, 0(r3) -/* 800261F4 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 800261F8 7D 89 03 A6 */ mtctr r12 -/* 800261FC 38 84 00 04 */ addi r4, r4, 4 -/* 80026200 4E 80 04 21 */ bctrl -/* 80026204 38 60 00 01 */ li r3, 1 -/* 80026208 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002620C 7C 08 03 A6 */ mtlr r0 -/* 80026210 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026214 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_layerTresureInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_layerTresureInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 46807bc18c..0000000000 --- a/asm/d/d_stage/dStage_layerTresureInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8002670C: -/* 8002670C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026710 7C 08 02 A6 */ mflr r0 -/* 80026714 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026718 4B FF F3 21 */ bl dStage_actorInit__FP11dStage_dt_cPviPv -/* 8002671C 38 60 00 01 */ li r3, 1 -/* 80026720 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026724 7C 08 03 A6 */ mtlr r0 -/* 80026728 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002672C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_lbnkInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_lbnkInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 50cf214de9..0000000000 --- a/asm/d/d_stage/dStage_lbnkInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80026670: -/* 80026670 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026674 7C 08 02 A6 */ mflr r0 -/* 80026678 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002667C 81 83 00 00 */ lwz r12, 0(r3) -/* 80026680 81 8C 01 3C */ lwz r12, 0x13c(r12) -/* 80026684 7D 89 03 A6 */ mtctr r12 -/* 80026688 38 84 00 04 */ addi r4, r4, 4 -/* 8002668C 4E 80 04 21 */ bctrl -/* 80026690 38 60 00 01 */ li r3, 1 -/* 80026694 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026698 7C 08 03 A6 */ mtlr r0 -/* 8002669C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800266A0 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_lgtvInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_lgtvInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 24496ef498..0000000000 --- a/asm/d/d_stage/dStage_lgtvInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800256AC: -/* 800256AC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800256B0 7C 08 02 A6 */ mflr r0 -/* 800256B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800256B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800256BC 48 33 CB 21 */ bl _savegpr_29 -/* 800256C0 7C 7D 1B 78 */ mr r29, r3 -/* 800256C4 7C 9E 23 78 */ mr r30, r4 -/* 800256C8 7C BF 2B 78 */ mr r31, r5 -/* 800256CC 7F E4 FB 78 */ mr r4, r31 -/* 800256D0 81 83 00 00 */ lwz r12, 0(r3) -/* 800256D4 81 8C 00 B0 */ lwz r12, 0xb0(r12) -/* 800256D8 7D 89 03 A6 */ mtctr r12 -/* 800256DC 4E 80 04 21 */ bctrl -/* 800256E0 2C 1F 00 00 */ cmpwi r31, 0 -/* 800256E4 40 82 00 20 */ bne lbl_80025704 -/* 800256E8 7F A3 EB 78 */ mr r3, r29 -/* 800256EC 38 80 00 00 */ li r4, 0 -/* 800256F0 81 9D 00 00 */ lwz r12, 0(r29) -/* 800256F4 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 800256F8 7D 89 03 A6 */ mtctr r12 -/* 800256FC 4E 80 04 21 */ bctrl -/* 80025700 48 00 00 1C */ b lbl_8002571C -lbl_80025704: -/* 80025704 7F A3 EB 78 */ mr r3, r29 -/* 80025708 80 9E 00 08 */ lwz r4, 8(r30) -/* 8002570C 81 9D 00 00 */ lwz r12, 0(r29) -/* 80025710 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80025714 7D 89 03 A6 */ mtctr r12 -/* 80025718 4E 80 04 21 */ bctrl -lbl_8002571C: -/* 8002571C 38 60 00 01 */ li r3, 1 -/* 80025720 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025724 48 33 CB 05 */ bl _restgpr_29 -/* 80025728 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002572C 7C 08 03 A6 */ mtlr r0 -/* 80025730 38 21 00 20 */ addi r1, r1, 0x20 -/* 80025734 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_mapEventInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_mapEventInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 14ecfc5ce0..0000000000 --- a/asm/d/d_stage/dStage_mapEventInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800261B0: -/* 800261B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800261B4 7C 08 02 A6 */ mflr r0 -/* 800261B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800261BC 81 83 00 00 */ lwz r12, 0(r3) -/* 800261C0 81 8C 00 F8 */ lwz r12, 0xf8(r12) -/* 800261C4 7D 89 03 A6 */ mtctr r12 -/* 800261C8 38 84 00 04 */ addi r4, r4, 4 -/* 800261CC 4E 80 04 21 */ bctrl -/* 800261D0 38 60 00 01 */ li r3, 1 -/* 800261D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800261D8 7C 08 03 A6 */ mtlr r0 -/* 800261DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800261E0 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_multInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_multInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 41091e0b7c..0000000000 --- a/asm/d/d_stage/dStage_multInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800265DC: -/* 800265DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800265E0 7C 08 02 A6 */ mflr r0 -/* 800265E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800265E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800265EC 7C 7F 1B 78 */ mr r31, r3 -/* 800265F0 81 83 00 00 */ lwz r12, 0(r3) -/* 800265F4 81 8C 01 28 */ lwz r12, 0x128(r12) -/* 800265F8 7D 89 03 A6 */ mtctr r12 -/* 800265FC 38 84 00 04 */ addi r4, r4, 4 -/* 80026600 4E 80 04 21 */ bctrl -/* 80026604 4B FF DA 65 */ bl dStage_initRoomKeepDoorInfo__Fv -/* 80026608 7F E3 FB 78 */ mr r3, r31 -/* 8002660C 81 9F 00 00 */ lwz r12, 0(r31) -/* 80026610 81 8C 01 2C */ lwz r12, 0x12c(r12) -/* 80026614 7D 89 03 A6 */ mtctr r12 -/* 80026618 4E 80 04 21 */ bctrl -/* 8002661C 7C 64 1B 78 */ mr r4, r3 -/* 80026620 7F E3 FB 78 */ mr r3, r31 -/* 80026624 38 A0 00 00 */ li r5, 0 -/* 80026628 4B FF FE 35 */ bl readMult__FP11dStage_dt_cP14dStage_Multi_cb -/* 8002662C 7F E3 FB 78 */ mr r3, r31 -/* 80026630 81 9F 00 00 */ lwz r12, 0(r31) -/* 80026634 81 8C 01 38 */ lwz r12, 0x138(r12) -/* 80026638 7D 89 03 A6 */ mtctr r12 -/* 8002663C 4E 80 04 21 */ bctrl -/* 80026640 7C 64 1B 78 */ mr r4, r3 -/* 80026644 7F E3 FB 78 */ mr r3, r31 -/* 80026648 38 A0 00 01 */ li r5, 1 -/* 8002664C 4B FF FE 11 */ bl readMult__FP11dStage_dt_cP14dStage_Multi_cb -/* 80026650 38 00 FF FF */ li r0, -1 -/* 80026654 98 1F 00 04 */ stb r0, 4(r31) -/* 80026658 38 60 00 01 */ li r3, 1 -/* 8002665C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80026660 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026664 7C 08 03 A6 */ mtlr r0 -/* 80026668 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002666C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_paletteInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_paletteInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 7d278376d7..0000000000 --- a/asm/d/d_stage/dStage_paletteInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80025498: -/* 80025498 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002549C 7C 08 02 A6 */ mflr r0 -/* 800254A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800254A4 80 84 00 08 */ lwz r4, 8(r4) -/* 800254A8 81 83 00 00 */ lwz r12, 0(r3) -/* 800254AC 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 800254B0 7D 89 03 A6 */ mtctr r12 -/* 800254B4 4E 80 04 21 */ bctrl -/* 800254B8 38 60 00 01 */ li r3, 1 -/* 800254BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800254C0 7C 08 03 A6 */ mtlr r0 -/* 800254C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800254C8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_playerInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_playerInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index be87841632..0000000000 --- a/asm/d/d_stage/dStage_playerInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,184 +0,0 @@ -lbl_80025014: -/* 80025014 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80025018 7C 08 02 A6 */ mflr r0 -/* 8002501C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80025020 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025024 48 33 D1 B5 */ bl _savegpr_28 -/* 80025028 7C 7D 1B 78 */ mr r29, r3 -/* 8002502C 7C BC 2B 78 */ mr r28, r5 -/* 80025030 38 84 00 04 */ addi r4, r4, 4 -/* 80025034 83 C4 00 04 */ lwz r30, 4(r4) -/* 80025038 81 83 00 00 */ lwz r12, 0(r3) -/* 8002503C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80025040 7D 89 03 A6 */ mtctr r12 -/* 80025044 4E 80 04 21 */ bctrl -/* 80025048 7F A3 EB 78 */ mr r3, r29 -/* 8002504C 57 84 04 3E */ clrlwi r4, r28, 0x10 -/* 80025050 81 9D 00 00 */ lwz r12, 0(r29) -/* 80025054 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80025058 7D 89 03 A6 */ mtctr r12 -/* 8002505C 4E 80 04 21 */ bctrl -/* 80025060 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80025064 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80025068 80 1F 5D AC */ lwz r0, 0x5dac(r31) -/* 8002506C 28 00 00 00 */ cmplwi r0, 0 -/* 80025070 40 82 00 1C */ bne lbl_8002508C -/* 80025074 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) -/* 80025078 7C 03 07 74 */ extsb r3, r0 -/* 8002507C 88 1D 00 04 */ lbz r0, 4(r29) -/* 80025080 7C 00 07 74 */ extsb r0, r0 -/* 80025084 7C 03 00 00 */ cmpw r3, r0 -/* 80025088 41 82 00 0C */ beq lbl_80025094 -lbl_8002508C: -/* 8002508C 38 60 00 01 */ li r3, 1 -/* 80025090 48 00 02 10 */ b lbl_800252A0 -lbl_80025094: -/* 80025094 4B FF 4A 15 */ bl fopAcM_CreateAppend__Fv -/* 80025098 7C 7D 1B 78 */ mr r29, r3 -/* 8002509C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800250A0 38 C3 61 C0 */ addi r6, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800250A4 A8 66 4E 08 */ lha r3, 0x4e08(r6) -/* 800250A8 80 86 0D C8 */ lwz r4, 0xdc8(r6) -/* 800250AC 2C 03 FF FE */ cmpwi r3, -2 -/* 800250B0 41 82 00 0C */ beq lbl_800250BC -/* 800250B4 2C 03 FF FD */ cmpwi r3, -3 -/* 800250B8 40 82 00 48 */ bne lbl_80025100 -lbl_800250BC: -/* 800250BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800250C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800250C4 80 03 0E E4 */ lwz r0, 0xee4(r3) -/* 800250C8 90 1D 00 00 */ stw r0, 0(r29) -/* 800250CC C0 03 0E D8 */ lfs f0, 0xed8(r3) -/* 800250D0 D0 1D 00 04 */ stfs f0, 4(r29) -/* 800250D4 C0 03 0E DC */ lfs f0, 0xedc(r3) -/* 800250D8 D0 1D 00 08 */ stfs f0, 8(r29) -/* 800250DC C0 03 0E E0 */ lfs f0, 0xee0(r3) -/* 800250E0 D0 1D 00 0C */ stfs f0, 0xc(r29) -/* 800250E4 A8 63 0E E8 */ lha r3, 0xee8(r3) -/* 800250E8 38 00 00 00 */ li r0, 0 -/* 800250EC B0 1D 00 10 */ sth r0, 0x10(r29) -/* 800250F0 B0 7D 00 12 */ sth r3, 0x12(r29) -/* 800250F4 38 00 FF 00 */ li r0, -256 -/* 800250F8 B0 1D 00 14 */ sth r0, 0x14(r29) -/* 800250FC 48 00 01 0C */ b lbl_80025208 -lbl_80025100: -/* 80025100 2C 03 FF FF */ cmpwi r3, -1 -/* 80025104 40 82 00 3C */ bne lbl_80025140 -/* 80025108 90 9D 00 00 */ stw r4, 0(r29) -/* 8002510C C0 06 0D BC */ lfs f0, 0xdbc(r6) -/* 80025110 D0 1D 00 04 */ stfs f0, 4(r29) -/* 80025114 C0 06 0D C0 */ lfs f0, 0xdc0(r6) -/* 80025118 D0 1D 00 08 */ stfs f0, 8(r29) -/* 8002511C C0 06 0D C4 */ lfs f0, 0xdc4(r6) -/* 80025120 D0 1D 00 0C */ stfs f0, 0xc(r29) -/* 80025124 A8 66 0D BA */ lha r3, 0xdba(r6) -/* 80025128 38 00 00 00 */ li r0, 0 -/* 8002512C B0 1D 00 10 */ sth r0, 0x10(r29) -/* 80025130 B0 7D 00 12 */ sth r3, 0x12(r29) -/* 80025134 38 00 FF 00 */ li r0, -256 -/* 80025138 B0 1D 00 14 */ sth r0, 0x14(r29) -/* 8002513C 48 00 00 CC */ b lbl_80025208 -lbl_80025140: -/* 80025140 2C 03 FF FC */ cmpwi r3, -4 -/* 80025144 40 82 00 0C */ bne lbl_80025150 -/* 80025148 A8 A6 0E E8 */ lha r5, 0xee8(r6) -/* 8002514C 48 00 00 08 */ b lbl_80025154 -lbl_80025150: -/* 80025150 7C 65 1B 78 */ mr r5, r3 -lbl_80025154: -/* 80025154 7F 89 03 A6 */ mtctr r28 -/* 80025158 2C 1C 00 00 */ cmpwi r28, 0 -/* 8002515C 40 81 00 1C */ ble lbl_80025178 -lbl_80025160: -/* 80025160 A8 1E 00 1C */ lha r0, 0x1c(r30) -/* 80025164 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80025168 7C 00 28 00 */ cmpw r0, r5 -/* 8002516C 41 82 00 0C */ beq lbl_80025178 -/* 80025170 3B DE 00 20 */ addi r30, r30, 0x20 -/* 80025174 42 00 FF EC */ bdnz lbl_80025160 -lbl_80025178: -/* 80025178 80 1E 00 08 */ lwz r0, 8(r30) -/* 8002517C 90 1D 00 00 */ stw r0, 0(r29) -/* 80025180 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 80025184 D0 1D 00 04 */ stfs f0, 4(r29) -/* 80025188 C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 8002518C D0 1D 00 08 */ stfs f0, 8(r29) -/* 80025190 C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 80025194 D0 1D 00 0C */ stfs f0, 0xc(r29) -/* 80025198 A8 1E 00 18 */ lha r0, 0x18(r30) -/* 8002519C B0 1D 00 10 */ sth r0, 0x10(r29) -/* 800251A0 A8 1E 00 1A */ lha r0, 0x1a(r30) -/* 800251A4 B0 1D 00 12 */ sth r0, 0x12(r29) -/* 800251A8 A8 1E 00 1C */ lha r0, 0x1c(r30) -/* 800251AC B0 1D 00 14 */ sth r0, 0x14(r29) -/* 800251B0 A0 1E 00 1E */ lhz r0, 0x1e(r30) -/* 800251B4 B0 1D 00 16 */ sth r0, 0x16(r29) -/* 800251B8 2C 03 FF FC */ cmpwi r3, -4 -/* 800251BC 40 82 00 18 */ bne lbl_800251D4 -/* 800251C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800251C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800251C8 80 03 0E E4 */ lwz r0, 0xee4(r3) -/* 800251CC 90 1D 00 00 */ stw r0, 0(r29) -/* 800251D0 48 00 00 38 */ b lbl_80025208 -lbl_800251D4: -/* 800251D4 28 04 00 00 */ cmplwi r4, 0 -/* 800251D8 41 82 00 18 */ beq lbl_800251F0 -/* 800251DC 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) -/* 800251E0 7C 00 07 74 */ extsb r0, r0 -/* 800251E4 50 80 00 32 */ rlwimi r0, r4, 0, 0, 0x19 -/* 800251E8 90 1D 00 00 */ stw r0, 0(r29) -/* 800251EC 48 00 00 1C */ b lbl_80025208 -lbl_800251F0: -/* 800251F0 40 82 00 18 */ bne lbl_80025208 -/* 800251F4 80 7D 00 00 */ lwz r3, 0(r29) -/* 800251F8 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) -/* 800251FC 7C 00 07 74 */ extsb r0, r0 -/* 80025200 50 60 00 32 */ rlwimi r0, r3, 0, 0, 0x19 -/* 80025204 90 1D 00 00 */ stw r0, 0(r29) -lbl_80025208: -/* 80025208 38 00 00 00 */ li r0, 0 -/* 8002520C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80025210 38 E3 61 C0 */ addi r7, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80025214 90 07 0D C8 */ stw r0, 0xdc8(r7) -/* 80025218 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 8002521C 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 80025220 B0 1D 00 16 */ sth r0, 0x16(r29) -/* 80025224 38 00 FF FF */ li r0, -1 -/* 80025228 98 1D 00 21 */ stb r0, 0x21(r29) -/* 8002522C 3B E7 4E 00 */ addi r31, r7, 0x4e00 -/* 80025230 7F E3 FB 78 */ mr r3, r31 -/* 80025234 7F E4 FB 78 */ mr r4, r31 -/* 80025238 80 1D 00 00 */ lwz r0, 0(r29) -/* 8002523C 54 05 06 BE */ clrlwi r5, r0, 0x1a -/* 80025240 A8 C6 4E 08 */ lha r6, 0x4e08(r6) -/* 80025244 88 07 4E 0B */ lbz r0, 0x4e0b(r7) -/* 80025248 7C 07 07 74 */ extsb r7, r0 -/* 8002524C 4B FF EF 51 */ bl set__19dStage_startStage_cFPCcScsSc -/* 80025250 7F C3 F3 78 */ mr r3, r30 -/* 80025254 7F A4 EB 78 */ mr r4, r29 -/* 80025258 4B FF FC A5 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class -/* 8002525C 80 6D 87 E0 */ lwz r3, mProcID__20dStage_roomControl_c(r13) -/* 80025260 4B FF 9A 51 */ bl fopScnM_SearchByID__FUi -/* 80025264 A8 03 00 08 */ lha r0, 8(r3) -/* 80025268 2C 00 00 0B */ cmpwi r0, 0xb -/* 8002526C 40 82 00 30 */ bne lbl_8002529C -/* 80025270 7F E3 FB 78 */ mr r3, r31 -/* 80025274 3C 80 80 38 */ lis r4, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80025278 38 84 8A 50 */ addi r4, r4, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 8002527C 38 84 00 DB */ addi r4, r4, 0xdb -/* 80025280 48 34 37 15 */ bl strcmp -/* 80025284 2C 03 00 00 */ cmpwi r3, 0 -/* 80025288 41 82 00 14 */ beq lbl_8002529C -/* 8002528C 38 60 03 16 */ li r3, 0x316 -/* 80025290 38 80 00 00 */ li r4, 0 -/* 80025294 38 A0 00 00 */ li r5, 0 -/* 80025298 4B FF AE 71 */ bl fopMsgM_Create__FsPFPv_iPv -lbl_8002529C: -/* 8002529C 38 60 00 01 */ li r3, 1 -lbl_800252A0: -/* 800252A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800252A4 48 33 CF 81 */ bl _restgpr_28 -/* 800252A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800252AC 7C 08 03 A6 */ mtlr r0 -/* 800252B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800252B4 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_plightInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_plightInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index be658837c7..0000000000 --- a/asm/d/d_stage/dStage_plightInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80025648: -/* 80025648 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002564C 7C 08 02 A6 */ mflr r0 -/* 80025650 90 01 00 14 */ stw r0, 0x14(r1) -/* 80025654 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80025658 93 C1 00 08 */ stw r30, 8(r1) -/* 8002565C 7C 7E 1B 78 */ mr r30, r3 -/* 80025660 7C BF 2B 78 */ mr r31, r5 -/* 80025664 80 84 00 08 */ lwz r4, 8(r4) -/* 80025668 81 83 00 00 */ lwz r12, 0(r3) -/* 8002566C 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 80025670 7D 89 03 A6 */ mtctr r12 -/* 80025674 4E 80 04 21 */ bctrl -/* 80025678 7F C3 F3 78 */ mr r3, r30 -/* 8002567C 7F E4 FB 78 */ mr r4, r31 -/* 80025680 81 9E 00 00 */ lwz r12, 0(r30) -/* 80025684 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80025688 7D 89 03 A6 */ mtctr r12 -/* 8002568C 4E 80 04 21 */ bctrl -/* 80025690 38 60 00 01 */ li r3, 1 -/* 80025694 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80025698 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002569C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800256A0 7C 08 03 A6 */ mtlr r0 -/* 800256A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800256A8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_ppntInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_ppntInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 3842d00029..0000000000 --- a/asm/d/d_stage/dStage_ppntInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80025E70: -/* 80025E70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80025E74 7C 08 02 A6 */ mflr r0 -/* 80025E78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80025E7C 81 83 00 00 */ lwz r12, 0(r3) -/* 80025E80 81 8C 00 C8 */ lwz r12, 0xc8(r12) -/* 80025E84 7D 89 03 A6 */ mtctr r12 -/* 80025E88 38 84 00 04 */ addi r4, r4, 4 -/* 80025E8C 4E 80 04 21 */ bctrl -/* 80025E90 38 60 00 01 */ li r3, 1 -/* 80025E94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80025E98 7C 08 03 A6 */ mtlr r0 -/* 80025E9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025EA0 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_pselectInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_pselectInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index c80f81994b..0000000000 --- a/asm/d/d_stage/dStage_pselectInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800254CC: -/* 800254CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800254D0 7C 08 02 A6 */ mflr r0 -/* 800254D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800254D8 80 84 00 08 */ lwz r4, 8(r4) -/* 800254DC 81 83 00 00 */ lwz r12, 0(r3) -/* 800254E0 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 800254E4 7D 89 03 A6 */ mtctr r12 -/* 800254E8 4E 80 04 21 */ bctrl -/* 800254EC 38 60 00 01 */ li r3, 1 -/* 800254F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800254F4 7C 08 03 A6 */ mtlr r0 -/* 800254F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800254FC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_restartRoom__FUlUli.s b/asm/d/d_stage/dStage_restartRoom__FUlUli.s deleted file mode 100644 index b64e272745..0000000000 --- a/asm/d/d_stage/dStage_restartRoom__FUlUli.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800274B0: -/* 800274B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800274B4 7C 08 02 A6 */ mflr r0 -/* 800274B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 800274BC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800274C0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 800274C4 7C 7E 1B 78 */ mr r30, r3 -/* 800274C8 7C 87 23 78 */ mr r7, r4 -/* 800274CC 90 A1 00 08 */ stw r5, 8(r1) -/* 800274D0 38 00 00 00 */ li r0, 0 -/* 800274D4 90 01 00 0C */ stw r0, 0xc(r1) -/* 800274D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800274DC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800274E0 38 7F 4E 00 */ addi r3, r31, 0x4e00 -/* 800274E4 38 80 FF FF */ li r4, -1 -/* 800274E8 88 1F 0D B4 */ lbz r0, 0xdb4(r31) -/* 800274EC 7C 05 07 74 */ extsb r5, r0 -/* 800274F0 38 C0 FF FF */ li r6, -1 -/* 800274F4 C0 22 82 90 */ lfs f1, lit_4270(r2) -/* 800274F8 39 00 00 00 */ li r8, 0 -/* 800274FC 39 20 00 00 */ li r9, 0 -/* 80027500 39 40 00 00 */ li r10, 0 -/* 80027504 48 00 5D F9 */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii -/* 80027508 93 DF 0D C8 */ stw r30, 0xdc8(r31) -/* 8002750C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80027510 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80027514 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80027518 7C 08 03 A6 */ mtlr r0 -/* 8002751C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80027520 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index e9b5aaefbb..0000000000 --- a/asm/d/d_stage/dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800267DC: -/* 800267DC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800267E0 7C 08 02 A6 */ mflr r0 -/* 800267E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800267E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800267EC 48 33 B9 ED */ bl _savegpr_28 -/* 800267F0 7C 7C 1B 78 */ mr r28, r3 -/* 800267F4 7C 9D 23 78 */ mr r29, r4 -/* 800267F8 7C BE 2B 78 */ mr r30, r5 -/* 800267FC 7C DF 33 78 */ mr r31, r6 -/* 80026800 38 9D 00 04 */ addi r4, r29, 4 -/* 80026804 81 83 00 00 */ lwz r12, 0(r3) -/* 80026808 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 8002680C 7D 89 03 A6 */ mtctr r12 -/* 80026810 4E 80 04 21 */ bctrl -/* 80026814 7F 83 E3 78 */ mr r3, r28 -/* 80026818 7F A4 EB 78 */ mr r4, r29 -/* 8002681C 7F C5 F3 78 */ mr r5, r30 -/* 80026820 7F E6 FB 78 */ mr r6, r31 -/* 80026824 4B FF F4 B9 */ bl dStage_doorInfoInit__FP11dStage_dt_cPviPv -/* 80026828 38 60 00 01 */ li r3, 1 -/* 8002682C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026830 48 33 B9 F5 */ bl _restgpr_28 -/* 80026834 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80026838 7C 08 03 A6 */ mtlr r0 -/* 8002683C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80026840 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_roomInit__Fi.s b/asm/d/d_stage/dStage_roomInit__Fi.s deleted file mode 100644 index 458490b55f..0000000000 --- a/asm/d/d_stage/dStage_roomInit__Fi.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80024D10: -/* 80024D10 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80024D14 7C 08 02 A6 */ mflr r0 -/* 80024D18 90 01 00 24 */ stw r0, 0x24(r1) -/* 80024D1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024D20 48 33 D4 BD */ bl _savegpr_29 -/* 80024D24 7C 7D 1B 78 */ mr r29, r3 -/* 80024D28 4B FF F6 C1 */ bl setStayNo__20dStage_roomControl_cFi -/* 80024D2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80024D30 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80024D34 38 7E 4E 20 */ addi r3, r30, 0x4e20 -/* 80024D38 81 9E 4E 20 */ lwz r12, 0x4e20(r30) -/* 80024D3C 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80024D40 7D 89 03 A6 */ mtctr r12 -/* 80024D44 4E 80 04 21 */ bctrl -/* 80024D48 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80024D4C 41 82 00 48 */ beq lbl_80024D94 -/* 80024D50 80 1F 00 00 */ lwz r0, 0(r31) -/* 80024D54 7C 00 E8 00 */ cmpw r0, r29 -/* 80024D58 40 81 00 3C */ ble lbl_80024D94 -/* 80024D5C 80 7F 00 04 */ lwz r3, 4(r31) -/* 80024D60 57 BD 10 3A */ slwi r29, r29, 2 -/* 80024D64 7C 63 E8 2E */ lwzx r3, r3, r29 -/* 80024D68 88 03 00 02 */ lbz r0, 2(r3) -/* 80024D6C 54 03 07 BE */ clrlwi r3, r0, 0x1e -/* 80024D70 48 00 00 41 */ bl SetTimePass__20dStage_roomControl_cFi -/* 80024D74 80 7F 00 04 */ lwz r3, 4(r31) -/* 80024D78 7C A3 E8 2E */ lwzx r5, r3, r29 -/* 80024D7C 38 7E 4E C4 */ addi r3, r30, 0x4ec4 -/* 80024D80 88 85 00 00 */ lbz r4, 0(r5) -/* 80024D84 80 A5 00 04 */ lwz r5, 4(r5) -/* 80024D88 38 C0 00 01 */ li r6, 1 -/* 80024D8C 4B FF F7 91 */ bl loadRoom__20dStage_roomControl_cFiPUcb -/* 80024D90 48 00 00 08 */ b lbl_80024D98 -lbl_80024D94: -/* 80024D94 38 60 00 01 */ li r3, 1 -lbl_80024D98: -/* 80024D98 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024D9C 48 33 D4 8D */ bl _restgpr_29 -/* 80024DA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80024DA4 7C 08 03 A6 */ mtlr r0 -/* 80024DA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80024DAC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi.s b/asm/d/d_stage/dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi.s deleted file mode 100644 index dda48c5c1b..0000000000 --- a/asm/d/d_stage/dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80025E40: -/* 80025E40 2C 04 00 00 */ cmpwi r4, 0 -/* 80025E44 41 80 00 10 */ blt lbl_80025E54 -/* 80025E48 80 03 00 00 */ lwz r0, 0(r3) -/* 80025E4C 7C 04 00 00 */ cmpw r4, r0 -/* 80025E50 41 80 00 08 */ blt lbl_80025E58 -lbl_80025E54: -/* 80025E54 38 80 00 00 */ li r4, 0 -lbl_80025E58: -/* 80025E58 80 63 00 04 */ lwz r3, 4(r3) -/* 80025E5C 54 80 10 3A */ slwi r0, r4, 2 -/* 80025E60 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80025E64 88 03 00 01 */ lbz r0, 1(r3) -/* 80025E68 54 03 06 7E */ clrlwi r3, r0, 0x19 -/* 80025E6C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_roomTresureInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_roomTresureInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 86431ad348..0000000000 --- a/asm/d/d_stage/dStage_roomTresureInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800266A4: -/* 800266A4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800266A8 7C 08 02 A6 */ mflr r0 -/* 800266AC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800266B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800266B4 48 33 BB 25 */ bl _savegpr_28 -/* 800266B8 7C 7C 1B 78 */ mr r28, r3 -/* 800266BC 7C 9D 23 78 */ mr r29, r4 -/* 800266C0 7C BE 2B 78 */ mr r30, r5 -/* 800266C4 7C DF 33 78 */ mr r31, r6 -/* 800266C8 38 9D 00 04 */ addi r4, r29, 4 -/* 800266CC 81 83 00 00 */ lwz r12, 0(r3) -/* 800266D0 81 8C 01 44 */ lwz r12, 0x144(r12) -/* 800266D4 7D 89 03 A6 */ mtctr r12 -/* 800266D8 4E 80 04 21 */ bctrl -/* 800266DC 7F 83 E3 78 */ mr r3, r28 -/* 800266E0 7F A4 EB 78 */ mr r4, r29 -/* 800266E4 7F C5 F3 78 */ mr r5, r30 -/* 800266E8 7F E6 FB 78 */ mr r6, r31 -/* 800266EC 4B FF F3 4D */ bl dStage_actorInit__FP11dStage_dt_cPviPv -/* 800266F0 38 60 00 01 */ li r3, 1 -/* 800266F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800266F8 48 33 BB 2D */ bl _restgpr_28 -/* 800266FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80026700 7C 08 03 A6 */ mtlr r0 -/* 80026704 38 21 00 20 */ addi r1, r1, 0x20 -/* 80026708 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_rppnInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_rppnInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 04b6414d9e..0000000000 --- a/asm/d/d_stage/dStage_rppnInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80025F44: -/* 80025F44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80025F48 7C 08 02 A6 */ mflr r0 -/* 80025F4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80025F50 81 83 00 00 */ lwz r12, 0(r3) -/* 80025F54 81 8C 00 D8 */ lwz r12, 0xd8(r12) -/* 80025F58 7D 89 03 A6 */ mtctr r12 -/* 80025F5C 38 84 00 04 */ addi r4, r4, 4 -/* 80025F60 4E 80 04 21 */ bctrl -/* 80025F64 38 60 00 01 */ li r3, 1 -/* 80025F68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80025F6C 7C 08 03 A6 */ mtlr r0 -/* 80025F70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025F74 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_sclsInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_sclsInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 0ef9652643..0000000000 --- a/asm/d/d_stage/dStage_sclsInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80025838: -/* 80025838 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002583C 7C 08 02 A6 */ mflr r0 -/* 80025840 90 01 00 14 */ stw r0, 0x14(r1) -/* 80025844 81 83 00 00 */ lwz r12, 0(r3) -/* 80025848 81 8C 00 C0 */ lwz r12, 0xc0(r12) -/* 8002584C 7D 89 03 A6 */ mtctr r12 -/* 80025850 38 84 00 04 */ addi r4, r4, 4 -/* 80025854 4E 80 04 21 */ bctrl -/* 80025858 38 60 00 01 */ li r3, 1 -/* 8002585C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80025860 7C 08 03 A6 */ mtlr r0 -/* 80025864 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025868 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_setLayerTagName__FP9FuncTableii.s b/asm/d/d_stage/dStage_setLayerTagName__FP9FuncTableii.s deleted file mode 100644 index a65f0151fe..0000000000 --- a/asm/d/d_stage/dStage_setLayerTagName__FP9FuncTableii.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80026080: -/* 80026080 2C 05 00 0A */ cmpwi r5, 0xa -/* 80026084 38 00 00 57 */ li r0, 0x57 -/* 80026088 40 80 00 08 */ bge lbl_80026090 -/* 8002608C 38 00 00 30 */ li r0, 0x30 -lbl_80026090: -/* 80026090 7C 05 02 14 */ add r0, r5, r0 -/* 80026094 7C 00 07 74 */ extsb r0, r0 -/* 80026098 7C 89 03 A6 */ mtctr r4 -/* 8002609C 2C 04 00 00 */ cmpwi r4, 0 -/* 800260A0 4C 81 00 20 */ blelr -lbl_800260A4: -/* 800260A4 98 03 00 03 */ stb r0, 3(r3) -/* 800260A8 38 63 00 0C */ addi r3, r3, 0xc -/* 800260AC 42 00 FF F8 */ bdnz lbl_800260A4 -/* 800260B0 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_soundInfoInitCL__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_soundInfoInitCL__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 054b4b2ff7..0000000000 --- a/asm/d/d_stage/dStage_soundInfoInitCL__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8002604C: -/* 8002604C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026050 7C 08 02 A6 */ mflr r0 -/* 80026054 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026058 81 83 00 00 */ lwz r12, 0(r3) -/* 8002605C 81 8C 00 F0 */ lwz r12, 0xf0(r12) -/* 80026060 7D 89 03 A6 */ mtctr r12 -/* 80026064 38 84 00 04 */ addi r4, r4, 4 -/* 80026068 4E 80 04 21 */ bctrl -/* 8002606C 38 60 00 01 */ li r3, 1 -/* 80026070 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026074 7C 08 03 A6 */ mtlr r0 -/* 80026078 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002607C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_soundInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_soundInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 4c00cb4a99..0000000000 --- a/asm/d/d_stage/dStage_soundInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80026018: -/* 80026018 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002601C 7C 08 02 A6 */ mflr r0 -/* 80026020 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026024 81 83 00 00 */ lwz r12, 0(r3) -/* 80026028 81 8C 00 E8 */ lwz r12, 0xe8(r12) -/* 8002602C 7D 89 03 A6 */ mtctr r12 -/* 80026030 38 84 00 04 */ addi r4, r4, 4 -/* 80026034 4E 80 04 21 */ bctrl -/* 80026038 38 60 00 01 */ li r3, 1 -/* 8002603C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026040 7C 08 03 A6 */ mtlr r0 -/* 80026044 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026048 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_stEventInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_stEventInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index a15f6b6c9e..0000000000 --- a/asm/d/d_stage/dStage_stEventInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8002617C: -/* 8002617C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026180 7C 08 02 A6 */ mflr r0 -/* 80026184 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026188 81 83 00 00 */ lwz r12, 0(r3) -/* 8002618C 81 8C 00 F8 */ lwz r12, 0xf8(r12) -/* 80026190 7D 89 03 A6 */ mtctr r12 -/* 80026194 38 84 00 04 */ addi r4, r4, 4 -/* 80026198 4E 80 04 21 */ bctrl -/* 8002619C 38 60 00 01 */ li r3, 1 -/* 800261A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800261A4 7C 08 03 A6 */ mtlr r0 -/* 800261A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800261AC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_stagInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_stagInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 526138a88b..0000000000 --- a/asm/d/d_stage/dStage_stagInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80025744: -/* 80025744 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80025748 7C 08 02 A6 */ mflr r0 -/* 8002574C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80025750 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80025754 93 C1 00 08 */ stw r30, 8(r1) -/* 80025758 7C 7E 1B 78 */ mr r30, r3 -/* 8002575C 80 84 00 08 */ lwz r4, 8(r4) -/* 80025760 81 83 00 00 */ lwz r12, 0(r3) -/* 80025764 81 8C 00 B8 */ lwz r12, 0xb8(r12) -/* 80025768 7D 89 03 A6 */ mtctr r12 -/* 8002576C 4E 80 04 21 */ bctrl -/* 80025770 7F C3 F3 78 */ mr r3, r30 -/* 80025774 4B FF E7 8D */ bl dStage_isBossStage__FP11dStage_dt_c -/* 80025778 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8002577C 40 82 00 40 */ bne lbl_800257BC -/* 80025780 3C 60 80 38 */ lis r3, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80025784 38 63 8A 50 */ addi r3, r3, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80025788 38 63 00 E3 */ addi r3, r3, 0xe3 -/* 8002578C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80025790 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80025794 3C 84 00 02 */ addis r4, r4, 2 -/* 80025798 38 84 D4 F8 */ addi r4, r4, -11016 -/* 8002579C 38 A0 00 40 */ li r5, 0x40 -/* 800257A0 48 01 69 F5 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci -/* 800257A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800257A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800257AC 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 800257B0 81 8C 01 34 */ lwz r12, 0x134(r12) -/* 800257B4 7D 89 03 A6 */ mtctr r12 -/* 800257B8 4E 80 04 21 */ bctrl -lbl_800257BC: -/* 800257BC 7F C3 F3 78 */ mr r3, r30 -/* 800257C0 81 9E 00 00 */ lwz r12, 0(r30) -/* 800257C4 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 800257C8 7D 89 03 A6 */ mtctr r12 -/* 800257CC 4E 80 04 21 */ bctrl -/* 800257D0 88 03 00 09 */ lbz r0, 9(r3) -/* 800257D4 54 1F FE FE */ rlwinm r31, r0, 0x1f, 0x1b, 0x1f -/* 800257D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800257DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800257E0 7F E4 FB 78 */ mr r4, r31 -/* 800257E4 48 00 F8 D9 */ bl getSave__10dSv_info_cFi -/* 800257E8 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 800257EC 38 63 07 EC */ addi r3, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 800257F0 48 23 6A 09 */ bl init__12dSvBit_HIO_cFv -/* 800257F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800257F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800257FC 38 63 09 78 */ addi r3, r3, 0x978 -/* 80025800 7F E4 07 74 */ extsb r4, r31 -/* 80025804 48 00 F3 11 */ bl init__12dSv_danBit_cFSc -/* 80025808 7F C3 F3 78 */ mr r3, r30 -/* 8002580C 4B FF E7 45 */ bl dStage_KeepDoorInfoInit__FP11dStage_dt_c -/* 80025810 38 60 00 01 */ li r3, 1 -/* 80025814 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80025818 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002581C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80025820 7C 08 03 A6 */ mtlr r0 -/* 80025824 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025828 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 5917b5b797..0000000000 --- a/asm/d/d_stage/dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80026764: -/* 80026764 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80026768 7C 08 02 A6 */ mflr r0 -/* 8002676C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80026770 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026774 48 33 BA 61 */ bl _savegpr_27 -/* 80026778 7C 7B 1B 78 */ mr r27, r3 -/* 8002677C 7C 9C 23 78 */ mr r28, r4 -/* 80026780 7C BD 2B 78 */ mr r29, r5 -/* 80026784 7C DE 33 78 */ mr r30, r6 -/* 80026788 3B FC 00 04 */ addi r31, r28, 4 -/* 8002678C 7F E4 FB 78 */ mr r4, r31 -/* 80026790 81 83 00 00 */ lwz r12, 0(r3) -/* 80026794 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 80026798 7D 89 03 A6 */ mtctr r12 -/* 8002679C 4E 80 04 21 */ bctrl -/* 800267A0 7F 63 DB 78 */ mr r3, r27 -/* 800267A4 7F 84 E3 78 */ mr r4, r28 -/* 800267A8 7F A5 EB 78 */ mr r5, r29 -/* 800267AC 7F C6 F3 78 */ mr r6, r30 -/* 800267B0 4B FF F4 4D */ bl dStage_tgscInfoInit__FP11dStage_dt_cPviPv -/* 800267B4 7F 63 DB 78 */ mr r3, r27 -/* 800267B8 7F E4 FB 78 */ mr r4, r31 -/* 800267BC 4B FF D7 C9 */ bl dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class -/* 800267C0 38 60 00 01 */ li r3, 1 -/* 800267C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800267C8 48 33 BA 59 */ bl _restgpr_27 -/* 800267CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800267D0 7C 08 03 A6 */ mtlr r0 -/* 800267D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800267D8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index dc0e81bd90..0000000000 --- a/asm/d/d_stage/dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8002631C: -/* 8002631C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026320 7C 08 02 A6 */ mflr r0 -/* 80026324 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026328 7C 65 1B 78 */ mr r5, r3 -/* 8002632C 38 64 00 04 */ addi r3, r4, 4 -/* 80026330 88 85 00 04 */ lbz r4, 4(r5) -/* 80026334 48 07 59 81 */ bl addData__7dTres_cFPQ27dTres_c10list_classSc -/* 80026338 38 60 00 01 */ li r3, 1 -/* 8002633C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026340 7C 08 03 A6 */ mtlr r0 -/* 80026344 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026348 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 582810cb67..0000000000 --- a/asm/d/d_stage/dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80025958: -/* 80025958 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002595C 7C 08 02 A6 */ mflr r0 -/* 80025960 90 01 00 24 */ stw r0, 0x24(r1) -/* 80025964 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025968 48 33 C8 71 */ bl _savegpr_28 -/* 8002596C 7C 7C 1B 78 */ mr r28, r3 -/* 80025970 7C 9D 23 78 */ mr r29, r4 -/* 80025974 83 E4 00 08 */ lwz r31, 8(r4) -/* 80025978 3B C0 00 00 */ li r30, 0 -/* 8002597C 48 00 00 94 */ b lbl_80025A10 -lbl_80025980: -/* 80025980 88 7C 00 04 */ lbz r3, 4(r28) -/* 80025984 38 9F 00 0C */ addi r4, r31, 0xc -/* 80025988 48 00 BA AD */ bl check__7daSus_cFScRC4cXyz -/* 8002598C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80025990 40 82 00 78 */ bne lbl_80025A08 -/* 80025994 4B FF 41 15 */ bl fopAcM_CreateAppend__Fv -/* 80025998 7C 64 1B 79 */ or. r4, r3, r3 -/* 8002599C 41 82 00 6C */ beq lbl_80025A08 -/* 800259A0 80 1F 00 08 */ lwz r0, 8(r31) -/* 800259A4 90 04 00 00 */ stw r0, 0(r4) -/* 800259A8 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 800259AC D0 04 00 04 */ stfs f0, 4(r4) -/* 800259B0 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 800259B4 D0 04 00 08 */ stfs f0, 8(r4) -/* 800259B8 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 800259BC D0 04 00 0C */ stfs f0, 0xc(r4) -/* 800259C0 A8 1F 00 18 */ lha r0, 0x18(r31) -/* 800259C4 B0 04 00 10 */ sth r0, 0x10(r4) -/* 800259C8 A8 1F 00 1A */ lha r0, 0x1a(r31) -/* 800259CC B0 04 00 12 */ sth r0, 0x12(r4) -/* 800259D0 A8 1F 00 1C */ lha r0, 0x1c(r31) -/* 800259D4 B0 04 00 14 */ sth r0, 0x14(r4) -/* 800259D8 A0 1F 00 1E */ lhz r0, 0x1e(r31) -/* 800259DC B0 04 00 16 */ sth r0, 0x16(r4) -/* 800259E0 88 1C 00 04 */ lbz r0, 4(r28) -/* 800259E4 98 04 00 21 */ stb r0, 0x21(r4) -/* 800259E8 88 1F 00 20 */ lbz r0, 0x20(r31) -/* 800259EC 98 04 00 18 */ stb r0, 0x18(r4) -/* 800259F0 88 1F 00 21 */ lbz r0, 0x21(r31) -/* 800259F4 98 04 00 19 */ stb r0, 0x19(r4) -/* 800259F8 88 1F 00 22 */ lbz r0, 0x22(r31) -/* 800259FC 98 04 00 1A */ stb r0, 0x1a(r4) -/* 80025A00 7F E3 FB 78 */ mr r3, r31 -/* 80025A04 4B FF F4 F9 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class -lbl_80025A08: -/* 80025A08 3B FF 00 24 */ addi r31, r31, 0x24 -/* 80025A0C 3B DE 00 01 */ addi r30, r30, 1 -lbl_80025A10: -/* 80025A10 80 1D 00 04 */ lwz r0, 4(r29) -/* 80025A14 7C 1E 00 00 */ cmpw r30, r0 -/* 80025A18 41 80 FF 68 */ blt lbl_80025980 -/* 80025A1C 38 60 00 01 */ li r3, 1 -/* 80025A20 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025A24 48 33 C8 01 */ bl _restgpr_28 -/* 80025A28 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80025A2C 7C 08 03 A6 */ mtlr r0 -/* 80025A30 38 21 00 20 */ addi r1, r1, 0x20 -/* 80025A34 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_tgscInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_tgscInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index fad46976ff..0000000000 --- a/asm/d/d_stage/dStage_tgscInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80025BFC: -/* 80025BFC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80025C00 7C 08 02 A6 */ mflr r0 -/* 80025C04 90 01 00 24 */ stw r0, 0x24(r1) -/* 80025C08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025C0C 48 33 C5 CD */ bl _savegpr_28 -/* 80025C10 7C 7C 1B 78 */ mr r28, r3 -/* 80025C14 7C 9D 23 78 */ mr r29, r4 -/* 80025C18 83 E4 00 08 */ lwz r31, 8(r4) -/* 80025C1C 3B C0 00 00 */ li r30, 0 -/* 80025C20 48 00 00 94 */ b lbl_80025CB4 -lbl_80025C24: -/* 80025C24 88 7C 00 04 */ lbz r3, 4(r28) -/* 80025C28 38 9F 00 0C */ addi r4, r31, 0xc -/* 80025C2C 48 00 B8 09 */ bl check__7daSus_cFScRC4cXyz -/* 80025C30 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80025C34 40 82 00 78 */ bne lbl_80025CAC -/* 80025C38 4B FF 3E 71 */ bl fopAcM_CreateAppend__Fv -/* 80025C3C 7C 64 1B 79 */ or. r4, r3, r3 -/* 80025C40 41 82 00 6C */ beq lbl_80025CAC -/* 80025C44 80 1F 00 08 */ lwz r0, 8(r31) -/* 80025C48 90 04 00 00 */ stw r0, 0(r4) -/* 80025C4C C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80025C50 D0 04 00 04 */ stfs f0, 4(r4) -/* 80025C54 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 80025C58 D0 04 00 08 */ stfs f0, 8(r4) -/* 80025C5C C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80025C60 D0 04 00 0C */ stfs f0, 0xc(r4) -/* 80025C64 A8 1F 00 18 */ lha r0, 0x18(r31) -/* 80025C68 B0 04 00 10 */ sth r0, 0x10(r4) -/* 80025C6C A8 1F 00 1A */ lha r0, 0x1a(r31) -/* 80025C70 B0 04 00 12 */ sth r0, 0x12(r4) -/* 80025C74 A8 1F 00 1C */ lha r0, 0x1c(r31) -/* 80025C78 B0 04 00 14 */ sth r0, 0x14(r4) -/* 80025C7C A0 1F 00 1E */ lhz r0, 0x1e(r31) -/* 80025C80 B0 04 00 16 */ sth r0, 0x16(r4) -/* 80025C84 88 1C 00 04 */ lbz r0, 4(r28) -/* 80025C88 98 04 00 21 */ stb r0, 0x21(r4) -/* 80025C8C 88 1F 00 20 */ lbz r0, 0x20(r31) -/* 80025C90 98 04 00 18 */ stb r0, 0x18(r4) -/* 80025C94 88 1F 00 21 */ lbz r0, 0x21(r31) -/* 80025C98 98 04 00 19 */ stb r0, 0x19(r4) -/* 80025C9C 88 1F 00 22 */ lbz r0, 0x22(r31) -/* 80025CA0 98 04 00 1A */ stb r0, 0x1a(r4) -/* 80025CA4 7F E3 FB 78 */ mr r3, r31 -/* 80025CA8 4B FF F2 55 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class -lbl_80025CAC: -/* 80025CAC 3B FF 00 24 */ addi r31, r31, 0x24 -/* 80025CB0 3B DE 00 01 */ addi r30, r30, 1 -lbl_80025CB4: -/* 80025CB4 80 1D 00 04 */ lwz r0, 4(r29) -/* 80025CB8 7C 1E 00 00 */ cmpw r30, r0 -/* 80025CBC 41 80 FF 68 */ blt lbl_80025C24 -/* 80025CC0 38 60 00 01 */ li r3, 1 -/* 80025CC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025CC8 48 33 C5 5D */ bl _restgpr_28 -/* 80025CCC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80025CD0 7C 08 03 A6 */ mtlr r0 -/* 80025CD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80025CD8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_vrboxInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_vrboxInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 202387324f..0000000000 --- a/asm/d/d_stage/dStage_vrboxInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800255E0: -/* 800255E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800255E4 7C 08 02 A6 */ mflr r0 -/* 800255E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800255EC 80 84 00 08 */ lwz r4, 8(r4) -/* 800255F0 81 83 00 00 */ lwz r12, 0(r3) -/* 800255F4 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800255F8 7D 89 03 A6 */ mtctr r12 -/* 800255FC 4E 80 04 21 */ bctrl -/* 80025600 38 60 00 01 */ li r3, 1 -/* 80025604 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80025608 7C 08 03 A6 */ mtlr r0 -/* 8002560C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025610 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 9b4cf1b63a..0000000000 --- a/asm/d/d_stage/dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80025614: -/* 80025614 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80025618 7C 08 02 A6 */ mflr r0 -/* 8002561C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80025620 80 84 00 08 */ lwz r4, 8(r4) -/* 80025624 81 83 00 00 */ lwz r12, 0(r3) -/* 80025628 81 8C 00 68 */ lwz r12, 0x68(r12) -/* 8002562C 7D 89 03 A6 */ mtctr r12 -/* 80025630 4E 80 04 21 */ bctrl -/* 80025634 38 60 00 01 */ li r3, 1 -/* 80025638 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002563C 7C 08 03 A6 */ mtlr r0 -/* 80025640 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025644 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/getElst__16dStage_stageDt_cFv.s b/asm/d/d_stage/getElst__16dStage_stageDt_cFv.s deleted file mode 100644 index 1255d155bf..0000000000 --- a/asm/d/d_stage/getElst__16dStage_stageDt_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80026AE8: -/* 80026AE8 80 63 00 A0 */ lwz r3, 0xa0(r3) -/* 80026AEC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/getMapInfoBase__15dStage_roomDt_cCFv.s b/asm/d/d_stage/getMapInfoBase__15dStage_roomDt_cCFv.s deleted file mode 100644 index 847687eb44..0000000000 --- a/asm/d/d_stage/getMapInfoBase__15dStage_roomDt_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800253FC: -/* 800253FC 80 63 00 14 */ lwz r3, 0x14(r3) -/* 80025400 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/getMapInfoBase__16dStage_stageDt_cCFv.s b/asm/d/d_stage/getMapInfoBase__16dStage_stageDt_cCFv.s deleted file mode 100644 index b8294dde14..0000000000 --- a/asm/d/d_stage/getMapInfoBase__16dStage_stageDt_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80025490: -/* 80025490 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80025494 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/getMemoryBlock__20dStage_roomControl_cFi.s b/asm/d/d_stage/getMemoryBlock__20dStage_roomControl_cFi.s deleted file mode 100644 index 3f1a45a4cf..0000000000 --- a/asm/d/d_stage/getMemoryBlock__20dStage_roomControl_cFi.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800243B0: -/* 800243B0 3C 80 80 3F */ lis r4, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 800243B4 38 84 60 94 */ addi r4, r4, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 800243B8 1C 03 04 04 */ mulli r0, r3, 0x404 -/* 800243BC 7C 64 02 14 */ add r3, r4, r0 -/* 800243C0 88 03 03 F8 */ lbz r0, 0x3f8(r3) -/* 800243C4 7C 00 07 75 */ extsb. r0, r0 -/* 800243C8 40 80 00 0C */ bge lbl_800243D4 -/* 800243CC 38 60 00 00 */ li r3, 0 -/* 800243D0 4E 80 00 20 */ blr -lbl_800243D4: -/* 800243D4 54 00 10 3A */ slwi r0, r0, 2 -/* 800243D8 3C 60 80 3A */ lis r3, mMemoryBlock__20dStage_roomControl_c@ha /* 0x803A6920@ha */ -/* 800243DC 38 63 69 20 */ addi r3, r3, mMemoryBlock__20dStage_roomControl_c@l /* 0x803A6920@l */ -/* 800243E0 7C 63 00 2E */ lwzx r3, r3, r0 -/* 800243E4 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/getSclsInfo__15dStage_roomDt_cCFv.s b/asm/d/d_stage/getSclsInfo__15dStage_roomDt_cCFv.s deleted file mode 100644 index adb2c3dfbb..0000000000 --- a/asm/d/d_stage/getSclsInfo__15dStage_roomDt_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800272E0: -/* 800272E0 80 63 00 48 */ lwz r3, 0x48(r3) -/* 800272E4 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/getSclsInfo__16dStage_stageDt_cCFv.s b/asm/d/d_stage/getSclsInfo__16dStage_stageDt_cCFv.s deleted file mode 100644 index ef91611208..0000000000 --- a/asm/d/d_stage/getSclsInfo__16dStage_stageDt_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800272E8: -/* 800272E8 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800272EC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/init__20dStage_roomControl_cFv.s b/asm/d/d_stage/init__20dStage_roomControl_cFv.s deleted file mode 100644 index e7bdd319d9..0000000000 --- a/asm/d/d_stage/init__20dStage_roomControl_cFv.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_800241E8: -/* 800241E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800241EC 7C 08 02 A6 */ mflr r0 -/* 800241F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800241F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800241F8 48 33 DF E1 */ bl _savegpr_28 -/* 800241FC 38 80 FF FF */ li r4, -1 -/* 80024200 98 8D 87 E4 */ stb r4, struct_80450D64+0x0(r13) -/* 80024204 98 8D 87 E5 */ stb r4, struct_80450D64+0x1(r13) -/* 80024208 98 8D 87 E6 */ stb r4, struct_80450D64+0x2(r13) -/* 8002420C 38 00 00 00 */ li r0, 0 -/* 80024210 98 0D 87 E8 */ stb r0, data_80450D68(r13) -/* 80024214 98 8D 80 70 */ stb r4, data_804505F0(r13) -/* 80024218 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002421C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80024220 A8 04 4E 08 */ lha r0, 0x4e08(r4) -/* 80024224 7C 00 07 35 */ extsh. r0, r0 -/* 80024228 40 80 00 0C */ bge lbl_80024234 -/* 8002422C 2C 00 FF FC */ cmpwi r0, -4 -/* 80024230 40 82 00 08 */ bne lbl_80024238 -lbl_80024234: -/* 80024234 48 00 01 05 */ bl initZone__20dStage_roomControl_cFv -lbl_80024238: -/* 80024238 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8002423C 3B E3 60 94 */ addi r31, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 80024240 7F FE FB 78 */ mr r30, r31 -/* 80024244 3B A0 00 00 */ li r29, 0 -/* 80024248 3B 80 00 00 */ li r28, 0 -lbl_8002424C: -/* 8002424C 7F C3 F3 78 */ mr r3, r30 -/* 80024250 81 9E 00 00 */ lwz r12, 0(r30) -/* 80024254 81 8C 00 08 */ lwz r12, 8(r12) -/* 80024258 7D 89 03 A6 */ mtctr r12 -/* 8002425C 4E 80 04 21 */ bctrl -/* 80024260 7F C3 F3 78 */ mr r3, r30 -/* 80024264 48 00 0A 45 */ bl initFileList2__15dStage_roomDt_cFv -/* 80024268 38 00 00 00 */ li r0, 0 -/* 8002426C 7C 7F E2 14 */ add r3, r31, r28 -/* 80024270 98 03 03 F4 */ stb r0, 0x3f4(r3) -/* 80024274 98 1E 03 F5 */ stb r0, 0x3f5(r30) -/* 80024278 88 7E 03 F7 */ lbz r3, 0x3f7(r30) -/* 8002427C 7C 60 07 75 */ extsb. r0, r3 -/* 80024280 41 80 00 40 */ blt lbl_800242C0 -/* 80024284 7C 60 07 74 */ extsb r0, r3 -/* 80024288 54 04 28 34 */ slwi r4, r0, 5 -/* 8002428C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80024290 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80024294 7C 60 22 14 */ add r3, r0, r4 -/* 80024298 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 8002429C 48 01 0A 51 */ bl clearRoomSwitch__13dSv_zoneBit_cFv -/* 800242A0 88 1E 03 F7 */ lbz r0, 0x3f7(r30) -/* 800242A4 7C 00 07 74 */ extsb r0, r0 -/* 800242A8 54 04 28 34 */ slwi r4, r0, 5 -/* 800242AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800242B0 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800242B4 7C 60 22 14 */ add r3, r0, r4 -/* 800242B8 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 800242BC 48 01 0A 3D */ bl clearRoomItem__13dSv_zoneBit_cFv -lbl_800242C0: -/* 800242C0 38 00 FF FF */ li r0, -1 -/* 800242C4 98 1E 03 F8 */ stb r0, 0x3f8(r30) -/* 800242C8 38 00 00 00 */ li r0, 0 -/* 800242CC 90 1E 04 00 */ stw r0, 0x400(r30) -/* 800242D0 3B BD 00 01 */ addi r29, r29, 1 -/* 800242D4 2C 1D 00 40 */ cmpwi r29, 0x40 -/* 800242D8 3B DE 04 04 */ addi r30, r30, 0x404 -/* 800242DC 3B 9C 04 04 */ addi r28, r28, 0x404 -/* 800242E0 41 80 FF 6C */ blt lbl_8002424C -/* 800242E4 3C 60 80 38 */ lis r3, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 800242E8 38 63 8A 50 */ addi r3, r3, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 800242EC 38 63 00 8D */ addi r3, r3, 0x8d -/* 800242F0 48 00 B1 45 */ bl dComIfG_getStageRes__FPCc -/* 800242F4 90 6D 87 EC */ stw r3, mArcBankName__20dStage_roomControl_c(r13) -/* 800242F8 3C 60 80 38 */ lis r3, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 800242FC 38 63 8A 50 */ addi r3, r3, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80024300 38 63 00 96 */ addi r3, r3, 0x96 -/* 80024304 48 00 B1 31 */ bl dComIfG_getStageRes__FPCc -/* 80024308 90 6D 87 F0 */ stw r3, mArcBankData__20dStage_roomControl_c(r13) -/* 8002430C 80 0D 87 EC */ lwz r0, mArcBankName__20dStage_roomControl_c(r13) -/* 80024310 28 00 00 00 */ cmplwi r0, 0 -/* 80024314 40 82 00 0C */ bne lbl_80024320 -/* 80024318 38 00 00 00 */ li r0, 0 -/* 8002431C 90 0D 87 F0 */ stw r0, mArcBankData__20dStage_roomControl_c(r13) -lbl_80024320: -/* 80024320 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024324 48 33 DF 01 */ bl _restgpr_28 -/* 80024328 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002432C 7C 08 03 A6 */ mtlr r0 -/* 80024330 38 21 00 20 */ addi r1, r1, 0x20 -/* 80024334 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/layerActorLoader__FPvP11dStage_dt_ci.s b/asm/d/d_stage/layerActorLoader__FPvP11dStage_dt_ci.s deleted file mode 100644 index a2cc138844..0000000000 --- a/asm/d/d_stage/layerActorLoader__FPvP11dStage_dt_ci.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80026AF0: -/* 80026AF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80026AF4 7C 08 02 A6 */ mflr r0 -/* 80026AF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026AFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80026B00 93 C1 00 08 */ stw r30, 8(r1) -/* 80026B04 7C 7E 1B 78 */ mr r30, r3 -/* 80026B08 7C 9F 23 78 */ mr r31, r4 -/* 80026B0C 38 60 00 00 */ li r3, 0 -/* 80026B10 48 00 5E 6D */ bl getLayerNo__14dComIfG_play_cFi -/* 80026B14 7C 65 1B 78 */ mr r5, r3 -/* 80026B18 3C 60 80 3A */ lis r3, l_layerFuncTable_5158@ha /* 0x803A668C@ha */ -/* 80026B1C 38 63 66 8C */ addi r3, r3, l_layerFuncTable_5158@l /* 0x803A668C@l */ -/* 80026B20 38 80 00 04 */ li r4, 4 -/* 80026B24 4B FF F5 5D */ bl dStage_setLayerTagName__FP9FuncTableii -/* 80026B28 7F C3 F3 78 */ mr r3, r30 -/* 80026B2C 7F E4 FB 78 */ mr r4, r31 -/* 80026B30 3C A0 80 3A */ lis r5, l_layerFuncTable_5158@ha /* 0x803A668C@ha */ -/* 80026B34 38 A5 66 8C */ addi r5, r5, l_layerFuncTable_5158@l /* 0x803A668C@l */ -/* 80026B38 38 C0 00 04 */ li r6, 4 -/* 80026B3C 4B FF F5 79 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -/* 80026B40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80026B44 83 C1 00 08 */ lwz r30, 8(r1) -/* 80026B48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026B4C 7C 08 03 A6 */ mtlr r0 -/* 80026B50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026B54 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/layerTableLoader__FPvP11dStage_dt_ci.s b/asm/d/d_stage/layerTableLoader__FPvP11dStage_dt_ci.s deleted file mode 100644 index 6ebe4df6df..0000000000 --- a/asm/d/d_stage/layerTableLoader__FPvP11dStage_dt_ci.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_800269B4: -/* 800269B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800269B8 7C 08 02 A6 */ mflr r0 -/* 800269BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800269C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800269C4 48 33 B8 15 */ bl _savegpr_28 -/* 800269C8 7C 7E 1B 78 */ mr r30, r3 -/* 800269CC 7C 9F 23 78 */ mr r31, r4 -/* 800269D0 2C 05 FF FF */ cmpwi r5, -1 -/* 800269D4 41 82 00 0C */ beq lbl_800269E0 -/* 800269D8 7C BD 2B 78 */ mr r29, r5 -/* 800269DC 48 00 00 18 */ b lbl_800269F4 -lbl_800269E0: -/* 800269E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800269E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800269E8 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 800269EC 7C 00 07 74 */ extsb r0, r0 -/* 800269F0 7C 1D 03 78 */ mr r29, r0 -lbl_800269F4: -/* 800269F4 38 60 00 00 */ li r3, 0 -/* 800269F8 48 00 5F 85 */ bl getLayerNo__14dComIfG_play_cFi -/* 800269FC 7C 65 1B 78 */ mr r5, r3 -/* 80026A00 3C 60 80 3A */ lis r3, l_layerFuncTableA@ha /* 0x803A6644@ha */ -/* 80026A04 38 63 66 44 */ addi r3, r3, l_layerFuncTableA@l /* 0x803A6644@l */ -/* 80026A08 38 80 00 01 */ li r4, 1 -/* 80026A0C 4B FF F6 75 */ bl dStage_setLayerTagName__FP9FuncTableii -/* 80026A10 7F C3 F3 78 */ mr r3, r30 -/* 80026A14 7F E4 FB 78 */ mr r4, r31 -/* 80026A18 3C A0 80 3A */ lis r5, l_layerFuncTableA@ha /* 0x803A6644@ha */ -/* 80026A1C 38 A5 66 44 */ addi r5, r5, l_layerFuncTableA@l /* 0x803A6644@l */ -/* 80026A20 38 C0 00 01 */ li r6, 1 -/* 80026A24 4B FF F6 91 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -/* 80026A28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026A2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80026A30 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 80026A34 81 8C 01 70 */ lwz r12, 0x170(r12) -/* 80026A38 7D 89 03 A6 */ mtctr r12 -/* 80026A3C 4E 80 04 21 */ bctrl -/* 80026A40 28 03 00 00 */ cmplwi r3, 0 -/* 80026A44 41 82 00 60 */ beq lbl_80026AA4 -/* 80026A48 2C 1D 00 00 */ cmpwi r29, 0 -/* 80026A4C 41 80 00 58 */ blt lbl_80026AA4 -/* 80026A50 80 03 00 00 */ lwz r0, 0(r3) -/* 80026A54 7C 00 E8 00 */ cmpw r0, r29 -/* 80026A58 40 81 00 4C */ ble lbl_80026AA4 -/* 80026A5C 83 83 00 04 */ lwz r28, 4(r3) -/* 80026A60 38 60 00 00 */ li r3, 0 -/* 80026A64 48 00 5F 19 */ bl getLayerNo__14dComIfG_play_cFi -/* 80026A68 7C 65 1B 78 */ mr r5, r3 -/* 80026A6C 3C 60 80 3A */ lis r3, l_envLayerFuncTable@ha /* 0x803A6650@ha */ -/* 80026A70 38 63 66 50 */ addi r3, r3, l_envLayerFuncTable@l /* 0x803A6650@l */ -/* 80026A74 38 80 00 05 */ li r4, 5 -/* 80026A78 1C 1D 00 0F */ mulli r0, r29, 0xf -/* 80026A7C 7C 00 2A 14 */ add r0, r0, r5 -/* 80026A80 7C BC 00 AE */ lbzx r5, r28, r0 -/* 80026A84 4B FF F5 FD */ bl dStage_setLayerTagName__FP9FuncTableii -/* 80026A88 7F C3 F3 78 */ mr r3, r30 -/* 80026A8C 7F E4 FB 78 */ mr r4, r31 -/* 80026A90 3C A0 80 3A */ lis r5, l_envLayerFuncTable@ha /* 0x803A6650@ha */ -/* 80026A94 38 A5 66 50 */ addi r5, r5, l_envLayerFuncTable@l /* 0x803A6650@l */ -/* 80026A98 38 C0 00 05 */ li r6, 5 -/* 80026A9C 4B FF F6 19 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -/* 80026AA0 48 00 00 30 */ b lbl_80026AD0 -lbl_80026AA4: -/* 80026AA4 3C 60 80 3A */ lis r3, l_envLayerFuncTable@ha /* 0x803A6650@ha */ -/* 80026AA8 38 63 66 50 */ addi r3, r3, l_envLayerFuncTable@l /* 0x803A6650@l */ -/* 80026AAC 38 80 00 05 */ li r4, 5 -/* 80026AB0 38 A0 00 00 */ li r5, 0 -/* 80026AB4 4B FF F5 CD */ bl dStage_setLayerTagName__FP9FuncTableii -/* 80026AB8 7F C3 F3 78 */ mr r3, r30 -/* 80026ABC 7F E4 FB 78 */ mr r4, r31 -/* 80026AC0 3C A0 80 3A */ lis r5, l_envLayerFuncTable@ha /* 0x803A6650@ha */ -/* 80026AC4 38 A5 66 50 */ addi r5, r5, l_envLayerFuncTable@l /* 0x803A6650@l */ -/* 80026AC8 38 C0 00 05 */ li r6, 5 -/* 80026ACC 4B FF F5 E9 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -lbl_80026AD0: -/* 80026AD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026AD4 48 33 B7 51 */ bl _restgpr_28 -/* 80026AD8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80026ADC 7C 08 03 A6 */ mtlr r0 -/* 80026AE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80026AE4 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/readMult__FP11dStage_dt_cP14dStage_Multi_cb.s b/asm/d/d_stage/readMult__FP11dStage_dt_cP14dStage_Multi_cb.s deleted file mode 100644 index 2462605787..0000000000 --- a/asm/d/d_stage/readMult__FP11dStage_dt_cP14dStage_Multi_cb.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_8002645C: -/* 8002645C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80026460 7C 08 02 A6 */ mflr r0 -/* 80026464 90 01 00 34 */ stw r0, 0x34(r1) -/* 80026468 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002646C 48 33 BD 65 */ bl _savegpr_26 -/* 80026470 7C 7B 1B 78 */ mr r27, r3 -/* 80026474 7C 9C 23 79 */ or. r28, r4, r4 -/* 80026478 7C BD 2B 78 */ mr r29, r5 -/* 8002647C 41 82 01 48 */ beq lbl_800265C4 -/* 80026480 83 FC 00 04 */ lwz r31, 4(r28) -/* 80026484 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80026488 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002648C 3B C3 4E 20 */ addi r30, r3, 0x4e20 -/* 80026490 7F C3 F3 78 */ mr r3, r30 -/* 80026494 81 9E 00 00 */ lwz r12, 0(r30) -/* 80026498 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8002649C 7D 89 03 A6 */ mtctr r12 -/* 800264A0 4E 80 04 21 */ bctrl -/* 800264A4 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 800264A8 54 00 07 7F */ clrlwi. r0, r0, 0x1d -/* 800264AC 41 82 00 28 */ beq lbl_800264D4 -/* 800264B0 7F C3 F3 78 */ mr r3, r30 -/* 800264B4 81 9E 00 00 */ lwz r12, 0(r30) -/* 800264B8 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 800264BC 7D 89 03 A6 */ mtctr r12 -/* 800264C0 4E 80 04 21 */ bctrl -/* 800264C4 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 800264C8 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 800264CC 2C 00 00 06 */ cmpwi r0, 6 -/* 800264D0 40 82 00 14 */ bne lbl_800264E4 -lbl_800264D4: -/* 800264D4 38 6D 87 F4 */ la r3, m_roomDzs__20dStage_roomControl_c(r13) /* 80450D74-_SDA_BASE_ */ -/* 800264D8 80 1C 00 00 */ lwz r0, 0(r28) -/* 800264DC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800264E0 4B FF E5 55 */ bl create__Q220dStage_roomControl_c9roomDzs_cFUc -lbl_800264E4: -/* 800264E4 3B C0 00 00 */ li r30, 0 -/* 800264E8 48 00 00 CC */ b lbl_800265B4 -lbl_800264EC: -/* 800264EC 38 6D 87 F4 */ la r3, m_roomDzs__20dStage_roomControl_c(r13) /* 80450D74-_SDA_BASE_ */ -/* 800264F0 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 800264F4 88 BF 00 0A */ lbz r5, 0xa(r31) -/* 800264F8 4B FF E6 4D */ bl add__Q220dStage_roomControl_c9roomDzs_cFUcUc -/* 800264FC 7C 7A 1B 78 */ mr r26, r3 -/* 80026500 28 03 00 00 */ cmplwi r3, 0 -/* 80026504 40 82 00 44 */ bne lbl_80026548 -/* 80026508 38 61 00 08 */ addi r3, r1, 8 -/* 8002650C 3C 80 80 38 */ lis r4, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80026510 38 84 8A 50 */ addi r4, r4, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80026514 38 84 01 0E */ addi r4, r4, 0x10e -/* 80026518 88 BF 00 0A */ lbz r5, 0xa(r31) -/* 8002651C 4C C6 31 82 */ crclr 6 -/* 80026520 48 33 FF BD */ bl sprintf -/* 80026524 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80026528 41 82 00 14 */ beq lbl_8002653C -/* 8002652C 38 61 00 08 */ addi r3, r1, 8 -/* 80026530 48 00 8F 49 */ bl dComIfG_getOldStageRes__FPCc -/* 80026534 7C 7A 1B 78 */ mr r26, r3 -/* 80026538 48 00 00 10 */ b lbl_80026548 -lbl_8002653C: -/* 8002653C 38 61 00 08 */ addi r3, r1, 8 -/* 80026540 48 00 8E F5 */ bl dComIfG_getStageRes__FPCc -/* 80026544 7C 7A 1B 78 */ mr r26, r3 -lbl_80026548: -/* 80026548 28 1A 00 00 */ cmplwi r26, 0 -/* 8002654C 41 82 00 60 */ beq lbl_800265AC -/* 80026550 7F 43 D3 78 */ mr r3, r26 -/* 80026554 4B FF FE 09 */ bl dStage_dt_c_offsetToPtr__FPv -/* 80026558 88 1F 00 0A */ lbz r0, 0xa(r31) -/* 8002655C 98 1B 00 04 */ stb r0, 4(r27) -/* 80026560 7F 43 D3 78 */ mr r3, r26 -/* 80026564 7F 64 DB 78 */ mr r4, r27 -/* 80026568 3C A0 80 3A */ lis r5, l_roomFuncTable@ha /* 0x803A65CC@ha */ -/* 8002656C 38 A5 65 CC */ addi r5, r5, l_roomFuncTable@l /* 0x803A65CC@l */ -/* 80026570 38 C0 00 04 */ li r6, 4 -/* 80026574 4B FF FB 41 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -/* 80026578 38 60 00 00 */ li r3, 0 -/* 8002657C 48 00 64 01 */ bl getLayerNo__14dComIfG_play_cFi -/* 80026580 7C 65 1B 78 */ mr r5, r3 -/* 80026584 3C 60 80 3A */ lis r3, l_layerFuncTable_5053@ha /* 0x803A65FC@ha */ -/* 80026588 38 63 65 FC */ addi r3, r3, l_layerFuncTable_5053@l /* 0x803A65FC@l */ -/* 8002658C 38 80 00 03 */ li r4, 3 -/* 80026590 4B FF FA F1 */ bl dStage_setLayerTagName__FP9FuncTableii -/* 80026594 7F 43 D3 78 */ mr r3, r26 -/* 80026598 7F 64 DB 78 */ mr r4, r27 -/* 8002659C 3C A0 80 3A */ lis r5, l_layerFuncTable_5053@ha /* 0x803A65FC@ha */ -/* 800265A0 38 A5 65 FC */ addi r5, r5, l_layerFuncTable_5053@l /* 0x803A65FC@l */ -/* 800265A4 38 C0 00 03 */ li r6, 3 -/* 800265A8 4B FF FB 0D */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -lbl_800265AC: -/* 800265AC 3B FF 00 0C */ addi r31, r31, 0xc -/* 800265B0 3B DE 00 01 */ addi r30, r30, 1 -lbl_800265B4: -/* 800265B4 7F C3 07 74 */ extsb r3, r30 -/* 800265B8 80 1C 00 00 */ lwz r0, 0(r28) -/* 800265BC 7C 03 00 00 */ cmpw r3, r0 -/* 800265C0 41 80 FF 2C */ blt lbl_800264EC -lbl_800265C4: -/* 800265C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800265C8 48 33 BC 55 */ bl _restgpr_26 -/* 800265CC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800265D0 7C 08 03 A6 */ mtlr r0 -/* 800265D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800265D8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/remove__Q220dStage_roomControl_c9roomDzs_cFv.s b/asm/d/d_stage/remove__Q220dStage_roomControl_c9roomDzs_cFv.s deleted file mode 100644 index e1b0afd31b..0000000000 --- a/asm/d/d_stage/remove__Q220dStage_roomControl_c9roomDzs_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80024ABC: -/* 80024ABC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80024AC0 7C 08 02 A6 */ mflr r0 -/* 80024AC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80024AC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024ACC 48 33 D7 0D */ bl _savegpr_28 -/* 80024AD0 7C 7C 1B 78 */ mr r28, r3 -/* 80024AD4 88 03 00 00 */ lbz r0, 0(r3) -/* 80024AD8 28 00 00 00 */ cmplwi r0, 0 -/* 80024ADC 41 82 00 50 */ beq lbl_80024B2C -/* 80024AE0 83 DC 00 04 */ lwz r30, 4(r28) -/* 80024AE4 3B A0 00 00 */ li r29, 0 -/* 80024AE8 48 00 00 24 */ b lbl_80024B0C -lbl_80024AEC: -/* 80024AEC 83 FE 00 00 */ lwz r31, 0(r30) -/* 80024AF0 28 1F 00 00 */ cmplwi r31, 0 -/* 80024AF4 41 82 00 10 */ beq lbl_80024B04 -/* 80024AF8 4B FE A2 F5 */ bl mDoExt_getArchiveHeap__Fv -/* 80024AFC 7F E4 FB 78 */ mr r4, r31 -/* 80024B00 48 2A 9A 49 */ bl free__7JKRHeapFPv -lbl_80024B04: -/* 80024B04 3B DE 00 04 */ addi r30, r30, 4 -/* 80024B08 3B BD 00 01 */ addi r29, r29, 1 -lbl_80024B0C: -/* 80024B0C 57 A3 06 3E */ clrlwi r3, r29, 0x18 -/* 80024B10 88 1C 00 00 */ lbz r0, 0(r28) -/* 80024B14 7C 03 00 40 */ cmplw r3, r0 -/* 80024B18 41 80 FF D4 */ blt lbl_80024AEC -/* 80024B1C 80 7C 00 04 */ lwz r3, 4(r28) -/* 80024B20 48 2A A2 41 */ bl __dla__FPv -/* 80024B24 38 00 00 00 */ li r0, 0 -/* 80024B28 98 1C 00 00 */ stb r0, 0(r28) -lbl_80024B2C: -/* 80024B2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024B30 48 33 D6 F5 */ bl _restgpr_28 -/* 80024B34 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80024B38 7C 08 03 A6 */ mtlr r0 -/* 80024B3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80024B40 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/resetOldMulti__16dStage_stageDt_cFv.s b/asm/d/d_stage/resetOldMulti__16dStage_stageDt_cFv.s deleted file mode 100644 index da059194fb..0000000000 --- a/asm/d/d_stage/resetOldMulti__16dStage_stageDt_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8002582C: -/* 8002582C 38 00 00 00 */ li r0, 0 -/* 80025830 90 03 00 8C */ stw r0, 0x8c(r3) -/* 80025834 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setOldMulti__16dStage_stageDt_cFv.s b/asm/d/d_stage/setOldMulti__16dStage_stageDt_cFv.s deleted file mode 100644 index 65b892b010..0000000000 --- a/asm/d/d_stage/setOldMulti__16dStage_stageDt_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80026FDC: -/* 80026FDC 80 03 00 88 */ lwz r0, 0x88(r3) -/* 80026FE0 90 03 00 8C */ stw r0, 0x8c(r3) -/* 80026FE4 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setStayNo__20dStage_roomControl_cFi.s b/asm/d/d_stage/setStayNo__20dStage_roomControl_cFi.s deleted file mode 100644 index 9fca6cbbee..0000000000 --- a/asm/d/d_stage/setStayNo__20dStage_roomControl_cFi.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800243E8: -/* 800243E8 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) -/* 800243EC 98 0D 87 E5 */ stb r0, struct_80450D64+0x1(r13) -/* 800243F0 98 6D 87 E4 */ stb r3, struct_80450D64+0x0(r13) -/* 800243F4 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 800243F8 98 6D 87 E6 */ stb r3, struct_80450D64+0x2(r13) -/* 800243FC 7C A0 07 75 */ extsb. r0, r5 -/* 80024400 4D 80 00 20 */ bltlr -/* 80024404 38 80 00 01 */ li r4, 1 -/* 80024408 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8002440C 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 80024410 7C A0 07 74 */ extsb r0, r5 -/* 80024414 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 80024418 7C 63 02 14 */ add r3, r3, r0 -/* 8002441C 98 83 03 F5 */ stb r4, 0x3f5(r3) -/* 80024420 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/zoneCountCheck__20dStage_roomControl_cCFi.s b/asm/d/d_stage/zoneCountCheck__20dStage_roomControl_cCFi.s deleted file mode 100644 index 3bea7198c9..0000000000 --- a/asm/d/d_stage/zoneCountCheck__20dStage_roomControl_cCFi.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_8002471C: -/* 8002471C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80024720 7C 08 02 A6 */ mflr r0 -/* 80024724 90 01 00 24 */ stw r0, 0x24(r1) -/* 80024728 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002472C 48 33 DA AD */ bl _savegpr_28 -/* 80024730 7C 9C 23 78 */ mr r28, r4 -/* 80024734 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 80024738 38 03 60 94 */ addi r0, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 8002473C 7C 1E 03 78 */ mr r30, r0 -/* 80024740 3B A0 00 00 */ li r29, 0 -/* 80024744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80024748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002474C 3B E3 4E 20 */ addi r31, r3, 0x4e20 -lbl_80024750: -/* 80024750 88 7E 03 F7 */ lbz r3, 0x3f7(r30) -/* 80024754 7C 60 07 75 */ extsb. r0, r3 -/* 80024758 41 80 00 B4 */ blt lbl_8002480C -/* 8002475C 88 1E 03 F6 */ lbz r0, 0x3f6(r30) -/* 80024760 7C 00 07 75 */ extsb. r0, r0 -/* 80024764 40 81 00 A8 */ ble lbl_8002480C -/* 80024768 7C 60 07 74 */ extsb r0, r3 -/* 8002476C 54 04 28 34 */ slwi r4, r0, 5 -/* 80024770 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80024774 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80024778 7C 60 22 14 */ add r3, r0, r4 -/* 8002477C 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 80024780 48 01 05 6D */ bl clearRoomSwitch__13dSv_zoneBit_cFv -/* 80024784 88 1E 03 F7 */ lbz r0, 0x3f7(r30) -/* 80024788 7C 00 07 74 */ extsb r0, r0 -/* 8002478C 54 04 28 34 */ slwi r4, r0, 5 -/* 80024790 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80024794 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80024798 7C 60 22 14 */ add r3, r0, r4 -/* 8002479C 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 800247A0 48 01 05 59 */ bl clearRoomItem__13dSv_zoneBit_cFv -/* 800247A4 7F E3 FB 78 */ mr r3, r31 -/* 800247A8 81 9F 00 00 */ lwz r12, 0(r31) -/* 800247AC 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 800247B0 7D 89 03 A6 */ mtctr r12 -/* 800247B4 4E 80 04 21 */ bctrl -/* 800247B8 80 03 00 0C */ lwz r0, 0xc(r3) -/* 800247BC 54 00 87 7F */ rlwinm. r0, r0, 0x10, 0x1d, 0x1f -/* 800247C0 41 82 00 4C */ beq lbl_8002480C -/* 800247C4 88 0D 87 E5 */ lbz r0, struct_80450D64+0x1(r13) -/* 800247C8 7C 00 07 74 */ extsb r0, r0 -/* 800247CC 7C 1C 00 00 */ cmpw r28, r0 -/* 800247D0 41 82 00 3C */ beq lbl_8002480C -/* 800247D4 88 7E 03 F6 */ lbz r3, 0x3f6(r30) -/* 800247D8 38 03 FF FF */ addi r0, r3, -1 -/* 800247DC 98 1E 03 F6 */ stb r0, 0x3f6(r30) -/* 800247E0 7C 00 07 75 */ extsb. r0, r0 -/* 800247E4 40 82 00 28 */ bne lbl_8002480C -/* 800247E8 38 A0 FF FF */ li r5, -1 -/* 800247EC 88 1E 03 F7 */ lbz r0, 0x3f7(r30) -/* 800247F0 7C 00 07 74 */ extsb r0, r0 -/* 800247F4 54 04 28 34 */ slwi r4, r0, 5 -/* 800247F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800247FC 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80024800 7C 60 22 14 */ add r3, r0, r4 -/* 80024804 98 A3 09 B4 */ stb r5, 0x9b4(r3) -/* 80024808 98 BE 03 F7 */ stb r5, 0x3f7(r30) -lbl_8002480C: -/* 8002480C 3B BD 00 01 */ addi r29, r29, 1 -/* 80024810 2C 1D 00 40 */ cmpwi r29, 0x40 -/* 80024814 3B DE 04 04 */ addi r30, r30, 0x404 -/* 80024818 41 80 FF 38 */ blt lbl_80024750 -/* 8002481C 7F 83 E3 78 */ mr r3, r28 -/* 80024820 4B FF FB C9 */ bl setStayNo__20dStage_roomControl_cFi -/* 80024824 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024828 48 33 D9 FD */ bl _restgpr_28 -/* 8002482C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80024830 7C 08 03 A6 */ mtlr r0 -/* 80024834 38 21 00 20 */ addi r1, r1, 0x20 -/* 80024838 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/chkGetCompass__10dMapInfo_nFv.s b/asm/d/map/d_map_path_dmap/chkGetCompass__10dMapInfo_nFv.s deleted file mode 100644 index 03e3576958..0000000000 --- a/asm/d/map/d_map_path_dmap/chkGetCompass__10dMapInfo_nFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8003ECA0: -/* 8003ECA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003ECA4 7C 08 02 A6 */ mflr r0 -/* 8003ECA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003ECAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003ECB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003ECB4 38 63 09 58 */ addi r3, r3, 0x958 -/* 8003ECB8 38 80 00 01 */ li r4, 1 -/* 8003ECBC 4B FF 5C 79 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 8003ECC0 30 03 FF FF */ addic r0, r3, -1 -/* 8003ECC4 7C 60 19 10 */ subfe r3, r0, r3 -/* 8003ECC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003ECCC 7C 08 03 A6 */ mtlr r0 -/* 8003ECD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003ECD4 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/chkGetMap__10dMapInfo_nFv.s b/asm/d/map/d_map_path_dmap/chkGetMap__10dMapInfo_nFv.s deleted file mode 100644 index 2618e712b1..0000000000 --- a/asm/d/map/d_map_path_dmap/chkGetMap__10dMapInfo_nFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8003ECD8: -/* 8003ECD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003ECDC 7C 08 02 A6 */ mflr r0 -/* 8003ECE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003ECE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003ECE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003ECEC 38 63 09 58 */ addi r3, r3, 0x958 -/* 8003ECF0 38 80 00 00 */ li r4, 0 -/* 8003ECF4 4B FF 5C 41 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 8003ECF8 30 03 FF FF */ addic r0, r3, -1 -/* 8003ECFC 7C 60 19 10 */ subfe r3, r0, r3 -/* 8003ED00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003ED04 7C 08 03 A6 */ mtlr r0 -/* 8003ED08 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003ED0C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/correctionOriginPos__10dMapInfo_nFScP3Vec.s b/asm/d/map/d_map_path_dmap/correctionOriginPos__10dMapInfo_nFScP3Vec.s deleted file mode 100644 index fd44cf638b..0000000000 --- a/asm/d/map/d_map_path_dmap/correctionOriginPos__10dMapInfo_nFScP3Vec.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8003ED60: -/* 8003ED60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003ED64 7C 08 02 A6 */ mflr r0 -/* 8003ED68 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003ED6C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003ED70 93 C1 00 08 */ stw r30, 8(r1) -/* 8003ED74 7C 9E 23 79 */ or. r30, r4, r4 -/* 8003ED78 3C A0 80 3F */ lis r5, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8003ED7C 38 A5 60 94 */ addi r5, r5, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 8003ED80 7C 60 07 74 */ extsb r0, r3 -/* 8003ED84 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 8003ED88 7C 65 02 14 */ add r3, r5, r0 -/* 8003ED8C 83 E3 00 20 */ lwz r31, 0x20(r3) -/* 8003ED90 41 82 00 18 */ beq lbl_8003EDA8 -/* 8003ED94 7F E3 FB 78 */ mr r3, r31 -/* 8003ED98 48 00 00 55 */ bl rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec -/* 8003ED9C 7F E3 FB 78 */ mr r3, r31 -/* 8003EDA0 7F C4 F3 78 */ mr r4, r30 -/* 8003EDA4 48 00 00 1D */ bl offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec -lbl_8003EDA8: -/* 8003EDA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003EDAC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8003EDB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003EDB4 7C 08 03 A6 */ mtlr r0 -/* 8003EDB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003EDBC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/isVisitedRoom__10dMapInfo_nFi.s b/asm/d/map/d_map_path_dmap/isVisitedRoom__10dMapInfo_nFi.s deleted file mode 100644 index 6f62bd7eb6..0000000000 --- a/asm/d/map/d_map_path_dmap/isVisitedRoom__10dMapInfo_nFi.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8003ED10: -/* 8003ED10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003ED14 7C 08 02 A6 */ mflr r0 -/* 8003ED18 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003ED1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003ED20 3B E0 00 00 */ li r31, 0 -/* 8003ED24 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 8003ED28 38 84 FC 60 */ addi r4, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 8003ED2C 88 04 02 FC */ lbz r0, 0x2fc(r4) -/* 8003ED30 28 00 00 00 */ cmplwi r0, 0 -/* 8003ED34 40 82 00 10 */ bne lbl_8003ED44 -/* 8003ED38 4B FF 0F 61 */ bl dComIfGs_isVisitedRoom__Fi -/* 8003ED3C 2C 03 00 00 */ cmpwi r3, 0 -/* 8003ED40 41 82 00 08 */ beq lbl_8003ED48 -lbl_8003ED44: -/* 8003ED44 3B E0 00 01 */ li r31, 1 -lbl_8003ED48: -/* 8003ED48 7F E3 FB 78 */ mr r3, r31 -/* 8003ED4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003ED50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003ED54 7C 08 03 A6 */ mtlr r0 -/* 8003ED58 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003ED5C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec.s b/asm/d/map/d_map_path_dmap/offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec.s deleted file mode 100644 index 37998ee22c..0000000000 --- a/asm/d/map/d_map_path_dmap/offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8003EDC0: -/* 8003EDC0 28 03 00 00 */ cmplwi r3, 0 -/* 8003EDC4 4D 82 00 20 */ beqlr -/* 8003EDC8 C0 24 00 00 */ lfs f1, 0(r4) -/* 8003EDCC C0 03 00 14 */ lfs f0, 0x14(r3) -/* 8003EDD0 EC 01 00 2A */ fadds f0, f1, f0 -/* 8003EDD4 D0 04 00 00 */ stfs f0, 0(r4) -/* 8003EDD8 C0 24 00 08 */ lfs f1, 8(r4) -/* 8003EDDC C0 03 00 18 */ lfs f0, 0x18(r3) -/* 8003EDE0 EC 01 00 2A */ fadds f0, f1, f0 -/* 8003EDE4 D0 04 00 08 */ stfs f0, 8(r4) -/* 8003EDE8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec.s b/asm/d/map/d_map_path_dmap/rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec.s deleted file mode 100644 index de3f6869d9..0000000000 --- a/asm/d/map/d_map_path_dmap/rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8003EDEC: -/* 8003EDEC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003EDF0 7C 08 02 A6 */ mflr r0 -/* 8003EDF4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003EDF8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8003EDFC 7C 9F 23 78 */ mr r31, r4 -/* 8003EE00 38 80 00 00 */ li r4, 0 -/* 8003EE04 28 03 00 00 */ cmplwi r3, 0 -/* 8003EE08 41 82 00 08 */ beq lbl_8003EE10 -/* 8003EE0C A8 83 00 1C */ lha r4, 0x1c(r3) -lbl_8003EE10: -/* 8003EE10 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8003EE14 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8003EE18 4B FC D5 C5 */ bl mDoMtx_YrotS__FPA4_fs -/* 8003EE1C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8003EE20 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8003EE24 7F E4 FB 78 */ mr r4, r31 -/* 8003EE28 38 A1 00 08 */ addi r5, r1, 8 -/* 8003EE2C 48 30 7F 41 */ bl PSMTXMultVec -/* 8003EE30 C0 01 00 08 */ lfs f0, 8(r1) -/* 8003EE34 D0 1F 00 00 */ stfs f0, 0(r31) -/* 8003EE38 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8003EE3C D0 1F 00 04 */ stfs f0, 4(r31) -/* 8003EE40 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8003EE44 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8003EE48 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8003EE4C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003EE50 7C 08 03 A6 */ mtlr r0 -/* 8003EE54 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003EE58 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__29dSvBit_childSwPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__29dSvBit_childSwPerfectionHIO_cFv.s deleted file mode 100644 index 9f55bc4d23..0000000000 --- a/asm/d/save/d_save_HIO/__ct__29dSvBit_childSwPerfectionHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BB78: -/* 8025BB78 3C 80 80 3C */ lis r4, __vt__29dSvBit_childSwPerfectionHIO_c@ha /* 0x803C3384@ha */ -/* 8025BB7C 38 04 33 84 */ addi r0, r4, __vt__29dSvBit_childSwPerfectionHIO_c@l /* 0x803C3384@l */ -/* 8025BB80 90 03 00 00 */ stw r0, 0(r3) -/* 8025BB84 38 C0 00 00 */ li r6, 0 -/* 8025BB88 38 80 00 00 */ li r4, 0 -/* 8025BB8C 38 00 00 80 */ li r0, 0x80 -/* 8025BB90 7C 09 03 A6 */ mtctr r0 -lbl_8025BB94: -/* 8025BB94 7C A3 32 14 */ add r5, r3, r6 -/* 8025BB98 98 85 00 05 */ stb r4, 5(r5) -/* 8025BB9C 98 85 00 85 */ stb r4, 0x85(r5) -/* 8025BBA0 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BBA4 42 00 FF F0 */ bdnz lbl_8025BB94 -/* 8025BBA8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__29dSvBit_childTbPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__29dSvBit_childTbPerfectionHIO_cFv.s deleted file mode 100644 index 5ea46c5103..0000000000 --- a/asm/d/save/d_save_HIO/__ct__29dSvBit_childTbPerfectionHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BF68: -/* 8025BF68 3C 80 80 3C */ lis r4, __vt__29dSvBit_childTbPerfectionHIO_c@ha /* 0x803C3324@ha */ -/* 8025BF6C 38 04 33 24 */ addi r0, r4, __vt__29dSvBit_childTbPerfectionHIO_c@l /* 0x803C3324@l */ -/* 8025BF70 90 03 00 00 */ stw r0, 0(r3) -/* 8025BF74 38 C0 00 00 */ li r6, 0 -/* 8025BF78 38 80 00 00 */ li r4, 0 -/* 8025BF7C 38 00 00 40 */ li r0, 0x40 -/* 8025BF80 7C 09 03 A6 */ mtctr r0 -lbl_8025BF84: -/* 8025BF84 7C A3 32 14 */ add r5, r3, r6 -/* 8025BF88 98 85 00 05 */ stb r4, 5(r5) -/* 8025BF8C 98 85 00 45 */ stb r4, 0x45(r5) -/* 8025BF90 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BF94 42 00 FF F0 */ bdnz lbl_8025BF84 -/* 8025BF98 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index a6b47e64a9..c2b017c00a 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -57,15 +57,21 @@ public: /* 80300660 */ s32 setString(char const*, ...); void setFontSize(f32 sizeX, f32 sizeY) { + f32 x; if (sizeX > 0.0f) { - sizeX = 0.0f; + x = sizeX; + } else { + x = 0.0f; } - field_0x11c = sizeX; + field_0x11c = x; + f32 y; if (sizeY > 0.0f) { - sizeY = 0.0f; + y = sizeY; + } else { + y = 0.0f; } - field_0x120 = sizeY; + field_0x120 = y; } void setFontSize(TFontSize size) { setFontSize(size.mSizeX, size.mSizeY); } diff --git a/include/d/a/d_a_itembase.h b/include/d/a/d_a_itembase.h index aa5871a8bc..9b29d6dd72 100644 --- a/include/d/a/d_a_itembase.h +++ b/include/d/a/d_a_itembase.h @@ -1,9 +1,34 @@ #ifndef D_A_D_A_ITEMBASE_H #define D_A_D_A_ITEMBASE_H +#include "SSystem/SComponent/c_phase.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "dolphin/types.h" +#include "f_op/f_op_actor.h" -class daItemBase_c { +struct daItemBase_data { + /* 0x00 */ f32 field_0x0; + /* 0x04 */ f32 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ s16 field_0x18; + /* 0x1A */ s16 field_0x1a; + /* 0x1C */ s16 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ s16 field_0x28; + /* 0x2A */ s16 field_0x2a; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ s16 field_0x34; + /* 0x36 */ s16 field_0x36; +}; + +class daItemBase_c : public fopAc_ac_c { public: u8 getItemNo(); void hide(); @@ -12,35 +37,33 @@ public: u8 chkDraw(); void dead(); u8 chkDead(); - void CreateItemHeap(char const*, s16, s16, s16, s16, s16, s16, s16); - void DeleteBase(char const*); - bool clothCreate(); - bool __CreateHeap(); - void DrawBase(); - void RotateYBase(); - void setListStart(); + int CreateItemHeap(char const*, s16, s16, s16, s16, s16, s16, s16); + int DeleteBase(char const*); void setListEnd(); - void settingBeforeDraw(); - void setTevStr(); - void setShadow(); - void animEntry(); void animPlay(f32, f32, f32, f32, f32, f32); - void chkFlag(int); - void getTevFrm(); - void getBtpFrm(); - void getShadowSize(); - void getCollisionH(); - void getCollisionR(); - void getData(); + daItemBase_data& getData(); - static u8 const m_data[56]; + virtual int DrawBase(); + virtual void setListStart(); + virtual void settingBeforeDraw(); + virtual void setTevStr(); + virtual void setShadow(); + virtual void animEntry(); + virtual void RotateYBase(); + virtual int clothCreate(); + virtual int __CreateHeap(); + virtual BOOL chkFlag(int); + virtual s8 getTevFrm(); + virtual s8 getBtpFrm(); + virtual u8 getShadowSize(); + virtual u8 getCollisionH(); + virtual u8 getCollisionR(); + + static daItemBase_data const m_data; private: -#ifdef NONMATCHING - /* 0x568 */ void* field_0x568; - /* 0x56C */ request_of_phase_process_class* field_0x56c; - /* 0x570 */ u8 field_0x578[4]; - /* 0x574 */ J3DModel* field_0x574; + /* 0x56C */ request_of_phase_process_class mPhase; + /* 0x574 */ J3DModel* mpModel; /* 0x578 */ mDoExt_btkAnm* field_0x578; /* 0x57C */ mDoExt_bpkAnm* field_0x57c; /* 0x580 */ mDoExt_brkAnm* field_0x580; @@ -54,11 +77,6 @@ private: /* 0x920 */ u8 field_0x920[0xA]; /* 0x92A */ u8 m_itemNo; /* 0x92B */ u8 field_0x92b; -#endif - - u8 unk0[0x92a]; - u8 mItemNo; - u8 unk2347; }; #endif /* D_A_D_A_ITEMBASE_H */ diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index e27e8be59f..85a78ee2d1 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -7,6 +7,7 @@ #include "d/d_attention.h" #include "d/d_drawlist.h" #include "d/d_resorce.h" +#include "d/d_simple_model.h" #include "d/d_stage.h" #include "d/d_vibration.h" #include "d/event/d_event.h" @@ -15,17 +16,9 @@ #include "d/save/d_save.h" #include "dolphin/types.h" #include "f_op/f_op_camera_mng.h" +#include "f_op/f_op_scene_mng.h" -struct dTimer_c { - /* 8025D524 */ int deleteCheck(); - /* 8025D618 */ void start(int, s16); - /* 8025D538 */ void start(int); - /* 8025D7E8 */ void stop(u8); - /* 8025D86C */ void restart(u8); - /* 8025D920 */ void end(int); - /* 8025D9E0 */ void deleteRequest(); -}; - +class dTimer_c; class __d_timer_info_c { public: __d_timer_info_c() { @@ -43,8 +36,13 @@ public: class phaseParam_c { public: - /* 0x0 */ char* field_0x0; - /* 0x4 */ JKRHeap* heap; + phaseParam_c(const char* name, JKRHeap* heap) { + mResName = name; + mpHeap = heap; + } + + /* 0x0 */ const char* mResName; + /* 0x4 */ JKRHeap* mpHeap; }; class dComIfG_camera_info_class { @@ -66,6 +64,18 @@ public: }; STATIC_ASSERT(sizeof(dComIfG_camera_info_class) == 0x38); +class dComIfG_resLoader_c { +public: + /* 8002F314 */ dComIfG_resLoader_c(); + /* 8002F328 */ ~dComIfG_resLoader_c(); + /* 8002F3B4 */ int load(char const**, JKRHeap*); + +private: + /* 0x0 */ const char** field_0x0; + /* 0x4 */ request_of_phase_process_class field_0x4; + /* 0xC */ u8 field_0xc; +}; + enum PlayerPtr { LINK_PTR, HORSE_PTR }; class daHorse_c; @@ -79,138 +89,58 @@ public: void ct(); void init(); void itemInit(); - void setItemBombNumCount(u8, s16); - s16 getItemBombNumCount(u8); - void clearItemBombNumCount(u8); - void setNowVibration(u8); + void setItemBombNumCount(u8 i_item, s16 count); + s16 getItemBombNumCount(u8 i_item); + void clearItemBombNumCount(u8 i_item); + void setNowVibration(u8 vib_status); u32 getNowVibration(); - void setStartStage(dStage_startStage_c*); - static int getLayerNo_common_common(char const*, int, int); - static int getLayerNo_common(char const*, int, int); + void setStartStage(dStage_startStage_c* p_startStage); + static int getLayerNo_common_common(char const* stageName, int roomId, int layer); + static int getLayerNo_common(char const* stageName, int roomId, int layer); static int getLayerNo(int); void createParticle(); - u32 createSimpleModel(); + dSmplMdl_draw_c* createSimpleModel(); void deleteSimpleModel(); void drawSimpleModel(); - u32 addSimpleModel(J3DModelData*, int, u8); - u32 removeSimpleModel(J3DModelData*, int); - u32 entrySimpleModel(J3DModel*, int); - void setTimerNowTimeMs(int); + int addSimpleModel(J3DModelData* i_modelData, int roomNo, u8 drawBG); + int removeSimpleModel(J3DModelData* i_modelData, int roomNo); + void entrySimpleModel(J3DModel* i_model, int roomNo); + void setTimerNowTimeMs(int time); int getTimerNowTimeMs(); - void setTimerLimitTimeMs(int); + void setTimerLimitTimeMs(int time); int getTimerLimitTimeMs(); - void setTimerMode(int); + void setTimerMode(int mode); int getTimerMode(); - void setTimerType(u8); + void setTimerType(u8 type); u8 getTimerType(); - void setTimerPtr(dTimer_c*); + void setTimerPtr(dTimer_c* ptr); dTimer_c* getTimerPtr(); - void setWarpItemData(const char*, cXyz, s16, s8, u8, u8); + void setWarpItemData(const char* stage, cXyz pos, s16 angle, s8 roomNo, u8, u8); ~dComIfG_play_c() {} - // inlines - bool& isPauseFlag() { return mPauseFlag; } dMsgObject_c* getMsgObjectClass() { return mMsgObjectClass; } dStage_roomControl_c* getRoomControl() { return &mRoomControl; } dStage_stageDt_c& getStage() { return mStageData; } dEvt_control_c& getEvent() { return mEvent; } daHorse_c* getHorseActor() { return (daHorse_c*)mPlayerPtr[1]; } - u8& getItemLifeCountType() { return mItemLifeCountType; } + J2DGrafContext* getCurrentGrafPort() { return mCurrentGrafPort; } + dVibration_c& getVibration() { return mVibration; } + camera_class* getCamera(int idx) { return mCameraInfo[idx].mCamera; } + void* getPlayerPtr(int ptrIdx) { return mPlayerPtr[ptrIdx]; } + void* getPlayer(int idx) { return mPlayer[idx]; } + dPa_control_c* getParticle() { return mParticle; } + dEvent_manager_c& getEvtManager() { return mEvtManager; } + dAttention_c& getAttention() { return mAttention; } + dStage_startStage_c* getStartStage() { return &mStartStage; } + + void setSelectItem(int idx, u8 itemId) { mSelectItem[idx] = itemId; } + u8 getSelectItem(int idx) { return mSelectItem[idx]; } + void setSelectEquip(int idx, u8 item_id) { mSelectEquip[idx] = item_id; } void setItem(u8 slot, u8 i_no) { mItemSlot = slot; mItemID = i_no; } - void setSelectItem(int idx, u8 itemId) { mSelectItem[idx] = itemId; } - - void setSelectEquip(int idx, u8 item_id) { mSelectEquip[idx] = item_id; } - - u8 getSelectItem(int idx) { return mSelectItem[idx]; } - - void setZStatus(u8 status, u8 flag) { - mZStatus = status; - mZSetFlag = flag; - } - void setRStatus(u8 status, u8 flag) { - mRStatus = status; - mRSetFlag = flag; - } - void setDoStatus(u8 status, u8 flag) { - mDoStatus = status; - mDoSetFlag = flag; - } - void setAStatus(u8 status, u8 flag) { - mAStatus = status; - mASetFlag = flag; - } - void setXStatus(u8 status, u8 flag) { - mXStatus = status; - mXSetFlag = flag; - } - void setYStatus(u8 status, u8 flag) { - mYStatus = status; - mYSetFlag = flag; - } - void setBottleStatus(u8 status, u8 flag) { - mBottleStatus = status; - mBottleSetFlag = flag; - } - void setNunStatus(u8 status, u8 param_1, u8 flag) { - mNunStatus = status; - field_0x4ef0 = param_1; - mNunSetFlag = flag; - } - void setRemoConStatus(u8 status, u8 param_1, u8 flag) { - mRemoConStatus = status; - field_0x4ef2 = param_1; - mRemoConSetFlag = flag; - } - void setNunZStatus(u8 status, u8 flag) { - mNunZStatus = status; - mNunZSetFlag = flag; - } - void setNunCStatus(u8 status, u8 flag) { - mNunCStatus = status; - mNunCSetFlag = flag; - } - void setCStickStatus(u8 status, u8 param_1, u8 flag) { - mCStickStatus = status; - mCStickDirection = param_1; - mCStickSetFlag = flag; - } - void setCStickStatusForce(u8 status, u8 param_1, u8 flag) { - mCStickStatusForce = status; - mCStickDirectionForce = param_1; - mCStickSetFlagForce = flag; - } - void setSButtonStatus(u8 status, u8 flag) { - mSButtonStatus = status; - mSButtonSetFlag = flag; - } - void setSButtonStatusForce(u8 status, u8 flag) { - mSButtonStatusForce = status; - mSButtonSetFlagForce = flag; - } - void setItemLifeCount(float hearts, u8 type) { - mItemLifeCount += hearts; - mItemLifeCountType = type; - } - void setItemRupeeCount(int rupees) { mItemRupeeCount += rupees; } - void setItemMagicCount(s16 magic) { mItemMagicCount += magic; } - void setItemMaxMagicCount(s16 max) { mItemMaxMagicCount += max; } - void setItemArrowNumCount(s16 arrows) { mItemArrowNumCount += arrows; } - void setItemPachinkoNumCount(s16 seeds) { mItemPachinkoNumCount += seeds; } - void setItemKeyNumCount(s16 keys) { mItemKeyNumCount += keys; } - void setItemMaxLifeCount(s16 max) { mItemMaxLifeCount += max; } - void setOxygen(int oxygen) { mOxygen = oxygen; } - void setNowOxygen(s32 oxygen) { mNowOxygen = oxygen; } - int getOxygen() { return mOxygen; } - int getMaxOxygen() { return mMaxOxygen; } - void setMaxOxygen(int max) { mMaxOxygen = max; } - void setItemNowLife(u16 life) { mItemNowLife = life; } - void setItemNowMagic(s16 magic) { mItemNowMagicCount = magic; } - void setItemNowOil(s32 oil) { mItemNowOil = oil; } - u8 getNeedLightDropNum() { return mNeedLightDropNum; } u8 getDoStatus() { return mDoStatus; } u8 getRStatus() { return mRStatus; } u8 getAStatus() { return mAStatus; } @@ -225,71 +155,118 @@ public: u8 getNunZStatus() { return mNunZStatus; } u8 getNunCStatus() { return mNunCStatus; } u8 getBottleStatus() { return mBottleStatus; } - bool isDoSetFlag(u8 flag) { return flag & mDoSetFlag; } - bool isASetFlag(u8 flag) { return flag & mASetFlag; } - bool isRSetFlag(u8 flag) { return flag & mRSetFlag; } - bool isXSetFlag(u8 flag) { return flag & mXSetFlag; } - bool isYSetFlag(u8 flag) { return flag & mYSetFlag; } - const char* getStartStageName() { return mStartStage.getName(); } - s8 getStartStageRoomNo() { return mStartStage.getRoomNo(); } - s8 getStartStageLayer() { return mStartStage.getLayer(); } - const char* getNextStageName() { return mNextStage.getName(); } - dStage_startStage_c* getNextStartStage() { return &mNextStage; } - s8 getNextStageRoomNo() { return mNextStage.getRoomNo(); } - s8 getNextStageLayer() { return mNextStage.getLayer(); } - u8 isHeapLockFlag() { return mHeapLockFlag; } - void setHeapLockFlag(u8 status) { mHeapLockFlag = status; } - void setSubHeapLockFlag(int idx, u8 status) { mSubHeapLockFlag[idx] = status; } - u8 getSubHeapLockFlag(int idx) { return mSubHeapLockFlag[idx]; } - void offHeapLockFlag() { mHeapLockFlag = 0; } - JKRExpHeap* getSubExpHeap2D(int idx) { return mSubExpHeap2D[idx]; } - void setSubExpHeap2D(int idx, void* heap) { mSubExpHeap2D[idx] = (JKRExpHeap*)heap; } - void offEnableNextStage() { mNextStage.offEnable(); } - JKRExpHeap* getExpHeap2D() { return mExpHeap2D; } - dEvent_manager_c& getEvtManager() { return mEvtManager; } - dAttention_c& getAttention() { return mAttention; } - JKRArchive* getMsgDtArchive(int idx) { return mMsgDtArchive[idx]; } - s16 getStartStagePoint() { return mStartStage.getPoint(); } - s8 getStartStageDarkArea() { return mStartStage.getDarkArea(); } - void setStartStageDarkArea(s8 darkArea) { mStartStage.setDarkArea(darkArea); } - void setStartStageLayer(s8 layer) { mStartStage.setLayer(layer); } - s16 getNextStagePoint() { return mNextStage.getPoint(); } - s8 getNextStageWipe() { return mNextStage.getWipe(); } - bool isEnableNextStage() { return mNextStage.isEnable(); } - void* getPlayerPtr(int ptrIdx) { return mPlayerPtr[ptrIdx]; } - void* getPlayer(int idx) { return mPlayer[idx]; } - JKRArchive* getMain2DArchive() { return mMain2DArchive; } - JKRArchive* getAnmArchive() { return mAnmArchive; } - JKRArchive* getCollectResArchive() { return mCollectResArchive; } - JKRArchive* getItemIconArchive() { return mItemIconArchive; } - JKRExpHeap* getMsgExpHeap() { return mMsgExpHeap; } - J2DGrafContext* getCurrentGrafPort() { return mCurrentGrafPort; } - dVibration_c& getVibration() { return mVibration; } - void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] |= flag; } - void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] &= ~flag; } - bool checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[i]; } - BOOL checkCameraAttentionStatus(int i, u32 flag) { - return mCameraInfo[i].mCameraAttentionStatus & flag; - } - s8 getPlayerCameraID(int i) { return mPlayerCameraID[i]; } - dPa_control_c* getParticle() { return mParticle; } - void set3DStatus(u8 status, u8 direction, u8 flag) { - m3DStatus = status; - m3DDirection = direction; - m3DSetFlag = flag; - } - void offPauseFlag() { mPauseFlag = false; } - camera_class* getCamera(int idx) { return mCameraInfo[idx].mCamera; } - s32 checkStatus(u16 flags) { return flags & mStatus; } - s16 getItemPachinkoNumCount() { return mItemPachinkoNumCount; } - void clearItemPachinkoNumCount() { mItemPachinkoNumCount = 0; } u8 getSButtonStatusForce() { return mSButtonStatusForce; } u8 getSButtonSetFlagForce() { return mSButtonSetFlagForce; } u8 getCStickStatusForce() { return mCStickStatusForce; } u8 getCStickSetFlagForce() { return mCStickSetFlagForce; } u8 getCStickDirectionForce() { return mCStickDirectionForce; } bool isCStickSetFlag(u8 flag) { return mCStickSetFlag & flag; } - void show2dOn() { mShow2D = 1; } + bool isDoSetFlag(u8 flag) { return flag & mDoSetFlag; } + bool isASetFlag(u8 flag) { return flag & mASetFlag; } + bool isRSetFlag(u8 flag) { return flag & mRSetFlag; } + bool isXSetFlag(u8 flag) { return flag & mXSetFlag; } + bool isYSetFlag(u8 flag) { return flag & mYSetFlag; } + + void setZStatus(u8 status, u8 flag) { + mZStatus = status; + mZSetFlag = flag; + } + + void setRStatus(u8 status, u8 flag) { + mRStatus = status; + mRSetFlag = flag; + } + + void setDoStatus(u8 status, u8 flag) { + mDoStatus = status; + mDoSetFlag = flag; + } + + void setAStatus(u8 status, u8 flag) { + mAStatus = status; + mASetFlag = flag; + } + + void setXStatus(u8 status, u8 flag) { + mXStatus = status; + mXSetFlag = flag; + } + + void setYStatus(u8 status, u8 flag) { + mYStatus = status; + mYSetFlag = flag; + } + + void setBottleStatus(u8 status, u8 flag) { + mBottleStatus = status; + mBottleSetFlag = flag; + } + + void setNunStatus(u8 status, u8 param_1, u8 flag) { + mNunStatus = status; + field_0x4ef0 = param_1; + mNunSetFlag = flag; + } + + void setRemoConStatus(u8 status, u8 param_1, u8 flag) { + mRemoConStatus = status; + field_0x4ef2 = param_1; + mRemoConSetFlag = flag; + } + + void setNunZStatus(u8 status, u8 flag) { + mNunZStatus = status; + mNunZSetFlag = flag; + } + + void setNunCStatus(u8 status, u8 flag) { + mNunCStatus = status; + mNunCSetFlag = flag; + } + + void setCStickStatus(u8 status, u8 param_1, u8 flag) { + mCStickStatus = status; + mCStickDirection = param_1; + mCStickSetFlag = flag; + } + + void setCStickStatusForce(u8 status, u8 param_1, u8 flag) { + mCStickStatusForce = status; + mCStickDirectionForce = param_1; + mCStickSetFlagForce = flag; + } + + void setSButtonStatus(u8 status, u8 flag) { + mSButtonStatus = status; + mSButtonSetFlag = flag; + } + + void setSButtonStatusForce(u8 status, u8 flag) { + mSButtonStatusForce = status; + mSButtonSetFlagForce = flag; + } + + void set3DStatus(u8 status, u8 direction, u8 flag) { + m3DStatus = status; + m3DDirection = direction; + m3DSetFlag = flag; + } + + void setItemRupeeCount(int rupees) { mItemRupeeCount += rupees; } + void setItemMagicCount(s16 magic) { mItemMagicCount += magic; } + void setItemMaxMagicCount(s16 max) { mItemMaxMagicCount += max; } + void setItemArrowNumCount(s16 arrows) { mItemArrowNumCount += arrows; } + void setItemPachinkoNumCount(s16 seeds) { mItemPachinkoNumCount += seeds; } + void setItemKeyNumCount(s16 keys) { mItemKeyNumCount += keys; } + void setItemMaxLifeCount(s16 max) { mItemMaxLifeCount += max; } + void setOxygen(int oxygen) { mOxygen = oxygen; } + void setNowOxygen(s32 oxygen) { mNowOxygen = oxygen; } + int getOxygen() { return mOxygen; } + void setMaxOxygen(int max) { mMaxOxygen = max; } + int getMaxOxygen() { return mMaxOxygen; } + void setItemNowLife(u16 life) { mItemNowLife = life; } + void setItemNowMagic(s16 magic) { mItemNowMagicCount = magic; } + void setItemNowOil(s32 oil) { mItemNowOil = oil; } s16 getItemMaxLifeCount() { return mItemMaxLifeCount; } f32 getItemLifeCount() { return mItemLifeCount; } void clearItemMaxLifeCount() { mItemMaxLifeCount = 0; } @@ -297,13 +274,77 @@ public: mItemLifeCount = 0.0f; mItemLifeCountType = 0; } + + void setItemLifeCount(f32 hearts, u8 type) { + mItemLifeCount += hearts; + mItemLifeCountType = type; + } + + u8& getItemLifeCountType() { return mItemLifeCountType; } + s16 getItemPachinkoNumCount() { return mItemPachinkoNumCount; } + void clearItemPachinkoNumCount() { mItemPachinkoNumCount = 0; } + u8 getNeedLightDropNum() { return mNeedLightDropNum; } + + const char* getStartStageName() { return mStartStage.getName(); } + s8 getStartStageRoomNo() { return mStartStage.getRoomNo(); } + s8 getStartStageLayer() { return mStartStage.getLayer(); } + s16 getStartStagePoint() { return mStartStage.getPoint(); } + s8 getStartStageDarkArea() { return mStartStage.getDarkArea(); } + void setStartStageDarkArea(s8 darkArea) { mStartStage.setDarkArea(darkArea); } + void setStartStageLayer(s8 layer) { mStartStage.setLayer(layer); } + + const char* getNextStageName() { return mNextStage.getName(); } + dStage_startStage_c* getNextStartStage() { return &mNextStage; } + s8 getNextStageRoomNo() { return mNextStage.getRoomNo(); } + s8 getNextStageLayer() { return mNextStage.getLayer(); } + s16 getNextStagePoint() { return mNextStage.getPoint(); } + s8 getNextStageWipe() { return mNextStage.getWipe(); } + bool isEnableNextStage() { return mNextStage.isEnable(); } + void offEnableNextStage() { mNextStage.offEnable(); } + void setNextStage(const char* stage, s8 roomNo, s16 point, s8 layer, s8 wipe, u8 wipe_speed) { + mNextStage.set(stage, roomNo, point, layer, wipe, wipe_speed); + } + + u8 isHeapLockFlag() { return mHeapLockFlag; } + void setHeapLockFlag(u8 status) { mHeapLockFlag = status; } + void setSubHeapLockFlag(int idx, u8 status) { mSubHeapLockFlag[idx] = status; } + u8 getSubHeapLockFlag(int idx) { return mSubHeapLockFlag[idx]; } + void offHeapLockFlag() { mHeapLockFlag = 0; } + + JKRExpHeap* getExpHeap2D() { return mExpHeap2D; } + JKRExpHeap* getMsgExpHeap() { return mMsgExpHeap; } + JKRExpHeap* getSubExpHeap2D(int idx) { return mSubExpHeap2D[idx]; } + void setSubExpHeap2D(int idx, void* heap) { mSubExpHeap2D[idx] = (JKRExpHeap*)heap; } + + JKRArchive* getMsgDtArchive(int idx) { return mMsgDtArchive[idx]; } + JKRArchive* getMain2DArchive() { return mMain2DArchive; } + JKRArchive* getAnmArchive() { return mAnmArchive; } + JKRArchive* getCollectResArchive() { return mCollectResArchive; } + JKRArchive* getItemIconArchive() { return mItemIconArchive; } + JKRAramArchive* getFieldMapArchive2() { return mFieldMapArchive2; } + + void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] |= flag; } + void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] &= ~flag; } + bool checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[i]; } + + s8 getPlayerCameraID(int i) { return mPlayerCameraID[i]; } void setCameraParamFileName(int i, char* name) { mCameraInfo[i].mCameraParamFileName = name; } - s8 getLayerOld() { return mLayerOld; } + const char* getCameraParamFileName(int i) { return mCameraInfo[i].mCameraParamFileName; } + BOOL checkCameraAttentionStatus(int i, u32 flag) { + return mCameraInfo[i].mCameraAttentionStatus & flag; + } + void setStatus(u16 status) { mStatus = status; } + s32 checkStatus(u16 flags) { return flags & mStatus; } + + bool& isPauseFlag() { return mPauseFlag; } + void offPauseFlag() { mPauseFlag = false; } + void show2dOn() { mShow2D = 1; } + s8 getLayerOld() { return mLayerOld; } public: - /* 0x00000 */ dBgS mDBgS; - /* 0x01404 */ dCcS mDCcS; + /* 0x00000 */ dBgS mBgs; + /* 0x01404 */ dCcS mCcs; /* 0x03EC8 */ dStage_startStage_c mStartStage; /* 0x03ED6 */ dStage_nextStage_c mNextStage; /* 0x03EE8 */ dStage_stageDt_c mStageData; @@ -313,7 +354,7 @@ public: /* 0x04780 */ dAttention_c mAttention; /* 0x04C9C */ dVibration_c mVibration; /* 0x04D2C */ u8 field_0x4d2c[4]; - /* 0x04D30 */ JKRArchive* mFieldMapArchive2; + /* 0x04D30 */ JKRAramArchive* mFieldMapArchive2; /* 0x04D34 */ JKRArchive* mMsgArchive[11]; /* 0x04D60 */ JKRArchive* mDemoMsgArchive; /* 0x04D64 */ JKRArchive* mMeterButtonArchive; @@ -340,7 +381,7 @@ public: /* 0x04DF8 */ JKRArchive* mMain2DArchive; /* 0x04DFC */ void* field_0x4dfc[2]; /* 0x04E04 */ dPa_control_c* mParticle; - /* 0x04E08 */ void* mSimpleModel; + /* 0x04E08 */ dSmplMdl_draw_c* mSimpleModel; /* 0x04E0C */ u8 mWindowNum; /* 0x04E0D */ s8 mLayerOld; /* 0x04E0E */ u16 mStatus; @@ -350,7 +391,7 @@ public: /* 0x04E78 */ s8 mPlayerCameraID[4]; /* 0x04E7C */ void* mPlayerPtr[2]; // 0: Player, 1: Horse ; type may be wrong /* 0x04E84 */ dMsgObject_c* mMsgObjectClass; - /* 0x04E88 */ float mItemLifeCount; + /* 0x04E88 */ f32 mItemLifeCount; /* 0x04E8C */ int mItemRupeeCount; /* 0x04E90 */ s16 mItemKeyNumCount; /* 0x04E92 */ s16 mItemMaxLifeCount; @@ -489,10 +530,10 @@ public: /* 0x04F84 */ JKRExpHeap* mExpHeap2D; /* 0x04F88 */ JKRExpHeap* mSubExpHeap2D[2]; /* 0x04F90 */ JKRExpHeap* mMsgExpHeap; - /* 0x04F94 */ char field_0x4F94[8]; // related to setWarpItemData - /* 0x04F9C */ cXyz field_0x4f9c; // related to setWarpItemData - /* 0x04FA8 */ s16 field_0x4fa8; - /* 0x04FAA */ s8 field_0x4faa; // related to setWarpItemData + /* 0x04F94 */ char mWarpItemStage[8]; + /* 0x04F9C */ cXyz mWarpItemPos; + /* 0x04FA8 */ s16 mWarpItemAngle; + /* 0x04FAA */ s8 mWarpItemRoom; /* 0x04FAB */ u8 field_0x4fab; // related to setWarpItemData /* 0x04FAC */ u8 field_0x4fac; // related to setWarpItemData /* 0x04FAD */ u8 field_0x4fad[3]; @@ -550,105 +591,116 @@ public: STATIC_ASSERT(122384 == sizeof(dComIfG_inf_c)); extern dComIfG_inf_c g_dComIfG_gameInfo; - extern GXColor g_blackColor; extern GXColor g_clearColor; extern GXColor g_whiteColor; -void dComIfGp_setItemLifeCount(float, u8); -void dComIfGp_setItemRupeeCount(long); -int dComIfGs_isItemFirstBit(u8); -u16 dComIfGs_getRupee(); -void dComIfGp_setSelectItem(int); -u8 dComIfGs_getMixItemIndex(int); -void dComIfGs_setSelectItemIndex(int, u8); -void dComIfGs_setMixItemIndex(int, u8); -u8 dComIfGs_getBottleMax(); -u8 dComIfGs_checkGetItem(u8); -void dComIfGs_setSelectEquipClothes(u8); -void dComIfG_get_timelayer(int*); -s32 dComIfGp_offHeapLockFlag(int); -void dComIfGp_createSubExpHeap2D(); -void dComIfGp_destroySubExpHeap2D(); -int dComIfGp_checkEmptySubHeap2D(); -int dComIfGp_searchUseSubHeap2D(int); -void dComIfGs_setLastWarpMarkItemData(const char*, cXyz, s16, s8, u8, u8); -u16 dComIfGs_getMaxLifeGauge(); -void dComIfGs_setWarpMarkFlag(u8); -void dComIfGs_setSelectEquipSword(u8); -void dComIfGs_setSelectEquipShield(u8); -void* dComIfG_getStageRes(char const*); int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn, void*); -void dComIfGp_addSelectItemNum(int, s16); -BOOL dComIfGs_isOneZoneSwitch(int, int); -u8 dComIfGp_getSelectItem(int); -u8 dComIfGp_TargetWarpPt_get(); -void dComIfGp_TargetWarpPt_set(u8); -BOOL dComIfGp_TransportWarp_check(); -void dComIfGp_setNextStage(char const*, s16, s8, s8, f32, u32, int, s8, s16, int, int); +BOOL dComIfG_resetToOpening(scene_class* scene); +char* dComIfG_getRoomArcName(int roomNo); +void* dComIfG_getStageRes(char const* resName); +void* dComIfG_getOldStageRes(char const* resName); +void dComIfG_get_timelayer(int* layer); +int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resName); + +inline void dComIfG_setBrightness(u8 brightness) { + g_dComIfG_gameInfo.mFadeBrightness = brightness; +} + +inline int dComIfG_getTimerMode() { + return g_dComIfG_gameInfo.play.getTimerMode(); +} + +inline dTimer_c* dComIfG_getTimerPtr() { + return g_dComIfG_gameInfo.play.getTimerPtr(); +} + +inline int dComIfG_setObjectRes(const char* name, u8 param_1, JKRHeap* heap) { + return g_dComIfG_gameInfo.mResControl.setObjectRes(name, param_1, heap); +} + +inline int dComIfG_setStageRes(const char* name, JKRHeap* heap) { + return g_dComIfG_gameInfo.mResControl.setStageRes(name, heap); +} + +inline int dComIfG_syncObjectRes(const char* name) { + return g_dComIfG_gameInfo.mResControl.syncObjectRes(name); +} + +inline int dComIfG_syncStageRes(const char* name) { + return g_dComIfG_gameInfo.mResControl.syncStageRes(name); +} + +inline int dComIfG_deleteObjectResMain(const char* res) { + return g_dComIfG_gameInfo.mResControl.deleteObjectRes(res); +} + +inline int dComIfG_deleteStageRes(const char* res) { + return g_dComIfG_gameInfo.mResControl.deleteStageRes(res); +} + +inline void* dComIfG_getStageRes(const char* arcName, const char* resName) { + return g_dComIfG_gameInfo.mResControl.getStageRes(arcName, resName); +} + +inline void* dComIfG_getObjectRes(const char* arcName, const char* resName) { + return g_dComIfG_gameInfo.mResControl.getObjectRes(arcName, resName); +} + +inline void* dComIfG_getObjectRes(const char* arcName, int param_1) { + return g_dComIfG_gameInfo.mResControl.getObjectRes(arcName, param_1); +} + +inline dBgS& dComIfG_Bgsp() { + return g_dComIfG_gameInfo.play.mBgs; +} + +inline dCcS* dComIfG_Ccsp() { + return &g_dComIfG_gameInfo.play.mCcs; +} + +inline dRes_info_c* dComIfG_getObjectResInfo(const char* arc_name) { + return g_dComIfG_gameInfo.mResControl.getObjectResInfo(arc_name); +} + +inline dRes_info_c* dComIfG_getStageResInfo(const char* arc_name) { + return g_dComIfG_gameInfo.mResControl.getStageResInfo(arc_name); +} + +inline int dComIfG_syncAllObjectRes() { + return g_dComIfG_gameInfo.mResControl.syncAllObjectRes(); +} + +inline void* dComIfG_getObjectIDRes(const char* arc_name, u16 id) { + return g_dComIfG_gameInfo.mResControl.getObjectIDRes(arc_name, id); +} + +inline u8 dComIfG_getBrightness() { + return g_dComIfG_gameInfo.mFadeBrightness; +} + +u8 dComIfGs_getMixItemIndex(int i_no); +void dComIfGs_setSelectItemIndex(int i_no, u8 item_index); +void dComIfGs_setMixItemIndex(int i_no, u8 item_index); +u8 dComIfGs_getBottleMax(); +u8 dComIfGs_checkGetItem(u8 i_itemNo); +void dComIfGs_setSelectEquipClothes(u8 i_itemNo); +void dComIfGs_setKeyNum(int i_stageNo, u8 keyNum); +void dComIfGs_BossLife_public_Set(s8); +s8 dComIfGs_sense_type_change_Get(); cXyz& dComIfGs_getWarpPlayerPos(); const char* dComIfGs_getWarpStageName(); s16 dComIfGs_getWarpPlayerAngleY(); s8 dComIfGs_getWarpRoomNo(); -char* dComIfG_getRoomArcName(int); -int dComIfGp_getSelectItemNum(int); -int dComIfGp_getSelectItemMaxNum(int); -void dComIfGp_mapShow(); -void dComIfGp_mapHide(); -bool dComIfGp_checkMapShow(); -s32 dComIfGp_setHeapLockFlag(u8); -s8 dComIfGs_sense_type_change_Get(); -u8 dComIfGp_world_dark_get(); -JKRExpHeap* dComIfGp_getSubHeap2D(int); -void dComIfGp_world_dark_set(u8); -void dComIfGs_BossLife_public_Set(s8); - -class scene_class; -BOOL dComIfG_resetToOpening(scene_class*); - -inline void dComIfGp_setRStatus(u8 status, u8 flag) { - g_dComIfG_gameInfo.play.setRStatus(status, flag); -} - -inline void dComIfGp_setDoStatus(u8 status, u8 flag) { - g_dComIfG_gameInfo.play.setDoStatus(status, flag); -} - -inline void dComIfGp_setAStatus(u8 status, u8 flag) { - g_dComIfG_gameInfo.play.setAStatus(status, flag); -} - -inline void dComIfGp_setZStatus(u8 status, u8 flag) { - g_dComIfG_gameInfo.play.setZStatus(status, flag); -} - -inline void dComIfGp_setItemMagicCount(s16 amount) { - g_dComIfG_gameInfo.play.setItemMagicCount(amount); -} - -inline void dComIfGp_setItemMaxMagicCount(s16 max) { - g_dComIfG_gameInfo.play.setItemMaxMagicCount(max); -} - -inline void dComIfGp_setItemArrowNumCount(s16 amount) { - g_dComIfG_gameInfo.play.setItemArrowNumCount(amount); -} - -inline void dComIfGp_setItemPachinkoNumCount(s16 amount) { - g_dComIfG_gameInfo.play.setItemPachinkoNumCount(amount); -} - -inline void dComIfGp_setItemBombNumCount(u8 param_0, s16 amount) { - g_dComIfG_gameInfo.play.setItemBombNumCount(param_0, amount); -} - -inline void dComIfGp_setItemKeyNumCount(s16 amount) { - g_dComIfG_gameInfo.play.setItemKeyNumCount(amount); -} - -inline void dComIfGp_setItemMaxLifeCount(s16 max) { - g_dComIfG_gameInfo.play.setItemMaxLifeCount(max); -} +BOOL dComIfGs_isOneZoneSwitch(int swBit, int roomNo); +void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 roomNo, u8, u8); +u16 dComIfGs_getMaxLifeGauge(); +void dComIfGs_setWarpMarkFlag(u8); +void dComIfGs_setSelectEquipSword(u8 i_itemNo); +void dComIfGs_setSelectEquipShield(u8 i_itemNo); +int dComIfGs_isItemFirstBit(u8 i_itemNo); +u16 dComIfGs_getRupee(); +BOOL dComIfGs_isVisitedRoom(int i_roomNo); inline void dComIfGs_onDungeonItemMap() { g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemMap(); @@ -726,8 +778,8 @@ inline void dComIfGs_setRodTypeLevelUp() { g_dComIfG_gameInfo.info.getPlayer().getItem().setRodTypeLevelUp(); } -inline void dComIfGs_setArrowNum(u8 amount) { - g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setArrowNum(amount); +inline void dComIfGs_setArrowNum(u8 num) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setArrowNum(num); } inline void dComIfGs_setArrowMax(u8 max) { @@ -742,48 +794,48 @@ inline void dComIfGs_setEmptyBombBag() { g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag(); } -inline void dComIfGs_setEmptyBombBag(u8 type, u8 amount) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag(type, amount); +inline void dComIfGs_setEmptyBombBag(u8 newBomb, u8 bombNum) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag(newBomb, bombNum); } -inline void dComIfGs_setEmptyBombBagItemIn(u8 type, bool unk) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(type, unk); +inline void dComIfGs_setEmptyBombBagItemIn(u8 newBomb, bool setNum) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(newBomb, setNum); } inline void dComIfGs_setEmptyBottle() { g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottle(); } -inline void dComIfGs_setEmptyBottle(u8 type) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottle(type); +inline void dComIfGs_setEmptyBottle(u8 i_itemNo) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottle(i_itemNo); } -inline void dComIfGs_setEmptyBottleItemIn(u8 type) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottleItemIn(type); +inline void dComIfGs_setEmptyBottleItemIn(u8 i_itemNo) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottleItemIn(i_itemNo); } -inline void dComIfGs_setBottleNum(u8 param_0, u8 param_1) { - g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBottleNum(param_0, param_1); +inline void dComIfGs_setBottleNum(u8 i_bottleIdx, u8 bottle_num) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBottleNum(i_bottleIdx, bottle_num); } inline void dComIfGs_onEventBit(u16 id) { g_dComIfG_gameInfo.info.getSavedata().getEvent().onEventBit(id); } -inline void dComIfGs_onLightDropFlag(u8 area_id) { - g_dComIfG_gameInfo.info.getPlayer().getLightDrop().onLightDropGetFlag(area_id); +inline void dComIfGs_onLightDropFlag(u8 i_nowLevel) { + g_dComIfG_gameInfo.info.getPlayer().getLightDrop().onLightDropGetFlag(i_nowLevel); } -inline void dComIfGs_onSwitch(int param1, int param2) { - g_dComIfG_gameInfo.info.onSwitch(param1, param2); +inline void dComIfGs_onSwitch(int i_no, int i_roomNo) { + g_dComIfG_gameInfo.info.onSwitch(i_no, i_roomNo); } -inline void dComIfGs_offSwitch(int param1, int param2) { - g_dComIfG_gameInfo.info.offSwitch(param1, param2); +inline void dComIfGs_offSwitch(int i_no, int i_roomNo) { + g_dComIfG_gameInfo.info.offSwitch(i_no, i_roomNo); } -inline BOOL dComIfGs_isSwitch(int param1, int param2) { - return g_dComIfG_gameInfo.info.isSwitch(param1, param2); +inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo) { + return g_dComIfG_gameInfo.info.isSwitch(i_no, i_roomNo); } inline s32 dComIfGs_isDungeonItemMap() { @@ -798,8 +850,8 @@ inline s32 dComIfGs_isDungeonItemBossKey() { return g_dComIfG_gameInfo.info.getMemory().getBit().isDungeonItemBossKey(); } -inline u8 dComIfGs_getItem(int slot, bool unk) { - return g_dComIfG_gameInfo.info.getPlayer().getItem().getItem(slot, unk); +inline u8 dComIfGs_getItem(int slot_no, bool check_combo) { + return g_dComIfG_gameInfo.info.getPlayer().getItem().getItem(slot_no, check_combo); } inline BOOL dComIfGs_isCollectSword(u8 sword_id) { @@ -811,12 +863,12 @@ inline BOOL dComIfGs_isCollectClothing(u8 clothing_id) { clothing_id); } -inline u8 dComIfGs_checkBottle(u8 type) { - return g_dComIfG_gameInfo.info.getPlayer().getItem().checkBottle(type); +inline u8 dComIfGs_checkBottle(u8 i_itemNo) { + return g_dComIfG_gameInfo.info.getPlayer().getItem().checkBottle(i_itemNo); } -inline BOOL dComIfGs_isLightDropGetFlag(u8 area_id) { - return g_dComIfG_gameInfo.info.getPlayer().getLightDrop().isLightDropGetFlag(area_id); +inline BOOL dComIfGs_isLightDropGetFlag(u8 i_nowLevel) { + return g_dComIfG_gameInfo.info.getPlayer().getLightDrop().isLightDropGetFlag(i_nowLevel); } inline u8 dComIfGs_getArrowMax() { @@ -835,8 +887,8 @@ inline u8 dComIfGs_getKeyNum() { return g_dComIfG_gameInfo.info.getMemory().getBit().getKeyNum(); } -inline void dComIfGs_onItemFirstBit(u8 i_no) { - g_dComIfG_gameInfo.info.getPlayer().getGetItem().onFirstBit(i_no); +inline void dComIfGs_onItemFirstBit(u8 i_itemNo) { + g_dComIfG_gameInfo.info.getPlayer().getGetItem().onFirstBit(i_itemNo); } inline u16 dComIfGs_getMaxLife() { @@ -847,15 +899,11 @@ inline void dComIfGs_offEventBit(u16 event) { g_dComIfG_gameInfo.info.getSavedata().getEvent().offEventBit(event); } -// inline int dComIfGs_isEventBit__FUs(u16 event) { -// return g_dComIfG_gameInfo.getSaveFile().getTmp().isEventBit(event); -// } - inline const char* dComIfGs_getLastWarpMarkStageName() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getName(); } -inline cXyz dComIfGs_getLastWarpMarkPlayerPos() { +inline cXyz& dComIfGs_getLastWarpMarkPlayerPos() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getPos(); } @@ -883,90 +931,18 @@ inline u8 dComIfGs_getSelectEquipShield() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectEquip(COLLECT_SHIELD); } -inline u8 dComIfGs_getLightDropNum(u8 area_id) { - return g_dComIfG_gameInfo.info.getPlayer().getLightDrop().getLightDropNum(area_id); +inline u8 dComIfGs_getLightDropNum(u8 i_nowLevel) { + return g_dComIfG_gameInfo.info.getPlayer().getLightDrop().getLightDropNum(i_nowLevel); } inline u8 dComIfGs_getSelectItemIndex(int idx) { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectItemIndex(idx); } -inline void dComIfGp_setItem(u8 slot, u8 i_no) { - g_dComIfG_gameInfo.play.setItem(slot, i_no); -} - -inline u32 dComIfGp_getNowVibration() { - return g_dComIfG_gameInfo.play.getNowVibration(); -} - -inline const char* dComIfGp_getStartStageName() { - return g_dComIfG_gameInfo.play.getStartStageName(); -} - -inline const char* dComIfGp_getNextStageName() { - return g_dComIfG_gameInfo.play.getNextStageName(); -} - -inline dStage_startStage_c* dComIfGp_getNextStartStage() { - return g_dComIfG_gameInfo.play.getNextStartStage(); -} - -inline s8 dComIfGp_getNextStageRoomNo() { - return g_dComIfG_gameInfo.play.getNextStageRoomNo(); -} - -inline s8 dComIfGp_getNextStageLayer() { - return g_dComIfG_gameInfo.play.getNextStageLayer(); -} - -inline s32 dComIfGp_getNextStageWipe() { - return g_dComIfG_gameInfo.play.getNextStageWipe(); -} - -inline bool dComIfGp_isEnableNextStage() { - return g_dComIfG_gameInfo.play.isEnableNextStage(); -} - -inline void dComIfGd_reset() { - g_dComIfG_gameInfo.drawlist.reset(); -} - inline u8 dComIfGs_getOptVibration() { return g_dComIfG_gameInfo.info.getPlayer().getConfig().getVibration(); } -inline s32 dComIfGp_roomControl_getStayNo() { - return dStage_roomControl_c::getStayNo(); -} - -inline void dComIfGp_setStartStage(dStage_startStage_c* pStartStage) { - g_dComIfG_gameInfo.play.setStartStage(pStartStage); -} - -inline s8 dComIfGp_getStartStageRoomNo() { - return g_dComIfG_gameInfo.play.getStartStageRoomNo(); -} - -inline s8 dComIfGp_getStartStageLayer() { - return g_dComIfG_gameInfo.play.getStartStageLayer(); -} - -inline s8 dComIfGp_getStartStageDarkArea() { - return g_dComIfG_gameInfo.play.getStartStageDarkArea(); -} - -inline void dComIfGp_setStartStageDarkArea(s8 darkArea) { - g_dComIfG_gameInfo.play.setStartStageDarkArea(darkArea); -} - -inline roomRead_class* dComIfGp_getStageRoom() { - return g_dComIfG_gameInfo.play.getStage().getRoom(); -} - -inline stage_stag_info_class* dComIfGp_getStageStagInfo() { - return g_dComIfG_gameInfo.play.getStage().getStagInfo(); -} - inline BOOL dComIfGs_isTbox(int i_no) { return g_dComIfG_gameInfo.info.getMemory().getBit().isTbox(i_no); } @@ -999,72 +975,10 @@ inline s32 dComIfGs_isDungeonItemWarp() { return g_dComIfG_gameInfo.info.getMemory().getBit().isDungeonItemWarp(); } -inline u8 dComIfGp_isHeapLockFlag() { - return g_dComIfG_gameInfo.play.isHeapLockFlag(); -} - -inline void dComIfGp_setSubHeapLockFlag(int idx, u8 status) { - g_dComIfG_gameInfo.play.setSubHeapLockFlag(idx, status); -} - -inline u8 dComIfGp_getSubHeapLockFlag(int idx) { - return g_dComIfG_gameInfo.play.getSubHeapLockFlag(idx); -} - -inline JKRExpHeap* dComIfGp_getSubExpHeap2D(int idx) { - return g_dComIfG_gameInfo.play.getSubExpHeap2D(idx); -} - -inline void dComIfGp_setSubExpHeap2D(int idx, void* heap) { - g_dComIfG_gameInfo.play.setSubExpHeap2D(idx, heap); -} - -inline void dComIfGp_offEnableNextStage() { - g_dComIfG_gameInfo.play.offEnableNextStage(); -} - inline void dComIfGs_setKeyNum(u8 keyNum) { g_dComIfG_gameInfo.info.getMemory().getBit().setKeyNum(keyNum); } -void dComIfGs_setKeyNum(int i_stageNo, u8 keyNum); - -inline int dComIfG_getTimerMode() { - return g_dComIfG_gameInfo.play.getTimerMode(); -} - -inline dTimer_c* dComIfG_getTimerPtr() { - return g_dComIfG_gameInfo.play.getTimerPtr(); -} - -inline void dComIfGp_roomControl_initZone() { - g_dComIfG_gameInfo.play.getRoomControl()->initZone(); -} - -inline int dComIfG_setObjectRes(const char* name, u8 param_1, JKRHeap* heap) { - return g_dComIfG_gameInfo.mResControl.setObjectRes(name, param_1, heap); -} - -inline int dComIfG_setStageRes(const char* name, JKRHeap* heap) { - return g_dComIfG_gameInfo.mResControl.setStageRes(name, heap); -} - -inline int dComIfG_syncObjectRes(const char* name) { - return g_dComIfG_gameInfo.mResControl.syncObjectRes(name); -} - -inline int dComIfG_syncStageRes(const char* name) { - return g_dComIfG_gameInfo.mResControl.syncStageRes(name); -} - -inline JKRExpHeap* dComIfGp_getExpHeap2D() { - return g_dComIfG_gameInfo.play.getExpHeap2D(); -} - -inline JKRExpHeap* dComIfGp_getMsgExpHeap() { - return g_dComIfG_gameInfo.play.getMsgExpHeap(); -} - inline s16 dComIfGs_getOil() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getOil(); } @@ -1089,10 +1003,6 @@ inline void dComIfGs_setLineUpItem() { g_dComIfG_gameInfo.info.getPlayer().getItem().setLineUpItem(); } -inline void dComIfGp_setNowVibration(u8 status) { - g_dComIfG_gameInfo.play.setNowVibration(status); -} - inline s32 dComIfGs_isGetMagicUseFlag() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().isMagicFlag(0); } @@ -1101,128 +1011,285 @@ inline void dComIfGs_offTmpBit(u16 flag) { g_dComIfG_gameInfo.info.getTmp().offEventBit(flag); } -inline dAttention_c& dComIfGp_getAttention() { - return g_dComIfG_gameInfo.play.getAttention(); -} - -inline BOOL dComIfGs_isDarkClearLV(int param_0) { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().isDarkClearLV(param_0); +inline BOOL dComIfGs_isDarkClearLV(int i_no) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().isDarkClearLV(i_no); } inline BOOL dComIfGs_isTmpBit(u16 flag) { return g_dComIfG_gameInfo.info.getTmp().isEventBit(flag); } -inline BOOL dComIfGs_isTransformLV(int param_0) { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().isTransformLV(param_0); +inline BOOL dComIfGs_isTransformLV(int i_no) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().isTransformLV(i_no); } inline void dComIfGs_onStageLife() { g_dComIfG_gameInfo.info.getMemory().getBit().onStageLife(); } -inline u8 dComIfGs_getBombNum(u8 param_0) { - return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getBombNum(param_0); +inline u8 dComIfGs_getBombNum(u8 i_bagIdx) { + return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getBombNum(i_bagIdx); } inline u8 dComIfGs_getPachinkoNum() { return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getPachinkoNum(); } -inline u8 dComIfGs_getBottleNum(u8 param_0) { - return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getBottleNum(param_0); +inline u8 dComIfGs_getBottleNum(u8 i_bottleIdx) { + return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getBottleNum(i_bottleIdx); } -inline u8 dComIfGs_getBombMax(u8 param_0) { - return g_dComIfG_gameInfo.info.getPlayer().getItemMax().getBombNum(param_0); +inline u8 dComIfGs_getBombMax(u8 bombId) { + return g_dComIfG_gameInfo.info.getPlayer().getItemMax().getBombNum(bombId); } -inline void dComIfGs_setBombNum(u8 param_0, u8 param_1) { - g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBombNum(param_0, param_1); +inline void dComIfGs_setBombNum(u8 i_bagIdx, u8 bombId) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBombNum(i_bagIdx, bombId); } -inline void dComIfGs_setPachinkoNum(u8 param_0) { - g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setPachinkoNum(param_0); +inline void dComIfGs_setPachinkoNum(u8 num) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setPachinkoNum(num); } -inline void dComIfGs_addBottleNum(u8 param_0, s16 param_1) { - g_dComIfG_gameInfo.info.getPlayer().getItemRecord().addBottleNum(param_0, param_1); +inline void dComIfGs_addBottleNum(u8 i_bottleIdx, s16 num) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().addBottleNum(i_bottleIdx, num); } inline void dComIfGs_resetLastWarpAcceptStage() { g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().resetWarpAcceptStage(); } -inline void dComIfGp_setSelectEquipClothes(u8 i_clothId) { - g_dComIfG_gameInfo.play.setSelectEquip(COLLECT_CLOTHING, i_clothId); +inline void dComIfGs_offItemFirstBit(u8 i_itemNo) { + g_dComIfG_gameInfo.info.getPlayer().getGetItem().offFirstBit(i_itemNo); } -inline void dComIfGp_setSelectEquipSword(u8 i_swordId) { - g_dComIfG_gameInfo.play.setSelectEquip(COLLECT_SWORD, i_swordId); -} - -inline void dComIfGp_setSelectEquipShield(u8 i_shieldId) { - g_dComIfG_gameInfo.play.setSelectEquip(COLLECT_SHIELD, i_shieldId); -} - -inline void dComIfGs_offItemFirstBit(u8 param_0) { - g_dComIfG_gameInfo.info.getPlayer().getGetItem().offFirstBit(param_0); -} - -inline BOOL dComIfGs_isLetterGetFlag(int param_0) { - return g_dComIfG_gameInfo.info.getPlayer().getLetterInfo().isLetterGetFlag(param_0); -} - -inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) { - return g_dComIfG_gameInfo.play.getMsgDtArchive(idx); +inline BOOL dComIfGs_isLetterGetFlag(int i_no) { + return g_dComIfG_gameInfo.info.getPlayer().getLetterInfo().isLetterGetFlag(i_no); } inline u8 dComIfGs_getArrowNum() { return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getArrowNum(); } -inline s16 dComIfGp_getStartStagePoint() { - return g_dComIfG_gameInfo.play.getStartStagePoint(); -} - -inline s16 dComIfGp_getNextStagePoint() { - return g_dComIfG_gameInfo.play.getNextStagePoint(); -} - inline void dComIfGs_initZone() { g_dComIfG_gameInfo.info.initZone(); } -inline int dComIfG_deleteObjectResMain(const char* res) { - return g_dComIfG_gameInfo.mResControl.deleteObjectRes(res); +inline s16 dComIfGs_getStartPoint() { + return g_dComIfG_gameInfo.info.getRestart().getStartPoint(); } -inline void dComIfGp_roomControl_init() { - g_dComIfG_gameInfo.play.getRoomControl()->init(); +inline u32 dComIfGs_getLastSceneMode() { + return g_dComIfG_gameInfo.info.getRestart().getLastMode(); } -inline void* dComIfG_getStageRes(const char* arcName, const char* resName) { - return g_dComIfG_gameInfo.mResControl.getStageRes(arcName, resName); +inline void dComIfGs_setTurnRestart(const cXyz& i_position, s16 i_angle, s8 param_2, u32 i_param) { + g_dComIfG_gameInfo.info.getTurnRestart().set(i_position, i_angle, param_2, i_param); } -inline void* dComIfG_getObjectRes(const char* arcName, const char* resName) { - return g_dComIfG_gameInfo.mResControl.getObjectRes(arcName, resName); +inline void dComIfGs_setRestartRoom(const cXyz& i_position, s16 i_angle, s8 i_roomNo) { + g_dComIfG_gameInfo.info.getRestart().setRoom(i_position, i_angle, i_roomNo); } -inline void* dComIfG_getObjectRes(const char* arcName, int param_1) { - return g_dComIfG_gameInfo.mResControl.getObjectRes(arcName, param_1); +inline s8 dComIfGs_getRestartRoomNo() { + return g_dComIfG_gameInfo.info.getRestart().getRoomNo(); +} + +inline void dComIfGs_setRestartRoomParam(u32 param) { + g_dComIfG_gameInfo.info.getRestart().setRoomParam(param); +} + +inline u8 dComIfGs_getMagic() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMagic(); +} + +inline u8 dComIfGs_getMaxMagic() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMaxMagic(); +} + +inline bool dComIfGs_isCollectMirror(u8 i_item) { + return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollectMirror(i_item); +} + +inline bool dComIfGs_isCollectCrystal(u8 i_item) { + return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollectCrystal(i_item); +} + +inline void dComIfGs_onCollectMirror(u8 i_item) { + g_dComIfG_gameInfo.info.getPlayer().getCollect().onCollectMirror(i_item); +} + +inline void dComIfGs_onCollectCrystal(u8 i_item) { + g_dComIfG_gameInfo.info.getPlayer().getCollect().onCollectCrystal(i_item); +} + +inline u16 dComIfGs_getDate() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().getDate(); +} + +inline void dComIfGs_setDate(u16 date) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setDate(date); +} + +inline f32 dComIfGs_getTime() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().getTime(); +} + +inline void dComIfGs_setTime(f32 time) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setTime(time); +} + +inline void dComIfGs_onDarkClearLV(int lv) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onDarkClearLV(lv); +} + +inline void dComIfGs_onTransformLV(int lv) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onTransformLV(lv); +} + +inline void dComIfGs_onSaveDunSwitch(int flag) { + g_dComIfG_gameInfo.info.getDan().onSwitch(flag); +} + +inline u8 dComIfGs_getDataNum() { + return g_dComIfG_gameInfo.info.getDataNum(); +} + +inline char* dComIfGs_getPlayerName() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getLinkName(); +} + +inline u8 dComIfGs_getTransformStatus() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getTransformStatus(); +} + +inline bool dComIfGs_isPlayerFieldLastStayFieldDataExistFlag() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().isFieldDataExistFlag(); +} + +inline void dComIfGs_setPlayerFieldLastStayInfo(const char* stage, cXyz& pos, s16 angle, s8 point, + u8 region) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().set(stage, pos, angle, point, + region); +} + +inline void dComIfGs_setStartPoint(s16 point) { + g_dComIfG_gameInfo.info.getRestart().setStartPoint(point); +} + +inline void dComIfGs_clearRoomSwitch(int zoneNo) { + g_dComIfG_gameInfo.info.getZone(zoneNo).getZoneBit().clearRoomSwitch(); +} + +inline void dComIfGs_clearRoomItem(int zoneNo) { + g_dComIfG_gameInfo.info.getZone(zoneNo).getZoneBit().clearRoomItem(); +} + +inline void dComIfGs_removeZone(int zoneNo) { + g_dComIfG_gameInfo.info.removeZone(zoneNo); +} + +inline u32 dComIfGs_getTurnRestartParam() { + return g_dComIfG_gameInfo.info.getTurnRestart().getParam(); +} + +inline cXyz& dComIfGs_getTurnRestartPos() { + return g_dComIfG_gameInfo.info.getTurnRestart().getPos(); +} + +inline s16 dComIfGs_getTurnRestartAngleY() { + return g_dComIfG_gameInfo.info.getTurnRestart().getAngleY(); +} + +inline u32 dComIfGs_getRestartRoomParam() { + return g_dComIfG_gameInfo.info.getRestart().getRoomParam(); +} + +inline cXyz& dComIfGs_getRestartRoomPos() { + return g_dComIfG_gameInfo.info.getRestart().getRoomPos(); +} + +inline s16 dComIfGs_getRestartRoomAngleY() { + return g_dComIfG_gameInfo.info.getRestart().getRoomAngleY(); +} + +inline BOOL dComIfGs_isActor(int i_no, int i_roomNo) { + return g_dComIfG_gameInfo.info.isActor(i_no, i_roomNo); +} + +inline void dComIfGs_putSave(int i_stageNo) { + g_dComIfG_gameInfo.info.putSave(i_stageNo); +} + +inline void dComIfGs_getSave(int i_stageNo) { + g_dComIfG_gameInfo.info.getSave(i_stageNo); +} + +inline void dComIfGs_initDan(s8 i_stageNo) { + g_dComIfG_gameInfo.info.initDan(i_stageNo); +} + +void dComIfGp_setItemLifeCount(f32 amount, u8 type); +void dComIfGp_setItemRupeeCount(long amount); +void dComIfGp_setSelectItem(int index); +s32 dComIfGp_offHeapLockFlag(int flag); +void dComIfGp_createSubExpHeap2D(); +void dComIfGp_destroySubExpHeap2D(); +int dComIfGp_checkEmptySubHeap2D(); +int dComIfGp_searchUseSubHeap2D(int flag); +void dComIfGp_addSelectItemNum(int index, s16 num); +u8 dComIfGp_getSelectItem(int index); +u8 dComIfGp_TargetWarpPt_get(); +void dComIfGp_TargetWarpPt_set(u8); +BOOL dComIfGp_TransportWarp_check(); +void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer, f32 lastSpeed, + u32 lastMode, int, s8 wipe, s16 lastAngle, int, int); +void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer); +int dComIfGp_getSelectItemNum(int index); +int dComIfGp_getSelectItemMaxNum(int index); +void dComIfGp_mapShow(); +void dComIfGp_mapHide(); +bool dComIfGp_checkMapShow(); +s32 dComIfGp_setHeapLockFlag(u8 flag); +u8 dComIfGp_world_dark_get(); +JKRExpHeap* dComIfGp_getSubHeap2D(int flag); +void dComIfGp_world_dark_set(u8); +u8 dComIfGp_getNowLevel(); + +inline dStage_startStage_c* dComIfGp_getStartStage() { + return g_dComIfG_gameInfo.play.getStartStage(); +} + +inline dEvent_manager_c* dComIfGp_getPEvtManager() { + return &g_dComIfG_gameInfo.play.getEvtManager(); +} + +inline dAttention_c& dComIfGp_getAttention() { + return g_dComIfG_gameInfo.play.getAttention(); +} + +inline J2DGrafContext* dComIfGp_getCurrentGrafPort() { + return g_dComIfG_gameInfo.play.getCurrentGrafPort(); +} + +inline dVibration_c& dComIfGp_getVibration() { + return g_dComIfG_gameInfo.play.getVibration(); } inline daPy_py_c* dComIfGp_getLinkPlayer() { return (daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); } -inline daPy_py_c* daPy_getLinkPlayerActorClass() { - return dComIfGp_getLinkPlayer(); +inline void* dComIfGp_getPlayer(int idx) { + return g_dComIfG_gameInfo.play.getPlayer(idx); } -inline daAlink_c* daAlink_getAlinkActorClass() { - return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); +inline dMsgObject_c* dComIfGp_getMsgObjectClass() { + return g_dComIfG_gameInfo.play.getMsgObjectClass(); +} + +inline camera_class* dComIfGp_getCamera(int idx) { + return g_dComIfG_gameInfo.play.getCamera(idx); } inline JKRArchive* dComIfGp_getMain2DArchive() { @@ -1241,101 +1308,102 @@ inline JKRArchive* dComIfGp_getItemIconArchive() { return g_dComIfG_gameInfo.play.getItemIconArchive(); } -inline J2DGrafContext* dComIfGp_getCurrentGrafPort() { - return g_dComIfG_gameInfo.play.getCurrentGrafPort(); +inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) { + return g_dComIfG_gameInfo.play.getMsgDtArchive(idx); } -inline dBgS& dComIfG_Bgsp() { - return g_dComIfG_gameInfo.play.mDBgS; +inline JKRExpHeap* dComIfGp_getExpHeap2D() { + return g_dComIfG_gameInfo.play.getExpHeap2D(); } -inline dCcS* dComIfG_Ccsp() { - return &g_dComIfG_gameInfo.play.mDCcS; +inline JKRExpHeap* dComIfGp_getMsgExpHeap() { + return g_dComIfG_gameInfo.play.getMsgExpHeap(); } -inline s16 dComIfGs_getStartPoint() { - return g_dComIfG_gameInfo.info.getRestart().getStartPoint(); +inline JKRExpHeap* dComIfGp_getSubExpHeap2D(int idx) { + return g_dComIfG_gameInfo.play.getSubExpHeap2D(idx); } -inline dVibration_c& dComIfGp_getVibration() { - return g_dComIfG_gameInfo.play.getVibration(); +inline const char* dComIfGp_getStartStageName() { + return g_dComIfG_gameInfo.play.getStartStageName(); } -inline void dComIfGp_setPlayerStatus0(int param_0, u32 flag) { - g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 0, flag); +inline void dComIfGp_setStartStage(dStage_startStage_c* p_startStage) { + g_dComIfG_gameInfo.play.setStartStage(p_startStage); } -inline void dComIfGp_setPlayerStatus1(int param_0, u32 flag) { - g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 1, flag); +inline s8 dComIfGp_getStartStageRoomNo() { + return g_dComIfG_gameInfo.play.getStartStageRoomNo(); } -inline dEvent_manager_c* dComIfGp_getPEvtManager() { - return &g_dComIfG_gameInfo.play.getEvtManager(); +inline s8 dComIfGp_getStartStageLayer() { + return g_dComIfG_gameInfo.play.getStartStageLayer(); } -inline void dComIfGp_evmng_cutEnd(int param_0) { - dComIfGp_getPEvtManager()->cutEnd(param_0); +inline s8 dComIfGp_getStartStageDarkArea() { + return g_dComIfG_gameInfo.play.getStartStageDarkArea(); } -inline BOOL dComIfGp_checkCameraAttentionStatus(int i, u32 flag) { - return g_dComIfG_gameInfo.play.checkCameraAttentionStatus(i, flag); +inline void dComIfGp_setStartStageDarkArea(s8 darkArea) { + g_dComIfG_gameInfo.play.setStartStageDarkArea(darkArea); +} + +inline s16 dComIfGp_getStartStagePoint() { + return g_dComIfG_gameInfo.play.getStartStagePoint(); +} + +inline const char* dComIfGp_getNextStageName() { + return g_dComIfG_gameInfo.play.getNextStageName(); +} + +inline dStage_startStage_c* dComIfGp_getNextStartStage() { + return g_dComIfG_gameInfo.play.getNextStartStage(); +} + +inline s8 dComIfGp_getNextStageRoomNo() { + return g_dComIfG_gameInfo.play.getNextStageRoomNo(); +} + +inline s8 dComIfGp_getNextStageLayer() { + return g_dComIfG_gameInfo.play.getNextStageLayer(); +} + +inline s32 dComIfGp_getNextStageWipe() { + return g_dComIfG_gameInfo.play.getNextStageWipe(); +} + +inline bool dComIfGp_isEnableNextStage() { + return g_dComIfG_gameInfo.play.isEnableNextStage(); +} + +inline s16 dComIfGp_getNextStagePoint() { + return g_dComIfG_gameInfo.play.getNextStagePoint(); +} + +inline u32 dComIfGp_getNowVibration() { + return g_dComIfG_gameInfo.play.getNowVibration(); +} + +inline void dComIfGp_setRStatus(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setRStatus(status, flag); +} + +inline void dComIfGp_setDoStatus(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setDoStatus(status, flag); +} + +inline void dComIfGp_setAStatus(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setAStatus(status, flag); +} + +inline void dComIfGp_setZStatus(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setZStatus(status, flag); } inline void dComIfGp_set3DStatus(u8 status, u8 direction, u8 flag) { g_dComIfG_gameInfo.play.set3DStatus(status, direction, flag); } -inline u32 dComIfGs_getLastSceneMode() { - return g_dComIfG_gameInfo.info.getRestart().getLastMode(); -} - -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, - s8 param_8, const GXColor* param_9, const GXColor* param_10, - const cXyz* param_11) { - return g_dComIfG_gameInfo.play.getParticle()->setNormal( - param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, - param_10, param_11, 1.0f); -} - -inline u32 dComIfGp_particle_set(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, s8 param_8, const GXColor* param_9, - const GXColor* param_10, const cXyz* param_11) { - return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, param_3, param_4, - param_5, param_6, param_7, param_8, - param_9, param_10, param_11, 1.0f); -} - -inline u32 dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2, - const cXyz* param_3) { - return dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL, - NULL, NULL); -} - -inline void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) { - g_dComIfG_gameInfo.play.getParticle()->forceOnEventMove(param_0); -} - -inline dPa_control_c::level_c::emitter_c* dComIfGp_particle_getEmitter(u32 param_0) { - return g_dComIfG_gameInfo.play.getParticle()->getEmitter(param_0); -} - -inline u32 dComIfGp_particle_setPolyColor(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2, - const cXyz* param_3, const dKy_tevstr_c* param_4, - const csXyz* param_5, const cXyz* param_6, int param_7, - dPa_levelEcallBack* param_8, s8 param_9, - const cXyz* param_10) { - return g_dComIfG_gameInfo.play.getParticle()->setPoly(param_0, param_1, param_2, param_3, - param_4, param_5, param_6, param_7, - param_8, param_9, param_10); -} - -inline dRes_info_c* dComIfG_getObjectResInfo(const char* arc_name) { - return g_dComIfG_gameInfo.mResControl.getObjectResInfo(arc_name); -} - inline void dComIfGp_setXStatus(u8 status, u8 flag) { g_dComIfG_gameInfo.play.setXStatus(status, flag); } @@ -1344,88 +1412,36 @@ inline void dComIfGp_setYStatus(u8 status, u8 flag) { g_dComIfG_gameInfo.play.setYStatus(status, flag); } -inline BOOL dComIfGp_event_compulsory(void* param_0, const char* param_1, u16 param_2) { - return g_dComIfG_gameInfo.play.getEvent().compulsory(param_0, param_1, param_2); +inline void dComIfGp_setNunStatus(u8 status, u8 param_1, u8 flag) { + g_dComIfG_gameInfo.play.setNunStatus(status, param_1, flag); } -inline void dComIfGs_setTurnRestart(const cXyz& param_0, s16 param_1, s8 param_2, u32 param_3) { - g_dComIfG_gameInfo.info.getTurnRestart().set(param_0, param_1, param_2, param_3); +inline void dComIfGp_setRemoConStatus(u8 status, u8 param_1, u8 flag) { + g_dComIfG_gameInfo.play.setRemoConStatus(status, param_1, flag); } -inline void dComIfGs_setRestartRoom(const cXyz& param_0, s16 param_1, s8 param_2) { - g_dComIfG_gameInfo.info.getRestart().setRoom(param_0, param_1, param_2); +inline void dComIfGp_setNunZStatus(u8 param_0, u8 param_1) { + g_dComIfG_gameInfo.play.setNunZStatus(param_0, param_1); } -inline s8 dComIfGs_getRestartRoomNo() { - return g_dComIfG_gameInfo.info.getRestart().getRoomNo(); +inline void dComIfGp_setNunCStatus(u8 param_0, u8 param_1) { + g_dComIfG_gameInfo.play.setNunCStatus(param_0, param_1); } -inline void dComIfGs_setRestartRoomParam(u32 param) { - g_dComIfG_gameInfo.info.getRestart().setRoomParam(param); +inline void dComIfGp_setCStickStatus(u8 status, u8 param_1, u8 flag) { + g_dComIfG_gameInfo.play.setCStickStatus(status, param_1, flag); } -inline void dComIfGp_clearPlayerStatus0(int param_0, u32 flag) { - g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 0, flag); +inline void dComIfGp_setCStickStatusForce(u8 status, u8 param_1, u8 flag) { + g_dComIfG_gameInfo.play.setCStickStatusForce(status, param_1, flag); } -inline int* dComIfGp_evmng_getMyIntegerP(int index, char* name) { - return (int*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_INT); +inline void dComIfGp_setSButtonStatus(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setSButtonStatus(status, flag); } -inline char* dComIfGp_evmng_getMyStringP(int index, char* name) { - return (char*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_STRING); -} - -inline f32* dComIfGp_evmng_getMyFloatP(int index, char* name) { - return (f32*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_FLOAT); -} - -inline stage_scls_info_dummy_class* dComIfGp_getStageSclsInfo() { - return g_dComIfG_gameInfo.play.getStage().getSclsInfo(); -} - -inline dStage_roomStatus_c* dComIfGp_roomControl_getStatusRoomDt(int room_no) { - return g_dComIfG_gameInfo.play.getRoomControl()->getStatusRoomDt(room_no); -} - -inline void dComIfGp_setItemNowLife(u16 life) { - g_dComIfG_gameInfo.play.setItemNowLife(life); -} - -inline void dComIfGp_setItemNowMagic(s16 magic) { - g_dComIfG_gameInfo.play.setItemNowMagic(magic); -} - -inline u8 dComIfGs_getMagic() { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMagic(); -} - -inline u8 dComIfGs_getMaxMagic() { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMaxMagic(); -} - -inline void dComIfGp_setOxygen(int oxygen) { - g_dComIfG_gameInfo.play.setOxygen(oxygen); -} - -inline void dComIfGp_setNowOxygen(s32 oxygen) { - g_dComIfG_gameInfo.play.setNowOxygen(oxygen); -} - -inline int dComIfGp_getMaxOxygen() { - return g_dComIfG_gameInfo.play.getMaxOxygen(); -} - -inline int dComIfGp_getOxygen() { - return g_dComIfG_gameInfo.play.getOxygen(); -} - -inline u8 dComIfGp_getNeedLightDropNum() { - return g_dComIfG_gameInfo.play.getNeedLightDropNum(); -} - -inline void dComIfGp_setItemNowOil(s32 oil) { - g_dComIfG_gameInfo.play.setItemNowOil(oil); +inline void dComIfGp_setSButtonStatusForce(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setSButtonStatusForce(status, flag); } inline u8 dComIfGp_getAStatus() { @@ -1476,6 +1492,158 @@ inline u8 dComIfGp_getRemoConStatus() { return g_dComIfG_gameInfo.play.getRemoConStatus(); } +inline u8 dComIfGp_getCStickDirectionForce() { + return g_dComIfG_gameInfo.play.getCStickDirectionForce(); +} + +inline u8 dComIfGp_getCStickStatusForce() { + return g_dComIfG_gameInfo.play.getCStickStatusForce(); +} + +inline u8 dComIfGp_getCStickSetFlagForce() { + return g_dComIfG_gameInfo.play.getCStickSetFlagForce(); +} + +inline u8 dComIfGp_getSButtonStatusForce() { + return g_dComIfG_gameInfo.play.getSButtonStatusForce(); +} + +inline u8 dComIfGp_getSButtonSetFlagForce() { + return g_dComIfG_gameInfo.play.getSButtonSetFlagForce(); +} + +inline void dComIfGp_setItemMagicCount(s16 count) { + g_dComIfG_gameInfo.play.setItemMagicCount(count); +} + +inline void dComIfGp_setItemMaxMagicCount(s16 count) { + g_dComIfG_gameInfo.play.setItemMaxMagicCount(count); +} + +inline void dComIfGp_setItemArrowNumCount(s16 count) { + g_dComIfG_gameInfo.play.setItemArrowNumCount(count); +} + +inline void dComIfGp_setItemPachinkoNumCount(s16 count) { + g_dComIfG_gameInfo.play.setItemPachinkoNumCount(count); +} + +inline void dComIfGp_setItemBombNumCount(u8 i_item, s16 count) { + g_dComIfG_gameInfo.play.setItemBombNumCount(i_item, count); +} + +inline void dComIfGp_setItemKeyNumCount(s16 count) { + g_dComIfG_gameInfo.play.setItemKeyNumCount(count); +} + +inline void dComIfGp_setItemMaxLifeCount(s16 count) { + g_dComIfG_gameInfo.play.setItemMaxLifeCount(count); +} + +inline void dComIfGp_setItem(u8 slot, u8 i_no) { + g_dComIfG_gameInfo.play.setItem(slot, i_no); +} + +inline roomRead_class* dComIfGp_getStageRoom() { + return g_dComIfG_gameInfo.play.getStage().getRoom(); +} + +inline stage_stag_info_class* dComIfGp_getStageStagInfo() { + return g_dComIfG_gameInfo.play.getStage().getStagInfo(); +} + +inline u8 dComIfGp_isHeapLockFlag() { + return g_dComIfG_gameInfo.play.isHeapLockFlag(); +} + +inline void dComIfGp_setSubHeapLockFlag(int idx, u8 status) { + g_dComIfG_gameInfo.play.setSubHeapLockFlag(idx, status); +} + +inline u8 dComIfGp_getSubHeapLockFlag(int idx) { + return g_dComIfG_gameInfo.play.getSubHeapLockFlag(idx); +} + +inline void dComIfGp_setSubExpHeap2D(int idx, void* heap) { + g_dComIfG_gameInfo.play.setSubExpHeap2D(idx, heap); +} + +inline void dComIfGp_offEnableNextStage() { + g_dComIfG_gameInfo.play.offEnableNextStage(); +} + +inline void dComIfGp_setNowVibration(u8 status) { + g_dComIfG_gameInfo.play.setNowVibration(status); +} + +inline void dComIfGp_setSelectEquipClothes(u8 i_clothNo) { + g_dComIfG_gameInfo.play.setSelectEquip(COLLECT_CLOTHING, i_clothNo); +} + +inline void dComIfGp_setSelectEquipSword(u8 i_swordNo) { + g_dComIfG_gameInfo.play.setSelectEquip(COLLECT_SWORD, i_swordNo); +} + +inline void dComIfGp_setSelectEquipShield(u8 i_shieldNo) { + g_dComIfG_gameInfo.play.setSelectEquip(COLLECT_SHIELD, i_shieldNo); +} + +inline void dComIfGp_setStatus(u16 status) { + g_dComIfG_gameInfo.play.setStatus(status); +} + +inline void dComIfGp_setPlayerStatus0(int param_0, u32 flag) { + g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 0, flag); +} + +inline void dComIfGp_setPlayerStatus1(int param_0, u32 flag) { + g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 1, flag); +} + +inline BOOL dComIfGp_checkCameraAttentionStatus(int i, u32 flag) { + return g_dComIfG_gameInfo.play.checkCameraAttentionStatus(i, flag); +} + +inline void dComIfGp_clearPlayerStatus0(int param_0, u32 flag) { + g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 0, flag); +} + +inline stage_scls_info_dummy_class* dComIfGp_getStageSclsInfo() { + return g_dComIfG_gameInfo.play.getStage().getSclsInfo(); +} + +inline void dComIfGp_setItemNowLife(u16 life) { + g_dComIfG_gameInfo.play.setItemNowLife(life); +} + +inline void dComIfGp_setItemNowMagic(s16 magic) { + g_dComIfG_gameInfo.play.setItemNowMagic(magic); +} + +inline void dComIfGp_setOxygen(int oxygen) { + g_dComIfG_gameInfo.play.setOxygen(oxygen); +} + +inline void dComIfGp_setNowOxygen(s32 oxygen) { + g_dComIfG_gameInfo.play.setNowOxygen(oxygen); +} + +inline int dComIfGp_getMaxOxygen() { + return g_dComIfG_gameInfo.play.getMaxOxygen(); +} + +inline int dComIfGp_getOxygen() { + return g_dComIfG_gameInfo.play.getOxygen(); +} + +inline u8 dComIfGp_getNeedLightDropNum() { + return g_dComIfG_gameInfo.play.getNeedLightDropNum(); +} + +inline void dComIfGp_setItemNowOil(s32 oil) { + g_dComIfG_gameInfo.play.setItemNowOil(oil); +} + inline bool dComIfGp_isDoSetFlag(u8 flag) { return g_dComIfG_gameInfo.play.isDoSetFlag(flag); } @@ -1496,165 +1664,22 @@ inline bool dComIfGp_isYSetFlag(u8 flag) { return g_dComIfG_gameInfo.play.isYSetFlag(flag); } -inline bool dComIfGs_isCollectMirror(u8 param_0) { - return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollectMirror(param_0); -} - -inline bool dComIfGs_isCollectCrystal(u8 param_0) { - return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollectCrystal(param_0); -} - -inline void dComIfGs_onCollectMirror(u8 param_0) { - g_dComIfG_gameInfo.info.getPlayer().getCollect().onCollectMirror(param_0); -} - -inline void dComIfGs_onCollectCrystal(u8 param_0) { - g_dComIfG_gameInfo.info.getPlayer().getCollect().onCollectCrystal(param_0); -} - inline bool dComIfGp_isPauseFlag() { return g_dComIfG_gameInfo.play.isPauseFlag(); } -inline void dComIfGp_setNunStatus(u8 param_0, u8 param_1, u8 param_2) { - g_dComIfG_gameInfo.play.setNunStatus(param_0, param_1, param_2); -} - -inline void dComIfGp_setRemoConStatus(u8 param_0, u8 param_1, u8 param_2) { - g_dComIfG_gameInfo.play.setRemoConStatus(param_0, param_1, param_2); -} - -inline void dComIfGp_setNunZStatus(u8 param_0, u8 param_1) { - g_dComIfG_gameInfo.play.setNunZStatus(param_0, param_1); -} - -inline void dComIfGp_setNunCStatus(u8 param_0, u8 param_1) { - g_dComIfG_gameInfo.play.setNunCStatus(param_0, param_1); -} - -inline void dComIfGp_setCStickStatus(u8 param_0, u8 param_1, u8 param_2) { - g_dComIfG_gameInfo.play.setCStickStatus(param_0, param_1, param_2); -} - -inline void dComIfGp_setCStickStatusForce(u8 param_0, u8 param_1, u8 param_2) { - g_dComIfG_gameInfo.play.setCStickStatusForce(param_0, param_1, param_2); -} - -inline u8 dComIfGp_getCStickDirectionForce() { - return g_dComIfG_gameInfo.play.getCStickDirectionForce(); -} - -inline u8 dComIfGp_getCStickStatusForce() { - return g_dComIfG_gameInfo.play.getCStickStatusForce(); -} - -inline u8 dComIfGp_getCStickSetFlagForce() { - return g_dComIfG_gameInfo.play.getCStickSetFlagForce(); -} - inline bool dComIfGp_isCStickSetFlag(u8 flag) { return g_dComIfG_gameInfo.play.isCStickSetFlag(flag); } -inline void* dComIfG_getObjectIDRes(const char* arc_name, u16 id) { - return g_dComIfG_gameInfo.mResControl.getObjectIDRes(arc_name, id); -} - -inline void* dComIfGp_getPlayer(int idx) { - return g_dComIfG_gameInfo.play.getPlayer(idx); -} - -inline void dComIfGd_set2DOpa(dDlst_base_c* dlst) { - g_dComIfG_gameInfo.drawlist.set2DOpa(dlst); -} - -inline void dComIfGd_set2DOpaTop(dDlst_base_c* dlst) { - g_dComIfG_gameInfo.drawlist.set2DOpaTop(dlst); -} - -inline dMsgObject_c* dComIfGp_getMsgObjectClass() { - return g_dComIfG_gameInfo.play.getMsgObjectClass(); -} - inline void dComIfGp_offPauseFlag() { g_dComIfG_gameInfo.play.offPauseFlag(); } -inline view_class* dComIfGd_getView() { - return g_dComIfG_gameInfo.drawlist.getView(); -} - -inline J3DDrawBuffer* dComIfGd_getListFilter() { - return g_dComIfG_gameInfo.drawlist.getOpaListFilter(); -} - -inline J3DDrawBuffer* dComIfGd_getOpaListIndScreen() { - return g_dComIfG_gameInfo.drawlist.getOpaListP0(); -} - -inline void dComIfGd_setListSky() { - g_dComIfG_gameInfo.drawlist.setOpaListSky(); - g_dComIfG_gameInfo.drawlist.setXluListSky(); -} - -inline void dComIfGd_setList() { - g_dComIfG_gameInfo.drawlist.setOpaList(); - g_dComIfG_gameInfo.drawlist.setXluList(); -} - -inline void dComIfGd_setXluList2DScreen() { - g_dComIfG_gameInfo.drawlist.setXluList2DScreen(); -} - -inline void dComIfGd_setXluListBG() { - g_dComIfG_gameInfo.drawlist.setXluListBG(); -} - -inline camera_class* dComIfGp_getCamera(int idx) { - return g_dComIfG_gameInfo.play.getCamera(idx); -} - inline s32 dComIfGp_checkStatus(u16 flags) { return g_dComIfG_gameInfo.play.checkStatus(flags); } -inline s32 dComIfGp_roomControl_getTimePass() { - return g_dComIfG_gameInfo.play.getRoomControl()->GetTimePass(); -} - -inline u16 dComIfGs_getDate() { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().getDate(); -} - -inline void dComIfGs_setDate(u16 date) { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setDate(date); -} - -inline f32 dComIfGs_getTime() { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().getTime(); -} - -inline void dComIfGs_setTime(f32 time) { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setTime(time); -} - -inline u8 dComIfG_getBrightness() { - return g_dComIfG_gameInfo.mFadeBrightness; -} - -inline void dComIfG_setBrightness(u8 brightness) { - g_dComIfG_gameInfo.mFadeBrightness = brightness; -} - -inline void dComIfGd_drawListItem3d() { - g_dComIfG_gameInfo.drawlist.drawOpaListItem3d(); - g_dComIfG_gameInfo.drawlist.drawXluListItem3d(); -} - -inline void dComIfGd_init() { - g_dComIfG_gameInfo.drawlist.init(); -} - inline s16 dComIfGp_getItemPachinkoNumCount() { return g_dComIfG_gameInfo.play.getItemPachinkoNumCount(); } @@ -1663,22 +1688,6 @@ inline void dComIfGp_clearItemPachinkoNumCount() { g_dComIfG_gameInfo.play.clearItemPachinkoNumCount(); } -inline u8 dComIfGp_getSButtonStatusForce() { - return g_dComIfG_gameInfo.play.getSButtonStatusForce(); -} - -inline u8 dComIfGp_getSButtonSetFlagForce() { - return g_dComIfG_gameInfo.play.getSButtonSetFlagForce(); -} - -inline void dComIfGp_setSButtonStatus(u8 status, u8 flag) { - g_dComIfG_gameInfo.play.setSButtonStatus(status, flag); -} - -inline void dComIfGp_setSButtonStatusForce(u8 status, u8 flag) { - g_dComIfG_gameInfo.play.setSButtonStatusForce(status, flag); -} - inline void dComIfGp_2dShowOn() { g_dComIfG_gameInfo.play.show2dOn(); } @@ -1703,40 +1712,108 @@ inline u8 dComIfGp_getItemLifeCountType() { return g_dComIfG_gameInfo.play.getItemLifeCountType(); } -inline void dComIfGp_particle_cleanup() { - g_dComIfG_gameInfo.play.getParticle()->cleanup(); -} - inline void dComIfGp_setCameraParamFileName(int i, char* name) { g_dComIfG_gameInfo.play.setCameraParamFileName(i, name); } -inline void dComIfGs_onDarkClearLV(int lv) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onDarkClearLV(lv); -} - -inline void dComIfGs_onTransformLV(int lv) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onTransformLV(lv); +inline const char* dComIfGp_getCameraParamFileName(int i) { + return g_dComIfG_gameInfo.play.getCameraParamFileName(i); } inline s8 dComIfGp_getLayerOld() { return g_dComIfG_gameInfo.play.getLayerOld(); } +inline void dComIfGp_resetOldMulti() { + g_dComIfG_gameInfo.play.getStage().resetOldMulti(); +} + +inline void dComIfGp_setOldMulti() { + g_dComIfG_gameInfo.play.getStage().setOldMulti(); +} + inline void dComIfGp_setStartStageLayer(s8 layer) { g_dComIfG_gameInfo.play.setStartStageLayer(layer); } -inline void dComIfGs_onSaveDunSwitch(int flag) { - g_dComIfG_gameInfo.info.getDan().onSwitch(flag); +inline dStage_Multi_c* dComIfGp_getMulti() { + return g_dComIfG_gameInfo.play.getStage().getMulti(); } -inline void dComIfGp_setStatus(u16 status) { - g_dComIfG_gameInfo.play.setStatus(status); +inline JKRAramArchive* dComIfGp_getFieldMapArchive2() { + return g_dComIfG_gameInfo.play.getFieldMapArchive2(); } -inline int dComIfG_syncAllObjectRes() { - return g_dComIfG_gameInfo.mResControl.syncAllObjectRes(); +inline s32 dComIfGp_roomControl_getStayNo() { + return dStage_roomControl_c::getStayNo(); +} + +inline void dComIfGp_roomControl_initZone() { + g_dComIfG_gameInfo.play.getRoomControl()->initZone(); +} + +inline void dComIfGp_roomControl_init() { + g_dComIfG_gameInfo.play.getRoomControl()->init(); +} + +inline dStage_roomStatus_c* dComIfGp_roomControl_getStatusRoomDt(int room_no) { + return g_dComIfG_gameInfo.play.getRoomControl()->getStatusRoomDt(room_no); +} + +inline s32 dComIfGp_roomControl_getTimePass() { + return g_dComIfG_gameInfo.play.getRoomControl()->GetTimePass(); +} + +inline void dComIfGp_roomControl_setTimePass(int isPassing) { + g_dComIfG_gameInfo.play.getRoomControl()->SetTimePass(isPassing); +} + +inline int dComIfGp_roomControl_loadRoom(int param_0, u8* param_1, bool param_2) { + return g_dComIfG_gameInfo.play.getRoomControl()->loadRoom(param_0, param_1, param_2); +} + +inline void dComIfGp_roomControl_setStayNo(int stayNo) { + g_dComIfG_gameInfo.play.getRoomControl()->setStayNo(stayNo); +} + +inline dKy_tevstr_c* dComIfGp_roomControl_getTevStr(int i_roomNo) { + return g_dComIfG_gameInfo.play.getRoomControl()->getTevStr(i_roomNo); +} + +inline bool dComIfGp_roomControl_checkStatusFlag(int i_roomNo, u8 flag) { + return g_dComIfG_gameInfo.play.mRoomControl.checkStatusFlag(i_roomNo, flag); +} + +inline void dComIfGp_roomControl_zoneCountCheck(int i_roomNo) { + g_dComIfG_gameInfo.play.mRoomControl.zoneCountCheck(i_roomNo); +} + +inline BOOL dComIfGp_event_compulsory(void* param_0, const char* param_1, u16 param_2) { + return g_dComIfG_gameInfo.play.getEvent().compulsory(param_0, param_1, param_2); +} + +inline void dComIfGp_evmng_cutEnd(int param_0) { + dComIfGp_getPEvtManager()->cutEnd(param_0); +} + +inline int* dComIfGp_evmng_getMyIntegerP(int index, char* name) { + return (int*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_INT); +} + +inline char* dComIfGp_evmng_getMyStringP(int index, char* name) { + return (char*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_STRING); +} + +inline f32* dComIfGp_evmng_getMyFloatP(int index, char* name) { + return (f32*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_FLOAT); +} + +inline void dComIfGp_evmng_create() { + g_dComIfG_gameInfo.play.getEvtManager().create(); +} + +inline void dComIfGp_evmng_remove() { + g_dComIfG_gameInfo.play.getEvtManager().remove(); } inline void dComIfGp_particle_readScene(u8 particle_no, mDoDvdThd_toMainRam_c** param_1) { @@ -1751,12 +1828,134 @@ inline void dComIfGp_particle_calc2D() { g_dComIfG_gameInfo.play.getParticle()->calc2D(); } -inline u8 dComIfGs_getDataNum() { - return g_dComIfG_gameInfo.info.getDataNum(); +inline void dComIfGp_particle_cleanup() { + g_dComIfG_gameInfo.play.getParticle()->cleanup(); } -inline char* dComIfGs_getPlayerName() { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getLinkName(); +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, + s8 param_8, const GXColor* param_9, const GXColor* param_10, + const cXyz* param_11) { + return g_dComIfG_gameInfo.play.getParticle()->setNormal( + param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, + param_10, param_11, 1.0f); +} + +inline u32 dComIfGp_particle_set(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, s8 param_8, const GXColor* param_9, + const GXColor* param_10, const cXyz* param_11) { + return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, param_3, param_4, + param_5, param_6, param_7, param_8, + param_9, param_10, param_11, 1.0f); +} + +inline u32 dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2, + const cXyz* param_3) { + return dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL, + NULL, NULL); +} + +inline void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) { + g_dComIfG_gameInfo.play.getParticle()->forceOnEventMove(param_0); +} + +inline dPa_control_c::level_c::emitter_c* dComIfGp_particle_getEmitter(u32 param_0) { + return g_dComIfG_gameInfo.play.getParticle()->getEmitter(param_0); +} + +inline u32 dComIfGp_particle_setPolyColor(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2, + const cXyz* param_3, const dKy_tevstr_c* param_4, + const csXyz* param_5, const cXyz* param_6, int param_7, + dPa_levelEcallBack* param_8, s8 param_9, + const cXyz* param_10) { + return g_dComIfG_gameInfo.play.getParticle()->setPoly(param_0, param_1, param_2, param_3, + param_4, param_5, param_6, param_7, + param_8, param_9, param_10); +} + +int dComIfGd_setSimpleShadow(cXyz* pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, s16 angle, + f32 param_5, _GXTexObj* tex); +int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4, + f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8, + dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12); + +inline void dComIfGd_drawListItem3d() { + g_dComIfG_gameInfo.drawlist.drawOpaListItem3d(); + g_dComIfG_gameInfo.drawlist.drawXluListItem3d(); +} + +inline void dComIfGd_reset() { + g_dComIfG_gameInfo.drawlist.reset(); +} + +inline void dComIfGd_set2DOpa(dDlst_base_c* dlst) { + g_dComIfG_gameInfo.drawlist.set2DOpa(dlst); +} + +inline void dComIfGd_set2DOpaTop(dDlst_base_c* dlst) { + g_dComIfG_gameInfo.drawlist.set2DOpaTop(dlst); +} + +inline view_class* dComIfGd_getView() { + return g_dComIfG_gameInfo.drawlist.getView(); +} + +inline J3DDrawBuffer* dComIfGd_getListFilter() { + return g_dComIfG_gameInfo.drawlist.getOpaListFilter(); +} + +inline J3DDrawBuffer* dComIfGd_getOpaListIndScreen() { + return g_dComIfG_gameInfo.drawlist.getOpaListP0(); +} + +inline J3DDrawBuffer* dComIfGd_getListPacket() { + return g_dComIfG_gameInfo.drawlist.getOpaListPacket(); +} + +inline void dComIfGd_setListSky() { + g_dComIfG_gameInfo.drawlist.setOpaListSky(); + g_dComIfG_gameInfo.drawlist.setXluListSky(); +} + +inline void dComIfGd_setListDark() { + g_dComIfG_gameInfo.drawlist.setOpaListDark(); + g_dComIfG_gameInfo.drawlist.setXluListDark(); +} + +inline void dComIfGd_setList() { + g_dComIfG_gameInfo.drawlist.setOpaList(); + g_dComIfG_gameInfo.drawlist.setXluList(); +} + +inline void dComIfGd_setXluList2DScreen() { + g_dComIfG_gameInfo.drawlist.setXluList2DScreen(); +} + +inline void dComIfGd_setXluListBG() { + g_dComIfG_gameInfo.drawlist.setXluListBG(); +} + +inline void dComIfGd_setListBG() { + g_dComIfG_gameInfo.drawlist.setOpaListBG(); + g_dComIfG_gameInfo.drawlist.setXluListBG(); +} + +inline void dComIfGd_init() { + g_dComIfG_gameInfo.drawlist.init(); +} + +inline daPy_py_c* daPy_getLinkPlayerActorClass() { + return dComIfGp_getLinkPlayer(); +} + +inline daPy_py_c* daPy_getPlayerActorClass() { + return (daPy_py_c*)dComIfGp_getPlayer(0); +} + +inline daAlink_c* daAlink_getAlinkActorClass() { + return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); } #endif /* D_COM_D_COM_INF_GAME_H */ diff --git a/include/d/com/d_com_static.h b/include/d/com/d_com_static.h index e2d4fa9402..62fa73bf14 100644 --- a/include/d/com/d_com_static.h +++ b/include/d/com/d_com_static.h @@ -2,5 +2,37 @@ #define D_COM_D_COM_STATIC_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +class daSus_c { +public: + class data_c { + public: + /* 80030F14 */ void set(s8, cXyz const&, cXyz const&, u8, u8, u8); + /* 80030FBC */ void reset(); + /* 80030FCC */ void isSwitch(); + /* 800310C8 */ void check(fopAc_ac_c*); + /* 80031038 */ void check(cXyz const&); + /* 80031150 */ void execute(); + /* 80031F28 */ ~data_c(); + /* 80031F64 */ data_c(); + }; + + class room_c { + public: + /* 80031190 */ void add(daSus_c::data_c*); + /* 800311FC */ void reset(); + /* 80031EE4 */ room_c(); + }; + + /* 80031248 */ void newData(s8, cXyz const&, cXyz const&, u8, u8, u8); + /* 800313BC */ void reset(); + /* 800314D4 */ void check(fopAc_ac_c*); + /* 80031434 */ static bool check(s8, cXyz const&); + /* 800315A4 */ static void execute(); + + static u8 mData[1152]; + static u8 mRoom[256]; +}; #endif /* D_COM_D_COM_STATIC_H */ diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index fb07cf9965..5f68fe598e 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -142,12 +142,14 @@ public: /* 80055768 */ void reset(); /* 800557C8 */ void imageDraw(f32 (*)[4]); /* 80055A14 */ void draw(f32 (*)[4]); - /* 80055C74 */ void setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*); + /* 80055C74 */ int setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*); /* 80055F1C */ void addReal(u32, J3DModel*); - /* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); + /* 80055F84 */ int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); /* 80055FE8 */ void setSimpleTex(ResTIMG const*); - static u8 mSimpleTexObj[32]; + static GXTexObj* getSimpleTex() { return &mSimpleTexObj; } + + static GXTexObj mSimpleTexObj; private: /* 0x00000 */ u8 field_0x0; @@ -218,15 +220,31 @@ public: view_class* getView() { return mView; } J3DDrawBuffer* getOpaListFilter() { return mListFilter; } J3DDrawBuffer* getOpaListP0() { return mListP0; } + J3DDrawBuffer* getOpaListPacket() { return mOpaListPacket; } void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, XLU_BUFFER); } void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, OPA_BUFFER); } void setXluListSky() { setXluDrawList(mpXluListSky); } void setOpaListSky() { setOpaDrawList(mOpaListSky); } + void setXluListDark() { setXluDrawList(mXluListDark); } + void setOpaListDark() { setOpaDrawList(mOpaListDark); } void setOpaList() { setOpaDrawList(mOpaList); } void setXluList() { setXluDrawList(mXluList); } void setXluListBG() { setXluDrawList(mXluListBG); } + void setOpaListBG() { setOpaDrawList(mOpaListBG); } void setXluList2DScreen() { setXluDrawList(mList2DScreen); } + int setSimpleShadow(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3, s16 param_4, + f32 param_5, _GXTexObj* param_6) { + return mShadowControl.setSimple(param_0, param_1, param_2, param_3, param_4, param_5, + param_6); + } + + int setRealShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4, + f32 param_5, dKy_tevstr_c* param_6) { + return mShadowControl.setReal(param_0, param_1, param_2, param_3, param_4, param_5, + param_6); + } + static void offWipe() { data_80450ED0 = 0; } static u8 mWipeDlst[72]; diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h index b127d75ac8..976bf716b8 100644 --- a/include/d/d_item_data.h +++ b/include/d/d_item_data.h @@ -3,4 +3,84 @@ #include "dolphin/types.h" +struct dItem_itemInfo { + /* 0x0 */ u8 mShadowSize; + /* 0x1 */ u8 mH; + /* 0x2 */ u8 mR; + /* 0x3 */ u8 mFlag; +}; + +struct dItem_itemResource { + /* 0x00 */ char* mArcName; + /* 0x04 */ s16 mBmdName; + /* 0x06 */ s16 mBtkName; + /* 0x08 */ s16 mBckName; + /* 0x0A */ s16 mBrkName; + /* 0x0C */ s16 mBtpName; + /* 0x0E */ s8 mTevFrm; + /* 0x0F */ s8 mBtpFrm; + /* 0x10 */ s16 mTexture; + /* 0x12 */ u8 mTexScale; + /* 0x14 */ s16 field_0x14; +}; // Size: 0x18 + +struct dItem_fieldItemResource { + /* 0x0 */ char* mFieldArc; + /* 0x4 */ s16 mItemBmdName; + /* 0x6 */ s16 mItemBckName; + /* 0x8 */ s16 mItemBrkName; + /* 0xA */ u8 field_0xa; + /* 0xC */ u16 mHeapSize; +}; // Size: 0x10 + +struct dItem_data { + static char* getArcName(u8 index) { return item_resource[index].mArcName; } + + static s16 getBtpName(u8 index) { return item_resource[index].mBtpName; } + + static s16 getBrkName(u8 index) { return item_resource[index].mBrkName; } + + static s16 getBxaName(u8 index) { return -1; } + + static s16 getBckName(u8 index) { return item_resource[index].mBckName; } + + static s16 getBpkName(u8 index) { return -1; } + + static s16 getBtkName(u8 index) { return item_resource[index].mBtkName; } + + static s16 getBmdName(u8 index) { return item_resource[index].mBmdName; } + + static s8 getTevFrm(u8 index) { return item_resource[index].mTevFrm; } + + static s8 getBtpFrm(u8 index) { return item_resource[index].mBtpFrm; } + + static char* getFieldArc(u8 index) { return field_item_res[index].mFieldArc; } + + static s16 getItemBmdName(u8 index) { return field_item_res[index].mItemBmdName; } + + static s16 getItemBtkName(u8 index) { return -1; } + + static s16 getItemBpkName(u8 index) { return -1; } + + static s16 getItemBckName(u8 index) { return field_item_res[index].mItemBckName; } + + static s16 getItemBxaName(u8 index) { return -1; } + + static s16 getItemBrkName(u8 index) { return field_item_res[index].mItemBrkName; } + + static s16 getItemBtpName(u8 index) { return -1; } + + static BOOL chkFlag(u8 index, int flag) { return item_info[index].mFlag & flag; } + + static u8 getShadowSize(u8 index) { return item_info[index].mShadowSize; } + + static u8 getH(u8 index) { return item_info[index].mH; } + + static u8 getR(u8 index) { return item_info[index].mR; } + + static dItem_itemResource item_resource[255]; + static dItem_fieldItemResource field_item_res[255]; + static dItem_itemInfo item_info[255]; +}; + #endif /* D_D_ITEM_DATA_H */ diff --git a/include/d/d_lib.h b/include/d/d_lib.h index 618d76138e..27a0715dce 100644 --- a/include/d/d_lib.h +++ b/include/d/d_lib.h @@ -3,6 +3,9 @@ #include "dolphin/types.h" +struct JKRAramArchive; +u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName); + struct STControl { /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16); diff --git a/include/d/d_model.h b/include/d/d_model.h index 2a9b4d2b9f..d1ef64481d 100644 --- a/include/d/d_model.h +++ b/include/d/d_model.h @@ -1,6 +1,55 @@ #ifndef D_D_MODEL_H #define D_D_MODEL_H +#include "d/com/d_com_inf_game.h" #include "dolphin/types.h" +class dMdl_obj_c { +public: + MtxP getMtx() { return mMtx; } + + /* 0x00 */ Mtx mMtx; + /* 0x30 */ dMdl_obj_c* mpObj; +}; + +class dMdl_c : public J3DPacket { +public: + /* 8009C650 */ void create(J3DModelData*, u16, dKy_tevstr_c*); + /* 8009C668 */ void entryObj(dMdl_obj_c*); + /* 8009C930 */ dMdl_c(); + + /* 8009C4FC */ virtual void draw(); + /* 8009C808 */ virtual ~dMdl_c(); + + J3DModelData* getModelData() { return mpModelData; } + u16 getMaterialId() { return mMaterialId; } + dKy_tevstr_c* getTevstr() { return mpTevstr; } + +private: + /* 0x10 */ J3DModelData* mpModelData; + /* 0x14 */ dKy_tevstr_c* mpTevstr; + /* 0x18 */ u16 mMaterialId; + /* 0x1A */ bool field_0x1a; + /* 0x1C */ dMdl_obj_c* mpModelObj; +}; + +class dMdl_mng_c { +public: + dMdl_mng_c() { field_0x80 = 0; } + ~dMdl_mng_c() {} + + /* 8009C6DC */ dMdl_c* search(J3DModelData*, u16, dKy_tevstr_c*); + /* 8009C724 */ dMdl_c* entry(J3DModelData*, u16, dKy_tevstr_c*); + /* 8009C8D8 */ dMdl_c* entry(J3DModelData*, u16, int); + /* 8009C7AC */ void create(); + /* 8009C864 */ void remove(); + /* 8009C8C0 */ void reset(); + + static dMdl_mng_c* m_myObj; + +private: + /* 0x00 */ dMdl_c field_0x0[4]; + /* 0x80 */ u8 field_0x80; +}; + #endif /* D_D_MODEL_H */ diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 57ff36799d..6ddae09a32 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -97,6 +97,10 @@ public: return deleteRes(name, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); } + int deleteStageRes(const char* name) { + return deleteRes(name, &mStageInfo[0], ARRAY_SIZE(mStageInfo)); + } + void* getStageRes(const char* arcName, const char* resName) { return getRes(arcName, resName, &mStageInfo[0], ARRAY_SIZE(mStageInfo)); } @@ -105,6 +109,10 @@ public: return getResInfo(arcName, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); } + dRes_info_c* getStageResInfo(const char* arcName) { + return getResInfo(arcName, &mStageInfo[0], ARRAY_SIZE(mStageInfo)); + } + /* 0x0000 */ dRes_info_c mObjectInfo[0x80]; /* 0x1200 */ dRes_info_c mStageInfo[0x40]; }; // Size: 0x1B00 diff --git a/include/d/d_simple_model.h b/include/d/d_simple_model.h index 2b6155b5f9..72ff3a98aa 100644 --- a/include/d/d_simple_model.h +++ b/include/d/d_simple_model.h @@ -1,6 +1,61 @@ #ifndef D_D_SIMPLE_MODEL_H #define D_D_SIMPLE_MODEL_H +#include "JSystem/J3DGraphAnimator/J3DModel.h" +#include "JSystem/JKernel/JKRSolidHeap.h" #include "dolphin/types.h" +class modelList_c { +public: + void init() { + mpModel = NULL; + field_0x4 = NULL; + } + + void set(J3DModel* model) { mpModel = model; } + + /* 0x0 */ J3DModel* mpModel; + /* 0x4 */ modelList_c* field_0x4; +}; + +class diff_model_c { +public: + /* 80048D60 */ diff_model_c(); + /* 800490EC */ BOOL create(J3DModelData*, int, u8); + /* 800491F4 */ J3DModelData* getModelData(); + /* 80049210 */ void remove(int); + /* 80049270 */ void draw(); + /* 80049368 */ void init(); + /* 80049388 */ BOOL isSame(J3DModelData*, int); + /* 800493FC */ s32 getRoomNo(); + /* 80049408 */ void insert(modelList_c*); + + J3DModel* getModel() { return mpModel; } + +private: + /* 0x00 */ JKRSolidHeap* mpHeap; + /* 0x04 */ J3DModel* mpModel; + /* 0x08 */ int mCreateNum; + /* 0x0C */ modelList_c* mpList; + /* 0x10 */ u8 mDrawBG; + /* 0x11 */ s8 mRoomNo; + /* 0x12 */ u8 field_0x12; +}; // Size: 0x14 + +class dSmplMdl_draw_c { +public: + /* 80048CB4 */ dSmplMdl_draw_c(); + /* 80048E0C */ void draw(); + /* 80048EBC */ void entry(J3DModel*, int); + /* 80048F70 */ BOOL addModel(J3DModelData*, int, u8); + /* 80049058 */ int removeModel(J3DModelData*, int); + + /* 80048D80 */ virtual ~dSmplMdl_draw_c(); + +private: + /* 0x04 */ diff_model_c mModel[8]; + /* 0xA4 */ int mListCount; + /* 0xA8 */ modelList_c mList[500]; +}; // Size: 0x1048 + #endif /* D_D_SIMPLE_MODEL_H */ diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 95f062496e..8fef2d38f7 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -9,48 +9,53 @@ #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" -struct stage_vrboxcol_info_class {}; +struct stage_vrboxcol_info_class { + // VRB +}; // Size: 0x18 -struct stage_vrbox_info_class {}; +struct stage_vrbox_info_class { + // Virt +}; -struct stage_tresure_class {}; - -struct stage_tgsc_data_class { - /* 8002847C */ ~stage_tgsc_data_class() {} - /* 800284B8 */ stage_tgsc_data_class() {} - /* 0x00 */ u32 field_0x0; - /* 0x04 */ u32 field_0x4; - /* 0x08 */ fopAcM_prmBase_class field_0x8; - /* 0x20 */ u16 field_0x20; - /* 0x22 */ u8 field_0x22; -}; // Size = 0x24 - -STATIC_ASSERT(sizeof(stage_tgsc_data_class) == 0x24); - -struct stage_tgsc_class {}; +class stage_tresure_class { +public: + /* 0x00 */ char mName[8]; + /* 0x08 */ u8 field_0x8; + /* 0x09 */ u8 mTypeFlag; + /* 0x0A */ u8 field_0xa; // part of flag + /* 0x0B */ u8 mAppearType; + /* 0x0C */ Vec mPosition; + /* 0x18 */ s16 mRoomNo; + /* 0x1A */ s16 mRotation; + /* 0x1C */ u8 mItem; + /* 0x1D */ u8 mFlagID; +}; // Size: 0x20 struct stage_stag_info_class { - /* 0x00 */ u8 field_0x00[8]; + /* 0x00 */ f32 field_0x0; + /* 0x04 */ f32 field_0x4; /* 0x08 */ u8 mCameraType; /* 0x09 */ u8 field_0x09; /* 0x0A */ u16 field_0x0a; /* 0x0C */ u32 field_0x0c; /* 0x10 */ u32 field_0x10; - /* 0x14 */ u8 field_0x14[6]; + /* 0x14 */ u8 field_0x14[6]; // usually all 0xFF /* 0x1A */ s16 mGapLevel; /* 0x1C */ s16 mRangeUp; /* 0x1E */ s16 mRangeDown; - /* 0x20 */ u8 field_0x20[8]; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; /* 0x28 */ u8 mMsgGroup; /* 0x2A */ u16 mStageTitleNo; -}; // Size: 0x2C + /* 0x2C */ u8 mParticleNo; +}; struct stage_scls_info_class { /* 0x0 */ char mStage[8]; /* 0x8 */ u8 mStart; /* 0x9 */ s8 mRoom; - /* 0xA */ s8 field_0xa; - /* 0xB */ s8 field_0xb; + /* 0xA */ u8 field_0xa; + /* 0xB */ u8 field_0xb; /* 0xC */ s8 mWipe; }; // Size: 0xD @@ -59,33 +64,97 @@ struct stage_scls_info_dummy_class { /* 0x04 */ stage_scls_info_class* mEntries; }; -struct stage_pure_lightvec_info_class {}; +struct stage_pure_lightvec_info_class { + // LGT +}; -struct stage_pselect_info_class {}; +struct stage_pselect_info_class { + // Col +}; -struct stage_plight_info_class {}; +struct stage_plight_info_class { + // LGHT +}; -struct stage_palette_info_class {}; +struct stage_palette_info_class { + // PAL +}; -struct stage_map_info_dummy_class {}; +struct stage_map_info_class { + /* 0x00 */ u8 field_0x0[0x35]; + /* 0x35 */ u8 field_0x35; + /* 0x36 */ u8 field_0x36[2]; +}; // Size: 0x38 -struct stage_map_info_class {}; +struct stage_map_info_dummy_class { + /* 0x0 */ int field_0x0; + /* 0x4 */ stage_map_info_class* mData; +}; -struct stage_envr_info_class {}; +struct stage_envr_info_class { + // Env +}; -struct stage_camera_class {}; +struct stage_camera2_data_class { + /* 0x00 */ int field_0x0; + /* 0x04 */ f32 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ u8 field_0x10; + /* 0x11 */ u8 field_0x11; + /* 0x12 */ u8 field_0x12; + /* 0x13 */ u8 field_0x13; + /* 0x14 */ u16 field_0x14; + /* 0x16 */ u16 field_0x16; +}; // Size: 0x18 -struct stage_camera2_data_class {}; +struct stage_camera_class { + /* 0x0 */ int field_0x0; + /* 0x4 */ stage_camera2_data_class* field_0x4; +}; -struct stage_arrow_class {}; +struct stage_arrow_class { + /* 0x00 */ cXyz mPosition; + /* 0x0C */ csXyz mAngle; +}; // Size: 0x14 -struct stage_actor_data_class {}; +class stage_actor_data_class { +public: + /* 0x00 */ char mName[8]; + /* 0x08 */ u32 mParameter; + /* 0x0C */ cXyz mSpawnPos; + /* 0x18 */ csXyz mAngle; + /* 0x1E */ u16 mEnemyNo; +}; // Size: 0x20 -struct stage_actor_class {}; +class stage_actor_class { +public: + /* 0x0 */ int mEntryNum; + /* 0x4 */ stage_actor_data_class* mEntries; +}; + +struct stage_tgsc_data_class : public stage_actor_data_class { + /* 8002847C */ ~stage_tgsc_data_class() {} + /* 800284B8 */ stage_tgsc_data_class() {} + + /* 0x20 */ u8 field_0x20; + /* 0x21 */ u8 field_0x21; + /* 0x22 */ u8 field_0x22; +}; // Size: 0x24 + +STATIC_ASSERT(sizeof(stage_tgsc_data_class) == 0x24); + +class stage_tgsc_class { +public: + /* 0x00 */ int mEntryNum; + /* 0x04 */ stage_tgsc_data_class* mData; +}; struct roomRead_data_class { - /* 0x0 */ u8 field_0x0[2]; + /* 0x0 */ u8 field_0x0; + /* 0x1 */ u8 field_0x1; /* 0x2 */ u8 field_0x2; + /* 0x4 */ u8* field_0x4; }; struct roomRead_class { @@ -93,37 +162,83 @@ struct roomRead_class { /* 0x4 */ roomRead_data_class** field_0x4; }; -inline s32 dStage_roomRead_dt_c_GetVrboxswitch(roomRead_data_class& data) { - return data.field_0x2 & 8; -} - -struct dStage_FileList2_dt_c {}; +class dStage_FileList2_dt_c { +public: + /* 0x00 */ f32 mLeftRmX; + /* 0x04 */ f32 mInnerRmZ; + /* 0x08 */ f32 mRightRmX; + /* 0x0C */ f32 mFrontRmZ; + /* 0x10 */ u8 mMinFloorNo; + /* 0x11 */ u8 mMaxFloorNo; + /* 0x12 */ u8 field_0x12; + /* 0x13 */ u8 field_0x13; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ s16 field_0x1c; +}; // Size: 0x20 struct dStage_MemoryMap_c {}; struct dStage_dPath_c {}; -struct dStage_Multi_c {}; +struct dStage_Mult_info { + /* 0x0 */ f32 mTransX; + /* 0x4 */ f32 mTransY; + /* 0x8 */ s16 mAngle; + /* 0xA */ u8 mRoomNo; +}; // Size: 0xC -struct dStage_SoundInfo_c {}; - -struct dStage_FileList_dt_c { - /* 0x0 */ u32 field_0x0; +class dStage_Multi_c { +public: + /* 0x0 */ int field_0x0; + /* 0x4 */ dStage_Mult_info* mInfo; }; -struct dStage_dPnt_c {}; +struct dStage_SoundInfo_c { + // SOND +}; -struct dStage_FloorInfo_c {}; +class dStage_FileList_dt_c { +public: + /* 0x00 */ u32 mParameters; + /* 0x04 */ f32 mSeaLevel; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ u8 field_0x10[9]; + /* 0x1A */ u8 mDefaultCamera; + /* 0x1C */ u16 mMsg; +}; // Size: 0x20 -struct dStage_Lbnk_c {}; +struct dStage_dPnt_c { + // PPNT +}; -struct dStage_Elst_c {}; +struct dStage_FloorInfo_c { + // FLOR +}; + +struct dStage_Lbnk_c { + // LBNK +}; + +struct dStage_Elst_c { + struct unkData { + u8 field_0x0[15]; + }; + + /* 0x0 */ int field_0x0; + /* 0x4 */ unkData* field_0x4; +}; struct dStage_MemoryConfig_c {}; -struct dStage_DMap_c {}; +struct dStage_DMap_c { + // DMAP +}; -struct dStage_MapEventInfo_c {}; +struct dStage_MapEventInfo_c { + // REVT +}; class dStage_dt_c { public: @@ -144,7 +259,7 @@ public: /* vt[12] */ virtual roomRead_class* getRoom(void) const = 0; /* vt[13] */ virtual void setMapInfo(stage_map_info_class*) = 0; /* vt[14] */ virtual stage_map_info_class* getMapInfo(void) const = 0; - /* vt[15] */ virtual int getMapInfo2(int) const = 0; + /* vt[15] */ virtual stage_map_info_class* getMapInfo2(int) const = 0; /* vt[16] */ virtual void setMapInfoBase(stage_map_info_dummy_class*) = 0; /* vt[17] */ virtual stage_map_info_dummy_class* getMapInfoBase(void) const = 0; /* vt[18] */ virtual void setPaletteInfo(stage_palette_info_class*) = 0; @@ -244,7 +359,7 @@ public: /* vt[12] */ virtual roomRead_class* getRoom(void) const; /* vt[13] */ virtual void setMapInfo(stage_map_info_class*); /* vt[14] */ virtual stage_map_info_class* getMapInfo(void) const; - /* vt[15] */ virtual int getMapInfo2(int) const; + /* vt[15] */ virtual stage_map_info_class* getMapInfo2(int) const; /* vt[16] */ virtual void setMapInfoBase(stage_map_info_dummy_class*); /* vt[17] */ virtual stage_map_info_dummy_class* getMapInfoBase(void) const; /* vt[18] */ virtual void setPaletteInfo(stage_palette_info_class*); @@ -325,48 +440,48 @@ public: void setTreasure(stage_tresure_class*); -private: - stage_camera_class* mCamera; - stage_arrow_class* mArrow; - stage_actor_class* mPlayer; - roomRead_class* mRoom; - stage_map_info_class* mMapInfo; - stage_map_info_dummy_class* mMapInfoBase; - stage_palette_info_class* mPaletteInfo; - stage_pselect_info_class* mPselectInfo; - stage_envr_info_class* mEnvrInfo; - stage_vrbox_info_class* mVrboxInfo; - stage_vrboxcol_info_class* mVrboxcolInfo; - stage_plight_info_class* mPlightInfo; - dStage_MapEventInfo_c* mMapEventInfo; - u32 mPaletteNumInfo; - u32 mPselectNumInfo; - u32 mEnvrNumInfo; - u32 mVrboxNumInfo; - int mVrboxcolNumInfo; - u32 mPlightNumInfo; - u16 mPlayerNum; - u16 field_0x56; - u16 field_0x58; - u16 field_0x5a; - stage_stag_info_class* mStagInfo; - stage_scls_info_dummy_class* mSclsInfo; - dStage_dPnt_c* mPntInfo; - dStage_dPath_c* mPathInfo; - dStage_dPnt_c* mPnt2Inf; - dStage_dPath_c* mPath2Info; - dStage_SoundInfo_c* mSoundInf; - dStage_SoundInfo_c* mSoundInfCL; - dStage_FloorInfo_c* mFloorInfo; - dStage_MemoryConfig_c* mMemoryConfig; - dStage_MemoryMap_c* mMemoryMap; - dStage_Multi_c* mMulti; - dStage_Multi_c* mOldMulti; - stage_tresure_class* mTreasure; - dStage_DMap_c* mDMap; - stage_tgsc_class* mDrTg; - stage_tgsc_class* mDoor; - dStage_Elst_c* mElst; +public: + /* 0x08 */ stage_camera_class* mCamera; + /* 0x0C */ stage_arrow_class* mArrow; + /* 0x10 */ stage_actor_class* mPlayer; + /* 0x14 */ roomRead_class* mRoom; + /* 0x18 */ stage_map_info_class* mMapInfo; + /* 0x1C */ stage_map_info_dummy_class* mMapInfoBase; + /* 0x20 */ stage_palette_info_class* mPaletteInfo; + /* 0x24 */ stage_pselect_info_class* mPselectInfo; + /* 0x28 */ stage_envr_info_class* mEnvrInfo; + /* 0x2C */ stage_vrbox_info_class* mVrboxInfo; + /* 0x30 */ stage_vrboxcol_info_class* mVrboxcolInfo; + /* 0x34 */ stage_plight_info_class* mPlightInfo; + /* 0x38 */ dStage_MapEventInfo_c* mMapEventInfo; + /* 0x3C */ u32 mPaletteNumInfo; + /* 0x40 */ u32 mPselectNumInfo; + /* 0x44 */ u32 mEnvrNumInfo; + /* 0x48 */ u32 mVrboxNumInfo; + /* 0x4C */ int mVrboxcolNumInfo; + /* 0x50 */ u32 mPlightNumInfo; + /* 0x54 */ u16 mPlayerNum; + /* 0x56 */ u16 field_0x56; + /* 0x58 */ u16 field_0x58; + /* 0x5A */ u16 field_0x5a; + /* 0x5C */ stage_stag_info_class* mStagInfo; + /* 0x60 */ stage_scls_info_dummy_class* mSclsInfo; + /* 0x64 */ dStage_dPnt_c* mPntInfo; + /* 0x68 */ dStage_dPath_c* mPathInfo; + /* 0x6C */ dStage_dPnt_c* mPnt2Inf; + /* 0x70 */ dStage_dPath_c* mPath2Info; + /* 0x74 */ dStage_SoundInfo_c* mSoundInf; + /* 0x78 */ dStage_SoundInfo_c* mSoundInfCL; + /* 0x7C */ dStage_FloorInfo_c* mFloorInfo; + /* 0x80 */ dStage_MemoryConfig_c* mMemoryConfig; + /* 0x84 */ dStage_MemoryMap_c* mMemoryMap; + /* 0x88 */ dStage_Multi_c* mMulti; + /* 0x8C */ dStage_Multi_c* mOldMulti; + /* 0x90 */ stage_tresure_class* mTreasure; + /* 0x94 */ dStage_DMap_c* mDMap; + /* 0x98 */ stage_tgsc_class* mDrTg; + /* 0x9C */ stage_tgsc_class* mDoor; + /* 0xA0 */ dStage_Elst_c* mElst; }; class dStage_roomDt_c : public dStage_dt_c { @@ -389,7 +504,7 @@ public: virtual roomRead_class* getRoom(void) const; virtual void setMapInfo(stage_map_info_class*); virtual stage_map_info_class* getMapInfo(void) const; - virtual int getMapInfo2(int) const; + virtual stage_map_info_class* getMapInfo2(int) const; virtual void setMapInfoBase(stage_map_info_dummy_class*); virtual stage_map_info_dummy_class* getMapInfoBase(void) const; virtual void setPaletteInfo(stage_palette_info_class*); @@ -468,56 +583,59 @@ public: virtual void setElst(dStage_Elst_c*); virtual dStage_Elst_c* getElst(void); -private: - stage_pure_lightvec_info_class* mLightVecInfo; - int mLightVecInfoNum; - stage_map_info_class* mMapInfo; - stage_map_info_dummy_class* mMapInfoBase; - stage_vrbox_info_class* mVrboxInfo; - stage_vrboxcol_info_class* mVrboxcolInfo; - dStage_FileList2_dt_c* mFileList2Info; - dStage_FileList_dt_c* mFileListInfo; - stage_actor_class* mPlayer; - dStage_dPnt_c* mPnt2Info; - dStage_dPath_c* mPath2Info; - stage_camera_class* mCamera; - stage_arrow_class* mArrow; - dStage_MapEventInfo_c* mMapEventInfo; - dStage_SoundInfo_c* mSoundInf; - dStage_SoundInfo_c* mSoundInfCL; - stage_scls_info_dummy_class* mSclsInfo; - dStage_Lbnk_c* mLbnk; - stage_tresure_class* mTreasure; - stage_tgsc_class* mDrTg; - stage_tgsc_class* mDoor; - dStage_FloorInfo_c* mFloorInfo; - u16 mPlayerNum; - u16 field_0x62; - int mVrboxNumInfo; - int mVrboxcolNumInfo; +public: + /* 0x08 */ stage_pure_lightvec_info_class* mLightVecInfo; + /* 0x0C */ int mLightVecInfoNum; + /* 0x10 */ stage_map_info_class* mMapInfo; + /* 0x14 */ stage_map_info_dummy_class* mMapInfoBase; + /* 0x18 */ stage_vrbox_info_class* mVrboxInfo; + /* 0x1C */ stage_vrboxcol_info_class* mVrboxcolInfo; + /* 0x20 */ dStage_FileList2_dt_c* mFileList2Info; + /* 0x24 */ dStage_FileList_dt_c* mFileListInfo; + /* 0x28 */ stage_actor_class* mPlayer; + /* 0x2C */ dStage_dPnt_c* mPnt2Info; + /* 0x30 */ dStage_dPath_c* mPath2Info; + /* 0x34 */ stage_camera_class* mCamera; + /* 0x38 */ stage_arrow_class* mArrow; + /* 0x3C */ dStage_MapEventInfo_c* mMapEventInfo; + /* 0x40 */ dStage_SoundInfo_c* mSoundInf; + /* 0x44 */ dStage_SoundInfo_c* mSoundInfCL; + /* 0x48 */ stage_scls_info_dummy_class* mSclsInfo; + /* 0x4C */ dStage_Lbnk_c* mLbnk; + /* 0x50 */ stage_tresure_class* mTreasure; + /* 0x54 */ stage_tgsc_class* mDrTg; + /* 0x58 */ stage_tgsc_class* mDoor; + /* 0x5C */ dStage_FloorInfo_c* mFloorInfo; + /* 0x60 */ u16 mPlayerNum; + /* 0x62 */ u16 field_0x62; + /* 0x64 */ int mVrboxNumInfo; + /* 0x68 */ int mVrboxcolNumInfo; }; // Size: 0x6C class dStage_roomStatus_c { public: /* 0x000 */ dStage_roomDt_c mRoomDt; /* 0x06C */ dKy_tevstr_c mKyTevStr; - /* 0x3F4 */ u8 unk_0x3F4; - /* 0x3F5 */ u8 unk_0x3F5[2]; + /* 0x3F4 */ u8 mFlag; + /* 0x3F5 */ bool mDraw; + /* 0x3F6 */ s8 mZoneCount; /* 0x3F7 */ s8 mZoneNo; /* 0x3F8 */ s8 mMemBlockID; - /* 0x3F9 */ s8 unk_3F9[0x404 - 0x3F9]; + /* 0x3F9 */ u8 mRegionNo; + /* 0x3FC */ int mProcID; + /* 0x400 */ int field_0x400; int getZoneNo() const { return mZoneNo; } - /* 80028360 */ ~dStage_roomStatus_c() {} - /* 8002839C */ dStage_roomStatus_c() {} + ~dStage_roomStatus_c() {} + dStage_roomStatus_c() {} }; // Size: 0x404 STATIC_ASSERT(sizeof(dStage_roomStatus_c) == 0x404); -extern s8 struct_80450D64; // sStayNo -extern s8 sLastStayNo; -extern s8 sNextStayNo; -extern s8 sTimePass; +extern s8 struct_80450D64; // gStayNo +extern s8 gLastStayNo; +extern s8 gNextStayNo; +extern s8 gTimePass; extern u8 data_80450D68; class dStage_roomControl_c { @@ -525,27 +643,31 @@ public: class roomDzs_c { public: roomDzs_c() { m_num = 0; } - /* 80024A34 */ void create(u8); - /* 80024ABC */ void remove(); - /* 80024B44 */ void add(u8, u8); + void create(u8); + void remove(); + void* add(u8, u8); /* 0x00 */ u8 m_num; - /* 0x04 */ JKRHeap* m_dzs; + /* 0x04 */ void** m_dzs; }; + static void createRoomDzs(u8 i_num) { m_roomDzs.create(i_num); } + static void* addRoomDzs(u8 i_num, u8 roomNo) { return m_roomDzs.add(i_num, roomNo); } + static void removeRoomDzs() { m_roomDzs.remove(); } + dStage_roomControl_c() {} void init(void); static int getZoneNo(int room); /* 80024338 */ void initZone(); /* 80024384 */ dStage_roomStatus_c* getStatusRoomDt(int); - /* 800243B0 */ JKRExpHeap* getMemoryBlock(int); + /* 800243B0 */ static JKRExpHeap* getMemoryBlock(int); /* 800243E8 */ static void setStayNo(int); /* 80024424 */ static void setNextStayNo(int); /* 800244E8 */ bool checkRoomDisp(int) const; - /* 8002451C */ void loadRoom(int, u8*, bool); + /* 8002451C */ int loadRoom(int, u8*, bool); /* 8002471C */ void zoneCountCheck(int) const; /* 80024844 */ static JKRExpHeap* createMemoryBlock(int, u32); - /* 800248A8 */ void destroyMemoryBlock(); + /* 800248A8 */ static void destroyMemoryBlock(); /* 8002490C */ static void setArcBank(int, char const*); /* 80024940 */ static char* getArcBank(int); /* 80024954 */ static bool resetArchiveBank(int); @@ -553,16 +675,28 @@ public: /* 8025BAAC */ void setZoneNo(int, int); static s32 GetTimePass(); - inline static s8 getStayNo() { return struct_80450D64; } - s8 getMemoryBlockID(int i_roomNo) { return mStatus[i_roomNo].mMemBlockID; } - bool checkStatusFlag(int i_roomNo, u8 flag) const { - return cLib_checkBit(mStatus[i_roomNo].unk_0x3F4, flag); + static s8 getStayNo() { return struct_80450D64; } + static u8 getRegionNo(int i_roomNo) { return mStatus[i_roomNo].mRegionNo; } + static s8 getMemoryBlockID(int i_roomNo) { return mStatus[i_roomNo].mMemBlockID; } + dKy_tevstr_c* getTevStr(int i_roomNo) { return &mStatus[i_roomNo].mKyTevStr; } + void setStatusFlag(int i_roomNo, u8 flag) { mStatus[i_roomNo].mFlag = flag; } + static void onStatusDraw(int i_roomNo) { mStatus[i_roomNo].mDraw = true; } + static dStage_FileList2_dt_c* getFileList2(int i_roomNo) { + return mStatus[i_roomNo].mRoomDt.mFileList2Info; } static char* getDemoArcName() { return mDemoArcName; } static char* getArcBankName() { return mArcBankName; } static void setRoomReadId(s8 id) { data_804505F0 = id; } + static s8 getRoomReadId() { return data_804505F0; } static void offNoChangeRoom() { data_80450D68 = false; } static void setProcID(u32 id) { mProcID = id; } + static u32 getProcID() { return mProcID; } + static void setFileList2(int i_roomNo, dStage_FileList2_dt_c* list) { + mStatus[i_roomNo].mRoomDt.mFileList2Info = list; + } + bool checkStatusFlag(int i_roomNo, u8 flag) const { + return cLib_checkBit(mStatus[i_roomNo].mFlag, flag); + } static JKRExpHeap* mMemoryBlock[19]; static char mArcBank[32][10]; @@ -574,7 +708,7 @@ public: static roomDzs_c m_roomDzs; private: - u8 field_0x0[4]; + /* 0x0 */ u8 field_0x0[4]; }; class dStage_startStage_c { @@ -629,10 +763,20 @@ public: typedef int (*dStage_Func)(dStage_dt_c*, void*, int, void*); struct FuncTable { - char identifier[8]; + char identifier[5]; dStage_Func function; }; +struct dStage_fileHeader { + /* 0x0 */ int chunkCount; +}; + +struct dStage_nodeHeader { + /* 0x0 */ u32 m_tag; + /* 0x4 */ int m_entryNum; + /* 0x8 */ u32 m_offset; +}; + const char* dStage_getName2(s16, s8); dStage_objectNameInf* dStage_searchName(const char*); static int dStage_stageKeepTresureInit(dStage_dt_c*, void*, int, void*); @@ -684,14 +828,26 @@ static int dStage_fieldMapFiliInfo2Init(dStage_dt_c*, void*, int, void*); static int dStage_fieldMapMapPathInit(dStage_dt_c*, void*, int, void*); u8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class&, int); -void dStage_changeScene(int, f32, u32, s8, s16, int); +int dStage_changeScene(int, f32, u32, s8, s16, int); void dStage_infoCreate(); u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer); +inline s32 dStage_roomRead_dt_c_GetVrboxswitch(roomRead_data_class& data) { + return data.field_0x2 & 8; +} + +inline s32 dStage_roomRead_dt_c_GetTimePass(roomRead_data_class& data) { + return data.field_0x2 & 3; +} + inline u8 dStage_roomRead_dt_c_GetLoadRoomIndex(u8 param_0) { return param_0 & 0x3f; } +inline u8 dStage_roomRead_dt_c_GetReverb(roomRead_data_class& room) { + return room.field_0x1 & 0x7F; +} + inline u32 dStage_stagInfo_GetSTType(stage_stag_info_class* pstag) { return (pstag->field_0x0c >> 16) & 7; } @@ -728,12 +884,12 @@ inline s8 dStage_sclsInfo_getWipeTime(stage_scls_info_class* p_info) { return p_info->field_0xb >> 5; } -inline s8 dStage_sclsInfo_getTimeH(stage_scls_info_class* p_info) { - return (p_info->field_0xa >> 4) | (p_info->field_0xb & 16); +inline int dStage_sclsInfo_getTimeH(stage_scls_info_class* p_info) { + return ((p_info->field_0xb & 0xF0) >> 4) | ((p_info->field_0xa & 0x0F) << 4); } inline u32 dStage_FileList_dt_getMiniMap(dStage_FileList_dt_c* p_fList) { - return p_fList->field_0x0 >> 3 & 7; + return p_fList->mParameters >> 3 & 7; } #endif /* D_D_STAGE_H */ diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 2c20b19c48..f4b0f517c4 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -1,8 +1,31 @@ #ifndef D_D_TIMER_H #define D_D_TIMER_H +#include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" void dTimer_createStockTimer(); +class dTimer_c { +public: + /* 8025CA0C */ void _create(); + /* 8025CF04 */ void _execute(); + /* 8025D33C */ void _draw(); + /* 8025D3BC */ void _delete(); + /* 8025D524 */ int deleteCheck(); + /* 8025D618 */ void start(int, s16); + /* 8025D538 */ void start(int); + /* 8025D7C0 */ void stock_start(s16); + /* 8025D708 */ void stock_start(); + /* 8025D7E8 */ void stop(u8); + /* 8025D86C */ void restart(u8); + /* 8025D920 */ void end(int); + /* 8025D9E0 */ void deleteRequest(); + /* 8025D9F0 */ void getTimeMs(); + /* 8025DA54 */ void getLimitTimeMs(); + /* 8025DA9C */ void getRestTimeMs(); + /* 8025DB10 */ void isStart(); + /* 802613DC */ void createGetIn(cXyz); +}; + #endif /* D_D_TIMER_H */ diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 35de0a93d7..0adb1a27c1 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -17,6 +17,7 @@ void dKy_itudemo_se(); BOOL dKy_darkworld_spot_check(char const* stageName, int roomNo); void dKy_darkworld_Area_set(char const* stageName, int roomNo); void dKy_FiveSenses_fullthrottle_dark(); +s32 dKy_daynight_check(); struct LIGHT_INFLUENCE { /* 800CFC7C */ ~LIGHT_INFLUENCE(); @@ -132,8 +133,7 @@ public: /* 0x32C */ cXyz field_0x32c; /* 0x338 */ cXyz field_0x338; /* 0x344 */ f32 field_0x344; - /* 0x348 */ int field_0x348; - /* 0x34C */ int field_0x34c; + /* 0x348 */ GXColorS10 field_0x348; /* 0x350 */ int field_0x350; /* 0x354 */ int field_0x354; /* 0x358 */ u16 field_0x358; @@ -200,6 +200,10 @@ public: /* 801ADBBC */ virtual ~dScnKy_env_light_c(); + void setLightTevColorType_MAJI(J3DModel* i_model, dKy_tevstr_c* tevstr) { + setLightTevColorType_MAJI(i_model->getModelData(), tevstr); + } + public: /* 0x0000 */ // vtable /* 0x0004 */ void* mpDmPalet; @@ -489,5 +493,8 @@ s32 dKy_getdaytime_minute(); s32 dKy_get_dayofweek(); static void dKy_Sound_init(); void dKy_setLight_nowroom(char); +void dKy_setLight_nowroom_actor(dKy_tevstr_c*); +void dKy_setLight_again(); +void dKy_GxFog_tevstr_set(dKy_tevstr_c*); #endif /* D_KANKYO_D_KANKYO_H */ diff --git a/include/d/map/d_map_path_dmap.h b/include/d/map/d_map_path_dmap.h index 02a1b34362..6af6485e74 100644 --- a/include/d/map/d_map_path_dmap.h +++ b/include/d/map/d_map_path_dmap.h @@ -29,12 +29,12 @@ public: }; struct dMapInfo_n { - /* 8003ECA0 */ void chkGetCompass(); - /* 8003ECD8 */ void chkGetMap(); - /* 8003ED10 */ void isVisitedRoom(int); - /* 8003ED60 */ void correctionOriginPos(s8, Vec*); - /* 8003EDC0 */ void offsetPlus(dStage_FileList2_dt_c const*, Vec*); - /* 8003EDEC */ void rotAngle(dStage_FileList2_dt_c const*, Vec*); + /* 8003ECA0 */ bool chkGetCompass(); + /* 8003ECD8 */ bool chkGetMap(); + /* 8003ED10 */ static bool isVisitedRoom(int); + /* 8003ED60 */ static void correctionOriginPos(s8, Vec*); + /* 8003EDC0 */ static void offsetPlus(dStage_FileList2_dt_c const*, Vec*); + /* 8003EDEC */ static void rotAngle(dStage_FileList2_dt_c const*, Vec*); /* 8003EE5C */ static Vec getMapPlayerPos(); /* 8003EF20 */ void getMapPlayerAngleY(); /* 8003EF70 */ void getConstRestartIconPointer(); diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 558efb0a08..8028c7daff 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -44,10 +44,6 @@ struct dMenu_Letter { static dMenu_LetterData letter_data[64]; }; -struct dItem_data { - static void* item_resource[1530]; -}; - class dMw_c; class dMeter2_c; class J2DPicture; @@ -151,6 +147,7 @@ public: void onLifeGaugeSE() { mLifeGaugeSE = 1; } void offLifeGaugeSE() { mLifeGaugeSE = 0; } u8 getLifeGaugeSE() { return mLifeGaugeSE; } + const char* getSaveStageName() { return mSaveStageName; } public: /* 0x04 */ u8 unk4[4]; @@ -429,6 +426,10 @@ inline u8 dMeter2Info_getLifeGaugeSE() { return g_meter2_info.getLifeGaugeSE(); } +inline const char* dMeter2Info_getSaveStageName() { + return g_meter2_info.getSaveStageName(); +} + char* dMeter2Info_getNumberTextureName(int pIndex); #endif /* D_METER_D_METER2_INFO_H */ diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 2dc464610a..6c63643051 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -91,8 +91,8 @@ public: /* 0x005 */ u8 field_0x5; /* 0x006 */ u8 field_0x6; /* 0x008 */ emitter_c mEmitter[0x80]; - /* 0xC08 */ - }; + /* 0xC08 */ emitter_c* field_0xc08[0x100]; + }; // Size: 0x1008 /* 8004BACC */ dPa_control_c(); /* 8004BB70 */ void getRM_ID(u16); diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index abc7f07764..5cfe163cf4 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -9,6 +9,7 @@ #define DEFAULT_SELECT_ITEM_INDEX 0 #define MAX_SELECT_ITEM 4 +#define SELECT_ITEM_NUM 2 #define MAX_EQUIPMENT 6 #define MAX_EVENTS 256 #define MAX_ITEM_SLOTS 24 @@ -104,7 +105,7 @@ enum ItemTable { /* 0x2B */ SHIELD, /* 0x2C */ HYLIA_SHIELD, /* 0x2D */ TKS_LETTER, - /* 0x2E */ WEARS_CASUAL, + /* 0x2E */ WEAR_CASUAL, /* 0x2F */ WEAR_KOKIRI, /* 0x30 */ ARMOR, /* 0x31 */ WEAR_ZORA, @@ -358,15 +359,29 @@ enum ItemMax { /* 0x6 */ POKE_BOMB_MAX = 6 }; +enum { + /* 0x0 */ SELECT_ITEM_LEFT, + /* 0x1 */ SELECT_ITEM_RIGHT, + /* 0x2 */ SELECT_ITEM_DOWN, + /* 0x3 */ SELECT_ITEM_B, + /* 0x0 */ SELECT_ITEM_X = SELECT_ITEM_LEFT, + /* 0x1 */ SELECT_ITEM_Y = SELECT_ITEM_RIGHT, +}; + +enum { + /* 0x0 */ TF_STATUS_HUMAN, + /* 0x1 */ TF_STATUS_WOLF, +}; + class dSv_player_status_a_c { public: void init(); - void setSelectItemIndex(signed int, u8); - u8 getSelectItemIndex(signed int) const; - void setMixItemIndex(signed int, u8); - u8 getMixItemIndex(signed int) const; + void setSelectItemIndex(int i_no, u8 item_index); + u8 getSelectItemIndex(int i_no) const; + void setMixItemIndex(int i_no, u8 item_index); + u8 getMixItemIndex(int i_no) const; u16 getRupeeMax() const; - int isMagicFlag(u8) const; + int isMagicFlag(u8 i_magic) const; u16 getMaxLife() { return mMaxLife; } u16 getLife() { return mLife; } @@ -376,6 +391,7 @@ public: u8& getMagic() { return mMagic; } u8& getMaxMagic() { return mMaxMagic; } u8 getSelectEquip(int item) const { return mSelectEquip[item]; } + u8 getTransformStatus() const { return mTransformStatus; } void setOil(u16 oil) { mOil = oil; } void setMaxOil(u16 max) { mMaxOil = max; } void setWalletSize(u8 size) { mWalletSize = size; } @@ -410,10 +426,10 @@ private: class dSv_player_status_b_c { public: void init(); - void onDarkClearLV(int); - BOOL isDarkClearLV(int) const; - void onTransformLV(int); - BOOL isTransformLV(int) const; + void onDarkClearLV(int i_no); + BOOL isDarkClearLV(int i_no) const; + void onTransformLV(int i_no); + BOOL isTransformLV(int i_no) const; void setDateIpl(s64 time) { mDateIpl = time; } u16 getDate() const { return mDate; } @@ -428,7 +444,7 @@ private: /* 0x09 */ u8 mDarkClearLevelFlag; /* 0x0A */ u8 unk10; /* 0x0B */ u8 unk11; - /* 0x0C */ float mTime; + /* 0x0C */ f32 mTime; /* 0x10 */ u16 mDate; /* 0x12 */ u8 unk18[3]; }; // Size: 0x18 @@ -438,7 +454,7 @@ public: dSv_horse_place_c() {} void init(); - void set(const char*, const cXyz&, s16, s8); + void set(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_roomNo); private: /* 0x00 */ cXyz mPos; @@ -451,9 +467,9 @@ private: class dSv_player_return_place_c { public: void init(); - void set(const char*, s8, u8); - u8 getRoomNo() { return mRoomNo; } - u8 getPlayerStatus() { return mPlayerStatus; } + void set(const char* i_name, s8 i_roomNo, u8 i_status); + s8 getRoomNo() const { return mRoomNo; } + u8 getPlayerStatus() const { return mPlayerStatus; } char* getName() { return mName; } private: @@ -469,9 +485,11 @@ public: dSv_player_field_last_stay_info_c() {} void init(); - BOOL isRegionBit(int unk) const; - void onRegionBit(int unk); - void set(const char*, const cXyz&, s16, s8, u8); + BOOL isRegionBit(int i_region) const; + void onRegionBit(int i_region); + void set(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_spawn, u8 i_regionNo); + + bool isFieldDataExistFlag() const { return mFieldDataExistFlag; } private: /* 0x00 */ cXyz mPos; @@ -489,10 +507,10 @@ public: dSv_player_last_mark_info_c() {} void init(); - void setWarpItemData(const char*, const cXyz&, s16, s8, u8, u8); + void setWarpItemData(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_roomNo, u8, u8); const char* getName() { return mName; } - cXyz getPos() { return mPos; } + cXyz& getPos() { return mPos; } s16 getAngleY() { return mAngleY; } s8 getRoomNo() { return mRoomNo; } char getWarpAcceptStage() { return mWarpAcceptStage; } @@ -511,29 +529,29 @@ private: class dSv_player_item_c { public: void init(); - void setItem(int, u8); - u8 getItem(int, bool) const; + void setItem(int item_slot, u8 i_itemNo); + u8 getItem(int slot_no, bool check_combo) const; void setLineUpItem(); - u8 getLineUpItem(int) const; - void setBottleItemIn(u8, u8); - void setEmptyBottleItemIn(u8); + u8 getLineUpItem(int slot_no) const; + void setBottleItemIn(u8 curItemIn, u8 newItemIn); + void setEmptyBottleItemIn(u8 i_itemNo); void setEmptyBottle(); - void setEmptyBottle(u8); - void setEquipBottleItemIn(u8, u8); - void setEquipBottleItemEmpty(u8); - u8 checkBottle(u8); + void setEmptyBottle(u8 i_itemNo); + void setEquipBottleItemIn(u8 curItemIn, u8 newItemIn); + void setEquipBottleItemEmpty(u8 curItemIn); + u8 checkBottle(u8 i_itemNo); int checkInsectBottle(); u8 checkEmptyBottle(); - void setBombBagItemIn(u8, u8, bool); - void setBombBagItemIn(u8, u8, u8, bool); - void setEmptyBombBagItemIn(u8, bool); - void setEmptyBombBagItemIn(u8, u8, bool); + void setBombBagItemIn(u8 curBomb, u8 newBomb, bool setNum); + void setBombBagItemIn(u8 curBomb, u8 newBomb, u8 bombNum, bool setNum); + void setEmptyBombBagItemIn(u8 newBomb, bool setNum); + void setEmptyBombBagItemIn(u8 newBomb, u8 bombNum, bool setNum); void setEmptyBombBag(); - void setEmptyBombBag(u8, u8); - u8 checkBombBag(u8); - void setWarashibeItem(u8); + void setEmptyBombBag(u8 newBomb, u8 bombNum); + u8 checkBombBag(u8 i_itemNo); + void setWarashibeItem(u8 i_itemNo); void setRodTypeLevelUp(); - void setBaitItem(u8); + void setBaitItem(u8 i_itemNo); private: /* 0x00 */ u8 mItems[24]; @@ -543,9 +561,9 @@ private: class dSv_player_get_item_c { public: void init(); - void onFirstBit(u8); - void offFirstBit(u8); - int isFirstBit(u8) const; + void onFirstBit(u8 i_itemNo); + void offFirstBit(u8 i_itemNo); + int isFirstBit(u8 i_itemNo) const; private: /* 0x0 */ u32 mItemFlags[8]; @@ -554,11 +572,11 @@ private: class dSv_player_item_record_c { public: void init(); - void setBombNum(u8, u8); - u8 getBombNum(u8) const; - void setBottleNum(u8, u8); - u8 addBottleNum(u8, s16); - u8 getBottleNum(u8) const; + void setBombNum(u8 i_bagIdx, u8 bag_id); + u8 getBombNum(u8 i_bagIdx) const; + void setBottleNum(u8 i_bottleIdx, u8 bottle_num); + u8 addBottleNum(u8 i_bottleIdx, s16 num); + u8 getBottleNum(u8 i_bottleIdx) const; u8 getArrowNum() const { return mArrowNum; } void setArrowNum(u8 amount) { mArrowNum = amount; } @@ -576,8 +594,8 @@ private: class dSv_player_item_max_c { public: void init(); - void setBombNum(u8, u8); - u8 getBombNum(u8) const; + void setBombNum(u8 bomb_id, u8 bomb_max); + u8 getBombNum(u8 bomb_id) const; void setArrowNum(u8 max) { mItemMax[ARROW_MAX] = max; } u8 getArrowNum() { return mItemMax[ARROW_MAX]; } @@ -589,12 +607,12 @@ private: class dSv_player_collect_c { public: void init(); - void setCollect(int, u8); - BOOL isCollect(int, u8) const; - void onCollectCrystal(u8); - BOOL isCollectCrystal(u8) const; - void onCollectMirror(u8); - BOOL isCollectMirror(u8) const; + void setCollect(int i_item_type, u8 i_item); + BOOL isCollect(int i_item_type, u8 i_item) const; + void onCollectCrystal(u8 i_item); + BOOL isCollectCrystal(u8 i_item) const; + void onCollectMirror(u8 i_item); + BOOL isCollectMirror(u8 i_item) const; u8 getPohNum() { return mPohNum; } @@ -620,10 +638,10 @@ private: class dSv_light_drop_c { public: void init(); - void setLightDropNum(u8, u8); - u8 getLightDropNum(u8) const; - void onLightDropGetFlag(u8); - BOOL isLightDropGetFlag(u8) const; + void setLightDropNum(u8 i_nowLevel, u8 dropNum); + u8 getLightDropNum(u8 i_nowLevel) const; + void onLightDropGetFlag(u8 i_nowLevel); + BOOL isLightDropGetFlag(u8 i_nowLevel) const; private: /* 0x0 */ u8 mLightDropNum[4]; @@ -634,10 +652,10 @@ private: class dSv_letter_info_c { public: void init(); - void onLetterGetFlag(int); - BOOL isLetterGetFlag(int) const; - void onLetterReadFlag(int); - int isLetterReadFlag(int) const; + void onLetterGetFlag(int i_no); + BOOL isLetterGetFlag(int i_no) const; + void onLetterReadFlag(int i_no); + int isLetterReadFlag(int i_no) const; private: /* 0x00 */ u32 mLetterGetFlags[2]; @@ -648,7 +666,7 @@ private: class dSv_fishing_info_c { public: void init(); - void addFishCount(u8); + void addFishCount(u8 fish_index); private: /* 0x00 */ u16 mFishCount[16]; @@ -658,7 +676,7 @@ private: class dSv_player_info_c { public: void init(); - char* getLinkName() { return (char*)mPlayerName; } + char* getLinkName() { return mPlayerName; } void setPlayerName(const char* name) { strcpy((char*)mPlayerName, name); } void setHorseName(const char* name) { strcpy((char*)mHorseName, name); } void setTotalTime(s64 time) { mTotalTime = time; } @@ -670,9 +688,9 @@ private: /* 0x08 */ s64 mTotalTime; /* 0x10 */ u16 unk16; /* 0x12 */ u16 mDeathCount; - /* 0x14 */ u8 mPlayerName[16]; + /* 0x14 */ char mPlayerName[16]; /* 0x24 */ u8 unk36; - /* 0x25 */ u8 mHorseName[16]; + /* 0x25 */ char mHorseName[16]; /* 0x35 */ u8 unk53; /* 0x36 */ u8 mClearCount; /* 0x37 */ u8 unk55[5]; @@ -683,21 +701,22 @@ public: void init(); u32 checkVibration() const; u8 getSound(); - void setSound(u8); + void setSound(u8 i_mode); u8 getVibration(); - void setVibration(u8); - inline u8 getAttentionType(void) { return mAttentionType; } - inline void setAttentionType(u8 i_mAttentionType) { mAttentionType = i_mAttentionType; } - inline u16 getCalibrateDist(void) { return mCalibrateDist; } - inline void setCalibrateDist(u16 i_mCalibrateDist) { mCalibrateDist = i_mCalibrateDist; } - inline u8 getCalValue(void) { return mCalValue; } - inline void setCalValue(u8 i_mCalValue) { mCalValue = i_mCalValue; } - inline bool getShortCut(void) { return mShortCut; } - inline void setShortCut(bool i_mShortCut) { mShortCut = i_mShortCut; } - inline u8 getCameraControl(void) { return mCameraControl; } - inline void setCameraControl(u8 i_mCameraControl) { mCameraControl = i_mCameraControl; } - inline bool getPointer(void) { return mPointer; } - inline void setPointer(bool i_mPointer) { mPointer = i_mPointer; } + void setVibration(u8 i_status); + + u8 getAttentionType() { return mAttentionType; } + void setAttentionType(u8 i_mAttentionType) { mAttentionType = i_mAttentionType; } + u16 getCalibrateDist() { return mCalibrateDist; } + void setCalibrateDist(u16 i_mCalibrateDist) { mCalibrateDist = i_mCalibrateDist; } + u8 getCalValue() { return mCalValue; } + void setCalValue(u8 i_mCalValue) { mCalValue = i_mCalValue; } + bool getShortCut() { return mShortCut; } + void setShortCut(bool i_mShortCut) { mShortCut = i_mShortCut; } + u8 getCameraControl() { return mCameraControl; } + void setCameraControl(u8 i_mCameraControl) { mCameraControl = i_mCameraControl; } + bool getPointer() { return mPointer; } + void setPointer(bool i_mPointer) { mPointer = i_mPointer; } private: /* 0x0 */ u8 unk0; @@ -716,8 +735,8 @@ private: class dSv_player_c { public: dSv_player_c() {} - void init(); + dSv_player_info_c& getPlayerInfo() { return mPlayerInfo; } dSv_player_status_a_c& getPlayerStatusA() { return mPlayerStatusA; } dSv_player_status_b_c& getPlayerStatusB() { return mPlayerStatusB; } @@ -731,6 +750,9 @@ public: dSv_player_get_item_c& getGetItem() { return mGetItem; } dSv_player_config_c& getConfig() { return mConfig; } dSv_letter_info_c& getLetterInfo() { return mLetterInfo; } + dSv_player_field_last_stay_info_c& getPlayerFieldLastStayInfo() { + return mPlayerFieldLastStayInfo; + } private: /* 0x000 */ dSv_player_status_a_c mPlayerStatusA; @@ -766,17 +788,17 @@ public: }; void init(); - void onTbox(int); - void offTbox(int); - BOOL isTbox(int) const; - void onSwitch(int); - void offSwitch(int); - BOOL isSwitch(int) const; - BOOL revSwitch(int); - void onItem(int); - BOOL isItem(int) const; - void onDungeonItem(int); - s32 isDungeonItem(int) const; + void onTbox(int i_no); + void offTbox(int i_no); + BOOL isTbox(int i_no) const; + void onSwitch(int i_no); + void offSwitch(int i_no); + BOOL isSwitch(int i_no) const; + BOOL revSwitch(int i_no); + void onItem(int i_no); + BOOL isItem(int i_no) const; + void onDungeonItem(int i_no); + s32 isDungeonItem(int i_no) const; u8 getKeyNum() { return mKeyNum; } void setKeyNum(u8 keyNum) { mKeyNum = keyNum; } @@ -805,11 +827,11 @@ private: class dSv_event_c { public: void init(); - void onEventBit(u16); - void offEventBit(u16); - int isEventBit(u16) const; - void setEventReg(u16, u8); - u8 getEventReg(u16) const; + void onEventBit(u16 i_no); + void offEventBit(u16 i_no); + int isEventBit(u16 i_no) const; + void setEventReg(u16 i_reg, u8 i_no); + u8 getEventReg(u16 i_reg) const; private: /* 0x0 */ u8 mEvent[256]; @@ -846,9 +868,9 @@ class dSv_memory2_c { public: dSv_memory2_c() { this->init(); } void init(); - void onVisitedRoom(int); - void offVisitedRoom(int); - BOOL isVisitedRoom(int); + void onVisitedRoom(int i_no); + void offVisitedRoom(int i_no); + BOOL isVisitedRoom(int i_no); private: /* 0x0 */ u32 mVisitedRoom[2]; @@ -858,13 +880,13 @@ STATIC_ASSERT(sizeof(dSv_memory2_c) == 8); class dSv_danBit_c { public: - bool init(s8); - void onSwitch(int); - void offSwitch(int); - BOOL isSwitch(int) const; - BOOL revSwitch(int); - void onItem(int); - BOOL isItem(int) const; + bool init(s8 i_stage); + void onSwitch(int i_no); + void offSwitch(int i_no); + BOOL isSwitch(int i_no) const; + BOOL revSwitch(int i_no); + void onItem(int i_no); + BOOL isItem(int i_no) const; private: /* 0x00 */ s8 mStageNo; @@ -880,18 +902,18 @@ public: void init(); void clearRoomSwitch(); void clearRoomItem(); - void onSwitch(int); - void offSwitch(int); - BOOL isSwitch(int) const; - BOOL revSwitch(int); - void onOneSwitch(int); - void offOneSwitch(int); - BOOL isOneSwitch(int) const; - BOOL revOneSwitch(int); - void onItem(int); - BOOL isItem(int) const; - void onOneItem(int); - BOOL isOneItem(int) const; + void onSwitch(int i_no); + void offSwitch(int i_no); + BOOL isSwitch(int i_no) const; + BOOL revSwitch(int i_no); + void onOneSwitch(int i_no); + void offOneSwitch(int i_no); + BOOL isOneSwitch(int i_no) const; + BOOL revOneSwitch(int i_no); + void onItem(int i_no); + BOOL isItem(int i_no) const; + void onOneItem(int i_no); + BOOL isOneItem(int i_no) const; private: /* 0x00 */ u16 mSwitch[2]; @@ -904,9 +926,9 @@ private: class dSv_zoneActor_c { public: void init(); - void on(int); - void off(int); - BOOL is(int) const; + void on(int i_id); + void off(int i_id); + BOOL is(int i_id) const; static const int ACTOR_MAX = 0xFFFF; @@ -916,14 +938,16 @@ private: class dSv_zone_c { public: - dSv_zone_c(void) { mRoomNo = -1; } // the assembly for this is in d_com_inf_game.s - void init(int); + dSv_zone_c() { mRoomNo = -1; } + void init(int i_roomNo); + dSv_zoneBit_c& getZoneBit() { return mBit; } const dSv_zoneBit_c& getBit() const { return mBit; } dSv_zoneActor_c& getActor() { return mActor; } const dSv_zoneActor_c& getActor() const { return mActor; } s8& getRoomNo() { return mRoomNo; } + void reset() { mRoomNo = -1; } private: /* 0x00 */ s8 mRoomNo; @@ -936,12 +960,22 @@ STATIC_ASSERT(sizeof(dSv_zone_c) == 0x20); class dSv_restart_c { public: - void setRoom(const cXyz&, s16, s8); + void setRoom(const cXyz& i_position, s16 i_angleY, s8 i_roomNo); void setRoomParam(u32 param) { mRoomParam = param; } + void setStartPoint(s16 point) { mStartPoint = point; } + void setLastSceneInfo(f32 speed, u32 mode, s16 angle) { + mLastSpeedF = speed; + mLastMode = mode; + mLastAngleY = angle; + } + s16 getStartPoint() const { return mStartPoint; } u32 getLastMode() const { return mLastMode; } s8 getRoomNo() const { return mRoomNo; } + u32 getRoomParam() const { return mRoomParam; } + cXyz& getRoomPos() { return mRoomPos; } + s16 getRoomAngleY() const { return mRoomAngleY; } private: /* 0x00 */ s8 mRoomNo; @@ -963,7 +997,11 @@ public: /* 0x18 */ cXyz mCameraUp; }; // Size: 0x24 - void set(const cXyz&, s16, s8, u32); + void set(const cXyz& i_position, s16 i_angleY, s8, u32 i_param); + + u32 getParam() const { return mParam; } + cXyz& getPos() { return mPosition; } + s16 getAngleY() const { return mAngleY; } private: /* 0x00 */ cXyz mPosition; @@ -985,7 +1023,7 @@ public: dSv_save_c() {} void init(); - dSv_memory2_c* getSave2(int); + dSv_memory2_c* getSave2(int i_stage2No); dSv_player_c& getPlayer() { return mPlayer; } dSv_event_c& getEvent() { return mEvent; } @@ -1007,26 +1045,27 @@ public: class dSv_info_c { public: void init(); - void getSave(int); - void putSave(int); + void getSave(int i_stageNo); + void putSave(int i_stageNo); void initZone(); - u32 createZone(int); - void onSwitch(int, int); - void offSwitch(int, int); - BOOL isSwitch(int, int) const; - BOOL revSwitch(int, int); - void onItem(int, int); - BOOL isItem(int, int) const; - void onActor(int, int); - void offActor(int, int); - BOOL isActor(int, int) const; - int memory_to_card(char*, int); - int card_to_memory(char*, int); - int initdata_to_card(char*, int); + u32 createZone(int i_roomNo); + void onSwitch(int i_no, int i_roomNo); + void offSwitch(int i_no, int i_roomNo); + BOOL isSwitch(int i_no, int i_roomNo) const; + BOOL revSwitch(int i_no, int i_roomNo); + void onItem(int i_no, int i_roomNo); + BOOL isItem(int i_no, int i_roomNo) const; + void onActor(int i_no, int i_roomNo); + void offActor(int i_no, int i_roomNo); + BOOL isActor(int i_no, int i_roomNo) const; + int memory_to_card(char* card_ptr, int dataNum); + int card_to_memory(char* card_ptr, int dataNum); + int initdata_to_card(char* card_ptr, int dataNum); dSv_save_c& getSavedata() { return mSavedata; } dSv_memory_c& getMemory() { return mMemory; } dSv_zone_c* getZones() { return mZone; } + dSv_zone_c& getZone(int id) { return mZone[id]; } dSv_player_c& getPlayer() { return mSavedata.getPlayer(); } dSv_event_c& getTmp() { return mTmp; } dSv_restart_c& getRestart() { return mRestart; } @@ -1035,14 +1074,27 @@ public: dSv_danBit_c& getDan() { return mDan; } s64 getStartTime() const { return mStartTime; } s64 getSaveTotalTime() const { return mSaveTotalTime; } - void initDan(s8 param_0) { mDan.init(param_0); } + void initDan(s8 i_stage) { mDan.init(i_stage); } u8 getDataNum() const { return mDataNum; } + void removeZone(int zoneNo) { mZone[zoneNo].reset(); } + + static const int MEMORY_SWITCH = 0x80; + static const int DAN_SWITCH = 0x40; + static const int ZONE_SWITCH = 0x20; + static const int ONEZONE_SWITCH = 0x10; + + static const int MEMORY_ITEM = 0x80; + static const int DAN_ITEM = 0x20; + static const int ZONE_ITEM = 0x20; + static const int ONEZONE_ITEM = 0x10; + + static const int ZONE_MAX = 0x20; private: /* 0x000 */ dSv_save_c mSavedata; /* 0x958 */ dSv_memory_c mMemory; /* 0x978 */ dSv_danBit_c mDan; - /* 0x9B4 */ dSv_zone_c mZone[32]; + /* 0x9B4 */ dSv_zone_c mZone[ZONE_MAX]; /* 0xDB4 */ dSv_restart_c mRestart; /* 0xDD8 */ dSv_event_c mTmp; /* 0xED8 */ dSv_turnRestart_c mTurnRestart; diff --git a/include/d/save/d_save_HIO.h b/include/d/save/d_save_HIO.h index 3cbc229557..ef4b049302 100644 --- a/include/d/save/d_save_HIO.h +++ b/include/d/save/d_save_HIO.h @@ -2,5 +2,217 @@ #define D_SAVE_D_SAVE_HIO_H #include "dolphin/types.h" +#include "global.h" + +class dSvBit_childTransformHIO_c { +public: + /* 8025C0A0 */ dSvBit_childTransformHIO_c(); + /* 8025C0D4 */ void init(); + + /* 8025C2E4 */ virtual ~dSvBit_childTransformHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool WF[4]; + /* 0x09 */ bool field_0x9[4]; +}; + +class dSvBit_childDarknessHIO_c { +public: + /* 8025C004 */ dSvBit_childDarknessHIO_c(); + /* 8025C038 */ void init(); + + /* 8025C32C */ virtual ~dSvBit_childDarknessHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool TW[6]; + /* 0x0B */ bool field_0x9[6]; +}; + +class dSvBit_childOtherHIO_c { +public: + /* 8025C13C */ dSvBit_childOtherHIO_c(); + /* 8025C178 */ void init(); + + /* 8025C29C */ virtual ~dSvBit_childOtherHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ u8 mDropNum; + /* 0x06 */ u8 field_0x6; + /* 0x07 */ bool mLightVessel[4]; + /* 0x0B */ bool field_0xb[4]; +}; + +class dSvBit_childTbPerfectionHIO_c { +public: + /* 8025BF68 */ dSvBit_childTbPerfectionHIO_c(); + /* 8025BF9C */ void init(); + + /* 8025C374 */ virtual ~dSvBit_childTbPerfectionHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool field_0x5[0x40]; + /* 0x45 */ bool field_0x45[0x40]; +}; + +class dSvBit_childTreasureHIO_c { +public: + /* 8025C874 */ virtual ~dSvBit_childTreasureHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x08 */ dSvBit_childTbPerfectionHIO_c mPerfectSave; +}; + +class dSvBit_childSwZoneHIO_c { +public: + /* 8025BCB0 */ dSvBit_childSwZoneHIO_c(); + /* 8025BCE4 */ void init(); + + /* 8025C524 */ virtual ~dSvBit_childSwZoneHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool field_0x5[0x20]; + /* 0x25 */ bool field_0x25[0x20]; +}; + +class dSvBit_childSwPerfectionHIO_c { +public: + /* 8025BB78 */ dSvBit_childSwPerfectionHIO_c(); + /* 8025BBAC */ void init(); + + /* 8025C5B4 */ virtual ~dSvBit_childSwPerfectionHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool field_0x5[0x80]; + /* 0x85 */ bool field_0x85[0x80]; +}; + +class dSvBit_childSwOneZoneHIO_c { +public: + /* 8025BD10 */ dSvBit_childSwOneZoneHIO_c(); + /* 8025BD44 */ void init(); + + /* 8025C4DC */ virtual ~dSvBit_childSwOneZoneHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool field_0x5[0x10]; + /* 0x15 */ bool field_0x15[0x10]; +}; + +class dSvBit_childSwDungeonHIO_c { +public: + /* 8025BC14 */ dSvBit_childSwDungeonHIO_c(); + /* 8025BC48 */ void init(); + + /* 8025C56C */ virtual ~dSvBit_childSwDungeonHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool field_0x5[0x40]; + /* 0x45 */ bool field_0x45[0x40]; +}; + +class dSvBit_childSwitchHIO_c { +public: + /* 8025C970 */ virtual ~dSvBit_childSwitchHIO_c(); + +private: + /* 0x004 */ u8 field_0x4; + /* 0x008 */ dSvBit_childSwPerfectionHIO_c field_0x8; + /* 0x110 */ dSvBit_childSwDungeonHIO_c field_0x110; + /* 0x198 */ dSvBit_childSwZoneHIO_c field_0x198; + /* 0x1E0 */ dSvBit_childSwOneZoneHIO_c field_0x1e0; +}; + +class dSvBit_childItZoneHIO_c { +public: + /* 8025BEA8 */ dSvBit_childItZoneHIO_c(); + /* 8025BEDC */ void init(); + + /* 8025C404 */ virtual ~dSvBit_childItZoneHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool field_0x5[0x20]; + /* 0x25 */ bool field_0x25[0x20]; +}; + +class dSvBit_childItPerfectionHIO_c { +public: + /* 8025BD70 */ dSvBit_childItPerfectionHIO_c(); + /* 8025BDA4 */ void init(); + + /* 8025C494 */ virtual ~dSvBit_childItPerfectionHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool field_0x5[0x20]; + /* 0x25 */ bool field_0x25[0x20]; +}; + +class dSvBit_childItOneZoneHIO_c { +public: + /* 8025BF08 */ dSvBit_childItOneZoneHIO_c(); + /* 8025BF3C */ void init(); + + /* 8025C3BC */ virtual ~dSvBit_childItOneZoneHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool field_0x5[0x10]; + /* 0x15 */ bool field_0x15[0x10]; +}; + +class dSvBit_childItDungeonHIO_c { +public: + /* 8025BE0C */ dSvBit_childItDungeonHIO_c(); + /* 8025BE40 */ void init(); + + /* 8025C44C */ virtual ~dSvBit_childItDungeonHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ bool field_0x5[0x80]; + /* 0x85 */ bool field_0x85[0x80]; +}; + +class dSvBit_childItemHIO_c { +public: + /* 8025C8D4 */ virtual ~dSvBit_childItemHIO_c(); + +private: + /* 0x004 */ u8 field_0x4; + /* 0x008 */ dSvBit_childItPerfectionHIO_c mFullSave; + /* 0x050 */ dSvBit_childItDungeonHIO_c mDungeonSave; + /* 0x158 */ dSvBit_childItZoneHIO_c mZoneSave; + /* 0x1A0 */ dSvBit_childItOneZoneHIO_c mOneZoneSave; +}; + +class dSvBit_HIO_c { +public: + /* 8025C1F8 */ void init(); + + /* 8025C6FC */ virtual ~dSvBit_HIO_c(); + +private: + /* 0x004 */ u8 field_0x4; + /* 0x008 */ dSvBit_childSwitchHIO_c mSwitch; + /* 0x210 */ dSvBit_childItemHIO_c mItem; + /* 0x3D8 */ dSvBit_childTreasureHIO_c mTreasure; + /* 0x468 */ dSvBit_childDarknessHIO_c mDarkness; + /* 0x47C */ dSvBit_childTransformHIO_c mTransform; + /* 0x48C */ dSvBit_childOtherHIO_c mOther; + /* 0x49C */ bool mTransformFlag; + /* 0x49D */ bool field_0x49d; +}; + +STATIC_ASSERT(sizeof(dSvBit_HIO_c) == 0x4A0); #endif /* D_SAVE_D_SAVE_HIO_H */ diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index 66e71bb2bc..b8c541c591 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -912,6 +912,7 @@ void GXInitLightSpot(GXLightObj*, f32, GXSpotFn); void GXInvalidateTexAll(void); void GXLoadLightObjImm(GXLightObj*, GXLightID); void GXLoadPosMtxImm(Mtx, u32); +void GXLoadNrmMtxImm(Mtx, u32); void GXLoadTexMtxImm(Mtx, u32, GXTexMtxType); void GXPixModeSync(void); void GXProject(f32, f32, f32, Mtx, f32*, f32*, f32*, f32*, f32*); diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index 3898ce711c..0822e21425 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -18,6 +18,7 @@ public: /* 0x224 */ leafdraw_method_class* pMthd; }; +u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3); void fopCamM_Management(void); u32 fopCamM_GetParam(camera_class* pCamera); void fopCamM_Init(void); diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h index 06f72dae2c..8c7a8b99f5 100644 --- a/include/f_op/f_op_kankyo_mng.h +++ b/include/f_op/f_op_kankyo_mng.h @@ -10,5 +10,6 @@ void* fopKyM_CreateAppend(void); f32* createAppend(int param_1, cXyz* param_2, cXyz* param_3); void fopKyM_Delete(void* param_1); void fopKyM_Create(s16 param_1, fopKyMCreateFunc param_2, void* param_3); +void fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, fopKyMCreateFunc); #endif \ No newline at end of file diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h index 406ce5ccfa..262554724b 100644 --- a/include/m_Do/m_Do_Reset.h +++ b/include/m_Do/m_Do_Reset.h @@ -35,7 +35,7 @@ public: mResetData->mResetPrepare = 0; } static u8 getLogoScnFlag() { return mResetData->mLogoScnFlag; } - static bool isReturnToMenu() { return mResetData->mReturnToMenu; } + static BOOL isReturnToMenu() { return mResetData->mReturnToMenu; } static bool isShutdown() { return mResetData->mShutdown; } static int isReset() { return mResetData->mReset; } static int get3ButtonResetPort() { return mResetData->m3ButtonResetPort; } diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index d7cfdc53f8..fee6b49fb3 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -34,6 +34,7 @@ public: extern JKRSolidHeap* g_mDoAud_audioHeap; +void mDoAud_resetProcess(); bool mDoAud_resetRecover(); void mDoAud_setSceneName(char const* spot, s32 room, s32 layer); s32 mDoAud_load1stDynamicWave(); @@ -75,4 +76,8 @@ inline bool mDoAud_check1stDynamicWave() { return Z2AudioMgr::getInterface()->mSceneMgr.check1stDynamicWave(); } +inline void mDoAud_bgmStop(u32 param_0) { + Z2AudioMgr::getInterface()->mSeqMgr.bgmStop(param_0, 0); +} + #endif /* M_DO_M_DO_AUDIO_H */ diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index e1a927cdc8..76cd28eb34 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -33,14 +33,14 @@ private: class mDoExt_btkAnm : public mDoExt_baseAnm { public: mDoExt_btkAnm(void) { mBtkAnm = 0; } - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); + /* 8000D63C */ int init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); void entry(J3DModelData* data) { entry(data, getFrame()); } void entry(J3DModelData* data, f32 frame) { entry(&data->getMaterialTable(), frame); } - void init(J3DModelData* data, J3DAnmTextureSRTKey* key, int param_2, int param_3, f32 param_4, - s16 param_5, s16 param_6) { - init(&data->getMaterialTable(), key, param_2, param_3, param_4, param_5, param_6); + int init(J3DModelData* data, J3DAnmTextureSRTKey* key, int param_2, int param_3, f32 param_4, + s16 param_5, s16 param_6) { + return init(&data->getMaterialTable(), key, param_2, param_3, param_4, param_5, param_6); } private: @@ -52,9 +52,17 @@ STATIC_ASSERT(sizeof(mDoExt_btkAnm) == 0x18); class mDoExt_brkAnm : public mDoExt_baseAnm { public: mDoExt_brkAnm(void) { mBrkAnm = 0; } - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); + /* 8000D70C */ int init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); + void entry(J3DModelData* data) { entry(data, getFrame()); } + void entry(J3DModelData* data, f32 frame) { entry(&data->getMaterialTable(), frame); } + + int init(J3DModelData* data, J3DAnmTevRegKey* anmKey, int param_2, int param_3, f32 param_4, + s16 param_5, s16 param_6) { + return init(&data->getMaterialTable(), anmKey, param_2, param_3, param_4, param_5, param_6); + } + private: /* 0x14 */ u32 mBrkAnm; }; // Size: 0x18 @@ -64,9 +72,18 @@ STATIC_ASSERT(sizeof(mDoExt_brkAnm) == 0x18); class mDoExt_bpkAnm : public mDoExt_baseAnm { public: mDoExt_bpkAnm(void) { mBpkAnm = 0; } - /* 8000D47C */ void init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16); + /* 8000D47C */ int init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16); /* 8000D518 */ void entry(J3DMaterialTable*, f32); + void entry(J3DModelData* data) { entry(data, getFrame()); } + void entry(J3DModelData* data, f32 frame) { entry(&data->getMaterialTable(), frame); } + + int init(J3DModelData* data, J3DAnmColor* anmColor, int param_2, int param_3, f32 param_4, + s16 param_5, s16 param_6) { + return init(&data->getMaterialTable(), anmColor, param_2, param_3, param_4, param_5, + param_6); + } + private: /* 0x14 */ u32 mBpkAnm; }; // Size: 0x18 @@ -76,11 +93,13 @@ STATIC_ASSERT(sizeof(mDoExt_bpkAnm) == 0x18); class mDoExt_bckAnm : public mDoExt_baseAnm { public: mDoExt_bckAnm(void) { mAnm = 0; } - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); + /* 8000D7DC */ int init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); /* 8000D9CC */ void entry(J3DModelData*, f32); /* 8000D9E8 */ void entryJoint(J3DModelData*, u16, f32); + void entry(J3DModelData* data) { entry(data, getFrame()); } + private: /* 0x14 */ u32 mBckAnm; /* 0x18 */ u32 mAnm; @@ -88,6 +107,25 @@ private: STATIC_ASSERT(sizeof(mDoExt_bckAnm) == 0x1C); +class mDoExt_btpAnm : public mDoExt_baseAnm { +public: + mDoExt_btpAnm() { mpAnm = NULL; } + /* 8000D54C */ int init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); + /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); + + void entry(J3DModelData* data) { entry(data, getFrame()); } + void entry(J3DModelData* data, s16 frame) { entry(&data->getMaterialTable(), frame); } + + int init(J3DModelData* data, J3DAnmTexPattern* anmPattern, int param_2, int param_3, + f32 param_4, s16 param_5, s16 param_6) { + return init(&data->getMaterialTable(), anmPattern, param_2, param_3, param_4, param_5, + param_6); + } + +private: + /* 0x14 */ J3DAnmTexPattern* mpAnm; +}; + class J3DTransformInfo; class mDoExt_McaMorfCallBack1_c { @@ -185,6 +223,7 @@ JKRSolidHeap* mDoExt_createSolidHeapToCurrent(JKRHeap**, u32, JKRHeap*, u32); JKRSolidHeap* mDoExt_createSolidHeapToCurrent(u32, JKRHeap*, u32); JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(u32, u32); JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(JKRHeap**, u32, u32); +u32 mDoExt_adjustSolidHeapToSystem(JKRSolidHeap* pHeap); JKRHeap* mDoExt_getCurrentHeap(); void mDoExt_removeMesgFont(); void mDoExt_modelUpdateDL(J3DModel*); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 6dea80b75c..df5699d1f5 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -37,11 +37,13 @@ public: static MtxP get() { return now; } static void transS(f32 x, f32 y, f32 z) { PSMTXTrans(now, x, y, z); } static void scaleS(f32 x, f32 y, f32 z) { PSMTXScale(now, x, y, z); } + static void multVec(const Vec* a, Vec* b) { PSMTXMultVec(now, a, b); } static void XYZrotS(s16 x, s16 y, s16 z) { mDoMtx_XYZrotS(now, x, y, z); } static void XYZrotM(s16 x, s16 y, s16 z) { mDoMtx_XYZrotM(now, x, y, z); } static void ZXYrotS(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotS(now, x, y, z); } static void ZXYrotM(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotM(now, x, y, z); } static void YrotM(s16 y) { mDoMtx_YrotM(now, y); } + static void YrotS(s16 y) { mDoMtx_YrotS(now, y); } static Mtx now; static Mtx buffer[16]; diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index bbd6ff7cce..f2a6a563ac 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -3239,7 +3239,6 @@ extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag(); extern "C" void JMAEulerToQuat__FsssP10Quaternion(); extern "C" void GXClearVtxDesc(); -extern "C" void GXLoadNrmMtxImm(); extern "C" void __register_global_object(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); diff --git a/src/d/a/d_a_itembase.cpp b/src/d/a/d_a_itembase.cpp index 969955a6dc..1c021d9f8c 100644 --- a/src/d/a/d_a_itembase.cpp +++ b/src/d/a/d_a_itembase.cpp @@ -4,393 +4,283 @@ // #include "d/a/d_a_itembase.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_item_data.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct J3DMaterialTable {}; - -struct J3DAnmTexPattern {}; - -struct mDoExt_btpAnm { - /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); - /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); -}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmColor {}; - -struct mDoExt_bpkAnm { - /* 8000D47C */ void init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16); - /* 8000D518 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct dKy_tevstr_c {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dItem_data { - static void* item_resource[1530]; - static u8 item_info[1020 + 4 /* padding */]; -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct cBgS_PolyInfo {}; - -struct _GXTexObj {}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); -}; - -// -// Forward References: -// - -extern "C" void DeleteBase__12daItemBase_cFPCc(); -extern "C" bool clothCreate__12daItemBase_cFv(); -extern "C" bool __CreateHeap__12daItemBase_cFv(); -extern "C" void CreateItemHeap__12daItemBase_cFPCcsssssss(); -extern "C" void DrawBase__12daItemBase_cFv(); -extern "C" void RotateYBase__12daItemBase_cFv(); -extern "C" void setListStart__12daItemBase_cFv(); -extern "C" void setListEnd__12daItemBase_cFv(); -extern "C" void settingBeforeDraw__12daItemBase_cFv(); -extern "C" void setTevStr__12daItemBase_cFv(); -extern "C" void setShadow__12daItemBase_cFv(); -extern "C" void animEntry__12daItemBase_cFv(); -extern "C" void animPlay__12daItemBase_cFffffff(); -extern "C" void chkFlag__12daItemBase_cFi(); -extern "C" void getTevFrm__12daItemBase_cFv(); -extern "C" void getBtpFrm__12daItemBase_cFv(); -extern "C" void getShadowSize__12daItemBase_cFv(); -extern "C" void getCollisionH__12daItemBase_cFv(); -extern "C" void getCollisionR__12daItemBase_cFv(); -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; - // // External References: // -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss(); -extern "C" void entry__13mDoExt_bpkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss(); -extern "C" void entry__13mDoExt_btpAnmFP16J3DMaterialTables(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj(); -extern "C" void -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getData__12daItemBase_cFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void* __nw__FUl(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void _savefpr_27(); -extern "C" void _restfpr_27(); -extern "C" void _savegpr_21(); -extern "C" void _restgpr_21(); -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" void* item_resource__10dItem_data[1530]; -extern "C" u8 item_info__10dItem_data[1020 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; +extern "C" extern dScnKy_env_light_c g_env_light; // // Declarations: // /* 80144724-8014474C 13F064 0028+00 0/0 1/1 8/8 .text DeleteBase__12daItemBase_cFPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::DeleteBase(char const* param_0) { - nofralloc -#include "asm/d/a/d_a_itembase/DeleteBase__12daItemBase_cFPCc.s" +int daItemBase_c::DeleteBase(char const* res) { + dComIfG_resDelete(&mPhase, res); + return 1; } -#pragma pop /* 8014474C-80144754 13F08C 0008+00 1/0 1/0 9/0 .text clothCreate__12daItemBase_cFv */ -bool daItemBase_c::clothCreate() { - return true; +int daItemBase_c::clothCreate() { + return 1; } /* 80144754-8014475C 13F094 0008+00 1/0 1/0 3/0 .text __CreateHeap__12daItemBase_cFv */ -bool daItemBase_c::__CreateHeap() { - return true; +int daItemBase_c::__CreateHeap() { + return 1; } -/* ############################################################################################## */ -/* 804533A8-804533AC 0019A8 0004+00 2/2 0/0 0/0 .sdata2 @3881 */ -SECTION_SDATA2 static f32 lit_3881 = 1.0f; - /* 8014475C-80144B94 13F09C 0438+00 0/0 3/3 0/0 .text CreateItemHeap__12daItemBase_cFPCcsssssss */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::CreateItemHeap(char const* param_0, s16 param_1, s16 param_2, s16 param_3, - s16 param_4, s16 param_5, s16 param_6, s16 param_7) { - nofralloc -#include "asm/d/a/d_a_itembase/CreateItemHeap__12daItemBase_cFPCcsssssss.s" +int daItemBase_c::CreateItemHeap(char const* arcName, s16 bmdName, s16 btkName, s16 bpkName, + s16 bckName, s16 bxaName, s16 brkName, s16 btpName) { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(arcName, bmdName); + + u32 flags = 0x11000084; + u32 uvar7 = 0x80000; + + if (btkName > 0) { + flags |= 0x200; + } + + if (bpkName > 0) { + flags |= 0x1; + } + + if (btpName > 0) { + flags |= 0x20000; + } + + if (chkFlag(4)) { + uvar7 = 0; + } + + mpModel = mDoExt_J3DModel__create(modelData, uvar7, flags); + + if (mpModel == NULL) { + return 0; + } else { + field_0x578 = NULL; + if (btkName > 0) { + J3DAnmTextureSRTKey* pbtk = + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(arcName, btkName); + field_0x578 = new mDoExt_btkAnm(); + + if (field_0x578 == NULL || !field_0x578->init(modelData, pbtk, 1, 2, 1.0f, 0, -1)) { + return 0; + } + } + + field_0x57c = NULL; + if (bpkName > 0) { + J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(arcName, bpkName); + field_0x57c = new mDoExt_bpkAnm(); + + if (field_0x57c == NULL || !field_0x57c->init(modelData, pbpk, 1, 2, 1.0f, 0, -1)) { + return 0; + } + } + + field_0x584 = NULL; + if (bckName > 0) { + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(arcName, bckName); + field_0x584 = new mDoExt_bckAnm(); + + if (field_0x584 == NULL || !field_0x584->init(pbck, 1, 2, 1.0f, 0, -1, false)) { + return 0; + } + } + + field_0x580 = NULL; + if (brkName > 0) { + J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(arcName, brkName); + s8 tevFrm = getTevFrm(); + int tmp = 1; + if (tevFrm != -1) { + tmp = 0; + } + + field_0x580 = new mDoExt_brkAnm(); + + if (field_0x580 == NULL || !field_0x580->init(modelData, pbrk, tmp, 2, 1.0f, 0, -1)) { + return 0; + } + } + + field_0x588 = NULL; + if (btpName > 0) { + J3DAnmTexPattern* pbtp = (J3DAnmTexPattern*)dComIfG_getObjectRes(arcName, btpName); + field_0x588 = new mDoExt_btpAnm(); + + if (field_0x588 == NULL || !field_0x588->init(modelData, pbtp, 1, 2, 1.0f, 0, -1)) { + return 0; + } + } + + if (!clothCreate()) { + return 0; + } + } + + return __CreateHeap() ? 1 : 0; } -#pragma pop /* 80144B94-80144C30 13F4D4 009C+00 1/0 1/0 9/0 .text DrawBase__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::DrawBase() { - nofralloc -#include "asm/d/a/d_a_itembase/DrawBase__12daItemBase_cFv.s" +int daItemBase_c::DrawBase() { + setTevStr(); + animEntry(); + setListStart(); + settingBeforeDraw(); + mDoExt_modelUpdateDL(mpModel); + setListEnd(); + setShadow(); + return 1; } -#pragma pop /* 80144C30-80144C7C 13F570 004C+00 1/0 1/0 9/0 .text RotateYBase__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::RotateYBase() { - nofralloc -#include "asm/d/a/d_a_itembase/RotateYBase__12daItemBase_cFv.s" +void daItemBase_c::RotateYBase() { + mCollisionRot.y += (s16)(0xFFFF / getData().field_0x1c); } -#pragma pop /* 80144C7C-80144CA0 13F5BC 0024+00 1/0 1/0 5/0 .text setListStart__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::setListStart() { - nofralloc -#include "asm/d/a/d_a_itembase/setListStart__12daItemBase_cFv.s" +void daItemBase_c::setListStart() { + dComIfGd_setListDark(); } -#pragma pop /* 80144CA0-80144CC4 13F5E0 0024+00 1/1 0/0 0/0 .text setListEnd__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::setListEnd() { - nofralloc -#include "asm/d/a/d_a_itembase/setListEnd__12daItemBase_cFv.s" +void daItemBase_c::setListEnd() { + dComIfGd_setList(); } -#pragma pop /* 80144CC4-80144D18 13F604 0054+00 1/0 1/0 9/0 .text settingBeforeDraw__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::settingBeforeDraw() { - nofralloc -#include "asm/d/a/d_a_itembase/settingBeforeDraw__12daItemBase_cFv.s" +void daItemBase_c::settingBeforeDraw() { + if (chkFlag(4)) { + fopAcM_setEffectMtx(this, mpModel->getModelData()); + } } -#pragma pop /* 80144D18-80144D70 13F658 0058+00 1/0 0/0 8/0 .text setTevStr__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::setTevStr() { - nofralloc -#include "asm/d/a/d_a_itembase/setTevStr__12daItemBase_cFv.s" +void daItemBase_c::setTevStr() { + g_env_light.settingTevStruct(0, &mCurrent.mPosition, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); } -#pragma pop - -/* ############################################################################################## */ -/* 804533AC-804533B0 0019AC 0004+00 1/1 0/0 0/0 .sdata2 @3952 */ -SECTION_SDATA2 static u8 lit_3952[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 804533B0-804533B8 0019B0 0004+04 1/1 0/0 0/0 .sdata2 @3953 */ -SECTION_SDATA2 static f32 lit_3953[1 + 1 /* padding */] = { - 150.0f, - /* padding */ - 0.0f, -}; - -/* 804533B8-804533C0 0019B8 0008+00 1/1 0/0 0/0 .sdata2 @3955 */ -SECTION_SDATA2 static f64 lit_3955 = 4503599627370496.0 /* cast u32 to float */; /* 80144D70-80144EDC 13F6B0 016C+00 1/0 1/0 9/1 .text setShadow__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::setShadow() { - nofralloc -#include "asm/d/a/d_a_itembase/setShadow__12daItemBase_cFv.s" -} -#pragma pop +void daItemBase_c::setShadow() { + f32 scale = mScale.x * getShadowSize(); -/* ############################################################################################## */ -/* 804533C0-804533C8 0019C0 0008+00 1/1 0/0 0/0 .sdata2 @4041 */ -SECTION_SDATA2 static f64 lit_4041 = 4503601774854144.0 /* cast s32 to float */; + if (!chkFlag(0x10)) { + if (getShadowSize() != 0.0f) { + dComIfGd_setSimpleShadow(&mCurrent.mPosition, field_0x58c.GetGroundH(), scale, + field_0x58c.m_gnd, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); + } + } else { + f32 shadowSize = getShadowSize(); + if (shadowSize == 0.0f) { + shadowSize = 150.0f; + } + + field_0x91c = + dComIfGd_setShadow(field_0x91c, 3, mpModel, &mCurrent.mPosition, shadowSize, 0.0f, + mCurrent.mPosition.y, field_0x58c.GetGroundH(), field_0x58c.m_gnd, + &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + } +} /* 80144EDC-8014503C 13F81C 0160+00 1/0 1/0 9/0 .text animEntry__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::animEntry() { - nofralloc -#include "asm/d/a/d_a_itembase/animEntry__12daItemBase_cFv.s" +void daItemBase_c::animEntry() { + if (field_0x580 != NULL) { + s8 tevFrm = getTevFrm(); + if (tevFrm != -1) { + field_0x580->entry(mpModel->getModelData(), tevFrm); + } else { + field_0x580->entry(mpModel->getModelData()); + } + } + + if (field_0x588 != NULL) { + s8 btpFrm = getBtpFrm(); + if (btpFrm != -1) { + field_0x588->entry(mpModel->getModelData(), btpFrm); + } else { + field_0x588->entry(mpModel->getModelData()); + } + } + + if (field_0x578 != NULL) { + field_0x578->entry(mpModel->getModelData()); + } + + if (field_0x584 != NULL) { + field_0x584->entry(mpModel->getModelData()); + } + + if (field_0x57c != NULL) { + field_0x57c->entry(mpModel->getModelData()); + } } -#pragma pop /* 8014503C-80145144 13F97C 0108+00 0/0 2/2 4/4 .text animPlay__12daItemBase_cFffffff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::animPlay(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, - f32 param_5) { - nofralloc -#include "asm/d/a/d_a_itembase/animPlay__12daItemBase_cFffffff.s" +void daItemBase_c::animPlay(f32 btkSpeed, f32 bpkSpeed, f32 bckSpeed, f32 param_3, f32 brkSpeed, + f32 btpSpeed) { + if (field_0x580 != NULL && getTevFrm() == -1) { + field_0x580->setPlaySpeed(brkSpeed); + field_0x580->play(); + } + + if (field_0x588 != NULL && getBtpFrm() == -1) { + field_0x588->setPlaySpeed(btpSpeed); + field_0x588->play(); + } + + if (field_0x578 != NULL) { + field_0x578->setPlaySpeed(btkSpeed); + field_0x578->play(); + } + + if (field_0x57c != NULL) { + field_0x57c->setPlaySpeed(bpkSpeed); + field_0x57c->play(); + } + + if (field_0x584 != NULL) { + field_0x584->setPlaySpeed(bckSpeed); + field_0x584->play(); + } } -#pragma pop /* 80145144-80145164 13FA84 0020+00 1/0 1/0 8/0 .text chkFlag__12daItemBase_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::chkFlag(int param_0) { - nofralloc -#include "asm/d/a/d_a_itembase/chkFlag__12daItemBase_cFi.s" +BOOL daItemBase_c::chkFlag(int flag) { + return dItem_data::chkFlag(m_itemNo, flag); } -#pragma pop /* 80145164-80145180 13FAA4 001C+00 1/0 1/0 8/0 .text getTevFrm__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::getTevFrm() { - nofralloc -#include "asm/d/a/d_a_itembase/getTevFrm__12daItemBase_cFv.s" +s8 daItemBase_c::getTevFrm() { + return dItem_data::getTevFrm(m_itemNo); } -#pragma pop /* 80145180-8014519C 13FAC0 001C+00 1/0 1/0 8/0 .text getBtpFrm__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::getBtpFrm() { - nofralloc -#include "asm/d/a/d_a_itembase/getBtpFrm__12daItemBase_cFv.s" +s8 daItemBase_c::getBtpFrm() { + return dItem_data::getBtpFrm(m_itemNo); } -#pragma pop /* 8014519C-801451B4 13FADC 0018+00 1/0 1/0 8/0 .text getShadowSize__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::getShadowSize() { - nofralloc -#include "asm/d/a/d_a_itembase/getShadowSize__12daItemBase_cFv.s" +u8 daItemBase_c::getShadowSize() { + return dItem_data::getShadowSize(m_itemNo); } -#pragma pop /* 801451B4-801451D0 13FAF4 001C+00 1/0 1/0 8/0 .text getCollisionH__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::getCollisionH() { - nofralloc -#include "asm/d/a/d_a_itembase/getCollisionH__12daItemBase_cFv.s" +u8 daItemBase_c::getCollisionH() { + return dItem_data::getH(m_itemNo); } -#pragma pop /* 801451D0-801451EC 13FB10 001C+00 1/0 1/0 8/0 .text getCollisionR__12daItemBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daItemBase_c::getCollisionR() { - nofralloc -#include "asm/d/a/d_a_itembase/getCollisionR__12daItemBase_cFv.s" +u8 daItemBase_c::getCollisionR() { + return dItem_data::getR(m_itemNo); } -#pragma pop - -/* ############################################################################################## */ -/* 803B3610-803B3658 010730 0044+04 0/0 1/1 9/9 .data __vt__12daItemBase_c */ -SECTION_DATA extern void* __vt__12daItemBase_c[17 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)DrawBase__12daItemBase_cFv, - (void*)setListStart__12daItemBase_cFv, - (void*)settingBeforeDraw__12daItemBase_cFv, - (void*)setTevStr__12daItemBase_cFv, - (void*)setShadow__12daItemBase_cFv, - (void*)animEntry__12daItemBase_cFv, - (void*)RotateYBase__12daItemBase_cFv, - (void*)clothCreate__12daItemBase_cFv, - (void*)__CreateHeap__12daItemBase_cFv, - (void*)chkFlag__12daItemBase_cFi, - (void*)getTevFrm__12daItemBase_cFv, - (void*)getBtpFrm__12daItemBase_cFv, - (void*)getShadowSize__12daItemBase_cFv, - (void*)getCollisionH__12daItemBase_cFv, - (void*)getCollisionR__12daItemBase_cFv, - /* padding */ - NULL, -}; diff --git a/src/d/a/d_a_itembase_static.cpp b/src/d/a/d_a_itembase_static.cpp index b8e002a6cb..303c5dd202 100644 --- a/src/d/a/d_a_itembase_static.cpp +++ b/src/d/a/d_a_itembase_static.cpp @@ -5,57 +5,20 @@ #include "d/a/d_a_itembase_static.h" #include "SSystem/SComponent/c_lib.h" +#include "d/d_item_data.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct fopAc_ac_c {}; - -struct dItem_data { - static void* item_resource[1530]; - static void* field_item_res[1020]; -}; - -// -// Forward References: -// - -extern "C" void getItemNo__12daItemBase_cFv(); -extern "C" void hide__12daItemBase_cFv(); -extern "C" void show__12daItemBase_cFv(); -extern "C" void changeDraw__12daItemBase_cFv(); -extern "C" void chkDraw__12daItemBase_cFv(); -extern "C" void dead__12daItemBase_cFv(); -extern "C" void chkDead__12daItemBase_cFv(); -extern "C" void CheckItemCreateHeap__FP10fopAc_ac_c(); -extern "C" void CheckFieldItemCreateHeap__FP10fopAc_ac_c(); -extern "C" u8 const m_data__12daItemBase_c[56]; - -// -// External References: -// - -extern "C" void CreateItemHeap__12daItemBase_cFPCcsssssss(); -extern "C" void* item_resource__10dItem_data[1530]; -extern "C" void* field_item_res__10dItem_data[1020]; - -// -// Declarations: -// - u8 daItemBase_c::getItemNo() { - return mItemNo; + return m_itemNo; } void daItemBase_c::hide() { - cLib_offBit(unk2347, 1); + cLib_offBit(field_0x92b, 1); } void daItemBase_c::show() { - cLib_onBit(unk2347, 1); + cLib_onBit(field_0x92b, 1); } void daItemBase_c::changeDraw() { @@ -67,44 +30,43 @@ void daItemBase_c::changeDraw() { } u8 daItemBase_c::chkDraw() { - return cLib_checkBit(unk2347, 1) != 0; + return cLib_checkBit(field_0x92b, 1) != 0; } void daItemBase_c::dead() { - cLib_onBit(unk2347, 2); + cLib_onBit(field_0x92b, 2); } u8 daItemBase_c::chkDead() { - return cLib_checkBit(unk2347, 2) != 0; + return cLib_checkBit(field_0x92b, 2) != 0; } /* 80037B0C-80037B78 03244C 006C+00 0/0 0/0 1/1 .text CheckItemCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CheckItemCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_itembase_static/CheckItemCreateHeap__FP10fopAc_ac_c.s" +void CheckItemCreateHeap(fopAc_ac_c* actor) { + daItemBase_c* item = static_cast(actor); + + u8 item_no = item->getItemNo(); + item->CreateItemHeap(dItem_data::getArcName(item_no), dItem_data::getBmdName(item_no), + dItem_data::getBtkName(item_no), dItem_data::getBpkName(item_no), + dItem_data::getBckName(item_no), dItem_data::getBxaName(item_no), + dItem_data::getBrkName(item_no), dItem_data::getBtpName(item_no)); } -#pragma pop /* 80037B78-80037BE0 0324B8 0068+00 0/0 1/1 7/7 .text CheckFieldItemCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CheckFieldItemCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_itembase_static/CheckFieldItemCreateHeap__FP10fopAc_ac_c.s" +void CheckFieldItemCreateHeap(fopAc_ac_c* actor) { + daItemBase_c* item = static_cast(actor); + + u8 item_no = item->getItemNo(); + item->CreateItemHeap(dItem_data::getFieldArc(item_no), dItem_data::getItemBmdName(item_no), + dItem_data::getItemBtkName(item_no), dItem_data::getItemBpkName(item_no), + dItem_data::getItemBckName(item_no), dItem_data::getItemBxaName(item_no), + dItem_data::getItemBrkName(item_no), dItem_data::getItemBtpName(item_no)); } -#pragma pop /* ############################################################################################## */ /* 803792B0-803792E8 005910 0038+00 0/0 1/1 0/0 .rodata m_data__12daItemBase_c */ -SECTION_RODATA u8 const daItemBase_c::m_data[56] = { - 0xC0, 0x90, 0x00, 0x00, 0x3F, 0x1E, 0xB8, 0x52, 0x42, 0x34, 0x00, 0x00, 0x41, 0x20, - 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x01, 0x00, 0xF0, 0x00, 0x3C, 0x0F, 0xA0, - 0x00, 0x78, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, 0x04, 0x4C, - 0x0B, 0xB8, 0x41, 0xB8, 0x00, 0x00, 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x0A, -}; +SECTION_RODATA daItemBase_data const daItemBase_c::m_data = { + -4.5f, 0.62f, 45.0f, 10.0f, 6.0f, 1, 240, 60, 4000, + 120, -4.0f, 3.5f, 1100, 3000, 23.0f, -6.0f, 13, 10}; COMPILER_STRIP_GATE(0x803792B0, &daItemBase_c::m_data); diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index f1b59bb10b..9a783342b5 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -5,38 +5,13 @@ #include "d/com/d_com_inf_game.h" #include "d/d_item.h" +#include "d/d_procname.h" +#include "d/d_timer.h" #include "d/kankyo/d_kankyo.h" #include "d/meter/d_meter2_info.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct scene_class {}; - -struct dSmplMdl_draw_c { - /* 80048CB4 */ dSmplMdl_draw_c(); - /* 80048E0C */ void draw(); - /* 80048EBC */ void entry(J3DModel*, int); - /* 80048F70 */ void addModel(J3DModelData*, int, u8); - /* 80049058 */ void removeModel(J3DModelData*, int); -}; - -struct dComIfG_resLoader_c { - /* 8002F314 */ dComIfG_resLoader_c(); - /* 8002F328 */ ~dComIfG_resLoader_c(); - /* 8002F3B4 */ void load(char const**, JKRHeap*); -}; - -struct Z2SeqMgr { - /* 802AF408 */ void bgmStop(u32, s32); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; +#include "m_Do/m_Do_audio.h" // // Forward References: @@ -230,7 +205,7 @@ extern "C" void __dt__8cM3dGCylFv(); extern "C" void __dt__8cM3dGAabFv(); extern "C" void __dt__15cCcD_DivideInfoFv(); extern "C" extern char const* const d_com_d_com_inf_game__stringBase0; -extern "C" extern u32 g_saftyWhiteColor; +extern "C" extern GXColor g_saftyWhiteColor; // // External References: @@ -374,7 +349,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__4cCcS[12]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_env_light[4880]; +extern "C" extern dScnKy_env_light_c g_env_light; extern "C" u8 mFader__13mDoGph_gInf_c[4]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -425,8 +400,8 @@ void dComIfG_play_c::init() { mGameoverStatus = 0; } -void dComIfGp_checkItemGet(u8 param_0, int param_1) { - checkItemGet(param_0, param_1); +void dComIfGp_checkItemGet(u8 i_itemNo, int param_1) { + checkItemGet(i_itemNo, param_1); } void dComIfG_play_c::itemInit() { @@ -449,8 +424,8 @@ void dComIfG_play_c::itemInit() { mNowVibration = dComIfGs_getOptVibration(); } -void dComIfG_play_c::setItemBombNumCount(u8 i_item, s16 pCount) { - mItemBombNumCount[i_item] += pCount; +void dComIfG_play_c::setItemBombNumCount(u8 i_item, s16 count) { + mItemBombNumCount[i_item] += count; } s16 dComIfG_play_c::getItemBombNumCount(u8 i_item) { @@ -461,23 +436,23 @@ void dComIfG_play_c::clearItemBombNumCount(u8 i_item) { mItemBombNumCount[i_item] = 0; } -void dComIfG_play_c::setNowVibration(u8 pStatus) { - mNowVibration = pStatus; +void dComIfG_play_c::setNowVibration(u8 vib_status) { + mNowVibration = vib_status; } u32 dComIfG_play_c::getNowVibration() { return mNowVibration; } -void dComIfG_play_c::setStartStage(dStage_startStage_c* pStartStage) { +void dComIfG_play_c::setStartStage(dStage_startStage_c* p_startStage) { mLayerOld = mStartStage.getLayer(); - mStartStage = *pStartStage; + mStartStage = *p_startStage; } /* 8002B3F4-8002B434 025D34 0040+00 1/1 0/0 0/0 .text dComIfG_get_timelayer__FPi */ -void dComIfG_get_timelayer(int* pLayer) { - if (dKy_daynight_check__Fv()) { - *pLayer += 1; +void dComIfG_get_timelayer(int* layer) { + if (dKy_daynight_check()) { + *layer += 1; } } @@ -1163,7 +1138,8 @@ int dComIfG_play_c::getLayerNo_common_common(const char* stageName, int roomId, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dComIfG_play_c::getLayerNo_common_common(char const* param_0, int param_1, int param_2) { +asm int dComIfG_play_c::getLayerNo_common_common(char const* i_stageName, int i_roomID, + int i_layerOverride) { nofralloc #include "asm/d/com/d_com_inf_game/getLayerNo_common_common__14dComIfG_play_cFPCcii.s" } @@ -1183,104 +1159,74 @@ int dComIfG_play_c::getLayerNo_common(char const* i_stageName, int i_roomID, int /* 8002C97C-8002C9D8 0272BC 005C+00 1/1 22/22 68/68 .text getLayerNo__14dComIfG_play_cFi */ -#ifdef NONMATCHING -int dComIfG_play_c::getLayerNo(int param_0) { - int roomNo = dComIfGp_roomControl_getStayNo(); +int dComIfG_play_c::getLayerNo(int) { + s32 roomNo = dComIfGp_roomControl_getStayNo(); - if (roomNo <= -1) { + if ((s8)roomNo <= -1) { roomNo = dComIfGp_getStartStageRoomNo(); } - int layer = dComIfGp_getStartStageLayer(); - const char* stage = dComIfGp_getStartStageName(); - - return getLayerNo_common(stage, roomNo, layer); + return getLayerNo_common(dComIfGp_getStartStageName(), roomNo, dComIfGp_getStartStageLayer()); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dComIfG_play_c::getLayerNo(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/getLayerNo__14dComIfG_play_cFi.s" -} -#pragma pop -#endif /* 8002C9D8-8002CA1C 027318 0044+00 0/0 1/1 0/0 .text createParticle__14dComIfG_play_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::createParticle() { - nofralloc -#include "asm/d/com/d_com_inf_game/createParticle__14dComIfG_play_cFv.s" +void dComIfG_play_c::createParticle() { + mParticle = new dPa_control_c(); } -#pragma pop /* 8002CA1C-8002CA70 02735C 0054+00 0/0 1/1 0/0 .text createSimpleModel__14dComIfG_play_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 dComIfG_play_c::createSimpleModel() { - nofralloc -#include "asm/d/com/d_com_inf_game/createSimpleModel__14dComIfG_play_cFv.s" +dSmplMdl_draw_c* dComIfG_play_c::createSimpleModel() { + if (mSimpleModel == NULL) { + mSimpleModel = new dSmplMdl_draw_c(); + } + return mSimpleModel; } -#pragma pop /* 8002CA70-8002CAC4 0273B0 0054+00 0/0 1/1 0/0 .text deleteSimpleModel__14dComIfG_play_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::deleteSimpleModel() { - nofralloc -#include "asm/d/com/d_com_inf_game/deleteSimpleModel__14dComIfG_play_cFv.s" +void dComIfG_play_c::deleteSimpleModel() { + if (mSimpleModel != NULL) { + delete mSimpleModel; + mSimpleModel = NULL; + } } -#pragma pop /* 8002CAC4-8002CAF0 027404 002C+00 0/0 1/1 0/0 .text drawSimpleModel__14dComIfG_play_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::drawSimpleModel() { - nofralloc -#include "asm/d/com/d_com_inf_game/drawSimpleModel__14dComIfG_play_cFv.s" +void dComIfG_play_c::drawSimpleModel() { + if (mSimpleModel != NULL) { + mSimpleModel->draw(); + } } -#pragma pop /* 8002CAF0-8002CB30 027430 0040+00 0/0 0/0 16/16 .text * addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 dComIfG_play_c::addSimpleModel(J3DModelData* param_0, int param_1, u8 param_2) { - nofralloc -#include "asm/d/com/d_com_inf_game/addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc.s" +int dComIfG_play_c::addSimpleModel(J3DModelData* i_modelData, int roomNo, u8 drawBG) { + if (mSimpleModel != NULL && mSimpleModel->addModel(i_modelData, roomNo, drawBG)) { + return 1; + } + + return -1; } -#pragma pop /* 8002CB30-8002CB68 027470 0038+00 0/0 0/0 16/16 .text * removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 dComIfG_play_c::removeSimpleModel(J3DModelData* param_0, int param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai.s" +int dComIfG_play_c::removeSimpleModel(J3DModelData* i_modelData, int roomNo) { + if (mSimpleModel != NULL) { + mSimpleModel->removeModel(i_modelData, roomNo); + return 1; + } + + return 0; } -#pragma pop /* 8002CB68-8002CB94 0274A8 002C+00 0/0 0/0 16/16 .text * entrySimpleModel__14dComIfG_play_cFP8J3DModeli */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 dComIfG_play_c::entrySimpleModel(J3DModel* param_0, int param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/entrySimpleModel__14dComIfG_play_cFP8J3DModeli.s" +void dComIfG_play_c::entrySimpleModel(J3DModel* i_model, int roomNo) { + if (mSimpleModel != NULL) { + mSimpleModel->entry(i_model, roomNo); + } } -#pragma pop void dComIfG_play_c::setTimerNowTimeMs(int time) { mTimerInfo.mTimerNowTimeMs = time; @@ -1315,8 +1261,8 @@ u8 dComIfG_play_c::getTimerType() { } /* 8002CBD4-8002CBDC -00001 0008+00 0/0 0/0 0/0 .text setTimerPtr__14dComIfG_play_cFP8dTimer_c */ -void dComIfG_play_c::setTimerPtr(dTimer_c* pTimerPtr) { - mTimerInfo.mTimerPtr = pTimerPtr; +void dComIfG_play_c::setTimerPtr(dTimer_c* ptr) { + mTimerInfo.mTimerPtr = ptr; } /* 8002CBDC-8002CBE4 02751C 0008+00 6/6 7/7 15/15 .text getTimerPtr__14dComIfG_play_cFv @@ -1339,13 +1285,6 @@ void dComIfG_inf_c::ct() { field_0x1de0a = 0xFF; } -/* ############################################################################################## */ -/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379043 = "F_SP102"; -#pragma pop - /* 80450600-80450604 000080 0004+00 0/0 18/18 2/2 .sdata g_clearColor */ SECTION_SDATA extern GXColor g_clearColor = {0, 0, 0, 0}; @@ -1354,35 +1293,43 @@ SECTION_SDATA extern GXColor g_blackColor = {0, 0, 0, 255}; /* 8002CC54-8002CD44 027594 00F0+00 1/1 1/1 0/0 .text dComIfG_changeOpeningScene__FP11scene_classs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_changeOpeningScene(scene_class* param_0, s16 param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_changeOpeningScene__FP11scene_classs.s" +int dComIfG_changeOpeningScene(scene_class* scene, s16 procName) { + dComIfGp_offEnableNextStage(); + dComIfGp_setNextStage("F_SP102", 100, 0, 10); + mDoAud_setSceneName(dComIfGp_getNextStageName(), dComIfGp_getNextStageRoomNo(), + dComIfGp_getNextStageLayer()); + dComIfGs_setRestartRoomParam(0); + + if (mDoGph_gInf_c::getFader()->getStatus() == 1) { + mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); + } + + fopScnM_ChangeReq(scene, procName, 0, 30); + fopScnM_ReRequest(procName, 0); + + return 1; } -#pragma pop /* 8002CD44-8002CDB8 027684 0074+00 0/0 2/2 0/0 .text dComIfG_resetToOpening__FP11scene_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL dComIfG_resetToOpening(scene_class* param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_resetToOpening__FP11scene_class.s" +BOOL dComIfG_resetToOpening(scene_class* scene) { + if (mDoRst::isReturnToMenu() || !mDoRst::isReset() || + mDoGph_gInf_c::getFader()->getStatus() == 2) { + return 0; + } + + dComIfG_changeOpeningScene(scene, PROC_OPENING_SCENE); + mDoAud_bgmStop(30); + mDoAud_resetProcess(); + return 1; } -#pragma pop static int phase_1(char* arc_name) { - int ret; - if (!dComIfG_setObjectRes(arc_name, 0, NULL)) { OSReport_Error("%s.arc Read Error !!\n", arc_name); - ret = 5; - } else { - ret = 2; + return 5; } - return ret; + + return 2; } /* 8002CE38-8002CEB4 027778 007C+00 1/0 0/0 0/0 .text phase_2__FPc */ @@ -1398,55 +1345,35 @@ static int phase_2(char* arc_name) { } /* 8002CEB4-8002CEBC 0277F4 0008+00 1/0 0/0 0/0 .text phase_3__FPc */ -static int phase_3(char* param_0) { +static int phase_3(char*) { return 4; } -typedef int (*dComIfG_phaseMethod)(char*); -typedef int (*dComIfG_phaseMethod0)(phaseParam_c*); - -/* ############################################################################################## */ -/* 803A71B8-803A71C4 -00001 000C+00 1/1 0/0 0/0 .data l_method$5017 */ -SECTION_DATA static dComIfG_phaseMethod l_method_5017[3] = { - phase_1, - phase_2, - phase_3, -}; - /* 8002CEBC-8002CEFC 0277FC 0040+00 0/0 7/7 550/550 .text * dComIfG_resLoad__FP30request_of_phase_process_classPCc */ -#ifdef NONMATCHING -int dComIfG_resLoad(request_of_phase_process_class* param_0, char const* param_1) { - if (param_0->mPhaseStep == 2) { +int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* arc_name) { + static int (*l_method[3])(void*) = {(int (*)(void*))phase_1, (int (*)(void*))phase_2, + (int (*)(void*))phase_3}; + + if (i_phase->mPhaseStep == 2) { return 4; - } else { - dComLbG_PhaseHandler(param_0, &l_method_5017[0], (void*)param_1); } - return 0; + + return dComLbG_PhaseHandler(i_phase, l_method, (void*)arc_name); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_resLoad(request_of_phase_process_class* param_0, char const* param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_resLoad__FP30request_of_phase_process_classPCc.s" -} -#pragma pop -#endif /* 8002CEFC-8002CF5C 02783C 0060+00 1/0 0/0 0/0 .text phase_01__FP12phaseParam_c */ -static int phase_01(phaseParam_c* param_0) { - if (dComIfG_setObjectRes(param_0->field_0x0, 0, param_0->heap) == 0) { +static int phase_01(phaseParam_c* phase) { + if (dComIfG_setObjectRes(phase->mResName, 0, phase->mpHeap) == 0) { return 5; - } else { - return 2; } + + return 2; } /* 8002CF5C-8002CFB8 02789C 005C+00 1/0 0/0 0/0 .text phase_02__FP12phaseParam_c */ -static int phase_02(phaseParam_c* param_0) { - int syncStatus = dComIfG_syncObjectRes(param_0->field_0x0); +static int phase_02(phaseParam_c* phase) { + int syncStatus = dComIfG_syncObjectRes(phase->mResName); if (syncStatus < 0) { return 5; } else { @@ -1455,90 +1382,102 @@ static int phase_02(phaseParam_c* param_0) { } /* 8002CFB8-8002CFC0 0278F8 0008+00 1/0 0/0 0/0 .text phase_03__FP12phaseParam_c */ -static int phase_03(phaseParam_c* param_0) { +static int phase_03(phaseParam_c*) { return false; } -/* ############################################################################################## */ -/* 803A71C4-803A71D0 -00001 000C+00 1/1 0/0 0/0 .data l_method$5051 */ -SECTION_DATA static dComIfG_phaseMethod0 l_method_5051[3] = { - phase_01, - phase_02, - phase_03, -}; - /* 8002CFC0-8002D008 027900 0048+00 1/1 3/3 0/0 .text * dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_resLoad(request_of_phase_process_class* param_0, char const* param_1, - JKRHeap* param_2) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap.s" +int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* resName, JKRHeap* heap) { + static int (*l_method[3])(void*) = {(int (*)(void*))phase_01, (int (*)(void*))phase_02, + (int (*)(void*))phase_03}; + + if (i_phase->mPhaseStep == 2) { + return 4; + } + + phaseParam_c param(resName, heap); + return dComLbG_PhaseHandler(i_phase, l_method, ¶m); } -#pragma pop /* 8002D008-8002D06C 027948 0064+00 1/1 10/10 540/540 .text * dComIfG_resDelete__FP30request_of_phase_process_classPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_resDelete(request_of_phase_process_class* param_0, char const* param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_resDelete__FP30request_of_phase_process_classPCc.s" -} -#pragma pop +int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resName) { + if (i_phase->mPhaseStep != 2) { + return 0; + } -u8 dComIfGp_getReverb(int param_0) { - return dStage_roomRead_dt_c_GetReverbStage(*dComIfGp_getStageRoom(), param_0); + dComIfG_deleteObjectResMain(resName); + i_phase->mPhaseStep = 0; + return 1; } -/* ############################################################################################## */ -/* 80451D00-80451D04 000300 0004+00 2/2 0/0 0/0 .sdata2 @5090 */ -SECTION_SDATA2 static f32 lit_5090 = -1000000000.0f; +u8 dComIfGp_getReverb(int roomNo) { + return dStage_roomRead_dt_c_GetReverbStage(*dComIfGp_getStageRoom(), roomNo); +} + +inline int dComIfGd_setSimpleShadow(cXyz* pos, f32 param_1, f32 param_2, cXyz* param_3, s16 angle, + f32 param_5, _GXTexObj* tex) { + return g_dComIfG_gameInfo.drawlist.setSimpleShadow(pos, param_1, param_2, param_3, angle, + param_5, tex); +} /* 8002D0B4-8002D1AC 0279F4 00F8+00 0/0 3/3 34/34 .text * dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGd_setSimpleShadow(cXyz* param_0, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, - s16 param_4, f32 param_5, _GXTexObj* param_6) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj.s" +int dComIfGd_setSimpleShadow(cXyz* pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, s16 angle, + f32 param_5, _GXTexObj* tex) { + if (param_3.ChkSetInfo() && -1000000000.0f != param_1) { + cM3dGPla plane; + dComIfG_Bgsp().GetTriPla(param_3, &plane); + + return dComIfGd_setSimpleShadow(pos, param_1, param_2, &plane.mNormal, angle, param_5, tex); + } else { + return 0; + } } -#pragma pop /* 8002D1AC-8002D25C 027AEC 00B0+00 0/0 0/0 1/1 .text dComIfGp_getMapTrans__FiPfPfPs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_getMapTrans(int param_0, f32* param_1, f32* param_2, s16* param_3) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_getMapTrans__FiPfPfPs.s" +int dComIfGp_getMapTrans(int roomNo, f32* transX, f32* transY, s16* angle) { + dStage_Multi_c* multi = dComIfGp_getMulti(); + if (multi == NULL) { + return 0; + } + + dStage_Mult_info* info = multi->mInfo; + for (int i = 0; i < multi->field_0x0; i++) { + if (roomNo == info->mRoomNo) { + *transX = info->mTransX; + *transY = info->mTransY; + *angle = info->mAngle; + return 1; + } + info++; + } + + return 0; } -#pragma pop /* 8002D25C-8002D2AC 027B9C 0050+00 0/0 3/3 3/3 .text dComIfGp_getRoomCamera__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_getRoomCamera(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_getRoomCamera__Fi.s" +stage_camera_class* dComIfGp_getRoomCamera(int roomNo) { + dStage_roomStatus_c* status = dComIfGp_roomControl_getStatusRoomDt(roomNo); + + if (status == NULL) { + return NULL; + } + + return status->mRoomDt.getCamera(); } -#pragma pop /* 8002D2AC-8002D2FC 027BEC 0050+00 0/0 3/3 3/3 .text dComIfGp_getRoomArrow__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_getRoomArrow(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_getRoomArrow__Fi.s" +stage_arrow_class* dComIfGp_getRoomArrow(int roomNo) { + dStage_roomStatus_c* status = dComIfGp_roomControl_getStatusRoomDt(roomNo); + + if (status == NULL) { + return NULL; + } + + return status->mRoomDt.getArrow(); } -#pragma pop /* ############################################################################################## */ /* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -1548,29 +1487,82 @@ SECTION_DEAD static char const* const stringBase_80379089 = ""; #pragma pop /* 8002D2FC-8002D554 027C3C 0258+00 2/2 7/7 4/4 .text dComIfGp_setNextStage__FPCcsScScfUliScsii */ +// 1 out of order instruction, small regalloc +#ifdef NONMATCHING +void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer, f32 lastSpeed, + u32 lastMode, int param_6, s8 wipe, s16 lastAngle, int param_9, + int param_10) { + u32 mode = lastMode; + + if (layer >= 15) { + layer = -1; + } + + if (dComIfGs_isPlayerFieldLastStayFieldDataExistFlag() && + daPy_getLinkPlayerActorClass() != NULL) { + s8 curPoint = (s8)daPy_getLinkPlayerActorClass()->mCurrent.mRoomNo; + cXyz pos = dMapInfo_n::getMapPlayerPos(); + s16 angle = daPy_getLinkPlayerActorClass()->mCollisionRot.y; + u8 level = dComIfGp_getNowLevel(); + dComIfGs_setPlayerFieldLastStayInfo(dComIfGp_getStartStageName(), pos, angle, curPoint, + level); + } + + if (!strcmp(stage, "F_SP121") && roomNo == 13 && (point == 99 || point == 98) && layer == 2) { + dComIfGs_setKeyNum(6, 2); + } else { + dComIfGs_setKeyNum(6, 0); + } + + if (daAlink_getAlinkActorClass() != NULL) { + daAlink_getAlinkActorClass()->setLastSceneMode(&mode); + } + + if (strcmp(dMeter2Info_getSaveStageName(), "") && + strcmp(stage, dMeter2Info_getSaveStageName())) { + dMeter2Info_setSaveStageName(""); + } + + u8 wipe_speed; + switch (param_10) { + case 0: + wipe_speed = 26; + break; + case 1: + wipe_speed = 13; + break; + case 2: + wipe_speed = 6; + break; + case 3: + wipe_speed = 1; + break; + default: + wipe_speed = 26; + break; + } + + g_dComIfG_gameInfo.play.setNextStage(stage, roomNo, point, layer, wipe, wipe_speed); + g_dComIfG_gameInfo.info.getRestart().setLastSceneInfo(lastSpeed, mode, lastAngle); + if (param_6 != 0) { + dComIfGs_setStartPoint(point); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGp_setNextStage(char const* param_0, s16 param_1, s8 param_2, s8 param_3, - f32 param_4, u32 param_5, int param_6, s8 param_7, s16 param_8, - int param_9, int param_10) { +asm void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer, f32 lastSpeed, + u32 lastMode, int param_6, s8 wipe, s16 lastAngle, int param_9, + int param_10) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGp_setNextStage__FPCcsScScfUliScsii.s" } #pragma pop +#endif -/* ############################################################################################## */ -/* 80451D04-80451D08 000304 0004+00 2/2 0/0 0/0 .sdata2 @5226 */ -SECTION_SDATA2 static u8 lit_5226[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -void dComIfGp_setNextStage(char const* param_0, s16 param_1, s8 param_2, s8 param_3) { - dComIfGp_setNextStage(param_0, param_1, param_2, param_3, FLOAT_LABEL(lit_5226), 0, 1, 0, 0, 1, - 0); +void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer) { + dComIfGp_setNextStage(stage, point, roomNo, layer, 0.0f, 0, 1, 0, 0, 1, 0); } BOOL dComIfGs_isStageTbox(int i_stageNo, int i_no) { @@ -1652,15 +1644,32 @@ s8 dComIfGs_sense_type_change_Get() { return g_dComIfG_gameInfo.field_0x1ddfa; } +inline void dComIfGs_onSvZoneSwitch(int zoneNo, int swBit) { + g_dComIfG_gameInfo.info.getZone(zoneNo).getZoneBit().onSwitch(swBit); +} + /* 8002D94C-8002D9B0 02828C 0064+00 0/0 1/1 17/17 .text dComIfGs_onZoneSwitch__Fii */ +#ifdef NONMATCHING +void dComIfGs_onZoneSwitch(int swBit, int roomNo) { + if (roomNo < 0) { + return; + } + + if (dComIfGp_roomControl_getStayNo() >= 0) { + int zoneNo = dStage_roomControl_c::getZoneNo(roomNo); + dComIfGs_onSvZoneSwitch(zoneNo, swBit); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_onZoneSwitch(int param_0, int param_1) { +asm void dComIfGs_onZoneSwitch(int swBit, int roomNo) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_onZoneSwitch__Fii.s" } #pragma pop +#endif int dStage_roomControl_c::getZoneNo(int i_roomNo) { return mStatus[i_roomNo].getZoneNo(); @@ -1750,73 +1759,94 @@ void dComIfGs_setMixItemIndex(int i_no, u8 item_index) { } /* 8002DD3C-8002DDC8 02867C 008C+00 3/3 1/1 0/0 .text dComIfGs_getSelectMixItemNoArrowIndex__Fi */ -#ifdef NONMATCHING -u8 dComIfGs_getSelectMixItemNoArrowIndex(int p1) { - u8 item_index = dComIfGs_getSelectItemIndex(p1); - u8 mix_index = dComIfGs_getMixItemIndex(p1); +u8 dComIfGs_getSelectMixItemNoArrowIndex(int index) { + u8 item_index = dComIfGs_getSelectItemIndex(index); + u8 mix_index = dComIfGs_getMixItemIndex(index); - if (item_index >= 0xf && item_index < 0x12) { + if (item_index >= SLOT_15 && item_index < SLOT_18) { return item_index; } - else if (mix_index != 255 && (mix_index >= 0xf && mix_index < 0x12)) { - return 255; + if (mix_index != NO_ITEM && mix_index >= SLOT_15 && mix_index < SLOT_18) { + return mix_index; } - // return p1; + return NO_ITEM; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dComIfGs_getSelectMixItemNoArrowIndex(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_getSelectMixItemNoArrowIndex__Fi.s" -} -#pragma pop -#endif u8 dComIfGs_getMixItemIndex(int i_no) { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMixItemIndex(i_no); } /* 8002DDF4-8002DF1C 028734 0128+00 1/1 13/13 0/0 .text dComIfGp_setSelectItem__Fi */ -void dComIfGp_setSelectItem(int idx) { - if (idx == 2) { - if (dComIfGs_getSelectItemIndex(idx) != 0xFF) { - u8 selectItemIdx = dComIfGs_getSelectItemIndex(idx); - g_dComIfG_gameInfo.play.setSelectItem(idx, selectItemIdx); +void dComIfGp_setSelectItem(int index) { + if (index == SELECT_ITEM_DOWN) { + if (dComIfGs_getSelectItemIndex(index) != NO_ITEM) { + u8 selectItemIdx = dComIfGs_getSelectItemIndex(index); + g_dComIfG_gameInfo.play.setSelectItem(index, selectItemIdx); - if (selectItemIdx == 0xFF) { - dComIfGs_setSelectItemIndex(idx, -1); + if (selectItemIdx == NO_ITEM) { + dComIfGs_setSelectItemIndex(index, NO_ITEM); } } else { - g_dComIfG_gameInfo.play.setSelectItem(idx, -1); + g_dComIfG_gameInfo.play.setSelectItem(index, NO_ITEM); + } + } else if (dComIfGs_getSelectItemIndex(index) != NO_ITEM) { + u8 item = dComIfGs_getItem(dComIfGs_getSelectItemIndex(index), false); + g_dComIfG_gameInfo.play.setSelectItem(index, item); + + if (item == NO_ITEM) { + dComIfGs_setSelectItemIndex(index, NO_ITEM); } } else { - if (dComIfGs_getSelectItemIndex(idx) != 0xFF) { - u8 selectItemIdx = dComIfGs_getSelectItemIndex(idx); - u8 item = dComIfGs_getItem(selectItemIdx, 0); - g_dComIfG_gameInfo.play.setSelectItem(idx, item); - - if (item == 0xFF) { - dComIfGs_setSelectItemIndex(idx, -1); - } - } else { - g_dComIfG_gameInfo.play.setSelectItem(idx, -1); - } + g_dComIfG_gameInfo.play.setSelectItem(index, NO_ITEM); } } /* 8002DF1C-8002E048 02885C 012C+00 4/4 19/19 0/0 .text dComIfGp_getSelectItem__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dComIfGp_getSelectItem(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_getSelectItem__Fi.s" +u8 dComIfGp_getSelectItem(int index) { + u8 playItem = g_dComIfG_gameInfo.play.getSelectItem(index); + + if ((index == SELECT_ITEM_X || index == SELECT_ITEM_Y) && + dComIfGs_getMixItemIndex(index) != NO_ITEM) { + u8 saveItem = dComIfGs_getItem(dComIfGs_getMixItemIndex(index), false); + + if (saveItem == BOW) { + saveItem = playItem; + playItem = BOW; + } else if (saveItem == FISHING_ROD_1) { + saveItem = playItem; + playItem = FISHING_ROD_1; + } + + if (playItem == BOW) { + switch (saveItem) { + case NORMAL_BOMB: + case WATER_BOMB: + case POKE_BOMB: + playItem = BOMB_ARROW; + break; + case HAWK_EYE: + playItem = HAWK_ARROW; + break; + } + } else if (playItem == FISHING_ROD_1) { + switch (saveItem) { + case BEE_CHILD: + playItem = BEE_ROD; + break; + case WORM: + playItem = WORM_ROD; + break; + case ZORAS_JEWEL: + playItem = JEWEL_ROD; + break; + } + } + } + + return playItem; } -#pragma pop void dComIfGp_mapShow() { dComIfGs_offEventBit(0x1D01); @@ -1831,33 +1861,32 @@ bool dComIfGp_checkMapShow() { } /* 8002E0E0-8002E188 028A20 00A8+00 0/0 9/9 0/0 .text dComIfGp_setHeapLockFlag__FUc */ -s32 dComIfGp_setHeapLockFlag(u8 param_0) { - if (param_0 == 7 || param_0 == 8) { +s32 dComIfGp_setHeapLockFlag(u8 flag) { + if (flag == 7 || flag == 8) { if (!dComIfGp_isHeapLockFlag()) { dComIfGp_createSubExpHeap2D(); } g_dComIfG_gameInfo.play.setHeapLockFlag(5); - int check = dComIfGp_checkEmptySubHeap2D(); - if (check >= 0) { - dComIfGp_setSubHeapLockFlag(check, param_0); + int heapIndex = dComIfGp_checkEmptySubHeap2D(); + if (heapIndex >= 0) { + dComIfGp_setSubHeapLockFlag(heapIndex, flag); } + } else if (flag == 0) { + dComIfGp_offHeapLockFlag(0); } else { - if (param_0 == 0) { - dComIfGp_offHeapLockFlag(0); - } else { - g_dComIfG_gameInfo.play.setHeapLockFlag(param_0); - } + g_dComIfG_gameInfo.play.setHeapLockFlag(flag); } + return 1; } -s32 dComIfGp_offHeapLockFlag(int param_0) { +s32 dComIfGp_offHeapLockFlag(int flag) { if (dComIfGp_isHeapLockFlag() == 5) { - if (param_0 == 7 || param_0 == 8) { - int check = dComIfGp_searchUseSubHeap2D(param_0); - if (check >= 0) { - dComIfGp_setSubHeapLockFlag(check, 0); + if (flag == 7 || flag == 8) { + int heapIndex = dComIfGp_searchUseSubHeap2D(flag); + if (heapIndex >= 0) { + dComIfGp_setSubHeapLockFlag(heapIndex, 0); } if (!dComIfGp_getSubHeapLockFlag(0) && !dComIfGp_getSubHeapLockFlag(1)) { @@ -1868,6 +1897,7 @@ s32 dComIfGp_offHeapLockFlag(int param_0) { } else { g_dComIfG_gameInfo.play.offHeapLockFlag(); } + return 1; } @@ -1903,10 +1933,10 @@ int dComIfGp_checkEmptySubHeap2D() { return -1; } -int dComIfGp_searchUseSubHeap2D(int param_0) { +int dComIfGp_searchUseSubHeap2D(int flag) { if (dComIfGp_isHeapLockFlag() == 5) { for (int i = 0; i < 2; i++) { - if (param_0 == dComIfGp_getSubHeapLockFlag(i)) { + if (flag == dComIfGp_getSubHeapLockFlag(i)) { return i; } } @@ -1914,10 +1944,10 @@ int dComIfGp_searchUseSubHeap2D(int param_0) { return -1; } -JKRExpHeap* dComIfGp_getSubHeap2D(int param_0) { +JKRExpHeap* dComIfGp_getSubHeap2D(int flag) { if (dComIfGp_isHeapLockFlag() == 5) { for (int i = 0; i < 2; i++) { - if (param_0 == dComIfGp_getSubHeapLockFlag(i)) { + if (flag == dComIfGp_getSubHeapLockFlag(i)) { return dComIfGp_getSubExpHeap2D(i); } } @@ -1925,20 +1955,19 @@ JKRExpHeap* dComIfGp_getSubHeap2D(int param_0) { return NULL; } -static u8 l_itemno[24] = { - M_BEETLE, F_BEETLE, M_BUTTERFLY, F_BUTTERFLY, M_STAG_BEETLE, F_STAG_BEETLE, - M_GRASSHOPPER, F_GRASSHOPPER, M_NANAFUSHI, F_NANAFUSHI, M_DANGOMUSHI, F_DANGOMUSHI, - M_MANTIS, F_MANTIS, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL, - M_DRAGONFLY, F_DRAGONFLY, M_ANT, F_ANT, M_MAYFLY, F_MAYFLY, -}; - int dComIfGs_checkGetInsectNum() { + static u8 l_itemno[24] = { + M_BEETLE, F_BEETLE, M_BUTTERFLY, F_BUTTERFLY, M_STAG_BEETLE, F_STAG_BEETLE, + M_GRASSHOPPER, F_GRASSHOPPER, M_NANAFUSHI, F_NANAFUSHI, M_DANGOMUSHI, F_DANGOMUSHI, + M_MANTIS, F_MANTIS, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL, + M_DRAGONFLY, F_DRAGONFLY, M_ANT, F_ANT, M_MAYFLY, F_MAYFLY, + }; + int insectCount = 0; - u8* insectList = &l_itemno[0]; - u8 insectId; + u8* insectList = l_itemno; for (int i = 0; i < ARRAY_SIZE(l_itemno); i++) { - insectId = *insectList; + u8 insectId = *insectList; insectList++; if (dComIfGs_isItemFirstBit(insectId) && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) { @@ -1948,21 +1977,24 @@ int dComIfGs_checkGetInsectNum() { return insectCount; } -u8 dComIfGs_checkGetItem(u8 i_no) { +u8 dComIfGs_checkGetItem(u8 i_itemNo) { u8 count = 0; for (int i = 0; i < 60; i++) { - if (i_no == dComIfGs_getItem(i, true)) { + if (i_itemNo == dComIfGs_getItem(i, true)) { count++; } } - if (dComIfGs_getSelectEquipClothes() == i_no) { + + if (dComIfGs_getSelectEquipClothes() == i_itemNo) { count++; } - if (dComIfGs_getSelectEquipSword() == i_no) { + + if (dComIfGs_getSelectEquipSword() == i_itemNo) { count++; } - if (dComIfGs_getSelectEquipShield() == i_no) { + + if (dComIfGs_getSelectEquipShield() == i_itemNo) { count++; } @@ -1974,18 +2006,18 @@ u8 dComIfGs_getBottleMax() { } /* 8002E5C0-8002E688 028F00 00C8+00 0/0 11/11 0/0 .text dComIfGp_getSelectItemNum__Fi */ -int dComIfGp_getSelectItemNum(int param_0) { - u8 selectItem = dComIfGp_getSelectItem(param_0); +int dComIfGp_getSelectItemNum(int index) { + u8 selectItem = dComIfGp_getSelectItem(index); int itemNum = 0; if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || selectItem == BOMB_ARROW) { - selectItem = dComIfGs_getSelectMixItemNoArrowIndex(param_0) - SLOT_15; + selectItem = dComIfGs_getSelectMixItemNoArrowIndex(index) - SLOT_15; itemNum = dComIfGs_getBombNum(selectItem); } else if (selectItem == PACHINKO) { itemNum = dComIfGs_getPachinkoNum(); } else if (selectItem == BEE_CHILD) { - selectItem = dComIfGs_getSelectItemIndex(param_0); + selectItem = dComIfGs_getSelectItemIndex(index); itemNum = dComIfGs_getBottleNum(selectItem - SLOT_11); } @@ -1993,8 +2025,8 @@ int dComIfGp_getSelectItemNum(int param_0) { } /* 8002E688-8002E714 028FC8 008C+00 0/0 5/5 0/0 .text dComIfGp_getSelectItemMaxNum__Fi */ -int dComIfGp_getSelectItemMaxNum(int param_0) { - u8 selectItem = dComIfGp_getSelectItem(param_0); +int dComIfGp_getSelectItemMaxNum(int index) { + u8 selectItem = dComIfGp_getSelectItem(index); int itemNum = 0; if (selectItem == BOMB_BAG_LV1) { @@ -2012,98 +2044,73 @@ int dComIfGp_getSelectItemMaxNum(int param_0) { } /* 8002E714-8002E83C 029054 0128+00 0/0 2/2 0/0 .text dComIfGp_setSelectItemNum__Fis */ -// two swapped instructions -#ifdef NONMATCHING -void dComIfGp_setSelectItemNum(int param_0, s16 param_1) { - u8 selectItem = dComIfGp_getSelectItem(param_0); - u8 selectMixItem; - int itemNum; +void dComIfGp_setSelectItemNum(int index, s16 num) { + u8 selectItem = dComIfGp_getSelectItem(index); if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || selectItem == BOMB_ARROW) { - selectMixItem = dComIfGs_getSelectMixItemNoArrowIndex(param_0) - SLOT_15; - itemNum = dComIfGs_getBombMax(selectItem); + u8 mix_index = dComIfGs_getSelectMixItemNoArrowIndex(index) - SLOT_15; - if (itemNum > param_1) { - param_1 = dComIfGs_getBombMax(selectItem); + if (num > dComIfGs_getBombMax(selectItem)) { + num = dComIfGs_getBombMax(selectItem); } - dComIfGs_setBombNum(selectMixItem, param_1); + dComIfGs_setBombNum(mix_index, num); } else if (selectItem == PACHINKO) { - dComIfGs_setPachinkoNum(param_1); + dComIfGs_setPachinkoNum(num); } else if (selectItem == BEE_CHILD) { - selectItem = dComIfGs_getSelectItemIndex(param_0) - SLOT_11; - itemNum = dComIfGs_getBottleMax(); + u8 bottle_idx = dComIfGs_getSelectItemIndex(index) - SLOT_11; - if (itemNum > param_1) { - param_1 = dComIfGs_getBottleMax(); + if (num > dComIfGs_getBottleMax()) { + num = dComIfGs_getBottleMax(); } - dComIfGs_setBottleNum(selectItem, param_1); + dComIfGs_setBottleNum(bottle_idx, num); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_setSelectItemNum(int param_0, s16 param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_setSelectItemNum__Fis.s" -} -#pragma pop -#endif /* 8002E83C-8002E910 02917C 00D4+00 0/0 5/5 0/0 .text dComIfGp_addSelectItemNum__Fis */ -void dComIfGp_addSelectItemNum(int param_0, s16 param_1) { - u8 selectItem = dComIfGp_getSelectItem(param_0); - u8 selectMixItem; - int itemNum; +void dComIfGp_addSelectItemNum(int index, s16 num) { + u8 selectItem = dComIfGp_getSelectItem(index); if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || selectItem == BOMB_ARROW) { - selectMixItem = dComIfGs_getSelectMixItemNoArrowIndex(param_0) - SLOT_15; - dComIfGp_setItemBombNumCount(selectMixItem, param_1); + u8 mix_index = dComIfGs_getSelectMixItemNoArrowIndex(index) - SLOT_15; + dComIfGp_setItemBombNumCount(mix_index, num); } else if (selectItem == PACHINKO) { - dComIfGp_setItemPachinkoNumCount(param_1); + dComIfGp_setItemPachinkoNumCount(num); } else if (selectItem == BEE_CHILD) { - selectItem = dComIfGs_getSelectItemIndex(param_0); - dComIfGs_addBottleNum(selectItem - SLOT_11, param_1); + selectItem = dComIfGs_getSelectItemIndex(index); + dComIfGs_addBottleNum(selectItem - SLOT_11, num); } } +inline int dComIfGd_setRealShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, + f32 param_4, f32 param_5, dKy_tevstr_c* param_6) { + return g_dComIfG_gameInfo.drawlist.setRealShadow(param_0, param_1, param_2, param_3, param_4, + param_5, param_6); +} + /* 8002E910-8002E974 029250 0064+00 0/0 5/5 137/137 .text * dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4, - f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8, - dKy_tevstr_c* param_9, s16 param_10, f32 param_11, - _GXTexObj* param_12) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj.s" +int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4, + f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8, + dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12) { + if (param_7 <= -1000000000.0f) { + return 0; + } else { + return dComIfGd_setRealShadow(param_0, param_1, param_2, param_3, param_4, + param_6 - param_7, param_9); + } } -#pragma pop /* 8002E974-8002E9D4 0292B4 0060+00 0/0 1/1 0/0 .text dComIfGs_gameStart__Fv */ -// instruction in wrong place -#ifdef NONMATCHING void dComIfGs_gameStart() { dComIfGp_offEnableNextStage(); s8 roomNo = g_dComIfG_gameInfo.info.getPlayer().getPlayerReturnPlace().getRoomNo(); - u8 status = g_dComIfG_gameInfo.info.getPlayer().getPlayerReturnPlace().getPlayerStatus(); + s16 point = g_dComIfG_gameInfo.info.getPlayer().getPlayerReturnPlace().getPlayerStatus(); char* name = g_dComIfG_gameInfo.info.getPlayer().getPlayerReturnPlace().getName(); - dComIfGp_setNextStage(name, status, roomNo, -1, FLOAT_LABEL(lit_5226), 0, 1, 0, 0, 0, 0); + dComIfGp_setNextStage(name, point, roomNo, -1, 0.0f, 0, 1, 0, 0, 0, 0); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_gameStart() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_gameStart__Fv.s" -} -#pragma pop -#endif u32 dComIfG_getTrigA(u32 pad) { return mDoCPd_c::getTrigA(pad); @@ -2152,23 +2159,28 @@ BOOL dComIfGp_isLightDropMapVisible() { } /* 8002EE60-8002EEB0 0297A0 0050+00 1/1 11/11 0/0 .text dComIfGp_getNowLevel__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_getNowLevel() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_getNowLevel__Fv.s" -} -#pragma pop +u8 dComIfGp_getNowLevel() { + int roomNo = -1; + if (daPy_getLinkPlayerActorClass() != NULL) { + roomNo = fopAcM_GetRoomNo(daPy_getLinkPlayerActorClass()); + } -void dComIfGs_setSelectEquipClothes(u8 item) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(COLLECT_CLOTHING, item); + if (roomNo < 0) { + roomNo = dComIfGp_getStartStageRoomNo(); + } + + return dStage_roomControl_c::getRegionNo(roomNo); +} + +void dComIfGs_setSelectEquipClothes(u8 i_itemNo) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(COLLECT_CLOTHING, + i_itemNo); } /* 8002EEC0-8002EF94 029800 00D4+00 0/0 4/4 1/1 .text dComIfGs_setSelectEquipSword__FUc */ -void dComIfGs_setSelectEquipSword(u8 i_itemId) { - switch (i_itemId) { +void dComIfGs_setSelectEquipSword(u8 i_itemNo) { + switch (i_itemNo) { case SWORD: dComIfGs_setCollectSword(COLLECT_ORDON_SWORD); break; @@ -2183,13 +2195,13 @@ void dComIfGs_setSelectEquipSword(u8 i_itemId) { break; } - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(1, i_itemId); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(COLLECT_SWORD, i_itemNo); } /* 8002EF94-8002F040 0298D4 00AC+00 0/0 2/2 0/0 .text dComIfGs_setSelectEquipShield__FUc */ -void dComIfGs_setSelectEquipShield(u8 i_itemId) { - switch (i_itemId) { +void dComIfGs_setSelectEquipShield(u8 i_itemNo) { + switch (i_itemNo) { case WOOD_SHIELD: dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD); break; @@ -2201,7 +2213,7 @@ void dComIfGs_setSelectEquipShield(u8 i_itemId) { break; } - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(2, i_itemId); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(COLLECT_SHIELD, i_itemNo); } void dComIfGs_setKeyNum(int i_stageNo, u8 keyNum) { @@ -2218,31 +2230,31 @@ void dComIfGs_setKeyNum(int i_stageNo, u8 keyNum) { /* 8002F0E0-8002F128 029A20 0048+00 1/1 0/0 0/0 .text dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc */ -static void dComIfGs_setWarpItemData(int param_0, char const* param_1, cXyz param_2, s16 param_3, - s8 param_4, u8 param_5, u8 param_6) { - g_dComIfG_gameInfo.play.setWarpItemData(param_1, param_2, param_3, param_4, param_5, param_6); +static void dComIfGs_setWarpItemData(int param_0, char const* stage, cXyz pos, s16 angle, s8 roomNo, + u8 param_5, u8 param_6) { + g_dComIfG_gameInfo.play.setWarpItemData(stage, pos, angle, roomNo, param_5, param_6); } -void dComIfG_play_c::setWarpItemData(char const* param_0, cXyz param_1, s16 param_2, s8 param_3, - u8 param_4, u8 param_5) { - strcpy(field_0x4F94, param_0); - field_0x4f9c.set(param_1); - field_0x4fa8 = param_2; - field_0x4faa = param_3; +void dComIfG_play_c::setWarpItemData(char const* stage, cXyz pos, s16 angle, s8 roomNo, u8 param_4, + u8 param_5) { + strcpy(mWarpItemStage, stage); + mWarpItemPos.set(pos); + mWarpItemAngle = angle; + mWarpItemRoom = roomNo; field_0x4fac = param_5; field_0x4fab = param_4; } -void dComIfGs_setWarpItemData(char const* param_0, cXyz param_1, s16 param_2, s8 param_3, - u8 param_4, u8 param_5) { - dComIfGs_setWarpItemData(0, param_0, param_1, param_2, param_3, param_4, param_5); - dComIfGs_setLastWarpMarkItemData(param_0, param_1, param_2, param_3, param_4, param_5); +void dComIfGs_setWarpItemData(char const* stage, cXyz pos, s16 angle, s8 roomNo, u8 param_4, + u8 param_5) { + dComIfGs_setWarpItemData(0, stage, pos, angle, roomNo, param_4, param_5); + dComIfGs_setLastWarpMarkItemData(stage, pos, angle, roomNo, param_4, param_5); } -void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 room, u8 unk1, +void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 roomNo, u8 unk1, u8 unk2) { g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().setWarpItemData(stage, pos, angle, - room, unk1, unk2); + roomNo, unk1, unk2); } const char* dComIfGs_getWarpStageName() { @@ -2250,20 +2262,9 @@ const char* dComIfGs_getWarpStageName() { } /* 8002F2BC-8002F2CC 029BFC 0010+00 0/0 1/1 0/0 .text dComIfGs_getWarpPlayerPos__Fv */ -#ifdef NONMATCHING -cXyz dComIfGs_getWarpPlayerPos() { +cXyz& dComIfGs_getWarpPlayerPos() { return dComIfGs_getLastWarpMarkPlayerPos(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cXyz& dComIfGs_getWarpPlayerPos() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_getWarpPlayerPos__Fv.s" -} -#pragma pop -#endif s16 dComIfGs_getWarpPlayerAngleY() { return dComIfGs_getLastWarpMarkPlayerAngleY(); @@ -2277,39 +2278,42 @@ BOOL dComIfGs_getWarpMarkFlag() { return dComIfGs_getLastWarpAcceptStage() >= 0; } -void dComIfGs_setWarpMarkFlag(u8 param_0) { +void dComIfGs_setWarpMarkFlag(u8) { /* empty function */ } /* 8002F314-8002F328 029C54 0014+00 0/0 0/0 1/1 .text __ct__19dComIfG_resLoader_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dComIfG_resLoader_c::dComIfG_resLoader_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__19dComIfG_resLoader_cFv.s" +dComIfG_resLoader_c::dComIfG_resLoader_c() { + field_0x0 = NULL; + field_0x4.mPhaseStep = 0; + field_0xc = 0; } -#pragma pop /* 8002F328-8002F3B4 029C68 008C+00 0/0 0/0 1/1 .text __dt__19dComIfG_resLoader_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dComIfG_resLoader_c::~dComIfG_resLoader_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__19dComIfG_resLoader_cFv.s" +dComIfG_resLoader_c::~dComIfG_resLoader_c() { + if (field_0x0 != NULL) { + for (int i = field_0xc; i >= 0; i--) { + dComIfG_resDelete(&field_0x4, field_0x0[i]); + field_0x4.mPhaseStep = 2; + } + } } -#pragma pop /* 8002F3B4-8002F434 029CF4 0080+00 0/0 0/0 1/1 .text load__19dComIfG_resLoader_cFPPCcP7JKRHeap */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_resLoader_c::load(char const** param_0, JKRHeap* param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/load__19dComIfG_resLoader_cFPPCcP7JKRHeap.s" +int dComIfG_resLoader_c::load(char const** param_0, JKRHeap* heap) { + field_0x0 = param_0; + + int ret = dComIfG_resLoad(&field_0x4, field_0x0[field_0xc], heap); + if (ret == 4) { + if (field_0x0[field_0xc + 1][0] != 0) { + field_0xc++; + field_0x4.mPhaseStep = 0; + ret = 0; + } + } + + return ret; } -#pragma pop /* 8002F434-8002F478 029D74 0044+00 0/0 12/12 12/12 .text dComIfG_getStageRes__FPCc */ void* dComIfG_getStageRes(char const* resName) { @@ -2321,15 +2325,14 @@ void* dComIfG_getOldStageRes(char const* resName) { return dComIfG_getStageRes("Xtg_00", resName); } -static char buf[32]; - -char* dComIfG_getRoomArcName(int param_0) { - sprintf((char*)buf, (char*)"R%02d_00", param_0); +char* dComIfG_getRoomArcName(int roomNo) { + static char buf[32]; + sprintf(buf, "R%02d_00", roomNo); return buf; } /* 8002F500-8002F504 029E40 0004+00 0/0 1/1 0/0 .text dComIfGp_ret_wp_set__FSc */ -void dComIfGp_ret_wp_set(s8 param_0) { +void dComIfGp_ret_wp_set(s8) { /* empty function */ } @@ -2341,121 +2344,125 @@ u8 dComIfGp_world_dark_get() { return g_dComIfG_gameInfo.mWorldDark; } -int dComIfG_TimerStart(int param_0, s16 param_1) { - int uvar2; - - if (param_0 == dComIfG_getTimerMode()) { +int dComIfG_TimerStart(int mode, s16 time) { + if (mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { - if (param_1 == 0) { - timer->start(param_0); + if (time == 0) { + timer->start(mode); } else { - timer->start(param_0, param_1); + timer->start(mode, time); } - uvar2 = 1; + return 1; } else { - uvar2 = 0; + return 0; } - } else { - uvar2 = 0; } - return uvar2; + + return 0; } -int dComIfG_TimerStop(int param_0) { - int uvar2; - - if (param_0 == dComIfG_getTimerMode()) { +int dComIfG_TimerStop(int mode) { + if (mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { timer->stop(4); - uvar2 = 1; + return 1; } else { - uvar2 = 0; + return 0; } - } else { - uvar2 = 0; } - return uvar2; + + return 0; } -int dComIfG_TimerReStart(int param_0) { - int uvar2; - - if (param_0 == dComIfG_getTimerMode()) { +int dComIfG_TimerReStart(int mode) { + if (mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { timer->restart(4); - uvar2 = 1; + return 1; } else { - uvar2 = 0; + return 0; } - } else { - uvar2 = 0; } - return uvar2; + + return 0; } -int dComIfG_TimerEnd(int param_0, int param_1) { - int uvar2; - - if (param_0 == dComIfG_getTimerMode()) { +int dComIfG_TimerEnd(int mode, int param_1) { + if (mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { timer->end(param_1); - uvar2 = 1; + return 1; } else { - uvar2 = 0; + return 0; } - } else { - uvar2 = 0; } - return uvar2; + + return 0; } /* 8002F72C-8002F79C 02A06C 0070+00 0/0 0/0 2/2 .text dComIfG_TimerDeleteCheck__Fi */ -int dComIfG_TimerDeleteCheck(int param_0) { - int uvar2; - - if (param_0 == dComIfG_getTimerMode()) { +int dComIfG_TimerDeleteCheck(int mode) { + if (mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { - uvar2 = timer->deleteCheck(); + return timer->deleteCheck(); } else { - uvar2 = 0; + return 0; } - } else { - uvar2 = 0; } - return uvar2; + + return 0; } -int dComIfG_TimerDeleteRequest(int param_0) { - int uvar2; - - if (param_0 == dComIfG_getTimerMode()) { +int dComIfG_TimerDeleteRequest(int mode) { + if (mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { timer->deleteRequest(); - uvar2 = 1; + return 1; } else { - uvar2 = 0; + return 0; } - } else { - uvar2 = 0; } - return uvar2; + + return 0; } /* 8002F810-8002F9F0 02A150 01E0+00 0/0 1/1 0/0 .text dComIfGs_Wolf_Change_Check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_Wolf_Change_Check() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_Wolf_Change_Check__Fv.s" +u8 dComIfGs_Wolf_Change_Check() { + u8 is_wolf = false; + + // Transforming Unlocked + if (dComIfGs_isEventBit(0x0D04)) { + is_wolf = dComIfGs_getTransformStatus(); + } else if (dComIfGs_isTransformLV(0) && !dComIfGs_isDarkClearLV(0)) { + is_wolf = true; + } else if (dComIfGs_isTransformLV(1) && !dComIfGs_isDarkClearLV(1)) { + is_wolf = true; + } else if (dComIfGs_isTransformLV(2) && !dComIfGs_isDarkClearLV(2)) { + is_wolf = true; + } else if (dComIfGs_isTransformLV(3) && !dComIfGs_isDarkClearLV(3)) { + is_wolf = true; + } + + // Stage is Hyrule Field and Room is Eldin Gorge Entrance + if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && dComIfGp_getStartStageRoomNo() == 2 && + dComIfGp_getStartStagePoint() == 10 && !dComIfGs_isSaveSwitch(12)) { + is_wolf = false; + } + // Stage is Hyrule Field and Room is North Lanayru - Eldin Entrance + else if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && + dComIfGp_getStartStageRoomNo() == 9 && dComIfGp_getStartStagePoint() == 10 && + !dComIfGs_isSaveSwitch(13)) { + is_wolf = false; + } + + return is_wolf; } -#pragma pop void dComIfGs_PolyDamageOff_Set(s8 param_0) { g_dComIfG_gameInfo.field_0x1ddfb = param_0; @@ -2483,6 +2490,16 @@ SECTION_SDATA2 static f64 lit_7580 = 0.6; /* 8002FA54-8002FA84 02A394 0030+00 0/0 4/4 96/96 .text dComIfGs_wolfeye_effect_check__Fv */ +#ifdef NONMATCHING +int dComIfGs_wolfeye_effect_check() { + BOOL ret = 0; + if (g_env_light.field_0xf3d == 1 && g_env_light.field_0xf40 > 0.6) { + ret = 1; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2491,6 +2508,7 @@ asm void dComIfGs_wolfeye_effect_check() { #include "asm/d/com/d_com_inf_game/dComIfGs_wolfeye_effect_check__Fv.s" } #pragma pop +#endif void dComIfGs_Grass_hide_Set(s8 param_0) { g_dComIfG_gameInfo.field_0x1ddfc = param_0; @@ -2523,6 +2541,16 @@ BOOL dComIfGp_TransportWarp_check() { /* 8002FB20-8002FB80 02A460 0060+00 2/2 6/6 0/0 .text * dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv */ +#ifdef NONMATCHING +int dComLbG_PhaseHandler(request_of_phase_process_class* param_0, int (**param_1)(void*), + void* param_2) { + int ret = cPhs_Handler(param_0, param_1, param_2); + if (ret != 2 && ret < 2) { + return ret; + } + return dComLbG_PhaseHandler(param_0, param_1, param_2); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2532,6 +2560,7 @@ asm int dComLbG_PhaseHandler(request_of_phase_process_class* param_0, int (**par #include "asm/d/com/d_com_inf_game/dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv.s" } #pragma pop +#endif /* 8002FB80-8002FC3C 02A4C0 00BC+00 0/0 1/1 1/1 .text dComIfGs_onVisitedRoom__Fi */ #pragma push @@ -2553,41 +2582,44 @@ asm void dComIfGs_offVisitedRoom(int param_0) { } #pragma pop +inline BOOL dComIfGs_isSaveVisitedRoom(int param_0, int param_1) { + return g_dComIfG_gameInfo.info.getSavedata().getSave2(param_0)->isVisitedRoom(param_1); +} + /* 8002FC98-8002FCF4 02A5D8 005C+00 0/0 1/1 0/0 .text dComIfGs_isVisitedRoom__Fi */ +// instructions swapped +#ifdef NONMATCHING +BOOL dComIfGs_isVisitedRoom(int param_0) { + int stayNo = dComIfGp_roomControl_getStayNo(); + dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(stayNo); + return dComIfGs_isSaveVisitedRoom(fileList->field_0x13, param_0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_isVisitedRoom(int param_0) { +asm BOOL dComIfGs_isVisitedRoom(int param_0) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_isVisitedRoom__Fi.s" } #pragma pop +#endif /* 8002FCF4-8002FD08 02A634 0014+00 0/0 1/1 0/0 .text dComIfGs_staffroll_next_go__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_staffroll_next_go() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_staffroll_next_go__Fv.s" +void dComIfGs_staffroll_next_go() { + g_env_light.field_0x130c = true; } -#pragma pop /* 8002FD08-8002FD18 02A648 0010+00 0/0 1/1 0/0 .text dComIfGs_staffroll_next_go_check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_staffroll_next_go_check() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_staffroll_next_go_check__Fv.s" +u8 dComIfGs_staffroll_next_go_check() { + return g_env_light.field_0x130c; } -#pragma pop /* ############################################################################################## */ /* 80450608-8045060C 000088 0004+00 0/0 6/6 11/11 .sdata g_whiteColor */ SECTION_SDATA extern GXColor g_whiteColor = {255, 255, 255, 255}; /* 8045060C-80450610 00008C 0004+00 0/0 3/3 3/3 .sdata g_saftyWhiteColor */ -SECTION_SDATA extern u32 g_saftyWhiteColor = 0xA0A0A0FF; +SECTION_SDATA extern GXColor g_saftyWhiteColor = {160, 160, 160, 255}; /* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp index 27327c3133..2a29c0b36c 100644 --- a/src/d/com/d_com_static.cpp +++ b/src/d/com/d_com_static.cpp @@ -11,19 +11,12 @@ // Types: // -struct fopAc_ac_c {}; - struct daYkgr_c { static u8 m_aim_rate[4]; static u8 m_path[4]; static u8 m_emitter[4]; }; -struct cXyz { - /* 80009184 */ ~cXyz(); - /* 800125DC */ cXyz(); -}; - struct daTagStream_c { /* 800318B4 */ void checkArea(cXyz const*); @@ -45,34 +38,6 @@ struct daTagMagne_c { static u8 mTagMagne[4]; }; -struct daSus_c { - struct data_c { - /* 80030F14 */ void set(s8, cXyz const&, cXyz const&, u8, u8, u8); - /* 80030FBC */ void reset(); - /* 80030FCC */ void isSwitch(); - /* 800310C8 */ void check(fopAc_ac_c*); - /* 80031038 */ void check(cXyz const&); - /* 80031150 */ void execute(); - /* 80031F28 */ ~data_c(); - /* 80031F64 */ data_c(); - }; - - struct room_c { - /* 80031190 */ void add(daSus_c::data_c*); - /* 800311FC */ void reset(); - /* 80031EE4 */ room_c(); - }; - - /* 80031248 */ void newData(s8, cXyz const&, cXyz const&, u8, u8, u8); - /* 800313BC */ void reset(); - /* 800314D4 */ void check(fopAc_ac_c*); - /* 80031434 */ void check(s8, cXyz const&); - /* 800315A4 */ void execute(); - - static u8 mData[1152]; - static u8 mRoom[256]; -}; - struct daSetBgObj_c { /* 80031870 */ void getArcName(fopAc_ac_c*); }; @@ -100,8 +65,6 @@ struct daObjCarry_c { static u8 mRoomNo[5 + 3 /* padding */]; }; -struct J3DModel {}; - struct daMirror_c { /* 8003194C */ void entry(J3DModel*); /* 80031990 */ void remove(); @@ -418,7 +381,7 @@ asm void daSus_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daSus_c::check(s8 param_0, cXyz const& param_1) { +asm bool daSus_c::check(s8 param_0, cXyz const& param_1) { nofralloc #include "asm/d/com/d_com_static/check__7daSus_cFScRC4cXyz.s" } diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index ba99320c4d..200e2f485b 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -2663,8 +2663,8 @@ SECTION_SDATA2 static f32 lit_5553 = 0.0010000000474974513f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDlst_shadowControl_c::setReal(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, - f32 param_4, f32 param_5, dKy_tevstr_c* param_6) { +asm int dDlst_shadowControl_c::setReal(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, + f32 param_4, f32 param_5, dKy_tevstr_c* param_6) { nofralloc #include "asm/d/d_drawlist/setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c.s" } @@ -2686,8 +2686,8 @@ asm void dDlst_shadowControl_c::addReal(u32 param_0, J3DModel* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDlst_shadowControl_c::setSimple(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3, - s16 param_4, f32 param_5, _GXTexObj* param_6) { +asm int dDlst_shadowControl_c::setSimple(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3, + s16 param_4, f32 param_5, _GXTexObj* param_6) { nofralloc #include "asm/d/d_drawlist/setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj.s" } @@ -2695,7 +2695,7 @@ asm void dDlst_shadowControl_c::setSimple(cXyz* param_0, f32 param_1, f32 param_ /* ############################################################################################## */ /* 804248D0-804248F0 0515F0 0020+00 1/1 6/6 173/173 .bss mSimpleTexObj__21dDlst_shadowControl_c */ -u8 dDlst_shadowControl_c::mSimpleTexObj[32]; +GXTexObj dDlst_shadowControl_c::mSimpleTexObj; /* 80055FE8-80056018 050928 0030+00 0/0 1/1 0/0 .text * setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG */ diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index ba8f9ba134..517b0a82ae 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -1185,7 +1185,7 @@ void item_func_TKS_LETTER() { } void item_func_WEAR_CASUAL() { - dComIfGs_setSelectEquipClothes(WEARS_CASUAL); + dComIfGs_setSelectEquipClothes(WEAR_CASUAL); } void item_func_WEAR_KOKIRI() { @@ -1238,10 +1238,9 @@ void item_func_HAWK_EYE() { #ifdef NONMATCHING void item_func_WOOD_STICK() { dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD); - dComIfGs_setSelectEquipSword__FUc(WOOD_STICK); + dComIfGs_setSelectEquipSword(WOOD_STICK); - s8 stayNo = dComIfGp_roomControl_getStayNo(); - dComIfGs_onSwitch(28, stayNo); // wrong order + dComIfGs_onSwitch(28, dComIfGp_roomControl_getStayNo()); // wrong order } #else #pragma push @@ -1868,7 +1867,7 @@ s32 item_getcheck_func_TKS_LETTER() { } s32 item_getcheck_func_WEAR_CASUAL() { - return dComIfGs_isItemFirstBit(WEARS_CASUAL); + return dComIfGs_isItemFirstBit(WEAR_CASUAL); } s32 item_getcheck_func_WEAR_KOKIRI() { @@ -2471,12 +2470,10 @@ s32 isArrow(u8 item_no) { } /* 8009B708-8009B77C 096048 0074+00 0/0 4/4 1/1 .text isBottleItem__FUc */ -// probably wrong cases or order -#ifdef NONMATCHING bool isBottleItem(u8 item_no) { - bool is_bottle_item; - switch (item_no) { + case OIL_BOTTLE3: + case EMPTY_BOTTLE: case RED_BOTTLE: case GREEN_BOTTLE: case BLUE_BOTTLE: @@ -2489,10 +2486,8 @@ bool isBottleItem(u8 item_no) { case UGLY_SOUP: case HOT_SPRING: case FAIRY: - case HOT_SPRING_2: - case OIL2: - case OIL: case FAIRY_DROP: + case WORM: case BEE_CHILD: case CHUCHU_RARE: case CHUCHU_RED: @@ -2503,29 +2498,16 @@ bool isBottleItem(u8 item_no) { case LV1_SOUP: case LV2_SOUP: case LV3_SOUP: - case CHUCHU_YELLOW2: - case OIL_BOTTLE3: - case SHOP_BEE_CHILD: case CHUCHU_BLACK: - is_bottle_item = true; - break; + case POU_FIRE1: + case POU_FIRE2: + case POU_FIRE3: + case POU_FIRE4: + return true; default: - is_bottle_item = false; - break; + return false; } - - return is_bottle_item; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void isBottleItem(u8 param_0) { - nofralloc -#include "asm/d/d_item/isBottleItem__FUc.s" -} -#pragma pop -#endif BOOL isHeart(u8 item_no) { BOOL is_heart = false; diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 79eebb7429..4b03cce87a 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -7,16 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct dItem_data { - static void* item_resource[1530]; - static void* field_item_res[1020]; - static u8 item_info[1020 + 4 /* padding */]; -}; - // // Forward References: // @@ -26,4148 +16,581 @@ extern "C" void* item_resource__10dItem_data[1530]; extern "C" void* field_item_res__10dItem_data[1020]; extern "C" u8 item_info__10dItem_data[1020 + 4 /* padding */]; -// -// External References: -// - // // Declarations: // -/* ############################################################################################## */ -/* 8037AD68-8037AD72 0073C8 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AD68 = "F_gD_rupy"; -#pragma pop - -/* 8037AD72-8037AD7C 0073D2 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AD72 = "O_gD_bomb"; -#pragma pop - -/* 8037AD7C-8037AD86 0073DC 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AD7C = "O_gD_arow"; -#pragma pop - -/* 8037AD86-8037AD90 0073E6 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AD86 = "O_gD_tane"; -#pragma pop - -/* 8037AD90-8037AD98 0073F0 0008+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AD90 = "O_gD_PG"; -#pragma pop - -/* 8037AD98-8037ADA0 0073F8 0008+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AD98 = "O_gD_BI"; -#pragma pop - -/* 8037ADA0-8037ADA9 007400 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADA0 = "T_gD_key"; -#pragma pop - -/* 8037ADA9-8037ADB3 007409 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADA9 = "O_gD_hutk"; -#pragma pop - -/* 8037ADB3-8037ADBD 007413 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADB3 = "O_gD_hutu"; -#pragma pop - -/* 8037ADBD-8037ADC6 00741D 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADBD = "T_gD_map"; -#pragma pop - -/* 8037ADC6-8037ADD0 007426 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADC6 = "T_gD_kmps"; -#pragma pop - -/* 8037ADD0-8037ADD9 007430 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADD0 = "O_gD_TKS"; -#pragma pop - -/* 8037ADD9-8037ADE3 007439 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADD9 = "T_gD_bkey"; -#pragma pop - -/* 8037ADE3-8037ADEC 007443 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADE3 = "O_gD_TKC"; -#pragma pop - -/* 8037ADEC-8037ADF5 00744C 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADEC = "O_gD_SWA"; -#pragma pop - -/* 8037ADF5-8037ADFE 007455 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADF5 = "T_gD_SHB"; -#pragma pop - -/* 8037ADFE-8037AE07 00745E 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037ADFE = "O_gD_SHC"; -#pragma pop - -/* 8037AE07-8037AE10 007467 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE07 = "O_gD_SHA"; -#pragma pop - -/* 8037AE10-8037AE1A 007470 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE10 = "O_gD_mem2"; -#pragma pop - -/* 8037AE1A-8037AE24 00747A 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE1A = "O_gD_marm"; -#pragma pop - -/* 8037AE24-8037AE2E 007484 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE24 = "O_gD_zora"; -#pragma pop - -/* 8037AE2E-8037AE38 00748E 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE2E = "O_gD_Injy"; -#pragma pop - -/* 8037AE38-8037AE42 007498 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE38 = "O_gD_puL2"; -#pragma pop - -/* 8037AE42-8037AE4C 0074A2 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE42 = "O_gD_puL3"; -#pragma pop - -/* 8037AE4C-8037AE56 0074AC 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE4C = "O_gD_sang"; -#pragma pop - -/* 8037AE56-8037AE60 0074B6 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE56 = "O_gD_hawk"; -#pragma pop - -/* 8037AE60-8037AE69 0074C0 0009+00 2/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE60 = "O_gD_SWB"; -#pragma pop - -/* 8037AE69-8037AE73 0074C9 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE69 = "O_gD_boom"; -#pragma pop - -/* 8037AE73-8037AE7B 0074D3 0008+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE73 = "O_gD_SP"; -#pragma pop - -/* 8037AE7B-8037AE83 0074DB 0008+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE7B = "O_gD_IB"; -#pragma pop - -/* 8037AE83-8037AE8C 0074E3 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE83 = "O_gD_bow"; -#pragma pop - -/* 8037AE8C-8037AE94 0074EC 0008+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE8C = "O_gD_HS"; -#pragma pop - -/* 8037AE94-8037AE9E 0074F4 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE94 = "O_gD_boot"; -#pragma pop - -/* 8037AE9E-8037AEA8 0074FE 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AE9E = "O_gD_CROD"; -#pragma pop - -/* 8037AEA8-8037AEB0 007508 0008+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AEA8 = "T_gD_kt"; -#pragma pop - -/* 8037AEB0-8037AEBA 007510 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AEB0 = "O_gD_uktr"; -#pragma pop - -/* 8037AEBA-8037AEC4 00751A 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AEBA = "O_gD_pach"; -#pragma pop - -/* 8037AEC4-8037AECE 007524 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AEC4 = "O_gD_bmL2"; -#pragma pop - -/* 8037AECE-8037AED8 00752E 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AECE = "O_gD_bomc"; -#pragma pop - -/* 8037AED8-8037AEE2 007538 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AED8 = "O_gD_quL1"; -#pragma pop - -/* 8037AEE2-8037AEEC 007542 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AEE2 = "O_gD_quL2"; -#pragma pop - -/* 8037AEEC-8037AEF6 00754C 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AEEC = "O_gD_quL3"; -#pragma pop - -/* 8037AEF6-8037AF00 007556 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AEF6 = "O_gD_bott"; -#pragma pop - -/* 8037AF00-8037AF09 007560 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF00 = "Obj_kntr"; -#pragma pop - -/* 8037AF09-8037AF13 007569 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF09 = "O_gD_lttr"; -#pragma pop - -/* 8037AF13-8037AF1D 007573 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF13 = "O_gD_bill"; -#pragma pop - -/* 8037AF1D-8037AF27 00757D 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF1D = "O_gD_wood"; -#pragma pop - -/* 8037AF27-8037AF31 007587 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF27 = "O_gD_pend"; -#pragma pop - -/* 8037AF31-8037AF3B 007591 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF31 = "O_gD_hk_s"; -#pragma pop - -/* 8037AF3B-8037AF45 00759B 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF3B = "N_gD_Lpod"; -#pragma pop - -/* 8037AF45-8037AF4F 0075A5 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF45 = "O_gD_kabo"; -#pragma pop - -/* 8037AF4F-8037AF59 0075AF 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF4F = "O_gD_kabm"; -#pragma pop - -/* 8037AF59-8037AF63 0075B9 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF59 = "O_gD_choo"; -#pragma pop - -/* 8037AF63-8037AF6D 0075C3 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF63 = "O_gD_chom"; -#pragma pop - -/* 8037AF6D-8037AF77 0075CD 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF6D = "O_gD_kuwo"; -#pragma pop - -/* 8037AF77-8037AF81 0075D7 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF77 = "O_gD_kuwm"; -#pragma pop - -/* 8037AF81-8037AF8B 0075E1 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF81 = "O_gD_bato"; -#pragma pop - -/* 8037AF8B-8037AF95 0075EB 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF8B = "O_gD_batm"; -#pragma pop - -/* 8037AF95-8037AF9F 0075F5 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF95 = "O_gD_nano"; -#pragma pop - -/* 8037AF9F-8037AFA9 0075FF 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AF9F = "O_gD_nanm"; -#pragma pop - -/* 8037AFA9-8037AFB3 007609 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AFA9 = "O_gD_dano"; -#pragma pop - -/* 8037AFB3-8037AFBD 007613 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AFB3 = "O_gD_danm"; -#pragma pop - -/* 8037AFBD-8037AFC7 00761D 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AFBD = "O_gD_kamo"; -#pragma pop - -/* 8037AFC7-8037AFD1 007627 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AFC7 = "O_gD_kamm"; -#pragma pop - -/* 8037AFD1-8037AFDB 007631 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AFD1 = "O_gD_teno"; -#pragma pop - -/* 8037AFDB-8037AFE5 00763B 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AFDB = "O_gD_tenm"; -#pragma pop - -/* 8037AFE5-8037AFEF 007645 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AFE5 = "O_gD_kato"; -#pragma pop - -/* 8037AFEF-8037AFF9 00764F 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AFEF = "O_gD_katm"; -#pragma pop - -/* 8037AFF9-8037B003 007659 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037AFF9 = "O_gD_tono"; -#pragma pop - -/* 8037B003-8037B00D 007663 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B003 = "O_gD_tonm"; -#pragma pop - -/* 8037B00D-8037B017 00766D 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B00D = "O_gD_ario"; -#pragma pop - -/* 8037B017-8037B021 007677 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B017 = "O_gD_arim"; -#pragma pop - -/* 8037B021-8037B02B 007681 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B021 = "O_gD_kago"; -#pragma pop - -/* 8037B02B-8037B035 00768B 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B02B = "O_gD_kagm"; -#pragma pop - -/* 8037B035-8037B03F 007695 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B035 = "O_gD_tama"; -#pragma pop - -/* 8037B03F-8037B049 00769F 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B03F = "O_gD_komo"; -#pragma pop - -/* 8037B049-8037B053 0076A9 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B049 = "O_gD_pump"; -#pragma pop - -/* 8037B053-8037B05D 0076B3 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B053 = "O_gD_chee"; -#pragma pop - -/* 8037B05D-8037B067 0076BD 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B05D = "O_gD_bkey"; -#pragma pop - -/* 8037B067-8037B071 0076C7 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B067 = "D_MKey_01"; -#pragma pop - -/* 8037B071-8037B07B 0076D1 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B071 = "D_MKey_02"; -#pragma pop - -/* 8037B07B-8037B085 0076DB 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B07B = "D_MKey_03"; -#pragma pop - -/* 8037B085-8037B08F 0076E5 000A+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B085 = "O_gD_Mkey"; -#pragma pop - -/* 8037B08F-8037B096 0076EF 0007+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B08F = "Always"; -#pragma pop - -/* 8037B096-8037B09E 0076F6 0008+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B096 = "T_g_key"; -#pragma pop - -/* 8037B09E-8037B0A7 0076FE 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B09E = "T_g_bkey"; -#pragma pop - -/* 8037B0A7-8037B0AF 007707 0008+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B0A7 = "O_g_SWA"; -#pragma pop - -/* 8037B0AF-8037B0B7 00770F 0008+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B0AF = "T_g_SHB"; -#pragma pop - -/* 8037B0B7-8037B0C0 007717 0009+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B0B7 = "O_g_ZORA"; -#pragma pop - -/* 8037B0C0-8037B0C7 007720 0007+00 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B0C0 = "T_g_kt"; -#pragma pop - -/* 8037B0C7-8037B0D0 007727 0007+02 1/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B0C7 = "O_wood"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037B0CE = "\0"; -#pragma pop - /* 803AC5A0-803ADD88 -00001 17E8+00 0/0 10/10 2/2 .data item_resource__10dItem_data */ -SECTION_DATA void* dItem_data::item_resource[1530] = { - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D3C00, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF01FF, - (void*)0x002D3C00, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF02FF, - (void*)0x002D3C00, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF03FF, - (void*)0x002D3C00, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF04FF, - (void*)0x002D3C00, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF05FF, - (void*)0x002D3C00, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF06FF, - (void*)0x002D3C00, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xA), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000C6400, - (void*)0x019F0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xA), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000C6400, - (void*)0x019F0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xA), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000C6400, - (void*)0x019F0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xA), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000C6400, - (void*)0x019F0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x14), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00536400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x14), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00536400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x14), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00536400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x14), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00536400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1E), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x005C6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x28), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x28), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x28), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x28), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x30), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000B6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x30), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000B6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x30), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000B6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x30), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000B6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x38), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x006E6400, - (void*)0x00790000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x41), - (void*)0x0008FFFF, - (void*)0x0005000B, - (void*)0xFFFFFFFF, - (void*)0x00506400, - (void*)0x01940000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x4B), - (void*)0x0008FFFF, - (void*)0x0005000B, - (void*)0xFFFFFFFF, - (void*)0x00516400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x55), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00716400, - (void*)0x01970000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x5E), - (void*)0x0007FFFF, - (void*)0x0004FFFF, - (void*)0xFFFFFFFF, - (void*)0x006F6400, - (void*)0x01980000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x68), - (void*)0x0008FFFF, - (void*)0x0005FFFF, - (void*)0x000BFFFF, - (void*)0x00286400, - (void*)0x01910000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x71), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00216400, - (void*)0xFFFF0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x7B), - (void*)0x0009000C, - (void*)0x0006FFFF, - (void*)0x000FFFFF, - (void*)0x00266400, - (void*)0x01910000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x84), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00706E00, - (void*)0x01950000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00426E00, - (void*)0x01B20000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x8D), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00746E00, - (void*)0x01B50000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x96), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00406E00, - (void*)0x01960000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x9F), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x003C6400, - (void*)0x01B40000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xA8), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00226400, - (void*)0x01A80000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x006B6400, - (void*)0x01920000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x006B6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xB2), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00416400, - (void*)0x01A90000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xBC), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x004D6400, - (void*)0x01AA0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xC6), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x002D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x68), - (void*)0x0008FFFF, - (void*)0x0005FFFF, - (void*)0xFFFFFFFF, - (void*)0x00286400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xD0), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00476400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xD0), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00486400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xDA), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00496400, - (void*)0x01AD0000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00506400, - (void*)0x019F0000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00506400, - (void*)0x01AF0000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00506400, - (void*)0x01B00000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00506400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00726E00, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)0x01B30000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xE4), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x002A6400, - (void*)0x01940000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xEE), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00596400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xF8), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00246E00, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x101), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00626E00, - (void*)0x01AB0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x10B), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x002B5F00, - (void*)0x01A60000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x113), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00207800, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x11B), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00696400, - (void*)0x01A50000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x124), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x006A7800, - (void*)0x01AC0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x12C), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00256400, - (void*)0x01A70000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x136), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00166E00, - (void*)0x019E0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x124), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x002C8200, - (void*)0x01B50000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x140), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x006C6E00, - (void*)0x01930000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00426E00, - (void*)0x01B60000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x148), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00186400, - (void*)0x01B70000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x152), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x005B6400, - (void*)0x01B80000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x136), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00166E00, - (void*)0x01B90000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)0x01BA0000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)0x01970000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x15C), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00566400, - (void*)0x01980000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x166), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF00FF, - (void*)0x00556400, - (void*)0x01BD0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x166), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00556400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00566400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x170), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x004A6400, - (void*)0x01B10000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x17A), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x004B6400, - (void*)0x01F00000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x184), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x004C6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x004E6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x000C6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00596400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00196400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x001B6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x001A6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x001C6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x001D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0002, - (void*)0x00115000, - (void*)0x01BE0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0000, - (void*)0x00115000, - (void*)0x01BF0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0100, - (void*)0x00115000, - (void*)0x01C00000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0200, - (void*)0x00115000, - (void*)0x01C10000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0300, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0301, - (void*)0x00125000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0400, - (void*)0x00115000, - (void*)0x01A10000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0500, - (void*)0x00115000, - (void*)0x01AE0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0400, - (void*)0x00115000, - (void*)0x01A10000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0000, - (void*)0x00115000, - (void*)0x01BF0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0800, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0500, - (void*)0x00115000, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0500, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x198), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x006C6E00, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x198), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x006C6E00, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x15C), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000C6400, - (void*)0x01980000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x28), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x30), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x000B6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0B00, - (void*)0x00115000, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0B00, - (void*)0x00115000, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0700, - (void*)0x00115000, - (void*)0x01BF0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0000, - (void*)0x00115000, - (void*)0x01BF0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0200, - (void*)0x00115000, - (void*)0x01BF0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0100, - (void*)0x00115000, - (void*)0x01BF0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0400, - (void*)0x00115000, - (void*)0x01BF0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0600, - (void*)0x00115000, - (void*)0x01BF0000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00135000, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00135000, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00135000, - (void*)0x01CF0000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1A1), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x005A6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1AB), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00546400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1B5), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00586400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1BF), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x005D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x005D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)0x01D30000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)0x01D20000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xA8), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00226400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xA8), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00226400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x006C6E00, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0400, - (void*)0x00115000, - (void*)0x01A10000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1C9), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00115000, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00115000, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1D3), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00526400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1D3), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00526400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1D3), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00526400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1D3), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00526400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1DD), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00305000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1E7), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x002F5000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1F1), - (void*)0x0009000F, - (void*)0x0006000C, - (void*)0xFFFFFFFF, - (void*)0x00085000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x1FB), - (void*)0x0009000F, - (void*)0x0006000C, - (void*)0xFFFFFFFF, - (void*)0x00075000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x205), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00385000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x20F), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00375000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x219), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00065000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x223), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00055000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x22D), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x003B5000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x237), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x003A5000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x241), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x000A5000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x24B), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00095000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x255), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00345000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x25F), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00335000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x269), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x005F5000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x273), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x005E5000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x27D), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00365000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x287), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00355000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x291), - (void*)0x0009000F, - (void*)0x0006000C, - (void*)0xFFFFFFFF, - (void*)0x00615000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x29B), - (void*)0x0009000F, - (void*)0x0006000C, - (void*)0xFFFFFFFF, - (void*)0x00605000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2A5), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00045000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2AF), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x00035000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2B9), - (void*)0x0009000F, - (void*)0x0006000C, - (void*)0xFFFFFFFF, - (void*)0x00325000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2C3), - (void*)0x0009000F, - (void*)0x0006000C, - (void*)0xFFFFFFFF, - (void*)0x00315000, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2CD), - (void*)0x0005000B, - (void*)0xFFFF0008, - (void*)0xFFFFFFFF, - (void*)0x003E6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x002D6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2D7), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x004F6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2D7), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x004F6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2D7), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x004F6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x7B), - (void*)0x0009000C, - (void*)0x0006FFFF, - (void*)0x000FFFFF, - (void*)0x00266400, - (void*)0x01910000, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF04FF, - (void*)0x002D3C00, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x38), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x006E6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0002, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0002, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0002, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x18E), - (void*)0x0006000C, - (void*)0xFFFF0009, - (void*)0x000F0002, - (void*)0x00115000, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x38), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x006E6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2E1), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00296400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2EB), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00156400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2F5), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x003F6400, - (void*)NULL, - (void*)&d_d_item_data__stringBase0, - (void*)0x0004FFFF, - (void*)0xFFFF0007, - (void*)0xFFFF00FF, - (void*)0x003C6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x140), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x006C6E00, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x2FF), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00437800, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x309), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00457800, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x313), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00467800, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x38), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x006E6400, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x31D), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x00177800, - (void*)NULL, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x38), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0x006E6400, - (void*)NULL, +SECTION_DATA dItem_itemResource dItem_data::item_resource[255] = { + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x3C, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x1, 0xFF, 0x002D, 0x3C, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x2, 0xFF, 0x002D, 0x3C, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x3, 0xFF, 0x002D, 0x3C, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x4, 0xFF, 0x002D, 0x3C, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x5, 0xFF, 0x002D, 0x3C, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x6, 0xFF, 0x002D, 0x3C, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"O_gD_bomb", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000C, 0x64, 0x019F}, + {"O_gD_bomb", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000C, 0x64, 0x019F}, + {"O_gD_bomb", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000C, 0x64, 0x019F}, + {"O_gD_bomb", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000C, 0x64, 0x019F}, + {"O_gD_arow", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0053, 0x64, 0x0000}, + {"O_gD_arow", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0053, 0x64, 0x0000}, + {"O_gD_arow", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0053, 0x64, 0x0000}, + {"O_gD_arow", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0053, 0x64, 0x0000}, + {"O_gD_tane", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x005C, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"O_gD_PG", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000D, 0x64, 0x0000}, + {"O_gD_PG", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000D, 0x64, 0x0000}, + {"O_gD_PG", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000D, 0x64, 0x0000}, + {"O_gD_PG", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000D, 0x64, 0x0000}, + {"O_gD_BI", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000B, 0x64, 0x0000}, + {"O_gD_BI", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000B, 0x64, 0x0000}, + {"O_gD_BI", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000B, 0x64, 0x0000}, + {"O_gD_BI", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000B, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0079}, + {"O_gD_hutk", 0x0008, 0xFFFF, 0x0005, 0x000B, 0xFFFF, 0xFF, 0xFF, 0x0050, 0x64, 0x0194}, + {"O_gD_hutu", 0x0008, 0xFFFF, 0x0005, 0x000B, 0xFFFF, 0xFF, 0xFF, 0x0051, 0x64, 0x0000}, + {"T_gD_map", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0071, 0x64, 0x0197}, + {"T_gD_kmps", 0x0007, 0xFFFF, 0x0004, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006F, 0x64, 0x0198}, + {"O_gD_TKS", 0x0008, 0xFFFF, 0x0005, 0xFFFF, 0x000B, 0xFF, 0xFF, 0x0028, 0x64, 0x0191}, + {"T_gD_bkey", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0021, 0x64, 0xFFFF}, + {"O_gD_TKC", 0x0009, 0x000C, 0x0006, 0xFFFF, 0x000F, 0xFF, 0xFF, 0x0026, 0x64, 0x0191}, + {"O_gD_SWA", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0070, 0x6E, 0x0195}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0042, 0x6E, 0x01B2}, + {"T_gD_SHB", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0074, 0x6E, 0x01B5}, + {"O_gD_SHC", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0040, 0x6E, 0x0196}, + {"O_gD_SHA", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x003C, 0x64, 0x01B4}, + {"O_gD_mem2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0022, 0x64, 0x01A8}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x006B, 0x64, 0x0192}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x006B, 0x64, 0x0000}, + {"O_gD_marm", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0041, 0x64, 0x01A9}, + {"O_gD_zora", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004D, 0x64, 0x01AA}, + {"O_gD_Injy", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x002D, 0x64, 0x0000}, + {"O_gD_TKS", 0x0008, 0xFFFF, 0x0005, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0028, 0x64, 0x0000}, + {"O_gD_puL2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0047, 0x64, 0x0000}, + {"O_gD_puL2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0048, 0x64, 0x0000}, + {"O_gD_puL3", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0049, 0x64, 0x01AD}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0050, 0x64, 0x019F}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0050, 0x64, 0x01AF}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0050, 0x64, 0x01B0}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0050, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0072, 0x6E, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x01B3}, + {"O_gD_sang", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x002A, 0x64, 0x0194}, + {"O_gD_hawk", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0059, 0x64, 0x0000}, + {"O_gD_SWB", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0024, 0x6E, 0x0000}, + {"O_gD_boom", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0062, 0x6E, 0x01AB}, + {"O_gD_SP", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x002B, 0x5F, 0x01A6}, + {"O_gD_IB", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0020, 0x78, 0x0000}, + {"O_gD_bow", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0069, 0x64, 0x01A5}, + {"O_gD_HS", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006A, 0x78, 0x01AC}, + {"O_gD_boot", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0025, 0x64, 0x01A7}, + {"O_gD_CROD", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0016, 0x6E, 0x019E}, + {"O_gD_HS", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x002C, 0x82, 0x01B5}, + {"T_gD_kt", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006C, 0x6E, 0x0193}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0042, 0x6E, 0x01B6}, + {"O_gD_uktr", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0018, 0x64, 0x01B7}, + {"O_gD_pach", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x005B, 0x64, 0x01B8}, + {"O_gD_CROD", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0016, 0x6E, 0x01B9}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x01BA}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0197}, + {"O_gD_bmL2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0056, 0x64, 0x0198}, + {"O_gD_bomc", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0, 0xFF, 0x0055, 0x64, 0x01BD}, + {"O_gD_bomc", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0055, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0056, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"O_gD_quL1", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004A, 0x64, 0x01B1}, + {"O_gD_quL2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004B, 0x64, 0x01F0}, + {"O_gD_quL3", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004C, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x004E, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x000C, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0059, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0019, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x001B, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x001A, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x001C, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x001D, 0x64, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x01BE}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x0, 0x0011, 0x50, 0x01BF}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x1, 0x0, 0x0011, 0x50, 0x01C0}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x2, 0x0, 0x0011, 0x50, 0x01C1}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x3, 0x0, 0x0011, 0x50, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x3, 0x1, 0x0012, 0x50, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01A1}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x5, 0x0, 0x0011, 0x50, 0x01AE}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01A1}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x0, 0x0011, 0x50, 0x01BF}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x8, 0x0, 0x0011, 0x50, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x5, 0x0, 0x0011, 0x50, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0011, 0x50, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x5, 0x0, 0x0011, 0x50, 0x0000}, + {"Obj_kntr", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006C, 0x6E, 0x0000}, + {"Obj_kntr", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006C, 0x6E, 0x0000}, + {"O_gD_bmL2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000C, 0x64, 0x0198}, + {"O_gD_PG", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000D, 0x64, 0x0000}, + {"O_gD_BI", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000B, 0x64, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0xB, 0x0, 0x0011, 0x50, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0011, 0x50, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0xB, 0x0, 0x0011, 0x50, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0011, 0x50, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x7, 0x0, 0x0011, 0x50, 0x01BF}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x0, 0x0011, 0x50, 0x01BF}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x2, 0x0, 0x0011, 0x50, 0x01BF}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x1, 0x0, 0x0011, 0x50, 0x01BF}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01BF}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x6, 0x0, 0x0011, 0x50, 0x01BF}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0013, 0x50, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0013, 0x50, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0013, 0x50, 0x01CF}, + {"O_gD_lttr", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x005A, 0x64, 0x0000}, + {"O_gD_bill", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0054, 0x64, 0x0000}, + {"O_gD_wood", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0058, 0x64, 0x0000}, + {"O_gD_pend", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x005D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x005D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x01D3}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x01D2}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"O_gD_mem2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0022, 0x64, 0x0000}, + {"O_gD_mem2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0022, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x006C, 0x6E, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01A1}, + {"O_gD_hk_s", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0011, 0x50, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0011, 0x50, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"N_gD_Lpod", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0052, 0x64, 0x0000}, + {"N_gD_Lpod", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0052, 0x64, 0x0000}, + {"N_gD_Lpod", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0052, 0x64, 0x0000}, + {"N_gD_Lpod", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0052, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0011, 0x50, 0x0000}, + {"O_gD_kabo", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0030, 0x50, 0x0000}, + {"O_gD_kabm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x002F, 0x50, 0x0000}, + {"O_gD_choo", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0008, 0x50, 0x0000}, + {"O_gD_chom", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0007, 0x50, 0x0000}, + {"O_gD_kuwo", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0038, 0x50, 0x0000}, + {"O_gD_kuwm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0037, 0x50, 0x0000}, + {"O_gD_bato", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0006, 0x50, 0x0000}, + {"O_gD_batm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0005, 0x50, 0x0000}, + {"O_gD_nano", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x003B, 0x50, 0x0000}, + {"O_gD_nanm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x003A, 0x50, 0x0000}, + {"O_gD_dano", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x000A, 0x50, 0x0000}, + {"O_gD_danm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0009, 0x50, 0x0000}, + {"O_gD_kamo", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0034, 0x50, 0x0000}, + {"O_gD_kamm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0033, 0x50, 0x0000}, + {"O_gD_teno", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x005F, 0x50, 0x0000}, + {"O_gD_tenm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x005E, 0x50, 0x0000}, + {"O_gD_kato", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0036, 0x50, 0x0000}, + {"O_gD_katm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0035, 0x50, 0x0000}, + {"O_gD_tono", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0061, 0x50, 0x0000}, + {"O_gD_tonm", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0060, 0x50, 0x0000}, + {"O_gD_ario", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0004, 0x50, 0x0000}, + {"O_gD_arim", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0003, 0x50, 0x0000}, + {"O_gD_kago", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0032, 0x50, 0x0000}, + {"O_gD_kagm", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0031, 0x50, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"O_gD_tama", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x003E, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000}, + {"O_gD_komo", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004F, 0x64, 0x0000}, + {"O_gD_komo", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004F, 0x64, 0x0000}, + {"O_gD_komo", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004F, 0x64, 0x0000}, + {"O_gD_TKC", 0x0009, 0x000C, 0x0006, 0xFFFF, 0x000F, 0xFF, 0xFF, 0x0026, 0x64, 0x0191}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x4, 0xFF, 0x002D, 0x3C, 0x0000}, + {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000}, + {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000}, + {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0000}, + {"O_gD_pump", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0029, 0x64, 0x0000}, + {"O_gD_chee", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0015, 0x64, 0x0000}, + {"O_gD_bkey", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x003F, 0x64, 0x0000}, + {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x003C, 0x64, 0x0000}, + {"T_gD_kt", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006C, 0x6E, 0x0000}, + {"D_MKey_01", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0043, 0x78, 0x0000}, + {"D_MKey_02", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0045, 0x78, 0x0000}, + {"D_MKey_03", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0046, 0x78, 0x0000}, + {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0000}, + {"O_gD_Mkey", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0017, 0x78, 0x0000}, + {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0000}, }; /* 803ADD88-803AED78 -00001 0FF0+00 0/0 3/3 14/14 .data field_item_res__10dItem_data */ -SECTION_DATA void* dItem_data::field_item_res[1020] = { - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0014FFFF, - (void*)0x0030FF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0017FFFF, - (void*)0x00310000, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0017FFFF, - (void*)0x00310100, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0017FFFF, - (void*)0x00310200, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0017FFFF, - (void*)0x00310300, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0017FFFF, - (void*)0x00310400, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0017FFFF, - (void*)0x00310500, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0017FFFF, - (void*)0x00310600, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0023FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0023FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0023FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0022FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0024FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0014FFFF, - (void*)0x0030FF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x32E), - (void*)0x0003FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0015000D, - (void*)0x0033FF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x327), - (void*)0x0016000E, - (void*)0x0034FF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x336), - (void*)0x0003FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x33F), - (void*)0x0003FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x347), - (void*)0x0003FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x34F), - (void*)0x0003FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0xF8), - (void*)0x0003FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x358), - (void*)0x0003FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x35F), - (void*)0x0004FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x358), - (void*)0x0003FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, - (void*)(((char*)&d_d_item_data__stringBase0) + 0x32E), - (void*)0x0003FFFF, - (void*)0xFFFFFF00, - (void*)0x10000000, +SECTION_DATA dItem_fieldItemResource dItem_data::field_item_res[255] = { + {"Always", 0x0014, 0xFFFF, 0x0030, 0xFF, 0x1000}, + {"Always", 0x0017, 0xFFFF, 0x0031, 0x0, 0x1000}, + {"Always", 0x0017, 0xFFFF, 0x0031, 0x1, 0x1000}, + {"Always", 0x0017, 0xFFFF, 0x0031, 0x2, 0x1000}, + {"Always", 0x0017, 0xFFFF, 0x0031, 0x3, 0x1000}, + {"Always", 0x0017, 0xFFFF, 0x0031, 0x4, 0x1000}, + {"Always", 0x0017, 0xFFFF, 0x0031, 0x5, 0x1000}, + {"Always", 0x0017, 0xFFFF, 0x0031, 0x6, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"Always", 0x0023, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"Always", 0x0023, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"Always", 0x0023, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"Always", 0x0022, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"Always", 0x0024, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"Always", 0x0014, 0xFFFF, 0x0030, 0xFF, 0x1000}, + {"T_g_key", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"Always", 0x0015, 0x000D, 0x0033, 0xFF, 0x1000}, + {"Always", 0x0016, 0x000E, 0x0034, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"T_g_bkey", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"O_g_SWA", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"T_g_SHB", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"O_g_ZORA", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"O_gD_SWB", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"T_g_kt", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"O_wood", 0x0004, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"T_g_kt", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, + {"T_g_key", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000}, }; /* 803AED78-803AF178 00BE98 03FC+04 0/0 9/9 9/9 .data item_info__10dItem_data */ -SECTION_DATA u8 dItem_data::item_info[1020 + 4 /* padding */] = { - 0x0F, - 0x28, - 0x1E, - 0x04, - 0x14, - 0x46, - 0x1E, - 0x04, - 0x14, - 0x46, - 0x1E, - 0x04, - 0x14, - 0x46, - 0x1E, - 0x04, - 0x14, - 0x46, - 0x1E, - 0x04, - 0x14, - 0x46, - 0x1E, - 0x04, - 0x14, - 0x46, - 0x1E, - 0x04, - 0x14, - 0x46, - 0x1E, - 0x04, - 0x14, - 0x28, - 0x1E, - 0x04, - 0x14, - 0x28, - 0x1E, - 0x04, - 0x28, - 0x3C, - 0x1E, - 0x00, - 0x28, - 0x3C, - 0x1E, - 0x00, - 0x28, - 0x3C, - 0x1E, - 0x00, - 0x28, - 0x3C, - 0x1E, - 0x00, - 0x14, - 0x50, - 0x32, - 0x00, - 0x14, - 0x50, - 0x32, - 0x00, - 0x14, - 0x50, - 0x32, - 0x00, - 0x14, - 0x50, - 0x32, - 0x00, - 0x23, - 0x46, - 0x1E, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x96, - 0x28, - 0x1E, - 0x11, - 0xE6, - 0x64, - 0x32, - 0x15, - 0xE6, - 0x64, - 0x32, - 0x15, - 0x00, - 0x00, - 0x00, - 0x40, - 0x00, - 0x00, - 0x00, - 0x44, - 0x00, - 0x00, - 0x00, - 0x00, - 0x96, - 0x00, - 0x00, - 0x55, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x96, - 0x3C, - 0x3C, - 0x11, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x96, - 0xFF, - 0xFF, - 0x13, - 0x00, - 0x00, - 0x00, - 0x40, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x40, - 0x00, - 0x00, - 0x00, - 0x40, - 0x00, - 0x00, - 0x00, - 0x40, - 0x00, - 0x00, - 0x00, - 0x40, - 0x00, - 0x00, - 0x00, - 0x40, - 0x96, - 0x32, - 0x14, - 0x15, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x46, - 0x1E, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x1E, - 0x32, - 0x28, - 0x05, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x96, - 0x32, - 0x14, - 0x15, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_DATA dItem_itemInfo dItem_data::item_info[255] = { + {15, 40, 30, 4}, {20, 70, 30, 4}, {20, 70, 30, 4}, {20, 70, 30, 4}, {20, 70, 30, 4}, + {20, 70, 30, 4}, {20, 70, 30, 4}, {20, 70, 30, 4}, {20, 40, 30, 4}, {20, 40, 30, 4}, + {40, 60, 30, 0}, {40, 60, 30, 0}, {40, 60, 30, 0}, {40, 60, 30, 0}, {20, 80, 50, 0}, + {20, 80, 50, 0}, {20, 80, 50, 0}, {20, 80, 50, 0}, {35, 70, 30, 0}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {150, 40, 30, 17}, {230, 100, 50, 21}, {230, 100, 50, 21}, + {0, 0, 0, 64}, {0, 0, 0, 68}, {0, 0, 0, 0}, {150, 0, 0, 85}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 4}, {150, 60, 60, 17}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 4}, {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, {0, 0, 0, 0}, {150, 255, 255, 19}, + {0, 0, 0, 64}, {0, 0, 0, 4}, {0, 0, 0, 64}, {0, 0, 0, 64}, {0, 0, 0, 64}, + {0, 0, 0, 64}, {0, 0, 0, 64}, {150, 50, 20, 21}, {0, 0, 0, 4}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 70, 30, 0}, {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {30, 50, 40, 5}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 0}, {0, 0, 0, 4}, + {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, {0, 0, 0, 4}, + {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 4}, {150, 50, 20, 21}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, }; /* 8037AD68-8037AD68 0073C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index 22a375a9f9..882afebe9a 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -287,7 +287,7 @@ asm void dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cX #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dLib_getExpandSizeFromAramArchive(JKRAramArchive* param_0, char const* param_1) { +asm u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* param_0, char const* param_1) { nofralloc #include "asm/d/d_lib/dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc.s" } diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp index fb8b968a2f..ce00b54a32 100644 --- a/src/d/d_model.cpp +++ b/src/d/d_model.cpp @@ -7,54 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct dStage_roomControl_c { - static u8 mStatus[65792]; -}; - -struct dMdl_obj_c {}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dMdl_mng_c { - /* 8009C6DC */ void search(J3DModelData*, u16, dKy_tevstr_c*); - /* 8009C724 */ void entry(J3DModelData*, u16, dKy_tevstr_c*); - /* 8009C8D8 */ void entry(J3DModelData*, u16, int); - /* 8009C7AC */ void create(); - /* 8009C864 */ void remove(); - /* 8009C8C0 */ void reset(); - - static u8 m_myObj[4 + 4 /* padding */]; -}; - -struct dMdl_c { - /* 8009C4FC */ void draw(); - /* 8009C650 */ void create(J3DModelData*, u16, dKy_tevstr_c*); - /* 8009C668 */ void entryObj(dMdl_obj_c*); - /* 8009C808 */ ~dMdl_c(); - /* 8009C930 */ dMdl_c(); -}; - -struct J3DShape { - /* 80315300 */ void loadPreDrawSetting() const; - - static u8 sOldVcdVatCmd[4]; -}; - -struct J3DPacket; -struct J3DDrawBuffer { - /* 8032548C */ void entryImm(J3DPacket*, u16); -}; - -struct J3DPacket { - /* 80312750 */ bool entry(J3DDrawBuffer*); -}; - // // Forward References: // @@ -84,11 +36,6 @@ extern "C" void __dl__FPv(); extern "C" bool entry__9J3DPacketFP13J3DDrawBuffer(); extern "C" void loadPreDrawSetting__8J3DShapeCFv(); extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs(); -extern "C" void PSMTXConcat(); -extern "C" void GXSetChanAmbColor(); -extern "C" void GXSetChanMatColor(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXLoadNrmMtxImm(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_27(); @@ -97,144 +44,147 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" extern void* __vt__9J3DPacket[5]; extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_whiteColor; extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; // // Declarations: // -/* ############################################################################################## */ -/* 80456B70-80456B78 000010 0004+04 1/1 0/0 0/0 .sbss2 @3621 */ -SECTION_SBSS2 static u8 lit_3621[4 + 4 /* padding */]; - /* 8009C4FC-8009C650 096E3C 0154+00 1/0 0/0 0/0 .text draw__6dMdl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMdl_c::draw() { - nofralloc -#include "asm/d/d_model/draw__6dMdl_cFv.s" +void dMdl_c::draw() { + j3dSys.setVtxPos(mpModelData->getVtxPosArray()); + j3dSys.setVtxNrm(mpModelData->getVtxNrmArray()); + j3dSys.setVtxCol(mpModelData->getVtxColorArray(0)); + J3DShape::resetVcdVatCache(); + + J3DShape* shape = mpModelData->getMaterialNodePointer(mMaterialId)->getShape(); + mpModelData->getMaterialNodePointer(mMaterialId)->loadSharedDL(); + shape->loadPreDrawSetting(); + + GXColor amb_color = {mpTevstr->field_0x348.r, mpTevstr->field_0x348.g, mpTevstr->field_0x348.b, + mpTevstr->field_0x348.a}; + GXSetChanAmbColor(GX_COLOR0A0, amb_color); + GXSetChanMatColor(GX_COLOR0A0, g_whiteColor); + dKy_setLight_nowroom_actor(mpTevstr); + dKy_setLight_again(); + dKy_GxFog_tevstr_set(mpTevstr); + + Mtx m; + for (dMdl_obj_c* obj = mpModelObj; obj != NULL; obj = obj->mpObj) { + PSMTXConcat(j3dSys.getViewMtx(), obj->getMtx(), m); + GXLoadPosMtxImm(m, GX_PNMTX0); + GXLoadNrmMtxImm(m, GX_PNMTX0); + shape->simpleDrawCache(); + } + + field_0x1a = false; } -#pragma pop /* 8009C650-8009C668 096F90 0018+00 1/1 0/0 1/1 .text * create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMdl_c::create(J3DModelData* param_0, u16 param_1, dKy_tevstr_c* param_2) { - nofralloc -#include "asm/d/d_model/create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c.s" +void dMdl_c::create(J3DModelData* i_modelData, u16 i_materialId, dKy_tevstr_c* i_tevstr) { + mpModelData = i_modelData; + mMaterialId = i_materialId; + mpTevstr = i_tevstr; + field_0x1a = false; } -#pragma pop /* 8009C668-8009C6DC 096FA8 0074+00 0/0 0/0 5/5 .text entryObj__6dMdl_cFP10dMdl_obj_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMdl_c::entryObj(dMdl_obj_c* param_0) { - nofralloc -#include "asm/d/d_model/entryObj__6dMdl_cFP10dMdl_obj_c.s" +void dMdl_c::entryObj(dMdl_obj_c* i_obj) { + if (!field_0x1a) { + dComIfGd_getListPacket()->entryImm(this, 0); + field_0x1a = true; + mpModelObj = NULL; + } + + i_obj->mpObj = mpModelObj; + mpModelObj = i_obj; } -#pragma pop /* 8009C6DC-8009C724 09701C 0048+00 1/1 0/0 0/0 .text * search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMdl_mng_c::search(J3DModelData* param_0, u16 param_1, dKy_tevstr_c* param_2) { - nofralloc -#include "asm/d/d_model/search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c.s" +dMdl_c* dMdl_mng_c::search(J3DModelData* i_modelData, u16 i_materialId, dKy_tevstr_c* i_tevstr) { + dMdl_c* model = field_0x0; + for (int i = field_0x80; i > 0; i--) { + if (model->getModelData() == i_modelData && model->getMaterialId() == i_materialId && + model->getTevstr() == i_tevstr) { + return model; + } + model++; + } + return NULL; } -#pragma pop /* 8009C724-8009C7AC 097064 0088+00 1/1 0/0 0/0 .text * entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMdl_mng_c::entry(J3DModelData* param_0, u16 param_1, dKy_tevstr_c* param_2) { - nofralloc -#include "asm/d/d_model/entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c.s" +dMdl_c* dMdl_mng_c::entry(J3DModelData* i_modelData, u16 i_materialId, dKy_tevstr_c* i_tevstr) { + dMdl_c* model = search(i_modelData, i_materialId, i_tevstr); + + if (model == NULL) { + if (field_0x80 >= 4) { + return NULL; + } else { + model = &field_0x0[field_0x80]; + model->create(i_modelData, i_materialId, i_tevstr); + field_0x80++; + } + } + + return model; } -#pragma pop /* ############################################################################################## */ /* 80450FA0-80450FA8 0004A0 0004+04 4/4 0/0 0/0 .sbss m_myObj__10dMdl_mng_c */ -u8 dMdl_mng_c::m_myObj[4 + 4 /* padding */]; +dMdl_mng_c* dMdl_mng_c::m_myObj; /* 8009C7AC-8009C808 0970EC 005C+00 0/0 1/1 0/0 .text create__10dMdl_mng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMdl_mng_c::create() { - nofralloc -#include "asm/d/d_model/create__10dMdl_mng_cFv.s" +void dMdl_mng_c::create() { + m_myObj = new dMdl_mng_c(); } -#pragma pop - -/* ############################################################################################## */ -/* 803AF978-803AF990 00CA98 0014+04 2/2 0/0 1/1 .data __vt__6dMdl_c */ -SECTION_DATA extern void* __vt__6dMdl_c[5 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)entry__9J3DPacketFP13J3DDrawBuffer, - (void*)draw__6dMdl_cFv, - (void*)__dt__6dMdl_cFv, - /* padding */ - NULL, -}; /* 8009C808-8009C864 097148 005C+00 3/2 0/0 0/0 .text __dt__6dMdl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMdl_c::~dMdl_c() { - nofralloc -#include "asm/d/d_model/__dt__6dMdl_cFv.s" -} -#pragma pop +dMdl_c::~dMdl_c() {} /* 8009C864-8009C8C0 0971A4 005C+00 0/0 1/1 0/0 .text remove__10dMdl_mng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMdl_mng_c::remove() { - nofralloc -#include "asm/d/d_model/remove__10dMdl_mng_cFv.s" +void dMdl_mng_c::remove() { + if (m_myObj != NULL) { + delete m_myObj; + m_myObj = NULL; + } } -#pragma pop /* 8009C8C0-8009C8D8 097200 0018+00 0/0 1/1 0/0 .text reset__10dMdl_mng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMdl_mng_c::reset() { - nofralloc -#include "asm/d/d_model/reset__10dMdl_mng_cFv.s" +void dMdl_mng_c::reset() { + if (m_myObj == NULL) { + return; + } + + m_myObj->field_0x80 = 0; } -#pragma pop /* 8009C8D8-8009C930 097218 0058+00 0/0 0/0 4/4 .text entry__10dMdl_mng_cFP12J3DModelDataUsi */ +// missing mr instructions +#ifdef NONMATCHING +dMdl_c* dMdl_mng_c::entry(J3DModelData* i_modelData, u16 i_materialId, int i_roomNo) { + if (m_myObj == NULL) { + return NULL; + } + + return entry(i_modelData, i_materialId, dComIfGp_roomControl_getTevStr(i_roomNo)); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMdl_mng_c::entry(J3DModelData* param_0, u16 param_1, int param_2) { +asm dMdl_c* dMdl_mng_c::entry(J3DModelData* param_0, u16 param_1, int param_2) { nofralloc #include "asm/d/d_model/entry__10dMdl_mng_cFP12J3DModelDataUsi.s" } #pragma pop +#endif /* 8009C930-8009C964 097270 0034+00 1/1 0/0 0/0 .text __ct__6dMdl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMdl_c::dMdl_c() { - nofralloc -#include "asm/d/d_model/__ct__6dMdl_cFv.s" +dMdl_c::dMdl_c() { + mpModelData = NULL; + mMaterialId = 0; } -#pragma pop diff --git a/src/d/d_simple_model.cpp b/src/d/d_simple_model.cpp index 46f79ed3fe..9ad7bf70ef 100644 --- a/src/d/d_simple_model.cpp +++ b/src/d/d_simple_model.cpp @@ -4,100 +4,16 @@ // #include "d/d_simple_model.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct modelList_c {}; - -struct J3DModelData {}; - -struct diff_model_c { - /* 80048D60 */ diff_model_c(); - /* 800490EC */ void create(J3DModelData*, int, u8); - /* 800491F4 */ void getModelData(); - /* 80049210 */ void remove(int); - /* 80049270 */ void draw(); - /* 80049368 */ void init(); - /* 80049388 */ void isSame(J3DModelData*, int); - /* 800493FC */ void getRoomNo(); - /* 80049408 */ void insert(modelList_c*); -}; - -struct dStage_roomControl_c { - static u8 mStatus[65792]; -}; - -struct J3DModel {}; - -struct dSmplMdl_draw_c { - /* 80048CB4 */ dSmplMdl_draw_c(); - /* 80048D80 */ ~dSmplMdl_draw_c(); - /* 80048E0C */ void draw(); - /* 80048EBC */ void entry(J3DModel*, int); - /* 80048F70 */ void addModel(J3DModelData*, int, u8); - /* 80049058 */ void removeModel(J3DModelData*, int); -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct JKRSolidHeap {}; - -// -// Forward References: -// - -extern "C" static void dSmplMdl_modelUpdateDL__FP8J3DModel(); -extern "C" void __ct__15dSmplMdl_draw_cFv(); -extern "C" void __ct__12diff_model_cFv(); -extern "C" void __dt__15dSmplMdl_draw_cFv(); -extern "C" void draw__15dSmplMdl_draw_cFv(); -extern "C" void entry__15dSmplMdl_draw_cFP8J3DModeli(); -extern "C" void addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc(); -extern "C" void removeModel__15dSmplMdl_draw_cFP12J3DModelDatai(); -extern "C" void create__12diff_model_cFP12J3DModelDataiUc(); -extern "C" void getModelData__12diff_model_cFv(); -extern "C" void remove__12diff_model_cFi(); -extern "C" void draw__12diff_model_cFv(); -extern "C" void init__12diff_model_cFv(); -extern "C" void isSame__12diff_model_cFP12J3DModelDatai(); -extern "C" void getRoomNo__12diff_model_cFv(); -extern "C" void insert__12diff_model_cFP11modelList_c(); +#include "m_Do/m_Do_mtx.h" // // External References: // -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_createSolidHeapFromGameToCurrent__FUlUl(); -extern "C" void mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap(); -extern "C" void mDoExt_destroySolidHeap__FP12JKRSolidHeap(); -extern "C" void mDoExt_restoreCurrentHeap__Fv(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void __construct_array(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; +extern "C" extern dScnKy_env_light_c g_env_light; // // Declarations: @@ -105,181 +21,212 @@ extern "C" extern u8 j3dSys[284]; /* 80048C54-80048CB4 043594 0060+00 1/1 0/0 0/0 .text dSmplMdl_modelUpdateDL__FP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dSmplMdl_modelUpdateDL(J3DModel* param_0) { - nofralloc -#include "asm/d/d_simple_model/dSmplMdl_modelUpdateDL__FP8J3DModel.s" +static void dSmplMdl_modelUpdateDL(J3DModel* i_model) { + i_model->calc(); + i_model->entry(); + i_model->viewCalc(); } -#pragma pop - -/* ############################################################################################## */ -/* 803A82F8-803A8308 005418 000C+04 2/2 0/0 0/0 .data __vt__15dSmplMdl_draw_c */ -SECTION_DATA extern void* __vt__15dSmplMdl_draw_c[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15dSmplMdl_draw_cFv, - /* padding */ - NULL, -}; /* 80048CB4-80048D60 0435F4 00AC+00 0/0 1/1 0/0 .text __ct__15dSmplMdl_draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSmplMdl_draw_c::dSmplMdl_draw_c() { - nofralloc -#include "asm/d/d_simple_model/__ct__15dSmplMdl_draw_cFv.s" +dSmplMdl_draw_c::dSmplMdl_draw_c() { + for (int i = 0; i < 8; i++) { + mModel[i].init(); + } + + for (int i = 0; i < 500; i++) { + mList[i].init(); + } + + mListCount = 0; } -#pragma pop /* 80048D60-80048D80 0436A0 0020+00 1/1 0/0 0/0 .text __ct__12diff_model_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm diff_model_c::diff_model_c() { - nofralloc -#include "asm/d/d_simple_model/__ct__12diff_model_cFv.s" +diff_model_c::diff_model_c() { + mpHeap = NULL; + mpModel = NULL; + mCreateNum = 0; + mpList = NULL; + mRoomNo = 63; } -#pragma pop /* 80048D80-80048E0C 0436C0 008C+00 1/0 0/0 0/0 .text __dt__15dSmplMdl_draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSmplMdl_draw_c::~dSmplMdl_draw_c() { - nofralloc -#include "asm/d/d_simple_model/__dt__15dSmplMdl_draw_cFv.s" +dSmplMdl_draw_c::~dSmplMdl_draw_c() { + for (int i = 0; i < 8; i++) { + if (mModel[i].getModel() != NULL) { + mModel[i].remove(1); + } + } } -#pragma pop /* 80048E0C-80048EBC 04374C 00B0+00 0/0 1/1 0/0 .text draw__15dSmplMdl_draw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSmplMdl_draw_c::draw() { - nofralloc -#include "asm/d/d_simple_model/draw__15dSmplMdl_draw_cFv.s" +void dSmplMdl_draw_c::draw() { + for (int i = 0; i < 8; i++) { + if (mModel[i].getModel() != NULL) { + mModel[i].draw(); + } + } + mListCount = 0; + + for (int i = 0; i < 500; i++) { + mList[i].init(); + } + + for (int i = 0; i < 8; i++) { + mModel[i].insert(NULL); + } } -#pragma pop /* 80048EBC-80048F70 0437FC 00B4+00 0/0 1/1 0/0 .text entry__15dSmplMdl_draw_cFP8J3DModeli */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSmplMdl_draw_c::entry(J3DModel* param_0, int param_1) { - nofralloc -#include "asm/d/d_simple_model/entry__15dSmplMdl_draw_cFP8J3DModeli.s" +void dSmplMdl_draw_c::entry(J3DModel* i_model, int roomNo) { + if (i_model != NULL && mListCount < 500) { + mList[mListCount].set(i_model); + for (int i = 0; i < 8; i++) { + if (mModel[i].isSame(i_model->getModelData(), roomNo)) { + mModel[i].insert(&mList[mListCount]); + break; + } + } + mListCount++; + } } -#pragma pop /* 80048F70-80049058 0438B0 00E8+00 0/0 1/1 0/0 .text * addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSmplMdl_draw_c::addModel(J3DModelData* param_0, int param_1, u8 param_2) { - nofralloc -#include "asm/d/d_simple_model/addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc.s" +BOOL dSmplMdl_draw_c::addModel(J3DModelData* i_modelData, int roomNo, u8 drawBG) { + for (int i = 0; i < 8; i++) { + if (mModel[i].isSame(i_modelData, roomNo)) { + return mModel[i].create(i_modelData, roomNo, drawBG) ? TRUE : FALSE; + } + } + + for (int i = 0; i < 8; i++) { + if (mModel[i].getModelData() == NULL) { + return mModel[i].create(i_modelData, roomNo, drawBG) ? TRUE : FALSE; + } + } + + return 0; } -#pragma pop /* 80049058-800490EC 043998 0094+00 0/0 1/1 0/0 .text * removeModel__15dSmplMdl_draw_cFP12J3DModelDatai */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSmplMdl_draw_c::removeModel(J3DModelData* param_0, int param_1) { - nofralloc -#include "asm/d/d_simple_model/removeModel__15dSmplMdl_draw_cFP12J3DModelDatai.s" -} -#pragma pop +int dSmplMdl_draw_c::removeModel(J3DModelData* i_modelData, int roomNo) { + if (i_modelData == NULL) { + return 0; + } -/* ############################################################################################## */ -/* 80451F38-80451F40 000538 0004+04 1/1 0/0 0/0 .sdata2 @3763 */ -SECTION_SDATA2 static f32 lit_3763[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; + for (int i = 0; i < 8; i++) { + if (mModel[i].isSame(i_modelData, roomNo)) { + mModel[i].remove(0); + return 0; + } + } + + return 0; +} /* 800490EC-800491F4 043A2C 0108+00 1/1 0/0 0/0 .text create__12diff_model_cFP12J3DModelDataiUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void diff_model_c::create(J3DModelData* param_0, int param_1, u8 param_2) { - nofralloc -#include "asm/d/d_simple_model/create__12diff_model_cFP12J3DModelDataiUc.s" +BOOL diff_model_c::create(J3DModelData* i_modelData, int roomNo, u8 drawBG) { + if (mpHeap == NULL) { + mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x2000, 0x20); + + if (mpHeap != NULL) { + mpModel = mDoExt_J3DModel__create(i_modelData, 0x80000, 0x11000084); + + if (mpModel == NULL) { + remove(1); + mDoExt_restoreCurrentHeap(); + } else { + mpModel->setBaseScale(cXyz(0.0f, 0.0f, 0.0f)); + mpModel->i_setBaseTRMtx(g_mDoMtx_identity); + mCreateNum++; + mDoExt_adjustSolidHeapToSystem(mpHeap); + mRoomNo = roomNo; + mDrawBG = drawBG; + return 1; + } + } + } else { + mCreateNum++; + return 1; + } + + return 0; } -#pragma pop /* 800491F4-80049210 043B34 001C+00 2/2 0/0 0/0 .text getModelData__12diff_model_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void diff_model_c::getModelData() { - nofralloc -#include "asm/d/d_simple_model/getModelData__12diff_model_cFv.s" +J3DModelData* diff_model_c::getModelData() { + if (mpModel != NULL) { + return mpModel->getModelData(); + } + return NULL; } -#pragma pop /* 80049210-80049270 043B50 0060+00 3/3 0/0 0/0 .text remove__12diff_model_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void diff_model_c::remove(int param_0) { - nofralloc -#include "asm/d/d_simple_model/remove__12diff_model_cFi.s" +void diff_model_c::remove(int param_0) { + mCreateNum--; + + if (mCreateNum == 0 || param_0 != 0) { + JKRSolidHeap* heap = mpHeap; + if (heap != NULL) { + mDoExt_destroySolidHeap(heap); + init(); + } + } } -#pragma pop /* 80049270-80049368 043BB0 00F8+00 1/1 0/0 0/0 .text draw__12diff_model_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void diff_model_c::draw() { - nofralloc -#include "asm/d/d_simple_model/draw__12diff_model_cFv.s" +void diff_model_c::draw() { + modelList_c* list = mpList; + if (list != NULL) { + if (dComIfGp_roomControl_checkStatusFlag(getRoomNo(), 0x10)) { + dKy_tevstr_c* tevstr = dComIfGp_roomControl_getTevStr(getRoomNo()); + g_env_light.setLightTevColorType_MAJI(mpModel, tevstr); + + if (mDrawBG == 1) { + dComIfGd_setListBG(); + } + + for (; list != NULL; list = list->field_0x4) { + dSmplMdl_modelUpdateDL(list->mpModel); + } + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + } + } } -#pragma pop /* 80049368-80049388 043CA8 0020+00 2/2 0/0 0/0 .text init__12diff_model_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void diff_model_c::init() { - nofralloc -#include "asm/d/d_simple_model/init__12diff_model_cFv.s" +void diff_model_c::init() { + mpModel = NULL; + mpHeap = NULL; + mpList = NULL; + mCreateNum = 0; + mRoomNo = 63; } -#pragma pop /* 80049388-800493FC 043CC8 0074+00 3/3 0/0 0/0 .text isSame__12diff_model_cFP12J3DModelDatai */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void diff_model_c::isSame(J3DModelData* param_0, int param_1) { - nofralloc -#include "asm/d/d_simple_model/isSame__12diff_model_cFP12J3DModelDatai.s" +BOOL diff_model_c::isSame(J3DModelData* i_modelData, int roomNo) { + if (mpModel != NULL) { + return getModelData() == i_modelData && roomNo == getRoomNo(); + } + + return FALSE; } -#pragma pop /* 800493FC-80049408 043D3C 000C+00 2/2 0/0 0/0 .text getRoomNo__12diff_model_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void diff_model_c::getRoomNo() { - nofralloc -#include "asm/d/d_simple_model/getRoomNo__12diff_model_cFv.s" +s32 diff_model_c::getRoomNo() { + return mRoomNo; } -#pragma pop /* 80049408-80049420 043D48 0018+00 2/2 0/0 0/0 .text insert__12diff_model_cFP11modelList_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void diff_model_c::insert(modelList_c* param_0) { - nofralloc -#include "asm/d/d_simple_model/insert__12diff_model_cFP11modelList_c.s" +void diff_model_c::insert(modelList_c* list) { + modelList_c* prev = mpList; + mpList = list; + + if (list == NULL) { + return; + } + + list->field_0x4 = prev; } -#pragma pop diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 4d519a0d6b..cdcd6314fe 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -4,32 +4,19 @@ // #include "d/d_stage.h" -#include "d/d_procname.h" +#include "JSystem/JKernel/JKRAramArchive.h" +#include "SSystem/SComponent/c_malloc.h" #include "d/com/d_com_inf_game.h" +#include "d/com/d_com_static.h" +#include "d/d_procname.h" +#include "d/save/d_save_HIO.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_kankyo_mng.h" +#include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_reset.h" -// -// Types: -// - -struct daSus_c { - /* 80031434 */ void check(s8, cXyz const&); - /* 800315A4 */ void execute(); -}; - -struct dSvBit_HIO_c { - /* 8025C1F8 */ void init(); -}; - -struct cMl { - /* 80263228 */ void memalignB(int, u32); -}; - -struct JKRAramArchive {}; - // // Forward References: // @@ -411,13 +398,17 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern J3DLightInfo const j3dDefaultLightInfo; -extern "C" extern u8 g_save_bit_HIO[1184 + 4 /* padding */]; +extern "C" extern dSvBit_HIO_c g_save_bit_HIO; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; // // Declarations: // +inline u8 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { + return param_0->field_0x09 >> 1 & 0x1f; +} + inline dStage_stageDt_c* dComIfGp_getStage() { return &g_dComIfG_gameInfo.play.getStage(); } @@ -452,16 +443,14 @@ dStage_KeepDoorInfo* dStage_GetKeepDoorInfo() { return &DoorInfo; } -static u8 dStage_isBossStage(dStage_dt_c* param_0) { - u8 isBossStg; - stage_stag_info_class* pstag = param_0->getStagInfo(); +static u8 dStage_isBossStage(dStage_dt_c* stageDt) { + stage_stag_info_class* pstag = stageDt->getStagInfo(); - if (pstag == 0) { - isBossStg = false; - } else { - isBossStg = dStage_stagInfo_GetSTType(pstag) == 3; + if (pstag == NULL) { + return false; } - return isBossStg; + + return dStage_stagInfo_GetSTType(pstag) == 3; } /* 80023F50-80023F84 01E890 0034+00 1/1 0/0 0/1 .text dStage_KeepDoorInfoInit__FP11dStage_dt_c */ @@ -482,13 +471,6 @@ static asm void dStage_KeepDoorInfoProc(dStage_dt_c* param_0, stage_tgsc_class* } #pragma pop -/* ############################################################################################## */ -/* 803F5778-803F5784 022498 000C+00 0/1 0/0 0/0 .bss @3981 */ -// #pragma push -// #pragma force_active on -// static u8 lit_3981[12]; -// #pragma pop - /* 803F5784-803F6088 0224A4 0904+00 3/4 0/0 0/0 .bss l_RoomKeepDoorInfo */ static dStage_KeepDoorInfo l_RoomKeepDoorInfo; @@ -513,23 +495,11 @@ static asm void dStage_RoomKeepDoorInfoProc(dStage_dt_c* param_0, stage_tgsc_cla /* 80024174-8002419C 01EAB4 0028+00 2/0 0/0 0/0 .text * dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv */ -#ifdef NONMATCHING -static int dStage_RoomKeepDoorInit(dStage_dt_c* param_0, void* param_1, int param_2, +static int dStage_RoomKeepDoorInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { - dStage_RoomKeepDoorInfoProc(param_0, (stage_tgsc_class*)param_1); + dStage_RoomKeepDoorInfoProc(stageDt, (stage_tgsc_class*)((char*)i_data + 4)); return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_RoomKeepDoorInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv.s" -} -#pragma pop -#endif void dStage_startStage_c::set(const char* i_Name, s8 i_RoomNo, s16 i_Point, s8 i_Layer) { strcpy(mName, i_Name); @@ -538,14 +508,6 @@ void dStage_startStage_c::set(const char* i_Name, s8 i_RoomNo, s16 i_Point, s8 i mLayer = i_Layer; } -/* ############################################################################################## */ -/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378ADD = "name.bin"; -SECTION_DEAD static char const* const stringBase_80378AE6 = "bank.bin"; -#pragma pop - /* 803F6094-80406194 022DB4 10100+00 12/12 31/31 16/16 .bss mStatus__20dStage_roomControl_c */ dStage_roomStatus_c dStage_roomControl_c::mStatus[0x40]; @@ -557,19 +519,16 @@ u32 dStage_roomControl_c::mProcID; /* 80450D64-80450D68 -00001 0004+00 6/6 94/94 101/101 .sbss None */ /* 80450D64 0001+00 data_80450D64 None */ -/* 80450D65 0001+00 data_80450D65 None */ -/* 80450D66 0001+00 data_80450D66 None */ -/* 80450D67 0001+00 data_80450D67 None */ s8 struct_80450D64; -#pragma push -#pragma force_active on -s8 sLastStayNo; +/* 80450D65 0001+00 data_80450D65 None */ +s8 gLastStayNo; -s8 sNextStayNo; -#pragma pop +/* 80450D66 0001+00 data_80450D66 None */ +s8 gNextStayNo; -s8 sTimePass; +/* 80450D67 0001+00 data_80450D67 None */ +s8 gTimePass; /* 80450D68-80450D6C 000268 0004+00 2/2 2/2 1/1 .sbss None */ u8 data_80450D68; @@ -581,38 +540,48 @@ char* dStage_roomControl_c::mArcBankName; char* dStage_roomControl_c::mArcBankData; /* 800241E8-80024338 01EB28 0150+00 1/1 0/0 0/4 .text init__20dStage_roomControl_cFv */ -#ifdef NONMATCHING void dStage_roomControl_c::init() { - if (-1 < dComIfGp_getStartStagePoint()) { - dComIfGs_initZone(); + struct_80450D64 = -1; + gLastStayNo = -1; + gNextStayNo = -1; + data_80450D68 = 0; + data_804505F0 = -1; + + if (dComIfGp_getStartStagePoint() >= 0 || dComIfGp_getStartStagePoint() == -4) { + initZone(); } - dStage_roomStatus_c* status = &mStatus[0]; - + dStage_roomStatus_c* status = mStatus; for (int i = 0; i < 0x40; i++) { status->mRoomDt.init(); status->mRoomDt.initFileList2(); - status->unk_0x3F4[0] = 0; - status->unk_0x3F4[1] = 0; + setStatusFlag(i, 0); + status->mDraw = false; + + if (status->mZoneNo >= 0) { + dComIfGs_clearRoomSwitch(status->mZoneNo); + dComIfGs_clearRoomItem(status->mZoneNo); + } + + status->mMemBlockID = -1; + status->field_0x400 = 0; + status++; + } + + mArcBankName = (char*)dComIfG_getStageRes("name.bin"); + mArcBankData = (char*)dComIfG_getStageRes("bank.bin"); + + if (mArcBankName == NULL) { + mArcBankData = NULL; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomControl_c::init() { - nofralloc -#include "asm/d/d_stage/init__20dStage_roomControl_cFv.s" -} -#pragma pop -#endif /* 80024338-80024384 01EC78 004C+00 1/1 1/1 0/7 .text initZone__20dStage_roomControl_cFv */ void dStage_roomControl_c::initZone() { dComIfGs_initZone(); - dStage_roomStatus_c* status = &mStatus[0]; + dStage_roomStatus_c* status = mStatus; for (int i = 0; i < 0x40; i++) { status->mZoneNo = -1; status++; @@ -1568,10 +1537,10 @@ SECTION_DATA static FuncTable l_layerFuncTable_5131[2] = { }; /* 803A6638-803A6644 -00001 000C+00 1/1 0/0 0/0 .data l_funcTable$5136 */ -SECTION_DATA static FuncTable l_funcTable_5136 = {"STAG", dStage_stagInfoInit}; +SECTION_DATA static FuncTable l_funcTable_5136[1] = {"STAG", dStage_stagInfoInit}; /* 803A6644-803A6650 -00001 000C+00 1/1 0/0 0/0 .data l_layerFuncTableA$5141 */ -SECTION_DATA static FuncTable l_layerFuncTableA = {"SON0", dStage_soundInfoInit}; +SECTION_DATA static FuncTable l_layerFuncTableA[1] = {"SON0", dStage_soundInfoInit}; /* 803A6650-803A668C -00001 003C+00 1/1 0/0 0/0 .data l_envLayerFuncTable$5142 */ SECTION_DATA static FuncTable l_envLayerFuncTable[5] = { @@ -1636,7 +1605,6 @@ SECTION_DATA JKRExpHeap* dStage_roomControl_c::mMemoryBlock[19] = { }; /* 800243B0-800243E8 01ECF0 0038+00 0/0 3/3 1/1 .text getMemoryBlock__20dStage_roomControl_cFi */ -#ifdef NONMATCHING JKRExpHeap* dStage_roomControl_c::getMemoryBlock(int i_roomNo) { int blockId = getMemoryBlockID(i_roomNo); @@ -1645,44 +1613,24 @@ JKRExpHeap* dStage_roomControl_c::getMemoryBlock(int i_roomNo) { } return mMemoryBlock[blockId]; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JKRExpHeap* dStage_roomControl_c::getMemoryBlock(int param_0) { - nofralloc -#include "asm/d/d_stage/getMemoryBlock__20dStage_roomControl_cFi.s" -} -#pragma pop -#endif /* 800243E8-80024424 01ED28 003C+00 2/2 0/0 0/0 .text setStayNo__20dStage_roomControl_cFi */ -#ifdef NONMATCHING -void dStage_roomControl_c::setStayNo(int param_0) { - sLastStayNo = struct_80450D64; - struct_80450D64 = param_0; +void dStage_roomControl_c::setStayNo(int stayNo) { + gLastStayNo = struct_80450D64; + struct_80450D64 = stayNo; + gNextStayNo = struct_80450D64; - if (struct_80450D64 > -1) { - sNextStayNo = struct_80450D64; + if (struct_80450D64 < 0) { + return; } - sNextStayNo = struct_80450D64; - mStatus[struct_80450D64].unk_0x3F4[1] = 1; + + onStatusDraw(struct_80450D64); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomControl_c::setStayNo(int param_0) { - nofralloc -#include "asm/d/d_stage/setStayNo__20dStage_roomControl_cFi.s" -} -#pragma pop -#endif /* 80024424-8002442C 01ED64 0008+00 0/0 0/0 1/1 .text setNextStayNo__20dStage_roomControl_cFi */ void dStage_roomControl_c::setNextStayNo(int nextStayNo) { - sNextStayNo = nextStayNo; + gNextStayNo = nextStayNo; } static int stayRoomCheck(int param_0, u8* param_1, int param_2) { @@ -1696,14 +1644,21 @@ static int stayRoomCheck(int param_0, u8* param_1, int param_2) { } /* 80024460-800244E8 01EDA0 0088+00 1/1 0/0 0/0 .text createRoomScene__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void createRoomScene(int param_0) { - nofralloc -#include "asm/d/d_stage/createRoomScene__Fi.s" +static int createRoomScene(int param_0) { + int* ptr = (int*)JKRHeap::alloc(4, -4, NULL); + + if (ptr == NULL) { + return 0; + } + *ptr = param_0; + + if (!fopScnM_CreateReq(PROC_ROOM_SCENE, 0x7FFF, 0, (u32)ptr)) { + JKRHeap::free(ptr, NULL); + return 0; + } + + return 1; } -#pragma pop /* 800244E8-8002451C 01EE28 0034+00 0/0 0/0 8/13 .text checkRoomDisp__20dStage_roomControl_cCFi */ bool dStage_roomControl_c::checkRoomDisp(int i_roomNo) const { @@ -1717,32 +1672,42 @@ bool dStage_roomControl_c::checkRoomDisp(int i_roomNo) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dStage_roomControl_c::loadRoom(int param_0, u8* param_1, bool param_2) { +asm int dStage_roomControl_c::loadRoom(int param_0, u8* param_1, bool param_2) { nofralloc #include "asm/d/d_stage/loadRoom__20dStage_roomControl_cFiPUcb.s" } #pragma pop /* 8002471C-8002483C 01F05C 0120+00 1/1 0/0 0/3 .text zoneCountCheck__20dStage_roomControl_cCFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomControl_c::zoneCountCheck(int param_0) const { - nofralloc -#include "asm/d/d_stage/zoneCountCheck__20dStage_roomControl_cCFi.s" +void dStage_roomControl_c::zoneCountCheck(int stayNo) const { + dStage_roomStatus_c* status = mStatus; + for (int i = 0; i < 0x40; i++) { + if (status->mZoneNo >= 0 && status->mZoneCount > 0) { + dComIfGs_clearRoomSwitch(status->mZoneNo); + dComIfGs_clearRoomItem(status->mZoneNo); + + if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 0 && + stayNo != gLastStayNo) { + if (--status->mZoneCount == 0) { + dComIfGs_removeZone(status->mZoneNo); + status->mZoneNo = -1; + } + } + } + status++; + } + setStayNo(stayNo); } -#pragma pop stage_stag_info_class* dStage_stageDt_c::getStagInfo() const { return mStagInfo; } -JKRExpHeap* dStage_roomControl_c::createMemoryBlock(int param_0, u32 param_1) { - if (mMemoryBlock[param_0] == NULL) { - JKRHeap* tmp = mDoExt_getArchiveHeap(); - mMemoryBlock[param_0] = JKRExpHeap::create(param_1, tmp, false); +JKRExpHeap* dStage_roomControl_c::createMemoryBlock(int index, u32 param_1) { + if (mMemoryBlock[index] == NULL) { + mMemoryBlock[index] = JKRExpHeap::create(param_1, mDoExt_getArchiveHeap(), false); } - return mMemoryBlock[param_0]; + return mMemoryBlock[index]; } void dStage_roomControl_c::destroyMemoryBlock() { @@ -1780,8 +1745,8 @@ SECTION_DATA char dStage_roomControl_c::mArcBank[32][10] = { }; /* 8002490C-80024940 01F24C 0034+00 1/1 1/1 0/2 .text setArcBank__20dStage_roomControl_cFiPCc */ -void dStage_roomControl_c::setArcBank(int i_bank, char const* param_1) { - strncpy(&mArcBank[i_bank][0], param_1, 9); +void dStage_roomControl_c::setArcBank(int i_bank, char const* bankName) { + strncpy(&mArcBank[i_bank][0], bankName, 9); } /* 80024940-80024954 01F280 0014+00 1/1 1/1 0/1 .text getArcBank__20dStage_roomControl_cFi */ @@ -1802,14 +1767,14 @@ SECTION_DEAD static char const* const stringBase_80378AF0 = */ // regalloc #ifdef NONMATCHING -int dStage_roomControl_c::resetArchiveBank(int i_bank) { +bool dStage_roomControl_c::resetArchiveBank(int i_bank) { for (; i_bank < 32; i_bank++) { char* bank = getArcBank(i_bank); if (strcmp(bank, "")) { s32 syncStatus = dComIfG_syncObjectRes(bank); if (syncStatus < 0) { - OSReport_Error("Bank[%d] : %s.arc Sync Read Error !!\n", bank, i_bank); + OSReport_Error("Bank[%d] : %s.arc Sync Read Error !!\n", i_bank, bank); } else { if (syncStatus > 0) { return 0; @@ -1834,60 +1799,59 @@ asm bool dStage_roomControl_c::resetArchiveBank(int param_0) { /* 80024A34-80024ABC 01F374 0088+00 1/1 0/0 0/2 .text * create__Q220dStage_roomControl_c9roomDzs_cFUc */ -#ifdef NONMATCHING -void dStage_roomControl_c::roomDzs_c::create(u8 param_0) { - JKRExpHeap* archeap = mDoExt_getArchiveHeap(); - JKRHeap** heap = new (archeap, -4) JKRHeap*[param_0]; - m_dzs = heap; +void dStage_roomControl_c::roomDzs_c::create(u8 i_num) { + m_dzs = new (mDoExt_getArchiveHeap(), -4) void*[i_num]; - JKRHeap* heap2 = (JKRHeap*)m_dzs; - - if (heap2 != NULL) { - for (u8 i = 0; i < param_0; i++) { - heap2 = heap[i]; + if (m_dzs != NULL) { + u32** dzs = (u32**)m_dzs; + for (u8 i = 0; i < i_num; i++) { + *dzs = NULL; + dzs++; } - m_num = param_0; + m_num = i_num; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomControl_c::roomDzs_c::create(u8 param_0) { - nofralloc -#include "asm/d/d_stage/create__Q220dStage_roomControl_c9roomDzs_cFUc.s" -} -#pragma pop -#endif /* 80024ABC-80024B44 01F3FC 0088+00 1/1 0/0 0/0 .text remove__Q220dStage_roomControl_c9roomDzs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomControl_c::roomDzs_c::remove() { - nofralloc -#include "asm/d/d_stage/remove__Q220dStage_roomControl_c9roomDzs_cFv.s" +void dStage_roomControl_c::roomDzs_c::remove() { + if (m_num != 0) { + u32** dzs = (u32**)m_dzs; + for (u8 i = 0; i < m_num; i++) { + if (*dzs != NULL) { + mDoExt_getArchiveHeap()->free(*dzs); + } + dzs++; + } + delete[] m_dzs; + m_num = 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378B16 = "%s/room%d.dzs"; -#pragma pop /* 80024B44-80024C1C 01F484 00D8+00 1/1 0/0 0/1 .text add__Q220dStage_roomControl_c9roomDzs_cFUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomControl_c::roomDzs_c::add(u8 param_0, u8 param_1) { - nofralloc -#include "asm/d/d_stage/add__Q220dStage_roomControl_c9roomDzs_cFUcUc.s" +void* dStage_roomControl_c::roomDzs_c::add(u8 i_num, u8 roomNo) { + if (m_num == 0) { + return NULL; + } + + void** dzs = m_dzs; + if (dzs[i_num] == NULL) { + char dzsName[20]; + sprintf(dzsName, "%s/room%d.dzs", dComIfGp_getStartStageName(), roomNo); + + u32 expandSize = + dLib_getExpandSizeFromAramArchive(dComIfGp_getFieldMapArchive2(), (const char*)dzsName); + void* dzs_buf = mDoExt_getArchiveHeap()->alloc(expandSize, -0x20); + dzs[i_num] = dzs_buf; + + if (dzs[i_num] != NULL) { + dComIfGp_getFieldMapArchive2()->readResource(dzs[i_num], expandSize, dzsName); + } + } + + return dzs[i_num]; } -#pragma pop void dStage_stageDt_c::init() { mCamera = NULL; @@ -1954,18 +1918,24 @@ void dStage_roomDt_c::init() { } /* 80024D10-80024DB0 01F650 00A0+00 1/1 0/0 0/0 .text dStage_roomInit__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dStage_roomInit(int param_0) { - nofralloc -#include "asm/d/d_stage/dStage_roomInit__Fi.s" +static int dStage_roomInit(int stayNo) { + dComIfGp_roomControl_setStayNo(stayNo); + + roomRead_class* room = dComIfGp_getStageRoom(); + if (room != NULL && room->field_0x0 > stayNo) { + int time_pass = dStage_roomRead_dt_c_GetTimePass(*room->field_0x4[stayNo]); + dComIfGp_roomControl_setTimePass(time_pass); + + return dComIfGp_roomControl_loadRoom(room->field_0x4[stayNo]->field_0x0, + room->field_0x4[stayNo]->field_0x4, true); + } + + return 1; } -#pragma pop /* 80024DB0-80024DB8 01F6F0 0008+00 2/2 0/0 0/0 .text SetTimePass__20dStage_roomControl_cFi */ void dStage_roomControl_c::SetTimePass(int isPassing) { - sTimePass = isPassing; + gTimePass = isPassing; } roomRead_class* dStage_stageDt_c::getRoom() const { @@ -2023,8 +1993,7 @@ static void dStage_actorCreate(stage_actor_data_class* param_0, fopAcM_prm_class param_1->mSubtype = actorInf->mSubtype; s16 objName = actorInf->mProcName; - // "hider" actor - if (objName == 0x30F) { + if (objName == PROC_SUSPEND) { actor = (fopAc_ac_c*)fopAcM_FastCreate(objName, 0, NULL, param_1); if (actor != NULL) { @@ -2037,25 +2006,20 @@ static void dStage_actorCreate(stage_actor_data_class* param_0, fopAcM_prm_class } } -/* ############################################################################################## */ -/* 80451C90-80451C94 000290 0004+00 2/2 0/0 0/0 .sdata2 @4270 */ -SECTION_SDATA2 static u8 lit_4270[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 80024F98-80025004 01F8D8 006C+00 1/1 0/0 0/0 .text * dStage_cameraCreate__FP24stage_camera2_data_classii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dStage_cameraCreate(stage_camera2_data_class* param_0, int param_1, int param_2) { - nofralloc -#include "asm/d/d_stage/dStage_cameraCreate__FP24stage_camera2_data_classii.s" +static int dStage_cameraCreate(stage_camera2_data_class* camera, int i_cameraIdx, int param_2) { + camera = static_cast(cMl::memalignB(-4, 0x18)); + + if (camera != NULL) { + camera->field_0x4 = 0.0f; + camera->field_0x8 = 0.0f; + camera->field_0x4 = 0.0f; + camera->field_0x0 = param_2; + fopCamM_Create(i_cameraIdx, PROC_CAMERA, camera); + } + return 1; } -#pragma pop stage_actor_class* dStage_roomDt_c::getPlayer() const { return mPlayer; @@ -2065,52 +2029,96 @@ stage_actor_class* dStage_stageDt_c::getPlayer() const { return mPlayer; } -/* ############################################################################################## */ -/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378B2B = "S_MV000"; -#pragma pop - /* 80025014-800252B8 01F954 02A4+00 2/0 0/0 0/0 .text dStage_playerInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_playerInit(dStage_dt_c* param_0, void* param_1, int param_2, void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_playerInit__FP11dStage_dt_cPviPv.s" -} -#pragma pop +static int dStage_playerInit(dStage_dt_c* stageDt, void* i_data, int num, void* param_3) { + stage_actor_class* player = (stage_actor_class*)((int*)i_data + 1); + stage_actor_data_class* player_data = player->mEntries; + stageDt->setPlayer(player); + stageDt->setPlayerNum(num); + + if (dComIfGp_getPlayer(0) != NULL || dComIfGp_getStartStageRoomNo() != stageDt->getRoomNo()) { + return 1; + } + + fopAcM_prm_class* appen = fopAcM_CreateAppend(); + + int point = dComIfGp_getStartStagePoint(); + u32 roomParam = dComIfGs_getRestartRoomParam(); + if (point == -2 || point == -3) { + appen->mParameter = dComIfGs_getTurnRestartParam(); + appen->mPos = dComIfGs_getTurnRestartPos(); + appen->mAngle.set(0, dComIfGs_getTurnRestartAngleY(), -0x100); + } else if (point == -1) { + appen->mParameter = roomParam; + appen->mPos = dComIfGs_getRestartRoomPos(); + appen->mAngle.set(0, dComIfGs_getRestartRoomAngleY(), -0x100); + } else { + int unk; + if (point == -4) { + unk = dComIfGs_getTurnRestartAngleY(); + } else { + unk = point; + } + + for (int i = 0; i < num; i++) { + if ((u8)player_data->mAngle.z == unk) { + break; + } + player_data++; + } + + appen->mParameter = player_data->mParameter; + appen->mPos = player_data->mSpawnPos; + appen->mAngle = player_data->mAngle; + appen->mEnemyNo = player_data->mEnemyNo; + + if (point == -4) { + appen->mParameter = dComIfGs_getTurnRestartParam(); + } else if (roomParam != 0) { + appen->mParameter = (roomParam & 0xFFFFFFC0) | (dComIfGp_getStartStageRoomNo() & 0x3F); + } else if (roomParam == 0) { + appen->mParameter = + (appen->mParameter & 0xFFFFFFC0) | (dComIfGp_getStartStageRoomNo() & 0x3F); + } + } + + dComIfGs_setRestartRoomParam(0); + appen->mEnemyNo = 0xFFFF; + appen->mRoomNo = -1; + + dComIfGp_getStartStage()->set(dComIfGp_getStartStageName(), appen->mParameter & 0x3F, + dComIfGp_getStartStagePoint(), dComIfGp_getStartStageLayer()); + dStage_actorCreate(player_data, appen); + + base_process_class* ac = + (base_process_class*)fopScnM_SearchByID(dStage_roomControl_c::getProcID()); + if (ac->mProcName == PROC_PLAY_SCENE) { + if (strcmp(dComIfGp_getStartStageName(), "S_MV000")) { + fopMsgM_Create(PROC_METER2, NULL, NULL); + } + } -/* 800252B8-80025308 01FBF8 0050+00 1/0 0/0 0/0 .text dStage_cameraInit__FP11dStage_dt_cPviPv */ -#ifdef NONMATCHING -static int dStage_cameraInit(dStage_dt_c* param_0, void* param_1, int param_2, void* param_3) { - unkTest* tmp = (unkTest*)param_1; - param_0->setCamera((stage_camera_class*)tmp->field_0x4); - dStage_cameraCreate((stage_camera2_data_class*)tmp->field_0x4, 0, 0); return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_cameraInit(dStage_dt_c* param_0, void* param_1, int param_2, void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_cameraInit__FP11dStage_dt_cPviPv.s" + +/* 800252B8-80025308 01FBF8 0050+00 1/0 0/0 0/0 .text dStage_cameraInit__FP11dStage_dt_cPviPv */ +static int dStage_cameraInit(dStage_dt_c* stageDt, void* i_data, int param_2, void* param_3) { + stage_camera_class* camera = (stage_camera_class*)((char*)i_data + 4); + stageDt->setCamera(camera); + dStage_cameraCreate(camera->field_0x4, 0, 0); + return 1; } -#pragma pop -#endif /* 80025308-8002533C 01FC48 0034+00 1/0 0/0 0/0 .text dStage_RoomCameraInit__FP11dStage_dt_cPviPv */ -static int dStage_RoomCameraInit(dStage_dt_c* i_stage, void* param_1, int param_2, void* param_3) { - i_stage->setCamera((stage_camera_class*)param_1 + 4); +static int dStage_RoomCameraInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) { + i_stage->setCamera((stage_camera_class*)((char*)i_data + 4)); return 1; } /* 8002533C-80025370 01FC7C 0034+00 2/0 0/0 0/0 .text dStage_arrowInit__FP11dStage_dt_cPviPv */ -static int dStage_arrowInit(dStage_dt_c* i_stage, void* param_1, int param_2, void* param_3) { - i_stage->setArrow((stage_arrow_class*)param_1 + 4); +static int dStage_arrowInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) { + i_stage->setArrow((stage_arrow_class*)((char*)i_data + 4)); return 1; } @@ -2119,89 +2127,68 @@ static int dStage_arrowInit(dStage_dt_c* i_stage, void* param_1, int param_2, vo #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dStage_roomDt_c::getMapInfo2(int param_0) const { +asm stage_map_info_class* dStage_roomDt_c::getMapInfo2(int param_0) const { nofralloc #include "asm/d/d_stage/getMapInfo2__15dStage_roomDt_cCFi.s" } #pragma pop /* 800253FC-80025404 01FD3C 0008+00 1/0 0/0 0/0 .text getMapInfoBase__15dStage_roomDt_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm stage_map_info_dummy_class* dStage_roomDt_c::getMapInfoBase() const { - nofralloc -#include "asm/d/d_stage/getMapInfoBase__15dStage_roomDt_cCFv.s" +stage_map_info_dummy_class* dStage_roomDt_c::getMapInfoBase() const { + return mMapInfoBase; } -#pragma pop /* 80025404-80025490 01FD44 008C+00 1/0 0/0 0/0 .text getMapInfo2__16dStage_stageDt_cCFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dStage_stageDt_c::getMapInfo2(int param_0) const { +asm stage_map_info_class* dStage_stageDt_c::getMapInfo2(int param_0) const { nofralloc #include "asm/d/d_stage/getMapInfo2__16dStage_stageDt_cCFi.s" } #pragma pop /* 80025490-80025498 01FDD0 0008+00 1/0 0/0 0/0 .text getMapInfoBase__16dStage_stageDt_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm stage_map_info_dummy_class* dStage_stageDt_c::getMapInfoBase() const { - nofralloc -#include "asm/d/d_stage/getMapInfoBase__16dStage_stageDt_cCFv.s" +stage_map_info_dummy_class* dStage_stageDt_c::getMapInfoBase() const { + return mMapInfoBase; } -#pragma pop /* 80025498-800254CC 01FDD8 0034+00 1/0 0/0 0/0 .text dStage_paletteInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_paletteInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_paletteInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_paletteInfoInit(dStage_dt_c* stageDt, void* i_data, int param_2, void* param_3) { + dStage_nodeHeader* pal_info = (dStage_nodeHeader*)(i_data); + stageDt->setPaletteInfo((stage_palette_info_class*)pal_info->m_offset); + return 1; } -#pragma pop /* 800254CC-80025500 01FE0C 0034+00 1/0 0/0 0/1 .text dStage_pselectInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_pselectInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_pselectInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_pselectInfoInit(dStage_dt_c* stageDt, void* i_data, int param_2, void* param_3) { + dStage_nodeHeader* psel_info = (dStage_nodeHeader*)(i_data); + stageDt->setPselectInfo((stage_pselect_info_class*)psel_info->m_offset); + return 1; } -#pragma pop /* 80025500-80025534 01FE40 0034+00 1/0 0/0 0/1 .text dStage_envrInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_envrInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_envrInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_envrInfoInit(dStage_dt_c* stageDt, void* i_data, int param_2, void* param_3) { + dStage_nodeHeader* envr_info = (dStage_nodeHeader*)(i_data); + stageDt->setEnvrInfo((stage_envr_info_class*)envr_info->m_offset); + return 1; } -#pragma pop /* 80025534-8002556C 01FE74 0038+00 1/0 0/0 0/2 .text dStage_filiInfo2Init__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_filiInfo2Init(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_filiInfo2Init__FP11dStage_dt_cPviPv.s" +static int dStage_filiInfo2Init(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + if (entryNum == 0) { + return 1; + } + + dStage_nodeHeader* fili_info = (dStage_nodeHeader*)(i_data); + dStage_roomControl_c::setFileList2(stageDt->getRoomNo(), + (dStage_FileList2_dt_c*)fili_info->m_offset); + return 1; } -#pragma pop /* 8002556C-8002558C 01FEAC 0020+00 1/0 0/0 0/0 .text * dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv */ @@ -2216,181 +2203,265 @@ static asm int dStage_fieldMapFiliInfo2Init(dStage_dt_c* param_0, void* param_1, #pragma pop /* 8002558C-800255E0 01FECC 0054+00 2/0 0/0 0/0 .text dStage_filiInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_filiInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_filiInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_filiInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + if (entryNum == 0) { + stageDt->setFileListInfo(NULL); + } else { + dStage_nodeHeader* fili_info = (dStage_nodeHeader*)(i_data); + stageDt->setFileListInfo((dStage_FileList_dt_c*)fili_info->m_offset); + } + + return 1; } -#pragma pop /* 800255E0-80025614 01FF20 0034+00 2/0 0/0 0/0 .text dStage_vrboxInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_vrboxInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_vrboxInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_vrboxInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + dStage_nodeHeader* vrbox_info = (dStage_nodeHeader*)(i_data); + stageDt->setVrboxInfo((stage_vrbox_info_class*)vrbox_info->m_offset); + return 1; } -#pragma pop /* 80025614-80025648 01FF54 0034+00 1/0 0/0 0/0 .text * dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_vrboxcolInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_vrboxcolInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, + void* param_3) { + dStage_nodeHeader* vrcol_info = (dStage_nodeHeader*)(i_data); + stageDt->setVrboxcolInfo((stage_vrboxcol_info_class*)vrcol_info->m_offset); + return 1; } -#pragma pop /* 80025648-800256AC 01FF88 0064+00 2/0 0/0 0/0 .text dStage_plightInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_plightInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_plightInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_plightInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + dStage_nodeHeader* plight_info = (dStage_nodeHeader*)(i_data); + stageDt->setPlightInfo((stage_plight_info_class*)plight_info->m_offset); + stageDt->setPlightNumInfo(entryNum); + return 1; } -#pragma pop /* 800256AC-80025738 01FFEC 008C+00 1/0 0/0 0/0 .text dStage_lgtvInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_lgtvInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_lgtvInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_lgtvInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setLightVecInfoNum(entryNum); + + if (entryNum == 0) { + stageDt->setLightVecInfo(NULL); + } else { + dStage_nodeHeader* lgtv_info = (dStage_nodeHeader*)(i_data); + stageDt->setLightVecInfo((stage_pure_lightvec_info_class*)lgtv_info->m_offset); + } + + return 1; } -#pragma pop /* 80025738-80025744 020078 000C+00 0/0 1/1 0/0 .text * dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi */ +#ifdef NONMATCHING +u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer) { + return p_info[layer].mParticleNo; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* param_0, int param_1) { +asm u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer) { nofralloc #include "asm/d/d_stage/dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi.s" } #pragma pop - -/* ############################################################################################## */ -/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378B33 = "Xtg_00"; -#pragma pop +#endif /* 80025744-8002582C 020084 00E8+00 1/0 0/0 0/0 .text dStage_stagInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_stagInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, +static int dStage_stagInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_stagInfoInit__FP11dStage_dt_cPviPv.s" + dStage_nodeHeader* stag_info = (dStage_nodeHeader*)(i_data); + stageDt->setStagInfo((stage_stag_info_class*)stag_info->m_offset); + + if (!dStage_isBossStage(stageDt)) { + dComIfG_deleteStageRes("Xtg_00"); + dComIfGp_resetOldMulti(); + } + + int stageNo = dStage_stagInfo_GetSaveTbl(stageDt->getStagInfo()); + dComIfGs_getSave(stageNo); + g_save_bit_HIO.init(); + dComIfGs_initDan(stageNo); + dStage_KeepDoorInfoInit(stageDt); + return 1; } -#pragma pop /* 8002582C-80025838 02016C 000C+00 1/0 0/0 0/0 .text resetOldMulti__16dStage_stageDt_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::resetOldMulti() { - nofralloc -#include "asm/d/d_stage/resetOldMulti__16dStage_stageDt_cFv.s" +void dStage_stageDt_c::resetOldMulti() { + mOldMulti = NULL; } -#pragma pop /* 80025838-8002586C 020178 0034+00 2/0 0/0 0/0 .text dStage_sclsInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_sclsInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_sclsInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_sclsInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setSclsInfo((stage_scls_info_dummy_class*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 8002586C-80025958 0201AC 00EC+00 1/0 0/0 0/0 .text * dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_actorCommonLayerInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv.s" +static int dStage_actorCommonLayerInit(dStage_dt_c* stageDt, void* i_data, int entryNum, + void* param_3) { + stage_actor_class* actor = (stage_actor_class*)((int*)i_data + 1); + stage_actor_data_class* actor_data = actor->mEntries; + + for (int i = 0; i < actor->mEntryNum; i++) { + if (!dComIfGs_isActor(actor_data->mEnemyNo, stageDt->getRoomNo())) { + if (!daSus_c::check(stageDt->getRoomNo(), actor_data->mSpawnPos)) { + fopAcM_prm_class* appen = fopAcM_CreateAppend(); + + if (appen != NULL) { + appen->mParameter = actor_data->mParameter; + appen->mPos = actor_data->mSpawnPos; + appen->mAngle = actor_data->mAngle; + appen->mEnemyNo = actor_data->mEnemyNo; + appen->mRoomNo = stageDt->getRoomNo(); + dStage_actorCreate(actor_data, appen); + } + } + } + actor_data++; + } + + return 1; } -#pragma pop /* 80025958-80025A38 020298 00E0+00 1/0 0/0 0/0 .text * dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_tgscCommonLayerInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv.s" +static int dStage_tgscCommonLayerInit(dStage_dt_c* stageDt, void* i_data, int entryNum, + void* param_3) { + stage_tgsc_class* actor = (stage_tgsc_class*)((int*)i_data + 1); + stage_tgsc_data_class* actor_data = actor->mData; + + for (int i = 0; i < actor->mEntryNum; i++) { + if (!daSus_c::check(stageDt->getRoomNo(), actor_data->mSpawnPos)) { + fopAcM_prm_class* appen = fopAcM_CreateAppend(); + + if (appen != NULL) { + appen->mParameter = actor_data->mParameter; + appen->mPos = actor_data->mSpawnPos; + appen->mAngle = actor_data->mAngle; + appen->mEnemyNo = actor_data->mEnemyNo; + appen->mRoomNo = stageDt->getRoomNo(); + appen->mScale[0] = actor_data->field_0x20; + appen->mScale[1] = actor_data->field_0x21; + appen->mScale[2] = actor_data->field_0x22; + dStage_actorCreate(actor_data, appen); + } + } + actor_data++; + } + + return 1; } -#pragma pop /* 80025A38-80025B24 020378 00EC+00 3/2 0/0 0/0 .text dStage_actorInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_actorInit(dStage_dt_c* param_0, void* param_1, int param_2, void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_actorInit__FP11dStage_dt_cPviPv.s" +static int dStage_actorInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stage_actor_class* actor = (stage_actor_class*)((int*)i_data + 1); + stage_actor_data_class* actor_data = actor->mEntries; + + for (int i = 0; i < actor->mEntryNum; i++) { + if (!dComIfGs_isActor(actor_data->mEnemyNo, stageDt->getRoomNo())) { + if (!daSus_c::check(stageDt->getRoomNo(), actor_data->mSpawnPos)) { + fopAcM_prm_class* appen = fopAcM_CreateAppend(); + + if (appen != NULL) { + appen->mParameter = actor_data->mParameter; + appen->mPos = actor_data->mSpawnPos; + appen->mAngle = actor_data->mAngle; + appen->mEnemyNo = actor_data->mEnemyNo; + appen->mRoomNo = stageDt->getRoomNo(); + dStage_actorCreate(actor_data, appen); + } + } + } + actor_data++; + } + + return 1; } -#pragma pop /* 80025B24-80025BFC 020464 00D8+00 1/0 0/0 0/0 .text * dStage_actorInit_always__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_actorInit_always(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_actorInit_always__FP11dStage_dt_cPviPv.s" +static int dStage_actorInit_always(dStage_dt_c* stageDt, void* i_data, int entryNum, + void* param_3) { + stage_actor_class* actor = (stage_actor_class*)((int*)i_data + 1); + stage_actor_data_class* actor_data = actor->mEntries; + + for (int i = 0; i < actor->mEntryNum; i++) { + if (!dComIfGs_isActor(actor_data->mEnemyNo, stageDt->getRoomNo())) { + fopAcM_prm_class* appen = fopAcM_CreateAppend(); + + if (appen != NULL) { + appen->mParameter = actor_data->mParameter; + appen->mPos = actor_data->mSpawnPos; + appen->mAngle = actor_data->mAngle; + appen->mEnemyNo = actor_data->mEnemyNo; + appen->mRoomNo = stageDt->getRoomNo(); + dStage_actorCreate(actor_data, appen); + } + } + actor_data++; + } + + return 1; } -#pragma pop /* 80025BFC-80025CDC 02053C 00E0+00 4/1 0/0 0/0 .text dStage_tgscInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_tgscInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_tgscInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_tgscInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stage_tgsc_class* actor = (stage_tgsc_class*)((int*)i_data + 1); + stage_tgsc_data_class* actor_data = actor->mData; + + for (int i = 0; i < actor->mEntryNum; i++) { + if (!daSus_c::check(stageDt->getRoomNo(), actor_data->mSpawnPos)) { + fopAcM_prm_class* appen = fopAcM_CreateAppend(); + + if (appen != NULL) { + appen->mParameter = actor_data->mParameter; + appen->mPos = actor_data->mSpawnPos; + appen->mAngle = actor_data->mAngle; + appen->mEnemyNo = actor_data->mEnemyNo; + appen->mRoomNo = stageDt->getRoomNo(); + appen->mScale[0] = actor_data->field_0x20; + appen->mScale[1] = actor_data->field_0x21; + appen->mScale[2] = actor_data->field_0x22; + dStage_actorCreate(actor_data, appen); + } + } + actor_data++; + } + + return 1; } -#pragma pop /* 80025CDC-80025DA8 02061C 00CC+00 1/1 0/0 0/0 .text dStage_doorInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_doorInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_doorInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_doorInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stage_tgsc_class* actor = (stage_tgsc_class*)((int*)i_data + 1); + stage_tgsc_data_class* actor_data = actor->mData; + + for (int i = 0; i < actor->mEntryNum; i++) { + fopAcM_prm_class* appen = fopAcM_CreateAppend(); + + if (appen != NULL) { + appen->mParameter = actor_data->mParameter; + appen->mPos = actor_data->mSpawnPos; + appen->mAngle = actor_data->mAngle; + appen->mEnemyNo = actor_data->mEnemyNo; + appen->mRoomNo = stageDt->getRoomNo(); + appen->mScale[0] = actor_data->field_0x20; + appen->mScale[1] = actor_data->field_0x21; + appen->mScale[2] = actor_data->field_0x22; + dStage_actorCreate(actor_data, appen); + } + actor_data++; + } + + return 1; } -#pragma pop /* 80025DA8-80025E40 0206E8 0098+00 2/0 0/0 0/0 .text dStage_roomReadInit__FP11dStage_dt_cPviPv */ #pragma push @@ -2405,25 +2476,19 @@ static asm int dStage_roomReadInit(dStage_dt_c* param_0, void* param_1, int para /* 80025E40-80025E70 020780 0030+00 0/0 1/1 0/0 .text * dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class& param_0, int param_1) { - nofralloc -#include "asm/d/d_stage/dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi.s" +u8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class& room, int index) { + if (index < 0 || index >= room.field_0x0) { + index = 0; + } + + return dStage_roomRead_dt_c_GetReverb(*room.field_0x4[index]); } -#pragma pop /* 80025E70-80025EA4 0207B0 0034+00 1/0 0/0 0/0 .text dStage_ppntInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_ppntInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_ppntInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_ppntInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setPntInfo((dStage_dPnt_c*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 80025EA4-80025F44 0207E4 00A0+00 1/0 0/0 0/0 .text dStage_pathInfoInit__FP11dStage_dt_cPviPv */ #pragma push @@ -2437,15 +2502,10 @@ static asm int dStage_pathInfoInit(dStage_dt_c* param_0, void* param_1, int para #pragma pop /* 80025F44-80025F78 020884 0034+00 2/0 0/0 0/0 .text dStage_rppnInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_rppnInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_rppnInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_rppnInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setPnt2Info((dStage_dPnt_c*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 80025F78-80026018 0208B8 00A0+00 2/0 0/0 0/0 .text dStage_rpatInfoInit__FP11dStage_dt_cPviPv */ #pragma push @@ -2460,115 +2520,81 @@ static asm int dStage_rpatInfoInit(dStage_dt_c* param_0, void* param_1, int para /* 80026018-8002604C 020958 0034+00 1/0 0/0 0/0 .text dStage_soundInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_soundInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_soundInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_soundInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setSoundInf((dStage_SoundInfo_c*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 8002604C-80026080 02098C 0034+00 2/0 0/0 0/0 .text dStage_soundInfoInitCL__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_soundInfoInitCL(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_soundInfoInitCL__FP11dStage_dt_cPviPv.s" +static int dStage_soundInfoInitCL(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setSoundInfCL((dStage_SoundInfo_c*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 80026080-800260B4 0209C0 0034+00 3/3 0/0 0/0 .text dStage_setLayerTagName__FP9FuncTableii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dStage_setLayerTagName(FuncTable* param_0, int param_1, int param_2) { - nofralloc -#include "asm/d/d_stage/dStage_setLayerTagName__FP9FuncTableii.s" -} -#pragma pop +static void dStage_setLayerTagName(FuncTable* funcTbl, int tblSize, int i_layerNo) { + char layerTag; + if (i_layerNo < 10) { + layerTag = '0'; + } else { + layerTag = 'W'; + } + layerTag = i_layerNo + layerTag; -/* ############################################################################################## */ -/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378B3A = "dStage_dt_c_decode: i_data is NULL\n"; -#pragma pop + for (int i = 0; i < tblSize; i++) { + funcTbl->identifier[3] = layerTag; + funcTbl++; + } +} /* 800260B4-8002617C 0209F4 00C8+00 9/9 0/0 0/0 .text * dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei */ -// no idea -#ifdef NONMATCHING -static void dStage_dt_c_decode(void* i_data, dStage_dt_c* i_stage, FuncTable* param_2, - int param_3) { - int* ptr; - +static void dStage_dt_c_decode(void* i_data, dStage_dt_c* i_stage, FuncTable* funcTbl, + int tblSize) { if (i_data != NULL) { - int ivar4 = 0; - ptr = (int*)i_data + 1; - for (int i = 0; i < param_3; i += 12) { - for (int j = 0; j < (int)ptr; j += 12) { - if ((int)ptr == ivar4) { - param_2->function(i_stage, (void*)ptr, param_3, i_data); - } - } - ivar4++; - } - } + for (int i = 0; i < tblSize; i++) { + dStage_fileHeader* file = ((dStage_fileHeader*)i_data); + dStage_nodeHeader* node = ((dStage_nodeHeader*)(file + 1)); - OSReport_Error("dStage_dt_c_decode: i_data is NULL\n"); + FuncTable* nodeFunc = funcTbl + i; + + for (int j = 0; j < file->chunkCount; j++) { + if ((int)node->m_tag == *(int*)nodeFunc->identifier) { + if (nodeFunc->function != NULL) { + nodeFunc->function(i_stage, node, node->m_entryNum, i_data); + } + break; + } + node++; + } + } + } else { + OSReport_Error("dStage_dt_c_decode: i_data is NULL\n"); + } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dStage_dt_c_decode(void* param_0, dStage_dt_c* param_1, FuncTable* param_2, - int param_3) { - nofralloc -#include "asm/d/d_stage/dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei.s" -} -#pragma pop -#endif /* 8002617C-800261B0 020ABC 0034+00 1/0 0/0 0/0 .text dStage_stEventInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_stEventInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_stEventInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_stEventInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setMapEventInfo((dStage_MapEventInfo_c*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 800261B0-800261E4 020AF0 0034+00 1/0 0/0 0/0 .text * dStage_mapEventInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_mapEventInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_mapEventInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_mapEventInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, + void* param_3) { + stageDt->setMapEventInfo((dStage_MapEventInfo_c*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 800261E4-80026218 020B24 0034+00 2/0 0/0 0/0 .text dStage_floorInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_floorInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_floorInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_floorInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setFloorInfo((dStage_FloorInfo_c*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 80026218-80026298 020B58 0080+00 1/0 0/0 0/9 .text dStage_memaInfoInit__FP11dStage_dt_cPviPv */ #pragma push @@ -2594,15 +2620,11 @@ static asm int dStage_mecoInfoInit(dStage_dt_c* param_0, void* param_1, int para /* 8002631C-8002634C 020C5C 0030+00 2/0 0/0 0/0 .text * dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_stageKeepTresureInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv.s" +static int dStage_stageKeepTresureInit(dStage_dt_c* stageDt, void* i_data, int entryNum, + void* param_3) { + dTres_c::addData((dTres_c::list_class*)((char*)i_data + 4), stageDt->getRoomNo()); + return 1; } -#pragma pop /* 8002634C-8002635C 020C8C 0010+00 1/0 0/0 0/0 .text * dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv */ @@ -2617,14 +2639,16 @@ static asm int dStage_fieldMapTresureInit(dStage_dt_c* param_0, void* param_1, i #pragma pop /* 8002635C-800263A0 020C9C 0044+00 4/4 0/0 0/0 .text dStage_dt_c_offsetToPtr__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dStage_dt_c_offsetToPtr(void* param_0) { - nofralloc -#include "asm/d/d_stage/dStage_dt_c_offsetToPtr__FPv.s" +static void dStage_dt_c_offsetToPtr(void* i_data) { + dStage_nodeHeader* p_node = (dStage_nodeHeader*)((int*)i_data + 1); + + for (int i = 0; i < ((dStage_fileHeader*)i_data)->chunkCount; i++) { + if (p_node->m_offset != 0 && p_node->m_offset < 0x80000000) { + p_node->m_offset += (u32)i_data; + } + p_node++; + } } -#pragma pop /* 800263A0-800263D0 020CE0 0030+00 1/0 0/0 0/0 .text dStage_mapPathInit__FP11dStage_dt_cPviPv */ #pragma push @@ -2660,133 +2684,131 @@ static asm int dStage_fieldMapMapPathInit(dStage_dt_c* param_0, void* param_1, i } #pragma pop -/* ############################################################################################## */ -/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378B5E = "room%d.dzs"; -#pragma pop - /* 80450D74-80450D7C 000274 0008+00 3/3 0/0 0/0 .sbss m_roomDzs__20dStage_roomControl_c */ dStage_roomControl_c::roomDzs_c dStage_roomControl_c::m_roomDzs; /* 8002645C-800265DC 020D9C 0180+00 1/1 0/0 0/0 .text readMult__FP11dStage_dt_cP14dStage_Multi_cb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void readMult(dStage_dt_c* param_0, dStage_Multi_c* param_1, bool param_2) { - nofralloc -#include "asm/d/d_stage/readMult__FP11dStage_dt_cP14dStage_Multi_cb.s" +static void readMult(dStage_dt_c* stageDt, dStage_Multi_c* multi, bool useOldRes) { + if (multi != NULL) { + dStage_Mult_info* info = multi->mInfo; + + if (dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 0 || + dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 6) { + dStage_roomControl_c::m_roomDzs.create(multi->field_0x0); + } + + for (s8 i = 0; i < multi->field_0x0; i++) { + void* dzs = dStage_roomControl_c::addRoomDzs(i, info->mRoomNo); + + if (dzs == NULL) { + char dzsName[11]; + sprintf(dzsName, "room%d.dzs", info->mRoomNo); + + if (useOldRes) { + dzs = dComIfG_getOldStageRes(dzsName); + } else { + dzs = dComIfG_getStageRes(dzsName); + } + } + + if (dzs != NULL) { + dStage_dt_c_offsetToPtr(dzs); + stageDt->setRoomNo(info->mRoomNo); + dStage_dt_c_decode(dzs, stageDt, l_roomFuncTable, 4); + dStage_setLayerTagName(l_layerFuncTable_5053, 3, dComIfG_play_c::getLayerNo(0)); + dStage_dt_c_decode(dzs, stageDt, l_layerFuncTable_5053, 3); + } + + info++; + } + } } -#pragma pop /* 800265DC-80026670 020F1C 0094+00 1/0 0/0 0/0 .text dStage_multInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_multInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_multInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_multInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setMulti((dStage_Multi_c*)((char*)i_data + 4)); + dStage_initRoomKeepDoorInfo(); + + readMult(stageDt, stageDt->getMulti(), false); + readMult(stageDt, stageDt->getOldMulti(), true); + stageDt->setRoomNo(-1); + + return 1; } -#pragma pop /* 80026670-800266A4 020FB0 0034+00 1/0 0/0 0/0 .text dStage_lbnkInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_lbnkInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_lbnkInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_lbnkInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setLbnk((dStage_Lbnk_c*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 800266A4-8002670C 020FE4 0068+00 1/0 0/0 0/0 .text dStage_roomTresureInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_roomTresureInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_roomTresureInit__FP11dStage_dt_cPviPv.s" +static int dStage_roomTresureInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setTresure((stage_tresure_class*)((char*)i_data + 4)); + dStage_actorInit(stageDt, i_data, entryNum, param_3); + return 1; } -#pragma pop /* 8002670C-80026730 02104C 0024+00 1/0 0/0 0/0 .text * dStage_layerTresureInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_layerTresureInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_layerTresureInit__FP11dStage_dt_cPviPv.s" +static int dStage_layerTresureInit(dStage_dt_c* stageDt, void* i_data, int entryNum, + void* param_3) { + dStage_actorInit(stageDt, i_data, entryNum, param_3); + return 1; } -#pragma pop /* 80026730-80026764 021070 0034+00 1/0 0/0 0/0 .text dStage_dmapInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_dmapInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_dmapInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_dmapInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { + stageDt->setDMap((dStage_DMap_c*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 80026764-800267DC 0210A4 0078+00 1/0 0/0 0/0 .text * dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_stageDrtgInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_stageDrtgInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, + void* param_3) { + stageDt->setDrTg((stage_tgsc_class*)((char*)i_data + 4)); + dStage_tgscInfoInit(stageDt, i_data, entryNum, param_3); + dStage_KeepDoorInfoProc(stageDt, (stage_tgsc_class*)((char*)i_data + 4)); + return 1; } -#pragma pop /* 800267DC-80026844 02111C 0068+00 2/0 0/0 0/0 .text * dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_roomDrtgInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_roomDrtgInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, + void* param_3) { + stageDt->setDrTg((stage_tgsc_class*)((char*)i_data + 4)); + dStage_doorInfoInit(stageDt, i_data, entryNum, param_3); + return 1; } -#pragma pop /* 80026844-80026898 021184 0054+00 1/0 0/0 0/0 .text dStage_elstInfoInit__FP11dStage_dt_cPviPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dStage_elstInfoInit(dStage_dt_c* param_0, void* param_1, int param_2, - void* param_3) { - nofralloc -#include "asm/d/d_stage/dStage_elstInfoInit__FP11dStage_dt_cPviPv.s" +static int dStage_elstInfoInit(dStage_dt_c* stageDt, void* i_data, int param_2, void* param_3) { + dStage_Elst_c* elst = (dStage_Elst_c*)((char*)i_data + 4); + + if (param_2 == 0) { + stageDt->setElst(NULL); + } else { + stageDt->setElst(elst); + } + + return 1; } -#pragma pop /* 80026898-80026914 0211D8 007C+00 1/1 0/0 0/0 .text dKankyo_create__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dKankyo_create() { - nofralloc -#include "asm/d/d_stage/dKankyo_create__Fv.s" +static void dKankyo_create() { + fopKyM_fastCreate(PROC_KANKYO, NULL, NULL, NULL, NULL); + fopKyM_fastCreate(PROC_KYEFF, NULL, NULL, NULL, NULL); + fopKyM_fastCreate(PROC_KYEFF2, NULL, NULL, NULL, NULL); + fopKyM_fastCreate(PROC_ENVSE, NULL, NULL, NULL, NULL); } -#pragma pop /* 80026914-80026940 021254 002C+00 1/1 0/0 0/0 .text layerMemoryInfoLoader__FPvP11dStage_dt_ci */ static void layerMemoryInfoLoader(void* i_data, dStage_dt_c* i_stage, int param_2) { - dStage_dt_c_decode(i_data, i_stage, &l_layerFuncTable_5131[0], 2); + dStage_dt_c_decode(i_data, i_stage, l_layerFuncTable_5131, 2); } /* 80026940-800269B4 021280 0074+00 1/1 0/0 0/0 .text @@ -2794,83 +2816,77 @@ static void layerMemoryInfoLoader(void* i_data, dStage_dt_c* i_stage, int param_ static void dStage_dt_c_stageInitLoader(void* i_data, dStage_dt_c* i_stage) { dStage_dt_c_offsetToPtr(i_data); i_stage->init(); - dStage_dt_c_decode(i_data, i_stage, &l_funcTable_5136, 1); + dStage_dt_c_decode(i_data, i_stage, l_funcTable_5136, 1); layerMemoryInfoLoader(i_data, i_stage, -1); } /* 800269B4-80026AE8 0212F4 0134+00 2/2 0/0 0/0 .text layerTableLoader__FPvP11dStage_dt_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void layerTableLoader(void* param_0, dStage_dt_c* param_1, int param_2) { - nofralloc -#include "asm/d/d_stage/layerTableLoader__FPvP11dStage_dt_ci.s" +static void layerTableLoader(void* i_data, dStage_dt_c* stageDt, int roomNo) { + int newRoomNo; + if (roomNo != -1) { + newRoomNo = roomNo; + } else { + newRoomNo = dComIfGp_getStartStageRoomNo(); + } + + dStage_setLayerTagName(l_layerFuncTableA, ARRAY_SIZE(l_layerFuncTableA), + dComIfG_play_c::getLayerNo(0)); + dStage_dt_c_decode(i_data, stageDt, l_layerFuncTableA, ARRAY_SIZE(l_layerFuncTableA)); + + dStage_Elst_c* elst = dComIfGp_getStage()->getElst(); + if (elst != NULL && newRoomNo >= 0 && elst->field_0x0 > newRoomNo) { + dStage_Elst_c::unkData* d = elst->field_0x4; + int layer = dComIfG_play_c::getLayerNo(0); + dStage_setLayerTagName(l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable), + d[newRoomNo].field_0x0[layer]); + dStage_dt_c_decode(i_data, stageDt, l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable)); + } else { + dStage_setLayerTagName(l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable), 0); + dStage_dt_c_decode(i_data, stageDt, l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable)); + } } -#pragma pop /* 80026AE8-80026AF0 021428 0008+00 1/0 0/0 0/0 .text getElst__16dStage_stageDt_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dStage_Elst_c* dStage_stageDt_c::getElst() { - nofralloc -#include "asm/d/d_stage/getElst__16dStage_stageDt_cFv.s" +dStage_Elst_c* dStage_stageDt_c::getElst() { + return mElst; } -#pragma pop /* 80026AF0-80026B58 021430 0068+00 2/2 0/0 0/0 .text layerActorLoader__FPvP11dStage_dt_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void layerActorLoader(void* param_0, dStage_dt_c* param_1, int param_2) { - nofralloc -#include "asm/d/d_stage/layerActorLoader__FPvP11dStage_dt_ci.s" +static void layerActorLoader(void* i_data, dStage_dt_c* stageDt, int param_2) { + dStage_setLayerTagName(l_layerFuncTable_5158, 4, dComIfG_play_c::getLayerNo(0)); + dStage_dt_c_decode(i_data, stageDt, l_layerFuncTable_5158, 4); } -#pragma pop /* 80026B58-80026BBC 021498 0064+00 1/1 0/0 0/0 .text dStage_dt_c_stageLoader__FPvP11dStage_dt_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dStage_dt_c_stageLoader(void* param_0, dStage_dt_c* param_1) { - nofralloc -#include "asm/d/d_stage/dStage_dt_c_stageLoader__FPvP11dStage_dt_c.s" +static void dStage_dt_c_stageLoader(void* i_data, dStage_dt_c* stageDt) { + dStage_dt_c_decode(i_data, stageDt, l_funcTable_5163, 26); + layerTableLoader(i_data, stageDt, -1); + layerActorLoader(i_data, stageDt, -1); } -#pragma pop /* 80026BBC-80026C34 0214FC 0078+00 0/0 1/1 0/0 .text dStage_dt_c_roomLoader__FPvP11dStage_dt_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_dt_c_roomLoader(void* param_0, dStage_dt_c* param_1, int param_2) { - nofralloc -#include "asm/d/d_stage/dStage_dt_c_roomLoader__FPvP11dStage_dt_ci.s" +void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* stageDt, int param_2) { + dStage_dt_c_offsetToPtr(i_data); + stageDt->init(); + dStage_dt_c_decode(i_data, stageDt, l_funcTable_5168, 14); + layerTableLoader(i_data, stageDt, param_2); } -#pragma pop /* 80026C34-80026C8C 021574 0058+00 0/0 1/1 0/0 .text dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_dt_c_roomReLoader(void* param_0, dStage_dt_c* param_1, int param_2) { - nofralloc -#include "asm/d/d_stage/dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci.s" +void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* stageDt, int param_2) { + dStage_dt_c_decode(i_data, stageDt, l_funcTable_5173, 8); + layerActorLoader(i_data, stageDt, param_2); } -#pragma pop /* 80026C8C-80026CDC 0215CC 0050+00 0/0 1/1 0/0 .text * dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_dt_c_fieldMapLoader(void* param_0, dStage_dt_c* param_1) { - nofralloc -#include "asm/d/d_stage/dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c.s" +void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage) { + dStage_dt_c_offsetToPtr(i_data); + dStage_dt_c_decode(i_data, i_stage, l_funcTable_5178, 3); } -#pragma pop /* 80026CDC-80026D38 02161C 005C+00 0/0 1/1 0/0 .text dStage_infoCreate__Fv */ void dStage_infoCreate() { @@ -2880,77 +2896,109 @@ void dStage_infoCreate() { dStage_dt_c_stageInitLoader(stageRsrc, dComIfGp_getStage()); } -/* ############################################################################################## */ -/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378B73 = "vrbox_sora.bmd"; -#pragma pop - /* 80406194-804061A0 032EB4 000A+02 2/2 14/14 7/7 .bss mDemoArcName__20dStage_roomControl_c */ char dStage_roomControl_c::mDemoArcName[10]; /* 80026D38-80026DF8 021678 00C0+00 0/0 1/1 0/0 .text dStage_Create__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_Create() { - nofralloc -#include "asm/d/d_stage/dStage_Create__Fv.s" -} -#pragma pop +void dStage_Create() { + void* stageRsrc = dComIfG_getStageRes("stage.dzs"); + dStage_dt_c_stageLoader(stageRsrc, dComIfGp_getStage()); + daSus_c::execute(); -/* ############################################################################################## */ -/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378B82 = "Stg_00"; -SECTION_DEAD static char const* const stringBase_80378B89 = "Event"; -#pragma pop + if (dComIfGp_getStartStageRoomNo() >= 0) { + dStage_roomInit(dComIfGp_getStartStageRoomNo()); + } + + *dStage_roomControl_c::getDemoArcName() = NULL; + dKankyo_create(); + + if (dComIfG_getStageRes("vrbox_sora.bmd")) { + fpcSCtRq_Request(fpcLy_CurrentLayer(), PROC_VRBOX, NULL, NULL, NULL); + fpcSCtRq_Request(fpcLy_CurrentLayer(), PROC_VRBOX2, NULL, NULL, NULL); + } + + dComIfGp_evmng_create(); +} /* 80026DF8-80026FDC 021738 01E4+00 0/0 1/1 0/7 .text dStage_Delete__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_Delete() { - nofralloc -#include "asm/d/d_stage/dStage_Delete__Fv.s" +void dStage_Delete() { + if (*dStage_roomControl_c::getDemoArcName() != NULL) { + dComIfG_deleteObjectResMain(dStage_roomControl_c::getDemoArcName()); + } + + int stageNo = dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()); + dComIfGs_putSave(stageNo); + dStage_roomControl_c::removeRoomDzs(); + + if (mDoRst::isReset() || !dComIfGp_isEnableNextStage() || + strcmp(dComIfGp_getNextStageName(), dComIfGp_getStartStageName())) { + dStage_roomControl_c::destroyMemoryBlock(); + + if (dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == 1) { + dRes_info_c* info = dComIfG_getStageResInfo("Stg_00"); + *info->getArchiveName() = 'X'; + dComIfGp_setOldMulti(); + } else { + dComIfG_deleteStageRes("Stg_00"); + dComIfG_deleteStageRes("Xtg_00"); + dComIfGp_resetOldMulti(); + } + } + + dComIfG_deleteObjectResMain("Event"); + dComIfG_deleteObjectResMain(dComIfGp_getCameraParamFileName(0)); + dComIfGp_evmng_remove(); + dComIfGp_getStage()->init(); } -#pragma pop /* 80026FDC-80026FE8 02191C 000C+00 1/0 0/0 0/0 .text setOldMulti__16dStage_stageDt_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setOldMulti() { - nofralloc -#include "asm/d/d_stage/setOldMulti__16dStage_stageDt_cFv.s" +void dStage_stageDt_c::setOldMulti() { + mOldMulti = mMulti; } -#pragma pop /* 80026FE8-800270FC 021928 0114+00 0/0 1/1 1/1 .text dStage_RoomCheck__FP11cBgS_GndChk */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_RoomCheck(cBgS_GndChk* param_0) { - nofralloc -#include "asm/d/d_stage/dStage_RoomCheck__FP11cBgS_GndChk.s" +int dStage_RoomCheck(cBgS_GndChk* gndChk) { + int roomReadId = dStage_roomControl_c::getRoomReadId(); + int roomId; + + if (gndChk == NULL) { + roomId = roomReadId; + } else { + roomId = dComIfG_Bgsp().GetRoomId(*gndChk); + } + + if (roomId < 0) { + return 0; + } + + if (roomId != dComIfGp_roomControl_getStayNo()) { + dComIfGp_roomControl_zoneCountCheck(roomId); + } + + if (roomReadId < 0) { + roomReadId = dComIfGp_roomControl_getStayNo(); + } + + roomRead_class* room = dComIfGp_getStageRoom(); + if (room != NULL && room->field_0x0 > roomReadId) { + int timePass = + dStage_roomRead_dt_c_GetTimePass(*room->field_0x4[dComIfGp_roomControl_getStayNo()]); + dComIfGp_roomControl_setTimePass(timePass); + + roomRead_data_class* room_data = room->field_0x4[roomReadId]; + return dComIfGp_roomControl_loadRoom(room_data->field_0x0, room_data->field_0x4, false); + } + + return 1; } -#pragma pop /* 800270FC-80027170 021A3C 0074+00 0/0 1/1 0/0 .text * dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_changeSceneExitId(cBgS_PolyInfo& param_0, f32 param_1, u32 param_2, s8 param_3, - s16 param_4) { - nofralloc -#include "asm/d/d_stage/dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs.s" +void dStage_changeSceneExitId(cBgS_PolyInfo& param_0, f32 speed, u32 mode, s8 roomNo, s16 angle) { + dStage_changeScene(dComIfG_Bgsp().GetExitId(param_0), speed, mode, roomNo, angle, -1); } -#pragma pop /* ############################################################################################## */ /* 80451C94-80451C98 000294 0004+00 2/2 0/0 0/0 .sdata2 @5315 */ @@ -2961,37 +3009,65 @@ SECTION_SDATA2 static f64 lit_5317 = 4503601774854144.0 /* cast s32 to float */; /* 80027170-800272E0 021AB0 0170+00 1/1 10/10 63/63 .text dStage_changeScene__FifUlScsi */ +// scls info types might be wrong or inlines wrong +#ifdef NONMATCHING +int dStage_changeScene(int i_exitId, f32 speed, u32 mode, s8 room_no, s16 angle, int param_5) { + stage_scls_info_dummy_class* scls; + + if (room_no == -1) { + scls = dComIfGp_getStageSclsInfo(); + } else { + scls = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getSclsInfo(); + } + + if (scls == NULL) { + return 0; + } + + stage_scls_info_class* scls_info = &scls->mEntries[i_exitId]; + u8 wipe = dStage_sclsInfo_getWipe(scls_info); + int wipe_time = dStage_sclsInfo_getWipeTime(scls_info); + s8 layer = dStage_sclsInfo_getSceneLayer(scls_info); + int timeH = dStage_sclsInfo_getTimeH(scls_info); + + if (layer >= 15) { + layer = -1; + } + + if (layer == -1 && param_5 != -1) { + layer = param_5; + } + + if (timeH < 31) { + dKy_set_nexttime(15.0f * timeH); + } + + dComIfGp_setNextStage(scls_info->mStage, scls_info->mStart, scls_info->mRoom, layer, speed, + mode, 1, wipe == 15 ? 0 : wipe, angle, 1, wipe_time); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dStage_changeScene(int param_0, f32 param_1, u32 param_2, s8 param_3, s16 param_4, - int param_5) { +asm int dStage_changeScene(int i_exitId, f32 speed, u32 mode, s8 room_no, s16 angle, int param_5) { nofralloc #include "asm/d/d_stage/dStage_changeScene__FifUlScsi.s" } #pragma pop +#endif /* 800272E0-800272E8 021C20 0008+00 1/0 0/0 0/0 .text getSclsInfo__15dStage_roomDt_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm stage_scls_info_dummy_class* dStage_roomDt_c::getSclsInfo() const { - nofralloc -#include "asm/d/d_stage/getSclsInfo__15dStage_roomDt_cCFv.s" +stage_scls_info_dummy_class* dStage_roomDt_c::getSclsInfo() const { + return mSclsInfo; } -#pragma pop /* 800272E8-800272F0 021C28 0008+00 1/0 0/0 0/0 .text getSclsInfo__16dStage_stageDt_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm stage_scls_info_dummy_class* dStage_stageDt_c::getSclsInfo() const { - nofralloc -#include "asm/d/d_stage/getSclsInfo__16dStage_stageDt_cCFv.s" +stage_scls_info_dummy_class* dStage_stageDt_c::getSclsInfo() const { + return mSclsInfo; } -#pragma pop /* ############################################################################################## */ /* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -3013,14 +3089,11 @@ asm void dStage_changeScene4Event(int param_0, s8 param_1, int param_2, bool par #pragma pop /* 800274B0-80027524 021DF0 0074+00 0/0 1/1 0/0 .text dStage_restartRoom__FUlUli */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_restartRoom(u32 param_0, u32 param_1, int param_2) { - nofralloc -#include "asm/d/d_stage/dStage_restartRoom__FUlUli.s" +void dStage_restartRoom(u32 roomParam, u32 mode, int param_2) { + dComIfGp_setNextStage(dComIfGp_getStartStageName(), -1, dComIfGs_getRestartRoomNo(), -1, 0.0f, + mode, 0, 0, 0, param_2, 0); + dComIfGs_setRestartRoomParam(roomParam); } -#pragma pop void dStage_roomDt_c::setCamera(stage_camera_class* i_Camera) { mCamera = i_Camera; diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index e38ccefd7a..66f360b7ab 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -4,6 +4,7 @@ // #include "d/d_timer.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,75 +12,10 @@ // Types: // -struct request_of_phase_process_class {}; - -struct msg_class {}; - -struct cXyz {}; - -struct dTimer_c { - /* 8025CA0C */ void _create(); - /* 8025CF04 */ void _execute(); - /* 8025D33C */ void _draw(); - /* 8025D3BC */ void _delete(); - /* 8025D524 */ void deleteCheck(); - /* 8025D618 */ void start(int, s16); - /* 8025D538 */ void start(int); - /* 8025D7C0 */ void stock_start(s16); - /* 8025D708 */ void stock_start(); - /* 8025D7E8 */ void stop(u8); - /* 8025D86C */ void restart(u8); - /* 8025D920 */ void end(int); - /* 8025D9E0 */ void deleteRequest(); - /* 8025D9F0 */ void getTimeMs(); - /* 8025DA54 */ void getLimitTimeMs(); - /* 8025DA9C */ void getRestTimeMs(); - /* 8025DB10 */ void isStart(); - /* 802613DC */ void createGetIn(cXyz); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C1E4 */ void getResInfo(char const*, dRes_info_c*, int); -}; - struct dMsgObject_c { /* 8023822C */ void getStatus(); }; -struct JMSMesgEntry_c {}; - -struct dMeter2Info_c { - /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); -}; - -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 dLib_time_c { - /* 80032804 */ void getTime(); -}; - -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - -struct J2DPane { - /* 802F7AFC */ void getParentPane(); - /* 802F7FCC */ void animationTransform(); -}; - -struct JKRArchive {}; - struct dDlst_TimerScrnDraw_c { /* 8025DB38 */ dDlst_TimerScrnDraw_c(); /* 8025DBE0 */ void setHIO(); @@ -109,18 +45,6 @@ struct dDlst_TimerScrnDraw_c { /* 80261394 */ ~dDlst_TimerScrnDraw_c(); }; -struct dComIfG_play_c { - /* 8002CB9C */ void getTimerNowTimeMs(); - /* 8002CBAC */ void getTimerLimitTimeMs(); - /* 8002CBBC */ void getTimerMode(); - /* 8002CBCC */ void getTimerType(); - /* 8002CBDC */ void getTimerPtr(); -}; - -struct JAISoundID {}; - -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -129,44 +53,10 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JKRHeap { - /* 802CE784 */ void getTotalFreeSize(); -}; - -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRExpHeap {}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; -struct CPaneMgrAlpha { - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 802557D0 */ void setAlphaRate(f32); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802545B0 */ void paneTrans(f32, f32); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - // // Forward References: // @@ -298,14 +188,9 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void __div2i(); -extern "C" void strcmp(); -extern "C" void strcpy(); extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -378,7 +263,7 @@ asm void dTimer_c::_delete() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dTimer_c::deleteCheck() { +asm int dTimer_c::deleteCheck() { nofralloc #include "asm/d/d_timer/deleteCheck__8dTimer_cFv.s" } diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index 45e5aa933b..b9025f1b1c 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -4,19 +4,16 @@ // #include "d/map/d_map_path_dmap.h" +#include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter_HIO.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "m_Do/m_Do_mtx.h" // // Types: // -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - struct dMpath_n { struct dTexObjAggregate_c { /* 8003C85C */ void create(); @@ -181,76 +178,64 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 m_texObjAgg__8dMpath_n[28]; extern "C" u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */]; -extern "C" extern u8 g_fmapHIO[1188]; // // Declarations: // /* 8003ECA0-8003ECD8 0395E0 0038+00 0/0 3/3 0/0 .text chkGetCompass__10dMapInfo_nFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMapInfo_n::chkGetCompass() { - nofralloc -#include "asm/d/map/d_map_path_dmap/chkGetCompass__10dMapInfo_nFv.s" +bool dMapInfo_n::chkGetCompass() { + return dComIfGs_isDungeonItemCompass() ? true : false; } -#pragma pop /* 8003ECD8-8003ED10 039618 0038+00 0/0 4/4 0/0 .text chkGetMap__10dMapInfo_nFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMapInfo_n::chkGetMap() { - nofralloc -#include "asm/d/map/d_map_path_dmap/chkGetMap__10dMapInfo_nFv.s" +bool dMapInfo_n::chkGetMap() { + return dComIfGs_isDungeonItemMap() ? true : false; } -#pragma pop /* 8003ED10-8003ED60 039650 0050+00 2/2 7/7 0/0 .text isVisitedRoom__10dMapInfo_nFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMapInfo_n::isVisitedRoom(int param_0) { - nofralloc -#include "asm/d/map/d_map_path_dmap/isVisitedRoom__10dMapInfo_nFi.s" +bool dMapInfo_n::isVisitedRoom(int i_roomNo) { + return g_fmapHIO.mAllRegionsUnlocked || dComIfGs_isVisitedRoom(i_roomNo); } -#pragma pop /* 8003ED60-8003EDC0 0396A0 0060+00 1/1 2/2 0/0 .text correctionOriginPos__10dMapInfo_nFScP3Vec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMapInfo_n::correctionOriginPos(s8 param_0, Vec* param_1) { - nofralloc -#include "asm/d/map/d_map_path_dmap/correctionOriginPos__10dMapInfo_nFScP3Vec.s" +void dMapInfo_n::correctionOriginPos(s8 i_roomNo, Vec* pos_p) { + dStage_FileList2_dt_c* filelist = dStage_roomControl_c::getFileList2(i_roomNo); + + if (pos_p != NULL) { + rotAngle(filelist, pos_p); + offsetPlus(filelist, pos_p); + } } -#pragma pop /* 8003EDC0-8003EDEC 039700 002C+00 3/3 0/0 0/0 .text * offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMapInfo_n::offsetPlus(dStage_FileList2_dt_c const* param_0, Vec* param_1) { - nofralloc -#include "asm/d/map/d_map_path_dmap/offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec.s" +void dMapInfo_n::offsetPlus(dStage_FileList2_dt_c const* filelist, Vec* p_pos) { + if (filelist == NULL) { + return; + } + + p_pos->x += filelist->field_0x14; + p_pos->z += filelist->field_0x18; } -#pragma pop /* 8003EDEC-8003EE5C 03972C 0070+00 3/3 0/0 0/0 .text * rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMapInfo_n::rotAngle(dStage_FileList2_dt_c const* param_0, Vec* param_1) { - nofralloc -#include "asm/d/map/d_map_path_dmap/rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec.s" +void dMapInfo_n::rotAngle(dStage_FileList2_dt_c const* filelist, Vec* p_pos) { + s16 rot = 0; + + if (filelist != NULL) { + rot = filelist->field_0x1c; + } + mDoMtx_stack_c::YrotS(rot); + + Vec mult; + mDoMtx_stack_c::multVec(p_pos, &mult); + + *p_pos = mult; } -#pragma pop /* ############################################################################################## */ /* 80451E28-80451E2C 000428 0004+00 6/6 0/0 0/0 .sdata2 @3796 */ @@ -262,6 +247,30 @@ SECTION_SDATA2 static u8 lit_3796[4] = { }; /* 8003EE5C-8003EF20 03979C 00C4+00 1/1 6/6 0/0 .text getMapPlayerPos__10dMapInfo_nFv */ +// stayNo / mStatus loads switched +#ifdef NONMATCHING +Vec dMapInfo_n::getMapPlayerPos() { + Vec pos; + fopAc_ac_c* player = daPy_getPlayerActorClass(); + if (player != NULL) { + pos = player->mCurrent.mPosition; + } else { + f32 tmp = FLOAT_LABEL(lit_3796); + pos.x = tmp; + pos.y = tmp; + pos.z = tmp; + } + + s8 stayNo = dComIfGp_roomControl_getStayNo(); + dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(stayNo); + if (fileList2_p != NULL) { + rotAngle(fileList2_p, &pos); + offsetPlus(fileList2_p, &pos); + } + + return pos; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -270,6 +279,7 @@ asm Vec dMapInfo_n::getMapPlayerPos() { #include "asm/d/map/d_map_path_dmap/getMapPlayerPos__10dMapInfo_nFv.s" } #pragma pop +#endif /* 8003EF20-8003EF70 039860 0050+00 1/1 1/1 0/0 .text getMapPlayerAngleY__10dMapInfo_nFv */ diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp index 106a3431ed..067832a2eb 100644 --- a/src/d/meter/d_meter2.cpp +++ b/src/d/meter/d_meter2.cpp @@ -1351,10 +1351,6 @@ asm void dMeter2_c::alphaAnimeButtonCross() { } #pragma pop -inline daPy_py_c* daPy_getPlayerActorClass() { - return (daPy_py_c*)dComIfGp_getPlayer(0); -} - inline u16 dComIfGp_event_checkHind(u16 flag) { if (!dComIfGp_event_runCheck()) { return false; diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp index d4b84b17fd..2b4848736c 100644 --- a/src/d/meter/d_meter2_info.cpp +++ b/src/d/meter/d_meter2_info.cpp @@ -1274,8 +1274,8 @@ asm void dMeter2Info_getPixel(f32 param_0, f32 param_1, f32 param_2, f32 param_3 /* 8021E4B0-8021E530 218DF0 0080+00 0/0 2/2 1/1 .text dMeter2Info_setCloth__FUcb */ void dMeter2Info_setCloth(u8 i_clothId, bool param_1) { - if ((int)i_clothId >= MAGIC_LV1 || (int)i_clothId < WEARS_CASUAL) { - i_clothId = WEARS_CASUAL; + if ((int)i_clothId >= MAGIC_LV1 || (int)i_clothId < WEAR_CASUAL) { + i_clothId = WEAR_CASUAL; param_1 = false; } diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp index e333a537ab..20834e0cdf 100644 --- a/src/d/meter/d_meter_map.cpp +++ b/src/d/meter/d_meter_map.cpp @@ -106,10 +106,6 @@ inline dStage_stageDt_c* dComIfGp_getStage() { return &g_dComIfG_gameInfo.play.getStage(); } -inline daPy_py_c* daPy_getPlayerActorClass() { - return (daPy_py_c*)dComIfGp_getPlayer(0); -} - inline BOOL dComIfGs_isEventBit(u16 id) { return g_dComIfG_gameInfo.info.getEvent().isEventBit(id); } diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index fc0a5455da..b44228ba19 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -443,7 +443,6 @@ extern "C" void entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern(); extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); extern "C" void GXInvalidateVtxCache(); extern "C" void GXFlush(); -extern "C" void GXLoadNrmMtxImm(); extern "C" void __register_global_object(); extern "C" void __destroy_new_array(); extern "C" void __construct_array(); diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index bef3b669f6..19f288b34e 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -228,8 +228,8 @@ inline BOOL dComIfGs_isEventBit(u16 id) { return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(id); } -static u8 dSv_item_rename(u8 item_id) { - switch (item_id) { +static u8 dSv_item_rename(u8 i_itemNo) { + switch (i_itemNo) { case OIL_BOTTLE_2: return OIL_BOTTLE; case RED_BOTTLE_2: @@ -237,7 +237,7 @@ static u8 dSv_item_rename(u8 item_id) { case OIL2: return OIL; default: - return item_id; + return i_itemNo; } } @@ -259,7 +259,7 @@ void dSv_player_status_a_c::init() { mSelectEquip[i] = 0; } - mSelectEquip[COLLECT_CLOTHING] = WEARS_CASUAL; + mSelectEquip[COLLECT_CLOTHING] = WEAR_CASUAL; mSelectEquip[COLLECT_SWORD] = NO_ITEM; mSelectEquip[COLLECT_SHIELD] = NO_ITEM; mSelectEquip[COLLECT_SMELL] = NO_ITEM; @@ -269,33 +269,33 @@ void dSv_player_status_a_c::init() { mMagic = 0; mMagicFlag = 0; unk29 = 0; - mTransformStatus = 0; + mTransformStatus = TF_STATUS_HUMAN; for (int i = 0; i < 3; i++) { unk31[i] = 0; } } -void dSv_player_status_a_c::setSelectItemIndex(signed int i_no, u8 item_index) { +void dSv_player_status_a_c::setSelectItemIndex(int i_no, u8 item_index) { if (i_no < MAX_SELECT_ITEM) { mSelectItem[i_no] = item_index; } } -u8 dSv_player_status_a_c::getSelectItemIndex(signed int i_no) const { +u8 dSv_player_status_a_c::getSelectItemIndex(int i_no) const { if (i_no < MAX_SELECT_ITEM) { return mSelectItem[i_no]; } return 0; } -void dSv_player_status_a_c::setMixItemIndex(signed int i_no, u8 item_index) { +void dSv_player_status_a_c::setMixItemIndex(int i_no, u8 item_index) { if (i_no < MAX_SELECT_ITEM) { mMixItem[i_no] = item_index; } } -u8 dSv_player_status_a_c::getMixItemIndex(signed int i_no) const { +u8 dSv_player_status_a_c::getMixItemIndex(int i_no) const { if (i_no < MAX_SELECT_ITEM) { return mMixItem[i_no]; } @@ -318,7 +318,7 @@ u16 dSv_player_status_a_c::getRupeeMax() const { BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const { if (i_magic == 0) { - return dComIfGs_isEventBit(0x2304); + return dComIfGs_isEventBit(0x2304); // Magic Unlocked } return (mMagicFlag & (u8)(1 << i_magic)) ? TRUE : FALSE; } @@ -360,12 +360,11 @@ void dSv_horse_place_c::init() { mRoomNo = 0; } -void dSv_horse_place_c::set(const char* i_name, const cXyz& i_position, s16 i_x_rot, - signed char i_room_id) { +void dSv_horse_place_c::set(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_roomNo) { strcpy(mName, i_name); - mPos = i_position; - mAngleY = i_x_rot; - mRoomNo = i_room_id; + mPos = i_pos; + mAngleY = i_angle; + mRoomNo = i_roomNo; } void dSv_player_return_place_c::init() { @@ -376,10 +375,10 @@ void dSv_player_return_place_c::init() { unk11 = 0; } -void dSv_player_return_place_c::set(const char* i_name, s8 i_room_id, u8 i_spawn_id) { +void dSv_player_return_place_c::set(const char* i_name, s8 i_roomNo, u8 i_status) { strcpy(mName, i_name); - mRoomNo = i_room_id; - mPlayerStatus = i_spawn_id; + mRoomNo = i_roomNo; + mPlayerStatus = i_status; } void dSv_player_field_last_stay_info_c::init() { @@ -396,30 +395,24 @@ void dSv_player_field_last_stay_info_c::init() { } } -void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_last_position, - s16 i_last_angle, signed char i_last_spawn_id, - u8 i_last_room_id) { +void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_pos, s16 i_angle, + s8 i_spawn, u8 i_regionNo) { strcpy(mName, i_name); - - mPos = i_last_position; - mAngleY = i_last_angle; - mLastSpawnId = i_last_spawn_id; - mRegionNo = i_last_room_id; + mPos = i_pos; + mAngleY = i_angle; + mLastSpawnId = i_spawn; + mRegionNo = i_regionNo; } -void dSv_player_field_last_stay_info_c::onRegionBit(int i_region_bit) { - if (i_region_bit < 0) { - return; +void dSv_player_field_last_stay_info_c::onRegionBit(int i_region) { + if (i_region >= 0 && i_region < 8) { + mRegion |= (u8)(1 << i_region); } - if (8 <= i_region_bit) { - return; - } - mRegion |= (u8)(1 << i_region_bit); } -BOOL dSv_player_field_last_stay_info_c::isRegionBit(int i_region_bit) const { - if ((i_region_bit >= 0) && (i_region_bit < 8)) { - return (mRegion & (u8)(1 << i_region_bit)) ? TRUE : FALSE; +BOOL dSv_player_field_last_stay_info_c::isRegionBit(int i_region) const { + if (i_region >= 0 && i_region < 8) { + return (mRegion & (u8)(1 << i_region)) ? TRUE : FALSE; } return false; } @@ -437,107 +430,104 @@ void dSv_player_last_mark_info_c::init() { } } -void dSv_player_last_mark_info_c::setWarpItemData(const char* i_ooccoo_stage, - const cXyz& i_ooccoo_position, s16 i_ooccoo_angle, - s8 i_ooccoo_room_id, u8 unk1, u8 unk2) { - strcpy(mName, i_ooccoo_stage); - mPos.set(i_ooccoo_position); - mAngleY = i_ooccoo_angle; - mRoomNo = i_ooccoo_room_id; +void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz& i_pos, + s16 i_angle, s8 i_roomNo, u8 unk1, u8 unk2) { + strcpy(mName, i_name); + mPos.set(i_pos); + mAngleY = i_angle; + mRoomNo = i_roomNo; } void dSv_player_item_c::init() { - for (int i = 0; i < 24; i++) { + for (int i = 0; i < MAX_ITEM_SLOTS; i++) { mItems[i] = NO_ITEM; mItemSlots[i] = NO_ITEM; } } -void dSv_player_item_c::setItem(int item_slot, u8 item_id) { +void dSv_player_item_c::setItem(int item_slot, u8 i_itemNo) { if (item_slot < MAX_ITEM_SLOTS) { - mItems[item_slot] = item_id; + mItems[item_slot] = i_itemNo; setLineUpItem(); } - int select_item_index = DEFAULT_SELECT_ITEM_INDEX; - - do { - if (item_slot == dComIfGs_getSelectItemIndex(select_item_index)) { - dComIfGp_setSelectItem(select_item_index); + for (int i = DEFAULT_SELECT_ITEM_INDEX; i < MAX_SELECT_ITEM - 1; i++) { + if (item_slot == dComIfGs_getSelectItemIndex(i)) { + dComIfGp_setSelectItem(i); } - select_item_index++; - } while (select_item_index < MAX_SELECT_ITEM - 1); + } } -u8 dSv_player_item_c::getItem(int item_idx, bool isComboItem) const { - if (item_idx < MAX_ITEM_SLOTS) { - if (isComboItem) { - for (int i = 0; i < 2; i++) { - if ((dComIfGs_getSelectItemIndex(i) == item_idx || - item_idx == dComIfGs_getMixItemIndex(i)) && +u8 dSv_player_item_c::getItem(int slot_no, bool check_combo) const { + if (slot_no < MAX_ITEM_SLOTS) { + if (check_combo) { + for (int i = 0; i < SELECT_ITEM_NUM; i++) { + if ((slot_no == dComIfGs_getSelectItemIndex(i) || + slot_no == dComIfGs_getMixItemIndex(i)) && dComIfGs_getMixItemIndex(i) != NO_ITEM) { - u8 item_id_2 = mItems[dComIfGs_getSelectItemIndex(i)]; - u8 item_id_1 = mItems[dComIfGs_getMixItemIndex(i)]; + u8 select_item = mItems[dComIfGs_getSelectItemIndex(i)]; + u8 mix_item = mItems[dComIfGs_getMixItemIndex(i)]; // Get Bomb arrow check: Bow + Normal Bombs - if ((item_id_2 == BOW && item_id_1 == NORMAL_BOMB) || - (item_id_1 == BOW && item_id_2 == NORMAL_BOMB)) { + if ((select_item == BOW && mix_item == NORMAL_BOMB) || + (mix_item == BOW && select_item == NORMAL_BOMB)) { return BOMB_ARROW; } // Get Bomb arrow check: Bow + Water Bombs - if ((item_id_2 == BOW && item_id_1 == WATER_BOMB) || - (item_id_1 == BOW && item_id_2 == WATER_BOMB)) { + if ((select_item == BOW && mix_item == WATER_BOMB) || + (mix_item == BOW && select_item == WATER_BOMB)) { return BOMB_ARROW; } // Get Bomb arrow check: Bow + Bomblings - if ((item_id_2 == BOW && item_id_1 == POKE_BOMB) || - (item_id_1 == BOW && item_id_2 == POKE_BOMB)) { + if ((select_item == BOW && mix_item == POKE_BOMB) || + (mix_item == BOW && select_item == POKE_BOMB)) { return BOMB_ARROW; } // Get Hawkeye check - if ((item_id_2 == BOW && item_id_1 == HAWK_EYE) || - (item_id_1 == BOW && item_id_2 == HAWK_EYE)) { + if ((select_item == BOW && mix_item == HAWK_EYE) || + (mix_item == BOW && select_item == HAWK_EYE)) { return HAWK_ARROW; } // Get Rod w/ bee larva - if ((item_id_2 == FISHING_ROD_1 && item_id_1 == BEE_CHILD) || - (item_id_1 == FISHING_ROD_1 && item_id_2 == BEE_CHILD)) { + if ((select_item == FISHING_ROD_1 && mix_item == BEE_CHILD) || + (mix_item == FISHING_ROD_1 && select_item == BEE_CHILD)) { return BEE_ROD; } // Get Rod w/ coral earring - if ((item_id_2 == FISHING_ROD_1 && item_id_1 == ZORAS_JEWEL) || - (item_id_1 == FISHING_ROD_1 && item_id_2 == ZORAS_JEWEL)) { + if ((select_item == FISHING_ROD_1 && mix_item == ZORAS_JEWEL) || + (mix_item == FISHING_ROD_1 && select_item == ZORAS_JEWEL)) { return JEWEL_ROD; } // Get Rod w/ worm - if ((item_id_2 == FISHING_ROD_1 && item_id_1 == WORM) || - (item_id_1 == FISHING_ROD_1 && item_id_2 == WORM)) { + if ((select_item == FISHING_ROD_1 && mix_item == WORM) || + (mix_item == FISHING_ROD_1 && select_item == WORM)) { return WORM_ROD; } - if (i == 3) { + // This block will only run on the Wii version + if (i == SELECT_ITEM_B) { if (dComIfGs_getSelectItemIndex(i) == 0 && dComIfGs_getMixItemIndex(i) == 0) { - dComIfGs_setSelectItemIndex(i, 0xFF); - dComIfGs_setMixItemIndex(i, 0xFF); - return 0xFF; + dComIfGs_setSelectItemIndex(i, NO_ITEM); + dComIfGs_setMixItemIndex(i, NO_ITEM); + return NO_ITEM; } } // Uncertain combination item＝＝＝＞%d, %d\n - OSReport_Error("合成アイテム不定＝＝＝＞%d, %d\n", item_id_2, item_id_1); + OSReport_Error("合成アイテム不定＝＝＝＞%d, %d\n", select_item, mix_item); } } } - return mItems[item_idx]; - } else { - return NO_ITEM; + return mItems[slot_no]; } + + return NO_ITEM; } static u8 i_item_lst[23] = {0x0A, 0x08, 0x06, 0x02, 0x09, 0x04, 0x03, 0x00, 0x01, 0x17, 0x14, 0x05, @@ -556,7 +546,7 @@ void dSv_player_item_c::setLineUpItem() { for (int i1 = 0; i1 < 23; i1++) { if (mItems[i_item_lst[i1]] != NO_ITEM) { - mItemSlots[i2] = i_item_lst[i2]; + mItemSlots[i2] = i_item_lst[i1]; i2++; } } @@ -572,36 +562,32 @@ asm void dSv_player_item_c::setLineUpItem() { #pragma pop #endif -u8 dSv_player_item_c::getLineUpItem(int slot_number) const { - if (slot_number < MAX_ITEM_SLOTS) { - return mItemSlots[slot_number]; +u8 dSv_player_item_c::getLineUpItem(int slot_no) const { + if (slot_no < MAX_ITEM_SLOTS) { + return mItemSlots[slot_no]; } return NO_ITEM; } /* 80033370-80033450 02DCB0 00E0+00 1/1 2/2 0/0 .text setBottleItemIn__17dSv_player_item_cFUcUc */ #ifdef NONMATCHING -void dSv_player_item_c::setBottleItemIn(u8 i_item_id_1, u8 i_item_id_2) { - u8 current_item_index; - u8 new_item_index; - - current_item_index = dSv_item_rename(i_item_id_1); - new_item_index = dSv_item_rename(i_item_id_2); +void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) { + u8 cur_item = dSv_item_rename(curItemIn); + u8 new_item = dSv_item_rename(newItemIn); for (int i = 0; i < 4; i++) { - // sanitize input to make sure it's only a bottle - if (current_item_index == items[i + SLOT_11]) { - setItem(i + SLOT_11, new_item_index); - // if hotsprings water, turn on the timer - if (new_item_index == 107) { + if (cur_item == mItems[i + SLOT_11]) { + setItem(i + SLOT_11, new_item); + if (new_item == HOT_SPRING) { dMeter2Info_setHotSpringTimer(i + SLOT_11); } - for (int j = 0; j < 4; j++) { - j = getSelectItemIndex(i); - if (i + SLOT_11 == j) { - dComIfGp_setSelectItem__Fi(j); + + for (int j = 0; j < 3; j++) { + if (i + SLOT_11 == dComIfGs_getSelectItemIndex(j)) { + dComIfGp_setSelectItem(j); } } + return; } } } @@ -609,7 +595,7 @@ void dSv_player_item_c::setBottleItemIn(u8 i_item_id_1, u8 i_item_id_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dSv_player_item_c::setBottleItemIn(u8 param_0, u8 param_1) { +asm void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) { nofralloc #include "asm/d/save/d_save/setBottleItemIn__17dSv_player_item_cFUcUc.s" } @@ -620,15 +606,14 @@ asm void dSv_player_item_c::setBottleItemIn(u8 param_0, u8 param_1) { * setEmptyBottleItemIn__17dSv_player_item_cFUc */ // this is 1 instruction off #ifdef NONMATCHING -void dSv_player_item_c::setEmptyBottleItemIn(u8 i_item_id) { - setBottleItemIn(EMPTY_BOTTLE, dSv_item_rename(i_item_id)); - return; +void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) { + setBottleItemIn(EMPTY_BOTTLE, dSv_item_rename(i_itemNo)); } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dSv_player_item_c::setEmptyBottleItemIn(u8 param_0) { +asm void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) { nofralloc #include "asm/d/save/d_save/setEmptyBottleItemIn__17dSv_player_item_cFUc.s" } @@ -644,10 +629,10 @@ void dSv_player_item_c::setEmptyBottle() { } } -void dSv_player_item_c::setEmptyBottle(u8 item_id) { +void dSv_player_item_c::setEmptyBottle(u8 i_itemNo) { for (int i = 0; i < 4; i++) { if (dComIfGs_getItem((u8)(i + SLOT_11), true) == NO_ITEM) { - dComIfGs_setItem((u8)(i + SLOT_11), item_id); + dComIfGs_setItem((u8)(i + SLOT_11), i_itemNo); return; } } @@ -657,46 +642,40 @@ void dSv_player_item_c::setEmptyBottle(u8 item_id) { * setEquipBottleItemIn__17dSv_player_item_cFUcUc */ // one instruction #ifdef NONMATCHING -void dSv_player_item_c::setEquipBottleItemIn(u8 param_0, u8 param_1) { - u8 item = dSv_item_rename(param_1); - u8 selectItemIdx; - if (dComIfGs_getSelectItemIndex(param_0) >= 11 && dComIfGs_getSelectItemIndex(param_0) <= 14) { - if (item == HOT_SPRING) { - selectItemIdx = dComIfGs_getSelectItemIndex(param_0); - dMeter2Info_setHotSpringTimer(selectItemIdx); +void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) { + u8 new_item = dSv_item_rename(newItemIn); + + if (dComIfGs_getSelectItemIndex(curItemIn) >= SLOT_11 && + dComIfGs_getSelectItemIndex(curItemIn) <= SLOT_14) { + if (new_item == HOT_SPRING) { + dMeter2Info_setHotSpringTimer(dComIfGs_getSelectItemIndex(curItemIn)); } - selectItemIdx = dComIfGs_getSelectItemIndex(param_0); - setItem(selectItemIdx, item); - - selectItemIdx = dComIfGs_getSelectItemIndex(param_0); - dComIfGs_setItem(selectItemIdx, item); - - selectItemIdx = dComIfGs_getSelectItemIndex(param_0); - dComIfGp_setItem(selectItemIdx, item); - dComIfGp_setSelectItem(param_0); + setItem(dComIfGs_getSelectItemIndex(curItemIn), new_item); + dComIfGs_setItem(dComIfGs_getSelectItemIndex(curItemIn), new_item); + dComIfGp_setItem(dComIfGs_getSelectItemIndex(curItemIn), new_item); + dComIfGp_setSelectItem(curItemIn); } } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dSv_player_item_c::setEquipBottleItemIn(u8 param_0, u8 param_1) { +asm void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) { nofralloc #include "asm/d/save/d_save/setEquipBottleItemIn__17dSv_player_item_cFUcUc.s" } #pragma pop #endif -void dSv_player_item_c::setEquipBottleItemEmpty(u8 selected_index) { - setEquipBottleItemIn(selected_index, EMPTY_BOTTLE); +void dSv_player_item_c::setEquipBottleItemEmpty(u8 curItemIn) { + setEquipBottleItemIn(curItemIn, EMPTY_BOTTLE); } -u8 dSv_player_item_c::checkBottle(u8 i_item_id) { - u8 item_id; +u8 dSv_player_item_c::checkBottle(u8 i_itemNo) { u8 num_bottles = 0; + u8 item_id = dSv_item_rename(i_itemNo); - item_id = dSv_item_rename(i_item_id); for (int i = 0; i < BOTTLE_MAX; i++) { if (item_id == mItems[i + SLOT_11]) { num_bottles++; @@ -790,31 +769,27 @@ BOOL dSv_player_item_c::checkInsectBottle() { } u8 dSv_player_item_c::checkEmptyBottle() { - u8 num = 0; + u8 bottleNum = 0; for (int i = 0; i < BOTTLE_MAX; i++) { - // Loop through the bottle slots (11 - 14) and increment counter for every empty bottle if (mItems[i + SLOT_11] == EMPTY_BOTTLE) { - num++; + bottleNum++; } } - return num; + return bottleNum; } -void dSv_player_item_c::setBombBagItemIn(u8 param_0, u8 param_1, bool param_2) { - int i = 0; - for (; i < 3; i++) { - if (param_0 == mItems[i + SLOT_15]) { - setItem(i + SLOT_15, param_1); +void dSv_player_item_c::setBombBagItemIn(u8 curBomb, u8 newBomb, bool setNum) { + for (int i = 0; i < 3; i++) { + if (curBomb == mItems[i + SLOT_15]) { + setItem(i + SLOT_15, newBomb); - if (param_2 == 1 && param_1 != BOMB_BAG_LV1) { - u8 bombMax = dComIfGs_getBombMax(param_1); - dComIfGs_setBombNum(i, bombMax); + if (setNum == true && newBomb != BOMB_BAG_LV1) { + dComIfGs_setBombNum(i, dComIfGs_getBombMax(newBomb)); } for (int j = 0; j < 3; j++) { - u8 selectItem = dComIfGs_getSelectItemIndex(j); - if (i + SLOT_15 == selectItem) { + if (i + SLOT_15 == dComIfGs_getSelectItemIndex(j)) { dComIfGp_setSelectItem(j); } } @@ -823,23 +798,20 @@ void dSv_player_item_c::setBombBagItemIn(u8 param_0, u8 param_1, bool param_2) { } } -void dSv_player_item_c::setBombBagItemIn(u8 param_0, u8 param_1, u8 param_2, bool param_3) { - int i = 0; - for (; i < 3; i++) { - if (param_0 == mItems[i + SLOT_15]) { - setItem(i + SLOT_15, param_1); +void dSv_player_item_c::setBombBagItemIn(u8 curBomb, u8 newBomb, u8 bombNum, bool setNum) { + for (int i = 0; i < 3; i++) { + if (curBomb == mItems[i + SLOT_15]) { + setItem(i + SLOT_15, newBomb); - if (param_3 == 1 && param_1 != BOMB_BAG_LV1) { - u8 bombMax = dComIfGs_getBombMax(param_1); - if (param_2 > bombMax) { - param_2 = dComIfGs_getBombMax(param_1); + if (setNum == 1 && newBomb != BOMB_BAG_LV1) { + if (bombNum > dComIfGs_getBombMax(newBomb)) { + bombNum = dComIfGs_getBombMax(newBomb); } - dComIfGs_setBombNum(i, param_2); + dComIfGs_setBombNum(i, bombNum); } for (int j = 0; j < 3; j++) { - u8 selectItem = dComIfGs_getSelectItemIndex(j); - if (i + SLOT_15 == selectItem) { + if (i + SLOT_15 == dComIfGs_getSelectItemIndex(j)) { dComIfGp_setSelectItem(j); } } @@ -848,72 +820,66 @@ void dSv_player_item_c::setBombBagItemIn(u8 param_0, u8 param_1, u8 param_2, boo } } -void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1, bool param_2) { - setBombBagItemIn(BOMB_BAG_LV1, param_1, param_2); +void dSv_player_item_c::setEmptyBombBagItemIn(u8 newBomb, bool setNum) { + setBombBagItemIn(BOMB_BAG_LV1, newBomb, setNum); } -void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1, u8 param_2, bool param_3) { - setBombBagItemIn(BOMB_BAG_LV1, param_1, param_2, param_3); +void dSv_player_item_c::setEmptyBombBagItemIn(u8 newBomb, u8 bombNum, bool setNum) { + setBombBagItemIn(BOMB_BAG_LV1, newBomb, bombNum, setNum); } void dSv_player_item_c::setEmptyBombBag() { for (int i = 0; i < 3; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_15), true) == 0xff) { + if (dComIfGs_getItem((u8)(i + SLOT_15), true) == NO_ITEM) { dComIfGs_setItem((u8)(i + SLOT_15), BOMB_BAG_LV1); return; } } } -void dSv_player_item_c::setEmptyBombBag(u8 param_0, u8 param_1) { +void dSv_player_item_c::setEmptyBombBag(u8 newBomb, u8 bombNum) { for (int i = 0; i < 3; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_15), true) == 0xff) { - dComIfGs_setItem((u8)(i + SLOT_15), param_0); + if (dComIfGs_getItem((u8)(i + SLOT_15), true) == NO_ITEM) { + dComIfGs_setItem((u8)(i + SLOT_15), newBomb); - if (param_0 == BOMB_BAG_LV1) { + if (newBomb == BOMB_BAG_LV1) { return; } - if (param_1 > dComIfGs_getBombMax(param_0)) { - param_1 = dComIfGs_getBombMax(param_0); + if (bombNum > dComIfGs_getBombMax(newBomb)) { + bombNum = dComIfGs_getBombMax(newBomb); } - dComIfGs_setBombNum(i, param_1); + dComIfGs_setBombNum(i, bombNum); return; } } } -u8 dSv_player_item_c::checkBombBag(u8 param_1) { - u8 counter = 0; +u8 dSv_player_item_c::checkBombBag(u8 i_itemNo) { + u8 bombBags = 0; for (int i = 0; i < BOMB_BAG_MAX; i++) { - // Loop through the bomb bag slots (15 - 17) and increment counter for every match - if (param_1 == mItems[i + SLOT_15]) { - counter++; + if (i_itemNo == mItems[i + SLOT_15]) { + bombBags++; } } - return counter; + return bombBags; } -void dSv_player_item_c::setWarashibeItem(u8 i_item_id) { - u32 select_item_index; - - dComIfGs_setItem(SLOT_21, i_item_id); - dComIfGp_setItem(SLOT_21, i_item_id); +void dSv_player_item_c::setWarashibeItem(u8 i_itemNo) { + dComIfGs_setItem(SLOT_21, i_itemNo); + dComIfGp_setItem(SLOT_21, i_itemNo); for (int i = 0; i < 4; i++) { - select_item_index = dComIfGs_getSelectItemIndex((u8)i); - if (select_item_index == SLOT_21) { + if (dComIfGs_getSelectItemIndex((u8)i) == SLOT_21) { dComIfGp_setSelectItem((u8)i); } } } void dSv_player_item_c::setRodTypeLevelUp() { - int current_fishing_rod_item_id = mItems[SLOT_20]; - - switch (current_fishing_rod_item_id) { + switch (mItems[SLOT_20]) { case BEE_ROD: { mItems[SLOT_20] = JEWEL_BEE_ROD; break; @@ -933,8 +899,8 @@ void dSv_player_item_c::setRodTypeLevelUp() { } } -void dSv_player_item_c::setBaitItem(u8 param_1) { - switch (param_1) { +void dSv_player_item_c::setBaitItem(u8 i_itemNo) { + switch (i_itemNo) { case BEE_CHILD: { dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_BEE_ROD : mItems[SLOT_20] = BEE_ROD; @@ -966,17 +932,14 @@ void dSv_player_get_item_c::init() { /* 80033E60-80033E94 02E7A0 0034+00 0/0 3/3 1/1 .text onFirstBit__21dSv_player_get_item_cFUc */ // this is a few instructions off #ifdef NONMATCHING -void dSv_player_get_item_c::onFirstBit(u8 i_itemno) { - int tmp = (int)i_itemno; - int tmp2 = (i_itemno >> 3) & 0xE0; - // int uVar1 = ; - mItemFlags[tmp2] |= 1 << (tmp & 0x1F); +void dSv_player_get_item_c::onFirstBit(u8 i_itemNo) { + mItemFlags[i_itemNo >> 5] |= (1 << (i_itemNo & 0x1F)); } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dSv_player_get_item_c::onFirstBit(u8 param_0) { +asm void dSv_player_get_item_c::onFirstBit(u8 i_itemNo) { nofralloc #include "asm/d/save/d_save/onFirstBit__21dSv_player_get_item_cFUc.s" } @@ -987,7 +950,7 @@ asm void dSv_player_get_item_c::onFirstBit(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dSv_player_get_item_c::offFirstBit(u8 param_0) { +asm void dSv_player_get_item_c::offFirstBit(u8 i_itemNo) { nofralloc #include "asm/d/save/d_save/offFirstBit__21dSv_player_get_item_cFUc.s" } @@ -997,7 +960,7 @@ asm void dSv_player_get_item_c::offFirstBit(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dSv_player_get_item_c::isFirstBit(u8 param_0) const { +asm int dSv_player_get_item_c::isFirstBit(u8 i_itemNo) const { nofralloc #include "asm/d/save/d_save/isFirstBit__21dSv_player_get_item_cCFUc.s" } @@ -1033,18 +996,19 @@ void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 bottle_num) { mBottleNum[i_bottleIdx] = bottle_num; } -u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 param_2) { - int iVar3 = mBottleNum[i_bottleIdx] + param_2; +u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 num) { + int bottleNum = mBottleNum[i_bottleIdx] + num; - dComIfGs_getItem((u8)(i_bottleIdx + 0xB), true); + dComIfGs_getItem((u8)(i_bottleIdx + SLOT_11), true); - if (iVar3 < 0) { + if (bottleNum < 0) { mBottleNum[i_bottleIdx] = 0; - } else if (iVar3 > dComIfGs_getBottleMax()) { + } else if (bottleNum > dComIfGs_getBottleMax()) { mBottleNum[i_bottleIdx] = dComIfGs_getBottleMax(); } else { - mBottleNum[i_bottleIdx] = iVar3; + mBottleNum[i_bottleIdx] = bottleNum; } + return mBottleNum[i_bottleIdx]; } @@ -1076,21 +1040,19 @@ void dSv_player_item_max_c::setBombNum(u8 bomb_id, u8 bomb_max) { } } -u8 dSv_player_item_max_c::getBombNum(u8 param_1) const { - u8 iVar3; - - iVar3 = 0x1; +u8 dSv_player_item_max_c::getBombNum(u8 bombId) const { + u8 lv_multiplier = 1; if (dComIfGs_isItemFirstBit(BOMB_BAG_LV2)) { - iVar3 = 0x2; + lv_multiplier = 2; } - switch (param_1) { + switch (bombId) { case NORMAL_BOMB: - return (u8)(mItemMax[NORMAL_BOMB_MAX] * iVar3); + return (u8)(mItemMax[NORMAL_BOMB_MAX] * lv_multiplier); case WATER_BOMB: - return (u8)(mItemMax[WATER_BOMB_MAX] * iVar3); + return (u8)(mItemMax[WATER_BOMB_MAX] * lv_multiplier); case POKE_BOMB: - return (u8)(mItemMax[POKE_BOMB_MAX] * iVar3); + return (u8)(mItemMax[POKE_BOMB_MAX] * lv_multiplier); default: return 0; } @@ -1152,27 +1114,27 @@ void dSv_light_drop_c::init() { } } -void dSv_light_drop_c::setLightDropNum(u8 i_nowLevel, u8 param_2) { - if ((i_nowLevel < LIGHT_DROP_STAGE) || (i_nowLevel > 6)) { - mLightDropNum[i_nowLevel] = param_2; +void dSv_light_drop_c::setLightDropNum(u8 i_nowLevel, u8 dropNum) { + if (i_nowLevel < LIGHT_DROP_STAGE || i_nowLevel > 6) { + mLightDropNum[i_nowLevel] = dropNum; } } u8 dSv_light_drop_c::getLightDropNum(u8 i_nowLevel) const { - if ((i_nowLevel >= LIGHT_DROP_STAGE) && (i_nowLevel <= 6)) { + if (i_nowLevel >= LIGHT_DROP_STAGE && i_nowLevel <= 6) { return 0; } return mLightDropNum[i_nowLevel]; } void dSv_light_drop_c::onLightDropGetFlag(u8 i_nowLevel) { - if ((i_nowLevel < LIGHT_DROP_STAGE) || (i_nowLevel > 6)) { + if (i_nowLevel < LIGHT_DROP_STAGE || i_nowLevel > 6) { mLightDropGetFlag |= (u8)(1 << i_nowLevel); } } BOOL dSv_light_drop_c::isLightDropGetFlag(u8 i_nowLevel) const { - if ((i_nowLevel >= LIGHT_DROP_STAGE) && (i_nowLevel <= 6)) { + if (i_nowLevel >= LIGHT_DROP_STAGE && i_nowLevel <= 6) { return 0; } return mLightDropGetFlag & (u8)(1 << i_nowLevel) ? TRUE : FALSE; @@ -1190,15 +1152,15 @@ void dSv_letter_info_c::init() { } void dSv_letter_info_c::onLetterGetFlag(int i_no) { - mLetterGetFlags[i_no >> 0x5] |= 0x1 << (i_no & 0x1F); + mLetterGetFlags[i_no >> 5] |= 1 << (i_no & 0x1F); } BOOL dSv_letter_info_c::isLetterGetFlag(int i_no) const { - return mLetterGetFlags[i_no >> 0x5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE; + return mLetterGetFlags[i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE; } void dSv_letter_info_c::onLetterReadFlag(int i_no) { - mLetterReadFlags[i_no >> 0x5] |= 0x1 << (i_no & 0x1F); + mLetterReadFlags[i_no >> 5] |= 1 << (i_no & 0x1F); } BOOL dSv_letter_info_c::isLetterReadFlag(int i_no) const { @@ -1219,8 +1181,8 @@ void dSv_fishing_info_c::addFishCount(u8 fish_index) { } void dSv_player_info_c::init() { - dMeter2Info_getString(0x382, (char*)mPlayerName, NULL); - dMeter2Info_getString(0x383, (char*)mHorseName, NULL); + dMeter2Info_getString(0x382, mPlayerName, NULL); // Link + dMeter2Info_getString(0x383, mHorseName, NULL); // Epona unk4 = 0; unk0 = 0; @@ -1235,11 +1197,9 @@ void dSv_player_info_c::init() { } void dSv_player_config_c::init() { - u32 os_soundMode; - unk0 = 1; - os_soundMode = OSGetSoundMode(); - if (os_soundMode == SOUND_MODE_MONO) { + + if (OSGetSoundMode() == SOUND_MODE_MONO) { mSoundMode = SOUND_MODE_MONO; Z2AudioMgr::mAudioMgrPtr->setOutputMode(SOUND_MODE_MONO); } else { @@ -1321,7 +1281,7 @@ void dSv_memBit_c::offTbox(int i_no) { } BOOL dSv_memBit_c::isTbox(int i_no) const { - return 1 << (i_no & 0x1f) & mTbox[i_no >> 0x5] ? TRUE : FALSE; + return 1 << (i_no & 0x1f) & mTbox[i_no >> 5] ? TRUE : FALSE; } void dSv_memBit_c::onSwitch(int i_no) { @@ -1332,22 +1292,22 @@ void dSv_memBit_c::offSwitch(int i_no) { } BOOL dSv_memBit_c::isSwitch(int i_no) const { - return (mSwitch[i_no >> 0x5] & 0x1 << (i_no & 0x1F)) ? TRUE : FALSE; + return (mSwitch[i_no >> 5] & 1 << (i_no & 0x1F)) ? TRUE : FALSE; } /* 8003488C-800348C4 02F1CC 0038+00 1/1 0/0 0/0 .text revSwitch__12dSv_memBit_cFi */ // instruction in wrong place #ifdef NONMATCHING BOOL dSv_memBit_c::revSwitch(int i_no) { - unsigned int tmp = 1 << (i_no & 0x1F); - (mTbox + (i_no >> 0x5))[0x2] ^= tmp; - return (mTbox + (i_no >> 0x5))[0x2] & tmp ? TRUE : FALSE; + u32 tmp = 1 << (i_no & 0x1F); + mSwitch[i_no >> 5] ^= tmp; + return mSwitch[i_no >> 5] & tmp ? TRUE : FALSE; } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dSv_memBit_c::revSwitch(int param_0) { +asm int dSv_memBit_c::revSwitch(int i_no) { nofralloc #include "asm/d/save/d_save/revSwitch__12dSv_memBit_cFi.s" } @@ -1359,7 +1319,7 @@ void dSv_memBit_c::onItem(int i_no) { } BOOL dSv_memBit_c::isItem(int i_no) const { - return (mItem[i_no >> 0x5] & 1 << (i_no & 0x1F)) ? TRUE : FALSE; + return (mItem[i_no >> 5] & 1 << (i_no & 0x1F)) ? TRUE : FALSE; } void dSv_memBit_c::onDungeonItem(int i_no) { @@ -1389,14 +1349,13 @@ BOOL dSv_event_c::isEventBit(u16 i_no) const { return mEvent[(i_no >> 8)] & (i_no & 0xFF) ? TRUE : FALSE; } -void dSv_event_c::setEventReg(u16 param_1, u8 param_2) { - u8 uVar1 = (param_1 >> 8); - mEvent[uVar1] &= ~(u8)param_1; - mEvent[uVar1] |= param_2; +void dSv_event_c::setEventReg(u16 i_reg, u8 i_no) { + mEvent[i_reg >> 8] &= ~(u8)i_reg; + mEvent[i_reg >> 8] |= i_no; } -u8 dSv_event_c::getEventReg(u16 param_1) const { - return (u8)param_1 & mEvent[param_1 >> 8]; +u8 dSv_event_c::getEventReg(u16 i_reg) const { + return (u8)i_reg & mEvent[i_reg >> 8]; } void dSv_MiniGame_c::init() { @@ -1429,8 +1388,8 @@ void dSv_memory2_c::offVisitedRoom(int i_no) { mVisitedRoom[i_no >> 5] &= ~(1 << (i_no & 0x1F)); } -BOOL dSv_memory2_c::isVisitedRoom(int param_1) { - return (1 << (param_1 & 0x1F) & mVisitedRoom[param_1 >> 5]) ? TRUE : FALSE; +BOOL dSv_memory2_c::isVisitedRoom(int i_no) { + return (1 << (i_no & 0x1F) & mVisitedRoom[i_no >> 5]) ? TRUE : FALSE; } bool dSv_danBit_c::init(s8 i_stage) { @@ -1466,7 +1425,7 @@ void dSv_danBit_c::offSwitch(int i_no) { } BOOL dSv_danBit_c::isSwitch(int i_no) const { - return mSwitch[i_no >> 0x5] & (0x1 << (i_no & 0x1F)) ? TRUE : FALSE; + return mSwitch[i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE; } BOOL dSv_danBit_c::revSwitch(int i_no) { @@ -1521,14 +1480,14 @@ BOOL dSv_zoneBit_c::isSwitch(int i_no) const { #ifdef NONMATCHING BOOL dSv_zoneBit_c::revSwitch(int i_no) { int uVar1 = 1 << (i_no & 0xF); - switch_bitfield[i_no >> 4] ^= uVar1; - return switch_bitfield[i_no >> 4] & uVar1 ? TRUE : FALSE; + mSwitch[i_no >> 4] ^= uVar1; + return mSwitch[i_no >> 4] & uVar1 ? TRUE : FALSE; } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dSv_zoneBit_c::revSwitch(int param_0) { +asm int dSv_zoneBit_c::revSwitch(int i_no) { nofralloc #include "asm/d/save/d_save/revSwitch__13dSv_zoneBit_cFi.s" } @@ -1646,11 +1605,11 @@ void dSv_info_c::initZone() { } } -u32 dSv_info_c::createZone(int param_1) { +u32 dSv_info_c::createZone(int i_roomNo) { dSv_zone_c* zone = mZone; for (int i = 0; i < 0x20; zone++, i++) { if (zone->getRoomNo() < 0) { - zone->init(param_1); + zone->init(i_roomNo); return i; } } @@ -1658,129 +1617,125 @@ u32 dSv_info_c::createZone(int param_1) { } void dSv_info_c::onSwitch(int i_no, int i_roomNo) { - if ((i_no == -1) || (i_no == 0xFF)) { + if (i_no == -1 || i_no == 255) { return; } - if (i_no < 0x80) { + if (i_no < MEMORY_SWITCH) { mMemory.getBit().onSwitch(i_no); - } else if (i_no < 0xc0) { - mDan.onSwitch(i_no - 0x80); + } else if (i_no < (MEMORY_SWITCH + DAN_SWITCH)) { + mDan.onSwitch(i_no - MEMORY_SWITCH); } else { int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo); - if (i_no < 0xE0) { - mZone[zoneId].getZoneBit().onSwitch(i_no - 0xC0); + if (i_no < (MEMORY_SWITCH + DAN_SWITCH + ZONE_SWITCH)) { + mZone[zoneId].getZoneBit().onSwitch(i_no - (MEMORY_SWITCH + DAN_SWITCH)); } else { - mZone[zoneId].getZoneBit().onOneSwitch(i_no - 0xE0); + mZone[zoneId].getZoneBit().onOneSwitch(i_no - + (MEMORY_SWITCH + DAN_SWITCH + ZONE_SWITCH)); } } } void dSv_info_c::offSwitch(int i_no, int i_roomNo) { - if ((i_no == -1) || (i_no == 0xFF)) { + if (i_no == -1 || i_no == 255) { return; } - if (i_no < 0x80) { + if (i_no < MEMORY_SWITCH) { mMemory.getBit().offSwitch(i_no); - } else if (i_no < 0xc0) { - mDan.offSwitch(i_no - 0x80); + } else if (i_no < (MEMORY_SWITCH + DAN_SWITCH)) { + mDan.offSwitch(i_no - MEMORY_SWITCH); } else { int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo); - if (i_no < 0xE0) { - mZone[zoneId].getZoneBit().offSwitch(i_no - 0xC0); + if (i_no < (MEMORY_SWITCH + DAN_SWITCH + ZONE_SWITCH)) { + mZone[zoneId].getZoneBit().offSwitch(i_no - (MEMORY_SWITCH + DAN_SWITCH)); } else { - mZone[zoneId].getZoneBit().offOneSwitch(i_no - 0xE0); + mZone[zoneId].getZoneBit().offOneSwitch(i_no - + (MEMORY_SWITCH + DAN_SWITCH + ZONE_SWITCH)); } } } BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const { - int value; - if ((i_no == -1) || (i_no == 0xFF)) { + if (i_no == -1 || i_no == 255) { return FALSE; } - if (i_no < 0x80) { - value = mMemory.getBit().isSwitch(i_no); - } else if (i_no < 0xc0) { - value = mDan.isSwitch(i_no - 0x80); + if (i_no < MEMORY_SWITCH) { + return mMemory.getBit().isSwitch(i_no); + } else if (i_no < (MEMORY_SWITCH + DAN_SWITCH)) { + return mDan.isSwitch(i_no - MEMORY_SWITCH); } else { int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo); - if ((zoneId < 0) || (zoneId >= 0x20)) { - value = FALSE; + if (zoneId < 0 || zoneId >= ZONE_MAX) { + return FALSE; } else { - if (i_no < 0xE0) { - value = mZone[zoneId].getBit().isSwitch(i_no - 0xC0); + if (i_no < (MEMORY_SWITCH + DAN_SWITCH + ZONE_SWITCH)) { + return mZone[zoneId].getBit().isSwitch(i_no - (MEMORY_SWITCH + DAN_SWITCH)); } else { - value = mZone[zoneId].getBit().isOneSwitch(i_no - 0xE0); + return mZone[zoneId].getBit().isOneSwitch( + i_no - (MEMORY_SWITCH + DAN_SWITCH + ZONE_SWITCH)); } } } - return value; } BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) { - int value; - if ((i_no == -1) || (i_no == 0xFF)) { + if (i_no == -1 || i_no == 255) { return FALSE; } - if (i_no < 0x80) { - value = mMemory.getBit().revSwitch(i_no); - } else if (i_no < 0xC0) { - value = mDan.revSwitch(i_no - 0x80); + if (i_no < MEMORY_SWITCH) { + return mMemory.getBit().revSwitch(i_no); + } else if (i_no < (MEMORY_SWITCH + DAN_SWITCH)) { + return mDan.revSwitch(i_no - MEMORY_SWITCH); } else { int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); - if (i_no < 0xE0) { - value = mZone[zoneNo].getZoneBit().revSwitch(i_no - 0xC0); + if (i_no < (MEMORY_SWITCH + DAN_SWITCH + ZONE_SWITCH)) { + return mZone[zoneNo].getZoneBit().revSwitch(i_no - (MEMORY_SWITCH + DAN_SWITCH)); } else { - value = mZone[zoneNo].getZoneBit().revOneSwitch(i_no - 0xE0); + return mZone[zoneNo].getZoneBit().revOneSwitch( + i_no - (MEMORY_SWITCH + DAN_SWITCH + ZONE_SWITCH)); } } - - return value; } void dSv_info_c::onItem(int i_no, int i_roomNo) { - if ((i_no == -1) || (i_no == 0xFF)) { + if (i_no == -1 || i_no == 255) { return; } - if (i_no < 0x80) { + if (i_no < MEMORY_ITEM) { mDan.onItem(i_no); - } else if (i_no < 0xA0) { - mMemory.getBit().onItem(i_no - 0x80); + } else if (i_no < (MEMORY_ITEM + DAN_ITEM)) { + mMemory.getBit().onItem(i_no - MEMORY_ITEM); } else { int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); - if (i_no < 0xC0) { - mZone[zoneNo].getZoneBit().onItem(i_no - 0xA0); + if (i_no < (MEMORY_ITEM + DAN_ITEM + ZONE_ITEM)) { + mZone[zoneNo].getZoneBit().onItem(i_no - (MEMORY_ITEM + DAN_ITEM)); } else { - mZone[zoneNo].getZoneBit().onOneItem(i_no - 0xC0); + mZone[zoneNo].getZoneBit().onOneItem(i_no - (MEMORY_ITEM + DAN_ITEM + ZONE_ITEM)); } } } BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const { - int value; - if ((i_no == -1) || (i_no == 0xFF)) { + if (i_no == -1 || i_no == 255) { return FALSE; } - if (i_no < 0x80) { - value = mDan.isItem(i_no); - } else if (i_no < 0xA0) { - value = mMemory.getBit().isItem(i_no - 0x80); + if (i_no < MEMORY_ITEM) { + return mDan.isItem(i_no); + } else if (i_no < (MEMORY_ITEM + DAN_ITEM)) { + return mMemory.getBit().isItem(i_no - MEMORY_ITEM); } else { int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); - if (i_no < 0xC0) { - value = mZone[zoneNo].getBit().isItem(i_no - 0xA0); + if (i_no < (MEMORY_ITEM + DAN_ITEM + ZONE_ITEM)) { + return mZone[zoneNo].getBit().isItem(i_no - (MEMORY_ITEM + DAN_ITEM)); } else { - value = mZone[zoneNo].getBit().isOneItem(i_no - 0xC0); + return mZone[zoneNo].getBit().isOneItem(i_no - (MEMORY_ITEM + DAN_ITEM + ZONE_ITEM)); } } - - return value; } void dSv_info_c::onActor(int i_id, int i_roomNo) { @@ -1821,7 +1776,7 @@ SECTION_DEAD static char const* const stringBase_8037926C = "SAVE size:%d\n"; /* 80035798-80035A04 0300D8 026C+00 0/0 1/1 0/0 .text memory_to_card__10dSv_info_cFPci */ // lots of regalloc issues #ifdef NONMATCHING -int dSv_info_c::memory_to_card(char* card_ptr, int data_num) { +int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { bool lantern_not_recovered = false; s32 lantern_stolen; s32 lantern_dropped; @@ -1843,7 +1798,7 @@ int dSv_info_c::memory_to_card(char* card_ptr, int data_num) { phi_r30 = true; } - char* save_ptr = card_ptr + (data_num * 0xA94); // 0xA94 = Quest Log size + char* save_ptr = card_ptr + (dataNum * 0xA94); // 0xA94 = Quest Log size dSv_save_c* savedata = dComIfGs_getSaveData(); s64 play_time = (OSGetTime() - dComIfGs_getSaveStartTime()); @@ -1879,7 +1834,7 @@ int dSv_info_c::memory_to_card(char* card_ptr, int data_num) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dSv_info_c::memory_to_card(char* param_0, int param_1) { +asm int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { nofralloc #include "asm/d/save/d_save/memory_to_card__10dSv_info_cFPci.s" } @@ -1896,8 +1851,8 @@ SECTION_DEAD static char const* const stringBase_8037927A = "LOAD size:%d\n"; /* 80035A04-80035BD0 030344 01CC+00 0/0 2/2 0/0 .text card_to_memory__10dSv_info_cFPci */ // memcpy param loads out of order #ifdef NONMATCHING -int dSv_info_c::card_to_memory(char* param_0, int param_1) { - memcpy(dComIfGs_getSaveData(), param_0 + param_1 * 0xa94, sizeof(dSv_save_c)); +int dSv_info_c::card_to_memory(char* card_ptr, int dataNum) { + memcpy(dComIfGs_getSaveData(), card_ptr + dataNum * 0xa94, sizeof(dSv_save_c)); if (OSGetSoundMode() == SOUND_MODE_MONO) { g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(SOUND_MODE_MONO); @@ -1940,7 +1895,7 @@ int dSv_info_c::card_to_memory(char* param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dSv_info_c::card_to_memory(char* param_0, int param_1) { +asm int dSv_info_c::card_to_memory(char* card_ptr, int dataNum) { nofralloc #include "asm/d/save/d_save/card_to_memory__10dSv_info_cFPci.s" } @@ -1959,8 +1914,8 @@ SECTION_DEAD static char const* const pad_80379296 = "\0"; /* 80035BD0-80035C88 030510 00B8+00 0/0 3/3 0/0 .text initdata_to_card__10dSv_info_cFPci */ #ifdef NONMATCHING -int dSv_info_c::initdata_to_card(char* param_0, int fileNo) { - char* ptr = param_0 + (fileNo * 0xa94); +int dSv_info_c::initdata_to_card(char* card_ptr, int dataNum) { + char* ptr = card_ptr + (dataNum * 0xa94); dSv_save_c tmp; tmp.init(); @@ -1974,7 +1929,7 @@ int dSv_info_c::initdata_to_card(char* param_0, int fileNo) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dSv_info_c::initdata_to_card(char* param_0, int param_1) { +asm int dSv_info_c::initdata_to_card(char* card_ptr, int dataNum) { nofralloc #include "asm/d/save/d_save/initdata_to_card__10dSv_info_cFPci.s" } diff --git a/src/d/save/d_save_HIO.cpp b/src/d/save/d_save_HIO.cpp index 7194c85059..f7092ae539 100644 --- a/src/d/save/d_save_HIO.cpp +++ b/src/d/save/d_save_HIO.cpp @@ -4,127 +4,10 @@ // #include "d/save/d_save_HIO.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct dSv_player_status_b_c { - /* 80032BB0 */ void isDarkClearLV(int) const; - /* 80032BEC */ void isTransformLV(int) const; -}; - -struct dSv_memBit_c { - /* 800347E8 */ void isTbox(int) const; - /* 80034860 */ void isSwitch(int) const; - /* 800348EC */ void isItem(int) const; -}; - -struct dSv_light_drop_c { - /* 80034340 */ void getLightDropNum(u8) const; - /* 8003439C */ void isLightDropGetFlag(u8) const; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dSv_danBit_c { - /* 80034BE8 */ void isSwitch(int) const; - /* 80034C74 */ void isItem(int) const; -}; - -struct dSvBit_childTreasureHIO_c { - /* 8025C874 */ ~dSvBit_childTreasureHIO_c(); -}; - -struct dSvBit_childTransformHIO_c { - /* 8025C0A0 */ dSvBit_childTransformHIO_c(); - /* 8025C0D4 */ void init(); - /* 8025C2E4 */ ~dSvBit_childTransformHIO_c(); -}; - -struct dSvBit_childTbPerfectionHIO_c { - /* 8025BF68 */ dSvBit_childTbPerfectionHIO_c(); - /* 8025BF9C */ void init(); - /* 8025C374 */ ~dSvBit_childTbPerfectionHIO_c(); -}; - -struct dSvBit_childSwitchHIO_c { - /* 8025C970 */ ~dSvBit_childSwitchHIO_c(); -}; - -struct dSvBit_childSwZoneHIO_c { - /* 8025BCB0 */ dSvBit_childSwZoneHIO_c(); - /* 8025BCE4 */ void init(); - /* 8025C524 */ ~dSvBit_childSwZoneHIO_c(); -}; - -struct dSvBit_childSwPerfectionHIO_c { - /* 8025BB78 */ dSvBit_childSwPerfectionHIO_c(); - /* 8025BBAC */ void init(); - /* 8025C5B4 */ ~dSvBit_childSwPerfectionHIO_c(); -}; - -struct dSvBit_childSwOneZoneHIO_c { - /* 8025BD10 */ dSvBit_childSwOneZoneHIO_c(); - /* 8025BD44 */ void init(); - /* 8025C4DC */ ~dSvBit_childSwOneZoneHIO_c(); -}; - -struct dSvBit_childSwDungeonHIO_c { - /* 8025BC14 */ dSvBit_childSwDungeonHIO_c(); - /* 8025BC48 */ void init(); - /* 8025C56C */ ~dSvBit_childSwDungeonHIO_c(); -}; - -struct dSvBit_childOtherHIO_c { - /* 8025C13C */ dSvBit_childOtherHIO_c(); - /* 8025C178 */ void init(); - /* 8025C29C */ ~dSvBit_childOtherHIO_c(); -}; - -struct dSvBit_childItemHIO_c { - /* 8025C8D4 */ ~dSvBit_childItemHIO_c(); -}; - -struct dSvBit_childItZoneHIO_c { - /* 8025BEA8 */ dSvBit_childItZoneHIO_c(); - /* 8025BEDC */ void init(); - /* 8025C404 */ ~dSvBit_childItZoneHIO_c(); -}; - -struct dSvBit_childItPerfectionHIO_c { - /* 8025BD70 */ dSvBit_childItPerfectionHIO_c(); - /* 8025BDA4 */ void init(); - /* 8025C494 */ ~dSvBit_childItPerfectionHIO_c(); -}; - -struct dSvBit_childItOneZoneHIO_c { - /* 8025BF08 */ dSvBit_childItOneZoneHIO_c(); - /* 8025BF3C */ void init(); - /* 8025C3BC */ ~dSvBit_childItOneZoneHIO_c(); -}; - -struct dSvBit_childItDungeonHIO_c { - /* 8025BE0C */ dSvBit_childItDungeonHIO_c(); - /* 8025BE40 */ void init(); - /* 8025C44C */ ~dSvBit_childItDungeonHIO_c(); -}; - -struct dSvBit_childDarknessHIO_c { - /* 8025C004 */ dSvBit_childDarknessHIO_c(); - /* 8025C038 */ void init(); - /* 8025C32C */ ~dSvBit_childDarknessHIO_c(); -}; - -struct dSvBit_HIO_c { - /* 8025C1F8 */ void init(); - /* 8025C6FC */ ~dSvBit_HIO_c(); -}; - // // Forward References: // @@ -190,7 +73,6 @@ extern "C" void __dl__FPv(); extern "C" void __register_global_object(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; // // Declarations: @@ -288,14 +170,12 @@ SECTION_DATA extern void* __vt__29dSvBit_childSwPerfectionHIO_c[3] = { }; /* 8025BB78-8025BBAC 2564B8 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childSwPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__29dSvBit_childSwPerfectionHIO_cFv.s" +dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() { + for (int i = 0; i < 0x80; i++) { + field_0x5[i] = false; + field_0x85[i] = false; + } } -#pragma pop /* 8025BBAC-8025BC14 2564EC 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childSwPerfectionHIO_cFv */ #pragma push @@ -452,14 +332,12 @@ asm void dSvBit_childItOneZoneHIO_c::init() { #pragma pop /* 8025BF68-8025BF9C 2568A8 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childTbPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childTbPerfectionHIO_c::dSvBit_childTbPerfectionHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__29dSvBit_childTbPerfectionHIO_cFv.s" +dSvBit_childTbPerfectionHIO_c::dSvBit_childTbPerfectionHIO_c() { + for (int i = 0; i < 0x40; i++) { + field_0x5[i] = false; + field_0x45[i] = false; + } } -#pragma pop /* 8025BF9C-8025C004 2568DC 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childTbPerfectionHIO_cFv */ #pragma push @@ -547,7 +425,8 @@ asm void dSvBit_HIO_c::init() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childOtherHIO_c::~dSvBit_childOtherHIO_c() { +// asm dSvBit_childOtherHIO_c::~dSvBit_childOtherHIO_c() { +extern "C" asm void __dt__22dSvBit_childOtherHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__22dSvBit_childOtherHIO_cFv.s" } @@ -557,7 +436,8 @@ asm dSvBit_childOtherHIO_c::~dSvBit_childOtherHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childTransformHIO_c::~dSvBit_childTransformHIO_c() { +// asm dSvBit_childTransformHIO_c::~dSvBit_childTransformHIO_c() { +extern "C" asm void __dt__26dSvBit_childTransformHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__26dSvBit_childTransformHIO_cFv.s" } @@ -568,7 +448,8 @@ asm dSvBit_childTransformHIO_c::~dSvBit_childTransformHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childDarknessHIO_c::~dSvBit_childDarknessHIO_c() { +// asm dSvBit_childDarknessHIO_c::~dSvBit_childDarknessHIO_c() { +extern "C" asm void __dt__25dSvBit_childDarknessHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__25dSvBit_childDarknessHIO_cFv.s" } @@ -578,7 +459,8 @@ asm dSvBit_childDarknessHIO_c::~dSvBit_childDarknessHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childTbPerfectionHIO_c::~dSvBit_childTbPerfectionHIO_c() { +// asm dSvBit_childTbPerfectionHIO_c::~dSvBit_childTbPerfectionHIO_c() { +extern "C" asm void __dt__29dSvBit_childTbPerfectionHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__29dSvBit_childTbPerfectionHIO_cFv.s" } @@ -588,7 +470,8 @@ asm dSvBit_childTbPerfectionHIO_c::~dSvBit_childTbPerfectionHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childItOneZoneHIO_c::~dSvBit_childItOneZoneHIO_c() { +// asm dSvBit_childItOneZoneHIO_c::~dSvBit_childItOneZoneHIO_c() { +extern "C" asm void __dt__26dSvBit_childItOneZoneHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__26dSvBit_childItOneZoneHIO_cFv.s" } @@ -599,7 +482,8 @@ asm dSvBit_childItOneZoneHIO_c::~dSvBit_childItOneZoneHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childItZoneHIO_c::~dSvBit_childItZoneHIO_c() { +// asm dSvBit_childItZoneHIO_c::~dSvBit_childItZoneHIO_c() { +extern "C" asm void __dt__23dSvBit_childItZoneHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__23dSvBit_childItZoneHIO_cFv.s" } @@ -609,7 +493,8 @@ asm dSvBit_childItZoneHIO_c::~dSvBit_childItZoneHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childItDungeonHIO_c::~dSvBit_childItDungeonHIO_c() { +// asm dSvBit_childItDungeonHIO_c::~dSvBit_childItDungeonHIO_c() { +extern "C" asm void __dt__26dSvBit_childItDungeonHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__26dSvBit_childItDungeonHIO_cFv.s" } @@ -619,7 +504,8 @@ asm dSvBit_childItDungeonHIO_c::~dSvBit_childItDungeonHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childItPerfectionHIO_c::~dSvBit_childItPerfectionHIO_c() { +// asm dSvBit_childItPerfectionHIO_c::~dSvBit_childItPerfectionHIO_c() { +extern "C" asm void __dt__29dSvBit_childItPerfectionHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__29dSvBit_childItPerfectionHIO_cFv.s" } @@ -629,7 +515,8 @@ asm dSvBit_childItPerfectionHIO_c::~dSvBit_childItPerfectionHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childSwOneZoneHIO_c::~dSvBit_childSwOneZoneHIO_c() { +// asm dSvBit_childSwOneZoneHIO_c::~dSvBit_childSwOneZoneHIO_c() { +extern "C" asm void __dt__26dSvBit_childSwOneZoneHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__26dSvBit_childSwOneZoneHIO_cFv.s" } @@ -640,7 +527,8 @@ asm dSvBit_childSwOneZoneHIO_c::~dSvBit_childSwOneZoneHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childSwZoneHIO_c::~dSvBit_childSwZoneHIO_c() { +// asm dSvBit_childSwZoneHIO_c::~dSvBit_childSwZoneHIO_c() { +extern "C" asm void __dt__23dSvBit_childSwZoneHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__23dSvBit_childSwZoneHIO_cFv.s" } @@ -650,7 +538,8 @@ asm dSvBit_childSwZoneHIO_c::~dSvBit_childSwZoneHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childSwDungeonHIO_c::~dSvBit_childSwDungeonHIO_c() { +// asm dSvBit_childSwDungeonHIO_c::~dSvBit_childSwDungeonHIO_c() { +extern "C" asm void __dt__26dSvBit_childSwDungeonHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__26dSvBit_childSwDungeonHIO_cFv.s" } @@ -660,7 +549,8 @@ asm dSvBit_childSwDungeonHIO_c::~dSvBit_childSwDungeonHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childSwPerfectionHIO_c::~dSvBit_childSwPerfectionHIO_c() { +// asm dSvBit_childSwPerfectionHIO_c::~dSvBit_childSwPerfectionHIO_c() { +extern "C" asm void __dt__29dSvBit_childSwPerfectionHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__29dSvBit_childSwPerfectionHIO_cFv.s" } @@ -722,7 +612,8 @@ REGISTER_CTORS(0x8025C5FC, __sinit_d_save_HIO_cpp); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_HIO_c::~dSvBit_HIO_c() { +// asm dSvBit_HIO_c::~dSvBit_HIO_c() { +extern "C" asm void __dt__12dSvBit_HIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s" } @@ -733,7 +624,8 @@ asm dSvBit_HIO_c::~dSvBit_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childTreasureHIO_c::~dSvBit_childTreasureHIO_c() { +// asm dSvBit_childTreasureHIO_c::~dSvBit_childTreasureHIO_c() { +extern "C" asm void __dt__25dSvBit_childTreasureHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__25dSvBit_childTreasureHIO_cFv.s" } @@ -743,7 +635,8 @@ asm dSvBit_childTreasureHIO_c::~dSvBit_childTreasureHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childItemHIO_c::~dSvBit_childItemHIO_c() { +// asm dSvBit_childItemHIO_c::~dSvBit_childItemHIO_c() { +extern "C" asm void __dt__21dSvBit_childItemHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__21dSvBit_childItemHIO_cFv.s" } @@ -754,7 +647,8 @@ asm dSvBit_childItemHIO_c::~dSvBit_childItemHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dSvBit_childSwitchHIO_c::~dSvBit_childSwitchHIO_c() { +// asm dSvBit_childSwitchHIO_c::~dSvBit_childSwitchHIO_c() { +extern "C" asm void __dt__23dSvBit_childSwitchHIO_cFv() { nofralloc #include "asm/d/save/d_save_HIO/__dt__23dSvBit_childSwitchHIO_cFv.s" } diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index dc2924dfa1..08ec75cdfc 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -18,11 +18,6 @@ // Types: // -struct mDoExt_btpAnm { - /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); - /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); -}; - struct mDoExt_blkAnm { /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16); }; @@ -530,7 +525,6 @@ extern "C" void GXClearVtxDesc(); extern "C" void GXGetTexObjWidth(); extern "C" void GXGetTexObjHeight(); extern "C" void GXSetTexCoordScaleManually(); -extern "C" void GXLoadNrmMtxImm(); extern "C" void __construct_new_array(); extern "C" void _savegpr_15(); extern "C" void _savegpr_18(); @@ -632,8 +626,8 @@ asm void mDoExt_baseAnm::play() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoExt_bpkAnm::init(J3DMaterialTable* param_0, J3DAnmColor* param_1, int param_2, - int param_3, f32 param_4, s16 param_5, s16 param_6) { +asm int mDoExt_bpkAnm::init(J3DMaterialTable* param_0, J3DAnmColor* param_1, int param_2, + int param_3, f32 param_4, s16 param_5, s16 param_6) { nofralloc #include "asm/m_Do/m_Do_ext/init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss.s" } @@ -655,8 +649,8 @@ asm void mDoExt_bpkAnm::entry(J3DMaterialTable* param_0, f32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoExt_btpAnm::init(J3DMaterialTable* param_0, J3DAnmTexPattern* param_1, int param_2, - int param_3, f32 param_4, s16 param_5, s16 param_6) { +asm int mDoExt_btpAnm::init(J3DMaterialTable* param_0, J3DAnmTexPattern* param_1, int param_2, + int param_3, f32 param_4, s16 param_5, s16 param_6) { nofralloc #include "asm/m_Do/m_Do_ext/init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss.s" } @@ -678,8 +672,8 @@ asm void mDoExt_btpAnm::entry(J3DMaterialTable* param_0, s16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoExt_btkAnm::init(J3DMaterialTable* param_0, J3DAnmTextureSRTKey* param_1, int param_2, - int param_3, f32 param_4, s16 param_5, s16 param_6) { +asm int mDoExt_btkAnm::init(J3DMaterialTable* param_0, J3DAnmTextureSRTKey* param_1, int param_2, + int param_3, f32 param_4, s16 param_5, s16 param_6) { nofralloc #include "asm/m_Do/m_Do_ext/init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss.s" } @@ -701,8 +695,8 @@ asm void mDoExt_btkAnm::entry(J3DMaterialTable* param_0, f32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoExt_brkAnm::init(J3DMaterialTable* param_0, J3DAnmTevRegKey* param_1, int param_2, - int param_3, f32 param_4, s16 param_5, s16 param_6) { +asm int mDoExt_brkAnm::init(J3DMaterialTable* param_0, J3DAnmTevRegKey* param_1, int param_2, + int param_3, f32 param_4, s16 param_5, s16 param_6) { nofralloc #include "asm/m_Do/m_Do_ext/init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss.s" } @@ -1452,8 +1446,8 @@ SECTION_DATA extern void* __vt__10J3DMtxCalc[11 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoExt_bckAnm::init(J3DAnmTransform* param_0, int param_1, int param_2, f32 param_3, - s16 param_4, s16 param_5, bool param_6) { +asm int mDoExt_bckAnm::init(J3DAnmTransform* param_0, int param_1, int param_2, f32 param_3, + s16 param_4, s16 param_5, bool param_6) { nofralloc #include "asm/m_Do/m_Do_ext/init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb.s" }