diff --git a/Progress.md b/Progress.md index 9f872d05c0..16f3aa6111 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 34.306504% | 1379352 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 34.306504% | 1379352 | 4020672 -RELs | 33.426154% | 3844116 | 11500324 -Total | 33.654206% | 5223468 | 15520996 +RELs | 33.448623% | 3846700 | 11500324 +Total | 33.670855% | 5226052 | 15520996 ## RELs @@ -377,7 +377,7 @@ d_a_obj_cdoor | 40.255786% | 2644 | 6568 d_a_obj_chandelier | 36.773256% | 2024 | 5504 d_a_obj_chest | 39.833795% | 2876 | 7220 d_a_obj_cho | 33.555219% | 4436 | 13220 -d_a_obj_cowdoor | 56.672761% | 1240 | 2188 +d_a_obj_cowdoor | 100.000000% | 2188 | 2188 d_a_obj_crope | 26.014689% | 2692 | 10348 d_a_obj_crvfence | 37.146893% | 3156 | 8496 d_a_obj_crvgate | 27.603513% | 4400 | 15940 @@ -642,7 +642,7 @@ d_a_obj_thdoor | 39.419319% | 2824 | 7164 d_a_obj_timeFire | 43.483146% | 1548 | 3560 d_a_obj_timer | 46.691176% | 1016 | 2176 d_a_obj_tks | 34.669261% | 7128 | 20560 -d_a_obj_tmoon | 48.478702% | 956 | 1972 +d_a_obj_tmoon | 100.000000% | 1972 | 1972 d_a_obj_toaru_maki | 46.596067% | 1232 | 2644 d_a_obj_toby | 32.460733% | 3720 | 11460 d_a_obj_tobyhouse | 34.586466% | 3864 | 11172 @@ -750,7 +750,7 @@ d_a_tag_mwait | 35.082873% | 1016 | 2896 d_a_tag_myna2 | 47.260274% | 828 | 1752 d_a_tag_myna_light | 36.747759% | 1148 | 3124 d_a_tag_pachi | 51.107595% | 1292 | 2528 -d_a_tag_poFire | 63.270142% | 1068 | 1688 +d_a_tag_poFire | 100.000000% | 1688 | 1688 d_a_tag_push | 41.000000% | 1148 | 2800 d_a_tag_qs | 34.804270% | 1956 | 5620 d_a_tag_ret_room | 100.000000% | 1684 | 1684 @@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244 d_a_warp_bug | 54.940711% | 1112 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 33.426154% | 3844116 | 11500324 +Total | 33.448623% | 3846700 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/CreateHeap__11daCowdoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/CreateHeap__11daCowdoor_cFv.s deleted file mode 100644 index 4e0c5106c3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/CreateHeap__11daCowdoor_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80BCC8C4: -/* 80BCC8C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCC8C8 7C 08 02 A6 */ mflr r0 -/* 80BCC8CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCC8D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCC8D4 7C 7F 1B 78 */ mr r31, r3 -/* 80BCC8D8 3C 60 80 BD */ lis r3, l_arcName@ha /* 0x80BCCBDC@ha */ -/* 80BCC8DC 38 63 CB DC */ addi r3, r3, l_arcName@l /* 0x80BCCBDC@l */ -/* 80BCC8E0 80 63 00 00 */ lwz r3, 0(r3) -/* 80BCC8E4 3C 80 80 BD */ lis r4, l_bmdName@ha /* 0x80BCCBE0@ha */ -/* 80BCC8E8 38 84 CB E0 */ addi r4, r4, l_bmdName@l /* 0x80BCCBE0@l */ -/* 80BCC8EC 80 84 00 00 */ lwz r4, 0(r4) -/* 80BCC8F0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCC8F4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCC8F8 3C A5 00 02 */ addis r5, r5, 2 -/* 80BCC8FC 38 C0 00 80 */ li r6, 0x80 -/* 80BCC900 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BCC904 4B 46 FA 79 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80BCC908 3C 80 00 08 */ lis r4, 8 -/* 80BCC90C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80BCC910 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80BCC914 4B 44 83 41 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80BCC918 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80BCC91C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BCC920 30 03 FF FF */ addic r0, r3, -1 -/* 80BCC924 7C 60 19 10 */ subfe r3, r0, r3 -/* 80BCC928 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCC92C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCC930 7C 08 03 A6 */ mtlr r0 -/* 80BCC934 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCC938 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Create__11daCowdoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Create__11daCowdoor_cFv.s deleted file mode 100644 index 63ab760848..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Create__11daCowdoor_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80BCC86C: -/* 80BCC86C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCC870 7C 08 02 A6 */ mflr r0 -/* 80BCC874 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCC878 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCC87C 7C 7F 1B 78 */ mr r31, r3 -/* 80BCC880 4B FF FF 79 */ bl setBaseMtx__11daCowdoor_cFv -/* 80BCC884 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BCC888 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BCC88C 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80BCC890 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BCC894 80 83 00 04 */ lwz r4, 4(r3) -/* 80BCC898 7F E3 FB 78 */ mr r3, r31 -/* 80BCC89C 4B 44 DC DD */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80BCC8A0 3C 60 80 BD */ lis r3, lit_3648@ha /* 0x80BCCBB4@ha */ -/* 80BCC8A4 C0 03 CB B4 */ lfs f0, lit_3648@l(r3) /* 0x80BCCBB4@l */ -/* 80BCC8A8 D0 1F 05 20 */ stfs f0, 0x520(r31) -/* 80BCC8AC 38 60 00 01 */ li r3, 1 -/* 80BCC8B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCC8B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCC8B8 7C 08 03 A6 */ mtlr r0 -/* 80BCC8BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCC8C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Delete__11daCowdoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Delete__11daCowdoor_cFv.s deleted file mode 100644 index ce971c1ed2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Delete__11daCowdoor_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80BCCAEC: -/* 80BCCAEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCCAF0 7C 08 02 A6 */ mflr r0 -/* 80BCCAF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCCAF8 3C 80 80 BD */ lis r4, l_arcName@ha /* 0x80BCCBDC@ha */ -/* 80BCCAFC 38 84 CB DC */ addi r4, r4, l_arcName@l /* 0x80BCCBDC@l */ -/* 80BCCB00 80 84 00 00 */ lwz r4, 0(r4) -/* 80BCCB04 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80BCCB08 4B 46 05 01 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BCCB0C 38 60 00 01 */ li r3, 1 -/* 80BCCB10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCCB14 7C 08 03 A6 */ mtlr r0 -/* 80BCCB18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCCB1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Draw__11daCowdoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Draw__11daCowdoor_cFv.s deleted file mode 100644 index e5afa36e4b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Draw__11daCowdoor_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80BCCA48: -/* 80BCCA48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCCA4C 7C 08 02 A6 */ mflr r0 -/* 80BCCA50 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCCA54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCCA58 93 C1 00 08 */ stw r30, 8(r1) -/* 80BCCA5C 7C 7E 1B 78 */ mr r30, r3 -/* 80BCCA60 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BCCA64 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BCCA68 38 80 00 10 */ li r4, 0x10 -/* 80BCCA6C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BCCA70 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80BCCA74 4B 5D 6D 51 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BCCA78 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BCCA7C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BCCA80 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80BCCA84 80 84 00 04 */ lwz r4, 4(r4) -/* 80BCCA88 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80BCCA8C 4B 5D 83 15 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BCCA90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCCA94 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCCA98 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80BCCA9C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80BCCAA0 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80BCCAA4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BCCAA8 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80BCCAAC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BCCAB0 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BCCAB4 4B 44 12 11 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80BCCAB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCCABC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCCAC0 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80BCCAC4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BCCAC8 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80BCCACC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BCCAD0 38 60 00 01 */ li r3, 1 -/* 80BCCAD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCCAD8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BCCADC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCCAE0 7C 08 03 A6 */ mtlr r0 -/* 80BCCAE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCCAE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Execute__11daCowdoor_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Execute__11daCowdoor_cFPPA3_A4_f.s deleted file mode 100644 index ccb58a67b3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Execute__11daCowdoor_cFPPA3_A4_f.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80BCCA1C: -/* 80BCCA1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCCA20 7C 08 02 A6 */ mflr r0 -/* 80BCCA24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCCA28 38 03 05 6C */ addi r0, r3, 0x56c -/* 80BCCA2C 90 04 00 00 */ stw r0, 0(r4) -/* 80BCCA30 4B FF FD C9 */ bl setBaseMtx__11daCowdoor_cFv -/* 80BCCA34 38 60 00 01 */ li r3, 1 -/* 80BCCA38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCCA3C 7C 08 03 A6 */ mtlr r0 -/* 80BCCA40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCCA44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Create__FP10fopAc_ac_c.s deleted file mode 100644 index fa2429000a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BCCB8C: -/* 80BCCB8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCCB90 7C 08 02 A6 */ mflr r0 -/* 80BCCB94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCCB98 4B FF FD A5 */ bl create__11daCowdoor_cFv -/* 80BCCB9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCCBA0 7C 08 03 A6 */ mtlr r0 -/* 80BCCBA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCCBA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Delete__FP11daCowdoor_c.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Delete__FP11daCowdoor_c.s deleted file mode 100644 index bde7d3e45e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Delete__FP11daCowdoor_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BCCB6C: -/* 80BCCB6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCCB70 7C 08 02 A6 */ mflr r0 -/* 80BCCB74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCCB78 4B 4A BD 65 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80BCCB7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCCB80 7C 08 03 A6 */ mtlr r0 -/* 80BCCB84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCCB88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Draw__FP11daCowdoor_c.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Draw__FP11daCowdoor_c.s deleted file mode 100644 index fb9595fa30..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Draw__FP11daCowdoor_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80BCCB20: -/* 80BCCB20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCCB24 7C 08 02 A6 */ mflr r0 -/* 80BCCB28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCCB2C 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80BCCB30 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80BCCB34 7D 89 03 A6 */ mtctr r12 -/* 80BCCB38 4E 80 04 21 */ bctrl -/* 80BCCB3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCCB40 7C 08 03 A6 */ mtlr r0 -/* 80BCCB44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCCB48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Execute__FP11daCowdoor_c.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Execute__FP11daCowdoor_c.s deleted file mode 100644 index 4f8894f09c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Execute__FP11daCowdoor_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BCCB4C: -/* 80BCCB4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCCB50 7C 08 02 A6 */ mflr r0 -/* 80BCCB54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCCB58 4B 4A BD F9 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80BCCB5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCCB60 7C 08 03 A6 */ mtlr r0 -/* 80BCCB64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCCB68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/func_80BCC93C.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/func_80BCC93C.s deleted file mode 100644 index 3626be6165..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/func_80BCC93C.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80BCC93C: -/* 80BCC93C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCC940 7C 08 02 A6 */ mflr r0 -/* 80BCC944 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCC948 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCC94C 7C 7F 1B 78 */ mr r31, r3 -/* 80BCC950 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BCC954 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BCC958 40 82 00 28 */ bne lbl_80BCC980 -/* 80BCC95C 28 1F 00 00 */ cmplwi r31, 0 -/* 80BCC960 41 82 00 14 */ beq lbl_80BCC974 -/* 80BCC964 4B 4A BC C1 */ bl __ct__16dBgS_MoveBgActorFv -/* 80BCC968 3C 60 80 BD */ lis r3, __vt__11daCowdoor_c@ha /* 0x80BCCC38@ha */ -/* 80BCC96C 38 03 CC 38 */ addi r0, r3, __vt__11daCowdoor_c@l /* 0x80BCCC38@l */ -/* 80BCC970 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80BCC974: -/* 80BCC974 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80BCC978 60 00 00 08 */ ori r0, r0, 8 -/* 80BCC97C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80BCC980: -/* 80BCC980 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80BCC984 3C 80 80 BD */ lis r4, l_arcName@ha /* 0x80BCCBDC@ha */ -/* 80BCC988 38 84 CB DC */ addi r4, r4, l_arcName@l /* 0x80BCCBDC@l */ -/* 80BCC98C 80 84 00 00 */ lwz r4, 0(r4) -/* 80BCC990 4B 46 05 2D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80BCC994 7C 60 1B 78 */ mr r0, r3 -/* 80BCC998 2C 00 00 04 */ cmpwi r0, 4 -/* 80BCC99C 40 82 00 68 */ bne lbl_80BCCA04 -/* 80BCC9A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCC9A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCC9A8 3C 63 00 02 */ addis r3, r3, 2 -/* 80BCC9AC 3C 80 80 BD */ lis r4, l_arcName@ha /* 0x80BCCBDC@ha */ -/* 80BCC9B0 38 84 CB DC */ addi r4, r4, l_arcName@l /* 0x80BCCBDC@l */ -/* 80BCC9B4 80 84 00 00 */ lwz r4, 0(r4) -/* 80BCC9B8 3C A0 80 BD */ lis r5, l_dzbName@ha /* 0x80BCCBE4@ha */ -/* 80BCC9BC 38 A5 CB E4 */ addi r5, r5, l_dzbName@l /* 0x80BCCBE4@l */ -/* 80BCC9C0 80 A5 00 00 */ lwz r5, 0(r5) -/* 80BCC9C4 38 63 C2 F8 */ addi r3, r3, -15624 -/* 80BCC9C8 4B 46 FC F1 */ bl getObjectResName2Index__14dRes_control_cFPCcPCc -/* 80BCC9CC 7C 65 1B 78 */ mr r5, r3 -/* 80BCC9D0 7F E3 FB 78 */ mr r3, r31 -/* 80BCC9D4 3C 80 80 BD */ lis r4, l_arcName@ha /* 0x80BCCBDC@ha */ -/* 80BCC9D8 38 84 CB DC */ addi r4, r4, l_arcName@l /* 0x80BCCBDC@l */ -/* 80BCC9DC 80 84 00 00 */ lwz r4, 0(r4) -/* 80BCC9E0 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80BCC9E4 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80BCC9E8 38 E0 40 00 */ li r7, 0x4000 -/* 80BCC9EC 39 00 00 00 */ li r8, 0 -/* 80BCC9F0 4B 4A BD CD */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80BCC9F4 7C 60 1B 78 */ mr r0, r3 -/* 80BCC9F8 2C 00 00 05 */ cmpwi r0, 5 -/* 80BCC9FC 40 82 00 08 */ bne lbl_80BCCA04 -/* 80BCCA00 48 00 00 08 */ b lbl_80BCCA08 -lbl_80BCCA04: -/* 80BCCA04 7C 03 03 78 */ mr r3, r0 -lbl_80BCCA08: -/* 80BCCA08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCCA0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCCA10 7C 08 03 A6 */ mtlr r0 -/* 80BCCA14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCCA18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/setBaseMtx__11daCowdoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/setBaseMtx__11daCowdoor_cFv.s deleted file mode 100644 index 273129e697..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/setBaseMtx__11daCowdoor_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BCC7F8: -/* 80BCC7F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCC7FC 7C 08 02 A6 */ mflr r0 -/* 80BCC800 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCC804 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCC808 7C 7F 1B 78 */ mr r31, r3 -/* 80BCC80C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BCC810 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BCC814 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80BCC818 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80BCC81C C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80BCC820 4B 77 A0 C9 */ bl PSMTXTrans -/* 80BCC824 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BCC828 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BCC82C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80BCC830 4B 43 FC 05 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BCC834 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BCC838 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BCC83C 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80BCC840 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BCC844 4B 77 9C 6D */ bl PSMTXCopy -/* 80BCC848 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BCC84C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BCC850 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80BCC854 4B 77 9C 5D */ bl PSMTXCopy -/* 80BCC858 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCC85C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCC860 7C 08 03 A6 */ mtlr r0 -/* 80BCC864 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCC868 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 2a64947ffd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D12B98: -/* 80D12B98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12B9C 7C 08 02 A6 */ mflr r0 -/* 80D12BA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12BA4 48 00 00 F9 */ bl CreateHeap__12daObjTMoon_cFv -/* 80D12BA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12BAC 7C 08 03 A6 */ mtlr r0 -/* 80D12BB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12BB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/CreateHeap__12daObjTMoon_cFv.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/CreateHeap__12daObjTMoon_cFv.s deleted file mode 100644 index 2830e52e4d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/CreateHeap__12daObjTMoon_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80D12C9C: -/* 80D12C9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12CA0 7C 08 02 A6 */ mflr r0 -/* 80D12CA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12CA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D12CAC 7C 7F 1B 78 */ mr r31, r3 -/* 80D12CB0 3C 60 80 D1 */ lis r3, l_arcName@ha /* 0x80D12FA0@ha */ -/* 80D12CB4 38 63 2F A0 */ addi r3, r3, l_arcName@l /* 0x80D12FA0@l */ -/* 80D12CB8 80 63 00 00 */ lwz r3, 0(r3) -/* 80D12CBC 38 80 00 03 */ li r4, 3 -/* 80D12CC0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D12CC4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D12CC8 3C A5 00 02 */ addis r5, r5, 2 -/* 80D12CCC 38 C0 00 80 */ li r6, 0x80 -/* 80D12CD0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80D12CD4 4B 32 96 19 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D12CD8 3C 80 00 08 */ lis r4, 8 -/* 80D12CDC 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D12CE0 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D12CE4 4B 30 1F 71 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D12CE8 90 7F 05 70 */ stw r3, 0x570(r31) -/* 80D12CEC 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80D12CF0 30 03 FF FF */ addic r0, r3, -1 -/* 80D12CF4 7C 60 19 10 */ subfe r3, r0, r3 -/* 80D12CF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D12CFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12D00 7C 08 03 A6 */ mtlr r0 -/* 80D12D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12D08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/Create__12daObjTMoon_cFv.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/Create__12daObjTMoon_cFv.s deleted file mode 100644 index 28325b12f8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/Create__12daObjTMoon_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80D12C48: -/* 80D12C48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12C4C 7C 08 02 A6 */ mflr r0 -/* 80D12C50 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12C54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D12C58 7C 7F 1B 78 */ mr r31, r3 -/* 80D12C5C 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80D12C60 54 00 05 BE */ clrlwi r0, r0, 0x16 -/* 80D12C64 B0 03 05 74 */ sth r0, 0x574(r3) -/* 80D12C68 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80D12C6C 54 00 B5 BE */ rlwinm r0, r0, 0x16, 0x16, 0x1f -/* 80D12C70 B0 03 05 76 */ sth r0, 0x576(r3) -/* 80D12C74 4B FF FF 45 */ bl initBaseMtx__12daObjTMoon_cFv -/* 80D12C78 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80D12C7C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D12C80 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80D12C84 38 60 00 01 */ li r3, 1 -/* 80D12C88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D12C8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12C90 7C 08 03 A6 */ mtlr r0 -/* 80D12C94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12C98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/_delete__12daObjTMoon_cFv.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/_delete__12daObjTMoon_cFv.s deleted file mode 100644 index 27f5fd29cb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/_delete__12daObjTMoon_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80D12EDC: -/* 80D12EDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12EE0 7C 08 02 A6 */ mflr r0 -/* 80D12EE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12EE8 3C 80 80 D1 */ lis r4, l_arcName@ha /* 0x80D12FA0@ha */ -/* 80D12EEC 38 84 2F A0 */ addi r4, r4, l_arcName@l /* 0x80D12FA0@l */ -/* 80D12EF0 80 84 00 00 */ lwz r4, 0(r4) -/* 80D12EF4 38 63 05 68 */ addi r3, r3, 0x568 -/* 80D12EF8 4B 31 A1 11 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D12EFC 38 60 00 01 */ li r3, 1 -/* 80D12F00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12F04 7C 08 03 A6 */ mtlr r0 -/* 80D12F08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12F0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Create__FP12daObjTMoon_c.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Create__FP12daObjTMoon_c.s deleted file mode 100644 index 549cfcbd4d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Create__FP12daObjTMoon_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D12F70: -/* 80D12F70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12F74 7C 08 02 A6 */ mflr r0 -/* 80D12F78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12F7C 4B FF FD 91 */ bl create__12daObjTMoon_cFv -/* 80D12F80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12F84 7C 08 03 A6 */ mtlr r0 -/* 80D12F88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12F8C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Delete__FP12daObjTMoon_c.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Delete__FP12daObjTMoon_c.s deleted file mode 100644 index 9309c52b26..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Delete__FP12daObjTMoon_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D12F50: -/* 80D12F50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12F54 7C 08 02 A6 */ mflr r0 -/* 80D12F58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12F5C 4B FF FF 81 */ bl _delete__12daObjTMoon_cFv -/* 80D12F60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12F64 7C 08 03 A6 */ mtlr r0 -/* 80D12F68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12F6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Draw__FP12daObjTMoon_c.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Draw__FP12daObjTMoon_c.s deleted file mode 100644 index 0d45f9f1ad..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Draw__FP12daObjTMoon_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D12F10: -/* 80D12F10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12F14 7C 08 02 A6 */ mflr r0 -/* 80D12F18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12F1C 4B FF FF 99 */ bl draw__12daObjTMoon_cFv -/* 80D12F20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12F24 7C 08 03 A6 */ mtlr r0 -/* 80D12F28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12F2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Execute__FP12daObjTMoon_c.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Execute__FP12daObjTMoon_c.s deleted file mode 100644 index 800c310ccc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Execute__FP12daObjTMoon_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D12F30: -/* 80D12F30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12F34 7C 08 02 A6 */ mflr r0 -/* 80D12F38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12F3C 4B FF FE 85 */ bl execute__12daObjTMoon_cFv -/* 80D12F40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12F44 7C 08 03 A6 */ mtlr r0 -/* 80D12F48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12F4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/draw__12daObjTMoon_cFv.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/draw__12daObjTMoon_cFv.s deleted file mode 100644 index b80f264db5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/draw__12daObjTMoon_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80D12EB4: -/* 80D12EB4 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80D12EB8 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D12EBC 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 80D12EC0 D0 04 10 94 */ stfs f0, 0x1094(r4) -/* 80D12EC4 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80D12EC8 D0 04 10 98 */ stfs f0, 0x1098(r4) -/* 80D12ECC C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80D12ED0 D0 04 10 9C */ stfs f0, 0x109c(r4) -/* 80D12ED4 38 60 00 01 */ li r3, 1 -/* 80D12ED8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/execute__12daObjTMoon_cFv.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/execute__12daObjTMoon_cFv.s deleted file mode 100644 index 9f541cc044..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/execute__12daObjTMoon_cFv.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_80D12DC0: -/* 80D12DC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12DC4 7C 08 02 A6 */ mflr r0 -/* 80D12DC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12DCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D12DD0 7C 7F 1B 78 */ mr r31, r3 -/* 80D12DD4 A0 03 05 76 */ lhz r0, 0x576(r3) -/* 80D12DD8 28 00 03 FF */ cmplwi r0, 0x3ff -/* 80D12DDC 41 82 00 2C */ beq lbl_80D12E08 -/* 80D12DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D12DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D12DE8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80D12DEC 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 80D12DF0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80D12DF4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80D12DF8 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80D12DFC 4B 32 1B C1 */ bl isEventBit__11dSv_event_cCFUs -/* 80D12E00 2C 03 00 00 */ cmpwi r3, 0 -/* 80D12E04 40 82 00 38 */ bne lbl_80D12E3C -lbl_80D12E08: -/* 80D12E08 A0 1F 05 74 */ lhz r0, 0x574(r31) -/* 80D12E0C 28 00 03 FF */ cmplwi r0, 0x3ff -/* 80D12E10 41 82 00 3C */ beq lbl_80D12E4C -/* 80D12E14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D12E18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D12E1C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80D12E20 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 80D12E24 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80D12E28 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80D12E2C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80D12E30 4B 32 1B 8D */ bl isEventBit__11dSv_event_cCFUs -/* 80D12E34 2C 03 00 00 */ cmpwi r3, 0 -/* 80D12E38 40 82 00 14 */ bne lbl_80D12E4C -lbl_80D12E3C: -/* 80D12E3C 38 7F 00 D8 */ addi r3, r31, 0xd8 -/* 80D12E40 4B 30 D6 95 */ bl fopDwTg_DrawQTo__FP16create_tag_class -/* 80D12E44 38 60 00 01 */ li r3, 1 -/* 80D12E48 48 00 00 58 */ b lbl_80D12EA0 -lbl_80D12E4C: -/* 80D12E4C A0 1F 05 74 */ lhz r0, 0x574(r31) -/* 80D12E50 28 00 03 FF */ cmplwi r0, 0x3ff -/* 80D12E54 41 82 00 48 */ beq lbl_80D12E9C -/* 80D12E58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D12E5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D12E60 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80D12E64 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 80D12E68 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80D12E6C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80D12E70 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80D12E74 4B 32 1B 49 */ bl isEventBit__11dSv_event_cCFUs -/* 80D12E78 2C 03 00 00 */ cmpwi r3, 0 -/* 80D12E7C 41 82 00 20 */ beq lbl_80D12E9C -/* 80D12E80 7F E3 FB 78 */ mr r3, r31 -/* 80D12E84 4B 30 EB 7D */ bl fpcLf_GetPriority__FPC14leafdraw_class -/* 80D12E88 7C 64 07 34 */ extsh r4, r3 -/* 80D12E8C 38 7F 00 D8 */ addi r3, r31, 0xd8 -/* 80D12E90 4B 30 D6 1D */ bl fopDwTg_ToDrawQ__FP16create_tag_classi -/* 80D12E94 38 60 00 01 */ li r3, 1 -/* 80D12E98 48 00 00 08 */ b lbl_80D12EA0 -lbl_80D12E9C: -/* 80D12E9C 38 60 00 01 */ li r3, 1 -lbl_80D12EA0: -/* 80D12EA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D12EA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12EA8 7C 08 03 A6 */ mtlr r0 -/* 80D12EAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12EB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/func_80D12D0C.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/func_80D12D0C.s deleted file mode 100644 index 13c44f4765..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/func_80D12D0C.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80D12D0C: -/* 80D12D0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12D10 7C 08 02 A6 */ mflr r0 -/* 80D12D14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12D18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D12D1C 93 C1 00 08 */ stw r30, 8(r1) -/* 80D12D20 7C 7E 1B 78 */ mr r30, r3 -/* 80D12D24 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D12D28 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D12D2C 40 82 00 1C */ bne lbl_80D12D48 -/* 80D12D30 28 1E 00 00 */ cmplwi r30, 0 -/* 80D12D34 41 82 00 08 */ beq lbl_80D12D3C -/* 80D12D38 4B 30 5E 2D */ bl __ct__10fopAc_ac_cFv -lbl_80D12D3C: -/* 80D12D3C 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80D12D40 60 00 00 08 */ ori r0, r0, 8 -/* 80D12D44 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80D12D48: -/* 80D12D48 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80D12D4C 3C 80 80 D1 */ lis r4, l_arcName@ha /* 0x80D12FA0@ha */ -/* 80D12D50 38 84 2F A0 */ addi r4, r4, l_arcName@l /* 0x80D12FA0@l */ -/* 80D12D54 80 84 00 00 */ lwz r4, 0(r4) -/* 80D12D58 4B 31 A1 65 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D12D5C 7C 7F 1B 78 */ mr r31, r3 -/* 80D12D60 2C 1F 00 04 */ cmpwi r31, 4 -/* 80D12D64 40 82 00 40 */ bne lbl_80D12DA4 -/* 80D12D68 7F C3 F3 78 */ mr r3, r30 -/* 80D12D6C 3C 80 80 D1 */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x80D12B98@ha */ -/* 80D12D70 38 84 2B 98 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x80D12B98@l */ -/* 80D12D74 38 A0 08 80 */ li r5, 0x880 -/* 80D12D78 4B 30 77 39 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D12D7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D12D80 40 82 00 0C */ bne lbl_80D12D8C -/* 80D12D84 38 60 00 05 */ li r3, 5 -/* 80D12D88 48 00 00 20 */ b lbl_80D12DA8 -lbl_80D12D8C: -/* 80D12D8C 7F C3 F3 78 */ mr r3, r30 -/* 80D12D90 4B FF FE B9 */ bl Create__12daObjTMoon_cFv -/* 80D12D94 2C 03 00 00 */ cmpwi r3, 0 -/* 80D12D98 40 82 00 0C */ bne lbl_80D12DA4 -/* 80D12D9C 38 60 00 05 */ li r3, 5 -/* 80D12DA0 48 00 00 08 */ b lbl_80D12DA8 -lbl_80D12DA4: -/* 80D12DA4 7F E3 FB 78 */ mr r3, r31 -lbl_80D12DA8: -/* 80D12DA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D12DAC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D12DB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12DB4 7C 08 03 A6 */ mtlr r0 -/* 80D12DB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12DBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/initBaseMtx__12daObjTMoon_cFv.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/initBaseMtx__12daObjTMoon_cFv.s deleted file mode 100644 index bb3428b2c2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/initBaseMtx__12daObjTMoon_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D12BB8: -/* 80D12BB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12BBC 7C 08 02 A6 */ mflr r0 -/* 80D12BC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12BC4 80 83 05 70 */ lwz r4, 0x570(r3) -/* 80D12BC8 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D12BCC D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80D12BD0 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80D12BD4 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80D12BD8 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80D12BDC D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80D12BE0 48 00 00 15 */ bl setBaseMtx__12daObjTMoon_cFv -/* 80D12BE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12BE8 7C 08 03 A6 */ mtlr r0 -/* 80D12BEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12BF0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/setBaseMtx__12daObjTMoon_cFv.s b/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/setBaseMtx__12daObjTMoon_cFv.s deleted file mode 100644 index 6e6dccbde3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/setBaseMtx__12daObjTMoon_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80D12BF4: -/* 80D12BF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D12BF8 7C 08 02 A6 */ mflr r0 -/* 80D12BFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D12C00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D12C04 7C 7F 1B 78 */ mr r31, r3 -/* 80D12C08 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80D12C0C 4B 2F A1 59 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80D12C10 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D12C14 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D12C18 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80D12C1C 4B 2F 98 19 */ bl mDoMtx_YrotM__FPA4_fs -/* 80D12C20 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D12C24 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D12C28 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80D12C2C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D12C30 4B 63 38 81 */ bl PSMTXCopy -/* 80D12C34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D12C38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D12C3C 7C 08 03 A6 */ mtlr r0 -/* 80D12C40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D12C44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/Execute__13daTagPoFire_cFv.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/Execute__13daTagPoFire_cFv.s deleted file mode 100644 index 47341040fa..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/Execute__13daTagPoFire_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80D5DBF0: -/* 80D5DBF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5DBF4 7C 08 02 A6 */ mflr r0 -/* 80D5DBF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D5DBFC 88 03 05 69 */ lbz r0, 0x569(r3) -/* 80D5DC00 28 00 00 00 */ cmplwi r0, 0 -/* 80D5DC04 41 82 00 08 */ beq lbl_80D5DC0C -/* 80D5DC08 4B 2B C0 75 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_80D5DC0C: -/* 80D5DC0C 38 60 00 01 */ li r3, 1 -/* 80D5DC10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5DC14 7C 08 03 A6 */ mtlr r0 -/* 80D5DC18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D5DC1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__ct__17daTagPoFire_HIO_cFv.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__ct__17daTagPoFire_HIO_cFv.s deleted file mode 100644 index c841b3a601..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__ct__17daTagPoFire_HIO_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80D5DACC: -/* 80D5DACC 3C 80 80 D6 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80D5DDB8@ha */ -/* 80D5DAD0 38 04 DD B8 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80D5DDB8@l */ -/* 80D5DAD4 90 03 00 00 */ stw r0, 0(r3) -/* 80D5DAD8 3C 80 80 D6 */ lis r4, __vt__17daTagPoFire_HIO_c@ha /* 0x80D5DDAC@ha */ -/* 80D5DADC 38 04 DD AC */ addi r0, r4, __vt__17daTagPoFire_HIO_c@l /* 0x80D5DDAC@l */ -/* 80D5DAE0 90 03 00 00 */ stw r0, 0(r3) -/* 80D5DAE4 38 00 00 14 */ li r0, 0x14 -/* 80D5DAE8 98 03 00 04 */ stb r0, 4(r3) -/* 80D5DAEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index a1c9532f4c..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D5DAF0: -/* 80D5DAF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5DAF4 7C 08 02 A6 */ mflr r0 -/* 80D5DAF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D5DAFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D5DB00 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D5DB04 41 82 00 1C */ beq lbl_80D5DB20 -/* 80D5DB08 3C A0 80 D6 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80D5DDB8@ha */ -/* 80D5DB0C 38 05 DD B8 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80D5DDB8@l */ -/* 80D5DB10 90 1F 00 00 */ stw r0, 0(r31) -/* 80D5DB14 7C 80 07 35 */ extsh. r0, r4 -/* 80D5DB18 40 81 00 08 */ ble lbl_80D5DB20 -/* 80D5DB1C 4B 57 12 21 */ bl __dl__FPv -lbl_80D5DB20: -/* 80D5DB20 7F E3 FB 78 */ mr r3, r31 -/* 80D5DB24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D5DB28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5DB2C 7C 08 03 A6 */ mtlr r0 -/* 80D5DB30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D5DB34 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__dt__17daTagPoFire_HIO_cFv.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__dt__17daTagPoFire_HIO_cFv.s deleted file mode 100644 index 09aa4c111b..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__dt__17daTagPoFire_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80D5DCB0: -/* 80D5DCB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5DCB4 7C 08 02 A6 */ mflr r0 -/* 80D5DCB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D5DCBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D5DCC0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D5DCC4 41 82 00 30 */ beq lbl_80D5DCF4 -/* 80D5DCC8 3C 60 80 D6 */ lis r3, __vt__17daTagPoFire_HIO_c@ha /* 0x80D5DDAC@ha */ -/* 80D5DCCC 38 03 DD AC */ addi r0, r3, __vt__17daTagPoFire_HIO_c@l /* 0x80D5DDAC@l */ -/* 80D5DCD0 90 1F 00 00 */ stw r0, 0(r31) -/* 80D5DCD4 41 82 00 10 */ beq lbl_80D5DCE4 -/* 80D5DCD8 3C 60 80 D6 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80D5DDB8@ha */ -/* 80D5DCDC 38 03 DD B8 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80D5DDB8@l */ -/* 80D5DCE0 90 1F 00 00 */ stw r0, 0(r31) -lbl_80D5DCE4: -/* 80D5DCE4 7C 80 07 35 */ extsh. r0, r4 -/* 80D5DCE8 40 81 00 0C */ ble lbl_80D5DCF4 -/* 80D5DCEC 7F E3 FB 78 */ mr r3, r31 -/* 80D5DCF0 4B 57 10 4D */ bl __dl__FPv -lbl_80D5DCF4: -/* 80D5DCF4 7F E3 FB 78 */ mr r3, r31 -/* 80D5DCF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D5DCFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5DD00 7C 08 03 A6 */ mtlr r0 -/* 80D5DD04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D5DD08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__sinit_d_a_tag_poFire_cpp.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__sinit_d_a_tag_poFire_cpp.s deleted file mode 100644 index f94612c5ef..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__sinit_d_a_tag_poFire_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D5DD0C: -/* 80D5DD0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5DD10 7C 08 02 A6 */ mflr r0 -/* 80D5DD14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D5DD18 3C 60 80 D6 */ lis r3, l_HIO@ha /* 0x80D5DDDC@ha */ -/* 80D5DD1C 38 63 DD DC */ addi r3, r3, l_HIO@l /* 0x80D5DDDC@l */ -/* 80D5DD20 4B FF FD AD */ bl __ct__17daTagPoFire_HIO_cFv -/* 80D5DD24 3C 80 80 D6 */ lis r4, __dt__17daTagPoFire_HIO_cFv@ha /* 0x80D5DCB0@ha */ -/* 80D5DD28 38 84 DC B0 */ addi r4, r4, __dt__17daTagPoFire_HIO_cFv@l /* 0x80D5DCB0@l */ -/* 80D5DD2C 3C A0 80 D6 */ lis r5, lit_3617@ha /* 0x80D5DDD0@ha */ -/* 80D5DD30 38 A5 DD D0 */ addi r5, r5, lit_3617@l /* 0x80D5DDD0@l */ -/* 80D5DD34 4B FF FD 25 */ bl __register_global_object -/* 80D5DD38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5DD3C 7C 08 03 A6 */ mtlr r0 -/* 80D5DD40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D5DD44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/create__13daTagPoFire_cFv.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/create__13daTagPoFire_cFv.s deleted file mode 100644 index 89c1046485..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/create__13daTagPoFire_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80D5DB90: -/* 80D5DB90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5DB94 7C 08 02 A6 */ mflr r0 -/* 80D5DB98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D5DB9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D5DBA0 7C 7F 1B 78 */ mr r31, r3 -/* 80D5DBA4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D5DBA8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D5DBAC 40 82 00 1C */ bne lbl_80D5DBC8 -/* 80D5DBB0 28 1F 00 00 */ cmplwi r31, 0 -/* 80D5DBB4 41 82 00 08 */ beq lbl_80D5DBBC -/* 80D5DBB8 4B 2B AF AD */ bl __ct__10fopAc_ac_cFv -lbl_80D5DBBC: -/* 80D5DBBC 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D5DBC0 60 00 00 08 */ ori r0, r0, 8 -/* 80D5DBC4 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D5DBC8: -/* 80D5DBC8 38 00 00 00 */ li r0, 0 -/* 80D5DBCC 98 1F 05 69 */ stb r0, 0x569(r31) -/* 80D5DBD0 7F E3 FB 78 */ mr r3, r31 -/* 80D5DBD4 4B FF FF 65 */ bl setBaseMtx__13daTagPoFire_cFv -/* 80D5DBD8 38 60 00 04 */ li r3, 4 -/* 80D5DBDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D5DBE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5DBE4 7C 08 03 A6 */ mtlr r0 -/* 80D5DBE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D5DBEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Create__FP10fopAc_ac_c.s deleted file mode 100644 index b622d98023..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D5DC90: -/* 80D5DC90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5DC94 7C 08 02 A6 */ mflr r0 -/* 80D5DC98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D5DC9C 4B FF FE F5 */ bl create__13daTagPoFire_cFv -/* 80D5DCA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5DCA4 7C 08 03 A6 */ mtlr r0 -/* 80D5DCA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D5DCAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Delete__FP13daTagPoFire_c.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Delete__FP13daTagPoFire_c.s deleted file mode 100644 index 081717d809..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Delete__FP13daTagPoFire_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D5DC70: -/* 80D5DC70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5DC74 7C 08 02 A6 */ mflr r0 -/* 80D5DC78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D5DC7C 4B FF FF AD */ bl Delete__13daTagPoFire_cFv -/* 80D5DC80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5DC84 7C 08 03 A6 */ mtlr r0 -/* 80D5DC88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D5DC8C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Draw__FP13daTagPoFire_c.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Draw__FP13daTagPoFire_c.s deleted file mode 100644 index 89c4b56991..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Draw__FP13daTagPoFire_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D5DC30: -/* 80D5DC30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5DC34 7C 08 02 A6 */ mflr r0 -/* 80D5DC38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D5DC3C 4B FF FF E5 */ bl Draw__13daTagPoFire_cFv -/* 80D5DC40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5DC44 7C 08 03 A6 */ mtlr r0 -/* 80D5DC48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D5DC4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Execute__FP13daTagPoFire_c.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Execute__FP13daTagPoFire_c.s deleted file mode 100644 index cb2dfc3624..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Execute__FP13daTagPoFire_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D5DC50: -/* 80D5DC50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5DC54 7C 08 02 A6 */ mflr r0 -/* 80D5DC58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D5DC5C 4B FF FF 95 */ bl Execute__13daTagPoFire_cFv -/* 80D5DC60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5DC64 7C 08 03 A6 */ mtlr r0 -/* 80D5DC68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D5DC6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/setBaseMtx__13daTagPoFire_cFv.s b/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/setBaseMtx__13daTagPoFire_cFv.s deleted file mode 100644 index 8c3906878f..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/setBaseMtx__13daTagPoFire_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80D5DB38: -/* 80D5DB38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5DB3C 7C 08 02 A6 */ mflr r0 -/* 80D5DB40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D5DB44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D5DB48 7C 7F 1B 78 */ mr r31, r3 -/* 80D5DB4C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D5DB50 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D5DB54 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80D5DB58 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80D5DB5C C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80D5DB60 4B 5E 8D 89 */ bl PSMTXTrans -/* 80D5DB64 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D5DB68 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D5DB6C A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80D5DB70 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80D5DB74 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80D5DB78 4B 2A E7 29 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80D5DB7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D5DB80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5DB84 7C 08 03 A6 */ mtlr r0 -/* 80D5DB88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D5DB8C 4E 80 00 20 */ blr diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index 0335ebe8d7..9e8ca34a97 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -111,6 +111,8 @@ bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const&); bool dBgS_CheckBWallPoly(cBgS_PolyInfo const&); void dBgS_MoveBGProc_Typical(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6); +void dBgS_MoveBGProc_TypicalRotY(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, + bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6); f32 dBgS_GetNY(cBgS_PolyInfo const& poly); #endif /* D_BG_D_BG_S_H */ diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h index 3e2c20b081..c3935e8159 100644 --- a/include/d/d_gameover.h +++ b/include/d/d_gameover.h @@ -12,7 +12,6 @@ public: /* 8019AFE0 */ dGov_HIO_c(); /* 8019C06C */ virtual ~dGov_HIO_c(); - /* 0x04 */ s8 field_0x4; /* 0x08 */ f32 mScale; /* 0x0C */ f32 mAlpha; /* 0x10 */ f32 mAnimSpeed; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 6439a94ee6..2fb288504b 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -153,7 +153,7 @@ inline u32 fopAcM_GetParam(const void* pActor) { return fpcM_GetParam(pActor); } -inline u8 fopAcM_GetParamBit(void* ac, u8 shift, u8 bit) { +inline u32 fopAcM_GetParamBit(void* ac, u8 shift, u8 bit) { return (fopAcM_GetParam(ac) >> shift) & ((1 << bit) - 1); } diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index a6f72935e0..abf715f55d 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -6,6 +6,7 @@ class mDoHIO_entry_c { public: virtual ~mDoHIO_entry_c() {} + u8 unk_0x4; }; #endif /* M_DO_M_DO_HOSTIO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h b/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h index 17258c6e2c..74c53c4433 100644 --- a/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h +++ b/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h @@ -1,6 +1,22 @@ #ifndef D_A_OBJ_COWDOOR_H #define D_A_OBJ_COWDOOR_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daCowdoor_c : public dBgS_MoveBgActor { +public: + /* 80BCC7F8 */ void setBaseMtx(); + /* 80BCC86C */ int Create(); + /* 80BCC8C4 */ int CreateHeap(); + /* 80BCC93C */ int create(); + /* 80BCCA1C */ int Execute(f32 (**)[3][4]); + /* 80BCCA48 */ int Draw(); + /* 80BCCAEC */ int Delete(); + + /* 0x5A0 */ request_of_phase_process_class field_0x5a0; + /* 0x5A8 */ J3DModel* field_0x5a8; +}; // Size: 0x5AC #endif /* D_A_OBJ_COWDOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h b/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h index d92192837a..06dd387b45 100644 --- a/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h +++ b/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h @@ -1,6 +1,27 @@ #ifndef D_A_OBJ_TMOON_H #define D_A_OBJ_TMOON_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daObjTMoon_c : public fopAc_ac_c { +public: + /* 80D12BB8 */ void initBaseMtx(); + /* 80D12BF4 */ void setBaseMtx(); + /* 80D12C48 */ int Create(); + /* 80D12C9C */ bool CreateHeap(); + /* 80D12D0C */ int create(); + /* 80D12DC0 */ int execute(); + /* 80D12EB4 */ int draw(); + /* 80D12EDC */ int _delete(); + + u32 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); } + u32 getEventBit2() { return fopAcM_GetParamBit(this, 10, 10); } + + /* 0x568 */ request_of_phase_process_class field_0x568; + /* 0x570 */ J3DModel* field_0x570; + /* 0x574 */ u16 field_0x574; + /* 0x576 */ u16 field_0x576; +}; // Size: 0x578 #endif /* D_A_OBJ_TMOON_H */ diff --git a/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h b/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h index 4e6743d6f5..9f0dda433d 100644 --- a/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h +++ b/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h @@ -26,7 +26,6 @@ public: /* 80D5B2EC */ daLv6CstaSw_HIO_c(); /* 80D5B740 */ virtual ~daLv6CstaSw_HIO_c(); - /* 0x04 */ s8 field_0x4; }; #endif /* D_A_TAG_LV6CSTASW_H */ diff --git a/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h b/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h index e49a792d69..308919d430 100644 --- a/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h +++ b/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h @@ -1,6 +1,27 @@ #ifndef D_A_TAG_POFIRE_H #define D_A_TAG_POFIRE_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_hostIO.h" + +class daTagPoFire_c : public fopAc_ac_c { +public: + /* 80D5DB38 */ void setBaseMtx(); + /* 80D5DB90 */ int create(); + /* 80D5DBF0 */ int Execute(); + /* 80D5DC20 */ int Draw(); + /* 80D5DC28 */ int Delete(); + + /* 0x568 */ u8 field_0x568; + /* 0x569 */ u8 field_0x569; + /* 0x56A */ u16 field_0x56a; +}; + +class daTagPoFire_HIO_c : public mDoHIO_entry_c { +public: + /* 80D5DACC */ daTagPoFire_HIO_c(); + /* 80D5DCB0 */ virtual ~daTagPoFire_HIO_c(); +}; #endif /* D_A_TAG_POFIRE_H */ diff --git a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp index 40730ab8cd..a51dbbea03 100644 --- a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp +++ b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp @@ -129,23 +129,23 @@ static actor_method_class l_daObjBombf_Method = { /* 80BBAEC8-80BBAEF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Bombf */ extern actor_process_profile_definition g_profile_Obj_Bombf = { - -3, - 7, - -3, - PROC_Obj_Bombf, - 0, - &g_fpcLf_Method.mBase, - sizeof(daObjBombf_c), - 0, - 0, - &g_fopAc_Method.base, - 0x00FB, - 0, - 0, - &l_daObjBombf_Method, - 0x00040100, - 3, - 14, - 0, - 0, + -3, // mLayerID + 7, // mListID + -3, // mListPrio + PROC_Obj_Bombf, // mProcName + 0, // Padding + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daObjBombf_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 0x00FB, // mPriority + 0, // Padding + 0, // Padding + &l_daObjBombf_Method, // mSubMtd + 0x00040100, // mStatus + 3, // mActorType + 14, // mCullType + 0, // Padding + 0, // Padding }; diff --git a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp index 781c759f4d..9e7ebcc100 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp @@ -1,301 +1,132 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_cowdoor -// +/** + * d_a_obj_cowdoor.cpp + * Cow Door + */ #include "rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daCowdoor_c { - /* 80BCC7F8 */ void setBaseMtx(); - /* 80BCC86C */ void Create(); - /* 80BCC8C4 */ void CreateHeap(); - /* 80BCC93C */ void create(); - /* 80BCCA1C */ void Execute(f32 (**)[3][4]); - /* 80BCCA48 */ void Draw(); - /* 80BCCAEC */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -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 { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void setBaseMtx__11daCowdoor_cFv(); -extern "C" void Create__11daCowdoor_cFv(); -extern "C" void CreateHeap__11daCowdoor_cFv(); -extern "C" void create__11daCowdoor_cFv(); -extern "C" void Execute__11daCowdoor_cFPPA3_A4_f(); -extern "C" void Draw__11daCowdoor_cFv(); -extern "C" void Delete__11daCowdoor_cFv(); -extern "C" static void daCowdoor_Draw__FP11daCowdoor_c(); -extern "C" static void daCowdoor_Execute__FP11daCowdoor_c(); -extern "C" static void daCowdoor_Delete__FP11daCowdoor_c(); -extern "C" static void daCowdoor_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_obj_cowdoor__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void getObjectResName2Index__14dRes_control_cFPCcPCc(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; - -// -// Declarations: -// /* 80BCC7F8-80BCC86C 000078 0074+00 2/2 0/0 0/0 .text setBaseMtx__11daCowdoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daCowdoor_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/setBaseMtx__11daCowdoor_cFv.s" +void daCowdoor_c::setBaseMtx() { + PSMTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + PSMTXCopy(mDoMtx_stack_c::now, field_0x5a8->mBaseTransformMtx); + PSMTXCopy(mDoMtx_stack_c::now, field_0x56c); } -#pragma pop - -/* ############################################################################################## */ -/* 80BCCBB4-80BCCBB8 000000 0004+00 1/1 0/0 0/0 .rodata @3648 */ -SECTION_RODATA static f32 const lit_3648 = 5.0f; -COMPILER_STRIP_GATE(0x80BCCBB4, &lit_3648); /* 80BCC86C-80BCC8C4 0000EC 0058+00 1/0 0/0 0/0 .text Create__11daCowdoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daCowdoor_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Create__11daCowdoor_cFv.s" +int daCowdoor_c::Create() { + setBaseMtx(); + mCullMtx = field_0x5a8->mBaseTransformMtx; + fopAcM_setCullSizeBox2(this, field_0x5a8->getModelData()); + mCullSizeFar = 5.0f; + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BCCBB8-80BCCBB8 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BCCBB8 = "A_UHDoor"; -SECTION_DEAD static char const* const stringBase_80BCCBC1 = "A_UHDoor.bmd"; -#pragma pop /* 80BCCBDC-80BCCBE0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_cowdoor__stringBase0; +static const char* l_arcName = "A_UHDoor"; /* 80BCCBE0-80BCCBE4 -00001 0004+00 1/1 0/0 0/0 .data l_bmdName */ -SECTION_DATA static void* l_bmdName = (void*)(((char*)&d_a_obj_cowdoor__stringBase0) + 0x9); +static const char* l_bmdName = "A_UHDoor.bmd"; /* 80BCC8C4-80BCC93C 000144 0078+00 1/0 0/0 0/0 .text CreateHeap__11daCowdoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daCowdoor_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/CreateHeap__11daCowdoor_cFv.s" +int daCowdoor_c::CreateHeap() { + field_0x5a8 = mDoExt_J3DModel__create( + (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdName), 0x80000, 0x11000084); + return (field_0x5a8 != NULL) ? 1 : 0; } -#pragma pop - -/* ############################################################################################## */ -/* 80BCCBB8-80BCCBB8 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BCCBCE = "A_UHDoor.dzb"; -#pragma pop /* 80BCCBE4-80BCCBE8 -00001 0004+00 1/1 0/0 0/0 .data l_dzbName */ -SECTION_DATA static void* l_dzbName = (void*)(((char*)&d_a_obj_cowdoor__stringBase0) + 0x16); - -/* 80BCCBE8-80BCCC08 -00001 0020+00 1/0 0/0 0/0 .data l_daCowdoor_Method */ -SECTION_DATA static void* l_daCowdoor_Method[8] = { - (void*)daCowdoor_Create__FP10fopAc_ac_c, - (void*)daCowdoor_Delete__FP11daCowdoor_c, - (void*)daCowdoor_Execute__FP11daCowdoor_c, - (void*)NULL, - (void*)daCowdoor_Draw__FP11daCowdoor_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80BCCC08-80BCCC38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Cowdoor */ -SECTION_DATA extern void* g_profile_Obj_Cowdoor[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x005D0000, (void*)&g_fpcLf_Method, - (void*)0x000005AC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01BF0000, (void*)&l_daCowdoor_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80BCCC38-80BCCC60 00005C 0028+00 1/1 0/0 0/0 .data __vt__11daCowdoor_c */ -SECTION_DATA extern void* __vt__11daCowdoor_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__11daCowdoor_cFv, - (void*)Create__11daCowdoor_cFv, - (void*)Execute__11daCowdoor_cFPPA3_A4_f, - (void*)Draw__11daCowdoor_cFv, - (void*)Delete__11daCowdoor_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; +static const char* l_dzbName = "A_UHDoor.dzb"; /* 80BCC93C-80BCCA1C 0001BC 00E0+00 1/1 0/0 0/0 .text create__11daCowdoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daCowdoor_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/func_80BCC93C.s" +int daCowdoor_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daCowdoor_c(); + fopAcM_OnCondition(this, 8); + } + int phase = dComIfG_resLoad(&field_0x5a0, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + phase = + MoveBGCreate(l_arcName, dComIfG_getObjctResName2Index(l_arcName, l_dzbName), + dBgS_MoveBGProc_TypicalRotY, 0x4000, NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + return phase; } -#pragma pop /* 80BCCA1C-80BCCA48 00029C 002C+00 1/0 0/0 0/0 .text Execute__11daCowdoor_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daCowdoor_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Execute__11daCowdoor_cFPPA3_A4_f.s" +int daCowdoor_c::Execute(f32 (**param_0)[3][4]) { + *param_0 = &field_0x56c; + setBaseMtx(); + return 1; } -#pragma pop /* 80BCCA48-80BCCAEC 0002C8 00A4+00 1/0 0/0 0/0 .text Draw__11daCowdoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daCowdoor_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Draw__11daCowdoor_cFv.s" +int daCowdoor_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(field_0x5a8->mModelData, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(field_0x5a8); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80BCCAEC-80BCCB20 00036C 0034+00 1/0 0/0 0/0 .text Delete__11daCowdoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daCowdoor_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/Delete__11daCowdoor_cFv.s" +int daCowdoor_c::Delete() { + dComIfG_resDelete(&field_0x5a0, l_arcName); + return 1; } -#pragma pop /* 80BCCB20-80BCCB4C 0003A0 002C+00 1/0 0/0 0/0 .text daCowdoor_Draw__FP11daCowdoor_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daCowdoor_Draw(daCowdoor_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Draw__FP11daCowdoor_c.s" +static int daCowdoor_Draw(daCowdoor_c* i_this) { + return static_cast(i_this)->Draw(); } -#pragma pop /* 80BCCB4C-80BCCB6C 0003CC 0020+00 1/0 0/0 0/0 .text daCowdoor_Execute__FP11daCowdoor_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daCowdoor_Execute(daCowdoor_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Execute__FP11daCowdoor_c.s" +static int daCowdoor_Execute(daCowdoor_c* i_this) { + return static_cast(i_this)->MoveBGExecute(); } -#pragma pop /* 80BCCB6C-80BCCB8C 0003EC 0020+00 1/0 0/0 0/0 .text daCowdoor_Delete__FP11daCowdoor_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daCowdoor_Delete(daCowdoor_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Delete__FP11daCowdoor_c.s" +static int daCowdoor_Delete(daCowdoor_c* i_this) { + return static_cast(i_this)->MoveBGDelete(); } -#pragma pop /* 80BCCB8C-80BCCBAC 00040C 0020+00 1/0 0/0 0/0 .text daCowdoor_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daCowdoor_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor/daCowdoor_Create__FP10fopAc_ac_c.s" +static int daCowdoor_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* 80BCCBB8-80BCCBB8 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80BCCBE8-80BCCC08 -00001 0020+00 1/0 0/0 0/0 .data l_daCowdoor_Method */ +static actor_method_class l_daCowdoor_Method = { + (process_method_func)daCowdoor_Create, (process_method_func)daCowdoor_Delete, + (process_method_func)daCowdoor_Execute, (process_method_func)NULL, + (process_method_func)daCowdoor_Draw, +}; + +/* 80BCCC08-80BCCC38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Cowdoor */ +extern actor_process_profile_definition g_profile_Obj_Cowdoor = { + -3, // mLayerID + 3, // mListID + -3, // mListPrio + PROC_Obj_Cowdoor, // mProcName + 0, // Padding + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daCowdoor_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 0x01BF, // mPriority + 0, // Padding + 0, // Padding + &l_daCowdoor_Method, // mSubMtd + 0x00040100, // mStatus + 0, // mActorType + 14, // mCullType + 0, // Padding + 0, // Padding +}; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp index 6083fd64af..7824cd6a73 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp +++ b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp @@ -1,273 +1,140 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_tmoon -// +/** + * d_a_obj_tmoon.cpp + * Moon in Hidden Skill Scene + */ #include "rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct leafdraw_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjTMoon_c { - /* 80D12BB8 */ void initBaseMtx(); - /* 80D12BF4 */ void setBaseMtx(); - /* 80D12C48 */ void Create(); - /* 80D12C9C */ void CreateHeap(); - /* 80D12D0C */ void create(); - /* 80D12DC0 */ void execute(); - /* 80D12EB4 */ void draw(); - /* 80D12EDC */ void _delete(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct create_tag_class {}; - -struct J3DModelData {}; - -// -// Forward References: -// - -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" void initBaseMtx__12daObjTMoon_cFv(); -extern "C" void setBaseMtx__12daObjTMoon_cFv(); -extern "C" void Create__12daObjTMoon_cFv(); -extern "C" void CreateHeap__12daObjTMoon_cFv(); -extern "C" void create__12daObjTMoon_cFv(); -extern "C" void execute__12daObjTMoon_cFv(); -extern "C" void draw__12daObjTMoon_cFv(); -extern "C" void _delete__12daObjTMoon_cFv(); -extern "C" static void daObjTMoon_Draw__FP12daObjTMoon_c(); -extern "C" static void daObjTMoon_Execute__FP12daObjTMoon_c(); -extern "C" static void daObjTMoon_Delete__FP12daObjTMoon_c(); -extern "C" static void daObjTMoon_Create__FP12daObjTMoon_c(); -extern "C" extern char const* const d_a_obj_tmoon__stringBase0; -extern "C" extern void* g_profile_Obj_TMoon[12]; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopDwTg_ToDrawQ__FP16create_tag_classi(); -extern "C" void fopDwTg_DrawQTo__FP16create_tag_class(); -extern "C" void fpcLf_GetPriority__FPC14leafdraw_class(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void PSMTXCopy(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; - -// -// Declarations: -// /* 80D12B98-80D12BB8 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void CheckCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/CheckCreateHeap__FP10fopAc_ac_c.s" +static bool CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 80D12BB8-80D12BF4 000098 003C+00 1/1 0/0 0/0 .text initBaseMtx__12daObjTMoon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTMoon_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/initBaseMtx__12daObjTMoon_cFv.s" +void daObjTMoon_c::initBaseMtx() { + field_0x570->setBaseScale(mScale); + setBaseMtx(); } -#pragma pop /* 80D12BF4-80D12C48 0000D4 0054+00 1/1 0/0 0/0 .text setBaseMtx__12daObjTMoon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTMoon_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/setBaseMtx__12daObjTMoon_cFv.s" +void daObjTMoon_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + PSMTXCopy(mDoMtx_stack_c::now, field_0x570->mBaseTransformMtx); } -#pragma pop /* 80D12C48-80D12C9C 000128 0054+00 1/1 0/0 0/0 .text Create__12daObjTMoon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTMoon_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/Create__12daObjTMoon_cFv.s" +int daObjTMoon_c::Create() { + field_0x574 = getEventBit1(); + field_0x576 = getEventBit2(); + initBaseMtx(); + fopAcM_SetMtx(this, field_0x570->getBaseTRMtx()); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80D12F98-80D12F98 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D12F98 = "A_TMoon"; -#pragma pop /* 80D12FA0-80D12FA4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_tmoon__stringBase0; +static const char* l_arcName = "A_TMoon"; /* 80D12C9C-80D12D0C 00017C 0070+00 1/1 0/0 0/0 .text CreateHeap__12daObjTMoon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTMoon_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/CreateHeap__12daObjTMoon_cFv.s" +bool daObjTMoon_c::CreateHeap() { + field_0x570 = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, 3), + 0x80000, 0x11000084); + return field_0x570 != NULL; } -#pragma pop /* 80D12D0C-80D12DC0 0001EC 00B4+00 1/1 0/0 0/0 .text create__12daObjTMoon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTMoon_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/func_80D12D0C.s" +int daObjTMoon_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daObjTMoon_c(); + fopAcM_OnCondition(this, 8); + } + int phase = dComIfG_resLoad(&field_0x568, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckCreateHeap, 0x880)) { + return cPhs_ERROR_e; + } else if (!Create()) { + return cPhs_ERROR_e; + } + } + return phase; } -#pragma pop /* 80D12DC0-80D12EB4 0002A0 00F4+00 1/1 0/0 0/0 .text execute__12daObjTMoon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTMoon_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/execute__12daObjTMoon_cFv.s" +int daObjTMoon_c::execute() { + if ((field_0x576 != 0x3ff) && + (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x576])) || + (field_0x574 != 0x3ff) && + (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x574]))) + { + fopDwTg_DrawQTo(&mDwTg); + return 1; + } else if ((field_0x574 != 0x3ff) && + (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x574]))) + { + fopDwTg_ToDrawQ(&mDwTg, fpcLf_GetPriority(this)); + return 1; + } + return 1; } -#pragma pop /* 80D12EB4-80D12EDC 000394 0028+00 1/1 0/0 0/0 .text draw__12daObjTMoon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTMoon_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/draw__12daObjTMoon_cFv.s" +int daObjTMoon_c::draw() { + g_env_light.mMoonPos = current.pos; + return 1; } -#pragma pop /* 80D12EDC-80D12F10 0003BC 0034+00 1/1 0/0 0/0 .text _delete__12daObjTMoon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTMoon_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/_delete__12daObjTMoon_cFv.s" +int daObjTMoon_c::_delete() { + dComIfG_resDelete(&field_0x568, l_arcName); + return 1; } -#pragma pop -/* 80D12F10-80D12F30 0003F0 0020+00 1/0 0/0 0/0 .text daObjTMoon_Draw__FP12daObjTMoon_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjTMoon_Draw(daObjTMoon_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Draw__FP12daObjTMoon_c.s" +/* 80D12F10-80D12F30 0003F0 0020+00 1/0 0/0 0/0 .text daObjTMoon_Draw__FP12daObjTMoon_c */ +static int daObjTMoon_Draw(daObjTMoon_c* i_this) { + return i_this->draw(); } -#pragma pop /* 80D12F30-80D12F50 000410 0020+00 1/0 0/0 0/0 .text daObjTMoon_Execute__FP12daObjTMoon_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjTMoon_Execute(daObjTMoon_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Execute__FP12daObjTMoon_c.s" +static int daObjTMoon_Execute(daObjTMoon_c* i_this) { + return i_this->execute(); } -#pragma pop -/* 80D12F50-80D12F70 000430 0020+00 1/0 0/0 0/0 .text daObjTMoon_Delete__FP12daObjTMoon_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjTMoon_Delete(daObjTMoon_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Delete__FP12daObjTMoon_c.s" +/* 80D12F50-80D12F70 000430 0020+00 1/0 0/0 0/0 .text daObjTMoon_Delete__FP12daObjTMoon_c */ +static int daObjTMoon_Delete(daObjTMoon_c* i_this) { + return i_this->_delete(); } -#pragma pop -/* 80D12F70-80D12F90 000450 0020+00 1/0 0/0 0/0 .text daObjTMoon_Create__FP12daObjTMoon_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjTMoon_Create(daObjTMoon_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon/daObjTMoon_Create__FP12daObjTMoon_c.s" +/* 80D12F70-80D12F90 000450 0020+00 1/0 0/0 0/0 .text daObjTMoon_Create__FP12daObjTMoon_c */ +static int daObjTMoon_Create(daObjTMoon_c* i_this) { + return i_this->create(); } -#pragma pop -/* ############################################################################################## */ /* 80D12FA4-80D12FC4 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTMoon_Method */ -SECTION_DATA static void* l_daObjTMoon_Method[8] = { - (void*)daObjTMoon_Create__FP12daObjTMoon_c, - (void*)daObjTMoon_Delete__FP12daObjTMoon_c, - (void*)daObjTMoon_Execute__FP12daObjTMoon_c, - (void*)NULL, - (void*)daObjTMoon_Draw__FP12daObjTMoon_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjTMoon_Method = { + (process_method_func)daObjTMoon_Create, (process_method_func)daObjTMoon_Delete, + (process_method_func)daObjTMoon_Execute, (process_method_func)NULL, + (process_method_func)daObjTMoon_Draw, }; /* 80D12FC4-80D12FF4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TMoon */ -SECTION_DATA extern void* g_profile_Obj_TMoon[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01950000, (void*)&g_fpcLf_Method, - (void*)0x00000578, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02390000, (void*)&l_daObjTMoon_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_TMoon = { + -3, // mLayerID + 7, // mListID + -3, // mListPrio + PROC_Obj_TMoon, // mProcName + 0, // Padding + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daObjTMoon_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 0x0239, // mPriority + 0, // Padding + 0, // Padding + &l_daObjTMoon_Method, // mSubMtd + 0x00040000, // mStatus + 0, // mActorType + 14, // mCullType + 0, // Padding + 0, // Padding }; - -/* 80D12F98-80D12F98 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp index 9b1942f0d3..a679220474 100644 --- a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp @@ -7,7 +7,7 @@ /* 80D5B2EC-80D5B310 0000EC 0024+00 1/1 0/0 0/0 .text __ct__17daLv6CstaSw_HIO_cFv */ daLv6CstaSw_HIO_c::daLv6CstaSw_HIO_c() { - field_0x4 = 0; + unk_0x4 = 0; } /* 80D5B358-80D5B3B0 000158 0058+00 1/1 0/0 0/0 .text setBaseMtx__13daLv6CstaSw_cFv */ diff --git a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp index 8eb96eb88b..8f80310218 100644 --- a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp +++ b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp @@ -1,244 +1,107 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_tag_poFire -// +/** + * d_a_tag_poFire.cpp + * Tag - Poe Fire + */ #include "rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D5DAF0 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daTagPoFire_c { - /* 80D5DB38 */ void setBaseMtx(); - /* 80D5DB90 */ void create(); - /* 80D5DBF0 */ void Execute(); - /* 80D5DC20 */ bool Draw(); - /* 80D5DC28 */ bool Delete(); -}; - -struct daTagPoFire_HIO_c { - /* 80D5DACC */ daTagPoFire_HIO_c(); - /* 80D5DCB0 */ ~daTagPoFire_HIO_c(); -}; - -// -// Forward References: -// - -extern "C" void __ct__17daTagPoFire_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__13daTagPoFire_cFv(); -extern "C" void create__13daTagPoFire_cFv(); -extern "C" void Execute__13daTagPoFire_cFv(); -extern "C" bool Draw__13daTagPoFire_cFv(); -extern "C" bool Delete__13daTagPoFire_cFv(); -extern "C" static void daTagPoFire_Draw__FP13daTagPoFire_c(); -extern "C" static void daTagPoFire_Execute__FP13daTagPoFire_c(); -extern "C" static void daTagPoFire_Delete__FP13daTagPoFire_c(); -extern "C" static void daTagPoFire_Create__FP10fopAc_ac_c(); -extern "C" void __dt__17daTagPoFire_HIO_cFv(); -extern "C" void __sinit_d_a_tag_poFire_cpp(); - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D5DD5C-80D5DD7C -00001 0020+00 1/0 0/0 0/0 .data l_daTagPoFire_Method */ -SECTION_DATA static void* l_daTagPoFire_Method[8] = { - (void*)daTagPoFire_Create__FP10fopAc_ac_c, - (void*)daTagPoFire_Delete__FP13daTagPoFire_c, - (void*)daTagPoFire_Execute__FP13daTagPoFire_c, - (void*)NULL, - (void*)daTagPoFire_Draw__FP13daTagPoFire_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D5DD7C-80D5DDAC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_poFire */ -SECTION_DATA extern void* g_profile_Tag_poFire[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x017A0000, (void*)&g_fpcLf_Method, - (void*)0x0000056C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02890000, (void*)&l_daTagPoFire_Method, - (void*)0x00044000, (void*)0x000E0000, -}; - -/* 80D5DDAC-80D5DDB8 000050 000C+00 2/2 0/0 0/0 .data __vt__17daTagPoFire_HIO_c */ -SECTION_DATA extern void* __vt__17daTagPoFire_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17daTagPoFire_HIO_cFv, -}; - -/* 80D5DDB8-80D5DDC4 00005C 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; /* 80D5DACC-80D5DAF0 0000EC 0024+00 1/1 0/0 0/0 .text __ct__17daTagPoFire_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daTagPoFire_HIO_c::daTagPoFire_HIO_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__ct__17daTagPoFire_HIO_cFv.s" +daTagPoFire_HIO_c::daTagPoFire_HIO_c() { + unk_0x4 = 0x14; } -#pragma pop - -/* 80D5DAF0-80D5DB38 000110 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop /* 80D5DB38-80D5DB90 000158 0058+00 1/1 0/0 0/0 .text setBaseMtx__13daTagPoFire_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagPoFire_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/setBaseMtx__13daTagPoFire_cFv.s" +void daTagPoFire_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); } -#pragma pop /* 80D5DB90-80D5DBF0 0001B0 0060+00 1/1 0/0 0/0 .text create__13daTagPoFire_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagPoFire_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/create__13daTagPoFire_cFv.s" +int daTagPoFire_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daTagPoFire_c(); + fopAcM_OnCondition(this, 8); + } + field_0x569 = 0; + setBaseMtx(); + return cPhs_COMPLEATE_e; } -#pragma pop /* 80D5DBF0-80D5DC20 000210 0030+00 1/1 0/0 0/0 .text Execute__13daTagPoFire_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagPoFire_c::Execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/Execute__13daTagPoFire_cFv.s" +int daTagPoFire_c::Execute() { + if (field_0x569) { + fopAcM_delete(this); + } + return 1; } -#pragma pop /* 80D5DC20-80D5DC28 000240 0008+00 1/1 0/0 0/0 .text Draw__13daTagPoFire_cFv */ -bool daTagPoFire_c::Draw() { - return true; +int daTagPoFire_c::Draw() { + return 1; } /* 80D5DC28-80D5DC30 000248 0008+00 1/1 0/0 0/0 .text Delete__13daTagPoFire_cFv */ -bool daTagPoFire_c::Delete() { - return true; +int daTagPoFire_c::Delete() { + return 1; } /* 80D5DC30-80D5DC50 000250 0020+00 1/0 0/0 0/0 .text daTagPoFire_Draw__FP13daTagPoFire_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagPoFire_Draw(daTagPoFire_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Draw__FP13daTagPoFire_c.s" +static int daTagPoFire_Draw(daTagPoFire_c* i_this) { + return i_this->Draw(); } -#pragma pop /* 80D5DC50-80D5DC70 000270 0020+00 1/0 0/0 0/0 .text daTagPoFire_Execute__FP13daTagPoFire_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagPoFire_Execute(daTagPoFire_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Execute__FP13daTagPoFire_c.s" +static int daTagPoFire_Execute(daTagPoFire_c* i_this) { + return i_this->Execute(); } -#pragma pop /* 80D5DC70-80D5DC90 000290 0020+00 1/0 0/0 0/0 .text daTagPoFire_Delete__FP13daTagPoFire_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagPoFire_Delete(daTagPoFire_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Delete__FP13daTagPoFire_c.s" +static int daTagPoFire_Delete(daTagPoFire_c* i_this) { + return i_this->Delete(); } -#pragma pop /* 80D5DC90-80D5DCB0 0002B0 0020+00 1/0 0/0 0/0 .text daTagPoFire_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagPoFire_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/daTagPoFire_Create__FP10fopAc_ac_c.s" +static int daTagPoFire_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 80D5DCB0-80D5DD0C 0002D0 005C+00 2/1 0/0 0/0 .text __dt__17daTagPoFire_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daTagPoFire_HIO_c::~daTagPoFire_HIO_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__dt__17daTagPoFire_HIO_cFv.s" -} -#pragma pop +daTagPoFire_HIO_c::~daTagPoFire_HIO_c() {} -/* ############################################################################################## */ /* 80D5DDD0-80D5DDDC 000008 000C+00 1/1 0/0 0/0 .bss @3617 */ static u8 lit_3617[12]; /* 80D5DDDC-80D5DDE4 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; +static daTagPoFire_HIO_c l_HIO; -/* 80D5DD0C-80D5DD48 00032C 003C+00 0/0 1/0 0/0 .text __sinit_d_a_tag_poFire_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_tag_poFire_cpp() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire/__sinit_d_a_tag_poFire_cpp.s" -} -#pragma pop +/* 80D5DD5C-80D5DD7C -00001 0020+00 1/0 0/0 0/0 .data l_daTagPoFire_Method */ +static actor_method_class l_daTagPoFire_Method = { + (process_method_func)daTagPoFire_Create, (process_method_func)daTagPoFire_Delete, + (process_method_func)daTagPoFire_Execute, (process_method_func)NULL, + (process_method_func)daTagPoFire_Draw, +}; -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80D5DD0C, __sinit_d_a_tag_poFire_cpp); -#pragma pop +/* 80D5DD7C-80D5DDAC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_poFire */ +extern actor_process_profile_definition g_profile_Tag_poFire = { + -3, // mLayerID + 7, // mListID + -3, // mListPrio + PROC_Tag_poFire, // mProcName + 0, // Padding + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daTagPoFire_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 0x0289, // mPriority + 0, // Padding + 0, // Padding + &l_daTagPoFire_Method, // mSubMtd + 0x00044000, // mStatus + 0, // mActorType + 14, // mCullType + 0, // Padding + 0, // Padding +};