From ca1ece683b3eae1a9dcf4fe9ba971d2eb82b64ae Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Fri, 12 Jul 2024 23:24:50 -0700 Subject: [PATCH] Lv5key / Iceblock done (#2177) * obj_lv5key * obj_iceblock done * remove asm --- Progress.md | 16 +- ..._9daAlink_cFQ29dBgW_Base13PushPullLabeli.s | 97 - .../Action__13daObjLv5Key_cFv.s | 21 - .../CreateHeap__13daObjLv5Key_cFv.s | 58 - .../Delete__13daObjLv5Key_cFv.s | 14 - .../d_a_obj_Lv5Key/Draw__13daObjLv5Key_cFv.s | 45 - .../Execute__13daObjLv5Key_cFv.s | 17 - .../d_a_obj_Lv5Key/Fall__13daObjLv5Key_cFi.s | 110 - .../d_a_obj_Lv5Key/Init__13daObjLv5Key_cFv.s | 51 - .../d_a_obj_Lv5Key/Land__13daObjLv5Key_cFi.s | 64 - .../d_a_obj_Lv5Key/Open__13daObjLv5Key_cFi.s | 59 - .../d_a_obj_Lv5Key/Shake__13daObjLv5Key_cFi.s | 88 - ...ranslateByNowDirect__13daObjLv5Key_cFfff.s | 25 - .../d_a_obj_Lv5Key/Wait__13daObjLv5Key_cFi.s | 63 - .../d_a_obj_Lv5Key/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_obj_Lv5Key/__dt__12dBgS_ObjAcchFv.s | 30 - .../d_a_obj_Lv5Key/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_Lv5Key/__dt__8cM3dGSphFv.s | 20 - .../create_1st__13daObjLv5Key_cFv.s | 113 - .../daObjLv5Key_Create__FP10fopAc_ac_c.s | 9 - .../daObjLv5Key_Delete__FP13daObjLv5Key_c.s | 10 - .../daObjLv5Key_Draw__FP13daObjLv5Key_c.s | 9 - .../daObjLv5Key_Execute__FP13daObjLv5Key_c.s | 9 - .../d_a_obj_Lv5Key/func_80B9C908.s | 3 - .../d_a_obj_Lv5Key/func_80B9C910.s | 3 - .../initCcSph__13daObjLv5Key_cFv.s | 25 - ...daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi.s | 45 - .../setBaseMtx__13daObjLv5Key_cFv.s | 31 - .../setBgc__13daObjLv5Key_cFv.s | 29 - .../setCcSph__13daObjLv5Key_cFv.s | 50 - .../useHeapInit__FP10fopAc_ac_c.s | 9 - .../CreateHeap__13daObjIceBlk_cFv.s | 127 -- .../Create__13daObjIceBlk_cFv.s | 242 --- .../Delete__13daObjIceBlk_cFv.s | 52 - .../Draw__13daObjIceBlk_cFv.s | 68 - .../Execute__13daObjIceBlk_cFPPA3_A4_f.s | 39 - .../d_a_obj_iceblock/__dt__10cCcD_GSttsFv.s | 20 - .../d_a_obj_iceblock/__dt__10dCcD_GSttsFv.s | 26 - .../d_a_obj_iceblock/__dt__12dBgS_AcchCirFv.s | 30 - .../d_a_obj_iceblock/__dt__12dBgS_ObjAcchFv.s | 30 - .../__dt__14dBgS_ObjGndChkFv.s | 32 - .../d_a_obj_iceblock/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_iceblock/__dt__8cM3dGCylFv.s | 20 - .../d_a_obj_iceblock/__dt__8cM3dGPlaFv.s | 20 - .../actionEvent__13daObjIceBlk_cFv.s | 35 - .../actionOrderEvent__13daObjIceBlk_cFv.s | 47 - .../actionWait__13daObjIceBlk_cFv.s | 27 - .../bgCheck__13daObjIceBlk_cFv.s | 48 - .../checkBgHit__13daObjIceBlk_cFv.s | 61 - .../checkFall__13daObjIceBlk_cFv.s | 91 - .../checkWalk__13daObjIceBlk_cFv.s | 122 -- .../checkWallPre__13daObjIceBlk_cFs.s | 114 - .../clrCounter__13daObjIceBlk_cFv.s | 11 - .../create1st__13daObjIceBlk_cFv.s | 52 - ...bjIceBlk_MoveBGDelete__FP13daObjIceBlk_c.s | 9 - ...aObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c.s | 12 - ...jIceBlk_MoveBGExecute__FP13daObjIceBlk_c.s | 9 - ...daObjIceBlk_create1st__FP13daObjIceBlk_c.s | 92 - .../disablePushPull__13daObjIceBlk_cFv.s | 21 - .../enablePushPull__13daObjIceBlk_cFv.s | 21 - .../event_proc_call__13daObjIceBlk_cFv.s | 49 - .../d_a_obj_iceblock/func_80C21CD8.s | 63 - .../d_a_obj_iceblock/func_80C242C4.s | 3 - .../d_a_obj_iceblock/func_80C242CC.s | 3 - .../d_a_obj_iceblock/func_80C242D4.s | 3 - .../d_a_obj_iceblock/func_80C242DC.s | 3 - .../d_a_obj_iceblock/func_80C242E4.s | 3 - .../getPointNo__13daObjIceBlk_cFv.s | 38 - .../initBaseMtx__13daObjIceBlk_cFv.s | 26 - .../init_bgCheck__13daObjIceBlk_cFv.s | 22 - .../loadCurrentPos__13daObjIceBlk_cFv.s | 41 - .../mode_init_wait__13daObjIceBlk_cFv.s | 33 - .../mode_init_walk__13daObjIceBlk_cFv.s | 13 - .../mode_proc_call__13daObjIceBlk_cFv.s | 254 --- .../mode_proc_wait__13daObjIceBlk_cFv.s | 60 - .../mode_proc_walk__13daObjIceBlk_cFv.s | 201 -- ...lBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s | 7 - .../saveCurrentPos__13daObjIceBlk_cFv.s | 163 -- .../setBaseMtx__13daObjIceBlk_cFv.s | 34 - .../setEffect__13daObjIceBlk_cFv.s | 101 - include/SSystem/SComponent/c_bg_s_chk.h | 7 +- include/SSystem/SComponent/c_lib.h | 6 +- include/d/a/d_a_alink.h | 4 +- include/d/bg/d_bg_s.h | 2 +- include/d/bg/d_bg_w_base.h | 10 +- .../d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h | 77 +- .../a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h | 92 +- rel/d/a/door/d_a_door_push/d_a_door_push.cpp | 4 +- rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp | 891 +++----- rel/d/a/obj/d_a_obj_iceblock/Makefile | 2 - .../obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp | 1846 +++++++---------- .../unknown_translation_unit_bss.cpp | 28 - src/d/a/d_a_alink_grab.inc | 60 +- src/d/bg/d_bg_s.cpp | 8 +- 94 files changed, 1303 insertions(+), 5515 deletions(-) delete mode 100644 asm/d/a/d_a_alink/setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Action__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/CreateHeap__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Delete__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Draw__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Execute__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Fall__13daObjLv5Key_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Init__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Land__13daObjLv5Key_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Open__13daObjLv5Key_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Shake__13daObjLv5Key_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/TranslateByNowDirect__13daObjLv5Key_cFfff.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Wait__13daObjLv5Key_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGSphFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/create_1st__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Delete__FP13daObjLv5Key_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Draw__FP13daObjLv5Key_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Execute__FP13daObjLv5Key_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/func_80B9C908.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/func_80B9C910.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/initCcSph__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setBaseMtx__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setBgc__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setCcSph__13daObjLv5Key_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/CreateHeap__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Create__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Delete__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Draw__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Execute__13daObjIceBlk_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__10cCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__10dCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_AcchCirFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__14dBgS_ObjGndChkFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGPlaFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionEvent__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionOrderEvent__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionWait__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/bgCheck__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkBgHit__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkFall__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkWalk__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkWallPre__13daObjIceBlk_cFs.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/clrCounter__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/create1st__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_create1st__FP13daObjIceBlk_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/disablePushPull__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/enablePushPull__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/event_proc_call__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C21CD8.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242C4.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242CC.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242D4.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242DC.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242E4.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/getPointNo__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/initBaseMtx__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/init_bgCheck__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/loadCurrentPos__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_init_wait__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_init_walk__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_call__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_wait__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_walk__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/saveCurrentPos__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/setBaseMtx__13daObjIceBlk_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/setEffect__13daObjIceBlk_cFv.s delete mode 100644 rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp diff --git a/Progress.md b/Progress.md index b6d09f4940..b690a443a5 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 50.755503% | 1825444 | 3596544 +.text | 50.765513% | 1825804 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 55.945374% | 2249380 | 4020672 +Total | 55.954328% | 2249740 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 55.945374% | 2249380 | 4020672 -RELs | 39.141193% | 4501364 | 11500324 -Total | 43.494271% | 6750744 | 15520996 +main.dol | 55.954328% | 2249740 | 4020672 +RELs | 39.260076% | 4515036 | 11500324 +Total | 43.584677% | 6764776 | 15520996 ## RELs @@ -339,7 +339,7 @@ d_a_npc_zelda | 37.603569% | 7080 | 18828 d_a_npc_zra | 27.520869% | 29804 | 108296 d_a_npc_zrc | 32.120762% | 10384 | 32328 d_a_npc_zrz | 36.950639% | 15840 | 42868 -d_a_obj_Lv5Key | 37.172105% | 2324 | 6252 +d_a_obj_Lv5Key | 100.000000% | 6252 | 6252 d_a_obj_Turara | 38.494412% | 4684 | 12168 d_a_obj_TvCdlst | 43.547170% | 2308 | 5300 d_a_obj_Y_taihou | 37.379068% | 3400 | 9096 @@ -439,7 +439,7 @@ d_a_obj_hhashi | 33.138856% | 3408 | 10284 d_a_obj_hsTarget | 100.000000% | 2624 | 2624 d_a_obj_ice_l | 49.736247% | 2640 | 5308 d_a_obj_ice_s | 35.446009% | 2416 | 6816 -d_a_obj_iceblock | 32.744340% | 4744 | 14488 +d_a_obj_iceblock | 100.000000% | 14488 | 14488 d_a_obj_iceleaf | 37.604212% | 3428 | 9116 d_a_obj_ihasi | 43.372216% | 1636 | 3772 d_a_obj_ikada | 40.697674% | 1960 | 4816 @@ -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 | 39.141193% | 4501364 | 11500324 +Total | 39.260076% | 4515036 | 11500324 diff --git a/asm/d/a/d_a_alink/setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli.s b/asm/d/a/d_a_alink/setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli.s deleted file mode 100644 index 4d2c8b4fb8..0000000000 --- a/asm/d/a/d_a_alink/setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_800E7F3C: -/* 800E7F3C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E7F40 7C 08 02 A6 */ mflr r0 -/* 800E7F44 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E7F48 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E7F4C 48 27 A2 91 */ bl _savegpr_29 -/* 800E7F50 7C 7F 1B 78 */ mr r31, r3 -/* 800E7F54 7C 9D 23 79 */ or. r29, r4, r4 -/* 800E7F58 7C BE 2B 78 */ mr r30, r5 -/* 800E7F5C 41 82 00 14 */ beq lbl_800E7F70 -/* 800E7F60 80 1F 31 98 */ lwz r0, 0x3198(r31) -/* 800E7F64 2C 00 00 00 */ cmpwi r0, 0 -/* 800E7F68 41 82 00 08 */ beq lbl_800E7F70 -/* 800E7F6C 63 BD 00 04 */ ori r29, r29, 4 -lbl_800E7F70: -/* 800E7F70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E7F74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E7F78 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800E7F7C 38 9F 1E 1C */ addi r4, r31, 0x1e1c -/* 800E7F80 7F E5 FB 78 */ mr r5, r31 -/* 800E7F84 A8 DF 04 E6 */ lha r6, 0x4e6(r31) -/* 800E7F88 7F A7 EB 78 */ mr r7, r29 -/* 800E7F8C 4B F8 DC E1 */ bl PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel -/* 800E7F90 28 03 00 00 */ cmplwi r3, 0 -/* 800E7F94 40 82 00 0C */ bne lbl_800E7FA0 -/* 800E7F98 38 60 00 00 */ li r3, 0 -/* 800E7F9C 48 00 00 F0 */ b lbl_800E808C -lbl_800E7FA0: -/* 800E7FA0 2C 1D 00 00 */ cmpwi r29, 0 -/* 800E7FA4 40 82 00 0C */ bne lbl_800E7FB0 -/* 800E7FA8 2C 1E 00 00 */ cmpwi r30, 0 -/* 800E7FAC 41 82 00 BC */ beq lbl_800E8068 -lbl_800E7FB0: -/* 800E7FB0 A8 83 04 E6 */ lha r4, 0x4e6(r3) -/* 800E7FB4 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 800E7FB8 7C 04 00 00 */ cmpw r4, r0 -/* 800E7FBC 41 82 00 7C */ beq lbl_800E8038 -/* 800E7FC0 7C 00 20 50 */ subf r0, r0, r4 -/* 800E7FC4 7C 05 07 34 */ extsh r5, r0 -/* 800E7FC8 A8 1F 30 0E */ lha r0, 0x300e(r31) -/* 800E7FCC 7C 00 2A 14 */ add r0, r0, r5 -/* 800E7FD0 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800E7FD4 A8 1F 30 0E */ lha r0, 0x300e(r31) -/* 800E7FD8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 800E7FDC 3C 80 80 44 */ lis r4, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 800E7FE0 38 84 9A 20 */ addi r4, r4, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 800E7FE4 7C 44 04 2E */ lfsx f2, r4, r0 -/* 800E7FE8 C0 3F 37 C8 */ lfs f1, 0x37c8(r31) -/* 800E7FEC C0 1F 34 7C */ lfs f0, 0x347c(r31) -/* 800E7FF0 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 800E7FF4 EC 01 00 2A */ fadds f0, f1, f0 -/* 800E7FF8 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 800E7FFC A8 1F 30 0E */ lha r0, 0x300e(r31) -/* 800E8000 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 800E8004 7C 84 02 14 */ add r4, r4, r0 -/* 800E8008 C0 44 00 04 */ lfs f2, 4(r4) -/* 800E800C C0 3F 37 D0 */ lfs f1, 0x37d0(r31) -/* 800E8010 C0 1F 34 7C */ lfs f0, 0x347c(r31) -/* 800E8014 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 800E8018 EC 01 00 2A */ fadds f0, f1, f0 -/* 800E801C D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 800E8020 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800E8024 7C 00 2A 14 */ add r0, r0, r5 -/* 800E8028 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 800E802C A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 800E8030 7C 00 2A 14 */ add r0, r0, r5 -/* 800E8034 B0 1F 04 DE */ sth r0, 0x4de(r31) -lbl_800E8038: -/* 800E8038 C0 5F 04 D0 */ lfs f2, 0x4d0(r31) -/* 800E803C C0 23 04 D0 */ lfs f1, 0x4d0(r3) -/* 800E8040 C0 1F 37 C8 */ lfs f0, 0x37c8(r31) -/* 800E8044 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800E8048 EC 02 00 2A */ fadds f0, f2, f0 -/* 800E804C D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 800E8050 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) -/* 800E8054 C0 23 04 D8 */ lfs f1, 0x4d8(r3) -/* 800E8058 C0 1F 37 D0 */ lfs f0, 0x37d0(r31) -/* 800E805C EC 01 00 28 */ fsubs f0, f1, f0 -/* 800E8060 EC 02 00 2A */ fadds f0, f2, f0 -/* 800E8064 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -lbl_800E8068: -/* 800E8068 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 800E806C D0 1F 37 C8 */ stfs f0, 0x37c8(r31) -/* 800E8070 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 800E8074 D0 1F 37 CC */ stfs f0, 0x37cc(r31) -/* 800E8078 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 800E807C D0 1F 37 D0 */ stfs f0, 0x37d0(r31) -/* 800E8080 A8 03 04 E6 */ lha r0, 0x4e6(r3) -/* 800E8084 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800E8088 38 60 00 01 */ li r3, 1 -lbl_800E808C: -/* 800E808C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E8090 48 27 A1 99 */ bl _restgpr_29 -/* 800E8094 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E8098 7C 08 03 A6 */ mtlr r0 -/* 800E809C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E80A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Action__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Action__13daObjLv5Key_cFv.s deleted file mode 100644 index bf353b4e9c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Action__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80B9BDD8: -/* 80B9BDD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9BDDC 7C 08 02 A6 */ mflr r0 -/* 80B9BDE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9BDE4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80B9BDE8 7C 7F 1B 78 */ mr r31, r3 -/* 80B9BDEC 38 7F 09 48 */ addi r3, r31, 0x948 -/* 80B9BDF0 4B 7C 62 29 */ bl __ptmf_test -/* 80B9BDF4 2C 03 00 00 */ cmpwi r3, 0 -/* 80B9BDF8 41 82 00 18 */ beq lbl_80B9BE10 -/* 80B9BDFC 7F E3 FB 78 */ mr r3, r31 -/* 80B9BE00 38 80 00 00 */ li r4, 0 -/* 80B9BE04 39 9F 09 48 */ addi r12, r31, 0x948 -/* 80B9BE08 4B 7C 62 7D */ bl __ptmf_scall -/* 80B9BE0C 60 00 00 00 */ nop -lbl_80B9BE10: -/* 80B9BE10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80B9BE14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9BE18 7C 08 03 A6 */ mtlr r0 -/* 80B9BE1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9BE20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/CreateHeap__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/CreateHeap__13daObjLv5Key_cFv.s deleted file mode 100644 index 2ab226db07..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/CreateHeap__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80B9B9B8: -/* 80B9B9B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80B9B9BC 7C 08 02 A6 */ mflr r0 -/* 80B9B9C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80B9B9C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80B9B9C8 4B 7C 68 15 */ bl _savegpr_29 -/* 80B9B9CC 7C 7D 1B 78 */ mr r29, r3 -/* 80B9B9D0 3C 60 80 BA */ lis r3, l_arcName@ha /* 0x80B9C9B4@ha */ -/* 80B9B9D4 38 63 C9 B4 */ addi r3, r3, l_arcName@l /* 0x80B9C9B4@l */ -/* 80B9B9D8 80 63 00 00 */ lwz r3, 0(r3) -/* 80B9B9DC 38 80 00 07 */ li r4, 7 -/* 80B9B9E0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80B9B9E4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80B9B9E8 3F C5 00 02 */ addis r30, r5, 2 -/* 80B9B9EC 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80B9B9F0 7F C5 F3 78 */ mr r5, r30 -/* 80B9B9F4 38 C0 00 80 */ li r6, 0x80 -/* 80B9B9F8 4B 4A 08 F5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80B9B9FC 7C 7F 1B 78 */ mr r31, r3 -/* 80B9BA00 3C 60 80 BA */ lis r3, l_arcName@ha /* 0x80B9C9B4@ha */ -/* 80B9BA04 38 63 C9 B4 */ addi r3, r3, l_arcName@l /* 0x80B9C9B4@l */ -/* 80B9BA08 80 63 00 00 */ lwz r3, 0(r3) -/* 80B9BA0C 38 80 00 04 */ li r4, 4 -/* 80B9BA10 7F C5 F3 78 */ mr r5, r30 -/* 80B9BA14 38 C0 00 80 */ li r6, 0x80 -/* 80B9BA18 4B 4A 08 D5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80B9BA1C 7C 7E 1B 78 */ mr r30, r3 -/* 80B9BA20 7F E3 FB 78 */ mr r3, r31 -/* 80B9BA24 3C 80 00 08 */ lis r4, 8 -/* 80B9BA28 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80B9BA2C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80B9BA30 4B 47 92 25 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80B9BA34 90 7D 05 90 */ stw r3, 0x590(r29) -/* 80B9BA38 80 1D 05 90 */ lwz r0, 0x590(r29) -/* 80B9BA3C 28 00 00 00 */ cmplwi r0, 0 -/* 80B9BA40 40 82 00 0C */ bne lbl_80B9BA4C -/* 80B9BA44 38 60 00 00 */ li r3, 0 -/* 80B9BA48 48 00 00 34 */ b lbl_80B9BA7C -lbl_80B9BA4C: -/* 80B9BA4C 38 7D 05 94 */ addi r3, r29, 0x594 -/* 80B9BA50 7F C4 F3 78 */ mr r4, r30 -/* 80B9BA54 38 A0 00 01 */ li r5, 1 -/* 80B9BA58 38 C0 00 00 */ li r6, 0 -/* 80B9BA5C 3C E0 80 BA */ lis r7, lit_3755@ha /* 0x80B9C920@ha */ -/* 80B9BA60 C0 27 C9 20 */ lfs f1, lit_3755@l(r7) /* 0x80B9C920@l */ -/* 80B9BA64 38 E0 00 00 */ li r7, 0 -/* 80B9BA68 39 00 FF FF */ li r8, -1 -/* 80B9BA6C 39 20 00 00 */ li r9, 0 -/* 80B9BA70 4B 47 1D 6D */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80B9BA74 30 03 FF FF */ addic r0, r3, -1 -/* 80B9BA78 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80B9BA7C: -/* 80B9BA7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80B9BA80 4B 7C 67 A9 */ bl _restgpr_29 -/* 80B9BA84 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80B9BA88 7C 08 03 A6 */ mtlr r0 -/* 80B9BA8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80B9BA90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Delete__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Delete__13daObjLv5Key_cFv.s deleted file mode 100644 index 0b2812f017..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Delete__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80B9C500: -/* 80B9C500 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C504 7C 08 02 A6 */ mflr r0 -/* 80B9C508 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C50C 3C 80 80 BA */ lis r4, l_arcName@ha /* 0x80B9C9B4@ha */ -/* 80B9C510 38 84 C9 B4 */ addi r4, r4, l_arcName@l /* 0x80B9C9B4@l */ -/* 80B9C514 80 84 00 00 */ lwz r4, 0(r4) -/* 80B9C518 38 63 05 B0 */ addi r3, r3, 0x5b0 -/* 80B9C51C 4B 49 0A ED */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80B9C520 38 60 00 01 */ li r3, 1 -/* 80B9C524 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C528 7C 08 03 A6 */ mtlr r0 -/* 80B9C52C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C530 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Draw__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Draw__13daObjLv5Key_cFv.s deleted file mode 100644 index ced3db7415..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Draw__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80B9C450: -/* 80B9C450 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C454 7C 08 02 A6 */ mflr r0 -/* 80B9C458 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C45C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80B9C460 7C 7F 1B 78 */ mr r31, r3 -/* 80B9C464 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80B9C468 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80B9C46C 38 80 00 10 */ li r4, 0x10 -/* 80B9C470 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80B9C474 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80B9C478 4B 60 73 4D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80B9C47C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80B9C480 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80B9C484 80 9F 05 90 */ lwz r4, 0x590(r31) -/* 80B9C488 80 84 00 04 */ lwz r4, 4(r4) -/* 80B9C48C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80B9C490 4B 60 89 11 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80B9C494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80B9C498 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80B9C49C 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80B9C4A0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80B9C4A4 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80B9C4A8 90 03 00 48 */ stw r0, 0x48(r3) -/* 80B9C4AC 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80B9C4B0 90 03 00 4C */ stw r0, 0x4c(r3) -/* 80B9C4B4 80 7F 05 90 */ lwz r3, 0x590(r31) -/* 80B9C4B8 80 83 00 04 */ lwz r4, 4(r3) -/* 80B9C4BC 38 7F 05 94 */ addi r3, r31, 0x594 -/* 80B9C4C0 C0 3F 05 A4 */ lfs f1, 0x5a4(r31) -/* 80B9C4C4 4B 47 15 09 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80B9C4C8 80 7F 05 90 */ lwz r3, 0x590(r31) -/* 80B9C4CC 4B 47 17 F9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80B9C4D0 80 7F 05 90 */ lwz r3, 0x590(r31) -/* 80B9C4D4 80 63 00 04 */ lwz r3, 4(r3) -/* 80B9C4D8 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80B9C4DC 80 63 00 00 */ lwz r3, 0(r3) -/* 80B9C4E0 38 00 00 00 */ li r0, 0 -/* 80B9C4E4 90 03 00 54 */ stw r0, 0x54(r3) -/* 80B9C4E8 38 60 00 01 */ li r3, 1 -/* 80B9C4EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80B9C4F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C4F4 7C 08 03 A6 */ mtlr r0 -/* 80B9C4F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C4FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Execute__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Execute__13daObjLv5Key_cFv.s deleted file mode 100644 index 9b710a22b0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Execute__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80B9C410: -/* 80B9C410 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C414 7C 08 02 A6 */ mflr r0 -/* 80B9C418 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C41C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80B9C420 7C 7F 1B 78 */ mr r31, r3 -/* 80B9C424 4B FF F9 B5 */ bl Action__13daObjLv5Key_cFv -/* 80B9C428 7F E3 FB 78 */ mr r3, r31 -/* 80B9C42C 48 00 01 09 */ bl setBaseMtx__13daObjLv5Key_cFv -/* 80B9C430 7F E3 FB 78 */ mr r3, r31 -/* 80B9C434 4B FF F7 F9 */ bl setCcSph__13daObjLv5Key_cFv -/* 80B9C438 38 60 00 01 */ li r3, 1 -/* 80B9C43C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80B9C440 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C444 7C 08 03 A6 */ mtlr r0 -/* 80B9C448 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C44C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Fall__13daObjLv5Key_cFi.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Fall__13daObjLv5Key_cFi.s deleted file mode 100644 index 3d434f8322..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Fall__13daObjLv5Key_cFi.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_80B9BFDC: -/* 80B9BFDC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80B9BFE0 7C 08 02 A6 */ mflr r0 -/* 80B9BFE4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80B9BFE8 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80B9BFEC F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80B9BFF0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80B9BFF4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80B9BFF8 7C 7F 1B 78 */ mr r31, r3 -/* 80B9BFFC 3C 80 80 BA */ lis r4, lit_3755@ha /* 0x80B9C920@ha */ -/* 80B9C000 3B C4 C9 20 */ addi r30, r4, lit_3755@l /* 0x80B9C920@l */ -/* 80B9C004 A8 03 09 54 */ lha r0, 0x954(r3) -/* 80B9C008 2C 00 00 01 */ cmpwi r0, 1 -/* 80B9C00C 41 82 00 4C */ beq lbl_80B9C058 -/* 80B9C010 40 80 00 14 */ bge lbl_80B9C024 -/* 80B9C014 2C 00 FF FF */ cmpwi r0, -1 -/* 80B9C018 41 82 01 44 */ beq lbl_80B9C15C -/* 80B9C01C 40 80 00 14 */ bge lbl_80B9C030 -/* 80B9C020 48 00 01 3C */ b lbl_80B9C15C -lbl_80B9C024: -/* 80B9C024 2C 00 00 03 */ cmpwi r0, 3 -/* 80B9C028 40 80 01 34 */ bge lbl_80B9C15C -/* 80B9C02C 48 00 00 AC */ b lbl_80B9C0D8 -lbl_80B9C030: -/* 80B9C030 C0 1E 00 1C */ lfs f0, 0x1c(r30) -/* 80B9C034 D0 1F 05 2C */ stfs f0, 0x52c(r31) -/* 80B9C038 D0 1F 04 F8 */ stfs f0, 0x4f8(r31) -/* 80B9C03C D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80B9C040 D0 1F 05 00 */ stfs f0, 0x500(r31) -/* 80B9C044 C0 1E 00 68 */ lfs f0, 0x68(r30) -/* 80B9C048 D0 1F 05 30 */ stfs f0, 0x530(r31) -/* 80B9C04C 38 00 00 01 */ li r0, 1 -/* 80B9C050 B0 1F 09 54 */ sth r0, 0x954(r31) -/* 80B9C054 48 00 01 08 */ b lbl_80B9C15C -lbl_80B9C058: -/* 80B9C058 4B 47 E5 B5 */ bl fopAcM_calcSpeed__FP10fopAc_ac_c -/* 80B9C05C 7F E3 FB 78 */ mr r3, r31 -/* 80B9C060 38 80 00 00 */ li r4, 0 -/* 80B9C064 4B 47 E5 FD */ bl fopAcM_posMove__FP10fopAc_ac_cPC4cXyz -/* 80B9C068 C3 FF 04 D4 */ lfs f31, 0x4d4(r31) -/* 80B9C06C C0 1E 00 6C */ lfs f0, 0x6c(r30) -/* 80B9C070 EC 1F 00 28 */ fsubs f0, f31, f0 -/* 80B9C074 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80B9C078 38 7F 05 F8 */ addi r3, r31, 0x5f8 -/* 80B9C07C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80B9C080 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80B9C084 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80B9C088 4B 4D AA 25 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80B9C08C D3 FF 04 D4 */ stfs f31, 0x4d4(r31) -/* 80B9C090 80 1F 06 24 */ lwz r0, 0x624(r31) -/* 80B9C094 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80B9C098 41 82 00 C4 */ beq lbl_80B9C15C -/* 80B9C09C C0 1E 00 70 */ lfs f0, 0x70(r30) -/* 80B9C0A0 D0 1F 05 2C */ stfs f0, 0x52c(r31) -/* 80B9C0A4 C0 3E 00 1C */ lfs f1, 0x1c(r30) -/* 80B9C0A8 D0 3F 04 F8 */ stfs f1, 0x4f8(r31) -/* 80B9C0AC C0 1E 00 74 */ lfs f0, 0x74(r30) -/* 80B9C0B0 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80B9C0B4 D0 3F 05 00 */ stfs f1, 0x500(r31) -/* 80B9C0B8 38 00 01 20 */ li r0, 0x120 -/* 80B9C0BC B0 1F 09 64 */ sth r0, 0x964(r31) -/* 80B9C0C0 38 00 00 00 */ li r0, 0 -/* 80B9C0C4 B0 1F 09 66 */ sth r0, 0x966(r31) -/* 80B9C0C8 B0 1F 09 68 */ sth r0, 0x968(r31) -/* 80B9C0CC 38 00 00 02 */ li r0, 2 -/* 80B9C0D0 B0 1F 09 54 */ sth r0, 0x954(r31) -/* 80B9C0D4 48 00 00 88 */ b lbl_80B9C15C -lbl_80B9C0D8: -/* 80B9C0D8 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80B9C0DC 38 9F 09 64 */ addi r4, r31, 0x964 -/* 80B9C0E0 4B 6C B3 7D */ bl __apl__5csXyzFR5csXyz -/* 80B9C0E4 7F E3 FB 78 */ mr r3, r31 -/* 80B9C0E8 4B 47 E5 25 */ bl fopAcM_calcSpeed__FP10fopAc_ac_c -/* 80B9C0EC 7F E3 FB 78 */ mr r3, r31 -/* 80B9C0F0 38 80 00 00 */ li r4, 0 -/* 80B9C0F4 4B 47 E5 6D */ bl fopAcM_posMove__FP10fopAc_ac_cPC4cXyz -/* 80B9C0F8 C3 FF 04 D4 */ lfs f31, 0x4d4(r31) -/* 80B9C0FC C0 1E 00 78 */ lfs f0, 0x78(r30) -/* 80B9C100 EC 1F 00 28 */ fsubs f0, f31, f0 -/* 80B9C104 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80B9C108 38 7F 05 F8 */ addi r3, r31, 0x5f8 -/* 80B9C10C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80B9C110 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80B9C114 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80B9C118 4B 4D A9 95 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80B9C11C D3 FF 04 D4 */ stfs f31, 0x4d4(r31) -/* 80B9C120 80 1F 06 24 */ lwz r0, 0x624(r31) -/* 80B9C124 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80B9C128 41 82 00 34 */ beq lbl_80B9C15C -/* 80B9C12C 3C 60 80 BA */ lis r3, lit_3891@ha /* 0x80B9C9E8@ha */ -/* 80B9C130 38 83 C9 E8 */ addi r4, r3, lit_3891@l /* 0x80B9C9E8@l */ -/* 80B9C134 80 64 00 00 */ lwz r3, 0(r4) -/* 80B9C138 80 04 00 04 */ lwz r0, 4(r4) -/* 80B9C13C 90 61 00 08 */ stw r3, 8(r1) -/* 80B9C140 90 01 00 0C */ stw r0, 0xc(r1) -/* 80B9C144 80 04 00 08 */ lwz r0, 8(r4) -/* 80B9C148 90 01 00 10 */ stw r0, 0x10(r1) -/* 80B9C14C 7F E3 FB 78 */ mr r3, r31 -/* 80B9C150 38 81 00 08 */ addi r4, r1, 8 -/* 80B9C154 38 A0 00 01 */ li r5, 1 -/* 80B9C158 4B FF FB D9 */ bl setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi -lbl_80B9C15C: -/* 80B9C15C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80B9C160 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80B9C164 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80B9C168 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80B9C16C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80B9C170 7C 08 03 A6 */ mtlr r0 -/* 80B9C174 38 21 00 30 */ addi r1, r1, 0x30 -/* 80B9C178 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Init__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Init__13daObjLv5Key_cFv.s deleted file mode 100644 index 866d1e8fa4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Init__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80B9BA94: -/* 80B9BA94 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80B9BA98 7C 08 02 A6 */ mflr r0 -/* 80B9BA9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80B9BAA0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80B9BAA4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80B9BAA8 7C 7E 1B 78 */ mr r30, r3 -/* 80B9BAAC 3C 80 80 BA */ lis r4, lit_3755@ha /* 0x80B9C920@ha */ -/* 80B9BAB0 3B E4 C9 20 */ addi r31, r4, lit_3755@l /* 0x80B9C920@l */ -/* 80B9BAB4 48 00 01 19 */ bl initCcSph__13daObjLv5Key_cFv -/* 80B9BAB8 7F C3 F3 78 */ mr r3, r30 -/* 80B9BABC C0 3F 00 04 */ lfs f1, 4(r31) -/* 80B9BAC0 C0 5F 00 08 */ lfs f2, 8(r31) -/* 80B9BAC4 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 80B9BAC8 C0 9F 00 10 */ lfs f4, 0x10(r31) -/* 80B9BACC C0 BF 00 14 */ lfs f5, 0x14(r31) -/* 80B9BAD0 C0 DF 00 18 */ lfs f6, 0x18(r31) -/* 80B9BAD4 4B 47 EA 75 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80B9BAD8 C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 80B9BADC D0 1E 09 58 */ stfs f0, 0x958(r30) -/* 80B9BAE0 D0 1E 09 5C */ stfs f0, 0x95c(r30) -/* 80B9BAE4 D0 1E 09 60 */ stfs f0, 0x960(r30) -/* 80B9BAE8 38 00 00 00 */ li r0, 0 -/* 80B9BAEC 98 1E 09 45 */ stb r0, 0x945(r30) -/* 80B9BAF0 3C 60 80 3A */ lis r3, __ptmf_null@ha /* 0x803A2180@ha */ -/* 80B9BAF4 38 83 21 80 */ addi r4, r3, __ptmf_null@l /* 0x803A2180@l */ -/* 80B9BAF8 80 64 00 00 */ lwz r3, 0(r4) -/* 80B9BAFC 80 04 00 04 */ lwz r0, 4(r4) -/* 80B9BB00 90 7E 09 48 */ stw r3, 0x948(r30) -/* 80B9BB04 90 1E 09 4C */ stw r0, 0x94c(r30) -/* 80B9BB08 80 04 00 08 */ lwz r0, 8(r4) -/* 80B9BB0C 90 1E 09 50 */ stw r0, 0x950(r30) -/* 80B9BB10 3C 60 80 BA */ lis r3, lit_3759@ha /* 0x80B9C9B8@ha */ -/* 80B9BB14 38 83 C9 B8 */ addi r4, r3, lit_3759@l /* 0x80B9C9B8@l */ -/* 80B9BB18 80 64 00 00 */ lwz r3, 0(r4) -/* 80B9BB1C 80 04 00 04 */ lwz r0, 4(r4) -/* 80B9BB20 90 61 00 08 */ stw r3, 8(r1) -/* 80B9BB24 90 01 00 0C */ stw r0, 0xc(r1) -/* 80B9BB28 80 04 00 08 */ lwz r0, 8(r4) -/* 80B9BB2C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80B9BB30 7F C3 F3 78 */ mr r3, r30 -/* 80B9BB34 38 81 00 08 */ addi r4, r1, 8 -/* 80B9BB38 38 A0 00 01 */ li r5, 1 -/* 80B9BB3C 48 00 01 F5 */ bl setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi -/* 80B9BB40 38 60 00 04 */ li r3, 4 -/* 80B9BB44 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80B9BB48 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80B9BB4C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80B9BB50 7C 08 03 A6 */ mtlr r0 -/* 80B9BB54 38 21 00 20 */ addi r1, r1, 0x20 -/* 80B9BB58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Land__13daObjLv5Key_cFi.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Land__13daObjLv5Key_cFi.s deleted file mode 100644 index ae91222522..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Land__13daObjLv5Key_cFi.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80B9C17C: -/* 80B9C17C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C180 7C 08 02 A6 */ mflr r0 -/* 80B9C184 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C188 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80B9C18C 93 C1 00 08 */ stw r30, 8(r1) -/* 80B9C190 7C 7E 1B 78 */ mr r30, r3 -/* 80B9C194 3C 80 80 BA */ lis r4, lit_3755@ha /* 0x80B9C920@ha */ -/* 80B9C198 3B E4 C9 20 */ addi r31, r4, lit_3755@l /* 0x80B9C920@l */ -/* 80B9C19C A8 03 09 54 */ lha r0, 0x954(r3) -/* 80B9C1A0 2C 00 00 00 */ cmpwi r0, 0 -/* 80B9C1A4 41 82 00 18 */ beq lbl_80B9C1BC -/* 80B9C1A8 40 80 00 08 */ bge lbl_80B9C1B0 -/* 80B9C1AC 48 00 00 A4 */ b lbl_80B9C250 -lbl_80B9C1B0: -/* 80B9C1B0 2C 00 00 02 */ cmpwi r0, 2 -/* 80B9C1B4 40 80 00 9C */ bge lbl_80B9C250 -/* 80B9C1B8 48 00 00 5C */ b lbl_80B9C214 -lbl_80B9C1BC: -/* 80B9C1BC C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80B9C1C0 FC 40 08 90 */ fmr f2, f1 -/* 80B9C1C4 C0 7F 00 7C */ lfs f3, 0x7c(r31) -/* 80B9C1C8 48 00 01 E9 */ bl TranslateByNowDirect__13daObjLv5Key_cFfff -/* 80B9C1CC C0 1F 00 80 */ lfs f0, 0x80(r31) -/* 80B9C1D0 D0 1E 09 58 */ stfs f0, 0x958(r30) -/* 80B9C1D4 C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 80B9C1D8 D0 1E 09 5C */ stfs f0, 0x95c(r30) -/* 80B9C1DC C0 1F 00 88 */ lfs f0, 0x88(r31) -/* 80B9C1E0 D0 1E 09 60 */ stfs f0, 0x960(r30) -/* 80B9C1E4 38 00 02 C0 */ li r0, 0x2c0 -/* 80B9C1E8 B0 1E 09 6A */ sth r0, 0x96a(r30) -/* 80B9C1EC 38 80 00 00 */ li r4, 0 -/* 80B9C1F0 B0 9E 09 6C */ sth r4, 0x96c(r30) -/* 80B9C1F4 B0 9E 09 6E */ sth r4, 0x96e(r30) -/* 80B9C1F8 A8 7E 09 64 */ lha r3, 0x964(r30) -/* 80B9C1FC 38 03 FF F0 */ addi r0, r3, -16 -/* 80B9C200 B0 1E 09 64 */ sth r0, 0x964(r30) -/* 80B9C204 B0 9E 09 68 */ sth r4, 0x968(r30) -/* 80B9C208 38 00 00 01 */ li r0, 1 -/* 80B9C20C B0 1E 09 54 */ sth r0, 0x954(r30) -/* 80B9C210 48 00 00 40 */ b lbl_80B9C250 -lbl_80B9C214: -/* 80B9C214 38 7E 09 64 */ addi r3, r30, 0x964 -/* 80B9C218 38 9E 09 6A */ addi r4, r30, 0x96a -/* 80B9C21C 4B 6C B2 41 */ bl __apl__5csXyzFR5csXyz -/* 80B9C220 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 80B9C224 38 9E 09 64 */ addi r4, r30, 0x964 -/* 80B9C228 4B 6C B2 35 */ bl __apl__5csXyzFR5csXyz -/* 80B9C22C A8 1E 04 E4 */ lha r0, 0x4e4(r30) -/* 80B9C230 2C 00 40 00 */ cmpwi r0, 0x4000 -/* 80B9C234 41 80 00 1C */ blt lbl_80B9C250 -/* 80B9C238 38 00 40 00 */ li r0, 0x4000 -/* 80B9C23C B0 1E 04 E4 */ sth r0, 0x4e4(r30) -/* 80B9C240 38 00 00 03 */ li r0, 3 -/* 80B9C244 98 1E 09 45 */ stb r0, 0x945(r30) -/* 80B9C248 38 00 FF FF */ li r0, -1 -/* 80B9C24C B0 1E 09 54 */ sth r0, 0x954(r30) -lbl_80B9C250: -/* 80B9C250 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80B9C254 83 C1 00 08 */ lwz r30, 8(r1) -/* 80B9C258 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C25C 7C 08 03 A6 */ mtlr r0 -/* 80B9C260 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C264 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Open__13daObjLv5Key_cFi.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Open__13daObjLv5Key_cFi.s deleted file mode 100644 index 3afb4d72db..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Open__13daObjLv5Key_cFi.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80B9BF08: -/* 80B9BF08 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80B9BF0C 7C 08 02 A6 */ mflr r0 -/* 80B9BF10 90 01 00 24 */ stw r0, 0x24(r1) -/* 80B9BF14 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80B9BF18 7C 7F 1B 78 */ mr r31, r3 -/* 80B9BF1C A8 03 09 54 */ lha r0, 0x954(r3) -/* 80B9BF20 2C 00 00 00 */ cmpwi r0, 0 -/* 80B9BF24 41 82 00 18 */ beq lbl_80B9BF3C -/* 80B9BF28 40 80 00 08 */ bge lbl_80B9BF30 -/* 80B9BF2C 48 00 00 9C */ b lbl_80B9BFC8 -lbl_80B9BF30: -/* 80B9BF30 2C 00 00 02 */ cmpwi r0, 2 -/* 80B9BF34 40 80 00 94 */ bge lbl_80B9BFC8 -/* 80B9BF38 48 00 00 28 */ b lbl_80B9BF60 -lbl_80B9BF3C: -/* 80B9BF3C 3C 60 80 BA */ lis r3, lit_3755@ha /* 0x80B9C920@ha */ -/* 80B9BF40 C0 03 C9 20 */ lfs f0, lit_3755@l(r3) /* 0x80B9C920@l */ -/* 80B9BF44 D0 1F 05 A0 */ stfs f0, 0x5a0(r31) -/* 80B9BF48 80 1F 08 38 */ lwz r0, 0x838(r31) -/* 80B9BF4C 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80B9BF50 90 1F 08 38 */ stw r0, 0x838(r31) -/* 80B9BF54 38 00 00 01 */ li r0, 1 -/* 80B9BF58 B0 1F 09 54 */ sth r0, 0x954(r31) -/* 80B9BF5C 48 00 00 6C */ b lbl_80B9BFC8 -lbl_80B9BF60: -/* 80B9BF60 38 7F 05 94 */ addi r3, r31, 0x594 -/* 80B9BF64 4B 47 14 C5 */ bl play__14mDoExt_baseAnmFv -/* 80B9BF68 38 80 00 01 */ li r4, 1 -/* 80B9BF6C 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 80B9BF70 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80B9BF74 40 82 00 1C */ bne lbl_80B9BF90 -/* 80B9BF78 3C 60 80 BA */ lis r3, lit_3773@ha /* 0x80B9C93C@ha */ -/* 80B9BF7C C0 23 C9 3C */ lfs f1, lit_3773@l(r3) /* 0x80B9C93C@l */ -/* 80B9BF80 C0 1F 05 A0 */ lfs f0, 0x5a0(r31) -/* 80B9BF84 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80B9BF88 41 82 00 08 */ beq lbl_80B9BF90 -/* 80B9BF8C 38 80 00 00 */ li r4, 0 -lbl_80B9BF90: -/* 80B9BF90 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 80B9BF94 41 82 00 34 */ beq lbl_80B9BFC8 -/* 80B9BF98 3C 60 80 BA */ lis r3, lit_3862@ha /* 0x80B9C9DC@ha */ -/* 80B9BF9C 38 83 C9 DC */ addi r4, r3, lit_3862@l /* 0x80B9C9DC@l */ -/* 80B9BFA0 80 64 00 00 */ lwz r3, 0(r4) -/* 80B9BFA4 80 04 00 04 */ lwz r0, 4(r4) -/* 80B9BFA8 90 61 00 08 */ stw r3, 8(r1) -/* 80B9BFAC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80B9BFB0 80 04 00 08 */ lwz r0, 8(r4) -/* 80B9BFB4 90 01 00 10 */ stw r0, 0x10(r1) -/* 80B9BFB8 7F E3 FB 78 */ mr r3, r31 -/* 80B9BFBC 38 81 00 08 */ addi r4, r1, 8 -/* 80B9BFC0 38 A0 00 01 */ li r5, 1 -/* 80B9BFC4 4B FF FD 6D */ bl setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi -lbl_80B9BFC8: -/* 80B9BFC8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80B9BFCC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80B9BFD0 7C 08 03 A6 */ mtlr r0 -/* 80B9BFD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80B9BFD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Shake__13daObjLv5Key_cFi.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Shake__13daObjLv5Key_cFi.s deleted file mode 100644 index 534eb26aa9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Shake__13daObjLv5Key_cFi.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_80B9C268: -/* 80B9C268 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80B9C26C 7C 08 02 A6 */ mflr r0 -/* 80B9C270 90 01 00 24 */ stw r0, 0x24(r1) -/* 80B9C274 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80B9C278 7C 7F 1B 78 */ mr r31, r3 -/* 80B9C27C A8 03 09 54 */ lha r0, 0x954(r3) -/* 80B9C280 2C 00 00 01 */ cmpwi r0, 1 -/* 80B9C284 41 82 00 4C */ beq lbl_80B9C2D0 -/* 80B9C288 40 80 00 14 */ bge lbl_80B9C29C -/* 80B9C28C 2C 00 FF FF */ cmpwi r0, -1 -/* 80B9C290 41 82 01 0C */ beq lbl_80B9C39C -/* 80B9C294 40 80 00 14 */ bge lbl_80B9C2A8 -/* 80B9C298 48 00 01 04 */ b lbl_80B9C39C -lbl_80B9C29C: -/* 80B9C29C 2C 00 00 03 */ cmpwi r0, 3 -/* 80B9C2A0 40 80 00 FC */ bge lbl_80B9C39C -/* 80B9C2A4 48 00 00 74 */ b lbl_80B9C318 -lbl_80B9C2A8: -/* 80B9C2A8 3C 60 80 BA */ lis r3, lit_3773@ha /* 0x80B9C93C@ha */ -/* 80B9C2AC C0 03 C9 3C */ lfs f0, lit_3773@l(r3) /* 0x80B9C93C@l */ -/* 80B9C2B0 D0 1F 09 58 */ stfs f0, 0x958(r31) -/* 80B9C2B4 D0 1F 09 5C */ stfs f0, 0x95c(r31) -/* 80B9C2B8 D0 1F 09 60 */ stfs f0, 0x960(r31) -/* 80B9C2BC 38 00 00 1E */ li r0, 0x1e -/* 80B9C2C0 B0 1F 09 56 */ sth r0, 0x956(r31) -/* 80B9C2C4 38 00 00 01 */ li r0, 1 -/* 80B9C2C8 B0 1F 09 54 */ sth r0, 0x954(r31) -/* 80B9C2CC 48 00 00 D0 */ b lbl_80B9C39C -lbl_80B9C2D0: -/* 80B9C2D0 A8 7F 09 56 */ lha r3, 0x956(r31) -/* 80B9C2D4 38 03 FF FF */ addi r0, r3, -1 -/* 80B9C2D8 B0 1F 09 56 */ sth r0, 0x956(r31) -/* 80B9C2DC 7C 00 07 35 */ extsh. r0, r0 -/* 80B9C2E0 41 81 00 BC */ bgt lbl_80B9C39C -/* 80B9C2E4 38 80 00 02 */ li r4, 2 -/* 80B9C2E8 98 9F 09 70 */ stb r4, 0x970(r31) -/* 80B9C2EC 38 00 FF 00 */ li r0, -256 -/* 80B9C2F0 B0 1F 09 64 */ sth r0, 0x964(r31) -/* 80B9C2F4 38 60 00 00 */ li r3, 0 -/* 80B9C2F8 B0 7F 09 66 */ sth r3, 0x966(r31) -/* 80B9C2FC B0 7F 09 68 */ sth r3, 0x968(r31) -/* 80B9C300 38 00 00 2A */ li r0, 0x2a -/* 80B9C304 B0 1F 09 6A */ sth r0, 0x96a(r31) -/* 80B9C308 B0 7F 09 6C */ sth r3, 0x96c(r31) -/* 80B9C30C B0 7F 09 6E */ sth r3, 0x96e(r31) -/* 80B9C310 B0 9F 09 54 */ sth r4, 0x954(r31) -/* 80B9C314 48 00 00 88 */ b lbl_80B9C39C -lbl_80B9C318: -/* 80B9C318 38 7F 09 64 */ addi r3, r31, 0x964 -/* 80B9C31C 38 9F 09 6A */ addi r4, r31, 0x96a -/* 80B9C320 4B 6C B1 3D */ bl __apl__5csXyzFR5csXyz -/* 80B9C324 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80B9C328 38 9F 09 64 */ addi r4, r31, 0x964 -/* 80B9C32C 4B 6C B1 31 */ bl __apl__5csXyzFR5csXyz -/* 80B9C330 A8 1F 04 E4 */ lha r0, 0x4e4(r31) -/* 80B9C334 2C 00 00 00 */ cmpwi r0, 0 -/* 80B9C338 41 80 00 64 */ blt lbl_80B9C39C -/* 80B9C33C 38 60 00 00 */ li r3, 0 -/* 80B9C340 B0 7F 04 E4 */ sth r3, 0x4e4(r31) -/* 80B9C344 38 00 FF 00 */ li r0, -256 -/* 80B9C348 B0 1F 09 64 */ sth r0, 0x964(r31) -/* 80B9C34C B0 7F 09 66 */ sth r3, 0x966(r31) -/* 80B9C350 B0 7F 09 68 */ sth r3, 0x968(r31) -/* 80B9C354 88 7F 09 70 */ lbz r3, 0x970(r31) -/* 80B9C358 38 03 FF FF */ addi r0, r3, -1 -/* 80B9C35C 98 1F 09 70 */ stb r0, 0x970(r31) -/* 80B9C360 88 1F 09 70 */ lbz r0, 0x970(r31) -/* 80B9C364 7C 00 07 75 */ extsb. r0, r0 -/* 80B9C368 41 81 00 34 */ bgt lbl_80B9C39C -/* 80B9C36C 3C 60 80 BA */ lis r3, lit_3947@ha /* 0x80B9C9F4@ha */ -/* 80B9C370 38 83 C9 F4 */ addi r4, r3, lit_3947@l /* 0x80B9C9F4@l */ -/* 80B9C374 80 64 00 00 */ lwz r3, 0(r4) -/* 80B9C378 80 04 00 04 */ lwz r0, 4(r4) -/* 80B9C37C 90 61 00 08 */ stw r3, 8(r1) -/* 80B9C380 90 01 00 0C */ stw r0, 0xc(r1) -/* 80B9C384 80 04 00 08 */ lwz r0, 8(r4) -/* 80B9C388 90 01 00 10 */ stw r0, 0x10(r1) -/* 80B9C38C 7F E3 FB 78 */ mr r3, r31 -/* 80B9C390 38 81 00 08 */ addi r4, r1, 8 -/* 80B9C394 38 A0 00 01 */ li r5, 1 -/* 80B9C398 4B FF F9 99 */ bl setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi -lbl_80B9C39C: -/* 80B9C39C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80B9C3A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80B9C3A4 7C 08 03 A6 */ mtlr r0 -/* 80B9C3A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80B9C3AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/TranslateByNowDirect__13daObjLv5Key_cFfff.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/TranslateByNowDirect__13daObjLv5Key_cFfff.s deleted file mode 100644 index a1dd41d9b8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/TranslateByNowDirect__13daObjLv5Key_cFfff.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80B9C3B0: -/* 80B9C3B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80B9C3B4 7C 08 02 A6 */ mflr r0 -/* 80B9C3B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80B9C3BC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80B9C3C0 7C 7F 1B 78 */ mr r31, r3 -/* 80B9C3C4 D0 21 00 08 */ stfs f1, 8(r1) -/* 80B9C3C8 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 80B9C3CC D0 61 00 10 */ stfs f3, 0x10(r1) -/* 80B9C3D0 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80B9C3D4 4B 47 0B 39 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz -/* 80B9C3D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80B9C3DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80B9C3E0 38 81 00 08 */ addi r4, r1, 8 -/* 80B9C3E4 7C 85 23 78 */ mr r5, r4 -/* 80B9C3E8 4B 7A A9 85 */ bl PSMTXMultVec -/* 80B9C3EC 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80B9C3F0 38 81 00 08 */ addi r4, r1, 8 -/* 80B9C3F4 7C 65 1B 78 */ mr r5, r3 -/* 80B9C3F8 4B 7A AC 99 */ bl PSVECAdd -/* 80B9C3FC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80B9C400 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80B9C404 7C 08 03 A6 */ mtlr r0 -/* 80B9C408 38 21 00 20 */ addi r1, r1, 0x20 -/* 80B9C40C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Wait__13daObjLv5Key_cFi.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Wait__13daObjLv5Key_cFi.s deleted file mode 100644 index d2437f172b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Wait__13daObjLv5Key_cFi.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80B9BE24: -/* 80B9BE24 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80B9BE28 7C 08 02 A6 */ mflr r0 -/* 80B9BE2C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80B9BE30 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80B9BE34 7C 7F 1B 78 */ mr r31, r3 -/* 80B9BE38 A8 03 09 54 */ lha r0, 0x954(r3) -/* 80B9BE3C 2C 00 00 00 */ cmpwi r0, 0 -/* 80B9BE40 41 82 00 18 */ beq lbl_80B9BE58 -/* 80B9BE44 40 80 00 08 */ bge lbl_80B9BE4C -/* 80B9BE48 48 00 00 AC */ b lbl_80B9BEF4 -lbl_80B9BE4C: -/* 80B9BE4C 2C 00 00 02 */ cmpwi r0, 2 -/* 80B9BE50 40 80 00 A4 */ bge lbl_80B9BEF4 -/* 80B9BE54 48 00 00 24 */ b lbl_80B9BE78 -lbl_80B9BE58: -/* 80B9BE58 38 00 00 00 */ li r0, 0 -/* 80B9BE5C 98 1F 09 45 */ stb r0, 0x945(r31) -/* 80B9BE60 3C 60 80 BA */ lis r3, lit_3773@ha /* 0x80B9C93C@ha */ -/* 80B9BE64 C0 03 C9 3C */ lfs f0, lit_3773@l(r3) /* 0x80B9C93C@l */ -/* 80B9BE68 D0 1F 05 A0 */ stfs f0, 0x5a0(r31) -/* 80B9BE6C 38 00 00 01 */ li r0, 1 -/* 80B9BE70 B0 1F 09 54 */ sth r0, 0x954(r31) -/* 80B9BE74 48 00 00 80 */ b lbl_80B9BEF4 -lbl_80B9BE78: -/* 80B9BE78 88 1F 09 45 */ lbz r0, 0x945(r31) -/* 80B9BE7C 7C 00 07 74 */ extsb r0, r0 -/* 80B9BE80 2C 00 00 02 */ cmpwi r0, 2 -/* 80B9BE84 40 82 00 3C */ bne lbl_80B9BEC0 -/* 80B9BE88 4B FF FC D5 */ bl setBgc__13daObjLv5Key_cFv -/* 80B9BE8C 3C 60 80 BA */ lis r3, lit_3837@ha /* 0x80B9C9C4@ha */ -/* 80B9BE90 38 83 C9 C4 */ addi r4, r3, lit_3837@l /* 0x80B9C9C4@l */ -/* 80B9BE94 80 64 00 00 */ lwz r3, 0(r4) -/* 80B9BE98 80 04 00 04 */ lwz r0, 4(r4) -/* 80B9BE9C 90 61 00 14 */ stw r3, 0x14(r1) -/* 80B9BEA0 90 01 00 18 */ stw r0, 0x18(r1) -/* 80B9BEA4 80 04 00 08 */ lwz r0, 8(r4) -/* 80B9BEA8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80B9BEAC 7F E3 FB 78 */ mr r3, r31 -/* 80B9BEB0 38 81 00 14 */ addi r4, r1, 0x14 -/* 80B9BEB4 38 A0 00 01 */ li r5, 1 -/* 80B9BEB8 4B FF FE 79 */ bl setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi -/* 80B9BEBC 48 00 00 38 */ b lbl_80B9BEF4 -lbl_80B9BEC0: -/* 80B9BEC0 2C 00 00 01 */ cmpwi r0, 1 -/* 80B9BEC4 40 82 00 30 */ bne lbl_80B9BEF4 -/* 80B9BEC8 3C 80 80 BA */ lis r4, lit_3842@ha /* 0x80B9C9D0@ha */ -/* 80B9BECC 38 A4 C9 D0 */ addi r5, r4, lit_3842@l /* 0x80B9C9D0@l */ -/* 80B9BED0 80 85 00 00 */ lwz r4, 0(r5) -/* 80B9BED4 80 05 00 04 */ lwz r0, 4(r5) -/* 80B9BED8 90 81 00 08 */ stw r4, 8(r1) -/* 80B9BEDC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80B9BEE0 80 05 00 08 */ lwz r0, 8(r5) -/* 80B9BEE4 90 01 00 10 */ stw r0, 0x10(r1) -/* 80B9BEE8 38 81 00 08 */ addi r4, r1, 8 -/* 80B9BEEC 38 A0 00 01 */ li r5, 1 -/* 80B9BEF0 4B FF FE 41 */ bl setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi -lbl_80B9BEF4: -/* 80B9BEF4 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80B9BEF8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80B9BEFC 7C 08 03 A6 */ mtlr r0 -/* 80B9BF00 38 21 00 30 */ addi r1, r1, 0x30 -/* 80B9BF04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 539bf41cd9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80B9C898: -/* 80B9C898 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C89C 7C 08 02 A6 */ mflr r0 -/* 80B9C8A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C8A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80B9C8A8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80B9C8AC 41 82 00 1C */ beq lbl_80B9C8C8 -/* 80B9C8B0 3C A0 80 BA */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80B9CA8C@ha */ -/* 80B9C8B4 38 05 CA 8C */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80B9CA8C@l */ -/* 80B9C8B8 90 1F 00 00 */ stw r0, 0(r31) -/* 80B9C8BC 7C 80 07 35 */ extsh. r0, r4 -/* 80B9C8C0 40 81 00 08 */ ble lbl_80B9C8C8 -/* 80B9C8C4 4B 73 24 79 */ bl __dl__FPv -lbl_80B9C8C8: -/* 80B9C8C8 7F E3 FB 78 */ mr r3, r31 -/* 80B9C8CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80B9C8D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C8D4 7C 08 03 A6 */ mtlr r0 -/* 80B9C8D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C8DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index dbfbd5d3af..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80B9C828: -/* 80B9C828 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C82C 7C 08 02 A6 */ mflr r0 -/* 80B9C830 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C834 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80B9C838 93 C1 00 08 */ stw r30, 8(r1) -/* 80B9C83C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80B9C840 7C 9F 23 78 */ mr r31, r4 -/* 80B9C844 41 82 00 38 */ beq lbl_80B9C87C -/* 80B9C848 3C 80 80 BA */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80B9CA68@ha */ -/* 80B9C84C 38 84 CA 68 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80B9CA68@l */ -/* 80B9C850 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80B9C854 38 04 00 0C */ addi r0, r4, 0xc -/* 80B9C858 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80B9C85C 38 04 00 18 */ addi r0, r4, 0x18 -/* 80B9C860 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80B9C864 38 80 00 00 */ li r4, 0 -/* 80B9C868 4B 4D 97 2D */ bl __dt__9dBgS_AcchFv -/* 80B9C86C 7F E0 07 35 */ extsh. r0, r31 -/* 80B9C870 40 81 00 0C */ ble lbl_80B9C87C -/* 80B9C874 7F C3 F3 78 */ mr r3, r30 -/* 80B9C878 4B 73 24 C5 */ bl __dl__FPv -lbl_80B9C87C: -/* 80B9C87C 7F C3 F3 78 */ mr r3, r30 -/* 80B9C880 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80B9C884 83 C1 00 08 */ lwz r30, 8(r1) -/* 80B9C888 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C88C 7C 08 03 A6 */ mtlr r0 -/* 80B9C890 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C894 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGAabFv.s deleted file mode 100644 index 683fad62aa..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80B9C7E0: -/* 80B9C7E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C7E4 7C 08 02 A6 */ mflr r0 -/* 80B9C7E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C7EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80B9C7F0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80B9C7F4 41 82 00 1C */ beq lbl_80B9C810 -/* 80B9C7F8 3C A0 80 BA */ lis r5, __vt__8cM3dGAab@ha /* 0x80B9CA5C@ha */ -/* 80B9C7FC 38 05 CA 5C */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80B9CA5C@l */ -/* 80B9C800 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80B9C804 7C 80 07 35 */ extsh. r0, r4 -/* 80B9C808 40 81 00 08 */ ble lbl_80B9C810 -/* 80B9C80C 4B 73 25 31 */ bl __dl__FPv -lbl_80B9C810: -/* 80B9C810 7F E3 FB 78 */ mr r3, r31 -/* 80B9C814 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80B9C818 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C81C 7C 08 03 A6 */ mtlr r0 -/* 80B9C820 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C824 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGSphFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGSphFv.s deleted file mode 100644 index ed998be249..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80B9C798: -/* 80B9C798 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C79C 7C 08 02 A6 */ mflr r0 -/* 80B9C7A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C7A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80B9C7A8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80B9C7AC 41 82 00 1C */ beq lbl_80B9C7C8 -/* 80B9C7B0 3C A0 80 BA */ lis r5, __vt__8cM3dGSph@ha /* 0x80B9CA50@ha */ -/* 80B9C7B4 38 05 CA 50 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80B9CA50@l */ -/* 80B9C7B8 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80B9C7BC 7C 80 07 35 */ extsh. r0, r4 -/* 80B9C7C0 40 81 00 08 */ ble lbl_80B9C7C8 -/* 80B9C7C4 4B 73 25 79 */ bl __dl__FPv -lbl_80B9C7C8: -/* 80B9C7C8 7F E3 FB 78 */ mr r3, r31 -/* 80B9C7CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80B9C7D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C7D4 7C 08 03 A6 */ mtlr r0 -/* 80B9C7D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C7DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/create_1st__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/create_1st__13daObjLv5Key_cFv.s deleted file mode 100644 index 9d83b438e8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/create_1st__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_80B9C5EC: -/* 80B9C5EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80B9C5F0 7C 08 02 A6 */ mflr r0 -/* 80B9C5F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80B9C5F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80B9C5FC 4B 7C 5B E1 */ bl _savegpr_29 -/* 80B9C600 7C 7F 1B 78 */ mr r31, r3 -/* 80B9C604 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80B9C608 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80B9C60C 40 82 01 0C */ bne lbl_80B9C718 -/* 80B9C610 7F E0 FB 79 */ or. r0, r31, r31 -/* 80B9C614 41 82 00 F8 */ beq lbl_80B9C70C -/* 80B9C618 7C 1E 03 78 */ mr r30, r0 -/* 80B9C61C 4B 47 C5 49 */ bl __ct__10fopAc_ac_cFv -/* 80B9C620 38 7E 05 6C */ addi r3, r30, 0x56c -/* 80B9C624 4B 72 22 21 */ bl __ct__16Z2SoundObjSimpleFv -/* 80B9C628 3B BE 05 94 */ addi r29, r30, 0x594 -/* 80B9C62C 3C 60 80 BA */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80B9CA8C@ha */ -/* 80B9C630 38 03 CA 8C */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80B9CA8C@l */ -/* 80B9C634 90 1E 05 94 */ stw r0, 0x594(r30) -/* 80B9C638 7F A3 EB 78 */ mr r3, r29 -/* 80B9C63C 38 80 00 00 */ li r4, 0 -/* 80B9C640 4B 78 BD BD */ bl init__12J3DFrameCtrlFs -/* 80B9C644 38 00 00 00 */ li r0, 0 -/* 80B9C648 90 1D 00 18 */ stw r0, 0x18(r29) -/* 80B9C64C 38 7E 05 B8 */ addi r3, r30, 0x5b8 -/* 80B9C650 4B 4D 98 5D */ bl __ct__12dBgS_AcchCirFv -/* 80B9C654 3B BE 05 F8 */ addi r29, r30, 0x5f8 -/* 80B9C658 7F A3 EB 78 */ mr r3, r29 -/* 80B9C65C 4B 4D 9A 45 */ bl __ct__9dBgS_AcchFv -/* 80B9C660 3C 60 80 BA */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80B9CA68@ha */ -/* 80B9C664 38 63 CA 68 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80B9CA68@l */ -/* 80B9C668 90 7D 00 10 */ stw r3, 0x10(r29) -/* 80B9C66C 38 03 00 0C */ addi r0, r3, 0xc -/* 80B9C670 90 1D 00 14 */ stw r0, 0x14(r29) -/* 80B9C674 38 03 00 18 */ addi r0, r3, 0x18 -/* 80B9C678 90 1D 00 24 */ stw r0, 0x24(r29) -/* 80B9C67C 38 7D 00 14 */ addi r3, r29, 0x14 -/* 80B9C680 4B 4D C7 E9 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80B9C684 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80B9C688 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80B9C68C 90 1E 07 E8 */ stw r0, 0x7e8(r30) -/* 80B9C690 38 7E 07 EC */ addi r3, r30, 0x7ec -/* 80B9C694 4B 4E 70 CD */ bl __ct__10dCcD_GSttsFv -/* 80B9C698 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80B9C69C 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80B9C6A0 90 7E 07 E8 */ stw r3, 0x7e8(r30) -/* 80B9C6A4 38 03 00 20 */ addi r0, r3, 0x20 -/* 80B9C6A8 90 1E 07 EC */ stw r0, 0x7ec(r30) -/* 80B9C6AC 3B BE 08 0C */ addi r29, r30, 0x80c -/* 80B9C6B0 7F A3 EB 78 */ mr r3, r29 -/* 80B9C6B4 4B 4E 73 75 */ bl __ct__12dCcD_GObjInfFv -/* 80B9C6B8 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80B9C6BC 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80B9C6C0 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80B9C6C4 3C 60 80 BA */ lis r3, __vt__8cM3dGAab@ha /* 0x80B9CA5C@ha */ -/* 80B9C6C8 38 03 CA 5C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80B9CA5C@l */ -/* 80B9C6CC 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 80B9C6D0 3C 60 80 BA */ lis r3, __vt__8cM3dGSph@ha /* 0x80B9CA50@ha */ -/* 80B9C6D4 38 03 CA 50 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80B9CA50@l */ -/* 80B9C6D8 90 1D 01 34 */ stw r0, 0x134(r29) -/* 80B9C6DC 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80B9C6E0 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80B9C6E4 90 7D 01 20 */ stw r3, 0x120(r29) -/* 80B9C6E8 38 03 00 58 */ addi r0, r3, 0x58 -/* 80B9C6EC 90 1D 01 34 */ stw r0, 0x134(r29) -/* 80B9C6F0 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80B9C6F4 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80B9C6F8 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 80B9C6FC 38 03 00 2C */ addi r0, r3, 0x2c -/* 80B9C700 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80B9C704 38 03 00 84 */ addi r0, r3, 0x84 -/* 80B9C708 90 1D 01 34 */ stw r0, 0x134(r29) -lbl_80B9C70C: -/* 80B9C70C 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80B9C710 60 00 00 08 */ ori r0, r0, 8 -/* 80B9C714 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80B9C718: -/* 80B9C718 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 80B9C71C 3C 80 80 BA */ lis r4, l_arcName@ha /* 0x80B9C9B4@ha */ -/* 80B9C720 38 84 C9 B4 */ addi r4, r4, l_arcName@l /* 0x80B9C9B4@l */ -/* 80B9C724 80 84 00 00 */ lwz r4, 0(r4) -/* 80B9C728 4B 49 07 95 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80B9C72C 7C 7E 1B 78 */ mr r30, r3 -/* 80B9C730 2C 1E 00 04 */ cmpwi r30, 4 -/* 80B9C734 40 82 00 48 */ bne lbl_80B9C77C -/* 80B9C738 7F E3 FB 78 */ mr r3, r31 -/* 80B9C73C 3C 80 80 BA */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80B9C8E0@ha */ -/* 80B9C740 38 84 C8 E0 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80B9C8E0@l */ -/* 80B9C744 3C A0 00 05 */ lis r5, 0x0005 /* 0x0004B000@ha */ -/* 80B9C748 38 A5 B0 00 */ addi r5, r5, 0xB000 /* 0x0004B000@l */ -/* 80B9C74C 4B 47 DD 65 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80B9C750 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80B9C754 40 82 00 0C */ bne lbl_80B9C760 -/* 80B9C758 38 60 00 05 */ li r3, 5 -/* 80B9C75C 48 00 00 24 */ b lbl_80B9C780 -lbl_80B9C760: -/* 80B9C760 80 7F 05 90 */ lwz r3, 0x590(r31) -/* 80B9C764 38 03 00 24 */ addi r0, r3, 0x24 -/* 80B9C768 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80B9C76C 7F E3 FB 78 */ mr r3, r31 -/* 80B9C770 4B FF F3 25 */ bl Init__13daObjLv5Key_cFv -/* 80B9C774 7F E3 FB 78 */ mr r3, r31 -/* 80B9C778 4B FF FE 55 */ bl daObjLv5Key_Execute__FP13daObjLv5Key_c -lbl_80B9C77C: -/* 80B9C77C 7F C3 F3 78 */ mr r3, r30 -lbl_80B9C780: -/* 80B9C780 39 61 00 20 */ addi r11, r1, 0x20 -/* 80B9C784 4B 7C 5A A5 */ bl _restgpr_29 -/* 80B9C788 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80B9C78C 7C 08 03 A6 */ mtlr r0 -/* 80B9C790 38 21 00 20 */ addi r1, r1, 0x20 -/* 80B9C794 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 0b2f3579e7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80B9BCEC: -/* 80B9BCEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9BCF0 7C 08 02 A6 */ mflr r0 -/* 80B9BCF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9BCF8 48 00 08 F5 */ bl create_1st__13daObjLv5Key_cFv -/* 80B9BCFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9BD00 7C 08 03 A6 */ mtlr r0 -/* 80B9BD04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9BD08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Delete__FP13daObjLv5Key_c.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Delete__FP13daObjLv5Key_c.s deleted file mode 100644 index a24e37c775..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Delete__FP13daObjLv5Key_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80B9BD0C: -/* 80B9BD0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9BD10 7C 08 02 A6 */ mflr r0 -/* 80B9BD14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9BD18 48 00 07 E9 */ bl Delete__13daObjLv5Key_cFv -/* 80B9BD1C 38 60 00 01 */ li r3, 1 -/* 80B9BD20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9BD24 7C 08 03 A6 */ mtlr r0 -/* 80B9BD28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9BD2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Draw__FP13daObjLv5Key_c.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Draw__FP13daObjLv5Key_c.s deleted file mode 100644 index fdb6b7b1ef..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Draw__FP13daObjLv5Key_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80B9C5AC: -/* 80B9C5AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C5B0 7C 08 02 A6 */ mflr r0 -/* 80B9C5B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C5B8 4B FF FE 99 */ bl Draw__13daObjLv5Key_cFv -/* 80B9C5BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C5C0 7C 08 03 A6 */ mtlr r0 -/* 80B9C5C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C5C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Execute__FP13daObjLv5Key_c.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Execute__FP13daObjLv5Key_c.s deleted file mode 100644 index 751ea429a5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Execute__FP13daObjLv5Key_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80B9C5CC: -/* 80B9C5CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C5D0 7C 08 02 A6 */ mflr r0 -/* 80B9C5D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C5D8 4B FF FE 39 */ bl Execute__13daObjLv5Key_cFv -/* 80B9C5DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C5E0 7C 08 03 A6 */ mtlr r0 -/* 80B9C5E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C5E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/func_80B9C908.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/func_80B9C908.s deleted file mode 100644 index 05ed299994..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/func_80B9C908.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80B9C908: -/* 80B9C908 38 63 FF DC */ addi r3, r3, -36 -/* 80B9C90C 4B FF FF 1C */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/func_80B9C910.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/func_80B9C910.s deleted file mode 100644 index b5f329a64a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/func_80B9C910.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80B9C910: -/* 80B9C910 38 63 FF EC */ addi r3, r3, -20 -/* 80B9C914 4B FF FF 14 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/initCcSph__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/initCcSph__13daObjLv5Key_cFv.s deleted file mode 100644 index 2be2b3b1d5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/initCcSph__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80B9BBCC: -/* 80B9BBCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9BBD0 7C 08 02 A6 */ mflr r0 -/* 80B9BBD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9BBD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80B9BBDC 7C 7F 1B 78 */ mr r31, r3 -/* 80B9BBE0 38 7F 07 D0 */ addi r3, r31, 0x7d0 -/* 80B9BBE4 38 80 00 3C */ li r4, 0x3c -/* 80B9BBE8 38 A0 00 FF */ li r5, 0xff -/* 80B9BBEC 7F E6 FB 78 */ mr r6, r31 -/* 80B9BBF0 4B 4E 7C 71 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80B9BBF4 38 7F 08 0C */ addi r3, r31, 0x80c -/* 80B9BBF8 3C 80 80 BA */ lis r4, ccShpSrc@ha /* 0x80B9C940@ha */ -/* 80B9BBFC 38 84 C9 40 */ addi r4, r4, ccShpSrc@l /* 0x80B9C940@l */ -/* 80B9BC00 4B 4E 8E 35 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80B9BC04 38 1F 07 D0 */ addi r0, r31, 0x7d0 -/* 80B9BC08 90 1F 08 50 */ stw r0, 0x850(r31) -/* 80B9BC0C 38 7F 09 30 */ addi r3, r31, 0x930 -/* 80B9BC10 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80B9BC14 4B 6D 3A 35 */ bl SetC__8cM3dGSphFRC4cXyz -/* 80B9BC18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80B9BC1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9BC20 7C 08 03 A6 */ mtlr r0 -/* 80B9BC24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9BC28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi.s deleted file mode 100644 index 6b57d1013a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80B9BD30: -/* 80B9BD30 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80B9BD34 7C 08 02 A6 */ mflr r0 -/* 80B9BD38 90 01 00 24 */ stw r0, 0x24(r1) -/* 80B9BD3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80B9BD40 4B 7C 64 9D */ bl _savegpr_29 -/* 80B9BD44 7C 7D 1B 78 */ mr r29, r3 -/* 80B9BD48 7C 9E 23 78 */ mr r30, r4 -/* 80B9BD4C 7C BF 2B 78 */ mr r31, r5 -/* 80B9BD50 38 7D 09 48 */ addi r3, r29, 0x948 -/* 80B9BD54 4B 7C 62 F5 */ bl __ptmf_cmpr -/* 80B9BD58 2C 03 00 00 */ cmpwi r3, 0 -/* 80B9BD5C 41 82 00 64 */ beq lbl_80B9BDC0 -/* 80B9BD60 38 7D 09 48 */ addi r3, r29, 0x948 -/* 80B9BD64 4B 7C 62 B5 */ bl __ptmf_test -/* 80B9BD68 2C 03 00 00 */ cmpwi r3, 0 -/* 80B9BD6C 41 82 00 20 */ beq lbl_80B9BD8C -/* 80B9BD70 38 00 FF FF */ li r0, -1 -/* 80B9BD74 B0 1D 09 54 */ sth r0, 0x954(r29) -/* 80B9BD78 7F A3 EB 78 */ mr r3, r29 -/* 80B9BD7C 7F E4 FB 78 */ mr r4, r31 -/* 80B9BD80 39 9D 09 48 */ addi r12, r29, 0x948 -/* 80B9BD84 4B 7C 63 01 */ bl __ptmf_scall -/* 80B9BD88 60 00 00 00 */ nop -lbl_80B9BD8C: -/* 80B9BD8C 38 00 00 00 */ li r0, 0 -/* 80B9BD90 B0 1D 09 54 */ sth r0, 0x954(r29) -/* 80B9BD94 80 7E 00 00 */ lwz r3, 0(r30) -/* 80B9BD98 80 1E 00 04 */ lwz r0, 4(r30) -/* 80B9BD9C 90 7D 09 48 */ stw r3, 0x948(r29) -/* 80B9BDA0 90 1D 09 4C */ stw r0, 0x94c(r29) -/* 80B9BDA4 80 1E 00 08 */ lwz r0, 8(r30) -/* 80B9BDA8 90 1D 09 50 */ stw r0, 0x950(r29) -/* 80B9BDAC 7F A3 EB 78 */ mr r3, r29 -/* 80B9BDB0 7F E4 FB 78 */ mr r4, r31 -/* 80B9BDB4 39 9D 09 48 */ addi r12, r29, 0x948 -/* 80B9BDB8 4B 7C 62 CD */ bl __ptmf_scall -/* 80B9BDBC 60 00 00 00 */ nop -lbl_80B9BDC0: -/* 80B9BDC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80B9BDC4 4B 7C 64 65 */ bl _restgpr_29 -/* 80B9BDC8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80B9BDCC 7C 08 03 A6 */ mtlr r0 -/* 80B9BDD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80B9BDD4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setBaseMtx__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setBaseMtx__13daObjLv5Key_cFv.s deleted file mode 100644 index 427fb714ba..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setBaseMtx__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80B9C534: -/* 80B9C534 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C538 7C 08 02 A6 */ mflr r0 -/* 80B9C53C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C540 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80B9C544 7C 7F 1B 78 */ mr r31, r3 -/* 80B9C548 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80B9C54C 4B 47 08 19 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80B9C550 C0 3F 09 58 */ lfs f1, 0x958(r31) -/* 80B9C554 C0 5F 09 5C */ lfs f2, 0x95c(r31) -/* 80B9C558 C0 7F 09 60 */ lfs f3, 0x960(r31) -/* 80B9C55C 4B 47 08 41 */ bl transM__14mDoMtx_stack_cFfff -/* 80B9C560 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80B9C564 4B 47 09 E1 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80B9C568 C0 1F 09 58 */ lfs f0, 0x958(r31) -/* 80B9C56C FC 20 00 50 */ fneg f1, f0 -/* 80B9C570 C0 1F 09 5C */ lfs f0, 0x95c(r31) -/* 80B9C574 FC 40 00 50 */ fneg f2, f0 -/* 80B9C578 C0 1F 09 60 */ lfs f0, 0x960(r31) -/* 80B9C57C FC 60 00 50 */ fneg f3, f0 -/* 80B9C580 4B 47 08 1D */ bl transM__14mDoMtx_stack_cFfff -/* 80B9C584 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80B9C588 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80B9C58C 80 9F 05 90 */ lwz r4, 0x590(r31) -/* 80B9C590 38 84 00 24 */ addi r4, r4, 0x24 -/* 80B9C594 4B 7A 9F 1D */ bl PSMTXCopy -/* 80B9C598 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80B9C59C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C5A0 7C 08 03 A6 */ mtlr r0 -/* 80B9C5A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C5A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setBgc__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setBgc__13daObjLv5Key_cFv.s deleted file mode 100644 index a9f33f95e9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setBgc__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80B9BB5C: -/* 80B9BB5C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80B9BB60 7C 08 02 A6 */ mflr r0 -/* 80B9BB64 90 01 00 24 */ stw r0, 0x24(r1) -/* 80B9BB68 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80B9BB6C 7C 7F 1B 78 */ mr r31, r3 -/* 80B9BB70 38 00 00 00 */ li r0, 0 -/* 80B9BB74 90 01 00 08 */ stw r0, 8(r1) -/* 80B9BB78 38 7F 05 F8 */ addi r3, r31, 0x5f8 -/* 80B9BB7C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80B9BB80 38 BF 04 BC */ addi r5, r31, 0x4bc -/* 80B9BB84 7F E6 FB 78 */ mr r6, r31 -/* 80B9BB88 38 E0 00 01 */ li r7, 1 -/* 80B9BB8C 39 1F 05 B8 */ addi r8, r31, 0x5b8 -/* 80B9BB90 39 3F 04 F8 */ addi r9, r31, 0x4f8 -/* 80B9BB94 39 40 00 00 */ li r10, 0 -/* 80B9BB98 4B 4D A6 B1 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80B9BB9C 38 7F 05 F8 */ addi r3, r31, 0x5f8 -/* 80B9BBA0 4B 4D B8 21 */ bl SetGndThinCellingOff__9dBgS_AcchFv -/* 80B9BBA4 38 7F 05 B8 */ addi r3, r31, 0x5b8 -/* 80B9BBA8 3C 80 80 BA */ lis r4, lit_3768@ha /* 0x80B9C928@ha */ -/* 80B9BBAC C0 24 C9 28 */ lfs f1, lit_3768@l(r4) /* 0x80B9C928@l */ -/* 80B9BBB0 FC 40 08 90 */ fmr f2, f1 -/* 80B9BBB4 4B 4D A3 A5 */ bl SetWall__12dBgS_AcchCirFff -/* 80B9BBB8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80B9BBBC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80B9BBC0 7C 08 03 A6 */ mtlr r0 -/* 80B9BBC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80B9BBC8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setCcSph__13daObjLv5Key_cFv.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setCcSph__13daObjLv5Key_cFv.s deleted file mode 100644 index 3ca67a3b41..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setCcSph__13daObjLv5Key_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80B9BC2C: -/* 80B9BC2C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80B9BC30 7C 08 02 A6 */ mflr r0 -/* 80B9BC34 90 01 00 24 */ stw r0, 0x24(r1) -/* 80B9BC38 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80B9BC3C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80B9BC40 7C 7E 1B 78 */ mr r30, r3 -/* 80B9BC44 3C 60 80 BA */ lis r3, lit_3755@ha /* 0x80B9C920@ha */ -/* 80B9BC48 3B E3 C9 20 */ addi r31, r3, lit_3755@l /* 0x80B9C920@l */ -/* 80B9BC4C C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80B9BC50 D0 21 00 08 */ stfs f1, 8(r1) -/* 80B9BC54 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 80B9BC58 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80B9BC5C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80B9BC60 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80B9BC64 4B 47 11 01 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80B9BC68 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 80B9BC6C 4B 47 12 D9 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80B9BC70 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80B9BC74 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80B9BC78 38 81 00 08 */ addi r4, r1, 8 -/* 80B9BC7C 7C 85 23 78 */ mr r5, r4 -/* 80B9BC80 4B 7A B0 ED */ bl PSMTXMultVec -/* 80B9BC84 38 7E 09 30 */ addi r3, r30, 0x930 -/* 80B9BC88 38 81 00 08 */ addi r4, r1, 8 -/* 80B9BC8C 4B 6D 39 BD */ bl SetC__8cM3dGSphFRC4cXyz -/* 80B9BC90 38 7E 09 30 */ addi r3, r30, 0x930 -/* 80B9BC94 C0 3F 00 64 */ lfs f1, 0x64(r31) -/* 80B9BC98 4B 6D 3A 71 */ bl SetR__8cM3dGSphFf -/* 80B9BC9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80B9BCA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80B9BCA4 38 63 23 3C */ addi r3, r3, 0x233c -/* 80B9BCA8 38 9E 08 0C */ addi r4, r30, 0x80c -/* 80B9BCAC 4B 6C 8E FD */ bl Set__4cCcSFP8cCcD_Obj -/* 80B9BCB0 38 7E 08 0C */ addi r3, r30, 0x80c -/* 80B9BCB4 4B 4E 87 AD */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80B9BCB8 28 03 00 00 */ cmplwi r3, 0 -/* 80B9BCBC 41 82 00 18 */ beq lbl_80B9BCD4 -/* 80B9BCC0 38 7E 08 0C */ addi r3, r30, 0x80c -/* 80B9BCC4 81 9E 08 48 */ lwz r12, 0x848(r30) -/* 80B9BCC8 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80B9BCCC 7D 89 03 A6 */ mtctr r12 -/* 80B9BCD0 4E 80 04 21 */ bctrl -lbl_80B9BCD4: -/* 80B9BCD4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80B9BCD8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80B9BCDC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80B9BCE0 7C 08 03 A6 */ mtlr r0 -/* 80B9BCE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80B9BCE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index b9e5a71a95..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80B9C8E0: -/* 80B9C8E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80B9C8E4 7C 08 02 A6 */ mflr r0 -/* 80B9C8E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80B9C8EC 4B FF F0 CD */ bl CreateHeap__13daObjLv5Key_cFv -/* 80B9C8F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80B9C8F4 7C 08 03 A6 */ mtlr r0 -/* 80B9C8F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80B9C8FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/CreateHeap__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/CreateHeap__13daObjIceBlk_cFv.s deleted file mode 100644 index 0bc788b08d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/CreateHeap__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,127 +0,0 @@ -lbl_80C22618: -/* 80C22618 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C2261C 7C 08 02 A6 */ mflr r0 -/* 80C22620 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C22624 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C22628 4B 73 FB B5 */ bl _savegpr_29 -/* 80C2262C 7C 7F 1B 78 */ mr r31, r3 -/* 80C22630 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80C22634 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80C22638 28 04 00 FF */ cmplwi r4, 0xff -/* 80C2263C 41 82 01 00 */ beq lbl_80C2273C -/* 80C22640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22644 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22648 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C2264C 7C 05 07 74 */ extsb r5, r0 -/* 80C22650 4B 41 2D 11 */ bl isSwitch__10dSv_info_cCFii -/* 80C22654 2C 03 00 00 */ cmpwi r3, 0 -/* 80C22658 40 82 00 E4 */ bne lbl_80C2273C -/* 80C2265C 3C 60 80 C2 */ lis r3, l_arcName@ha /* 0x80C244F0@ha */ -/* 80C22660 38 63 44 F0 */ addi r3, r3, l_arcName@l /* 0x80C244F0@l */ -/* 80C22664 80 63 00 00 */ lwz r3, 0(r3) -/* 80C22668 3C 80 80 C2 */ lis r4, l_bmd@ha /* 0x80C243A0@ha */ -/* 80C2266C 38 84 43 A0 */ addi r4, r4, l_bmd@l /* 0x80C243A0@l */ -/* 80C22670 80 84 00 00 */ lwz r4, 0(r4) -/* 80C22674 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22678 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C2267C 3F C5 00 02 */ addis r30, r5, 2 -/* 80C22680 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80C22684 7F C5 F3 78 */ mr r5, r30 -/* 80C22688 38 C0 00 80 */ li r6, 0x80 -/* 80C2268C 4B 41 9C 61 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C22690 38 80 00 00 */ li r4, 0 -/* 80C22694 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C22698 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C2269C 4B 3F 25 B9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C226A0 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80C226A4 80 1F 05 A8 */ lwz r0, 0x5a8(r31) -/* 80C226A8 28 00 00 00 */ cmplwi r0, 0 -/* 80C226AC 40 82 00 0C */ bne lbl_80C226B8 -/* 80C226B0 38 60 00 00 */ li r3, 0 -/* 80C226B4 48 00 01 28 */ b lbl_80C227DC -lbl_80C226B8: -/* 80C226B8 38 60 00 C0 */ li r3, 0xc0 -/* 80C226BC 4B 6A C5 91 */ bl __nw__FUl -/* 80C226C0 7C 60 1B 79 */ or. r0, r3, r3 -/* 80C226C4 41 82 00 0C */ beq lbl_80C226D0 -/* 80C226C8 4B 45 92 A9 */ bl __ct__4dBgWFv -/* 80C226CC 7C 60 1B 78 */ mr r0, r3 -lbl_80C226D0: -/* 80C226D0 90 1F 09 44 */ stw r0, 0x944(r31) -/* 80C226D4 80 1F 09 44 */ lwz r0, 0x944(r31) -/* 80C226D8 28 00 00 00 */ cmplwi r0, 0 -/* 80C226DC 41 82 00 50 */ beq lbl_80C2272C -/* 80C226E0 3C 60 80 C2 */ lis r3, l_arcName@ha /* 0x80C244F0@ha */ -/* 80C226E4 38 63 44 F0 */ addi r3, r3, l_arcName@l /* 0x80C244F0@l */ -/* 80C226E8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C226EC 38 80 00 0B */ li r4, 0xb -/* 80C226F0 7F C5 F3 78 */ mr r5, r30 -/* 80C226F4 38 C0 00 80 */ li r6, 0x80 -/* 80C226F8 4B 41 9B F5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C226FC 7C 64 1B 78 */ mr r4, r3 -/* 80C22700 80 7F 09 44 */ lwz r3, 0x944(r31) -/* 80C22704 38 A0 00 01 */ li r5, 1 -/* 80C22708 38 DF 05 6C */ addi r6, r31, 0x56c -/* 80C2270C 4B 45 78 2D */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80C22710 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C22714 40 82 00 18 */ bne lbl_80C2272C -/* 80C22718 3C 60 80 07 */ lis r3, dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075B44@ha */ -/* 80C2271C 38 03 5B 44 */ addi r0, r3, dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075B44@l */ -/* 80C22720 80 7F 09 44 */ lwz r3, 0x944(r31) -/* 80C22724 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80C22728 48 00 00 1C */ b lbl_80C22744 -lbl_80C2272C: -/* 80C2272C 38 00 00 00 */ li r0, 0 -/* 80C22730 90 1F 09 44 */ stw r0, 0x944(r31) -/* 80C22734 38 60 00 00 */ li r3, 0 -/* 80C22738 48 00 00 A4 */ b lbl_80C227DC -lbl_80C2273C: -/* 80C2273C 38 00 00 00 */ li r0, 0 -/* 80C22740 90 1F 05 A8 */ stw r0, 0x5a8(r31) -lbl_80C22744: -/* 80C22744 3C 60 80 C2 */ lis r3, l_arcName@ha /* 0x80C244F0@ha */ -/* 80C22748 38 63 44 F0 */ addi r3, r3, l_arcName@l /* 0x80C244F0@l */ -/* 80C2274C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C22750 3C 80 80 C2 */ lis r4, l_bmd@ha /* 0x80C243A0@ha */ -/* 80C22754 38 84 43 A0 */ addi r4, r4, l_bmd@l /* 0x80C243A0@l */ -/* 80C22758 80 84 00 04 */ lwz r4, 4(r4) -/* 80C2275C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22760 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22764 3F C5 00 02 */ addis r30, r5, 2 -/* 80C22768 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80C2276C 7F C5 F3 78 */ mr r5, r30 -/* 80C22770 38 C0 00 80 */ li r6, 0x80 -/* 80C22774 4B 41 9B 79 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C22778 7C 7D 1B 78 */ mr r29, r3 -/* 80C2277C 3C 60 80 C2 */ lis r3, l_arcName@ha /* 0x80C244F0@ha */ -/* 80C22780 38 63 44 F0 */ addi r3, r3, l_arcName@l /* 0x80C244F0@l */ -/* 80C22784 80 63 00 00 */ lwz r3, 0(r3) -/* 80C22788 3C 80 80 C2 */ lis r4, l_bmd@ha /* 0x80C243A0@ha */ -/* 80C2278C 38 84 43 A0 */ addi r4, r4, l_bmd@l /* 0x80C243A0@l */ -/* 80C22790 80 84 00 00 */ lwz r4, 0(r4) -/* 80C22794 7F C5 F3 78 */ mr r5, r30 -/* 80C22798 38 C0 00 80 */ li r6, 0x80 -/* 80C2279C 4B 41 9B 51 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C227A0 7C 64 1B 78 */ mr r4, r3 -/* 80C227A4 7F A3 EB 78 */ mr r3, r29 -/* 80C227A8 4B 3E C0 8D */ bl mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData -/* 80C227AC 7F A3 EB 78 */ mr r3, r29 -/* 80C227B0 3C 80 00 08 */ lis r4, 8 -/* 80C227B4 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C227B8 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C227BC 4B 3F 24 99 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C227C0 90 7F 05 AC */ stw r3, 0x5ac(r31) -/* 80C227C4 80 1F 05 AC */ lwz r0, 0x5ac(r31) -/* 80C227C8 28 00 00 00 */ cmplwi r0, 0 -/* 80C227CC 40 82 00 0C */ bne lbl_80C227D8 -/* 80C227D0 38 60 00 00 */ li r3, 0 -/* 80C227D4 48 00 00 08 */ b lbl_80C227DC -lbl_80C227D8: -/* 80C227D8 38 60 00 01 */ li r3, 1 -lbl_80C227DC: -/* 80C227DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C227E0 4B 73 FA 49 */ bl _restgpr_29 -/* 80C227E4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C227E8 7C 08 03 A6 */ mtlr r0 -/* 80C227EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C227F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Create__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Create__13daObjIceBlk_cFv.s deleted file mode 100644 index 00e79b2dc6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Create__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,242 +0,0 @@ -lbl_80C22298: -/* 80C22298 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80C2229C 7C 08 02 A6 */ mflr r0 -/* 80C222A0 90 01 00 44 */ stw r0, 0x44(r1) -/* 80C222A4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C222A8 4B 73 FF 25 */ bl _savegpr_25 -/* 80C222AC 7C 7E 1B 78 */ mr r30, r3 -/* 80C222B0 3C 60 80 C2 */ lis r3, l_dir_vec@ha /* 0x80C242F4@ha */ -/* 80C222B4 3B E3 42 F4 */ addi r31, r3, l_dir_vec@l /* 0x80C242F4@l */ -/* 80C222B8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C222BC 54 03 C6 3E */ rlwinm r3, r0, 0x18, 0x18, 0x1f -/* 80C222C0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C222C4 7C 04 07 74 */ extsb r4, r0 -/* 80C222C8 4B 42 F5 25 */ bl dPath_GetRoomPath__Fii -/* 80C222CC 90 7E 09 BC */ stw r3, 0x9bc(r30) -/* 80C222D0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C222D4 98 1E 09 C0 */ stb r0, 0x9c0(r30) -/* 80C222D8 80 1E 09 BC */ lwz r0, 0x9bc(r30) -/* 80C222DC 28 00 00 00 */ cmplwi r0, 0 -/* 80C222E0 41 82 00 10 */ beq lbl_80C222F0 -/* 80C222E4 88 1E 09 C0 */ lbz r0, 0x9c0(r30) -/* 80C222E8 28 00 00 FF */ cmplwi r0, 0xff -/* 80C222EC 40 82 00 18 */ bne lbl_80C22304 -lbl_80C222F0: -/* 80C222F0 38 60 00 00 */ li r3, 0 -/* 80C222F4 90 7E 09 BC */ stw r3, 0x9bc(r30) -/* 80C222F8 38 00 00 FF */ li r0, 0xff -/* 80C222FC 98 1E 09 C0 */ stb r0, 0x9c0(r30) -/* 80C22300 98 7E 09 C1 */ stb r3, 0x9c1(r30) -lbl_80C22304: -/* 80C22304 80 7E 09 BC */ lwz r3, 0x9bc(r30) -/* 80C22308 28 03 00 00 */ cmplwi r3, 0 -/* 80C2230C 41 82 00 C4 */ beq lbl_80C223D0 -/* 80C22310 A0 03 00 00 */ lhz r0, 0(r3) -/* 80C22314 28 00 00 01 */ cmplwi r0, 1 -/* 80C22318 40 82 00 10 */ bne lbl_80C22328 -/* 80C2231C 38 00 00 01 */ li r0, 1 -/* 80C22320 98 1E 09 C1 */ stb r0, 0x9c1(r30) -/* 80C22324 48 00 00 AC */ b lbl_80C223D0 -lbl_80C22328: -/* 80C22328 28 00 00 04 */ cmplwi r0, 4 -/* 80C2232C 40 80 00 10 */ bge lbl_80C2233C -/* 80C22330 38 00 00 02 */ li r0, 2 -/* 80C22334 98 1E 09 C1 */ stb r0, 0x9c1(r30) -/* 80C22338 48 00 00 98 */ b lbl_80C223D0 -lbl_80C2233C: -/* 80C2233C 28 00 00 08 */ cmplwi r0, 8 -/* 80C22340 40 80 00 10 */ bge lbl_80C22350 -/* 80C22344 38 00 00 03 */ li r0, 3 -/* 80C22348 98 1E 09 C1 */ stb r0, 0x9c1(r30) -/* 80C2234C 48 00 00 84 */ b lbl_80C223D0 -lbl_80C22350: -/* 80C22350 28 00 00 10 */ cmplwi r0, 0x10 -/* 80C22354 40 80 00 10 */ bge lbl_80C22364 -/* 80C22358 38 00 00 04 */ li r0, 4 -/* 80C2235C 98 1E 09 C1 */ stb r0, 0x9c1(r30) -/* 80C22360 48 00 00 70 */ b lbl_80C223D0 -lbl_80C22364: -/* 80C22364 28 00 00 20 */ cmplwi r0, 0x20 -/* 80C22368 40 80 00 10 */ bge lbl_80C22378 -/* 80C2236C 38 00 00 05 */ li r0, 5 -/* 80C22370 98 1E 09 C1 */ stb r0, 0x9c1(r30) -/* 80C22374 48 00 00 5C */ b lbl_80C223D0 -lbl_80C22378: -/* 80C22378 28 00 00 40 */ cmplwi r0, 0x40 -/* 80C2237C 40 80 00 10 */ bge lbl_80C2238C -/* 80C22380 38 00 00 06 */ li r0, 6 -/* 80C22384 98 1E 09 C1 */ stb r0, 0x9c1(r30) -/* 80C22388 48 00 00 48 */ b lbl_80C223D0 -lbl_80C2238C: -/* 80C2238C 28 00 00 80 */ cmplwi r0, 0x80 -/* 80C22390 40 80 00 10 */ bge lbl_80C223A0 -/* 80C22394 38 00 00 07 */ li r0, 7 -/* 80C22398 98 1E 09 C1 */ stb r0, 0x9c1(r30) -/* 80C2239C 48 00 00 34 */ b lbl_80C223D0 -lbl_80C223A0: -/* 80C223A0 28 00 00 FF */ cmplwi r0, 0xff -/* 80C223A4 40 80 00 10 */ bge lbl_80C223B4 -/* 80C223A8 38 00 00 08 */ li r0, 8 -/* 80C223AC 98 1E 09 C1 */ stb r0, 0x9c1(r30) -/* 80C223B0 48 00 00 20 */ b lbl_80C223D0 -lbl_80C223B4: -/* 80C223B4 3C 60 80 C2 */ lis r3, d_a_obj_iceblock__stringBase0@ha /* 0x80C2449C@ha */ -/* 80C223B8 38 63 44 9C */ addi r3, r3, d_a_obj_iceblock__stringBase0@l /* 0x80C2449C@l */ -/* 80C223BC 38 63 00 0A */ addi r3, r3, 0xa -/* 80C223C0 4C C6 31 82 */ crclr 6 -/* 80C223C4 4B 3E 48 49 */ bl OSReport_Error -/* 80C223C8 38 60 00 00 */ li r3, 0 -/* 80C223CC 48 00 02 34 */ b lbl_80C22600 -lbl_80C223D0: -/* 80C223D0 7F C3 F3 78 */ mr r3, r30 -/* 80C223D4 4B FF FB 59 */ bl loadCurrentPos__13daObjIceBlk_cFv -/* 80C223D8 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80C223DC 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C223E0 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80C223E4 38 7E 07 88 */ addi r3, r30, 0x788 -/* 80C223E8 C0 3F 00 A0 */ lfs f1, 0xa0(r31) -/* 80C223EC FC 40 08 90 */ fmr f2, f1 -/* 80C223F0 4B 45 3B 69 */ bl SetWall__12dBgS_AcchCirFff -/* 80C223F4 38 00 00 00 */ li r0, 0 -/* 80C223F8 90 01 00 08 */ stw r0, 8(r1) -/* 80C223FC 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 80C22400 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80C22404 38 BE 04 BC */ addi r5, r30, 0x4bc -/* 80C22408 7F C6 F3 78 */ mr r6, r30 -/* 80C2240C 38 E0 00 01 */ li r7, 1 -/* 80C22410 39 1E 07 88 */ addi r8, r30, 0x788 -/* 80C22414 39 3E 04 F8 */ addi r9, r30, 0x4f8 -/* 80C22418 39 40 00 00 */ li r10, 0 -/* 80C2241C 4B 45 3E 2D */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80C22420 38 7E 07 C8 */ addi r3, r30, 0x7c8 -/* 80C22424 38 80 00 FF */ li r4, 0xff -/* 80C22428 38 A0 00 FF */ li r5, 0xff -/* 80C2242C 7F C6 F3 78 */ mr r6, r30 -/* 80C22430 4B 46 14 31 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C22434 38 7E 08 04 */ addi r3, r30, 0x804 -/* 80C22438 38 9F 00 38 */ addi r4, r31, 0x38 -/* 80C2243C 4B 46 24 79 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C22440 38 1E 07 C8 */ addi r0, r30, 0x7c8 -/* 80C22444 90 1E 08 48 */ stw r0, 0x848(r30) -/* 80C22448 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80C2244C 80 63 00 04 */ lwz r3, 4(r3) -/* 80C22450 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80C22454 80 83 00 00 */ lwz r4, 0(r3) -/* 80C22458 C0 DE 04 F4 */ lfs f6, 0x4f4(r30) -/* 80C2245C C0 A4 00 4C */ lfs f5, 0x4c(r4) -/* 80C22460 C0 FE 04 F0 */ lfs f7, 0x4f0(r30) -/* 80C22464 C0 9E 04 EC */ lfs f4, 0x4ec(r30) -/* 80C22468 7F C3 F3 78 */ mr r3, r30 -/* 80C2246C C0 04 00 3C */ lfs f0, 0x3c(r4) -/* 80C22470 EC 24 00 32 */ fmuls f1, f4, f0 -/* 80C22474 FC 00 28 50 */ fneg f0, f5 -/* 80C22478 EC 47 00 32 */ fmuls f2, f7, f0 -/* 80C2247C C0 04 00 44 */ lfs f0, 0x44(r4) -/* 80C22480 EC 66 00 32 */ fmuls f3, f6, f0 -/* 80C22484 C0 04 00 48 */ lfs f0, 0x48(r4) -/* 80C22488 EC 84 00 32 */ fmuls f4, f4, f0 -/* 80C2248C EC A7 01 72 */ fmuls f5, f7, f5 -/* 80C22490 C0 04 00 50 */ lfs f0, 0x50(r4) -/* 80C22494 EC C6 00 32 */ fmuls f6, f6, f0 -/* 80C22498 4B 3F 80 B1 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80C2249C 3C 60 80 C2 */ lis r3, PPCallBack__13daObjIceBlk_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel@ha /* 0x80C21CD8@ha */ -/* 80C224A0 38 03 1C D8 */ addi r0, r3, PPCallBack__13daObjIceBlk_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel@l /* 0x80C21CD8@l */ -/* 80C224A4 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80C224A8 90 03 00 10 */ stw r0, 0x10(r3) -/* 80C224AC 3C 60 80 C2 */ lis r3, rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c@ha /* 0x80C21DAC@ha */ -/* 80C224B0 38 03 1D AC */ addi r0, r3, rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c@l /* 0x80C21DAC@l */ -/* 80C224B4 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80C224B8 90 03 00 B4 */ stw r0, 0xb4(r3) -/* 80C224BC C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 80C224C0 D0 1E 05 30 */ stfs f0, 0x530(r30) -/* 80C224C4 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C224C8 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80C224CC 28 04 00 FF */ cmplwi r4, 0xff -/* 80C224D0 41 82 01 04 */ beq lbl_80C225D4 -/* 80C224D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C224D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C224DC 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C224E0 7C 05 07 74 */ extsb r5, r0 -/* 80C224E4 4B 41 2E 7D */ bl isSwitch__10dSv_info_cCFii -/* 80C224E8 2C 03 00 00 */ cmpwi r3, 0 -/* 80C224EC 40 82 00 E8 */ bne lbl_80C225D4 -/* 80C224F0 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80C224F4 28 03 00 00 */ cmplwi r3, 0 -/* 80C224F8 41 82 00 24 */ beq lbl_80C2251C -/* 80C224FC 4B 64 5C D9 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C22500 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C22504 41 82 00 18 */ beq lbl_80C2251C -/* 80C22508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C2250C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22510 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C22514 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 80C22518 4B 45 1D 39 */ bl Release__4cBgSFP9dBgW_Base -lbl_80C2251C: -/* 80C2251C 80 7E 09 44 */ lwz r3, 0x944(r30) -/* 80C22520 28 03 00 00 */ cmplwi r3, 0 -/* 80C22524 41 82 00 28 */ beq lbl_80C2254C -/* 80C22528 4B 64 5C AD */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C2252C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C22530 40 82 00 1C */ bne lbl_80C2254C -/* 80C22534 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22538 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C2253C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C22540 80 9E 09 44 */ lwz r4, 0x944(r30) -/* 80C22544 7F C5 F3 78 */ mr r5, r30 -/* 80C22548 4B 45 24 C1 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80C2254C: -/* 80C2254C 80 7E 09 44 */ lwz r3, 0x944(r30) -/* 80C22550 28 03 00 00 */ cmplwi r3, 0 -/* 80C22554 41 82 00 08 */ beq lbl_80C2255C -/* 80C22558 4B 45 94 69 */ bl Move__4dBgWFv -lbl_80C2255C: -/* 80C2255C 3B 20 00 00 */ li r25, 0 -/* 80C22560 3B A0 00 00 */ li r29, 0 -/* 80C22564 3B 80 00 00 */ li r28, 0 -/* 80C22568 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C2256C 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22570 3B 7F 00 9C */ addi r27, r31, 0x9c -lbl_80C22574: -/* 80C22574 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) -/* 80C22578 38 80 00 00 */ li r4, 0 -/* 80C2257C 90 81 00 08 */ stw r4, 8(r1) -/* 80C22580 38 00 FF FF */ li r0, -1 -/* 80C22584 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C22588 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C2258C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C22590 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C22594 38 80 00 00 */ li r4, 0 -/* 80C22598 7C BB E2 2E */ lhzx r5, r27, r28 -/* 80C2259C 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80C225A0 38 E0 00 00 */ li r7, 0 -/* 80C225A4 39 1E 04 B4 */ addi r8, r30, 0x4b4 -/* 80C225A8 39 3E 04 EC */ addi r9, r30, 0x4ec -/* 80C225AC 39 40 00 FF */ li r10, 0xff -/* 80C225B0 C0 3F 00 A8 */ lfs f1, 0xa8(r31) -/* 80C225B4 4B 42 A4 DD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C225B8 38 1D 09 E4 */ addi r0, r29, 0x9e4 -/* 80C225BC 7C 7E 01 2E */ stwx r3, r30, r0 -/* 80C225C0 3B 39 00 01 */ addi r25, r25, 1 -/* 80C225C4 2C 19 00 02 */ cmpwi r25, 2 -/* 80C225C8 3B BD 00 04 */ addi r29, r29, 4 -/* 80C225CC 3B 9C 00 02 */ addi r28, r28, 2 -/* 80C225D0 41 80 FF A4 */ blt lbl_80C22574 -lbl_80C225D4: -/* 80C225D4 7F C3 F3 78 */ mr r3, r30 -/* 80C225D8 48 00 12 89 */ bl init_bgCheck__13daObjIceBlk_cFv -/* 80C225DC 7F C3 F3 78 */ mr r3, r30 -/* 80C225E0 48 00 09 19 */ bl mode_init_wait__13daObjIceBlk_cFv -/* 80C225E4 38 00 00 00 */ li r0, 0 -/* 80C225E8 98 1E 09 4C */ stb r0, 0x94c(r30) -/* 80C225EC 7F C3 F3 78 */ mr r3, r30 -/* 80C225F0 4B FF F7 D5 */ bl initBaseMtx__13daObjIceBlk_cFv -/* 80C225F4 38 00 00 03 */ li r0, 3 -/* 80C225F8 98 1E 09 E0 */ stb r0, 0x9e0(r30) -/* 80C225FC 38 60 00 01 */ li r3, 1 -lbl_80C22600: -/* 80C22600 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C22604 4B 73 FC 15 */ bl _restgpr_25 -/* 80C22608 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80C2260C 7C 08 03 A6 */ mtlr r0 -/* 80C22610 38 21 00 40 */ addi r1, r1, 0x40 -/* 80C22614 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Delete__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Delete__13daObjIceBlk_cFv.s deleted file mode 100644 index 76a8c7b3ee..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Delete__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80C23DA8: -/* 80C23DA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C23DAC 7C 08 02 A6 */ mflr r0 -/* 80C23DB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C23DB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C23DB8 7C 7F 1B 78 */ mr r31, r3 -/* 80C23DBC 38 60 00 00 */ li r3, 0 -/* 80C23DC0 38 A0 00 01 */ li r5, 1 -/* 80C23DC4 7C 64 1B 78 */ mr r4, r3 -/* 80C23DC8 38 00 00 02 */ li r0, 2 -/* 80C23DCC 7C 09 03 A6 */ mtctr r0 -lbl_80C23DD0: -/* 80C23DD0 38 E3 09 E4 */ addi r7, r3, 0x9e4 -/* 80C23DD4 7C DF 38 2E */ lwzx r6, r31, r7 -/* 80C23DD8 28 06 00 00 */ cmplwi r6, 0 -/* 80C23DDC 41 82 00 18 */ beq lbl_80C23DF4 -/* 80C23DE0 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 80C23DE4 60 00 00 01 */ ori r0, r0, 1 -/* 80C23DE8 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 80C23DEC 90 A6 00 24 */ stw r5, 0x24(r6) -/* 80C23DF0 7C 9F 39 2E */ stwx r4, r31, r7 -lbl_80C23DF4: -/* 80C23DF4 38 63 00 04 */ addi r3, r3, 4 -/* 80C23DF8 42 00 FF D8 */ bdnz lbl_80C23DD0 -/* 80C23DFC 80 7F 09 44 */ lwz r3, 0x944(r31) -/* 80C23E00 28 03 00 00 */ cmplwi r3, 0 -/* 80C23E04 41 82 00 24 */ beq lbl_80C23E28 -/* 80C23E08 4B 64 43 CD */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C23E0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C23E10 41 82 00 18 */ beq lbl_80C23E28 -/* 80C23E14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C23E18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C23E1C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C23E20 80 9F 09 44 */ lwz r4, 0x944(r31) -/* 80C23E24 4B 45 04 2D */ bl Release__4cBgSFP9dBgW_Base -lbl_80C23E28: -/* 80C23E28 7F E3 FB 78 */ mr r3, r31 -/* 80C23E2C 4B FF E1 9D */ bl saveCurrentPos__13daObjIceBlk_cFv -/* 80C23E30 38 00 00 00 */ li r0, 0 -/* 80C23E34 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C23E38 90 03 00 10 */ stw r0, 0x10(r3) -/* 80C23E3C 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C23E40 3C 80 80 C2 */ lis r4, l_arcName@ha /* 0x80C244F0@ha */ -/* 80C23E44 38 84 44 F0 */ addi r4, r4, l_arcName@l /* 0x80C244F0@l */ -/* 80C23E48 80 84 00 00 */ lwz r4, 0(r4) -/* 80C23E4C 4B 40 91 BD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C23E50 38 60 00 01 */ li r3, 1 -/* 80C23E54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C23E58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C23E5C 7C 08 03 A6 */ mtlr r0 -/* 80C23E60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C23E64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Draw__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Draw__13daObjIceBlk_cFv.s deleted file mode 100644 index 065ff9a297..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Draw__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_80C23CA4: -/* 80C23CA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C23CA8 7C 08 02 A6 */ mflr r0 -/* 80C23CAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C23CB0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C23CB4 93 C1 00 08 */ stw r30, 8(r1) -/* 80C23CB8 7C 7F 1B 78 */ mr r31, r3 -/* 80C23CBC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C23CC0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C23CC4 38 80 00 10 */ li r4, 0x10 -/* 80C23CC8 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C23CCC 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C23CD0 4B 57 FA F5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C23CD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C23CD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C23CDC 80 03 5F 70 */ lwz r0, 0x5f70(r3) -/* 80C23CE0 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C23CE4 3B C4 4A C8 */ addi r30, r4, j3dSys@l /* 0x80434AC8@l */ -/* 80C23CE8 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C23CEC 80 03 5F 74 */ lwz r0, 0x5f74(r3) -/* 80C23CF0 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C23CF4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C23CF8 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80C23CFC 28 04 00 FF */ cmplwi r4, 0xff -/* 80C23D00 41 82 00 4C */ beq lbl_80C23D4C -/* 80C23D04 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C23D08 7C 05 07 74 */ extsb r5, r0 -/* 80C23D0C 4B 41 16 55 */ bl isSwitch__10dSv_info_cCFii -/* 80C23D10 2C 03 00 00 */ cmpwi r3, 0 -/* 80C23D14 40 82 00 38 */ bne lbl_80C23D4C -/* 80C23D18 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C23D1C 28 04 00 00 */ cmplwi r4, 0 -/* 80C23D20 41 82 00 54 */ beq lbl_80C23D74 -/* 80C23D24 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C23D28 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C23D2C 80 84 00 04 */ lwz r4, 4(r4) -/* 80C23D30 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C23D34 4B 58 10 6D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C23D38 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C23D3C 4B 3E 9F 89 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C23D40 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C23D44 4B 40 DC 09 */ bl entry__10daMirror_cFP8J3DModel -/* 80C23D48 48 00 00 2C */ b lbl_80C23D74 -lbl_80C23D4C: -/* 80C23D4C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C23D50 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C23D54 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80C23D58 80 84 00 04 */ lwz r4, 4(r4) -/* 80C23D5C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C23D60 4B 58 10 41 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C23D64 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 80C23D68 4B 3E 9F 5D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C23D6C 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 80C23D70 4B 40 DB DD */ bl entry__10daMirror_cFP8J3DModel -lbl_80C23D74: -/* 80C23D74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C23D78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C23D7C 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C23D80 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C23D84 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C23D88 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C23D8C 38 60 00 01 */ li r3, 1 -/* 80C23D90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C23D94 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C23D98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C23D9C 7C 08 03 A6 */ mtlr r0 -/* 80C23DA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C23DA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Execute__13daObjIceBlk_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Execute__13daObjIceBlk_cFPPA3_A4_f.s deleted file mode 100644 index b2416b461c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Execute__13daObjIceBlk_cFPPA3_A4_f.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80C228B4: -/* 80C228B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C228B8 7C 08 02 A6 */ mflr r0 -/* 80C228BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C228C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C228C4 93 C1 00 08 */ stw r30, 8(r1) -/* 80C228C8 7C 7E 1B 78 */ mr r30, r3 -/* 80C228CC 7C 9F 23 78 */ mr r31, r4 -/* 80C228D0 48 00 02 59 */ bl mode_proc_call__13daObjIceBlk_cFv -/* 80C228D4 7F C3 F3 78 */ mr r3, r30 -/* 80C228D8 48 00 11 79 */ bl event_proc_call__13daObjIceBlk_cFv -/* 80C228DC 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80C228E0 90 1F 00 00 */ stw r0, 0(r31) -/* 80C228E4 7F C3 F3 78 */ mr r3, r30 -/* 80C228E8 4B FF F5 3D */ bl setBaseMtx__13daObjIceBlk_cFv -/* 80C228EC C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80C228F0 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80C228F4 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80C228F8 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80C228FC C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80C22900 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80C22904 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80C22908 D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 80C2290C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80C22910 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80C22914 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80C22918 D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80C2291C 38 00 00 00 */ li r0, 0 -/* 80C22920 90 1E 09 40 */ stw r0, 0x940(r30) -/* 80C22924 98 1E 09 D1 */ stb r0, 0x9d1(r30) -/* 80C22928 38 7E 07 E4 */ addi r3, r30, 0x7e4 -/* 80C2292C 4B 46 0F 05 */ bl Move__10dCcD_GSttsFv -/* 80C22930 38 60 00 01 */ li r3, 1 -/* 80C22934 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C22938 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C2293C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C22940 7C 08 03 A6 */ mtlr r0 -/* 80C22944 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C22948 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 27caaa44be..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C2427C: -/* 80C2427C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C24280 7C 08 02 A6 */ mflr r0 -/* 80C24284 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C24288 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C2428C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C24290 41 82 00 1C */ beq lbl_80C242AC -/* 80C24294 3C A0 80 C2 */ lis r5, __vt__10cCcD_GStts@ha /* 0x80C245E0@ha */ -/* 80C24298 38 05 45 E0 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80C245E0@l */ -/* 80C2429C 90 1F 00 00 */ stw r0, 0(r31) -/* 80C242A0 7C 80 07 35 */ extsh. r0, r4 -/* 80C242A4 40 81 00 08 */ ble lbl_80C242AC -/* 80C242A8 4B 6A AA 95 */ bl __dl__FPv -lbl_80C242AC: -/* 80C242AC 7F E3 FB 78 */ mr r3, r31 -/* 80C242B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C242B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C242B8 7C 08 03 A6 */ mtlr r0 -/* 80C242BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C242C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index d0d30aba34..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C240D4: -/* 80C240D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C240D8 7C 08 02 A6 */ mflr r0 -/* 80C240DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C240E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C240E4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C240E8 41 82 00 30 */ beq lbl_80C24118 -/* 80C240EC 3C 60 80 C2 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80C245EC@ha */ -/* 80C240F0 38 03 45 EC */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80C245EC@l */ -/* 80C240F4 90 1F 00 00 */ stw r0, 0(r31) -/* 80C240F8 41 82 00 10 */ beq lbl_80C24108 -/* 80C240FC 3C 60 80 C2 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80C245E0@ha */ -/* 80C24100 38 03 45 E0 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80C245E0@l */ -/* 80C24104 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C24108: -/* 80C24108 7C 80 07 35 */ extsh. r0, r4 -/* 80C2410C 40 81 00 0C */ ble lbl_80C24118 -/* 80C24110 7F E3 FB 78 */ mr r3, r31 -/* 80C24114 4B 6A AC 29 */ bl __dl__FPv -lbl_80C24118: -/* 80C24118 7F E3 FB 78 */ mr r3, r31 -/* 80C2411C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C24120 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C24124 7C 08 03 A6 */ mtlr r0 -/* 80C24128 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C2412C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index 98a7590406..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C24130: -/* 80C24130 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C24134 7C 08 02 A6 */ mflr r0 -/* 80C24138 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C2413C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C24140 93 C1 00 08 */ stw r30, 8(r1) -/* 80C24144 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C24148 7C 9F 23 78 */ mr r31, r4 -/* 80C2414C 41 82 00 38 */ beq lbl_80C24184 -/* 80C24150 3C 60 80 C2 */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80C245D4@ha */ -/* 80C24154 38 03 45 D4 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80C245D4@l */ -/* 80C24158 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80C2415C 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80C24160 38 80 FF FF */ li r4, -1 -/* 80C24164 4B 64 AD B5 */ bl __dt__8cM3dGCirFv -/* 80C24168 7F C3 F3 78 */ mr r3, r30 -/* 80C2416C 38 80 00 00 */ li r4, 0 -/* 80C24170 4B 64 3F 41 */ bl __dt__13cBgS_PolyInfoFv -/* 80C24174 7F E0 07 35 */ extsh. r0, r31 -/* 80C24178 40 81 00 0C */ ble lbl_80C24184 -/* 80C2417C 7F C3 F3 78 */ mr r3, r30 -/* 80C24180 4B 6A AB BD */ bl __dl__FPv -lbl_80C24184: -/* 80C24184 7F C3 F3 78 */ mr r3, r30 -/* 80C24188 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C2418C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C24190 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C24194 7C 08 03 A6 */ mtlr r0 -/* 80C24198 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C2419C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index db9fe609b8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C241A0: -/* 80C241A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C241A4 7C 08 02 A6 */ mflr r0 -/* 80C241A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C241AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C241B0 93 C1 00 08 */ stw r30, 8(r1) -/* 80C241B4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C241B8 7C 9F 23 78 */ mr r31, r4 -/* 80C241BC 41 82 00 38 */ beq lbl_80C241F4 -/* 80C241C0 3C 80 80 C2 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80C24640@ha */ -/* 80C241C4 38 84 46 40 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80C24640@l */ -/* 80C241C8 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80C241CC 38 04 00 0C */ addi r0, r4, 0xc -/* 80C241D0 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80C241D4 38 04 00 18 */ addi r0, r4, 0x18 -/* 80C241D8 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80C241DC 38 80 00 00 */ li r4, 0 -/* 80C241E0 4B 45 1D B5 */ bl __dt__9dBgS_AcchFv -/* 80C241E4 7F E0 07 35 */ extsh. r0, r31 -/* 80C241E8 40 81 00 0C */ ble lbl_80C241F4 -/* 80C241EC 7F C3 F3 78 */ mr r3, r30 -/* 80C241F0 4B 6A AB 4D */ bl __dl__FPv -lbl_80C241F4: -/* 80C241F4 7F C3 F3 78 */ mr r3, r30 -/* 80C241F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C241FC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C24200 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C24204 7C 08 03 A6 */ mtlr r0 -/* 80C24208 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C2420C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__14dBgS_ObjGndChkFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__14dBgS_ObjGndChkFv.s deleted file mode 100644 index adca559f71..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__14dBgS_ObjGndChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80C23FCC: -/* 80C23FCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C23FD0 7C 08 02 A6 */ mflr r0 -/* 80C23FD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C23FD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C23FDC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C23FE0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C23FE4 7C 9F 23 78 */ mr r31, r4 -/* 80C23FE8 41 82 00 40 */ beq lbl_80C24028 -/* 80C23FEC 3C 80 80 C2 */ lis r4, __vt__14dBgS_ObjGndChk@ha /* 0x80C245F8@ha */ -/* 80C23FF0 38 84 45 F8 */ addi r4, r4, __vt__14dBgS_ObjGndChk@l /* 0x80C245F8@l */ -/* 80C23FF4 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80C23FF8 38 04 00 0C */ addi r0, r4, 0xc -/* 80C23FFC 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80C24000 38 04 00 18 */ addi r0, r4, 0x18 -/* 80C24004 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 80C24008 38 04 00 24 */ addi r0, r4, 0x24 -/* 80C2400C 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C24010 38 80 00 00 */ li r4, 0 -/* 80C24014 4B 45 35 DD */ bl __dt__11dBgS_GndChkFv -/* 80C24018 7F E0 07 35 */ extsh. r0, r31 -/* 80C2401C 40 81 00 0C */ ble lbl_80C24028 -/* 80C24020 7F C3 F3 78 */ mr r3, r30 -/* 80C24024 4B 6A AD 19 */ bl __dl__FPv -lbl_80C24028: -/* 80C24028 7F C3 F3 78 */ mr r3, r30 -/* 80C2402C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C24030 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C24034 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C24038 7C 08 03 A6 */ mtlr r0 -/* 80C2403C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C24040 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGAabFv.s deleted file mode 100644 index 08e54ca817..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C2408C: -/* 80C2408C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C24090 7C 08 02 A6 */ mflr r0 -/* 80C24094 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C24098 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C2409C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C240A0 41 82 00 1C */ beq lbl_80C240BC -/* 80C240A4 3C A0 80 C2 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C24634@ha */ -/* 80C240A8 38 05 46 34 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C24634@l */ -/* 80C240AC 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C240B0 7C 80 07 35 */ extsh. r0, r4 -/* 80C240B4 40 81 00 08 */ ble lbl_80C240BC -/* 80C240B8 4B 6A AC 85 */ bl __dl__FPv -lbl_80C240BC: -/* 80C240BC 7F E3 FB 78 */ mr r3, r31 -/* 80C240C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C240C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C240C8 7C 08 03 A6 */ mtlr r0 -/* 80C240CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C240D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGCylFv.s deleted file mode 100644 index aeab1f878c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C24044: -/* 80C24044 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C24048 7C 08 02 A6 */ mflr r0 -/* 80C2404C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C24050 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C24054 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C24058 41 82 00 1C */ beq lbl_80C24074 -/* 80C2405C 3C A0 80 C2 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80C24628@ha */ -/* 80C24060 38 05 46 28 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80C24628@l */ -/* 80C24064 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C24068 7C 80 07 35 */ extsh. r0, r4 -/* 80C2406C 40 81 00 08 */ ble lbl_80C24074 -/* 80C24070 4B 6A AC CD */ bl __dl__FPv -lbl_80C24074: -/* 80C24074 7F E3 FB 78 */ mr r3, r31 -/* 80C24078 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C2407C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C24080 7C 08 03 A6 */ mtlr r0 -/* 80C24084 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C24088 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGPlaFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGPlaFv.s deleted file mode 100644 index 13a5d71a86..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGPlaFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C23A08: -/* 80C23A08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C23A0C 7C 08 02 A6 */ mflr r0 -/* 80C23A10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C23A14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C23A18 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C23A1C 41 82 00 1C */ beq lbl_80C23A38 -/* 80C23A20 3C A0 80 C2 */ lis r5, __vt__8cM3dGPla@ha /* 0x80C24664@ha */ -/* 80C23A24 38 05 46 64 */ addi r0, r5, __vt__8cM3dGPla@l /* 0x80C24664@l */ -/* 80C23A28 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80C23A2C 7C 80 07 35 */ extsh. r0, r4 -/* 80C23A30 40 81 00 08 */ ble lbl_80C23A38 -/* 80C23A34 4B 6A B3 09 */ bl __dl__FPv -lbl_80C23A38: -/* 80C23A38 7F E3 FB 78 */ mr r3, r31 -/* 80C23A3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C23A40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C23A44 7C 08 03 A6 */ mtlr r0 -/* 80C23A48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C23A4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionEvent__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionEvent__13daObjIceBlk_cFv.s deleted file mode 100644 index 717131f3d1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionEvent__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80C23C1C: -/* 80C23C1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C23C20 7C 08 02 A6 */ mflr r0 -/* 80C23C24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C23C28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C23C2C 93 C1 00 08 */ stw r30, 8(r1) -/* 80C23C30 7C 7E 1B 78 */ mr r30, r3 -/* 80C23C34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C23C38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C23C3C 88 03 5D B0 */ lbz r0, 0x5db0(r3) -/* 80C23C40 7C 00 07 74 */ extsb r0, r0 -/* 80C23C44 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 80C23C48 7C 63 02 14 */ add r3, r3, r0 -/* 80C23C4C 83 E3 5D 74 */ lwz r31, 0x5d74(r3) -/* 80C23C50 88 1E 09 4D */ lbz r0, 0x94d(r30) -/* 80C23C54 28 00 00 01 */ cmplwi r0, 1 -/* 80C23C58 41 82 00 30 */ beq lbl_80C23C88 -/* 80C23C5C 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C23C60 4B 53 D8 4D */ bl Start__9dCamera_cFv -/* 80C23C64 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C23C68 38 80 00 00 */ li r4, 0 -/* 80C23C6C 4B 53 F3 A1 */ bl SetTrimSize__9dCamera_cFl -/* 80C23C70 38 00 00 00 */ li r0, 0 -/* 80C23C74 98 1E 09 4C */ stb r0, 0x94c(r30) -/* 80C23C78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C23C7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C23C80 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80C23C84 4B 41 E7 E5 */ bl reset__14dEvt_control_cFv -lbl_80C23C88: -/* 80C23C88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C23C8C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C23C90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C23C94 7C 08 03 A6 */ mtlr r0 -/* 80C23C98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C23C9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionOrderEvent__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionOrderEvent__13daObjIceBlk_cFv.s deleted file mode 100644 index 42e59407cc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionOrderEvent__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80C23B70: -/* 80C23B70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C23B74 7C 08 02 A6 */ mflr r0 -/* 80C23B78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C23B7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C23B80 93 C1 00 08 */ stw r30, 8(r1) -/* 80C23B84 7C 7E 1B 78 */ mr r30, r3 -/* 80C23B88 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C23B8C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C23B90 88 04 5D B0 */ lbz r0, 0x5db0(r4) -/* 80C23B94 7C 00 07 74 */ extsb r0, r0 -/* 80C23B98 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 80C23B9C 7C 84 02 14 */ add r4, r4, r0 -/* 80C23BA0 83 E4 5D 74 */ lwz r31, 0x5d74(r4) -/* 80C23BA4 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80C23BA8 28 00 00 02 */ cmplwi r0, 2 -/* 80C23BAC 40 82 00 24 */ bne lbl_80C23BD0 -/* 80C23BB0 38 00 00 02 */ li r0, 2 -/* 80C23BB4 98 1E 09 4C */ stb r0, 0x94c(r30) -/* 80C23BB8 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C23BBC 4B 53 D9 15 */ bl Stop__9dCamera_cFv -/* 80C23BC0 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C23BC4 38 80 00 01 */ li r4, 1 -/* 80C23BC8 4B 53 F4 45 */ bl SetTrimSize__9dCamera_cFl -/* 80C23BCC 48 00 00 38 */ b lbl_80C23C04 -lbl_80C23BD0: -/* 80C23BD0 88 1E 09 4D */ lbz r0, 0x94d(r30) -/* 80C23BD4 28 00 00 01 */ cmplwi r0, 1 -/* 80C23BD8 40 82 00 24 */ bne lbl_80C23BFC -/* 80C23BDC 38 80 00 02 */ li r4, 2 -/* 80C23BE0 38 A0 00 00 */ li r5, 0 -/* 80C23BE4 38 C0 00 00 */ li r6, 0 -/* 80C23BE8 4B 3F 7D 21 */ bl fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs -/* 80C23BEC A0 1E 00 FA */ lhz r0, 0xfa(r30) -/* 80C23BF0 60 00 00 02 */ ori r0, r0, 2 -/* 80C23BF4 B0 1E 00 FA */ sth r0, 0xfa(r30) -/* 80C23BF8 48 00 00 0C */ b lbl_80C23C04 -lbl_80C23BFC: -/* 80C23BFC 38 00 00 00 */ li r0, 0 -/* 80C23C00 98 1E 09 4C */ stb r0, 0x94c(r30) -lbl_80C23C04: -/* 80C23C04 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C23C08 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C23C0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C23C10 7C 08 03 A6 */ mtlr r0 -/* 80C23C14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C23C18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionWait__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionWait__13daObjIceBlk_cFv.s deleted file mode 100644 index 240023270b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionWait__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80C23B0C: -/* 80C23B0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C23B10 7C 08 02 A6 */ mflr r0 -/* 80C23B14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C23B18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C23B1C 7C 7F 1B 78 */ mr r31, r3 -/* 80C23B20 88 03 09 4D */ lbz r0, 0x94d(r3) -/* 80C23B24 28 00 00 01 */ cmplwi r0, 1 -/* 80C23B28 40 82 00 34 */ bne lbl_80C23B5C -/* 80C23B2C 88 1F 09 D0 */ lbz r0, 0x9d0(r31) -/* 80C23B30 28 00 00 01 */ cmplwi r0, 1 -/* 80C23B34 40 82 00 28 */ bne lbl_80C23B5C -/* 80C23B38 38 00 00 01 */ li r0, 1 -/* 80C23B3C 98 1F 09 4C */ stb r0, 0x94c(r31) -/* 80C23B40 38 80 00 02 */ li r4, 2 -/* 80C23B44 38 A0 00 00 */ li r5, 0 -/* 80C23B48 38 C0 00 00 */ li r6, 0 -/* 80C23B4C 4B 3F 7D BD */ bl fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs -/* 80C23B50 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80C23B54 60 00 00 02 */ ori r0, r0, 2 -/* 80C23B58 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_80C23B5C: -/* 80C23B5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C23B60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C23B64 7C 08 03 A6 */ mtlr r0 -/* 80C23B68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C23B6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/bgCheck__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/bgCheck__13daObjIceBlk_cFv.s deleted file mode 100644 index 89788f68a2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/bgCheck__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80C237B0: -/* 80C237B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C237B4 7C 08 02 A6 */ mflr r0 -/* 80C237B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C237BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C237C0 93 C1 00 08 */ stw r30, 8(r1) -/* 80C237C4 7C 7E 1B 78 */ mr r30, r3 -/* 80C237C8 83 E3 09 54 */ lwz r31, 0x954(r3) -/* 80C237CC 38 00 00 00 */ li r0, 0 -/* 80C237D0 90 03 09 54 */ stw r0, 0x954(r3) -/* 80C237D4 4B FF FE F5 */ bl checkBgHit__13daObjIceBlk_cFv -/* 80C237D8 C0 3E 09 58 */ lfs f1, 0x958(r30) -/* 80C237DC C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80C237E0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C237E4 40 81 00 50 */ ble lbl_80C23834 -/* 80C237E8 D0 3E 04 D4 */ stfs f1, 0x4d4(r30) -/* 80C237EC 3C 60 80 C2 */ lis r3, lit_3936@ha /* 0x80C24370@ha */ -/* 80C237F0 C0 03 43 70 */ lfs f0, lit_3936@l(r3) /* 0x80C24370@l */ -/* 80C237F4 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80C237F8 57 E0 07 BD */ rlwinm. r0, r31, 0, 0x1e, 0x1e -/* 80C237FC 40 82 00 10 */ bne lbl_80C2380C -/* 80C23800 80 1E 09 54 */ lwz r0, 0x954(r30) -/* 80C23804 60 00 00 01 */ ori r0, r0, 1 -/* 80C23808 90 1E 09 54 */ stw r0, 0x954(r30) -lbl_80C2380C: -/* 80C2380C 80 1E 09 54 */ lwz r0, 0x954(r30) -/* 80C23810 60 00 00 02 */ ori r0, r0, 2 -/* 80C23814 90 1E 09 54 */ stw r0, 0x954(r30) -/* 80C23818 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C2381C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C23820 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C23824 38 9E 09 7C */ addi r4, r30, 0x97c -/* 80C23828 7F C5 F3 78 */ mr r5, r30 -/* 80C2382C 4B 45 23 59 */ bl RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c -/* 80C23830 48 00 00 18 */ b lbl_80C23848 -lbl_80C23834: -/* 80C23834 57 E0 07 BD */ rlwinm. r0, r31, 0, 0x1e, 0x1e -/* 80C23838 41 82 00 10 */ beq lbl_80C23848 -/* 80C2383C 80 1E 09 54 */ lwz r0, 0x954(r30) -/* 80C23840 60 00 00 04 */ ori r0, r0, 4 -/* 80C23844 90 1E 09 54 */ stw r0, 0x954(r30) -lbl_80C23848: -/* 80C23848 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C2384C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C23850 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C23854 7C 08 03 A6 */ mtlr r0 -/* 80C23858 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C2385C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkBgHit__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkBgHit__13daObjIceBlk_cFv.s deleted file mode 100644 index f349982937..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkBgHit__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80C236C8: -/* 80C236C8 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80C236CC 7C 08 02 A6 */ mflr r0 -/* 80C236D0 90 01 00 54 */ stw r0, 0x54(r1) -/* 80C236D4 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80C236D8 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80C236DC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C236E0 4B 73 EA F1 */ bl _savegpr_26 -/* 80C236E4 7C 7A 1B 78 */ mr r26, r3 -/* 80C236E8 3C 60 80 C2 */ lis r3, l_dir_vec@ha /* 0x80C242F4@ha */ -/* 80C236EC 3B C3 42 F4 */ addi r30, r3, l_dir_vec@l /* 0x80C242F4@l */ -/* 80C236F0 C0 1E 01 60 */ lfs f0, 0x160(r30) -/* 80C236F4 D0 1A 09 58 */ stfs f0, 0x958(r26) -/* 80C236F8 3B 80 FF FF */ li r28, -1 -/* 80C236FC 80 1A 00 04 */ lwz r0, 4(r26) -/* 80C23700 90 1A 09 70 */ stw r0, 0x970(r26) -/* 80C23704 3B 60 00 00 */ li r27, 0 -/* 80C23708 3B E0 00 00 */ li r31, 0 -/* 80C2370C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C23710 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C23714 3B A3 0F 38 */ addi r29, r3, 0xf38 -/* 80C23718 C3 FE 01 64 */ lfs f31, 0x164(r30) -lbl_80C2371C: -/* 80C2371C 38 61 00 08 */ addi r3, r1, 8 -/* 80C23720 38 9A 04 D0 */ addi r4, r26, 0x4d0 -/* 80C23724 38 BE 01 24 */ addi r5, r30, 0x124 -/* 80C23728 7C A5 FA 14 */ add r5, r5, r31 -/* 80C2372C 4B 64 33 B9 */ bl __pl__4cXyzCFRC3Vec -/* 80C23730 C0 01 00 08 */ lfs f0, 8(r1) -/* 80C23734 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80C23738 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80C2373C D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80C23740 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80C23744 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80C23748 EC 01 F8 2A */ fadds f0, f1, f31 -/* 80C2374C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80C23750 38 7A 09 68 */ addi r3, r26, 0x968 -/* 80C23754 38 81 00 14 */ addi r4, r1, 0x14 -/* 80C23758 4B 64 45 D1 */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 80C2375C 7F A3 EB 78 */ mr r3, r29 -/* 80C23760 38 9A 09 68 */ addi r4, r26, 0x968 -/* 80C23764 4B 45 0D 3D */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 80C23768 C0 1A 09 58 */ lfs f0, 0x958(r26) -/* 80C2376C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C23770 40 81 00 0C */ ble lbl_80C2377C -/* 80C23774 D0 3A 09 58 */ stfs f1, 0x958(r26) -/* 80C23778 7F 7C DB 78 */ mr r28, r27 -lbl_80C2377C: -/* 80C2377C 3B 7B 00 01 */ addi r27, r27, 1 -/* 80C23780 2C 1B 00 05 */ cmpwi r27, 5 -/* 80C23784 3B FF 00 0C */ addi r31, r31, 0xc -/* 80C23788 41 80 FF 94 */ blt lbl_80C2371C -/* 80C2378C 7F 83 E3 78 */ mr r3, r28 -/* 80C23790 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80C23794 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80C23798 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C2379C 4B 73 EA 81 */ bl _restgpr_26 -/* 80C237A0 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80C237A4 7C 08 03 A6 */ mtlr r0 -/* 80C237A8 38 21 00 50 */ addi r1, r1, 0x50 -/* 80C237AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkFall__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkFall__13daObjIceBlk_cFv.s deleted file mode 100644 index 1018aa8fbb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkFall__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,91 +0,0 @@ -lbl_80C238B0: -/* 80C238B0 94 21 FF 20 */ stwu r1, -0xe0(r1) -/* 80C238B4 7C 08 02 A6 */ mflr r0 -/* 80C238B8 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 80C238BC DB E1 00 D0 */ stfd f31, 0xd0(r1) -/* 80C238C0 F3 E1 00 D8 */ psq_st f31, 216(r1), 0, 0 /* qr0 */ -/* 80C238C4 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 80C238C8 4B 73 E9 09 */ bl _savegpr_26 -/* 80C238CC 7C 7F 1B 78 */ mr r31, r3 -/* 80C238D0 38 61 00 40 */ addi r3, r1, 0x40 -/* 80C238D4 4B 45 46 89 */ bl __ct__14dBgS_ObjLinChkFv -/* 80C238D8 80 1F 00 04 */ lwz r0, 4(r31) -/* 80C238DC 90 01 00 48 */ stw r0, 0x48(r1) -/* 80C238E0 3B 40 00 00 */ li r26, 0 -/* 80C238E4 3B C0 00 00 */ li r30, 0 -/* 80C238E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C238EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C238F0 3B 83 0F 38 */ addi r28, r3, 0xf38 -/* 80C238F4 3B 61 00 54 */ addi r27, r1, 0x54 -/* 80C238F8 3C 60 80 C2 */ lis r3, l_check_offsetXZ_4641@ha /* 0x80C2445C@ha */ -/* 80C238FC 3B A3 44 5C */ addi r29, r3, l_check_offsetXZ_4641@l /* 0x80C2445C@l */ -/* 80C23900 3C 60 80 C2 */ lis r3, lit_4696@ha /* 0x80C24498@ha */ -/* 80C23904 C3 E3 44 98 */ lfs f31, lit_4696@l(r3) /* 0x80C24498@l */ -lbl_80C23908: -/* 80C23908 38 61 00 08 */ addi r3, r1, 8 -/* 80C2390C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80C23910 7C BD F2 14 */ add r5, r29, r30 -/* 80C23914 4B 64 31 D1 */ bl __pl__4cXyzCFRC3Vec -/* 80C23918 C0 41 00 08 */ lfs f2, 8(r1) -/* 80C2391C D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80C23920 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80C23924 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80C23928 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80C2392C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80C23930 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80C23934 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80C23938 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80C2393C FC 00 08 18 */ frsp f0, f1 -/* 80C23940 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 80C23944 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80C23948 38 61 00 40 */ addi r3, r1, 0x40 -/* 80C2394C 38 81 00 20 */ addi r4, r1, 0x20 -/* 80C23950 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80C23954 7F E6 FB 78 */ mr r6, r31 -/* 80C23958 4B 45 44 0D */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 80C2395C 7F 83 E3 78 */ mr r3, r28 -/* 80C23960 38 81 00 40 */ addi r4, r1, 0x40 -/* 80C23964 4B 45 0A 51 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 80C23968 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C2396C 41 82 00 5C */ beq lbl_80C239C8 -/* 80C23970 3C 60 80 C2 */ lis r3, __vt__8cM3dGPla@ha /* 0x80C24664@ha */ -/* 80C23974 38 03 46 64 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x80C24664@l */ -/* 80C23978 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80C2397C 7F 83 E3 78 */ mr r3, r28 -/* 80C23980 7F 64 DB 78 */ mr r4, r27 -/* 80C23984 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80C23988 4B 45 0D BD */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 80C2398C C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80C23990 4B 64 48 55 */ bl cBgW_CheckBGround__Ff -/* 80C23994 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C23998 41 82 00 24 */ beq lbl_80C239BC -/* 80C2399C 3C 60 80 C2 */ lis r3, __vt__8cM3dGPla@ha /* 0x80C24664@ha */ -/* 80C239A0 38 03 46 64 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x80C24664@l */ -/* 80C239A4 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80C239A8 38 61 00 40 */ addi r3, r1, 0x40 -/* 80C239AC 38 80 FF FF */ li r4, -1 -/* 80C239B0 4B 45 46 09 */ bl __dt__14dBgS_ObjLinChkFv -/* 80C239B4 38 60 00 00 */ li r3, 0 -/* 80C239B8 48 00 00 30 */ b lbl_80C239E8 -lbl_80C239BC: -/* 80C239BC 3C 60 80 C2 */ lis r3, __vt__8cM3dGPla@ha /* 0x80C24664@ha */ -/* 80C239C0 38 03 46 64 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x80C24664@l */ -/* 80C239C4 90 01 00 3C */ stw r0, 0x3c(r1) -lbl_80C239C8: -/* 80C239C8 3B 5A 00 01 */ addi r26, r26, 1 -/* 80C239CC 2C 1A 00 05 */ cmpwi r26, 5 -/* 80C239D0 3B DE 00 0C */ addi r30, r30, 0xc -/* 80C239D4 41 80 FF 34 */ blt lbl_80C23908 -/* 80C239D8 38 61 00 40 */ addi r3, r1, 0x40 -/* 80C239DC 38 80 FF FF */ li r4, -1 -/* 80C239E0 4B 45 45 D9 */ bl __dt__14dBgS_ObjLinChkFv -/* 80C239E4 38 60 00 01 */ li r3, 1 -lbl_80C239E8: -/* 80C239E8 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, 0 /* qr0 */ -/* 80C239EC CB E1 00 D0 */ lfd f31, 0xd0(r1) -/* 80C239F0 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 80C239F4 4B 73 E8 29 */ bl _restgpr_26 -/* 80C239F8 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 80C239FC 7C 08 03 A6 */ mtlr r0 -/* 80C23A00 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80C23A04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkWalk__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkWalk__13daObjIceBlk_cFv.s deleted file mode 100644 index 80b5df8238..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkWalk__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,122 +0,0 @@ -lbl_80C2294C: -/* 80C2294C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C22950 7C 08 02 A6 */ mflr r0 -/* 80C22954 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C22958 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80C2295C 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80C22960 7C 7E 1B 78 */ mr r30, r3 -/* 80C22964 3B E0 FF FF */ li r31, -1 -/* 80C22968 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80C2296C 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80C22970 28 04 00 FF */ cmplwi r4, 0xff -/* 80C22974 41 82 00 28 */ beq lbl_80C2299C -/* 80C22978 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C2297C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22980 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C22984 7C 05 07 74 */ extsb r5, r0 -/* 80C22988 4B 41 29 D9 */ bl isSwitch__10dSv_info_cCFii -/* 80C2298C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C22990 40 82 00 0C */ bne lbl_80C2299C -/* 80C22994 38 60 FF FF */ li r3, -1 -/* 80C22998 48 00 01 54 */ b lbl_80C22AEC -lbl_80C2299C: -/* 80C2299C 38 80 00 00 */ li r4, 0 -/* 80C229A0 38 60 00 01 */ li r3, 1 -/* 80C229A4 38 00 00 04 */ li r0, 4 -/* 80C229A8 7C 09 03 A6 */ mtctr r0 -lbl_80C229AC: -/* 80C229AC 38 04 09 48 */ addi r0, r4, 0x948 -/* 80C229B0 7C 1E 00 AE */ lbzx r0, r30, r0 -/* 80C229B4 28 00 00 00 */ cmplwi r0, 0 -/* 80C229B8 41 82 00 0C */ beq lbl_80C229C4 -/* 80C229BC 7C 9F 23 78 */ mr r31, r4 -/* 80C229C0 98 7E 09 D0 */ stb r3, 0x9d0(r30) -lbl_80C229C4: -/* 80C229C4 38 84 00 01 */ addi r4, r4, 1 -/* 80C229C8 42 00 FF E4 */ bdnz lbl_80C229AC -/* 80C229CC 38 7E 08 04 */ addi r3, r30, 0x804 -/* 80C229D0 4B 46 1A 91 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80C229D4 28 03 00 00 */ cmplwi r3, 0 -/* 80C229D8 41 82 00 E4 */ beq lbl_80C22ABC -/* 80C229DC 38 7E 08 04 */ addi r3, r30, 0x804 -/* 80C229E0 4B 46 1B 69 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80C229E4 88 1E 09 D1 */ lbz r0, 0x9d1(r30) -/* 80C229E8 28 00 00 00 */ cmplwi r0, 0 -/* 80C229EC 40 82 00 D0 */ bne lbl_80C22ABC -/* 80C229F0 28 03 00 00 */ cmplwi r3, 0 -/* 80C229F4 41 82 00 C8 */ beq lbl_80C22ABC -/* 80C229F8 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80C229FC 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 -/* 80C22A00 41 82 00 BC */ beq lbl_80C22ABC -/* 80C22A04 88 03 00 14 */ lbz r0, 0x14(r3) -/* 80C22A08 28 00 00 03 */ cmplwi r0, 3 -/* 80C22A0C 40 82 00 B0 */ bne lbl_80C22ABC -/* 80C22A10 38 61 00 08 */ addi r3, r1, 8 -/* 80C22A14 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80C22A18 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22A1C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22A20 80 A5 5D AC */ lwz r5, 0x5dac(r5) -/* 80C22A24 38 A5 04 D0 */ addi r5, r5, 0x4d0 -/* 80C22A28 4B 64 41 0D */ bl __mi__4cXyzCFRC3Vec -/* 80C22A2C C0 21 00 08 */ lfs f1, 8(r1) -/* 80C22A30 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80C22A34 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80C22A38 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80C22A3C C0 41 00 10 */ lfs f2, 0x10(r1) -/* 80C22A40 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80C22A44 4B 64 4C 31 */ bl cM_atan2s__Fff -/* 80C22A48 7C 60 07 34 */ extsh r0, r3 -/* 80C22A4C 2C 00 E0 00 */ cmpwi r0, -8192 -/* 80C22A50 41 80 00 14 */ blt lbl_80C22A64 -/* 80C22A54 2C 00 20 00 */ cmpwi r0, 0x2000 -/* 80C22A58 40 80 00 0C */ bge lbl_80C22A64 -/* 80C22A5C 3B E0 00 00 */ li r31, 0 -/* 80C22A60 48 00 00 54 */ b lbl_80C22AB4 -lbl_80C22A64: -/* 80C22A64 7C 60 07 34 */ extsh r0, r3 -/* 80C22A68 2C 00 20 00 */ cmpwi r0, 0x2000 -/* 80C22A6C 41 80 00 14 */ blt lbl_80C22A80 -/* 80C22A70 2C 00 60 00 */ cmpwi r0, 0x6000 -/* 80C22A74 40 80 00 0C */ bge lbl_80C22A80 -/* 80C22A78 3B E0 00 01 */ li r31, 1 -/* 80C22A7C 48 00 00 38 */ b lbl_80C22AB4 -lbl_80C22A80: -/* 80C22A80 7C 60 07 34 */ extsh r0, r3 -/* 80C22A84 2C 00 E0 00 */ cmpwi r0, -8192 -/* 80C22A88 40 80 00 14 */ bge lbl_80C22A9C -/* 80C22A8C 2C 00 A0 00 */ cmpwi r0, -24576 -/* 80C22A90 41 80 00 0C */ blt lbl_80C22A9C -/* 80C22A94 3B E0 00 03 */ li r31, 3 -/* 80C22A98 48 00 00 1C */ b lbl_80C22AB4 -lbl_80C22A9C: -/* 80C22A9C 7C 60 07 34 */ extsh r0, r3 -/* 80C22AA0 2C 00 A0 00 */ cmpwi r0, -24576 -/* 80C22AA4 41 80 00 0C */ blt lbl_80C22AB0 -/* 80C22AA8 2C 00 60 00 */ cmpwi r0, 0x6000 -/* 80C22AAC 41 80 00 08 */ blt lbl_80C22AB4 -lbl_80C22AB0: -/* 80C22AB0 3B E0 00 02 */ li r31, 2 -lbl_80C22AB4: -/* 80C22AB4 38 00 00 02 */ li r0, 2 -/* 80C22AB8 98 1E 09 D0 */ stb r0, 0x9d0(r30) -lbl_80C22ABC: -/* 80C22ABC 2C 1F FF FF */ cmpwi r31, -1 -/* 80C22AC0 41 82 00 28 */ beq lbl_80C22AE8 -/* 80C22AC4 7F C3 F3 78 */ mr r3, r30 -/* 80C22AC8 57 E0 08 3C */ slwi r0, r31, 1 -/* 80C22ACC 3C 80 80 C2 */ lis r4, l_dir_angle@ha /* 0x80C24324@ha */ -/* 80C22AD0 38 84 43 24 */ addi r4, r4, l_dir_angle@l /* 0x80C24324@l */ -/* 80C22AD4 7C 84 02 AE */ lhax r4, r4, r0 -/* 80C22AD8 48 00 0A 35 */ bl checkWallPre__13daObjIceBlk_cFs -/* 80C22ADC 2C 03 00 00 */ cmpwi r3, 0 -/* 80C22AE0 41 80 00 08 */ blt lbl_80C22AE8 -/* 80C22AE4 3B E0 FF FF */ li r31, -1 -lbl_80C22AE8: -/* 80C22AE8 7F E3 FB 78 */ mr r3, r31 -lbl_80C22AEC: -/* 80C22AEC 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80C22AF0 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80C22AF4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C22AF8 7C 08 03 A6 */ mtlr r0 -/* 80C22AFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C22B00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkWallPre__13daObjIceBlk_cFs.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkWallPre__13daObjIceBlk_cFs.s deleted file mode 100644 index 5eb54dc59f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkWallPre__13daObjIceBlk_cFs.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_80C2350C: -/* 80C2350C 94 21 FF 00 */ stwu r1, -0x100(r1) -/* 80C23510 7C 08 02 A6 */ mflr r0 -/* 80C23514 90 01 01 04 */ stw r0, 0x104(r1) -/* 80C23518 39 61 01 00 */ addi r11, r1, 0x100 -/* 80C2351C 4B 73 EC A9 */ bl _savegpr_23 -/* 80C23520 7C 7C 1B 78 */ mr r28, r3 -/* 80C23524 7C 9D 23 78 */ mr r29, r4 -/* 80C23528 3C 60 80 C2 */ lis r3, l_dir_vec@ha /* 0x80C242F4@ha */ -/* 80C2352C 3B E3 42 F4 */ addi r31, r3, l_dir_vec@l /* 0x80C242F4@l */ -/* 80C23530 38 61 00 68 */ addi r3, r1, 0x68 -/* 80C23534 4B 45 4A 29 */ bl __ct__14dBgS_ObjLinChkFv -/* 80C23538 3B C0 FF FF */ li r30, -1 -/* 80C2353C 80 1C 00 04 */ lwz r0, 4(r28) -/* 80C23540 90 01 00 70 */ stw r0, 0x70(r1) -/* 80C23544 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C23548 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C2354C 7F A4 EB 78 */ mr r4, r29 -/* 80C23550 4B 3E 8E 8D */ bl mDoMtx_YrotS__FPA4_fs -/* 80C23554 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C23558 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C2355C 3C 80 80 43 */ lis r4, BaseZ__4cXyz@ha /* 0x80430D3C@ha */ -/* 80C23560 38 84 0D 3C */ addi r4, r4, BaseZ__4cXyz@l /* 0x80430D3C@l */ -/* 80C23564 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80C23568 4B 72 38 05 */ bl PSMTXMultVec -/* 80C2356C 38 61 00 2C */ addi r3, r1, 0x2c -/* 80C23570 38 81 00 44 */ addi r4, r1, 0x44 -/* 80C23574 C0 3F 01 1C */ lfs f1, 0x11c(r31) -/* 80C23578 4B 64 36 0D */ bl __ml__4cXyzCFf -/* 80C2357C C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80C23580 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80C23584 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80C23588 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80C2358C C0 01 00 34 */ lfs f0, 0x34(r1) -/* 80C23590 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80C23594 38 61 00 44 */ addi r3, r1, 0x44 -/* 80C23598 7C 64 1B 78 */ mr r4, r3 -/* 80C2359C C0 3F 01 20 */ lfs f1, 0x120(r31) -/* 80C235A0 4B 72 3B 39 */ bl PSVECScale -/* 80C235A4 3A E0 00 00 */ li r23, 0 -/* 80C235A8 3B 60 00 00 */ li r27, 0 -/* 80C235AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C235B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C235B4 3B 23 0F 38 */ addi r25, r3, 0xf38 -/* 80C235B8 3B 01 00 98 */ addi r24, r1, 0x98 -/* 80C235BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C235C0 3B 43 D4 70 */ addi r26, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -lbl_80C235C4: -/* 80C235C4 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 80C235C8 4B 3E 97 9D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80C235CC 7F 43 D3 78 */ mr r3, r26 -/* 80C235D0 7F A4 EB 78 */ mr r4, r29 -/* 80C235D4 4B 3E 8E 61 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C235D8 7F 43 D3 78 */ mr r3, r26 -/* 80C235DC 38 9F 00 E0 */ addi r4, r31, 0xe0 -/* 80C235E0 7C 84 DA 14 */ add r4, r4, r27 -/* 80C235E4 38 A1 00 5C */ addi r5, r1, 0x5c -/* 80C235E8 4B 72 37 85 */ bl PSMTXMultVec -/* 80C235EC 38 61 00 20 */ addi r3, r1, 0x20 -/* 80C235F0 38 81 00 5C */ addi r4, r1, 0x5c -/* 80C235F4 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80C235F8 4B 64 34 ED */ bl __pl__4cXyzCFRC3Vec -/* 80C235FC C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80C23600 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80C23604 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80C23608 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80C2360C C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80C23610 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 80C23614 38 61 00 68 */ addi r3, r1, 0x68 -/* 80C23618 38 81 00 5C */ addi r4, r1, 0x5c -/* 80C2361C 38 A1 00 50 */ addi r5, r1, 0x50 -/* 80C23620 7F 86 E3 78 */ mr r6, r28 -/* 80C23624 4B 45 47 41 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 80C23628 7F 23 CB 78 */ mr r3, r25 -/* 80C2362C 38 81 00 68 */ addi r4, r1, 0x68 -/* 80C23630 4B 45 0D 85 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 80C23634 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C23638 41 82 00 58 */ beq lbl_80C23690 -/* 80C2363C 38 61 00 14 */ addi r3, r1, 0x14 -/* 80C23640 38 81 00 5C */ addi r4, r1, 0x5c -/* 80C23644 38 A1 00 38 */ addi r5, r1, 0x38 -/* 80C23648 4B 64 34 9D */ bl __pl__4cXyzCFRC3Vec -/* 80C2364C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80C23650 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80C23654 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80C23658 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80C2365C C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80C23660 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 80C23664 38 61 00 08 */ addi r3, r1, 8 -/* 80C23668 38 81 00 50 */ addi r4, r1, 0x50 -/* 80C2366C 7F 05 C3 78 */ mr r5, r24 -/* 80C23670 4B 64 34 C5 */ bl __mi__4cXyzCFRC3Vec -/* 80C23674 C0 01 00 08 */ lfs f0, 8(r1) -/* 80C23678 D0 1C 09 5C */ stfs f0, 0x95c(r28) -/* 80C2367C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80C23680 D0 1C 09 60 */ stfs f0, 0x960(r28) -/* 80C23684 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80C23688 D0 1C 09 64 */ stfs f0, 0x964(r28) -/* 80C2368C 7E FE BB 78 */ mr r30, r23 -lbl_80C23690: -/* 80C23690 3A F7 00 01 */ addi r23, r23, 1 -/* 80C23694 2C 17 00 05 */ cmpwi r23, 5 -/* 80C23698 3B 7B 00 0C */ addi r27, r27, 0xc -/* 80C2369C 41 80 FF 28 */ blt lbl_80C235C4 -/* 80C236A0 38 61 00 68 */ addi r3, r1, 0x68 -/* 80C236A4 38 80 FF FF */ li r4, -1 -/* 80C236A8 4B 45 49 11 */ bl __dt__14dBgS_ObjLinChkFv -/* 80C236AC 7F C3 F3 78 */ mr r3, r30 -/* 80C236B0 39 61 01 00 */ addi r11, r1, 0x100 -/* 80C236B4 4B 73 EB 5D */ bl _restgpr_23 -/* 80C236B8 80 01 01 04 */ lwz r0, 0x104(r1) -/* 80C236BC 7C 08 03 A6 */ mtlr r0 -/* 80C236C0 38 21 01 00 */ addi r1, r1, 0x100 -/* 80C236C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/clrCounter__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/clrCounter__13daObjIceBlk_cFv.s deleted file mode 100644 index 6335edf7ae..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/clrCounter__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80C22B04: -/* 80C22B04 38 A0 00 00 */ li r5, 0 -/* 80C22B08 38 80 00 00 */ li r4, 0 -/* 80C22B0C 38 00 00 04 */ li r0, 4 -/* 80C22B10 7C 09 03 A6 */ mtctr r0 -lbl_80C22B14: -/* 80C22B14 38 05 09 48 */ addi r0, r5, 0x948 -/* 80C22B18 7C 83 01 AE */ stbx r4, r3, r0 -/* 80C22B1C 38 A5 00 01 */ addi r5, r5, 1 -/* 80C22B20 42 00 FF F4 */ bdnz lbl_80C22B14 -/* 80C22B24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/create1st__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/create1st__13daObjIceBlk_cFv.s deleted file mode 100644 index 2d555df79a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/create1st__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80C227F4: -/* 80C227F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C227F8 7C 08 02 A6 */ mflr r0 -/* 80C227FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C22800 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C22804 93 C1 00 08 */ stw r30, 8(r1) -/* 80C22808 7C 7E 1B 78 */ mr r30, r3 -/* 80C2280C 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 80C22810 3C 80 80 C2 */ lis r4, l_arcName@ha /* 0x80C244F0@ha */ -/* 80C22814 38 84 44 F0 */ addi r4, r4, l_arcName@l /* 0x80C244F0@l */ -/* 80C22818 80 84 00 00 */ lwz r4, 0(r4) -/* 80C2281C 4B 40 A6 A1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C22820 7C 60 1B 78 */ mr r0, r3 -/* 80C22824 2C 00 00 04 */ cmpwi r0, 4 -/* 80C22828 40 82 00 70 */ bne lbl_80C22898 -/* 80C2282C 3B E0 0C 40 */ li r31, 0xc40 -/* 80C22830 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C22834 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80C22838 28 04 00 FF */ cmplwi r4, 0xff -/* 80C2283C 41 82 00 24 */ beq lbl_80C22860 -/* 80C22840 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22844 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22848 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C2284C 7C 05 07 74 */ extsb r5, r0 -/* 80C22850 4B 41 2B 11 */ bl isSwitch__10dSv_info_cCFii -/* 80C22854 2C 03 00 00 */ cmpwi r3, 0 -/* 80C22858 40 82 00 08 */ bne lbl_80C22860 -/* 80C2285C 3B E0 29 40 */ li r31, 0x2940 -lbl_80C22860: -/* 80C22860 7F C3 F3 78 */ mr r3, r30 -/* 80C22864 3C 80 80 C2 */ lis r4, l_arcName@ha /* 0x80C244F0@ha */ -/* 80C22868 38 84 44 F0 */ addi r4, r4, l_arcName@l /* 0x80C244F0@l */ -/* 80C2286C 80 84 00 00 */ lwz r4, 0(r4) -/* 80C22870 38 A0 00 0C */ li r5, 0xc -/* 80C22874 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075B44@ha */ -/* 80C22878 38 C6 5B 44 */ addi r6, r6, dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075B44@l */ -/* 80C2287C 7F E7 FB 78 */ mr r7, r31 -/* 80C22880 39 00 00 00 */ li r8, 0 -/* 80C22884 4B 45 5F 39 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C22888 7C 60 1B 78 */ mr r0, r3 -/* 80C2288C 2C 00 00 05 */ cmpwi r0, 5 -/* 80C22890 40 82 00 08 */ bne lbl_80C22898 -/* 80C22894 48 00 00 08 */ b lbl_80C2289C -lbl_80C22898: -/* 80C22898 7C 03 03 78 */ mr r3, r0 -lbl_80C2289C: -/* 80C2289C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C228A0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C228A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C228A8 7C 08 03 A6 */ mtlr r0 -/* 80C228AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C228B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c.s deleted file mode 100644 index 6018e82d11..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C24210: -/* 80C24210 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C24214 7C 08 02 A6 */ mflr r0 -/* 80C24218 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C2421C 4B 45 46 C1 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C24220 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C24224 7C 08 03 A6 */ mtlr r0 -/* 80C24228 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C2422C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c.s deleted file mode 100644 index 9c10030e34..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C24250: -/* 80C24250 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C24254 7C 08 02 A6 */ mflr r0 -/* 80C24258 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C2425C 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C24260 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C24264 7D 89 03 A6 */ mtctr r12 -/* 80C24268 4E 80 04 21 */ bctrl -/* 80C2426C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C24270 7C 08 03 A6 */ mtlr r0 -/* 80C24274 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C24278 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c.s deleted file mode 100644 index 56cf8fbca5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C24230: -/* 80C24230 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C24234 7C 08 02 A6 */ mflr r0 -/* 80C24238 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C2423C 4B 45 47 15 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C24240 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C24244 7C 08 03 A6 */ mtlr r0 -/* 80C24248 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C2424C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_create1st__FP13daObjIceBlk_c.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_create1st__FP13daObjIceBlk_c.s deleted file mode 100644 index 9bd8774d26..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_create1st__FP13daObjIceBlk_c.s +++ /dev/null @@ -1,92 +0,0 @@ -lbl_80C23E68: -/* 80C23E68 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C23E6C 7C 08 02 A6 */ mflr r0 -/* 80C23E70 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C23E74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C23E78 4B 73 E3 65 */ bl _savegpr_29 -/* 80C23E7C 7C 7F 1B 78 */ mr r31, r3 -/* 80C23E80 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C23E84 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C23E88 40 82 01 24 */ bne lbl_80C23FAC -/* 80C23E8C 7F E0 FB 79 */ or. r0, r31, r31 -/* 80C23E90 41 82 01 10 */ beq lbl_80C23FA0 -/* 80C23E94 7C 1E 03 78 */ mr r30, r0 -/* 80C23E98 4B 45 47 8D */ bl __ct__16dBgS_MoveBgActorFv -/* 80C23E9C 3C 60 80 C2 */ lis r3, __vt__13daObjIceBlk_c@ha /* 0x80C24670@ha */ -/* 80C23EA0 38 03 46 70 */ addi r0, r3, __vt__13daObjIceBlk_c@l /* 0x80C24670@l */ -/* 80C23EA4 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C23EA8 3B BE 05 B0 */ addi r29, r30, 0x5b0 -/* 80C23EAC 7F A3 EB 78 */ mr r3, r29 -/* 80C23EB0 4B 45 21 F1 */ bl __ct__9dBgS_AcchFv -/* 80C23EB4 3C 60 80 C2 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80C24640@ha */ -/* 80C23EB8 38 63 46 40 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80C24640@l */ -/* 80C23EBC 90 7D 00 10 */ stw r3, 0x10(r29) -/* 80C23EC0 38 03 00 0C */ addi r0, r3, 0xc -/* 80C23EC4 90 1D 00 14 */ stw r0, 0x14(r29) -/* 80C23EC8 38 03 00 18 */ addi r0, r3, 0x18 -/* 80C23ECC 90 1D 00 24 */ stw r0, 0x24(r29) -/* 80C23ED0 38 7D 00 14 */ addi r3, r29, 0x14 -/* 80C23ED4 4B 45 4F 95 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80C23ED8 38 7E 07 88 */ addi r3, r30, 0x788 -/* 80C23EDC 4B 45 1F D1 */ bl __ct__12dBgS_AcchCirFv -/* 80C23EE0 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C23EE4 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C23EE8 90 1E 07 E0 */ stw r0, 0x7e0(r30) -/* 80C23EEC 38 7E 07 E4 */ addi r3, r30, 0x7e4 -/* 80C23EF0 4B 45 F8 71 */ bl __ct__10dCcD_GSttsFv -/* 80C23EF4 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C23EF8 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C23EFC 90 7E 07 E0 */ stw r3, 0x7e0(r30) -/* 80C23F00 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C23F04 90 1E 07 E4 */ stw r0, 0x7e4(r30) -/* 80C23F08 3B BE 08 04 */ addi r29, r30, 0x804 -/* 80C23F0C 7F A3 EB 78 */ mr r3, r29 -/* 80C23F10 4B 45 FB 19 */ bl __ct__12dCcD_GObjInfFv -/* 80C23F14 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C23F18 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C23F1C 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80C23F20 3C 60 80 C2 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C24634@ha */ -/* 80C23F24 38 03 46 34 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C24634@l */ -/* 80C23F28 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 80C23F2C 3C 60 80 C2 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C24628@ha */ -/* 80C23F30 38 03 46 28 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C24628@l */ -/* 80C23F34 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C23F38 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C23F3C 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C23F40 90 7D 01 20 */ stw r3, 0x120(r29) -/* 80C23F44 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C23F48 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C23F4C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C23F50 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C23F54 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 80C23F58 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C23F5C 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80C23F60 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C23F64 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C23F68 3B BE 09 68 */ addi r29, r30, 0x968 -/* 80C23F6C 7F A3 EB 78 */ mr r3, r29 -/* 80C23F70 4B 45 36 0D */ bl __ct__11dBgS_GndChkFv -/* 80C23F74 3C 60 80 C2 */ lis r3, __vt__14dBgS_ObjGndChk@ha /* 0x80C245F8@ha */ -/* 80C23F78 38 63 45 F8 */ addi r3, r3, __vt__14dBgS_ObjGndChk@l /* 0x80C245F8@l */ -/* 80C23F7C 90 7D 00 10 */ stw r3, 0x10(r29) -/* 80C23F80 38 03 00 0C */ addi r0, r3, 0xc -/* 80C23F84 90 1D 00 20 */ stw r0, 0x20(r29) -/* 80C23F88 38 03 00 18 */ addi r0, r3, 0x18 -/* 80C23F8C 90 1D 00 3C */ stw r0, 0x3c(r29) -/* 80C23F90 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C23F94 90 1D 00 4C */ stw r0, 0x4c(r29) -/* 80C23F98 38 7D 00 3C */ addi r3, r29, 0x3c -/* 80C23F9C 4B 45 4E CD */ bl SetObj__16dBgS_PolyPassChkFv -lbl_80C23FA0: -/* 80C23FA0 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C23FA4 60 00 00 08 */ ori r0, r0, 8 -/* 80C23FA8 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C23FAC: -/* 80C23FAC 7F E3 FB 78 */ mr r3, r31 -/* 80C23FB0 4B FF E8 45 */ bl create1st__13daObjIceBlk_cFv -/* 80C23FB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C23FB8 4B 73 E2 71 */ bl _restgpr_29 -/* 80C23FBC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C23FC0 7C 08 03 A6 */ mtlr r0 -/* 80C23FC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C23FC8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/disablePushPull__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/disablePushPull__13daObjIceBlk_cFv.s deleted file mode 100644 index cd66d68668..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/disablePushPull__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80C2224C: -/* 80C2224C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C22250 7C 08 02 A6 */ mflr r0 -/* 80C22254 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C22258 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C2225C 7C 7F 1B 78 */ mr r31, r3 -/* 80C22260 80 63 05 68 */ lwz r3, 0x568(r3) -/* 80C22264 28 03 00 00 */ cmplwi r3, 0 -/* 80C22268 41 82 00 1C */ beq lbl_80C22284 -/* 80C2226C 4B 64 5F 69 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C22270 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C22274 41 82 00 10 */ beq lbl_80C22284 -/* 80C22278 38 00 00 00 */ li r0, 0 -/* 80C2227C 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C22280 98 03 00 14 */ stb r0, 0x14(r3) -lbl_80C22284: -/* 80C22284 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C22288 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C2228C 7C 08 03 A6 */ mtlr r0 -/* 80C22290 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C22294 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/enablePushPull__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/enablePushPull__13daObjIceBlk_cFv.s deleted file mode 100644 index 41d4ad8c85..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/enablePushPull__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80C22200: -/* 80C22200 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C22204 7C 08 02 A6 */ mflr r0 -/* 80C22208 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C2220C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C22210 7C 7F 1B 78 */ mr r31, r3 -/* 80C22214 80 63 05 68 */ lwz r3, 0x568(r3) -/* 80C22218 28 03 00 00 */ cmplwi r3, 0 -/* 80C2221C 41 82 00 1C */ beq lbl_80C22238 -/* 80C22220 4B 64 5F B5 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C22224 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C22228 41 82 00 10 */ beq lbl_80C22238 -/* 80C2222C 38 00 00 01 */ li r0, 1 -/* 80C22230 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C22234 98 03 00 14 */ stb r0, 0x14(r3) -lbl_80C22238: -/* 80C22238 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C2223C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C22240 7C 08 03 A6 */ mtlr r0 -/* 80C22244 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C22248 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/event_proc_call__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/event_proc_call__13daObjIceBlk_cFv.s deleted file mode 100644 index 2552a9da04..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/event_proc_call__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80C23A50: -/* 80C23A50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C23A54 7C 08 02 A6 */ mflr r0 -/* 80C23A58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C23A5C 3C 80 80 C2 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80C244D0@ha */ -/* 80C23A60 38 E4 44 D0 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80C244D0@l */ -/* 80C23A64 3C 80 80 C2 */ lis r4, struct_80C24698+0x1@ha /* 0x80C24699@ha */ -/* 80C23A68 38 C4 46 99 */ addi r6, r4, struct_80C24698+0x1@l /* 0x80C24699@l */ -/* 80C23A6C 88 06 00 00 */ lbz r0, 0(r6) -/* 80C23A70 7C 00 07 75 */ extsb. r0, r0 -/* 80C23A74 40 82 00 70 */ bne lbl_80C23AE4 -/* 80C23A78 80 87 00 54 */ lwz r4, 0x54(r7) -/* 80C23A7C 80 07 00 58 */ lwz r0, 0x58(r7) -/* 80C23A80 90 87 00 84 */ stw r4, 0x84(r7) -/* 80C23A84 90 07 00 88 */ stw r0, 0x88(r7) -/* 80C23A88 80 07 00 5C */ lwz r0, 0x5c(r7) -/* 80C23A8C 90 07 00 8C */ stw r0, 0x8c(r7) -/* 80C23A90 38 A7 00 84 */ addi r5, r7, 0x84 -/* 80C23A94 80 87 00 60 */ lwz r4, 0x60(r7) -/* 80C23A98 80 07 00 64 */ lwz r0, 0x64(r7) -/* 80C23A9C 90 85 00 0C */ stw r4, 0xc(r5) -/* 80C23AA0 90 05 00 10 */ stw r0, 0x10(r5) -/* 80C23AA4 80 07 00 68 */ lwz r0, 0x68(r7) -/* 80C23AA8 90 05 00 14 */ stw r0, 0x14(r5) -/* 80C23AAC 80 87 00 6C */ lwz r4, 0x6c(r7) -/* 80C23AB0 80 07 00 70 */ lwz r0, 0x70(r7) -/* 80C23AB4 90 85 00 18 */ stw r4, 0x18(r5) -/* 80C23AB8 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80C23ABC 80 07 00 74 */ lwz r0, 0x74(r7) -/* 80C23AC0 90 05 00 20 */ stw r0, 0x20(r5) -/* 80C23AC4 80 87 00 78 */ lwz r4, 0x78(r7) -/* 80C23AC8 80 07 00 7C */ lwz r0, 0x7c(r7) -/* 80C23ACC 90 85 00 24 */ stw r4, 0x24(r5) -/* 80C23AD0 90 05 00 28 */ stw r0, 0x28(r5) -/* 80C23AD4 80 07 00 80 */ lwz r0, 0x80(r7) -/* 80C23AD8 90 05 00 2C */ stw r0, 0x2c(r5) -/* 80C23ADC 38 00 00 01 */ li r0, 1 -/* 80C23AE0 98 06 00 00 */ stb r0, 0(r6) -lbl_80C23AE4: -/* 80C23AE4 88 03 09 4C */ lbz r0, 0x94c(r3) -/* 80C23AE8 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80C23AEC 39 87 00 84 */ addi r12, r7, 0x84 -/* 80C23AF0 7D 8C 02 14 */ add r12, r12, r0 -/* 80C23AF4 4B 73 E5 91 */ bl __ptmf_scall -/* 80C23AF8 60 00 00 00 */ nop -/* 80C23AFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C23B00 7C 08 03 A6 */ mtlr r0 -/* 80C23B04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C23B08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C21CD8.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C21CD8.s deleted file mode 100644 index 1f8bc179f1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C21CD8.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80C21CD8: -/* 80C21CD8 54 C4 07 FF */ clrlwi. r4, r6, 0x1f -/* 80C21CDC 30 04 FF FF */ addic r0, r4, -1 -/* 80C21CE0 7C 00 21 10 */ subfe r0, r0, r4 -/* 80C21CE4 39 00 FF FF */ li r8, -1 -/* 80C21CE8 41 82 00 78 */ beq lbl_80C21D60 -/* 80C21CEC 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80C21CF0 41 82 00 70 */ beq lbl_80C21D60 -/* 80C21CF4 7C A0 07 34 */ extsh r0, r5 -/* 80C21CF8 2C 00 E0 00 */ cmpwi r0, -8192 -/* 80C21CFC 41 80 00 14 */ blt lbl_80C21D10 -/* 80C21D00 2C 00 20 00 */ cmpwi r0, 0x2000 -/* 80C21D04 40 80 00 0C */ bge lbl_80C21D10 -/* 80C21D08 39 00 00 00 */ li r8, 0 -/* 80C21D0C 48 00 00 54 */ b lbl_80C21D60 -lbl_80C21D10: -/* 80C21D10 7C A0 07 34 */ extsh r0, r5 -/* 80C21D14 2C 00 20 00 */ cmpwi r0, 0x2000 -/* 80C21D18 41 80 00 14 */ blt lbl_80C21D2C -/* 80C21D1C 2C 00 60 00 */ cmpwi r0, 0x6000 -/* 80C21D20 40 80 00 0C */ bge lbl_80C21D2C -/* 80C21D24 39 00 00 01 */ li r8, 1 -/* 80C21D28 48 00 00 38 */ b lbl_80C21D60 -lbl_80C21D2C: -/* 80C21D2C 7C A0 07 34 */ extsh r0, r5 -/* 80C21D30 2C 00 E0 00 */ cmpwi r0, -8192 -/* 80C21D34 40 80 00 14 */ bge lbl_80C21D48 -/* 80C21D38 2C 00 A0 00 */ cmpwi r0, -24576 -/* 80C21D3C 41 80 00 0C */ blt lbl_80C21D48 -/* 80C21D40 39 00 00 03 */ li r8, 3 -/* 80C21D44 48 00 00 1C */ b lbl_80C21D60 -lbl_80C21D48: -/* 80C21D48 7C A0 07 34 */ extsh r0, r5 -/* 80C21D4C 2C 00 A0 00 */ cmpwi r0, -24576 -/* 80C21D50 41 80 00 0C */ blt lbl_80C21D5C -/* 80C21D54 2C 00 60 00 */ cmpwi r0, 0x6000 -/* 80C21D58 41 80 00 08 */ blt lbl_80C21D60 -lbl_80C21D5C: -/* 80C21D5C 39 00 00 02 */ li r8, 2 -lbl_80C21D60: -/* 80C21D60 2C 08 FF FF */ cmpwi r8, -1 -/* 80C21D64 41 82 00 40 */ beq lbl_80C21DA4 -/* 80C21D68 39 20 00 00 */ li r9, 0 -/* 80C21D6C 38 80 00 00 */ li r4, 0 -/* 80C21D70 38 00 00 04 */ li r0, 4 -/* 80C21D74 7C 09 03 A6 */ mtctr r0 -lbl_80C21D78: -/* 80C21D78 7C 09 40 00 */ cmpw r9, r8 -/* 80C21D7C 40 82 00 18 */ bne lbl_80C21D94 -/* 80C21D80 38 E9 09 48 */ addi r7, r9, 0x948 -/* 80C21D84 7C A3 38 AE */ lbzx r5, r3, r7 -/* 80C21D88 38 05 00 01 */ addi r0, r5, 1 -/* 80C21D8C 7C 03 39 AE */ stbx r0, r3, r7 -/* 80C21D90 48 00 00 0C */ b lbl_80C21D9C -lbl_80C21D94: -/* 80C21D94 38 09 09 48 */ addi r0, r9, 0x948 -/* 80C21D98 7C 83 01 AE */ stbx r4, r3, r0 -lbl_80C21D9C: -/* 80C21D9C 39 29 00 01 */ addi r9, r9, 1 -/* 80C21DA0 42 00 FF D8 */ bdnz lbl_80C21D78 -lbl_80C21DA4: -/* 80C21DA4 90 C3 09 40 */ stw r6, 0x940(r3) -/* 80C21DA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242C4.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242C4.s deleted file mode 100644 index d8e80e191f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242C4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C242C4: -/* 80C242C4 38 63 FF DC */ addi r3, r3, -36 -/* 80C242C8 4B FF FE D8 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242CC.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242CC.s deleted file mode 100644 index fb202e2d08..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242CC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C242CC: -/* 80C242CC 38 63 FF EC */ addi r3, r3, -20 -/* 80C242D0 4B FF FE D0 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242D4.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242D4.s deleted file mode 100644 index 3ab1d46123..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242D4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C242D4: -/* 80C242D4 38 63 FF EC */ addi r3, r3, -20 -/* 80C242D8 4B FF FC F4 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242DC.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242DC.s deleted file mode 100644 index 2df42e1bd5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242DC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C242DC: -/* 80C242DC 38 63 FF B4 */ addi r3, r3, -76 -/* 80C242E0 4B FF FC EC */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242E4.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242E4.s deleted file mode 100644 index 1808e77893..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242E4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C242E4: -/* 80C242E4 38 63 FF C4 */ addi r3, r3, -60 -/* 80C242E8 4B FF FC E4 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/getPointNo__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/getPointNo__13daObjIceBlk_cFv.s deleted file mode 100644 index e8e0c7805d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/getPointNo__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80C21EA4: -/* 80C21EA4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C21EA8 7C 08 02 A6 */ mflr r0 -/* 80C21EAC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C21EB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C21EB4 4B 74 03 21 */ bl _savegpr_27 -/* 80C21EB8 7C 7B 1B 78 */ mr r27, r3 -/* 80C21EBC 3B A0 00 00 */ li r29, 0 -/* 80C21EC0 3B 80 00 00 */ li r28, 0 -/* 80C21EC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C21EC8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C21ECC 3B E0 00 01 */ li r31, 1 -/* 80C21ED0 48 00 00 34 */ b lbl_80C21F04 -lbl_80C21ED4: -/* 80C21ED4 7F C3 F3 78 */ mr r3, r30 -/* 80C21ED8 88 1B 09 C0 */ lbz r0, 0x9c0(r27) -/* 80C21EDC 7C 80 E2 14 */ add r4, r0, r28 -/* 80C21EE0 88 1B 04 BA */ lbz r0, 0x4ba(r27) -/* 80C21EE4 7C 05 07 74 */ extsb r5, r0 -/* 80C21EE8 4B 41 34 79 */ bl isSwitch__10dSv_info_cCFii -/* 80C21EEC 2C 03 00 00 */ cmpwi r3, 0 -/* 80C21EF0 41 82 00 10 */ beq lbl_80C21F00 -/* 80C21EF4 7F E0 E0 30 */ slw r0, r31, r28 -/* 80C21EF8 7F A0 03 78 */ or r0, r29, r0 -/* 80C21EFC 54 1D 04 3E */ clrlwi r29, r0, 0x10 -lbl_80C21F00: -/* 80C21F00 3B 9C 00 01 */ addi r28, r28, 1 -lbl_80C21F04: -/* 80C21F04 88 1B 09 C1 */ lbz r0, 0x9c1(r27) -/* 80C21F08 7C 1C 00 00 */ cmpw r28, r0 -/* 80C21F0C 41 80 FF C8 */ blt lbl_80C21ED4 -/* 80C21F10 7F A3 EB 78 */ mr r3, r29 -/* 80C21F14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C21F18 4B 74 03 09 */ bl _restgpr_27 -/* 80C21F1C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C21F20 7C 08 03 A6 */ mtlr r0 -/* 80C21F24 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C21F28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/initBaseMtx__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/initBaseMtx__13daObjIceBlk_cFv.s deleted file mode 100644 index b83ca224b5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/initBaseMtx__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C21DC4: -/* 80C21DC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C21DC8 7C 08 02 A6 */ mflr r0 -/* 80C21DCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C21DD0 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80C21DD4 28 04 00 00 */ cmplwi r4, 0 -/* 80C21DD8 41 82 00 1C */ beq lbl_80C21DF4 -/* 80C21DDC C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80C21DE0 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80C21DE4 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80C21DE8 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80C21DEC C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80C21DF0 D0 04 00 20 */ stfs f0, 0x20(r4) -lbl_80C21DF4: -/* 80C21DF4 80 83 05 AC */ lwz r4, 0x5ac(r3) -/* 80C21DF8 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80C21DFC D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80C21E00 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80C21E04 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80C21E08 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80C21E0C D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80C21E10 48 00 00 15 */ bl setBaseMtx__13daObjIceBlk_cFv -/* 80C21E14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C21E18 7C 08 03 A6 */ mtlr r0 -/* 80C21E1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C21E20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/init_bgCheck__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/init_bgCheck__13daObjIceBlk_cFv.s deleted file mode 100644 index c5cd08d0e3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/init_bgCheck__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80C23860: -/* 80C23860 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C23864 7C 08 02 A6 */ mflr r0 -/* 80C23868 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C2386C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C23870 7C 7F 1B 78 */ mr r31, r3 -/* 80C23874 4B FF FE 55 */ bl checkBgHit__13daObjIceBlk_cFv -/* 80C23878 2C 03 00 00 */ cmpwi r3, 0 -/* 80C2387C 41 80 00 20 */ blt lbl_80C2389C -/* 80C23880 C0 1F 09 58 */ lfs f0, 0x958(r31) -/* 80C23884 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80C23888 38 00 00 00 */ li r0, 0 -/* 80C2388C 90 1F 09 54 */ stw r0, 0x954(r31) -/* 80C23890 80 1F 09 54 */ lwz r0, 0x954(r31) -/* 80C23894 60 00 00 02 */ ori r0, r0, 2 -/* 80C23898 90 1F 09 54 */ stw r0, 0x954(r31) -lbl_80C2389C: -/* 80C2389C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C238A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C238A4 7C 08 03 A6 */ mtlr r0 -/* 80C238A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C238AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/loadCurrentPos__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/loadCurrentPos__13daObjIceBlk_cFv.s deleted file mode 100644 index b6d2395308..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/loadCurrentPos__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80C21F2C: -/* 80C21F2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C21F30 7C 08 02 A6 */ mflr r0 -/* 80C21F34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C21F38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C21F3C 7C 7F 1B 78 */ mr r31, r3 -/* 80C21F40 80 03 09 BC */ lwz r0, 0x9bc(r3) -/* 80C21F44 28 00 00 00 */ cmplwi r0, 0 -/* 80C21F48 41 82 00 6C */ beq lbl_80C21FB4 -/* 80C21F4C 4B FF FF 59 */ bl getPointNo__13daObjIceBlk_cFv -/* 80C21F50 54 64 04 3F */ clrlwi. r4, r3, 0x10 -/* 80C21F54 41 82 00 60 */ beq lbl_80C21FB4 -/* 80C21F58 80 7F 09 BC */ lwz r3, 0x9bc(r31) -/* 80C21F5C 80 63 00 08 */ lwz r3, 8(r3) -/* 80C21F60 38 04 FF FF */ addi r0, r4, -1 -/* 80C21F64 54 00 20 36 */ slwi r0, r0, 4 -/* 80C21F68 7C 63 02 14 */ add r3, r3, r0 -/* 80C21F6C C0 03 00 04 */ lfs f0, 4(r3) -/* 80C21F70 D0 1F 04 A8 */ stfs f0, 0x4a8(r31) -/* 80C21F74 C0 03 00 08 */ lfs f0, 8(r3) -/* 80C21F78 D0 1F 04 AC */ stfs f0, 0x4ac(r31) -/* 80C21F7C C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80C21F80 D0 1F 04 B0 */ stfs f0, 0x4b0(r31) -/* 80C21F84 C0 1F 04 A8 */ lfs f0, 0x4a8(r31) -/* 80C21F88 D0 1F 04 BC */ stfs f0, 0x4bc(r31) -/* 80C21F8C C0 1F 04 AC */ lfs f0, 0x4ac(r31) -/* 80C21F90 D0 1F 04 C0 */ stfs f0, 0x4c0(r31) -/* 80C21F94 C0 1F 04 B0 */ lfs f0, 0x4b0(r31) -/* 80C21F98 D0 1F 04 C4 */ stfs f0, 0x4c4(r31) -/* 80C21F9C C0 1F 04 A8 */ lfs f0, 0x4a8(r31) -/* 80C21FA0 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80C21FA4 C0 1F 04 AC */ lfs f0, 0x4ac(r31) -/* 80C21FA8 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80C21FAC C0 1F 04 B0 */ lfs f0, 0x4b0(r31) -/* 80C21FB0 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -lbl_80C21FB4: -/* 80C21FB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C21FB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C21FBC 7C 08 03 A6 */ mtlr r0 -/* 80C21FC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C21FC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_init_wait__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_init_wait__13daObjIceBlk_cFv.s deleted file mode 100644 index 1343d6f7b0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_init_wait__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80C22EF8: -/* 80C22EF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C22EFC 7C 08 02 A6 */ mflr r0 -/* 80C22F00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C22F04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C22F08 7C 7F 1B 78 */ mr r31, r3 -/* 80C22F0C 4B FF F0 BD */ bl saveCurrentPos__13daObjIceBlk_cFv -/* 80C22F10 38 63 FF FF */ addi r3, r3, -1 -/* 80C22F14 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C22F18 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 80C22F1C 7C 03 00 00 */ cmpw r3, r0 -/* 80C22F20 40 82 00 0C */ bne lbl_80C22F2C -/* 80C22F24 7F E3 FB 78 */ mr r3, r31 -/* 80C22F28 4B FF F3 25 */ bl disablePushPull__13daObjIceBlk_cFv -lbl_80C22F2C: -/* 80C22F2C 3C 60 80 C2 */ lis r3, lit_3936@ha /* 0x80C24370@ha */ -/* 80C22F30 C0 03 43 70 */ lfs f0, lit_3936@l(r3) /* 0x80C24370@l */ -/* 80C22F34 D0 1F 05 2C */ stfs f0, 0x52c(r31) -/* 80C22F38 3C 60 80 C2 */ lis r3, lit_4079@ha /* 0x80C24398@ha */ -/* 80C22F3C C0 03 43 98 */ lfs f0, lit_4079@l(r3) /* 0x80C24398@l */ -/* 80C22F40 D0 1F 05 30 */ stfs f0, 0x530(r31) -/* 80C22F44 38 00 FF FF */ li r0, -1 -/* 80C22F48 90 1F 09 50 */ stw r0, 0x950(r31) -/* 80C22F4C 7F E3 FB 78 */ mr r3, r31 -/* 80C22F50 4B FF FB B5 */ bl clrCounter__13daObjIceBlk_cFv -/* 80C22F54 38 00 00 00 */ li r0, 0 -/* 80C22F58 98 1F 09 D0 */ stb r0, 0x9d0(r31) -/* 80C22F5C 98 1F 09 4D */ stb r0, 0x94d(r31) -/* 80C22F60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C22F64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C22F68 7C 08 03 A6 */ mtlr r0 -/* 80C22F6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C22F70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_init_walk__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_init_walk__13daObjIceBlk_cFv.s deleted file mode 100644 index e503dcaa53..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_init_walk__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C23058: -/* 80C23058 3C 80 80 C2 */ lis r4, lit_4079@ha /* 0x80C24398@ha */ -/* 80C2305C C0 04 43 98 */ lfs f0, lit_4079@l(r4) /* 0x80C24398@l */ -/* 80C23060 D0 03 05 30 */ stfs f0, 0x530(r3) -/* 80C23064 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80C23068 D0 03 09 C4 */ stfs f0, 0x9c4(r3) -/* 80C2306C C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80C23070 D0 03 09 C8 */ stfs f0, 0x9c8(r3) -/* 80C23074 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80C23078 D0 03 09 CC */ stfs f0, 0x9cc(r3) -/* 80C2307C 38 00 00 01 */ li r0, 1 -/* 80C23080 98 03 09 4D */ stb r0, 0x94d(r3) -/* 80C23084 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_call__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_call__13daObjIceBlk_cFv.s deleted file mode 100644 index 9c6342370f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_call__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,254 +0,0 @@ -lbl_80C22B28: -/* 80C22B28 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80C22B2C 7C 08 02 A6 */ mflr r0 -/* 80C22B30 90 01 00 64 */ stw r0, 0x64(r1) -/* 80C22B34 39 61 00 60 */ addi r11, r1, 0x60 -/* 80C22B38 4B 73 F6 A5 */ bl _savegpr_29 -/* 80C22B3C 7C 7F 1B 78 */ mr r31, r3 -/* 80C22B40 3C 60 80 C2 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80C244D0@ha */ -/* 80C22B44 3B A3 44 D0 */ addi r29, r3, cNullVec__6Z2Calc@l /* 0x80C244D0@l */ -/* 80C22B48 3C 60 80 C2 */ lis r3, l_dir_vec@ha /* 0x80C242F4@ha */ -/* 80C22B4C 3B C3 42 F4 */ addi r30, r3, l_dir_vec@l /* 0x80C242F4@l */ -/* 80C22B50 3C 60 80 C2 */ lis r3, struct_80C24698+0x0@ha /* 0x80C24698@ha */ -/* 80C22B54 38 A3 46 98 */ addi r5, r3, struct_80C24698+0x0@l /* 0x80C24698@l */ -/* 80C22B58 88 05 00 00 */ lbz r0, 0(r5) -/* 80C22B5C 7C 00 07 75 */ extsb. r0, r0 -/* 80C22B60 40 82 00 40 */ bne lbl_80C22BA0 -/* 80C22B64 80 7D 00 24 */ lwz r3, 0x24(r29) -/* 80C22B68 80 1D 00 28 */ lwz r0, 0x28(r29) -/* 80C22B6C 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 80C22B70 90 1D 00 40 */ stw r0, 0x40(r29) -/* 80C22B74 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 80C22B78 90 1D 00 44 */ stw r0, 0x44(r29) -/* 80C22B7C 38 9D 00 3C */ addi r4, r29, 0x3c -/* 80C22B80 80 7D 00 30 */ lwz r3, 0x30(r29) -/* 80C22B84 80 1D 00 34 */ lwz r0, 0x34(r29) -/* 80C22B88 90 64 00 0C */ stw r3, 0xc(r4) -/* 80C22B8C 90 04 00 10 */ stw r0, 0x10(r4) -/* 80C22B90 80 1D 00 38 */ lwz r0, 0x38(r29) -/* 80C22B94 90 04 00 14 */ stw r0, 0x14(r4) -/* 80C22B98 38 00 00 01 */ li r0, 1 -/* 80C22B9C 98 05 00 00 */ stb r0, 0(r5) -lbl_80C22BA0: -/* 80C22BA0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C22BA4 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80C22BA8 28 04 00 FF */ cmplwi r4, 0xff -/* 80C22BAC 41 82 02 48 */ beq lbl_80C22DF4 -/* 80C22BB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22BB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22BB8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C22BBC 7C 05 07 74 */ extsb r5, r0 -/* 80C22BC0 4B 41 27 A1 */ bl isSwitch__10dSv_info_cCFii -/* 80C22BC4 2C 03 00 00 */ cmpwi r3, 0 -/* 80C22BC8 40 82 02 2C */ bne lbl_80C22DF4 -/* 80C22BCC 80 1F 08 04 */ lwz r0, 0x804(r31) -/* 80C22BD0 60 00 00 01 */ ori r0, r0, 1 -/* 80C22BD4 90 1F 08 04 */ stw r0, 0x804(r31) -/* 80C22BD8 7F E3 FB 78 */ mr r3, r31 -/* 80C22BDC 4B FF F6 71 */ bl disablePushPull__13daObjIceBlk_cFv -/* 80C22BE0 38 7F 08 04 */ addi r3, r31, 0x804 -/* 80C22BE4 4B 46 18 7D */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80C22BE8 28 03 00 00 */ cmplwi r3, 0 -/* 80C22BEC 41 82 01 E4 */ beq lbl_80C22DD0 -/* 80C22BF0 38 7F 08 04 */ addi r3, r31, 0x804 -/* 80C22BF4 4B 46 19 55 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80C22BF8 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80C22BFC 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 -/* 80C22C00 41 82 01 D0 */ beq lbl_80C22DD0 -/* 80C22C04 3B A0 00 00 */ li r29, 0 -/* 80C22C08 88 03 00 14 */ lbz r0, 0x14(r3) -/* 80C22C0C 28 00 00 64 */ cmplwi r0, 0x64 -/* 80C22C10 41 82 00 10 */ beq lbl_80C22C20 -/* 80C22C14 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80C22C18 28 00 00 03 */ cmplwi r0, 3 -/* 80C22C1C 40 82 00 0C */ bne lbl_80C22C28 -lbl_80C22C20: -/* 80C22C20 3B A0 00 01 */ li r29, 1 -/* 80C22C24 48 00 00 D0 */ b lbl_80C22CF4 -lbl_80C22C28: -/* 80C22C28 28 00 00 02 */ cmplwi r0, 2 -/* 80C22C2C 40 82 00 C8 */ bne lbl_80C22CF4 -/* 80C22C30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22C34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22C38 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80C22C3C 38 00 00 FF */ li r0, 0xff -/* 80C22C40 90 01 00 08 */ stw r0, 8(r1) -/* 80C22C44 38 80 00 00 */ li r4, 0 -/* 80C22C48 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C22C4C 38 00 FF FF */ li r0, -1 -/* 80C22C50 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C22C54 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C22C58 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C22C5C 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C22C60 80 9F 09 DC */ lwz r4, 0x9dc(r31) -/* 80C22C64 38 A0 00 00 */ li r5, 0 -/* 80C22C68 3C C0 00 01 */ lis r6, 0x0001 /* 0x00008678@ha */ -/* 80C22C6C 38 C6 86 78 */ addi r6, r6, 0x8678 /* 0x00008678@l */ -/* 80C22C70 38 FF 04 D0 */ addi r7, r31, 0x4d0 -/* 80C22C74 39 00 00 00 */ li r8, 0 -/* 80C22C78 39 3F 04 E4 */ addi r9, r31, 0x4e4 -/* 80C22C7C 39 40 00 00 */ li r10, 0 -/* 80C22C80 C0 3E 00 A8 */ lfs f1, 0xa8(r30) -/* 80C22C84 4B 42 A8 49 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C22C88 90 7F 09 DC */ stw r3, 0x9dc(r31) -/* 80C22C8C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C22C90 7C 03 07 74 */ extsb r3, r0 -/* 80C22C94 4B 40 A3 D9 */ bl dComIfGp_getReverb__Fi -/* 80C22C98 7C 67 1B 78 */ mr r7, r3 -/* 80C22C9C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801C8@ha */ -/* 80C22CA0 38 03 01 C8 */ addi r0, r3, 0x01C8 /* 0x000801C8@l */ -/* 80C22CA4 90 01 00 28 */ stw r0, 0x28(r1) -/* 80C22CA8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C22CAC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C22CB0 80 63 00 00 */ lwz r3, 0(r3) -/* 80C22CB4 38 81 00 28 */ addi r4, r1, 0x28 -/* 80C22CB8 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80C22CBC 38 C0 00 00 */ li r6, 0 -/* 80C22CC0 C0 3E 00 A8 */ lfs f1, 0xa8(r30) -/* 80C22CC4 FC 40 08 90 */ fmr f2, f1 -/* 80C22CC8 C0 7E 00 B4 */ lfs f3, 0xb4(r30) -/* 80C22CCC FC 80 18 90 */ fmr f4, f3 -/* 80C22CD0 39 00 00 00 */ li r8, 0 -/* 80C22CD4 4B 68 8C B1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C22CD8 88 7F 09 E0 */ lbz r3, 0x9e0(r31) -/* 80C22CDC 38 03 FF FF */ addi r0, r3, -1 -/* 80C22CE0 98 1F 09 E0 */ stb r0, 0x9e0(r31) -/* 80C22CE4 88 1F 09 E0 */ lbz r0, 0x9e0(r31) -/* 80C22CE8 28 00 00 00 */ cmplwi r0, 0 -/* 80C22CEC 40 82 00 08 */ bne lbl_80C22CF4 -/* 80C22CF0 3B A0 00 01 */ li r29, 1 -lbl_80C22CF4: -/* 80C22CF4 2C 1D 00 00 */ cmpwi r29, 0 -/* 80C22CF8 41 82 00 D8 */ beq lbl_80C22DD0 -/* 80C22CFC 80 7F 09 44 */ lwz r3, 0x944(r31) -/* 80C22D00 28 03 00 00 */ cmplwi r3, 0 -/* 80C22D04 41 82 00 24 */ beq lbl_80C22D28 -/* 80C22D08 4B 64 54 CD */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C22D0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C22D10 41 82 00 18 */ beq lbl_80C22D28 -/* 80C22D14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22D18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22D1C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C22D20 80 9F 09 44 */ lwz r4, 0x944(r31) -/* 80C22D24 4B 45 15 2D */ bl Release__4cBgSFP9dBgW_Base -lbl_80C22D28: -/* 80C22D28 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C22D2C 28 03 00 00 */ cmplwi r3, 0 -/* 80C22D30 41 82 00 28 */ beq lbl_80C22D58 -/* 80C22D34 4B 64 54 A1 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C22D38 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C22D3C 40 82 00 1C */ bne lbl_80C22D58 -/* 80C22D40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22D44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22D48 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C22D4C 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C22D50 7F E5 FB 78 */ mr r5, r31 -/* 80C22D54 4B 45 1C B5 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80C22D58: -/* 80C22D58 7F E3 FB 78 */ mr r3, r31 -/* 80C22D5C 48 00 06 2D */ bl setEffect__13daObjIceBlk_cFv -/* 80C22D60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22D64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22D68 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C22D6C 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80C22D70 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C22D74 7C 05 07 74 */ extsb r5, r0 -/* 80C22D78 4B 41 24 89 */ bl onSwitch__10dSv_info_cFii -/* 80C22D7C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C22D80 7C 03 07 74 */ extsb r3, r0 -/* 80C22D84 4B 40 A2 E9 */ bl dComIfGp_getReverb__Fi -/* 80C22D88 7C 67 1B 78 */ mr r7, r3 -/* 80C22D8C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801C7@ha */ -/* 80C22D90 38 03 01 C7 */ addi r0, r3, 0x01C7 /* 0x000801C7@l */ -/* 80C22D94 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C22D98 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C22D9C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C22DA0 80 63 00 00 */ lwz r3, 0(r3) -/* 80C22DA4 38 81 00 24 */ addi r4, r1, 0x24 -/* 80C22DA8 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80C22DAC 38 C0 00 00 */ li r6, 0 -/* 80C22DB0 C0 3E 00 A8 */ lfs f1, 0xa8(r30) -/* 80C22DB4 FC 40 08 90 */ fmr f2, f1 -/* 80C22DB8 C0 7E 00 B4 */ lfs f3, 0xb4(r30) -/* 80C22DBC FC 80 18 90 */ fmr f4, f3 -/* 80C22DC0 39 00 00 00 */ li r8, 0 -/* 80C22DC4 4B 68 8B C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C22DC8 7F E3 FB 78 */ mr r3, r31 -/* 80C22DCC 4B FF F4 35 */ bl enablePushPull__13daObjIceBlk_cFv -lbl_80C22DD0: -/* 80C22DD0 38 7F 09 28 */ addi r3, r31, 0x928 -/* 80C22DD4 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80C22DD8 4B 64 C4 05 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C22DDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22DE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22DE4 38 63 23 3C */ addi r3, r3, 0x233c -/* 80C22DE8 38 9F 08 04 */ addi r4, r31, 0x804 -/* 80C22DEC 4B 64 1D BD */ bl Set__4cCcSFP8cCcD_Obj -/* 80C22DF0 48 00 00 F0 */ b lbl_80C22EE0 -lbl_80C22DF4: -/* 80C22DF4 80 1F 08 04 */ lwz r0, 0x804(r31) -/* 80C22DF8 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80C22DFC 90 1F 08 04 */ stw r0, 0x804(r31) -/* 80C22E00 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80C22E04 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80C22E08 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80C22E0C D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80C22E10 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80C22E14 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80C22E18 7F E3 FB 78 */ mr r3, r31 -/* 80C22E1C 38 80 00 00 */ li r4, 0 -/* 80C22E20 4B 3F 78 AD */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 80C22E24 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 80C22E28 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80C22E2C C0 01 00 40 */ lfs f0, 0x40(r1) -/* 80C22E30 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 80C22E34 7F E3 FB 78 */ mr r3, r31 -/* 80C22E38 48 00 09 79 */ bl bgCheck__13daObjIceBlk_cFv -/* 80C22E3C 7F E3 FB 78 */ mr r3, r31 -/* 80C22E40 88 1F 09 4D */ lbz r0, 0x94d(r31) -/* 80C22E44 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80C22E48 39 9D 00 3C */ addi r12, r29, 0x3c -/* 80C22E4C 7D 8C 02 14 */ add r12, r12, r0 -/* 80C22E50 4B 73 F2 35 */ bl __ptmf_scall -/* 80C22E54 60 00 00 00 */ nop -/* 80C22E58 80 1F 09 54 */ lwz r0, 0x954(r31) -/* 80C22E5C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80C22E60 41 82 00 80 */ beq lbl_80C22EE0 -/* 80C22E64 C0 3E 00 7C */ lfs f1, 0x7c(r30) -/* 80C22E68 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 80C22E6C C0 1E 00 A8 */ lfs f0, 0xa8(r30) -/* 80C22E70 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80C22E74 D0 21 00 34 */ stfs f1, 0x34(r1) -/* 80C22E78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C22E7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22E80 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80C22E84 38 80 00 04 */ li r4, 4 -/* 80C22E88 38 A0 00 1F */ li r5, 0x1f -/* 80C22E8C 38 C1 00 2C */ addi r6, r1, 0x2c -/* 80C22E90 4B 44 CB 95 */ bl StartShock__12dVibration_cFii4cXyz -/* 80C22E94 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C22E98 7C 03 07 74 */ extsb r3, r0 -/* 80C22E9C 4B 40 A1 D1 */ bl dComIfGp_getReverb__Fi -/* 80C22EA0 7C 67 1B 78 */ mr r7, r3 -/* 80C22EA4 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801DF@ha */ -/* 80C22EA8 38 03 01 DF */ addi r0, r3, 0x01DF /* 0x000801DF@l */ -/* 80C22EAC 90 01 00 20 */ stw r0, 0x20(r1) -/* 80C22EB0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C22EB4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C22EB8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C22EBC 38 81 00 20 */ addi r4, r1, 0x20 -/* 80C22EC0 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80C22EC4 38 C0 00 00 */ li r6, 0 -/* 80C22EC8 C0 3E 00 A8 */ lfs f1, 0xa8(r30) -/* 80C22ECC FC 40 08 90 */ fmr f2, f1 -/* 80C22ED0 C0 7E 00 B4 */ lfs f3, 0xb4(r30) -/* 80C22ED4 FC 80 18 90 */ fmr f4, f3 -/* 80C22ED8 39 00 00 00 */ li r8, 0 -/* 80C22EDC 4B 68 8A A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C22EE0: -/* 80C22EE0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80C22EE4 4B 73 F3 45 */ bl _restgpr_29 -/* 80C22EE8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80C22EEC 7C 08 03 A6 */ mtlr r0 -/* 80C22EF0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80C22EF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_wait__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_wait__13daObjIceBlk_cFv.s deleted file mode 100644 index 10cfde2f0d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_wait__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80C22F74: -/* 80C22F74 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C22F78 7C 08 02 A6 */ mflr r0 -/* 80C22F7C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C22F80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C22F84 4B 73 F2 59 */ bl _savegpr_29 -/* 80C22F88 7C 7F 1B 78 */ mr r31, r3 -/* 80C22F8C 3C 80 80 C2 */ lis r4, l_dir_vec@ha /* 0x80C242F4@ha */ -/* 80C22F90 3B A4 42 F4 */ addi r29, r4, l_dir_vec@l /* 0x80C242F4@l */ -/* 80C22F94 4B FF F9 B9 */ bl checkWalk__13daObjIceBlk_cFv -/* 80C22F98 7C 7E 1B 78 */ mr r30, r3 -/* 80C22F9C 2C 1E FF FF */ cmpwi r30, -1 -/* 80C22FA0 41 82 00 6C */ beq lbl_80C2300C -/* 80C22FA4 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C22FA8 7C 03 07 74 */ extsb r3, r0 -/* 80C22FAC 4B 40 A0 C1 */ bl dComIfGp_getReverb__Fi -/* 80C22FB0 7C 67 1B 78 */ mr r7, r3 -/* 80C22FB4 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801D2@ha */ -/* 80C22FB8 38 03 01 D2 */ addi r0, r3, 0x01D2 /* 0x000801D2@l */ -/* 80C22FBC 90 01 00 08 */ stw r0, 8(r1) -/* 80C22FC0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C22FC4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C22FC8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C22FCC 38 81 00 08 */ addi r4, r1, 8 -/* 80C22FD0 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80C22FD4 38 C0 00 00 */ li r6, 0 -/* 80C22FD8 C0 3D 00 A8 */ lfs f1, 0xa8(r29) -/* 80C22FDC FC 40 08 90 */ fmr f2, f1 -/* 80C22FE0 C0 7D 00 B4 */ lfs f3, 0xb4(r29) -/* 80C22FE4 FC 80 18 90 */ fmr f4, f3 -/* 80C22FE8 39 00 00 00 */ li r8, 0 -/* 80C22FEC 4B 68 89 99 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C22FF0 93 DF 09 50 */ stw r30, 0x950(r31) -/* 80C22FF4 57 C0 08 3C */ slwi r0, r30, 1 -/* 80C22FF8 38 7D 00 30 */ addi r3, r29, 0x30 -/* 80C22FFC 7C 03 02 AE */ lhax r0, r3, r0 -/* 80C23000 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 80C23004 7F E3 FB 78 */ mr r3, r31 -/* 80C23008 48 00 00 51 */ bl mode_init_walk__13daObjIceBlk_cFv -lbl_80C2300C: -/* 80C2300C 80 1F 09 40 */ lwz r0, 0x940(r31) -/* 80C23010 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80C23014 40 82 00 0C */ bne lbl_80C23020 -/* 80C23018 7F E3 FB 78 */ mr r3, r31 -/* 80C2301C 4B FF FA E9 */ bl clrCounter__13daObjIceBlk_cFv -lbl_80C23020: -/* 80C23020 38 7F 09 28 */ addi r3, r31, 0x928 -/* 80C23024 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80C23028 4B 64 C1 B5 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C2302C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C23030 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C23034 38 63 23 3C */ addi r3, r3, 0x233c -/* 80C23038 38 9F 08 04 */ addi r4, r31, 0x804 -/* 80C2303C 4B 64 1B 6D */ bl Set__4cCcSFP8cCcD_Obj -/* 80C23040 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C23044 4B 73 F1 E5 */ bl _restgpr_29 -/* 80C23048 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C2304C 7C 08 03 A6 */ mtlr r0 -/* 80C23050 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C23054 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_walk__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_walk__13daObjIceBlk_cFv.s deleted file mode 100644 index e5cdc11c5f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_walk__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,201 +0,0 @@ -lbl_80C23088: -/* 80C23088 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80C2308C 7C 08 02 A6 */ mflr r0 -/* 80C23090 90 01 00 54 */ stw r0, 0x54(r1) -/* 80C23094 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 80C23098 93 C1 00 48 */ stw r30, 0x48(r1) -/* 80C2309C 7C 7F 1B 78 */ mr r31, r3 -/* 80C230A0 3C 60 80 C2 */ lis r3, l_dir_vec@ha /* 0x80C242F4@ha */ -/* 80C230A4 3B C3 42 F4 */ addi r30, r3, l_dir_vec@l /* 0x80C242F4@l */ -/* 80C230A8 88 1F 09 D0 */ lbz r0, 0x9d0(r31) -/* 80C230AC 28 00 00 01 */ cmplwi r0, 1 -/* 80C230B0 40 82 00 20 */ bne lbl_80C230D0 -/* 80C230B4 38 7F 05 2C */ addi r3, r31, 0x52c -/* 80C230B8 C0 3E 00 B8 */ lfs f1, 0xb8(r30) -/* 80C230BC C0 5E 00 BC */ lfs f2, 0xbc(r30) -/* 80C230C0 C0 7E 00 A8 */ lfs f3, 0xa8(r30) -/* 80C230C4 C0 9E 00 C0 */ lfs f4, 0xc0(r30) -/* 80C230C8 4B 64 C8 B5 */ bl cLib_addCalc__FPfffff -/* 80C230CC 48 00 00 1C */ b lbl_80C230E8 -lbl_80C230D0: -/* 80C230D0 28 00 00 02 */ cmplwi r0, 2 -/* 80C230D4 40 82 00 14 */ bne lbl_80C230E8 -/* 80C230D8 38 7F 05 2C */ addi r3, r31, 0x52c -/* 80C230DC C0 3E 00 C4 */ lfs f1, 0xc4(r30) -/* 80C230E0 C0 5E 00 C8 */ lfs f2, 0xc8(r30) -/* 80C230E4 4B 64 D6 5D */ bl cLib_chaseF__FPfff -lbl_80C230E8: -/* 80C230E8 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80C230EC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80C230F0 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80C230F4 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80C230F8 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80C230FC D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80C23100 7F E3 FB 78 */ mr r3, r31 -/* 80C23104 38 80 00 00 */ li r4, 0 -/* 80C23108 4B 3F 75 59 */ bl fopAcM_posMove__FP10fopAc_ac_cPC4cXyz -/* 80C2310C C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80C23110 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80C23114 7F E3 FB 78 */ mr r3, r31 -/* 80C23118 80 1F 09 50 */ lwz r0, 0x950(r31) -/* 80C2311C 54 00 08 3C */ slwi r0, r0, 1 -/* 80C23120 38 9E 00 30 */ addi r4, r30, 0x30 -/* 80C23124 7C 84 02 AE */ lhax r4, r4, r0 -/* 80C23128 48 00 03 E5 */ bl checkWallPre__13daObjIceBlk_cFs -/* 80C2312C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C23130 41 80 00 AC */ blt lbl_80C231DC -/* 80C23134 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C23138 C0 1F 09 5C */ lfs f0, 0x95c(r31) -/* 80C2313C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80C23140 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80C23144 C0 3F 04 D8 */ lfs f1, 0x4d8(r31) -/* 80C23148 C0 1F 09 64 */ lfs f0, 0x964(r31) -/* 80C2314C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80C23150 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 80C23154 C0 3E 00 7C */ lfs f1, 0x7c(r30) -/* 80C23158 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80C2315C C0 1E 00 A8 */ lfs f0, 0xa8(r30) -/* 80C23160 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C23164 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80C23168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C2316C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C23170 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80C23174 38 80 00 04 */ li r4, 4 -/* 80C23178 38 A0 00 1F */ li r5, 0x1f -/* 80C2317C 38 C1 00 0C */ addi r6, r1, 0xc -/* 80C23180 4B 44 C8 A5 */ bl StartShock__12dVibration_cFii4cXyz -/* 80C23184 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C23188 7C 03 07 74 */ extsb r3, r0 -/* 80C2318C 4B 40 9E E1 */ bl dComIfGp_getReverb__Fi -/* 80C23190 7C 67 1B 78 */ mr r7, r3 -/* 80C23194 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801D3@ha */ -/* 80C23198 38 03 01 D3 */ addi r0, r3, 0x01D3 /* 0x000801D3@l */ -/* 80C2319C 90 01 00 08 */ stw r0, 8(r1) -/* 80C231A0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C231A4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C231A8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C231AC 38 81 00 08 */ addi r4, r1, 8 -/* 80C231B0 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80C231B4 38 C0 00 00 */ li r6, 0 -/* 80C231B8 C0 3E 00 A8 */ lfs f1, 0xa8(r30) -/* 80C231BC FC 40 08 90 */ fmr f2, f1 -/* 80C231C0 C0 7E 00 B4 */ lfs f3, 0xb4(r30) -/* 80C231C4 FC 80 18 90 */ fmr f4, f3 -/* 80C231C8 39 00 00 00 */ li r8, 0 -/* 80C231CC 4B 68 87 B9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C231D0 7F E3 FB 78 */ mr r3, r31 -/* 80C231D4 4B FF FD 25 */ bl mode_init_wait__13daObjIceBlk_cFv -/* 80C231D8 48 00 01 90 */ b lbl_80C23368 -lbl_80C231DC: -/* 80C231DC 80 1F 09 54 */ lwz r0, 0x954(r31) -/* 80C231E0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80C231E4 40 82 01 84 */ bne lbl_80C23368 -/* 80C231E8 7F E3 FB 78 */ mr r3, r31 -/* 80C231EC 48 00 06 C5 */ bl checkFall__13daObjIceBlk_cFv -/* 80C231F0 2C 03 00 00 */ cmpwi r3, 0 -/* 80C231F4 41 82 01 74 */ beq lbl_80C23368 -/* 80C231F8 C0 1F 04 F8 */ lfs f0, 0x4f8(r31) -/* 80C231FC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80C23200 C0 1F 04 FC */ lfs f0, 0x4fc(r31) -/* 80C23204 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80C23208 C0 1F 05 00 */ lfs f0, 0x500(r31) -/* 80C2320C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80C23210 80 1F 09 50 */ lwz r0, 0x950(r31) -/* 80C23214 2C 00 00 01 */ cmpwi r0, 1 -/* 80C23218 40 82 00 50 */ bne lbl_80C23268 -/* 80C2321C C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80C23220 C0 7F 09 C4 */ lfs f3, 0x9c4(r31) -/* 80C23224 EC 00 18 28 */ fsubs f0, f0, f3 -/* 80C23228 C0 5E 00 CC */ lfs f2, 0xcc(r30) -/* 80C2322C EC 00 10 24 */ fdivs f0, f0, f2 -/* 80C23230 FC 00 00 1E */ fctiwz f0, f0 -/* 80C23234 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 80C23238 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C2323C C8 3E 00 D0 */ lfd f1, 0xd0(r30) -/* 80C23240 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C23244 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80C23248 3C 00 43 30 */ lis r0, 0x4330 -/* 80C2324C 90 01 00 38 */ stw r0, 0x38(r1) -/* 80C23250 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 80C23254 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C23258 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C2325C EC 03 00 2A */ fadds f0, f3, f0 -/* 80C23260 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80C23264 48 00 00 FC */ b lbl_80C23360 -lbl_80C23268: -/* 80C23268 2C 00 00 03 */ cmpwi r0, 3 -/* 80C2326C 40 82 00 50 */ bne lbl_80C232BC -/* 80C23270 C0 7F 09 C4 */ lfs f3, 0x9c4(r31) -/* 80C23274 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80C23278 EC 03 00 28 */ fsubs f0, f3, f0 -/* 80C2327C C0 5E 00 CC */ lfs f2, 0xcc(r30) -/* 80C23280 EC 00 10 24 */ fdivs f0, f0, f2 -/* 80C23284 FC 00 00 1E */ fctiwz f0, f0 -/* 80C23288 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80C2328C 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80C23290 C8 3E 00 D0 */ lfd f1, 0xd0(r30) -/* 80C23294 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C23298 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C2329C 3C 00 43 30 */ lis r0, 0x4330 -/* 80C232A0 90 01 00 30 */ stw r0, 0x30(r1) -/* 80C232A4 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80C232A8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C232AC EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C232B0 EC 03 00 28 */ fsubs f0, f3, f0 -/* 80C232B4 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80C232B8 48 00 00 A8 */ b lbl_80C23360 -lbl_80C232BC: -/* 80C232BC 2C 00 00 00 */ cmpwi r0, 0 -/* 80C232C0 40 82 00 50 */ bne lbl_80C23310 -/* 80C232C4 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80C232C8 C0 7F 09 CC */ lfs f3, 0x9cc(r31) -/* 80C232CC EC 00 18 28 */ fsubs f0, f0, f3 -/* 80C232D0 C0 5E 00 CC */ lfs f2, 0xcc(r30) -/* 80C232D4 EC 00 10 24 */ fdivs f0, f0, f2 -/* 80C232D8 FC 00 00 1E */ fctiwz f0, f0 -/* 80C232DC D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80C232E0 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80C232E4 C8 3E 00 D0 */ lfd f1, 0xd0(r30) -/* 80C232E8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C232EC 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C232F0 3C 00 43 30 */ lis r0, 0x4330 -/* 80C232F4 90 01 00 30 */ stw r0, 0x30(r1) -/* 80C232F8 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80C232FC EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C23300 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C23304 EC 03 00 2A */ fadds f0, f3, f0 -/* 80C23308 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 80C2330C 48 00 00 54 */ b lbl_80C23360 -lbl_80C23310: -/* 80C23310 2C 00 00 02 */ cmpwi r0, 2 -/* 80C23314 40 82 00 4C */ bne lbl_80C23360 -/* 80C23318 C0 7F 09 CC */ lfs f3, 0x9cc(r31) -/* 80C2331C C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80C23320 EC 03 00 28 */ fsubs f0, f3, f0 -/* 80C23324 C0 5E 00 CC */ lfs f2, 0xcc(r30) -/* 80C23328 EC 00 10 24 */ fdivs f0, f0, f2 -/* 80C2332C FC 00 00 1E */ fctiwz f0, f0 -/* 80C23330 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80C23334 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80C23338 C8 3E 00 D0 */ lfd f1, 0xd0(r30) -/* 80C2333C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C23340 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C23344 3C 00 43 30 */ lis r0, 0x4330 -/* 80C23348 90 01 00 30 */ stw r0, 0x30(r1) -/* 80C2334C C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80C23350 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C23354 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C23358 EC 03 00 28 */ fsubs f0, f3, f0 -/* 80C2335C D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -lbl_80C23360: -/* 80C23360 7F E3 FB 78 */ mr r3, r31 -/* 80C23364 4B FF FB 95 */ bl mode_init_wait__13daObjIceBlk_cFv -lbl_80C23368: -/* 80C23368 7F E3 FB 78 */ mr r3, r31 -/* 80C2336C 4B FF F7 99 */ bl clrCounter__13daObjIceBlk_cFv -/* 80C23370 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 80C23374 83 C1 00 48 */ lwz r30, 0x48(r1) -/* 80C23378 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80C2337C 7C 08 03 A6 */ mtlr r0 -/* 80C23380 38 21 00 50 */ addi r1, r1, 0x50 -/* 80C23384 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index bc9dd0a114..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80C21DAC: -/* 80C21DAC A8 05 00 08 */ lha r0, 8(r5) -/* 80C21DB0 2C 00 00 FD */ cmpwi r0, 0xfd -/* 80C21DB4 4C 82 00 20 */ bnelr -/* 80C21DB8 38 00 00 01 */ li r0, 1 -/* 80C21DBC 98 04 09 D1 */ stb r0, 0x9d1(r4) -/* 80C21DC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/saveCurrentPos__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/saveCurrentPos__13daObjIceBlk_cFv.s deleted file mode 100644 index 9b6c222162..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/saveCurrentPos__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,163 +0,0 @@ -lbl_80C21FC8: -/* 80C21FC8 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80C21FCC 7C 08 02 A6 */ mflr r0 -/* 80C21FD0 90 01 00 64 */ stw r0, 0x64(r1) -/* 80C21FD4 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80C21FD8 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80C21FDC DB C1 00 40 */ stfd f30, 0x40(r1) -/* 80C21FE0 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 80C21FE4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C21FE8 4B 74 01 ED */ bl _savegpr_27 -/* 80C21FEC 7C 7E 1B 78 */ mr r30, r3 -/* 80C21FF0 3C 60 80 C2 */ lis r3, l_dir_vec@ha /* 0x80C242F4@ha */ -/* 80C21FF4 3B A3 42 F4 */ addi r29, r3, l_dir_vec@l /* 0x80C242F4@l */ -/* 80C21FF8 3B E0 FF FF */ li r31, -1 -/* 80C21FFC 80 7E 09 BC */ lwz r3, 0x9bc(r30) -/* 80C22000 28 03 00 00 */ cmplwi r3, 0 -/* 80C22004 40 82 00 0C */ bne lbl_80C22010 -/* 80C22008 38 60 FF FF */ li r3, -1 -/* 80C2200C 48 00 01 CC */ b lbl_80C221D8 -lbl_80C22010: -/* 80C22010 83 83 00 08 */ lwz r28, 8(r3) -/* 80C22014 3B 60 00 00 */ li r27, 0 -/* 80C22018 C3 FD 00 7C */ lfs f31, 0x7c(r29) -/* 80C2201C C3 DD 00 98 */ lfs f30, 0x98(r29) -/* 80C22020 48 00 01 30 */ b lbl_80C22150 -lbl_80C22024: -/* 80C22024 C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 80C22028 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80C2202C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C22030 D3 E1 00 10 */ stfs f31, 0x10(r1) -/* 80C22034 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80C22038 C0 3C 00 0C */ lfs f1, 0xc(r28) -/* 80C2203C C0 1C 00 04 */ lfs f0, 4(r28) -/* 80C22040 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80C22044 D3 E1 00 1C */ stfs f31, 0x1c(r1) -/* 80C22048 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80C2204C 38 61 00 0C */ addi r3, r1, 0xc -/* 80C22050 38 81 00 18 */ addi r4, r1, 0x18 -/* 80C22054 4B 72 53 49 */ bl PSVECSquareDistance -/* 80C22058 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 80C2205C 40 81 00 58 */ ble lbl_80C220B4 -/* 80C22060 FC 00 08 34 */ frsqrte f0, f1 -/* 80C22064 C8 9D 00 80 */ lfd f4, 0x80(r29) -/* 80C22068 FC 44 00 32 */ fmul f2, f4, f0 -/* 80C2206C C8 7D 00 88 */ lfd f3, 0x88(r29) -/* 80C22070 FC 00 00 32 */ fmul f0, f0, f0 -/* 80C22074 FC 01 00 32 */ fmul f0, f1, f0 -/* 80C22078 FC 03 00 28 */ fsub f0, f3, f0 -/* 80C2207C FC 02 00 32 */ fmul f0, f2, f0 -/* 80C22080 FC 44 00 32 */ fmul f2, f4, f0 -/* 80C22084 FC 00 00 32 */ fmul f0, f0, f0 -/* 80C22088 FC 01 00 32 */ fmul f0, f1, f0 -/* 80C2208C FC 03 00 28 */ fsub f0, f3, f0 -/* 80C22090 FC 02 00 32 */ fmul f0, f2, f0 -/* 80C22094 FC 44 00 32 */ fmul f2, f4, f0 -/* 80C22098 FC 00 00 32 */ fmul f0, f0, f0 -/* 80C2209C FC 01 00 32 */ fmul f0, f1, f0 -/* 80C220A0 FC 03 00 28 */ fsub f0, f3, f0 -/* 80C220A4 FC 02 00 32 */ fmul f0, f2, f0 -/* 80C220A8 FC 21 00 32 */ fmul f1, f1, f0 -/* 80C220AC FC 20 08 18 */ frsp f1, f1 -/* 80C220B0 48 00 00 88 */ b lbl_80C22138 -lbl_80C220B4: -/* 80C220B4 C8 1D 00 90 */ lfd f0, 0x90(r29) -/* 80C220B8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C220BC 40 80 00 10 */ bge lbl_80C220CC -/* 80C220C0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80C220C4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80C220C8 48 00 00 70 */ b lbl_80C22138 -lbl_80C220CC: -/* 80C220CC D0 21 00 08 */ stfs f1, 8(r1) -/* 80C220D0 80 81 00 08 */ lwz r4, 8(r1) -/* 80C220D4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80C220D8 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80C220DC 7C 03 00 00 */ cmpw r3, r0 -/* 80C220E0 41 82 00 14 */ beq lbl_80C220F4 -/* 80C220E4 40 80 00 40 */ bge lbl_80C22124 -/* 80C220E8 2C 03 00 00 */ cmpwi r3, 0 -/* 80C220EC 41 82 00 20 */ beq lbl_80C2210C -/* 80C220F0 48 00 00 34 */ b lbl_80C22124 -lbl_80C220F4: -/* 80C220F4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80C220F8 41 82 00 0C */ beq lbl_80C22104 -/* 80C220FC 38 00 00 01 */ li r0, 1 -/* 80C22100 48 00 00 28 */ b lbl_80C22128 -lbl_80C22104: -/* 80C22104 38 00 00 02 */ li r0, 2 -/* 80C22108 48 00 00 20 */ b lbl_80C22128 -lbl_80C2210C: -/* 80C2210C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80C22110 41 82 00 0C */ beq lbl_80C2211C -/* 80C22114 38 00 00 05 */ li r0, 5 -/* 80C22118 48 00 00 10 */ b lbl_80C22128 -lbl_80C2211C: -/* 80C2211C 38 00 00 03 */ li r0, 3 -/* 80C22120 48 00 00 08 */ b lbl_80C22128 -lbl_80C22124: -/* 80C22124 38 00 00 04 */ li r0, 4 -lbl_80C22128: -/* 80C22128 2C 00 00 01 */ cmpwi r0, 1 -/* 80C2212C 40 82 00 0C */ bne lbl_80C22138 -/* 80C22130 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80C22134 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80C22138: -/* 80C22138 FC 01 F0 40 */ fcmpo cr0, f1, f30 -/* 80C2213C 40 80 00 0C */ bge lbl_80C22148 -/* 80C22140 3B FB 00 01 */ addi r31, r27, 1 -/* 80C22144 48 00 00 1C */ b lbl_80C22160 -lbl_80C22148: -/* 80C22148 3B 9C 00 10 */ addi r28, r28, 0x10 -/* 80C2214C 3B 7B 00 01 */ addi r27, r27, 1 -lbl_80C22150: -/* 80C22150 80 7E 09 BC */ lwz r3, 0x9bc(r30) -/* 80C22154 A0 03 00 00 */ lhz r0, 0(r3) -/* 80C22158 7C 1B 00 00 */ cmpw r27, r0 -/* 80C2215C 41 80 FE C8 */ blt lbl_80C22024 -lbl_80C22160: -/* 80C22160 2C 1F 00 00 */ cmpwi r31, 0 -/* 80C22164 40 80 00 0C */ bge lbl_80C22170 -/* 80C22168 7F E3 FB 78 */ mr r3, r31 -/* 80C2216C 48 00 00 6C */ b lbl_80C221D8 -lbl_80C22170: -/* 80C22170 3B 60 00 00 */ li r27, 0 -/* 80C22174 48 00 00 54 */ b lbl_80C221C8 -lbl_80C22178: -/* 80C22178 38 00 00 01 */ li r0, 1 -/* 80C2217C 7C 00 D8 30 */ slw r0, r0, r27 -/* 80C22180 7F E0 00 39 */ and. r0, r31, r0 -/* 80C22184 41 82 00 24 */ beq lbl_80C221A8 -/* 80C22188 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C2218C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C22190 88 1E 09 C0 */ lbz r0, 0x9c0(r30) -/* 80C22194 7C 80 DA 14 */ add r4, r0, r27 -/* 80C22198 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C2219C 7C 05 07 74 */ extsb r5, r0 -/* 80C221A0 4B 41 30 61 */ bl onSwitch__10dSv_info_cFii -/* 80C221A4 48 00 00 20 */ b lbl_80C221C4 -lbl_80C221A8: -/* 80C221A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C221AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C221B0 88 1E 09 C0 */ lbz r0, 0x9c0(r30) -/* 80C221B4 7C 80 DA 14 */ add r4, r0, r27 -/* 80C221B8 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C221BC 7C 05 07 74 */ extsb r5, r0 -/* 80C221C0 4B 41 30 F1 */ bl offSwitch__10dSv_info_cFii -lbl_80C221C4: -/* 80C221C4 3B 7B 00 01 */ addi r27, r27, 1 -lbl_80C221C8: -/* 80C221C8 88 1E 09 C1 */ lbz r0, 0x9c1(r30) -/* 80C221CC 7C 1B 00 00 */ cmpw r27, r0 -/* 80C221D0 41 80 FF A8 */ blt lbl_80C22178 -/* 80C221D4 7F E3 FB 78 */ mr r3, r31 -lbl_80C221D8: -/* 80C221D8 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 80C221DC CB E1 00 50 */ lfd f31, 0x50(r1) -/* 80C221E0 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 80C221E4 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 80C221E8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C221EC 4B 74 00 35 */ bl _restgpr_27 -/* 80C221F0 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80C221F4 7C 08 03 A6 */ mtlr r0 -/* 80C221F8 38 21 00 60 */ addi r1, r1, 0x60 -/* 80C221FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/setBaseMtx__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/setBaseMtx__13daObjIceBlk_cFv.s deleted file mode 100644 index 03a8d12e73..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/setBaseMtx__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80C21E24: -/* 80C21E24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C21E28 7C 08 02 A6 */ mflr r0 -/* 80C21E2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C21E30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C21E34 7C 7F 1B 78 */ mr r31, r3 -/* 80C21E38 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80C21E3C 4B 3E AF 29 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80C21E40 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C21E44 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C21E48 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80C21E4C 4B 3E A5 E9 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C21E50 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C21E54 28 04 00 00 */ cmplwi r4, 0 -/* 80C21E58 41 82 00 14 */ beq lbl_80C21E6C -/* 80C21E5C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C21E60 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C21E64 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C21E68 4B 72 46 49 */ bl PSMTXCopy -lbl_80C21E6C: -/* 80C21E6C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C21E70 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C21E74 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80C21E78 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C21E7C 4B 72 46 35 */ bl PSMTXCopy -/* 80C21E80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C21E84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C21E88 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80C21E8C 4B 72 46 25 */ bl PSMTXCopy -/* 80C21E90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C21E94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C21E98 7C 08 03 A6 */ mtlr r0 -/* 80C21E9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C21EA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/setEffect__13daObjIceBlk_cFv.s b/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/setEffect__13daObjIceBlk_cFv.s deleted file mode 100644 index bf4922bf89..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/setEffect__13daObjIceBlk_cFv.s +++ /dev/null @@ -1,101 +0,0 @@ -lbl_80C23388: -/* 80C23388 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80C2338C 7C 08 02 A6 */ mflr r0 -/* 80C23390 90 01 00 44 */ stw r0, 0x44(r1) -/* 80C23394 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C23398 4B 73 EE 39 */ bl _savegpr_26 -/* 80C2339C 7C 7D 1B 78 */ mr r29, r3 -/* 80C233A0 3C 60 80 C2 */ lis r3, l_dir_vec@ha /* 0x80C242F4@ha */ -/* 80C233A4 3B C3 42 F4 */ addi r30, r3, l_dir_vec@l /* 0x80C242F4@l */ -/* 80C233A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C233AC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C233B0 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80C233B4 38 00 00 FF */ li r0, 0xff -/* 80C233B8 90 01 00 08 */ stw r0, 8(r1) -/* 80C233BC 38 80 00 00 */ li r4, 0 -/* 80C233C0 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C233C4 38 00 FF FF */ li r0, -1 -/* 80C233C8 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C233CC 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C233D0 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C233D4 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C233D8 80 9D 09 D4 */ lwz r4, 0x9d4(r29) -/* 80C233DC 38 A0 00 00 */ li r5, 0 -/* 80C233E0 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000867B@ha */ -/* 80C233E4 38 C6 86 7B */ addi r6, r6, 0x867B /* 0x0000867B@l */ -/* 80C233E8 38 FD 04 D0 */ addi r7, r29, 0x4d0 -/* 80C233EC 39 00 00 00 */ li r8, 0 -/* 80C233F0 39 3D 04 E4 */ addi r9, r29, 0x4e4 -/* 80C233F4 39 40 00 00 */ li r10, 0 -/* 80C233F8 C0 3E 00 A8 */ lfs f1, 0xa8(r30) -/* 80C233FC 4B 42 A0 D1 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C23400 90 7D 09 D4 */ stw r3, 0x9d4(r29) -/* 80C23404 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80C23408 38 00 00 FF */ li r0, 0xff -/* 80C2340C 90 01 00 08 */ stw r0, 8(r1) -/* 80C23410 38 80 00 00 */ li r4, 0 -/* 80C23414 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C23418 38 00 FF FF */ li r0, -1 -/* 80C2341C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C23420 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C23424 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C23428 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C2342C 80 9D 09 D8 */ lwz r4, 0x9d8(r29) -/* 80C23430 38 A0 00 00 */ li r5, 0 -/* 80C23434 A0 DE 00 D8 */ lhz r6, 0xd8(r30) -/* 80C23438 38 FD 04 D0 */ addi r7, r29, 0x4d0 -/* 80C2343C 39 00 00 00 */ li r8, 0 -/* 80C23440 39 3D 04 E4 */ addi r9, r29, 0x4e4 -/* 80C23444 39 40 00 00 */ li r10, 0 -/* 80C23448 C0 3E 00 A8 */ lfs f1, 0xa8(r30) -/* 80C2344C 4B 42 A0 81 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C23450 90 7D 09 D8 */ stw r3, 0x9d8(r29) -/* 80C23454 3B 40 00 00 */ li r26, 0 -/* 80C23458 3B 80 00 00 */ li r28, 0 -/* 80C2345C 3B 7E 00 DC */ addi r27, r30, 0xdc -lbl_80C23460: -/* 80C23460 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80C23464 38 80 00 00 */ li r4, 0 -/* 80C23468 90 81 00 08 */ stw r4, 8(r1) -/* 80C2346C 38 00 FF FF */ li r0, -1 -/* 80C23470 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C23474 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C23478 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C2347C 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C23480 38 80 00 00 */ li r4, 0 -/* 80C23484 7C BB E2 2E */ lhzx r5, r27, r28 -/* 80C23488 38 DD 04 D0 */ addi r6, r29, 0x4d0 -/* 80C2348C 38 E0 00 00 */ li r7, 0 -/* 80C23490 39 1D 04 B4 */ addi r8, r29, 0x4b4 -/* 80C23494 39 3D 04 EC */ addi r9, r29, 0x4ec -/* 80C23498 39 40 00 FF */ li r10, 0xff -/* 80C2349C C0 3E 00 A8 */ lfs f1, 0xa8(r30) -/* 80C234A0 4B 42 95 F1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C234A4 3B 5A 00 01 */ addi r26, r26, 1 -/* 80C234A8 2C 1A 00 02 */ cmpwi r26, 2 -/* 80C234AC 3B 9C 00 02 */ addi r28, r28, 2 -/* 80C234B0 41 80 FF B0 */ blt lbl_80C23460 -/* 80C234B4 38 60 00 00 */ li r3, 0 -/* 80C234B8 38 A0 00 01 */ li r5, 1 -/* 80C234BC 38 80 00 00 */ li r4, 0 -/* 80C234C0 38 00 00 02 */ li r0, 2 -/* 80C234C4 7C 09 03 A6 */ mtctr r0 -lbl_80C234C8: -/* 80C234C8 38 E3 09 E4 */ addi r7, r3, 0x9e4 -/* 80C234CC 7C DD 38 2E */ lwzx r6, r29, r7 -/* 80C234D0 28 06 00 00 */ cmplwi r6, 0 -/* 80C234D4 41 82 00 18 */ beq lbl_80C234EC -/* 80C234D8 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 80C234DC 60 00 00 01 */ ori r0, r0, 1 -/* 80C234E0 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 80C234E4 90 A6 00 24 */ stw r5, 0x24(r6) -/* 80C234E8 7C 9D 39 2E */ stwx r4, r29, r7 -lbl_80C234EC: -/* 80C234EC 38 63 00 04 */ addi r3, r3, 4 -/* 80C234F0 42 00 FF D8 */ bdnz lbl_80C234C8 -/* 80C234F4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C234F8 4B 73 ED 25 */ bl _restgpr_26 -/* 80C234FC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80C23500 7C 08 03 A6 */ mtlr r0 -/* 80C23504 38 21 00 40 */ addi r1, r1, 0x40 -/* 80C23508 4E 80 00 20 */ blr diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index d56dd19c67..98d22fe790 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -2,6 +2,7 @@ #define C_BG_S_CHK_H #include "dolphin/mtx/vec.h" +#include "f_pc/f_pc_base.h" struct cBgD_Vtx_t : public Vec {}; @@ -16,7 +17,7 @@ class cBgS_Chk { public: /* 0x0 */ cBgS_PolyPassChk* mPolyPassChk; /* 0x4 */ cBgS_GrpPassChk* mGrpPassChk; - /* 0x8 */ u32 mActorPid; + /* 0x8 */ fpc_ProcID mActorPid; /* 0xC */ u8 unk_0x0C; /* 0x10 */ // __vtable__ @@ -25,8 +26,8 @@ public: void SetExtChk(cBgS_Chk&); bool ChkSameActorPid(unsigned int) const; - void SetActorPid(u32 pid) { mActorPid = pid; } - u32 GetActorPid() const { return mActorPid; } + void SetActorPid(fpc_ProcID pid) { mActorPid = pid; } + fpc_ProcID GetActorPid() const { return mActorPid; } void SetPolyPassChk(cBgS_PolyPassChk* p_chk) { mPolyPassChk = p_chk; } void SetGrpPassChk(cBgS_GrpPassChk* p_chk) { mGrpPassChk = p_chk; } cBgS_PolyPassChk* GetPolyPassChk() const { return mPolyPassChk; } diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index ae65e692fe..3d15cd8280 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -37,16 +37,16 @@ s32 cLib_distanceAngleS(s16 x, s16 y); template inline void cLib_offBit(T& value, T bit) { - value &= ~bit; + value = (T)(value & ~bit); } template inline void cLib_onBit(T& value, T bit) { - value |= bit; + value = (T)(value | bit); } template -inline T cLib_checkBit(T& value, T bit) { +inline T cLib_checkBit(T value, T bit) { return (T)(value & bit); } diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 5087638ad4..a409cb4df3 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -1994,7 +1994,7 @@ public: /* 800E7EE4 */ int getWallGrabStatus(); /* 800E7EF4 */ BOOL wallGrabTrigger(); /* 800E7F18 */ BOOL wallGrabButton(); - /* 800E7F3C */ void setPushPullKeepData(dBgW_Base::PushPullLabel, int); + /* 800E7F3C */ int setPushPullKeepData(dBgW_Base::PushPullLabel, int); /* 800E80A4 */ void checkPushPullTurnBlock(); /* 800E8148 */ void checkPullBehindWall(); /* 800E8298 */ void offGoatStopGame(); @@ -3288,6 +3288,8 @@ public: bool checkWolfDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); } bool checkWolfLieWaterIn() const { return mWaterY > current.pos.y + 20.5f; } + BOOL checkPowerGloveGet() { return false; } + J3DModel* initModel(J3DModelData* p_modelData, u32 param_1) { return initModel(p_modelData, 0x80000, param_1); } diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index e20cc4ad60..510a452406 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -105,7 +105,7 @@ public: void MoveBgMatrixCrrPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*); void ArrowStickCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, cXyz&); - bool PushPullCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); + fopAc_ac_c* PushPullCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); bool WaterChk(dBgS_SplGrpChk* chk) { return SplGrpChk(chk); } u32 GetMtrlSndId(cBgS_PolyInfo* param_0) { return dKy_pol_sound_get(param_0); } diff --git a/include/d/bg/d_bg_w_base.h b/include/d/bg/d_bg_w_base.h index 12f5ddddc9..3d7174c8a1 100644 --- a/include/d/bg/d_bg_w_base.h +++ b/include/d/bg/d_bg_w_base.h @@ -18,14 +18,18 @@ class fopAc_ac_c; class dBgW_Base : public cBgW_BgId { public: enum PushPullLabel { - PUSHPULL_LABEL1 = 1, + PPLABEL_NONE = 0, + PPLABEL_PUSH = 1, + PPLABEL_PULL = 2, + PPLABEL_4 = 4, + PPLABEL_HEAVY = 8, }; enum PRIORITY { PRIORITY_0, }; - typedef bool (*PushPull_CallBack)(fopAc_ac_c*, fopAc_ac_c*, s16, + typedef fopAc_ac_c* (*PushPull_CallBack)(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); /* 8007E5A8 */ dBgW_Base(); @@ -103,6 +107,8 @@ public: void SetPriority(PRIORITY priority) { m_priority = priority; } void onStickWall() { field_0xb |= 1; } void onStickRoof() { field_0xb |= 2; } + void OnPushPullOk() { m_pushPull_Ok = true; } + void OffPushPullOk() { m_pushPull_Ok = false; } private: /* 0x08 */ u8 m_priority; diff --git a/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h b/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h index 8e8d7ddccc..60c5210364 100644 --- a/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h +++ b/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h @@ -1,27 +1,35 @@ #ifndef D_A_OBJ_LV5KEY_H #define D_A_OBJ_LV5KEY_H +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "f_op/f_op_actor_mng.h" - - - /** * @ingroup actors-objects * @class daObjLv5Key_c - * @brief Snowpeak Ruins Key + * @brief Snowpeak Ruins Key Lock * * @details * */ class daObjLv5Key_c : public fopAc_ac_c { public: - /* 80B9B9B8 */ void CreateHeap(); - /* 80B9BA94 */ void Init(); + typedef void (daObjLv5Key_c::*actionFunc)(int); + + enum daObjLv5Key_STATUS { + STATUS_WAIT, + STATUS_SHAKE_START, + STATUS_OPEN_START, + STATUS_OPEN, + }; + + /* 80B9B9B8 */ int CreateHeap(); + /* 80B9BA94 */ int Init(); /* 80B9BB5C */ void setBgc(); /* 80B9BBCC */ void initCcSph(); /* 80B9BC2C */ void setCcSph(); - /* 80B9BD30 */ void setAction(void (daObjLv5Key_c::*)(int), int); + /* 80B9BD30 */ void setAction(actionFunc, int); /* 80B9BDD8 */ void Action(); /* 80B9BE24 */ void Wait(int); /* 80B9BF08 */ void Open(int); @@ -29,24 +37,57 @@ public: /* 80B9C17C */ void Land(int); /* 80B9C268 */ void Shake(int); /* 80B9C3B0 */ void TranslateByNowDirect(f32, f32, f32); - /* 80B9C410 */ void Execute(); - /* 80B9C450 */ void Draw(); - /* 80B9C500 */ void Delete(); + /* 80B9C410 */ int Execute(); + /* 80B9C450 */ int Draw(); + /* 80B9C500 */ int Delete(); /* 80B9C534 */ void setBaseMtx(); - /* 80B9C5EC */ void create_1st(); + /* 80B9C5EC */ int create_1st(); - void setStatus(u8 status) { mStatus = status; } - void keylock_open_start() { setStatus(2); } - void keylock_shake_start() { setStatus(1); } - bool is_open() { return mStatus == 3; } + void setLocalOffset(f32 x, f32 y, f32 z) { mLocalOffset.set(x, y, z); } + void setRotateSpd(s16 x, s16 y, s16 z) { mRotateSpd.set(x, y, z); } + void setRotateAccel(s16 x, s16 y, s16 z) { mRotateAccel.set(x, y, z); } + void RotateAngle() { shape_angle += mRotateSpd; } + void calcRotateSpd() { mRotateSpd += mRotateAccel; } + + void setTimer(s16 timer) { mTimer = timer; } + void setShakeNum(s8 num) { mShakeNum = num; } + void decShakeNum() { mShakeNum--; } + + bool countdown() { return --mTimer <= 0; } + + void setStatus(s8 status) { mStatus = status; } + void keylock_open_start() { setStatus(STATUS_OPEN_START); } + void keylock_shake_start() { setStatus(STATUS_SHAKE_START); } + bool is_open() { return mStatus == STATUS_OPEN; } + bool is_open_start() { return mStatus == STATUS_OPEN_START; } + bool is_shake_start() { return mStatus == STATUS_SHAKE_START; } + bool is_shake_end() { return mShakeNum <= 0; } + + cXyz& getLocalOffset() { return mLocalOffset; } private: - /* 0x568 */ u8 field_0x568[0x945 - 0x568]; + /* 0x568 */ u8 field_0x568[0x56C - 0x568]; + /* 0x56C */ Z2SoundObjSimple mSound; + /* 0x58C */ u8 field_0x58C[0x590 - 0x58C]; + /* 0x590 */ J3DModel* mpModel; + /* 0x594 */ mDoExt_bckAnm mBck; + /* 0x5B0 */ request_of_phase_process_class mPhase; + /* 0x5B8 */ dBgS_AcchCir mAcchCir; + /* 0x5F8 */ dBgS_ObjAcch mAcch; + /* 0x7D0 */ dCcD_Stts mCcStts; + /* 0x80C */ dCcD_Sph mCcSph; + /* 0x944 */ u8 field_0x944; /* 0x945 */ s8 mStatus; - /* 0x946 */ u8 field_0x946[0x97c - 0x946]; + /* 0x948 */ actionFunc mAction; + /* 0x954 */ s16 mMode; + /* 0x956 */ s16 mTimer; + /* 0x958 */ cXyz mLocalOffset; + /* 0x964 */ csXyz mRotateSpd; + /* 0x96A */ csXyz mRotateAccel; + /* 0x970 */ s8 mShakeNum; + /* 0x971 */ u8 field_0x971[0x97c - 0x971]; }; STATIC_ASSERT(sizeof(daObjLv5Key_c) == 0x97c); - #endif /* D_A_OBJ_LV5KEY_H */ diff --git a/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h b/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h index 78ef4f779d..d73efc9e16 100644 --- a/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h +++ b/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h @@ -1,7 +1,12 @@ #ifndef D_A_OBJ_ICEBLOCK_H #define D_A_OBJ_ICEBLOCK_H +#include "d/bg/d_bg_s_acch.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" #include "f_op/f_op_actor_mng.h" +#include "d/d_path.h" +#include "d/bg/d_bg_w.h" /** * @ingroup actors-objects @@ -11,21 +16,37 @@ * @details * */ -class daObjIceBlk_c : public fopAc_ac_c { +class daObjIceBlk_c : public dBgS_MoveBgActor { public: - /* 80C21CD8 */ void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); + enum State_e { + STATE_0_e = 0, + STATE_LAND_e = 1, + STATE_2_e = 2, + STATE_4_e = 4, + }; + + enum Mode_e { + MODE_PROC_WAIT_e, + MODE_PROC_WALK_e, + }; + + enum Action_e { + ACTION_WAIT_e, + ACTION_ORDER_EVENT_e, + ACTION_EVENT_e, + ACTION_DEAD_e, + }; + + /* 80C21CD8 */ static void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); /* 80C21DC4 */ void initBaseMtx(); /* 80C21E24 */ void setBaseMtx(); - /* 80C21EA4 */ void getPointNo(); + /* 80C21EA4 */ u16 getPointNo(); /* 80C21F2C */ void loadCurrentPos(); - /* 80C21FC8 */ void saveCurrentPos(); + /* 80C21FC8 */ int saveCurrentPos(); /* 80C22200 */ void enablePushPull(); /* 80C2224C */ void disablePushPull(); - /* 80C22298 */ void Create(); - /* 80C22618 */ void CreateHeap(); - /* 80C227F4 */ void create1st(); - /* 80C228B4 */ void Execute(f32 (**)[3][4]); - /* 80C2294C */ void checkWalk(); + /* 80C227F4 */ int create1st(); + /* 80C2294C */ int checkWalk(); /* 80C22B04 */ void clrCounter(); /* 80C22B28 */ void mode_proc_call(); /* 80C22EF8 */ void mode_init_wait(); @@ -33,23 +54,60 @@ public: /* 80C23058 */ void mode_init_walk(); /* 80C23088 */ void mode_proc_walk(); /* 80C23388 */ void setEffect(); - /* 80C2350C */ void checkWallPre(s16); - /* 80C236C8 */ void checkBgHit(); + /* 80C2350C */ int checkWallPre(s16); + /* 80C236C8 */ int checkBgHit(); /* 80C237B0 */ void bgCheck(); /* 80C23860 */ void init_bgCheck(); - /* 80C238B0 */ void checkFall(); + /* 80C238B0 */ BOOL checkFall(); /* 80C23A50 */ void event_proc_call(); /* 80C23B0C */ void actionWait(); /* 80C23B70 */ void actionOrderEvent(); /* 80C23C1C */ void actionEvent(); /* 80C23CA0 */ void actionDead(); - /* 80C23CA4 */ void Draw(); - /* 80C23DA8 */ void Delete(); -private: - /* 0x568 */ u8 field_0x568[0x9ec - 0x568]; + + /* 80C22618 */ virtual int CreateHeap(); + /* 80C22298 */ virtual int Create(); + /* 80C228B4 */ virtual int Execute(Mtx**); + /* 80C23CA4 */ virtual int Draw(); + /* 80C23DA8 */ virtual int Delete(); + + u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } + int getPathId() { return fopAcM_GetParamBit(this, 8, 8); } + int getCorrectPointNo() { return fopAcM_GetParamBit(this, 0x10, 8); } + u8 getSwbit2() { return fopAcM_GetParamBit(this, 0x18, 8); } + + void setAction(u8 i_action) { mAction = i_action; } + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mpIceModel; + /* 0x5AC */ J3DModel* mpModel; + /* 0x5B0 */ dBgS_ObjAcch mAcch; + /* 0x788 */ dBgS_AcchCir mAcchCir; + /* 0x7C8 */ dCcD_Stts mCcStts; + /* 0x804 */ dCcD_Cyl mCcCyl; + /* 0x940 */ dBgW::PushPullLabel mPPLabel; + /* 0x944 */ dBgW* mpIceBgW; + /* 0x948 */ u8 mCounter[4]; + /* 0x94C */ u8 mAction; + /* 0x94D */ u8 mMode; + /* 0x950 */ int mMoveDir; + /* 0x954 */ State_e mState; + /* 0x958 */ f32 mGroundY; + /* 0x95C */ cXyz mWallPrePos; + /* 0x968 */ dBgS_ObjGndChk mGndChk; + /* 0x9BC */ dPath* mpPath; + /* 0x9C0 */ u8 mSwbit; + /* 0x9C1 */ u8 mMaxSwNum; + /* 0x9C4 */ cXyz mWalkInitPos; + /* 0x9D0 */ u8 mWalkType; + /* 0x9D1 */ bool mIsPlayerRide; + /* 0x9D4 */ u32 field_0x9d4; + /* 0x9D8 */ u32 field_0x9d8; + /* 0x9DC */ u32 mKezuruEmtrID; + /* 0x9E0 */ u8 mHitCounter; + /* 0x9E4 */ JPABaseEmitter* mColdEffEmitters[2]; }; STATIC_ASSERT(sizeof(daObjIceBlk_c) == 0x9ec); - #endif /* D_A_OBJ_ICEBLOCK_H */ diff --git a/rel/d/a/door/d_a_door_push/d_a_door_push.cpp b/rel/d/a/door/d_a_door_push/d_a_door_push.cpp index c60cda1f7a..f43b815942 100644 --- a/rel/d/a/door/d_a_door_push/d_a_door_push.cpp +++ b/rel/d/a/door/d_a_door_push/d_a_door_push.cpp @@ -13,7 +13,7 @@ * PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ static void PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2, dBgW_Base::PushPullLabel param_3) { - if (cLib_checkBit(param_3, dBgW_Base::PUSHPULL_LABEL1) != 0) { + if (cLib_checkBit(param_3, dBgW_Base::PPLABEL_PUSH) != 0) { daDoorPush_c* l_this = (daDoorPush_c*)i_this; l_this->field_0x62e[0]++; l_this->field_0x62e[1] = 0; @@ -25,7 +25,7 @@ static void PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2, * PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ static void PPCallBack2(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2, dBgW_Base::PushPullLabel param_3) { - if (cLib_checkBit(param_3, dBgW_Base::PUSHPULL_LABEL1) != 0) { + if (cLib_checkBit(param_3, dBgW_Base::PPLABEL_PUSH) != 0) { daDoorPush_c* l_this = (daDoorPush_c*)i_this; l_this->field_0x62e[1]++; l_this->field_0x62e[0] = 0; diff --git a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp index 99c2a03da1..16ea81993b 100644 --- a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp +++ b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp @@ -1,669 +1,384 @@ /** * @file d_a_obj_Lv5Key.cpp - * -*/ + * Snowpeak Ruins Key Lock + */ #include "rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h" -#include "dol2asm.h" +#include "d/com/d_com_inf_game.h" - -// -// Forward References: -// - -extern "C" void CreateHeap__13daObjLv5Key_cFv(); -extern "C" void Init__13daObjLv5Key_cFv(); -extern "C" void setBgc__13daObjLv5Key_cFv(); -extern "C" void initCcSph__13daObjLv5Key_cFv(); -extern "C" void setCcSph__13daObjLv5Key_cFv(); -extern "C" static void daObjLv5Key_Create__FP10fopAc_ac_c(); -extern "C" static void daObjLv5Key_Delete__FP13daObjLv5Key_c(); -extern "C" void setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi(); -extern "C" void Action__13daObjLv5Key_cFv(); -extern "C" void Wait__13daObjLv5Key_cFi(); -extern "C" void Open__13daObjLv5Key_cFi(); -extern "C" void Fall__13daObjLv5Key_cFi(); -extern "C" void Land__13daObjLv5Key_cFi(); -extern "C" void Shake__13daObjLv5Key_cFi(); -extern "C" void TranslateByNowDirect__13daObjLv5Key_cFfff(); -extern "C" void Execute__13daObjLv5Key_cFv(); -extern "C" void Draw__13daObjLv5Key_cFv(); -extern "C" void Delete__13daObjLv5Key_cFv(); -extern "C" void setBaseMtx__13daObjLv5Key_cFv(); -extern "C" static void daObjLv5Key_Draw__FP13daObjLv5Key_c(); -extern "C" static void daObjLv5Key_Execute__FP13daObjLv5Key_c(); -extern "C" void create_1st__13daObjLv5Key_cFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static bool daObjLv5Key_IsDelete__FP13daObjLv5Key_c(); -extern "C" static void func_80B9C908(); -extern "C" static void func_80B9C910(); -extern "C" extern char const* const d_a_obj_Lv5Key__stringBase0; - -// -// External References: -// - -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_calcSpeed__FP10fopAc_ac_c(); -extern "C" void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz(); -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_cFPCclP11dRes_info_ci(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetGndThinCellingOff__9dBgS_AcchFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __apl__5csXyzFR5csXyz(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void __ptmf_test(); -extern "C" void __ptmf_cmpr(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[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]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80B9C920-80B9C924 000000 0004+00 6/6 0/0 0/0 .rodata @3755 */ -SECTION_RODATA static f32 const lit_3755 = 1.0f; -COMPILER_STRIP_GATE(0x80B9C920, &lit_3755); - -/* 80B9C9AC-80B9C9AC 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80B9C9AC = "Lv5_KEY"; -#pragma pop +static int useHeapInit(fopAc_ac_c*); /* 80B9C9B4-80B9C9B8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_Lv5Key__stringBase0; +static char* l_arcName = "Lv5_KEY"; /* 80B9B9B8-80B9BA94 000078 00DC+00 1/1 0/0 0/0 .text CreateHeap__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/CreateHeap__13daObjLv5Key_cFv.s" +int daObjLv5Key_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7); + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); + JUT_ASSERT(modelData != 0); + + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + if (!mBck.init(pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) { + return 0; + } + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80B9C924-80B9C928 000004 0004+00 0/1 0/0 0/0 .rodata @3767 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3767 = -50.0f; -COMPILER_STRIP_GATE(0x80B9C924, &lit_3767); -#pragma pop - -/* 80B9C928-80B9C92C 000008 0004+00 1/2 0/0 0/0 .rodata @3768 */ -SECTION_RODATA static f32 const lit_3768 = 30.0f; -COMPILER_STRIP_GATE(0x80B9C928, &lit_3768); - -/* 80B9C92C-80B9C930 00000C 0004+00 0/1 0/0 0/0 .rodata @3769 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3769 = -20.0f; -COMPILER_STRIP_GATE(0x80B9C92C, &lit_3769); -#pragma pop - -/* 80B9C930-80B9C934 000010 0004+00 0/1 0/0 0/0 .rodata @3770 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3770 = 50.0f; -COMPILER_STRIP_GATE(0x80B9C930, &lit_3770); -#pragma pop - -/* 80B9C934-80B9C938 000014 0004+00 0/1 0/0 0/0 .rodata @3771 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3771 = -90.0f; -COMPILER_STRIP_GATE(0x80B9C934, &lit_3771); -#pragma pop - -/* 80B9C938-80B9C93C 000018 0004+00 0/1 0/0 0/0 .rodata @3772 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3772 = 20.0f; -COMPILER_STRIP_GATE(0x80B9C938, &lit_3772); -#pragma pop - -/* 80B9C93C-80B9C940 00001C 0004+00 3/7 0/0 0/0 .rodata @3773 */ -SECTION_RODATA static u8 const lit_3773[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80B9C93C, &lit_3773); - -/* 80B9C9B8-80B9C9C4 -00001 000C+00 1/1 0/0 0/0 .data @3759 */ -SECTION_DATA static void* lit_3759[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)Wait__13daObjLv5Key_cFi, -}; /* 80B9BA94-80B9BB5C 000154 00C8+00 1/1 0/0 0/0 .text Init__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::Init() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Init__13daObjLv5Key_cFv.s" +int daObjLv5Key_c::Init() { + initCcSph(); + fopAcM_setCullSizeBox(this, -50.0f, 30.0f, -20.0f, 50.0f, -90.0f, 20.0f); + setLocalOffset(0.0f, 0.0f, 0.0f); + setStatus(STATUS_WAIT); + + mAction = NULL; + setAction(&Wait, 1); + return cPhs_COMPLEATE_e; } -#pragma pop /* 80B9BB5C-80B9BBCC 00021C 0070+00 1/1 0/0 0/0 .text setBgc__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::setBgc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setBgc__13daObjLv5Key_cFv.s" +void daObjLv5Key_c::setBgc() { + OS_REPORT("-------------setBgc!!\n"); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), NULL, NULL); + mAcch.SetGndThinCellingOff(); + mAcchCir.SetWall(30.0f, 30.0f); } -#pragma pop - -/* ############################################################################################## */ -/* 80B9C940-80B9C980 000020 0040+00 1/1 0/0 0/0 .rodata ccShpSrc$3784 */ -SECTION_RODATA static u8 const ccShpSrc[64] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xC1, 0x8E, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80B9C940, &ccShpSrc); /* 80B9BBCC-80B9BC2C 00028C 0060+00 1/1 0/0 0/0 .text initCcSph__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::initCcSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/initCcSph__13daObjLv5Key_cFv.s" +void daObjLv5Key_c::initCcSph() { + static const dCcD_SrcSph ccShpSrc = { + { + {0x0, {{0x400, 0x1, 0x0}, {0xD8FBFDFF, 0x11}, 0x0}}, // mObj + {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, -17.8f, 0.0f}, 35.0f} // mSph + } // mSphAttr + }; + + mCcStts.Init(0x3C, 0xFF, this); + mCcSph.Set(ccShpSrc); + mCcSph.SetStts(&mCcStts); + mCcSph.SetC(current.pos); } -#pragma pop - -/* ############################################################################################## */ -/* 80B9C980-80B9C984 000060 0004+00 0/1 0/0 0/0 .rodata @3797 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3797 = -17.5f; -COMPILER_STRIP_GATE(0x80B9C980, &lit_3797); -#pragma pop - -/* 80B9C984-80B9C988 000064 0004+00 0/1 0/0 0/0 .rodata @3798 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3798 = 35.0f; -COMPILER_STRIP_GATE(0x80B9C984, &lit_3798); -#pragma pop /* 80B9BC2C-80B9BCEC 0002EC 00C0+00 1/1 0/0 0/0 .text setCcSph__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::setCcSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setCcSph__13daObjLv5Key_cFv.s" +void daObjLv5Key_c::setCcSph() { + cXyz center(0.0f, -17.5f, 0.0f); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::multVec(¢er, ¢er); + + mCcSph.SetC(center); + mCcSph.SetR(35.0f); + dComIfG_Ccsp()->Set(&mCcSph); + + if (mCcSph.ChkTgHit()) { + mCcSph.ClrTgHit(); + } } -#pragma pop /* 80B9BCEC-80B9BD0C 0003AC 0020+00 1/0 0/0 0/0 .text daObjLv5Key_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv5Key_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Create__FP10fopAc_ac_c.s" +static int daObjLv5Key_Create(fopAc_ac_c* i_this) { + return ((daObjLv5Key_c*)i_this)->create_1st(); } -#pragma pop /* 80B9BD0C-80B9BD30 0003CC 0024+00 1/0 0/0 0/0 .text daObjLv5Key_Delete__FP13daObjLv5Key_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv5Key_Delete(daObjLv5Key_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Delete__FP13daObjLv5Key_c.s" +static int daObjLv5Key_Delete(daObjLv5Key_c* i_this) { + i_this->Delete(); + return 1; } -#pragma pop /* 80B9BD30-80B9BDD8 0003F0 00A8+00 5/5 0/0 0/0 .text * setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::setAction(void (daObjLv5Key_c::*param_0)(int), int param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi.s" +void daObjLv5Key_c::setAction(daObjLv5Key_c::actionFunc i_action, int param_1) { + if (mAction != i_action) { + if (mAction != NULL) { + mMode = -1; + (this->*mAction)(param_1); + } + + mMode = 0; + mAction = i_action; + (this->*mAction)(param_1); + } } -#pragma pop /* 80B9BDD8-80B9BE24 000498 004C+00 1/1 0/0 0/0 .text Action__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::Action() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Action__13daObjLv5Key_cFv.s" +void daObjLv5Key_c::Action() { + if (mAction == NULL) { + OS_REPORT("ACTION NOT SET!!\n"); + } else { + (this->*mAction)(0); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80B9C9C4-80B9C9D0 -00001 000C+00 1/1 0/0 0/0 .data @3837 */ -SECTION_DATA static void* lit_3837[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)Open__13daObjLv5Key_cFi, -}; - -/* 80B9C9D0-80B9C9DC -00001 000C+00 1/1 0/0 0/0 .data @3842 */ -SECTION_DATA static void* lit_3842[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)Shake__13daObjLv5Key_cFi, -}; /* 80B9BE24-80B9BF08 0004E4 00E4+00 2/0 0/0 0/0 .text Wait__13daObjLv5Key_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::Wait(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Wait__13daObjLv5Key_cFi.s" +void daObjLv5Key_c::Wait(int param_0) { + switch (mMode) { + case -1: + break; + case 0: + setStatus(STATUS_WAIT); + mBck.setPlaySpeed(0.0f); + mMode = 1; + break; + case 1: + if (is_open_start()) { + setBgc(); + setAction(&Open, 1); + } else if (is_shake_start()) { + setAction(&Shake, 1); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80B9C9DC-80B9C9E8 -00001 000C+00 1/1 0/0 0/0 .data @3862 */ -SECTION_DATA static void* lit_3862[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)Fall__13daObjLv5Key_cFi, -}; /* 80B9BF08-80B9BFDC 0005C8 00D4+00 1/0 0/0 0/0 .text Open__13daObjLv5Key_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::Open(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Open__13daObjLv5Key_cFi.s" +void daObjLv5Key_c::Open(int param_0) { + switch (mMode) { + case -1: + break; + case 0: + mBck.setPlaySpeed(1.0f); + mCcSph.OffCoSetBit(); + mMode = 1; + break; + case 1: + mBck.play(); + + if (mBck.isStop()) { + setAction(&Fall, 1); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80B9C988-80B9C98C 000068 0004+00 0/1 0/0 0/0 .rodata @3907 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3907 = -6.0f; -COMPILER_STRIP_GATE(0x80B9C988, &lit_3907); -#pragma pop - -/* 80B9C98C-80B9C990 00006C 0004+00 0/1 0/0 0/0 .rodata @3908 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3908 = 88.0f; -COMPILER_STRIP_GATE(0x80B9C98C, &lit_3908); -#pragma pop - -/* 80B9C990-80B9C994 000070 0004+00 0/1 0/0 0/0 .rodata @3909 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3909 = 4.0f; -COMPILER_STRIP_GATE(0x80B9C990, &lit_3909); -#pragma pop - -/* 80B9C994-80B9C998 000074 0004+00 0/1 0/0 0/0 .rodata @3910 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3910 = 22.0f; -COMPILER_STRIP_GATE(0x80B9C994, &lit_3910); -#pragma pop - -/* 80B9C998-80B9C99C 000078 0004+00 0/1 0/0 0/0 .rodata @3911 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3911 = 87.0f; -COMPILER_STRIP_GATE(0x80B9C998, &lit_3911); -#pragma pop - -/* 80B9C9E8-80B9C9F4 -00001 000C+00 1/1 0/0 0/0 .data @3891 */ -SECTION_DATA static void* lit_3891[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)Land__13daObjLv5Key_cFi, -}; /* 80B9BFDC-80B9C17C 00069C 01A0+00 1/0 0/0 0/0 .text Fall__13daObjLv5Key_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::Fall(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Fall__13daObjLv5Key_cFi.s" +void daObjLv5Key_c::Fall(int param_0) { + switch (mMode) { + case -1: + break; + case 0: + fopAcM_SetSpeedF(this, 0.0f); + fopAcM_SetSpeed(this, 0.0f, 0.0f, 0.0f); + fopAcM_SetGravity(this, -6.0f); + mMode = 1; + break; + case 1: + fopAcM_calcSpeed(this); + fopAcM_posMove(this, NULL); + + f32 old_y = current.pos.y; + current.pos.y -= 88.0f; + mAcch.CrrPos(dComIfG_Bgsp()); + current.pos.y = old_y; + + OS_REPORT("FALL SPD = %f\n", speed.y); + + if (mAcch.i_ChkGroundHit()) { + fopAcM_GetSpeed(this); + fopAcM_SetSpeedF(this, 4.0f); + fopAcM_SetSpeed(this, 0.0f, 22.0f, 0.0f); + + setRotateSpd(0x120, 0, 0); + mMode = 2; + } + break; + case 2: + RotateAngle(); + + fopAcM_calcSpeed(this); + fopAcM_posMove(this, NULL); + OS_REPORT("BOUND SPD = %f\n", speed.y); + + f32 prev_y = current.pos.y; + current.pos.y -= 87.0f; + mAcch.CrrPos(dComIfG_Bgsp()); + current.pos.y = prev_y; + + if (mAcch.i_ChkGroundHit()) { + setAction(&Land, 1); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80B9C99C-80B9C9A0 00007C 0004+00 0/1 0/0 0/0 .rodata @3929 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3929 = 92.0f / 5.0f; -COMPILER_STRIP_GATE(0x80B9C99C, &lit_3929); -#pragma pop - -/* 80B9C9A0-80B9C9A4 000080 0004+00 0/1 0/0 0/0 .rodata @3930 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3930 = -87.0f / 5.0f; -COMPILER_STRIP_GATE(0x80B9C9A0, &lit_3930); -#pragma pop - -/* 80B9C9A4-80B9C9A8 000084 0004+00 0/1 0/0 0/0 .rodata @3931 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3931 = 0xC2956666; -COMPILER_STRIP_GATE(0x80B9C9A4, &lit_3931); -#pragma pop - -/* 80B9C9A8-80B9C9AC 000088 0004+00 0/1 0/0 0/0 .rodata @3932 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3932 = 87.0f / 10.0f; -COMPILER_STRIP_GATE(0x80B9C9A8, &lit_3932); -#pragma pop /* 80B9C17C-80B9C268 00083C 00EC+00 1/0 0/0 0/0 .text Land__13daObjLv5Key_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::Land(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Land__13daObjLv5Key_cFi.s" -} -#pragma pop +void daObjLv5Key_c::Land(int param_0) { + switch (mMode) { + case -1: + break; + case 0: + TranslateByNowDirect(0.0f, 0.0f, 18.4f); + setLocalOffset(-17.4, -74.7f, 8.7f); + setRotateAccel(0x2C0, 0, 0); + mRotateSpd.x -= 0x10; + mRotateSpd.z = 0; -/* ############################################################################################## */ -/* 80B9C9F4-80B9CA00 -00001 000C+00 1/1 0/0 0/0 .data @3947 */ -SECTION_DATA static void* lit_3947[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)Wait__13daObjLv5Key_cFi, -}; + mMode = 1; + break; + case 1: + calcRotateSpd(); + OS_REPORT("ROTATE SPD = %x\n", mRotateSpd.x); + RotateAngle(); + + if (shape_angle.x >= 0x4000) { + shape_angle.x = 0x4000; + setStatus(STATUS_OPEN); + mMode = -1; + } + } +} /* 80B9C268-80B9C3B0 000928 0148+00 1/0 0/0 0/0 .text Shake__13daObjLv5Key_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::Shake(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Shake__13daObjLv5Key_cFi.s" +void daObjLv5Key_c::Shake(int param_0) { + switch (mMode) { + case -1: + break; + case 0: + setLocalOffset(0.0f, 0.0f, 0.0f); + setTimer(30); + mMode = 1; + break; + case 1: + if (countdown()) { + setShakeNum(2); + setRotateSpd(-0x100, 0, 0); + setRotateAccel(0x2A, 0, 0); + mMode = 2; + } + break; + case 2: + calcRotateSpd(); + RotateAngle(); + + if (shape_angle.x >= 0) { + shape_angle.x = 0; + setRotateSpd(-0x100, 0, 0); + decShakeNum(); + + if (is_shake_end()) { + setAction(&Wait, 1); + } + } + } } -#pragma pop /* 80B9C3B0-80B9C410 000A70 0060+00 1/1 0/0 0/0 .text TranslateByNowDirect__13daObjLv5Key_cFfff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::TranslateByNowDirect(f32 param_0, f32 param_1, f32 param_2) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/TranslateByNowDirect__13daObjLv5Key_cFfff.s" +void daObjLv5Key_c::TranslateByNowDirect(f32 i_x, f32 i_y, f32 i_z) { + cXyz trans; + trans.set(i_x, i_y, i_z); + + mDoMtx_stack_c::ZXYrotS(shape_angle); + mDoMtx_stack_c::multVec(&trans, &trans); + current.pos += trans; } -#pragma pop /* 80B9C410-80B9C450 000AD0 0040+00 1/1 0/0 0/0 .text Execute__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Execute__13daObjLv5Key_cFv.s" +int daObjLv5Key_c::Execute() { + Action(); + setBaseMtx(); + setCcSph(); + return 1; } -#pragma pop /* 80B9C450-80B9C500 000B10 00B0+00 1/1 0/0 0/0 .text Draw__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Draw__13daObjLv5Key_cFv.s" +int daObjLv5Key_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mBck.entry(mpModel->getModelData()); + mDoExt_modelUpdateDL(mpModel); + mBck.remove(mpModel->getModelData()); + return 1; } -#pragma pop /* 80B9C500-80B9C534 000BC0 0034+00 1/1 0/0 0/0 .text Delete__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/Delete__13daObjLv5Key_cFv.s" +int daObjLv5Key_c::Delete() { + dComIfG_resDelete(&mPhase, l_arcName); + return 1; } -#pragma pop /* 80B9C534-80B9C5AC 000BF4 0078+00 1/1 0/0 0/0 .text setBaseMtx__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setBaseMtx__13daObjLv5Key_cFv.s" +void daObjLv5Key_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + + cXyz& localOffset = getLocalOffset(); + mDoMtx_stack_c::transM(localOffset.x, localOffset.y, localOffset.z); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::transM(-localOffset.x, -localOffset.y, -localOffset.z); + + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop /* 80B9C5AC-80B9C5CC 000C6C 0020+00 1/0 0/0 0/0 .text daObjLv5Key_Draw__FP13daObjLv5Key_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv5Key_Draw(daObjLv5Key_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Draw__FP13daObjLv5Key_c.s" +static int daObjLv5Key_Draw(daObjLv5Key_c* i_this) { + return i_this->Draw(); } -#pragma pop /* 80B9C5CC-80B9C5EC 000C8C 0020+00 2/1 0/0 0/0 .text daObjLv5Key_Execute__FP13daObjLv5Key_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv5Key_Execute(daObjLv5Key_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/daObjLv5Key_Execute__FP13daObjLv5Key_c.s" +static int daObjLv5Key_Execute(daObjLv5Key_c* i_this) { + return i_this->Execute(); +} + +/* 80B9C5EC-80B9C798 000CAC 01AC+00 1/1 0/0 0/0 .text create_1st__13daObjLv5Key_cFv */ +int daObjLv5Key_c::create_1st() { + fopAcM_SetupActor(this, daObjLv5Key_c); + + int phase = dComIfG_resLoad(&mPhase, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x4B000)) { + return cPhs_ERROR_e; + } + + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + Init(); + daObjLv5Key_Execute(this); + } + + return phase; +} + +/* 80B9C8E0-80B9C900 000FA0 0020+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +static int useHeapInit(fopAc_ac_c* i_this) { + return ((daObjLv5Key_c*)i_this)->CreateHeap(); +} + +/* 80B9C900-80B9C908 000FC0 0008+00 1/0 0/0 0/0 .text daObjLv5Key_IsDelete__FP13daObjLv5Key_c */ +static int daObjLv5Key_IsDelete(daObjLv5Key_c* i_this) { + return 1; } -#pragma pop -/* ############################################################################################## */ /* 80B9CA00-80B9CA20 -00001 0020+00 1/0 0/0 0/0 .data l_daObjLv5Key_Method */ static actor_method_class l_daObjLv5Key_Method = { - (process_method_func)daObjLv5Key_Create__FP10fopAc_ac_c, - (process_method_func)daObjLv5Key_Delete__FP13daObjLv5Key_c, - (process_method_func)daObjLv5Key_Execute__FP13daObjLv5Key_c, - (process_method_func)daObjLv5Key_IsDelete__FP13daObjLv5Key_c, - (process_method_func)daObjLv5Key_Draw__FP13daObjLv5Key_c, + (process_method_func)daObjLv5Key_Create, (process_method_func)daObjLv5Key_Delete, + (process_method_func)daObjLv5Key_Execute, (process_method_func)daObjLv5Key_IsDelete, + (process_method_func)daObjLv5Key_Draw, }; /* 80B9CA20-80B9CA50 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv5Key */ extern actor_process_profile_definition g_profile_Obj_Lv5Key = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv5Key, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(daObjLv5Key_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 46, // mPriority - &l_daObjLv5Key_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv5Key, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv5Key_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 46, // mPriority + &l_daObjLv5Key_Method, // sub_method + 0x00044180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80B9CA50-80B9CA5C 00009C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 80B9CA5C-80B9CA68 0000A8 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, -}; - -/* 80B9CA68-80B9CA8C 0000B4 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_80B9C910, - (void*)NULL, - (void*)NULL, - (void*)func_80B9C908, -}; - -/* 80B9CA8C-80B9CA98 0000D8 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, -}; - -/* 80B9C5EC-80B9C798 000CAC 01AC+00 1/1 0/0 0/0 .text create_1st__13daObjLv5Key_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv5Key_c::create_1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/create_1st__13daObjLv5Key_cFv.s" -} -#pragma pop - -/* 80B9C798-80B9C7E0 000E58 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGSph::~cM3dGSph() { -extern "C" asm void __dt__8cM3dGSphFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGSphFv.s" -} -#pragma pop - -/* 80B9C7E0-80B9C828 000EA0 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80B9C828-80B9C898 000EE8 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() { -extern "C" asm void __dt__12dBgS_ObjAcchFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80B9C898-80B9C8E0 000F58 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __dt__12J3DFrameCtrlFv() { -//asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* 80B9C8E0-80B9C900 000FA0 0020+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/useHeapInit__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80B9C900-80B9C908 000FC0 0008+00 1/0 0/0 0/0 .text daObjLv5Key_IsDelete__FP13daObjLv5Key_c */ -static bool daObjLv5Key_IsDelete(daObjLv5Key_c* param_0) { - return true; -} - -/* 80B9C908-80B9C910 000FC8 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_80B9C908() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/func_80B9C908.s" -} -#pragma pop - -/* 80B9C910-80B9C918 000FD0 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_80B9C910() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/func_80B9C910.s" -} -#pragma pop - -/* 80B9C9AC-80B9C9AC 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_iceblock/Makefile b/rel/d/a/obj/d_a_obj_iceblock/Makefile index 758b58a169..c015089942 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/Makefile +++ b/rel/d/a/obj/d_a_obj_iceblock/Makefile @@ -8,12 +8,10 @@ M481_MAP := $(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceblock.map M481_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp \ rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp \ M481_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.o \ M481_LIBS := \ diff --git a/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp b/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp index bc137c1487..d78d96e423 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp +++ b/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp @@ -1,423 +1,225 @@ /** * @file d_a_obj_iceblock.cpp - * -*/ + * + */ #include "rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" #include "d/d_camera.h" +#include "rel/d/a/d_a_mirror/d_a_mirror.h" +enum PUSH_DIR { + DIR_SOUTH, + DIR_EAST, + DIR_NORTH, + DIR_WEST, +}; - - -// -// Forward References: -// - -extern "C" void -PPCallBack__13daObjIceBlk_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); -extern "C" static void rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" void initBaseMtx__13daObjIceBlk_cFv(); -extern "C" void setBaseMtx__13daObjIceBlk_cFv(); -extern "C" void getPointNo__13daObjIceBlk_cFv(); -extern "C" void loadCurrentPos__13daObjIceBlk_cFv(); -extern "C" void saveCurrentPos__13daObjIceBlk_cFv(); -extern "C" void enablePushPull__13daObjIceBlk_cFv(); -extern "C" void disablePushPull__13daObjIceBlk_cFv(); -extern "C" void Create__13daObjIceBlk_cFv(); -extern "C" void CreateHeap__13daObjIceBlk_cFv(); -extern "C" void create1st__13daObjIceBlk_cFv(); -extern "C" void Execute__13daObjIceBlk_cFPPA3_A4_f(); -extern "C" void checkWalk__13daObjIceBlk_cFv(); -extern "C" void clrCounter__13daObjIceBlk_cFv(); -extern "C" void mode_proc_call__13daObjIceBlk_cFv(); -extern "C" void mode_init_wait__13daObjIceBlk_cFv(); -extern "C" void mode_proc_wait__13daObjIceBlk_cFv(); -extern "C" void mode_init_walk__13daObjIceBlk_cFv(); -extern "C" void mode_proc_walk__13daObjIceBlk_cFv(); -extern "C" void setEffect__13daObjIceBlk_cFv(); -extern "C" void checkWallPre__13daObjIceBlk_cFs(); -extern "C" void checkBgHit__13daObjIceBlk_cFv(); -extern "C" void bgCheck__13daObjIceBlk_cFv(); -extern "C" void init_bgCheck__13daObjIceBlk_cFv(); -extern "C" void checkFall__13daObjIceBlk_cFv(); -extern "C" void __dt__8cM3dGPlaFv(); -extern "C" void event_proc_call__13daObjIceBlk_cFv(); -extern "C" void actionWait__13daObjIceBlk_cFv(); -extern "C" void actionOrderEvent__13daObjIceBlk_cFv(); -extern "C" void actionEvent__13daObjIceBlk_cFv(); -extern "C" void actionDead__13daObjIceBlk_cFv(); -extern "C" void Draw__13daObjIceBlk_cFv(); -extern "C" void Delete__13daObjIceBlk_cFv(); -extern "C" static void daObjIceBlk_create1st__FP13daObjIceBlk_c(); -extern "C" void __dt__14dBgS_ObjGndChkFv(); -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 daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c(); -extern "C" static void daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c(); -extern "C" static void daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" static void func_80C242C4(); -extern "C" static void func_80C242CC(); -extern "C" static void func_80C242D4(); -extern "C" static void func_80C242DC(); -extern "C" static void func_80C242E4(); -extern "C" extern char const* const d_a_obj_iceblock__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz(); -extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(); -extern "C" void fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void entry__10daMirror_cFP8J3DModel(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void offSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dPath_GetRoomPath__Fii(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void LineCross__4cBgSFP11cBgS_LinChk(); -extern "C" void GroundCross__4cBgSFP11cBgS_GndChk(); -extern "C" void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__11dBgS_GndChkFv(); -extern "C" void __dt__11dBgS_GndChkFv(); -extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(); -extern "C" void __ct__14dBgS_ObjLinChkFv(); -extern "C" void __dt__14dBgS_ObjLinChkFv(); -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 Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void Start__9dCamera_cFv(); -extern "C" void Stop__9dCamera_cFv(); -extern "C" void SetTrimSize__9dCamera_cFl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __pl__4cXyzCFRC3Vec(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void __ml__4cXyzCFf(); -extern "C" void cM_atan2s__Fff(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void cBgW_CheckBGround__Ff(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); -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" u8 BaseZ__4cXyz[12]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80C24698[4]; - -// -// Declarations: -// +enum WALK_TYPE { + WALK_PUSH = 1, + WALK_IRON_BALL_HIT, +}; /* 80C21CD8-80C21DAC 000078 00D4+00 1/1 0/0 0/0 .text * PPCallBack__13daObjIceBlk_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::PPCallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, s16 param_2, - dBgW_Base::PushPullLabel param_3) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C21CD8.s" +void daObjIceBlk_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, s16 i_angle, + dBgW_Base::PushPullLabel i_label) { + bool temp_r3 = cLib_checkBit(i_label, dBgW::PPLABEL_PUSH) != 0; + bool temp_r3_2 = cLib_checkBit(i_label, dBgW::PPLABEL_PUSH) != 0; + int push_dir = -1; + + if (temp_r3_2 && temp_r3) { + if (i_angle >= -0x2000 && i_angle < 0x2000) { + push_dir = DIR_SOUTH; + } else if (i_angle >= 0x2000 && i_angle < 0x6000) { + push_dir = DIR_EAST; + } else if (i_angle < -0x2000 && i_angle >= -0x6000) { + push_dir = DIR_WEST; + } else if (i_angle < -0x6000 || i_angle >= 0x6000) { + push_dir = DIR_NORTH; + } + } + + if (push_dir != -1) { + for (int i = 0; i < 4; i++) { + if (i == push_dir) { + ((daObjIceBlk_c*)i_bgActor)->mCounter[i]++; + } else { + ((daObjIceBlk_c*)i_bgActor)->mCounter[i] = 0; + } + } + } + + ((daObjIceBlk_c*)i_bgActor)->mPPLabel = i_label; } -#pragma pop /* 80C21DAC-80C21DC4 00014C 0018+00 1/1 0/0 0/0 .text * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s" +static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) { + if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + ((daObjIceBlk_c*)i_bgActor)->mIsPlayerRide = true; + } } -#pragma pop /* 80C21DC4-80C21E24 000164 0060+00 1/1 0/0 0/0 .text initBaseMtx__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/initBaseMtx__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::initBaseMtx() { + if (mpIceModel != NULL) { + mpIceModel->setBaseScale(scale); + } + + mpModel->setBaseScale(scale); + setBaseMtx(); } -#pragma pop /* 80C21E24-80C21EA4 0001C4 0080+00 2/2 0/0 0/0 .text setBaseMtx__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/setBaseMtx__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + + if (mpIceModel != NULL) { + mpIceModel->setBaseTRMtx(mDoMtx_stack_c::get()); + } + + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -#pragma pop /* 80C21EA4-80C21F2C 000244 0088+00 1/1 0/0 0/0 .text getPointNo__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::getPointNo() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/getPointNo__13daObjIceBlk_cFv.s" +u16 daObjIceBlk_c::getPointNo() { + u16 point_no = 0; + + for (int i = 0; i < mMaxSwNum; i++) { + if (fopAcM_isSwitch(this, mSwbit + i)) { + point_no |= (1 << i); + } + } + + return point_no; } -#pragma pop /* 80C21F2C-80C21FC8 0002CC 009C+00 1/1 0/0 0/0 .text loadCurrentPos__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::loadCurrentPos() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/loadCurrentPos__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::loadCurrentPos() { + if (mpPath != NULL) { + u16 point_no = getPointNo(); + if (point_no != 0) { + dStage_dPnt_c* point = &mpPath->m_points[point_no - 1]; + home.pos = point->m_position; + old.pos = home.pos; + current.pos = home.pos; + } + } } -#pragma pop -/* ############################################################################################## */ /* 80C242F4-80C24324 000000 0030+00 8/8 0/0 0/0 .rodata l_dir_vec */ -SECTION_RODATA static u8 const l_dir_vec[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +static const Vec l_dir_vec[4] = { + {0.0f, 0.0f, 1.0f}, + {1.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, -1.0f}, + {-1.0f, 0.0f, 0.0f}, }; -COMPILER_STRIP_GATE(0x80C242F4, &l_dir_vec); /* 80C24324-80C2432C 000030 0008+00 1/3 0/0 0/0 .rodata l_dir_angle */ -SECTION_RODATA static u8 const l_dir_angle[8] = { - 0x00, 0x00, 0x40, 0x00, 0x80, 0x00, 0xC0, 0x00, -}; -COMPILER_STRIP_GATE(0x80C24324, &l_dir_angle); +static const s16 l_dir_angle[4] = {0x0000, 0x4000, 0x8000, 0xC000}; /* 80C2432C-80C24370 000038 0044+00 0/1 0/0 0/0 .rodata l_cyl_src */ -#pragma push -#pragma force_active on const static dCcD_SrcCyl l_cyl_src = { { - {0x0, {{0x100, 0x1, 0x1d}, {0x400000, 0x11}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x2, 0x1}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf + {0x0, {{0x100, 0x1, 0x1d}, {0x400000, 0x11}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x2, 0x1}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 180.0f, // mRadius - 290.0f // mHeight - } // mCyl + {0.0f, 0.0f, 0.0f}, // mCenter + 180.0f, // mRadius + 290.0f // mHeight + } // mCyl }; -#pragma pop - -/* 80C24370-80C24374 00007C 0004+00 2/5 0/0 0/0 .rodata @3936 */ -SECTION_RODATA static u8 const lit_3936[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C24370, &lit_3936); - -/* 80C24374-80C2437C 000080 0008+00 0/1 0/0 0/0 .rodata @3937 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3937[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C24374, &lit_3937); -#pragma pop - -/* 80C2437C-80C24384 000088 0008+00 0/1 0/0 0/0 .rodata @3938 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3938[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C2437C, &lit_3938); -#pragma pop - -/* 80C24384-80C2438C 000090 0008+00 0/1 0/0 0/0 .rodata @3939 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3939[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C24384, &lit_3939); -#pragma pop - -/* 80C2438C-80C24390 000098 0004+00 0/1 0/0 0/0 .rodata @3940 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3940 = 5.0f; -COMPILER_STRIP_GATE(0x80C2438C, &lit_3940); -#pragma pop /* 80C21FC8-80C22200 000368 0238+00 2/2 0/0 0/0 .text saveCurrentPos__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::saveCurrentPos() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/saveCurrentPos__13daObjIceBlk_cFv.s" +int daObjIceBlk_c::saveCurrentPos() { + int current_pos = -1; + + if (mpPath == NULL) { + return current_pos; + } + + dStage_dPnt_c* point = mpPath->m_points; + f32 nearest_dist = 1000000.0f; + int nearest_point_no = 0; + + for (int i = 0; i < mpPath->m_num; i++) { +#ifdef DEBUG + f32 dist = current.pos.absXZ(point->m_position); + if (dist < nearest_dist) { + nearest_point_no = i; + nearest_dist = dist; + } +#endif + + if (current.pos.absXZ(point->m_position) < 5.0f) { + current_pos = i + 1; + break; + } + + point++; + } + + if (current_pos < 0) { + // "Ice Block: No Path Point found nearby!\n" + OS_REPORT_ERROR("氷ブロック：近くにパスポイントが見つかりませんでした！\n"); + + // "Ice Block: Nearest Path Point No:<%d>:<%f>cm\n" + OS_REPORT_ERROR("氷ブロック：一番近いパスポイントNo<%d>:<%f>cm\n", nearest_point_no, + nearest_dist); + + // "Ice Block: Save Switch not activated\n" + OS_REPORT_ERROR("氷ブロック：スイッチによるセーブは実行されませんでした\n"); + return current_pos; + } + + for (int i = 0; i < mMaxSwNum; i++) { + if (current_pos & (1 << i)) { + fopAcM_onSwitch(this, mSwbit + i); + } else { + fopAcM_offSwitch(this, mSwbit + i); + } + } + + // "Ice Block: Saved at point<%d>!\n" + OS_REPORT("氷ブロック：ポイント<%d>にセーブしました！\n", current_pos - 1); + return current_pos; } -#pragma pop /* 80C22200-80C2224C 0005A0 004C+00 1/1 0/0 0/0 .text enablePushPull__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::enablePushPull() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/enablePushPull__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::enablePushPull() { + if (mpBgW != NULL && mpBgW->ChkUsed()) { + mpBgW->OnPushPullOk(); + } } -#pragma pop /* 80C2224C-80C22298 0005EC 004C+00 2/2 0/0 0/0 .text disablePushPull__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::disablePushPull() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/disablePushPull__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::disablePushPull() { + if (mpBgW != NULL && mpBgW->ChkUsed()) { + mpBgW->OffPushPullOk(); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80C24390-80C24394 00009C 0004+00 0/1 0/0 0/0 .rodata l_eff_id$4008 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_eff_id[4] = { - 0x8A, - 0xE1, - 0x8A, - 0xE2, -}; -COMPILER_STRIP_GATE(0x80C24390, &l_eff_id); -#pragma pop - -/* 80C24394-80C24398 0000A0 0004+00 0/1 0/0 0/0 .rodata @4078 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4078 = 30.0f; -COMPILER_STRIP_GATE(0x80C24394, &lit_4078); -#pragma pop - -/* 80C24398-80C2439C 0000A4 0004+00 2/3 0/0 0/0 .rodata @4079 */ -SECTION_RODATA static f32 const lit_4079 = -6.0f; -COMPILER_STRIP_GATE(0x80C24398, &lit_4079); - -/* 80C2439C-80C243A0 0000A8 0004+00 0/5 0/0 0/0 .rodata @4080 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4080 = 1.0f; -COMPILER_STRIP_GATE(0x80C2439C, &lit_4080); -#pragma pop - -/* 80C2449C-80C2449C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C2449C = "Y_icecube"; -SECTION_DEAD static char const* const stringBase_80C244A6 = - "氷ブロック：パスポイント数が多すぎます！\n"; -#pragma pop - -/* 80C22298-80C22618 000638 0380+00 1/0 0/0 0/0 .text Create__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Create__13daObjIceBlk_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C243A0-80C243A8 0000AC 0008+00 1/1 0/0 0/0 .rodata l_bmd$4084 */ -SECTION_RODATA static u8 const l_bmd[8] = { - 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, -}; -COMPILER_STRIP_GATE(0x80C243A0, &l_bmd); /* 80C244D0-80C244DC 000000 000C+00 2/2 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, }; /* 80C244DC-80C244F0 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, @@ -428,764 +230,696 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80C244F0-80C244F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_iceblock__stringBase0; +static char* l_arcName = "Y_icecube"; + +/* 80C22298-80C22618 000638 0380+00 1/0 0/0 0/0 .text Create__13daObjIceBlk_cFv */ +int daObjIceBlk_c::Create() { + mpPath = dPath_GetRoomPath(getPathId(), fopAcM_GetRoomNo(this)); + mSwbit = getSwbit(); + + if (mpPath == NULL || mSwbit == 0xFF) { + // "Ice Block: No Path or Save spec so no save\n" + OS_REPORT("[43;30m氷ブロック：パスorセーブ指定が無いのでセーブしません\n"); + mpPath = NULL; + mSwbit = 0xFF; + mMaxSwNum = 0; + } + + if (mpPath != NULL) { + u16 point_num = mpPath->m_num; + + if (point_num == 1) { + mMaxSwNum = 1; + } else if (point_num < 4) { + mMaxSwNum = 2; + } else if (point_num < 8) { + mMaxSwNum = 3; + } else if (point_num < 16) { + mMaxSwNum = 4; + } else if (point_num < 32) { + mMaxSwNum = 5; + } else if (point_num < 64) { + mMaxSwNum = 6; + } else if (point_num < 128) { + mMaxSwNum = 7; + } else if (point_num < 255) { + mMaxSwNum = 8; + } else { + // "Ice Block: Too many path points!\n" + OSReport_Error("氷ブロック：パスポイント数が多すぎます！\n"); + return 0; + } + + // "Ice Block: Using switch<%d> of <%d>n\" + OS_REPORT("氷ブロック：スイッチ<%d>から<%d>個使用します\n", mSwbit, mMaxSwNum); + } + + loadCurrentPos(); + + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + + mAcchCir.SetWall(30.0f, 30.0f); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), NULL, NULL); + mCcStts.Init(0xFF, 0xFF, this); + mCcCyl.Set(l_cyl_src); + mCcCyl.SetStts(&mCcStts); + + J3DJoint* pjoint = mpModel->getModelData()->getJointNodePointer(0); + fopAcM_setCullSizeBox(this, scale.x * pjoint->getMin()->x, scale.y * -pjoint->getMax()->y, + scale.z * pjoint->getMin()->z, scale.x * pjoint->getMax()->x, + scale.y * pjoint->getMax()->y, scale.z * pjoint->getMax()->z); + + mpBgW->SetPushPullCallback((dBgW_Base::PushPull_CallBack)PPCallBack); + mpBgW->SetRideCallback(rideCallBack); + + fopAcM_SetGravity(this, -6.0f); + + if (getSwbit2() != 0xFF) { + if (!fopAcM_isSwitch(this, getSwbit2())) { + if (mpBgW != NULL && mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } + + if (mpIceBgW != NULL && !mpIceBgW->ChkUsed()) { + dComIfG_Bgsp().Regist(mpIceBgW, this); + } + + if (mpIceBgW != NULL) { + mpIceBgW->Move(); + } + + for (int i = 0; i < 2; i++) { + static const u16 l_eff_id[] = {0x8AE1, 0x8AE2}; + mColdEffEmitters[i] = + dComIfGp_particle_set(l_eff_id[i], ¤t.pos, &home.angle, &scale, 0xFF, + NULL, -1, NULL, NULL, NULL); +#ifdef DEBUG + if (mColdEffEmitters[i] == NULL) { + // "Ice Block: Cold Effect set failed\n" + OS_REPORT("氷ブロック：冷気エフェクトセット失敗\n"); + return 0; + } +#endif + } + } + } + + init_bgCheck(); + mode_init_wait(); + setAction(ACTION_WAIT_e); + initBaseMtx(); + mHitCounter = 3; + return 1; +} /* 80C22618-80C227F4 0009B8 01DC+00 1/0 0/0 0/0 .text CreateHeap__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/CreateHeap__13daObjIceBlk_cFv.s" +int daObjIceBlk_c::CreateHeap() { + static const int l_bmd[] = {5, 8}; + + if (getSwbit2() != 0xFF && !fopAcM_isSwitch(this, getSwbit2())) { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[0]); + JUT_ASSERT(modelData != 0); + + mpIceModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); + if (mpIceModel == NULL) { + return 0; + } + + mpIceBgW = new dBgW(); + if (mpIceBgW != NULL && + !mpIceBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 11), dBgW::MOVE_BG_e, &mBgMtx)) + { + mpIceBgW->SetCrrFunc(dBgS_MoveBGProc_Trans); + } else { + mpIceBgW = NULL; + return 0; + } + } else { + mpIceModel = NULL; + } + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[1]); + JUT_ASSERT(modelData != 0); + + J3DModelData* shareModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[0]); + JUT_ASSERT(shareModelData != 0); + + mDoExt_setupShareTexture(modelData, shareModelData); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } else if (mpModel != NULL) { + return 1; + } + + return 1; } -#pragma pop /* 80C227F4-80C228B4 000B94 00C0+00 1/1 0/0 0/0 .text create1st__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/create1st__13daObjIceBlk_cFv.s" +int daObjIceBlk_c::create1st() { + int phase = dComIfG_resLoad(&mPhase, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + u32 heap_size = 0xC40; + if (getSwbit2() != 0xFF && !fopAcM_isSwitch(this, getSwbit2())) { + heap_size = 0x2940; + } + + phase = MoveBGCreate(l_arcName, 12, dBgS_MoveBGProc_Trans, heap_size, NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + + return phase; } -#pragma pop /* 80C228B4-80C2294C 000C54 0098+00 1/0 0/0 0/0 .text Execute__13daObjIceBlk_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Execute__13daObjIceBlk_cFPPA3_A4_f.s" +int daObjIceBlk_c::Execute(Mtx** param_0) { + mode_proc_call(); + event_proc_call(); + + *param_0 = &mBgMtx; + setBaseMtx(); + + eyePos = current.pos; + attention_info.position = current.pos; + + mPPLabel = dBgW::PPLABEL_NONE; + mIsPlayerRide = false; + mCcStts.Move(); + return 1; } -#pragma pop /* 80C2294C-80C22B04 000CEC 01B8+00 1/1 0/0 0/0 .text checkWalk__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::checkWalk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkWalk__13daObjIceBlk_cFv.s" +int daObjIceBlk_c::checkWalk() { + int push_dir = -1; + + if (getSwbit2() != 0xFF && !fopAcM_isSwitch(this, getSwbit2())) { + return -1; + } + + for (int i = 0; i < 4; i++) { + if (mCounter[i] != 0) { + push_dir = i; + mWalkType = WALK_PUSH; + } + } + + if (mCcCyl.ChkTgHit()) { + dCcD_GObjInf* hit_gobj = mCcCyl.GetTgHitGObj(); + if (!mIsPlayerRide && hit_gobj != NULL && hit_gobj->ChkAtType(AT_TYPE_IRON_BALL) && + hit_gobj->GetAtAtp() == 3) + { + cXyz sp38 = current.pos - daPy_getPlayerActorClass()->current.pos; + s16 hit_angle = cM_atan2s(sp38.x, sp38.z); + + if (hit_angle >= -0x2000 && hit_angle < 0x2000) { + push_dir = DIR_SOUTH; + } else if (hit_angle >= 0x2000 && hit_angle < 0x6000) { + push_dir = DIR_EAST; + } else if (hit_angle < -0x2000 && hit_angle >= -0x6000) { + push_dir = DIR_WEST; + } else if (hit_angle < -0x6000 || hit_angle >= 0x6000) { + push_dir = DIR_NORTH; + } + + mWalkType = WALK_IRON_BALL_HIT; + } + } + + if (push_dir != -1 && checkWallPre(l_dir_angle[push_dir]) >= 0) { + push_dir = -1; + } + + return push_dir; } -#pragma pop /* 80C22B04-80C22B28 000EA4 0024+00 3/3 0/0 0/0 .text clrCounter__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::clrCounter() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/clrCounter__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::clrCounter() { + for (int i = 0; i < 4; i++) { + mCounter[i] = 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80C243A8-80C243AC 0000B4 0004+00 0/3 0/0 0/0 .rodata @4361 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4361 = -1.0f; -COMPILER_STRIP_GATE(0x80C243A8, &lit_4361); -#pragma pop - -/* 80C244F4-80C24500 -00001 000C+00 0/1 0/0 0/0 .data @4231 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4231[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_proc_wait__13daObjIceBlk_cFv, -}; -#pragma pop - -/* 80C24500-80C2450C -00001 000C+00 0/1 0/0 0/0 .data @4232 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4232[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_proc_walk__13daObjIceBlk_cFv, -}; -#pragma pop - -/* 80C2450C-80C24524 00003C 0018+00 0/1 0/0 0/0 .data l_func$4230 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func_4230[24] = { - 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 /* 80C22B28-80C22EF8 000EC8 03D0+00 1/1 0/0 0/0 .text mode_proc_call__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::mode_proc_call() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_call__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::mode_proc_call() { + typedef void (daObjIceBlk_c::*modeProc)(void); + static modeProc l_func[] = {&mode_proc_wait, &mode_proc_walk}; + + if (getSwbit2() != 0xFF && !fopAcM_isSwitch(this, getSwbit2())) { + mCcCyl.OnAtSPrmBit(1); + disablePushPull(); + + if (mCcCyl.ChkTgHit()) { + dCcD_GObjInf* hit_gobj = mCcCyl.GetTgHitGObj(); + + if (hit_gobj->GetAtType() & AT_TYPE_IRON_BALL) { + BOOL break_ice = false; + if (hit_gobj->GetAtAtp() == 100 || hit_gobj->GetAtAtp() == 3) { + break_ice = true; + } else if (hit_gobj->GetAtAtp() == 2) { + mKezuruEmtrID = dComIfGp_particle_set(mKezuruEmtrID, 0x8678, ¤t.pos, + &shape_angle, NULL); + fopAcM_seStart(this, Z2SE_OBJ_ICE_KEZURU, 0); + + mHitCounter--; + if (mHitCounter == 0) { + break_ice = true; + } + } + + if (break_ice) { + if (mpIceBgW != NULL && mpIceBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpIceBgW); + } + + if (mpBgW != NULL && !mpBgW->ChkUsed()) { + dComIfG_Bgsp().Regist(mpBgW, this); + } + + setEffect(); + fopAcM_onSwitch(this, getSwbit2()); + fopAcM_seStart(this, Z2SE_OBJ_ICE_BREAK, 0); + enablePushPull(); + } + } + } + + mCcCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCcCyl); + return; + } + + mCcCyl.OffAtSPrmBit(1); + + cXyz prev_pos(current.pos); + fopAcM_posMoveF(this, NULL); + current.pos.x = prev_pos.x; + current.pos.z = prev_pos.z; + + bgCheck(); + + (this->*l_func[mMode])(); + + if (cLib_checkBit(mState, STATE_LAND_e)) { + dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f)); + fopAcM_seStart(this, Z2SE_OBJ_IRONBLOCK_LAND, 0); + } } -#pragma pop /* 80C22EF8-80C22F74 001298 007C+00 2/2 0/0 0/0 .text mode_init_wait__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::mode_init_wait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_init_wait__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::mode_init_wait() { + int current_pos = saveCurrentPos(); + if (current_pos - 1 == getCorrectPointNo()) { + disablePushPull(); + // "Ice Block: Disable PushPull since correct position<%d>\n" + OS_REPORT("氷ブロック：正解位置なので押し引き不可になりました<%d>\n", current_pos); + } else { + // "Ice Block: Not in Correct<%d> position<%d>\n" + OS_REPORT("氷ブロック：正解位置<%d>ではありません<%d>\n", getCorrectPointNo(), current_pos); + } + + fopAcM_SetSpeedF(this, 0.0f); + fopAcM_SetGravity(this, -6.0f); + + mMoveDir = -1; + clrCounter(); + mWalkType = 0; + mMode = MODE_PROC_WAIT_e; } -#pragma pop /* 80C22F74-80C23058 001314 00E4+00 1/0 0/0 0/0 .text mode_proc_wait__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::mode_proc_wait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_wait__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::mode_proc_wait() { + int push_dir = checkWalk(); + if (push_dir != -1) { + fopAcM_seStart(this, Z2SE_OBJ_IRONBLOCK_MOVE, 0); + mMoveDir = push_dir; + current.angle.y = l_dir_angle[push_dir]; + mode_init_walk(); + } + + if (!cLib_checkBit(mPPLabel, dBgW::PPLABEL_PUSH)) { + clrCounter(); + } + + mCcCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCcCyl); } -#pragma pop /* 80C23058-80C23088 0013F8 0030+00 1/1 0/0 0/0 .text mode_init_walk__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::mode_init_walk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_init_walk__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::mode_init_walk() { + fopAcM_SetGravity(this, -6.0f); + mWalkInitPos = current.pos; + mMode = MODE_PROC_WALK_e; } -#pragma pop - -/* ############################################################################################## */ -/* 80C243AC-80C243B0 0000B8 0004+00 0/1 0/0 0/0 .rodata @4451 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4451 = 21.0f; -COMPILER_STRIP_GATE(0x80C243AC, &lit_4451); -#pragma pop - -/* 80C243B0-80C243B4 0000BC 0004+00 0/1 0/0 0/0 .rodata @4452 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4452 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80C243B0, &lit_4452); -#pragma pop - -/* 80C243B4-80C243B8 0000C0 0004+00 0/1 0/0 0/0 .rodata @4453 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4453 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80C243B4, &lit_4453); -#pragma pop - -/* 80C243B8-80C243BC 0000C4 0004+00 0/1 0/0 0/0 .rodata @4454 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4454 = 27.0f; -COMPILER_STRIP_GATE(0x80C243B8, &lit_4454); -#pragma pop - -/* 80C243BC-80C243C0 0000C8 0004+00 0/1 0/0 0/0 .rodata @4455 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4455 = 23.0f; -COMPILER_STRIP_GATE(0x80C243BC, &lit_4455); -#pragma pop - -/* 80C243C0-80C243C4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4456 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4456 = 300.0f; -COMPILER_STRIP_GATE(0x80C243C0, &lit_4456); -#pragma pop - -/* 80C243C4-80C243CC 0000D0 0008+00 0/1 0/0 0/0 .rodata @4459 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4459[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C243C4, &lit_4459); -#pragma pop /* 80C23088-80C23388 001428 0300+00 1/0 0/0 0/0 .text mode_proc_walk__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::mode_proc_walk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/mode_proc_walk__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::mode_proc_walk() { + if (mWalkType == WALK_PUSH) { + cLib_addCalc(&speedF, 21.0f, 0.05f, 1.0f, 0.01f); + } else if (mWalkType == WALK_IRON_BALL_HIT) { + cLib_chaseF(&speedF, 27.0f, 23.0f); + } + + cXyz prev_pos(current.pos); + fopAcM_posMove(this, NULL); + current.pos.y = prev_pos.y; + + if (checkWallPre(l_dir_angle[mMoveDir]) >= 0) { + current.pos.x -= mWallPrePos.x; + current.pos.z -= mWallPrePos.z; + dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f)); + fopAcM_seStart(this, Z2SE_OBJ_IRONBLOCK_STOP, 0); + mode_init_wait(); + } else if (!cLib_checkBit(mState, STATE_2_e) && checkFall()) { + cXyz sp4C(speed); + + int sp20; + if (mMoveDir == DIR_EAST) { + sp20 = (current.pos.x - mWalkInitPos.x) / 300.0f; + current.pos.x = mWalkInitPos.x + sp20 * 300.0f; + } else if (mMoveDir == DIR_WEST) { + sp20 = (mWalkInitPos.x - current.pos.x) / 300.0f; + current.pos.x = mWalkInitPos.x - sp20 * 300.0f; + } else if (mMoveDir == DIR_SOUTH) { + sp20 = (current.pos.z - mWalkInitPos.z) / 300.0f; + current.pos.z = mWalkInitPos.z + sp20 * 300.0f; + } else if (mMoveDir == DIR_NORTH) { + sp20 = (mWalkInitPos.z - current.pos.z) / 300.0f; + current.pos.z = mWalkInitPos.z - sp20 * 300.0f; + } + + mode_init_wait(); + } + + clrCounter(); } -#pragma pop - -/* ############################################################################################## */ -/* 80C243CC-80C243D0 0000D8 0004+00 0/1 0/0 0/0 .rodata l_eff_break_b$4463 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_eff_break_b[4] = { - 0x86, - 0x79, - 0x86, - 0x7A, -}; -COMPILER_STRIP_GATE(0x80C243CC, &l_eff_break_b); -#pragma pop - -/* 80C243D0-80C243D4 0000DC 0004+00 0/1 0/0 0/0 .rodata l_eff_break_id$4464 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_eff_break_id[4] = { - 0x8A, - 0xDF, - 0x8A, - 0xE0, -}; -COMPILER_STRIP_GATE(0x80C243D0, &l_eff_break_id); -#pragma pop /* 80C23388-80C2350C 001728 0184+00 1/1 0/0 0/0 .text setEffect__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::setEffect() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/setEffect__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::setEffect() { + static const u16 l_eff_break_b[] = {0x8679, 0x867A}; + static const u16 l_eff_break_id[] = {0x8ADF, 0x8AE0}; + + field_0x9d4 = dComIfGp_particle_set(field_0x9d4, 0x867B, ¤t.pos, &shape_angle, NULL, 0xFF, + NULL, -1, NULL, NULL, NULL); + field_0x9d8 = dComIfGp_particle_set(field_0x9d8, l_eff_break_b[0], ¤t.pos, &shape_angle, + NULL, 0xFF, NULL, -1, NULL, NULL, NULL); + + for (int i = 0; i < 2; i++) { + dComIfGp_particle_set(l_eff_break_id[i], ¤t.pos, &home.angle, &scale, 0xFF, NULL, -1, + NULL, NULL, NULL); + } + + for (int i = 0; i < 2; i++) { + if (mColdEffEmitters[i] != NULL) { + mColdEffEmitters[i]->becomeInvalidEmitter(); + mColdEffEmitters[i] = NULL; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80C243D4-80C24410 0000E0 003C+00 0/1 0/0 0/0 .rodata l_check_offsetXY$4509 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_check_offsetXY[60] = { - 0xC3, 0x11, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x11, 0x00, - 0x00, 0x43, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x43, 0x93, - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C243D4, &l_check_offsetXY); -#pragma pop - -/* 80C24410-80C24414 00011C 0004+00 0/1 0/0 0/0 .rodata @4571 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4571 = 150.0f; -COMPILER_STRIP_GATE(0x80C24410, &lit_4571); -#pragma pop - -/* 80C24414-80C24418 000120 0004+00 0/1 0/0 0/0 .rodata @4572 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4572 = 155.0f; -COMPILER_STRIP_GATE(0x80C24414, &lit_4572); -#pragma pop /* 80C2350C-80C236C8 0018AC 01BC+00 2/2 0/0 0/0 .text checkWallPre__13daObjIceBlk_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::checkWallPre(s16 param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkWallPre__13daObjIceBlk_cFs.s" +int daObjIceBlk_c::checkWallPre(s16 i_angle) { + dBgS_ObjLinChk linchk; + cXyz start; + cXyz end; + cXyz spBC; + cXyz spC8; + + int var_r29 = -1; + + linchk.SetActorPid(mBase.mBsPcId); + + mDoMtx_stack_c::YrotS(i_angle); + mDoMtx_stack_c::multVec(&cXyz::BaseZ, &spBC); + spC8 = spBC * 150.0f; + spBC *= 155.0f; + + for (int i = 0; i < 5; i++) { + static const Vec l_check_offsetXY[] = { + {-145.0f, 5.0f, 0.0f}, {-145.0f, 295.0f, 0.0f}, {145.0f, 295.0f, 0.0f}, + {145.0f, 5.0f, 0.0f}, {0.0f, 150.0f, 0.0f}, + }; + + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(i_angle); + mDoMtx_stack_c::multVec(&l_check_offsetXY[i], &start); + end = start + spBC; + + linchk.Set(&start, &end, this); + if (dComIfG_Bgsp().LineCross(&linchk)) { + end = start + spC8; + mWallPrePos = end - linchk.i_GetCross(); + var_r29 = i; + } + } + + return var_r29; } -#pragma pop - -/* ############################################################################################## */ -/* 80C24418-80C24454 000124 003C+00 0/1 0/0 0/0 .rodata l_check_offsetXZ$4577 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_check_offsetXZ_4577[60] = { - 0xC3, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x11, 0x00, 0x00, 0xC3, 0x11, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, - 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C24418, &l_check_offsetXZ_4577); -#pragma pop - -/* 80C24454-80C24458 000160 0004+00 0/1 0/0 0/0 .rodata @4603 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4603 = -1000000000.0f; -COMPILER_STRIP_GATE(0x80C24454, &lit_4603); -#pragma pop - -/* 80C24458-80C2445C 000164 0004+00 0/1 0/0 0/0 .rodata @4604 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4604 = 100.0f; -COMPILER_STRIP_GATE(0x80C24458, &lit_4604); -#pragma pop /* 80C236C8-80C237B0 001A68 00E8+00 2/2 0/0 0/0 .text checkBgHit__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::checkBgHit() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkBgHit__13daObjIceBlk_cFv.s" +int daObjIceBlk_c::checkBgHit() { + cXyz check_pos; + mGroundY = -1000000000.0f; + + int var_r29 = -1; + + mGndChk.SetActorPid(mBase.mBsPcId); + + for (int i = 0; i < 5; i++) { + static const Vec l_check_offsetXZ[] = { + {-145.0f, 0.0f, -145.0f}, {-145.0f, 0.0f, 145.0f}, {145.0f, 0.0f, 145.0f}, + {145.0f, 0.0f, -145.0f}, {0.0f, 0.0f, 0.0f}, + }; + + check_pos = current.pos + l_check_offsetXZ[i]; + check_pos.y += 100.0f; + + mGndChk.SetPos(&check_pos); + f32 gnd_y = dComIfG_Bgsp().GroundCross(&mGndChk); + if (gnd_y > mGroundY) { + mGroundY = gnd_y; + var_r29 = i; + } + } + + return var_r29; } -#pragma pop /* 80C237B0-80C23860 001B50 00B0+00 1/1 0/0 0/0 .text bgCheck__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::bgCheck() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/bgCheck__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::bgCheck() { + State_e prev_state = mState; + mState = STATE_0_e; + + if (checkBgHit() < 0) { + // "Ice Block: No Floor!\n" + OS_REPORT("[43;30m氷ブロック：床がありません！\n"); + } + + if (mGroundY > current.pos.y) { + current.pos.y = mGroundY; + speed.y = 0.0f; + + if (!cLib_checkBit(prev_state, STATE_2_e)) { + cLib_onBit(mState, STATE_LAND_e); + } + + cLib_onBit(mState, STATE_2_e); + dComIfG_Bgsp().RideCallBack(mGndChk, this); + } else { + if (cLib_checkBit(prev_state, STATE_2_e)) { + cLib_onBit(mState, STATE_4_e); + } + } } -#pragma pop /* 80C23860-80C238B0 001C00 0050+00 1/1 0/0 0/0 .text init_bgCheck__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::init_bgCheck() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/init_bgCheck__13daObjIceBlk_cFv.s" +void daObjIceBlk_c::init_bgCheck() { + if (checkBgHit() >= 0) { + current.pos.y = mGroundY; + mState = STATE_0_e; + cLib_onBit(mState, STATE_2_e); + } else { + // "Ice Block: No Floor!\n" + OS_REPORT("氷ブロック：床がありません！\n"); + } } -#pragma pop -/* ############################################################################################## */ -/* 80C2445C-80C24498 000168 003C+00 1/1 0/0 0/0 .rodata l_check_offsetXZ$4641 */ -SECTION_RODATA static u8 const l_check_offsetXZ_4641[60] = { - 0xC3, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x11, 0x00, 0x00, 0xC3, 0x11, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, - 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C2445C, &l_check_offsetXZ_4641); +/* 80C238B0-80C23A08 001C50 0158+00 1/1 0/0 0/0 .text checkFall__13daObjIceBlk_cFv */ +BOOL daObjIceBlk_c::checkFall() { + cXyz start; + cXyz end; -/* 80C24498-80C2449C 0001A4 0004+00 1/1 0/0 0/0 .rodata @4696 */ -SECTION_RODATA static f32 const lit_4696 = 50.0f; -COMPILER_STRIP_GATE(0x80C24498, &lit_4696); + dBgS_ObjLinChk linchk; + linchk.SetActorPid(mBase.mBsPcId); -/* 80C24524-80C24530 -00001 000C+00 0/1 0/0 0/0 .data @4705 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4705[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__13daObjIceBlk_cFv, -}; -#pragma pop + for (int i = 0; i < 5; i++) { + static const Vec l_check_offsetXZ[] = { + {-145.0f, 0.0f, -145.0f}, {-145.0f, 0.0f, 145.0f}, {145.0f, 0.0f, 145.0f}, + {145.0f, 0.0f, -145.0f}, {0.0f, 0.0f, 0.0f}, + }; -/* 80C24530-80C2453C -00001 000C+00 0/1 0/0 0/0 .data @4706 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4706[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrderEvent__13daObjIceBlk_cFv, -}; -#pragma pop + start = current.pos + l_check_offsetXZ[i]; + end = start; + end.y -= 50.0f; -/* 80C2453C-80C24548 -00001 000C+00 0/1 0/0 0/0 .data @4707 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4707[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEvent__13daObjIceBlk_cFv, -}; -#pragma pop + linchk.Set(&start, &end, this); -/* 80C24548-80C24554 -00001 000C+00 0/1 0/0 0/0 .data @4708 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4708[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionDead__13daObjIceBlk_cFv, -}; -#pragma pop + if (dComIfG_Bgsp().LineCross(&linchk)) { + cM3dGPla plane; + dComIfG_Bgsp().GetTriPla(linchk, &plane); -/* 80C24554-80C24584 000084 0030+00 0/1 0/0 0/0 .data l_func$4704 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func_4704[48] = { - 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop + if (cBgW_CheckBGround(plane.mNormal.y)) { + return false; + } + } + } + + return true; +} + +/* 80C23A50-80C23B0C 001DF0 00BC+00 1/1 0/0 0/0 .text event_proc_call__13daObjIceBlk_cFv + */ +void daObjIceBlk_c::event_proc_call() { + typedef void (daObjIceBlk_c::*actionFunc)(void); + static actionFunc l_func[] = {&actionWait, &actionOrderEvent, &actionEvent, &actionDead}; + + (this->*l_func[mAction])(); +} + +/* 80C23B0C-80C23B70 001EAC 0064+00 1/0 0/0 0/0 .text actionWait__13daObjIceBlk_cFv */ +void daObjIceBlk_c::actionWait() { + if (mMode == MODE_PROC_WALK_e && mWalkType == WALK_PUSH) { + setAction(ACTION_ORDER_EVENT_e); + fopAcM_orderPotentialEvent(this, 2, 0, 0); + eventInfo.i_onCondition(fopAcCnd_NOEXEC_e); + } +} + +/* 80C23B70-80C23C1C 001F10 00AC+00 1/0 0/0 0/0 .text actionOrderEvent__13daObjIceBlk_cFv + */ +void daObjIceBlk_c::actionOrderEvent() { + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + + if (eventInfo.i_checkCommandDemoAccrpt()) { + setAction(ACTION_EVENT_e); + camera->mCamera.Stop(); + camera->mCamera.SetTrimSize(1); + } else if (mMode == MODE_PROC_WALK_e) { + fopAcM_orderPotentialEvent(this, 2, 0, 0); + eventInfo.i_onCondition(fopAcCnd_NOEXEC_e); + } else { + setAction(ACTION_WAIT_e); + } +} + +/* 80C23C1C-80C23CA0 001FBC 0084+00 1/0 0/0 0/0 .text actionEvent__13daObjIceBlk_cFv */ +void daObjIceBlk_c::actionEvent() { + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + + if (mMode != MODE_PROC_WALK_e) { + camera->mCamera.Start(); + camera->mCamera.SetTrimSize(0); + setAction(ACTION_WAIT_e); + dComIfGp_event_reset(); + } +} + +/* 80C23CA0-80C23CA4 002040 0004+00 1/0 0/0 0/0 .text actionDead__13daObjIceBlk_cFv */ +void daObjIceBlk_c::actionDead() {} + +/* 80C23CA4-80C23DA8 002044 0104+00 1/0 0/0 0/0 .text Draw__13daObjIceBlk_cFv */ +int daObjIceBlk_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + + dComIfGd_setListBG(); + + if (getSwbit2() != 0xFF && !fopAcM_isSwitch(this, getSwbit2())) { + if (mpIceModel != NULL) { + g_env_light.setLightTevColorType_MAJI(mpIceModel, &tevStr); + mDoExt_modelUpdateDL(mpIceModel); + daMirror_c::entry(mpIceModel); + } + } else { + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + mDoExt_modelUpdateDL(mpModel); + daMirror_c::entry(mpModel); + } + + dComIfGd_setList(); + return 1; +} + +/* 80C23DA8-80C23E68 002148 00C0+00 1/0 0/0 0/0 .text Delete__13daObjIceBlk_cFv */ +int daObjIceBlk_c::Delete() { + for (int i = 0; i < 2; i++) { + if (mColdEffEmitters[i] != NULL) { + mColdEffEmitters[i]->becomeInvalidEmitter(); + mColdEffEmitters[i] = NULL; + } + } + + if (mpIceBgW != NULL && mpIceBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpIceBgW); + } + + saveCurrentPos(); + mpBgW->SetPushPullCallback(NULL); + dComIfG_resDelete(&mPhase, l_arcName); + return 1; +} + +/* 80C23E68-80C23FCC 002208 0164+00 1/0 0/0 0/0 .text daObjIceBlk_create1st__FP13daObjIceBlk_c */ +static int daObjIceBlk_create1st(daObjIceBlk_c* i_this) { + fopAcM_SetupActor(i_this, daObjIceBlk_c); + return i_this->create1st(); +} + +/* 80C24210-80C24230 0025B0 0020+00 1/0 0/0 0/0 .text daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c + */ +static int daObjIceBlk_MoveBGDelete(daObjIceBlk_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80C24230-80C24250 0025D0 0020+00 1/0 0/0 0/0 .text daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c + */ +static int daObjIceBlk_MoveBGExecute(daObjIceBlk_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80C24250-80C2427C 0025F0 002C+00 1/0 0/0 0/0 .text daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c */ +static int daObjIceBlk_MoveBGDraw(daObjIceBlk_c* i_this) { + return i_this->MoveBGDraw(); +} /* 80C24584-80C245A4 -00001 0020+00 1/0 0/0 0/0 .data daObjIceBlk_METHODS */ static actor_method_class daObjIceBlk_METHODS = { - (process_method_func)daObjIceBlk_create1st__FP13daObjIceBlk_c, - (process_method_func)daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c, - (process_method_func)daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c, - 0, - (process_method_func)daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c, + (process_method_func)daObjIceBlk_create1st, (process_method_func)daObjIceBlk_MoveBGDelete, + (process_method_func)daObjIceBlk_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjIceBlk_MoveBGDraw, }; /* 80C245A4-80C245D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_IceBlock */ extern actor_process_profile_definition g_profile_Obj_IceBlock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_IceBlock, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(daObjIceBlk_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 535, // mPriority - &daObjIceBlk_METHODS, // sub_method - 0x00040500, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_IceBlock, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjIceBlk_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 535, // mPriority + &daObjIceBlk_METHODS, // sub_method + 0x00040500, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C245D4-80C245E0 000104 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, -}; - -/* 80C245E0-80C245EC 000110 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, -}; - -/* 80C245EC-80C245F8 00011C 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, -}; - -/* 80C245F8-80C24628 000128 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_80C242D4, - (void*)NULL, - (void*)NULL, - (void*)func_80C242E4, - (void*)NULL, - (void*)NULL, - (void*)func_80C242DC, -}; - -/* 80C24628-80C24634 000158 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, -}; - -/* 80C24634-80C24640 000164 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, -}; - -/* 80C24640-80C24664 000170 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_80C242CC, - (void*)NULL, - (void*)NULL, - (void*)func_80C242C4, -}; - -/* 80C24664-80C24670 000194 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGPla */ -SECTION_DATA extern void* __vt__8cM3dGPla[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGPlaFv, -}; - -/* 80C238B0-80C23A08 001C50 0158+00 1/1 0/0 0/0 .text checkFall__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::checkFall() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/checkFall__13daObjIceBlk_cFv.s" -} -#pragma pop - -/* 80C23A08-80C23A50 001DA8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGPlaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGPla::~cM3dGPla() { -extern "C" asm void __dt__8cM3dGPlaFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGPlaFv.s" -} -#pragma pop - -/* 80C23A50-80C23B0C 001DF0 00BC+00 1/1 0/0 0/0 .text event_proc_call__13daObjIceBlk_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::event_proc_call() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/event_proc_call__13daObjIceBlk_cFv.s" -} -#pragma pop - -/* 80C23B0C-80C23B70 001EAC 0064+00 1/0 0/0 0/0 .text actionWait__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::actionWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionWait__13daObjIceBlk_cFv.s" -} -#pragma pop - -/* 80C23B70-80C23C1C 001F10 00AC+00 1/0 0/0 0/0 .text actionOrderEvent__13daObjIceBlk_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::actionOrderEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionOrderEvent__13daObjIceBlk_cFv.s" -} -#pragma pop - -/* 80C23C1C-80C23CA0 001FBC 0084+00 1/0 0/0 0/0 .text actionEvent__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::actionEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/actionEvent__13daObjIceBlk_cFv.s" -} -#pragma pop - -/* 80C23CA0-80C23CA4 002040 0004+00 1/0 0/0 0/0 .text actionDead__13daObjIceBlk_cFv */ -void daObjIceBlk_c::actionDead() { - /* empty function */ -} - -/* 80C23CA4-80C23DA8 002044 0104+00 1/0 0/0 0/0 .text Draw__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Draw__13daObjIceBlk_cFv.s" -} -#pragma pop - -/* 80C23DA8-80C23E68 002148 00C0+00 1/0 0/0 0/0 .text Delete__13daObjIceBlk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjIceBlk_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/Delete__13daObjIceBlk_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C24670-80C24698 0001A0 0028+00 1/1 0/0 0/0 .data __vt__13daObjIceBlk_c */ -SECTION_DATA extern void* __vt__13daObjIceBlk_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__13daObjIceBlk_cFv, - (void*)Create__13daObjIceBlk_cFv, - (void*)Execute__13daObjIceBlk_cFPPA3_A4_f, - (void*)Draw__13daObjIceBlk_cFv, - (void*)Delete__13daObjIceBlk_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C23E68-80C23FCC 002208 0164+00 1/0 0/0 0/0 .text daObjIceBlk_create1st__FP13daObjIceBlk_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjIceBlk_create1st(daObjIceBlk_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_create1st__FP13daObjIceBlk_c.s" -} -#pragma pop - -/* 80C23FCC-80C24044 00236C 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() { -extern "C" asm void __dt__14dBgS_ObjGndChkFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__14dBgS_ObjGndChkFv.s" -} -#pragma pop - -/* 80C24044-80C2408C 0023E4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80C2408C-80C240D4 00242C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80C240D4-80C24130 002474 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() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80C24130-80C241A0 0024D0 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() { -extern "C" asm void __dt__12dBgS_AcchCirFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 80C241A0-80C24210 002540 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() { -extern "C" asm void __dt__12dBgS_ObjAcchFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80C24210-80C24230 0025B0 0020+00 1/0 0/0 0/0 .text daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjIceBlk_MoveBGDelete(daObjIceBlk_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c.s" -} -#pragma pop - -/* 80C24230-80C24250 0025D0 0020+00 1/0 0/0 0/0 .text daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjIceBlk_MoveBGExecute(daObjIceBlk_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c.s" -} -#pragma pop - -/* 80C24250-80C2427C 0025F0 002C+00 1/0 0/0 0/0 .text daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjIceBlk_MoveBGDraw(daObjIceBlk_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c.s" -} -#pragma pop - -/* 80C2427C-80C242C4 00261C 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() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80C242C4-80C242CC 002664 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_80C242C4() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242C4.s" -} -#pragma pop - -/* 80C242CC-80C242D4 00266C 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_80C242CC() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242CC.s" -} -#pragma pop - -/* 80C242D4-80C242DC 002674 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_80C242D4() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242D4.s" -} -#pragma pop - -/* 80C242DC-80C242E4 00267C 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_80C242DC() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242DC.s" -} -#pragma pop - -/* 80C242E4-80C242EC 002684 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_80C242E4() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/func_80C242E4.s" -} -#pragma pop - -/* 80C2449C-80C2449C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp deleted file mode 100644 index 1e188ea000..0000000000 --- a/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: unknown_translation_unit_bss -// - -#include "rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 struct_80C24698[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C24698-80C2469C -00001 0004+00 0/0 2/2 0/0 .bss None */ -/* 80C24698 0001+00 data_80C24698 None */ -/* 80C24699 0003+00 data_80C24699 None */ -extern u8 struct_80C24698[4]; -u8 struct_80C24698[4]; diff --git a/src/d/a/d_a_alink_grab.inc b/src/d/a/d_a_alink_grab.inc index 2d5de4aae0..8a67c37e28 100644 --- a/src/d/a/d_a_alink_grab.inc +++ b/src/d/a/d_a_alink_grab.inc @@ -1,3 +1,6 @@ +#include "d/a/d_a_alink.h" +#include "d/com/d_com_inf_game.h" + /* 800E3830-800E3858 0DE170 0028+00 2/2 0/0 0/0 .text daAlink_checkLightBallA__FP10fopAc_ac_c */ static bool daAlink_checkLightBallA(fopAc_ac_c* p_actor) { if (fopAcM_GetName(p_actor) == PROC_Obj_Carry && @@ -127,8 +130,7 @@ BOOL daAlink_c::checkGrabCarryActor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkGrabSlowMoveActor() { - nofralloc +asm void daAlink_c::checkGrabSlowMoveActor(){nofralloc #include "asm/d/a/d_a_alink/checkGrabSlowMoveActor__9daAlink_cFv.s" } #pragma pop @@ -150,8 +152,7 @@ BOOL daAlink_c::checkGrabSideActor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setGrabUpperAnime(f32 param_0) { - nofralloc +asm void daAlink_c::setGrabUpperAnime(f32 param_0){nofralloc #include "asm/d/a/d_a_alink/setGrabUpperAnime__9daAlink_cFf.s" } #pragma pop @@ -261,8 +262,7 @@ asm void daAlink_c::setGrabUpperSpeedRate() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setCarryArmAngle(f32 param_0, f32 param_1) { - nofralloc +asm void daAlink_c::setCarryArmAngle(f32 param_0, f32 param_1){nofralloc #include "asm/d/a/d_a_alink/setCarryArmAngle__9daAlink_cFff.s" } #pragma pop @@ -485,8 +485,7 @@ asm int daAlink_c::procGrabStandInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int daAlink_c::procGrabStand() { - nofralloc +asm int daAlink_c::procGrabStand(){nofralloc #include "asm/d/a/d_a_alink/procGrabStand__9daAlink_cFv.s" } #pragma pop @@ -576,8 +575,7 @@ asm int daAlink_c::procPickPut() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSetChainPullAnime(s16 param_0) { - nofralloc +asm void daAlink_c::checkSetChainPullAnime(s16 param_0){nofralloc #include "asm/d/a/d_a_alink/checkSetChainPullAnime__9daAlink_cFs.s" } #pragma pop @@ -712,14 +710,42 @@ BOOL daAlink_c::wallGrabButton() { /* 800E7F3C-800E80A4 0E287C 0168+00 4/4 0/0 0/0 .text * setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setPushPullKeepData(dBgW_Base::PushPullLabel param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli.s" +int daAlink_c::setPushPullKeepData(dBgW_Base::PushPullLabel i_label, int param_1) { + if (i_label != dBgW::PPLABEL_NONE) { + if (checkPowerGloveGet()) { + cLib_onBit(i_label, dBgW::PPLABEL_HEAVY); + } + + if (field_0x3198) { + cLib_onBit(i_label, dBgW::PPLABEL_4); + } + } + + fopAc_ac_c* pp_actor = dComIfG_Bgsp().PushPullCallBack(mPolyInfo1, this, shape_angle.y, i_label); + if (pp_actor == NULL) { + return 0; + } + + cXyz unused; + if (i_label != dBgW::PPLABEL_NONE || param_1) { + if (pp_actor->shape_angle.y != mProcVar2.field_0x300c) { + s16 var_r28 = pp_actor->shape_angle.y - mProcVar2.field_0x300c; + mProcVar3.field_0x300e.x += var_r28; + + current.pos.x = field_0x37c8.x + field_0x347c * cM_ssin(mProcVar3.field_0x300e.x); + current.pos.z = field_0x37c8.z + field_0x347c * cM_scos(mProcVar3.field_0x300e.x); + shape_angle.y += var_r28; + current.angle.y += var_r28; + } + + current.pos.x += pp_actor->current.pos.x - field_0x37c8.x; + current.pos.z += pp_actor->current.pos.z - field_0x37c8.z; + } + + field_0x37c8 = pp_actor->current.pos; + mProcVar2.field_0x300c = pp_actor->shape_angle.y; + return 1; } -#pragma pop /* 800E80A4-800E8148 0E29E4 00A4+00 2/2 0/0 0/0 .text checkPushPullTurnBlock__9daAlink_cFv */ #pragma push diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index e7d089336a..6ce7b939d7 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -848,8 +848,8 @@ void dBgS::ArrowStickCallBack(cBgS_PolyInfo const& poly, fopAc_ac_c* param_1, cX /* 80075C6C-80075D0C 0705AC 00A0+00 0/0 1/1 0/0 .text * PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ -bool dBgS::PushPullCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1, s16 param_2, - dBgW_Base::PushPullLabel param_3) { +fopAc_ac_c* dBgS::PushPullCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* i_pushActor, s16 i_angle, + dBgW_Base::PushPullLabel i_label) { u16 bg_index = param_0.GetBgIndex(); dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr; if (!base->ChkUsed()) { @@ -864,8 +864,8 @@ bool dBgS::PushPullCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1, s return false; } - return base->GetPushPullCallback()(m_chk_element[bg_index].m_actor_ptr, param_1, param_2, - param_3); + return base->GetPushPullCallback()(m_chk_element[bg_index].m_actor_ptr, i_pushActor, i_angle, + i_label); } /* 80075D0C-80075D7C 07064C 0070+00 0/0 8/8 1/1 .text dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo */