From 6b6407ac6dafa24a63a917ecaa7a08be5d3500ea Mon Sep 17 00:00:00 2001 From: Jeff Padgham Date: Sat, 9 Mar 2024 17:21:58 -0800 Subject: [PATCH] d_a_obj_digsnow OK (#2090) * Decomp OK * Cleanup and format pass, removing unused asm * Updating progress * Additional cleanup and PR feedback --------- Co-authored-by: GinNoOokami --- Progress.md | 16 +- .../CreateHeap__14daObjDigSnow_cFv.s | 29 - .../Create__14daObjDigSnow_cFv.s | 24 - .../Delete__14daObjDigSnow_cFv.s | 14 - .../Draw__14daObjDigSnow_cFv.s | 42 - .../Execute__14daObjDigSnow_cFPPA3_A4_f.s | 34 - .../d_a_obj_digsnow/__dt__10cCcD_GSttsFv.s | 20 - .../d_a_obj_digsnow/__dt__10dCcD_GSttsFv.s | 26 - .../d_a_obj_digsnow/__dt__12dBgS_AcchCirFv.s | 30 - .../d_a_obj_digsnow/__dt__12dBgS_ObjAcchFv.s | 30 - .../__dt__14dBgS_ObjGndChkFv.s | 32 - .../d_a_obj_digsnow/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_digsnow/__dt__8cM3dGCylFv.s | 20 - .../action__14daObjDigSnow_cFv.s | 43 - .../create1st__14daObjDigSnow_cFv.s | 48 -- ...DigSnow_MoveBGDelete__FP14daObjDigSnow_c.s | 9 - ...bjDigSnow_MoveBGDraw__FP14daObjDigSnow_c.s | 12 - ...igSnow_MoveBGExecute__FP14daObjDigSnow_c.s | 9 - ...ObjDigSnow_create1st__FP14daObjDigSnow_c.s | 78 -- .../d_a_obj_digsnow/func_80BDD698.s | 3 - .../d_a_obj_digsnow/func_80BDD6A0.s | 3 - .../d_a_obj_digsnow/func_80BDD6A8.s | 3 - .../d_a_obj_digsnow/func_80BDD6B0.s | 3 - .../d_a_obj_digsnow/func_80BDD6B8.s | 3 - .../initBaseMtx__14daObjDigSnow_cFv.s | 16 - .../mode_dig__14daObjDigSnow_cFv.s | 41 - .../mode_init_dig__14daObjDigSnow_cFv.s | 54 -- .../mode_init_end__14daObjDigSnow_cFv.s | 22 - .../mode_init_wait__14daObjDigSnow_cFv.s | 4 - .../mode_wait__14daObjDigSnow_cFv.s | 13 - .../setBaseMtx__14daObjDigSnow_cFv.s | 30 - .../d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h | 56 +- rel/d/a/obj/d_a_obj_digsnow/Makefile | 2 - .../a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp | 811 ++++-------------- .../unknown_translation_unit_bss.cpp | 26 - 35 files changed, 210 insertions(+), 1416 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/CreateHeap__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Create__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Delete__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Draw__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Execute__14daObjDigSnow_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__10cCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__10dCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__12dBgS_AcchCirFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__14dBgS_ObjGndChkFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/action__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/create1st__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGDelete__FP14daObjDigSnow_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGDraw__FP14daObjDigSnow_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGExecute__FP14daObjDigSnow_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_create1st__FP14daObjDigSnow_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD698.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6A0.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6A8.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6B0.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6B8.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/initBaseMtx__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_dig__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_dig__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_end__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_wait__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_wait__14daObjDigSnow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/setBaseMtx__14daObjDigSnow_cFv.s delete mode 100644 rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.cpp diff --git a/Progress.md b/Progress.md index 9fa09b2f2f..c1d5c9d1e0 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 52.688307% | 2118424 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 52.688307% | 2118424 | 4020672 -RELs | 36.401514% | 4186292 | 11500324 -Total | 40.620563% | 6304716 | 15520996 +RELs | 36.594134% | 4208444 | 11500324 +Total | 40.763286% | 6326868 | 15520996 ## RELs @@ -391,7 +391,7 @@ 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 | 100.000000% | 3564 | 3564 -d_a_obj_digsnow | 44.813278% | 2160 | 4820 +d_a_obj_digsnow | 100.000000% | 4820 | 4820 d_a_obj_dmelevator | 35.600390% | 4376 | 12292 d_a_obj_drop | 30.227416% | 3828 | 12664 d_a_obj_dust | 40.406977% | 2224 | 5504 @@ -447,7 +447,7 @@ d_a_obj_inobone | 42.361111% | 1952 | 4608 d_a_obj_ita | 42.717855% | 2804 | 6564 d_a_obj_itamato | 38.072602% | 3524 | 9256 d_a_obj_ito | 30.588925% | 4176 | 13652 -d_a_obj_kabuto | 30.226537% | 5604 | 18540 +d_a_obj_kabuto | 100.000000% | 18540 | 18540 d_a_obj_kag | 32.055503% | 5452 | 17008 d_a_obj_kage | 50.520833% | 1164 | 2304 d_a_obj_kago | 31.956798% | 4024 | 12592 @@ -615,9 +615,9 @@ d_a_obj_stopper | 31.675996% | 3848 | 12148 d_a_obj_stopper2 | 38.987342% | 1848 | 4740 d_a_obj_suisya | 100.000000% | 2348 | 2348 d_a_obj_sw | 27.590884% | 4068 | 14744 -d_a_obj_swBallA | 35.803945% | 2396 | 6692 -d_a_obj_swBallB | 34.276891% | 2664 | 7772 -d_a_obj_swBallC | 41.458222% | 3116 | 7516 +d_a_obj_swBallA | 48.416019% | 3240 | 6692 +d_a_obj_swBallB | 51.158003% | 3976 | 7772 +d_a_obj_swBallC | 100.000000% | 7516 | 7516 d_a_obj_swLight | 40.346767% | 3444 | 8536 d_a_obj_swchain | 24.473297% | 3996 | 16328 d_a_obj_swhang | 38.446450% | 3920 | 10196 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 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 | 36.401514% | 4186292 | 11500324 +Total | 36.594134% | 4208444 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/CreateHeap__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/CreateHeap__14daObjDigSnow_cFv.s deleted file mode 100644 index 7ca371f389..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/CreateHeap__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80BDCD64: -/* 80BDCD64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCD68 7C 08 02 A6 */ mflr r0 -/* 80BDCD6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCD70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDCD74 7C 7F 1B 78 */ mr r31, r3 -/* 80BDCD78 3C 60 80 BE */ lis r3, l_arcName@ha /* 0x80BDD708@ha */ -/* 80BDCD7C 38 63 D7 08 */ addi r3, r3, l_arcName@l /* 0x80BDD708@l */ -/* 80BDCD80 80 63 00 00 */ lwz r3, 0(r3) -/* 80BDCD84 38 80 00 04 */ li r4, 4 -/* 80BDCD88 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDCD8C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDCD90 3C A5 00 02 */ addis r5, r5, 2 -/* 80BDCD94 38 C0 00 80 */ li r6, 0x80 -/* 80BDCD98 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BDCD9C 4B 45 F5 51 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDCDA0 3C 80 00 08 */ lis r4, 8 -/* 80BDCDA4 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80BDCDA8 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80BDCDAC 4B 43 7E A9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80BDCDB0 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80BDCDB4 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BDCDB8 30 03 FF FF */ addic r0, r3, -1 -/* 80BDCDBC 7C 60 19 10 */ subfe r3, r0, r3 -/* 80BDCDC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDCDC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCDC8 7C 08 03 A6 */ mtlr r0 -/* 80BDCDCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCDD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Create__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Create__14daObjDigSnow_cFv.s deleted file mode 100644 index e1e9062b12..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Create__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80BDCD08: -/* 80BDCD08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCD0C 7C 08 02 A6 */ mflr r0 -/* 80BDCD10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCD14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDCD18 7C 7F 1B 78 */ mr r31, r3 -/* 80BDCD1C 4B FF FF 3D */ bl initBaseMtx__14daObjDigSnow_cFv -/* 80BDCD20 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BDCD24 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BDCD28 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80BDCD2C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BDCD30 80 83 00 04 */ lwz r4, 4(r3) -/* 80BDCD34 7F E3 FB 78 */ mr r3, r31 -/* 80BDCD38 4B 43 D8 41 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80BDCD3C 38 00 00 1F */ li r0, 0x1f -/* 80BDCD40 98 1F 05 4B */ stb r0, 0x54b(r31) -/* 80BDCD44 7F E3 FB 78 */ mr r3, r31 -/* 80BDCD48 48 00 02 5D */ bl mode_init_wait__14daObjDigSnow_cFv -/* 80BDCD4C 38 60 00 01 */ li r3, 1 -/* 80BDCD50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDCD54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCD58 7C 08 03 A6 */ mtlr r0 -/* 80BDCD5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCD60 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Delete__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Delete__14daObjDigSnow_cFv.s deleted file mode 100644 index ea113922c2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Delete__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80BDD2B8: -/* 80BDD2B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD2BC 7C 08 02 A6 */ mflr r0 -/* 80BDD2C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD2C4 3C 80 80 BE */ lis r4, l_arcName@ha /* 0x80BDD708@ha */ -/* 80BDD2C8 38 84 D7 08 */ addi r4, r4, l_arcName@l /* 0x80BDD708@l */ -/* 80BDD2CC 80 84 00 00 */ lwz r4, 0(r4) -/* 80BDD2D0 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80BDD2D4 4B 44 FD 35 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BDD2D8 38 60 00 01 */ li r3, 1 -/* 80BDD2DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD2E0 7C 08 03 A6 */ mtlr r0 -/* 80BDD2E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD2E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Draw__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Draw__14daObjDigSnow_cFv.s deleted file mode 100644 index 281177d88e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Draw__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80BDD214: -/* 80BDD214 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD218 7C 08 02 A6 */ mflr r0 -/* 80BDD21C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD220 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDD224 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDD228 7C 7E 1B 78 */ mr r30, r3 -/* 80BDD22C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BDD230 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BDD234 38 80 00 10 */ li r4, 0x10 -/* 80BDD238 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BDD23C 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80BDD240 4B 5C 65 85 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BDD244 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BDD248 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BDD24C 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80BDD250 80 84 00 04 */ lwz r4, 4(r4) -/* 80BDD254 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80BDD258 4B 5C 7B 49 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BDD25C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDD260 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDD264 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80BDD268 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80BDD26C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80BDD270 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BDD274 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80BDD278 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BDD27C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BDD280 4B 43 0A 45 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80BDD284 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDD288 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDD28C 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80BDD290 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BDD294 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80BDD298 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BDD29C 38 60 00 01 */ li r3, 1 -/* 80BDD2A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDD2A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDD2A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD2AC 7C 08 03 A6 */ mtlr r0 -/* 80BDD2B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD2B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Execute__14daObjDigSnow_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Execute__14daObjDigSnow_cFPPA3_A4_f.s deleted file mode 100644 index 0c45933478..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Execute__14daObjDigSnow_cFPPA3_A4_f.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80BDCE84: -/* 80BDCE84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCE88 7C 08 02 A6 */ mflr r0 -/* 80BDCE8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCE90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDCE94 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDCE98 7C 7E 1B 78 */ mr r30, r3 -/* 80BDCE9C 7C 9F 23 78 */ mr r31, r4 -/* 80BDCEA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDCEA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDCEA8 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80BDCEAC 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80BDCEB0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80BDCEB4 41 82 00 10 */ beq lbl_80BDCEC4 -/* 80BDCEB8 38 00 00 80 */ li r0, 0x80 -/* 80BDCEBC 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 80BDCEC0 48 00 00 0C */ b lbl_80BDCECC -lbl_80BDCEC4: -/* 80BDCEC4 38 00 00 00 */ li r0, 0 -/* 80BDCEC8 90 1E 05 5C */ stw r0, 0x55c(r30) -lbl_80BDCECC: -/* 80BDCECC 7F C3 F3 78 */ mr r3, r30 -/* 80BDCED0 48 00 00 31 */ bl action__14daObjDigSnow_cFv -/* 80BDCED4 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80BDCED8 90 1F 00 00 */ stw r0, 0(r31) -/* 80BDCEDC 7F C3 F3 78 */ mr r3, r30 -/* 80BDCEE0 4B FF FD B5 */ bl setBaseMtx__14daObjDigSnow_cFv -/* 80BDCEE4 38 60 00 01 */ li r3, 1 -/* 80BDCEE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDCEEC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDCEF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCEF4 7C 08 03 A6 */ mtlr r0 -/* 80BDCEF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCEFC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index a6b33ea39d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BDD650: -/* 80BDD650 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD654 7C 08 02 A6 */ mflr r0 -/* 80BDD658 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD65C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDD660 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BDD664 41 82 00 1C */ beq lbl_80BDD680 -/* 80BDD668 3C A0 80 BE */ lis r5, __vt__10cCcD_GStts@ha /* 0x80BDD7B0@ha */ -/* 80BDD66C 38 05 D7 B0 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80BDD7B0@l */ -/* 80BDD670 90 1F 00 00 */ stw r0, 0(r31) -/* 80BDD674 7C 80 07 35 */ extsh. r0, r4 -/* 80BDD678 40 81 00 08 */ ble lbl_80BDD680 -/* 80BDD67C 4B 6F 16 C1 */ bl __dl__FPv -lbl_80BDD680: -/* 80BDD680 7F E3 FB 78 */ mr r3, r31 -/* 80BDD684 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDD688 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD68C 7C 08 03 A6 */ mtlr r0 -/* 80BDD690 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD694 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 673e665f2c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80BDD4A8: -/* 80BDD4A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD4AC 7C 08 02 A6 */ mflr r0 -/* 80BDD4B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD4B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDD4B8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BDD4BC 41 82 00 30 */ beq lbl_80BDD4EC -/* 80BDD4C0 3C 60 80 BE */ lis r3, __vt__10dCcD_GStts@ha /* 0x80BDD7BC@ha */ -/* 80BDD4C4 38 03 D7 BC */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80BDD7BC@l */ -/* 80BDD4C8 90 1F 00 00 */ stw r0, 0(r31) -/* 80BDD4CC 41 82 00 10 */ beq lbl_80BDD4DC -/* 80BDD4D0 3C 60 80 BE */ lis r3, __vt__10cCcD_GStts@ha /* 0x80BDD7B0@ha */ -/* 80BDD4D4 38 03 D7 B0 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80BDD7B0@l */ -/* 80BDD4D8 90 1F 00 00 */ stw r0, 0(r31) -lbl_80BDD4DC: -/* 80BDD4DC 7C 80 07 35 */ extsh. r0, r4 -/* 80BDD4E0 40 81 00 0C */ ble lbl_80BDD4EC -/* 80BDD4E4 7F E3 FB 78 */ mr r3, r31 -/* 80BDD4E8 4B 6F 18 55 */ bl __dl__FPv -lbl_80BDD4EC: -/* 80BDD4EC 7F E3 FB 78 */ mr r3, r31 -/* 80BDD4F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDD4F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD4F8 7C 08 03 A6 */ mtlr r0 -/* 80BDD4FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD500 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index d488fc4959..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BDD504: -/* 80BDD504 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD508 7C 08 02 A6 */ mflr r0 -/* 80BDD50C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD510 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDD514 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDD518 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BDD51C 7C 9F 23 78 */ mr r31, r4 -/* 80BDD520 41 82 00 38 */ beq lbl_80BDD558 -/* 80BDD524 3C 60 80 BE */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80BDD7A4@ha */ -/* 80BDD528 38 03 D7 A4 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80BDD7A4@l */ -/* 80BDD52C 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80BDD530 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80BDD534 38 80 FF FF */ li r4, -1 -/* 80BDD538 4B 69 19 E1 */ bl __dt__8cM3dGCirFv -/* 80BDD53C 7F C3 F3 78 */ mr r3, r30 -/* 80BDD540 38 80 00 00 */ li r4, 0 -/* 80BDD544 4B 68 AB 6D */ bl __dt__13cBgS_PolyInfoFv -/* 80BDD548 7F E0 07 35 */ extsh. r0, r31 -/* 80BDD54C 40 81 00 0C */ ble lbl_80BDD558 -/* 80BDD550 7F C3 F3 78 */ mr r3, r30 -/* 80BDD554 4B 6F 17 E9 */ bl __dl__FPv -lbl_80BDD558: -/* 80BDD558 7F C3 F3 78 */ mr r3, r30 -/* 80BDD55C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDD560 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDD564 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD568 7C 08 03 A6 */ mtlr r0 -/* 80BDD56C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD570 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 057dae6816..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BDD574: -/* 80BDD574 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD578 7C 08 02 A6 */ mflr r0 -/* 80BDD57C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD580 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDD584 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDD588 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BDD58C 7C 9F 23 78 */ mr r31, r4 -/* 80BDD590 41 82 00 38 */ beq lbl_80BDD5C8 -/* 80BDD594 3C 80 80 BE */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80BDD7E0@ha */ -/* 80BDD598 38 84 D7 E0 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80BDD7E0@l */ -/* 80BDD59C 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80BDD5A0 38 04 00 0C */ addi r0, r4, 0xc -/* 80BDD5A4 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80BDD5A8 38 04 00 18 */ addi r0, r4, 0x18 -/* 80BDD5AC 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80BDD5B0 38 80 00 00 */ li r4, 0 -/* 80BDD5B4 4B 49 89 E1 */ bl __dt__9dBgS_AcchFv -/* 80BDD5B8 7F E0 07 35 */ extsh. r0, r31 -/* 80BDD5BC 40 81 00 0C */ ble lbl_80BDD5C8 -/* 80BDD5C0 7F C3 F3 78 */ mr r3, r30 -/* 80BDD5C4 4B 6F 17 79 */ bl __dl__FPv -lbl_80BDD5C8: -/* 80BDD5C8 7F C3 F3 78 */ mr r3, r30 -/* 80BDD5CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDD5D0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDD5D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD5D8 7C 08 03 A6 */ mtlr r0 -/* 80BDD5DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD5E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__14dBgS_ObjGndChkFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__14dBgS_ObjGndChkFv.s deleted file mode 100644 index 10dd9d6d76..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__14dBgS_ObjGndChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80BDD0AC: -/* 80BDD0AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD0B0 7C 08 02 A6 */ mflr r0 -/* 80BDD0B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD0B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDD0BC 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDD0C0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BDD0C4 7C 9F 23 78 */ mr r31, r4 -/* 80BDD0C8 41 82 00 40 */ beq lbl_80BDD108 -/* 80BDD0CC 3C 80 80 BE */ lis r4, __vt__14dBgS_ObjGndChk@ha /* 0x80BDD804@ha */ -/* 80BDD0D0 38 84 D8 04 */ addi r4, r4, __vt__14dBgS_ObjGndChk@l /* 0x80BDD804@l */ -/* 80BDD0D4 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80BDD0D8 38 04 00 0C */ addi r0, r4, 0xc -/* 80BDD0DC 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80BDD0E0 38 04 00 18 */ addi r0, r4, 0x18 -/* 80BDD0E4 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 80BDD0E8 38 04 00 24 */ addi r0, r4, 0x24 -/* 80BDD0EC 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80BDD0F0 38 80 00 00 */ li r4, 0 -/* 80BDD0F4 4B 49 A4 FD */ bl __dt__11dBgS_GndChkFv -/* 80BDD0F8 7F E0 07 35 */ extsh. r0, r31 -/* 80BDD0FC 40 81 00 0C */ ble lbl_80BDD108 -/* 80BDD100 7F C3 F3 78 */ mr r3, r30 -/* 80BDD104 4B 6F 1C 39 */ bl __dl__FPv -lbl_80BDD108: -/* 80BDD108 7F C3 F3 78 */ mr r3, r30 -/* 80BDD10C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDD110 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDD114 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD118 7C 08 03 A6 */ mtlr r0 -/* 80BDD11C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD120 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__8cM3dGAabFv.s deleted file mode 100644 index 454fe32838..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BDD460: -/* 80BDD460 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD464 7C 08 02 A6 */ mflr r0 -/* 80BDD468 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD46C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDD470 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BDD474 41 82 00 1C */ beq lbl_80BDD490 -/* 80BDD478 3C A0 80 BE */ lis r5, __vt__8cM3dGAab@ha /* 0x80BDD7D4@ha */ -/* 80BDD47C 38 05 D7 D4 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80BDD7D4@l */ -/* 80BDD480 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80BDD484 7C 80 07 35 */ extsh. r0, r4 -/* 80BDD488 40 81 00 08 */ ble lbl_80BDD490 -/* 80BDD48C 4B 6F 18 B1 */ bl __dl__FPv -lbl_80BDD490: -/* 80BDD490 7F E3 FB 78 */ mr r3, r31 -/* 80BDD494 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDD498 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD49C 7C 08 03 A6 */ mtlr r0 -/* 80BDD4A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD4A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__8cM3dGCylFv.s deleted file mode 100644 index 10ca28cda3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BDD418: -/* 80BDD418 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD41C 7C 08 02 A6 */ mflr r0 -/* 80BDD420 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD424 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDD428 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BDD42C 41 82 00 1C */ beq lbl_80BDD448 -/* 80BDD430 3C A0 80 BE */ lis r5, __vt__8cM3dGCyl@ha /* 0x80BDD7C8@ha */ -/* 80BDD434 38 05 D7 C8 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80BDD7C8@l */ -/* 80BDD438 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80BDD43C 7C 80 07 35 */ extsh. r0, r4 -/* 80BDD440 40 81 00 08 */ ble lbl_80BDD448 -/* 80BDD444 4B 6F 18 F9 */ bl __dl__FPv -lbl_80BDD448: -/* 80BDD448 7F E3 FB 78 */ mr r3, r31 -/* 80BDD44C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDD450 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD454 7C 08 03 A6 */ mtlr r0 -/* 80BDD458 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD45C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/action__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/action__14daObjDigSnow_cFv.s deleted file mode 100644 index 52dc52e26e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/action__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80BDCF00: -/* 80BDCF00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCF04 7C 08 02 A6 */ mflr r0 -/* 80BDCF08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCF0C 3C 80 80 BE */ lis r4, cNullVec__6Z2Calc@ha /* 0x80BDD6E8@ha */ -/* 80BDCF10 38 E4 D6 E8 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80BDD6E8@l */ -/* 80BDCF14 3C 80 80 BE */ lis r4, data_80BDD860@ha /* 0x80BDD860@ha */ -/* 80BDCF18 38 C4 D8 60 */ addi r6, r4, data_80BDD860@l /* 0x80BDD860@l */ -/* 80BDCF1C 88 06 00 00 */ lbz r0, 0(r6) -/* 80BDCF20 7C 00 07 75 */ extsb. r0, r0 -/* 80BDCF24 40 82 00 58 */ bne lbl_80BDCF7C -/* 80BDCF28 80 87 00 24 */ lwz r4, 0x24(r7) -/* 80BDCF2C 80 07 00 28 */ lwz r0, 0x28(r7) -/* 80BDCF30 90 87 00 48 */ stw r4, 0x48(r7) -/* 80BDCF34 90 07 00 4C */ stw r0, 0x4c(r7) -/* 80BDCF38 80 07 00 2C */ lwz r0, 0x2c(r7) -/* 80BDCF3C 90 07 00 50 */ stw r0, 0x50(r7) -/* 80BDCF40 38 A7 00 48 */ addi r5, r7, 0x48 -/* 80BDCF44 80 87 00 30 */ lwz r4, 0x30(r7) -/* 80BDCF48 80 07 00 34 */ lwz r0, 0x34(r7) -/* 80BDCF4C 90 85 00 0C */ stw r4, 0xc(r5) -/* 80BDCF50 90 05 00 10 */ stw r0, 0x10(r5) -/* 80BDCF54 80 07 00 38 */ lwz r0, 0x38(r7) -/* 80BDCF58 90 05 00 14 */ stw r0, 0x14(r5) -/* 80BDCF5C 80 87 00 3C */ lwz r4, 0x3c(r7) -/* 80BDCF60 80 07 00 40 */ lwz r0, 0x40(r7) -/* 80BDCF64 90 85 00 18 */ stw r4, 0x18(r5) -/* 80BDCF68 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80BDCF6C 80 07 00 44 */ lwz r0, 0x44(r7) -/* 80BDCF70 90 05 00 20 */ stw r0, 0x20(r5) -/* 80BDCF74 38 00 00 01 */ li r0, 1 -/* 80BDCF78 98 06 00 00 */ stb r0, 0(r6) -lbl_80BDCF7C: -/* 80BDCF7C 88 03 09 3D */ lbz r0, 0x93d(r3) -/* 80BDCF80 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80BDCF84 39 87 00 48 */ addi r12, r7, 0x48 -/* 80BDCF88 7D 8C 02 14 */ add r12, r12, r0 -/* 80BDCF8C 4B 78 50 F9 */ bl __ptmf_scall -/* 80BDCF90 60 00 00 00 */ nop -/* 80BDCF94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCF98 7C 08 03 A6 */ mtlr r0 -/* 80BDCF9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCFA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/create1st__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/create1st__14daObjDigSnow_cFv.s deleted file mode 100644 index 5a5763030a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/create1st__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80BDCDD4: -/* 80BDCDD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCDD8 7C 08 02 A6 */ mflr r0 -/* 80BDCDDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCDE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDCDE4 7C 7F 1B 78 */ mr r31, r3 -/* 80BDCDE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDCDEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDCDF0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80BDCDF4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BDCDF8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80BDCDFC 7C 05 07 74 */ extsb r5, r0 -/* 80BDCE00 4B 45 85 61 */ bl isSwitch__10dSv_info_cCFii -/* 80BDCE04 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDCE08 41 82 00 0C */ beq lbl_80BDCE14 -/* 80BDCE0C 38 60 00 05 */ li r3, 5 -/* 80BDCE10 48 00 00 60 */ b lbl_80BDCE70 -lbl_80BDCE14: -/* 80BDCE14 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80BDCE18 3C 80 80 BE */ lis r4, l_arcName@ha /* 0x80BDD708@ha */ -/* 80BDCE1C 38 84 D7 08 */ addi r4, r4, l_arcName@l /* 0x80BDD708@l */ -/* 80BDCE20 80 84 00 00 */ lwz r4, 0(r4) -/* 80BDCE24 4B 45 00 99 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80BDCE28 7C 60 1B 78 */ mr r0, r3 -/* 80BDCE2C 2C 00 00 04 */ cmpwi r0, 4 -/* 80BDCE30 40 82 00 3C */ bne lbl_80BDCE6C -/* 80BDCE34 7F E3 FB 78 */ mr r3, r31 -/* 80BDCE38 3C 80 80 BE */ lis r4, l_arcName@ha /* 0x80BDD708@ha */ -/* 80BDCE3C 38 84 D7 08 */ addi r4, r4, l_arcName@l /* 0x80BDD708@l */ -/* 80BDCE40 80 84 00 00 */ lwz r4, 0(r4) -/* 80BDCE44 38 A0 00 07 */ li r5, 7 -/* 80BDCE48 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80BDCE4C 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80BDCE50 38 E0 10 00 */ li r7, 0x1000 -/* 80BDCE54 39 00 00 00 */ li r8, 0 -/* 80BDCE58 4B 49 B9 65 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80BDCE5C 7C 60 1B 78 */ mr r0, r3 -/* 80BDCE60 2C 00 00 05 */ cmpwi r0, 5 -/* 80BDCE64 40 82 00 08 */ bne lbl_80BDCE6C -/* 80BDCE68 48 00 00 08 */ b lbl_80BDCE70 -lbl_80BDCE6C: -/* 80BDCE6C 7C 03 03 78 */ mr r3, r0 -lbl_80BDCE70: -/* 80BDCE70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDCE74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCE78 7C 08 03 A6 */ mtlr r0 -/* 80BDCE7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCE80 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGDelete__FP14daObjDigSnow_c.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGDelete__FP14daObjDigSnow_c.s deleted file mode 100644 index 75cbb44591..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGDelete__FP14daObjDigSnow_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDD5E4: -/* 80BDD5E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD5E8 7C 08 02 A6 */ mflr r0 -/* 80BDD5EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD5F0 4B 49 B2 ED */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80BDD5F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD5F8 7C 08 03 A6 */ mtlr r0 -/* 80BDD5FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD600 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGDraw__FP14daObjDigSnow_c.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGDraw__FP14daObjDigSnow_c.s deleted file mode 100644 index 091b1810cf..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGDraw__FP14daObjDigSnow_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80BDD624: -/* 80BDD624 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD628 7C 08 02 A6 */ mflr r0 -/* 80BDD62C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD630 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80BDD634 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80BDD638 7D 89 03 A6 */ mtctr r12 -/* 80BDD63C 4E 80 04 21 */ bctrl -/* 80BDD640 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD644 7C 08 03 A6 */ mtlr r0 -/* 80BDD648 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD64C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGExecute__FP14daObjDigSnow_c.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGExecute__FP14daObjDigSnow_c.s deleted file mode 100644 index da8dfbd98c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGExecute__FP14daObjDigSnow_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDD604: -/* 80BDD604 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD608 7C 08 02 A6 */ mflr r0 -/* 80BDD60C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD610 4B 49 B3 41 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80BDD614 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD618 7C 08 03 A6 */ mtlr r0 -/* 80BDD61C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD620 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_create1st__FP14daObjDigSnow_c.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_create1st__FP14daObjDigSnow_c.s deleted file mode 100644 index a4dd9804f4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_create1st__FP14daObjDigSnow_c.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_80BDD2EC: -/* 80BDD2EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BDD2F0 7C 08 02 A6 */ mflr r0 -/* 80BDD2F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BDD2F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BDD2FC 4B 78 4E E1 */ bl _savegpr_29 -/* 80BDD300 7C 7F 1B 78 */ mr r31, r3 -/* 80BDD304 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BDD308 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BDD30C 40 82 00 EC */ bne lbl_80BDD3F8 -/* 80BDD310 7F E0 FB 79 */ or. r0, r31, r31 -/* 80BDD314 41 82 00 D8 */ beq lbl_80BDD3EC -/* 80BDD318 7C 1E 03 78 */ mr r30, r0 -/* 80BDD31C 4B 49 B3 09 */ bl __ct__16dBgS_MoveBgActorFv -/* 80BDD320 3C 60 80 BE */ lis r3, __vt__14daObjDigSnow_c@ha /* 0x80BDD834@ha */ -/* 80BDD324 38 03 D8 34 */ addi r0, r3, __vt__14daObjDigSnow_c@l /* 0x80BDD834@l */ -/* 80BDD328 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80BDD32C 3B BE 05 AC */ addi r29, r30, 0x5ac -/* 80BDD330 7F A3 EB 78 */ mr r3, r29 -/* 80BDD334 4B 49 8D 6D */ bl __ct__9dBgS_AcchFv -/* 80BDD338 3C 60 80 BE */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80BDD7E0@ha */ -/* 80BDD33C 38 63 D7 E0 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80BDD7E0@l */ -/* 80BDD340 90 7D 00 10 */ stw r3, 0x10(r29) -/* 80BDD344 38 03 00 0C */ addi r0, r3, 0xc -/* 80BDD348 90 1D 00 14 */ stw r0, 0x14(r29) -/* 80BDD34C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80BDD350 90 1D 00 24 */ stw r0, 0x24(r29) -/* 80BDD354 38 7D 00 14 */ addi r3, r29, 0x14 -/* 80BDD358 4B 49 BB 11 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80BDD35C 38 7E 07 84 */ addi r3, r30, 0x784 -/* 80BDD360 4B 49 8B 4D */ bl __ct__12dBgS_AcchCirFv -/* 80BDD364 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80BDD368 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80BDD36C 90 1E 07 DC */ stw r0, 0x7dc(r30) -/* 80BDD370 38 7E 07 E0 */ addi r3, r30, 0x7e0 -/* 80BDD374 4B 4A 63 ED */ bl __ct__10dCcD_GSttsFv -/* 80BDD378 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80BDD37C 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80BDD380 90 7E 07 DC */ stw r3, 0x7dc(r30) -/* 80BDD384 38 03 00 20 */ addi r0, r3, 0x20 -/* 80BDD388 90 1E 07 E0 */ stw r0, 0x7e0(r30) -/* 80BDD38C 3B BE 08 00 */ addi r29, r30, 0x800 -/* 80BDD390 7F A3 EB 78 */ mr r3, r29 -/* 80BDD394 4B 4A 66 95 */ bl __ct__12dCcD_GObjInfFv -/* 80BDD398 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80BDD39C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80BDD3A0 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80BDD3A4 3C 60 80 BE */ lis r3, __vt__8cM3dGAab@ha /* 0x80BDD7D4@ha */ -/* 80BDD3A8 38 03 D7 D4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80BDD7D4@l */ -/* 80BDD3AC 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 80BDD3B0 3C 60 80 BE */ lis r3, __vt__8cM3dGCyl@ha /* 0x80BDD7C8@ha */ -/* 80BDD3B4 38 03 D7 C8 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80BDD7C8@l */ -/* 80BDD3B8 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80BDD3BC 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80BDD3C0 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80BDD3C4 90 7D 01 20 */ stw r3, 0x120(r29) -/* 80BDD3C8 38 03 00 58 */ addi r0, r3, 0x58 -/* 80BDD3CC 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80BDD3D0 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80BDD3D4 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80BDD3D8 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 80BDD3DC 38 03 00 2C */ addi r0, r3, 0x2c -/* 80BDD3E0 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80BDD3E4 38 03 00 84 */ addi r0, r3, 0x84 -/* 80BDD3E8 90 1D 01 38 */ stw r0, 0x138(r29) -lbl_80BDD3EC: -/* 80BDD3EC 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80BDD3F0 60 00 00 08 */ ori r0, r0, 8 -/* 80BDD3F4 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80BDD3F8: -/* 80BDD3F8 7F E3 FB 78 */ mr r3, r31 -/* 80BDD3FC 4B FF F9 D9 */ bl create1st__14daObjDigSnow_cFv -/* 80BDD400 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BDD404 4B 78 4E 25 */ bl _restgpr_29 -/* 80BDD408 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BDD40C 7C 08 03 A6 */ mtlr r0 -/* 80BDD410 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BDD414 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD698.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD698.s deleted file mode 100644 index c247436346..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD698.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BDD698: -/* 80BDD698 38 63 FF EC */ addi r3, r3, -20 -/* 80BDD69C 4B FF FA 10 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6A0.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6A0.s deleted file mode 100644 index 482d6a82c3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6A0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BDD6A0: -/* 80BDD6A0 38 63 FF B4 */ addi r3, r3, -76 -/* 80BDD6A4 4B FF FA 08 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6A8.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6A8.s deleted file mode 100644 index 9ab44c7581..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6A8.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BDD6A8: -/* 80BDD6A8 38 63 FF C4 */ addi r3, r3, -60 -/* 80BDD6AC 4B FF FA 00 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6B0.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6B0.s deleted file mode 100644 index 84643a778f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6B0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BDD6B0: -/* 80BDD6B0 38 63 FF DC */ addi r3, r3, -36 -/* 80BDD6B4 4B FF FE C0 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6B8.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6B8.s deleted file mode 100644 index 2a714055c9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6B8.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BDD6B8: -/* 80BDD6B8 38 63 FF EC */ addi r3, r3, -20 -/* 80BDD6BC 4B FF FE B8 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/initBaseMtx__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/initBaseMtx__14daObjDigSnow_cFv.s deleted file mode 100644 index 3310aa0d19..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/initBaseMtx__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80BDCC58: -/* 80BDCC58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCC5C 7C 08 02 A6 */ mflr r0 -/* 80BDCC60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCC64 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80BDCC68 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80BDCC6C D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80BDCC70 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80BDCC74 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80BDCC78 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80BDCC7C D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80BDCC80 48 00 00 15 */ bl setBaseMtx__14daObjDigSnow_cFv -/* 80BDCC84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCC88 7C 08 03 A6 */ mtlr r0 -/* 80BDCC8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCC90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_dig__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_dig__14daObjDigSnow_cFv.s deleted file mode 100644 index ec3e69c149..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_dig__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80BDD124: -/* 80BDD124 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD128 7C 08 02 A6 */ mflr r0 -/* 80BDD12C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD130 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDD134 7C 7F 1B 78 */ mr r31, r3 -/* 80BDD138 3C 60 80 BE */ lis r3, lit_3744@ha /* 0x80BDD6C8@ha */ -/* 80BDD13C 38 83 D6 C8 */ addi r4, r3, lit_3744@l /* 0x80BDD6C8@l */ -/* 80BDD140 C0 44 00 04 */ lfs f2, 4(r4) -/* 80BDD144 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 80BDD148 C0 1F 09 40 */ lfs f0, 0x940(r31) -/* 80BDD14C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BDD150 EC 22 00 2A */ fadds f1, f2, f0 -/* 80BDD154 C0 04 00 08 */ lfs f0, 8(r4) -/* 80BDD158 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80BDD15C FC 00 02 10 */ fabs f0, f0 -/* 80BDD160 FC 20 00 18 */ frsp f1, f0 -/* 80BDD164 FC 40 08 90 */ fmr f2, f1 -/* 80BDD168 C0 04 00 0C */ lfs f0, 0xc(r4) -/* 80BDD16C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDD170 40 80 00 08 */ bge lbl_80BDD178 -/* 80BDD174 FC 40 00 90 */ fmr f2, f0 -lbl_80BDD178: -/* 80BDD178 38 7F 04 D4 */ addi r3, r31, 0x4d4 -/* 80BDD17C C0 3F 09 40 */ lfs f1, 0x940(r31) -/* 80BDD180 C0 04 00 10 */ lfs f0, 0x10(r4) -/* 80BDD184 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80BDD188 4B 69 35 B9 */ bl cLib_chaseF__FPfff -/* 80BDD18C 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDD190 41 82 00 18 */ beq lbl_80BDD1A8 -/* 80BDD194 88 1F 09 3C */ lbz r0, 0x93c(r31) -/* 80BDD198 28 00 00 02 */ cmplwi r0, 2 -/* 80BDD19C 40 82 00 0C */ bne lbl_80BDD1A8 -/* 80BDD1A0 7F E3 FB 78 */ mr r3, r31 -/* 80BDD1A4 48 00 00 19 */ bl mode_init_end__14daObjDigSnow_cFv -lbl_80BDD1A8: -/* 80BDD1A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDD1AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD1B0 7C 08 03 A6 */ mtlr r0 -/* 80BDD1B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD1B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_dig__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_dig__14daObjDigSnow_cFv.s deleted file mode 100644 index 4537aeed4a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_dig__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80BDCFDC: -/* 80BDCFDC 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80BDCFE0 7C 08 02 A6 */ mflr r0 -/* 80BDCFE4 90 01 00 84 */ stw r0, 0x84(r1) -/* 80BDCFE8 39 61 00 80 */ addi r11, r1, 0x80 -/* 80BDCFEC 4B 78 51 E9 */ bl _savegpr_27 -/* 80BDCFF0 7C 7C 1B 78 */ mr r28, r3 -/* 80BDCFF4 3B 61 00 08 */ addi r27, r1, 8 -/* 80BDCFF8 7F 63 DB 78 */ mr r3, r27 -/* 80BDCFFC 4B 49 A5 81 */ bl __ct__11dBgS_GndChkFv -/* 80BDD000 3C 60 80 BE */ lis r3, __vt__14dBgS_ObjGndChk@ha /* 0x80BDD804@ha */ -/* 80BDD004 38 63 D8 04 */ addi r3, r3, __vt__14dBgS_ObjGndChk@l /* 0x80BDD804@l */ -/* 80BDD008 90 61 00 18 */ stw r3, 0x18(r1) -/* 80BDD00C 3B E3 00 0C */ addi r31, r3, 0xc -/* 80BDD010 93 E1 00 28 */ stw r31, 0x28(r1) -/* 80BDD014 3B C3 00 18 */ addi r30, r3, 0x18 -/* 80BDD018 93 C1 00 44 */ stw r30, 0x44(r1) -/* 80BDD01C 3B A3 00 24 */ addi r29, r3, 0x24 -/* 80BDD020 93 A1 00 54 */ stw r29, 0x54(r1) -/* 80BDD024 38 7B 00 3C */ addi r3, r27, 0x3c -/* 80BDD028 4B 49 BE 41 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80BDD02C 80 1C 00 04 */ lwz r0, 4(r28) -/* 80BDD030 90 01 00 10 */ stw r0, 0x10(r1) -/* 80BDD034 7F 63 DB 78 */ mr r3, r27 -/* 80BDD038 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 80BDD03C 4B 68 AC ED */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 80BDD040 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDD044 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDD048 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BDD04C 7F 64 DB 78 */ mr r4, r27 -/* 80BDD050 4B 49 74 51 */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 80BDD054 3C 60 80 BE */ lis r3, lit_3744@ha /* 0x80BDD6C8@ha */ -/* 80BDD058 C0 03 D6 C8 */ lfs f0, lit_3744@l(r3) /* 0x80BDD6C8@l */ -/* 80BDD05C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80BDD060 41 82 00 08 */ beq lbl_80BDD068 -/* 80BDD064 D0 3C 09 40 */ stfs f1, 0x940(r28) -lbl_80BDD068: -/* 80BDD068 38 00 00 01 */ li r0, 1 -/* 80BDD06C 98 1C 09 3D */ stb r0, 0x93d(r28) -/* 80BDD070 3C 60 80 BE */ lis r3, __vt__14dBgS_ObjGndChk@ha /* 0x80BDD804@ha */ -/* 80BDD074 38 03 D8 04 */ addi r0, r3, __vt__14dBgS_ObjGndChk@l /* 0x80BDD804@l */ -/* 80BDD078 90 01 00 18 */ stw r0, 0x18(r1) -/* 80BDD07C 93 E1 00 28 */ stw r31, 0x28(r1) -/* 80BDD080 93 C1 00 44 */ stw r30, 0x44(r1) -/* 80BDD084 93 A1 00 54 */ stw r29, 0x54(r1) -/* 80BDD088 38 61 00 08 */ addi r3, r1, 8 -/* 80BDD08C 38 80 00 00 */ li r4, 0 -/* 80BDD090 4B 49 A5 61 */ bl __dt__11dBgS_GndChkFv -/* 80BDD094 39 61 00 80 */ addi r11, r1, 0x80 -/* 80BDD098 4B 78 51 89 */ bl _restgpr_27 -/* 80BDD09C 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80BDD0A0 7C 08 03 A6 */ mtlr r0 -/* 80BDD0A4 38 21 00 80 */ addi r1, r1, 0x80 -/* 80BDD0A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_end__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_end__14daObjDigSnow_cFv.s deleted file mode 100644 index 191652628a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_end__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80BDD1BC: -/* 80BDD1BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDD1C0 7C 08 02 A6 */ mflr r0 -/* 80BDD1C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDD1C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDD1CC 7C 7F 1B 78 */ mr r31, r3 -/* 80BDD1D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDD1D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDD1D8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80BDD1DC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BDD1E0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80BDD1E4 7C 05 07 74 */ extsb r5, r0 -/* 80BDD1E8 4B 45 80 19 */ bl onSwitch__10dSv_info_cFii -/* 80BDD1EC 7F E3 FB 78 */ mr r3, r31 -/* 80BDD1F0 4B 43 CA 8D */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80BDD1F4 38 00 00 02 */ li r0, 2 -/* 80BDD1F8 98 1F 09 3D */ stb r0, 0x93d(r31) -/* 80BDD1FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDD200 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDD204 7C 08 03 A6 */ mtlr r0 -/* 80BDD208 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDD20C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_wait__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_wait__14daObjDigSnow_cFv.s deleted file mode 100644 index f8d0194d13..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_wait__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80BDCFA4: -/* 80BDCFA4 38 00 00 00 */ li r0, 0 -/* 80BDCFA8 98 03 09 3D */ stb r0, 0x93d(r3) -/* 80BDCFAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_wait__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_wait__14daObjDigSnow_cFv.s deleted file mode 100644 index fae64794d5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_wait__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80BDCFB0: -/* 80BDCFB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCFB4 7C 08 02 A6 */ mflr r0 -/* 80BDCFB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCFBC 88 03 09 3C */ lbz r0, 0x93c(r3) -/* 80BDCFC0 28 00 00 01 */ cmplwi r0, 1 -/* 80BDCFC4 40 82 00 08 */ bne lbl_80BDCFCC -/* 80BDCFC8 48 00 00 15 */ bl mode_init_dig__14daObjDigSnow_cFv -lbl_80BDCFCC: -/* 80BDCFCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCFD0 7C 08 03 A6 */ mtlr r0 -/* 80BDCFD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCFD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/setBaseMtx__14daObjDigSnow_cFv.s b/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/setBaseMtx__14daObjDigSnow_cFv.s deleted file mode 100644 index 5b1756427a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/setBaseMtx__14daObjDigSnow_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BDCC94: -/* 80BDCC94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCC98 7C 08 02 A6 */ mflr r0 -/* 80BDCC9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCCA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDCCA4 7C 7F 1B 78 */ mr r31, r3 -/* 80BDCCA8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BDCCAC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BDCCB0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80BDCCB4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80BDCCB8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80BDCCBC 4B 76 9C 2D */ bl PSMTXTrans -/* 80BDCCC0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BDCCC4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BDCCC8 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80BDCCCC 4B 42 F7 69 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BDCCD0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BDCCD4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BDCCD8 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80BDCCDC 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BDCCE0 4B 76 97 D1 */ bl PSMTXCopy -/* 80BDCCE4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BDCCE8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BDCCEC 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80BDCCF0 4B 76 97 C1 */ bl PSMTXCopy -/* 80BDCCF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDCCF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCCFC 7C 08 03 A6 */ mtlr r0 -/* 80BDCD00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCD04 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h b/include/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h index d095134cf3..d82823ad50 100644 --- a/include/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h +++ b/include/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h @@ -1,6 +1,60 @@ #ifndef D_A_OBJ_DIGSNOW_H #define D_A_OBJ_DIGSNOW_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" + +class J3DModel; + +class daObjDigSnow_c : public dBgS_MoveBgActor { +public: + enum Mode_e { + /* 0 */ MODE_WAIT_e, + /* 1 */ MODE_DIG_e, + /* 2 */ MODE_END_e, + }; + + enum Action_e { + /* 0 */ ACTION_WAIT_e, + /* 1 */ ACTION_DIG_e, + /* 2 */ ACTION_END_e, + }; + + /* 80BDCC58 */ void initBaseMtx(); + /* 80BDCC94 */ void setBaseMtx(); + /* 80BDCD08 */ virtual int Create(); + /* 80BDCD64 */ virtual int CreateHeap(); + /* 80BDCDD4 */ int create1st(); + /* 80BDCE84 */ virtual int Execute(Mtx**); + /* 80BDCF00 */ void action(); + /* 80BDCFA4 */ void mode_init_wait(); + /* 80BDCFB0 */ void mode_wait(); + /* 80BDCFDC */ void mode_init_dig(); + /* 80BDD124 */ void mode_dig(); + /* 80BDD1BC */ void mode_init_end(); + /* 80BDD210 */ void mode_end(); + /* 80BDD214 */ virtual int Draw(); + /* 80BDD2B8 */ virtual int Delete(); + + u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } + void startDig() { mAction = ACTION_DIG_e; } + void endDig() { mAction = ACTION_END_e; } + +private: + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ dBgS_ObjAcch mAcch; + /* 0x784 */ dBgS_AcchCir mAcchCir; + /* 0x7C4 */ dCcD_Stts mStts; + /* 0x800 */ dCcD_Cyl mCyl; + /* 0x93C */ u8 mMode; + /* 0x93D */ u8 mAction; + /* 0x940 */ f32 mGroundHeight; +}; // Size: 0x944 + +STATIC_ASSERT(sizeof(daObjDigSnow_c) == 0x944); #endif /* D_A_OBJ_DIGSNOW_H */ diff --git a/rel/d/a/obj/d_a_obj_digsnow/Makefile b/rel/d/a/obj/d_a_obj_digsnow/Makefile index fae0ebc1dc..d7fe309554 100644 --- a/rel/d/a/obj/d_a_obj_digsnow/Makefile +++ b/rel/d/a/obj/d_a_obj_digsnow/Makefile @@ -8,12 +8,10 @@ M437_MAP := $(BUILD_DIR)/rel/d/a/obj/d_a_obj_digsnow.map M437_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.cpp \ rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp \ M437_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.o \ M437_LIBS := \ diff --git a/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp b/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp index 48aebf9a1f..3e97132abc 100644 --- a/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp +++ b/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp @@ -1,292 +1,53 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_digsnow +// d_a_obj_digsnow.cpp +// Object - Dig Snow // #include "rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h" -#include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjDigSnow_c { - /* 80BDCC58 */ void initBaseMtx(); - /* 80BDCC94 */ void setBaseMtx(); - /* 80BDCD08 */ void Create(); - /* 80BDCD64 */ void CreateHeap(); - /* 80BDCDD4 */ void create1st(); - /* 80BDCE84 */ void Execute(f32 (**)[3][4]); - /* 80BDCF00 */ void action(); - /* 80BDCFA4 */ void mode_init_wait(); - /* 80BDCFB0 */ void mode_wait(); - /* 80BDCFDC */ void mode_init_dig(); - /* 80BDD124 */ void mode_dig(); - /* 80BDD1BC */ void mode_init_end(); - /* 80BDD210 */ void mode_end(); - /* 80BDD214 */ void Draw(); - /* 80BDD2B8 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) 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 dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80BDD4A8 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 80BDD0AC */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 80BDD574 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~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 dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80BDD504 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct cM3dGCyl { - /* 80BDD418 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80BDD460 */ ~cM3dGAab(); -}; - -struct cCcD_GStts { - /* 80BDD650 */ ~cCcD_GStts(); -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void initBaseMtx__14daObjDigSnow_cFv(); -extern "C" void setBaseMtx__14daObjDigSnow_cFv(); -extern "C" void Create__14daObjDigSnow_cFv(); -extern "C" void CreateHeap__14daObjDigSnow_cFv(); -extern "C" void create1st__14daObjDigSnow_cFv(); -extern "C" void Execute__14daObjDigSnow_cFPPA3_A4_f(); -extern "C" void action__14daObjDigSnow_cFv(); -extern "C" void mode_init_wait__14daObjDigSnow_cFv(); -extern "C" void mode_wait__14daObjDigSnow_cFv(); -extern "C" void mode_init_dig__14daObjDigSnow_cFv(); -extern "C" void __dt__14dBgS_ObjGndChkFv(); -extern "C" void mode_dig__14daObjDigSnow_cFv(); -extern "C" void mode_init_end__14daObjDigSnow_cFv(); -extern "C" void mode_end__14daObjDigSnow_cFv(); -extern "C" void Draw__14daObjDigSnow_cFv(); -extern "C" void Delete__14daObjDigSnow_cFv(); -extern "C" static void daObjDigSnow_create1st__FP14daObjDigSnow_c(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" static void daObjDigSnow_MoveBGDelete__FP14daObjDigSnow_c(); -extern "C" static void daObjDigSnow_MoveBGExecute__FP14daObjDigSnow_c(); -extern "C" static void daObjDigSnow_MoveBGDraw__FP14daObjDigSnow_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" static void func_80BDD698(); -extern "C" static void func_80BDD6A0(); -extern "C" static void func_80BDD6A8(); -extern "C" static void func_80BDD6B0(); -extern "C" static void func_80BDD6B8(); -extern "C" extern char const* const d_a_obj_digsnow__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_delete__FP10fopAc_ac_c(); -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 onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void GroundCross__4cBgSFP11cBgS_GndChk(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void __ct__11dBgS_GndChkFv(); -extern "C" void __dt__11dBgS_GndChkFv(); -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 SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -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]; -extern "C" extern u8 data_80BDD860[4]; +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" // // Declarations: // /* 80BDCC58-80BDCC94 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/initBaseMtx__14daObjDigSnow_cFv.s" +void daObjDigSnow_c::initBaseMtx() { + mpModel->setBaseScale(scale); + setBaseMtx(); } -#pragma pop /* 80BDCC94-80BDCD08 0000B4 0074+00 2/2 0/0 0/0 .text setBaseMtx__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/setBaseMtx__14daObjDigSnow_cFv.s" +void daObjDigSnow_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -#pragma pop /* 80BDCD08-80BDCD64 000128 005C+00 1/0 0/0 0/0 .text Create__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Create__14daObjDigSnow_cFv.s" -} -#pragma pop +int daObjDigSnow_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); -/* ############################################################################################## */ -/* 80BDD6DC-80BDD6DC 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BDD6DC = "Y_horiyuk"; -#pragma pop + attention_info.field_0x0[0x07] = 31; + + mode_init_wait(); + + return TRUE; +} /* 80BDD6E8-80BDD6F4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80BDD6F4-80BDD708 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -297,272 +58,117 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80BDD708-80BDD70C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_digsnow__stringBase0; +static char* l_arcName = "Y_horiyuk"; /* 80BDCD64-80BDCDD4 000184 0070+00 1/0 0/0 0/0 .text CreateHeap__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/CreateHeap__14daObjDigSnow_cFv.s" +int daObjDigSnow_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); + mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + + if (mpModel == NULL) { + return FALSE; + } + + return TRUE; } -#pragma pop /* 80BDCDD4-80BDCE84 0001F4 00B0+00 1/1 0/0 0/0 .text create1st__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/create1st__14daObjDigSnow_cFv.s" +int daObjDigSnow_c::create1st() { + cPhs__Step step; + + if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetHomeRoomNo(this))) { + return cPhs_ERROR_e; + } else { + step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName); + if (step == cPhs_COMPLEATE_e) { + step = + (cPhs__Step)MoveBGCreate(l_arcName, 7, dBgS_MoveBGProc_TypicalRotY, 0x1000, NULL); + if (step == cPhs_ERROR_e) { + return step; + } + } + } + + return step; } -#pragma pop /* 80BDCE84-80BDCF00 0002A4 007C+00 1/0 0/0 0/0 .text Execute__14daObjDigSnow_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Execute__14daObjDigSnow_cFPPA3_A4_f.s" +int daObjDigSnow_c::Execute(Mtx** i_mtx) { + if (dComIfGp_getLinkPlayer()->i_checkWolf()) { + attention_info.flags = 0x80; + } else { + attention_info.flags = 0; + } + + action(); + + *i_mtx = &mBgMtx; + setBaseMtx(); + + return TRUE; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDD70C-80BDD718 -00001 000C+00 0/1 0/0 0/0 .data @3713 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3713[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_wait__14daObjDigSnow_cFv, -}; -#pragma pop - -/* 80BDD718-80BDD724 -00001 000C+00 0/1 0/0 0/0 .data @3714 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3714[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_dig__14daObjDigSnow_cFv, -}; -#pragma pop - -/* 80BDD724-80BDD730 -00001 000C+00 0/1 0/0 0/0 .data @3715 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3715[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_end__14daObjDigSnow_cFv, -}; -#pragma pop - -/* 80BDD730-80BDD754 000048 0024+00 0/1 0/0 0/0 .data l_func$3712 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[36] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop /* 80BDCF00-80BDCFA4 000320 00A4+00 1/1 0/0 0/0 .text action__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::action() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/action__14daObjDigSnow_cFv.s" +void daObjDigSnow_c::action() { + typedef void (daObjDigSnow_c::*action_func)(); + static action_func l_func[] = { + &daObjDigSnow_c::mode_wait, + &daObjDigSnow_c::mode_dig, + &daObjDigSnow_c::mode_end, + }; + + (this->*l_func[mAction])(); } -#pragma pop /* 80BDCFA4-80BDCFB0 0003C4 000C+00 1/1 0/0 0/0 .text mode_init_wait__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::mode_init_wait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_wait__14daObjDigSnow_cFv.s" +void daObjDigSnow_c::mode_init_wait() { + mAction = ACTION_WAIT_e; } -#pragma pop /* 80BDCFB0-80BDCFDC 0003D0 002C+00 1/0 0/0 0/0 .text mode_wait__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::mode_wait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_wait__14daObjDigSnow_cFv.s" +void daObjDigSnow_c::mode_wait() { + if (mMode == MODE_DIG_e) { + mode_init_dig(); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80BDD6C8-80BDD6CC 000000 0004+00 2/2 0/0 0/0 .rodata @3744 */ -SECTION_RODATA static f32 const lit_3744 = -1000000000.0f; -COMPILER_STRIP_GATE(0x80BDD6C8, &lit_3744); - -/* 80BDD754-80BDD774 -00001 0020+00 1/0 0/0 0/0 .data daObjDigSnow_METHODS */ -SECTION_DATA static void* daObjDigSnow_METHODS[8] = { - (void*)daObjDigSnow_create1st__FP14daObjDigSnow_c, - (void*)daObjDigSnow_MoveBGDelete__FP14daObjDigSnow_c, - (void*)daObjDigSnow_MoveBGExecute__FP14daObjDigSnow_c, - (void*)NULL, - (void*)daObjDigSnow_MoveBGDraw__FP14daObjDigSnow_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80BDD774-80BDD7A4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_DigSnow */ -SECTION_DATA extern void* g_profile_Obj_DigSnow[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00900000, (void*)&g_fpcLf_Method, - (void*)0x00000944, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x027A0000, (void*)&daObjDigSnow_METHODS, - (void*)0x00044100, (void*)0x000E0000, -}; - -/* 80BDD7A4-80BDD7B0 0000BC 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80BDD7B0-80BDD7BC 0000C8 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80BDD7BC-80BDD7C8 0000D4 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80BDD7C8-80BDD7D4 0000E0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80BDD7D4-80BDD7E0 0000EC 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80BDD7E0-80BDD804 0000F8 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80BDD6B8, - (void*)NULL, - (void*)NULL, - (void*)func_80BDD6B0, -}; - -/* 80BDD804-80BDD834 00011C 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */ -SECTION_DATA extern void* __vt__14dBgS_ObjGndChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14dBgS_ObjGndChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_80BDD698, - (void*)NULL, - (void*)NULL, - (void*)func_80BDD6A8, - (void*)NULL, - (void*)NULL, - (void*)func_80BDD6A0, -}; /* 80BDCFDC-80BDD0AC 0003FC 00D0+00 1/1 0/0 0/0 .text mode_init_dig__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::mode_init_dig() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_dig__14daObjDigSnow_cFv.s" +void daObjDigSnow_c::mode_init_dig() { + dBgS_ObjGndChk obj_gnd_chk; + + obj_gnd_chk.SetActorPid(mBase.mBsPcId); + obj_gnd_chk.SetPos(¤t.pos); + + f32 gnd_height = dComIfG_Bgsp().GroundCross(&obj_gnd_chk); + if (gnd_height != -1000000000.0f) { + mGroundHeight = gnd_height; + } + + startDig(); } -#pragma pop - -/* 80BDD0AC-80BDD124 0004CC 0078+00 4/3 0/0 0/0 .text __dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__14dBgS_ObjGndChkFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BDD6CC-80BDD6D0 000004 0004+00 0/1 0/0 0/0 .rodata @3761 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3761 = 10.0f; -COMPILER_STRIP_GATE(0x80BDD6CC, &lit_3761); -#pragma pop - -/* 80BDD6D0-80BDD6D4 000008 0004+00 0/1 0/0 0/0 .rodata @3762 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3762 = 35.0f; -COMPILER_STRIP_GATE(0x80BDD6D0, &lit_3762); -#pragma pop - -/* 80BDD6D4-80BDD6D8 00000C 0004+00 0/1 0/0 0/0 .rodata @3763 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3763 = 1.0f; -COMPILER_STRIP_GATE(0x80BDD6D4, &lit_3763); -#pragma pop - -/* 80BDD6D8-80BDD6DC 000010 0004+00 0/1 0/0 0/0 .rodata @3764 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3764 = 30.0f; -COMPILER_STRIP_GATE(0x80BDD6D8, &lit_3764); -#pragma pop /* 80BDD124-80BDD1BC 000544 0098+00 1/0 0/0 0/0 .text mode_dig__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::mode_dig() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_dig__14daObjDigSnow_cFv.s" +void daObjDigSnow_c::mode_dig() { + f32 step = fabsf(((current.pos.y - mGroundHeight) + 10.0f) / 35.0f); + if (step < 1.0f) { + step = 1.0f; + } + + if (cLib_chaseF(¤t.pos.y, mGroundHeight - 30.0f, step) && mMode == MODE_END_e) { + mode_init_end(); + } } -#pragma pop /* 80BDD1BC-80BDD210 0005DC 0054+00 1/1 0/0 0/0 .text mode_init_end__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::mode_init_end() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/mode_init_end__14daObjDigSnow_cFv.s" +void daObjDigSnow_c::mode_init_end() { + dComIfGs_onSwitch(getSwNo(), fopAcM_GetHomeRoomNo(this)); + fopAcM_delete(this); + endDig(); } -#pragma pop /* 80BDD210-80BDD214 000630 0004+00 1/0 0/0 0/0 .text mode_end__14daObjDigSnow_cFv */ void daObjDigSnow_c::mode_end() { @@ -570,192 +176,69 @@ void daObjDigSnow_c::mode_end() { } /* 80BDD214-80BDD2B8 000634 00A4+00 1/0 0/0 0/0 .text Draw__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Draw__14daObjDigSnow_cFv.s" +int daObjDigSnow_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + + return TRUE; } -#pragma pop /* 80BDD2B8-80BDD2EC 0006D8 0034+00 1/0 0/0 0/0 .text Delete__14daObjDigSnow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigSnow_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/Delete__14daObjDigSnow_cFv.s" +int daObjDigSnow_c::Delete() { + dComIfG_resDelete(&mPhaseReq, l_arcName); + return TRUE; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDD834-80BDD85C 00014C 0028+00 1/1 0/0 0/0 .data __vt__14daObjDigSnow_c */ -SECTION_DATA extern void* __vt__14daObjDigSnow_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__14daObjDigSnow_cFv, - (void*)Create__14daObjDigSnow_cFv, - (void*)Execute__14daObjDigSnow_cFPPA3_A4_f, - (void*)Draw__14daObjDigSnow_cFv, - (void*)Delete__14daObjDigSnow_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 80BDD2EC-80BDD418 00070C 012C+00 1/0 0/0 0/0 .text daObjDigSnow_create1st__FP14daObjDigSnow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigSnow_create1st(daObjDigSnow_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_create1st__FP14daObjDigSnow_c.s" -} -#pragma pop +static int daObjDigSnow_create1st(daObjDigSnow_c* i_this) { + fopAcM_SetupActor(i_this, daObjDigSnow_c); -/* 80BDD418-80BDD460 000838 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__8cM3dGCylFv.s" + return i_this->create1st(); } -#pragma pop - -/* 80BDD460-80BDD4A8 000880 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80BDD4A8-80BDD504 0008C8 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80BDD504-80BDD574 000924 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 80BDD574-80BDD5E4 000994 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop /* 80BDD5E4-80BDD604 000A04 0020+00 1/0 0/0 0/0 .text * daObjDigSnow_MoveBGDelete__FP14daObjDigSnow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigSnow_MoveBGDelete(daObjDigSnow_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGDelete__FP14daObjDigSnow_c.s" +static int daObjDigSnow_MoveBGDelete(daObjDigSnow_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80BDD604-80BDD624 000A24 0020+00 1/0 0/0 0/0 .text * daObjDigSnow_MoveBGExecute__FP14daObjDigSnow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigSnow_MoveBGExecute(daObjDigSnow_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGExecute__FP14daObjDigSnow_c.s" +static int daObjDigSnow_MoveBGExecute(daObjDigSnow_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80BDD624-80BDD650 000A44 002C+00 1/0 0/0 0/0 .text daObjDigSnow_MoveBGDraw__FP14daObjDigSnow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigSnow_MoveBGDraw(daObjDigSnow_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/daObjDigSnow_MoveBGDraw__FP14daObjDigSnow_c.s" +static int daObjDigSnow_MoveBGDraw(daObjDigSnow_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop -/* 80BDD650-80BDD698 000A70 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/__dt__10cCcD_GSttsFv.s" -} -#pragma pop +/* 80BDD754-80BDD774 -00001 0020+00 1/0 0/0 0/0 .data daObjDigSnow_METHODS */ +static actor_method_class daObjDigSnow_METHODS = { + (process_method_func)daObjDigSnow_create1st, (process_method_func)daObjDigSnow_MoveBGDelete, + (process_method_func)daObjDigSnow_MoveBGExecute, NULL, + (process_method_func)daObjDigSnow_MoveBGDraw, +}; -/* 80BDD698-80BDD6A0 000AB8 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BDD698() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD698.s" -} -#pragma pop - -/* 80BDD6A0-80BDD6A8 000AC0 0008+00 1/0 0/0 0/0 .text @76@__dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BDD6A0() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6A0.s" -} -#pragma pop - -/* 80BDD6A8-80BDD6B0 000AC8 0008+00 1/0 0/0 0/0 .text @60@__dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BDD6A8() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6A8.s" -} -#pragma pop - -/* 80BDD6B0-80BDD6B8 000AD0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BDD6B0() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6B0.s" -} -#pragma pop - -/* 80BDD6B8-80BDD6C0 000AD8 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BDD6B8() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow/func_80BDD6B8.s" -} -#pragma pop - -/* 80BDD6DC-80BDD6DC 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +extern actor_process_profile_definition g_profile_Obj_DigSnow = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_DigSnow, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjDigSnow_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 634, // mPriority + &daObjDigSnow_METHODS, // sub_method + 0x44100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; diff --git a/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.cpp deleted file mode 100644 index f76d07018d..0000000000 --- a/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: unknown_translation_unit_bss -// - -#include "rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 data_80BDD860[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BDD860-80BDD864 000000 0004+00 0/0 1/1 0/0 .bss None */ -extern u8 data_80BDD860[4]; -u8 data_80BDD860[4];