From a930179f00ee5ba19038971399276b8dfb04e812 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Sat, 9 Mar 2024 08:46:03 +0200 Subject: [PATCH] d_a_obj_swBall* work (#2086) * d_a_obj_swBall* work * ASSERT -> JUT_ASSERT --- .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../_delete__14daObjSwBallA_cFv.s | 34 - .../daObjSwBallA_Create__FP10fopAc_ac_c.s | 9 - .../daObjSwBallA_Delete__FP14daObjSwBallA_c.s | 9 - .../daObjSwBallA_Draw__FP14daObjSwBallA_c.s | 9 - ...daObjSwBallA_Execute__FP14daObjSwBallA_c.s | 9 - .../initBaseMtx__14daObjSwBallA_cFv.s | 9 - .../d_a_obj_swBallA/s_ball_sub__FPvPv.s | 33 - .../search_ball__14daObjSwBallA_cFv.s | 87 -- .../setBaseMtx__14daObjSwBallA_cFv.s | 26 - .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../Create__14daObjSwBallB_cFv.s | 101 -- .../_delete__14daObjSwBallB_cFv.s | 14 - .../daObjSwBallB_Create__FP10fopAc_ac_c.s | 9 - .../daObjSwBallB_Delete__FP14daObjSwBallB_c.s | 9 - .../daObjSwBallB_Draw__FP14daObjSwBallB_c.s | 9 - ...daObjSwBallB_Execute__FP14daObjSwBallB_c.s | 9 - .../initBaseMtx__14daObjSwBallB_cFv.s | 9 - .../d_a_obj_swBallB/s_ball_sub__FPvPv.s | 41 - .../search_ball__14daObjSwBallB_cFv.s | 123 -- .../setBaseMtx__14daObjSwBallB_cFv.s | 26 - .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../CreateHeap__14daObjSwBallC_cFv.s | 81 -- .../Create__14daObjSwBallC_cFv.s | 107 -- .../d_a_obj_swBallC/__dt__12J3DFrameCtrlFv.s | 20 - .../_delete__14daObjSwBallC_cFv.s | 14 - .../actionEvent__14daObjSwBallC_cFv.s | 47 - .../actionOrderEvent__14daObjSwBallC_cFv.s | 45 - .../actionWait__14daObjSwBallC_cFv.s | 41 - .../calcLightBallScale__14daObjSwBallC_cFv.s | 57 - .../daObjSwBallC_Create__FP14daObjSwBallC_c.s | 9 - .../daObjSwBallC_Delete__FP14daObjSwBallC_c.s | 9 - .../daObjSwBallC_Draw__FP14daObjSwBallC_c.s | 9 - ...daObjSwBallC_Execute__FP14daObjSwBallC_c.s | 9 - .../deleteLightBallA__14daObjSwBallC_cFv.s | 16 - .../deleteLightBallB__14daObjSwBallC_cFv.s | 16 - .../deleteLightBall__14daObjSwBallC_cFv.s | 14 - .../demoProc__14daObjSwBallC_cFv.s | 292 ----- .../draw__14daObjSwBallC_cFv.s | 100 -- .../event_proc_call__14daObjSwBallC_cFv.s | 49 - .../execute__14daObjSwBallC_cFv.s | 10 - .../d_a_obj_swBallC/func_80CF606C.s | 51 - .../d_a_obj_swBallC/func_80CF6CB0.s | 9 - .../initBaseMtx__14daObjSwBallC_cFv.s | 9 - .../d_a_obj_swBallC/s_ballA_sub__FPvPv.s | 25 - .../d_a_obj_swBallC/s_ballB_sub__FPvPv.s | 25 - .../d_a_obj_swBallC/s_swb_sub__FPvPv.s | 30 - .../setBaseMtx__14daObjSwBallC_cFv.s | 26 - .../setLightOffSwB__14daObjSwBallC_cFv.s | 32 - .../setLightOnSwB__14daObjSwBallC_cFv.s | 32 - include/d/a/d_a_player.h | 1 + include/m_Do/m_Do_ext.h | 1 + .../rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h | 3 + .../d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h | 44 +- .../d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h | 50 +- .../d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h | 44 +- .../a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp | 507 +++++--- .../a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp | 596 ++++++---- rel/d/a/obj/d_a_obj_swBallC/Makefile | 2 - .../a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp | 1039 ++++++----------- .../unknown_translation_unit_bss.cpp | 26 - 61 files changed, 1196 insertions(+), 2903 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/_delete__14daObjSwBallA_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Delete__FP14daObjSwBallA_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Draw__FP14daObjSwBallA_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Execute__FP14daObjSwBallA_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/initBaseMtx__14daObjSwBallA_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/s_ball_sub__FPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/search_ball__14daObjSwBallA_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/setBaseMtx__14daObjSwBallA_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/Create__14daObjSwBallB_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/_delete__14daObjSwBallB_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Delete__FP14daObjSwBallB_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Draw__FP14daObjSwBallB_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Execute__FP14daObjSwBallB_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/initBaseMtx__14daObjSwBallB_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/s_ball_sub__FPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/search_ball__14daObjSwBallB_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/setBaseMtx__14daObjSwBallB_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/CreateHeap__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/Create__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/_delete__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionEvent__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionOrderEvent__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionWait__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/calcLightBallScale__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Create__FP14daObjSwBallC_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Delete__FP14daObjSwBallC_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Draw__FP14daObjSwBallC_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Execute__FP14daObjSwBallC_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBallA__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBallB__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBall__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/demoProc__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/draw__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/event_proc_call__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/execute__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF606C.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF6CB0.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/initBaseMtx__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_ballA_sub__FPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_ballB_sub__FPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_swb_sub__FPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setBaseMtx__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setLightOffSwB__14daObjSwBallC_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setLightOnSwB__14daObjSwBallC_cFv.s delete mode 100644 rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.cpp diff --git a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index c26c098afa..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF3374: -/* 80CF3374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF3378 7C 08 02 A6 */ mflr r0 -/* 80CF337C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF3380 48 00 04 7D */ bl CreateHeap__14daObjSwBallA_cFv -/* 80CF3384 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF3388 7C 08 03 A6 */ mtlr r0 -/* 80CF338C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF3390 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/_delete__14daObjSwBallA_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/_delete__14daObjSwBallA_cFv.s deleted file mode 100644 index 2acca928f9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/_delete__14daObjSwBallA_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80CF41F4: -/* 80CF41F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF41F8 7C 08 02 A6 */ mflr r0 -/* 80CF41FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF4200 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF4204 7C 7F 1B 78 */ mr r31, r3 -/* 80CF4208 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF420C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF4210 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CF4214 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80CF4218 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF421C 7C 05 07 74 */ extsb r5, r0 -/* 80CF4220 4B 34 11 41 */ bl isSwitch__10dSv_info_cCFii -/* 80CF4224 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF4228 40 82 00 20 */ bne lbl_80CF4248 -/* 80CF422C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF4230 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF4234 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CF4238 54 04 86 3E */ rlwinm r4, r0, 0x10, 0x18, 0x1f -/* 80CF423C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF4240 7C 05 07 74 */ extsb r5, r0 -/* 80CF4244 4B 34 10 6D */ bl offSwitch__10dSv_info_cFii -lbl_80CF4248: -/* 80CF4248 38 7F 05 7C */ addi r3, r31, 0x57c -/* 80CF424C 3C 80 80 CF */ lis r4, l_arcName@ha /* 0x80CF4438@ha */ -/* 80CF4250 38 84 44 38 */ addi r4, r4, l_arcName@l /* 0x80CF4438@l */ -/* 80CF4254 80 84 00 00 */ lwz r4, 0(r4) -/* 80CF4258 4B 33 8D B1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CF425C 38 60 00 01 */ li r3, 1 -/* 80CF4260 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF4264 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF4268 7C 08 03 A6 */ mtlr r0 -/* 80CF426C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF4270 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Create__FP10fopAc_ac_c.s deleted file mode 100644 index ba1e38f9c7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF42D4: -/* 80CF42D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF42D8 7C 08 02 A6 */ mflr r0 -/* 80CF42DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF42E0 4B FF F6 91 */ bl create__14daObjSwBallA_cFv -/* 80CF42E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF42E8 7C 08 03 A6 */ mtlr r0 -/* 80CF42EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF42F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Delete__FP14daObjSwBallA_c.s b/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Delete__FP14daObjSwBallA_c.s deleted file mode 100644 index 2cdb3ce1aa..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Delete__FP14daObjSwBallA_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF42B4: -/* 80CF42B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF42B8 7C 08 02 A6 */ mflr r0 -/* 80CF42BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF42C0 4B FF FF 35 */ bl _delete__14daObjSwBallA_cFv -/* 80CF42C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF42C8 7C 08 03 A6 */ mtlr r0 -/* 80CF42CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF42D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Draw__FP14daObjSwBallA_c.s b/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Draw__FP14daObjSwBallA_c.s deleted file mode 100644 index be2c3d2cb6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Draw__FP14daObjSwBallA_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF4274: -/* 80CF4274 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF4278 7C 08 02 A6 */ mflr r0 -/* 80CF427C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF4280 4B FF FD ED */ bl draw__14daObjSwBallA_cFv -/* 80CF4284 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF4288 7C 08 03 A6 */ mtlr r0 -/* 80CF428C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF4290 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Execute__FP14daObjSwBallA_c.s b/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Execute__FP14daObjSwBallA_c.s deleted file mode 100644 index bdfa487729..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Execute__FP14daObjSwBallA_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF4294: -/* 80CF4294 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF4298 7C 08 02 A6 */ mflr r0 -/* 80CF429C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF42A0 4B FF F7 F1 */ bl execute__14daObjSwBallA_cFv -/* 80CF42A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF42A8 7C 08 03 A6 */ mtlr r0 -/* 80CF42AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF42B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/initBaseMtx__14daObjSwBallA_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/initBaseMtx__14daObjSwBallA_cFv.s deleted file mode 100644 index 1406e29b60..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/initBaseMtx__14daObjSwBallA_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF3610: -/* 80CF3610 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF3614 7C 08 02 A6 */ mflr r0 -/* 80CF3618 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF361C 48 00 00 15 */ bl setBaseMtx__14daObjSwBallA_cFv -/* 80CF3620 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF3624 7C 08 03 A6 */ mtlr r0 -/* 80CF3628 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF362C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/s_ball_sub__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/s_ball_sub__FPvPv.s deleted file mode 100644 index 8bae302ef2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/s_ball_sub__FPvPv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80CF32F8: -/* 80CF32F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF32FC 7C 08 02 A6 */ mflr r0 -/* 80CF3300 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF3304 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF3308 7C 7F 1B 78 */ mr r31, r3 -/* 80CF330C 4B 32 59 D5 */ bl fopAc_IsActor__FPv -/* 80CF3310 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF3314 41 82 00 48 */ beq lbl_80CF335C -/* 80CF3318 A8 1F 00 08 */ lha r0, 8(r31) -/* 80CF331C 2C 00 02 FC */ cmpwi r0, 0x2fc -/* 80CF3320 40 82 00 3C */ bne lbl_80CF335C -/* 80CF3324 88 1F 0C F0 */ lbz r0, 0xcf0(r31) -/* 80CF3328 2C 00 00 0B */ cmpwi r0, 0xb -/* 80CF332C 40 82 00 30 */ bne lbl_80CF335C -/* 80CF3330 3C 60 80 CF */ lis r3, l_target_info_count@ha /* 0x80CF4528@ha */ -/* 80CF3334 38 83 45 28 */ addi r4, r3, l_target_info_count@l /* 0x80CF4528@l */ -/* 80CF3338 80 A4 00 00 */ lwz r5, 0(r4) -/* 80CF333C 2C 05 00 08 */ cmpwi r5, 8 -/* 80CF3340 40 80 00 1C */ bge lbl_80CF335C -/* 80CF3344 54 A0 10 3A */ slwi r0, r5, 2 -/* 80CF3348 3C 60 80 CF */ lis r3, l_target_info@ha /* 0x80CF4508@ha */ -/* 80CF334C 38 63 45 08 */ addi r3, r3, l_target_info@l /* 0x80CF4508@l */ -/* 80CF3350 7F E3 01 2E */ stwx r31, r3, r0 -/* 80CF3354 38 05 00 01 */ addi r0, r5, 1 -/* 80CF3358 90 04 00 00 */ stw r0, 0(r4) -lbl_80CF335C: -/* 80CF335C 38 60 00 00 */ li r3, 0 -/* 80CF3360 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF3364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF3368 7C 08 03 A6 */ mtlr r0 -/* 80CF336C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF3370 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/search_ball__14daObjSwBallA_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/search_ball__14daObjSwBallA_cFv.s deleted file mode 100644 index cbd62aa8e8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/search_ball__14daObjSwBallA_cFv.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_80CF34E4: -/* 80CF34E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF34E8 7C 08 02 A6 */ mflr r0 -/* 80CF34EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF34F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF34F4 7C 7F 1B 78 */ mr r31, r3 -/* 80CF34F8 38 A0 00 00 */ li r5, 0 -/* 80CF34FC 3C 60 80 CF */ lis r3, l_target_info_count@ha /* 0x80CF4528@ha */ -/* 80CF3500 90 A3 45 28 */ stw r5, l_target_info_count@l(r3) /* 0x80CF4528@l */ -/* 80CF3504 7C A3 2B 78 */ mr r3, r5 -/* 80CF3508 3C 80 80 CF */ lis r4, l_target_info@ha /* 0x80CF4508@ha */ -/* 80CF350C 38 84 45 08 */ addi r4, r4, l_target_info@l /* 0x80CF4508@l */ -/* 80CF3510 38 00 00 08 */ li r0, 8 -/* 80CF3514 7C 09 03 A6 */ mtctr r0 -lbl_80CF3518: -/* 80CF3518 7C A4 19 2E */ stwx r5, r4, r3 -/* 80CF351C 38 63 00 04 */ addi r3, r3, 4 -/* 80CF3520 42 00 FF F8 */ bdnz lbl_80CF3518 -/* 80CF3524 3C 60 80 CF */ lis r3, s_ball_sub__FPvPv@ha /* 0x80CF32F8@ha */ -/* 80CF3528 38 63 32 F8 */ addi r3, r3, s_ball_sub__FPvPv@l /* 0x80CF32F8@l */ -/* 80CF352C 7F E4 FB 78 */ mr r4, r31 -/* 80CF3530 4B 32 DE 09 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80CF3534 39 40 00 00 */ li r10, 0 -/* 80CF3538 38 60 00 00 */ li r3, 0 -/* 80CF353C 3C 80 80 CF */ lis r4, l_target_info@ha /* 0x80CF4508@ha */ -/* 80CF3540 38 E4 45 08 */ addi r7, r4, l_target_info@l /* 0x80CF4508@l */ -/* 80CF3544 3C 80 80 CF */ lis r4, l_target_info_count@ha /* 0x80CF4528@ha */ -/* 80CF3548 38 A4 45 28 */ addi r5, r4, l_target_info_count@l /* 0x80CF4528@l */ -/* 80CF354C 48 00 00 A4 */ b lbl_80CF35F0 -lbl_80CF3550: -/* 80CF3550 7C 87 18 2E */ lwzx r4, r7, r3 -/* 80CF3554 28 04 00 00 */ cmplwi r4, 0 -/* 80CF3558 41 82 00 90 */ beq lbl_80CF35E8 -/* 80CF355C 41 82 00 0C */ beq lbl_80CF3568 -/* 80CF3560 81 04 00 04 */ lwz r8, 4(r4) -/* 80CF3564 48 00 00 08 */ b lbl_80CF356C -lbl_80CF3568: -/* 80CF3568 39 00 FF FF */ li r8, -1 -lbl_80CF356C: -/* 80CF356C 3C 08 00 01 */ addis r0, r8, 1 -/* 80CF3570 28 00 FF FF */ cmplwi r0, 0xffff -/* 80CF3574 41 82 00 74 */ beq lbl_80CF35E8 -/* 80CF3578 38 C0 FF FF */ li r6, -1 -/* 80CF357C 39 20 00 00 */ li r9, 0 -/* 80CF3580 38 80 00 00 */ li r4, 0 -/* 80CF3584 38 00 00 08 */ li r0, 8 -/* 80CF3588 7C 09 03 A6 */ mtctr r0 -lbl_80CF358C: -/* 80CF358C 38 04 05 8C */ addi r0, r4, 0x58c -/* 80CF3590 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 80CF3594 7C 08 00 40 */ cmplw r8, r0 -/* 80CF3598 40 82 00 0C */ bne lbl_80CF35A4 -/* 80CF359C 7D 26 4B 78 */ mr r6, r9 -/* 80CF35A0 48 00 00 10 */ b lbl_80CF35B0 -lbl_80CF35A4: -/* 80CF35A4 39 29 00 01 */ addi r9, r9, 1 -/* 80CF35A8 38 84 00 04 */ addi r4, r4, 4 -/* 80CF35AC 42 00 FF E0 */ bdnz lbl_80CF358C -lbl_80CF35B0: -/* 80CF35B0 2C 06 00 00 */ cmpwi r6, 0 -/* 80CF35B4 40 80 00 34 */ bge lbl_80CF35E8 -/* 80CF35B8 38 80 00 00 */ li r4, 0 -/* 80CF35BC 38 00 00 08 */ li r0, 8 -/* 80CF35C0 7C 09 03 A6 */ mtctr r0 -lbl_80CF35C4: -/* 80CF35C4 39 24 05 8C */ addi r9, r4, 0x58c -/* 80CF35C8 7C DF 48 2E */ lwzx r6, r31, r9 -/* 80CF35CC 3C 06 00 01 */ addis r0, r6, 1 -/* 80CF35D0 28 00 FF FF */ cmplwi r0, 0xffff -/* 80CF35D4 40 82 00 0C */ bne lbl_80CF35E0 -/* 80CF35D8 7D 1F 49 2E */ stwx r8, r31, r9 -/* 80CF35DC 48 00 00 0C */ b lbl_80CF35E8 -lbl_80CF35E0: -/* 80CF35E0 38 84 00 04 */ addi r4, r4, 4 -/* 80CF35E4 42 00 FF E0 */ bdnz lbl_80CF35C4 -lbl_80CF35E8: -/* 80CF35E8 39 4A 00 01 */ addi r10, r10, 1 -/* 80CF35EC 38 63 00 04 */ addi r3, r3, 4 -lbl_80CF35F0: -/* 80CF35F0 80 05 00 00 */ lwz r0, 0(r5) -/* 80CF35F4 7C 0A 00 00 */ cmpw r10, r0 -/* 80CF35F8 41 80 FF 58 */ blt lbl_80CF3550 -/* 80CF35FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF3600 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF3604 7C 08 03 A6 */ mtlr r0 -/* 80CF3608 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF360C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/setBaseMtx__14daObjSwBallA_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/setBaseMtx__14daObjSwBallA_cFv.s deleted file mode 100644 index c6026a562e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/setBaseMtx__14daObjSwBallA_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CF3630: -/* 80CF3630 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF3634 7C 08 02 A6 */ mflr r0 -/* 80CF3638 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF363C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF3640 7C 7F 1B 78 */ mr r31, r3 -/* 80CF3644 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF3648 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF364C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CF3650 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CF3654 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CF3658 4B 65 32 91 */ bl PSMTXTrans -/* 80CF365C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF3660 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF3664 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80CF3668 4B 31 8D CD */ bl mDoMtx_YrotM__FPA4_fs -/* 80CF366C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF3670 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF3674 80 9F 05 84 */ lwz r4, 0x584(r31) -/* 80CF3678 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CF367C 4B 65 2E 35 */ bl PSMTXCopy -/* 80CF3680 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF3684 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF3688 7C 08 03 A6 */ mtlr r0 -/* 80CF368C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF3690 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index ab33dfeacd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF464C: -/* 80CF464C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF4650 7C 08 02 A6 */ mflr r0 -/* 80CF4654 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF4658 48 00 05 1D */ bl CreateHeap__14daObjSwBallB_cFv -/* 80CF465C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF4660 7C 08 03 A6 */ mtlr r0 -/* 80CF4664 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF4668 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/Create__14daObjSwBallB_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/Create__14daObjSwBallB_cFv.s deleted file mode 100644 index 0010d476e9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/Create__14daObjSwBallB_cFv.s +++ /dev/null @@ -1,101 +0,0 @@ -lbl_80CF49F0: -/* 80CF49F0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CF49F4 7C 08 02 A6 */ mflr r0 -/* 80CF49F8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CF49FC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CF4A00 7C 7F 1B 78 */ mr r31, r3 -/* 80CF4A04 4B FF FF 69 */ bl initBaseMtx__14daObjSwBallB_cFv -/* 80CF4A08 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 80CF4A0C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CF4A10 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80CF4A14 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 80CF4A18 80 63 00 04 */ lwz r3, 4(r3) -/* 80CF4A1C 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80CF4A20 80 83 00 00 */ lwz r4, 0(r3) -/* 80CF4A24 7F E3 FB 78 */ mr r3, r31 -/* 80CF4A28 C0 24 00 3C */ lfs f1, 0x3c(r4) -/* 80CF4A2C C0 44 00 40 */ lfs f2, 0x40(r4) -/* 80CF4A30 C0 64 00 44 */ lfs f3, 0x44(r4) -/* 80CF4A34 C0 84 00 48 */ lfs f4, 0x48(r4) -/* 80CF4A38 C0 A4 00 4C */ lfs f5, 0x4c(r4) -/* 80CF4A3C C0 C4 00 50 */ lfs f6, 0x50(r4) -/* 80CF4A40 4B 32 5B 09 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80CF4A44 38 60 00 00 */ li r3, 0 -/* 80CF4A48 38 80 FF FF */ li r4, -1 -/* 80CF4A4C 38 00 00 02 */ li r0, 2 -/* 80CF4A50 7C 09 03 A6 */ mtctr r0 -lbl_80CF4A54: -/* 80CF4A54 38 03 05 8C */ addi r0, r3, 0x58c -/* 80CF4A58 7C 9F 01 2E */ stwx r4, r31, r0 -/* 80CF4A5C 38 63 00 04 */ addi r3, r3, 4 -/* 80CF4A60 42 00 FF F4 */ bdnz lbl_80CF4A54 -/* 80CF4A64 38 00 FF FF */ li r0, -1 -/* 80CF4A68 90 1F 05 9C */ stw r0, 0x59c(r31) -/* 80CF4A6C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80CF4A70 7C 00 07 75 */ extsb. r0, r0 -/* 80CF4A74 40 82 00 9C */ bne lbl_80CF4B10 -/* 80CF4A78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF4A7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF4A80 38 80 00 3F */ li r4, 0x3f -/* 80CF4A84 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF4A88 7C 05 07 74 */ extsb r5, r0 -/* 80CF4A8C 4B 34 08 D5 */ bl isSwitch__10dSv_info_cCFii -/* 80CF4A90 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF4A94 41 82 00 7C */ beq lbl_80CF4B10 -/* 80CF4A98 80 9F 05 88 */ lwz r4, 0x588(r31) -/* 80CF4A9C A8 04 00 08 */ lha r0, 8(r4) -/* 80CF4AA0 3C 60 80 CF */ lis r3, lit_3935@ha /* 0x80CF5A00@ha */ -/* 80CF4AA4 C8 23 5A 00 */ lfd f1, lit_3935@l(r3) /* 0x80CF5A00@l */ -/* 80CF4AA8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80CF4AAC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CF4AB0 3C 00 43 30 */ lis r0, 0x4330 -/* 80CF4AB4 90 01 00 08 */ stw r0, 8(r1) -/* 80CF4AB8 C8 01 00 08 */ lfd f0, 8(r1) -/* 80CF4ABC EC 00 08 28 */ fsubs f0, f0, f1 -/* 80CF4AC0 D0 04 00 10 */ stfs f0, 0x10(r4) -/* 80CF4AC4 80 9F 00 B0 */ lwz r4, 0xb0(r31) -/* 80CF4AC8 54 80 27 3E */ srwi r0, r4, 0x1c -/* 80CF4ACC 28 00 00 01 */ cmplwi r0, 1 -/* 80CF4AD0 40 82 00 1C */ bne lbl_80CF4AEC -/* 80CF4AD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF4AD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF4ADC 54 84 C6 3E */ rlwinm r4, r4, 0x18, 0x18, 0x1f -/* 80CF4AE0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF4AE4 7C 05 07 74 */ extsb r5, r0 -/* 80CF4AE8 4B 34 07 19 */ bl onSwitch__10dSv_info_cFii -lbl_80CF4AEC: -/* 80CF4AEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF4AF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF4AF4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CF4AF8 54 04 86 3E */ rlwinm r4, r0, 0x10, 0x18, 0x1f -/* 80CF4AFC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF4B00 7C 05 07 74 */ extsb r5, r0 -/* 80CF4B04 4B 34 06 FD */ bl onSwitch__10dSv_info_cFii -/* 80CF4B08 38 00 00 05 */ li r0, 5 -/* 80CF4B0C 98 1F 05 96 */ stb r0, 0x596(r31) -lbl_80CF4B10: -/* 80CF4B10 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 80CF4B14 80 63 00 04 */ lwz r3, 4(r3) -/* 80CF4B18 80 63 00 60 */ lwz r3, 0x60(r3) -/* 80CF4B1C 80 63 00 00 */ lwz r3, 0(r3) -/* 80CF4B20 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 80CF4B24 38 80 00 01 */ li r4, 1 -/* 80CF4B28 81 83 00 00 */ lwz r12, 0(r3) -/* 80CF4B2C 81 8C 00 74 */ lwz r12, 0x74(r12) -/* 80CF4B30 7D 89 03 A6 */ mtctr r12 -/* 80CF4B34 4E 80 04 21 */ bctrl -/* 80CF4B38 3C 80 80 CF */ lis r4, l_color@ha /* 0x80CF59D0@ha */ -/* 80CF4B3C 8C 04 59 D0 */ lbzu r0, l_color@l(r4) /* 0x80CF59D0@l */ -/* 80CF4B40 98 03 00 00 */ stb r0, 0(r3) -/* 80CF4B44 88 04 00 01 */ lbz r0, 1(r4) -/* 80CF4B48 98 03 00 01 */ stb r0, 1(r3) -/* 80CF4B4C 88 04 00 02 */ lbz r0, 2(r4) -/* 80CF4B50 98 03 00 02 */ stb r0, 2(r3) -/* 80CF4B54 7F E3 FB 78 */ mr r3, r31 -/* 80CF4B58 48 00 02 B1 */ bl execute__14daObjSwBallB_cFv -/* 80CF4B5C 38 60 00 01 */ li r3, 1 -/* 80CF4B60 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CF4B64 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CF4B68 7C 08 03 A6 */ mtlr r0 -/* 80CF4B6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CF4B70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/_delete__14daObjSwBallB_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/_delete__14daObjSwBallB_cFv.s deleted file mode 100644 index 638e20c719..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/_delete__14daObjSwBallB_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80CF582C: -/* 80CF582C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF5830 7C 08 02 A6 */ mflr r0 -/* 80CF5834 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF5838 3C 80 80 CF */ lis r4, l_arcName@ha /* 0x80CF5A40@ha */ -/* 80CF583C 38 84 5A 40 */ addi r4, r4, l_arcName@l /* 0x80CF5A40@l */ -/* 80CF5840 80 84 00 00 */ lwz r4, 0(r4) -/* 80CF5844 38 63 05 7C */ addi r3, r3, 0x57c -/* 80CF5848 4B 33 77 C1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CF584C 38 60 00 01 */ li r3, 1 -/* 80CF5850 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF5854 7C 08 03 A6 */ mtlr r0 -/* 80CF5858 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF585C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 406d624633..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF58C0: -/* 80CF58C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF58C4 7C 08 02 A6 */ mflr r0 -/* 80CF58C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF58CC 4B FF F4 1D */ bl create__14daObjSwBallB_cFv -/* 80CF58D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF58D4 7C 08 03 A6 */ mtlr r0 -/* 80CF58D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF58DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Delete__FP14daObjSwBallB_c.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Delete__FP14daObjSwBallB_c.s deleted file mode 100644 index f58274b2bf..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Delete__FP14daObjSwBallB_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF58A0: -/* 80CF58A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF58A4 7C 08 02 A6 */ mflr r0 -/* 80CF58A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF58AC 4B FF FF 81 */ bl _delete__14daObjSwBallB_cFv -/* 80CF58B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF58B4 7C 08 03 A6 */ mtlr r0 -/* 80CF58B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF58BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Draw__FP14daObjSwBallB_c.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Draw__FP14daObjSwBallB_c.s deleted file mode 100644 index 939bf28c3d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Draw__FP14daObjSwBallB_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF5860: -/* 80CF5860 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF5864 7C 08 02 A6 */ mflr r0 -/* 80CF5868 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF586C 4B FF FE 39 */ bl draw__14daObjSwBallB_cFv -/* 80CF5870 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF5874 7C 08 03 A6 */ mtlr r0 -/* 80CF5878 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF587C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Execute__FP14daObjSwBallB_c.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Execute__FP14daObjSwBallB_c.s deleted file mode 100644 index 545861fe31..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Execute__FP14daObjSwBallB_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF5880: -/* 80CF5880 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF5884 7C 08 02 A6 */ mflr r0 -/* 80CF5888 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF588C 4B FF F5 7D */ bl execute__14daObjSwBallB_cFv -/* 80CF5890 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF5894 7C 08 03 A6 */ mtlr r0 -/* 80CF5898 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF589C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/initBaseMtx__14daObjSwBallB_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/initBaseMtx__14daObjSwBallB_cFv.s deleted file mode 100644 index 69a88c96d8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/initBaseMtx__14daObjSwBallB_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF496C: -/* 80CF496C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF4970 7C 08 02 A6 */ mflr r0 -/* 80CF4974 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF4978 48 00 00 15 */ bl setBaseMtx__14daObjSwBallB_cFv -/* 80CF497C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF4980 7C 08 03 A6 */ mtlr r0 -/* 80CF4984 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF4988 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/s_ball_sub__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/s_ball_sub__FPvPv.s deleted file mode 100644 index 0203369940..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/s_ball_sub__FPvPv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80CF45B8: -/* 80CF45B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF45BC 7C 08 02 A6 */ mflr r0 -/* 80CF45C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF45C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF45C8 7C 7F 1B 78 */ mr r31, r3 -/* 80CF45CC 4B 32 47 15 */ bl fopAc_IsActor__FPv -/* 80CF45D0 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF45D4 41 82 00 60 */ beq lbl_80CF4634 -/* 80CF45D8 A8 1F 00 08 */ lha r0, 8(r31) -/* 80CF45DC 2C 00 02 FC */ cmpwi r0, 0x2fc -/* 80CF45E0 40 82 00 54 */ bne lbl_80CF4634 -/* 80CF45E4 38 00 00 00 */ li r0, 0 -/* 80CF45E8 88 7F 0C F0 */ lbz r3, 0xcf0(r31) -/* 80CF45EC 2C 03 00 08 */ cmpwi r3, 8 -/* 80CF45F0 41 82 00 0C */ beq lbl_80CF45FC -/* 80CF45F4 2C 03 00 09 */ cmpwi r3, 9 -/* 80CF45F8 40 82 00 08 */ bne lbl_80CF4600 -lbl_80CF45FC: -/* 80CF45FC 38 00 00 01 */ li r0, 1 -lbl_80CF4600: -/* 80CF4600 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80CF4604 41 82 00 30 */ beq lbl_80CF4634 -/* 80CF4608 3C 60 80 CF */ lis r3, l_target_info_count@ha /* 0x80CF5B18@ha */ -/* 80CF460C 38 83 5B 18 */ addi r4, r3, l_target_info_count@l /* 0x80CF5B18@l */ -/* 80CF4610 80 A4 00 00 */ lwz r5, 0(r4) -/* 80CF4614 2C 05 00 02 */ cmpwi r5, 2 -/* 80CF4618 40 80 00 1C */ bge lbl_80CF4634 -/* 80CF461C 54 A0 10 3A */ slwi r0, r5, 2 -/* 80CF4620 3C 60 80 CF */ lis r3, l_target_info@ha /* 0x80CF5B10@ha */ -/* 80CF4624 38 63 5B 10 */ addi r3, r3, l_target_info@l /* 0x80CF5B10@l */ -/* 80CF4628 7F E3 01 2E */ stwx r31, r3, r0 -/* 80CF462C 38 05 00 01 */ addi r0, r5, 1 -/* 80CF4630 90 04 00 00 */ stw r0, 0(r4) -lbl_80CF4634: -/* 80CF4634 38 60 00 00 */ li r3, 0 -/* 80CF4638 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF463C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF4640 7C 08 03 A6 */ mtlr r0 -/* 80CF4644 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF4648 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/search_ball__14daObjSwBallB_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/search_ball__14daObjSwBallB_cFv.s deleted file mode 100644 index 40cf0f78c6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/search_ball__14daObjSwBallB_cFv.s +++ /dev/null @@ -1,123 +0,0 @@ -lbl_80CF47BC: -/* 80CF47BC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80CF47C0 7C 08 02 A6 */ mflr r0 -/* 80CF47C4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80CF47C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80CF47CC 4B 66 DA 05 */ bl _savegpr_26 -/* 80CF47D0 7C 7F 1B 78 */ mr r31, r3 -/* 80CF47D4 38 A0 00 00 */ li r5, 0 -/* 80CF47D8 3C 60 80 CF */ lis r3, l_target_info_count@ha /* 0x80CF5B18@ha */ -/* 80CF47DC 90 A3 5B 18 */ stw r5, l_target_info_count@l(r3) /* 0x80CF5B18@l */ -/* 80CF47E0 7C A3 2B 78 */ mr r3, r5 -/* 80CF47E4 3C 80 80 CF */ lis r4, l_target_info@ha /* 0x80CF5B10@ha */ -/* 80CF47E8 38 84 5B 10 */ addi r4, r4, l_target_info@l /* 0x80CF5B10@l */ -/* 80CF47EC 38 00 00 02 */ li r0, 2 -/* 80CF47F0 7C 09 03 A6 */ mtctr r0 -lbl_80CF47F4: -/* 80CF47F4 7C A4 19 2E */ stwx r5, r4, r3 -/* 80CF47F8 38 63 00 04 */ addi r3, r3, 4 -/* 80CF47FC 42 00 FF F8 */ bdnz lbl_80CF47F4 -/* 80CF4800 3C 60 80 CF */ lis r3, s_ball_sub__FPvPv@ha /* 0x80CF45B8@ha */ -/* 80CF4804 38 63 45 B8 */ addi r3, r3, s_ball_sub__FPvPv@l /* 0x80CF45B8@l */ -/* 80CF4808 7F E4 FB 78 */ mr r4, r31 -/* 80CF480C 4B 32 CB 2D */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80CF4810 39 40 00 00 */ li r10, 0 -/* 80CF4814 38 60 00 00 */ li r3, 0 -/* 80CF4818 3C 80 80 CF */ lis r4, l_target_info@ha /* 0x80CF5B10@ha */ -/* 80CF481C 38 E4 5B 10 */ addi r7, r4, l_target_info@l /* 0x80CF5B10@l */ -/* 80CF4820 3C 80 80 CF */ lis r4, l_target_info_count@ha /* 0x80CF5B18@ha */ -/* 80CF4824 38 A4 5B 18 */ addi r5, r4, l_target_info_count@l /* 0x80CF5B18@l */ -/* 80CF4828 48 00 00 A4 */ b lbl_80CF48CC -lbl_80CF482C: -/* 80CF482C 7C 87 18 2E */ lwzx r4, r7, r3 -/* 80CF4830 28 04 00 00 */ cmplwi r4, 0 -/* 80CF4834 41 82 00 90 */ beq lbl_80CF48C4 -/* 80CF4838 41 82 00 0C */ beq lbl_80CF4844 -/* 80CF483C 81 04 00 04 */ lwz r8, 4(r4) -/* 80CF4840 48 00 00 08 */ b lbl_80CF4848 -lbl_80CF4844: -/* 80CF4844 39 00 FF FF */ li r8, -1 -lbl_80CF4848: -/* 80CF4848 3C 08 00 01 */ addis r0, r8, 1 -/* 80CF484C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80CF4850 41 82 00 74 */ beq lbl_80CF48C4 -/* 80CF4854 38 C0 FF FF */ li r6, -1 -/* 80CF4858 39 20 00 00 */ li r9, 0 -/* 80CF485C 38 80 00 00 */ li r4, 0 -/* 80CF4860 38 00 00 02 */ li r0, 2 -/* 80CF4864 7C 09 03 A6 */ mtctr r0 -lbl_80CF4868: -/* 80CF4868 38 04 05 8C */ addi r0, r4, 0x58c -/* 80CF486C 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 80CF4870 7C 08 00 40 */ cmplw r8, r0 -/* 80CF4874 40 82 00 0C */ bne lbl_80CF4880 -/* 80CF4878 7D 26 4B 78 */ mr r6, r9 -/* 80CF487C 48 00 00 10 */ b lbl_80CF488C -lbl_80CF4880: -/* 80CF4880 39 29 00 01 */ addi r9, r9, 1 -/* 80CF4884 38 84 00 04 */ addi r4, r4, 4 -/* 80CF4888 42 00 FF E0 */ bdnz lbl_80CF4868 -lbl_80CF488C: -/* 80CF488C 2C 06 00 00 */ cmpwi r6, 0 -/* 80CF4890 40 80 00 34 */ bge lbl_80CF48C4 -/* 80CF4894 38 80 00 00 */ li r4, 0 -/* 80CF4898 38 00 00 02 */ li r0, 2 -/* 80CF489C 7C 09 03 A6 */ mtctr r0 -lbl_80CF48A0: -/* 80CF48A0 39 24 05 8C */ addi r9, r4, 0x58c -/* 80CF48A4 7C DF 48 2E */ lwzx r6, r31, r9 -/* 80CF48A8 3C 06 00 01 */ addis r0, r6, 1 -/* 80CF48AC 28 00 FF FF */ cmplwi r0, 0xffff -/* 80CF48B0 40 82 00 0C */ bne lbl_80CF48BC -/* 80CF48B4 7D 1F 49 2E */ stwx r8, r31, r9 -/* 80CF48B8 48 00 00 0C */ b lbl_80CF48C4 -lbl_80CF48BC: -/* 80CF48BC 38 84 00 04 */ addi r4, r4, 4 -/* 80CF48C0 42 00 FF E0 */ bdnz lbl_80CF48A0 -lbl_80CF48C4: -/* 80CF48C4 39 4A 00 01 */ addi r10, r10, 1 -/* 80CF48C8 38 63 00 04 */ addi r3, r3, 4 -lbl_80CF48CC: -/* 80CF48CC 80 05 00 00 */ lwz r0, 0(r5) -/* 80CF48D0 7C 0A 00 00 */ cmpw r10, r0 -/* 80CF48D4 41 80 FF 58 */ blt lbl_80CF482C -/* 80CF48D8 3B 40 00 00 */ li r26, 0 -/* 80CF48DC 3B C0 00 00 */ li r30, 0 -/* 80CF48E0 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80CF48E4 3B 83 35 90 */ addi r28, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80CF48E8 3B A0 FF FF */ li r29, -1 -lbl_80CF48EC: -/* 80CF48EC 3B 7E 05 8C */ addi r27, r30, 0x58c -/* 80CF48F0 7C 1F D8 2E */ lwzx r0, r31, r27 -/* 80CF48F4 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CF48F8 7F 83 E3 78 */ mr r3, r28 -/* 80CF48FC 38 81 00 0C */ addi r4, r1, 0xc -/* 80CF4900 4B 32 4E F9 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80CF4904 28 03 00 00 */ cmplwi r3, 0 -/* 80CF4908 40 82 00 08 */ bne lbl_80CF4910 -/* 80CF490C 7F BF D9 2E */ stwx r29, r31, r27 -lbl_80CF4910: -/* 80CF4910 3B 5A 00 01 */ addi r26, r26, 1 -/* 80CF4914 2C 1A 00 02 */ cmpwi r26, 2 -/* 80CF4918 3B DE 00 04 */ addi r30, r30, 4 -/* 80CF491C 41 80 FF D0 */ blt lbl_80CF48EC -/* 80CF4920 80 7F 05 9C */ lwz r3, 0x59c(r31) -/* 80CF4924 3C 03 00 01 */ addis r0, r3, 1 -/* 80CF4928 28 00 FF FF */ cmplwi r0, 0xffff -/* 80CF492C 41 82 00 28 */ beq lbl_80CF4954 -/* 80CF4930 90 61 00 08 */ stw r3, 8(r1) -/* 80CF4934 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80CF4938 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80CF493C 38 81 00 08 */ addi r4, r1, 8 -/* 80CF4940 4B 32 4E B9 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80CF4944 28 03 00 00 */ cmplwi r3, 0 -/* 80CF4948 40 82 00 0C */ bne lbl_80CF4954 -/* 80CF494C 38 00 FF FF */ li r0, -1 -/* 80CF4950 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80CF4954: -/* 80CF4954 39 61 00 30 */ addi r11, r1, 0x30 -/* 80CF4958 4B 66 D8 C5 */ bl _restgpr_26 -/* 80CF495C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80CF4960 7C 08 03 A6 */ mtlr r0 -/* 80CF4964 38 21 00 30 */ addi r1, r1, 0x30 -/* 80CF4968 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/setBaseMtx__14daObjSwBallB_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/setBaseMtx__14daObjSwBallB_cFv.s deleted file mode 100644 index 04412935ff..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/setBaseMtx__14daObjSwBallB_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CF498C: -/* 80CF498C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF4990 7C 08 02 A6 */ mflr r0 -/* 80CF4994 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF4998 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF499C 7C 7F 1B 78 */ mr r31, r3 -/* 80CF49A0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF49A4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF49A8 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CF49AC C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CF49B0 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CF49B4 4B 65 1F 35 */ bl PSMTXTrans -/* 80CF49B8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF49BC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF49C0 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80CF49C4 4B 31 7A 71 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CF49C8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF49CC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF49D0 80 9F 05 84 */ lwz r4, 0x584(r31) -/* 80CF49D4 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CF49D8 4B 65 1A D9 */ bl PSMTXCopy -/* 80CF49DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF49E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF49E4 7C 08 03 A6 */ mtlr r0 -/* 80CF49E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF49EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 1dea211bd7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF5B98: -/* 80CF5B98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF5B9C 7C 08 02 A6 */ mflr r0 -/* 80CF5BA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF5BA4 48 00 03 55 */ bl CreateHeap__14daObjSwBallC_cFv -/* 80CF5BA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF5BAC 7C 08 03 A6 */ mtlr r0 -/* 80CF5BB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF5BB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/CreateHeap__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/CreateHeap__14daObjSwBallC_cFv.s deleted file mode 100644 index 6de85d176a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/CreateHeap__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_80CF5EF8: -/* 80CF5EF8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CF5EFC 7C 08 02 A6 */ mflr r0 -/* 80CF5F00 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CF5F04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF5F08 4B 66 C2 D1 */ bl _savegpr_28 -/* 80CF5F0C 7C 7F 1B 78 */ mr r31, r3 -/* 80CF5F10 3C 60 80 CF */ lis r3, l_arcName@ha /* 0x80CF6DB0@ha */ -/* 80CF5F14 38 63 6D B0 */ addi r3, r3, l_arcName@l /* 0x80CF6DB0@l */ -/* 80CF5F18 80 63 00 00 */ lwz r3, 0(r3) -/* 80CF5F1C 38 80 00 06 */ li r4, 6 -/* 80CF5F20 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF5F24 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF5F28 3F C5 00 02 */ addis r30, r5, 2 -/* 80CF5F2C 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80CF5F30 7F C5 F3 78 */ mr r5, r30 -/* 80CF5F34 38 C0 00 80 */ li r6, 0x80 -/* 80CF5F38 4B 34 63 B5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CF5F3C 7C 7D 1B 78 */ mr r29, r3 -/* 80CF5F40 3C 80 00 08 */ lis r4, 8 -/* 80CF5F44 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 80CF5F48 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 80CF5F4C 4B 31 ED 09 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CF5F50 90 7F 05 70 */ stw r3, 0x570(r31) -/* 80CF5F54 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80CF5F58 28 00 00 00 */ cmplwi r0, 0 -/* 80CF5F5C 40 82 00 0C */ bne lbl_80CF5F68 -/* 80CF5F60 38 60 00 00 */ li r3, 0 -/* 80CF5F64 48 00 00 A8 */ b lbl_80CF600C -lbl_80CF5F68: -/* 80CF5F68 3C 60 80 CF */ lis r3, l_arcName@ha /* 0x80CF6DB0@ha */ -/* 80CF5F6C 38 63 6D B0 */ addi r3, r3, l_arcName@l /* 0x80CF6DB0@l */ -/* 80CF5F70 80 63 00 00 */ lwz r3, 0(r3) -/* 80CF5F74 38 80 00 0A */ li r4, 0xa -/* 80CF5F78 7F C5 F3 78 */ mr r5, r30 -/* 80CF5F7C 38 C0 00 80 */ li r6, 0x80 -/* 80CF5F80 4B 34 63 6D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CF5F84 7C 7C 1B 78 */ mr r28, r3 -/* 80CF5F88 38 60 00 18 */ li r3, 0x18 -/* 80CF5F8C 4B 5D 8C C1 */ bl __nw__FUl -/* 80CF5F90 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CF5F94 41 82 00 20 */ beq lbl_80CF5FB4 -/* 80CF5F98 3C 80 80 CF */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80CF6F08@ha */ -/* 80CF5F9C 38 04 6F 08 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80CF6F08@l */ -/* 80CF5FA0 90 1E 00 00 */ stw r0, 0(r30) -/* 80CF5FA4 38 80 00 00 */ li r4, 0 -/* 80CF5FA8 4B 63 24 55 */ bl init__12J3DFrameCtrlFs -/* 80CF5FAC 38 00 00 00 */ li r0, 0 -/* 80CF5FB0 90 1E 00 14 */ stw r0, 0x14(r30) -lbl_80CF5FB4: -/* 80CF5FB4 93 DF 05 74 */ stw r30, 0x574(r31) -/* 80CF5FB8 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80CF5FBC 28 03 00 00 */ cmplwi r3, 0 -/* 80CF5FC0 41 82 00 30 */ beq lbl_80CF5FF0 -/* 80CF5FC4 38 9D 00 58 */ addi r4, r29, 0x58 -/* 80CF5FC8 7F 85 E3 78 */ mr r5, r28 -/* 80CF5FCC 38 C0 00 01 */ li r6, 1 -/* 80CF5FD0 38 E0 00 00 */ li r7, 0 -/* 80CF5FD4 3D 00 80 CF */ lis r8, lit_3814@ha /* 0x80CF6CDC@ha */ -/* 80CF5FD8 C0 28 6C DC */ lfs f1, lit_3814@l(r8) /* 0x80CF6CDC@l */ -/* 80CF5FDC 39 00 00 00 */ li r8, 0 -/* 80CF5FE0 39 20 FF FF */ li r9, -1 -/* 80CF5FE4 4B 31 76 59 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80CF5FE8 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF5FEC 40 82 00 0C */ bne lbl_80CF5FF8 -lbl_80CF5FF0: -/* 80CF5FF0 38 60 00 00 */ li r3, 0 -/* 80CF5FF4 48 00 00 18 */ b lbl_80CF600C -lbl_80CF5FF8: -/* 80CF5FF8 3C 60 80 CF */ lis r3, lit_3850@ha /* 0x80CF6CEC@ha */ -/* 80CF5FFC C0 03 6C EC */ lfs f0, lit_3850@l(r3) /* 0x80CF6CEC@l */ -/* 80CF6000 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80CF6004 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80CF6008 38 60 00 01 */ li r3, 1 -lbl_80CF600C: -/* 80CF600C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF6010 4B 66 C2 15 */ bl _restgpr_28 -/* 80CF6014 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CF6018 7C 08 03 A6 */ mtlr r0 -/* 80CF601C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CF6020 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/Create__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/Create__14daObjSwBallC_cFv.s deleted file mode 100644 index 54c38e5442..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/Create__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,107 +0,0 @@ -lbl_80CF5D58: -/* 80CF5D58 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CF5D5C 7C 08 02 A6 */ mflr r0 -/* 80CF5D60 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CF5D64 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CF5D68 7C 7F 1B 78 */ mr r31, r3 -/* 80CF5D6C 4B FF FF 69 */ bl initBaseMtx__14daObjSwBallC_cFv -/* 80CF5D70 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80CF5D74 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CF5D78 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80CF5D7C 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80CF5D80 80 63 00 04 */ lwz r3, 4(r3) -/* 80CF5D84 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80CF5D88 80 83 00 00 */ lwz r4, 0(r3) -/* 80CF5D8C 7F E3 FB 78 */ mr r3, r31 -/* 80CF5D90 C0 24 00 3C */ lfs f1, 0x3c(r4) -/* 80CF5D94 C0 44 00 40 */ lfs f2, 0x40(r4) -/* 80CF5D98 C0 64 00 44 */ lfs f3, 0x44(r4) -/* 80CF5D9C C0 84 00 48 */ lfs f4, 0x48(r4) -/* 80CF5DA0 C0 A4 00 4C */ lfs f5, 0x4c(r4) -/* 80CF5DA4 C0 C4 00 50 */ lfs f6, 0x50(r4) -/* 80CF5DA8 4B 32 47 A1 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80CF5DAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF5DB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF5DB4 38 80 00 3D */ li r4, 0x3d -/* 80CF5DB8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF5DBC 7C 05 07 74 */ extsb r5, r0 -/* 80CF5DC0 4B 33 F5 A1 */ bl isSwitch__10dSv_info_cCFii -/* 80CF5DC4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF5DC8 41 82 00 60 */ beq lbl_80CF5E28 -/* 80CF5DCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF5DD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF5DD4 38 80 00 3E */ li r4, 0x3e -/* 80CF5DD8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF5DDC 7C 05 07 74 */ extsb r5, r0 -/* 80CF5DE0 4B 33 F5 81 */ bl isSwitch__10dSv_info_cCFii -/* 80CF5DE4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF5DE8 41 82 00 40 */ beq lbl_80CF5E28 -/* 80CF5DEC 3C 60 80 CF */ lis r3, lit_3814@ha /* 0x80CF6CDC@ha */ -/* 80CF5DF0 C0 03 6C DC */ lfs f0, lit_3814@l(r3) /* 0x80CF6CDC@l */ -/* 80CF5DF4 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80CF5DF8 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80CF5DFC 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80CF5E00 A8 04 00 08 */ lha r0, 8(r4) -/* 80CF5E04 3C 60 80 CF */ lis r3, lit_3816@ha /* 0x80CF6CE4@ha */ -/* 80CF5E08 C8 23 6C E4 */ lfd f1, lit_3816@l(r3) /* 0x80CF6CE4@l */ -/* 80CF5E0C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80CF5E10 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CF5E14 3C 00 43 30 */ lis r0, 0x4330 -/* 80CF5E18 90 01 00 08 */ stw r0, 8(r1) -/* 80CF5E1C C8 01 00 08 */ lfd f0, 8(r1) -/* 80CF5E20 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80CF5E24 D0 04 00 10 */ stfs f0, 0x10(r4) -lbl_80CF5E28: -/* 80CF5E28 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80CF5E2C 80 63 00 04 */ lwz r3, 4(r3) -/* 80CF5E30 80 63 00 60 */ lwz r3, 0x60(r3) -/* 80CF5E34 80 63 00 00 */ lwz r3, 0(r3) -/* 80CF5E38 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 80CF5E3C 38 80 00 01 */ li r4, 1 -/* 80CF5E40 81 83 00 00 */ lwz r12, 0(r3) -/* 80CF5E44 81 8C 00 74 */ lwz r12, 0x74(r12) -/* 80CF5E48 7D 89 03 A6 */ mtctr r12 -/* 80CF5E4C 4E 80 04 21 */ bctrl -/* 80CF5E50 3C 80 80 CF */ lis r4, l_color@ha /* 0x80CF6CD4@ha */ -/* 80CF5E54 8C 04 6C D4 */ lbzu r0, l_color@l(r4) /* 0x80CF6CD4@l */ -/* 80CF5E58 98 03 00 00 */ stb r0, 0(r3) -/* 80CF5E5C 88 04 00 01 */ lbz r0, 1(r4) -/* 80CF5E60 98 03 00 01 */ stb r0, 1(r3) -/* 80CF5E64 88 04 00 02 */ lbz r0, 2(r4) -/* 80CF5E68 98 03 00 02 */ stb r0, 2(r3) -/* 80CF5E6C 38 00 00 FF */ li r0, 0xff -/* 80CF5E70 98 1F 05 7E */ stb r0, 0x57e(r31) -/* 80CF5E74 3C 60 80 CF */ lis r3, l_arcName@ha /* 0x80CF6DB0@ha */ -/* 80CF5E78 80 03 6D B0 */ lwz r0, l_arcName@l(r3) /* 0x80CF6DB0@l */ -/* 80CF5E7C 90 1F 01 00 */ stw r0, 0x100(r31) -/* 80CF5E80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF5E84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF5E88 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80CF5E8C 7F E4 FB 78 */ mr r4, r31 -/* 80CF5E90 3C A0 80 CF */ lis r5, l_evName@ha /* 0x80CF6DB4@ha */ -/* 80CF5E94 38 A5 6D B4 */ addi r5, r5, l_evName@l /* 0x80CF6DB4@l */ -/* 80CF5E98 80 A5 00 00 */ lwz r5, 0(r5) -/* 80CF5E9C 38 C0 00 FF */ li r6, 0xff -/* 80CF5EA0 4B 35 18 B9 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80CF5EA4 B0 7F 05 7C */ sth r3, 0x57c(r31) -/* 80CF5EA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF5EAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF5EB0 38 80 00 3F */ li r4, 0x3f -/* 80CF5EB4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF5EB8 7C 05 07 74 */ extsb r5, r0 -/* 80CF5EBC 4B 33 F4 A5 */ bl isSwitch__10dSv_info_cCFii -/* 80CF5EC0 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF5EC4 41 82 00 14 */ beq lbl_80CF5ED8 -/* 80CF5EC8 7F E3 FB 78 */ mr r3, r31 -/* 80CF5ECC 48 00 09 4D */ bl setLightOnSwB__14daObjSwBallC_cFv -/* 80CF5ED0 38 00 00 03 */ li r0, 3 -/* 80CF5ED4 98 1F 05 7F */ stb r0, 0x57f(r31) -lbl_80CF5ED8: -/* 80CF5ED8 7F E3 FB 78 */ mr r3, r31 -/* 80CF5EDC 48 00 02 45 */ bl execute__14daObjSwBallC_cFv -/* 80CF5EE0 38 60 00 01 */ li r3, 1 -/* 80CF5EE4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CF5EE8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CF5EEC 7C 08 03 A6 */ mtlr r0 -/* 80CF5EF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CF5EF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 2aa9cad21a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CF6024: -/* 80CF6024 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6028 7C 08 02 A6 */ mflr r0 -/* 80CF602C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6030 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF6034 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CF6038 41 82 00 1C */ beq lbl_80CF6054 -/* 80CF603C 3C A0 80 CF */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80CF6F08@ha */ -/* 80CF6040 38 05 6F 08 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80CF6F08@l */ -/* 80CF6044 90 1F 00 00 */ stw r0, 0(r31) -/* 80CF6048 7C 80 07 35 */ extsh. r0, r4 -/* 80CF604C 40 81 00 08 */ ble lbl_80CF6054 -/* 80CF6050 4B 5D 8C ED */ bl __dl__FPv -lbl_80CF6054: -/* 80CF6054 7F E3 FB 78 */ mr r3, r31 -/* 80CF6058 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF605C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6060 7C 08 03 A6 */ mtlr r0 -/* 80CF6064 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6068 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/_delete__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/_delete__14daObjSwBallC_cFv.s deleted file mode 100644 index 2bb403f5fc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/_delete__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80CF6BFC: -/* 80CF6BFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6C00 7C 08 02 A6 */ mflr r0 -/* 80CF6C04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6C08 3C 80 80 CF */ lis r4, l_arcName@ha /* 0x80CF6DB0@ha */ -/* 80CF6C0C 38 84 6D B0 */ addi r4, r4, l_arcName@l /* 0x80CF6DB0@l */ -/* 80CF6C10 80 84 00 00 */ lwz r4, 0(r4) -/* 80CF6C14 38 63 05 68 */ addi r3, r3, 0x568 -/* 80CF6C18 4B 33 63 F1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CF6C1C 38 60 00 01 */ li r3, 1 -/* 80CF6C20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6C24 7C 08 03 A6 */ mtlr r0 -/* 80CF6C28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6C2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionEvent__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionEvent__14daObjSwBallC_cFv.s deleted file mode 100644 index 394c8214ea..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionEvent__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80CF6344: -/* 80CF6344 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CF6348 7C 08 02 A6 */ mflr r0 -/* 80CF634C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CF6350 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF6354 4B 66 BE 89 */ bl _savegpr_29 -/* 80CF6358 7C 7D 1B 78 */ mr r29, r3 -/* 80CF635C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF6360 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF6364 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80CF6368 A8 9D 05 7C */ lha r4, 0x57c(r29) -/* 80CF636C 4B 35 17 0D */ bl endCheck__16dEvent_manager_cFs -/* 80CF6370 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF6374 41 82 00 5C */ beq lbl_80CF63D0 -/* 80CF6378 38 00 00 03 */ li r0, 3 -/* 80CF637C 98 1D 05 7F */ stb r0, 0x57f(r29) -/* 80CF6380 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 80CF6384 4B 34 C0 E5 */ bl reset__14dEvt_control_cFv -/* 80CF6388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF638C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF6390 38 80 00 58 */ li r4, 0x58 -/* 80CF6394 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80CF6398 7C 05 07 74 */ extsb r5, r0 -/* 80CF639C 4B 33 EE 65 */ bl onSwitch__10dSv_info_cFii -/* 80CF63A0 3B C0 00 00 */ li r30, 0 -/* 80CF63A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF63A8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_80CF63AC: -/* 80CF63AC 7F E3 FB 78 */ mr r3, r31 -/* 80CF63B0 38 9E 00 50 */ addi r4, r30, 0x50 -/* 80CF63B4 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80CF63B8 7C 05 07 74 */ extsb r5, r0 -/* 80CF63BC 4B 33 EE 45 */ bl onSwitch__10dSv_info_cFii -/* 80CF63C0 3B DE 00 01 */ addi r30, r30, 1 -/* 80CF63C4 2C 1E 00 08 */ cmpwi r30, 8 -/* 80CF63C8 41 80 FF E4 */ blt lbl_80CF63AC -/* 80CF63CC 48 00 00 0C */ b lbl_80CF63D8 -lbl_80CF63D0: -/* 80CF63D0 7F A3 EB 78 */ mr r3, r29 -/* 80CF63D4 48 00 00 21 */ bl demoProc__14daObjSwBallC_cFv -lbl_80CF63D8: -/* 80CF63D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF63DC 4B 66 BE 4D */ bl _restgpr_29 -/* 80CF63E0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CF63E4 7C 08 03 A6 */ mtlr r0 -/* 80CF63E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CF63EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionOrderEvent__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionOrderEvent__14daObjSwBallC_cFv.s deleted file mode 100644 index 5277c380e3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionOrderEvent__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80CF629C: -/* 80CF629C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF62A0 7C 08 02 A6 */ mflr r0 -/* 80CF62A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF62A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF62AC 7C 7F 1B 78 */ mr r31, r3 -/* 80CF62B0 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80CF62B4 28 00 00 02 */ cmplwi r0, 2 -/* 80CF62B8 40 82 00 50 */ bne lbl_80CF6308 -/* 80CF62BC 38 00 00 02 */ li r0, 2 -/* 80CF62C0 98 1F 05 7F */ stb r0, 0x57f(r31) -/* 80CF62C4 48 00 01 31 */ bl demoProc__14daObjSwBallC_cFv -/* 80CF62C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF62CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF62D0 38 80 00 3F */ li r4, 0x3f -/* 80CF62D4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF62D8 7C 05 07 74 */ extsb r5, r0 -/* 80CF62DC 4B 33 EF 25 */ bl onSwitch__10dSv_info_cFii -/* 80CF62E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF62E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF62E8 3B E3 09 58 */ addi r31, r3, 0x958 -/* 80CF62EC 7F E3 FB 78 */ mr r3, r31 -/* 80CF62F0 38 80 00 0A */ li r4, 0xa -/* 80CF62F4 4B 33 E4 AD */ bl onTbox__12dSv_memBit_cFi -/* 80CF62F8 7F E3 FB 78 */ mr r3, r31 -/* 80CF62FC 38 80 00 0B */ li r4, 0xb -/* 80CF6300 4B 33 E4 A1 */ bl onTbox__12dSv_memBit_cFi -/* 80CF6304 48 00 00 2C */ b lbl_80CF6330 -lbl_80CF6308: -/* 80CF6308 A8 9F 05 7C */ lha r4, 0x57c(r31) -/* 80CF630C 88 BF 05 7E */ lbz r5, 0x57e(r31) -/* 80CF6310 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80CF6314 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80CF6318 38 E0 00 00 */ li r7, 0 -/* 80CF631C 39 00 00 01 */ li r8, 1 -/* 80CF6320 4B 32 53 5D */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 80CF6324 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80CF6328 60 00 00 02 */ ori r0, r0, 2 -/* 80CF632C B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_80CF6330: -/* 80CF6330 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF6334 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6338 7C 08 03 A6 */ mtlr r0 -/* 80CF633C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6340 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionWait__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionWait__14daObjSwBallC_cFv.s deleted file mode 100644 index 528c87b61e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionWait__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80CF6200: -/* 80CF6200 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6204 7C 08 02 A6 */ mflr r0 -/* 80CF6208 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF620C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF6210 7C 7F 1B 78 */ mr r31, r3 -/* 80CF6214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF6218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF621C 38 80 00 3D */ li r4, 0x3d -/* 80CF6220 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF6224 7C 05 07 74 */ extsb r5, r0 -/* 80CF6228 4B 33 F1 39 */ bl isSwitch__10dSv_info_cCFii -/* 80CF622C 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF6230 41 82 00 58 */ beq lbl_80CF6288 -/* 80CF6234 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF6238 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF623C 38 80 00 3E */ li r4, 0x3e -/* 80CF6240 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CF6244 7C 05 07 74 */ extsb r5, r0 -/* 80CF6248 4B 33 F1 19 */ bl isSwitch__10dSv_info_cCFii -/* 80CF624C 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF6250 41 82 00 38 */ beq lbl_80CF6288 -/* 80CF6254 38 00 00 01 */ li r0, 1 -/* 80CF6258 98 1F 05 7F */ stb r0, 0x57f(r31) -/* 80CF625C 7F E3 FB 78 */ mr r3, r31 -/* 80CF6260 A8 9F 05 7C */ lha r4, 0x57c(r31) -/* 80CF6264 88 BF 05 7E */ lbz r5, 0x57e(r31) -/* 80CF6268 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80CF626C 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80CF6270 38 E0 00 00 */ li r7, 0 -/* 80CF6274 39 00 00 01 */ li r8, 1 -/* 80CF6278 4B 32 54 05 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 80CF627C A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80CF6280 60 00 00 02 */ ori r0, r0, 2 -/* 80CF6284 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_80CF6288: -/* 80CF6288 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF628C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6290 7C 08 03 A6 */ mtlr r0 -/* 80CF6294 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6298 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/calcLightBallScale__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/calcLightBallScale__14daObjSwBallC_cFv.s deleted file mode 100644 index e2f7ab9e50..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/calcLightBallScale__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80CF699C: -/* 80CF699C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CF69A0 7C 08 02 A6 */ mflr r0 -/* 80CF69A4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CF69A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF69AC 4B 66 B8 31 */ bl _savegpr_29 -/* 80CF69B0 7C 7D 1B 78 */ mr r29, r3 -/* 80CF69B4 3B C0 00 00 */ li r30, 0 -/* 80CF69B8 3C 60 80 CF */ lis r3, s_ballA_sub__FPvPv@ha /* 0x80CF5C24@ha */ -/* 80CF69BC 38 63 5C 24 */ addi r3, r3, s_ballA_sub__FPvPv@l /* 0x80CF5C24@l */ -/* 80CF69C0 7F A4 EB 78 */ mr r4, r29 -/* 80CF69C4 4B 32 A9 75 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80CF69C8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CF69CC 41 82 00 3C */ beq lbl_80CF6A08 -/* 80CF69D0 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 80CF69D4 60 00 08 00 */ ori r0, r0, 0x800 -/* 80CF69D8 90 1F 04 9C */ stw r0, 0x49c(r31) -/* 80CF69DC 38 7F 04 EC */ addi r3, r31, 0x4ec -/* 80CF69E0 3C 80 80 CF */ lis r4, lit_3850@ha /* 0x80CF6CEC@ha */ -/* 80CF69E4 C0 24 6C EC */ lfs f1, lit_3850@l(r4) /* 0x80CF6CEC@l */ -/* 80CF69E8 3C 80 80 CF */ lis r4, lit_4175@ha /* 0x80CF6CFC@ha */ -/* 80CF69EC C0 44 6C FC */ lfs f2, lit_4175@l(r4) /* 0x80CF6CFC@l */ -/* 80CF69F0 4B 57 9D 51 */ bl cLib_chaseF__FPfff -/* 80CF69F4 7C 7E 1B 78 */ mr r30, r3 -/* 80CF69F8 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80CF69FC D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 80CF6A00 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80CF6A04 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -lbl_80CF6A08: -/* 80CF6A08 3C 60 80 CF */ lis r3, s_ballB_sub__FPvPv@ha /* 0x80CF5C7C@ha */ -/* 80CF6A0C 38 63 5C 7C */ addi r3, r3, s_ballB_sub__FPvPv@l /* 0x80CF5C7C@l */ -/* 80CF6A10 7F A4 EB 78 */ mr r4, r29 -/* 80CF6A14 4B 32 A9 25 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80CF6A18 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CF6A1C 41 82 00 3C */ beq lbl_80CF6A58 -/* 80CF6A20 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 80CF6A24 60 00 08 00 */ ori r0, r0, 0x800 -/* 80CF6A28 90 1F 04 9C */ stw r0, 0x49c(r31) -/* 80CF6A2C 38 7F 04 EC */ addi r3, r31, 0x4ec -/* 80CF6A30 3C 80 80 CF */ lis r4, lit_3850@ha /* 0x80CF6CEC@ha */ -/* 80CF6A34 C0 24 6C EC */ lfs f1, lit_3850@l(r4) /* 0x80CF6CEC@l */ -/* 80CF6A38 3C 80 80 CF */ lis r4, lit_4175@ha /* 0x80CF6CFC@ha */ -/* 80CF6A3C C0 44 6C FC */ lfs f2, lit_4175@l(r4) /* 0x80CF6CFC@l */ -/* 80CF6A40 4B 57 9D 01 */ bl cLib_chaseF__FPfff -/* 80CF6A44 7F DE 18 38 */ and r30, r30, r3 -/* 80CF6A48 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80CF6A4C D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 80CF6A50 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80CF6A54 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -lbl_80CF6A58: -/* 80CF6A58 7F C3 F3 78 */ mr r3, r30 -/* 80CF6A5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF6A60 4B 66 B7 C9 */ bl _restgpr_29 -/* 80CF6A64 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CF6A68 7C 08 03 A6 */ mtlr r0 -/* 80CF6A6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CF6A70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Create__FP14daObjSwBallC_c.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Create__FP14daObjSwBallC_c.s deleted file mode 100644 index cd28a19ca8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Create__FP14daObjSwBallC_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF6C90: -/* 80CF6C90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6C94 7C 08 02 A6 */ mflr r0 -/* 80CF6C98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6C9C 4B FF F3 D1 */ bl create__14daObjSwBallC_cFv -/* 80CF6CA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6CA4 7C 08 03 A6 */ mtlr r0 -/* 80CF6CA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6CAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Delete__FP14daObjSwBallC_c.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Delete__FP14daObjSwBallC_c.s deleted file mode 100644 index 6ea2753227..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Delete__FP14daObjSwBallC_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF6C70: -/* 80CF6C70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6C74 7C 08 02 A6 */ mflr r0 -/* 80CF6C78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6C7C 4B FF FF 81 */ bl _delete__14daObjSwBallC_cFv -/* 80CF6C80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6C84 7C 08 03 A6 */ mtlr r0 -/* 80CF6C88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6C8C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Draw__FP14daObjSwBallC_c.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Draw__FP14daObjSwBallC_c.s deleted file mode 100644 index cf321db1ec..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Draw__FP14daObjSwBallC_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF6C30: -/* 80CF6C30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6C34 7C 08 02 A6 */ mflr r0 -/* 80CF6C38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6C3C 4B FF FE 39 */ bl draw__14daObjSwBallC_cFv -/* 80CF6C40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6C44 7C 08 03 A6 */ mtlr r0 -/* 80CF6C48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6C4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Execute__FP14daObjSwBallC_c.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Execute__FP14daObjSwBallC_c.s deleted file mode 100644 index 71d61f5569..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Execute__FP14daObjSwBallC_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF6C50: -/* 80CF6C50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6C54 7C 08 02 A6 */ mflr r0 -/* 80CF6C58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6C5C 4B FF F4 C5 */ bl execute__14daObjSwBallC_cFv -/* 80CF6C60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6C64 7C 08 03 A6 */ mtlr r0 -/* 80CF6C68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6C6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBallA__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBallA__14daObjSwBallC_cFv.s deleted file mode 100644 index 9ee2c38df9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBallA__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80CF692C: -/* 80CF692C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6930 7C 08 02 A6 */ mflr r0 -/* 80CF6934 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6938 7C 64 1B 78 */ mr r4, r3 -/* 80CF693C 3C 60 80 CF */ lis r3, s_ballA_sub__FPvPv@ha /* 0x80CF5C24@ha */ -/* 80CF6940 38 63 5C 24 */ addi r3, r3, s_ballA_sub__FPvPv@l /* 0x80CF5C24@l */ -/* 80CF6944 4B 32 A9 F5 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80CF6948 28 03 00 00 */ cmplwi r3, 0 -/* 80CF694C 41 82 00 08 */ beq lbl_80CF6954 -/* 80CF6950 4B 32 33 2D */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_80CF6954: -/* 80CF6954 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6958 7C 08 03 A6 */ mtlr r0 -/* 80CF695C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6960 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBallB__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBallB__14daObjSwBallC_cFv.s deleted file mode 100644 index a038a360fa..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBallB__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80CF6964: -/* 80CF6964 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6968 7C 08 02 A6 */ mflr r0 -/* 80CF696C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6970 7C 64 1B 78 */ mr r4, r3 -/* 80CF6974 3C 60 80 CF */ lis r3, s_ballB_sub__FPvPv@ha /* 0x80CF5C7C@ha */ -/* 80CF6978 38 63 5C 7C */ addi r3, r3, s_ballB_sub__FPvPv@l /* 0x80CF5C7C@l */ -/* 80CF697C 4B 32 A9 BD */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80CF6980 28 03 00 00 */ cmplwi r3, 0 -/* 80CF6984 41 82 00 08 */ beq lbl_80CF698C -/* 80CF6988 4B 32 32 F5 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_80CF698C: -/* 80CF698C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6990 7C 08 03 A6 */ mtlr r0 -/* 80CF6994 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6998 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBall__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBall__14daObjSwBallC_cFv.s deleted file mode 100644 index e506913d2d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBall__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80CF68F8: -/* 80CF68F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF68FC 7C 08 02 A6 */ mflr r0 -/* 80CF6900 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6904 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF6908 7C 7F 1B 78 */ mr r31, r3 -/* 80CF690C 48 00 00 21 */ bl deleteLightBallA__14daObjSwBallC_cFv -/* 80CF6910 7F E3 FB 78 */ mr r3, r31 -/* 80CF6914 48 00 00 51 */ bl deleteLightBallB__14daObjSwBallC_cFv -/* 80CF6918 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF691C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6920 7C 08 03 A6 */ mtlr r0 -/* 80CF6924 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6928 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/demoProc__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/demoProc__14daObjSwBallC_cFv.s deleted file mode 100644 index a0e63dd471..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/demoProc__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,292 +0,0 @@ -lbl_80CF63F4: -/* 80CF63F4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80CF63F8 7C 08 02 A6 */ mflr r0 -/* 80CF63FC 90 01 00 34 */ stw r0, 0x34(r1) -/* 80CF6400 39 61 00 30 */ addi r11, r1, 0x30 -/* 80CF6404 4B 66 BD D1 */ bl _savegpr_27 -/* 80CF6408 7C 7B 1B 78 */ mr r27, r3 -/* 80CF640C 3C 60 80 CF */ lis r3, l_color@ha /* 0x80CF6CD4@ha */ -/* 80CF6410 3B C3 6C D4 */ addi r30, r3, l_color@l /* 0x80CF6CD4@l */ -/* 80CF6414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF6418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF641C 83 A3 5D AC */ lwz r29, 0x5dac(r3) -/* 80CF6420 3B 83 4F F8 */ addi r28, r3, 0x4ff8 -/* 80CF6424 7F 83 E3 78 */ mr r3, r28 -/* 80CF6428 80 9B 05 78 */ lwz r4, 0x578(r27) -/* 80CF642C 3C A0 80 CF */ lis r5, action_table@ha /* 0x80CF6E1C@ha */ -/* 80CF6430 38 A5 6E 1C */ addi r5, r5, action_table@l /* 0x80CF6E1C@l */ -/* 80CF6434 38 C0 00 0D */ li r6, 0xd -/* 80CF6438 38 E0 00 00 */ li r7, 0 -/* 80CF643C 39 00 00 00 */ li r8, 0 -/* 80CF6440 4B 35 19 D1 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 80CF6444 7C 7F 1B 78 */ mr r31, r3 -/* 80CF6448 7F 83 E3 78 */ mr r3, r28 -/* 80CF644C 3C 80 80 CF */ lis r4, l_staffName@ha /* 0x80CF6DB8@ha */ -/* 80CF6450 38 84 6D B8 */ addi r4, r4, l_staffName@l /* 0x80CF6DB8@l */ -/* 80CF6454 80 84 00 00 */ lwz r4, 0(r4) -/* 80CF6458 38 A0 00 00 */ li r5, 0 -/* 80CF645C 38 C0 00 00 */ li r6, 0 -/* 80CF6460 4B 35 16 BD */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80CF6464 90 7B 05 78 */ stw r3, 0x578(r27) -/* 80CF6468 80 1D 05 8C */ lwz r0, 0x58c(r29) -/* 80CF646C 64 00 80 00 */ oris r0, r0, 0x8000 -/* 80CF6470 90 1D 05 8C */ stw r0, 0x58c(r29) -/* 80CF6474 7F 83 E3 78 */ mr r3, r28 -/* 80CF6478 80 9B 05 78 */ lwz r4, 0x578(r27) -/* 80CF647C 4B 35 18 D1 */ bl getIsAddvance__16dEvent_manager_cFi -/* 80CF6480 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF6484 41 82 01 F0 */ beq lbl_80CF6674 -/* 80CF6488 28 1F 00 0C */ cmplwi r31, 0xc -/* 80CF648C 41 81 01 E8 */ bgt lbl_80CF6674 -/* 80CF6490 3C 60 80 CF */ lis r3, lit_4112@ha /* 0x80CF6E84@ha */ -/* 80CF6494 38 63 6E 84 */ addi r3, r3, lit_4112@l /* 0x80CF6E84@l */ -/* 80CF6498 57 E0 10 3A */ slwi r0, r31, 2 -/* 80CF649C 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80CF64A0 7C 09 03 A6 */ mtctr r0 -/* 80CF64A4 4E 80 04 20 */ bctr -lbl_80CF64A8: -/* 80CF64A8 7F 83 E3 78 */ mr r3, r28 -/* 80CF64AC 80 9B 05 78 */ lwz r4, 0x578(r27) -/* 80CF64B0 3C A0 80 CF */ lis r5, d_a_obj_swBallC__stringBase0@ha /* 0x80CF6D08@ha */ -/* 80CF64B4 38 A5 6D 08 */ addi r5, r5, d_a_obj_swBallC__stringBase0@l /* 0x80CF6D08@l */ -/* 80CF64B8 38 A5 00 81 */ addi r5, r5, 0x81 -/* 80CF64BC 38 C0 00 03 */ li r6, 3 -/* 80CF64C0 4B 35 1C 2D */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 80CF64C4 28 03 00 00 */ cmplwi r3, 0 -/* 80CF64C8 40 82 00 10 */ bne lbl_80CF64D8 -/* 80CF64CC 38 00 00 01 */ li r0, 1 -/* 80CF64D0 98 1B 05 80 */ stb r0, 0x580(r27) -/* 80CF64D4 48 00 01 A0 */ b lbl_80CF6674 -lbl_80CF64D8: -/* 80CF64D8 80 03 00 00 */ lwz r0, 0(r3) -/* 80CF64DC 98 1B 05 80 */ stb r0, 0x580(r27) -/* 80CF64E0 48 00 01 94 */ b lbl_80CF6674 -lbl_80CF64E4: -/* 80CF64E4 C0 1E 00 08 */ lfs f0, 8(r30) -/* 80CF64E8 80 7B 05 74 */ lwz r3, 0x574(r27) -/* 80CF64EC D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80CF64F0 48 00 01 84 */ b lbl_80CF6674 -lbl_80CF64F4: -/* 80CF64F4 C0 1E 00 04 */ lfs f0, 4(r30) -/* 80CF64F8 80 7B 05 74 */ lwz r3, 0x574(r27) -/* 80CF64FC D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80CF6500 48 00 01 74 */ b lbl_80CF6674 -lbl_80CF6504: -/* 80CF6504 7F 63 DB 78 */ mr r3, r27 -/* 80CF6508 48 00 03 11 */ bl setLightOnSwB__14daObjSwBallC_cFv -/* 80CF650C 48 00 01 68 */ b lbl_80CF6674 -lbl_80CF6510: -/* 80CF6510 7F 63 DB 78 */ mr r3, r27 -/* 80CF6514 48 00 03 75 */ bl setLightOffSwB__14daObjSwBallC_cFv -/* 80CF6518 48 00 01 5C */ b lbl_80CF6674 -lbl_80CF651C: -/* 80CF651C 7F 63 DB 78 */ mr r3, r27 -/* 80CF6520 48 00 03 D9 */ bl deleteLightBall__14daObjSwBallC_cFv -/* 80CF6524 48 00 01 50 */ b lbl_80CF6674 -lbl_80CF6528: -/* 80CF6528 88 1B 04 E2 */ lbz r0, 0x4e2(r27) -/* 80CF652C 7C 03 07 74 */ extsb r3, r0 -/* 80CF6530 4B 33 6B 3D */ bl dComIfGp_getReverb__Fi -/* 80CF6534 7C 67 1B 78 */ mr r7, r3 -/* 80CF6538 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080221@ha */ -/* 80CF653C 38 03 02 21 */ addi r0, r3, 0x0221 /* 0x00080221@l */ -/* 80CF6540 90 01 00 08 */ stw r0, 8(r1) -/* 80CF6544 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CF6548 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CF654C 80 63 00 00 */ lwz r3, 0(r3) -/* 80CF6550 38 81 00 08 */ addi r4, r1, 8 -/* 80CF6554 38 BB 05 38 */ addi r5, r27, 0x538 -/* 80CF6558 38 C0 00 00 */ li r6, 0 -/* 80CF655C C0 3E 00 08 */ lfs f1, 8(r30) -/* 80CF6560 FC 40 08 90 */ fmr f2, f1 -/* 80CF6564 C0 7E 00 04 */ lfs f3, 4(r30) -/* 80CF6568 FC 80 18 90 */ fmr f4, f3 -/* 80CF656C 39 00 00 00 */ li r8, 0 -/* 80CF6570 4B 5B 54 15 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CF6574 48 00 01 00 */ b lbl_80CF6674 -lbl_80CF6578: -/* 80CF6578 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CF657C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CF6580 80 63 00 00 */ lwz r3, 0(r3) -/* 80CF6584 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 80CF6588 3C 80 02 00 */ lis r4, 0x0200 /* 0x0200005E@ha */ -/* 80CF658C 38 84 00 5E */ addi r4, r4, 0x005E /* 0x0200005E@l */ -/* 80CF6590 4B 5B 96 05 */ bl bgmStreamPrepare__8Z2SeqMgrFUl -/* 80CF6594 38 00 00 37 */ li r0, 0x37 -/* 80CF6598 98 1B 05 85 */ stb r0, 0x585(r27) -/* 80CF659C 7F 63 DB 78 */ mr r3, r27 -/* 80CF65A0 48 00 02 79 */ bl setLightOnSwB__14daObjSwBallC_cFv -/* 80CF65A4 38 60 00 29 */ li r3, 0x29 -/* 80CF65A8 38 80 00 00 */ li r4, 0 -/* 80CF65AC 4B 52 7F 85 */ bl dMeter2Info_setSword__FUcb -/* 80CF65B0 48 00 00 C4 */ b lbl_80CF6674 -lbl_80CF65B4: -/* 80CF65B4 38 00 00 03 */ li r0, 3 -/* 80CF65B8 B0 1D 06 04 */ sth r0, 0x604(r29) -/* 80CF65BC 38 00 00 00 */ li r0, 0 -/* 80CF65C0 90 1D 06 0C */ stw r0, 0x60c(r29) -/* 80CF65C4 38 00 00 02 */ li r0, 2 -/* 80CF65C8 98 1B 05 80 */ stb r0, 0x580(r27) -/* 80CF65CC C0 1E 00 1C */ lfs f0, 0x1c(r30) -/* 80CF65D0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80CF65D4 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80CF65D8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CF65DC C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 80CF65E0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80CF65E4 7F A3 EB 78 */ mr r3, r29 -/* 80CF65E8 38 81 00 0C */ addi r4, r1, 0xc -/* 80CF65EC 38 A0 00 00 */ li r5, 0 -/* 80CF65F0 38 C0 00 00 */ li r6, 0 -/* 80CF65F4 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 80CF65F8 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 80CF65FC 7D 89 03 A6 */ mtctr r12 -/* 80CF6600 4E 80 04 21 */ bctrl -/* 80CF6604 38 00 00 04 */ li r0, 4 -/* 80CF6608 90 1D 06 14 */ stw r0, 0x614(r29) -/* 80CF660C 38 00 00 01 */ li r0, 1 -/* 80CF6610 90 1D 06 0C */ stw r0, 0x60c(r29) -/* 80CF6614 38 00 00 00 */ li r0, 0 -/* 80CF6618 90 1D 06 10 */ stw r0, 0x610(r29) -/* 80CF661C B0 1D 06 0A */ sth r0, 0x60a(r29) -/* 80CF6620 48 00 00 54 */ b lbl_80CF6674 -lbl_80CF6624: -/* 80CF6624 38 00 00 03 */ li r0, 3 -/* 80CF6628 B0 1D 06 04 */ sth r0, 0x604(r29) -/* 80CF662C 38 60 00 00 */ li r3, 0 -/* 80CF6630 90 7D 06 0C */ stw r3, 0x60c(r29) -/* 80CF6634 38 00 00 02 */ li r0, 2 -/* 80CF6638 98 1B 05 80 */ stb r0, 0x580(r27) -/* 80CF663C 38 00 00 04 */ li r0, 4 -/* 80CF6640 90 1D 06 14 */ stw r0, 0x614(r29) -/* 80CF6644 38 00 00 01 */ li r0, 1 -/* 80CF6648 90 1D 06 0C */ stw r0, 0x60c(r29) -/* 80CF664C 90 7D 06 10 */ stw r3, 0x610(r29) -/* 80CF6650 B0 7D 06 0A */ sth r3, 0x60a(r29) -/* 80CF6654 48 00 00 20 */ b lbl_80CF6674 -lbl_80CF6658: -/* 80CF6658 38 00 FF FF */ li r0, -1 -/* 80CF665C 90 1B 05 88 */ stw r0, 0x588(r27) -/* 80CF6660 48 00 00 14 */ b lbl_80CF6674 -lbl_80CF6664: -/* 80CF6664 38 00 00 01 */ li r0, 1 -/* 80CF6668 98 1B 05 84 */ stb r0, 0x584(r27) -/* 80CF666C 38 60 00 49 */ li r3, 0x49 -/* 80CF6670 4B 3A 18 1D */ bl execItemGet__FUc -lbl_80CF6674: -/* 80CF6674 88 1B 05 84 */ lbz r0, 0x584(r27) -/* 80CF6678 28 00 00 00 */ cmplwi r0, 0 -/* 80CF667C 41 82 00 10 */ beq lbl_80CF668C -/* 80CF6680 80 1D 05 90 */ lwz r0, 0x590(r29) -/* 80CF6684 60 00 00 10 */ ori r0, r0, 0x10 -/* 80CF6688 90 1D 05 90 */ stw r0, 0x590(r29) -lbl_80CF668C: -/* 80CF668C 28 1F 00 0C */ cmplwi r31, 0xc -/* 80CF6690 41 81 01 2C */ bgt lbl_80CF67BC -/* 80CF6694 3C 60 80 CF */ lis r3, lit_4113@ha /* 0x80CF6E50@ha */ -/* 80CF6698 38 63 6E 50 */ addi r3, r3, lit_4113@l /* 0x80CF6E50@l */ -/* 80CF669C 57 E0 10 3A */ slwi r0, r31, 2 -/* 80CF66A0 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80CF66A4 7C 09 03 A6 */ mtctr r0 -/* 80CF66A8 4E 80 04 20 */ bctr -lbl_80CF66AC: -/* 80CF66AC 38 7B 05 80 */ addi r3, r27, 0x580 -/* 80CF66B0 48 00 06 01 */ bl func_80CF6CB0 -/* 80CF66B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CF66B8 40 82 01 10 */ bne lbl_80CF67C8 -/* 80CF66BC 7F 83 E3 78 */ mr r3, r28 -/* 80CF66C0 80 9B 05 78 */ lwz r4, 0x578(r27) -/* 80CF66C4 4B 35 1A B9 */ bl cutEnd__16dEvent_manager_cFi -/* 80CF66C8 48 00 01 00 */ b lbl_80CF67C8 -lbl_80CF66CC: -/* 80CF66CC 80 7B 05 74 */ lwz r3, 0x574(r27) -/* 80CF66D0 4B 31 6D 59 */ bl play__14mDoExt_baseAnmFv -/* 80CF66D4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF66D8 41 82 00 F0 */ beq lbl_80CF67C8 -/* 80CF66DC 7F 83 E3 78 */ mr r3, r28 -/* 80CF66E0 80 9B 05 78 */ lwz r4, 0x578(r27) -/* 80CF66E4 4B 35 1A 99 */ bl cutEnd__16dEvent_manager_cFi -/* 80CF66E8 48 00 00 E0 */ b lbl_80CF67C8 -lbl_80CF66EC: -/* 80CF66EC 7F 83 E3 78 */ mr r3, r28 -/* 80CF66F0 80 9B 05 78 */ lwz r4, 0x578(r27) -/* 80CF66F4 4B 35 1A 89 */ bl cutEnd__16dEvent_manager_cFi -/* 80CF66F8 48 00 00 D0 */ b lbl_80CF67C8 -lbl_80CF66FC: -/* 80CF66FC 7F 63 DB 78 */ mr r3, r27 -/* 80CF6700 48 00 02 9D */ bl calcLightBallScale__14daObjSwBallC_cFv -/* 80CF6704 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF6708 41 82 00 C0 */ beq lbl_80CF67C8 -/* 80CF670C 7F 63 DB 78 */ mr r3, r27 -/* 80CF6710 48 00 01 E9 */ bl deleteLightBall__14daObjSwBallC_cFv -/* 80CF6714 7F 83 E3 78 */ mr r3, r28 -/* 80CF6718 80 9B 05 78 */ lwz r4, 0x578(r27) -/* 80CF671C 4B 35 1A 61 */ bl cutEnd__16dEvent_manager_cFi -/* 80CF6720 48 00 00 A8 */ b lbl_80CF67C8 -lbl_80CF6724: -/* 80CF6724 80 7B 05 88 */ lwz r3, 0x588(r27) -/* 80CF6728 3C 03 00 01 */ addis r0, r3, 1 -/* 80CF672C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80CF6730 40 82 00 18 */ bne lbl_80CF6748 -/* 80CF6734 38 60 00 AE */ li r3, 0xae -/* 80CF6738 38 80 03 E8 */ li r4, 0x3e8 -/* 80CF673C 4B 32 97 49 */ bl fopMsgM_messageSet__FUlUl -/* 80CF6740 90 7B 05 88 */ stw r3, 0x588(r27) -/* 80CF6744 48 00 00 84 */ b lbl_80CF67C8 -lbl_80CF6748: -/* 80CF6748 4B 32 92 DD */ bl fopMsgM_SearchByID__FUi -/* 80CF674C 28 03 00 00 */ cmplwi r3, 0 -/* 80CF6750 41 82 00 78 */ beq lbl_80CF67C8 -/* 80CF6754 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80CF6758 28 00 00 0E */ cmplwi r0, 0xe -/* 80CF675C 40 82 00 10 */ bne lbl_80CF676C -/* 80CF6760 38 00 00 10 */ li r0, 0x10 -/* 80CF6764 B0 03 00 F8 */ sth r0, 0xf8(r3) -/* 80CF6768 48 00 00 60 */ b lbl_80CF67C8 -lbl_80CF676C: -/* 80CF676C 28 00 00 12 */ cmplwi r0, 0x12 -/* 80CF6770 40 82 00 58 */ bne lbl_80CF67C8 -/* 80CF6774 38 00 00 13 */ li r0, 0x13 -/* 80CF6778 B0 03 00 F8 */ sth r0, 0xf8(r3) -/* 80CF677C 7F 83 E3 78 */ mr r3, r28 -/* 80CF6780 80 9B 05 78 */ lwz r4, 0x578(r27) -/* 80CF6784 4B 35 19 F9 */ bl cutEnd__16dEvent_manager_cFi -/* 80CF6788 48 00 00 40 */ b lbl_80CF67C8 -lbl_80CF678C: -/* 80CF678C 38 7B 05 80 */ addi r3, r27, 0x580 -/* 80CF6790 48 00 05 21 */ bl func_80CF6CB0 -/* 80CF6794 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CF6798 40 82 00 30 */ bne lbl_80CF67C8 -/* 80CF679C 38 00 00 02 */ li r0, 2 -/* 80CF67A0 B0 1D 06 04 */ sth r0, 0x604(r29) -/* 80CF67A4 38 00 00 01 */ li r0, 1 -/* 80CF67A8 90 1D 06 14 */ stw r0, 0x614(r29) -/* 80CF67AC 7F 83 E3 78 */ mr r3, r28 -/* 80CF67B0 80 9B 05 78 */ lwz r4, 0x578(r27) -/* 80CF67B4 4B 35 19 C9 */ bl cutEnd__16dEvent_manager_cFi -/* 80CF67B8 48 00 00 10 */ b lbl_80CF67C8 -lbl_80CF67BC: -/* 80CF67BC 7F 83 E3 78 */ mr r3, r28 -/* 80CF67C0 80 9B 05 78 */ lwz r4, 0x578(r27) -/* 80CF67C4 4B 35 19 B9 */ bl cutEnd__16dEvent_manager_cFi -lbl_80CF67C8: -/* 80CF67C8 88 7B 05 85 */ lbz r3, 0x585(r27) -/* 80CF67CC 7C 60 07 75 */ extsb. r0, r3 -/* 80CF67D0 41 80 00 2C */ blt lbl_80CF67FC -/* 80CF67D4 38 03 FF FF */ addi r0, r3, -1 -/* 80CF67D8 98 1B 05 85 */ stb r0, 0x585(r27) -/* 80CF67DC 88 1B 05 85 */ lbz r0, 0x585(r27) -/* 80CF67E0 7C 00 07 75 */ extsb. r0, r0 -/* 80CF67E4 40 82 00 18 */ bne lbl_80CF67FC -/* 80CF67E8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CF67EC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CF67F0 80 63 00 00 */ lwz r3, 0(r3) -/* 80CF67F4 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 80CF67F8 4B 5B 96 21 */ bl bgmStreamPlay__8Z2SeqMgrFv -lbl_80CF67FC: -/* 80CF67FC 38 60 00 00 */ li r3, 0 -/* 80CF6800 39 61 00 30 */ addi r11, r1, 0x30 -/* 80CF6804 4B 66 BA 1D */ bl _restgpr_27 -/* 80CF6808 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80CF680C 7C 08 03 A6 */ mtlr r0 -/* 80CF6810 38 21 00 30 */ addi r1, r1, 0x30 -/* 80CF6814 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/draw__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/draw__14daObjSwBallC_cFv.s deleted file mode 100644 index dc9544949e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/draw__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_80CF6A74: -/* 80CF6A74 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80CF6A78 7C 08 02 A6 */ mflr r0 -/* 80CF6A7C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80CF6A80 39 61 00 50 */ addi r11, r1, 0x50 -/* 80CF6A84 4B 66 B7 55 */ bl _savegpr_28 -/* 80CF6A88 7C 7E 1B 78 */ mr r30, r3 -/* 80CF6A8C 3C 60 80 CF */ lis r3, l_color@ha /* 0x80CF6CD4@ha */ -/* 80CF6A90 3B 83 6C D4 */ addi r28, r3, l_color@l /* 0x80CF6CD4@l */ -/* 80CF6A94 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CF6A98 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CF6A9C 38 80 00 00 */ li r4, 0 -/* 80CF6AA0 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CF6AA4 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80CF6AA8 4B 4A CD 1D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CF6AAC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CF6AB0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CF6AB4 80 9E 05 70 */ lwz r4, 0x570(r30) -/* 80CF6AB8 80 84 00 04 */ lwz r4, 4(r4) -/* 80CF6ABC 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CF6AC0 4B 4A E2 E1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CF6AC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF6AC8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF6ACC 80 04 5F 78 */ lwz r0, 0x5f78(r4) -/* 80CF6AD0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80CF6AD4 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80CF6AD8 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CF6ADC 80 04 5F 7C */ lwz r0, 0x5f7c(r4) -/* 80CF6AE0 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CF6AE4 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80CF6AE8 80 63 00 04 */ lwz r3, 4(r3) -/* 80CF6AEC 80 63 00 60 */ lwz r3, 0x60(r3) -/* 80CF6AF0 83 A3 00 00 */ lwz r29, 0(r3) -/* 80CF6AF4 80 7D 00 28 */ lwz r3, 0x28(r29) -/* 80CF6AF8 38 80 00 01 */ li r4, 1 -/* 80CF6AFC 81 83 00 00 */ lwz r12, 0(r3) -/* 80CF6B00 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 80CF6B04 7D 89 03 A6 */ mtctr r12 -/* 80CF6B08 4E 80 04 21 */ bctrl -/* 80CF6B0C 28 03 00 00 */ cmplwi r3, 0 -/* 80CF6B10 41 82 00 8C */ beq lbl_80CF6B9C -/* 80CF6B14 80 7D 00 28 */ lwz r3, 0x28(r29) -/* 80CF6B18 38 80 00 01 */ li r4, 1 -/* 80CF6B1C 81 83 00 00 */ lwz r12, 0(r3) -/* 80CF6B20 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 80CF6B24 7D 89 03 A6 */ mtctr r12 -/* 80CF6B28 4E 80 04 21 */ bctrl -/* 80CF6B2C 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80CF6B30 41 82 00 6C */ beq lbl_80CF6B9C -/* 80CF6B34 38 61 00 08 */ addi r3, r1, 8 -/* 80CF6B38 C0 3C 00 2C */ lfs f1, 0x2c(r28) -/* 80CF6B3C C0 5C 00 30 */ lfs f2, 0x30(r28) -/* 80CF6B40 FC 60 10 90 */ fmr f3, f2 -/* 80CF6B44 FC 80 08 90 */ fmr f4, f1 -/* 80CF6B48 C0 BC 00 08 */ lfs f5, 8(r28) -/* 80CF6B4C FC C0 28 90 */ fmr f6, f5 -/* 80CF6B50 C0 FC 00 18 */ lfs f7, 0x18(r28) -/* 80CF6B54 FD 00 38 90 */ fmr f8, f7 -/* 80CF6B58 4B 65 01 8D */ bl C_MTXLightOrtho -/* 80CF6B5C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF6B60 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF6B64 38 80 40 00 */ li r4, 0x4000 -/* 80CF6B68 4B 31 57 DD */ bl mDoMtx_XrotS__FPA4_fs -/* 80CF6B6C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CF6B70 FC 20 00 50 */ fneg f1, f0 -/* 80CF6B74 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80CF6B78 FC 40 00 50 */ fneg f2, f0 -/* 80CF6B7C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80CF6B80 FC 60 00 50 */ fneg f3, f0 -/* 80CF6B84 4B 31 62 19 */ bl transM__14mDoMtx_stack_cFfff -/* 80CF6B88 38 61 00 08 */ addi r3, r1, 8 -/* 80CF6B8C 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF6B90 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF6B94 38 BD 00 24 */ addi r5, r29, 0x24 -/* 80CF6B98 4B 64 F9 4D */ bl PSMTXConcat -lbl_80CF6B9C: -/* 80CF6B9C 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80CF6BA0 80 83 00 04 */ lwz r4, 4(r3) -/* 80CF6BA4 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80CF6BA8 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80CF6BAC 38 84 00 58 */ addi r4, r4, 0x58 -/* 80CF6BB0 4B 31 6B 29 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80CF6BB4 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80CF6BB8 4B 31 71 0D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CF6BBC 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80CF6BC0 80 63 00 04 */ lwz r3, 4(r3) -/* 80CF6BC4 4B 31 72 2D */ bl mDoExt_btkAnmRemove__FP12J3DModelData -/* 80CF6BC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF6BCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF6BD0 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80CF6BD4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CF6BD8 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80CF6BDC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CF6BE0 38 60 00 01 */ li r3, 1 -/* 80CF6BE4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80CF6BE8 4B 66 B6 3D */ bl _restgpr_28 -/* 80CF6BEC 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80CF6BF0 7C 08 03 A6 */ mtlr r0 -/* 80CF6BF4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80CF6BF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/event_proc_call__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/event_proc_call__14daObjSwBallC_cFv.s deleted file mode 100644 index b447c26d31..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/event_proc_call__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80CF6144: -/* 80CF6144 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6148 7C 08 02 A6 */ mflr r0 -/* 80CF614C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6150 3C 80 80 CF */ lis r4, cNullVec__6Z2Calc@ha /* 0x80CF6D90@ha */ -/* 80CF6154 38 E4 6D 90 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80CF6D90@l */ -/* 80CF6158 3C 80 80 CF */ lis r4, data_80CF6F18@ha /* 0x80CF6F18@ha */ -/* 80CF615C 38 C4 6F 18 */ addi r6, r4, data_80CF6F18@l /* 0x80CF6F18@l */ -/* 80CF6160 88 06 00 00 */ lbz r0, 0(r6) -/* 80CF6164 7C 00 07 75 */ extsb. r0, r0 -/* 80CF6168 40 82 00 70 */ bne lbl_80CF61D8 -/* 80CF616C 80 87 00 2C */ lwz r4, 0x2c(r7) -/* 80CF6170 80 07 00 30 */ lwz r0, 0x30(r7) -/* 80CF6174 90 87 00 5C */ stw r4, 0x5c(r7) -/* 80CF6178 90 07 00 60 */ stw r0, 0x60(r7) -/* 80CF617C 80 07 00 34 */ lwz r0, 0x34(r7) -/* 80CF6180 90 07 00 64 */ stw r0, 0x64(r7) -/* 80CF6184 38 A7 00 5C */ addi r5, r7, 0x5c -/* 80CF6188 80 87 00 38 */ lwz r4, 0x38(r7) -/* 80CF618C 80 07 00 3C */ lwz r0, 0x3c(r7) -/* 80CF6190 90 85 00 0C */ stw r4, 0xc(r5) -/* 80CF6194 90 05 00 10 */ stw r0, 0x10(r5) -/* 80CF6198 80 07 00 40 */ lwz r0, 0x40(r7) -/* 80CF619C 90 05 00 14 */ stw r0, 0x14(r5) -/* 80CF61A0 80 87 00 44 */ lwz r4, 0x44(r7) -/* 80CF61A4 80 07 00 48 */ lwz r0, 0x48(r7) -/* 80CF61A8 90 85 00 18 */ stw r4, 0x18(r5) -/* 80CF61AC 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80CF61B0 80 07 00 4C */ lwz r0, 0x4c(r7) -/* 80CF61B4 90 05 00 20 */ stw r0, 0x20(r5) -/* 80CF61B8 80 87 00 50 */ lwz r4, 0x50(r7) -/* 80CF61BC 80 07 00 54 */ lwz r0, 0x54(r7) -/* 80CF61C0 90 85 00 24 */ stw r4, 0x24(r5) -/* 80CF61C4 90 05 00 28 */ stw r0, 0x28(r5) -/* 80CF61C8 80 07 00 58 */ lwz r0, 0x58(r7) -/* 80CF61CC 90 05 00 2C */ stw r0, 0x2c(r5) -/* 80CF61D0 38 00 00 01 */ li r0, 1 -/* 80CF61D4 98 06 00 00 */ stb r0, 0(r6) -lbl_80CF61D8: -/* 80CF61D8 88 03 05 7F */ lbz r0, 0x57f(r3) -/* 80CF61DC 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80CF61E0 39 87 00 5C */ addi r12, r7, 0x5c -/* 80CF61E4 7D 8C 02 14 */ add r12, r12, r0 -/* 80CF61E8 4B 66 BE 9D */ bl __ptmf_scall -/* 80CF61EC 60 00 00 00 */ nop -/* 80CF61F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF61F4 7C 08 03 A6 */ mtlr r0 -/* 80CF61F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF61FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/execute__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/execute__14daObjSwBallC_cFv.s deleted file mode 100644 index 066e9dbf36..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/execute__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80CF6120: -/* 80CF6120 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6124 7C 08 02 A6 */ mflr r0 -/* 80CF6128 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF612C 48 00 00 19 */ bl event_proc_call__14daObjSwBallC_cFv -/* 80CF6130 38 60 00 01 */ li r3, 1 -/* 80CF6134 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6138 7C 08 03 A6 */ mtlr r0 -/* 80CF613C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF6140 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF606C.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF606C.s deleted file mode 100644 index d63eea49e8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF606C.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80CF606C: -/* 80CF606C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF6070 7C 08 02 A6 */ mflr r0 -/* 80CF6074 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF6078 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF607C 93 C1 00 08 */ stw r30, 8(r1) -/* 80CF6080 7C 7E 1B 78 */ mr r30, r3 -/* 80CF6084 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CF6088 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CF608C 40 82 00 1C */ bne lbl_80CF60A8 -/* 80CF6090 28 1E 00 00 */ cmplwi r30, 0 -/* 80CF6094 41 82 00 08 */ beq lbl_80CF609C -/* 80CF6098 4B 32 2A CD */ bl __ct__10fopAc_ac_cFv -lbl_80CF609C: -/* 80CF609C 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80CF60A0 60 00 00 08 */ ori r0, r0, 8 -/* 80CF60A4 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80CF60A8: -/* 80CF60A8 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80CF60AC 3C 80 80 CF */ lis r4, l_arcName@ha /* 0x80CF6DB0@ha */ -/* 80CF60B0 38 84 6D B0 */ addi r4, r4, l_arcName@l /* 0x80CF6DB0@l */ -/* 80CF60B4 80 84 00 00 */ lwz r4, 0(r4) -/* 80CF60B8 4B 33 6E 05 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CF60BC 7C 7F 1B 78 */ mr r31, r3 -/* 80CF60C0 2C 1F 00 04 */ cmpwi r31, 4 -/* 80CF60C4 40 82 00 40 */ bne lbl_80CF6104 -/* 80CF60C8 7F C3 F3 78 */ mr r3, r30 -/* 80CF60CC 3C 80 80 CF */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x80CF5B98@ha */ -/* 80CF60D0 38 84 5B 98 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x80CF5B98@l */ -/* 80CF60D4 38 A0 09 60 */ li r5, 0x960 -/* 80CF60D8 4B 32 43 D9 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80CF60DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CF60E0 40 82 00 0C */ bne lbl_80CF60EC -/* 80CF60E4 38 60 00 05 */ li r3, 5 -/* 80CF60E8 48 00 00 20 */ b lbl_80CF6108 -lbl_80CF60EC: -/* 80CF60EC 7F C3 F3 78 */ mr r3, r30 -/* 80CF60F0 4B FF FC 69 */ bl Create__14daObjSwBallC_cFv -/* 80CF60F4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF60F8 40 82 00 0C */ bne lbl_80CF6104 -/* 80CF60FC 38 60 00 05 */ li r3, 5 -/* 80CF6100 48 00 00 08 */ b lbl_80CF6108 -lbl_80CF6104: -/* 80CF6104 7F E3 FB 78 */ mr r3, r31 -lbl_80CF6108: -/* 80CF6108 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF610C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CF6110 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF6114 7C 08 03 A6 */ mtlr r0 -/* 80CF6118 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF611C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF6CB0.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF6CB0.s deleted file mode 100644 index b80705cafa..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF6CB0.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF6CB0: -/* 80CF6CB0 88 83 00 00 */ lbz r4, 0(r3) -/* 80CF6CB4 28 04 00 00 */ cmplwi r4, 0 -/* 80CF6CB8 41 82 00 0C */ beq lbl_80CF6CC4 -/* 80CF6CBC 38 04 FF FF */ addi r0, r4, -1 -/* 80CF6CC0 98 03 00 00 */ stb r0, 0(r3) -lbl_80CF6CC4: -/* 80CF6CC4 88 63 00 00 */ lbz r3, 0(r3) -/* 80CF6CC8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/initBaseMtx__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/initBaseMtx__14daObjSwBallC_cFv.s deleted file mode 100644 index ddc3119b8f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/initBaseMtx__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF5CD4: -/* 80CF5CD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF5CD8 7C 08 02 A6 */ mflr r0 -/* 80CF5CDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF5CE0 48 00 00 15 */ bl setBaseMtx__14daObjSwBallC_cFv -/* 80CF5CE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF5CE8 7C 08 03 A6 */ mtlr r0 -/* 80CF5CEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF5CF0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_ballA_sub__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_ballA_sub__FPvPv.s deleted file mode 100644 index 20638e678f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_ballA_sub__FPvPv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80CF5C24: -/* 80CF5C24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF5C28 7C 08 02 A6 */ mflr r0 -/* 80CF5C2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF5C30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF5C34 7C 7F 1B 78 */ mr r31, r3 -/* 80CF5C38 4B 32 30 A9 */ bl fopAc_IsActor__FPv -/* 80CF5C3C 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF5C40 41 82 00 24 */ beq lbl_80CF5C64 -/* 80CF5C44 A8 1F 00 08 */ lha r0, 8(r31) -/* 80CF5C48 2C 00 02 FC */ cmpwi r0, 0x2fc -/* 80CF5C4C 40 82 00 18 */ bne lbl_80CF5C64 -/* 80CF5C50 88 1F 0C F0 */ lbz r0, 0xcf0(r31) -/* 80CF5C54 2C 00 00 08 */ cmpwi r0, 8 -/* 80CF5C58 40 82 00 0C */ bne lbl_80CF5C64 -/* 80CF5C5C 7F E3 FB 78 */ mr r3, r31 -/* 80CF5C60 48 00 00 08 */ b lbl_80CF5C68 -lbl_80CF5C64: -/* 80CF5C64 38 60 00 00 */ li r3, 0 -lbl_80CF5C68: -/* 80CF5C68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF5C6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF5C70 7C 08 03 A6 */ mtlr r0 -/* 80CF5C74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF5C78 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_ballB_sub__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_ballB_sub__FPvPv.s deleted file mode 100644 index 0d42cf11ab..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_ballB_sub__FPvPv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80CF5C7C: -/* 80CF5C7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF5C80 7C 08 02 A6 */ mflr r0 -/* 80CF5C84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF5C88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF5C8C 7C 7F 1B 78 */ mr r31, r3 -/* 80CF5C90 4B 32 30 51 */ bl fopAc_IsActor__FPv -/* 80CF5C94 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF5C98 41 82 00 24 */ beq lbl_80CF5CBC -/* 80CF5C9C A8 1F 00 08 */ lha r0, 8(r31) -/* 80CF5CA0 2C 00 02 FC */ cmpwi r0, 0x2fc -/* 80CF5CA4 40 82 00 18 */ bne lbl_80CF5CBC -/* 80CF5CA8 88 1F 0C F0 */ lbz r0, 0xcf0(r31) -/* 80CF5CAC 2C 00 00 09 */ cmpwi r0, 9 -/* 80CF5CB0 40 82 00 0C */ bne lbl_80CF5CBC -/* 80CF5CB4 7F E3 FB 78 */ mr r3, r31 -/* 80CF5CB8 48 00 00 08 */ b lbl_80CF5CC0 -lbl_80CF5CBC: -/* 80CF5CBC 38 60 00 00 */ li r3, 0 -lbl_80CF5CC0: -/* 80CF5CC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF5CC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF5CC8 7C 08 03 A6 */ mtlr r0 -/* 80CF5CCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF5CD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_swb_sub__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_swb_sub__FPvPv.s deleted file mode 100644 index 3391250e46..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_swb_sub__FPvPv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CF5BB8: -/* 80CF5BB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF5BBC 7C 08 02 A6 */ mflr r0 -/* 80CF5BC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF5BC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF5BC8 93 C1 00 08 */ stw r30, 8(r1) -/* 80CF5BCC 7C 7E 1B 78 */ mr r30, r3 -/* 80CF5BD0 7C 9F 23 78 */ mr r31, r4 -/* 80CF5BD4 4B 32 31 0D */ bl fopAc_IsActor__FPv -/* 80CF5BD8 2C 03 00 00 */ cmpwi r3, 0 -/* 80CF5BDC 41 82 00 2C */ beq lbl_80CF5C08 -/* 80CF5BE0 A8 1E 00 08 */ lha r0, 8(r30) -/* 80CF5BE4 2C 00 01 9A */ cmpwi r0, 0x19a -/* 80CF5BE8 40 82 00 20 */ bne lbl_80CF5C08 -/* 80CF5BEC 88 7F 05 82 */ lbz r3, 0x582(r31) -/* 80CF5BF0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80CF5BF4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80CF5BF8 7C 03 00 40 */ cmplw r3, r0 -/* 80CF5BFC 40 82 00 0C */ bne lbl_80CF5C08 -/* 80CF5C00 7F C3 F3 78 */ mr r3, r30 -/* 80CF5C04 48 00 00 08 */ b lbl_80CF5C0C -lbl_80CF5C08: -/* 80CF5C08 38 60 00 00 */ li r3, 0 -lbl_80CF5C0C: -/* 80CF5C0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF5C10 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CF5C14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF5C18 7C 08 03 A6 */ mtlr r0 -/* 80CF5C1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF5C20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setBaseMtx__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setBaseMtx__14daObjSwBallC_cFv.s deleted file mode 100644 index 0a255860eb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setBaseMtx__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CF5CF4: -/* 80CF5CF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF5CF8 7C 08 02 A6 */ mflr r0 -/* 80CF5CFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF5D00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF5D04 7C 7F 1B 78 */ mr r31, r3 -/* 80CF5D08 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF5D0C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF5D10 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CF5D14 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CF5D18 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CF5D1C 4B 65 0B CD */ bl PSMTXTrans -/* 80CF5D20 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF5D24 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF5D28 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80CF5D2C 4B 31 67 09 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CF5D30 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF5D34 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF5D38 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80CF5D3C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CF5D40 4B 65 07 71 */ bl PSMTXCopy -/* 80CF5D44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF5D48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF5D4C 7C 08 03 A6 */ mtlr r0 -/* 80CF5D50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF5D54 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setLightOffSwB__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setLightOffSwB__14daObjSwBallC_cFv.s deleted file mode 100644 index f49222a3aa..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setLightOffSwB__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80CF6888: -/* 80CF6888 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CF688C 7C 08 02 A6 */ mflr r0 -/* 80CF6890 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CF6894 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF6898 4B 66 B9 41 */ bl _savegpr_28 -/* 80CF689C 7C 7C 1B 78 */ mr r28, r3 -/* 80CF68A0 3B A0 00 00 */ li r29, 0 -/* 80CF68A4 3C 60 80 CF */ lis r3, s_swb_sub__FPvPv@ha /* 0x80CF5BB8@ha */ -/* 80CF68A8 3B C3 5B B8 */ addi r30, r3, s_swb_sub__FPvPv@l /* 0x80CF5BB8@l */ -/* 80CF68AC 3B E0 00 01 */ li r31, 1 -/* 80CF68B0 48 00 00 24 */ b lbl_80CF68D4 -lbl_80CF68B4: -/* 80CF68B4 9B BC 05 82 */ stb r29, 0x582(r28) -/* 80CF68B8 7F C3 F3 78 */ mr r3, r30 -/* 80CF68BC 7F 84 E3 78 */ mr r4, r28 -/* 80CF68C0 4B 32 AA 79 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80CF68C4 28 03 00 00 */ cmplwi r3, 0 -/* 80CF68C8 41 82 00 08 */ beq lbl_80CF68D0 -/* 80CF68CC 9B E3 05 AD */ stb r31, 0x5ad(r3) -lbl_80CF68D0: -/* 80CF68D0 3B BD 00 01 */ addi r29, r29, 1 -lbl_80CF68D4: -/* 80CF68D4 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80CF68D8 28 00 00 06 */ cmplwi r0, 6 -/* 80CF68DC 41 80 FF D8 */ blt lbl_80CF68B4 -/* 80CF68E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF68E4 4B 66 B9 41 */ bl _restgpr_28 -/* 80CF68E8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CF68EC 7C 08 03 A6 */ mtlr r0 -/* 80CF68F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CF68F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setLightOnSwB__14daObjSwBallC_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setLightOnSwB__14daObjSwBallC_cFv.s deleted file mode 100644 index cbaba525f1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setLightOnSwB__14daObjSwBallC_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80CF6818: -/* 80CF6818 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CF681C 7C 08 02 A6 */ mflr r0 -/* 80CF6820 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CF6824 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF6828 4B 66 B9 B1 */ bl _savegpr_28 -/* 80CF682C 7C 7C 1B 78 */ mr r28, r3 -/* 80CF6830 3B A0 00 00 */ li r29, 0 -/* 80CF6834 3C 60 80 CF */ lis r3, s_swb_sub__FPvPv@ha /* 0x80CF5BB8@ha */ -/* 80CF6838 3B C3 5B B8 */ addi r30, r3, s_swb_sub__FPvPv@l /* 0x80CF5BB8@l */ -/* 80CF683C 3B E0 00 01 */ li r31, 1 -/* 80CF6840 48 00 00 24 */ b lbl_80CF6864 -lbl_80CF6844: -/* 80CF6844 9B BC 05 82 */ stb r29, 0x582(r28) -/* 80CF6848 7F C3 F3 78 */ mr r3, r30 -/* 80CF684C 7F 84 E3 78 */ mr r4, r28 -/* 80CF6850 4B 32 AA E9 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80CF6854 28 03 00 00 */ cmplwi r3, 0 -/* 80CF6858 41 82 00 08 */ beq lbl_80CF6860 -/* 80CF685C 9B E3 05 AC */ stb r31, 0x5ac(r3) -lbl_80CF6860: -/* 80CF6860 3B BD 00 01 */ addi r29, r29, 1 -lbl_80CF6864: -/* 80CF6864 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80CF6868 28 00 00 06 */ cmplwi r0, 6 -/* 80CF686C 41 80 FF D8 */ blt lbl_80CF6844 -/* 80CF6870 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF6874 4B 66 B9 B1 */ bl _restgpr_28 -/* 80CF6878 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CF687C 7C 08 03 A6 */ mtlr r0 -/* 80CF6880 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CF6884 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index c0dc55a6b0..d6993d8f33 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -830,6 +830,7 @@ public: void i_offPlayerNoDraw() { i_offNoResetFlg0(FLG0_PLAYER_NO_DRAW); } void i_onPushPullKeep() { i_onNoResetFlg0(FLG0_PUSH_PULL_KEEP); } void i_offPushPullKeep() { i_offNoResetFlg0(FLG0_PUSH_PULL_KEEP); } + void onLightSwordGetEffect() { i_onEndResetFlg2(FLG2_UNK_10); } u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 75eb46954e..0a44f91267 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -626,6 +626,7 @@ void mDoExt_brkAnmRemove(J3DModelData* i_modelData); void mDoExt_setupStageTexture(J3DModelData* i_modelData); OSThread* mDoExt_GetCurrentRunningThread(); void mDoExt_setupShareTexture(J3DModelData* i_modelData, J3DModelData* i_shareModelData); +void mDoExt_btkAnmRemove(J3DModelData* i_modelData); struct JUTFont; JUTFont* mDoExt_getMesgFont(); diff --git a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h index ca6be2cdf0..4e446a39f6 100644 --- a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h +++ b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h @@ -202,6 +202,9 @@ public: u8 getSaveID() { return getItemNo(); } u32 getSetType() { return (u32)(field_0xd18 << 16) >> 29;} // fake match? s8 prm_chk_type_ironball() { return (s8)(getType() == TYPE_IRON_BALL); } + s8 prm_chk_type_lightball() { return (getType() == TYPE_BALL_S || getType() == TYPE_BALL_S_2); } + void startCtrl() { mCtrl = 1; } + void endCtrl() { mCtrl = 0; } static void make_prm(csXyz* param_1, u8 param_2, u8 param_3, u8 param_4, u8 param_5, u8 param_6=0) { param_1->x = (param_4 << 8) | param_3; diff --git a/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h b/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h index 64dab25052..57dfefbdda 100644 --- a/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h +++ b/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h @@ -2,25 +2,51 @@ #define D_A_OBJ_SWBALLA_H #include "f_op/f_op_actor_mng.h" +#include "d/event/d_event_lib.h" -class daObjSwBallA_c { +// dEvLib_callback_c is not generated at the correct location. +class daObjSwBallA_c : public fopAc_ac_c /*, public dEvLib_callback_c*/ { public: - /* 80CF3394 */ void checkArea_sub(fopAc_ac_c*); + //daObjSwBallA_c() : dEvLib_callback_c(this) {} + /* 80CF3394 */ int checkArea_sub(fopAc_ac_c*); /* 80CF34E4 */ void search_ball(); /* 80CF3610 */ void initBaseMtx(); /* 80CF3630 */ void setBaseMtx(); - /* 80CF3694 */ void Create(); - /* 80CF37FC */ void CreateHeap(); - /* 80CF3970 */ void create(); - /* 80CF3A90 */ void execute(); + /* 80CF3694 */ int Create(); + /* 80CF37FC */ int CreateHeap(); + /* 80CF3970 */ int create(); + /* 80CF3A90 */ int execute(); /* 80CF3B40 */ void actionRun(); /* 80CF3D80 */ void actionStop(); /* 80CF3D84 */ void PutCrrPos(); - /* 80CF406C */ void draw(); - /* 80CF41F4 */ void _delete(); + /* 80CF406C */ int draw(); + /* 80CF41F4 */ int _delete(); /* 80CF4354 */ ~daObjSwBallA_c(); - u32 getSwbit() { return fopAcM_GetParamBit(this,0x10,8); } + u32 getArg0() { return fopAcM_GetParamBit(this, 0, 8); } + u32 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); } + u32 getSwbit() { return fopAcM_GetParamBit(this, 16, 8); } + u32 getType() { return fopAcM_GetParamBit(this, 24, 4); } + u8 getEvent() { return field_0x5c6; } + void clrFlag(u8 idx) { field_0x5af[idx] = 0; } + void onFlag(u8 idx, u8 val) { field_0x5af[idx] |= val; } + u8 checkFlag(u8 idx, u8 val) { return field_0x5af[idx] & val; } + + u8 dEvLib_callback_c_filler[0x14]; + /* 0x57C */ request_of_phase_process_class field_0x57c; + /* 0x584 */ J3DModel* mModel; + /* 0x588 */ mDoExt_btkAnm* field_0x588; + /* 0x58C */ u32 field_0x58c[8]; + /* 0x5AC */ u8 field_0x5ac; + /* 0x5AD */ u8 field_0x5ad; + /* 0x5AE */ u8 field_0x5ae; + /* 0x5AF */ u8 field_0x5af[8]; + /* 0x5B7 */ u8 field_0x5b7[8]; + /* 0x5C0 */ u32 field_0x5c0; + /* 0x5C4 */ u8 field_0x5c4; + /* 0x5C5 */ u8 field_0x5c5; + /* 0x5C6 */ u16 field_0x5c6; + /* 0x5C8 */ u16 field_0x5c8; }; #endif /* D_A_OBJ_SWBALLA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h b/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h index 99a4732717..d277490f54 100644 --- a/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h +++ b/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h @@ -2,25 +2,57 @@ #define D_A_OBJ_SWBALLB_H #include "f_op/f_op_actor_mng.h" +#include "d/event/d_event_lib.h" -class daObjSwBallB_c { +class daObjSwBallB_c : public fopAc_ac_c { //, public dEvLib_callback_c { public: - /* 80CF466C */ void checkArea_sub(fopAc_ac_c*); + //daObjSwBallB_c() : dEvLib_callback_c(this) {} + /* 80CF466C */ int checkArea_sub(fopAc_ac_c*); /* 80CF47BC */ void search_ball(); /* 80CF496C */ void initBaseMtx(); /* 80CF498C */ void setBaseMtx(); - /* 80CF49F0 */ void Create(); - /* 80CF4B74 */ void CreateHeap(); - /* 80CF4CE8 */ void create(); - /* 80CF4E08 */ void execute(); + /* 80CF49F0 */ int Create(); + /* 80CF4B74 */ int CreateHeap(); + /* 80CF4CE8 */ int create(); + /* 80CF4E08 */ int execute(); /* 80CF4EB8 */ void actionRun(); /* 80CF5384 */ void actionStop(); /* 80CF5388 */ void PutCrrPos(); - /* 80CF56A4 */ void draw(); - /* 80CF582C */ void _delete(); + /* 80CF56A4 */ int draw(); + /* 80CF582C */ int _delete(); /* 80CF5940 */ ~daObjSwBallB_c(); - s32 getID() { return fopAcM_GetParamBit(this,0,8); } + s32 getID() { return fopAcM_GetParamBit(this, 0, 8); } + u32 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); } + u32 getSwbit() { return fopAcM_GetParamBit(this, 16, 8); } + u32 getType() { return fopAcM_GetParamBit(this, 24, 4); } + u32 getArg1() { return fopAcM_GetParamBit(this, 28, 4); } + u8 getEvent() { return field_0x5a2; } + void clrFlag(u8 idx) { field_0x597[idx] = 0; } + void onFlag(u8 idx, u8 val) { field_0x597[idx] |= val; } + u8 checkFlag(u8 idx, u8 val) { return field_0x597[idx] & val; } + void setLightOn() { field_0x5ac = 1; } + void setLightOff() { field_0x5ad = 1; } + + u8 dEvLib_callback_c_filler[0x14]; + /* 0x57C */ request_of_phase_process_class field_0x57c; + /* 0x584 */ J3DModel* mModel; + /* 0x588 */ mDoExt_btkAnm* field_0x588; + /* 0x58C */ u32 field_0x58c[2]; + /* 0x594 */ u8 field_0x594; + /* 0x595 */ u8 field_0x595; + /* 0x596 */ u8 field_0x596; + /* 0x597 */ u8 field_0x597[2]; + /* 0x598 */ u8 field_0x599[2]; + /* 0x59C */ u32 field_0x59c; + /* 0x5A0 */ u8 field_0x5a0; + /* 0x5A1 */ u8 field_0x5a1; + /* 0x5A2 */ u16 field_0x5a2; + /* 0x5A4 */ u16 field_0x5a4; + /* 0x5A6 */ u16 field_0x5a6; + /* 0x5A8 */ int field_0x5a8; + /* 0x5AC */ u8 field_0x5ac; + /* 0x5AD */ u8 field_0x5ad; }; #endif /* D_A_OBJ_SWBALLB_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h b/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h index cc1649c224..d843e70cd8 100644 --- a/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h +++ b/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h @@ -1,6 +1,48 @@ #ifndef D_A_OBJ_SWBALLC_H #define D_A_OBJ_SWBALLC_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +struct daObjSwBallC_c : public fopAc_ac_c { + /* 80CF5CD4 */ void initBaseMtx(); + /* 80CF5CF4 */ void setBaseMtx(); + /* 80CF5D58 */ int Create(); + /* 80CF5EF8 */ int CreateHeap(); + /* 80CF606C */ int create(); + /* 80CF6120 */ int execute(); + /* 80CF6144 */ void event_proc_call(); + /* 80CF6200 */ void actionWait(); + /* 80CF629C */ void actionOrderEvent(); + /* 80CF6344 */ void actionEvent(); + /* 80CF63F0 */ void actionDead(); + /* 80CF63F4 */ int demoProc(); + /* 80CF6818 */ void setLightOnSwB(); + /* 80CF6888 */ void setLightOffSwB(); + /* 80CF68F8 */ void deleteLightBall(); + /* 80CF692C */ void deleteLightBallA(); + /* 80CF6964 */ void deleteLightBallB(); + /* 80CF699C */ int calcLightBallScale(); + /* 80CF6A74 */ int draw(); + /* 80CF6BFC */ int _delete(); + + void setAction(u8 action) { field_0x57f = action; } + + /* 0x568 */ request_of_phase_process_class field_0x568; + /* 0x570 */ J3DModel* mModel; + /* 0x574 */ mDoExt_btkAnm* field_0x574; + /* 0x578 */ u32 field_0x578; + /* 0x57C */ s16 field_0x57c; + /* 0x57E */ u8 field_0x57e; + /* 0x57F */ u8 field_0x57f; + /* 0x580 */ u8 field_0x580; + /* 0x581 */ u8 field_0x581; + /* 0x582 */ u8 field_0x582; + /* 0x583 */ u8 field_0x583; + /* 0x584 */ u8 field_0x584; + /* 0x585 */ s8 field_0x585; + /* 0x586 */ u8 field_0x586; + /* 0x587 */ u8 field_0x587; + /* 0x588 */ u32 field_0x588; +}; #endif /* D_A_OBJ_SWBALLC_H */ diff --git a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp index f26dbf8d8f..dcfdbaf864 100644 --- a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp +++ b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp @@ -4,90 +4,13 @@ // #include "rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h" +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" +#include "d/d_lib.h" +#include "d/a/d_a_player.h" +#include "f_pc/f_pc_executor.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "dol2asm.h" -// -// Types: -// - -// struct request_of_phase_process_class {}; - -// struct mDoMtx_stack_c { -// /* 8000CD9C */ void transM(f32, f32, f32); - -// static u8 now[48]; -// }; - -// struct J3DMaterialTable {}; - -// struct J3DAnmTextureSRTKey {}; - -// struct mDoExt_btkAnm { -// /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); -// /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -// }; - -// struct mDoExt_baseAnm { -// /* 8000D428 */ void play(); -// }; - -// struct fopAc_ac_c { -// /* 80018B64 */ fopAc_ac_c(); -// /* 80018C8C */ ~fopAc_ac_c(); -// }; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -// struct dKy_tevstr_c {}; - -// struct J3DModelData {}; - -// struct cXyz {}; - -// struct dScnKy_env_light_c { -// /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); -// /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -// }; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80CF42F4 */ ~dEvLib_callback_c(); - /* 80CF433C */ bool eventStart(); - /* 80CF4344 */ bool eventRun(); - /* 80CF434C */ bool eventEnd(); -}; - -// struct JAISoundID {}; - -// struct Vec {}; - -// 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 J3DModel {}; - -// struct J3DFrameCtrl { -// /* 803283FC */ void init(s16); -// /* 80CF3928 */ ~J3DFrameCtrl(); -// }; - // // Forward References: // @@ -161,21 +84,12 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -// extern "C" void PSMTXCopy(); -// extern "C" void PSMTXConcat(); -// extern "C" void PSMTXTrans(); -// extern "C" void C_MTXLightOrtho(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_22(); extern "C" void _savegpr_28(); extern "C" void _restgpr_22(); extern "C" void _restgpr_28(); -// 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 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -184,34 +98,32 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80CF4508-80CF4528 000000 0020+00 2/2 0/0 0/0 .bss l_target_info */ -static u8 l_target_info[32]; +static daObjCarry_c* l_target_info[8]; /* 80CF4528-80CF452C 000020 0004+00 2/2 0/0 0/0 .bss l_target_info_count */ -static u8 l_target_info_count[4]; +static int l_target_info_count; /* 80CF32F8-80CF3374 000078 007C+00 1/1 0/0 0/0 .text s_ball_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void s_ball_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/s_ball_sub__FPvPv.s" +static void* s_ball_sub(void* param_1, void* param_2) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_LV8_BALL) + { + if (l_target_info_count < 8) { + l_target_info[l_target_info_count] = (daObjCarry_c*)param_1; + l_target_info_count++; + } + } + return NULL; } -#pragma pop /* 80CF3374-80CF3394 0000F4 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_swBallA/d_a_obj_swBallA/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* param_0) { + return ((daObjSwBallA_c*)param_0)->CreateHeap(); } -#pragma pop /* ############################################################################################## */ /* 80CF43E4-80CF43E8 000000 0004+00 4/4 0/0 0/0 .rodata l_color */ -SECTION_RODATA static u32 const l_color = 0x0396FFFF; +SECTION_RODATA static GXColor const l_color = {0x3,0x96,0xFF,0xFF}; COMPILER_STRIP_GATE(0x80CF43E4, &l_color); /* 80CF43E8-80CF43EC 000004 0004+00 0/2 0/0 0/0 .rodata @3730 */ @@ -251,44 +163,87 @@ COMPILER_STRIP_GATE(0x80CF43F4, &lit_3733); /* 80CF3394-80CF34E4 000114 0150+00 1/1 0/0 0/0 .text * checkArea_sub__14daObjSwBallA_cFP10fopAc_ac_c */ +// Matches with literals +#ifdef NONMATCHING +int daObjSwBallA_c::checkArea_sub(fopAc_ac_c* param_1) { + if (param_1 == NULL) { + return 0; + } + if (getType() == 0) { + if (param_1->current.pos.y >= current.pos.y - 10.0f && + param_1->current.pos.y < current.pos.y + mScale.y * 100.0f && + fopAcM_searchActorDistanceXZ(this, param_1) < mScale.x * 100.0f) + { + return 1; + } + } else { + if (getType() == 1) { + cXyz cStack_1c(mScale.x * -100.0f, 0.0f, mScale.z * -100.0f); + cXyz cStack_28(mScale.x * 100.0f, mScale.y * 100.0f, mScale.z * 100.0f); + cStack_1c.y += current.pos.y - 10.0f; + cStack_28.y += current.pos.y; + if (param_1->current.pos.y >= cStack_1c.y && param_1->current.pos.y < cStack_28.y && + dLib_checkActorInRectangle(param_1, this, &cStack_1c, &cStack_28)) + { + return 1; + } + } + } + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallA_c::checkArea_sub(fopAc_ac_c* param_0) { +asm int daObjSwBallA_c::checkArea_sub(fopAc_ac_c* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/checkArea_sub__14daObjSwBallA_cFP10fopAc_ac_c.s" } #pragma pop +#endif /* 80CF34E4-80CF3610 000264 012C+00 1/1 0/0 0/0 .text search_ball__14daObjSwBallA_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallA_c::search_ball() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/search_ball__14daObjSwBallA_cFv.s" +void daObjSwBallA_c::search_ball() { + l_target_info_count = 0; + for (int i = 0; i < 8; i++) { + l_target_info[i] = NULL; + } + i_fpcM_Search(s_ball_sub, this); + for (int i = 0; i < l_target_info_count; i++) { + if (l_target_info[i] != 0) { + u32 id = fopAcM_GetID(l_target_info[i]); + if (id != -1) { + int idIndex = -1; + for (int j = 0; j < 8; j++) { + if (id == field_0x58c[j]) { + idIndex = j; + break; + } + } + if (idIndex < 0) { + for (int j = 0; j < 8; j++) { + if (field_0x58c[j] == -1) { + field_0x58c[j] = id; + break; + } + } + } + } + } + } } -#pragma pop /* 80CF3610-80CF3630 000390 0020+00 1/1 0/0 0/0 .text initBaseMtx__14daObjSwBallA_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallA_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/initBaseMtx__14daObjSwBallA_cFv.s" +void daObjSwBallA_c::initBaseMtx() { + setBaseMtx(); } -#pragma pop /* 80CF3630-80CF3694 0003B0 0064+00 1/1 0/0 0/0 .text setBaseMtx__14daObjSwBallA_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallA_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/setBaseMtx__14daObjSwBallA_cFv.s" +void daObjSwBallA_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop /* ############################################################################################## */ /* 80CF43FC-80CF4404 000018 0008+00 1/1 0/0 0/0 .rodata @3884 */ @@ -298,14 +253,43 @@ SECTION_RODATA static u8 const lit_3884[8] = { COMPILER_STRIP_GATE(0x80CF43FC, &lit_3884); /* 80CF3694-80CF37FC 000414 0168+00 1/1 0/0 0/0 .text Create__14daObjSwBallA_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daObjSwBallA_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + J3DJoint* joint = mModel->getModelData()->getJointNodePointer(0); + fopAcM_setCullSizeBox(this, + joint->getMin()->x, joint->getMin()->y, joint->getMin()->z, + joint->getMax()->x, joint->getMax()->y, joint->getMax()->z); + for (int i = 0; i < 8; i++) { + field_0x58c[i] = -1; + } + field_0x5c0 = -1; + if (i_fopAcM_isSwitch(this, getSwbit2())) { + field_0x588->setFrame(field_0x588->getEndFrame()); + field_0x5ae = 2; + } else { + i_fopAcM_offSwitch(this, getSwbit()); + field_0x588->setFrame(0.0f); + field_0x5ae = 0; + } + GXColor* color = mModel->getModelData()->getMaterialNodePointer(0)->getTevKColor(1); + color->r = l_color.r; + color->g = l_color.g; + color->b = l_color.b; + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallA_c::Create() { +asm int daObjSwBallA_c::Create() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/Create__14daObjSwBallA_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80CF4404-80CF4408 000020 0004+00 2/3 0/0 0/0 .rodata @3918 */ @@ -337,7 +321,7 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80CF4438-80CF443C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_swBallA__stringBase0; +SECTION_DATA static char* l_arcName = (char*)&d_a_obj_swBallA__stringBase0; /* 80CF443C-80CF4448 -00001 000C+00 0/1 0/0 0/0 .data @3956 */ #pragma push @@ -421,14 +405,34 @@ SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { }; /* 80CF37FC-80CF3928 00057C 012C+00 1/1 0/0 0/0 .text CreateHeap__14daObjSwBallA_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daObjSwBallA_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); + JUT_ASSERT(381, modelData != 0); + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (mModel == 0) { + return 0; + } + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 7); + JUT_ASSERT(381, pbtk != 0); + field_0x588 = new mDoExt_btkAnm(); + if (field_0x588 == NULL || field_0x588->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { + return 0; + } + field_0x588->setPlaySpeed(0.0f); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallA_c::CreateHeap() { +asm int daObjSwBallA_c::CreateHeap() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/CreateHeap__14daObjSwBallA_cFv.s" } #pragma pop +#endif /* 80CF3928-80CF3970 0006A8 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ #pragma push @@ -442,28 +446,66 @@ extern "C" asm void __dt__12J3DFrameCtrlFv() { #pragma pop /* 80CF3970-80CF3A90 0006F0 0120+00 1/1 0/0 0/0 .text create__14daObjSwBallA_cFv */ +#ifdef NONMATCHING +int daObjSwBallA_c::create() { + fopAcM_SetupActor(this, daObjSwBallA_c); + if (field_0x5c4 == 0) { + field_0x5c4 = 1; + field_0x5c6 = orig.angle.x; + field_0x5c8 = orig.angle.z; + shape_angle.x = 0; + current.angle.x = 0; + orig.angle.x = 0; + shape_angle.z = 0; + current.angle.z = 0; + orig.angle.z = 0; + } + int res = dComIfG_resLoad(&field_0x57c, l_arcName); + if (res == cPhs_COMPLEATE_e) { + if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x940) == 0) { + return cPhs_ERROR_e; + } else if (Create() == 0) { + return cPhs_ERROR_e; + } + } + return res; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallA_c::create() { +asm int daObjSwBallA_c::create() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/func_80CF3970.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80CF452C-80CF4530 000024 0004+00 1/1 0/0 0/0 .bss None */ static u8 data_80CF452C[4]; /* 80CF3A90-80CF3B40 000810 00B0+00 1/1 0/0 0/0 .text execute__14daObjSwBallA_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daObjSwBallA_c::execute() { + typedef void (daObjSwBallA_c::*ballfunc)(); + static ballfunc l_func[2] = {&daObjSwBallA_c::actionRun, &daObjSwBallA_c::actionStop}; + (this->*l_func[field_0x5ad])(); + eventUpdate(); + field_0x588->play(); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallA_c::execute() { +asm int daObjSwBallA_c::execute() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/execute__14daObjSwBallA_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80CF4408-80CF440C 000024 0004+00 1/1 0/0 0/0 .rodata @4032 */ @@ -471,6 +513,42 @@ SECTION_RODATA static f32 const lit_4032 = -1.0f; COMPILER_STRIP_GATE(0x80CF4408, &lit_4032); /* 80CF3B40-80CF3D80 0008C0 0240+00 1/0 0/0 0/0 .text actionRun__14daObjSwBallA_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daObjSwBallA_c::actionRun() { + u32 iVar4 = field_0x5c0; + search_ball(); + PutCrrPos(); + switch (field_0x5ae) { + case 0: + if (iVar4 == -1 && field_0x5c0 != -1) { + fopAcM_seStart(this, Z2SE_OBJ_L8_L_BALL_SW_ON, 0); + field_0x588->setPlaySpeed(1.0f); + field_0x5ae = 1; + } + break; + case 1: + if (field_0x5c0 == -1) { + fopAcM_seStart(this, Z2SE_OBJ_L8_L_BALL_SW_OFF, 0); + field_0x588->setPlaySpeed(-1.0f); + i_fopAcM_offSwitch(this, getSwbit()); + field_0x5ae = 0; + } else { + if (field_0x588->play() != 0) { + i_fopAcM_onSwitch(this, getSwbit()); + if (getEvent() != 0xff) { + orderEvent(getEvent(), 0xff, 1); + } + if (getArg0() == 1) { + field_0x5ae = 2; + } + } + fopAcM_seStartLevel(this, Z2SE_OBJ_L8_L_BALL_SW, 0); + } + break; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -479,6 +557,7 @@ asm void daObjSwBallA_c::actionRun() { #include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/actionRun__14daObjSwBallA_cFv.s" } #pragma pop +#endif /* 80CF3D80-80CF3D84 000B00 0004+00 1/0 0/0 0/0 .text actionStop__14daObjSwBallA_cFv */ void daObjSwBallA_c::actionStop() { @@ -494,6 +573,79 @@ COMPILER_STRIP_GATE(0x80CF440C, &lit_4122); #pragma pop /* 80CF3D84-80CF406C 000B04 02E8+00 1/1 0/0 0/0 .text PutCrrPos__14daObjSwBallA_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daObjSwBallA_c::PutCrrPos() { + daPy_py_c* player = daPy_getPlayerActorClass(); + s16 sVar5 = cLib_targetAngleY(&player->current.pos, ¤t.pos) - player->shape_angle.y; + if (fopAcM_searchPlayerDistanceXZ(this) < 300.0f && sVar5 < 0x4000) { + daObjCarry_c* carryObj = (daObjCarry_c*)fopAcM_SearchByID(player->getGrabActorID()); + if (carryObj != NULL && + fopAcM_IsActor(carryObj) + && fopAcM_GetName(carryObj) == PROC_Obj_Carry && + carryObj->getType() == daObjCarry_c::TYPE_LV8_BALL) + { + player->setForcePutPos(current.pos); + } + } + daObjCarry_c* carryObj; + for (u8 i = 0; i < 8; i++) { + bool isArea = false; + u8 carryNow = 0; + u8 hookCarryNow = 0; + if (field_0x58c[i] != -1) { + carryObj = (daObjCarry_c*)fopAcM_SearchByID(field_0x58c[i]); + isArea = checkArea_sub(carryObj); + carryNow = fopAcM_checkCarryNow(carryObj) >> 13; + hookCarryNow = fopAcM_checkHookCarryNow(carryObj) >> 20; + if (field_0x5c0 == -1 || field_0x5c0 == field_0x58c[i]) { + switch(field_0x5b7[i]) { + case 0: + if ((isArea && ((carryNow == 0 && checkFlag(i, 1)) || + (hookCarryNow == 0 && checkFlag(i, 4)))) || + (isArea && !checkFlag(i, 2) && carryNow == 0 && hookCarryNow == 0)) + { + carryObj->startCtrl(); + field_0x5c0 = field_0x58c[i]; + field_0x5b7[i] = 1; + } else { + if (!isArea) { + field_0x5c0 = 0xffffffff; + } + } + break; + case 1: + if (isArea != 0 && carryNow == 0 && hookCarryNow == 0) { + cLib_chaseF(&carryObj->current.pos.x, current.pos.x, + 10.0f); + cLib_chaseF(&carryObj->current.pos.z, current.pos.z, + 10.0f); + if (fopAcM_searchActorDistanceXZ(this, carryObj) == 0.0f) { + carryObj->endCtrl(); + field_0x5b7[i] = 0; + } + } else { + carryObj->endCtrl(); + field_0x5b7[i] = 0; + field_0x5c0 = 0xffffffff; + } + break; + } + } + } + clrFlag(i); + if (isArea) { + onFlag(i, 2); + } + if (carryNow) { + onFlag(i, 1); + } + if (hookCarryNow) { + onFlag(i, 4); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -502,73 +654,78 @@ asm void daObjSwBallA_c::PutCrrPos() { #include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/PutCrrPos__14daObjSwBallA_cFv.s" } #pragma pop +#endif /* 80CF406C-80CF41F4 000DEC 0188+00 1/1 0/0 0/0 .text draw__14daObjSwBallA_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daObjSwBallA_c::draw() { + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + dComIfGd_setListDarkBG(); + J3DMaterial* material = mModel->getModelData()->getMaterialNodePointer(0); + if (material->getTexGenBlock()->getTexMtx(1) != NULL) { + J3DTexMtxInfo* texMtxInfo = &material->getTexGenBlock()->getTexMtx(1)->getTexMtxInfo(); + if (texMtxInfo != NULL) { + Mtx auStack_48; + C_MTXLightOrtho(auStack_48, 100.0f, -100.0f, -100.0f, 100.0f, 1.0f, 1.0f, 0.0f, 0.0f); + mDoMtx_stack_c::XrotS(0x4000); + mDoMtx_stack_c::transM(-current.pos.x, -current.pos.y, -current.pos.z); + cMtx_concat(auStack_48, mDoMtx_stack_c::get(), texMtxInfo->mEffectMtx); + } + } + field_0x588->entry(mModel->getModelData()); + mDoExt_modelUpdateDL(mModel); + mDoExt_btkAnmRemove(mModel->getModelData()); + dComIfGd_setList(); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallA_c::draw() { +asm int daObjSwBallA_c::draw() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/draw__14daObjSwBallA_cFv.s" } #pragma pop +#endif /* 80CF41F4-80CF4274 000F74 0080+00 1/1 0/0 0/0 .text _delete__14daObjSwBallA_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallA_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/_delete__14daObjSwBallA_cFv.s" +int daObjSwBallA_c::_delete() { + if (!i_fopAcM_isSwitch(this, getSwbit2())) { + i_fopAcM_offSwitch(this, getSwbit()); + } + dComIfG_resDelete(&field_0x57c, l_arcName); + return 1; } -#pragma pop /* 80CF4274-80CF4294 000FF4 0020+00 1/0 0/0 0/0 .text daObjSwBallA_Draw__FP14daObjSwBallA_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallA_Draw(daObjSwBallA_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Draw__FP14daObjSwBallA_c.s" +static int daObjSwBallA_Draw(daObjSwBallA_c* param_0) { + return param_0->draw(); } -#pragma pop /* 80CF4294-80CF42B4 001014 0020+00 1/0 0/0 0/0 .text daObjSwBallA_Execute__FP14daObjSwBallA_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallA_Execute(daObjSwBallA_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Execute__FP14daObjSwBallA_c.s" +static int daObjSwBallA_Execute(daObjSwBallA_c* param_0) { + return param_0->execute(); } -#pragma pop /* 80CF42B4-80CF42D4 001034 0020+00 1/0 0/0 0/0 .text daObjSwBallA_Delete__FP14daObjSwBallA_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallA_Delete(daObjSwBallA_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Delete__FP14daObjSwBallA_c.s" +static int daObjSwBallA_Delete(daObjSwBallA_c* param_0) { + return param_0->_delete(); } -#pragma pop /* 80CF42D4-80CF42F4 001054 0020+00 1/0 0/0 0/0 .text daObjSwBallA_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallA_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/daObjSwBallA_Create__FP10fopAc_ac_c.s" +static int daObjSwBallA_Create(fopAc_ac_c* param_0) { + return ((daObjSwBallA_c*)param_0)->create(); } -#pragma pop /* 80CF42F4-80CF433C 001074 0048+00 1/0 0/0 0/0 .text __dt__17dEvLib_callback_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA/__dt__17dEvLib_callback_cFv.s" } @@ -576,17 +733,17 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80CF433C-80CF4344 0010BC 0008+00 2/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80CF4344-80CF434C 0010C4 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80CF434C-80CF4354 0010CC 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp index be397944ba..4f7701f7bf 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp +++ b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp @@ -4,115 +4,12 @@ // #include "rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h" +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" +#include "d/a/d_a_player.h" +#include "d/d_lib.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "dol2asm.h" -// -// Types: -// - -// struct request_of_phase_process_class {}; - -// struct mDoMtx_stack_c { -// /* 8000CD9C */ void transM(f32, f32, f32); - -// static u8 now[48]; -// }; - -// struct J3DMaterialTable {}; - -// struct J3DAnmTextureSRTKey {}; - -// struct mDoExt_btkAnm { -// /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); -// /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -// }; - -// struct mDoExt_baseAnm { -// /* 8000D428 */ void play(); -// }; - -// struct fopAc_ac_c { -// /* 80018B64 */ fopAc_ac_c(); -// /* 80018C8C */ ~fopAc_ac_c(); -// }; - -// struct daObjSwBallB_c { -// /* 80CF466C */ void checkArea_sub(fopAc_ac_c*); -// /* 80CF47BC */ void search_ball(); -// /* 80CF496C */ void initBaseMtx(); -// /* 80CF498C */ void setBaseMtx(); -// /* 80CF49F0 */ void Create(); -// /* 80CF4B74 */ void CreateHeap(); -// /* 80CF4CE8 */ void create(); -// /* 80CF4E08 */ void execute(); -// /* 80CF4EB8 */ void actionRun(); -// /* 80CF5384 */ void actionStop(); -// /* 80CF5388 */ void PutCrrPos(); -// /* 80CF56A4 */ void draw(); -// /* 80CF582C */ void _delete(); -// /* 80CF5940 */ ~daObjSwBallB_c(); -// }; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); -}; - -// struct dKy_tevstr_c {}; - -// struct J3DModelData {}; - -// struct cXyz {}; - -// struct dScnKy_env_light_c { -// /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); -// /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -// }; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80CF58E0 */ ~dEvLib_callback_c(); - /* 80CF5928 */ bool eventStart(); - /* 80CF5930 */ bool eventRun(); - /* 80CF5938 */ bool eventEnd(); -}; - -// struct JAISoundID {}; - -// struct Vec {}; - -// 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 J3DModel {}; - -// struct J3DFrameCtrl { -// /* 803283FC */ void init(s16); -// /* 80CF4CA0 */ ~J3DFrameCtrl(); -// }; - -// -// Forward References: -// - extern "C" static void s_ball_sub__FPvPv(); extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" void checkArea_sub__14daObjSwBallB_cFP10fopAc_ac_c(); @@ -199,10 +96,8 @@ 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" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -211,41 +106,39 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80CF5B10-80CF5B18 000000 0008+00 2/2 0/0 0/0 .bss l_target_info */ -static u8 l_target_info[8]; +static daObjCarry_c* l_target_info[2]; /* 80CF5B18-80CF5B1C 000008 0004+00 2/2 0/0 0/0 .bss l_target_info_count */ -static u8 l_target_info_count[4]; +static int l_target_info_count; /* 80CF45B8-80CF464C 000078 0094+00 1/1 0/0 0/0 .text s_ball_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void s_ball_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/s_ball_sub__FPvPv.s" +static void* s_ball_sub(void* param_1, void* param_2) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + ((daObjCarry_c*)param_1)->prm_chk_type_lightball()) + { + if (l_target_info_count < 2) { + l_target_info[l_target_info_count] = (daObjCarry_c*)param_1; + l_target_info_count++; + } + } + return NULL; } -#pragma pop /* 80CF464C-80CF466C 00010C 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_swBallB/d_a_obj_swBallB/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* param_0) { + return ((daObjSwBallB_c*)param_0)->CreateHeap(); } -#pragma pop /* ############################################################################################## */ /* 80CF59D0-80CF59D4 000000 0004+00 5/5 0/0 0/0 .rodata l_color */ -SECTION_RODATA static u32 const l_color = 0x0396FFFF; +SECTION_RODATA static GXColor const l_color = {0x03, 0x96, 0xFF, 0xFF}; COMPILER_STRIP_GATE(0x80CF59D0, &l_color); /* 80CF59D4-80CF59E0 000004 000C+00 0/1 0/0 0/0 .rodata l_event_bitA */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_event_bitA[12] = { - 0x43, 0x04, 0x43, 0x02, 0x43, 0x01, 0x44, 0x80, 0x44, 0x40, 0x44, 0x20, +SECTION_RODATA static u16 const l_event_bitA[6] = { + 0x4304, 0x4302, 0x4301, 0x4480, 0x4440, 0x4420, }; COMPILER_STRIP_GATE(0x80CF59D4, &l_event_bitA); #pragma pop @@ -253,8 +146,8 @@ COMPILER_STRIP_GATE(0x80CF59D4, &l_event_bitA); /* 80CF59E0-80CF59EC 000010 000C+00 0/1 0/0 0/0 .rodata l_event_bitB */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_event_bitB[12] = { - 0x44, 0x10, 0x44, 0x08, 0x44, 0x04, 0x44, 0x02, 0x44, 0x01, 0x45, 0x80, +SECTION_RODATA static u16 const l_event_bitB[6] = { + 0x4410, 0x4408, 0x4404, 0x4402, 0x4401, 0x4580, }; COMPILER_STRIP_GATE(0x80CF59E0, &l_event_bitB); #pragma pop @@ -296,73 +189,131 @@ COMPILER_STRIP_GATE(0x80CF59F8, &lit_3755); /* 80CF466C-80CF47BC 00012C 0150+00 1/1 0/0 0/0 .text * checkArea_sub__14daObjSwBallB_cFP10fopAc_ac_c */ +// Matches with literals +#ifdef NONMATCHING +int daObjSwBallB_c::checkArea_sub(fopAc_ac_c* param_1) { + if (param_1 == NULL) { + return 0; + } + if (getType() == 0) { + if (param_1->current.pos.y >= current.pos.y - 10.0f && + param_1->current.pos.y < current.pos.y + mScale.y * 100.0f && + fopAcM_searchActorDistanceXZ(this, param_1) < mScale.x * 100.0f) + { + return 1; + } + } else { + if (getType() == 1) { + cXyz cStack_1c(mScale.x * -100.0f, 0.0f, mScale.z * -100.0f); + cXyz cStack_28(mScale.x * 100.0f, mScale.y * 100.0f, mScale.z * 100.0f); + cStack_1c.y += current.pos.y - 10.0f; + cStack_28.y += current.pos.y; + if (param_1->current.pos.y >= cStack_1c.y && param_1->current.pos.y < cStack_28.y && + dLib_checkActorInRectangle(param_1, this, &cStack_1c, &cStack_28)) + { + return 1; + } + } + } + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallB_c::checkArea_sub(fopAc_ac_c* param_0) { +asm int daObjSwBallB_c::checkArea_sub(fopAc_ac_c* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/checkArea_sub__14daObjSwBallB_cFP10fopAc_ac_c.s" } #pragma pop +#endif /* 80CF47BC-80CF496C 00027C 01B0+00 1/1 0/0 0/0 .text search_ball__14daObjSwBallB_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallB_c::search_ball() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/search_ball__14daObjSwBallB_cFv.s" +void daObjSwBallB_c::search_ball() { + l_target_info_count = 0; + for (int i = 0; i < 2; i++) { + l_target_info[i] = NULL; + } + i_fpcM_Search(s_ball_sub, this); + for (int i = 0; i < l_target_info_count; i++) { + if (l_target_info[i] != 0) { + u32 id = fopAcM_GetID(l_target_info[i]); + if (id != -1) { + int idIndex = -1; + for (int j = 0; j < 2; j++) { + if (id == field_0x58c[j]) { + idIndex = j; + break; + } + } + if (idIndex < 0) { + for (int j = 0; j < 2; j++) { + if (field_0x58c[j] == -1) { + field_0x58c[j] = id; + break; + } + } + } + } + } + } + + for (int j = 0; j < 2; j++) { + if (fopAcM_SearchByID(field_0x58c[j]) == NULL) { + field_0x58c[j] = -1; + } + } + if (field_0x59c != -1 && fopAcM_SearchByID(field_0x59c) == NULL) { + field_0x59c = -1; + } } -#pragma pop /* 80CF496C-80CF498C 00042C 0020+00 1/1 0/0 0/0 .text initBaseMtx__14daObjSwBallB_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallB_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/initBaseMtx__14daObjSwBallB_cFv.s" +void daObjSwBallB_c::initBaseMtx() { + setBaseMtx(); } -#pragma pop /* 80CF498C-80CF49F0 00044C 0064+00 1/1 0/0 0/0 .text setBaseMtx__14daObjSwBallB_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallB_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/setBaseMtx__14daObjSwBallB_cFv.s" +void daObjSwBallB_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop - -/* ############################################################################################## */ -/* 80CF5A00-80CF5A08 000030 0008+00 1/1 0/0 0/0 .rodata @3935 */ -SECTION_RODATA static u8 const lit_3935[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CF5A00, &lit_3935); /* 80CF49F0-80CF4B74 0004B0 0184+00 1/1 0/0 0/0 .text Create__14daObjSwBallB_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallB_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/Create__14daObjSwBallB_cFv.s" +int daObjSwBallB_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + J3DJoint* joint = mModel->getModelData()->getJointNodePointer(0); + fopAcM_setCullSizeBox(this, + joint->getMin()->x, joint->getMin()->y, joint->getMin()->z, + joint->getMax()->x, joint->getMax()->y, joint->getMax()->z); + for (int i = 0; i < 2; i++) { + field_0x58c[i] = -1; + } + field_0x59c = -1; + + if (fopAcM_GetRoomNo(this) == 0 && i_fopAcM_isSwitch(this, 0x3f)) { + field_0x588->setFrame(field_0x588->getEndFrame()); + if (getArg1() == 1) { + i_fopAcM_onSwitch(this, getSwbit2()); + } + i_fopAcM_onSwitch(this, getSwbit()); + field_0x596 = 5; + } + GXColor* color = mModel->getModelData()->getMaterialNodePointer(0)->getTevKColor(1); + color->r = l_color.r; + color->g = l_color.g; + color->b = l_color.b; + execute(); + return 1; } -#pragma pop /* ############################################################################################## */ /* 80CF5A08-80CF5A0C 000038 0004+00 1/3 0/0 0/0 .rodata @3969 */ SECTION_RODATA static f32 const lit_3969 = 1.0f; COMPILER_STRIP_GATE(0x80CF5A08, &lit_3969); -/* 80CF5A14-80CF5A14 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CF5A14 = "P_LBswBC"; -#pragma pop - /* 80CF5A20-80CF5A2C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -382,7 +333,7 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80CF5A40-80CF5A44 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_swBallB__stringBase0; +SECTION_DATA static char* l_arcName = "P_LBswBC"; /* 80CF5A44-80CF5A50 -00001 000C+00 0/1 0/0 0/0 .data @4007 */ #pragma push @@ -466,14 +417,34 @@ SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { }; /* 80CF4B74-80CF4CA0 000634 012C+00 1/1 0/0 0/0 .text CreateHeap__14daObjSwBallB_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daObjSwBallB_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + JUT_ASSERT(427, modelData != 0); + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (mModel == 0) { + return 0; + } + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 9); + JUT_ASSERT(441, pbtk != 0); + field_0x588 = new mDoExt_btkAnm(); + if (field_0x588 == NULL || field_0x588->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { + return 0; + } + field_0x588->setPlaySpeed(0.0f); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallB_c::CreateHeap() { +asm int daObjSwBallB_c::CreateHeap() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/CreateHeap__14daObjSwBallB_cFv.s" } #pragma pop +#endif /* 80CF4CA0-80CF4CE8 000760 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ #pragma push @@ -487,28 +458,67 @@ extern "C" asm void __dt__12J3DFrameCtrlFv() { #pragma pop /* 80CF4CE8-80CF4E08 0007A8 0120+00 1/1 0/0 0/0 .text create__14daObjSwBallB_cFv */ +// Matches with dEvLib_callback_c +#ifdef NONMATCHING +int daObjSwBallB_c::create() { + fopAcM_SetupActor(this, daObjSwBallB_c); + if (field_0x5a0 == 0) { + field_0x5a0 = 1; + field_0x5a2 = orig.angle.x; + field_0x5a4 = orig.angle.z; + shape_angle.x = 0; + current.angle.x = 0; + orig.angle.x = 0; + shape_angle.z = 0; + current.angle.z = 0; + orig.angle.z = 0; + } + int res = dComIfG_resLoad(&field_0x57c, l_arcName); + if (res == cPhs_COMPLEATE_e) { + if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x940) == 0) { + return cPhs_ERROR_e; + } else if (Create() == 0) { + return cPhs_ERROR_e; + } + } + return res; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallB_c::create() { +asm int daObjSwBallB_c::create() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/func_80CF4CE8.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80CF5B1C-80CF5B20 00000C 0004+00 1/1 0/0 0/0 .bss None */ static u8 data_80CF5B1C[4]; /* 80CF4E08-80CF4EB8 0008C8 00B0+00 2/2 0/0 0/0 .text execute__14daObjSwBallB_cFv */ +// Matches with dEvLib_callback_c and data +#ifdef NONMATCHING +int daObjSwBallB_c::execute() { + typedef void (daObjSwBallB_c::*ballfunc)(); + static ballfunc l_func[2] = {&daObjSwBallB_c::actionRun, &daObjSwBallB_c::actionStop}; + (this->*l_func[field_0x595])(); + eventUpdate(); + field_0x588->play(); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallB_c::execute() { +asm int daObjSwBallB_c::execute() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/execute__14daObjSwBallB_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80CF5A0C-80CF5A10 00003C 0004+00 0/1 0/0 0/0 .rodata @4178 */ @@ -519,6 +529,83 @@ COMPILER_STRIP_GATE(0x80CF5A0C, &lit_4178); #pragma pop /* 80CF4EB8-80CF5384 000978 04CC+00 1/0 0/0 0/0 .text actionRun__14daObjSwBallB_cFv */ +// Matches with literals and dEvLib_callback_c +#ifdef NONMATCHING +void daObjSwBallB_c::actionRun() { + u32 iVar4 = field_0x59c; + search_ball(); + PutCrrPos(); + switch (field_0x596) { + case 0: + if (iVar4 == -1 && field_0x59c != -1) { + fopAcM_seStart(this, Z2SE_OBJ_L8_L_BALL_SW_ON, 0); + field_0x588->setPlaySpeed(1.0f); + field_0x596 = 1; + } else if (field_0x5ac != 0) { + fopAcM_seStart(this, Z2SE_OBJ_L8_L_BALL_SW_ON, 0); + field_0x588->setPlaySpeed(1.0f); + field_0x596 = 3; + } + break; + case 1: + if (field_0x59c == -1) { + field_0x588->setPlaySpeed(-1.0f); + if (dComIfGp_roomControl_getStayNo() != 0) { + i_fopAcM_offSwitch(this, getSwbit()); + } + fopAcM_seStart(this, Z2SE_OBJ_L8_L_BALL_SW_OFF, 0); + field_0x5a8 = -1; + field_0x596 = 0; + } else { + if (field_0x588->play() != 0) { + if (dComIfGp_roomControl_getStayNo() == 0) { + daObjCarry_c* carryObj = (daObjCarry_c*)fopAcM_SearchByID(field_0x59c); + if (carryObj != NULL) { + if (getArg1() == 1) { + i_fopAcM_onSwitch(this, getSwbit2()); + } + if (carryObj->getType() == 8) { + i_fopAcM_onSwitch(this, getSwbit()); + dComIfGs_onEventBit(l_event_bitA[getID()]); + field_0x5a8 = 0; + } else { + dComIfGs_onEventBit(l_event_bitB[getID()]); + field_0x5a8 = 1; + } + } + } else { + i_fopAcM_onSwitch(this, getSwbit()); + } + if (getEvent() != 0xff) { + orderEvent(getEvent(), 0xff, 1); + } + } + if (field_0x5ad != 0) { + fopAcM_seStart(this, Z2SE_OBJ_L8_L_BALL_SW_OFF, 0); + field_0x588->setPlaySpeed(-1.0f); + field_0x596 = 4; + } + fopAcM_seStartLevel(this, Z2SE_OBJ_L8_L_BALL_SW, 0); + } + break; + case 2: + break; + case 3: + field_0x588->play(); + fopAcM_seStartLevel(this, Z2SE_OBJ_L8_L_BALL_SW, 0); + break; + case 4: + if (field_0x588->play() != 0 && field_0x5ac != 0) { + fopAcM_seStart(this, Z2SE_OBJ_L8_L_BALL_SW_ON, 0); + field_0x588->setPlaySpeed(1.0f); + field_0x596 = 3; + } + break; + case 5: + break; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -527,7 +614,7 @@ asm void daObjSwBallB_c::actionRun() { #include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/actionRun__14daObjSwBallB_cFv.s" } #pragma pop - +#endif /* 80CF5384-80CF5388 000E44 0004+00 1/0 0/0 0/0 .text actionStop__14daObjSwBallB_cFv */ void daObjSwBallB_c::actionStop() { /* empty function */ @@ -542,6 +629,80 @@ COMPILER_STRIP_GATE(0x80CF5A10, &lit_4276); #pragma pop /* 80CF5388-80CF56A4 000E48 031C+00 1/1 0/0 0/0 .text PutCrrPos__14daObjSwBallB_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daObjSwBallB_c::PutCrrPos() { + daPy_py_c* player = daPy_getPlayerActorClass(); + s16 sVar5 = cLib_targetAngleY(&player->current.pos, ¤t.pos) - player->shape_angle.y; + if (fopAcM_searchPlayerDistanceXZ(this) < 300.0f && sVar5 < 0x4000 && sVar5 > -0x4000) { + daObjCarry_c* carryObj = (daObjCarry_c*)fopAcM_SearchByID(player->getGrabActorID()); + if (carryObj != NULL && fopAcM_IsActor(carryObj) && + fopAcM_GetName(carryObj) == PROC_Obj_Carry && carryObj->prm_chk_type_lightball()) + { + player->setForcePutPos(current.pos); + if (!i_dComIfGp_event_runCheck()) { + dComIfGp_setDoStatus(0x14, 2); + } + } + } + daObjCarry_c* carryObj; + for (u8 i = 0; i < 2; i++) { + bool isArea = false; + u8 carryNow = 0; + u8 hookCarryNow = 0; + if (field_0x58c[i] != -1) { + carryObj = (daObjCarry_c*)fopAcM_SearchByID(field_0x58c[i]); + isArea = checkArea_sub(carryObj); + carryNow = fopAcM_checkCarryNow(carryObj) >> 13; + hookCarryNow = fopAcM_checkHookCarryNow(carryObj) >> 20; + if (field_0x59c == -1 || field_0x59c == field_0x58c[i]) { + switch(field_0x599[i]) { + case 0: + if ((isArea && ((carryNow == 0 && checkFlag(i, 1)) || + (hookCarryNow == 0 && checkFlag(i, 4)))) || + (isArea && !checkFlag(i, 2) && carryNow == 0 && hookCarryNow == 0)) + { + carryObj->startCtrl(); + field_0x59c = field_0x58c[i]; + field_0x599[i] = 1; + } else { + if (!isArea) { + field_0x59c = 0xffffffff; + } + } + break; + case 1: + if (isArea != 0) { + cLib_chaseF(&carryObj->current.pos.x, current.pos.x, + 10.0f); + cLib_chaseF(&carryObj->current.pos.z, current.pos.z, + 10.0f); + if (fopAcM_searchActorDistanceXZ(this, carryObj) == 0.0f) { + carryObj->endCtrl(); + field_0x599[i] = 0; + } + } else { + carryObj->endCtrl(); + field_0x599[i] = 0; + field_0x59c = 0xffffffff; + } + break; + } + } + } + clrFlag(i); + if (isArea) { + onFlag(i, 2); + } + if (carryNow) { + onFlag(i, 1); + } + if (hookCarryNow) { + onFlag(i, 4); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -550,73 +711,74 @@ asm void daObjSwBallB_c::PutCrrPos() { #include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/PutCrrPos__14daObjSwBallB_cFv.s" } #pragma pop +#endif /* 80CF56A4-80CF582C 001164 0188+00 1/1 0/0 0/0 .text draw__14daObjSwBallB_cFv */ +#ifdef NONMATCHING +int daObjSwBallB_c::draw() { + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + dComIfGd_setListDarkBG(); + J3DMaterial* material = mModel->getModelData()->getMaterialNodePointer(0); + if (material->getTexGenBlock()->getTexMtx(1) != NULL) { + J3DTexMtxInfo* texMtxInfo = &material->getTexGenBlock()->getTexMtx(1)->getTexMtxInfo(); + if (texMtxInfo != NULL) { + Mtx auStack_48; + C_MTXLightOrtho(auStack_48, 100.0f, -100.0f, -100.0f, 100.0f, 1.0f, 1.0f, 0.0f, 0.0f); + mDoMtx_stack_c::XrotS(0x4000); + mDoMtx_stack_c::transM(-current.pos.x, -current.pos.y, -current.pos.z); + cMtx_concat(auStack_48, mDoMtx_stack_c::get(), texMtxInfo->mEffectMtx); + } + } + field_0x588->entry(mModel->getModelData()); + mDoExt_modelUpdateDL(mModel); + mDoExt_btkAnmRemove(mModel->getModelData()); + dComIfGd_setList(); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjSwBallB_c::draw() { +asm int daObjSwBallB_c::draw() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/draw__14daObjSwBallB_cFv.s" } #pragma pop +#endif /* 80CF582C-80CF5860 0012EC 0034+00 1/1 0/0 0/0 .text _delete__14daObjSwBallB_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallB_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/_delete__14daObjSwBallB_cFv.s" +int daObjSwBallB_c::_delete() { + dComIfG_resDelete(&field_0x57c, l_arcName); + return 1; } -#pragma pop /* 80CF5860-80CF5880 001320 0020+00 1/0 0/0 0/0 .text daObjSwBallB_Draw__FP14daObjSwBallB_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallB_Draw(daObjSwBallB_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Draw__FP14daObjSwBallB_c.s" +static int daObjSwBallB_Draw(daObjSwBallB_c* param_0) { + return param_0->draw(); } -#pragma pop /* 80CF5880-80CF58A0 001340 0020+00 1/0 0/0 0/0 .text daObjSwBallB_Execute__FP14daObjSwBallB_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallB_Execute(daObjSwBallB_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Execute__FP14daObjSwBallB_c.s" +static int daObjSwBallB_Execute(daObjSwBallB_c* param_0) { + return param_0->execute(); } -#pragma pop /* 80CF58A0-80CF58C0 001360 0020+00 1/0 0/0 0/0 .text daObjSwBallB_Delete__FP14daObjSwBallB_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallB_Delete(daObjSwBallB_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Delete__FP14daObjSwBallB_c.s" +static int daObjSwBallB_Delete(daObjSwBallB_c* param_0) { + return param_0->_delete(); } -#pragma pop /* 80CF58C0-80CF58E0 001380 0020+00 1/0 0/0 0/0 .text daObjSwBallB_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallB_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/daObjSwBallB_Create__FP10fopAc_ac_c.s" +static int daObjSwBallB_Create(fopAc_ac_c* param_0) { + return ((daObjSwBallB_c*)param_0)->create(); } -#pragma pop /* 80CF58E0-80CF5928 0013A0 0048+00 1/0 0/0 0/0 .text __dt__17dEvLib_callback_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/__dt__17dEvLib_callback_cFv.s" } @@ -624,17 +786,17 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80CF5928-80CF5930 0013E8 0008+00 2/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80CF5930-80CF5938 0013F0 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80CF5938-80CF5940 0013F8 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_swBallC/Makefile b/rel/d/a/obj/d_a_obj_swBallC/Makefile index 7c37a74582..ff97f236a5 100644 --- a/rel/d/a/obj/d_a_obj_swBallC/Makefile +++ b/rel/d/a/obj/d_a_obj_swBallC/Makefile @@ -8,12 +8,10 @@ M640_MAP := $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallC.map M640_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.cpp \ rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp \ M640_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.o \ M640_LIBS := \ diff --git a/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp b/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp index 759110477a..34af5302b1 100644 --- a/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp +++ b/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp @@ -1,337 +1,77 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_swBallC +// d_a_obj_swBallC // #include "rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjSwBallC_c { - /* 80CF5CD4 */ void initBaseMtx(); - /* 80CF5CF4 */ void setBaseMtx(); - /* 80CF5D58 */ void Create(); - /* 80CF5EF8 */ void CreateHeap(); - /* 80CF606C */ void create(); - /* 80CF6120 */ void execute(); - /* 80CF6144 */ void event_proc_call(); - /* 80CF6200 */ void actionWait(); - /* 80CF629C */ void actionOrderEvent(); - /* 80CF6344 */ void actionEvent(); - /* 80CF63F0 */ void actionDead(); - /* 80CF63F4 */ void demoProc(); - /* 80CF6818 */ void setLightOnSwB(); - /* 80CF6888 */ void setLightOffSwB(); - /* 80CF68F8 */ void deleteLightBall(); - /* 80CF692C */ void deleteLightBallA(); - /* 80CF6964 */ void deleteLightBallB(); - /* 80CF699C */ void calcLightBallScale(); - /* 80CF6A74 */ void draw(); - /* 80CF6BFC */ void _delete(); -}; - -struct dSv_memBit_c { - /* 800347A0 */ void onTbox(int); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); -}; - -struct Z2SeqMgr { - /* 802AFB94 */ void bgmStreamPrepare(u32); - /* 802AFE18 */ void bgmStreamPlay(); -}; - -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 J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CF6024 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" static void s_swb_sub__FPvPv(); -extern "C" static void s_ballA_sub__FPvPv(); -extern "C" static void s_ballB_sub__FPvPv(); -extern "C" void initBaseMtx__14daObjSwBallC_cFv(); -extern "C" void setBaseMtx__14daObjSwBallC_cFv(); -extern "C" void Create__14daObjSwBallC_cFv(); -extern "C" void CreateHeap__14daObjSwBallC_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void create__14daObjSwBallC_cFv(); -extern "C" void execute__14daObjSwBallC_cFv(); -extern "C" void event_proc_call__14daObjSwBallC_cFv(); -extern "C" void actionWait__14daObjSwBallC_cFv(); -extern "C" void actionOrderEvent__14daObjSwBallC_cFv(); -extern "C" void actionEvent__14daObjSwBallC_cFv(); -extern "C" void actionDead__14daObjSwBallC_cFv(); -extern "C" void demoProc__14daObjSwBallC_cFv(); -extern "C" void setLightOnSwB__14daObjSwBallC_cFv(); -extern "C" void setLightOffSwB__14daObjSwBallC_cFv(); -extern "C" void deleteLightBall__14daObjSwBallC_cFv(); -extern "C" void deleteLightBallA__14daObjSwBallC_cFv(); -extern "C" void deleteLightBallB__14daObjSwBallC_cFv(); -extern "C" void calcLightBallScale__14daObjSwBallC_cFv(); -extern "C" void draw__14daObjSwBallC_cFv(); -extern "C" void _delete__14daObjSwBallC_cFv(); -extern "C" static void daObjSwBallC_Draw__FP14daObjSwBallC_c(); -extern "C" static void daObjSwBallC_Execute__FP14daObjSwBallC_c(); -extern "C" static void daObjSwBallC_Delete__FP14daObjSwBallC_c(); -extern "C" static void daObjSwBallC_Create__FP14daObjSwBallC_c(); -extern "C" void func_80CF6CB0(void* _this, u8*); -extern "C" extern char const* const d_a_obj_swBallC__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_btkAnmRemove__FP12J3DModelData(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void fopMsgM_SearchByID__FUi(); -extern "C" void fopMsgM_messageSet__FUlUl(); -extern "C" void fpcEx_Search__FPFPvPv_PvPv(); -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 onTbox__12dSv_memBit_cFi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void execItemGet__FUc(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void dMeter2Info_setSword__FUcb(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void bgmStreamPrepare__8Z2SeqMgrFUl(); -extern "C" void bgmStreamPlay__8Z2SeqMgrFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXLightOrtho(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -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" 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 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80CF6F18[4]; - -// -// Declarations: -// +#include "rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h" +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "d/meter/d_meter2_info.h" +#include "d/d_item.h" +#include "d/a/d_a_player.h" +#include "f_op/f_op_msg_mng.h" +#include "f_op/f_op_msg.h" /* 80CF5B98-80CF5BB8 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void CheckCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* param_0) { + return ((daObjSwBallC_c*)param_0)->CreateHeap(); } -#pragma pop /* 80CF5BB8-80CF5C24 000098 006C+00 2/2 0/0 0/0 .text s_swb_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void s_swb_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_swb_sub__FPvPv.s" +static void* s_swb_sub(void* param_1, void* param_2) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_SwBallB && + (u32)((daObjSwBallB_c*)param_1)->getID() == ((daObjSwBallC_c*)param_2)->field_0x582) + { + return param_1; + } + return NULL; } -#pragma pop /* 80CF5C24-80CF5C7C 000104 0058+00 2/2 0/0 0/0 .text s_ballA_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void s_ballA_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_ballA_sub__FPvPv.s" +static void* s_ballA_sub(void* param_1, void* param_2) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_BALL_S) + { + return param_1; + } + return NULL; } -#pragma pop /* 80CF5C7C-80CF5CD4 00015C 0058+00 2/2 0/0 0/0 .text s_ballB_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void s_ballB_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/s_ballB_sub__FPvPv.s" +static void* s_ballB_sub(void* param_1, void* param_2) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_BALL_S_2) + { + return param_1; + } + return NULL; } -#pragma pop /* 80CF5CD4-80CF5CF4 0001B4 0020+00 1/1 0/0 0/0 .text initBaseMtx__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/initBaseMtx__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::initBaseMtx() { + setBaseMtx(); } -#pragma pop /* 80CF5CF4-80CF5D58 0001D4 0064+00 1/1 0/0 0/0 .text setBaseMtx__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setBaseMtx__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop /* ############################################################################################## */ /* 80CF6CD4-80CF6CD8 000000 0004+00 3/3 0/0 0/0 .rodata l_color */ -SECTION_RODATA static u32 const l_color = 0x0396FFFF; -COMPILER_STRIP_GATE(0x80CF6CD4, &l_color); - -/* 80CF6CD8-80CF6CDC 000004 0004+00 0/0 0/0 0/0 .rodata @3697 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3697 = -1.0f; -COMPILER_STRIP_GATE(0x80CF6CD8, &lit_3697); -#pragma pop - -/* 80CF6CDC-80CF6CE4 000008 0004+04 2/3 0/0 0/0 .rodata @3814 */ -SECTION_RODATA static f32 const lit_3814[1 + 1 /* padding */] = { - 1.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80CF6CDC, &lit_3814); - -/* 80CF6CE4-80CF6CEC 000010 0008+00 1/1 0/0 0/0 .rodata @3816 */ -SECTION_RODATA static u8 const lit_3816[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CF6CE4, &lit_3816); - -/* 80CF6D08-80CF6D08 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CF6D08 = "P_LBswBC"; -SECTION_DEAD static char const* const stringBase_80CF6D11 = "REVIVE_MASTER_SWORD"; -#pragma pop +static GXColor const l_color = {0x03, 0x96, 0xFF, 0xFF}; /* 80CF6D90-80CF6D9C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80CF6D9C-80CF6DB0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -342,458 +82,401 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80CF6DB0-80CF6DB4 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_swBallC__stringBase0; +static char* l_arcName = "P_LBswBC"; /* 80CF6DB4-80CF6DB8 -00001 0004+00 1/1 0/0 0/0 .data l_evName */ -SECTION_DATA static void* l_evName = (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x9); +static char* l_evName = "REVIVE_MASTER_SWORD"; + +static f32 dummyFloat() { + return -1.0f; +} /* 80CF5D58-80CF5EF8 000238 01A0+00 1/1 0/0 0/0 .text Create__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/Create__14daObjSwBallC_cFv.s" +int daObjSwBallC_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + J3DJoint* joint = mModel->getModelData()->getJointNodePointer(0); + fopAcM_setCullSizeBox(this, + joint->getMin()->x, joint->getMin()->y, joint->getMin()->z, + joint->getMax()->x, joint->getMax()->y, joint->getMax()->z); + + if (i_fopAcM_isSwitch(this, 0x3d) && i_fopAcM_isSwitch(this, 0x3e)) { + field_0x574->setPlaySpeed(1.0f); + field_0x574->setFrame(field_0x574->getEndFrame()); + } + GXColor* color = mModel->getModelData()->getMaterialNodePointer(0)->getTevKColor(1); + color->r = l_color.r; + color->g = l_color.g; + color->b = l_color.b; + field_0x57e = -1; + eventInfo.setArchiveName(l_arcName); + field_0x57c = i_dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xff); + if (i_fopAcM_isSwitch(this, 0x3f)) { + setLightOnSwB(); + setAction(3); + } + execute(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CF6CEC-80CF6CF0 000018 0004+00 2/3 0/0 0/0 .rodata @3850 */ -SECTION_RODATA static u8 const lit_3850[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CF6CEC, &lit_3850); - -/* 80CF6D08-80CF6D08 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CF6D25 = "lbsw"; -SECTION_DEAD static char const* const stringBase_80CF6D2A = "WAIT"; -SECTION_DEAD static char const* const stringBase_80CF6D2F = "ON"; -SECTION_DEAD static char const* const stringBase_80CF6D32 = "OFF"; -SECTION_DEAD static char const* const stringBase_80CF6D36 = "ON_ALL_B"; -SECTION_DEAD static char const* const stringBase_80CF6D3F = "OFF_ALL_B"; -SECTION_DEAD static char const* const stringBase_80CF6D49 = "DEL_BALL"; -SECTION_DEAD static char const* const stringBase_80CF6D52 = "SOUND"; -SECTION_DEAD static char const* const stringBase_80CF6D58 = "SCALING"; -SECTION_DEAD static char const* const stringBase_80CF6D60 = "INIT"; -SECTION_DEAD static char const* const stringBase_80CF6D65 = "MESSAGE"; -SECTION_DEAD static char const* const stringBase_80CF6D6D = "ST_CUT2"; -SECTION_DEAD static char const* const stringBase_80CF6D75 = "LINK_INIT"; -SECTION_DEAD static char const* const stringBase_80CF6D7F = "EQUIP_SWD"; -#pragma pop /* 80CF6DB8-80CF6DBC -00001 0004+00 1/1 0/0 0/0 .data l_staffName */ -SECTION_DATA static void* l_staffName = (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x1D); - -/* 80CF6DBC-80CF6DC8 -00001 000C+00 0/1 0/0 0/0 .data @3896 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3896[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__14daObjSwBallC_cFv, -}; -#pragma pop - -/* 80CF6DC8-80CF6DD4 -00001 000C+00 0/1 0/0 0/0 .data @3897 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3897[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrderEvent__14daObjSwBallC_cFv, -}; -#pragma pop - -/* 80CF6DD4-80CF6DE0 -00001 000C+00 0/1 0/0 0/0 .data @3898 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3898[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEvent__14daObjSwBallC_cFv, -}; -#pragma pop - -/* 80CF6DE0-80CF6DEC -00001 000C+00 0/1 0/0 0/0 .data @3899 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3899[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionDead__14daObjSwBallC_cFv, -}; -#pragma pop - -/* 80CF6DEC-80CF6E1C 00005C 0030+00 0/1 0/0 0/0 .data l_func$3895 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80CF6E1C-80CF6E50 -00001 0034+00 1/1 0/0 0/0 .data action_table$3966 */ -SECTION_DATA static void* action_table[13] = { - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x22), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x27), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x2A), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x2E), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x37), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x41), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x4A), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x50), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x58), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x5D), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x65), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x6D), - (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x77), -}; - -/* 80CF6E50-80CF6E84 -00001 0034+00 1/1 0/0 0/0 .data @4113 */ -SECTION_DATA static void* lit_4113[13] = { - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x2B8), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x2D8), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x2D8), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x2F8), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x2F8), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x3C8), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x3C8), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x308), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x3C8), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x330), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x3C8), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x398), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x398), -}; - -/* 80CF6E84-80CF6EB8 -00001 0034+00 1/1 0/0 0/0 .data @4112 */ -SECTION_DATA static void* lit_4112[13] = { - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0xB4), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0xF0), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x100), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x110), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x11C), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x128), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x134), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x280), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x184), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x264), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x270), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x1C0), - (void*)(((char*)demoProc__14daObjSwBallC_cFv) + 0x230), -}; - -/* 80CF6EB8-80CF6ED8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjSwBallC_Method */ -SECTION_DATA static void* l_daObjSwBallC_Method[8] = { - (void*)daObjSwBallC_Create__FP14daObjSwBallC_c, - (void*)daObjSwBallC_Delete__FP14daObjSwBallC_c, - (void*)daObjSwBallC_Execute__FP14daObjSwBallC_c, - (void*)NULL, - (void*)daObjSwBallC_Draw__FP14daObjSwBallC_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80CF6ED8-80CF6F08 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwBallC */ -SECTION_DATA extern void* g_profile_Obj_SwBallC[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01A60000, (void*)&g_fpcLf_Method, - (void*)0x0000058C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02460000, (void*)&l_daObjSwBallC_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80CF6F08-80CF6F14 000178 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; +static char* l_staffName = "lbsw"; /* 80CF5EF8-80CF6024 0003D8 012C+00 1/1 0/0 0/0 .text CreateHeap__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/CreateHeap__14daObjSwBallC_cFv.s" +int daObjSwBallC_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6); + JUT_ASSERT(427, modelData != 0); + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (mModel == 0) { + return 0; + } + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 10); + JUT_ASSERT(441, pbtk != 0); + field_0x574 = new mDoExt_btkAnm(); + if (field_0x574 == NULL || field_0x574->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { + return 0; + } + field_0x574->setPlaySpeed(0.0f); + return 1; } -#pragma pop - -/* 80CF6024-80CF606C 000504 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop /* 80CF606C-80CF6120 00054C 00B4+00 1/1 0/0 0/0 .text create__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF606C.s" +int daObjSwBallC_c::create() { + fopAcM_SetupActor(this, daObjSwBallC_c); + int res = dComIfG_resLoad(&field_0x568, l_arcName); + if (res == cPhs_COMPLEATE_e) { + if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x960) == 0) { + return cPhs_ERROR_e; + } else if (Create() == 0) { + return cPhs_ERROR_e; + } + } + return res; } -#pragma pop /* 80CF6120-80CF6144 000600 0024+00 2/2 0/0 0/0 .text execute__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/execute__14daObjSwBallC_cFv.s" +int daObjSwBallC_c::execute() { + event_proc_call(); + return 1; } -#pragma pop /* 80CF6144-80CF6200 000624 00BC+00 1/2 0/0 0/0 .text event_proc_call__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::event_proc_call() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/event_proc_call__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::event_proc_call() { + typedef void (daObjSwBallC_c::*ballfunc)(); + static ballfunc l_func[4] = {&daObjSwBallC_c::actionWait, &daObjSwBallC_c::actionOrderEvent, &daObjSwBallC_c::actionEvent, &daObjSwBallC_c::actionDead}; + (this->*l_func[field_0x57f])(); } -#pragma pop + +/* 80CF6E1C-80CF6E50 -00001 0034+00 1/1 0/0 0/0 .data action_table$3966 */ +static char* action_table[13] = { + "WAIT", "ON", "OFF", "ON_ALL_B", "OFF_ALL_B", "DEL_BALL", "SOUND", + "SCALING", "INIT", "MESSAGE", "ST_CUT2", "LINK_INIT", "EQUIP_SWD", +}; /* 80CF6200-80CF629C 0006E0 009C+00 1/0 0/0 0/0 .text actionWait__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::actionWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionWait__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::actionWait() { + if (i_fopAcM_isSwitch(this, 0x3d) && i_fopAcM_isSwitch(this, 0x3e)) { + setAction(1); + fopAcM_orderOtherEventId(this, field_0x57c, field_0x57e, 0xffff, 0, 1); + eventInfo.i_onCondition(2); + } } -#pragma pop /* 80CF629C-80CF6344 00077C 00A8+00 1/0 0/0 0/0 .text actionOrderEvent__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::actionOrderEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionOrderEvent__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::actionOrderEvent() { + if (eventInfo.checkCommandDemoAccrpt()) { + setAction(2); + demoProc(); + i_fopAcM_onSwitch(this, 0x3f); + dComIfGs_onTbox(10); + dComIfGs_onTbox(11); + } else { + fopAcM_orderOtherEventId(this, field_0x57c, field_0x57e, 0xffff, 0, 1); + eventInfo.i_onCondition(2); + } } -#pragma pop /* 80CF6344-80CF63F0 000824 00AC+00 1/0 0/0 0/0 .text actionEvent__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::actionEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/actionEvent__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::actionEvent() { + if (dComIfGp_evmng_endCheck(field_0x57c)) { + setAction(3); + i_dComIfGp_event_reset(); + i_fopAcM_onSwitch(this, 0x58); + for (int i = 0; i < 8; i++) { + i_fopAcM_onSwitch(this, i + 0x50); + } + } else { + demoProc(); + } } -#pragma pop /* 80CF63F0-80CF63F4 0008D0 0004+00 1/0 0/0 0/0 .text actionDead__14daObjSwBallC_cFv */ void daObjSwBallC_c::actionDead() { /* empty function */ } -/* ############################################################################################## */ -/* 80CF6D08-80CF6D08 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CF6D89 = "Timer"; -#pragma pop - /* 80CF63F4-80CF6818 0008D4 0424+00 4/2 0/0 0/0 .text demoProc__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::demoProc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/demoProc__14daObjSwBallC_cFv.s" +int daObjSwBallC_c::demoProc() { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz acStack_38; + int uVar1 = dComIfGp_evmng_getMyActIdx(field_0x578, action_table, 13, 0, 0); + field_0x578 = i_dComIfGp_evmng_getMyStaffId(l_staffName, NULL, 0); + player->onShieldBackBone(); + if (dComIfGp_evmng_getIsAddvance(field_0x578)) { + switch (uVar1) { + case 0: + int* puVar4 = dComIfGp_evmng_getMyIntegerP(field_0x578, "Timer"); + if (puVar4 == NULL) { + field_0x580 = 1; + } else { + field_0x580 = *puVar4; + } + break; + case 1: + field_0x574->setPlaySpeed(1.0f); + break; + case 2: + field_0x574->setPlaySpeed(-1.0f); + break; + case 3: + setLightOnSwB(); + break; + case 4: + setLightOffSwB(); + break; + case 5: + deleteLightBall(); + break; + case 6: + fopAcM_seStart(this, Z2SE_OBJ_L_SWD_DEMO, 0); + break; + case 8: + Z2GetAudioMgr()->bgmStreamPrepare(0x200005e); + field_0x585 = 0x37; + setLightOnSwB(); + dMeter2Info_setSword(0x29, 0); + break; + case 11: + player->i_changeOriginalDemo(); + field_0x580 = 2; + acStack_38.set(262.5f, -188.0f, 10712.5f); + player->setPlayerPosAndAngle(&acStack_38, 0, 0); + player->i_changeDemoMode(4, 1, 0, 0); + break; + case 12: + player->i_changeOriginalDemo(); + field_0x580 = 2; + player->i_changeDemoMode(4, 1, 0, 0); + break; + case 9: + field_0x588 = -1; + break; + case 10: + field_0x584 = 1; + execItemGet(LIGHT_SWORD); + break; + } + } + if (field_0x584 != 0) { + player->onLightSwordGetEffect(); + } + switch (uVar1) { + case 0: + if (cLib_calcTimer(&field_0x580) == 0) { + dComIfGp_evmng_cutEnd(field_0x578); + } + break; + case 1: + case 2: + if (field_0x574->play() != 0) { + dComIfGp_evmng_cutEnd(field_0x578); + } + break; + case 3: + case 4: + dComIfGp_evmng_cutEnd(field_0x578); + break; + case 7: + if (calcLightBallScale() != 0) { + deleteLightBall(); + dComIfGp_evmng_cutEnd(field_0x578); + } + break; + case 9: + if (field_0x588 == -1) { + field_0x588 = fopMsgM_messageSet(0xae, 1000); + } else { + msg_class* msg = fopMsgM_SearchByID(field_0x588); + if (msg != NULL) { + if (msg->mMode == 0xe) { + msg->mMode = 0x10; + } else if (msg->mMode == 0x12) { + msg->mMode = 0x13; + dComIfGp_evmng_cutEnd(field_0x578); + } + } + } + break; + case 11: + case 12: + if (cLib_calcTimer(&field_0x580) == 0) { + player->i_cancelOriginalDemo(); + dComIfGp_evmng_cutEnd(field_0x578); + } + break; + default: + dComIfGp_evmng_cutEnd(field_0x578); + break; + } + if (field_0x585 >= 0) { + field_0x585--; + if (field_0x585 == 0) { + Z2GetAudioMgr()->bgmStreamPlay(); + } + } + return 0; } -#pragma pop /* 80CF6818-80CF6888 000CF8 0070+00 2/2 0/0 0/0 .text setLightOnSwB__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::setLightOnSwB() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setLightOnSwB__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::setLightOnSwB() { + for (u8 i = 0; i < 6; i++) { + field_0x582 = i; + daObjSwBallB_c* ball = (daObjSwBallB_c*)i_fpcM_Search(s_swb_sub, this); + if (ball != NULL) { + ball->setLightOn(); + } + } } -#pragma pop /* 80CF6888-80CF68F8 000D68 0070+00 1/1 0/0 0/0 .text setLightOffSwB__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::setLightOffSwB() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/setLightOffSwB__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::setLightOffSwB() { + for (u8 i = 0; i < 6; i++) { + field_0x582 = i; + daObjSwBallB_c* ball = (daObjSwBallB_c*)i_fpcM_Search(s_swb_sub, this); + if (ball != NULL) { + ball->setLightOff(); + } + } } -#pragma pop /* 80CF68F8-80CF692C 000DD8 0034+00 1/1 0/0 0/0 .text deleteLightBall__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::deleteLightBall() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBall__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::deleteLightBall() { + deleteLightBallA(); + deleteLightBallB(); } -#pragma pop /* 80CF692C-80CF6964 000E0C 0038+00 1/1 0/0 0/0 .text deleteLightBallA__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::deleteLightBallA() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBallA__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::deleteLightBallA() { + fopAc_ac_c* ball = (fopAc_ac_c*)i_fpcM_Search(s_ballA_sub, this); + if (ball != NULL) { + fopAcM_delete(ball); + } } -#pragma pop /* 80CF6964-80CF699C 000E44 0038+00 1/1 0/0 0/0 .text deleteLightBallB__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::deleteLightBallB() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/deleteLightBallB__14daObjSwBallC_cFv.s" +void daObjSwBallC_c::deleteLightBallB() { + fopAc_ac_c* ball = (fopAc_ac_c*)i_fpcM_Search(s_ballB_sub, this); + if (ball != NULL) { + fopAcM_delete(ball); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80CF6CF0-80CF6CF4 00001C 0004+00 0/0 0/0 0/0 .rodata @4109 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4109 = 262.5f; -COMPILER_STRIP_GATE(0x80CF6CF0, &lit_4109); -#pragma pop - -/* 80CF6CF4-80CF6CF8 000020 0004+00 0/0 0/0 0/0 .rodata @4110 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4110 = -188.0f; -COMPILER_STRIP_GATE(0x80CF6CF4, &lit_4110); -#pragma pop - -/* 80CF6CF8-80CF6CFC 000024 0004+00 0/0 0/0 0/0 .rodata @4111 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4111 = 10712.5f; -COMPILER_STRIP_GATE(0x80CF6CF8, &lit_4111); -#pragma pop - -/* 80CF6CFC-80CF6D00 000028 0004+00 1/1 0/0 0/0 .rodata @4175 */ -SECTION_RODATA static f32 const lit_4175 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80CF6CFC, &lit_4175); /* 80CF699C-80CF6A74 000E7C 00D8+00 1/1 0/0 0/0 .text calcLightBallScale__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::calcLightBallScale() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/calcLightBallScale__14daObjSwBallC_cFv.s" +int daObjSwBallC_c::calcLightBallScale() { + int uVar3 = 0; + fopAc_ac_c* ball = (fopAc_ac_c*)i_fpcM_Search(s_ballA_sub, this); + if (ball != NULL) { + fopAcM_OnStatus(ball, 0x800); + uVar3 = cLib_chaseF(&ball->scale.x, 0.0f, 0.05f); + ball->scale.y = ball->scale.x; + ball->scale.z = ball->scale.x; + } + ball = (fopAc_ac_c*)i_fpcM_Search(s_ballB_sub, this); + if (ball != NULL) { + fopAcM_OnStatus(ball, 0x800); + uVar3 &= cLib_chaseF(&ball->scale.x, 0.0f, 0.05f); + ball->scale.y = ball->scale.x; + ball->scale.z = ball->scale.x; + } + return uVar3; } -#pragma pop - -/* ############################################################################################## */ -/* 80CF6D00-80CF6D04 00002C 0004+00 0/1 0/0 0/0 .rodata @4252 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4252 = 100.0f; -COMPILER_STRIP_GATE(0x80CF6D00, &lit_4252); -#pragma pop - -/* 80CF6D04-80CF6D08 000030 0004+00 0/1 0/0 0/0 .rodata @4253 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4253 = -100.0f; -COMPILER_STRIP_GATE(0x80CF6D04, &lit_4253); -#pragma pop /* 80CF6A74-80CF6BFC 000F54 0188+00 1/1 0/0 0/0 .text draw__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/draw__14daObjSwBallC_cFv.s" +int daObjSwBallC_c::draw() { + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + dComIfGd_setListDarkBG(); + J3DMaterial* material = mModel->getModelData()->getMaterialNodePointer(0); + if (material->getTexGenBlock()->getTexMtx(1) != NULL) { + J3DTexMtxInfo* texMtxInfo = &material->getTexGenBlock()->getTexMtx(1)->getTexMtxInfo(); + if (texMtxInfo != NULL) { + Mtx auStack_48; + C_MTXLightOrtho(auStack_48, 100.0f, -100.0f, -100.0f, 100.0f, 1.0f, 1.0f, 0.0f, 0.0f); + mDoMtx_stack_c::XrotS(0x4000); + mDoMtx_stack_c::transM(-current.pos.x, -current.pos.y, -current.pos.z); + cMtx_concat(auStack_48, mDoMtx_stack_c::get(), texMtxInfo->mEffectMtx); + } + } + field_0x574->entry(mModel->getModelData()); + mDoExt_modelUpdateDL(mModel); + mDoExt_btkAnmRemove(mModel->getModelData()); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80CF6BFC-80CF6C30 0010DC 0034+00 1/1 0/0 0/0 .text _delete__14daObjSwBallC_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwBallC_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/_delete__14daObjSwBallC_cFv.s" +int daObjSwBallC_c::_delete() { + dComIfG_resDelete(&field_0x568, l_arcName); + return 1; } -#pragma pop /* 80CF6C30-80CF6C50 001110 0020+00 1/0 0/0 0/0 .text daObjSwBallC_Draw__FP14daObjSwBallC_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallC_Draw(daObjSwBallC_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Draw__FP14daObjSwBallC_c.s" +static int daObjSwBallC_Draw(daObjSwBallC_c* param_0) { + return param_0->draw(); } -#pragma pop /* 80CF6C50-80CF6C70 001130 0020+00 1/0 0/0 0/0 .text daObjSwBallC_Execute__FP14daObjSwBallC_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallC_Execute(daObjSwBallC_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Execute__FP14daObjSwBallC_c.s" +static int daObjSwBallC_Execute(daObjSwBallC_c* param_0) { + return param_0->execute(); } -#pragma pop /* 80CF6C70-80CF6C90 001150 0020+00 1/0 0/0 0/0 .text daObjSwBallC_Delete__FP14daObjSwBallC_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallC_Delete(daObjSwBallC_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Delete__FP14daObjSwBallC_c.s" +static int daObjSwBallC_Delete(daObjSwBallC_c* param_0) { + return param_0->_delete(); } -#pragma pop /* 80CF6C90-80CF6CB0 001170 0020+00 1/0 0/0 0/0 .text daObjSwBallC_Create__FP14daObjSwBallC_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwBallC_Create(daObjSwBallC_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/daObjSwBallC_Create__FP14daObjSwBallC_c.s" +static int daObjSwBallC_Create(daObjSwBallC_c* param_0) { + return param_0->create(); } -#pragma pop -/* 80CF6CB0-80CF6CCC 001190 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80CF6CB0(void* _this, u8* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF6CB0.s" -} -#pragma pop +/* 80CF6EB8-80CF6ED8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjSwBallC_Method */ +static actor_method_class l_daObjSwBallC_Method = { + (process_method_func)daObjSwBallC_Create, + (process_method_func)daObjSwBallC_Delete, + (process_method_func)daObjSwBallC_Execute, + (process_method_func)NULL, + (process_method_func)daObjSwBallC_Draw, +}; -/* 80CF6D08-80CF6D08 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80CF6ED8-80CF6F08 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwBallC */ +extern actor_process_profile_definition g_profile_Obj_SwBallC = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_Obj_SwBallC, + &g_fpcLf_Method.mBase, + sizeof(daObjSwBallC_c), + 0, + 0, + &g_fopAc_Method.base, + 0x246, + &l_daObjSwBallC_Method, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.cpp deleted file mode 100644 index bbcb348e1d..0000000000 --- a/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: unknown_translation_unit_bss -// - -#include "rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 data_80CF6F18[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80CF6F18-80CF6F1C 000000 0004+00 0/0 1/1 0/0 .bss None */ -extern u8 data_80CF6F18[4]; -u8 data_80CF6F18[4];