From e1a0f636e5c68d53b4e00a4cff85700f6588ef1b Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Fri, 21 Apr 2023 07:18:49 -0700 Subject: [PATCH] e_ym / obj_volcball wip. obj_mgate done (#318) * e_ym / obj_volcball wip. obj_mgate done * remove asm --------- Co-authored-by: root --- .../d_a_e_ym/d_a_e_ym/_delete__8daE_YM_cFv.s | 43 - .../d_a_e_ym/bckSetFly__8daE_YM_cFiUcff.s | 42 - .../d_a_e_ym/bckSet__8daE_YM_cFiUcff.s | 92 - .../d_a_e_ym/checkBck__8daE_YM_cFPCci.s | 24 - .../checkElectricStart__8daE_YM_cFv.s | 30 - .../checkFrinedSamePos__8daE_YM_cFv.s | 18 - .../d_a_e_ym/daE_YM_Create__FP8daE_YM_c.s | 9 - .../d_a_e_ym/daE_YM_Delete__FP8daE_YM_c.s | 9 - .../d_a_e_ym/daE_YM_Draw__FP8daE_YM_c.s | 9 - .../d_a_e_ym/daE_YM_Execute__FP8daE_YM_c.s | 9 - .../d_a_e_ym/damage_check__8daE_YM_cFv.s | 105 - .../d_a_e_ym/d_a_e_ym/execute__8daE_YM_cFv.s | 105 - .../d_a_e_ym/d_a_e_ym/initFly__8daE_YM_cFv.s | 31 - .../d_a_e_ym/d_a_e_ym/mtx_set__8daE_YM_cFv.s | 35 - .../a/e/d_a_e_ym/d_a_e_ym/s_obj_sub__FPvPv.s | 56 - .../d/a/e/d_a_e_ym/d_a_e_ym/s_ym_sub__FPvPv.s | 54 - .../d_a_e_ym/setActionMode__8daE_YM_cFi.s | 11 - .../d_a_e_ym/setAppear__8daE_YM_cFv.s | 11 - .../d_a_e_ym/setHideType__8daE_YM_cFv.s | 48 - .../d_a_e_ym/setInclination__8daE_YM_cFv.s | 28 - .../d_a_e_ym/setLockByCargo__8daE_YM_cFv.s | 4 - .../d_a_e_ym/setNormalCc__8daE_YM_cFv.s | 7 - .../d_a_e_ym/useHeapInit__FP10fopAc_ac_c.s | 9 - .../CreateHeap__12daObjMGate_cFv.s | 60 - .../d_a_obj_mgate/Create__12daObjMGate_cFv.s | 20 - .../d_a_obj_mgate/Delete__12daObjMGate_cFv.s | 24 - .../d_a_obj_mgate/Draw__12daObjMGate_cFv.s | 53 - .../Execute__12daObjMGate_cFPPA3_A4_f.s | 184 -- .../create1st__12daObjMGate_cFv.s | 67 - ...aObjMGate_MoveBGDelete__FP12daObjMGate_c.s | 9 - .../daObjMGate_MoveBGDraw__FP12daObjMGate_c.s | 12 - ...ObjMGate_MoveBGExecute__FP12daObjMGate_c.s | 9 - .../daObjMGate_create1st__FP12daObjMGate_c.s | 27 - .../initBaseMtx__12daObjMGate_cFv.s | 33 - .../setBaseMtx__12daObjMGate_cFv.s | 78 - .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../CreateHeap__15daObjVolcBall_cFv.s | 46 - .../_delete__15daObjVolcBall_cFv.s | 42 - .../actionStop__15daObjVolcBall_cFv.s | 51 - .../actionSwWait__15daObjVolcBall_cFv.s | 44 - .../action__15daObjVolcBall_cFv.s | 61 - .../daObjVolcBall_Create__FP10fopAc_ac_c.s | 9 - ...aObjVolcBall_Delete__FP15daObjVolcBall_c.s | 9 - .../daObjVolcBall_Draw__FP15daObjVolcBall_c.s | 9 - ...ObjVolcBall_Execute__FP15daObjVolcBall_c.s | 9 - .../endFallEffect__15daObjVolcBall_cFi.s | 28 - .../eventStart__15daObjVolcBall_cFv.s | 20 - .../execute__15daObjVolcBall_cFv.s | 25 - .../getData__15daObjVolcBall_cFv.s | 7 - .../initActionEnd__15daObjVolcBall_cFv.s | 30 - ...nitActionPlayerWait__15daObjVolcBall_cFv.s | 4 - .../initActionSwWait__15daObjVolcBall_cFv.s | 4 - .../initActionWarning__15daObjVolcBall_cFv.s | 11 - .../initBaseMtx__15daObjVolcBall_cFv.s | 9 - .../d_a_obj_volcball/search_big_volc__FPvPv.s | 23 - .../setBaseMtx__15daObjVolcBall_cFv.s | 34 - .../setEruptEffect__15daObjVolcBall_cFi.s | 46 - .../setFallEffect__15daObjVolcBall_cFi.s | 66 - include/JSystem/J3DGraphBase/J3DMaterial.h | 1 + include/SSystem/SComponent/c_cc_d.h | 3 +- include/d/a/d_a_player.h | 5 +- include/d/bg/d_bg_s.h | 2 +- include/d/bg/d_bg_s_movebg_actor.h | 2 + include/d/d_lib.h | 6 +- include/d/d_vibration.h | 2 +- include/d/event/d_event_lib.h | 5 + include/d/particle/d_particle.h | 1 + include/m_Do/m_Do_ext.h | 1 + include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h | 155 +- .../rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h | 44 +- libs/SSystem/SComponent/c_cc_d.cpp | 2 +- rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp | 820 +++++-- rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp | 606 ++---- rel/d/a/obj/d_a_obj_volcball/Makefile | 2 - .../obj/d_a_obj_volcball/d_a_obj_volcball.cpp | 1928 ++++++++++------- .../unknown_translation_unit_bss.cpp | 27 - src/d/a/d_a_player.cpp | 2 +- src/d/d_lib.cpp | 2 +- src/d/d_vibration.cpp | 8 +- src/d/menu/d_menu_dmap.cpp | 2 - 80 files changed, 2121 insertions(+), 3466 deletions(-) delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/_delete__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/bckSetFly__8daE_YM_cFiUcff.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/bckSet__8daE_YM_cFiUcff.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkBck__8daE_YM_cFPCci.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkElectricStart__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkFrinedSamePos__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Create__FP8daE_YM_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Delete__FP8daE_YM_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Draw__FP8daE_YM_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Execute__FP8daE_YM_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/damage_check__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/execute__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/initFly__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/mtx_set__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/s_obj_sub__FPvPv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/s_ym_sub__FPvPv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setActionMode__8daE_YM_cFi.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setAppear__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setHideType__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setInclination__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setLockByCargo__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setNormalCc__8daE_YM_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/CreateHeap__12daObjMGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Create__12daObjMGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Delete__12daObjMGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Draw__12daObjMGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Execute__12daObjMGate_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/create1st__12daObjMGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGDelete__FP12daObjMGate_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGDraw__FP12daObjMGate_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGExecute__FP12daObjMGate_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_create1st__FP12daObjMGate_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/initBaseMtx__12daObjMGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/setBaseMtx__12daObjMGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/CreateHeap__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/_delete__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionStop__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionSwWait__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/action__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Delete__FP15daObjVolcBall_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Draw__FP15daObjVolcBall_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Execute__FP15daObjVolcBall_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/endFallEffect__15daObjVolcBall_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/eventStart__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/execute__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/getData__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionEnd__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionPlayerWait__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionSwWait__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionWarning__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initBaseMtx__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/search_big_volc__FPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setBaseMtx__15daObjVolcBall_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setEruptEffect__15daObjVolcBall_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setFallEffect__15daObjVolcBall_cFi.s delete mode 100644 rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.cpp diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/_delete__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/_delete__8daE_YM_cFv.s deleted file mode 100644 index d958d9e87d..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/_delete__8daE_YM_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80813A38: -/* 80813A38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80813A3C 7C 08 02 A6 */ mflr r0 -/* 80813A40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80813A44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80813A48 7C 7F 1B 78 */ mr r31, r3 -/* 80813A4C 88 03 06 CA */ lbz r0, 0x6ca(r3) -/* 80813A50 28 00 00 01 */ cmplwi r0, 1 -/* 80813A54 40 82 00 18 */ bne lbl_80813A6C -/* 80813A58 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 80813A5C 3C 80 80 81 */ lis r4, d_a_e_ym__stringBase0@ha /* 0x80815AEC@ha */ -/* 80813A60 38 84 5A EC */ addi r4, r4, d_a_e_ym__stringBase0@l /* 0x80815AEC@l */ -/* 80813A64 4B 81 95 A5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80813A68 48 00 00 18 */ b lbl_80813A80 -lbl_80813A6C: -/* 80813A6C 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 80813A70 3C 80 80 81 */ lis r4, d_a_e_ym__stringBase0@ha /* 0x80815AEC@ha */ -/* 80813A74 38 84 5A EC */ addi r4, r4, d_a_e_ym__stringBase0@l /* 0x80815AEC@l */ -/* 80813A78 38 84 00 05 */ addi r4, r4, 5 -/* 80813A7C 4B 81 95 8D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -lbl_80813A80: -/* 80813A80 88 1F 0A F4 */ lbz r0, 0xaf4(r31) -/* 80813A84 28 00 00 00 */ cmplwi r0, 0 -/* 80813A88 41 82 00 10 */ beq lbl_80813A98 -/* 80813A8C 38 00 00 00 */ li r0, 0 -/* 80813A90 3C 60 80 81 */ lis r3, data_80815D28@ha /* 0x80815D28@ha */ -/* 80813A94 98 03 5D 28 */ stb r0, data_80815D28@l(r3) /* 0x80815D28@l */ -lbl_80813A98: -/* 80813A98 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 80813A9C 28 00 00 00 */ cmplwi r0, 0 -/* 80813AA0 41 82 00 18 */ beq lbl_80813AB8 -/* 80813AA4 38 7F 05 BC */ addi r3, r31, 0x5bc -/* 80813AA8 81 9F 05 BC */ lwz r12, 0x5bc(r31) -/* 80813AAC 81 8C 00 08 */ lwz r12, 8(r12) -/* 80813AB0 7D 89 03 A6 */ mtctr r12 -/* 80813AB4 4E 80 04 21 */ bctrl -lbl_80813AB8: -/* 80813AB8 38 60 00 01 */ li r3, 1 -/* 80813ABC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80813AC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80813AC4 7C 08 03 A6 */ mtlr r0 -/* 80813AC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80813ACC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/bckSetFly__8daE_YM_cFiUcff.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/bckSetFly__8daE_YM_cFiUcff.s deleted file mode 100644 index e4a3621f87..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/bckSetFly__8daE_YM_cFiUcff.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80808328: -/* 80808328 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8080832C 7C 08 02 A6 */ mflr r0 -/* 80808330 90 01 00 34 */ stw r0, 0x34(r1) -/* 80808334 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80808338 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 8080833C DB C1 00 10 */ stfd f30, 0x10(r1) -/* 80808340 F3 C1 00 18 */ psq_st f30, 24(r1), 0, 0 /* qr0 */ -/* 80808344 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80808348 93 C1 00 08 */ stw r30, 8(r1) -/* 8080834C 7C 7E 1B 78 */ mr r30, r3 -/* 80808350 7C BF 2B 78 */ mr r31, r5 -/* 80808354 FF C0 08 90 */ fmr f30, f1 -/* 80808358 FF E0 10 90 */ fmr f31, f2 -/* 8080835C 3C 60 80 81 */ lis r3, d_a_e_ym__stringBase0@ha /* 0x80815AEC@ha */ -/* 80808360 38 63 5A EC */ addi r3, r3, d_a_e_ym__stringBase0@l /* 0x80815AEC@l */ -/* 80808364 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80808368 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8080836C 3C A5 00 02 */ addis r5, r5, 2 -/* 80808370 38 C0 00 80 */ li r6, 0x80 -/* 80808374 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80808378 4B 83 3F 75 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8080837C 7C 64 1B 78 */ mr r4, r3 -/* 80808380 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 80808384 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80808388 FC 20 F0 90 */ fmr f1, f30 -/* 8080838C FC 40 F8 90 */ fmr f2, f31 -/* 80808390 3C C0 80 81 */ lis r6, lit_3926@ha /* 0x80815998@ha */ -/* 80808394 C0 66 59 98 */ lfs f3, lit_3926@l(r6) /* 0x80815998@l */ -/* 80808398 3C C0 80 81 */ lis r6, lit_3988@ha /* 0x808159E0@ha */ -/* 8080839C C0 86 59 E0 */ lfs f4, lit_3988@l(r6) /* 0x808159E0@l */ -/* 808083A0 4B 80 8A D1 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 808083A4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 808083A8 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 808083AC E3 C1 00 18 */ psq_l f30, 24(r1), 0, 0 /* qr0 */ -/* 808083B0 CB C1 00 10 */ lfd f30, 0x10(r1) -/* 808083B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808083B8 83 C1 00 08 */ lwz r30, 8(r1) -/* 808083BC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 808083C0 7C 08 03 A6 */ mtlr r0 -/* 808083C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 808083C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/bckSet__8daE_YM_cFiUcff.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/bckSet__8daE_YM_cFiUcff.s deleted file mode 100644 index df9654fa4d..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/bckSet__8daE_YM_cFiUcff.s +++ /dev/null @@ -1,92 +0,0 @@ -lbl_808081E0: -/* 808081E0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 808081E4 7C 08 02 A6 */ mflr r0 -/* 808081E8 90 01 00 44 */ stw r0, 0x44(r1) -/* 808081EC DB E1 00 30 */ stfd f31, 0x30(r1) -/* 808081F0 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 808081F4 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 808081F8 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 808081FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80808200 4B B5 9F DD */ bl _savegpr_29 -/* 80808204 7C 7D 1B 78 */ mr r29, r3 -/* 80808208 7C BE 2B 78 */ mr r30, r5 -/* 8080820C FF C0 08 90 */ fmr f30, f1 -/* 80808210 FF E0 10 90 */ fmr f31, f2 -/* 80808214 3C 60 80 81 */ lis r3, lit_3925@ha /* 0x80815994@ha */ -/* 80808218 3B E3 59 94 */ addi r31, r3, lit_3925@l /* 0x80815994@l */ -/* 8080821C 88 1D 06 CA */ lbz r0, 0x6ca(r29) -/* 80808220 28 00 00 01 */ cmplwi r0, 1 -/* 80808224 40 82 00 98 */ bne lbl_808082BC -/* 80808228 2C 04 00 0E */ cmpwi r4, 0xe -/* 8080822C 41 82 00 40 */ beq lbl_8080826C -/* 80808230 40 80 00 10 */ bge lbl_80808240 -/* 80808234 2C 04 00 06 */ cmpwi r4, 6 -/* 80808238 41 82 00 18 */ beq lbl_80808250 -/* 8080823C 48 00 00 38 */ b lbl_80808274 -lbl_80808240: -/* 80808240 2C 04 00 10 */ cmpwi r4, 0x10 -/* 80808244 41 82 00 1C */ beq lbl_80808260 -/* 80808248 40 80 00 2C */ bge lbl_80808274 -/* 8080824C 48 00 00 0C */ b lbl_80808258 -lbl_80808250: -/* 80808250 38 80 00 08 */ li r4, 8 -/* 80808254 48 00 00 24 */ b lbl_80808278 -lbl_80808258: -/* 80808258 38 80 00 09 */ li r4, 9 -/* 8080825C 48 00 00 1C */ b lbl_80808278 -lbl_80808260: -/* 80808260 C3 FF 00 48 */ lfs f31, 0x48(r31) -/* 80808264 38 80 00 0A */ li r4, 0xa -/* 80808268 48 00 00 10 */ b lbl_80808278 -lbl_8080826C: -/* 8080826C 38 80 00 0A */ li r4, 0xa -/* 80808270 48 00 00 08 */ b lbl_80808278 -lbl_80808274: -/* 80808274 38 80 00 09 */ li r4, 9 -lbl_80808278: -/* 80808278 3C 60 80 81 */ lis r3, d_a_e_ym__stringBase0@ha /* 0x80815AEC@ha */ -/* 8080827C 38 63 5A EC */ addi r3, r3, d_a_e_ym__stringBase0@l /* 0x80815AEC@l */ -/* 80808280 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80808284 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80808288 3C A5 00 02 */ addis r5, r5, 2 -/* 8080828C 38 C0 00 80 */ li r6, 0x80 -/* 80808290 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80808294 4B 83 40 59 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80808298 7C 64 1B 78 */ mr r4, r3 -/* 8080829C 80 7D 05 B4 */ lwz r3, 0x5b4(r29) -/* 808082A0 57 C5 06 3E */ clrlwi r5, r30, 0x18 -/* 808082A4 FC 20 F0 90 */ fmr f1, f30 -/* 808082A8 FC 40 F8 90 */ fmr f2, f31 -/* 808082AC C0 7F 00 04 */ lfs f3, 4(r31) -/* 808082B0 C0 9F 00 4C */ lfs f4, 0x4c(r31) -/* 808082B4 4B 80 8B BD */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 808082B8 48 00 00 48 */ b lbl_80808300 -lbl_808082BC: -/* 808082BC 3C 60 80 81 */ lis r3, d_a_e_ym__stringBase0@ha /* 0x80815AEC@ha */ -/* 808082C0 38 63 5A EC */ addi r3, r3, d_a_e_ym__stringBase0@l /* 0x80815AEC@l */ -/* 808082C4 38 63 00 05 */ addi r3, r3, 5 -/* 808082C8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 808082CC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 808082D0 3C A5 00 02 */ addis r5, r5, 2 -/* 808082D4 38 C0 00 80 */ li r6, 0x80 -/* 808082D8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 808082DC 4B 83 40 11 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 808082E0 7C 64 1B 78 */ mr r4, r3 -/* 808082E4 80 7D 05 B4 */ lwz r3, 0x5b4(r29) -/* 808082E8 57 C5 06 3E */ clrlwi r5, r30, 0x18 -/* 808082EC FC 20 F0 90 */ fmr f1, f30 -/* 808082F0 FC 40 F8 90 */ fmr f2, f31 -/* 808082F4 C0 7F 00 04 */ lfs f3, 4(r31) -/* 808082F8 C0 9F 00 4C */ lfs f4, 0x4c(r31) -/* 808082FC 4B 80 8B 75 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -lbl_80808300: -/* 80808300 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 80808304 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80808308 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 8080830C CB C1 00 20 */ lfd f30, 0x20(r1) -/* 80808310 39 61 00 20 */ addi r11, r1, 0x20 -/* 80808314 4B B5 9F 15 */ bl _restgpr_29 -/* 80808318 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8080831C 7C 08 03 A6 */ mtlr r0 -/* 80808320 38 21 00 40 */ addi r1, r1, 0x40 -/* 80808324 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkBck__8daE_YM_cFPCci.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkBck__8daE_YM_cFPCci.s deleted file mode 100644 index e85f1f82b3..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkBck__8daE_YM_cFPCci.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80808184: -/* 80808184 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80808188 7C 08 02 A6 */ mflr r0 -/* 8080818C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80808190 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80808194 7C 7F 1B 78 */ mr r31, r3 -/* 80808198 7C 83 23 78 */ mr r3, r4 -/* 8080819C 7C A4 2B 78 */ mr r4, r5 -/* 808081A0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 808081A4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 808081A8 3C A5 00 02 */ addis r5, r5, 2 -/* 808081AC 38 C0 00 80 */ li r6, 0x80 -/* 808081B0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 808081B4 4B 83 41 39 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 808081B8 80 9F 05 B4 */ lwz r4, 0x5b4(r31) -/* 808081BC 80 04 00 08 */ lwz r0, 8(r4) -/* 808081C0 7C 00 18 50 */ subf r0, r0, r3 -/* 808081C4 7C 00 00 34 */ cntlzw r0, r0 -/* 808081C8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 808081CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808081D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808081D4 7C 08 03 A6 */ mtlr r0 -/* 808081D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 808081DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkElectricStart__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkElectricStart__8daE_YM_cFv.s deleted file mode 100644 index 37468557d6..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkElectricStart__8daE_YM_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80810DF8: -/* 80810DF8 88 03 06 A1 */ lbz r0, 0x6a1(r3) -/* 80810DFC 28 00 00 01 */ cmplwi r0, 1 -/* 80810E00 40 82 00 54 */ bne lbl_80810E54 -/* 80810E04 80 03 06 90 */ lwz r0, 0x690(r3) -/* 80810E08 2C 00 00 00 */ cmpwi r0, 0 -/* 80810E0C 41 82 00 1C */ beq lbl_80810E28 -/* 80810E10 2C 00 00 05 */ cmpwi r0, 5 -/* 80810E14 41 82 00 14 */ beq lbl_80810E28 -/* 80810E18 38 00 00 00 */ li r0, 0 -/* 80810E1C 98 03 06 C9 */ stb r0, 0x6c9(r3) -/* 80810E20 B0 03 07 08 */ sth r0, 0x708(r3) -/* 80810E24 4E 80 00 20 */ blr -lbl_80810E28: -/* 80810E28 A8 83 07 08 */ lha r4, 0x708(r3) -/* 80810E2C 2C 04 00 00 */ cmpwi r4, 0 -/* 80810E30 4D 82 00 20 */ beqlr -/* 80810E34 38 04 FF FF */ addi r0, r4, -1 -/* 80810E38 B0 03 07 08 */ sth r0, 0x708(r3) -/* 80810E3C A8 03 07 08 */ lha r0, 0x708(r3) -/* 80810E40 2C 00 00 00 */ cmpwi r0, 0 -/* 80810E44 4C 82 00 20 */ bnelr -/* 80810E48 38 00 00 01 */ li r0, 1 -/* 80810E4C 98 03 06 C9 */ stb r0, 0x6c9(r3) -/* 80810E50 4E 80 00 20 */ blr -lbl_80810E54: -/* 80810E54 38 00 00 00 */ li r0, 0 -/* 80810E58 98 03 06 C9 */ stb r0, 0x6c9(r3) -/* 80810E5C B0 03 07 08 */ sth r0, 0x708(r3) -/* 80810E60 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkFrinedSamePos__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkFrinedSamePos__8daE_YM_cFv.s deleted file mode 100644 index 3a7232bd07..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkFrinedSamePos__8daE_YM_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80812FCC: -/* 80812FCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80812FD0 7C 08 02 A6 */ mflr r0 -/* 80812FD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80812FD8 7C 64 1B 78 */ mr r4, r3 -/* 80812FDC 88 03 06 AA */ lbz r0, 0x6aa(r3) -/* 80812FE0 28 00 00 00 */ cmplwi r0, 0 -/* 80812FE4 40 82 00 18 */ bne lbl_80812FFC -/* 80812FE8 60 00 00 80 */ ori r0, r0, 0x80 -/* 80812FEC 98 04 06 AA */ stb r0, 0x6aa(r4) -/* 80812FF0 3C 60 80 81 */ lis r3, s_ym_sub__FPvPv@ha /* 0x80812F0C@ha */ -/* 80812FF4 38 63 2F 0C */ addi r3, r3, s_ym_sub__FPvPv@l /* 0x80812F0C@l */ -/* 80812FF8 4B 80 E3 41 */ bl fpcEx_Search__FPFPvPv_PvPv -lbl_80812FFC: -/* 80812FFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80813000 7C 08 03 A6 */ mtlr r0 -/* 80813004 38 21 00 10 */ addi r1, r1, 0x10 -/* 80813008 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Create__FP8daE_YM_c.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Create__FP8daE_YM_c.s deleted file mode 100644 index db3770d314..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Create__FP8daE_YM_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_808153F0: -/* 808153F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808153F4 7C 08 02 A6 */ mflr r0 -/* 808153F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 808153FC 4B FF F7 A9 */ bl create__8daE_YM_cFv -/* 80815400 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80815404 7C 08 03 A6 */ mtlr r0 -/* 80815408 38 21 00 10 */ addi r1, r1, 0x10 -/* 8081540C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Delete__FP8daE_YM_c.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Delete__FP8daE_YM_c.s deleted file mode 100644 index bcad78f234..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Delete__FP8daE_YM_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80813AD0: -/* 80813AD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80813AD4 7C 08 02 A6 */ mflr r0 -/* 80813AD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80813ADC 4B FF FF 5D */ bl _delete__8daE_YM_cFv -/* 80813AE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80813AE4 7C 08 03 A6 */ mtlr r0 -/* 80813AE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80813AEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Draw__FP8daE_YM_c.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Draw__FP8daE_YM_c.s deleted file mode 100644 index 15cffb42f0..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Draw__FP8daE_YM_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80808678: -/* 80808678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8080867C 7C 08 02 A6 */ mflr r0 -/* 80808680 90 01 00 14 */ stw r0, 0x14(r1) -/* 80808684 4B FF FD 49 */ bl draw__8daE_YM_cFv -/* 80808688 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8080868C 7C 08 03 A6 */ mtlr r0 -/* 80808690 38 21 00 10 */ addi r1, r1, 0x10 -/* 80808694 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Execute__FP8daE_YM_c.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Execute__FP8daE_YM_c.s deleted file mode 100644 index 8775a4e275..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Execute__FP8daE_YM_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80813A10: -/* 80813A10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80813A14 7C 08 02 A6 */ mflr r0 -/* 80813A18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80813A1C 4B FF FE 91 */ bl execute__8daE_YM_cFv -/* 80813A20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80813A24 7C 08 03 A6 */ mtlr r0 -/* 80813A28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80813A2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/damage_check__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/damage_check__8daE_YM_cFv.s deleted file mode 100644 index 8e451f8983..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/damage_check__8daE_YM_cFv.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_8080BB7C: -/* 8080BB7C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8080BB80 7C 08 02 A6 */ mflr r0 -/* 8080BB84 90 01 00 24 */ stw r0, 0x24(r1) -/* 8080BB88 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8080BB8C 7C 7F 1B 78 */ mr r31, r3 -/* 8080BB90 A8 03 06 F4 */ lha r0, 0x6f4(r3) -/* 8080BB94 2C 00 00 00 */ cmpwi r0, 0 -/* 8080BB98 40 82 01 50 */ bne lbl_8080BCE8 -/* 8080BB9C 80 1F 06 90 */ lwz r0, 0x690(r31) -/* 8080BBA0 2C 00 00 12 */ cmpwi r0, 0x12 -/* 8080BBA4 41 82 01 44 */ beq lbl_8080BCE8 -/* 8080BBA8 2C 00 00 03 */ cmpwi r0, 3 -/* 8080BBAC 40 82 00 08 */ bne lbl_8080BBB4 -/* 8080BBB0 48 00 01 38 */ b lbl_8080BCE8 -lbl_8080BBB4: -/* 8080BBB4 38 7F 09 54 */ addi r3, r31, 0x954 -/* 8080BBB8 4B 87 7C 79 */ bl Move__10dCcD_GSttsFv -/* 8080BBBC 38 7F 09 74 */ addi r3, r31, 0x974 -/* 8080BBC0 4B 87 88 A1 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 8080BBC4 28 03 00 00 */ cmplwi r3, 0 -/* 8080BBC8 41 82 01 20 */ beq lbl_8080BCE8 -/* 8080BBCC 38 7F 09 74 */ addi r3, r31, 0x974 -/* 8080BBD0 4B 87 89 29 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 8080BBD4 90 7F 0A AC */ stw r3, 0xaac(r31) -/* 8080BBD8 A8 1F 07 00 */ lha r0, 0x700(r31) -/* 8080BBDC 2C 00 00 00 */ cmpwi r0, 0 -/* 8080BBE0 41 82 00 14 */ beq lbl_8080BBF4 -/* 8080BBE4 80 7F 0A AC */ lwz r3, 0xaac(r31) -/* 8080BBE8 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8080BBEC 74 00 D8 00 */ andis. r0, r0, 0xd800 -/* 8080BBF0 40 82 00 F8 */ bne lbl_8080BCE8 -lbl_8080BBF4: -/* 8080BBF4 7F E3 FB 78 */ mr r3, r31 -/* 8080BBF8 38 9F 0A AC */ addi r4, r31, 0xaac -/* 8080BBFC 4B 87 C0 09 */ bl cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo -/* 8080BC00 80 7F 0A AC */ lwz r3, 0xaac(r31) -/* 8080BC04 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8080BC08 74 00 D8 00 */ andis. r0, r0, 0xd800 -/* 8080BC0C 41 82 00 10 */ beq lbl_8080BC1C -/* 8080BC10 38 00 00 14 */ li r0, 0x14 -/* 8080BC14 B0 1F 06 F4 */ sth r0, 0x6f4(r31) -/* 8080BC18 48 00 00 0C */ b lbl_8080BC24 -lbl_8080BC1C: -/* 8080BC1C 38 00 00 0A */ li r0, 0xa -/* 8080BC20 B0 1F 06 F4 */ sth r0, 0x6f4(r31) -lbl_8080BC24: -/* 8080BC24 A0 1F 0A C8 */ lhz r0, 0xac8(r31) -/* 8080BC28 28 00 00 01 */ cmplwi r0, 1 -/* 8080BC2C 41 81 00 0C */ bgt lbl_8080BC38 -/* 8080BC30 38 00 00 0A */ li r0, 0xa -/* 8080BC34 B0 1F 06 F4 */ sth r0, 0x6f4(r31) -lbl_8080BC38: -/* 8080BC38 80 7F 0A AC */ lwz r3, 0xaac(r31) -/* 8080BC3C 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8080BC40 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 8080BC44 41 82 00 20 */ beq lbl_8080BC64 -/* 8080BC48 88 1F 06 A4 */ lbz r0, 0x6a4(r31) -/* 8080BC4C 28 00 00 00 */ cmplwi r0, 0 -/* 8080BC50 41 82 00 98 */ beq lbl_8080BCE8 -/* 8080BC54 7F E3 FB 78 */ mr r3, r31 -/* 8080BC58 38 80 00 04 */ li r4, 4 -/* 8080BC5C 4B FF E3 41 */ bl setActionMode__8daE_YM_cFi -/* 8080BC60 48 00 00 88 */ b lbl_8080BCE8 -lbl_8080BC64: -/* 8080BC64 88 1F 06 A0 */ lbz r0, 0x6a0(r31) -/* 8080BC68 28 00 00 02 */ cmplwi r0, 2 -/* 8080BC6C 41 82 00 7C */ beq lbl_8080BCE8 -/* 8080BC70 3C 60 00 07 */ lis r3, 0x0007 /* 0x000700E7@ha */ -/* 8080BC74 38 03 00 E7 */ addi r0, r3, 0x00E7 /* 0x000700E7@l */ -/* 8080BC78 90 01 00 08 */ stw r0, 8(r1) -/* 8080BC7C 38 7F 05 BC */ addi r3, r31, 0x5bc -/* 8080BC80 38 81 00 08 */ addi r4, r1, 8 -/* 8080BC84 38 A0 00 00 */ li r5, 0 -/* 8080BC88 38 C0 FF FF */ li r6, -1 -/* 8080BC8C 81 9F 05 BC */ lwz r12, 0x5bc(r31) -/* 8080BC90 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8080BC94 7D 89 03 A6 */ mtctr r12 -/* 8080BC98 4E 80 04 21 */ bctrl -/* 8080BC9C 80 7F 0A AC */ lwz r3, 0xaac(r31) -/* 8080BCA0 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8080BCA4 54 00 00 C7 */ rlwinm. r0, r0, 0, 3, 3 -/* 8080BCA8 41 82 00 2C */ beq lbl_8080BCD4 -/* 8080BCAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8080BCB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8080BCB4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 8080BCB8 38 80 00 03 */ li r4, 3 -/* 8080BCBC 7F E5 FB 78 */ mr r5, r31 -/* 8080BCC0 38 DF 05 38 */ addi r6, r31, 0x538 -/* 8080BCC4 38 E0 00 00 */ li r7, 0 -/* 8080BCC8 39 00 00 00 */ li r8, 0 -/* 8080BCCC 39 20 00 00 */ li r9, 0 -/* 8080BCD0 4B 84 05 49 */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl -lbl_8080BCD4: -/* 8080BCD4 7F E3 FB 78 */ mr r3, r31 -/* 8080BCD8 38 80 00 03 */ li r4, 3 -/* 8080BCDC 4B FF E2 C1 */ bl setActionMode__8daE_YM_cFi -/* 8080BCE0 7F E3 FB 78 */ mr r3, r31 -/* 8080BCE4 4B FF F7 61 */ bl executeDown__8daE_YM_cFv -lbl_8080BCE8: -/* 8080BCE8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8080BCEC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8080BCF0 7C 08 03 A6 */ mtlr r0 -/* 8080BCF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8080BCF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/execute__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/execute__8daE_YM_cFv.s deleted file mode 100644 index 758611e242..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/execute__8daE_YM_cFv.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_808138AC: -/* 808138AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808138B0 7C 08 02 A6 */ mflr r0 -/* 808138B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 808138B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 808138BC 7C 7F 1B 78 */ mr r31, r3 -/* 808138C0 88 03 07 1D */ lbz r0, 0x71d(r3) -/* 808138C4 28 00 00 00 */ cmplwi r0, 0 -/* 808138C8 41 82 00 0C */ beq lbl_808138D4 -/* 808138CC 38 60 00 01 */ li r3, 1 -/* 808138D0 48 00 01 2C */ b lbl_808139FC -lbl_808138D4: -/* 808138D4 A8 7F 06 F0 */ lha r3, 0x6f0(r31) -/* 808138D8 2C 03 00 00 */ cmpwi r3, 0 -/* 808138DC 41 82 00 0C */ beq lbl_808138E8 -/* 808138E0 38 03 FF FF */ addi r0, r3, -1 -/* 808138E4 B0 1F 06 F0 */ sth r0, 0x6f0(r31) -lbl_808138E8: -/* 808138E8 A8 7F 06 F2 */ lha r3, 0x6f2(r31) -/* 808138EC 2C 03 00 00 */ cmpwi r3, 0 -/* 808138F0 41 82 00 0C */ beq lbl_808138FC -/* 808138F4 38 03 FF FF */ addi r0, r3, -1 -/* 808138F8 B0 1F 06 F2 */ sth r0, 0x6f2(r31) -lbl_808138FC: -/* 808138FC A8 7F 06 F4 */ lha r3, 0x6f4(r31) -/* 80813900 2C 03 00 00 */ cmpwi r3, 0 -/* 80813904 41 82 00 0C */ beq lbl_80813910 -/* 80813908 38 03 FF FF */ addi r0, r3, -1 -/* 8081390C B0 1F 06 F4 */ sth r0, 0x6f4(r31) -lbl_80813910: -/* 80813910 A8 7F 06 F6 */ lha r3, 0x6f6(r31) -/* 80813914 2C 03 00 00 */ cmpwi r3, 0 -/* 80813918 41 82 00 0C */ beq lbl_80813924 -/* 8081391C 38 03 FF FF */ addi r0, r3, -1 -/* 80813920 B0 1F 06 F6 */ sth r0, 0x6f6(r31) -lbl_80813924: -/* 80813924 A8 7F 06 F8 */ lha r3, 0x6f8(r31) -/* 80813928 2C 03 00 00 */ cmpwi r3, 0 -/* 8081392C 41 82 00 0C */ beq lbl_80813938 -/* 80813930 38 03 FF FF */ addi r0, r3, -1 -/* 80813934 B0 1F 06 F8 */ sth r0, 0x6f8(r31) -lbl_80813938: -/* 80813938 A8 7F 06 FC */ lha r3, 0x6fc(r31) -/* 8081393C 2C 03 00 00 */ cmpwi r3, 0 -/* 80813940 41 82 00 0C */ beq lbl_8081394C -/* 80813944 38 03 FF FF */ addi r0, r3, -1 -/* 80813948 B0 1F 06 FC */ sth r0, 0x6fc(r31) -lbl_8081394C: -/* 8081394C A8 7F 06 FE */ lha r3, 0x6fe(r31) -/* 80813950 2C 03 00 00 */ cmpwi r3, 0 -/* 80813954 41 82 00 0C */ beq lbl_80813960 -/* 80813958 38 03 FF FF */ addi r0, r3, -1 -/* 8081395C B0 1F 06 FE */ sth r0, 0x6fe(r31) -lbl_80813960: -/* 80813960 A8 7F 07 00 */ lha r3, 0x700(r31) -/* 80813964 2C 03 00 00 */ cmpwi r3, 0 -/* 80813968 41 82 00 0C */ beq lbl_80813974 -/* 8081396C 38 03 FF FF */ addi r0, r3, -1 -/* 80813970 B0 1F 07 00 */ sth r0, 0x700(r31) -lbl_80813974: -/* 80813974 A8 7F 06 FA */ lha r3, 0x6fa(r31) -/* 80813978 2C 03 00 00 */ cmpwi r3, 0 -/* 8081397C 41 82 00 0C */ beq lbl_80813988 -/* 80813980 38 03 FF FF */ addi r0, r3, -1 -/* 80813984 B0 1F 06 FA */ sth r0, 0x6fa(r31) -lbl_80813988: -/* 80813988 80 7F 07 04 */ lwz r3, 0x704(r31) -/* 8081398C 2C 03 00 00 */ cmpwi r3, 0 -/* 80813990 41 82 00 0C */ beq lbl_8081399C -/* 80813994 38 03 FF FF */ addi r0, r3, -1 -/* 80813998 90 1F 07 04 */ stw r0, 0x704(r31) -lbl_8081399C: -/* 8081399C A8 7F 07 0A */ lha r3, 0x70a(r31) -/* 808139A0 2C 03 00 00 */ cmpwi r3, 0 -/* 808139A4 41 82 00 0C */ beq lbl_808139B0 -/* 808139A8 38 03 FF FF */ addi r0, r3, -1 -/* 808139AC B0 1F 07 0A */ sth r0, 0x70a(r31) -lbl_808139B0: -/* 808139B0 A8 7F 07 0C */ lha r3, 0x70c(r31) -/* 808139B4 2C 03 00 00 */ cmpwi r3, 0 -/* 808139B8 41 82 00 0C */ beq lbl_808139C4 -/* 808139BC 38 03 FF FF */ addi r0, r3, -1 -/* 808139C0 B0 1F 07 0C */ sth r0, 0x70c(r31) -lbl_808139C4: -/* 808139C4 A8 7F 07 0E */ lha r3, 0x70e(r31) -/* 808139C8 2C 03 00 00 */ cmpwi r3, 0 -/* 808139CC 41 82 00 0C */ beq lbl_808139D8 -/* 808139D0 38 03 FF FF */ addi r0, r3, -1 -/* 808139D4 B0 1F 07 0E */ sth r0, 0x70e(r31) -lbl_808139D8: -/* 808139D8 7F E3 FB 78 */ mr r3, r31 -/* 808139DC 4B FF D4 1D */ bl checkElectricStart__8daE_YM_cFv -/* 808139E0 7F E3 FB 78 */ mr r3, r31 -/* 808139E4 4B FF F6 29 */ bl action__8daE_YM_cFv -/* 808139E8 7F E3 FB 78 */ mr r3, r31 -/* 808139EC 4B FF FB 3D */ bl mtx_set__8daE_YM_cFv -/* 808139F0 7F E3 FB 78 */ mr r3, r31 -/* 808139F4 4B FF FB BD */ bl cc_set__8daE_YM_cFv -/* 808139F8 38 60 00 01 */ li r3, 1 -lbl_808139FC: -/* 808139FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80813A00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80813A04 7C 08 03 A6 */ mtlr r0 -/* 80813A08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80813A0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/initFly__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/initFly__8daE_YM_cFv.s deleted file mode 100644 index b0958d4029..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/initFly__8daE_YM_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8080E630: -/* 8080E630 38 00 00 2E */ li r0, 0x2e -/* 8080E634 98 03 05 46 */ stb r0, 0x546(r3) -/* 8080E638 3C 80 80 81 */ lis r4, lit_3926@ha /* 0x80815998@ha */ -/* 8080E63C C0 04 59 98 */ lfs f0, lit_3926@l(r4) /* 0x80815998@l */ -/* 8080E640 D0 03 05 30 */ stfs f0, 0x530(r3) -/* 8080E644 38 00 00 00 */ li r0, 0 -/* 8080E648 B0 03 06 E4 */ sth r0, 0x6e4(r3) -/* 8080E64C 80 03 06 C4 */ lwz r0, 0x6c4(r3) -/* 8080E650 28 00 00 00 */ cmplwi r0, 0 -/* 8080E654 41 82 00 20 */ beq lbl_8080E674 -/* 8080E658 C0 03 06 B8 */ lfs f0, 0x6b8(r3) -/* 8080E65C D0 03 06 70 */ stfs f0, 0x670(r3) -/* 8080E660 C0 03 06 BC */ lfs f0, 0x6bc(r3) -/* 8080E664 D0 03 06 74 */ stfs f0, 0x674(r3) -/* 8080E668 C0 03 06 C0 */ lfs f0, 0x6c0(r3) -/* 8080E66C D0 03 06 78 */ stfs f0, 0x678(r3) -/* 8080E670 48 00 00 1C */ b lbl_8080E68C -lbl_8080E674: -/* 8080E674 C0 03 04 A8 */ lfs f0, 0x4a8(r3) -/* 8080E678 D0 03 06 70 */ stfs f0, 0x670(r3) -/* 8080E67C C0 03 04 AC */ lfs f0, 0x4ac(r3) -/* 8080E680 D0 03 06 74 */ stfs f0, 0x674(r3) -/* 8080E684 C0 03 04 B0 */ lfs f0, 0x4b0(r3) -/* 8080E688 D0 03 06 78 */ stfs f0, 0x678(r3) -lbl_8080E68C: -/* 8080E68C 38 00 00 03 */ li r0, 3 -/* 8080E690 98 03 06 A0 */ stb r0, 0x6a0(r3) -/* 8080E694 38 00 00 00 */ li r0, 0 -/* 8080E698 B0 03 04 E4 */ sth r0, 0x4e4(r3) -/* 8080E69C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/mtx_set__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/mtx_set__8daE_YM_cFv.s deleted file mode 100644 index f256958d8a..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/mtx_set__8daE_YM_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80813528: -/* 80813528 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8081352C 7C 08 02 A6 */ mflr r0 -/* 80813530 90 01 00 14 */ stw r0, 0x14(r1) -/* 80813534 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80813538 7C 7F 1B 78 */ mr r31, r3 -/* 8081353C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80813540 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80813544 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80813548 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 8081354C C0 1F 06 DC */ lfs f0, 0x6dc(r31) -/* 80813550 EC 42 00 2A */ fadds f2, f2, f0 -/* 80813554 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80813558 4B B3 33 91 */ bl PSMTXTrans -/* 8081355C 38 7F 06 68 */ addi r3, r31, 0x668 -/* 80813560 4B 7F 99 E5 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80813564 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80813568 4B 7F 99 DD */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 8081356C C0 3F 06 8C */ lfs f1, 0x68c(r31) -/* 80813570 FC 40 08 90 */ fmr f2, f1 -/* 80813574 FC 60 08 90 */ fmr f3, f1 -/* 80813578 4B 7F 98 C1 */ bl scaleM__14mDoMtx_stack_cFfff -/* 8081357C 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 80813580 80 83 00 04 */ lwz r4, 4(r3) -/* 80813584 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80813588 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8081358C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80813590 4B B3 2F 21 */ bl PSMTXCopy -/* 80813594 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 80813598 4B 7F DC 55 */ bl modelCalc__16mDoExt_McaMorfSOFv -/* 8081359C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808135A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808135A4 7C 08 03 A6 */ mtlr r0 -/* 808135A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 808135AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/s_obj_sub__FPvPv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/s_obj_sub__FPvPv.s deleted file mode 100644 index 935ca56900..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/s_obj_sub__FPvPv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_80808698: -/* 80808698 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8080869C 7C 08 02 A6 */ mflr r0 -/* 808086A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 808086A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 808086A8 93 C1 00 08 */ stw r30, 8(r1) -/* 808086AC 7C 7E 1B 78 */ mr r30, r3 -/* 808086B0 7C 9F 23 78 */ mr r31, r4 -/* 808086B4 4B 81 06 2D */ bl fopAc_IsActor__FPv -/* 808086B8 2C 03 00 00 */ cmpwi r3, 0 -/* 808086BC 41 82 00 90 */ beq lbl_8080874C -/* 808086C0 A8 1E 00 08 */ lha r0, 8(r30) -/* 808086C4 2C 00 02 FC */ cmpwi r0, 0x2fc -/* 808086C8 40 82 00 84 */ bne lbl_8080874C -/* 808086CC 28 1E 00 00 */ cmplwi r30, 0 -/* 808086D0 41 82 00 0C */ beq lbl_808086DC -/* 808086D4 80 7E 00 04 */ lwz r3, 4(r30) -/* 808086D8 48 00 00 08 */ b lbl_808086E0 -lbl_808086DC: -/* 808086DC 38 60 FF FF */ li r3, -1 -lbl_808086E0: -/* 808086E0 4B 81 9A 59 */ bl fpcM_IsCreating__FUi -/* 808086E4 2C 03 00 00 */ cmpwi r3, 0 -/* 808086E8 40 82 00 64 */ bne lbl_8080874C -/* 808086EC 7F C3 F3 78 */ mr r3, r30 -/* 808086F0 7F E4 FB 78 */ mr r4, r31 -/* 808086F4 4B 81 22 71 */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 808086F8 3C 60 80 81 */ lis r3, lit_3925@ha /* 0x80815994@ha */ -/* 808086FC C0 03 59 94 */ lfs f0, lit_3925@l(r3) /* 0x80815994@l */ -/* 80808700 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80808704 40 80 00 48 */ bge lbl_8080874C -/* 80808708 3C 60 80 81 */ lis r3, m_obj_dist@ha /* 0x80815D60@ha */ -/* 8080870C 38 83 5D 60 */ addi r4, r3, m_obj_dist@l /* 0x80815D60@l */ -/* 80808710 C0 04 00 00 */ lfs f0, 0(r4) -/* 80808714 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80808718 40 80 00 34 */ bge lbl_8080874C -/* 8080871C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80808720 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80808724 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80808728 FC 00 02 10 */ fabs f0, f0 -/* 8080872C FC 40 00 18 */ frsp f2, f0 -/* 80808730 3C 60 80 81 */ lis r3, lit_3947@ha /* 0x808159C4@ha */ -/* 80808734 C0 03 59 C4 */ lfs f0, lit_3947@l(r3) /* 0x808159C4@l */ -/* 80808738 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8080873C 40 80 00 10 */ bge lbl_8080874C -/* 80808740 3C 60 80 81 */ lis r3, m_near_obj@ha /* 0x80815D5C@ha */ -/* 80808744 93 C3 5D 5C */ stw r30, m_near_obj@l(r3) /* 0x80815D5C@l */ -/* 80808748 D0 24 00 00 */ stfs f1, 0(r4) -lbl_8080874C: -/* 8080874C 38 60 00 00 */ li r3, 0 -/* 80808750 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80808754 83 C1 00 08 */ lwz r30, 8(r1) -/* 80808758 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8080875C 7C 08 03 A6 */ mtlr r0 -/* 80808760 38 21 00 10 */ addi r1, r1, 0x10 -/* 80808764 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/s_ym_sub__FPvPv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/s_ym_sub__FPvPv.s deleted file mode 100644 index 03c6eb15ac..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/s_ym_sub__FPvPv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80812F0C: -/* 80812F0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80812F10 7C 08 02 A6 */ mflr r0 -/* 80812F14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80812F18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80812F1C 93 C1 00 08 */ stw r30, 8(r1) -/* 80812F20 7C 7E 1B 78 */ mr r30, r3 -/* 80812F24 7C 9F 23 78 */ mr r31, r4 -/* 80812F28 4B 80 5D B9 */ bl fopAc_IsActor__FPv -/* 80812F2C 2C 03 00 00 */ cmpwi r3, 0 -/* 80812F30 41 82 00 80 */ beq lbl_80812FB0 -/* 80812F34 A8 1E 00 08 */ lha r0, 8(r30) -/* 80812F38 2C 00 01 F4 */ cmpwi r0, 0x1f4 -/* 80812F3C 40 82 00 74 */ bne lbl_80812FB0 -/* 80812F40 28 1E 00 00 */ cmplwi r30, 0 -/* 80812F44 41 82 00 0C */ beq lbl_80812F50 -/* 80812F48 80 7E 00 04 */ lwz r3, 4(r30) -/* 80812F4C 48 00 00 08 */ b lbl_80812F54 -lbl_80812F50: -/* 80812F50 38 60 FF FF */ li r3, -1 -lbl_80812F54: -/* 80812F54 4B 80 F1 E5 */ bl fpcM_IsCreating__FUi -/* 80812F58 2C 03 00 00 */ cmpwi r3, 0 -/* 80812F5C 40 82 00 54 */ bne lbl_80812FB0 -/* 80812F60 7C 1E F8 40 */ cmplw r30, r31 -/* 80812F64 41 82 00 4C */ beq lbl_80812FB0 -/* 80812F68 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80812F6C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80812F70 4B A5 40 BD */ bl __eq__4cXyzCFRC3Vec -/* 80812F74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80812F78 41 82 00 38 */ beq lbl_80812FB0 -/* 80812F7C 88 1F 06 AA */ lbz r0, 0x6aa(r31) -/* 80812F80 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80812F84 41 82 00 14 */ beq lbl_80812F98 -/* 80812F88 88 1E 06 AA */ lbz r0, 0x6aa(r30) -/* 80812F8C 60 00 00 84 */ ori r0, r0, 0x84 -/* 80812F90 98 1E 06 AA */ stb r0, 0x6aa(r30) -/* 80812F94 48 00 00 10 */ b lbl_80812FA4 -lbl_80812F98: -/* 80812F98 88 1E 06 AA */ lbz r0, 0x6aa(r30) -/* 80812F9C 60 00 00 82 */ ori r0, r0, 0x82 -/* 80812FA0 98 1E 06 AA */ stb r0, 0x6aa(r30) -lbl_80812FA4: -/* 80812FA4 88 1F 06 AA */ lbz r0, 0x6aa(r31) -/* 80812FA8 60 00 00 81 */ ori r0, r0, 0x81 -/* 80812FAC 98 1F 06 AA */ stb r0, 0x6aa(r31) -lbl_80812FB0: -/* 80812FB0 38 60 00 00 */ li r3, 0 -/* 80812FB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80812FB8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80812FBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80812FC0 7C 08 03 A6 */ mtlr r0 -/* 80812FC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80812FC8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setActionMode__8daE_YM_cFi.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setActionMode__8daE_YM_cFi.s deleted file mode 100644 index b07345aeb9..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setActionMode__8daE_YM_cFi.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80809F9C: -/* 80809F9C 80 03 06 90 */ lwz r0, 0x690(r3) -/* 80809FA0 90 03 06 94 */ stw r0, 0x694(r3) -/* 80809FA4 90 83 06 90 */ stw r4, 0x690(r3) -/* 80809FA8 38 00 00 00 */ li r0, 0 -/* 80809FAC 90 03 06 98 */ stw r0, 0x698(r3) -/* 80809FB0 B0 03 06 F2 */ sth r0, 0x6f2(r3) -/* 80809FB4 B0 03 06 F0 */ sth r0, 0x6f0(r3) -/* 80809FB8 A8 03 04 E6 */ lha r0, 0x4e6(r3) -/* 80809FBC B0 03 04 DE */ sth r0, 0x4de(r3) -/* 80809FC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setAppear__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setAppear__8daE_YM_cFv.s deleted file mode 100644 index b12450b335..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setAppear__8daE_YM_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80809D84: -/* 80809D84 38 80 00 00 */ li r4, 0 -/* 80809D88 98 83 06 A4 */ stb r4, 0x6a4(r3) -/* 80809D8C 88 03 06 A6 */ lbz r0, 0x6a6(r3) -/* 80809D90 28 00 00 04 */ cmplwi r0, 4 -/* 80809D94 41 82 00 08 */ beq lbl_80809D9C -/* 80809D98 98 83 06 A0 */ stb r4, 0x6a0(r3) -lbl_80809D9C: -/* 80809D9C 38 00 00 04 */ li r0, 4 -/* 80809DA0 90 03 07 14 */ stw r0, 0x714(r3) -/* 80809DA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setHideType__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setHideType__8daE_YM_cFv.s deleted file mode 100644 index c62f2efcea..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setHideType__8daE_YM_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80814AF0: -/* 80814AF0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80814AF4 7C 08 02 A6 */ mflr r0 -/* 80814AF8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80814AFC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80814B00 7C 7F 1B 78 */ mr r31, r3 -/* 80814B04 38 00 00 01 */ li r0, 1 -/* 80814B08 98 03 06 A4 */ stb r0, 0x6a4(r3) -/* 80814B0C 38 00 01 45 */ li r0, 0x145 -/* 80814B10 90 03 09 A0 */ stw r0, 0x9a0(r3) -/* 80814B14 3C 00 00 01 */ lis r0, 1 -/* 80814B18 90 03 09 9C */ stw r0, 0x99c(r3) -/* 80814B1C 38 00 00 00 */ li r0, 0 -/* 80814B20 3C 60 80 81 */ lis r3, m_near_obj@ha /* 0x80815D5C@ha */ -/* 80814B24 90 03 5D 5C */ stw r0, m_near_obj@l(r3) /* 0x80815D5C@l */ -/* 80814B28 3C 60 80 81 */ lis r3, lit_3925@ha /* 0x80815994@ha */ -/* 80814B2C C0 03 59 94 */ lfs f0, lit_3925@l(r3) /* 0x80815994@l */ -/* 80814B30 3C 60 80 81 */ lis r3, m_obj_dist@ha /* 0x80815D60@ha */ -/* 80814B34 D0 03 5D 60 */ stfs f0, m_obj_dist@l(r3) /* 0x80815D60@l */ -/* 80814B38 3C 60 80 81 */ lis r3, s_obj_sub__FPvPv@ha /* 0x80808698@ha */ -/* 80814B3C 38 63 86 98 */ addi r3, r3, s_obj_sub__FPvPv@l /* 0x80808698@l */ -/* 80814B40 7F E4 FB 78 */ mr r4, r31 -/* 80814B44 4B 80 C7 F5 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80814B48 3C 60 80 81 */ lis r3, m_near_obj@ha /* 0x80815D5C@ha */ -/* 80814B4C 38 63 5D 5C */ addi r3, r3, m_near_obj@l /* 0x80815D5C@l */ -/* 80814B50 80 63 00 00 */ lwz r3, 0(r3) -/* 80814B54 28 03 00 00 */ cmplwi r3, 0 -/* 80814B58 41 82 00 30 */ beq lbl_80814B88 -/* 80814B5C C0 23 04 D0 */ lfs f1, 0x4d0(r3) -/* 80814B60 D0 21 00 08 */ stfs f1, 8(r1) -/* 80814B64 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80814B68 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80814B6C C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80814B70 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80814B74 D0 3F 04 D0 */ stfs f1, 0x4d0(r31) -/* 80814B78 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 80814B7C 38 00 00 01 */ li r0, 1 -/* 80814B80 98 1F 06 A6 */ stb r0, 0x6a6(r31) -/* 80814B84 48 00 00 0C */ b lbl_80814B90 -lbl_80814B88: -/* 80814B88 38 00 00 03 */ li r0, 3 -/* 80814B8C 98 1F 06 A6 */ stb r0, 0x6a6(r31) -lbl_80814B90: -/* 80814B90 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80814B94 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80814B98 7C 08 03 A6 */ mtlr r0 -/* 80814B9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80814BA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setInclination__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setInclination__8daE_YM_cFv.s deleted file mode 100644 index 38a20b2330..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setInclination__8daE_YM_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8080F8C8: -/* 8080F8C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8080F8CC 7C 08 02 A6 */ mflr r0 -/* 8080F8D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8080F8D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8080F8D8 7C 7F 1B 78 */ mr r31, r3 -/* 8080F8DC C0 23 05 2C */ lfs f1, 0x52c(r3) -/* 8080F8E0 C0 43 04 FC */ lfs f2, 0x4fc(r3) -/* 8080F8E4 4B A5 7D 91 */ bl cM_atan2s__Fff -/* 8080F8E8 38 03 C0 00 */ addi r0, r3, -16384 -/* 8080F8EC 7C 04 07 34 */ extsh r4, r0 -/* 8080F8F0 2C 04 E8 90 */ cmpwi r4, -6000 -/* 8080F8F4 40 80 00 08 */ bge lbl_8080F8FC -/* 8080F8F8 38 80 E8 90 */ li r4, -6000 -lbl_8080F8FC: -/* 8080F8FC 7C 80 07 34 */ extsh r0, r4 -/* 8080F900 2C 00 17 70 */ cmpwi r0, 0x1770 -/* 8080F904 40 81 00 08 */ ble lbl_8080F90C -/* 8080F908 38 80 17 70 */ li r4, 0x1770 -lbl_8080F90C: -/* 8080F90C 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 8080F910 38 A0 01 80 */ li r5, 0x180 -/* 8080F914 4B A6 12 7D */ bl cLib_chaseAngleS__FPsss -/* 8080F918 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8080F91C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8080F920 7C 08 03 A6 */ mtlr r0 -/* 8080F924 38 21 00 10 */ addi r1, r1, 0x10 -/* 8080F928 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setLockByCargo__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setLockByCargo__8daE_YM_cFv.s deleted file mode 100644 index f5d15cf397..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setLockByCargo__8daE_YM_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_808123C4: -/* 808123C4 38 00 00 5A */ li r0, 0x5a -/* 808123C8 B0 03 06 F2 */ sth r0, 0x6f2(r3) -/* 808123CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setNormalCc__8daE_YM_cFv.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setNormalCc__8daE_YM_cFv.s deleted file mode 100644 index 6497157af4..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setNormalCc__8daE_YM_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80809D6C: -/* 80809D6C 38 00 00 75 */ li r0, 0x75 -/* 80809D70 90 03 09 A0 */ stw r0, 0x9a0(r3) -/* 80809D74 3C 80 D8 FC */ lis r4, 0xD8FC /* 0xD8FBFDFF@ha */ -/* 80809D78 38 04 FD FF */ addi r0, r4, 0xFDFF /* 0xD8FBFDFF@l */ -/* 80809D7C 90 03 09 9C */ stw r0, 0x99c(r3) -/* 80809D80 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 1560604576..0000000000 --- a/asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80813E84: -/* 80813E84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80813E88 7C 08 02 A6 */ mflr r0 -/* 80813E8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80813E90 4B FF FC 61 */ bl CreateHeap__8daE_YM_cFv -/* 80813E94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80813E98 7C 08 03 A6 */ mtlr r0 -/* 80813E9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80813EA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/CreateHeap__12daObjMGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/CreateHeap__12daObjMGate_cFv.s deleted file mode 100644 index 1dae640fec..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/CreateHeap__12daObjMGate_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_805937AC: -/* 805937AC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805937B0 7C 08 02 A6 */ mflr r0 -/* 805937B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 805937B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 805937BC 4B DC EA 21 */ bl _savegpr_29 -/* 805937C0 7C 7D 1B 78 */ mr r29, r3 -/* 805937C4 3C 60 80 59 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80593F68@ha */ -/* 805937C8 3B E3 3F 68 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x80593F68@l */ -/* 805937CC 88 1D 05 B9 */ lbz r0, 0x5b9(r29) -/* 805937D0 54 00 10 3A */ slwi r0, r0, 2 -/* 805937D4 38 7F 00 20 */ addi r3, r31, 0x20 -/* 805937D8 7C 63 00 2E */ lwzx r3, r3, r0 -/* 805937DC 38 9F 00 28 */ addi r4, r31, 0x28 -/* 805937E0 7C 84 00 2E */ lwzx r4, r4, r0 -/* 805937E4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805937E8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805937EC 3F C5 00 02 */ addis r30, r5, 2 -/* 805937F0 3B DE C2 F8 */ addi r30, r30, -15624 -/* 805937F4 7F C5 F3 78 */ mr r5, r30 -/* 805937F8 38 C0 00 80 */ li r6, 0x80 -/* 805937FC 4B AA 8B 81 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80593800 3C 80 00 08 */ lis r4, 8 -/* 80593804 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80593808 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 8059380C 4B A8 14 49 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80593810 90 7D 05 B0 */ stw r3, 0x5b0(r29) -/* 80593814 80 1D 05 B0 */ lwz r0, 0x5b0(r29) -/* 80593818 28 00 00 00 */ cmplwi r0, 0 -/* 8059381C 40 82 00 0C */ bne lbl_80593828 -/* 80593820 38 60 00 00 */ li r3, 0 -/* 80593824 48 00 00 50 */ b lbl_80593874 -lbl_80593828: -/* 80593828 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 8059382C 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f -/* 80593830 40 82 00 40 */ bne lbl_80593870 -/* 80593834 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80593838 80 9F 00 3C */ lwz r4, 0x3c(r31) -/* 8059383C 7F C5 F3 78 */ mr r5, r30 -/* 80593840 38 C0 00 80 */ li r6, 0x80 -/* 80593844 4B AA 8B 39 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80593848 3C 80 00 08 */ lis r4, 8 -/* 8059384C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80593850 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80593854 4B A8 14 01 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80593858 90 7D 05 B4 */ stw r3, 0x5b4(r29) -/* 8059385C 80 1D 05 B4 */ lwz r0, 0x5b4(r29) -/* 80593860 28 00 00 00 */ cmplwi r0, 0 -/* 80593864 40 82 00 0C */ bne lbl_80593870 -/* 80593868 38 60 00 00 */ li r3, 0 -/* 8059386C 48 00 00 08 */ b lbl_80593874 -lbl_80593870: -/* 80593870 38 60 00 01 */ li r3, 1 -lbl_80593874: -/* 80593874 39 61 00 20 */ addi r11, r1, 0x20 -/* 80593878 4B DC E9 B1 */ bl _restgpr_29 -/* 8059387C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80593880 7C 08 03 A6 */ mtlr r0 -/* 80593884 38 21 00 20 */ addi r1, r1, 0x20 -/* 80593888 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Create__12daObjMGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Create__12daObjMGate_cFv.s deleted file mode 100644 index 502935dc13..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Create__12daObjMGate_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80593760: -/* 80593760 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80593764 7C 08 02 A6 */ mflr r0 -/* 80593768 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059376C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80593770 7C 7F 1B 78 */ mr r31, r3 -/* 80593774 4B FF FE 45 */ bl initBaseMtx__12daObjMGate_cFv -/* 80593778 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 8059377C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80593780 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80593784 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 80593788 80 83 00 04 */ lwz r4, 4(r3) -/* 8059378C 7F E3 FB 78 */ mr r3, r31 -/* 80593790 4B A8 6D E9 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80593794 38 60 00 01 */ li r3, 1 -/* 80593798 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059379C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805937A0 7C 08 03 A6 */ mtlr r0 -/* 805937A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 805937A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Delete__12daObjMGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Delete__12daObjMGate_cFv.s deleted file mode 100644 index 5d7d0ef2f1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Delete__12daObjMGate_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80593D18: -/* 80593D18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80593D1C 7C 08 02 A6 */ mflr r0 -/* 80593D20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80593D24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80593D28 7C 7F 1B 78 */ mr r31, r3 -/* 80593D2C 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80593D30 88 1F 05 B9 */ lbz r0, 0x5b9(r31) -/* 80593D34 54 00 10 3A */ slwi r0, r0, 2 -/* 80593D38 3C 80 80 59 */ lis r4, l_arcName@ha /* 0x80593F88@ha */ -/* 80593D3C 38 84 3F 88 */ addi r4, r4, l_arcName@l /* 0x80593F88@l */ -/* 80593D40 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80593D44 4B A9 92 C5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80593D48 38 7F 05 A8 */ addi r3, r31, 0x5a8 -/* 80593D4C 3C 80 80 59 */ lis r4, l_keyArcName@ha /* 0x80593FA0@ha */ -/* 80593D50 38 84 3F A0 */ addi r4, r4, l_keyArcName@l /* 0x80593FA0@l */ -/* 80593D54 80 84 00 00 */ lwz r4, 0(r4) -/* 80593D58 4B A9 92 B1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80593D5C 38 60 00 01 */ li r3, 1 -/* 80593D60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80593D64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80593D68 7C 08 03 A6 */ mtlr r0 -/* 80593D6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80593D70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Draw__12daObjMGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Draw__12daObjMGate_cFv.s deleted file mode 100644 index 64fde3e3e4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Draw__12daObjMGate_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80593C4C: -/* 80593C4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80593C50 7C 08 02 A6 */ mflr r0 -/* 80593C54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80593C58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80593C5C 93 C1 00 08 */ stw r30, 8(r1) -/* 80593C60 7C 7F 1B 78 */ mr r31, r3 -/* 80593C64 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80593C68 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80593C6C 38 80 00 10 */ li r4, 0x10 -/* 80593C70 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80593C74 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80593C78 4B C0 FB 4D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80593C7C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80593C80 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80593C84 80 9F 05 B0 */ lwz r4, 0x5b0(r31) -/* 80593C88 80 84 00 04 */ lwz r4, 4(r4) -/* 80593C8C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80593C90 4B C1 11 11 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80593C94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80593C98 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80593C9C 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80593CA0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80593CA4 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80593CA8 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80593CAC 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80593CB0 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80593CB4 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 80593CB8 4B A7 A0 0D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80593CBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80593CC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80593CC4 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80593CC8 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80593CCC 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80593CD0 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80593CD4 80 9F 05 B4 */ lwz r4, 0x5b4(r31) -/* 80593CD8 28 04 00 00 */ cmplwi r4, 0 -/* 80593CDC 41 82 00 20 */ beq lbl_80593CFC -/* 80593CE0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80593CE4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80593CE8 80 84 00 04 */ lwz r4, 4(r4) -/* 80593CEC 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80593CF0 4B C1 10 B1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80593CF4 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 80593CF8 4B A7 9F CD */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_80593CFC: -/* 80593CFC 38 60 00 01 */ li r3, 1 -/* 80593D00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80593D04 83 C1 00 08 */ lwz r30, 8(r1) -/* 80593D08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80593D0C 7C 08 03 A6 */ mtlr r0 -/* 80593D10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80593D14 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Execute__12daObjMGate_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Execute__12daObjMGate_cFPPA3_A4_f.s deleted file mode 100644 index 9736a7e22c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Execute__12daObjMGate_cFPPA3_A4_f.s +++ /dev/null @@ -1,184 +0,0 @@ -lbl_80593988: -/* 80593988 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8059398C 7C 08 02 A6 */ mflr r0 -/* 80593990 90 01 00 54 */ stw r0, 0x54(r1) -/* 80593994 39 61 00 50 */ addi r11, r1, 0x50 -/* 80593998 4B DC E8 45 */ bl _savegpr_29 -/* 8059399C 7C 7D 1B 78 */ mr r29, r3 -/* 805939A0 7C 9E 23 78 */ mr r30, r4 -/* 805939A4 3C 60 80 59 */ lis r3, l_key_offset@ha /* 0x80593E48@ha */ -/* 805939A8 3B E3 3E 48 */ addi r31, r3, l_key_offset@l /* 0x80593E48@l */ -/* 805939AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805939B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805939B4 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 805939B8 80 9D 05 C8 */ lwz r4, 0x5c8(r29) -/* 805939BC 38 04 00 01 */ addi r0, r4, 1 -/* 805939C0 90 1D 05 C8 */ stw r0, 0x5c8(r29) -/* 805939C4 80 03 05 80 */ lwz r0, 0x580(r3) -/* 805939C8 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 805939CC 41 82 01 DC */ beq lbl_80593BA8 -/* 805939D0 88 1D 05 B9 */ lbz r0, 0x5b9(r29) -/* 805939D4 2C 00 00 01 */ cmpwi r0, 1 -/* 805939D8 41 82 00 4C */ beq lbl_80593A24 -/* 805939DC 40 80 00 7C */ bge lbl_80593A58 -/* 805939E0 2C 00 00 00 */ cmpwi r0, 0 -/* 805939E4 40 80 00 08 */ bge lbl_805939EC -/* 805939E8 48 00 00 70 */ b lbl_80593A58 -lbl_805939EC: -/* 805939EC C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 805939F0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 805939F4 38 9F 00 2C */ addi r4, r31, 0x2c -/* 805939F8 C0 04 00 04 */ lfs f0, 4(r4) -/* 805939FC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80593A00 C0 04 00 08 */ lfs f0, 8(r4) -/* 80593A04 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80593A08 C0 04 00 18 */ lfs f0, 0x18(r4) -/* 80593A0C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80593A10 C0 04 00 1C */ lfs f0, 0x1c(r4) -/* 80593A14 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80593A18 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 80593A1C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80593A20 48 00 00 38 */ b lbl_80593A58 -lbl_80593A24: -/* 80593A24 C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 80593A28 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80593A2C 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80593A30 C0 04 00 04 */ lfs f0, 4(r4) -/* 80593A34 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80593A38 C0 04 00 08 */ lfs f0, 8(r4) -/* 80593A3C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80593A40 C0 04 00 18 */ lfs f0, 0x18(r4) -/* 80593A44 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80593A48 C0 04 00 1C */ lfs f0, 0x1c(r4) -/* 80593A4C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80593A50 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 80593A54 D0 01 00 1C */ stfs f0, 0x1c(r1) -lbl_80593A58: -/* 80593A58 7F A4 EB 78 */ mr r4, r29 -/* 80593A5C 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80593A60 38 C1 00 14 */ addi r6, r1, 0x14 -/* 80593A64 4B A9 EB F1 */ bl dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz -/* 80593A68 2C 03 00 00 */ cmpwi r3, 0 -/* 80593A6C 41 82 01 3C */ beq lbl_80593BA8 -/* 80593A70 88 1D 05 B8 */ lbz r0, 0x5b8(r29) -/* 80593A74 28 00 00 01 */ cmplwi r0, 1 -/* 80593A78 40 82 00 C4 */ bne lbl_80593B3C -/* 80593A7C C0 1F 00 94 */ lfs f0, 0x94(r31) -/* 80593A80 D0 1D 05 C4 */ stfs f0, 0x5c4(r29) -/* 80593A84 C0 1F 00 98 */ lfs f0, 0x98(r31) -/* 80593A88 D0 1D 05 C0 */ stfs f0, 0x5c0(r29) -/* 80593A8C 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80593A90 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f -/* 80593A94 28 00 00 01 */ cmplwi r0, 1 -/* 80593A98 40 82 00 54 */ bne lbl_80593AEC -/* 80593A9C 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80593AA0 7C 03 07 74 */ extsb r3, r0 -/* 80593AA4 4B A9 95 C9 */ bl dComIfGp_getReverb__Fi -/* 80593AA8 7C 67 1B 78 */ mr r7, r3 -/* 80593AAC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080235@ha */ -/* 80593AB0 38 03 02 35 */ addi r0, r3, 0x0235 /* 0x00080235@l */ -/* 80593AB4 90 01 00 10 */ stw r0, 0x10(r1) -/* 80593AB8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80593ABC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80593AC0 80 63 00 00 */ lwz r3, 0(r3) -/* 80593AC4 38 81 00 10 */ addi r4, r1, 0x10 -/* 80593AC8 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80593ACC 38 C0 00 00 */ li r6, 0 -/* 80593AD0 C0 3F 00 9C */ lfs f1, 0x9c(r31) -/* 80593AD4 FC 40 08 90 */ fmr f2, f1 -/* 80593AD8 C0 7F 00 8C */ lfs f3, 0x8c(r31) -/* 80593ADC FC 80 18 90 */ fmr f4, f3 -/* 80593AE0 39 00 00 00 */ li r8, 0 -/* 80593AE4 4B D1 7E A1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80593AE8 48 00 00 C0 */ b lbl_80593BA8 -lbl_80593AEC: -/* 80593AEC 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80593AF0 7C 03 07 74 */ extsb r3, r0 -/* 80593AF4 4B A9 95 79 */ bl dComIfGp_getReverb__Fi -/* 80593AF8 7C 67 1B 78 */ mr r7, r3 -/* 80593AFC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080234@ha */ -/* 80593B00 38 03 02 34 */ addi r0, r3, 0x0234 /* 0x00080234@l */ -/* 80593B04 90 01 00 0C */ stw r0, 0xc(r1) -/* 80593B08 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80593B0C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80593B10 80 63 00 00 */ lwz r3, 0(r3) -/* 80593B14 38 81 00 0C */ addi r4, r1, 0xc -/* 80593B18 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80593B1C 38 C0 00 00 */ li r6, 0 -/* 80593B20 C0 3F 00 9C */ lfs f1, 0x9c(r31) -/* 80593B24 FC 40 08 90 */ fmr f2, f1 -/* 80593B28 C0 7F 00 8C */ lfs f3, 0x8c(r31) -/* 80593B2C FC 80 18 90 */ fmr f4, f3 -/* 80593B30 39 00 00 00 */ li r8, 0 -/* 80593B34 4B D1 7E 51 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80593B38 48 00 00 70 */ b lbl_80593BA8 -lbl_80593B3C: -/* 80593B3C C0 1F 00 A0 */ lfs f0, 0xa0(r31) -/* 80593B40 D0 1D 05 C4 */ stfs f0, 0x5c4(r29) -/* 80593B44 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 80593B48 D0 1D 05 C0 */ stfs f0, 0x5c0(r29) -/* 80593B4C 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80593B50 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f -/* 80593B54 28 00 00 01 */ cmplwi r0, 1 -/* 80593B58 40 82 00 50 */ bne lbl_80593BA8 -/* 80593B5C 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80593B60 7C 03 07 74 */ extsb r3, r0 -/* 80593B64 4B A9 95 09 */ bl dComIfGp_getReverb__Fi -/* 80593B68 7C 67 1B 78 */ mr r7, r3 -/* 80593B6C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080235@ha */ -/* 80593B70 38 03 02 35 */ addi r0, r3, 0x0235 /* 0x00080235@l */ -/* 80593B74 90 01 00 08 */ stw r0, 8(r1) -/* 80593B78 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80593B7C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80593B80 80 63 00 00 */ lwz r3, 0(r3) -/* 80593B84 38 81 00 08 */ addi r4, r1, 8 -/* 80593B88 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80593B8C 38 C0 00 00 */ li r6, 0 -/* 80593B90 C0 3F 00 9C */ lfs f1, 0x9c(r31) -/* 80593B94 FC 40 08 90 */ fmr f2, f1 -/* 80593B98 C0 7F 00 8C */ lfs f3, 0x8c(r31) -/* 80593B9C FC 80 18 90 */ fmr f4, f3 -/* 80593BA0 39 00 00 00 */ li r8, 0 -/* 80593BA4 4B D1 7D E1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80593BA8: -/* 80593BA8 38 1D 05 6C */ addi r0, r29, 0x56c -/* 80593BAC 90 1E 00 00 */ stw r0, 0(r30) -/* 80593BB0 7F A3 EB 78 */ mr r3, r29 -/* 80593BB4 4B FF FA 7D */ bl setBaseMtx__12daObjMGate_cFv -/* 80593BB8 80 1D 05 C8 */ lwz r0, 0x5c8(r29) -/* 80593BBC 1C 00 0F A0 */ mulli r0, r0, 0xfa0 -/* 80593BC0 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80593BC4 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80593BC8 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80593BCC 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80593BD0 C0 1D 05 C4 */ lfs f0, 0x5c4(r29) -/* 80593BD4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80593BD8 FC 00 00 1E */ fctiwz f0, f0 -/* 80593BDC D8 01 00 30 */ stfd f0, 0x30(r1) -/* 80593BE0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80593BE4 B0 1D 05 BC */ sth r0, 0x5bc(r29) -/* 80593BE8 80 1D 05 C8 */ lwz r0, 0x5c8(r29) -/* 80593BEC 1C 00 17 70 */ mulli r0, r0, 0x1770 -/* 80593BF0 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80593BF4 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80593BF8 C0 1D 05 C0 */ lfs f0, 0x5c0(r29) -/* 80593BFC EC 00 00 72 */ fmuls f0, f0, f1 -/* 80593C00 FC 00 00 1E */ fctiwz f0, f0 -/* 80593C04 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80593C08 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80593C0C B0 1D 05 CC */ sth r0, 0x5cc(r29) -/* 80593C10 38 7D 05 C4 */ addi r3, r29, 0x5c4 -/* 80593C14 C0 3F 00 A8 */ lfs f1, 0xa8(r31) -/* 80593C18 C0 5F 00 AC */ lfs f2, 0xac(r31) -/* 80593C1C 4B CD BE 65 */ bl cLib_addCalc0__FPfff -/* 80593C20 38 7D 05 C0 */ addi r3, r29, 0x5c0 -/* 80593C24 C0 3F 00 B0 */ lfs f1, 0xb0(r31) -/* 80593C28 C0 5F 00 AC */ lfs f2, 0xac(r31) -/* 80593C2C 4B CD BE 55 */ bl cLib_addCalc0__FPfff -/* 80593C30 38 60 00 01 */ li r3, 1 -/* 80593C34 39 61 00 50 */ addi r11, r1, 0x50 -/* 80593C38 4B DC E5 F1 */ bl _restgpr_29 -/* 80593C3C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80593C40 7C 08 03 A6 */ mtlr r0 -/* 80593C44 38 21 00 50 */ addi r1, r1, 0x50 -/* 80593C48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/create1st__12daObjMGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/create1st__12daObjMGate_cFv.s deleted file mode 100644 index 1bb7d06d25..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/create1st__12daObjMGate_cFv.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_8059388C: -/* 8059388C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80593890 7C 08 02 A6 */ mflr r0 -/* 80593894 90 01 00 14 */ stw r0, 0x14(r1) -/* 80593898 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059389C 93 C1 00 08 */ stw r30, 8(r1) -/* 805938A0 7C 7E 1B 78 */ mr r30, r3 -/* 805938A4 3C 60 80 59 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80593F68@ha */ -/* 805938A8 3B E3 3F 68 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x80593F68@l */ -/* 805938AC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805938B0 54 00 FF 3E */ rlwinm r0, r0, 0x1f, 0x1c, 0x1f -/* 805938B4 98 1E 05 B9 */ stb r0, 0x5b9(r30) -/* 805938B8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805938BC 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 805938C0 98 1E 05 B8 */ stb r0, 0x5b8(r30) -/* 805938C4 38 7E 05 A8 */ addi r3, r30, 0x5a8 -/* 805938C8 80 9F 00 38 */ lwz r4, 0x38(r31) -/* 805938CC 4B A9 95 F1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 805938D0 2C 03 00 04 */ cmpwi r3, 4 -/* 805938D4 41 82 00 08 */ beq lbl_805938DC -/* 805938D8 48 00 00 98 */ b lbl_80593970 -lbl_805938DC: -/* 805938DC 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 805938E0 88 1E 05 B9 */ lbz r0, 0x5b9(r30) -/* 805938E4 54 00 10 3A */ slwi r0, r0, 2 -/* 805938E8 38 9F 00 20 */ addi r4, r31, 0x20 -/* 805938EC 7C 84 00 2E */ lwzx r4, r4, r0 -/* 805938F0 4B A9 95 CD */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 805938F4 7C 60 1B 78 */ mr r0, r3 -/* 805938F8 2C 00 00 04 */ cmpwi r0, 4 -/* 805938FC 40 82 00 70 */ bne lbl_8059396C -/* 80593900 88 1E 05 B9 */ lbz r0, 0x5b9(r30) -/* 80593904 54 00 10 3A */ slwi r0, r0, 2 -/* 80593908 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059390C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80593910 3C 63 00 02 */ addis r3, r3, 2 -/* 80593914 38 9F 00 20 */ addi r4, r31, 0x20 -/* 80593918 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8059391C 38 BF 00 30 */ addi r5, r31, 0x30 -/* 80593920 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80593924 38 63 C2 F8 */ addi r3, r3, -15624 -/* 80593928 4B AA 8D 91 */ bl getObjectResName2Index__14dRes_control_cFPCcPCc -/* 8059392C 7C 65 1B 78 */ mr r5, r3 -/* 80593930 7F C3 F3 78 */ mr r3, r30 -/* 80593934 88 1E 05 B9 */ lbz r0, 0x5b9(r30) -/* 80593938 54 00 10 3A */ slwi r0, r0, 2 -/* 8059393C 38 9F 00 20 */ addi r4, r31, 0x20 -/* 80593940 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80593944 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80593948 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 8059394C 3C E0 80 00 */ lis r7, 0x8000 /* 0x80004000@ha */ -/* 80593950 38 E7 40 00 */ addi r7, r7, 0x4000 /* 0x80004000@l */ -/* 80593954 39 00 00 00 */ li r8, 0 -/* 80593958 4B AE 4E 65 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 8059395C 7C 60 1B 78 */ mr r0, r3 -/* 80593960 2C 00 00 05 */ cmpwi r0, 5 -/* 80593964 40 82 00 08 */ bne lbl_8059396C -/* 80593968 48 00 00 08 */ b lbl_80593970 -lbl_8059396C: -/* 8059396C 7C 03 03 78 */ mr r3, r0 -lbl_80593970: -/* 80593970 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80593974 83 C1 00 08 */ lwz r30, 8(r1) -/* 80593978 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059397C 7C 08 03 A6 */ mtlr r0 -/* 80593980 38 21 00 10 */ addi r1, r1, 0x10 -/* 80593984 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGDelete__FP12daObjMGate_c.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGDelete__FP12daObjMGate_c.s deleted file mode 100644 index 4ed352a5b6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGDelete__FP12daObjMGate_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80593DD4: -/* 80593DD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80593DD8 7C 08 02 A6 */ mflr r0 -/* 80593DDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80593DE0 4B AE 4A FD */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80593DE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80593DE8 7C 08 03 A6 */ mtlr r0 -/* 80593DEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80593DF0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGDraw__FP12daObjMGate_c.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGDraw__FP12daObjMGate_c.s deleted file mode 100644 index aa31d3a853..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGDraw__FP12daObjMGate_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80593E14: -/* 80593E14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80593E18 7C 08 02 A6 */ mflr r0 -/* 80593E1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80593E20 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80593E24 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80593E28 7D 89 03 A6 */ mtctr r12 -/* 80593E2C 4E 80 04 21 */ bctrl -/* 80593E30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80593E34 7C 08 03 A6 */ mtlr r0 -/* 80593E38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80593E3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGExecute__FP12daObjMGate_c.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGExecute__FP12daObjMGate_c.s deleted file mode 100644 index 14ecc25e7d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGExecute__FP12daObjMGate_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80593DF4: -/* 80593DF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80593DF8 7C 08 02 A6 */ mflr r0 -/* 80593DFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80593E00 4B AE 4B 51 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80593E04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80593E08 7C 08 03 A6 */ mtlr r0 -/* 80593E0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80593E10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_create1st__FP12daObjMGate_c.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_create1st__FP12daObjMGate_c.s deleted file mode 100644 index 8b75fe84e7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_create1st__FP12daObjMGate_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80593D74: -/* 80593D74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80593D78 7C 08 02 A6 */ mflr r0 -/* 80593D7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80593D80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80593D84 7C 7F 1B 78 */ mr r31, r3 -/* 80593D88 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80593D8C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80593D90 40 82 00 28 */ bne lbl_80593DB8 -/* 80593D94 28 1F 00 00 */ cmplwi r31, 0 -/* 80593D98 41 82 00 14 */ beq lbl_80593DAC -/* 80593D9C 4B AE 48 89 */ bl __ct__16dBgS_MoveBgActorFv -/* 80593DA0 3C 60 80 59 */ lis r3, __vt__12daObjMGate_c@ha /* 0x80593FF8@ha */ -/* 80593DA4 38 03 3F F8 */ addi r0, r3, __vt__12daObjMGate_c@l /* 0x80593FF8@l */ -/* 80593DA8 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80593DAC: -/* 80593DAC 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80593DB0 60 00 00 08 */ ori r0, r0, 8 -/* 80593DB4 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80593DB8: -/* 80593DB8 7F E3 FB 78 */ mr r3, r31 -/* 80593DBC 4B FF FA D1 */ bl create1st__12daObjMGate_cFv -/* 80593DC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80593DC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80593DC8 7C 08 03 A6 */ mtlr r0 -/* 80593DCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80593DD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/initBaseMtx__12daObjMGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/initBaseMtx__12daObjMGate_cFv.s deleted file mode 100644 index 359590a409..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/initBaseMtx__12daObjMGate_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_805935B8: -/* 805935B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805935BC 7C 08 02 A6 */ mflr r0 -/* 805935C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 805935C4 80 83 05 B4 */ lwz r4, 0x5b4(r3) -/* 805935C8 28 04 00 00 */ cmplwi r4, 0 -/* 805935CC 41 82 00 1C */ beq lbl_805935E8 -/* 805935D0 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 805935D4 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 805935D8 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 805935DC D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 805935E0 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 805935E4 D0 04 00 20 */ stfs f0, 0x20(r4) -lbl_805935E8: -/* 805935E8 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 805935EC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 805935F0 40 82 00 10 */ bne lbl_80593600 -/* 805935F4 3C 80 80 59 */ lis r4, lit_3670@ha /* 0x80593ED4@ha */ -/* 805935F8 C0 04 3E D4 */ lfs f0, lit_3670@l(r4) /* 0x80593ED4@l */ -/* 805935FC D0 03 04 F4 */ stfs f0, 0x4f4(r3) -lbl_80593600: -/* 80593600 80 83 05 B0 */ lwz r4, 0x5b0(r3) -/* 80593604 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80593608 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 8059360C C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80593610 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80593614 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80593618 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 8059361C 48 00 00 15 */ bl setBaseMtx__12daObjMGate_cFv -/* 80593620 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80593624 7C 08 03 A6 */ mtlr r0 -/* 80593628 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059362C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/setBaseMtx__12daObjMGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/setBaseMtx__12daObjMGate_cFv.s deleted file mode 100644 index 7de2ed119e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/setBaseMtx__12daObjMGate_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_80593630: -/* 80593630 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80593634 7C 08 02 A6 */ mflr r0 -/* 80593638 90 01 00 24 */ stw r0, 0x24(r1) -/* 8059363C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80593640 7C 7F 1B 78 */ mr r31, r3 -/* 80593644 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80593648 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059364C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80593650 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80593654 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80593658 4B DB 32 91 */ bl PSMTXTrans -/* 8059365C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80593660 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80593664 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80593668 4B A7 8D CD */ bl mDoMtx_YrotM__FPA4_fs -/* 8059366C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80593670 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80593674 A8 9F 05 BA */ lha r4, 0x5ba(r31) -/* 80593678 A8 BF 05 BC */ lha r5, 0x5bc(r31) -/* 8059367C A8 DF 05 BE */ lha r6, 0x5be(r31) -/* 80593680 4B A7 8C 21 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80593684 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80593688 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059368C 80 9F 05 B0 */ lwz r4, 0x5b0(r31) -/* 80593690 38 84 00 24 */ addi r4, r4, 0x24 -/* 80593694 4B DB 2E 1D */ bl PSMTXCopy -/* 80593698 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059369C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 805936A0 38 9F 05 6C */ addi r4, r31, 0x56c -/* 805936A4 4B DB 2E 0D */ bl PSMTXCopy -/* 805936A8 80 1F 05 B4 */ lwz r0, 0x5b4(r31) -/* 805936AC 28 00 00 00 */ cmplwi r0, 0 -/* 805936B0 41 82 00 9C */ beq lbl_8059374C -/* 805936B4 88 1F 05 B9 */ lbz r0, 0x5b9(r31) -/* 805936B8 1C 80 00 0C */ mulli r4, r0, 0xc -/* 805936BC 3C 60 80 59 */ lis r3, l_key_offset@ha /* 0x80593E48@ha */ -/* 805936C0 38 03 3E 48 */ addi r0, r3, l_key_offset@l /* 0x80593E48@l */ -/* 805936C4 7C 60 22 14 */ add r3, r0, r4 -/* 805936C8 C0 03 00 00 */ lfs f0, 0(r3) -/* 805936CC D0 01 00 08 */ stfs f0, 8(r1) -/* 805936D0 C0 03 00 04 */ lfs f0, 4(r3) -/* 805936D4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 805936D8 C0 03 00 08 */ lfs f0, 8(r3) -/* 805936DC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 805936E0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 805936E4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 805936E8 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 805936EC C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 805936F0 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 805936F4 4B DB 31 F5 */ bl PSMTXTrans -/* 805936F8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 805936FC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80593700 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80593704 4B A7 8D 31 */ bl mDoMtx_YrotM__FPA4_fs -/* 80593708 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059370C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80593710 A8 9F 05 BA */ lha r4, 0x5ba(r31) -/* 80593714 A8 BF 05 BC */ lha r5, 0x5bc(r31) -/* 80593718 A8 DF 05 BE */ lha r6, 0x5be(r31) -/* 8059371C 4B A7 8B 85 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80593720 38 61 00 08 */ addi r3, r1, 8 -/* 80593724 4B A7 96 B1 */ bl transM__14mDoMtx_stack_cFRC4cXyz -/* 80593728 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059372C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80593730 A8 9F 05 CC */ lha r4, 0x5cc(r31) -/* 80593734 4B A7 8C 69 */ bl mDoMtx_XrotM__FPA4_fs -/* 80593738 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059373C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80593740 80 9F 05 B4 */ lwz r4, 0x5b4(r31) -/* 80593744 38 84 00 24 */ addi r4, r4, 0x24 -/* 80593748 4B DB 2D 69 */ bl PSMTXCopy -lbl_8059374C: -/* 8059374C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80593750 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80593754 7C 08 03 A6 */ mtlr r0 -/* 80593758 38 21 00 20 */ addi r1, r1, 0x20 -/* 8059375C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index ebdf319ca0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D21B30: -/* 80D21B30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D21B34 7C 08 02 A6 */ mflr r0 -/* 80D21B38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D21B3C 48 00 02 45 */ bl CreateHeap__15daObjVolcBall_cFv -/* 80D21B40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D21B44 7C 08 03 A6 */ mtlr r0 -/* 80D21B48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D21B4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/CreateHeap__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/CreateHeap__15daObjVolcBall_cFv.s deleted file mode 100644 index d9295df97d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/CreateHeap__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80D21D80: -/* 80D21D80 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D21D84 7C 08 02 A6 */ mflr r0 -/* 80D21D88 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D21D8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D21D90 4B 64 04 45 */ bl _savegpr_27 -/* 80D21D94 7C 7B 1B 78 */ mr r27, r3 -/* 80D21D98 3C 60 80 D2 */ lis r3, l_arcName@ha /* 0x80D23EAC@ha */ -/* 80D21D9C 38 63 3E AC */ addi r3, r3, l_arcName@l /* 0x80D23EAC@l */ -/* 80D21DA0 80 63 00 00 */ lwz r3, 0(r3) -/* 80D21DA4 38 80 00 03 */ li r4, 3 -/* 80D21DA8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D21DAC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D21DB0 3C A5 00 02 */ addis r5, r5, 2 -/* 80D21DB4 38 C0 00 80 */ li r6, 0x80 -/* 80D21DB8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80D21DBC 4B 31 A5 31 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D21DC0 7C 7D 1B 78 */ mr r29, r3 -/* 80D21DC4 3B 80 00 00 */ li r28, 0 -/* 80D21DC8 3B E0 00 00 */ li r31, 0 -/* 80D21DCC 3F C0 11 00 */ lis r30, 0x1100 /* 0x11000084@ha */ -lbl_80D21DD0: -/* 80D21DD0 7F A3 EB 78 */ mr r3, r29 -/* 80D21DD4 3C 80 00 08 */ lis r4, 8 -/* 80D21DD8 38 BE 00 84 */ addi r5, r30, 0x0084 /* 0x11000084@l */ -/* 80D21DDC 4B 2F 2E 79 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D21DE0 38 1F 06 0C */ addi r0, r31, 0x60c -/* 80D21DE4 7C 7B 01 2E */ stwx r3, r27, r0 -/* 80D21DE8 7C 1B 00 2E */ lwzx r0, r27, r0 -/* 80D21DEC 28 00 00 00 */ cmplwi r0, 0 -/* 80D21DF0 40 82 00 0C */ bne lbl_80D21DFC -/* 80D21DF4 38 60 00 00 */ li r3, 0 -/* 80D21DF8 48 00 00 18 */ b lbl_80D21E10 -lbl_80D21DFC: -/* 80D21DFC 3B 9C 00 01 */ addi r28, r28, 1 -/* 80D21E00 2C 1C 00 09 */ cmpwi r28, 9 -/* 80D21E04 3B FF 03 E0 */ addi r31, r31, 0x3e0 -/* 80D21E08 41 80 FF C8 */ blt lbl_80D21DD0 -/* 80D21E0C 38 60 00 01 */ li r3, 1 -lbl_80D21E10: -/* 80D21E10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D21E14 4B 64 04 0D */ bl _restgpr_27 -/* 80D21E18 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D21E1C 7C 08 03 A6 */ mtlr r0 -/* 80D21E20 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D21E24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/_delete__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/_delete__15daObjVolcBall_cFv.s deleted file mode 100644 index 93eef483fe..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/_delete__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80D23A0C: -/* 80D23A0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D23A10 7C 08 02 A6 */ mflr r0 -/* 80D23A14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D23A18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D23A1C 93 C1 00 08 */ stw r30, 8(r1) -/* 80D23A20 7C 7E 1B 78 */ mr r30, r3 -/* 80D23A24 38 7E 05 7C */ addi r3, r30, 0x57c -/* 80D23A28 3C 80 80 D2 */ lis r4, l_arcName@ha /* 0x80D23EAC@ha */ -/* 80D23A2C 38 84 3E AC */ addi r4, r4, l_arcName@l /* 0x80D23EAC@l */ -/* 80D23A30 80 84 00 00 */ lwz r4, 0(r4) -/* 80D23A34 4B 30 95 D5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D23A38 88 1E 06 00 */ lbz r0, 0x600(r30) -/* 80D23A3C 28 00 00 00 */ cmplwi r0, 0 -/* 80D23A40 41 82 00 18 */ beq lbl_80D23A58 -/* 80D23A44 28 00 00 01 */ cmplwi r0, 1 -/* 80D23A48 40 82 00 24 */ bne lbl_80D23A6C -/* 80D23A4C 88 1E 29 26 */ lbz r0, 0x2926(r30) -/* 80D23A50 28 00 00 00 */ cmplwi r0, 0 -/* 80D23A54 41 82 00 18 */ beq lbl_80D23A6C -lbl_80D23A58: -/* 80D23A58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D23A5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D23A60 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80D23A64 38 80 00 1F */ li r4, 0x1f -/* 80D23A68 4B 34 C3 2D */ bl StopQuake__12dVibration_cFi -lbl_80D23A6C: -/* 80D23A6C 3B E0 00 00 */ li r31, 0 -lbl_80D23A70: -/* 80D23A70 7F C3 F3 78 */ mr r3, r30 -/* 80D23A74 7F E4 FB 78 */ mr r4, r31 -/* 80D23A78 4B FF F5 55 */ bl endFallEffect__15daObjVolcBall_cFi -/* 80D23A7C 3B FF 00 01 */ addi r31, r31, 1 -/* 80D23A80 2C 1F 00 09 */ cmpwi r31, 9 -/* 80D23A84 41 80 FF EC */ blt lbl_80D23A70 -/* 80D23A88 38 60 00 01 */ li r3, 1 -/* 80D23A8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D23A90 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D23A94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D23A98 7C 08 03 A6 */ mtlr r0 -/* 80D23A9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D23AA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionStop__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionStop__15daObjVolcBall_cFv.s deleted file mode 100644 index 28fef9b4b0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionStop__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80D22724: -/* 80D22724 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D22728 7C 08 02 A6 */ mflr r0 -/* 80D2272C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D22730 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80D22734 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80D22738 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D2273C 7C 7F 1B 78 */ mr r31, r3 -/* 80D22740 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D22744 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D22748 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D2274C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80D22750 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80D22754 7C 05 07 74 */ extsb r5, r0 -/* 80D22758 4B 31 2C 09 */ bl isSwitch__10dSv_info_cCFii -/* 80D2275C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D22760 40 82 00 0C */ bne lbl_80D2276C -/* 80D22764 38 00 00 01 */ li r0, 1 -/* 80D22768 98 1F 06 01 */ stb r0, 0x601(r31) -lbl_80D2276C: -/* 80D2276C 38 7F 06 04 */ addi r3, r31, 0x604 -/* 80D22770 48 00 16 19 */ bl func_80D23D88 -/* 80D22774 28 03 00 00 */ cmplwi r3, 0 -/* 80D22778 40 82 00 50 */ bne lbl_80D227C8 -/* 80D2277C 7F E3 FB 78 */ mr r3, r31 -/* 80D22780 4B FF F3 99 */ bl getData__15daObjVolcBall_cFv -/* 80D22784 C0 23 00 30 */ lfs f1, 0x30(r3) -/* 80D22788 3C 60 80 D2 */ lis r3, lit_3715@ha /* 0x80D23E0C@ha */ -/* 80D2278C C0 03 3E 0C */ lfs f0, lit_3715@l(r3) /* 0x80D23E0C@l */ -/* 80D22790 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80D22794 4B 54 51 F9 */ bl cM_rndFX__Ff -/* 80D22798 FF E0 08 90 */ fmr f31, f1 -/* 80D2279C 7F E3 FB 78 */ mr r3, r31 -/* 80D227A0 4B FF F3 79 */ bl getData__15daObjVolcBall_cFv -/* 80D227A4 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80D227A8 3C 60 80 D2 */ lis r3, lit_3715@ha /* 0x80D23E0C@ha */ -/* 80D227AC C0 03 3E 0C */ lfs f0, lit_3715@l(r3) /* 0x80D23E0C@l */ -/* 80D227B0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80D227B4 EC 20 F8 2A */ fadds f1, f0, f31 -/* 80D227B8 4B 63 F8 F5 */ bl __cvt_fp2unsigned -/* 80D227BC 90 7F 06 04 */ stw r3, 0x604(r31) -/* 80D227C0 7F E3 FB 78 */ mr r3, r31 -/* 80D227C4 4B FF FD B9 */ bl initActionWarning__15daObjVolcBall_cFv -lbl_80D227C8: -/* 80D227C8 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80D227CC CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80D227D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D227D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D227D8 7C 08 03 A6 */ mtlr r0 -/* 80D227DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D227E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionSwWait__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionSwWait__15daObjVolcBall_cFv.s deleted file mode 100644 index 4feb729e5c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionSwWait__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80D2267C: -/* 80D2267C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D22680 7C 08 02 A6 */ mflr r0 -/* 80D22684 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D22688 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80D2268C F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80D22690 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D22694 7C 7F 1B 78 */ mr r31, r3 -/* 80D22698 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D2269C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D226A0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D226A4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80D226A8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80D226AC 7C 05 07 74 */ extsb r5, r0 -/* 80D226B0 4B 31 2C B1 */ bl isSwitch__10dSv_info_cCFii -/* 80D226B4 2C 03 00 00 */ cmpwi r3, 0 -/* 80D226B8 41 82 00 50 */ beq lbl_80D22708 -/* 80D226BC 38 00 00 02 */ li r0, 2 -/* 80D226C0 98 1F 06 01 */ stb r0, 0x601(r31) -/* 80D226C4 7F E3 FB 78 */ mr r3, r31 -/* 80D226C8 4B FF F4 51 */ bl getData__15daObjVolcBall_cFv -/* 80D226CC C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80D226D0 3C 60 80 D2 */ lis r3, lit_3715@ha /* 0x80D23E0C@ha */ -/* 80D226D4 C0 03 3E 0C */ lfs f0, lit_3715@l(r3) /* 0x80D23E0C@l */ -/* 80D226D8 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80D226DC 4B 54 52 B1 */ bl cM_rndFX__Ff -/* 80D226E0 FF E0 08 90 */ fmr f31, f1 -/* 80D226E4 7F E3 FB 78 */ mr r3, r31 -/* 80D226E8 4B FF F4 31 */ bl getData__15daObjVolcBall_cFv -/* 80D226EC C0 23 00 24 */ lfs f1, 0x24(r3) -/* 80D226F0 3C 60 80 D2 */ lis r3, lit_3715@ha /* 0x80D23E0C@ha */ -/* 80D226F4 C0 03 3E 0C */ lfs f0, lit_3715@l(r3) /* 0x80D23E0C@l */ -/* 80D226F8 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80D226FC EC 20 F8 2A */ fadds f1, f0, f31 -/* 80D22700 4B 63 F9 AD */ bl __cvt_fp2unsigned -/* 80D22704 90 7F 06 04 */ stw r3, 0x604(r31) -lbl_80D22708: -/* 80D22708 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80D2270C CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80D22710 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D22714 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D22718 7C 08 03 A6 */ mtlr r0 -/* 80D2271C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D22720 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/action__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/action__15daObjVolcBall_cFv.s deleted file mode 100644 index e00ffc02bf..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/action__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80D22484: -/* 80D22484 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D22488 7C 08 02 A6 */ mflr r0 -/* 80D2248C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D22490 3C 80 80 D2 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80D23E8C@ha */ -/* 80D22494 38 84 3E 8C */ addi r4, r4, cNullVec__6Z2Calc@l /* 0x80D23E8C@l */ -/* 80D22498 3C A0 80 D2 */ lis r5, data_80D24100@ha /* 0x80D24100@ha */ -/* 80D2249C 38 E5 41 00 */ addi r7, r5, data_80D24100@l /* 0x80D24100@l */ -/* 80D224A0 88 07 00 00 */ lbz r0, 0(r7) -/* 80D224A4 7C 00 07 75 */ extsb. r0, r0 -/* 80D224A8 40 82 00 A0 */ bne lbl_80D22548 -/* 80D224AC 80 A4 00 CC */ lwz r5, 0xcc(r4) -/* 80D224B0 80 04 00 D0 */ lwz r0, 0xd0(r4) -/* 80D224B4 90 A4 01 14 */ stw r5, 0x114(r4) -/* 80D224B8 90 04 01 18 */ stw r0, 0x118(r4) -/* 80D224BC 80 04 00 D4 */ lwz r0, 0xd4(r4) -/* 80D224C0 90 04 01 1C */ stw r0, 0x11c(r4) -/* 80D224C4 38 C4 01 14 */ addi r6, r4, 0x114 -/* 80D224C8 80 A4 00 D8 */ lwz r5, 0xd8(r4) -/* 80D224CC 80 04 00 DC */ lwz r0, 0xdc(r4) -/* 80D224D0 90 A6 00 0C */ stw r5, 0xc(r6) -/* 80D224D4 90 06 00 10 */ stw r0, 0x10(r6) -/* 80D224D8 80 04 00 E0 */ lwz r0, 0xe0(r4) -/* 80D224DC 90 06 00 14 */ stw r0, 0x14(r6) -/* 80D224E0 80 A4 00 E4 */ lwz r5, 0xe4(r4) -/* 80D224E4 80 04 00 E8 */ lwz r0, 0xe8(r4) -/* 80D224E8 90 A6 00 18 */ stw r5, 0x18(r6) -/* 80D224EC 90 06 00 1C */ stw r0, 0x1c(r6) -/* 80D224F0 80 04 00 EC */ lwz r0, 0xec(r4) -/* 80D224F4 90 06 00 20 */ stw r0, 0x20(r6) -/* 80D224F8 80 A4 00 F0 */ lwz r5, 0xf0(r4) -/* 80D224FC 80 04 00 F4 */ lwz r0, 0xf4(r4) -/* 80D22500 90 A6 00 24 */ stw r5, 0x24(r6) -/* 80D22504 90 06 00 28 */ stw r0, 0x28(r6) -/* 80D22508 80 04 00 F8 */ lwz r0, 0xf8(r4) -/* 80D2250C 90 06 00 2C */ stw r0, 0x2c(r6) -/* 80D22510 80 A4 00 FC */ lwz r5, 0xfc(r4) -/* 80D22514 80 04 01 00 */ lwz r0, 0x100(r4) -/* 80D22518 90 A6 00 30 */ stw r5, 0x30(r6) -/* 80D2251C 90 06 00 34 */ stw r0, 0x34(r6) -/* 80D22520 80 04 01 04 */ lwz r0, 0x104(r4) -/* 80D22524 90 06 00 38 */ stw r0, 0x38(r6) -/* 80D22528 80 A4 01 08 */ lwz r5, 0x108(r4) -/* 80D2252C 80 04 01 0C */ lwz r0, 0x10c(r4) -/* 80D22530 90 A6 00 3C */ stw r5, 0x3c(r6) -/* 80D22534 90 06 00 40 */ stw r0, 0x40(r6) -/* 80D22538 80 04 01 10 */ lwz r0, 0x110(r4) -/* 80D2253C 90 06 00 44 */ stw r0, 0x44(r6) -/* 80D22540 38 00 00 01 */ li r0, 1 -/* 80D22544 98 07 00 00 */ stb r0, 0(r7) -lbl_80D22548: -/* 80D22548 88 03 06 01 */ lbz r0, 0x601(r3) -/* 80D2254C 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80D22550 39 84 01 14 */ addi r12, r4, 0x114 -/* 80D22554 7D 8C 02 14 */ add r12, r12, r0 -/* 80D22558 4B 63 FB 2D */ bl __ptmf_scall -/* 80D2255C 60 00 00 00 */ nop -/* 80D22560 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D22564 7C 08 03 A6 */ mtlr r0 -/* 80D22568 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D2256C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 0c8110d755..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D23B04: -/* 80D23B04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D23B08 7C 08 02 A6 */ mflr r0 -/* 80D23B0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D23B10 4B FF E3 19 */ bl create__15daObjVolcBall_cFv -/* 80D23B14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D23B18 7C 08 03 A6 */ mtlr r0 -/* 80D23B1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D23B20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Delete__FP15daObjVolcBall_c.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Delete__FP15daObjVolcBall_c.s deleted file mode 100644 index 10be48367b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Delete__FP15daObjVolcBall_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D23AE4: -/* 80D23AE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D23AE8 7C 08 02 A6 */ mflr r0 -/* 80D23AEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D23AF0 4B FF FF 1D */ bl _delete__15daObjVolcBall_cFv -/* 80D23AF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D23AF8 7C 08 03 A6 */ mtlr r0 -/* 80D23AFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D23B00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Draw__FP15daObjVolcBall_c.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Draw__FP15daObjVolcBall_c.s deleted file mode 100644 index e0ce71a336..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Draw__FP15daObjVolcBall_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D23AA4: -/* 80D23AA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D23AA8 7C 08 02 A6 */ mflr r0 -/* 80D23AAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D23AB0 4B FF FE 55 */ bl draw__15daObjVolcBall_cFv -/* 80D23AB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D23AB8 7C 08 03 A6 */ mtlr r0 -/* 80D23ABC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D23AC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Execute__FP15daObjVolcBall_c.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Execute__FP15daObjVolcBall_c.s deleted file mode 100644 index 11fb991911..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Execute__FP15daObjVolcBall_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D23AC4: -/* 80D23AC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D23AC8 7C 08 02 A6 */ mflr r0 -/* 80D23ACC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D23AD0 4B FF E9 55 */ bl execute__15daObjVolcBall_cFv -/* 80D23AD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D23AD8 7C 08 03 A6 */ mtlr r0 -/* 80D23ADC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D23AE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/endFallEffect__15daObjVolcBall_cFi.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/endFallEffect__15daObjVolcBall_cFi.s deleted file mode 100644 index 4fff5c5e84..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/endFallEffect__15daObjVolcBall_cFi.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80D22FCC: -/* 80D22FCC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D22FD0 7C 08 02 A6 */ mflr r0 -/* 80D22FD4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D22FD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D22FDC 4B 63 F2 01 */ bl _savegpr_29 -/* 80D22FE0 1C 84 03 E0 */ mulli r4, r4, 0x3e0 -/* 80D22FE4 3B C4 06 0C */ addi r30, r4, 0x60c -/* 80D22FE8 7F C3 F2 14 */ add r30, r3, r30 -/* 80D22FEC 3B A0 00 00 */ li r29, 0 -/* 80D22FF0 3B E0 00 00 */ li r31, 0 -lbl_80D22FF4: -/* 80D22FF4 38 7F 03 90 */ addi r3, r31, 0x390 -/* 80D22FF8 7C 7E 1A 14 */ add r3, r30, r3 -/* 80D22FFC 81 83 00 00 */ lwz r12, 0(r3) -/* 80D23000 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80D23004 7D 89 03 A6 */ mtctr r12 -/* 80D23008 4E 80 04 21 */ bctrl -/* 80D2300C 3B BD 00 01 */ addi r29, r29, 1 -/* 80D23010 2C 1D 00 04 */ cmpwi r29, 4 -/* 80D23014 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80D23018 41 80 FF DC */ blt lbl_80D22FF4 -/* 80D2301C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D23020 4B 63 F2 09 */ bl _restgpr_29 -/* 80D23024 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D23028 7C 08 03 A6 */ mtlr r0 -/* 80D2302C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D23030 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/eventStart__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/eventStart__15daObjVolcBall_cFv.s deleted file mode 100644 index 8f9d458291..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/eventStart__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D22DDC: -/* 80D22DDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D22DE0 7C 08 02 A6 */ mflr r0 -/* 80D22DE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D22DE8 80 03 29 20 */ lwz r0, 0x2920(r3) -/* 80D22DEC 90 01 00 08 */ stw r0, 8(r1) -/* 80D22DF0 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80D22DF4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80D22DF8 38 81 00 08 */ addi r4, r1, 8 -/* 80D22DFC 4B 2F 69 FD */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80D22E00 28 03 00 00 */ cmplwi r3, 0 -/* 80D22E04 41 82 00 0C */ beq lbl_80D22E10 -/* 80D22E08 38 00 00 01 */ li r0, 1 -/* 80D22E0C 98 03 09 5F */ stb r0, 0x95f(r3) -lbl_80D22E10: -/* 80D22E10 38 60 00 01 */ li r3, 1 -/* 80D22E14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D22E18 7C 08 03 A6 */ mtlr r0 -/* 80D22E1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D22E20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/execute__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/execute__15daObjVolcBall_cFv.s deleted file mode 100644 index 9acc44d06f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/execute__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80D22424: -/* 80D22424 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D22428 7C 08 02 A6 */ mflr r0 -/* 80D2242C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D22430 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80D22434 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80D22438 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D2243C 7C 7F 1B 78 */ mr r31, r3 -/* 80D22440 4B FF F6 D9 */ bl getData__15daObjVolcBall_cFv -/* 80D22444 C3 E3 00 00 */ lfs f31, 0(r3) -/* 80D22448 7F E3 FB 78 */ mr r3, r31 -/* 80D2244C 4B FF F6 CD */ bl getData__15daObjVolcBall_cFv -/* 80D22450 C0 03 00 04 */ lfs f0, 4(r3) -/* 80D22454 D3 FF 05 30 */ stfs f31, 0x530(r31) -/* 80D22458 D0 1F 05 34 */ stfs f0, 0x534(r31) -/* 80D2245C 7F E3 FB 78 */ mr r3, r31 -/* 80D22460 48 00 00 25 */ bl action__15daObjVolcBall_cFv -/* 80D22464 38 60 00 01 */ li r3, 1 -/* 80D22468 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80D2246C CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80D22470 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D22474 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D22478 7C 08 03 A6 */ mtlr r0 -/* 80D2247C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D22480 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/getData__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/getData__15daObjVolcBall_cFv.s deleted file mode 100644 index c20b8741bd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/getData__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80D21B18: -/* 80D21B18 88 03 06 00 */ lbz r0, 0x600(r3) -/* 80D21B1C 1C 80 00 54 */ mulli r4, r0, 0x54 -/* 80D21B20 3C 60 80 D2 */ lis r3, l_param@ha /* 0x80D23EB0@ha */ -/* 80D21B24 38 03 3E B0 */ addi r0, r3, l_param@l /* 0x80D23EB0@l */ -/* 80D21B28 7C 60 22 14 */ add r3, r0, r4 -/* 80D21B2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionEnd__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionEnd__15daObjVolcBall_cFv.s deleted file mode 100644 index aa0f374c37..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionEnd__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80D22C6C: -/* 80D22C6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D22C70 7C 08 02 A6 */ mflr r0 -/* 80D22C74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D22C78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D22C7C 7C 7F 1B 78 */ mr r31, r3 -/* 80D22C80 38 00 00 00 */ li r0, 0 -/* 80D22C84 98 03 29 25 */ stb r0, 0x2925(r3) -/* 80D22C88 98 03 29 24 */ stb r0, 0x2924(r3) -/* 80D22C8C 3C 60 80 D2 */ lis r3, search_big_volc__FPvPv@ha /* 0x80D21B50@ha */ -/* 80D22C90 38 63 1B 50 */ addi r3, r3, search_big_volc__FPvPv@l /* 0x80D21B50@l */ -/* 80D22C94 7F E4 FB 78 */ mr r4, r31 -/* 80D22C98 4B 2F 6B 61 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80D22C9C 28 03 00 00 */ cmplwi r3, 0 -/* 80D22CA0 41 82 00 18 */ beq lbl_80D22CB8 -/* 80D22CA4 41 82 00 0C */ beq lbl_80D22CB0 -/* 80D22CA8 80 03 00 04 */ lwz r0, 4(r3) -/* 80D22CAC 48 00 00 08 */ b lbl_80D22CB4 -lbl_80D22CB0: -/* 80D22CB0 38 00 FF FF */ li r0, -1 -lbl_80D22CB4: -/* 80D22CB4 90 1F 29 20 */ stw r0, 0x2920(r31) -lbl_80D22CB8: -/* 80D22CB8 38 00 00 05 */ li r0, 5 -/* 80D22CBC 98 1F 06 01 */ stb r0, 0x601(r31) -/* 80D22CC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D22CC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D22CC8 7C 08 03 A6 */ mtlr r0 -/* 80D22CCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D22CD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionPlayerWait__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionPlayerWait__15daObjVolcBall_cFv.s deleted file mode 100644 index 296d0c967c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionPlayerWait__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80D22570: -/* 80D22570 38 00 00 00 */ li r0, 0 -/* 80D22574 98 03 06 01 */ stb r0, 0x601(r3) -/* 80D22578 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionSwWait__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionSwWait__15daObjVolcBall_cFv.s deleted file mode 100644 index 24d5477347..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionSwWait__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80D225A4: -/* 80D225A4 38 00 00 01 */ li r0, 1 -/* 80D225A8 98 03 06 01 */ stb r0, 0x601(r3) -/* 80D225AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionWarning__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionWarning__15daObjVolcBall_cFv.s deleted file mode 100644 index 04237c79b6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionWarning__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80D2257C: -/* 80D2257C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D22580 7C 08 02 A6 */ mflr r0 -/* 80D22584 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D22588 38 00 00 03 */ li r0, 3 -/* 80D2258C 98 03 06 01 */ stb r0, 0x601(r3) -/* 80D22590 48 00 12 D9 */ bl startQuake__15daObjVolcBall_cFv -/* 80D22594 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D22598 7C 08 03 A6 */ mtlr r0 -/* 80D2259C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D225A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initBaseMtx__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initBaseMtx__15daObjVolcBall_cFv.s deleted file mode 100644 index 02c4e05be4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initBaseMtx__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D21BA0: -/* 80D21BA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D21BA4 7C 08 02 A6 */ mflr r0 -/* 80D21BA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D21BAC 48 00 00 15 */ bl setBaseMtx__15daObjVolcBall_cFv -/* 80D21BB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D21BB4 7C 08 03 A6 */ mtlr r0 -/* 80D21BB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D21BBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/search_big_volc__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/search_big_volc__FPvPv.s deleted file mode 100644 index 57dfb943ae..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/search_big_volc__FPvPv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80D21B50: -/* 80D21B50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D21B54 7C 08 02 A6 */ mflr r0 -/* 80D21B58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D21B5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D21B60 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D21B64 41 82 00 24 */ beq lbl_80D21B88 -/* 80D21B68 4B 2F 71 79 */ bl fopAc_IsActor__FPv -/* 80D21B6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D21B70 41 82 00 18 */ beq lbl_80D21B88 -/* 80D21B74 A8 1F 00 0E */ lha r0, 0xe(r31) -/* 80D21B78 2C 00 00 E1 */ cmpwi r0, 0xe1 -/* 80D21B7C 40 82 00 0C */ bne lbl_80D21B88 -/* 80D21B80 7F E3 FB 78 */ mr r3, r31 -/* 80D21B84 48 00 00 08 */ b lbl_80D21B8C -lbl_80D21B88: -/* 80D21B88 38 60 00 00 */ li r3, 0 -lbl_80D21B8C: -/* 80D21B8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D21B90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D21B94 7C 08 03 A6 */ mtlr r0 -/* 80D21B98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D21B9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setBaseMtx__15daObjVolcBall_cFv.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setBaseMtx__15daObjVolcBall_cFv.s deleted file mode 100644 index 52776c9d3a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setBaseMtx__15daObjVolcBall_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80D21BC0: -/* 80D21BC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D21BC4 7C 08 02 A6 */ mflr r0 -/* 80D21BC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D21BCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D21BD0 7C 7F 1B 78 */ mr r31, r3 -/* 80D21BD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D21BD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D21BDC 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80D21BE0 88 1F 06 00 */ lbz r0, 0x600(r31) -/* 80D21BE4 28 00 00 00 */ cmplwi r0, 0 -/* 80D21BE8 40 82 00 1C */ bne lbl_80D21C04 -/* 80D21BEC C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80D21BF0 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80D21BF4 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80D21BF8 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80D21BFC C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80D21C00 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -lbl_80D21C04: -/* 80D21C04 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D21C08 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D21C0C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80D21C10 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80D21C14 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80D21C18 4B 62 4C D1 */ bl PSMTXTrans -/* 80D21C1C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D21C20 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D21C24 38 9F 28 EC */ addi r4, r31, 0x28ec -/* 80D21C28 4B 62 48 89 */ bl PSMTXCopy -/* 80D21C2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D21C30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D21C34 7C 08 03 A6 */ mtlr r0 -/* 80D21C38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D21C3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setEruptEffect__15daObjVolcBall_cFi.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setEruptEffect__15daObjVolcBall_cFi.s deleted file mode 100644 index 32c0d7bf72..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setEruptEffect__15daObjVolcBall_cFi.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80D22E24: -/* 80D22E24 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80D22E28 7C 08 02 A6 */ mflr r0 -/* 80D22E2C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80D22E30 39 61 00 40 */ addi r11, r1, 0x40 -/* 80D22E34 4B 63 F3 99 */ bl _savegpr_25 -/* 80D22E38 7C 79 1B 78 */ mr r25, r3 -/* 80D22E3C 1C 64 03 E0 */ mulli r3, r4, 0x3e0 -/* 80D22E40 3B 63 06 0C */ addi r27, r3, 0x60c -/* 80D22E44 7F 79 DA 14 */ add r27, r25, r27 -/* 80D22E48 3B 40 00 00 */ li r26, 0 -/* 80D22E4C 3B E0 00 00 */ li r31, 0 -/* 80D22E50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D22E54 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D22E58 3C 60 80 D2 */ lis r3, l_effect_id@ha /* 0x80D23E3C@ha */ -/* 80D22E5C 3B A3 3E 3C */ addi r29, r3, l_effect_id@l /* 0x80D23E3C@l */ -/* 80D22E60 3C 60 80 D2 */ lis r3, lit_3717@ha /* 0x80D23E14@ha */ -/* 80D22E64 3B C3 3E 14 */ addi r30, r3, lit_3717@l /* 0x80D23E14@l */ -lbl_80D22E68: -/* 80D22E68 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 80D22E6C 38 80 00 00 */ li r4, 0 -/* 80D22E70 90 81 00 08 */ stw r4, 8(r1) -/* 80D22E74 38 00 FF FF */ li r0, -1 -/* 80D22E78 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D22E7C 90 81 00 10 */ stw r4, 0x10(r1) -/* 80D22E80 90 81 00 14 */ stw r4, 0x14(r1) -/* 80D22E84 90 81 00 18 */ stw r4, 0x18(r1) -/* 80D22E88 38 80 00 00 */ li r4, 0 -/* 80D22E8C 7C BD FA 2E */ lhzx r5, r29, r31 -/* 80D22E90 38 DB 00 04 */ addi r6, r27, 4 -/* 80D22E94 38 F9 01 0C */ addi r7, r25, 0x10c -/* 80D22E98 39 00 00 00 */ li r8, 0 -/* 80D22E9C 39 3B 00 1C */ addi r9, r27, 0x1c -/* 80D22EA0 39 40 00 FF */ li r10, 0xff -/* 80D22EA4 C0 3E 00 00 */ lfs f1, 0(r30) -/* 80D22EA8 4B 32 9B E9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80D22EAC 3B 5A 00 01 */ addi r26, r26, 1 -/* 80D22EB0 2C 1A 00 06 */ cmpwi r26, 6 -/* 80D22EB4 3B FF 00 02 */ addi r31, r31, 2 -/* 80D22EB8 41 80 FF B0 */ blt lbl_80D22E68 -/* 80D22EBC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80D22EC0 4B 63 F3 59 */ bl _restgpr_25 -/* 80D22EC4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80D22EC8 7C 08 03 A6 */ mtlr r0 -/* 80D22ECC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80D22ED0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setFallEffect__15daObjVolcBall_cFi.s b/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setFallEffect__15daObjVolcBall_cFi.s deleted file mode 100644 index 4a73ed232a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setFallEffect__15daObjVolcBall_cFi.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_80D22ED4: -/* 80D22ED4 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80D22ED8 7C 08 02 A6 */ mflr r0 -/* 80D22EDC 90 01 00 64 */ stw r0, 0x64(r1) -/* 80D22EE0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80D22EE4 4B 63 F2 E1 */ bl _savegpr_23 -/* 80D22EE8 7C 7C 1B 78 */ mr r28, r3 -/* 80D22EEC 7C 9D 23 78 */ mr r29, r4 -/* 80D22EF0 1C 7D 03 E0 */ mulli r3, r29, 0x3e0 -/* 80D22EF4 3B E3 06 0C */ addi r31, r3, 0x60c -/* 80D22EF8 7F FC FA 14 */ add r31, r28, r31 -/* 80D22EFC 3B C0 00 00 */ li r30, 0 -/* 80D22F00 3B 60 00 00 */ li r27, 0 -/* 80D22F04 3B 40 00 00 */ li r26, 0 -/* 80D22F08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D22F0C 3A E3 61 C0 */ addi r23, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D22F10 3C 60 80 D2 */ lis r3, l_fall_effect_id@ha /* 0x80D23E48@ha */ -/* 80D22F14 3B 03 3E 48 */ addi r24, r3, l_fall_effect_id@l /* 0x80D23E48@l */ -/* 80D22F18 3C 60 80 D2 */ lis r3, lit_3717@ha /* 0x80D23E14@ha */ -/* 80D22F1C 3B 23 3E 14 */ addi r25, r3, lit_3717@l /* 0x80D23E14@l */ -lbl_80D22F20: -/* 80D22F20 2C 1D 00 08 */ cmpwi r29, 8 -/* 80D22F24 40 82 00 18 */ bne lbl_80D22F3C -/* 80D22F28 C0 1C 29 1C */ lfs f0, 0x291c(r28) -/* 80D22F2C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80D22F30 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80D22F34 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80D22F38 48 00 00 1C */ b lbl_80D22F54 -lbl_80D22F3C: -/* 80D22F3C C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 80D22F40 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80D22F44 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80D22F48 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80D22F4C C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80D22F50 D0 01 00 28 */ stfs f0, 0x28(r1) -lbl_80D22F54: -/* 80D22F54 80 77 5D 3C */ lwz r3, 0x5d3c(r23) -/* 80D22F58 38 1A 03 90 */ addi r0, r26, 0x390 -/* 80D22F5C 7C 1F 02 14 */ add r0, r31, r0 -/* 80D22F60 90 01 00 08 */ stw r0, 8(r1) -/* 80D22F64 38 00 FF FF */ li r0, -1 -/* 80D22F68 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D22F6C 38 00 00 00 */ li r0, 0 -/* 80D22F70 90 01 00 10 */ stw r0, 0x10(r1) -/* 80D22F74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D22F78 90 01 00 18 */ stw r0, 0x18(r1) -/* 80D22F7C 38 80 00 00 */ li r4, 0 -/* 80D22F80 7C B8 DA 2E */ lhzx r5, r24, r27 -/* 80D22F84 38 DF 00 04 */ addi r6, r31, 4 -/* 80D22F88 38 FC 01 0C */ addi r7, r28, 0x10c -/* 80D22F8C 39 1F 00 34 */ addi r8, r31, 0x34 -/* 80D22F90 39 21 00 20 */ addi r9, r1, 0x20 -/* 80D22F94 39 40 00 FF */ li r10, 0xff -/* 80D22F98 C0 39 00 00 */ lfs f1, 0(r25) -/* 80D22F9C 4B 32 9A F5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80D22FA0 3B DE 00 01 */ addi r30, r30, 1 -/* 80D22FA4 2C 1E 00 04 */ cmpwi r30, 4 -/* 80D22FA8 3B 7B 00 02 */ addi r27, r27, 2 -/* 80D22FAC 3B 5A 00 14 */ addi r26, r26, 0x14 -/* 80D22FB0 41 80 FF 70 */ blt lbl_80D22F20 -/* 80D22FB4 39 61 00 60 */ addi r11, r1, 0x60 -/* 80D22FB8 4B 63 F2 59 */ bl _restgpr_23 -/* 80D22FBC 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80D22FC0 7C 08 03 A6 */ mtlr r0 -/* 80D22FC4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80D22FC8 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 0ab504da98..d5cdd83b0a 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -61,6 +61,7 @@ public: } J3DNBTScale* getNBTScale() const { return mTexGenBlock->getNBTScale(); } u32 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); } + GXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); } void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); } void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); } diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index f01ab4d0d1..3b29c2f052 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -335,7 +335,7 @@ public: cCcD_ObjCommonBase() { ct(); } /* 8008409C */ virtual ~cCcD_ObjCommonBase() {} /* 802639B0 */ void ct(); - void setSPrm(s32 sprm) { mSPrm = sprm; } + void SetSPrm(u32 sprm) { mSPrm = sprm; } s32 getSPrm() const { return mSPrm; } void setRPrm(s32 rprm) { mRPrm = rprm; } s32 getRPrm() const { return mRPrm; } @@ -458,6 +458,7 @@ public: void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(0xC); } void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(0xC); } void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); } + void SetCoSPrm(u32 prm) { mObjCo.SetSPrm(prm); } }; // Size = 0x40 diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 229859b2e3..34b0ea5b88 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -377,6 +377,7 @@ public: enum daPy_RFLG1 { RFLG1_UNK_30 = 0x30, RFLG1_UNK_2 = 0x2, + RFLG1_WOLF_ATTACK_REVERSE = 0x1, }; enum { @@ -450,7 +451,7 @@ public: static BOOL checkMasterSwordEquip(); static BOOL checkWoodShieldEquip(); static f32 getAttentionOffsetY(); - s16 checkNowWolfEyeUp(); + static int checkNowWolfEyeUp(); static void forceRestartRoom(int, u32, int); static void setFmChainPos(fopAc_ac_c*, cXyz*, int); static void cancelFmChainGrab(); @@ -709,6 +710,7 @@ public: bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); } bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); } bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); } + bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); } void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); } void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); } @@ -749,6 +751,7 @@ public: void i_offEndResetFlg2(daPy_ERFLG2 flag) { mEndResetFlg2 &= ~flag; } int i_checkResetFlg0(daPy_py_c::daPy_RFLG0 flag) const { return mResetFlg0 & flag; } + int checkResetFlg1(daPy_py_c::daPy_RFLG1 flag) const { return mResetFlg1 & flag; } int i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 flag) const { return mEndResetFlg0 & flag; } int i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 flag) const { return mEndResetFlg1 & flag; } diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index 9e8ca34a97..b2a7e66f56 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -112,7 +112,7 @@ bool dBgS_CheckBWallPoly(cBgS_PolyInfo const&); void dBgS_MoveBGProc_Typical(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6); void dBgS_MoveBGProc_TypicalRotY(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, - bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6); + bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6); f32 dBgS_GetNY(cBgS_PolyInfo const& poly); #endif /* D_BG_D_BG_S_H */ diff --git a/include/d/bg/d_bg_s_movebg_actor.h b/include/d/bg/d_bg_s_movebg_actor.h index 3321d77db9..5393f1dff1 100644 --- a/include/d/bg/d_bg_s_movebg_actor.h +++ b/include/d/bg/d_bg_s_movebg_actor.h @@ -20,6 +20,8 @@ public: /* 800788DC */ int MoveBGDelete(); /* 80078950 */ int MoveBGExecute(); + int MoveBGDraw() { return Draw(); } + /* 80078688 */ virtual int CreateHeap(); /* 80078690 */ virtual int Create(); /* 80078698 */ virtual int Execute(f32 (**)[3][4]); diff --git a/include/d/d_lib.h b/include/d/d_lib.h index 7a54285045..3c8f01c5cf 100644 --- a/include/d/d_lib.h +++ b/include/d/d_lib.h @@ -1,12 +1,14 @@ #ifndef D_D_LIB_H #define D_D_LIB_H -#include "dolphin/types.h" -#include "dolphin/os/OS.h" #include "dolphin/mtx/quat.h" +#include "dolphin/os/OS.h" +#include "f_op/f_op_actor.h" struct JKRAramArchive; u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName); +BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2, + cXyz const* param_3); struct STControl { STControl() { diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h index 140b1b7189..26543a574a 100644 --- a/include/d/d_vibration.h +++ b/include/d/d_vibration.h @@ -13,7 +13,7 @@ public: /* 8006FB10 */ bool StartQuake(int, int, cXyz); /* 8006FD94 */ int StopQuake(int); /* 8006FE00 */ void Kill(); - /* 8006FE5C */ int CheckQuake(); + /* 8006FE5C */ bool CheckQuake(); /* 8006FE84 */ void setDefault(); /* 8006FF04 */ void Init(); /* 8006FF38 */ void Pause(); diff --git a/include/d/event/d_event_lib.h b/include/d/event/d_event_lib.h index 48728cb2e8..5019a47c0a 100644 --- a/include/d/event/d_event_lib.h +++ b/include/d/event/d_event_lib.h @@ -21,6 +21,11 @@ struct action_class { }; struct dEvLib_callback_c { + dEvLib_callback_c(fopAc_ac_c* param_0) { + mActor = param_0; + mAction = NULL; + } + /* 8004886C */ BOOL eventUpdate(); /* 800488A4 */ BOOL setEvent(int, int, int); /* 80048940 */ void orderEvent(int, int, int); diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 52167cba2b..8a7737559c 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -58,6 +58,7 @@ public: class dPa_followEcallBack : public dPa_levelEcallBack { public: /* 80049580 */ dPa_followEcallBack(u8, u8); + /* 80D22230 */ void __defctor(); // compiler generated /* 80050200 */ virtual ~dPa_followEcallBack(); /* 800495BC */ virtual void execute(JPABaseEmitter*); diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index b31b3cbbc0..580ad36664 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -262,6 +262,7 @@ public: bool isLoop() { return mFrameCtrl.checkState(2); } f32 getEndFrame() { return mFrameCtrl.getEnd(); } BOOL checkFrame(f32 frame) { return mFrameCtrl.checkPass(frame); } + J3DAnmTransform* getAnm() { return mpAnm; } bool isStop() { bool stopped = true; diff --git a/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h b/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h index dc20d5568d..75ae6fd416 100644 --- a/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h +++ b/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h @@ -1,32 +1,64 @@ #ifndef D_A_E_YM_H #define D_A_E_YM_H -#include "dolphin/types.h" -#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_uty.h" +#include "d/com/d_com_inf_game.h" + +class daE_YM_HIO_c { +public: + /* 8080812C */ daE_YM_HIO_c(); + + /* 80815458 */ virtual ~daE_YM_HIO_c(); + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mModelSize; + /* 0x0C */ f32 mElectricInvincibilityTimeExtension; + /* 0x10 */ f32 mMoveSpeed; + /* 0x14 */ f32 mFlyMoveSpeed; + /* 0x18 */ f32 mFlyAttackSpeed; + /* 0x1C */ f32 mSurpriseDistance; + /* 0x20 */ f32 mMoveRange; +}; class daE_YM_c : public fopEn_enemy_c { public: - u8 getTagNo() { - return mTagNo; - } + enum daE_YM_Action { + /* 0 */ ACT_WAIT, + /* 1 */ ACT_MOVE, + /* 2 */ ACT_ESCAPE, + /* 3 */ ACT_DOWN, + /* 4 */ ACT_WIND, + /* 5 */ ACT_SURPRISE, + /* 6 */ ACT_BACK, + /* 7 */ ACT_FALL, + /* 8 */ ACT_ATTACK, + /* 9 */ ACT_ATTACK_WALL, + /* 10 */ ACT_DEFENSE, + /* 11 */ ACT_FLY, + /* 12 */ ACT_FLY_ATTACK, + /* 13 */ ACT_RAIL, + /* 14 */ ACT_BACK_RAIL, + /* 15 */ ACT_ELECTRIC, + /* 16 */ ACT_SWITCH, + /* 17 */ ACT_FIRE, + /* 18 */ ACT_RIVER, + }; - void setTagPos(cXyz& i_position) { - mTagPos = i_position; - } + u8 getTagNo() { return mTagNo; } - void setTagPosP() { - mTagPosP = &mTagPos; - } + void setTagPos(cXyz& i_position) { mTagPos = i_position; } - /* 80808184 */ void checkBck(char const*, int); + void setTagPosP() { mTagPosP = &mTagPos; } + + /* 80808184 */ BOOL checkBck(char const*, int); /* 808081E0 */ void bckSet(int, u8, f32, f32); /* 80808328 */ void bckSetFly(int, u8, f32, f32); - /* 808083CC */ void draw(); + /* 808083CC */ int draw(); /* 80808768 */ void setDigEffect(); /* 80808884 */ void setElecEffect1(); /* 808089DC */ void setElecEffect2(); /* 80808B3C */ void setFireEffect(); - /* 80808E34 */ void checkWallCrash(); + /* 80808E34 */ bool checkWallCrash(); /* 80809000 */ void checkWolfBark(); /* 80809228 */ void checkSurpriseLock(); /* 8080963C */ void checkRailSurprise(); @@ -74,20 +106,105 @@ public: /* 8081300C */ void action(); /* 80813528 */ void mtx_set(); /* 808135B0 */ void cc_set(); - /* 808138AC */ void execute(); - /* 80813A38 */ void _delete(); - /* 80813AF0 */ void CreateHeap(); + /* 808138AC */ int execute(); + /* 80813A38 */ int _delete(); + /* 80813AF0 */ int CreateHeap(); /* 80813EA4 */ void checkBeforeBg(s16); /* 808143A0 */ void checkBeforeGround(); /* 808144D8 */ void checkInitialWall(); /* 80814758 */ void checkWall(); /* 80814AF0 */ void setHideType(); - /* 80814BA4 */ void create(); + /* 80814BA4 */ int create(); - /* 0x5AC */ u8 field_0x5ac[268]; + void setFriendFlag(u8 i_flag) { mFriendFlag |= i_flag; } + u8 getFriendFlag() { return mFriendFlag; } + + /* 0x5AC */ request_of_phase_process_class mPhase; + /* 0x5B4 */ mDoExt_McaMorfSO* field_0x5b4; + /* 0x5B8 */ mDoExt_brkAnm* field_0x5b8; + /* 0x5BC */ Z2CreatureEnemy field_0x5bc; + /* 0x660 */ u8 field_0x660[0x664 - 0x660]; + /* 0x664 */ fopAc_ac_c* field_0x664; + /* 0x668 */ csXyz field_0x668; + /* 0x66E */ u8 field_0x66E[0x670 - 0x66E]; + /* 0x670 */ cXyz field_0x670; + /* 0x67C */ cXyz field_0x67c; + /* 0x688 */ f32 field_0x688; + /* 0x68C */ f32 field_0x68c; + /* 0x690 */ int mAction; + /* 0x694 */ int mLastAction; + /* 0x698 */ int mMode; + /* 0x69C */ u32 field_0x69c; + /* 0x6A0 */ u8 mType; + /* 0x6A1 */ u8 field_0x6a1; + /* 0x6A2 */ u8 mSwitchBit; + /* 0x6A3 */ u8 field_0x6a3; + /* 0x6A4 */ u8 mIsHide; + /* 0x6A5 */ u8 field_0x6a5; + /* 0x6A6 */ u8 field_0x6a6; + /* 0x6A7 */ u8 field_0x6a7; + /* 0x6A8 */ u8 field_0x6a8; + /* 0x6A9 */ u8 field_0x6a9; + /* 0x6AA */ u8 mFriendFlag; + /* 0x6AB */ u8 field_0x6AB[0x6AC - 0x6AB]; + /* 0x6AC */ dPath* mpPath; + /* 0x6B0 */ dPath* field_0x6b0; + /* 0x6B4 */ s8 field_0x6b4; + /* 0x6B5 */ u8 field_0x6B5[0x6B8 - 0x6B5]; /* 0x6B8 */ cXyz mTagPos; /* 0x6C4 */ cXyz* mTagPosP; /* 0x6C8 */ u8 mTagNo; + /* 0x6C9 */ u8 field_0x6c9; + /* 0x6CA */ u8 mFlyType; + /* 0x6CB */ u8 field_0x6cb; + /* 0x6CC */ u8 field_0x6cc; + /* 0x6CD */ u8 field_0x6CD[0x6CF - 0x6CD]; + /* 0x6CF */ u8 field_0x6cf; + /* 0x6D0 */ cXyz* field_0x6d0; + /* 0x6D4 */ f32 field_0x6d4; + /* 0x6D8 */ f32 mDistToPlayer; + /* 0x6DC */ f32 field_0x6dc; + /* 0x6E0 */ f32 field_0x6e0; + /* 0x6E4 */ s16 field_0x6e4; + /* 0x6E6 */ s16 field_0x6e6; + /* 0x6E8 */ s16 field_0x6e8; + /* 0x6EA */ s16 mAngleToPlayer; + /* 0x6EC */ f32 field_0x6ec; + /* 0x6F0 */ s16 field_0x6f0; + /* 0x6F2 */ s16 field_0x6f2; + /* 0x6F4 */ s16 field_0x6f4; + /* 0x6F6 */ s16 field_0x6f6; + /* 0x6F8 */ s16 field_0x6f8; + /* 0x6FA */ s16 field_0x6fa; + /* 0x6FC */ s16 field_0x6fc; + /* 0x6FE */ s16 field_0x6fe; + /* 0x700 */ s16 field_0x700; + /* 0x702 */ u8 field_0x702[0x704 - 0x702]; + /* 0x704 */ int field_0x704; + /* 0x708 */ s16 field_0x708; + /* 0x70A */ s16 field_0x70a; + /* 0x70C */ s16 field_0x70c; + /* 0x70E */ s16 field_0x70e; + /* 0x710 */ s16 field_0x710; + /* 0x712 */ u8 field_0x712[0x714 - 0x712]; + /* 0x714 */ int field_0x714; + /* 0x718 */ int field_0x718; + /* 0x71C */ u8 field_0x71c; + /* 0x71D */ u8 field_0x71d; + /* 0x71E */ u8 field_0x71E[0x720 - 0x71E]; + /* 0x720 */ dBgS_AcchCir field_0x720; + /* 0x760 */ dBgS_ObjAcch field_0x760; + /* 0x938 */ dCcD_Stts field_0x938; + /* 0x974 */ dCcD_Sph mSphCc; + /* 0xAAC */ dCcU_AtInfo mAtInfo; + /* 0xAD0 */ u32 field_0xad0; + /* 0xAD4 */ u32 field_0xad4; + /* 0xAD8 */ u32 field_0xad8; + /* 0xADC */ u32 field_0xadc; + /* 0xAE0 */ u32 field_0xae0; + /* 0xAE4 */ u32 field_0xae4; + /* 0xAE8 */ u32 field_0xae8[3]; + /* 0xAF4 */ u8 field_0xaf4; }; #endif /* D_A_E_YM_H */ diff --git a/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h b/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h index 7e2936b9b8..7f65865c11 100644 --- a/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h +++ b/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h @@ -1,6 +1,48 @@ #ifndef D_A_OBJ_MGATE_H #define D_A_OBJ_MGATE_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/com/d_com_inf_game.h" + +class daObjMGate_c : public dBgS_MoveBgActor { +public: + enum Kind_e { + /* 0 */ KIND_IZUMI, // Spring + /* 1 */ KIND_HASHI, // Bridge + }; + + enum Type_e { + /* 0 */ TYPE_LEFT, + /* 1 */ TYPE_RIGHT, + }; + + /* 805935B8 */ void initBaseMtx(); + /* 80593630 */ void setBaseMtx(); + /* 8059388C */ int create1st(); + + /* 805937AC */ virtual int CreateHeap(); + /* 80593760 */ virtual int Create(); + /* 80593988 */ virtual int Execute(f32 (**)[3][4]); + /* 80593C4C */ virtual int Draw(); + /* 80593D18 */ virtual int Delete(); + + u8 getType() { return fopAcM_GetParamBit(this, 0, 1); } + u8 getKind() { return fopAcM_GetParamBit(this, 1, 4); } + bool checkLock() { return fopAcM_GetParamBit(this, 5, 1); } + u8 checkOpen() { return fopAcM_GetParamBit(this, 8, 4); } + +private: + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ request_of_phase_process_class mKeyPhase; + /* 0x5B0 */ J3DModel* mpModel; + /* 0x5B4 */ J3DModel* mpKeyModel; + /* 0x5B8 */ u8 mType; + /* 0x5B9 */ u8 mKind; + /* 0x5BA */ csXyz mGateAngle; + /* 0x5C0 */ f32 mGateKeySwingMultiplier; + /* 0x5C4 */ f32 mGateSwingMultiplier; + /* 0x5C8 */ int mCounter; + /* 0x5CC */ s16 mGateKeyAngle; +}; #endif /* D_A_OBJ_MGATE_H */ diff --git a/libs/SSystem/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp index 07fe1a3b04..bde61fb1ef 100644 --- a/libs/SSystem/SComponent/c_cc_d.cpp +++ b/libs/SSystem/SComponent/c_cc_d.cpp @@ -257,7 +257,7 @@ void cCcD_ObjCommonBase::ct() { void cCcD_ObjHitInf::Set(cCcD_SrcObjHitInf const& src) { mObjAt.Set(src.mObjAt); mObjTg.Set(src.mObjTg); - mObjCo.setSPrm(src.mSPrm); + mObjCo.SetSPrm(src.mSPrm); } /* 80263A10-80263A1C 25E350 000C+00 0/0 1/1 0/0 .text ct__8cCcD_ObjFv */ diff --git a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp index 961689a0b1..3715acc39b 100644 --- a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp +++ b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp @@ -4,8 +4,9 @@ */ #include "rel/d/a/e/d_a_e_ym/d_a_e_ym.h" +#include "d/d_path.h" +#include "SSystem/SComponent/c_math.h" #include "dol2asm.h" -#include "dolphin/types.h" // // Types: @@ -15,20 +16,8 @@ struct daTag_FWall_c { /* 80815958 */ void getPos(u8); }; -struct daPy_py_c { - /* 8015F424 */ void checkNowWolfEyeUp(); - /* 8081593C */ void getLeftHandPos() const; - - static u8 m_midnaActor[4]; -}; - -struct daE_YM_HIO_c { - /* 8080812C */ daE_YM_HIO_c(); - /* 80815458 */ ~daE_YM_HIO_c(); -}; - struct E_YM_n { - static u8 cc_sph_src[64]; + static dCcD_SrcSph cc_sph_src; }; // @@ -268,14 +257,12 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); 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]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u8 JPTracePCB4[4]; @@ -437,11 +424,17 @@ SECTION_DATA static u8 eff_id[6 + 2 /* padding */] = { #pragma pop /* 80815B3C-80815B7C 000038 0040+00 1/1 0/0 0/0 .data cc_sph_src__6E_YM_n */ -SECTION_DATA u8 E_YM_n::cc_sph_src[64] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, - 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x75, 0x09, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, +dCcD_SrcSph E_YM_n::cc_sph_src = { + { + {0, {{0x400, 1, 13}, {0xD8FBFDFF, 3}, 0x75}}, + {dCcD_SE_METAL, 0, 0, 0, {0}}, + {dCcD_SE_NONE, 0, 0, 0, {2}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 40.0f, + }, }; /* 80815B7C-80815B84 000078 0008+00 0/0 0/0 0/0 .data w_eff_id$5427 */ @@ -480,9 +473,7 @@ SECTION_DATA static void* lit_7049[11] = { }; /* 80815BD0-80815BDC 0000CC 000C+00 1/1 0/0 0/0 .data YM_DIG_POS_Y$7355 */ -SECTION_DATA static u8 YM_DIG_POS_Y[12] = { - 0xC1, 0x70, 0x00, 0x00, 0xC1, 0xF0, 0x00, 0x00, 0xC2, 0x8C, 0x00, 0x00, -}; +SECTION_DATA static Vec YM_DIG_POS_Y = {-15.0f, -30.0f, -70.0f}; /* 80815BDC-80815C28 -00001 004C+00 1/1 0/0 0/0 .data @8522 */ SECTION_DATA static void* lit_8522[19] = { @@ -598,6 +589,19 @@ SECTION_DATA extern void* __vt__12daE_YM_HIO_c[3] = { }; /* 8080812C-80808184 0000EC 0058+00 1/1 0/0 0/0 .text __ct__12daE_YM_HIO_cFv */ +// matches with literals +#ifdef NONMATCHING +daE_YM_HIO_c::daE_YM_HIO_c() { + field_0x4 = -1; + mFlyMoveSpeed = 20.0f; + mFlyAttackSpeed = 30.0f; + mModelSize = 0.6f; + mElectricInvincibilityTimeExtension = 3.0f; + mMoveSpeed = 13.0f; + mSurpriseDistance = 400.0f; + mMoveRange = 300.0f; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -606,16 +610,12 @@ asm daE_YM_HIO_c::daE_YM_HIO_c() { #include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/__ct__12daE_YM_HIO_cFv.s" } #pragma pop +#endif /* 80808184-808081E0 000144 005C+00 3/3 0/0 0/0 .text checkBck__8daE_YM_cFPCci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::checkBck(char const* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkBck__8daE_YM_cFPCci.s" +BOOL daE_YM_c::checkBck(char const* i_arcName, int i_resNo) { + return field_0x5b4->getAnm() == (J3DAnmTransform*)dComIfG_getObjectRes(i_arcName, i_resNo); } -#pragma pop /* ############################################################################################## */ /* 808159DC-808159E0 000048 0004+00 0/4 0/0 0/0 .rodata @3987 */ @@ -629,32 +629,42 @@ COMPILER_STRIP_GATE(0x808159DC, &lit_3987); SECTION_RODATA static f32 const lit_3988 = -1.0f; COMPILER_STRIP_GATE(0x808159E0, &lit_3988); -/* 80815AEC-80815AEC 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80815AEC = "E_TM"; -SECTION_DEAD static char const* const stringBase_80815AF1 = "E_YM"; -#pragma pop - /* 808081E0-80808328 0001A0 0148+00 18/18 0/0 0/0 .text bckSet__8daE_YM_cFiUcff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::bckSet(int param_0, u8 param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/bckSet__8daE_YM_cFiUcff.s" +void daE_YM_c::bckSet(int i_resID, u8 i_attribute, f32 i_morf, f32 i_speed) { + int tm_res_id; + + if (mFlyType == true) { + switch (i_resID) { + case 6: + tm_res_id = 8; + break; + case 15: + tm_res_id = 9; + break; + case 16: + i_speed = FLOAT_LABEL(lit_3987); + tm_res_id = 10; + break; + case 14: + tm_res_id = 10; + break; + default: + tm_res_id = 9; + } + + field_0x5b4->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_TM", tm_res_id), i_attribute, + i_morf, i_speed, FLOAT_LABEL(lit_3926), FLOAT_LABEL(lit_3988)); + } else { + field_0x5b4->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_YM", i_resID), i_attribute, + i_morf, i_speed, FLOAT_LABEL(lit_3926), FLOAT_LABEL(lit_3988)); + } } -#pragma pop /* 80808328-808083CC 0002E8 00A4+00 4/4 0/0 0/0 .text bckSetFly__8daE_YM_cFiUcff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::bckSetFly(int param_0, u8 param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/bckSetFly__8daE_YM_cFiUcff.s" +void daE_YM_c::bckSetFly(int i_resID, u8 i_attribute, f32 i_morf, f32 i_speed) { + field_0x5b4->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_TM", i_resID), i_attribute, + i_morf, i_speed, FLOAT_LABEL(lit_3926), FLOAT_LABEL(lit_3988)); } -#pragma pop /* ############################################################################################## */ /* 808159E4-808159E8 000050 0004+00 0/1 0/0 0/0 .rodata @4101 */ @@ -672,24 +682,90 @@ COMPILER_STRIP_GATE(0x808159E8, &lit_4102); #pragma pop /* 808083CC-80808678 00038C 02AC+00 1/1 0/0 0/0 .text draw__8daE_YM_cFv */ +// one instruction order mismatch (probably causes regalloc issue) +#ifdef NONMATCHING +int daE_YM_c::draw() { + if (field_0x71d) { + return 1; + } + + if (daPy_py_c::checkNowWolfEyeUp()) { + cLib_addCalc2(&field_0x6d4, 255.0f, 1.0f, 30.0f); + } else if (mAction == ACT_DOWN) { + cLib_addCalc2(&field_0x6d4, 255.0f, 1.0f, 30.0f); + } else { + cLib_addCalc2(&field_0x6d4, 0.0f, 1.0f, 30.0f); + } + + bool bvar = true; + + if (field_0x710 != 0) { + if (field_0x6d4 == 0.0f) { + return 1; + } + + if (mIsHide && mAction != ACT_RAIL && mAction != ACT_BACK_RAIL) { + bvar = false; + } + } else { + field_0x710 = 1; + } + + if (mFlyType == true) { + J3DShape* shape_p = + field_0x5b4->getModel()->getModelData()->getMaterialNodePointer(1)->getShape(); + + if (shape_p != NULL) { + if (field_0x6cc) { + shape_p->show(); + } else { + shape_p->hide(); + } + } + } + + J3DModel* model_p = field_0x5b4->getModel(); + g_env_light.settingTevStruct(6, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(model_p->getModelData(), &mTevStr); + + J3DModelData* modelData_p = model_p->getModelData(); + for (u16 i = 0; i < modelData_p->getMaterialNum(); i++) { + modelData_p->getMaterialNodePointer(i)->getTevKColor(3)->a = field_0x6d4; + } + + if (bvar) { + if (field_0x6dc != -70.0f) { + field_0x5b8->entry(model_p->getModelData()); + dComIfGd_setListDark(); + field_0x5b4->entryDL(); + dComIfGd_setList(); + } + + cXyz sp40; + sp40.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + + field_0x69c = dComIfGd_setShadow(field_0x69c, 1, model_p, &sp40, 400.0f, 0.0f, + current.pos.y, field_0x760.GetGroundH(), field_0x760.m_gnd, + &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daE_YM_c::draw() { +asm int daE_YM_c::draw() { nofralloc #include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/draw__8daE_YM_cFv.s" } #pragma pop +#endif /* 80808678-80808698 000638 0020+00 1/0 0/0 0/0 .text daE_YM_Draw__FP8daE_YM_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YM_Draw(daE_YM_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Draw__FP8daE_YM_c.s" +static int daE_YM_Draw(daE_YM_c* i_this) { + return i_this->draw(); } -#pragma pop /* ############################################################################################## */ /* 80815D28-80815D2C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -702,22 +778,47 @@ static u8 lit_3941[12]; static u8 l_HIO[36]; /* 80815D5C-80815D60 00003C 0004+00 3/3 0/0 0/0 .bss m_near_obj */ -static u8 m_near_obj[4]; +static fopAc_ac_c* m_near_obj; /* 80815D60-80815D64 000040 0004+00 3/3 0/0 0/0 .bss m_obj_dist */ -static u8 m_obj_dist[4]; +static f32 m_obj_dist; /* 80808698-80808768 000658 00D0+00 2/2 0/0 0/0 .text s_obj_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void s_obj_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/s_obj_sub__FPvPv.s" +static void* s_obj_sub(void* param_0, void* param_1) { + fopAc_ac_c* e_ym; + fopAc_ac_c* near_obj; + + near_obj = (fopAc_ac_c*)param_0; + e_ym = (fopAc_ac_c*)param_1; + + if (fopAcM_IsActor(near_obj) && fopAcM_GetName(near_obj) == PROC_Obj_Carry) { + if (!fpcM_IsCreating(fopAcM_GetID(near_obj))) { + f32 obj_dist = fopAcM_searchActorDistanceXZ(near_obj, e_ym); + + if (obj_dist < FLOAT_LABEL(lit_3925) && obj_dist < m_obj_dist && + fabsf(fopAcM_searchActorDistanceY(near_obj, e_ym)) < FLOAT_LABEL(lit_3947)) + { + m_near_obj = near_obj; + m_obj_dist = obj_dist; + } + } + } + + return 0; } -#pragma pop /* 80808768-80808884 000728 011C+00 1/1 0/0 0/0 .text setDigEffect__8daE_YM_cFv */ +// matches with literals +#ifdef NONMATCHING +void daE_YM_c::setDigEffect() { + cXyz sp1C(field_0x68c, field_0x68c, field_0x68c); + cXyz sp28(current.pos); + sp28.y += field_0x6dc; + + field_0xad8 = dComIfGp_particle_set(field_0xad8, 0x83A8, &sp28, &shape_angle, &sp1C); + field_0xadc = dComIfGp_particle_set(field_0xadc, 0x83A9, &sp28, &shape_angle, &sp1C); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -726,6 +827,7 @@ asm void daE_YM_c::setDigEffect() { #include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setDigEffect__8daE_YM_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 808159EC-808159F0 000058 0004+00 0/16 0/0 0/0 .rodata @4214 */ @@ -781,14 +883,36 @@ COMPILER_STRIP_GATE(0x808159F4, &lit_4416); #pragma pop /* 80808E34-80809000 000DF4 01CC+00 3/3 0/0 0/0 .text checkWallCrash__8daE_YM_cFv */ +// matches with literals +#ifdef NONMATCHING +bool daE_YM_c::checkWallCrash() { + if (mType == 1 && (daPy_getPlayerActorClass()->checkFrontRollCrash() || + daPy_getPlayerActorClass()->checkWolfAttackReverse())) + { + cXyz tmp = daPy_getPlayerActorClass()->current.pos - field_0x670; + if (tmp.absXZ() < 600.0f) { + if (mTagPosP != NULL) { + setActionMode(ACT_FLY); + } else { + setActionMode(ACT_FALL); + } + + return true; + } + } + + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daE_YM_c::checkWallCrash() { +asm bool daE_YM_c::checkWallCrash() { nofralloc #include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkWallCrash__8daE_YM_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 808159F8-808159FC 000064 0004+00 0/1 0/0 0/0 .rodata @4472 */ @@ -874,24 +998,21 @@ asm void daE_YM_c::checkSurpriseNear() { #pragma pop /* 80809D6C-80809D84 001D2C 0018+00 6/6 0/0 0/0 .text setNormalCc__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::setNormalCc() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setNormalCc__8daE_YM_cFv.s" +void daE_YM_c::setNormalCc() { + mSphCc.SetCoSPrm(0x75); + mSphCc.SetTgType(0xD8FBFDFF); } -#pragma pop /* 80809D84-80809DA8 001D44 0024+00 7/7 0/0 0/0 .text setAppear__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::setAppear() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setAppear__8daE_YM_cFv.s" +void daE_YM_c::setAppear() { + mIsHide = false; + + if (field_0x6a6 != 4) { + mType = 0; + } + + field_0x714 = 4; } -#pragma pop /* ############################################################################################## */ /* 80815A10-80815A14 00007C 0004+00 0/1 0/0 0/0 .rodata @4871 */ @@ -933,14 +1054,14 @@ asm void daE_YM_c::setTurnSound() { #pragma pop /* 80809F9C-80809FC4 001F5C 0028+00 26/26 0/0 0/0 .text setActionMode__8daE_YM_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::setActionMode(int param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setActionMode__8daE_YM_cFi.s" +void daE_YM_c::setActionMode(int i_action) { + mLastAction = mAction; + mAction = i_action; + mMode = 0; + field_0x6f2 = 0; + field_0x6f0 = 0; + current.angle.y = shape_angle.y; } -#pragma pop /* ############################################################################################## */ /* 80815A1C-80815A20 000088 0004+00 0/7 0/0 0/0 .rodata @5021 */ @@ -1104,14 +1225,46 @@ extern "C" asm void __dt__8cM3dGPlaFv() { #pragma pop /* 8080BB7C-8080BCFC 003B3C 0180+00 1/1 0/0 0/0 .text damage_check__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::damage_check() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/damage_check__8daE_YM_cFv.s" +void daE_YM_c::damage_check() { + if (field_0x6f4 != 0 || mAction == ACT_RIVER || mAction == ACT_DOWN) { + return; + } + + field_0x938.Move(); + + if (mSphCc.ChkTgHit()) { + mAtInfo.mpCollider = mSphCc.GetTgHitObj(); + + if (field_0x700 == 0 || !mAtInfo.mpCollider->ChkAtType(0xD8000000)) { + cc_at_check(this, &mAtInfo); + + if (mAtInfo.mpCollider->ChkAtType(0xD8000000)) { + field_0x6f4 = 20; + } else { + field_0x6f4 = 10; + } + + if (mAtInfo.mAttackPower <= 1) { + field_0x6f4 = 10; + } + + if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_BOOMERANG)) { + if (mIsHide) { + setActionMode(ACT_WIND); + } + } else if (mType != 2) { + field_0x5bc.startCreatureSound(Z2SE_EN_YM_DEATH, 0, -1); + + if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_10000000)) { + i_dComIfGp_setHitMark(3, this, &mEyePos, NULL, NULL, 0); + } + + setActionMode(ACT_DOWN); + executeDown(); + } + } + } } -#pragma pop /* ############################################################################################## */ /* 80815A58-80815A5C 0000C4 0004+00 0/5 0/0 0/0 .rodata @5724 */ @@ -1358,14 +1511,20 @@ asm void daE_YM_c::checkFlyTerritory() { #pragma pop /* 8080E630-8080E6A0 0065F0 0070+00 1/1 0/0 0/0 .text initFly__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::initFly() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/initFly__8daE_YM_cFv.s" +void daE_YM_c::initFly() { + mAttentionInfo.field_0x0[2] = 46; + mGravity = FLOAT_LABEL(lit_3926); + field_0x6e4 = 0; + + if (mTagPosP != NULL) { + field_0x670 = mTagPos; + } else { + field_0x670 = orig.pos; + } + + mType = 3; + shape_angle.x = 0; } -#pragma pop /* ############################################################################################## */ /* 80815A98-80815A9C 000104 0004+00 0/2 0/0 0/0 .rodata @7042 */ @@ -1393,14 +1552,18 @@ asm void daE_YM_c::executeFly() { #pragma pop /* 8080F8C8-8080F92C 007888 0064+00 1/1 0/0 0/0 .text setInclination__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::setInclination() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setInclination__8daE_YM_cFv.s" +void daE_YM_c::setInclination() { + s16 tan = cM_atan2s(speedF, speed.y) - 0x4000; + if (tan < -6000) { + tan = -6000; + } + + if (tan > 6000) { + tan = 6000; + } + + cLib_chaseAngleS(&shape_angle.x, tan, 0x0180); } -#pragma pop /* 8080F92C-80810084 0078EC 0758+00 1/1 0/0 0/0 .text executeFlyAttack__8daE_YM_cFv */ #pragma push @@ -1453,14 +1616,23 @@ asm void daE_YM_c::executeBackRail() { #pragma pop /* 80810DF8-80810E64 008DB8 006C+00 1/1 0/0 0/0 .text checkElectricStart__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::checkElectricStart() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkElectricStart__8daE_YM_cFv.s" +void daE_YM_c::checkElectricStart() { + if (field_0x6a1 == 1) { + if (mAction != ACT_WAIT && mAction != ACT_SURPRISE) { + field_0x6c9 = 0; + field_0x708 = 0; + } else if (field_0x708 != 0) { + field_0x708--; + + if (field_0x708 == 0) { + field_0x6c9 = 1; + } + } + } else { + field_0x6c9 = 0; + field_0x708 = 0; + } } -#pragma pop /* ############################################################################################## */ /* 80815AA0-80815AA4 00010C 0004+00 0/2 0/0 0/0 .rodata @7044 */ @@ -1587,14 +1759,9 @@ asm void daE_YM_c::setRiverAttention() { #pragma pop /* 808123C4-808123D0 00A384 000C+00 0/0 0/0 1/1 .text setLockByCargo__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::setLockByCargo() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setLockByCargo__8daE_YM_cFv.s" +void daE_YM_c::setLockByCargo() { + field_0x6f2 = 90; } -#pragma pop /* ############################################################################################## */ /* 80815AC8-80815ACC 000134 0004+00 0/1 0/0 0/0 .rodata @8350 */ @@ -1622,24 +1789,34 @@ asm void daE_YM_c::executeRiver() { #pragma pop /* 80812F0C-80812FCC 00AECC 00C0+00 1/1 0/0 0/0 .text s_ym_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void s_ym_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/s_ym_sub__FPvPv.s" +static void* s_ym_sub(void* param_0, void* param_1) { + daE_YM_c* actor_a = (daE_YM_c*)param_0; + daE_YM_c* actor_b = (daE_YM_c*)param_1; + + if (fopAcM_IsActor(actor_a) && fopAcM_GetName(actor_a) == PROC_E_YM) { + if (!fpcM_IsCreating(fopAcM_GetID(actor_a)) && actor_a != actor_b && + actor_a->current.pos == actor_b->current.pos) + { + if (actor_b->getFriendFlag() & 1) { + actor_a->setFriendFlag(0x84); + } else { + actor_a->setFriendFlag(0x82); + } + + actor_b->setFriendFlag(0x81); + } + } + + return 0; } -#pragma pop /* 80812FCC-8081300C 00AF8C 0040+00 1/1 0/0 0/0 .text checkFrinedSamePos__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::checkFrinedSamePos() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/checkFrinedSamePos__8daE_YM_cFv.s" +void daE_YM_c::checkFrinedSamePos() { + if (mFriendFlag == 0) { + setFriendFlag(0x80); + i_fpcM_Search(s_ym_sub, this); + } } -#pragma pop /* 8081300C-80813528 00AFCC 051C+00 2/1 0/0 0/0 .text action__8daE_YM_cFv */ #pragma push @@ -1652,14 +1829,15 @@ asm void daE_YM_c::action() { #pragma pop /* 80813528-808135B0 00B4E8 0088+00 1/1 0/0 0/0 .text mtx_set__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::mtx_set() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/mtx_set__8daE_YM_cFv.s" +void daE_YM_c::mtx_set() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x6dc, current.pos.z); + mDoMtx_stack_c::ZXYrotM(field_0x668); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::scaleM(field_0x68c, field_0x68c, field_0x68c); + + field_0x5b4->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + field_0x5b4->modelCalc(); } -#pragma pop /* ############################################################################################## */ /* 80815AD0-80815AD4 00013C 0004+00 0/1 0/0 0/0 .rodata @8621 */ @@ -1687,55 +1865,109 @@ asm void daE_YM_c::cc_set() { #pragma pop /* 808138AC-80813A10 00B86C 0164+00 1/1 0/0 0/0 .text execute__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::execute() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/execute__8daE_YM_cFv.s" +int daE_YM_c::execute() { + if (field_0x71d) { + return 1; + } + + if (field_0x6f0 != 0) { + field_0x6f0--; + } + + if (field_0x6f2 != 0) { + field_0x6f2--; + } + + if (field_0x6f4 != 0) { + field_0x6f4--; + } + + if (field_0x6f6 != 0) { + field_0x6f6--; + } + + if (field_0x6f8 != 0) { + field_0x6f8--; + } + + if (field_0x6fc != 0) { + field_0x6fc--; + } + + if (field_0x6fe != 0) { + field_0x6fe--; + } + + if (field_0x700 != 0) { + field_0x700--; + } + + if (field_0x6fa != 0) { + field_0x6fa--; + } + + if (field_0x704 != 0) { + field_0x704--; + } + + if (field_0x70a != 0) { + field_0x70a--; + } + + if (field_0x70c != 0) { + field_0x70c--; + } + + if (field_0x70e != 0) { + field_0x70e--; + } + + checkElectricStart(); + action(); + mtx_set(); + cc_set(); + return 1; } -#pragma pop /* 80813A10-80813A30 00B9D0 0020+00 2/1 0/0 0/0 .text daE_YM_Execute__FP8daE_YM_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YM_Execute(daE_YM_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Execute__FP8daE_YM_c.s" +static int daE_YM_Execute(daE_YM_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80813A30-80813A38 00B9F0 0008+00 1/0 0/0 0/0 .text daE_YM_IsDelete__FP8daE_YM_c */ -static bool daE_YM_IsDelete(daE_YM_c* param_0) { - return true; +static int daE_YM_IsDelete(daE_YM_c* i_this) { + return 1; } /* 80813A38-80813AD0 00B9F8 0098+00 1/1 0/0 0/0 .text _delete__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::_delete() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/_delete__8daE_YM_cFv.s" +int daE_YM_c::_delete() { + if (mFlyType == true) { + dComIfG_resDelete(&mPhase, "E_TM"); + } else { + dComIfG_resDelete(&mPhase, "E_YM"); + } + + if (field_0xaf4) { + data_80815D28[0] = 0; + } + + if (mHeap != NULL) { + field_0x5bc.deleteObject(); + } + + return 1; } -#pragma pop /* 80813AD0-80813AF0 00BA90 0020+00 1/0 0/0 0/0 .text daE_YM_Delete__FP8daE_YM_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YM_Delete(daE_YM_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Delete__FP8daE_YM_c.s" +static int daE_YM_Delete(daE_YM_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80813AF0-80813E38 00BAB0 0348+00 1/1 0/0 0/0 .text CreateHeap__8daE_YM_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daE_YM_c::CreateHeap() { +asm int daE_YM_c::CreateHeap() { nofralloc #include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/CreateHeap__8daE_YM_cFv.s" } @@ -1752,21 +1984,16 @@ extern "C" asm void __ct__4cXyzFv() { #pragma optimization_level 0 #pragma optimizewithasm off // asm J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" asm void __dt__12J3DFrameCtrlFv(){ +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/__dt__12J3DFrameCtrlFv.s" } #pragma pop /* 80813E84-80813EA4 00BE44 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/e/d_a_e_ym/d_a_e_ym/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* ############################################################################################## */ /* 80815AD8-80815ADC 000144 0004+00 0/2 0/0 0/0 .rodata @8964 */ @@ -1832,14 +2059,26 @@ asm void daE_YM_c::checkWall() { #pragma pop /* 80814AF0-80814BA4 00CAB0 00B4+00 1/1 0/0 0/0 .text setHideType__8daE_YM_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_YM_c::setHideType() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/setHideType__8daE_YM_cFv.s" +void daE_YM_c::setHideType() { + mIsHide = true; + mSphCc.SetCoSPrm(0x145); + mSphCc.SetTgType(0x10000); + + m_near_obj = NULL; + m_obj_dist = FLOAT_LABEL(lit_3925); + + i_fpcM_Search(s_obj_sub, this); + + if (m_near_obj != NULL) { + cXyz obj_pos(m_near_obj->current.pos); + + current.pos.x = obj_pos.x; + current.pos.z = obj_pos.z; + field_0x6a6 = 1; + } else { + field_0x6a6 = 3; + } } -#pragma pop /* ############################################################################################## */ /* 80815AE4-80815AEC 000150 0008+00 0/1 0/0 0/0 .rodata @9420 */ @@ -1858,14 +2097,192 @@ SECTION_DEAD static char const* const stringBase_80815AFE = "E_ym"; #pragma pop /* 80814BA4-80815224 00CB64 0680+00 2/1 0/0 0/0 .text create__8daE_YM_cFv */ +// literals / small issue +#ifdef NONMATCHING +int daE_YM_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daE_YM_c(); + fopAcM_OnCondition(this, 8); + } + + mType = fopAcM_GetParam(this); + if (mType == 0xFF) { + mType = 0; + } + + mSwitchBit = fopAcM_GetParam(this) >> 0x18; + + u8 prm2 = fopAcM_GetParam(this) >> 0x10; + if (prm2 == 0xFF) { + prm2 = 0; + } + + field_0x6e0 = prm2 * 100.0f; + + u8 prm1 = fopAcM_GetParam(this) >> 0x8; + u8 tmp0 = current.angle.z >> 8; + + mTagNo = (u8)current.angle.z; + field_0x6a1 = 1; + + if ((current.angle.x & 3) != 0) { + field_0x6a1 = 0; + } + + if ((current.angle.x & 12) != 0) { + field_0x6cb = 1; + } + + field_0x6a3 = (u8)(current.angle.x >> 8); + + if (mSwitchBit != 0xFF && dComIfGs_isSwitch(mSwitchBit, fopAcM_GetRoomNo(this))) { + return cPhs_ERROR_e; + } + + if ((mTagNo != 0 && mTagNo != 0xFF) || (mType == 6 || mType == 3 || mType == 7)) { + mFlyType = true; + } else { + mFlyType = false; + } + + int phase; + if (mFlyType == true) { + phase = dComIfG_resLoad(&mPhase, "E_TM"); + } else { + phase = dComIfG_resLoad(&mPhase, "E_YM"); + } + + if (phase == cPhs_COMPLEATE_e) { + current.angle.z = 0; + current.angle.x = 0; + shape_angle.z = 0; + shape_angle.x = 0; + + if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)useHeapInit, 0x28B0)) { + return cPhs_ERROR_e; + } + + if (!data_80815D28[0]) { + field_0xaf4 = 1; + data_80815D28[0] = true; + l_HIO.field_0x4 = -1; + } + + field_0x714 = 4; + mAttentionInfo.field_0x0[2] = 58; + fopAcM_SetMtx(this, field_0x5b4->getModel()->getBaseTRMtx()); + fopAcM_SetMin(this, -200.0f, -100.0f, -200.0f); + fopAcM_SetMax(this, 200.0f, 100.0f, 200.0f); + + field_0x760.Set(¤t.pos, &next.pos, this, 1, &field_0x720, &speed, NULL, NULL); + field_0x760.OnLineCheck(); + field_0x720.SetWall(30.0f, 60.0f); + + mHealth = 10; + field_0x560 = 10; + + field_0x938.Init(100, 0, this); + mSphCc.Set(E_YM_n::cc_sph_src); + mSphCc.SetStts(&field_0x938); + + field_0x5bc.init(¤t.pos, &mEyePos, 3, 1); + field_0x5bc.setEnemyName("E_ym"); + mAtInfo.mpSound = &field_0x5bc; + mAtInfo.mPowerType = 1; + field_0x68c = 0.6f; + + switch (mType) { + case 0: + field_0x670 = current.pos; + setActionMode(ACT_WAIT); + break; + case 1: + checkInitialWall(); + field_0x670 = current.pos; + setActionMode(ACT_WAIT); + break; + case 2: + setActionMode(ACT_WAIT); + mMode = 100; + break; + case 3: + setActionMode(ACT_FLY); + mMode = 2; + break; + case 4: + if (tmp0 != 0xFF) { + mpPath = dPath_GetRoomPath(tmp0, fopAcM_GetRoomNo(this)); + + if (mpPath != NULL) { + mAttentionInfo.field_0x4[3] = 31; + field_0x6a6 = 4; + field_0x670 = current.pos; + setActionMode(ACT_WAIT); + break; + } + } + + mType = 0; + field_0x670 = current.pos; + setActionMode(ACT_WAIT); + break; + case 5: + if (field_0x6a3 == 0xFF) { + mType = 0; + field_0x670 = current.pos; + setActionMode(ACT_WAIT); + } else { + if (tmp0 != 0xFF) { + mpPath = dPath_GetRoomPath(tmp0, fopAcM_GetRoomNo(this)); + } + + setActionMode(ACT_SWITCH); + if (dComIfGs_isSwitch(field_0x6a3, fopAcM_GetRoomNo(this))) { + mMode = 10; + } + } + break; + case 6: + setActionMode(ACT_FIRE); + break; + case 7: + if (tmp0 != 0xFF) { + mpPath = dPath_GetRoomPath(tmp0, fopAcM_GetRoomNo(this)); + } + + if (prm1 != 0xFF) { + field_0x6b0 = dPath_GetRoomPath(prm1, fopAcM_GetRoomNo(this)); + } + + if (mpPath != NULL || field_0x6b0 != NULL) { + field_0x68c = 1.5f; + setActionMode(ACT_RIVER); + break; + } + + return cPhs_ERROR_e; + } + + field_0x6cc = 1; + if (mFlyType == true && mType != 3) { + field_0x6cc = 0; + } + + daE_YM_Execute(this); + } + + return phase; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daE_YM_c::create() { +asm int daE_YM_c::create() { nofralloc #include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/create__8daE_YM_cFv.s" } #pragma pop +#endif /* 80815224-8081526C 00D1E4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ #pragma push @@ -1923,14 +2340,9 @@ extern "C" asm void __dt__12dBgS_AcchCirFv() { #pragma pop /* 808153F0-80815410 00D3B0 0020+00 1/0 0/0 0/0 .text daE_YM_Create__FP8daE_YM_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YM_Create(daE_YM_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/daE_YM_Create__FP8daE_YM_c.s" +static int daE_YM_Create(daE_YM_c* i_this) { + return i_this->create(); } -#pragma pop /* 80815410-80815458 00D3D0 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ #pragma push @@ -1957,8 +2369,7 @@ asm daE_YM_HIO_c::~daE_YM_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_d_a_e_ym_cpp() { - nofralloc +asm void __sinit_d_a_e_ym_cpp(){nofralloc #include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/__sinit_d_a_e_ym_cpp.s" } #pragma pop @@ -2015,7 +2426,8 @@ extern "C" asm void __dt__4cXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::getLeftHandPos() const { +// asm void daPy_py_c::getLeftHandPos() const { +extern "C" asm void getLeftHandPos__9daPy_py_cCFv() { nofralloc #include "asm/rel/d/a/e/d_a_e_ym/d_a_e_ym/getLeftHandPos__9daPy_py_cCFv.s" } diff --git a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp index 59642804c2..03f192914d 100644 --- a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp +++ b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp @@ -1,254 +1,92 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_mgate -// +/** + * d_a_obj_mgate.cpp + * Ordon Spring / Bridge Gates + */ #include "rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CDD4 */ void transM(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjMGate_c { - /* 805935B8 */ void initBaseMtx(); - /* 80593630 */ void setBaseMtx(); - /* 80593760 */ void Create(); - /* 805937AC */ void CreateHeap(); - /* 8059388C */ void create1st(); - /* 80593988 */ void Execute(f32 (**)[3][4]); - /* 80593C4C */ void Draw(); - /* 80593D18 */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void initBaseMtx__12daObjMGate_cFv(); -extern "C" void setBaseMtx__12daObjMGate_cFv(); -extern "C" void Create__12daObjMGate_cFv(); -extern "C" void CreateHeap__12daObjMGate_cFv(); -extern "C" void create1st__12daObjMGate_cFv(); -extern "C" void Execute__12daObjMGate_cFPPA3_A4_f(); -extern "C" void Draw__12daObjMGate_cFv(); -extern "C" void Delete__12daObjMGate_cFv(); -extern "C" static void daObjMGate_create1st__FP12daObjMGate_c(); -extern "C" static void daObjMGate_MoveBGDelete__FP12daObjMGate_c(); -extern "C" static void daObjMGate_MoveBGExecute__FP12daObjMGate_c(); -extern "C" static void daObjMGate_MoveBGDraw__FP12daObjMGate_c(); -extern "C" extern char const* const d_a_obj_mgate__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void getObjectResName2Index__14dRes_control_cFPCcPCc(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cLib_addCalc0__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// +#include "SSystem/SComponent/c_math.h" /* ############################################################################################## */ /* 80593E48-80593E60 000000 0018+00 2/2 0/0 0/0 .rodata l_key_offset */ -SECTION_RODATA static u8 const l_key_offset[24] = { - 0x43, 0x4D, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x66, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +static Vec const l_key_offset[2] = { + {205.0f, 180.0f, 0.0f}, + {230.0f, 180.0f, 0.0f}, }; -COMPILER_STRIP_GATE(0x80593E48, &l_key_offset); /* 80593E60-80593E74 000018 0014+00 0/0 0/0 0/0 .rodata l_col_offsetX */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_col_offsetX[20] = { - 0x42, 0xA0, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, 0x43, 0x70, - 0x00, 0x00, 0x43, 0xA0, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, +static f32 const l_col_offsetX[5] = { + 80.0f, 160.0f, 240.0f, 320.0f, 400.0f, }; -COMPILER_STRIP_GATE(0x80593E60, &l_col_offsetX); -#pragma pop /* 80593E74-80593EA4 00002C 0030+00 0/1 0/0 0/0 .rodata l_roll_crash_check_areaL */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_roll_crash_check_areaL[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0x43, 0xCD, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0x43, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, +static Vec const l_roll_crash_check_areaL[4] = { + {0.0f, 0.0f, -140.0f}, + {410.0f, 0.0f, -140.0f}, + {410.0f, 0.0f, 140.0f}, + {0.0f, 0.0f, 140.0f}, }; -COMPILER_STRIP_GATE(0x80593E74, &l_roll_crash_check_areaL); -#pragma pop /* 80593EA4-80593ED4 00005C 0030+00 0/1 0/0 0/0 .rodata l_roll_crash_check_areaL2 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_roll_crash_check_areaL2[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0x43, 0xE6, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0x43, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, +static Vec const l_roll_crash_check_areaL2[4] = { + {0.0f, 0.0f, -140.0f}, + {460.0f, 0.0f, -140.0f}, + {460.0f, 0.0f, 140.0f}, + {0.0f, 0.0f, 140.0f}, }; -COMPILER_STRIP_GATE(0x80593EA4, &l_roll_crash_check_areaL2); -#pragma pop - -/* 80593ED4-80593ED8 00008C 0004+00 1/2 0/0 0/0 .rodata @3670 */ -SECTION_RODATA static f32 const lit_3670 = -1.0f; -COMPILER_STRIP_GATE(0x80593ED4, &lit_3670); /* 805935B8-80593630 000078 0078+00 1/1 0/0 0/0 .text initBaseMtx__12daObjMGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjMGate_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/initBaseMtx__12daObjMGate_cFv.s" +void daObjMGate_c::initBaseMtx() { + if (mpKeyModel != NULL) { + mpKeyModel->setBaseScale(mScale); + } + + if (getType() == TYPE_LEFT) { + mScale.z = -1.0f; + } + + mpModel->setBaseScale(mScale); + setBaseMtx(); } -#pragma pop /* 80593630-80593760 0000F0 0130+00 2/2 0/0 0/0 .text setBaseMtx__12daObjMGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjMGate_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/setBaseMtx__12daObjMGate_cFv.s" +void daObjMGate_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mDoMtx_stack_c::ZXYrotM(mGateAngle.x, mGateAngle.y, mGateAngle.z); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + PSMTXCopy(mDoMtx_stack_c::get(), field_0x56c); + + if (mpKeyModel != NULL) { + cXyz key_offset(l_key_offset[mKind]); + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mDoMtx_stack_c::ZXYrotM(mGateAngle.x, mGateAngle.y, mGateAngle.z); + mDoMtx_stack_c::transM(key_offset); + mDoMtx_stack_c::XrotM(mGateKeyAngle); + mpKeyModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + } } -#pragma pop /* 80593760-805937AC 000220 004C+00 1/0 0/0 0/0 .text Create__12daObjMGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjMGate_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Create__12daObjMGate_cFv.s" -} -#pragma pop +int daObjMGate_c::Create() { + initBaseMtx(); -/* ############################################################################################## */ -/* 80593EFC-80593EFC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80593EFC = "M_IGate"; -SECTION_DEAD static char const* const stringBase_80593F04 = "M_HGate"; -SECTION_DEAD static char const* const stringBase_80593F0C = "M_IzumiGate.bmd"; -SECTION_DEAD static char const* const stringBase_80593F1C = "M_HashiGate.bmd"; -SECTION_DEAD static char const* const stringBase_80593F2C = "M_IzumiGate.dzb"; -SECTION_DEAD static char const* const stringBase_80593F3C = "M_HashiGate.dzb"; -SECTION_DEAD static char const* const stringBase_80593F4C = "M_GateKey"; -SECTION_DEAD static char const* const stringBase_80593F56 = "M_IGateKey.bmd"; -#pragma pop + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + return 1; +} /* 80593F68-80593F74 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, }; /* 80593F74-80593F88 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ +// unused but still left in? #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, @@ -259,234 +97,206 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80593F88-80593F90 -00001 0008+00 1/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName[2] = { - (void*)&d_a_obj_mgate__stringBase0, - (void*)(((char*)&d_a_obj_mgate__stringBase0) + 0x8), +static char* l_arcName[] = { + "M_IGate", + "M_HGate", }; /* 80593F90-80593F98 -00001 0008+00 0/1 0/0 0/0 .data l_bmdName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_bmdName[2] = { - (void*)(((char*)&d_a_obj_mgate__stringBase0) + 0x10), - (void*)(((char*)&d_a_obj_mgate__stringBase0) + 0x20), +static char* l_bmdName[] = { + "M_IzumiGate.bmd", + "M_HashiGate.bmd", }; -#pragma pop /* 80593F98-80593FA0 -00001 0008+00 0/1 0/0 0/0 .data l_dzbName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_dzbName[2] = { - (void*)(((char*)&d_a_obj_mgate__stringBase0) + 0x30), - (void*)(((char*)&d_a_obj_mgate__stringBase0) + 0x40), +static char* l_dzbName[] = { + "M_IzumiGate.dzb", + "M_HashiGate.dzb", }; -#pragma pop /* 80593FA0-80593FA4 -00001 0004+00 1/3 0/0 0/0 .data l_keyArcName */ -SECTION_DATA static void* l_keyArcName = (void*)(((char*)&d_a_obj_mgate__stringBase0) + 0x50); +static char* l_keyArcName = "M_GateKey"; /* 80593FA4-80593FA8 -00001 0004+00 0/1 0/0 0/0 .data l_keyBmdName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_keyBmdName = (void*)(((char*)&d_a_obj_mgate__stringBase0) + 0x5A); -#pragma pop +static char* l_keyBmdName = "M_IGateKey.bmd"; /* 805937AC-8059388C 00026C 00E0+00 1/0 0/0 0/0 .text CreateHeap__12daObjMGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjMGate_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/CreateHeap__12daObjMGate_cFv.s" +int daObjMGate_c::CreateHeap() { + J3DModelData* modelData = + (J3DModelData*)dComIfG_getObjectRes(l_arcName[mKind], l_bmdName[mKind]); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + if (!checkLock()) { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_keyArcName, l_keyBmdName); + mpKeyModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpKeyModel == NULL) { + return 0; + } + } + + return 1; } -#pragma pop /* 8059388C-80593988 00034C 00FC+00 1/1 0/0 0/0 .text create1st__12daObjMGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjMGate_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/create1st__12daObjMGate_cFv.s" +int daObjMGate_c::create1st() { + mKind = getKind(); + mType = getType(); + + int phase = dComIfG_resLoad(&mKeyPhase, l_keyArcName); + if (phase != cPhs_COMPLEATE_e) { + return phase; + } + + phase = dComIfG_resLoad(&mPhase, l_arcName[mKind]); + if (phase == cPhs_COMPLEATE_e) { + int dzb_id = dComIfG_getObjctResName2Index(l_arcName[mKind], l_dzbName[mKind]); + + phase = + MoveBGCreate(l_arcName[mKind], dzb_id, dBgS_MoveBGProc_TypicalRotY, 0x80004000, NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + + return phase; } -#pragma pop /* ############################################################################################## */ /* 80593ED8-80593EDC 000090 0004+00 0/0 0/0 0/0 .rodata @3752 */ +// unused but still left in? #pragma push #pragma force_active on -SECTION_RODATA static u8 const lit_3752[4] = { +static u8 const lit_3752[4] = { 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(0x80593ED8, &lit_3752); -#pragma pop - -/* 80593EDC-80593EE0 000094 0004+00 0/1 0/0 0/0 .rodata @3880 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3880 = 700.0f; -COMPILER_STRIP_GATE(0x80593EDC, &lit_3880); -#pragma pop - -/* 80593EE0-80593EE4 000098 0004+00 0/1 0/0 0/0 .rodata @3881 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3881 = 1000.0f; -COMPILER_STRIP_GATE(0x80593EE0, &lit_3881); -#pragma pop - -/* 80593EE4-80593EE8 00009C 0004+00 0/1 0/0 0/0 .rodata @3882 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3882 = 1.0f; -COMPILER_STRIP_GATE(0x80593EE4, &lit_3882); -#pragma pop - -/* 80593EE8-80593EEC 0000A0 0004+00 0/1 0/0 0/0 .rodata @3883 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3883 = -700.0f; -COMPILER_STRIP_GATE(0x80593EE8, &lit_3883); -#pragma pop - -/* 80593EEC-80593EF0 0000A4 0004+00 0/1 0/0 0/0 .rodata @3884 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3884 = -1000.0f; -COMPILER_STRIP_GATE(0x80593EEC, &lit_3884); -#pragma pop - -/* 80593EF0-80593EF4 0000A8 0004+00 0/1 0/0 0/0 .rodata @3885 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3885 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80593EF0, &lit_3885); -#pragma pop - -/* 80593EF4-80593EF8 0000AC 0004+00 0/1 0/0 0/0 .rodata @3886 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3886 = 20.0f; -COMPILER_STRIP_GATE(0x80593EF4, &lit_3886); -#pragma pop - -/* 80593EF8-80593EFC 0000B0 0004+00 0/1 0/0 0/0 .rodata @3887 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3887 = 7.0f / 100.0f; -COMPILER_STRIP_GATE(0x80593EF8, &lit_3887); #pragma pop /* 80593988-80593C4C 000448 02C4+00 1/0 0/0 0/0 .text Execute__12daObjMGate_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjMGate_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Execute__12daObjMGate_cFPPA3_A4_f.s" +int daObjMGate_c::Execute(Mtx** param_0) { + daPy_py_c* player_p = dComIfGp_getLinkPlayer(); + mCounter++; + + if (player_p->checkFrontRollCrash()) { + cXyz check_area_posA; + cXyz check_area_posB; + + switch (mKind) { + case KIND_IZUMI: + check_area_posA = l_roll_crash_check_areaL[0]; + check_area_posB = l_roll_crash_check_areaL[2]; + break; + case KIND_HASHI: + check_area_posA = l_roll_crash_check_areaL2[0]; + check_area_posB = l_roll_crash_check_areaL2[2]; + break; + } + + if (dLib_checkActorInRectangle(player_p, this, &check_area_posA, &check_area_posB)) { + if (mType == TYPE_RIGHT) { + mGateSwingMultiplier = 700.0f; + mGateKeySwingMultiplier = 1000.0f; + + if (checkOpen() == true) { + fopAcM_seStart(this, Z2SE_OBJ_IGATE_ATK_OP, 0); + } else { + fopAcM_seStart(this, Z2SE_OBJ_IGATE_ATK_CL, 0); + } + } else { + mGateSwingMultiplier = -700.0f; + mGateKeySwingMultiplier = -1000.0f; + + if (checkOpen() == true) { + fopAcM_seStart(this, Z2SE_OBJ_IGATE_ATK_OP, 0); + } + } + } + } + + *param_0 = &field_0x56c; + setBaseMtx(); + + mGateAngle.y = mGateSwingMultiplier * cM_ssin(mCounter * 4000); + mGateKeyAngle = mGateKeySwingMultiplier * cM_ssin(mCounter * 6000); + cLib_addCalc0(&mGateSwingMultiplier, 0.1f, 20.0f); + cLib_addCalc0(&mGateKeySwingMultiplier, 0.07f, 20.0f); + return 1; } -#pragma pop /* 80593C4C-80593D18 00070C 00CC+00 1/0 0/0 0/0 .text Draw__12daObjMGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjMGate_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Draw__12daObjMGate_cFv.s" +int daObjMGate_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + + if (mpKeyModel != NULL) { + g_env_light.setLightTevColorType_MAJI(mpKeyModel, &mTevStr); + mDoExt_modelUpdateDL(mpKeyModel); + } + + return 1; } -#pragma pop /* 80593D18-80593D74 0007D8 005C+00 1/0 0/0 0/0 .text Delete__12daObjMGate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjMGate_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/Delete__12daObjMGate_cFv.s" +int daObjMGate_c::Delete() { + dComIfG_resDelete(&mPhase, l_arcName[mKind]); + dComIfG_resDelete(&mKeyPhase, l_keyArcName); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80593FA8-80593FC8 -00001 0020+00 1/0 0/0 0/0 .data daObjMGate_METHODS */ -SECTION_DATA static void* daObjMGate_METHODS[8] = { - (void*)daObjMGate_create1st__FP12daObjMGate_c, - (void*)daObjMGate_MoveBGDelete__FP12daObjMGate_c, - (void*)daObjMGate_MoveBGExecute__FP12daObjMGate_c, - (void*)NULL, - (void*)daObjMGate_MoveBGDraw__FP12daObjMGate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80593FC8-80593FF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MGate */ -SECTION_DATA extern void* g_profile_Obj_MGate[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00640000, (void*)&g_fpcLf_Method, - (void*)0x000005D0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01C40000, (void*)&daObjMGate_METHODS, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80593FF8-80594020 000090 0028+00 1/1 0/0 0/0 .data __vt__12daObjMGate_c */ -SECTION_DATA extern void* __vt__12daObjMGate_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daObjMGate_cFv, - (void*)Create__12daObjMGate_cFv, - (void*)Execute__12daObjMGate_cFPPA3_A4_f, - (void*)Draw__12daObjMGate_cFv, - (void*)Delete__12daObjMGate_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 80593D74-80593DD4 000834 0060+00 1/0 0/0 0/0 .text daObjMGate_create1st__FP12daObjMGate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjMGate_create1st(daObjMGate_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_create1st__FP12daObjMGate_c.s" +static int daObjMGate_create1st(daObjMGate_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) daObjMGate_c(); + fopAcM_OnCondition(i_this, 8); + } + + return i_this->create1st(); } -#pragma pop /* 80593DD4-80593DF4 000894 0020+00 1/0 0/0 0/0 .text daObjMGate_MoveBGDelete__FP12daObjMGate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjMGate_MoveBGDelete(daObjMGate_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGDelete__FP12daObjMGate_c.s" +static int daObjMGate_MoveBGDelete(daObjMGate_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80593DF4-80593E14 0008B4 0020+00 1/0 0/0 0/0 .text daObjMGate_MoveBGExecute__FP12daObjMGate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjMGate_MoveBGExecute(daObjMGate_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGExecute__FP12daObjMGate_c.s" +static int daObjMGate_MoveBGExecute(daObjMGate_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80593E14-80593E40 0008D4 002C+00 1/0 0/0 0/0 .text daObjMGate_MoveBGDraw__FP12daObjMGate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjMGate_MoveBGDraw(daObjMGate_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate/daObjMGate_MoveBGDraw__FP12daObjMGate_c.s" +static int daObjMGate_MoveBGDraw(daObjMGate_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop -/* 80593EFC-80593EFC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 80593FA8-80593FC8 -00001 0020+00 1/0 0/0 0/0 .data daObjMGate_METHODS */ +static actor_method_class daObjMGate_METHODS = { + (process_method_func)daObjMGate_create1st, (process_method_func)daObjMGate_MoveBGDelete, + (process_method_func)daObjMGate_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjMGate_MoveBGDraw, +}; + +/* 80593FC8-80593FF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MGate */ +extern actor_process_profile_definition g_profile_Obj_MGate = { + -3, 3, + 0xFFFD, PROC_Obj_MGate, + 0, &g_fpcLf_Method.mBase, + 0x5D0, 0, + 0, &g_fopAc_Method.base, + 0x01C4, 0, + 0, &daObjMGate_METHODS, + 0x00040100, 0, + 14, 0, + 0, +}; diff --git a/rel/d/a/obj/d_a_obj_volcball/Makefile b/rel/d/a/obj/d_a_obj_volcball/Makefile index 3bde1eb3b7..ae36e2f9b8 100644 --- a/rel/d/a/obj/d_a_obj_volcball/Makefile +++ b/rel/d/a/obj/d_a_obj_volcball/Makefile @@ -8,12 +8,10 @@ M675_MAP := $(BUILD_DIR)/rel/d/a/obj/d_a_obj_volcball.map M675_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.cpp \ rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp \ M675_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.o \ M675_LIBS := \ diff --git a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp index f07c991df8..966d29ab06 100644 --- a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp +++ b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp @@ -1,55 +1,89 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_volcball -// +/** + * d_a_obj_volcball.cpp + * Volcano Eruption Falling Rocks + */ #include "rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/event/d_event_lib.h" #include "dol2asm.h" -#include "dolphin/types.h" // // Types: // -struct request_of_phase_process_class {}; +class daObjVolcBall_c : public fopAc_ac_c, public dEvLib_callback_c { +public: + enum mode_e { + /* 0 */ MODE_PLAYER_WAIT, + /* 1 */ MODE_SWITCH_WAIT, + /* 2 */ MODE_STOP, + /* 3 */ MODE_QUAKE, + /* 4 */ MODE_ERUPT, + /* 5 */ MODE_END, + }; -struct csXyz {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); -}; - -struct daObjVolcBall_c { struct vball_s { /* 80D21FA8 */ ~vball_s(); /* 80D2214C */ vball_s(); + + /* 0x000 */ J3DModel* mpModel; + /* 0x004 */ cXyz field_0x4; + /* 0x010 */ cXyz field_0x10; + /* 0x01C */ cXyz field_0x1c; + /* 0x028 */ cXyz field_0x28; + /* 0x034 */ csXyz field_0x34; + /* 0x03C */ cXyz field_0x3c; + /* 0x048 */ f32 field_0x48; + /* 0x04C */ f32 field_0x4c; + /* 0x050 */ f32 field_0x50; + /* 0x054 */ dBgS_ObjAcch mAcch; + /* 0x22C */ dCcD_Sph mSphCc; + /* 0x364 */ cXyz field_0x364; + /* 0x370 */ u32 field_0x370; + /* 0x374 */ s16 field_0x374; + /* 0x376 */ u8 field_0x376; + /* 0x378 */ csXyz field_0x378; + /* 0x37E */ u8 field_0x37E[0x0390 - 0x037E]; + /* 0x390 */ dPa_followEcallBack field_0x390[4]; }; - /* 80D21B18 */ void getData(); + class volc_param_c { + public: + /* 0x00 */ f32 mGravity; + /* 0x04 */ f32 mMaxFallSpeed; + /* 0x08 */ f32 mBallSpeedH; + /* 0x0C */ f32 mBallSetShortRange; + /* 0x10 */ f32 mBallSetRandom; + /* 0x14 */ f32 mNormalScale; + /* 0x18 */ f32 mScaleRandValue; + /* 0x1C */ f32 mNormalInterval; + /* 0x20 */ f32 mRandInterval; + /* 0x24 */ f32 mNormalWaitTime; + /* 0x28 */ f32 mRandWaitTime; + /* 0x2C */ f32 mNormalWarningTime; + /* 0x30 */ f32 mRandWarningTime; + /* 0x34 */ f32 mNormalEruptTime; + /* 0x38 */ f32 mRandEruptTime; + /* 0x3C */ f32 mSearchBallFreq; + /* 0x40 */ f32 mSearchBallBaseScale; + /* 0x44 */ f32 mSearchBallRandScale; + /* 0x48 */ f32 mSearchBallSetHeight; + /* 0x4C */ f32 mSearchBallShadowIntensity; + /* 0x50 */ u8 mSearchBallCreateTime; + /* 0x51 */ u8 mPlayerSearchTime; + }; + + daObjVolcBall_c() : dEvLib_callback_c(this) {} + + /* 80D21B18 */ volc_param_c* getData(); /* 80D21BA0 */ void initBaseMtx(); /* 80D21BC0 */ void setBaseMtx(); - /* 80D21C40 */ void Create(); - /* 80D21D80 */ void CreateHeap(); - /* 80D21E28 */ void create(); - /* 80D22424 */ void execute(); + /* 80D21C40 */ int Create(); + /* 80D21D80 */ int CreateHeap(); + /* 80D21E28 */ int create(); + /* 80D22424 */ int execute(); /* 80D22484 */ void action(); /* 80D22570 */ void initActionPlayerWait(); /* 80D2257C */ void initActionWarning(); @@ -61,176 +95,54 @@ struct daObjVolcBall_c { /* 80D22944 */ void actionEruption(); /* 80D22C6C */ void initActionEnd(); /* 80D22CD4 */ void actionEnd(); - /* 80D22DDC */ void eventStart(); /* 80D22E24 */ void setEruptEffect(int); /* 80D22ED4 */ void setFallEffect(int); /* 80D22FCC */ void endFallEffect(int); - /* 80D23034 */ void createSearchBall(); - /* 80D23188 */ void createNormalBall(); - /* 80D23438 */ void executeBall(); + /* 80D23034 */ bool createSearchBall(); + /* 80D23188 */ bool createNormalBall(); + /* 80D23438 */ int executeBall(); /* 80D23868 */ void startQuake(); - /* 80D23904 */ void draw(); - /* 80D23A0C */ void _delete(); - /* 80D23B24 */ ~daObjVolcBall_c(); + /* 80D23904 */ int draw(); + /* 80D23A0C */ int _delete(); + + /* 80D23B24 */ virtual ~daObjVolcBall_c(); + /* 80D22DDC */ virtual BOOL eventStart(); + + u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } + u8 checkBigVolc() { return fopAcM_GetParamBit(this, 0x1F, 1); } + u8 getEvNo() { return fopAcM_GetParamBit(this, 0x10, 8); } + + void setAction(u8 i_action) { mMode = i_action; } + + /* 0x057C */ request_of_phase_process_class mPhase; + /* 0x0584 */ dBgS_AcchCir mAcchCir; + /* 0x05C4 */ dCcD_Stts mCcStts; + /* 0x0600 */ u8 mIsBigVolc; + /* 0x0601 */ u8 mMode; + /* 0x0602 */ u8 mNormalBallCreateTimer; + /* 0x0603 */ u8 field_0x603; + /* 0x0604 */ u32 mTime; + /* 0x0608 */ u32 mSearchBallCreateTimer; + /* 0x060C */ vball_s mBall[9]; + /* 0x28EC */ Mtx field_0x28ec; + /* 0x291C */ f32 field_0x291c; + /* 0x2920 */ u32 mBigVolcActorID; + /* 0x2924 */ u8 field_0x2924; + /* 0x2925 */ u8 field_0x2925; + /* 0x2926 */ u8 field_0x2926; }; -struct dVibration_c { - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); - /* 8006FE5C */ void CheckQuake(); +class daObjVolcBom_c { +public: + void startFall() { field_0x95f = 1; } + void startSearch() { field_0x960 = 1; } + + u8 temp[0x95F]; + /* 0x95F */ u8 field_0x95f; + /* 0x960 */ u8 field_0x960; }; -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack { - /* 80D22148 */ void cleanup(); - /* 80D23CE0 */ ~dPa_levelEcallBack(); -}; - -struct dPa_followEcallBack { - /* 80049580 */ dPa_followEcallBack(u8, u8); - /* 80D220C4 */ ~dPa_followEcallBack(); - /* 80D22230 */ void __defctor(); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80D23C40 */ ~dEvLib_callback_c(); - /* 80D23C88 */ bool eventRun(); - /* 80D23C90 */ bool eventEnd(); - /* 80D23D64 */ bool eventStart(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80D22358 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80D222E8 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80D223B4 */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80D22258 */ ~cM3dGSph(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80D222A0 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80D23C98 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct _GXTexObj {}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JPABaseEmitter {}; - -struct JPAEmitterCallBack { - /* 8027E6A4 */ ~JPAEmitterCallBack(); - /* 80D23D54 */ void execute(JPABaseEmitter*); - /* 80D23D58 */ void executeAfter(JPABaseEmitter*); - /* 80D23D5C */ void draw(JPABaseEmitter*); - /* 80D23D60 */ void drawAfter(JPABaseEmitter*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - // // Forward References: // @@ -281,17 +193,21 @@ extern "C" static void daObjVolcBall_Delete__FP15daObjVolcBall_c(); extern "C" static void daObjVolcBall_Create__FP10fopAc_ac_c(); extern "C" void __dt__15daObjVolcBall_cFv(); extern "C" void __dt__17dEvLib_callback_cFv(); -extern "C" bool eventRun__17dEvLib_callback_cFv(); -extern "C" bool eventEnd__17dEvLib_callback_cFv(); +extern "C" int eventRun__17dEvLib_callback_cFv(void* this_); +extern "C" int eventEnd__17dEvLib_callback_cFv(void* this_); extern "C" void __dt__10cCcD_GSttsFv(); extern "C" void __dt__18dPa_levelEcallBackFv(); -extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(); -extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); -extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(); -extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); -extern "C" bool eventStart__17dEvLib_callback_cFv(); -extern "C" void func_80D23D6C(void* _this, u8*); -extern "C" void func_80D23D88(void* _this, u32*); +extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_, + JPABaseEmitter* param_0); +extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_, + JPABaseEmitter* param_0); +extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_, + JPABaseEmitter* param_0); +extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_, + JPABaseEmitter* param_0); +extern "C" int eventStart__17dEvLib_callback_cFv(void* this_); +extern "C" u8 func_80D23D6C(u8*); +extern "C" u32 func_80D23D88(u32*); extern "C" static void func_80D23DA4(); extern "C" static void func_80D23DAC(); extern "C" static void func_80D23DB4(); @@ -359,12 +275,6 @@ extern "C" void __dt__18JPAEmitterCallBackFv(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareDistance(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); @@ -381,8 +291,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__19dPa_followEcallBack[10]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -390,14 +298,21 @@ 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]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80D24100[4]; +extern void* __vt__15daObjVolcBall_c[10]; +extern void* __vt__12dBgS_AcchCir[3]; +extern void* __vt__10cCcD_GStts[3]; +extern void* __vt__10dCcD_GStts[3]; +extern void* __vt__18dPa_levelEcallBack[9]; +extern void* __vt__12dBgS_ObjAcch[9]; +extern void* __vt__8cM3dGAab[3]; +extern void* __vt__8cM3dGSph[3]; +extern void* __vt__17dEvLib_callback_c[6]; + // // Declarations: // @@ -428,82 +343,72 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80D23EAC-80D23EB0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_volcball__stringBase0; +SECTION_DATA static const char* l_arcName = "M_Volcbal"; /* 80D23EB0-80D23F58 000024 00A8+00 1/1 0/0 0/0 .data l_param */ -SECTION_DATA static u8 l_param[168] = { - 0xC0, 0x40, 0x00, 0x00, 0xC2, 0x8C, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x44, 0xD4, 0x80, 0x00, - 0x43, 0xC8, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x40, 0xA0, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x9C, 0x40, 0x00, 0x3F, 0x99, 0x99, 0x9A, - 0x08, 0x46, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, 0xC2, 0xC8, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x44, 0xD4, 0x80, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3E, 0x99, 0x99, 0x9A, 0x45, 0x9C, 0x40, 0x00, - 0x3F, 0x99, 0x99, 0x9A, 0x02, 0x2B, 0x00, 0x00, +static daObjVolcBall_c::volc_param_c l_param[] = { + { + -3.0f, -70.0f, 1.0f, 1700.0f, 400.0f, 1.0f, 0.5f, 5.0f, 5.0f, 50.0f, 20.0f, + 6.0f, 2.0f, 20.0f, 4.0f, 0.6f, 2.0f, 0.0f, 5000.0f, 1.2f, 8, 70, + }, + { + -10.0f, -100.0f, 1.0f, 1700.0f, 400.0f, 1.0f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, + 1.0f, 0.0f, 9.0f, 0.0f, 1.0f, 2.0f, 0.3f, 5000.0f, 1.2f, 2, 43, + }, }; /* 80D21B18-80D21B30 000078 0018+00 8/8 0/0 0/0 .text getData__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::getData() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/getData__15daObjVolcBall_cFv.s" +daObjVolcBall_c::volc_param_c* daObjVolcBall_c::getData() { + return &l_param[mIsBigVolc]; } -#pragma pop /* 80D21B30-80D21B50 000090 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void CheckCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 80D21B50-80D21BA0 0000B0 0050+00 1/1 0/0 0/0 .text search_big_volc__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void search_big_volc(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/search_big_volc__FPvPv.s" +static void* search_big_volc(void* i_actor, void*) { + if (i_actor != NULL && fopAcM_IsActor(i_actor) && + fopAcM_GetProfName(i_actor) == PROC_Obj_VolcanicBomb) + { + return i_actor; + } + + return NULL; } -#pragma pop /* 80D21BA0-80D21BC0 000100 0020+00 1/1 0/0 0/0 .text initBaseMtx__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initBaseMtx__15daObjVolcBall_cFv.s" +void daObjVolcBall_c::initBaseMtx() { + setBaseMtx(); } -#pragma pop /* 80D21BC0-80D21C40 000120 0080+00 1/1 0/0 0/0 .text setBaseMtx__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setBaseMtx__15daObjVolcBall_cFv.s" +void daObjVolcBall_c::setBaseMtx() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + if (mIsBigVolc == 0) { + current.pos = player_p->current.pos; + } + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + PSMTXCopy(mDoMtx_stack_c::get(), field_0x28ec); } -#pragma pop /* ############################################################################################## */ /* 80D23DCC-80D23E0C 000000 0040+00 7/7 0/0 0/0 .rodata l_sph_src */ -SECTION_RODATA static u8 const l_sph_src[64] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, +static const dCcD_SrcSph l_sph_src = { + { + {0, {{AT_TYPE_BOMB, 1, 0x1F}, {0, 0x11}, 0}}, + {dCcD_SE_NONE, 0, 1, 0, {8}}, + {dCcD_SE_NONE, 0, 0, 0, {2}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 100.0f, + }, }; -COMPILER_STRIP_GATE(0x80D23DCC, &l_sph_src); /* 80D23E0C-80D23E10 000040 0004+00 2/6 0/0 0/0 .rodata @3715 */ SECTION_RODATA static f32 const lit_3715 = 30.0f; @@ -533,98 +438,939 @@ COMPILER_STRIP_GATE(0x80D23E18, &lit_3718); #pragma pop /* 80D21C40-80D21D80 0001A0 0140+00 1/1 0/0 0/0 .text Create__15daObjVolcBall_cFv */ +// matches with literals +#ifdef NONMATCHING +int daObjVolcBall_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, field_0x28ec); + + for (int i = 0; i < 9; i++) { + mAcchCir.SetWall(30.0f, 30.0f); + mBall[i].mAcch.Set(&mBall[i].field_0x4, &mBall[i].field_0x10, this, 1, &mAcchCir, + &mBall[i].field_0x3c, NULL, NULL); + mCcStts.Init(0, 0xFF, this); + mBall[i].mSphCc.Set(l_sph_src); + mBall[i].mSphCc.SetStts(&mCcStts); + } + + fopAcM_setCullSizeBox(this, -1000.0f, 0.0f, -1000.0f, 1000.0f, 1000.0f, 1000.0f); + + if (mIsBigVolc == 0) { + if (i_fopAcM_isSwitch(this, getSwBit())) { + initActionWarning(); + } else { + initActionSwWait(); + } + } else { + initActionPlayerWait(); + } + + mBigVolcActorID = -1; + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjVolcBall_c::Create() { +asm int daObjVolcBall_c::Create() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/Create__15daObjVolcBall_cFv.s" } #pragma pop +#endif /* 80D21D80-80D21E28 0002E0 00A8+00 1/1 0/0 0/0 .text CreateHeap__15daObjVolcBall_cFv */ +int daObjVolcBall_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3); + + for (int i = 0; i < 9; i++) { + mBall[i].mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mBall[i].mpModel == NULL) { + return 0; + } + } + + return 1; +} + +/* 80D21E28-80D21FA8 000388 0180+00 1/1 0/0 0/0 .text create__15daObjVolcBall_cFv */ +// matches with vtable data +#ifdef NONMATCHING +int daObjVolcBall_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daObjVolcBall_c(); + fopAcM_OnCondition(this, 8); + } + + mIsBigVolc = checkBigVolc(); + if (mIsBigVolc == 1) { + if (i_fopAcM_isSwitch(this, getSwBit2())) { + return cPhs_ERROR_e; + } + + field_0x2926 = 1; + } + + int phase = dComIfG_resLoad(&mPhase, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x4900)) { + return cPhs_ERROR_e; + } + + if (!Create()) { + return cPhs_ERROR_e; + } + } + + return phase; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjVolcBall_c::CreateHeap() { +asm int daObjVolcBall_c::create() { nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/CreateHeap__15daObjVolcBall_cFv.s" +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/func_80D21E28.s" +} +#pragma pop +#endif + +/* 80D21FA8-80D220C4 000508 011C+00 2/2 0/0 0/0 .text __dt__Q215daObjVolcBall_c7vball_sFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daObjVolcBall_c::vball_s::~vball_s() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__Q215daObjVolcBall_c7vball_sFv.s" } #pragma pop +/* 80D220C4-80D22148 000624 0084+00 2/2 0/0 0/0 .text __dt__19dPa_followEcallBackFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm dPa_followEcallBack::~dPa_followEcallBack() { +extern "C" asm void __dt__19dPa_followEcallBackFv() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__19dPa_followEcallBackFv.s" +} +#pragma pop + +/* 80D22148-80D2214C 0006A8 0004+00 1/0 0/0 0/0 .text cleanup__18dPa_levelEcallBackFv */ +void dPa_levelEcallBack::cleanup() { + /* empty function */ +} + +/* 80D2214C-80D22230 0006AC 00E4+00 1/1 0/0 0/0 .text __ct__Q215daObjVolcBall_c7vball_sFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daObjVolcBall_c::vball_s::vball_s() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__ct__Q215daObjVolcBall_c7vball_sFv.s" +} +#pragma pop + +/* 80D22230-80D22258 000790 0028+00 1/1 0/0 0/0 .text __defctor__19dPa_followEcallBackFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void dPa_followEcallBack::__defctor() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__defctor__19dPa_followEcallBackFv.s" +} +#pragma pop + +/* 80D22258-80D222A0 0007B8 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_volcball/d_a_obj_volcball/__dt__8cM3dGSphFv.s" +} +#pragma pop + +/* 80D222A0-80D222E8 000800 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_volcball/d_a_obj_volcball/__dt__8cM3dGAabFv.s" +} +#pragma pop + +/* 80D222E8-80D22358 000848 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_volcball/d_a_obj_volcball/__dt__12dBgS_ObjAcchFv.s" +} +#pragma pop + +/* 80D22358-80D223B4 0008B8 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_volcball/d_a_obj_volcball/__dt__10dCcD_GSttsFv.s" +} +#pragma pop + +/* 80D223B4-80D22424 000914 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_volcball/d_a_obj_volcball/__dt__12dBgS_AcchCirFv.s" +} +#pragma pop + +/* 80D22424-80D22484 000984 0060+00 1/1 0/0 0/0 .text execute__15daObjVolcBall_cFv */ +int daObjVolcBall_c::execute() { + f32 gravity = getData()->mGravity; + f32 fall_speed = getData()->mMaxFallSpeed; + + mGravity = gravity; + mMaxFallSpeed = fall_speed; + + action(); + return 1; +} + +typedef void (daObjVolcBall_c::*actionFunc)(); + +/* 80D22484-80D22570 0009E4 00EC+00 1/1 0/0 0/0 .text action__15daObjVolcBall_cFv */ +void daObjVolcBall_c::action() { + static actionFunc l_func[] = { + &daObjVolcBall_c::actionPlayerWait, &daObjVolcBall_c::actionSwWait, + &daObjVolcBall_c::actionStop, &daObjVolcBall_c::actionWarning, + &daObjVolcBall_c::actionEruption, &daObjVolcBall_c::actionEnd, + }; + + (this->*l_func[mMode])(); +} + +/* 80D22570-80D2257C 000AD0 000C+00 1/1 0/0 0/0 .text initActionPlayerWait__15daObjVolcBall_cFv */ +void daObjVolcBall_c::initActionPlayerWait() { + setAction(MODE_PLAYER_WAIT); +} + +/* 80D2257C-80D225A4 000ADC 0028+00 3/3 0/0 0/0 .text initActionWarning__15daObjVolcBall_cFv */ +void daObjVolcBall_c::initActionWarning() { + setAction(MODE_QUAKE); + startQuake(); +} + +/* 80D225A4-80D225B0 000B04 000C+00 1/1 0/0 0/0 .text initActionSwWait__15daObjVolcBall_cFv */ +void daObjVolcBall_c::initActionSwWait() { + setAction(MODE_SWITCH_WAIT); +} + /* ############################################################################################## */ -/* 80D23F58-80D23F64 -00001 000C+00 0/1 0/0 0/0 .data @3929 */ +/* 80D23E1C-80D23E20 000050 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on -SECTION_DATA static void* lit_3929[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionPlayerWait__15daObjVolcBall_cFv, -}; +SECTION_RODATA static f32 const lit_3969 = 2500.0f; +COMPILER_STRIP_GATE(0x80D23E1C, &lit_3969); #pragma pop -/* 80D23F64-80D23F70 -00001 000C+00 0/1 0/0 0/0 .data @3930 */ +/* 80D23E20-80D23E24 000054 0004+00 0/1 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on -SECTION_DATA static void* lit_3930[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionSwWait__15daObjVolcBall_cFv, -}; +SECTION_RODATA static f32 const lit_3970 = 300.0f; +COMPILER_STRIP_GATE(0x80D23E20, &lit_3970); #pragma pop -/* 80D23F70-80D23F7C -00001 000C+00 0/1 0/0 0/0 .data @3931 */ +/* 80D225B0-80D2267C 000B10 00CC+00 1/0 0/0 0/0 .text actionPlayerWait__15daObjVolcBall_cFv */ +// matches with literals +#ifdef NONMATCHING +void daObjVolcBall_c::actionPlayerWait() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + if (fopAcM_searchPlayerDistanceXZ(this) < 2500.0f) { + if (fabsf(current.pos.y - player_p->current.pos.y) < 300.0f) { + mTime = getData()->mNormalWarningTime * 30.0f + + cM_rndFX(getData()->mRandWarningTime * 30.0f); + initActionWarning(); + } + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daObjVolcBall_c::actionPlayerWait() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionPlayerWait__15daObjVolcBall_cFv.s" +} +#pragma pop +#endif + +/* 80D2267C-80D22724 000BDC 00A8+00 1/0 0/0 0/0 .text actionSwWait__15daObjVolcBall_cFv + */ +void daObjVolcBall_c::actionSwWait() { + if (i_fopAcM_isSwitch(this, getSwBit())) { + setAction(MODE_STOP); + mTime = getData()->mNormalWaitTime * FLOAT_LABEL(lit_3715) + + cM_rndFX(getData()->mRandWaitTime * FLOAT_LABEL(lit_3715)); + } +} + +/* 80D22724-80D227E4 000C84 00C0+00 1/0 0/0 0/0 .text actionStop__15daObjVolcBall_cFv */ +void daObjVolcBall_c::actionStop() { + if (!i_fopAcM_isSwitch(this, getSwBit())) { + setAction(MODE_SWITCH_WAIT); + } + + if (func_80D23D88(&mTime) == 0) { + mTime = getData()->mNormalWarningTime * FLOAT_LABEL(lit_3715) + + cM_rndFX(getData()->mRandWarningTime * FLOAT_LABEL(lit_3715)); + initActionWarning(); + } +} + +/* ############################################################################################## */ +/* 80D23E24-80D23E28 000058 0004+00 2/7 0/0 0/0 .rodata @4031 */ +SECTION_RODATA static f32 const lit_4031 = 1.0f; +COMPILER_STRIP_GATE(0x80D23E24, &lit_4031); + +/* 80D23E28-80D23E2C 00005C 0004+00 0/3 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on -SECTION_DATA static void* lit_3931[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionStop__15daObjVolcBall_cFv, -}; +SECTION_RODATA static f32 const lit_4032 = -1.0f; +COMPILER_STRIP_GATE(0x80D23E28, &lit_4032); #pragma pop -/* 80D23F7C-80D23F88 -00001 000C+00 0/1 0/0 0/0 .data @3932 */ +/* 80D227E4-80D22944 000D44 0160+00 1/0 0/0 0/0 .text actionWarning__15daObjVolcBall_cFv + */ +// matches with literals +#ifdef NONMATCHING +void daObjVolcBall_c::actionWarning() { + if (!dComIfGp_getVibration().CheckQuake()) { + startQuake(); + } + + if (getSwBit() != 0xFF) { + if (!i_fopAcM_isSwitch(this, getSwBit())) { + dComIfGp_getVibration().StopQuake(31); + setAction(MODE_SWITCH_WAIT); + } + } + + if (func_80D23D88(&mTime) == 0) { + setAction(MODE_ERUPT); + mTime = getData()->mNormalEruptTime * FLOAT_LABEL(lit_3715) + + cM_rndFX(getData()->mRandEruptTime * FLOAT_LABEL(lit_3715)); + + mSearchBallCreateTimer = getData()->mSearchBallCreateTime * 30; + } + + i_mDoAud_seStartLevel(Z2SE_ENV_VOLCANO_SHAKE, NULL, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daObjVolcBall_c::actionWarning() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionWarning__15daObjVolcBall_cFv.s" +} +#pragma pop +#endif + +/* ############################################################################################## */ +/* 80D23E2C-80D23E34 000060 0004+04 0/1 0/0 0/0 .rodata @4095 */ #pragma push #pragma force_active on -SECTION_DATA static void* lit_3932[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWarning__15daObjVolcBall_cFv, +SECTION_RODATA static f32 const lit_4095[1 + 1 /* padding */] = { + 100.0f, + /* padding */ + 0.0f, }; +COMPILER_STRIP_GATE(0x80D23E2C, &lit_4095); #pragma pop -/* 80D23F88-80D23F94 -00001 000C+00 0/1 0/0 0/0 .data @3933 */ +/* 80D23E34-80D23E3C 000068 0008+00 0/1 0/0 0/0 .rodata @4097 */ #pragma push #pragma force_active on -SECTION_DATA static void* lit_3933[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEruption__15daObjVolcBall_cFv, +SECTION_RODATA static u8 const lit_4097[8] = { + 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +COMPILER_STRIP_GATE(0x80D23E34, &lit_4097); #pragma pop -/* 80D23F94-80D23FA0 -00001 000C+00 0/1 0/0 0/0 .data @3934 */ +/* 80D22944-80D22C6C 000EA4 0328+00 1/0 0/0 0/0 .text actionEruption__15daObjVolcBall_cFv + */ +// small regalloc / literals +#ifdef NONMATCHING +void daObjVolcBall_c::actionEruption() { + if (!dComIfGp_getVibration().CheckQuake()) { + startQuake(); + } + + daPy_py_c* player_p = daPy_getPlayerActorClass(); + u32 timer = func_80D23D88(&mTime); + bool disable_ball_create = true; + + if (timer != 0) { + bool bvar2 = false; + if (getSwBit() != 0xFF && !i_fopAcM_isSwitch(this, getSwBit())) { + bvar2 = true; + } + + if (!bvar2) { + disable_ball_create = false; + } + } + + if (!disable_ball_create) { + if (func_80D23D88(&mSearchBallCreateTimer) == 0) { + createSearchBall(); + } + + if (func_80D23D6C(&mNormalBallCreateTimer) == 0) { + createNormalBall(); + } + } + + if (mBall[8].field_0x376 != 0) { + field_0x603++; + + u8 search_time = getData()->mPlayerSearchTime; + f32 shadow_intensity = getData()->mSearchBallShadowIntensity; + + if (field_0x603 < search_time) { + mBall[8].field_0x4.x = player_p->current.pos.x; + mBall[8].field_0x4.z = player_p->current.pos.z; + mBall[8].field_0x364 = player_p->current.pos; + } + + cLib_chaseF(&mBall[8].field_0x1c.x, field_0x291c, field_0x291c / (f32)search_time); + cLib_chaseF(&mBall[8].field_0x1c.y, field_0x291c, field_0x291c / (f32)search_time); + cLib_chaseF(&mBall[8].field_0x1c.z, field_0x291c, field_0x291c / (f32)search_time); + cLib_chaseF(&mBall[8].field_0x50, shadow_intensity, shadow_intensity / (f32)search_time); + + mBall[8].field_0x28 = mBall[8].field_0x1c; + mBall[8].mSphCc.SetR(field_0x291c * 100.0f); + mBall[8].mSphCc.SetC(mBall[8].field_0x4); + dComIfG_Ccsp()->Set(&mBall[8].mSphCc); + } + + if (!executeBall() && disable_ball_create) { + if (mIsBigVolc == 0) { + setAction(MODE_STOP); + mTime = getData()->mNormalWaitTime * FLOAT_LABEL(lit_3715) + + cM_rndFX(getData()->mRandWaitTime * FLOAT_LABEL(lit_3715)); + } else if (mIsBigVolc == 1) { + initActionEnd(); + } + + dComIfGp_getVibration().StopQuake(31); + } + + i_mDoAud_seStartLevel(Z2SE_ENV_VOLCANO_SHAKE, NULL, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daObjVolcBall_c::actionEruption() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionEruption__15daObjVolcBall_cFv.s" +} +#pragma pop +#endif + +/* 80D22C6C-80D22CD4 0011CC 0068+00 1/1 0/0 0/0 .text initActionEnd__15daObjVolcBall_cFv + */ +void daObjVolcBall_c::initActionEnd() { + field_0x2925 = 0; + field_0x2924 = 0; + + fopAc_ac_c* big_volc = fopAcM_Search(search_big_volc, this); + if (big_volc != NULL) { + mBigVolcActorID = fopAcM_GetID(big_volc); + } + + setAction(MODE_END); +} + +/* 80D22CD4-80D22DDC 001234 0108+00 1/0 0/0 0/0 .text actionEnd__15daObjVolcBall_cFv */ +// weird branching +#ifdef NONMATCHING +void daObjVolcBall_c::actionEnd() { + if (mIsBigVolc == 1 ||) { + if (mIsBigVolc == 1 && i_fopAcM_isSwitch(this, getSwBit())) { + return; + } + + daObjVolcBom_c* bom_p = (daObjVolcBom_c*)fopAcM_SearchByID(mBigVolcActorID); + if (bom_p != NULL) { + switch (field_0x2924) { + case 0: + bom_p->startSearch(); + field_0x2924 = 1; + case 1: + if (field_0x2925 == 60) { + field_0x2924 = 2; + } + + field_0x2925++; + break; + case 2: + orderEvent(getEvNo(), 0xFF, 1); + field_0x2924 = 3; + break; + case 3: + eventUpdate(); + break; + } + } + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daObjVolcBall_c::actionEnd() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionEnd__15daObjVolcBall_cFv.s" +} +#pragma pop +#endif + +/* 80D22DDC-80D22E24 00133C 0048+00 2/1 0/0 0/0 .text eventStart__15daObjVolcBall_cFv */ +BOOL daObjVolcBall_c::eventStart() { + daObjVolcBom_c* bom_p = (daObjVolcBom_c*)fopAcM_SearchByID(mBigVolcActorID); + if (bom_p != NULL) { + bom_p->startFall(); + } + + return TRUE; +} + +/* 80D22E24-80D22ED4 001384 00B0+00 1/1 0/0 0/0 .text setEruptEffect__15daObjVolcBall_cFi + */ +void daObjVolcBall_c::setEruptEffect(int i_ballNo) { + static u16 const l_effect_id[6] = {0x84A8, 0x84A9, 0x84AA, 0x84AB, 0x84AC, 0x84AD}; + + vball_s* ball = &mBall[i_ballNo]; + + for (int i = 0; i < 6; i++) { + dComIfGp_particle_setColor(l_effect_id[i], &ball->field_0x4, &mTevStr, NULL, NULL, + FLOAT_LABEL(lit_3717), 0xFF, NULL, &ball->field_0x1c, NULL, -1, + NULL); + } +} + +/* 80D22ED4-80D22FCC 001434 00F8+00 2/2 0/0 0/0 .text setFallEffect__15daObjVolcBall_cFi + */ +void daObjVolcBall_c::setFallEffect(int i_ballNo) { + static u16 const l_fall_effect_id[4] = {0x84AE, 0x84AF, 0x84B0, 0x84B1}; + + vball_s* ball = &mBall[i_ballNo]; + + for (int i = 0; i < 4; i++) { + cXyz sp28; + + if (i_ballNo == 8) { + sp28.setAll(field_0x291c); + } else { + sp28 = ball->field_0x1c; + } + + dComIfGp_particle_setColor(l_fall_effect_id[i], &ball->field_0x4, &mTevStr, NULL, NULL, + FLOAT_LABEL(lit_3717), 0xFF, &ball->field_0x34, &sp28, + &ball->field_0x390[i], -1, NULL); + } +} + +/* 80D22FCC-80D23034 00152C 0068+00 2/2 0/0 0/0 .text endFallEffect__15daObjVolcBall_cFi + */ +void daObjVolcBall_c::endFallEffect(int i_ballNo) { + vball_s* ball = &mBall[i_ballNo]; + + for (int i = 0; i < 4; i++) { + ball->field_0x390[i].remove(); + } +} + +/* 80D23034-80D23188 001594 0154+00 1/1 0/0 0/0 .text createSearchBall__15daObjVolcBall_cFv */ +// matches with literals +#ifdef NONMATCHING +bool daObjVolcBall_c::createSearchBall() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + bool var_r30 = false; + + if (mBall[8].field_0x376 == 0) { + f32 create_freq = getData()->mSearchBallFreq; + f32 scale = getData()->mSearchBallBaseScale + cM_rndFX(getData()->mSearchBallRandScale); + f32 height = getData()->mSearchBallSetHeight; + + if (cM_rndF(1.0f) < create_freq) { + mBall[8].field_0x376 = 1; + mBall[8].field_0x4 = player_p->current.pos; + mBall[8].field_0x4.y += height; + mBall[8].field_0x4c = mBall[8].field_0x4.y; + mBall[8].field_0x1c.set(0.0f, 0.0f, 0.0f); + mBall[8].field_0x3c.set(0.0f, 0.0f, 0.0f); + mBall[8].field_0x50 = 0.0f; + + field_0x291c = scale; + field_0x603 = 0; + setFallEffect(8); + var_r30 = true; + } + + mSearchBallCreateTimer = getData()->mSearchBallCreateTime * 30; + } + + return var_r30; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daObjVolcBall_c::createSearchBall() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/createSearchBall__15daObjVolcBall_cFv.s" +} +#pragma pop +#endif + +/* ############################################################################################## */ +/* 80D23E50-80D23E54 000084 0004+00 0/1 0/0 0/0 .rodata @4279 */ #pragma push #pragma force_active on -SECTION_DATA static void* lit_3934[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEnd__15daObjVolcBall_cFv, -}; +SECTION_RODATA static f32 const lit_4279 = 32767.0f; +COMPILER_STRIP_GATE(0x80D23E50, &lit_4279); #pragma pop -/* 80D23FA0-80D23FE8 000114 0048+00 0/1 0/0 0/0 .data l_func$3928 */ +/* 80D23E54-80D23E58 000088 0004+00 0/1 0/0 0/0 .rodata @4280 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_func[72] = { - 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_RODATA static f32 const lit_4280 = 3000.0f; +COMPILER_STRIP_GATE(0x80D23E54, &lit_4280); #pragma pop +/* 80D23188-80D23438 0016E8 02B0+00 1/1 0/0 0/0 .text createNormalBall__15daObjVolcBall_cFv */ +// matches with literals +#ifdef NONMATCHING +bool daObjVolcBall_c::createNormalBall() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + bool bvar = false; + + f32 fvar11 = getData()->mBallSetShortRange; + f32 fvar1 = getData()->mBallSetRandom; + + cXyz sp8C(1.0f, 0.0f, 0.0f); + cXyz sp98; + + mDoMtx_stack_c::YrotS(cM_rndFX(32767.0f)); + mDoMtx_stack_c::multVec(&sp8C, &sp8C); + sp98 = sp8C; + sp8C *= fvar11; + + cXyz spA4 = player_p->current.pos + sp8C; + sp98 *= cM_rndF(fvar1); + + spA4 += sp98; + spA4.y = player_p->current.pos.y + 3000.0f; + + if (!fopAcM_gc_c::gndCheck(&spA4)) { + return false; + } + + f32 scale = getData()->mNormalScale + cM_rndFX(getData()->mScaleRandValue); + f32 ball_speedH = getData()->mBallSpeedH; + + int ball_no = -1; + for (int i = 0; i < 8; i++) { + if (mBall[i].field_0x376 == 0) { + ball_no = i; + break; + } + } + + if (ball_no != -1) { + vball_s* ball = &mBall[ball_no]; + + ball->field_0x4 = spA4; + ball->field_0x10 = spA4; + ball->field_0x1c.set(scale, scale, scale); + ball->field_0x28.set(0.0f, 0.0f, 0.0f); + ball->field_0x3c.set(0.0f, 0.0f, 0.0f); + ball->field_0x34.y = cM_rndF(32767.0f); + ball->field_0x4c = ball->field_0x4.y; + ball->field_0x48 = ball_speedH; + ball->field_0x374 = ball->field_0x34.y; + ball->field_0x376 = 1; + + setFallEffect(ball_no); + mNormalBallCreateTimer = getData()->mNormalInterval + cM_rndFX(getData()->mRandInterval); + bvar = true; + } + + return bvar; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daObjVolcBall_c::createNormalBall() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/createNormalBall__15daObjVolcBall_cFv.s" +} +#pragma pop +#endif + +/* ############################################################################################## */ +/* 80D23E58-80D23E5C 00008C 0004+00 0/1 0/0 0/0 .rodata @4407 */ +#pragma push +#pragma force_active on +SECTION_RODATA static f32 const lit_4407 = 1.0f / 10.0f; +COMPILER_STRIP_GATE(0x80D23E58, &lit_4407); +#pragma pop + +/* 80D23E5C-80D23E64 000090 0004+04 0/1 0/0 0/0 .rodata @4408 */ +#pragma push +#pragma force_active on +SECTION_RODATA static f32 const lit_4408[1 + 1 /* padding */] = { + -1000000000.0f, + /* padding */ + 0.0f, +}; +COMPILER_STRIP_GATE(0x80D23E5C, &lit_4408); +#pragma pop + +/* 80D23E64-80D23E6C 000098 0008+00 0/1 0/0 0/0 .rodata @4409 */ +#pragma push +#pragma force_active on +SECTION_RODATA static u8 const lit_4409[8] = { + 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; +COMPILER_STRIP_GATE(0x80D23E64, &lit_4409); +#pragma pop + +/* 80D23E6C-80D23E74 0000A0 0008+00 0/1 0/0 0/0 .rodata @4410 */ +#pragma push +#pragma force_active on +SECTION_RODATA static u8 const lit_4410[8] = { + 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; +COMPILER_STRIP_GATE(0x80D23E6C, &lit_4410); +#pragma pop + +/* 80D23E74-80D23E7C 0000A8 0008+00 0/1 0/0 0/0 .rodata @4411 */ +#pragma push +#pragma force_active on +SECTION_RODATA static u8 const lit_4411[8] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; +COMPILER_STRIP_GATE(0x80D23E74, &lit_4411); +#pragma pop + +/* 80D23438-80D23868 001998 0430+00 1/1 0/0 0/0 .text executeBall__15daObjVolcBall_cFv */ +// small regalloc / literals +#ifdef NONMATCHING +int daObjVolcBall_c::executeBall() { + int ret = 0; + vball_s* ball = mBall; + + for (int i = 0; i < 9; i++) { + if (ball->field_0x376 != 0) { + ball->field_0x10 = ball->field_0x4; + ball->field_0x364.y = ball->field_0x4.y; + ball->field_0x3c.y += fopAcM_GetGravity(this); + + if (ball->field_0x3c.y < fopAcM_GetMaxFallSpeed(this)) { + ball->field_0x3c.y = fopAcM_GetMaxFallSpeed(this); + } + + ball->field_0x3c.x = ball->field_0x48 * cM_scos(ball->field_0x374); + ball->field_0x3c.z = ball->field_0x48 * cM_ssin(ball->field_0x374); + + ball->field_0x4 += ball->field_0x3c; + ball->field_0x34.x += 2000; + + if (i != 8) { + cLib_chaseF(&ball->field_0x28.x, ball->field_0x1c.x, 0.1f); + cLib_chaseF(&ball->field_0x28.x, ball->field_0x1c.x, 0.1f); + cLib_chaseF(&ball->field_0x28.x, ball->field_0x1c.x, 0.1f); + } + + mDoMtx_stack_c::transS(ball->field_0x4); + mDoMtx_stack_c::ZXYrotM(ball->field_0x34); + + ball->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + ball->mpModel->setBaseScale(ball->field_0x28); + + ball->mAcch.CrrPos(dComIfG_Bgsp()); + + if (ball->mAcch.ChkGroundHit() || ball->mAcch.GetGroundH() == -1000000000.0f) { + mDoAud_seStart(Z2SE_OBJ_BREAK_ROCK, &mBall[i].field_0x4, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + endFallEffect(i); + setEruptEffect(i); + ball->field_0x376 = 0; + } else { + if (i == 8) { + i_mDoAud_seStartLevel(Z2SE_OBJ_ROCK_FALL_DIRECT, &ball->field_0x4, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } else { + i_mDoAud_seStartLevel(Z2SE_OBJ_ROCK_FALL_DUMMY, &ball->field_0x4, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + + ball->field_0x378.x = cM_atan2s(ball->field_0x4.y - ball->field_0x10.y, + ball->field_0x4.absXZ(ball->field_0x10)); + ball->field_0x378.y = cM_atan2s(ball->field_0x4.z - ball->field_0x10.z, + ball->field_0x4.x - ball->field_0x10.x); + ball->field_0x378.z = 0; + } + + ret++; + } + + ball++; + } + + return ret; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daObjVolcBall_c::executeBall() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/executeBall__15daObjVolcBall_cFv.s" +} +#pragma pop +#endif + +/* 80D23868-80D23904 001DC8 009C+00 3/3 0/0 0/0 .text startQuake__15daObjVolcBall_cFv */ +// matches with literals +#ifdef NONMATCHING +void daObjVolcBall_c::startQuake() { + if (mIsBigVolc == 0) { + dComIfGp_getVibration().StartQuake(2, 31, cXyz(0.0f, 1.0f, 0.0f)); + } else { + dComIfGp_getVibration().StartQuake(4, 31, cXyz(0.0f, 1.0f, 0.0f)); + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daObjVolcBall_c::startQuake() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/startQuake__15daObjVolcBall_cFv.s" +} +#pragma pop +#endif + +/* ############################################################################################## */ +/* 80D23E7C-80D23E80 0000B0 0004+00 0/1 0/0 0/0 .rodata @4447 */ +#pragma push +#pragma force_active on +SECTION_RODATA static f32 const lit_4447 = 2000.0f; +COMPILER_STRIP_GATE(0x80D23E7C, &lit_4447); +#pragma pop + +/* 80D23904-80D23A0C 001E64 0108+00 1/1 0/0 0/0 .text draw__15daObjVolcBall_cFv */ +// matches with literals +#ifdef NONMATCHING +int daObjVolcBall_c::draw() { + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + + mTevStr.mLightPosWorld.x = mBall[8].field_0x4.x; + mTevStr.mLightPosWorld.y = mBall[8].field_0x4.y; + mTevStr.mLightPosWorld.z = mBall[8].field_0x4.z; + mTevStr.field_0x344 = mBall[8].field_0x50; + + vball_s* ball = mBall; + for (int i = 0; i < 9; i++) { + if (ball->field_0x376 != 0) { + g_env_light.setLightTevColorType_MAJI(ball->mpModel, &mTevStr); + mDoExt_modelUpdateDL(ball->mpModel); + } + + ball++; + } + + if (mBall[8].field_0x376 != 0) { + mBall[8].field_0x370 = dComIfGd_setShadow( + mBall[8].field_0x370, 0, mBall[8].mpModel, &mBall[8].field_0x364, 2000.0f, 0.0f, + mBall[8].field_0x364.y, mBall[8].mAcch.GetGroundH(), mBall[8].mAcch.m_gnd, &mTevStr, 0, + 1.0f, dDlst_shadowControl_c::getSimpleTex()); + } + + return 1; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daObjVolcBall_c::draw() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/draw__15daObjVolcBall_cFv.s" +} +#pragma pop +#endif + +/* 80D23A0C-80D23AA4 001F6C 0098+00 1/1 0/0 0/0 .text _delete__15daObjVolcBall_cFv */ +int daObjVolcBall_c::_delete() { + dComIfG_resDelete(&mPhase, l_arcName); + + if (mIsBigVolc == 0 || (mIsBigVolc == 1 && field_0x2926 != 0)) { + dComIfGp_getVibration().StopQuake(31); + } + + for (int i = 0; i < 9; i++) { + endFallEffect(i); + } + + return 1; +} + +/* 80D23AA4-80D23AC4 002004 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Draw__FP15daObjVolcBall_c */ +static int daObjVolcBall_Draw(daObjVolcBall_c* i_this) { + return i_this->draw(); +} + +/* 80D23AC4-80D23AE4 002024 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Execute__FP15daObjVolcBall_c + */ +static int daObjVolcBall_Execute(daObjVolcBall_c* i_this) { + return i_this->execute(); +} + +/* 80D23AE4-80D23B04 002044 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Delete__FP15daObjVolcBall_c */ +static int daObjVolcBall_Delete(daObjVolcBall_c* i_this) { + return i_this->_delete(); +} + +/* 80D23B04-80D23B24 002064 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Create__FP10fopAc_ac_c */ +static int daObjVolcBall_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); +} + /* 80D23FE8-80D24008 -00001 0020+00 1/0 0/0 0/0 .data l_daObjVolcBall_Method */ SECTION_DATA static void* l_daObjVolcBall_Method[8] = { (void*)daObjVolcBall_Create__FP10fopAc_ac_c, @@ -732,518 +1478,12 @@ SECTION_DATA extern void* __vt__17dEvLib_callback_c[6] = { (void*)eventEnd__17dEvLib_callback_cFv, }; -/* 80D21E28-80D21FA8 000388 0180+00 1/1 0/0 0/0 .text create__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/func_80D21E28.s" -} -#pragma pop - -/* 80D21FA8-80D220C4 000508 011C+00 2/2 0/0 0/0 .text __dt__Q215daObjVolcBall_c7vball_sFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjVolcBall_c::vball_s::~vball_s() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__Q215daObjVolcBall_c7vball_sFv.s" -} -#pragma pop - -/* 80D220C4-80D22148 000624 0084+00 2/2 0/0 0/0 .text __dt__19dPa_followEcallBackFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dPa_followEcallBack::~dPa_followEcallBack() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__19dPa_followEcallBackFv.s" -} -#pragma pop - -/* 80D22148-80D2214C 0006A8 0004+00 1/0 0/0 0/0 .text cleanup__18dPa_levelEcallBackFv */ -void dPa_levelEcallBack::cleanup() { - /* empty function */ -} - -/* 80D2214C-80D22230 0006AC 00E4+00 1/1 0/0 0/0 .text __ct__Q215daObjVolcBall_c7vball_sFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjVolcBall_c::vball_s::vball_s() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__ct__Q215daObjVolcBall_c7vball_sFv.s" -} -#pragma pop - -/* 80D22230-80D22258 000790 0028+00 1/1 0/0 0/0 .text __defctor__19dPa_followEcallBackFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dPa_followEcallBack::__defctor() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__defctor__19dPa_followEcallBackFv.s" -} -#pragma pop - -/* 80D22258-80D222A0 0007B8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__8cM3dGSphFv.s" -} -#pragma pop - -/* 80D222A0-80D222E8 000800 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80D222E8-80D22358 000848 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80D22358-80D223B4 0008B8 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80D223B4-80D22424 000914 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 80D22424-80D22484 000984 0060+00 1/1 0/0 0/0 .text execute__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/execute__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D22484-80D22570 0009E4 00EC+00 1/1 0/0 0/0 .text action__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::action() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/action__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D22570-80D2257C 000AD0 000C+00 1/1 0/0 0/0 .text initActionPlayerWait__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::initActionPlayerWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionPlayerWait__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D2257C-80D225A4 000ADC 0028+00 3/3 0/0 0/0 .text initActionWarning__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::initActionWarning() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionWarning__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D225A4-80D225B0 000B04 000C+00 1/1 0/0 0/0 .text initActionSwWait__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::initActionSwWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionSwWait__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D23E1C-80D23E20 000050 0004+00 0/1 0/0 0/0 .rodata @3969 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3969 = 2500.0f; -COMPILER_STRIP_GATE(0x80D23E1C, &lit_3969); -#pragma pop - -/* 80D23E20-80D23E24 000054 0004+00 0/1 0/0 0/0 .rodata @3970 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3970 = 300.0f; -COMPILER_STRIP_GATE(0x80D23E20, &lit_3970); -#pragma pop - -/* 80D225B0-80D2267C 000B10 00CC+00 1/0 0/0 0/0 .text actionPlayerWait__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::actionPlayerWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionPlayerWait__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D2267C-80D22724 000BDC 00A8+00 1/0 0/0 0/0 .text actionSwWait__15daObjVolcBall_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::actionSwWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionSwWait__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D22724-80D227E4 000C84 00C0+00 1/0 0/0 0/0 .text actionStop__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::actionStop() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionStop__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D23E24-80D23E28 000058 0004+00 2/7 0/0 0/0 .rodata @4031 */ -SECTION_RODATA static f32 const lit_4031 = 1.0f; -COMPILER_STRIP_GATE(0x80D23E24, &lit_4031); - -/* 80D23E28-80D23E2C 00005C 0004+00 0/3 0/0 0/0 .rodata @4032 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4032 = -1.0f; -COMPILER_STRIP_GATE(0x80D23E28, &lit_4032); -#pragma pop - -/* 80D227E4-80D22944 000D44 0160+00 1/0 0/0 0/0 .text actionWarning__15daObjVolcBall_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::actionWarning() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionWarning__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D23E2C-80D23E34 000060 0004+04 0/1 0/0 0/0 .rodata @4095 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4095[1 + 1 /* padding */] = { - 100.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80D23E2C, &lit_4095); -#pragma pop - -/* 80D23E34-80D23E3C 000068 0008+00 0/1 0/0 0/0 .rodata @4097 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4097[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D23E34, &lit_4097); -#pragma pop - -/* 80D22944-80D22C6C 000EA4 0328+00 1/0 0/0 0/0 .text actionEruption__15daObjVolcBall_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::actionEruption() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionEruption__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D22C6C-80D22CD4 0011CC 0068+00 1/1 0/0 0/0 .text initActionEnd__15daObjVolcBall_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::initActionEnd() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/initActionEnd__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D22CD4-80D22DDC 001234 0108+00 1/0 0/0 0/0 .text actionEnd__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::actionEnd() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/actionEnd__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D22DDC-80D22E24 00133C 0048+00 2/1 0/0 0/0 .text eventStart__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::eventStart() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/eventStart__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D23E3C-80D23E48 000070 000C+00 1/1 0/0 0/0 .rodata l_effect_id$4157 */ -SECTION_RODATA static u8 const l_effect_id[12] = { - 0x84, 0xA8, 0x84, 0xA9, 0x84, 0xAA, 0x84, 0xAB, 0x84, 0xAC, 0x84, 0xAD, -}; -COMPILER_STRIP_GATE(0x80D23E3C, &l_effect_id); - -/* 80D22E24-80D22ED4 001384 00B0+00 1/1 0/0 0/0 .text setEruptEffect__15daObjVolcBall_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::setEruptEffect(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setEruptEffect__15daObjVolcBall_cFi.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D23E48-80D23E50 00007C 0008+00 1/1 0/0 0/0 .rodata l_fall_effect_id$4173 */ -SECTION_RODATA static u8 const l_fall_effect_id[8] = { - 0x84, 0xAE, 0x84, 0xAF, 0x84, 0xB0, 0x84, 0xB1, -}; -COMPILER_STRIP_GATE(0x80D23E48, &l_fall_effect_id); - -/* 80D22ED4-80D22FCC 001434 00F8+00 2/2 0/0 0/0 .text setFallEffect__15daObjVolcBall_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::setFallEffect(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/setFallEffect__15daObjVolcBall_cFi.s" -} -#pragma pop - -/* 80D22FCC-80D23034 00152C 0068+00 2/2 0/0 0/0 .text endFallEffect__15daObjVolcBall_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::endFallEffect(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/endFallEffect__15daObjVolcBall_cFi.s" -} -#pragma pop - -/* 80D23034-80D23188 001594 0154+00 1/1 0/0 0/0 .text createSearchBall__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::createSearchBall() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/createSearchBall__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D23E50-80D23E54 000084 0004+00 0/1 0/0 0/0 .rodata @4279 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4279 = 32767.0f; -COMPILER_STRIP_GATE(0x80D23E50, &lit_4279); -#pragma pop - -/* 80D23E54-80D23E58 000088 0004+00 0/1 0/0 0/0 .rodata @4280 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4280 = 3000.0f; -COMPILER_STRIP_GATE(0x80D23E54, &lit_4280); -#pragma pop - -/* 80D23188-80D23438 0016E8 02B0+00 1/1 0/0 0/0 .text createNormalBall__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::createNormalBall() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/createNormalBall__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D23E58-80D23E5C 00008C 0004+00 0/1 0/0 0/0 .rodata @4407 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4407 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80D23E58, &lit_4407); -#pragma pop - -/* 80D23E5C-80D23E64 000090 0004+04 0/1 0/0 0/0 .rodata @4408 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4408[1 + 1 /* padding */] = { - -1000000000.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80D23E5C, &lit_4408); -#pragma pop - -/* 80D23E64-80D23E6C 000098 0008+00 0/1 0/0 0/0 .rodata @4409 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4409[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D23E64, &lit_4409); -#pragma pop - -/* 80D23E6C-80D23E74 0000A0 0008+00 0/1 0/0 0/0 .rodata @4410 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4410[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D23E6C, &lit_4410); -#pragma pop - -/* 80D23E74-80D23E7C 0000A8 0008+00 0/1 0/0 0/0 .rodata @4411 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4411[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D23E74, &lit_4411); -#pragma pop - -/* 80D23438-80D23868 001998 0430+00 1/1 0/0 0/0 .text executeBall__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::executeBall() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/executeBall__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D23868-80D23904 001DC8 009C+00 3/3 0/0 0/0 .text startQuake__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::startQuake() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/startQuake__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D23E7C-80D23E80 0000B0 0004+00 0/1 0/0 0/0 .rodata @4447 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4447 = 2000.0f; -COMPILER_STRIP_GATE(0x80D23E7C, &lit_4447); -#pragma pop - -/* 80D23904-80D23A0C 001E64 0108+00 1/1 0/0 0/0 .text draw__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/draw__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D23A0C-80D23AA4 001F6C 0098+00 1/1 0/0 0/0 .text _delete__15daObjVolcBall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjVolcBall_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/_delete__15daObjVolcBall_cFv.s" -} -#pragma pop - -/* 80D23AA4-80D23AC4 002004 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Draw__FP15daObjVolcBall_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjVolcBall_Draw(daObjVolcBall_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Draw__FP15daObjVolcBall_c.s" -} -#pragma pop - -/* 80D23AC4-80D23AE4 002024 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Execute__FP15daObjVolcBall_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjVolcBall_Execute(daObjVolcBall_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Execute__FP15daObjVolcBall_c.s" -} -#pragma pop - -/* 80D23AE4-80D23B04 002044 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Delete__FP15daObjVolcBall_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjVolcBall_Delete(daObjVolcBall_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Delete__FP15daObjVolcBall_c.s" -} -#pragma pop - -/* 80D23B04-80D23B24 002064 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjVolcBall_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/daObjVolcBall_Create__FP10fopAc_ac_c.s" -} -#pragma pop - /* 80D23B24-80D23C40 002084 011C+00 2/1 0/0 0/0 .text __dt__15daObjVolcBall_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daObjVolcBall_c::~daObjVolcBall_c() { +// asm daObjVolcBall_c::~daObjVolcBall_c() { +extern "C" asm void __dt__15daObjVolcBall_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__15daObjVolcBall_cFv.s" } @@ -1253,19 +1493,22 @@ asm daObjVolcBall_c::~daObjVolcBall_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__17dEvLib_callback_cFv.s" } #pragma pop /* 80D23C88-80D23C90 0021E8 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// int dEvLib_callback_c::eventRun() { +extern "C" int eventRun__17dEvLib_callback_cFv(void* this_) { return true; } /* 80D23C90-80D23C98 0021F0 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// int dEvLib_callback_c::eventEnd() { +extern "C" int eventEnd__17dEvLib_callback_cFv(void* this_) { return true; } @@ -1273,7 +1516,8 @@ bool dEvLib_callback_c::eventEnd() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__10cCcD_GSttsFv.s" } @@ -1283,7 +1527,8 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_levelEcallBack::~dPa_levelEcallBack() { +// asm dPa_levelEcallBack::~dPa_levelEcallBack() { +extern "C" asm void __dt__18dPa_levelEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__dt__18dPa_levelEcallBackFv.s" } @@ -1291,31 +1536,40 @@ asm dPa_levelEcallBack::~dPa_levelEcallBack() { /* 80D23D54-80D23D58 0022B4 0004+00 1/0 0/0 0/0 .text * execute__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_, + JPABaseEmitter* param_0) { /* empty function */ } /* 80D23D58-80D23D5C 0022B8 0004+00 1/0 0/0 0/0 .text * executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_, + JPABaseEmitter* param_0) { /* empty function */ } /* 80D23D5C-80D23D60 0022BC 0004+00 1/0 0/0 0/0 .text draw__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_, + JPABaseEmitter* param_0) { /* empty function */ } /* 80D23D60-80D23D64 0022C0 0004+00 1/0 0/0 0/0 .text * drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_, + JPABaseEmitter* param_0) { /* empty function */ } /* 80D23D64-80D23D6C 0022C4 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" int eventStart__17dEvLib_callback_cFv(void* this_) { return true; } @@ -1323,7 +1577,7 @@ bool dEvLib_callback_c::eventStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D23D6C(void* _this, u8* param_0) { +extern "C" asm u8 func_80D23D6C(u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/func_80D23D6C.s" } @@ -1333,7 +1587,7 @@ extern "C" asm void func_80D23D6C(void* _this, u8* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D23D88(void* _this, u32* param_0) { +extern "C" asm u32 func_80D23D88(u32* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/func_80D23D88.s" } diff --git a/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.cpp deleted file mode 100644 index 73003f1d86..0000000000 --- a/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: unknown_translation_unit_bss -// - -#include "rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 data_80D24100[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D24100-80D24104 000000 0004+00 0/0 1/1 0/0 .bss None */ -extern u8 data_80D24100[4]; -u8 data_80D24100[4]; diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index 60a9cd7d04..89e1d8999d 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -651,7 +651,7 @@ f32 daPy_py_c::getAttentionOffsetY() { /* 8015F424-8015F438 159D64 0014+00 0/0 17/17 33/33 .text checkNowWolfEyeUp__9daPy_py_cFv */ -s16 daPy_py_c::checkNowWolfEyeUp() { +int daPy_py_c::checkNowWolfEyeUp() { return daAlink_getAlinkActorClass()->checkWolfEyeUp(); } diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index 1f95b31806..6c204e5e5d 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -336,7 +336,7 @@ asm void dLib_getEventSwitchNo(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2, +asm BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2, cXyz const* param_3) { nofralloc #include "asm/d/d_lib/dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz.s" diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index cea976e007..8458937530 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -205,12 +205,8 @@ void dVibration_c::Kill() { } /* 8006FE5C-8006FE84 06A79C 0028+00 0/0 0/0 10/10 .text CheckQuake__12dVibration_cFv */ -int dVibration_c::CheckQuake() { - int ret = 0; - if (field_0x0.mQuake.field_0x4 != -1 || field_0x70 != -1) { - ret = 1; - } - return ret; +bool dVibration_c::CheckQuake() { + return field_0x0.mQuake.field_0x4 != -1 || field_0x70 != -1; } /* 8006FE84-8006FF04 06A7C4 0080+00 2/2 0/0 0/0 .text setDefault__12dVibration_cFv */ diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp index 361e6c7699..bd0fb53db6 100644 --- a/src/d/menu/d_menu_dmap.cpp +++ b/src/d/menu/d_menu_dmap.cpp @@ -24,8 +24,6 @@ struct mDoCPd_c { static u8 m_cpadInfo[256]; }; -struct fopAc_ac_c {}; - struct dTres_c { /* 8009C27C */ void getBossIconFloorNo(int*); };