From e1b1ac6a0c4e4b2a85e5ea39ffb80bc6caedc861 Mon Sep 17 00:00:00 2001 From: Trueffel <106771418+Trueffeloot@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:36:33 +0100 Subject: [PATCH] d_a_obj_bbox mostly OK (#1972) * d_a_obj_bbox mostly OK * remove unused asm * better description --- .../CreateHeap__11daObjBBox_cFv.s | 29 -- .../d_a_obj_bbox/Create__11daObjBBox_cFv.s | 31 -- .../d_a_obj_bbox/Delete__11daObjBBox_cFv.s | 14 - .../d_a_obj_bbox/Draw__11daObjBBox_cFv.s | 42 --- .../Execute__11daObjBBox_cFPPA3_A4_f.s | 96 ------ .../daObjBBox_MoveBGDelete__FP11daObjBBox_c.s | 9 - .../daObjBBox_MoveBGDraw__FP11daObjBBox_c.s | 12 - ...daObjBBox_MoveBGExecute__FP11daObjBBox_c.s | 9 - .../initBaseMtx__11daObjBBox_cFv.s | 16 - .../setBaseMtx__11daObjBBox_cFv.s | 26 -- .../rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h | 25 +- rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp | 316 ++++++------------ 12 files changed, 127 insertions(+), 498 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/CreateHeap__11daObjBBox_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Create__11daObjBBox_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Delete__11daObjBBox_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Draw__11daObjBBox_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Execute__11daObjBBox_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDelete__FP11daObjBBox_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDraw__FP11daObjBBox_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGExecute__FP11daObjBBox_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/initBaseMtx__11daObjBBox_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/setBaseMtx__11daObjBBox_cFv.s diff --git a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/CreateHeap__11daObjBBox_cFv.s b/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/CreateHeap__11daObjBBox_cFv.s deleted file mode 100644 index c084db6b3d8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/CreateHeap__11daObjBBox_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80BACE50: -/* 80BACE50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BACE54 7C 08 02 A6 */ mflr r0 -/* 80BACE58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BACE5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BACE60 7C 7F 1B 78 */ mr r31, r3 -/* 80BACE64 3C 60 80 BB */ lis r3, l_arcName@ha /* 0x80BAD4D4@ha */ -/* 80BACE68 38 63 D4 D4 */ addi r3, r3, l_arcName@l /* 0x80BAD4D4@l */ -/* 80BACE6C 80 63 00 00 */ lwz r3, 0(r3) -/* 80BACE70 38 80 00 04 */ li r4, 4 -/* 80BACE74 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BACE78 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BACE7C 3C A5 00 02 */ addis r5, r5, 2 -/* 80BACE80 38 C0 00 80 */ li r6, 0x80 -/* 80BACE84 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BACE88 4B 48 F4 65 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BACE8C 3C 80 00 08 */ lis r4, 8 -/* 80BACE90 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80BACE94 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80BACE98 4B 46 7D BD */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80BACE9C 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80BACEA0 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BACEA4 30 03 FF FF */ addic r0, r3, -1 -/* 80BACEA8 7C 60 19 10 */ subfe r3, r0, r3 -/* 80BACEAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BACEB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BACEB4 7C 08 03 A6 */ mtlr r0 -/* 80BACEB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BACEBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Create__11daObjBBox_cFv.s b/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Create__11daObjBBox_cFv.s deleted file mode 100644 index c1f2c470f7d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Create__11daObjBBox_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80BACDD8: -/* 80BACDD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BACDDC 7C 08 02 A6 */ mflr r0 -/* 80BACDE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BACDE4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BACDE8 7C 7F 1B 78 */ mr r31, r3 -/* 80BACDEC 4B FF FF 4D */ bl initBaseMtx__11daObjBBox_cFv -/* 80BACDF0 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BACDF4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BACDF8 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80BACDFC 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 80BACE00 38 80 00 FF */ li r4, 0xff -/* 80BACE04 38 A0 00 FF */ li r5, 0xff -/* 80BACE08 7F E6 FB 78 */ mr r6, r31 -/* 80BACE0C 4B 4D 6A 55 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80BACE10 38 7F 05 E8 */ addi r3, r31, 0x5e8 -/* 80BACE14 3C 80 80 BB */ lis r4, l_cyl_src@ha /* 0x80BAD474@ha */ -/* 80BACE18 38 84 D4 74 */ addi r4, r4, l_cyl_src@l /* 0x80BAD474@l */ -/* 80BACE1C 4B 4D 7A 99 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80BACE20 38 1F 05 AC */ addi r0, r31, 0x5ac -/* 80BACE24 90 1F 06 2C */ stw r0, 0x62c(r31) -/* 80BACE28 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BACE2C 80 83 00 04 */ lwz r4, 4(r3) -/* 80BACE30 7F E3 FB 78 */ mr r3, r31 -/* 80BACE34 4B 46 D7 45 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80BACE38 38 60 00 01 */ li r3, 1 -/* 80BACE3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BACE40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BACE44 7C 08 03 A6 */ mtlr r0 -/* 80BACE48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BACE4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Delete__11daObjBBox_cFv.s b/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Delete__11daObjBBox_cFv.s deleted file mode 100644 index 0e7a9b699b5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Delete__11daObjBBox_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80BAD2D8: -/* 80BAD2D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BAD2DC 7C 08 02 A6 */ mflr r0 -/* 80BAD2E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BAD2E4 3C 80 80 BB */ lis r4, l_arcName@ha /* 0x80BAD4D4@ha */ -/* 80BAD2E8 38 84 D4 D4 */ addi r4, r4, l_arcName@l /* 0x80BAD4D4@l */ -/* 80BAD2EC 80 84 00 00 */ lwz r4, 0(r4) -/* 80BAD2F0 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80BAD2F4 4B 47 FD 15 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BAD2F8 38 60 00 01 */ li r3, 1 -/* 80BAD2FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BAD300 7C 08 03 A6 */ mtlr r0 -/* 80BAD304 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BAD308 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Draw__11daObjBBox_cFv.s b/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Draw__11daObjBBox_cFv.s deleted file mode 100644 index 7468cee1fe8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Draw__11daObjBBox_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80BAD234: -/* 80BAD234 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BAD238 7C 08 02 A6 */ mflr r0 -/* 80BAD23C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BAD240 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BAD244 93 C1 00 08 */ stw r30, 8(r1) -/* 80BAD248 7C 7E 1B 78 */ mr r30, r3 -/* 80BAD24C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BAD250 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BAD254 38 80 00 10 */ li r4, 0x10 -/* 80BAD258 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BAD25C 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80BAD260 4B 5F 65 65 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BAD264 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BAD268 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BAD26C 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80BAD270 80 84 00 04 */ lwz r4, 4(r4) -/* 80BAD274 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80BAD278 4B 5F 7B 29 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BAD27C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BAD280 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BAD284 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80BAD288 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80BAD28C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80BAD290 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BAD294 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80BAD298 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BAD29C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BAD2A0 4B 46 0A 25 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80BAD2A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BAD2A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BAD2AC 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80BAD2B0 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BAD2B4 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80BAD2B8 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BAD2BC 38 60 00 01 */ li r3, 1 -/* 80BAD2C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BAD2C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BAD2C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BAD2CC 7C 08 03 A6 */ mtlr r0 -/* 80BAD2D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BAD2D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Execute__11daObjBBox_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Execute__11daObjBBox_cFPPA3_A4_f.s deleted file mode 100644 index 562142290cd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Execute__11daObjBBox_cFPPA3_A4_f.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_80BAD0C0: -/* 80BAD0C0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80BAD0C4 7C 08 02 A6 */ mflr r0 -/* 80BAD0C8 90 01 00 54 */ stw r0, 0x54(r1) -/* 80BAD0CC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80BAD0D0 4B 7B 50 FD */ bl _savegpr_25 -/* 80BAD0D4 7C 7D 1B 78 */ mr r29, r3 -/* 80BAD0D8 7C 9E 23 78 */ mr r30, r4 -/* 80BAD0DC 3C 60 80 BB */ lis r3, l_cyl_src@ha /* 0x80BAD474@ha */ -/* 80BAD0E0 3B E3 D4 74 */ addi r31, r3, l_cyl_src@l /* 0x80BAD474@l */ -/* 80BAD0E4 38 7D 05 E8 */ addi r3, r29, 0x5e8 -/* 80BAD0E8 4B 4D 73 79 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80BAD0EC 28 03 00 00 */ cmplwi r3, 0 -/* 80BAD0F0 41 82 00 F8 */ beq lbl_80BAD1E8 -/* 80BAD0F4 38 7D 05 E8 */ addi r3, r29, 0x5e8 -/* 80BAD0F8 4B 4D 74 01 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80BAD0FC 28 03 00 00 */ cmplwi r3, 0 -/* 80BAD100 41 82 00 E8 */ beq lbl_80BAD1E8 -/* 80BAD104 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80BAD108 74 00 D8 00 */ andis. r0, r0, 0xd800 -/* 80BAD10C 41 82 00 DC */ beq lbl_80BAD1E8 -/* 80BAD110 3B 20 00 00 */ li r25, 0 -/* 80BAD114 3B 80 00 00 */ li r28, 0 -/* 80BAD118 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BAD11C 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BAD120 3B 7F 00 44 */ addi r27, r31, 0x44 -lbl_80BAD124: -/* 80BAD124 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) -/* 80BAD128 38 80 00 00 */ li r4, 0 -/* 80BAD12C 90 81 00 08 */ stw r4, 8(r1) -/* 80BAD130 38 00 FF FF */ li r0, -1 -/* 80BAD134 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BAD138 90 81 00 10 */ stw r4, 0x10(r1) -/* 80BAD13C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80BAD140 90 81 00 18 */ stw r4, 0x18(r1) -/* 80BAD144 38 80 00 00 */ li r4, 0 -/* 80BAD148 7C BB E2 2E */ lhzx r5, r27, r28 -/* 80BAD14C 38 DD 04 D0 */ addi r6, r29, 0x4d0 -/* 80BAD150 38 E0 00 00 */ li r7, 0 -/* 80BAD154 39 00 00 00 */ li r8, 0 -/* 80BAD158 39 3D 04 EC */ addi r9, r29, 0x4ec -/* 80BAD15C 39 40 00 FF */ li r10, 0xff -/* 80BAD160 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80BAD164 4B 49 F9 2D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80BAD168 3B 39 00 01 */ addi r25, r25, 1 -/* 80BAD16C 2C 19 00 05 */ cmpwi r25, 5 -/* 80BAD170 3B 9C 00 02 */ addi r28, r28, 2 -/* 80BAD174 41 80 FF B0 */ blt lbl_80BAD124 -/* 80BAD178 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80BAD17C 7C 03 07 74 */ extsb r3, r0 -/* 80BAD180 4B 47 FE ED */ bl dComIfGp_getReverb__Fi -/* 80BAD184 7C 67 1B 78 */ mr r7, r3 -/* 80BAD188 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800FB@ha */ -/* 80BAD18C 38 03 00 FB */ addi r0, r3, 0x00FB /* 0x000800FB@l */ -/* 80BAD190 90 01 00 20 */ stw r0, 0x20(r1) -/* 80BAD194 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BAD198 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BAD19C 80 63 00 00 */ lwz r3, 0(r3) -/* 80BAD1A0 38 81 00 20 */ addi r4, r1, 0x20 -/* 80BAD1A4 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80BAD1A8 38 C0 00 00 */ li r6, 0 -/* 80BAD1AC C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80BAD1B0 FC 40 08 90 */ fmr f2, f1 -/* 80BAD1B4 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 80BAD1B8 FC 80 18 90 */ fmr f4, f3 -/* 80BAD1BC 39 00 00 00 */ li r8, 0 -/* 80BAD1C0 4B 6F E7 C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80BAD1C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BAD1C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BAD1CC 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80BAD1D0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BAD1D4 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80BAD1D8 7C 05 07 74 */ extsb r5, r0 -/* 80BAD1DC 4B 48 80 25 */ bl onSwitch__10dSv_info_cFii -/* 80BAD1E0 7F A3 EB 78 */ mr r3, r29 -/* 80BAD1E4 4B 46 CA 99 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_80BAD1E8: -/* 80BAD1E8 38 1D 05 6C */ addi r0, r29, 0x56c -/* 80BAD1EC 90 1E 00 00 */ stw r0, 0(r30) -/* 80BAD1F0 7F A3 EB 78 */ mr r3, r29 -/* 80BAD1F4 4B FF FB 81 */ bl setBaseMtx__11daObjBBox_cFv -/* 80BAD1F8 38 7D 07 0C */ addi r3, r29, 0x70c -/* 80BAD1FC 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BAD200 4B 6C 1F DD */ bl SetC__8cM3dGCylFRC4cXyz -/* 80BAD204 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BAD208 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BAD20C 38 63 23 3C */ addi r3, r3, 0x233c -/* 80BAD210 38 9D 05 E8 */ addi r4, r29, 0x5e8 -/* 80BAD214 4B 6B 79 95 */ bl Set__4cCcSFP8cCcD_Obj -/* 80BAD218 38 60 00 01 */ li r3, 1 -/* 80BAD21C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80BAD220 4B 7B 4F F9 */ bl _restgpr_25 -/* 80BAD224 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80BAD228 7C 08 03 A6 */ mtlr r0 -/* 80BAD22C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80BAD230 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDelete__FP11daObjBBox_c.s b/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDelete__FP11daObjBBox_c.s deleted file mode 100644 index 197f6f1ed30..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDelete__FP11daObjBBox_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BAD400: -/* 80BAD400 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BAD404 7C 08 02 A6 */ mflr r0 -/* 80BAD408 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BAD40C 4B 4C B4 D1 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80BAD410 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BAD414 7C 08 03 A6 */ mtlr r0 -/* 80BAD418 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BAD41C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDraw__FP11daObjBBox_c.s b/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDraw__FP11daObjBBox_c.s deleted file mode 100644 index b897d8ba1ab..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDraw__FP11daObjBBox_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80BAD440: -/* 80BAD440 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BAD444 7C 08 02 A6 */ mflr r0 -/* 80BAD448 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BAD44C 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80BAD450 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80BAD454 7D 89 03 A6 */ mtctr r12 -/* 80BAD458 4E 80 04 21 */ bctrl -/* 80BAD45C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BAD460 7C 08 03 A6 */ mtlr r0 -/* 80BAD464 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BAD468 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGExecute__FP11daObjBBox_c.s b/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGExecute__FP11daObjBBox_c.s deleted file mode 100644 index c675096ca6a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGExecute__FP11daObjBBox_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BAD420: -/* 80BAD420 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BAD424 7C 08 02 A6 */ mflr r0 -/* 80BAD428 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BAD42C 4B 4C B5 25 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80BAD430 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BAD434 7C 08 03 A6 */ mtlr r0 -/* 80BAD438 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BAD43C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/initBaseMtx__11daObjBBox_cFv.s b/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/initBaseMtx__11daObjBBox_cFv.s deleted file mode 100644 index ee7c263b1c9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/initBaseMtx__11daObjBBox_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80BACD38: -/* 80BACD38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BACD3C 7C 08 02 A6 */ mflr r0 -/* 80BACD40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BACD44 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80BACD48 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80BACD4C D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80BACD50 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80BACD54 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80BACD58 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80BACD5C D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80BACD60 48 00 00 15 */ bl setBaseMtx__11daObjBBox_cFv -/* 80BACD64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BACD68 7C 08 03 A6 */ mtlr r0 -/* 80BACD6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BACD70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/setBaseMtx__11daObjBBox_cFv.s b/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/setBaseMtx__11daObjBBox_cFv.s deleted file mode 100644 index a6cf1053a21..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/setBaseMtx__11daObjBBox_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80BACD74: -/* 80BACD74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BACD78 7C 08 02 A6 */ mflr r0 -/* 80BACD7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BACD80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BACD84 7C 7F 1B 78 */ mr r31, r3 -/* 80BACD88 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BACD8C 4B 45 FF D9 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BACD90 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BACD94 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BACD98 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80BACD9C 4B 45 F6 99 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BACDA0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BACDA4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BACDA8 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80BACDAC 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BACDB0 4B 79 97 01 */ bl PSMTXCopy -/* 80BACDB4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BACDB8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BACDBC 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80BACDC0 4B 79 96 F1 */ bl PSMTXCopy -/* 80BACDC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BACDC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BACDCC 7C 08 03 A6 */ mtlr r0 -/* 80BACDD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BACDD4 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h b/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h index af263c8b124..73c7328a782 100644 --- a/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h +++ b/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h @@ -1,6 +1,29 @@ #ifndef D_A_OBJ_BBOX_H #define D_A_OBJ_BBOX_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daObjBBox_c : public dBgS_MoveBgActor { +public: + /* 80BACD38 */ void initBaseMtx(); + /* 80BACD74 */ void setBaseMtx(); + /* 80BACDD8 */ int Create(); + /* 80BACE50 */ int CreateHeap(); + /* 80BACEC0 */ int create1st(); + /* 80BAD0C0 */ int Execute(Mtx**); + /* 80BAD234 */ int Draw(); + /* 80BAD2D8 */ int Delete(); + + u32 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } + +private: + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ dCcD_Stts mStts; + /* 0x5E8 */ dCcD_Cyl mCyl; +}; // Size: 0x724 #endif /* D_A_OBJ_BBOX_H */ diff --git a/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp b/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp index ea876a8bdaa..fb47015fa25 100644 --- a/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp +++ b/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp @@ -1,92 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_bbox -// +/** + * d_a_obj_bbox.cpp + * Object - Breakable Wooden Box + */ #include "rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h" -#include "d/cc/d_cc_d.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjBBox_c { - /* 80BACD38 */ void initBaseMtx(); - /* 80BACD74 */ void setBaseMtx(); - /* 80BACDD8 */ void Create(); - /* 80BACE50 */ void CreateHeap(); - /* 80BACEC0 */ void create1st(); - /* 80BAD0C0 */ void Execute(f32 (**)[3][4]); - /* 80BAD234 */ void Draw(); - /* 80BAD2D8 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -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 dBgW {}; - -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 cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct J3DModel {}; - // // Forward References: // @@ -145,20 +66,14 @@ extern "C" void Set__4cCcSFP8cCcD_Obj(); extern "C" void SetC__8cM3dGCylFRC4cXyz(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void _savegpr_25(); extern "C" void _restgpr_25(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -166,70 +81,54 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* 80BACD38-80BACD74 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjBBox_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBBox_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/initBaseMtx__11daObjBBox_cFv.s" +void daObjBBox_c::initBaseMtx() { + mpModel->setBaseScale(mScale); + setBaseMtx(); } -#pragma pop /* 80BACD74-80BACDD8 0000B4 0064+00 2/2 0/0 0/0 .text setBaseMtx__11daObjBBox_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBBox_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/setBaseMtx__11daObjBBox_cFv.s" +void daObjBBox_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -#pragma pop -/* ############################################################################################## */ /* 80BAD474-80BAD4B8 000000 0044+00 2/2 0/0 0/0 .rodata l_cyl_src */ const static dCcD_SrcCyl l_cyl_src = { { - {0x0, {{0x0, 0x0, 0x1f}, {0xd8000000, 0x11}, 0x78}}, // mObj - {dCcD_SE_NONE, 0x1, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf + {0x0, {{0x0, 0x0, 0x1f}, {0xd8000000, 0x11}, 0x78}}, // mObj + {dCcD_SE_NONE, 0x1, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 90.0f, // mRadius - 100.0f // mHeight - } // mCyl + {0.0f, 0.0f, 0.0f}, // mCenter + 90.0f, // mRadius + 100.0f // mHeight + } // mCyl }; /* 80BACDD8-80BACE50 000118 0078+00 1/0 0/0 0/0 .text Create__11daObjBBox_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBBox_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Create__11daObjBBox_cFv.s" +int daObjBBox_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->mBaseTransformMtx); + mStts.Init(0xff, 0xff, this); + mCyl.Set(l_cyl_src); + mCyl.SetStts(&mStts); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BAD4CC-80BAD4CC 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BAD4CC = "M_BBox"; -#pragma pop /* 80BAD4D4-80BAD4D8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_bbox__stringBase0; +static char* l_arcName = "M_BBox"; /* 80BACE50-80BACEC0 000190 0070+00 1/0 0/0 0/0 .text CreateHeap__11daObjBBox_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBBox_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/CreateHeap__11daObjBBox_cFv.s" +int daObjBBox_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + return mpModel != NULL ? 1 : 0; } -#pragma pop /* ############################################################################################## */ /* 80BAD4D8-80BAD4F8 -00001 0020+00 1/0 0/0 0/0 .data daObjBBox_METHODS */ @@ -283,14 +182,33 @@ SECTION_DATA extern void* __vt__11daObjBBox_c[10] = { }; /* 80BACEC0-80BAD030 000200 0170+00 1/1 0/0 0/0 .text create1st__11daObjBBox_cFv */ +#ifdef NONMATCHING +// vtable explosion +int daObjBBox_c::create1st() { + fopAcM_SetupActor(this, daObjBBox_c); + + if (i_fopAcM_isSwitch(this, getSwNo())) { + return cPhs_ERROR_e; + } + int phase = dComIfG_resLoad(&mPhaseReq, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + phase = MoveBGCreate(l_arcName, 7, NULL, 0xC00, NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + return phase; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjBBox_c::create1st() { +asm int daObjBBox_c::create1st() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/create1st__11daObjBBox_cFv.s" } #pragma pop +#endif /* 80BAD030-80BAD078 000370 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ #pragma push @@ -314,110 +232,82 @@ extern "C" asm void __dt__8cM3dGAabFv() { } #pragma pop -/* ############################################################################################## */ /* 80BAD4B8-80BAD4C4 000044 000A+02 0/1 0/0 0/0 .rodata particle_id$3793 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const particle_id[10 + 2 /* padding */] = { - 0x83, - 0xB0, - 0x83, - 0xB1, - 0x83, - 0xB2, - 0x83, - 0xB3, - 0x83, - 0xB4, - /* padding */ - 0x00, - 0x00, +static const u16 particle_id[5] = { + 0x83B0, 0x83B1, 0x83B2, 0x83B3, 0x83B4, }; -COMPILER_STRIP_GATE(0x80BAD4B8, &particle_id); -#pragma pop - -/* 80BAD4C4-80BAD4C8 000050 0004+00 0/1 0/0 0/0 .rodata @3821 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3821 = 1.0f; -COMPILER_STRIP_GATE(0x80BAD4C4, &lit_3821); -#pragma pop - -/* 80BAD4C8-80BAD4CC 000054 0004+00 0/1 0/0 0/0 .rodata @3822 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3822 = -1.0f; -COMPILER_STRIP_GATE(0x80BAD4C8, &lit_3822); #pragma pop /* 80BAD0C0-80BAD234 000400 0174+00 1/0 0/0 0/0 .text Execute__11daObjBBox_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBBox_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Execute__11daObjBBox_cFPPA3_A4_f.s" +int daObjBBox_c::Execute(Mtx** i_mtx) { + if (mCyl.ChkTgHit() != 0) { + cCcD_Obj* hitObj = mCyl.GetTgHitObj(); + if (hitObj != NULL) { + if (hitObj->ChkAtType(0xd8000000)) { + for (int i = 0; i < 5; i++) { + dComIfGp_particle_set(particle_id[i], ¤t.pos, NULL, &mScale, 0xff, NULL, + -1, NULL, NULL, NULL); + } + fopAcM_seStart(this, Z2SE_OBJ_WOODBOX_BREAK, 0); + i_fopAcM_onSwitch(this, getSwNo()); + fopAcM_delete(this); + } + } + } + *i_mtx = &mBgMtx; + setBaseMtx(); + mCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCyl); + return 1; } -#pragma pop /* 80BAD234-80BAD2D8 000574 00A4+00 1/0 0/0 0/0 .text Draw__11daObjBBox_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBBox_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Draw__11daObjBBox_cFv.s" +int daObjBBox_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80BAD2D8-80BAD30C 000618 0034+00 1/0 0/0 0/0 .text Delete__11daObjBBox_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBBox_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Delete__11daObjBBox_cFv.s" +int daObjBBox_c::Delete() { + dComIfG_resDelete(&mPhaseReq, l_arcName); + return 1; } -#pragma pop /* 80BAD30C-80BAD400 00064C 00F4+00 1/0 0/0 0/0 .text daObjBBox_create1st__FP11daObjBBox_c */ +#ifdef NONMATCHING +// vtable explosion +static int daObjBBox_create1st(daObjBBox_c* i_this) { + fopAcM_SetupActor(i_this, daObjBBox_c); + return i_this->create1st(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void daObjBBox_create1st(daObjBBox_c* param_0) { +static asm int daObjBBox_create1st(daObjBBox_c* i_this) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_create1st__FP11daObjBBox_c.s" } #pragma pop +#endif /* 80BAD400-80BAD420 000740 0020+00 1/0 0/0 0/0 .text daObjBBox_MoveBGDelete__FP11daObjBBox_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBBox_MoveBGDelete(daObjBBox_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDelete__FP11daObjBBox_c.s" +static int daObjBBox_MoveBGDelete(daObjBBox_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80BAD420-80BAD440 000760 0020+00 1/0 0/0 0/0 .text daObjBBox_MoveBGExecute__FP11daObjBBox_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBBox_MoveBGExecute(daObjBBox_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGExecute__FP11daObjBBox_c.s" +static int daObjBBox_MoveBGExecute(daObjBBox_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80BAD440-80BAD46C 000780 002C+00 1/0 0/0 0/0 .text daObjBBox_MoveBGDraw__FP11daObjBBox_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBBox_MoveBGDraw(daObjBBox_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDraw__FP11daObjBBox_c.s" +static int daObjBBox_MoveBGDraw(daObjBBox_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop - -/* 80BAD4CC-80BAD4CC 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */