diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/CreateHeap__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/CreateHeap__16daObjAvalanche_cFv.s deleted file mode 100644 index 0dcabcf4714..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/CreateHeap__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,117 +0,0 @@ -lbl_80BA7178: -/* 80BA7178 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BA717C 7C 08 02 A6 */ mflr r0 -/* 80BA7180 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BA7184 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BA7188 4B 7B B0 4D */ bl _savegpr_27 -/* 80BA718C 7C 7D 1B 78 */ mr r29, r3 -/* 80BA7190 3C 60 80 BA */ lis r3, l_dzb@ha /* 0x80BA7CFC@ha */ -/* 80BA7194 3B E3 7C FC */ addi r31, r3, l_dzb@l /* 0x80BA7CFC@l */ -/* 80BA7198 3C 60 80 BA */ lis r3, l_arcName@ha /* 0x80BA7D90@ha */ -/* 80BA719C 38 63 7D 90 */ addi r3, r3, l_arcName@l /* 0x80BA7D90@l */ -/* 80BA71A0 80 63 00 00 */ lwz r3, 0(r3) -/* 80BA71A4 38 80 00 09 */ li r4, 9 -/* 80BA71A8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA71AC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA71B0 3F C5 00 02 */ addis r30, r5, 2 -/* 80BA71B4 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80BA71B8 7F C5 F3 78 */ mr r5, r30 -/* 80BA71BC 38 C0 00 80 */ li r6, 0x80 -/* 80BA71C0 4B 49 51 2D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BA71C4 3C 80 00 08 */ lis r4, 8 -/* 80BA71C8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 80BA71CC 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 80BA71D0 4B 46 DA 85 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80BA71D4 90 7D 05 A8 */ stw r3, 0x5a8(r29) -/* 80BA71D8 80 1D 05 A8 */ lwz r0, 0x5a8(r29) -/* 80BA71DC 28 00 00 00 */ cmplwi r0, 0 -/* 80BA71E0 40 82 00 0C */ bne lbl_80BA71EC -/* 80BA71E4 38 60 00 00 */ li r3, 0 -/* 80BA71E8 48 00 01 28 */ b lbl_80BA7310 -lbl_80BA71EC: -/* 80BA71EC 3C 60 80 BA */ lis r3, l_arcName@ha /* 0x80BA7D90@ha */ -/* 80BA71F0 38 63 7D 90 */ addi r3, r3, l_arcName@l /* 0x80BA7D90@l */ -/* 80BA71F4 80 63 00 00 */ lwz r3, 0(r3) -/* 80BA71F8 38 80 00 06 */ li r4, 6 -/* 80BA71FC 7F C5 F3 78 */ mr r5, r30 -/* 80BA7200 38 C0 00 80 */ li r6, 0x80 -/* 80BA7204 4B 49 50 E9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BA7208 7C 7B 1B 78 */ mr r27, r3 -/* 80BA720C 38 60 00 1C */ li r3, 0x1c -/* 80BA7210 4B 72 7A 3D */ bl __nw__FUl -/* 80BA7214 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80BA7218 41 82 00 20 */ beq lbl_80BA7238 -/* 80BA721C 3C 80 80 BA */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80BA7E6C@ha */ -/* 80BA7220 38 04 7E 6C */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80BA7E6C@l */ -/* 80BA7224 90 1C 00 00 */ stw r0, 0(r28) -/* 80BA7228 38 80 00 00 */ li r4, 0 -/* 80BA722C 4B 78 11 D1 */ bl init__12J3DFrameCtrlFs -/* 80BA7230 38 00 00 00 */ li r0, 0 -/* 80BA7234 90 1C 00 18 */ stw r0, 0x18(r28) -lbl_80BA7238: -/* 80BA7238 93 9D 05 AC */ stw r28, 0x5ac(r29) -/* 80BA723C 80 7D 05 AC */ lwz r3, 0x5ac(r29) -/* 80BA7240 28 03 00 00 */ cmplwi r3, 0 -/* 80BA7244 41 82 00 2C */ beq lbl_80BA7270 -/* 80BA7248 7F 64 DB 78 */ mr r4, r27 -/* 80BA724C 38 A0 00 01 */ li r5, 1 -/* 80BA7250 38 C0 00 00 */ li r6, 0 -/* 80BA7254 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80BA7258 38 E0 00 00 */ li r7, 0 -/* 80BA725C 39 00 FF FF */ li r8, -1 -/* 80BA7260 39 20 00 00 */ li r9, 0 -/* 80BA7264 4B 46 65 79 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80BA7268 2C 03 00 00 */ cmpwi r3, 0 -/* 80BA726C 40 82 00 0C */ bne lbl_80BA7278 -lbl_80BA7270: -/* 80BA7270 38 60 00 00 */ li r3, 0 -/* 80BA7274 48 00 00 9C */ b lbl_80BA7310 -lbl_80BA7278: -/* 80BA7278 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80BA727C 80 7D 05 AC */ lwz r3, 0x5ac(r29) -/* 80BA7280 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80BA7284 38 60 00 C0 */ li r3, 0xc0 -/* 80BA7288 4B 72 79 C5 */ bl __nw__FUl -/* 80BA728C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80BA7290 41 82 00 0C */ beq lbl_80BA729C -/* 80BA7294 4B 4D 46 DD */ bl __ct__4dBgWFv -/* 80BA7298 7C 60 1B 78 */ mr r0, r3 -lbl_80BA729C: -/* 80BA729C 90 1D 05 B0 */ stw r0, 0x5b0(r29) -/* 80BA72A0 80 1D 05 B0 */ lwz r0, 0x5b0(r29) -/* 80BA72A4 28 00 00 00 */ cmplwi r0, 0 -/* 80BA72A8 41 82 00 54 */ beq lbl_80BA72FC -/* 80BA72AC 3C 60 80 BA */ lis r3, l_arcName@ha /* 0x80BA7D90@ha */ -/* 80BA72B0 38 63 7D 90 */ addi r3, r3, l_arcName@l /* 0x80BA7D90@l */ -/* 80BA72B4 80 63 00 00 */ lwz r3, 0(r3) -/* 80BA72B8 38 9F 00 00 */ addi r4, r31, 0 -/* 80BA72BC 80 84 00 04 */ lwz r4, 4(r4) -/* 80BA72C0 7F C5 F3 78 */ mr r5, r30 -/* 80BA72C4 38 C0 00 80 */ li r6, 0x80 -/* 80BA72C8 4B 49 50 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BA72CC 7C 64 1B 78 */ mr r4, r3 -/* 80BA72D0 80 7D 05 B0 */ lwz r3, 0x5b0(r29) -/* 80BA72D4 38 A0 00 01 */ li r5, 1 -/* 80BA72D8 38 DD 05 B4 */ addi r6, r29, 0x5b4 -/* 80BA72DC 4B 4D 2C 5D */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80BA72E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BA72E4 40 82 00 18 */ bne lbl_80BA72FC -/* 80BA72E8 3C 60 80 07 */ lis r3, dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075B44@ha */ -/* 80BA72EC 38 03 5B 44 */ addi r0, r3, dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075B44@l */ -/* 80BA72F0 80 7D 05 B0 */ lwz r3, 0x5b0(r29) -/* 80BA72F4 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80BA72F8 48 00 00 14 */ b lbl_80BA730C -lbl_80BA72FC: -/* 80BA72FC 38 00 00 00 */ li r0, 0 -/* 80BA7300 90 1D 05 B0 */ stw r0, 0x5b0(r29) -/* 80BA7304 38 60 00 00 */ li r3, 0 -/* 80BA7308 48 00 00 08 */ b lbl_80BA7310 -lbl_80BA730C: -/* 80BA730C 38 60 00 01 */ li r3, 1 -lbl_80BA7310: -/* 80BA7310 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BA7314 4B 7B AF 0D */ bl _restgpr_27 -/* 80BA7318 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BA731C 7C 08 03 A6 */ mtlr r0 -/* 80BA7320 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BA7324 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Create__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Create__16daObjAvalanche_cFv.s deleted file mode 100644 index a6a35a043bd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Create__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,115 +0,0 @@ -lbl_80BA6FC8: -/* 80BA6FC8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BA6FCC 7C 08 02 A6 */ mflr r0 -/* 80BA6FD0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BA6FD4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BA6FD8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80BA6FDC 7C 7E 1B 78 */ mr r30, r3 -/* 80BA6FE0 3C 60 80 BA */ lis r3, cNullVec__6Z2Calc@ha /* 0x80BA7D70@ha */ -/* 80BA6FE4 3B E3 7D 70 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x80BA7D70@l */ -/* 80BA6FE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA6FEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA6FF0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BA6FF4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BA6FF8 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80BA6FFC 7C 05 07 74 */ extsb r5, r0 -/* 80BA7000 4B 48 E3 61 */ bl isSwitch__10dSv_info_cCFii -/* 80BA7004 2C 03 00 00 */ cmpwi r3, 0 -/* 80BA7008 41 82 00 94 */ beq lbl_80BA709C -/* 80BA700C 3C 60 80 BA */ lis r3, lit_3663@ha /* 0x80BA7D1C@ha */ -/* 80BA7010 C0 03 7D 1C */ lfs f0, lit_3663@l(r3) /* 0x80BA7D1C@l */ -/* 80BA7014 D0 1E 05 E4 */ stfs f0, 0x5e4(r30) -/* 80BA7018 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80BA701C 28 03 00 00 */ cmplwi r3, 0 -/* 80BA7020 41 82 00 24 */ beq lbl_80BA7044 -/* 80BA7024 4B 6C 11 B1 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80BA7028 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BA702C 41 82 00 18 */ beq lbl_80BA7044 -/* 80BA7030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA7034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7038 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BA703C 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 80BA7040 4B 4C D2 11 */ bl Release__4cBgSFP9dBgW_Base -lbl_80BA7044: -/* 80BA7044 80 9E 05 B0 */ lwz r4, 0x5b0(r30) -/* 80BA7048 28 04 00 00 */ cmplwi r4, 0 -/* 80BA704C 41 82 00 18 */ beq lbl_80BA7064 -/* 80BA7050 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA7054 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7058 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BA705C 7F C5 F3 78 */ mr r5, r30 -/* 80BA7060 4B 4C D9 A9 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80BA7064: -/* 80BA7064 80 9E 05 AC */ lwz r4, 0x5ac(r30) -/* 80BA7068 A8 04 00 08 */ lha r0, 8(r4) -/* 80BA706C 3C 60 80 BA */ lis r3, lit_3718@ha /* 0x80BA7D24@ha */ -/* 80BA7070 C8 23 7D 24 */ lfd f1, lit_3718@l(r3) /* 0x80BA7D24@l */ -/* 80BA7074 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BA7078 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BA707C 3C 00 43 30 */ lis r0, 0x4330 -/* 80BA7080 90 01 00 08 */ stw r0, 8(r1) -/* 80BA7084 C8 01 00 08 */ lfd f0, 8(r1) -/* 80BA7088 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80BA708C D0 04 00 10 */ stfs f0, 0x10(r4) -/* 80BA7090 38 00 00 03 */ li r0, 3 -/* 80BA7094 98 1E 05 E8 */ stb r0, 0x5e8(r30) -/* 80BA7098 48 00 00 48 */ b lbl_80BA70E0 -lbl_80BA709C: -/* 80BA709C 3C 60 80 BA */ lis r3, lit_3716@ha /* 0x80BA7D20@ha */ -/* 80BA70A0 C0 03 7D 20 */ lfs f0, lit_3716@l(r3) /* 0x80BA7D20@l */ -/* 80BA70A4 D0 1E 05 E4 */ stfs f0, 0x5e4(r30) -/* 80BA70A8 80 9E 05 B0 */ lwz r4, 0x5b0(r30) -/* 80BA70AC 28 04 00 00 */ cmplwi r4, 0 -/* 80BA70B0 41 82 00 18 */ beq lbl_80BA70C8 -/* 80BA70B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA70B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA70BC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BA70C0 7F C5 F3 78 */ mr r5, r30 -/* 80BA70C4 4B 4C D9 45 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80BA70C8: -/* 80BA70C8 3C 60 80 BA */ lis r3, lit_3663@ha /* 0x80BA7D1C@ha */ -/* 80BA70CC C0 03 7D 1C */ lfs f0, lit_3663@l(r3) /* 0x80BA7D1C@l */ -/* 80BA70D0 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80BA70D4 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80BA70D8 38 00 00 00 */ li r0, 0 -/* 80BA70DC 98 1E 05 E8 */ stb r0, 0x5e8(r30) -lbl_80BA70E0: -/* 80BA70E0 7F C3 F3 78 */ mr r3, r30 -/* 80BA70E4 4B FF FD F5 */ bl initBaseMtx__16daObjAvalanche_cFv -/* 80BA70E8 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BA70EC 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BA70F0 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80BA70F4 7F C3 F3 78 */ mr r3, r30 -/* 80BA70F8 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 80BA70FC 38 9F 00 2C */ addi r4, r31, 0x2c -/* 80BA7100 C0 44 00 04 */ lfs f2, 4(r4) -/* 80BA7104 C0 64 00 08 */ lfs f3, 8(r4) -/* 80BA7108 C0 84 00 0C */ lfs f4, 0xc(r4) -/* 80BA710C C0 A4 00 10 */ lfs f5, 0x10(r4) -/* 80BA7110 C0 C4 00 14 */ lfs f6, 0x14(r4) -/* 80BA7114 4B 47 34 35 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80BA7118 80 7E 05 B0 */ lwz r3, 0x5b0(r30) -/* 80BA711C 28 03 00 00 */ cmplwi r3, 0 -/* 80BA7120 41 82 00 08 */ beq lbl_80BA7128 -/* 80BA7124 4B 4D 48 9D */ bl Move__4dBgWFv -lbl_80BA7128: -/* 80BA7128 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BA712C 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80BA7130 98 1E 05 E9 */ stb r0, 0x5e9(r30) -/* 80BA7134 80 1F 00 20 */ lwz r0, 0x20(r31) -/* 80BA7138 90 1E 01 00 */ stw r0, 0x100(r30) -/* 80BA713C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA7140 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7144 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80BA7148 7F C4 F3 78 */ mr r4, r30 -/* 80BA714C 80 BF 00 24 */ lwz r5, 0x24(r31) -/* 80BA7150 38 C0 00 FF */ li r6, 0xff -/* 80BA7154 4B 4A 06 05 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80BA7158 B0 7E 05 F0 */ sth r3, 0x5f0(r30) -/* 80BA715C 38 60 00 01 */ li r3, 1 -/* 80BA7160 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BA7164 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80BA7168 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BA716C 7C 08 03 A6 */ mtlr r0 -/* 80BA7170 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BA7174 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Delete__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Delete__16daObjAvalanche_cFv.s deleted file mode 100644 index 66075fb1b72..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Delete__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80BA7BA0: -/* 80BA7BA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA7BA4 7C 08 02 A6 */ mflr r0 -/* 80BA7BA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7BAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA7BB0 7C 7F 1B 78 */ mr r31, r3 -/* 80BA7BB4 80 63 05 B0 */ lwz r3, 0x5b0(r3) -/* 80BA7BB8 28 03 00 00 */ cmplwi r3, 0 -/* 80BA7BBC 41 82 00 24 */ beq lbl_80BA7BE0 -/* 80BA7BC0 4B 6C 06 15 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80BA7BC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BA7BC8 41 82 00 18 */ beq lbl_80BA7BE0 -/* 80BA7BCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA7BD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7BD4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BA7BD8 80 9F 05 B0 */ lwz r4, 0x5b0(r31) -/* 80BA7BDC 4B 4C C6 75 */ bl Release__4cBgSFP9dBgW_Base -lbl_80BA7BE0: -/* 80BA7BE0 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80BA7BE4 3C 80 80 BA */ lis r4, l_arcName@ha /* 0x80BA7D90@ha */ -/* 80BA7BE8 38 84 7D 90 */ addi r4, r4, l_arcName@l /* 0x80BA7D90@l */ -/* 80BA7BEC 80 84 00 00 */ lwz r4, 0(r4) -/* 80BA7BF0 4B 48 54 19 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BA7BF4 38 60 00 01 */ li r3, 1 -/* 80BA7BF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA7BFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA7C00 7C 08 03 A6 */ mtlr r0 -/* 80BA7C04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA7C08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Draw__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Draw__16daObjAvalanche_cFv.s deleted file mode 100644 index 5fc334137c6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Draw__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80BA7AE8: -/* 80BA7AE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA7AEC 7C 08 02 A6 */ mflr r0 -/* 80BA7AF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7AF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA7AF8 93 C1 00 08 */ stw r30, 8(r1) -/* 80BA7AFC 7C 7E 1B 78 */ mr r30, r3 -/* 80BA7B00 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BA7B04 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BA7B08 38 80 00 20 */ li r4, 0x20 -/* 80BA7B0C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BA7B10 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80BA7B14 4B 5F BC B1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BA7B18 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BA7B1C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BA7B20 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80BA7B24 80 84 00 04 */ lwz r4, 4(r4) -/* 80BA7B28 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80BA7B2C 4B 5F D2 75 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BA7B30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA7B34 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7B38 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80BA7B3C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80BA7B40 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80BA7B44 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BA7B48 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80BA7B4C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BA7B50 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BA7B54 80 83 00 04 */ lwz r4, 4(r3) -/* 80BA7B58 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80BA7B5C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80BA7B60 4B 46 5E 6D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80BA7B64 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BA7B68 4B 46 61 5D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80BA7B6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA7B70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7B74 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80BA7B78 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BA7B7C 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80BA7B80 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BA7B84 38 60 00 01 */ li r3, 1 -/* 80BA7B88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA7B8C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BA7B90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA7B94 7C 08 03 A6 */ mtlr r0 -/* 80BA7B98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA7B9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Execute__16daObjAvalanche_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Execute__16daObjAvalanche_cFPPA3_A4_f.s deleted file mode 100644 index 0d38a76498d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Execute__16daObjAvalanche_cFPPA3_A4_f.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BA73F4: -/* 80BA73F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA73F8 7C 08 02 A6 */ mflr r0 -/* 80BA73FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7400 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA7404 93 C1 00 08 */ stw r30, 8(r1) -/* 80BA7408 7C 7E 1B 78 */ mr r30, r3 -/* 80BA740C 7C 9F 23 78 */ mr r31, r4 -/* 80BA7410 48 00 02 09 */ bl event_proc_call__16daObjAvalanche_cFv -/* 80BA7414 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80BA7418 90 1F 00 00 */ stw r0, 0(r31) -/* 80BA741C 7F C3 F3 78 */ mr r3, r30 -/* 80BA7420 4B FF FA F5 */ bl setBaseMtx__16daObjAvalanche_cFv -/* 80BA7424 38 60 00 01 */ li r3, 1 -/* 80BA7428 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA742C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BA7430 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA7434 7C 08 03 A6 */ mtlr r0 -/* 80BA7438 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA743C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index fb6e9452c35..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BA7328: -/* 80BA7328 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA732C 7C 08 02 A6 */ mflr r0 -/* 80BA7330 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7334 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA7338 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BA733C 41 82 00 1C */ beq lbl_80BA7358 -/* 80BA7340 3C A0 80 BA */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80BA7E6C@ha */ -/* 80BA7344 38 05 7E 6C */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80BA7E6C@l */ -/* 80BA7348 90 1F 00 00 */ stw r0, 0(r31) -/* 80BA734C 7C 80 07 35 */ extsh. r0, r4 -/* 80BA7350 40 81 00 08 */ ble lbl_80BA7358 -/* 80BA7354 4B 72 79 E9 */ bl __dl__FPv -lbl_80BA7358: -/* 80BA7358 7F E3 FB 78 */ mr r3, r31 -/* 80BA735C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA7360 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA7364 7C 08 03 A6 */ mtlr r0 -/* 80BA7368 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA736C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionEvent__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionEvent__16daObjAvalanche_cFv.s deleted file mode 100644 index 773685d7ec5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionEvent__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80BA7804: -/* 80BA7804 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA7808 7C 08 02 A6 */ mflr r0 -/* 80BA780C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7810 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA7814 93 C1 00 08 */ stw r30, 8(r1) -/* 80BA7818 7C 7E 1B 78 */ mr r30, r3 -/* 80BA781C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA7820 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7824 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80BA7828 A8 9E 05 F0 */ lha r4, 0x5f0(r30) -/* 80BA782C 4B 4A 02 4D */ bl endCheck__16dEvent_manager_cFs -/* 80BA7830 2C 03 00 00 */ cmpwi r3, 0 -/* 80BA7834 41 82 00 34 */ beq lbl_80BA7868 -/* 80BA7838 38 00 00 03 */ li r0, 3 -/* 80BA783C 98 1E 05 E8 */ stb r0, 0x5e8(r30) -/* 80BA7840 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 80BA7844 4B 49 AC 25 */ bl reset__14dEvt_control_cFv -/* 80BA7848 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA784C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7850 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BA7854 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BA7858 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80BA785C 7C 05 07 74 */ extsb r5, r0 -/* 80BA7860 4B 48 D9 A1 */ bl onSwitch__10dSv_info_cFii -/* 80BA7864 48 00 00 0C */ b lbl_80BA7870 -lbl_80BA7868: -/* 80BA7868 7F C3 F3 78 */ mr r3, r30 -/* 80BA786C 48 00 00 21 */ bl demoProc__16daObjAvalanche_cFv -lbl_80BA7870: -/* 80BA7870 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA7874 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BA7878 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA787C 7C 08 03 A6 */ mtlr r0 -/* 80BA7880 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA7884 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionOrderEvent__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionOrderEvent__16daObjAvalanche_cFv.s deleted file mode 100644 index b544da8518e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionOrderEvent__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80BA773C: -/* 80BA773C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA7740 7C 08 02 A6 */ mflr r0 -/* 80BA7744 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7748 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA774C 93 C1 00 08 */ stw r30, 8(r1) -/* 80BA7750 7C 7E 1B 78 */ mr r30, r3 -/* 80BA7754 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80BA7758 28 00 00 02 */ cmplwi r0, 2 -/* 80BA775C 40 82 00 68 */ bne lbl_80BA77C4 -/* 80BA7760 38 00 00 02 */ li r0, 2 -/* 80BA7764 98 1E 05 E8 */ stb r0, 0x5e8(r30) -/* 80BA7768 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA776C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7770 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80BA7774 38 7F 40 C0 */ addi r3, r31, 0x40c0 -/* 80BA7778 3C 80 80 BA */ lis r4, l_staffName@ha /* 0x80BA7D98@ha */ -/* 80BA777C 38 84 7D 98 */ addi r4, r4, l_staffName@l /* 0x80BA7D98@l */ -/* 80BA7780 80 84 00 00 */ lwz r4, 0(r4) -/* 80BA7784 38 A0 00 00 */ li r5, 0 -/* 80BA7788 38 C0 00 00 */ li r6, 0 -/* 80BA778C 4B 4A 03 91 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80BA7790 90 7E 05 EC */ stw r3, 0x5ec(r30) -/* 80BA7794 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80BA7798 28 03 00 00 */ cmplwi r3, 0 -/* 80BA779C 41 82 00 1C */ beq lbl_80BA77B8 -/* 80BA77A0 4B 6C 0A 35 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80BA77A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BA77A8 41 82 00 10 */ beq lbl_80BA77B8 -/* 80BA77AC 7F E3 FB 78 */ mr r3, r31 -/* 80BA77B0 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 80BA77B4 4B 4C CA 9D */ bl Release__4cBgSFP9dBgW_Base -lbl_80BA77B8: -/* 80BA77B8 7F C3 F3 78 */ mr r3, r30 -/* 80BA77BC 48 00 00 D1 */ bl demoProc__16daObjAvalanche_cFv -/* 80BA77C0 48 00 00 2C */ b lbl_80BA77EC -lbl_80BA77C4: -/* 80BA77C4 A8 9E 05 F0 */ lha r4, 0x5f0(r30) -/* 80BA77C8 88 BE 05 E9 */ lbz r5, 0x5e9(r30) -/* 80BA77CC 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80BA77D0 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80BA77D4 38 E0 00 00 */ li r7, 0 -/* 80BA77D8 39 00 00 01 */ li r8, 1 -/* 80BA77DC 4B 47 3E A1 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 80BA77E0 A0 1E 00 FA */ lhz r0, 0xfa(r30) -/* 80BA77E4 60 00 00 02 */ ori r0, r0, 2 -/* 80BA77E8 B0 1E 00 FA */ sth r0, 0xfa(r30) -lbl_80BA77EC: -/* 80BA77EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA77F0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BA77F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA77F8 7C 08 03 A6 */ mtlr r0 -/* 80BA77FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA7800 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionWait__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionWait__16daObjAvalanche_cFv.s deleted file mode 100644 index 49b1d970c1c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionWait__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80BA76D4: -/* 80BA76D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA76D8 7C 08 02 A6 */ mflr r0 -/* 80BA76DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA76E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA76E4 7C 7F 1B 78 */ mr r31, r3 -/* 80BA76E8 4B FF FD 59 */ bl checkCollapse__16daObjAvalanche_cFv -/* 80BA76EC 2C 03 00 00 */ cmpwi r3, 0 -/* 80BA76F0 41 82 00 38 */ beq lbl_80BA7728 -/* 80BA76F4 38 00 00 01 */ li r0, 1 -/* 80BA76F8 98 1F 05 E8 */ stb r0, 0x5e8(r31) -/* 80BA76FC 7F E3 FB 78 */ mr r3, r31 -/* 80BA7700 A8 9F 05 F0 */ lha r4, 0x5f0(r31) -/* 80BA7704 88 BF 05 E9 */ lbz r5, 0x5e9(r31) -/* 80BA7708 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80BA770C 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80BA7710 38 E0 00 00 */ li r7, 0 -/* 80BA7714 39 00 00 01 */ li r8, 1 -/* 80BA7718 4B 47 3F 65 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 80BA771C A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80BA7720 60 00 00 02 */ ori r0, r0, 2 -/* 80BA7724 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_80BA7728: -/* 80BA7728 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA772C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA7730 7C 08 03 A6 */ mtlr r0 -/* 80BA7734 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA7738 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/checkCollapse__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/checkCollapse__16daObjAvalanche_cFv.s deleted file mode 100644 index 24d36c21376..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/checkCollapse__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_80BA7440: -/* 80BA7440 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BA7444 7C 08 02 A6 */ mflr r0 -/* 80BA7448 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BA744C 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80BA7450 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80BA7454 7C 7E 1B 78 */ mr r30, r3 -/* 80BA7458 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA745C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7460 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 80BA7464 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80BA7468 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80BA746C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80BA7470 40 82 00 0C */ bne lbl_80BA747C -/* 80BA7474 38 60 00 00 */ li r3, 0 -/* 80BA7478 48 00 01 14 */ b lbl_80BA758C -lbl_80BA747C: -/* 80BA747C 80 1F 05 84 */ lwz r0, 0x584(r31) -/* 80BA7480 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80BA7484 40 82 00 18 */ bne lbl_80BA749C -/* 80BA7488 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 80BA748C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80BA7490 40 82 00 0C */ bne lbl_80BA749C -/* 80BA7494 38 60 00 00 */ li r3, 0 -/* 80BA7498 48 00 00 F4 */ b lbl_80BA758C -lbl_80BA749C: -/* 80BA749C 3C 60 80 BA */ lis r3, l_check_pos@ha /* 0x80BA7D04@ha */ -/* 80BA74A0 C4 03 7D 04 */ lfsu f0, l_check_pos@l(r3) /* 0x80BA7D04@l */ -/* 80BA74A4 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80BA74A8 C0 03 00 04 */ lfs f0, 4(r3) -/* 80BA74AC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80BA74B0 C0 03 00 08 */ lfs f0, 8(r3) -/* 80BA74B4 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80BA74B8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80BA74BC D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80BA74C0 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 80BA74C4 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80BA74C8 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80BA74CC D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80BA74D0 38 61 00 08 */ addi r3, r1, 8 -/* 80BA74D4 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80BA74D8 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BA74DC 4B 6B F6 59 */ bl __mi__4cXyzCFRC3Vec -/* 80BA74E0 C0 01 00 08 */ lfs f0, 8(r1) -/* 80BA74E4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80BA74E8 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80BA74EC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BA74F0 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80BA74F4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80BA74F8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA74FC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA7500 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 80BA7504 7C 00 00 D0 */ neg r0, r0 -/* 80BA7508 7C 04 07 34 */ extsh r4, r0 -/* 80BA750C 4B 46 4F 29 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BA7510 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA7514 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA7518 38 81 00 14 */ addi r4, r1, 0x14 -/* 80BA751C 7C 85 23 78 */ mr r5, r4 -/* 80BA7520 4B 79 F8 4D */ bl PSMTXMultVec -/* 80BA7524 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80BA7528 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80BA752C FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 80BA7530 40 81 00 58 */ ble lbl_80BA7588 -/* 80BA7534 3C 60 80 BA */ lis r3, lit_3834@ha /* 0x80BA7D30@ha */ -/* 80BA7538 C0 03 7D 30 */ lfs f0, lit_3834@l(r3) /* 0x80BA7D30@l */ -/* 80BA753C EC 00 08 2A */ fadds f0, f0, f1 -/* 80BA7540 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80BA7544 40 80 00 44 */ bge lbl_80BA7588 -/* 80BA7548 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 80BA754C C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80BA7550 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BA7554 40 81 00 34 */ ble lbl_80BA7588 -/* 80BA7558 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80BA755C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BA7560 40 80 00 28 */ bge lbl_80BA7588 -/* 80BA7564 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80BA7568 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80BA756C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BA7570 40 81 00 18 */ ble lbl_80BA7588 -/* 80BA7574 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 80BA7578 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BA757C 40 80 00 0C */ bge lbl_80BA7588 -/* 80BA7580 38 60 00 01 */ li r3, 1 -/* 80BA7584 48 00 00 08 */ b lbl_80BA758C -lbl_80BA7588: -/* 80BA7588 38 60 00 00 */ li r3, 0 -lbl_80BA758C: -/* 80BA758C 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80BA7590 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80BA7594 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BA7598 7C 08 03 A6 */ mtlr r0 -/* 80BA759C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BA75A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/create1st__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/create1st__16daObjAvalanche_cFv.s deleted file mode 100644 index d7ca2dad89d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/create1st__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80BA7370: -/* 80BA7370 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA7374 7C 08 02 A6 */ mflr r0 -/* 80BA7378 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA737C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA7380 7C 7F 1B 78 */ mr r31, r3 -/* 80BA7384 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80BA7388 3C 80 80 BA */ lis r4, l_arcName@ha /* 0x80BA7D90@ha */ -/* 80BA738C 38 84 7D 90 */ addi r4, r4, l_arcName@l /* 0x80BA7D90@l */ -/* 80BA7390 80 84 00 00 */ lwz r4, 0(r4) -/* 80BA7394 4B 48 5B 29 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80BA7398 7C 60 1B 78 */ mr r0, r3 -/* 80BA739C 2C 00 00 04 */ cmpwi r0, 4 -/* 80BA73A0 40 82 00 3C */ bne lbl_80BA73DC -/* 80BA73A4 7F E3 FB 78 */ mr r3, r31 -/* 80BA73A8 3C 80 80 BA */ lis r4, l_arcName@ha /* 0x80BA7D90@ha */ -/* 80BA73AC 38 84 7D 90 */ addi r4, r4, l_arcName@l /* 0x80BA7D90@l */ -/* 80BA73B0 80 84 00 00 */ lwz r4, 0(r4) -/* 80BA73B4 38 A0 00 0D */ li r5, 0xd -/* 80BA73B8 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075B44@ha */ -/* 80BA73BC 38 C6 5B 44 */ addi r6, r6, dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075B44@l */ -/* 80BA73C0 38 E0 29 20 */ li r7, 0x2920 -/* 80BA73C4 39 00 00 00 */ li r8, 0 -/* 80BA73C8 4B 4D 13 F5 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80BA73CC 7C 60 1B 78 */ mr r0, r3 -/* 80BA73D0 2C 00 00 05 */ cmpwi r0, 5 -/* 80BA73D4 40 82 00 08 */ bne lbl_80BA73DC -/* 80BA73D8 48 00 00 08 */ b lbl_80BA73E0 -lbl_80BA73DC: -/* 80BA73DC 7C 03 03 78 */ mr r3, r0 -lbl_80BA73E0: -/* 80BA73E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA73E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA73E8 7C 08 03 A6 */ mtlr r0 -/* 80BA73EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA73F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGDelete__FP16daObjAvalanche_c.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGDelete__FP16daObjAvalanche_c.s deleted file mode 100644 index 67657b69b9e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGDelete__FP16daObjAvalanche_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BA7C6C: -/* 80BA7C6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA7C70 7C 08 02 A6 */ mflr r0 -/* 80BA7C74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7C78 4B 4D 0C 65 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80BA7C7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA7C80 7C 08 03 A6 */ mtlr r0 -/* 80BA7C84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA7C88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGDraw__FP16daObjAvalanche_c.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGDraw__FP16daObjAvalanche_c.s deleted file mode 100644 index 2fffc06a65d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGDraw__FP16daObjAvalanche_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80BA7CAC: -/* 80BA7CAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA7CB0 7C 08 02 A6 */ mflr r0 -/* 80BA7CB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7CB8 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80BA7CBC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80BA7CC0 7D 89 03 A6 */ mtctr r12 -/* 80BA7CC4 4E 80 04 21 */ bctrl -/* 80BA7CC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA7CCC 7C 08 03 A6 */ mtlr r0 -/* 80BA7CD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA7CD4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGExecute__FP16daObjAvalanche_c.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGExecute__FP16daObjAvalanche_c.s deleted file mode 100644 index 929416091a3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGExecute__FP16daObjAvalanche_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BA7C8C: -/* 80BA7C8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA7C90 7C 08 02 A6 */ mflr r0 -/* 80BA7C94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7C98 4B 4D 0C B9 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80BA7C9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA7CA0 7C 08 03 A6 */ mtlr r0 -/* 80BA7CA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA7CA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_create1st__FP16daObjAvalanche_c.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_create1st__FP16daObjAvalanche_c.s deleted file mode 100644 index 02a87d1df35..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_create1st__FP16daObjAvalanche_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80BA7C0C: -/* 80BA7C0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA7C10 7C 08 02 A6 */ mflr r0 -/* 80BA7C14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7C18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA7C1C 7C 7F 1B 78 */ mr r31, r3 -/* 80BA7C20 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BA7C24 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BA7C28 40 82 00 28 */ bne lbl_80BA7C50 -/* 80BA7C2C 28 1F 00 00 */ cmplwi r31, 0 -/* 80BA7C30 41 82 00 14 */ beq lbl_80BA7C44 -/* 80BA7C34 4B 4D 09 F1 */ bl __ct__16dBgS_MoveBgActorFv -/* 80BA7C38 3C 60 80 BA */ lis r3, __vt__16daObjAvalanche_c@ha /* 0x80BA7E78@ha */ -/* 80BA7C3C 38 03 7E 78 */ addi r0, r3, __vt__16daObjAvalanche_c@l /* 0x80BA7E78@l */ -/* 80BA7C40 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80BA7C44: -/* 80BA7C44 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80BA7C48 60 00 00 08 */ ori r0, r0, 8 -/* 80BA7C4C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80BA7C50: -/* 80BA7C50 7F E3 FB 78 */ mr r3, r31 -/* 80BA7C54 4B FF F7 1D */ bl create1st__16daObjAvalanche_cFv -/* 80BA7C58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA7C5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA7C60 7C 08 03 A6 */ mtlr r0 -/* 80BA7C64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA7C68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/demoProc__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/demoProc__16daObjAvalanche_cFv.s deleted file mode 100644 index 0c8851a9736..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/demoProc__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,122 +0,0 @@ -lbl_80BA788C: -/* 80BA788C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BA7890 7C 08 02 A6 */ mflr r0 -/* 80BA7894 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BA7898 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BA789C 4B 7B A9 41 */ bl _savegpr_29 -/* 80BA78A0 7C 7D 1B 78 */ mr r29, r3 -/* 80BA78A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA78A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA78AC 3B C3 4F F8 */ addi r30, r3, 0x4ff8 -/* 80BA78B0 7F C3 F3 78 */ mr r3, r30 -/* 80BA78B4 80 9D 05 EC */ lwz r4, 0x5ec(r29) -/* 80BA78B8 3C A0 80 BA */ lis r5, action_table@ha /* 0x80BA7E14@ha */ -/* 80BA78BC 38 A5 7E 14 */ addi r5, r5, action_table@l /* 0x80BA7E14@l */ -/* 80BA78C0 38 C0 00 02 */ li r6, 2 -/* 80BA78C4 38 E0 00 00 */ li r7, 0 -/* 80BA78C8 39 00 00 00 */ li r8, 0 -/* 80BA78CC 4B 4A 05 45 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 80BA78D0 7C 7F 1B 78 */ mr r31, r3 -/* 80BA78D4 7F C3 F3 78 */ mr r3, r30 -/* 80BA78D8 80 9D 05 EC */ lwz r4, 0x5ec(r29) -/* 80BA78DC 4B 4A 04 71 */ bl getIsAddvance__16dEvent_manager_cFi -/* 80BA78E0 2C 03 00 00 */ cmpwi r3, 0 -/* 80BA78E4 41 82 00 DC */ beq lbl_80BA79C0 -/* 80BA78E8 2C 1F 00 01 */ cmpwi r31, 1 -/* 80BA78EC 41 82 00 50 */ beq lbl_80BA793C -/* 80BA78F0 40 80 00 D0 */ bge lbl_80BA79C0 -/* 80BA78F4 2C 1F 00 00 */ cmpwi r31, 0 -/* 80BA78F8 40 80 00 08 */ bge lbl_80BA7900 -/* 80BA78FC 48 00 00 C4 */ b lbl_80BA79C0 -lbl_80BA7900: -/* 80BA7900 7F C3 F3 78 */ mr r3, r30 -/* 80BA7904 80 9D 05 EC */ lwz r4, 0x5ec(r29) -/* 80BA7908 3C A0 80 BA */ lis r5, d_a_obj_avalanche__stringBase0@ha /* 0x80BA7D3C@ha */ -/* 80BA790C 38 A5 7D 3C */ addi r5, r5, d_a_obj_avalanche__stringBase0@l /* 0x80BA7D3C@l */ -/* 80BA7910 38 A5 00 2B */ addi r5, r5, 0x2b -/* 80BA7914 38 C0 00 03 */ li r6, 3 -/* 80BA7918 4B 4A 07 D5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 80BA791C 28 03 00 00 */ cmplwi r3, 0 -/* 80BA7920 40 82 00 10 */ bne lbl_80BA7930 -/* 80BA7924 38 00 00 01 */ li r0, 1 -/* 80BA7928 98 1D 05 EA */ stb r0, 0x5ea(r29) -/* 80BA792C 48 00 00 94 */ b lbl_80BA79C0 -lbl_80BA7930: -/* 80BA7930 80 03 00 00 */ lwz r0, 0(r3) -/* 80BA7934 98 1D 05 EA */ stb r0, 0x5ea(r29) -/* 80BA7938 48 00 00 88 */ b lbl_80BA79C0 -lbl_80BA793C: -/* 80BA793C 3C 60 80 BA */ lis r3, lit_3762@ha /* 0x80BA7D2C@ha */ -/* 80BA7940 C0 03 7D 2C */ lfs f0, lit_3762@l(r3) /* 0x80BA7D2C@l */ -/* 80BA7944 80 7D 05 AC */ lwz r3, 0x5ac(r29) -/* 80BA7948 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80BA794C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80BA7950 D0 1D 05 38 */ stfs f0, 0x538(r29) -/* 80BA7954 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80BA7958 D0 1D 05 3C */ stfs f0, 0x53c(r29) -/* 80BA795C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80BA7960 D0 1D 05 40 */ stfs f0, 0x540(r29) -/* 80BA7964 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80BA7968 7C 03 07 74 */ extsb r3, r0 -/* 80BA796C 4B 48 57 01 */ bl dComIfGp_getReverb__Fi -/* 80BA7970 7C 67 1B 78 */ mr r7, r3 -/* 80BA7974 3C 60 00 08 */ lis r3, 0x0008 /* 0x000802A3@ha */ -/* 80BA7978 38 03 02 A3 */ addi r0, r3, 0x02A3 /* 0x000802A3@l */ -/* 80BA797C 90 01 00 08 */ stw r0, 8(r1) -/* 80BA7980 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BA7984 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BA7988 80 63 00 00 */ lwz r3, 0(r3) -/* 80BA798C 38 81 00 08 */ addi r4, r1, 8 -/* 80BA7990 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80BA7994 38 C0 00 00 */ li r6, 0 -/* 80BA7998 3D 00 80 BA */ lis r8, lit_3762@ha /* 0x80BA7D2C@ha */ -/* 80BA799C C0 28 7D 2C */ lfs f1, lit_3762@l(r8) /* 0x80BA7D2C@l */ -/* 80BA79A0 FC 40 08 90 */ fmr f2, f1 -/* 80BA79A4 3D 00 80 BA */ lis r8, lit_3964@ha /* 0x80BA7D38@ha */ -/* 80BA79A8 C0 68 7D 38 */ lfs f3, lit_3964@l(r8) /* 0x80BA7D38@l */ -/* 80BA79AC FC 80 18 90 */ fmr f4, f3 -/* 80BA79B0 39 00 00 00 */ li r8, 0 -/* 80BA79B4 4B 70 3F D1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80BA79B8 7F A3 EB 78 */ mr r3, r29 -/* 80BA79BC 48 00 00 95 */ bl setEffect__16daObjAvalanche_cFv -lbl_80BA79C0: -/* 80BA79C0 2C 1F 00 01 */ cmpwi r31, 1 -/* 80BA79C4 41 82 00 34 */ beq lbl_80BA79F8 -/* 80BA79C8 40 80 00 60 */ bge lbl_80BA7A28 -/* 80BA79CC 2C 1F 00 00 */ cmpwi r31, 0 -/* 80BA79D0 40 80 00 08 */ bge lbl_80BA79D8 -/* 80BA79D4 48 00 00 54 */ b lbl_80BA7A28 -lbl_80BA79D8: -/* 80BA79D8 38 7D 05 EA */ addi r3, r29, 0x5ea -/* 80BA79DC 48 00 02 FD */ bl func_80BA7CD8 -/* 80BA79E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BA79E4 40 82 00 50 */ bne lbl_80BA7A34 -/* 80BA79E8 7F C3 F3 78 */ mr r3, r30 -/* 80BA79EC 80 9D 05 EC */ lwz r4, 0x5ec(r29) -/* 80BA79F0 4B 4A 07 8D */ bl cutEnd__16dEvent_manager_cFi -/* 80BA79F4 48 00 00 40 */ b lbl_80BA7A34 -lbl_80BA79F8: -/* 80BA79F8 80 7D 05 AC */ lwz r3, 0x5ac(r29) -/* 80BA79FC 4B 46 5A 2D */ bl play__14mDoExt_baseAnmFv -/* 80BA7A00 2C 03 00 00 */ cmpwi r3, 0 -/* 80BA7A04 41 82 00 30 */ beq lbl_80BA7A34 -/* 80BA7A08 7F A3 EB 78 */ mr r3, r29 -/* 80BA7A0C 4B FF FB 99 */ bl move__16daObjAvalanche_cFv -/* 80BA7A10 2C 03 00 00 */ cmpwi r3, 0 -/* 80BA7A14 41 82 00 20 */ beq lbl_80BA7A34 -/* 80BA7A18 7F C3 F3 78 */ mr r3, r30 -/* 80BA7A1C 80 9D 05 EC */ lwz r4, 0x5ec(r29) -/* 80BA7A20 4B 4A 07 5D */ bl cutEnd__16dEvent_manager_cFi -/* 80BA7A24 48 00 00 10 */ b lbl_80BA7A34 -lbl_80BA7A28: -/* 80BA7A28 7F C3 F3 78 */ mr r3, r30 -/* 80BA7A2C 80 9D 05 EC */ lwz r4, 0x5ec(r29) -/* 80BA7A30 4B 4A 07 4D */ bl cutEnd__16dEvent_manager_cFi -lbl_80BA7A34: -/* 80BA7A34 38 60 00 00 */ li r3, 0 -/* 80BA7A38 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BA7A3C 4B 7B A7 ED */ bl _restgpr_29 -/* 80BA7A40 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BA7A44 7C 08 03 A6 */ mtlr r0 -/* 80BA7A48 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BA7A4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/event_proc_call__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/event_proc_call__16daObjAvalanche_cFv.s deleted file mode 100644 index 70e5323a88f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/event_proc_call__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80BA7618: -/* 80BA7618 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA761C 7C 08 02 A6 */ mflr r0 -/* 80BA7620 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA7624 3C 80 80 BA */ lis r4, cNullVec__6Z2Calc@ha /* 0x80BA7D70@ha */ -/* 80BA7628 38 E4 7D 70 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80BA7D70@l */ -/* 80BA762C 3C 80 80 BA */ lis r4, data_80BA7EA0@ha /* 0x80BA7EA0@ha */ -/* 80BA7630 38 C4 7E A0 */ addi r6, r4, data_80BA7EA0@l /* 0x80BA7EA0@l */ -/* 80BA7634 88 06 00 00 */ lbz r0, 0(r6) -/* 80BA7638 7C 00 07 75 */ extsb. r0, r0 -/* 80BA763C 40 82 00 70 */ bne lbl_80BA76AC -/* 80BA7640 80 87 00 44 */ lwz r4, 0x44(r7) -/* 80BA7644 80 07 00 48 */ lwz r0, 0x48(r7) -/* 80BA7648 90 87 00 74 */ stw r4, 0x74(r7) -/* 80BA764C 90 07 00 78 */ stw r0, 0x78(r7) -/* 80BA7650 80 07 00 4C */ lwz r0, 0x4c(r7) -/* 80BA7654 90 07 00 7C */ stw r0, 0x7c(r7) -/* 80BA7658 38 A7 00 74 */ addi r5, r7, 0x74 -/* 80BA765C 80 87 00 50 */ lwz r4, 0x50(r7) -/* 80BA7660 80 07 00 54 */ lwz r0, 0x54(r7) -/* 80BA7664 90 85 00 0C */ stw r4, 0xc(r5) -/* 80BA7668 90 05 00 10 */ stw r0, 0x10(r5) -/* 80BA766C 80 07 00 58 */ lwz r0, 0x58(r7) -/* 80BA7670 90 05 00 14 */ stw r0, 0x14(r5) -/* 80BA7674 80 87 00 5C */ lwz r4, 0x5c(r7) -/* 80BA7678 80 07 00 60 */ lwz r0, 0x60(r7) -/* 80BA767C 90 85 00 18 */ stw r4, 0x18(r5) -/* 80BA7680 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80BA7684 80 07 00 64 */ lwz r0, 0x64(r7) -/* 80BA7688 90 05 00 20 */ stw r0, 0x20(r5) -/* 80BA768C 80 87 00 68 */ lwz r4, 0x68(r7) -/* 80BA7690 80 07 00 6C */ lwz r0, 0x6c(r7) -/* 80BA7694 90 85 00 24 */ stw r4, 0x24(r5) -/* 80BA7698 90 05 00 28 */ stw r0, 0x28(r5) -/* 80BA769C 80 07 00 70 */ lwz r0, 0x70(r7) -/* 80BA76A0 90 05 00 2C */ stw r0, 0x2c(r5) -/* 80BA76A4 38 00 00 01 */ li r0, 1 -/* 80BA76A8 98 06 00 00 */ stb r0, 0(r6) -lbl_80BA76AC: -/* 80BA76AC 88 03 05 E8 */ lbz r0, 0x5e8(r3) -/* 80BA76B0 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80BA76B4 39 87 00 74 */ addi r12, r7, 0x74 -/* 80BA76B8 7D 8C 02 14 */ add r12, r12, r0 -/* 80BA76BC 4B 7B A9 C9 */ bl __ptmf_scall -/* 80BA76C0 60 00 00 00 */ nop -/* 80BA76C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA76C8 7C 08 03 A6 */ mtlr r0 -/* 80BA76CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA76D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/func_80BA7CD8.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/func_80BA7CD8.s deleted file mode 100644 index b3e54bdfefe..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/func_80BA7CD8.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BA7CD8: -/* 80BA7CD8 88 83 00 00 */ lbz r4, 0(r3) -/* 80BA7CDC 28 04 00 00 */ cmplwi r4, 0 -/* 80BA7CE0 41 82 00 0C */ beq lbl_80BA7CEC -/* 80BA7CE4 38 04 FF FF */ addi r0, r4, -1 -/* 80BA7CE8 98 03 00 00 */ stb r0, 0(r3) -lbl_80BA7CEC: -/* 80BA7CEC 88 63 00 00 */ lbz r3, 0(r3) -/* 80BA7CF0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/initBaseMtx__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/initBaseMtx__16daObjAvalanche_cFv.s deleted file mode 100644 index a8c0248f0e9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/initBaseMtx__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80BA6ED8: -/* 80BA6ED8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA6EDC 7C 08 02 A6 */ mflr r0 -/* 80BA6EE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA6EE4 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80BA6EE8 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80BA6EEC D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80BA6EF0 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80BA6EF4 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80BA6EF8 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80BA6EFC D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80BA6F00 48 00 00 15 */ bl setBaseMtx__16daObjAvalanche_cFv -/* 80BA6F04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA6F08 7C 08 03 A6 */ mtlr r0 -/* 80BA6F0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA6F10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/move__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/move__16daObjAvalanche_cFv.s deleted file mode 100644 index d76a20419db..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/move__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80BA75A4: -/* 80BA75A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA75A8 7C 08 02 A6 */ mflr r0 -/* 80BA75AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA75B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA75B4 93 C1 00 08 */ stw r30, 8(r1) -/* 80BA75B8 7C 7E 1B 78 */ mr r30, r3 -/* 80BA75BC 3B E0 00 00 */ li r31, 0 -/* 80BA75C0 38 7E 05 E4 */ addi r3, r30, 0x5e4 -/* 80BA75C4 3C 80 80 BA */ lis r4, lit_3663@ha /* 0x80BA7D1C@ha */ -/* 80BA75C8 C0 24 7D 1C */ lfs f1, lit_3663@l(r4) /* 0x80BA7D1C@l */ -/* 80BA75CC 3C 80 80 BA */ lis r4, lit_3846@ha /* 0x80BA7D34@ha */ -/* 80BA75D0 C0 44 7D 34 */ lfs f2, lit_3846@l(r4) /* 0x80BA7D34@l */ -/* 80BA75D4 4B 6C 91 6D */ bl cLib_chaseF__FPfff -/* 80BA75D8 2C 03 00 00 */ cmpwi r3, 0 -/* 80BA75DC 41 82 00 08 */ beq lbl_80BA75E4 -/* 80BA75E0 3B E0 00 01 */ li r31, 1 -lbl_80BA75E4: -/* 80BA75E4 7F C3 F3 78 */ mr r3, r30 -/* 80BA75E8 4B FF F9 2D */ bl setBaseMtx__16daObjAvalanche_cFv -/* 80BA75EC 80 7E 05 B0 */ lwz r3, 0x5b0(r30) -/* 80BA75F0 28 03 00 00 */ cmplwi r3, 0 -/* 80BA75F4 41 82 00 08 */ beq lbl_80BA75FC -/* 80BA75F8 4B 4D 43 C9 */ bl Move__4dBgWFv -lbl_80BA75FC: -/* 80BA75FC 7F E3 FB 78 */ mr r3, r31 -/* 80BA7600 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA7604 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BA7608 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA760C 7C 08 03 A6 */ mtlr r0 -/* 80BA7610 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA7614 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/setBaseMtx__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/setBaseMtx__16daObjAvalanche_cFv.s deleted file mode 100644 index 340c7204024..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/setBaseMtx__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80BA6F14: -/* 80BA6F14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA6F18 7C 08 02 A6 */ mflr r0 -/* 80BA6F1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA6F20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA6F24 7C 7F 1B 78 */ mr r31, r3 -/* 80BA6F28 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA6F2C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA6F30 3C 80 80 BA */ lis r4, lit_3663@ha /* 0x80BA7D1C@ha */ -/* 80BA6F34 C0 24 7D 1C */ lfs f1, lit_3663@l(r4) /* 0x80BA7D1C@l */ -/* 80BA6F38 FC 40 08 90 */ fmr f2, f1 -/* 80BA6F3C FC 60 08 90 */ fmr f3, f1 -/* 80BA6F40 4B 79 F9 A9 */ bl PSMTXTrans -/* 80BA6F44 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA6F48 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA6F4C 38 80 00 00 */ li r4, 0 -/* 80BA6F50 4B 46 54 E5 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BA6F54 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA6F58 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA6F5C 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80BA6F60 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BA6F64 4B 79 F5 4D */ bl PSMTXCopy -/* 80BA6F68 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA6F6C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA6F70 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80BA6F74 4B 79 F5 3D */ bl PSMTXCopy -/* 80BA6F78 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA6F7C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA6F80 3C 80 80 BA */ lis r4, lit_3663@ha /* 0x80BA7D1C@ha */ -/* 80BA6F84 C0 24 7D 1C */ lfs f1, lit_3663@l(r4) /* 0x80BA7D1C@l */ -/* 80BA6F88 C0 5F 05 E4 */ lfs f2, 0x5e4(r31) -/* 80BA6F8C FC 60 08 90 */ fmr f3, f1 -/* 80BA6F90 4B 79 F9 59 */ bl PSMTXTrans -/* 80BA6F94 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA6F98 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA6F9C 38 80 00 00 */ li r4, 0 -/* 80BA6FA0 4B 46 54 95 */ bl mDoMtx_YrotM__FPA4_fs -/* 80BA6FA4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA6FA8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA6FAC 38 9F 05 B4 */ addi r4, r31, 0x5b4 -/* 80BA6FB0 4B 79 F5 01 */ bl PSMTXCopy -/* 80BA6FB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA6FB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA6FBC 7C 08 03 A6 */ mtlr r0 -/* 80BA6FC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA6FC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/setEffect__16daObjAvalanche_cFv.s b/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/setEffect__16daObjAvalanche_cFv.s deleted file mode 100644 index fd052de9a4e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/setEffect__16daObjAvalanche_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80BA7A50: -/* 80BA7A50 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BA7A54 7C 08 02 A6 */ mflr r0 -/* 80BA7A58 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BA7A5C 3C 60 80 BA */ lis r3, lit_3663@ha /* 0x80BA7D1C@ha */ -/* 80BA7A60 C0 03 7D 1C */ lfs f0, lit_3663@l(r3) /* 0x80BA7D1C@l */ -/* 80BA7A64 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80BA7A68 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80BA7A6C D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80BA7A70 38 61 00 20 */ addi r3, r1, 0x20 -/* 80BA7A74 38 80 00 00 */ li r4, 0 -/* 80BA7A78 38 A0 00 00 */ li r5, 0 -/* 80BA7A7C 38 C0 00 00 */ li r6, 0 -/* 80BA7A80 4B 6B F9 75 */ bl __ct__5csXyzFsss -/* 80BA7A84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA7A88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA7A8C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80BA7A90 38 80 00 00 */ li r4, 0 -/* 80BA7A94 90 81 00 08 */ stw r4, 8(r1) -/* 80BA7A98 38 00 FF FF */ li r0, -1 -/* 80BA7A9C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BA7AA0 90 81 00 10 */ stw r4, 0x10(r1) -/* 80BA7AA4 90 81 00 14 */ stw r4, 0x14(r1) -/* 80BA7AA8 90 81 00 18 */ stw r4, 0x18(r1) -/* 80BA7AAC 38 80 00 00 */ li r4, 0 -/* 80BA7AB0 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008C51@ha */ -/* 80BA7AB4 38 A5 8C 51 */ addi r5, r5, 0x8C51 /* 0x00008C51@l */ -/* 80BA7AB8 38 C1 00 28 */ addi r6, r1, 0x28 -/* 80BA7ABC 38 E0 00 00 */ li r7, 0 -/* 80BA7AC0 39 01 00 20 */ addi r8, r1, 0x20 -/* 80BA7AC4 39 20 00 00 */ li r9, 0 -/* 80BA7AC8 39 40 00 FF */ li r10, 0xff -/* 80BA7ACC 3D 60 80 BA */ lis r11, lit_3762@ha /* 0x80BA7D2C@ha */ -/* 80BA7AD0 C0 2B 7D 2C */ lfs f1, lit_3762@l(r11) /* 0x80BA7D2C@l */ -/* 80BA7AD4 4B 4A 4F BD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80BA7AD8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BA7ADC 7C 08 03 A6 */ mtlr r0 -/* 80BA7AE0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BA7AE4 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.h b/include/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.h index 2a92b5cda47..4d94769be73 100644 --- a/include/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.h +++ b/include/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.h @@ -2,5 +2,55 @@ #define D_A_OBJ_AVALANCHE_H #include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "f_op/f_op_actor_mng.h" + +class dBgW; + +class daObjAvalanche_c : public dBgS_MoveBgActor { +public: + enum Action { + ACTION_WAIT, + ACTION_ORDER_EVENT, + ACTION_EVENT, + ACTION_DEAD, + }; + + /* 80BA6ED8 */ void initBaseMtx(); + /* 80BA6F14 */ void setBaseMtx(); + /* 80BA6FC8 */ int Create(); + /* 80BA7178 */ int CreateHeap(); + /* 80BA7370 */ int create1st(); + /* 80BA73F4 */ int Execute(Mtx**); + /* 80BA7440 */ int checkCollapse(); + /* 80BA75A4 */ int move(); + /* 80BA7618 */ void event_proc_call(); + /* 80BA76D4 */ void actionWait(); + /* 80BA773C */ void actionOrderEvent(); + /* 80BA7804 */ void actionEvent(); + /* 80BA7888 */ void actionDead(); + /* 80BA788C */ int demoProc(); + /* 80BA7A50 */ void setEffect(); + /* 80BA7AE8 */ int Draw(); + /* 80BA7BA0 */ int Delete(); + + u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getEvId() { return fopAcM_GetParamBit(this, 8, 8); } + void setAction(u8 action) { mAction = action; } + +private: + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mModel; + /* 0x5AC */ mDoExt_bckAnm* mBckAnm; + /* 0x5B0 */ dBgW* mpBgW2; + /* 0x5B4 */ Mtx mMtx2; + /* 0x5E4 */ f32 field_0x5e4; + /* 0x5E8 */ u8 mAction; + /* 0x5E9 */ u8 mMapToolId; + /* 0x5EA */ u8 mTimer; + /* 0x5EC */ int mStaffId; + /* 0x5F0 */ s16 mEventIdx; +}; + #endif /* D_A_OBJ_AVALANCHE_H */ diff --git a/rel/d/a/obj/d_a_obj_avalanche/Makefile b/rel/d/a/obj/d_a_obj_avalanche/Makefile index fac59797031..bef7f0cfaa2 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/Makefile +++ b/rel/d/a/obj/d_a_obj_avalanche/Makefile @@ -8,12 +8,10 @@ M400_MAP := $(BUILD_DIR)/rel/d/a/obj/d_a_obj_avalanche.map M400_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_bss.cpp \ rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp \ M400_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.o \ M400_LIBS := \ diff --git a/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp b/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp index 6d3dd81da44..92f5c771c02 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp +++ b/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp @@ -4,336 +4,50 @@ // #include "rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daObjAvalanche_c { - /* 80BA6ED8 */ void initBaseMtx(); - /* 80BA6F14 */ void setBaseMtx(); - /* 80BA6FC8 */ void Create(); - /* 80BA7178 */ void CreateHeap(); - /* 80BA7370 */ void create1st(); - /* 80BA73F4 */ void Execute(f32 (**)[3][4]); - /* 80BA7440 */ void checkCollapse(); - /* 80BA75A4 */ void move(); - /* 80BA7618 */ void event_proc_call(); - /* 80BA76D4 */ void actionWait(); - /* 80BA773C */ void actionOrderEvent(); - /* 80BA7804 */ void actionEvent(); - /* 80BA7888 */ void actionDead(); - /* 80BA788C */ void demoProc(); - /* 80BA7A50 */ void setEffect(); - /* 80BA7AE8 */ void Draw(); - /* 80BA7BA0 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80BA7328 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void initBaseMtx__16daObjAvalanche_cFv(); -extern "C" void setBaseMtx__16daObjAvalanche_cFv(); -extern "C" void Create__16daObjAvalanche_cFv(); -extern "C" void CreateHeap__16daObjAvalanche_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void create1st__16daObjAvalanche_cFv(); -extern "C" void Execute__16daObjAvalanche_cFPPA3_A4_f(); -extern "C" void checkCollapse__16daObjAvalanche_cFv(); -extern "C" void move__16daObjAvalanche_cFv(); -extern "C" void event_proc_call__16daObjAvalanche_cFv(); -extern "C" void actionWait__16daObjAvalanche_cFv(); -extern "C" void actionOrderEvent__16daObjAvalanche_cFv(); -extern "C" void actionEvent__16daObjAvalanche_cFv(); -extern "C" void actionDead__16daObjAvalanche_cFv(); -extern "C" void demoProc__16daObjAvalanche_cFv(); -extern "C" void setEffect__16daObjAvalanche_cFv(); -extern "C" void Draw__16daObjAvalanche_cFv(); -extern "C" void Delete__16daObjAvalanche_cFv(); -extern "C" static void daObjAvalanche_create1st__FP16daObjAvalanche_c(); -extern "C" static void daObjAvalanche_MoveBGDelete__FP16daObjAvalanche_c(); -extern "C" static void daObjAvalanche_MoveBGExecute__FP16daObjAvalanche_c(); -extern "C" static void daObjAvalanche_MoveBGDraw__FP16daObjAvalanche_c(); -extern "C" void func_80BA7CD8(void* _this, u8*); -extern "C" extern char const* const d_a_obj_avalanche__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -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 reset__14dEvt_control_cFv(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void __ct__5csXyzFsss(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80BA7EA0[4]; - -// -// Declarations: -// +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "d/a/d_a_player.h" +#include "SSystem/SComponent/c_math.h" /* 80BA6ED8-80BA6F14 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/initBaseMtx__16daObjAvalanche_cFv.s" +void daObjAvalanche_c::initBaseMtx() { + mModel->setBaseScale(scale); + setBaseMtx(); } -#pragma pop /* ############################################################################################## */ /* 80BA7CFC-80BA7D04 000000 0008+00 1/1 0/0 0/0 .rodata l_dzb */ -SECTION_RODATA static u8 const l_dzb[8] = { - 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0C, +static u32 const l_dzb[2] = { + 13, 12, }; -COMPILER_STRIP_GATE(0x80BA7CFC, &l_dzb); /* 80BA7D04-80BA7D1C 000008 0018+00 1/1 0/0 0/0 .rodata l_check_pos */ -SECTION_RODATA static u8 const l_check_pos[24] = { - 0xC3, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, +static Vec const l_check_pos[2] = { + {-300.0f, 0.0f, 0.0f}, + {300.0f, 0.0f, 300.0f}, }; -COMPILER_STRIP_GATE(0x80BA7D04, &l_check_pos); - -/* 80BA7D1C-80BA7D20 000020 0004+00 4/5 0/0 0/0 .rodata @3663 */ -SECTION_RODATA static u8 const lit_3663[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BA7D1C, &lit_3663); /* 80BA6F14-80BA6FC8 0000B4 00B4+00 3/3 0/0 0/0 .text setBaseMtx__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/setBaseMtx__16daObjAvalanche_cFv.s" +void daObjAvalanche_c::setBaseMtx() { + mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f); + mDoMtx_stack_c::YrotM(0); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); + mDoMtx_stack_c::transS(0.0f, field_0x5e4, 0.0f); + mDoMtx_stack_c::YrotM(0); + MTXCopy(mDoMtx_stack_c::get(), mMtx2); } -#pragma pop - -/* ############################################################################################## */ -/* 80BA7D20-80BA7D24 000024 0004+00 1/1 0/0 0/0 .rodata @3716 */ -SECTION_RODATA static f32 const lit_3716 = -400.0f; -COMPILER_STRIP_GATE(0x80BA7D20, &lit_3716); - -/* 80BA7D24-80BA7D2C 000028 0008+00 1/1 0/0 0/0 .rodata @3718 */ -SECTION_RODATA static u8 const lit_3718[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BA7D24, &lit_3718); - -/* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BA7D3C = "V_Yuki"; -SECTION_DEAD static char const* const stringBase_80BA7D43 = "SNOW_COLLAPSE"; -SECTION_DEAD static char const* const stringBase_80BA7D51 = "Obj_ava"; -#pragma pop /* 80BA7D70-80BA7D7C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80BA7D7C-80BA7D90 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, @@ -344,368 +58,313 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80BA7D90-80BA7D94 -00001 0004+00 3/4 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_avalanche__stringBase0; +static char* l_arcName = "V_Yuki"; /* 80BA7D94-80BA7D98 -00001 0004+00 0/1 0/0 0/0 .data l_evName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_evName = (void*)(((char*)&d_a_obj_avalanche__stringBase0) + 0x7); -#pragma pop +static char* l_evName = "SNOW_COLLAPSE"; /* 80BA7D98-80BA7D9C -00001 0004+00 1/1 0/0 0/0 .data l_staffName */ -SECTION_DATA static void* l_staffName = (void*)(((char*)&d_a_obj_avalanche__stringBase0) + 0x15); +static char* l_staffName = "Obj_ava"; /* 80BA7D9C-80BA7DB4 00002C 0018+00 0/1 0/0 0/0 .data l_cull_box */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_cull_box[24] = { - 0xC3, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0xC4, 0x2F, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, +static f32 l_cull_box[6] = { + -500.0f, -500.0f, -700.0f, + 500.0f, 1000.0f, 700.0f, }; -#pragma pop /* 80BA6FC8-80BA7178 000168 01B0+00 1/0 0/0 0/0 .text Create__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Create__16daObjAvalanche_cFv.s" +int daObjAvalanche_c::Create() { + if (fopAcM_isSwitch(this, getSwbit())) { + field_0x5e4 = 0.0f; + if (mpBgW != NULL && mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } + if (mpBgW2 != NULL) { + dComIfG_Bgsp().Regist(mpBgW2, this); + } + mBckAnm->setFrame(mBckAnm->getEndFrame()); + setAction(ACTION_DEAD); + } else { + field_0x5e4 = -400.0f; + if (mpBgW2 != NULL) { + dComIfG_Bgsp().Regist(mpBgW2, this); + } + mBckAnm->setFrame(0.0f); + setAction(ACTION_WAIT); + } + initBaseMtx(); + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + fopAcM_setCullSizeBox(this, l_cull_box[0], l_cull_box[1], l_cull_box[2], l_cull_box[3], + l_cull_box[4], l_cull_box[5]); + if (mpBgW2 != 0) { + mpBgW2->Move(); + } + mMapToolId = getEvId(); + eventInfo.setArchiveName(l_arcName); + mEventIdx = dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xff); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BA7D2C-80BA7D30 000030 0004+00 2/3 0/0 0/0 .rodata @3762 */ -SECTION_RODATA static f32 const lit_3762 = 1.0f; -COMPILER_STRIP_GATE(0x80BA7D2C, &lit_3762); - -/* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BA7D59 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80BA7D5E = "COLLAPSE"; -#pragma pop - -/* 80BA7DB4-80BA7DC0 -00001 000C+00 0/1 0/0 0/0 .data @3851 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3851[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__16daObjAvalanche_cFv, -}; -#pragma pop - -/* 80BA7DC0-80BA7DCC -00001 000C+00 0/1 0/0 0/0 .data @3852 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3852[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrderEvent__16daObjAvalanche_cFv, -}; -#pragma pop - -/* 80BA7DCC-80BA7DD8 -00001 000C+00 0/1 0/0 0/0 .data @3853 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3853[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEvent__16daObjAvalanche_cFv, -}; -#pragma pop - -/* 80BA7DD8-80BA7DE4 -00001 000C+00 0/1 0/0 0/0 .data @3854 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3854[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionDead__16daObjAvalanche_cFv, -}; -#pragma pop - -/* 80BA7DE4-80BA7E14 000074 0030+00 0/1 0/0 0/0 .data l_func$3850 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80BA7E14-80BA7E1C -00001 0008+00 1/1 0/0 0/0 .data action_table$3910 */ -SECTION_DATA static void* action_table[2] = { - (void*)(((char*)&d_a_obj_avalanche__stringBase0) + 0x1D), - (void*)(((char*)&d_a_obj_avalanche__stringBase0) + 0x22), -}; - -/* 80BA7E1C-80BA7E3C -00001 0020+00 1/0 0/0 0/0 .data daObjAvalanche_METHODS */ -SECTION_DATA static void* daObjAvalanche_METHODS[8] = { - (void*)daObjAvalanche_create1st__FP16daObjAvalanche_c, - (void*)daObjAvalanche_MoveBGDelete__FP16daObjAvalanche_c, - (void*)daObjAvalanche_MoveBGExecute__FP16daObjAvalanche_c, - (void*)NULL, - (void*)daObjAvalanche_MoveBGDraw__FP16daObjAvalanche_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80BA7E3C-80BA7E6C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Avalanche */ -SECTION_DATA extern void* g_profile_Obj_Avalanche[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00AD0000, (void*)&g_fpcLf_Method, - (void*)0x000005F4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x028F0000, (void*)&daObjAvalanche_METHODS, - (void*)0x00040000, (void*)0x000E0000, -}; - -/* 80BA7E6C-80BA7E78 0000FC 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; /* 80BA7178-80BA7328 000318 01B0+00 1/0 0/0 0/0 .text CreateHeap__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/CreateHeap__16daObjAvalanche_cFv.s" +int daObjAvalanche_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9); + JUT_ASSERT(233, modelData != 0); + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (mModel == NULL) { + return 0; + } + J3DAnmTransform* anm = + (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 6); + JUT_ASSERT(247, anm != 0); + mBckAnm = new mDoExt_bckAnm(); + if (mBckAnm == NULL || !mBckAnm->init(anm, 1, 0, 1.0, 0, -1, false)) { + return 0; + } + mBckAnm->setPlaySpeed(0.0f); + mpBgW2 = new dBgW(); + if (mpBgW2 != NULL && !mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, l_dzb[1]), 1, &mMtx2)) { + mpBgW2->SetCrrFunc(dBgS_MoveBGProc_Trans); + } else { + mpBgW2 = NULL; + return 0; + } + return 1; } -#pragma pop - -/* 80BA7328-80BA7370 0004C8 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop /* 80BA7370-80BA73F4 000510 0084+00 1/1 0/0 0/0 .text create1st__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/create1st__16daObjAvalanche_cFv.s" +int daObjAvalanche_c::create1st() { + int rv = dComIfG_resLoad(&mPhase, l_arcName); + if (rv == cPhs_COMPLEATE_e) { + rv = MoveBGCreate(l_arcName, 13, dBgS_MoveBGProc_Trans, 0x2920, NULL); + if (rv == cPhs_ERROR_e) { + return rv; + } + } + return rv; } -#pragma pop /* 80BA73F4-80BA7440 000594 004C+00 1/0 0/0 0/0 .text Execute__16daObjAvalanche_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Execute__16daObjAvalanche_cFPPA3_A4_f.s" +int daObjAvalanche_c::Execute(Mtx** param_1) { + event_proc_call(); + *param_1 = &mBgMtx; + setBaseMtx(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BA7D30-80BA7D34 000034 0004+00 1/1 0/0 0/0 .rodata @3834 */ -SECTION_RODATA static f32 const lit_3834 = 300.0f; -COMPILER_STRIP_GATE(0x80BA7D30, &lit_3834); /* 80BA7440-80BA75A4 0005E0 0164+00 1/1 0/0 0/0 .text checkCollapse__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::checkCollapse() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/checkCollapse__16daObjAvalanche_cFv.s" +int daObjAvalanche_c::checkCollapse() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + if (!daPy_py_c::i_checkNowWolf()) { + return 0; + } + if (!player->checkWolfAttackReverse() && !player->checkFrontRollCrash()) { + return 0; + } + cXyz local_1c; + cXyz local_28; + local_28 = l_check_pos[0]; + local_1c = l_check_pos[1]; + cXyz playerDist = player->current.pos - current.pos; + mDoMtx_stack_c::YrotM(-shape_angle.y); + mDoMtx_stack_c::multVec(&playerDist, &playerDist); + if (player->current.pos.y > current.pos.y && player->current.pos.y < current.pos.y + 300.0f && + playerDist.x > local_28.x && playerDist.x < local_1c.x && playerDist.z > local_28.z && + playerDist.z < local_1c.z) + { + return 1; + } else { + return 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80BA7D34-80BA7D38 000038 0004+00 1/1 0/0 0/0 .rodata @3846 */ -SECTION_RODATA static f32 const lit_3846 = 40.0f; -COMPILER_STRIP_GATE(0x80BA7D34, &lit_3846); /* 80BA75A4-80BA7618 000744 0074+00 1/1 0/0 0/0 .text move__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::move() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/move__16daObjAvalanche_cFv.s" +int daObjAvalanche_c::move() { + int rv = 0; + if (cLib_chaseF(&field_0x5e4, 0.0f, 40.0f)) { + rv = 1; + } + setBaseMtx(); + if (mpBgW2 != NULL) { + mpBgW2->Move(); + } + return rv; } -#pragma pop /* 80BA7618-80BA76D4 0007B8 00BC+00 1/1 0/0 0/0 .text event_proc_call__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::event_proc_call() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/event_proc_call__16daObjAvalanche_cFv.s" +void daObjAvalanche_c::event_proc_call() { + typedef void (daObjAvalanche_c::*actionFunc)(); + static actionFunc l_func[4] = { + &daObjAvalanche_c::actionWait, + &daObjAvalanche_c::actionOrderEvent, + &daObjAvalanche_c::actionEvent, + &daObjAvalanche_c::actionDead, + }; + (this->*l_func[mAction])(); } -#pragma pop /* 80BA76D4-80BA773C 000874 0068+00 1/0 0/0 0/0 .text actionWait__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::actionWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionWait__16daObjAvalanche_cFv.s" +void daObjAvalanche_c::actionWait() { + if (checkCollapse()) { + setAction(ACTION_ORDER_EVENT); + fopAcM_orderOtherEventId(this, mEventIdx, mMapToolId, 0xffff, 0, 1); + eventInfo.i_onCondition(2); + } } -#pragma pop /* 80BA773C-80BA7804 0008DC 00C8+00 1/0 0/0 0/0 .text actionOrderEvent__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::actionOrderEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionOrderEvent__16daObjAvalanche_cFv.s" +void daObjAvalanche_c::actionOrderEvent() { + if (eventInfo.i_checkCommandDemoAccrpt()) { + setAction(ACTION_EVENT); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staffName, 0, 0); + if (mpBgW != NULL && mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } + demoProc(); + } else { + fopAcM_orderOtherEventId(this, mEventIdx, mMapToolId, 0xffff, 0, 1); + eventInfo.i_onCondition(2); + } } -#pragma pop /* 80BA7804-80BA7888 0009A4 0084+00 1/0 0/0 0/0 .text actionEvent__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::actionEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/actionEvent__16daObjAvalanche_cFv.s" +void daObjAvalanche_c::actionEvent() { + if (dComIfGp_evmng_endCheck(mEventIdx)) { + setAction(ACTION_DEAD); + dComIfGp_event_reset(); + fopAcM_onSwitch(this, getSwbit()); + } else { + demoProc(); + } } -#pragma pop /* 80BA7888-80BA788C 000A28 0004+00 1/0 0/0 0/0 .text actionDead__16daObjAvalanche_cFv */ void daObjAvalanche_c::actionDead() { - /* empty function */ } -/* ############################################################################################## */ -/* 80BA7D38-80BA7D3C 00003C 0004+00 1/1 0/0 0/0 .rodata @3964 */ -SECTION_RODATA static f32 const lit_3964 = -1.0f; -COMPILER_STRIP_GATE(0x80BA7D38, &lit_3964); - -/* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BA7D67 = "Timer"; -#pragma pop +/* 80BA7E14-80BA7E1C -00001 0008+00 1/1 0/0 0/0 .data action_table$3910 */ +static char* action_table[2] = { + "WAIT", + "COLLAPSE", +}; /* 80BA788C-80BA7A50 000A2C 01C4+00 2/2 0/0 0/0 .text demoProc__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::demoProc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/demoProc__16daObjAvalanche_cFv.s" +int daObjAvalanche_c::demoProc() { + daPy_getPlayerActorClass(); + int actIdx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 2, 0, 0); + if (dComIfGp_evmng_getIsAddvance(mStaffId)) { + switch (actIdx) { + case 0: + int* puVar3 = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer"); + if (puVar3 == NULL) { + mTimer = 1; + } else { + mTimer = *puVar3; + } + break; + case 1: + mBckAnm->setPlaySpeed(1.0f); + eyePos = current.pos; + fopAcM_seStart(this, Z2SE_OBJ_SNOW_SLIDE, 0); + setEffect(); + break; + } + } + switch (actIdx) { + case 0: + if (cLib_calcTimer(&mTimer) == 0) { + dComIfGp_evmng_cutEnd(mStaffId); + } + break; + case 1: + if (mBckAnm->play() && move()) { + dComIfGp_evmng_cutEnd(mStaffId); + } + break; + default: + dComIfGp_evmng_cutEnd(mStaffId); + break; + } + return 0; } -#pragma pop /* 80BA7A50-80BA7AE8 000BF0 0098+00 1/1 0/0 0/0 .text setEffect__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::setEffect() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/setEffect__16daObjAvalanche_cFv.s" +void daObjAvalanche_c::setEffect() { + cXyz acStack_18(0.0f, 0.0f, 0.0f); + csXyz cStack_20(0, 0, 0); + dComIfGp_particle_set(0x8c51, &acStack_18, &cStack_20, NULL, 0xff, NULL, 0xffffffff, NULL, NULL, + NULL); } -#pragma pop /* 80BA7AE8-80BA7BA0 000C88 00B8+00 1/0 0/0 0/0 .text Draw__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Draw__16daObjAvalanche_cFv.s" +int daObjAvalanche_c::Draw() { + g_env_light.settingTevStruct(32, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + dComIfGd_setListBG(); + mBckAnm->entry(mModel->getModelData()); + mDoExt_modelUpdateDL(mModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80BA7BA0-80BA7C0C 000D40 006C+00 1/0 0/0 0/0 .text Delete__16daObjAvalanche_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjAvalanche_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/Delete__16daObjAvalanche_cFv.s" +int daObjAvalanche_c::Delete() { + if (mpBgW2 != NULL && mpBgW2->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW2); + } + dComIfG_resDelete(&mPhase, l_arcName); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BA7E78-80BA7EA0 000108 0028+00 1/1 0/0 0/0 .data __vt__16daObjAvalanche_c */ -SECTION_DATA extern void* __vt__16daObjAvalanche_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__16daObjAvalanche_cFv, - (void*)Create__16daObjAvalanche_cFv, - (void*)Execute__16daObjAvalanche_cFPPA3_A4_f, - (void*)Draw__16daObjAvalanche_cFv, - (void*)Delete__16daObjAvalanche_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 80BA7C0C-80BA7C6C 000DAC 0060+00 1/0 0/0 0/0 .text * daObjAvalanche_create1st__FP16daObjAvalanche_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjAvalanche_create1st(daObjAvalanche_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_create1st__FP16daObjAvalanche_c.s" +static int daObjAvalanche_create1st(daObjAvalanche_c* i_this) { + fopAcM_SetupActor(i_this, daObjAvalanche_c); + return i_this->create1st(); } -#pragma pop /* 80BA7C6C-80BA7C8C 000E0C 0020+00 1/0 0/0 0/0 .text * daObjAvalanche_MoveBGDelete__FP16daObjAvalanche_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjAvalanche_MoveBGDelete(daObjAvalanche_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGDelete__FP16daObjAvalanche_c.s" +static int daObjAvalanche_MoveBGDelete(daObjAvalanche_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80BA7C8C-80BA7CAC 000E2C 0020+00 1/0 0/0 0/0 .text * daObjAvalanche_MoveBGExecute__FP16daObjAvalanche_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjAvalanche_MoveBGExecute(daObjAvalanche_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGExecute__FP16daObjAvalanche_c.s" +static int daObjAvalanche_MoveBGExecute(daObjAvalanche_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80BA7CAC-80BA7CD8 000E4C 002C+00 1/0 0/0 0/0 .text * daObjAvalanche_MoveBGDraw__FP16daObjAvalanche_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjAvalanche_MoveBGDraw(daObjAvalanche_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/daObjAvalanche_MoveBGDraw__FP16daObjAvalanche_c.s" +static int daObjAvalanche_MoveBGDraw(daObjAvalanche_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop -/* 80BA7CD8-80BA7CF4 000E78 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80BA7CD8(void* _this, u8* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/func_80BA7CD8.s" -} -#pragma pop +/* 80BA7E1C-80BA7E3C -00001 0020+00 1/0 0/0 0/0 .data daObjAvalanche_METHODS */ +static actor_method_class daObjAvalanche_METHODS = { + (process_method_func)daObjAvalanche_create1st, (process_method_func)daObjAvalanche_MoveBGDelete, + (process_method_func)daObjAvalanche_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjAvalanche_MoveBGDraw, +}; + +/* 80BA7E3C-80BA7E6C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Avalanche */ +extern actor_process_profile_definition g_profile_Obj_Avalanche = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Avalanche, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjAvalanche_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 655, // mPriority + &daObjAvalanche_METHODS, // sub_method + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; /* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_bss.cpp deleted file mode 100644 index 445d318c2d6..00000000000 --- a/rel/d/a/obj/d_a_obj_avalanche/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_avalanche/unknown_translation_unit_bss.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 data_80BA7EA0[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BA7EA0-80BA7EA4 000000 0004+00 0/0 1/1 0/0 .bss None */ -extern u8 data_80BA7EA0[4]; -u8 data_80BA7EA0[4];