From 228b5e17d8418a31e13386ad66d367884b978212 Mon Sep 17 00:00:00 2001 From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com> Date: Fri, 2 Feb 2024 23:12:31 -0500 Subject: [PATCH] d_a_obj_bosswarp and d_a_obj_ystone mostly done (#2058) --- Progress.md | 10 +- .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../CreateHeap__15daObjBossWarp_cFv.s | 135 -- .../Create__15daObjBossWarp_cFv.s | 102 - .../d_a_obj_bosswarp/__dt__12J3DFrameCtrlFv.s | 20 - .../_delete__15daObjBossWarp_cFv.s | 19 - .../actionCancelEvent__15daObjBossWarp_cFv.s | 29 - .../actionChkEvent__15daObjBossWarp_cFv.s | 60 - .../actionEvent__15daObjBossWarp_cFv.s | 29 - ...ionOrderCancelEvent__15daObjBossWarp_cFv.s | 41 - ...actionOrderChkEvent__15daObjBossWarp_cFv.s | 62 - .../actionOrderEvent__15daObjBossWarp_cFv.s | 52 - ...ctionOrderWarpEvent__15daObjBossWarp_cFv.s | 41 - .../actionWaitWarp__15daObjBossWarp_cFv.s | 28 - .../actionWait__15daObjBossWarp_cFv.s | 23 - .../actionWarpEvent__15daObjBossWarp_cFv.s | 21 - .../appear__15daObjBossWarp_cFi.s | 94 - .../checkDistance__15daObjBossWarp_cFv.s | 115 -- .../daObjBossWarp_Create__FP10fopAc_ac_c.s | 9 - ...aObjBossWarp_Delete__FP15daObjBossWarp_c.s | 9 - .../daObjBossWarp_Draw__FP15daObjBossWarp_c.s | 9 - ...ObjBossWarp_Execute__FP15daObjBossWarp_c.s | 9 - .../disappear__15daObjBossWarp_cFi.s | 24 - .../draw__15daObjBossWarp_cFv.s | 44 - .../event_proc_call__15daObjBossWarp_cFv.s | 91 - .../d_a_obj_bosswarp/func_80579B70.s | 54 - .../d_a_obj_bosswarp/getNowLevel__Fv.s | 47 - .../initBaseMtx__15daObjBossWarp_cFv.s | 19 - .../setBaseMtx__15daObjBossWarp_cFv.s | 29 - .../setGoal__15daObjBossWarp_cFv.s | 47 - .../set_appear__15daObjBossWarp_cFv.s | 29 - ...aObj_Ystone_Delete__FP16obj_ystone_class.s | 17 - .../daObj_Ystone_Draw__FP16obj_ystone_class.s | 64 - ...Obj_Ystone_Execute__FP16obj_ystone_class.s | 36 - .../d_a_obj_ystone/getNowLevel__Fv.s | 34 - .../setModelBaseMtx__FP16obj_ystone_class.s | 60 - include/d/com/d_com_inf_game.h | 4 + include/rel/d/a/d_a_midna/d_a_midna.h | 4 + .../a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h | 82 +- .../d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h | 49 +- rel/d/a/obj/d_a_obj_bosswarp/Makefile | 2 - .../obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp | 1667 +++++++---------- .../unknown_translation_unit_bss.cpp | 26 - rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp | 533 +++--- 44 files changed, 1172 insertions(+), 2716 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/CreateHeap__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/Create__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/_delete__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionCancelEvent__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionChkEvent__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionEvent__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderCancelEvent__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderChkEvent__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderEvent__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderWarpEvent__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWaitWarp__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWait__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWarpEvent__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/appear__15daObjBossWarp_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/checkDistance__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Delete__FP15daObjBossWarp_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Draw__FP15daObjBossWarp_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Execute__FP15daObjBossWarp_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/disappear__15daObjBossWarp_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/draw__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/event_proc_call__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/func_80579B70.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/getNowLevel__Fv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/initBaseMtx__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setBaseMtx__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setGoal__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/set_appear__15daObjBossWarp_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Delete__FP16obj_ystone_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Draw__FP16obj_ystone_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Execute__FP16obj_ystone_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/getNowLevel__Fv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/setModelBaseMtx__FP16obj_ystone_class.s delete mode 100644 rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_bss.cpp diff --git a/Progress.md b/Progress.md index 21070a9a73a..bb4f9c6064b 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 51.046790% | 2052424 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 51.046790% | 2052424 | 4020672 -RELs | 35.625501% | 4097048 | 11500324 -Total | 39.620344% | 6149472 | 15520996 +RELs | 35.674369% | 4102668 | 11500324 +Total | 39.656553% | 6155092 | 15520996 ## RELs @@ -361,7 +361,7 @@ d_a_obj_bky_rock | 35.592460% | 3172 | 8912 d_a_obj_bmWindow | 38.757933% | 3420 | 8824 d_a_obj_bmshutter | 41.338854% | 2396 | 5796 d_a_obj_bombf | 100.000000% | 2176 | 2176 -d_a_obj_bosswarp | 39.728243% | 4912 | 12364 +d_a_obj_bosswarp | 78.906503% | 9756 | 12364 d_a_obj_boumato | 40.192484% | 3508 | 8728 d_a_obj_brakeeff | 45.417515% | 1784 | 3928 d_a_obj_brg | 22.881356% | 6696 | 29264 @@ -677,7 +677,7 @@ d_a_obj_wsword | 100.000000% | 2820 | 2820 d_a_obj_yel_bag | 33.773087% | 3584 | 10612 d_a_obj_yobikusa | 39.095993% | 3356 | 8584 d_a_obj_yousei | 27.926623% | 4628 | 16572 -d_a_obj_ystone | 42.824944% | 2280 | 5324 +d_a_obj_ystone | 57.400451% | 3056 | 5324 d_a_obj_zcloth | 100.000000% | 2528 | 2528 d_a_obj_zdoor | 45.037688% | 2868 | 6368 d_a_obj_zrTurara | 65.733114% | 4788 | 7284 @@ -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 | 35.625501% | 4097048 | 11500324 +Total | 35.674369% | 4102668 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index d82b437e1d2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80579638: -/* 80579638 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057963C 7C 08 02 A6 */ mflr r0 -/* 80579640 90 01 00 14 */ stw r0, 0x14(r1) -/* 80579644 48 00 02 F1 */ bl CreateHeap__15daObjBossWarp_cFv -/* 80579648 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057964C 7C 08 03 A6 */ mtlr r0 -/* 80579650 38 21 00 10 */ addi r1, r1, 0x10 -/* 80579654 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/CreateHeap__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/CreateHeap__15daObjBossWarp_cFv.s deleted file mode 100644 index 4f3e5442ee4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/CreateHeap__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,135 +0,0 @@ -lbl_80579934: -/* 80579934 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80579938 7C 08 02 A6 */ mflr r0 -/* 8057993C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80579940 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80579944 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80579948 39 61 00 40 */ addi r11, r1, 0x40 -/* 8057994C 4B DE 88 6D */ bl _savegpr_20 -/* 80579950 7C 7B 1B 78 */ mr r27, r3 -/* 80579954 3C 60 80 58 */ lis r3, l_hair_offset@ha /* 0x8057B360@ha */ -/* 80579958 3B C3 B3 60 */ addi r30, r3, l_hair_offset@l /* 0x8057B360@l */ -/* 8057995C 3C 60 80 58 */ lis r3, l_arcName@ha /* 0x8057B678@ha */ -/* 80579960 38 63 B6 78 */ addi r3, r3, l_arcName@l /* 0x8057B678@l */ -/* 80579964 80 63 00 00 */ lwz r3, 0(r3) -/* 80579968 38 80 00 06 */ li r4, 6 -/* 8057996C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80579970 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80579974 3F A5 00 02 */ addis r29, r5, 2 -/* 80579978 3B BD C2 F8 */ addi r29, r29, -15624 -/* 8057997C 7F A5 EB 78 */ mr r5, r29 -/* 80579980 38 C0 00 80 */ li r6, 0x80 -/* 80579984 4B AC 29 69 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80579988 7C 7F 1B 78 */ mr r31, r3 -/* 8057998C 3C 80 00 08 */ lis r4, 8 -/* 80579990 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 80579994 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 80579998 4B A9 B2 BD */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8057999C 90 7B 05 70 */ stw r3, 0x570(r27) -/* 805799A0 80 1B 05 70 */ lwz r0, 0x570(r27) -/* 805799A4 28 00 00 00 */ cmplwi r0, 0 -/* 805799A8 40 82 00 0C */ bne lbl_805799B4 -/* 805799AC 38 60 00 00 */ li r3, 0 -/* 805799B0 48 00 01 58 */ b lbl_80579B08 -lbl_805799B4: -/* 805799B4 3C 60 80 58 */ lis r3, l_arcName@ha /* 0x8057B678@ha */ -/* 805799B8 38 63 B6 78 */ addi r3, r3, l_arcName@l /* 0x8057B678@l */ -/* 805799BC 80 63 00 00 */ lwz r3, 0(r3) -/* 805799C0 38 80 00 09 */ li r4, 9 -/* 805799C4 7F A5 EB 78 */ mr r5, r29 -/* 805799C8 38 C0 00 80 */ li r6, 0x80 -/* 805799CC 4B AC 29 21 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 805799D0 7C 75 1B 78 */ mr r21, r3 -/* 805799D4 38 60 00 18 */ li r3, 0x18 -/* 805799D8 4B D5 52 75 */ bl __nw__FUl -/* 805799DC 7C 76 1B 79 */ or. r22, r3, r3 -/* 805799E0 41 82 00 20 */ beq lbl_80579A00 -/* 805799E4 3C 80 80 58 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8057B8C0@ha */ -/* 805799E8 38 04 B8 C0 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8057B8C0@l */ -/* 805799EC 90 16 00 00 */ stw r0, 0(r22) -/* 805799F0 38 80 00 00 */ li r4, 0 -/* 805799F4 4B DA EA 09 */ bl init__12J3DFrameCtrlFs -/* 805799F8 38 00 00 00 */ li r0, 0 -/* 805799FC 90 16 00 14 */ stw r0, 0x14(r22) -lbl_80579A00: -/* 80579A00 92 DB 05 7C */ stw r22, 0x57c(r27) -/* 80579A04 80 7B 05 7C */ lwz r3, 0x57c(r27) -/* 80579A08 28 03 00 00 */ cmplwi r3, 0 -/* 80579A0C 41 82 00 2C */ beq lbl_80579A38 -/* 80579A10 38 9F 00 58 */ addi r4, r31, 0x58 -/* 80579A14 7E A5 AB 78 */ mr r5, r21 -/* 80579A18 38 C0 00 01 */ li r6, 1 -/* 80579A1C 38 E0 00 00 */ li r7, 0 -/* 80579A20 C0 3E 00 D4 */ lfs f1, 0xd4(r30) -/* 80579A24 39 00 00 00 */ li r8, 0 -/* 80579A28 39 20 FF FF */ li r9, -1 -/* 80579A2C 4B A9 3C E1 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80579A30 2C 03 00 00 */ cmpwi r3, 0 -/* 80579A34 40 82 00 0C */ bne lbl_80579A40 -lbl_80579A38: -/* 80579A38 38 60 00 00 */ li r3, 0 -/* 80579A3C 48 00 00 CC */ b lbl_80579B08 -lbl_80579A40: -/* 80579A40 C3 FE 00 E8 */ lfs f31, 0xe8(r30) -/* 80579A44 80 7B 05 7C */ lwz r3, 0x57c(r27) -/* 80579A48 D3 E3 00 0C */ stfs f31, 0xc(r3) -/* 80579A4C 3B 80 00 00 */ li r28, 0 -/* 80579A50 3B 40 00 00 */ li r26, 0 -/* 80579A54 3C 60 80 58 */ lis r3, l_arcName@ha /* 0x8057B678@ha */ -/* 80579A58 3A C3 B6 78 */ addi r22, r3, l_arcName@l /* 0x8057B678@l */ -/* 80579A5C 3A FE 00 D8 */ addi r23, r30, 0xd8 -/* 80579A60 3B 3E 00 E0 */ addi r25, r30, 0xe0 -lbl_80579A64: -/* 80579A64 80 76 00 00 */ lwz r3, 0(r22) -/* 80579A68 7C 97 D0 2E */ lwzx r4, r23, r26 -/* 80579A6C 7F A5 EB 78 */ mr r5, r29 -/* 80579A70 38 C0 00 80 */ li r6, 0x80 -/* 80579A74 4B AC 28 79 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80579A78 7C 74 1B 78 */ mr r20, r3 -/* 80579A7C 38 60 00 18 */ li r3, 0x18 -/* 80579A80 4B D5 51 CD */ bl __nw__FUl -/* 80579A84 7C 78 1B 79 */ or. r24, r3, r3 -/* 80579A88 41 82 00 20 */ beq lbl_80579AA8 -/* 80579A8C 3C 80 80 58 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8057B8C0@ha */ -/* 80579A90 38 04 B8 C0 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8057B8C0@l */ -/* 80579A94 90 18 00 00 */ stw r0, 0(r24) -/* 80579A98 38 80 00 00 */ li r4, 0 -/* 80579A9C 4B DA E9 61 */ bl init__12J3DFrameCtrlFs -/* 80579AA0 38 00 00 00 */ li r0, 0 -/* 80579AA4 90 18 00 14 */ stw r0, 0x14(r24) -lbl_80579AA8: -/* 80579AA8 3A BA 05 74 */ addi r21, r26, 0x574 -/* 80579AAC 7F 1B A9 2E */ stwx r24, r27, r21 -/* 80579AB0 7C 7B A8 2E */ lwzx r3, r27, r21 -/* 80579AB4 28 03 00 00 */ cmplwi r3, 0 -/* 80579AB8 41 82 00 2C */ beq lbl_80579AE4 -/* 80579ABC 38 9F 00 58 */ addi r4, r31, 0x58 -/* 80579AC0 7E 85 A3 78 */ mr r5, r20 -/* 80579AC4 38 C0 00 01 */ li r6, 1 -/* 80579AC8 7C F9 D0 2E */ lwzx r7, r25, r26 -/* 80579ACC C0 3E 00 D4 */ lfs f1, 0xd4(r30) -/* 80579AD0 39 00 00 00 */ li r8, 0 -/* 80579AD4 39 20 FF FF */ li r9, -1 -/* 80579AD8 4B A9 3B 65 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80579ADC 2C 03 00 00 */ cmpwi r3, 0 -/* 80579AE0 40 82 00 0C */ bne lbl_80579AEC -lbl_80579AE4: -/* 80579AE4 38 60 00 00 */ li r3, 0 -/* 80579AE8 48 00 00 20 */ b lbl_80579B08 -lbl_80579AEC: -/* 80579AEC 7C 7B A8 2E */ lwzx r3, r27, r21 -/* 80579AF0 D3 E3 00 0C */ stfs f31, 0xc(r3) -/* 80579AF4 3B 9C 00 01 */ addi r28, r28, 1 -/* 80579AF8 2C 1C 00 02 */ cmpwi r28, 2 -/* 80579AFC 3B 5A 00 04 */ addi r26, r26, 4 -/* 80579B00 41 80 FF 64 */ blt lbl_80579A64 -/* 80579B04 38 60 00 01 */ li r3, 1 -lbl_80579B08: -/* 80579B08 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80579B0C CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80579B10 39 61 00 40 */ addi r11, r1, 0x40 -/* 80579B14 4B DE 86 F1 */ bl _restgpr_20 -/* 80579B18 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80579B1C 7C 08 03 A6 */ mtlr r0 -/* 80579B20 38 21 00 50 */ addi r1, r1, 0x50 -/* 80579B24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/Create__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/Create__15daObjBossWarp_cFv.s deleted file mode 100644 index 7624e9fa592..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/Create__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,102 +0,0 @@ -lbl_805797B8: -/* 805797B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805797BC 7C 08 02 A6 */ mflr r0 -/* 805797C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 805797C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 805797C8 4B DE 8A 15 */ bl _savegpr_29 -/* 805797CC 7C 7E 1B 78 */ mr r30, r3 -/* 805797D0 3C 80 80 58 */ lis r4, cNullVec__6Z2Calc@ha /* 0x8057B658@ha */ -/* 805797D4 3B E4 B6 58 */ addi r31, r4, cNullVec__6Z2Calc@l /* 0x8057B658@l */ -/* 805797D8 4B FF FF 29 */ bl initBaseMtx__15daObjBossWarp_cFv -/* 805797DC 4B FF FE 7D */ bl getNowLevel__Fv -/* 805797E0 7C 7D 1B 78 */ mr r29, r3 -/* 805797E4 2C 1D FF FF */ cmpwi r29, -1 -/* 805797E8 41 82 00 0C */ beq lbl_805797F4 -/* 805797EC 2C 1D 00 08 */ cmpwi r29, 8 -/* 805797F0 40 82 00 10 */ bne lbl_80579800 -lbl_805797F4: -/* 805797F4 38 00 FF FF */ li r0, -1 -/* 805797F8 B0 1E 05 92 */ sth r0, 0x592(r30) -/* 805797FC 48 00 00 2C */ b lbl_80579828 -lbl_80579800: -/* 80579800 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80579804 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80579808 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8057980C 7F C4 F3 78 */ mr r4, r30 -/* 80579810 57 A0 10 3A */ slwi r0, r29, 2 -/* 80579814 38 BF 00 24 */ addi r5, r31, 0x24 -/* 80579818 7C A5 00 2E */ lwzx r5, r5, r0 -/* 8057981C 38 C0 00 FF */ li r6, 0xff -/* 80579820 4B AC DF 39 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80579824 B0 7E 05 92 */ sth r3, 0x592(r30) -lbl_80579828: -/* 80579828 38 00 00 FF */ li r0, 0xff -/* 8057982C 98 1E 05 94 */ stb r0, 0x594(r30) -/* 80579830 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80579834 54 00 2F FF */ rlwinm. r0, r0, 5, 0x1f, 0x1f -/* 80579838 41 82 00 0C */ beq lbl_80579844 -/* 8057983C 2C 1D 00 08 */ cmpwi r29, 8 -/* 80579840 40 82 00 48 */ bne lbl_80579888 -lbl_80579844: -/* 80579844 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80579848 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057984C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80579850 7F C4 F3 78 */ mr r4, r30 -/* 80579854 3C A0 80 58 */ lis r5, d_a_obj_bosswarp__stringBase0@ha /* 0x8057B4EC@ha */ -/* 80579858 38 A5 B4 EC */ addi r5, r5, d_a_obj_bosswarp__stringBase0@l /* 0x8057B4EC@l */ -/* 8057985C 38 A5 00 A9 */ addi r5, r5, 0xa9 -/* 80579860 38 C0 00 FF */ li r6, 0xff -/* 80579864 4B AC DE F5 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80579868 B0 7E 05 96 */ sth r3, 0x596(r30) -/* 8057986C 38 00 00 FF */ li r0, 0xff -/* 80579870 98 1E 05 98 */ stb r0, 0x598(r30) -/* 80579874 38 00 00 03 */ li r0, 3 -/* 80579878 98 1E 05 90 */ stb r0, 0x590(r30) -/* 8057987C 7F C3 F3 78 */ mr r3, r30 -/* 80579880 48 00 05 19 */ bl set_appear__15daObjBossWarp_cFv -/* 80579884 48 00 00 3C */ b lbl_805798C0 -lbl_80579888: -/* 80579888 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057988C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80579890 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80579894 7F C4 F3 78 */ mr r4, r30 -/* 80579898 3C A0 80 58 */ lis r5, d_a_obj_bosswarp__stringBase0@ha /* 0x8057B4EC@ha */ -/* 8057989C 38 A5 B4 EC */ addi r5, r5, d_a_obj_bosswarp__stringBase0@l /* 0x8057B4EC@l */ -/* 805798A0 38 A5 00 B5 */ addi r5, r5, 0xb5 -/* 805798A4 38 C0 00 FF */ li r6, 0xff -/* 805798A8 4B AC DE B1 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 805798AC B0 7E 05 96 */ sth r3, 0x596(r30) -/* 805798B0 38 00 00 FF */ li r0, 0xff -/* 805798B4 98 1E 05 98 */ stb r0, 0x598(r30) -/* 805798B8 38 00 00 00 */ li r0, 0 -/* 805798BC 98 1E 05 90 */ stb r0, 0x590(r30) -lbl_805798C0: -/* 805798C0 80 1F 00 20 */ lwz r0, 0x20(r31) -/* 805798C4 90 1E 01 00 */ stw r0, 0x100(r30) -/* 805798C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805798CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805798D0 3B A3 4F F8 */ addi r29, r3, 0x4ff8 -/* 805798D4 7F A3 EB 78 */ mr r3, r29 -/* 805798D8 7F C4 F3 78 */ mr r4, r30 -/* 805798DC 80 BF 00 48 */ lwz r5, 0x48(r31) -/* 805798E0 38 C0 00 FF */ li r6, 0xff -/* 805798E4 4B AC DE 75 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 805798E8 B0 7E 05 C8 */ sth r3, 0x5c8(r30) -/* 805798EC 7F A3 EB 78 */ mr r3, r29 -/* 805798F0 7F C4 F3 78 */ mr r4, r30 -/* 805798F4 80 BF 00 4C */ lwz r5, 0x4c(r31) -/* 805798F8 38 C0 00 FF */ li r6, 0xff -/* 805798FC 4B AC DE 5D */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80579900 B0 7E 06 1E */ sth r3, 0x61e(r30) -/* 80579904 3C 60 80 58 */ lis r3, lit_3740@ha /* 0x8057B434@ha */ -/* 80579908 C0 03 B4 34 */ lfs f0, lit_3740@l(r3) /* 0x8057B434@l */ -/* 8057990C D0 1E 05 CC */ stfs f0, 0x5cc(r30) -/* 80579910 7F C3 F3 78 */ mr r3, r30 -/* 80579914 48 00 06 E5 */ bl execute__15daObjBossWarp_cFv -/* 80579918 38 60 00 01 */ li r3, 1 -/* 8057991C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80579920 4B DE 89 09 */ bl _restgpr_29 -/* 80579924 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80579928 7C 08 03 A6 */ mtlr r0 -/* 8057992C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80579930 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index c698adcaf8f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80579B28: -/* 80579B28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80579B2C 7C 08 02 A6 */ mflr r0 -/* 80579B30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80579B34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80579B38 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80579B3C 41 82 00 1C */ beq lbl_80579B58 -/* 80579B40 3C A0 80 58 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x8057B8C0@ha */ -/* 80579B44 38 05 B8 C0 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x8057B8C0@l */ -/* 80579B48 90 1F 00 00 */ stw r0, 0(r31) -/* 80579B4C 7C 80 07 35 */ extsh. r0, r4 -/* 80579B50 40 81 00 08 */ ble lbl_80579B58 -/* 80579B54 4B D5 51 E9 */ bl __dl__FPv -lbl_80579B58: -/* 80579B58 7F E3 FB 78 */ mr r3, r31 -/* 80579B5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80579B60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80579B64 7C 08 03 A6 */ mtlr r0 -/* 80579B68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80579B6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/_delete__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/_delete__15daObjBossWarp_cFv.s deleted file mode 100644 index af1fa73d157..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/_delete__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8057B23C: -/* 8057B23C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057B240 7C 08 02 A6 */ mflr r0 -/* 8057B244 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057B248 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057B24C 7C 7F 1B 78 */ mr r31, r3 -/* 8057B250 38 80 00 00 */ li r4, 0 -/* 8057B254 4B FF EB B5 */ bl disappear__15daObjBossWarp_cFi -/* 8057B258 38 7F 05 68 */ addi r3, r31, 0x568 -/* 8057B25C 3C 80 80 58 */ lis r4, l_arcName@ha /* 0x8057B678@ha */ -/* 8057B260 38 84 B6 78 */ addi r4, r4, l_arcName@l /* 0x8057B678@l */ -/* 8057B264 80 84 00 00 */ lwz r4, 0(r4) -/* 8057B268 4B AB 1D A1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8057B26C 38 60 00 01 */ li r3, 1 -/* 8057B270 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057B274 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057B278 7C 08 03 A6 */ mtlr r0 -/* 8057B27C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057B280 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionCancelEvent__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionCancelEvent__15daObjBossWarp_cFv.s deleted file mode 100644 index d6716b2f884..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionCancelEvent__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8057AA2C: -/* 8057AA2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057AA30 7C 08 02 A6 */ mflr r0 -/* 8057AA34 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057AA38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057AA3C 93 C1 00 08 */ stw r30, 8(r1) -/* 8057AA40 7C 7E 1B 78 */ mr r30, r3 -/* 8057AA44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057AA48 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057AA4C 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 8057AA50 A8 9E 06 1E */ lha r4, 0x61e(r30) -/* 8057AA54 4B AC D0 25 */ bl endCheck__16dEvent_manager_cFs -/* 8057AA58 2C 03 00 00 */ cmpwi r3, 0 -/* 8057AA5C 41 82 00 18 */ beq lbl_8057AA74 -/* 8057AA60 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8057AA64 4B AC 7A 05 */ bl reset__14dEvt_control_cFv -/* 8057AA68 38 00 00 03 */ li r0, 3 -/* 8057AA6C 98 1E 05 90 */ stb r0, 0x590(r30) -/* 8057AA70 48 00 00 0C */ b lbl_8057AA7C -lbl_8057AA74: -/* 8057AA74 7F C3 F3 78 */ mr r3, r30 -/* 8057AA78 48 00 00 1D */ bl demoProc__15daObjBossWarp_cFv -lbl_8057AA7C: -/* 8057AA7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057AA80 83 C1 00 08 */ lwz r30, 8(r1) -/* 8057AA84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057AA88 7C 08 03 A6 */ mtlr r0 -/* 8057AA8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057AA90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionChkEvent__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionChkEvent__15daObjBossWarp_cFv.s deleted file mode 100644 index c6261f536b7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionChkEvent__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8057A8B4: -/* 8057A8B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057A8B8 7C 08 02 A6 */ mflr r0 -/* 8057A8BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057A8C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057A8C4 93 C1 00 08 */ stw r30, 8(r1) -/* 8057A8C8 7C 7E 1B 78 */ mr r30, r3 -/* 8057A8CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057A8D0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057A8D4 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 8057A8D8 A8 9E 05 C8 */ lha r4, 0x5c8(r30) -/* 8057A8DC 4B AC D1 9D */ bl endCheck__16dEvent_manager_cFs -/* 8057A8E0 2C 03 00 00 */ cmpwi r3, 0 -/* 8057A8E4 41 82 00 90 */ beq lbl_8057A974 -/* 8057A8E8 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8057A8EC 4B AC 7B 7D */ bl reset__14dEvt_control_cFv -/* 8057A8F0 A0 1E 06 1C */ lhz r0, 0x61c(r30) -/* 8057A8F4 28 00 00 00 */ cmplwi r0, 0 -/* 8057A8F8 40 82 00 3C */ bne lbl_8057A934 -/* 8057A8FC 38 00 00 04 */ li r0, 4 -/* 8057A900 98 1E 05 90 */ stb r0, 0x590(r30) -/* 8057A904 7F C3 F3 78 */ mr r3, r30 -/* 8057A908 A8 9E 05 96 */ lha r4, 0x596(r30) -/* 8057A90C 88 BE 05 98 */ lbz r5, 0x598(r30) -/* 8057A910 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8057A914 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8057A918 38 E0 00 00 */ li r7, 0 -/* 8057A91C 39 00 00 01 */ li r8, 1 -/* 8057A920 4B AA 0D 5D */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8057A924 A0 1E 00 FA */ lhz r0, 0xfa(r30) -/* 8057A928 60 00 00 02 */ ori r0, r0, 2 -/* 8057A92C B0 1E 00 FA */ sth r0, 0xfa(r30) -/* 8057A930 48 00 00 4C */ b lbl_8057A97C -lbl_8057A934: -/* 8057A934 28 00 00 01 */ cmplwi r0, 1 -/* 8057A938 40 82 00 44 */ bne lbl_8057A97C -/* 8057A93C 38 00 00 09 */ li r0, 9 -/* 8057A940 98 1E 05 90 */ stb r0, 0x590(r30) -/* 8057A944 7F C3 F3 78 */ mr r3, r30 -/* 8057A948 A8 9E 06 1E */ lha r4, 0x61e(r30) -/* 8057A94C 38 A0 00 FF */ li r5, 0xff -/* 8057A950 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8057A954 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8057A958 38 E0 00 00 */ li r7, 0 -/* 8057A95C 39 00 00 01 */ li r8, 1 -/* 8057A960 4B AA 0D 1D */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8057A964 A0 1E 00 FA */ lhz r0, 0xfa(r30) -/* 8057A968 60 00 00 02 */ ori r0, r0, 2 -/* 8057A96C B0 1E 00 FA */ sth r0, 0xfa(r30) -/* 8057A970 48 00 00 0C */ b lbl_8057A97C -lbl_8057A974: -/* 8057A974 7F C3 F3 78 */ mr r3, r30 -/* 8057A978 48 00 01 1D */ bl demoProc__15daObjBossWarp_cFv -lbl_8057A97C: -/* 8057A97C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057A980 83 C1 00 08 */ lwz r30, 8(r1) -/* 8057A984 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057A988 7C 08 03 A6 */ mtlr r0 -/* 8057A98C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057A990 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionEvent__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionEvent__15daObjBossWarp_cFv.s deleted file mode 100644 index 58472c091a2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionEvent__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8057A610: -/* 8057A610 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057A614 7C 08 02 A6 */ mflr r0 -/* 8057A618 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057A61C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057A620 93 C1 00 08 */ stw r30, 8(r1) -/* 8057A624 7C 7E 1B 78 */ mr r30, r3 -/* 8057A628 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057A62C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057A630 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 8057A634 A8 9E 05 92 */ lha r4, 0x592(r30) -/* 8057A638 4B AC D4 41 */ bl endCheck__16dEvent_manager_cFs -/* 8057A63C 2C 03 00 00 */ cmpwi r3, 0 -/* 8057A640 41 82 00 18 */ beq lbl_8057A658 -/* 8057A644 38 00 00 03 */ li r0, 3 -/* 8057A648 98 1E 05 90 */ stb r0, 0x590(r30) -/* 8057A64C 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8057A650 4B AC 7E 19 */ bl reset__14dEvt_control_cFv -/* 8057A654 48 00 00 0C */ b lbl_8057A660 -lbl_8057A658: -/* 8057A658 7F C3 F3 78 */ mr r3, r30 -/* 8057A65C 48 00 04 39 */ bl demoProc__15daObjBossWarp_cFv -lbl_8057A660: -/* 8057A660 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057A664 83 C1 00 08 */ lwz r30, 8(r1) -/* 8057A668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057A66C 7C 08 03 A6 */ mtlr r0 -/* 8057A670 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057A674 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderCancelEvent__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderCancelEvent__15daObjBossWarp_cFv.s deleted file mode 100644 index f478b563709..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderCancelEvent__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8057A994: -/* 8057A994 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057A998 7C 08 02 A6 */ mflr r0 -/* 8057A99C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057A9A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057A9A4 7C 7F 1B 78 */ mr r31, r3 -/* 8057A9A8 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 8057A9AC 28 00 00 02 */ cmplwi r0, 2 -/* 8057A9B0 40 82 00 40 */ bne lbl_8057A9F0 -/* 8057A9B4 38 00 00 0A */ li r0, 0xa -/* 8057A9B8 98 1F 05 90 */ stb r0, 0x590(r31) -/* 8057A9BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057A9C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057A9C4 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8057A9C8 3C 80 80 58 */ lis r4, d_a_obj_bosswarp__stringBase0@ha /* 0x8057B4EC@ha */ -/* 8057A9CC 38 84 B4 EC */ addi r4, r4, d_a_obj_bosswarp__stringBase0@l /* 0x8057B4EC@l */ -/* 8057A9D0 38 84 00 C3 */ addi r4, r4, 0xc3 -/* 8057A9D4 38 A0 00 00 */ li r5, 0 -/* 8057A9D8 38 C0 00 00 */ li r6, 0 -/* 8057A9DC 4B AC D1 41 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 8057A9E0 90 7F 05 9C */ stw r3, 0x59c(r31) -/* 8057A9E4 7F E3 FB 78 */ mr r3, r31 -/* 8057A9E8 48 00 00 AD */ bl demoProc__15daObjBossWarp_cFv -/* 8057A9EC 48 00 00 2C */ b lbl_8057AA18 -lbl_8057A9F0: -/* 8057A9F0 A8 9F 06 1E */ lha r4, 0x61e(r31) -/* 8057A9F4 38 A0 00 FF */ li r5, 0xff -/* 8057A9F8 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8057A9FC 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8057AA00 38 E0 00 00 */ li r7, 0 -/* 8057AA04 39 00 00 01 */ li r8, 1 -/* 8057AA08 4B AA 0C 75 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8057AA0C A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 8057AA10 60 00 00 02 */ ori r0, r0, 2 -/* 8057AA14 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_8057AA18: -/* 8057AA18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057AA1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057AA20 7C 08 03 A6 */ mtlr r0 -/* 8057AA24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057AA28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderChkEvent__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderChkEvent__15daObjBossWarp_cFv.s deleted file mode 100644 index 5dd9447a062..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderChkEvent__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8057A7C8: -/* 8057A7C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057A7CC 7C 08 02 A6 */ mflr r0 -/* 8057A7D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057A7D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057A7D8 93 C1 00 08 */ stw r30, 8(r1) -/* 8057A7DC 7C 7E 1B 78 */ mr r30, r3 -/* 8057A7E0 3C 80 80 45 */ lis r4, m_midnaActor__9daPy_py_c@ha /* 0x80451018@ha */ -/* 8057A7E4 83 E4 10 18 */ lwz r31, m_midnaActor__9daPy_py_c@l(r4) /* 0x80451018@l */ -/* 8057A7E8 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 8057A7EC 28 00 00 02 */ cmplwi r0, 2 -/* 8057A7F0 40 82 00 84 */ bne lbl_8057A874 -/* 8057A7F4 38 00 00 08 */ li r0, 8 -/* 8057A7F8 98 1E 05 90 */ stb r0, 0x590(r30) -/* 8057A7FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057A800 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057A804 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8057A808 3C 80 80 58 */ lis r4, d_a_obj_bosswarp__stringBase0@ha /* 0x8057B4EC@ha */ -/* 8057A80C 38 84 B4 EC */ addi r4, r4, d_a_obj_bosswarp__stringBase0@l /* 0x8057B4EC@l */ -/* 8057A810 38 84 00 C3 */ addi r4, r4, 0xc3 -/* 8057A814 38 A0 00 00 */ li r5, 0 -/* 8057A818 38 C0 00 00 */ li r6, 0 -/* 8057A81C 4B AC D3 01 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 8057A820 90 7E 05 9C */ stw r3, 0x59c(r30) -/* 8057A824 C0 1F 05 50 */ lfs f0, 0x550(r31) -/* 8057A828 D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 8057A82C C0 1F 05 54 */ lfs f0, 0x554(r31) -/* 8057A830 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 8057A834 C0 1F 05 58 */ lfs f0, 0x558(r31) -/* 8057A838 D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 8057A83C C0 3E 05 54 */ lfs f1, 0x554(r30) -/* 8057A840 3C 60 80 58 */ lis r3, lit_4227@ha /* 0x8057B48C@ha */ -/* 8057A844 C0 03 B4 8C */ lfs f0, lit_4227@l(r3) /* 0x8057B48C@l */ -/* 8057A848 EC 01 00 2A */ fadds f0, f1, f0 -/* 8057A84C D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 8057A850 C0 1E 05 50 */ lfs f0, 0x550(r30) -/* 8057A854 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 8057A858 C0 1E 05 54 */ lfs f0, 0x554(r30) -/* 8057A85C D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 8057A860 C0 1E 05 58 */ lfs f0, 0x558(r30) -/* 8057A864 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 8057A868 7F C3 F3 78 */ mr r3, r30 -/* 8057A86C 48 00 02 29 */ bl demoProc__15daObjBossWarp_cFv -/* 8057A870 48 00 00 2C */ b lbl_8057A89C -lbl_8057A874: -/* 8057A874 A8 9E 05 C8 */ lha r4, 0x5c8(r30) -/* 8057A878 38 A0 00 FF */ li r5, 0xff -/* 8057A87C 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8057A880 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8057A884 38 E0 00 00 */ li r7, 0 -/* 8057A888 39 00 00 01 */ li r8, 1 -/* 8057A88C 4B AA 0D F1 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8057A890 A0 1E 00 FA */ lhz r0, 0xfa(r30) -/* 8057A894 60 00 00 02 */ ori r0, r0, 2 -/* 8057A898 B0 1E 00 FA */ sth r0, 0xfa(r30) -lbl_8057A89C: -/* 8057A89C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057A8A0 83 C1 00 08 */ lwz r30, 8(r1) -/* 8057A8A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057A8A8 7C 08 03 A6 */ mtlr r0 -/* 8057A8AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057A8B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderEvent__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderEvent__15daObjBossWarp_cFv.s deleted file mode 100644 index 19e0126cbbd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderEvent__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8057A54C: -/* 8057A54C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8057A550 7C 08 02 A6 */ mflr r0 -/* 8057A554 90 01 00 24 */ stw r0, 0x24(r1) -/* 8057A558 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8057A55C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8057A560 7C 7E 1B 78 */ mr r30, r3 -/* 8057A564 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 8057A568 28 00 00 02 */ cmplwi r0, 2 -/* 8057A56C 40 82 00 64 */ bne lbl_8057A5D0 -/* 8057A570 38 00 02 F2 */ li r0, 0x2f2 -/* 8057A574 B0 01 00 08 */ sth r0, 8(r1) -/* 8057A578 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName__FPvPv@ha /* 0x80023578@ha */ -/* 8057A57C 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName__FPvPv@l /* 0x80023578@l */ -/* 8057A580 38 81 00 08 */ addi r4, r1, 8 -/* 8057A584 4B A9 F2 75 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8057A588 7C 64 1B 78 */ mr r4, r3 -/* 8057A58C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057A590 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057A594 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8057A598 4B AC 90 F5 */ bl setPtT__14dEvt_control_cFPv -/* 8057A59C 38 00 00 02 */ li r0, 2 -/* 8057A5A0 98 1E 05 90 */ stb r0, 0x590(r30) -/* 8057A5A4 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 8057A5A8 3C 80 80 58 */ lis r4, d_a_obj_bosswarp__stringBase0@ha /* 0x8057B4EC@ha */ -/* 8057A5AC 38 84 B4 EC */ addi r4, r4, d_a_obj_bosswarp__stringBase0@l /* 0x8057B4EC@l */ -/* 8057A5B0 38 84 00 C3 */ addi r4, r4, 0xc3 -/* 8057A5B4 38 A0 00 00 */ li r5, 0 -/* 8057A5B8 38 C0 00 00 */ li r6, 0 -/* 8057A5BC 4B AC D5 61 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 8057A5C0 90 7E 05 9C */ stw r3, 0x59c(r30) -/* 8057A5C4 7F C3 F3 78 */ mr r3, r30 -/* 8057A5C8 48 00 04 CD */ bl demoProc__15daObjBossWarp_cFv -/* 8057A5CC 48 00 00 2C */ b lbl_8057A5F8 -lbl_8057A5D0: -/* 8057A5D0 A8 9E 05 92 */ lha r4, 0x592(r30) -/* 8057A5D4 88 BE 05 94 */ lbz r5, 0x594(r30) -/* 8057A5D8 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8057A5DC 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8057A5E0 38 E0 00 03 */ li r7, 3 -/* 8057A5E4 39 00 00 01 */ li r8, 1 -/* 8057A5E8 4B AA 10 95 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8057A5EC A0 1E 00 FA */ lhz r0, 0xfa(r30) -/* 8057A5F0 60 00 00 02 */ ori r0, r0, 2 -/* 8057A5F4 B0 1E 00 FA */ sth r0, 0xfa(r30) -lbl_8057A5F8: -/* 8057A5F8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8057A5FC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8057A600 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8057A604 7C 08 03 A6 */ mtlr r0 -/* 8057A608 38 21 00 20 */ addi r1, r1, 0x20 -/* 8057A60C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderWarpEvent__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderWarpEvent__15daObjBossWarp_cFv.s deleted file mode 100644 index 42d3538c1ad..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderWarpEvent__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8057A6E0: -/* 8057A6E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057A6E4 7C 08 02 A6 */ mflr r0 -/* 8057A6E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057A6EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057A6F0 7C 7F 1B 78 */ mr r31, r3 -/* 8057A6F4 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 8057A6F8 28 00 00 02 */ cmplwi r0, 2 -/* 8057A6FC 40 82 00 40 */ bne lbl_8057A73C -/* 8057A700 38 00 00 05 */ li r0, 5 -/* 8057A704 98 1F 05 90 */ stb r0, 0x590(r31) -/* 8057A708 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057A70C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057A710 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8057A714 3C 80 80 58 */ lis r4, d_a_obj_bosswarp__stringBase0@ha /* 0x8057B4EC@ha */ -/* 8057A718 38 84 B4 EC */ addi r4, r4, d_a_obj_bosswarp__stringBase0@l /* 0x8057B4EC@l */ -/* 8057A71C 38 84 00 C3 */ addi r4, r4, 0xc3 -/* 8057A720 38 A0 00 00 */ li r5, 0 -/* 8057A724 38 C0 00 00 */ li r6, 0 -/* 8057A728 4B AC D3 F5 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 8057A72C 90 7F 05 9C */ stw r3, 0x59c(r31) -/* 8057A730 7F E3 FB 78 */ mr r3, r31 -/* 8057A734 48 00 03 61 */ bl demoProc__15daObjBossWarp_cFv -/* 8057A738 48 00 00 2C */ b lbl_8057A764 -lbl_8057A73C: -/* 8057A73C A8 9F 05 96 */ lha r4, 0x596(r31) -/* 8057A740 88 BF 05 98 */ lbz r5, 0x598(r31) -/* 8057A744 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8057A748 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8057A74C 38 E0 00 00 */ li r7, 0 -/* 8057A750 39 00 00 01 */ li r8, 1 -/* 8057A754 4B AA 0F 29 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8057A758 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 8057A75C 60 00 00 02 */ ori r0, r0, 2 -/* 8057A760 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_8057A764: -/* 8057A764 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057A768 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057A76C 7C 08 03 A6 */ mtlr r0 -/* 8057A770 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057A774 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWaitWarp__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWaitWarp__15daObjBossWarp_cFv.s deleted file mode 100644 index 0114942076d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWaitWarp__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8057A678: -/* 8057A678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057A67C 7C 08 02 A6 */ mflr r0 -/* 8057A680 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057A684 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057A688 7C 7F 1B 78 */ mr r31, r3 -/* 8057A68C 4B FF F7 D1 */ bl checkDistance__15daObjBossWarp_cFv -/* 8057A690 2C 03 00 00 */ cmpwi r3, 0 -/* 8057A694 41 82 00 38 */ beq lbl_8057A6CC -/* 8057A698 38 00 00 07 */ li r0, 7 -/* 8057A69C 98 1F 05 90 */ stb r0, 0x590(r31) -/* 8057A6A0 7F E3 FB 78 */ mr r3, r31 -/* 8057A6A4 A8 9F 05 C8 */ lha r4, 0x5c8(r31) -/* 8057A6A8 38 A0 00 FF */ li r5, 0xff -/* 8057A6AC 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8057A6B0 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8057A6B4 38 E0 00 00 */ li r7, 0 -/* 8057A6B8 39 00 00 01 */ li r8, 1 -/* 8057A6BC 4B AA 0F C1 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8057A6C0 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 8057A6C4 60 00 00 02 */ ori r0, r0, 2 -/* 8057A6C8 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_8057A6CC: -/* 8057A6CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057A6D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057A6D4 7C 08 03 A6 */ mtlr r0 -/* 8057A6D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057A6DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWait__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWait__15daObjBossWarp_cFv.s deleted file mode 100644 index 3160565d4d3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWait__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8057A4F4: -/* 8057A4F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057A4F8 7C 08 02 A6 */ mflr r0 -/* 8057A4FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057A500 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057A504 7C 7F 1B 78 */ mr r31, r3 -/* 8057A508 38 00 00 01 */ li r0, 1 -/* 8057A50C 98 03 05 90 */ stb r0, 0x590(r3) -/* 8057A510 A8 83 05 92 */ lha r4, 0x592(r3) -/* 8057A514 88 A3 05 94 */ lbz r5, 0x594(r3) -/* 8057A518 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8057A51C 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8057A520 38 E0 00 03 */ li r7, 3 -/* 8057A524 39 00 00 01 */ li r8, 1 -/* 8057A528 4B AA 11 55 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8057A52C A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 8057A530 60 00 00 02 */ ori r0, r0, 2 -/* 8057A534 B0 1F 00 FA */ sth r0, 0xfa(r31) -/* 8057A538 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057A53C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057A540 7C 08 03 A6 */ mtlr r0 -/* 8057A544 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057A548 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWarpEvent__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWarpEvent__15daObjBossWarp_cFv.s deleted file mode 100644 index 2686001bb61..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWarpEvent__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8057A778: -/* 8057A778 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057A77C 7C 08 02 A6 */ mflr r0 -/* 8057A780 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057A784 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057A788 7C 7F 1B 78 */ mr r31, r3 -/* 8057A78C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057A790 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057A794 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8057A798 A8 9F 05 96 */ lha r4, 0x596(r31) -/* 8057A79C 4B AC D2 DD */ bl endCheck__16dEvent_manager_cFs -/* 8057A7A0 2C 03 00 00 */ cmpwi r3, 0 -/* 8057A7A4 40 82 00 0C */ bne lbl_8057A7B0 -/* 8057A7A8 7F E3 FB 78 */ mr r3, r31 -/* 8057A7AC 48 00 02 E9 */ bl demoProc__15daObjBossWarp_cFv -lbl_8057A7B0: -/* 8057A7B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057A7B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057A7B8 7C 08 03 A6 */ mtlr r0 -/* 8057A7BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057A7C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/appear__15daObjBossWarp_cFi.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/appear__15daObjBossWarp_cFi.s deleted file mode 100644 index f079c6e09b5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/appear__15daObjBossWarp_cFi.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_80579C30: -/* 80579C30 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80579C34 7C 08 02 A6 */ mflr r0 -/* 80579C38 90 01 00 44 */ stw r0, 0x44(r1) -/* 80579C3C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80579C40 4B DE 85 8D */ bl _savegpr_25 -/* 80579C44 7C 7B 1B 78 */ mr r27, r3 -/* 80579C48 3C 60 80 58 */ lis r3, l_hair_offset@ha /* 0x8057B360@ha */ -/* 80579C4C 3B C3 B3 60 */ addi r30, r3, l_hair_offset@l /* 0x8057B360@l */ -/* 80579C50 C0 1B 04 D0 */ lfs f0, 0x4d0(r27) -/* 80579C54 D0 1B 05 BC */ stfs f0, 0x5bc(r27) -/* 80579C58 C0 1B 04 D4 */ lfs f0, 0x4d4(r27) -/* 80579C5C D0 1B 05 C0 */ stfs f0, 0x5c0(r27) -/* 80579C60 C0 1B 04 D8 */ lfs f0, 0x4d8(r27) -/* 80579C64 D0 1B 05 C4 */ stfs f0, 0x5c4(r27) -/* 80579C68 C0 3B 05 C0 */ lfs f1, 0x5c0(r27) -/* 80579C6C C0 1E 00 D0 */ lfs f0, 0xd0(r30) -/* 80579C70 EC 01 00 2A */ fadds f0, f1, f0 -/* 80579C74 D0 1B 05 C0 */ stfs f0, 0x5c0(r27) -/* 80579C78 3B 80 00 00 */ li r28, 0 -/* 80579C7C 3B 40 00 00 */ li r26, 0 -/* 80579C80 3B 20 00 00 */ li r25, 0 -/* 80579C84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80579C88 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_80579C8C: -/* 80579C8C 3B B9 05 80 */ addi r29, r25, 0x580 -/* 80579C90 7C 1B E8 2E */ lwzx r0, r27, r29 -/* 80579C94 28 00 00 00 */ cmplwi r0, 0 -/* 80579C98 40 82 00 B8 */ bne lbl_80579D50 -/* 80579C9C 2C 1C 00 03 */ cmpwi r28, 3 -/* 80579CA0 40 82 00 54 */ bne lbl_80579CF4 -/* 80579CA4 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80579CA8 38 80 00 00 */ li r4, 0 -/* 80579CAC 90 81 00 08 */ stw r4, 8(r1) -/* 80579CB0 38 00 FF FF */ li r0, -1 -/* 80579CB4 90 01 00 0C */ stw r0, 0xc(r1) -/* 80579CB8 90 81 00 10 */ stw r4, 0x10(r1) -/* 80579CBC 90 81 00 14 */ stw r4, 0x14(r1) -/* 80579CC0 90 81 00 18 */ stw r4, 0x18(r1) -/* 80579CC4 38 80 00 00 */ li r4, 0 -/* 80579CC8 38 BE 00 EC */ addi r5, r30, 0xec -/* 80579CCC 7C A5 D2 2E */ lhzx r5, r5, r26 -/* 80579CD0 38 DB 05 BC */ addi r6, r27, 0x5bc -/* 80579CD4 38 E0 00 00 */ li r7, 0 -/* 80579CD8 39 00 00 00 */ li r8, 0 -/* 80579CDC 39 3B 04 EC */ addi r9, r27, 0x4ec -/* 80579CE0 39 40 00 FF */ li r10, 0xff -/* 80579CE4 C0 3E 00 D4 */ lfs f1, 0xd4(r30) -/* 80579CE8 4B AD 2D A9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80579CEC 7C 7B E9 2E */ stwx r3, r27, r29 -/* 80579CF0 48 00 00 60 */ b lbl_80579D50 -lbl_80579CF4: -/* 80579CF4 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80579CF8 38 80 00 00 */ li r4, 0 -/* 80579CFC 90 81 00 08 */ stw r4, 8(r1) -/* 80579D00 38 00 FF FF */ li r0, -1 -/* 80579D04 90 01 00 0C */ stw r0, 0xc(r1) -/* 80579D08 90 81 00 10 */ stw r4, 0x10(r1) -/* 80579D0C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80579D10 90 81 00 18 */ stw r4, 0x18(r1) -/* 80579D14 38 80 00 00 */ li r4, 0 -/* 80579D18 38 BE 00 EC */ addi r5, r30, 0xec -/* 80579D1C 7C A5 D2 2E */ lhzx r5, r5, r26 -/* 80579D20 38 DB 05 BC */ addi r6, r27, 0x5bc -/* 80579D24 38 E0 00 00 */ li r7, 0 -/* 80579D28 39 00 00 00 */ li r8, 0 -/* 80579D2C 39 20 00 00 */ li r9, 0 -/* 80579D30 39 40 00 FF */ li r10, 0xff -/* 80579D34 C0 3E 00 D4 */ lfs f1, 0xd4(r30) -/* 80579D38 4B AD 2D 59 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80579D3C 7C 7B E9 2E */ stwx r3, r27, r29 -/* 80579D40 2C 1C 00 00 */ cmpwi r28, 0 -/* 80579D44 40 82 00 0C */ bne lbl_80579D50 -/* 80579D48 38 00 00 00 */ li r0, 0 -/* 80579D4C 90 1B 05 80 */ stw r0, 0x580(r27) -lbl_80579D50: -/* 80579D50 3B 9C 00 01 */ addi r28, r28, 1 -/* 80579D54 2C 1C 00 04 */ cmpwi r28, 4 -/* 80579D58 3B 5A 00 02 */ addi r26, r26, 2 -/* 80579D5C 3B 39 00 04 */ addi r25, r25, 4 -/* 80579D60 41 80 FF 2C */ blt lbl_80579C8C -/* 80579D64 C0 1E 00 D4 */ lfs f0, 0xd4(r30) -/* 80579D68 80 7B 05 7C */ lwz r3, 0x57c(r27) -/* 80579D6C D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80579D70 80 7B 05 74 */ lwz r3, 0x574(r27) -/* 80579D74 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80579D78 80 7B 05 78 */ lwz r3, 0x578(r27) -/* 80579D7C D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80579D80 39 61 00 40 */ addi r11, r1, 0x40 -/* 80579D84 4B DE 84 95 */ bl _restgpr_25 -/* 80579D88 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80579D8C 7C 08 03 A6 */ mtlr r0 -/* 80579D90 38 21 00 40 */ addi r1, r1, 0x40 -/* 80579D94 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/checkDistance__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/checkDistance__15daObjBossWarp_cFv.s deleted file mode 100644 index 357b9aa8f1d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/checkDistance__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,115 +0,0 @@ -lbl_80579E5C: -/* 80579E5C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80579E60 7C 08 02 A6 */ mflr r0 -/* 80579E64 90 01 00 44 */ stw r0, 0x44(r1) -/* 80579E68 39 61 00 40 */ addi r11, r1, 0x40 -/* 80579E6C 4B DE 83 71 */ bl _savegpr_29 -/* 80579E70 7C 7D 1B 78 */ mr r29, r3 -/* 80579E74 3C 60 80 58 */ lis r3, l_hair_offset@ha /* 0x8057B360@ha */ -/* 80579E78 3B E3 B3 60 */ addi r31, r3, l_hair_offset@l /* 0x8057B360@l */ -/* 80579E7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80579E80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80579E84 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 80579E88 C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 80579E8C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80579E90 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80579E94 C0 3F 00 E8 */ lfs f1, 0xe8(r31) -/* 80579E98 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80579E9C D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80579EA0 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 80579EA4 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80579EA8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80579EAC D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80579EB0 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80579EB4 38 61 00 0C */ addi r3, r1, 0xc -/* 80579EB8 38 81 00 18 */ addi r4, r1, 0x18 -/* 80579EBC 4B DC D4 E1 */ bl PSVECSquareDistance -/* 80579EC0 C0 1F 00 E8 */ lfs f0, 0xe8(r31) -/* 80579EC4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80579EC8 40 81 00 58 */ ble lbl_80579F20 -/* 80579ECC FC 00 08 34 */ frsqrte f0, f1 -/* 80579ED0 C8 9F 01 00 */ lfd f4, 0x100(r31) -/* 80579ED4 FC 44 00 32 */ fmul f2, f4, f0 -/* 80579ED8 C8 7F 01 08 */ lfd f3, 0x108(r31) -/* 80579EDC FC 00 00 32 */ fmul f0, f0, f0 -/* 80579EE0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80579EE4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80579EE8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80579EEC FC 44 00 32 */ fmul f2, f4, f0 -/* 80579EF0 FC 00 00 32 */ fmul f0, f0, f0 -/* 80579EF4 FC 01 00 32 */ fmul f0, f1, f0 -/* 80579EF8 FC 03 00 28 */ fsub f0, f3, f0 -/* 80579EFC FC 02 00 32 */ fmul f0, f2, f0 -/* 80579F00 FC 44 00 32 */ fmul f2, f4, f0 -/* 80579F04 FC 00 00 32 */ fmul f0, f0, f0 -/* 80579F08 FC 01 00 32 */ fmul f0, f1, f0 -/* 80579F0C FC 03 00 28 */ fsub f0, f3, f0 -/* 80579F10 FC 02 00 32 */ fmul f0, f2, f0 -/* 80579F14 FC 21 00 32 */ fmul f1, f1, f0 -/* 80579F18 FC 20 08 18 */ frsp f1, f1 -/* 80579F1C 48 00 00 88 */ b lbl_80579FA4 -lbl_80579F20: -/* 80579F20 C8 1F 01 10 */ lfd f0, 0x110(r31) -/* 80579F24 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80579F28 40 80 00 10 */ bge lbl_80579F38 -/* 80579F2C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80579F30 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80579F34 48 00 00 70 */ b lbl_80579FA4 -lbl_80579F38: -/* 80579F38 D0 21 00 08 */ stfs f1, 8(r1) -/* 80579F3C 80 81 00 08 */ lwz r4, 8(r1) -/* 80579F40 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80579F44 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80579F48 7C 03 00 00 */ cmpw r3, r0 -/* 80579F4C 41 82 00 14 */ beq lbl_80579F60 -/* 80579F50 40 80 00 40 */ bge lbl_80579F90 -/* 80579F54 2C 03 00 00 */ cmpwi r3, 0 -/* 80579F58 41 82 00 20 */ beq lbl_80579F78 -/* 80579F5C 48 00 00 34 */ b lbl_80579F90 -lbl_80579F60: -/* 80579F60 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80579F64 41 82 00 0C */ beq lbl_80579F70 -/* 80579F68 38 00 00 01 */ li r0, 1 -/* 80579F6C 48 00 00 28 */ b lbl_80579F94 -lbl_80579F70: -/* 80579F70 38 00 00 02 */ li r0, 2 -/* 80579F74 48 00 00 20 */ b lbl_80579F94 -lbl_80579F78: -/* 80579F78 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80579F7C 41 82 00 0C */ beq lbl_80579F88 -/* 80579F80 38 00 00 05 */ li r0, 5 -/* 80579F84 48 00 00 10 */ b lbl_80579F94 -lbl_80579F88: -/* 80579F88 38 00 00 03 */ li r0, 3 -/* 80579F8C 48 00 00 08 */ b lbl_80579F94 -lbl_80579F90: -/* 80579F90 38 00 00 04 */ li r0, 4 -lbl_80579F94: -/* 80579F94 2C 00 00 01 */ cmpwi r0, 1 -/* 80579F98 40 82 00 0C */ bne lbl_80579FA4 -/* 80579F9C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80579FA0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80579FA4: -/* 80579FA4 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80579FA8 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80579FAC EC 42 00 28 */ fsubs f2, f2, f0 -/* 80579FB0 C0 1F 01 18 */ lfs f0, 0x118(r31) -/* 80579FB4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80579FB8 40 80 00 24 */ bge lbl_80579FDC -/* 80579FBC C0 1F 01 1C */ lfs f0, 0x11c(r31) -/* 80579FC0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80579FC4 40 80 00 18 */ bge lbl_80579FDC -/* 80579FC8 C0 1F 01 20 */ lfs f0, 0x120(r31) -/* 80579FCC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80579FD0 40 81 00 0C */ ble lbl_80579FDC -/* 80579FD4 38 60 00 01 */ li r3, 1 -/* 80579FD8 48 00 00 08 */ b lbl_80579FE0 -lbl_80579FDC: -/* 80579FDC 38 60 00 00 */ li r3, 0 -lbl_80579FE0: -/* 80579FE0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80579FE4 4B DE 82 45 */ bl _restgpr_29 -/* 80579FE8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80579FEC 7C 08 03 A6 */ mtlr r0 -/* 80579FF0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80579FF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Create__FP10fopAc_ac_c.s deleted file mode 100644 index add7de24eb1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8057B2E4: -/* 8057B2E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057B2E8 7C 08 02 A6 */ mflr r0 -/* 8057B2EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057B2F0 4B FF E8 81 */ bl create__15daObjBossWarp_cFv -/* 8057B2F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057B2F8 7C 08 03 A6 */ mtlr r0 -/* 8057B2FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057B300 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Delete__FP15daObjBossWarp_c.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Delete__FP15daObjBossWarp_c.s deleted file mode 100644 index 12f4f6daa47..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Delete__FP15daObjBossWarp_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8057B2C4: -/* 8057B2C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057B2C8 7C 08 02 A6 */ mflr r0 -/* 8057B2CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057B2D0 4B FF FF 6D */ bl _delete__15daObjBossWarp_cFv -/* 8057B2D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057B2D8 7C 08 03 A6 */ mtlr r0 -/* 8057B2DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057B2E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Draw__FP15daObjBossWarp_c.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Draw__FP15daObjBossWarp_c.s deleted file mode 100644 index 2fa37fe2c06..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Draw__FP15daObjBossWarp_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8057B284: -/* 8057B284 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057B288 7C 08 02 A6 */ mflr r0 -/* 8057B28C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057B290 4B FF FF 01 */ bl draw__15daObjBossWarp_cFv -/* 8057B294 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057B298 7C 08 03 A6 */ mtlr r0 -/* 8057B29C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057B2A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Execute__FP15daObjBossWarp_c.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Execute__FP15daObjBossWarp_c.s deleted file mode 100644 index 3272e0629f9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Execute__FP15daObjBossWarp_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8057B2A4: -/* 8057B2A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057B2A8 7C 08 02 A6 */ mflr r0 -/* 8057B2AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057B2B0 4B FF ED 49 */ bl execute__15daObjBossWarp_cFv -/* 8057B2B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057B2B8 7C 08 03 A6 */ mtlr r0 -/* 8057B2BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057B2C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/disappear__15daObjBossWarp_cFi.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/disappear__15daObjBossWarp_cFi.s deleted file mode 100644 index 52bcd6b75e7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/disappear__15daObjBossWarp_cFi.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80579E08: -/* 80579E08 38 80 00 00 */ li r4, 0 -/* 80579E0C 38 E0 00 01 */ li r7, 1 -/* 80579E10 7C 85 23 78 */ mr r5, r4 -/* 80579E14 38 00 00 04 */ li r0, 4 -/* 80579E18 7C 09 03 A6 */ mtctr r0 -lbl_80579E1C: -/* 80579E1C 39 04 05 80 */ addi r8, r4, 0x580 -/* 80579E20 7C C3 40 2E */ lwzx r6, r3, r8 -/* 80579E24 28 06 00 00 */ cmplwi r6, 0 -/* 80579E28 41 82 00 28 */ beq lbl_80579E50 -/* 80579E2C 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 80579E30 60 00 00 01 */ ori r0, r0, 1 -/* 80579E34 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 80579E38 90 E6 00 24 */ stw r7, 0x24(r6) -/* 80579E3C 7C C3 40 2E */ lwzx r6, r3, r8 -/* 80579E40 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 80579E44 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 80579E48 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 80579E4C 7C A3 41 2E */ stwx r5, r3, r8 -lbl_80579E50: -/* 80579E50 38 84 00 04 */ addi r4, r4, 4 -/* 80579E54 42 00 FF C8 */ bdnz lbl_80579E1C -/* 80579E58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/draw__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/draw__15daObjBossWarp_cFv.s deleted file mode 100644 index 3b42871bb1a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/draw__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8057B190: -/* 8057B190 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057B194 7C 08 02 A6 */ mflr r0 -/* 8057B198 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057B19C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057B1A0 7C 7F 1B 78 */ mr r31, r3 -/* 8057B1A4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8057B1A8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8057B1AC 38 80 00 00 */ li r4, 0 -/* 8057B1B0 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8057B1B4 38 DF 01 0C */ addi r6, r31, 0x10c -/* 8057B1B8 4B C2 86 0D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8057B1BC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8057B1C0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8057B1C4 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 8057B1C8 80 84 00 04 */ lwz r4, 4(r4) -/* 8057B1CC 38 BF 01 0C */ addi r5, r31, 0x10c -/* 8057B1D0 4B C2 9B D1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8057B1D4 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 8057B1D8 80 83 00 04 */ lwz r4, 4(r3) -/* 8057B1DC 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 8057B1E0 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8057B1E4 38 84 00 58 */ addi r4, r4, 0x58 -/* 8057B1E8 4B A9 25 C1 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 8057B1EC 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 8057B1F0 80 83 00 04 */ lwz r4, 4(r3) -/* 8057B1F4 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 8057B1F8 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8057B1FC 38 84 00 58 */ addi r4, r4, 0x58 -/* 8057B200 4B A9 24 D9 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 8057B204 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 8057B208 80 83 00 04 */ lwz r4, 4(r3) -/* 8057B20C 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 8057B210 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8057B214 38 84 00 58 */ addi r4, r4, 0x58 -/* 8057B218 4B A9 24 C1 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 8057B21C 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 8057B220 4B A9 2A A5 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8057B224 38 60 00 01 */ li r3, 1 -/* 8057B228 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057B22C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057B230 7C 08 03 A6 */ mtlr r0 -/* 8057B234 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057B238 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/event_proc_call__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/event_proc_call__15daObjBossWarp_cFv.s deleted file mode 100644 index d8dd7def62c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/event_proc_call__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,91 +0,0 @@ -lbl_8057A390: -/* 8057A390 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057A394 7C 08 02 A6 */ mflr r0 -/* 8057A398 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057A39C 3C 80 80 58 */ lis r4, cNullVec__6Z2Calc@ha /* 0x8057B658@ha */ -/* 8057A3A0 38 C4 B6 58 */ addi r6, r4, cNullVec__6Z2Calc@l /* 0x8057B658@l */ -/* 8057A3A4 3C 80 80 58 */ lis r4, data_8057B8D0@ha /* 0x8057B8D0@ha */ -/* 8057A3A8 38 A4 B8 D0 */ addi r5, r4, data_8057B8D0@l /* 0x8057B8D0@l */ -/* 8057A3AC 88 05 00 00 */ lbz r0, 0(r5) -/* 8057A3B0 7C 00 07 75 */ extsb. r0, r0 -/* 8057A3B4 40 82 01 18 */ bne lbl_8057A4CC -/* 8057A3B8 80 86 00 50 */ lwz r4, 0x50(r6) -/* 8057A3BC 80 06 00 54 */ lwz r0, 0x54(r6) -/* 8057A3C0 90 86 00 D4 */ stw r4, 0xd4(r6) -/* 8057A3C4 90 06 00 D8 */ stw r0, 0xd8(r6) -/* 8057A3C8 80 06 00 58 */ lwz r0, 0x58(r6) -/* 8057A3CC 90 06 00 DC */ stw r0, 0xdc(r6) -/* 8057A3D0 38 86 00 D4 */ addi r4, r6, 0xd4 -/* 8057A3D4 80 E6 00 5C */ lwz r7, 0x5c(r6) -/* 8057A3D8 80 06 00 60 */ lwz r0, 0x60(r6) -/* 8057A3DC 90 E4 00 0C */ stw r7, 0xc(r4) -/* 8057A3E0 90 04 00 10 */ stw r0, 0x10(r4) -/* 8057A3E4 80 06 00 64 */ lwz r0, 0x64(r6) -/* 8057A3E8 90 04 00 14 */ stw r0, 0x14(r4) -/* 8057A3EC 80 E6 00 68 */ lwz r7, 0x68(r6) -/* 8057A3F0 80 06 00 6C */ lwz r0, 0x6c(r6) -/* 8057A3F4 90 E4 00 18 */ stw r7, 0x18(r4) -/* 8057A3F8 90 04 00 1C */ stw r0, 0x1c(r4) -/* 8057A3FC 80 06 00 70 */ lwz r0, 0x70(r6) -/* 8057A400 90 04 00 20 */ stw r0, 0x20(r4) -/* 8057A404 80 E6 00 74 */ lwz r7, 0x74(r6) -/* 8057A408 80 06 00 78 */ lwz r0, 0x78(r6) -/* 8057A40C 90 E4 00 24 */ stw r7, 0x24(r4) -/* 8057A410 90 04 00 28 */ stw r0, 0x28(r4) -/* 8057A414 80 06 00 7C */ lwz r0, 0x7c(r6) -/* 8057A418 90 04 00 2C */ stw r0, 0x2c(r4) -/* 8057A41C 80 E6 00 80 */ lwz r7, 0x80(r6) -/* 8057A420 80 06 00 84 */ lwz r0, 0x84(r6) -/* 8057A424 90 E4 00 30 */ stw r7, 0x30(r4) -/* 8057A428 90 04 00 34 */ stw r0, 0x34(r4) -/* 8057A42C 80 06 00 88 */ lwz r0, 0x88(r6) -/* 8057A430 90 04 00 38 */ stw r0, 0x38(r4) -/* 8057A434 80 E6 00 8C */ lwz r7, 0x8c(r6) -/* 8057A438 80 06 00 90 */ lwz r0, 0x90(r6) -/* 8057A43C 90 E4 00 3C */ stw r7, 0x3c(r4) -/* 8057A440 90 04 00 40 */ stw r0, 0x40(r4) -/* 8057A444 80 06 00 94 */ lwz r0, 0x94(r6) -/* 8057A448 90 04 00 44 */ stw r0, 0x44(r4) -/* 8057A44C 80 E6 00 98 */ lwz r7, 0x98(r6) -/* 8057A450 80 06 00 9C */ lwz r0, 0x9c(r6) -/* 8057A454 90 E4 00 48 */ stw r7, 0x48(r4) -/* 8057A458 90 04 00 4C */ stw r0, 0x4c(r4) -/* 8057A45C 80 06 00 A0 */ lwz r0, 0xa0(r6) -/* 8057A460 90 04 00 50 */ stw r0, 0x50(r4) -/* 8057A464 80 E6 00 A4 */ lwz r7, 0xa4(r6) -/* 8057A468 80 06 00 A8 */ lwz r0, 0xa8(r6) -/* 8057A46C 90 E4 00 54 */ stw r7, 0x54(r4) -/* 8057A470 90 04 00 58 */ stw r0, 0x58(r4) -/* 8057A474 80 06 00 AC */ lwz r0, 0xac(r6) -/* 8057A478 90 04 00 5C */ stw r0, 0x5c(r4) -/* 8057A47C 80 E6 00 B0 */ lwz r7, 0xb0(r6) -/* 8057A480 80 06 00 B4 */ lwz r0, 0xb4(r6) -/* 8057A484 90 E4 00 60 */ stw r7, 0x60(r4) -/* 8057A488 90 04 00 64 */ stw r0, 0x64(r4) -/* 8057A48C 80 06 00 B8 */ lwz r0, 0xb8(r6) -/* 8057A490 90 04 00 68 */ stw r0, 0x68(r4) -/* 8057A494 80 E6 00 BC */ lwz r7, 0xbc(r6) -/* 8057A498 80 06 00 C0 */ lwz r0, 0xc0(r6) -/* 8057A49C 90 E4 00 6C */ stw r7, 0x6c(r4) -/* 8057A4A0 90 04 00 70 */ stw r0, 0x70(r4) -/* 8057A4A4 80 06 00 C4 */ lwz r0, 0xc4(r6) -/* 8057A4A8 90 04 00 74 */ stw r0, 0x74(r4) -/* 8057A4AC 80 E6 00 C8 */ lwz r7, 0xc8(r6) -/* 8057A4B0 80 06 00 CC */ lwz r0, 0xcc(r6) -/* 8057A4B4 90 E4 00 78 */ stw r7, 0x78(r4) -/* 8057A4B8 90 04 00 7C */ stw r0, 0x7c(r4) -/* 8057A4BC 80 06 00 D0 */ lwz r0, 0xd0(r6) -/* 8057A4C0 90 04 00 80 */ stw r0, 0x80(r4) -/* 8057A4C4 38 00 00 01 */ li r0, 1 -/* 8057A4C8 98 05 00 00 */ stb r0, 0(r5) -lbl_8057A4CC: -/* 8057A4CC 88 03 05 90 */ lbz r0, 0x590(r3) -/* 8057A4D0 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8057A4D4 39 86 00 D4 */ addi r12, r6, 0xd4 -/* 8057A4D8 7D 8C 02 14 */ add r12, r12, r0 -/* 8057A4DC 4B DE 7B A9 */ bl __ptmf_scall -/* 8057A4E0 60 00 00 00 */ nop -/* 8057A4E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057A4E8 7C 08 03 A6 */ mtlr r0 -/* 8057A4EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057A4F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/func_80579B70.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/func_80579B70.s deleted file mode 100644 index fa179f3a495..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/func_80579B70.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80579B70: -/* 80579B70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80579B74 7C 08 02 A6 */ mflr r0 -/* 80579B78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80579B7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80579B80 93 C1 00 08 */ stw r30, 8(r1) -/* 80579B84 7C 7E 1B 78 */ mr r30, r3 -/* 80579B88 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80579B8C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80579B90 40 82 00 28 */ bne lbl_80579BB8 -/* 80579B94 7F C0 F3 79 */ or. r0, r30, r30 -/* 80579B98 41 82 00 14 */ beq lbl_80579BAC -/* 80579B9C 7C 1F 03 78 */ mr r31, r0 -/* 80579BA0 4B A9 EF C5 */ bl __ct__10fopAc_ac_cFv -/* 80579BA4 38 7F 05 D0 */ addi r3, r31, 0x5d0 -/* 80579BA8 4B CD 03 59 */ bl __ct__10dMsgFlow_cFv -lbl_80579BAC: -/* 80579BAC 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80579BB0 60 00 00 08 */ ori r0, r0, 8 -/* 80579BB4 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80579BB8: -/* 80579BB8 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80579BBC 3C 80 80 58 */ lis r4, l_arcName@ha /* 0x8057B678@ha */ -/* 80579BC0 38 84 B6 78 */ addi r4, r4, l_arcName@l /* 0x8057B678@l */ -/* 80579BC4 80 84 00 00 */ lwz r4, 0(r4) -/* 80579BC8 4B AB 32 F5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80579BCC 7C 7F 1B 78 */ mr r31, r3 -/* 80579BD0 2C 1F 00 04 */ cmpwi r31, 4 -/* 80579BD4 40 82 00 40 */ bne lbl_80579C14 -/* 80579BD8 7F C3 F3 78 */ mr r3, r30 -/* 80579BDC 3C 80 80 58 */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x80579638@ha */ -/* 80579BE0 38 84 96 38 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x80579638@l */ -/* 80579BE4 38 A0 18 E0 */ li r5, 0x18e0 -/* 80579BE8 4B AA 08 C9 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80579BEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80579BF0 40 82 00 0C */ bne lbl_80579BFC -/* 80579BF4 38 60 00 05 */ li r3, 5 -/* 80579BF8 48 00 00 20 */ b lbl_80579C18 -lbl_80579BFC: -/* 80579BFC 7F C3 F3 78 */ mr r3, r30 -/* 80579C00 4B FF FB B9 */ bl Create__15daObjBossWarp_cFv -/* 80579C04 2C 03 00 00 */ cmpwi r3, 0 -/* 80579C08 40 82 00 0C */ bne lbl_80579C14 -/* 80579C0C 38 60 00 05 */ li r3, 5 -/* 80579C10 48 00 00 08 */ b lbl_80579C18 -lbl_80579C14: -/* 80579C14 7F E3 FB 78 */ mr r3, r31 -lbl_80579C18: -/* 80579C18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80579C1C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80579C20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80579C24 7C 08 03 A6 */ mtlr r0 -/* 80579C28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80579C2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/getNowLevel__Fv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/getNowLevel__Fv.s deleted file mode 100644 index a41992d5224..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/getNowLevel__Fv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80579658: -/* 80579658 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8057965C 7C 08 02 A6 */ mflr r0 -/* 80579660 90 01 00 44 */ stw r0, 0x44(r1) -/* 80579664 39 61 00 40 */ addi r11, r1, 0x40 -/* 80579668 4B DE 8B 71 */ bl _savegpr_28 -/* 8057966C 38 A1 00 04 */ addi r5, r1, 4 -/* 80579670 3C 60 80 58 */ lis r3, lit_3683@ha /* 0x8057B408@ha */ -/* 80579674 38 63 B4 08 */ addi r3, r3, lit_3683@l /* 0x8057B408@l */ -/* 80579678 38 83 FF FC */ addi r4, r3, -4 -/* 8057967C 38 00 00 04 */ li r0, 4 -/* 80579680 7C 09 03 A6 */ mtctr r0 -lbl_80579684: -/* 80579684 80 64 00 04 */ lwz r3, 4(r4) -/* 80579688 84 04 00 08 */ lwzu r0, 8(r4) -/* 8057968C 90 65 00 04 */ stw r3, 4(r5) -/* 80579690 94 05 00 08 */ stwu r0, 8(r5) -/* 80579694 42 00 FF F0 */ bdnz lbl_80579684 -/* 80579698 80 04 00 04 */ lwz r0, 4(r4) -/* 8057969C 90 05 00 04 */ stw r0, 4(r5) -/* 805796A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805796A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805796A8 3B A3 4E 00 */ addi r29, r3, 0x4e00 -/* 805796AC 3B 80 00 00 */ li r28, 0 -/* 805796B0 3B E0 00 00 */ li r31, 0 -/* 805796B4 3B C1 00 08 */ addi r30, r1, 8 -lbl_805796B8: -/* 805796B8 7F A3 EB 78 */ mr r3, r29 -/* 805796BC 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 805796C0 4B DE F2 D5 */ bl strcmp -/* 805796C4 2C 03 00 00 */ cmpwi r3, 0 -/* 805796C8 40 82 00 0C */ bne lbl_805796D4 -/* 805796CC 7F 83 E3 78 */ mr r3, r28 -/* 805796D0 48 00 00 18 */ b lbl_805796E8 -lbl_805796D4: -/* 805796D4 3B 9C 00 01 */ addi r28, r28, 1 -/* 805796D8 2C 1C 00 09 */ cmpwi r28, 9 -/* 805796DC 3B FF 00 04 */ addi r31, r31, 4 -/* 805796E0 41 80 FF D8 */ blt lbl_805796B8 -/* 805796E4 38 60 FF FF */ li r3, -1 -lbl_805796E8: -/* 805796E8 39 61 00 40 */ addi r11, r1, 0x40 -/* 805796EC 4B DE 8B 39 */ bl _restgpr_28 -/* 805796F0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 805796F4 7C 08 03 A6 */ mtlr r0 -/* 805796F8 38 21 00 40 */ addi r1, r1, 0x40 -/* 805796FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/initBaseMtx__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/initBaseMtx__15daObjBossWarp_cFv.s deleted file mode 100644 index 4a4af2d791e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/initBaseMtx__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80579700: -/* 80579700 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80579704 7C 08 02 A6 */ mflr r0 -/* 80579708 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057970C 3C 80 80 58 */ lis r4, lit_3701@ha /* 0x8057B42C@ha */ -/* 80579710 C0 04 B4 2C */ lfs f0, lit_3701@l(r4) /* 0x8057B42C@l */ -/* 80579714 D0 03 04 F0 */ stfs f0, 0x4f0(r3) -/* 80579718 80 83 05 70 */ lwz r4, 0x570(r3) -/* 8057971C C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80579720 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80579724 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80579728 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 8057972C C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80579730 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80579734 48 00 00 15 */ bl setBaseMtx__15daObjBossWarp_cFv -/* 80579738 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057973C 7C 08 03 A6 */ mtlr r0 -/* 80579740 38 21 00 10 */ addi r1, r1, 0x10 -/* 80579744 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setBaseMtx__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setBaseMtx__15daObjBossWarp_cFv.s deleted file mode 100644 index b823bafa431..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setBaseMtx__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80579748: -/* 80579748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057974C 7C 08 02 A6 */ mflr r0 -/* 80579750 90 01 00 14 */ stw r0, 0x14(r1) -/* 80579754 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80579758 7C 7F 1B 78 */ mr r31, r3 -/* 8057975C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80579760 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80579764 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80579768 3C 80 80 58 */ lis r4, lit_3715@ha /* 0x8057B430@ha */ -/* 8057976C C0 44 B4 30 */ lfs f2, lit_3715@l(r4) /* 0x8057B430@l */ -/* 80579770 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80579774 EC 42 00 2A */ fadds f2, f2, f0 -/* 80579778 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 8057977C 4B DC D1 6D */ bl PSMTXTrans -/* 80579780 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80579784 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80579788 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8057978C 4B A9 2C A9 */ bl mDoMtx_YrotM__FPA4_fs -/* 80579790 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80579794 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80579798 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 8057979C 38 84 00 24 */ addi r4, r4, 0x24 -/* 805797A0 4B DC CD 11 */ bl PSMTXCopy -/* 805797A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805797A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805797AC 7C 08 03 A6 */ mtlr r0 -/* 805797B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 805797B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setGoal__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setGoal__15daObjBossWarp_cFv.s deleted file mode 100644 index 41eb982366f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setGoal__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8057B0D8: -/* 8057B0D8 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8057B0DC 7C 08 02 A6 */ mflr r0 -/* 8057B0E0 90 01 00 64 */ stw r0, 0x64(r1) -/* 8057B0E4 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8057B0E8 7C 7F 1B 78 */ mr r31, r3 -/* 8057B0EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057B0F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057B0F4 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 8057B0F8 38 61 00 2C */ addi r3, r1, 0x2c -/* 8057B0FC 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 8057B100 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8057B104 4B CE BA 31 */ bl __mi__4cXyzCFRC3Vec -/* 8057B108 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8057B10C D0 01 00 44 */ stfs f0, 0x44(r1) -/* 8057B110 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 8057B114 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 8057B118 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 8057B11C D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 8057B120 38 61 00 20 */ addi r3, r1, 0x20 -/* 8057B124 38 81 00 44 */ addi r4, r1, 0x44 -/* 8057B128 4B CE BE 21 */ bl normalizeZP__4cXyzFv -/* 8057B12C 38 61 00 14 */ addi r3, r1, 0x14 -/* 8057B130 38 81 00 20 */ addi r4, r1, 0x20 -/* 8057B134 3C A0 80 58 */ lis r5, lit_4541@ha /* 0x8057B4E8@ha */ -/* 8057B138 C0 25 B4 E8 */ lfs f1, lit_4541@l(r5) /* 0x8057B4E8@l */ -/* 8057B13C 4B CE BA 49 */ bl __ml__4cXyzCFf -/* 8057B140 38 61 00 08 */ addi r3, r1, 8 -/* 8057B144 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8057B148 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8057B14C 4B CE B9 99 */ bl __pl__4cXyzCFRC3Vec -/* 8057B150 C0 01 00 08 */ lfs f0, 8(r1) -/* 8057B154 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 8057B158 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8057B15C D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 8057B160 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8057B164 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 8057B168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057B16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057B170 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8057B174 38 81 00 38 */ addi r4, r1, 0x38 -/* 8057B178 4B AC D2 4D */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 8057B17C 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 8057B180 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8057B184 7C 08 03 A6 */ mtlr r0 -/* 8057B188 38 21 00 60 */ addi r1, r1, 0x60 -/* 8057B18C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/set_appear__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/set_appear__15daObjBossWarp_cFv.s deleted file mode 100644 index c68f47490b5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/set_appear__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80579D98: -/* 80579D98 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80579D9C 7C 08 02 A6 */ mflr r0 -/* 80579DA0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80579DA4 80 A3 05 7C */ lwz r5, 0x57c(r3) -/* 80579DA8 A8 05 00 08 */ lha r0, 8(r5) -/* 80579DAC 3C 80 80 58 */ lis r4, lit_3918@ha /* 0x8057B458@ha */ -/* 80579DB0 C8 24 B4 58 */ lfd f1, lit_3918@l(r4) /* 0x8057B458@l */ -/* 80579DB4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80579DB8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80579DBC 3C 80 43 30 */ lis r4, 0x4330 -/* 80579DC0 90 81 00 08 */ stw r4, 8(r1) -/* 80579DC4 C8 01 00 08 */ lfd f0, 8(r1) -/* 80579DC8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80579DCC D0 05 00 10 */ stfs f0, 0x10(r5) -/* 80579DD0 80 A3 05 78 */ lwz r5, 0x578(r3) -/* 80579DD4 A8 05 00 08 */ lha r0, 8(r5) -/* 80579DD8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80579DDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80579DE0 90 81 00 10 */ stw r4, 0x10(r1) -/* 80579DE4 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80579DE8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80579DEC D0 05 00 10 */ stfs f0, 0x10(r5) -/* 80579DF0 38 80 00 00 */ li r4, 0 -/* 80579DF4 4B FF FE 3D */ bl appear__15daObjBossWarp_cFi -/* 80579DF8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80579DFC 7C 08 03 A6 */ mtlr r0 -/* 80579E00 38 21 00 20 */ addi r1, r1, 0x20 -/* 80579E04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Delete__FP16obj_ystone_class.s b/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Delete__FP16obj_ystone_class.s deleted file mode 100644 index 5c648f345b1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Delete__FP16obj_ystone_class.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80D3E778: -/* 80D3E778 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D3E77C 7C 08 02 A6 */ mflr r0 -/* 80D3E780 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D3E784 7C 64 1B 78 */ mr r4, r3 -/* 80D3E788 38 64 05 68 */ addi r3, r4, 0x568 -/* 80D3E78C 88 04 05 99 */ lbz r0, 0x599(r4) -/* 80D3E790 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3E794 3C 80 80 D4 */ lis r4, l_arcName@ha /* 0x80D3ECBC@ha */ -/* 80D3E798 38 84 EC BC */ addi r4, r4, l_arcName@l /* 0x80D3ECBC@l */ -/* 80D3E79C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80D3E7A0 4B 2E E8 69 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D3E7A4 38 60 00 01 */ li r3, 1 -/* 80D3E7A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D3E7AC 7C 08 03 A6 */ mtlr r0 -/* 80D3E7B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D3E7B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Draw__FP16obj_ystone_class.s b/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Draw__FP16obj_ystone_class.s deleted file mode 100644 index 7f9917d11c9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Draw__FP16obj_ystone_class.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80D3E090: -/* 80D3E090 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D3E094 7C 08 02 A6 */ mflr r0 -/* 80D3E098 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D3E09C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D3E0A0 93 C1 00 08 */ stw r30, 8(r1) -/* 80D3E0A4 7C 7E 1B 78 */ mr r30, r3 -/* 80D3E0A8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D3E0AC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D3E0B0 38 80 00 00 */ li r4, 0 -/* 80D3E0B4 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80D3E0B8 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80D3E0BC 4B 46 57 09 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D3E0C0 88 1E 05 99 */ lbz r0, 0x599(r30) -/* 80D3E0C4 28 00 00 03 */ cmplwi r0, 3 -/* 80D3E0C8 40 80 00 4C */ bge lbl_80D3E114 -/* 80D3E0CC 88 1E 05 9B */ lbz r0, 0x59b(r30) -/* 80D3E0D0 28 00 00 00 */ cmplwi r0, 0 -/* 80D3E0D4 40 82 00 90 */ bne lbl_80D3E164 -/* 80D3E0D8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D3E0DC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D3E0E0 80 9E 05 70 */ lwz r4, 0x570(r30) -/* 80D3E0E4 80 84 00 04 */ lwz r4, 4(r4) -/* 80D3E0E8 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80D3E0EC 4B 46 6C B5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D3E0F0 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80D3E0F4 80 83 00 04 */ lwz r4, 4(r3) -/* 80D3E0F8 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80D3E0FC C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80D3E100 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D3E104 4B 2C F6 A5 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80D3E108 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80D3E10C 4B 2C FB B9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D3E110 48 00 00 54 */ b lbl_80D3E164 -lbl_80D3E114: -/* 80D3E114 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 80D3E118 83 E3 00 04 */ lwz r31, 4(r3) -/* 80D3E11C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D3E120 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D3E124 80 9F 00 04 */ lwz r4, 4(r31) -/* 80D3E128 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80D3E12C 4B 46 6C 75 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D3E130 88 1E 05 9A */ lbz r0, 0x59a(r30) -/* 80D3E134 28 00 00 00 */ cmplwi r0, 0 -/* 80D3E138 41 82 00 18 */ beq lbl_80D3E150 -/* 80D3E13C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80D3E140 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D3E144 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80D3E148 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D3E14C 4B 2C F5 8D */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -lbl_80D3E150: -/* 80D3E150 7F C3 F3 78 */ mr r3, r30 -/* 80D3E154 80 9F 00 04 */ lwz r4, 4(r31) -/* 80D3E158 4B 2D F2 D5 */ bl fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData -/* 80D3E15C 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 80D3E160 4B 2D 30 61 */ bl entryDL__16mDoExt_McaMorfSOFv -lbl_80D3E164: -/* 80D3E164 38 60 00 01 */ li r3, 1 -/* 80D3E168 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D3E16C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D3E170 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D3E174 7C 08 03 A6 */ mtlr r0 -/* 80D3E178 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D3E17C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Execute__FP16obj_ystone_class.s b/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Execute__FP16obj_ystone_class.s deleted file mode 100644 index 8dc74f5ca72..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Execute__FP16obj_ystone_class.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80D3E6EC: -/* 80D3E6EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D3E6F0 7C 08 02 A6 */ mflr r0 -/* 80D3E6F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D3E6F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D3E6FC 7C 7F 1B 78 */ mr r31, r3 -/* 80D3E700 88 03 05 99 */ lbz r0, 0x599(r3) -/* 80D3E704 28 00 00 03 */ cmplwi r0, 3 -/* 80D3E708 40 80 00 18 */ bge lbl_80D3E720 -/* 80D3E70C 88 1F 05 9B */ lbz r0, 0x59b(r31) -/* 80D3E710 28 00 00 00 */ cmplwi r0, 0 -/* 80D3E714 41 82 00 0C */ beq lbl_80D3E720 -/* 80D3E718 38 60 00 01 */ li r3, 1 -/* 80D3E71C 48 00 00 40 */ b lbl_80D3E75C -lbl_80D3E720: -/* 80D3E720 7F E3 FB 78 */ mr r3, r31 -/* 80D3E724 4B FF FB 39 */ bl action__FP16obj_ystone_class -/* 80D3E728 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80D3E72C D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 80D3E730 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80D3E734 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80D3E738 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80D3E73C D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 80D3E740 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80D3E744 D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 80D3E748 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80D3E74C D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 80D3E750 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80D3E754 D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 80D3E758 38 60 00 01 */ li r3, 1 -lbl_80D3E75C: -/* 80D3E75C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D3E760 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D3E764 7C 08 03 A6 */ mtlr r0 -/* 80D3E768 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D3E76C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/getNowLevel__Fv.s b/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/getNowLevel__Fv.s deleted file mode 100644 index c31349d6e06..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/getNowLevel__Fv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80D3E018: -/* 80D3E018 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D3E01C 7C 08 02 A6 */ mflr r0 -/* 80D3E020 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D3E024 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D3E028 4B 62 41 B1 */ bl _savegpr_28 -/* 80D3E02C 3B 80 00 00 */ li r28, 0 -/* 80D3E030 3B E0 00 00 */ li r31, 0 -/* 80D3E034 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D3E038 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D3E03C 3B A3 4E 00 */ addi r29, r3, 0x4e00 -/* 80D3E040 3C 60 80 D4 */ lis r3, l_stageName@ha /* 0x80D3ECD8@ha */ -/* 80D3E044 3B C3 EC D8 */ addi r30, r3, l_stageName@l /* 0x80D3ECD8@l */ -lbl_80D3E048: -/* 80D3E048 7F A3 EB 78 */ mr r3, r29 -/* 80D3E04C 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80D3E050 4B 62 A9 45 */ bl strcmp -/* 80D3E054 2C 03 00 00 */ cmpwi r3, 0 -/* 80D3E058 40 82 00 0C */ bne lbl_80D3E064 -/* 80D3E05C 38 7C 00 01 */ addi r3, r28, 1 -/* 80D3E060 48 00 00 18 */ b lbl_80D3E078 -lbl_80D3E064: -/* 80D3E064 3B 9C 00 01 */ addi r28, r28, 1 -/* 80D3E068 2C 1C 00 09 */ cmpwi r28, 9 -/* 80D3E06C 3B FF 00 04 */ addi r31, r31, 4 -/* 80D3E070 41 80 FF D8 */ blt lbl_80D3E048 -/* 80D3E074 38 60 FF FF */ li r3, -1 -lbl_80D3E078: -/* 80D3E078 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D3E07C 4B 62 41 A9 */ bl _restgpr_28 -/* 80D3E080 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D3E084 7C 08 03 A6 */ mtlr r0 -/* 80D3E088 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D3E08C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/setModelBaseMtx__FP16obj_ystone_class.s b/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/setModelBaseMtx__FP16obj_ystone_class.s deleted file mode 100644 index 7f52fd2f1f1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/setModelBaseMtx__FP16obj_ystone_class.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80D3E180: -/* 80D3E180 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D3E184 7C 08 02 A6 */ mflr r0 -/* 80D3E188 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D3E18C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D3E190 93 C1 00 08 */ stw r30, 8(r1) -/* 80D3E194 7C 7E 1B 78 */ mr r30, r3 -/* 80D3E198 88 03 05 99 */ lbz r0, 0x599(r3) -/* 80D3E19C 28 00 00 03 */ cmplwi r0, 3 -/* 80D3E1A0 40 80 00 0C */ bge lbl_80D3E1AC -/* 80D3E1A4 83 FE 05 70 */ lwz r31, 0x570(r30) -/* 80D3E1A8 48 00 00 0C */ b lbl_80D3E1B4 -lbl_80D3E1AC: -/* 80D3E1AC 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 80D3E1B0 83 E3 00 04 */ lwz r31, 4(r3) -lbl_80D3E1B4: -/* 80D3E1B4 88 1E 05 98 */ lbz r0, 0x598(r30) -/* 80D3E1B8 7C 00 07 75 */ extsb. r0, r0 -/* 80D3E1BC 40 82 00 50 */ bne lbl_80D3E20C -/* 80D3E1C0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3E1C4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D3E1C8 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80D3E1CC C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80D3E1D0 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 80D3E1D4 4B 60 87 15 */ bl PSMTXTrans -/* 80D3E1D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3E1DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D3E1E0 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80D3E1E4 4B 2C E2 51 */ bl mDoMtx_YrotM__FPA4_fs -/* 80D3E1E8 C0 3E 05 80 */ lfs f1, 0x580(r30) -/* 80D3E1EC FC 40 08 90 */ fmr f2, f1 -/* 80D3E1F0 FC 60 08 90 */ fmr f3, f1 -/* 80D3E1F4 4B 2C EC 45 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80D3E1F8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3E1FC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D3E200 38 9F 00 24 */ addi r4, r31, 0x24 -/* 80D3E204 4B 60 82 AD */ bl PSMTXCopy -/* 80D3E208 48 00 00 3C */ b lbl_80D3E244 -lbl_80D3E20C: -/* 80D3E20C 38 00 00 00 */ li r0, 0 -/* 80D3E210 98 1E 05 98 */ stb r0, 0x598(r30) -/* 80D3E214 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80D3E218 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3E21C 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D3E220 4B 60 82 91 */ bl PSMTXCopy -/* 80D3E224 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3E228 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D3E22C C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80D3E230 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 80D3E234 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80D3E238 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80D3E23C C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 80D3E240 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -lbl_80D3E244: -/* 80D3E244 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D3E248 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D3E24C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D3E250 7C 08 03 A6 */ mtlr r0 -/* 80D3E254 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D3E258 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 7c8a7849609..d0ecd959d39 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -3214,6 +3214,10 @@ inline int dComIfGp_evmng_startDemo(int param_0) { return dComIfGp_getPEvtManager()->setStartDemo(param_0); } +inline void dComIfGp_event_setTalkPartner(fopAc_ac_c* i_actor) { + g_dComIfG_gameInfo.play.getEvent().setPtT(i_actor); +} + inline fopAc_ac_c* dComIfGp_event_getTalkPartner() { u32 t = g_dComIfG_gameInfo.play.getEvent().mPtT; return g_dComIfG_gameInfo.play.getEvent().convPId(t); diff --git a/include/rel/d/a/d_a_midna/d_a_midna.h b/include/rel/d/a/d_a_midna/d_a_midna.h index 529f8de7c9d..363d8790382 100644 --- a/include/rel/d/a/d_a_midna/d_a_midna.h +++ b/include/rel/d/a/d_a_midna/d_a_midna.h @@ -137,6 +137,10 @@ public: onStateFlg1(FLG1_UNK_100); } + MtxP getMtxHairTop() { + return field_0x574->i_getAnmMtx(10); + } + bool checkReturnAnime() const { return field_0x5e4[0].getIdx() == 0x1CA; } diff --git a/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h b/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h index fed1c4157f1..9acb6f300ae 100644 --- a/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h +++ b/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h @@ -1,6 +1,86 @@ #ifndef D_A_OBJ_BOSSWARP_H #define D_A_OBJ_BOSSWARP_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "f_op/f_op_actor_mng.h" +#include "d/msg/d_msg_flow.h" + +class daObjBossWarp_c : public fopAc_ac_c { +public: + enum Action { + /* 0x0 */ ACT_WAIT, + /* 0x1 */ ACT_ORDER_EVENT, + /* 0x2 */ ACT_EVENT, + /* 0x3 */ ACT_WAIT_WARP, + /* 0x4 */ ACT_ORDER_WARP_EVENT, + /* 0x5 */ ACT_WARP_EVENT, + /* 0x6 */ ACT_DEAD, + /* 0x7 */ ACT_ORDER_CHK_EVENT, + /* 0x8 */ ACT_CHK_EVENT, + /* 0x9 */ ACT_ORDER_CANCEL_EVENT, + /* 0xA */ ACT_CANCEL_EVENT, + }; + + /* 80579700 */ void initBaseMtx(); + /* 80579748 */ void setBaseMtx(); + /* 805797B8 */ int Create(); + /* 80579934 */ int CreateHeap(); + /* 80579B70 */ cPhs__Step create(); + /* 80579C30 */ void appear(int); + /* 80579D98 */ void set_appear(); + /* 80579E08 */ void disappear(int); + /* 80579E5C */ BOOL checkDistance(); + /* 80579FF8 */ int execute(); + /* 8057A390 */ void event_proc_call(); + /* 8057A4F4 */ void actionWait(); + /* 8057A54C */ void actionOrderEvent(); + /* 8057A610 */ void actionEvent(); + /* 8057A678 */ void actionWaitWarp(); + /* 8057A6E0 */ void actionOrderWarpEvent(); + /* 8057A778 */ void actionWarpEvent(); + /* 8057A7C4 */ void actionDead(); + /* 8057A7C8 */ void actionOrderChkEvent(); + /* 8057A8B4 */ void actionChkEvent(); + /* 8057A994 */ void actionOrderCancelEvent(); + /* 8057AA2C */ void actionCancelEvent(); + /* 8057AA94 */ int demoProc(); + /* 8057B0D8 */ void setGoal(); + /* 8057B190 */ int draw(); + /* 8057B23C */ int _delete(); + + u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getSceneListNo() { return fopAcM_GetParamBit(this, 8, 8); } + bool isFirst() { return fopAcM_GetParamBit(this, 0x1b, 1); } + void setAction(u8 action) { mAction = action; } + + /* 0x568 */ request_of_phase_process_class mPhaseReq; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ mDoExt_btkAnm* mpBtkAnm[2]; + /* 0x57C */ mDoExt_brkAnm* mpBrkAnm; + /* 0x580 */ JPABaseEmitter* mpParticle[4]; + /* 0x590 */ u8 mAction; + /* 0x591 */ bool field_0x591; + /* 0x592 */ s16 mBossClearEventId; + /* 0x594 */ u8 mBossClearMapToolId; + /* 0x595 */ bool field_0x595; + /* 0x596 */ s16 mBossWarpInEventId; + /* 0x598 */ u8 mBossWarpInMapToolId; + /* 0x599 */ u8 field_0x599; + /* 0x59C */ int mStaffId; + /* 0x5A0 */ int mTimer; + /* 0x5A4 */ cXyz mYstonePos; + /* 0x5B0 */ cXyz mYstoneTargetPos; + /* 0x5BC */ cXyz mParticlePos; + /* 0x5C8 */ s16 mWarpCheckEventId; + /* 0x5CA */ u16 mCounter; + /* 0x5CC */ f32 mScaleF; + /* 0x5D0 */ dMsgFlow_c mMsgFlow; + /* 0x61C */ u16 mWarpChoice; + /* 0x61E */ s16 mWarpCancelEventId; + /* 0x620 */ cXyz field_0x620; + /* 0x62C */ bool mScalingUp; +}; + +STATIC_ASSERT(sizeof(daObjBossWarp_c) == 0x630); #endif /* D_A_OBJ_BOSSWARP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h b/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h index 4cf170ecdfc..5e8b7314ca1 100644 --- a/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h +++ b/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h @@ -1,6 +1,53 @@ #ifndef D_A_OBJ_YSTONE_H #define D_A_OBJ_YSTONE_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "f_op/f_op_actor.h" + +class obj_ystone_class : public fopAc_ac_c { +public: + void setCurrentPos(cXyz i_pos) { + current.pos = i_pos; + } + + void setBaseMtx(MtxP i_mtx) { + field_0x598 = 1; + if (mLevel < 3) { + if (mpModel != NULL) { + mpModel->i_setBaseTRMtx(i_mtx); + } + } else { + if (mpMorf != NULL) { + mpMorf->getModel()->i_setBaseTRMtx(i_mtx); + } + } + } + + int getMirrorMode() { + return mMirrorMode; + } + + void setMirrorMode(int i_mode) { + mMirrorMode = i_mode; + } + + /* 0x568 */ request_of_phase_process_class mPhaseReq; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ mDoExt_brkAnm* mpBrkAnm; + /* 0x578 */ mDoExt_btkAnm* mpBtkAnm; + /* 0x57C */ mDoExt_McaMorfSO* mpMorf; + /* 0x580 */ f32 mScaleF; + /* 0x584 */ u8 field_0x584[2]; + /* 0x586 */ s16 mShadowMode; + /* 0x588 */ u8 field_0x588[4]; + /* 0x58C */ int mMirrorMode; + /* 0x590 */ int mTimer; + /* 0x594 */ u32 mParticleKey; + /* 0x598 */ s8 field_0x598; + /* 0x599 */ u8 mLevel; + /* 0x59A */ bool field_0x59a; + /* 0x59B */ bool field_0x59b; + /* 0x59C */ u8 field_0x59c[4]; +}; #endif /* D_A_OBJ_YSTONE_H */ diff --git a/rel/d/a/obj/d_a_obj_bosswarp/Makefile b/rel/d/a/obj/d_a_obj_bosswarp/Makefile index d587c88c933..7d3e447489e 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/Makefile +++ b/rel/d/a/obj/d_a_obj_bosswarp/Makefile @@ -8,12 +8,10 @@ M91_MAP := $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bosswarp.map M91_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_bss.cpp \ rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp \ M91_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.o \ M91_LIBS := \ diff --git a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp index 1a94d20128b..1b6163e3885 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp +++ b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp @@ -1,186 +1,26 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_bosswarp -// +/** + * d_a_obj_bosswarp.cpp + * Object - Boss Warp + */ #include "rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h" +#include "rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" +#include "SSystem/SComponent/c_math.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/a/d_a_player.h" +#include "d/d_procname.h" #include "dol2asm.h" // // Types: // -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266F48 */ void normalizeZP(); -}; - -struct obj_ystone_class { - /* 8057B33C */ void setCurrentPos(cXyz); -}; - -struct mesg_flow_node_branch {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - struct daObjLife_c { /* 8057B320 */ void setPos(cXyz); }; -struct daObjBossWarp_c { - /* 80579700 */ void initBaseMtx(); - /* 80579748 */ void setBaseMtx(); - /* 805797B8 */ void Create(); - /* 80579934 */ void CreateHeap(); - /* 80579B70 */ void create(); - /* 80579C30 */ void appear(int); - /* 80579D98 */ void set_appear(); - /* 80579E08 */ void disappear(int); - /* 80579E5C */ void checkDistance(); - /* 80579FF8 */ void execute(); - /* 8057A390 */ void event_proc_call(); - /* 8057A4F4 */ void actionWait(); - /* 8057A54C */ void actionOrderEvent(); - /* 8057A610 */ void actionEvent(); - /* 8057A678 */ void actionWaitWarp(); - /* 8057A6E0 */ void actionOrderWarpEvent(); - /* 8057A778 */ void actionWarpEvent(); - /* 8057A7C4 */ void actionDead(); - /* 8057A7C8 */ void actionOrderChkEvent(); - /* 8057A8B4 */ void actionChkEvent(); - /* 8057A994 */ void actionOrderCancelEvent(); - /* 8057AA2C */ void actionCancelEvent(); - /* 8057AA94 */ void demoProc(); - /* 8057B0D8 */ void setGoal(); - /* 8057B190 */ void draw(); - /* 8057B23C */ void _delete(); -}; - -struct dSv_player_collect_c { - /* 8003422C */ void onCollectCrystal(u8); - /* 80034270 */ void onCollectMirror(u8); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024B2C0 */ void query005(mesg_flow_node_branch*, fopAc_ac_c*, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 8004368C */ void setPtT(void*); -}; - -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); - /* 800483C4 */ void setGoal(cXyz*); - /* 8004882C */ void checkStartDemo(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80579B28 */ ~J3DFrameCtrl(); -}; - // // Forward References: // @@ -281,10 +121,6 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_20(); extern "C" void _savegpr_24(); @@ -298,14 +134,8 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" 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 u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_8057B8D0[4]; @@ -314,154 +144,6 @@ extern "C" extern u8 data_8057B8D0[4]; // Declarations: // -/* 80579638-80579658 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void CheckCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/CheckCreateHeap__FP10fopAc_ac_c.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8057B555-8057B55D 0001F5 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8057B555; - -/* 8057B55D-8057B565 0001FD 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8057B55D; - -/* 8057B565-8057B56D 000205 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8057B565; - -/* 8057B56D-8057B575 00020D 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8057B56D; - -/* 8057B575-8057B57D 000215 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8057B575; - -/* 8057B57D-8057B585 00021D 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8057B57D; - -/* 8057B585-8057B58D 000225 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8057B585; - -/* 8057B58D-8057B595 00022D 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8057B58D; - -/* 8057B360-8057B3B4 000000 0054+00 5/5 0/0 0/0 .rodata l_hair_offset */ -SECTION_RODATA static u8 const l_hair_offset[84] = { - 0x42, 0x44, 0x00, 0x00, 0xC2, 0x08, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x42, 0x38, - 0x00, 0x00, 0xC1, 0x70, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x54, 0x00, 0x00, - 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8057B360, &l_hair_offset); - -/* 8057B3B4-8057B408 000054 0054+00 0/1 0/0 0/0 .rodata l_hair_rotate */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_hair_rotate[84] = { - 0x42, 0x3C, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0x18, 0x00, 0x00, 0xC0, 0x00, - 0x00, 0x00, 0x42, 0x88, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, - 0xC2, 0x70, 0x00, 0x00, 0xC3, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8057B3B4, &l_hair_rotate); -#pragma pop - -/* 8057B408-8057B42C -00001 0024+00 1/1 0/0 0/0 .rodata @3683 */ -SECTION_RODATA static void* const lit_3683[9] = { - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x69), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x71), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x79), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x81), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x89), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x91), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x99), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0xA1), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x79), -}; -COMPILER_STRIP_GATE(0x8057B408, &lit_3683); - -/* 8057B4EC-8057B4EC 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8057B4EC = "ef_Portal"; -SECTION_DEAD static char const* const stringBase_8057B4F6 = "BOSSCLEAR01"; -SECTION_DEAD static char const* const stringBase_8057B502 = "BOSSCLEAR02"; -SECTION_DEAD static char const* const stringBase_8057B50E = "BOSSCLEAR03"; -SECTION_DEAD static char const* const stringBase_8057B51A = "BOSSCLEAR05"; -SECTION_DEAD static char const* const stringBase_8057B526 = "BOSSCLEAR06"; -SECTION_DEAD static char const* const stringBase_8057B532 = "BOSSCLEAR07"; -SECTION_DEAD static char const* const stringBase_8057B53E = "WARP_CHECK"; -SECTION_DEAD static char const* const stringBase_8057B549 = "WARP_CANCEL"; -SECTION_DEAD static char const* const stringBase_8057B555 = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_8057B55D = "D_MN04A"; -SECTION_DEAD static char const* const stringBase_8057B565 = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_8057B56D = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_8057B575 = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_8057B57D = "D_MN06A"; -SECTION_DEAD static char const* const stringBase_8057B585 = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_8057B58D = "D_MN08A"; -#pragma pop - -/* 80579658-80579700 000098 00A8+00 3/3 0/0 0/0 .text getNowLevel__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getNowLevel() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/getNowLevel__Fv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8057B42C-8057B430 0000CC 0004+00 1/1 0/0 0/0 .rodata @3701 */ -SECTION_RODATA static f32 const lit_3701 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(0x8057B42C, &lit_3701); - -/* 80579700-80579748 000140 0048+00 1/1 0/0 0/0 .text initBaseMtx__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/initBaseMtx__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8057B430-8057B434 0000D0 0004+00 1/2 0/0 0/0 .rodata @3715 */ -SECTION_RODATA static f32 const lit_3715 = 2.0f; -COMPILER_STRIP_GATE(0x8057B430, &lit_3715); - -/* 80579748-805797B8 000188 0070+00 2/2 0/0 0/0 .text setBaseMtx__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setBaseMtx__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8057B434-8057B438 0000D4 0004+00 1/4 0/0 0/0 .rodata @3740 */ -SECTION_RODATA static f32 const lit_3740 = 1.0f; -COMPILER_STRIP_GATE(0x8057B434, &lit_3740); - -/* 8057B4EC-8057B4EC 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8057B595 = "BOSS_WARPIN"; -SECTION_DEAD static char const* const stringBase_8057B5A1 = "BOSS_WARPIN_M"; -#pragma pop - /* 8057B658-8057B664 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -481,243 +163,488 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 8057B678-8057B67C -00001 0004+00 3/4 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_bosswarp__stringBase0; +static char* l_arcName = "ef_Portal"; /* 8057B67C-8057B6A0 -00001 0024+00 0/1 0/0 0/0 .data l_clearEvName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_clearEvName[9] = { - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0xA), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x16), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x22), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x22), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x2E), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x3A), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x46), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x22), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x22), +static char const* l_clearEvName[9] = { + "BOSSCLEAR01", + "BOSSCLEAR02", + "BOSSCLEAR03", + "BOSSCLEAR03", + "BOSSCLEAR05", + "BOSSCLEAR06", + "BOSSCLEAR07", + "BOSSCLEAR03", + "BOSSCLEAR03", }; -#pragma pop /* 8057B6A0-8057B6A4 -00001 0004+00 0/1 0/0 0/0 .data l_warp_check_evName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_warp_check_evName = - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x52); -#pragma pop +static char const* l_warp_check_evName = "WARP_CHECK"; /* 8057B6A4-8057B6A8 -00001 0004+00 0/1 0/0 0/0 .data l_warp_cancel_evName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_warp_cancel_evName = - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x5D); -#pragma pop +static char const* l_warp_cancel_evName = "WARP_CANCEL"; + +/* 8057B360-8057B3B4 000000 0054+00 5/5 0/0 0/0 .rodata l_hair_offset */ +static Vec const l_hair_offset[7] = { + {49.0f, -34.0f, -3.0f}, + {46.0f, -15.0f, 3.0f}, + {53.0f, -32.0f, 0.0f}, + {50.0f, 0.0f, 0.0f}, + {50.0f, 0.0f, 0.0f}, + {50.0f, 0.0f, 0.0f}, + {50.0f, 0.0f, 0.0f}, +}; + +/* 8057B3B4-8057B408 000054 0054+00 0/1 0/0 0/0 .rodata l_hair_rotate */ +static Vec const l_hair_rotate[7] = { + {47.0f, 80.0f, 38.0f}, + {-2.0f, 68.0f, 2.0f}, + {160.0f, -60.0f, -160.0f}, + {0.0f, 90.0f, 0.0f}, + {0.0f, 90.0f, 0.0f}, + {0.0f, 90.0f, 0.0f}, + {0.0f, 90.0f, 0.0f}, +}; + +/* 80579638-80579658 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ +static int CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); +} + +/* 80579658-80579700 000098 00A8+00 3/3 0/0 0/0 .text getNowLevel__Fv */ +static int getNowLevel() { + char const* stages[9] = { + "D_MN05A", + "D_MN04A", + "D_MN01A", + "D_MN10A", + "D_MN11A", + "D_MN06A", + "D_MN07A", + "D_MN08A", + "D_MN01A", + }; + char const* start_stage = dComIfGp_getStartStageName(); + for (int i = 0; i < 9; i++) { + if (!strcmp(start_stage, stages[i])) { + return i; + } + } + return -1; +} + +/* 80579700-80579748 000140 0048+00 1/1 0/0 0/0 .text initBaseMtx__15daObjBossWarp_cFv */ +void daObjBossWarp_c::initBaseMtx() { + mScale.y = 0.15f; + mpModel->setBaseScale(mScale); + setBaseMtx(); +} + +/* 80579748-805797B8 000188 0070+00 2/2 0/0 0/0 .text setBaseMtx__15daObjBossWarp_cFv */ +void daObjBossWarp_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 2.0f, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); +} /* 805797B8-80579934 0001F8 017C+00 1/1 0/0 0/0 .text Create__15daObjBossWarp_cFv */ +int daObjBossWarp_c::Create() { + initBaseMtx(); + + int level = getNowLevel(); + if (level == -1 || level == 8) { + mBossClearEventId = -1; + } else { + mBossClearEventId = + i_dComIfGp_getEventManager().getEventIdx(this, l_clearEvName[level], 0xff); + } + mBossClearMapToolId = 0xff; + + if (!isFirst() || level == 8) { + mBossWarpInEventId = i_dComIfGp_getEventManager().getEventIdx(this, "BOSS_WARPIN", 0xff); + mBossWarpInMapToolId = 0xff; + mAction = 3; + set_appear(); + } else { + mBossWarpInEventId = i_dComIfGp_getEventManager().getEventIdx(this, "BOSS_WARPIN_M", 0xff); + mBossWarpInMapToolId = 0xff; + mAction = 0; + } + + mEvtInfo.mArchiveName = l_arcName; + mWarpCheckEventId = i_dComIfGp_getEventManager().getEventIdx(this, l_warp_check_evName, 0xff); + mWarpCancelEventId = i_dComIfGp_getEventManager().getEventIdx(this, l_warp_cancel_evName, 0xff); + + mScaleF = 1.0f; + execute(); + return 1; +} + +/* 80579934-80579B28 000374 01F4+00 1/1 0/0 0/0 .text CreateHeap__15daObjBossWarp_cFv */ +int daObjBossWarp_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6); + mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000284); + if (mpModel == NULL) { + return 0; + } + + J3DAnmTevRegKey* brk_anm = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 9); + mpBrkAnm = new mDoExt_brkAnm(); + if (mpBrkAnm == NULL || !mpBrkAnm->init(model_data, brk_anm, 1, 0, 1.0f, 0, -1)) { + return 0; + } + mpBrkAnm->setPlaySpeed(0.0f); + + static int const l_btk_idx[2] = {12, 13}; + static int const l_play_mode[2] = {2, 0}; + for (int i = 0; i < 2; i++) { + J3DAnmTextureSRTKey* btk_anm = + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, l_btk_idx[i]); + mpBtkAnm[i] = new mDoExt_btkAnm(); + if (mpBtkAnm[i] == NULL || + !mpBtkAnm[i]->init(model_data, btk_anm, 1, l_play_mode[i], 1.0f, 0, -1)) + { + return 0; + } + mpBtkAnm[i]->setPlaySpeed(0.0f); + } + + return 1; +} + +/* 80579B70-80579C30 0005B0 00C0+00 1/1 0/0 0/0 .text create__15daObjBossWarp_cFv */ +cPhs__Step daObjBossWarp_c::create() { + fopAcM_SetupActor(this, daObjBossWarp_c); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName); + if (step == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x18e0)) { + return cPhs_ERROR_e; + } + if (!Create()) { + return cPhs_ERROR_e; + } + } + return step; +} + +/* 80579C30-80579D98 000670 0168+00 3/3 0/0 0/0 .text appear__15daObjBossWarp_cFi */ +void daObjBossWarp_c::appear(int param_0) { + mParticlePos = current.pos; + mParticlePos.y += 2.0f; + static u16 const l_eff_id[4] = {0x8548, 0x8549, 0x854a, 0x854b}; + + for (int i = 0; i < 4; i++) { + if (mpParticle[i] == NULL) { + if (i == 3) { + mpParticle[i] = dComIfGp_particle_set(l_eff_id[i], &mParticlePos, NULL, &mScale); + } else { + mpParticle[i] = dComIfGp_particle_set(l_eff_id[i], &mParticlePos, NULL, NULL); + if (i == 0) { + mpParticle[0] = NULL; + } + } + } + } + + mpBrkAnm->setPlaySpeed(1.0f); + mpBtkAnm[0]->setPlaySpeed(1.0f); + mpBtkAnm[1]->setPlaySpeed(1.0f); +} + +/* 80579D98-80579E08 0007D8 0070+00 1/1 0/0 0/0 .text set_appear__15daObjBossWarp_cFv */ +void daObjBossWarp_c::set_appear() { + mpBrkAnm->setFrame(mpBrkAnm->getEndFrame()); + mpBtkAnm[1]->setFrame(mpBtkAnm[1]->getEndFrame()); + appear(0); +} + +/* 80579E08-80579E5C 000848 0054+00 2/2 0/0 0/0 .text disappear__15daObjBossWarp_cFi */ +void daObjBossWarp_c::disappear(int param_0) { + for (int i = 0; i < 4; i++) { + if (mpParticle[i] != NULL) { + mpParticle[i]->becomeInvalidEmitter(); + mpParticle[i]->quitImmortalEmitter(); + mpParticle[i] = NULL; + } + } +} + +/* 80579E5C-80579FF8 00089C 019C+00 2/2 0/0 0/0 .text checkDistance__15daObjBossWarp_cFv + */ +BOOL daObjBossWarp_c::checkDistance() { + daPy_py_c* player = daPy_getPlayerActorClass(); + f32 dist_xz = player->current.pos.absXZ(current.pos); + f32 dist_y = player->current.pos.y - current.pos.y; + if (dist_xz < 150.0f && dist_y < 200.0f && dist_y > -1.0f) { + return true; + } else { + return false; + } +} + +/* ############################################################################################## */ +/* 8057B484-8057B488 000124 0004+00 0/1 0/0 0/0 .rodata @4118 */ +#pragma push +#pragma force_active on +SECTION_RODATA static u32 const lit_4118 = 0x43360B61; +COMPILER_STRIP_GATE(0x8057B484, &lit_4118); +#pragma pop + +/* 8057B488-8057B48C 000128 0004+00 0/1 0/0 0/0 .rodata @4119 */ +#pragma push +#pragma force_active on +SECTION_RODATA static f32 const lit_4119 = 2.0f / 125.0f; +COMPILER_STRIP_GATE(0x8057B488, &lit_4119); +#pragma pop + +/* 80579FF8-8057A390 000A38 0398+00 2/2 0/0 0/0 .text execute__15daObjBossWarp_cFv */ +#ifdef NONMATCHING +// regalloc +int daObjBossWarp_c::execute() { + if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != 3) { + u8 sw = getSwNo(); + if (sw == 0xff || i_fopAcM_isSwitch(this, sw)) { + field_0x591 = true; + } else { + field_0x591 = false; + } + daPy_py_c* player = daPy_getPlayerActorClass(); + if (field_0x591) { + appear(0); + if (checkDistance()) { + u8 scene = getSceneListNo(); + player->onSceneChangeArea(scene, 0xff, 0); + } + } + } else { + if (!isFirst() && !dComIfGp_evmng_checkStartDemo()) { + field_0x595 = true; + field_0x620 = current.pos; + } + event_proc_call(); + + daMidna_c* midna = daPy_py_c::getMidnaActor(); + if (field_0x595 && midna != NULL) { + midna->onTagWaitPos(&field_0x620); + } + obj_ystone_class* ystone = (obj_ystone_class*)i_fopAcM_SearchByName(PROC_OBJ_YSTONE); + int level = getNowLevel(); + + if (ystone != NULL && midna != NULL) { + switch (field_0x599) { + case 0: + break; + case 1: + mDoMtx_stack_c::copy(midna->getMtxHairTop()); + cXyz hair_offset = l_hair_offset[level]; + mDoMtx_stack_c::transM(hair_offset); + mDoMtx_stack_c::ZXYrotM( + cM_deg2s(l_hair_rotate[level].x), + cM_deg2s(l_hair_rotate[level].y), + cM_deg2s(l_hair_rotate[level].z) + ); + mDoMtx_stack_c::scaleM(mScaleF, mScaleF, mScaleF); + ystone->setBaseMtx(mDoMtx_stack_c::get()); + break; + } + } + } + + mpBrkAnm->play(); + mpBtkAnm[0]->play(); + mpBtkAnm[1]->play(); + + if (mScalingUp) { + cLib_chaseF(&mScale.y, 1.0f, 0.016f); + } + + if (mpParticle[3] != NULL) { + JGeometry::TVec3 scale; + JGeometry::setTVec3f(&mScale.x, &scale.x); + mpParticle[3]->setGlobalScale(scale); + } + + if (mpBrkAnm != NULL && mpBrkAnm->getFrame() != 0.0f) { + i_mDoAud_seStartLevel(Z2SE_OBJ_MDN_ESCAPE_HOLE, ¤t.pos, 0, 0); + } + + setBaseMtx(); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjBossWarp_c::Create() { +asm int daObjBossWarp_c::execute() { nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/Create__15daObjBossWarp_cFv.s" +#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/execute__15daObjBossWarp_cFv.s" } #pragma pop +#endif -/* ############################################################################################## */ -/* 8057B438-8057B440 0000D8 0008+00 0/1 0/0 0/0 .rodata l_btk_idx$3754 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_btk_idx[8] = { - 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0D, +/* 8057A390-8057A4F4 000DD0 0164+00 1/1 0/0 0/0 .text event_proc_call__15daObjBossWarp_cFv */ +void daObjBossWarp_c::event_proc_call() { + typedef void (daObjBossWarp_c::*daObjBossWarp_action)(); + static daObjBossWarp_action l_func[11] = { + &actionWait, + &actionOrderEvent, + &actionEvent, + &actionWaitWarp, + &actionOrderWarpEvent, + &actionWarpEvent, + &actionDead, + &actionOrderChkEvent, + &actionChkEvent, + &actionOrderCancelEvent, + &actionCancelEvent, + }; + (this->*l_func[mAction])(); +} + +/* 8057A4F4-8057A54C 000F34 0058+00 1/0 0/0 0/0 .text actionWait__15daObjBossWarp_cFv */ +void daObjBossWarp_c::actionWait() { + setAction(ACT_ORDER_EVENT); + fopAcM_orderOtherEventId(this, mBossClearEventId, mBossClearMapToolId, 0xffff, 3, 1); + mEvtInfo.i_onCondition(2); +} + +/* 8057A54C-8057A610 000F8C 00C4+00 1/0 0/0 0/0 .text actionOrderEvent__15daObjBossWarp_cFv */ +void daObjBossWarp_c::actionOrderEvent() { + if (mEvtInfo.i_checkCommandDemoAccrpt()) { + dComIfGp_event_setTalkPartner(i_fopAcM_SearchByName(PROC_OBJ_YSTONE)); + setAction(ACT_EVENT); + mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); + demoProc(); + } else { + fopAcM_orderOtherEventId(this, mBossClearEventId, mBossClearMapToolId, 0xffff, 3, 1); + mEvtInfo.i_onCondition(2); + } +} + +/* 8057A610-8057A678 001050 0068+00 1/0 0/0 0/0 .text actionEvent__15daObjBossWarp_cFv */ +void daObjBossWarp_c::actionEvent() { + if (dComIfGp_evmng_endCheck(mBossClearEventId)) { + setAction(ACT_WAIT_WARP); + i_dComIfGp_event_reset(); + } else { + demoProc(); + } +} + +/* 8057A678-8057A6E0 0010B8 0068+00 1/0 0/0 0/0 .text actionWaitWarp__15daObjBossWarp_cFv + */ +void daObjBossWarp_c::actionWaitWarp() { + if (checkDistance()) { + setAction(ACT_ORDER_CHK_EVENT); + fopAcM_orderOtherEventId(this, mWarpCheckEventId, 0xff, 0xffff, 0, 1); + mEvtInfo.i_onCondition(2); + } +} + +/* 8057A6E0-8057A778 001120 0098+00 1/0 0/0 0/0 .text actionOrderWarpEvent__15daObjBossWarp_cFv */ +void daObjBossWarp_c::actionOrderWarpEvent() { + if (mEvtInfo.i_checkCommandDemoAccrpt()) { + setAction(ACT_WARP_EVENT); + mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); + demoProc(); + } else { + fopAcM_orderOtherEventId(this, mBossWarpInEventId, mBossWarpInMapToolId, 0xffff, 0, 1); + mEvtInfo.i_onCondition(2); + } +} + +/* 8057A778-8057A7C4 0011B8 004C+00 1/0 0/0 0/0 .text actionWarpEvent__15daObjBossWarp_cFv */ +void daObjBossWarp_c::actionWarpEvent() { + if (!dComIfGp_evmng_endCheck(mBossWarpInEventId)) { + demoProc(); + } +} + +/* 8057A7C4-8057A7C8 001204 0004+00 1/0 0/0 0/0 .text actionDead__15daObjBossWarp_cFv */ +void daObjBossWarp_c::actionDead() { + /* empty function */ +} + +/* 8057A7C8-8057A8B4 001208 00EC+00 1/0 0/0 0/0 .text actionOrderChkEvent__15daObjBossWarp_cFv */ +void daObjBossWarp_c::actionOrderChkEvent() { + daMidna_c* midna = daPy_py_c::getMidnaActor(); + if (mEvtInfo.i_checkCommandDemoAccrpt()) { + setAction(ACT_CHK_EVENT); + mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); + mAttentionInfo.mPosition = midna->mAttentionInfo.mPosition; + mAttentionInfo.mPosition.y += 100.0f; + mEyePos = mAttentionInfo.mPosition; + demoProc(); + } else { + fopAcM_orderOtherEventId(this, mWarpCheckEventId, 0xff, 0xffff, 0, 1); + mEvtInfo.i_onCondition(2); + } +} + +/* 8057A8B4-8057A994 0012F4 00E0+00 1/0 0/0 0/0 .text actionChkEvent__15daObjBossWarp_cFv + */ +void daObjBossWarp_c::actionChkEvent() { + if (dComIfGp_evmng_endCheck(mWarpCheckEventId)) { + i_dComIfGp_event_reset(); + if (mWarpChoice == 0) { + setAction(ACT_ORDER_WARP_EVENT); + fopAcM_orderOtherEventId(this, mBossWarpInEventId, mBossWarpInMapToolId, 0xffff, 0, 1); + mEvtInfo.i_onCondition(2); + } else if (mWarpChoice == 1) { + setAction(ACT_ORDER_CANCEL_EVENT); + fopAcM_orderOtherEventId(this, mWarpCancelEventId, 0xff, 0xffff, 0, 1); + mEvtInfo.i_onCondition(2); + } + } else { + demoProc(); + } +} + +/* 8057A994-8057AA2C 0013D4 0098+00 1/0 0/0 0/0 .text actionOrderCancelEvent__15daObjBossWarp_cFv + */ +void daObjBossWarp_c::actionOrderCancelEvent() { + if (mEvtInfo.i_checkCommandDemoAccrpt()) { + setAction(ACT_CANCEL_EVENT); + mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); + demoProc(); + } else { + fopAcM_orderOtherEventId(this, mWarpCancelEventId, 0xff, 0xffff, 0, 1); + mEvtInfo.i_onCondition(2); + } +} + +/* 8057AA2C-8057AA94 00146C 0068+00 1/0 0/0 0/0 .text actionCancelEvent__15daObjBossWarp_cFv */ +void daObjBossWarp_c::actionCancelEvent() { + if (dComIfGp_evmng_endCheck(mWarpCancelEventId)) { + i_dComIfGp_event_reset(); + setAction(ACT_WAIT_WARP); + } else { + demoProc(); + } +} + +/* 8057B490-8057B4B4 000130 0024+00 0/0 0/0 0/0 .rodata l_dangeon_clr_bitNo$4282 */ +static int const l_dangeon_clr_bitNo[9] = { + 0x37, 0x40, 0x4E, 0x109, 0x10A, 0x10B, 0x10C, -1, -1 }; -COMPILER_STRIP_GATE(0x8057B438, &l_btk_idx); -#pragma pop - -/* 8057B440-8057B448 0000E0 0008+00 0/1 0/0 0/0 .rodata l_play_mode$3755 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_play_mode[8] = { - 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8057B440, &l_play_mode); -#pragma pop - -/* 8057B448-8057B44C 0000E8 0004+00 0/4 0/0 0/0 .rodata @3807 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3807[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8057B448, &lit_3807); -#pragma pop - -/* 8057B4EC-8057B4EC 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8057B5AF = "WARPHOLE"; -SECTION_DEAD static char const* const stringBase_8057B5B8 = "WAIT"; -SECTION_DEAD static char const* const stringBase_8057B5BD = "APPEAR"; -SECTION_DEAD static char const* const stringBase_8057B5C4 = "DISAPPEAR"; -SECTION_DEAD static char const* const stringBase_8057B5CE = "SCENE_CHG"; -SECTION_DEAD static char const* const stringBase_8057B5D8 = "STONE_FALL"; -SECTION_DEAD static char const* const stringBase_8057B5E3 = "STONE_MIDNA"; -SECTION_DEAD static char const* const stringBase_8057B5EF = "WALK_TARGET1"; -SECTION_DEAD static char const* const stringBase_8057B5FC = "APPEAR_END"; -SECTION_DEAD static char const* const stringBase_8057B607 = "STONE_DELETE"; -SECTION_DEAD static char const* const stringBase_8057B614 = "STONE_PUTAWAY"; -SECTION_DEAD static char const* const stringBase_8057B622 = "WCHECK"; -SECTION_DEAD static char const* const stringBase_8057B629 = "SETPOS"; -SECTION_DEAD static char const* const stringBase_8057B630 = "SCALING"; -SECTION_DEAD static char const* const stringBase_8057B638 = "STONE_SCALE"; -SECTION_DEAD static char const* const stringBase_8057B644 = "HEART_MOVE"; -#pragma pop - -/* 8057B6A8-8057B6B4 -00001 000C+00 0/1 0/0 0/0 .data @4131 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4131[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B6B4-8057B6C0 -00001 000C+00 0/1 0/0 0/0 .data @4132 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4132[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrderEvent__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B6C0-8057B6CC -00001 000C+00 0/1 0/0 0/0 .data @4133 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4133[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEvent__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B6CC-8057B6D8 -00001 000C+00 0/1 0/0 0/0 .data @4134 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4134[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWaitWarp__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B6D8-8057B6E4 -00001 000C+00 0/1 0/0 0/0 .data @4135 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4135[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrderWarpEvent__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B6E4-8057B6F0 -00001 000C+00 0/1 0/0 0/0 .data @4136 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4136[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWarpEvent__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B6F0-8057B6FC -00001 000C+00 0/1 0/0 0/0 .data @4137 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4137[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionDead__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B6FC-8057B708 -00001 000C+00 0/1 0/0 0/0 .data @4138 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4138[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrderChkEvent__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B708-8057B714 -00001 000C+00 0/1 0/0 0/0 .data @4139 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4139[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionChkEvent__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B714-8057B720 -00001 000C+00 0/1 0/0 0/0 .data @4140 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4140[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrderCancelEvent__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B720-8057B72C -00001 000C+00 0/1 0/0 0/0 .data @4141 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4141[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionCancelEvent__15daObjBossWarp_cFv, -}; -#pragma pop - -/* 8057B72C-8057B7B0 0000D4 0084+00 0/1 0/0 0/0 .data l_func$4130 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[132] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop /* 8057B7B0-8057B7EC -00001 003C+00 1/1 0/0 0/0 .data action_table$4273 */ -SECTION_DATA static void* action_table[15] = { - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0xCC), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0xD1), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0xD8), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0xE2), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0xEC), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0xF7), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x103), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x110), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x11B), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x128), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x136), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x13D), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x144), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x14C), - (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x158), +static char* action_table[15] = { + "WAIT", + "APPEAR", + "DISAPPEAR", + "SCENE_CHG", + "STONE_FALL", + "STONE_MIDNA", + "WALK_TARGET1", + "APPEAR_END", + "STONE_DELETE", + "STONE_PUTAWAY", + "WCHECK", + "SETPOS", + "SCALING", + "STONE_SCALE", + "HEART_MOVE", }; /* 8057B7EC-8057B818 -00001 002C+00 1/1 0/0 0/0 .data @4504 */ @@ -765,344 +692,6 @@ SECTION_DATA static void* lit_4502[15] = { (void*)(((char*)demoProc__15daObjBossWarp_cFv) + 0x3F8), }; -/* 8057B870-8057B890 -00001 0020+00 1/0 0/0 0/0 .data l_daObjBossWarp_Method */ -SECTION_DATA static void* l_daObjBossWarp_Method[8] = { - (void*)daObjBossWarp_Create__FP10fopAc_ac_c, - (void*)daObjBossWarp_Delete__FP15daObjBossWarp_c, - (void*)daObjBossWarp_Execute__FP15daObjBossWarp_c, - (void*)NULL, - (void*)daObjBossWarp_Draw__FP15daObjBossWarp_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8057B890-8057B8C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BossWarp */ -SECTION_DATA extern void* g_profile_Obj_BossWarp[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01630000, (void*)&g_fpcLf_Method, - (void*)0x00000630, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02DA0000, (void*)&l_daObjBossWarp_Method, - (void*)0x00044000, (void*)0x000E0000, -}; - -/* 8057B8C0-8057B8CC 000268 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, -}; - -/* 80579934-80579B28 000374 01F4+00 1/1 0/0 0/0 .text CreateHeap__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/CreateHeap__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 80579B28-80579B70 000568 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_bosswarp/d_a_obj_bosswarp/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* 80579B70-80579C30 0005B0 00C0+00 1/1 0/0 0/0 .text create__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/func_80579B70.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8057B44C-8057B458 0000EC 0008+04 0/1 0/0 0/0 .rodata l_eff_id$3854 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_eff_id[8 + 4 /* padding */] = { - 0x85, - 0x48, - 0x85, - 0x49, - 0x85, - 0x4A, - 0x85, - 0x4B, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8057B44C, &l_eff_id); -#pragma pop - -/* 80579C30-80579D98 000670 0168+00 3/3 0/0 0/0 .text appear__15daObjBossWarp_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::appear(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/appear__15daObjBossWarp_cFi.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8057B458-8057B460 0000F8 0008+00 1/1 0/0 0/0 .rodata @3918 */ -SECTION_RODATA static u8 const lit_3918[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8057B458, &lit_3918); - -/* 80579D98-80579E08 0007D8 0070+00 1/1 0/0 0/0 .text set_appear__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::set_appear() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/set_appear__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 80579E08-80579E5C 000848 0054+00 2/2 0/0 0/0 .text disappear__15daObjBossWarp_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::disappear(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/disappear__15daObjBossWarp_cFi.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8057B460-8057B468 000100 0008+00 0/1 0/0 0/0 .rodata @3986 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3986[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8057B460, &lit_3986); -#pragma pop - -/* 8057B468-8057B470 000108 0008+00 0/1 0/0 0/0 .rodata @3987 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3987[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8057B468, &lit_3987); -#pragma pop - -/* 8057B470-8057B478 000110 0008+00 0/1 0/0 0/0 .rodata @3988 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3988[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8057B470, &lit_3988); -#pragma pop - -/* 8057B478-8057B47C 000118 0004+00 0/1 0/0 0/0 .rodata @3989 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3989 = 150.0f; -COMPILER_STRIP_GATE(0x8057B478, &lit_3989); -#pragma pop - -/* 8057B47C-8057B480 00011C 0004+00 0/1 0/0 0/0 .rodata @3990 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3990 = 200.0f; -COMPILER_STRIP_GATE(0x8057B47C, &lit_3990); -#pragma pop - -/* 8057B480-8057B484 000120 0004+00 0/2 0/0 0/0 .rodata @3991 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3991 = -1.0f; -COMPILER_STRIP_GATE(0x8057B480, &lit_3991); -#pragma pop - -/* 80579E5C-80579FF8 00089C 019C+00 2/2 0/0 0/0 .text checkDistance__15daObjBossWarp_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::checkDistance() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/checkDistance__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8057B484-8057B488 000124 0004+00 0/1 0/0 0/0 .rodata @4118 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4118 = 0x43360B61; -COMPILER_STRIP_GATE(0x8057B484, &lit_4118); -#pragma pop - -/* 8057B488-8057B48C 000128 0004+00 0/1 0/0 0/0 .rodata @4119 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4119 = 2.0f / 125.0f; -COMPILER_STRIP_GATE(0x8057B488, &lit_4119); -#pragma pop - -/* 80579FF8-8057A390 000A38 0398+00 2/2 0/0 0/0 .text execute__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/execute__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057A390-8057A4F4 000DD0 0164+00 1/1 0/0 0/0 .text event_proc_call__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::event_proc_call() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/event_proc_call__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057A4F4-8057A54C 000F34 0058+00 1/0 0/0 0/0 .text actionWait__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::actionWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWait__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057A54C-8057A610 000F8C 00C4+00 1/0 0/0 0/0 .text actionOrderEvent__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::actionOrderEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderEvent__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057A610-8057A678 001050 0068+00 1/0 0/0 0/0 .text actionEvent__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::actionEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionEvent__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057A678-8057A6E0 0010B8 0068+00 1/0 0/0 0/0 .text actionWaitWarp__15daObjBossWarp_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::actionWaitWarp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWaitWarp__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057A6E0-8057A778 001120 0098+00 1/0 0/0 0/0 .text actionOrderWarpEvent__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::actionOrderWarpEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderWarpEvent__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057A778-8057A7C4 0011B8 004C+00 1/0 0/0 0/0 .text actionWarpEvent__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::actionWarpEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionWarpEvent__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057A7C4-8057A7C8 001204 0004+00 1/0 0/0 0/0 .text actionDead__15daObjBossWarp_cFv */ -void daObjBossWarp_c::actionDead() { - /* empty function */ -} - -/* ############################################################################################## */ -/* 8057B48C-8057B490 00012C 0004+00 1/1 0/0 0/0 .rodata @4227 */ -SECTION_RODATA static f32 const lit_4227 = 100.0f; -COMPILER_STRIP_GATE(0x8057B48C, &lit_4227); - -/* 8057A7C8-8057A8B4 001208 00EC+00 1/0 0/0 0/0 .text actionOrderChkEvent__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::actionOrderChkEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderChkEvent__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057A8B4-8057A994 0012F4 00E0+00 1/0 0/0 0/0 .text actionChkEvent__15daObjBossWarp_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::actionChkEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionChkEvent__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057A994-8057AA2C 0013D4 0098+00 1/0 0/0 0/0 .text actionOrderCancelEvent__15daObjBossWarp_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::actionOrderCancelEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionOrderCancelEvent__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* 8057AA2C-8057AA94 00146C 0068+00 1/0 0/0 0/0 .text actionCancelEvent__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::actionCancelEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/actionCancelEvent__15daObjBossWarp_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8057B490-8057B4B4 000130 0024+00 0/0 0/0 0/0 .rodata l_dangeon_clr_bitNo$4282 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_dangeon_clr_bitNo[36] = { - 0x00, 0x00, 0x00, 0x37, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x4E, - 0x00, 0x00, 0x01, 0x09, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00, 0x01, 0x0B, - 0x00, 0x00, 0x01, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -}; -COMPILER_STRIP_GATE(0x8057B490, &l_dangeon_clr_bitNo); -#pragma pop - /* 8057B4B4-8057B4B8 000154 0004+00 0/1 0/0 0/0 .rodata @4489 */ #pragma push #pragma force_active on @@ -1124,14 +713,212 @@ SECTION_DEAD static char const* const stringBase_8057B64F = "Timer"; #pragma pop /* 8057AA94-8057B0D8 0014D4 0644+00 11/8 0/0 0/0 .text demoProc__15daObjBossWarp_cFv */ +#ifdef NONMATCHING +// regalloc +int daObjBossWarp_c::demoProc() { + static char* action_table[15] = { + "WAIT", + "APPEAR", + "DISAPPEAR", + "SCENE_CHG", + "STONE_FALL", + "STONE_MIDNA", + "WALK_TARGET1", + "APPEAR_END", + "STONE_DELETE", + "STONE_PUTAWAY", + "WCHECK", + "SETPOS", + "SCALING", + "STONE_SCALE", + "HEART_MOVE", + }; + + daPy_py_c* player = daPy_getPlayerActorClass(); + obj_ystone_class* ystone = (obj_ystone_class*)i_fopAcM_SearchByName(PROC_OBJ_YSTONE); + cXyz unused(100000.0f, 0.0f, 0.0f); + daMidna_c* midna = daPy_py_c::getMidnaActor(); + daObjLife_c* life_container = (daObjLife_c*)i_fopAcM_SearchByName(PROC_Obj_LifeContainer); + cXyz life_pos(900.0f, 0.0f, 0.0f); + int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 15, 0, 0); + + if (dComIfGp_evmng_getIsAddvance(mStaffId)) { + switch (act_idx) { + case 0: // WAIT + int* timer = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer"); + if (timer == NULL) { + mTimer = 1; + } else { + mTimer = *timer; + } + break; + case 1: // APPEAR + int level = getNowLevel(); + if (level >= 0 && level < 10 && l_dangeon_clr_bitNo[level] > 0) { + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[l_dangeon_clr_bitNo[level]]); + } + appear(0); + break; + case 2: // DISAPPEAR + disappear(0); + break; + case 3: // SCENE_CHG + int scene; + if (isFirst()) { + scene = getSceneListNo(); + } else { + scene = getSceneListNo(); + } + player->onSceneChangeArea(scene, 0xff, 0); + break; + case 4: // STONE_FALL + if (ystone != NULL) { + mYstonePos = ystone->current.pos; + if (getNowLevel() < 3) { + mYstonePos.y += 50.0f; + } else if (getNowLevel() == 5) { + mYstonePos.y = player->current.pos.y + 270.0f + 120.0f; + ystone->setCurrentPos(mYstonePos); + } else { + mYstonePos.y += 120.0f; + } + } + if (getNowLevel() < 3) { + mYstoneTargetPos.set(0.0f, 145.0f, 74.0f); + } else { + mYstoneTargetPos.set(0.0f, 175.0f, 54.0f); + } + mDoMtx_stack_c::transS(player->current.pos); + mDoMtx_stack_c::YrotM(player->shape_angle.y); + mDoMtx_stack_c::multVec(&mYstoneTargetPos, &mYstoneTargetPos); + mYstonePos.x = mYstoneTargetPos.x; + mYstonePos.z = mYstoneTargetPos.z; + switch (getNowLevel()) { + case 0: + dComIfGs_onCollectCrystal(0); + break; + case 1: + dComIfGs_onCollectCrystal(1); + break; + case 2: + dComIfGs_onCollectCrystal(2); + break; + case 4: + dComIfGs_onCollectMirror(1); + break; + case 5: + dComIfGs_onCollectMirror(2); + break; + case 6: + dComIfGs_onCollectMirror(3); + break; + } + mCounter = 0; + break; + case 5: // STONE_MIDNA + mCounter = 0; + break; + case 9: // STONE_PUTAWAY + mCounter = 0; + break; + case 6: // WALK_TARGET1 + dComIfGp_evmng_setGoal(¤t.pos); + break; + case 7: // APPEAR_END + break; + case 8: // STONE_DELETE + break; + case 10: // WCHECK + mMsgFlow.init(this, 0xbc0, 0, NULL); + break; + case 11: // SETPOS + setGoal(); + break; + case 12: // SCALING + mScalingUp = true; + break; + case 13: // STONE_SCALE + break; + case 14: // HEART_MOVE + if (life_container != NULL) { + life_container->setPos(life_pos); + } + break; + } + } + + switch (act_idx) { + case 0: // WAIT + if (cLib_calcTimer(&mTimer) == 0) { + dComIfGp_evmng_cutEnd(mStaffId); + } + break; + case 1: // APPEAR + dComIfGp_evmng_cutEnd(mStaffId); + break; + case 2: // DISAPPEAR + dComIfGp_evmng_cutEnd(mStaffId); + break; + case 3: // SCENE_CHG + break; + case 4: // STONE_FALL + if (ystone != NULL) { + f32 dist = cLib_addCalc(&mYstonePos.y, mYstoneTargetPos.y, 0.05f, 2.0f, 0.1f); + if (dist < 40.0f) { + mCounter++; + if (ystone->getMirrorMode() == 2) { + ystone->setMirrorMode(3); + } + } + if (dist == 0.0f && mCounter > 50) { + dComIfGp_evmng_cutEnd(mStaffId); + } + ystone->setCurrentPos(mYstonePos); + } + break; + case 5: // STONE_MIDNA + mCounter++; + if (mCounter == 12) { + field_0x599 = 1; + } + dComIfGp_evmng_cutEnd(mStaffId); + break; + case 9: // STONE_PUTAWAY + mCounter++; + if (cLib_chaseF(&mScaleF, 0.0f, 0.033f)) { + fopAcM_delete(fopAcM_GetID(ystone)); + dComIfGp_evmng_cutEnd(mStaffId); + } + break; + case 7: // APPEAR_END + field_0x595 = true; + field_0x620 = midna->current.pos; + dComIfGp_evmng_cutEnd(mStaffId); + break; + case 10: // WCHECK + if (mMsgFlow.doFlow(this, NULL, 0)) { + dComIfGp_evmng_cutEnd(mStaffId); + } else if (mMsgFlow.isSelectMessage()) { + mWarpChoice = mMsgFlow.getSelectNum(); + } + break; + default: + dComIfGp_evmng_cutEnd(mStaffId); + break; + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjBossWarp_c::demoProc() { +asm int daObjBossWarp_c::demoProc() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/demoProc__15daObjBossWarp_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8057B4BC-8057B4C0 00015C 0004+00 0/0 0/0 0/0 .rodata @4491 */ @@ -1211,80 +998,52 @@ SECTION_RODATA static u32 const lit_4501 = 0x3D072B02; COMPILER_STRIP_GATE(0x8057B4E4, &lit_4501); #pragma pop -/* 8057B4E8-8057B4EC 000188 0004+00 1/1 0/0 0/0 .rodata @4541 */ -SECTION_RODATA static f32 const lit_4541 = 250.0f; -COMPILER_STRIP_GATE(0x8057B4E8, &lit_4541); - /* 8057B0D8-8057B190 001B18 00B8+00 1/1 0/0 0/0 .text setGoal__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::setGoal() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setGoal__15daObjBossWarp_cFv.s" +void daObjBossWarp_c::setGoal() { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz delta = player->current.pos - current.pos; + cXyz goal = current.pos + delta.normalizeZP() * 250.0f; + dComIfGp_evmng_setGoal(&goal); } -#pragma pop /* 8057B190-8057B23C 001BD0 00AC+00 1/1 0/0 0/0 .text draw__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/draw__15daObjBossWarp_cFv.s" +int daObjBossWarp_c::draw() { + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + mpBrkAnm->entry(mpModel->getModelData()); + mpBtkAnm[0]->entry(mpModel->getModelData()); + mpBtkAnm[1]->entry(mpModel->getModelData()); + mDoExt_modelUpdateDL(mpModel); + return 1; } -#pragma pop /* 8057B23C-8057B284 001C7C 0048+00 1/1 0/0 0/0 .text _delete__15daObjBossWarp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBossWarp_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/_delete__15daObjBossWarp_cFv.s" +int daObjBossWarp_c::_delete() { + disappear(0); + dComIfG_resDelete(&mPhaseReq, l_arcName); + return 1; } -#pragma pop /* 8057B284-8057B2A4 001CC4 0020+00 1/0 0/0 0/0 .text daObjBossWarp_Draw__FP15daObjBossWarp_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBossWarp_Draw(daObjBossWarp_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Draw__FP15daObjBossWarp_c.s" +static int daObjBossWarp_Draw(daObjBossWarp_c* i_this) { + return i_this->draw(); } -#pragma pop /* 8057B2A4-8057B2C4 001CE4 0020+00 1/0 0/0 0/0 .text daObjBossWarp_Execute__FP15daObjBossWarp_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBossWarp_Execute(daObjBossWarp_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Execute__FP15daObjBossWarp_c.s" +static int daObjBossWarp_Execute(daObjBossWarp_c* i_this) { + return i_this->execute(); } -#pragma pop /* 8057B2C4-8057B2E4 001D04 0020+00 1/0 0/0 0/0 .text daObjBossWarp_Delete__FP15daObjBossWarp_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBossWarp_Delete(daObjBossWarp_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Delete__FP15daObjBossWarp_c.s" +static int daObjBossWarp_Delete(daObjBossWarp_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 8057B2E4-8057B304 001D24 0020+00 1/0 0/0 0/0 .text daObjBossWarp_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBossWarp_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/daObjBossWarp_Create__FP10fopAc_ac_c.s" +static cPhs__Step daObjBossWarp_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 8057B304-8057B320 001D44 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPi */ #pragma push @@ -1310,10 +1069,36 @@ asm void daObjLife_c::setPos(cXyz param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void obj_ystone_class::setCurrentPos(cXyz param_0) { +// asm void obj_ystone_class::setCurrentPos(cXyz param_0) { +extern "C" asm void setCurrentPos__16obj_ystone_classF4cXyz() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setCurrentPos__16obj_ystone_classF4cXyz.s" } #pragma pop -/* 8057B4EC-8057B4EC 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 8057B870-8057B890 -00001 0020+00 1/0 0/0 0/0 .data l_daObjBossWarp_Method */ +static actor_method_class l_daObjBossWarp_Method = { + (process_method_func)daObjBossWarp_Create, + (process_method_func)daObjBossWarp_Delete, + (process_method_func)daObjBossWarp_Execute, + (process_method_func)NULL, + (process_method_func)daObjBossWarp_Draw, +}; + +/* 8057B890-8057B8C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BossWarp */ +extern actor_process_profile_definition g_profile_Obj_BossWarp = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_Obj_BossWarp, + &g_fpcLf_Method.mBase, + sizeof(daObjBossWarp_c), + 0, + 0, + &g_fopAc_Method.base, + 0x2DA, + &l_daObjBossWarp_Method, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_bss.cpp deleted file mode 100644 index 75935dec3f1..00000000000 --- a/rel/d/a/obj/d_a_obj_bosswarp/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_bosswarp/unknown_translation_unit_bss.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 data_8057B8D0[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8057B8D0-8057B8D4 000000 0004+00 0/0 1/1 0/0 .bss None */ -extern u8 data_8057B8D0[4]; -u8 data_8057B8D0[4]; diff --git a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp index 3cb3125a1ac..e7bec8e30d6 100644 --- a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp +++ b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp @@ -1,106 +1,15 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ystone -// +/** + * d_a_obj_ystone.cpp + * Object - Dungeon Prize + */ #include "rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_ystone_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature {}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dKy_tevstr_c {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D3EA38 */ ~J3DFrameCtrl(); -}; - // // Forward References: // @@ -116,6 +25,7 @@ extern "C" static void useHeapInit__FP10fopAc_ac_c(); extern "C" void __dt__12J3DFrameCtrlFv(); extern "C" static void daObj_Ystone_Create__FP10fopAc_ac_c(); extern "C" extern char const* const d_a_obj_ystone__stringBase0; +static cPhs__Step daObj_Ystone_Create(fopAc_ac_c*); // // External References: @@ -152,124 +62,108 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP 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 PSMTXScale(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); extern "C" void _savegpr_28(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); -extern "C" void strcmp(); -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]; // // Declarations: // -/* ############################################################################################## */ -/* 80D3EC5C-80D3EC5C 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D3EC5C = "N_gD_mskF"; -SECTION_DEAD static char const* const stringBase_80D3EC66 = "N_gD_mskB"; -SECTION_DEAD static char const* const stringBase_80D3EC70 = "N_gD_mskT"; -SECTION_DEAD static char const* const stringBase_80D3EC7A = "MirrorB"; -SECTION_DEAD static char const* const stringBase_80D3EC82 = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_80D3EC8A = "D_MN04A"; -SECTION_DEAD static char const* const stringBase_80D3EC92 = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_80D3EC9A = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_80D3ECA2 = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_80D3ECAA = "D_MN06A"; -SECTION_DEAD static char const* const stringBase_80D3ECB2 = "D_MN07A"; -#pragma pop - /* 80D3ECBC-80D3ECD8 -00001 001C+00 4/4 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName[7] = { - (void*)&d_a_obj_ystone__stringBase0, - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0xA), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x14), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x1E), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x1E), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x1E), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x1E), +static char const* l_arcName[7] = { + "N_gD_mskF", + "N_gD_mskB", + "N_gD_mskT", + "MirrorB", + "MirrorB", + "MirrorB", + "MirrorB", }; /* 80D3ECD8-80D3ECFC -00001 0024+00 1/1 0/0 0/0 .data l_stageName$3775 */ -SECTION_DATA static void* l_stageName[9] = { - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x26), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x2E), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x36), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x3E), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x46), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x4E), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x56), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x36), - (void*)(((char*)&d_a_obj_ystone__stringBase0) + 0x36), +static char const* l_stageName[9] = { + "D_MN05A", + "D_MN04A", + "D_MN01A", + "D_MN10A", + "D_MN11A", + "D_MN06A", + "D_MN07A", + "D_MN01A", + "D_MN01A", }; -/* 80D3E018-80D3E090 000078 0078+00 1/1 0/0 0/0 .text getNowLevel__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getNowLevel() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/getNowLevel__Fv.s" -} -#pragma pop - -/* 80D3E090-80D3E180 0000F0 00F0+00 1/0 0/0 0/0 .text daObj_Ystone_Draw__FP16obj_ystone_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Ystone_Draw(obj_ystone_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Draw__FP16obj_ystone_class.s" -} -#pragma pop - -/* 80D3E180-80D3E25C 0001E0 00DC+00 1/1 0/0 0/0 .text setModelBaseMtx__FP16obj_ystone_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void setModelBaseMtx(obj_ystone_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/setModelBaseMtx__FP16obj_ystone_class.s" -} -#pragma pop - -/* ############################################################################################## */ /* 80D3EC0C-80D3EC28 000000 001C+00 2/2 0/0 0/0 .rodata l_bmdIndex */ -SECTION_RODATA static u8 const l_bmdIndex[28] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, - 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, -}; -COMPILER_STRIP_GATE(0x80D3EC0C, &l_bmdIndex); +static int const l_bmdIndex[7] = {4, 4, 4, 9, 9, 10, 11}; /* 80D3EC28-80D3EC34 00001C 000C+00 0/1 0/0 0/0 .rodata l_brkIndex */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_brkIndex[12] = { - 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, -}; -COMPILER_STRIP_GATE(0x80D3EC28, &l_brkIndex); +static int const l_brkIndex[3] = {7, 7, 7}; #pragma pop /* 80D3EC34-80D3EC50 000028 001C+00 0/1 0/0 0/0 .rodata l_btkIndex */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_btkIndex[28] = { - 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, - 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x10, -}; -COMPILER_STRIP_GATE(0x80D3EC34, &l_btkIndex); +static int const l_btkIndex[7] = {14, 14, 14, 14, 14, 15, 16}; #pragma pop +/* 80D3E018-80D3E090 000078 0078+00 1/1 0/0 0/0 .text getNowLevel__Fv */ +static int getNowLevel() { + for (int i = 0; i < 9; i++) { + if (!strcmp(dComIfGp_getStartStageName(), l_stageName[i])) { + return i + 1; + } + } + return -1; +} + +/* 80D3E090-80D3E180 0000F0 00F0+00 1/0 0/0 0/0 .text daObj_Ystone_Draw__FP16obj_ystone_class */ +static int daObj_Ystone_Draw(obj_ystone_class* i_this) { + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); + if (i_this->mLevel < 3) { + if (!i_this->field_0x59b) { + g_env_light.setLightTevColorType_MAJI(i_this->mpModel->mModelData, &i_this->mTevStr); + i_this->mpBrkAnm->entry(i_this->mpModel->getModelData()); + mDoExt_modelUpdateDL(i_this->mpModel); + } + } else { + J3DModel* model = i_this->mpMorf->getModel(); + g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->mTevStr); + if (i_this->field_0x59a) { + i_this->mpBtkAnm->entry(model->getModelData()); + } + fopAcM_setEffectMtx(i_this, model->getModelData()); + i_this->mpMorf->entryDL(); + } + return 1; +} + +/* 80D3E180-80D3E25C 0001E0 00DC+00 1/1 0/0 0/0 .text setModelBaseMtx__FP16obj_ystone_class */ +static void setModelBaseMtx(obj_ystone_class* i_this) { + J3DModel* model; + if (i_this->mLevel < 3) { + model = i_this->mpModel; + } else { + model = i_this->mpMorf->getModel(); + } + if (i_this->field_0x598 == 0) { + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + mDoMtx_stack_c::scaleM(i_this->mScaleF, i_this->mScaleF, i_this->mScaleF); + model->i_setBaseTRMtx(mDoMtx_stack_c::get()); + } else { + i_this->field_0x598 = 0; + mDoMtx_stack_c::copy(model->getBaseTRMtx()); + mDoMtx_stack_c::multVecZero(&i_this->current.pos); + } +} + /* 80D3EC50-80D3EC54 000044 0004+00 1/3 0/0 0/0 .rodata @3967 */ SECTION_RODATA static f32 const lit_3967 = 1.0f; COMPILER_STRIP_GATE(0x80D3EC50, &lit_3967); @@ -290,10 +184,8 @@ SECTION_RODATA static f32 const lit_3969 = -1.0f; COMPILER_STRIP_GATE(0x80D3EC58, &lit_3969); #pragma pop -/* 80D3ECFC-80D3ED10 000040 0014+00 1/1 0/0 0/0 .data mirror_effect_id$3870 */ -SECTION_DATA static u8 mirror_effect_id[20] = { - 0x89, 0xA0, 0x89, 0xA1, 0x89, 0xA2, 0x89, 0xA5, 0x89, 0xA6, - 0x89, 0xA7, 0x89, 0xA8, 0x89, 0xA9, 0x89, 0xAA, 0x89, 0xAB, +static u16 mirror_effect_id[10] = { + 0x89A0, 0x89A1, 0x89A2, 0x89A5, 0x89A6, 0x89A7, 0x89A8, 0x89A9, 0x89AA, 0x89AB }; /* 80D3ED10-80D3ED2C -00001 001C+00 1/1 0/0 0/0 .data @3970 */ @@ -308,6 +200,101 @@ SECTION_DATA static void* lit_3970[7] = { }; /* 80D3E25C-80D3E6EC 0002BC 0490+00 2/1 0/0 0/0 .text action__FP16obj_ystone_class */ +#ifdef NONMATCHING +// matches with literals +static void action(obj_ystone_class* i_this) { + if (i_this->mLevel < 3) { + switch (i_this->mShadowMode) { + case 0: + i_this->shape_angle.y += 0x100; + } + + setModelBaseMtx(i_this); + i_this->mParticleKey = + dComIfGp_particle_set(i_this->mParticleKey, 0x8403, &i_this->current.pos, + &i_this->mTevStr, &i_this->shape_angle, NULL, 0xff, + NULL, -1, NULL, NULL, NULL); + i_this->mpBrkAnm->play(); + } else { + if (i_this->mTimer != 0) { + i_this->mTimer--; + } + + J3DAnmTransform* anm; + J3DAnmTextureSRTKey* btk_anm; + switch (i_this->mMirrorMode) { + case 0: + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); + static u16 mirror_effect_id[10] = { + 0x89A0, 0x89A1, 0x89A2, 0x89A5, 0x89A6, 0x89A7, 0x89A8, 0x89A9, 0x89AA, 0x89AB + }; + for (int i = 0; i < 10; i++) { + dComIfGp_particle_set(mirror_effect_id[i], &i_this->current.pos, &i_this->mTevStr, + &i_this->shape_angle, NULL); + } + i_this->mMirrorMode = 1; + i_this->mTimer = 120; + anm = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[i_this->mLevel], 5); + i_this->mpMorf->setAnm(anm, 0, 0.0f, 0.0f, 0.0f, -1.0f); + i_this->mpMorf->setFrame(1.0f); + break; + + case 1: + if (i_this->mTimer == 0) { + i_this->mMirrorMode = 2; + i_this->mpMorf->setPlaySpeed(1.0f); + i_this->mpMorf->setFrame(0.0f); + } + // no break + + case 2: + i_this->mParticleKey = + dComIfGp_particle_set(i_this->mParticleKey, 0x89a3, &i_this->current.pos, + &i_this->mTevStr, &i_this->shape_angle, NULL, 0xff, + NULL, -1, NULL, NULL, NULL); + i_this->shape_angle.y += 0x100; + break; + + case 3: + i_this->mMirrorMode = 4; + anm = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[i_this->mLevel], 6); + i_this->mpMorf->setAnm(anm, 0, 0.0f, 1.0f, 0.0f, -1.0f); + i_this->field_0x59a = true; + btk_anm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[i_this->mLevel], + l_btkIndex[i_this->mLevel]); + i_this->mpBtkAnm->init(i_this->mpMorf->getModel()->getModelData(), + btk_anm, 1, 0, 1.0f, 0, -1); + // no break + + case 4: + i_this->shape_angle.y += 0x100; + mDoMtx_stack_c::copy(i_this->mpMorf->getModel()->i_getAnmMtx(0)); + cXyz particle_pos; + mDoMtx_stack_c::multVecZero(&particle_pos); + i_this->mParticleKey = + dComIfGp_particle_set(i_this->mParticleKey, 0x89a4, &particle_pos, &i_this->mTevStr, + &i_this->shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL); + break; + + case 5: + i_this->mMirrorMode = 6; + anm = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[i_this->mLevel], 6); + i_this->mpMorf->setAnm(anm, 0, 0.0f, 0.0f, 0.0f, -1.0f); + break; + + case 6: + break; + } + + if (i_this->field_0x59a) { + i_this->mpBtkAnm->play(); + } + i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); + setModelBaseMtx(i_this); + i_this->mpMorf->modelCalc(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -316,55 +303,58 @@ static asm void action(obj_ystone_class* param_0) { #include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/action__FP16obj_ystone_class.s" } #pragma pop +#endif /* 80D3E6EC-80D3E770 00074C 0084+00 2/1 0/0 0/0 .text daObj_Ystone_Execute__FP16obj_ystone_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Ystone_Execute(obj_ystone_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Execute__FP16obj_ystone_class.s" +static int daObj_Ystone_Execute(obj_ystone_class* i_this) { + if (i_this->mLevel < 3 && i_this->field_0x59b) { + return 1; + } else { + action(i_this); + i_this->mEyePos = i_this->current.pos; + i_this->mAttentionInfo.mPosition = i_this->current.pos; + return 1; + } } -#pragma pop /* 80D3E770-80D3E778 0007D0 0008+00 1/0 0/0 0/0 .text daObj_Ystone_IsDelete__FP16obj_ystone_class */ -static bool daObj_Ystone_IsDelete(obj_ystone_class* param_0) { - return true; +static int daObj_Ystone_IsDelete(obj_ystone_class* i_this) { + return 1; } /* 80D3E778-80D3E7B8 0007D8 0040+00 1/0 0/0 0/0 .text daObj_Ystone_Delete__FP16obj_ystone_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Ystone_Delete(obj_ystone_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Delete__FP16obj_ystone_class.s" +static int daObj_Ystone_Delete(obj_ystone_class* i_this) { + dComIfG_resDelete(&i_this->mPhaseReq, l_arcName[i_this->mLevel]); + return 1; } -#pragma pop -/* ############################################################################################## */ /* 80D3ED2C-80D3ED4C -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Ystone_Method */ -SECTION_DATA static void* l_daObj_Ystone_Method[8] = { - (void*)daObj_Ystone_Create__FP10fopAc_ac_c, - (void*)daObj_Ystone_Delete__FP16obj_ystone_class, - (void*)daObj_Ystone_Execute__FP16obj_ystone_class, - (void*)daObj_Ystone_IsDelete__FP16obj_ystone_class, - (void*)daObj_Ystone_Draw__FP16obj_ystone_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Ystone_Method = { + (process_method_func)daObj_Ystone_Create, + (process_method_func)daObj_Ystone_Delete, + (process_method_func)daObj_Ystone_Execute, + (process_method_func)daObj_Ystone_IsDelete, + (process_method_func)daObj_Ystone_Draw, }; /* 80D3ED4C-80D3ED7C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_YSTONE */ -SECTION_DATA extern void* g_profile_OBJ_YSTONE[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02F20000, (void*)&g_fpcLf_Method, - (void*)0x000005A0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02590000, (void*)&l_daObj_Ystone_Method, - (void*)0x00044100, (void*)NULL, +extern actor_process_profile_definition g_profile_OBJ_YSTONE = { + fpcLy_CURRENT_e, + 8, + fpcPi_CURRENT_e, + PROC_OBJ_YSTONE, + &g_fpcLf_Method.mBase, + sizeof(obj_ystone_class), + 0, + 0, + &g_fopAc_Method.base, + 0x259, + &l_daObj_Ystone_Method, + 0x44100, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; /* 80D3ED7C-80D3ED88 0000C0 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -375,20 +365,66 @@ SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { }; /* 80D3E7B8-80D3EA38 000818 0280+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +#ifdef NONMATCHING +// regalloc +static int useHeapInit(fopAc_ac_c* i_this) { + obj_ystone_class* _this = static_cast(i_this); + J3DModelData* model_data = + (J3DModelData*)dComIfG_getObjectRes(l_arcName[_this->mLevel], l_bmdIndex[_this->mLevel]); + + if (_this->mLevel < 3) { + _this->mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (_this->mpModel == NULL) { + return 0; + } + + J3DAnmTevRegKey* brk_anm = + (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[_this->mLevel], + l_brkIndex[_this->mLevel]); + _this->mpBrkAnm = new mDoExt_brkAnm(); + if (_this->mpBrkAnm == NULL || + !_this->mpBrkAnm->init(model_data, brk_anm, 1, 2, 1.0f, 0, -1)) + { + return 0; + } + } else { + _this->mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[_this->mLevel], 5), + 0, 1.0f, 0, -1, NULL, 0, 0x11000284); + if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { + return 0; + } + + _this->mpBtkAnm = new mDoExt_btkAnm(); + if (_this->mpBtkAnm == NULL) { + return 0; + } + J3DAnmTextureSRTKey* btk_anm = + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[_this->mLevel], + l_btkIndex[_this->mLevel]); + if (!_this->mpBtkAnm->init(model_data, btk_anm, 0, 2, 1.0f, 0, -1)) { + return 0; + } + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { +static asm int useHeapInit(fopAc_ac_c* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/useHeapInit__FP10fopAc_ac_c.s" } #pragma pop +#endif /* 80D3EA38-80D3EA80 000A98 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/__dt__12J3DFrameCtrlFv.s" } @@ -396,13 +432,52 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { /* 80D3EA80-80D3EC04 000AE0 0184+00 1/0 0/0 0/0 .text daObj_Ystone_Create__FP10fopAc_ac_c */ +#ifdef NONMATCHING +// matches with literals +static cPhs__Step daObj_Ystone_Create(fopAc_ac_c* i_this) { + obj_ystone_class* _this = static_cast(i_this); + fopAcM_SetupActor(_this, obj_ystone_class); + _this->mLevel = getNowLevel() - 1; + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhaseReq, l_arcName[_this->mLevel]); + + if (step == cPhs_COMPLEATE_e) { + if (_this->mLevel < 3) { + if (!fopAcM_entrySolidHeap(_this, useHeapInit, 0x1000)) { + return cPhs_ERROR_e; + } + } else { + if (!fopAcM_entrySolidHeap(_this, useHeapInit, 0x33a0)) { + return cPhs_ERROR_e; + } + } + + if (_this->mLevel < 3) { + fopAcM_SetMtx(_this, _this->mpModel->getBaseTRMtx()); + if (_this->mLevel < 3) { + _this->field_0x59b = true; + } + mDoMtx_stack_c::scaleS(0.0f, 0.0f, 0.0f); + _this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + } else { + fopAcM_SetMtx(_this, _this->mpMorf->getModel()->getBaseTRMtx()); + _this->mMirrorMode = fopAcM_GetParam(_this) & 0xff; + if (_this->mMirrorMode >= 7) { + _this->mMirrorMode = 0; + } + } + + _this->mScaleF = 1.0f; + daObj_Ystone_Execute(_this); + } + return step; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void daObj_Ystone_Create(fopAc_ac_c* param_0) { +static asm cPhs__Step daObj_Ystone_Create(fopAc_ac_c* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Create__FP10fopAc_ac_c.s" } #pragma pop - -/* 80D3EC5C-80D3EC5C 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#endif