From c5b54dd7ec656e70ced5d1363a6862aecece6afc Mon Sep 17 00:00:00 2001 From: Trueffel <106771418+Trueffeloot@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:43:24 +0200 Subject: [PATCH] d_a_door_push OK (#1959) * work on d_a_push_door * d_a_door_push OK * remove unused asm --- .../CreateHeap__12daDoorPush_cFv.s | 78 -- .../d_a_door_push/Create__12daDoorPush_cFv.s | 92 -- .../d_a_door_push/Delete__12daDoorPush_cFv.s | 34 - .../d_a_door_push/Draw__12daDoorPush_cFv.s | 49 - .../Execute__12daDoorPush_cFPPA3_A4_f.s | 30 - ...10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s | 11 - ...10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s | 11 - .../d_a_door_push/__dt__4cXyzFv.s | 17 - .../actionEvent__12daDoorPush_cFv.s | 9 - .../actionOpenWait__12daDoorPush_cFv.s | 31 - .../actionOrderEvent__12daDoorPush_cFv.s | 34 - .../d_a_door_push/action__12daDoorPush_cFv.s | 33 - .../create1st__12daDoorPush_cFv.s | 36 - ...aDoorPush_MoveBGDelete__FP12daDoorPush_c.s | 9 - .../daDoorPush_MoveBGDraw__FP12daDoorPush_c.s | 12 - ...DoorPush_MoveBGExecute__FP12daDoorPush_c.s | 9 - .../daDoorPush_create1st__FP12daDoorPush_c.s | 38 - .../demoProc__12daDoorPush_cFv.s | 195 ---- .../event_proc_call__12daDoorPush_cFv.s | 43 - .../d_a_door_push/func_80678EA8.s | 9 - .../initBaseMtx__12daDoorPush_cFv.s | 77 -- .../init_modeWait__12daDoorPush_cFv.s | 13 - .../modeWait__12daDoorPush_cFv.s | 119 --- .../rotateInit__12daDoorPush_cFv.s | 10 - .../d_a_door_push/rotate__12daDoorPush_cFv.s | 48 - .../setBaseMtx__12daDoorPush_cFv.s | 77 -- .../d_a_door_push/setGoal__12daDoorPush_cFv.s | 47 - include/SSystem/SComponent/c_lib.h | 2 +- include/d/a/d_a_player.h | 4 + include/d/bg/d_bg_w_base.h | 5 +- include/d/com/d_com_inf_game.h | 4 + .../d/a/door/d_a_door_push/d_a_door_push.h | 66 +- rel/d/a/door/d_a_door_push/Makefile | 2 - rel/d/a/door/d_a_door_push/d_a_door_push.cpp | 998 ++++++------------ .../unknown_translation_unit_bss.cpp | 28 - 35 files changed, 408 insertions(+), 1872 deletions(-) delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/CreateHeap__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/Create__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/Delete__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/Draw__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/Execute__12daDoorPush_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/__dt__4cXyzFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionEvent__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionOpenWait__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionOrderEvent__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/action__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/create1st__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGDelete__FP12daDoorPush_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGDraw__FP12daDoorPush_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGExecute__FP12daDoorPush_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_create1st__FP12daDoorPush_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/demoProc__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/event_proc_call__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/func_80678EA8.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/initBaseMtx__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/init_modeWait__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/modeWait__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/rotateInit__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/rotate__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/setBaseMtx__12daDoorPush_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_push/d_a_door_push/setGoal__12daDoorPush_cFv.s delete mode 100644 rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.cpp diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/CreateHeap__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/CreateHeap__12daDoorPush_cFv.s deleted file mode 100644 index 03be9f34776..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/CreateHeap__12daDoorPush_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_806781FC: -/* 806781FC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80678200 7C 08 02 A6 */ mflr r0 -/* 80678204 90 01 00 24 */ stw r0, 0x24(r1) -/* 80678208 39 61 00 20 */ addi r11, r1, 0x20 -/* 8067820C 4B CE 9F C5 */ bl _savegpr_26 -/* 80678210 7C 7F 1B 78 */ mr r31, r3 -/* 80678214 3C 60 80 68 */ lis r3, l_arcName@ha /* 0x80678F70@ha */ -/* 80678218 38 63 8F 70 */ addi r3, r3, l_arcName@l /* 0x80678F70@l */ -/* 8067821C 80 63 00 00 */ lwz r3, 0(r3) -/* 80678220 38 80 00 05 */ li r4, 5 -/* 80678224 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80678228 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8067822C 3F 85 00 02 */ addis r28, r5, 2 -/* 80678230 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 80678234 7F 85 E3 78 */ mr r5, r28 -/* 80678238 38 C0 00 80 */ li r6, 0x80 -/* 8067823C 4B 9C 40 B1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80678240 7C 7B 1B 78 */ mr r27, r3 -/* 80678244 3B 40 00 00 */ li r26, 0 -/* 80678248 3B C0 00 00 */ li r30, 0 -/* 8067824C 3F A0 11 00 */ lis r29, 0x1100 /* 0x11000084@ha */ -lbl_80678250: -/* 80678250 7F 63 DB 78 */ mr r3, r27 -/* 80678254 3C 80 00 08 */ lis r4, 8 -/* 80678258 38 BD 00 84 */ addi r5, r29, 0x0084 /* 0x11000084@l */ -/* 8067825C 4B 99 C9 F9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80678260 38 1E 05 A8 */ addi r0, r30, 0x5a8 -/* 80678264 7C 7F 01 2E */ stwx r3, r31, r0 -/* 80678268 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 8067826C 28 00 00 00 */ cmplwi r0, 0 -/* 80678270 40 82 00 0C */ bne lbl_8067827C -/* 80678274 38 60 00 00 */ li r3, 0 -/* 80678278 48 00 00 88 */ b lbl_80678300 -lbl_8067827C: -/* 8067827C 3B 5A 00 01 */ addi r26, r26, 1 -/* 80678280 2C 1A 00 02 */ cmpwi r26, 2 -/* 80678284 3B DE 00 04 */ addi r30, r30, 4 -/* 80678288 41 80 FF C8 */ blt lbl_80678250 -/* 8067828C 38 60 00 C0 */ li r3, 0xc0 -/* 80678290 4B C5 69 BD */ bl __nw__FUl -/* 80678294 7C 60 1B 79 */ or. r0, r3, r3 -/* 80678298 41 82 00 0C */ beq lbl_806782A4 -/* 8067829C 4B A0 36 D5 */ bl __ct__4dBgWFv -/* 806782A0 7C 60 1B 78 */ mr r0, r3 -lbl_806782A4: -/* 806782A4 90 1F 05 B0 */ stw r0, 0x5b0(r31) -/* 806782A8 80 1F 05 B0 */ lwz r0, 0x5b0(r31) -/* 806782AC 28 00 00 00 */ cmplwi r0, 0 -/* 806782B0 41 82 00 3C */ beq lbl_806782EC -/* 806782B4 3C 60 80 68 */ lis r3, l_arcName@ha /* 0x80678F70@ha */ -/* 806782B8 38 63 8F 70 */ addi r3, r3, l_arcName@l /* 0x80678F70@l */ -/* 806782BC 80 63 00 00 */ lwz r3, 0(r3) -/* 806782C0 38 80 00 08 */ li r4, 8 -/* 806782C4 7F 85 E3 78 */ mr r5, r28 -/* 806782C8 38 C0 00 80 */ li r6, 0x80 -/* 806782CC 4B 9C 40 21 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 806782D0 7C 64 1B 78 */ mr r4, r3 -/* 806782D4 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 806782D8 38 A0 00 01 */ li r5, 1 -/* 806782DC 38 DF 05 B4 */ addi r6, r31, 0x5b4 -/* 806782E0 4B A0 1C 59 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 806782E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 806782E8 41 82 00 14 */ beq lbl_806782FC -lbl_806782EC: -/* 806782EC 38 00 00 00 */ li r0, 0 -/* 806782F0 90 1F 05 B0 */ stw r0, 0x5b0(r31) -/* 806782F4 38 60 00 00 */ li r3, 0 -/* 806782F8 48 00 00 08 */ b lbl_80678300 -lbl_806782FC: -/* 806782FC 38 60 00 01 */ li r3, 1 -lbl_80678300: -/* 80678300 39 61 00 20 */ addi r11, r1, 0x20 -/* 80678304 4B CE 9F 19 */ bl _restgpr_26 -/* 80678308 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8067830C 7C 08 03 A6 */ mtlr r0 -/* 80678310 38 21 00 20 */ addi r1, r1, 0x20 -/* 80678314 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Create__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Create__12daDoorPush_cFv.s deleted file mode 100644 index 06f4d9b2ada..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Create__12daDoorPush_cFv.s +++ /dev/null @@ -1,92 +0,0 @@ -lbl_8067809C: -/* 8067809C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 806780A0 7C 08 02 A6 */ mflr r0 -/* 806780A4 90 01 00 24 */ stw r0, 0x24(r1) -/* 806780A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 806780AC 4B CE A1 25 */ bl _savegpr_26 -/* 806780B0 7C 7F 1B 78 */ mr r31, r3 -/* 806780B4 80 83 05 B0 */ lwz r4, 0x5b0(r3) -/* 806780B8 28 04 00 00 */ cmplwi r4, 0 -/* 806780BC 41 82 00 28 */ beq lbl_806780E4 -/* 806780C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806780C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806780C8 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 806780CC 7F E5 FB 78 */ mr r5, r31 -/* 806780D0 4B 9F C9 39 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 806780D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 806780D8 41 82 00 0C */ beq lbl_806780E4 -/* 806780DC 38 60 00 00 */ li r3, 0 -/* 806780E0 48 00 01 04 */ b lbl_806781E4 -lbl_806780E4: -/* 806780E4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 806780E8 B0 1F 06 30 */ sth r0, 0x630(r31) -/* 806780EC A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 806780F0 38 03 7F FF */ addi r0, r3, 0x7fff -/* 806780F4 B0 1F 06 32 */ sth r0, 0x632(r31) -/* 806780F8 A8 1F 06 30 */ lha r0, 0x630(r31) -/* 806780FC B0 1F 06 34 */ sth r0, 0x634(r31) -/* 80678100 A8 1F 06 32 */ lha r0, 0x632(r31) -/* 80678104 B0 1F 06 36 */ sth r0, 0x636(r31) -/* 80678108 38 00 00 02 */ li r0, 2 -/* 8067810C 98 1F 06 39 */ stb r0, 0x639(r31) -/* 80678110 7F E3 FB 78 */ mr r3, r31 -/* 80678114 4B FF FC F5 */ bl initBaseMtx__12daDoorPush_cFv -/* 80678118 38 1F 05 E4 */ addi r0, r31, 0x5e4 -/* 8067811C 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80678120 7F E3 FB 78 */ mr r3, r31 -/* 80678124 3C 80 80 68 */ lis r4, l_cull_box@ha /* 0x80678F74@ha */ -/* 80678128 C4 24 8F 74 */ lfsu f1, l_cull_box@l(r4) /* 0x80678F74@l */ -/* 8067812C C0 44 00 04 */ lfs f2, 4(r4) -/* 80678130 C0 64 00 08 */ lfs f3, 8(r4) -/* 80678134 C0 84 00 0C */ lfs f4, 0xc(r4) -/* 80678138 C0 A4 00 10 */ lfs f5, 0x10(r4) -/* 8067813C C0 C4 00 14 */ lfs f6, 0x14(r4) -/* 80678140 4B 9A 24 09 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80678144 3C 60 80 67 */ lis r3, PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel@ha /* 0x80677DB8@ha */ -/* 80678148 38 03 7D B8 */ addi r0, r3, PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel@l /* 0x80677DB8@l */ -/* 8067814C 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80678150 90 03 00 10 */ stw r0, 0x10(r3) -/* 80678154 3C 60 80 67 */ lis r3, PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel@ha /* 0x80677DE0@ha */ -/* 80678158 38 03 7D E0 */ addi r0, r3, PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel@l /* 0x80677DE0@l */ -/* 8067815C 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 80678160 90 03 00 10 */ stw r0, 0x10(r3) -/* 80678164 3C 60 80 68 */ lis r3, l_arcName@ha /* 0x80678F70@ha */ -/* 80678168 80 03 8F 70 */ lwz r0, l_arcName@l(r3) /* 0x80678F70@l */ -/* 8067816C 90 1F 01 00 */ stw r0, 0x100(r31) -/* 80678170 3B 40 00 00 */ li r26, 0 -/* 80678174 3B C0 00 00 */ li r30, 0 -/* 80678178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8067817C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80678180 3B 63 4F F8 */ addi r27, r3, 0x4ff8 -/* 80678184 3C 60 80 68 */ lis r3, d_a_door_push__stringBase0@ha /* 0x80678F18@ha */ -/* 80678188 3B 83 8F 18 */ addi r28, r3, d_a_door_push__stringBase0@l /* 0x80678F18@l */ -/* 8067818C 3B A0 00 FF */ li r29, 0xff -lbl_80678190: -/* 80678190 7F 63 DB 78 */ mr r3, r27 -/* 80678194 7F E4 FB 78 */ mr r4, r31 -/* 80678198 38 BC 00 0A */ addi r5, r28, 0xa -/* 8067819C 38 C0 00 FF */ li r6, 0xff -/* 806781A0 4B 9C F5 B9 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 806781A4 38 1E 06 3A */ addi r0, r30, 0x63a -/* 806781A8 7C 7F 03 2E */ sthx r3, r31, r0 -/* 806781AC 38 1A 06 3E */ addi r0, r26, 0x63e -/* 806781B0 7F BF 01 AE */ stbx r29, r31, r0 -/* 806781B4 3B 5A 00 01 */ addi r26, r26, 1 -/* 806781B8 2C 1A 00 02 */ cmpwi r26, 2 -/* 806781BC 3B DE 00 02 */ addi r30, r30, 2 -/* 806781C0 41 80 FF D0 */ blt lbl_80678190 -/* 806781C4 3C 60 80 68 */ lis r3, lit_3744@ha /* 0x80678EE0@ha */ -/* 806781C8 C0 03 8E E0 */ lfs f0, lit_3744@l(r3) /* 0x80678EE0@l */ -/* 806781CC D0 1F 05 20 */ stfs f0, 0x520(r31) -/* 806781D0 7F E3 FB 78 */ mr r3, r31 -/* 806781D4 48 00 02 B5 */ bl init_modeWait__12daDoorPush_cFv -/* 806781D8 7F E3 FB 78 */ mr r3, r31 -/* 806781DC 4B A0 07 75 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 806781E0 38 60 00 01 */ li r3, 1 -lbl_806781E4: -/* 806781E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 806781E8 4B CE A0 35 */ bl _restgpr_26 -/* 806781EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 806781F0 7C 08 03 A6 */ mtlr r0 -/* 806781F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 806781F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Delete__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Delete__12daDoorPush_cFv.s deleted file mode 100644 index 8e090277852..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Delete__12daDoorPush_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80678D2C: -/* 80678D2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80678D30 7C 08 02 A6 */ mflr r0 -/* 80678D34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678D38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80678D3C 7C 7F 1B 78 */ mr r31, r3 -/* 80678D40 80 63 05 B0 */ lwz r3, 0x5b0(r3) -/* 80678D44 28 03 00 00 */ cmplwi r3, 0 -/* 80678D48 41 82 00 24 */ beq lbl_80678D6C -/* 80678D4C 4B BE F4 89 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80678D50 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80678D54 41 82 00 18 */ beq lbl_80678D6C -/* 80678D58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80678D5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80678D60 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80678D64 80 9F 05 B0 */ lwz r4, 0x5b0(r31) -/* 80678D68 4B 9F B4 E9 */ bl Release__4cBgSFP9dBgW_Base -lbl_80678D6C: -/* 80678D6C 38 00 00 00 */ li r0, 0 -/* 80678D70 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80678D74 90 03 00 10 */ stw r0, 0x10(r3) -/* 80678D78 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 80678D7C 90 03 00 10 */ stw r0, 0x10(r3) -/* 80678D80 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80678D84 3C 80 80 68 */ lis r4, l_arcName@ha /* 0x80678F70@ha */ -/* 80678D88 38 84 8F 70 */ addi r4, r4, l_arcName@l /* 0x80678F70@l */ -/* 80678D8C 80 84 00 00 */ lwz r4, 0(r4) -/* 80678D90 4B 9B 42 79 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80678D94 38 60 00 01 */ li r3, 1 -/* 80678D98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80678D9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80678DA0 7C 08 03 A6 */ mtlr r0 -/* 80678DA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678DA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Draw__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Draw__12daDoorPush_cFv.s deleted file mode 100644 index 10dcc7b4877..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Draw__12daDoorPush_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80678C70: -/* 80678C70 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80678C74 7C 08 02 A6 */ mflr r0 -/* 80678C78 90 01 00 34 */ stw r0, 0x34(r1) -/* 80678C7C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80678C80 4B CE 95 4D */ bl _savegpr_25 -/* 80678C84 7C 79 1B 78 */ mr r25, r3 -/* 80678C88 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80678C8C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80678C90 38 80 00 10 */ li r4, 0x10 -/* 80678C94 38 B9 04 D0 */ addi r5, r25, 0x4d0 -/* 80678C98 38 D9 01 0C */ addi r6, r25, 0x10c -/* 80678C9C 4B B2 AB 29 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80678CA0 3B 40 00 00 */ li r26, 0 -/* 80678CA4 3B E0 00 00 */ li r31, 0 -/* 80678CA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80678CAC 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80678CB0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80678CB4 3B A3 4A C8 */ addi r29, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80678CB8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80678CBC 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */ -lbl_80678CC0: -/* 80678CC0 7F C3 F3 78 */ mr r3, r30 -/* 80678CC4 3B 7F 05 A8 */ addi r27, r31, 0x5a8 -/* 80678CC8 7C 99 D8 2E */ lwzx r4, r25, r27 -/* 80678CCC 80 84 00 04 */ lwz r4, 4(r4) -/* 80678CD0 38 B9 01 0C */ addi r5, r25, 0x10c -/* 80678CD4 4B B2 C0 CD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80678CD8 80 1C 5F 70 */ lwz r0, 0x5f70(r28) -/* 80678CDC 90 1D 00 48 */ stw r0, 0x48(r29) -/* 80678CE0 80 1C 5F 74 */ lwz r0, 0x5f74(r28) -/* 80678CE4 90 1D 00 4C */ stw r0, 0x4c(r29) -/* 80678CE8 7C 79 D8 2E */ lwzx r3, r25, r27 -/* 80678CEC 4B 99 4F D9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80678CF0 80 1C 5F 80 */ lwz r0, 0x5f80(r28) -/* 80678CF4 90 1D 00 48 */ stw r0, 0x48(r29) -/* 80678CF8 80 1C 5F 84 */ lwz r0, 0x5f84(r28) -/* 80678CFC 90 1D 00 4C */ stw r0, 0x4c(r29) -/* 80678D00 3B 5A 00 01 */ addi r26, r26, 1 -/* 80678D04 2C 1A 00 02 */ cmpwi r26, 2 -/* 80678D08 3B FF 00 04 */ addi r31, r31, 4 -/* 80678D0C 41 80 FF B4 */ blt lbl_80678CC0 -/* 80678D10 38 60 00 01 */ li r3, 1 -/* 80678D14 39 61 00 30 */ addi r11, r1, 0x30 -/* 80678D18 4B CE 95 01 */ bl _restgpr_25 -/* 80678D1C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80678D20 7C 08 03 A6 */ mtlr r0 -/* 80678D24 38 21 00 30 */ addi r1, r1, 0x30 -/* 80678D28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Execute__12daDoorPush_cFPPA3_A4_f.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Execute__12daDoorPush_cFPPA3_A4_f.s deleted file mode 100644 index cbc0487c54d..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/Execute__12daDoorPush_cFPPA3_A4_f.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8067839C: -/* 8067839C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806783A0 7C 08 02 A6 */ mflr r0 -/* 806783A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 806783A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806783AC 7C 7F 1B 78 */ mr r31, r3 -/* 806783B0 38 1F 05 6C */ addi r0, r31, 0x56c -/* 806783B4 90 04 00 00 */ stw r0, 0(r4) -/* 806783B8 48 00 00 55 */ bl action__12daDoorPush_cFv -/* 806783BC 7F E3 FB 78 */ mr r3, r31 -/* 806783C0 48 00 02 A5 */ bl event_proc_call__12daDoorPush_cFv -/* 806783C4 7F E3 FB 78 */ mr r3, r31 -/* 806783C8 4B FF FB 71 */ bl setBaseMtx__12daDoorPush_cFv -/* 806783CC 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 806783D0 4B A0 35 F1 */ bl Move__4dBgWFv -/* 806783D4 38 80 00 00 */ li r4, 0 -/* 806783D8 38 60 00 00 */ li r3, 0 -/* 806783DC 38 00 00 02 */ li r0, 2 -/* 806783E0 7C 09 03 A6 */ mtctr r0 -lbl_806783E4: -/* 806783E4 38 04 06 2C */ addi r0, r4, 0x62c -/* 806783E8 7C 7F 01 AE */ stbx r3, r31, r0 -/* 806783EC 38 84 00 01 */ addi r4, r4, 1 -/* 806783F0 42 00 FF F4 */ bdnz lbl_806783E4 -/* 806783F4 38 60 00 01 */ li r3, 1 -/* 806783F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806783FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80678400 7C 08 03 A6 */ mtlr r0 -/* 80678404 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678408 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s deleted file mode 100644 index 7b59e2f9715..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80677DE0: -/* 80677DE0 54 C0 07 FF */ clrlwi. r0, r6, 0x1f -/* 80677DE4 4D 82 00 20 */ beqlr -/* 80677DE8 88 83 06 2F */ lbz r4, 0x62f(r3) -/* 80677DEC 38 04 00 01 */ addi r0, r4, 1 -/* 80677DF0 98 03 06 2F */ stb r0, 0x62f(r3) -/* 80677DF4 38 00 00 00 */ li r0, 0 -/* 80677DF8 98 03 06 2E */ stb r0, 0x62e(r3) -/* 80677DFC 38 00 00 01 */ li r0, 1 -/* 80677E00 98 03 06 2D */ stb r0, 0x62d(r3) -/* 80677E04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s deleted file mode 100644 index bb4699e5eec..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80677DB8: -/* 80677DB8 54 C0 07 FF */ clrlwi. r0, r6, 0x1f -/* 80677DBC 4D 82 00 20 */ beqlr -/* 80677DC0 88 83 06 2E */ lbz r4, 0x62e(r3) -/* 80677DC4 38 04 00 01 */ addi r0, r4, 1 -/* 80677DC8 98 03 06 2E */ stb r0, 0x62e(r3) -/* 80677DCC 38 00 00 00 */ li r0, 0 -/* 80677DD0 98 03 06 2F */ stb r0, 0x62f(r3) -/* 80677DD4 38 00 00 01 */ li r0, 1 -/* 80677DD8 98 03 06 2C */ stb r0, 0x62c(r3) -/* 80677DDC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/__dt__4cXyzFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/__dt__4cXyzFv.s deleted file mode 100644 index e3fafef9704..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/__dt__4cXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80678060: -/* 80678060 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80678064 7C 08 02 A6 */ mflr r0 -/* 80678068 90 01 00 14 */ stw r0, 0x14(r1) -/* 8067806C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80678070 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80678074 41 82 00 10 */ beq lbl_80678084 -/* 80678078 7C 80 07 35 */ extsh. r0, r4 -/* 8067807C 40 81 00 08 */ ble lbl_80678084 -/* 80678080 4B C5 6C BD */ bl __dl__FPv -lbl_80678084: -/* 80678084 7F E3 FB 78 */ mr r3, r31 -/* 80678088 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8067808C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80678090 7C 08 03 A6 */ mtlr r0 -/* 80678094 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678098 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionEvent__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionEvent__12daDoorPush_cFv.s deleted file mode 100644 index 12236199045..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionEvent__12daDoorPush_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_806787F8: -/* 806787F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806787FC 7C 08 02 A6 */ mflr r0 -/* 80678800 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678804 48 00 00 15 */ bl demoProc__12daDoorPush_cFv -/* 80678808 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8067880C 7C 08 03 A6 */ mtlr r0 -/* 80678810 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678814 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionOpenWait__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionOpenWait__12daDoorPush_cFv.s deleted file mode 100644 index 59187f6b7fe..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionOpenWait__12daDoorPush_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80678708: -/* 80678708 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8067870C 7C 08 02 A6 */ mflr r0 -/* 80678710 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678714 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80678718 7C 7F 1B 78 */ mr r31, r3 -/* 8067871C 88 03 06 39 */ lbz r0, 0x639(r3) -/* 80678720 28 00 00 02 */ cmplwi r0, 2 -/* 80678724 41 82 00 44 */ beq lbl_80678768 -/* 80678728 38 00 00 01 */ li r0, 1 -/* 8067872C 98 1F 06 40 */ stb r0, 0x640(r31) -/* 80678730 88 BF 06 39 */ lbz r5, 0x639(r31) -/* 80678734 54 A0 08 3C */ slwi r0, r5, 1 -/* 80678738 7C 9F 02 14 */ add r4, r31, r0 -/* 8067873C A8 84 06 3A */ lha r4, 0x63a(r4) -/* 80678740 7C BF 2A 14 */ add r5, r31, r5 -/* 80678744 88 A5 06 3E */ lbz r5, 0x63e(r5) -/* 80678748 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8067874C 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80678750 38 E0 00 00 */ li r7, 0 -/* 80678754 39 00 00 01 */ li r8, 1 -/* 80678758 4B 9A 2F 25 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8067875C A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80678760 60 00 00 02 */ ori r0, r0, 2 -/* 80678764 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_80678768: -/* 80678768 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8067876C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80678770 7C 08 03 A6 */ mtlr r0 -/* 80678774 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678778 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionOrderEvent__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionOrderEvent__12daDoorPush_cFv.s deleted file mode 100644 index f00c512b10d..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionOrderEvent__12daDoorPush_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8067877C: -/* 8067877C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80678780 7C 08 02 A6 */ mflr r0 -/* 80678784 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678788 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8067878C 7C 7F 1B 78 */ mr r31, r3 -/* 80678790 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80678794 28 00 00 02 */ cmplwi r0, 2 -/* 80678798 40 82 00 14 */ bne lbl_806787AC -/* 8067879C 38 00 00 02 */ li r0, 2 -/* 806787A0 98 1F 06 40 */ stb r0, 0x640(r31) -/* 806787A4 48 00 00 75 */ bl demoProc__12daDoorPush_cFv -/* 806787A8 48 00 00 3C */ b lbl_806787E4 -lbl_806787AC: -/* 806787AC 88 BF 06 39 */ lbz r5, 0x639(r31) -/* 806787B0 54 A0 08 3C */ slwi r0, r5, 1 -/* 806787B4 7C 9F 02 14 */ add r4, r31, r0 -/* 806787B8 A8 84 06 3A */ lha r4, 0x63a(r4) -/* 806787BC 7C BF 2A 14 */ add r5, r31, r5 -/* 806787C0 88 A5 06 3E */ lbz r5, 0x63e(r5) -/* 806787C4 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 806787C8 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 806787CC 38 E0 00 00 */ li r7, 0 -/* 806787D0 39 00 00 01 */ li r8, 1 -/* 806787D4 4B 9A 2E A9 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 806787D8 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 806787DC 60 00 00 02 */ ori r0, r0, 2 -/* 806787E0 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_806787E4: -/* 806787E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806787E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806787EC 7C 08 03 A6 */ mtlr r0 -/* 806787F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 806787F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/action__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/action__12daDoorPush_cFv.s deleted file mode 100644 index 61297211c8e..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/action__12daDoorPush_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8067840C: -/* 8067840C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80678410 7C 08 02 A6 */ mflr r0 -/* 80678414 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678418 3C 80 80 68 */ lis r4, struct_80679070+0x0@ha /* 0x80679070@ha */ -/* 8067841C 38 E4 90 70 */ addi r7, r4, struct_80679070+0x0@l /* 0x80679070@l */ -/* 80678420 88 07 00 00 */ lbz r0, 0(r7) -/* 80678424 7C 00 07 75 */ extsb. r0, r0 -/* 80678428 40 82 00 34 */ bne lbl_8067845C -/* 8067842C 3C 80 80 68 */ lis r4, l_func_3791@ha /* 0x80678F98@ha */ -/* 80678430 38 C4 8F 98 */ addi r6, r4, l_func_3791@l /* 0x80678F98@l */ -/* 80678434 3C 80 80 68 */ lis r4, lit_3792@ha /* 0x80678F8C@ha */ -/* 80678438 38 A4 8F 8C */ addi r5, r4, lit_3792@l /* 0x80678F8C@l */ -/* 8067843C 80 85 00 00 */ lwz r4, 0(r5) -/* 80678440 80 05 00 04 */ lwz r0, 4(r5) -/* 80678444 90 86 00 00 */ stw r4, 0(r6) -/* 80678448 90 06 00 04 */ stw r0, 4(r6) -/* 8067844C 80 05 00 08 */ lwz r0, 8(r5) -/* 80678450 90 06 00 08 */ stw r0, 8(r6) -/* 80678454 38 00 00 01 */ li r0, 1 -/* 80678458 98 07 00 00 */ stb r0, 0(r7) -lbl_8067845C: -/* 8067845C 88 03 06 38 */ lbz r0, 0x638(r3) -/* 80678460 1C A0 00 0C */ mulli r5, r0, 0xc -/* 80678464 3C 80 80 68 */ lis r4, l_func_3791@ha /* 0x80678F98@ha */ -/* 80678468 38 04 8F 98 */ addi r0, r4, l_func_3791@l /* 0x80678F98@l */ -/* 8067846C 7D 80 2A 14 */ add r12, r0, r5 -/* 80678470 4B CE 9C 15 */ bl __ptmf_scall -/* 80678474 60 00 00 00 */ nop -/* 80678478 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8067847C 7C 08 03 A6 */ mtlr r0 -/* 80678480 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678484 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/create1st__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/create1st__12daDoorPush_cFv.s deleted file mode 100644 index ad9231d9b66..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/create1st__12daDoorPush_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80678318: -/* 80678318 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8067831C 7C 08 02 A6 */ mflr r0 -/* 80678320 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678324 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80678328 7C 7F 1B 78 */ mr r31, r3 -/* 8067832C 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80678330 3C 80 80 68 */ lis r4, l_arcName@ha /* 0x80678F70@ha */ -/* 80678334 38 84 8F 70 */ addi r4, r4, l_arcName@l /* 0x80678F70@l */ -/* 80678338 80 84 00 00 */ lwz r4, 0(r4) -/* 8067833C 4B 9B 4B 81 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80678340 7C 60 1B 78 */ mr r0, r3 -/* 80678344 2C 00 00 04 */ cmpwi r0, 4 -/* 80678348 40 82 00 3C */ bne lbl_80678384 -/* 8067834C 7F E3 FB 78 */ mr r3, r31 -/* 80678350 3C 80 80 68 */ lis r4, l_arcName@ha /* 0x80678F70@ha */ -/* 80678354 38 84 8F 70 */ addi r4, r4, l_arcName@l /* 0x80678F70@l */ -/* 80678358 80 84 00 00 */ lwz r4, 0(r4) -/* 8067835C 38 A0 00 08 */ li r5, 8 -/* 80678360 38 C0 00 00 */ li r6, 0 -/* 80678364 3C E0 00 01 */ lis r7, 0x0001 /* 0x00008600@ha */ -/* 80678368 38 E7 86 00 */ addi r7, r7, 0x8600 /* 0x00008600@l */ -/* 8067836C 39 00 00 00 */ li r8, 0 -/* 80678370 4B A0 04 4D */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80678374 7C 60 1B 78 */ mr r0, r3 -/* 80678378 2C 00 00 05 */ cmpwi r0, 5 -/* 8067837C 40 82 00 08 */ bne lbl_80678384 -/* 80678380 48 00 00 08 */ b lbl_80678388 -lbl_80678384: -/* 80678384 7C 03 03 78 */ mr r3, r0 -lbl_80678388: -/* 80678388 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8067838C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80678390 7C 08 03 A6 */ mtlr r0 -/* 80678394 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678398 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGDelete__FP12daDoorPush_c.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGDelete__FP12daDoorPush_c.s deleted file mode 100644 index 97411858e29..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGDelete__FP12daDoorPush_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80678E3C: -/* 80678E3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80678E40 7C 08 02 A6 */ mflr r0 -/* 80678E44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678E48 4B 9F FA 95 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80678E4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80678E50 7C 08 03 A6 */ mtlr r0 -/* 80678E54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678E58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGDraw__FP12daDoorPush_c.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGDraw__FP12daDoorPush_c.s deleted file mode 100644 index 8b5b94806f8..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGDraw__FP12daDoorPush_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80678E7C: -/* 80678E7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80678E80 7C 08 02 A6 */ mflr r0 -/* 80678E84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678E88 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80678E8C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80678E90 7D 89 03 A6 */ mtctr r12 -/* 80678E94 4E 80 04 21 */ bctrl -/* 80678E98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80678E9C 7C 08 03 A6 */ mtlr r0 -/* 80678EA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678EA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGExecute__FP12daDoorPush_c.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGExecute__FP12daDoorPush_c.s deleted file mode 100644 index ba1d98ca276..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGExecute__FP12daDoorPush_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80678E5C: -/* 80678E5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80678E60 7C 08 02 A6 */ mflr r0 -/* 80678E64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678E68 4B 9F FA E9 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80678E6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80678E70 7C 08 03 A6 */ mtlr r0 -/* 80678E74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678E78 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_create1st__FP12daDoorPush_c.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_create1st__FP12daDoorPush_c.s deleted file mode 100644 index 0e4f7dfa5dd..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_create1st__FP12daDoorPush_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80678DAC: -/* 80678DAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80678DB0 7C 08 02 A6 */ mflr r0 -/* 80678DB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678DB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80678DBC 93 C1 00 08 */ stw r30, 8(r1) -/* 80678DC0 7C 7F 1B 78 */ mr r31, r3 -/* 80678DC4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80678DC8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80678DCC 40 82 00 4C */ bne lbl_80678E18 -/* 80678DD0 7F E0 FB 79 */ or. r0, r31, r31 -/* 80678DD4 41 82 00 38 */ beq lbl_80678E0C -/* 80678DD8 7C 1E 03 78 */ mr r30, r0 -/* 80678DDC 4B 9F F8 49 */ bl __ct__16dBgS_MoveBgActorFv -/* 80678DE0 3C 60 80 68 */ lis r3, __vt__12daDoorPush_c@ha /* 0x80679048@ha */ -/* 80678DE4 38 03 90 48 */ addi r0, r3, __vt__12daDoorPush_c@l /* 0x80679048@l */ -/* 80678DE8 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80678DEC 38 7E 06 14 */ addi r3, r30, 0x614 -/* 80678DF0 3C 80 80 68 */ lis r4, __ct__4cXyzFv@ha /* 0x80678E38@ha */ -/* 80678DF4 38 84 8E 38 */ addi r4, r4, __ct__4cXyzFv@l /* 0x80678E38@l */ -/* 80678DF8 3C A0 80 68 */ lis r5, __dt__4cXyzFv@ha /* 0x80678060@ha */ -/* 80678DFC 38 A5 80 60 */ addi r5, r5, __dt__4cXyzFv@l /* 0x80678060@l */ -/* 80678E00 38 C0 00 0C */ li r6, 0xc -/* 80678E04 38 E0 00 02 */ li r7, 2 -/* 80678E08 4B CE 8F 59 */ bl __construct_array -lbl_80678E0C: -/* 80678E0C 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80678E10 60 00 00 08 */ ori r0, r0, 8 -/* 80678E14 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80678E18: -/* 80678E18 7F E3 FB 78 */ mr r3, r31 -/* 80678E1C 4B FF F4 FD */ bl create1st__12daDoorPush_cFv -/* 80678E20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80678E24 83 C1 00 08 */ lwz r30, 8(r1) -/* 80678E28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80678E2C 7C 08 03 A6 */ mtlr r0 -/* 80678E30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678E34 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/demoProc__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/demoProc__12daDoorPush_cFv.s deleted file mode 100644 index 492bc7629ee..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/demoProc__12daDoorPush_cFv.s +++ /dev/null @@ -1,195 +0,0 @@ -lbl_80678818: -/* 80678818 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8067881C 7C 08 02 A6 */ mflr r0 -/* 80678820 90 01 00 34 */ stw r0, 0x34(r1) -/* 80678824 39 61 00 30 */ addi r11, r1, 0x30 -/* 80678828 4B CE 99 A9 */ bl _savegpr_26 -/* 8067882C 7C 7C 1B 78 */ mr r28, r3 -/* 80678830 3C 60 80 68 */ lis r3, lit_3688@ha /* 0x80678ECC@ha */ -/* 80678834 3B E3 8E CC */ addi r31, r3, lit_3688@l /* 0x80678ECC@l */ -/* 80678838 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8067883C 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80678840 83 DA 5D AC */ lwz r30, 0x5dac(r26) -/* 80678844 3B BA 4F F8 */ addi r29, r26, 0x4ff8 -/* 80678848 7F A3 EB 78 */ mr r3, r29 -/* 8067884C 3C 80 80 68 */ lis r4, d_a_door_push__stringBase0@ha /* 0x80678F18@ha */ -/* 80678850 38 84 8F 18 */ addi r4, r4, d_a_door_push__stringBase0@l /* 0x80678F18@l */ -/* 80678854 38 84 00 2A */ addi r4, r4, 0x2a -/* 80678858 38 A0 00 00 */ li r5, 0 -/* 8067885C 38 C0 00 00 */ li r6, 0 -/* 80678860 4B 9C F2 BD */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80678864 90 7C 06 44 */ stw r3, 0x644(r28) -/* 80678868 7F A3 EB 78 */ mr r3, r29 -/* 8067886C 80 9C 06 44 */ lwz r4, 0x644(r28) -/* 80678870 3C A0 80 68 */ lis r5, action_table@ha /* 0x80678FEC@ha */ -/* 80678874 38 A5 8F EC */ addi r5, r5, action_table@l /* 0x80678FEC@l */ -/* 80678878 38 C0 00 03 */ li r6, 3 -/* 8067887C 38 E0 00 00 */ li r7, 0 -/* 80678880 39 00 00 00 */ li r8, 0 -/* 80678884 4B 9C F5 8D */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 80678888 7C 7B 1B 78 */ mr r27, r3 -/* 8067888C 7F A3 EB 78 */ mr r3, r29 -/* 80678890 80 9C 06 44 */ lwz r4, 0x644(r28) -/* 80678894 4B 9C F4 B9 */ bl getIsAddvance__16dEvent_manager_cFi -/* 80678898 2C 03 00 00 */ cmpwi r3, 0 -/* 8067889C 41 82 00 6C */ beq lbl_80678908 -/* 806788A0 2C 1B 00 01 */ cmpwi r27, 1 -/* 806788A4 41 82 00 54 */ beq lbl_806788F8 -/* 806788A8 40 80 00 60 */ bge lbl_80678908 -/* 806788AC 2C 1B 00 00 */ cmpwi r27, 0 -/* 806788B0 40 80 00 0C */ bge lbl_806788BC -/* 806788B4 48 00 00 54 */ b lbl_80678908 -/* 806788B8 48 00 00 50 */ b lbl_80678908 -lbl_806788BC: -/* 806788BC 7F A3 EB 78 */ mr r3, r29 -/* 806788C0 80 9C 06 44 */ lwz r4, 0x644(r28) -/* 806788C4 3C A0 80 68 */ lis r5, d_a_door_push__stringBase0@ha /* 0x80678F18@ha */ -/* 806788C8 38 A5 8F 18 */ addi r5, r5, d_a_door_push__stringBase0@l /* 0x80678F18@l */ -/* 806788CC 38 A5 00 30 */ addi r5, r5, 0x30 -/* 806788D0 38 C0 00 03 */ li r6, 3 -/* 806788D4 4B 9C F8 19 */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 806788D8 28 03 00 00 */ cmplwi r3, 0 -/* 806788DC 40 82 00 10 */ bne lbl_806788EC -/* 806788E0 38 00 00 01 */ li r0, 1 -/* 806788E4 98 1C 06 48 */ stb r0, 0x648(r28) -/* 806788E8 48 00 00 20 */ b lbl_80678908 -lbl_806788EC: -/* 806788EC 80 03 00 00 */ lwz r0, 0(r3) -/* 806788F0 98 1C 06 48 */ stb r0, 0x648(r28) -/* 806788F4 48 00 00 14 */ b lbl_80678908 -lbl_806788F8: -/* 806788F8 7F 83 E3 78 */ mr r3, r28 -/* 806788FC 48 00 01 F1 */ bl rotateInit__12daDoorPush_cFv -/* 80678900 38 00 00 00 */ li r0, 0 -/* 80678904 98 1C 06 41 */ stb r0, 0x641(r28) -lbl_80678908: -/* 80678908 2C 1B 00 01 */ cmpwi r27, 1 -/* 8067890C 41 82 00 40 */ beq lbl_8067894C -/* 80678910 40 80 00 10 */ bge lbl_80678920 -/* 80678914 2C 1B 00 00 */ cmpwi r27, 0 -/* 80678918 40 80 00 14 */ bge lbl_8067892C -/* 8067891C 48 00 01 A8 */ b lbl_80678AC4 -lbl_80678920: -/* 80678920 2C 1B 00 03 */ cmpwi r27, 3 -/* 80678924 40 80 01 A0 */ bge lbl_80678AC4 -/* 80678928 48 00 01 74 */ b lbl_80678A9C -lbl_8067892C: -/* 8067892C 38 7C 06 48 */ addi r3, r28, 0x648 -/* 80678930 48 00 05 79 */ bl func_80678EA8 -/* 80678934 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80678938 40 82 01 98 */ bne lbl_80678AD0 -/* 8067893C 7F A3 EB 78 */ mr r3, r29 -/* 80678940 80 9C 06 44 */ lwz r4, 0x644(r28) -/* 80678944 4B 9C F8 39 */ bl cutEnd__16dEvent_manager_cFi -/* 80678948 48 00 01 88 */ b lbl_80678AD0 -lbl_8067894C: -/* 8067894C 7F 83 E3 78 */ mr r3, r28 -/* 80678950 48 00 01 C1 */ bl rotate__12daDoorPush_cFv -/* 80678954 2C 03 00 00 */ cmpwi r3, 0 -/* 80678958 41 82 00 80 */ beq lbl_806789D8 -/* 8067895C 80 7A 5D AC */ lwz r3, 0x5dac(r26) -/* 80678960 80 03 05 70 */ lwz r0, 0x570(r3) -/* 80678964 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 -/* 80678968 90 03 05 70 */ stw r0, 0x570(r3) -/* 8067896C 7F 83 E3 78 */ mr r3, r28 -/* 80678970 48 00 02 51 */ bl setGoal__12daDoorPush_cFv -/* 80678974 88 1C 04 E2 */ lbz r0, 0x4e2(r28) -/* 80678978 7C 03 07 74 */ extsb r3, r0 -/* 8067897C 4B 9B 46 F1 */ bl dComIfGp_getReverb__Fi -/* 80678980 7C 67 1B 78 */ mr r7, r3 -/* 80678984 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080320@ha */ -/* 80678988 38 03 03 20 */ addi r0, r3, 0x0320 /* 0x00080320@l */ -/* 8067898C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80678990 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80678994 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80678998 80 63 00 00 */ lwz r3, 0(r3) -/* 8067899C 38 81 00 0C */ addi r4, r1, 0xc -/* 806789A0 38 BC 05 38 */ addi r5, r28, 0x538 -/* 806789A4 38 C0 00 00 */ li r6, 0 -/* 806789A8 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 806789AC FC 40 08 90 */ fmr f2, f1 -/* 806789B0 C0 7F 00 2C */ lfs f3, 0x2c(r31) -/* 806789B4 FC 80 18 90 */ fmr f4, f3 -/* 806789B8 39 00 00 00 */ li r8, 0 -/* 806789BC 4B C3 2F C9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 806789C0 38 00 00 01 */ li r0, 1 -/* 806789C4 98 1C 06 41 */ stb r0, 0x641(r28) -/* 806789C8 7F A3 EB 78 */ mr r3, r29 -/* 806789CC 80 9C 06 44 */ lwz r4, 0x644(r28) -/* 806789D0 4B 9C F7 AD */ bl cutEnd__16dEvent_manager_cFi -/* 806789D4 48 00 00 5C */ b lbl_80678A30 -lbl_806789D8: -/* 806789D8 88 1C 06 41 */ lbz r0, 0x641(r28) -/* 806789DC 28 00 00 00 */ cmplwi r0, 0 -/* 806789E0 40 82 00 50 */ bne lbl_80678A30 -/* 806789E4 88 1C 04 E2 */ lbz r0, 0x4e2(r28) -/* 806789E8 7C 03 07 74 */ extsb r3, r0 -/* 806789EC 4B 9B 46 81 */ bl dComIfGp_getReverb__Fi -/* 806789F0 7C 67 1B 78 */ mr r7, r3 -/* 806789F4 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008031F@ha */ -/* 806789F8 38 03 03 1F */ addi r0, r3, 0x031F /* 0x0008031F@l */ -/* 806789FC 90 01 00 08 */ stw r0, 8(r1) -/* 80678A00 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80678A04 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80678A08 80 63 00 00 */ lwz r3, 0(r3) -/* 80678A0C 38 81 00 08 */ addi r4, r1, 8 -/* 80678A10 38 BC 05 38 */ addi r5, r28, 0x538 -/* 80678A14 38 C0 00 00 */ li r6, 0 -/* 80678A18 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80678A1C FC 40 08 90 */ fmr f2, f1 -/* 80678A20 C0 7F 00 2C */ lfs f3, 0x2c(r31) -/* 80678A24 FC 80 18 90 */ fmr f4, f3 -/* 80678A28 39 00 00 00 */ li r8, 0 -/* 80678A2C 4B C3 3A E1 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80678A30: -/* 80678A30 88 1C 06 39 */ lbz r0, 0x639(r28) -/* 80678A34 28 00 00 00 */ cmplwi r0, 0 -/* 80678A38 40 82 00 38 */ bne lbl_80678A70 -/* 80678A3C 7F C3 F3 78 */ mr r3, r30 -/* 80678A40 38 9C 06 54 */ addi r4, r28, 0x654 -/* 80678A44 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 80678A48 7C BC 02 14 */ add r5, r28, r0 -/* 80678A4C A8 A5 06 30 */ lha r5, 0x630(r5) -/* 80678A50 38 05 7F FF */ addi r0, r5, 0x7fff -/* 80678A54 7C 05 07 34 */ extsh r5, r0 -/* 80678A58 38 C0 00 00 */ li r6, 0 -/* 80678A5C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80678A60 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 80678A64 7D 89 03 A6 */ mtctr r12 -/* 80678A68 4E 80 04 21 */ bctrl -/* 80678A6C 48 00 00 64 */ b lbl_80678AD0 -lbl_80678A70: -/* 80678A70 7F C3 F3 78 */ mr r3, r30 -/* 80678A74 38 9C 06 54 */ addi r4, r28, 0x654 -/* 80678A78 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 80678A7C 7C BC 02 14 */ add r5, r28, r0 -/* 80678A80 A8 A5 06 30 */ lha r5, 0x630(r5) -/* 80678A84 38 C0 00 00 */ li r6, 0 -/* 80678A88 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80678A8C 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 80678A90 7D 89 03 A6 */ mtctr r12 -/* 80678A94 4E 80 04 21 */ bctrl -/* 80678A98 48 00 00 38 */ b lbl_80678AD0 -lbl_80678A9C: -/* 80678A9C 80 1C 00 B0 */ lwz r0, 0xb0(r28) -/* 80678AA0 54 03 E6 BE */ rlwinm r3, r0, 0x1c, 0x1a, 0x1f -/* 80678AA4 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80678AA8 38 80 00 00 */ li r4, 0 -/* 80678AAC 88 1C 04 E2 */ lbz r0, 0x4e2(r28) -/* 80678AB0 7C 05 07 74 */ extsb r5, r0 -/* 80678AB4 38 C0 00 00 */ li r6, 0 -/* 80678AB8 38 E0 FF FF */ li r7, -1 -/* 80678ABC 4B 9A E6 B5 */ bl dStage_changeScene__FifUlScsi -/* 80678AC0 48 00 00 10 */ b lbl_80678AD0 -lbl_80678AC4: -/* 80678AC4 7F A3 EB 78 */ mr r3, r29 -/* 80678AC8 80 9C 06 44 */ lwz r4, 0x644(r28) -/* 80678ACC 4B 9C F6 B1 */ bl cutEnd__16dEvent_manager_cFi -lbl_80678AD0: -/* 80678AD0 38 60 00 00 */ li r3, 0 -/* 80678AD4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80678AD8 4B CE 97 45 */ bl _restgpr_26 -/* 80678ADC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80678AE0 7C 08 03 A6 */ mtlr r0 -/* 80678AE4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80678AE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/event_proc_call__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/event_proc_call__12daDoorPush_cFv.s deleted file mode 100644 index bdf8f0fd9d2..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/event_proc_call__12daDoorPush_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80678664: -/* 80678664 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80678668 7C 08 02 A6 */ mflr r0 -/* 8067866C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80678670 3C 80 80 68 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80678F50@ha */ -/* 80678674 38 E4 8F 50 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80678F50@l */ -/* 80678678 3C 80 80 68 */ lis r4, struct_80679070+0x1@ha /* 0x80679071@ha */ -/* 8067867C 38 C4 90 71 */ addi r6, r4, struct_80679070+0x1@l /* 0x80679071@l */ -/* 80678680 88 06 00 00 */ lbz r0, 0(r6) -/* 80678684 7C 00 07 75 */ extsb. r0, r0 -/* 80678688 40 82 00 58 */ bne lbl_806786E0 -/* 8067868C 80 87 00 54 */ lwz r4, 0x54(r7) -/* 80678690 80 07 00 58 */ lwz r0, 0x58(r7) -/* 80678694 90 87 00 78 */ stw r4, 0x78(r7) -/* 80678698 90 07 00 7C */ stw r0, 0x7c(r7) -/* 8067869C 80 07 00 5C */ lwz r0, 0x5c(r7) -/* 806786A0 90 07 00 80 */ stw r0, 0x80(r7) -/* 806786A4 38 A7 00 78 */ addi r5, r7, 0x78 -/* 806786A8 80 87 00 60 */ lwz r4, 0x60(r7) -/* 806786AC 80 07 00 64 */ lwz r0, 0x64(r7) -/* 806786B0 90 85 00 0C */ stw r4, 0xc(r5) -/* 806786B4 90 05 00 10 */ stw r0, 0x10(r5) -/* 806786B8 80 07 00 68 */ lwz r0, 0x68(r7) -/* 806786BC 90 05 00 14 */ stw r0, 0x14(r5) -/* 806786C0 80 87 00 6C */ lwz r4, 0x6c(r7) -/* 806786C4 80 07 00 70 */ lwz r0, 0x70(r7) -/* 806786C8 90 85 00 18 */ stw r4, 0x18(r5) -/* 806786CC 90 05 00 1C */ stw r0, 0x1c(r5) -/* 806786D0 80 07 00 74 */ lwz r0, 0x74(r7) -/* 806786D4 90 05 00 20 */ stw r0, 0x20(r5) -/* 806786D8 38 00 00 01 */ li r0, 1 -/* 806786DC 98 06 00 00 */ stb r0, 0(r6) -lbl_806786E0: -/* 806786E0 88 03 06 40 */ lbz r0, 0x640(r3) -/* 806786E4 1C 00 00 0C */ mulli r0, r0, 0xc -/* 806786E8 39 87 00 78 */ addi r12, r7, 0x78 -/* 806786EC 7D 8C 02 14 */ add r12, r12, r0 -/* 806786F0 4B CE 99 95 */ bl __ptmf_scall -/* 806786F4 60 00 00 00 */ nop -/* 806786F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806786FC 7C 08 03 A6 */ mtlr r0 -/* 80678700 38 21 00 10 */ addi r1, r1, 0x10 -/* 80678704 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/func_80678EA8.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/func_80678EA8.s deleted file mode 100644 index 11166c8436c..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/func_80678EA8.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80678EA8: -/* 80678EA8 88 83 00 00 */ lbz r4, 0(r3) -/* 80678EAC 28 04 00 00 */ cmplwi r4, 0 -/* 80678EB0 41 82 00 0C */ beq lbl_80678EBC -/* 80678EB4 38 04 FF FF */ addi r0, r4, -1 -/* 80678EB8 98 03 00 00 */ stb r0, 0(r3) -lbl_80678EBC: -/* 80678EBC 88 63 00 00 */ lbz r3, 0(r3) -/* 80678EC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/initBaseMtx__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/initBaseMtx__12daDoorPush_cFv.s deleted file mode 100644 index 769ecf94733..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/initBaseMtx__12daDoorPush_cFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80677E08: -/* 80677E08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80677E0C 7C 08 02 A6 */ mflr r0 -/* 80677E10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80677E14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80677E18 93 C1 00 08 */ stw r30, 8(r1) -/* 80677E1C 7C 7E 1B 78 */ mr r30, r3 -/* 80677E20 3C 60 80 68 */ lis r3, lit_3688@ha /* 0x80678ECC@ha */ -/* 80677E24 3B E3 8E CC */ addi r31, r3, lit_3688@l /* 0x80678ECC@l */ -/* 80677E28 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80677E2C C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80677E30 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80677E34 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 80677E38 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80677E3C C0 1E 04 F4 */ lfs f0, 0x4f4(r30) -/* 80677E40 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80677E44 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80677E48 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80677E4C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80677E50 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 80677E54 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80677E58 C0 1E 04 F4 */ lfs f0, 0x4f4(r30) -/* 80677E5C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80677E60 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80677E64 D0 1E 06 14 */ stfs f0, 0x614(r30) -/* 80677E68 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80677E6C D0 1E 06 18 */ stfs f0, 0x618(r30) -/* 80677E70 D0 1E 06 1C */ stfs f0, 0x61c(r30) -/* 80677E74 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677E78 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677E7C A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80677E80 4B 99 45 5D */ bl mDoMtx_YrotS__FPA4_fs -/* 80677E84 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677E88 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677E8C 38 9E 06 14 */ addi r4, r30, 0x614 -/* 80677E90 7C 85 23 78 */ mr r5, r4 -/* 80677E94 4B CC EE D9 */ bl PSMTXMultVec -/* 80677E98 38 7E 06 14 */ addi r3, r30, 0x614 -/* 80677E9C 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80677EA0 7C 65 1B 78 */ mr r5, r3 -/* 80677EA4 4B CC F1 ED */ bl PSVECAdd -/* 80677EA8 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80677EAC D0 1E 06 20 */ stfs f0, 0x620(r30) -/* 80677EB0 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80677EB4 D0 1E 06 24 */ stfs f0, 0x624(r30) -/* 80677EB8 D0 1E 06 28 */ stfs f0, 0x628(r30) -/* 80677EBC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677EC0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677EC4 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80677EC8 4B 99 45 15 */ bl mDoMtx_YrotS__FPA4_fs -/* 80677ECC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677ED0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677ED4 38 9E 06 20 */ addi r4, r30, 0x620 -/* 80677ED8 7C 85 23 78 */ mr r5, r4 -/* 80677EDC 4B CC EE 91 */ bl PSMTXMultVec -/* 80677EE0 38 7E 06 20 */ addi r3, r30, 0x620 -/* 80677EE4 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80677EE8 7C 65 1B 78 */ mr r5, r3 -/* 80677EEC 4B CC F1 A5 */ bl PSVECAdd -/* 80677EF0 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80677EF4 4B 99 4E 71 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80677EF8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677EFC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677F00 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80677F04 4B 99 45 31 */ bl mDoMtx_YrotM__FPA4_fs -/* 80677F08 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677F0C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677F10 38 9E 05 E4 */ addi r4, r30, 0x5e4 -/* 80677F14 4B CC E5 9D */ bl PSMTXCopy -/* 80677F18 7F C3 F3 78 */ mr r3, r30 -/* 80677F1C 48 00 00 1D */ bl setBaseMtx__12daDoorPush_cFv -/* 80677F20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80677F24 83 C1 00 08 */ lwz r30, 8(r1) -/* 80677F28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80677F2C 7C 08 03 A6 */ mtlr r0 -/* 80677F30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80677F34 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/init_modeWait__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/init_modeWait__12daDoorPush_cFv.s deleted file mode 100644 index 0f607c7e4dd..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/init_modeWait__12daDoorPush_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80678488: -/* 80678488 38 A0 00 00 */ li r5, 0 -/* 8067848C 38 80 00 00 */ li r4, 0 -/* 80678490 38 00 00 02 */ li r0, 2 -/* 80678494 7C 09 03 A6 */ mtctr r0 -lbl_80678498: -/* 80678498 38 05 06 2E */ addi r0, r5, 0x62e -/* 8067849C 7C 83 01 AE */ stbx r4, r3, r0 -/* 806784A0 38 A5 00 01 */ addi r5, r5, 1 -/* 806784A4 42 00 FF F4 */ bdnz lbl_80678498 -/* 806784A8 38 00 00 00 */ li r0, 0 -/* 806784AC 98 03 06 38 */ stb r0, 0x638(r3) -/* 806784B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/modeWait__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/modeWait__12daDoorPush_cFv.s deleted file mode 100644 index 28f2a0a9b43..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/modeWait__12daDoorPush_cFv.s +++ /dev/null @@ -1,119 +0,0 @@ -lbl_806784B4: -/* 806784B4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 806784B8 7C 08 02 A6 */ mflr r0 -/* 806784BC 90 01 00 34 */ stw r0, 0x34(r1) -/* 806784C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 806784C4 4B CE 9D 15 */ bl _savegpr_28 -/* 806784C8 7C 7E 1B 78 */ mr r30, r3 -/* 806784CC 3B A0 00 01 */ li r29, 1 -/* 806784D0 88 03 06 2C */ lbz r0, 0x62c(r3) -/* 806784D4 28 00 00 00 */ cmplwi r0, 0 -/* 806784D8 41 82 00 0C */ beq lbl_806784E4 -/* 806784DC 38 00 00 00 */ li r0, 0 -/* 806784E0 48 00 00 18 */ b lbl_806784F8 -lbl_806784E4: -/* 806784E4 88 1E 06 2D */ lbz r0, 0x62d(r30) -/* 806784E8 28 00 00 00 */ cmplwi r0, 0 -/* 806784EC 38 00 00 02 */ li r0, 2 -/* 806784F0 41 82 00 08 */ beq lbl_806784F8 -/* 806784F4 38 00 00 01 */ li r0, 1 -lbl_806784F8: -/* 806784F8 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 806784FC 28 1F 00 02 */ cmplwi r31, 2 -/* 80678500 41 82 00 B8 */ beq lbl_806785B8 -/* 80678504 7C 7E FA 14 */ add r3, r30, r31 -/* 80678508 88 03 06 2E */ lbz r0, 0x62e(r3) -/* 8067850C 28 00 00 23 */ cmplwi r0, 0x23 -/* 80678510 41 80 00 0C */ blt lbl_8067851C -/* 80678514 9B FE 06 39 */ stb r31, 0x639(r30) -/* 80678518 48 00 00 98 */ b lbl_806785B0 -lbl_8067851C: -/* 8067851C 28 00 00 00 */ cmplwi r0, 0 -/* 80678520 41 82 00 90 */ beq lbl_806785B0 -/* 80678524 38 7E 06 4A */ addi r3, r30, 0x64a -/* 80678528 38 80 01 F4 */ li r4, 0x1f4 -/* 8067852C 38 A0 00 3C */ li r5, 0x3c -/* 80678530 38 C0 00 05 */ li r6, 5 -/* 80678534 4B BF 80 D5 */ bl cLib_addCalcAngleS2__FPssss -/* 80678538 A8 1E 06 4C */ lha r0, 0x64c(r30) -/* 8067853C 1C 00 03 E0 */ mulli r0, r0, 0x3e0 -/* 80678540 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80678544 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80678548 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8067854C 7C 03 04 2E */ lfsx f0, r3, r0 -/* 80678550 FC 00 02 10 */ fabs f0, f0 -/* 80678554 FC 60 00 18 */ frsp f3, f0 -/* 80678558 3C 60 80 68 */ lis r3, lit_3870@ha /* 0x80678EE4@ha */ -/* 8067855C C0 43 8E E4 */ lfs f2, lit_3870@l(r3) /* 0x80678EE4@l */ -/* 80678560 A8 1E 06 4A */ lha r0, 0x64a(r30) -/* 80678564 3C 60 80 68 */ lis r3, lit_3872@ha /* 0x80678EEC@ha */ -/* 80678568 C8 23 8E EC */ lfd f1, lit_3872@l(r3) /* 0x80678EEC@l */ -/* 8067856C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80678570 90 01 00 0C */ stw r0, 0xc(r1) -/* 80678574 3C 00 43 30 */ lis r0, 0x4330 -/* 80678578 90 01 00 08 */ stw r0, 8(r1) -/* 8067857C C8 01 00 08 */ lfd f0, 8(r1) -/* 80678580 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80678584 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 80678588 EC 02 00 2A */ fadds f0, f2, f0 -/* 8067858C FC 00 00 1E */ fctiwz f0, f0 -/* 80678590 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80678594 80 81 00 14 */ lwz r4, 0x14(r1) -/* 80678598 57 E0 08 3C */ slwi r0, r31, 1 -/* 8067859C 7C 7E 02 14 */ add r3, r30, r0 -/* 806785A0 B0 83 06 4E */ sth r4, 0x64e(r3) -/* 806785A4 A8 7E 06 4C */ lha r3, 0x64c(r30) -/* 806785A8 38 03 00 01 */ addi r0, r3, 1 -/* 806785AC B0 1E 06 4C */ sth r0, 0x64c(r30) -lbl_806785B0: -/* 806785B0 3B A0 00 00 */ li r29, 0 -/* 806785B4 48 00 00 40 */ b lbl_806785F4 -lbl_806785B8: -/* 806785B8 3B E0 00 00 */ li r31, 0 -/* 806785BC B3 FE 06 4A */ sth r31, 0x64a(r30) -/* 806785C0 B3 FE 06 4C */ sth r31, 0x64c(r30) -/* 806785C4 3B 80 00 00 */ li r28, 0 -lbl_806785C8: -/* 806785C8 38 7F 06 4E */ addi r3, r31, 0x64e -/* 806785CC 7C 7E 1A 14 */ add r3, r30, r3 -/* 806785D0 38 80 00 00 */ li r4, 0 -/* 806785D4 38 A0 00 04 */ li r5, 4 -/* 806785D8 38 C0 00 32 */ li r6, 0x32 -/* 806785DC 38 E0 00 05 */ li r7, 5 -/* 806785E0 4B BF 7F 61 */ bl cLib_addCalcAngleS__FPsssss -/* 806785E4 3B 9C 00 01 */ addi r28, r28, 1 -/* 806785E8 2C 1C 00 02 */ cmpwi r28, 2 -/* 806785EC 3B FF 00 02 */ addi r31, r31, 2 -/* 806785F0 41 80 FF D8 */ blt lbl_806785C8 -lbl_806785F4: -/* 806785F4 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 806785F8 41 82 00 24 */ beq lbl_8067861C -/* 806785FC 38 80 00 00 */ li r4, 0 -/* 80678600 38 60 00 00 */ li r3, 0 -/* 80678604 38 00 00 02 */ li r0, 2 -/* 80678608 7C 09 03 A6 */ mtctr r0 -lbl_8067860C: -/* 8067860C 38 04 06 2E */ addi r0, r4, 0x62e -/* 80678610 7C 7E 01 AE */ stbx r3, r30, r0 -/* 80678614 38 84 00 01 */ addi r4, r4, 1 -/* 80678618 42 00 FF F4 */ bdnz lbl_8067860C -lbl_8067861C: -/* 8067861C 88 1E 06 39 */ lbz r0, 0x639(r30) -/* 80678620 28 00 00 02 */ cmplwi r0, 2 -/* 80678624 40 82 00 28 */ bne lbl_8067864C -/* 80678628 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 8067862C A8 1E 06 4E */ lha r0, 0x64e(r30) -/* 80678630 7C 03 02 14 */ add r0, r3, r0 -/* 80678634 B0 1E 06 30 */ sth r0, 0x630(r30) -/* 80678638 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 8067863C A8 1E 06 50 */ lha r0, 0x650(r30) -/* 80678640 7C 63 02 14 */ add r3, r3, r0 -/* 80678644 38 03 7F FF */ addi r0, r3, 0x7fff -/* 80678648 B0 1E 06 32 */ sth r0, 0x632(r30) -lbl_8067864C: -/* 8067864C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80678650 4B CE 9B D5 */ bl _restgpr_28 -/* 80678654 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80678658 7C 08 03 A6 */ mtlr r0 -/* 8067865C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80678660 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/rotateInit__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/rotateInit__12daDoorPush_cFv.s deleted file mode 100644 index c54f215fe34..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/rotateInit__12daDoorPush_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80678AEC: -/* 80678AEC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80678AF0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80678AF4 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 80678AF8 80 04 05 70 */ lwz r0, 0x570(r4) -/* 80678AFC 60 00 08 00 */ ori r0, r0, 0x800 -/* 80678B00 90 04 05 70 */ stw r0, 0x570(r4) -/* 80678B04 38 00 00 00 */ li r0, 0 -/* 80678B08 98 03 06 49 */ stb r0, 0x649(r3) -/* 80678B0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/rotate__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/rotate__12daDoorPush_cFv.s deleted file mode 100644 index e7af4b686fe..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/rotate__12daDoorPush_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80678B10: -/* 80678B10 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80678B14 88 83 06 49 */ lbz r4, 0x649(r3) -/* 80678B18 38 04 00 01 */ addi r0, r4, 1 -/* 80678B1C 98 03 06 49 */ stb r0, 0x649(r3) -/* 80678B20 88 03 06 39 */ lbz r0, 0x639(r3) -/* 80678B24 54 00 08 3C */ slwi r0, r0, 1 -/* 80678B28 7C 83 02 14 */ add r4, r3, r0 -/* 80678B2C A8 04 06 34 */ lha r0, 0x634(r4) -/* 80678B30 B0 04 06 30 */ sth r0, 0x630(r4) -/* 80678B34 3C 80 80 68 */ lis r4, lit_4009@ha /* 0x80678EFC@ha */ -/* 80678B38 C0 44 8E FC */ lfs f2, lit_4009@l(r4) /* 0x80678EFC@l */ -/* 80678B3C 88 03 06 49 */ lbz r0, 0x649(r3) -/* 80678B40 3C 80 80 68 */ lis r4, lit_4012@ha /* 0x80678F04@ha */ -/* 80678B44 C8 24 8F 04 */ lfd f1, lit_4012@l(r4) /* 0x80678F04@l */ -/* 80678B48 90 01 00 0C */ stw r0, 0xc(r1) -/* 80678B4C 3C 00 43 30 */ lis r0, 0x4330 -/* 80678B50 90 01 00 08 */ stw r0, 8(r1) -/* 80678B54 C8 01 00 08 */ lfd f0, 8(r1) -/* 80678B58 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80678B5C 3C 80 80 68 */ lis r4, lit_4010@ha /* 0x80678F00@ha */ -/* 80678B60 C0 04 8F 00 */ lfs f0, lit_4010@l(r4) /* 0x80678F00@l */ -/* 80678B64 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80678B68 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80678B6C FC 00 00 1E */ fctiwz f0, f0 -/* 80678B70 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80678B74 80 A1 00 14 */ lwz r5, 0x14(r1) -/* 80678B78 88 83 06 39 */ lbz r4, 0x639(r3) -/* 80678B7C 28 04 00 01 */ cmplwi r4, 1 -/* 80678B80 40 82 00 0C */ bne lbl_80678B8C -/* 80678B84 7C 05 00 D0 */ neg r0, r5 -/* 80678B88 7C 05 07 34 */ extsh r5, r0 -lbl_80678B8C: -/* 80678B8C 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e -/* 80678B90 7C 83 02 14 */ add r4, r3, r0 -/* 80678B94 A8 04 06 30 */ lha r0, 0x630(r4) -/* 80678B98 7C 00 2A 14 */ add r0, r0, r5 -/* 80678B9C B0 04 06 30 */ sth r0, 0x630(r4) -/* 80678BA0 88 03 06 49 */ lbz r0, 0x649(r3) -/* 80678BA4 28 00 00 3C */ cmplwi r0, 0x3c -/* 80678BA8 40 82 00 0C */ bne lbl_80678BB4 -/* 80678BAC 38 60 00 01 */ li r3, 1 -/* 80678BB0 48 00 00 08 */ b lbl_80678BB8 -lbl_80678BB4: -/* 80678BB4 38 60 00 00 */ li r3, 0 -lbl_80678BB8: -/* 80678BB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80678BBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/setBaseMtx__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/setBaseMtx__12daDoorPush_cFv.s deleted file mode 100644 index fb1537d9adf..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/setBaseMtx__12daDoorPush_cFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80677F38: -/* 80677F38 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80677F3C 7C 08 02 A6 */ mflr r0 -/* 80677F40 90 01 00 24 */ stw r0, 0x24(r1) -/* 80677F44 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80677F48 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80677F4C 7C 7F 1B 78 */ mr r31, r3 -/* 80677F50 3C 60 80 68 */ lis r3, lit_3688@ha /* 0x80678ECC@ha */ -/* 80677F54 3B C3 8E CC */ addi r30, r3, lit_3688@l /* 0x80678ECC@l */ -/* 80677F58 38 7F 06 14 */ addi r3, r31, 0x614 -/* 80677F5C 4B 99 4E 09 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80677F60 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677F64 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677F68 A8 9F 06 30 */ lha r4, 0x630(r31) -/* 80677F6C 4B 99 44 C9 */ bl mDoMtx_YrotM__FPA4_fs -/* 80677F70 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677F74 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677F78 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80677F7C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80677F80 4B CC E5 31 */ bl PSMTXCopy -/* 80677F84 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677F88 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677F8C 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80677F90 4B CC E5 21 */ bl PSMTXCopy -/* 80677F94 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80677F98 4B 99 4D CD */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80677F9C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677FA0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677FA4 A8 9F 06 32 */ lha r4, 0x632(r31) -/* 80677FA8 4B 99 44 8D */ bl mDoMtx_YrotM__FPA4_fs -/* 80677FAC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677FB0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677FB4 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80677FB8 38 84 00 24 */ addi r4, r4, 0x24 -/* 80677FBC 4B CC E4 F5 */ bl PSMTXCopy -/* 80677FC0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80677FC4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80677FC8 38 9F 05 B4 */ addi r4, r31, 0x5b4 -/* 80677FCC 4B CC E4 E5 */ bl PSMTXCopy -/* 80677FD0 88 1F 06 39 */ lbz r0, 0x639(r31) -/* 80677FD4 28 00 00 02 */ cmplwi r0, 2 -/* 80677FD8 41 82 00 70 */ beq lbl_80678048 -/* 80677FDC C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 80677FE0 D0 01 00 08 */ stfs f0, 8(r1) -/* 80677FE4 C0 1E 00 04 */ lfs f0, 4(r30) -/* 80677FE8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80677FEC C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 80677FF0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80677FF4 28 00 00 01 */ cmplwi r0, 1 -/* 80677FF8 40 82 00 0C */ bne lbl_80678004 -/* 80677FFC FC 00 00 50 */ fneg f0, f0 -/* 80678000 D0 01 00 10 */ stfs f0, 0x10(r1) -lbl_80678004: -/* 80678004 88 1F 06 39 */ lbz r0, 0x639(r31) -/* 80678008 1C 60 00 0C */ mulli r3, r0, 0xc -/* 8067800C 38 63 06 14 */ addi r3, r3, 0x614 -/* 80678010 7C 7F 1A 14 */ add r3, r31, r3 -/* 80678014 4B 99 4D 51 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80678018 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8067801C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80678020 88 1F 06 39 */ lbz r0, 0x639(r31) -/* 80678024 54 00 08 3C */ slwi r0, r0, 1 -/* 80678028 7C 9F 02 14 */ add r4, r31, r0 -/* 8067802C A8 84 06 30 */ lha r4, 0x630(r4) -/* 80678030 4B 99 44 05 */ bl mDoMtx_YrotM__FPA4_fs -/* 80678034 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80678038 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8067803C 38 81 00 08 */ addi r4, r1, 8 -/* 80678040 38 BF 06 54 */ addi r5, r31, 0x654 -/* 80678044 4B CC ED 29 */ bl PSMTXMultVec -lbl_80678048: -/* 80678048 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8067804C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80678050 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80678054 7C 08 03 A6 */ mtlr r0 -/* 80678058 38 21 00 20 */ addi r1, r1, 0x20 -/* 8067805C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/setGoal__12daDoorPush_cFv.s b/asm/rel/d/a/door/d_a_door_push/d_a_door_push/setGoal__12daDoorPush_cFv.s deleted file mode 100644 index 77aa26e9b20..00000000000 --- a/asm/rel/d/a/door/d_a_door_push/d_a_door_push/setGoal__12daDoorPush_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80678BC0: -/* 80678BC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80678BC4 7C 08 02 A6 */ mflr r0 -/* 80678BC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80678BCC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80678BD0 7C 7F 1B 78 */ mr r31, r3 -/* 80678BD4 3C 60 80 68 */ lis r3, lit_3688@ha /* 0x80678ECC@ha */ -/* 80678BD8 38 63 8E CC */ addi r3, r3, lit_3688@l /* 0x80678ECC@l */ -/* 80678BDC 88 1F 06 39 */ lbz r0, 0x639(r31) -/* 80678BE0 28 00 00 00 */ cmplwi r0, 0 -/* 80678BE4 40 82 00 20 */ bne lbl_80678C04 -/* 80678BE8 C0 03 00 40 */ lfs f0, 0x40(r3) -/* 80678BEC D0 01 00 08 */ stfs f0, 8(r1) -/* 80678BF0 C0 03 00 04 */ lfs f0, 4(r3) -/* 80678BF4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80678BF8 C0 03 00 44 */ lfs f0, 0x44(r3) -/* 80678BFC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80678C00 48 00 00 1C */ b lbl_80678C1C -lbl_80678C04: -/* 80678C04 C0 03 00 48 */ lfs f0, 0x48(r3) -/* 80678C08 D0 01 00 08 */ stfs f0, 8(r1) -/* 80678C0C C0 03 00 04 */ lfs f0, 4(r3) -/* 80678C10 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80678C14 C0 03 00 44 */ lfs f0, 0x44(r3) -/* 80678C18 D0 01 00 10 */ stfs f0, 0x10(r1) -lbl_80678C1C: -/* 80678C1C 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80678C20 4B 99 41 45 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80678C24 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80678C28 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80678C2C A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 80678C30 4B 99 38 05 */ bl mDoMtx_YrotM__FPA4_fs -/* 80678C34 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80678C38 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80678C3C 38 81 00 08 */ addi r4, r1, 8 -/* 80678C40 7C 85 23 78 */ mr r5, r4 -/* 80678C44 4B CC E1 29 */ bl PSMTXMultVec -/* 80678C48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80678C4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80678C50 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80678C54 38 81 00 08 */ addi r4, r1, 8 -/* 80678C58 4B 9C F7 6D */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 80678C5C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80678C60 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80678C64 7C 08 03 A6 */ mtlr r0 -/* 80678C68 38 21 00 20 */ addi r1, r1, 0x20 -/* 80678C6C 4E 80 00 20 */ blr diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index 252defbfddc..9e6ce9c9909 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -46,7 +46,7 @@ inline void cLib_onBit(T& value, u8 bit) { } template -inline T cLib_checkBit(T& value, u8 bit) { +inline u8 cLib_checkBit(T& value, u8 bit) { return value & bit; } diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 3a429f737a1..7784bf909a4 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -222,6 +222,7 @@ public: FLG0_UNK_4000 = 0x4000, FLG0_UNK_2000 = 0x2000, FLG0_MAGNE_BOOTS_ON = 0x1000, + FLG0_PUSH_PULL_KEEP = 0x800, FLG0_UNK_100 = 0x100, FLG0_UNK_80 = 0x80, FLG0_UNK_40 = 0x40, @@ -764,6 +765,9 @@ public: bool i_checkMidnaRide() const { return i_checkNoResetFlg0(FLG0_MIDNA_RIDE); } void i_onPlayerNoDraw() { i_onNoResetFlg0(FLG0_PLAYER_NO_DRAW); } void i_offPlayerNoDraw() { i_offNoResetFlg0(FLG0_PLAYER_NO_DRAW); } + void i_onPushPullKeep() { i_onNoResetFlg0(FLG0_PUSH_PULL_KEEP); } + void i_offPushPullKeep() { i_offNoResetFlg0(FLG0_PUSH_PULL_KEEP); } + u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } diff --git a/include/d/bg/d_bg_w_base.h b/include/d/bg/d_bg_w_base.h index 59c3efed8b9..c8260c2b839 100644 --- a/include/d/bg/d_bg_w_base.h +++ b/include/d/bg/d_bg_w_base.h @@ -17,7 +17,9 @@ class fopAc_ac_c; class dBgW_Base : public cBgW_BgId { public: - enum PushPullLabel {}; + enum PushPullLabel { + PUSHPULL_LABEL1 = 1, + }; enum PRIORITY { PRIORITY_0, @@ -95,6 +97,7 @@ public: bool chkStickWall() { return field_0xb & 1; } bool chkStickRoof() { return field_0xb & 2; } bool ChkPushPullOk() const { return m_pushPull_Ok; } + void SetPushPullCallback(PushPull_CallBack i_callBack) { m_pushPull_Callback = i_callBack; } void SetRoomId(int id) { m_roomId = id; } bool ChkPriority(int prio) { return m_priority == prio; } void SetPriority(PRIORITY priority) { m_priority = priority; } diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index c24fda060e9..afb1db2c3ab 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -3082,6 +3082,10 @@ inline int dComIfGp_evmng_getMySubstanceNum(int index, char* name) { return dComIfGp_getPEvtManager()->getMySubstanceNum(index, name); } +inline void dComIfGp_evmng_setGoal(cXyz* i_goal) { + dComIfGp_getPEvtManager()->setGoal(i_goal); +} + inline BOOL dComIfGp_evmng_ChkPresentEnd() { return dComIfGp_getPEvtManager()->ChkPresentEnd(); } diff --git a/include/rel/d/a/door/d_a_door_push/d_a_door_push.h b/include/rel/d/a/door/d_a_door_push/d_a_door_push.h index 4eab94e2ac5..2a104dfeb87 100644 --- a/include/rel/d/a/door/d_a_door_push/d_a_door_push.h +++ b/include/rel/d/a/door/d_a_door_push/d_a_door_push.h @@ -1,6 +1,70 @@ #ifndef D_A_DOOR_PUSH_H #define D_A_DOOR_PUSH_H -#include "dolphin/types.h" +#include "d/a/d_a_player.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daDoorPush_c : public dBgS_MoveBgActor { +public: + enum act_e { + WAIT_e, + OPEN_e, + SCENE_CHG_e, + }; + + enum action_e { + ACTION_OPEN_WAIT_e = 1, + ACTION_ORDER_EVENT_e, + }; + + /* 80677E08 */ void initBaseMtx(); + /* 80677F38 */ void setBaseMtx(); + /* 8067809C */ int Create(); + /* 806781FC */ int CreateHeap(); + /* 80678318 */ int create1st(); + /* 8067839C */ int Execute(Mtx**); + /* 8067840C */ void action(); + /* 80678488 */ void init_modeWait(); + /* 806784B4 */ void modeWait(); + /* 80678664 */ void event_proc_call(); + /* 80678708 */ void actionOpenWait(); + /* 8067877C */ void actionOrderEvent(); + /* 806787F8 */ void actionEvent(); + /* 80678818 */ int demoProc(); + /* 80678AEC */ void rotateInit(); + /* 80678B10 */ int rotate(); + /* 80678BC0 */ void setGoal(); + /* 80678C70 */ int Draw(); + /* 80678D2C */ int Delete(); + + void setAction(u8 i_action) { mAction = i_action; } + u32 getSceneNo() { return fopAcM_GetParamBit(this, 4, 6); } + + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModel[2]; + /* 0x5B0 */ dBgW* mpDoorBgW; + /* 0x5B4 */ Mtx mDoorMtx; + /* 0x5E4 */ Mtx mActorMtx; + /* 0x614 */ cXyz mXyz[2]; + /* 0x62C */ u8 field_0x62c[2]; + /* 0x62E */ u8 field_0x62e[2]; + /* 0x630 */ s16 field_0x630[2]; + /* 0x634 */ s16 field_0x634[2]; + /* 0x638 */ u8 field_0x638; + /* 0x639 */ u8 mIndex; + /* 0x63A */ s16 field_0x63a[2]; + /* 0x63E */ u8 field_0x63e[2]; + /* 0x640 */ u8 mAction; + /* 0x641 */ u8 field_0x641; + /* 0x644 */ s32 field_0x644; + /* 0x648 */ u8 field_0x648; + /* 0x649 */ u8 field_0x649; + /* 0x64A */ s16 field_0x64a; + /* 0x64C */ s16 field_0x64c; + /* 0x64E */ s16 field_0x64e[2]; + /* 0x654 */ cXyz mPosition; +}; // Size: 0x660 #endif /* D_A_DOOR_PUSH_H */ diff --git a/rel/d/a/door/d_a_door_push/Makefile b/rel/d/a/door/d_a_door_push/Makefile index e440d0a2595..c487edc6039 100644 --- a/rel/d/a/door/d_a_door_push/Makefile +++ b/rel/d/a/door/d_a_door_push/Makefile @@ -8,12 +8,10 @@ M169_MAP := $(BUILD_DIR)/rel/d/a/door/d_a_door_push.map M169_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.cpp \ rel/d/a/door/d_a_door_push/d_a_door_push.cpp \ M169_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/door/d_a_door_push/d_a_door_push.o \ M169_LIBS := \ diff --git a/rel/d/a/door/d_a_door_push/d_a_door_push.cpp b/rel/d/a/door/d_a_door_push/d_a_door_push.cpp index d86c150a315..c5fd247ea48 100644 --- a/rel/d/a/door/d_a_door_push/d_a_door_push.cpp +++ b/rel/d/a/door/d_a_door_push/d_a_door_push.cpp @@ -1,351 +1,86 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_door_push -// +/** + * d_a_door_push.cpp + * Door - Push +*/ #include "rel/d/a/door/d_a_door_push/d_a_door_push.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/bg/d_bg_w.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 cXyz { - /* 80678060 */ ~cXyz(); - /* 80678E38 */ cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daDoorPush_c { - /* 80677E08 */ void initBaseMtx(); - /* 80677F38 */ void setBaseMtx(); - /* 8067809C */ void Create(); - /* 806781FC */ void CreateHeap(); - /* 80678318 */ void create1st(); - /* 8067839C */ void Execute(f32 (**)[3][4]); - /* 8067840C */ void action(); - /* 80678488 */ void init_modeWait(); - /* 806784B4 */ void modeWait(); - /* 80678664 */ void event_proc_call(); - /* 80678708 */ void actionOpenWait(); - /* 8067877C */ void actionOrderEvent(); - /* 806787F8 */ void actionEvent(); - /* 80678818 */ void demoProc(); - /* 80678AEC */ void rotateInit(); - /* 80678B10 */ void rotate(); - /* 80678BC0 */ void setGoal(); - /* 80678C70 */ void Draw(); - /* 80678D2C */ void Delete(); -}; - -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 dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 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*); -}; - -struct dBgW_Base { - struct PushPullLabel {}; -}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" static void PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); -extern "C" static void PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); -extern "C" void initBaseMtx__12daDoorPush_cFv(); -extern "C" void setBaseMtx__12daDoorPush_cFv(); -extern "C" void __dt__4cXyzFv(); -extern "C" void Create__12daDoorPush_cFv(); -extern "C" void CreateHeap__12daDoorPush_cFv(); -extern "C" void create1st__12daDoorPush_cFv(); -extern "C" void Execute__12daDoorPush_cFPPA3_A4_f(); -extern "C" void action__12daDoorPush_cFv(); -extern "C" void init_modeWait__12daDoorPush_cFv(); -extern "C" void modeWait__12daDoorPush_cFv(); -extern "C" void event_proc_call__12daDoorPush_cFv(); -extern "C" void actionOpenWait__12daDoorPush_cFv(); -extern "C" void actionOrderEvent__12daDoorPush_cFv(); -extern "C" void actionEvent__12daDoorPush_cFv(); -extern "C" void demoProc__12daDoorPush_cFv(); -extern "C" void rotateInit__12daDoorPush_cFv(); -extern "C" void rotate__12daDoorPush_cFv(); -extern "C" void setGoal__12daDoorPush_cFv(); -extern "C" void Draw__12daDoorPush_cFv(); -extern "C" void Delete__12daDoorPush_cFv(); -extern "C" static void daDoorPush_create1st__FP12daDoorPush_c(); -extern "C" void __ct__4cXyzFv(); -extern "C" static void daDoorPush_MoveBGDelete__FP12daDoorPush_c(); -extern "C" static void daDoorPush_MoveBGExecute__FP12daDoorPush_c(); -extern "C" static void daDoorPush_MoveBGDraw__FP12daDoorPush_c(); -extern "C" void func_80678EA8(void* _this, u8*); -extern "C" extern char const* const d_a_door_push__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void dStage_changeScene__FifUlScsi(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void setGoal__16dEvent_manager_cFP4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void cLib_addCalcAngleS__FPsssss(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80679070[4]; - -// -// Declarations: -// +#include "f_op/f_op_actor_mng.h" /* 80677DB8-80677DE0 000078 0028+00 1/1 0/0 0/0 .text * PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void PPCallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, s16 param_2, - dBgW_Base::PushPullLabel param_3) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s" +static void PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2, + dBgW_Base::PushPullLabel param_3) { + if (cLib_checkBit(param_3, dBgW_Base::PUSHPULL_LABEL1) != 0) { + daDoorPush_c* l_this = (daDoorPush_c*)i_this; + l_this->field_0x62e[0]++; + l_this->field_0x62e[1] = 0; + l_this->field_0x62c[0] = 1; + } } -#pragma pop /* 80677DE0-80677E08 0000A0 0028+00 1/1 0/0 0/0 .text * PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void PPCallBack2(fopAc_ac_c* param_0, fopAc_ac_c* param_1, s16 param_2, - dBgW_Base::PushPullLabel param_3) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s" +static void PPCallBack2(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2, + dBgW_Base::PushPullLabel param_3) { + if (cLib_checkBit(param_3, dBgW_Base::PUSHPULL_LABEL1) != 0) { + daDoorPush_c* l_this = (daDoorPush_c*)i_this; + l_this->field_0x62e[1]++; + l_this->field_0x62e[0] = 0; + l_this->field_0x62c[1] = 1; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80678ECC-80678ED0 000000 0004+00 4/4 0/0 0/0 .rodata @3688 */ -SECTION_RODATA static f32 const lit_3688 = -550.0f; -COMPILER_STRIP_GATE(0x80678ECC, &lit_3688); - -/* 80678ED0-80678ED4 000004 0004+00 0/3 0/0 0/0 .rodata @3689 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3689[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80678ED0, &lit_3689); -#pragma pop - -/* 80678ED4-80678ED8 000008 0004+00 0/1 0/0 0/0 .rodata @3690 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3690 = 550.0f; -COMPILER_STRIP_GATE(0x80678ED4, &lit_3690); -#pragma pop /* 80677E08-80677F38 0000C8 0130+00 1/1 0/0 0/0 .text initBaseMtx__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/initBaseMtx__12daDoorPush_cFv.s" +void daDoorPush_c::initBaseMtx() { + mpModel[0]->setBaseScale(mScale); + mpModel[1]->setBaseScale(mScale); + mXyz[0].set(-550.0f, 0.0f, 0.0f); + mDoMtx_stack_c::YrotS(shape_angle.y); + mDoMtx_stack_c::multVec(&mXyz[0], &mXyz[0]); + VECAdd(&mXyz[0], ¤t.pos, &mXyz[0]); + mXyz[1].set(550.0f, 0.0f, 0.0f); + mDoMtx_stack_c::YrotS(shape_angle.y); + mDoMtx_stack_c::multVec(&mXyz[1], &mXyz[1]); + VECAdd(&mXyz[1], ¤t.pos, &mXyz[1]); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + MTXCopy(mDoMtx_stack_c::get(), mActorMtx); + setBaseMtx(); } -#pragma pop - -/* ############################################################################################## */ -/* 80678ED8-80678EDC 00000C 0004+00 0/1 0/0 0/0 .rodata @3716 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3716 = 450.0f; -COMPILER_STRIP_GATE(0x80678ED8, &lit_3716); -#pragma pop - -/* 80678EDC-80678EE0 000010 0004+00 0/1 0/0 0/0 .rodata @3717 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3717 = 75.0f; -COMPILER_STRIP_GATE(0x80678EDC, &lit_3717); -#pragma pop /* 80677F38-80678060 0001F8 0128+00 2/2 0/0 0/0 .text setBaseMtx__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/setBaseMtx__12daDoorPush_cFv.s" +void daDoorPush_c::setBaseMtx() { + mDoMtx_stack_c::transS(mXyz[0]); + mDoMtx_stack_c::YrotM(field_0x630[0]); + MTXCopy(mDoMtx_stack_c::get(), mpModel[0]->mBaseTransformMtx); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); + mDoMtx_stack_c::transS(mXyz[1]); + mDoMtx_stack_c::YrotM(field_0x630[1]); + MTXCopy(mDoMtx_stack_c::get(), mpModel[1]->mBaseTransformMtx); + MTXCopy(mDoMtx_stack_c::get(), mDoorMtx); + + if (mIndex != 2) { + cXyz mult(450.0f, 0.0f, 75.0f); + + if (mIndex == 1) { + mult.z = -mult.z; + } + mDoMtx_stack_c::transS(mXyz[mIndex]); + mDoMtx_stack_c::YrotM(field_0x630[mIndex]); + mDoMtx_stack_c::multVec(&mult, &mPosition); + } } -#pragma pop - -/* 80678060-8067809C 000320 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cXyz::~cXyz() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/__dt__4cXyzFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80678EE0-80678EE4 000014 0004+00 1/1 0/0 0/0 .rodata @3744 */ -SECTION_RODATA static f32 const lit_3744 = 5.0f; -COMPILER_STRIP_GATE(0x80678EE0, &lit_3744); - -/* 80678F18-80678F18 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80678F18 = "V_OsuDoor"; -SECTION_DEAD static char const* const stringBase_80678F22 = "PUSH_DOOR_L"; -#pragma pop /* 80678F50-80678F5C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -363,416 +98,343 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80678F70-80678F74 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_door_push__stringBase0; +static char* l_arcName = "V_OsuDoor"; /* 80678F74-80678F8C 000024 0018+00 1/1 0/0 0/0 .data l_cull_box */ -SECTION_DATA static u8 l_cull_box[24] = { - 0xC4, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x16, 0x00, 0x00, - 0x44, 0x16, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, +static Vec l_cull_box[2] = { + {-600.0f, 0.0f, -600.0f}, + {600.0f, 1000.0f, 600.0f}, }; /* 8067809C-806781FC 00035C 0160+00 1/0 0/0 0/0 .text Create__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::Create() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/Create__12daDoorPush_cFv.s" +int daDoorPush_c::Create() { + if (mpDoorBgW != NULL && dComIfG_Bgsp().Regist(mpDoorBgW, this)) { + return 0; + } + field_0x630[0] = shape_angle.y; + field_0x630[1] = shape_angle.y + 0x7fff; + field_0x634[0] = field_0x630[0]; + field_0x634[1] = field_0x630[1]; + mIndex = 2; + initBaseMtx(); + fopAcM_SetMtx(this, mActorMtx); + fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x, + l_cull_box[1].y, l_cull_box[1].z); + mpBgW->SetPushPullCallback((dBgW_Base::PushPull_CallBack)PPCallBack); + mpDoorBgW->SetPushPullCallback((dBgW_Base::PushPull_CallBack)PPCallBack2); + mEvtInfo.setArchiveName(l_arcName); + for (int i = 0; i < 2; i++) { + field_0x63a[i] = i_dComIfGp_getEventManager().getEventIdx(this, "PUSH_DOOR_L", 0xff); + field_0x63e[i] = 0xff; + } + fopAcM_setCullSizeFar(this, 5.0f); + init_modeWait(); + MoveBGExecute(); + return 1; } -#pragma pop /* 806781FC-80678318 0004BC 011C+00 1/0 0/0 0/0 .text CreateHeap__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/CreateHeap__12daDoorPush_cFv.s" +int daDoorPush_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + for (int i = 0; i < 2; i++) { + mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel[i] == NULL) { + return 0; + } + } + mpDoorBgW = new dBgW(); + if (mpDoorBgW == NULL || + mpDoorBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 8), 1, &mDoorMtx)) + { + mpDoorBgW = NULL; + return 0; + } + return 1; } -#pragma pop /* 80678318-8067839C 0005D8 0084+00 1/1 0/0 0/0 .text create1st__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::create1st() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/create1st__12daDoorPush_cFv.s" +int daDoorPush_c::create1st() { + int phase = dComIfG_resLoad(&mPhaseReq, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + phase = MoveBGCreate(l_arcName, 8, NULL, 0x8600, NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + return phase; } -#pragma pop /* 8067839C-8067840C 00065C 0070+00 1/0 0/0 0/0 .text Execute__12daDoorPush_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/Execute__12daDoorPush_cFPPA3_A4_f.s" +int daDoorPush_c::Execute(Mtx** i_mtx) { + *i_mtx = &mBgMtx; + action(); + event_proc_call(); + setBaseMtx(); + mpDoorBgW->Move(); + for (int i = 0; i < 2; i++) { + field_0x62c[i] = 0; + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80678F8C-80678F98 -00001 000C+00 1/1 0/0 0/0 .data @3792 */ -SECTION_DATA static void* lit_3792[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__12daDoorPush_cFv, -}; - -/* 80678F98-80678FA4 000048 000C+00 1/1 0/0 0/0 .data l_func$3791 */ -SECTION_DATA static u8 l_func_3791[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; /* 8067840C-80678488 0006CC 007C+00 1/1 0/0 0/0 .text action__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::action() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/action__12daDoorPush_cFv.s" +void daDoorPush_c::action() { + typedef void (daDoorPush_c::*actionFunc)(); + static actionFunc l_func[] = {&daDoorPush_c::modeWait}; + (this->*l_func[field_0x638])(); } -#pragma pop /* 80678488-806784B4 000748 002C+00 1/1 0/0 0/0 .text init_modeWait__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::init_modeWait() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/init_modeWait__12daDoorPush_cFv.s" +void daDoorPush_c::init_modeWait() { + for (int i = 0; i < 2; i++) { + field_0x62e[i] = 0; + } + field_0x638 = 0; } -#pragma pop - -/* ############################################################################################## */ -/* 80678EE4-80678EEC 000018 0004+04 1/1 0/0 0/0 .rodata @3870 */ -SECTION_RODATA static f32 const lit_3870[1 + 1 /* padding */] = { - 10.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80678EE4, &lit_3870); - -/* 80678EEC-80678EF4 000020 0008+00 1/1 0/0 0/0 .rodata @3872 */ -SECTION_RODATA static u8 const lit_3872[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80678EEC, &lit_3872); /* 806784B4-80678664 000774 01B0+00 1/0 0/0 0/0 .text modeWait__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::modeWait() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/modeWait__12daDoorPush_cFv.s" +void daDoorPush_c::modeWait() { + enum index_e { + INDEX_0_e, + INDEX_1_e, + INDEX_MAX_e, + }; + + u8 idx; + bool check = true; + + idx = (field_0x62c[0] != 0 ? INDEX_0_e : (field_0x62c[1] != 0 ? INDEX_1_e : INDEX_MAX_e)); + + if (idx != INDEX_MAX_e) { + if (field_0x62e[idx] >= 35) { + mIndex = idx; + } else if (field_0x62e[idx] != 0) { + cLib_addCalcAngleS2(&field_0x64a, 500, 0x3c, 5); + field_0x64e[idx] = field_0x64a * fabsf(cM_ssin(field_0x64c * 0x3e0)) + 10.0f; + field_0x64c++; + } + check = false; + } else { + field_0x64a = 0; + field_0x64c = 0; + for (int i = 0; i < 2; i++) { + cLib_addCalcAngleS(&field_0x64e[i], 0, 4, 50, 5); + } + } + if (check != 0) { + for (int i = 0; i < 2; i++) { + field_0x62e[i] = 0; + } + } + if (mIndex == 2) { + field_0x630[0] = shape_angle.y + field_0x64e[0]; + field_0x630[1] = 0x7FFF + shape_angle.y + field_0x64e[1]; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80678FA4-80678FB0 -00001 000C+00 0/1 0/0 0/0 .data @3878 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3878[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOpenWait__12daDoorPush_cFv, -}; -#pragma pop - -/* 80678FB0-80678FBC -00001 000C+00 0/1 0/0 0/0 .data @3879 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3879[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrderEvent__12daDoorPush_cFv, -}; -#pragma pop - -/* 80678FBC-80678FC8 -00001 000C+00 0/1 0/0 0/0 .data @3880 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3880[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEvent__12daDoorPush_cFv, -}; -#pragma pop - -/* 80678FC8-80678FEC 000078 0024+00 0/1 0/0 0/0 .data l_func$3877 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func_3877[36] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop /* 80678664-80678708 000924 00A4+00 1/1 0/0 0/0 .text event_proc_call__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::event_proc_call() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/event_proc_call__12daDoorPush_cFv.s" +void daDoorPush_c::event_proc_call() { + typedef void (daDoorPush_c::*actionFunc)(); + static actionFunc l_func[] = { + &daDoorPush_c::actionOpenWait, + &daDoorPush_c::actionOrderEvent, + &daDoorPush_c::actionEvent, + }; + (this->*l_func[mAction])(); } -#pragma pop /* 80678708-8067877C 0009C8 0074+00 1/0 0/0 0/0 .text actionOpenWait__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::actionOpenWait() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionOpenWait__12daDoorPush_cFv.s" +void daDoorPush_c::actionOpenWait() { + if (mIndex != 2) { + setAction(1); + fopAcM_orderOtherEventId(this, field_0x63a[mIndex], field_0x63e[mIndex], 0xffff, 0, 1); + mEvtInfo.i_onCondition(2); + } } -#pragma pop /* 8067877C-806787F8 000A3C 007C+00 1/0 0/0 0/0 .text actionOrderEvent__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::actionOrderEvent() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionOrderEvent__12daDoorPush_cFv.s" +void daDoorPush_c::actionOrderEvent() { + if (mEvtInfo.i_checkCommandDemoAccrpt()) { + setAction(2); + demoProc(); + } else { + fopAcM_orderOtherEventId(this, field_0x63a[mIndex], field_0x63e[mIndex], 0xffff, 0, 1); + mEvtInfo.i_onCondition(2); + } } -#pragma pop /* 806787F8-80678818 000AB8 0020+00 1/0 0/0 0/0 .text actionEvent__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::actionEvent() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/actionEvent__12daDoorPush_cFv.s" +void daDoorPush_c::actionEvent() { + demoProc(); } -#pragma pop - -/* ############################################################################################## */ -/* 80678F18-80678F18 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80678F2E = "WAIT"; -SECTION_DEAD static char const* const stringBase_80678F33 = "OPEN"; -SECTION_DEAD static char const* const stringBase_80678F38 = "SCENE_CHG"; -SECTION_DEAD static char const* const stringBase_80678F42 = "pdoor"; -SECTION_DEAD static char const* const stringBase_80678F48 = "Timer"; -#pragma pop /* 80678FEC-80678FF8 -00001 000C+00 1/1 0/0 0/0 .data action_table$3910 */ -SECTION_DATA static void* action_table[3] = { - (void*)(((char*)&d_a_door_push__stringBase0) + 0x16), - (void*)(((char*)&d_a_door_push__stringBase0) + 0x1B), - (void*)(((char*)&d_a_door_push__stringBase0) + 0x20), -}; +static char* action_table[3] = {"WAIT", "OPEN", "SCENE_CHG"}; /* 80678818-80678AEC 000AD8 02D4+00 2/2 0/0 0/0 .text demoProc__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::demoProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/demoProc__12daDoorPush_cFv.s" +int daDoorPush_c::demoProc() { + daPy_py_c* player = daPy_getPlayerActorClass(); + + field_0x644 = i_dComIfGp_evmng_getMyStaffId("pdoor", NULL, 0); + + s32 actIdx = + dComIfGp_evmng_getMyActIdx(field_0x644, action_table, ARRAY_SIZE(action_table), 0, 0); + if (dComIfGp_evmng_getIsAddvance(field_0x644) != 0) { + switch (actIdx) { + case WAIT_e: + int* integerP = dComIfGp_evmng_getMyIntegerP(field_0x644, "Timer"); + if (integerP == NULL) { + field_0x648 = 1; + } else { + field_0x648 = *integerP; + } + break; + case OPEN_e: + rotateInit(); + field_0x641 = 0; + break; + case SCENE_CHG_e: + default: + break; + } + } + switch (actIdx) { + case WAIT_e: + if (cLib_calcTimer(&field_0x648) == 0) { + dComIfGp_evmng_cutEnd(field_0x644); + } + break; + case OPEN_e: + if (rotate() != 0) { + ((daPy_py_c*)dComIfGp_getPlayer(0))->i_offPushPullKeep(); + setGoal(); + fopAcM_seStart(this, Z2SE_OBJ_HYRULE_DR_STOP, 0); + field_0x641 = 1; + dComIfGp_evmng_cutEnd(field_0x644); + } else if (field_0x641 == 0) { + fopAcM_seStartLevel(this, Z2SE_OBJ_HYRULE_DR_MOVE, 0); + } + if (mIndex == 0) { + player->setPlayerPosAndAngle(&mPosition, field_0x630[mIndex] + 0x7fff, 0); + } else { + player->setPlayerPosAndAngle(&mPosition, field_0x630[mIndex], 0); + } + break; + case SCENE_CHG_e: + dStage_changeScene(getSceneNo(), 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); + break; + default: + dComIfGp_evmng_cutEnd(field_0x644); + break; + } + return 0; } -#pragma pop /* 80678AEC-80678B10 000DAC 0024+00 1/1 0/0 0/0 .text rotateInit__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::rotateInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/rotateInit__12daDoorPush_cFv.s" +void daDoorPush_c::rotateInit() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + player->i_onPushPullKeep(); + field_0x649 = 0; } -#pragma pop - -/* ############################################################################################## */ -/* 80678EF4-80678EF8 000028 0004+00 0/0 0/0 0/0 .rodata @3985 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3985 = 1.0f; -COMPILER_STRIP_GATE(0x80678EF4, &lit_3985); -#pragma pop - -/* 80678EF8-80678EFC 00002C 0004+00 0/0 0/0 0/0 .rodata @3986 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3986 = -1.0f; -COMPILER_STRIP_GATE(0x80678EF8, &lit_3986); -#pragma pop - -/* 80678EFC-80678F00 000030 0004+00 1/1 0/0 0/0 .rodata @4009 */ -SECTION_RODATA static f32 const lit_4009 = 5461.0f; -COMPILER_STRIP_GATE(0x80678EFC, &lit_4009); - -/* 80678F00-80678F04 000034 0004+00 1/1 0/0 0/0 .rodata @4010 */ -SECTION_RODATA static f32 const lit_4010 = 60.0f; -COMPILER_STRIP_GATE(0x80678F00, &lit_4010); - -/* 80678F04-80678F0C 000038 0008+00 1/1 0/0 0/0 .rodata @4012 */ -SECTION_RODATA static u8 const lit_4012[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80678F04, &lit_4012); /* 80678B10-80678BC0 000DD0 00B0+00 1/1 0/0 0/0 .text rotate__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::rotate() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/rotate__12daDoorPush_cFv.s" +int daDoorPush_c::rotate() { + field_0x649++; + field_0x630[mIndex] = field_0x634[mIndex]; + s16 rotation = field_0x649 / 60.0f * 5461.0f; + if (mIndex == 1) { + rotation = -rotation; + } + field_0x630[mIndex] += rotation; + if (field_0x649 == 60) { + return 1; + } + return 0; } -#pragma pop - -/* ############################################################################################## */ -/* 80678F0C-80678F10 000040 0004+00 0/1 0/0 0/0 .rodata @4031 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4031 = 300.0f; -COMPILER_STRIP_GATE(0x80678F0C, &lit_4031); -#pragma pop - -/* 80678F10-80678F14 000044 0004+00 0/1 0/0 0/0 .rodata @4032 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4032 = -400.0f; -COMPILER_STRIP_GATE(0x80678F10, &lit_4032); -#pragma pop - -/* 80678F14-80678F18 000048 0004+00 0/1 0/0 0/0 .rodata @4033 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4033 = -300.0f; -COMPILER_STRIP_GATE(0x80678F14, &lit_4033); -#pragma pop /* 80678BC0-80678C70 000E80 00B0+00 1/1 0/0 0/0 .text setGoal__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::setGoal() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/setGoal__12daDoorPush_cFv.s" +void daDoorPush_c::setGoal() { + cXyz goal; + if (mIndex == 0) { + goal.set(300.0f, 0.0f, -400.0f); + } else { + goal.set(-300.0f, 0.0f, -400.0f); + } + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(orig.angle.y); + mDoMtx_stack_c::multVec(&goal, &goal); + dComIfGp_evmng_setGoal(&goal); } -#pragma pop /* 80678C70-80678D2C 000F30 00BC+00 1/0 0/0 0/0 .text Draw__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::Draw() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/Draw__12daDoorPush_cFv.s" +int daDoorPush_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + for (int i = 0; i < 2; i++) { + g_env_light.setLightTevColorType_MAJI(mpModel[i], &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel[i]); + dComIfGd_setList(); + } + return 1; } -#pragma pop /* 80678D2C-80678DAC 000FEC 0080+00 1/0 0/0 0/0 .text Delete__12daDoorPush_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoorPush_c::Delete() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/Delete__12daDoorPush_cFv.s" +int daDoorPush_c::Delete() { + if (mpDoorBgW != NULL && mpDoorBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpDoorBgW); + } + mpBgW->SetPushPullCallback(NULL); + mpDoorBgW->SetPushPullCallback(NULL); + dComIfG_resDelete(&mPhaseReq, l_arcName); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80678FF8-80679018 -00001 0020+00 1/0 0/0 0/0 .data daDoorPush_METHODS */ -SECTION_DATA static void* daDoorPush_METHODS[8] = { - (void*)daDoorPush_create1st__FP12daDoorPush_c, - (void*)daDoorPush_MoveBGDelete__FP12daDoorPush_c, - (void*)daDoorPush_MoveBGExecute__FP12daDoorPush_c, - (void*)NULL, - (void*)daDoorPush_MoveBGDraw__FP12daDoorPush_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80679018-80679048 -00001 0030+00 0/0 0/0 1/0 .data g_profile_PushDoor */ -SECTION_DATA extern void* g_profile_PushDoor[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00BF0000, (void*)&g_fpcLf_Method, - (void*)0x00000660, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02420000, (void*)&daDoorPush_METHODS, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80679048-80679070 0000F8 0028+00 1/1 0/0 0/0 .data __vt__12daDoorPush_c */ -SECTION_DATA extern void* __vt__12daDoorPush_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daDoorPush_cFv, - (void*)Create__12daDoorPush_cFv, - (void*)Execute__12daDoorPush_cFPPA3_A4_f, - (void*)Draw__12daDoorPush_cFv, - (void*)Delete__12daDoorPush_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 80678DAC-80678E38 00106C 008C+00 1/0 0/0 0/0 .text daDoorPush_create1st__FP12daDoorPush_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDoorPush_create1st(daDoorPush_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_create1st__FP12daDoorPush_c.s" -} -#pragma pop - -/* 80678E38-80678E3C 0010F8 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { - /* empty function */ +static int daDoorPush_create1st(daDoorPush_c* i_this) { + fopAcM_SetupActor(i_this, daDoorPush_c); + return i_this->create1st(); } /* 80678E3C-80678E5C 0010FC 0020+00 1/0 0/0 0/0 .text daDoorPush_MoveBGDelete__FP12daDoorPush_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDoorPush_MoveBGDelete(daDoorPush_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGDelete__FP12daDoorPush_c.s" +static int daDoorPush_MoveBGDelete(daDoorPush_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80678E5C-80678E7C 00111C 0020+00 1/0 0/0 0/0 .text daDoorPush_MoveBGExecute__FP12daDoorPush_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDoorPush_MoveBGExecute(daDoorPush_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGExecute__FP12daDoorPush_c.s" +static int daDoorPush_MoveBGExecute(daDoorPush_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80678E7C-80678EA8 00113C 002C+00 1/0 0/0 0/0 .text daDoorPush_MoveBGDraw__FP12daDoorPush_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDoorPush_MoveBGDraw(daDoorPush_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/daDoorPush_MoveBGDraw__FP12daDoorPush_c.s" +static int daDoorPush_MoveBGDraw(daDoorPush_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop -/* 80678EA8-80678EC4 001168 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80678EA8(void* _this, u8* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/func_80678EA8.s" -} -#pragma pop +/* 80678FF8-80679018 -00001 0020+00 1/0 0/0 0/0 .data daDoorPush_METHODS */ +static actor_method_class daDoorPush_METHODS = { + (process_method_func)daDoorPush_create1st, (process_method_func)daDoorPush_MoveBGDelete, + (process_method_func)daDoorPush_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daDoorPush_MoveBGDraw, +}; -/* 80678F18-80678F18 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80679018-80679048 -00001 0030+00 0/0 0/0 1/0 .data g_profile_PushDoor */ +extern actor_process_profile_definition g_profile_PushDoor = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_PushDoor, + &g_fpcLf_Method.mBase, + sizeof(daDoorPush_c), + 0, + 0, + &g_fopAc_Method.base, + 578, + &daDoorPush_METHODS, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.cpp b/rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.cpp deleted file mode 100644 index 7a676c12a4d..00000000000 --- a/rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: unknown_translation_unit_bss -// - -#include "rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 struct_80679070[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80679070-80679074 -00001 0004+00 0/0 2/2 0/0 .bss None */ -/* 80679070 0001+00 data_80679070 None */ -/* 80679071 0003+00 data_80679071 None */ -extern u8 struct_80679070[4]; -u8 struct_80679070[4];