diff options
| author | Trueffel <106771418+Trueffeloot@users.noreply.github.com> | 2024-04-21 14:27:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-21 15:27:36 +0300 |
| commit | 151c5099abdddb91c8c4cf3565c0c5075a0e0146 (patch) | |
| tree | 223f48042d2e51c81aeadceb3cb3d589e1c0f5d8 | |
| parent | d253deb2b95e96323d9b8fddd3e4aa629203ebd4 (diff) | |
d_a_obj_chest OK (#2136)
* obj_chest all functions matchin
* obj_chest OK & some renaming
* update progress & remove asm
34 files changed, 284 insertions, 1972 deletions
diff --git a/Progress.md b/Progress.md index 7dfac5aada..29268efddd 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 54.157315% | 2177488 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 54.157315% | 2177488 | 4020672 -RELs | 37.780466% | 4344876 | 11500324 -Total | 42.022844% | 6522364 | 15520996 +RELs | 37.818239% | 4349220 | 11500324 +Total | 42.050832% | 6526708 | 15520996 ## RELs @@ -375,7 +375,7 @@ d_a_obj_cblock | 42.294713% | 3008 | 7112 d_a_obj_cboard | 100.000000% | 2648 | 2648 d_a_obj_cdoor | 100.000000% | 6568 | 6568 d_a_obj_chandelier | 100.000000% | 5504 | 5504 -d_a_obj_chest | 39.833795% | 2876 | 7220 +d_a_obj_chest | 100.000000% | 7220 | 7220 d_a_obj_cho | 100.000000% | 13220 | 13220 d_a_obj_cowdoor | 100.000000% | 2188 | 2188 d_a_obj_crope | 26.014689% | 2692 | 10348 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 37.780466% | 4344876 | 11500324 +Total | 37.818239% | 4349220 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/CreateHeap__12daObjChest_cFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/CreateHeap__12daObjChest_cFv.s deleted file mode 100644 index 345a09694e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/CreateHeap__12daObjChest_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80BC9240: -/* 80BC9240 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9244 7C 08 02 A6 */ mflr r0 -/* 80BC9248 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC924C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC9250 7C 7F 1B 78 */ mr r31, r3 -/* 80BC9254 3C 60 80 BD */ lis r3, l_arcName@ha /* 0x80BCA0D8@ha */ -/* 80BC9258 38 63 A0 D8 */ addi r3, r3, l_arcName@l /* 0x80BCA0D8@l */ -/* 80BC925C 80 63 00 00 */ lwz r3, 0(r3) -/* 80BC9260 38 80 00 04 */ li r4, 4 -/* 80BC9264 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BC9268 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BC926C 3C A5 00 02 */ addis r5, r5, 2 -/* 80BC9270 38 C0 00 80 */ li r6, 0x80 -/* 80BC9274 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BC9278 4B 47 30 75 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BC927C 3C 80 00 08 */ lis r4, 8 -/* 80BC9280 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80BC9284 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80BC9288 4B 44 B9 CD */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80BC928C 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80BC9290 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BC9294 30 03 FF FF */ addic r0, r3, -1 -/* 80BC9298 7C 60 19 10 */ subfe r3, r0, r3 -/* 80BC929C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC92A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC92A4 7C 08 03 A6 */ mtlr r0 -/* 80BC92A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC92AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Create__12daObjChest_cFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Create__12daObjChest_cFv.s deleted file mode 100644 index e18f7e5780..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Create__12daObjChest_cFv.s +++ /dev/null @@ -1,115 +0,0 @@ -lbl_80BC9088: -/* 80BC9088 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BC908C 7C 08 02 A6 */ mflr r0 -/* 80BC9090 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BC9094 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BC9098 4B 79 91 39 */ bl _savegpr_26 -/* 80BC909C 7C 7E 1B 78 */ mr r30, r3 -/* 80BC90A0 3C 60 80 BD */ lis r3, l_cyl_src@ha /* 0x80BC9FFC@ha */ -/* 80BC90A4 3B E3 9F FC */ addi r31, r3, l_cyl_src@l /* 0x80BC9FFC@l */ -/* 80BC90A8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BC90AC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BC90B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BC90B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BC90B8 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80BC90BC 7C 05 07 74 */ extsb r5, r0 -/* 80BC90C0 4B 46 C2 A1 */ bl isSwitch__10dSv_info_cCFii -/* 80BC90C4 2C 03 00 00 */ cmpwi r3, 0 -/* 80BC90C8 41 82 00 B0 */ beq lbl_80BC9178 -/* 80BC90CC 38 00 40 00 */ li r0, 0x4000 -/* 80BC90D0 B0 1E 0A 84 */ sth r0, 0xa84(r30) -/* 80BC90D4 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BC90D8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BC90DC C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80BC90E0 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80BC90E4 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BC90E8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BC90EC C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 80BC90F0 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BC90F4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80BC90F8 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80BC90FC D0 3E 0A 78 */ stfs f1, 0xa78(r30) -/* 80BC9100 C0 1F 00 58 */ lfs f0, 0x58(r31) -/* 80BC9104 D0 1E 0A 7C */ stfs f0, 0xa7c(r30) -/* 80BC9108 D0 3E 0A 80 */ stfs f1, 0xa80(r30) -/* 80BC910C 38 61 00 10 */ addi r3, r1, 0x10 -/* 80BC9110 4B 44 3C 55 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BC9114 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC9118 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC911C A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 80BC9120 4B 44 33 15 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BC9124 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC9128 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC912C A8 9E 0A 84 */ lha r4, 0xa84(r30) -/* 80BC9130 4B 44 32 6D */ bl mDoMtx_XrotM__FPA4_fs -/* 80BC9134 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC9138 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC913C 38 9E 0A 78 */ addi r4, r30, 0xa78 -/* 80BC9140 7C 85 23 78 */ mr r5, r4 -/* 80BC9144 4B 77 DC 29 */ bl PSMTXMultVec -/* 80BC9148 38 7E 0A 78 */ addi r3, r30, 0xa78 -/* 80BC914C 4B 45 4B 71 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 80BC9150 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BC9154 41 82 00 10 */ beq lbl_80BC9164 -/* 80BC9158 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80BC915C C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 80BC9160 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -lbl_80BC9164: -/* 80BC9164 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80BC9168 D0 1E 0A A0 */ stfs f0, 0xaa0(r30) -/* 80BC916C 38 00 00 02 */ li r0, 2 -/* 80BC9170 98 1E 0A 90 */ stb r0, 0xa90(r30) -/* 80BC9174 48 00 00 0C */ b lbl_80BC9180 -lbl_80BC9178: -/* 80BC9178 38 00 00 00 */ li r0, 0 -/* 80BC917C 98 1E 0A 90 */ stb r0, 0xa90(r30) -lbl_80BC9180: -/* 80BC9180 7F C3 F3 78 */ mr r3, r30 -/* 80BC9184 4B FF FD 75 */ bl initBaseMtx__12daObjChest_cFv -/* 80BC9188 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BC918C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BC9190 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80BC9194 38 7E 07 84 */ addi r3, r30, 0x784 -/* 80BC9198 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 80BC919C FC 40 08 90 */ fmr f2, f1 -/* 80BC91A0 4B 4A CD B9 */ bl SetWall__12dBgS_AcchCirFff -/* 80BC91A4 38 00 00 00 */ li r0, 0 -/* 80BC91A8 90 01 00 08 */ stw r0, 8(r1) -/* 80BC91AC 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 80BC91B0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80BC91B4 38 BE 04 BC */ addi r5, r30, 0x4bc -/* 80BC91B8 7F C6 F3 78 */ mr r6, r30 -/* 80BC91BC 38 E0 00 01 */ li r7, 1 -/* 80BC91C0 39 1E 07 84 */ addi r8, r30, 0x784 -/* 80BC91C4 39 3E 04 F8 */ addi r9, r30, 0x4f8 -/* 80BC91C8 39 40 00 00 */ li r10, 0 -/* 80BC91CC 4B 4A D0 7D */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80BC91D0 38 7E 07 C4 */ addi r3, r30, 0x7c4 -/* 80BC91D4 38 80 00 FF */ li r4, 0xff -/* 80BC91D8 38 A0 00 FF */ li r5, 0xff -/* 80BC91DC 7F C6 F3 78 */ mr r6, r30 -/* 80BC91E0 4B 4B A6 81 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80BC91E4 3B 40 00 00 */ li r26, 0 -/* 80BC91E8 3B A0 00 00 */ li r29, 0 -/* 80BC91EC 3B 9E 07 C4 */ addi r28, r30, 0x7c4 -lbl_80BC91F0: -/* 80BC91F0 7F 7E EA 14 */ add r27, r30, r29 -/* 80BC91F4 38 7B 08 00 */ addi r3, r27, 0x800 -/* 80BC91F8 38 9F 00 00 */ addi r4, r31, 0 -/* 80BC91FC 4B 4B B6 B9 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80BC9200 93 9B 08 44 */ stw r28, 0x844(r27) -/* 80BC9204 3B 5A 00 01 */ addi r26, r26, 1 -/* 80BC9208 2C 1A 00 02 */ cmpwi r26, 2 -/* 80BC920C 3B BD 01 3C */ addi r29, r29, 0x13c -/* 80BC9210 41 80 FF E0 */ blt lbl_80BC91F0 -/* 80BC9214 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BC9218 80 83 00 04 */ lwz r4, 4(r3) -/* 80BC921C 7F C3 F3 78 */ mr r3, r30 -/* 80BC9220 4B 45 13 59 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80BC9224 38 60 00 01 */ li r3, 1 -/* 80BC9228 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BC922C 4B 79 8F F1 */ bl _restgpr_26 -/* 80BC9230 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BC9234 7C 08 03 A6 */ mtlr r0 -/* 80BC9238 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BC923C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Delete__12daObjChest_cFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Delete__12daObjChest_cFv.s deleted file mode 100644 index 0284fceb8c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Delete__12daObjChest_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80BC9EA4: -/* 80BC9EA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9EA8 7C 08 02 A6 */ mflr r0 -/* 80BC9EAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9EB0 3C 80 80 BD */ lis r4, l_arcName@ha /* 0x80BCA0D8@ha */ -/* 80BC9EB4 38 84 A0 D8 */ addi r4, r4, l_arcName@l /* 0x80BCA0D8@l */ -/* 80BC9EB8 80 84 00 00 */ lwz r4, 0(r4) -/* 80BC9EBC 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80BC9EC0 4B 46 31 49 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BC9EC4 38 60 00 01 */ li r3, 1 -/* 80BC9EC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9ECC 7C 08 03 A6 */ mtlr r0 -/* 80BC9ED0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9ED4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Draw__12daObjChest_cFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Draw__12daObjChest_cFv.s deleted file mode 100644 index c69a5fe6bd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Draw__12daObjChest_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80BC9E00: -/* 80BC9E00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9E04 7C 08 02 A6 */ mflr r0 -/* 80BC9E08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9E0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC9E10 93 C1 00 08 */ stw r30, 8(r1) -/* 80BC9E14 7C 7E 1B 78 */ mr r30, r3 -/* 80BC9E18 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BC9E1C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BC9E20 38 80 00 10 */ li r4, 0x10 -/* 80BC9E24 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BC9E28 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80BC9E2C 4B 5D 99 99 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BC9E30 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BC9E34 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BC9E38 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80BC9E3C 80 84 00 04 */ lwz r4, 4(r4) -/* 80BC9E40 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80BC9E44 4B 5D AF 5D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BC9E48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BC9E4C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BC9E50 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80BC9E54 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80BC9E58 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80BC9E5C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BC9E60 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80BC9E64 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BC9E68 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BC9E6C 4B 44 3E 59 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80BC9E70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BC9E74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BC9E78 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80BC9E7C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BC9E80 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80BC9E84 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BC9E88 38 60 00 01 */ li r3, 1 -/* 80BC9E8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC9E90 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BC9E94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9E98 7C 08 03 A6 */ mtlr r0 -/* 80BC9E9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9EA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Execute__12daObjChest_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Execute__12daObjChest_cFPPA3_A4_f.s deleted file mode 100644 index 1e046d0d78..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Execute__12daObjChest_cFPPA3_A4_f.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80BC970C: -/* 80BC970C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9710 7C 08 02 A6 */ mflr r0 -/* 80BC9714 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9718 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC971C 93 C1 00 08 */ stw r30, 8(r1) -/* 80BC9720 7C 7E 1B 78 */ mr r30, r3 -/* 80BC9724 7C 9F 23 78 */ mr r31, r4 -/* 80BC9728 80 83 0A 94 */ lwz r4, 0xa94(r3) -/* 80BC972C 38 04 00 01 */ addi r0, r4, 1 -/* 80BC9730 90 03 0A 94 */ stw r0, 0xa94(r3) -/* 80BC9734 48 00 00 31 */ bl action__12daObjChest_cFv -/* 80BC9738 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80BC973C 90 1F 00 00 */ stw r0, 0(r31) -/* 80BC9740 7F C3 F3 78 */ mr r3, r30 -/* 80BC9744 4B FF F7 F1 */ bl setBaseMtx__12daObjChest_cFv -/* 80BC9748 38 60 00 01 */ li r3, 1 -/* 80BC974C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC9750 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BC9754 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9758 7C 08 03 A6 */ mtlr r0 -/* 80BC975C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9760 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__ct__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__ct__8dCcD_CylFv.s deleted file mode 100644 index c11aa7bf20..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__ct__8dCcD_CylFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80BC94BC: -/* 80BC94BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC94C0 7C 08 02 A6 */ mflr r0 -/* 80BC94C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC94C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC94CC 7C 7F 1B 78 */ mr r31, r3 -/* 80BC94D0 4B 4B A5 59 */ bl __ct__12dCcD_GObjInfFv -/* 80BC94D4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80BC94D8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80BC94DC 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80BC94E0 3C 60 80 BD */ lis r3, __vt__8cM3dGAab@ha /* 0x80BCA198@ha */ -/* 80BC94E4 38 03 A1 98 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80BCA198@l */ -/* 80BC94E8 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 80BC94EC 3C 60 80 BD */ lis r3, __vt__8cM3dGCyl@ha /* 0x80BCA1A4@ha */ -/* 80BC94F0 38 03 A1 A4 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80BCA1A4@l */ -/* 80BC94F4 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80BC94F8 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80BC94FC 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80BC9500 90 7F 01 20 */ stw r3, 0x120(r31) -/* 80BC9504 38 03 00 58 */ addi r0, r3, 0x58 -/* 80BC9508 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80BC950C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80BC9510 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80BC9514 90 7F 00 3C */ stw r3, 0x3c(r31) -/* 80BC9518 38 03 00 2C */ addi r0, r3, 0x2c -/* 80BC951C 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80BC9520 38 03 00 84 */ addi r0, r3, 0x84 -/* 80BC9524 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80BC9528 7F E3 FB 78 */ mr r3, r31 -/* 80BC952C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC9530 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9534 7C 08 03 A6 */ mtlr r0 -/* 80BC9538 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC953C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index da82786c34..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BC9F64: -/* 80BC9F64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9F68 7C 08 02 A6 */ mflr r0 -/* 80BC9F6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9F70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC9F74 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BC9F78 41 82 00 1C */ beq lbl_80BC9F94 -/* 80BC9F7C 3C A0 80 BD */ lis r5, __vt__10cCcD_GStts@ha /* 0x80BCA180@ha */ -/* 80BC9F80 38 05 A1 80 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80BCA180@l */ -/* 80BC9F84 90 1F 00 00 */ stw r0, 0(r31) -/* 80BC9F88 7C 80 07 35 */ extsh. r0, r4 -/* 80BC9F8C 40 81 00 08 */ ble lbl_80BC9F94 -/* 80BC9F90 4B 70 4D AD */ bl __dl__FPv -lbl_80BC9F94: -/* 80BC9F94 7F E3 FB 78 */ mr r3, r31 -/* 80BC9F98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC9F9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9FA0 7C 08 03 A6 */ mtlr r0 -/* 80BC9FA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9FA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 08e66df0b6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80BC95D0: -/* 80BC95D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC95D4 7C 08 02 A6 */ mflr r0 -/* 80BC95D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC95DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC95E0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BC95E4 41 82 00 30 */ beq lbl_80BC9614 -/* 80BC95E8 3C 60 80 BD */ lis r3, __vt__10dCcD_GStts@ha /* 0x80BCA18C@ha */ -/* 80BC95EC 38 03 A1 8C */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80BCA18C@l */ -/* 80BC95F0 90 1F 00 00 */ stw r0, 0(r31) -/* 80BC95F4 41 82 00 10 */ beq lbl_80BC9604 -/* 80BC95F8 3C 60 80 BD */ lis r3, __vt__10cCcD_GStts@ha /* 0x80BCA180@ha */ -/* 80BC95FC 38 03 A1 80 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80BCA180@l */ -/* 80BC9600 90 1F 00 00 */ stw r0, 0(r31) -lbl_80BC9604: -/* 80BC9604 7C 80 07 35 */ extsh. r0, r4 -/* 80BC9608 40 81 00 0C */ ble lbl_80BC9614 -/* 80BC960C 7F E3 FB 78 */ mr r3, r31 -/* 80BC9610 4B 70 57 2D */ bl __dl__FPv -lbl_80BC9614: -/* 80BC9614 7F E3 FB 78 */ mr r3, r31 -/* 80BC9618 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC961C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9620 7C 08 03 A6 */ mtlr r0 -/* 80BC9624 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9628 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index e95b3b17a6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BC962C: -/* 80BC962C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9630 7C 08 02 A6 */ mflr r0 -/* 80BC9634 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9638 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC963C 93 C1 00 08 */ stw r30, 8(r1) -/* 80BC9640 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BC9644 7C 9F 23 78 */ mr r31, r4 -/* 80BC9648 41 82 00 38 */ beq lbl_80BC9680 -/* 80BC964C 3C 60 80 BD */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80BCA174@ha */ -/* 80BC9650 38 03 A1 74 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80BCA174@l */ -/* 80BC9654 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80BC9658 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80BC965C 38 80 FF FF */ li r4, -1 -/* 80BC9660 4B 6A 58 B9 */ bl __dt__8cM3dGCirFv -/* 80BC9664 7F C3 F3 78 */ mr r3, r30 -/* 80BC9668 38 80 00 00 */ li r4, 0 -/* 80BC966C 4B 69 EA 45 */ bl __dt__13cBgS_PolyInfoFv -/* 80BC9670 7F E0 07 35 */ extsh. r0, r31 -/* 80BC9674 40 81 00 0C */ ble lbl_80BC9680 -/* 80BC9678 7F C3 F3 78 */ mr r3, r30 -/* 80BC967C 4B 70 56 C1 */ bl __dl__FPv -lbl_80BC9680: -/* 80BC9680 7F C3 F3 78 */ mr r3, r30 -/* 80BC9684 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC9688 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BC968C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9690 7C 08 03 A6 */ mtlr r0 -/* 80BC9694 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9698 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index fec7a4f012..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BC969C: -/* 80BC969C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC96A0 7C 08 02 A6 */ mflr r0 -/* 80BC96A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC96A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC96AC 93 C1 00 08 */ stw r30, 8(r1) -/* 80BC96B0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BC96B4 7C 9F 23 78 */ mr r31, r4 -/* 80BC96B8 41 82 00 38 */ beq lbl_80BC96F0 -/* 80BC96BC 3C 80 80 BD */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80BCA1B0@ha */ -/* 80BC96C0 38 84 A1 B0 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80BCA1B0@l */ -/* 80BC96C4 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80BC96C8 38 04 00 0C */ addi r0, r4, 0xc -/* 80BC96CC 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80BC96D0 38 04 00 18 */ addi r0, r4, 0x18 -/* 80BC96D4 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80BC96D8 38 80 00 00 */ li r4, 0 -/* 80BC96DC 4B 4A C8 B9 */ bl __dt__9dBgS_AcchFv -/* 80BC96E0 7F E0 07 35 */ extsh. r0, r31 -/* 80BC96E4 40 81 00 0C */ ble lbl_80BC96F0 -/* 80BC96E8 7F C3 F3 78 */ mr r3, r30 -/* 80BC96EC 4B 70 56 51 */ bl __dl__FPv -lbl_80BC96F0: -/* 80BC96F0 7F C3 F3 78 */ mr r3, r30 -/* 80BC96F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC96F8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BC96FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9700 7C 08 03 A6 */ mtlr r0 -/* 80BC9704 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9708 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8cM3dGAabFv.s deleted file mode 100644 index 121a4445d5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BC9588: -/* 80BC9588 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC958C 7C 08 02 A6 */ mflr r0 -/* 80BC9590 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9594 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC9598 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BC959C 41 82 00 1C */ beq lbl_80BC95B8 -/* 80BC95A0 3C A0 80 BD */ lis r5, __vt__8cM3dGAab@ha /* 0x80BCA198@ha */ -/* 80BC95A4 38 05 A1 98 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80BCA198@l */ -/* 80BC95A8 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80BC95AC 7C 80 07 35 */ extsh. r0, r4 -/* 80BC95B0 40 81 00 08 */ ble lbl_80BC95B8 -/* 80BC95B4 4B 70 57 89 */ bl __dl__FPv -lbl_80BC95B8: -/* 80BC95B8 7F E3 FB 78 */ mr r3, r31 -/* 80BC95BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC95C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC95C4 7C 08 03 A6 */ mtlr r0 -/* 80BC95C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC95CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8cM3dGCylFv.s deleted file mode 100644 index cfe5daf857..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BC9540: -/* 80BC9540 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9544 7C 08 02 A6 */ mflr r0 -/* 80BC9548 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC954C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC9550 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BC9554 41 82 00 1C */ beq lbl_80BC9570 -/* 80BC9558 3C A0 80 BD */ lis r5, __vt__8cM3dGCyl@ha /* 0x80BCA1A4@ha */ -/* 80BC955C 38 05 A1 A4 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80BCA1A4@l */ -/* 80BC9560 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80BC9564 7C 80 07 35 */ extsh. r0, r4 -/* 80BC9568 40 81 00 08 */ ble lbl_80BC9570 -/* 80BC956C 4B 70 57 D1 */ bl __dl__FPv -lbl_80BC9570: -/* 80BC9570 7F E3 FB 78 */ mr r3, r31 -/* 80BC9574 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC9578 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC957C 7C 08 03 A6 */ mtlr r0 -/* 80BC9580 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9584 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8dCcD_CylFv.s deleted file mode 100644 index f79e923fdb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8dCcD_CylFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80BC93F0: -/* 80BC93F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC93F4 7C 08 02 A6 */ mflr r0 -/* 80BC93F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC93FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BC9400 93 C1 00 08 */ stw r30, 8(r1) -/* 80BC9404 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BC9408 7C 9F 23 78 */ mr r31, r4 -/* 80BC940C 41 82 00 94 */ beq lbl_80BC94A0 -/* 80BC9410 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80BC9414 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80BC9418 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80BC941C 38 03 00 2C */ addi r0, r3, 0x2c -/* 80BC9420 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80BC9424 38 03 00 84 */ addi r0, r3, 0x84 -/* 80BC9428 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80BC942C 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80BC9430 41 82 00 54 */ beq lbl_80BC9484 -/* 80BC9434 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80BC9438 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80BC943C 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80BC9440 38 03 00 58 */ addi r0, r3, 0x58 -/* 80BC9444 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80BC9448 34 1E 01 24 */ addic. r0, r30, 0x124 -/* 80BC944C 41 82 00 10 */ beq lbl_80BC945C -/* 80BC9450 3C 60 80 BD */ lis r3, __vt__8cM3dGCyl@ha /* 0x80BCA1A4@ha */ -/* 80BC9454 38 03 A1 A4 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80BCA1A4@l */ -/* 80BC9458 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_80BC945C: -/* 80BC945C 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80BC9460 41 82 00 24 */ beq lbl_80BC9484 -/* 80BC9464 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80BC9468 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80BC946C 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80BC9470 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80BC9474 41 82 00 10 */ beq lbl_80BC9484 -/* 80BC9478 3C 60 80 BD */ lis r3, __vt__8cM3dGAab@ha /* 0x80BCA198@ha */ -/* 80BC947C 38 03 A1 98 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80BCA198@l */ -/* 80BC9480 90 1E 01 1C */ stw r0, 0x11c(r30) -lbl_80BC9484: -/* 80BC9484 7F C3 F3 78 */ mr r3, r30 -/* 80BC9488 38 80 00 00 */ li r4, 0 -/* 80BC948C 4B 4B AC 59 */ bl __dt__12dCcD_GObjInfFv -/* 80BC9490 7F E0 07 35 */ extsh. r0, r31 -/* 80BC9494 40 81 00 0C */ ble lbl_80BC94A0 -/* 80BC9498 7F C3 F3 78 */ mr r3, r30 -/* 80BC949C 4B 70 58 A1 */ bl __dl__FPv -lbl_80BC94A0: -/* 80BC94A0 7F C3 F3 78 */ mr r3, r30 -/* 80BC94A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BC94A8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BC94AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC94B0 7C 08 03 A6 */ mtlr r0 -/* 80BC94B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC94B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/actionMove__12daObjChest_cFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/actionMove__12daObjChest_cFv.s deleted file mode 100644 index 50b17d7399..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/actionMove__12daObjChest_cFv.s +++ /dev/null @@ -1,134 +0,0 @@ -lbl_80BC9BF0: -/* 80BC9BF0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BC9BF4 7C 08 02 A6 */ mflr r0 -/* 80BC9BF8 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BC9BFC 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80BC9C00 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80BC9C04 7C 7E 1B 78 */ mr r30, r3 -/* 80BC9C08 3C 60 80 BD */ lis r3, l_cyl_src@ha /* 0x80BC9FFC@ha */ -/* 80BC9C0C 3B E3 9F FC */ addi r31, r3, l_cyl_src@l /* 0x80BC9FFC@l */ -/* 80BC9C10 38 7E 0A 91 */ addi r3, r30, 0xa91 -/* 80BC9C14 48 00 03 99 */ bl func_80BC9FAC -/* 80BC9C18 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BC9C1C 40 82 01 C8 */ bne lbl_80BC9DE4 -/* 80BC9C20 A8 7E 0A 8A */ lha r3, 0xa8a(r30) -/* 80BC9C24 38 03 00 80 */ addi r0, r3, 0x80 -/* 80BC9C28 B0 1E 0A 8A */ sth r0, 0xa8a(r30) -/* 80BC9C2C 38 7E 0A 84 */ addi r3, r30, 0xa84 -/* 80BC9C30 38 9E 0A 8A */ addi r4, r30, 0xa8a -/* 80BC9C34 4B 69 D8 29 */ bl __apl__5csXyzFR5csXyz -/* 80BC9C38 A8 1E 0A 84 */ lha r0, 0xa84(r30) -/* 80BC9C3C C8 3F 00 48 */ lfd f1, 0x48(r31) -/* 80BC9C40 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BC9C44 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80BC9C48 3C 00 43 30 */ lis r0, 0x4330 -/* 80BC9C4C 90 01 00 28 */ stw r0, 0x28(r1) -/* 80BC9C50 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80BC9C54 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80BC9C58 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 80BC9C5C EC 01 00 24 */ fdivs f0, f1, f0 -/* 80BC9C60 D0 1E 0A A0 */ stfs f0, 0xaa0(r30) -/* 80BC9C64 C0 3E 0A A0 */ lfs f1, 0xaa0(r30) -/* 80BC9C68 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80BC9C6C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BC9C70 40 81 00 08 */ ble lbl_80BC9C78 -/* 80BC9C74 D0 1E 0A A0 */ stfs f0, 0xaa0(r30) -lbl_80BC9C78: -/* 80BC9C78 A8 1E 0A 84 */ lha r0, 0xa84(r30) -/* 80BC9C7C 2C 00 40 00 */ cmpwi r0, 0x4000 -/* 80BC9C80 40 81 01 64 */ ble lbl_80BC9DE4 -/* 80BC9C84 38 00 40 00 */ li r0, 0x4000 -/* 80BC9C88 B0 1E 0A 84 */ sth r0, 0xa84(r30) -/* 80BC9C8C 38 00 00 00 */ li r0, 0 -/* 80BC9C90 B0 1E 0A 8A */ sth r0, 0xa8a(r30) -/* 80BC9C94 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 80BC9C98 D0 1E 05 30 */ stfs f0, 0x530(r30) -/* 80BC9C9C C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80BC9CA0 C0 1E 05 30 */ lfs f0, 0x530(r30) -/* 80BC9CA4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BC9CA8 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80BC9CAC C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80BC9CB0 D0 3E 0A 78 */ stfs f1, 0xa78(r30) -/* 80BC9CB4 C0 1F 00 58 */ lfs f0, 0x58(r31) -/* 80BC9CB8 D0 1E 0A 7C */ stfs f0, 0xa7c(r30) -/* 80BC9CBC D0 3E 0A 80 */ stfs f1, 0xa80(r30) -/* 80BC9CC0 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80BC9CC4 4B 44 30 A1 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BC9CC8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC9CCC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC9CD0 A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 80BC9CD4 4B 44 27 61 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BC9CD8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC9CDC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC9CE0 A8 9E 0A 84 */ lha r4, 0xa84(r30) -/* 80BC9CE4 4B 44 26 B9 */ bl mDoMtx_XrotM__FPA4_fs -/* 80BC9CE8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC9CEC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC9CF0 38 9E 0A 78 */ addi r4, r30, 0xa78 -/* 80BC9CF4 7C 85 23 78 */ mr r5, r4 -/* 80BC9CF8 4B 77 D0 75 */ bl PSMTXMultVec -/* 80BC9CFC 38 7E 0A 78 */ addi r3, r30, 0xa78 -/* 80BC9D00 4B 45 3F BD */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 80BC9D04 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BC9D08 41 82 00 DC */ beq lbl_80BC9DE4 -/* 80BC9D0C 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80BC9D10 C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 80BC9D14 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80BC9D18 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80BC9D1C D0 1E 05 30 */ stfs f0, 0x530(r30) -/* 80BC9D20 C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 80BC9D24 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BC9D28 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BC9D2C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80BC9D30 38 61 00 0C */ addi r3, r1, 0xc -/* 80BC9D34 7C 64 1B 78 */ mr r4, r3 -/* 80BC9D38 C0 3F 00 B0 */ lfs f1, 0xb0(r31) -/* 80BC9D3C 4B 77 D3 9D */ bl PSVECScale -/* 80BC9D40 38 60 03 01 */ li r3, 0x301 -/* 80BC9D44 38 80 00 03 */ li r4, 3 -/* 80BC9D48 38 BE 0A 78 */ addi r5, r30, 0xa78 -/* 80BC9D4C 38 C0 FF FF */ li r6, -1 -/* 80BC9D50 38 E0 00 00 */ li r7, 0 -/* 80BC9D54 39 01 00 0C */ addi r8, r1, 0xc -/* 80BC9D58 39 20 FF FF */ li r9, -1 -/* 80BC9D5C 4B 45 00 3D */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc -/* 80BC9D60 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80BC9D64 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80BC9D68 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80BC9D6C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80BC9D70 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80BC9D74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BC9D78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BC9D7C 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80BC9D80 38 80 00 04 */ li r4, 4 -/* 80BC9D84 38 A0 00 1F */ li r5, 0x1f -/* 80BC9D88 38 C1 00 18 */ addi r6, r1, 0x18 -/* 80BC9D8C 4B 4A 5C 99 */ bl StartShock__12dVibration_cFii4cXyz -/* 80BC9D90 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80BC9D94 7C 03 07 74 */ extsb r3, r0 -/* 80BC9D98 4B 46 32 D5 */ bl dComIfGp_getReverb__Fi -/* 80BC9D9C 7C 67 1B 78 */ mr r7, r3 -/* 80BC9DA0 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080111@ha */ -/* 80BC9DA4 38 03 01 11 */ addi r0, r3, 0x0111 /* 0x00080111@l */ -/* 80BC9DA8 90 01 00 08 */ stw r0, 8(r1) -/* 80BC9DAC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BC9DB0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BC9DB4 80 63 00 00 */ lwz r3, 0(r3) -/* 80BC9DB8 38 81 00 08 */ addi r4, r1, 8 -/* 80BC9DBC 38 BE 0A 78 */ addi r5, r30, 0xa78 -/* 80BC9DC0 38 C0 00 00 */ li r6, 0 -/* 80BC9DC4 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 80BC9DC8 FC 40 08 90 */ fmr f2, f1 -/* 80BC9DCC C0 7F 00 78 */ lfs f3, 0x78(r31) -/* 80BC9DD0 FC 80 18 90 */ fmr f4, f3 -/* 80BC9DD4 39 00 00 00 */ li r8, 0 -/* 80BC9DD8 4B 6E 1B AD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80BC9DDC 38 00 00 02 */ li r0, 2 -/* 80BC9DE0 98 1E 0A 90 */ stb r0, 0xa90(r30) -lbl_80BC9DE4: -/* 80BC9DE4 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80BC9DE8 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80BC9DEC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BC9DF0 7C 08 03 A6 */ mtlr r0 -/* 80BC9DF4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BC9DF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/actionWait__12daObjChest_cFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/actionWait__12daObjChest_cFv.s deleted file mode 100644 index b889926678..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/actionWait__12daObjChest_cFv.s +++ /dev/null @@ -1,267 +0,0 @@ -lbl_80BC9808: -/* 80BC9808 94 21 FF 10 */ stwu r1, -0xf0(r1) -/* 80BC980C 7C 08 02 A6 */ mflr r0 -/* 80BC9810 90 01 00 F4 */ stw r0, 0xf4(r1) -/* 80BC9814 DB E1 00 E0 */ stfd f31, 0xe0(r1) -/* 80BC9818 F3 E1 00 E8 */ psq_st f31, 232(r1), 0, 0 /* qr0 */ -/* 80BC981C DB C1 00 D0 */ stfd f30, 0xd0(r1) -/* 80BC9820 F3 C1 00 D8 */ psq_st f30, 216(r1), 0, 0 /* qr0 */ -/* 80BC9824 DB A1 00 C0 */ stfd f29, 0xc0(r1) -/* 80BC9828 F3 A1 00 C8 */ psq_st f29, 200(r1), 0, 0 /* qr0 */ -/* 80BC982C DB 81 00 B0 */ stfd f28, 0xb0(r1) -/* 80BC9830 F3 81 00 B8 */ psq_st f28, 184(r1), 0, 0 /* qr0 */ -/* 80BC9834 DB 61 00 A0 */ stfd f27, 0xa0(r1) -/* 80BC9838 F3 61 00 A8 */ psq_st f27, 168(r1), 0, 0 /* qr0 */ -/* 80BC983C 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80BC9840 4B 79 89 85 */ bl _savegpr_23 -/* 80BC9844 7C 7F 1B 78 */ mr r31, r3 -/* 80BC9848 3C 60 80 BD */ lis r3, l_cyl_src@ha /* 0x80BC9FFC@ha */ -/* 80BC984C 3B 63 9F FC */ addi r27, r3, l_cyl_src@l /* 0x80BC9FFC@l */ -/* 80BC9850 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BC9854 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BC9858 83 43 5D AC */ lwz r26, 0x5dac(r3) -/* 80BC985C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80BC9860 54 00 C7 3F */ rlwinm. r0, r0, 0x18, 0x1c, 0x1f -/* 80BC9864 40 82 00 C8 */ bne lbl_80BC992C -/* 80BC9868 38 7F 0A 92 */ addi r3, r31, 0xa92 -/* 80BC986C 48 00 07 5D */ bl func_80BC9FC8 -/* 80BC9870 54 60 04 3F */ clrlwi. r0, r3, 0x10 -/* 80BC9874 40 82 00 B8 */ bne lbl_80BC992C -/* 80BC9878 C0 3B 00 64 */ lfs f1, 0x64(r27) -/* 80BC987C 4B 69 E0 D9 */ bl cM_rndF__Ff -/* 80BC9880 C0 1B 00 60 */ lfs f0, 0x60(r27) -/* 80BC9884 EC 00 08 2A */ fadds f0, f0, f1 -/* 80BC9888 FC 00 00 1E */ fctiwz f0, f0 -/* 80BC988C D8 01 00 68 */ stfd f0, 0x68(r1) -/* 80BC9890 80 01 00 6C */ lwz r0, 0x6c(r1) -/* 80BC9894 B0 1F 0A 92 */ sth r0, 0xa92(r31) -/* 80BC9898 C0 3B 00 6C */ lfs f1, 0x6c(r27) -/* 80BC989C 4B 69 E0 F1 */ bl cM_rndFX__Ff -/* 80BC98A0 C0 1B 00 68 */ lfs f0, 0x68(r27) -/* 80BC98A4 EC 00 08 2A */ fadds f0, f0, f1 -/* 80BC98A8 FC 00 00 1E */ fctiwz f0, f0 -/* 80BC98AC D8 01 00 70 */ stfd f0, 0x70(r1) -/* 80BC98B0 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80BC98B4 B0 1F 0A 9A */ sth r0, 0xa9a(r31) -/* 80BC98B8 C0 3B 00 44 */ lfs f1, 0x44(r27) -/* 80BC98BC 4B 69 E0 99 */ bl cM_rndF__Ff -/* 80BC98C0 C0 1B 00 70 */ lfs f0, 0x70(r27) -/* 80BC98C4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BC98C8 40 81 00 10 */ ble lbl_80BC98D8 -/* 80BC98CC C0 1B 00 54 */ lfs f0, 0x54(r27) -/* 80BC98D0 D0 1F 0A 9C */ stfs f0, 0xa9c(r31) -/* 80BC98D4 48 00 00 0C */ b lbl_80BC98E0 -lbl_80BC98D8: -/* 80BC98D8 C0 1B 00 74 */ lfs f0, 0x74(r27) -/* 80BC98DC D0 1F 0A 9C */ stfs f0, 0xa9c(r31) -lbl_80BC98E0: -/* 80BC98E0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80BC98E4 7C 03 07 74 */ extsb r3, r0 -/* 80BC98E8 4B 46 37 85 */ bl dComIfGp_getReverb__Fi -/* 80BC98EC 7C 67 1B 78 */ mr r7, r3 -/* 80BC98F0 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080174@ha */ -/* 80BC98F4 38 03 01 74 */ addi r0, r3, 0x0174 /* 0x00080174@l */ -/* 80BC98F8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BC98FC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BC9900 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BC9904 80 63 00 00 */ lwz r3, 0(r3) -/* 80BC9908 38 81 00 0C */ addi r4, r1, 0xc -/* 80BC990C 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80BC9910 38 C0 00 00 */ li r6, 0 -/* 80BC9914 C0 3B 00 44 */ lfs f1, 0x44(r27) -/* 80BC9918 FC 40 08 90 */ fmr f2, f1 -/* 80BC991C C0 7B 00 78 */ lfs f3, 0x78(r27) -/* 80BC9920 FC 80 18 90 */ fmr f4, f3 -/* 80BC9924 39 00 00 00 */ li r8, 0 -/* 80BC9928 4B 6E 20 5D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80BC992C: -/* 80BC992C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BC9930 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BC9934 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80BC9938 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BC993C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80BC9940 7C 05 07 74 */ extsb r5, r0 -/* 80BC9944 4B 46 BA 1D */ bl isSwitch__10dSv_info_cCFii -/* 80BC9948 2C 03 00 00 */ cmpwi r3, 0 -/* 80BC994C 40 82 02 64 */ bne lbl_80BC9BB0 -/* 80BC9950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BC9954 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BC9958 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80BC995C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80BC9960 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80BC9964 41 82 02 4C */ beq lbl_80BC9BB0 -/* 80BC9968 80 1A 05 84 */ lwz r0, 0x584(r26) -/* 80BC996C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80BC9970 40 82 00 10 */ bne lbl_80BC9980 -/* 80BC9974 80 1A 05 80 */ lwz r0, 0x580(r26) -/* 80BC9978 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80BC997C 41 82 02 34 */ beq lbl_80BC9BB0 -lbl_80BC9980: -/* 80BC9980 3B 00 00 00 */ li r24, 0 -/* 80BC9984 3A E0 00 00 */ li r23, 0 -/* 80BC9988 C3 9B 00 7C */ lfs f28, 0x7c(r27) -/* 80BC998C C3 BB 00 54 */ lfs f29, 0x54(r27) -/* 80BC9990 C3 DB 00 80 */ lfs f30, 0x80(r27) -/* 80BC9994 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC9998 3B 83 D4 70 */ addi r28, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC999C C3 FB 00 64 */ lfs f31, 0x64(r27) -/* 80BC99A0 7F 9D E3 78 */ mr r29, r28 -/* 80BC99A4 7F 9E E3 78 */ mr r30, r28 -/* 80BC99A8 C3 7B 00 6C */ lfs f27, 0x6c(r27) -lbl_80BC99AC: -/* 80BC99AC D3 81 00 34 */ stfs f28, 0x34(r1) -/* 80BC99B0 D3 A1 00 38 */ stfs f29, 0x38(r1) -/* 80BC99B4 D3 C1 00 3C */ stfs f30, 0x3c(r1) -/* 80BC99B8 D3 81 00 4C */ stfs f28, 0x4c(r1) -/* 80BC99BC D3 A1 00 50 */ stfs f29, 0x50(r1) -/* 80BC99C0 D3 C1 00 54 */ stfs f30, 0x54(r1) -/* 80BC99C4 D3 C1 00 28 */ stfs f30, 0x28(r1) -/* 80BC99C8 D3 A1 00 2C */ stfs f29, 0x2c(r1) -/* 80BC99CC D3 C1 00 30 */ stfs f30, 0x30(r1) -/* 80BC99D0 D3 C1 00 58 */ stfs f30, 0x58(r1) -/* 80BC99D4 D3 A1 00 5C */ stfs f29, 0x5c(r1) -/* 80BC99D8 D3 C1 00 60 */ stfs f30, 0x60(r1) -/* 80BC99DC 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BC99E0 4B 44 33 85 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BC99E4 7F 83 E3 78 */ mr r3, r28 -/* 80BC99E8 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80BC99EC 4B 44 2A 49 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BC99F0 3B 21 00 4C */ addi r25, r1, 0x4c -/* 80BC99F4 7F 39 BA 14 */ add r25, r25, r23 -/* 80BC99F8 7F 83 E3 78 */ mr r3, r28 -/* 80BC99FC 7F 24 CB 78 */ mr r4, r25 -/* 80BC9A00 7F 25 CB 78 */ mr r5, r25 -/* 80BC9A04 4B 77 D3 69 */ bl PSMTXMultVec -/* 80BC9A08 D3 A1 00 40 */ stfs f29, 0x40(r1) -/* 80BC9A0C D3 A1 00 44 */ stfs f29, 0x44(r1) -/* 80BC9A10 D3 E1 00 48 */ stfs f31, 0x48(r1) -/* 80BC9A14 38 7A 04 D0 */ addi r3, r26, 0x4d0 -/* 80BC9A18 4B 44 33 4D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BC9A1C 7F A3 EB 78 */ mr r3, r29 -/* 80BC9A20 A8 9A 04 E6 */ lha r4, 0x4e6(r26) -/* 80BC9A24 4B 44 2A 11 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BC9A28 7F C3 F3 78 */ mr r3, r30 -/* 80BC9A2C 38 81 00 40 */ addi r4, r1, 0x40 -/* 80BC9A30 7C 85 23 78 */ mr r5, r4 -/* 80BC9A34 4B 77 D3 39 */ bl PSMTXMultVec -/* 80BC9A38 C0 19 00 00 */ lfs f0, 0(r25) -/* 80BC9A3C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BC9A40 D3 A1 00 14 */ stfs f29, 0x14(r1) -/* 80BC9A44 C0 19 00 08 */ lfs f0, 8(r25) -/* 80BC9A48 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BC9A4C C0 01 00 40 */ lfs f0, 0x40(r1) -/* 80BC9A50 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80BC9A54 D3 A1 00 20 */ stfs f29, 0x20(r1) -/* 80BC9A58 C0 01 00 48 */ lfs f0, 0x48(r1) -/* 80BC9A5C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80BC9A60 38 61 00 10 */ addi r3, r1, 0x10 -/* 80BC9A64 38 81 00 1C */ addi r4, r1, 0x1c -/* 80BC9A68 4B 77 D9 35 */ bl PSVECSquareDistance -/* 80BC9A6C FC 01 E8 40 */ fcmpo cr0, f1, f29 -/* 80BC9A70 40 81 00 58 */ ble lbl_80BC9AC8 -/* 80BC9A74 FC 00 08 34 */ frsqrte f0, f1 -/* 80BC9A78 C8 9B 00 88 */ lfd f4, 0x88(r27) -/* 80BC9A7C FC 44 00 32 */ fmul f2, f4, f0 -/* 80BC9A80 C8 7B 00 90 */ lfd f3, 0x90(r27) -/* 80BC9A84 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BC9A88 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BC9A8C FC 03 00 28 */ fsub f0, f3, f0 -/* 80BC9A90 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BC9A94 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BC9A98 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BC9A9C FC 01 00 32 */ fmul f0, f1, f0 -/* 80BC9AA0 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BC9AA4 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BC9AA8 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BC9AAC FC 00 00 32 */ fmul f0, f0, f0 -/* 80BC9AB0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BC9AB4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BC9AB8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BC9ABC FC 21 00 32 */ fmul f1, f1, f0 -/* 80BC9AC0 FC 20 08 18 */ frsp f1, f1 -/* 80BC9AC4 48 00 00 88 */ b lbl_80BC9B4C -lbl_80BC9AC8: -/* 80BC9AC8 C8 1B 00 98 */ lfd f0, 0x98(r27) -/* 80BC9ACC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BC9AD0 40 80 00 10 */ bge lbl_80BC9AE0 -/* 80BC9AD4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BC9AD8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80BC9ADC 48 00 00 70 */ b lbl_80BC9B4C -lbl_80BC9AE0: -/* 80BC9AE0 D0 21 00 08 */ stfs f1, 8(r1) -/* 80BC9AE4 80 81 00 08 */ lwz r4, 8(r1) -/* 80BC9AE8 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80BC9AEC 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80BC9AF0 7C 03 00 00 */ cmpw r3, r0 -/* 80BC9AF4 41 82 00 14 */ beq lbl_80BC9B08 -/* 80BC9AF8 40 80 00 40 */ bge lbl_80BC9B38 -/* 80BC9AFC 2C 03 00 00 */ cmpwi r3, 0 -/* 80BC9B00 41 82 00 20 */ beq lbl_80BC9B20 -/* 80BC9B04 48 00 00 34 */ b lbl_80BC9B38 -lbl_80BC9B08: -/* 80BC9B08 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BC9B0C 41 82 00 0C */ beq lbl_80BC9B18 -/* 80BC9B10 38 00 00 01 */ li r0, 1 -/* 80BC9B14 48 00 00 28 */ b lbl_80BC9B3C -lbl_80BC9B18: -/* 80BC9B18 38 00 00 02 */ li r0, 2 -/* 80BC9B1C 48 00 00 20 */ b lbl_80BC9B3C -lbl_80BC9B20: -/* 80BC9B20 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BC9B24 41 82 00 0C */ beq lbl_80BC9B30 -/* 80BC9B28 38 00 00 05 */ li r0, 5 -/* 80BC9B2C 48 00 00 10 */ b lbl_80BC9B3C -lbl_80BC9B30: -/* 80BC9B30 38 00 00 03 */ li r0, 3 -/* 80BC9B34 48 00 00 08 */ b lbl_80BC9B3C -lbl_80BC9B38: -/* 80BC9B38 38 00 00 04 */ li r0, 4 -lbl_80BC9B3C: -/* 80BC9B3C 2C 00 00 01 */ cmpwi r0, 1 -/* 80BC9B40 40 82 00 0C */ bne lbl_80BC9B4C -/* 80BC9B44 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BC9B48 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80BC9B4C: -/* 80BC9B4C FC 01 D8 40 */ fcmpo cr0, f1, f27 -/* 80BC9B50 40 80 00 50 */ bge lbl_80BC9BA0 -/* 80BC9B54 C0 41 00 44 */ lfs f2, 0x44(r1) -/* 80BC9B58 C0 3B 00 A0 */ lfs f1, 0xa0(r27) -/* 80BC9B5C C0 19 00 04 */ lfs f0, 4(r25) -/* 80BC9B60 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BC9B64 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80BC9B68 40 80 00 38 */ bge lbl_80BC9BA0 -/* 80BC9B6C 38 00 00 05 */ li r0, 5 -/* 80BC9B70 98 1F 0A 91 */ stb r0, 0xa91(r31) -/* 80BC9B74 38 00 00 01 */ li r0, 1 -/* 80BC9B78 98 1F 0A 90 */ stb r0, 0xa90(r31) -/* 80BC9B7C C0 1B 00 54 */ lfs f0, 0x54(r27) -/* 80BC9B80 D0 1F 0A A0 */ stfs f0, 0xaa0(r31) -/* 80BC9B84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BC9B88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BC9B8C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80BC9B90 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BC9B94 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80BC9B98 7C 05 07 74 */ extsb r5, r0 -/* 80BC9B9C 4B 46 B6 65 */ bl onSwitch__10dSv_info_cFii -lbl_80BC9BA0: -/* 80BC9BA0 3B 18 00 01 */ addi r24, r24, 1 -/* 80BC9BA4 2C 18 00 02 */ cmpwi r24, 2 -/* 80BC9BA8 3A F7 00 0C */ addi r23, r23, 0xc -/* 80BC9BAC 41 80 FE 00 */ blt lbl_80BC99AC -lbl_80BC9BB0: -/* 80BC9BB0 E3 E1 00 E8 */ psq_l f31, 232(r1), 0, 0 /* qr0 */ -/* 80BC9BB4 CB E1 00 E0 */ lfd f31, 0xe0(r1) -/* 80BC9BB8 E3 C1 00 D8 */ psq_l f30, 216(r1), 0, 0 /* qr0 */ -/* 80BC9BBC CB C1 00 D0 */ lfd f30, 0xd0(r1) -/* 80BC9BC0 E3 A1 00 C8 */ psq_l f29, 200(r1), 0, 0 /* qr0 */ -/* 80BC9BC4 CB A1 00 C0 */ lfd f29, 0xc0(r1) -/* 80BC9BC8 E3 81 00 B8 */ psq_l f28, 184(r1), 0, 0 /* qr0 */ -/* 80BC9BCC CB 81 00 B0 */ lfd f28, 0xb0(r1) -/* 80BC9BD0 E3 61 00 A8 */ psq_l f27, 168(r1), 0, 0 /* qr0 */ -/* 80BC9BD4 CB 61 00 A0 */ lfd f27, 0xa0(r1) -/* 80BC9BD8 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80BC9BDC 4B 79 86 35 */ bl _restgpr_23 -/* 80BC9BE0 80 01 00 F4 */ lwz r0, 0xf4(r1) -/* 80BC9BE4 7C 08 03 A6 */ mtlr r0 -/* 80BC9BE8 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80BC9BEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/action__12daObjChest_cFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/action__12daObjChest_cFv.s deleted file mode 100644 index 5afb3ac608..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/action__12daObjChest_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80BC9764: -/* 80BC9764 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9768 7C 08 02 A6 */ mflr r0 -/* 80BC976C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9770 3C 80 80 BD */ lis r4, cNullVec__6Z2Calc@ha /* 0x80BCA0B8@ha */ -/* 80BC9774 38 E4 A0 B8 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80BCA0B8@l */ -/* 80BC9778 3C 80 80 BD */ lis r4, data_80BCA200@ha /* 0x80BCA200@ha */ -/* 80BC977C 38 C4 A2 00 */ addi r6, r4, data_80BCA200@l /* 0x80BCA200@l */ -/* 80BC9780 88 06 00 00 */ lbz r0, 0(r6) -/* 80BC9784 7C 00 07 75 */ extsb. r0, r0 -/* 80BC9788 40 82 00 58 */ bne lbl_80BC97E0 -/* 80BC978C 80 87 00 24 */ lwz r4, 0x24(r7) -/* 80BC9790 80 07 00 28 */ lwz r0, 0x28(r7) -/* 80BC9794 90 87 00 48 */ stw r4, 0x48(r7) -/* 80BC9798 90 07 00 4C */ stw r0, 0x4c(r7) -/* 80BC979C 80 07 00 2C */ lwz r0, 0x2c(r7) -/* 80BC97A0 90 07 00 50 */ stw r0, 0x50(r7) -/* 80BC97A4 38 A7 00 48 */ addi r5, r7, 0x48 -/* 80BC97A8 80 87 00 30 */ lwz r4, 0x30(r7) -/* 80BC97AC 80 07 00 34 */ lwz r0, 0x34(r7) -/* 80BC97B0 90 85 00 0C */ stw r4, 0xc(r5) -/* 80BC97B4 90 05 00 10 */ stw r0, 0x10(r5) -/* 80BC97B8 80 07 00 38 */ lwz r0, 0x38(r7) -/* 80BC97BC 90 05 00 14 */ stw r0, 0x14(r5) -/* 80BC97C0 80 87 00 3C */ lwz r4, 0x3c(r7) -/* 80BC97C4 80 07 00 40 */ lwz r0, 0x40(r7) -/* 80BC97C8 90 85 00 18 */ stw r4, 0x18(r5) -/* 80BC97CC 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80BC97D0 80 07 00 44 */ lwz r0, 0x44(r7) -/* 80BC97D4 90 05 00 20 */ stw r0, 0x20(r5) -/* 80BC97D8 38 00 00 01 */ li r0, 1 -/* 80BC97DC 98 06 00 00 */ stb r0, 0(r6) -lbl_80BC97E0: -/* 80BC97E0 88 03 0A 90 */ lbz r0, 0xa90(r3) -/* 80BC97E4 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80BC97E8 39 87 00 48 */ addi r12, r7, 0x48 -/* 80BC97EC 7D 8C 02 14 */ add r12, r12, r0 -/* 80BC97F0 4B 79 88 95 */ bl __ptmf_scall -/* 80BC97F4 60 00 00 00 */ nop -/* 80BC97F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC97FC 7C 08 03 A6 */ mtlr r0 -/* 80BC9800 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9804 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 1facc6f99c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BC9F44: -/* 80BC9F44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9F48 7C 08 02 A6 */ mflr r0 -/* 80BC9F4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9F50 4B FF F3 61 */ bl create__12daObjChest_cFv -/* 80BC9F54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9F58 7C 08 03 A6 */ mtlr r0 -/* 80BC9F5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9F60 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Delete__FP12daObjChest_c.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Delete__FP12daObjChest_c.s deleted file mode 100644 index c2948b0047..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Delete__FP12daObjChest_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BC9F24: -/* 80BC9F24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9F28 7C 08 02 A6 */ mflr r0 -/* 80BC9F2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9F30 4B 4A E9 AD */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80BC9F34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9F38 7C 08 03 A6 */ mtlr r0 -/* 80BC9F3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9F40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Draw__FP12daObjChest_c.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Draw__FP12daObjChest_c.s deleted file mode 100644 index 5c59645942..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Draw__FP12daObjChest_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80BC9ED8: -/* 80BC9ED8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9EDC 7C 08 02 A6 */ mflr r0 -/* 80BC9EE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9EE4 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80BC9EE8 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80BC9EEC 7D 89 03 A6 */ mtctr r12 -/* 80BC9EF0 4E 80 04 21 */ bctrl -/* 80BC9EF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9EF8 7C 08 03 A6 */ mtlr r0 -/* 80BC9EFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9F00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Execute__FP12daObjChest_c.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Execute__FP12daObjChest_c.s deleted file mode 100644 index 662b31444c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Execute__FP12daObjChest_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BC9F04: -/* 80BC9F04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC9F08 7C 08 02 A6 */ mflr r0 -/* 80BC9F0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC9F10 4B 4A EA 41 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80BC9F14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC9F18 7C 08 03 A6 */ mtlr r0 -/* 80BC9F1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC9F20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC92B0.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC92B0.s deleted file mode 100644 index 51f7965f13..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC92B0.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_80BC92B0: -/* 80BC92B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BC92B4 7C 08 02 A6 */ mflr r0 -/* 80BC92B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BC92BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BC92C0 4B 79 8F 1D */ bl _savegpr_29 -/* 80BC92C4 7C 7F 1B 78 */ mr r31, r3 -/* 80BC92C8 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BC92CC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BC92D0 40 82 00 AC */ bne lbl_80BC937C -/* 80BC92D4 7F E0 FB 79 */ or. r0, r31, r31 -/* 80BC92D8 41 82 00 98 */ beq lbl_80BC9370 -/* 80BC92DC 7C 1E 03 78 */ mr r30, r0 -/* 80BC92E0 4B 4A F3 45 */ bl __ct__16dBgS_MoveBgActorFv -/* 80BC92E4 3C 60 80 BD */ lis r3, __vt__12daObjChest_c@ha /* 0x80BCA1D4@ha */ -/* 80BC92E8 38 03 A1 D4 */ addi r0, r3, __vt__12daObjChest_c@l /* 0x80BCA1D4@l */ -/* 80BC92EC 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80BC92F0 3B BE 05 AC */ addi r29, r30, 0x5ac -/* 80BC92F4 7F A3 EB 78 */ mr r3, r29 -/* 80BC92F8 4B 4A CD A9 */ bl __ct__9dBgS_AcchFv -/* 80BC92FC 3C 60 80 BD */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80BCA1B0@ha */ -/* 80BC9300 38 63 A1 B0 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80BCA1B0@l */ -/* 80BC9304 90 7D 00 10 */ stw r3, 0x10(r29) -/* 80BC9308 38 03 00 0C */ addi r0, r3, 0xc -/* 80BC930C 90 1D 00 14 */ stw r0, 0x14(r29) -/* 80BC9310 38 03 00 18 */ addi r0, r3, 0x18 -/* 80BC9314 90 1D 00 24 */ stw r0, 0x24(r29) -/* 80BC9318 38 7D 00 14 */ addi r3, r29, 0x14 -/* 80BC931C 4B 4A FB 4D */ bl SetObj__16dBgS_PolyPassChkFv -/* 80BC9320 38 7E 07 84 */ addi r3, r30, 0x784 -/* 80BC9324 4B 4A CB 89 */ bl __ct__12dBgS_AcchCirFv -/* 80BC9328 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80BC932C 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80BC9330 90 1E 07 DC */ stw r0, 0x7dc(r30) -/* 80BC9334 38 7E 07 E0 */ addi r3, r30, 0x7e0 -/* 80BC9338 4B 4B A4 29 */ bl __ct__10dCcD_GSttsFv -/* 80BC933C 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80BC9340 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80BC9344 90 7E 07 DC */ stw r3, 0x7dc(r30) -/* 80BC9348 38 03 00 20 */ addi r0, r3, 0x20 -/* 80BC934C 90 1E 07 E0 */ stw r0, 0x7e0(r30) -/* 80BC9350 38 7E 08 00 */ addi r3, r30, 0x800 -/* 80BC9354 3C 80 80 BD */ lis r4, __ct__8dCcD_CylFv@ha /* 0x80BC94BC@ha */ -/* 80BC9358 38 84 94 BC */ addi r4, r4, __ct__8dCcD_CylFv@l /* 0x80BC94BC@l */ -/* 80BC935C 3C A0 80 BD */ lis r5, __dt__8dCcD_CylFv@ha /* 0x80BC93F0@ha */ -/* 80BC9360 38 A5 93 F0 */ addi r5, r5, __dt__8dCcD_CylFv@l /* 0x80BC93F0@l */ -/* 80BC9364 38 C0 01 3C */ li r6, 0x13c -/* 80BC9368 38 E0 00 02 */ li r7, 2 -/* 80BC936C 4B 79 89 F5 */ bl __construct_array -lbl_80BC9370: -/* 80BC9370 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80BC9374 60 00 00 08 */ ori r0, r0, 8 -/* 80BC9378 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80BC937C: -/* 80BC937C 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80BC9380 3C 80 80 BD */ lis r4, l_arcName@ha /* 0x80BCA0D8@ha */ -/* 80BC9384 38 84 A0 D8 */ addi r4, r4, l_arcName@l /* 0x80BCA0D8@l */ -/* 80BC9388 80 84 00 00 */ lwz r4, 0(r4) -/* 80BC938C 4B 46 3B 31 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80BC9390 7C 60 1B 78 */ mr r0, r3 -/* 80BC9394 2C 00 00 04 */ cmpwi r0, 4 -/* 80BC9398 40 82 00 3C */ bne lbl_80BC93D4 -/* 80BC939C 7F E3 FB 78 */ mr r3, r31 -/* 80BC93A0 3C 80 80 BD */ lis r4, l_arcName@ha /* 0x80BCA0D8@ha */ -/* 80BC93A4 38 84 A0 D8 */ addi r4, r4, l_arcName@l /* 0x80BCA0D8@l */ -/* 80BC93A8 80 84 00 00 */ lwz r4, 0(r4) -/* 80BC93AC 38 A0 00 07 */ li r5, 7 -/* 80BC93B0 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80BC93B4 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80BC93B8 38 E0 0C 00 */ li r7, 0xc00 -/* 80BC93BC 39 00 00 00 */ li r8, 0 -/* 80BC93C0 4B 4A F3 FD */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80BC93C4 7C 60 1B 78 */ mr r0, r3 -/* 80BC93C8 2C 00 00 05 */ cmpwi r0, 5 -/* 80BC93CC 40 82 00 08 */ bne lbl_80BC93D4 -/* 80BC93D0 48 00 00 08 */ b lbl_80BC93D8 -lbl_80BC93D4: -/* 80BC93D4 7C 03 03 78 */ mr r3, r0 -lbl_80BC93D8: -/* 80BC93D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BC93DC 4B 79 8E 4D */ bl _restgpr_29 -/* 80BC93E0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BC93E4 7C 08 03 A6 */ mtlr r0 -/* 80BC93E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BC93EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FAC.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FAC.s deleted file mode 100644 index 6c36dec733..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FAC.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BC9FAC: -/* 80BC9FAC 88 83 00 00 */ lbz r4, 0(r3) -/* 80BC9FB0 28 04 00 00 */ cmplwi r4, 0 -/* 80BC9FB4 41 82 00 0C */ beq lbl_80BC9FC0 -/* 80BC9FB8 38 04 FF FF */ addi r0, r4, -1 -/* 80BC9FBC 98 03 00 00 */ stb r0, 0(r3) -lbl_80BC9FC0: -/* 80BC9FC0 88 63 00 00 */ lbz r3, 0(r3) -/* 80BC9FC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FC8.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FC8.s deleted file mode 100644 index ce3b63144c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FC8.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BC9FC8: -/* 80BC9FC8 A0 83 00 00 */ lhz r4, 0(r3) -/* 80BC9FCC 28 04 00 00 */ cmplwi r4, 0 -/* 80BC9FD0 41 82 00 0C */ beq lbl_80BC9FDC -/* 80BC9FD4 38 04 FF FF */ addi r0, r4, -1 -/* 80BC9FD8 B0 03 00 00 */ sth r0, 0(r3) -lbl_80BC9FDC: -/* 80BC9FDC A0 63 00 00 */ lhz r3, 0(r3) -/* 80BC9FE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FE4.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FE4.s deleted file mode 100644 index 6eadba1c5d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FE4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BC9FE4: -/* 80BC9FE4 38 63 FF DC */ addi r3, r3, -36 -/* 80BC9FE8 4B FF F6 B4 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FEC.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FEC.s deleted file mode 100644 index a0f00e6fdb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FEC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BC9FEC: -/* 80BC9FEC 38 63 FF EC */ addi r3, r3, -20 -/* 80BC9FF0 4B FF F6 AC */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/initBaseMtx__12daObjChest_cFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/initBaseMtx__12daObjChest_cFv.s deleted file mode 100644 index fc132aaba3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/initBaseMtx__12daObjChest_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80BC8EF8: -/* 80BC8EF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BC8EFC 7C 08 02 A6 */ mflr r0 -/* 80BC8F00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC8F04 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80BC8F08 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80BC8F0C D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80BC8F10 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80BC8F14 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80BC8F18 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80BC8F1C D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80BC8F20 48 00 00 15 */ bl setBaseMtx__12daObjChest_cFv -/* 80BC8F24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BC8F28 7C 08 03 A6 */ mtlr r0 -/* 80BC8F2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BC8F30 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/setBaseMtx__12daObjChest_cFv.s b/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/setBaseMtx__12daObjChest_cFv.s deleted file mode 100644 index 53cbac4c59..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/setBaseMtx__12daObjChest_cFv.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_80BC8F34: -/* 80BC8F34 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80BC8F38 7C 08 02 A6 */ mflr r0 -/* 80BC8F3C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80BC8F40 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80BC8F44 7C 7F 1B 78 */ mr r31, r3 -/* 80BC8F48 A8 63 0A 9A */ lha r3, 0xa9a(r3) -/* 80BC8F4C 38 03 FF 74 */ addi r0, r3, -140 -/* 80BC8F50 B0 1F 0A 9A */ sth r0, 0xa9a(r31) -/* 80BC8F54 A8 7F 0A 98 */ lha r3, 0xa98(r31) -/* 80BC8F58 A8 1F 0A 9A */ lha r0, 0xa9a(r31) -/* 80BC8F5C 7C 03 02 14 */ add r0, r3, r0 -/* 80BC8F60 B0 1F 0A 98 */ sth r0, 0xa98(r31) -/* 80BC8F64 A8 1F 0A 98 */ lha r0, 0xa98(r31) -/* 80BC8F68 2C 00 00 00 */ cmpwi r0, 0 -/* 80BC8F6C 40 80 00 4C */ bge lbl_80BC8FB8 -/* 80BC8F70 38 00 00 00 */ li r0, 0 -/* 80BC8F74 B0 1F 0A 98 */ sth r0, 0xa98(r31) -/* 80BC8F78 A8 1F 0A 9A */ lha r0, 0xa9a(r31) -/* 80BC8F7C 3C 60 80 BD */ lis r3, lit_3681@ha /* 0x80BCA044@ha */ -/* 80BC8F80 C8 23 A0 44 */ lfd f1, lit_3681@l(r3) /* 0x80BCA044@l */ -/* 80BC8F84 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BC8F88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BC8F8C 3C 00 43 30 */ lis r0, 0x4330 -/* 80BC8F90 90 01 00 10 */ stw r0, 0x10(r1) -/* 80BC8F94 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80BC8F98 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80BC8F9C C0 1F 0A 9C */ lfs f0, 0xa9c(r31) -/* 80BC8FA0 FC 00 00 50 */ fneg f0, f0 -/* 80BC8FA4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BC8FA8 FC 00 00 1E */ fctiwz f0, f0 -/* 80BC8FAC D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80BC8FB0 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80BC8FB4 B0 1F 0A 9A */ sth r0, 0xa9a(r31) -lbl_80BC8FB8: -/* 80BC8FB8 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BC8FBC 4B 44 3D A9 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BC8FC0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC8FC4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC8FC8 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80BC8FCC 4B 44 34 69 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BC8FD0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC8FD4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC8FD8 A8 9F 0A 84 */ lha r4, 0xa84(r31) -/* 80BC8FDC A8 1F 0A 98 */ lha r0, 0xa98(r31) -/* 80BC8FE0 7C 04 02 14 */ add r0, r4, r0 -/* 80BC8FE4 7C 04 07 34 */ extsh r4, r0 -/* 80BC8FE8 A8 BF 0A 86 */ lha r5, 0xa86(r31) -/* 80BC8FEC A8 DF 0A 88 */ lha r6, 0xa88(r31) -/* 80BC8FF0 4B 44 32 B1 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80BC8FF4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC8FF8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC8FFC 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80BC9000 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BC9004 4B 77 D4 AD */ bl PSMTXCopy -/* 80BC9008 A8 7F 0A 84 */ lha r3, 0xa84(r31) -/* 80BC900C 7C 60 07 35 */ extsh. r0, r3 -/* 80BC9010 41 82 00 54 */ beq lbl_80BC9064 -/* 80BC9014 B0 61 00 08 */ sth r3, 8(r1) -/* 80BC9018 A8 1F 0A 86 */ lha r0, 0xa86(r31) -/* 80BC901C B0 01 00 0A */ sth r0, 0xa(r1) -/* 80BC9020 A8 1F 0A 88 */ lha r0, 0xa88(r31) -/* 80BC9024 B0 01 00 0C */ sth r0, 0xc(r1) -/* 80BC9028 38 00 40 00 */ li r0, 0x4000 -/* 80BC902C B0 01 00 08 */ sth r0, 8(r1) -/* 80BC9030 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BC9034 4B 44 3D 31 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BC9038 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC903C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC9040 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80BC9044 4B 44 33 F1 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BC9048 38 61 00 08 */ addi r3, r1, 8 -/* 80BC904C 4B 44 3E F9 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80BC9050 3C 60 80 BD */ lis r3, lit_3679@ha /* 0x80BCA040@ha */ -/* 80BC9054 C0 23 A0 40 */ lfs f1, lit_3679@l(r3) /* 0x80BCA040@l */ -/* 80BC9058 C0 5F 0A A0 */ lfs f2, 0xaa0(r31) -/* 80BC905C FC 60 08 90 */ fmr f3, f1 -/* 80BC9060 4B 44 3D D9 */ bl scaleM__14mDoMtx_stack_cFfff -lbl_80BC9064: -/* 80BC9064 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BC9068 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BC906C 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80BC9070 4B 77 D4 41 */ bl PSMTXCopy -/* 80BC9074 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80BC9078 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BC907C 7C 08 03 A6 */ mtlr r0 -/* 80BC9080 38 21 00 30 */ addi r1, r1, 0x30 -/* 80BC9084 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h b/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h index 2e89c8aac8..e15e29b67a 100644 --- a/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h +++ b/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h @@ -1,5 +1,53 @@ #ifndef D_A_OBJ_CHEST_H #define D_A_OBJ_CHEST_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 daObjChest_c : public dBgS_MoveBgActor { +public: + enum daObjChest_Action { + /* 0 */ ACTION_WAIT, + /* 1 */ ACTION_MOVE, + /* 2 */ ACTION_END, + }; + + /* 80BC8EF8 */ void initBaseMtx(); + /* 80BC8F34 */ void setBaseMtx(); + /* 80BC9088 */ int Create(); + /* 80BC9240 */ int CreateHeap(); + /* 80BC92B0 */ int create(); + /* 80BC970C */ int Execute(Mtx**); + /* 80BC9764 */ void action(); + /* 80BC9808 */ void actionWait(); + /* 80BC9BF0 */ void actionMove(); + /* 80BC9DFC */ void actionEnd(); + /* 80BC9E00 */ int Draw(); + /* 80BC9EA4 */ int Delete(); + + void setAction(u8 i_action) { mAction = i_action; } + u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } + u32 getArg0() { return fopAcM_GetParamBit(this, 8, 4); } + + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ dBgS_ObjAcch mObjAcch; + /* 0x784 */ dBgS_AcchCir mAcchCir; + /* 0x7C4 */ dCcD_Stts mStts; + /* 0x800 */ dCcD_Cyl mCyl[2]; + /* 0xA78 */ cXyz mFallingChestPos; + /* 0xA84 */ csXyz mFallingChestRot; + /* 0xA8A */ csXyz mExtraRot; + /* 0xA90 */ u8 mAction; + /* 0xA91 */ u8 mMoveStartTimer; + /* 0xA92 */ u16 mRandomMoveStartTimer; + /* 0xA94 */ s32 mLifeCycleLength; // this only gets incremented in the execute function + /* 0xA98 */ s16 mModifyRotX; + /* 0xA9A */ s16 mRandomRotX; + /* 0xA9C */ f32 field_0xa9c; + /* 0xAA0 */ f32 mScaleY; +}; // Size: 0xAA4 #endif /* D_A_OBJ_CHEST_H */ diff --git a/rel/d/a/obj/d_a_obj_chest/Makefile b/rel/d/a/obj/d_a_obj_chest/Makefile index 5f90b81588..35a767085c 100644 --- a/rel/d/a/obj/d_a_obj_chest/Makefile +++ b/rel/d/a/obj/d_a_obj_chest/Makefile @@ -8,12 +8,10 @@ M422_MAP := $(BUILD_DIR)/rel/d/a/obj/d_a_obj_chest.map M422_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.cpp \ rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp \ M422_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.o \ M422_LIBS := \ diff --git a/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp b/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp index 0287b66a8e..c487f667eb 100644 --- a/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp +++ b/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp @@ -1,342 +1,108 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_chest -// +/** + * @file d_a_obj_chest.cpp + * @brief Object - Chest + * + */ #include "rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h" -#include "d/cc/d_cc_d.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/bg/d_bg_s.h" +#include "d/bg/d_bg_w.h" +#include "d/d_procname.h" #include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 8026745C */ void operator+=(csXyz&); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daObjChest_c { - /* 80BC8EF8 */ void initBaseMtx(); - /* 80BC8F34 */ void setBaseMtx(); - /* 80BC9088 */ void Create(); - /* 80BC9240 */ void CreateHeap(); - /* 80BC92B0 */ void create(); - /* 80BC970C */ void Execute(f32 (**)[3][4]); - /* 80BC9764 */ void action(); - /* 80BC9808 */ void actionWait(); - /* 80BC9BF0 */ void actionMove(); - /* 80BC9DFC */ void actionEnd(); - /* 80BC9E00 */ void Draw(); - /* 80BC9EA4 */ void Delete(); -}; - -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 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 dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BC969C */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~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_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80BC962C */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void initBaseMtx__12daObjChest_cFv(); -extern "C" void setBaseMtx__12daObjChest_cFv(); -extern "C" void Create__12daObjChest_cFv(); -extern "C" void CreateHeap__12daObjChest_cFv(); -extern "C" void create__12daObjChest_cFv(); -extern "C" void __dt__8dCcD_CylFv(); -extern "C" void __ct__8dCcD_CylFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void Execute__12daObjChest_cFPPA3_A4_f(); -extern "C" void action__12daObjChest_cFv(); -extern "C" void actionWait__12daObjChest_cFv(); -extern "C" void actionMove__12daObjChest_cFv(); -extern "C" void actionEnd__12daObjChest_cFv(); -extern "C" void Draw__12daObjChest_cFv(); -extern "C" void Delete__12daObjChest_cFv(); -extern "C" static void daObjChest_Draw__FP12daObjChest_c(); -extern "C" static void daObjChest_Execute__FP12daObjChest_c(); -extern "C" static void daObjChest_Delete__FP12daObjChest_c(); -extern "C" static void daObjChest_Create__FP10fopAc_ac_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80BC9FAC(void* _this, u8*); -extern "C" void func_80BC9FC8(void* _this, u16*); -extern "C" static void func_80BC9FE4(); -extern "C" static void func_80BC9FEC(); -extern "C" extern char const* const d_a_obj_chest__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __apl__5csXyzFR5csXyz(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__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" f32 mGroundY__11fopAcM_gc_c; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80BCA200[4]; - -// -// Declarations: -// +#include "rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h" /* 80BC8EF8-80BC8F34 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__12daObjChest_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/initBaseMtx__12daObjChest_cFv.s" +void daObjChest_c::initBaseMtx() { + mpModel->setBaseScale(scale); + setBaseMtx(); } -#pragma pop -/* ############################################################################################## */ /* 80BC9FFC-80BCA040 000000 0044+00 3/3 0/0 0/0 .rodata l_cyl_src */ const static dCcD_SrcCyl l_cyl_src = { { - {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x0}, 0x19}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf + {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x0}, 0x19}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 260.0f // mHeight - } // mCyl -}; - -/* 80BCA040-80BCA044 000044 0004+00 1/4 0/0 0/0 .rodata @3679 */ -SECTION_RODATA static f32 const lit_3679 = 1.0f; -COMPILER_STRIP_GATE(0x80BCA040, &lit_3679); - -/* 80BCA044-80BCA04C 000048 0008+00 1/2 0/0 0/0 .rodata @3681 */ -SECTION_RODATA static u8 const lit_3681[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 260.0f // mHeight + } // mCyl }; -COMPILER_STRIP_GATE(0x80BCA044, &lit_3681); /* 80BC8F34-80BC9088 0000B4 0154+00 2/2 0/0 0/0 .text setBaseMtx__12daObjChest_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/setBaseMtx__12daObjChest_cFv.s" +void daObjChest_c::setBaseMtx() { + mRandomRotX -= 0x8C; + mModifyRotX += mRandomRotX; + if (mModifyRotX < 0) { + mModifyRotX = 0; + mRandomRotX *= -field_0xa9c; + } + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + mDoMtx_stack_c::ZXYrotM(mFallingChestRot.x + mModifyRotX, mFallingChestRot.y, + mFallingChestRot.z); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + if ((s16)mFallingChestRot.x != 0) { + csXyz rotation; + rotation = mFallingChestRot; + rotation.x = 0x4000; + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + mDoMtx_stack_c::ZXYrotM(rotation); + mDoMtx_stack_c::scaleM(1.0f, mScaleY, 1.0f); + } + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -#pragma pop - -/* ############################################################################################## */ -/* 80BCA04C-80BCA050 000050 0004+00 0/1 0/0 0/0 .rodata @3730 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3730 = 5.0f; -COMPILER_STRIP_GATE(0x80BCA04C, &lit_3730); -#pragma pop - -/* 80BCA050-80BCA054 000054 0004+00 0/3 0/0 0/0 .rodata @3731 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3731[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BCA050, &lit_3731); -#pragma pop - -/* 80BCA054-80BCA058 000058 0004+00 0/2 0/0 0/0 .rodata @3732 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3732 = 150.0f; -COMPILER_STRIP_GATE(0x80BCA054, &lit_3732); -#pragma pop - -/* 80BCA058-80BCA05C 00005C 0004+00 0/1 0/0 0/0 .rodata @3733 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3733 = 30.0f; -COMPILER_STRIP_GATE(0x80BCA058, &lit_3733); -#pragma pop /* 80BC9088-80BC9240 000208 01B8+00 1/0 0/0 0/0 .text Create__12daObjChest_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Create__12daObjChest_cFv.s" +int daObjChest_c::Create() { + u8 switch_no = getSwNo(); + if (fopAcM_isSwitch(this, switch_no)) { + mFallingChestRot.x = 0x4000; + cXyz transform(current.pos); + transform.y += 5.0f; + mFallingChestPos.set(0.0f, 150.0f, 0.0f); + mDoMtx_stack_c::transS(transform); + mDoMtx_stack_c::YrotM(current.angle.y); + mDoMtx_stack_c::XrotM(mFallingChestRot.x); + mDoMtx_stack_c::multVec(&mFallingChestPos, &mFallingChestPos); + if (fopAcM_gc_c::gndCheck(&mFallingChestPos)) { + current.pos.y = fopAcM_gc_c::getGroundY(); + } + mScaleY = 1.0f; + setAction(ACTION_END); + } else { + setAction(ACTION_WAIT); + } + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + mAcchCir.SetWall(30.0f, 30.0f); + mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), NULL, NULL); + mStts.Init(0xff, 0xff, this); + for (int i = 0; i < 2; i++) { + mCyl[i].Set(l_cyl_src); + mCyl[i].SetStts(&mStts); + } + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BCA0B0-80BCA0B0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BCA0B0 = "H_Tansu"; -#pragma pop /* 80BCA0B8-80BCA0C4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80BCA0C4-80BCA0D8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -347,399 +113,127 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80BCA0D8-80BCA0DC -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_chest__stringBase0; +static char* l_arcName = "H_Tansu"; /* 80BC9240-80BC92B0 0003C0 0070+00 1/0 0/0 0/0 .text CreateHeap__12daObjChest_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/CreateHeap__12daObjChest_cFv.s" +int daObjChest_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel != NULL) { + return 1; + } + return 0; } -#pragma pop - -/* ############################################################################################## */ -/* 80BCA0DC-80BCA0E8 -00001 000C+00 0/1 0/0 0/0 .data @3876 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3876[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__12daObjChest_cFv, -}; -#pragma pop - -/* 80BCA0E8-80BCA0F4 -00001 000C+00 0/1 0/0 0/0 .data @3877 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3877[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionMove__12daObjChest_cFv, -}; -#pragma pop - -/* 80BCA0F4-80BCA100 -00001 000C+00 0/1 0/0 0/0 .data @3878 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3878[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEnd__12daObjChest_cFv, -}; -#pragma pop - -/* 80BCA100-80BCA124 000048 0024+00 0/1 0/0 0/0 .data l_func$3875 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[36] = { - 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 - -/* 80BCA124-80BCA144 -00001 0020+00 1/0 0/0 0/0 .data l_daObjChest_Method */ -SECTION_DATA static void* l_daObjChest_Method[8] = { - (void*)daObjChest_Create__FP10fopAc_ac_c, - (void*)daObjChest_Delete__FP12daObjChest_c, - (void*)daObjChest_Execute__FP12daObjChest_c, - (void*)NULL, - (void*)daObjChest_Draw__FP12daObjChest_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80BCA144-80BCA174 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Chest */ -SECTION_DATA extern void* g_profile_Obj_Chest[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00830000, (void*)&g_fpcLf_Method, - (void*)0x00000AA4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x025B0000, (void*)&l_daObjChest_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80BCA174-80BCA180 0000BC 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80BCA180-80BCA18C 0000C8 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, -}; - -/* 80BCA18C-80BCA198 0000D4 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, -}; - -/* 80BCA198-80BCA1A4 0000E0 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80BCA1A4-80BCA1B0 0000EC 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80BCA1B0-80BCA1D4 0000F8 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80BC9FEC, - (void*)NULL, - (void*)NULL, - (void*)func_80BC9FE4, -}; - -/* 80BCA1D4-80BCA1FC 00011C 0028+00 1/1 0/0 0/0 .data __vt__12daObjChest_c */ -SECTION_DATA extern void* __vt__12daObjChest_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daObjChest_cFv, - (void*)Create__12daObjChest_cFv, - (void*)Execute__12daObjChest_cFPPA3_A4_f, - (void*)Draw__12daObjChest_cFv, - (void*)Delete__12daObjChest_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 80BC92B0-80BC93F0 000430 0140+00 1/1 0/0 0/0 .text create__12daObjChest_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC92B0.s" -} -#pragma pop - -/* 80BC93F0-80BC94BC 000570 00CC+00 1/1 0/0 0/0 .text __dt__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Cyl::~dCcD_Cyl() { -extern "C" asm void __dt__8dCcD_CylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8dCcD_CylFv.s" +int daObjChest_c::create() { + fopAcM_SetupActor(this, daObjChest_c); + + int phase = dComIfG_resLoad(&mPhaseReq, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + phase = MoveBGCreate(l_arcName, 7, dBgS_MoveBGProc_TypicalRotY, 0xc00, NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + return phase; } -#pragma pop - -/* 80BC94BC-80BC9540 00063C 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Cyl::dCcD_Cyl() { -extern "C" asm void __ct__8dCcD_CylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__ct__8dCcD_CylFv.s" -} -#pragma pop - -/* 80BC9540-80BC9588 0006C0 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80BC9588-80BC95D0 000708 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80BC95D0-80BC962C 000750 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80BC962C-80BC969C 0007AC 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 80BC969C-80BC970C 00081C 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop /* 80BC970C-80BC9764 00088C 0058+00 1/0 0/0 0/0 .text Execute__12daObjChest_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Execute__12daObjChest_cFPPA3_A4_f.s" +int daObjChest_c::Execute(Mtx** i_mtx) { + mLifeCycleLength++; + action(); + *i_mtx = &mBgMtx; + setBaseMtx(); + return 1; } -#pragma pop /* 80BC9764-80BC9808 0008E4 00A4+00 1/1 0/0 0/0 .text action__12daObjChest_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::action() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/action__12daObjChest_cFv.s" +void daObjChest_c::action() { + typedef void (daObjChest_c::*actionFunc)(); + static actionFunc l_func[3] = { + &daObjChest_c::actionWait, + &daObjChest_c::actionMove, + &daObjChest_c::actionEnd, + }; + + (this->*l_func[mAction])(); } -#pragma pop - -/* ############################################################################################## */ -/* 80BCA05C-80BCA060 000060 0004+00 0/1 0/0 0/0 .rodata @4015 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4015 = 70.0f; -COMPILER_STRIP_GATE(0x80BCA05C, &lit_4015); -#pragma pop - -/* 80BCA060-80BCA064 000064 0004+00 0/1 0/0 0/0 .rodata @4016 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4016 = 90.0f; -COMPILER_STRIP_GATE(0x80BCA060, &lit_4016); -#pragma pop - -/* 80BCA064-80BCA068 000068 0004+00 0/1 0/0 0/0 .rodata @4017 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4017 = 450.0f; -COMPILER_STRIP_GATE(0x80BCA064, &lit_4017); -#pragma pop - -/* 80BCA068-80BCA06C 00006C 0004+00 0/1 0/0 0/0 .rodata @4018 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4018 = 100.0f; -COMPILER_STRIP_GATE(0x80BCA068, &lit_4018); -#pragma pop - -/* 80BCA06C-80BCA070 000070 0004+00 0/1 0/0 0/0 .rodata @4019 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4019 = 0.5f; -COMPILER_STRIP_GATE(0x80BCA06C, &lit_4019); -#pragma pop - -/* 80BCA070-80BCA074 000074 0004+00 0/1 0/0 0/0 .rodata @4020 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4020 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(0x80BCA070, &lit_4020); -#pragma pop - -/* 80BCA074-80BCA078 000078 0004+00 0/2 0/0 0/0 .rodata @4021 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4021 = -1.0f; -COMPILER_STRIP_GATE(0x80BCA074, &lit_4021); -#pragma pop - -/* 80BCA078-80BCA07C 00007C 0004+00 0/1 0/0 0/0 .rodata @4022 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4022 = 50.0f; -COMPILER_STRIP_GATE(0x80BCA078, &lit_4022); -#pragma pop - -/* 80BCA07C-80BCA084 000080 0004+04 0/1 0/0 0/0 .rodata @4023 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4023[1 + 1 /* padding */] = { - -50.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80BCA07C, &lit_4023); -#pragma pop - -/* 80BCA084-80BCA08C 000088 0008+00 0/1 0/0 0/0 .rodata @4024 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4024[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BCA084, &lit_4024); -#pragma pop - -/* 80BCA08C-80BCA094 000090 0008+00 0/1 0/0 0/0 .rodata @4025 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4025[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BCA08C, &lit_4025); -#pragma pop - -/* 80BCA094-80BCA09C 000098 0008+00 0/1 0/0 0/0 .rodata @4026 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4026[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BCA094, &lit_4026); -#pragma pop - -/* 80BCA09C-80BCA0A0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4027 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4027 = 260.0f; -COMPILER_STRIP_GATE(0x80BCA09C, &lit_4027); -#pragma pop /* 80BC9808-80BC9BF0 000988 03E8+00 1/0 0/0 0/0 .text actionWait__12daObjChest_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::actionWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/actionWait__12daObjChest_cFv.s" +void daObjChest_c::actionWait() { + daPy_py_c* player = daPy_getPlayerActorClass(); + + if (getArg0() == 0 && cLib_calcTimer<u16>(&mRandomMoveStartTimer) == 0) { + mRandomMoveStartTimer = cM_rndF(90.0f) + 70.0f; + mRandomRotX = cM_rndFX(100.0f) + 450.0f; + if (cM_rndF(1.0f) > 0.5f) { + field_0xa9c = 0.0f; + } else { + field_0xa9c = 0.7f; + } + fopAcM_seStart(this, Z2SE_OBJ_TANSU_YURE, 0); + } + + if (!fopAcM_isSwitch(this, getSwNo()) && player->i_checkNowWolf()) { + if (player->checkWolfAttackReverse() || player->checkFrontRollCrash()) { + for (int i = 0; i < 2; i++) { + cXyz multiply[2] = { + cXyz(50.0f, 0.0f, -50.0f), + cXyz(-50.0f, 0.0f, -50.0f), + }; + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(current.angle.y); + mDoMtx_stack_c::multVec(&multiply[i], &multiply[i]); + + cXyz playerMultiply(0.0f, 0.0f, 90.0f); + mDoMtx_stack_c::transS(player->current.pos); + mDoMtx_stack_c::YrotM(player->shape_angle.y); + mDoMtx_stack_c::multVec(&playerMultiply, &playerMultiply); + f32 multAbsXZ = multiply[i].absXZ(playerMultiply); + if (multAbsXZ < 100.0f && playerMultiply.y < multiply[i].y + 260.0f) { + mMoveStartTimer = 5; + setAction(ACTION_MOVE); + mScaleY = 0.0f; + fopAcM_onSwitch(this, getSwNo()); + } + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80BCA0A0-80BCA0A4 0000A4 0004+00 0/1 0/0 0/0 .rodata @4070 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4070 = 16384.0f; -COMPILER_STRIP_GATE(0x80BCA0A0, &lit_4070); -#pragma pop - -/* 80BCA0A4-80BCA0A8 0000A8 0004+00 0/1 0/0 0/0 .rodata @4071 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4071 = -4.0f; -COMPILER_STRIP_GATE(0x80BCA0A4, &lit_4071); -#pragma pop - -/* 80BCA0A8-80BCA0AC 0000AC 0004+00 0/1 0/0 0/0 .rodata @4072 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4072 = 2.5f; -COMPILER_STRIP_GATE(0x80BCA0A8, &lit_4072); -#pragma pop - -/* 80BCA0AC-80BCA0B0 0000B0 0004+00 0/1 0/0 0/0 .rodata @4073 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4073 = 5.0f / 3.0f; -COMPILER_STRIP_GATE(0x80BCA0AC, &lit_4073); -#pragma pop /* 80BC9BF0-80BC9DFC 000D70 020C+00 1/0 0/0 0/0 .text actionMove__12daObjChest_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::actionMove() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/actionMove__12daObjChest_cFv.s" +void daObjChest_c::actionMove() { + if (cLib_calcTimer<u8>(&mMoveStartTimer) == 0) { + mExtraRot.x += 0x80; + mFallingChestRot += mExtraRot; + mScaleY = mFallingChestRot.x / 16384.0f; + if (mScaleY > 1.0f) { + mScaleY = 1.0f; + } + if (mFallingChestRot.x > 0x4000) { + mFallingChestRot.x = 0x4000; + mExtraRot.x = 0; + fopAcM_SetGravity(this, -4.0f); + current.pos.y -= gravity; + mFallingChestPos.set(0.0f, 150.0f, 0.0f); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(current.angle.y); + mDoMtx_stack_c::XrotM(mFallingChestRot.x); + mDoMtx_stack_c::multVec(&mFallingChestPos, &mFallingChestPos); + if (fopAcM_gc_c::gndCheck(&mFallingChestPos)) { + current.pos.y = fopAcM_gc_c::getGroundY(); + fopAcM_SetGravity(this, 0.0f); + daObjEff::Act_c::make_land_smoke(&mFallingChestPos, 2.5f); + dComIfGp_getVibration().StartShock(4, 0x1F, cXyz(0.0f, 1.0f, 0.0f)); + mDoAud_seStart(Z2SE_OBJ_CHEST_DOWN, &mFallingChestPos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + setAction(ACTION_END); + } + } + } } -#pragma pop /* 80BC9DFC-80BC9E00 000F7C 0004+00 1/0 0/0 0/0 .text actionEnd__12daObjChest_cFv */ void daObjChest_c::actionEnd() { @@ -747,117 +241,65 @@ void daObjChest_c::actionEnd() { } /* 80BC9E00-80BC9EA4 000F80 00A4+00 1/0 0/0 0/0 .text Draw__12daObjChest_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Draw__12daObjChest_cFv.s" +int daObjChest_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80BC9EA4-80BC9ED8 001024 0034+00 1/0 0/0 0/0 .text Delete__12daObjChest_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjChest_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/Delete__12daObjChest_cFv.s" +int daObjChest_c::Delete() { + dComIfG_resDelete(&mPhaseReq, l_arcName); + return 1; } -#pragma pop /* 80BC9ED8-80BC9F04 001058 002C+00 1/0 0/0 0/0 .text daObjChest_Draw__FP12daObjChest_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjChest_Draw(daObjChest_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Draw__FP12daObjChest_c.s" +static int daObjChest_Draw(daObjChest_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* 80BC9F04-80BC9F24 001084 0020+00 1/0 0/0 0/0 .text daObjChest_Execute__FP12daObjChest_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjChest_Execute(daObjChest_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Execute__FP12daObjChest_c.s" +static int daObjChest_Execute(daObjChest_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80BC9F24-80BC9F44 0010A4 0020+00 1/0 0/0 0/0 .text daObjChest_Delete__FP12daObjChest_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjChest_Delete(daObjChest_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Delete__FP12daObjChest_c.s" +static int daObjChest_Delete(daObjChest_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80BC9F44-80BC9F64 0010C4 0020+00 1/0 0/0 0/0 .text daObjChest_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjChest_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/daObjChest_Create__FP10fopAc_ac_c.s" +static int daObjChest_Create(fopAc_ac_c* i_this) { + return static_cast<daObjChest_c*>(i_this)->create(); } -#pragma pop - -/* 80BC9F64-80BC9FAC 0010E4 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/__dt__10cCcD_GSttsFv.s" -} -#pragma pop -/* 80BC9FAC-80BC9FC8 00112C 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<Uc>__FPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80BC9FAC(void* _this, u8* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FAC.s" -} -#pragma pop - -/* 80BC9FC8-80BC9FE4 001148 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<Us>__FPUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80BC9FC8(void* _this, u16* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FC8.s" -} -#pragma pop - -/* 80BC9FE4-80BC9FEC 001164 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BC9FE4() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FE4.s" -} -#pragma pop - -/* 80BC9FEC-80BC9FF4 00116C 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BC9FEC() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FEC.s" -} -#pragma pop +/* 80BCA124-80BCA144 -00001 0020+00 1/0 0/0 0/0 .data l_daObjChest_Method */ +static actor_method_class l_daObjChest_Method = { + (process_method_func)daObjChest_Create, (process_method_func)daObjChest_Delete, + (process_method_func)daObjChest_Execute, (process_method_func)NULL, + (process_method_func)daObjChest_Draw, +}; -/* 80BCA0B0-80BCA0B0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80BCA144-80BCA174 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Chest */ +extern actor_process_profile_definition g_profile_Obj_Chest = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Chest, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjChest_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 603, // mPriority + &l_daObjChest_Method, // sub_method + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; diff --git a/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.cpp deleted file mode 100644 index 4a85167dbc..0000000000 --- a/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: unknown_translation_unit_bss -// - -#include "rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 data_80BCA200[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BCA200-80BCA204 000000 0004+00 0/0 1/1 0/0 .bss None */ -extern u8 data_80BCA200[4]; -u8 data_80BCA200[4]; diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp index 9b07814dc5..3cb6c76fde 100644 --- a/src/d/file/d_file_select.cpp +++ b/src/d/file/d_file_select.cpp @@ -3854,15 +3854,19 @@ bool dFile_select_c::copySelectWakuAlpahAnm(u8 param_1) { /* 80188950-80188994 183290 0044+00 1/1 0/0 0/0 .text getCptoNum__14dFile_select_cFUc */ u8 dFile_select_c::getCptoNum(u8 param_0) { - // !@bug It returns the value in this if field_0x026a is not in the range + u8 cptoNum; switch (field_0x026a) { case 0: - return param_0 + 1; + cptoNum = param_0 + 1; + break; case 1: - return param_0 * 2; + cptoNum = param_0 * 2; + break; case 2: - return param_0; + cptoNum = param_0; + break; } + return cptoNum; } /* 80188994-80188B54 1832D4 01C0+00 1/0 0/0 0/0 .text copyToSelBack__14dFile_select_cFv diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index 11d7f7fff1..bffd7a8f80 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -3726,7 +3726,7 @@ SECTION_SDATA2 static f64 lit_7963 = 0.39269909262657166; /* 801B7660-801B774C 1B1FA0 00EC+00 1/1 0/0 0/0 .text toItem3Dpos__17dMenu_Collect3D_cFfffP4cXyz */ -// This is mostly matching like this using O2 but still regalloc (f29/f31) +// This is mostly matching like this using O2 but still regalloc (f29/f31). The main issue is the use of dVar12 #ifdef NONMATCHING #pragma push #pragma optimization_level 2 @@ -3740,7 +3740,7 @@ void dMenu_Collect3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, cXyz* MTXInverse(adStack_98, auStack_c8); f32 tangent = tan(0.39269909262657166); f32 dVar12 = -param_2; - cXyz cStack_d4((dVar7 * param_2) * (tangent * mDoGph_gInf_c::getAspect()), + cXyz cStack_d4((dVar7 * param_2) * (mDoGph_gInf_c::getAspect() * tangent), (tangent * (dVar11 * dVar12)), dVar12); MTXMultVec(auStack_c8, &cStack_d4, param_3); } |