From 08fa2f03fc1333057e265e80dd7ba8b1fc59b472 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sat, 12 Aug 2023 17:09:47 -0700 Subject: [PATCH] Kytag09 and Kytag11 OK, work on d_a_bg_obj and d_kankyo (#1877) * work on kankyo / d_a_bg_obj * d_a_bg_obj work / kytag09 and kytag11 OK * remove asm --- .../initKCollision__8dBgWKColFPv.s | 14 - .../CreateHeapType0__9daBgObj_cFv.s | 156 -- .../CreateHeapType1__9daBgObj_cFv.s | 194 -- .../d_a_bg_obj/CreateHeap__9daBgObj_cFv.s | 46 - .../CreateInitType0__9daBgObj_cFv.s | 31 - .../CreateInitType1__9daBgObj_cFv.s | 93 - .../d_a_bg_obj/Create__9daBgObj_cFv.s | 15 - .../d_a_bg_obj/Delete__9daBgObj_cFv.s | 19 - .../d_a_bg_obj/Draw__9daBgObj_cFv.s | 132 -- .../d_a_bg_obj/ExecuteType0__9daBgObj_cFv.s | 75 - .../d_a_bg_obj/ExecuteType1__9daBgObj_cFv.s | 62 - .../Execute__9daBgObj_cFPPA3_A4_f.s | 51 - .../d_a_bg_obj/d_a_bg_obj/__ct__8dCcD_TriFv.s | 37 - .../d_a_bg_obj/__dt__10cCcD_GSttsFv.s | 20 - .../d_a_bg_obj/__dt__10dCcD_GSttsFv.s | 26 - .../d_a_bg_obj/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGAabFv.s | 20 - .../d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGCylFv.s | 20 - .../d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGPlaFv.s | 20 - .../d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGTriFv.s | 26 - .../d_a_bg_obj/d_a_bg_obj/__dt__8dCcD_TriFv.s | 60 - .../d_a_bg_obj/__sinit_d_a_bg_obj_cpp.s | 110 - .../d_a_bg_obj/actionEvent__9daBgObj_cFv.s | 26 - .../actionOrderWait__9daBgObj_cFv.s | 48 - .../d_a_bg_obj/checkDestroy__9daBgObj_cFv.s | 64 - .../d_a_bg_obj/create1st__9daBgObj_cFv.s | 71 - .../daBgObj_MoveBGDelete__FP9daBgObj_c.s | 9 - .../daBgObj_MoveBGDraw__FP9daBgObj_c.s | 12 - .../daBgObj_MoveBGExecute__FP9daBgObj_c.s | 9 - .../daBgObj_create1st__FP9daBgObj_c.s | 72 - .../d_a_bg_obj/doShareTexture__9daBgObj_cFv.s | 70 - .../a/d_a_bg_obj/d_a_bg_obj/getBmdName__Fii.s | 31 - .../a/d_a_bg_obj/d_a_bg_obj/getBrkName__Fii.s | 32 - .../a/d_a_bg_obj/d_a_bg_obj/getBtkName__Fii.s | 32 - .../a/d_a_bg_obj/d_a_bg_obj/getDzbName__Fi.s | 18 - .../indirectProc__9daBgObj_cFP8J3DModel.s | 39 - .../d_a_bg_obj/initBaseMtx__9daBgObj_cFv.s | 23 - ...InfoBlock__Q29daBgObj_c11spec_data_cFPUc.s | 5 - ...icleBlock__Q29daBgObj_c11spec_data_cFPUc.s | 12 - ...oundBlock__Q29daBgObj_c11spec_data_cFPUc.s | 12 - ...hareBlock__Q29daBgObj_c11spec_data_cFPUc.s | 50 - .../d_a_bg_obj/regist__9daBgObj_cFP4dBgW.s | 16 - .../d_a_bg_obj/release__9daBgObj_cFP4dBgW.s | 22 - .../d_a_bg_obj/setBaseMtx__9daBgObj_cFv.s | 31 - .../d_a_bg_obj/setColCommon__9daBgObj_cFv.s | 41 - ...tage_copy__FP11fshop_classP11fshop_class.s | 20 - .../d_a_kytag09/__dt__12J3DFrameCtrlFv.s | 20 - .../daKytag09_Create__FP10fopAc_ac_c.s | 94 - .../daKytag09_Delete__FP13kytag09_class.s | 24 - .../daKytag09_Draw__FP13kytag09_class.s | 132 -- .../useHeapInit2__FP10fopAc_ac_c.s | 56 - .../d_a_kytag09/useHeapInit__FP10fopAc_ac_c.s | 95 - .../d_a_kytag11/dKankyo_DayProc__Fv.s | 15 - .../daKytag11_Create__FP10fopAc_ac_c.s | 46 - .../daKytag11_Execute__FP13kytag11_class.s | 169 -- include/SSystem/SComponent/c_cc_d.h | 4 + include/SSystem/SComponent/c_m3d_g_tri.h | 6 + include/d/bg/d_bg_w_kcol.h | 9 +- include/d/cc/d_cc_d.h | 3 +- include/d/d_demo.h | 2 +- include/m_Do/m_Do_controller_pad.h | 1 + include/m_Do/m_Do_ext.h | 5 +- include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h | 126 +- .../rel/d/a/kytag/d_a_kytag09/d_a_kytag09.h | 15 +- .../rel/d/a/kytag/d_a_kytag11/d_a_kytag11.h | 15 +- rel/d/a/d_a_bg/d_a_bg.cpp | 62 +- rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp | 1933 ++++++++--------- rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp | 419 ++-- rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp | 373 ++-- rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp | 286 ++- rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp | 2 +- rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp | 2 +- rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp | 15 +- src/d/bg/d_bg_w_kcol.cpp | 14 +- src/d/kankyo/d_kankyo.cpp | 262 ++- 75 files changed, 1831 insertions(+), 4386 deletions(-) delete mode 100644 asm/d/bg/d_bg_w_kcol/initKCollision__8dBgWKColFPv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeapType0__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeapType1__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeap__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateInitType0__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateInitType1__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Create__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Delete__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Draw__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/ExecuteType0__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/ExecuteType1__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Execute__9daBgObj_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__ct__8dCcD_TriFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__10cCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__10dCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGPlaFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGTriFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8dCcD_TriFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__sinit_d_a_bg_obj_cpp.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionEvent__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionOrderWait__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/checkDestroy__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/create1st__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGDelete__FP9daBgObj_c.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGDraw__FP9daBgObj_c.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGExecute__FP9daBgObj_c.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_create1st__FP9daBgObj_c.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/doShareTexture__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBmdName__Fii.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBrkName__Fii.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBtkName__Fii.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getDzbName__Fi.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/indirectProc__9daBgObj_cFP8J3DModel.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initBaseMtx__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initFarInfoBlock__Q29daBgObj_c11spec_data_cFPUc.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initParticleBlock__Q29daBgObj_c11spec_data_cFPUc.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initSoundBlock__Q29daBgObj_c11spec_data_cFPUc.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initTexShareBlock__Q29daBgObj_c11spec_data_cFPUc.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/regist__9daBgObj_cFP4dBgW.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/release__9daBgObj_cFP4dBgW.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setBaseMtx__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setColCommon__9daBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/stage_copy__FP11fshop_classP11fshop_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Delete__FP13kytag09_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Draw__FP13kytag09_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/useHeapInit2__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/dKankyo_DayProc__Fv.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Execute__FP13kytag11_class.s diff --git a/asm/d/bg/d_bg_w_kcol/initKCollision__8dBgWKColFPv.s b/asm/d/bg/d_bg_w_kcol/initKCollision__8dBgWKColFPv.s deleted file mode 100644 index 09f49241d5..0000000000 --- a/asm/d/bg/d_bg_w_kcol/initKCollision__8dBgWKColFPv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8007E7D0: -/* 8007E7D0 80 03 00 00 */ lwz r0, 0(r3) -/* 8007E7D4 7C 03 02 14 */ add r0, r3, r0 -/* 8007E7D8 90 03 00 00 */ stw r0, 0(r3) -/* 8007E7DC 80 03 00 04 */ lwz r0, 4(r3) -/* 8007E7E0 7C 03 02 14 */ add r0, r3, r0 -/* 8007E7E4 90 03 00 04 */ stw r0, 4(r3) -/* 8007E7E8 80 03 00 08 */ lwz r0, 8(r3) -/* 8007E7EC 7C 03 02 14 */ add r0, r3, r0 -/* 8007E7F0 90 03 00 08 */ stw r0, 8(r3) -/* 8007E7F4 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8007E7F8 7C 03 02 14 */ add r0, r3, r0 -/* 8007E7FC 90 03 00 0C */ stw r0, 0xc(r3) -/* 8007E800 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeapType0__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeapType0__9daBgObj_cFv.s deleted file mode 100644 index 1ee55d0e58..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeapType0__9daBgObj_cFv.s +++ /dev/null @@ -1,156 +0,0 @@ -lbl_8045A2F0: -/* 8045A2F0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8045A2F4 7C 08 02 A6 */ mflr r0 -/* 8045A2F8 90 01 00 34 */ stw r0, 0x34(r1) -/* 8045A2FC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8045A300 4B F0 7E C9 */ bl _savegpr_24 -/* 8045A304 7C 7B 1B 78 */ mr r27, r3 -/* 8045A308 3B 80 00 00 */ li r28, 0 -/* 8045A30C 3B 40 00 00 */ li r26, 0 -/* 8045A310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045A314 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045A318 3F C3 00 02 */ addis r30, r3, 2 -/* 8045A31C 3B DE C2 F8 */ addi r30, r30, -15624 -lbl_8045A320: -/* 8045A320 38 60 00 00 */ li r3, 0 -/* 8045A324 7F 84 E3 78 */ mr r4, r28 -/* 8045A328 4B FF F3 31 */ bl getBmdName__Fii -/* 8045A32C 7C 79 1B 78 */ mr r25, r3 -/* 8045A330 7F 63 DB 78 */ mr r3, r27 -/* 8045A334 4B BD 75 3D */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045A338 7F 24 CB 78 */ mr r4, r25 -/* 8045A33C 7F C5 F3 78 */ mr r5, r30 -/* 8045A340 38 C0 00 80 */ li r6, 0x80 -/* 8045A344 4B BE 20 39 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045A348 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8045A34C 41 82 01 AC */ beq lbl_8045A4F8 -/* 8045A350 3C 80 00 08 */ lis r4, 8 -/* 8045A354 3C A0 11 00 */ lis r5, 0x1100 /* 0x11001284@ha */ -/* 8045A358 38 A5 12 84 */ addi r5, r5, 0x1284 /* 0x11001284@l */ -/* 8045A35C 4B BB A8 F9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8045A360 7F BB D2 14 */ add r29, r27, r26 -/* 8045A364 90 7D 05 A8 */ stw r3, 0x5a8(r29) -/* 8045A368 80 1D 05 A8 */ lwz r0, 0x5a8(r29) -/* 8045A36C 28 00 00 00 */ cmplwi r0, 0 -/* 8045A370 40 82 00 0C */ bne lbl_8045A37C -/* 8045A374 38 60 00 00 */ li r3, 0 -/* 8045A378 48 00 01 9C */ b lbl_8045A514 -lbl_8045A37C: -/* 8045A37C 38 00 00 00 */ li r0, 0 -/* 8045A380 90 1D 05 B8 */ stw r0, 0x5b8(r29) -/* 8045A384 90 1D 05 C8 */ stw r0, 0x5c8(r29) -/* 8045A388 38 60 00 00 */ li r3, 0 -/* 8045A38C 7F 84 E3 78 */ mr r4, r28 -/* 8045A390 4B FF F3 35 */ bl getBtkName__Fii -/* 8045A394 7C 79 1B 78 */ mr r25, r3 -/* 8045A398 7F 63 DB 78 */ mr r3, r27 -/* 8045A39C 4B BD 74 D5 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045A3A0 7F 24 CB 78 */ mr r4, r25 -/* 8045A3A4 7F C5 F3 78 */ mr r5, r30 -/* 8045A3A8 38 C0 00 80 */ li r6, 0x80 -/* 8045A3AC 4B BE 1F D1 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045A3B0 7C 78 1B 79 */ or. r24, r3, r3 -/* 8045A3B4 41 82 00 84 */ beq lbl_8045A438 -/* 8045A3B8 38 60 00 18 */ li r3, 0x18 -/* 8045A3BC 4B E7 48 91 */ bl __nw__FUl -/* 8045A3C0 7C 79 1B 79 */ or. r25, r3, r3 -/* 8045A3C4 41 82 00 20 */ beq lbl_8045A3E4 -/* 8045A3C8 3C 80 80 46 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8045CDF4@ha */ -/* 8045A3CC 38 04 CD F4 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8045CDF4@l */ -/* 8045A3D0 90 19 00 00 */ stw r0, 0(r25) -/* 8045A3D4 38 80 00 00 */ li r4, 0 -/* 8045A3D8 4B EC E0 25 */ bl init__12J3DFrameCtrlFs -/* 8045A3DC 38 00 00 00 */ li r0, 0 -/* 8045A3E0 90 19 00 14 */ stw r0, 0x14(r25) -lbl_8045A3E4: -/* 8045A3E4 93 3D 05 B8 */ stw r25, 0x5b8(r29) -/* 8045A3E8 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 8045A3EC 28 03 00 00 */ cmplwi r3, 0 -/* 8045A3F0 41 82 00 30 */ beq lbl_8045A420 -/* 8045A3F4 38 9F 00 58 */ addi r4, r31, 0x58 -/* 8045A3F8 7F 05 C3 78 */ mr r5, r24 -/* 8045A3FC 38 C0 00 01 */ li r6, 1 -/* 8045A400 38 E0 00 02 */ li r7, 2 -/* 8045A404 3D 00 80 46 */ lis r8, lit_4076@ha /* 0x8045CA0C@ha */ -/* 8045A408 C0 28 CA 0C */ lfs f1, lit_4076@l(r8) /* 0x8045CA0C@l */ -/* 8045A40C 39 00 00 00 */ li r8, 0 -/* 8045A410 39 20 FF FF */ li r9, -1 -/* 8045A414 4B BB 32 29 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 8045A418 2C 03 00 00 */ cmpwi r3, 0 -/* 8045A41C 40 82 00 0C */ bne lbl_8045A428 -lbl_8045A420: -/* 8045A420 38 60 00 00 */ li r3, 0 -/* 8045A424 48 00 00 F0 */ b lbl_8045A514 -lbl_8045A428: -/* 8045A428 3C 60 80 46 */ lis r3, lit_4076@ha /* 0x8045CA0C@ha */ -/* 8045A42C C0 03 CA 0C */ lfs f0, lit_4076@l(r3) /* 0x8045CA0C@l */ -/* 8045A430 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 8045A434 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_8045A438: -/* 8045A438 38 60 00 00 */ li r3, 0 -/* 8045A43C 7F 84 E3 78 */ mr r4, r28 -/* 8045A440 4B FF F2 F5 */ bl getBrkName__Fii -/* 8045A444 7C 79 1B 78 */ mr r25, r3 -/* 8045A448 7F 63 DB 78 */ mr r3, r27 -/* 8045A44C 4B BD 74 25 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045A450 7F 24 CB 78 */ mr r4, r25 -/* 8045A454 7F C5 F3 78 */ mr r5, r30 -/* 8045A458 38 C0 00 80 */ li r6, 0x80 -/* 8045A45C 4B BE 1F 21 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045A460 7C 78 1B 79 */ or. r24, r3, r3 -/* 8045A464 41 82 00 84 */ beq lbl_8045A4E8 -/* 8045A468 38 60 00 18 */ li r3, 0x18 -/* 8045A46C 4B E7 47 E1 */ bl __nw__FUl -/* 8045A470 7C 79 1B 79 */ or. r25, r3, r3 -/* 8045A474 41 82 00 20 */ beq lbl_8045A494 -/* 8045A478 3C 80 80 46 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8045CDF4@ha */ -/* 8045A47C 38 04 CD F4 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8045CDF4@l */ -/* 8045A480 90 19 00 00 */ stw r0, 0(r25) -/* 8045A484 38 80 00 00 */ li r4, 0 -/* 8045A488 4B EC DF 75 */ bl init__12J3DFrameCtrlFs -/* 8045A48C 38 00 00 00 */ li r0, 0 -/* 8045A490 90 19 00 14 */ stw r0, 0x14(r25) -lbl_8045A494: -/* 8045A494 93 3D 05 C8 */ stw r25, 0x5c8(r29) -/* 8045A498 80 7D 05 C8 */ lwz r3, 0x5c8(r29) -/* 8045A49C 28 03 00 00 */ cmplwi r3, 0 -/* 8045A4A0 41 82 00 30 */ beq lbl_8045A4D0 -/* 8045A4A4 38 9F 00 58 */ addi r4, r31, 0x58 -/* 8045A4A8 7F 05 C3 78 */ mr r5, r24 -/* 8045A4AC 38 C0 00 01 */ li r6, 1 -/* 8045A4B0 38 E0 00 02 */ li r7, 2 -/* 8045A4B4 3D 00 80 46 */ lis r8, lit_4076@ha /* 0x8045CA0C@ha */ -/* 8045A4B8 C0 28 CA 0C */ lfs f1, lit_4076@l(r8) /* 0x8045CA0C@l */ -/* 8045A4BC 39 00 00 00 */ li r8, 0 -/* 8045A4C0 39 20 FF FF */ li r9, -1 -/* 8045A4C4 4B BB 32 49 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 8045A4C8 2C 03 00 00 */ cmpwi r3, 0 -/* 8045A4CC 40 82 00 0C */ bne lbl_8045A4D8 -lbl_8045A4D0: -/* 8045A4D0 38 60 00 00 */ li r3, 0 -/* 8045A4D4 48 00 00 40 */ b lbl_8045A514 -lbl_8045A4D8: -/* 8045A4D8 3C 60 80 46 */ lis r3, lit_4076@ha /* 0x8045CA0C@ha */ -/* 8045A4DC C0 03 CA 0C */ lfs f0, lit_4076@l(r3) /* 0x8045CA0C@l */ -/* 8045A4E0 80 7D 05 C8 */ lwz r3, 0x5c8(r29) -/* 8045A4E4 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_8045A4E8: -/* 8045A4E8 38 00 00 00 */ li r0, 0 -/* 8045A4EC 90 1D 05 B0 */ stw r0, 0x5b0(r29) -/* 8045A4F0 90 1D 05 C0 */ stw r0, 0x5c0(r29) -/* 8045A4F4 90 1D 05 D0 */ stw r0, 0x5d0(r29) -lbl_8045A4F8: -/* 8045A4F8 3B 9C 00 01 */ addi r28, r28, 1 -/* 8045A4FC 2C 1C 00 02 */ cmpwi r28, 2 -/* 8045A500 3B 5A 00 04 */ addi r26, r26, 4 -/* 8045A504 41 80 FE 1C */ blt lbl_8045A320 -/* 8045A508 7F 63 DB 78 */ mr r3, r27 -/* 8045A50C 48 00 03 31 */ bl doShareTexture__9daBgObj_cFv -/* 8045A510 38 60 00 01 */ li r3, 1 -lbl_8045A514: -/* 8045A514 39 61 00 30 */ addi r11, r1, 0x30 -/* 8045A518 4B F0 7C FD */ bl _restgpr_24 -/* 8045A51C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8045A520 7C 08 03 A6 */ mtlr r0 -/* 8045A524 38 21 00 30 */ addi r1, r1, 0x30 -/* 8045A528 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeapType1__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeapType1__9daBgObj_cFv.s deleted file mode 100644 index e8d355a229..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeapType1__9daBgObj_cFv.s +++ /dev/null @@ -1,194 +0,0 @@ -lbl_8045A574: -/* 8045A574 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8045A578 7C 08 02 A6 */ mflr r0 -/* 8045A57C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8045A580 39 61 00 40 */ addi r11, r1, 0x40 -/* 8045A584 4B F0 7C 39 */ bl _savegpr_21 -/* 8045A588 7C 7F 1B 78 */ mr r31, r3 -/* 8045A58C 3B 60 00 00 */ li r27, 0 -/* 8045A590 3B 20 00 00 */ li r25, 0 -/* 8045A594 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045A598 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045A59C 3F 83 00 02 */ addis r28, r3, 2 -/* 8045A5A0 3B 9C C2 F8 */ addi r28, r28, -15624 -lbl_8045A5A4: -/* 8045A5A4 3B 40 00 00 */ li r26, 0 -/* 8045A5A8 3B 00 00 00 */ li r24, 0 -/* 8045A5AC 7F DF CA 14 */ add r30, r31, r25 -lbl_8045A5B0: -/* 8045A5B0 38 00 00 00 */ li r0, 0 -/* 8045A5B4 7F BE C2 14 */ add r29, r30, r24 -/* 8045A5B8 90 1D 05 A8 */ stw r0, 0x5a8(r29) -/* 8045A5BC 90 1D 05 B8 */ stw r0, 0x5b8(r29) -/* 8045A5C0 90 1D 05 C8 */ stw r0, 0x5c8(r29) -/* 8045A5C4 7F 63 DB 78 */ mr r3, r27 -/* 8045A5C8 7F 44 D3 78 */ mr r4, r26 -/* 8045A5CC 4B FF F0 8D */ bl getBmdName__Fii -/* 8045A5D0 7C 76 1B 78 */ mr r22, r3 -/* 8045A5D4 7F E3 FB 78 */ mr r3, r31 -/* 8045A5D8 4B BD 72 99 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045A5DC 7E C4 B3 78 */ mr r4, r22 -/* 8045A5E0 7F 85 E3 78 */ mr r5, r28 -/* 8045A5E4 38 C0 00 80 */ li r6, 0x80 -/* 8045A5E8 4B BE 1D 95 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045A5EC 7C 77 1B 79 */ or. r23, r3, r3 -/* 8045A5F0 41 82 01 8C */ beq lbl_8045A77C -/* 8045A5F4 3C 80 00 08 */ lis r4, 8 -/* 8045A5F8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11001284@ha */ -/* 8045A5FC 38 A5 12 84 */ addi r5, r5, 0x1284 /* 0x11001284@l */ -/* 8045A600 4B BB A6 55 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8045A604 90 7D 05 A8 */ stw r3, 0x5a8(r29) -/* 8045A608 80 1D 05 A8 */ lwz r0, 0x5a8(r29) -/* 8045A60C 28 00 00 00 */ cmplwi r0, 0 -/* 8045A610 40 82 00 0C */ bne lbl_8045A61C -/* 8045A614 38 60 00 00 */ li r3, 0 -/* 8045A618 48 00 02 0C */ b lbl_8045A824 -lbl_8045A61C: -/* 8045A61C 7F 63 DB 78 */ mr r3, r27 -/* 8045A620 7F 44 D3 78 */ mr r4, r26 -/* 8045A624 4B FF F0 A1 */ bl getBtkName__Fii -/* 8045A628 7C 76 1B 78 */ mr r22, r3 -/* 8045A62C 7F E3 FB 78 */ mr r3, r31 -/* 8045A630 4B BD 72 41 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045A634 7E C4 B3 78 */ mr r4, r22 -/* 8045A638 7F 85 E3 78 */ mr r5, r28 -/* 8045A63C 38 C0 00 80 */ li r6, 0x80 -/* 8045A640 4B BE 1D 3D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045A644 7C 75 1B 79 */ or. r21, r3, r3 -/* 8045A648 41 82 00 84 */ beq lbl_8045A6CC -/* 8045A64C 38 60 00 18 */ li r3, 0x18 -/* 8045A650 4B E7 45 FD */ bl __nw__FUl -/* 8045A654 7C 76 1B 79 */ or. r22, r3, r3 -/* 8045A658 41 82 00 20 */ beq lbl_8045A678 -/* 8045A65C 3C 80 80 46 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8045CDF4@ha */ -/* 8045A660 38 04 CD F4 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8045CDF4@l */ -/* 8045A664 90 16 00 00 */ stw r0, 0(r22) -/* 8045A668 38 80 00 00 */ li r4, 0 -/* 8045A66C 4B EC DD 91 */ bl init__12J3DFrameCtrlFs -/* 8045A670 38 00 00 00 */ li r0, 0 -/* 8045A674 90 16 00 14 */ stw r0, 0x14(r22) -lbl_8045A678: -/* 8045A678 92 DD 05 B8 */ stw r22, 0x5b8(r29) -/* 8045A67C 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 8045A680 28 03 00 00 */ cmplwi r3, 0 -/* 8045A684 41 82 00 30 */ beq lbl_8045A6B4 -/* 8045A688 38 97 00 58 */ addi r4, r23, 0x58 -/* 8045A68C 7E A5 AB 78 */ mr r5, r21 -/* 8045A690 38 C0 00 01 */ li r6, 1 -/* 8045A694 38 E0 00 02 */ li r7, 2 -/* 8045A698 3D 00 80 46 */ lis r8, lit_4076@ha /* 0x8045CA0C@ha */ -/* 8045A69C C0 28 CA 0C */ lfs f1, lit_4076@l(r8) /* 0x8045CA0C@l */ -/* 8045A6A0 39 00 00 00 */ li r8, 0 -/* 8045A6A4 39 20 FF FF */ li r9, -1 -/* 8045A6A8 4B BB 2F 95 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 8045A6AC 2C 03 00 00 */ cmpwi r3, 0 -/* 8045A6B0 40 82 00 0C */ bne lbl_8045A6BC -lbl_8045A6B4: -/* 8045A6B4 38 60 00 00 */ li r3, 0 -/* 8045A6B8 48 00 01 6C */ b lbl_8045A824 -lbl_8045A6BC: -/* 8045A6BC 3C 60 80 46 */ lis r3, lit_4076@ha /* 0x8045CA0C@ha */ -/* 8045A6C0 C0 03 CA 0C */ lfs f0, lit_4076@l(r3) /* 0x8045CA0C@l */ -/* 8045A6C4 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 8045A6C8 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_8045A6CC: -/* 8045A6CC 7F 63 DB 78 */ mr r3, r27 -/* 8045A6D0 7F 44 D3 78 */ mr r4, r26 -/* 8045A6D4 4B FF F0 61 */ bl getBrkName__Fii -/* 8045A6D8 7C 76 1B 78 */ mr r22, r3 -/* 8045A6DC 7F E3 FB 78 */ mr r3, r31 -/* 8045A6E0 4B BD 71 91 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045A6E4 7E C4 B3 78 */ mr r4, r22 -/* 8045A6E8 7F 85 E3 78 */ mr r5, r28 -/* 8045A6EC 38 C0 00 80 */ li r6, 0x80 -/* 8045A6F0 4B BE 1C 8D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045A6F4 7C 75 1B 79 */ or. r21, r3, r3 -/* 8045A6F8 41 82 00 84 */ beq lbl_8045A77C -/* 8045A6FC 38 60 00 18 */ li r3, 0x18 -/* 8045A700 4B E7 45 4D */ bl __nw__FUl -/* 8045A704 7C 76 1B 79 */ or. r22, r3, r3 -/* 8045A708 41 82 00 20 */ beq lbl_8045A728 -/* 8045A70C 3C 80 80 46 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8045CDF4@ha */ -/* 8045A710 38 04 CD F4 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8045CDF4@l */ -/* 8045A714 90 16 00 00 */ stw r0, 0(r22) -/* 8045A718 38 80 00 00 */ li r4, 0 -/* 8045A71C 4B EC DC E1 */ bl init__12J3DFrameCtrlFs -/* 8045A720 38 00 00 00 */ li r0, 0 -/* 8045A724 90 16 00 14 */ stw r0, 0x14(r22) -lbl_8045A728: -/* 8045A728 92 DD 05 C8 */ stw r22, 0x5c8(r29) -/* 8045A72C 80 7D 05 C8 */ lwz r3, 0x5c8(r29) -/* 8045A730 28 03 00 00 */ cmplwi r3, 0 -/* 8045A734 41 82 00 30 */ beq lbl_8045A764 -/* 8045A738 38 97 00 58 */ addi r4, r23, 0x58 -/* 8045A73C 7E A5 AB 78 */ mr r5, r21 -/* 8045A740 38 C0 00 01 */ li r6, 1 -/* 8045A744 38 E0 00 02 */ li r7, 2 -/* 8045A748 3D 00 80 46 */ lis r8, lit_4076@ha /* 0x8045CA0C@ha */ -/* 8045A74C C0 28 CA 0C */ lfs f1, lit_4076@l(r8) /* 0x8045CA0C@l */ -/* 8045A750 39 00 00 00 */ li r8, 0 -/* 8045A754 39 20 FF FF */ li r9, -1 -/* 8045A758 4B BB 2F B5 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 8045A75C 2C 03 00 00 */ cmpwi r3, 0 -/* 8045A760 40 82 00 0C */ bne lbl_8045A76C -lbl_8045A764: -/* 8045A764 38 60 00 00 */ li r3, 0 -/* 8045A768 48 00 00 BC */ b lbl_8045A824 -lbl_8045A76C: -/* 8045A76C 3C 60 80 46 */ lis r3, lit_4076@ha /* 0x8045CA0C@ha */ -/* 8045A770 C0 03 CA 0C */ lfs f0, lit_4076@l(r3) /* 0x8045CA0C@l */ -/* 8045A774 80 7D 05 C8 */ lwz r3, 0x5c8(r29) -/* 8045A778 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_8045A77C: -/* 8045A77C 3B 5A 00 01 */ addi r26, r26, 1 -/* 8045A780 2C 1A 00 02 */ cmpwi r26, 2 -/* 8045A784 3B 18 00 04 */ addi r24, r24, 4 -/* 8045A788 41 80 FE 28 */ blt lbl_8045A5B0 -/* 8045A78C 3B 7B 00 01 */ addi r27, r27, 1 -/* 8045A790 2C 1B 00 02 */ cmpwi r27, 2 -/* 8045A794 3B 39 00 08 */ addi r25, r25, 8 -/* 8045A798 41 80 FE 0C */ blt lbl_8045A5A4 -/* 8045A79C 7F E3 FB 78 */ mr r3, r31 -/* 8045A7A0 48 00 00 9D */ bl doShareTexture__9daBgObj_cFv -/* 8045A7A4 38 60 00 01 */ li r3, 1 -/* 8045A7A8 4B FF EF FD */ bl getDzbName__Fi -/* 8045A7AC 7C 76 1B 78 */ mr r22, r3 -/* 8045A7B0 7F E3 FB 78 */ mr r3, r31 -/* 8045A7B4 4B BD 70 BD */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045A7B8 7E C4 B3 78 */ mr r4, r22 -/* 8045A7BC 7F 85 E3 78 */ mr r5, r28 -/* 8045A7C0 38 C0 00 80 */ li r6, 0x80 -/* 8045A7C4 4B BE 1B B9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045A7C8 7C 75 1B 79 */ or. r21, r3, r3 -/* 8045A7CC 41 82 00 54 */ beq lbl_8045A820 -/* 8045A7D0 38 60 00 C0 */ li r3, 0xc0 -/* 8045A7D4 4B E7 44 79 */ bl __nw__FUl -/* 8045A7D8 7C 60 1B 79 */ or. r0, r3, r3 -/* 8045A7DC 41 82 00 0C */ beq lbl_8045A7E8 -/* 8045A7E0 4B C2 11 91 */ bl __ct__4dBgWFv -/* 8045A7E4 7C 60 1B 78 */ mr r0, r3 -lbl_8045A7E8: -/* 8045A7E8 90 1F 05 D8 */ stw r0, 0x5d8(r31) -/* 8045A7EC 80 7F 05 D8 */ lwz r3, 0x5d8(r31) -/* 8045A7F0 28 03 00 00 */ cmplwi r3, 0 -/* 8045A7F4 41 82 00 1C */ beq lbl_8045A810 -/* 8045A7F8 7E A4 AB 78 */ mr r4, r21 -/* 8045A7FC 38 A0 00 01 */ li r5, 1 -/* 8045A800 38 DF 05 6C */ addi r6, r31, 0x56c -/* 8045A804 4B C1 F7 35 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 8045A808 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8045A80C 41 82 00 14 */ beq lbl_8045A820 -lbl_8045A810: -/* 8045A810 38 00 00 00 */ li r0, 0 -/* 8045A814 90 1F 05 D8 */ stw r0, 0x5d8(r31) -/* 8045A818 38 60 00 00 */ li r3, 0 -/* 8045A81C 48 00 00 08 */ b lbl_8045A824 -lbl_8045A820: -/* 8045A820 38 60 00 01 */ li r3, 1 -lbl_8045A824: -/* 8045A824 39 61 00 40 */ addi r11, r1, 0x40 -/* 8045A828 4B F0 79 E1 */ bl _restgpr_21 -/* 8045A82C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8045A830 7C 08 03 A6 */ mtlr r0 -/* 8045A834 38 21 00 40 */ addi r1, r1, 0x40 -/* 8045A838 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeap__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeap__9daBgObj_cFv.s deleted file mode 100644 index d41f6980c8..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeap__9daBgObj_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8045A940: -/* 8045A940 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045A944 7C 08 02 A6 */ mflr r0 -/* 8045A948 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045A94C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045A950 93 C1 00 08 */ stw r30, 8(r1) -/* 8045A954 7C 7E 1B 78 */ mr r30, r3 -/* 8045A958 3C 80 80 46 */ lis r4, l_specName@ha /* 0x8045CB38@ha */ -/* 8045A95C 83 E4 CB 38 */ lwz r31, l_specName@l(r4) /* 0x8045CB38@l */ -/* 8045A960 4B BD 6F 11 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045A964 7F E4 FB 78 */ mr r4, r31 -/* 8045A968 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045A96C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045A970 3C A5 00 02 */ addis r5, r5, 2 -/* 8045A974 38 C0 00 80 */ li r6, 0x80 -/* 8045A978 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8045A97C 4B BE 1A 01 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045A980 7C 64 1B 78 */ mr r4, r3 -/* 8045A984 88 1E 0D 02 */ lbz r0, 0xd02(r30) -/* 8045A988 28 00 00 00 */ cmplwi r0, 0 -/* 8045A98C 40 82 00 24 */ bne lbl_8045A9B0 -/* 8045A990 38 7E 0C D0 */ addi r3, r30, 0xcd0 -/* 8045A994 4B FF EF 71 */ bl Set__Q29daBgObj_c11spec_data_cFPv -/* 8045A998 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8045A99C 40 82 00 0C */ bne lbl_8045A9A8 -/* 8045A9A0 38 60 00 00 */ li r3, 0 -/* 8045A9A4 48 00 00 2C */ b lbl_8045A9D0 -lbl_8045A9A8: -/* 8045A9A8 38 00 00 01 */ li r0, 1 -/* 8045A9AC 98 1E 0D 02 */ stb r0, 0xd02(r30) -lbl_8045A9B0: -/* 8045A9B0 7F C3 F3 78 */ mr r3, r30 -/* 8045A9B4 A0 1E 0C D0 */ lhz r0, 0xcd0(r30) -/* 8045A9B8 1C A0 00 0C */ mulli r5, r0, 0xc -/* 8045A9BC 3C 80 80 46 */ lis r4, mCreateHeapFunc__9daBgObj_c@ha /* 0x8045CB6C@ha */ -/* 8045A9C0 38 04 CB 6C */ addi r0, r4, mCreateHeapFunc__9daBgObj_c@l /* 0x8045CB6C@l */ -/* 8045A9C4 7D 80 2A 14 */ add r12, r0, r5 -/* 8045A9C8 4B F0 76 BD */ bl __ptmf_scall -/* 8045A9CC 60 00 00 00 */ nop -lbl_8045A9D0: -/* 8045A9D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045A9D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8045A9D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045A9DC 7C 08 03 A6 */ mtlr r0 -/* 8045A9E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045A9E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateInitType0__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateInitType0__9daBgObj_cFv.s deleted file mode 100644 index 68e48d8bef..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateInitType0__9daBgObj_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8045A0EC: -/* 8045A0EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045A0F0 7C 08 02 A6 */ mflr r0 -/* 8045A0F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045A0F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045A0FC 7C 7F 1B 78 */ mr r31, r3 -/* 8045A100 38 00 00 00 */ li r0, 0 -/* 8045A104 98 03 0C C8 */ stb r0, 0xcc8(r3) -/* 8045A108 4B FF FC 35 */ bl initBaseMtx__9daBgObj_cFv -/* 8045A10C 88 1F 0C C8 */ lbz r0, 0xcc8(r31) -/* 8045A110 54 00 18 38 */ slwi r0, r0, 3 -/* 8045A114 7C 7F 02 14 */ add r3, r31, r0 -/* 8045A118 80 63 05 A8 */ lwz r3, 0x5a8(r3) -/* 8045A11C 38 03 00 24 */ addi r0, r3, 0x24 -/* 8045A120 90 1F 05 04 */ stw r0, 0x504(r31) -/* 8045A124 7F E3 FB 78 */ mr r3, r31 -/* 8045A128 88 9F 0C C8 */ lbz r4, 0xcc8(r31) -/* 8045A12C 4B FF FD E9 */ bl settingCullSizeBoxForCull__9daBgObj_cFi -/* 8045A130 3C 60 80 46 */ lis r3, lit_3873@ha /* 0x8045CA00@ha */ -/* 8045A134 C0 03 CA 00 */ lfs f0, lit_3873@l(r3) /* 0x8045CA00@l */ -/* 8045A138 C0 3F 0C F0 */ lfs f1, 0xcf0(r31) -/* 8045A13C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8045A140 41 82 00 08 */ beq lbl_8045A148 -/* 8045A144 D0 3F 05 20 */ stfs f1, 0x520(r31) -lbl_8045A148: -/* 8045A148 38 60 00 01 */ li r3, 1 -/* 8045A14C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045A150 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045A154 7C 08 03 A6 */ mtlr r0 -/* 8045A158 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045A15C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateInitType1__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateInitType1__9daBgObj_cFv.s deleted file mode 100644 index 40d10ddb0a..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateInitType1__9daBgObj_cFv.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_8045A160: -/* 8045A160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045A164 7C 08 02 A6 */ mflr r0 -/* 8045A168 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045A16C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045A170 7C 7F 1B 78 */ mr r31, r3 -/* 8045A174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045A178 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045A17C A0 1F 0C CC */ lhz r0, 0xccc(r31) -/* 8045A180 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8045A184 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8045A188 7C 05 07 74 */ extsb r5, r0 -/* 8045A18C 4B BD B1 D5 */ bl isSwitch__10dSv_info_cCFii -/* 8045A190 2C 03 00 00 */ cmpwi r3, 0 -/* 8045A194 41 82 00 30 */ beq lbl_8045A1C4 -/* 8045A198 38 00 00 01 */ li r0, 1 -/* 8045A19C 98 1F 0C C8 */ stb r0, 0xcc8(r31) -/* 8045A1A0 7F E3 FB 78 */ mr r3, r31 -/* 8045A1A4 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 8045A1A8 4B FF F9 BD */ bl release__9daBgObj_cFP4dBgW -/* 8045A1AC 7F E3 FB 78 */ mr r3, r31 -/* 8045A1B0 80 9F 05 D8 */ lwz r4, 0x5d8(r31) -/* 8045A1B4 4B FF FA 01 */ bl regist__9daBgObj_cFP4dBgW -/* 8045A1B8 38 00 00 03 */ li r0, 3 -/* 8045A1BC 98 1F 0C C5 */ stb r0, 0xcc5(r31) -/* 8045A1C0 48 00 00 10 */ b lbl_8045A1D0 -lbl_8045A1C4: -/* 8045A1C4 38 00 00 00 */ li r0, 0 -/* 8045A1C8 98 1F 0C C8 */ stb r0, 0xcc8(r31) -/* 8045A1CC 98 1F 0C C5 */ stb r0, 0xcc5(r31) -lbl_8045A1D0: -/* 8045A1D0 7F E3 FB 78 */ mr r3, r31 -/* 8045A1D4 4B FF FB 69 */ bl initBaseMtx__9daBgObj_cFv -/* 8045A1D8 88 9F 0C C8 */ lbz r4, 0xcc8(r31) -/* 8045A1DC 28 04 00 01 */ cmplwi r4, 1 -/* 8045A1E0 40 82 00 28 */ bne lbl_8045A208 -/* 8045A1E4 54 80 1D 78 */ rlwinm r0, r4, 3, 0x15, 0x1c -/* 8045A1E8 7C 7F 02 14 */ add r3, r31, r0 -/* 8045A1EC 80 03 05 A8 */ lwz r0, 0x5a8(r3) -/* 8045A1F0 28 00 00 00 */ cmplwi r0, 0 -/* 8045A1F4 40 82 00 14 */ bne lbl_8045A208 -/* 8045A1F8 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 8045A1FC 38 03 00 24 */ addi r0, r3, 0x24 -/* 8045A200 90 1F 05 04 */ stw r0, 0x504(r31) -/* 8045A204 48 00 00 18 */ b lbl_8045A21C -lbl_8045A208: -/* 8045A208 54 80 1D 78 */ rlwinm r0, r4, 3, 0x15, 0x1c -/* 8045A20C 7C 7F 02 14 */ add r3, r31, r0 -/* 8045A210 80 63 05 A8 */ lwz r3, 0x5a8(r3) -/* 8045A214 38 03 00 24 */ addi r0, r3, 0x24 -/* 8045A218 90 1F 05 04 */ stw r0, 0x504(r31) -lbl_8045A21C: -/* 8045A21C 7F E3 FB 78 */ mr r3, r31 -/* 8045A220 88 9F 0C C8 */ lbz r4, 0xcc8(r31) -/* 8045A224 4B FF FB E1 */ bl settingCullSizeBoxForCo__9daBgObj_cFi -/* 8045A228 3C 60 80 46 */ lis r3, lit_3873@ha /* 0x8045CA00@ha */ -/* 8045A22C C0 03 CA 00 */ lfs f0, lit_3873@l(r3) /* 0x8045CA00@l */ -/* 8045A230 C0 3F 0C F0 */ lfs f1, 0xcf0(r31) -/* 8045A234 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8045A238 41 82 00 08 */ beq lbl_8045A240 -/* 8045A23C D0 3F 05 20 */ stfs f1, 0x520(r31) -lbl_8045A240: -/* 8045A240 38 7F 05 DC */ addi r3, r31, 0x5dc -/* 8045A244 38 80 00 FF */ li r4, 0xff -/* 8045A248 38 A0 00 FF */ li r5, 0xff -/* 8045A24C 7F E6 FB 78 */ mr r6, r31 -/* 8045A250 4B C2 96 11 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 8045A254 7F E3 FB 78 */ mr r3, r31 -/* 8045A258 48 00 08 99 */ bl setColCommon__9daBgObj_cFv -/* 8045A25C 7F E3 FB 78 */ mr r3, r31 -/* 8045A260 88 9F 0C C8 */ lbz r4, 0xcc8(r31) -/* 8045A264 4B FF FC B1 */ bl settingCullSizeBoxForCull__9daBgObj_cFi -/* 8045A268 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045A26C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045A270 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8045A274 7F E4 FB 78 */ mr r4, r31 -/* 8045A278 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8045A27C 54 05 5E 3E */ rlwinm r5, r0, 0xb, 0x18, 0x1f -/* 8045A280 4B BE D4 19 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc -/* 8045A284 B0 7F 0C C6 */ sth r3, 0xcc6(r31) -/* 8045A288 80 7F 05 D8 */ lwz r3, 0x5d8(r31) -/* 8045A28C 28 03 00 00 */ cmplwi r3, 0 -/* 8045A290 41 82 00 08 */ beq lbl_8045A298 -/* 8045A294 4B C2 17 2D */ bl Move__4dBgWFv -lbl_8045A298: -/* 8045A298 7F E3 FB 78 */ mr r3, r31 -/* 8045A29C 4B FF F9 51 */ bl initAtt__9daBgObj_cFv -/* 8045A2A0 38 60 00 01 */ li r3, 1 -/* 8045A2A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045A2A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045A2AC 7C 08 03 A6 */ mtlr r0 -/* 8045A2B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045A2B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Create__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Create__9daBgObj_cFv.s deleted file mode 100644 index 65f910b0e9..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Create__9daBgObj_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8045A2B8: -/* 8045A2B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045A2BC 7C 08 02 A6 */ mflr r0 -/* 8045A2C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045A2C4 A0 03 0C D0 */ lhz r0, 0xcd0(r3) -/* 8045A2C8 1C A0 00 0C */ mulli r5, r0, 0xc -/* 8045A2CC 3C 80 80 46 */ lis r4, mCreateInitFunc__9daBgObj_c@ha /* 0x8045CBCC@ha */ -/* 8045A2D0 38 04 CB CC */ addi r0, r4, mCreateInitFunc__9daBgObj_c@l /* 0x8045CBCC@l */ -/* 8045A2D4 7D 80 2A 14 */ add r12, r0, r5 -/* 8045A2D8 4B F0 7D AD */ bl __ptmf_scall -/* 8045A2DC 60 00 00 00 */ nop -/* 8045A2E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045A2E4 7C 08 03 A6 */ mtlr r0 -/* 8045A2E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045A2EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Delete__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Delete__9daBgObj_cFv.s deleted file mode 100644 index 9a75d2898b..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Delete__9daBgObj_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8045C2E8: -/* 8045C2E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C2EC 7C 08 02 A6 */ mflr r0 -/* 8045C2F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C2F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045C2F8 7C 7F 1B 78 */ mr r31, r3 -/* 8045C2FC 80 83 05 D8 */ lwz r4, 0x5d8(r3) -/* 8045C300 4B FF D8 65 */ bl release__9daBgObj_cFP4dBgW -/* 8045C304 7F E3 FB 78 */ mr r3, r31 -/* 8045C308 4B BD 55 69 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045C30C 7C 64 1B 78 */ mr r4, r3 -/* 8045C310 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 8045C314 4B BD 0C F5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8045C318 38 60 00 01 */ li r3, 1 -/* 8045C31C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045C320 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C324 7C 08 03 A6 */ mtlr r0 -/* 8045C328 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C32C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Draw__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Draw__9daBgObj_cFv.s deleted file mode 100644 index 9ebf89a20b..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Draw__9daBgObj_cFv.s +++ /dev/null @@ -1,132 +0,0 @@ -lbl_8045C078: -/* 8045C078 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8045C07C 7C 08 02 A6 */ mflr r0 -/* 8045C080 90 01 00 24 */ stw r0, 0x24(r1) -/* 8045C084 39 61 00 20 */ addi r11, r1, 0x20 -/* 8045C088 4B F0 61 4D */ bl _savegpr_27 -/* 8045C08C 7C 7C 1B 78 */ mr r28, r3 -/* 8045C090 38 A0 00 01 */ li r5, 1 -/* 8045C094 38 60 00 00 */ li r3, 0 -/* 8045C098 38 00 00 02 */ li r0, 2 -/* 8045C09C 7C 09 03 A6 */ mtctr r0 -lbl_8045C0A0: -/* 8045C0A0 88 1C 0C C8 */ lbz r0, 0xcc8(r28) -/* 8045C0A4 54 00 18 38 */ slwi r0, r0, 3 -/* 8045C0A8 7C 80 1A 14 */ add r4, r0, r3 -/* 8045C0AC 38 04 05 A8 */ addi r0, r4, 0x5a8 -/* 8045C0B0 7C 1C 00 2E */ lwzx r0, r28, r0 -/* 8045C0B4 28 00 00 00 */ cmplwi r0, 0 -/* 8045C0B8 41 82 00 08 */ beq lbl_8045C0C0 -/* 8045C0BC 38 A0 00 00 */ li r5, 0 -lbl_8045C0C0: -/* 8045C0C0 38 63 00 04 */ addi r3, r3, 4 -/* 8045C0C4 42 00 FF DC */ bdnz lbl_8045C0A0 -/* 8045C0C8 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 8045C0CC 41 82 00 0C */ beq lbl_8045C0D8 -/* 8045C0D0 38 60 00 01 */ li r3, 1 -/* 8045C0D4 48 00 01 70 */ b lbl_8045C244 -lbl_8045C0D8: -/* 8045C0D8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8045C0DC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8045C0E0 38 80 00 20 */ li r4, 0x20 -/* 8045C0E4 38 BC 04 D0 */ addi r5, r28, 0x4d0 -/* 8045C0E8 38 DC 01 0C */ addi r6, r28, 0x10c -/* 8045C0EC 4B D4 76 D9 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8045C0F0 3B C0 00 00 */ li r30, 0 -/* 8045C0F4 3B 60 00 00 */ li r27, 0 -/* 8045C0F8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8045C0FC 3B A3 CA 54 */ addi r29, r3, g_env_light@l /* 0x8042CA54@l */ -lbl_8045C100: -/* 8045C100 88 1C 0C C8 */ lbz r0, 0xcc8(r28) -/* 8045C104 54 00 18 38 */ slwi r0, r0, 3 -/* 8045C108 7C 60 DA 14 */ add r3, r0, r27 -/* 8045C10C 38 03 05 A8 */ addi r0, r3, 0x5a8 -/* 8045C110 7C 9C 00 2E */ lwzx r4, r28, r0 -/* 8045C114 28 04 00 00 */ cmplwi r4, 0 -/* 8045C118 41 82 00 14 */ beq lbl_8045C12C -/* 8045C11C 7F A3 EB 78 */ mr r3, r29 -/* 8045C120 80 84 00 04 */ lwz r4, 4(r4) -/* 8045C124 38 BC 01 0C */ addi r5, r28, 0x10c -/* 8045C128 4B D4 8C 79 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -lbl_8045C12C: -/* 8045C12C 3B DE 00 01 */ addi r30, r30, 1 -/* 8045C130 2C 1E 00 02 */ cmpwi r30, 2 -/* 8045C134 3B 7B 00 04 */ addi r27, r27, 4 -/* 8045C138 41 80 FF C8 */ blt lbl_8045C100 -/* 8045C13C 3B A0 00 00 */ li r29, 0 -/* 8045C140 3B 60 00 00 */ li r27, 0 -/* 8045C144 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045C148 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045C14C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8045C150 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -lbl_8045C154: -/* 8045C154 80 1E 5F 70 */ lwz r0, 0x5f70(r30) -/* 8045C158 90 1F 00 48 */ stw r0, 0x48(r31) -/* 8045C15C 80 1E 5F 74 */ lwz r0, 0x5f74(r30) -/* 8045C160 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8045C164 88 1C 0C C8 */ lbz r0, 0xcc8(r28) -/* 8045C168 54 00 18 38 */ slwi r0, r0, 3 -/* 8045C16C 7C 60 DA 14 */ add r3, r0, r27 -/* 8045C170 38 03 05 A8 */ addi r0, r3, 0x5a8 -/* 8045C174 7C 9C 00 2E */ lwzx r4, r28, r0 -/* 8045C178 28 04 00 00 */ cmplwi r4, 0 -/* 8045C17C 41 82 00 9C */ beq lbl_8045C218 -/* 8045C180 7F 83 E3 78 */ mr r3, r28 -/* 8045C184 48 00 00 D9 */ bl indirectProc__9daBgObj_cFP8J3DModel -/* 8045C188 88 1C 0C C8 */ lbz r0, 0xcc8(r28) -/* 8045C18C 54 00 18 38 */ slwi r0, r0, 3 -/* 8045C190 7C 60 DA 14 */ add r3, r0, r27 -/* 8045C194 38 03 05 A8 */ addi r0, r3, 0x5a8 -/* 8045C198 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8045C19C 4B D5 0B 89 */ bl dKy_bg_MAxx_proc__FPv -/* 8045C1A0 88 1C 0C C8 */ lbz r0, 0xcc8(r28) -/* 8045C1A4 54 00 18 38 */ slwi r0, r0, 3 -/* 8045C1A8 7C 80 DA 14 */ add r4, r0, r27 -/* 8045C1AC 7C 9C 22 14 */ add r4, r28, r4 -/* 8045C1B0 80 64 05 B8 */ lwz r3, 0x5b8(r4) -/* 8045C1B4 28 03 00 00 */ cmplwi r3, 0 -/* 8045C1B8 41 82 00 18 */ beq lbl_8045C1D0 -/* 8045C1BC 80 84 05 A8 */ lwz r4, 0x5a8(r4) -/* 8045C1C0 80 84 00 04 */ lwz r4, 4(r4) -/* 8045C1C4 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8045C1C8 38 84 00 58 */ addi r4, r4, 0x58 -/* 8045C1CC 4B BB 15 0D */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -lbl_8045C1D0: -/* 8045C1D0 88 1C 0C C8 */ lbz r0, 0xcc8(r28) -/* 8045C1D4 54 00 18 38 */ slwi r0, r0, 3 -/* 8045C1D8 7C 80 DA 14 */ add r4, r0, r27 -/* 8045C1DC 7C 9C 22 14 */ add r4, r28, r4 -/* 8045C1E0 80 64 05 C8 */ lwz r3, 0x5c8(r4) -/* 8045C1E4 28 03 00 00 */ cmplwi r3, 0 -/* 8045C1E8 41 82 00 18 */ beq lbl_8045C200 -/* 8045C1EC 80 84 05 A8 */ lwz r4, 0x5a8(r4) -/* 8045C1F0 80 84 00 04 */ lwz r4, 4(r4) -/* 8045C1F4 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8045C1F8 38 84 00 58 */ addi r4, r4, 0x58 -/* 8045C1FC 4B BB 15 AD */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -lbl_8045C200: -/* 8045C200 88 1C 0C C8 */ lbz r0, 0xcc8(r28) -/* 8045C204 54 00 18 38 */ slwi r0, r0, 3 -/* 8045C208 7C 60 DA 14 */ add r3, r0, r27 -/* 8045C20C 38 03 05 A8 */ addi r0, r3, 0x5a8 -/* 8045C210 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8045C214 4B BB 1A B1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_8045C218: -/* 8045C218 3B BD 00 01 */ addi r29, r29, 1 -/* 8045C21C 2C 1D 00 02 */ cmpwi r29, 2 -/* 8045C220 3B 7B 00 04 */ addi r27, r27, 4 -/* 8045C224 41 80 FF 30 */ blt lbl_8045C154 -/* 8045C228 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045C22C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045C230 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 8045C234 90 1F 00 48 */ stw r0, 0x48(r31) -/* 8045C238 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 8045C23C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8045C240 38 60 00 01 */ li r3, 1 -lbl_8045C244: -/* 8045C244 39 61 00 20 */ addi r11, r1, 0x20 -/* 8045C248 4B F0 5F D9 */ bl _restgpr_27 -/* 8045C24C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8045C250 7C 08 03 A6 */ mtlr r0 -/* 8045C254 38 21 00 20 */ addi r1, r1, 0x20 -/* 8045C258 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/ExecuteType0__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/ExecuteType0__9daBgObj_cFv.s deleted file mode 100644 index 1d57947169..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/ExecuteType0__9daBgObj_cFv.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_8045BDB8: -/* 8045BDB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045BDBC 7C 08 02 A6 */ mflr r0 -/* 8045BDC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045BDC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045BDC8 7C 7F 1B 78 */ mr r31, r3 -/* 8045BDCC A0 03 0C CC */ lhz r0, 0xccc(r3) -/* 8045BDD0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8045BDD4 A0 03 0C CA */ lhz r0, 0xcca(r3) -/* 8045BDD8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8045BDDC 28 04 00 FF */ cmplwi r4, 0xff -/* 8045BDE0 41 82 00 D8 */ beq lbl_8045BEB8 -/* 8045BDE4 28 00 00 FF */ cmplwi r0, 0xff -/* 8045BDE8 40 82 00 68 */ bne lbl_8045BE50 -/* 8045BDEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045BDF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045BDF4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8045BDF8 7C 05 07 74 */ extsb r5, r0 -/* 8045BDFC 4B BD 95 65 */ bl isSwitch__10dSv_info_cCFii -/* 8045BE00 2C 03 00 00 */ cmpwi r3, 0 -/* 8045BE04 41 82 00 28 */ beq lbl_8045BE2C -/* 8045BE08 88 1F 0C C8 */ lbz r0, 0xcc8(r31) -/* 8045BE0C 28 00 00 01 */ cmplwi r0, 1 -/* 8045BE10 40 82 00 A8 */ bne lbl_8045BEB8 -/* 8045BE14 7F E3 FB 78 */ mr r3, r31 -/* 8045BE18 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 8045BE1C 4B FF DD 99 */ bl regist__9daBgObj_cFP4dBgW -/* 8045BE20 38 00 00 00 */ li r0, 0 -/* 8045BE24 98 1F 0C C8 */ stb r0, 0xcc8(r31) -/* 8045BE28 48 00 00 90 */ b lbl_8045BEB8 -lbl_8045BE2C: -/* 8045BE2C 88 1F 0C C8 */ lbz r0, 0xcc8(r31) -/* 8045BE30 28 00 00 00 */ cmplwi r0, 0 -/* 8045BE34 40 82 00 84 */ bne lbl_8045BEB8 -/* 8045BE38 7F E3 FB 78 */ mr r3, r31 -/* 8045BE3C 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 8045BE40 4B FF DD 25 */ bl release__9daBgObj_cFP4dBgW -/* 8045BE44 38 00 00 01 */ li r0, 1 -/* 8045BE48 98 1F 0C C8 */ stb r0, 0xcc8(r31) -/* 8045BE4C 48 00 00 6C */ b lbl_8045BEB8 -lbl_8045BE50: -/* 8045BE50 28 00 00 00 */ cmplwi r0, 0 -/* 8045BE54 40 82 00 64 */ bne lbl_8045BEB8 -/* 8045BE58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045BE5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045BE60 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8045BE64 7C 05 07 74 */ extsb r5, r0 -/* 8045BE68 4B BD 94 F9 */ bl isSwitch__10dSv_info_cCFii -/* 8045BE6C 2C 03 00 00 */ cmpwi r3, 0 -/* 8045BE70 41 82 00 28 */ beq lbl_8045BE98 -/* 8045BE74 88 1F 0C C8 */ lbz r0, 0xcc8(r31) -/* 8045BE78 28 00 00 00 */ cmplwi r0, 0 -/* 8045BE7C 40 82 00 3C */ bne lbl_8045BEB8 -/* 8045BE80 7F E3 FB 78 */ mr r3, r31 -/* 8045BE84 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 8045BE88 4B FF DC DD */ bl release__9daBgObj_cFP4dBgW -/* 8045BE8C 38 00 00 01 */ li r0, 1 -/* 8045BE90 98 1F 0C C8 */ stb r0, 0xcc8(r31) -/* 8045BE94 48 00 00 24 */ b lbl_8045BEB8 -lbl_8045BE98: -/* 8045BE98 88 1F 0C C8 */ lbz r0, 0xcc8(r31) -/* 8045BE9C 28 00 00 01 */ cmplwi r0, 1 -/* 8045BEA0 40 82 00 18 */ bne lbl_8045BEB8 -/* 8045BEA4 7F E3 FB 78 */ mr r3, r31 -/* 8045BEA8 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 8045BEAC 4B FF DD 09 */ bl regist__9daBgObj_cFP4dBgW -/* 8045BEB0 38 00 00 00 */ li r0, 0 -/* 8045BEB4 98 1F 0C C8 */ stb r0, 0xcc8(r31) -lbl_8045BEB8: -/* 8045BEB8 38 60 00 01 */ li r3, 1 -/* 8045BEBC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045BEC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045BEC4 7C 08 03 A6 */ mtlr r0 -/* 8045BEC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045BECC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/ExecuteType1__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/ExecuteType1__9daBgObj_cFv.s deleted file mode 100644 index d0b35bd8d1..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/ExecuteType1__9daBgObj_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8045BED0: -/* 8045BED0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045BED4 7C 08 02 A6 */ mflr r0 -/* 8045BED8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045BEDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045BEE0 7C 7F 1B 78 */ mr r31, r3 -/* 8045BEE4 3C 60 80 46 */ lis r3, cNullVec__6Z2Calc@ha /* 0x8045CAC4@ha */ -/* 8045BEE8 38 C3 CA C4 */ addi r6, r3, cNullVec__6Z2Calc@l /* 0x8045CAC4@l */ -/* 8045BEEC 3C 60 80 46 */ lis r3, data_8045CE40@ha /* 0x8045CE40@ha */ -/* 8045BEF0 38 A3 CE 40 */ addi r5, r3, data_8045CE40@l /* 0x8045CE40@l */ -/* 8045BEF4 88 05 00 00 */ lbz r0, 0(r5) -/* 8045BEF8 7C 00 07 75 */ extsb. r0, r0 -/* 8045BEFC 40 82 00 70 */ bne lbl_8045BF6C -/* 8045BF00 80 66 02 10 */ lwz r3, 0x210(r6) -/* 8045BF04 80 06 02 14 */ lwz r0, 0x214(r6) -/* 8045BF08 90 66 02 40 */ stw r3, 0x240(r6) -/* 8045BF0C 90 06 02 44 */ stw r0, 0x244(r6) -/* 8045BF10 80 06 02 18 */ lwz r0, 0x218(r6) -/* 8045BF14 90 06 02 48 */ stw r0, 0x248(r6) -/* 8045BF18 38 86 02 40 */ addi r4, r6, 0x240 -/* 8045BF1C 80 66 02 1C */ lwz r3, 0x21c(r6) -/* 8045BF20 80 06 02 20 */ lwz r0, 0x220(r6) -/* 8045BF24 90 64 00 0C */ stw r3, 0xc(r4) -/* 8045BF28 90 04 00 10 */ stw r0, 0x10(r4) -/* 8045BF2C 80 06 02 24 */ lwz r0, 0x224(r6) -/* 8045BF30 90 04 00 14 */ stw r0, 0x14(r4) -/* 8045BF34 80 66 02 28 */ lwz r3, 0x228(r6) -/* 8045BF38 80 06 02 2C */ lwz r0, 0x22c(r6) -/* 8045BF3C 90 64 00 18 */ stw r3, 0x18(r4) -/* 8045BF40 90 04 00 1C */ stw r0, 0x1c(r4) -/* 8045BF44 80 06 02 30 */ lwz r0, 0x230(r6) -/* 8045BF48 90 04 00 20 */ stw r0, 0x20(r4) -/* 8045BF4C 80 66 02 34 */ lwz r3, 0x234(r6) -/* 8045BF50 80 06 02 38 */ lwz r0, 0x238(r6) -/* 8045BF54 90 64 00 24 */ stw r3, 0x24(r4) -/* 8045BF58 90 04 00 28 */ stw r0, 0x28(r4) -/* 8045BF5C 80 06 02 3C */ lwz r0, 0x23c(r6) -/* 8045BF60 90 04 00 2C */ stw r0, 0x2c(r4) -/* 8045BF64 38 00 00 01 */ li r0, 1 -/* 8045BF68 98 05 00 00 */ stb r0, 0(r5) -lbl_8045BF6C: -/* 8045BF6C 7F E3 FB 78 */ mr r3, r31 -/* 8045BF70 88 1F 0C C5 */ lbz r0, 0xcc5(r31) -/* 8045BF74 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8045BF78 39 86 02 40 */ addi r12, r6, 0x240 -/* 8045BF7C 7D 8C 02 14 */ add r12, r12, r0 -/* 8045BF80 4B F0 61 05 */ bl __ptmf_scall -/* 8045BF84 60 00 00 00 */ nop -/* 8045BF88 88 7F 0D 01 */ lbz r3, 0xd01(r31) -/* 8045BF8C 28 03 00 00 */ cmplwi r3, 0 -/* 8045BF90 41 82 00 14 */ beq lbl_8045BFA4 -/* 8045BF94 28 03 00 64 */ cmplwi r3, 0x64 -/* 8045BF98 40 80 00 0C */ bge lbl_8045BFA4 -/* 8045BF9C 38 03 00 01 */ addi r0, r3, 1 -/* 8045BFA0 98 1F 0D 01 */ stb r0, 0xd01(r31) -lbl_8045BFA4: -/* 8045BFA4 38 60 00 01 */ li r3, 1 -/* 8045BFA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045BFAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045BFB0 7C 08 03 A6 */ mtlr r0 -/* 8045BFB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045BFB8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Execute__9daBgObj_cFPPA3_A4_f.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Execute__9daBgObj_cFPPA3_A4_f.s deleted file mode 100644 index bfe1905a74..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Execute__9daBgObj_cFPPA3_A4_f.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8045BFBC: -/* 8045BFBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8045BFC0 7C 08 02 A6 */ mflr r0 -/* 8045BFC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8045BFC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8045BFCC 4B F0 62 0D */ bl _savegpr_28 -/* 8045BFD0 7C 7E 1B 78 */ mr r30, r3 -/* 8045BFD4 7C 9F 23 78 */ mr r31, r4 -/* 8045BFD8 A0 03 0C D0 */ lhz r0, 0xcd0(r3) -/* 8045BFDC 1C A0 00 0C */ mulli r5, r0, 0xc -/* 8045BFE0 3C 80 80 46 */ lis r4, mExecuteFunc__9daBgObj_c@ha /* 0x8045CC2C@ha */ -/* 8045BFE4 38 04 CC 2C */ addi r0, r4, mExecuteFunc__9daBgObj_c@l /* 0x8045CC2C@l */ -/* 8045BFE8 7D 80 2A 14 */ add r12, r0, r5 -/* 8045BFEC 4B F0 60 99 */ bl __ptmf_scall -/* 8045BFF0 60 00 00 00 */ nop -/* 8045BFF4 3B 80 00 00 */ li r28, 0 -/* 8045BFF8 3B A0 00 00 */ li r29, 0 -lbl_8045BFFC: -/* 8045BFFC 88 1E 0C C8 */ lbz r0, 0xcc8(r30) -/* 8045C000 54 00 18 38 */ slwi r0, r0, 3 -/* 8045C004 7C 60 EA 14 */ add r3, r0, r29 -/* 8045C008 38 03 05 B8 */ addi r0, r3, 0x5b8 -/* 8045C00C 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 8045C010 28 03 00 00 */ cmplwi r3, 0 -/* 8045C014 41 82 00 08 */ beq lbl_8045C01C -/* 8045C018 4B BB 14 11 */ bl play__14mDoExt_baseAnmFv -lbl_8045C01C: -/* 8045C01C 88 1E 0C C8 */ lbz r0, 0xcc8(r30) -/* 8045C020 54 00 18 38 */ slwi r0, r0, 3 -/* 8045C024 7C 60 EA 14 */ add r3, r0, r29 -/* 8045C028 38 03 05 C8 */ addi r0, r3, 0x5c8 -/* 8045C02C 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 8045C030 28 03 00 00 */ cmplwi r3, 0 -/* 8045C034 41 82 00 08 */ beq lbl_8045C03C -/* 8045C038 4B BB 13 F1 */ bl play__14mDoExt_baseAnmFv -lbl_8045C03C: -/* 8045C03C 3B 9C 00 01 */ addi r28, r28, 1 -/* 8045C040 2C 1C 00 02 */ cmpwi r28, 2 -/* 8045C044 3B BD 00 04 */ addi r29, r29, 4 -/* 8045C048 41 80 FF B4 */ blt lbl_8045BFFC -/* 8045C04C 38 1E 05 6C */ addi r0, r30, 0x56c -/* 8045C050 90 1F 00 00 */ stw r0, 0(r31) -/* 8045C054 7F C3 F3 78 */ mr r3, r30 -/* 8045C058 4B FF DD 3D */ bl setBaseMtx__9daBgObj_cFv -/* 8045C05C 38 60 00 01 */ li r3, 1 -/* 8045C060 39 61 00 20 */ addi r11, r1, 0x20 -/* 8045C064 4B F0 61 C1 */ bl _restgpr_28 -/* 8045C068 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8045C06C 7C 08 03 A6 */ mtlr r0 -/* 8045C070 38 21 00 20 */ addi r1, r1, 0x20 -/* 8045C074 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__ct__8dCcD_TriFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__ct__8dCcD_TriFv.s deleted file mode 100644 index 760991c640..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__ct__8dCcD_TriFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8045C5B4: -/* 8045C5B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C5B8 7C 08 02 A6 */ mflr r0 -/* 8045C5BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C5C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045C5C4 7C 7F 1B 78 */ mr r31, r3 -/* 8045C5C8 4B C2 74 61 */ bl __ct__12dCcD_GObjInfFv -/* 8045C5CC 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8045C5D0 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8045C5D4 90 1F 01 20 */ stw r0, 0x120(r31) -/* 8045C5D8 3C 60 80 46 */ lis r3, __vt__8cM3dGAab@ha /* 0x8045CDC0@ha */ -/* 8045C5DC 38 03 CD C0 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8045CDC0@l */ -/* 8045C5E0 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 8045C5E4 3C 60 80 46 */ lis r3, __vt__8cM3dGPla@ha /* 0x8045CD9C@ha */ -/* 8045C5E8 38 03 CD 9C */ addi r0, r3, __vt__8cM3dGPla@l /* 0x8045CD9C@l */ -/* 8045C5EC 90 1F 01 34 */ stw r0, 0x134(r31) -/* 8045C5F0 3C 60 80 46 */ lis r3, __vt__8cM3dGTri@ha /* 0x8045CDA8@ha */ -/* 8045C5F4 38 03 CD A8 */ addi r0, r3, __vt__8cM3dGTri@l /* 0x8045CDA8@l */ -/* 8045C5F8 90 1F 01 34 */ stw r0, 0x134(r31) -/* 8045C5FC 3C 60 80 3C */ lis r3, __vt__12cCcD_TriAttr@ha /* 0x803C366C@ha */ -/* 8045C600 38 63 36 6C */ addi r3, r3, __vt__12cCcD_TriAttr@l /* 0x803C366C@l */ -/* 8045C604 90 7F 01 20 */ stw r3, 0x120(r31) -/* 8045C608 38 03 00 58 */ addi r0, r3, 0x58 -/* 8045C60C 90 1F 01 34 */ stw r0, 0x134(r31) -/* 8045C610 3C 60 80 3B */ lis r3, __vt__8dCcD_Tri@ha /* 0x803AC0E0@ha */ -/* 8045C614 38 63 C0 E0 */ addi r3, r3, __vt__8dCcD_Tri@l /* 0x803AC0E0@l */ -/* 8045C618 90 7F 00 3C */ stw r3, 0x3c(r31) -/* 8045C61C 38 03 00 2C */ addi r0, r3, 0x2c -/* 8045C620 90 1F 01 20 */ stw r0, 0x120(r31) -/* 8045C624 38 03 00 84 */ addi r0, r3, 0x84 -/* 8045C628 90 1F 01 34 */ stw r0, 0x134(r31) -/* 8045C62C 7F E3 FB 78 */ mr r3, r31 -/* 8045C630 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045C634 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C638 7C 08 03 A6 */ mtlr r0 -/* 8045C63C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C640 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 782062876a..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8045C7B0: -/* 8045C7B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C7B4 7C 08 02 A6 */ mflr r0 -/* 8045C7B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C7BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045C7C0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8045C7C4 41 82 00 1C */ beq lbl_8045C7E0 -/* 8045C7C8 3C A0 80 46 */ lis r5, __vt__10cCcD_GStts@ha /* 0x8045CD84@ha */ -/* 8045C7CC 38 05 CD 84 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x8045CD84@l */ -/* 8045C7D0 90 1F 00 00 */ stw r0, 0(r31) -/* 8045C7D4 7C 80 07 35 */ extsh. r0, r4 -/* 8045C7D8 40 81 00 08 */ ble lbl_8045C7E0 -/* 8045C7DC 4B E7 25 61 */ bl __dl__FPv -lbl_8045C7E0: -/* 8045C7E0 7F E3 FB 78 */ mr r3, r31 -/* 8045C7E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045C7E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C7EC 7C 08 03 A6 */ mtlr r0 -/* 8045C7F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C7F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 87550d1e69..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8045C6E8: -/* 8045C6E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C6EC 7C 08 02 A6 */ mflr r0 -/* 8045C6F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C6F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045C6F8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8045C6FC 41 82 00 30 */ beq lbl_8045C72C -/* 8045C700 3C 60 80 46 */ lis r3, __vt__10dCcD_GStts@ha /* 0x8045CD90@ha */ -/* 8045C704 38 03 CD 90 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x8045CD90@l */ -/* 8045C708 90 1F 00 00 */ stw r0, 0(r31) -/* 8045C70C 41 82 00 10 */ beq lbl_8045C71C -/* 8045C710 3C 60 80 46 */ lis r3, __vt__10cCcD_GStts@ha /* 0x8045CD84@ha */ -/* 8045C714 38 03 CD 84 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x8045CD84@l */ -/* 8045C718 90 1F 00 00 */ stw r0, 0(r31) -lbl_8045C71C: -/* 8045C71C 7C 80 07 35 */ extsh. r0, r4 -/* 8045C720 40 81 00 0C */ ble lbl_8045C72C -/* 8045C724 7F E3 FB 78 */ mr r3, r31 -/* 8045C728 4B E7 26 15 */ bl __dl__FPv -lbl_8045C72C: -/* 8045C72C 7F E3 FB 78 */ mr r3, r31 -/* 8045C730 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045C734 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C738 7C 08 03 A6 */ mtlr r0 -/* 8045C73C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C740 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index e5c200c74b..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8045A52C: -/* 8045A52C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045A530 7C 08 02 A6 */ mflr r0 -/* 8045A534 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045A538 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045A53C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8045A540 41 82 00 1C */ beq lbl_8045A55C -/* 8045A544 3C A0 80 46 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x8045CDF4@ha */ -/* 8045A548 38 05 CD F4 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x8045CDF4@l */ -/* 8045A54C 90 1F 00 00 */ stw r0, 0(r31) -/* 8045A550 7C 80 07 35 */ extsh. r0, r4 -/* 8045A554 40 81 00 08 */ ble lbl_8045A55C -/* 8045A558 4B E7 47 E5 */ bl __dl__FPv -lbl_8045A55C: -/* 8045A55C 7F E3 FB 78 */ mr r3, r31 -/* 8045A560 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045A564 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045A568 7C 08 03 A6 */ mtlr r0 -/* 8045A56C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045A570 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGAabFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGAabFv.s deleted file mode 100644 index c43de41e81..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8045C48C: -/* 8045C48C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C490 7C 08 02 A6 */ mflr r0 -/* 8045C494 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C498 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045C49C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8045C4A0 41 82 00 1C */ beq lbl_8045C4BC -/* 8045C4A4 3C A0 80 46 */ lis r5, __vt__8cM3dGAab@ha /* 0x8045CDC0@ha */ -/* 8045C4A8 38 05 CD C0 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x8045CDC0@l */ -/* 8045C4AC 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8045C4B0 7C 80 07 35 */ extsh. r0, r4 -/* 8045C4B4 40 81 00 08 */ ble lbl_8045C4BC -/* 8045C4B8 4B E7 28 85 */ bl __dl__FPv -lbl_8045C4BC: -/* 8045C4BC 7F E3 FB 78 */ mr r3, r31 -/* 8045C4C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045C4C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C4C8 7C 08 03 A6 */ mtlr r0 -/* 8045C4CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C4D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGCylFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGCylFv.s deleted file mode 100644 index a32f623a34..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8045C444: -/* 8045C444 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C448 7C 08 02 A6 */ mflr r0 -/* 8045C44C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C450 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045C454 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8045C458 41 82 00 1C */ beq lbl_8045C474 -/* 8045C45C 3C A0 80 46 */ lis r5, __vt__8cM3dGCyl@ha /* 0x8045CDB4@ha */ -/* 8045C460 38 05 CD B4 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x8045CDB4@l */ -/* 8045C464 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8045C468 7C 80 07 35 */ extsh. r0, r4 -/* 8045C46C 40 81 00 08 */ ble lbl_8045C474 -/* 8045C470 4B E7 28 CD */ bl __dl__FPv -lbl_8045C474: -/* 8045C474 7F E3 FB 78 */ mr r3, r31 -/* 8045C478 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045C47C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C480 7C 08 03 A6 */ mtlr r0 -/* 8045C484 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C488 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGPlaFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGPlaFv.s deleted file mode 100644 index 0372572a53..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGPlaFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8045C6A0: -/* 8045C6A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C6A4 7C 08 02 A6 */ mflr r0 -/* 8045C6A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C6AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045C6B0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8045C6B4 41 82 00 1C */ beq lbl_8045C6D0 -/* 8045C6B8 3C A0 80 46 */ lis r5, __vt__8cM3dGPla@ha /* 0x8045CD9C@ha */ -/* 8045C6BC 38 05 CD 9C */ addi r0, r5, __vt__8cM3dGPla@l /* 0x8045CD9C@l */ -/* 8045C6C0 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8045C6C4 7C 80 07 35 */ extsh. r0, r4 -/* 8045C6C8 40 81 00 08 */ ble lbl_8045C6D0 -/* 8045C6CC 4B E7 26 71 */ bl __dl__FPv -lbl_8045C6D0: -/* 8045C6D0 7F E3 FB 78 */ mr r3, r31 -/* 8045C6D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045C6D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C6DC 7C 08 03 A6 */ mtlr r0 -/* 8045C6E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C6E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGTriFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGTriFv.s deleted file mode 100644 index 0d27558997..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGTriFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8045C644: -/* 8045C644 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C648 7C 08 02 A6 */ mflr r0 -/* 8045C64C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C650 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045C654 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8045C658 41 82 00 30 */ beq lbl_8045C688 -/* 8045C65C 3C 60 80 46 */ lis r3, __vt__8cM3dGTri@ha /* 0x8045CDA8@ha */ -/* 8045C660 38 03 CD A8 */ addi r0, r3, __vt__8cM3dGTri@l /* 0x8045CDA8@l */ -/* 8045C664 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8045C668 41 82 00 10 */ beq lbl_8045C678 -/* 8045C66C 3C 60 80 46 */ lis r3, __vt__8cM3dGPla@ha /* 0x8045CD9C@ha */ -/* 8045C670 38 03 CD 9C */ addi r0, r3, __vt__8cM3dGPla@l /* 0x8045CD9C@l */ -/* 8045C674 90 1F 00 10 */ stw r0, 0x10(r31) -lbl_8045C678: -/* 8045C678 7C 80 07 35 */ extsh. r0, r4 -/* 8045C67C 40 81 00 0C */ ble lbl_8045C688 -/* 8045C680 7F E3 FB 78 */ mr r3, r31 -/* 8045C684 4B E7 26 B9 */ bl __dl__FPv -lbl_8045C688: -/* 8045C688 7F E3 FB 78 */ mr r3, r31 -/* 8045C68C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045C690 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C694 7C 08 03 A6 */ mtlr r0 -/* 8045C698 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C69C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8dCcD_TriFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8dCcD_TriFv.s deleted file mode 100644 index fa5025af09..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8dCcD_TriFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8045C4D4: -/* 8045C4D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C4D8 7C 08 02 A6 */ mflr r0 -/* 8045C4DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C4E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045C4E4 93 C1 00 08 */ stw r30, 8(r1) -/* 8045C4E8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8045C4EC 7C 9F 23 78 */ mr r31, r4 -/* 8045C4F0 41 82 00 A8 */ beq lbl_8045C598 -/* 8045C4F4 3C 60 80 3B */ lis r3, __vt__8dCcD_Tri@ha /* 0x803AC0E0@ha */ -/* 8045C4F8 38 63 C0 E0 */ addi r3, r3, __vt__8dCcD_Tri@l /* 0x803AC0E0@l */ -/* 8045C4FC 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 8045C500 38 03 00 2C */ addi r0, r3, 0x2c -/* 8045C504 90 1E 01 20 */ stw r0, 0x120(r30) -/* 8045C508 38 03 00 84 */ addi r0, r3, 0x84 -/* 8045C50C 90 1E 01 34 */ stw r0, 0x134(r30) -/* 8045C510 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 8045C514 41 82 00 68 */ beq lbl_8045C57C -/* 8045C518 3C 60 80 3C */ lis r3, __vt__12cCcD_TriAttr@ha /* 0x803C366C@ha */ -/* 8045C51C 38 63 36 6C */ addi r3, r3, __vt__12cCcD_TriAttr@l /* 0x803C366C@l */ -/* 8045C520 90 7E 01 20 */ stw r3, 0x120(r30) -/* 8045C524 38 03 00 58 */ addi r0, r3, 0x58 -/* 8045C528 90 1E 01 34 */ stw r0, 0x134(r30) -/* 8045C52C 34 1E 01 24 */ addic. r0, r30, 0x124 -/* 8045C530 41 82 00 24 */ beq lbl_8045C554 -/* 8045C534 3C 60 80 46 */ lis r3, __vt__8cM3dGTri@ha /* 0x8045CDA8@ha */ -/* 8045C538 38 03 CD A8 */ addi r0, r3, __vt__8cM3dGTri@l /* 0x8045CDA8@l */ -/* 8045C53C 90 1E 01 34 */ stw r0, 0x134(r30) -/* 8045C540 34 1E 01 24 */ addic. r0, r30, 0x124 -/* 8045C544 41 82 00 10 */ beq lbl_8045C554 -/* 8045C548 3C 60 80 46 */ lis r3, __vt__8cM3dGPla@ha /* 0x8045CD9C@ha */ -/* 8045C54C 38 03 CD 9C */ addi r0, r3, __vt__8cM3dGPla@l /* 0x8045CD9C@l */ -/* 8045C550 90 1E 01 34 */ stw r0, 0x134(r30) -lbl_8045C554: -/* 8045C554 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 8045C558 41 82 00 24 */ beq lbl_8045C57C -/* 8045C55C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8045C560 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8045C564 90 1E 01 20 */ stw r0, 0x120(r30) -/* 8045C568 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 8045C56C 41 82 00 10 */ beq lbl_8045C57C -/* 8045C570 3C 60 80 46 */ lis r3, __vt__8cM3dGAab@ha /* 0x8045CDC0@ha */ -/* 8045C574 38 03 CD C0 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8045CDC0@l */ -/* 8045C578 90 1E 01 1C */ stw r0, 0x11c(r30) -lbl_8045C57C: -/* 8045C57C 7F C3 F3 78 */ mr r3, r30 -/* 8045C580 38 80 00 00 */ li r4, 0 -/* 8045C584 4B C2 7B 61 */ bl __dt__12dCcD_GObjInfFv -/* 8045C588 7F E0 07 35 */ extsh. r0, r31 -/* 8045C58C 40 81 00 0C */ ble lbl_8045C598 -/* 8045C590 7F C3 F3 78 */ mr r3, r30 -/* 8045C594 4B E7 27 A9 */ bl __dl__FPv -lbl_8045C598: -/* 8045C598 7F C3 F3 78 */ mr r3, r30 -/* 8045C59C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045C5A0 83 C1 00 08 */ lwz r30, 8(r1) -/* 8045C5A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C5A8 7C 08 03 A6 */ mtlr r0 -/* 8045C5AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C5B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__sinit_d_a_bg_obj_cpp.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__sinit_d_a_bg_obj_cpp.s deleted file mode 100644 index 454e418944..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__sinit_d_a_bg_obj_cpp.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_8045C7F8: -/* 8045C7F8 3C 60 80 46 */ lis r3, cNullVec__6Z2Calc@ha /* 0x8045CAC4@ha */ -/* 8045C7FC 38 63 CA C4 */ addi r3, r3, cNullVec__6Z2Calc@l /* 0x8045CAC4@l */ -/* 8045C800 80 83 00 78 */ lwz r4, 0x78(r3) -/* 8045C804 80 03 00 7C */ lwz r0, 0x7c(r3) -/* 8045C808 90 83 00 A8 */ stw r4, 0xa8(r3) -/* 8045C80C 90 03 00 AC */ stw r0, 0xac(r3) -/* 8045C810 80 03 00 80 */ lwz r0, 0x80(r3) -/* 8045C814 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 8045C818 38 A3 00 A8 */ addi r5, r3, 0xa8 -/* 8045C81C 80 83 00 84 */ lwz r4, 0x84(r3) -/* 8045C820 80 03 00 88 */ lwz r0, 0x88(r3) -/* 8045C824 90 85 00 0C */ stw r4, 0xc(r5) -/* 8045C828 90 05 00 10 */ stw r0, 0x10(r5) -/* 8045C82C 80 03 00 8C */ lwz r0, 0x8c(r3) -/* 8045C830 90 05 00 14 */ stw r0, 0x14(r5) -/* 8045C834 80 83 00 90 */ lwz r4, 0x90(r3) -/* 8045C838 80 03 00 94 */ lwz r0, 0x94(r3) -/* 8045C83C 90 85 00 18 */ stw r4, 0x18(r5) -/* 8045C840 90 05 00 1C */ stw r0, 0x1c(r5) -/* 8045C844 80 03 00 98 */ lwz r0, 0x98(r3) -/* 8045C848 90 05 00 20 */ stw r0, 0x20(r5) -/* 8045C84C 80 83 00 9C */ lwz r4, 0x9c(r3) -/* 8045C850 80 03 00 A0 */ lwz r0, 0xa0(r3) -/* 8045C854 90 85 00 24 */ stw r4, 0x24(r5) -/* 8045C858 90 05 00 28 */ stw r0, 0x28(r5) -/* 8045C85C 80 03 00 A4 */ lwz r0, 0xa4(r3) -/* 8045C860 90 05 00 2C */ stw r0, 0x2c(r5) -/* 8045C864 80 83 00 D8 */ lwz r4, 0xd8(r3) -/* 8045C868 80 03 00 DC */ lwz r0, 0xdc(r3) -/* 8045C86C 90 83 01 08 */ stw r4, 0x108(r3) -/* 8045C870 90 03 01 0C */ stw r0, 0x10c(r3) -/* 8045C874 80 03 00 E0 */ lwz r0, 0xe0(r3) -/* 8045C878 90 03 01 10 */ stw r0, 0x110(r3) -/* 8045C87C 38 A3 01 08 */ addi r5, r3, 0x108 -/* 8045C880 80 83 00 E4 */ lwz r4, 0xe4(r3) -/* 8045C884 80 03 00 E8 */ lwz r0, 0xe8(r3) -/* 8045C888 90 85 00 0C */ stw r4, 0xc(r5) -/* 8045C88C 90 05 00 10 */ stw r0, 0x10(r5) -/* 8045C890 80 03 00 EC */ lwz r0, 0xec(r3) -/* 8045C894 90 05 00 14 */ stw r0, 0x14(r5) -/* 8045C898 80 83 00 F0 */ lwz r4, 0xf0(r3) -/* 8045C89C 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8045C8A0 90 85 00 18 */ stw r4, 0x18(r5) -/* 8045C8A4 90 05 00 1C */ stw r0, 0x1c(r5) -/* 8045C8A8 80 03 00 F8 */ lwz r0, 0xf8(r3) -/* 8045C8AC 90 05 00 20 */ stw r0, 0x20(r5) -/* 8045C8B0 80 83 00 FC */ lwz r4, 0xfc(r3) -/* 8045C8B4 80 03 01 00 */ lwz r0, 0x100(r3) -/* 8045C8B8 90 85 00 24 */ stw r4, 0x24(r5) -/* 8045C8BC 90 05 00 28 */ stw r0, 0x28(r5) -/* 8045C8C0 80 03 01 04 */ lwz r0, 0x104(r3) -/* 8045C8C4 90 05 00 2C */ stw r0, 0x2c(r5) -/* 8045C8C8 80 83 01 38 */ lwz r4, 0x138(r3) -/* 8045C8CC 80 03 01 3C */ lwz r0, 0x13c(r3) -/* 8045C8D0 90 83 01 68 */ stw r4, 0x168(r3) -/* 8045C8D4 90 03 01 6C */ stw r0, 0x16c(r3) -/* 8045C8D8 80 03 01 40 */ lwz r0, 0x140(r3) -/* 8045C8DC 90 03 01 70 */ stw r0, 0x170(r3) -/* 8045C8E0 38 A3 01 68 */ addi r5, r3, 0x168 -/* 8045C8E4 80 83 01 44 */ lwz r4, 0x144(r3) -/* 8045C8E8 80 03 01 48 */ lwz r0, 0x148(r3) -/* 8045C8EC 90 85 00 0C */ stw r4, 0xc(r5) -/* 8045C8F0 90 05 00 10 */ stw r0, 0x10(r5) -/* 8045C8F4 80 03 01 4C */ lwz r0, 0x14c(r3) -/* 8045C8F8 90 05 00 14 */ stw r0, 0x14(r5) -/* 8045C8FC 80 83 01 50 */ lwz r4, 0x150(r3) -/* 8045C900 80 03 01 54 */ lwz r0, 0x154(r3) -/* 8045C904 90 85 00 18 */ stw r4, 0x18(r5) -/* 8045C908 90 05 00 1C */ stw r0, 0x1c(r5) -/* 8045C90C 80 03 01 58 */ lwz r0, 0x158(r3) -/* 8045C910 90 05 00 20 */ stw r0, 0x20(r5) -/* 8045C914 80 83 01 5C */ lwz r4, 0x15c(r3) -/* 8045C918 80 03 01 60 */ lwz r0, 0x160(r3) -/* 8045C91C 90 85 00 24 */ stw r4, 0x24(r5) -/* 8045C920 90 05 00 28 */ stw r0, 0x28(r5) -/* 8045C924 80 03 01 64 */ lwz r0, 0x164(r3) -/* 8045C928 90 05 00 2C */ stw r0, 0x2c(r5) -/* 8045C92C 80 83 01 98 */ lwz r4, 0x198(r3) -/* 8045C930 80 03 01 9C */ lwz r0, 0x19c(r3) -/* 8045C934 90 83 01 D4 */ stw r4, 0x1d4(r3) -/* 8045C938 90 03 01 D8 */ stw r0, 0x1d8(r3) -/* 8045C93C 80 03 01 A0 */ lwz r0, 0x1a0(r3) -/* 8045C940 90 03 01 DC */ stw r0, 0x1dc(r3) -/* 8045C944 38 A3 01 D4 */ addi r5, r3, 0x1d4 -/* 8045C948 80 83 01 A4 */ lwz r4, 0x1a4(r3) -/* 8045C94C 80 03 01 A8 */ lwz r0, 0x1a8(r3) -/* 8045C950 90 85 00 0C */ stw r4, 0xc(r5) -/* 8045C954 90 05 00 10 */ stw r0, 0x10(r5) -/* 8045C958 80 03 01 AC */ lwz r0, 0x1ac(r3) -/* 8045C95C 90 05 00 14 */ stw r0, 0x14(r5) -/* 8045C960 80 83 01 B0 */ lwz r4, 0x1b0(r3) -/* 8045C964 80 03 01 B4 */ lwz r0, 0x1b4(r3) -/* 8045C968 90 85 00 18 */ stw r4, 0x18(r5) -/* 8045C96C 90 05 00 1C */ stw r0, 0x1c(r5) -/* 8045C970 80 03 01 B8 */ lwz r0, 0x1b8(r3) -/* 8045C974 90 05 00 20 */ stw r0, 0x20(r5) -/* 8045C978 80 83 01 BC */ lwz r4, 0x1bc(r3) -/* 8045C97C 80 03 01 C0 */ lwz r0, 0x1c0(r3) -/* 8045C980 90 85 00 24 */ stw r4, 0x24(r5) -/* 8045C984 90 05 00 28 */ stw r0, 0x28(r5) -/* 8045C988 80 03 01 C4 */ lwz r0, 0x1c4(r3) -/* 8045C98C 90 05 00 2C */ stw r0, 0x2c(r5) -/* 8045C990 80 83 01 C8 */ lwz r4, 0x1c8(r3) -/* 8045C994 80 03 01 CC */ lwz r0, 0x1cc(r3) -/* 8045C998 90 85 00 30 */ stw r4, 0x30(r5) -/* 8045C99C 90 05 00 34 */ stw r0, 0x34(r5) -/* 8045C9A0 80 03 01 D0 */ lwz r0, 0x1d0(r3) -/* 8045C9A4 90 05 00 38 */ stw r0, 0x38(r5) -/* 8045C9A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionEvent__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionEvent__9daBgObj_cFv.s deleted file mode 100644 index 5f935b25b9..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionEvent__9daBgObj_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8045BD50: -/* 8045BD50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045BD54 7C 08 02 A6 */ mflr r0 -/* 8045BD58 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045BD5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045BD60 93 C1 00 08 */ stw r30, 8(r1) -/* 8045BD64 7C 7E 1B 78 */ mr r30, r3 -/* 8045BD68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045BD6C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045BD70 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 8045BD74 A8 9E 0C C6 */ lha r4, 0xcc6(r30) -/* 8045BD78 4B BE BD 01 */ bl endCheck__16dEvent_manager_cFs -/* 8045BD7C 2C 03 00 00 */ cmpwi r3, 0 -/* 8045BD80 41 82 00 14 */ beq lbl_8045BD94 -/* 8045BD84 38 00 00 03 */ li r0, 3 -/* 8045BD88 98 1E 0C C5 */ stb r0, 0xcc5(r30) -/* 8045BD8C 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8045BD90 4B BE 66 D9 */ bl reset__14dEvt_control_cFv -lbl_8045BD94: -/* 8045BD94 38 60 00 01 */ li r3, 1 -/* 8045BD98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045BD9C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8045BDA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045BDA4 7C 08 03 A6 */ mtlr r0 -/* 8045BDA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045BDAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionOrderWait__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionOrderWait__9daBgObj_cFv.s deleted file mode 100644 index beb833c46b..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionOrderWait__9daBgObj_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_8045BB38: -/* 8045BB38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045BB3C 7C 08 02 A6 */ mflr r0 -/* 8045BB40 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045BB44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045BB48 7C 7F 1B 78 */ mr r31, r3 -/* 8045BB4C 4B FF F9 01 */ bl checkDestroy__9daBgObj_cFv -/* 8045BB50 2C 03 00 00 */ cmpwi r3, 0 -/* 8045BB54 41 82 00 40 */ beq lbl_8045BB94 -/* 8045BB58 88 1F 0C D2 */ lbz r0, 0xcd2(r31) -/* 8045BB5C 2C 00 00 02 */ cmpwi r0, 2 -/* 8045BB60 41 82 00 28 */ beq lbl_8045BB88 -/* 8045BB64 40 80 00 10 */ bge lbl_8045BB74 -/* 8045BB68 2C 00 00 00 */ cmpwi r0, 0 -/* 8045BB6C 40 80 00 10 */ bge lbl_8045BB7C -/* 8045BB70 48 00 00 58 */ b lbl_8045BBC8 -lbl_8045BB74: -/* 8045BB74 2C 00 00 05 */ cmpwi r0, 5 -/* 8045BB78 40 80 00 50 */ bge lbl_8045BBC8 -lbl_8045BB7C: -/* 8045BB7C 7F E3 FB 78 */ mr r3, r31 -/* 8045BB80 4B FF FA 61 */ bl orderWait_tri__9daBgObj_cFv -/* 8045BB84 48 00 00 44 */ b lbl_8045BBC8 -lbl_8045BB88: -/* 8045BB88 7F E3 FB 78 */ mr r3, r31 -/* 8045BB8C 4B FF FC 71 */ bl orderWait_cyl__9daBgObj_cFv -/* 8045BB90 48 00 00 38 */ b lbl_8045BBC8 -lbl_8045BB94: -/* 8045BB94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045BB98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045BB9C A0 1F 0C CC */ lhz r0, 0xccc(r31) -/* 8045BBA0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8045BBA4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8045BBA8 7C 05 07 74 */ extsb r5, r0 -/* 8045BBAC 4B BD 97 B5 */ bl isSwitch__10dSv_info_cCFii -/* 8045BBB0 2C 03 00 00 */ cmpwi r3, 0 -/* 8045BBB4 41 82 00 14 */ beq lbl_8045BBC8 -/* 8045BBB8 7F E3 FB 78 */ mr r3, r31 -/* 8045BBBC 4B FF FE 09 */ bl orderWait_spec__9daBgObj_cFv -/* 8045BBC0 38 00 00 01 */ li r0, 1 -/* 8045BBC4 98 1F 0D 00 */ stb r0, 0xd00(r31) -lbl_8045BBC8: -/* 8045BBC8 38 60 00 01 */ li r3, 1 -/* 8045BBCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045BBD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045BBD4 7C 08 03 A6 */ mtlr r0 -/* 8045BBD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045BBDC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/checkDestroy__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/checkDestroy__9daBgObj_cFv.s deleted file mode 100644 index 044b56053b..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/checkDestroy__9daBgObj_cFv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_8045B44C: -/* 8045B44C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045B450 7C 08 02 A6 */ mflr r0 -/* 8045B454 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045B458 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045B45C 7C 7F 1B 78 */ mr r31, r3 -/* 8045B460 A0 03 0C D0 */ lhz r0, 0xcd0(r3) -/* 8045B464 28 00 00 01 */ cmplwi r0, 1 -/* 8045B468 41 82 00 14 */ beq lbl_8045B47C -/* 8045B46C 28 00 00 02 */ cmplwi r0, 2 -/* 8045B470 41 82 00 0C */ beq lbl_8045B47C -/* 8045B474 38 60 00 00 */ li r3, 0 -/* 8045B478 48 00 00 A8 */ b lbl_8045B520 -lbl_8045B47C: -/* 8045B47C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045B480 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045B484 A0 1F 0C CC */ lhz r0, 0xccc(r31) -/* 8045B488 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8045B48C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8045B490 7C 05 07 74 */ extsb r5, r0 -/* 8045B494 4B BD 9E CD */ bl isSwitch__10dSv_info_cCFii -/* 8045B498 2C 03 00 00 */ cmpwi r3, 0 -/* 8045B49C 40 82 00 80 */ bne lbl_8045B51C -/* 8045B4A0 A0 1F 0C CC */ lhz r0, 0xccc(r31) -/* 8045B4A4 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 8045B4A8 28 04 00 FF */ cmplwi r4, 0xff -/* 8045B4AC 41 82 00 68 */ beq lbl_8045B514 -/* 8045B4B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045B4B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045B4B8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8045B4BC 7C 05 07 74 */ extsb r5, r0 -/* 8045B4C0 4B BD 9E A1 */ bl isSwitch__10dSv_info_cCFii -/* 8045B4C4 2C 03 00 00 */ cmpwi r3, 0 -/* 8045B4C8 41 82 00 14 */ beq lbl_8045B4DC -/* 8045B4CC A0 1F 0C CA */ lhz r0, 0xcca(r31) -/* 8045B4D0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8045B4D4 28 00 00 FF */ cmplwi r0, 0xff -/* 8045B4D8 41 82 00 3C */ beq lbl_8045B514 -lbl_8045B4DC: -/* 8045B4DC A0 1F 0C CC */ lhz r0, 0xccc(r31) -/* 8045B4E0 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 8045B4E4 28 04 00 FF */ cmplwi r4, 0xff -/* 8045B4E8 41 82 00 34 */ beq lbl_8045B51C -/* 8045B4EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045B4F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045B4F4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8045B4F8 7C 05 07 74 */ extsb r5, r0 -/* 8045B4FC 4B BD 9E 65 */ bl isSwitch__10dSv_info_cCFii -/* 8045B500 2C 03 00 00 */ cmpwi r3, 0 -/* 8045B504 40 82 00 18 */ bne lbl_8045B51C -/* 8045B508 A0 1F 0C CA */ lhz r0, 0xcca(r31) -/* 8045B50C 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8045B510 40 82 00 0C */ bne lbl_8045B51C -lbl_8045B514: -/* 8045B514 38 60 00 01 */ li r3, 1 -/* 8045B518 48 00 00 08 */ b lbl_8045B520 -lbl_8045B51C: -/* 8045B51C 38 60 00 00 */ li r3, 0 -lbl_8045B520: -/* 8045B520 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045B524 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045B528 7C 08 03 A6 */ mtlr r0 -/* 8045B52C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045B530 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/create1st__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/create1st__9daBgObj_cFv.s deleted file mode 100644 index 9c9a08b988..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/create1st__9daBgObj_cFv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_8045A9E8: -/* 8045A9E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045A9EC 7C 08 02 A6 */ mflr r0 -/* 8045A9F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045A9F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045A9F8 93 C1 00 08 */ stw r30, 8(r1) -/* 8045A9FC 7C 7F 1B 78 */ mr r31, r3 -/* 8045AA00 88 03 0C C9 */ lbz r0, 0xcc9(r3) -/* 8045AA04 28 00 00 00 */ cmplwi r0, 0 -/* 8045AA08 40 82 00 38 */ bne lbl_8045AA40 -/* 8045AA0C A8 1F 04 B4 */ lha r0, 0x4b4(r31) -/* 8045AA10 B0 1F 0C CA */ sth r0, 0xcca(r31) -/* 8045AA14 A8 1F 04 B8 */ lha r0, 0x4b8(r31) -/* 8045AA18 B0 1F 0C CC */ sth r0, 0xccc(r31) -/* 8045AA1C 38 00 00 01 */ li r0, 1 -/* 8045AA20 98 1F 0C C9 */ stb r0, 0xcc9(r31) -/* 8045AA24 38 00 00 00 */ li r0, 0 -/* 8045AA28 B0 1F 04 B8 */ sth r0, 0x4b8(r31) -/* 8045AA2C B0 1F 04 B4 */ sth r0, 0x4b4(r31) -/* 8045AA30 B0 1F 04 E0 */ sth r0, 0x4e0(r31) -/* 8045AA34 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 8045AA38 B0 1F 04 E8 */ sth r0, 0x4e8(r31) -/* 8045AA3C B0 1F 04 E4 */ sth r0, 0x4e4(r31) -lbl_8045AA40: -/* 8045AA40 7F E3 FB 78 */ mr r3, r31 -/* 8045AA44 4B BD 6E 2D */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045AA48 7C 64 1B 78 */ mr r4, r3 -/* 8045AA4C 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 8045AA50 4B BD 24 6D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8045AA54 7C 7E 1B 78 */ mr r30, r3 -/* 8045AA58 2C 1E 00 04 */ cmpwi r30, 4 -/* 8045AA5C 40 82 00 78 */ bne lbl_8045AAD4 -/* 8045AA60 38 60 00 00 */ li r3, 0 -/* 8045AA64 4B FF ED 41 */ bl getDzbName__Fi -/* 8045AA68 7C 7E 1B 78 */ mr r30, r3 -/* 8045AA6C 7F E3 FB 78 */ mr r3, r31 -/* 8045AA70 4B BD 6E 01 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045AA74 7C 64 1B 78 */ mr r4, r3 -/* 8045AA78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045AA7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045AA80 3C 63 00 02 */ addis r3, r3, 2 -/* 8045AA84 7F C5 F3 78 */ mr r5, r30 -/* 8045AA88 38 63 C2 F8 */ addi r3, r3, -15624 -/* 8045AA8C 4B BE 1C 2D */ bl getObjectResName2Index__14dRes_control_cFPCcPCc -/* 8045AA90 7C 7E 1B 78 */ mr r30, r3 -/* 8045AA94 7F E3 FB 78 */ mr r3, r31 -/* 8045AA98 4B BD 6D D9 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045AA9C 7C 64 1B 78 */ mr r4, r3 -/* 8045AAA0 7F E3 FB 78 */ mr r3, r31 -/* 8045AAA4 7F C5 F3 78 */ mr r5, r30 -/* 8045AAA8 38 C0 00 00 */ li r6, 0 -/* 8045AAAC 3C E0 80 02 */ lis r7, 0x8002 /* 0x80022110@ha */ -/* 8045AAB0 38 E7 21 10 */ addi r7, r7, 0x2110 /* 0x80022110@l */ -/* 8045AAB4 39 00 00 00 */ li r8, 0 -/* 8045AAB8 4B C1 DD 05 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 8045AABC 7C 7E 1B 78 */ mr r30, r3 -/* 8045AAC0 2C 1E 00 05 */ cmpwi r30, 5 -/* 8045AAC4 40 82 00 08 */ bne lbl_8045AACC -/* 8045AAC8 48 00 00 10 */ b lbl_8045AAD8 -lbl_8045AACC: -/* 8045AACC 7F E3 FB 78 */ mr r3, r31 -/* 8045AAD0 4B C1 DE 81 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -lbl_8045AAD4: -/* 8045AAD4 7F C3 F3 78 */ mr r3, r30 -lbl_8045AAD8: -/* 8045AAD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045AADC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8045AAE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045AAE4 7C 08 03 A6 */ mtlr r0 -/* 8045AAE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045AAEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGDelete__FP9daBgObj_c.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGDelete__FP9daBgObj_c.s deleted file mode 100644 index dd5dc0840a..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGDelete__FP9daBgObj_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8045C744: -/* 8045C744 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C748 7C 08 02 A6 */ mflr r0 -/* 8045C74C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C750 4B C1 C1 8D */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 8045C754 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C758 7C 08 03 A6 */ mtlr r0 -/* 8045C75C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C760 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGDraw__FP9daBgObj_c.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGDraw__FP9daBgObj_c.s deleted file mode 100644 index 37160f5aa1..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGDraw__FP9daBgObj_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8045C784: -/* 8045C784 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C788 7C 08 02 A6 */ mflr r0 -/* 8045C78C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C790 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 8045C794 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8045C798 7D 89 03 A6 */ mtctr r12 -/* 8045C79C 4E 80 04 21 */ bctrl -/* 8045C7A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C7A4 7C 08 03 A6 */ mtlr r0 -/* 8045C7A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C7AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGExecute__FP9daBgObj_c.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGExecute__FP9daBgObj_c.s deleted file mode 100644 index 76a20194f8..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGExecute__FP9daBgObj_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8045C764: -/* 8045C764 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C768 7C 08 02 A6 */ mflr r0 -/* 8045C76C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C770 4B C1 C1 E1 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 8045C774 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C778 7C 08 03 A6 */ mtlr r0 -/* 8045C77C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C780 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_create1st__FP9daBgObj_c.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_create1st__FP9daBgObj_c.s deleted file mode 100644 index df6a24b11d..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_create1st__FP9daBgObj_c.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8045C330: -/* 8045C330 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045C334 7C 08 02 A6 */ mflr r0 -/* 8045C338 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045C33C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045C340 93 C1 00 08 */ stw r30, 8(r1) -/* 8045C344 7C 7F 1B 78 */ mr r31, r3 -/* 8045C348 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8045C34C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8045C350 40 82 00 D4 */ bne lbl_8045C424 -/* 8045C354 7F E0 FB 79 */ or. r0, r31, r31 -/* 8045C358 41 82 00 C0 */ beq lbl_8045C418 -/* 8045C35C 7C 1E 03 78 */ mr r30, r0 -/* 8045C360 4B C1 C2 C5 */ bl __ct__16dBgS_MoveBgActorFv -/* 8045C364 3C 60 80 46 */ lis r3, __vt__9daBgObj_c@ha /* 0x8045CDCC@ha */ -/* 8045C368 38 03 CD CC */ addi r0, r3, __vt__9daBgObj_c@l /* 0x8045CDCC@l */ -/* 8045C36C 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 8045C370 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 8045C374 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 8045C378 90 1E 05 F4 */ stw r0, 0x5f4(r30) -/* 8045C37C 38 7E 05 F8 */ addi r3, r30, 0x5f8 -/* 8045C380 4B C2 73 E1 */ bl __ct__10dCcD_GSttsFv -/* 8045C384 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 8045C388 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 8045C38C 90 7E 05 F4 */ stw r3, 0x5f4(r30) -/* 8045C390 38 03 00 20 */ addi r0, r3, 0x20 -/* 8045C394 90 1E 05 F8 */ stw r0, 0x5f8(r30) -/* 8045C398 38 7E 06 18 */ addi r3, r30, 0x618 -/* 8045C39C 3C 80 80 46 */ lis r4, __ct__8dCcD_TriFv@ha /* 0x8045C5B4@ha */ -/* 8045C3A0 38 84 C5 B4 */ addi r4, r4, __ct__8dCcD_TriFv@l /* 0x8045C5B4@l */ -/* 8045C3A4 3C A0 80 46 */ lis r5, __dt__8dCcD_TriFv@ha /* 0x8045C4D4@ha */ -/* 8045C3A8 38 A5 C4 D4 */ addi r5, r5, __dt__8dCcD_TriFv@l /* 0x8045C4D4@l */ -/* 8045C3AC 38 C0 01 5C */ li r6, 0x15c -/* 8045C3B0 38 E0 00 04 */ li r7, 4 -/* 8045C3B4 4B F0 59 AD */ bl __construct_array -/* 8045C3B8 3B DE 0B 88 */ addi r30, r30, 0xb88 -/* 8045C3BC 7F C3 F3 78 */ mr r3, r30 -/* 8045C3C0 4B C2 76 69 */ bl __ct__12dCcD_GObjInfFv -/* 8045C3C4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8045C3C8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8045C3CC 90 1E 01 20 */ stw r0, 0x120(r30) -/* 8045C3D0 3C 60 80 46 */ lis r3, __vt__8cM3dGAab@ha /* 0x8045CDC0@ha */ -/* 8045C3D4 38 03 CD C0 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8045CDC0@l */ -/* 8045C3D8 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 8045C3DC 3C 60 80 46 */ lis r3, __vt__8cM3dGCyl@ha /* 0x8045CDB4@ha */ -/* 8045C3E0 38 03 CD B4 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x8045CDB4@l */ -/* 8045C3E4 90 1E 01 38 */ stw r0, 0x138(r30) -/* 8045C3E8 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 8045C3EC 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 8045C3F0 90 7E 01 20 */ stw r3, 0x120(r30) -/* 8045C3F4 38 03 00 58 */ addi r0, r3, 0x58 -/* 8045C3F8 90 1E 01 38 */ stw r0, 0x138(r30) -/* 8045C3FC 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 8045C400 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 8045C404 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 8045C408 38 03 00 2C */ addi r0, r3, 0x2c -/* 8045C40C 90 1E 01 20 */ stw r0, 0x120(r30) -/* 8045C410 38 03 00 84 */ addi r0, r3, 0x84 -/* 8045C414 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_8045C418: -/* 8045C418 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8045C41C 60 00 00 08 */ ori r0, r0, 8 -/* 8045C420 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8045C424: -/* 8045C424 7F E3 FB 78 */ mr r3, r31 -/* 8045C428 4B FF E5 C1 */ bl create1st__9daBgObj_cFv -/* 8045C42C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045C430 83 C1 00 08 */ lwz r30, 8(r1) -/* 8045C434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045C438 7C 08 03 A6 */ mtlr r0 -/* 8045C43C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045C440 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/doShareTexture__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/doShareTexture__9daBgObj_cFv.s deleted file mode 100644 index 0f46c5f884..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/doShareTexture__9daBgObj_cFv.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_8045A83C: -/* 8045A83C 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 8045A840 7C 08 02 A6 */ mflr r0 -/* 8045A844 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 8045A848 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8045A84C 4B F0 79 89 */ bl _savegpr_27 -/* 8045A850 7C 7B 1B 78 */ mr r27, r3 -/* 8045A854 80 63 0C E8 */ lwz r3, 0xce8(r3) -/* 8045A858 3B C3 00 08 */ addi r30, r3, 8 -/* 8045A85C 3B A0 00 00 */ li r29, 0 -/* 8045A860 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045A864 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045A868 3F E3 00 02 */ addis r31, r3, 2 -/* 8045A86C 3B FF C2 F8 */ addi r31, r31, -15624 -/* 8045A870 48 00 00 AC */ b lbl_8045A91C -lbl_8045A874: -/* 8045A874 38 61 00 48 */ addi r3, r1, 0x48 -/* 8045A878 7F C4 F3 78 */ mr r4, r30 -/* 8045A87C 4B F0 E2 B1 */ bl strcpy -/* 8045A880 7F C3 F3 78 */ mr r3, r30 -/* 8045A884 4B F0 E3 61 */ bl strlen -/* 8045A888 7F C3 F2 14 */ add r30, r3, r30 -/* 8045A88C 7F 63 DB 78 */ mr r3, r27 -/* 8045A890 3B DE 00 01 */ addi r30, r30, 1 -/* 8045A894 4B BD 6F DD */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045A898 38 81 00 48 */ addi r4, r1, 0x48 -/* 8045A89C 7F E5 FB 78 */ mr r5, r31 -/* 8045A8A0 38 C0 00 80 */ li r6, 0x80 -/* 8045A8A4 4B BE 1A D9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045A8A8 7C 60 1B 78 */ mr r0, r3 -/* 8045A8AC 7C 1C 03 78 */ mr r28, r0 -/* 8045A8B0 88 1E 00 00 */ lbz r0, 0(r30) -/* 8045A8B4 28 00 00 00 */ cmplwi r0, 0 -/* 8045A8B8 41 82 00 48 */ beq lbl_8045A900 -/* 8045A8BC 38 61 00 08 */ addi r3, r1, 8 -/* 8045A8C0 7F C4 F3 78 */ mr r4, r30 -/* 8045A8C4 4B F0 E2 69 */ bl strcpy -/* 8045A8C8 7F C3 F3 78 */ mr r3, r30 -/* 8045A8CC 4B F0 E3 19 */ bl strlen -/* 8045A8D0 7F C3 F2 14 */ add r30, r3, r30 -/* 8045A8D4 7F 63 DB 78 */ mr r3, r27 -/* 8045A8D8 3B DE 00 01 */ addi r30, r30, 1 -/* 8045A8DC 4B BD 6F 95 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 8045A8E0 38 81 00 08 */ addi r4, r1, 8 -/* 8045A8E4 7F E5 FB 78 */ mr r5, r31 -/* 8045A8E8 38 C0 00 80 */ li r6, 0x80 -/* 8045A8EC 4B BE 1A 91 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045A8F0 7C 64 1B 78 */ mr r4, r3 -/* 8045A8F4 7F 83 E3 78 */ mr r3, r28 -/* 8045A8F8 4B BB 3F 3D */ bl mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData -/* 8045A8FC 48 00 00 1C */ b lbl_8045A918 -lbl_8045A900: -/* 8045A900 40 82 00 18 */ bne lbl_8045A918 -/* 8045A904 88 1E 00 01 */ lbz r0, 1(r30) -/* 8045A908 28 00 00 01 */ cmplwi r0, 1 -/* 8045A90C 40 82 00 0C */ bne lbl_8045A918 -/* 8045A910 3B DE 00 02 */ addi r30, r30, 2 -/* 8045A914 4B BB 41 6D */ bl mDoExt_setupStageTexture__FP12J3DModelData -lbl_8045A918: -/* 8045A918 3B BD 00 01 */ addi r29, r29, 1 -lbl_8045A91C: -/* 8045A91C 88 1B 0C EC */ lbz r0, 0xcec(r27) -/* 8045A920 7C 1D 00 00 */ cmpw r29, r0 -/* 8045A924 41 80 FF 50 */ blt lbl_8045A874 -/* 8045A928 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8045A92C 4B F0 78 F5 */ bl _restgpr_27 -/* 8045A930 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 8045A934 7C 08 03 A6 */ mtlr r0 -/* 8045A938 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8045A93C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBmdName__Fii.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBmdName__Fii.s deleted file mode 100644 index a75a1e1605..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBmdName__Fii.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80459658: -/* 80459658 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045965C 7C 08 02 A6 */ mflr r0 -/* 80459660 90 01 00 14 */ stw r0, 0x14(r1) -/* 80459664 7C 65 1B 78 */ mr r5, r3 -/* 80459668 7C 86 23 79 */ or. r6, r4, r4 -/* 8045966C 41 82 00 08 */ beq lbl_80459674 -/* 80459670 48 00 00 20 */ b lbl_80459690 -lbl_80459674: -/* 80459674 3C 60 80 46 */ lis r3, l_bmdName@ha /* 0x8045CE00@ha */ -/* 80459678 38 63 CE 00 */ addi r3, r3, l_bmdName@l /* 0x8045CE00@l */ -/* 8045967C 3C 80 80 46 */ lis r4, d_a_bg_obj__stringBase0@ha /* 0x8045CA20@ha */ -/* 80459680 38 84 CA 20 */ addi r4, r4, d_a_bg_obj__stringBase0@l /* 0x8045CA20@l */ -/* 80459684 4C C6 31 82 */ crclr 6 -/* 80459688 4B F0 CE 55 */ bl sprintf -/* 8045968C 48 00 00 20 */ b lbl_804596AC -lbl_80459690: -/* 80459690 3C 60 80 46 */ lis r3, l_bmdName@ha /* 0x8045CE00@ha */ -/* 80459694 38 63 CE 00 */ addi r3, r3, l_bmdName@l /* 0x8045CE00@l */ -/* 80459698 3C 80 80 46 */ lis r4, d_a_bg_obj__stringBase0@ha /* 0x8045CA20@ha */ -/* 8045969C 38 84 CA 20 */ addi r4, r4, d_a_bg_obj__stringBase0@l /* 0x8045CA20@l */ -/* 804596A0 38 84 00 0C */ addi r4, r4, 0xc -/* 804596A4 4C C6 31 82 */ crclr 6 -/* 804596A8 4B F0 CE 35 */ bl sprintf -lbl_804596AC: -/* 804596AC 3C 60 80 46 */ lis r3, l_bmdName@ha /* 0x8045CE00@ha */ -/* 804596B0 38 63 CE 00 */ addi r3, r3, l_bmdName@l /* 0x8045CE00@l */ -/* 804596B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804596B8 7C 08 03 A6 */ mtlr r0 -/* 804596BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 804596C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBrkName__Fii.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBrkName__Fii.s deleted file mode 100644 index 706bc5998a..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBrkName__Fii.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80459734: -/* 80459734 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80459738 7C 08 02 A6 */ mflr r0 -/* 8045973C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80459740 7C 65 1B 78 */ mr r5, r3 -/* 80459744 7C 86 23 79 */ or. r6, r4, r4 -/* 80459748 41 82 00 08 */ beq lbl_80459750 -/* 8045974C 48 00 00 24 */ b lbl_80459770 -lbl_80459750: -/* 80459750 3C 60 80 46 */ lis r3, l_brkName@ha /* 0x8045CE20@ha */ -/* 80459754 38 63 CE 20 */ addi r3, r3, l_brkName@l /* 0x8045CE20@l */ -/* 80459758 3C 80 80 46 */ lis r4, d_a_bg_obj__stringBase0@ha /* 0x8045CA20@ha */ -/* 8045975C 38 84 CA 20 */ addi r4, r4, d_a_bg_obj__stringBase0@l /* 0x8045CA20@l */ -/* 80459760 38 84 00 36 */ addi r4, r4, 0x36 -/* 80459764 4C C6 31 82 */ crclr 6 -/* 80459768 4B F0 CD 75 */ bl sprintf -/* 8045976C 48 00 00 20 */ b lbl_8045978C -lbl_80459770: -/* 80459770 3C 60 80 46 */ lis r3, l_brkName@ha /* 0x8045CE20@ha */ -/* 80459774 38 63 CE 20 */ addi r3, r3, l_brkName@l /* 0x8045CE20@l */ -/* 80459778 3C 80 80 46 */ lis r4, d_a_bg_obj__stringBase0@ha /* 0x8045CA20@ha */ -/* 8045977C 38 84 CA 20 */ addi r4, r4, d_a_bg_obj__stringBase0@l /* 0x8045CA20@l */ -/* 80459780 38 84 00 42 */ addi r4, r4, 0x42 -/* 80459784 4C C6 31 82 */ crclr 6 -/* 80459788 4B F0 CD 55 */ bl sprintf -lbl_8045978C: -/* 8045978C 3C 60 80 46 */ lis r3, l_brkName@ha /* 0x8045CE20@ha */ -/* 80459790 38 63 CE 20 */ addi r3, r3, l_brkName@l /* 0x8045CE20@l */ -/* 80459794 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80459798 7C 08 03 A6 */ mtlr r0 -/* 8045979C 38 21 00 10 */ addi r1, r1, 0x10 -/* 804597A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBtkName__Fii.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBtkName__Fii.s deleted file mode 100644 index 391fe4af28..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBtkName__Fii.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_804596C4: -/* 804596C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804596C8 7C 08 02 A6 */ mflr r0 -/* 804596CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 804596D0 7C 65 1B 78 */ mr r5, r3 -/* 804596D4 7C 86 23 79 */ or. r6, r4, r4 -/* 804596D8 41 82 00 08 */ beq lbl_804596E0 -/* 804596DC 48 00 00 24 */ b lbl_80459700 -lbl_804596E0: -/* 804596E0 3C 60 80 46 */ lis r3, l_btkName@ha /* 0x8045CE10@ha */ -/* 804596E4 38 63 CE 10 */ addi r3, r3, l_btkName@l /* 0x8045CE10@l */ -/* 804596E8 3C 80 80 46 */ lis r4, d_a_bg_obj__stringBase0@ha /* 0x8045CA20@ha */ -/* 804596EC 38 84 CA 20 */ addi r4, r4, d_a_bg_obj__stringBase0@l /* 0x8045CA20@l */ -/* 804596F0 38 84 00 1B */ addi r4, r4, 0x1b -/* 804596F4 4C C6 31 82 */ crclr 6 -/* 804596F8 4B F0 CD E5 */ bl sprintf -/* 804596FC 48 00 00 20 */ b lbl_8045971C -lbl_80459700: -/* 80459700 3C 60 80 46 */ lis r3, l_btkName@ha /* 0x8045CE10@ha */ -/* 80459704 38 63 CE 10 */ addi r3, r3, l_btkName@l /* 0x8045CE10@l */ -/* 80459708 3C 80 80 46 */ lis r4, d_a_bg_obj__stringBase0@ha /* 0x8045CA20@ha */ -/* 8045970C 38 84 CA 20 */ addi r4, r4, d_a_bg_obj__stringBase0@l /* 0x8045CA20@l */ -/* 80459710 38 84 00 27 */ addi r4, r4, 0x27 -/* 80459714 4C C6 31 82 */ crclr 6 -/* 80459718 4B F0 CD C5 */ bl sprintf -lbl_8045971C: -/* 8045971C 3C 60 80 46 */ lis r3, l_btkName@ha /* 0x8045CE10@ha */ -/* 80459720 38 63 CE 10 */ addi r3, r3, l_btkName@l /* 0x8045CE10@l */ -/* 80459724 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80459728 7C 08 03 A6 */ mtlr r0 -/* 8045972C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80459730 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getDzbName__Fi.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getDzbName__Fi.s deleted file mode 100644 index 8c14d853ba..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getDzbName__Fi.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_804597A4: -/* 804597A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804597A8 7C 08 02 A6 */ mflr r0 -/* 804597AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 804597B0 7C 65 1B 78 */ mr r5, r3 -/* 804597B4 3C 60 80 46 */ lis r3, l_dzbName@ha /* 0x8045CE30@ha */ -/* 804597B8 38 63 CE 30 */ addi r3, r3, l_dzbName@l /* 0x8045CE30@l */ -/* 804597BC 3C 80 80 46 */ lis r4, d_a_bg_obj__stringBase0@ha /* 0x8045CA20@ha */ -/* 804597C0 38 84 CA 20 */ addi r4, r4, d_a_bg_obj__stringBase0@l /* 0x8045CA20@l */ -/* 804597C4 38 84 00 51 */ addi r4, r4, 0x51 -/* 804597C8 4C C6 31 82 */ crclr 6 -/* 804597CC 4B F0 CD 11 */ bl sprintf -/* 804597D0 3C 60 80 46 */ lis r3, l_dzbName@ha /* 0x8045CE30@ha */ -/* 804597D4 38 63 CE 30 */ addi r3, r3, l_dzbName@l /* 0x8045CE30@l */ -/* 804597D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804597DC 7C 08 03 A6 */ mtlr r0 -/* 804597E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 804597E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/indirectProc__9daBgObj_cFP8J3DModel.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/indirectProc__9daBgObj_cFP8J3DModel.s deleted file mode 100644 index 6fae87a14f..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/indirectProc__9daBgObj_cFP8J3DModel.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8045C25C: -/* 8045C25C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8045C260 7C 08 02 A6 */ mflr r0 -/* 8045C264 90 01 00 24 */ stw r0, 0x24(r1) -/* 8045C268 39 61 00 20 */ addi r11, r1, 0x20 -/* 8045C26C 4B F0 5F 71 */ bl _savegpr_29 -/* 8045C270 28 04 00 00 */ cmplwi r4, 0 -/* 8045C274 41 82 00 5C */ beq lbl_8045C2D0 -/* 8045C278 83 E4 00 04 */ lwz r31, 4(r4) -/* 8045C27C 3B A0 00 00 */ li r29, 0 -/* 8045C280 48 00 00 40 */ b lbl_8045C2C0 -lbl_8045C284: -/* 8045C284 80 7F 00 60 */ lwz r3, 0x60(r31) -/* 8045C288 57 A0 13 BA */ rlwinm r0, r29, 2, 0xe, 0x1d -/* 8045C28C 7F C3 00 2E */ lwzx r30, r3, r0 -/* 8045C290 7F C3 F3 78 */ mr r3, r30 -/* 8045C294 81 9E 00 00 */ lwz r12, 0(r30) -/* 8045C298 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8045C29C 7D 89 03 A6 */ mtctr r12 -/* 8045C2A0 4E 80 04 21 */ bctrl -/* 8045C2A4 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 8045C2A8 38 80 00 00 */ li r4, 0 -/* 8045C2AC 81 83 00 00 */ lwz r12, 0(r3) -/* 8045C2B0 81 8C 00 74 */ lwz r12, 0x74(r12) -/* 8045C2B4 7D 89 03 A6 */ mtctr r12 -/* 8045C2B8 4E 80 04 21 */ bctrl -/* 8045C2BC 3B BD 00 01 */ addi r29, r29, 1 -lbl_8045C2C0: -/* 8045C2C0 57 A3 04 3E */ clrlwi r3, r29, 0x10 -/* 8045C2C4 A0 1F 00 5C */ lhz r0, 0x5c(r31) -/* 8045C2C8 7C 03 00 40 */ cmplw r3, r0 -/* 8045C2CC 41 80 FF B8 */ blt lbl_8045C284 -lbl_8045C2D0: -/* 8045C2D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8045C2D4 4B F0 5F 55 */ bl _restgpr_29 -/* 8045C2D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8045C2DC 7C 08 03 A6 */ mtlr r0 -/* 8045C2E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8045C2E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initBaseMtx__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initBaseMtx__9daBgObj_cFv.s deleted file mode 100644 index 080663f40c..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initBaseMtx__9daBgObj_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80459D3C: -/* 80459D3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80459D40 7C 08 02 A6 */ mflr r0 -/* 80459D44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80459D48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80459D4C 7C 7F 1B 78 */ mr r31, r3 -/* 80459D50 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80459D54 4B BB 30 11 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80459D58 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80459D5C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80459D60 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80459D64 4B BB 26 D1 */ bl mDoMtx_YrotM__FPA4_fs -/* 80459D68 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80459D6C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80459D70 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80459D74 4B EE C7 3D */ bl PSMTXCopy -/* 80459D78 7F E3 FB 78 */ mr r3, r31 -/* 80459D7C 48 00 00 19 */ bl setBaseMtx__9daBgObj_cFv -/* 80459D80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80459D84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80459D88 7C 08 03 A6 */ mtlr r0 -/* 80459D8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80459D90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initFarInfoBlock__Q29daBgObj_c11spec_data_cFPUc.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initFarInfoBlock__Q29daBgObj_c11spec_data_cFPUc.s deleted file mode 100644 index 800b424784..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initFarInfoBlock__Q29daBgObj_c11spec_data_cFPUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_804598F4: -/* 804598F4 C0 04 00 04 */ lfs f0, 4(r4) -/* 804598F8 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 804598FC 38 64 00 08 */ addi r3, r4, 8 -/* 80459900 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initParticleBlock__Q29daBgObj_c11spec_data_cFPUc.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initParticleBlock__Q29daBgObj_c11spec_data_cFPUc.s deleted file mode 100644 index 50d782ac2e..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initParticleBlock__Q29daBgObj_c11spec_data_cFPUc.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_804597E8: -/* 804597E8 90 83 00 08 */ stw r4, 8(r3) -/* 804597EC 80 A3 00 08 */ lwz r5, 8(r3) -/* 804597F0 80 05 00 00 */ lwz r0, 0(r5) -/* 804597F4 54 00 E3 3E */ rlwinm r0, r0, 0x1c, 0xc, 0x1f -/* 804597F8 90 03 00 04 */ stw r0, 4(r3) -/* 804597FC 80 63 00 08 */ lwz r3, 8(r3) -/* 80459800 80 03 00 00 */ lwz r0, 0(r3) -/* 80459804 54 00 02 3E */ clrlwi r0, r0, 8 -/* 80459808 7C 60 22 14 */ add r3, r0, r4 -/* 8045980C 38 63 00 04 */ addi r3, r3, 4 -/* 80459810 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initSoundBlock__Q29daBgObj_c11spec_data_cFPUc.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initSoundBlock__Q29daBgObj_c11spec_data_cFPUc.s deleted file mode 100644 index 22f0889daf..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initSoundBlock__Q29daBgObj_c11spec_data_cFPUc.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80459814: -/* 80459814 90 83 00 10 */ stw r4, 0x10(r3) -/* 80459818 80 A3 00 10 */ lwz r5, 0x10(r3) -/* 8045981C 80 05 00 00 */ lwz r0, 0(r5) -/* 80459820 54 00 F2 BE */ rlwinm r0, r0, 0x1e, 0xa, 0x1f -/* 80459824 90 03 00 0C */ stw r0, 0xc(r3) -/* 80459828 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8045982C 80 03 00 00 */ lwz r0, 0(r3) -/* 80459830 54 00 02 3E */ clrlwi r0, r0, 8 -/* 80459834 7C 60 22 14 */ add r3, r0, r4 -/* 80459838 38 63 00 04 */ addi r3, r3, 4 -/* 8045983C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initTexShareBlock__Q29daBgObj_c11spec_data_cFPUc.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initTexShareBlock__Q29daBgObj_c11spec_data_cFPUc.s deleted file mode 100644 index c0aa59591b..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initTexShareBlock__Q29daBgObj_c11spec_data_cFPUc.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80459840: -/* 80459840 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 80459844 7C 08 02 A6 */ mflr r0 -/* 80459848 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 8045984C 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80459850 4B F0 89 8D */ bl _savegpr_29 -/* 80459854 7C 7D 1B 78 */ mr r29, r3 -/* 80459858 90 83 00 18 */ stw r4, 0x18(r3) -/* 8045985C 88 04 00 04 */ lbz r0, 4(r4) -/* 80459860 98 03 00 1C */ stb r0, 0x1c(r3) -/* 80459864 3B E0 00 00 */ li r31, 0 -/* 80459868 3B C4 00 08 */ addi r30, r4, 8 -/* 8045986C 48 00 00 60 */ b lbl_804598CC -lbl_80459870: -/* 80459870 38 61 00 48 */ addi r3, r1, 0x48 -/* 80459874 7F C4 F3 78 */ mr r4, r30 -/* 80459878 4B F0 F2 B5 */ bl strcpy -/* 8045987C 7F C3 F3 78 */ mr r3, r30 -/* 80459880 4B F0 F3 65 */ bl strlen -/* 80459884 7F C3 F2 14 */ add r30, r3, r30 -/* 80459888 8C 1E 00 01 */ lbzu r0, 1(r30) -/* 8045988C 28 00 00 00 */ cmplwi r0, 0 -/* 80459890 41 82 00 24 */ beq lbl_804598B4 -/* 80459894 38 61 00 08 */ addi r3, r1, 8 -/* 80459898 7F C4 F3 78 */ mr r4, r30 -/* 8045989C 4B F0 F2 91 */ bl strcpy -/* 804598A0 7F C3 F3 78 */ mr r3, r30 -/* 804598A4 4B F0 F3 41 */ bl strlen -/* 804598A8 7F C3 F2 14 */ add r30, r3, r30 -/* 804598AC 3B DE 00 01 */ addi r30, r30, 1 -/* 804598B0 48 00 00 18 */ b lbl_804598C8 -lbl_804598B4: -/* 804598B4 40 82 00 14 */ bne lbl_804598C8 -/* 804598B8 88 1E 00 01 */ lbz r0, 1(r30) -/* 804598BC 28 00 00 01 */ cmplwi r0, 1 -/* 804598C0 40 82 00 08 */ bne lbl_804598C8 -/* 804598C4 3B DE 00 02 */ addi r30, r30, 2 -lbl_804598C8: -/* 804598C8 3B FF 00 01 */ addi r31, r31, 1 -lbl_804598CC: -/* 804598CC 88 1D 00 1C */ lbz r0, 0x1c(r29) -/* 804598D0 7C 1F 00 00 */ cmpw r31, r0 -/* 804598D4 41 80 FF 9C */ blt lbl_80459870 -/* 804598D8 7F C3 F3 78 */ mr r3, r30 -/* 804598DC 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 804598E0 4B F0 89 49 */ bl _restgpr_29 -/* 804598E4 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 804598E8 7C 08 03 A6 */ mtlr r0 -/* 804598EC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 804598F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/regist__9daBgObj_cFP4dBgW.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/regist__9daBgObj_cFP4dBgW.s deleted file mode 100644 index 793e546a4b..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/regist__9daBgObj_cFP4dBgW.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80459BB4: -/* 80459BB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80459BB8 7C 08 02 A6 */ mflr r0 -/* 80459BBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80459BC0 7C 65 1B 78 */ mr r5, r3 -/* 80459BC4 28 04 00 00 */ cmplwi r4, 0 -/* 80459BC8 41 82 00 14 */ beq lbl_80459BDC -/* 80459BCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80459BD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80459BD4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80459BD8 4B C1 AE 31 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80459BDC: -/* 80459BDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80459BE0 7C 08 03 A6 */ mtlr r0 -/* 80459BE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80459BE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/release__9daBgObj_cFP4dBgW.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/release__9daBgObj_cFP4dBgW.s deleted file mode 100644 index bd2f10ea11..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/release__9daBgObj_cFP4dBgW.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80459B64: -/* 80459B64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80459B68 7C 08 02 A6 */ mflr r0 -/* 80459B6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80459B70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80459B74 7C 9F 23 79 */ or. r31, r4, r4 -/* 80459B78 41 82 00 28 */ beq lbl_80459BA0 -/* 80459B7C 7F E3 FB 78 */ mr r3, r31 -/* 80459B80 4B E0 E6 55 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80459B84 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80459B88 41 82 00 18 */ beq lbl_80459BA0 -/* 80459B8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80459B90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80459B94 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80459B98 7F E4 FB 78 */ mr r4, r31 -/* 80459B9C 4B C1 A6 B5 */ bl Release__4cBgSFP9dBgW_Base -lbl_80459BA0: -/* 80459BA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80459BA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80459BA8 7C 08 03 A6 */ mtlr r0 -/* 80459BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80459BB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setBaseMtx__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setBaseMtx__9daBgObj_cFv.s deleted file mode 100644 index 3de42f2745..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setBaseMtx__9daBgObj_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80459D94: -/* 80459D94 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80459D98 7C 08 02 A6 */ mflr r0 -/* 80459D9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80459DA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80459DA4 4B F0 84 39 */ bl _savegpr_29 -/* 80459DA8 7C 7D 1B 78 */ mr r29, r3 -/* 80459DAC 3B C0 00 00 */ li r30, 0 -/* 80459DB0 3B E0 00 00 */ li r31, 0 -lbl_80459DB4: -/* 80459DB4 88 1D 0C C8 */ lbz r0, 0xcc8(r29) -/* 80459DB8 54 00 18 38 */ slwi r0, r0, 3 -/* 80459DBC 7C 60 FA 14 */ add r3, r0, r31 -/* 80459DC0 38 03 05 A8 */ addi r0, r3, 0x5a8 -/* 80459DC4 7C 9D 00 2E */ lwzx r4, r29, r0 -/* 80459DC8 28 04 00 00 */ cmplwi r4, 0 -/* 80459DCC 41 82 00 10 */ beq lbl_80459DDC -/* 80459DD0 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80459DD4 38 84 00 24 */ addi r4, r4, 0x24 -/* 80459DD8 4B EE C6 D9 */ bl PSMTXCopy -lbl_80459DDC: -/* 80459DDC 3B DE 00 01 */ addi r30, r30, 1 -/* 80459DE0 2C 1E 00 02 */ cmpwi r30, 2 -/* 80459DE4 3B FF 00 04 */ addi r31, r31, 4 -/* 80459DE8 41 80 FF CC */ blt lbl_80459DB4 -/* 80459DEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80459DF0 4B F0 84 39 */ bl _restgpr_29 -/* 80459DF4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80459DF8 7C 08 03 A6 */ mtlr r0 -/* 80459DFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80459E00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setColCommon__9daBgObj_cFv.s b/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setColCommon__9daBgObj_cFv.s deleted file mode 100644 index 26237a8fe5..0000000000 --- a/asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setColCommon__9daBgObj_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8045AAF0: -/* 8045AAF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045AAF4 7C 08 02 A6 */ mflr r0 -/* 8045AAF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045AAFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045AB00 7C 7F 1B 78 */ mr r31, r3 -/* 8045AB04 88 03 0C C8 */ lbz r0, 0xcc8(r3) -/* 8045AB08 28 00 00 00 */ cmplwi r0, 0 -/* 8045AB0C 40 82 00 20 */ bne lbl_8045AB2C -/* 8045AB10 88 1F 0C D2 */ lbz r0, 0xcd2(r31) -/* 8045AB14 1C A0 00 0C */ mulli r5, r0, 0xc -/* 8045AB18 3C 80 80 46 */ lis r4, mTgSetFunc__9daBgObj_c@ha /* 0x8045CC98@ha */ -/* 8045AB1C 38 04 CC 98 */ addi r0, r4, mTgSetFunc__9daBgObj_c@l /* 0x8045CC98@l */ -/* 8045AB20 7D 80 2A 14 */ add r12, r0, r5 -/* 8045AB24 4B F0 75 61 */ bl __ptmf_scall -/* 8045AB28 60 00 00 00 */ nop -lbl_8045AB2C: -/* 8045AB2C 88 1F 0C E6 */ lbz r0, 0xce6(r31) -/* 8045AB30 28 00 00 01 */ cmplwi r0, 1 -/* 8045AB34 40 82 00 38 */ bne lbl_8045AB6C -/* 8045AB38 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 8045AB3C 38 A0 00 00 */ li r5, 0 -/* 8045AB40 38 60 00 00 */ li r3, 0 -/* 8045AB44 60 04 00 40 */ ori r4, r0, 0x40 -/* 8045AB48 48 00 00 14 */ b lbl_8045AB5C -lbl_8045AB4C: -/* 8045AB4C 38 03 06 40 */ addi r0, r3, 0x640 -/* 8045AB50 7C 9F 01 2E */ stwx r4, r31, r0 -/* 8045AB54 38 A5 00 01 */ addi r5, r5, 1 -/* 8045AB58 38 63 01 5C */ addi r3, r3, 0x15c -lbl_8045AB5C: -/* 8045AB5C 88 1F 0C C4 */ lbz r0, 0xcc4(r31) -/* 8045AB60 7C 05 00 00 */ cmpw r5, r0 -/* 8045AB64 41 80 FF E8 */ blt lbl_8045AB4C -/* 8045AB68 90 9F 0B B0 */ stw r4, 0xbb0(r31) -lbl_8045AB6C: -/* 8045AB6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045AB70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045AB74 7C 08 03 A6 */ mtlr r0 -/* 8045AB78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045AB7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/stage_copy__FP11fshop_classP11fshop_class.s b/asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/stage_copy__FP11fshop_classP11fshop_class.s deleted file mode 100644 index 175ddd6c25..0000000000 --- a/asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/stage_copy__FP11fshop_classP11fshop_class.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8086D1A0: -/* 8086D1A0 C0 04 40 14 */ lfs f0, 0x4014(r4) -/* 8086D1A4 D0 03 40 14 */ stfs f0, 0x4014(r3) -/* 8086D1A8 C0 04 40 18 */ lfs f0, 0x4018(r4) -/* 8086D1AC D0 03 40 18 */ stfs f0, 0x4018(r3) -/* 8086D1B0 C0 04 40 1C */ lfs f0, 0x401c(r4) -/* 8086D1B4 D0 03 40 1C */ stfs f0, 0x401c(r3) -/* 8086D1B8 A8 04 40 20 */ lha r0, 0x4020(r4) -/* 8086D1BC B0 03 40 20 */ sth r0, 0x4020(r3) -/* 8086D1C0 A8 04 40 22 */ lha r0, 0x4022(r4) -/* 8086D1C4 B0 03 40 22 */ sth r0, 0x4022(r3) -/* 8086D1C8 A8 04 40 24 */ lha r0, 0x4024(r4) -/* 8086D1CC B0 03 40 24 */ sth r0, 0x4024(r3) -/* 8086D1D0 C0 04 04 EC */ lfs f0, 0x4ec(r4) -/* 8086D1D4 D0 03 04 EC */ stfs f0, 0x4ec(r3) -/* 8086D1D8 C0 04 04 F0 */ lfs f0, 0x4f0(r4) -/* 8086D1DC D0 03 04 F0 */ stfs f0, 0x4f0(r3) -/* 8086D1E0 C0 04 04 F4 */ lfs f0, 0x4f4(r4) -/* 8086D1E4 D0 03 04 F4 */ stfs f0, 0x4f4(r3) -/* 8086D1E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 9d624f1145..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8085B9F4: -/* 8085B9F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8085B9F8 7C 08 02 A6 */ mflr r0 -/* 8085B9FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8085BA00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8085BA04 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8085BA08 41 82 00 1C */ beq lbl_8085BA24 -/* 8085BA0C 3C A0 80 86 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x8085BAB0@ha */ -/* 8085BA10 38 05 BA B0 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x8085BAB0@l */ -/* 8085BA14 90 1F 00 00 */ stw r0, 0(r31) -/* 8085BA18 7C 80 07 35 */ extsh. r0, r4 -/* 8085BA1C 40 81 00 08 */ ble lbl_8085BA24 -/* 8085BA20 4B A7 33 1D */ bl __dl__FPv -lbl_8085BA24: -/* 8085BA24 7F E3 FB 78 */ mr r3, r31 -/* 8085BA28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8085BA2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8085BA30 7C 08 03 A6 */ mtlr r0 -/* 8085BA34 38 21 00 10 */ addi r1, r1, 0x10 -/* 8085BA38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Create__FP10fopAc_ac_c.s deleted file mode 100644 index d185ea426d..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_8085B894: -/* 8085B894 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8085B898 7C 08 02 A6 */ mflr r0 -/* 8085B89C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8085B8A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8085B8A4 4B B0 69 39 */ bl _savegpr_29 -/* 8085B8A8 7C 7F 1B 78 */ mr r31, r3 -/* 8085B8AC 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8085B8B0 98 03 05 C5 */ stb r0, 0x5c5(r3) -/* 8085B8B4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8085B8B8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8085B8BC 40 82 00 8C */ bne lbl_8085B948 -/* 8085B8C0 7F E0 FB 79 */ or. r0, r31, r31 -/* 8085B8C4 41 82 00 78 */ beq lbl_8085B93C -/* 8085B8C8 7C 1E 03 78 */ mr r30, r0 -/* 8085B8CC 4B 7B D2 99 */ bl __ct__10fopAc_ac_cFv -/* 8085B8D0 3B BE 05 74 */ addi r29, r30, 0x574 -/* 8085B8D4 3C 60 80 86 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x8085BAB0@ha */ -/* 8085B8D8 38 03 BA B0 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x8085BAB0@l */ -/* 8085B8DC 90 1E 05 74 */ stw r0, 0x574(r30) -/* 8085B8E0 7F A3 EB 78 */ mr r3, r29 -/* 8085B8E4 38 80 00 00 */ li r4, 0 -/* 8085B8E8 4B AC CB 15 */ bl init__12J3DFrameCtrlFs -/* 8085B8EC 38 00 00 00 */ li r0, 0 -/* 8085B8F0 90 1D 00 14 */ stw r0, 0x14(r29) -/* 8085B8F4 3B BE 05 8C */ addi r29, r30, 0x58c -/* 8085B8F8 3C 60 80 86 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x8085BAB0@ha */ -/* 8085B8FC 38 03 BA B0 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x8085BAB0@l */ -/* 8085B900 90 1E 05 8C */ stw r0, 0x58c(r30) -/* 8085B904 7F A3 EB 78 */ mr r3, r29 -/* 8085B908 38 80 00 00 */ li r4, 0 -/* 8085B90C 4B AC CA F1 */ bl init__12J3DFrameCtrlFs -/* 8085B910 38 00 00 00 */ li r0, 0 -/* 8085B914 90 1D 00 14 */ stw r0, 0x14(r29) -/* 8085B918 3B BE 05 A4 */ addi r29, r30, 0x5a4 -/* 8085B91C 3C 60 80 86 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x8085BAB0@ha */ -/* 8085B920 38 03 BA B0 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x8085BAB0@l */ -/* 8085B924 90 1E 05 A4 */ stw r0, 0x5a4(r30) -/* 8085B928 7F A3 EB 78 */ mr r3, r29 -/* 8085B92C 38 80 00 00 */ li r4, 0 -/* 8085B930 4B AC CA CD */ bl init__12J3DFrameCtrlFs -/* 8085B934 38 00 00 00 */ li r0, 0 -/* 8085B938 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_8085B93C: -/* 8085B93C 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8085B940 60 00 00 08 */ ori r0, r0, 8 -/* 8085B944 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8085B948: -/* 8085B948 88 1F 05 C5 */ lbz r0, 0x5c5(r31) -/* 8085B94C 28 00 00 01 */ cmplwi r0, 1 -/* 8085B950 41 82 00 44 */ beq lbl_8085B994 -/* 8085B954 38 7F 05 BC */ addi r3, r31, 0x5bc -/* 8085B958 3C 80 80 86 */ lis r4, d_a_kytag09__stringBase0@ha /* 0x8085BA4C@ha */ -/* 8085B95C 38 84 BA 4C */ addi r4, r4, d_a_kytag09__stringBase0@l /* 0x8085BA4C@l */ -/* 8085B960 4B 7D 15 5D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8085B964 7C 7E 1B 78 */ mr r30, r3 -/* 8085B968 2C 1E 00 04 */ cmpwi r30, 4 -/* 8085B96C 40 82 00 6C */ bne lbl_8085B9D8 -/* 8085B970 7F E3 FB 78 */ mr r3, r31 -/* 8085B974 3C 80 80 86 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x8085B658@ha */ -/* 8085B978 38 84 B6 58 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x8085B658@l */ -/* 8085B97C 38 A0 5E B0 */ li r5, 0x5eb0 -/* 8085B980 4B 7B EB 31 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8085B984 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8085B988 40 82 00 50 */ bne lbl_8085B9D8 -/* 8085B98C 38 60 00 05 */ li r3, 5 -/* 8085B990 48 00 00 4C */ b lbl_8085B9DC -lbl_8085B994: -/* 8085B994 38 7F 05 BC */ addi r3, r31, 0x5bc -/* 8085B998 3C 80 80 86 */ lis r4, d_a_kytag09__stringBase0@ha /* 0x8085BA4C@ha */ -/* 8085B99C 38 84 BA 4C */ addi r4, r4, d_a_kytag09__stringBase0@l /* 0x8085BA4C@l */ -/* 8085B9A0 38 84 00 08 */ addi r4, r4, 8 -/* 8085B9A4 4B 7D 15 19 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8085B9A8 7C 7E 1B 78 */ mr r30, r3 -/* 8085B9AC 2C 1E 00 04 */ cmpwi r30, 4 -/* 8085B9B0 40 82 00 28 */ bne lbl_8085B9D8 -/* 8085B9B4 7F E3 FB 78 */ mr r3, r31 -/* 8085B9B8 3C 80 80 86 */ lis r4, useHeapInit2__FP10fopAc_ac_c@ha /* 0x8085B7C0@ha */ -/* 8085B9BC 38 84 B7 C0 */ addi r4, r4, useHeapInit2__FP10fopAc_ac_c@l /* 0x8085B7C0@l */ -/* 8085B9C0 38 A0 18 80 */ li r5, 0x1880 -/* 8085B9C4 4B 7B EA ED */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8085B9C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8085B9CC 40 82 00 0C */ bne lbl_8085B9D8 -/* 8085B9D0 38 60 00 05 */ li r3, 5 -/* 8085B9D4 48 00 00 08 */ b lbl_8085B9DC -lbl_8085B9D8: -/* 8085B9D8 7F C3 F3 78 */ mr r3, r30 -lbl_8085B9DC: -/* 8085B9DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8085B9E0 4B B0 68 49 */ bl _restgpr_29 -/* 8085B9E4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8085B9E8 7C 08 03 A6 */ mtlr r0 -/* 8085B9EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8085B9F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Delete__FP13kytag09_class.s b/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Delete__FP13kytag09_class.s deleted file mode 100644 index 7c8833bddb..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Delete__FP13kytag09_class.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8085B604: -/* 8085B604 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8085B608 7C 08 02 A6 */ mflr r0 -/* 8085B60C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8085B610 88 03 05 C5 */ lbz r0, 0x5c5(r3) -/* 8085B614 28 00 00 01 */ cmplwi r0, 1 -/* 8085B618 41 82 00 18 */ beq lbl_8085B630 -/* 8085B61C 38 63 05 BC */ addi r3, r3, 0x5bc -/* 8085B620 3C 80 80 86 */ lis r4, d_a_kytag09__stringBase0@ha /* 0x8085BA4C@ha */ -/* 8085B624 38 84 BA 4C */ addi r4, r4, d_a_kytag09__stringBase0@l /* 0x8085BA4C@l */ -/* 8085B628 4B 7D 19 E1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8085B62C 48 00 00 18 */ b lbl_8085B644 -lbl_8085B630: -/* 8085B630 38 63 05 BC */ addi r3, r3, 0x5bc -/* 8085B634 3C 80 80 86 */ lis r4, d_a_kytag09__stringBase0@ha /* 0x8085BA4C@ha */ -/* 8085B638 38 84 BA 4C */ addi r4, r4, d_a_kytag09__stringBase0@l /* 0x8085BA4C@l */ -/* 8085B63C 38 84 00 08 */ addi r4, r4, 8 -/* 8085B640 4B 7D 19 C9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -lbl_8085B644: -/* 8085B644 38 60 00 01 */ li r3, 1 -/* 8085B648 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8085B64C 7C 08 03 A6 */ mtlr r0 -/* 8085B650 38 21 00 10 */ addi r1, r1, 0x10 -/* 8085B654 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Draw__FP13kytag09_class.s b/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Draw__FP13kytag09_class.s deleted file mode 100644 index 1a94b8b5a5..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Draw__FP13kytag09_class.s +++ /dev/null @@ -1,132 +0,0 @@ -lbl_8085B3F8: -/* 8085B3F8 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8085B3FC 7C 08 02 A6 */ mflr r0 -/* 8085B400 90 01 00 54 */ stw r0, 0x54(r1) -/* 8085B404 39 61 00 50 */ addi r11, r1, 0x50 -/* 8085B408 4B B0 6D D5 */ bl _savegpr_29 -/* 8085B40C 7C 7E 1B 78 */ mr r30, r3 -/* 8085B410 80 63 05 68 */ lwz r3, 0x568(r3) -/* 8085B414 83 E3 00 04 */ lwz r31, 4(r3) -/* 8085B418 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085B41C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085B420 38 80 00 10 */ li r4, 0x10 -/* 8085B424 38 A0 00 00 */ li r5, 0 -/* 8085B428 38 DE 01 0C */ addi r6, r30, 0x10c -/* 8085B42C 4B 94 83 99 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8085B430 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085B434 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085B438 7F E4 FB 78 */ mr r4, r31 -/* 8085B43C 38 BE 01 0C */ addi r5, r30, 0x10c -/* 8085B440 4B 94 99 61 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8085B444 88 1E 05 C5 */ lbz r0, 0x5c5(r30) -/* 8085B448 28 00 00 01 */ cmplwi r0, 1 -/* 8085B44C 41 82 00 1C */ beq lbl_8085B468 -/* 8085B450 80 7E 05 6C */ lwz r3, 0x56c(r30) -/* 8085B454 80 83 00 04 */ lwz r4, 4(r3) -/* 8085B458 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085B45C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085B460 38 BE 01 0C */ addi r5, r30, 0x10c -/* 8085B464 4B 94 99 3D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -lbl_8085B468: -/* 8085B468 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8085B46C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8085B470 3C 80 80 86 */ lis r4, lit_3863@ha /* 0x8085BA44@ha */ -/* 8085B474 C0 24 BA 44 */ lfs f1, lit_3863@l(r4) /* 0x8085BA44@l */ -/* 8085B478 FC 40 08 90 */ fmr f2, f1 -/* 8085B47C FC 60 08 90 */ fmr f3, f1 -/* 8085B480 4B AE B4 69 */ bl PSMTXTrans -/* 8085B484 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8085B488 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8085B48C 38 81 00 08 */ addi r4, r1, 8 -/* 8085B490 4B AE B0 21 */ bl PSMTXCopy -/* 8085B494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085B498 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085B49C 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 8085B4A0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8085B4A4 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8085B4A8 90 1F 00 48 */ stw r0, 0x48(r31) -/* 8085B4AC 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 8085B4B0 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8085B4B4 88 1E 05 C5 */ lbz r0, 0x5c5(r30) -/* 8085B4B8 28 00 00 01 */ cmplwi r0, 1 -/* 8085B4BC 41 82 00 B0 */ beq lbl_8085B56C -/* 8085B4C0 38 61 00 08 */ addi r3, r1, 8 -/* 8085B4C4 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 8085B4C8 38 84 00 24 */ addi r4, r4, 0x24 -/* 8085B4CC 4B AE AF E5 */ bl PSMTXCopy -/* 8085B4D0 38 61 00 08 */ addi r3, r1, 8 -/* 8085B4D4 80 9E 05 6C */ lwz r4, 0x56c(r30) -/* 8085B4D8 38 84 00 24 */ addi r4, r4, 0x24 -/* 8085B4DC 4B AE AF D5 */ bl PSMTXCopy -/* 8085B4E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085B4E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085B4E8 3B A3 00 28 */ addi r29, r3, 0x28 -/* 8085B4EC 7F A3 EB 78 */ mr r3, r29 -/* 8085B4F0 38 80 00 01 */ li r4, 1 -/* 8085B4F4 4B 7D 76 BD */ bl isDarkClearLV__21dSv_player_status_b_cCFi -/* 8085B4F8 2C 03 00 00 */ cmpwi r3, 0 -/* 8085B4FC 40 82 00 30 */ bne lbl_8085B52C -/* 8085B500 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 8085B504 80 83 00 04 */ lwz r4, 4(r3) -/* 8085B508 C0 3E 05 84 */ lfs f1, 0x584(r30) -/* 8085B50C 38 7E 05 74 */ addi r3, r30, 0x574 -/* 8085B510 38 84 00 58 */ addi r4, r4, 0x58 -/* 8085B514 4B 7B 21 C5 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 8085B518 38 7E 05 74 */ addi r3, r30, 0x574 -/* 8085B51C 4B 7B 1F 0D */ bl play__14mDoExt_baseAnmFv -/* 8085B520 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 8085B524 4B 7B 27 A1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8085B528 48 00 00 98 */ b lbl_8085B5C0 -lbl_8085B52C: -/* 8085B52C 7F A3 EB 78 */ mr r3, r29 -/* 8085B530 38 80 00 02 */ li r4, 2 -/* 8085B534 4B 7D 76 7D */ bl isDarkClearLV__21dSv_player_status_b_cCFi -/* 8085B538 2C 03 00 00 */ cmpwi r3, 0 -/* 8085B53C 40 82 00 84 */ bne lbl_8085B5C0 -/* 8085B540 80 7E 05 6C */ lwz r3, 0x56c(r30) -/* 8085B544 80 83 00 04 */ lwz r4, 4(r3) -/* 8085B548 C0 3E 05 9C */ lfs f1, 0x59c(r30) -/* 8085B54C 38 7E 05 8C */ addi r3, r30, 0x58c -/* 8085B550 38 84 00 58 */ addi r4, r4, 0x58 -/* 8085B554 4B 7B 21 85 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 8085B558 38 7E 05 8C */ addi r3, r30, 0x58c -/* 8085B55C 4B 7B 1E CD */ bl play__14mDoExt_baseAnmFv -/* 8085B560 80 7E 05 6C */ lwz r3, 0x56c(r30) -/* 8085B564 4B 7B 27 61 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8085B568 48 00 00 58 */ b lbl_8085B5C0 -lbl_8085B56C: -/* 8085B56C 38 61 00 08 */ addi r3, r1, 8 -/* 8085B570 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 8085B574 38 84 00 24 */ addi r4, r4, 0x24 -/* 8085B578 4B AE AF 39 */ bl PSMTXCopy -/* 8085B57C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085B580 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085B584 38 63 00 28 */ addi r3, r3, 0x28 -/* 8085B588 38 80 00 00 */ li r4, 0 -/* 8085B58C 4B 7D 76 25 */ bl isDarkClearLV__21dSv_player_status_b_cCFi -/* 8085B590 2C 03 00 00 */ cmpwi r3, 0 -/* 8085B594 40 82 00 2C */ bne lbl_8085B5C0 -/* 8085B598 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 8085B59C 80 83 00 04 */ lwz r4, 4(r3) -/* 8085B5A0 C0 3E 05 84 */ lfs f1, 0x584(r30) -/* 8085B5A4 38 7E 05 74 */ addi r3, r30, 0x574 -/* 8085B5A8 38 84 00 58 */ addi r4, r4, 0x58 -/* 8085B5AC 4B 7B 21 2D */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 8085B5B0 38 7E 05 74 */ addi r3, r30, 0x574 -/* 8085B5B4 4B 7B 1E 75 */ bl play__14mDoExt_baseAnmFv -/* 8085B5B8 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 8085B5BC 4B 7B 27 09 */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_8085B5C0: -/* 8085B5C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085B5C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085B5C8 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 8085B5CC 90 1F 00 48 */ stw r0, 0x48(r31) -/* 8085B5D0 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 8085B5D4 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8085B5D8 38 60 00 01 */ li r3, 1 -/* 8085B5DC 39 61 00 50 */ addi r11, r1, 0x50 -/* 8085B5E0 4B B0 6C 49 */ bl _restgpr_29 -/* 8085B5E4 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8085B5E8 7C 08 03 A6 */ mtlr r0 -/* 8085B5EC 38 21 00 50 */ addi r1, r1, 0x50 -/* 8085B5F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/useHeapInit2__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/useHeapInit2__FP10fopAc_ac_c.s deleted file mode 100644 index 829aba84b4..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/useHeapInit2__FP10fopAc_ac_c.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_8085B7C0: -/* 8085B7C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8085B7C4 7C 08 02 A6 */ mflr r0 -/* 8085B7C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8085B7CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8085B7D0 4B B0 6A 0D */ bl _savegpr_29 -/* 8085B7D4 7C 7D 1B 78 */ mr r29, r3 -/* 8085B7D8 3C 60 80 86 */ lis r3, d_a_kytag09__stringBase0@ha /* 0x8085BA4C@ha */ -/* 8085B7DC 38 63 BA 4C */ addi r3, r3, d_a_kytag09__stringBase0@l /* 0x8085BA4C@l */ -/* 8085B7E0 38 63 00 08 */ addi r3, r3, 8 -/* 8085B7E4 38 80 00 04 */ li r4, 4 -/* 8085B7E8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085B7EC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085B7F0 3F C5 00 02 */ addis r30, r5, 2 -/* 8085B7F4 3B DE C2 F8 */ addi r30, r30, -15624 -/* 8085B7F8 7F C5 F3 78 */ mr r5, r30 -/* 8085B7FC 38 C0 00 80 */ li r6, 0x80 -/* 8085B800 4B 7E 0A ED */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8085B804 7C 7F 1B 78 */ mr r31, r3 -/* 8085B808 3C 80 00 08 */ lis r4, 8 -/* 8085B80C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 8085B810 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 8085B814 4B 7B 94 41 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8085B818 90 7D 05 68 */ stw r3, 0x568(r29) -/* 8085B81C 80 1D 05 68 */ lwz r0, 0x568(r29) -/* 8085B820 28 00 00 00 */ cmplwi r0, 0 -/* 8085B824 40 82 00 0C */ bne lbl_8085B830 -/* 8085B828 38 60 00 00 */ li r3, 0 -/* 8085B82C 48 00 00 50 */ b lbl_8085B87C -lbl_8085B830: -/* 8085B830 3C 60 80 86 */ lis r3, d_a_kytag09__stringBase0@ha /* 0x8085BA4C@ha */ -/* 8085B834 38 63 BA 4C */ addi r3, r3, d_a_kytag09__stringBase0@l /* 0x8085BA4C@l */ -/* 8085B838 38 63 00 08 */ addi r3, r3, 8 -/* 8085B83C 38 80 00 07 */ li r4, 7 -/* 8085B840 7F C5 F3 78 */ mr r5, r30 -/* 8085B844 38 C0 00 80 */ li r6, 0x80 -/* 8085B848 4B 7E 0A A5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8085B84C 7C 65 1B 78 */ mr r5, r3 -/* 8085B850 38 7D 05 74 */ addi r3, r29, 0x574 -/* 8085B854 38 9F 00 58 */ addi r4, r31, 0x58 -/* 8085B858 38 C0 00 01 */ li r6, 1 -/* 8085B85C 38 E0 00 02 */ li r7, 2 -/* 8085B860 3D 00 80 86 */ lis r8, lit_3906@ha /* 0x8085BA48@ha */ -/* 8085B864 C0 28 BA 48 */ lfs f1, lit_3906@l(r8) /* 0x8085BA48@l */ -/* 8085B868 39 00 00 00 */ li r8, 0 -/* 8085B86C 39 20 FF FF */ li r9, -1 -/* 8085B870 4B 7B 1D CD */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 8085B874 30 03 FF FF */ addic r0, r3, -1 -/* 8085B878 7C 60 19 10 */ subfe r3, r0, r3 -lbl_8085B87C: -/* 8085B87C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8085B880 4B B0 69 A9 */ bl _restgpr_29 -/* 8085B884 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8085B888 7C 08 03 A6 */ mtlr r0 -/* 8085B88C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8085B890 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 554304fe04..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_8085B658: -/* 8085B658 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8085B65C 7C 08 02 A6 */ mflr r0 -/* 8085B660 90 01 00 24 */ stw r0, 0x24(r1) -/* 8085B664 39 61 00 20 */ addi r11, r1, 0x20 -/* 8085B668 4B B0 6B 71 */ bl _savegpr_28 -/* 8085B66C 7C 7E 1B 78 */ mr r30, r3 -/* 8085B670 3C 60 80 86 */ lis r3, d_a_kytag09__stringBase0@ha /* 0x8085BA4C@ha */ -/* 8085B674 38 63 BA 4C */ addi r3, r3, d_a_kytag09__stringBase0@l /* 0x8085BA4C@l */ -/* 8085B678 38 80 00 04 */ li r4, 4 -/* 8085B67C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085B680 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085B684 3F E5 00 02 */ addis r31, r5, 2 -/* 8085B688 3B FF C2 F8 */ addi r31, r31, -15624 -/* 8085B68C 7F E5 FB 78 */ mr r5, r31 -/* 8085B690 38 C0 00 80 */ li r6, 0x80 -/* 8085B694 4B 7E 0C 59 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8085B698 7C 7D 1B 78 */ mr r29, r3 -/* 8085B69C 3C 60 80 86 */ lis r3, d_a_kytag09__stringBase0@ha /* 0x8085BA4C@ha */ -/* 8085B6A0 38 63 BA 4C */ addi r3, r3, d_a_kytag09__stringBase0@l /* 0x8085BA4C@l */ -/* 8085B6A4 38 80 00 05 */ li r4, 5 -/* 8085B6A8 7F E5 FB 78 */ mr r5, r31 -/* 8085B6AC 38 C0 00 80 */ li r6, 0x80 -/* 8085B6B0 4B 7E 0C 3D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8085B6B4 7C 7C 1B 78 */ mr r28, r3 -/* 8085B6B8 7F A3 EB 78 */ mr r3, r29 -/* 8085B6BC 3C 80 00 08 */ lis r4, 8 -/* 8085B6C0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 8085B6C4 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 8085B6C8 4B 7B 95 8D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8085B6CC 90 7E 05 68 */ stw r3, 0x568(r30) -/* 8085B6D0 80 1E 05 68 */ lwz r0, 0x568(r30) -/* 8085B6D4 28 00 00 00 */ cmplwi r0, 0 -/* 8085B6D8 40 82 00 0C */ bne lbl_8085B6E4 -/* 8085B6DC 38 60 00 00 */ li r3, 0 -/* 8085B6E0 48 00 00 C8 */ b lbl_8085B7A8 -lbl_8085B6E4: -/* 8085B6E4 3C 60 80 86 */ lis r3, d_a_kytag09__stringBase0@ha /* 0x8085BA4C@ha */ -/* 8085B6E8 38 63 BA 4C */ addi r3, r3, d_a_kytag09__stringBase0@l /* 0x8085BA4C@l */ -/* 8085B6EC 38 80 00 09 */ li r4, 9 -/* 8085B6F0 7F E5 FB 78 */ mr r5, r31 -/* 8085B6F4 38 C0 00 80 */ li r6, 0x80 -/* 8085B6F8 4B 7E 0B F5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8085B6FC 7C 65 1B 78 */ mr r5, r3 -/* 8085B700 38 7E 05 74 */ addi r3, r30, 0x574 -/* 8085B704 38 9D 00 58 */ addi r4, r29, 0x58 -/* 8085B708 38 C0 00 01 */ li r6, 1 -/* 8085B70C 38 E0 00 02 */ li r7, 2 -/* 8085B710 3D 00 80 86 */ lis r8, lit_3906@ha /* 0x8085BA48@ha */ -/* 8085B714 C0 28 BA 48 */ lfs f1, lit_3906@l(r8) /* 0x8085BA48@l */ -/* 8085B718 39 00 00 00 */ li r8, 0 -/* 8085B71C 39 20 FF FF */ li r9, -1 -/* 8085B720 4B 7B 1F 1D */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 8085B724 2C 03 00 00 */ cmpwi r3, 0 -/* 8085B728 40 82 00 0C */ bne lbl_8085B734 -/* 8085B72C 38 60 00 00 */ li r3, 0 -/* 8085B730 48 00 00 78 */ b lbl_8085B7A8 -lbl_8085B734: -/* 8085B734 7F 83 E3 78 */ mr r3, r28 -/* 8085B738 3C 80 00 08 */ lis r4, 8 -/* 8085B73C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 8085B740 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 8085B744 4B 7B 95 11 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8085B748 90 7E 05 6C */ stw r3, 0x56c(r30) -/* 8085B74C 80 1E 05 6C */ lwz r0, 0x56c(r30) -/* 8085B750 28 00 00 00 */ cmplwi r0, 0 -/* 8085B754 40 82 00 0C */ bne lbl_8085B760 -/* 8085B758 38 60 00 00 */ li r3, 0 -/* 8085B75C 48 00 00 4C */ b lbl_8085B7A8 -lbl_8085B760: -/* 8085B760 3C 60 80 86 */ lis r3, d_a_kytag09__stringBase0@ha /* 0x8085BA4C@ha */ -/* 8085B764 38 63 BA 4C */ addi r3, r3, d_a_kytag09__stringBase0@l /* 0x8085BA4C@l */ -/* 8085B768 38 80 00 0A */ li r4, 0xa -/* 8085B76C 7F E5 FB 78 */ mr r5, r31 -/* 8085B770 38 C0 00 80 */ li r6, 0x80 -/* 8085B774 4B 7E 0B 79 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8085B778 7C 65 1B 78 */ mr r5, r3 -/* 8085B77C 38 7E 05 8C */ addi r3, r30, 0x58c -/* 8085B780 38 9C 00 58 */ addi r4, r28, 0x58 -/* 8085B784 38 C0 00 01 */ li r6, 1 -/* 8085B788 38 E0 00 02 */ li r7, 2 -/* 8085B78C 3D 00 80 86 */ lis r8, lit_3906@ha /* 0x8085BA48@ha */ -/* 8085B790 C0 28 BA 48 */ lfs f1, lit_3906@l(r8) /* 0x8085BA48@l */ -/* 8085B794 39 00 00 00 */ li r8, 0 -/* 8085B798 39 20 FF FF */ li r9, -1 -/* 8085B79C 4B 7B 1E A1 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 8085B7A0 30 03 FF FF */ addic r0, r3, -1 -/* 8085B7A4 7C 60 19 10 */ subfe r3, r0, r3 -lbl_8085B7A8: -/* 8085B7A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8085B7AC 4B B0 6A 79 */ bl _restgpr_28 -/* 8085B7B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8085B7B4 7C 08 03 A6 */ mtlr r0 -/* 8085B7B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8085B7BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/dKankyo_DayProc__Fv.s b/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/dKankyo_DayProc__Fv.s deleted file mode 100644 index 68e3f248a7..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/dKankyo_DayProc__Fv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80529854: -/* 80529854 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80529858 7C 08 02 A6 */ mflr r0 -/* 8052985C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80529860 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80529864 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80529868 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8052986C 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 80529870 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 80529874 A0 84 00 B6 */ lhz r4, 0xb6(r4) -/* 80529878 4B B0 B1 2D */ bl offEventBit__11dSv_event_cFUs -/* 8052987C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80529880 7C 08 03 A6 */ mtlr r0 -/* 80529884 38 21 00 10 */ addi r1, r1, 0x10 -/* 80529888 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Create__FP10fopAc_ac_c.s deleted file mode 100644 index a2a580e3cd..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_805297A8: -/* 805297A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805297AC 7C 08 02 A6 */ mflr r0 -/* 805297B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 805297B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805297B8 7C 7F 1B 78 */ mr r31, r3 -/* 805297BC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 805297C0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 805297C4 40 82 00 1C */ bne lbl_805297E0 -/* 805297C8 28 1F 00 00 */ cmplwi r31, 0 -/* 805297CC 41 82 00 08 */ beq lbl_805297D4 -/* 805297D0 4B AE F3 95 */ bl __ct__10fopAc_ac_cFv -lbl_805297D4: -/* 805297D4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 805297D8 60 00 00 08 */ ori r0, r0, 8 -/* 805297DC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_805297E0: -/* 805297E0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 805297E4 54 00 06 FE */ clrlwi r0, r0, 0x1b -/* 805297E8 98 1F 05 68 */ stb r0, 0x568(r31) -/* 805297EC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 805297F0 54 00 DE FE */ rlwinm r0, r0, 0x1b, 0x1b, 0x1f -/* 805297F4 98 1F 05 69 */ stb r0, 0x569(r31) -/* 805297F8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 805297FC 54 00 B6 3E */ rlwinm r0, r0, 0x16, 0x18, 0x1f -/* 80529800 98 1F 05 6A */ stb r0, 0x56a(r31) -/* 80529804 A8 1F 04 DC */ lha r0, 0x4dc(r31) -/* 80529808 54 00 05 3E */ clrlwi r0, r0, 0x14 -/* 8052980C B0 1F 05 6C */ sth r0, 0x56c(r31) -/* 80529810 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 80529814 54 00 05 3E */ clrlwi r0, r0, 0x14 -/* 80529818 B0 1F 05 6E */ sth r0, 0x56e(r31) -/* 8052981C A8 1F 04 E0 */ lha r0, 0x4e0(r31) -/* 80529820 98 1F 05 72 */ stb r0, 0x572(r31) -/* 80529824 A8 1F 04 E0 */ lha r0, 0x4e0(r31) -/* 80529828 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8052982C 98 1F 05 73 */ stb r0, 0x573(r31) -/* 80529830 38 00 00 00 */ li r0, 0 -/* 80529834 98 1F 05 70 */ stb r0, 0x570(r31) -/* 80529838 98 1F 05 71 */ stb r0, 0x571(r31) -/* 8052983C 38 60 00 04 */ li r3, 4 -/* 80529840 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80529844 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80529848 7C 08 03 A6 */ mtlr r0 -/* 8052984C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80529850 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Execute__FP13kytag11_class.s b/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Execute__FP13kytag11_class.s deleted file mode 100644 index 32a17d6dab..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Execute__FP13kytag11_class.s +++ /dev/null @@ -1,169 +0,0 @@ -lbl_80529520: -/* 80529520 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80529524 7C 08 02 A6 */ mflr r0 -/* 80529528 90 01 00 34 */ stw r0, 0x34(r1) -/* 8052952C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80529530 4B E3 8C AD */ bl _savegpr_29 -/* 80529534 7C 7D 1B 78 */ mr r29, r3 -/* 80529538 3C 60 80 53 */ lis r3, lit_3874@ha /* 0x80529894@ha */ -/* 8052953C 3B C3 98 94 */ addi r30, r3, lit_3874@l /* 0x80529894@l */ -/* 80529540 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80529544 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80529548 38 00 00 00 */ li r0, 0 -/* 8052954C 98 1D 05 70 */ stb r0, 0x570(r29) -/* 80529550 38 00 00 01 */ li r0, 1 -/* 80529554 98 1D 05 70 */ stb r0, 0x570(r29) -/* 80529558 A0 1D 05 6C */ lhz r0, 0x56c(r29) -/* 8052955C 28 00 0F FF */ cmplwi r0, 0xfff -/* 80529560 41 82 00 38 */ beq lbl_80529598 -/* 80529564 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80529568 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8052956C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80529570 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 80529574 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80529578 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8052957C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80529580 4B B0 B4 3D */ bl isEventBit__11dSv_event_cCFUs -/* 80529584 2C 03 00 00 */ cmpwi r3, 0 -/* 80529588 40 82 00 44 */ bne lbl_805295CC -/* 8052958C 38 00 00 00 */ li r0, 0 -/* 80529590 98 1D 05 70 */ stb r0, 0x570(r29) -/* 80529594 48 00 00 38 */ b lbl_805295CC -lbl_80529598: -/* 80529598 88 9D 05 72 */ lbz r4, 0x572(r29) -/* 8052959C 28 04 00 FF */ cmplwi r4, 0xff -/* 805295A0 41 82 00 2C */ beq lbl_805295CC -/* 805295A4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 805295A8 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 805295AC 7C A5 07 74 */ extsb r5, r5 -/* 805295B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805295B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805295B8 4B B0 BD A9 */ bl isSwitch__10dSv_info_cCFii -/* 805295BC 2C 03 00 00 */ cmpwi r3, 0 -/* 805295C0 40 82 00 0C */ bne lbl_805295CC -/* 805295C4 38 00 00 00 */ li r0, 0 -/* 805295C8 98 1D 05 70 */ stb r0, 0x570(r29) -lbl_805295CC: -/* 805295CC A0 1D 05 6E */ lhz r0, 0x56e(r29) -/* 805295D0 28 00 0F FF */ cmplwi r0, 0xfff -/* 805295D4 41 82 00 38 */ beq lbl_8052960C -/* 805295D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805295DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805295E0 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 805295E4 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 805295E8 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 805295EC 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 805295F0 7C 84 02 2E */ lhzx r4, r4, r0 -/* 805295F4 4B B0 B3 C9 */ bl isEventBit__11dSv_event_cCFUs -/* 805295F8 2C 03 00 00 */ cmpwi r3, 0 -/* 805295FC 41 82 00 44 */ beq lbl_80529640 -/* 80529600 38 00 00 00 */ li r0, 0 -/* 80529604 98 1D 05 70 */ stb r0, 0x570(r29) -/* 80529608 48 00 00 38 */ b lbl_80529640 -lbl_8052960C: -/* 8052960C 88 9D 05 73 */ lbz r4, 0x573(r29) -/* 80529610 28 04 00 FF */ cmplwi r4, 0xff -/* 80529614 41 82 00 2C */ beq lbl_80529640 -/* 80529618 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8052961C 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80529620 7C A5 07 74 */ extsb r5, r5 -/* 80529624 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80529628 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8052962C 4B B0 BD 35 */ bl isSwitch__10dSv_info_cCFii -/* 80529630 2C 03 00 00 */ cmpwi r3, 0 -/* 80529634 41 82 00 0C */ beq lbl_80529640 -/* 80529638 38 00 00 00 */ li r0, 0 -/* 8052963C 98 1D 05 70 */ stb r0, 0x570(r29) -lbl_80529640: -/* 80529640 88 1D 05 70 */ lbz r0, 0x570(r29) -/* 80529644 28 00 00 00 */ cmplwi r0, 0 -/* 80529648 40 82 00 0C */ bne lbl_80529654 -/* 8052964C 38 60 00 01 */ li r3, 1 -/* 80529650 48 00 01 30 */ b lbl_80529780 -lbl_80529654: -/* 80529654 88 1D 05 71 */ lbz r0, 0x571(r29) -/* 80529658 28 00 00 00 */ cmplwi r0, 0 -/* 8052965C 40 82 00 50 */ bne lbl_805296AC -/* 80529660 88 1D 05 68 */ lbz r0, 0x568(r29) -/* 80529664 28 00 00 1F */ cmplwi r0, 0x1f -/* 80529668 41 82 00 3C */ beq lbl_805296A4 -/* 8052966C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80529670 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80529674 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 80529678 D0 1F 12 44 */ stfs f0, 0x1244(r31) -/* 8052967C C0 5E 00 00 */ lfs f2, 0(r30) -/* 80529680 C8 3E 00 18 */ lfd f1, 0x18(r30) -/* 80529684 90 01 00 0C */ stw r0, 0xc(r1) -/* 80529688 3C 00 43 30 */ lis r0, 0x4330 -/* 8052968C 90 01 00 08 */ stw r0, 8(r1) -/* 80529690 C8 01 00 08 */ lfd f0, 8(r1) -/* 80529694 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80529698 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8052969C D0 1F 12 44 */ stfs f0, 0x1244(r31) -/* 805296A0 D0 03 00 34 */ stfs f0, 0x34(r3) -lbl_805296A4: -/* 805296A4 38 00 00 01 */ li r0, 1 -/* 805296A8 98 1D 05 71 */ stb r0, 0x571(r29) -lbl_805296AC: -/* 805296AC 38 00 00 01 */ li r0, 1 -/* 805296B0 98 1F 12 FB */ stb r0, 0x12fb(r31) -/* 805296B4 88 1D 05 69 */ lbz r0, 0x569(r29) -/* 805296B8 28 00 00 1F */ cmplwi r0, 0x1f -/* 805296BC 41 82 00 20 */ beq lbl_805296DC -/* 805296C0 4B C7 63 51 */ bl dKy_getdaytime_hour__Fv -/* 805296C4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 805296C8 88 1D 05 69 */ lbz r0, 0x569(r29) -/* 805296CC 7C 00 18 40 */ cmplw r0, r3 -/* 805296D0 40 82 00 0C */ bne lbl_805296DC -/* 805296D4 38 60 00 01 */ li r3, 1 -/* 805296D8 48 00 00 A8 */ b lbl_80529780 -lbl_805296DC: -/* 805296DC C0 5E 00 04 */ lfs f2, 4(r30) -/* 805296E0 88 1D 05 6A */ lbz r0, 0x56a(r29) -/* 805296E4 C8 3E 00 18 */ lfd f1, 0x18(r30) -/* 805296E8 90 01 00 0C */ stw r0, 0xc(r1) -/* 805296EC 3C 00 43 30 */ lis r0, 0x4330 -/* 805296F0 90 01 00 08 */ stw r0, 8(r1) -/* 805296F4 C8 01 00 08 */ lfd f0, 8(r1) -/* 805296F8 EC 20 08 28 */ fsubs f1, f0, f1 -/* 805296FC C0 1E 00 08 */ lfs f0, 8(r30) -/* 80529700 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80529704 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80529708 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8052970C 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80529710 C0 1D 00 34 */ lfs f0, 0x34(r29) -/* 80529714 D0 1F 12 44 */ stfs f0, 0x1244(r31) -/* 80529718 A0 1D 00 38 */ lhz r0, 0x38(r29) -/* 8052971C B0 1F 12 BE */ sth r0, 0x12be(r31) -/* 80529720 EC 20 08 2A */ fadds f1, f0, f1 -/* 80529724 D0 3F 12 44 */ stfs f1, 0x1244(r31) -/* 80529728 4B E3 89 85 */ bl __cvt_fp2unsigned -/* 8052972C C8 3E 00 18 */ lfd f1, 0x18(r30) -/* 80529730 90 61 00 14 */ stw r3, 0x14(r1) -/* 80529734 3C 00 43 30 */ lis r0, 0x4330 -/* 80529738 90 01 00 10 */ stw r0, 0x10(r1) -/* 8052973C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80529740 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80529744 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 80529748 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8052974C 4C 41 13 82 */ cror 2, 1, 2 -/* 80529750 40 82 00 1C */ bne lbl_8052976C -/* 80529754 C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 80529758 D0 1F 12 44 */ stfs f0, 0x1244(r31) -/* 8052975C A0 7F 12 BE */ lhz r3, 0x12be(r31) -/* 80529760 38 03 00 01 */ addi r0, r3, 1 -/* 80529764 B0 1F 12 BE */ sth r0, 0x12be(r31) -/* 80529768 48 00 00 ED */ bl dKankyo_DayProc__Fv -lbl_8052976C: -/* 8052976C C0 1F 12 44 */ lfs f0, 0x1244(r31) -/* 80529770 D0 1D 00 34 */ stfs f0, 0x34(r29) -/* 80529774 A0 1F 12 BE */ lhz r0, 0x12be(r31) -/* 80529778 B0 1D 00 38 */ sth r0, 0x38(r29) -/* 8052977C 38 60 00 01 */ li r3, 1 -lbl_80529780: -/* 80529780 39 61 00 30 */ addi r11, r1, 0x30 -/* 80529784 4B E3 8A A5 */ bl _restgpr_29 -/* 80529788 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8052978C 7C 08 03 A6 */ mtlr r0 -/* 80529790 38 21 00 30 */ addi r1, r1, 0x30 -/* 80529794 4E 80 00 20 */ blr diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index f123a414f8..a42b810685 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -100,6 +100,10 @@ public: STATIC_ASSERT(0x20 == sizeof(cCcD_ShapeAttr)); +struct cCcD_SrcTriAttr { + cM3dGTriS mTri; +}; + class cCcD_TriAttr : public cCcD_ShapeAttr, public cM3dGTri { public: /* 80263C04 */ virtual void CalcAabBox(); diff --git a/include/SSystem/SComponent/c_m3d_g_tri.h b/include/SSystem/SComponent/c_m3d_g_tri.h index 24338c6582..59b427ef92 100644 --- a/include/SSystem/SComponent/c_m3d_g_tri.h +++ b/include/SSystem/SComponent/c_m3d_g_tri.h @@ -8,6 +8,12 @@ class cM3dGCyl; +struct cM3dGTriS { + Vec a; + Vec b; + Vec c; +}; + class cM3dGTri : public cM3dGPla { // private: public: diff --git a/include/d/bg/d_bg_w_kcol.h b/include/d/bg/d_bg_w_kcol.h index 12c5f303cc..45fee6a228 100644 --- a/include/d/bg/d_bg_w_kcol.h +++ b/include/d/bg/d_bg_w_kcol.h @@ -32,10 +32,17 @@ struct pkcdata { /* 0x24 */ u32 field_0x24; }; +struct KCol_Header { + /* 0x0 */ u32 pos_data_offset; + /* 0x4 */ u32 nrm_data_offset; + /* 0x8 */ u32 prism_data_offset; + /* 0xC */ u32 block_data_offset; +}; + class dBgWKCol : public dBgW_Base { public: /* 8007E6F4 */ dBgWKCol(); - /* 8007E7D0 */ void initKCollision(void*); + /* 8007E7D0 */ static void initKCollision(void*); /* 8007E804 */ void create(void* pprism, void* plc); /* 8007E850 */ void getTriNrm(KC_PrismData*, Vec**) const; /* 8007E8C0 */ cM3dGPla GetTriPla(int) const; diff --git a/include/d/cc/d_cc_d.h b/include/d/cc/d_cc_d.h index 83d8714930..22c76fe56c 100644 --- a/include/d/cc/d_cc_d.h +++ b/include/d/cc/d_cc_d.h @@ -85,7 +85,8 @@ struct dCcD_SrcSph { struct dCcD_SrcTri { /* 0x00 */ dCcD_SrcGObjInf mObjInf; -}; // Size: 0x30 + /* 0x30 */ cCcD_SrcTriAttr mTriAttr; +}; // Size: 0x54 struct dCcD_SrcCyl { /* 0x00 */ dCcD_SrcGObjInf mObjInf; diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 2099bdb0b9..c4713b7d6b 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -279,7 +279,7 @@ public: static dDemo_actor_c* getActor(u8 param_0) { return m_object->getActor(param_0); } static u32 getFrameNoMsg() { return m_frameNoMsg; } static s32 getMode() { return m_mode; } - static int getFrame() { return m_frame; } + static u32 getFrame() { return m_frame; } static JStudio::stb::TControl* getControl() { return m_control; } static bool isStatus(u32 status) { return m_status & status; } static void onStatus(u32 status) { m_status |= status; } diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h index a33525fa0a..727ca3f4ed 100644 --- a/include/m_Do/m_Do_controller_pad.h +++ b/include/m_Do/m_Do_controller_pad.h @@ -49,6 +49,7 @@ public: static u32 getHoldX(u32 pad) { return getHold(pad) & CButton::X; } static f32 getStickX(u32 pad) { return getCpadInfo(pad).mMainStickPosX; } static f32 getStickY(u32 pad) { return getCpadInfo(pad).mMainStickPosY; } + static f32 getStickX3D(u32 pad) { return getCpadInfo(pad).mMainStickPosX; } static f32 getStickValue(u32 pad) { return getCpadInfo(pad).mMainStickValue; } static s16 getStickAngle(u32 pad) { return getCpadInfo(pad).mMainStickAngle; } static s16 getStickAngle3D(u32 pad) { return getCpadInfo(pad).mMainStickAngle; } diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 3f84d6d982..bec5a7009b 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -76,7 +76,7 @@ public: int remove(J3DModelData* i_modelData) { return i_modelData->removeTexMtxAnimator(mpAnm); } void entryFrame() { entryFrame(getFrame()); } - void entryFrame(f32 frame) { setFrame(frame); } + void entryFrame(f32 frame) { mpAnm->setFrame(frame); } J3DAnmTextureSRTKey* getBtkAnm() const { return mpAnm; } @@ -106,7 +106,7 @@ public: int remove(J3DModelData* i_modelData) { return i_modelData->removeTevRegAnimator(mpAnm); } void entryFrame() { entryFrame(getFrame()); } - void entryFrame(f32 frame) { setFrame(frame); } + void entryFrame(f32 frame) { mpAnm->setFrame(frame); } J3DAnmTevRegKey* getBrkAnm() const { return mpAnm; } @@ -580,6 +580,7 @@ int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id); void mDoExt_modelEntryDL(J3DModel* i_model); void mDoExt_setupStageTexture(J3DModelData* i_modelData); OSThread* mDoExt_GetCurrentRunningThread(); +void mDoExt_setupShareTexture(J3DModelData* i_modelData, J3DModelData* i_shareModelData); struct JUTFont; JUTFont* mDoExt_getMesgFont(); diff --git a/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h b/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h index ad029c79b0..add0773ce6 100644 --- a/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h +++ b/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h @@ -1,6 +1,130 @@ #ifndef D_A_BG_OBJ_H #define D_A_BG_OBJ_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/bg/d_bg_w.h" +#include "d/cc/d_cc_d.h" +#include "f_op/f_op_actor_mng.h" + +class daBgObj_c; +typedef int (daBgObj_c::*createHeapFunc)(); +typedef int (daBgObj_c::*createInitFunc)(); +typedef int (daBgObj_c::*executeFunc)(); +typedef void (daBgObj_c::*tgSetFunc)(); +typedef int (daBgObj_c::*actionFunc)(); + +class daBgObj_c : public dBgS_MoveBgActor { +public: + class spec_data_c { + public: + /* 804597E8 */ u8* initParticleBlock(u8*); + /* 80459814 */ u8* initSoundBlock(u8*); + /* 80459840 */ u8* initTexShareBlock(u8*); + /* 804598F4 */ u8* initFarInfoBlock(u8*); + /* 80459904 */ bool Set(void*); + + /* 0x00 */ u16 mSpecType; + /* 0x02 */ u8 field_0x02; + /* 0x03 */ u8 field_0x03; + /* 0x04 */ u32 mParticleNum; + /* 0x08 */ u8* mpParticleBlock; + /* 0x0C */ u32 mSoundNum; + /* 0x10 */ u8* mpSoundBlock; + /* 0x14 */ u8 field_0x14; + /* 0x15 */ u8 field_0x15; + /* 0x16 */ u8 field_0x16; + /* 0x18 */ u8* mpTexShareBlock; + /* 0x1C */ u8 mTexShareNum; + /* 0x20 */ f32 mpFarInfoBlock; + }; + + /* 80459B64 */ void release(dBgW*); + /* 80459BB4 */ void regist(dBgW*); + /* 80459BEC */ void initAtt(); + /* 80459D0C */ void setAttentionInfo(fopAc_ac_c*); + /* 80459D3C */ void initBaseMtx(); + /* 80459D94 */ void setBaseMtx(); + /* 80459E04 */ void settingCullSizeBoxForCo(int); + /* 80459F14 */ void settingCullSizeBoxForCull(int); + /* 8045A0EC */ int CreateInitType0(); + /* 8045A160 */ int CreateInitType1(); + /* 8045A2F0 */ int CreateHeapType0(); + /* 8045A574 */ int CreateHeapType1(); + /* 8045A83C */ void doShareTexture(); + /* 8045A9E8 */ int create1st(); + /* 8045AAF0 */ void setColCommon(); + /* 8045AB80 */ void set_tri_0(); + /* 8045ACC0 */ void set_tri_1(); + /* 8045AE00 */ void set_cyl_0(); + /* 8045AE98 */ void set_tri_2(); + /* 8045AFD4 */ void set_tri_3(); + /* 8045B17C */ void setParticle(); + /* 8045B3A0 */ void setSe(); + /* 8045B44C */ BOOL checkDestroy(); + /* 8045B534 */ BOOL checkHitAt(cCcD_Obj*); + /* 8045B5E0 */ void orderWait_tri(); + /* 8045B7FC */ void orderWait_cyl(); + /* 8045B9C4 */ void orderWait_spec(); + /* 8045BB38 */ int actionOrderWait(); + /* 8045BBE0 */ int actionOrder(); + /* 8045BD50 */ int actionEvent(); + /* 8045BDB0 */ int actionWait(); + /* 8045BDB8 */ int ExecuteType0(); + /* 8045BED0 */ int ExecuteType1(); + /* 8045C25C */ void indirectProc(J3DModel*); + + /* 8045A940 */ virtual int CreateHeap(); + /* 8045A2B8 */ virtual int Create(); + /* 8045BFBC */ virtual int Execute(f32 (**)[3][4]); + /* 8045C078 */ virtual int Draw(); + /* 8045C2E8 */ virtual int Delete(); + + void setAction(u8 i_action) { mAction = i_action; } + + static createHeapFunc mCreateHeapFunc[]; + static createInitFunc mCreateInitFunc[]; + static executeFunc mExecuteFunc[]; + static tgSetFunc mTgSetFunc[]; + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* field_0x5a8[2][2]; + /* 0x5B8 */ mDoExt_btkAnm* field_0x5b8[2][2]; + /* 0x5C8 */ mDoExt_brkAnm* field_0x5c8[2][2]; + /* 0x5D8 */ dBgW* mpBgW; + /* 0x5DC */ dCcD_Stts mStts; + /* 0x618 */ dCcD_Tri mTris[4]; + /* 0xB88 */ dCcD_Cyl mCyl; + /* 0xCC4 */ u8 field_0xcc4; + /* 0xCC5 */ u8 mAction; + /* 0xCC6 */ s16 mEventIdx; + /* 0xCC8 */ u8 field_0xcc8; + /* 0xCC9 */ u8 field_0xcc9; + /* 0xCCA */ u16 field_0xcca; + /* 0xCCC */ u16 field_0xccc; + /* 0xCD0 */ spec_data_c mSpecData; + /* 0xCF4 */ csXyz field_0xcf4; + /* 0xCFC */ u32 mAttnActorID; + /* 0xD00 */ u8 field_0xd00; + /* 0xD01 */ u8 field_0xd01; + /* 0xD02 */ u8 field_0xd02; +}; + +namespace daBgObj_prm { +inline u8 getEvId(daBgObj_c* i_this) { + return (fopAcM_GetParam(i_this) >> 0x15) & 0xFF; +} + +inline u8 getSwBit(daBgObj_c* i_this) { + return i_this->field_0xccc & 0xFF; +} + +inline u8 getSwBit2(daBgObj_c* i_this) { + return (i_this->field_0xccc >> 8) & 0xFF; +} + +inline u8 getObjArg0(daBgObj_c* i_this) { + return i_this->field_0xcca & 0xFF; +} +}; // namespace daBgObj_prm #endif /* D_A_BG_OBJ_H */ diff --git a/include/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.h b/include/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.h index 37751c8a47..51c6195893 100644 --- a/include/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.h +++ b/include/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.h @@ -1,6 +1,19 @@ #ifndef D_A_KYTAG09_H #define D_A_KYTAG09_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class kytag09_class : public fopAc_ac_c { +public: + /* 0x568 */ J3DModel* mpModel; + /* 0x56C */ J3DModel* mpModel2; + /* 0x570 */ u8 field_0x570[0x574 - 0x570]; + /* 0x574 */ mDoExt_btkAnm mBtk_2; + /* 0x58C */ mDoExt_btkAnm mBtk; + /* 0x5A4 */ mDoExt_btkAnm unused_0x5a4; + /* 0x5BC */ request_of_phase_process_class mPhase; + /* 0x5C4 */ u8 field_0x5c4; + /* 0x5C5 */ u8 mType; +}; #endif /* D_A_KYTAG09_H */ diff --git a/include/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.h b/include/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.h index 6753337a55..87c7fd25b0 100644 --- a/include/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.h +++ b/include/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.h @@ -1,6 +1,19 @@ #ifndef D_A_KYTAG11_H #define D_A_KYTAG11_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class kytag11_class : public fopAc_ac_c { +public: + /* 0x568 */ u8 mNewTime; + /* 0x569 */ u8 mStopTime; + /* 0x56A */ u8 mEnvTime; + /* 0x56C */ u16 mOnEventID; + /* 0x56E */ u16 mOffEventID; + /* 0x570 */ u8 mChangeTime; + /* 0x571 */ u8 mInitTimeChange; + /* 0x572 */ u8 mOnSwitchNo; + /* 0x573 */ u8 mOffSwitchNo; +}; #endif /* D_A_KYTAG11_H */ diff --git a/rel/d/a/d_a_bg/d_a_bg.cpp b/rel/d/a/d_a_bg/d_a_bg.cpp index 75de1a107a..32e39b5a19 100644 --- a/rel/d/a/d_a_bg/d_a_bg.cpp +++ b/rel/d/a/d_a_bg/d_a_bg.cpp @@ -562,7 +562,7 @@ SECTION_DEAD static char const* const stringBase_804593C6 = "room.plc"; #pragma pop /* 804582B8-80458750 000738 0498+00 2/2 0/0 1/1 .text createHeap__6daBg_cFv */ -// regalloc +// regalloc, but equivalent #ifdef NONMATCHING int daBg_c::createHeap() { const char* arcName = setArcName(); @@ -773,6 +773,7 @@ SECTION_DEAD static char const* const stringBase_80459418 = "MA00_Kusa"; #pragma pop /* 804588C4-80458F38 000D44 0674+00 1/1 0/0 0/0 .text draw__6daBg_cFv */ +// just regalloc + some reorder issues #ifdef NONMATCHING int daBg_c::draw() { int roomNo = fopAcM_GetParam(this); @@ -782,8 +783,10 @@ int daBg_c::draw() { mDoLib_clipper::changeFar(1000000.0f); for (int i = 0; i < 6; bgData++, i++) { - if (bgData->mpBgModel != NULL) { - J3DModelData* modelData = bgData->mpBgModel->getModelData(); + J3DModel* bg_model = bgData->mpBgModel; + + if (bg_model != NULL) { + J3DModelData* modelData = bg_model->getModelData(); if (bgData->mpBgBtk != NULL) { bgData->mpBgBtk->entryFrame(); @@ -797,7 +800,7 @@ int daBg_c::draw() { } } - bgData->mpBgModel->calc(); + bg_model->calc(); for (u16 j = 0; j < modelData->getShapeNum(); j++) { J3DShape* shape = modelData->getShapeNodePointer(j); @@ -810,45 +813,45 @@ int daBg_c::draw() { } g_env_light.settingTevStruct(l_tevStrType[i], NULL, bgData->mpTevStr); - g_env_light.setLightTevColorType_MAJI(bgData->mpBgModel, bgData->mpTevStr); - dKy_bg_MAxx_proc(bgData->mpBgModel); + g_env_light.setLightTevColorType_MAJI(bg_model, bgData->mpTevStr); + dKy_bg_MAxx_proc(bg_model); - if (bgData->mpBgModel != NULL) { - modelData = bgData->mpBgModel->getModelData(); + if (bg_model != NULL) { + modelData = bg_model->getModelData(); for (u16 j = 0; j < modelData->getMaterialNum(); j++) { J3DMaterial* mat = modelData->getMaterialNodePointer(j); const char* name = modelData->getMaterialName()->getName(j); - if (!memcmp(&name[3], &"MA12", 4)) { + if (!memcmp(&name[3], "MA12", 4)) { if (g_env_light.mColPatCurr == 6) { field_0x5f0 = 0; } - } else if (!memcmp(&name[3], &"MA18", 4)) { - if (dDemo_c::getFrame() > 1117) { + } else if (!memcmp(&name[3], "MA18", 4)) { + if (dDemo_c::getFrame() >= 1118) { field_0x5f0 = 0; } - if (i_dComIfGs_isEventBit(0x0D04)) { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::M_077)) { field_0x5f0 = 9; } - } else if (!memcmp(&name[3], &"MA15", 4)) { - if (dComIfGs_BossLife_public_Get() == -1) { - field_0x5f0 = 0; + } else if (!memcmp(&name[3], "MA15", 4)) { + if (dComIfGs_BossLife_public_Get() != -1) { + field_0x5f1 = dComIfGs_BossLife_public_Get() + 1; } else { - field_0x5f0 = dComIfGs_BossLife_public_Get() + 1; + field_0x5f1 = 0; } - } else if (!memcmp(&name[3], &"MA09", 4)) { - bgData->mBtkAnmSpeed = 1.0f - (1.0f - g_env_light.mWaterSurfaceShineRate); - } else if (!memcmp(&name[3], &"MA05", 4)) { - bgData->mpTevStr->field_0x378 |= j; + } else if (!memcmp(&name[3], "MA09", 4)) { + bgData->mBtkAnmSpeed = 1.0f - (1.0f - g_env_light.mWaterSurfaceShineRate) * 0.9f; + } else if (!memcmp(&name[3], "MA05", 4)) { + bgData->mpTevStr->field_0x378 |= (u8)j; } if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") || !strcmp(dComIfGp_getStartStageName(), "R_SP127")) { - if (!memcmp(&name[3], &"MA00_Enkei_Tree_Color", 21) || - !memcmp(&name[3], &"MA00_Gake", 9) || - !memcmp(&name[3], &"MA00_Kusa", 9)) { + if (!memcmp(&name[3], "MA00_Enkei_Tree_Color", 21) || + !memcmp(&name[3], "MA00_Gake", 9) || + !memcmp(&name[3], "MA00_Kusa", 9)) { J3DGXColorS10 colorS10; J3DGXColor color; @@ -883,22 +886,22 @@ int daBg_c::draw() { if (var_f2 > 1.0f) { var_f2 = 1.0f; } - colorS10.mColor.r = var_r5 * var_f2; + colorS10.r = var_r5 * var_f2; f32 temp_f2_2 = bgData->mpTevStr->mColorC0.g / 10.0f; f32 var_f2_2 = temp_f2_2 * temp_f2_2; if (var_f2_2 > 1.0f) { var_f2_2 = 1.0f; } - colorS10.mColor.g = var_r0 * var_f2_2; + colorS10.g = var_r0 * var_f2_2; f32 temp_f2_3 = bgData->mpTevStr->mColorC0.b / 10.0f; f32 var_f2_3 = temp_f2_3 * temp_f2_3; if (var_f2_3 > 1.0f) { var_f2_3 = 1.0f; } - colorS10.mColor.b = var_r3 * var_f2_3; - colorS10.mColor.a = 255; + colorS10.b = var_r3 * var_f2_3; + colorS10.a = 255; mat->setTevColor(0, &colorS10); color.r = 0; @@ -910,14 +913,15 @@ int daBg_c::draw() { } } - mDoExt_modelEntryDL(bgData->mpBgModel); + mDoExt_modelEntryDL(bg_model); dComIfGd_setListBG(); } } } dComIfGd_setList(); - g_env_light.settingTevStruct(0x10, NULL, dComIfGp_roomControl_getTevStr(roomNo)); + dKy_tevstr_c* tevstr = dComIfGp_roomControl_getTevStr(roomNo); + g_env_light.settingTevStruct(0x10, NULL, tevstr); return 1; } diff --git a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp index 9938a51c08..af240acdc1 100644 --- a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp +++ b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp @@ -4,289 +4,24 @@ // #include "rel/d/a/d_a_bg_obj/d_a_bg_obj.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "MSL_C/stdio.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" #include "dol2asm.h" -#include "dolphin/types.h" +#include "dolphin/os/OS.h" +#include "rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daSetBgObj_c { - /* 80031870 */ void getArcName(fopAc_ac_c*); -}; - -struct J3DModel {}; - -struct cCcD_Obj {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct daBgObj_c { - struct spec_data_c { - /* 804597E8 */ void initParticleBlock(u8*); - /* 80459814 */ void initSoundBlock(u8*); - /* 80459840 */ void initTexShareBlock(u8*); - /* 804598F4 */ void initFarInfoBlock(u8*); - /* 80459904 */ void Set(void*); - }; - - /* 80459B64 */ void release(dBgW*); - /* 80459BB4 */ void regist(dBgW*); - /* 80459BEC */ void initAtt(); - /* 80459D0C */ void setAttentionInfo(fopAc_ac_c*); - /* 80459D3C */ void initBaseMtx(); - /* 80459D94 */ void setBaseMtx(); - /* 80459E04 */ void settingCullSizeBoxForCo(int); - /* 80459F14 */ void settingCullSizeBoxForCull(int); - /* 8045A0EC */ void CreateInitType0(); - /* 8045A160 */ void CreateInitType1(); - /* 8045A2B8 */ void Create(); - /* 8045A2F0 */ void CreateHeapType0(); - /* 8045A574 */ void CreateHeapType1(); - /* 8045A83C */ void doShareTexture(); - /* 8045A940 */ void CreateHeap(); - /* 8045A9E8 */ void create1st(); - /* 8045AAF0 */ void setColCommon(); - /* 8045AB80 */ void set_tri_0(); - /* 8045ACC0 */ void set_tri_1(); - /* 8045AE00 */ void set_cyl_0(); - /* 8045AE98 */ void set_tri_2(); - /* 8045AFD4 */ void set_tri_3(); - /* 8045B17C */ void setParticle(); - /* 8045B3A0 */ void setSe(); - /* 8045B44C */ void checkDestroy(); - /* 8045B534 */ void checkHitAt(cCcD_Obj*); - /* 8045B5E0 */ void orderWait_tri(); - /* 8045B7FC */ void orderWait_cyl(); - /* 8045B9C4 */ void orderWait_spec(); - /* 8045BB38 */ void actionOrderWait(); - /* 8045BBE0 */ void actionOrder(); - /* 8045BD50 */ void actionEvent(); - /* 8045BDB0 */ bool actionWait(); - /* 8045BDB8 */ void ExecuteType0(); - /* 8045BED0 */ void ExecuteType1(); - /* 8045BFBC */ void Execute(f32 (**)[3][4]); - /* 8045C078 */ void Draw(); - /* 8045C25C */ void indirectProc(J3DModel*); - /* 8045C2E8 */ void Delete(); - - static u8 mCreateHeapFunc[48]; - static u8 mCreateInitFunc[48]; - static u8 mExecuteFunc[48]; - static u8 mTgSetFunc[60]; -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dStage_roomControl_c { - static u8 mStatus[65792]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct JPABaseEmitter {}; - -struct dPa_modelEcallBack { - /* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, - u8); - - static u8 mEcallback[4]; -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); -}; - -struct dCcD_SrcTri {}; - -struct dCcD_Tri { - /* 80084884 */ void Set(dCcD_SrcTri const&); - /* 8045C4D4 */ ~dCcD_Tri(); - /* 8045C5B4 */ dCcD_Tri(); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 8045C6E8 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW_Base {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGTri { - /* 8026F7DC */ void setPos(Vec const*, Vec const*, Vec const*); - /* 8045C644 */ ~cM3dGTri(); -}; - -struct cM3dGPla { - /* 8045C6A0 */ ~cM3dGPla(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 8045C444 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 8045C48C */ ~cM3dGAab(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 8045C7B0 */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DTransformInfo {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8045A52C */ ~J3DFrameCtrl(); -}; +SECTION_DATA extern void* __vt__10cCcD_GStts[3]; +SECTION_DATA extern void* __vt__10dCcD_GStts[3]; +SECTION_DATA extern void* __vt__8cM3dGPla[3]; +SECTION_DATA extern void* __vt__8cM3dGTri[3]; +SECTION_DATA extern void* __vt__8cM3dGCyl[3]; +SECTION_DATA extern void* __vt__8cM3dGAab[3]; +SECTION_DATA extern void* __vt__9daBgObj_c[10]; +SECTION_DATA extern void* __vt__12J3DFrameCtrl[3]; // // Forward References: @@ -364,7 +99,6 @@ extern "C" u8 mTgSetFunc__9daBgObj_c[60]; // External References: // -extern "C" void OSReport_Error(); extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); @@ -437,10 +171,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXIdentity(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_21(); @@ -457,11 +187,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void sprintf(); -extern "C" void strcpy(); -extern "C" void strlen(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__8dCcD_Tri[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -471,9 +196,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -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 mEcallback__18dPa_modelEcallBack[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -481,132 +203,113 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // -/* ############################################################################################## */ -/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045CA20 = "model%d.bmd"; -SECTION_DEAD static char const* const stringBase_8045CA2C = "model%d_%d.bmd"; -#pragma pop - -/* 8045CE00-8045CE10 000000 0010+00 1/1 0/0 0/0 .bss l_bmdName$3644 */ -static u8 l_bmdName[16]; - /* 80459658-804596C4 000078 006C+00 2/2 0/0 0/0 .text getBmdName__Fii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getBmdName(int param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBmdName__Fii.s" +static const char* getBmdName(int param_0, int param_1) { + static char l_bmdName[16]; + + switch (param_1) { + case 0: + sprintf(l_bmdName, "model%d.bmd", param_0); + break; + default: + sprintf(l_bmdName, "model%d_%d.bmd", param_0, param_1); + break; + } + + return l_bmdName; } -#pragma pop -/* ############################################################################################## */ -/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045CA3B = "model%d.btk"; -SECTION_DEAD static char const* const stringBase_8045CA47 = "model%d_%d.btk"; -#pragma pop +static const char* getBtkName(int param_0, int param_1) { + static char l_btkName[16]; -/* 8045CE10-8045CE20 000010 0010+00 1/1 0/0 0/0 .bss l_btkName$3652 */ -static u8 l_btkName[16]; + switch (param_1) { + case 0: + sprintf(l_btkName, "model%d.btk", param_0); + break; + default: + sprintf(l_btkName, "model%d_%d.btk", param_0, param_1); + break; + } -/* 804596C4-80459734 0000E4 0070+00 2/2 0/0 0/0 .text getBtkName__Fii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getBtkName(int param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBtkName__Fii.s" + return l_btkName; } -#pragma pop - -/* ############################################################################################## */ -/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045CA56 = "model%d.brk"; -SECTION_DEAD static char const* const stringBase_8045CA62 = "model%d_%d.brk"; -#pragma pop - -/* 8045CE20-8045CE30 000020 0010+00 1/1 0/0 0/0 .bss l_brkName$3660 */ -static u8 l_brkName[16]; /* 80459734-804597A4 000154 0070+00 2/2 0/0 0/0 .text getBrkName__Fii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getBrkName(int param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getBrkName__Fii.s" +static const char* getBrkName(int param_0, int param_1) { + static char l_brkName[16]; + + switch (param_1) { + case 0: + sprintf(l_brkName, "model%d.brk", param_0); + break; + default: + sprintf(l_brkName, "model%d_%d.brk", param_0, param_1); + break; + } + + return l_brkName; } -#pragma pop - -/* ############################################################################################## */ -/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045CA71 = "model%d.dzb"; -#pragma pop - -/* 8045CE30-8045CE40 000030 0010+00 1/1 0/0 0/0 .bss l_dzbName$3668 */ -static u8 l_dzbName[16]; /* 804597A4-804597E8 0001C4 0044+00 2/2 0/0 0/0 .text getDzbName__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getDzbName(int param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/getDzbName__Fi.s" +static const char* getDzbName(int param_0) { + static char l_dzbName[16]; + + sprintf(l_dzbName, "model%d.dzb", param_0); + return l_dzbName; } -#pragma pop /* 804597E8-80459814 000208 002C+00 1/1 0/0 0/0 .text * initParticleBlock__Q29daBgObj_c11spec_data_cFPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::spec_data_c::initParticleBlock(u8* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initParticleBlock__Q29daBgObj_c11spec_data_cFPUc.s" +u8* daBgObj_c::spec_data_c::initParticleBlock(u8* i_dataPtr) { + mpParticleBlock = i_dataPtr; + mParticleNum = *(u32*)mpParticleBlock >> 4 & 0xFFFFF; + + return i_dataPtr + ((*(u32*)mpParticleBlock & 0xFFFFFF) + 4); } -#pragma pop /* 80459814-80459840 000234 002C+00 1/1 0/0 0/0 .text * initSoundBlock__Q29daBgObj_c11spec_data_cFPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::spec_data_c::initSoundBlock(u8* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initSoundBlock__Q29daBgObj_c11spec_data_cFPUc.s" +u8* daBgObj_c::spec_data_c::initSoundBlock(u8* i_dataPtr) { + mpSoundBlock = i_dataPtr; + mSoundNum = *(u32*)mpSoundBlock >> 2 & 0x3FFFFF; + + return i_dataPtr + ((*(u32*)mpSoundBlock & 0xFFFFFF) + 4); } -#pragma pop /* 80459840-804598F4 000260 00B4+00 1/1 0/0 0/0 .text * initTexShareBlock__Q29daBgObj_c11spec_data_cFPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::spec_data_c::initTexShareBlock(u8* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initTexShareBlock__Q29daBgObj_c11spec_data_cFPUc.s" +u8* daBgObj_c::spec_data_c::initTexShareBlock(u8* i_dataPtr) { + char sp48[64]; + char sp8[64]; + + mpTexShareBlock = i_dataPtr; + mTexShareNum = i_dataPtr[4]; + + int i = 0; + u8* dataPos = i_dataPtr + 8; + + for (; i < mTexShareNum; i++) { + strcpy(sp48, (char*)dataPos); + int len = strlen((char*)dataPos); + + dataPos += len + 1; + if (*dataPos != 0) { + strcpy(sp8, (char*)dataPos); + dataPos += strlen((char*)dataPos) + 1; + } else if (*dataPos == 0 && dataPos[1] == 1) { + dataPos += 2; + } + } + + return dataPos; } -#pragma pop /* 804598F4-80459904 000314 0010+00 1/1 0/0 0/0 .text * initFarInfoBlock__Q29daBgObj_c11spec_data_cFPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::spec_data_c::initFarInfoBlock(u8* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initFarInfoBlock__Q29daBgObj_c11spec_data_cFPUc.s" +u8* daBgObj_c::spec_data_c::initFarInfoBlock(u8* i_dataPtr) { + mpFarInfoBlock = *(f32*)(i_dataPtr + 4); + return i_dataPtr + 8; } -#pragma pop /* ############################################################################################## */ /* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -618,45 +321,165 @@ SECTION_DEAD static char const* const stringBase_8045CA86 = "データブロッ /* 80459904-80459B64 000324 0260+00 1/1 0/0 1/1 .text Set__Q29daBgObj_c11spec_data_cFPv */ +// close-ish +#ifdef NONMATCHING +struct spec_dat { + u16 field_0x0; + u16 field_0x2; + u8 field_0x4; +}; + +int daBgObj_c::spec_data_c::Set(void* i_ptr) { + spec_dat* data = (spec_dat*)i_ptr; + + mSpecType = data->field_0x0; + + switch (mSpecType) { + case 0: + u8 block_type = data->field_0x4; + u8* block_p = (u8*)data + 4; + + do { + switch (block_type) { + case 0: + break; + case 3: + block_p = initTexShareBlock(block_p); + break; + case 4: + block_p = initFarInfoBlock(block_p); + break; + } + + if (block_type == 0) { + break; + } + + block_type = *block_p; + } while (1); + break; + case 1: + u16 temp_r3 = data->field_0x2; + field_0x02 = temp_r3 & 0xF; + field_0x03 = (temp_r3 >> 0xE) & 3; + field_0x15 = (temp_r3 >> 0xC) & 3; + field_0x14 = (temp_r3 >> 9) & 7; + field_0x16 = (temp_r3 >> 8) & 1; + + u8 block_type = data->field_0x4; + u8* block_p = (u8*)i_ptr + 4; + + do { + switch (block_type) { + case 0: + break; + case 3: + block_p = initTexShareBlock(block_p); + break; + case 1: + block_p = initParticleBlock(block_p); + break; + case 2: + block_p = initSoundBlock(block_p); + break; + case 4: + block_p = initFarInfoBlock(block_p); + break; + } + + if (block_type == 0) { + break; + } + + block_type = *block_p; + } while (1); + break; + case 2: + u16 temp_r3_2 = data->field_0x2; + field_0x02 = temp_r3_2 & 0xF; + field_0x03 = (temp_r3_2 >> 0xE) & 3; + field_0x15 = (temp_r3_2 >> 0xC) & 3; + field_0x14 = (temp_r3_2 >> 9) & 7; + field_0x16 = (temp_r3_2 >> 8) & 1; + + u8 block_type = data->field_0x4; + u8* block_p = (u8*)i_ptr + 4; + + do { + switch (block_type) { + case 0: + break; + case 3: + block_p = initTexShareBlock(block_p); + break; + case 1: + block_p = initParticleBlock(block_p); + break; + case 2: + block_p = initSoundBlock(block_p); + break; + case 4: + block_p = initFarInfoBlock(block_p); + break; + default: + // "Data Block type invalid<%d>\n" + OSReport_Error("データブロックタイプが不正です<%d>\n", block_type); + break; + } + + if (block_type == 0) { + break; + } + + block_type = *block_p; + } while (1); + break; + default: + return 0; + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daBgObj_c::spec_data_c::Set(void* param_0) { +asm bool daBgObj_c::spec_data_c::Set(void* param_0) { nofralloc #include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Set__Q29daBgObj_c11spec_data_cFPv.s" } #pragma pop +#endif /* 80459B64-80459BB4 000584 0050+00 4/4 0/0 0/0 .text release__9daBgObj_cFP4dBgW */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::release(dBgW* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/release__9daBgObj_cFP4dBgW.s" +void daBgObj_c::release(dBgW* param_0) { + if (param_0 != NULL && param_0->ChkUsed()) { + dComIfG_Bgsp().Release(param_0); + } } -#pragma pop /* 80459BB4-80459BEC 0005D4 0038+00 3/3 0/0 3/3 .text regist__9daBgObj_cFP4dBgW */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::regist(dBgW* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/regist__9daBgObj_cFP4dBgW.s" +void daBgObj_c::regist(dBgW* param_0) { + if (param_0 != NULL) { + dComIfG_Bgsp().Regist(param_0, this); + } } -#pragma pop /* ############################################################################################## */ /* 8045C9B8-8045C9FC 000000 0044+00 6/6 0/0 0/0 .rodata l_cyl_src */ -SECTION_RODATA static u8 const l_cyl_src[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xD8, 0x40, 0x04, 0x22, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +static const dCcD_SrcCyl l_cyl_src = { + { + {0, {{0, 0, 0}, {0xD8400422, 0x11}, 0}}, + {dCcD_SE_NONE, 0, 0, 0, {8}}, + {dCcD_SE_NONE, 0, 0, 0, {4}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 0.0f, + 0.0f, + }, }; -COMPILER_STRIP_GATE(0x8045C9B8, &l_cyl_src); /* 8045C9FC-8045CA00 000044 0004+00 2/2 0/0 0/0 .rodata @3823 */ SECTION_RODATA static f32 const lit_3823 = 0.5f; @@ -684,24 +507,21 @@ asm void daBgObj_c::setAttentionInfo(fopAc_ac_c* param_0) { #pragma pop /* 80459D3C-80459D94 00075C 0058+00 2/2 0/0 0/0 .text initBaseMtx__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/initBaseMtx__9daBgObj_cFv.s" +void daBgObj_c::initBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + PSMTXCopy(mDoMtx_stack_c::get(), field_0x56c); + setBaseMtx(); } -#pragma pop /* 80459D94-80459E04 0007B4 0070+00 2/2 0/0 0/0 .text setBaseMtx__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setBaseMtx__9daBgObj_cFv.s" +void daBgObj_c::setBaseMtx() { + for (int i = 0; i < 2; i++) { + if (field_0x5a8[field_0xcc8][i] != NULL) { + field_0x5a8[field_0xcc8][i]->i_setBaseTRMtx(field_0x56c); + } + } } -#pragma pop /* ############################################################################################## */ /* 8045CA00-8045CA04 000048 0004+00 6/11 0/0 0/0 .rodata @3873 */ @@ -749,24 +569,59 @@ asm void daBgObj_c::settingCullSizeBoxForCull(int param_0) { #pragma pop /* 8045A0EC-8045A160 000B0C 0074+00 1/0 0/0 0/0 .text CreateInitType0__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::CreateInitType0() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateInitType0__9daBgObj_cFv.s" +int daBgObj_c::CreateInitType0() { + field_0xcc8 = 0; + initBaseMtx(); + fopAcM_SetMtx(this, field_0x5a8[field_0xcc8][0]->getBaseTRMtx()); + settingCullSizeBoxForCull(field_0xcc8); + + if (FLOAT_LABEL(lit_3873) != mSpecData.mpFarInfoBlock) { + fopAcM_setCullSizeFar(this, mSpecData.mpFarInfoBlock); + } + + return 1; } -#pragma pop /* 8045A160-8045A2B8 000B80 0158+00 3/0 0/0 0/0 .text CreateInitType1__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::CreateInitType1() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateInitType1__9daBgObj_cFv.s" +int daBgObj_c::CreateInitType1() { + if (i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) { + field_0xcc8 = 1; + release(field_0x568); + regist(mpBgW); + mAction = 3; + } else { + field_0xcc8 = 0; + mAction = 0; + } + + initBaseMtx(); + + if (field_0xcc8 == 1 && field_0x5a8[field_0xcc8][0] == NULL) { + fopAcM_SetMtx(this, field_0x5a8[0][0]->getBaseTRMtx()); + } else { + fopAcM_SetMtx(this, field_0x5a8[field_0xcc8][0]->getBaseTRMtx()); + } + + settingCullSizeBoxForCo(field_0xcc8); + + if (FLOAT_LABEL(lit_3873) != mSpecData.mpFarInfoBlock) { + fopAcM_setCullSizeFar(this, mSpecData.mpFarInfoBlock); + } + + mStts.Init(0xFF, 0xFF, this); + setColCommon(); + + settingCullSizeBoxForCull(field_0xcc8); + + mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, daBgObj_prm::getEvId(this)); + + if (mpBgW != NULL) { + mpBgW->Move(); + } + + initAtt(); + return 1; } -#pragma pop /* ############################################################################################## */ /* 8045CAC4-8045CAD0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -788,436 +643,264 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 8045CAE4-8045CB38 000020 0054+00 4/4 0/0 0/0 .data l_tri_src */ -SECTION_DATA static u8 l_tri_src[84] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xD8, 0x40, 0x04, 0x22, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x04, 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, +static dCcD_SrcTri l_tri_src = { + { + {0, {{0, 0, 0}, {0xD8400422, 0x11}, 0}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {dCcD_SE_NONE, 0, 0, 0, {4}}, + {0}, + }, + { + { + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + }, + }, }; /* 8045CB38-8045CB3C -00001 0004+00 1/1 0/0 0/0 .data l_specName */ -SECTION_DATA static void* l_specName = (void*)(((char*)&d_a_bg_obj__stringBase0) + 0x5D); - -/* 8045CB3C-8045CB48 -00001 000C+00 0/1 0/0 0/0 .data @3761 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3761[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)CreateHeapType0__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CB48-8045CB54 -00001 000C+00 0/1 0/0 0/0 .data @3762 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3762[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)CreateHeapType1__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CB54-8045CB60 -00001 000C+00 0/1 0/0 0/0 .data @3763 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3763[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)CreateHeapType1__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CB60-8045CB6C -00001 000C+00 0/1 0/0 0/0 .data @3764 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3764[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)CreateHeapType1__9daBgObj_cFv, -}; -#pragma pop +SECTION_DATA static char* l_specName = "spec.dat"; /* 8045CB6C-8045CB9C 0000A8 0030+00 1/2 0/0 0/0 .data mCreateHeapFunc__9daBgObj_c */ -SECTION_DATA u8 daBgObj_c::mCreateHeapFunc[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, +SECTION_DATA createHeapFunc daBgObj_c::mCreateHeapFunc[] = { + &daBgObj_c::CreateHeapType0, + &daBgObj_c::CreateHeapType1, + &daBgObj_c::CreateHeapType1, + &daBgObj_c::CreateHeapType1, }; -/* 8045CB9C-8045CBA8 -00001 000C+00 0/1 0/0 0/0 .data @3765 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3765[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)CreateInitType0__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CBA8-8045CBB4 -00001 000C+00 0/1 0/0 0/0 .data @3766 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3766[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)CreateInitType1__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CBB4-8045CBC0 -00001 000C+00 0/1 0/0 0/0 .data @3767 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3767[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)CreateInitType1__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CBC0-8045CBCC -00001 000C+00 0/1 0/0 0/0 .data @3768 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3768[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)CreateInitType1__9daBgObj_cFv, -}; -#pragma pop - /* 8045CBCC-8045CBFC 000108 0030+00 1/2 0/0 0/0 .data mCreateInitFunc__9daBgObj_c */ -SECTION_DATA u8 daBgObj_c::mCreateInitFunc[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, +SECTION_DATA createInitFunc daBgObj_c::mCreateInitFunc[] = { + &daBgObj_c::CreateInitType0, + &daBgObj_c::CreateInitType1, + &daBgObj_c::CreateInitType1, + &daBgObj_c::CreateInitType1, }; /* 8045A2B8-8045A2F0 000CD8 0038+00 1/0 0/0 0/0 .text Create__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::Create() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Create__9daBgObj_cFv.s" +int daBgObj_c::Create() { + return (this->*mCreateInitFunc[mSpecData.mSpecType])(); } -#pragma pop /* ############################################################################################## */ /* 8045CA0C-8045CA10 000054 0004+00 4/8 0/0 0/0 .rodata @4076 */ SECTION_RODATA static f32 const lit_4076 = 1.0f; COMPILER_STRIP_GATE(0x8045CA0C, &lit_4076); -/* 8045CBFC-8045CC08 -00001 000C+00 0/1 0/0 0/0 .data @3769 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3769[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)ExecuteType0__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CC08-8045CC14 -00001 000C+00 0/1 0/0 0/0 .data @3770 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3770[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)ExecuteType1__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CC14-8045CC20 -00001 000C+00 0/1 0/0 0/0 .data @3771 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3771[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)ExecuteType1__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CC20-8045CC2C -00001 000C+00 0/1 0/0 0/0 .data @3772 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3772[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)ExecuteType1__9daBgObj_cFv, -}; -#pragma pop - /* 8045CC2C-8045CC5C 000168 0030+00 1/2 0/0 0/0 .data mExecuteFunc__9daBgObj_c */ -SECTION_DATA u8 daBgObj_c::mExecuteFunc[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, +SECTION_DATA executeFunc daBgObj_c::mExecuteFunc[] = { + &daBgObj_c::ExecuteType0, + &daBgObj_c::ExecuteType1, + &daBgObj_c::ExecuteType1, + &daBgObj_c::ExecuteType1, }; -/* 8045CC5C-8045CC68 -00001 000C+00 0/1 0/0 0/0 .data @3773 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3773[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)set_tri_0__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CC68-8045CC74 -00001 000C+00 0/1 0/0 0/0 .data @3774 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3774[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)set_tri_1__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CC74-8045CC80 -00001 000C+00 0/1 0/0 0/0 .data @3775 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3775[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)set_cyl_0__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CC80-8045CC8C -00001 000C+00 0/1 0/0 0/0 .data @3776 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3776[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)set_tri_2__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CC8C-8045CC98 -00001 000C+00 0/1 0/0 0/0 .data @3777 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3777[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)set_tri_3__9daBgObj_cFv, -}; -#pragma pop - /* 8045CC98-8045CCD4 0001D4 003C+00 1/2 0/0 0/0 .data mTgSetFunc__9daBgObj_c */ -SECTION_DATA u8 daBgObj_c::mTgSetFunc[60] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8045CCD4-8045CCE0 -00001 000C+00 0/1 0/0 0/0 .data @4927 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4927[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrderWait__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CCE0-8045CCEC -00001 000C+00 0/1 0/0 0/0 .data @4928 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4928[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrder__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CCEC-8045CCF8 -00001 000C+00 0/1 0/0 0/0 .data @4929 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4929[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEvent__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CCF8-8045CD04 -00001 000C+00 0/1 0/0 0/0 .data @4930 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4930[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__9daBgObj_cFv, -}; -#pragma pop - -/* 8045CD04-8045CD34 000240 0030+00 0/1 0/0 0/0 .data l_func$4926 */ -#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 - -/* 8045CD34-8045CD54 -00001 0020+00 1/0 0/0 0/0 .data daBgObj_METHODS */ -SECTION_DATA static void* daBgObj_METHODS[8] = { - (void*)daBgObj_create1st__FP9daBgObj_c, - (void*)daBgObj_MoveBGDelete__FP9daBgObj_c, - (void*)daBgObj_MoveBGExecute__FP9daBgObj_c, - (void*)NULL, - (void*)daBgObj_MoveBGDraw__FP9daBgObj_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8045CD54-8045CD84 -00001 0030+00 0/0 0/0 1/0 .data g_profile_BG_OBJ */ -SECTION_DATA extern void* g_profile_BG_OBJ[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02DE0000, (void*)&g_fpcLf_Method, - (void*)0x00000D04, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02F00000, (void*)&daBgObj_METHODS, - (void*)0x10044100, (void*)0x000E0000, -}; - -/* 8045CD84-8045CD90 0002C0 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 8045CD90-8045CD9C 0002CC 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 8045CD9C-8045CDA8 0002D8 000C+00 4/4 0/0 0/0 .data __vt__8cM3dGPla */ -SECTION_DATA extern void* __vt__8cM3dGPla[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGPlaFv, -}; - -/* 8045CDA8-8045CDB4 0002E4 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGTri */ -SECTION_DATA extern void* __vt__8cM3dGTri[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGTriFv, -}; - -/* 8045CDB4-8045CDC0 0002F0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 8045CDC0-8045CDCC 0002FC 000C+00 4/4 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 8045CDCC-8045CDF4 000308 0028+00 1/1 0/0 0/0 .data __vt__9daBgObj_c */ -SECTION_DATA extern void* __vt__9daBgObj_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__9daBgObj_cFv, - (void*)Create__9daBgObj_cFv, - (void*)Execute__9daBgObj_cFPPA3_A4_f, - (void*)Draw__9daBgObj_cFv, - (void*)Delete__9daBgObj_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 8045CDF4-8045CE00 000330 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, +SECTION_DATA tgSetFunc daBgObj_c::mTgSetFunc[] = { + &daBgObj_c::set_tri_0, &daBgObj_c::set_tri_1, &daBgObj_c::set_cyl_0, + &daBgObj_c::set_tri_2, &daBgObj_c::set_tri_3, }; /* 8045A2F0-8045A52C 000D10 023C+00 1/0 0/0 0/0 .text CreateHeapType0__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::CreateHeapType0() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeapType0__9daBgObj_cFv.s" -} -#pragma pop +int daBgObj_c::CreateHeapType0() { + for (int i = 0; i < 2; i++) { + J3DModelData* modelData = + (J3DModelData*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), getBmdName(0, i)); + if (modelData != NULL) { + field_0x5a8[0][i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11001284); + if (field_0x5a8[0][i] == NULL) { + return 0; + } -/* 8045A52C-8045A574 000F4C 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/d_a_bg_obj/d_a_bg_obj/__dt__12J3DFrameCtrlFv.s" + field_0x5b8[0][i] = NULL; + field_0x5c8[0][i] = NULL; + + J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes( + daSetBgObj_c::getArcName(this), getBtkName(0, i)); + if (btk != NULL) { + field_0x5b8[0][i] = new mDoExt_btkAnm(); + if (field_0x5b8[0][i] == NULL || + !field_0x5b8[0][i]->init(modelData, btk, TRUE, 2, FLOAT_LABEL(lit_4076), 0, -1)) + { + return 0; + } + + field_0x5b8[0][i]->setPlaySpeed(FLOAT_LABEL(lit_4076)); + } + + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes( + daSetBgObj_c::getArcName(this), getBrkName(0, i)); + if (brk != NULL) { + field_0x5c8[0][i] = new mDoExt_brkAnm(); + if (field_0x5c8[0][i] == NULL || + !field_0x5c8[0][i]->init(modelData, brk, TRUE, 2, FLOAT_LABEL(lit_4076), 0, -1)) + { + return 0; + } + + field_0x5c8[0][i]->setPlaySpeed(FLOAT_LABEL(lit_4076)); + } + + field_0x5a8[1][i] = NULL; + field_0x5b8[1][i] = NULL; + field_0x5c8[1][i] = NULL; + } + } + + doShareTexture(); + return 1; } -#pragma pop /* 8045A574-8045A83C 000F94 02C8+00 3/0 0/0 0/0 .text CreateHeapType1__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::CreateHeapType1() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeapType1__9daBgObj_cFv.s" +int daBgObj_c::CreateHeapType1() { + for (int i = 0; i < 2; i++) { + for (int j = 0; j < 2; j++) { + field_0x5a8[i][j] = NULL; + field_0x5b8[i][j] = NULL; + field_0x5c8[i][j] = NULL; + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes( + daSetBgObj_c::getArcName(this), getBmdName(i, j)); + if (modelData != NULL) { + field_0x5a8[i][j] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11001284); + if (field_0x5a8[i][j] == NULL) { + return 0; + } + + J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes( + daSetBgObj_c::getArcName(this), getBtkName(i, j)); + if (btk != NULL) { + field_0x5b8[i][j] = new mDoExt_btkAnm(); + if (field_0x5b8[i][j] == NULL || + !field_0x5b8[i][j]->init(modelData, btk, TRUE, 2, FLOAT_LABEL(lit_4076), 0, + -1)) + { + return 0; + } + + field_0x5b8[i][j]->setPlaySpeed(FLOAT_LABEL(lit_4076)); + } + + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes( + daSetBgObj_c::getArcName(this), getBrkName(i, j)); + if (brk != NULL) { + field_0x5c8[i][j] = new mDoExt_brkAnm(); + if (field_0x5c8[i][j] == NULL || + !field_0x5c8[i][j]->init(modelData, brk, TRUE, 2, FLOAT_LABEL(lit_4076), 0, + -1)) + { + return 0; + } + + field_0x5c8[i][j]->setPlaySpeed(FLOAT_LABEL(lit_4076)); + } + } + } + } + + doShareTexture(); + + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), getDzbName(1)); + if (dzb != NULL) { + mpBgW = new dBgW(); + if (mpBgW == NULL || mpBgW->Set(dzb, 1, &field_0x56c)) { + mpBgW = NULL; + return 0; + } + } + + return 1; } -#pragma pop /* 8045A83C-8045A940 00125C 0104+00 2/2 0/0 0/0 .text doShareTexture__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::doShareTexture() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/doShareTexture__9daBgObj_cFv.s" +void daBgObj_c::doShareTexture() { + char res_name[64]; + char share_res_name[64]; + + u8* spec_res_name = mSpecData.mpTexShareBlock + 8; + + for (int i = 0; i < mSpecData.mTexShareNum; i++) { + strcpy(res_name, (char*)spec_res_name); + spec_res_name += strlen((char*)spec_res_name) + 1; + + J3DModelData* modelData = + (J3DModelData*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), res_name); + + if (*spec_res_name != 0) { + strcpy(share_res_name, (char*)spec_res_name); + spec_res_name += strlen((char*)spec_res_name) + 1; + + J3DModelData* shareModelData = + (J3DModelData*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), share_res_name); + mDoExt_setupShareTexture(modelData, shareModelData); + } else if (*spec_res_name == 0 && spec_res_name[1] == 1) { + spec_res_name += 2; + mDoExt_setupStageTexture(modelData); + } + } } -#pragma pop /* 8045A940-8045A9E8 001360 00A8+00 1/0 0/0 0/0 .text CreateHeap__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/CreateHeap__9daBgObj_cFv.s" +int daBgObj_c::CreateHeap() { + void* spec_data_p = dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), l_specName); + if (field_0xd02 == 0) { + if (!mSpecData.Set(spec_data_p)) { + return 0; + } + field_0xd02 = 1; + } + + return (this->*mCreateHeapFunc[mSpecData.mSpecType])(); } -#pragma pop /* 8045A9E8-8045AAF0 001408 0108+00 1/1 0/0 0/0 .text create1st__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::create1st() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/create1st__9daBgObj_cFv.s" +int daBgObj_c::create1st() { + if (field_0xcc9 == 0) { + field_0xcca = orig.angle.x; + field_0xccc = orig.angle.z; + field_0xcc9 = 1; + + orig.angle.z = 0; + orig.angle.x = 0; + current.angle.z = 0; + current.angle.x = 0; + shape_angle.z = 0; + shape_angle.x = 0; + } + + int phase = dComIfG_resLoad(&mPhase, daSetBgObj_c::getArcName(this)); + if (phase == cPhs_COMPLEATE_e) { + int resnameIdx = + dComIfG_getObjctResName2Index(daSetBgObj_c::getArcName(this), getDzbName(0)); + phase = MoveBGCreate(daSetBgObj_c::getArcName(this), resnameIdx, NULL, 0x80022110, NULL); + + if (phase == cPhs_ERROR_e) { + return phase; + } + + MoveBGExecute(); + } + + return phase; } -#pragma pop /* 8045AAF0-8045AB80 001510 0090+00 1/1 0/0 0/0 .text setColCommon__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::setColCommon() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setColCommon__9daBgObj_cFv.s" +void daBgObj_c::setColCommon() { + if (field_0xcc8 == 0) { + (this->*mTgSetFunc[mSpecData.field_0x02])(); + } + + if (mSpecData.field_0x16 == 1) { + u32 tg_type = mTris[0].GetTgType(); + + for (int i = 0; i < field_0xcc4; i++) { + mTris[i].SetTgType(tg_type | 0x40); + } + + mCyl.SetTgType(tg_type | 0x40); + } } -#pragma pop /* 8045AB80-8045ACC0 0015A0 0140+00 1/0 0/0 0/0 .text set_tri_0__9daBgObj_cFv */ #pragma push @@ -1314,6 +997,19 @@ SECTION_RODATA static f32 const lit_4579 = -1.0f; COMPILER_STRIP_GATE(0x8045CA1C, &lit_4579); /* 8045B3A0-8045B44C 001DC0 00AC+00 3/3 0/0 0/0 .text setSe__9daBgObj_cFv */ +// matches with literals +#ifdef NONMATCHING +void daBgObj_c::setSe() { + u32 i = mSpecData.mSoundNum; + u32* temp = (u32*)mSpecData.mpSoundBlock; + temp++; + + for (; i != 0; i--) { + fopAcM_seStart(this, *temp, 0); + temp++; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1322,29 +1018,114 @@ asm void daBgObj_c::setSe() { #include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/setSe__9daBgObj_cFv.s" } #pragma pop +#endif /* 8045B44C-8045B534 001E6C 00E8+00 1/1 0/0 0/0 .text checkDestroy__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::checkDestroy() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/checkDestroy__9daBgObj_cFv.s" +BOOL daBgObj_c::checkDestroy() { + if (mSpecData.mSpecType != 1 && mSpecData.mSpecType != 2) { + return false; + } + + if (!i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this)) && + (daBgObj_prm::getSwBit2(this) == 0xFF || + (i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit2(this)) && + daBgObj_prm::getObjArg0(this) == 0xFF) || + (daBgObj_prm::getSwBit2(this) != 0xFF && + !i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit2(this)) && + daBgObj_prm::getObjArg0(this) == 0))) + { + return true; + } + + return false; } -#pragma pop /* 8045B534-8045B5E0 001F54 00AC+00 2/2 0/0 0/0 .text checkHitAt__9daBgObj_cFP8cCcD_Obj */ +#ifdef NONMATCHING +BOOL daBgObj_c::checkHitAt(cCcD_Obj* i_hitObj) { + u32 hit_flags = 0; + u32 var_r8 = 0; + + if (i_hitObj != NULL) { + switch (mSpecData.mSpecType) { + case 1: + var_r8 = i_hitObj->ChkAtType(AT_TYPE_IRON_BALL) && i_hitObj->GetAtAtp() == 3; + hit_flags = var_r8 | i_hitObj->ChkAtType(AT_TYPE_BOMB); + break; + case 2: + u32 tmp2 = i_hitObj->ChkAtType(AT_TYPE_IRON_BALL); + var_r8 = tmp2; + hit_flags = + tmp2 | + (i_hitObj->ChkAtType(AT_TYPE_NORMAL_SWORD) | i_hitObj->ChkAtType(AT_TYPE_BOMB) | + i_hitObj->ChkAtType(AT_TYPE_CSTATUE_SWING) | i_hitObj->ChkAtType(AT_TYPE_UNK)); + break; + } + + field_0xd01 = i_hitObj->ChkAtType(AT_TYPE_BOMB); + field_0xd01 |= var_r8 != 0; + } + + return hit_flags != 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daBgObj_c::checkHitAt(cCcD_Obj* param_0) { +asm BOOL daBgObj_c::checkHitAt(cCcD_Obj* param_0) { nofralloc #include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/checkHitAt__9daBgObj_cFP8cCcD_Obj.s" } #pragma pop +#endif /* 8045B5E0-8045B7FC 002000 021C+00 1/1 0/0 0/0 .text orderWait_tri__9daBgObj_cFv */ +// matches with literals +#ifdef NONMATCHING +void daBgObj_c::orderWait_tri() { + for (int i = 0; i < field_0xcc4; i++) { + if (mTris[i].ChkTgHit()) { + if (checkHitAt(mTris[i].GetTgHitObj())) { + setSe(); + + fopAc_ac_c* hit_ac = mTris[i].GetTgHitAc(); + if (hit_ac != NULL) { + cXyz sp1C(hit_ac->current.pos); + sp1C = sp1C - current.pos; + + mDoMtx_stack_c::YrotS(-shape_angle.y); + mDoMtx_stack_c::multVec(&sp1C, &sp1C); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + + cXyz sp28; + if (sp1C.z > 0.0f) { + sp28 = cXyz(0.0, 0.0, 1.0); + } else { + sp28 = cXyz(0.0, 0.0, -1.0); + } + + mDoMtx_stack_c::multVec(&sp28, &sp28); + sp28 = sp28 - current.pos; + + field_0xcf4.y = cM_atan2s(sp28.x, sp28.z); + } + + setParticle(); + setAction(1); + break; + } + + mTris[i].ClrTgHit(); + } + } + + for (int i = 0; i < field_0xcc4; i++) { + dComIfG_Ccsp()->Set(&mTris[i]); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1353,8 +1134,49 @@ asm void daBgObj_c::orderWait_tri() { #include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/orderWait_tri__9daBgObj_cFv.s" } #pragma pop +#endif /* 8045B7FC-8045B9C4 00221C 01C8+00 1/1 0/0 0/0 .text orderWait_cyl__9daBgObj_cFv */ +// r30/r31 swap +#ifdef NONMATCHING +void daBgObj_c::orderWait_cyl() { + if (mCyl.ChkTgHit()) { + if (checkHitAt(mCyl.GetTgHitObj())) { + setSe(); + + fopAc_ac_c* hit_ac = mCyl.GetTgHitAc(); + if (hit_ac != NULL) { + cXyz sp1C(hit_ac->current.pos); + sp1C = sp1C - current.pos; + + mDoMtx_stack_c::YrotS(-shape_angle.y); + mDoMtx_stack_c::multVec(&sp1C, &sp1C); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + + cXyz sp28; + if (sp1C.z > 0.0f) { + sp28 = cXyz(0.0, 0.0, 1.0); + } else { + sp28 = cXyz(0.0, 0.0, -1.0); + } + + mDoMtx_stack_c::multVec(&sp28, &sp28); + sp28 = sp28 - current.pos; + + field_0xcf4.y = cM_atan2s(sp28.x, sp28.z); + } + + setParticle(); + setAction(1); + } + + mCyl.ClrTgHit(); + } + + dComIfG_Ccsp()->Set(&mCyl); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1363,8 +1185,41 @@ asm void daBgObj_c::orderWait_cyl() { #include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/orderWait_cyl__9daBgObj_cFv.s" } #pragma pop +#endif /* 8045B9C4-8045BB38 0023E4 0174+00 1/1 0/0 0/0 .text orderWait_spec__9daBgObj_cFv */ +// matches with literals +#ifdef NONMATCHING +void daBgObj_c::orderWait_spec() { + setSe(); + + fopAc_ac_c* player_p = dComIfGp_getPlayer(0); + if (player_p != NULL) { + cXyz sp1C(player_p->current.pos); + sp1C = sp1C - current.pos; + + mDoMtx_stack_c::YrotS(-shape_angle.y); + mDoMtx_stack_c::multVec(&sp1C, &sp1C); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + + cXyz sp28; + if (sp1C.z > 0.0f) { + sp28 = cXyz(0.0, 0.0, 1.0); + } else { + sp28 = cXyz(0.0, 0.0, -1.0); + } + + mDoMtx_stack_c::multVec(&sp28, &sp28); + sp28 = sp28 - current.pos; + + field_0xcf4.y = cM_atan2s(sp28.x, sp28.z); + } + + setParticle(); + setAction(1); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1373,242 +1228,274 @@ asm void daBgObj_c::orderWait_spec() { #include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/orderWait_spec__9daBgObj_cFv.s" } #pragma pop +#endif /* 8045BB38-8045BBE0 002558 00A8+00 1/0 0/0 0/0 .text actionOrderWait__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::actionOrderWait() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionOrderWait__9daBgObj_cFv.s" +int daBgObj_c::actionOrderWait() { + if (checkDestroy()) { + switch (mSpecData.field_0x02) { + case 0: + case 1: + case 3: + case 4: + orderWait_tri(); + break; + case 2: + orderWait_cyl(); + break; + } + } else if (i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) { + orderWait_spec(); + field_0xd00 = 1; + } + + return 1; } -#pragma pop /* 8045BBE0-8045BD50 002600 0170+00 1/0 0/0 0/0 .text actionOrder__9daBgObj_cFv */ +// matches with literals +#ifdef NONMATCHING +int daBgObj_c::actionOrder() { + if (mEvtInfo.i_checkCommandDemoAccrpt()) { + setAction(2); + + if (field_0xd01 < 5) { + dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f)); + } + } else { + if (daBgObj_prm::getEvId(this) != 0xFF) { + fopAcM_orderOtherEventId(this, mEventIdx, daBgObj_prm::getEvId(this), 0xFFFF, 0, 1); + } else { + setAction(3); + } + + if (!i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this)) || field_0xd00 != 0 || + field_0xcc8 == 0) + { + release(field_0x568); + regist(mpBgW); + field_0xcc8 = 1; + + settingCullSizeBoxForCull(field_0xcc8); + + fopAc_ac_c* attn_actor_p = fopAcM_SearchByID(mAttnActorID); + if (attn_actor_p != NULL) { + setAttentionInfo(attn_actor_p); + } + + i_fopAcM_onSwitch(this, daBgObj_prm::getSwBit(this)); + field_0xd00 = 0; + } + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daBgObj_c::actionOrder() { +asm int daBgObj_c::actionOrder() { nofralloc #include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionOrder__9daBgObj_cFv.s" } #pragma pop +#endif /* 8045BD50-8045BDB0 002770 0060+00 1/0 0/0 0/0 .text actionEvent__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::actionEvent() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/actionEvent__9daBgObj_cFv.s" +int daBgObj_c::actionEvent() { + if (dComIfGp_evmng_endCheck(mEventIdx)) { + setAction(3); + i_dComIfGp_event_reset(); + } + + return 1; } -#pragma pop /* 8045BDB0-8045BDB8 0027D0 0008+00 1/0 0/0 0/0 .text actionWait__9daBgObj_cFv */ -bool daBgObj_c::actionWait() { - return true; +int daBgObj_c::actionWait() { + return 1; } /* 8045BDB8-8045BED0 0027D8 0118+00 1/0 0/0 0/0 .text ExecuteType0__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::ExecuteType0() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/ExecuteType0__9daBgObj_cFv.s" -} -#pragma pop +int daBgObj_c::ExecuteType0() { + u8 swBit = daBgObj_prm::getSwBit(this); + u8 arg0 = daBgObj_prm::getObjArg0(this); -/* ############################################################################################## */ -/* 8045CE40-8045CE44 000040 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_8045CE40[4]; + if (swBit != 0xFF) { + if (arg0 == 0xFF) { + if (i_fopAcM_isSwitch(this, swBit)) { + if (field_0xcc8 == 1) { + regist(field_0x568); + field_0xcc8 = 0; + } + } else if (field_0xcc8 == 0) { + release(field_0x568); + field_0xcc8 = 1; + } + } else if (arg0 == 0) { + if (i_fopAcM_isSwitch(this, swBit)) { + if (field_0xcc8 == 0) { + release(field_0x568); + field_0xcc8 = 1; + } + } else if (field_0xcc8 == 1) { + regist(field_0x568); + field_0xcc8 = 0; + } + } + } + + return 1; +} /* 8045BED0-8045BFBC 0028F0 00EC+00 3/0 0/0 0/0 .text ExecuteType1__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::ExecuteType1() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/ExecuteType1__9daBgObj_cFv.s" +int daBgObj_c::ExecuteType1() { + static actionFunc l_func[] = {&daBgObj_c::actionOrderWait, &daBgObj_c::actionOrder, + &daBgObj_c::actionEvent, &daBgObj_c::actionWait}; + + (this->*l_func[mAction])(); + + if (field_0xd01 != 0 && field_0xd01 < 100) { + field_0xd01++; + } + + return 1; } -#pragma pop /* 8045BFBC-8045C078 0029DC 00BC+00 1/0 0/0 0/0 .text Execute__9daBgObj_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Execute__9daBgObj_cFPPA3_A4_f.s" +int daBgObj_c::Execute(f32 (**param_0)[3][4]) { + (this->*mExecuteFunc[mSpecData.mSpecType])(); + + for (int i = 0; i < 2; i++) { + if (field_0x5b8[field_0xcc8][i] != NULL) { + field_0x5b8[field_0xcc8][i]->play(); + } + + if (field_0x5c8[field_0xcc8][i] != NULL) { + field_0x5c8[field_0xcc8][i]->play(); + } + } + + *param_0 = &field_0x56c; + setBaseMtx(); + return 1; } -#pragma pop /* 8045C078-8045C25C 002A98 01E4+00 1/0 0/0 0/0 .text Draw__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::Draw() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Draw__9daBgObj_cFv.s" +int daBgObj_c::Draw() { + bool bvar = true; + for (int i = 0; i < 2; i++) { + if (field_0x5a8[field_0xcc8][i] != NULL) { + bvar = false; + } + } + + if (bvar) { + return 1; + } + + g_env_light.settingTevStruct(0x20, ¤t.pos, &mTevStr); + + for (int i = 0; i < 2; i++) { + if (field_0x5a8[field_0xcc8][i] != NULL) { + g_env_light.setLightTevColorType_MAJI(field_0x5a8[field_0xcc8][i], &mTevStr); + } + } + + for (int i = 0; i < 2; i++) { + dComIfGd_setListBG(); + if (field_0x5a8[field_0xcc8][i] != NULL) { + indirectProc(field_0x5a8[field_0xcc8][i]); + dKy_bg_MAxx_proc(field_0x5a8[field_0xcc8][i]); + + if (field_0x5b8[field_0xcc8][i] != NULL) { + field_0x5b8[field_0xcc8][i]->entry(field_0x5a8[field_0xcc8][i]->getModelData()); + } + + if (field_0x5c8[field_0xcc8][i] != NULL) { + field_0x5c8[field_0xcc8][i]->entry(field_0x5a8[field_0xcc8][i]->getModelData()); + } + + mDoExt_modelUpdateDL(field_0x5a8[field_0xcc8][i]); + } + } + + dComIfGd_setList(); + + return 1; } -#pragma pop /* 8045C25C-8045C2E8 002C7C 008C+00 1/1 0/0 0/0 .text indirectProc__9daBgObj_cFP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::indirectProc(J3DModel* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/indirectProc__9daBgObj_cFP8J3DModel.s" +void daBgObj_c::indirectProc(J3DModel* i_model) { + if (i_model != NULL) { + J3DModelData* modelData = i_model->getModelData(); + + for (u16 i = 0; i < modelData->getMaterialNum(); i++) { + J3DMaterial* mat_p = modelData->getMaterialNodePointer(i); + mat_p->change(); + mat_p->setCullMode(0); + } + } } -#pragma pop /* 8045C2E8-8045C330 002D08 0048+00 1/0 0/0 0/0 .text Delete__9daBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBgObj_c::Delete() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/Delete__9daBgObj_cFv.s" +int daBgObj_c::Delete() { + release(mpBgW); + dComIfG_resDelete(&mPhase, daSetBgObj_c::getArcName(this)); + return 1; } -#pragma pop /* 8045C330-8045C444 002D50 0114+00 1/0 0/0 0/0 .text daBgObj_create1st__FP9daBgObj_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBgObj_create1st(daBgObj_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_create1st__FP9daBgObj_c.s" -} -#pragma pop +static int daBgObj_create1st(daBgObj_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) daBgObj_c(); + fopAcM_OnCondition(i_this, 8); + } -/* 8045C444-8045C48C 002E64 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGCylFv.s" + return i_this->create1st(); } -#pragma pop - -/* 8045C48C-8045C4D4 002EAC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 8045C4D4-8045C5B4 002EF4 00E0+00 1/1 0/0 0/0 .text __dt__8dCcD_TriFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_Tri::~dCcD_Tri() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8dCcD_TriFv.s" -} -#pragma pop - -/* 8045C5B4-8045C644 002FD4 0090+00 1/1 0/0 0/0 .text __ct__8dCcD_TriFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_Tri::dCcD_Tri() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__ct__8dCcD_TriFv.s" -} -#pragma pop - -/* 8045C644-8045C6A0 003064 005C+00 1/0 0/0 0/0 .text __dt__8cM3dGTriFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGTri::~cM3dGTri() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGTriFv.s" -} -#pragma pop - -/* 8045C6A0-8045C6E8 0030C0 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGPlaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__8cM3dGPlaFv.s" -} -#pragma pop - -/* 8045C6E8-8045C744 003108 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__10dCcD_GSttsFv.s" -} -#pragma pop /* 8045C744-8045C764 003164 0020+00 1/0 0/0 0/0 .text daBgObj_MoveBGDelete__FP9daBgObj_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBgObj_MoveBGDelete(daBgObj_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGDelete__FP9daBgObj_c.s" +static int daBgObj_MoveBGDelete(daBgObj_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 8045C764-8045C784 003184 0020+00 1/0 0/0 0/0 .text daBgObj_MoveBGExecute__FP9daBgObj_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBgObj_MoveBGExecute(daBgObj_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGExecute__FP9daBgObj_c.s" +static int daBgObj_MoveBGExecute(daBgObj_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 8045C784-8045C7B0 0031A4 002C+00 1/0 0/0 0/0 .text daBgObj_MoveBGDraw__FP9daBgObj_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBgObj_MoveBGDraw(daBgObj_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/daBgObj_MoveBGDraw__FP9daBgObj_c.s" +static int daBgObj_MoveBGDraw(daBgObj_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop -/* 8045C7B0-8045C7F8 0031D0 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__dt__10cCcD_GSttsFv.s" -} -#pragma pop +/* 8045CD34-8045CD54 -00001 0020+00 1/0 0/0 0/0 .data daBgObj_METHODS */ +static actor_method_class daBgObj_METHODS = { + (process_method_func)daBgObj_create1st, + (process_method_func)daBgObj_MoveBGDelete, + (process_method_func)daBgObj_MoveBGExecute, + (process_method_func)NULL, + (process_method_func)daBgObj_MoveBGDraw, +}; -/* 8045C7F8-8045C9AC 003218 01B4+00 0/0 1/0 0/0 .text __sinit_d_a_bg_obj_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_bg_obj_cpp() { - nofralloc -#include "asm/rel/d/a/d_a_bg_obj/d_a_bg_obj/__sinit_d_a_bg_obj_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8045C7F8, __sinit_d_a_bg_obj_cpp); -#pragma pop - -/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 8045CD54-8045CD84 -00001 0030+00 0/0 0/0 1/0 .data g_profile_BG_OBJ */ +extern actor_process_profile_definition g_profile_BG_OBJ = { + -3, + 7, + -3, + PROC_BG_OBJ, + &g_fpcLf_Method.mBase, + sizeof(daBgObj_c), + 0, + 0, + &g_fopAc_Method.base, + 752, + &daBgObj_METHODS, + 0x10044100, + 0, + 14, +}; diff --git a/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp b/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp index 013939b9a3..c8e95e9b7a 100644 --- a/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp +++ b/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp @@ -4,208 +4,146 @@ // #include "rel/d/a/d_a_mg_fshop/d_a_mg_fshop.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" #include "dol2asm.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_executor.h" +#include "m_Do/m_Do_controller_pad.h" // // Types: // -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoExt_3DlineMat_c {}; - -struct mDoExt_3DlineMatSortPacket { - /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); -}; - -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct mDoExt_3DlineMat0_c { - /* 800125E0 */ void init(u16, u16, int); - /* 80012874 */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); - /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); -}; - -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct fshop_class {}; - struct fs_weed_s { /* 8086FED8 */ ~fs_weed_s(); /* 8086FF38 */ fs_weed_s(); + + /* 0x00 */ cXyz field_0x00[15]; + /* 0xB4 */ f32 field_0xb4; + /* 0xB8 */ f32 field_0xb8; + /* 0xBC */ s16 field_0xbc; }; struct fs_tsubo_s { /* 8086FE98 */ ~fs_tsubo_s(); /* 8086FED4 */ fs_tsubo_s(); + + /* 0x00 */ u8 field_0x00[0x14 - 0x00]; + /* 0x14 */ J3DModel* field_0x14; + /* 0x18 */ u8 field_0x18[0x1C - 0x18]; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ s16 field_0x20; + /* 0x22 */ s16 field_0x22; + /* 0x24 */ s16 field_0x24; }; struct fs_rod_s { /* 8086FF84 */ ~fs_rod_s(); /* 8086FFC0 */ fs_rod_s(); + + /* 0x00 */ u8 field_0x00[0x04 - 0x00]; + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ u8 field_0x0C[0x14 - 0x0C]; + /* 0x14 */ J3DModel* field_0x14; + /* 0x18 */ J3DModel* field_0x18[6]; + /* 0x30 */ mDoExt_3DlineMat0_c line_mat; + /* 0x4C */ int field_0x4c; + /* 0x50 */ u8 field_0x50[0x54 - 0x50]; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ u8 field_0x58[0x5C - 0x58]; }; struct fs_lure_s { /* 8086FFDC */ ~fs_lure_s(); /* 80870018 */ fs_lure_s(); + + /* 0x00 */ f32 field_0x00; + /* 0x04 */ u8 field_0x04[0x08 - 0x04]; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ s16 field_0x0c; + /* 0x0E */ s16 field_0x0e; + /* 0x10 */ s16 field_0x10; + /* 0x12 */ u8 field_0x12[0x14 - 0x12]; + /* 0x14 */ J3DModel* field_0x14; + /* 0x18 */ J3DModel* field_0x18[2]; + /* 0x20 */ u8 field_0x20[0x24 - 0x20]; + /* 0x24 */ int field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ s16 field_0x30; + /* 0x32 */ s16 field_0x32; + /* 0x34 */ s16 field_0x34; + /* 0x36 */ s16 field_0x36; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3c; }; struct fs_koro2_s { /* 8086FD78 */ ~fs_koro2_s(); /* 8086FDB4 */ fs_koro2_s(); + + /* 0x00 */ J3DModel* mpModel; + /* 0x04 */ J3DModelData* field_0x04; + /* 0x08 */ u8 field_0x08[0x34 - 0x08]; + /* 0x34 */ s8 field_0x34; + /* 0x35 */ u8 field_0x35[0x38 - 0x35]; + /* 0x38 */ cXyz field_0x38; + /* 0x44 */ cXyz field_0x44; + /* 0x50 */ s16 field_0x50; + /* 0x52 */ u8 field_0x52[0x54 - 0x52]; + /* 0x54 */ cXyz field_0x54; + /* 0x60 */ u8 field_0x60; + /* 0x61 */ u8 field_0x61[0x64 - 0x61]; + /* 0x64 */ dBgW* mpBgW; }; -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); +class fshop_class : public fopAc_ac_c { +public: + /* 0x0568 */ request_of_phase_process_class mPhase; + /* 0x0570 */ s16 field_0x0570; + /* 0x0572 */ s16 field_0x0572; + /* 0x0574 */ fs_lure_s mLure[48]; + /* 0x1174 */ fs_rod_s mRod[3]; + /* 0x1288 */ fs_weed_s mWeed[60]; + /* 0x3F88 */ mDoExt_3DlineMat0_c field_0x3f88; + /* 0x3FA4 */ fs_tsubo_s mTsubo[2]; + /* 0x3FF4 */ J3DModel* field_0x3ff4; + /* 0x3FF8 */ s16 field_0x3ff8; + /* 0x3FFA */ s16 field_0x3ffa; + /* 0x3FFC */ f32 field_0x3ffc; + /* 0x4000 */ f32 field_0x4000; + /* 0x4004 */ J3DModel* field_0x4004; + /* 0x4008 */ fshop_class* field_0x4008; + /* 0x400C */ u8 field_0x400C[0x400D - 0x400C]; + /* 0x400D */ u8 field_0x400d; + /* 0x400E */ u8 field_0x400e; + /* 0x4010 */ s16 field_0x4010; + /* 0x4014 */ cXyz field_0x4014; + /* 0x4020 */ csXyz field_0x4020; + /* 0x4028 */ J3DModel* mpA_crwaku_model; + /* 0x402C */ dBgW* field_0x402c; + /* 0x4030 */ Mtx field_0x4030; + /* 0x4060 */ s16 field_0x4060; + /* 0x4062 */ s16 field_0x4062; + /* 0x4064 */ cXyz field_0x4064; + /* 0x4070 */ J3DModel* field_0x4070; + /* 0x4074 */ dBgS_AcchCir field_0x4074; + /* 0x40B4 */ dBgS_ObjAcch field_0x40b4; + /* 0x428C */ u8 field_0x428c; + /* 0x428D */ u8 field_0x428d; + /* 0x4290 */ fs_koro2_s mKoro2[100]; + /* 0x6B30 */ J3DModel* field_0x6b30; + /* 0x6B34 */ s16 field_0x6b34; + /* 0x6B38 */ Mtx field_0x6b38; + /* 0x6B68 */ dBgW* field_0x6b68; + /* 0x6B6C */ u32 field_0x6b6c[2]; + /* 0x6B74 */ u8 field_0x6B74[0x6B7C - 0x6B74]; + /* 0x6B7C */ u8 field_0x6b7c; }; -struct dSv_event_c { - /* 80034A04 */ void getEventReg(u16) const; -}; - -struct J3DModelData {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 8086CC30 */ ~cXyz(); - /* 8086FF80 */ 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 dPa_levelEcallBack {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct J3DModel {}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 8086FDB8 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 8086FE28 */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); - /* 800773EC */ void OnWallSort(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct _GXTexObj {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DJoint {}; - // // Forward References: // @@ -333,11 +271,6 @@ extern "C" void MtxScale__FfffUc(); extern "C" void MtxPosition__FP4cXyzP4cXyz(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_14(); @@ -363,18 +296,11 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void __register_global_object(); // @@ -1970,7 +1896,8 @@ static asm void rod_set(fshop_class* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/__dt__4cXyzFv.s" } @@ -2101,14 +2028,11 @@ static asm void weed_control(fshop_class* param_0, fs_weed_s* param_1) { #pragma pop /* 8086D1A0-8086D1EC 001220 004C+00 1/1 0/0 0/0 .text stage_copy__FP11fshop_classP11fshop_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void stage_copy(fshop_class* param_0, fshop_class* param_1) { - nofralloc -#include "asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/stage_copy__FP11fshop_classP11fshop_class.s" +static void stage_copy(fshop_class* param_0, fshop_class* param_1) { + param_0->field_0x4014 = param_1->field_0x4014; + param_0->field_0x4020 = param_1->field_0x4020; + param_0->mScale = param_1->mScale; } -#pragma pop /* ############################################################################################## */ /* 80870110-80870114 00007C 0004+00 0/1 0/0 0/0 .rodata @4376 */ @@ -2164,7 +2088,7 @@ static asm void koro2_mtx_set(fshop_class* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void s_sel_sub(void* param_0, void* param_1) { +static asm void* s_sel_sub(void* param_0, void* param_1) { nofralloc #include "asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/s_sel_sub__FPvPv.s" } @@ -2174,7 +2098,7 @@ static asm void s_sel_sub(void* param_0, void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void s_ball_sub(void* param_0, void* param_1) { +static asm void* s_ball_sub(void* param_0, void* param_1) { nofralloc #include "asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/s_ball_sub__FPvPv.s" } @@ -2265,6 +2189,91 @@ static u8 old_stick_x[4]; static u8 data_80870AC4[4]; /* 8086D55C-8086D854 0015DC 02F8+00 1/1 0/0 0/0 .text koro2_game__FP11fshop_class */ +#ifdef NONMATCHING +static void koro2_game(fshop_class* i_this) { + cXyz sp5C; + cXyz sp68; + i_this->mScale.x = 1.0f; + + switch (i_this->field_0x4010) { + case 0: + i_this->field_0x4014.x = 284.0f; + i_this->field_0x4014.y = 87.8f; + i_this->field_0x4014.z = 432.0; + i_this->field_0x4020.z = 0; + i_this->field_0x4020.x = 0; + break; + case 1: + i_this->field_0x4014.x = 204.0f; + i_this->field_0x4014.y = -1352.2f; + i_this->field_0x4014.z = 430.0; + i_this->field_0x4020.y = -0x4000; + + cLib_addCalcAngleS2(&i_this->field_0x4020.x, 0, 2, 0x200); + cLib_addCalcAngleS2(&i_this->field_0x4020.z, 0, 2, 0x200); + case 2: + i_this->mScale.x = 10.0f; + if (i_this->field_0x4010 == 2) { + static f32 old_stick_x = 0.0f; + + if ((mDoCPd_c::getSubStickX(PAD_1) >= 0.8f && old_stick_x < 0.8f) || + (mDoCPd_c::getSubStickX(PAD_1) <= -0.8f && old_stick_x > -0.8f)) + { + if (mDoCPd_c::getSubStickX(PAD_1) > 0.0f) { + i_this->field_0x4062 += 0x4000; + } else { + i_this->field_0x4062 += -0x4000; + } + } + + old_stick_x = mDoCPd_c::getSubStickX(PAD_1); + cLib_addCalcAngleS2(&i_this->field_0x4060, i_this->field_0x4062, 4, 0x1000); + mDoMtx_YrotS(*calc_mtx, -i_this->field_0x4060); + + sp5C.x = mDoCPd_c::getStickX3D(PAD_1); + sp5C.y = 0.0f; + sp5C.z = mDoCPd_c::getStickY(PAD_1); + MtxPosition(&sp5C, &sp68); + + f32 var_f2 = sp68.x; + f32 var_f3 = sp68.z; + + f32 var_f31; + f32 var_f3_2; + if (var_f2 > 0.15f) { + var_f31 = var_f2 - 0.15f; + } else if (var_f2 < -0.15f) { + var_f31 = var_f2 + 0.15f; + } else { + var_f31 = 0.0f; + } + + if (var_f3 > 0.15f) { + var_f3_2 = var_f3 - 0.15f; + } else if (var_f3 < -0.15f) { + var_f3_2 = var_f3 + 0.15f; + } else { + var_f3_2 = 0.0f; + } + + cLib_addCalcAngleS2(&i_this->field_0x4020.x, var_f3_2 * -6000.0f, 4, 0x200); + cLib_addCalcAngleS2(&i_this->field_0x4020.z, var_f31 * -6000.0f, 4, 0x200); + } + break; + } + + i_this->field_0x4008 = (fshop_class*)i_fpcM_Search(s_sel_sub, i_this); + if (i_this->field_0x4008 != NULL) { + stage_copy(i_this->field_0x4008, i_this); + i_this->field_0x4008->field_0x400d = 0; + + fshop_class* ball_p = (fshop_class*)i_fpcM_Search(s_ball_sub, i_this); + if (ball_p != NULL) { + ball_p->field_0x4008 = i_this->field_0x4008; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2273,6 +2282,7 @@ static asm void koro2_game(fshop_class* param_0) { #include "asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/koro2_game__FP11fshop_class.s" } #pragma pop +#endif /* ############################################################################################## */ /* 808707A4-808707B4 000520 0010+00 1/1 0/0 0/0 .data c_x$4477 */ @@ -2946,7 +2956,8 @@ asm fs_koro2_s::~fs_koro2_s() { #pragma pop /* 8086FDB4-8086FDB8 003E34 0004+00 1/1 0/0 0/0 .text __ct__10fs_koro2_sFv */ -fs_koro2_s::fs_koro2_s() { +// fs_koro2_s::fs_koro2_s() { +extern "C" void __ct__10fs_koro2_sFv() { /* empty function */ } @@ -2954,7 +2965,8 @@ fs_koro2_s::fs_koro2_s() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/__dt__12dBgS_ObjAcchFv.s" } @@ -2964,7 +2976,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/__dt__12dBgS_AcchCirFv.s" } @@ -2981,7 +2994,8 @@ asm fs_tsubo_s::~fs_tsubo_s() { #pragma pop /* 8086FED4-8086FED8 003F54 0004+00 1/1 0/0 0/0 .text __ct__10fs_tsubo_sFv */ -fs_tsubo_s::fs_tsubo_s() { +// fs_tsubo_s::fs_tsubo_s() { +extern "C" void __ct__10fs_tsubo_sFv() { /* empty function */ } @@ -2999,14 +3013,16 @@ asm fs_weed_s::~fs_weed_s() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fs_weed_s::fs_weed_s() { +// asm fs_weed_s::fs_weed_s() { +extern "C" asm void __ct__9fs_weed_sFv() { nofralloc #include "asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/__ct__9fs_weed_sFv.s" } #pragma pop /* 8086FF80-8086FF84 004000 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" void __ct__4cXyzFv() { /* empty function */ } @@ -3024,7 +3040,8 @@ asm fs_rod_s::~fs_rod_s() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fs_rod_s::fs_rod_s() { +// asm fs_rod_s::fs_rod_s() { +extern "C" asm void __ct__8fs_rod_sFv() { nofralloc #include "asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/__ct__8fs_rod_sFv.s" } @@ -3041,7 +3058,8 @@ asm fs_lure_s::~fs_lure_s() { #pragma pop /* 80870018-8087001C 004098 0004+00 1/1 0/0 0/0 .text __ct__9fs_lure_sFv */ -fs_lure_s::fs_lure_s() { +// fs_lure_s::fs_lure_s() { +extern "C" void __ct__9fs_lure_sFv() { /* empty function */ } @@ -3049,8 +3067,7 @@ fs_lure_s::fs_lure_s() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_d_a_mg_fshop_cpp() { - nofralloc +asm void __sinit_d_a_mg_fshop_cpp(){nofralloc #include "asm/rel/d/a/d_a_mg_fshop/d_a_mg_fshop/__sinit_d_a_mg_fshop_cpp.s" } #pragma pop diff --git a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp index 3105a9ad7c..7eeee5bff6 100644 --- a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp +++ b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp @@ -1,242 +1,175 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_kytag09 -// +/** + * d_a_kytag09.cpp + * Twilight Film Tag + */ #include "rel/d/a/kytag/d_a_kytag09/d_a_kytag09.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct kytag09_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dSv_player_status_b_c { - /* 80032BB0 */ void isDarkClearLV(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 J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8085B9F4 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" static void daKytag09_Draw__FP13kytag09_class(); -extern "C" static bool daKytag09_Execute__FP13kytag09_class(); -extern "C" static bool daKytag09_IsDelete__FP13kytag09_class(); -extern "C" static void daKytag09_Delete__FP13kytag09_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void useHeapInit2__FP10fopAc_ac_c(); -extern "C" static void daKytag09_Create__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" extern char const* const d_a_kytag09__stringBase0; - -// -// External References: -// - -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_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isDarkClearLV__21dSv_player_status_b_cCFi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -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]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8085BA44-8085BA48 000000 0004+00 1/1 0/0 0/0 .rodata @3863 */ -SECTION_RODATA static u8 const lit_3863[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8085BA44, &lit_3863); +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 8085B3F8-8085B5F4 000078 01FC+00 1/0 0/0 0/0 .text daKytag09_Draw__FP13kytag09_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag09_Draw(kytag09_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Draw__FP13kytag09_class.s" +static int daKytag09_Draw(kytag09_class* i_this) { + J3DModelData* modelData = i_this->mpModel->getModelData(); + g_env_light.settingTevStruct(0x10, NULL, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(modelData, &i_this->mTevStr); + + if (i_this->mType != 1) { + modelData = i_this->mpModel2->getModelData(); + g_env_light.setLightTevColorType_MAJI(modelData, &i_this->mTevStr); + } + + mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f); + + Mtx m; + cMtx_copy(mDoMtx_stack_c::get(), m); + dComIfGd_setListBG(); + + if (i_this->mType != 1) { + i_this->mpModel->i_setBaseTRMtx(m); + i_this->mpModel2->i_setBaseTRMtx(m); + + if (!dComIfGs_isDarkClearLV(1)) { + i_this->mBtk_2.entry(i_this->mpModel->getModelData()); + i_this->mBtk_2.play(); + mDoExt_modelUpdateDL(i_this->mpModel); + } else if (!dComIfGs_isDarkClearLV(2)) { + i_this->mBtk.entry(i_this->mpModel2->getModelData()); + i_this->mBtk.play(); + mDoExt_modelUpdateDL(i_this->mpModel2); + } + } else { + i_this->mpModel->i_setBaseTRMtx(m); + + if (!dComIfGs_isDarkClearLV(0)) { + i_this->mBtk_2.entry(i_this->mpModel->getModelData()); + i_this->mBtk_2.play(); + mDoExt_modelUpdateDL(i_this->mpModel); + } + } + + dComIfGd_setList(); + return 1; } -#pragma pop /* 8085B5F4-8085B5FC 000274 0008+00 1/0 0/0 0/0 .text daKytag09_Execute__FP13kytag09_class */ -static bool daKytag09_Execute(kytag09_class* param_0) { - return true; +static int daKytag09_Execute(kytag09_class* i_this) { + return 1; } /* 8085B5FC-8085B604 00027C 0008+00 1/0 0/0 0/0 .text daKytag09_IsDelete__FP13kytag09_class */ -static bool daKytag09_IsDelete(kytag09_class* param_0) { - return true; +static int daKytag09_IsDelete(kytag09_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 8085BA4C-8085BA4C 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8085BA4C = "Kytag09"; -SECTION_DEAD static char const* const stringBase_8085BA54 = "kytag09_2"; -#pragma pop - /* 8085B604-8085B658 000284 0054+00 1/0 0/0 0/0 .text daKytag09_Delete__FP13kytag09_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag09_Delete(kytag09_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Delete__FP13kytag09_class.s" -} -#pragma pop +static int daKytag09_Delete(kytag09_class* i_this) { + if (i_this->mType != 1) { + dComIfG_resDelete(&i_this->mPhase, "Kytag09"); + } else { + dComIfG_resDelete(&i_this->mPhase, "kytag09_2"); + } -/* ############################################################################################## */ -/* 8085BA48-8085BA4C 000004 0004+00 2/2 0/0 0/0 .rodata @3906 */ -SECTION_RODATA static f32 const lit_3906 = 1.0f; -COMPILER_STRIP_GATE(0x8085BA48, &lit_3906); + return 1; +} + +/* 8085B658-8085B7C0 0002D8 0168+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +static int useHeapInit(fopAc_ac_c* i_this) { + kytag09_class* this_ = (kytag09_class*)i_this; + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kytag09", 4); + J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("Kytag09", 5); + + this_->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (this_->mpModel == NULL) { + return 0; + } + + J3DAnmTextureSRTKey* btkp = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Kytag09", 9); + if (!this_->mBtk_2.init(modelData, btkp, TRUE, 2, 1.0f, 0, -1)) { + return 0; + } + + this_->mpModel2 = mDoExt_J3DModel__create(modelData2, 0x80000, 0x11000284); + if (this_->mpModel2 == NULL) { + return 0; + } + + J3DAnmTextureSRTKey* btk2p = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Kytag09", 10); + if (!this_->mBtk.init(modelData2, btk2p, TRUE, 2, 1.0f, 0, -1)) { + return 0; + } + + return 1; +} + +/* 8085B7C0-8085B894 000440 00D4+00 1/1 0/0 0/0 .text useHeapInit2__FP10fopAc_ac_c */ +static int useHeapInit2(fopAc_ac_c* i_this) { + kytag09_class* this_ = (kytag09_class*)i_this; + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("kytag09_2", 4); + this_->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (this_->mpModel == NULL) { + return 0; + } + + J3DAnmTextureSRTKey* btkp = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("kytag09_2", 7); + if (!this_->mBtk_2.init(modelData, btkp, TRUE, 2, 1.0f, 0, -1)) { + return 0; + } + + return 1; +} + +/* 8085B894-8085B9F4 000514 0160+00 1/0 0/0 0/0 .text daKytag09_Create__FP10fopAc_ac_c */ +static int daKytag09_Create(fopAc_ac_c* i_this) { + kytag09_class* this_ = (kytag09_class*)i_this; + this_->mType = fopAcM_GetParam(this_) & 0xFF; + + if (!fopAcM_CheckCondition(this_, 8)) { + new (this_) kytag09_class(); + fopAcM_OnCondition(this_, 8); + } + + int phase; + if (this_->mType != 1) { + phase = dComIfG_resLoad(&this_->mPhase, "Kytag09"); + if (phase == cPhs_COMPLEATE_e && !fopAcM_entrySolidHeap(this_, useHeapInit, 0x5EB0)) { + return cPhs_ERROR_e; + } + } else { + phase = dComIfG_resLoad(&this_->mPhase, "kytag09_2"); + if (phase == cPhs_COMPLEATE_e && !fopAcM_entrySolidHeap(this_, useHeapInit2, 0x1880)) { + return cPhs_ERROR_e; + } + } + + return phase; +} /* 8085BA60-8085BA80 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag09_Method */ -SECTION_DATA static void* l_daKytag09_Method[8] = { - (void*)daKytag09_Create__FP10fopAc_ac_c, - (void*)daKytag09_Delete__FP13kytag09_class, - (void*)daKytag09_Execute__FP13kytag09_class, - (void*)daKytag09_IsDelete__FP13kytag09_class, - (void*)daKytag09_Draw__FP13kytag09_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daKytag09_Method = { + (process_method_func)daKytag09_Create, (process_method_func)daKytag09_Delete, + (process_method_func)daKytag09_Execute, (process_method_func)daKytag09_IsDelete, + (process_method_func)daKytag09_Draw, }; /* 8085BA80-8085BAB0 -00001 0030+00 0/2 0/0 1/0 .data g_profile_KYTAG09 */ -SECTION_DATA extern void* g_profile_KYTAG09[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02B30000, (void*)&g_fpcLf_Method, - (void*)0x000005C8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00670000, (void*)&l_daKytag09_Method, - (void*)0x00060000, (void*)NULL, +extern actor_process_profile_definition g_profile_KYTAG09 = { + -3, + 7, + -3, + PROC_KYTAG09, + &g_fpcLf_Method.mBase, + sizeof(kytag09_class), + 0, + 0, + &g_fopAc_Method.base, + 103, + &l_daKytag09_Method, + 0x60000, + 0, + 0, }; - -/* 8085B658-8085B7C0 0002D8 0168+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/useHeapInit__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 8085B7C0-8085B894 000440 00D4+00 1/1 0/0 0/0 .text useHeapInit2__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit2(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/useHeapInit2__FP10fopAc_ac_c.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8085BAB0-8085BABC 000050 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, -}; - -/* 8085B894-8085B9F4 000514 0160+00 1/0 0/0 0/0 .text daKytag09_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag09_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag09/d_a_kytag09/daKytag09_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 8085B9F4-8085BA3C 000674 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/kytag/d_a_kytag09/d_a_kytag09/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* 8085BA4C-8085BA4C 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp index c4a83680a3..ebd4e53b25 100644 --- a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp +++ b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp @@ -1,193 +1,155 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_kytag11 -// +/** + * d_a_kytag11.cpp + * Time Control Tag + */ #include "rel/d/a/kytag/d_a_kytag11/d_a_kytag11.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct kytag11_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_tmp_flag_c { - static u8 const tempBitLabels[370 + 2 /* padding */]; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349A4 */ void offEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; -}; - -// -// Forward References: -// - -extern "C" static bool daKytag11_Draw__FP13kytag11_class(); -extern "C" static void daKytag11_Execute__FP13kytag11_class(); -extern "C" static bool daKytag11_IsDelete__FP13kytag11_class(); -extern "C" static bool daKytag11_Delete__FP13kytag11_class(); -extern "C" static void daKytag11_Create__FP10fopAc_ac_c(); -extern "C" static void dKankyo_DayProc__Fv(); -extern "C" extern void* g_profile_KYTAG11[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void offEventBit__11dSv_event_cFUs(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void dKy_getdaytime_hour__Fv(); -extern "C" void __cvt_fp2unsigned(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 80529518-80529520 000078 0008+00 1/0 0/0 0/0 .text daKytag11_Draw__FP13kytag11_class */ -static bool daKytag11_Draw(kytag11_class* param_0) { - return true; +static int daKytag11_Draw(kytag11_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80529894-80529898 000000 0004+00 1/1 0/0 0/0 .rodata @3874 */ -SECTION_RODATA static f32 const lit_3874 = 15.0f; -COMPILER_STRIP_GATE(0x80529894, &lit_3874); - -/* 80529898-8052989C 000004 0004+00 0/1 0/0 0/0 .rodata @3875 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3875 = 0.5f; -COMPILER_STRIP_GATE(0x80529898, &lit_3875); -#pragma pop - -/* 8052989C-805298A0 000008 0004+00 0/1 0/0 0/0 .rodata @3876 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3876 = 255.0f; -COMPILER_STRIP_GATE(0x8052989C, &lit_3876); -#pragma pop - -/* 805298A0-805298A4 00000C 0004+00 0/1 0/0 0/0 .rodata @3877 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3877 = 360.0f; -COMPILER_STRIP_GATE(0x805298A0, &lit_3877); -#pragma pop - -/* 805298A4-805298AC 000010 0004+04 0/1 0/0 0/0 .rodata @3878 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3878[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x805298A4, &lit_3878); -#pragma pop - -/* 805298AC-805298B4 000018 0008+00 0/1 0/0 0/0 .rodata @3880 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3880[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x805298AC, &lit_3880); -#pragma pop - /* 80529520-80529798 000080 0278+00 1/0 0/0 0/0 .text daKytag11_Execute__FP13kytag11_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag11_Execute(kytag11_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Execute__FP13kytag11_class.s" +static int daKytag11_Execute(kytag11_class* i_this) { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + + i_this->mChangeTime = false; + i_this->mChangeTime = true; + + if (i_this->mOnEventID != 0xFFF) { + if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mOnEventID])) { + i_this->mChangeTime = false; + } + } else if (i_this->mOnSwitchNo != 0xFF) { + s32 room_no = dComIfGp_roomControl_getStayNo(); + if (!dComIfGs_isSwitch(i_this->mOnSwitchNo, room_no)) { + i_this->mChangeTime = false; + } + } + + if (i_this->mOffEventID != 0xFFF) { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mOffEventID])) { + i_this->mChangeTime = false; + } + } else if (i_this->mOffSwitchNo != 0xFF) { + s32 room_no = dComIfGp_roomControl_getStayNo(); + if (dComIfGs_isSwitch(i_this->mOffSwitchNo, room_no)) { + i_this->mChangeTime = false; + } + } + + if (!i_this->mChangeTime) { + return 1; + } + + if (!i_this->mInitTimeChange) { + if (i_this->mNewTime != 0x1F) { + env_light->mDaytime = dComIfGs_getTime(); + + f32 new_time = i_this->mNewTime * 15.0f; + env_light->mDaytime = new_time; + dComIfGs_setTime(new_time); + } + + i_this->mInitTimeChange = true; + } + + env_light->field_0x12fb = 1; + + if (i_this->mStopTime != 0x1F && i_this->mStopTime == (u8)dKy_getdaytime_hour()) { + return 1; + } + + f32 new_env_time = ((i_this->mEnvTime / 255.0f) * 0.5f); + f32 current_time = dComIfGs_getTime(); + + env_light->mDaytime = current_time; + env_light->mDate = dComIfGs_getDate(); + + new_env_time = current_time + new_env_time; + env_light->mDaytime = new_env_time; + + if ((u32)new_env_time >= 360.0f) { + env_light->mDaytime = 0.0f; + env_light->mDate++; + dKankyo_DayProc(); + } + + dComIfGs_setTime(env_light->mDaytime); + dComIfGs_setDate(env_light->mDate); + + return 1; } -#pragma pop /* 80529798-805297A0 0002F8 0008+00 1/0 0/0 0/0 .text daKytag11_IsDelete__FP13kytag11_class */ -static bool daKytag11_IsDelete(kytag11_class* param_0) { - return true; +static int daKytag11_IsDelete(kytag11_class* i_this) { + return 1; } /* 805297A0-805297A8 000300 0008+00 1/0 0/0 0/0 .text daKytag11_Delete__FP13kytag11_class */ -static bool daKytag11_Delete(kytag11_class* param_0) { - return true; +static int daKytag11_Delete(kytag11_class* i_this) { + return 1; } /* 805297A8-80529854 000308 00AC+00 1/0 0/0 0/0 .text daKytag11_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag11_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Create__FP10fopAc_ac_c.s" +static int daKytag11_Create(fopAc_ac_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) kytag11_class(); + fopAcM_OnCondition(i_this, 8); + } + + kytag11_class* this_ = (kytag11_class*)i_this; + + this_->mNewTime = fopAcM_GetParam(this_) & 0x1F; + this_->mStopTime = (fopAcM_GetParam(this_) >> 5) & 0x1F; + this_->mEnvTime = (fopAcM_GetParam(this_) >> 10) & 0xFF; + this_->mOnEventID = this_->current.angle.x & 0xFFF; + this_->mOffEventID = this_->current.angle.y & 0xFFF; + this_->mOnSwitchNo = this_->current.angle.z & 0xFF; + this_->mOffSwitchNo = (this_->current.angle.z >> 8) & 0xFF; + this_->mChangeTime = false; + this_->mInitTimeChange = false; + + return cPhs_COMPLEATE_e; } -#pragma pop /* 80529854-8052988C 0003B4 0038+00 1/1 0/0 0/0 .text dKankyo_DayProc__Fv */ +// this is a weak func that should be compiler generated, unsure how to make it do that for now #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dKankyo_DayProc() { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/dKankyo_DayProc__Fv.s" +#pragma force_active on +extern "C" void dKankyo_DayProc__Fv() { + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[91]); } #pragma pop /* ############################################################################################## */ /* 805298B4-805298D4 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag11_Method */ -SECTION_DATA static void* l_daKytag11_Method[8] = { - (void*)daKytag11_Create__FP10fopAc_ac_c, - (void*)daKytag11_Delete__FP13kytag11_class, - (void*)daKytag11_Execute__FP13kytag11_class, - (void*)daKytag11_IsDelete__FP13kytag11_class, - (void*)daKytag11_Draw__FP13kytag11_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daKytag11_Method = { + (process_method_func)daKytag11_Create, (process_method_func)daKytag11_Delete, + (process_method_func)daKytag11_Execute, (process_method_func)daKytag11_IsDelete, + (process_method_func)daKytag11_Draw, }; /* 805298D4-80529904 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG11 */ -SECTION_DATA extern void* g_profile_KYTAG11[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02B50000, (void*)&g_fpcLf_Method, - (void*)0x00000574, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00690000, (void*)&l_daKytag11_Method, - (void*)0x00044000, (void*)NULL, +extern actor_process_profile_definition g_profile_KYTAG11 = { + -3, + 7, + -3, + PROC_KYTAG11, + &g_fpcLf_Method.mBase, + sizeof(kytag11_class), + 0, + 0, + &g_fopAc_Method.base, + 105, + &l_daKytag11_Method, + 0x44000, + 0, + 0, }; diff --git a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp index 75a314d9cc..eb73cfbfb2 100644 --- a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp +++ b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp @@ -1,6 +1,6 @@ /** * d_a_kytag15.cpp - * + * Z Shake Tag */ #include "rel/d/a/kytag/d_a_kytag15/d_a_kytag15.h" diff --git a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp index 5c838df038..481a64b808 100644 --- a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp +++ b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp @@ -1,6 +1,6 @@ /** * d_a_kytag16.cpp - * + * Pikari Tag */ #include "rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h" diff --git a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp index 7b25a03b2d..20bde89224 100644 --- a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp +++ b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp @@ -1,14 +1,12 @@ /** * d_a_kytag17.cpp - * Environment Tag 17 + * Light Mask Tag */ #include "rel/d/a/kytag/d_a_kytag17/d_a_kytag17.h" #include "JSystem/JKernel/JKRHeap.h" -#include "dol2asm.h" -#include "dolphin/types.h" -#include "d/kankyo/d_kankyo.h" #include "d/d_procname.h" +#include "d/kankyo/d_kankyo.h" /* 8046DB58-8046DB60 000078 0008+00 1/0 0/0 0/0 .text daKytag17_Draw__FP13kytag17_class */ @@ -49,12 +47,9 @@ static int daKytag17_Create(fopAc_ac_c* i_this) { /* ############################################################################################## */ /* 8046DBE8-8046DC08 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag17_Method */ static actor_method_class l_daKytag17_Method = { - (process_method_func)daKytag17_Create, - (process_method_func)daKytag17_Delete, - (process_method_func)daKytag17_Execute, - (process_method_func)daKytag17_IsDelete, - (process_method_func)daKytag17_Draw -}; + (process_method_func)daKytag17_Create, (process_method_func)daKytag17_Delete, + (process_method_func)daKytag17_Execute, (process_method_func)daKytag17_IsDelete, + (process_method_func)daKytag17_Draw}; /* 8046DC08-8046DC38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG17 */ extern actor_process_profile_definition g_profile_KYTAG17 = { diff --git a/src/d/bg/d_bg_w_kcol.cpp b/src/d/bg/d_bg_w_kcol.cpp index d349a8e034..5c28e0a1ae 100644 --- a/src/d/bg/d_bg_w_kcol.cpp +++ b/src/d/bg/d_bg_w_kcol.cpp @@ -223,14 +223,14 @@ extern "C" asm void __dt__8dBgWKColFv() { #pragma pop /* 8007E7D0-8007E804 079110 0034+00 0/0 1/1 0/0 .text initKCollision__8dBgWKColFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgWKCol::initKCollision(void* param_0) { - nofralloc -#include "asm/d/bg/d_bg_w_kcol/initKCollision__8dBgWKColFPv.s" +void dBgWKCol::initKCollision(void* i_kclData) { + KCol_Header* header_p = (KCol_Header*)i_kclData; + + header_p->pos_data_offset = (u32)header_p + header_p->pos_data_offset; + header_p->nrm_data_offset = (u32)header_p + header_p->nrm_data_offset; + header_p->prism_data_offset = (u32)header_p + header_p->prism_data_offset; + header_p->block_data_offset = (u32)header_p + header_p->block_data_offset; } -#pragma pop /* 8007E804-8007E850 079144 004C+00 0/0 0/0 1/1 .text create__8dBgWKColFPvPv */ void dBgWKCol::create(void* pprism, void* plc) { diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 584945e6ca..02eb0bbc77 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -1177,6 +1177,78 @@ SECTION_SDATA2 static f32 lit_4852[1 + 1 /* padding */] = { }; /* 8019DD6C-8019E13C 1986AC 03D0+00 3/3 0/0 0/0 .text dKy_light_influence_id__F4cXyzi */ +// regalloc, but equivalent? +#ifdef NONMATCHING +static int dKy_light_influence_id(cXyz param_0, int param_1) { + f32 var_f31 = 1000000.0f; + + int var_r28 = -1; + int var_r27 = -1; + int var_r25 = -1; + + f32 var_f30 = 800.0f; + if (strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0) { + var_f30 = 250.0f; + } + + for (int i = 0; i <= param_1; i++) { + for (int j = 0; j < 100; j++) { + if (g_env_light.mPointLight[j] != NULL && (i == 0 || j != var_r28) && g_env_light.mPointLight[j]->mPow > 0.01f) { + if (var_f31 > param_0.abs(g_env_light.mPointLight[j]->mPosition)) { + if (g_env_light.mPointLight[j]->mIndex & 0x8000) { + if (var_f31 > var_f30) { + if (i == 0) { + var_r28 = j; + } + + if (i != 0) { + var_r27 = j; + } + + var_f31 = var_f30; + } + } else { + var_f31 = param_0.abs(g_env_light.mPointLight[j]->mPosition); + if (var_f31 < g_env_light.mPointLight[j]->mPow) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN05") == 0 && dComIfGp_roomControl_getStayNo() == 0) { + if (var_f31 < g_env_light.mPointLight[j]->mPow * 0.5f) { + var_r25 = 99; + } + } else { + var_r25 = 99; + } + } + + if (var_r25 != -2) { + if (i == 0) { + var_r28 = j; + } else { + var_r27 = j; + } + } + } + } + + if (g_env_light.mPointLight[j]->mIndex < 0 && var_r25 != 99) { + if (i == 0) { + var_r28 = j; + } + + var_r25 = -2; + } + } + } + var_f31 = 1000000.0f; + } + + int ret = var_r27; + if (param_1 == 0) { + ret = var_r28; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1185,9 +1257,43 @@ static asm int dKy_light_influence_id(cXyz param_0, int param_1) { #include "asm/d/kankyo/d_kankyo/dKy_light_influence_id__F4cXyzi.s" } #pragma pop +#endif /* 8019E13C-8019E404 198A7C 02C8+00 2/2 0/0 0/0 .text dKy_eflight_influence_id__F4cXyzi */ +// regalloc, but equivalent? +#ifdef NONMATCHING +static int dKy_eflight_influence_id(cXyz param_0, int param_1) { + f32 var_f31 = 1000000.0f; + + int var_r28 = -1; + int var_r27 = -1; + + for (int i = 0; i <= param_1; i++) { + for (int j = 0; j < 5; j++) { + if (g_env_light.mEfPLight[j] != NULL && (i == 0 || j != var_r28)) { + if (var_f31 > param_0.abs(g_env_light.mEfPLight[j]->mPosition) && g_env_light.mEfPLight[j]->mPow > 0.01f) { + var_f31 = param_0.abs(g_env_light.mEfPLight[j]->mPosition); + + if (i == 0) { + var_r28 = j; + } else { + var_r27 = j; + } + } + } + } + var_f31 = 1000000.0f; + } + + int ret = var_r27; + if (param_1 == 0) { + ret = var_r28; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1196,6 +1302,7 @@ static asm int dKy_eflight_influence_id(cXyz param_0, int param_1) { #include "asm/d/kankyo/d_kankyo/dKy_eflight_influence_id__F4cXyzi.s" } #pragma pop +#endif /* 8019E404-8019E430 198D44 002C+00 1/1 0/0 0/0 .text dKy_light_influence_col__Fi */ static GXColorS10 dKy_light_influence_col(int param_0) { @@ -1211,7 +1318,7 @@ SECTION_SDATA2 static f64 lit_4964 = 4503599627370496.0 /* cast u32 to float */; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm _GXColor dKy_light_influence_col(_GXColor* param_0, f32 param_1) { +asm GXColor dKy_light_influence_col(_GXColor* param_0, f32 param_1) { nofralloc #include "asm/d/kankyo/d_kankyo/dKy_light_influence_col__FP8_GXColorf.s" } @@ -2568,6 +2675,98 @@ asm void dScnKy_env_light_c::setLight() { /* 801A133C-801A16C0 19BC7C 0384+00 2/2 0/0 0/0 .text * setLight_bg__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf */ +// regalloc, but equivalent i think +#ifdef NONMATCHING +void dScnKy_env_light_c::setLight_bg(dKy_tevstr_c* i_tevstr, _GXColorS10* param_1, + _GXColorS10* param_2, f32* param_3, f32* param_4) { + i_tevstr->mColpatPrev = g_env_light.mColPatPrev; + i_tevstr->mColpatCurr = g_env_light.mColPatCurr; + + if (i_tevstr->mColpatPrev != i_tevstr->mColpatCurr) { + i_tevstr->mColpatBlend = g_env_light.mColPatBlend; + } + + u8 sp23; + u8 sp22; + u8 sp21; + u8 sp20; + f32 sp14; + int sp10; + int spC; + setLight_palno_get(&i_tevstr->mEnvrIdxPrev, &i_tevstr->mEnvrIdxCurr, &i_tevstr->mColpatPrev, + &i_tevstr->mColpatCurr, &sp23, &sp21, &sp22, &sp20, &sp14, &sp10, &spC, + &i_tevstr->mColpatBlend, &i_tevstr->mInitTimer); + + if (sp23 == 0xFF) { + for (int i = 0; i < 4; i++) { + param_1[i].r = 255; + param_1[i].g = 0; + param_1[i].b = 0; + } + } else { + stage_palette_info_class* temp_r27 = &g_env_light.mpDmPalet[sp23]; + stage_palette_info_class* temp_r26 = &g_env_light.mpDmPalet[sp21]; + stage_palette_info_class* temp_r25 = &g_env_light.mpDmPalet[sp22]; + stage_palette_info_class* temp_r24 = &g_env_light.mpDmPalet[sp20]; + + for (int i = 0; i < 4; i++) { + dKy_calc_color_set(¶m_1[i], &temp_r27->mActor_K0[i], &temp_r25->mActor_K0[i], + &temp_r26->mActor_K0[i], &temp_r24->mActor_K0[i], sp14, + i_tevstr->mColpatBlend, mBgAddColAmb, g_env_light.mColBgColRatio); + } + + if (daPy_py_c::checkNowWolfEyeUp()) { + dKy_WolfPowerup_BgAmbCol(param_1); + } + + param_1[3].a = 255; + param_1[2].a = 255; + param_1[1].a = 255; + param_1[0].a = 255; + + GXColorS10 sp50[6]; + for (int i = 0; i < 6; i++) { + dKy_calc_color_set(&sp50[i], &temp_r27->mBG1_K0[i], &temp_r25->mBG1_K0[i], + &temp_r26->mBG1_K0[i], &temp_r24->mBG1_K0[i], sp14, + i_tevstr->mColpatBlend, mBgAddColAmb, g_env_light.mColBgColRatio); + + if (daPy_py_c::checkNowWolfEyeUp()) { + sp50[i].r = 0; + sp50[i].g = 0; + sp50[i].b = 0; + } + + J3DLightInfo& temp_r30 = i_tevstr->field_0x074[i].getLightInfo(); + + GXColor sp28; + sp28.r = sp50[i].r; + sp28.g = sp50[i].g; + sp28.b = sp50[i].b; + sp28.a = sp50[i].a; + temp_r30.mColor = dKy_light_influence_col(&sp28, i_tevstr->field_0x374); + } + + dKy_calc_color_set(param_2, &temp_r27->field_0x21, &temp_r25->field_0x21, + &temp_r26->field_0x21, &temp_r24->field_0x21, sp14, + i_tevstr->mColpatBlend, mFogAddCol, g_env_light.mColFogColRatio); + + *param_3 = float_kankyo_color_ratio_set(temp_r27->mFogStartZ, temp_r26->mFogStartZ, sp14, + temp_r25->mFogStartZ, temp_r24->mFogStartZ, + i_tevstr->mColpatBlend, g_env_light.field_0x11ec, + g_env_light.field_0x11f4); + *param_4 = float_kankyo_color_ratio_set( + temp_r27->mFogEndZ, temp_r26->mFogEndZ, sp14, temp_r25->mFogEndZ, temp_r24->mFogEndZ, + i_tevstr->mColpatBlend, g_env_light.field_0x11f0, g_env_light.field_0x11f4); + + if (daPy_py_c::checkNowWolfEyeUp()) { + param_2->r = 0; + param_2->g = 0; + param_2->b = 0; + dKy_WolfPowerup_FogNearFar(param_3, param_4); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2577,66 +2776,7 @@ asm void dScnKy_env_light_c::setLight_bg(dKy_tevstr_c* param_0, _GXColorS10* par #include "asm/d/kankyo/d_kankyo/setLight_bg__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf.s" } #pragma pop - -/* void dScnKy_env_light_c::setLight_bg(dKy_tevstr_c* i_tevstr, _GXColorS10* param_1, - _GXColorS10* param_2, f32* param_3, f32* param_4) { - i_tevstr->mColpatPrev = g_env_light.mColPatPrev; - i_tevstr->mColpatCurr = g_env_light.mColPatCurr; - - if (i_tevstr->mColpatPrev != i_tevstr->mColpatCurr) { - i_tevstr->mColpatBlend = g_env_light.mColPatBlend; - } - - u8 sp9D; - u8 sp9F; - u8 sp9E; - u8 spA0; - f32 sp8C; - int sp90; - int sp94; - setLight_palno_get(&i_tevstr->mEnvrIdxPrev, &i_tevstr->mEnvrIdxCurr, &i_tevstr->mColpatPrev, - &i_tevstr->mColpatCurr, &sp9D, &sp9F, &sp9E, &spA0, &sp8C, &sp90, &sp94, - &i_tevstr->mColpatBlend, &i_tevstr->mInitTimer); - - stage_palette_info_class* palette_p = g_env_light.mpDmPalet; - - if (sp9D == 0xFF) { - for (int i = 0; i < 4; i++) { - param_1[i].r = 255; - param_1[i].g = 0; - param_1[i].b = 0; - } - } else { - for (int i = 0; i < 4; i++) { - GXColorS10 sp78; - sp78.r = mBgAddColAmb.r; - sp78.b = mBgAddColAmb.b; - - dKy_calc_color_set(¶m_1, &palette_p[sp9D].mK0Color[i], &palette_p[sp9E].mK0Color[i], - &palette_p[sp9F].mK0Color[i], &palette_p[spA0].mK0Color[i], sp8C, - i_tevstr->mColpatBlend, sp78, g_env_light.mColBgColRatio); - } - - if (daPy_py_c::checkNowWolfPowerUp()) { - dKy_WolfPowerup_BgAmbCol(param_1); - } - - param_1[3].a = 255; - param_1[2].a = 255; - param_1[1].a = 255; - param_1[0].a = 255; - - for (int i = 0; i < 4; i++) { - GXColorS10 sp80; - sp80.r = mBgAddColAmb.r; - sp80.b = mBgAddColAmb.b; - - dKy_calc_color_set(¶m_1, &palette_p[sp9D].mK0Color[i], &palette_p[sp9E].mK0Color[i], - &palette_p[sp9F].mK0Color[i], &palette_p[spA0].mK0Color[i], sp8C, - i_tevstr->mColpatBlend, sp80, g_env_light.mColBgColRatio); - } - } -} */ +#endif /* 801A16C0-801A1D64 19C000 06A4+00 1/1 0/0 0/0 .text * setLight_actor__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10PfPf */