From 9995df3bc7ccd049ec034422fae8d2f9876dc57f Mon Sep 17 00:00:00 2001 From: hatal175 Date: Wed, 1 May 2024 03:08:21 +0300 Subject: [PATCH] d_a_door_shutter OK (#2142) * a_d_door_shutter OK * d_a_door_spiral OK --- .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../CreateHeap__10daDoor20_cFv.s | 321 -- .../CreateInit__10daDoor20_cFv.s | 176 - .../d_a_door_shutter/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_door_shutter/__dt__12dBgS_AcchCirFv.s | 30 - .../d_a_door_shutter/__dt__12dBgS_ObjAcchFv.s | 30 - .../_delete__10daDoor20_cFv.s | 42 - .../actionDemo__10daDoor20_cFv.s | 35 - .../actionInit__10daDoor20_cFv.s | 22 - .../actionStopClose__10daDoor20_cFv.s | 23 - .../actionWait__10daDoor20_cFv.s | 95 - .../adjoinPlayer__10daDoor20_cFv.s | 45 - .../adjustmentAngle__10daDoor20_cFv.s | 62 - .../adjustmentProc__10daDoor20_cFv.s | 124 - .../calcMtx_2__10daDoor20_cFv.s | 64 - .../calcMtx__10daDoor20_cFv.s | 58 - .../calcMtx__12dDoor_stop_cFP10daDoor20_c.s | 51 - .../checkArea__10daDoor20_cFfff.s | 107 - .../checkExecute__10daDoor20_cFv.s | 50 - .../checkOpenMsgDoor__10daDoor20_cFPi.s | 44 - .../chkMakeKey__10daDoor20_cFv.s | 26 - .../chkMakeStop__10daDoor20_cFv.s | 33 - .../chkStopB__10daDoor20_cFv.s | 52 - .../chkStopClose__10daDoor20_cFv.s | 65 - .../chkStopF__10daDoor20_cFv.s | 59 - .../chkStopOpen__10daDoor20_cFv.s | 107 - .../closeEnd2__10daDoor20_cFv.s | 17 - .../closeEndCom__10daDoor20_cFv.s | 79 - .../closeEnd_1__10daDoor20_cFv.s | 32 - .../closeEnd__10daDoor20_cFi.s | 52 - .../closeInit_0__10daDoor20_cFv.s | 189 - .../closeInit_1__10daDoor20_cFv.s | 52 - .../closeInit__10daDoor20_cFi.s | 40 - .../closeInit__12dDoor_stop_cFP10daDoor20_c.s | 71 - .../closeProc__10daDoor20_cFi.s | 10 - .../closeProc__12dDoor_stop_cFP10daDoor20_c.s | 39 - .../createKey__10daDoor20_cFv.s | 178 - .../d_a_door_shutter/create__10daDoor20_cFv.s | 50 - .../create__12dDoor_stop_cFP10daDoor20_c.s | 21 - .../daDoor20_Create__FP10fopAc_ac_c.s | 64 - .../daDoor20_Delete__FP10daDoor20_c.s | 10 - .../daDoor20_Draw__FP10daDoor20_c.s | 9 - .../daDoor20_Execute__FP10daDoor20_c.s | 10 - .../deleteKey__10daDoor20_cFv.s | 24 - .../demoProc__10daDoor20_cFv.s | 990 ---- .../drawCheck__10daDoor20_cFi.s | 84 - .../d_a_door_shutter/draw__10daDoor20_cFv.s | 174 - .../draw__12dDoor_stop_cFP10daDoor20_c.s | 32 - .../execute__10daDoor20_cFv.s | 106 - .../frontCheckOld__10daDoor20_cFv.s | 39 - .../frontCheck__10daDoor20_cFv.s | 37 - .../d_a_door_shutter/func_804667EC.s | 9 - .../d_a_door_shutter/func_80466808.s | 3 - .../d_a_door_shutter/func_80466810.s | 3 - .../getAlwaysArcName__10daDoor20_cFv.s | 5 - .../getArcName__10daDoor20_cFv.s | 47 - .../getBmdName__10daDoor20_cFv.s | 50 - .../d_a_door_shutter/getBtk__10daDoor20_cFv.s | 5 - .../getDemoAction__10daDoor20_cFv.s | 19 - .../getDzbName__10daDoor20_cFv.s | 28 - .../getModelData__10daDoor20_cFv.s | 10 - .../getRestartPos__10daDoor20_cFP4cXyz.s | 68 - .../getSize2X__10daDoor20_cFv.s | 4 - .../getStopBmdName__10daDoor20_cFv.s | 16 - .../getStopModelData__10daDoor20_cFv.s | 10 - .../initOpenDemo__10daDoor20_cFi.s | 39 - .../initProc__10daDoor20_cFv.s | 21 - .../makeEventId__10daDoor20_cFv.s | 301 -- .../openEnd_1__10daDoor20_cFv.s | 32 - .../openEnd__10daDoor20_cFi.s | 32 - .../openInit2__10daDoor20_cFv.s | 64 - .../openInitCom__10daDoor20_cFi.s | 56 - .../openInit_0__10daDoor20_cFv.s | 187 - .../openInit_1__10daDoor20_cFv.s | 110 - .../openInit__10daDoor20_cFi.s | 43 - .../openInit__12dDoor_stop_cFP10daDoor20_c.s | 70 - .../openProc__10daDoor20_cFi.s | 228 - .../openProc__12dDoor_stop_cFP10daDoor20_c.s | 40 - .../orderStopEvent__10daDoor20_cFv.s | 104 - .../setAngle__10daDoor20_cFv.s | 8 - .../setDoorAngleSpec__10daDoor20_cFv.s | 106 - .../setEventPrm__10daDoor20_cFv.s | 299 -- .../setGoal__10daDoor20_cFv.s | 92 - .../d_a_door_shutter/setKey__10daDoor20_cFv.s | 33 - .../setStopDemo__10daDoor20_cFv.s | 65 - .../setStop__10daDoor20_cFv.s | 41 - .../startDemoProc__10daDoor20_cFv.s | 43 - include/d/com/d_com_inf_game.h | 4 + include/d/d_door_param2.h | 10 +- include/d/event/d_event.h | 1 + include/d/kankyo/d_kankyo.h | 2 +- include/rel/d/a/d_a_midna/d_a_midna.h | 4 + .../door/d_a_door_shutter/d_a_door_shutter.h | 155 + .../d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h | 30 + .../d_a_door_dbdoor00/d_a_door_dbdoor00.cpp | 2 +- .../door/d_a_door_knob00/d_a_door_knob00.cpp | 2 +- .../d_a_door_mbossL1/d_a_door_mbossL1.cpp | 2 +- rel/d/a/door/d_a_door_push/d_a_door_push.cpp | 3 +- .../d_a_door_shutter/d_a_door_shutter.cpp | 4114 ++++++++--------- .../door/d_a_door_spiral/d_a_door_spiral.cpp | 43 +- rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp | 81 +- rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp | 2 +- src/d/d_door_param2.cpp | 10 +- src/d/kankyo/d_kankyo.cpp | 2 +- src/d/particle/d_particle.cpp | 2 +- 105 files changed, 2237 insertions(+), 8682 deletions(-) delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CreateHeap__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CreateInit__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12dBgS_AcchCirFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/_delete__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionDemo__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionInit__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionStopClose__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionWait__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjoinPlayer__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjustmentAngle__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjustmentProc__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx_2__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx__12dDoor_stop_cFP10daDoor20_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkArea__10daDoor20_cFfff.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkExecute__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkOpenMsgDoor__10daDoor20_cFPi.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkMakeKey__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkMakeStop__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopB__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopClose__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopF__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopOpen__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd2__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEndCom__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd_1__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd__10daDoor20_cFi.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_0__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_1__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit__10daDoor20_cFi.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit__12dDoor_stop_cFP10daDoor20_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeProc__10daDoor20_cFi.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeProc__12dDoor_stop_cFP10daDoor20_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/createKey__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/create__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/create__12dDoor_stop_cFP10daDoor20_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Delete__FP10daDoor20_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Draw__FP10daDoor20_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Execute__FP10daDoor20_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/deleteKey__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/demoProc__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/drawCheck__10daDoor20_cFi.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__12dDoor_stop_cFP10daDoor20_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/execute__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheckOld__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheck__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_804667EC.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_80466808.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_80466810.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getAlwaysArcName__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getArcName__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getBmdName__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getBtk__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getDemoAction__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getDzbName__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getModelData__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getRestartPos__10daDoor20_cFP4cXyz.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getSize2X__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getStopBmdName__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getStopModelData__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/initOpenDemo__10daDoor20_cFi.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/initProc__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/makeEventId__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openEnd_1__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openEnd__10daDoor20_cFi.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit2__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInitCom__10daDoor20_cFi.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit_0__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit_1__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit__10daDoor20_cFi.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit__12dDoor_stop_cFP10daDoor20_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openProc__10daDoor20_cFi.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openProc__12dDoor_stop_cFP10daDoor20_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/orderStopEvent__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setAngle__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setDoorAngleSpec__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setEventPrm__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setGoal__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setKey__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setStopDemo__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setStop__10daDoor20_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/startDemoProc__10daDoor20_cFv.s diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index afb95074d0..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80460D8C: -/* 80460D8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80460D90 7C 08 02 A6 */ mflr r0 -/* 80460D94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80460D98 48 00 00 15 */ bl CreateHeap__10daDoor20_cFv -/* 80460D9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80460DA0 7C 08 03 A6 */ mtlr r0 -/* 80460DA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80460DA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CreateHeap__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CreateHeap__10daDoor20_cFv.s deleted file mode 100644 index 6ba5d3c563..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CreateHeap__10daDoor20_cFv.s +++ /dev/null @@ -1,321 +0,0 @@ -lbl_80460DAC: -/* 80460DAC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80460DB0 7C 08 02 A6 */ mflr r0 -/* 80460DB4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80460DB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80460DBC 4B F0 14 1D */ bl _savegpr_28 -/* 80460DC0 7C 7F 1B 78 */ mr r31, r3 -/* 80460DC4 4B BD 93 C5 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80460DC8 7C 7E 1B 78 */ mr r30, r3 -/* 80460DCC 7F E3 FB 78 */ mr r3, r31 -/* 80460DD0 4B FF FF 8D */ bl getModelData__10daDoor20_cFv -/* 80460DD4 7C 7C 1B 78 */ mr r28, r3 -/* 80460DD8 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000084@ha */ -/* 80460DDC 38 A3 00 84 */ addi r5, r3, 0x0084 /* 0x11000084@l */ -/* 80460DE0 2C 1E 00 02 */ cmpwi r30, 2 -/* 80460DE4 40 82 00 08 */ bne lbl_80460DEC -/* 80460DE8 60 A5 02 00 */ ori r5, r5, 0x200 -lbl_80460DEC: -/* 80460DEC 7F 83 E3 78 */ mr r3, r28 -/* 80460DF0 3C 80 00 08 */ lis r4, 8 -/* 80460DF4 4B BB 3E 61 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80460DF8 90 7F 05 7C */ stw r3, 0x57c(r31) -/* 80460DFC 80 1F 05 7C */ lwz r0, 0x57c(r31) -/* 80460E00 28 00 00 00 */ cmplwi r0, 0 -/* 80460E04 40 82 00 0C */ bne lbl_80460E10 -/* 80460E08 38 60 00 00 */ li r3, 0 -/* 80460E0C 48 00 04 30 */ b lbl_8046123C -lbl_80460E10: -/* 80460E10 2C 1E 00 09 */ cmpwi r30, 9 -/* 80460E14 40 82 01 44 */ bne lbl_80460F58 -/* 80460E18 7F E3 FB 78 */ mr r3, r31 -/* 80460E1C 4B FF FD 79 */ bl getAlwaysArcName__10daDoor20_cFv -/* 80460E20 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460E24 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460E28 38 84 00 A7 */ addi r4, r4, 0xa7 -/* 80460E2C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80460E30 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80460E34 3F A5 00 02 */ addis r29, r5, 2 -/* 80460E38 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80460E3C 7F A5 EB 78 */ mr r5, r29 -/* 80460E40 38 C0 00 80 */ li r6, 0x80 -/* 80460E44 4B BD B5 39 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80460E48 7C 64 1B 78 */ mr r4, r3 -/* 80460E4C 38 7F 05 84 */ addi r3, r31, 0x584 -/* 80460E50 38 A0 00 01 */ li r5, 1 -/* 80460E54 38 C0 00 00 */ li r6, 0 -/* 80460E58 3C E0 80 46 */ lis r7, lit_4124@ha /* 0x80466824@ha */ -/* 80460E5C C0 27 68 24 */ lfs f1, lit_4124@l(r7) /* 0x80466824@l */ -/* 80460E60 38 E0 00 00 */ li r7, 0 -/* 80460E64 39 00 FF FF */ li r8, -1 -/* 80460E68 39 20 00 00 */ li r9, 0 -/* 80460E6C 4B BA C9 71 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80460E70 2C 03 00 00 */ cmpwi r3, 0 -/* 80460E74 40 82 00 0C */ bne lbl_80460E80 -/* 80460E78 38 60 00 00 */ li r3, 0 -/* 80460E7C 48 00 03 C0 */ b lbl_8046123C -lbl_80460E80: -/* 80460E80 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80460E84 80 83 00 04 */ lwz r4, 4(r3) -/* 80460E88 38 7F 05 84 */ addi r3, r31, 0x584 -/* 80460E8C C0 3F 05 94 */ lfs f1, 0x594(r31) -/* 80460E90 4B BA CB 3D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80460E94 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80460E98 81 83 00 00 */ lwz r12, 0(r3) -/* 80460E9C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80460EA0 7D 89 03 A6 */ mtctr r12 -/* 80460EA4 4E 80 04 21 */ bctrl -/* 80460EA8 7F 83 E3 78 */ mr r3, r28 -/* 80460EAC 3C 80 00 08 */ lis r4, 8 -/* 80460EB0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80460EB4 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80460EB8 4B BB 3D 9D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80460EBC 90 7F 05 80 */ stw r3, 0x580(r31) -/* 80460EC0 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 80460EC4 28 00 00 00 */ cmplwi r0, 0 -/* 80460EC8 40 82 00 0C */ bne lbl_80460ED4 -/* 80460ECC 38 60 00 00 */ li r3, 0 -/* 80460ED0 48 00 03 6C */ b lbl_8046123C -lbl_80460ED4: -/* 80460ED4 7F E3 FB 78 */ mr r3, r31 -/* 80460ED8 4B FF FC BD */ bl getAlwaysArcName__10daDoor20_cFv -/* 80460EDC 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460EE0 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460EE4 38 84 00 A7 */ addi r4, r4, 0xa7 -/* 80460EE8 7F A5 EB 78 */ mr r5, r29 -/* 80460EEC 38 C0 00 80 */ li r6, 0x80 -/* 80460EF0 4B BD B4 8D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80460EF4 7C 64 1B 78 */ mr r4, r3 -/* 80460EF8 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80460EFC 38 A0 00 01 */ li r5, 1 -/* 80460F00 38 C0 00 00 */ li r6, 0 -/* 80460F04 3C E0 80 46 */ lis r7, lit_4124@ha /* 0x80466824@ha */ -/* 80460F08 C0 27 68 24 */ lfs f1, lit_4124@l(r7) /* 0x80466824@l */ -/* 80460F0C 38 E0 00 00 */ li r7, 0 -/* 80460F10 39 00 FF FF */ li r8, -1 -/* 80460F14 39 20 00 00 */ li r9, 0 -/* 80460F18 4B BA C8 C5 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80460F1C 2C 03 00 00 */ cmpwi r3, 0 -/* 80460F20 40 82 00 0C */ bne lbl_80460F2C -/* 80460F24 38 60 00 00 */ li r3, 0 -/* 80460F28 48 00 03 14 */ b lbl_8046123C -lbl_80460F2C: -/* 80460F2C 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80460F30 80 83 00 04 */ lwz r4, 4(r3) -/* 80460F34 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80460F38 C0 3F 05 B0 */ lfs f1, 0x5b0(r31) -/* 80460F3C 4B BA CA 91 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80460F40 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80460F44 81 83 00 00 */ lwz r12, 0(r3) -/* 80460F48 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80460F4C 7D 89 03 A6 */ mtctr r12 -/* 80460F50 4E 80 04 21 */ bctrl -/* 80460F54 48 00 01 D4 */ b lbl_80461128 -lbl_80460F58: -/* 80460F58 28 1E 00 0C */ cmplwi r30, 0xc -/* 80460F5C 41 81 00 1C */ bgt lbl_80460F78 -/* 80460F60 3C 60 80 46 */ lis r3, lit_4126@ha /* 0x80466ED0@ha */ -/* 80460F64 38 63 6E D0 */ addi r3, r3, lit_4126@l /* 0x80466ED0@l */ -/* 80460F68 57 C0 10 3A */ slwi r0, r30, 2 -/* 80460F6C 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80460F70 7C 09 03 A6 */ mtctr r0 -/* 80460F74 4E 80 04 20 */ bctr -lbl_80460F78: -/* 80460F78 7F E3 FB 78 */ mr r3, r31 -/* 80460F7C 4B FF FC 29 */ bl getArcName__10daDoor20_cFv -/* 80460F80 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460F84 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460F88 38 84 00 B2 */ addi r4, r4, 0xb2 -/* 80460F8C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80460F90 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80460F94 3C A5 00 02 */ addis r5, r5, 2 -/* 80460F98 38 C0 00 80 */ li r6, 0x80 -/* 80460F9C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80460FA0 4B BD B3 DD */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80460FA4 7C 64 1B 78 */ mr r4, r3 -/* 80460FA8 48 00 01 24 */ b lbl_804610CC -lbl_80460FAC: -/* 80460FAC 7F E3 FB 78 */ mr r3, r31 -/* 80460FB0 4B FF FB F5 */ bl getArcName__10daDoor20_cFv -/* 80460FB4 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460FB8 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460FBC 38 84 00 C1 */ addi r4, r4, 0xc1 -/* 80460FC0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80460FC4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80460FC8 3C A5 00 02 */ addis r5, r5, 2 -/* 80460FCC 38 C0 00 80 */ li r6, 0x80 -/* 80460FD0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80460FD4 4B BD B3 A9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80460FD8 7C 64 1B 78 */ mr r4, r3 -/* 80460FDC 48 00 00 F0 */ b lbl_804610CC -lbl_80460FE0: -/* 80460FE0 7F E3 FB 78 */ mr r3, r31 -/* 80460FE4 4B FF FD 0D */ bl getBtk__10daDoor20_cFv -/* 80460FE8 4B BC E4 4D */ bl dComIfG_getStageRes__FPCc -/* 80460FEC 7C 7C 1B 78 */ mr r28, r3 -/* 80460FF0 38 60 00 18 */ li r3, 0x18 -/* 80460FF4 4B E6 DC 59 */ bl __nw__FUl -/* 80460FF8 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80460FFC 41 82 00 20 */ beq lbl_8046101C -/* 80461000 3C 80 80 46 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80467320@ha */ -/* 80461004 38 04 73 20 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80467320@l */ -/* 80461008 90 1D 00 00 */ stw r0, 0(r29) -/* 8046100C 38 80 00 00 */ li r4, 0 -/* 80461010 4B EC 73 ED */ bl init__12J3DFrameCtrlFs -/* 80461014 38 00 00 00 */ li r0, 0 -/* 80461018 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_8046101C: -/* 8046101C 93 BF 05 C0 */ stw r29, 0x5c0(r31) -/* 80461020 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 80461024 28 03 00 00 */ cmplwi r3, 0 -/* 80461028 41 82 00 38 */ beq lbl_80461060 -/* 8046102C 80 9F 05 7C */ lwz r4, 0x57c(r31) -/* 80461030 80 84 00 04 */ lwz r4, 4(r4) -/* 80461034 38 84 00 58 */ addi r4, r4, 0x58 -/* 80461038 7F 85 E3 78 */ mr r5, r28 -/* 8046103C 38 C0 00 01 */ li r6, 1 -/* 80461040 38 E0 00 00 */ li r7, 0 -/* 80461044 3D 00 80 46 */ lis r8, lit_4124@ha /* 0x80466824@ha */ -/* 80461048 C0 28 68 24 */ lfs f1, lit_4124@l(r8) /* 0x80466824@l */ -/* 8046104C 39 00 00 00 */ li r8, 0 -/* 80461050 39 20 FF FF */ li r9, -1 -/* 80461054 4B BA C5 E9 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80461058 2C 03 00 00 */ cmpwi r3, 0 -/* 8046105C 40 82 00 0C */ bne lbl_80461068 -lbl_80461060: -/* 80461060 38 60 00 00 */ li r3, 0 -/* 80461064 48 00 01 D8 */ b lbl_8046123C -lbl_80461068: -/* 80461068 7F E3 FB 78 */ mr r3, r31 -/* 8046106C 4B FF FB 39 */ bl getArcName__10daDoor20_cFv -/* 80461070 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80461074 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80461078 38 84 00 B2 */ addi r4, r4, 0xb2 -/* 8046107C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461080 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461084 3C A5 00 02 */ addis r5, r5, 2 -/* 80461088 38 C0 00 80 */ li r6, 0x80 -/* 8046108C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80461090 4B BD B2 ED */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80461094 7C 64 1B 78 */ mr r4, r3 -/* 80461098 48 00 00 34 */ b lbl_804610CC -lbl_8046109C: -/* 8046109C 7F E3 FB 78 */ mr r3, r31 -/* 804610A0 4B FF FB 05 */ bl getArcName__10daDoor20_cFv -/* 804610A4 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 804610A8 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 804610AC 38 84 00 D0 */ addi r4, r4, 0xd0 -/* 804610B0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804610B4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804610B8 3C A5 00 02 */ addis r5, r5, 2 -/* 804610BC 38 C0 00 80 */ li r6, 0x80 -/* 804610C0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 804610C4 4B BD B2 B9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 804610C8 7C 64 1B 78 */ mr r4, r3 -lbl_804610CC: -/* 804610CC 38 7F 05 84 */ addi r3, r31, 0x584 -/* 804610D0 38 A0 00 01 */ li r5, 1 -/* 804610D4 38 C0 00 00 */ li r6, 0 -/* 804610D8 3C E0 80 46 */ lis r7, lit_4124@ha /* 0x80466824@ha */ -/* 804610DC C0 27 68 24 */ lfs f1, lit_4124@l(r7) /* 0x80466824@l */ -/* 804610E0 38 E0 00 00 */ li r7, 0 -/* 804610E4 39 00 FF FF */ li r8, -1 -/* 804610E8 39 20 00 00 */ li r9, 0 -/* 804610EC 4B BA C6 F1 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 804610F0 2C 03 00 00 */ cmpwi r3, 0 -/* 804610F4 40 82 00 0C */ bne lbl_80461100 -/* 804610F8 38 60 00 00 */ li r3, 0 -/* 804610FC 48 00 01 40 */ b lbl_8046123C -lbl_80461100: -/* 80461100 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80461104 80 83 00 04 */ lwz r4, 4(r3) -/* 80461108 38 7F 05 84 */ addi r3, r31, 0x584 -/* 8046110C C0 3F 05 94 */ lfs f1, 0x594(r31) -/* 80461110 4B BA C8 BD */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80461114 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80461118 81 83 00 00 */ lwz r12, 0(r3) -/* 8046111C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80461120 7D 89 03 A6 */ mtctr r12 -/* 80461124 4E 80 04 21 */ bctrl -lbl_80461128: -/* 80461128 7F E3 FB 78 */ mr r3, r31 -/* 8046112C 48 00 49 95 */ bl chkMakeStop__10daDoor20_cFv -/* 80461130 2C 03 00 00 */ cmpwi r3, 0 -/* 80461134 41 82 00 20 */ beq lbl_80461154 -/* 80461138 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 8046113C 7F E4 FB 78 */ mr r4, r31 -/* 80461140 48 00 53 A9 */ bl create__12dDoor_stop_cFP10daDoor20_c -/* 80461144 2C 03 00 00 */ cmpwi r3, 0 -/* 80461148 40 82 00 0C */ bne lbl_80461154 -/* 8046114C 38 60 00 00 */ li r3, 0 -/* 80461150 48 00 00 EC */ b lbl_8046123C -lbl_80461154: -/* 80461154 7F E3 FB 78 */ mr r3, r31 -/* 80461158 48 00 1A 01 */ bl calcMtx__10daDoor20_cFv -/* 8046115C 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 80461160 7F E4 FB 78 */ mr r4, r31 -/* 80461164 48 00 4F 91 */ bl calcMtx__12dDoor_stop_cFP10daDoor20_c -/* 80461168 38 7F 04 A8 */ addi r3, r31, 0x4a8 -/* 8046116C 4B BA BB F9 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80461170 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80461174 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80461178 A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 8046117C 4B BA B2 B9 */ bl mDoMtx_YrotM__FPA4_fs -/* 80461180 2C 1E 00 09 */ cmpwi r30, 9 -/* 80461184 40 82 00 1C */ bne lbl_804611A0 -/* 80461188 3C 60 80 46 */ lis r3, lit_4124@ha /* 0x80466824@ha */ -/* 8046118C C0 23 68 24 */ lfs f1, lit_4124@l(r3) /* 0x80466824@l */ -/* 80461190 3C 60 80 46 */ lis r3, lit_4125@ha /* 0x80466828@ha */ -/* 80461194 C0 43 68 28 */ lfs f2, lit_4125@l(r3) /* 0x80466828@l */ -/* 80461198 FC 60 08 90 */ fmr f3, f1 -/* 8046119C 4B BA BC 9D */ bl scaleM__14mDoMtx_stack_cFfff -lbl_804611A0: -/* 804611A0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804611A4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804611A8 38 9F 05 F4 */ addi r4, r31, 0x5f4 -/* 804611AC 4B EE 53 05 */ bl PSMTXCopy -/* 804611B0 38 60 00 C0 */ li r3, 0xc0 -/* 804611B4 4B E6 DA 99 */ bl __nw__FUl -/* 804611B8 7C 60 1B 79 */ or. r0, r3, r3 -/* 804611BC 41 82 00 0C */ beq lbl_804611C8 -/* 804611C0 4B C1 A7 B1 */ bl __ct__4dBgWFv -/* 804611C4 7C 60 1B 78 */ mr r0, r3 -lbl_804611C8: -/* 804611C8 90 1F 05 C4 */ stw r0, 0x5c4(r31) -/* 804611CC 80 1F 05 C4 */ lwz r0, 0x5c4(r31) -/* 804611D0 28 00 00 00 */ cmplwi r0, 0 -/* 804611D4 41 82 00 5C */ beq lbl_80461230 -/* 804611D8 7F E3 FB 78 */ mr r3, r31 -/* 804611DC 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 804611E0 81 8C 00 08 */ lwz r12, 8(r12) -/* 804611E4 7D 89 03 A6 */ mtctr r12 -/* 804611E8 4E 80 04 21 */ bctrl -/* 804611EC 7C 7D 1B 78 */ mr r29, r3 -/* 804611F0 7F E3 FB 78 */ mr r3, r31 -/* 804611F4 4B FF F9 A1 */ bl getAlwaysArcName__10daDoor20_cFv -/* 804611F8 7F A4 EB 78 */ mr r4, r29 -/* 804611FC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461200 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461204 3C A5 00 02 */ addis r5, r5, 2 -/* 80461208 38 C0 00 80 */ li r6, 0x80 -/* 8046120C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80461210 4B BD B1 6D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80461214 7C 64 1B 78 */ mr r4, r3 -/* 80461218 80 7F 05 C4 */ lwz r3, 0x5c4(r31) -/* 8046121C 38 A0 00 01 */ li r5, 1 -/* 80461220 38 DF 05 F4 */ addi r6, r31, 0x5f4 -/* 80461224 4B C1 8D 15 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80461228 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8046122C 41 82 00 0C */ beq lbl_80461238 -lbl_80461230: -/* 80461230 38 60 00 00 */ li r3, 0 -/* 80461234 48 00 00 08 */ b lbl_8046123C -lbl_80461238: -/* 80461238 38 60 00 01 */ li r3, 1 -lbl_8046123C: -/* 8046123C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80461240 4B F0 0F E5 */ bl _restgpr_28 -/* 80461244 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80461248 7C 08 03 A6 */ mtlr r0 -/* 8046124C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80461250 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CreateInit__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CreateInit__10daDoor20_cFv.s deleted file mode 100644 index 519a5ddd84..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CreateInit__10daDoor20_cFv.s +++ /dev/null @@ -1,176 +0,0 @@ -lbl_80462C2C: -/* 80462C2C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80462C30 7C 08 02 A6 */ mflr r0 -/* 80462C34 90 01 00 24 */ stw r0, 0x24(r1) -/* 80462C38 39 61 00 20 */ addi r11, r1, 0x20 -/* 80462C3C 4B EF F5 A1 */ bl _savegpr_29 -/* 80462C40 7C 7F 1B 78 */ mr r31, r3 -/* 80462C44 3C 60 80 46 */ lis r3, lit_4018@ha /* 0x80466820@ha */ -/* 80462C48 3B C3 68 20 */ addi r30, r3, lit_4018@l /* 0x80466820@l */ -/* 80462C4C 38 00 00 00 */ li r0, 0 -/* 80462C50 B0 1F 04 E8 */ sth r0, 0x4e8(r31) -/* 80462C54 B0 1F 04 E4 */ sth r0, 0x4e4(r31) -/* 80462C58 B0 1F 04 E0 */ sth r0, 0x4e0(r31) -/* 80462C5C B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 80462C60 38 7F 08 B8 */ addi r3, r31, 0x8b8 -/* 80462C64 C0 3E 00 68 */ lfs f1, 0x68(r30) -/* 80462C68 FC 40 08 90 */ fmr f2, f1 -/* 80462C6C 4B C1 32 ED */ bl SetWall__12dBgS_AcchCirFff -/* 80462C70 38 00 00 00 */ li r0, 0 -/* 80462C74 90 01 00 08 */ stw r0, 8(r1) -/* 80462C78 38 7F 06 E0 */ addi r3, r31, 0x6e0 -/* 80462C7C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80462C80 38 BF 04 BC */ addi r5, r31, 0x4bc -/* 80462C84 7F E6 FB 78 */ mr r6, r31 -/* 80462C88 38 E0 00 01 */ li r7, 1 -/* 80462C8C 39 1F 08 B8 */ addi r8, r31, 0x8b8 -/* 80462C90 39 3F 04 F8 */ addi r9, r31, 0x4f8 -/* 80462C94 39 40 00 00 */ li r10, 0 -/* 80462C98 4B C1 35 B1 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80462C9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80462CA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80462CA4 3B A3 0F 38 */ addi r29, r3, 0xf38 -/* 80462CA8 7F A3 EB 78 */ mr r3, r29 -/* 80462CAC 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 80462CB0 7F E5 FB 78 */ mr r5, r31 -/* 80462CB4 4B C1 1D 55 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80462CB8 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80462CBC 98 1F 04 8C */ stb r0, 0x48c(r31) -/* 80462CC0 38 00 00 00 */ li r0, 0 -/* 80462CC4 98 1F 06 90 */ stb r0, 0x690(r31) -/* 80462CC8 C0 1F 05 54 */ lfs f0, 0x554(r31) -/* 80462CCC C0 3E 00 6C */ lfs f1, 0x6c(r30) -/* 80462CD0 EC 00 08 2A */ fadds f0, f0, f1 -/* 80462CD4 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 80462CD8 C0 1F 05 3C */ lfs f0, 0x53c(r31) -/* 80462CDC EC 00 08 2A */ fadds f0, f0, f1 -/* 80462CE0 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80462CE4 38 00 00 20 */ li r0, 0x20 -/* 80462CE8 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80462CEC 38 1F 05 F4 */ addi r0, r31, 0x5f4 -/* 80462CF0 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80462CF4 7F E3 FB 78 */ mr r3, r31 -/* 80462CF8 4B BD 74 91 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80462CFC 2C 03 00 0A */ cmpwi r3, 0xa -/* 80462D00 40 82 00 28 */ bne lbl_80462D28 -/* 80462D04 7F E3 FB 78 */ mr r3, r31 -/* 80462D08 C0 3E 00 70 */ lfs f1, 0x70(r30) -/* 80462D0C C0 5E 00 0C */ lfs f2, 0xc(r30) -/* 80462D10 C0 7E 00 74 */ lfs f3, 0x74(r30) -/* 80462D14 C0 9E 00 78 */ lfs f4, 0x78(r30) -/* 80462D18 C0 BE 00 7C */ lfs f5, 0x7c(r30) -/* 80462D1C C0 DE 00 80 */ lfs f6, 0x80(r30) -/* 80462D20 4B BB 78 29 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80462D24 48 00 00 24 */ b lbl_80462D48 -lbl_80462D28: -/* 80462D28 7F E3 FB 78 */ mr r3, r31 -/* 80462D2C C0 3E 00 84 */ lfs f1, 0x84(r30) -/* 80462D30 C0 5E 00 0C */ lfs f2, 0xc(r30) -/* 80462D34 C0 7E 00 74 */ lfs f3, 0x74(r30) -/* 80462D38 C0 9E 00 58 */ lfs f4, 0x58(r30) -/* 80462D3C C0 BE 00 88 */ lfs f5, 0x88(r30) -/* 80462D40 C0 DE 00 80 */ lfs f6, 0x80(r30) -/* 80462D44 4B BB 78 05 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -lbl_80462D48: -/* 80462D48 C0 1E 00 8C */ lfs f0, 0x8c(r30) -/* 80462D4C D0 1F 05 20 */ stfs f0, 0x520(r31) -/* 80462D50 7F E3 FB 78 */ mr r3, r31 -/* 80462D54 48 00 01 61 */ bl setKey__10daDoor20_cFv -/* 80462D58 38 00 FF FF */ li r0, -1 -/* 80462D5C 90 1F 05 EC */ stw r0, 0x5ec(r31) -/* 80462D60 7F E3 FB 78 */ mr r3, r31 -/* 80462D64 4B BD 74 25 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80462D68 2C 03 00 09 */ cmpwi r3, 9 -/* 80462D6C 40 82 00 2C */ bne lbl_80462D98 -/* 80462D70 38 7D 3E C8 */ addi r3, r29, 0x3ec8 -/* 80462D74 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80462D78 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80462D7C 38 84 01 52 */ addi r4, r4, 0x152 -/* 80462D80 4B F0 5C 15 */ bl strcmp -/* 80462D84 2C 03 00 00 */ cmpwi r3, 0 -/* 80462D88 41 82 00 10 */ beq lbl_80462D98 -/* 80462D8C 38 00 00 01 */ li r0, 1 -/* 80462D90 98 1F 06 73 */ stb r0, 0x673(r31) -/* 80462D94 48 00 00 0C */ b lbl_80462DA0 -lbl_80462D98: -/* 80462D98 38 00 00 00 */ li r0, 0 -/* 80462D9C 98 1F 06 73 */ stb r0, 0x673(r31) -lbl_80462DA0: -/* 80462DA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80462DA4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80462DA8 88 1E 4E 0A */ lbz r0, 0x4e0a(r30) -/* 80462DAC 7C 1D 07 74 */ extsb r29, r0 -/* 80462DB0 7F E3 FB 78 */ mr r3, r31 -/* 80462DB4 4B BD 74 05 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80462DB8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80462DBC 7C 00 E8 00 */ cmpw r0, r29 -/* 80462DC0 41 82 00 20 */ beq lbl_80462DE0 -/* 80462DC4 88 1E 4E 0A */ lbz r0, 0x4e0a(r30) -/* 80462DC8 7C 1D 07 74 */ extsb r29, r0 -/* 80462DCC 7F E3 FB 78 */ mr r3, r31 -/* 80462DD0 4B BD 73 F5 */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80462DD4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80462DD8 7C 00 E8 00 */ cmpw r0, r29 -/* 80462DDC 40 82 00 0C */ bne lbl_80462DE8 -lbl_80462DE0: -/* 80462DE0 7F E3 FB 78 */ mr r3, r31 -/* 80462DE4 48 00 1A 75 */ bl createKey__10daDoor20_cFv -lbl_80462DE8: -/* 80462DE8 7F E3 FB 78 */ mr r3, r31 -/* 80462DEC 4B FF FD 6D */ bl calcMtx__10daDoor20_cFv -/* 80462DF0 80 7F 05 C4 */ lwz r3, 0x5c4(r31) -/* 80462DF4 4B C1 8B CD */ bl Move__4dBgWFv -/* 80462DF8 7F E3 FB 78 */ mr r3, r31 -/* 80462DFC 4B BD 73 BD */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80462E00 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 80462E04 98 64 00 09 */ stb r3, 9(r4) -/* 80462E08 7F E3 FB 78 */ mr r3, r31 -/* 80462E0C 4B BD 73 7D */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80462E10 28 03 00 0C */ cmplwi r3, 0xc -/* 80462E14 41 81 00 28 */ bgt lbl_80462E3C -/* 80462E18 3C 80 80 46 */ lis r4, lit_4926@ha /* 0x80467008@ha */ -/* 80462E1C 38 84 70 08 */ addi r4, r4, lit_4926@l /* 0x80467008@l */ -/* 80462E20 54 60 10 3A */ slwi r0, r3, 2 -/* 80462E24 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80462E28 7C 09 03 A6 */ mtctr r0 -/* 80462E2C 4E 80 04 20 */ bctr -lbl_80462E30: -/* 80462E30 38 00 00 03 */ li r0, 3 -/* 80462E34 98 1F 06 91 */ stb r0, 0x691(r31) -/* 80462E38 48 00 00 3C */ b lbl_80462E74 -lbl_80462E3C: -/* 80462E3C 38 00 00 01 */ li r0, 1 -/* 80462E40 98 1F 06 91 */ stb r0, 0x691(r31) -/* 80462E44 48 00 00 30 */ b lbl_80462E74 -lbl_80462E48: -/* 80462E48 38 00 00 02 */ li r0, 2 -/* 80462E4C 98 1F 06 91 */ stb r0, 0x691(r31) -/* 80462E50 48 00 00 24 */ b lbl_80462E74 -lbl_80462E54: -/* 80462E54 38 00 00 04 */ li r0, 4 -/* 80462E58 98 1F 06 91 */ stb r0, 0x691(r31) -/* 80462E5C 48 00 00 18 */ b lbl_80462E74 -lbl_80462E60: -/* 80462E60 38 00 00 05 */ li r0, 5 -/* 80462E64 98 1F 06 91 */ stb r0, 0x691(r31) -/* 80462E68 48 00 00 0C */ b lbl_80462E74 -lbl_80462E6C: -/* 80462E6C 38 00 00 06 */ li r0, 6 -/* 80462E70 98 1F 06 91 */ stb r0, 0x691(r31) -lbl_80462E74: -/* 80462E74 7F E3 FB 78 */ mr r3, r31 -/* 80462E78 4B FF DD 2D */ bl getArcName__10daDoor20_cFv -/* 80462E7C 90 7F 01 00 */ stw r3, 0x100(r31) -/* 80462E80 7F E3 FB 78 */ mr r3, r31 -/* 80462E84 48 00 25 2D */ bl initProc__10daDoor20_cFv -/* 80462E88 38 00 00 41 */ li r0, 0x41 -/* 80462E8C 98 1F 06 8D */ stb r0, 0x68d(r31) -/* 80462E90 38 00 FF FF */ li r0, -1 -/* 80462E94 98 1F 05 C8 */ stb r0, 0x5c8(r31) -/* 80462E98 38 60 00 01 */ li r3, 1 -/* 80462E9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80462EA0 4B EF F3 89 */ bl _restgpr_29 -/* 80462EA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80462EA8 7C 08 03 A6 */ mtlr r0 -/* 80462EAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80462EB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 64e173ead3..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80461254: -/* 80461254 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80461258 7C 08 02 A6 */ mflr r0 -/* 8046125C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80461260 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80461264 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80461268 41 82 00 1C */ beq lbl_80461284 -/* 8046126C 3C A0 80 46 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80467320@ha */ -/* 80461270 38 05 73 20 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80467320@l */ -/* 80461274 90 1F 00 00 */ stw r0, 0(r31) -/* 80461278 7C 80 07 35 */ extsh. r0, r4 -/* 8046127C 40 81 00 08 */ ble lbl_80461284 -/* 80461280 4B E6 DA BD */ bl __dl__FPv -lbl_80461284: -/* 80461284 7F E3 FB 78 */ mr r3, r31 -/* 80461288 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8046128C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80461290 7C 08 03 A6 */ mtlr r0 -/* 80461294 38 21 00 10 */ addi r1, r1, 0x10 -/* 80461298 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index b90280a5c8..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8046670C: -/* 8046670C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80466710 7C 08 02 A6 */ mflr r0 -/* 80466714 90 01 00 14 */ stw r0, 0x14(r1) -/* 80466718 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8046671C 93 C1 00 08 */ stw r30, 8(r1) -/* 80466720 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80466724 7C 9F 23 78 */ mr r31, r4 -/* 80466728 41 82 00 38 */ beq lbl_80466760 -/* 8046672C 3C 60 80 46 */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x804672F0@ha */ -/* 80466730 38 03 72 F0 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x804672F0@l */ -/* 80466734 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80466738 38 7E 00 14 */ addi r3, r30, 0x14 -/* 8046673C 38 80 FF FF */ li r4, -1 -/* 80466740 4B E0 87 D9 */ bl __dt__8cM3dGCirFv -/* 80466744 7F C3 F3 78 */ mr r3, r30 -/* 80466748 38 80 00 00 */ li r4, 0 -/* 8046674C 4B E0 19 65 */ bl __dt__13cBgS_PolyInfoFv -/* 80466750 7F E0 07 35 */ extsh. r0, r31 -/* 80466754 40 81 00 0C */ ble lbl_80466760 -/* 80466758 7F C3 F3 78 */ mr r3, r30 -/* 8046675C 4B E6 85 E1 */ bl __dl__FPv -lbl_80466760: -/* 80466760 7F C3 F3 78 */ mr r3, r30 -/* 80466764 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80466768 83 C1 00 08 */ lwz r30, 8(r1) -/* 8046676C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80466770 7C 08 03 A6 */ mtlr r0 -/* 80466774 38 21 00 10 */ addi r1, r1, 0x10 -/* 80466778 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 4ca3367f44..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8046677C: -/* 8046677C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80466780 7C 08 02 A6 */ mflr r0 -/* 80466784 90 01 00 14 */ stw r0, 0x14(r1) -/* 80466788 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8046678C 93 C1 00 08 */ stw r30, 8(r1) -/* 80466790 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80466794 7C 9F 23 78 */ mr r31, r4 -/* 80466798 41 82 00 38 */ beq lbl_804667D0 -/* 8046679C 3C 80 80 46 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x804672FC@ha */ -/* 804667A0 38 84 72 FC */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x804672FC@l */ -/* 804667A4 90 9E 00 10 */ stw r4, 0x10(r30) -/* 804667A8 38 04 00 0C */ addi r0, r4, 0xc -/* 804667AC 90 1E 00 14 */ stw r0, 0x14(r30) -/* 804667B0 38 04 00 18 */ addi r0, r4, 0x18 -/* 804667B4 90 1E 00 24 */ stw r0, 0x24(r30) -/* 804667B8 38 80 00 00 */ li r4, 0 -/* 804667BC 4B C0 F7 D9 */ bl __dt__9dBgS_AcchFv -/* 804667C0 7F E0 07 35 */ extsh. r0, r31 -/* 804667C4 40 81 00 0C */ ble lbl_804667D0 -/* 804667C8 7F C3 F3 78 */ mr r3, r30 -/* 804667CC 4B E6 85 71 */ bl __dl__FPv -lbl_804667D0: -/* 804667D0 7F C3 F3 78 */ mr r3, r30 -/* 804667D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804667D8 83 C1 00 08 */ lwz r30, 8(r1) -/* 804667DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804667E0 7C 08 03 A6 */ mtlr r0 -/* 804667E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 804667E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/_delete__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/_delete__10daDoor20_cFv.s deleted file mode 100644 index 7eb116b3ec..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/_delete__10daDoor20_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_804647BC: -/* 804647BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804647C0 7C 08 02 A6 */ mflr r0 -/* 804647C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804647C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804647CC 7C 7F 1B 78 */ mr r31, r3 -/* 804647D0 80 03 00 F0 */ lwz r0, 0xf0(r3) -/* 804647D4 28 00 00 00 */ cmplwi r0, 0 -/* 804647D8 41 82 00 28 */ beq lbl_80464800 -/* 804647DC 80 7F 05 C4 */ lwz r3, 0x5c4(r31) -/* 804647E0 4B E0 39 F5 */ bl ChkUsed__9cBgW_BgIdCFv -/* 804647E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 804647E8 41 82 00 18 */ beq lbl_80464800 -/* 804647EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804647F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804647F4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 804647F8 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 804647FC 4B C0 FA 55 */ bl Release__4cBgSFP9dBgW_Base -lbl_80464800: -/* 80464800 7F E3 FB 78 */ mr r3, r31 -/* 80464804 48 00 02 E1 */ bl deleteKey__10daDoor20_cFv -/* 80464808 7F E3 FB 78 */ mr r3, r31 -/* 8046480C 4B FF C3 89 */ bl getAlwaysArcName__10daDoor20_cFv -/* 80464810 7C 64 1B 78 */ mr r4, r3 -/* 80464814 38 7F 05 6C */ addi r3, r31, 0x56c -/* 80464818 4B BC 87 F1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8046481C 7F E3 FB 78 */ mr r3, r31 -/* 80464820 4B FF C3 85 */ bl getArcName__10daDoor20_cFv -/* 80464824 28 03 00 00 */ cmplwi r3, 0 -/* 80464828 41 82 00 18 */ beq lbl_80464840 -/* 8046482C 7F E3 FB 78 */ mr r3, r31 -/* 80464830 4B FF C3 75 */ bl getArcName__10daDoor20_cFv -/* 80464834 7C 64 1B 78 */ mr r4, r3 -/* 80464838 38 7F 05 74 */ addi r3, r31, 0x574 -/* 8046483C 4B BC 87 CD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -lbl_80464840: -/* 80464840 38 60 00 01 */ li r3, 1 -/* 80464844 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80464848 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8046484C 7C 08 03 A6 */ mtlr r0 -/* 80464850 38 21 00 10 */ addi r1, r1, 0x10 -/* 80464854 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionDemo__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionDemo__10daDoor20_cFv.s deleted file mode 100644 index 92f97b045e..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionDemo__10daDoor20_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8046416C: -/* 8046416C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80464170 7C 08 02 A6 */ mflr r0 -/* 80464174 90 01 00 14 */ stw r0, 0x14(r1) -/* 80464178 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8046417C 93 C1 00 08 */ stw r30, 8(r1) -/* 80464180 7C 7E 1B 78 */ mr r30, r3 -/* 80464184 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464188 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046418C 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80464190 88 1E 06 CB */ lbz r0, 0x6cb(r30) -/* 80464194 54 00 08 3C */ slwi r0, r0, 1 -/* 80464198 7C 9E 02 14 */ add r4, r30, r0 -/* 8046419C A8 84 06 92 */ lha r4, 0x692(r4) -/* 804641A0 4B BE 38 D9 */ bl endCheck__16dEvent_manager_cFs -/* 804641A4 2C 03 00 00 */ cmpwi r3, 0 -/* 804641A8 41 82 00 20 */ beq lbl_804641C8 -/* 804641AC 38 00 00 01 */ li r0, 1 -/* 804641B0 98 1E 06 90 */ stb r0, 0x690(r30) -/* 804641B4 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 804641B8 4B BD E2 B1 */ bl reset__14dEvt_control_cFv -/* 804641BC A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 804641C0 B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 804641C4 48 00 00 0C */ b lbl_804641D0 -lbl_804641C8: -/* 804641C8 7F C3 F3 78 */ mr r3, r30 -/* 804641CC 4B FF EE 15 */ bl demoProc__10daDoor20_cFv -lbl_804641D0: -/* 804641D0 38 60 00 01 */ li r3, 1 -/* 804641D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804641D8 83 C1 00 08 */ lwz r30, 8(r1) -/* 804641DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804641E0 7C 08 03 A6 */ mtlr r0 -/* 804641E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 804641E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionInit__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionInit__10daDoor20_cFv.s deleted file mode 100644 index 77c97485b8..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionInit__10daDoor20_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_804641EC: -/* 804641EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804641F0 7C 08 02 A6 */ mflr r0 -/* 804641F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804641F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804641FC 7C 7F 1B 78 */ mr r31, r3 -/* 80464200 48 00 04 39 */ bl setDoorAngleSpec__10daDoor20_cFv -/* 80464204 7F E3 FB 78 */ mr r3, r31 -/* 80464208 48 00 1C 85 */ bl setStop__10daDoor20_cFv -/* 8046420C 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 80464210 7F E4 FB 78 */ mr r4, r31 -/* 80464214 48 00 1E E1 */ bl calcMtx__12dDoor_stop_cFP10daDoor20_c -/* 80464218 7F E3 FB 78 */ mr r3, r31 -/* 8046421C 4B FF FD A1 */ bl actionWait__10daDoor20_cFv -/* 80464220 38 00 00 01 */ li r0, 1 -/* 80464224 98 1F 06 90 */ stb r0, 0x690(r31) -/* 80464228 38 60 00 01 */ li r3, 1 -/* 8046422C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80464230 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80464234 7C 08 03 A6 */ mtlr r0 -/* 80464238 38 21 00 10 */ addi r1, r1, 0x10 -/* 8046423C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionStopClose__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionStopClose__10daDoor20_cFv.s deleted file mode 100644 index 39770ddf3d..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionStopClose__10daDoor20_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80464118: -/* 80464118 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046411C 7C 08 02 A6 */ mflr r0 -/* 80464120 90 01 00 14 */ stw r0, 0x14(r1) -/* 80464124 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80464128 7C 7F 1B 78 */ mr r31, r3 -/* 8046412C 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 80464130 7F E4 FB 78 */ mr r4, r31 -/* 80464134 48 00 21 8D */ bl closeProc__12dDoor_stop_cFP10daDoor20_c -/* 80464138 2C 03 00 00 */ cmpwi r3, 0 -/* 8046413C 41 82 00 0C */ beq lbl_80464148 -/* 80464140 38 00 00 01 */ li r0, 1 -/* 80464144 98 1F 06 90 */ stb r0, 0x690(r31) -lbl_80464148: -/* 80464148 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 8046414C 7F E4 FB 78 */ mr r4, r31 -/* 80464150 48 00 1F A5 */ bl calcMtx__12dDoor_stop_cFP10daDoor20_c -/* 80464154 38 60 00 01 */ li r3, 1 -/* 80464158 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8046415C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80464160 7C 08 03 A6 */ mtlr r0 -/* 80464164 38 21 00 10 */ addi r1, r1, 0x10 -/* 80464168 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionWait__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionWait__10daDoor20_cFv.s deleted file mode 100644 index ad300c7ef8..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionWait__10daDoor20_cFv.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_80463FBC: -/* 80463FBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80463FC0 7C 08 02 A6 */ mflr r0 -/* 80463FC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80463FC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80463FCC 7C 7F 1B 78 */ mr r31, r3 -/* 80463FD0 A0 83 00 F8 */ lhz r4, 0xf8(r3) -/* 80463FD4 28 04 00 03 */ cmplwi r4, 3 -/* 80463FD8 40 82 00 20 */ bne lbl_80463FF8 -/* 80463FDC 38 80 00 01 */ li r4, 1 -/* 80463FE0 48 00 14 21 */ bl initOpenDemo__10daDoor20_cFi -/* 80463FE4 38 00 00 03 */ li r0, 3 -/* 80463FE8 98 1F 06 90 */ stb r0, 0x690(r31) -/* 80463FEC 7F E3 FB 78 */ mr r3, r31 -/* 80463FF0 4B FF EF F1 */ bl demoProc__10daDoor20_cFv -/* 80463FF4 48 00 01 0C */ b lbl_80464100 -lbl_80463FF8: -/* 80463FF8 88 1F 06 D8 */ lbz r0, 0x6d8(r31) -/* 80463FFC 28 00 00 00 */ cmplwi r0, 0 -/* 80464000 41 82 00 98 */ beq lbl_80464098 -/* 80464004 28 04 00 02 */ cmplwi r4, 2 -/* 80464008 40 82 00 64 */ bne lbl_8046406C -/* 8046400C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464010 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464014 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80464018 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 8046401C 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80464020 38 84 01 59 */ addi r4, r4, 0x159 -/* 80464024 38 A0 00 00 */ li r5, 0 -/* 80464028 38 C0 00 00 */ li r6, 0 -/* 8046402C 4B BE 3A F1 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80464030 90 7F 06 CC */ stw r3, 0x6cc(r31) -/* 80464034 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 80464038 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 8046403C 88 1F 06 8C */ lbz r0, 0x68c(r31) -/* 80464040 28 00 00 01 */ cmplwi r0, 1 -/* 80464044 40 82 00 10 */ bne lbl_80464054 -/* 80464048 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 8046404C 38 03 7F FF */ addi r0, r3, 0x7fff -/* 80464050 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -lbl_80464054: -/* 80464054 38 00 00 03 */ li r0, 3 -/* 80464058 98 1F 06 90 */ stb r0, 0x690(r31) -/* 8046405C 7F E3 FB 78 */ mr r3, r31 -/* 80464060 4B FF EF 81 */ bl demoProc__10daDoor20_cFv -/* 80464064 38 60 00 01 */ li r3, 1 -/* 80464068 48 00 00 9C */ b lbl_80464104 -lbl_8046406C: -/* 8046406C 48 00 1E B5 */ bl chkStopOpen__10daDoor20_cFv -/* 80464070 2C 03 00 00 */ cmpwi r3, 0 -/* 80464074 41 82 00 24 */ beq lbl_80464098 -/* 80464078 7F E3 FB 78 */ mr r3, r31 -/* 8046407C 48 00 1C 45 */ bl setStopDemo__10daDoor20_cFv -/* 80464080 7F E3 FB 78 */ mr r3, r31 -/* 80464084 4B FF FD AD */ bl orderStopEvent__10daDoor20_cFv -/* 80464088 2C 03 00 00 */ cmpwi r3, 0 -/* 8046408C 41 82 00 0C */ beq lbl_80464098 -/* 80464090 38 60 00 01 */ li r3, 1 -/* 80464094 48 00 00 70 */ b lbl_80464104 -lbl_80464098: -/* 80464098 88 1F 06 D8 */ lbz r0, 0x6d8(r31) -/* 8046409C 28 00 00 00 */ cmplwi r0, 0 -/* 804640A0 40 82 00 44 */ bne lbl_804640E4 -/* 804640A4 7F E3 FB 78 */ mr r3, r31 -/* 804640A8 48 00 1D 01 */ bl chkStopClose__10daDoor20_cFv -/* 804640AC 2C 03 00 00 */ cmpwi r3, 0 -/* 804640B0 41 82 00 34 */ beq lbl_804640E4 -/* 804640B4 38 00 00 01 */ li r0, 1 -/* 804640B8 98 1F 06 D8 */ stb r0, 0x6d8(r31) -/* 804640BC 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 804640C0 7F E4 FB 78 */ mr r4, r31 -/* 804640C4 48 00 20 ED */ bl closeInit__12dDoor_stop_cFP10daDoor20_c -/* 804640C8 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 804640CC 7F E4 FB 78 */ mr r4, r31 -/* 804640D0 48 00 20 25 */ bl calcMtx__12dDoor_stop_cFP10daDoor20_c -/* 804640D4 38 00 00 02 */ li r0, 2 -/* 804640D8 98 1F 06 90 */ stb r0, 0x690(r31) -/* 804640DC 38 60 00 01 */ li r3, 1 -/* 804640E0 48 00 00 24 */ b lbl_80464104 -lbl_804640E4: -/* 804640E4 88 1F 06 D8 */ lbz r0, 0x6d8(r31) -/* 804640E8 28 00 00 00 */ cmplwi r0, 0 -/* 804640EC 40 82 00 14 */ bne lbl_80464100 -/* 804640F0 7F E3 FB 78 */ mr r3, r31 -/* 804640F4 48 00 0E 71 */ bl makeEventId__10daDoor20_cFv -/* 804640F8 7F E3 FB 78 */ mr r3, r31 -/* 804640FC 4B FF D1 A1 */ bl setEventPrm__10daDoor20_cFv -lbl_80464100: -/* 80464100 38 60 00 01 */ li r3, 1 -lbl_80464104: -/* 80464104 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80464108 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8046410C 7C 08 03 A6 */ mtlr r0 -/* 80464110 38 21 00 10 */ addi r1, r1, 0x10 -/* 80464114 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjoinPlayer__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjoinPlayer__10daDoor20_cFv.s deleted file mode 100644 index 39f29d9191..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjoinPlayer__10daDoor20_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80464B3C: -/* 80464B3C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80464B40 7C 08 02 A6 */ mflr r0 -/* 80464B44 90 01 00 24 */ stw r0, 0x24(r1) -/* 80464B48 39 61 00 20 */ addi r11, r1, 0x20 -/* 80464B4C 4B EF D6 91 */ bl _savegpr_29 -/* 80464B50 7C 7D 1B 78 */ mr r29, r3 -/* 80464B54 4B BD 56 65 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464B58 54 7E 06 3E */ clrlwi r30, r3, 0x18 -/* 80464B5C 7F A3 EB 78 */ mr r3, r29 -/* 80464B60 4B BD 56 65 */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464B64 54 7D 06 3E */ clrlwi r29, r3, 0x18 -/* 80464B68 2C 1E 00 3F */ cmpwi r30, 0x3f -/* 80464B6C 41 82 00 0C */ beq lbl_80464B78 -/* 80464B70 2C 1D 00 3F */ cmpwi r29, 0x3f -/* 80464B74 40 82 00 0C */ bne lbl_80464B80 -lbl_80464B78: -/* 80464B78 38 60 00 01 */ li r3, 1 -/* 80464B7C 48 00 00 44 */ b lbl_80464BC0 -lbl_80464B80: -/* 80464B80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464B84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464B88 3B E3 4E C4 */ addi r31, r3, 0x4ec4 -/* 80464B8C 7F E3 FB 78 */ mr r3, r31 -/* 80464B90 7F C4 F3 78 */ mr r4, r30 -/* 80464B94 4B BB F9 55 */ bl checkRoomDisp__20dStage_roomControl_cCFi -/* 80464B98 2C 03 00 00 */ cmpwi r3, 0 -/* 80464B9C 40 82 00 18 */ bne lbl_80464BB4 -/* 80464BA0 7F E3 FB 78 */ mr r3, r31 -/* 80464BA4 7F A4 EB 78 */ mr r4, r29 -/* 80464BA8 4B BB F9 41 */ bl checkRoomDisp__20dStage_roomControl_cCFi -/* 80464BAC 2C 03 00 00 */ cmpwi r3, 0 -/* 80464BB0 41 82 00 0C */ beq lbl_80464BBC -lbl_80464BB4: -/* 80464BB4 38 60 00 01 */ li r3, 1 -/* 80464BB8 48 00 00 08 */ b lbl_80464BC0 -lbl_80464BBC: -/* 80464BBC 38 60 00 00 */ li r3, 0 -lbl_80464BC0: -/* 80464BC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80464BC4 4B EF D6 65 */ bl _restgpr_29 -/* 80464BC8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80464BCC 7C 08 03 A6 */ mtlr r0 -/* 80464BD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80464BD4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjustmentAngle__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjustmentAngle__10daDoor20_cFv.s deleted file mode 100644 index f793b902c1..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjustmentAngle__10daDoor20_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8046178C: -/* 8046178C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80461790 7C 08 02 A6 */ mflr r0 -/* 80461794 90 01 00 24 */ stw r0, 0x24(r1) -/* 80461798 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8046179C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 804617A0 7C 7E 1B 78 */ mr r30, r3 -/* 804617A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804617A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804617AC 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 804617B0 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 804617B4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 804617B8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 804617BC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 804617C0 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 804617C4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 804617C8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 804617CC B0 01 00 08 */ sth r0, 8(r1) -/* 804617D0 38 61 00 08 */ addi r3, r1, 8 -/* 804617D4 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 804617D8 38 04 7F FF */ addi r0, r4, 0x7fff -/* 804617DC 7C 04 07 34 */ extsh r4, r0 -/* 804617E0 38 A0 00 05 */ li r5, 5 -/* 804617E4 38 C0 0B B8 */ li r6, 0xbb8 -/* 804617E8 4B E0 EE 21 */ bl cLib_addCalcAngleS2__FPssss -/* 804617EC A8 1E 06 DC */ lha r0, 0x6dc(r30) -/* 804617F0 2C 00 00 00 */ cmpwi r0, 0 -/* 804617F4 40 81 00 34 */ ble lbl_80461828 -/* 804617F8 7F E3 FB 78 */ mr r3, r31 -/* 804617FC 38 81 00 0C */ addi r4, r1, 0xc -/* 80461800 A8 A1 00 08 */ lha r5, 8(r1) -/* 80461804 38 C0 00 00 */ li r6, 0 -/* 80461808 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 8046180C 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 80461810 7D 89 03 A6 */ mtctr r12 -/* 80461814 4E 80 04 21 */ bctrl -/* 80461818 A8 7E 06 DC */ lha r3, 0x6dc(r30) -/* 8046181C 38 03 FF FF */ addi r0, r3, -1 -/* 80461820 B0 1E 06 DC */ sth r0, 0x6dc(r30) -/* 80461824 48 00 00 34 */ b lbl_80461858 -lbl_80461828: -/* 80461828 7F E3 FB 78 */ mr r3, r31 -/* 8046182C 38 81 00 0C */ addi r4, r1, 0xc -/* 80461830 A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 80461834 38 05 7F FF */ addi r0, r5, 0x7fff -/* 80461838 7C 05 07 34 */ extsh r5, r0 -/* 8046183C 38 C0 00 00 */ li r6, 0 -/* 80461840 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 80461844 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 80461848 7D 89 03 A6 */ mtctr r12 -/* 8046184C 4E 80 04 21 */ bctrl -/* 80461850 38 60 00 01 */ li r3, 1 -/* 80461854 48 00 00 08 */ b lbl_8046185C -lbl_80461858: -/* 80461858 38 60 00 00 */ li r3, 0 -lbl_8046185C: -/* 8046185C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80461860 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80461864 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80461868 7C 08 03 A6 */ mtlr r0 -/* 8046186C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80461870 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjustmentProc__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjustmentProc__10daDoor20_cFv.s deleted file mode 100644 index 460f7ce85d..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjustmentProc__10daDoor20_cFv.s +++ /dev/null @@ -1,124 +0,0 @@ -lbl_80461874: -/* 80461874 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80461878 7C 08 02 A6 */ mflr r0 -/* 8046187C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80461880 39 61 00 30 */ addi r11, r1, 0x30 -/* 80461884 4B F0 09 55 */ bl _savegpr_28 -/* 80461888 7C 7D 1B 78 */ mr r29, r3 -/* 8046188C 3C 60 80 46 */ lis r3, lit_4018@ha /* 0x80466820@ha */ -/* 80461890 3B E3 68 20 */ addi r31, r3, lit_4018@l /* 0x80466820@l */ -/* 80461894 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461898 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046189C 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 804618A0 C0 5E 04 D0 */ lfs f2, 0x4d0(r30) -/* 804618A4 D0 41 00 08 */ stfs f2, 8(r1) -/* 804618A8 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 804618AC D0 21 00 0C */ stfs f1, 0xc(r1) -/* 804618B0 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 804618B4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 804618B8 A8 7D 04 E6 */ lha r3, 0x4e6(r29) -/* 804618BC 38 03 7F FF */ addi r0, r3, 0x7fff -/* 804618C0 7C 1C 07 34 */ extsh r28, r0 -/* 804618C4 D0 41 00 08 */ stfs f2, 8(r1) -/* 804618C8 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 804618CC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 804618D0 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 804618D4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 804618D8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804618DC 88 1D 06 CB */ lbz r0, 0x6cb(r29) -/* 804618E0 28 00 00 0C */ cmplwi r0, 0xc -/* 804618E4 41 82 00 14 */ beq lbl_804618F8 -/* 804618E8 28 00 00 0E */ cmplwi r0, 0xe -/* 804618EC 41 82 00 0C */ beq lbl_804618F8 -/* 804618F0 28 00 00 10 */ cmplwi r0, 0x10 -/* 804618F4 40 82 00 10 */ bne lbl_80461904 -lbl_804618F8: -/* 804618F8 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 804618FC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80461900 48 00 00 0C */ b lbl_8046190C -lbl_80461904: -/* 80461904 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80461908 D0 01 00 14 */ stfs f0, 0x14(r1) -lbl_8046190C: -/* 8046190C A8 9D 04 B6 */ lha r4, 0x4b6(r29) -/* 80461910 88 1D 06 8C */ lbz r0, 0x68c(r29) -/* 80461914 28 00 00 00 */ cmplwi r0, 0 -/* 80461918 40 82 00 0C */ bne lbl_80461924 -/* 8046191C 38 04 7F FF */ addi r0, r4, 0x7fff -/* 80461920 7C 04 07 34 */ extsh r4, r0 -lbl_80461924: -/* 80461924 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80461928 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8046192C 4B BA AA B1 */ bl mDoMtx_YrotS__FPA4_fs -/* 80461930 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80461934 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80461938 38 81 00 14 */ addi r4, r1, 0x14 -/* 8046193C 7C 85 23 78 */ mr r5, r4 -/* 80461940 4B EE 54 2D */ bl PSMTXMultVec -/* 80461944 38 61 00 14 */ addi r3, r1, 0x14 -/* 80461948 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 8046194C 7C 65 1B 78 */ mr r5, r3 -/* 80461950 4B EE 57 41 */ bl PSVECAdd -/* 80461954 C0 41 00 14 */ lfs f2, 0x14(r1) -/* 80461958 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 8046195C 57 80 04 38 */ rlwinm r0, r28, 0, 0x10, 0x1c -/* 80461960 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80461964 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80461968 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8046196C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80461970 EC A2 00 2A */ fadds f5, f2, f0 -/* 80461974 D0 A1 00 14 */ stfs f5, 0x14(r1) -/* 80461978 C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 8046197C C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80461980 7C 63 02 14 */ add r3, r3, r0 -/* 80461984 C0 03 00 04 */ lfs f0, 4(r3) -/* 80461988 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046198C EC 82 00 2A */ fadds f4, f2, f0 -/* 80461990 D0 81 00 1C */ stfs f4, 0x1c(r1) -/* 80461994 A8 1D 06 DC */ lha r0, 0x6dc(r29) -/* 80461998 2C 00 00 00 */ cmpwi r0, 0 -/* 8046199C 40 81 00 64 */ ble lbl_80461A00 -/* 804619A0 C0 7F 00 24 */ lfs f3, 0x24(r31) -/* 804619A4 C0 01 00 08 */ lfs f0, 8(r1) -/* 804619A8 EC 23 00 32 */ fmuls f1, f3, f0 -/* 804619AC C0 5F 00 28 */ lfs f2, 0x28(r31) -/* 804619B0 EC 02 01 72 */ fmuls f0, f2, f5 -/* 804619B4 EC 01 00 2A */ fadds f0, f1, f0 -/* 804619B8 D0 01 00 08 */ stfs f0, 8(r1) -/* 804619BC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 804619C0 EC 23 00 32 */ fmuls f1, f3, f0 -/* 804619C4 EC 02 01 32 */ fmuls f0, f2, f4 -/* 804619C8 EC 01 00 2A */ fadds f0, f1, f0 -/* 804619CC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 804619D0 7F C3 F3 78 */ mr r3, r30 -/* 804619D4 38 81 00 08 */ addi r4, r1, 8 -/* 804619D8 A8 BE 04 DE */ lha r5, 0x4de(r30) -/* 804619DC 38 C0 00 00 */ li r6, 0 -/* 804619E0 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 804619E4 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 804619E8 7D 89 03 A6 */ mtctr r12 -/* 804619EC 4E 80 04 21 */ bctrl -/* 804619F0 A8 7D 06 DC */ lha r3, 0x6dc(r29) -/* 804619F4 38 03 FF FF */ addi r0, r3, -1 -/* 804619F8 B0 1D 06 DC */ sth r0, 0x6dc(r29) -/* 804619FC 48 00 00 2C */ b lbl_80461A28 -lbl_80461A00: -/* 80461A00 7F C3 F3 78 */ mr r3, r30 -/* 80461A04 38 81 00 14 */ addi r4, r1, 0x14 -/* 80461A08 A8 BE 04 DE */ lha r5, 0x4de(r30) -/* 80461A0C 38 C0 00 00 */ li r6, 0 -/* 80461A10 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80461A14 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 80461A18 7D 89 03 A6 */ mtctr r12 -/* 80461A1C 4E 80 04 21 */ bctrl -/* 80461A20 38 60 00 01 */ li r3, 1 -/* 80461A24 48 00 00 08 */ b lbl_80461A2C -lbl_80461A28: -/* 80461A28 38 60 00 00 */ li r3, 0 -lbl_80461A2C: -/* 80461A2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80461A30 4B F0 07 F5 */ bl _restgpr_28 -/* 80461A34 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80461A38 7C 08 03 A6 */ mtlr r0 -/* 80461A3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80461A40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx_2__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx_2__10daDoor20_cFv.s deleted file mode 100644 index 646e733880..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx_2__10daDoor20_cFv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80462A5C: -/* 80462A5C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80462A60 7C 08 02 A6 */ mflr r0 -/* 80462A64 90 01 00 34 */ stw r0, 0x34(r1) -/* 80462A68 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80462A6C 7C 7F 1B 78 */ mr r31, r3 -/* 80462A70 3C 60 80 46 */ lis r3, lit_4018@ha /* 0x80466820@ha */ -/* 80462A74 38 63 68 20 */ addi r3, r3, lit_4018@l /* 0x80466820@l */ -/* 80462A78 C0 03 00 60 */ lfs f0, 0x60(r3) -/* 80462A7C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80462A80 C0 23 00 0C */ lfs f1, 0xc(r3) -/* 80462A84 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80462A88 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80462A8C C0 03 00 64 */ lfs f0, 0x64(r3) -/* 80462A90 D0 01 00 08 */ stfs f0, 8(r1) -/* 80462A94 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80462A98 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80462A9C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462AA0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462AA4 A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 80462AA8 4B BA 99 35 */ bl mDoMtx_YrotS__FPA4_fs -/* 80462AAC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462AB0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462AB4 38 81 00 14 */ addi r4, r1, 0x14 -/* 80462AB8 7C 85 23 78 */ mr r5, r4 -/* 80462ABC 4B EE 42 B1 */ bl PSMTXMultVec -/* 80462AC0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462AC4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462AC8 38 81 00 08 */ addi r4, r1, 8 -/* 80462ACC 7C 85 23 78 */ mr r5, r4 -/* 80462AD0 4B EE 42 9D */ bl PSMTXMultVec -/* 80462AD4 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80462AD8 4B BA A2 8D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80462ADC 38 61 00 14 */ addi r3, r1, 0x14 -/* 80462AE0 4B BA A2 F5 */ bl transM__14mDoMtx_stack_cFRC4cXyz -/* 80462AE4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462AE8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462AEC A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 80462AF0 4B BA 99 45 */ bl mDoMtx_YrotM__FPA4_fs -/* 80462AF4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462AF8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462AFC 80 9F 05 7C */ lwz r4, 0x57c(r31) -/* 80462B00 38 84 00 24 */ addi r4, r4, 0x24 -/* 80462B04 4B EE 39 AD */ bl PSMTXCopy -/* 80462B08 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80462B0C 4B BA A2 59 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80462B10 38 61 00 08 */ addi r3, r1, 8 -/* 80462B14 4B BA A2 C1 */ bl transM__14mDoMtx_stack_cFRC4cXyz -/* 80462B18 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462B1C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462B20 A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 80462B24 38 04 7F FF */ addi r0, r4, 0x7fff -/* 80462B28 7C 04 07 34 */ extsh r4, r0 -/* 80462B2C 4B BA 99 09 */ bl mDoMtx_YrotM__FPA4_fs -/* 80462B30 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462B34 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462B38 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 80462B3C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80462B40 4B EE 39 71 */ bl PSMTXCopy -/* 80462B44 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80462B48 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80462B4C 7C 08 03 A6 */ mtlr r0 -/* 80462B50 38 21 00 30 */ addi r1, r1, 0x30 -/* 80462B54 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx__10daDoor20_cFv.s deleted file mode 100644 index 4d424fa20b..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx__10daDoor20_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80462B58: -/* 80462B58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80462B5C 7C 08 02 A6 */ mflr r0 -/* 80462B60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80462B64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80462B68 7C 7F 1B 78 */ mr r31, r3 -/* 80462B6C 4B BD 76 1D */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80462B70 28 03 00 0C */ cmplwi r3, 0xc -/* 80462B74 41 81 00 78 */ bgt lbl_80462BEC -/* 80462B78 3C 80 80 46 */ lis r4, lit_4875@ha /* 0x80466FD4@ha */ -/* 80462B7C 38 84 6F D4 */ addi r4, r4, lit_4875@l /* 0x80466FD4@l */ -/* 80462B80 54 60 10 3A */ slwi r0, r3, 2 -/* 80462B84 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80462B88 7C 09 03 A6 */ mtctr r0 -/* 80462B8C 4E 80 04 20 */ bctr -lbl_80462B90: -/* 80462B90 7F E3 FB 78 */ mr r3, r31 -/* 80462B94 4B FF FE C9 */ bl calcMtx_2__10daDoor20_cFv -/* 80462B98 48 00 00 80 */ b lbl_80462C18 -lbl_80462B9C: -/* 80462B9C 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80462BA0 4B BA A1 C5 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80462BA4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462BA8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462BAC A8 9F 06 70 */ lha r4, 0x670(r31) -/* 80462BB0 4B BA 98 85 */ bl mDoMtx_YrotM__FPA4_fs -/* 80462BB4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462BB8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462BBC 80 9F 05 7C */ lwz r4, 0x57c(r31) -/* 80462BC0 38 84 00 24 */ addi r4, r4, 0x24 -/* 80462BC4 4B EE 38 ED */ bl PSMTXCopy -/* 80462BC8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462BCC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462BD0 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80462BD4 D0 1F 05 E0 */ stfs f0, 0x5e0(r31) -/* 80462BD8 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80462BDC D0 1F 05 E4 */ stfs f0, 0x5e4(r31) -/* 80462BE0 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 80462BE4 D0 1F 05 E8 */ stfs f0, 0x5e8(r31) -/* 80462BE8 48 00 00 30 */ b lbl_80462C18 -lbl_80462BEC: -/* 80462BEC 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80462BF0 4B BA A1 75 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80462BF4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462BF8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462BFC A8 9F 06 70 */ lha r4, 0x670(r31) -/* 80462C00 4B BA 98 35 */ bl mDoMtx_YrotM__FPA4_fs -/* 80462C04 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80462C08 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80462C0C 80 9F 05 7C */ lwz r4, 0x57c(r31) -/* 80462C10 38 84 00 24 */ addi r4, r4, 0x24 -/* 80462C14 4B EE 38 9D */ bl PSMTXCopy -lbl_80462C18: -/* 80462C18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80462C1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80462C20 7C 08 03 A6 */ mtlr r0 -/* 80462C24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80462C28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx__12dDoor_stop_cFP10daDoor20_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx__12dDoor_stop_cFP10daDoor20_c.s deleted file mode 100644 index 8ef2931fdc..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx__12dDoor_stop_cFP10daDoor20_c.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_804660F4: -/* 804660F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804660F8 7C 08 02 A6 */ mflr r0 -/* 804660FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80466100 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80466104 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80466108 7C 7E 1B 78 */ mr r30, r3 -/* 8046610C 7C 9F 23 78 */ mr r31, r4 -/* 80466110 88 03 00 08 */ lbz r0, 8(r3) -/* 80466114 28 00 00 00 */ cmplwi r0, 0 -/* 80466118 41 82 00 80 */ beq lbl_80466198 -/* 8046611C 80 1E 00 00 */ lwz r0, 0(r30) -/* 80466120 28 00 00 00 */ cmplwi r0, 0 -/* 80466124 40 82 00 08 */ bne lbl_8046612C -/* 80466128 48 00 00 70 */ b lbl_80466198 -lbl_8046612C: -/* 8046612C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80466130 D0 21 00 08 */ stfs f1, 8(r1) -/* 80466134 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80466138 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 8046613C C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80466140 D0 61 00 10 */ stfs f3, 0x10(r1) -/* 80466144 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80466148 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8046614C C0 1E 00 04 */ lfs f0, 4(r30) -/* 80466150 EC 42 00 2A */ fadds f2, f2, f0 -/* 80466154 4B EE 07 95 */ bl PSMTXTrans -/* 80466158 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8046615C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80466160 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80466164 4B BA 62 D1 */ bl mDoMtx_YrotM__FPA4_fs -/* 80466168 88 1E 00 09 */ lbz r0, 9(r30) -/* 8046616C 28 00 00 01 */ cmplwi r0, 1 -/* 80466170 40 82 00 14 */ bne lbl_80466184 -/* 80466174 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80466178 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8046617C 38 80 7F FF */ li r4, 0x7fff -/* 80466180 4B BA 62 B5 */ bl mDoMtx_YrotM__FPA4_fs -lbl_80466184: -/* 80466184 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80466188 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8046618C 80 9E 00 00 */ lwz r4, 0(r30) -/* 80466190 38 84 00 24 */ addi r4, r4, 0x24 -/* 80466194 4B EE 03 1D */ bl PSMTXCopy -lbl_80466198: -/* 80466198 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8046619C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 804661A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804661A4 7C 08 03 A6 */ mtlr r0 -/* 804661A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 804661AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkArea__10daDoor20_cFfff.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkArea__10daDoor20_cFfff.s deleted file mode 100644 index c1e08f399a..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkArea__10daDoor20_cFfff.s +++ /dev/null @@ -1,107 +0,0 @@ -lbl_80465490: -/* 80465490 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80465494 7C 08 02 A6 */ mflr r0 -/* 80465498 90 01 00 94 */ stw r0, 0x94(r1) -/* 8046549C DB E1 00 80 */ stfd f31, 0x80(r1) -/* 804654A0 F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 804654A4 DB C1 00 70 */ stfd f30, 0x70(r1) -/* 804654A8 F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 /* qr0 */ -/* 804654AC DB A1 00 60 */ stfd f29, 0x60(r1) -/* 804654B0 F3 A1 00 68 */ psq_st f29, 104(r1), 0, 0 /* qr0 */ -/* 804654B4 DB 81 00 50 */ stfd f28, 0x50(r1) -/* 804654B8 F3 81 00 58 */ psq_st f28, 88(r1), 0, 0 /* qr0 */ -/* 804654BC 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 804654C0 93 C1 00 48 */ stw r30, 0x48(r1) -/* 804654C4 7C 7E 1B 78 */ mr r30, r3 -/* 804654C8 FF C0 08 90 */ fmr f30, f1 -/* 804654CC FF E0 10 90 */ fmr f31, f2 -/* 804654D0 FF 80 18 90 */ fmr f28, f3 -/* 804654D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804654D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804654DC 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 804654E0 C0 1F 05 50 */ lfs f0, 0x550(r31) -/* 804654E4 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 804654E8 C0 1F 05 54 */ lfs f0, 0x554(r31) -/* 804654EC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 804654F0 C0 1F 05 58 */ lfs f0, 0x558(r31) -/* 804654F4 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 804654F8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 804654FC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80465500 38 61 00 20 */ addi r3, r1, 0x20 -/* 80465504 38 81 00 2C */ addi r4, r1, 0x2c -/* 80465508 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8046550C 4B E0 16 29 */ bl __mi__4cXyzCFRC3Vec -/* 80465510 C0 41 00 20 */ lfs f2, 0x20(r1) -/* 80465514 D0 41 00 38 */ stfs f2, 0x38(r1) -/* 80465518 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 8046551C D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80465520 C0 21 00 28 */ lfs f1, 0x28(r1) -/* 80465524 D0 21 00 40 */ stfs f1, 0x40(r1) -/* 80465528 D0 41 00 08 */ stfs f2, 8(r1) -/* 8046552C 3C 60 80 46 */ lis r3, lit_4256@ha /* 0x8046682C@ha */ -/* 80465530 C0 03 68 2C */ lfs f0, lit_4256@l(r3) /* 0x8046682C@l */ -/* 80465534 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80465538 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8046553C 38 61 00 08 */ addi r3, r1, 8 -/* 80465540 4B EE 1B F9 */ bl PSVECSquareMag -/* 80465544 FF A0 08 90 */ fmr f29, f1 -/* 80465548 FC 1D E0 40 */ fcmpo cr0, f29, f28 -/* 8046554C 40 81 00 0C */ ble lbl_80465558 -/* 80465550 38 60 00 00 */ li r3, 0 -/* 80465554 48 00 00 94 */ b lbl_804655E8 -lbl_80465558: -/* 80465558 38 61 00 14 */ addi r3, r1, 0x14 -/* 8046555C 38 81 00 38 */ addi r4, r1, 0x38 -/* 80465560 4B E0 19 95 */ bl normalize__4cXyzFv -/* 80465564 C0 21 00 38 */ lfs f1, 0x38(r1) -/* 80465568 C0 1E 06 80 */ lfs f0, 0x680(r30) -/* 8046556C EC 41 00 32 */ fmuls f2, f1, f0 -/* 80465570 C0 21 00 40 */ lfs f1, 0x40(r1) -/* 80465574 C0 1E 06 88 */ lfs f0, 0x688(r30) -/* 80465578 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046557C EC 22 00 2A */ fadds f1, f2, f0 -/* 80465580 EC 1D 00 72 */ fmuls f0, f29, f1 -/* 80465584 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80465588 FC 00 F8 40 */ fcmpo cr0, f0, f31 -/* 8046558C 40 81 00 0C */ ble lbl_80465598 -/* 80465590 38 60 00 00 */ li r3, 0 -/* 80465594 48 00 00 54 */ b lbl_804655E8 -lbl_80465598: -/* 80465598 EC 1D 00 28 */ fsubs f0, f29, f0 -/* 8046559C FC 00 F0 40 */ fcmpo cr0, f0, f30 -/* 804655A0 40 81 00 0C */ ble lbl_804655AC -/* 804655A4 38 60 00 00 */ li r3, 0 -/* 804655A8 48 00 00 40 */ b lbl_804655E8 -lbl_804655AC: -/* 804655AC A8 7E 04 DE */ lha r3, 0x4de(r30) -/* 804655B0 88 1E 06 8C */ lbz r0, 0x68c(r30) -/* 804655B4 28 00 00 01 */ cmplwi r0, 1 -/* 804655B8 40 82 00 0C */ bne lbl_804655C4 -/* 804655BC 38 03 7F FF */ addi r0, r3, 0x7fff -/* 804655C0 7C 03 07 34 */ extsh r3, r0 -lbl_804655C4: -/* 804655C4 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 804655C8 7C 00 18 50 */ subf r0, r0, r3 -/* 804655CC 7C 03 07 34 */ extsh r3, r0 -/* 804655D0 4B EF FB 01 */ bl abs -/* 804655D4 2C 03 50 00 */ cmpwi r3, 0x5000 -/* 804655D8 40 80 00 0C */ bge lbl_804655E4 -/* 804655DC 38 60 00 00 */ li r3, 0 -/* 804655E0 48 00 00 08 */ b lbl_804655E8 -lbl_804655E4: -/* 804655E4 38 60 00 01 */ li r3, 1 -lbl_804655E8: -/* 804655E8 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 804655EC CB E1 00 80 */ lfd f31, 0x80(r1) -/* 804655F0 E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 /* qr0 */ -/* 804655F4 CB C1 00 70 */ lfd f30, 0x70(r1) -/* 804655F8 E3 A1 00 68 */ psq_l f29, 104(r1), 0, 0 /* qr0 */ -/* 804655FC CB A1 00 60 */ lfd f29, 0x60(r1) -/* 80465600 E3 81 00 58 */ psq_l f28, 88(r1), 0, 0 /* qr0 */ -/* 80465604 CB 81 00 50 */ lfd f28, 0x50(r1) -/* 80465608 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 8046560C 83 C1 00 48 */ lwz r30, 0x48(r1) -/* 80465610 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80465614 7C 08 03 A6 */ mtlr r0 -/* 80465618 38 21 00 90 */ addi r1, r1, 0x90 -/* 8046561C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkExecute__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkExecute__10daDoor20_cFv.s deleted file mode 100644 index 7f5e447b2a..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkExecute__10daDoor20_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80464E18: -/* 80464E18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80464E1C 7C 08 02 A6 */ mflr r0 -/* 80464E20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80464E24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80464E28 7C 7F 1B 78 */ mr r31, r3 -/* 80464E2C 4B FF FE 3D */ bl frontCheck__10daDoor20_cFv -/* 80464E30 98 7F 06 8C */ stb r3, 0x68c(r31) -/* 80464E34 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 80464E38 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 80464E3C 41 82 00 0C */ beq lbl_80464E48 -/* 80464E40 38 60 00 01 */ li r3, 1 -/* 80464E44 48 00 00 6C */ b lbl_80464EB0 -lbl_80464E48: -/* 80464E48 A0 1F 00 F8 */ lhz r0, 0xf8(r31) -/* 80464E4C 28 00 00 02 */ cmplwi r0, 2 -/* 80464E50 41 82 00 0C */ beq lbl_80464E5C -/* 80464E54 28 00 00 03 */ cmplwi r0, 3 -/* 80464E58 40 82 00 0C */ bne lbl_80464E64 -lbl_80464E5C: -/* 80464E5C 38 60 00 02 */ li r3, 2 -/* 80464E60 48 00 00 50 */ b lbl_80464EB0 -lbl_80464E64: -/* 80464E64 88 1F 06 7D */ lbz r0, 0x67d(r31) -/* 80464E68 7C 04 07 74 */ extsb r4, r0 -/* 80464E6C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80464E70 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80464E74 7C 00 07 74 */ extsb r0, r0 -/* 80464E78 7C 04 00 00 */ cmpw r4, r0 -/* 80464E7C 41 82 00 0C */ beq lbl_80464E88 -/* 80464E80 38 60 00 00 */ li r3, 0 -/* 80464E84 48 00 00 2C */ b lbl_80464EB0 -lbl_80464E88: -/* 80464E88 88 1F 06 8C */ lbz r0, 0x68c(r31) -/* 80464E8C 28 00 00 02 */ cmplwi r0, 2 -/* 80464E90 41 82 00 1C */ beq lbl_80464EAC -/* 80464E94 7F E3 FB 78 */ mr r3, r31 -/* 80464E98 4B FF FC A5 */ bl adjoinPlayer__10daDoor20_cFv -/* 80464E9C 2C 03 00 00 */ cmpwi r3, 0 -/* 80464EA0 41 82 00 0C */ beq lbl_80464EAC -/* 80464EA4 38 60 00 02 */ li r3, 2 -/* 80464EA8 48 00 00 08 */ b lbl_80464EB0 -lbl_80464EAC: -/* 80464EAC 38 60 00 00 */ li r3, 0 -lbl_80464EB0: -/* 80464EB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80464EB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80464EB8 7C 08 03 A6 */ mtlr r0 -/* 80464EBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80464EC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkOpenMsgDoor__10daDoor20_cFPi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkOpenMsgDoor__10daDoor20_cFPi.s deleted file mode 100644 index 5c4f74c7bf..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkOpenMsgDoor__10daDoor20_cFPi.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_804616EC: -/* 804616EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804616F0 7C 08 02 A6 */ mflr r0 -/* 804616F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804616F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804616FC 93 C1 00 08 */ stw r30, 8(r1) -/* 80461700 7C 7E 1B 78 */ mr r30, r3 -/* 80461704 7C 9F 23 78 */ mr r31, r4 -/* 80461708 4B BD 8A ED */ bl isMsgDoor__13door_param2_cFP10fopAc_ac_c -/* 8046170C 2C 03 00 00 */ cmpwi r3, 0 -/* 80461710 40 82 00 0C */ bne lbl_8046171C -/* 80461714 38 60 00 01 */ li r3, 1 -/* 80461718 48 00 00 5C */ b lbl_80461774 -lbl_8046171C: -/* 8046171C 7F C3 F3 78 */ mr r3, r30 -/* 80461720 4B BD 8A F9 */ bl getMsgNo__13door_param2_cFP10fopAc_ac_c -/* 80461724 54 65 04 3E */ clrlwi r5, r3, 0x10 -/* 80461728 3C 05 00 00 */ addis r0, r5, 0 -/* 8046172C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80461730 40 82 00 14 */ bne lbl_80461744 -/* 80461734 38 00 00 00 */ li r0, 0 -/* 80461738 90 1F 00 00 */ stw r0, 0(r31) -/* 8046173C 38 60 00 01 */ li r3, 1 -/* 80461740 48 00 00 34 */ b lbl_80461774 -lbl_80461744: -/* 80461744 38 7E 06 24 */ addi r3, r30, 0x624 -/* 80461748 38 80 00 00 */ li r4, 0 -/* 8046174C 38 C0 00 00 */ li r6, 0 -/* 80461750 38 E0 00 00 */ li r7, 0 -/* 80461754 4B DE 88 3D */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80461758 38 7E 06 24 */ addi r3, r30, 0x624 -/* 8046175C 7F C4 F3 78 */ mr r4, r30 -/* 80461760 7F E5 FB 78 */ mr r5, r31 -/* 80461764 4B DE 89 D9 */ bl checkOpenDoor__10dMsgFlow_cFP10fopAc_ac_cPi -/* 80461768 7C 7F 1B 78 */ mr r31, r3 -/* 8046176C 4B DD 69 2D */ bl endFlowGroup__12dMsgObject_cFv -/* 80461770 7F E3 FB 78 */ mr r3, r31 -lbl_80461774: -/* 80461774 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80461778 83 C1 00 08 */ lwz r30, 8(r1) -/* 8046177C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80461780 7C 08 03 A6 */ mtlr r0 -/* 80461784 38 21 00 10 */ addi r1, r1, 0x10 -/* 80461788 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkMakeKey__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkMakeKey__10daDoor20_cFv.s deleted file mode 100644 index 1d44823efa..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkMakeKey__10daDoor20_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8046609C: -/* 8046609C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804660A0 7C 08 02 A6 */ mflr r0 -/* 804660A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804660A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804660AC 7C 7F 1B 78 */ mr r31, r3 -/* 804660B0 4B BD 40 F1 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 804660B4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 804660B8 28 00 00 02 */ cmplwi r0, 2 -/* 804660BC 41 82 00 18 */ beq lbl_804660D4 -/* 804660C0 7F E3 FB 78 */ mr r3, r31 -/* 804660C4 4B BD 40 E9 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 804660C8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 804660CC 28 00 00 02 */ cmplwi r0, 2 -/* 804660D0 40 82 00 0C */ bne lbl_804660DC -lbl_804660D4: -/* 804660D4 38 60 00 01 */ li r3, 1 -/* 804660D8 48 00 00 08 */ b lbl_804660E0 -lbl_804660DC: -/* 804660DC 38 60 00 00 */ li r3, 0 -lbl_804660E0: -/* 804660E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804660E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804660E8 7C 08 03 A6 */ mtlr r0 -/* 804660EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 804660F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkMakeStop__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkMakeStop__10daDoor20_cFv.s deleted file mode 100644 index 17b28a18b7..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkMakeStop__10daDoor20_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80465AC0: -/* 80465AC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80465AC4 7C 08 02 A6 */ mflr r0 -/* 80465AC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80465ACC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80465AD0 93 C1 00 08 */ stw r30, 8(r1) -/* 80465AD4 7C 7E 1B 78 */ mr r30, r3 -/* 80465AD8 4B BD 46 C9 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80465ADC 7C 7F 1B 78 */ mr r31, r3 -/* 80465AE0 7F C3 F3 78 */ mr r3, r30 -/* 80465AE4 4B BD 46 C9 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80465AE8 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80465AEC 28 00 00 01 */ cmplwi r0, 1 -/* 80465AF0 41 82 00 20 */ beq lbl_80465B10 -/* 80465AF4 28 00 00 03 */ cmplwi r0, 3 -/* 80465AF8 41 82 00 18 */ beq lbl_80465B10 -/* 80465AFC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80465B00 28 00 00 01 */ cmplwi r0, 1 -/* 80465B04 41 82 00 0C */ beq lbl_80465B10 -/* 80465B08 28 00 00 03 */ cmplwi r0, 3 -/* 80465B0C 40 82 00 0C */ bne lbl_80465B18 -lbl_80465B10: -/* 80465B10 38 60 00 01 */ li r3, 1 -/* 80465B14 48 00 00 08 */ b lbl_80465B1C -lbl_80465B18: -/* 80465B18 38 60 00 00 */ li r3, 0 -lbl_80465B1C: -/* 80465B1C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80465B20 83 C1 00 08 */ lwz r30, 8(r1) -/* 80465B24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80465B28 7C 08 03 A6 */ mtlr r0 -/* 80465B2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80465B30 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopB__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopB__10daDoor20_cFv.s deleted file mode 100644 index 46f86779a3..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopB__10daDoor20_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80465C04: -/* 80465C04 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80465C08 7C 08 02 A6 */ mflr r0 -/* 80465C0C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80465C10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80465C14 4B EF C5 C9 */ bl _savegpr_29 -/* 80465C18 7C 7D 1B 78 */ mr r29, r3 -/* 80465C1C 4B BD 45 C1 */ bl getSwbit2__13door_param2_cFP10fopAc_ac_c -/* 80465C20 7C 7F 1B 78 */ mr r31, r3 -/* 80465C24 7F A3 EB 78 */ mr r3, r29 -/* 80465C28 4B BD 45 9D */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80465C2C 54 7E 06 3E */ clrlwi r30, r3, 0x18 -/* 80465C30 7F A3 EB 78 */ mr r3, r29 -/* 80465C34 4B BD 45 79 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80465C38 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80465C3C 28 00 00 FF */ cmplwi r0, 0xff -/* 80465C40 40 82 00 0C */ bne lbl_80465C4C -/* 80465C44 38 60 00 00 */ li r3, 0 -/* 80465C48 48 00 00 60 */ b lbl_80465CA8 -lbl_80465C4C: -/* 80465C4C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80465C50 28 00 00 01 */ cmplwi r0, 1 -/* 80465C54 41 82 00 14 */ beq lbl_80465C68 -/* 80465C58 28 00 00 03 */ cmplwi r0, 3 -/* 80465C5C 41 82 00 0C */ beq lbl_80465C68 -/* 80465C60 38 60 00 00 */ li r3, 0 -/* 80465C64 48 00 00 44 */ b lbl_80465CA8 -lbl_80465C68: -/* 80465C68 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 80465C6C 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 80465C70 1C 1E 04 04 */ mulli r0, r30, 0x404 -/* 80465C74 7C 63 02 14 */ add r3, r3, r0 -/* 80465C78 88 03 03 F4 */ lbz r0, 0x3f4(r3) -/* 80465C7C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80465C80 40 82 00 0C */ bne lbl_80465C8C -/* 80465C84 38 60 FF FF */ li r3, -1 -/* 80465C88 48 00 00 20 */ b lbl_80465CA8 -lbl_80465C8C: -/* 80465C8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465C90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465C94 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 80465C98 7F C5 F3 78 */ mr r5, r30 -/* 80465C9C 4B BC F6 C5 */ bl isSwitch__10dSv_info_cCFii -/* 80465CA0 7C 60 00 34 */ cntlzw r0, r3 -/* 80465CA4 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -lbl_80465CA8: -/* 80465CA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80465CAC 4B EF C5 7D */ bl _restgpr_29 -/* 80465CB0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80465CB4 7C 08 03 A6 */ mtlr r0 -/* 80465CB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80465CBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopClose__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopClose__10daDoor20_cFv.s deleted file mode 100644 index c1bf029b38..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopClose__10daDoor20_cFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_80465DA8: -/* 80465DA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80465DAC 7C 08 02 A6 */ mflr r0 -/* 80465DB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80465DB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80465DB8 93 C1 00 08 */ stw r30, 8(r1) -/* 80465DBC 7C 7E 1B 78 */ mr r30, r3 -/* 80465DC0 80 03 06 D0 */ lwz r0, 0x6d0(r3) -/* 80465DC4 28 00 00 00 */ cmplwi r0, 0 -/* 80465DC8 40 82 00 0C */ bne lbl_80465DD4 -/* 80465DCC 38 60 00 00 */ li r3, 0 -/* 80465DD0 48 00 00 A4 */ b lbl_80465E74 -lbl_80465DD4: -/* 80465DD4 4B BD 43 CD */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80465DD8 54 7F 06 3E */ clrlwi r31, r3, 0x18 -/* 80465DDC 7F C3 F3 78 */ mr r3, r30 -/* 80465DE0 4B BD 43 CD */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80465DE4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 80465DE8 88 1E 06 8C */ lbz r0, 0x68c(r30) -/* 80465DEC 28 00 00 00 */ cmplwi r0, 0 -/* 80465DF0 40 82 00 30 */ bne lbl_80465E20 -/* 80465DF4 2C 1F 00 01 */ cmpwi r31, 1 -/* 80465DF8 41 82 00 0C */ beq lbl_80465E04 -/* 80465DFC 38 60 00 00 */ li r3, 0 -/* 80465E00 48 00 00 74 */ b lbl_80465E74 -lbl_80465E04: -/* 80465E04 7F C3 F3 78 */ mr r3, r30 -/* 80465E08 4B BD 43 C9 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80465E0C 7C 7F 1B 78 */ mr r31, r3 -/* 80465E10 7F C3 F3 78 */ mr r3, r30 -/* 80465E14 4B BD 43 A5 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80465E18 7C 60 1B 78 */ mr r0, r3 -/* 80465E1C 48 00 00 2C */ b lbl_80465E48 -lbl_80465E20: -/* 80465E20 2C 03 00 01 */ cmpwi r3, 1 -/* 80465E24 41 82 00 0C */ beq lbl_80465E30 -/* 80465E28 38 60 00 00 */ li r3, 0 -/* 80465E2C 48 00 00 48 */ b lbl_80465E74 -lbl_80465E30: -/* 80465E30 7F C3 F3 78 */ mr r3, r30 -/* 80465E34 4B BD 43 A9 */ bl getSwbit2__13door_param2_cFP10fopAc_ac_c -/* 80465E38 7C 7F 1B 78 */ mr r31, r3 -/* 80465E3C 7F C3 F3 78 */ mr r3, r30 -/* 80465E40 4B BD 43 85 */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80465E44 7C 60 1B 78 */ mr r0, r3 -lbl_80465E48: -/* 80465E48 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 80465E4C 28 04 00 FF */ cmplwi r4, 0xff -/* 80465E50 40 82 00 0C */ bne lbl_80465E5C -/* 80465E54 38 60 00 00 */ li r3, 0 -/* 80465E58 48 00 00 1C */ b lbl_80465E74 -lbl_80465E5C: -/* 80465E5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465E60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465E64 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 80465E68 4B BC F4 F9 */ bl isSwitch__10dSv_info_cCFii -/* 80465E6C 7C 60 00 34 */ cntlzw r0, r3 -/* 80465E70 54 03 D9 7E */ srwi r3, r0, 5 -lbl_80465E74: -/* 80465E74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80465E78 83 C1 00 08 */ lwz r30, 8(r1) -/* 80465E7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80465E80 7C 08 03 A6 */ mtlr r0 -/* 80465E84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80465E88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopF__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopF__10daDoor20_cFv.s deleted file mode 100644 index 155f6ae792..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopF__10daDoor20_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80465B34: -/* 80465B34 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80465B38 7C 08 02 A6 */ mflr r0 -/* 80465B3C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80465B40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80465B44 4B EF C6 99 */ bl _savegpr_29 -/* 80465B48 7C 7D 1B 78 */ mr r29, r3 -/* 80465B4C 4B BD 46 6D */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80465B50 54 7E 06 3E */ clrlwi r30, r3, 0x18 -/* 80465B54 7F A3 EB 78 */ mr r3, r29 -/* 80465B58 4B BD 46 49 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80465B5C 7C 7F 1B 78 */ mr r31, r3 -/* 80465B60 7F A3 EB 78 */ mr r3, r29 -/* 80465B64 4B BD 46 6D */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80465B68 7C 64 1B 78 */ mr r4, r3 -/* 80465B6C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80465B70 28 00 00 FF */ cmplwi r0, 0xff -/* 80465B74 40 82 00 0C */ bne lbl_80465B80 -/* 80465B78 38 60 00 00 */ li r3, 0 -/* 80465B7C 48 00 00 70 */ b lbl_80465BEC -lbl_80465B80: -/* 80465B80 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80465B84 2C 00 00 02 */ cmpwi r0, 2 -/* 80465B88 41 82 00 60 */ beq lbl_80465BE8 -/* 80465B8C 40 80 00 10 */ bge lbl_80465B9C -/* 80465B90 2C 00 00 01 */ cmpwi r0, 1 -/* 80465B94 40 80 00 10 */ bge lbl_80465BA4 -/* 80465B98 48 00 00 50 */ b lbl_80465BE8 -lbl_80465B9C: -/* 80465B9C 2C 00 00 04 */ cmpwi r0, 4 -/* 80465BA0 40 80 00 48 */ bge lbl_80465BE8 -lbl_80465BA4: -/* 80465BA4 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 80465BA8 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 80465BAC 1C 1E 04 04 */ mulli r0, r30, 0x404 -/* 80465BB0 7C 63 02 14 */ add r3, r3, r0 -/* 80465BB4 88 03 03 F4 */ lbz r0, 0x3f4(r3) -/* 80465BB8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80465BBC 40 82 00 0C */ bne lbl_80465BC8 -/* 80465BC0 38 60 FF FF */ li r3, -1 -/* 80465BC4 48 00 00 28 */ b lbl_80465BEC -lbl_80465BC8: -/* 80465BC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465BCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465BD0 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80465BD4 7F C5 F3 78 */ mr r5, r30 -/* 80465BD8 4B BC F7 89 */ bl isSwitch__10dSv_info_cCFii -/* 80465BDC 7C 60 00 34 */ cntlzw r0, r3 -/* 80465BE0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 80465BE4 48 00 00 08 */ b lbl_80465BEC -lbl_80465BE8: -/* 80465BE8 38 60 00 00 */ li r3, 0 -lbl_80465BEC: -/* 80465BEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80465BF0 4B EF C6 39 */ bl _restgpr_29 -/* 80465BF4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80465BF8 7C 08 03 A6 */ mtlr r0 -/* 80465BFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80465C00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopOpen__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopOpen__10daDoor20_cFv.s deleted file mode 100644 index e3a0281426..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopOpen__10daDoor20_cFv.s +++ /dev/null @@ -1,107 +0,0 @@ -lbl_80465F20: -/* 80465F20 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80465F24 7C 08 02 A6 */ mflr r0 -/* 80465F28 90 01 00 24 */ stw r0, 0x24(r1) -/* 80465F2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80465F30 4B EF C2 A5 */ bl _savegpr_27 -/* 80465F34 7C 7F 1B 78 */ mr r31, r3 -/* 80465F38 4B BD 42 69 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80465F3C 7C 7D 1B 78 */ mr r29, r3 -/* 80465F40 7F E3 FB 78 */ mr r3, r31 -/* 80465F44 4B BD 42 69 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80465F48 7C 7E 1B 78 */ mr r30, r3 -/* 80465F4C 88 1F 06 8C */ lbz r0, 0x68c(r31) -/* 80465F50 28 00 00 00 */ cmplwi r0, 0 -/* 80465F54 40 82 00 20 */ bne lbl_80465F74 -/* 80465F58 7F E3 FB 78 */ mr r3, r31 -/* 80465F5C 4B BD 42 75 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80465F60 7C 7C 1B 78 */ mr r28, r3 -/* 80465F64 7F E3 FB 78 */ mr r3, r31 -/* 80465F68 4B BD 42 51 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80465F6C 7C 7B 1B 78 */ mr r27, r3 -/* 80465F70 48 00 00 1C */ b lbl_80465F8C -lbl_80465F74: -/* 80465F74 7F E3 FB 78 */ mr r3, r31 -/* 80465F78 4B BD 42 65 */ bl getSwbit2__13door_param2_cFP10fopAc_ac_c -/* 80465F7C 7C 7C 1B 78 */ mr r28, r3 -/* 80465F80 7F E3 FB 78 */ mr r3, r31 -/* 80465F84 4B BD 42 41 */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80465F88 7C 7B 1B 78 */ mr r27, r3 -lbl_80465F8C: -/* 80465F8C 88 7F 06 8C */ lbz r3, 0x68c(r31) -/* 80465F90 28 03 00 00 */ cmplwi r3, 0 -/* 80465F94 40 82 00 10 */ bne lbl_80465FA4 -/* 80465F98 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80465F9C 28 00 00 03 */ cmplwi r0, 3 -/* 80465FA0 41 82 00 18 */ beq lbl_80465FB8 -lbl_80465FA4: -/* 80465FA4 28 03 00 01 */ cmplwi r3, 1 -/* 80465FA8 40 82 00 AC */ bne lbl_80466054 -/* 80465FAC 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80465FB0 28 00 00 03 */ cmplwi r0, 3 -/* 80465FB4 40 82 00 A0 */ bne lbl_80466054 -lbl_80465FB8: -/* 80465FB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465FBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465FC0 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80465FC4 28 00 00 00 */ cmplwi r0, 0 -/* 80465FC8 41 82 00 10 */ beq lbl_80465FD8 -/* 80465FCC 88 1F 06 8D */ lbz r0, 0x68d(r31) -/* 80465FD0 28 00 00 00 */ cmplwi r0, 0 -/* 80465FD4 40 82 00 AC */ bne lbl_80466080 -lbl_80465FD8: -/* 80465FD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465FDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465FE0 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 80465FE4 57 7D 06 3E */ clrlwi r29, r27, 0x18 -/* 80465FE8 7F A4 EB 78 */ mr r4, r29 -/* 80465FEC 4B BB E4 FD */ bl checkRoomDisp__20dStage_roomControl_cCFi -/* 80465FF0 2C 03 00 00 */ cmpwi r3, 0 -/* 80465FF4 41 82 00 54 */ beq lbl_80466048 -/* 80465FF8 7F 63 07 74 */ extsb r3, r27 -/* 80465FFC 4B BB 6A 21 */ bl fopAcM_myRoomSearchEnemy__FSc -/* 80466000 28 03 00 00 */ cmplwi r3, 0 -/* 80466004 40 82 00 44 */ bne lbl_80466048 -/* 80466008 88 7F 06 8D */ lbz r3, 0x68d(r31) -/* 8046600C 28 03 00 00 */ cmplwi r3, 0 -/* 80466010 41 82 00 14 */ beq lbl_80466024 -/* 80466014 38 03 FF FF */ addi r0, r3, -1 -/* 80466018 98 1F 06 8D */ stb r0, 0x68d(r31) -/* 8046601C 38 60 00 00 */ li r3, 0 -/* 80466020 48 00 00 64 */ b lbl_80466084 -lbl_80466024: -/* 80466024 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 80466028 28 04 00 FF */ cmplwi r4, 0xff -/* 8046602C 41 82 00 14 */ beq lbl_80466040 -/* 80466030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80466034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80466038 7F A5 EB 78 */ mr r5, r29 -/* 8046603C 4B BC F1 C5 */ bl onSwitch__10dSv_info_cFii -lbl_80466040: -/* 80466040 38 60 00 01 */ li r3, 1 -/* 80466044 48 00 00 40 */ b lbl_80466084 -lbl_80466048: -/* 80466048 38 00 00 41 */ li r0, 0x41 -/* 8046604C 98 1F 06 8D */ stb r0, 0x68d(r31) -/* 80466050 48 00 00 30 */ b lbl_80466080 -lbl_80466054: -/* 80466054 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 80466058 28 04 00 FF */ cmplwi r4, 0xff -/* 8046605C 41 82 00 24 */ beq lbl_80466080 -/* 80466060 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80466064 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80466068 57 65 06 3E */ clrlwi r5, r27, 0x18 -/* 8046606C 4B BC F2 F5 */ bl isSwitch__10dSv_info_cCFii -/* 80466070 2C 03 00 00 */ cmpwi r3, 0 -/* 80466074 41 82 00 0C */ beq lbl_80466080 -/* 80466078 38 60 00 01 */ li r3, 1 -/* 8046607C 48 00 00 08 */ b lbl_80466084 -lbl_80466080: -/* 80466080 38 60 00 00 */ li r3, 0 -lbl_80466084: -/* 80466084 39 61 00 20 */ addi r11, r1, 0x20 -/* 80466088 4B EF C1 99 */ bl _restgpr_27 -/* 8046608C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80466090 7C 08 03 A6 */ mtlr r0 -/* 80466094 38 21 00 20 */ addi r1, r1, 0x20 -/* 80466098 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd2__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd2__10daDoor20_cFv.s deleted file mode 100644 index 383419b907..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd2__10daDoor20_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80462A1C: -/* 80462A1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80462A20 7C 08 02 A6 */ mflr r0 -/* 80462A24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80462A28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80462A2C 7C 7F 1B 78 */ mr r31, r3 -/* 80462A30 A0 03 06 8E */ lhz r0, 0x68e(r3) -/* 80462A34 54 00 04 3C */ rlwinm r0, r0, 0, 0x10, 0x1e -/* 80462A38 B0 03 06 8E */ sth r0, 0x68e(r3) -/* 80462A3C 48 00 2C B5 */ bl closeEndCom__10daDoor20_cFv -/* 80462A40 7F E3 FB 78 */ mr r3, r31 -/* 80462A44 48 00 20 A1 */ bl deleteKey__10daDoor20_cFv -/* 80462A48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80462A4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80462A50 7C 08 03 A6 */ mtlr r0 -/* 80462A54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80462A58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEndCom__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEndCom__10daDoor20_cFv.s deleted file mode 100644 index e9850c13e5..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEndCom__10daDoor20_cFv.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_804656F0: -/* 804656F0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 804656F4 7C 08 02 A6 */ mflr r0 -/* 804656F8 90 01 00 54 */ stw r0, 0x54(r1) -/* 804656FC DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80465700 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80465704 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80465708 93 C1 00 38 */ stw r30, 0x38(r1) -/* 8046570C 7C 7F 1B 78 */ mr r31, r3 -/* 80465710 88 03 06 7E */ lbz r0, 0x67e(r3) -/* 80465714 88 63 06 7F */ lbz r3, 0x67f(r3) -/* 80465718 7C 00 18 40 */ cmplw r0, r3 -/* 8046571C 41 82 00 30 */ beq lbl_8046574C -/* 80465720 28 00 00 3F */ cmplwi r0, 0x3f -/* 80465724 41 82 00 28 */ beq lbl_8046574C -/* 80465728 28 03 00 3F */ cmplwi r3, 0x3f -/* 8046572C 41 82 00 20 */ beq lbl_8046574C -/* 80465730 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 80465734 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 80465738 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 8046573C 7C 63 02 14 */ add r3, r3, r0 -/* 80465740 88 03 03 F4 */ lbz r0, 0x3f4(r3) -/* 80465744 60 00 00 08 */ ori r0, r0, 8 -/* 80465748 98 03 03 F4 */ stb r0, 0x3f4(r3) -lbl_8046574C: -/* 8046574C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465750 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465754 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 80465758 38 61 00 08 */ addi r3, r1, 8 -/* 8046575C 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80465760 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80465764 4B E0 13 D1 */ bl __mi__4cXyzCFRC3Vec -/* 80465768 C0 21 00 08 */ lfs f1, 8(r1) -/* 8046576C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80465770 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80465774 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80465778 C0 41 00 10 */ lfs f2, 0x10(r1) -/* 8046577C D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80465780 C0 1F 06 80 */ lfs f0, 0x680(r31) -/* 80465784 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80465788 C0 1F 06 88 */ lfs f0, 0x688(r31) -/* 8046578C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80465790 EF E1 00 2A */ fadds f31, f1, f0 -/* 80465794 7F E3 FB 78 */ mr r3, r31 -/* 80465798 38 81 00 20 */ addi r4, r1, 0x20 -/* 8046579C 48 00 00 81 */ bl getRestartPos__10daDoor20_cFP4cXyz -/* 804657A0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804657A4 7C 06 07 74 */ extsb r6, r0 -/* 804657A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804657AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804657B0 38 63 0D B4 */ addi r3, r3, 0xdb4 -/* 804657B4 38 81 00 20 */ addi r4, r1, 0x20 -/* 804657B8 3C A0 80 46 */ lis r5, lit_4256@ha /* 0x8046682C@ha */ -/* 804657BC C0 05 68 2C */ lfs f0, lit_4256@l(r5) /* 0x8046682C@l */ -/* 804657C0 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 804657C4 40 81 00 0C */ ble lbl_804657D0 -/* 804657C8 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 804657CC 48 00 00 14 */ b lbl_804657E0 -lbl_804657D0: -/* 804657D0 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 804657D4 3C A5 00 01 */ addis r5, r5, 1 -/* 804657D8 38 05 80 00 */ addi r0, r5, -32768 -/* 804657DC 7C 05 07 34 */ extsh r5, r0 -lbl_804657E0: -/* 804657E0 4B BC F7 A1 */ bl setRoom__13dSv_restart_cFRC4cXyzsSc -/* 804657E4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804657E8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804657EC 80 63 00 00 */ lwz r3, 0(r3) -/* 804657F0 38 63 04 A4 */ addi r3, r3, 0x4a4 -/* 804657F4 38 80 00 01 */ li r4, 1 -/* 804657F8 4B E5 10 E9 */ bl setSceneExist__10Z2SceneMgrFb -/* 804657FC E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80465800 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80465804 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80465808 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 8046580C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80465810 7C 08 03 A6 */ mtlr r0 -/* 80465814 38 21 00 50 */ addi r1, r1, 0x50 -/* 80465818 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd_1__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd_1__10daDoor20_cFv.s deleted file mode 100644 index 3d6ed5326c..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd_1__10daDoor20_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_804627EC: -/* 804627EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804627F0 7C 08 02 A6 */ mflr r0 -/* 804627F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 804627F8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 804627FC 7C 7F 1B 78 */ mr r31, r3 -/* 80462800 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 80462804 7C 03 07 74 */ extsb r3, r0 -/* 80462808 4B BC A8 65 */ bl dComIfGp_getReverb__Fi -/* 8046280C 7C 67 1B 78 */ mr r7, r3 -/* 80462810 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800B5@ha */ -/* 80462814 38 03 00 B5 */ addi r0, r3, 0x00B5 /* 0x000800B5@l */ -/* 80462818 90 01 00 08 */ stw r0, 8(r1) -/* 8046281C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80462820 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80462824 80 63 00 00 */ lwz r3, 0(r3) -/* 80462828 38 81 00 08 */ addi r4, r1, 8 -/* 8046282C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80462830 38 C0 00 00 */ li r6, 0 -/* 80462834 3D 00 80 46 */ lis r8, lit_4124@ha /* 0x80466824@ha */ -/* 80462838 C0 28 68 24 */ lfs f1, lit_4124@l(r8) /* 0x80466824@l */ -/* 8046283C FC 40 08 90 */ fmr f2, f1 -/* 80462840 3D 00 80 46 */ lis r8, lit_4609@ha /* 0x80466870@ha */ -/* 80462844 C0 68 68 70 */ lfs f3, lit_4609@l(r8) /* 0x80466870@l */ -/* 80462848 FC 80 18 90 */ fmr f4, f3 -/* 8046284C 39 00 00 00 */ li r8, 0 -/* 80462850 4B E4 91 35 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80462854 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80462858 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8046285C 7C 08 03 A6 */ mtlr r0 -/* 80462860 38 21 00 20 */ addi r1, r1, 0x20 -/* 80462864 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd__10daDoor20_cFi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd__10daDoor20_cFi.s deleted file mode 100644 index 37846a1b65..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd__10daDoor20_cFi.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80462868: -/* 80462868 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8046286C 7C 08 02 A6 */ mflr r0 -/* 80462870 90 01 00 24 */ stw r0, 0x24(r1) -/* 80462874 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80462878 7C 7F 1B 78 */ mr r31, r3 -/* 8046287C A0 03 06 8E */ lhz r0, 0x68e(r3) -/* 80462880 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 80462884 B0 03 06 8E */ sth r0, 0x68e(r3) -/* 80462888 48 00 2E 69 */ bl closeEndCom__10daDoor20_cFv -/* 8046288C 3C 60 80 46 */ lis r3, lit_4256@ha /* 0x8046682C@ha */ -/* 80462890 C0 23 68 2C */ lfs f1, lit_4256@l(r3) /* 0x8046682C@l */ -/* 80462894 D0 21 00 08 */ stfs f1, 8(r1) -/* 80462898 3C 60 80 46 */ lis r3, lit_4124@ha /* 0x80466824@ha */ -/* 8046289C C0 03 68 24 */ lfs f0, lit_4124@l(r3) /* 0x80466824@l */ -/* 804628A0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 804628A4 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 804628A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804628AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804628B0 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 804628B4 38 80 00 04 */ li r4, 4 -/* 804628B8 38 A0 00 1F */ li r5, 0x1f -/* 804628BC 38 C1 00 08 */ addi r6, r1, 8 -/* 804628C0 4B C0 D1 65 */ bl StartShock__12dVibration_cFii4cXyz -/* 804628C4 7F E3 FB 78 */ mr r3, r31 -/* 804628C8 4B BD 78 C1 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 804628CC 28 03 00 0C */ cmplwi r3, 0xc -/* 804628D0 41 81 00 1C */ bgt lbl_804628EC -/* 804628D4 3C 80 80 46 */ lis r4, lit_4776@ha /* 0x80466FA0@ha */ -/* 804628D8 38 84 6F A0 */ addi r4, r4, lit_4776@l /* 0x80466FA0@l */ -/* 804628DC 54 60 10 3A */ slwi r0, r3, 2 -/* 804628E0 7C 04 00 2E */ lwzx r0, r4, r0 -/* 804628E4 7C 09 03 A6 */ mtctr r0 -/* 804628E8 4E 80 04 20 */ bctr -lbl_804628EC: -/* 804628EC 7F E3 FB 78 */ mr r3, r31 -/* 804628F0 4B FF FE F9 */ bl closeEnd_0__10daDoor20_cFv -/* 804628F4 48 00 00 0C */ b lbl_80462900 -lbl_804628F8: -/* 804628F8 7F E3 FB 78 */ mr r3, r31 -/* 804628FC 4B FF FE F1 */ bl closeEnd_1__10daDoor20_cFv -lbl_80462900: -/* 80462900 7F E3 FB 78 */ mr r3, r31 -/* 80462904 48 00 21 E1 */ bl deleteKey__10daDoor20_cFv -/* 80462908 7F E3 FB 78 */ mr r3, r31 -/* 8046290C 48 00 1D 2D */ bl setDoorAngleSpec__10daDoor20_cFv -/* 80462910 38 60 00 01 */ li r3, 1 -/* 80462914 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80462918 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8046291C 7C 08 03 A6 */ mtlr r0 -/* 80462920 38 21 00 20 */ addi r1, r1, 0x20 -/* 80462924 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_0__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_0__10daDoor20_cFv.s deleted file mode 100644 index 9264b2c060..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_0__10daDoor20_cFv.s +++ /dev/null @@ -1,189 +0,0 @@ -lbl_80462398: -/* 80462398 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8046239C 7C 08 02 A6 */ mflr r0 -/* 804623A0 90 01 00 54 */ stw r0, 0x54(r1) -/* 804623A4 39 61 00 50 */ addi r11, r1, 0x50 -/* 804623A8 4B EF FE 35 */ bl _savegpr_29 -/* 804623AC 7C 7F 1B 78 */ mr r31, r3 -/* 804623B0 3C 80 80 46 */ lis r4, lit_4018@ha /* 0x80466820@ha */ -/* 804623B4 3B C4 68 20 */ addi r30, r4, lit_4018@l /* 0x80466820@l */ -/* 804623B8 4B BD 7D D1 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 804623BC 2C 03 00 0A */ cmpwi r3, 0xa -/* 804623C0 40 82 00 38 */ bne lbl_804623F8 -/* 804623C4 7F E3 FB 78 */ mr r3, r31 -/* 804623C8 4B FF E7 DD */ bl getArcName__10daDoor20_cFv -/* 804623CC 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 804623D0 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 804623D4 38 84 01 1C */ addi r4, r4, 0x11c -/* 804623D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804623DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804623E0 3C A5 00 02 */ addis r5, r5, 2 -/* 804623E4 38 C0 00 80 */ li r6, 0x80 -/* 804623E8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 804623EC 4B BD 9F 91 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 804623F0 7C 64 1B 78 */ mr r4, r3 -/* 804623F4 48 00 00 34 */ b lbl_80462428 -lbl_804623F8: -/* 804623F8 7F E3 FB 78 */ mr r3, r31 -/* 804623FC 4B FF E7 A9 */ bl getArcName__10daDoor20_cFv -/* 80462400 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80462404 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80462408 38 84 01 2E */ addi r4, r4, 0x12e -/* 8046240C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80462410 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80462414 3C A5 00 02 */ addis r5, r5, 2 -/* 80462418 38 C0 00 80 */ li r6, 0x80 -/* 8046241C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80462420 4B BD 9F 5D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80462424 7C 64 1B 78 */ mr r4, r3 -lbl_80462428: -/* 80462428 38 7F 05 84 */ addi r3, r31, 0x584 -/* 8046242C 38 A0 00 01 */ li r5, 1 -/* 80462430 38 C0 00 00 */ li r6, 0 -/* 80462434 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80462438 38 E0 00 00 */ li r7, 0 -/* 8046243C 39 00 FF FF */ li r8, -1 -/* 80462440 39 20 00 01 */ li r9, 1 -/* 80462444 4B BA B3 99 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80462448 C0 5F 04 B0 */ lfs f2, 0x4b0(r31) -/* 8046244C C0 3E 00 58 */ lfs f1, 0x58(r30) -/* 80462450 C0 1F 04 AC */ lfs f0, 0x4ac(r31) -/* 80462454 EC 21 00 2A */ fadds f1, f1, f0 -/* 80462458 C0 1F 04 A8 */ lfs f0, 0x4a8(r31) -/* 8046245C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80462460 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 80462464 D0 41 00 30 */ stfs f2, 0x30(r1) -/* 80462468 38 61 00 28 */ addi r3, r1, 0x28 -/* 8046246C 4B BB B9 19 */ bl waterCheck__11fopAcM_wt_cFPC4cXyz -/* 80462470 7C 7D 1B 78 */ mr r29, r3 -/* 80462474 38 61 00 28 */ addi r3, r1, 0x28 -/* 80462478 4B BB B8 45 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 8046247C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80462480 41 82 00 6C */ beq lbl_804624EC -/* 80462484 3C 60 80 45 */ lis r3, mWaterY__11fopAcM_wt_c@ha /* 0x80450CD8@ha */ -/* 80462488 C0 23 0C D8 */ lfs f1, mWaterY__11fopAcM_wt_c@l(r3) /* 0x80450CD8@l */ -/* 8046248C 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80462490 C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 80462494 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80462498 40 81 00 54 */ ble lbl_804624EC -/* 8046249C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804624A0 7C 03 07 74 */ extsb r3, r0 -/* 804624A4 4B BC AB C9 */ bl dComIfGp_getReverb__Fi -/* 804624A8 7C 67 1B 78 */ mr r7, r3 -/* 804624AC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080196@ha */ -/* 804624B0 38 03 01 96 */ addi r0, r3, 0x0196 /* 0x00080196@l */ -/* 804624B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 804624B8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804624BC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804624C0 80 63 00 00 */ lwz r3, 0(r3) -/* 804624C4 38 81 00 24 */ addi r4, r1, 0x24 -/* 804624C8 38 BF 05 38 */ addi r5, r31, 0x538 -/* 804624CC 38 C0 00 00 */ li r6, 0 -/* 804624D0 C0 3E 00 04 */ lfs f1, 4(r30) -/* 804624D4 FC 40 08 90 */ fmr f2, f1 -/* 804624D8 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 804624DC FC 80 18 90 */ fmr f4, f3 -/* 804624E0 39 00 00 00 */ li r8, 0 -/* 804624E4 4B E4 94 A1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804624E8 48 00 01 10 */ b lbl_804625F8 -lbl_804624EC: -/* 804624EC 7F E3 FB 78 */ mr r3, r31 -/* 804624F0 4B BD 7C 99 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 804624F4 2C 03 00 02 */ cmpwi r3, 2 -/* 804624F8 40 82 00 54 */ bne lbl_8046254C -/* 804624FC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80462500 7C 03 07 74 */ extsb r3, r0 -/* 80462504 4B BC AB 69 */ bl dComIfGp_getReverb__Fi -/* 80462508 7C 67 1B 78 */ mr r7, r3 -/* 8046250C 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008021A@ha */ -/* 80462510 38 03 02 1A */ addi r0, r3, 0x021A /* 0x0008021A@l */ -/* 80462514 90 01 00 20 */ stw r0, 0x20(r1) -/* 80462518 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8046251C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80462520 80 63 00 00 */ lwz r3, 0(r3) -/* 80462524 38 81 00 20 */ addi r4, r1, 0x20 -/* 80462528 38 BF 05 38 */ addi r5, r31, 0x538 -/* 8046252C 38 C0 00 00 */ li r6, 0 -/* 80462530 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80462534 FC 40 08 90 */ fmr f2, f1 -/* 80462538 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 8046253C FC 80 18 90 */ fmr f4, f3 -/* 80462540 39 00 00 00 */ li r8, 0 -/* 80462544 4B E4 94 41 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80462548 48 00 00 B0 */ b lbl_804625F8 -lbl_8046254C: -/* 8046254C 7F E3 FB 78 */ mr r3, r31 -/* 80462550 4B BD 7C 39 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80462554 2C 03 00 0A */ cmpwi r3, 0xa -/* 80462558 40 82 00 54 */ bne lbl_804625AC -/* 8046255C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80462560 7C 03 07 74 */ extsb r3, r0 -/* 80462564 4B BC AB 09 */ bl dComIfGp_getReverb__Fi -/* 80462568 7C 67 1B 78 */ mr r7, r3 -/* 8046256C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000802B7@ha */ -/* 80462570 38 03 02 B7 */ addi r0, r3, 0x02B7 /* 0x000802B7@l */ -/* 80462574 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80462578 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8046257C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80462580 80 63 00 00 */ lwz r3, 0(r3) -/* 80462584 38 81 00 1C */ addi r4, r1, 0x1c -/* 80462588 38 BF 05 38 */ addi r5, r31, 0x538 -/* 8046258C 38 C0 00 00 */ li r6, 0 -/* 80462590 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80462594 FC 40 08 90 */ fmr f2, f1 -/* 80462598 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 8046259C FC 80 18 90 */ fmr f4, f3 -/* 804625A0 39 00 00 00 */ li r8, 0 -/* 804625A4 4B E4 93 E1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804625A8 48 00 00 50 */ b lbl_804625F8 -lbl_804625AC: -/* 804625AC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804625B0 7C 03 07 74 */ extsb r3, r0 -/* 804625B4 4B BC AA B9 */ bl dComIfGp_getReverb__Fi -/* 804625B8 7C 67 1B 78 */ mr r7, r3 -/* 804625BC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080192@ha */ -/* 804625C0 38 03 01 92 */ addi r0, r3, 0x0192 /* 0x00080192@l */ -/* 804625C4 90 01 00 18 */ stw r0, 0x18(r1) -/* 804625C8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804625CC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804625D0 80 63 00 00 */ lwz r3, 0(r3) -/* 804625D4 38 81 00 18 */ addi r4, r1, 0x18 -/* 804625D8 38 BF 05 38 */ addi r5, r31, 0x538 -/* 804625DC 38 C0 00 00 */ li r6, 0 -/* 804625E0 C0 3E 00 04 */ lfs f1, 4(r30) -/* 804625E4 FC 40 08 90 */ fmr f2, f1 -/* 804625E8 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 804625EC FC 80 18 90 */ fmr f4, f3 -/* 804625F0 39 00 00 00 */ li r8, 0 -/* 804625F4 4B E4 93 91 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_804625F8: -/* 804625F8 7F E3 FB 78 */ mr r3, r31 -/* 804625FC 4B BD 7B 8D */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80462600 2C 03 00 0A */ cmpwi r3, 0xa -/* 80462604 41 82 00 50 */ beq lbl_80462654 -/* 80462608 38 80 00 00 */ li r4, 0 -/* 8046260C 90 81 00 08 */ stw r4, 8(r1) -/* 80462610 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80462614 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80462618 7C 00 07 74 */ extsb r0, r0 -/* 8046261C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80462620 90 81 00 10 */ stw r4, 0x10(r1) -/* 80462624 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80462628 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046262C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80462630 3C 80 00 01 */ lis r4, 0x0001 /* 0x00008C50@ha */ -/* 80462634 38 84 8C 50 */ addi r4, r4, 0x8C50 /* 0x00008C50@l */ -/* 80462638 38 BF 07 D0 */ addi r5, r31, 0x7d0 -/* 8046263C 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 80462640 38 FF 01 0C */ addi r7, r31, 0x10c -/* 80462644 39 1F 04 E4 */ addi r8, r31, 0x4e4 -/* 80462648 39 20 00 00 */ li r9, 0 -/* 8046264C 39 40 00 00 */ li r10, 0 -/* 80462650 4B BE AA 19 */ bl setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz -lbl_80462654: -/* 80462654 39 61 00 50 */ addi r11, r1, 0x50 -/* 80462658 4B EF FB D1 */ bl _restgpr_29 -/* 8046265C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80462660 7C 08 03 A6 */ mtlr r0 -/* 80462664 38 21 00 50 */ addi r1, r1, 0x50 -/* 80462668 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_1__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_1__10daDoor20_cFv.s deleted file mode 100644 index 7b20c84640..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_1__10daDoor20_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8046266C: -/* 8046266C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80462670 7C 08 02 A6 */ mflr r0 -/* 80462674 90 01 00 24 */ stw r0, 0x24(r1) -/* 80462678 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8046267C 7C 7F 1B 78 */ mr r31, r3 -/* 80462680 4B FF E5 25 */ bl getArcName__10daDoor20_cFv -/* 80462684 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80462688 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 8046268C 38 84 01 40 */ addi r4, r4, 0x140 -/* 80462690 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80462694 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80462698 3C A5 00 02 */ addis r5, r5, 2 -/* 8046269C 38 C0 00 80 */ li r6, 0x80 -/* 804626A0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 804626A4 4B BD 9C D9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 804626A8 7C 64 1B 78 */ mr r4, r3 -/* 804626AC 38 7F 05 84 */ addi r3, r31, 0x584 -/* 804626B0 38 A0 00 01 */ li r5, 1 -/* 804626B4 38 C0 00 00 */ li r6, 0 -/* 804626B8 3C E0 80 46 */ lis r7, lit_4124@ha /* 0x80466824@ha */ -/* 804626BC C0 27 68 24 */ lfs f1, lit_4124@l(r7) /* 0x80466824@l */ -/* 804626C0 38 E0 00 00 */ li r7, 0 -/* 804626C4 39 00 FF FF */ li r8, -1 -/* 804626C8 39 20 00 01 */ li r9, 1 -/* 804626CC 4B BA B1 11 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 804626D0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804626D4 7C 03 07 74 */ extsb r3, r0 -/* 804626D8 4B BC A9 95 */ bl dComIfGp_getReverb__Fi -/* 804626DC 7C 67 1B 78 */ mr r7, r3 -/* 804626E0 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800B3@ha */ -/* 804626E4 38 03 00 B3 */ addi r0, r3, 0x00B3 /* 0x000800B3@l */ -/* 804626E8 90 01 00 08 */ stw r0, 8(r1) -/* 804626EC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804626F0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804626F4 80 63 00 00 */ lwz r3, 0(r3) -/* 804626F8 38 81 00 08 */ addi r4, r1, 8 -/* 804626FC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80462700 38 C0 00 00 */ li r6, 0 -/* 80462704 3D 00 80 46 */ lis r8, lit_4124@ha /* 0x80466824@ha */ -/* 80462708 C0 28 68 24 */ lfs f1, lit_4124@l(r8) /* 0x80466824@l */ -/* 8046270C FC 40 08 90 */ fmr f2, f1 -/* 80462710 3D 00 80 46 */ lis r8, lit_4609@ha /* 0x80466870@ha */ -/* 80462714 C0 68 68 70 */ lfs f3, lit_4609@l(r8) /* 0x80466870@l */ -/* 80462718 FC 80 18 90 */ fmr f4, f3 -/* 8046271C 39 00 00 00 */ li r8, 0 -/* 80462720 4B E4 92 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80462724 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80462728 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8046272C 7C 08 03 A6 */ mtlr r0 -/* 80462730 38 21 00 20 */ addi r1, r1, 0x20 -/* 80462734 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit__10daDoor20_cFi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit__10daDoor20_cFi.s deleted file mode 100644 index 40809d7539..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit__10daDoor20_cFi.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80462738: -/* 80462738 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046273C 7C 08 02 A6 */ mflr r0 -/* 80462740 90 01 00 14 */ stw r0, 0x14(r1) -/* 80462744 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80462748 7C 7F 1B 78 */ mr r31, r3 -/* 8046274C A0 03 06 8E */ lhz r0, 0x68e(r3) -/* 80462750 60 00 00 02 */ ori r0, r0, 2 -/* 80462754 B0 03 06 8E */ sth r0, 0x68e(r3) -/* 80462758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046275C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80462760 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80462764 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 80462768 7F E5 FB 78 */ mr r5, r31 -/* 8046276C 4B C1 22 9D */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80462770 7F E3 FB 78 */ mr r3, r31 -/* 80462774 4B BD 7A 15 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80462778 2C 03 00 02 */ cmpwi r3, 2 -/* 8046277C 41 82 00 1C */ beq lbl_80462798 -/* 80462780 40 80 00 14 */ bge lbl_80462794 -/* 80462784 2C 03 00 00 */ cmpwi r3, 0 -/* 80462788 41 82 00 10 */ beq lbl_80462798 -/* 8046278C 40 80 00 18 */ bge lbl_804627A4 -/* 80462790 48 00 00 08 */ b lbl_80462798 -lbl_80462794: -/* 80462794 2C 03 00 0A */ cmpwi r3, 0xa -lbl_80462798: -/* 80462798 7F E3 FB 78 */ mr r3, r31 -/* 8046279C 4B FF FB FD */ bl closeInit_0__10daDoor20_cFv -/* 804627A0 48 00 00 0C */ b lbl_804627AC -lbl_804627A4: -/* 804627A4 7F E3 FB 78 */ mr r3, r31 -/* 804627A8 4B FF FE C5 */ bl closeInit_1__10daDoor20_cFv -lbl_804627AC: -/* 804627AC 38 60 00 01 */ li r3, 1 -/* 804627B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804627B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804627B8 7C 08 03 A6 */ mtlr r0 -/* 804627BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 804627C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit__12dDoor_stop_cFP10daDoor20_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit__12dDoor_stop_cFP10daDoor20_c.s deleted file mode 100644 index 54096c823c..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit__12dDoor_stop_cFP10daDoor20_c.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_804661B0: -/* 804661B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804661B4 7C 08 02 A6 */ mflr r0 -/* 804661B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 804661BC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 804661C0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 804661C4 7C 9E 23 78 */ mr r30, r4 -/* 804661C8 3C 80 80 46 */ lis r4, lit_4018@ha /* 0x80466820@ha */ -/* 804661CC 3B E4 68 20 */ addi r31, r4, lit_4018@l /* 0x80466820@l */ -/* 804661D0 C0 1F 00 78 */ lfs f0, 0x78(r31) -/* 804661D4 D0 03 00 04 */ stfs f0, 4(r3) -/* 804661D8 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 804661DC D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 804661E0 38 00 00 01 */ li r0, 1 -/* 804661E4 98 03 00 0B */ stb r0, 0xb(r3) -/* 804661E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804661EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804661F0 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 804661F4 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 804661F8 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 804661FC 38 84 01 94 */ addi r4, r4, 0x194 -/* 80466200 4B F0 27 95 */ bl strcmp -/* 80466204 2C 03 00 00 */ cmpwi r3, 0 -/* 80466208 40 82 00 54 */ bne lbl_8046625C -/* 8046620C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80466210 7C 03 07 74 */ extsb r3, r0 -/* 80466214 4B BC 6E 59 */ bl dComIfGp_getReverb__Fi -/* 80466218 7C 67 1B 78 */ mr r7, r3 -/* 8046621C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800C2@ha */ -/* 80466220 38 03 00 C2 */ addi r0, r3, 0x00C2 /* 0x000800C2@l */ -/* 80466224 90 01 00 0C */ stw r0, 0xc(r1) -/* 80466228 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8046622C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80466230 80 63 00 00 */ lwz r3, 0(r3) -/* 80466234 38 81 00 0C */ addi r4, r1, 0xc -/* 80466238 38 BE 05 38 */ addi r5, r30, 0x538 -/* 8046623C 38 C0 00 00 */ li r6, 0 -/* 80466240 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80466244 FC 40 08 90 */ fmr f2, f1 -/* 80466248 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 8046624C FC 80 18 90 */ fmr f4, f3 -/* 80466250 39 00 00 00 */ li r8, 0 -/* 80466254 4B E4 57 31 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80466258 48 00 00 50 */ b lbl_804662A8 -lbl_8046625C: -/* 8046625C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80466260 7C 03 07 74 */ extsb r3, r0 -/* 80466264 4B BC 6E 09 */ bl dComIfGp_getReverb__Fi -/* 80466268 7C 67 1B 78 */ mr r7, r3 -/* 8046626C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801CD@ha */ -/* 80466270 38 03 01 CD */ addi r0, r3, 0x01CD /* 0x000801CD@l */ -/* 80466274 90 01 00 08 */ stw r0, 8(r1) -/* 80466278 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8046627C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80466280 80 63 00 00 */ lwz r3, 0(r3) -/* 80466284 38 81 00 08 */ addi r4, r1, 8 -/* 80466288 38 BE 05 38 */ addi r5, r30, 0x538 -/* 8046628C 38 C0 00 00 */ li r6, 0 -/* 80466290 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80466294 FC 40 08 90 */ fmr f2, f1 -/* 80466298 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 8046629C FC 80 18 90 */ fmr f4, f3 -/* 804662A0 39 00 00 00 */ li r8, 0 -/* 804662A4 4B E4 56 E1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_804662A8: -/* 804662A8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 804662AC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 804662B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804662B4 7C 08 03 A6 */ mtlr r0 -/* 804662B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 804662BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeProc__10daDoor20_cFi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeProc__10daDoor20_cFi.s deleted file mode 100644 index 1e4a2a34b8..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeProc__10daDoor20_cFi.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_804627C4: -/* 804627C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804627C8 7C 08 02 A6 */ mflr r0 -/* 804627CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 804627D0 38 63 05 84 */ addi r3, r3, 0x584 -/* 804627D4 4B BA AC 55 */ bl play__14mDoExt_baseAnmFv -/* 804627D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804627DC 7C 08 03 A6 */ mtlr r0 -/* 804627E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 804627E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeProc__12dDoor_stop_cFP10daDoor20_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeProc__12dDoor_stop_cFP10daDoor20_c.s deleted file mode 100644 index d1078c89c5..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeProc__12dDoor_stop_cFP10daDoor20_c.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_804662C0: -/* 804662C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804662C4 7C 08 02 A6 */ mflr r0 -/* 804662C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 804662CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 804662D0 4B EF BF 0D */ bl _savegpr_29 -/* 804662D4 7C 7D 1B 78 */ mr r29, r3 -/* 804662D8 7C 9E 23 78 */ mr r30, r4 -/* 804662DC 3C 60 80 46 */ lis r3, lit_4018@ha /* 0x80466820@ha */ -/* 804662E0 3B E3 68 20 */ addi r31, r3, lit_4018@l /* 0x80466820@l */ -/* 804662E4 88 1D 00 0B */ lbz r0, 0xb(r29) -/* 804662E8 28 00 00 00 */ cmplwi r0, 0 -/* 804662EC 40 82 00 0C */ bne lbl_804662F8 -/* 804662F0 38 60 00 01 */ li r3, 1 -/* 804662F4 48 00 00 40 */ b lbl_80466334 -lbl_804662F8: -/* 804662F8 38 7E 05 2C */ addi r3, r30, 0x52c -/* 804662FC C0 3F 00 AC */ lfs f1, 0xac(r31) -/* 80466300 C0 5F 00 B0 */ lfs f2, 0xb0(r31) -/* 80466304 4B E0 A4 3D */ bl cLib_chaseF__FPfff -/* 80466308 38 7D 00 04 */ addi r3, r29, 4 -/* 8046630C C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 80466310 C0 5E 05 2C */ lfs f2, 0x52c(r30) -/* 80466314 4B E0 A4 2D */ bl cLib_chaseF__FPfff -/* 80466318 2C 03 00 00 */ cmpwi r3, 0 -/* 8046631C 41 82 00 14 */ beq lbl_80466330 -/* 80466320 38 00 00 00 */ li r0, 0 -/* 80466324 98 1D 00 0B */ stb r0, 0xb(r29) -/* 80466328 38 60 00 02 */ li r3, 2 -/* 8046632C 48 00 00 08 */ b lbl_80466334 -lbl_80466330: -/* 80466330 38 60 00 00 */ li r3, 0 -lbl_80466334: -/* 80466334 39 61 00 20 */ addi r11, r1, 0x20 -/* 80466338 4B EF BE F1 */ bl _restgpr_29 -/* 8046633C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80466340 7C 08 03 A6 */ mtlr r0 -/* 80466344 38 21 00 20 */ addi r1, r1, 0x20 -/* 80466348 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/createKey__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/createKey__10daDoor20_cFv.s deleted file mode 100644 index cff47a7b55..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/createKey__10daDoor20_cFv.s +++ /dev/null @@ -1,178 +0,0 @@ -lbl_80464858: -/* 80464858 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8046485C 7C 08 02 A6 */ mflr r0 -/* 80464860 90 01 00 44 */ stw r0, 0x44(r1) -/* 80464864 39 61 00 40 */ addi r11, r1, 0x40 -/* 80464868 4B EF D9 75 */ bl _savegpr_29 -/* 8046486C 7C 7F 1B 78 */ mr r31, r3 -/* 80464870 3C 80 80 46 */ lis r4, lit_4018@ha /* 0x80466820@ha */ -/* 80464874 3B C4 68 20 */ addi r30, r4, lit_4018@l /* 0x80466820@l */ -/* 80464878 48 00 18 25 */ bl chkMakeKey__10daDoor20_cFv -/* 8046487C 2C 03 00 01 */ cmpwi r3, 1 -/* 80464880 40 82 02 48 */ bne lbl_80464AC8 -/* 80464884 88 1F 05 F0 */ lbz r0, 0x5f0(r31) -/* 80464888 28 00 00 00 */ cmplwi r0, 0 -/* 8046488C 41 82 02 3C */ beq lbl_80464AC8 -/* 80464890 80 7F 05 EC */ lwz r3, 0x5ec(r31) -/* 80464894 3C 03 00 01 */ addis r0, r3, 1 -/* 80464898 28 00 FF FF */ cmplwi r0, 0xffff -/* 8046489C 40 82 02 2C */ bne lbl_80464AC8 -/* 804648A0 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 804648A4 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 804648A8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 804648AC D0 01 00 28 */ stfs f0, 0x28(r1) -/* 804648B0 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 804648B4 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 804648B8 C0 1F 04 A8 */ lfs f0, 0x4a8(r31) -/* 804648BC D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 804648C0 C0 1F 04 AC */ lfs f0, 0x4ac(r31) -/* 804648C4 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 804648C8 C0 1F 04 B0 */ lfs f0, 0x4b0(r31) -/* 804648CC D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 804648D0 38 61 00 10 */ addi r3, r1, 0x10 -/* 804648D4 38 80 00 00 */ li r4, 0 -/* 804648D8 38 A0 00 00 */ li r5, 0 -/* 804648DC 38 C0 00 00 */ li r6, 0 -/* 804648E0 4B E0 2B 15 */ bl __ct__5csXyzFsss -/* 804648E4 88 1F 06 73 */ lbz r0, 0x673(r31) -/* 804648E8 2C 00 00 01 */ cmpwi r0, 1 -/* 804648EC 41 82 00 14 */ beq lbl_80464900 -/* 804648F0 40 80 00 D8 */ bge lbl_804649C8 -/* 804648F4 2C 00 00 00 */ cmpwi r0, 0 -/* 804648F8 40 80 00 E4 */ bge lbl_804649DC -/* 804648FC 48 00 00 CC */ b lbl_804649C8 -lbl_80464900: -/* 80464900 7F E3 FB 78 */ mr r3, r31 -/* 80464904 4B BD 58 9D */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80464908 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8046490C 28 00 00 02 */ cmplwi r0, 2 -/* 80464910 40 82 00 34 */ bne lbl_80464944 -/* 80464914 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 80464918 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8046491C C0 1E 00 9C */ lfs f0, 0x9c(r30) -/* 80464920 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80464924 C0 1E 00 48 */ lfs f0, 0x48(r30) -/* 80464928 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8046492C 38 00 00 00 */ li r0, 0 -/* 80464930 B0 01 00 12 */ sth r0, 0x12(r1) -/* 80464934 7F E3 FB 78 */ mr r3, r31 -/* 80464938 4B BD 58 81 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 8046493C 54 7D 06 3E */ clrlwi r29, r3, 0x18 -/* 80464940 48 00 00 44 */ b lbl_80464984 -lbl_80464944: -/* 80464944 7F E3 FB 78 */ mr r3, r31 -/* 80464948 4B BD 58 65 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 8046494C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80464950 28 00 00 02 */ cmplwi r0, 2 -/* 80464954 40 82 00 30 */ bne lbl_80464984 -/* 80464958 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 8046495C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80464960 C0 1E 00 9C */ lfs f0, 0x9c(r30) -/* 80464964 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80464968 C0 1E 00 A0 */ lfs f0, 0xa0(r30) -/* 8046496C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80464970 38 00 7F FF */ li r0, 0x7fff -/* 80464974 B0 01 00 12 */ sth r0, 0x12(r1) -/* 80464978 7F E3 FB 78 */ mr r3, r31 -/* 8046497C 4B BD 58 49 */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464980 54 7D 06 3E */ clrlwi r29, r3, 0x18 -lbl_80464984: -/* 80464984 38 00 00 00 */ li r0, 0 -/* 80464988 90 01 00 08 */ stw r0, 8(r1) -/* 8046498C 38 60 01 15 */ li r3, 0x115 -/* 80464990 28 1F 00 00 */ cmplwi r31, 0 -/* 80464994 41 82 00 0C */ beq lbl_804649A0 -/* 80464998 80 9F 00 04 */ lwz r4, 4(r31) -/* 8046499C 48 00 00 08 */ b lbl_804649A4 -lbl_804649A0: -/* 804649A0 38 80 FF FF */ li r4, -1 -lbl_804649A4: -/* 804649A4 38 A0 FF FF */ li r5, -1 -/* 804649A8 38 C1 00 18 */ addi r6, r1, 0x18 -/* 804649AC 7F A7 EB 78 */ mr r7, r29 -/* 804649B0 39 01 00 10 */ addi r8, r1, 0x10 -/* 804649B4 39 3F 04 EC */ addi r9, r31, 0x4ec -/* 804649B8 39 40 FF FF */ li r10, -1 -/* 804649BC 4B BB 55 BD */ bl fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i -/* 804649C0 90 7F 05 EC */ stw r3, 0x5ec(r31) -/* 804649C4 48 00 00 D4 */ b lbl_80464A98 -lbl_804649C8: -/* 804649C8 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 804649CC 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 804649D0 38 63 01 AA */ addi r3, r3, 0x1aa -/* 804649D4 4C C6 31 82 */ crclr 6 -/* 804649D8 4B BA 22 35 */ bl OSReport_Error -lbl_804649DC: -/* 804649DC 7F E3 FB 78 */ mr r3, r31 -/* 804649E0 4B BD 57 C1 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 804649E4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 804649E8 28 00 00 02 */ cmplwi r0, 2 -/* 804649EC 40 82 00 30 */ bne lbl_80464A1C -/* 804649F0 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 804649F4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804649F8 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 804649FC C0 1E 00 A4 */ lfs f0, 0xa4(r30) -/* 80464A00 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80464A04 38 00 00 00 */ li r0, 0 -/* 80464A08 B0 01 00 12 */ sth r0, 0x12(r1) -/* 80464A0C 7F E3 FB 78 */ mr r3, r31 -/* 80464A10 4B BD 57 A9 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464A14 54 7D 06 3E */ clrlwi r29, r3, 0x18 -/* 80464A18 48 00 00 40 */ b lbl_80464A58 -lbl_80464A1C: -/* 80464A1C 7F E3 FB 78 */ mr r3, r31 -/* 80464A20 4B BD 57 8D */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80464A24 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80464A28 28 00 00 02 */ cmplwi r0, 2 -/* 80464A2C 40 82 00 2C */ bne lbl_80464A58 -/* 80464A30 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 80464A34 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80464A38 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80464A3C C0 1E 00 A8 */ lfs f0, 0xa8(r30) -/* 80464A40 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80464A44 38 00 7F FF */ li r0, 0x7fff -/* 80464A48 B0 01 00 12 */ sth r0, 0x12(r1) -/* 80464A4C 7F E3 FB 78 */ mr r3, r31 -/* 80464A50 4B BD 57 75 */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464A54 54 7D 06 3E */ clrlwi r29, r3, 0x18 -lbl_80464A58: -/* 80464A58 38 00 00 00 */ li r0, 0 -/* 80464A5C 90 01 00 08 */ stw r0, 8(r1) -/* 80464A60 38 60 01 14 */ li r3, 0x114 -/* 80464A64 28 1F 00 00 */ cmplwi r31, 0 -/* 80464A68 41 82 00 0C */ beq lbl_80464A74 -/* 80464A6C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80464A70 48 00 00 08 */ b lbl_80464A78 -lbl_80464A74: -/* 80464A74 38 80 FF FF */ li r4, -1 -lbl_80464A78: -/* 80464A78 38 A0 FF FF */ li r5, -1 -/* 80464A7C 38 C1 00 18 */ addi r6, r1, 0x18 -/* 80464A80 7F A7 EB 78 */ mr r7, r29 -/* 80464A84 39 01 00 10 */ addi r8, r1, 0x10 -/* 80464A88 39 3F 04 EC */ addi r9, r31, 0x4ec -/* 80464A8C 39 40 FF FF */ li r10, -1 -/* 80464A90 4B BB 54 E9 */ bl fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i -/* 80464A94 90 7F 05 EC */ stw r3, 0x5ec(r31) -lbl_80464A98: -/* 80464A98 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80464A9C D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80464AA0 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80464AA4 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80464AA8 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80464AAC D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 80464AB0 80 7F 05 EC */ lwz r3, 0x5ec(r31) -/* 80464AB4 3C 03 00 01 */ addis r0, r3, 1 -/* 80464AB8 28 00 FF FF */ cmplwi r0, 0xffff -/* 80464ABC 40 82 00 0C */ bne lbl_80464AC8 -/* 80464AC0 38 60 00 00 */ li r3, 0 -/* 80464AC4 48 00 00 08 */ b lbl_80464ACC -lbl_80464AC8: -/* 80464AC8 38 60 00 01 */ li r3, 1 -lbl_80464ACC: -/* 80464ACC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80464AD0 4B EF D7 59 */ bl _restgpr_29 -/* 80464AD4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80464AD8 7C 08 03 A6 */ mtlr r0 -/* 80464ADC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80464AE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/create__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/create__10daDoor20_cFv.s deleted file mode 100644 index 7a00b8fa6d..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/create__10daDoor20_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80462F2C: -/* 80462F2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80462F30 7C 08 02 A6 */ mflr r0 -/* 80462F34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80462F38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80462F3C 7C 7F 1B 78 */ mr r31, r3 -/* 80462F40 4B FF DC 55 */ bl getAlwaysArcName__10daDoor20_cFv -/* 80462F44 7C 64 1B 78 */ mr r4, r3 -/* 80462F48 38 7F 05 6C */ addi r3, r31, 0x56c -/* 80462F4C 4B BC 9F 71 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80462F50 2C 03 00 04 */ cmpwi r3, 4 -/* 80462F54 41 82 00 08 */ beq lbl_80462F5C -/* 80462F58 48 00 00 74 */ b lbl_80462FCC -lbl_80462F5C: -/* 80462F5C 7F E3 FB 78 */ mr r3, r31 -/* 80462F60 4B FF DC 45 */ bl getArcName__10daDoor20_cFv -/* 80462F64 28 03 00 00 */ cmplwi r3, 0 -/* 80462F68 41 82 00 24 */ beq lbl_80462F8C -/* 80462F6C 7F E3 FB 78 */ mr r3, r31 -/* 80462F70 4B FF DC 35 */ bl getArcName__10daDoor20_cFv -/* 80462F74 7C 64 1B 78 */ mr r4, r3 -/* 80462F78 38 7F 05 74 */ addi r3, r31, 0x574 -/* 80462F7C 4B BC 9F 41 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80462F80 2C 03 00 04 */ cmpwi r3, 4 -/* 80462F84 41 82 00 08 */ beq lbl_80462F8C -/* 80462F88 48 00 00 44 */ b lbl_80462FCC -lbl_80462F8C: -/* 80462F8C 7F E3 FB 78 */ mr r3, r31 -/* 80462F90 4B BD 72 29 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80462F94 98 7F 04 E2 */ stb r3, 0x4e2(r31) -/* 80462F98 7F E3 FB 78 */ mr r3, r31 -/* 80462F9C 3C 80 80 46 */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x80460D8C@ha */ -/* 80462FA0 38 84 0D 8C */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x80460D8C@l */ -/* 80462FA4 3C A0 80 00 */ lis r5, 0x8000 /* 0x80003800@ha */ -/* 80462FA8 38 A5 38 00 */ addi r5, r5, 0x3800 /* 0x80003800@l */ -/* 80462FAC 4B BB 75 05 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80462FB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80462FB4 40 82 00 0C */ bne lbl_80462FC0 -/* 80462FB8 38 60 00 05 */ li r3, 5 -/* 80462FBC 48 00 00 10 */ b lbl_80462FCC -lbl_80462FC0: -/* 80462FC0 7F E3 FB 78 */ mr r3, r31 -/* 80462FC4 4B FF FC 69 */ bl CreateInit__10daDoor20_cFv -/* 80462FC8 38 60 00 04 */ li r3, 4 -lbl_80462FCC: -/* 80462FCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80462FD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80462FD4 7C 08 03 A6 */ mtlr r0 -/* 80462FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80462FDC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/create__12dDoor_stop_cFP10daDoor20_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/create__12dDoor_stop_cFP10daDoor20_c.s deleted file mode 100644 index 2d33472635..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/create__12dDoor_stop_cFP10daDoor20_c.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_804664E8: -/* 804664E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804664EC 7C 08 02 A6 */ mflr r0 -/* 804664F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 804664F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804664F8 7C 7F 1B 78 */ mr r31, r3 -/* 804664FC 7C 83 23 78 */ mr r3, r4 -/* 80466500 4B FF A6 71 */ bl getStopModelData__10daDoor20_cFv -/* 80466504 3C 80 00 08 */ lis r4, 8 -/* 80466508 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 8046650C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80466510 4B BA E7 45 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80466514 90 7F 00 00 */ stw r3, 0(r31) -/* 80466518 80 7F 00 00 */ lwz r3, 0(r31) -/* 8046651C 30 03 FF FF */ addic r0, r3, -1 -/* 80466520 7C 60 19 10 */ subfe r3, r0, r3 -/* 80466524 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80466528 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8046652C 7C 08 03 A6 */ mtlr r0 -/* 80466530 38 21 00 10 */ addi r1, r1, 0x10 -/* 80466534 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 66ba7b9956..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80466618: -/* 80466618 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8046661C 7C 08 02 A6 */ mflr r0 -/* 80466620 90 01 00 24 */ stw r0, 0x24(r1) -/* 80466624 39 61 00 20 */ addi r11, r1, 0x20 -/* 80466628 4B EF BB B5 */ bl _savegpr_29 -/* 8046662C 7C 7F 1B 78 */ mr r31, r3 -/* 80466630 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80466634 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80466638 40 82 00 B4 */ bne lbl_804666EC -/* 8046663C 7F E0 FB 79 */ or. r0, r31, r31 -/* 80466640 41 82 00 A0 */ beq lbl_804666E0 -/* 80466644 7C 1E 03 78 */ mr r30, r0 -/* 80466648 4B BB 25 1D */ bl __ct__10fopAc_ac_cFv -/* 8046664C 3C 60 80 46 */ lis r3, __vt__10daDoor20_c@ha /* 0x8046732C@ha */ -/* 80466650 38 03 73 2C */ addi r0, r3, __vt__10daDoor20_c@l /* 0x8046732C@l */ -/* 80466654 90 1E 05 68 */ stw r0, 0x568(r30) -/* 80466658 3B BE 05 84 */ addi r29, r30, 0x584 -/* 8046665C 3C 60 80 46 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80467320@ha */ -/* 80466660 38 03 73 20 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80467320@l */ -/* 80466664 90 1E 05 84 */ stw r0, 0x584(r30) -/* 80466668 7F A3 EB 78 */ mr r3, r29 -/* 8046666C 38 80 00 00 */ li r4, 0 -/* 80466670 4B EC 1D 8D */ bl init__12J3DFrameCtrlFs -/* 80466674 38 00 00 00 */ li r0, 0 -/* 80466678 90 1D 00 18 */ stw r0, 0x18(r29) -/* 8046667C 3B BE 05 A0 */ addi r29, r30, 0x5a0 -/* 80466680 3C 60 80 46 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80467320@ha */ -/* 80466684 38 03 73 20 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80467320@l */ -/* 80466688 90 1E 05 A0 */ stw r0, 0x5a0(r30) -/* 8046668C 7F A3 EB 78 */ mr r3, r29 -/* 80466690 38 80 00 00 */ li r4, 0 -/* 80466694 4B EC 1D 69 */ bl init__12J3DFrameCtrlFs -/* 80466698 38 00 00 00 */ li r0, 0 -/* 8046669C 90 1D 00 18 */ stw r0, 0x18(r29) -/* 804666A0 38 7E 06 24 */ addi r3, r30, 0x624 -/* 804666A4 4B DE 38 5D */ bl __ct__10dMsgFlow_cFv -/* 804666A8 3B BE 06 E0 */ addi r29, r30, 0x6e0 -/* 804666AC 7F A3 EB 78 */ mr r3, r29 -/* 804666B0 4B C0 F9 F1 */ bl __ct__9dBgS_AcchFv -/* 804666B4 3C 60 80 46 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x804672FC@ha */ -/* 804666B8 38 63 72 FC */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x804672FC@l */ -/* 804666BC 90 7D 00 10 */ stw r3, 0x10(r29) -/* 804666C0 38 03 00 0C */ addi r0, r3, 0xc -/* 804666C4 90 1D 00 14 */ stw r0, 0x14(r29) -/* 804666C8 38 03 00 18 */ addi r0, r3, 0x18 -/* 804666CC 90 1D 00 24 */ stw r0, 0x24(r29) -/* 804666D0 38 7D 00 14 */ addi r3, r29, 0x14 -/* 804666D4 4B C1 27 95 */ bl SetObj__16dBgS_PolyPassChkFv -/* 804666D8 38 7E 08 B8 */ addi r3, r30, 0x8b8 -/* 804666DC 4B C0 F7 D1 */ bl __ct__12dBgS_AcchCirFv -lbl_804666E0: -/* 804666E0 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 804666E4 60 00 00 08 */ ori r0, r0, 8 -/* 804666E8 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_804666EC: -/* 804666EC 7F E3 FB 78 */ mr r3, r31 -/* 804666F0 4B FF C8 3D */ bl create__10daDoor20_cFv -/* 804666F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 804666F8 4B EF BB 31 */ bl _restgpr_29 -/* 804666FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80466700 7C 08 03 A6 */ mtlr r0 -/* 80466704 38 21 00 20 */ addi r1, r1, 0x20 -/* 80466708 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Delete__FP10daDoor20_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Delete__FP10daDoor20_c.s deleted file mode 100644 index a6e7cfed15..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Delete__FP10daDoor20_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_804665F4: -/* 804665F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804665F8 7C 08 02 A6 */ mflr r0 -/* 804665FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80466600 4B FF E1 BD */ bl _delete__10daDoor20_cFv -/* 80466604 38 60 00 01 */ li r3, 1 -/* 80466608 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8046660C 7C 08 03 A6 */ mtlr r0 -/* 80466610 38 21 00 10 */ addi r1, r1, 0x10 -/* 80466614 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Draw__FP10daDoor20_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Draw__FP10daDoor20_c.s deleted file mode 100644 index 35549e9112..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Draw__FP10daDoor20_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_804665B0: -/* 804665B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804665B4 7C 08 02 A6 */ mflr r0 -/* 804665B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 804665BC 4B FF DD F5 */ bl draw__10daDoor20_cFv -/* 804665C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804665C4 7C 08 03 A6 */ mtlr r0 -/* 804665C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 804665CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Execute__FP10daDoor20_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Execute__FP10daDoor20_c.s deleted file mode 100644 index e2977063b8..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Execute__FP10daDoor20_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_804665D0: -/* 804665D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804665D4 7C 08 02 A6 */ mflr r0 -/* 804665D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 804665DC 4B FF DC 65 */ bl execute__10daDoor20_cFv -/* 804665E0 38 60 00 01 */ li r3, 1 -/* 804665E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804665E8 7C 08 03 A6 */ mtlr r0 -/* 804665EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 804665F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/deleteKey__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/deleteKey__10daDoor20_cFv.s deleted file mode 100644 index 22d080e1d1..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/deleteKey__10daDoor20_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80464AE4: -/* 80464AE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80464AE8 7C 08 02 A6 */ mflr r0 -/* 80464AEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80464AF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80464AF4 7C 7F 1B 78 */ mr r31, r3 -/* 80464AF8 80 63 05 EC */ lwz r3, 0x5ec(r3) -/* 80464AFC 3C 03 00 01 */ addis r0, r3, 1 -/* 80464B00 28 00 FF FF */ cmplwi r0, 0xffff -/* 80464B04 41 82 00 20 */ beq lbl_80464B24 -/* 80464B08 4B BB D6 31 */ bl fpcM_IsCreating__FUi -/* 80464B0C 2C 03 00 00 */ cmpwi r3, 0 -/* 80464B10 40 82 00 14 */ bne lbl_80464B24 -/* 80464B14 80 7F 05 EC */ lwz r3, 0x5ec(r31) -/* 80464B18 4B BB 51 A1 */ bl fopAcM_delete__FUi -/* 80464B1C 38 00 FF FF */ li r0, -1 -/* 80464B20 90 1F 05 EC */ stw r0, 0x5ec(r31) -lbl_80464B24: -/* 80464B24 38 60 00 01 */ li r3, 1 -/* 80464B28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80464B2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80464B30 7C 08 03 A6 */ mtlr r0 -/* 80464B34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80464B38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/demoProc__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/demoProc__10daDoor20_cFv.s deleted file mode 100644 index 980a66f83e..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/demoProc__10daDoor20_cFv.s +++ /dev/null @@ -1,990 +0,0 @@ -lbl_80462FE0: -/* 80462FE0 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80462FE4 7C 08 02 A6 */ mflr r0 -/* 80462FE8 90 01 00 74 */ stw r0, 0x74(r1) -/* 80462FEC 39 61 00 70 */ addi r11, r1, 0x70 -/* 80462FF0 4B EF F1 E1 */ bl _savegpr_26 -/* 80462FF4 7C 7F 1B 78 */ mr r31, r3 -/* 80462FF8 3C 60 80 46 */ lis r3, lit_4018@ha /* 0x80466820@ha */ -/* 80462FFC 3B C3 68 20 */ addi r30, r3, lit_4018@l /* 0x80466820@l */ -/* 80463000 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80463004 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80463008 3B 83 0F 38 */ addi r28, r3, 0xf38 -/* 8046300C 3B BC 40 C0 */ addi r29, r28, 0x40c0 -/* 80463010 7F A3 EB 78 */ mr r3, r29 -/* 80463014 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463018 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 8046301C 38 84 01 59 */ addi r4, r4, 0x159 -/* 80463020 38 A0 00 00 */ li r5, 0 -/* 80463024 38 C0 00 00 */ li r6, 0 -/* 80463028 4B BE 4A F5 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 8046302C 90 7F 06 CC */ stw r3, 0x6cc(r31) -/* 80463030 7F E3 FB 78 */ mr r3, r31 -/* 80463034 81 9F 05 68 */ lwz r12, 0x568(r31) -/* 80463038 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8046303C 7D 89 03 A6 */ mtctr r12 -/* 80463040 4E 80 04 21 */ bctrl -/* 80463044 7C 7B 1B 78 */ mr r27, r3 -/* 80463048 7F A3 EB 78 */ mr r3, r29 -/* 8046304C 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463050 4B BE 4C FD */ bl getIsAddvance__16dEvent_manager_cFi -/* 80463054 2C 03 00 00 */ cmpwi r3, 0 -/* 80463058 41 82 05 00 */ beq lbl_80463558 -/* 8046305C 28 1B 00 1C */ cmplwi r27, 0x1c -/* 80463060 41 81 04 F8 */ bgt lbl_80463558 -/* 80463064 3C 60 80 46 */ lis r3, lit_5341@ha /* 0x804670B0@ha */ -/* 80463068 38 63 70 B0 */ addi r3, r3, lit_5341@l /* 0x804670B0@l */ -/* 8046306C 57 60 10 3A */ slwi r0, r27, 2 -/* 80463070 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80463074 7C 09 03 A6 */ mtctr r0 -/* 80463078 4E 80 04 20 */ bctr -lbl_8046307C: -/* 8046307C 7F A3 EB 78 */ mr r3, r29 -/* 80463080 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463084 3C A0 80 46 */ lis r5, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463088 38 A5 68 D8 */ addi r5, r5, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 8046308C 38 A5 01 66 */ addi r5, r5, 0x166 -/* 80463090 38 C0 00 03 */ li r6, 3 -/* 80463094 4B BE 50 59 */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 80463098 28 03 00 00 */ cmplwi r3, 0 -/* 8046309C 40 82 00 10 */ bne lbl_804630AC -/* 804630A0 38 00 00 01 */ li r0, 1 -/* 804630A4 98 1F 05 DD */ stb r0, 0x5dd(r31) -/* 804630A8 48 00 04 B0 */ b lbl_80463558 -lbl_804630AC: -/* 804630AC 80 03 00 00 */ lwz r0, 0(r3) -/* 804630B0 98 1F 05 DD */ stb r0, 0x5dd(r31) -/* 804630B4 48 00 04 A4 */ b lbl_80463558 -lbl_804630B8: -/* 804630B8 7F E3 FB 78 */ mr r3, r31 -/* 804630BC 38 80 00 00 */ li r4, 0 -/* 804630C0 4B FF EE 05 */ bl openInit__10daDoor20_cFi -/* 804630C4 48 00 04 94 */ b lbl_80463558 -lbl_804630C8: -/* 804630C8 7F E3 FB 78 */ mr r3, r31 -/* 804630CC 38 80 00 00 */ li r4, 0 -/* 804630D0 4B FF F6 69 */ bl closeInit__10daDoor20_cFi -/* 804630D4 48 00 04 84 */ b lbl_80463558 -lbl_804630D8: -/* 804630D8 7F E3 FB 78 */ mr r3, r31 -/* 804630DC 48 00 28 85 */ bl setGoal__10daDoor20_cFv -/* 804630E0 48 00 04 78 */ b lbl_80463558 -lbl_804630E4: -/* 804630E4 88 1F 06 73 */ lbz r0, 0x673(r31) -/* 804630E8 28 00 00 01 */ cmplwi r0, 1 -/* 804630EC 40 82 00 30 */ bne lbl_8046311C -/* 804630F0 80 1F 05 EC */ lwz r0, 0x5ec(r31) -/* 804630F4 90 01 00 4C */ stw r0, 0x4c(r1) -/* 804630F8 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 804630FC 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80463100 38 81 00 4C */ addi r4, r1, 0x4c -/* 80463104 4B BB 66 F5 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80463108 28 03 00 00 */ cmplwi r3, 0 -/* 8046310C 41 82 00 38 */ beq lbl_80463144 -/* 80463110 38 00 00 02 */ li r0, 2 -/* 80463114 98 03 09 45 */ stb r0, 0x945(r3) -/* 80463118 48 00 00 2C */ b lbl_80463144 -lbl_8046311C: -/* 8046311C 80 1F 05 EC */ lwz r0, 0x5ec(r31) -/* 80463120 90 01 00 48 */ stw r0, 0x48(r1) -/* 80463124 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80463128 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 8046312C 38 81 00 48 */ addi r4, r1, 0x48 -/* 80463130 4B BB 66 C9 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80463134 28 03 00 00 */ cmplwi r3, 0 -/* 80463138 41 82 00 0C */ beq lbl_80463144 -/* 8046313C 38 00 00 01 */ li r0, 1 -/* 80463140 98 03 2C A4 */ stb r0, 0x2ca4(r3) -lbl_80463144: -/* 80463144 7F E3 FB 78 */ mr r3, r31 -/* 80463148 4B BD 70 89 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 8046314C 54 7A 06 3E */ clrlwi r26, r3, 0x18 -/* 80463150 2C 1A 00 FF */ cmpwi r26, 0xff -/* 80463154 41 82 04 04 */ beq lbl_80463558 -/* 80463158 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046315C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80463160 7F 44 D3 78 */ mr r4, r26 -/* 80463164 38 A0 FF FF */ li r5, -1 -/* 80463168 4B BD 21 F9 */ bl isSwitch__10dSv_info_cCFii -/* 8046316C 2C 03 00 00 */ cmpwi r3, 0 -/* 80463170 40 82 03 E8 */ bne lbl_80463558 -/* 80463174 7F E3 FB 78 */ mr r3, r31 -/* 80463178 4B BD 70 29 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 8046317C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80463180 28 00 00 02 */ cmplwi r0, 2 -/* 80463184 41 82 00 18 */ beq lbl_8046319C -/* 80463188 7F E3 FB 78 */ mr r3, r31 -/* 8046318C 4B BD 70 21 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80463190 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80463194 28 00 00 02 */ cmplwi r0, 2 -/* 80463198 40 82 03 C0 */ bne lbl_80463558 -lbl_8046319C: -/* 8046319C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804631A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804631A4 7F 44 D3 78 */ mr r4, r26 -/* 804631A8 38 A0 FF FF */ li r5, -1 -/* 804631AC 4B BD 20 55 */ bl onSwitch__10dSv_info_cFii -/* 804631B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804631B4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804631B8 A8 64 5D C8 */ lha r3, 0x5dc8(r4) -/* 804631BC 38 03 FF FF */ addi r0, r3, -1 -/* 804631C0 B0 04 5D C8 */ sth r0, 0x5dc8(r4) -/* 804631C4 88 1F 06 73 */ lbz r0, 0x673(r31) -/* 804631C8 28 00 00 01 */ cmplwi r0, 1 -/* 804631CC 40 82 00 54 */ bne lbl_80463220 -/* 804631D0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804631D4 7C 03 07 74 */ extsb r3, r0 -/* 804631D8 4B BC 9E 95 */ bl dComIfGp_getReverb__Fi -/* 804631DC 7C 67 1B 78 */ mr r7, r3 -/* 804631E0 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801E0@ha */ -/* 804631E4 38 03 01 E0 */ addi r0, r3, 0x01E0 /* 0x000801E0@l */ -/* 804631E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 804631EC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804631F0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804631F4 80 63 00 00 */ lwz r3, 0(r3) -/* 804631F8 38 81 00 14 */ addi r4, r1, 0x14 -/* 804631FC 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80463200 38 C0 00 00 */ li r6, 0 -/* 80463204 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463208 FC 40 08 90 */ fmr f2, f1 -/* 8046320C C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80463210 FC 80 18 90 */ fmr f4, f3 -/* 80463214 39 00 00 00 */ li r8, 0 -/* 80463218 4B E4 87 6D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8046321C 48 00 03 3C */ b lbl_80463558 -lbl_80463220: -/* 80463220 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80463224 7C 03 07 74 */ extsb r3, r0 -/* 80463228 4B BC 9E 45 */ bl dComIfGp_getReverb__Fi -/* 8046322C 7C 67 1B 78 */ mr r7, r3 -/* 80463230 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800B6@ha */ -/* 80463234 38 03 00 B6 */ addi r0, r3, 0x00B6 /* 0x000800B6@l */ -/* 80463238 90 01 00 10 */ stw r0, 0x10(r1) -/* 8046323C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80463240 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80463244 80 63 00 00 */ lwz r3, 0(r3) -/* 80463248 38 81 00 10 */ addi r4, r1, 0x10 -/* 8046324C 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80463250 38 C0 00 00 */ li r6, 0 -/* 80463254 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463258 FC 40 08 90 */ fmr f2, f1 -/* 8046325C C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80463260 FC 80 18 90 */ fmr f4, f3 -/* 80463264 39 00 00 00 */ li r8, 0 -/* 80463268 4B E4 87 1D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8046326C 48 00 02 EC */ b lbl_80463558 -lbl_80463270: -/* 80463270 7F E3 FB 78 */ mr r3, r31 -/* 80463274 48 00 2C 19 */ bl setStop__10daDoor20_cFv -/* 80463278 88 1F 06 D8 */ lbz r0, 0x6d8(r31) -/* 8046327C 28 00 00 00 */ cmplwi r0, 0 -/* 80463280 41 82 02 D8 */ beq lbl_80463558 -/* 80463284 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 80463288 7F E4 FB 78 */ mr r4, r31 -/* 8046328C 48 00 2F 25 */ bl closeInit__12dDoor_stop_cFP10daDoor20_c -/* 80463290 48 00 02 C8 */ b lbl_80463558 -lbl_80463294: -/* 80463294 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 80463298 7F E4 FB 78 */ mr r4, r31 -/* 8046329C 48 00 30 B1 */ bl openInit__12dDoor_stop_cFP10daDoor20_c -/* 804632A0 48 00 02 B8 */ b lbl_80463558 -lbl_804632A4: -/* 804632A4 38 00 00 05 */ li r0, 5 -/* 804632A8 B0 1F 06 DC */ sth r0, 0x6dc(r31) -/* 804632AC 48 00 02 AC */ b lbl_80463558 -lbl_804632B0: -/* 804632B0 38 00 00 05 */ li r0, 5 -/* 804632B4 B0 1F 06 DC */ sth r0, 0x6dc(r31) -/* 804632B8 7F E3 FB 78 */ mr r3, r31 -/* 804632BC 4B FF E7 89 */ bl setAngle__10daDoor20_cFv -/* 804632C0 48 00 02 98 */ b lbl_80463558 -lbl_804632C4: -/* 804632C4 7F E3 FB 78 */ mr r3, r31 -/* 804632C8 4B FF D8 CD */ bl getAlwaysArcName__10daDoor20_cFv -/* 804632CC 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 804632D0 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 804632D4 38 84 01 6C */ addi r4, r4, 0x16c -/* 804632D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804632DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804632E0 3C A5 00 02 */ addis r5, r5, 2 -/* 804632E4 38 C0 00 80 */ li r6, 0x80 -/* 804632E8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 804632EC 4B BD 90 91 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 804632F0 7C 7A 1B 78 */ mr r26, r3 -/* 804632F4 38 7F 05 84 */ addi r3, r31, 0x584 -/* 804632F8 7F 44 D3 78 */ mr r4, r26 -/* 804632FC 38 A0 00 01 */ li r5, 1 -/* 80463300 38 C0 00 00 */ li r6, 0 -/* 80463304 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463308 38 E0 00 00 */ li r7, 0 -/* 8046330C 39 00 FF FF */ li r8, -1 -/* 80463310 39 20 00 01 */ li r9, 1 -/* 80463314 4B BA A4 C9 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80463318 2C 03 00 00 */ cmpwi r3, 0 -/* 8046331C 41 82 00 28 */ beq lbl_80463344 -/* 80463320 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80463324 7F 44 D3 78 */ mr r4, r26 -/* 80463328 38 A0 00 01 */ li r5, 1 -/* 8046332C 38 C0 00 00 */ li r6, 0 -/* 80463330 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463334 38 E0 00 00 */ li r7, 0 -/* 80463338 39 00 FF FF */ li r8, -1 -/* 8046333C 39 20 00 01 */ li r9, 1 -/* 80463340 4B BA A4 9D */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -lbl_80463344: -/* 80463344 38 00 00 00 */ li r0, 0 -/* 80463348 98 1F 06 7C */ stb r0, 0x67c(r31) -/* 8046334C 7F E3 FB 78 */ mr r3, r31 -/* 80463350 4B FF F5 D9 */ bl openInit2__10daDoor20_cFv -/* 80463354 48 00 02 04 */ b lbl_80463558 -lbl_80463358: -/* 80463358 7F E3 FB 78 */ mr r3, r31 -/* 8046335C 4B FF D8 39 */ bl getAlwaysArcName__10daDoor20_cFv -/* 80463360 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463364 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463368 38 84 00 A7 */ addi r4, r4, 0xa7 -/* 8046336C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80463370 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80463374 3C A5 00 02 */ addis r5, r5, 2 -/* 80463378 38 C0 00 80 */ li r6, 0x80 -/* 8046337C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80463380 4B BD 8F FD */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80463384 7C 7A 1B 78 */ mr r26, r3 -/* 80463388 38 7F 05 84 */ addi r3, r31, 0x584 -/* 8046338C 7F 44 D3 78 */ mr r4, r26 -/* 80463390 38 A0 00 01 */ li r5, 1 -/* 80463394 38 C0 00 00 */ li r6, 0 -/* 80463398 C0 3E 00 04 */ lfs f1, 4(r30) -/* 8046339C 38 E0 00 00 */ li r7, 0 -/* 804633A0 39 00 FF FF */ li r8, -1 -/* 804633A4 39 20 00 01 */ li r9, 1 -/* 804633A8 4B BA A4 35 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 804633AC 2C 03 00 00 */ cmpwi r3, 0 -/* 804633B0 41 82 00 28 */ beq lbl_804633D8 -/* 804633B4 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 804633B8 7F 44 D3 78 */ mr r4, r26 -/* 804633BC 38 A0 00 01 */ li r5, 1 -/* 804633C0 38 C0 00 00 */ li r6, 0 -/* 804633C4 C0 3E 00 04 */ lfs f1, 4(r30) -/* 804633C8 38 E0 00 00 */ li r7, 0 -/* 804633CC 39 00 FF FF */ li r8, -1 -/* 804633D0 39 20 00 01 */ li r9, 1 -/* 804633D4 4B BA A4 09 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -lbl_804633D8: -/* 804633D8 38 00 00 00 */ li r0, 0 -/* 804633DC 98 1F 06 7C */ stb r0, 0x67c(r31) -/* 804633E0 7F E3 FB 78 */ mr r3, r31 -/* 804633E4 4B FF F5 45 */ bl openInit2__10daDoor20_cFv -/* 804633E8 48 00 01 70 */ b lbl_80463558 -lbl_804633EC: -/* 804633EC 7F E3 FB 78 */ mr r3, r31 -/* 804633F0 4B BD 6E 05 */ bl isMsgDoor__13door_param2_cFP10fopAc_ac_c -/* 804633F4 2C 03 00 00 */ cmpwi r3, 0 -/* 804633F8 41 82 01 60 */ beq lbl_80463558 -/* 804633FC 7F E3 FB 78 */ mr r3, r31 -/* 80463400 4B BD 6E 19 */ bl getMsgNo__13door_param2_cFP10fopAc_ac_c -/* 80463404 54 65 04 3E */ clrlwi r5, r3, 0x10 -/* 80463408 3C 05 00 00 */ addis r0, r5, 0 -/* 8046340C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80463410 41 82 01 48 */ beq lbl_80463558 -/* 80463414 38 7F 06 24 */ addi r3, r31, 0x624 -/* 80463418 7F E4 FB 78 */ mr r4, r31 -/* 8046341C 38 C0 00 00 */ li r6, 0 -/* 80463420 38 E0 00 00 */ li r7, 0 -/* 80463424 4B DE 6B 6D */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80463428 48 00 01 30 */ b lbl_80463558 -lbl_8046342C: -/* 8046342C 88 1F 06 73 */ lbz r0, 0x673(r31) -/* 80463430 28 00 00 01 */ cmplwi r0, 1 -/* 80463434 40 82 01 24 */ bne lbl_80463558 -/* 80463438 80 1F 05 EC */ lwz r0, 0x5ec(r31) -/* 8046343C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80463440 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80463444 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80463448 38 81 00 44 */ addi r4, r1, 0x44 -/* 8046344C 4B BB 63 AD */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80463450 28 03 00 00 */ cmplwi r3, 0 -/* 80463454 41 82 01 04 */ beq lbl_80463558 -/* 80463458 38 00 00 01 */ li r0, 1 -/* 8046345C 98 03 09 45 */ stb r0, 0x945(r3) -/* 80463460 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080023@ha */ -/* 80463464 38 03 00 23 */ addi r0, r3, 0x0023 /* 0x00080023@l */ -/* 80463468 90 01 00 40 */ stw r0, 0x40(r1) -/* 8046346C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80463470 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80463474 80 63 00 00 */ lwz r3, 0(r3) -/* 80463478 38 81 00 40 */ addi r4, r1, 0x40 -/* 8046347C 38 BF 05 E0 */ addi r5, r31, 0x5e0 -/* 80463480 38 C0 00 00 */ li r6, 0 -/* 80463484 38 E0 00 00 */ li r7, 0 -/* 80463488 C0 3E 00 04 */ lfs f1, 4(r30) -/* 8046348C FC 40 08 90 */ fmr f2, f1 -/* 80463490 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80463494 FC 80 18 90 */ fmr f4, f3 -/* 80463498 39 00 00 00 */ li r8, 0 -/* 8046349C 4B E4 84 E9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804634A0 48 00 00 B8 */ b lbl_80463558 -lbl_804634A4: -/* 804634A4 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804634A8 7C 03 07 74 */ extsb r3, r0 -/* 804634AC 4B BC 9B C1 */ bl dComIfGp_getReverb__Fi -/* 804634B0 7C 67 1B 78 */ mr r7, r3 -/* 804634B4 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008021B@ha */ -/* 804634B8 38 03 02 1B */ addi r0, r3, 0x021B /* 0x0008021B@l */ -/* 804634BC 90 01 00 0C */ stw r0, 0xc(r1) -/* 804634C0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804634C4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804634C8 80 63 00 00 */ lwz r3, 0(r3) -/* 804634CC 38 81 00 0C */ addi r4, r1, 0xc -/* 804634D0 38 BF 05 38 */ addi r5, r31, 0x538 -/* 804634D4 38 C0 00 00 */ li r6, 0 -/* 804634D8 C0 3E 00 04 */ lfs f1, 4(r30) -/* 804634DC FC 40 08 90 */ fmr f2, f1 -/* 804634E0 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 804634E4 FC 80 18 90 */ fmr f4, f3 -/* 804634E8 39 00 00 00 */ li r8, 0 -/* 804634EC 4B E4 84 99 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804634F0 C0 1E 00 04 */ lfs f0, 4(r30) -/* 804634F4 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 804634F8 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 804634FC 48 00 00 5C */ b lbl_80463558 -lbl_80463500: -/* 80463500 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80463504 7C 03 07 74 */ extsb r3, r0 -/* 80463508 4B BC 9B 65 */ bl dComIfGp_getReverb__Fi -/* 8046350C 7C 67 1B 78 */ mr r7, r3 -/* 80463510 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008021C@ha */ -/* 80463514 38 03 02 1C */ addi r0, r3, 0x021C /* 0x0008021C@l */ -/* 80463518 90 01 00 08 */ stw r0, 8(r1) -/* 8046351C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80463520 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80463524 80 63 00 00 */ lwz r3, 0(r3) -/* 80463528 38 81 00 08 */ addi r4, r1, 8 -/* 8046352C 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80463530 38 C0 00 00 */ li r6, 0 -/* 80463534 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463538 FC 40 08 90 */ fmr f2, f1 -/* 8046353C C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80463540 FC 80 18 90 */ fmr f4, f3 -/* 80463544 39 00 00 00 */ li r8, 0 -/* 80463548 4B E4 84 3D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8046354C C0 1E 00 50 */ lfs f0, 0x50(r30) -/* 80463550 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 80463554 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_80463558: -/* 80463558 28 1B 00 1C */ cmplwi r27, 0x1c -/* 8046355C 41 81 08 AC */ bgt lbl_80463E08 -/* 80463560 3C 60 80 46 */ lis r3, lit_5342@ha /* 0x8046703C@ha */ -/* 80463564 38 63 70 3C */ addi r3, r3, lit_5342@l /* 0x8046703C@l */ -/* 80463568 57 60 10 3A */ slwi r0, r27, 2 -/* 8046356C 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80463570 7C 09 03 A6 */ mtctr r0 -/* 80463574 4E 80 04 20 */ bctr -lbl_80463578: -/* 80463578 38 7F 05 DD */ addi r3, r31, 0x5dd -/* 8046357C 48 00 32 71 */ bl func_804667EC -/* 80463580 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80463584 40 82 08 90 */ bne lbl_80463E14 -/* 80463588 7F A3 EB 78 */ mr r3, r29 -/* 8046358C 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463590 4B BE 4B ED */ bl cutEnd__16dEvent_manager_cFi -/* 80463594 48 00 08 80 */ b lbl_80463E14 -lbl_80463598: -/* 80463598 A0 1F 06 8E */ lhz r0, 0x68e(r31) -/* 8046359C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 804635A0 41 82 00 34 */ beq lbl_804635D4 -/* 804635A4 7F E3 FB 78 */ mr r3, r31 -/* 804635A8 38 80 00 00 */ li r4, 0 -/* 804635AC 4B FF E9 B5 */ bl openProc__10daDoor20_cFi -/* 804635B0 2C 03 00 00 */ cmpwi r3, 0 -/* 804635B4 41 82 08 60 */ beq lbl_80463E14 -/* 804635B8 7F E3 FB 78 */ mr r3, r31 -/* 804635BC 38 80 00 00 */ li r4, 0 -/* 804635C0 4B FF ED 69 */ bl openEnd__10daDoor20_cFi -/* 804635C4 7F A3 EB 78 */ mr r3, r29 -/* 804635C8 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 804635CC 4B BE 4B B1 */ bl cutEnd__16dEvent_manager_cFi -/* 804635D0 48 00 08 44 */ b lbl_80463E14 -lbl_804635D4: -/* 804635D4 7F A3 EB 78 */ mr r3, r29 -/* 804635D8 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 804635DC 4B BE 4B A1 */ bl cutEnd__16dEvent_manager_cFi -/* 804635E0 48 00 08 34 */ b lbl_80463E14 -lbl_804635E4: -/* 804635E4 A0 1F 06 8E */ lhz r0, 0x68e(r31) -/* 804635E8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 804635EC 41 82 00 34 */ beq lbl_80463620 -/* 804635F0 7F E3 FB 78 */ mr r3, r31 -/* 804635F4 38 80 00 00 */ li r4, 0 -/* 804635F8 4B FF F1 CD */ bl closeProc__10daDoor20_cFi -/* 804635FC 2C 03 00 00 */ cmpwi r3, 0 -/* 80463600 41 82 08 14 */ beq lbl_80463E14 -/* 80463604 7F E3 FB 78 */ mr r3, r31 -/* 80463608 38 80 00 00 */ li r4, 0 -/* 8046360C 4B FF F2 5D */ bl closeEnd__10daDoor20_cFi -/* 80463610 7F A3 EB 78 */ mr r3, r29 -/* 80463614 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463618 4B BE 4B 65 */ bl cutEnd__16dEvent_manager_cFi -/* 8046361C 48 00 07 F8 */ b lbl_80463E14 -lbl_80463620: -/* 80463620 7F A3 EB 78 */ mr r3, r29 -/* 80463624 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463628 4B BE 4B 55 */ bl cutEnd__16dEvent_manager_cFi -/* 8046362C 48 00 07 E8 */ b lbl_80463E14 -lbl_80463630: -/* 80463630 88 1F 06 73 */ lbz r0, 0x673(r31) -/* 80463634 28 00 00 01 */ cmplwi r0, 1 -/* 80463638 40 82 00 54 */ bne lbl_8046368C -/* 8046363C 80 1F 05 EC */ lwz r0, 0x5ec(r31) -/* 80463640 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80463644 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80463648 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 8046364C 38 81 00 3C */ addi r4, r1, 0x3c -/* 80463650 4B BB 61 A9 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80463654 28 03 00 00 */ cmplwi r3, 0 -/* 80463658 41 82 00 10 */ beq lbl_80463668 -/* 8046365C 88 03 09 45 */ lbz r0, 0x945(r3) -/* 80463660 2C 00 00 03 */ cmpwi r0, 3 -/* 80463664 41 82 00 10 */ beq lbl_80463674 -lbl_80463668: -/* 80463668 88 1F 05 F0 */ lbz r0, 0x5f0(r31) -/* 8046366C 28 00 00 00 */ cmplwi r0, 0 -/* 80463670 40 82 07 A4 */ bne lbl_80463E14 -lbl_80463674: -/* 80463674 38 00 00 00 */ li r0, 0 -/* 80463678 98 1F 05 F0 */ stb r0, 0x5f0(r31) -/* 8046367C 7F A3 EB 78 */ mr r3, r29 -/* 80463680 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463684 4B BE 4A F9 */ bl cutEnd__16dEvent_manager_cFi -/* 80463688 48 00 07 8C */ b lbl_80463E14 -lbl_8046368C: -/* 8046368C 28 00 00 00 */ cmplwi r0, 0 -/* 80463690 40 82 07 84 */ bne lbl_80463E14 -/* 80463694 80 1F 05 EC */ lwz r0, 0x5ec(r31) -/* 80463698 90 01 00 38 */ stw r0, 0x38(r1) -/* 8046369C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 804636A0 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 804636A4 38 81 00 38 */ addi r4, r1, 0x38 -/* 804636A8 4B BB 61 51 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 804636AC 28 03 00 00 */ cmplwi r3, 0 -/* 804636B0 41 82 00 10 */ beq lbl_804636C0 -/* 804636B4 88 03 2C A4 */ lbz r0, 0x2ca4(r3) -/* 804636B8 28 00 00 03 */ cmplwi r0, 3 -/* 804636BC 41 82 00 10 */ beq lbl_804636CC -lbl_804636C0: -/* 804636C0 88 1F 05 F0 */ lbz r0, 0x5f0(r31) -/* 804636C4 28 00 00 00 */ cmplwi r0, 0 -/* 804636C8 40 82 07 4C */ bne lbl_80463E14 -lbl_804636CC: -/* 804636CC 38 00 00 00 */ li r0, 0 -/* 804636D0 98 1F 05 F0 */ stb r0, 0x5f0(r31) -/* 804636D4 7F A3 EB 78 */ mr r3, r29 -/* 804636D8 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 804636DC 4B BE 4A A1 */ bl cutEnd__16dEvent_manager_cFi -/* 804636E0 48 00 07 34 */ b lbl_80463E14 -lbl_804636E4: -/* 804636E4 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 804636E8 7F E4 FB 78 */ mr r4, r31 -/* 804636EC 48 00 2B D5 */ bl closeProc__12dDoor_stop_cFP10daDoor20_c -/* 804636F0 2C 03 00 00 */ cmpwi r3, 0 -/* 804636F4 41 82 00 10 */ beq lbl_80463704 -/* 804636F8 7F A3 EB 78 */ mr r3, r29 -/* 804636FC 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463700 4B BE 4A 7D */ bl cutEnd__16dEvent_manager_cFi -lbl_80463704: -/* 80463704 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 80463708 7F E4 FB 78 */ mr r4, r31 -/* 8046370C 48 00 29 E9 */ bl calcMtx__12dDoor_stop_cFP10daDoor20_c -/* 80463710 48 00 07 04 */ b lbl_80463E14 -lbl_80463714: -/* 80463714 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 80463718 7F E4 FB 78 */ mr r4, r31 -/* 8046371C 48 00 2D 3D */ bl openProc__12dDoor_stop_cFP10daDoor20_c -/* 80463720 2C 03 00 00 */ cmpwi r3, 0 -/* 80463724 41 82 00 10 */ beq lbl_80463734 -/* 80463728 7F A3 EB 78 */ mr r3, r29 -/* 8046372C 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463730 4B BE 4A 4D */ bl cutEnd__16dEvent_manager_cFi -lbl_80463734: -/* 80463734 38 7F 06 D0 */ addi r3, r31, 0x6d0 -/* 80463738 7F E4 FB 78 */ mr r4, r31 -/* 8046373C 48 00 29 B9 */ bl calcMtx__12dDoor_stop_cFP10daDoor20_c -/* 80463740 48 00 06 D4 */ b lbl_80463E14 -lbl_80463744: -/* 80463744 80 7F 05 C4 */ lwz r3, 0x5c4(r31) -/* 80463748 4B C1 82 79 */ bl Move__4dBgWFv -/* 8046374C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80463750 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80463754 98 1F 05 C8 */ stb r0, 0x5c8(r31) -/* 80463758 7F A3 EB 78 */ mr r3, r29 -/* 8046375C 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463760 4B BE 4A 1D */ bl cutEnd__16dEvent_manager_cFi -/* 80463764 48 00 06 B0 */ b lbl_80463E14 -lbl_80463768: -/* 80463768 7F E3 FB 78 */ mr r3, r31 -/* 8046376C 4B FF E0 21 */ bl adjustmentAngle__10daDoor20_cFv -/* 80463770 2C 03 00 00 */ cmpwi r3, 0 -/* 80463774 41 82 06 A0 */ beq lbl_80463E14 -/* 80463778 7F A3 EB 78 */ mr r3, r29 -/* 8046377C 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463780 4B BE 49 FD */ bl cutEnd__16dEvent_manager_cFi -/* 80463784 48 00 06 90 */ b lbl_80463E14 -lbl_80463788: -/* 80463788 7F E3 FB 78 */ mr r3, r31 -/* 8046378C 4B FF E0 E9 */ bl adjustmentProc__10daDoor20_cFv -/* 80463790 2C 03 00 00 */ cmpwi r3, 0 -/* 80463794 41 82 06 80 */ beq lbl_80463E14 -/* 80463798 7F A3 EB 78 */ mr r3, r29 -/* 8046379C 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 804637A0 4B BE 49 DD */ bl cutEnd__16dEvent_manager_cFi -/* 804637A4 48 00 06 70 */ b lbl_80463E14 -lbl_804637A8: -/* 804637A8 88 1F 05 F1 */ lbz r0, 0x5f1(r31) -/* 804637AC 28 00 00 00 */ cmplwi r0, 0 -/* 804637B0 40 82 00 18 */ bne lbl_804637C8 -/* 804637B4 38 7F 05 84 */ addi r3, r31, 0x584 -/* 804637B8 4B BA 9C 71 */ bl play__14mDoExt_baseAnmFv -/* 804637BC 7C 7B 1B 78 */ mr r27, r3 -/* 804637C0 C0 3F 05 94 */ lfs f1, 0x594(r31) -/* 804637C4 48 00 00 14 */ b lbl_804637D8 -lbl_804637C8: -/* 804637C8 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 804637CC 4B BA 9C 5D */ bl play__14mDoExt_baseAnmFv -/* 804637D0 7C 7B 1B 78 */ mr r27, r3 -/* 804637D4 C0 3F 05 B0 */ lfs f1, 0x5b0(r31) -lbl_804637D8: -/* 804637D8 C0 1E 00 90 */ lfs f0, 0x90(r30) -/* 804637DC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 804637E0 40 82 01 00 */ bne lbl_804638E0 -/* 804637E4 3B 5C 3E C8 */ addi r26, r28, 0x3ec8 -/* 804637E8 7F 43 D3 78 */ mr r3, r26 -/* 804637EC 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 804637F0 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 804637F4 38 84 01 77 */ addi r4, r4, 0x177 -/* 804637F8 4B F0 51 9D */ bl strcmp -/* 804637FC 2C 03 00 00 */ cmpwi r3, 0 -/* 80463800 40 82 00 48 */ bne lbl_80463848 -/* 80463804 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008018B@ha */ -/* 80463808 38 03 01 8B */ addi r0, r3, 0x018B /* 0x0008018B@l */ -/* 8046380C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80463810 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80463814 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80463818 80 63 00 00 */ lwz r3, 0(r3) -/* 8046381C 38 81 00 34 */ addi r4, r1, 0x34 -/* 80463820 38 BF 05 E0 */ addi r5, r31, 0x5e0 -/* 80463824 38 C0 00 00 */ li r6, 0 -/* 80463828 38 E0 00 00 */ li r7, 0 -/* 8046382C C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463830 FC 40 08 90 */ fmr f2, f1 -/* 80463834 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80463838 FC 80 18 90 */ fmr f4, f3 -/* 8046383C 39 00 00 00 */ li r8, 0 -/* 80463840 4B E4 81 45 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80463844 48 00 01 A0 */ b lbl_804639E4 -lbl_80463848: -/* 80463848 7F 43 D3 78 */ mr r3, r26 -/* 8046384C 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463850 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463854 38 84 01 7E */ addi r4, r4, 0x17e -/* 80463858 4B F0 51 3D */ bl strcmp -/* 8046385C 2C 03 00 00 */ cmpwi r3, 0 -/* 80463860 41 82 00 3C */ beq lbl_8046389C -/* 80463864 7F 43 D3 78 */ mr r3, r26 -/* 80463868 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 8046386C 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463870 38 84 01 85 */ addi r4, r4, 0x185 -/* 80463874 4B F0 51 21 */ bl strcmp -/* 80463878 2C 03 00 00 */ cmpwi r3, 0 -/* 8046387C 41 82 00 20 */ beq lbl_8046389C -/* 80463880 7F 43 D3 78 */ mr r3, r26 -/* 80463884 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463888 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 8046388C 38 84 01 52 */ addi r4, r4, 0x152 -/* 80463890 4B F0 51 05 */ bl strcmp -/* 80463894 2C 03 00 00 */ cmpwi r3, 0 -/* 80463898 40 82 01 4C */ bne lbl_804639E4 -lbl_8046389C: -/* 8046389C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801FF@ha */ -/* 804638A0 38 03 01 FF */ addi r0, r3, 0x01FF /* 0x000801FF@l */ -/* 804638A4 90 01 00 30 */ stw r0, 0x30(r1) -/* 804638A8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804638AC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804638B0 80 63 00 00 */ lwz r3, 0(r3) -/* 804638B4 38 81 00 30 */ addi r4, r1, 0x30 -/* 804638B8 38 BF 05 E0 */ addi r5, r31, 0x5e0 -/* 804638BC 38 C0 00 00 */ li r6, 0 -/* 804638C0 38 E0 00 00 */ li r7, 0 -/* 804638C4 C0 3E 00 04 */ lfs f1, 4(r30) -/* 804638C8 FC 40 08 90 */ fmr f2, f1 -/* 804638CC C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 804638D0 FC 80 18 90 */ fmr f4, f3 -/* 804638D4 39 00 00 00 */ li r8, 0 -/* 804638D8 4B E4 80 AD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804638DC 48 00 01 08 */ b lbl_804639E4 -lbl_804638E0: -/* 804638E0 C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 804638E4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 804638E8 40 82 00 FC */ bne lbl_804639E4 -/* 804638EC 3B 5C 3E C8 */ addi r26, r28, 0x3ec8 -/* 804638F0 7F 43 D3 78 */ mr r3, r26 -/* 804638F4 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 804638F8 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 804638FC 38 84 01 7E */ addi r4, r4, 0x17e -/* 80463900 4B F0 50 95 */ bl strcmp -/* 80463904 2C 03 00 00 */ cmpwi r3, 0 -/* 80463908 41 82 00 3C */ beq lbl_80463944 -/* 8046390C 7F 43 D3 78 */ mr r3, r26 -/* 80463910 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463914 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463918 38 84 01 85 */ addi r4, r4, 0x185 -/* 8046391C 4B F0 50 79 */ bl strcmp -/* 80463920 2C 03 00 00 */ cmpwi r3, 0 -/* 80463924 41 82 00 20 */ beq lbl_80463944 -/* 80463928 7F 43 D3 78 */ mr r3, r26 -/* 8046392C 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463930 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463934 38 84 01 52 */ addi r4, r4, 0x152 -/* 80463938 4B F0 50 5D */ bl strcmp -/* 8046393C 2C 03 00 00 */ cmpwi r3, 0 -/* 80463940 40 82 00 48 */ bne lbl_80463988 -lbl_80463944: -/* 80463944 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080200@ha */ -/* 80463948 38 03 02 00 */ addi r0, r3, 0x0200 /* 0x00080200@l */ -/* 8046394C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80463950 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80463954 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80463958 80 63 00 00 */ lwz r3, 0(r3) -/* 8046395C 38 81 00 2C */ addi r4, r1, 0x2c -/* 80463960 38 A0 00 00 */ li r5, 0 -/* 80463964 38 C0 00 00 */ li r6, 0 -/* 80463968 38 E0 00 00 */ li r7, 0 -/* 8046396C C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463970 FC 40 08 90 */ fmr f2, f1 -/* 80463974 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80463978 FC 80 18 90 */ fmr f4, f3 -/* 8046397C 39 00 00 00 */ li r8, 0 -/* 80463980 4B E4 80 05 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80463984 48 00 00 60 */ b lbl_804639E4 -lbl_80463988: -/* 80463988 7F 43 D3 78 */ mr r3, r26 -/* 8046398C 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463990 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463994 38 84 01 77 */ addi r4, r4, 0x177 -/* 80463998 4B F0 4F FD */ bl strcmp -/* 8046399C 2C 03 00 00 */ cmpwi r3, 0 -/* 804639A0 40 82 00 44 */ bne lbl_804639E4 -/* 804639A4 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008018C@ha */ -/* 804639A8 38 03 01 8C */ addi r0, r3, 0x018C /* 0x0008018C@l */ -/* 804639AC 90 01 00 28 */ stw r0, 0x28(r1) -/* 804639B0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804639B4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804639B8 80 63 00 00 */ lwz r3, 0(r3) -/* 804639BC 38 81 00 28 */ addi r4, r1, 0x28 -/* 804639C0 38 BF 05 E0 */ addi r5, r31, 0x5e0 -/* 804639C4 38 C0 00 00 */ li r6, 0 -/* 804639C8 38 E0 00 00 */ li r7, 0 -/* 804639CC C0 3E 00 04 */ lfs f1, 4(r30) -/* 804639D0 FC 40 08 90 */ fmr f2, f1 -/* 804639D4 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 804639D8 FC 80 18 90 */ fmr f4, f3 -/* 804639DC 39 00 00 00 */ li r8, 0 -/* 804639E0 4B E4 7F A5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_804639E4: -/* 804639E4 7F A3 EB 78 */ mr r3, r29 -/* 804639E8 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 804639EC 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 804639F0 38 84 01 8D */ addi r4, r4, 0x18d -/* 804639F4 38 A0 00 00 */ li r5, 0 -/* 804639F8 38 C0 00 00 */ li r6, 0 -/* 804639FC 4B BE 41 21 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80463A00 90 7F 06 78 */ stw r3, 0x678(r31) -/* 80463A04 88 1F 06 7C */ lbz r0, 0x67c(r31) -/* 80463A08 28 00 00 00 */ cmplwi r0, 0 -/* 80463A0C 40 82 00 18 */ bne lbl_80463A24 -/* 80463A10 7F A3 EB 78 */ mr r3, r29 -/* 80463A14 80 9F 06 78 */ lwz r4, 0x678(r31) -/* 80463A18 4B BE 43 35 */ bl getIsAddvance__16dEvent_manager_cFi -/* 80463A1C 2C 03 00 00 */ cmpwi r3, 0 -/* 80463A20 41 82 00 18 */ beq lbl_80463A38 -lbl_80463A24: -/* 80463A24 88 1F 06 7F */ lbz r0, 0x67f(r31) -/* 80463A28 98 1F 06 74 */ stb r0, 0x674(r31) -/* 80463A2C 38 00 00 01 */ li r0, 1 -/* 80463A30 98 1F 06 7C */ stb r0, 0x67c(r31) -/* 80463A34 48 00 00 0C */ b lbl_80463A40 -lbl_80463A38: -/* 80463A38 88 1F 06 7E */ lbz r0, 0x67e(r31) -/* 80463A3C 98 1F 06 74 */ stb r0, 0x674(r31) -lbl_80463A40: -/* 80463A40 2C 1B 00 00 */ cmpwi r27, 0 -/* 80463A44 41 82 03 D0 */ beq lbl_80463E14 -/* 80463A48 7F E3 FB 78 */ mr r3, r31 -/* 80463A4C 4B FF EF D1 */ bl closeEnd2__10daDoor20_cFv -/* 80463A50 80 7F 05 C4 */ lwz r3, 0x5c4(r31) -/* 80463A54 4B E0 47 81 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80463A58 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80463A5C 40 82 00 14 */ bne lbl_80463A70 -/* 80463A60 7F 83 E3 78 */ mr r3, r28 -/* 80463A64 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 80463A68 7F E5 FB 78 */ mr r5, r31 -/* 80463A6C 4B C1 0F 9D */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80463A70: -/* 80463A70 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 80463A74 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 80463A78 7F A3 EB 78 */ mr r3, r29 -/* 80463A7C 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463A80 4B BE 46 FD */ bl cutEnd__16dEvent_manager_cFi -/* 80463A84 48 00 03 90 */ b lbl_80463E14 -lbl_80463A88: -/* 80463A88 88 1F 05 F1 */ lbz r0, 0x5f1(r31) -/* 80463A8C 28 00 00 00 */ cmplwi r0, 0 -/* 80463A90 40 82 00 18 */ bne lbl_80463AA8 -/* 80463A94 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80463A98 4B BA 99 91 */ bl play__14mDoExt_baseAnmFv -/* 80463A9C 7C 7B 1B 78 */ mr r27, r3 -/* 80463AA0 C0 3F 05 B0 */ lfs f1, 0x5b0(r31) -/* 80463AA4 48 00 00 14 */ b lbl_80463AB8 -lbl_80463AA8: -/* 80463AA8 38 7F 05 84 */ addi r3, r31, 0x584 -/* 80463AAC 4B BA 99 7D */ bl play__14mDoExt_baseAnmFv -/* 80463AB0 7C 7B 1B 78 */ mr r27, r3 -/* 80463AB4 C0 3F 05 94 */ lfs f1, 0x594(r31) -lbl_80463AB8: -/* 80463AB8 C0 1E 00 94 */ lfs f0, 0x94(r30) -/* 80463ABC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80463AC0 40 82 01 00 */ bne lbl_80463BC0 -/* 80463AC4 3B 5C 3E C8 */ addi r26, r28, 0x3ec8 -/* 80463AC8 7F 43 D3 78 */ mr r3, r26 -/* 80463ACC 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463AD0 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463AD4 38 84 01 77 */ addi r4, r4, 0x177 -/* 80463AD8 4B F0 4E BD */ bl strcmp -/* 80463ADC 2C 03 00 00 */ cmpwi r3, 0 -/* 80463AE0 40 82 00 48 */ bne lbl_80463B28 -/* 80463AE4 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008018B@ha */ -/* 80463AE8 38 03 01 8B */ addi r0, r3, 0x018B /* 0x0008018B@l */ -/* 80463AEC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80463AF0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80463AF4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80463AF8 80 63 00 00 */ lwz r3, 0(r3) -/* 80463AFC 38 81 00 24 */ addi r4, r1, 0x24 -/* 80463B00 38 BF 05 E0 */ addi r5, r31, 0x5e0 -/* 80463B04 38 C0 00 00 */ li r6, 0 -/* 80463B08 38 E0 00 00 */ li r7, 0 -/* 80463B0C C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463B10 FC 40 08 90 */ fmr f2, f1 -/* 80463B14 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80463B18 FC 80 18 90 */ fmr f4, f3 -/* 80463B1C 39 00 00 00 */ li r8, 0 -/* 80463B20 4B E4 7E 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80463B24 48 00 01 A0 */ b lbl_80463CC4 -lbl_80463B28: -/* 80463B28 7F 43 D3 78 */ mr r3, r26 -/* 80463B2C 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463B30 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463B34 38 84 01 7E */ addi r4, r4, 0x17e -/* 80463B38 4B F0 4E 5D */ bl strcmp -/* 80463B3C 2C 03 00 00 */ cmpwi r3, 0 -/* 80463B40 41 82 00 3C */ beq lbl_80463B7C -/* 80463B44 7F 43 D3 78 */ mr r3, r26 -/* 80463B48 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463B4C 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463B50 38 84 01 85 */ addi r4, r4, 0x185 -/* 80463B54 4B F0 4E 41 */ bl strcmp -/* 80463B58 2C 03 00 00 */ cmpwi r3, 0 -/* 80463B5C 41 82 00 20 */ beq lbl_80463B7C -/* 80463B60 7F 43 D3 78 */ mr r3, r26 -/* 80463B64 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463B68 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463B6C 38 84 01 52 */ addi r4, r4, 0x152 -/* 80463B70 4B F0 4E 25 */ bl strcmp -/* 80463B74 2C 03 00 00 */ cmpwi r3, 0 -/* 80463B78 40 82 01 4C */ bne lbl_80463CC4 -lbl_80463B7C: -/* 80463B7C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801FF@ha */ -/* 80463B80 38 03 01 FF */ addi r0, r3, 0x01FF /* 0x000801FF@l */ -/* 80463B84 90 01 00 20 */ stw r0, 0x20(r1) -/* 80463B88 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80463B8C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80463B90 80 63 00 00 */ lwz r3, 0(r3) -/* 80463B94 38 81 00 20 */ addi r4, r1, 0x20 -/* 80463B98 38 BF 05 E0 */ addi r5, r31, 0x5e0 -/* 80463B9C 38 C0 00 00 */ li r6, 0 -/* 80463BA0 38 E0 00 00 */ li r7, 0 -/* 80463BA4 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463BA8 FC 40 08 90 */ fmr f2, f1 -/* 80463BAC C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80463BB0 FC 80 18 90 */ fmr f4, f3 -/* 80463BB4 39 00 00 00 */ li r8, 0 -/* 80463BB8 4B E4 7D CD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80463BBC 48 00 01 08 */ b lbl_80463CC4 -lbl_80463BC0: -/* 80463BC0 C0 1E 00 98 */ lfs f0, 0x98(r30) -/* 80463BC4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80463BC8 40 82 00 FC */ bne lbl_80463CC4 -/* 80463BCC 3B 5C 3E C8 */ addi r26, r28, 0x3ec8 -/* 80463BD0 7F 43 D3 78 */ mr r3, r26 -/* 80463BD4 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463BD8 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463BDC 38 84 01 7E */ addi r4, r4, 0x17e -/* 80463BE0 4B F0 4D B5 */ bl strcmp -/* 80463BE4 2C 03 00 00 */ cmpwi r3, 0 -/* 80463BE8 41 82 00 3C */ beq lbl_80463C24 -/* 80463BEC 7F 43 D3 78 */ mr r3, r26 -/* 80463BF0 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463BF4 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463BF8 38 84 01 85 */ addi r4, r4, 0x185 -/* 80463BFC 4B F0 4D 99 */ bl strcmp -/* 80463C00 2C 03 00 00 */ cmpwi r3, 0 -/* 80463C04 41 82 00 20 */ beq lbl_80463C24 -/* 80463C08 7F 43 D3 78 */ mr r3, r26 -/* 80463C0C 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463C10 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463C14 38 84 01 52 */ addi r4, r4, 0x152 -/* 80463C18 4B F0 4D 7D */ bl strcmp -/* 80463C1C 2C 03 00 00 */ cmpwi r3, 0 -/* 80463C20 40 82 00 48 */ bne lbl_80463C68 -lbl_80463C24: -/* 80463C24 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080200@ha */ -/* 80463C28 38 03 02 00 */ addi r0, r3, 0x0200 /* 0x00080200@l */ -/* 80463C2C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80463C30 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80463C34 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80463C38 80 63 00 00 */ lwz r3, 0(r3) -/* 80463C3C 38 81 00 1C */ addi r4, r1, 0x1c -/* 80463C40 38 A0 00 00 */ li r5, 0 -/* 80463C44 38 C0 00 00 */ li r6, 0 -/* 80463C48 38 E0 00 00 */ li r7, 0 -/* 80463C4C C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463C50 FC 40 08 90 */ fmr f2, f1 -/* 80463C54 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80463C58 FC 80 18 90 */ fmr f4, f3 -/* 80463C5C 39 00 00 00 */ li r8, 0 -/* 80463C60 4B E4 7D 25 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80463C64 48 00 00 60 */ b lbl_80463CC4 -lbl_80463C68: -/* 80463C68 7F 43 D3 78 */ mr r3, r26 -/* 80463C6C 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463C70 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463C74 38 84 01 77 */ addi r4, r4, 0x177 -/* 80463C78 4B F0 4D 1D */ bl strcmp -/* 80463C7C 2C 03 00 00 */ cmpwi r3, 0 -/* 80463C80 40 82 00 44 */ bne lbl_80463CC4 -/* 80463C84 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008018C@ha */ -/* 80463C88 38 03 01 8C */ addi r0, r3, 0x018C /* 0x0008018C@l */ -/* 80463C8C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80463C90 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80463C94 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80463C98 80 63 00 00 */ lwz r3, 0(r3) -/* 80463C9C 38 81 00 18 */ addi r4, r1, 0x18 -/* 80463CA0 38 BF 05 E0 */ addi r5, r31, 0x5e0 -/* 80463CA4 38 C0 00 00 */ li r6, 0 -/* 80463CA8 38 E0 00 00 */ li r7, 0 -/* 80463CAC C0 3E 00 04 */ lfs f1, 4(r30) -/* 80463CB0 FC 40 08 90 */ fmr f2, f1 -/* 80463CB4 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80463CB8 FC 80 18 90 */ fmr f4, f3 -/* 80463CBC 39 00 00 00 */ li r8, 0 -/* 80463CC0 4B E4 7C C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80463CC4: -/* 80463CC4 7F A3 EB 78 */ mr r3, r29 -/* 80463CC8 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80463CCC 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80463CD0 38 84 01 8D */ addi r4, r4, 0x18d -/* 80463CD4 38 A0 00 00 */ li r5, 0 -/* 80463CD8 38 C0 00 00 */ li r6, 0 -/* 80463CDC 4B BE 3E 41 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80463CE0 90 7F 06 78 */ stw r3, 0x678(r31) -/* 80463CE4 88 1F 06 7C */ lbz r0, 0x67c(r31) -/* 80463CE8 28 00 00 00 */ cmplwi r0, 0 -/* 80463CEC 40 82 00 18 */ bne lbl_80463D04 -/* 80463CF0 7F A3 EB 78 */ mr r3, r29 -/* 80463CF4 80 9F 06 78 */ lwz r4, 0x678(r31) -/* 80463CF8 4B BE 40 55 */ bl getIsAddvance__16dEvent_manager_cFi -/* 80463CFC 2C 03 00 00 */ cmpwi r3, 0 -/* 80463D00 41 82 00 18 */ beq lbl_80463D18 -lbl_80463D04: -/* 80463D04 88 1F 06 7F */ lbz r0, 0x67f(r31) -/* 80463D08 98 1F 06 74 */ stb r0, 0x674(r31) -/* 80463D0C 38 00 00 01 */ li r0, 1 -/* 80463D10 98 1F 06 7C */ stb r0, 0x67c(r31) -/* 80463D14 48 00 00 0C */ b lbl_80463D20 -lbl_80463D18: -/* 80463D18 88 1F 06 7E */ lbz r0, 0x67e(r31) -/* 80463D1C 98 1F 06 74 */ stb r0, 0x674(r31) -lbl_80463D20: -/* 80463D20 2C 1B 00 00 */ cmpwi r27, 0 -/* 80463D24 41 82 00 F0 */ beq lbl_80463E14 -/* 80463D28 7F E3 FB 78 */ mr r3, r31 -/* 80463D2C 4B FF EC F1 */ bl closeEnd2__10daDoor20_cFv -/* 80463D30 80 7F 05 C4 */ lwz r3, 0x5c4(r31) -/* 80463D34 4B E0 44 A1 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80463D38 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80463D3C 40 82 00 14 */ bne lbl_80463D50 -/* 80463D40 7F 83 E3 78 */ mr r3, r28 -/* 80463D44 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 80463D48 7F E5 FB 78 */ mr r5, r31 -/* 80463D4C 4B C1 0C BD */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80463D50: -/* 80463D50 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 80463D54 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 80463D58 7F A3 EB 78 */ mr r3, r29 -/* 80463D5C 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463D60 4B BE 44 1D */ bl cutEnd__16dEvent_manager_cFi -/* 80463D64 48 00 00 B0 */ b lbl_80463E14 -lbl_80463D68: -/* 80463D68 7F A3 EB 78 */ mr r3, r29 -/* 80463D6C 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463D70 4B BE 44 0D */ bl cutEnd__16dEvent_manager_cFi -/* 80463D74 48 00 00 A0 */ b lbl_80463E14 -lbl_80463D78: -/* 80463D78 7F E3 FB 78 */ mr r3, r31 -/* 80463D7C 4B BD 64 9D */ bl getMsgNo__13door_param2_cFP10fopAc_ac_c -/* 80463D80 54 7A 04 3E */ clrlwi r26, r3, 0x10 -/* 80463D84 7F E3 FB 78 */ mr r3, r31 -/* 80463D88 4B BD 64 6D */ bl isMsgDoor__13door_param2_cFP10fopAc_ac_c -/* 80463D8C 2C 03 00 00 */ cmpwi r3, 0 -/* 80463D90 41 82 00 48 */ beq lbl_80463DD8 -/* 80463D94 3C 1A 00 00 */ addis r0, r26, 0 -/* 80463D98 28 00 FF FF */ cmplwi r0, 0xffff -/* 80463D9C 41 82 00 3C */ beq lbl_80463DD8 -/* 80463DA0 A0 1C 40 6C */ lhz r0, 0x406c(r28) -/* 80463DA4 54 00 04 3C */ rlwinm r0, r0, 0, 0x10, 0x1e -/* 80463DA8 B0 1C 40 6C */ sth r0, 0x406c(r28) -/* 80463DAC 38 7F 06 24 */ addi r3, r31, 0x624 -/* 80463DB0 7F E4 FB 78 */ mr r4, r31 -/* 80463DB4 38 A0 00 00 */ li r5, 0 -/* 80463DB8 38 C0 00 00 */ li r6, 0 -/* 80463DBC 4B DE 65 1D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80463DC0 2C 03 00 00 */ cmpwi r3, 0 -/* 80463DC4 41 82 00 50 */ beq lbl_80463E14 -/* 80463DC8 7F A3 EB 78 */ mr r3, r29 -/* 80463DCC 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463DD0 4B BE 43 AD */ bl cutEnd__16dEvent_manager_cFi -/* 80463DD4 48 00 00 40 */ b lbl_80463E14 -lbl_80463DD8: -/* 80463DD8 7F A3 EB 78 */ mr r3, r29 -/* 80463DDC 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463DE0 4B BE 43 9D */ bl cutEnd__16dEvent_manager_cFi -/* 80463DE4 48 00 00 30 */ b lbl_80463E14 -lbl_80463DE8: -/* 80463DE8 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 80463DEC 4B BA 96 3D */ bl play__14mDoExt_baseAnmFv -/* 80463DF0 2C 03 00 00 */ cmpwi r3, 0 -/* 80463DF4 41 82 00 20 */ beq lbl_80463E14 -/* 80463DF8 7F A3 EB 78 */ mr r3, r29 -/* 80463DFC 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463E00 4B BE 43 7D */ bl cutEnd__16dEvent_manager_cFi -/* 80463E04 48 00 00 10 */ b lbl_80463E14 -lbl_80463E08: -/* 80463E08 7F A3 EB 78 */ mr r3, r29 -/* 80463E0C 80 9F 06 CC */ lwz r4, 0x6cc(r31) -/* 80463E10 4B BE 43 6D */ bl cutEnd__16dEvent_manager_cFi -lbl_80463E14: -/* 80463E14 38 60 00 00 */ li r3, 0 -/* 80463E18 39 61 00 70 */ addi r11, r1, 0x70 -/* 80463E1C 4B EF E4 01 */ bl _restgpr_26 -/* 80463E20 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80463E24 7C 08 03 A6 */ mtlr r0 -/* 80463E28 38 21 00 70 */ addi r1, r1, 0x70 -/* 80463E2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/drawCheck__10daDoor20_cFi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/drawCheck__10daDoor20_cFi.s deleted file mode 100644 index f8f1e53956..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/drawCheck__10daDoor20_cFi.s +++ /dev/null @@ -1,84 +0,0 @@ -lbl_80464CEC: -/* 80464CEC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80464CF0 7C 08 02 A6 */ mflr r0 -/* 80464CF4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80464CF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80464CFC 4B EF D4 DD */ bl _savegpr_28 -/* 80464D00 7C 7C 1B 78 */ mr r28, r3 -/* 80464D04 4B FF FE 39 */ bl adjoinPlayer__10daDoor20_cFv -/* 80464D08 2C 03 00 00 */ cmpwi r3, 0 -/* 80464D0C 40 82 00 20 */ bne lbl_80464D2C -/* 80464D10 A0 1C 00 F8 */ lhz r0, 0xf8(r28) -/* 80464D14 28 00 00 02 */ cmplwi r0, 2 -/* 80464D18 41 82 00 14 */ beq lbl_80464D2C -/* 80464D1C 28 00 00 03 */ cmplwi r0, 3 -/* 80464D20 41 82 00 0C */ beq lbl_80464D2C -/* 80464D24 38 60 00 00 */ li r3, 0 -/* 80464D28 48 00 00 D8 */ b lbl_80464E00 -lbl_80464D2C: -/* 80464D2C 7F 83 E3 78 */ mr r3, r28 -/* 80464D30 4B BD 54 89 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464D34 54 7E 06 3E */ clrlwi r30, r3, 0x18 -/* 80464D38 7F 83 E3 78 */ mr r3, r28 -/* 80464D3C 4B BD 54 89 */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464D40 54 7D 06 3E */ clrlwi r29, r3, 0x18 -/* 80464D44 7F 83 E3 78 */ mr r3, r28 -/* 80464D48 4B BD 54 59 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80464D4C 7F 83 E3 78 */ mr r3, r28 -/* 80464D50 4B BD 54 5D */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80464D54 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80464D58 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80464D5C 7C 00 07 74 */ extsb r0, r0 -/* 80464D60 7C 1E 00 00 */ cmpw r30, r0 -/* 80464D64 41 82 00 0C */ beq lbl_80464D70 -/* 80464D68 7C 1D 00 00 */ cmpw r29, r0 -/* 80464D6C 40 82 00 0C */ bne lbl_80464D78 -lbl_80464D70: -/* 80464D70 98 1C 04 8C */ stb r0, 0x48c(r28) -/* 80464D74 48 00 00 44 */ b lbl_80464DB8 -lbl_80464D78: -/* 80464D78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464D7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464D80 3B E3 4E C4 */ addi r31, r3, 0x4ec4 -/* 80464D84 7F E3 FB 78 */ mr r3, r31 -/* 80464D88 7F C4 F3 78 */ mr r4, r30 -/* 80464D8C 4B BB F7 5D */ bl checkRoomDisp__20dStage_roomControl_cCFi -/* 80464D90 2C 03 00 00 */ cmpwi r3, 0 -/* 80464D94 41 82 00 0C */ beq lbl_80464DA0 -/* 80464D98 9B DC 04 8C */ stb r30, 0x48c(r28) -/* 80464D9C 48 00 00 1C */ b lbl_80464DB8 -lbl_80464DA0: -/* 80464DA0 7F E3 FB 78 */ mr r3, r31 -/* 80464DA4 7F A4 EB 78 */ mr r4, r29 -/* 80464DA8 4B BB F7 41 */ bl checkRoomDisp__20dStage_roomControl_cCFi -/* 80464DAC 2C 03 00 00 */ cmpwi r3, 0 -/* 80464DB0 41 82 00 08 */ beq lbl_80464DB8 -/* 80464DB4 9B BC 04 8C */ stb r29, 0x48c(r28) -lbl_80464DB8: -/* 80464DB8 80 1C 06 78 */ lwz r0, 0x678(r28) -/* 80464DBC 2C 00 FF FF */ cmpwi r0, -1 -/* 80464DC0 41 82 00 0C */ beq lbl_80464DCC -/* 80464DC4 88 1C 06 74 */ lbz r0, 0x674(r28) -/* 80464DC8 98 1C 04 8C */ stb r0, 0x48c(r28) -lbl_80464DCC: -/* 80464DCC 88 1C 04 8C */ lbz r0, 0x48c(r28) -/* 80464DD0 98 1C 04 E2 */ stb r0, 0x4e2(r28) -/* 80464DD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464DD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464DDC 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 80464DE0 88 9C 04 8C */ lbz r4, 0x48c(r28) -/* 80464DE4 7C 84 07 74 */ extsb r4, r4 -/* 80464DE8 4B BB F7 01 */ bl checkRoomDisp__20dStage_roomControl_cCFi -/* 80464DEC 2C 03 00 00 */ cmpwi r3, 0 -/* 80464DF0 40 82 00 0C */ bne lbl_80464DFC -/* 80464DF4 38 60 00 01 */ li r3, 1 -/* 80464DF8 48 00 00 08 */ b lbl_80464E00 -lbl_80464DFC: -/* 80464DFC 38 60 00 01 */ li r3, 1 -lbl_80464E00: -/* 80464E00 39 61 00 20 */ addi r11, r1, 0x20 -/* 80464E04 4B EF D4 21 */ bl _restgpr_28 -/* 80464E08 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80464E0C 7C 08 03 A6 */ mtlr r0 -/* 80464E10 38 21 00 20 */ addi r1, r1, 0x20 -/* 80464E14 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__10daDoor20_cFv.s deleted file mode 100644 index 75eb1f93ab..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__10daDoor20_cFv.s +++ /dev/null @@ -1,174 +0,0 @@ -lbl_804643B0: -/* 804643B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804643B4 7C 08 02 A6 */ mflr r0 -/* 804643B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 804643BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804643C0 93 C1 00 08 */ stw r30, 8(r1) -/* 804643C4 7C 7E 1B 78 */ mr r30, r3 -/* 804643C8 38 80 00 00 */ li r4, 0 -/* 804643CC 48 00 09 21 */ bl drawCheck__10daDoor20_cFi -/* 804643D0 2C 03 00 00 */ cmpwi r3, 0 -/* 804643D4 40 82 00 3C */ bne lbl_80464410 -/* 804643D8 88 1E 05 C9 */ lbz r0, 0x5c9(r30) -/* 804643DC 28 00 00 00 */ cmplwi r0, 0 -/* 804643E0 40 82 00 20 */ bne lbl_80464400 -/* 804643E4 38 00 00 01 */ li r0, 1 -/* 804643E8 98 1E 05 C9 */ stb r0, 0x5c9(r30) -/* 804643EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804643F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804643F4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 804643F8 80 9E 05 C4 */ lwz r4, 0x5c4(r30) -/* 804643FC 4B C0 FE 55 */ bl Release__4cBgSFP9dBgW_Base -lbl_80464400: -/* 80464400 7F C3 F3 78 */ mr r3, r30 -/* 80464404 48 00 06 E1 */ bl deleteKey__10daDoor20_cFv -/* 80464408 38 60 00 01 */ li r3, 1 -/* 8046440C 48 00 02 14 */ b lbl_80464620 -lbl_80464410: -/* 80464410 88 1E 05 C9 */ lbz r0, 0x5c9(r30) -/* 80464414 28 00 00 00 */ cmplwi r0, 0 -/* 80464418 41 82 00 4C */ beq lbl_80464464 -/* 8046441C 38 00 00 00 */ li r0, 0 -/* 80464420 98 1E 05 C9 */ stb r0, 0x5c9(r30) -/* 80464424 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464428 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046442C 3B E4 0F 38 */ addi r31, r4, 0xf38 -/* 80464430 38 7F 3F 90 */ addi r3, r31, 0x3f90 -/* 80464434 80 84 4F 9C */ lwz r4, 0x4f9c(r4) -/* 80464438 4B BD EE B5 */ bl convPId__14dEvt_control_cFUi -/* 8046443C 7C 03 F0 40 */ cmplw r3, r30 -/* 80464440 41 82 00 14 */ beq lbl_80464454 -/* 80464444 7F E3 FB 78 */ mr r3, r31 -/* 80464448 80 9E 05 C4 */ lwz r4, 0x5c4(r30) -/* 8046444C 7F C5 F3 78 */ mr r5, r30 -/* 80464450 4B C1 05 B9 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80464454: -/* 80464454 7F C3 F3 78 */ mr r3, r30 -/* 80464458 48 00 04 01 */ bl createKey__10daDoor20_cFv -/* 8046445C 7F C3 F3 78 */ mr r3, r30 -/* 80464460 48 00 01 D9 */ bl setDoorAngleSpec__10daDoor20_cFv -lbl_80464464: -/* 80464464 7F C3 F3 78 */ mr r3, r30 -/* 80464468 4B BB 68 85 */ bl fopAcM_cullingCheck__FPC10fopAc_ac_c -/* 8046446C 2C 03 00 00 */ cmpwi r3, 0 -/* 80464470 41 82 00 0C */ beq lbl_8046447C -/* 80464474 38 60 00 01 */ li r3, 1 -/* 80464478 48 00 01 A8 */ b lbl_80464620 -lbl_8046447C: -/* 8046447C 7F C3 F3 78 */ mr r3, r30 -/* 80464480 4B FF E6 D9 */ bl calcMtx__10daDoor20_cFv -/* 80464484 A0 1E 00 F8 */ lhz r0, 0xf8(r30) -/* 80464488 28 00 00 03 */ cmplwi r0, 3 -/* 8046448C 41 82 00 34 */ beq lbl_804644C0 -/* 80464490 88 1E 05 C8 */ lbz r0, 0x5c8(r30) -/* 80464494 7C 04 07 74 */ extsb r4, r0 -/* 80464498 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046449C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 804644A0 7C 00 07 74 */ extsb r0, r0 -/* 804644A4 7C 04 00 00 */ cmpw r4, r0 -/* 804644A8 41 82 00 18 */ beq lbl_804644C0 -/* 804644AC 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 804644B0 4B C1 75 11 */ bl Move__4dBgWFv -/* 804644B4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 804644B8 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 804644BC 98 1E 05 C8 */ stb r0, 0x5c8(r30) -lbl_804644C0: -/* 804644C0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 804644C4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 804644C8 38 80 00 14 */ li r4, 0x14 -/* 804644CC 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 804644D0 38 DE 01 0C */ addi r6, r30, 0x10c -/* 804644D4 4B D3 F2 F1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 804644D8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 804644DC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 804644E0 80 9E 05 7C */ lwz r4, 0x57c(r30) -/* 804644E4 80 84 00 04 */ lwz r4, 4(r4) -/* 804644E8 38 BE 01 0C */ addi r5, r30, 0x10c -/* 804644EC 4B D4 08 B5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 804644F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804644F4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804644F8 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 804644FC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80464500 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80464504 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80464508 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 8046450C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80464510 7F C3 F3 78 */ mr r3, r30 -/* 80464514 4B BD 5C 75 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80464518 2C 03 00 09 */ cmpwi r3, 9 -/* 8046451C 40 82 00 70 */ bne lbl_8046458C -/* 80464520 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 80464524 80 83 00 04 */ lwz r4, 4(r3) -/* 80464528 38 7E 05 84 */ addi r3, r30, 0x584 -/* 8046452C C0 3E 05 94 */ lfs f1, 0x594(r30) -/* 80464530 4B BA 94 9D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80464534 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 80464538 4B BA 97 8D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8046453C 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 80464540 80 63 00 04 */ lwz r3, 4(r3) -/* 80464544 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80464548 80 63 00 00 */ lwz r3, 0(r3) -/* 8046454C 38 00 00 00 */ li r0, 0 -/* 80464550 90 03 00 54 */ stw r0, 0x54(r3) -/* 80464554 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 80464558 80 83 00 04 */ lwz r4, 4(r3) -/* 8046455C 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 80464560 C0 3E 05 B0 */ lfs f1, 0x5b0(r30) -/* 80464564 4B BA 94 69 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80464568 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 8046456C 4B BA 97 59 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80464570 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 80464574 80 63 00 04 */ lwz r3, 4(r3) -/* 80464578 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8046457C 80 63 00 00 */ lwz r3, 0(r3) -/* 80464580 38 00 00 00 */ li r0, 0 -/* 80464584 90 03 00 54 */ stw r0, 0x54(r3) -/* 80464588 48 00 00 64 */ b lbl_804645EC -lbl_8046458C: -/* 8046458C 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 80464590 28 03 00 00 */ cmplwi r3, 0 -/* 80464594 41 82 00 18 */ beq lbl_804645AC -/* 80464598 80 9E 05 7C */ lwz r4, 0x57c(r30) -/* 8046459C 80 84 00 04 */ lwz r4, 4(r4) -/* 804645A0 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 804645A4 38 84 00 58 */ addi r4, r4, 0x58 -/* 804645A8 4B BA 91 31 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -lbl_804645AC: -/* 804645AC 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 804645B0 80 83 00 04 */ lwz r4, 4(r3) -/* 804645B4 38 7E 05 84 */ addi r3, r30, 0x584 -/* 804645B8 C0 3E 05 94 */ lfs f1, 0x594(r30) -/* 804645BC 4B BA 94 11 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 804645C0 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 804645C4 4B BA 97 01 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 804645C8 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 804645CC 80 63 00 04 */ lwz r3, 4(r3) -/* 804645D0 80 63 00 28 */ lwz r3, 0x28(r3) -/* 804645D4 80 63 00 00 */ lwz r3, 0(r3) -/* 804645D8 38 00 00 00 */ li r0, 0 -/* 804645DC 90 03 00 54 */ stw r0, 0x54(r3) -/* 804645E0 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 804645E4 80 63 00 04 */ lwz r3, 4(r3) -/* 804645E8 4B BA 98 09 */ bl mDoExt_btkAnmRemove__FP12J3DModelData -lbl_804645EC: -/* 804645EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804645F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804645F4 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 804645F8 90 1F 00 48 */ stw r0, 0x48(r31) -/* 804645FC 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80464600 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80464604 88 1E 06 D8 */ lbz r0, 0x6d8(r30) -/* 80464608 28 00 00 00 */ cmplwi r0, 0 -/* 8046460C 41 82 00 10 */ beq lbl_8046461C -/* 80464610 38 7E 06 D0 */ addi r3, r30, 0x6d0 -/* 80464614 7F C4 F3 78 */ mr r4, r30 -/* 80464618 48 00 1F 21 */ bl draw__12dDoor_stop_cFP10daDoor20_c -lbl_8046461C: -/* 8046461C 38 60 00 01 */ li r3, 1 -lbl_80464620: -/* 80464620 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80464624 83 C1 00 08 */ lwz r30, 8(r1) -/* 80464628 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8046462C 7C 08 03 A6 */ mtlr r0 -/* 80464630 38 21 00 10 */ addi r1, r1, 0x10 -/* 80464634 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__12dDoor_stop_cFP10daDoor20_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__12dDoor_stop_cFP10daDoor20_c.s deleted file mode 100644 index 40889d5709..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__12dDoor_stop_cFP10daDoor20_c.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80466538: -/* 80466538 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046653C 7C 08 02 A6 */ mflr r0 -/* 80466540 90 01 00 14 */ stw r0, 0x14(r1) -/* 80466544 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80466548 93 C1 00 08 */ stw r30, 8(r1) -/* 8046654C 7C 7E 1B 78 */ mr r30, r3 -/* 80466550 7C 9F 23 78 */ mr r31, r4 -/* 80466554 80 03 00 00 */ lwz r0, 0(r3) -/* 80466558 28 00 00 00 */ cmplwi r0, 0 -/* 8046655C 41 82 00 3C */ beq lbl_80466598 -/* 80466560 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80466564 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80466568 38 80 00 10 */ li r4, 0x10 -/* 8046656C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80466570 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80466574 4B D3 D2 51 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80466578 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046657C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80466580 80 9E 00 00 */ lwz r4, 0(r30) -/* 80466584 80 84 00 04 */ lwz r4, 4(r4) -/* 80466588 38 BF 01 0C */ addi r5, r31, 0x10c -/* 8046658C 4B D3 E8 15 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80466590 80 7E 00 00 */ lwz r3, 0(r30) -/* 80466594 4B BA 77 31 */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_80466598: -/* 80466598 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8046659C 83 C1 00 08 */ lwz r30, 8(r1) -/* 804665A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804665A4 7C 08 03 A6 */ mtlr r0 -/* 804665A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 804665AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/execute__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/execute__10daDoor20_cFv.s deleted file mode 100644 index 9a364968c7..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/execute__10daDoor20_cFv.s +++ /dev/null @@ -1,106 +0,0 @@ -lbl_80464240: -/* 80464240 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80464244 7C 08 02 A6 */ mflr r0 -/* 80464248 90 01 00 24 */ stw r0, 0x24(r1) -/* 8046424C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80464250 4B EF DF 8D */ bl _savegpr_29 -/* 80464254 7C 7F 1B 78 */ mr r31, r3 -/* 80464258 38 00 FF FF */ li r0, -1 -/* 8046425C 90 03 06 78 */ stw r0, 0x678(r3) -/* 80464260 48 00 0B B9 */ bl checkExecute__10daDoor20_cFv -/* 80464264 2C 03 00 01 */ cmpwi r3, 1 -/* 80464268 41 82 00 88 */ beq lbl_804642F0 -/* 8046426C 40 80 00 10 */ bge lbl_8046427C -/* 80464270 2C 03 00 00 */ cmpwi r3, 0 -/* 80464274 40 80 00 14 */ bge lbl_80464288 -/* 80464278 48 00 00 88 */ b lbl_80464300 -lbl_8046427C: -/* 8046427C 2C 03 00 03 */ cmpwi r3, 3 -/* 80464280 40 80 00 80 */ bge lbl_80464300 -/* 80464284 48 00 00 10 */ b lbl_80464294 -lbl_80464288: -/* 80464288 38 00 00 00 */ li r0, 0 -/* 8046428C 98 1F 06 90 */ stb r0, 0x690(r31) -/* 80464290 48 00 00 70 */ b lbl_80464300 -lbl_80464294: -/* 80464294 88 1F 06 90 */ lbz r0, 0x690(r31) -/* 80464298 2C 00 00 02 */ cmpwi r0, 2 -/* 8046429C 41 82 00 3C */ beq lbl_804642D8 -/* 804642A0 40 80 00 14 */ bge lbl_804642B4 -/* 804642A4 2C 00 00 00 */ cmpwi r0, 0 -/* 804642A8 41 82 00 18 */ beq lbl_804642C0 -/* 804642AC 40 80 00 20 */ bge lbl_804642CC -/* 804642B0 48 00 00 50 */ b lbl_80464300 -lbl_804642B4: -/* 804642B4 2C 00 00 04 */ cmpwi r0, 4 -/* 804642B8 40 80 00 48 */ bge lbl_80464300 -/* 804642BC 48 00 00 28 */ b lbl_804642E4 -lbl_804642C0: -/* 804642C0 7F E3 FB 78 */ mr r3, r31 -/* 804642C4 4B FF FF 29 */ bl actionInit__10daDoor20_cFv -/* 804642C8 48 00 00 38 */ b lbl_80464300 -lbl_804642CC: -/* 804642CC 7F E3 FB 78 */ mr r3, r31 -/* 804642D0 4B FF FC ED */ bl actionWait__10daDoor20_cFv -/* 804642D4 48 00 00 2C */ b lbl_80464300 -lbl_804642D8: -/* 804642D8 7F E3 FB 78 */ mr r3, r31 -/* 804642DC 4B FF FE 3D */ bl actionStopClose__10daDoor20_cFv -/* 804642E0 48 00 00 20 */ b lbl_80464300 -lbl_804642E4: -/* 804642E4 7F E3 FB 78 */ mr r3, r31 -/* 804642E8 4B FF FE 85 */ bl actionDemo__10daDoor20_cFv -/* 804642EC 48 00 00 14 */ b lbl_80464300 -lbl_804642F0: -/* 804642F0 7F E3 FB 78 */ mr r3, r31 -/* 804642F4 48 00 0B D1 */ bl startDemoProc__10daDoor20_cFv -/* 804642F8 7F E3 FB 78 */ mr r3, r31 -/* 804642FC 4B FF EC E5 */ bl demoProc__10daDoor20_cFv -lbl_80464300: -/* 80464300 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80464304 8C 03 0D 64 */ lbzu r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80464308 98 1F 06 7D */ stb r0, 0x67d(r31) -/* 8046430C 8B C3 00 00 */ lbz r30, 0(r3) -/* 80464310 7F DE 07 74 */ extsb r30, r30 -/* 80464314 7F E3 FB 78 */ mr r3, r31 -/* 80464318 4B BD 5E A1 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 8046431C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80464320 7C 1E 00 00 */ cmpw r30, r0 -/* 80464324 40 82 00 10 */ bne lbl_80464334 -/* 80464328 7F E3 FB 78 */ mr r3, r31 -/* 8046432C 4B BD 5F 05 */ bl getFLightInf__13door_param2_cFP10fopAc_ac_c -/* 80464330 48 00 00 0C */ b lbl_8046433C -lbl_80464334: -/* 80464334 7F E3 FB 78 */ mr r3, r31 -/* 80464338 4B BD 5F 05 */ bl getBLightInf__13door_param2_cFP10fopAc_ac_c -lbl_8046433C: -/* 8046433C 98 7F 04 70 */ stb r3, 0x470(r31) -/* 80464340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464348 3B A3 0F 38 */ addi r29, r3, 0xf38 -/* 8046434C 3B DD 3E C8 */ addi r30, r29, 0x3ec8 -/* 80464350 7F C3 F3 78 */ mr r3, r30 -/* 80464354 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80464358 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 8046435C 38 84 01 94 */ addi r4, r4, 0x194 -/* 80464360 4B F0 46 35 */ bl strcmp -/* 80464364 2C 03 00 00 */ cmpwi r3, 0 -/* 80464368 41 82 00 2C */ beq lbl_80464394 -/* 8046436C 7F C3 F3 78 */ mr r3, r30 -/* 80464370 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80464374 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80464378 38 84 01 9B */ addi r4, r4, 0x19b -/* 8046437C 4B F0 46 19 */ bl strcmp -/* 80464380 2C 03 00 00 */ cmpwi r3, 0 -/* 80464384 41 82 00 10 */ beq lbl_80464394 -/* 80464388 38 7F 06 E0 */ addi r3, r31, 0x6e0 -/* 8046438C 7F A4 EB 78 */ mr r4, r29 -/* 80464390 4B C1 27 1D */ bl CrrPos__9dBgS_AcchFR4dBgS -lbl_80464394: -/* 80464394 38 60 00 01 */ li r3, 1 -/* 80464398 39 61 00 20 */ addi r11, r1, 0x20 -/* 8046439C 4B EF DE 8D */ bl _restgpr_29 -/* 804643A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804643A4 7C 08 03 A6 */ mtlr r0 -/* 804643A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 804643AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheckOld__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheckOld__10daDoor20_cFv.s deleted file mode 100644 index dbeaa4006c..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheckOld__10daDoor20_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80464BD8: -/* 80464BD8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80464BDC 7C 08 02 A6 */ mflr r0 -/* 80464BE0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80464BE4 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80464BE8 7C 7F 1B 78 */ mr r31, r3 -/* 80464BEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464BF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464BF4 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 80464BF8 38 61 00 18 */ addi r3, r1, 0x18 -/* 80464BFC 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80464C00 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80464C04 4B E0 1F 31 */ bl __mi__4cXyzCFRC3Vec -/* 80464C08 38 61 00 10 */ addi r3, r1, 0x10 -/* 80464C0C 38 81 00 18 */ addi r4, r1, 0x18 -/* 80464C10 4B E0 CC 71 */ bl __ct__7cSGlobeFRC4cXyz -/* 80464C14 38 61 00 08 */ addi r3, r1, 8 -/* 80464C18 38 81 00 16 */ addi r4, r1, 0x16 -/* 80464C1C A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 80464C20 4B E0 C6 09 */ bl __mi__7cSAngleCFs -/* 80464C24 A8 01 00 08 */ lha r0, 8(r1) -/* 80464C28 B0 01 00 0C */ sth r0, 0xc(r1) -/* 80464C2C 38 61 00 0C */ addi r3, r1, 0xc -/* 80464C30 4B E0 C4 9D */ bl Abs__7cSAngleCFv -/* 80464C34 7C 60 07 34 */ extsh r0, r3 -/* 80464C38 2C 00 40 00 */ cmpwi r0, 0x4000 -/* 80464C3C 40 80 00 14 */ bge lbl_80464C50 -/* 80464C40 7C 60 07 35 */ extsh. r0, r3 -/* 80464C44 41 80 00 0C */ blt lbl_80464C50 -/* 80464C48 38 60 00 00 */ li r3, 0 -/* 80464C4C 48 00 00 08 */ b lbl_80464C54 -lbl_80464C50: -/* 80464C50 38 60 00 01 */ li r3, 1 -lbl_80464C54: -/* 80464C54 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80464C58 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80464C5C 7C 08 03 A6 */ mtlr r0 -/* 80464C60 38 21 00 30 */ addi r1, r1, 0x30 -/* 80464C64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheck__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheck__10daDoor20_cFv.s deleted file mode 100644 index 6c41366bf2..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheck__10daDoor20_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80464C68: -/* 80464C68 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80464C6C 7C 08 02 A6 */ mflr r0 -/* 80464C70 90 01 00 24 */ stw r0, 0x24(r1) -/* 80464C74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80464C78 4B EF D5 65 */ bl _savegpr_29 -/* 80464C7C 7C 7D 1B 78 */ mr r29, r3 -/* 80464C80 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80464C84 8B E4 0D 64 */ lbz r31, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ -/* 80464C88 7F FF 07 74 */ extsb r31, r31 -/* 80464C8C 4B BD 55 2D */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464C90 54 7E 06 3E */ clrlwi r30, r3, 0x18 -/* 80464C94 7F A3 EB 78 */ mr r3, r29 -/* 80464C98 4B BD 55 2D */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464C9C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80464CA0 7C 1E 00 00 */ cmpw r30, r0 -/* 80464CA4 40 82 00 10 */ bne lbl_80464CB4 -/* 80464CA8 7F A3 EB 78 */ mr r3, r29 -/* 80464CAC 4B FF FF 2D */ bl frontCheckOld__10daDoor20_cFv -/* 80464CB0 48 00 00 24 */ b lbl_80464CD4 -lbl_80464CB4: -/* 80464CB4 7C 1F F0 00 */ cmpw r31, r30 -/* 80464CB8 40 82 00 0C */ bne lbl_80464CC4 -/* 80464CBC 38 60 00 00 */ li r3, 0 -/* 80464CC0 48 00 00 14 */ b lbl_80464CD4 -lbl_80464CC4: -/* 80464CC4 7C 00 F8 50 */ subf r0, r0, r31 -/* 80464CC8 30 00 FF FF */ addic r0, r0, -1 -/* 80464CCC 7C 60 01 10 */ subfe r3, r0, r0 -/* 80464CD0 38 63 00 02 */ addi r3, r3, 2 -lbl_80464CD4: -/* 80464CD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80464CD8 4B EF D5 51 */ bl _restgpr_29 -/* 80464CDC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80464CE0 7C 08 03 A6 */ mtlr r0 -/* 80464CE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80464CE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_804667EC.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_804667EC.s deleted file mode 100644 index 8e96f527c3..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_804667EC.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_804667EC: -/* 804667EC 88 83 00 00 */ lbz r4, 0(r3) -/* 804667F0 28 04 00 00 */ cmplwi r4, 0 -/* 804667F4 41 82 00 0C */ beq lbl_80466800 -/* 804667F8 38 04 FF FF */ addi r0, r4, -1 -/* 804667FC 98 03 00 00 */ stb r0, 0(r3) -lbl_80466800: -/* 80466800 88 63 00 00 */ lbz r3, 0(r3) -/* 80466804 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_80466808.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_80466808.s deleted file mode 100644 index ae40e97b9e..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_80466808.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80466808: -/* 80466808 38 63 FF DC */ addi r3, r3, -36 -/* 8046680C 4B FF FF 70 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_80466810.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_80466810.s deleted file mode 100644 index 9af4df308b..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_80466810.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80466810: -/* 80466810 38 63 FF EC */ addi r3, r3, -20 -/* 80466814 4B FF FF 68 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getAlwaysArcName__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getAlwaysArcName__10daDoor20_cFv.s deleted file mode 100644 index d4c0aee3c4..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getAlwaysArcName__10daDoor20_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80460B94: -/* 80460B94 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460B98 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460B9C 38 63 00 0E */ addi r3, r3, 0xe -/* 80460BA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getArcName__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getArcName__10daDoor20_cFv.s deleted file mode 100644 index 9c94b36469..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getArcName__10daDoor20_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80460BA4: -/* 80460BA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80460BA8 7C 08 02 A6 */ mflr r0 -/* 80460BAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80460BB0 4B BD 95 D9 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80460BB4 28 03 00 0C */ cmplwi r3, 0xc -/* 80460BB8 41 81 00 1C */ bgt lbl_80460BD4 -/* 80460BBC 3C 80 80 46 */ lis r4, lit_3980@ha /* 0x80466E9C@ha */ -/* 80460BC0 38 84 6E 9C */ addi r4, r4, lit_3980@l /* 0x80466E9C@l */ -/* 80460BC4 54 60 10 3A */ slwi r0, r3, 2 -/* 80460BC8 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80460BCC 7C 09 03 A6 */ mtctr r0 -/* 80460BD0 4E 80 04 20 */ bctr -lbl_80460BD4: -/* 80460BD4 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460BD8 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460BDC 38 63 00 15 */ addi r3, r3, 0x15 -/* 80460BE0 48 00 00 50 */ b lbl_80460C30 -lbl_80460BE4: -/* 80460BE4 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460BE8 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460BEC 38 63 00 1D */ addi r3, r3, 0x1d -/* 80460BF0 48 00 00 40 */ b lbl_80460C30 -lbl_80460BF4: -/* 80460BF4 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460BF8 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460BFC 38 63 00 25 */ addi r3, r3, 0x25 -/* 80460C00 48 00 00 30 */ b lbl_80460C30 -lbl_80460C04: -/* 80460C04 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460C08 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460C0C 38 63 00 2D */ addi r3, r3, 0x2d -/* 80460C10 48 00 00 20 */ b lbl_80460C30 -lbl_80460C14: -/* 80460C14 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460C18 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460C1C 38 63 00 35 */ addi r3, r3, 0x35 -/* 80460C20 48 00 00 10 */ b lbl_80460C30 -lbl_80460C24: -/* 80460C24 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460C28 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460C2C 38 63 00 3D */ addi r3, r3, 0x3d -lbl_80460C30: -/* 80460C30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80460C34 7C 08 03 A6 */ mtlr r0 -/* 80460C38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80460C3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getBmdName__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getBmdName__10daDoor20_cFv.s deleted file mode 100644 index 102ea41517..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getBmdName__10daDoor20_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80460C40: -/* 80460C40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80460C44 7C 08 02 A6 */ mflr r0 -/* 80460C48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80460C4C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80460C50 7C 7F 1B 78 */ mr r31, r3 -/* 80460C54 4B BD 95 35 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80460C58 2C 03 00 0A */ cmpwi r3, 0xa -/* 80460C5C 41 82 00 24 */ beq lbl_80460C80 -/* 80460C60 40 80 00 1C */ bge lbl_80460C7C -/* 80460C64 2C 03 00 03 */ cmpwi r3, 3 -/* 80460C68 40 80 00 08 */ bge lbl_80460C70 -/* 80460C6C 48 00 00 14 */ b lbl_80460C80 -lbl_80460C70: -/* 80460C70 2C 03 00 09 */ cmpwi r3, 9 -/* 80460C74 40 80 00 38 */ bge lbl_80460CAC -/* 80460C78 48 00 00 08 */ b lbl_80460C80 -lbl_80460C7C: -/* 80460C7C 2C 03 00 0C */ cmpwi r3, 0xc -lbl_80460C80: -/* 80460C80 7F E3 FB 78 */ mr r3, r31 -/* 80460C84 4B BD 95 11 */ bl getDoorModel__13door_param2_cFP10fopAc_ac_c -/* 80460C88 7C 65 1B 78 */ mr r5, r3 -/* 80460C8C 3C 60 80 46 */ lis r3, bmdName@ha /* 0x80467340@ha */ -/* 80460C90 38 63 73 40 */ addi r3, r3, bmdName@l /* 0x80467340@l */ -/* 80460C94 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460C98 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460C9C 38 84 00 45 */ addi r4, r4, 0x45 -/* 80460CA0 4C C6 31 82 */ crclr 6 -/* 80460CA4 4B F0 58 39 */ bl sprintf -/* 80460CA8 48 00 00 2C */ b lbl_80460CD4 -lbl_80460CAC: -/* 80460CAC 7F E3 FB 78 */ mr r3, r31 -/* 80460CB0 4B BD 94 E5 */ bl getDoorModel__13door_param2_cFP10fopAc_ac_c -/* 80460CB4 7C 65 1B 78 */ mr r5, r3 -/* 80460CB8 3C 60 80 46 */ lis r3, bmdName@ha /* 0x80467340@ha */ -/* 80460CBC 38 63 73 40 */ addi r3, r3, bmdName@l /* 0x80467340@l */ -/* 80460CC0 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460CC4 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460CC8 38 84 00 5B */ addi r4, r4, 0x5b -/* 80460CCC 4C C6 31 82 */ crclr 6 -/* 80460CD0 4B F0 58 0D */ bl sprintf -lbl_80460CD4: -/* 80460CD4 3C 60 80 46 */ lis r3, bmdName@ha /* 0x80467340@ha */ -/* 80460CD8 38 63 73 40 */ addi r3, r3, bmdName@l /* 0x80467340@l */ -/* 80460CDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80460CE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80460CE4 7C 08 03 A6 */ mtlr r0 -/* 80460CE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80460CEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getBtk__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getBtk__10daDoor20_cFv.s deleted file mode 100644 index 9223d71a1d..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getBtk__10daDoor20_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80460CF0: -/* 80460CF0 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460CF4 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460CF8 38 63 00 6E */ addi r3, r3, 0x6e -/* 80460CFC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getDemoAction__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getDemoAction__10daDoor20_cFv.s deleted file mode 100644 index 0b2b6f73d0..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getDemoAction__10daDoor20_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80465918: -/* 80465918 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046591C 7C 08 02 A6 */ mflr r0 -/* 80465920 90 01 00 14 */ stw r0, 0x14(r1) -/* 80465924 7C 64 1B 78 */ mr r4, r3 -/* 80465928 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046592C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465930 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80465934 80 84 06 CC */ lwz r4, 0x6cc(r4) -/* 80465938 3C A0 80 46 */ lis r5, action_table@ha /* 0x8046722C@ha */ -/* 8046593C 38 A5 72 2C */ addi r5, r5, action_table@l /* 0x8046722C@l */ -/* 80465940 38 C0 00 1D */ li r6, 0x1d -/* 80465944 38 E0 00 00 */ li r7, 0 -/* 80465948 39 00 00 00 */ li r8, 0 -/* 8046594C 4B BE 24 C5 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 80465950 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80465954 7C 08 03 A6 */ mtlr r0 -/* 80465958 38 21 00 10 */ addi r1, r1, 0x10 -/* 8046595C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getDzbName__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getDzbName__10daDoor20_cFv.s deleted file mode 100644 index e992f86f6c..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getDzbName__10daDoor20_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80460D00: -/* 80460D00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80460D04 7C 08 02 A6 */ mflr r0 -/* 80460D08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80460D0C 4B BD 94 7D */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80460D10 2C 03 00 0A */ cmpwi r3, 0xa -/* 80460D14 41 82 00 2C */ beq lbl_80460D40 -/* 80460D18 40 80 00 14 */ bge lbl_80460D2C -/* 80460D1C 2C 03 00 03 */ cmpwi r3, 3 -/* 80460D20 40 80 00 10 */ bge lbl_80460D30 -/* 80460D24 48 00 00 0C */ b lbl_80460D30 -/* 80460D28 48 00 00 08 */ b lbl_80460D30 -lbl_80460D2C: -/* 80460D2C 2C 03 00 0C */ cmpwi r3, 0xc -lbl_80460D30: -/* 80460D30 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460D34 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460D38 38 63 00 82 */ addi r3, r3, 0x82 -/* 80460D3C 48 00 00 10 */ b lbl_80460D4C -lbl_80460D40: -/* 80460D40 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460D44 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460D48 38 63 00 93 */ addi r3, r3, 0x93 -lbl_80460D4C: -/* 80460D4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80460D50 7C 08 03 A6 */ mtlr r0 -/* 80460D54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80460D58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getModelData__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getModelData__10daDoor20_cFv.s deleted file mode 100644 index f8bc8ddfa2..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getModelData__10daDoor20_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80460D5C: -/* 80460D5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80460D60 7C 08 02 A6 */ mflr r0 -/* 80460D64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80460D68 4B FF FE D9 */ bl getBmdName__10daDoor20_cFv -/* 80460D6C 4B BC E6 C9 */ bl dComIfG_getStageRes__FPCc -/* 80460D70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80460D74 7C 08 03 A6 */ mtlr r0 -/* 80460D78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80460D7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getRestartPos__10daDoor20_cFP4cXyz.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getRestartPos__10daDoor20_cFP4cXyz.s deleted file mode 100644 index 77b58e6e76..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getRestartPos__10daDoor20_cFP4cXyz.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_8046581C: -/* 8046581C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80465820 7C 08 02 A6 */ mflr r0 -/* 80465824 90 01 00 34 */ stw r0, 0x34(r1) -/* 80465828 39 61 00 30 */ addi r11, r1, 0x30 -/* 8046582C 4B EF C9 B1 */ bl _savegpr_29 -/* 80465830 7C 7D 1B 78 */ mr r29, r3 -/* 80465834 7C 9E 23 78 */ mr r30, r4 -/* 80465838 3C 60 80 46 */ lis r3, lit_4018@ha /* 0x80466820@ha */ -/* 8046583C 3B E3 68 20 */ addi r31, r3, lit_4018@l /* 0x80466820@l */ -/* 80465840 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465844 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465848 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 8046584C 38 61 00 08 */ addi r3, r1, 8 -/* 80465850 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80465854 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80465858 4B E0 12 DD */ bl __mi__4cXyzCFRC3Vec -/* 8046585C C0 21 00 08 */ lfs f1, 8(r1) -/* 80465860 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80465864 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80465868 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8046586C C0 41 00 10 */ lfs f2, 0x10(r1) -/* 80465870 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80465874 C0 7D 06 80 */ lfs f3, 0x680(r29) -/* 80465878 EC 21 00 F2 */ fmuls f1, f1, f3 -/* 8046587C C0 1D 06 88 */ lfs f0, 0x688(r29) -/* 80465880 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80465884 EC 21 00 2A */ fadds f1, f1, f0 -/* 80465888 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046588C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465890 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80465894 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80465898 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8046589C 41 82 00 20 */ beq lbl_804658BC -/* 804658A0 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 804658A4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804658A8 40 80 00 0C */ bge lbl_804658B4 -/* 804658AC C0 5F 00 78 */ lfs f2, 0x78(r31) -/* 804658B0 48 00 00 24 */ b lbl_804658D4 -lbl_804658B4: -/* 804658B4 C0 5F 00 70 */ lfs f2, 0x70(r31) -/* 804658B8 48 00 00 1C */ b lbl_804658D4 -lbl_804658BC: -/* 804658BC C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 804658C0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804658C4 40 80 00 0C */ bge lbl_804658D0 -/* 804658C8 C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 804658CC 48 00 00 08 */ b lbl_804658D4 -lbl_804658D0: -/* 804658D0 C0 5F 00 84 */ lfs f2, 0x84(r31) -lbl_804658D4: -/* 804658D4 C0 3D 04 D0 */ lfs f1, 0x4d0(r29) -/* 804658D8 EC 02 00 F2 */ fmuls f0, f2, f3 -/* 804658DC EC 01 00 28 */ fsubs f0, f1, f0 -/* 804658E0 D0 1E 00 00 */ stfs f0, 0(r30) -/* 804658E4 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 804658E8 D0 1E 00 04 */ stfs f0, 4(r30) -/* 804658EC C0 3D 04 D8 */ lfs f1, 0x4d8(r29) -/* 804658F0 C0 1D 06 88 */ lfs f0, 0x688(r29) -/* 804658F4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 804658F8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 804658FC D0 1E 00 08 */ stfs f0, 8(r30) -/* 80465900 39 61 00 30 */ addi r11, r1, 0x30 -/* 80465904 4B EF C9 25 */ bl _restgpr_29 -/* 80465908 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046590C 7C 08 03 A6 */ mtlr r0 -/* 80465910 38 21 00 30 */ addi r1, r1, 0x30 -/* 80465914 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getSize2X__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getSize2X__10daDoor20_cFv.s deleted file mode 100644 index eac9764ffb..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getSize2X__10daDoor20_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80460D80: -/* 80460D80 3C 60 80 46 */ lis r3, lit_4018@ha /* 0x80466820@ha */ -/* 80460D84 C0 23 68 20 */ lfs f1, lit_4018@l(r3) /* 0x80466820@l */ -/* 80460D88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getStopBmdName__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getStopBmdName__10daDoor20_cFv.s deleted file mode 100644 index 11501dd8c4..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getStopBmdName__10daDoor20_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80460B38: -/* 80460B38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80460B3C 7C 08 02 A6 */ mflr r0 -/* 80460B40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80460B44 4B BD 96 45 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80460B48 2C 03 00 0B */ cmpwi r3, 0xb -/* 80460B4C 41 82 00 0C */ beq lbl_80460B58 -/* 80460B50 40 80 00 08 */ bge lbl_80460B58 -/* 80460B54 2C 03 00 03 */ cmpwi r3, 3 -lbl_80460B58: -/* 80460B58 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80460B5C 38 63 68 D8 */ addi r3, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80460B60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80460B64 7C 08 03 A6 */ mtlr r0 -/* 80460B68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80460B6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getStopModelData__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getStopModelData__10daDoor20_cFv.s deleted file mode 100644 index 201b72ffc6..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getStopModelData__10daDoor20_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80460B70: -/* 80460B70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80460B74 7C 08 02 A6 */ mflr r0 -/* 80460B78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80460B7C 4B FF FF BD */ bl getStopBmdName__10daDoor20_cFv -/* 80460B80 4B BC E8 B5 */ bl dComIfG_getStageRes__FPCc -/* 80460B84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80460B88 7C 08 03 A6 */ mtlr r0 -/* 80460B8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80460B90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/initOpenDemo__10daDoor20_cFi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/initOpenDemo__10daDoor20_cFi.s deleted file mode 100644 index 4adaae7f7e..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/initOpenDemo__10daDoor20_cFi.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80465400: -/* 80465400 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80465404 7C 08 02 A6 */ mflr r0 -/* 80465408 90 01 00 24 */ stw r0, 0x24(r1) -/* 8046540C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80465410 4B EF CD CD */ bl _savegpr_29 -/* 80465414 7C 7D 1B 78 */ mr r29, r3 -/* 80465418 7C 9E 23 78 */ mr r30, r4 -/* 8046541C A8 03 04 DE */ lha r0, 0x4de(r3) -/* 80465420 B0 03 04 E6 */ sth r0, 0x4e6(r3) -/* 80465424 88 03 06 8C */ lbz r0, 0x68c(r3) -/* 80465428 28 00 00 01 */ cmplwi r0, 1 -/* 8046542C 40 82 00 10 */ bne lbl_8046543C -/* 80465430 A8 7D 04 E6 */ lha r3, 0x4e6(r29) -/* 80465434 38 03 7F FF */ addi r0, r3, 0x7fff -/* 80465438 B0 1D 04 E6 */ sth r0, 0x4e6(r29) -lbl_8046543C: -/* 8046543C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465440 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465444 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80465448 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 8046544C 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80465450 38 84 01 59 */ addi r4, r4, 0x159 -/* 80465454 38 A0 00 00 */ li r5, 0 -/* 80465458 38 C0 00 00 */ li r6, 0 -/* 8046545C 4B BE 26 C1 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80465460 90 7D 06 CC */ stw r3, 0x6cc(r29) -/* 80465464 2C 1E 00 00 */ cmpwi r30, 0 -/* 80465468 41 82 00 10 */ beq lbl_80465478 -/* 8046546C A0 1F 4F A0 */ lhz r0, 0x4fa0(r31) -/* 80465470 60 00 00 02 */ ori r0, r0, 2 -/* 80465474 B0 1F 4F A0 */ sth r0, 0x4fa0(r31) -lbl_80465478: -/* 80465478 39 61 00 20 */ addi r11, r1, 0x20 -/* 8046547C 4B EF CD AD */ bl _restgpr_29 -/* 80465480 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80465484 7C 08 03 A6 */ mtlr r0 -/* 80465488 38 21 00 20 */ addi r1, r1, 0x20 -/* 8046548C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/initProc__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/initProc__10daDoor20_cFv.s deleted file mode 100644 index c6b0fbd0b0..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/initProc__10daDoor20_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_804653B0: -/* 804653B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804653B4 7C 08 02 A6 */ mflr r0 -/* 804653B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 804653BC 3C 80 80 44 */ lis r4, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 804653C0 38 A4 9A 20 */ addi r5, r4, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 804653C4 A8 03 04 B6 */ lha r0, 0x4b6(r3) -/* 804653C8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 804653CC 7C 85 02 14 */ add r4, r5, r0 -/* 804653D0 C0 24 00 04 */ lfs f1, 4(r4) -/* 804653D4 7C 05 04 2E */ lfsx f0, r5, r0 -/* 804653D8 D0 03 06 80 */ stfs f0, 0x680(r3) -/* 804653DC 3C 80 80 46 */ lis r4, lit_4256@ha /* 0x8046682C@ha */ -/* 804653E0 C0 04 68 2C */ lfs f0, lit_4256@l(r4) /* 0x8046682C@l */ -/* 804653E4 D0 03 06 84 */ stfs f0, 0x684(r3) -/* 804653E8 D0 23 06 88 */ stfs f1, 0x688(r3) -/* 804653EC 4B FF FB 79 */ bl makeEventId__10daDoor20_cFv -/* 804653F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804653F4 7C 08 03 A6 */ mtlr r0 -/* 804653F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 804653FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/makeEventId__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/makeEventId__10daDoor20_cFv.s deleted file mode 100644 index 0a39f9b69d..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/makeEventId__10daDoor20_cFv.s +++ /dev/null @@ -1,301 +0,0 @@ -lbl_80464F64: -/* 80464F64 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80464F68 7C 08 02 A6 */ mflr r0 -/* 80464F6C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80464F70 39 61 00 30 */ addi r11, r1, 0x30 -/* 80464F74 4B EF D2 55 */ bl _savegpr_24 -/* 80464F78 7C 7D 1B 78 */ mr r29, r3 -/* 80464F7C 3C 60 80 46 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80466E7C@ha */ -/* 80464F80 3B E3 6E 7C */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x80466E7C@l */ -/* 80464F84 3B 00 00 00 */ li r24, 0 -/* 80464F88 3B 60 00 00 */ li r27, 0 -/* 80464F8C 3B 80 00 00 */ li r28, 0 -/* 80464F90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464F94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464F98 3B C3 4F F8 */ addi r30, r3, 0x4ff8 -/* 80464F9C 3B 3F 02 A8 */ addi r25, r31, 0x2a8 -/* 80464FA0 3B 40 00 FF */ li r26, 0xff -lbl_80464FA4: -/* 80464FA4 7F C3 F3 78 */ mr r3, r30 -/* 80464FA8 7F A4 EB 78 */ mr r4, r29 -/* 80464FAC 7C B9 E0 2E */ lwzx r5, r25, r28 -/* 80464FB0 38 C0 00 FF */ li r6, 0xff -/* 80464FB4 4B BE 27 A5 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80464FB8 38 1B 06 92 */ addi r0, r27, 0x692 -/* 80464FBC 7C 7D 03 2E */ sthx r3, r29, r0 -/* 80464FC0 38 18 06 B8 */ addi r0, r24, 0x6b8 -/* 80464FC4 7F 5D 01 AE */ stbx r26, r29, r0 -/* 80464FC8 3B 18 00 01 */ addi r24, r24, 1 -/* 80464FCC 2C 18 00 13 */ cmpwi r24, 0x13 -/* 80464FD0 3B 7B 00 02 */ addi r27, r27, 2 -/* 80464FD4 3B 9C 00 04 */ addi r28, r28, 4 -/* 80464FD8 41 80 FF CC */ blt lbl_80464FA4 -/* 80464FDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464FE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464FE4 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80464FE8 88 1D 06 91 */ lbz r0, 0x691(r29) -/* 80464FEC 2C 00 00 04 */ cmpwi r0, 4 -/* 80464FF0 41 82 02 1C */ beq lbl_8046520C -/* 80464FF4 40 80 00 1C */ bge lbl_80465010 -/* 80464FF8 2C 00 00 02 */ cmpwi r0, 2 -/* 80464FFC 41 82 01 6C */ beq lbl_80465168 -/* 80465000 40 80 00 C4 */ bge lbl_804650C4 -/* 80465004 2C 00 00 01 */ cmpwi r0, 1 -/* 80465008 40 80 00 18 */ bge lbl_80465020 -/* 8046500C 48 00 03 8C */ b lbl_80465398 -lbl_80465010: -/* 80465010 2C 00 00 06 */ cmpwi r0, 6 -/* 80465014 41 82 02 E4 */ beq lbl_804652F8 -/* 80465018 40 80 03 80 */ bge lbl_80465398 -/* 8046501C 48 00 02 38 */ b lbl_80465254 -lbl_80465020: -/* 80465020 28 03 00 00 */ cmplwi r3, 0 -/* 80465024 41 82 00 58 */ beq lbl_8046507C -/* 80465028 80 03 05 74 */ lwz r0, 0x574(r3) -/* 8046502C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80465030 41 82 00 4C */ beq lbl_8046507C -/* 80465034 3B 80 00 00 */ li r28, 0 -/* 80465038 3B 00 00 04 */ li r24, 4 -/* 8046503C 3B 60 00 08 */ li r27, 8 -/* 80465040 3B FF 03 04 */ addi r31, r31, 0x304 -lbl_80465044: -/* 80465044 7F C3 F3 78 */ mr r3, r30 -/* 80465048 7F A4 EB 78 */ mr r4, r29 -/* 8046504C 7C BF E0 2E */ lwzx r5, r31, r28 -/* 80465050 38 18 06 B8 */ addi r0, r24, 0x6b8 -/* 80465054 7C DD 00 AE */ lbzx r6, r29, r0 -/* 80465058 4B BE 27 01 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 8046505C 38 1B 06 92 */ addi r0, r27, 0x692 -/* 80465060 7C 7D 03 2E */ sthx r3, r29, r0 -/* 80465064 3B 18 00 01 */ addi r24, r24, 1 -/* 80465068 2C 18 00 08 */ cmpwi r24, 8 -/* 8046506C 3B 7B 00 02 */ addi r27, r27, 2 -/* 80465070 3B 9C 00 04 */ addi r28, r28, 4 -/* 80465074 41 80 FF D0 */ blt lbl_80465044 -/* 80465078 48 00 03 20 */ b lbl_80465398 -lbl_8046507C: -/* 8046507C 3B 80 00 00 */ li r28, 0 -/* 80465080 3B 20 00 04 */ li r25, 4 -/* 80465084 3B 60 00 08 */ li r27, 8 -/* 80465088 3B FF 02 F4 */ addi r31, r31, 0x2f4 -lbl_8046508C: -/* 8046508C 7F C3 F3 78 */ mr r3, r30 -/* 80465090 7F A4 EB 78 */ mr r4, r29 -/* 80465094 7C BF E0 2E */ lwzx r5, r31, r28 -/* 80465098 38 19 06 B8 */ addi r0, r25, 0x6b8 -/* 8046509C 7C DD 00 AE */ lbzx r6, r29, r0 -/* 804650A0 4B BE 26 B9 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 804650A4 38 1B 06 92 */ addi r0, r27, 0x692 -/* 804650A8 7C 7D 03 2E */ sthx r3, r29, r0 -/* 804650AC 3B 39 00 01 */ addi r25, r25, 1 -/* 804650B0 2C 19 00 08 */ cmpwi r25, 8 -/* 804650B4 3B 7B 00 02 */ addi r27, r27, 2 -/* 804650B8 3B 9C 00 04 */ addi r28, r28, 4 -/* 804650BC 41 80 FF D0 */ blt lbl_8046508C -/* 804650C0 48 00 02 D8 */ b lbl_80465398 -lbl_804650C4: -/* 804650C4 28 03 00 00 */ cmplwi r3, 0 -/* 804650C8 41 82 00 58 */ beq lbl_80465120 -/* 804650CC 80 03 05 74 */ lwz r0, 0x574(r3) -/* 804650D0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 804650D4 41 82 00 4C */ beq lbl_80465120 -/* 804650D8 3B 80 00 00 */ li r28, 0 -/* 804650DC 3B 20 00 04 */ li r25, 4 -/* 804650E0 3B 60 00 08 */ li r27, 8 -/* 804650E4 3B FF 03 24 */ addi r31, r31, 0x324 -lbl_804650E8: -/* 804650E8 7F C3 F3 78 */ mr r3, r30 -/* 804650EC 7F A4 EB 78 */ mr r4, r29 -/* 804650F0 7C BF E0 2E */ lwzx r5, r31, r28 -/* 804650F4 38 19 06 B8 */ addi r0, r25, 0x6b8 -/* 804650F8 7C DD 00 AE */ lbzx r6, r29, r0 -/* 804650FC 4B BE 26 5D */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80465100 38 1B 06 92 */ addi r0, r27, 0x692 -/* 80465104 7C 7D 03 2E */ sthx r3, r29, r0 -/* 80465108 3B 39 00 01 */ addi r25, r25, 1 -/* 8046510C 2C 19 00 08 */ cmpwi r25, 8 -/* 80465110 3B 7B 00 02 */ addi r27, r27, 2 -/* 80465114 3B 9C 00 04 */ addi r28, r28, 4 -/* 80465118 41 80 FF D0 */ blt lbl_804650E8 -/* 8046511C 48 00 02 7C */ b lbl_80465398 -lbl_80465120: -/* 80465120 3B 80 00 00 */ li r28, 0 -/* 80465124 3B 20 00 04 */ li r25, 4 -/* 80465128 3B 60 00 08 */ li r27, 8 -/* 8046512C 3B FF 03 14 */ addi r31, r31, 0x314 -lbl_80465130: -/* 80465130 7F C3 F3 78 */ mr r3, r30 -/* 80465134 7F A4 EB 78 */ mr r4, r29 -/* 80465138 7C BF E0 2E */ lwzx r5, r31, r28 -/* 8046513C 38 19 06 B8 */ addi r0, r25, 0x6b8 -/* 80465140 7C DD 00 AE */ lbzx r6, r29, r0 -/* 80465144 4B BE 26 15 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80465148 38 1B 06 92 */ addi r0, r27, 0x692 -/* 8046514C 7C 7D 03 2E */ sthx r3, r29, r0 -/* 80465150 3B 39 00 01 */ addi r25, r25, 1 -/* 80465154 2C 19 00 08 */ cmpwi r25, 8 -/* 80465158 3B 7B 00 02 */ addi r27, r27, 2 -/* 8046515C 3B 9C 00 04 */ addi r28, r28, 4 -/* 80465160 41 80 FF D0 */ blt lbl_80465130 -/* 80465164 48 00 02 34 */ b lbl_80465398 -lbl_80465168: -/* 80465168 28 03 00 00 */ cmplwi r3, 0 -/* 8046516C 41 82 00 58 */ beq lbl_804651C4 -/* 80465170 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80465174 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80465178 41 82 00 4C */ beq lbl_804651C4 -/* 8046517C 3B 80 00 00 */ li r28, 0 -/* 80465180 3B 20 00 04 */ li r25, 4 -/* 80465184 3B 60 00 08 */ li r27, 8 -/* 80465188 3B FF 03 44 */ addi r31, r31, 0x344 -lbl_8046518C: -/* 8046518C 7F C3 F3 78 */ mr r3, r30 -/* 80465190 7F A4 EB 78 */ mr r4, r29 -/* 80465194 7C BF E0 2E */ lwzx r5, r31, r28 -/* 80465198 38 19 06 B8 */ addi r0, r25, 0x6b8 -/* 8046519C 7C DD 00 AE */ lbzx r6, r29, r0 -/* 804651A0 4B BE 25 B9 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 804651A4 38 1B 06 92 */ addi r0, r27, 0x692 -/* 804651A8 7C 7D 03 2E */ sthx r3, r29, r0 -/* 804651AC 3B 39 00 01 */ addi r25, r25, 1 -/* 804651B0 2C 19 00 08 */ cmpwi r25, 8 -/* 804651B4 3B 7B 00 02 */ addi r27, r27, 2 -/* 804651B8 3B 9C 00 04 */ addi r28, r28, 4 -/* 804651BC 41 80 FF D0 */ blt lbl_8046518C -/* 804651C0 48 00 01 D8 */ b lbl_80465398 -lbl_804651C4: -/* 804651C4 3B 80 00 00 */ li r28, 0 -/* 804651C8 3B 20 00 04 */ li r25, 4 -/* 804651CC 3B 60 00 08 */ li r27, 8 -/* 804651D0 3B FF 03 34 */ addi r31, r31, 0x334 -lbl_804651D4: -/* 804651D4 7F C3 F3 78 */ mr r3, r30 -/* 804651D8 7F A4 EB 78 */ mr r4, r29 -/* 804651DC 7C BF E0 2E */ lwzx r5, r31, r28 -/* 804651E0 38 19 06 B8 */ addi r0, r25, 0x6b8 -/* 804651E4 7C DD 00 AE */ lbzx r6, r29, r0 -/* 804651E8 4B BE 25 71 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 804651EC 38 1B 06 92 */ addi r0, r27, 0x692 -/* 804651F0 7C 7D 03 2E */ sthx r3, r29, r0 -/* 804651F4 3B 39 00 01 */ addi r25, r25, 1 -/* 804651F8 2C 19 00 08 */ cmpwi r25, 8 -/* 804651FC 3B 7B 00 02 */ addi r27, r27, 2 -/* 80465200 3B 9C 00 04 */ addi r28, r28, 4 -/* 80465204 41 80 FF D0 */ blt lbl_804651D4 -/* 80465208 48 00 01 90 */ b lbl_80465398 -lbl_8046520C: -/* 8046520C 3B 80 00 00 */ li r28, 0 -/* 80465210 3B 20 00 0C */ li r25, 0xc -/* 80465214 3B 60 00 18 */ li r27, 0x18 -/* 80465218 3B FF 03 54 */ addi r31, r31, 0x354 -lbl_8046521C: -/* 8046521C 7F C3 F3 78 */ mr r3, r30 -/* 80465220 7F A4 EB 78 */ mr r4, r29 -/* 80465224 7C BF E0 2E */ lwzx r5, r31, r28 -/* 80465228 38 19 06 B8 */ addi r0, r25, 0x6b8 -/* 8046522C 7C DD 00 AE */ lbzx r6, r29, r0 -/* 80465230 4B BE 25 29 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80465234 38 1B 06 92 */ addi r0, r27, 0x692 -/* 80465238 7C 7D 03 2E */ sthx r3, r29, r0 -/* 8046523C 3B 39 00 01 */ addi r25, r25, 1 -/* 80465240 2C 19 00 13 */ cmpwi r25, 0x13 -/* 80465244 3B 7B 00 02 */ addi r27, r27, 2 -/* 80465248 3B 9C 00 04 */ addi r28, r28, 4 -/* 8046524C 41 80 FF D0 */ blt lbl_8046521C -/* 80465250 48 00 01 48 */ b lbl_80465398 -lbl_80465254: -/* 80465254 28 03 00 00 */ cmplwi r3, 0 -/* 80465258 41 82 00 58 */ beq lbl_804652B0 -/* 8046525C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80465260 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80465264 41 82 00 4C */ beq lbl_804652B0 -/* 80465268 3B 80 00 00 */ li r28, 0 -/* 8046526C 3B 20 00 04 */ li r25, 4 -/* 80465270 3B 60 00 08 */ li r27, 8 -/* 80465274 3B FF 03 80 */ addi r31, r31, 0x380 -lbl_80465278: -/* 80465278 7F C3 F3 78 */ mr r3, r30 -/* 8046527C 7F A4 EB 78 */ mr r4, r29 -/* 80465280 7C BF E0 2E */ lwzx r5, r31, r28 -/* 80465284 38 19 06 B8 */ addi r0, r25, 0x6b8 -/* 80465288 7C DD 00 AE */ lbzx r6, r29, r0 -/* 8046528C 4B BE 24 CD */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80465290 38 1B 06 92 */ addi r0, r27, 0x692 -/* 80465294 7C 7D 03 2E */ sthx r3, r29, r0 -/* 80465298 3B 39 00 01 */ addi r25, r25, 1 -/* 8046529C 2C 19 00 08 */ cmpwi r25, 8 -/* 804652A0 3B 7B 00 02 */ addi r27, r27, 2 -/* 804652A4 3B 9C 00 04 */ addi r28, r28, 4 -/* 804652A8 41 80 FF D0 */ blt lbl_80465278 -/* 804652AC 48 00 00 EC */ b lbl_80465398 -lbl_804652B0: -/* 804652B0 3B 80 00 00 */ li r28, 0 -/* 804652B4 3B 20 00 04 */ li r25, 4 -/* 804652B8 3B 60 00 08 */ li r27, 8 -/* 804652BC 3B FF 03 70 */ addi r31, r31, 0x370 -lbl_804652C0: -/* 804652C0 7F C3 F3 78 */ mr r3, r30 -/* 804652C4 7F A4 EB 78 */ mr r4, r29 -/* 804652C8 7C BF E0 2E */ lwzx r5, r31, r28 -/* 804652CC 38 19 06 B8 */ addi r0, r25, 0x6b8 -/* 804652D0 7C DD 00 AE */ lbzx r6, r29, r0 -/* 804652D4 4B BE 24 85 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 804652D8 38 1B 06 92 */ addi r0, r27, 0x692 -/* 804652DC 7C 7D 03 2E */ sthx r3, r29, r0 -/* 804652E0 3B 39 00 01 */ addi r25, r25, 1 -/* 804652E4 2C 19 00 08 */ cmpwi r25, 8 -/* 804652E8 3B 7B 00 02 */ addi r27, r27, 2 -/* 804652EC 3B 9C 00 04 */ addi r28, r28, 4 -/* 804652F0 41 80 FF D0 */ blt lbl_804652C0 -/* 804652F4 48 00 00 A4 */ b lbl_80465398 -lbl_804652F8: -/* 804652F8 28 03 00 00 */ cmplwi r3, 0 -/* 804652FC 41 82 00 58 */ beq lbl_80465354 -/* 80465300 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80465304 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80465308 41 82 00 4C */ beq lbl_80465354 -/* 8046530C 3B 80 00 00 */ li r28, 0 -/* 80465310 3B 20 00 04 */ li r25, 4 -/* 80465314 3B 60 00 08 */ li r27, 8 -/* 80465318 3B FF 03 A0 */ addi r31, r31, 0x3a0 -lbl_8046531C: -/* 8046531C 7F C3 F3 78 */ mr r3, r30 -/* 80465320 7F A4 EB 78 */ mr r4, r29 -/* 80465324 7C BF E0 2E */ lwzx r5, r31, r28 -/* 80465328 38 19 06 B8 */ addi r0, r25, 0x6b8 -/* 8046532C 7C DD 00 AE */ lbzx r6, r29, r0 -/* 80465330 4B BE 24 29 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80465334 38 1B 06 92 */ addi r0, r27, 0x692 -/* 80465338 7C 7D 03 2E */ sthx r3, r29, r0 -/* 8046533C 3B 39 00 01 */ addi r25, r25, 1 -/* 80465340 2C 19 00 08 */ cmpwi r25, 8 -/* 80465344 3B 7B 00 02 */ addi r27, r27, 2 -/* 80465348 3B 9C 00 04 */ addi r28, r28, 4 -/* 8046534C 41 80 FF D0 */ blt lbl_8046531C -/* 80465350 48 00 00 48 */ b lbl_80465398 -lbl_80465354: -/* 80465354 3B 60 00 00 */ li r27, 0 -/* 80465358 3B 20 00 04 */ li r25, 4 -/* 8046535C 3B 80 00 08 */ li r28, 8 -/* 80465360 3B FF 03 90 */ addi r31, r31, 0x390 -lbl_80465364: -/* 80465364 7F C3 F3 78 */ mr r3, r30 -/* 80465368 7F A4 EB 78 */ mr r4, r29 -/* 8046536C 7C BF D8 2E */ lwzx r5, r31, r27 -/* 80465370 38 19 06 B8 */ addi r0, r25, 0x6b8 -/* 80465374 7C DD 00 AE */ lbzx r6, r29, r0 -/* 80465378 4B BE 23 E1 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 8046537C 38 1C 06 92 */ addi r0, r28, 0x692 -/* 80465380 7C 7D 03 2E */ sthx r3, r29, r0 -/* 80465384 3B 39 00 01 */ addi r25, r25, 1 -/* 80465388 2C 19 00 08 */ cmpwi r25, 8 -/* 8046538C 3B 9C 00 02 */ addi r28, r28, 2 -/* 80465390 3B 7B 00 04 */ addi r27, r27, 4 -/* 80465394 41 80 FF D0 */ blt lbl_80465364 -lbl_80465398: -/* 80465398 39 61 00 30 */ addi r11, r1, 0x30 -/* 8046539C 4B EF CE 79 */ bl _restgpr_24 -/* 804653A0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 804653A4 7C 08 03 A6 */ mtlr r0 -/* 804653A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 804653AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openEnd_1__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openEnd_1__10daDoor20_cFv.s deleted file mode 100644 index 7511eb4599..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openEnd_1__10daDoor20_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_804622AC: -/* 804622AC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804622B0 7C 08 02 A6 */ mflr r0 -/* 804622B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 804622B8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 804622BC 7C 7F 1B 78 */ mr r31, r3 -/* 804622C0 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 804622C4 7C 03 07 74 */ extsb r3, r0 -/* 804622C8 4B BC AD A5 */ bl dComIfGp_getReverb__Fi -/* 804622CC 7C 67 1B 78 */ mr r7, r3 -/* 804622D0 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800B4@ha */ -/* 804622D4 38 03 00 B4 */ addi r0, r3, 0x00B4 /* 0x000800B4@l */ -/* 804622D8 90 01 00 08 */ stw r0, 8(r1) -/* 804622DC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804622E0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804622E4 80 63 00 00 */ lwz r3, 0(r3) -/* 804622E8 38 81 00 08 */ addi r4, r1, 8 -/* 804622EC 38 BF 05 E0 */ addi r5, r31, 0x5e0 -/* 804622F0 38 C0 00 00 */ li r6, 0 -/* 804622F4 3D 00 80 46 */ lis r8, lit_4124@ha /* 0x80466824@ha */ -/* 804622F8 C0 28 68 24 */ lfs f1, lit_4124@l(r8) /* 0x80466824@l */ -/* 804622FC FC 40 08 90 */ fmr f2, f1 -/* 80462300 3D 00 80 46 */ lis r8, lit_4609@ha /* 0x80466870@ha */ -/* 80462304 C0 68 68 70 */ lfs f3, lit_4609@l(r8) /* 0x80466870@l */ -/* 80462308 FC 80 18 90 */ fmr f4, f3 -/* 8046230C 39 00 00 00 */ li r8, 0 -/* 80462310 4B E4 96 75 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80462314 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80462318 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8046231C 7C 08 03 A6 */ mtlr r0 -/* 80462320 38 21 00 20 */ addi r1, r1, 0x20 -/* 80462324 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openEnd__10daDoor20_cFi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openEnd__10daDoor20_cFi.s deleted file mode 100644 index 347f1e7305..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openEnd__10daDoor20_cFi.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80462328: -/* 80462328 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046232C 7C 08 02 A6 */ mflr r0 -/* 80462330 90 01 00 14 */ stw r0, 0x14(r1) -/* 80462334 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80462338 7C 7F 1B 78 */ mr r31, r3 -/* 8046233C A0 03 06 8E */ lhz r0, 0x68e(r3) -/* 80462340 54 00 04 3C */ rlwinm r0, r0, 0, 0x10, 0x1e -/* 80462344 B0 03 06 8E */ sth r0, 0x68e(r3) -/* 80462348 4B BD 7E 41 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 8046234C 28 03 00 0C */ cmplwi r3, 0xc -/* 80462350 41 81 00 1C */ bgt lbl_8046236C -/* 80462354 3C 80 80 46 */ lis r4, lit_4638@ha /* 0x80466F6C@ha */ -/* 80462358 38 84 6F 6C */ addi r4, r4, lit_4638@l /* 0x80466F6C@l */ -/* 8046235C 54 60 10 3A */ slwi r0, r3, 2 -/* 80462360 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80462364 7C 09 03 A6 */ mtctr r0 -/* 80462368 4E 80 04 20 */ bctr -lbl_8046236C: -/* 8046236C 7F E3 FB 78 */ mr r3, r31 -/* 80462370 4B FF FF 39 */ bl openEnd_0__10daDoor20_cFv -/* 80462374 48 00 00 0C */ b lbl_80462380 -lbl_80462378: -/* 80462378 7F E3 FB 78 */ mr r3, r31 -/* 8046237C 4B FF FF 31 */ bl openEnd_1__10daDoor20_cFv -lbl_80462380: -/* 80462380 38 60 00 01 */ li r3, 1 -/* 80462384 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80462388 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8046238C 7C 08 03 A6 */ mtlr r0 -/* 80462390 38 21 00 10 */ addi r1, r1, 0x10 -/* 80462394 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit2__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit2__10daDoor20_cFv.s deleted file mode 100644 index 621a40d2ac..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit2__10daDoor20_cFv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80462928: -/* 80462928 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046292C 7C 08 02 A6 */ mflr r0 -/* 80462930 90 01 00 14 */ stw r0, 0x14(r1) -/* 80462934 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80462938 93 C1 00 08 */ stw r30, 8(r1) -/* 8046293C 7C 7E 1B 78 */ mr r30, r3 -/* 80462940 3C 80 80 46 */ lis r4, lit_4018@ha /* 0x80466820@ha */ -/* 80462944 3B E4 68 20 */ addi r31, r4, lit_4018@l /* 0x80466820@l */ -/* 80462948 88 03 06 8C */ lbz r0, 0x68c(r3) -/* 8046294C 98 03 05 F1 */ stb r0, 0x5f1(r3) -/* 80462950 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 80462954 D0 23 05 94 */ stfs f1, 0x594(r3) -/* 80462958 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8046295C D0 03 05 90 */ stfs f0, 0x590(r3) -/* 80462960 D0 23 05 B0 */ stfs f1, 0x5b0(r3) -/* 80462964 D0 03 05 AC */ stfs f0, 0x5ac(r3) -/* 80462968 38 80 00 01 */ li r4, 1 -/* 8046296C 48 00 2C B5 */ bl openInitCom__10daDoor20_cFi -/* 80462970 88 1E 06 7F */ lbz r0, 0x67f(r30) -/* 80462974 3C 60 80 45 */ lis r3, mNextRoomNo__10dMapInfo_c@ha /* 0x80450630@ha */ -/* 80462978 90 03 06 30 */ stw r0, mNextRoomNo__10dMapInfo_c@l(r3) /* 0x80450630@l */ -/* 8046297C A0 1E 06 8E */ lhz r0, 0x68e(r30) -/* 80462980 60 00 00 01 */ ori r0, r0, 1 -/* 80462984 B0 1E 06 8E */ sth r0, 0x68e(r30) -/* 80462988 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046298C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80462990 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80462994 80 9E 05 C4 */ lwz r4, 0x5c4(r30) -/* 80462998 4B C1 18 B9 */ bl Release__4cBgSFP9dBgW_Base -/* 8046299C 88 1E 05 F1 */ lbz r0, 0x5f1(r30) -/* 804629A0 28 00 00 00 */ cmplwi r0, 0 -/* 804629A4 40 82 00 10 */ bne lbl_804629B4 -/* 804629A8 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 804629AC 90 1E 05 BC */ stw r0, 0x5bc(r30) -/* 804629B0 48 00 00 0C */ b lbl_804629BC -lbl_804629B4: -/* 804629B4 80 1E 05 7C */ lwz r0, 0x57c(r30) -/* 804629B8 90 1E 05 BC */ stw r0, 0x5bc(r30) -lbl_804629BC: -/* 804629BC 80 7E 05 BC */ lwz r3, 0x5bc(r30) -/* 804629C0 80 63 00 84 */ lwz r3, 0x84(r3) -/* 804629C4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 804629C8 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804629CC 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804629D0 4B EE 3A E1 */ bl PSMTXCopy -/* 804629D4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804629D8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804629DC C0 03 00 0C */ lfs f0, 0xc(r3) -/* 804629E0 D0 1E 05 E0 */ stfs f0, 0x5e0(r30) -/* 804629E4 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 804629E8 D0 1E 05 E4 */ stfs f0, 0x5e4(r30) -/* 804629EC C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 804629F0 D0 1E 05 E8 */ stfs f0, 0x5e8(r30) -/* 804629F4 C0 3E 05 E4 */ lfs f1, 0x5e4(r30) -/* 804629F8 C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 804629FC EC 01 00 2A */ fadds f0, f1, f0 -/* 80462A00 D0 1E 05 E4 */ stfs f0, 0x5e4(r30) -/* 80462A04 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80462A08 83 C1 00 08 */ lwz r30, 8(r1) -/* 80462A0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80462A10 7C 08 03 A6 */ mtlr r0 -/* 80462A14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80462A18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInitCom__10daDoor20_cFi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInitCom__10daDoor20_cFi.s deleted file mode 100644 index d29fecb534..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInitCom__10daDoor20_cFi.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_80465620: -/* 80465620 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80465624 7C 08 02 A6 */ mflr r0 -/* 80465628 90 01 00 14 */ stw r0, 0x14(r1) -/* 8046562C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80465630 93 C1 00 08 */ stw r30, 8(r1) -/* 80465634 7C 7E 1B 78 */ mr r30, r3 -/* 80465638 4B BD 4B 81 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 8046563C 7C 7F 1B 78 */ mr r31, r3 -/* 80465640 7F C3 F3 78 */ mr r3, r30 -/* 80465644 4B BD 4B 81 */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80465648 88 1E 06 8C */ lbz r0, 0x68c(r30) -/* 8046564C 28 00 00 00 */ cmplwi r0, 0 -/* 80465650 40 82 00 10 */ bne lbl_80465660 -/* 80465654 9B FE 06 7E */ stb r31, 0x67e(r30) -/* 80465658 98 7E 06 7F */ stb r3, 0x67f(r30) -/* 8046565C 48 00 00 0C */ b lbl_80465668 -lbl_80465660: -/* 80465660 98 7E 06 7E */ stb r3, 0x67e(r30) -/* 80465664 9B FE 06 7F */ stb r31, 0x67f(r30) -lbl_80465668: -/* 80465668 88 1E 06 7E */ lbz r0, 0x67e(r30) -/* 8046566C 88 9E 06 7F */ lbz r4, 0x67f(r30) -/* 80465670 7C 00 20 40 */ cmplw r0, r4 -/* 80465674 41 82 00 44 */ beq lbl_804656B8 -/* 80465678 28 00 00 3F */ cmplwi r0, 0x3f -/* 8046567C 41 82 00 3C */ beq lbl_804656B8 -/* 80465680 28 04 00 3F */ cmplwi r4, 0x3f -/* 80465684 41 82 00 34 */ beq lbl_804656B8 -/* 80465688 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8046568C 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 80465690 38 A3 03 F4 */ addi r5, r3, 0x3f4 -/* 80465694 1C 64 04 04 */ mulli r3, r4, 0x404 -/* 80465698 7C 05 18 AE */ lbzx r0, r5, r3 -/* 8046569C 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b -/* 804656A0 7C 05 19 AE */ stbx r0, r5, r3 -/* 804656A4 88 1E 06 7E */ lbz r0, 0x67e(r30) -/* 804656A8 1C 60 04 04 */ mulli r3, r0, 0x404 -/* 804656AC 7C 05 18 AE */ lbzx r0, r5, r3 -/* 804656B0 60 00 00 20 */ ori r0, r0, 0x20 -/* 804656B4 7C 05 19 AE */ stbx r0, r5, r3 -lbl_804656B8: -/* 804656B8 88 7E 06 7F */ lbz r3, 0x67f(r30) -/* 804656BC 4B BB ED 69 */ bl setNextStayNo__20dStage_roomControl_cFi -/* 804656C0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804656C4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804656C8 80 63 00 00 */ lwz r3, 0(r3) -/* 804656CC 38 63 04 A4 */ addi r3, r3, 0x4a4 -/* 804656D0 38 80 00 00 */ li r4, 0 -/* 804656D4 4B E5 12 0D */ bl setSceneExist__10Z2SceneMgrFb -/* 804656D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804656DC 83 C1 00 08 */ lwz r30, 8(r1) -/* 804656E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804656E4 7C 08 03 A6 */ mtlr r0 -/* 804656E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 804656EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit_0__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit_0__10daDoor20_cFv.s deleted file mode 100644 index 03fd6dc853..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit_0__10daDoor20_cFv.s +++ /dev/null @@ -1,187 +0,0 @@ -lbl_80461A60: -/* 80461A60 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80461A64 7C 08 02 A6 */ mflr r0 -/* 80461A68 90 01 00 54 */ stw r0, 0x54(r1) -/* 80461A6C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80461A70 4B F0 07 59 */ bl _savegpr_24 -/* 80461A74 7C 7F 1B 78 */ mr r31, r3 -/* 80461A78 3C 80 80 46 */ lis r4, lit_4018@ha /* 0x80466820@ha */ -/* 80461A7C 3B C4 68 20 */ addi r30, r4, lit_4018@l /* 0x80466820@l */ -/* 80461A80 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461A84 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461A88 80 84 5D B4 */ lwz r4, 0x5db4(r4) -/* 80461A8C 80 04 05 74 */ lwz r0, 0x574(r4) -/* 80461A90 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80461A94 41 82 00 78 */ beq lbl_80461B0C -/* 80461A98 4B BD 86 F1 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80461A9C 2C 03 00 0A */ cmpwi r3, 0xa -/* 80461AA0 40 82 00 38 */ bne lbl_80461AD8 -/* 80461AA4 7F E3 FB 78 */ mr r3, r31 -/* 80461AA8 4B FF F0 FD */ bl getArcName__10daDoor20_cFv -/* 80461AAC 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80461AB0 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80461AB4 38 84 00 DF */ addi r4, r4, 0xdf -/* 80461AB8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461ABC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461AC0 3C A5 00 02 */ addis r5, r5, 2 -/* 80461AC4 38 C0 00 80 */ li r6, 0x80 -/* 80461AC8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80461ACC 4B BD A8 B1 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80461AD0 7C 64 1B 78 */ mr r4, r3 -/* 80461AD4 48 00 00 A8 */ b lbl_80461B7C -lbl_80461AD8: -/* 80461AD8 7F E3 FB 78 */ mr r3, r31 -/* 80461ADC 4B FF F0 C9 */ bl getArcName__10daDoor20_cFv -/* 80461AE0 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80461AE4 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80461AE8 38 84 00 F1 */ addi r4, r4, 0xf1 -/* 80461AEC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461AF0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461AF4 3C A5 00 02 */ addis r5, r5, 2 -/* 80461AF8 38 C0 00 80 */ li r6, 0x80 -/* 80461AFC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80461B00 4B BD A8 7D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80461B04 7C 64 1B 78 */ mr r4, r3 -/* 80461B08 48 00 00 74 */ b lbl_80461B7C -lbl_80461B0C: -/* 80461B0C 4B BD 86 7D */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80461B10 2C 03 00 0A */ cmpwi r3, 0xa -/* 80461B14 40 82 00 38 */ bne lbl_80461B4C -/* 80461B18 7F E3 FB 78 */ mr r3, r31 -/* 80461B1C 4B FF F0 89 */ bl getArcName__10daDoor20_cFv -/* 80461B20 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80461B24 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80461B28 38 84 00 D0 */ addi r4, r4, 0xd0 -/* 80461B2C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461B30 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461B34 3C A5 00 02 */ addis r5, r5, 2 -/* 80461B38 38 C0 00 80 */ li r6, 0x80 -/* 80461B3C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80461B40 4B BD A8 3D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80461B44 7C 64 1B 78 */ mr r4, r3 -/* 80461B48 48 00 00 34 */ b lbl_80461B7C -lbl_80461B4C: -/* 80461B4C 7F E3 FB 78 */ mr r3, r31 -/* 80461B50 4B FF F0 55 */ bl getArcName__10daDoor20_cFv -/* 80461B54 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80461B58 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80461B5C 38 84 00 B2 */ addi r4, r4, 0xb2 -/* 80461B60 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461B64 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461B68 3C A5 00 02 */ addis r5, r5, 2 -/* 80461B6C 38 C0 00 80 */ li r6, 0x80 -/* 80461B70 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80461B74 4B BD A8 09 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80461B78 7C 64 1B 78 */ mr r4, r3 -lbl_80461B7C: -/* 80461B7C 38 7F 05 84 */ addi r3, r31, 0x584 -/* 80461B80 38 A0 00 01 */ li r5, 1 -/* 80461B84 38 C0 00 00 */ li r6, 0 -/* 80461B88 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80461B8C 38 E0 00 00 */ li r7, 0 -/* 80461B90 39 00 FF FF */ li r8, -1 -/* 80461B94 39 20 00 01 */ li r9, 1 -/* 80461B98 4B BA BC 45 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80461B9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461BA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461BA4 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80461BA8 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80461BAC 81 8C 00 E0 */ lwz r12, 0xe0(r12) -/* 80461BB0 7D 89 03 A6 */ mtctr r12 -/* 80461BB4 4E 80 04 21 */ bctrl -/* 80461BB8 D0 3F 05 90 */ stfs f1, 0x590(r31) -/* 80461BBC 7F E3 FB 78 */ mr r3, r31 -/* 80461BC0 4B BD 86 29 */ bl getSwbit3__13door_param2_cFP10fopAc_ac_c -/* 80461BC4 54 7A 06 3E */ clrlwi r26, r3, 0x18 -/* 80461BC8 28 1A 00 FF */ cmplwi r26, 0xff -/* 80461BCC 41 82 01 38 */ beq lbl_80461D04 -/* 80461BD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461BD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461BD8 7F 44 D3 78 */ mr r4, r26 -/* 80461BDC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80461BE0 7C 05 07 74 */ extsb r5, r0 -/* 80461BE4 4B BD 37 7D */ bl isSwitch__10dSv_info_cCFii -/* 80461BE8 2C 03 00 00 */ cmpwi r3, 0 -/* 80461BEC 40 82 01 18 */ bne lbl_80461D04 -/* 80461BF0 38 61 00 20 */ addi r3, r1, 0x20 -/* 80461BF4 38 80 00 00 */ li r4, 0 -/* 80461BF8 A8 BF 06 70 */ lha r5, 0x670(r31) -/* 80461BFC 38 C0 00 00 */ li r6, 0 -/* 80461C00 4B E0 57 F5 */ bl __ct__5csXyzFsss -/* 80461C04 3B 20 00 00 */ li r25, 0 -/* 80461C08 3B 00 00 00 */ li r24, 0 -/* 80461C0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461C10 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461C14 3B 7C 4E 00 */ addi r27, r28, 0x4e00 -/* 80461C18 3C 60 80 46 */ lis r3, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80461C1C 3B A3 68 D8 */ addi r29, r3, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -lbl_80461C20: -/* 80461C20 7F 63 DB 78 */ mr r3, r27 -/* 80461C24 38 9D 01 03 */ addi r4, r29, 0x103 -/* 80461C28 4B F0 6D 6D */ bl strcmp -/* 80461C2C 2C 03 00 00 */ cmpwi r3, 0 -/* 80461C30 40 82 00 54 */ bne lbl_80461C84 -/* 80461C34 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80461C38 7C 04 07 74 */ extsb r4, r0 -/* 80461C3C 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 80461C40 38 00 00 00 */ li r0, 0 -/* 80461C44 90 01 00 08 */ stw r0, 8(r1) -/* 80461C48 90 81 00 0C */ stw r4, 0xc(r1) -/* 80461C4C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80461C50 90 01 00 14 */ stw r0, 0x14(r1) -/* 80461C54 90 01 00 18 */ stw r0, 0x18(r1) -/* 80461C58 38 80 00 00 */ li r4, 0 -/* 80461C5C 38 BE 00 38 */ addi r5, r30, 0x38 -/* 80461C60 7C A5 C2 2E */ lhzx r5, r5, r24 -/* 80461C64 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 80461C68 38 E0 00 00 */ li r7, 0 -/* 80461C6C 39 01 00 20 */ addi r8, r1, 0x20 -/* 80461C70 39 20 00 00 */ li r9, 0 -/* 80461C74 39 40 00 FF */ li r10, 0xff -/* 80461C78 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80461C7C 4B BE AE 15 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80461C80 48 00 00 50 */ b lbl_80461CD0 -lbl_80461C84: -/* 80461C84 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80461C88 7C 04 07 74 */ extsb r4, r0 -/* 80461C8C 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 80461C90 38 00 00 00 */ li r0, 0 -/* 80461C94 90 01 00 08 */ stw r0, 8(r1) -/* 80461C98 90 81 00 0C */ stw r4, 0xc(r1) -/* 80461C9C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80461CA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80461CA4 90 01 00 18 */ stw r0, 0x18(r1) -/* 80461CA8 38 80 00 00 */ li r4, 0 -/* 80461CAC 38 BE 00 2C */ addi r5, r30, 0x2c -/* 80461CB0 7C A5 C2 2E */ lhzx r5, r5, r24 -/* 80461CB4 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 80461CB8 38 E0 00 00 */ li r7, 0 -/* 80461CBC 39 01 00 20 */ addi r8, r1, 0x20 -/* 80461CC0 39 20 00 00 */ li r9, 0 -/* 80461CC4 39 40 00 FF */ li r10, 0xff -/* 80461CC8 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80461CCC 4B BE AD C5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -lbl_80461CD0: -/* 80461CD0 3B 39 00 01 */ addi r25, r25, 1 -/* 80461CD4 28 19 00 05 */ cmplwi r25, 5 -/* 80461CD8 3B 18 00 02 */ addi r24, r24, 2 -/* 80461CDC 41 80 FF 44 */ blt lbl_80461C20 -/* 80461CE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461CE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461CE8 7F 44 D3 78 */ mr r4, r26 -/* 80461CEC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80461CF0 7C 05 07 74 */ extsb r5, r0 -/* 80461CF4 4B BD 35 0D */ bl onSwitch__10dSv_info_cFii -/* 80461CF8 38 00 00 01 */ li r0, 1 -/* 80461CFC 98 1F 06 72 */ stb r0, 0x672(r31) -/* 80461D00 48 00 00 0C */ b lbl_80461D0C -lbl_80461D04: -/* 80461D04 38 00 00 00 */ li r0, 0 -/* 80461D08 98 1F 06 72 */ stb r0, 0x672(r31) -lbl_80461D0C: -/* 80461D0C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80461D10 4B F0 05 05 */ bl _restgpr_24 -/* 80461D14 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80461D18 7C 08 03 A6 */ mtlr r0 -/* 80461D1C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80461D20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit_1__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit_1__10daDoor20_cFv.s deleted file mode 100644 index eb1ea95d14..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit_1__10daDoor20_cFv.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_80461D24: -/* 80461D24 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80461D28 7C 08 02 A6 */ mflr r0 -/* 80461D2C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80461D30 39 61 00 40 */ addi r11, r1, 0x40 -/* 80461D34 4B F0 04 99 */ bl _savegpr_25 -/* 80461D38 7C 7E 1B 78 */ mr r30, r3 -/* 80461D3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461D40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461D44 80 84 5D B4 */ lwz r4, 0x5db4(r4) -/* 80461D48 80 04 05 74 */ lwz r0, 0x574(r4) -/* 80461D4C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80461D50 41 82 00 34 */ beq lbl_80461D84 -/* 80461D54 4B FF EE 51 */ bl getArcName__10daDoor20_cFv -/* 80461D58 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80461D5C 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80461D60 38 84 01 0A */ addi r4, r4, 0x10a -/* 80461D64 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461D68 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461D6C 3C A5 00 02 */ addis r5, r5, 2 -/* 80461D70 38 C0 00 80 */ li r6, 0x80 -/* 80461D74 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80461D78 4B BD A6 05 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80461D7C 7C 64 1B 78 */ mr r4, r3 -/* 80461D80 48 00 00 30 */ b lbl_80461DB0 -lbl_80461D84: -/* 80461D84 4B FF EE 21 */ bl getArcName__10daDoor20_cFv -/* 80461D88 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80461D8C 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80461D90 38 84 00 C1 */ addi r4, r4, 0xc1 -/* 80461D94 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461D98 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461D9C 3C A5 00 02 */ addis r5, r5, 2 -/* 80461DA0 38 C0 00 80 */ li r6, 0x80 -/* 80461DA4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80461DA8 4B BD A5 D5 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80461DAC 7C 64 1B 78 */ mr r4, r3 -lbl_80461DB0: -/* 80461DB0 38 7E 05 84 */ addi r3, r30, 0x584 -/* 80461DB4 38 A0 00 01 */ li r5, 1 -/* 80461DB8 38 C0 00 00 */ li r6, 0 -/* 80461DBC 3C E0 80 46 */ lis r7, lit_4124@ha /* 0x80466824@ha */ -/* 80461DC0 C0 27 68 24 */ lfs f1, lit_4124@l(r7) /* 0x80466824@l */ -/* 80461DC4 38 E0 00 00 */ li r7, 0 -/* 80461DC8 39 00 FF FF */ li r8, -1 -/* 80461DCC 39 20 00 01 */ li r9, 1 -/* 80461DD0 4B BA BA 0D */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80461DD4 7F C3 F3 78 */ mr r3, r30 -/* 80461DD8 4B BD 84 11 */ bl getSwbit3__13door_param2_cFP10fopAc_ac_c -/* 80461DDC 54 7F 06 3E */ clrlwi r31, r3, 0x18 -/* 80461DE0 28 1F 00 FF */ cmplwi r31, 0xff -/* 80461DE4 41 82 00 C0 */ beq lbl_80461EA4 -/* 80461DE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461DEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461DF0 7F E4 FB 78 */ mr r4, r31 -/* 80461DF4 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80461DF8 7C 05 07 74 */ extsb r5, r0 -/* 80461DFC 4B BD 35 65 */ bl isSwitch__10dSv_info_cCFii -/* 80461E00 2C 03 00 00 */ cmpwi r3, 0 -/* 80461E04 40 82 00 A0 */ bne lbl_80461EA4 -/* 80461E08 3B 20 00 00 */ li r25, 0 -/* 80461E0C 3B A0 00 00 */ li r29, 0 -/* 80461E10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461E14 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461E18 3C 60 80 46 */ lis r3, l_eff_id@ha /* 0x80466864@ha */ -/* 80461E1C 3B 63 68 64 */ addi r27, r3, l_eff_id@l /* 0x80466864@l */ -/* 80461E20 3C 60 80 46 */ lis r3, lit_4124@ha /* 0x80466824@ha */ -/* 80461E24 3B 83 68 24 */ addi r28, r3, lit_4124@l /* 0x80466824@l */ -lbl_80461E28: -/* 80461E28 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80461E2C 7C 04 07 74 */ extsb r4, r0 -/* 80461E30 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) -/* 80461E34 38 00 00 00 */ li r0, 0 -/* 80461E38 90 01 00 08 */ stw r0, 8(r1) -/* 80461E3C 90 81 00 0C */ stw r4, 0xc(r1) -/* 80461E40 90 01 00 10 */ stw r0, 0x10(r1) -/* 80461E44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80461E48 90 01 00 18 */ stw r0, 0x18(r1) -/* 80461E4C 38 80 00 00 */ li r4, 0 -/* 80461E50 7C BB EA 2E */ lhzx r5, r27, r29 -/* 80461E54 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80461E58 38 E0 00 00 */ li r7, 0 -/* 80461E5C 39 1E 04 E4 */ addi r8, r30, 0x4e4 -/* 80461E60 39 20 00 00 */ li r9, 0 -/* 80461E64 39 40 00 FF */ li r10, 0xff -/* 80461E68 C0 3C 00 00 */ lfs f1, 0(r28) -/* 80461E6C 4B BE AC 25 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80461E70 3B 39 00 01 */ addi r25, r25, 1 -/* 80461E74 2C 19 00 02 */ cmpwi r25, 2 -/* 80461E78 3B BD 00 02 */ addi r29, r29, 2 -/* 80461E7C 41 80 FF AC */ blt lbl_80461E28 -/* 80461E80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461E84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461E88 7F E4 FB 78 */ mr r4, r31 -/* 80461E8C 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80461E90 7C 05 07 74 */ extsb r5, r0 -/* 80461E94 4B BD 33 6D */ bl onSwitch__10dSv_info_cFii -/* 80461E98 38 00 00 01 */ li r0, 1 -/* 80461E9C 98 1E 06 72 */ stb r0, 0x672(r30) -/* 80461EA0 48 00 00 0C */ b lbl_80461EAC -lbl_80461EA4: -/* 80461EA4 38 00 00 00 */ li r0, 0 -/* 80461EA8 98 1E 06 72 */ stb r0, 0x672(r30) -lbl_80461EAC: -/* 80461EAC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80461EB0 4B F0 03 69 */ bl _restgpr_25 -/* 80461EB4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80461EB8 7C 08 03 A6 */ mtlr r0 -/* 80461EBC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80461EC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit__10daDoor20_cFi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit__10daDoor20_cFi.s deleted file mode 100644 index 535edce0bc..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit__10daDoor20_cFi.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80461EC4: -/* 80461EC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80461EC8 7C 08 02 A6 */ mflr r0 -/* 80461ECC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80461ED0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80461ED4 7C 7F 1B 78 */ mr r31, r3 -/* 80461ED8 38 80 00 01 */ li r4, 1 -/* 80461EDC 48 00 37 45 */ bl openInitCom__10daDoor20_cFi -/* 80461EE0 88 1F 06 7F */ lbz r0, 0x67f(r31) -/* 80461EE4 3C 60 80 45 */ lis r3, mNextRoomNo__10dMapInfo_c@ha /* 0x80450630@ha */ -/* 80461EE8 90 03 06 30 */ stw r0, mNextRoomNo__10dMapInfo_c@l(r3) /* 0x80450630@l */ -/* 80461EEC A0 1F 06 8E */ lhz r0, 0x68e(r31) -/* 80461EF0 60 00 00 01 */ ori r0, r0, 1 -/* 80461EF4 B0 1F 06 8E */ sth r0, 0x68e(r31) -/* 80461EF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461EFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461F00 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80461F04 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 80461F08 4B C1 23 49 */ bl Release__4cBgSFP9dBgW_Base -/* 80461F0C 7F E3 FB 78 */ mr r3, r31 -/* 80461F10 4B BD 82 79 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80461F14 28 03 00 0C */ cmplwi r3, 0xc -/* 80461F18 41 81 00 1C */ bgt lbl_80461F34 -/* 80461F1C 3C 80 80 46 */ lis r4, lit_4496@ha /* 0x80466F04@ha */ -/* 80461F20 38 84 6F 04 */ addi r4, r4, lit_4496@l /* 0x80466F04@l */ -/* 80461F24 54 60 10 3A */ slwi r0, r3, 2 -/* 80461F28 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80461F2C 7C 09 03 A6 */ mtctr r0 -/* 80461F30 4E 80 04 20 */ bctr -lbl_80461F34: -/* 80461F34 7F E3 FB 78 */ mr r3, r31 -/* 80461F38 4B FF FB 29 */ bl openInit_0__10daDoor20_cFv -/* 80461F3C 48 00 00 0C */ b lbl_80461F48 -lbl_80461F40: -/* 80461F40 7F E3 FB 78 */ mr r3, r31 -/* 80461F44 4B FF FD E1 */ bl openInit_1__10daDoor20_cFv -lbl_80461F48: -/* 80461F48 38 60 00 01 */ li r3, 1 -/* 80461F4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80461F50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80461F54 7C 08 03 A6 */ mtlr r0 -/* 80461F58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80461F5C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit__12dDoor_stop_cFP10daDoor20_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit__12dDoor_stop_cFP10daDoor20_c.s deleted file mode 100644 index f89907f732..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit__12dDoor_stop_cFP10daDoor20_c.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_8046634C: -/* 8046634C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80466350 7C 08 02 A6 */ mflr r0 -/* 80466354 90 01 00 24 */ stw r0, 0x24(r1) -/* 80466358 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8046635C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80466360 7C 9E 23 78 */ mr r30, r4 -/* 80466364 3C 80 80 46 */ lis r4, lit_4018@ha /* 0x80466820@ha */ -/* 80466368 3B E4 68 20 */ addi r31, r4, lit_4018@l /* 0x80466820@l */ -/* 8046636C C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80466370 D0 03 00 04 */ stfs f0, 4(r3) -/* 80466374 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 80466378 38 00 00 01 */ li r0, 1 -/* 8046637C 98 03 00 0B */ stb r0, 0xb(r3) -/* 80466380 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80466384 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80466388 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8046638C 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80466390 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80466394 38 84 01 94 */ addi r4, r4, 0x194 -/* 80466398 4B F0 25 FD */ bl strcmp -/* 8046639C 2C 03 00 00 */ cmpwi r3, 0 -/* 804663A0 40 82 00 54 */ bne lbl_804663F4 -/* 804663A4 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804663A8 7C 03 07 74 */ extsb r3, r0 -/* 804663AC 4B BC 6C C1 */ bl dComIfGp_getReverb__Fi -/* 804663B0 7C 67 1B 78 */ mr r7, r3 -/* 804663B4 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800C3@ha */ -/* 804663B8 38 03 00 C3 */ addi r0, r3, 0x00C3 /* 0x000800C3@l */ -/* 804663BC 90 01 00 0C */ stw r0, 0xc(r1) -/* 804663C0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804663C4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804663C8 80 63 00 00 */ lwz r3, 0(r3) -/* 804663CC 38 81 00 0C */ addi r4, r1, 0xc -/* 804663D0 38 BE 05 38 */ addi r5, r30, 0x538 -/* 804663D4 38 C0 00 00 */ li r6, 0 -/* 804663D8 C0 3F 00 04 */ lfs f1, 4(r31) -/* 804663DC FC 40 08 90 */ fmr f2, f1 -/* 804663E0 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 804663E4 FC 80 18 90 */ fmr f4, f3 -/* 804663E8 39 00 00 00 */ li r8, 0 -/* 804663EC 4B E4 55 99 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804663F0 48 00 00 50 */ b lbl_80466440 -lbl_804663F4: -/* 804663F4 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804663F8 7C 03 07 74 */ extsb r3, r0 -/* 804663FC 4B BC 6C 71 */ bl dComIfGp_getReverb__Fi -/* 80466400 7C 67 1B 78 */ mr r7, r3 -/* 80466404 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080010@ha */ -/* 80466408 38 03 00 10 */ addi r0, r3, 0x0010 /* 0x00080010@l */ -/* 8046640C 90 01 00 08 */ stw r0, 8(r1) -/* 80466410 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80466414 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80466418 80 63 00 00 */ lwz r3, 0(r3) -/* 8046641C 38 81 00 08 */ addi r4, r1, 8 -/* 80466420 38 BE 05 38 */ addi r5, r30, 0x538 -/* 80466424 38 C0 00 00 */ li r6, 0 -/* 80466428 C0 3F 00 04 */ lfs f1, 4(r31) -/* 8046642C FC 40 08 90 */ fmr f2, f1 -/* 80466430 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 80466434 FC 80 18 90 */ fmr f4, f3 -/* 80466438 39 00 00 00 */ li r8, 0 -/* 8046643C 4B E4 55 49 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80466440: -/* 80466440 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80466444 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80466448 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8046644C 7C 08 03 A6 */ mtlr r0 -/* 80466450 38 21 00 20 */ addi r1, r1, 0x20 -/* 80466454 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openProc__10daDoor20_cFi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openProc__10daDoor20_cFi.s deleted file mode 100644 index 08872cd7c6..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openProc__10daDoor20_cFi.s +++ /dev/null @@ -1,228 +0,0 @@ -lbl_80461F60: -/* 80461F60 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80461F64 7C 08 02 A6 */ mflr r0 -/* 80461F68 90 01 00 54 */ stw r0, 0x54(r1) -/* 80461F6C DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80461F70 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80461F74 39 61 00 40 */ addi r11, r1, 0x40 -/* 80461F78 4B F0 02 61 */ bl _savegpr_28 -/* 80461F7C 7C 7D 1B 78 */ mr r29, r3 -/* 80461F80 3C 60 80 46 */ lis r3, lit_4018@ha /* 0x80466820@ha */ -/* 80461F84 3B E3 68 20 */ addi r31, r3, lit_4018@l /* 0x80466820@l */ -/* 80461F88 C3 FD 05 94 */ lfs f31, 0x594(r29) -/* 80461F8C 38 7D 05 84 */ addi r3, r29, 0x584 -/* 80461F90 4B BA B4 99 */ bl play__14mDoExt_baseAnmFv -/* 80461F94 7C 7E 1B 78 */ mr r30, r3 -/* 80461F98 7F A3 EB 78 */ mr r3, r29 -/* 80461F9C 4B BD 81 ED */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80461FA0 28 03 00 0C */ cmplwi r3, 0xc -/* 80461FA4 41 81 01 08 */ bgt lbl_804620AC -/* 80461FA8 3C 80 80 46 */ lis r4, lit_4611@ha /* 0x80466F38@ha */ -/* 80461FAC 38 84 6F 38 */ addi r4, r4, lit_4611@l /* 0x80466F38@l */ -/* 80461FB0 54 60 10 3A */ slwi r0, r3, 2 -/* 80461FB4 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80461FB8 7C 09 03 A6 */ mtctr r0 -/* 80461FBC 4E 80 04 20 */ bctr -lbl_80461FC0: -/* 80461FC0 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 80461FC4 C0 3D 05 94 */ lfs f1, 0x594(r29) -/* 80461FC8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80461FCC 40 82 00 38 */ bne lbl_80462004 -/* 80461FD0 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 80461FD4 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80461FD8 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80461FDC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80461FE0 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 80461FE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461FE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461FEC 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80461FF0 38 80 00 04 */ li r4, 4 -/* 80461FF4 38 A0 00 0F */ li r5, 0xf -/* 80461FF8 38 C1 00 20 */ addi r6, r1, 0x20 -/* 80461FFC 4B C0 DA 29 */ bl StartShock__12dVibration_cFii4cXyz -/* 80462000 48 00 02 84 */ b lbl_80462284 -lbl_80462004: -/* 80462004 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80462008 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8046200C 40 82 02 78 */ bne lbl_80462284 -/* 80462010 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80462014 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80462018 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8046201C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80462020 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80462024 41 82 00 24 */ beq lbl_80462048 -/* 80462028 88 7D 06 72 */ lbz r3, 0x672(r29) -/* 8046202C 30 03 FF FF */ addic r0, r3, -1 -/* 80462030 7C 80 19 10 */ subfe r4, r0, r3 -/* 80462034 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008019B@ha */ -/* 80462038 38 03 01 9B */ addi r0, r3, 0x019B /* 0x0008019B@l */ -/* 8046203C 7C 04 02 14 */ add r0, r4, r0 -/* 80462040 7C 1C 03 78 */ mr r28, r0 -/* 80462044 48 00 00 20 */ b lbl_80462064 -lbl_80462048: -/* 80462048 88 1D 06 72 */ lbz r0, 0x672(r29) -/* 8046204C 28 00 00 00 */ cmplwi r0, 0 -/* 80462050 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800C7@ha */ -/* 80462054 38 03 00 C7 */ addi r0, r3, 0x00C7 /* 0x000800C7@l */ -/* 80462058 41 82 00 08 */ beq lbl_80462060 -/* 8046205C 38 03 00 B2 */ addi r0, r3, 0xb2 -lbl_80462060: -/* 80462060 7C 1C 03 78 */ mr r28, r0 -lbl_80462064: -/* 80462064 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80462068 7C 03 07 74 */ extsb r3, r0 -/* 8046206C 4B BC B0 01 */ bl dComIfGp_getReverb__Fi -/* 80462070 7C 67 1B 78 */ mr r7, r3 -/* 80462074 93 81 00 10 */ stw r28, 0x10(r1) -/* 80462078 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8046207C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80462080 80 63 00 00 */ lwz r3, 0(r3) -/* 80462084 38 81 00 10 */ addi r4, r1, 0x10 -/* 80462088 38 BD 05 E0 */ addi r5, r29, 0x5e0 -/* 8046208C 38 C0 00 00 */ li r6, 0 -/* 80462090 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80462094 FC 40 08 90 */ fmr f2, f1 -/* 80462098 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 8046209C FC 80 18 90 */ fmr f4, f3 -/* 804620A0 39 00 00 00 */ li r8, 0 -/* 804620A4 4B E4 98 E1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804620A8 48 00 01 DC */ b lbl_80462284 -lbl_804620AC: -/* 804620AC 7F A3 EB 78 */ mr r3, r29 -/* 804620B0 4B BD 80 D9 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 804620B4 2C 03 00 00 */ cmpwi r3, 0 -/* 804620B8 41 82 00 14 */ beq lbl_804620CC -/* 804620BC 7F A3 EB 78 */ mr r3, r29 -/* 804620C0 4B BD 80 C9 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 804620C4 2C 03 00 0A */ cmpwi r3, 0xa -/* 804620C8 40 82 00 44 */ bne lbl_8046210C -lbl_804620CC: -/* 804620CC C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 804620D0 C0 1D 05 94 */ lfs f0, 0x594(r29) -/* 804620D4 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 804620D8 40 82 00 34 */ bne lbl_8046210C -/* 804620DC C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 804620E0 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 804620E4 C0 1F 00 04 */ lfs f0, 4(r31) -/* 804620E8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804620EC D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 804620F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804620F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804620F8 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 804620FC 38 80 00 04 */ li r4, 4 -/* 80462100 38 A0 00 0F */ li r5, 0xf -/* 80462104 38 C1 00 14 */ addi r6, r1, 0x14 -/* 80462108 4B C0 D9 1D */ bl StartShock__12dVibration_cFii4cXyz -lbl_8046210C: -/* 8046210C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80462110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80462114 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80462118 80 03 05 74 */ lwz r0, 0x574(r3) -/* 8046211C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80462120 41 82 00 AC */ beq lbl_804621CC -/* 80462124 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80462128 C0 1D 05 94 */ lfs f0, 0x594(r29) -/* 8046212C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80462130 40 82 01 54 */ bne lbl_80462284 -/* 80462134 7F A3 EB 78 */ mr r3, r29 -/* 80462138 4B BD 80 51 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 8046213C 2C 03 00 02 */ cmpwi r3, 2 -/* 80462140 40 82 00 10 */ bne lbl_80462150 -/* 80462144 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080219@ha */ -/* 80462148 3B 83 02 19 */ addi r28, r3, 0x0219 /* 0x00080219@l */ -/* 8046214C 48 00 00 38 */ b lbl_80462184 -lbl_80462150: -/* 80462150 7F A3 EB 78 */ mr r3, r29 -/* 80462154 4B BD 80 35 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80462158 2C 03 00 0A */ cmpwi r3, 0xa -/* 8046215C 40 82 00 10 */ bne lbl_8046216C -/* 80462160 3C 60 00 08 */ lis r3, 0x0008 /* 0x000802B6@ha */ -/* 80462164 3B 83 02 B6 */ addi r28, r3, 0x02B6 /* 0x000802B6@l */ -/* 80462168 48 00 00 1C */ b lbl_80462184 -lbl_8046216C: -/* 8046216C 88 1D 06 72 */ lbz r0, 0x672(r29) -/* 80462170 28 00 00 00 */ cmplwi r0, 0 -/* 80462174 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080197@ha */ -/* 80462178 3B 83 01 97 */ addi r28, r3, 0x0197 /* 0x00080197@l */ -/* 8046217C 41 82 00 08 */ beq lbl_80462184 -/* 80462180 3B 83 01 9A */ addi r28, r3, 0x19a -lbl_80462184: -/* 80462184 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80462188 7C 03 07 74 */ extsb r3, r0 -/* 8046218C 4B BC AE E1 */ bl dComIfGp_getReverb__Fi -/* 80462190 7C 67 1B 78 */ mr r7, r3 -/* 80462194 93 81 00 0C */ stw r28, 0xc(r1) -/* 80462198 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8046219C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804621A0 80 63 00 00 */ lwz r3, 0(r3) -/* 804621A4 38 81 00 0C */ addi r4, r1, 0xc -/* 804621A8 38 BD 05 38 */ addi r5, r29, 0x538 -/* 804621AC 38 C0 00 00 */ li r6, 0 -/* 804621B0 C0 3F 00 04 */ lfs f1, 4(r31) -/* 804621B4 FC 40 08 90 */ fmr f2, f1 -/* 804621B8 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 804621BC FC 80 18 90 */ fmr f4, f3 -/* 804621C0 39 00 00 00 */ li r8, 0 -/* 804621C4 4B E4 97 C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804621C8 48 00 00 BC */ b lbl_80462284 -lbl_804621CC: -/* 804621CC C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 804621D0 C0 3D 05 94 */ lfs f1, 0x594(r29) -/* 804621D4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 804621D8 41 82 00 18 */ beq lbl_804621F0 -/* 804621DC FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 804621E0 40 80 00 A4 */ bge lbl_80462284 -/* 804621E4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804621E8 4C 41 13 82 */ cror 2, 1, 2 -/* 804621EC 40 82 00 98 */ bne lbl_80462284 -lbl_804621F0: -/* 804621F0 7F A3 EB 78 */ mr r3, r29 -/* 804621F4 4B BD 7F 95 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 804621F8 2C 03 00 02 */ cmpwi r3, 2 -/* 804621FC 40 82 00 10 */ bne lbl_8046220C -/* 80462200 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080219@ha */ -/* 80462204 3B 83 02 19 */ addi r28, r3, 0x0219 /* 0x00080219@l */ -/* 80462208 48 00 00 38 */ b lbl_80462240 -lbl_8046220C: -/* 8046220C 7F A3 EB 78 */ mr r3, r29 -/* 80462210 4B BD 7F 79 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80462214 2C 03 00 0A */ cmpwi r3, 0xa -/* 80462218 40 82 00 10 */ bne lbl_80462228 -/* 8046221C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000802B6@ha */ -/* 80462220 3B 83 02 B6 */ addi r28, r3, 0x02B6 /* 0x000802B6@l */ -/* 80462224 48 00 00 1C */ b lbl_80462240 -lbl_80462228: -/* 80462228 88 1D 06 72 */ lbz r0, 0x672(r29) -/* 8046222C 28 00 00 00 */ cmplwi r0, 0 -/* 80462230 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080191@ha */ -/* 80462234 3B 83 01 91 */ addi r28, r3, 0x0191 /* 0x00080191@l */ -/* 80462238 41 82 00 08 */ beq lbl_80462240 -/* 8046223C 3B 83 01 9A */ addi r28, r3, 0x19a -lbl_80462240: -/* 80462240 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80462244 7C 03 07 74 */ extsb r3, r0 -/* 80462248 4B BC AE 25 */ bl dComIfGp_getReverb__Fi -/* 8046224C 7C 67 1B 78 */ mr r7, r3 -/* 80462250 93 81 00 08 */ stw r28, 8(r1) -/* 80462254 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80462258 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8046225C 80 63 00 00 */ lwz r3, 0(r3) -/* 80462260 38 81 00 08 */ addi r4, r1, 8 -/* 80462264 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80462268 38 C0 00 00 */ li r6, 0 -/* 8046226C C0 3F 00 04 */ lfs f1, 4(r31) -/* 80462270 FC 40 08 90 */ fmr f2, f1 -/* 80462274 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 80462278 FC 80 18 90 */ fmr f4, f3 -/* 8046227C 39 00 00 00 */ li r8, 0 -/* 80462280 4B E4 97 05 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80462284: -/* 80462284 7F C3 F3 78 */ mr r3, r30 -/* 80462288 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 8046228C CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80462290 39 61 00 40 */ addi r11, r1, 0x40 -/* 80462294 4B EF FF 91 */ bl _restgpr_28 -/* 80462298 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8046229C 7C 08 03 A6 */ mtlr r0 -/* 804622A0 38 21 00 50 */ addi r1, r1, 0x50 -/* 804622A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openProc__12dDoor_stop_cFP10daDoor20_c.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openProc__12dDoor_stop_cFP10daDoor20_c.s deleted file mode 100644 index 5ef95e654d..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openProc__12dDoor_stop_cFP10daDoor20_c.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80466458: -/* 80466458 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8046645C 7C 08 02 A6 */ mflr r0 -/* 80466460 90 01 00 24 */ stw r0, 0x24(r1) -/* 80466464 39 61 00 20 */ addi r11, r1, 0x20 -/* 80466468 4B EF BD 75 */ bl _savegpr_29 -/* 8046646C 7C 7D 1B 78 */ mr r29, r3 -/* 80466470 7C 9E 23 78 */ mr r30, r4 -/* 80466474 3C 60 80 46 */ lis r3, lit_4018@ha /* 0x80466820@ha */ -/* 80466478 3B E3 68 20 */ addi r31, r3, lit_4018@l /* 0x80466820@l */ -/* 8046647C 88 1D 00 0B */ lbz r0, 0xb(r29) -/* 80466480 28 00 00 00 */ cmplwi r0, 0 -/* 80466484 40 82 00 0C */ bne lbl_80466490 -/* 80466488 38 60 00 01 */ li r3, 1 -/* 8046648C 48 00 00 44 */ b lbl_804664D0 -lbl_80466490: -/* 80466490 38 7E 05 2C */ addi r3, r30, 0x52c -/* 80466494 C0 3F 00 68 */ lfs f1, 0x68(r31) -/* 80466498 C0 5F 00 B4 */ lfs f2, 0xb4(r31) -/* 8046649C 4B E0 A2 A5 */ bl cLib_chaseF__FPfff -/* 804664A0 38 7D 00 04 */ addi r3, r29, 4 -/* 804664A4 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 804664A8 C0 5E 05 2C */ lfs f2, 0x52c(r30) -/* 804664AC 4B E0 A2 95 */ bl cLib_chaseF__FPfff -/* 804664B0 2C 03 00 00 */ cmpwi r3, 0 -/* 804664B4 41 82 00 18 */ beq lbl_804664CC -/* 804664B8 38 00 00 00 */ li r0, 0 -/* 804664BC 98 1D 00 0B */ stb r0, 0xb(r29) -/* 804664C0 98 1D 00 08 */ stb r0, 8(r29) -/* 804664C4 38 60 00 02 */ li r3, 2 -/* 804664C8 48 00 00 08 */ b lbl_804664D0 -lbl_804664CC: -/* 804664CC 38 60 00 00 */ li r3, 0 -lbl_804664D0: -/* 804664D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 804664D4 4B EF BD 55 */ bl _restgpr_29 -/* 804664D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804664DC 7C 08 03 A6 */ mtlr r0 -/* 804664E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 804664E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/orderStopEvent__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/orderStopEvent__10daDoor20_cFv.s deleted file mode 100644 index c42421d392..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/orderStopEvent__10daDoor20_cFv.s +++ /dev/null @@ -1,104 +0,0 @@ -lbl_80463E30: -/* 80463E30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80463E34 7C 08 02 A6 */ mflr r0 -/* 80463E38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80463E3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80463E40 7C 7F 1B 78 */ mr r31, r3 -/* 80463E44 88 03 06 8C */ lbz r0, 0x68c(r3) -/* 80463E48 28 00 00 00 */ cmplwi r0, 0 -/* 80463E4C 40 82 00 94 */ bne lbl_80463EE0 -/* 80463E50 4B BD 63 51 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80463E54 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80463E58 28 00 00 03 */ cmplwi r0, 3 -/* 80463E5C 41 82 00 18 */ beq lbl_80463E74 -/* 80463E60 7F E3 FB 78 */ mr r3, r31 -/* 80463E64 4B BD 63 3D */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80463E68 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80463E6C 28 00 00 01 */ cmplwi r0, 1 -/* 80463E70 40 82 01 04 */ bne lbl_80463F74 -lbl_80463E74: -/* 80463E74 7F E3 FB 78 */ mr r3, r31 -/* 80463E78 4B BD 63 7D */ bl isMsgDoor__13door_param2_cFP10fopAc_ac_c -/* 80463E7C 2C 03 00 00 */ cmpwi r3, 0 -/* 80463E80 40 82 00 F4 */ bne lbl_80463F74 -/* 80463E84 7F E3 FB 78 */ mr r3, r31 -/* 80463E88 4B BD 63 79 */ bl getEventNo__13door_param2_cFP10fopAc_ac_c -/* 80463E8C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80463E90 28 00 00 FF */ cmplwi r0, 0xff -/* 80463E94 41 82 00 E0 */ beq lbl_80463F74 -/* 80463E98 7F E3 FB 78 */ mr r3, r31 -/* 80463E9C 4B BD 63 65 */ bl getEventNo__13door_param2_cFP10fopAc_ac_c -/* 80463EA0 88 1F 06 CB */ lbz r0, 0x6cb(r31) -/* 80463EA4 7C 9F 02 14 */ add r4, r31, r0 -/* 80463EA8 98 64 06 B8 */ stb r3, 0x6b8(r4) -/* 80463EAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80463EB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80463EB4 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80463EB8 7F E4 FB 78 */ mr r4, r31 -/* 80463EBC 88 1F 06 CB */ lbz r0, 0x6cb(r31) -/* 80463EC0 7C BF 02 14 */ add r5, r31, r0 -/* 80463EC4 88 A5 06 B8 */ lbz r5, 0x6b8(r5) -/* 80463EC8 4B BE 37 D1 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc -/* 80463ECC 88 1F 06 CB */ lbz r0, 0x6cb(r31) -/* 80463ED0 54 00 08 3C */ slwi r0, r0, 1 -/* 80463ED4 7C 9F 02 14 */ add r4, r31, r0 -/* 80463ED8 B0 64 06 92 */ sth r3, 0x692(r4) -/* 80463EDC 48 00 00 98 */ b lbl_80463F74 -lbl_80463EE0: -/* 80463EE0 28 00 00 01 */ cmplwi r0, 1 -/* 80463EE4 40 82 00 90 */ bne lbl_80463F74 -/* 80463EE8 4B BD 62 C5 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80463EEC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80463EF0 28 00 00 03 */ cmplwi r0, 3 -/* 80463EF4 41 82 00 18 */ beq lbl_80463F0C -/* 80463EF8 7F E3 FB 78 */ mr r3, r31 -/* 80463EFC 4B BD 62 B1 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80463F00 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80463F04 28 00 00 01 */ cmplwi r0, 1 -/* 80463F08 40 82 00 6C */ bne lbl_80463F74 -lbl_80463F0C: -/* 80463F0C 7F E3 FB 78 */ mr r3, r31 -/* 80463F10 4B BD 62 E5 */ bl isMsgDoor__13door_param2_cFP10fopAc_ac_c -/* 80463F14 2C 03 00 00 */ cmpwi r3, 0 -/* 80463F18 40 82 00 5C */ bne lbl_80463F74 -/* 80463F1C 7F E3 FB 78 */ mr r3, r31 -/* 80463F20 4B BD 62 ED */ bl getEventNo2__13door_param2_cFP10fopAc_ac_c -/* 80463F24 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80463F28 28 00 00 FF */ cmplwi r0, 0xff -/* 80463F2C 41 82 00 48 */ beq lbl_80463F74 -/* 80463F30 7F E3 FB 78 */ mr r3, r31 -/* 80463F34 4B BD 62 D9 */ bl getEventNo2__13door_param2_cFP10fopAc_ac_c -/* 80463F38 88 1F 06 CB */ lbz r0, 0x6cb(r31) -/* 80463F3C 7C 9F 02 14 */ add r4, r31, r0 -/* 80463F40 98 64 06 B8 */ stb r3, 0x6b8(r4) -/* 80463F44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80463F48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80463F4C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80463F50 7F E4 FB 78 */ mr r4, r31 -/* 80463F54 88 1F 06 CB */ lbz r0, 0x6cb(r31) -/* 80463F58 7C BF 02 14 */ add r5, r31, r0 -/* 80463F5C 88 A5 06 B8 */ lbz r5, 0x6b8(r5) -/* 80463F60 4B BE 37 39 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc -/* 80463F64 88 1F 06 CB */ lbz r0, 0x6cb(r31) -/* 80463F68 54 00 08 3C */ slwi r0, r0, 1 -/* 80463F6C 7C 9F 02 14 */ add r4, r31, r0 -/* 80463F70 B0 64 06 92 */ sth r3, 0x692(r4) -lbl_80463F74: -/* 80463F74 88 BF 06 CB */ lbz r5, 0x6cb(r31) -/* 80463F78 7F E3 FB 78 */ mr r3, r31 -/* 80463F7C 54 A0 08 3C */ slwi r0, r5, 1 -/* 80463F80 7C 9F 02 14 */ add r4, r31, r0 -/* 80463F84 A8 84 06 92 */ lha r4, 0x692(r4) -/* 80463F88 7C BF 2A 14 */ add r5, r31, r5 -/* 80463F8C 88 A5 06 B8 */ lbz r5, 0x6b8(r5) -/* 80463F90 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80463F94 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80463F98 38 E0 00 00 */ li r7, 0 -/* 80463F9C 39 00 00 01 */ li r8, 1 -/* 80463FA0 4B BB 76 DD */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 80463FA4 38 60 00 01 */ li r3, 1 -/* 80463FA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80463FAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80463FB0 7C 08 03 A6 */ mtlr r0 -/* 80463FB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80463FB8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setAngle__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setAngle__10daDoor20_cFv.s deleted file mode 100644 index afc34cc32e..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setAngle__10daDoor20_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80461A44: -/* 80461A44 A8 63 04 E6 */ lha r3, 0x4e6(r3) -/* 80461A48 38 03 7F FF */ addi r0, r3, 0x7fff -/* 80461A4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461A50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461A54 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80461A58 B0 03 06 06 */ sth r0, 0x606(r3) -/* 80461A5C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setDoorAngleSpec__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setDoorAngleSpec__10daDoor20_cFv.s deleted file mode 100644 index 51ff40c93c..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setDoorAngleSpec__10daDoor20_cFv.s +++ /dev/null @@ -1,106 +0,0 @@ -lbl_80464638: -/* 80464638 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8046463C 7C 08 02 A6 */ mflr r0 -/* 80464640 90 01 00 34 */ stw r0, 0x34(r1) -/* 80464644 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80464648 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8046464C 7C 7F 1B 78 */ mr r31, r3 -/* 80464650 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464654 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464658 83 C4 5D AC */ lwz r30, 0x5dac(r4) -/* 8046465C 4B BD 5B 2D */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80464660 2C 03 00 02 */ cmpwi r3, 2 -/* 80464664 41 82 01 08 */ beq lbl_8046476C -/* 80464668 40 80 00 14 */ bge lbl_8046467C -/* 8046466C 2C 03 00 00 */ cmpwi r3, 0 -/* 80464670 41 82 00 FC */ beq lbl_8046476C -/* 80464674 40 80 00 14 */ bge lbl_80464688 -/* 80464678 48 00 00 F4 */ b lbl_8046476C -lbl_8046467C: -/* 8046467C 2C 03 00 0C */ cmpwi r3, 0xc -/* 80464680 41 82 00 EC */ beq lbl_8046476C -/* 80464684 48 00 00 E8 */ b lbl_8046476C -lbl_80464688: -/* 80464688 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046468C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464690 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80464694 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80464698 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 8046469C 38 84 01 A2 */ addi r4, r4, 0x1a2 -/* 804646A0 4B F0 42 F5 */ bl strcmp -/* 804646A4 2C 03 00 00 */ cmpwi r3, 0 -/* 804646A8 40 82 00 88 */ bne lbl_80464730 -/* 804646AC 38 61 00 08 */ addi r3, r1, 8 -/* 804646B0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 804646B4 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 804646B8 4B E0 24 7D */ bl __mi__4cXyzCFRC3Vec -/* 804646BC C0 01 00 08 */ lfs f0, 8(r1) -/* 804646C0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 804646C4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 804646C8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804646CC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 804646D0 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 804646D4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804646D8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804646DC A8 1F 04 B6 */ lha r0, 0x4b6(r31) -/* 804646E0 7C 00 00 D0 */ neg r0, r0 -/* 804646E4 7C 04 07 34 */ extsh r4, r0 -/* 804646E8 4B BA 7C F5 */ bl mDoMtx_YrotS__FPA4_fs -/* 804646EC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804646F0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804646F4 38 81 00 14 */ addi r4, r1, 0x14 -/* 804646F8 7C 85 23 78 */ mr r5, r4 -/* 804646FC 4B EE 26 71 */ bl PSMTXMultVec -/* 80464700 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80464704 3C 60 80 46 */ lis r3, lit_4256@ha /* 0x8046682C@ha */ -/* 80464708 C0 03 68 2C */ lfs f0, lit_4256@l(r3) /* 0x8046682C@l */ -/* 8046470C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80464710 40 81 00 14 */ ble lbl_80464724 -/* 80464714 A8 7F 04 DE */ lha r3, 0x4de(r31) -/* 80464718 38 03 7F FF */ addi r0, r3, 0x7fff -/* 8046471C B0 1F 06 70 */ sth r0, 0x670(r31) -/* 80464720 48 00 00 84 */ b lbl_804647A4 -lbl_80464724: -/* 80464724 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 80464728 B0 1F 06 70 */ sth r0, 0x670(r31) -/* 8046472C 48 00 00 78 */ b lbl_804647A4 -lbl_80464730: -/* 80464730 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80464734 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80464738 7F DE 07 74 */ extsb r30, r30 -/* 8046473C 7F E3 FB 78 */ mr r3, r31 -/* 80464740 4B BD 5A 79 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464744 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80464748 7C 00 F0 00 */ cmpw r0, r30 -/* 8046474C 40 82 00 14 */ bne lbl_80464760 -/* 80464750 A8 7F 04 DE */ lha r3, 0x4de(r31) -/* 80464754 38 03 7F FF */ addi r0, r3, 0x7fff -/* 80464758 B0 1F 06 70 */ sth r0, 0x670(r31) -/* 8046475C 48 00 00 48 */ b lbl_804647A4 -lbl_80464760: -/* 80464760 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 80464764 B0 1F 06 70 */ sth r0, 0x670(r31) -/* 80464768 48 00 00 3C */ b lbl_804647A4 -lbl_8046476C: -/* 8046476C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80464770 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80464774 7F DE 07 74 */ extsb r30, r30 -/* 80464778 7F E3 FB 78 */ mr r3, r31 -/* 8046477C 4B BD 5A 3D */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 80464780 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80464784 7C 00 F0 00 */ cmpw r0, r30 -/* 80464788 40 82 00 10 */ bne lbl_80464798 -/* 8046478C A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 80464790 B0 1F 06 70 */ sth r0, 0x670(r31) -/* 80464794 48 00 00 10 */ b lbl_804647A4 -lbl_80464798: -/* 80464798 A8 7F 04 DE */ lha r3, 0x4de(r31) -/* 8046479C 38 03 7F FF */ addi r0, r3, 0x7fff -/* 804647A0 B0 1F 06 70 */ sth r0, 0x670(r31) -lbl_804647A4: -/* 804647A4 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 804647A8 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 804647AC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 804647B0 7C 08 03 A6 */ mtlr r0 -/* 804647B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 804647B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setEventPrm__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setEventPrm__10daDoor20_cFv.s deleted file mode 100644 index b60f2b5d4c..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setEventPrm__10daDoor20_cFv.s +++ /dev/null @@ -1,299 +0,0 @@ -lbl_8046129C: -/* 8046129C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 804612A0 7C 08 02 A6 */ mflr r0 -/* 804612A4 90 01 00 54 */ stw r0, 0x54(r1) -/* 804612A8 39 61 00 50 */ addi r11, r1, 0x50 -/* 804612AC 4B F0 0F 2D */ bl _savegpr_28 -/* 804612B0 7C 7D 1B 78 */ mr r29, r3 -/* 804612B4 3C 80 80 46 */ lis r4, lit_4018@ha /* 0x80466820@ha */ -/* 804612B8 3B E4 68 20 */ addi r31, r4, lit_4018@l /* 0x80466820@l */ -/* 804612BC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804612C0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804612C4 83 C4 5D AC */ lwz r30, 0x5dac(r4) -/* 804612C8 48 00 4B C5 */ bl setStop__10daDoor20_cFv -/* 804612CC 7F A3 EB 78 */ mr r3, r29 -/* 804612D0 4B BD 8E E9 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 804612D4 54 7C 06 3E */ clrlwi r28, r3, 0x18 -/* 804612D8 7F A3 EB 78 */ mr r3, r29 -/* 804612DC 4B BD 8E E9 */ bl getBRoomNo__13door_param2_cFP10fopAc_ac_c -/* 804612E0 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 804612E4 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 804612E8 38 83 60 94 */ addi r4, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 804612EC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 804612F0 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 804612F4 7C 00 07 74 */ extsb r0, r0 -/* 804612F8 7C 1C 00 00 */ cmpw r28, r0 -/* 804612FC 7F 80 E3 78 */ mr r0, r28 -/* 80461300 40 82 00 08 */ bne lbl_80461308 -/* 80461304 7C A0 2B 78 */ mr r0, r5 -lbl_80461308: -/* 80461308 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 8046130C 7C 64 02 14 */ add r3, r4, r0 -/* 80461310 88 03 03 F4 */ lbz r0, 0x3f4(r3) -/* 80461314 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80461318 41 82 03 BC */ beq lbl_804616D4 -/* 8046131C 7F A3 EB 78 */ mr r3, r29 -/* 80461320 4B BD 8E 69 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80461324 2C 03 00 09 */ cmpwi r3, 9 -/* 80461328 40 82 01 1C */ bne lbl_80461444 -/* 8046132C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461330 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461334 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80461338 80 03 05 74 */ lwz r0, 0x574(r3) -/* 8046133C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80461340 40 82 03 94 */ bne lbl_804616D4 -/* 80461344 7F A3 EB 78 */ mr r3, r29 -/* 80461348 38 81 00 08 */ addi r4, r1, 8 -/* 8046134C 48 00 03 A1 */ bl checkOpenMsgDoor__10daDoor20_cFPi -/* 80461350 2C 03 00 00 */ cmpwi r3, 0 -/* 80461354 40 82 00 10 */ bne lbl_80461364 -/* 80461358 38 00 00 12 */ li r0, 0x12 -/* 8046135C 98 1D 06 CB */ stb r0, 0x6cb(r29) -/* 80461360 48 00 01 98 */ b lbl_804614F8 -lbl_80461364: -/* 80461364 38 61 00 18 */ addi r3, r1, 0x18 -/* 80461368 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 8046136C 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80461370 4B E0 57 C5 */ bl __mi__4cXyzCFRC3Vec -/* 80461374 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80461378 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 8046137C C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80461380 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80461384 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80461388 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 8046138C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80461390 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80461394 A8 1D 04 B6 */ lha r0, 0x4b6(r29) -/* 80461398 7C 00 00 D0 */ neg r0, r0 -/* 8046139C 7C 04 07 34 */ extsh r4, r0 -/* 804613A0 4B BA B0 3D */ bl mDoMtx_YrotS__FPA4_fs -/* 804613A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804613A8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804613AC 38 81 00 30 */ addi r4, r1, 0x30 -/* 804613B0 7C 85 23 78 */ mr r5, r4 -/* 804613B4 4B EE 59 B9 */ bl PSMTXMultVec -/* 804613B8 88 1D 06 8C */ lbz r0, 0x68c(r29) -/* 804613BC 28 00 00 00 */ cmplwi r0, 0 -/* 804613C0 40 82 00 44 */ bne lbl_80461404 -/* 804613C4 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 804613C8 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 804613CC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804613D0 40 81 00 10 */ ble lbl_804613E0 -/* 804613D4 38 00 00 0D */ li r0, 0xd -/* 804613D8 98 1D 06 CB */ stb r0, 0x6cb(r29) -/* 804613DC 48 00 00 0C */ b lbl_804613E8 -lbl_804613E0: -/* 804613E0 38 00 00 0C */ li r0, 0xc -/* 804613E4 98 1D 06 CB */ stb r0, 0x6cb(r29) -lbl_804613E8: -/* 804613E8 88 1D 06 DA */ lbz r0, 0x6da(r29) -/* 804613EC 28 00 00 FF */ cmplwi r0, 0xff -/* 804613F0 40 82 01 08 */ bne lbl_804614F8 -/* 804613F4 7F A3 EB 78 */ mr r3, r29 -/* 804613F8 48 00 48 0D */ bl chkStopB__10daDoor20_cFv -/* 804613FC 98 7D 06 DA */ stb r3, 0x6da(r29) -/* 80461400 48 00 00 F8 */ b lbl_804614F8 -lbl_80461404: -/* 80461404 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80461408 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 8046140C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80461410 40 81 00 10 */ ble lbl_80461420 -/* 80461414 38 00 00 0C */ li r0, 0xc -/* 80461418 98 1D 06 CB */ stb r0, 0x6cb(r29) -/* 8046141C 48 00 00 0C */ b lbl_80461428 -lbl_80461420: -/* 80461420 38 00 00 0D */ li r0, 0xd -/* 80461424 98 1D 06 CB */ stb r0, 0x6cb(r29) -lbl_80461428: -/* 80461428 88 1D 06 DA */ lbz r0, 0x6da(r29) -/* 8046142C 28 00 00 FF */ cmplwi r0, 0xff -/* 80461430 40 82 00 C8 */ bne lbl_804614F8 -/* 80461434 7F A3 EB 78 */ mr r3, r29 -/* 80461438 48 00 46 FD */ bl chkStopF__10daDoor20_cFv -/* 8046143C 98 7D 06 DA */ stb r3, 0x6da(r29) -/* 80461440 48 00 00 B8 */ b lbl_804614F8 -lbl_80461444: -/* 80461444 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461448 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046144C 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80461450 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80461454 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80461458 41 82 00 50 */ beq lbl_804614A8 -/* 8046145C 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 80461460 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 80461464 41 82 02 70 */ beq lbl_804616D4 -/* 80461468 3B 80 00 01 */ li r28, 1 -/* 8046146C 4B D4 B1 11 */ bl dKy_darkworld_check__Fv -/* 80461470 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80461474 28 00 00 01 */ cmplwi r0, 1 -/* 80461478 41 82 00 24 */ beq lbl_8046149C -/* 8046147C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461480 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461484 38 63 00 28 */ addi r3, r3, 0x28 -/* 80461488 38 80 00 03 */ li r4, 3 -/* 8046148C 4B BD 17 61 */ bl isTransformLV__21dSv_player_status_b_cCFi -/* 80461490 2C 03 00 00 */ cmpwi r3, 0 -/* 80461494 40 82 00 08 */ bne lbl_8046149C -/* 80461498 3B 80 00 00 */ li r28, 0 -lbl_8046149C: -/* 8046149C 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 804614A0 40 82 00 08 */ bne lbl_804614A8 -/* 804614A4 48 00 02 30 */ b lbl_804616D4 -lbl_804614A8: -/* 804614A8 88 1D 06 8C */ lbz r0, 0x68c(r29) -/* 804614AC 28 00 00 00 */ cmplwi r0, 0 -/* 804614B0 40 82 00 28 */ bne lbl_804614D8 -/* 804614B4 38 00 00 04 */ li r0, 4 -/* 804614B8 98 1D 06 CB */ stb r0, 0x6cb(r29) -/* 804614BC 88 1D 06 DA */ lbz r0, 0x6da(r29) -/* 804614C0 28 00 00 FF */ cmplwi r0, 0xff -/* 804614C4 40 82 00 34 */ bne lbl_804614F8 -/* 804614C8 7F A3 EB 78 */ mr r3, r29 -/* 804614CC 48 00 47 39 */ bl chkStopB__10daDoor20_cFv -/* 804614D0 98 7D 06 DA */ stb r3, 0x6da(r29) -/* 804614D4 48 00 00 24 */ b lbl_804614F8 -lbl_804614D8: -/* 804614D8 38 00 00 05 */ li r0, 5 -/* 804614DC 98 1D 06 CB */ stb r0, 0x6cb(r29) -/* 804614E0 88 1D 06 DA */ lbz r0, 0x6da(r29) -/* 804614E4 28 00 00 FF */ cmplwi r0, 0xff -/* 804614E8 40 82 00 10 */ bne lbl_804614F8 -/* 804614EC 7F A3 EB 78 */ mr r3, r29 -/* 804614F0 48 00 46 45 */ bl chkStopF__10daDoor20_cFv -/* 804614F4 98 7D 06 DA */ stb r3, 0x6da(r29) -lbl_804614F8: -/* 804614F8 88 1D 06 D8 */ lbz r0, 0x6d8(r29) -/* 804614FC 28 00 00 00 */ cmplwi r0, 0 -/* 80461500 40 82 01 D4 */ bne lbl_804616D4 -/* 80461504 88 1D 06 DA */ lbz r0, 0x6da(r29) -/* 80461508 28 00 00 01 */ cmplwi r0, 1 -/* 8046150C 40 82 00 10 */ bne lbl_8046151C -/* 80461510 88 7D 06 CB */ lbz r3, 0x6cb(r29) -/* 80461514 38 03 00 02 */ addi r0, r3, 2 -/* 80461518 98 1D 06 CB */ stb r0, 0x6cb(r29) -lbl_8046151C: -/* 8046151C 7F A3 EB 78 */ mr r3, r29 -/* 80461520 48 00 4B 7D */ bl chkMakeKey__10daDoor20_cFv -/* 80461524 2C 03 00 00 */ cmpwi r3, 0 -/* 80461528 41 82 01 14 */ beq lbl_8046163C -/* 8046152C 88 1D 05 F0 */ lbz r0, 0x5f0(r29) -/* 80461530 28 00 00 00 */ cmplwi r0, 0 -/* 80461534 41 82 01 50 */ beq lbl_80461684 -/* 80461538 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046153C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461540 80 64 5D B4 */ lwz r3, 0x5db4(r4) -/* 80461544 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80461548 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8046154C 41 82 00 14 */ beq lbl_80461560 -/* 80461550 88 04 09 74 */ lbz r0, 0x974(r4) -/* 80461554 28 00 00 00 */ cmplwi r0, 0 -/* 80461558 40 82 01 2C */ bne lbl_80461684 -/* 8046155C 48 00 01 78 */ b lbl_804616D4 -lbl_80461560: -/* 80461560 88 04 09 74 */ lbz r0, 0x974(r4) -/* 80461564 28 00 00 00 */ cmplwi r0, 0 -/* 80461568 40 82 01 1C */ bne lbl_80461684 -/* 8046156C 7F A3 EB 78 */ mr r3, r29 -/* 80461570 4B BD 8C 19 */ bl getKind__13door_param2_cFP10fopAc_ac_c -/* 80461574 2C 03 00 09 */ cmpwi r3, 9 -/* 80461578 40 82 01 5C */ bne lbl_804616D4 -/* 8046157C 88 1D 06 73 */ lbz r0, 0x673(r29) -/* 80461580 28 00 00 00 */ cmplwi r0, 0 -/* 80461584 41 82 01 50 */ beq lbl_804616D4 -/* 80461588 38 61 00 0C */ addi r3, r1, 0xc -/* 8046158C 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80461590 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80461594 4B E0 55 A1 */ bl __mi__4cXyzCFRC3Vec -/* 80461598 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8046159C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 804615A0 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 804615A4 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 804615A8 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 804615AC D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 804615B0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804615B4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804615B8 A8 1D 04 B6 */ lha r0, 0x4b6(r29) -/* 804615BC 7C 00 00 D0 */ neg r0, r0 -/* 804615C0 7C 04 07 34 */ extsh r4, r0 -/* 804615C4 4B BA AE 19 */ bl mDoMtx_YrotS__FPA4_fs -/* 804615C8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804615CC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804615D0 38 81 00 24 */ addi r4, r1, 0x24 -/* 804615D4 7C 85 23 78 */ mr r5, r4 -/* 804615D8 4B EE 57 95 */ bl PSMTXMultVec -/* 804615DC 88 1D 06 8C */ lbz r0, 0x68c(r29) -/* 804615E0 28 00 00 00 */ cmplwi r0, 0 -/* 804615E4 40 82 00 2C */ bne lbl_80461610 -/* 804615E8 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 804615EC C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 804615F0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804615F4 40 81 00 10 */ ble lbl_80461604 -/* 804615F8 38 00 00 11 */ li r0, 0x11 -/* 804615FC 98 1D 06 CB */ stb r0, 0x6cb(r29) -/* 80461600 48 00 00 84 */ b lbl_80461684 -lbl_80461604: -/* 80461604 38 00 00 10 */ li r0, 0x10 -/* 80461608 98 1D 06 CB */ stb r0, 0x6cb(r29) -/* 8046160C 48 00 00 78 */ b lbl_80461684 -lbl_80461610: -/* 80461610 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80461614 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80461618 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046161C 40 81 00 10 */ ble lbl_8046162C -/* 80461620 38 00 00 10 */ li r0, 0x10 -/* 80461624 98 1D 06 CB */ stb r0, 0x6cb(r29) -/* 80461628 48 00 00 5C */ b lbl_80461684 -lbl_8046162C: -/* 8046162C 38 00 00 11 */ li r0, 0x11 -/* 80461630 98 1D 06 CB */ stb r0, 0x6cb(r29) -/* 80461634 48 00 00 50 */ b lbl_80461684 -/* 80461638 48 00 00 9C */ b lbl_804616D4 -lbl_8046163C: -/* 8046163C 88 1D 06 8C */ lbz r0, 0x68c(r29) -/* 80461640 28 00 00 00 */ cmplwi r0, 0 -/* 80461644 40 82 00 14 */ bne lbl_80461658 -/* 80461648 7F A3 EB 78 */ mr r3, r29 -/* 8046164C 4B BD 8B 85 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80461650 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 80461654 48 00 00 10 */ b lbl_80461664 -lbl_80461658: -/* 80461658 7F A3 EB 78 */ mr r3, r29 -/* 8046165C 4B BD 8B 81 */ bl getSwbit2__13door_param2_cFP10fopAc_ac_c -/* 80461660 54 64 06 3E */ clrlwi r4, r3, 0x18 -lbl_80461664: -/* 80461664 2C 04 00 FF */ cmpwi r4, 0xff -/* 80461668 41 82 00 1C */ beq lbl_80461684 -/* 8046166C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80461670 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80461674 38 A0 FF FF */ li r5, -1 -/* 80461678 4B BD 3C E9 */ bl isSwitch__10dSv_info_cCFii -/* 8046167C 2C 03 00 00 */ cmpwi r3, 0 -/* 80461680 41 82 00 54 */ beq lbl_804616D4 -lbl_80461684: -/* 80461684 7F A3 EB 78 */ mr r3, r29 -/* 80461688 4B FF F6 F9 */ bl getSize2X__10daDoor20_cFv -/* 8046168C 7F A3 EB 78 */ mr r3, r29 -/* 80461690 C0 5F 00 00 */ lfs f2, 0(r31) -/* 80461694 C0 7F 00 10 */ lfs f3, 0x10(r31) -/* 80461698 48 00 3D F9 */ bl checkArea__10daDoor20_cFfff -/* 8046169C 2C 03 00 00 */ cmpwi r3, 0 -/* 804616A0 41 82 00 34 */ beq lbl_804616D4 -/* 804616A4 88 1D 06 CB */ lbz r0, 0x6cb(r29) -/* 804616A8 54 00 08 3C */ slwi r0, r0, 1 -/* 804616AC 7C 7D 02 14 */ add r3, r29, r0 -/* 804616B0 A8 03 06 92 */ lha r0, 0x692(r3) -/* 804616B4 B0 1D 00 FC */ sth r0, 0xfc(r29) -/* 804616B8 88 1D 06 CB */ lbz r0, 0x6cb(r29) -/* 804616BC 7C 7D 02 14 */ add r3, r29, r0 -/* 804616C0 88 03 06 B8 */ lbz r0, 0x6b8(r3) -/* 804616C4 98 1D 00 FE */ stb r0, 0xfe(r29) -/* 804616C8 A0 1D 00 FA */ lhz r0, 0xfa(r29) -/* 804616CC 60 00 00 04 */ ori r0, r0, 4 -/* 804616D0 B0 1D 00 FA */ sth r0, 0xfa(r29) -lbl_804616D4: -/* 804616D4 39 61 00 50 */ addi r11, r1, 0x50 -/* 804616D8 4B F0 0B 4D */ bl _restgpr_28 -/* 804616DC 80 01 00 54 */ lwz r0, 0x54(r1) -/* 804616E0 7C 08 03 A6 */ mtlr r0 -/* 804616E4 38 21 00 50 */ addi r1, r1, 0x50 -/* 804616E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setGoal__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setGoal__10daDoor20_cFv.s deleted file mode 100644 index 06e9a35371..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setGoal__10daDoor20_cFv.s +++ /dev/null @@ -1,92 +0,0 @@ -lbl_80465960: -/* 80465960 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80465964 7C 08 02 A6 */ mflr r0 -/* 80465968 90 01 00 44 */ stw r0, 0x44(r1) -/* 8046596C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80465970 4B EF C8 6D */ bl _savegpr_29 -/* 80465974 7C 7D 1B 78 */ mr r29, r3 -/* 80465978 3C 60 80 46 */ lis r3, lit_4018@ha /* 0x80466820@ha */ -/* 8046597C 3B E3 68 20 */ addi r31, r3, lit_4018@l /* 0x80466820@l */ -/* 80465980 38 61 00 08 */ addi r3, r1, 8 -/* 80465984 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465988 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046598C 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 80465990 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80465994 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80465998 4B E0 11 9D */ bl __mi__4cXyzCFRC3Vec -/* 8046599C C0 01 00 08 */ lfs f0, 8(r1) -/* 804659A0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 804659A4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 804659A8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 804659AC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 804659B0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 804659B4 A8 1D 04 B6 */ lha r0, 0x4b6(r29) -/* 804659B8 7C 1E 03 78 */ mr r30, r0 -/* 804659BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804659C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804659C4 7C 00 00 D0 */ neg r0, r0 -/* 804659C8 7C 04 07 34 */ extsh r4, r0 -/* 804659CC 4B BA 6A 11 */ bl mDoMtx_YrotS__FPA4_fs -/* 804659D0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804659D4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804659D8 38 81 00 20 */ addi r4, r1, 0x20 -/* 804659DC 7C 85 23 78 */ mr r5, r4 -/* 804659E0 4B EE 13 8D */ bl PSMTXMultVec -/* 804659E4 C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 804659E8 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 804659EC EC 01 00 32 */ fmuls f0, f1, f0 -/* 804659F0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 804659F4 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 804659F8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 804659FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465A00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465A04 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80465A08 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80465A0C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80465A10 41 82 00 10 */ beq lbl_80465A20 -/* 80465A14 C0 1F 00 70 */ lfs f0, 0x70(r31) -/* 80465A18 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80465A1C 48 00 00 0C */ b lbl_80465A28 -lbl_80465A20: -/* 80465A20 C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 80465A24 D0 01 00 28 */ stfs f0, 0x28(r1) -lbl_80465A28: -/* 80465A28 88 1D 06 8C */ lbz r0, 0x68c(r29) -/* 80465A2C 28 00 00 01 */ cmplwi r0, 1 -/* 80465A30 40 82 00 10 */ bne lbl_80465A40 -/* 80465A34 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80465A38 FC 00 00 50 */ fneg f0, f0 -/* 80465A3C D0 01 00 28 */ stfs f0, 0x28(r1) -lbl_80465A40: -/* 80465A40 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80465A44 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80465A48 C0 3D 04 D0 */ lfs f1, 0x4d0(r29) -/* 80465A4C C0 5D 04 D4 */ lfs f2, 0x4d4(r29) -/* 80465A50 C0 7D 04 D8 */ lfs f3, 0x4d8(r29) -/* 80465A54 4B EE 0E 95 */ bl PSMTXTrans -/* 80465A58 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80465A5C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80465A60 7F C4 F3 78 */ mr r4, r30 -/* 80465A64 4B BA 69 D1 */ bl mDoMtx_YrotM__FPA4_fs -/* 80465A68 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80465A6C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80465A70 38 81 00 20 */ addi r4, r1, 0x20 -/* 80465A74 7C 85 23 78 */ mr r5, r4 -/* 80465A78 4B EE 12 F5 */ bl PSMTXMultVec -/* 80465A7C C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80465A80 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80465A84 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80465A88 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80465A8C C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80465A90 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80465A94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80465A98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80465A9C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80465AA0 38 81 00 14 */ addi r4, r1, 0x14 -/* 80465AA4 4B BE 29 21 */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 80465AA8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80465AAC 4B EF C7 7D */ bl _restgpr_29 -/* 80465AB0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80465AB4 7C 08 03 A6 */ mtlr r0 -/* 80465AB8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80465ABC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setKey__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setKey__10daDoor20_cFv.s deleted file mode 100644 index 52399a5436..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setKey__10daDoor20_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80462EB4: -/* 80462EB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80462EB8 7C 08 02 A6 */ mflr r0 -/* 80462EBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80462EC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80462EC4 93 C1 00 08 */ stw r30, 8(r1) -/* 80462EC8 7C 7E 1B 78 */ mr r30, r3 -/* 80462ECC 4B BD 73 05 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80462ED0 54 7F 06 3E */ clrlwi r31, r3, 0x18 -/* 80462ED4 7F C3 F3 78 */ mr r3, r30 -/* 80462ED8 48 00 31 C5 */ bl chkMakeKey__10daDoor20_cFv -/* 80462EDC 2C 03 00 01 */ cmpwi r3, 1 -/* 80462EE0 40 82 00 2C */ bne lbl_80462F0C -/* 80462EE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80462EE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80462EEC 7F E4 FB 78 */ mr r4, r31 -/* 80462EF0 38 A0 FF FF */ li r5, -1 -/* 80462EF4 4B BD 24 6D */ bl isSwitch__10dSv_info_cCFii -/* 80462EF8 2C 03 00 00 */ cmpwi r3, 0 -/* 80462EFC 40 82 00 10 */ bne lbl_80462F0C -/* 80462F00 38 00 00 01 */ li r0, 1 -/* 80462F04 98 1E 05 F0 */ stb r0, 0x5f0(r30) -/* 80462F08 48 00 00 0C */ b lbl_80462F14 -lbl_80462F0C: -/* 80462F0C 38 00 00 00 */ li r0, 0 -/* 80462F10 98 1E 05 F0 */ stb r0, 0x5f0(r30) -lbl_80462F14: -/* 80462F14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80462F18 83 C1 00 08 */ lwz r30, 8(r1) -/* 80462F1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80462F20 7C 08 03 A6 */ mtlr r0 -/* 80462F24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80462F28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setStopDemo__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setStopDemo__10daDoor20_cFv.s deleted file mode 100644 index 25f1abd769..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setStopDemo__10daDoor20_cFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_80465CC0: -/* 80465CC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80465CC4 7C 08 02 A6 */ mflr r0 -/* 80465CC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80465CCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80465CD0 4B EF C5 09 */ bl _savegpr_28 -/* 80465CD4 7C 7C 1B 78 */ mr r28, r3 -/* 80465CD8 4B BD 44 C9 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80465CDC 7C 7D 1B 78 */ mr r29, r3 -/* 80465CE0 7F 83 E3 78 */ mr r3, r28 -/* 80465CE4 4B BD 44 C9 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80465CE8 7C 7E 1B 78 */ mr r30, r3 -/* 80465CEC 7F 83 E3 78 */ mr r3, r28 -/* 80465CF0 4B BD 45 05 */ bl isMsgDoor__13door_param2_cFP10fopAc_ac_c -/* 80465CF4 7C 7F 1B 78 */ mr r31, r3 -/* 80465CF8 88 1C 06 8C */ lbz r0, 0x68c(r28) -/* 80465CFC 28 00 00 00 */ cmplwi r0, 0 -/* 80465D00 40 82 00 4C */ bne lbl_80465D4C -/* 80465D04 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80465D08 28 00 00 03 */ cmplwi r0, 3 -/* 80465D0C 41 82 00 0C */ beq lbl_80465D18 -/* 80465D10 28 00 00 01 */ cmplwi r0, 1 -/* 80465D14 40 82 00 7C */ bne lbl_80465D90 -lbl_80465D18: -/* 80465D18 7F 83 E3 78 */ mr r3, r28 -/* 80465D1C 4B BD 44 E5 */ bl getEventNo__13door_param2_cFP10fopAc_ac_c -/* 80465D20 2C 1F 00 00 */ cmpwi r31, 0 -/* 80465D24 40 82 00 1C */ bne lbl_80465D40 -/* 80465D28 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80465D2C 28 00 00 FF */ cmplwi r0, 0xff -/* 80465D30 41 82 00 10 */ beq lbl_80465D40 -/* 80465D34 38 00 00 02 */ li r0, 2 -/* 80465D38 98 1C 06 CB */ stb r0, 0x6cb(r28) -/* 80465D3C 48 00 00 54 */ b lbl_80465D90 -lbl_80465D40: -/* 80465D40 38 00 00 00 */ li r0, 0 -/* 80465D44 98 1C 06 CB */ stb r0, 0x6cb(r28) -/* 80465D48 48 00 00 48 */ b lbl_80465D90 -lbl_80465D4C: -/* 80465D4C 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80465D50 28 00 00 03 */ cmplwi r0, 3 -/* 80465D54 41 82 00 0C */ beq lbl_80465D60 -/* 80465D58 28 00 00 01 */ cmplwi r0, 1 -/* 80465D5C 40 82 00 34 */ bne lbl_80465D90 -lbl_80465D60: -/* 80465D60 7F 83 E3 78 */ mr r3, r28 -/* 80465D64 4B BD 44 A9 */ bl getEventNo2__13door_param2_cFP10fopAc_ac_c -/* 80465D68 2C 1F 00 00 */ cmpwi r31, 0 -/* 80465D6C 40 82 00 1C */ bne lbl_80465D88 -/* 80465D70 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80465D74 28 00 00 FF */ cmplwi r0, 0xff -/* 80465D78 41 82 00 10 */ beq lbl_80465D88 -/* 80465D7C 38 00 00 03 */ li r0, 3 -/* 80465D80 98 1C 06 CB */ stb r0, 0x6cb(r28) -/* 80465D84 48 00 00 0C */ b lbl_80465D90 -lbl_80465D88: -/* 80465D88 38 00 00 01 */ li r0, 1 -/* 80465D8C 98 1C 06 CB */ stb r0, 0x6cb(r28) -lbl_80465D90: -/* 80465D90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80465D94 4B EF C4 91 */ bl _restgpr_28 -/* 80465D98 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80465D9C 7C 08 03 A6 */ mtlr r0 -/* 80465DA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80465DA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setStop__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setStop__10daDoor20_cFv.s deleted file mode 100644 index 89ccb319e0..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setStop__10daDoor20_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80465E8C: -/* 80465E8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80465E90 7C 08 02 A6 */ mflr r0 -/* 80465E94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80465E98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80465E9C 7C 7F 1B 78 */ mr r31, r3 -/* 80465EA0 4B FF FC 21 */ bl chkMakeStop__10daDoor20_cFv -/* 80465EA4 2C 03 00 00 */ cmpwi r3, 0 -/* 80465EA8 41 82 00 64 */ beq lbl_80465F0C -/* 80465EAC 80 1F 06 D0 */ lwz r0, 0x6d0(r31) -/* 80465EB0 28 00 00 00 */ cmplwi r0, 0 -/* 80465EB4 41 82 00 58 */ beq lbl_80465F0C -/* 80465EB8 88 1F 06 8C */ lbz r0, 0x68c(r31) -/* 80465EBC 98 1F 06 D9 */ stb r0, 0x6d9(r31) -/* 80465EC0 88 1F 06 8C */ lbz r0, 0x68c(r31) -/* 80465EC4 28 00 00 00 */ cmplwi r0, 0 -/* 80465EC8 40 82 00 20 */ bne lbl_80465EE8 -/* 80465ECC 7F E3 FB 78 */ mr r3, r31 -/* 80465ED0 4B FF FC 65 */ bl chkStopF__10daDoor20_cFv -/* 80465ED4 98 7F 06 D8 */ stb r3, 0x6d8(r31) -/* 80465ED8 7F E3 FB 78 */ mr r3, r31 -/* 80465EDC 4B FF FD 29 */ bl chkStopB__10daDoor20_cFv -/* 80465EE0 98 7F 06 DA */ stb r3, 0x6da(r31) -/* 80465EE4 48 00 00 1C */ b lbl_80465F00 -lbl_80465EE8: -/* 80465EE8 7F E3 FB 78 */ mr r3, r31 -/* 80465EEC 4B FF FD 19 */ bl chkStopB__10daDoor20_cFv -/* 80465EF0 98 7F 06 D8 */ stb r3, 0x6d8(r31) -/* 80465EF4 7F E3 FB 78 */ mr r3, r31 -/* 80465EF8 4B FF FC 3D */ bl chkStopF__10daDoor20_cFv -/* 80465EFC 98 7F 06 DA */ stb r3, 0x6da(r31) -lbl_80465F00: -/* 80465F00 3C 60 80 46 */ lis r3, lit_4256@ha /* 0x8046682C@ha */ -/* 80465F04 C0 03 68 2C */ lfs f0, lit_4256@l(r3) /* 0x8046682C@l */ -/* 80465F08 D0 1F 06 D4 */ stfs f0, 0x6d4(r31) -lbl_80465F0C: -/* 80465F0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80465F10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80465F14 7C 08 03 A6 */ mtlr r0 -/* 80465F18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80465F1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/startDemoProc__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/startDemoProc__10daDoor20_cFv.s deleted file mode 100644 index 62e0c14a4b..0000000000 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/startDemoProc__10daDoor20_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80464EC4: -/* 80464EC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80464EC8 7C 08 02 A6 */ mflr r0 -/* 80464ECC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80464ED0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80464ED4 93 C1 00 08 */ stw r30, 8(r1) -/* 80464ED8 7C 7E 1B 78 */ mr r30, r3 -/* 80464EDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80464EE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80464EE4 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 80464EE8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80464EEC 3C 80 80 46 */ lis r4, d_a_door_shutter__stringBase0@ha /* 0x804668D8@ha */ -/* 80464EF0 38 84 68 D8 */ addi r4, r4, d_a_door_shutter__stringBase0@l /* 0x804668D8@l */ -/* 80464EF4 38 84 01 59 */ addi r4, r4, 0x159 -/* 80464EF8 38 A0 00 00 */ li r5, 0 -/* 80464EFC 38 C0 00 00 */ li r6, 0 -/* 80464F00 4B BE 2C 1D */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80464F04 90 7E 06 CC */ stw r3, 0x6cc(r30) -/* 80464F08 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80464F0C B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 80464F10 A8 7E 04 B6 */ lha r3, 0x4b6(r30) -/* 80464F14 A8 1F 04 B6 */ lha r0, 0x4b6(r31) -/* 80464F18 7C 03 00 50 */ subf r0, r3, r0 -/* 80464F1C 7C 00 07 35 */ extsh. r0, r0 -/* 80464F20 40 80 00 0C */ bge lbl_80464F2C -/* 80464F24 7C 00 00 D0 */ neg r0, r0 -/* 80464F28 7C 00 07 34 */ extsh r0, r0 -lbl_80464F2C: -/* 80464F2C 7C 00 07 34 */ extsh r0, r0 -/* 80464F30 2C 00 10 00 */ cmpwi r0, 0x1000 -/* 80464F34 40 80 00 18 */ bge lbl_80464F4C -/* 80464F38 2C 00 FC 18 */ cmpwi r0, -1000 -/* 80464F3C 40 81 00 10 */ ble lbl_80464F4C -/* 80464F40 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 80464F44 38 03 7F FF */ addi r0, r3, 0x7fff -/* 80464F48 B0 1E 04 E6 */ sth r0, 0x4e6(r30) -lbl_80464F4C: -/* 80464F4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80464F50 83 C1 00 08 */ lwz r30, 8(r1) -/* 80464F54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80464F58 7C 08 03 A6 */ mtlr r0 -/* 80464F5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80464F60 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 087dc27417..11121ec5b8 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -3296,6 +3296,10 @@ inline u8 dComIfGp_event_getMode() { return g_dComIfG_gameInfo.play.getEvent().getMode(); } +inline fopAc_ac_c* dComIfGp_event_getDoorPartner() { + return g_dComIfG_gameInfo.play.getEvent().getPtD(); +} + inline int dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2) { return dComIfGp_getPEvtManager()->getMyStaffId(pName, pActor, param_2); } diff --git a/include/d/d_door_param2.h b/include/d/d_door_param2.h index 56107e3223..fd4dff5521 100644 --- a/include/d/d_door_param2.h +++ b/include/d/d_door_param2.h @@ -7,18 +7,18 @@ class fopAc_ac_c; class door_param2_c { public: - /* 8003A188 */ static u32 getKind(fopAc_ac_c* i_actor); + /* 8003A188 */ static int getKind(fopAc_ac_c* i_actor); /* 8003A194 */ static u32 getDoorModel(fopAc_ac_c* i_actor); /* 8003A1A0 */ static u8 getFrontOption(fopAc_ac_c* i_actor); /* 8003A1AC */ static u8 getBackOption(fopAc_ac_c* i_actor); - /* 8003A1B8 */ static u32 getFRoomNo(fopAc_ac_c* i_actor); - /* 8003A1C4 */ static u32 getBRoomNo(fopAc_ac_c* i_actor); + /* 8003A1B8 */ static u8 getFRoomNo(fopAc_ac_c* i_actor); + /* 8003A1C4 */ static u8 getBRoomNo(fopAc_ac_c* i_actor); /* 8003A1D0 */ static u8 getSwbit(fopAc_ac_c* i_actor); /* 8003A1DC */ static u8 getSwbit2(fopAc_ac_c* i_actor); /* 8003A1E8 */ static u8 getSwbit3(fopAc_ac_c* i_actor); - /* 8003A1F4 */ static u32 isMsgDoor(fopAc_ac_c* i_actor); + /* 8003A1F4 */ static int isMsgDoor(fopAc_ac_c* i_actor); /* 8003A200 */ static u8 getEventNo(fopAc_ac_c* i_actor); - /* 8003A20C */ static u32 getEventNo2(fopAc_ac_c* i_actor); + /* 8003A20C */ static u8 getEventNo2(fopAc_ac_c* i_actor); /* 8003A218 */ static u16 getMsgNo(fopAc_ac_c* i_actor); /* 8003A224 */ static u8 getExitNo(fopAc_ac_c* i_actor); /* 8003A230 */ static u32 getFLightInf(fopAc_ac_c* i_actor); diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index 03319741a5..a9f3dbd9ee 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -159,6 +159,7 @@ public: fopAc_ac_c* getPt1() { return convPId(mPt1); } fopAc_ac_c* getPt2() { return convPId(mPt2); } fopAc_ac_c* getPtT() { return convPId(mPtT); } + fopAc_ac_c* getPtD() { return convPId(mPtd); } bool isChangeOK(void* param_0) { return mChangeOK == param_0; } u8 getPreItemNo() { return mPreItemNo; } u8 getGtItm() { return mGtItm; } diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 9f0682353a..d78e965e56 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -192,7 +192,7 @@ public: /* 0x361 */ u8 field_0x361; /* 0x362 */ u8 field_0x362; /* 0x363 */ u8 field_0x363; - /* 0x364 */ u8 field_0x364; + /* 0x364 */ u8 mLightInf; /* 0x365 */ u8 field_0x365; /* 0x366 */ u8 field_0x366; /* 0x367 */ u8 field_0x367; diff --git a/include/rel/d/a/d_a_midna/d_a_midna.h b/include/rel/d/a/d_a_midna/d_a_midna.h index 4a58fa9a1d..474d4ed1c2 100644 --- a/include/rel/d/a/d_a_midna/d_a_midna.h +++ b/include/rel/d/a/d_a_midna/d_a_midna.h @@ -167,6 +167,10 @@ public: inline static BOOL checkMidnaRealBody(); + inline static BOOL i_checkMidnaRealBody() { + return dKy_darkworld_check() == 1 || dComIfGs_isTransformLV(3); + } + static bool i_checkMidnaTired() { return dComIfGs_isTransformLV(3) && !dComIfGs_isEventBit(0x1E08); } diff --git a/include/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.h b/include/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.h index 4e55819c18..dd6cbf3359 100644 --- a/include/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.h +++ b/include/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.h @@ -2,5 +2,160 @@ #define D_A_DOOR_SHUTTER_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/bg/d_bg_w.h" +#include "d/msg/d_msg_flow.h" +#include "d/bg/d_bg_s_acch.h" + +struct daDoor20_c; + +struct dDoor_stop_c { + /* 804660F4 */ void calcMtx(daDoor20_c*); + /* 804661B0 */ void closeInit(daDoor20_c*); + /* 804662C0 */ int closeProc(daDoor20_c*); + /* 8046634C */ void openInit(daDoor20_c*); + /* 80466458 */ int openProc(daDoor20_c*); + /* 804664E8 */ int create(daDoor20_c*); + /* 80466538 */ void draw(daDoor20_c*); + + J3DModel* field_0x0; + f32 field_0x4; + u8 field_0x8; + u8 field_0x9; + u8 field_0xa; + u8 field_0xb; +}; + +struct daDoor20_c : public fopAc_ac_c { + enum ActionType { + ACTION_INIT, + ACTION_WAIT, + ACTION_STOP_CLOSE, + ACTION_DEMO, + }; + + /* 80460B38 */ char* getStopBmdName(); + /* 80460B70 */ J3DModelData* getStopModelData(); + /* 80460B94 */ char* getAlwaysArcName(); + /* 80460BA4 */ char* getArcName(); + /* 80460C40 */ char* getBmdName(); + /* 80460CF0 */ char* getBtk(); + /* 80460D5C */ J3DModelData* getModelData(); + /* 80460D80 */ f32 getSize2X(); + /* 80460DAC */ int CreateHeap(); + /* 8046129C */ void setEventPrm(); + /* 804616EC */ int checkOpenMsgDoor(int*); + /* 8046178C */ int adjustmentAngle(); + /* 80461874 */ int adjustmentProc(); + /* 80461A44 */ void setAngle(); + /* 80461A60 */ void openInit_0(); + /* 80461D24 */ void openInit_1(); + /* 80461EC4 */ int openInit(int); + /* 80461F60 */ int openProc(int); + /* 804622A8 */ void openEnd_0(); + /* 804622AC */ void openEnd_1(); + /* 80462328 */ int openEnd(int); + /* 80462398 */ void closeInit_0(); + /* 8046266C */ void closeInit_1(); + /* 80462738 */ int closeInit(int); + /* 804627C4 */ int closeProc(int); + /* 804627E8 */ void closeEnd_0(); + /* 804627EC */ void closeEnd_1(); + /* 80462868 */ int closeEnd(int); + /* 80462928 */ void openInit2(); + /* 80462A1C */ void closeEnd2(); + /* 80462A5C */ void calcMtx_2(); + /* 80462B58 */ void calcMtx(); + /* 80462C2C */ int CreateInit(); + /* 80462EB4 */ void setKey(); + /* 80462F2C */ int create(); + /* 80462FE0 */ int demoProc(); + /* 80463E30 */ int orderStopEvent(); + /* 80463FBC */ int actionWait(); + /* 80464118 */ int actionStopClose(); + /* 8046416C */ int actionDemo(); + /* 804641EC */ int actionInit(); + /* 80464240 */ int execute(); + /* 804643B0 */ int draw(); + /* 80464638 */ void setDoorAngleSpec(); + /* 804647BC */ int _delete(); + /* 80464858 */ int createKey(); + /* 80464AE4 */ int deleteKey(); + /* 80464B3C */ int adjoinPlayer(); + /* 80464BD8 */ int frontCheckOld(); + /* 80464C68 */ int frontCheck(); + /* 80464CEC */ int drawCheck(int); + /* 80464E18 */ int checkExecute(); + /* 80464EC4 */ void startDemoProc(); + /* 80464F64 */ void makeEventId(); + /* 804653B0 */ void initProc(); + /* 80465400 */ void initOpenDemo(int); + /* 80465490 */ int checkArea(f32, f32, f32); + /* 80465620 */ void openInitCom(int); + /* 804656F0 */ void closeEndCom(); + /* 8046581C */ void getRestartPos(cXyz*); + /* 80465960 */ void setGoal(); + /* 80465AC0 */ int chkMakeStop(); + /* 80465B34 */ int chkStopF(); + /* 80465C04 */ int chkStopB(); + /* 80465CC0 */ void setStopDemo(); + /* 80465DA8 */ int chkStopClose(); + /* 80465E8C */ void setStop(); + /* 80465F20 */ int chkStopOpen(); + /* 8046609C */ int chkMakeKey(); + + /* 80460D00 */ virtual char* getDzbName(); + /* 80465918 */ virtual int getDemoAction(); + + void onFlag(u16 flag) { field_0x68e |= flag; } + void offFlag(u16 flag) { field_0x68e &= ~flag; } + bool checkFlag(u16 flag) { return field_0x68e & flag; } + void setAction(u8 action) { mAction = action; } + + /* 0x56C */ request_of_phase_process_class mPhase1; + /* 0x574 */ request_of_phase_process_class mPhase2; + /* 0x57C */ J3DModel* mModel1; + /* 0x580 */ J3DModel* mModel2; + /* 0x584 */ mDoExt_bckAnm field_0x584; + /* 0x5A0 */ mDoExt_bckAnm field_0x5a0; + /* 0x5BC */ J3DModel* field_0x5bc; + /* 0x5C0 */ mDoExt_btkAnm* field_0x5c0; + /* 0x5C4 */ dBgW* field_0x5c4; + /* 0x5C8 */ s8 field_0x5c8; + /* 0x5C9 */ bool field_0x5c9; + /* 0x5CA */ u8 field_0x5ca[0x5dd - 0x5ca]; + /* 0x5DD */ u8 field_0x5dd; + /* 0x5E0 */ cXyz field_0x5e0; + /* 0x5EC */ u32 field_0x5ec; + /* 0x5F0 */ bool field_0x5f0; + /* 0x5F1 */ u8 field_0x5f1; + /* 0x5F4 */ Mtx field_0x5f4; + /* 0x624 */ dMsgFlow_c field_0x624; + /* 0x670 */ s16 field_0x670; + /* 0x672 */ bool field_0x672; + /* 0x673 */ u8 field_0x673; + /* 0x674 */ u8 field_0x674; + /* 0x678 */ int field_0x678; + /* 0x67C */ u8 field_0x67c; + /* 0x67D */ s8 field_0x67d; + /* 0x67E */ u8 field_0x67e; + /* 0x67F */ u8 field_0x67f; + /* 0x680 */ cXyz field_0x680; + /* 0x68C */ u8 field_0x68c; + /* 0x68D */ u8 field_0x68d; + /* 0x68E */ u16 field_0x68e; + /* 0x690 */ u8 mAction; + /* 0x691 */ u8 field_0x691; + /* 0x692 */ s16 field_0x692[19]; + /* 0x6B8 */ u8 field_0x6b8[19]; + /* 0x6CB */ u8 field_0x6cb; + /* 0x6CC */ u32 field_0x6cc; + /* 0x6D0 */ dDoor_stop_c mDoorStop; + /* 0x6DC */ s16 field_0x6dc; + /* 0x6DE */ dBgS_ObjAcch field_0x6de; + /* 0x8B8 */ dBgS_AcchCir field_0x8b8; + /* 0x8F8 */ u32 field_0x8f8; +}; #endif /* D_A_DOOR_SHUTTER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h b/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h index c7d63e788c..4c5c2f6621 100644 --- a/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h +++ b/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h @@ -2,5 +2,35 @@ #define D_A_OBJ_LV5KEY_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +struct daObjLv5Key_c : public fopAc_ac_c { + /* 80B9B9B8 */ void CreateHeap(); + /* 80B9BA94 */ void Init(); + /* 80B9BB5C */ void setBgc(); + /* 80B9BBCC */ void initCcSph(); + /* 80B9BC2C */ void setCcSph(); + /* 80B9BD30 */ void setAction(void (daObjLv5Key_c::*)(int), int); + /* 80B9BDD8 */ void Action(); + /* 80B9BE24 */ void Wait(int); + /* 80B9BF08 */ void Open(int); + /* 80B9BFDC */ void Fall(int); + /* 80B9C17C */ void Land(int); + /* 80B9C268 */ void Shake(int); + /* 80B9C3B0 */ void TranslateByNowDirect(f32, f32, f32); + /* 80B9C410 */ void Execute(); + /* 80B9C450 */ void Draw(); + /* 80B9C500 */ void Delete(); + /* 80B9C534 */ void setBaseMtx(); + /* 80B9C5EC */ void create_1st(); + + void setStatus(u8 status) { mStatus = status; } + void keylock_open_start() { setStatus(2); } + void keylock_shake_start() { setStatus(1); } + bool is_open() { return mStatus == 3; } + + /* 0x568 */ u8 field_0x568[0x945 - 0x568]; + /* 0x945 */ s8 mStatus; +}; #endif /* D_A_OBJ_LV5KEY_H */ diff --git a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp index 88eec69e8c..b238463ca7 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp +++ b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp @@ -162,7 +162,7 @@ void daDbDoor00_c::calcMtx() { /* 8045D8F4-8045D9A8 0005F4 00B4+00 1/1 0/0 0/0 .text CreateInit__12daDbDoor00_cFv */ int daDbDoor00_c::CreateInit() { - s32 fRoomNo = door_param2_c::getFRoomNo(this); + u8 fRoomNo = door_param2_c::getFRoomNo(this); if (fopAcM_GetRoomNo(this) == -1) { fopAcM_SetRoomNo(this, fRoomNo); tevStr.mRoomNo = current.roomNo; diff --git a/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp b/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp index 4f6cd7bcf3..6b484d15cd 100644 --- a/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp +++ b/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp @@ -165,7 +165,7 @@ int daKnob20_c::CreateInit() { field_0x5a0->Move(); eventInfo.setArchiveName(getEvArcName()); setEventId(); - tevStr.field_0x364 = knob_param_c::getDoorLightInf(this); + tevStr.mLightInf = knob_param_c::getDoorLightInf(this); return 1; } diff --git a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp index a7f41015b8..f3aeedfa8f 100644 --- a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp +++ b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp @@ -1277,7 +1277,7 @@ int daMBdoorL1_c::CreateInit() { } else { lightInf = door_param2_c::getMBLightInf(this); } - tevStr.field_0x364 = lightInf; + tevStr.mLightInf = lightInf; return 1; } #else 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 6152f25094..c60cda1f7a 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 @@ -7,7 +7,6 @@ #include "SSystem/SComponent/c_math.h" #include "d/bg/d_bg_w.h" #include "d/d_procname.h" -#include "dol2asm.h" #include "f_op/f_op_actor_mng.h" /* 80677DB8-80677DE0 000078 0028+00 1/1 0/0 0/0 .text @@ -83,7 +82,7 @@ static u8 cNullVec__6Z2Calc[12] = { /* 80678F5C-80678F70 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, diff --git a/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp b/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp index 50a4767673..eb05a990c3 100644 --- a/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp +++ b/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp @@ -1,652 +1,48 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_door_shutter +// Door Shutter // #include "rel/d/a/door/d_a_door_shutter/d_a_door_shutter.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266EF4 */ void normalize(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct door_param2_c { - /* 8003A188 */ void getKind(fopAc_ac_c*); - /* 8003A194 */ void getDoorModel(fopAc_ac_c*); - /* 8003A1A0 */ void getFrontOption(fopAc_ac_c*); - /* 8003A1AC */ void getBackOption(fopAc_ac_c*); - /* 8003A1B8 */ void getFRoomNo(fopAc_ac_c*); - /* 8003A1C4 */ void getBRoomNo(fopAc_ac_c*); - /* 8003A1D0 */ void getSwbit(fopAc_ac_c*); - /* 8003A1DC */ void getSwbit2(fopAc_ac_c*); - /* 8003A1E8 */ void getSwbit3(fopAc_ac_c*); - /* 8003A1F4 */ void isMsgDoor(fopAc_ac_c*); - /* 8003A200 */ void getEventNo(fopAc_ac_c*); - /* 8003A20C */ void getEventNo2(fopAc_ac_c*); - /* 8003A218 */ void getMsgNo(fopAc_ac_c*); - /* 8003A230 */ void getFLightInf(fopAc_ac_c*); - /* 8003A23C */ void getBLightInf(fopAc_ac_c*); -}; - -struct daDoor20_c { - /* 80460B38 */ void getStopBmdName(); - /* 80460B70 */ void getStopModelData(); - /* 80460B94 */ void getAlwaysArcName(); - /* 80460BA4 */ void getArcName(); - /* 80460C40 */ void getBmdName(); - /* 80460CF0 */ void getBtk(); - /* 80460D00 */ void getDzbName(); - /* 80460D5C */ void getModelData(); - /* 80460D80 */ void getSize2X(); - /* 80460DAC */ void CreateHeap(); - /* 8046129C */ void setEventPrm(); - /* 804616EC */ void checkOpenMsgDoor(int*); - /* 8046178C */ void adjustmentAngle(); - /* 80461874 */ void adjustmentProc(); - /* 80461A44 */ void setAngle(); - /* 80461A60 */ void openInit_0(); - /* 80461D24 */ void openInit_1(); - /* 80461EC4 */ void openInit(int); - /* 80461F60 */ void openProc(int); - /* 804622A8 */ void openEnd_0(); - /* 804622AC */ void openEnd_1(); - /* 80462328 */ void openEnd(int); - /* 80462398 */ void closeInit_0(); - /* 8046266C */ void closeInit_1(); - /* 80462738 */ void closeInit(int); - /* 804627C4 */ void closeProc(int); - /* 804627E8 */ void closeEnd_0(); - /* 804627EC */ void closeEnd_1(); - /* 80462868 */ void closeEnd(int); - /* 80462928 */ void openInit2(); - /* 80462A1C */ void closeEnd2(); - /* 80462A5C */ void calcMtx_2(); - /* 80462B58 */ void calcMtx(); - /* 80462C2C */ void CreateInit(); - /* 80462EB4 */ void setKey(); - /* 80462F2C */ void create(); - /* 80462FE0 */ void demoProc(); - /* 80463E30 */ void orderStopEvent(); - /* 80463FBC */ void actionWait(); - /* 80464118 */ void actionStopClose(); - /* 8046416C */ void actionDemo(); - /* 804641EC */ void actionInit(); - /* 80464240 */ void execute(); - /* 804643B0 */ void draw(); - /* 80464638 */ void setDoorAngleSpec(); - /* 804647BC */ void _delete(); - /* 80464858 */ void createKey(); - /* 80464AE4 */ void deleteKey(); - /* 80464B3C */ void adjoinPlayer(); - /* 80464BD8 */ void frontCheckOld(); - /* 80464C68 */ void frontCheck(); - /* 80464CEC */ void drawCheck(int); - /* 80464E18 */ void checkExecute(); - /* 80464EC4 */ void startDemoProc(); - /* 80464F64 */ void makeEventId(); - /* 804653B0 */ void initProc(); - /* 80465400 */ void initOpenDemo(int); - /* 80465490 */ void checkArea(f32, f32, f32); - /* 80465620 */ void openInitCom(int); - /* 804656F0 */ void closeEndCom(); - /* 8046581C */ void getRestartPos(cXyz*); - /* 80465918 */ void getDemoAction(); - /* 80465960 */ void setGoal(); - /* 80465AC0 */ void chkMakeStop(); - /* 80465B34 */ void chkStopF(); - /* 80465C04 */ void chkStopB(); - /* 80465CC0 */ void setStopDemo(); - /* 80465DA8 */ void chkStopClose(); - /* 80465E8C */ void setStop(); - /* 80465F20 */ void chkStopOpen(); - /* 8046609C */ void chkMakeKey(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_restart_c { - /* 80034F80 */ void setRoom(cXyz const&, s16, s8); -}; - -struct dSv_player_status_b_c { - /* 80032BEC */ void isTransformLV(int) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dStage_roomControl_c { - /* 80024424 */ void setNextStayNo(int); - /* 800244E8 */ void checkRoomDisp(int) const; - - static u8 mStatus[65792]; -}; - -struct dKy_tevstr_c {}; - -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 { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D068 */ void setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*); -}; - -struct dMsgObject_c { - /* 80238098 */ void endFlowGroup(); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A13C */ void checkOpenDoor(fopAc_ac_c*, int*); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); -}; - -struct dMapInfo_c { - static u32 mNextRoomNo; -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 800432EC */ void convPId(unsigned int); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); - /* 800483C4 */ void setGoal(cXyz*); -}; - -struct dDoor_stop_c { - /* 804660F4 */ void calcMtx(daDoor20_c*); - /* 804661B0 */ void closeInit(daDoor20_c*); - /* 804662C0 */ void closeProc(daDoor20_c*); - /* 8046634C */ void openInit(daDoor20_c*); - /* 80466458 */ void openProc(daDoor20_c*); - /* 804664E8 */ void create(daDoor20_c*); - /* 80466538 */ void draw(daDoor20_c*); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 8046677C */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 8046670C */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cSGlobe { - /* 80271880 */ cSGlobe(cXyz const&); -}; - -struct cSAngle { - /* 802710CC */ void Abs() const; - /* 80271228 */ void operator-(s16) const; -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2SceneMgr { - /* 802B68E0 */ void setSceneExist(bool); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80461254 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void getStopBmdName__10daDoor20_cFv(); -extern "C" void getStopModelData__10daDoor20_cFv(); -extern "C" void getAlwaysArcName__10daDoor20_cFv(); -extern "C" void getArcName__10daDoor20_cFv(); -extern "C" void getBmdName__10daDoor20_cFv(); -extern "C" void getBtk__10daDoor20_cFv(); -extern "C" void getDzbName__10daDoor20_cFv(); -extern "C" void getModelData__10daDoor20_cFv(); -extern "C" void getSize2X__10daDoor20_cFv(); -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" void CreateHeap__10daDoor20_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void setEventPrm__10daDoor20_cFv(); -extern "C" void checkOpenMsgDoor__10daDoor20_cFPi(); -extern "C" void adjustmentAngle__10daDoor20_cFv(); -extern "C" void adjustmentProc__10daDoor20_cFv(); -extern "C" void setAngle__10daDoor20_cFv(); -extern "C" void openInit_0__10daDoor20_cFv(); -extern "C" void openInit_1__10daDoor20_cFv(); -extern "C" void openInit__10daDoor20_cFi(); -extern "C" void openProc__10daDoor20_cFi(); -extern "C" void openEnd_0__10daDoor20_cFv(); -extern "C" void openEnd_1__10daDoor20_cFv(); -extern "C" void openEnd__10daDoor20_cFi(); -extern "C" void closeInit_0__10daDoor20_cFv(); -extern "C" void closeInit_1__10daDoor20_cFv(); -extern "C" void closeInit__10daDoor20_cFi(); -extern "C" void closeProc__10daDoor20_cFi(); -extern "C" void closeEnd_0__10daDoor20_cFv(); -extern "C" void closeEnd_1__10daDoor20_cFv(); -extern "C" void closeEnd__10daDoor20_cFi(); -extern "C" void openInit2__10daDoor20_cFv(); -extern "C" void closeEnd2__10daDoor20_cFv(); -extern "C" void calcMtx_2__10daDoor20_cFv(); -extern "C" void calcMtx__10daDoor20_cFv(); -extern "C" void CreateInit__10daDoor20_cFv(); -extern "C" void setKey__10daDoor20_cFv(); -extern "C" void create__10daDoor20_cFv(); -extern "C" void demoProc__10daDoor20_cFv(); -extern "C" void orderStopEvent__10daDoor20_cFv(); -extern "C" void actionWait__10daDoor20_cFv(); -extern "C" void actionStopClose__10daDoor20_cFv(); -extern "C" void actionDemo__10daDoor20_cFv(); -extern "C" void actionInit__10daDoor20_cFv(); -extern "C" void execute__10daDoor20_cFv(); -extern "C" void draw__10daDoor20_cFv(); -extern "C" void setDoorAngleSpec__10daDoor20_cFv(); -extern "C" void _delete__10daDoor20_cFv(); -extern "C" void createKey__10daDoor20_cFv(); -extern "C" void deleteKey__10daDoor20_cFv(); -extern "C" void adjoinPlayer__10daDoor20_cFv(); -extern "C" void frontCheckOld__10daDoor20_cFv(); -extern "C" void frontCheck__10daDoor20_cFv(); -extern "C" void drawCheck__10daDoor20_cFi(); -extern "C" void checkExecute__10daDoor20_cFv(); -extern "C" void startDemoProc__10daDoor20_cFv(); -extern "C" void makeEventId__10daDoor20_cFv(); -extern "C" void initProc__10daDoor20_cFv(); -extern "C" void initOpenDemo__10daDoor20_cFi(); -extern "C" void checkArea__10daDoor20_cFfff(); -extern "C" void openInitCom__10daDoor20_cFi(); -extern "C" void closeEndCom__10daDoor20_cFv(); -extern "C" void getRestartPos__10daDoor20_cFP4cXyz(); -extern "C" void getDemoAction__10daDoor20_cFv(); -extern "C" void setGoal__10daDoor20_cFv(); -extern "C" void chkMakeStop__10daDoor20_cFv(); -extern "C" void chkStopF__10daDoor20_cFv(); -extern "C" void chkStopB__10daDoor20_cFv(); -extern "C" void setStopDemo__10daDoor20_cFv(); -extern "C" void chkStopClose__10daDoor20_cFv(); -extern "C" void setStop__10daDoor20_cFv(); -extern "C" void chkStopOpen__10daDoor20_cFv(); -extern "C" void chkMakeKey__10daDoor20_cFv(); -extern "C" void calcMtx__12dDoor_stop_cFP10daDoor20_c(); -extern "C" void closeInit__12dDoor_stop_cFP10daDoor20_c(); -extern "C" void closeProc__12dDoor_stop_cFP10daDoor20_c(); -extern "C" void openInit__12dDoor_stop_cFP10daDoor20_c(); -extern "C" void openProc__12dDoor_stop_cFP10daDoor20_c(); -extern "C" void create__12dDoor_stop_cFP10daDoor20_c(); -extern "C" void draw__12dDoor_stop_cFP10daDoor20_c(); -extern "C" static void daDoor20_Draw__FP10daDoor20_c(); -extern "C" static void daDoor20_Execute__FP10daDoor20_c(); -extern "C" static void daDoor20_Delete__FP10daDoor20_c(); -extern "C" static void daDoor20_Create__FP10fopAc_ac_c(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void func_804667EC(void* _this, u8*); -extern "C" static void func_80466808(); -extern "C" static void func_80466810(); -extern "C" extern char const* const d_a_door_shutter__stringBase0; - -// -// External References: -// - -extern "C" void OSReport_Error(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void transM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_btkAnmRemove__FP12J3DModelData(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_delete__FUi(); -extern "C" void fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_cullingCheck__FPC10fopAc_ac_c(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void fopAcM_myRoomSearchEnemy__FSc(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void waterCheck__11fopAcM_wt_cFPC4cXyz(); -extern "C" void fpcM_IsCreating__FUi(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void setNextStayNo__20dStage_roomControl_cFi(); -extern "C" void checkRoomDisp__20dStage_roomControl_cCFi(); -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 dComIfG_getStageRes__FPCc(); -extern "C" void isTransformLV__21dSv_player_status_b_cCFi(); -extern "C" void setRoom__13dSv_restart_cFRC4cXyzsSc(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getKind__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getDoorModel__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getFrontOption__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getBackOption__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getFRoomNo__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getBRoomNo__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getSwbit__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getSwbit2__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getSwbit3__13door_param2_cFP10fopAc_ac_c(); -extern "C" void isMsgDoor__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getEventNo__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getEventNo2__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getMsgNo__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getFLightInf__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getBLightInf__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void convPId__14dEvt_control_cFUi(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void setGoal__16dEvent_manager_cFP4cXyz(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void -setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -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 dKy_darkworld_check__Fv(); -extern "C" void endFlowGroup__12dMsgObject_cFv(); -extern "C" void __ct__10dMsgFlow_cFv(); -extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(); -extern "C" void checkOpenDoor__10dMsgFlow_cFP10fopAc_ac_cPi(); -extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void normalize__4cXyzFv(); -extern "C" void __ct__5csXyzFsss(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void Abs__7cSAngleCFv(); -extern "C" void __mi__7cSAngleCFs(); -extern "C" void __ct__7cSGlobeFRC4cXyz(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void setSceneExist__10Z2SceneMgrFb(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" void sprintf(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -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" u32 mNextRoomNo__10dMapInfo_c; -extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804668D8 = "door-stop.bmd"; -#pragma pop +#include "rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h" +#include "rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" +#include "d/d_door_param2.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/msg/d_msg_object.h" +#include "d/map/d_map_path_dmap.h" +#include "SSystem/SComponent/c_math.h" +#include "printf.h" /* 80460B38-80460B70 000078 0038+00 1/1 0/0 0/0 .text getStopBmdName__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getStopBmdName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getStopBmdName__10daDoor20_cFv.s" +char* daDoor20_c::getStopBmdName() { + switch (door_param2_c::getKind(this)) { + case 3: + case 11: + default: + return "door-stop.bmd"; + } } -#pragma pop /* 80460B70-80460B94 0000B0 0024+00 1/1 0/0 0/0 .text getStopModelData__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getStopModelData() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getStopModelData__10daDoor20_cFv.s" +J3DModelData* daDoor20_c::getStopModelData() { + return (J3DModelData*)dComIfG_getStageRes(getStopBmdName()); } -#pragma pop - -/* ############################################################################################## */ -/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804668E6 = "static"; -#pragma pop /* 80460B94-80460BA4 0000D4 0010+00 4/4 0/0 0/0 .text getAlwaysArcName__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getAlwaysArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getAlwaysArcName__10daDoor20_cFv.s" +char* daDoor20_c::getAlwaysArcName() { + return "static"; } -#pragma pop - -/* ############################################################################################## */ -/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804668ED = "DoorT00"; -SECTION_DEAD static char const* const stringBase_804668F5 = "DoorY00"; -SECTION_DEAD static char const* const stringBase_804668FD = "DoorK00"; -SECTION_DEAD static char const* const stringBase_80466905 = "DoorLV8"; -SECTION_DEAD static char const* const stringBase_8046690D = "DoorLV7"; -SECTION_DEAD static char const* const stringBase_80466915 = "DoorLV9"; -#pragma pop /* 80466E7C-80466E88 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, }; /* 80466E88-80466E9C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -656,1739 +52,2241 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80466E9C-80466ED0 -00001 0034+00 1/1 0/0 0/0 .data @3980 */ -SECTION_DATA static void* lit_3980[13] = { - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x30), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x40), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x60), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x30), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x30), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x30), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x30), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x30), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x30), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x50), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x80), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x30), - (void*)(((char*)getArcName__10daDoor20_cFv) + 0x70), -}; - /* 80460BA4-80460C40 0000E4 009C+00 9/8 0/0 0/0 .text getArcName__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getArcName__10daDoor20_cFv.s" +char* daDoor20_c::getArcName() { + switch (door_param2_c::getKind(this)) { + default: + return "DoorT00"; + case 1: + return "DoorY00"; + case 9: + return "DoorK00"; + case 2: + return "DoorLV8"; + case 12: + return "DoorLV7"; + case 10: + return "DoorLV9"; + } } -#pragma pop - -/* ############################################################################################## */ -/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8046691D = "door-shutter_%02d.bmd"; -SECTION_DEAD static char const* const stringBase_80466933 = "door-knob_%02d.bmd"; -#pragma pop /* 80467340-80467360 000000 0020+00 1/1 0/0 0/0 .bss bmdName$3984 */ -static u8 bmdName[32]; +static char bmdName[32]; /* 80460C40-80460CF0 000180 00B0+00 1/1 0/0 0/0 .text getBmdName__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getBmdName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getBmdName__10daDoor20_cFv.s" +char* daDoor20_c::getBmdName() { + switch(door_param2_c::getKind(this)) { + case 0: + case 1: + case 2: + case 10: + case 12: + default: + sprintf(bmdName, "door-shutter_%02d.bmd", door_param2_c::getDoorModel(this)); + break; + case 9: + sprintf(bmdName, "door-knob_%02d.bmd", door_param2_c::getDoorModel(this)); + break; + } + return bmdName; } -#pragma pop - -/* ############################################################################################## */ -/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80466946 = "door-shutter_00.btk"; -#pragma pop /* 80460CF0-80460D00 000230 0010+00 1/1 0/0 0/0 .text getBtk__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getBtk() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getBtk__10daDoor20_cFv.s" +char* daDoor20_c::getBtk() { + return "door-shutter_00.btk"; } -#pragma pop - -/* ############################################################################################## */ -/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8046695A = "door-shutter.dzb"; -SECTION_DEAD static char const* const stringBase_8046696B = "door-shutterlv9.dzb"; -#pragma pop /* 80460D00-80460D5C 000240 005C+00 1/0 0/0 0/0 .text getDzbName__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getDzbName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getDzbName__10daDoor20_cFv.s" +char* daDoor20_c::getDzbName() { + switch(door_param2_c::getKind(this)) { + case 0: + case 1: + case 2: + case 9: + case 12: + default: + return "door-shutter.dzb"; + case 10: + return "door-shutterlv9.dzb"; + } } -#pragma pop /* 80460D5C-80460D80 00029C 0024+00 1/1 0/0 0/0 .text getModelData__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getModelData() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getModelData__10daDoor20_cFv.s" +J3DModelData* daDoor20_c::getModelData() { + return (J3DModelData*)dComIfG_getStageRes(getBmdName()); } -#pragma pop - -/* ############################################################################################## */ -/* 80466820-80466824 000000 0004+00 17/17 0/0 0/0 .rodata @4018 */ -SECTION_RODATA static f32 const lit_4018 = 12100.0f; -COMPILER_STRIP_GATE(0x80466820, &lit_4018); /* 80460D80-80460D8C 0002C0 000C+00 1/1 0/0 0/0 .text getSize2X__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getSize2X() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getSize2X__10daDoor20_cFv.s" +f32 daDoor20_c::getSize2X() { + return 12100.0f; } -#pragma pop /* 80460D8C-80460DAC 0002CC 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void CheckCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop - -/* ############################################################################################## */ -/* 80466824-80466828 000004 0004+00 6/12 0/0 0/0 .rodata @4124 */ -SECTION_RODATA static f32 const lit_4124 = 1.0f; -COMPILER_STRIP_GATE(0x80466824, &lit_4124); - -/* 80466828-8046682C 000008 0004+00 1/1 0/0 0/0 .rodata @4125 */ -SECTION_RODATA static f32 const lit_4125 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(0x80466828, &lit_4125); - -/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8046697F = "FDoorA.bck"; -SECTION_DEAD static char const* const stringBase_8046698A = "oj_DoorOpD.bck"; -SECTION_DEAD static char const* const stringBase_80466999 = "oj_DoorOpC.bck"; -SECTION_DEAD static char const* const stringBase_804669A8 = "oj_DoorOpF.bck"; -SECTION_DEAD static char const* const stringBase_804669B7 = "md_oj_DoorOpF.bck"; -SECTION_DEAD static char const* const stringBase_804669C9 = "md_oj_DoorOpD.bck"; -SECTION_DEAD static char const* const stringBase_804669DB = "D_MN10"; -SECTION_DEAD static char const* const stringBase_804669E2 = "md_oj_DoorOpC.bck"; -SECTION_DEAD static char const* const stringBase_804669F4 = "oj_DoorCloseF.bck"; -SECTION_DEAD static char const* const stringBase_80466A06 = "oj_DoorCloseD.bck"; -SECTION_DEAD static char const* const stringBase_80466A18 = "oj_DoorCloseC.bck"; -SECTION_DEAD static char const* const stringBase_80466A2A = "D_MN09"; -SECTION_DEAD static char const* const stringBase_80466A31 = "SHUTTER_DOOR"; -SECTION_DEAD static char const* const stringBase_80466A3E = "Timer"; -SECTION_DEAD static char const* const stringBase_80466A44 = "FDoorB.bck"; -SECTION_DEAD static char const* const stringBase_80466A4F = "D_MN01"; -SECTION_DEAD static char const* const stringBase_80466A56 = "D_MN11"; -SECTION_DEAD static char const* const stringBase_80466A5D = "D_MN11B"; -SECTION_DEAD static char const* const stringBase_80466A65 = "CAMERA"; -SECTION_DEAD static char const* const stringBase_80466A6C = "D_MN05"; -SECTION_DEAD static char const* const stringBase_80466A73 = "D_MN04"; -SECTION_DEAD static char const* const stringBase_80466A7A = "F_SP115"; -SECTION_DEAD static char const* const stringBase_80466A82 = "シャッタードア：鍵タイプが不明です\n"; -SECTION_DEAD static char const* const stringBase_80466AA6 = "DEFAULT_STOP_OPEN"; -SECTION_DEAD static char const* const stringBase_80466AB8 = "DEFAULT_SHUTTER_DOOR_10"; -SECTION_DEAD static char const* const stringBase_80466AD0 = "DEFAULT_SHUTTER_DOOR_F_STOP"; -SECTION_DEAD static char const* const stringBase_80466AEC = "WOLF_SHUTTER_DOOR_10"; -SECTION_DEAD static char const* const stringBase_80466B01 = "WOLF_SHUTTER_DOOR_F_STOP"; -SECTION_DEAD static char const* const stringBase_80466B1A = "DEFAULT_SHUTTER_DOOR_14"; -SECTION_DEAD static char const* const stringBase_80466B32 = "DEFAULT_SHUTTER_DOOR_F_STOP_14"; -SECTION_DEAD static char const* const stringBase_80466B51 = "WOLF_SHUTTER_DOOR_14"; -SECTION_DEAD static char const* const stringBase_80466B66 = "WOLF_SHUTTER_DOOR_F_STOP_14"; -SECTION_DEAD static char const* const stringBase_80466B82 = "DEFAULT_SHUTTER_DOOR_18"; -SECTION_DEAD static char const* const stringBase_80466B9A = "DEFAULT_SHUTTER_DOOR_F_STOP_18"; -SECTION_DEAD static char const* const stringBase_80466BB9 = "WOLF_SHUTTER_DOOR_18"; -SECTION_DEAD static char const* const stringBase_80466BCE = "WOLF_SHUTTER_DOOR_F_STOP_18"; -SECTION_DEAD static char const* const stringBase_80466BEA = "DEFAULT_KNOB_DOOR_F"; -SECTION_DEAD static char const* const stringBase_80466BFE = "DEFAULT_KNOB_DOOR_B"; -SECTION_DEAD static char const* const stringBase_80466C12 = "DEFAULT_KNOB_DOOR_F_STOP"; -SECTION_DEAD static char const* const stringBase_80466C2B = "DEFAULT_KNOB_DOOR_B_STOP"; -SECTION_DEAD static char const* const stringBase_80466C44 = "DEFAULT_KNOB_DOOR_NOTOPEN_F"; -SECTION_DEAD static char const* const stringBase_80466C60 = "DEFAULT_KNOB_DOOR_NOTOPEN_B"; -SECTION_DEAD static char const* const stringBase_80466C7C = "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F"; -SECTION_DEAD static char const* const stringBase_80466C9D = "DEFAULT_SHUTTER_DOOR_20"; -SECTION_DEAD static char const* const stringBase_80466CB5 = "DEFAULT_SHUTTER_DOOR_F_STOP_20"; -SECTION_DEAD static char const* const stringBase_80466CD4 = "WOLF_SHUTTER_DOOR_20"; -SECTION_DEAD static char const* const stringBase_80466CE9 = "WOLF_SHUTTER_DOOR_F_STOP_20"; -SECTION_DEAD static char const* const stringBase_80466D05 = "DEFAULT_SHUTTER_DOOR_22"; -SECTION_DEAD static char const* const stringBase_80466D1D = "DEFAULT_SHUTTER_DOOR_F_STOP_22"; -SECTION_DEAD static char const* const stringBase_80466D3C = "WOLF_SHUTTER_DOOR_22"; -SECTION_DEAD static char const* const stringBase_80466D51 = "WOLF_SHUTTER_DOOR_F_STOP_22"; -SECTION_DEAD static char const* const stringBase_80466D6D = "WAIT"; -SECTION_DEAD static char const* const stringBase_80466D72 = "STOP_OPEN"; -SECTION_DEAD static char const* const stringBase_80466D7C = "STOP_CLOSE"; -SECTION_DEAD static char const* const stringBase_80466D87 = "OPEN"; -SECTION_DEAD static char const* const stringBase_80466D8C = "CLOSE"; -SECTION_DEAD static char const* const stringBase_80466D92 = "SMOKE"; -SECTION_DEAD static char const* const stringBase_80466D98 = "SMOKE_END"; -SECTION_DEAD static char const* const stringBase_80466DA2 = "SETGOAL"; -SECTION_DEAD static char const* const stringBase_80466DAA = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_80466DB1 = "SETSTART"; -SECTION_DEAD static char const* const stringBase_80466DBA = "SETANGLE"; -SECTION_DEAD static char const* const stringBase_80466DC3 = "ADJUSTMENT"; -SECTION_DEAD static char const* const stringBase_80466DCE = "OPEN_PUSH"; -SECTION_DEAD static char const* const stringBase_80466DD8 = "OPEN_PULL"; -SECTION_DEAD static char const* const stringBase_80466DE2 = "OPEN_PUSH2"; -SECTION_DEAD static char const* const stringBase_80466DED = "OPEN_PULL2"; -SECTION_DEAD static char const* const stringBase_80466DF8 = "TALK"; -SECTION_DEAD static char const* const stringBase_80466DFD = "SETSTART_PUSH"; -SECTION_DEAD static char const* const stringBase_80466E0B = "SETSTART_PULL"; -SECTION_DEAD static char const* const stringBase_80466E19 = "END_CHECK"; -SECTION_DEAD static char const* const stringBase_80466E23 = "DROP_BF"; -SECTION_DEAD static char const* const stringBase_80466E2B = "DROP_AF"; -SECTION_DEAD static char const* const stringBase_80466E33 = "DELETE_LOCK"; -SECTION_DEAD static char const* const stringBase_80466E3F = "OPEN_INIT"; -SECTION_DEAD static char const* const stringBase_80466E49 = "ADJUSTMENT2"; -SECTION_DEAD static char const* const stringBase_80466E55 = "NOT_OPEN"; -SECTION_DEAD static char const* const stringBase_80466E5E = "MESSAGE"; -SECTION_DEAD static char const* const stringBase_80466E66 = "LIGHT_ANM"; -SECTION_DEAD static char const* const stringBase_80466E70 = "LIGHT_ANM2"; -#pragma pop - -/* 80466ED0-80466F04 -00001 0034+00 1/1 0/0 0/0 .data @4126 */ -SECTION_DATA static void* lit_4126[13] = { - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x1CC), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x200), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x234), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x1CC), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x1CC), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x1CC), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x1CC), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x1CC), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x1CC), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x1CC), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x2F0), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x1CC), - (void*)(((char*)CreateHeap__10daDoor20_cFv) + 0x1CC), -}; - -/* 80466F04-80466F38 -00001 0034+00 1/1 0/0 0/0 .data @4496 */ -SECTION_DATA static void* lit_4496[13] = { - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x7C), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), - (void*)(((char*)openInit__10daDoor20_cFi) + 0x70), -}; - -/* 80466F38-80466F6C -00001 0034+00 1/1 0/0 0/0 .data @4611 */ -SECTION_DATA static void* lit_4611[13] = { - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x60), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), - (void*)(((char*)openProc__10daDoor20_cFi) + 0x14C), -}; - -/* 80466F6C-80466FA0 -00001 0034+00 1/1 0/0 0/0 .data @4638 */ -SECTION_DATA static void* lit_4638[13] = { - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x50), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), - (void*)(((char*)openEnd__10daDoor20_cFi) + 0x44), -}; - -/* 80466FA0-80466FD4 -00001 0034+00 1/1 0/0 0/0 .data @4776 */ -SECTION_DATA static void* lit_4776[13] = { - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x90), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), - (void*)(((char*)closeEnd__10daDoor20_cFi) + 0x84), -}; - -/* 80466FD4-80467008 -00001 0034+00 1/1 0/0 0/0 .data @4875 */ -SECTION_DATA static void* lit_4875[13] = { - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x44), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x38), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), - (void*)(((char*)calcMtx__10daDoor20_cFv) + 0x94), -}; - -/* 80467008-8046703C -00001 0034+00 1/1 0/0 0/0 .data @4926 */ -SECTION_DATA static void* lit_4926[13] = { - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x210), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x204), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x21C), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x210), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x210), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x210), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x210), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x210), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x210), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x228), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x240), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x210), - (void*)(((char*)CreateInit__10daDoor20_cFv) + 0x234), -}; - -/* 8046703C-804670B0 -00001 0074+00 1/1 0/0 0/0 .data @5342 */ -SECTION_DATA static void* lit_5342[29] = { - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x598), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x734), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x704), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x5B8), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x604), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x650), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x788), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x7C8), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xAA8), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE34), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x764), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE28), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x7A8), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xD88), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xD98), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE08), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE08), -}; - -/* 804670B0-80467124 -00001 0074+00 1/1 0/0 0/0 .data @5341 */ -SECTION_DATA static void* lit_5341[29] = { - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x9C), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x2B4), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x290), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xD8), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xE8), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0xF8), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x104), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x2C4), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x378), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x2E4), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x578), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x2D0), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x44C), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x40C), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x4C4), - (void*)(((char*)demoProc__10daDoor20_cFv) + 0x520), -}; - -/* 80467124-80467170 -00001 004C+00 0/1 0/0 0/0 .data table$5809 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* table[19] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x1CE), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x1CE), - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; -#pragma pop - -/* 80467170-80467180 -00001 0010+00 0/1 0/0 0/0 .data tate_table$5815 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* tate_table[4] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x1E0), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x1E0), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x1F8), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x1F8), -}; -#pragma pop - -/* 80467180-80467190 -00001 0010+00 0/1 0/0 0/0 .data tate_w_table$5816 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* tate_w_table[4] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x214), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x214), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x229), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x229), -}; -#pragma pop - -/* 80467190-804671A0 -00001 0010+00 0/1 0/0 0/0 .data yoko_table$5817 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* yoko_table[4] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x242), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x242), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x25A), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x25A), -}; -#pragma pop - -/* 804671A0-804671B0 -00001 0010+00 0/1 0/0 0/0 .data yoko_w_table$5818 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* yoko_w_table[4] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x279), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x279), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x28E), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x28E), -}; -#pragma pop - -/* 804671B0-804671C0 -00001 0010+00 0/1 0/0 0/0 .data lv8_table$5819 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lv8_table[4] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x2AA), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x2AA), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x2C2), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x2C2), -}; -#pragma pop - -/* 804671C0-804671D0 -00001 0010+00 0/1 0/0 0/0 .data lv8_w_table$5820 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lv8_w_table[4] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x2E1), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x2E1), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x2F6), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x2F6), -}; -#pragma pop - -/* 804671D0-804671EC -00001 001C+00 0/1 0/0 0/0 .data knob_table$5821 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* knob_table[7] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x312), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x326), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x33A), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x353), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x36C), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x388), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x3A4), -}; -#pragma pop - -/* 804671EC-804671FC -00001 0010+00 0/1 0/0 0/0 .data lv7_table$5822 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lv7_table[4] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x3C5), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x3C5), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x3DD), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x3DD), -}; -#pragma pop - -/* 804671FC-8046720C -00001 0010+00 0/1 0/0 0/0 .data lv7_w_table$5823 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lv7_w_table[4] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x3FC), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x3FC), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x411), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x411), -}; -#pragma pop - -/* 8046720C-8046721C -00001 0010+00 0/1 0/0 0/0 .data lv9_table$5824 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lv9_table[4] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x42D), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x42D), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x445), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x445), -}; -#pragma pop - -/* 8046721C-8046722C -00001 0010+00 0/1 0/0 0/0 .data lv9_w_table$5825 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lv9_w_table[4] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x464), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x464), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x479), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x479), -}; -#pragma pop - -/* 8046722C-804672A0 -00001 0074+00 1/1 0/0 0/0 .data action_table$6155 */ -SECTION_DATA static void* action_table[29] = { - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x495), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x49A), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4A4), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4AF), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4B4), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4BA), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4C0), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4CA), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4D2), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4D9), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4E2), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4EB), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x4F6), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x500), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x50A), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x515), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x520), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x525), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x533), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x541), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x54B), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x553), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x55B), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x567), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x571), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x57D), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x586), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x58E), - (void*)(((char*)&d_a_door_shutter__stringBase0) + 0x598), -}; - -/* 804672A0-804672C0 -00001 0020+00 1/0 0/0 0/0 .data l_daDoor20_Method */ -SECTION_DATA static void* l_daDoor20_Method[8] = { - (void*)daDoor20_Create__FP10fopAc_ac_c, - (void*)daDoor20_Delete__FP10daDoor20_c, - (void*)daDoor20_Execute__FP10daDoor20_c, - (void*)NULL, - (void*)daDoor20_Draw__FP10daDoor20_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 804672C0-804672F0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_DOOR20 */ -SECTION_DATA extern void* g_profile_DOOR20[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00E80000, (void*)&g_fpcLf_Method, - (void*)0x000008FC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01260000, (void*)&l_daDoor20_Method, - (void*)0x00044000, (void*)0x000E0000, -}; - -/* 804672F0-804672FC 000474 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 804672FC-80467320 000480 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80466810, - (void*)NULL, - (void*)NULL, - (void*)func_80466808, -}; - -/* 80467320-8046732C 0004A4 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; /* 80460DAC-80461254 0002EC 04A8+00 2/1 0/0 0/0 .text CreateHeap__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CreateHeap__10daDoor20_cFv.s" +int daDoor20_c::CreateHeap() { + int kind = door_param2_c::getKind(this); + J3DModelData* modelData = getModelData(); + JUT_ASSERT(355, modelData != 0); + int dListFlag = 0x11000084; + if (kind == 2) { + dListFlag |= 0x200; + } + mModel1 = mDoExt_J3DModel__create(modelData, 0x80000, dListFlag); + if (mModel1 == NULL) { + return 0; + } + J3DAnmTransform* anm; + if (kind == 9) { + + if (!field_0x584.init((J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck"), 1, 0, 1.0f, 0, -1, false)) { + return 0; + } + field_0x584.entry(mModel1->getModelData()); + mModel1->calc(); + mModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mModel2 == NULL) { + return 0; + } + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck"); + JUT_ASSERT(394, anm != 0); + if (!field_0x5a0.init(anm, 1, 0, 1.0f, 0, -1, false)) { + return 0; + } + field_0x5a0.entry(mModel1->getModelData()); + mModel2->calc(); + } else { + + switch (kind) { + case 0: + case 3: + case 4: + case 5: + case 11: + case 12: + default: + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpD.bck"); + break; + case 1: + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpC.bck"); + break; + case 2: + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk()); + JUT_ASSERT(421, pbtk != 0); + field_0x5c0 = new mDoExt_btkAnm(); + if (field_0x5c0 == NULL || !field_0x5c0->init(mModel1->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) { + return 0; + } + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpD.bck"); + break; + case 10: + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpF.bck"); + break; + } + JUT_ASSERT(375, anm != 0); + if (field_0x584.init(anm, 1, 0, 1.0f, 0, -1, false) == 0) { + return 0; + } + field_0x584.entry(mModel1->getModelData()); + mModel1->calc(); + } + if (chkMakeStop() && !mDoorStop.create(this)) { + return 0; + } + calcMtx(); + mDoorStop.calcMtx(this); + mDoMtx_stack_c::transS(home.pos); + mDoMtx_stack_c::YrotM(home.angle.y); + if (kind == 9) { + mDoMtx_stack_c::scaleM(1.0f, 1.4f, 1.0f); + } + MTXCopy(mDoMtx_stack_c::get(), field_0x5f4); + field_0x5c4 = new dBgW(); + if (field_0x5c4 == 0 || field_0x5c4->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzbName()), 1, &field_0x5f4)) { + return 0; + } + return 1; } -#pragma pop - -/* 80461254-8046129C 000794 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8046682C-80466830 00000C 0004+00 6/18 0/0 0/0 .rodata @4256 */ -SECTION_RODATA static u8 const lit_4256[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8046682C, &lit_4256); - -/* 80466830-80466834 000010 0004+00 0/1 0/0 0/0 .rodata @4257 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4257 = 62500.0f; -COMPILER_STRIP_GATE(0x80466830, &lit_4257); -#pragma pop /* 8046129C-804616EC 0007DC 0450+00 1/1 0/0 0/0 .text setEventPrm__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::setEventPrm() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setEventPrm__10daDoor20_cFv.s" +void daDoor20_c::setEventPrm() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + setStop(); + int FRoomNo = door_param2_c::getFRoomNo(this); + int BRoomNo = door_param2_c::getBRoomNo(this); + u32 roomNo; + if (FRoomNo == dComIfGp_roomControl_getStayNo()) { + roomNo = BRoomNo; + } else { + roomNo = FRoomNo; + } + if (dComIfGp_roomControl_checkStatusFlag(roomNo, 1)) { + if (door_param2_c::getKind(this) == 9) { + if (daPy_py_c::i_checkNowWolf()) { + return; + } + int iStack_48; + if (checkOpenMsgDoor(&iStack_48) == 0) { + field_0x6cb = 18; + } else { + cXyz local_38 = player->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-home.angle.y); + mDoMtx_stack_c::multVec(&local_38, &local_38); + if (field_0x68c == 0) { + if (local_38.x > 0.0f) { + field_0x6cb = 13; + } else { + field_0x6cb = 12; + } + if (mDoorStop.field_0xa == 0xff) { + mDoorStop.field_0xa = chkStopB(); + } + } else { + if (local_38.x > 0.0f) { + field_0x6cb = 12; + } else { + field_0x6cb = 13; + } + if (mDoorStop.field_0xa == 0xff) { + mDoorStop.field_0xa = chkStopF(); + } + } + } + } else { + if (daPy_py_c::i_checkNowWolf()) { + if (!player->checkMidnaRide() || !daMidna_c::i_checkMidnaRealBody()) { + return; + } + } + if (field_0x68c == 0) { + field_0x6cb = 4; + if (mDoorStop.field_0xa == 0xff) { + mDoorStop.field_0xa = chkStopB(); + } + } else { + field_0x6cb = 5; + if (mDoorStop.field_0xa == 0xff) { + mDoorStop.field_0xa = chkStopF(); + } + } + } + if (mDoorStop.field_0x8 == 0) { + if (mDoorStop.field_0xa == 1) { + field_0x6cb += 2; + } + if (chkMakeKey()) { + if (field_0x5f0) { + // FAKE MATCH: should be daPy_py_c::i_checkNowWolf + if (((daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR))->checkWolf()) { + if (dComIfGs_getKeyNum() == 0) { + return; + } + } else if (dComIfGs_getKeyNum() == 0) { + if (door_param2_c::getKind(this) == 9 && field_0x673 != 0) { + cXyz local_44 = player->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-home.angle.y); + mDoMtx_stack_c::multVec(&local_44, &local_44); + if (field_0x68c == 0) { + if (local_44.x > 0.0f) { + field_0x6cb = 17; + } else { + field_0x6cb = 16; + } + } else if (local_44.x > 0.0f) { + field_0x6cb = 16; + } else { + field_0x6cb = 17; + } + } else { + return; + } + } + } + } else { + int swBit; + if (field_0x68c == 0) { + swBit = door_param2_c::getSwbit(this); + } else { + swBit = door_param2_c::getSwbit2(this); + } + if (swBit != 0xff && !dComIfGs_isSwitch(swBit, 0xffffffff)) { + return; + } + } + if (checkArea(getSize2X(), 12100.0f, 62500.0f)) { + eventInfo.setEventId(field_0x692[field_0x6cb]); + eventInfo.setMapToolId(field_0x6b8[field_0x6cb]); + eventInfo.i_onCondition(4); + } + } + } } -#pragma pop /* 804616EC-8046178C 000C2C 00A0+00 1/1 0/0 0/0 .text checkOpenMsgDoor__10daDoor20_cFPi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::checkOpenMsgDoor(int* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkOpenMsgDoor__10daDoor20_cFPi.s" +int daDoor20_c::checkOpenMsgDoor(int* param_1) { + if (!door_param2_c::isMsgDoor(this)) { + return 1; + } + int msgNo = door_param2_c::getMsgNo(this); + if (msgNo == 0xffff) { + *param_1 = 0; + return 1; + } + field_0x624.init(NULL, msgNo, NULL, NULL); + int rv = field_0x624.checkOpenDoor(this, param_1); + dMsgObject_endFlowGroup(); + return rv; } -#pragma pop /* 8046178C-80461874 000CCC 00E8+00 1/1 0/0 0/0 .text adjustmentAngle__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::adjustmentAngle() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjustmentAngle__10daDoor20_cFv.s" +int daDoor20_c::adjustmentAngle() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + cXyz playerPos; + playerPos = player->current.pos; + s16 angle = player->shape_angle.y; + cLib_addCalcAngleS2(&angle, shape_angle.y + 0x7fff, 5, + 3000); + if (field_0x6dc > 0) { + player->setPlayerPosAndAngle(&playerPos, angle, 0); + field_0x6dc--; + } else { + player->setPlayerPosAndAngle(&playerPos, shape_angle.y + 0x7fff, 0); + return 1; + } + return 0; } -#pragma pop - -/* ############################################################################################## */ -/* 80466834-80466838 000014 0004+00 0/1 0/0 0/0 .rodata @4346 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4346 = 75.0f; -COMPILER_STRIP_GATE(0x80466834, &lit_4346); -#pragma pop - -/* 80466838-8046683C 000018 0004+00 0/1 0/0 0/0 .rodata @4347 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4347 = -75.0f; -COMPILER_STRIP_GATE(0x80466838, &lit_4347); -#pragma pop - -/* 8046683C-80466840 00001C 0004+00 0/1 0/0 0/0 .rodata @4348 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4348 = -70.0f; -COMPILER_STRIP_GATE(0x8046683C, &lit_4348); -#pragma pop - -/* 80466840-80466844 000020 0004+00 0/1 0/0 0/0 .rodata @4349 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4349 = -65.0f; -COMPILER_STRIP_GATE(0x80466840, &lit_4349); -#pragma pop - -/* 80466844-80466848 000024 0004+00 0/2 0/0 0/0 .rodata @4350 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4350 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(0x80466844, &lit_4350); -#pragma pop - -/* 80466848-8046684C 000028 0004+00 0/1 0/0 0/0 .rodata @4351 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4351 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80466848, &lit_4351); -#pragma pop /* 80461874-80461A44 000DB4 01D0+00 1/1 0/0 0/0 .text adjustmentProc__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::adjustmentProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjustmentProc__10daDoor20_cFv.s" +int daDoor20_c::adjustmentProc() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + cXyz local_2c; + cXyz local_38; + local_38 = player->current.pos; + s16 angle = shape_angle.y + 0x7fff; + local_38 = player->current.pos; + local_2c.z = 0.0f; + local_2c.y = 0.0f; + if (field_0x6cb == 12 || field_0x6cb == 14 || field_0x6cb == 16) { + local_2c.x = 75.0f; + } else { + local_2c.x = -75.0f; + } + s16 sVar3 = home.angle.y; + if (field_0x68c == 0) { + sVar3 += 0x7fff; + } + mDoMtx_stack_c::YrotS(sVar3); + mDoMtx_stack_c::multVec(&local_2c, &local_2c); + local_2c += current.pos; + local_2c.x += cM_ssin(angle) * -70.0f; + local_2c.z += cM_scos(angle) * -65.0f; + if (field_0x6dc > 0) { + local_38.x = local_38.x * 0.8f + local_2c.x * 0.2f; + local_38.z = local_38.z * 0.8f + local_2c.z * 0.2f; + player->setPlayerPosAndAngle(&local_38, player->current.angle.y, 0); + field_0x6dc--; + } else { + player->setPlayerPosAndAngle(&local_2c, player->current.angle.y, 0); + return 1; + } + return 0; } -#pragma pop /* 80461A44-80461A60 000F84 001C+00 1/1 0/0 0/0 .text setAngle__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::setAngle() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setAngle__10daDoor20_cFv.s" +void daDoor20_c::setAngle() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + player->changeDemoMoveAngle(shape_angle.y + 0x7fff); } -#pragma pop -/* ############################################################################################## */ /* 8046684C-80466858 00002C 000A+02 0/1 0/0 0/0 .rodata l_eff_id_lv3$4376 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_eff_id_lv3[10 + 2 /* padding */] = { - 0x87, - 0x62, - 0x87, - 0x63, - 0x87, - 0x64, - 0x87, - 0x65, - 0x87, - 0x66, - /* padding */ - 0x00, - 0x00, +static u16 const l_eff_id_lv3[5] = { + 0x8762, + 0x8763, + 0x8764, + 0x8765, + 0x8766, }; -COMPILER_STRIP_GATE(0x8046684C, &l_eff_id_lv3); -#pragma pop /* 80466858-80466864 000038 000A+02 0/1 0/0 0/0 .rodata l_eff_id_lv4$4377 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_eff_id_lv4[10 + 2 /* padding */] = { - 0x8A, - 0xEB, - 0x8A, - 0xEC, - 0x8A, - 0xED, - 0x8A, - 0xEE, - 0x8A, - 0xEF, - /* padding */ - 0x00, - 0x00, +static u16 const l_eff_id_lv4[5] = { + 0x8AEB, + 0x8AEC, + 0x8AED, + 0x8AEE, + 0x8AEF, }; -COMPILER_STRIP_GATE(0x80466858, &l_eff_id_lv4); -#pragma pop /* 80461A60-80461D24 000FA0 02C4+00 1/1 0/0 0/0 .text openInit_0__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::openInit_0() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit_0__10daDoor20_cFv.s" +void daDoor20_c::openInit_0() { + J3DAnmTransform* anm; + if (daPy_py_c::i_checkNowWolf()) { + if (door_param2_c::getKind(this) == 10) { + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "md_oj_DoorOpF.bck"); + } else { + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "md_oj_DoorOpD.bck"); + } + } else { + if (door_param2_c::getKind(this) == 10) { + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpF.bck"); + } else { + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpD.bck"); + } + } + JUT_ASSERT(832, anm != 0); + int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(835, rt == 0); + daPy_py_c* player = daPy_getPlayerActorClass(); + field_0x584.setPlaySpeed(player->getBaseAnimeFrameRate()); + u8 bVar5 = door_param2_c::getSwbit3(this); + if (bVar5 != 0xff && !fopAcM_isSwitch(this, bVar5)) { + csXyz acStack_2c(0, field_0x670, 0); + for (u32 i = 0; i < 5; i++) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN10") == 0) { + s32 roomNo = fopAcM_GetRoomNo(this); + dComIfGp_particle_set(l_eff_id_lv4[i], + ¤t.pos, &acStack_2c, NULL, 0xff, NULL, roomNo, NULL, NULL, NULL); + } else { + s32 roomNo = fopAcM_GetRoomNo(this); + dComIfGp_particle_set(l_eff_id_lv3[i], + ¤t.pos, &acStack_2c, NULL, 0xff, NULL, roomNo, NULL, NULL, NULL); + } + } + fopAcM_onSwitch(this, bVar5); + field_0x672 = true; + } else { + field_0x672 = false; + } } -#pragma pop -/* ############################################################################################## */ /* 80466864-80466868 000044 0004+00 1/1 0/0 0/0 .rodata l_eff_id$4449 */ -SECTION_RODATA static u8 const l_eff_id[4] = { - 0x82, - 0x95, - 0x82, - 0x96, +static u16 const l_eff_id[2] = { + 0x8295, + 0x8296, }; -COMPILER_STRIP_GATE(0x80466864, &l_eff_id); /* 80461D24-80461EC4 001264 01A0+00 1/1 0/0 0/0 .text openInit_1__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::openInit_1() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit_1__10daDoor20_cFv.s" +void daDoor20_c::openInit_1() { + J3DAnmTransform* anm; + if (daPy_py_c::i_checkNowWolf()) { + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "md_oj_DoorOpC.bck"); + } else { + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpC.bck"); + } + JUT_ASSERT(915, anm != 0); + int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(918, rt == 0); + u8 bVar5 = door_param2_c::getSwbit3(this); + if (bVar5 != 0xff && !fopAcM_isSwitch(this, bVar5)) { + for (int i = 0; i < 2; i++) { + s32 roomNo = fopAcM_GetRoomNo(this); + dComIfGp_particle_set(l_eff_id[i], ¤t.pos, &shape_angle, NULL, 0xff, NULL, + roomNo, NULL, NULL, NULL); + } + fopAcM_onSwitch(this, bVar5); + field_0x672 = true; + } else { + field_0x672 = false; + } } -#pragma pop /* 80461EC4-80461F60 001404 009C+00 2/1 0/0 0/0 .text openInit__10daDoor20_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::openInit(int param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit__10daDoor20_cFi.s" +int daDoor20_c::openInit(int param_1) { + openInitCom(1); + dMapInfo_c::setNextRoomNoForMapPat0(field_0x67f); + onFlag(1); + dComIfG_Bgsp().Release(field_0x5c4); + switch (door_param2_c::getKind(this)) { + case 0: + case 3: + case 4: + case 9: + case 11: + case 12: + default: + openInit_0(); + break; + case 1: + openInit_1(); + break; + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80466868-8046686C 000048 0004+00 0/2 0/0 0/0 .rodata @4607 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4607 = 17.0f; -COMPILER_STRIP_GATE(0x80466868, &lit_4607); -#pragma pop - -/* 8046686C-80466870 00004C 0004+00 0/1 0/0 0/0 .rodata @4608 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4608 = 18.0f; -COMPILER_STRIP_GATE(0x8046686C, &lit_4608); -#pragma pop - -/* 80466870-80466874 000050 0004+00 3/7 0/0 0/0 .rodata @4609 */ -SECTION_RODATA static f32 const lit_4609 = -1.0f; -COMPILER_STRIP_GATE(0x80466870, &lit_4609); - -/* 80466874-80466878 000054 0004+00 0/1 0/0 0/0 .rodata @4610 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4610 = 20.0f; -COMPILER_STRIP_GATE(0x80466874, &lit_4610); -#pragma pop /* 80461F60-804622A8 0014A0 0348+00 2/1 0/0 0/0 .text openProc__10daDoor20_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::openProc(int param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openProc__10daDoor20_cFi.s" +int daDoor20_c::openProc(int param_1) { + u32 sfx; + f32 frame = field_0x584.getFrame(); + int rv = field_0x584.play(); + switch (door_param2_c::getKind(this)) { + case 1: + if (field_0x584.getFrame() == 17.0f) { + dComIfGp_getVibration().StartShock(4, 15, cXyz(0.0f, 1.0f, 0.0f)); + } else { + if (field_0x584.getFrame() == 18.0f) { + if (daPy_py_c::i_checkNowWolf()) { + u32 mdnfx; + if (field_0x672) { + mdnfx = Z2SE_OBJ_WOOD_DR_OP_MDN_FX; + } else { + mdnfx = Z2SE_OBJ_WOOD_DR_OP_MDN; + } + sfx = mdnfx; + } else { + sfx = + field_0x672 ? Z2SE_OBJ_WOOD_DOOR_ROLLOPEN : Z2SE_OBJ_WOOD_DOOR_ROLLOPEN2; + } + mDoAud_seStart(sfx, &field_0x5e0, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + } + break; + case 0: + case 3: + case 4: + case 9: + case 11: + case 12: + default: + if ((door_param2_c::getKind(this) == 0 || door_param2_c::getKind(this) == 10) && + field_0x584.getFrame() == 17.0f) + { + dComIfGp_getVibration().StartShock(4, 15, cXyz(0.0f, 1.0f, 0.0f)); + } + if (daPy_py_c::i_checkNowWolf()) { + if (field_0x584.getFrame() == 20.0f) { + if (door_param2_c::getKind(this) == 2) { + sfx = Z2SE_OBJ_L8_SHTR_OP; + } else { + if (door_param2_c::getKind(this) == 10) { + sfx = Z2SE_OBJ_LV9_SHTR_OP; + } else { + sfx = field_0x672 ? Z2SE_OBJ_LV3_SHTR_OP_FX : Z2SE_OBJ_LV3_SHTR_OP_MDN; + } + } + fopAcM_seStart(this, sfx, 0); + } + } else { + if (field_0x584.getFrame() == 20.0f || (frame < 20.0f && field_0x584.getFrame() >= 20.0f)) + { + if (door_param2_c::getKind(this) == 2) { + sfx = Z2SE_OBJ_L8_SHTR_OP; + } else { + if (door_param2_c::getKind(this) == 10) { + sfx = Z2SE_OBJ_LV9_SHTR_OP; + } else { + sfx = field_0x672 ? Z2SE_OBJ_LV3_SHTR_OP_FX : Z2SE_OBJ_LV3_SHTR_OP; + } + } + fopAcM_seStart(this, sfx, 0); + } + } + break; + } + return rv; } -#pragma pop /* 804622A8-804622AC 0017E8 0004+00 1/1 0/0 0/0 .text openEnd_0__10daDoor20_cFv */ void daDoor20_c::openEnd_0() { - /* empty function */ } /* 804622AC-80462328 0017EC 007C+00 1/1 0/0 0/0 .text openEnd_1__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::openEnd_1() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openEnd_1__10daDoor20_cFv.s" +void daDoor20_c::openEnd_1() { + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_OPEN_STOP, &field_0x5e0, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } -#pragma pop /* 80462328-80462398 001868 0070+00 2/1 0/0 0/0 .text openEnd__10daDoor20_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::openEnd(int param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openEnd__10daDoor20_cFi.s" +int daDoor20_c::openEnd(int param_1) { + offFlag(1); + switch (door_param2_c::getKind(this)) { + case 0: + case 3: + case 4: + case 9: + case 11: + case 12: + default: + openEnd_0(); + break; + case 1: + openEnd_1(); + break; + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80466878-8046687C 000058 0004+00 0/3 0/0 0/0 .rodata @4706 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4706 = 200.0f; -COMPILER_STRIP_GATE(0x80466878, &lit_4706); -#pragma pop /* 80462398-8046266C 0018D8 02D4+00 1/1 0/0 0/0 .text closeInit_0__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::closeInit_0() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_0__10daDoor20_cFv.s" +void daDoor20_c::closeInit_0() { + J3DAnmTransform* anm; + if (door_param2_c::getKind(this) == 10) { + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorCloseF.bck"); + } else { + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorCloseD.bck"); + } + JUT_ASSERT(1178, anm != 0); + int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(1181, rt == 0); + cXyz acStack_40(home.pos.x, home.pos.y + 200.0f, home.pos.z); + bool waterCheck = fopAcM_wt_c::waterCheck(&acStack_40); + fopAcM_gc_c::gndCheck(&acStack_40); + if (waterCheck != 0 && fopAcM_wt_c::getWaterY() > fopAcM_gc_c::getGroundY()) { + fopAcM_seStart(this, Z2SE_OBJ_LV3_SHTR_CL_WTR, 0); + } else { + if (door_param2_c::getKind(this) == 2) { + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CL, 0); + } else { + if (door_param2_c::getKind(this) == 10) { + fopAcM_seStart(this, Z2SE_OBJ_LV9_SHTR_CL, 0); + } else { + fopAcM_seStart(this, Z2SE_OBJ_LV3_SHTR_CL, 0); + } + } + } + if (door_param2_c::getKind(this) != 10) { + dComIfGp_particle_setPolyColor(0x8c50, field_0x6de.m_gnd, ¤t.pos, &tevStr, + &shape_angle, NULL, 0, NULL, dComIfGp_roomControl_getStayNo(), 0); + } } -#pragma pop /* 8046266C-80462738 001BAC 00CC+00 1/1 0/0 0/0 .text closeInit_1__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::closeInit_1() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_1__10daDoor20_cFv.s" +void daDoor20_c::closeInit_1() { + J3DAnmTransform* anm = + (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorCloseC.bck"); + JUT_ASSERT(1236, anm != 0); + int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(1239, rt == 0); + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLCLOSE, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } -#pragma pop /* 80462738-804627C4 001C78 008C+00 1/1 0/0 0/0 .text closeInit__10daDoor20_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::closeInit(int param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit__10daDoor20_cFi.s" +int daDoor20_c::closeInit(int param_1) { + onFlag(2); + int rt = dComIfG_Bgsp().Regist(field_0x5c4, this); + JUT_ASSERT(1264, !rt); + switch(door_param2_c::getKind(this)) { + case 0: + case 2: + case 10: + default: + closeInit_0(); + break; + case 1: + closeInit_1(); + break; + } + return 1; } -#pragma pop /* 804627C4-804627E8 001D04 0024+00 1/1 0/0 0/0 .text closeProc__10daDoor20_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::closeProc(int param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeProc__10daDoor20_cFi.s" +int daDoor20_c::closeProc(int param_0) { + return field_0x584.play(); } -#pragma pop /* 804627E8-804627EC 001D28 0004+00 1/1 0/0 0/0 .text closeEnd_0__10daDoor20_cFv */ void daDoor20_c::closeEnd_0() { - /* empty function */ } /* 804627EC-80462868 001D2C 007C+00 1/1 0/0 0/0 .text closeEnd_1__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::closeEnd_1() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd_1__10daDoor20_cFv.s" +void daDoor20_c::closeEnd_1() { + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_CLOSE_STOP, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } -#pragma pop /* 80462868-80462928 001DA8 00C0+00 2/1 0/0 0/0 .text closeEnd__10daDoor20_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::closeEnd(int param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd__10daDoor20_cFi.s" +int daDoor20_c::closeEnd(int param_0) { + offFlag(2); + closeEndCom(); + dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f)); + switch (door_param2_c::getKind(this)) { + case 0: + case 3: + case 4: + case 9: + case 11: + case 12: + default: + closeEnd_0(); + break; + case 1: + closeEnd_1(); + break; + } + deleteKey(); + setDoorAngleSpec(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8046687C-80466880 00005C 0004+00 0/1 0/0 0/0 .rodata @4805 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4805 = 100.0f; -COMPILER_STRIP_GATE(0x8046687C, &lit_4805); -#pragma pop /* 80462928-80462A1C 001E68 00F4+00 1/1 0/0 0/0 .text openInit2__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::openInit2() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit2__10daDoor20_cFv.s" +void daDoor20_c::openInit2() { + field_0x5f1 = field_0x68c; + field_0x584.setFrame(0.0f); + field_0x584.setPlaySpeed(1.0f); + field_0x5a0.setFrame(0.0f); + field_0x5a0.setPlaySpeed(1.0f); + openInitCom(1); + dMapInfo_c::setNextRoomNoForMapPat0(field_0x67f); + onFlag(1); + dComIfG_Bgsp().Release(field_0x5c4); + if (field_0x5f1 == 0) { + field_0x5bc = mModel2; + } else { + field_0x5bc = mModel1; + } + mDoMtx_stack_c::copy(field_0x5bc->getAnmMtx(0)); + mDoMtx_stack_c::multVecZero(&field_0x5e0); + field_0x5e0.y += 100.0f; } -#pragma pop /* 80462A1C-80462A5C 001F5C 0040+00 1/1 0/0 0/0 .text closeEnd2__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::closeEnd2() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEnd2__10daDoor20_cFv.s" +void daDoor20_c::closeEnd2() { + offFlag(1); + closeEndCom(); + deleteKey(); } -#pragma pop - -/* ############################################################################################## */ -/* 80466880-80466884 000060 0004+00 0/1 0/0 0/0 .rodata @4849 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4849 = 220.0f; -COMPILER_STRIP_GATE(0x80466880, &lit_4849); -#pragma pop - -/* 80466884-80466888 000064 0004+00 0/1 0/0 0/0 .rodata @4850 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4850 = -220.0f; -COMPILER_STRIP_GATE(0x80466884, &lit_4850); -#pragma pop /* 80462A5C-80462B58 001F9C 00FC+00 1/1 0/0 0/0 .text calcMtx_2__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::calcMtx_2() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx_2__10daDoor20_cFv.s" +void daDoor20_c::calcMtx_2() { + cXyz cStack_1c(220.0f, 0.0f, 0.0f); + cXyz cStack_28(-220.0f, 0.0f, 0.0f); + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&cStack_1c, &cStack_1c); + mDoMtx_stack_c::multVec(&cStack_28, &cStack_28); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transM(cStack_1c); + mDoMtx_stack_c::YrotM(home.angle.y); + mModel1->setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transM(cStack_28); + mDoMtx_stack_c::YrotM(home.angle.y + 0x7fff); + mModel2->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop /* 80462B58-80462C2C 002098 00D4+00 4/3 0/0 0/0 .text calcMtx__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::calcMtx() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx__10daDoor20_cFv.s" +void daDoor20_c::calcMtx() { + switch (door_param2_c::getKind(this)) { + case 9: + calcMtx_2(); + break; + case 1: + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(field_0x670); + mModel1->setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_stack_c::multVecZero(&field_0x5e0); + break; + case 0: + case 3: + case 4: + case 11: + case 12: + default: + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(field_0x670); + mModel1->setBaseTRMtx(mDoMtx_stack_c::get()); + break; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80466888-8046688C 000068 0004+00 0/2 0/0 0/0 .rodata @4916 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4916 = 30.0f; -COMPILER_STRIP_GATE(0x80466888, &lit_4916); -#pragma pop - -/* 8046688C-80466890 00006C 0004+00 0/1 0/0 0/0 .rodata @4917 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4917 = 150.0f; -COMPILER_STRIP_GATE(0x8046688C, &lit_4917); -#pragma pop - -/* 80466890-80466894 000070 0004+00 0/3 0/0 0/0 .rodata @4918 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4918 = -300.0f; -COMPILER_STRIP_GATE(0x80466890, &lit_4918); -#pragma pop - -/* 80466894-80466898 000074 0004+00 0/1 0/0 0/0 .rodata @4919 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4919 = -50.0f; -COMPILER_STRIP_GATE(0x80466894, &lit_4919); -#pragma pop - -/* 80466898-8046689C 000078 0004+00 0/4 0/0 0/0 .rodata @4920 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4920 = 300.0f; -COMPILER_STRIP_GATE(0x80466898, &lit_4920); -#pragma pop - -/* 8046689C-804668A0 00007C 0004+00 0/1 0/0 0/0 .rodata @4921 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4921 = 700.0f; -COMPILER_STRIP_GATE(0x8046689C, &lit_4921); -#pragma pop - -/* 804668A0-804668A4 000080 0004+00 0/1 0/0 0/0 .rodata @4922 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4922 = 50.0f; -COMPILER_STRIP_GATE(0x804668A0, &lit_4922); -#pragma pop - -/* 804668A4-804668A8 000084 0004+00 0/3 0/0 0/0 .rodata @4923 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4923 = -200.0f; -COMPILER_STRIP_GATE(0x804668A4, &lit_4923); -#pragma pop - -/* 804668A8-804668AC 000088 0004+00 0/1 0/0 0/0 .rodata @4924 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4924 = 500.0f; -COMPILER_STRIP_GATE(0x804668A8, &lit_4924); -#pragma pop - -/* 804668AC-804668B0 00008C 0004+00 0/1 0/0 0/0 .rodata @4925 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4925 = 10.0f; -COMPILER_STRIP_GATE(0x804668AC, &lit_4925); -#pragma pop /* 80462C2C-80462EB4 00216C 0288+00 2/1 0/0 0/0 .text CreateInit__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::CreateInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/CreateInit__10daDoor20_cFv.s" +int daDoor20_c::CreateInit() { + shape_angle.z = 0; + shape_angle.x = 0; + current.angle.z = 0; + current.angle.x = 0; + field_0x8b8.SetWall(30.0f, 30.0f); + field_0x6de.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, + &field_0x8b8, fopAcM_GetSpeed_p(this), NULL, NULL); + int rt = dComIfG_Bgsp().Regist(field_0x5c4, this); + JUT_ASSERT(1512, !rt); + tevStr.mRoomNo = current.roomNo; + setAction(ACTION_INIT); + attention_info.position.y += 150.0f; + eyePos.y += 150.0f; + attention_info.flags = 0x20; + fopAcM_SetMtx(this, field_0x5f4); + if (door_param2_c::getKind(this) == 10) { + fopAcM_setCullSizeBox(this, -300.0f, 0, -50.0f, 300.0f, 700.0f, 50.0f); + } else { + fopAcM_setCullSizeBox(this, -200.0f, 0, -50.0f, 200.0f, 500.0f, 50.0f); + } + fopAcM_setCullSizeFar(this, 10.0f); + setKey(); + field_0x5ec = -1; + if (door_param2_c::getKind(this) == 9 && strcmp(dComIfGp_getStartStageName(), "D_MN09") != 0) { + field_0x673 = 1; + } else { + field_0x673 = 0; + } + if (door_param2_c::getFRoomNo(this) == dComIfGp_getStartStageRoomNo() || door_param2_c::getBRoomNo(this) == dComIfGp_getStartStageRoomNo()) { + createKey(); + } + calcMtx(); + field_0x5c4->Move(); + field_0x5c4->SetRoomId(door_param2_c::getFRoomNo(this)); + switch (door_param2_c::getKind(this)) { + case 1: + field_0x691 = 3; + break; + default: + field_0x691 = 1; + break; + case 2: + field_0x691 = 2; + break; + case 9: + field_0x691 = 4; + break; + case 12: + field_0x691 = 5; + break; + case 10: + field_0x691 = 6; + break; + } + eventInfo.setArchiveName(getArcName()); + initProc(); + field_0x68d = 65; + field_0x5c8 = -1; + return 1; } -#pragma pop /* 80462EB4-80462F2C 0023F4 0078+00 1/1 0/0 0/0 .text setKey__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::setKey() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setKey__10daDoor20_cFv.s" +void daDoor20_c::setKey() { + int swBit = door_param2_c::getSwbit(this); + if (chkMakeKey() == 1 && !dComIfGs_isSwitch(swBit, 0xffffffff)) { + field_0x5f0 = true; + } else { + field_0x5f0 = false; + } } -#pragma pop /* 80462F2C-80462FE0 00246C 00B4+00 1/1 0/0 0/0 .text create__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::create() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/create__10daDoor20_cFv.s" +int daDoor20_c::create() { + int rv = dComIfG_resLoad(&mPhase1, getAlwaysArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + if (getArcName() != NULL) { + rv = dComIfG_resLoad(&mPhase2, getArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + } + fopAcM_SetRoomNo(this, door_param2_c::getFRoomNo(this)); + if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x80003800) == 0) { + rv = cPhs_ERROR_e; + } else { + CreateInit(); + rv = cPhs_COMPLEATE_e; + } + return rv; } -#pragma pop /* 80462FE0-80463E30 002520 0E50+00 5/3 0/0 0/0 .text demoProc__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::demoProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/demoProc__10daDoor20_cFv.s" +int daDoor20_c::demoProc() { + field_0x6cc = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", 0, 0); + int demoAction = getDemoAction(); + if (dComIfGp_evmng_getIsAddvance(field_0x6cc)) { + switch (demoAction) { + case 0: + int* pTimer = dComIfGp_evmng_getMyIntegerP( + field_0x6cc, "Timer"); + if (pTimer == NULL) { + field_0x5dd = 1; + } else { + field_0x5dd = *pTimer; + } + break; + case 3: + openInit(0); + break; + case 4: + closeInit(0); + break; + case 7: + setGoal(); + break; + case 8: + if (field_0x673 == 1) { + daObjLv5Key_c* lv5Key = + (daObjLv5Key_c*)fopAcM_SearchByID(field_0x5ec); + if (lv5Key != NULL) { + lv5Key->keylock_open_start(); + } + } else { + obj_keyhole_class* keyhole = (obj_keyhole_class*)fopAcM_SearchByID( + field_0x5ec); + if (keyhole != NULL) { + keyhole->setOpen(); + } + } + int swBit = door_param2_c::getSwbit(this); + if (swBit != 0xff && + !dComIfGs_isSwitch(swBit, 0xffffffff) && + (door_param2_c::getFrontOption(this) == 2 || door_param2_c::getBackOption(this) == 2)) + { + dComIfGs_onSwitch(swBit, 0xffffffff); + dComIfGp_setItemKeyNumCount(0xffffffff); + if (field_0x673 == 1) { + fopAcM_seStart(this, Z2SE_OBJ_DOOR_LOCK_OPEN, 0); + } else { + fopAcM_seStart(this, Z2SE_OBJ_DOOR_CHAIN_LOCK_OPEN, 0); + } + } + break; + case 2: + setStop(); + if (mDoorStop.field_0x8 != 0) { + mDoorStop.closeInit(this); + } + break; + case 1: + mDoorStop.openInit(this); + break; + case 11: + field_0x6dc = 5; + break; + case 24: + field_0x6dc = 5; + setAngle(); + break; + case 13: + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes( + getAlwaysArcName(), "FDoorB.bck"); + JUT_ASSERT(1796, anm != 0); + if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm, + 1, 0, 1.0f, 0, -1, true)) + { + JUT_PANIC(0); + } + field_0x67c = 0; + openInit2(); + break; + case 12: + anm = + (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck"); + JUT_ASSERT(1809, anm != 0); + if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm, + 1, 0, 1.0f, 0, -1, true)) + { + JUT_PANIC(0); + } + field_0x67c = 0; + openInit2(); + break; + case 26: + if (door_param2_c::isMsgDoor(this)) { + int msgNo = door_param2_c::getMsgNo(this); + if (msgNo != 0xffff) { + field_0x624.init(this, msgNo, 0, NULL); + } + } + break; + case 25: + if (field_0x673 == 1) { + daObjLv5Key_c* lv5Key = (daObjLv5Key_c*)fopAcM_SearchByID(field_0x5ec); + if (lv5Key != NULL) { + lv5Key->keylock_shake_start(); + mDoAud_seStart(Z2SE_OBJ_KNOB_DOOR_LOCKED, &field_0x5e0, 0, 0); + } + } + break; + case 27: + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CREST_ON, 0); + field_0x5c0->setPlaySpeed(1.0f); + break; + case 28: + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CREST_OFF, 0); + field_0x5c0->setPlaySpeed(-1.0f); + break; + } + } + switch (demoAction) { + case 0: + if (cLib_calcTimer(&field_0x5dd) == 0) { + dComIfGp_evmng_cutEnd(field_0x6cc); + } + break; + case 3: + if (checkFlag(1)) { + if (openProc(0)) { + openEnd(0); + dComIfGp_evmng_cutEnd(field_0x6cc); + } + } else { + dComIfGp_evmng_cutEnd(field_0x6cc); + } + break; + case 4: + if (checkFlag(2)) { + if (closeProc(0)) { + closeEnd(0); + dComIfGp_evmng_cutEnd(field_0x6cc); + } + } else { + dComIfGp_evmng_cutEnd(field_0x6cc); + } + break; + case 8: + if (field_0x673 == 1) { + daObjLv5Key_c* lv5Key = (daObjLv5Key_c*)fopAcM_SearchByID(field_0x5ec); + if ((lv5Key != NULL && lv5Key->is_open()) || !field_0x5f0) { + field_0x5f0 = false; + dComIfGp_evmng_cutEnd(field_0x6cc); + } + } else if (field_0x673 == 0) { + obj_keyhole_class* keyhole = (obj_keyhole_class*)fopAcM_SearchByID(field_0x5ec); + if ((keyhole != NULL && keyhole->checkOpenEnd()) || !field_0x5f0) { + field_0x5f0 = false; + dComIfGp_evmng_cutEnd(field_0x6cc); + } + } + break; + case 2: + if (mDoorStop.closeProc(this)) { + dComIfGp_evmng_cutEnd(field_0x6cc); + } + mDoorStop.calcMtx(this); + break; + case 1: + if (mDoorStop.openProc(this)) { + dComIfGp_evmng_cutEnd(field_0x6cc); + } + mDoorStop.calcMtx(this); + break; + case 19: + field_0x5c4->Move(); + field_0x5c8 = dComIfGp_roomControl_getStayNo(); + dComIfGp_evmng_cutEnd(field_0x6cc); + break; + case 11: + if (adjustmentAngle()) { + dComIfGp_evmng_cutEnd(field_0x6cc); + } + break; + case 24: + if (adjustmentProc()) { + dComIfGp_evmng_cutEnd(field_0x6cc); + } + break; + + + case 12: + int local_48; + f32 dVar19; + if (field_0x5f1 == 0) { + local_48 = field_0x584.play(); + dVar19 = field_0x584.getFrame(); + } else { + local_48 = field_0x5a0.play(); + dVar19 = field_0x5a0.getFrame(); + } + if (dVar19 == 24.0f) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN01") == 0) { + mDoAud_seStart(Z2SE_OBJ_LV3_KNOB_DR_OP, &field_0x5e0, 0, 0); + } else if (strcmp(dComIfGp_getStartStageName(), "D_MN11") == 0 || + strcmp(dComIfGp_getStartStageName(), "D_MN11B") == 0 || + strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0) + { + mDoAud_seStart(Z2SE_OBJ_KNOB_DOOR_LV5_OP, &field_0x5e0, 0, 0); + } + } else if (dVar19 == 75.0f) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN11") == 0 || + strcmp(dComIfGp_getStartStageName(), "D_MN11B") == 0 || + strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0) + { + mDoAud_seStart(Z2SE_OBJ_KNOB_DOOR_LV5_CL, 0, 0, 0); + } else if (strcmp(dComIfGp_getStartStageName(), "D_MN01") == 0) { + mDoAud_seStart(Z2SE_OBJ_LV3_KNOB_DR_CL, &field_0x5e0, 0, 0); + } + } + field_0x678 = dComIfGp_evmng_getMyStaffId("CAMERA", 0, 0); + if (field_0x67c != 0 || + dComIfGp_evmng_getIsAddvance(field_0x678)) + { + field_0x674 = field_0x67f; + field_0x67c = 1; + } else { + field_0x674 = field_0x67e; + } + if (local_48 != 0) { + closeEnd2(); + if (!field_0x5c4->ChkUsed()) { + dComIfG_Bgsp().Regist(field_0x5c4, this); + } + shape_angle.y = current.angle.y; + dComIfGp_evmng_cutEnd(field_0x6cc); + } + break; + case 13: + if (field_0x5f1 == 0) { + local_48 = field_0x5a0.play(); + dVar19 = field_0x5a0.getFrame(); + } else { + local_48 = field_0x584.play(); + dVar19 = field_0x584.getFrame(); + } + if (dVar19 == 19.0f) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN01") == 0) { + mDoAud_seStart(Z2SE_OBJ_LV3_KNOB_DR_OP, &field_0x5e0, 0, 0); + } else { + if (strcmp(dComIfGp_getStartStageName(), "D_MN11") == 0 || + strcmp(dComIfGp_getStartStageName(), "D_MN11B") == 0 || + strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0) + { + mDoAud_seStart(Z2SE_OBJ_KNOB_DOOR_LV5_OP, &field_0x5e0, 0, 0); + } + } + } else if (dVar19 == 76.0f) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN11") == 0 || + strcmp(dComIfGp_getStartStageName(), "D_MN11B") == 0 || + strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0) { + mDoAud_seStart(Z2SE_OBJ_KNOB_DOOR_LV5_CL, 0, 0, 0); + + } else if (strcmp(dComIfGp_getStartStageName(), "D_MN01") == 0) { + mDoAud_seStart(Z2SE_OBJ_LV3_KNOB_DR_CL, &field_0x5e0, 0, 0); + } + } + field_0x678 = dComIfGp_evmng_getMyStaffId("CAMERA", 0, 0); + if (field_0x67c != 0 || dComIfGp_evmng_getIsAddvance(field_0x678)) { + field_0x674 = field_0x67f; + field_0x67c = 1; + } else { + field_0x674 = field_0x67e; + } + if (local_48 != 0) { + closeEnd2(); + if (!field_0x5c4->ChkUsed()) { + dComIfG_Bgsp().Regist(field_0x5c4, this); + } + shape_angle.y = current.angle.y; + dComIfGp_evmng_cutEnd(field_0x6cc); + } + break; + case 16: + break; + case 25: + dComIfGp_evmng_cutEnd(field_0x6cc); + break; + case 26: + int msgNo = door_param2_c::getMsgNo(this); + if (door_param2_c::isMsgDoor(this) && msgNo != 0xffff) { + dComIfGp_event_offHindFlag(1); + if (field_0x624.doFlow(this, NULL, 0)) { + dComIfGp_evmng_cutEnd(field_0x6cc); + } + } else { + dComIfGp_evmng_cutEnd(field_0x6cc); + } + break; + case 27: + case 28: + if (field_0x5c0->play()) { + dComIfGp_evmng_cutEnd(field_0x6cc); + } + break; + default: + dComIfGp_evmng_cutEnd(field_0x6cc); + break; + } + return 0; } -#pragma pop /* 80463E30-80463FBC 003370 018C+00 1/1 0/0 0/0 .text orderStopEvent__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::orderStopEvent() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/orderStopEvent__10daDoor20_cFv.s" +int daDoor20_c::orderStopEvent() { + if (field_0x68c == 0) { + if ((door_param2_c::getFrontOption(this) == 3 || + door_param2_c::getFrontOption(this) == 1) && + !door_param2_c::isMsgDoor(this) && door_param2_c::getEventNo(this) != 0xff) + { + field_0x6b8[field_0x6cb] = door_param2_c::getEventNo(this); + field_0x692[field_0x6cb] = + dComIfGp_getEventManager().getEventIdx(this, field_0x6b8[field_0x6cb]); + } + } else if (field_0x68c == 1 && + (door_param2_c::getBackOption(this) == 3 || + door_param2_c::getBackOption(this) == 1) && + !door_param2_c::isMsgDoor(this) && door_param2_c::getEventNo2(this) != 0xff) + { + field_0x6b8[field_0x6cb] = door_param2_c::getEventNo2(this); + field_0x692[field_0x6cb] = + dComIfGp_getEventManager().getEventIdx(this, field_0x6b8[field_0x6cb]); + } + fopAcM_orderOtherEventId(this, field_0x692[field_0x6cb], field_0x6b8[field_0x6cb], 0xffff, 0, + 1); + return 1; } -#pragma pop /* 80463FBC-80464118 0034FC 015C+00 2/2 0/0 0/0 .text actionWait__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::actionWait() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionWait__10daDoor20_cFv.s" +int daDoor20_c::actionWait() { + if (eventInfo.i_checkCommandDoor()) { + initOpenDemo(1); + setAction(ACTION_DEMO); + demoProc(); + } else { + if (mDoorStop.field_0x8 != 0) { + if (eventInfo.checkCommandDemoAccrpt()) { + field_0x6cc = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", 0, 0); + shape_angle.y = current.angle.y; + if (field_0x68c == 1) { + shape_angle.y += 0x7fff; + } + setAction(ACTION_DEMO); + demoProc(); + return 1; + } + if (chkStopOpen()) { + setStopDemo(); + if (orderStopEvent()) { + return 1; + } + } + } + if (mDoorStop.field_0x8 == 0 && chkStopClose()) { + mDoorStop.field_0x8 = 1; + mDoorStop.closeInit(this); + mDoorStop.calcMtx(this); + setAction(ACTION_STOP_CLOSE); + return 1; + } else if (mDoorStop.field_0x8 == 0) { + makeEventId(); + setEventPrm(); + } + } + return 1; } -#pragma pop /* 80464118-8046416C 003658 0054+00 1/1 0/0 0/0 .text actionStopClose__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::actionStopClose() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionStopClose__10daDoor20_cFv.s" +int daDoor20_c::actionStopClose() { + if (mDoorStop.closeProc(this)) { + setAction(ACTION_WAIT); + } + mDoorStop.calcMtx(this); + return 1; } -#pragma pop -/* 8046416C-804641EC 0036AC 0080+00 1/1 0/0 0/0 .text actionDemo__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::actionDemo() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionDemo__10daDoor20_cFv.s" +/* 8046416C-804641EC 0036AC 0080+00 1/1 0/0 0/0 .text */ +int daDoor20_c::actionDemo() { + if (dComIfGp_evmng_endCheck(field_0x692[field_0x6cb])) { + setAction(ACTION_WAIT); + dComIfGp_event_reset(); + shape_angle.y = current.angle.y; + } else { + demoProc(); + } + return 1; } -#pragma pop /* 804641EC-80464240 00372C 0054+00 1/1 0/0 0/0 .text actionInit__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::actionInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/actionInit__10daDoor20_cFv.s" +int daDoor20_c::actionInit() { + setDoorAngleSpec(); + setStop(); + mDoorStop.calcMtx(this); + actionWait(); + setAction(ACTION_WAIT); + return 1; } -#pragma pop /* 80464240-804643B0 003780 0170+00 1/1 0/0 0/0 .text execute__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::execute() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/execute__10daDoor20_cFv.s" +int daDoor20_c::execute() { + field_0x678 = -1; + switch(checkExecute()) { + case 0: + setAction(ACTION_INIT); + break; + case 2: + switch(mAction) { + case ACTION_INIT: + actionInit(); + break; + case ACTION_WAIT: + actionWait(); + break; + case ACTION_STOP_CLOSE: + actionStopClose(); + break; + case ACTION_DEMO: + actionDemo(); + break; + } + break; + case 1: + startDemoProc(); + demoProc(); + break; + } + field_0x67d = dComIfGp_roomControl_getStayNo(); + u32 lightInf; + if (dComIfGp_roomControl_getStayNo() == door_param2_c::getFRoomNo(this)) { + lightInf = door_param2_c::getFLightInf(this); + } else { + lightInf = door_param2_c::getBLightInf(this); + } + tevStr.mLightInf = lightInf; + if (strcmp(dComIfGp_getStartStageName(), "D_MN05") != 0 && strcmp(dComIfGp_getStartStageName(), "D_MN04") != 0) { + field_0x6de.CrrPos(dComIfG_Bgsp()); + } + return 1; } -#pragma pop /* 804643B0-80464638 0038F0 0288+00 1/1 0/0 0/0 .text draw__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::draw() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__10daDoor20_cFv.s" +int daDoor20_c::draw() { + if (!drawCheck(0)) { + if (field_0x5c9 == false) { + field_0x5c9 = true; + dComIfG_Bgsp().Release(field_0x5c4); + } + deleteKey(); + return 1; + } + if (field_0x5c9) { + field_0x5c9 = false; + if (dComIfGp_event_getDoorPartner() != this) { + int rt = dComIfG_Bgsp().Regist(field_0x5c4, this); + JUT_ASSERT(2407, !rt); + } + createKey(); + setDoorAngleSpec(); + } + if (fopAcM_cullingCheck(this)) { + return 1; + } + calcMtx(); + if (!eventInfo.i_checkCommandDoor() && field_0x5c8 != dComIfGp_roomControl_getStayNo()) { + field_0x5c4->Move(); + field_0x5c8 = dComIfGp_roomControl_getStayNo(); + } + g_env_light.settingTevStruct(20, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel1, &tevStr); + dComIfGd_setListBG(); + if (door_param2_c::getKind(this) == 9) { + field_0x584.entry(mModel1->getModelData()); + mDoExt_modelUpdateDL(mModel1); + mDoExt_bckAnmRemove(mModel1->getModelData()); + field_0x5a0.entry(mModel2->getModelData()); + mDoExt_modelUpdateDL(mModel2); + mDoExt_bckAnmRemove(mModel2->getModelData()); + } else { + if (field_0x5c0 != 0) { + field_0x5c0->entry(mModel1->getModelData()); + } + field_0x584.entry(mModel1->getModelData()); + mDoExt_modelUpdateDL(mModel1); + mDoExt_bckAnmRemove(mModel1->getModelData()); + mDoExt_btkAnmRemove(mModel1->getModelData()); + } + dComIfGd_setList(); + if (mDoorStop.field_0x8 != 0) { + mDoorStop.draw(this); + } + return 1; } -#pragma pop /* 80464638-804647BC 003B78 0184+00 3/3 0/0 0/0 .text setDoorAngleSpec__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::setDoorAngleSpec() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setDoorAngleSpec__10daDoor20_cFv.s" +void daDoor20_c::setDoorAngleSpec() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + cXyz cStack_1c; + switch(door_param2_c::getKind(this)) { + case 1: + if (strcmp(dComIfGp_getStartStageName(), "F_SP115") == 0) { + cStack_1c = player->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-home.angle.y); + mDoMtx_stack_c::multVec(&cStack_1c, &cStack_1c); + if (cStack_1c.z > 0.0f) { + field_0x670 = current.angle.y + 0x7fff; + } else { + field_0x670 = current.angle.y; + } + } else { + if (door_param2_c::getFRoomNo(this) == dComIfGp_roomControl_getStayNo()) { + field_0x670 = current.angle.y + 0x7fff; + } else { + field_0x670 = current.angle.y; + } + } + break; + case 0: + case 2: + case 12: + default: + if (door_param2_c::getFRoomNo(this) == dComIfGp_roomControl_getStayNo()) { + field_0x670 = current.angle.y; + } else { + field_0x670 = current.angle.y + 0x7fff; + } + } } -#pragma pop /* 804647BC-80464858 003CFC 009C+00 1/1 0/0 0/0 .text _delete__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::_delete() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/_delete__10daDoor20_cFv.s" +int daDoor20_c::_delete() { + if (heap != NULL && + field_0x5c4->ChkUsed()) + { + dComIfG_Bgsp().Release(field_0x5c4); + } + deleteKey(); + dComIfG_resDelete(&mPhase1, getAlwaysArcName()); + if (getArcName() != NULL) { + dComIfG_resDelete(&mPhase2, getArcName()); + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 804668B0-804668B4 000090 0004+00 0/0 0/0 0/0 .rodata @5338 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5338 = 24.0f; -COMPILER_STRIP_GATE(0x804668B0, &lit_5338); -#pragma pop - -/* 804668B4-804668B8 000094 0004+00 0/0 0/0 0/0 .rodata @5339 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5339 = 19.0f; -COMPILER_STRIP_GATE(0x804668B4, &lit_5339); -#pragma pop - -/* 804668B8-804668BC 000098 0004+00 0/0 0/0 0/0 .rodata @5340 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5340 = 76.0f; -COMPILER_STRIP_GATE(0x804668B8, &lit_5340); -#pragma pop - -/* 804668BC-804668C0 00009C 0004+00 0/1 0/0 0/0 .rodata @5670 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5670 = 107.0f; -COMPILER_STRIP_GATE(0x804668BC, &lit_5670); -#pragma pop - -/* 804668C0-804668C4 0000A0 0004+00 0/1 0/0 0/0 .rodata @5671 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5671 = -17.0f; -COMPILER_STRIP_GATE(0x804668C0, &lit_5671); -#pragma pop - -/* 804668C4-804668C8 0000A4 0004+00 0/1 0/0 0/0 .rodata @5672 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5672 = 35.0f; -COMPILER_STRIP_GATE(0x804668C4, &lit_5672); -#pragma pop - -/* 804668C8-804668CC 0000A8 0004+00 0/1 0/0 0/0 .rodata @5673 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5673 = -35.0f; -COMPILER_STRIP_GATE(0x804668C8, &lit_5673); -#pragma pop /* 80464858-80464AE4 003D98 028C+00 2/2 0/0 0/0 .text createKey__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::createKey() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/createKey__10daDoor20_cFv.s" +int daDoor20_c::createKey() { + if (chkMakeKey() == 1 && field_0x5f0 && field_0x5ec == -1) { + cXyz prevPos(current.pos); + current.pos = home.pos; + csXyz cStack_30(0, 0, 0); + cXyz cStack_28; + int roomNo; + switch (field_0x673) { + case 1: + if (door_param2_c::getFrontOption(this) == 2) { + cStack_28.set(0.0f, 107.0f, 17.0f); + cStack_30.y = 0; + roomNo = door_param2_c::getFRoomNo(this); + } else if (door_param2_c::getBackOption(this) == 2) { + cStack_28.set(0.0f, 107.0f, -17.0f); + cStack_30.y = 0x7fff; + roomNo = door_param2_c::getBRoomNo(this); + } + field_0x5ec = + fopAcM_createChildFromOffset(PROC_Obj_Lv5Key, fopAcM_GetID(this), 0xffffffff, + &cStack_28, roomNo, &cStack_30, &scale, 0xffffffff, 0); + break; + default: + OSReport_Error("シャッタードア：鍵タイプが不明です\n"); // Shutter door: key type unknown + // fallthrough + case 0: + if (door_param2_c::getFrontOption(this) == 2) { + cStack_28.set(0.0f, 0.0f, 35.0f); + cStack_30.y = 0; + roomNo = door_param2_c::getFRoomNo(this); + } else { + if (door_param2_c::getBackOption(this) == 2) { + cStack_28.set(0.0f, 0.0f, -35.0f); + cStack_30.y = 0x7fff; + roomNo = door_param2_c::getBRoomNo(this); + } + } + field_0x5ec = + fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff, + &cStack_28, roomNo, &cStack_30, &scale, 0xffffffff, 0); + } + + current.pos = prevPos; + if (field_0x5ec == -1) { + return 0; + } + } + return 1; } -#pragma pop /* 80464AE4-80464B3C 004024 0058+00 4/4 0/0 0/0 .text deleteKey__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::deleteKey() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/deleteKey__10daDoor20_cFv.s" +int daDoor20_c::deleteKey() { + if (field_0x5ec != -1 && !fpcM_IsCreating(field_0x5ec)) { + fopAcM_delete(field_0x5ec); + field_0x5ec = -1; + } + return 1; } -#pragma pop /* 80464B3C-80464BD8 00407C 009C+00 2/2 0/0 0/0 .text adjoinPlayer__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::adjoinPlayer() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/adjoinPlayer__10daDoor20_cFv.s" +int daDoor20_c::adjoinPlayer() { + int fRoomNo = door_param2_c::getFRoomNo(this); + int bRoomNo = door_param2_c::getBRoomNo(this); + if (fRoomNo == 63 || bRoomNo == 63) { + return 1; + } + if (dComIfGp_roomControl_checkRoomDisp(fRoomNo) || dComIfGp_roomControl_checkRoomDisp(bRoomNo)) + { + return 1; + } else { + return 0; + } } -#pragma pop /* 80464BD8-80464C68 004118 0090+00 1/1 0/0 0/0 .text frontCheckOld__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::frontCheckOld() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheckOld__10daDoor20_cFv.s" +int daDoor20_c::frontCheckOld() { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cSGlobe acStack_30(player->current.pos - current.pos); + cSAngle acStack_34; + acStack_34 = acStack_30.U() - current.angle.y; + s16 sVar3 = acStack_34.Abs(); + if (sVar3 < 0x4000 && sVar3 >= 0) { + return 0; + } else { + return 1; + } } -#pragma pop /* 80464C68-80464CEC 0041A8 0084+00 1/1 0/0 0/0 .text frontCheck__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::frontCheck() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheck__10daDoor20_cFv.s" +int daDoor20_c::frontCheck() { + int stayno = dComIfGp_roomControl_getStayNo(); + int fRoomNo = door_param2_c::getFRoomNo(this); + int bRoomNo = door_param2_c::getBRoomNo(this); + if (fRoomNo == bRoomNo) { + return frontCheckOld(); + } else if (stayno == fRoomNo) { + return 0; + } else if (stayno == bRoomNo) { + return 1; + } else { + return 2; + } } -#pragma pop /* 80464CEC-80464E18 00422C 012C+00 1/1 0/0 0/0 .text drawCheck__10daDoor20_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::drawCheck(int param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/drawCheck__10daDoor20_cFi.s" +int daDoor20_c::drawCheck(int param_1) { + if (!adjoinPlayer() && !eventInfo.i_checkCommandDemoAccrpt() && !eventInfo.i_checkCommandDoor()) + { + return 0; + } + int fRoomNo = door_param2_c::getFRoomNo(this); + int bRoomNo = door_param2_c::getBRoomNo(this); + door_param2_c::getFrontOption(this); + door_param2_c::getBackOption(this); + int stayNo = dComIfGp_roomControl_getStayNo(); + if (fRoomNo == stayNo || bRoomNo == stayNo) { + tevStr.mRoomNo = stayNo; + } else { + if (dComIfGp_roomControl_checkRoomDisp(fRoomNo)) { + tevStr.mRoomNo = fRoomNo; + } else if (dComIfGp_roomControl_checkRoomDisp(bRoomNo)) { + tevStr.mRoomNo = bRoomNo; + } + } + if (field_0x678 != -1) { + tevStr.mRoomNo = field_0x674; + } + fopAcM_SetRoomNo(this, tevStr.mRoomNo); + if (!dComIfGp_roomControl_checkRoomDisp(tevStr.mRoomNo)) { + return 1; + } else { + return 1; + } } -#pragma pop /* 80464E18-80464EC4 004358 00AC+00 1/1 0/0 0/0 .text checkExecute__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::checkExecute() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkExecute__10daDoor20_cFv.s" +int daDoor20_c::checkExecute() { + field_0x68c = frontCheck(); + if (fopAcM_checkStatus(this, 0x1000)) { + return 1; + } + if (eventInfo.i_checkCommandDemoAccrpt() || eventInfo.i_checkCommandDoor()) { + return 2; + } + if (field_0x67d != dComIfGp_roomControl_getStayNo()) { + return 0; + } + if (field_0x68c != 2 && adjoinPlayer()) { + return 2; + } else { + return 0; + } } -#pragma pop /* 80464EC4-80464F64 004404 00A0+00 1/1 0/0 0/0 .text startDemoProc__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::startDemoProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/startDemoProc__10daDoor20_cFv.s" +void daDoor20_c::startDemoProc() { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + field_0x6cc = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", 0, 0); + shape_angle.y = current.angle.y; + JUT_ASSERT(2860, player); + s16 angleDiff = player->home.angle.y - home.angle.y; + if (angleDiff < 0) { + angleDiff = -angleDiff; + } + + // !@bug should probably be -0x1000 + if (angleDiff < 0x1000 && angleDiff > -1000) { + shape_angle.y += 0x7fff; + } } -#pragma pop + +static char* table[19] = { + "DEFAULT_STOP_OPEN", + "DEFAULT_STOP_OPEN", + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, +}; + +/* 80467170-80467180 -00001 0010+00 0/1 0/0 0/0 .data tate_table$5815 */ +static char* tate_table[4] = { + "DEFAULT_SHUTTER_DOOR_10", + "DEFAULT_SHUTTER_DOOR_10", + "DEFAULT_SHUTTER_DOOR_F_STOP", + "DEFAULT_SHUTTER_DOOR_F_STOP", +}; + +/* 80467180-80467190 -00001 0010+00 0/1 0/0 0/0 .data tate_w_table$5816 */ +static char* tate_w_table[4] = { + "WOLF_SHUTTER_DOOR_10", + "WOLF_SHUTTER_DOOR_10", + "WOLF_SHUTTER_DOOR_F_STOP", + "WOLF_SHUTTER_DOOR_F_STOP", +}; + +/* 80467190-804671A0 -00001 0010+00 0/1 0/0 0/0 .data yoko_table$5817 */ +static char* yoko_table[4] = { + "DEFAULT_SHUTTER_DOOR_14", + "DEFAULT_SHUTTER_DOOR_14", + "DEFAULT_SHUTTER_DOOR_F_STOP_14", + "DEFAULT_SHUTTER_DOOR_F_STOP_14", +}; + +/* 804671A0-804671B0 -00001 0010+00 0/1 0/0 0/0 .data yoko_w_table$5818 */ +static char* yoko_w_table[4] = { + "WOLF_SHUTTER_DOOR_14", + "WOLF_SHUTTER_DOOR_14", + "WOLF_SHUTTER_DOOR_F_STOP_14", + "WOLF_SHUTTER_DOOR_F_STOP_14", +}; + +/* 804671B0-804671C0 -00001 0010+00 0/1 0/0 0/0 .data lv8_table$5819 */ +static char* lv8_table[4] = { + "DEFAULT_SHUTTER_DOOR_18", + "DEFAULT_SHUTTER_DOOR_18", + "DEFAULT_SHUTTER_DOOR_F_STOP_18", + "DEFAULT_SHUTTER_DOOR_F_STOP_18", +}; + +/* 804671C0-804671D0 -00001 0010+00 0/1 0/0 0/0 .data lv8_w_table$5820 */ +static char* lv8_w_table[4] = { + "WOLF_SHUTTER_DOOR_18", + "WOLF_SHUTTER_DOOR_18", + "WOLF_SHUTTER_DOOR_F_STOP_18", + "WOLF_SHUTTER_DOOR_F_STOP_18", +}; + +/* 804671D0-804671EC -00001 001C+00 0/1 0/0 0/0 .data knob_table$5821 */ +static char* knob_table[7] = { + "DEFAULT_KNOB_DOOR_F", + "DEFAULT_KNOB_DOOR_B", + "DEFAULT_KNOB_DOOR_F_STOP", + "DEFAULT_KNOB_DOOR_B_STOP", + "DEFAULT_KNOB_DOOR_NOTOPEN_F", + "DEFAULT_KNOB_DOOR_NOTOPEN_B", + "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F", +}; + +/* 804671EC-804671FC -00001 0010+00 0/1 0/0 0/0 .data lv7_table$5822 */ +static char* lv7_table[4] = { + "DEFAULT_SHUTTER_DOOR_20", + "DEFAULT_SHUTTER_DOOR_20", + "DEFAULT_SHUTTER_DOOR_F_STOP_20", + "DEFAULT_SHUTTER_DOOR_F_STOP_20", +}; + +/* 804671FC-8046720C -00001 0010+00 0/1 0/0 0/0 .data lv7_w_table$5823 */ +static char* lv7_w_table[4] = { + "WOLF_SHUTTER_DOOR_20", + "WOLF_SHUTTER_DOOR_20", + "WOLF_SHUTTER_DOOR_F_STOP_20", + "WOLF_SHUTTER_DOOR_F_STOP_20", +}; + +/* 8046720C-8046721C -00001 0010+00 0/1 0/0 0/0 .data lv9_table$5824 */ +static char* lv9_table[4] = { + "DEFAULT_SHUTTER_DOOR_22", + "DEFAULT_SHUTTER_DOOR_22", + "DEFAULT_SHUTTER_DOOR_F_STOP_22", + "DEFAULT_SHUTTER_DOOR_F_STOP_22", +}; + +/* 8046721C-8046722C -00001 0010+00 0/1 0/0 0/0 .data lv9_w_table$5825 */ +static char* lv9_w_table[4] = { + "WOLF_SHUTTER_DOOR_22", + "WOLF_SHUTTER_DOOR_22", + "WOLF_SHUTTER_DOOR_F_STOP_22", + "WOLF_SHUTTER_DOOR_F_STOP_22", +}; + /* 80464F64-804653B0 0044A4 044C+00 2/2 0/0 0/0 .text makeEventId__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::makeEventId() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/makeEventId__10daDoor20_cFv.s" +void daDoor20_c::makeEventId() { + for (int i = 0; i < 19; i++) { + field_0x692[i] = dComIfGp_getEventManager().getEventIdx(this, table[i], 0xff); + field_0x6b8[i] = 0xff; + } + daPy_py_c* player = dComIfGp_getLinkPlayer(); + int i; + switch (field_0x691) { + case 1: + if (player != NULL && player->i_checkNowWolf()) { + int j = 0; + for (i = 4; i < 8; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, tate_w_table[j], field_0x6b8[i]); + } + } else { + int j = 0; + for (i = 4; i < 8; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, tate_table[j], field_0x6b8[i]); + } + } + break; + case 3: + if (player != NULL && player->i_checkNowWolf()) { + int j = 0; + for (i = 4; i < 8; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, yoko_w_table[j], field_0x6b8[i]); + } + } else { + int j = 0; + for (i = 4; i < 8; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, yoko_table[j], field_0x6b8[i]); + } + } + break; + case 2: + if (player != NULL && player->i_checkNowWolf()) { + int j = 0; + for (i = 4; i < 8; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, lv8_w_table[j], field_0x6b8[i]); + } + } else { + int j = 0; + for (i = 4; i < 8; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, lv8_table[j], field_0x6b8[i]); + } + } + break; + case 4: + int j = 0; + for (i = 12; i < 19; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, knob_table[j], field_0x6b8[i]); + } + break; + case 5: + if (player != NULL && player->i_checkNowWolf()) { + int j = 0; + for (i = 4; i < 8; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, lv7_w_table[j], field_0x6b8[i]); + } + } else { + int j = 0; + for (i = 4; i < 8; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, lv7_table[j], field_0x6b8[i]); + } + } + break; + case 6: + if (player != NULL && player->i_checkNowWolf()) { + int j = 0; + for (i = 4; i < 8; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, lv9_w_table[j], field_0x6b8[i]); + } + } else { + int j = 0; + for (i = 4; i < 8; i++, j++) { + field_0x692[i] = + dComIfGp_getEventManager().getEventIdx(this, lv9_table[j], field_0x6b8[i]); + } + } + break; + } } -#pragma pop /* 804653B0-80465400 0048F0 0050+00 1/1 0/0 0/0 .text initProc__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::initProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/initProc__10daDoor20_cFv.s" +void daDoor20_c::initProc() { + field_0x680.set(cM_ssin(home.angle.y), 0.0f, cM_scos(home.angle.y)); + makeEventId(); } -#pragma pop /* 80465400-80465490 004940 0090+00 1/1 0/0 0/0 .text initOpenDemo__10daDoor20_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::initOpenDemo(int param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/initOpenDemo__10daDoor20_cFi.s" +void daDoor20_c::initOpenDemo(int param_1) { + shape_angle.y = current.angle.y; + if (field_0x68c == 1) { + shape_angle.y += 0x7fff; + } + field_0x6cc = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", 0, 0); + if (param_1 != 0) { + dComIfGp_event_onEventFlag(2); + } } -#pragma pop /* 80465490-80465620 0049D0 0190+00 1/1 0/0 0/0 .text checkArea__10daDoor20_cFfff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::checkArea(f32 param_0, f32 param_1, f32 param_2) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkArea__10daDoor20_cFfff.s" +int daDoor20_c::checkArea(f32 param_1, f32 param_2, f32 param_3) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz acStack_68; + cXyz cStack_74(player->attention_info.position); + cStack_74.y = player->current.pos.y; + acStack_68 = cStack_74 - current.pos; + f32 dVar10 = acStack_68.abs2XZ(); + if (dVar10 > param_3) { + return 0; + } + acStack_68.normalize(); + f32 dVar11 = acStack_68.inprodXZ(field_0x680); + dVar11 = (dVar11 * (dVar10 * dVar11)); + if (dVar11 > param_2) { + return 0; + } + if (dVar10 - dVar11 > param_1) { + return 0; + } + s16 sVar8 = current.angle.y; + if (field_0x68c == 1) { + sVar8 += 0x7fff; + } + if (abs((s16)(sVar8 - player->current.angle.y)) < 0x5000) { + return 0; + } else { + return 1; + } } -#pragma pop /* 80465620-804656F0 004B60 00D0+00 2/2 0/0 0/0 .text openInitCom__10daDoor20_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::openInitCom(int param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInitCom__10daDoor20_cFi.s" +void daDoor20_c::openInitCom(int param_1) { + dComIfGp_getPlayer(0); + u8 fRoomNo = door_param2_c::getFRoomNo(this); + u8 bRoomNo = door_param2_c::getBRoomNo(this); + if (field_0x68c == 0) { + field_0x67e = fRoomNo; + field_0x67f = bRoomNo; + } else { + field_0x67e = bRoomNo; + field_0x67f = fRoomNo; + } + if (field_0x67e != field_0x67f && field_0x67e != 63 && field_0x67f != 63) { + dComIfGp_roomControl_offStatusFlag(field_0x67f, 8); + dComIfGp_roomControl_onStatusFlag(field_0x67e, 0x20); + } + dStage_roomControl_c::setNextStayNo(field_0x67f); + Z2GetAudioMgr()->setSceneExist(false); } -#pragma pop /* 804656F0-8046581C 004C30 012C+00 2/2 0/0 0/0 .text closeEndCom__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::closeEndCom() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeEndCom__10daDoor20_cFv.s" +void daDoor20_c::closeEndCom() { + if (field_0x67e != field_0x67f && field_0x67e != 63 && + field_0x67f != 63) + { + dComIfGp_roomControl_onStatusFlag(field_0x67e, 8); + } + cXyz cStack_2c; + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz cStack_38 = player->current.pos - current.pos; + f32 dVar8 = cStack_38.inprodXZ(field_0x680); + getRestartPos(&cStack_2c); + s32 roomNo = fopAcM_GetRoomNo(player); + s16 angle; + if (dVar8 > 0.0f) { + angle = current.angle.y; + } else { + angle = current.angle.y + 0x8000; + } + dComIfGs_setRestartRoom(cStack_2c, angle, roomNo); + Z2GetAudioMgr()->setSceneExist(true); } -#pragma pop /* 8046581C-80465918 004D5C 00FC+00 1/1 0/0 0/0 .text getRestartPos__10daDoor20_cFP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getRestartPos(cXyz* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getRestartPos__10daDoor20_cFP4cXyz.s" +void daDoor20_c::getRestartPos(cXyz* param_1) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz acStack_78 = player->current.pos - current.pos; + f32 dVar9 = acStack_78.inprodXZ(field_0x680); + f32 fVar1; + if (daPy_py_c::i_checkNowWolf()) { + if (dVar9 < 0.0f) { + fVar1 = 300.0f; + } else { + fVar1 = -300.0f; + } + } else { + if (dVar9 < 0.0f) { + fVar1 = 200.0f; + } else { + fVar1 = -200.0f; + } + } + param_1->x = current.pos.x - fVar1 * field_0x680.x; + param_1->y = current.pos.y; + param_1->z = current.pos.z - fVar1 * field_0x680.z; } -#pragma pop + +/* 8046722C-804672A0 -00001 0074+00 1/1 0/0 0/0 .data action_table$6155 */ +static char* action_table[29] = { + "WAIT", + "STOP_OPEN", + "STOP_CLOSE", + "OPEN", + "CLOSE", + "SMOKE", + "SMOKE_END", + "SETGOAL", + "UNLOCK", + "SETSTART", + "SETANGLE", + "ADJUSTMENT", + "OPEN_PUSH", + "OPEN_PULL", + "OPEN_PUSH2", + "OPEN_PULL2", + "TALK", + "SETSTART_PUSH", + "SETSTART_PULL", + "END_CHECK", + "DROP_BF", + "DROP_AF", + "DELETE_LOCK", + "OPEN_INIT", + "ADJUSTMENT2", + "NOT_OPEN", + "MESSAGE", + "LIGHT_ANM", + "LIGHT_ANM2", +}; /* 80465918-80465960 004E58 0048+00 1/0 0/0 0/0 .text getDemoAction__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::getDemoAction() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/getDemoAction__10daDoor20_cFv.s" +int daDoor20_c::getDemoAction() { + return dComIfGp_evmng_getMyActIdx(field_0x6cc, action_table, 29, 0, 0); } -#pragma pop /* 80465960-80465AC0 004EA0 0160+00 1/1 0/0 0/0 .text setGoal__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::setGoal() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setGoal__10daDoor20_cFv.s" +void daDoor20_c::setGoal() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + cXyz local_1c = player->current.pos - current.pos; + cXyz local_28; + s16 homeY = home.angle.y; + mDoMtx_stack_c::YrotS(-home.angle.y); + mDoMtx_stack_c::multVec(&local_1c, &local_1c); + local_1c.x = local_1c.x * 0.8f; + local_1c.y = 0.0f; + if (daPy_py_c::i_checkNowWolf()) { + local_1c.z = -300.0f; + } else { + local_1c.z = -200.0f; + } + if (field_0x68c == 1) { + local_1c.z = -local_1c.z; + } + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(homeY); + mDoMtx_stack_c::multVec(&local_1c, &local_1c); + local_28.x = local_1c.x; + local_28.y = 0.0f; + local_28.z = local_1c.z; + dComIfGp_evmng_setGoal(&local_28); } -#pragma pop /* 80465AC0-80465B34 005000 0074+00 2/2 0/0 0/0 .text chkMakeStop__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::chkMakeStop() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkMakeStop__10daDoor20_cFv.s" +int daDoor20_c::chkMakeStop() { + u8 frontOption = door_param2_c::getFrontOption(this); + u8 backOption = door_param2_c::getBackOption(this); + if (frontOption == 1 || frontOption == 3 || backOption == 1 || backOption == 3) { + return 1; + } else { + return 0; + } } -#pragma pop /* 80465B34-80465C04 005074 00D0+00 2/2 0/0 0/0 .text chkStopF__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::chkStopF() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopF__10daDoor20_cFv.s" +int daDoor20_c::chkStopF() { + int fRoomNo = door_param2_c::getFRoomNo(this); + u8 frontOption = door_param2_c::getFrontOption(this); + u8 swBit = door_param2_c::getSwbit(this); + if (swBit == 0xff) { + return 0; + } + switch (frontOption) { + case 1: + case 3: + if (!dComIfGp_roomControl_checkStatusFlag(fRoomNo, 1)) { + return -1; + } + return dComIfGs_isSwitch(swBit, fRoomNo) == 0; + } + return 0; } -#pragma pop /* 80465C04-80465CC0 005144 00BC+00 2/2 0/0 0/0 .text chkStopB__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::chkStopB() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopB__10daDoor20_cFv.s" +int daDoor20_c::chkStopB() { + u8 swBit = door_param2_c::getSwbit2(this); + int bRoomNo = door_param2_c::getBRoomNo(this); + u8 backOption = door_param2_c::getBackOption(this); + if (swBit == 0xff) { + return 0; + } + if (backOption != 1 && backOption != 3) { + return 0; + } + if (!dComIfGp_roomControl_checkStatusFlag(bRoomNo, 1)) { + return -1; + } + return dComIfGs_isSwitch(swBit, bRoomNo) == 0; } -#pragma pop /* 80465CC0-80465DA8 005200 00E8+00 1/1 0/0 0/0 .text setStopDemo__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::setStopDemo() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setStopDemo__10daDoor20_cFv.s" +void daDoor20_c::setStopDemo() { + u8 frontOption = door_param2_c::getFrontOption(this); + u8 backOption = door_param2_c::getBackOption(this); + int isMsgDoor = door_param2_c::isMsgDoor(this); + if (field_0x68c == 0) { + if (frontOption == 3 || frontOption == 1) { + u8 eventNo = door_param2_c::getEventNo(this); + if (isMsgDoor == 0 && eventNo != 0xff) { + field_0x6cb = 2; + } else { + field_0x6cb = 0; + } + } + } else if (backOption == 3 || backOption == 1) { + u8 eventNo = door_param2_c::getEventNo2(this); + if (isMsgDoor == 0 && eventNo != 0xff) { + field_0x6cb = 3; + } else { + field_0x6cb = 1; + } + } } -#pragma pop /* 80465DA8-80465E8C 0052E8 00E4+00 1/1 0/0 0/0 .text chkStopClose__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::chkStopClose() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopClose__10daDoor20_cFv.s" +int daDoor20_c::chkStopClose() { + if (mDoorStop.field_0x0 == 0) { + return 0; + } + int frontOption = door_param2_c::getFrontOption(this); + int backOption = door_param2_c::getBackOption(this); + u8 swBit; + u8 roomNo; + if (field_0x68c == 0) { + if (frontOption != 1) { + return 0; + } + swBit = door_param2_c::getSwbit(this); + roomNo = door_param2_c::getFRoomNo(this); + } else { + if (backOption != 1) { + return 0; + } + swBit = door_param2_c::getSwbit2(this); + roomNo = door_param2_c::getBRoomNo(this); + } + if (swBit == 0xff) { + return 0; + } + if (dComIfGs_isSwitch(swBit, roomNo)) { + return 0; + } else { + return 1; + } } -#pragma pop /* 80465E8C-80465F20 0053CC 0094+00 3/3 0/0 0/0 .text setStop__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::setStop() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setStop__10daDoor20_cFv.s" +void daDoor20_c::setStop() { + if (chkMakeStop() && mDoorStop.field_0x0 != 0) { + mDoorStop.field_0x9 = field_0x68c; + if (field_0x68c == 0) { + mDoorStop.field_0x8 = chkStopF(); + mDoorStop.field_0xa = chkStopB(); + } else { + mDoorStop.field_0x8 = chkStopB(); + mDoorStop.field_0xa = chkStopF(); + } + mDoorStop.field_0x4 = 0.0f; + } } -#pragma pop /* 80465F20-8046609C 005460 017C+00 1/1 0/0 0/0 .text chkStopOpen__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::chkStopOpen() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkStopOpen__10daDoor20_cFv.s" +int daDoor20_c::chkStopOpen() { + u8 frontOption = door_param2_c::getFrontOption(this); + u8 backOption = door_param2_c::getBackOption(this); + u8 swBit; + u8 roomNo; + if (field_0x68c == 0) { + swBit = door_param2_c::getSwbit(this); + roomNo = door_param2_c::getFRoomNo(this); + } else { + swBit = door_param2_c::getSwbit2(this); + roomNo = door_param2_c::getBRoomNo(this); + } + if ((field_0x68c == 0 && frontOption == 3) || (field_0x68c == 1 && backOption == 3)) { + if (dComIfGp_event_runCheck() == 0 || (field_0x68d == 0)) { + if (dComIfGp_roomControl_checkRoomDisp(roomNo) && + fopAcM_myRoomSearchEnemy(roomNo) == NULL) + { + if (field_0x68d != 0) { + field_0x68d--; + return 0; + } + if (swBit != 0xff) { + g_dComIfG_gameInfo.info.onSwitch(swBit, roomNo); + } + return 1; + } + field_0x68d = 65; + } + } else if (swBit != 0xff && dComIfGs_isSwitch(swBit, roomNo)) { + return 1; + } + return 0; } -#pragma pop /* 8046609C-804660F4 0055DC 0058+00 3/3 0/0 0/0 .text chkMakeKey__10daDoor20_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDoor20_c::chkMakeKey() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/chkMakeKey__10daDoor20_cFv.s" +int daDoor20_c::chkMakeKey() { + if (door_param2_c::getFrontOption(this) == 2 || door_param2_c::getBackOption(this) == 2) { + return 1; + } else { + return 0; + } } -#pragma pop /* 804660F4-804661B0 005634 00BC+00 5/5 0/0 0/0 .text calcMtx__12dDoor_stop_cFP10daDoor20_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop_c::calcMtx(daDoor20_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/calcMtx__12dDoor_stop_cFP10daDoor20_c.s" +void dDoor_stop_c::calcMtx(daDoor20_c* i_this) { + if (field_0x8 == 0 || field_0x0 == NULL) { + return; + } + cXyz local_18(i_this->current.pos); + mDoMtx_stack_c::transS(local_18.x, local_18.y + field_0x4, local_18.z); + mDoMtx_stack_c::YrotM(i_this->current.angle.y); + if (field_0x9 == 1) { + mDoMtx_stack_c::YrotM(0x7fff); + } + field_0x0->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop /* 804661B0-804662C0 0056F0 0110+00 2/2 0/0 0/0 .text closeInit__12dDoor_stop_cFP10daDoor20_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop_c::closeInit(daDoor20_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit__12dDoor_stop_cFP10daDoor20_c.s" +void dDoor_stop_c::closeInit(daDoor20_c* i_this) { + field_0x4 = 300.0f; + i_this->speedF = 0; + field_0xb = 1; + if (strcmp(dComIfGp_getStartStageName(), "D_MN05") == 0) { + fopAcM_seStart(i_this, Z2SE_OBJ_DOOR_WOOD_BAR_CL, 0); + } else { + fopAcM_seStart(i_this, Z2SE_OBJ_DOOR_STEEL_BAR_CL, 0); + } } -#pragma pop - -/* ############################################################################################## */ -/* 804668CC-804668D0 0000AC 0004+00 0/1 0/0 0/0 .rodata @6377 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_6377 = 60.0f; -COMPILER_STRIP_GATE(0x804668CC, &lit_6377); -#pragma pop - -/* 804668D0-804668D4 0000B0 0004+00 0/1 0/0 0/0 .rodata @6378 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_6378 = 6.0f; -COMPILER_STRIP_GATE(0x804668D0, &lit_6378); -#pragma pop /* 804662C0-8046634C 005800 008C+00 2/2 0/0 0/0 .text closeProc__12dDoor_stop_cFP10daDoor20_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop_c::closeProc(daDoor20_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeProc__12dDoor_stop_cFP10daDoor20_c.s" +int dDoor_stop_c::closeProc(daDoor20_c* i_this) { + if (field_0xb == 0) { + return 1; + } + cLib_chaseF(&i_this->speedF, 60.0f, 6.0f); + if (cLib_chaseF(&field_0x4, 0.0f, i_this->speedF)) { + field_0xb = 0; + return 2; + } + return 0; } -#pragma pop /* 8046634C-80466458 00588C 010C+00 1/1 0/0 0/0 .text openInit__12dDoor_stop_cFP10daDoor20_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop_c::openInit(daDoor20_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openInit__12dDoor_stop_cFP10daDoor20_c.s" +void dDoor_stop_c::openInit(daDoor20_c* i_this) { + field_0x4 = 0.0f; + i_this->speedF = 0; + field_0xb = 1; + if (strcmp(dComIfGp_getStartStageName(), "D_MN05") == 0) { + fopAcM_seStart(i_this, Z2SE_OBJ_DOOR_WOOD_BAR_OP, 0); + } else { + fopAcM_seStart(i_this, Z2SE_OBJ_DOOR_STEEL_BAR, 0); + } } -#pragma pop - -/* ############################################################################################## */ -/* 804668D4-804668D8 0000B4 0004+00 0/1 0/0 0/0 .rodata @6409 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_6409 = 4.0f; -COMPILER_STRIP_GATE(0x804668D4, &lit_6409); -#pragma pop /* 80466458-804664E8 005998 0090+00 1/1 0/0 0/0 .text openProc__12dDoor_stop_cFP10daDoor20_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop_c::openProc(daDoor20_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/openProc__12dDoor_stop_cFP10daDoor20_c.s" +int dDoor_stop_c::openProc(daDoor20_c* i_this) { + if (field_0xb == 0) { + return 1; + } + cLib_chaseF(&i_this->speedF, 30.0f, 4.0f); + ; + if (cLib_chaseF(&field_0x4, 300.0f, i_this->speedF)) { + field_0xb = 0; + field_0x8 = 0; + return 2; + } + return 0; } -#pragma pop /* 804664E8-80466538 005A28 0050+00 1/1 0/0 0/0 .text create__12dDoor_stop_cFP10daDoor20_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop_c::create(daDoor20_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/create__12dDoor_stop_cFP10daDoor20_c.s" +int dDoor_stop_c::create(daDoor20_c* i_this) { + J3DModelData* stopModelData = i_this->getStopModelData(); + JUT_ASSERT(3923, stopModelData != 0); + field_0x0 = mDoExt_J3DModel__create(stopModelData, 0x80000, 0x11000084); + return field_0x0 != NULL ? 1 : 0; } -#pragma pop /* 80466538-804665B0 005A78 0078+00 1/1 0/0 0/0 .text draw__12dDoor_stop_cFP10daDoor20_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop_c::draw(daDoor20_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__12dDoor_stop_cFP10daDoor20_c.s" +void dDoor_stop_c::draw(daDoor20_c* i_this) { + if (field_0x0 != NULL) { + g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(field_0x0, &i_this->tevStr); + mDoExt_modelUpdateDL(field_0x0); + } } -#pragma pop /* 804665B0-804665D0 005AF0 0020+00 1/0 0/0 0/0 .text daDoor20_Draw__FP10daDoor20_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDoor20_Draw(daDoor20_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Draw__FP10daDoor20_c.s" +static int daDoor20_Draw(daDoor20_c* i_this) { + return i_this->draw(); } -#pragma pop /* 804665D0-804665F4 005B10 0024+00 1/0 0/0 0/0 .text daDoor20_Execute__FP10daDoor20_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDoor20_Execute(daDoor20_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Execute__FP10daDoor20_c.s" +static int daDoor20_Execute(daDoor20_c* i_this) { + i_this->execute(); + return 1; } -#pragma pop /* 804665F4-80466618 005B34 0024+00 1/0 0/0 0/0 .text daDoor20_Delete__FP10daDoor20_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDoor20_Delete(daDoor20_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Delete__FP10daDoor20_c.s" +static int daDoor20_Delete(daDoor20_c* i_this) { + i_this->_delete(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8046732C-8046733C 0004B0 0010+00 1/1 0/0 0/0 .data __vt__10daDoor20_c */ -SECTION_DATA extern void* __vt__10daDoor20_c[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)getDzbName__10daDoor20_cFv, - (void*)getDemoAction__10daDoor20_cFv, -}; /* 80466618-8046670C 005B58 00F4+00 1/0 0/0 0/0 .text daDoor20_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDoor20_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/daDoor20_Create__FP10fopAc_ac_c.s" +static int daDoor20_Create(fopAc_ac_c* i_this) { + fopAcM_SetupActor(i_this, daDoor20_c); + return static_cast(i_this)->create(); } -#pragma pop - -/* 8046670C-8046677C 005C4C 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 8046677C-804667EC 005CBC 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 804667EC-80466808 005D2C 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_804667EC(void* _this, u8* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_804667EC.s" -} -#pragma pop - -/* 80466808-80466810 005D48 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80466808() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_80466808.s" -} -#pragma pop - -/* 80466810-80466818 005D50 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80466810() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_80466810.s" -} -#pragma pop /* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ + +/* 804672A0-804672C0 -00001 0020+00 1/0 0/0 0/0 .data l_daDoor20_Method */ +static actor_method_class l_daDoor20_Method = { + (process_method_func)daDoor20_Create, (process_method_func)daDoor20_Delete, + (process_method_func)daDoor20_Execute, (process_method_func)NULL, + (process_method_func)daDoor20_Draw, +}; + +/* 804672C0-804672F0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_DOOR20 */ +extern actor_process_profile_definition g_profile_DOOR20 = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_DOOR20, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daDoor20_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 294, // mPriority + &l_daDoor20_Method, // sub_method + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; diff --git a/rel/d/a/door/d_a_door_spiral/d_a_door_spiral.cpp b/rel/d/a/door/d_a_door_spiral/d_a_door_spiral.cpp index 53a4a8ad5a..0533573e85 100644 --- a/rel/d/a/door/d_a_door_spiral/d_a_door_spiral.cpp +++ b/rel/d/a/door/d_a_door_spiral/d_a_door_spiral.cpp @@ -1,32 +1,23 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_door_spiral +// Door Spiral // #include "rel/d/a/door/d_a_door_spiral/d_a_door_spiral.h" -#include "dol2asm.h" +#include "f_op/f_op_actor.h" -// -// Forward References: -// - -extern "C" extern void* g_profile_SPIRAL_DOOR[12]; - -// -// External References: -// - -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 804673E0-80467410 -00001 0030+00 0/0 0/0 1/0 .data g_profile_SPIRAL_DOOR */ -SECTION_DATA extern void* g_profile_SPIRAL_DOOR[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, (void*)0x022D0000, (void*)&g_fpcLf_Method, - (void*)0x000006B0, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x012D0000, (void*)NULL, (void*)0x00044000, (void*)0x00060000, +extern actor_process_profile_definition g_profile_SPIRAL_DOOR = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_SPIRAL_DOOR, // mProcName + &g_fpcLf_Method.mBase, // sub_method + 0x6b0, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 301, // mPriority + NULL, // sub_method + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_6_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp index 73eea7f9ba..e86ab32782 100644 --- a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp +++ b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp @@ -12,66 +12,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 8026745C */ void operator+=(csXyz&); -}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjLv5Key_c { - /* 80B9B9B8 */ void CreateHeap(); - /* 80B9BA94 */ void Init(); - /* 80B9BB5C */ void setBgc(); - /* 80B9BBCC */ void initCcSph(); - /* 80B9BC2C */ void setCcSph(); - /* 80B9BD30 */ void setAction(void (daObjLv5Key_c::*)(int), int); - /* 80B9BDD8 */ void Action(); - /* 80B9BE24 */ void Wait(int); - /* 80B9BF08 */ void Open(int); - /* 80B9BFDC */ void Fall(int); - /* 80B9C17C */ void Land(int); - /* 80B9C268 */ void Shake(int); - /* 80B9C3B0 */ void TranslateByNowDirect(f32, f32, f32); - /* 80B9C410 */ void Execute(); - /* 80B9C450 */ void Draw(); - /* 80B9C500 */ void Delete(); - /* 80B9C534 */ void setBaseMtx(); - /* 80B9C5EC */ void create_1st(); -}; - -struct dKy_tevstr_c {}; - -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 { @@ -136,17 +76,6 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80B9C898 */ ~J3DFrameCtrl(); -}; - // // Forward References: // @@ -226,17 +155,12 @@ extern "C" void SetR__8cM3dGSphFf(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __ptmf_test(); extern "C" void __ptmf_cmpr(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -244,8 +168,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; // // Declarations: @@ -763,7 +685,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +asm void __dt__12J3DFrameCtrlFv() { +//asm J3DFrameCtrl::~J3DFrameCtrl() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp b/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp index b7edf5f8c0..3a20171b4f 100644 --- a/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp +++ b/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp @@ -57,7 +57,7 @@ int daObjWindow_c::Create() { mCyl.Set(l_cyl_src); mCyl.SetStts(&mStts); } - tevStr.field_0x364 = getLightInf(); + tevStr.mLightInf = getLightInf(); return 1; } diff --git a/src/d/d_door_param2.cpp b/src/d/d_door_param2.cpp index cf2ebd3d5d..af7806c696 100644 --- a/src/d/d_door_param2.cpp +++ b/src/d/d_door_param2.cpp @@ -7,7 +7,7 @@ #include "f_op/f_op_actor_mng.h" /* 8003A188-8003A194 034AC8 000C+00 0/0 0/0 17/17 .text getKind__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::getKind(fopAc_ac_c* i_actor) { +int door_param2_c::getKind(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 0, 5); } @@ -31,13 +31,13 @@ u8 door_param2_c::getBackOption(fopAc_ac_c* i_actor) { /* 8003A1B8-8003A1C4 034AF8 000C+00 0/0 0/0 19/19 .text getFRoomNo__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::getFRoomNo(fopAc_ac_c* i_actor) { +u8 door_param2_c::getFRoomNo(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 13, 6); } /* 8003A1C4-8003A1D0 034B04 000C+00 0/0 0/0 10/10 .text getBRoomNo__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::getBRoomNo(fopAc_ac_c* i_actor) { +u8 door_param2_c::getBRoomNo(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 19, 6); } @@ -58,7 +58,7 @@ u8 door_param2_c::getSwbit3(fopAc_ac_c* i_actor) { } /* 8003A1F4-8003A200 034B34 000C+00 0/0 0/0 4/4 .text isMsgDoor__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::isMsgDoor(fopAc_ac_c* i_actor) { +int door_param2_c::isMsgDoor(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 31, 1); } @@ -69,7 +69,7 @@ u8 door_param2_c::getEventNo(fopAc_ac_c* i_actor) { /* 8003A20C-8003A218 034B4C 000C+00 0/0 0/0 2/2 .text getEventNo2__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) { +u8 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) { return (i_actor->home.angle.x >> 8) & 0xFF; } diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 94b12d9162..bd3c6a7b25 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -4264,7 +4264,7 @@ void dScnKy_env_light_c::settingTevStruct(int i_tevstrType, cXyz* param_1, dKy_t if (i_tevstr->field_0x37a != 20) { i_tevstr->field_0x374 = g_env_light.mPaletteTerrainLightEffect; } else { - switch (i_tevstr->field_0x364) { + switch (i_tevstr->mLightInf) { case 0: i_tevstr->field_0x374 = 0.2f; break; diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index adfe8ee578..c957e84bc2 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -1172,7 +1172,7 @@ bool dPa_modelEcallBack::model_c::set(J3DModelData* param_0, dKy_tevstr_c const& *(Arr*)&field_0x8.mColorK0 = *(Arr*)¶m_1.mColorK0; *(Arr*)&field_0x8.mFogColor = *(Arr*)¶m_1.mFogColor; *(int*)&field_0x8.field_0x360 = *(int*)¶m_1.field_0x360; - *(int*)&field_0x8.field_0x364 = *(int*)¶m_1.field_0x364; + *(int*)&field_0x8.mLightInf = *(int*)¶m_1.mLightInf; field_0x8.mFogStartZ = param_1.mFogStartZ; field_0x8.mFogEndZ = param_1.mFogEndZ;