From b8988116132d84aa58d9a3b95a1ba65f79032790 Mon Sep 17 00:00:00 2001 From: Trueffel <106771418+Trueffeloot@users.noreply.github.com> Date: Wed, 26 Jul 2023 06:45:38 +0200 Subject: [PATCH] Izumi_gate+vground (#391) * d_a_izumi_gate & d_a_obj_vground OK * license agreement * prevent merging conflict * optimization based on review --- Progress.md | 16 +- .../CreateHeap__13daIzumiGate_cFv.s | 31 -- .../Create__13daIzumiGate_cFv.s | 10 - .../Delete__13daIzumiGate_cFv.s | 14 - .../d_a_izumi_gate/Draw__13daIzumiGate_cFv.s | 42 -- .../Execute__13daIzumiGate_cFPPA3_A4_f.s | 12 - .../daIzumiGate_Create__FP10fopAc_ac_c.s | 60 --- .../daIzumiGate_Delete__FP13daIzumiGate_c.s | 10 - .../daIzumiGate_Draw__FP13daIzumiGate_c.s | 12 - .../daIzumiGate_Execute__FP13daIzumiGate_c.s | 9 - .../initBaseMtx__13daIzumiGate_cFv.s | 9 - .../setBaseMtx__13daIzumiGate_cFv.s | 22 - .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../CreateHeap__11daObjVGnd_cFv.s | 116 ----- .../d_a_obj_vground/Create__11daObjVGnd_cFv.s | 22 - .../d_a_obj_vground/__dt__12J3DFrameCtrlFv.s | 20 - .../_delete__11daObjVGnd_cFv.s | 14 - .../daObjVGnd_Create__FP10fopAc_ac_c.s | 9 - .../daObjVGnd_Delete__FP11daObjVGnd_c.s | 9 - .../daObjVGnd_Draw__FP11daObjVGnd_c.s | 9 - .../daObjVGnd_Execute__FP11daObjVGnd_c.s | 9 - .../d_a_obj_vground/draw__11daObjVGnd_cFv.s | 54 --- .../execute__11daObjVGnd_cFv.s | 56 --- .../d_a_obj_vground/func_80D216F4.s | 51 --- .../initBaseMtx__11daObjVGnd_cFv.s | 21 - .../setBaseMtx__11daObjVGnd_cFv.s | 26 -- include/d/bg/d_bg_s_movebg_actor.h | 2 +- include/d/menu/d_menu_ring.h | 2 +- .../rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h | 20 +- .../d/a/obj/d_a_obj_vground/d_a_obj_vground.h | 22 +- rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp | 339 ++++---------- .../a/obj/d_a_obj_vground/d_a_obj_vground.cpp | 426 +++++------------- src/d/bg/d_bg_s_movebg_actor.cpp | 2 +- 33 files changed, 252 insertions(+), 1233 deletions(-) delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/CreateHeap__13daIzumiGate_cFv.s delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Create__13daIzumiGate_cFv.s delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Delete__13daIzumiGate_cFv.s delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Draw__13daIzumiGate_cFv.s delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Execute__13daIzumiGate_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Delete__FP13daIzumiGate_c.s delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Draw__FP13daIzumiGate_c.s delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Execute__FP13daIzumiGate_c.s delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/initBaseMtx__13daIzumiGate_cFv.s delete mode 100644 asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/setBaseMtx__13daIzumiGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/CreateHeap__11daObjVGnd_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/Create__11daObjVGnd_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/_delete__11daObjVGnd_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Delete__FP11daObjVGnd_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Draw__FP11daObjVGnd_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Execute__FP11daObjVGnd_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/draw__11daObjVGnd_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/execute__11daObjVGnd_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/func_80D216F4.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/initBaseMtx__11daObjVGnd_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/setBaseMtx__11daObjVGnd_cFv.s diff --git a/Progress.md b/Progress.md index 3311b04148e..13168fece6d 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 37.234870% | 1497092 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 37.234870% | 1497092 | 4020672 -RELs | 33.954487% | 3904876 | 11500324 -Total | 34.804261% | 5401968 | 15520996 +RELs | 34.025372% | 3913028 | 11500324 +Total | 34.856784% | 5410120 | 15520996 ## RELs @@ -189,7 +189,7 @@ d_a_guard_mng | 100.000000% | 1504 | 1504 d_a_hitobj | 100.000000% | 1640 | 1640 d_a_horse | 22.301298% | 15668 | 70256 d_a_hozelda | 28.805621% | 4920 | 17080 -d_a_izumi_gate | 57.729941% | 1180 | 2044 +d_a_izumi_gate | 100.000000% | 2044 | 2044 d_a_kago | 24.588671% | 15124 | 61508 d_a_kytag00 | 33.522084% | 2368 | 7064 d_a_kytag01 | 35.156250% | 1260 | 3584 @@ -390,7 +390,7 @@ d_a_obj_cwall | 30.455195% | 5968 | 19596 d_a_obj_damCps | 100.000000% | 504 | 504 d_a_obj_dan | 35.198921% | 4176 | 11864 d_a_obj_digholl | 100.000000% | 2272 | 2272 -d_a_obj_digplace | 35.129068% | 1252 | 3564 +d_a_obj_digplace | 100.000000% | 3564 | 3564 d_a_obj_digsnow | 44.813278% | 2160 | 4820 d_a_obj_dmelevator | 35.600390% | 4376 | 12292 d_a_obj_drop | 30.227416% | 3828 | 12664 @@ -601,7 +601,7 @@ d_a_obj_smgdoor | 41.383095% | 3016 | 7288 d_a_obj_smoke | 100.000000% | 1512 | 1512 d_a_obj_smtile | 35.912938% | 2376 | 6616 d_a_obj_smw_stone | 40.435606% | 1708 | 4224 -d_a_obj_snowEffTag | 46.419098% | 1400 | 3016 +d_a_obj_snowEffTag | 100.000000% | 3016 | 3016 d_a_obj_snow_soup | 37.025948% | 1484 | 4008 d_a_obj_so | 31.698636% | 6412 | 20228 d_a_obj_spinLift | 41.107692% | 2672 | 6500 @@ -655,7 +655,7 @@ d_a_obj_treesh | 48.098664% | 1872 | 3892 d_a_obj_twGate | 57.395498% | 2856 | 4976 d_a_obj_udoor | 49.156627% | 1632 | 3320 d_a_obj_usaku | 55.081301% | 1084 | 1968 -d_a_obj_vground | 44.817927% | 1280 | 2856 +d_a_obj_vground | 100.000000% | 2856 | 2856 d_a_obj_volcball | 50.478183% | 6756 | 13384 d_a_obj_volcbom | 32.897713% | 5236 | 15916 d_a_obj_warp_kbrg | 34.066524% | 5080 | 14912 @@ -737,7 +737,7 @@ d_a_tag_kago_fall | 34.469328% | 1416 | 4108 d_a_tag_kmsg | 32.037997% | 1484 | 4632 d_a_tag_lantern | 100.000000% | 2384 | 2384 d_a_tag_lightball | 46.212121% | 976 | 2112 -d_a_tag_lv2prchk | 35.734870% | 992 | 2776 +d_a_tag_lv2prchk | 100.000000% | 2776 | 2776 d_a_tag_lv5soup | 100.000000% | 1908 | 1908 d_a_tag_lv6CstaSw | 100.000000% | 2560 | 2560 d_a_tag_magne | 100.000000% | 928 | 928 @@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 33.954487% | 3904876 | 11500324 +Total | 34.025372% | 3913028 | 11500324 diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/CreateHeap__13daIzumiGate_cFv.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/CreateHeap__13daIzumiGate_cFv.s deleted file mode 100644 index 8162cdb6681..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/CreateHeap__13daIzumiGate_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80849260: -/* 80849260 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80849264 7C 08 02 A6 */ mflr r0 -/* 80849268 90 01 00 14 */ stw r0, 0x14(r1) -/* 8084926C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80849270 7C 7F 1B 78 */ mr r31, r3 -/* 80849274 3C 60 80 85 */ lis r3, l_arcName@ha /* 0x80849438@ha */ -/* 80849278 38 63 94 38 */ addi r3, r3, l_arcName@l /* 0x80849438@l */ -/* 8084927C 80 63 00 00 */ lwz r3, 0(r3) -/* 80849280 3C 80 80 85 */ lis r4, d_a_izumi_gate__stringBase0@ha /* 0x80849408@ha */ -/* 80849284 38 84 94 08 */ addi r4, r4, d_a_izumi_gate__stringBase0@l /* 0x80849408@l */ -/* 80849288 38 84 00 1C */ addi r4, r4, 0x1c -/* 8084928C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80849290 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80849294 3C A5 00 02 */ addis r5, r5, 2 -/* 80849298 38 C0 00 80 */ li r6, 0x80 -/* 8084929C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 808492A0 4B 7F 30 DD */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 808492A4 3C 80 00 08 */ lis r4, 8 -/* 808492A8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 808492AC 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 808492B0 4B 7C B9 A5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 808492B4 90 7F 05 A0 */ stw r3, 0x5a0(r31) -/* 808492B8 80 7F 05 A0 */ lwz r3, 0x5a0(r31) -/* 808492BC 30 03 FF FF */ addic r0, r3, -1 -/* 808492C0 7C 60 19 10 */ subfe r3, r0, r3 -/* 808492C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808492C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808492CC 7C 08 03 A6 */ mtlr r0 -/* 808492D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 808492D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Create__13daIzumiGate_cFv.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Create__13daIzumiGate_cFv.s deleted file mode 100644 index 200e75c556d..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Create__13daIzumiGate_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_808492D8: -/* 808492D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808492DC 7C 08 02 A6 */ mflr r0 -/* 808492E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 808492E4 4B FF FD B5 */ bl initBaseMtx__13daIzumiGate_cFv -/* 808492E8 38 60 00 04 */ li r3, 4 -/* 808492EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808492F0 7C 08 03 A6 */ mtlr r0 -/* 808492F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 808492F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Delete__13daIzumiGate_cFv.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Delete__13daIzumiGate_cFv.s deleted file mode 100644 index ba278ffb10f..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Delete__13daIzumiGate_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_808493CC: -/* 808493CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808493D0 7C 08 02 A6 */ mflr r0 -/* 808493D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 808493D8 3C 80 80 85 */ lis r4, l_arcName@ha /* 0x80849438@ha */ -/* 808493DC 38 84 94 38 */ addi r4, r4, l_arcName@l /* 0x80849438@l */ -/* 808493E0 80 84 00 00 */ lwz r4, 0(r4) -/* 808493E4 38 63 05 A4 */ addi r3, r3, 0x5a4 -/* 808493E8 4B 7E 3C 21 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 808493EC 38 60 00 01 */ li r3, 1 -/* 808493F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808493F4 7C 08 03 A6 */ mtlr r0 -/* 808493F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 808493FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Draw__13daIzumiGate_cFv.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Draw__13daIzumiGate_cFv.s deleted file mode 100644 index e8f98bb9682..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Draw__13daIzumiGate_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80849328: -/* 80849328 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8084932C 7C 08 02 A6 */ mflr r0 -/* 80849330 90 01 00 14 */ stw r0, 0x14(r1) -/* 80849334 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80849338 93 C1 00 08 */ stw r30, 8(r1) -/* 8084933C 7C 7E 1B 78 */ mr r30, r3 -/* 80849340 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80849344 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80849348 38 80 00 10 */ li r4, 0x10 -/* 8084934C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80849350 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80849354 4B 95 A4 71 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80849358 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8084935C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80849360 80 9E 05 A0 */ lwz r4, 0x5a0(r30) -/* 80849364 80 84 00 04 */ lwz r4, 4(r4) -/* 80849368 38 BE 01 0C */ addi r5, r30, 0x10c -/* 8084936C 4B 95 BA 35 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80849370 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80849374 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80849378 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 8084937C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80849380 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80849384 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80849388 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 8084938C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80849390 80 7E 05 A0 */ lwz r3, 0x5a0(r30) -/* 80849394 4B 7C 49 31 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80849398 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8084939C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 808493A0 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 808493A4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 808493A8 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 808493AC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 808493B0 38 60 00 01 */ li r3, 1 -/* 808493B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808493B8 83 C1 00 08 */ lwz r30, 8(r1) -/* 808493BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808493C0 7C 08 03 A6 */ mtlr r0 -/* 808493C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 808493C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Execute__13daIzumiGate_cFPPA3_A4_f.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Execute__13daIzumiGate_cFPPA3_A4_f.s deleted file mode 100644 index a5a59f96a48..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Execute__13daIzumiGate_cFPPA3_A4_f.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_808492FC: -/* 808492FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80849300 7C 08 02 A6 */ mflr r0 -/* 80849304 90 01 00 14 */ stw r0, 0x14(r1) -/* 80849308 38 03 05 6C */ addi r0, r3, 0x56c -/* 8084930C 90 04 00 00 */ stw r0, 0(r4) -/* 80849310 4B FF FD A9 */ bl setBaseMtx__13daIzumiGate_cFv -/* 80849314 38 60 00 01 */ li r3, 1 -/* 80849318 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8084931C 7C 08 03 A6 */ mtlr r0 -/* 80849320 38 21 00 10 */ addi r1, r1, 0x10 -/* 80849324 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Create__FP10fopAc_ac_c.s deleted file mode 100644 index f9a491d7f2c..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80849184: -/* 80849184 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80849188 7C 08 02 A6 */ mflr r0 -/* 8084918C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80849190 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80849194 7C 7F 1B 78 */ mr r31, r3 -/* 80849198 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8084919C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 808491A0 40 82 00 28 */ bne lbl_808491C8 -/* 808491A4 28 1F 00 00 */ cmplwi r31, 0 -/* 808491A8 41 82 00 14 */ beq lbl_808491BC -/* 808491AC 4B 82 F4 79 */ bl __ct__16dBgS_MoveBgActorFv -/* 808491B0 3C 60 80 85 */ lis r3, __vt__13daIzumiGate_c@ha /* 0x8084948C@ha */ -/* 808491B4 38 03 94 8C */ addi r0, r3, __vt__13daIzumiGate_c@l /* 0x8084948C@l */ -/* 808491B8 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_808491BC: -/* 808491BC 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 808491C0 60 00 00 08 */ ori r0, r0, 8 -/* 808491C4 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_808491C8: -/* 808491C8 38 7F 05 A4 */ addi r3, r31, 0x5a4 -/* 808491CC 3C 80 80 85 */ lis r4, l_arcName@ha /* 0x80849438@ha */ -/* 808491D0 38 84 94 38 */ addi r4, r4, l_arcName@l /* 0x80849438@l */ -/* 808491D4 80 84 00 00 */ lwz r4, 0(r4) -/* 808491D8 4B 7E 3C E5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 808491DC 2C 03 00 04 */ cmpwi r3, 4 -/* 808491E0 40 82 00 6C */ bne lbl_8084924C -/* 808491E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 808491E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 808491EC 3C 63 00 02 */ addis r3, r3, 2 -/* 808491F0 3C 80 80 85 */ lis r4, l_arcName@ha /* 0x80849438@ha */ -/* 808491F4 38 84 94 38 */ addi r4, r4, l_arcName@l /* 0x80849438@l */ -/* 808491F8 80 84 00 00 */ lwz r4, 0(r4) -/* 808491FC 3C A0 80 85 */ lis r5, d_a_izumi_gate__stringBase0@ha /* 0x80849408@ha */ -/* 80849200 38 A5 94 08 */ addi r5, r5, d_a_izumi_gate__stringBase0@l /* 0x80849408@l */ -/* 80849204 38 A5 00 0A */ addi r5, r5, 0xa -/* 80849208 38 63 C2 F8 */ addi r3, r3, -15624 -/* 8084920C 4B 7F 34 AD */ bl getObjectResName2Index__14dRes_control_cFPCcPCc -/* 80849210 7C 65 1B 78 */ mr r5, r3 -/* 80849214 7F E3 FB 78 */ mr r3, r31 -/* 80849218 3C 80 80 85 */ lis r4, l_arcName@ha /* 0x80849438@ha */ -/* 8084921C 38 84 94 38 */ addi r4, r4, l_arcName@l /* 0x80849438@l */ -/* 80849220 80 84 00 00 */ lwz r4, 0(r4) -/* 80849224 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80849228 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 8084922C 38 E0 40 00 */ li r7, 0x4000 -/* 80849230 39 00 00 00 */ li r8, 0 -/* 80849234 4B 82 F5 89 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80849238 2C 03 00 05 */ cmpwi r3, 5 -/* 8084923C 40 82 00 08 */ bne lbl_80849244 -/* 80849240 48 00 00 0C */ b lbl_8084924C -lbl_80849244: -/* 80849244 38 1F 05 6C */ addi r0, r31, 0x56c -/* 80849248 90 1F 05 04 */ stw r0, 0x504(r31) -lbl_8084924C: -/* 8084924C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80849250 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80849254 7C 08 03 A6 */ mtlr r0 -/* 80849258 38 21 00 10 */ addi r1, r1, 0x10 -/* 8084925C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Delete__FP13daIzumiGate_c.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Delete__FP13daIzumiGate_c.s deleted file mode 100644 index da9db3c0ceb..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Delete__FP13daIzumiGate_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80849160: -/* 80849160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80849164 7C 08 02 A6 */ mflr r0 -/* 80849168 90 01 00 14 */ stw r0, 0x14(r1) -/* 8084916C 4B 82 F7 71 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80849170 38 60 00 01 */ li r3, 1 -/* 80849174 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80849178 7C 08 03 A6 */ mtlr r0 -/* 8084917C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80849180 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Draw__FP13daIzumiGate_c.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Draw__FP13daIzumiGate_c.s deleted file mode 100644 index 6ab06cced24..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Draw__FP13daIzumiGate_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8084910C: -/* 8084910C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80849110 7C 08 02 A6 */ mflr r0 -/* 80849114 90 01 00 14 */ stw r0, 0x14(r1) -/* 80849118 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 8084911C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80849120 7D 89 03 A6 */ mtctr r12 -/* 80849124 4E 80 04 21 */ bctrl -/* 80849128 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8084912C 7C 08 03 A6 */ mtlr r0 -/* 80849130 38 21 00 10 */ addi r1, r1, 0x10 -/* 80849134 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Execute__FP13daIzumiGate_c.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Execute__FP13daIzumiGate_c.s deleted file mode 100644 index af3eaf6351f..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Execute__FP13daIzumiGate_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80849138: -/* 80849138 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8084913C 7C 08 02 A6 */ mflr r0 -/* 80849140 90 01 00 14 */ stw r0, 0x14(r1) -/* 80849144 4B 82 F8 0D */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80849148 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8084914C 7C 08 03 A6 */ mtlr r0 -/* 80849150 38 21 00 10 */ addi r1, r1, 0x10 -/* 80849154 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/initBaseMtx__13daIzumiGate_cFv.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/initBaseMtx__13daIzumiGate_cFv.s deleted file mode 100644 index 8bd9edbaa4c..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/initBaseMtx__13daIzumiGate_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80849098: -/* 80849098 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8084909C 7C 08 02 A6 */ mflr r0 -/* 808490A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 808490A4 48 00 00 15 */ bl setBaseMtx__13daIzumiGate_cFv -/* 808490A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808490AC 7C 08 03 A6 */ mtlr r0 -/* 808490B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 808490B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/setBaseMtx__13daIzumiGate_cFv.s b/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/setBaseMtx__13daIzumiGate_cFv.s deleted file mode 100644 index c3c9a2eb759..00000000000 --- a/asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/setBaseMtx__13daIzumiGate_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_808490B8: -/* 808490B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808490BC 7C 08 02 A6 */ mflr r0 -/* 808490C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 808490C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 808490C8 7C 7F 1B 78 */ mr r31, r3 -/* 808490CC 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 808490D0 4B 7C 3C 95 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 808490D4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 808490D8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 808490DC 38 9F 05 6C */ addi r4, r31, 0x56c -/* 808490E0 4B AF D3 D1 */ bl PSMTXCopy -/* 808490E4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 808490E8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 808490EC 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 808490F0 38 84 00 24 */ addi r4, r4, 0x24 -/* 808490F4 4B AF D3 BD */ bl PSMTXCopy -/* 808490F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808490FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80849100 7C 08 03 A6 */ mtlr r0 -/* 80849104 38 21 00 10 */ addi r1, r1, 0x10 -/* 80849108 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 90a68723549..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D213D8: -/* 80D213D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D213DC 7C 08 02 A6 */ mflr r0 -/* 80D213E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D213E4 48 00 01 1D */ bl CreateHeap__11daObjVGnd_cFv -/* 80D213E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D213EC 7C 08 03 A6 */ mtlr r0 -/* 80D213F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D213F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/CreateHeap__11daObjVGnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/CreateHeap__11daObjVGnd_cFv.s deleted file mode 100644 index 1eea9827a65..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/CreateHeap__11daObjVGnd_cFv.s +++ /dev/null @@ -1,116 +0,0 @@ -lbl_80D21500: -/* 80D21500 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D21504 7C 08 02 A6 */ mflr r0 -/* 80D21508 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D2150C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D21510 4B 64 0C C5 */ bl _savegpr_27 -/* 80D21514 7C 7E 1B 78 */ mr r30, r3 -/* 80D21518 3C 60 80 D2 */ lis r3, l_arcName@ha /* 0x80D21A24@ha */ -/* 80D2151C 38 63 1A 24 */ addi r3, r3, l_arcName@l /* 0x80D21A24@l */ -/* 80D21520 80 63 00 00 */ lwz r3, 0(r3) -/* 80D21524 38 80 00 05 */ li r4, 5 -/* 80D21528 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D2152C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D21530 3F 85 00 02 */ addis r28, r5, 2 -/* 80D21534 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 80D21538 7F 85 E3 78 */ mr r5, r28 -/* 80D2153C 38 C0 00 80 */ li r6, 0x80 -/* 80D21540 4B 31 AD AD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D21544 7C 7F 1B 78 */ mr r31, r3 -/* 80D21548 3C 80 00 08 */ lis r4, 8 -/* 80D2154C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 80D21550 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 80D21554 4B 2F 37 01 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D21558 90 7E 05 70 */ stw r3, 0x570(r30) -/* 80D2155C 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 80D21560 28 00 00 00 */ cmplwi r0, 0 -/* 80D21564 40 82 00 0C */ bne lbl_80D21570 -/* 80D21568 38 60 00 00 */ li r3, 0 -/* 80D2156C 48 00 01 28 */ b lbl_80D21694 -lbl_80D21570: -/* 80D21570 3C 60 80 D2 */ lis r3, l_arcName@ha /* 0x80D21A24@ha */ -/* 80D21574 38 63 1A 24 */ addi r3, r3, l_arcName@l /* 0x80D21A24@l */ -/* 80D21578 80 63 00 00 */ lwz r3, 0(r3) -/* 80D2157C 38 80 00 0B */ li r4, 0xb -/* 80D21580 7F 85 E3 78 */ mr r5, r28 -/* 80D21584 38 C0 00 80 */ li r6, 0x80 -/* 80D21588 4B 31 AD 65 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D2158C 7C 7B 1B 78 */ mr r27, r3 -/* 80D21590 38 60 00 18 */ li r3, 0x18 -/* 80D21594 4B 5A D6 B9 */ bl __nw__FUl -/* 80D21598 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80D2159C 41 82 00 20 */ beq lbl_80D215BC -/* 80D215A0 3C 80 80 D2 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80D21A78@ha */ -/* 80D215A4 38 04 1A 78 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80D21A78@l */ -/* 80D215A8 90 1D 00 00 */ stw r0, 0(r29) -/* 80D215AC 38 80 00 00 */ li r4, 0 -/* 80D215B0 4B 60 6E 4D */ bl init__12J3DFrameCtrlFs -/* 80D215B4 38 00 00 00 */ li r0, 0 -/* 80D215B8 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80D215BC: -/* 80D215BC 93 BE 05 74 */ stw r29, 0x574(r30) -/* 80D215C0 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80D215C4 28 03 00 00 */ cmplwi r3, 0 -/* 80D215C8 41 82 00 30 */ beq lbl_80D215F8 -/* 80D215CC 38 9F 00 58 */ addi r4, r31, 0x58 -/* 80D215D0 7F 65 DB 78 */ mr r5, r27 -/* 80D215D4 38 C0 00 01 */ li r6, 1 -/* 80D215D8 38 E0 00 00 */ li r7, 0 -/* 80D215DC 3D 00 80 D2 */ lis r8, lit_3704@ha /* 0x80D21A0C@ha */ -/* 80D215E0 C0 28 1A 0C */ lfs f1, lit_3704@l(r8) /* 0x80D21A0C@l */ -/* 80D215E4 39 00 00 00 */ li r8, 0 -/* 80D215E8 39 20 FF FF */ li r9, -1 -/* 80D215EC 4B 2E C0 51 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80D215F0 2C 03 00 00 */ cmpwi r3, 0 -/* 80D215F4 40 82 00 0C */ bne lbl_80D21600 -lbl_80D215F8: -/* 80D215F8 38 60 00 00 */ li r3, 0 -/* 80D215FC 48 00 00 98 */ b lbl_80D21694 -lbl_80D21600: -/* 80D21600 3C 60 80 D2 */ lis r3, l_arcName@ha /* 0x80D21A24@ha */ -/* 80D21604 38 63 1A 24 */ addi r3, r3, l_arcName@l /* 0x80D21A24@l */ -/* 80D21608 80 63 00 00 */ lwz r3, 0(r3) -/* 80D2160C 38 80 00 08 */ li r4, 8 -/* 80D21610 7F 85 E3 78 */ mr r5, r28 -/* 80D21614 38 C0 00 80 */ li r6, 0x80 -/* 80D21618 4B 31 AC D5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D2161C 7C 7B 1B 78 */ mr r27, r3 -/* 80D21620 38 60 00 18 */ li r3, 0x18 -/* 80D21624 4B 5A D6 29 */ bl __nw__FUl -/* 80D21628 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80D2162C 41 82 00 20 */ beq lbl_80D2164C -/* 80D21630 3C 80 80 D2 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80D21A78@ha */ -/* 80D21634 38 04 1A 78 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80D21A78@l */ -/* 80D21638 90 1D 00 00 */ stw r0, 0(r29) -/* 80D2163C 38 80 00 00 */ li r4, 0 -/* 80D21640 4B 60 6D BD */ bl init__12J3DFrameCtrlFs -/* 80D21644 38 00 00 00 */ li r0, 0 -/* 80D21648 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80D2164C: -/* 80D2164C 93 BE 05 78 */ stw r29, 0x578(r30) -/* 80D21650 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D21654 28 03 00 00 */ cmplwi r3, 0 -/* 80D21658 41 82 00 30 */ beq lbl_80D21688 -/* 80D2165C 38 9F 00 58 */ addi r4, r31, 0x58 -/* 80D21660 7F 65 DB 78 */ mr r5, r27 -/* 80D21664 38 C0 00 01 */ li r6, 1 -/* 80D21668 38 E0 00 00 */ li r7, 0 -/* 80D2166C 3D 00 80 D2 */ lis r8, lit_3704@ha /* 0x80D21A0C@ha */ -/* 80D21670 C0 28 1A 0C */ lfs f1, lit_3704@l(r8) /* 0x80D21A0C@l */ -/* 80D21674 39 00 00 00 */ li r8, 0 -/* 80D21678 39 20 FF FF */ li r9, -1 -/* 80D2167C 4B 2E C0 91 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80D21680 2C 03 00 00 */ cmpwi r3, 0 -/* 80D21684 40 82 00 0C */ bne lbl_80D21690 -lbl_80D21688: -/* 80D21688 38 60 00 00 */ li r3, 0 -/* 80D2168C 48 00 00 08 */ b lbl_80D21694 -lbl_80D21690: -/* 80D21690 38 60 00 01 */ li r3, 1 -lbl_80D21694: -/* 80D21694 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D21698 4B 64 0B 89 */ bl _restgpr_27 -/* 80D2169C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D216A0 7C 08 03 A6 */ mtlr r0 -/* 80D216A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D216A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/Create__11daObjVGnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/Create__11daObjVGnd_cFv.s deleted file mode 100644 index 9edfa083691..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/Create__11daObjVGnd_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80D214AC: -/* 80D214AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D214B0 7C 08 02 A6 */ mflr r0 -/* 80D214B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D214B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D214BC 7C 7F 1B 78 */ mr r31, r3 -/* 80D214C0 4B FF FF 39 */ bl initBaseMtx__11daObjVGnd_cFv -/* 80D214C4 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80D214C8 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D214CC 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80D214D0 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80D214D4 80 83 00 04 */ lwz r4, 4(r3) -/* 80D214D8 7F E3 FB 78 */ mr r3, r31 -/* 80D214DC 4B 2F 90 9D */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80D214E0 7F E3 FB 78 */ mr r3, r31 -/* 80D214E4 48 00 02 C5 */ bl execute__11daObjVGnd_cFv -/* 80D214E8 38 60 00 01 */ li r3, 1 -/* 80D214EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D214F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D214F4 7C 08 03 A6 */ mtlr r0 -/* 80D214F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D214FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index f4b0676684d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D216AC: -/* 80D216AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D216B0 7C 08 02 A6 */ mflr r0 -/* 80D216B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D216B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D216BC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D216C0 41 82 00 1C */ beq lbl_80D216DC -/* 80D216C4 3C A0 80 D2 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80D21A78@ha */ -/* 80D216C8 38 05 1A 78 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80D21A78@l */ -/* 80D216CC 90 1F 00 00 */ stw r0, 0(r31) -/* 80D216D0 7C 80 07 35 */ extsh. r0, r4 -/* 80D216D4 40 81 00 08 */ ble lbl_80D216DC -/* 80D216D8 4B 5A D6 65 */ bl __dl__FPv -lbl_80D216DC: -/* 80D216DC 7F E3 FB 78 */ mr r3, r31 -/* 80D216E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D216E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D216E8 7C 08 03 A6 */ mtlr r0 -/* 80D216EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D216F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/_delete__11daObjVGnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/_delete__11daObjVGnd_cFv.s deleted file mode 100644 index 41c51cb5b79..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/_delete__11daObjVGnd_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80D2194C: -/* 80D2194C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D21950 7C 08 02 A6 */ mflr r0 -/* 80D21954 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D21958 3C 80 80 D2 */ lis r4, l_arcName@ha /* 0x80D21A24@ha */ -/* 80D2195C 38 84 1A 24 */ addi r4, r4, l_arcName@l /* 0x80D21A24@l */ -/* 80D21960 80 84 00 00 */ lwz r4, 0(r4) -/* 80D21964 38 63 05 68 */ addi r3, r3, 0x568 -/* 80D21968 4B 30 B6 A1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D2196C 38 60 00 01 */ li r3, 1 -/* 80D21970 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D21974 7C 08 03 A6 */ mtlr r0 -/* 80D21978 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D2197C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 34fa8af665f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D219E0: -/* 80D219E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D219E4 7C 08 02 A6 */ mflr r0 -/* 80D219E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D219EC 4B FF FD 09 */ bl create__11daObjVGnd_cFv -/* 80D219F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D219F4 7C 08 03 A6 */ mtlr r0 -/* 80D219F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D219FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Delete__FP11daObjVGnd_c.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Delete__FP11daObjVGnd_c.s deleted file mode 100644 index 4938c136546..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Delete__FP11daObjVGnd_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D219C0: -/* 80D219C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D219C4 7C 08 02 A6 */ mflr r0 -/* 80D219C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D219CC 4B FF FF 81 */ bl _delete__11daObjVGnd_cFv -/* 80D219D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D219D4 7C 08 03 A6 */ mtlr r0 -/* 80D219D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D219DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Draw__FP11daObjVGnd_c.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Draw__FP11daObjVGnd_c.s deleted file mode 100644 index dcc8eec7ee8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Draw__FP11daObjVGnd_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D21980: -/* 80D21980 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D21984 7C 08 02 A6 */ mflr r0 -/* 80D21988 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D2198C 4B FF FE ED */ bl draw__11daObjVGnd_cFv -/* 80D21990 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D21994 7C 08 03 A6 */ mtlr r0 -/* 80D21998 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D2199C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Execute__FP11daObjVGnd_c.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Execute__FP11daObjVGnd_c.s deleted file mode 100644 index b9464474b18..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Execute__FP11daObjVGnd_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D219A0: -/* 80D219A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D219A4 7C 08 02 A6 */ mflr r0 -/* 80D219A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D219AC 4B FF FD FD */ bl execute__11daObjVGnd_cFv -/* 80D219B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D219B4 7C 08 03 A6 */ mtlr r0 -/* 80D219B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D219BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/draw__11daObjVGnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/draw__11daObjVGnd_cFv.s deleted file mode 100644 index 2e9b9caf9a4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/draw__11daObjVGnd_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80D21878: -/* 80D21878 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D2187C 7C 08 02 A6 */ mflr r0 -/* 80D21880 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D21884 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D21888 93 C1 00 08 */ stw r30, 8(r1) -/* 80D2188C 7C 7E 1B 78 */ mr r30, r3 -/* 80D21890 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D21894 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D21898 38 80 00 10 */ li r4, 0x10 -/* 80D2189C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80D218A0 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80D218A4 4B 48 1F 21 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D218A8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D218AC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D218B0 80 9E 05 70 */ lwz r4, 0x570(r30) -/* 80D218B4 80 84 00 04 */ lwz r4, 4(r4) -/* 80D218B8 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80D218BC 4B 48 34 E5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D218C0 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80D218C4 80 83 00 04 */ lwz r4, 4(r3) -/* 80D218C8 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D218CC C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80D218D0 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D218D4 4B 2E BE D5 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80D218D8 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80D218DC 80 83 00 04 */ lwz r4, 4(r3) -/* 80D218E0 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80D218E4 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80D218E8 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D218EC 4B 2E BD ED */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80D218F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D218F4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D218F8 80 04 5F 78 */ lwz r0, 0x5f78(r4) -/* 80D218FC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80D21900 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80D21904 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80D21908 80 04 5F 7C */ lwz r0, 0x5f7c(r4) -/* 80D2190C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80D21910 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80D21914 4B 2E C3 B1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D21918 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D2191C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D21920 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80D21924 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80D21928 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80D2192C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80D21930 38 60 00 01 */ li r3, 1 -/* 80D21934 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D21938 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D2193C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D21940 7C 08 03 A6 */ mtlr r0 -/* 80D21944 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D21948 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/execute__11daObjVGnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/execute__11daObjVGnd_cFv.s deleted file mode 100644 index de2d4bdcd71..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/execute__11daObjVGnd_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_80D217A8: -/* 80D217A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D217AC 7C 08 02 A6 */ mflr r0 -/* 80D217B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D217B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D217B8 93 C1 00 08 */ stw r30, 8(r1) -/* 80D217BC 7C 7F 1B 78 */ mr r31, r3 -/* 80D217C0 3C 60 80 D2 */ lis r3, lit_3630@ha /* 0x80D21A08@ha */ -/* 80D217C4 3B C3 1A 08 */ addi r30, r3, lit_3630@l /* 0x80D21A08@l */ -/* 80D217C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D217CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D217D0 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80D217D4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80D217D8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80D217DC A0 84 00 82 */ lhz r4, 0x82(r4) -/* 80D217E0 4B 31 31 DD */ bl isEventBit__11dSv_event_cCFUs -/* 80D217E4 2C 03 00 00 */ cmpwi r3, 0 -/* 80D217E8 41 82 00 1C */ beq lbl_80D21804 -/* 80D217EC C0 1E 00 08 */ lfs f0, 8(r30) -/* 80D217F0 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80D217F4 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80D217F8 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D217FC D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80D21800 48 00 00 54 */ b lbl_80D21854 -lbl_80D21804: -/* 80D21804 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D21808 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D2180C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D21810 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80D21814 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80D21818 7C 05 07 74 */ extsb r5, r0 -/* 80D2181C 4B 31 3B 45 */ bl isSwitch__10dSv_info_cCFii -/* 80D21820 2C 03 00 00 */ cmpwi r3, 0 -/* 80D21824 41 82 00 1C */ beq lbl_80D21840 -/* 80D21828 C0 1E 00 04 */ lfs f0, 4(r30) -/* 80D2182C 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80D21830 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80D21834 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D21838 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80D2183C 48 00 00 18 */ b lbl_80D21854 -lbl_80D21840: -/* 80D21840 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 80D21844 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80D21848 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80D2184C 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D21850 D0 03 00 10 */ stfs f0, 0x10(r3) -lbl_80D21854: -/* 80D21854 7F E3 FB 78 */ mr r3, r31 -/* 80D21858 4B FF FB F1 */ bl setBaseMtx__11daObjVGnd_cFv -/* 80D2185C 38 60 00 01 */ li r3, 1 -/* 80D21860 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D21864 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D21868 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D2186C 7C 08 03 A6 */ mtlr r0 -/* 80D21870 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D21874 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/func_80D216F4.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/func_80D216F4.s deleted file mode 100644 index 7c74e366673..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/func_80D216F4.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80D216F4: -/* 80D216F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D216F8 7C 08 02 A6 */ mflr r0 -/* 80D216FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D21700 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D21704 93 C1 00 08 */ stw r30, 8(r1) -/* 80D21708 7C 7E 1B 78 */ mr r30, r3 -/* 80D2170C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D21710 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D21714 40 82 00 1C */ bne lbl_80D21730 -/* 80D21718 28 1E 00 00 */ cmplwi r30, 0 -/* 80D2171C 41 82 00 08 */ beq lbl_80D21724 -/* 80D21720 4B 2F 74 45 */ bl __ct__10fopAc_ac_cFv -lbl_80D21724: -/* 80D21724 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80D21728 60 00 00 08 */ ori r0, r0, 8 -/* 80D2172C 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80D21730: -/* 80D21730 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80D21734 3C 80 80 D2 */ lis r4, l_arcName@ha /* 0x80D21A24@ha */ -/* 80D21738 38 84 1A 24 */ addi r4, r4, l_arcName@l /* 0x80D21A24@l */ -/* 80D2173C 80 84 00 00 */ lwz r4, 0(r4) -/* 80D21740 4B 30 B7 7D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D21744 7C 7F 1B 78 */ mr r31, r3 -/* 80D21748 2C 1F 00 04 */ cmpwi r31, 4 -/* 80D2174C 40 82 00 40 */ bne lbl_80D2178C -/* 80D21750 7F C3 F3 78 */ mr r3, r30 -/* 80D21754 3C 80 80 D2 */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x80D213D8@ha */ -/* 80D21758 38 84 13 D8 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x80D213D8@l */ -/* 80D2175C 38 A0 09 60 */ li r5, 0x960 -/* 80D21760 4B 2F 8D 51 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D21764 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D21768 40 82 00 0C */ bne lbl_80D21774 -/* 80D2176C 38 60 00 05 */ li r3, 5 -/* 80D21770 48 00 00 20 */ b lbl_80D21790 -lbl_80D21774: -/* 80D21774 7F C3 F3 78 */ mr r3, r30 -/* 80D21778 4B FF FD 35 */ bl Create__11daObjVGnd_cFv -/* 80D2177C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D21780 40 82 00 0C */ bne lbl_80D2178C -/* 80D21784 38 60 00 05 */ li r3, 5 -/* 80D21788 48 00 00 08 */ b lbl_80D21790 -lbl_80D2178C: -/* 80D2178C 7F E3 FB 78 */ mr r3, r31 -lbl_80D21790: -/* 80D21790 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D21794 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D21798 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D2179C 7C 08 03 A6 */ mtlr r0 -/* 80D217A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D217A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/initBaseMtx__11daObjVGnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/initBaseMtx__11daObjVGnd_cFv.s deleted file mode 100644 index c8fd75eb3a0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/initBaseMtx__11daObjVGnd_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80D213F8: -/* 80D213F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D213FC 7C 08 02 A6 */ mflr r0 -/* 80D21400 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D21404 C0 23 04 D4 */ lfs f1, 0x4d4(r3) -/* 80D21408 3C 80 80 D2 */ lis r4, lit_3630@ha /* 0x80D21A08@ha */ -/* 80D2140C C0 04 1A 08 */ lfs f0, lit_3630@l(r4) /* 0x80D21A08@l */ -/* 80D21410 EC 01 00 2A */ fadds f0, f1, f0 -/* 80D21414 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 80D21418 80 83 05 70 */ lwz r4, 0x570(r3) -/* 80D2141C C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D21420 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80D21424 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80D21428 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80D2142C C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80D21430 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80D21434 48 00 00 15 */ bl setBaseMtx__11daObjVGnd_cFv -/* 80D21438 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D2143C 7C 08 03 A6 */ mtlr r0 -/* 80D21440 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D21444 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/setBaseMtx__11daObjVGnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/setBaseMtx__11daObjVGnd_cFv.s deleted file mode 100644 index e6b2bbe1d6f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/setBaseMtx__11daObjVGnd_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80D21448: -/* 80D21448 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D2144C 7C 08 02 A6 */ mflr r0 -/* 80D21450 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D21454 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D21458 7C 7F 1B 78 */ mr r31, r3 -/* 80D2145C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D21460 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D21464 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80D21468 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80D2146C C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80D21470 4B 62 54 79 */ bl PSMTXTrans -/* 80D21474 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D21478 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D2147C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80D21480 4B 2E AF B5 */ bl mDoMtx_YrotM__FPA4_fs -/* 80D21484 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D21488 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D2148C 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80D21490 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D21494 4B 62 50 1D */ bl PSMTXCopy -/* 80D21498 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D2149C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D214A0 7C 08 03 A6 */ mtlr r0 -/* 80D214A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D214A8 4E 80 00 20 */ blr diff --git a/include/d/bg/d_bg_s_movebg_actor.h b/include/d/bg/d_bg_s_movebg_actor.h index 0623dd94e2b..8ce7aab0106 100644 --- a/include/d/bg/d_bg_s_movebg_actor.h +++ b/include/d/bg/d_bg_s_movebg_actor.h @@ -24,7 +24,7 @@ public: /* 80078688 */ virtual int CreateHeap(); /* 80078690 */ virtual int Create(); - /* 80078698 */ virtual int Execute(f32 (**)[3][4]); + /* 80078698 */ virtual int Execute(Mtx**); /* 800786A0 */ virtual int Draw(); /* 800786A8 */ virtual int Delete(); /* 800786B0 */ virtual int IsDelete(); diff --git a/include/d/menu/d_menu_ring.h b/include/d/menu/d_menu_ring.h index 3d1e87f07a8..9bb032c5097 100644 --- a/include/d/menu/d_menu_ring.h +++ b/include/d/menu/d_menu_ring.h @@ -127,7 +127,7 @@ private: /* 0x5B8 */ f32 field_0x5b8[10]; /* 0x5E0 */ f32 field_0x5e0[10]; /* 0x608 */ f32 field_0x608; - /* 0x604 */ f32 field_0x604; + /* 0x60C */ f32 field_0x60c; /* 0x610 */ f32 field_0x610; /* 0x614 */ f32 field_0x614; /* 0x618 */ f32 field_0x618; diff --git a/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h b/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h index bf5b408eba0..2811bea1eb7 100644 --- a/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h +++ b/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h @@ -1,6 +1,24 @@ #ifndef D_A_IZUMI_GATE_H #define D_A_IZUMI_GATE_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 daIzumiGate_c : public dBgS_MoveBgActor { +public: + /* 80849098 */ void initBaseMtx(); + /* 808490B8 */ void setBaseMtx(); + /* 80849260 */ int CreateHeap(); + /* 808492D8 */ int Create(); + /* 808492FC */ int Execute(Mtx**); + /* 80849328 */ int Draw(); + /* 808493CC */ int Delete(); + + inline int create(); + + /* 0x5A0 */ J3DModel* mpModel; + /* 0x5A4 */ request_of_phase_process_class mPhaseReq; +}; // Size: 0x5AC #endif /* D_A_IZUMI_GATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h b/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h index 06a6362d101..b4c1b1e174f 100644 --- a/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h +++ b/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h @@ -1,6 +1,26 @@ #ifndef D_A_OBJ_VGROUND_H #define D_A_OBJ_VGROUND_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daObjVGnd_c : public fopAc_ac_c { +public: + /* 80D213F8 */ void initBaseMtx(); + /* 80D21448 */ void setBaseMtx(); + /* 80D214AC */ int Create(); + /* 80D21500 */ int CreateHeap(); + /* 80D216F4 */ int create(); + /* 80D217A8 */ int execute(); + /* 80D21878 */ int draw(); + /* 80D2194C */ int _delete(); + + u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } + + /* 0x568 */ request_of_phase_process_class mPhaseReq; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ mDoExt_btkAnm* mpBtk; + /* 0x578 */ mDoExt_brkAnm* mpBrk; +}; // Size: 0x57C #endif /* D_A_OBJ_VGROUND_H */ diff --git a/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp b/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp index 4497d0634dc..973683831eb 100644 --- a/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp +++ b/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp @@ -1,299 +1,130 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_izumi_gate -// +/** + * d_a_izumi_gate.cpp + * Spring - Gate + */ #include "rel/d/a/d_a_izumi_gate/d_a_izumi_gate.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 fopAc_ac_c {}; - -struct daIzumiGate_c { - /* 80849098 */ void initBaseMtx(); - /* 808490B8 */ void setBaseMtx(); - /* 80849260 */ void CreateHeap(); - /* 808492D8 */ void Create(); - /* 808492FC */ void Execute(f32 (**)[3][4]); - /* 80849328 */ void Draw(); - /* 808493CC */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -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 initBaseMtx__13daIzumiGate_cFv(); -extern "C" void setBaseMtx__13daIzumiGate_cFv(); -extern "C" static void daIzumiGate_Draw__FP13daIzumiGate_c(); -extern "C" static void daIzumiGate_Execute__FP13daIzumiGate_c(); -extern "C" static bool daIzumiGate_IsDelete__FP13daIzumiGate_c(); -extern "C" static void daIzumiGate_Delete__FP13daIzumiGate_c(); -extern "C" static void daIzumiGate_Create__FP10fopAc_ac_c(); -extern "C" void CreateHeap__13daIzumiGate_cFv(); -extern "C" void Create__13daIzumiGate_cFv(); -extern "C" void Execute__13daIzumiGate_cFPPA3_A4_f(); -extern "C" void Draw__13daIzumiGate_cFv(); -extern "C" void Delete__13daIzumiGate_cFv(); -extern "C" extern char const* const d_a_izumi_gate__stringBase0; - -// -// External References: -// - -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -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" 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: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80849098-808490B8 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__13daIzumiGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIzumiGate_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/initBaseMtx__13daIzumiGate_cFv.s" +void daIzumiGate_c::initBaseMtx() { + setBaseMtx(); } -#pragma pop /* 808490B8-8084910C 000098 0054+00 2/2 0/0 0/0 .text setBaseMtx__13daIzumiGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIzumiGate_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/setBaseMtx__13daIzumiGate_cFv.s" +void daIzumiGate_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + PSMTXCopy(mDoMtx_stack_c::now, field_0x56c); + PSMTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx); } -#pragma pop /* 8084910C-80849138 0000EC 002C+00 1/0 0/0 0/0 .text daIzumiGate_Draw__FP13daIzumiGate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daIzumiGate_Draw(daIzumiGate_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Draw__FP13daIzumiGate_c.s" +static int daIzumiGate_Draw(daIzumiGate_c* i_this) { + return static_cast(i_this)->MoveBGDraw(); } -#pragma pop /* 80849138-80849158 000118 0020+00 1/0 0/0 0/0 .text daIzumiGate_Execute__FP13daIzumiGate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daIzumiGate_Execute(daIzumiGate_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Execute__FP13daIzumiGate_c.s" +static int daIzumiGate_Execute(daIzumiGate_c* i_this) { + return static_cast(i_this)->MoveBGExecute(); } -#pragma pop /* 80849158-80849160 000138 0008+00 1/0 0/0 0/0 .text daIzumiGate_IsDelete__FP13daIzumiGate_c */ -static bool daIzumiGate_IsDelete(daIzumiGate_c* param_0) { - return true; +static int daIzumiGate_IsDelete(daIzumiGate_c* i_this) { + return 1; } /* 80849160-80849184 000140 0024+00 1/0 0/0 0/0 .text daIzumiGate_Delete__FP13daIzumiGate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daIzumiGate_Delete(daIzumiGate_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Delete__FP13daIzumiGate_c.s" +static int daIzumiGate_Delete(daIzumiGate_c* i_this) { + static_cast(i_this)->MoveBGDelete(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80849408-80849408 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80849408 = "M_IzmGate"; -SECTION_DEAD static char const* const stringBase_80849412 = "M_IzumiGate_b.dzb"; -#pragma pop /* 80849438-8084943C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_izumi_gate__stringBase0; - -/* 8084943C-8084945C -00001 0020+00 1/0 0/0 0/0 .data l_daIzumiGate_Method */ -SECTION_DATA static void* l_daIzumiGate_Method[8] = { - (void*)daIzumiGate_Create__FP10fopAc_ac_c, - (void*)daIzumiGate_Delete__FP13daIzumiGate_c, - (void*)daIzumiGate_Execute__FP13daIzumiGate_c, - (void*)daIzumiGate_IsDelete__FP13daIzumiGate_c, - (void*)daIzumiGate_Draw__FP13daIzumiGate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8084945C-8084948C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Izumi_Gate */ -SECTION_DATA extern void* g_profile_Izumi_Gate[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01570000, (void*)&g_fpcLf_Method, - (void*)0x000005AC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00260000, (void*)&l_daIzumiGate_Method, - (void*)0x00040000, (void*)0x000E0000, -}; - -/* 8084948C-808494B4 000054 0028+00 1/1 0/0 0/0 .data __vt__13daIzumiGate_c */ -SECTION_DATA extern void* __vt__13daIzumiGate_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__13daIzumiGate_cFv, - (void*)Create__13daIzumiGate_cFv, - (void*)Execute__13daIzumiGate_cFPPA3_A4_f, - (void*)Draw__13daIzumiGate_cFv, - (void*)Delete__13daIzumiGate_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; +static char* l_arcName = "M_IzmGate"; /* 80849184-80849260 000164 00DC+00 1/0 0/0 0/0 .text daIzumiGate_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daIzumiGate_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/daIzumiGate_Create__FP10fopAc_ac_c.s" +int daIzumiGate_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daIzumiGate_c(); + fopAcM_OnCondition(this, 8); + } + int phase = dComIfG_resLoad(&mPhaseReq, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + int objectName = dComIfG_getObjctResName2Index(l_arcName, "M_IzumiGate_b.dzb"); + phase = MoveBGCreate(l_arcName, objectName, dBgS_MoveBGProc_TypicalRotY, 0x4000, NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + fopAcM_SetMtx(this, field_0x56c); + } + return phase; } -#pragma pop -/* ############################################################################################## */ -/* 80849408-80849408 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80849424 = "M_IzumiGate_b.bmd"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80849436 = "\0"; -#pragma pop +static int daIzumiGate_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); +} /* 80849260-808492D8 000240 0078+00 1/0 0/0 0/0 .text CreateHeap__13daIzumiGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIzumiGate_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/CreateHeap__13daIzumiGate_cFv.s" +int daIzumiGate_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_IzumiGate_b.bmd"); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + return mpModel != NULL ? 1 : 0; } -#pragma pop /* 808492D8-808492FC 0002B8 0024+00 1/0 0/0 0/0 .text Create__13daIzumiGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIzumiGate_c::Create() { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Create__13daIzumiGate_cFv.s" +int daIzumiGate_c::Create() { + initBaseMtx(); + return cPhs_COMPLEATE_e; } -#pragma pop /* 808492FC-80849328 0002DC 002C+00 1/0 0/0 0/0 .text Execute__13daIzumiGate_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIzumiGate_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Execute__13daIzumiGate_cFPPA3_A4_f.s" +int daIzumiGate_c::Execute(Mtx** i_mtx) { + *i_mtx = &field_0x56c; + setBaseMtx(); + return 1; } -#pragma pop /* 80849328-808493CC 000308 00A4+00 1/0 0/0 0/0 .text Draw__13daIzumiGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIzumiGate_c::Draw() { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Draw__13daIzumiGate_cFv.s" +int daIzumiGate_c::Draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 808493CC-80849400 0003AC 0034+00 1/0 0/0 0/0 .text Delete__13daIzumiGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIzumiGate_c::Delete() { - nofralloc -#include "asm/rel/d/a/d_a_izumi_gate/d_a_izumi_gate/Delete__13daIzumiGate_cFv.s" +int daIzumiGate_c::Delete() { + dComIfG_resDelete(&mPhaseReq, l_arcName); + return 1; } -#pragma pop -/* 80849408-80849408 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 8084943C-8084945C -00001 0020+00 1/0 0/0 0/0 .data l_daIzumiGate_Method */ +static actor_method_class l_daIzumiGate_Method = { + (process_method_func)daIzumiGate_Create, (process_method_func)daIzumiGate_Delete, + (process_method_func)daIzumiGate_Execute, (process_method_func)daIzumiGate_IsDelete, + (process_method_func)daIzumiGate_Draw, +}; + +/* 8084945C-8084948C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Izumi_Gate */ +extern actor_process_profile_definition g_profile_Izumi_Gate = { + -3, + 7, + -3, + PROC_Izumi_Gate, + &g_fpcLf_Method.mBase, + sizeof(daIzumiGate_c), + 0, + 0, + &g_fopAc_Method.base, + 0x0026, + &l_daIzumiGate_Method, + 0x00040000, + 0, + 14, +}; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp b/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp index 568d6bd5d92..c09af1dce1e 100644 --- a/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp +++ b/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp @@ -1,357 +1,163 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_vground -// +/** + * d_a_obj_vground.cpp + * Object - Volcano Ground + */ #include "rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -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 fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjVGnd_c { - /* 80D213F8 */ void initBaseMtx(); - /* 80D21448 */ void setBaseMtx(); - /* 80D214AC */ void Create(); - /* 80D21500 */ void CreateHeap(); - /* 80D216F4 */ void create(); - /* 80D217A8 */ void execute(); - /* 80D21878 */ void draw(); - /* 80D2194C */ void _delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -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 { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D216AC */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" void initBaseMtx__11daObjVGnd_cFv(); -extern "C" void setBaseMtx__11daObjVGnd_cFv(); -extern "C" void Create__11daObjVGnd_cFv(); -extern "C" void CreateHeap__11daObjVGnd_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void create__11daObjVGnd_cFv(); -extern "C" void execute__11daObjVGnd_cFv(); -extern "C" void draw__11daObjVGnd_cFv(); -extern "C" void _delete__11daObjVGnd_cFv(); -extern "C" static void daObjVGnd_Draw__FP11daObjVGnd_c(); -extern "C" static void daObjVGnd_Execute__FP11daObjVGnd_c(); -extern "C" static void daObjVGnd_Delete__FP11daObjVGnd_c(); -extern "C" static void daObjVGnd_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_obj_vground__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -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 mDoExt_modelUpdateDL__FP8J3DModel(); -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 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 isEventBit__11dSv_event_cCFUs(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -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 __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_27(); -extern "C" void _restgpr_27(); -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]; -extern "C" extern u8 j3dSys[284]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80D213D8-80D213F8 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_vground/d_a_obj_vground/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop - -/* ############################################################################################## */ -/* 80D21A08-80D21A0C 000000 0004+00 2/2 0/0 0/0 .rodata @3630 */ -SECTION_RODATA static f32 const lit_3630 = 5.0f; -COMPILER_STRIP_GATE(0x80D21A08, &lit_3630); /* 80D213F8-80D21448 000098 0050+00 1/1 0/0 0/0 .text initBaseMtx__11daObjVGnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVGnd_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/initBaseMtx__11daObjVGnd_cFv.s" +void daObjVGnd_c::initBaseMtx() { + current.pos.y += 5.0f; + mpModel->setBaseScale(mScale); + setBaseMtx(); } -#pragma pop /* 80D21448-80D214AC 0000E8 0064+00 2/2 0/0 0/0 .text setBaseMtx__11daObjVGnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVGnd_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/setBaseMtx__11daObjVGnd_cFv.s" +void daObjVGnd_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + PSMTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx); } -#pragma pop /* 80D214AC-80D21500 00014C 0054+00 1/1 0/0 0/0 .text Create__11daObjVGnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVGnd_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/Create__11daObjVGnd_cFv.s" +int daObjVGnd_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + execute(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80D21A0C-80D21A10 000004 0004+00 1/2 0/0 0/0 .rodata @3704 */ -SECTION_RODATA static f32 const lit_3704 = 1.0f; -COMPILER_STRIP_GATE(0x80D21A0C, &lit_3704); - -/* 80D21A18-80D21A18 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D21A18 = "M_VolcGnd"; -#pragma pop /* 80D21A24-80D21A28 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_vground__stringBase0; - -/* 80D21A28-80D21A48 -00001 0020+00 1/0 0/0 0/0 .data l_daObjVGnd_Method */ -SECTION_DATA static void* l_daObjVGnd_Method[8] = { - (void*)daObjVGnd_Create__FP10fopAc_ac_c, - (void*)daObjVGnd_Delete__FP11daObjVGnd_c, - (void*)daObjVGnd_Execute__FP11daObjVGnd_c, - (void*)NULL, - (void*)daObjVGnd_Draw__FP11daObjVGnd_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D21A48-80D21A78 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_VolcGnd */ -SECTION_DATA extern void* g_profile_Obj_VolcGnd[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00E20000, (void*)&g_fpcLf_Method, - (void*)0x0000057C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02530000, (void*)&l_daObjVGnd_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80D21A78-80D21A84 000054 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; +static char* l_arcName = "M_VolcGnd"; /* 80D21500-80D216AC 0001A0 01AC+00 1/1 0/0 0/0 .text CreateHeap__11daObjVGnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVGnd_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/CreateHeap__11daObjVGnd_cFv.s" -} -#pragma pop +int daObjVGnd_c::CreateHeap() { + J3DModelData* mpObjectRes = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + mpModel = mDoExt_J3DModel__create(mpObjectRes, 0x80000, 0x11000284); + if (!mpModel) { + return 0; + } -/* 80D216AC-80D216F4 00034C 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/__dt__12J3DFrameCtrlFv.s" + J3DAnmTextureSRTKey* mpTextureSRTKey = + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0xb); + mpBtk = new mDoExt_btkAnm(); + if ((!mpBtk) || (!mpBtk->init(mpObjectRes, mpTextureSRTKey, 1, NULL, 1.0f, NULL, -1))) { + return 0; + } + + J3DAnmTevRegKey* mpTevReqKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 8); + mpBrk = new mDoExt_brkAnm(); + if ((!mpBrk) || (!mpBrk->init(mpObjectRes, mpTevReqKey, 1, NULL, 1.0f, NULL, -1))) { + return 0; + } + + return 1; } -#pragma pop /* 80D216F4-80D217A8 000394 00B4+00 1/1 0/0 0/0 .text create__11daObjVGnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVGnd_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/func_80D216F4.s" +int daObjVGnd_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daObjVGnd_c(); + fopAcM_OnCondition(this, 8); + } + int phase = dComIfG_resLoad(&mPhaseReq, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckCreateHeap, 0x960)) { + return cPhs_ERROR_e; + } else if (!Create()) { + return cPhs_ERROR_e; + } + } + return phase; } -#pragma pop - -/* ############################################################################################## */ -/* 80D21A10-80D21A14 000008 0004+00 0/1 0/0 0/0 .rodata @3778 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3778 = 2.0f; -COMPILER_STRIP_GATE(0x80D21A10, &lit_3778); -#pragma pop - -/* 80D21A14-80D21A18 00000C 0004+00 0/1 0/0 0/0 .rodata @3779 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3779[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D21A14, &lit_3779); -#pragma pop /* 80D217A8-80D21878 000448 00D0+00 2/2 0/0 0/0 .text execute__11daObjVGnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVGnd_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/execute__11daObjVGnd_cFv.s" +int daObjVGnd_c::execute() { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[65])) { + mpBrk->setFrame(2.0f); + mpBtk->setFrame(2.0f); + } else { + if (i_fopAcM_isSwitch(this, getSwbit())) { + mpBrk->setFrame(1.0f); + mpBtk->setFrame(1.0f); + } else { + mpBrk->setFrame(0.0f); + mpBtk->setFrame(0.0f); + } + } + setBaseMtx(); + return 1; } -#pragma pop /* 80D21878-80D2194C 000518 00D4+00 1/1 0/0 0/0 .text draw__11daObjVGnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVGnd_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/draw__11daObjVGnd_cFv.s" +int daObjVGnd_c::draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + mpBrk->entry(mpModel->getModelData()); + mpBtk->entry(mpModel->getModelData()); + dComIfGd_setListDarkBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80D2194C-80D21980 0005EC 0034+00 1/1 0/0 0/0 .text _delete__11daObjVGnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVGnd_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/_delete__11daObjVGnd_cFv.s" +int daObjVGnd_c::_delete() { + dComIfG_resDelete(&mPhaseReq, l_arcName); + return 1; } -#pragma pop /* 80D21980-80D219A0 000620 0020+00 1/0 0/0 0/0 .text daObjVGnd_Draw__FP11daObjVGnd_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjVGnd_Draw(daObjVGnd_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Draw__FP11daObjVGnd_c.s" +static int daObjVGnd_Draw(daObjVGnd_c* i_this) { + return i_this->draw(); } -#pragma pop /* 80D219A0-80D219C0 000640 0020+00 1/0 0/0 0/0 .text daObjVGnd_Execute__FP11daObjVGnd_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjVGnd_Execute(daObjVGnd_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Execute__FP11daObjVGnd_c.s" +static int daObjVGnd_Execute(daObjVGnd_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80D219C0-80D219E0 000660 0020+00 1/0 0/0 0/0 .text daObjVGnd_Delete__FP11daObjVGnd_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjVGnd_Delete(daObjVGnd_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Delete__FP11daObjVGnd_c.s" +static int daObjVGnd_Delete(daObjVGnd_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80D219E0-80D21A00 000680 0020+00 1/0 0/0 0/0 .text daObjVGnd_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjVGnd_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground/daObjVGnd_Create__FP10fopAc_ac_c.s" +static int daObjVGnd_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* 80D21A18-80D21A18 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80D21A28-80D21A48 -00001 0020+00 1/0 0/0 0/0 .data l_daObjVGnd_Method */ +static actor_method_class l_daObjVGnd_Method = { + (process_method_func)daObjVGnd_Create, (process_method_func)daObjVGnd_Delete, + (process_method_func)daObjVGnd_Execute, (process_method_func)NULL, + (process_method_func)daObjVGnd_Draw, +}; + +/* 80D21A48-80D21A78 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_VolcGnd */ +extern actor_process_profile_definition g_profile_Obj_VolcGnd = { + -3, + 3, + -3, + PROC_Obj_VolcGnd, + &g_fpcLf_Method.mBase, + sizeof(daObjVGnd_c), + 0, + 0, + &g_fopAc_Method.base, + 0x0253, + &l_daObjVGnd_Method, + 0x00040100, + 0, + 14, +}; \ No newline at end of file diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/bg/d_bg_s_movebg_actor.cpp index ba9142591dc..9a069c09850 100644 --- a/src/d/bg/d_bg_s_movebg_actor.cpp +++ b/src/d/bg/d_bg_s_movebg_actor.cpp @@ -43,7 +43,7 @@ int dBgS_MoveBgActor::Create() { } /* 80078698-800786A0 072FD8 0008+00 1/0 0/0 3/0 .text Execute__16dBgS_MoveBgActorFPPA3_A4_f */ -int dBgS_MoveBgActor::Execute(f32 (**param_0)[3][4]) { +int dBgS_MoveBgActor::Execute(Mtx**) { return 1; }