From 392f6101ca8d9187768d9764b14f8dce6bb7be59 Mon Sep 17 00:00:00 2001 From: TakaRikka Date: Wed, 2 Aug 2023 01:36:58 -0700 Subject: [PATCH] remove asm --- .../CalcTevColor__18dScnKy_env_light_cFv.s | 39 ----- .../GetTimePass__20dStage_roomControl_cFv.s | 3 - .../dKy_Delete__FP17sub_kankyo__class.s | 20 --- .../dKy_Draw__FP17sub_kankyo__class.s | 12 -- .../dKy_Execute__FP17sub_kankyo__class.s | 14 -- .../dKy_Global_amb_set__FP12dKy_tevstr_c.s | 69 -------- .../d_kankyo/dKy_actor_addcol_set__Fsssf.s | 39 ----- .../dKy_bgparts_activelight_cut__Fi.s | 8 - ...ts_activelight_set__FP15LIGHT_INFLUENCEi.s | 29 ---- ...scroll__FP12J3DModelDataP12dKy_tevstr_ci.s | 108 ------------- ...dalkmist_inf_cut__FP18DALKMIST_INFLUENCE.s | 14 -- ...dalkmist_inf_set__FP18DALKMIST_INFLUENCE.s | 24 --- .../dKy_efplight_cut__FP15LIGHT_INFLUENCE.s | 17 -- .../dKy_efplight_set__FP15LIGHT_INFLUENCE.s | 37 ----- ...eck__FP30stage_pure_lightvec_info_classc.s | 36 ----- ...ock_light_every_set__FP15LIGHT_INFLUENCE.s | 25 --- .../dKy_plight_cut__FP15LIGHT_INFLUENCE.s | 22 --- ...plight_priority_set__FP15LIGHT_INFLUENCE.s | 41 ----- .../dKy_plight_set__FP15LIGHT_INFLUENCE.s | 37 ----- ...v_light_cFP12J3DModelDataP12dKy_tevstr_c.s | 69 -------- ...oExt_setupStageTexture__FP12J3DModelData.s | 152 ----------------- .../daKytag08_Delete__FP13kytag08_class.s | 54 ------- .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 -- .../CreateHeap__11daObjSwPr_cFv.s | 33 ---- .../Create__11daObjSwPr_cFv.s | 108 ------------- .../d_a_obj_swpropeller/__dt__8cM3dGAabFv.s | 20 --- .../d_a_obj_swpropeller/__dt__8cM3dGCylFv.s | 20 --- .../_delete__11daObjSwPr_cFv.s | 17 -- .../daObjSwPr_Create__FP10fopAc_ac_c.s | 9 -- .../daObjSwPr_Delete__FP11daObjSwPr_c.s | 9 -- .../daObjSwPr_Draw__FP11daObjSwPr_c.s | 9 -- .../daObjSwPr_Execute__FP11daObjSwPr_c.s | 9 -- .../draw__11daObjSwPr_cFv.s | 26 --- .../execute__11daObjSwPr_cFv.s | 82 ---------- .../execute_type_boomerang__11daObjSwPr_cFv.s | 148 ----------------- .../execute_type_wind__11daObjSwPr_cFv.s | 153 ------------------ .../d_a_obj_swpropeller/func_8059A888.s | 132 --------------- .../initBaseMtx__11daObjSwPr_cFv.s | 16 -- .../nodeCallBack__FP8J3DJointi.s | 46 ------ .../setBaseMtx__11daObjSwPr_cFv.s | 20 --- .../setRotateTime__11daObjSwPr_cFv.s | 5 - .../switchCtrl__11daObjSwPr_cFv.s | 37 ----- 42 files changed, 1777 deletions(-) delete mode 100644 asm/d/kankyo/d_kankyo/CalcTevColor__18dScnKy_env_light_cFv.s delete mode 100644 asm/d/kankyo/d_kankyo/GetTimePass__20dStage_roomControl_cFv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_Delete__FP17sub_kankyo__class.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_Draw__FP17sub_kankyo__class.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_Execute__FP17sub_kankyo__class.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_Global_amb_set__FP12dKy_tevstr_c.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_actor_addcol_set__Fsssf.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_bgparts_activelight_cut__Fi.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_dalkmist_inf_cut__FP18DALKMIST_INFLUENCE.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_dalkmist_inf_set__FP18DALKMIST_INFLUENCE.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_efplight_cut__FP15LIGHT_INFLUENCE.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_efplight_set__FP15LIGHT_INFLUENCE.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_mock_light_every_set__FP15LIGHT_INFLUENCE.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_plight_cut__FP15LIGHT_INFLUENCE.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_plight_priority_set__FP15LIGHT_INFLUENCE.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_plight_set__FP15LIGHT_INFLUENCE.s delete mode 100644 asm/d/kankyo/d_kankyo/setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c.s delete mode 100644 asm/m_Do/m_Do_ext/mDoExt_setupStageTexture__FP12J3DModelData.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Delete__FP13kytag08_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/CreateHeap__11daObjSwPr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/Create__11daObjSwPr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/_delete__11daObjSwPr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Delete__FP11daObjSwPr_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Draw__FP11daObjSwPr_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Execute__FP11daObjSwPr_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/draw__11daObjSwPr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute__11daObjSwPr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute_type_boomerang__11daObjSwPr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute_type_wind__11daObjSwPr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/func_8059A888.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/initBaseMtx__11daObjSwPr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/nodeCallBack__FP8J3DJointi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/setBaseMtx__11daObjSwPr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/setRotateTime__11daObjSwPr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/switchCtrl__11daObjSwPr_cFv.s diff --git a/asm/d/kankyo/d_kankyo/CalcTevColor__18dScnKy_env_light_cFv.s b/asm/d/kankyo/d_kankyo/CalcTevColor__18dScnKy_env_light_cFv.s deleted file mode 100644 index 07d60d290b..0000000000 --- a/asm/d/kankyo/d_kankyo/CalcTevColor__18dScnKy_env_light_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801A4E90: -/* 801A4E90 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801A4E94 7C 08 02 A6 */ mflr r0 -/* 801A4E98 90 01 00 34 */ stw r0, 0x34(r1) -/* 801A4E9C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801A4EA0 93 C1 00 28 */ stw r30, 0x28(r1) -/* 801A4EA4 7C 7E 1B 78 */ mr r30, r3 -/* 801A4EA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801A4EAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801A4EB0 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 801A4EB4 28 1F 00 00 */ cmplwi r31, 0 -/* 801A4EB8 41 82 00 54 */ beq lbl_801A4F0C -/* 801A4EBC C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 801A4EC0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 801A4EC4 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 801A4EC8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 801A4ECC C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 801A4ED0 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801A4ED4 38 61 00 14 */ addi r3, r1, 0x14 -/* 801A4ED8 38 80 00 00 */ li r4, 0 -/* 801A4EDC 4B FF 92 61 */ bl dKy_eflight_influence_id__F4cXyzi -/* 801A4EE0 90 7E 12 A8 */ stw r3, 0x12a8(r30) -/* 801A4EE4 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 801A4EE8 D0 01 00 08 */ stfs f0, 8(r1) -/* 801A4EEC C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 801A4EF0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 801A4EF4 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 801A4EF8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 801A4EFC 38 61 00 08 */ addi r3, r1, 8 -/* 801A4F00 38 80 00 00 */ li r4, 0 -/* 801A4F04 4B FF 8E 69 */ bl dKy_light_influence_id__F4cXyzi -/* 801A4F08 90 7E 12 A4 */ stw r3, 0x12a4(r30) -lbl_801A4F0C: -/* 801A4F0C 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801A4F10 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 801A4F14 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801A4F18 7C 08 03 A6 */ mtlr r0 -/* 801A4F1C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A4F20 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/GetTimePass__20dStage_roomControl_cFv.s b/asm/d/kankyo/d_kankyo/GetTimePass__20dStage_roomControl_cFv.s deleted file mode 100644 index 9ec8c4e3e6..0000000000 --- a/asm/d/kankyo/d_kankyo/GetTimePass__20dStage_roomControl_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8019F780: -/* 8019F780 88 6D 87 E7 */ lbz r3, mStayNo__20dStage_roomControl_c+0x3(r13) -/* 8019F784 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_Delete__FP17sub_kankyo__class.s b/asm/d/kankyo/d_kankyo/dKy_Delete__FP17sub_kankyo__class.s deleted file mode 100644 index 84499eaf3a..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_Delete__FP17sub_kankyo__class.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801A5BD4: -/* 801A5BD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801A5BD8 7C 08 02 A6 */ mflr r0 -/* 801A5BDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A5BE0 4B FF 8A B5 */ bl plight_init__Fv -/* 801A5BE4 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 801A5BE8 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 801A5BEC 48 12 0D AD */ bl resetScene__10Z2EnvSeMgrFv -/* 801A5BF0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A5BF4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A5BF8 80 63 0F 38 */ lwz r3, 0xf38(r3) -/* 801A5BFC 28 03 00 00 */ cmplwi r3, 0 -/* 801A5C00 41 82 00 08 */ beq lbl_801A5C08 -/* 801A5C04 4B E6 95 89 */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap -lbl_801A5C08: -/* 801A5C08 38 60 00 01 */ li r3, 1 -/* 801A5C0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801A5C10 7C 08 03 A6 */ mtlr r0 -/* 801A5C14 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A5C18 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_Draw__FP17sub_kankyo__class.s b/asm/d/kankyo/d_kankyo/dKy_Draw__FP17sub_kankyo__class.s deleted file mode 100644 index 7e0a45b7c0..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_Draw__FP17sub_kankyo__class.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801A5B6C: -/* 801A5B6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801A5B70 7C 08 02 A6 */ mflr r0 -/* 801A5B74 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A5B78 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A5B7C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A5B80 4B FF FB 5D */ bl drawKankyo__18dScnKy_env_light_cFv -/* 801A5B84 38 60 00 01 */ li r3, 1 -/* 801A5B88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801A5B8C 7C 08 03 A6 */ mtlr r0 -/* 801A5B90 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A5B94 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_Execute__FP17sub_kankyo__class.s b/asm/d/kankyo/d_kankyo/dKy_Execute__FP17sub_kankyo__class.s deleted file mode 100644 index b545ccd780..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_Execute__FP17sub_kankyo__class.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801A5B98: -/* 801A5B98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801A5B9C 7C 08 02 A6 */ mflr r0 -/* 801A5BA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A5BA4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A5BA8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A5BAC 4B FF F6 DD */ bl exeKankyo__18dScnKy_env_light_cFv -/* 801A5BB0 4B EB 4A 11 */ bl dKyw_wind_set__Fv -/* 801A5BB4 48 00 51 9D */ bl dKy_twilight_camelight_set__Fv -/* 801A5BB8 38 60 00 01 */ li r3, 1 -/* 801A5BBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801A5BC0 7C 08 03 A6 */ mtlr r0 -/* 801A5BC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A5BC8 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_Global_amb_set__FP12dKy_tevstr_c.s b/asm/d/kankyo/d_kankyo/dKy_Global_amb_set__FP12dKy_tevstr_c.s deleted file mode 100644 index 27f9ff2ba1..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_Global_amb_set__FP12dKy_tevstr_c.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_801A75E0: -/* 801A75E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801A75E4 7C 08 02 A6 */ mflr r0 -/* 801A75E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801A75EC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801A75F0 7C 7F 1B 78 */ mr r31, r3 -/* 801A75F4 A8 03 03 48 */ lha r0, 0x348(r3) -/* 801A75F8 98 01 00 0C */ stb r0, 0xc(r1) -/* 801A75FC A8 03 03 4A */ lha r0, 0x34a(r3) -/* 801A7600 98 01 00 0D */ stb r0, 0xd(r1) -/* 801A7604 A8 03 03 4C */ lha r0, 0x34c(r3) -/* 801A7608 98 01 00 0E */ stb r0, 0xe(r1) -/* 801A760C A8 03 03 4E */ lha r0, 0x34e(r3) -/* 801A7610 98 01 00 0F */ stb r0, 0xf(r1) -/* 801A7614 88 03 03 7A */ lbz r0, 0x37a(r3) -/* 801A7618 28 00 00 02 */ cmplwi r0, 2 -/* 801A761C 41 82 00 0C */ beq lbl_801A7628 -/* 801A7620 28 00 00 03 */ cmplwi r0, 3 -/* 801A7624 40 82 00 54 */ bne lbl_801A7678 -lbl_801A7628: -/* 801A7628 48 00 4F 55 */ bl dKy_darkworld_check__Fv -/* 801A762C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801A7630 41 82 00 80 */ beq lbl_801A76B0 -/* 801A7634 88 1F 03 7A */ lbz r0, 0x37a(r31) -/* 801A7638 28 00 00 02 */ cmplwi r0, 2 -/* 801A763C 40 82 00 20 */ bne lbl_801A765C -/* 801A7640 38 00 00 12 */ li r0, 0x12 -/* 801A7644 98 01 00 0C */ stb r0, 0xc(r1) -/* 801A7648 98 01 00 0D */ stb r0, 0xd(r1) -/* 801A764C 98 01 00 0E */ stb r0, 0xe(r1) -/* 801A7650 38 00 00 00 */ li r0, 0 -/* 801A7654 98 01 00 0F */ stb r0, 0xf(r1) -/* 801A7658 48 00 00 58 */ b lbl_801A76B0 -lbl_801A765C: -/* 801A765C 38 00 00 0C */ li r0, 0xc -/* 801A7660 98 01 00 0C */ stb r0, 0xc(r1) -/* 801A7664 98 01 00 0D */ stb r0, 0xd(r1) -/* 801A7668 98 01 00 0E */ stb r0, 0xe(r1) -/* 801A766C 38 00 00 00 */ li r0, 0 -/* 801A7670 98 01 00 0F */ stb r0, 0xf(r1) -/* 801A7674 48 00 00 3C */ b lbl_801A76B0 -lbl_801A7678: -/* 801A7678 28 00 00 01 */ cmplwi r0, 1 -/* 801A767C 41 80 00 0C */ blt lbl_801A7688 -/* 801A7680 28 00 00 07 */ cmplwi r0, 7 -/* 801A7684 40 81 00 18 */ ble lbl_801A769C -lbl_801A7688: -/* 801A7688 28 00 00 09 */ cmplwi r0, 9 -/* 801A768C 40 82 00 24 */ bne lbl_801A76B0 -/* 801A7690 48 00 4E ED */ bl dKy_darkworld_check__Fv -/* 801A7694 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801A7698 41 82 00 18 */ beq lbl_801A76B0 -lbl_801A769C: -/* 801A769C 38 00 00 00 */ li r0, 0 -/* 801A76A0 98 01 00 0C */ stb r0, 0xc(r1) -/* 801A76A4 98 01 00 0D */ stb r0, 0xd(r1) -/* 801A76A8 98 01 00 0E */ stb r0, 0xe(r1) -/* 801A76AC 98 01 00 0F */ stb r0, 0xf(r1) -lbl_801A76B0: -/* 801A76B0 80 01 00 0C */ lwz r0, 0xc(r1) -/* 801A76B4 90 01 00 08 */ stw r0, 8(r1) -/* 801A76B8 38 60 00 04 */ li r3, 4 -/* 801A76BC 38 81 00 08 */ addi r4, r1, 8 -/* 801A76C0 48 1B 62 A1 */ bl GXSetChanAmbColor -/* 801A76C4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801A76C8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801A76CC 7C 08 03 A6 */ mtlr r0 -/* 801A76D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A76D4 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_actor_addcol_set__Fsssf.s b/asm/d/kankyo/d_kankyo/dKy_actor_addcol_set__Fsssf.s deleted file mode 100644 index ba3daad578..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_actor_addcol_set__Fsssf.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801A7E88: -/* 801A7E88 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801A7E8C 7C 08 02 A6 */ mflr r0 -/* 801A7E90 90 01 00 24 */ stw r0, 0x24(r1) -/* 801A7E94 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 801A7E98 39 61 00 18 */ addi r11, r1, 0x18 -/* 801A7E9C 48 1B A3 41 */ bl _savegpr_29 -/* 801A7EA0 7C 7D 1B 78 */ mr r29, r3 -/* 801A7EA4 7C 9E 23 78 */ mr r30, r4 -/* 801A7EA8 7C BF 2B 78 */ mr r31, r5 -/* 801A7EAC FF E0 08 90 */ fmr f31, f1 -/* 801A7EB0 4B FF FC 19 */ bl dKy_actor_addcol_amb_set__Fsssf -/* 801A7EB4 7F A3 EB 78 */ mr r3, r29 -/* 801A7EB8 7F C4 F3 78 */ mr r4, r30 -/* 801A7EBC 7F E5 FB 78 */ mr r5, r31 -/* 801A7EC0 FC 20 F8 90 */ fmr f1, f31 -/* 801A7EC4 4B FF FC A5 */ bl dKy_bg_addcol_amb_set__Fsssf -/* 801A7EC8 7F A3 EB 78 */ mr r3, r29 -/* 801A7ECC 7F C4 F3 78 */ mr r4, r30 -/* 801A7ED0 7F E5 FB 78 */ mr r5, r31 -/* 801A7ED4 FC 20 F8 90 */ fmr f1, f31 -/* 801A7ED8 4B FF FD 31 */ bl dKy_bg1_addcol_amb_set__Fsssf -/* 801A7EDC 7F A3 EB 78 */ mr r3, r29 -/* 801A7EE0 7F C4 F3 78 */ mr r4, r30 -/* 801A7EE4 7F E5 FB 78 */ mr r5, r31 -/* 801A7EE8 FC 20 F8 90 */ fmr f1, f31 -/* 801A7EEC 4B FF FD BD */ bl dKy_bg2_addcol_amb_set__Fsssf -/* 801A7EF0 7F A3 EB 78 */ mr r3, r29 -/* 801A7EF4 7F C4 F3 78 */ mr r4, r30 -/* 801A7EF8 7F E5 FB 78 */ mr r5, r31 -/* 801A7EFC FC 20 F8 90 */ fmr f1, f31 -/* 801A7F00 4B FF FE 49 */ bl dKy_bg3_addcol_amb_set__Fsssf -/* 801A7F04 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 801A7F08 39 61 00 18 */ addi r11, r1, 0x18 -/* 801A7F0C 48 1B A3 1D */ bl _restgpr_29 -/* 801A7F10 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801A7F14 7C 08 03 A6 */ mtlr r0 -/* 801A7F18 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A7F1C 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_bgparts_activelight_cut__Fi.s b/asm/d/kankyo/d_kankyo/dKy_bgparts_activelight_cut__Fi.s deleted file mode 100644 index 7eb3cfa557..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_bgparts_activelight_cut__Fi.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801A7AAC: -/* 801A7AAC 38 A0 00 00 */ li r5, 0 -/* 801A7AB0 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7AB4 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 801A7AB8 54 60 28 34 */ slwi r0, r3, 5 -/* 801A7ABC 7C 64 02 14 */ add r3, r4, r0 -/* 801A7AC0 90 A3 07 80 */ stw r5, 0x780(r3) -/* 801A7AC4 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi.s b/asm/d/kankyo/d_kankyo/dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi.s deleted file mode 100644 index 12fcce04e0..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_801A7A40: -/* 801A7A40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801A7A44 7C 08 02 A6 */ mflr r0 -/* 801A7A48 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A7A4C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801A7A50 93 C1 00 08 */ stw r30, 8(r1) -/* 801A7A54 7C 65 1B 79 */ or. r5, r3, r3 -/* 801A7A58 7C 9E 23 78 */ mr r30, r4 -/* 801A7A5C 41 82 00 38 */ beq lbl_801A7A94 -/* 801A7A60 57 DF 28 34 */ slwi r31, r30, 5 -/* 801A7A64 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7A68 38 03 CA 54 */ addi r0, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A7A6C 7C 60 FA 14 */ add r3, r0, r31 -/* 801A7A70 38 63 07 64 */ addi r3, r3, 0x764 -/* 801A7A74 7C A4 2B 78 */ mr r4, r5 -/* 801A7A78 38 A0 00 20 */ li r5, 0x20 -/* 801A7A7C 4B E5 BA C5 */ bl memcpy -/* 801A7A80 38 9E 00 01 */ addi r4, r30, 1 -/* 801A7A84 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7A88 38 03 CA 54 */ addi r0, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A7A8C 7C 60 FA 14 */ add r3, r0, r31 -/* 801A7A90 90 83 07 80 */ stw r4, 0x780(r3) -lbl_801A7A94: -/* 801A7A94 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801A7A98 83 C1 00 08 */ lwz r30, 8(r1) -/* 801A7A9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801A7AA0 7C 08 03 A6 */ mtlr r0 -/* 801A7AA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A7AA8 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci.s b/asm/d/kankyo/d_kankyo/dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci.s deleted file mode 100644 index 282d90d4a5..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_801A4C10: -/* 801A4C10 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801A4C14 7C 08 02 A6 */ mflr r0 -/* 801A4C18 90 01 00 34 */ stw r0, 0x34(r1) -/* 801A4C1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A4C20 48 1B D5 AD */ bl _savegpr_25 -/* 801A4C24 7C 79 1B 78 */ mr r25, r3 -/* 801A4C28 7C 9A 23 78 */ mr r26, r4 -/* 801A4C2C 7C BB 2B 78 */ mr r27, r5 -/* 801A4C30 83 C3 00 64 */ lwz r30, 0x64(r3) -/* 801A4C34 A0 63 00 5C */ lhz r3, 0x5c(r3) -/* 801A4C38 3B 83 FF FF */ addi r28, r3, -1 -/* 801A4C3C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A4C40 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A4C44 48 00 01 3C */ b lbl_801A4D80 -lbl_801A4C48: -/* 801A4C48 80 79 00 60 */ lwz r3, 0x60(r25) -/* 801A4C4C 57 80 13 BA */ rlwinm r0, r28, 2, 0xe, 0x1d -/* 801A4C50 7F A3 00 2E */ lwzx r29, r3, r0 -/* 801A4C54 7F 65 DB 78 */ mr r5, r27 -/* 801A4C58 A0 1A 03 78 */ lhz r0, 0x378(r26) -/* 801A4C5C 28 00 00 00 */ cmplwi r0, 0 -/* 801A4C60 41 82 00 10 */ beq lbl_801A4C70 -/* 801A4C64 7C 00 E0 00 */ cmpw r0, r28 -/* 801A4C68 40 82 00 08 */ bne lbl_801A4C70 -/* 801A4C6C 38 A0 00 02 */ li r5, 2 -lbl_801A4C70: -/* 801A4C70 7F A3 EB 78 */ mr r3, r29 -/* 801A4C74 7F 44 D3 78 */ mr r4, r26 -/* 801A4C78 4B FF F7 A9 */ bl setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci -/* 801A4C7C 7F C3 F3 78 */ mr r3, r30 -/* 801A4C80 57 84 04 3E */ clrlwi r4, r28, 0x10 -/* 801A4C84 48 13 9E 75 */ bl getName__10JUTNameTabCFUs -/* 801A4C88 88 03 00 03 */ lbz r0, 3(r3) -/* 801A4C8C 2C 00 00 4D */ cmpwi r0, 0x4d -/* 801A4C90 40 82 00 34 */ bne lbl_801A4CC4 -/* 801A4C94 88 03 00 04 */ lbz r0, 4(r3) -/* 801A4C98 2C 00 00 41 */ cmpwi r0, 0x41 -/* 801A4C9C 40 82 00 28 */ bne lbl_801A4CC4 -/* 801A4CA0 88 03 00 05 */ lbz r0, 5(r3) -/* 801A4CA4 2C 00 00 30 */ cmpwi r0, 0x30 -/* 801A4CA8 40 82 00 1C */ bne lbl_801A4CC4 -/* 801A4CAC 88 03 00 06 */ lbz r0, 6(r3) -/* 801A4CB0 7C 00 07 74 */ extsb r0, r0 -/* 801A4CB4 2C 00 00 30 */ cmpwi r0, 0x30 -/* 801A4CB8 41 82 00 24 */ beq lbl_801A4CDC -/* 801A4CBC 2C 00 00 31 */ cmpwi r0, 0x31 -/* 801A4CC0 41 82 00 1C */ beq lbl_801A4CDC -lbl_801A4CC4: -/* 801A4CC4 88 03 00 05 */ lbz r0, 5(r3) -/* 801A4CC8 2C 00 00 31 */ cmpwi r0, 0x31 -/* 801A4CCC 40 82 00 B0 */ bne lbl_801A4D7C -/* 801A4CD0 88 03 00 06 */ lbz r0, 6(r3) -/* 801A4CD4 2C 00 00 36 */ cmpwi r0, 0x36 -/* 801A4CD8 40 82 00 A4 */ bne lbl_801A4D7C -lbl_801A4CDC: -/* 801A4CDC 88 03 00 06 */ lbz r0, 6(r3) -/* 801A4CE0 2C 00 00 30 */ cmpwi r0, 0x30 -/* 801A4CE4 40 82 00 38 */ bne lbl_801A4D1C -/* 801A4CE8 88 1F 12 F8 */ lbz r0, 0x12f8(r31) -/* 801A4CEC 98 01 00 08 */ stb r0, 8(r1) -/* 801A4CF0 38 00 00 00 */ li r0, 0 -/* 801A4CF4 98 01 00 09 */ stb r0, 9(r1) -/* 801A4CF8 98 01 00 0A */ stb r0, 0xa(r1) -/* 801A4CFC 98 01 00 0B */ stb r0, 0xb(r1) -/* 801A4D00 80 7D 00 2C */ lwz r3, 0x2c(r29) -/* 801A4D04 38 80 00 01 */ li r4, 1 -/* 801A4D08 38 A1 00 08 */ addi r5, r1, 8 -/* 801A4D0C 81 83 00 00 */ lwz r12, 0(r3) -/* 801A4D10 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 801A4D14 7D 89 03 A6 */ mtctr r12 -/* 801A4D18 4E 80 04 21 */ bctrl -lbl_801A4D1C: -/* 801A4D1C 80 7D 00 28 */ lwz r3, 0x28(r29) -/* 801A4D20 38 80 00 01 */ li r4, 1 -/* 801A4D24 81 83 00 00 */ lwz r12, 0(r3) -/* 801A4D28 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 801A4D2C 7D 89 03 A6 */ mtctr r12 -/* 801A4D30 4E 80 04 21 */ bctrl -/* 801A4D34 28 03 00 00 */ cmplwi r3, 0 -/* 801A4D38 41 82 00 44 */ beq lbl_801A4D7C -/* 801A4D3C 80 7D 00 28 */ lwz r3, 0x28(r29) -/* 801A4D40 38 80 00 01 */ li r4, 1 -/* 801A4D44 81 83 00 00 */ lwz r12, 0(r3) -/* 801A4D48 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 801A4D4C 7D 89 03 A6 */ mtctr r12 -/* 801A4D50 4E 80 04 21 */ bctrl -/* 801A4D54 28 03 00 00 */ cmplwi r3, 0 -/* 801A4D58 41 82 00 24 */ beq lbl_801A4D7C -/* 801A4D5C 80 9F 0E D0 */ lwz r4, 0xed0(r31) -/* 801A4D60 28 04 00 00 */ cmplwi r4, 0 -/* 801A4D64 41 82 00 18 */ beq lbl_801A4D7C -/* 801A4D68 C0 04 11 50 */ lfs f0, 0x1150(r4) -/* 801A4D6C D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 801A4D70 80 9F 0E D0 */ lwz r4, 0xed0(r31) -/* 801A4D74 C0 04 11 54 */ lfs f0, 0x1154(r4) -/* 801A4D78 D0 03 00 20 */ stfs f0, 0x20(r3) -lbl_801A4D7C: -/* 801A4D7C 3B 9C FF FF */ addi r28, r28, -1 -lbl_801A4D80: -/* 801A4D80 2C 1C 00 00 */ cmpwi r28, 0 -/* 801A4D84 40 80 FE C4 */ bge lbl_801A4C48 -/* 801A4D88 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A4D8C 48 1B D4 8D */ bl _restgpr_25 -/* 801A4D90 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801A4D94 7C 08 03 A6 */ mtlr r0 -/* 801A4D98 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A4D9C 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_dalkmist_inf_cut__FP18DALKMIST_INFLUENCE.s b/asm/d/kankyo/d_kankyo/dKy_dalkmist_inf_cut__FP18DALKMIST_INFLUENCE.s deleted file mode 100644 index 915aa29003..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_dalkmist_inf_cut__FP18DALKMIST_INFLUENCE.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801A7868: -/* 801A7868 28 03 00 00 */ cmplwi r3, 0 -/* 801A786C 4D 82 00 20 */ beqlr -/* 801A7870 88 03 00 10 */ lbz r0, 0x10(r3) -/* 801A7874 7C 00 07 74 */ extsb r0, r0 -/* 801A7878 2C 00 00 0A */ cmpwi r0, 0xa -/* 801A787C 4C 80 00 20 */ bgelr -/* 801A7880 38 80 00 00 */ li r4, 0 -/* 801A7884 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7888 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A788C 54 00 10 3A */ slwi r0, r0, 2 -/* 801A7890 7C 63 02 14 */ add r3, r3, r0 -/* 801A7894 90 83 09 90 */ stw r4, 0x990(r3) -/* 801A7898 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_dalkmist_inf_set__FP18DALKMIST_INFLUENCE.s b/asm/d/kankyo/d_kankyo/dKy_dalkmist_inf_set__FP18DALKMIST_INFLUENCE.s deleted file mode 100644 index ca8fb9c2b2..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_dalkmist_inf_set__FP18DALKMIST_INFLUENCE.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801A7814: -/* 801A7814 38 E0 00 00 */ li r7, 0 -/* 801A7818 38 80 00 00 */ li r4, 0 -/* 801A781C 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7820 38 C5 CA 54 */ addi r6, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A7824 38 00 00 0A */ li r0, 0xa -/* 801A7828 7C 09 03 A6 */ mtctr r0 -lbl_801A782C: -/* 801A782C 7C A6 22 14 */ add r5, r6, r4 -/* 801A7830 80 05 09 90 */ lwz r0, 0x990(r5) -/* 801A7834 28 00 00 00 */ cmplwi r0, 0 -/* 801A7838 40 82 00 20 */ bne lbl_801A7858 -/* 801A783C 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7840 38 05 CA 54 */ addi r0, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A7844 7C 80 22 14 */ add r4, r0, r4 -/* 801A7848 90 64 09 90 */ stw r3, 0x990(r4) -/* 801A784C 80 64 09 90 */ lwz r3, 0x990(r4) -/* 801A7850 98 E3 00 10 */ stb r7, 0x10(r3) -/* 801A7854 4E 80 00 20 */ blr -lbl_801A7858: -/* 801A7858 38 E7 00 01 */ addi r7, r7, 1 -/* 801A785C 38 84 00 04 */ addi r4, r4, 4 -/* 801A7860 42 00 FF CC */ bdnz lbl_801A782C -/* 801A7864 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_efplight_cut__FP15LIGHT_INFLUENCE.s b/asm/d/kankyo/d_kankyo/dKy_efplight_cut__FP15LIGHT_INFLUENCE.s deleted file mode 100644 index 6b46ee3be9..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_efplight_cut__FP15LIGHT_INFLUENCE.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_801A7A00: -/* 801A7A00 28 03 00 00 */ cmplwi r3, 0 -/* 801A7A04 4D 82 00 20 */ beqlr -/* 801A7A08 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801A7A0C 2C 03 00 00 */ cmpwi r3, 0 -/* 801A7A10 4D 82 00 20 */ beqlr -/* 801A7A14 34 03 FF FF */ addic. r0, r3, -1 -/* 801A7A18 4D 80 00 20 */ bltlr -/* 801A7A1C 2C 00 00 05 */ cmpwi r0, 5 -/* 801A7A20 4C 80 00 20 */ bgelr -/* 801A7A24 38 80 00 00 */ li r4, 0 -/* 801A7A28 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7A2C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A7A30 54 00 10 3A */ slwi r0, r0, 2 -/* 801A7A34 7C 63 02 14 */ add r3, r3, r0 -/* 801A7A38 90 83 05 88 */ stw r4, 0x588(r3) -/* 801A7A3C 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_efplight_set__FP15LIGHT_INFLUENCE.s b/asm/d/kankyo/d_kankyo/dKy_efplight_set__FP15LIGHT_INFLUENCE.s deleted file mode 100644 index ee1253589c..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_efplight_set__FP15LIGHT_INFLUENCE.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_801A797C: -/* 801A797C 38 80 00 00 */ li r4, 0 -/* 801A7980 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7984 38 C5 CA 54 */ addi r6, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A7988 38 00 00 05 */ li r0, 5 -/* 801A798C 7C 09 03 A6 */ mtctr r0 -lbl_801A7990: -/* 801A7990 7C A6 22 14 */ add r5, r6, r4 -/* 801A7994 80 05 05 88 */ lwz r0, 0x588(r5) -/* 801A7998 7C 00 18 40 */ cmplw r0, r3 -/* 801A799C 4D 82 00 20 */ beqlr -/* 801A79A0 38 84 00 04 */ addi r4, r4, 4 -/* 801A79A4 42 00 FF EC */ bdnz lbl_801A7990 -/* 801A79A8 38 E0 00 00 */ li r7, 0 -/* 801A79AC 38 80 00 00 */ li r4, 0 -/* 801A79B0 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A79B4 38 C5 CA 54 */ addi r6, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A79B8 38 00 00 05 */ li r0, 5 -/* 801A79BC 7C 09 03 A6 */ mtctr r0 -lbl_801A79C0: -/* 801A79C0 7C A6 22 14 */ add r5, r6, r4 -/* 801A79C4 80 05 05 88 */ lwz r0, 0x588(r5) -/* 801A79C8 28 00 00 00 */ cmplwi r0, 0 -/* 801A79CC 40 82 00 24 */ bne lbl_801A79F0 -/* 801A79D0 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A79D4 38 05 CA 54 */ addi r0, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A79D8 7C 80 22 14 */ add r4, r0, r4 -/* 801A79DC 90 64 05 88 */ stw r3, 0x588(r4) -/* 801A79E0 38 07 00 01 */ addi r0, r7, 1 -/* 801A79E4 80 64 05 88 */ lwz r3, 0x588(r4) -/* 801A79E8 90 03 00 1C */ stw r0, 0x1c(r3) -/* 801A79EC 4E 80 00 20 */ blr -lbl_801A79F0: -/* 801A79F0 38 E7 00 01 */ addi r7, r7, 1 -/* 801A79F4 38 84 00 04 */ addi r4, r4, 4 -/* 801A79F8 42 00 FF C8 */ bdnz lbl_801A79C0 -/* 801A79FC 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc.s b/asm/d/kankyo/d_kankyo/dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc.s deleted file mode 100644 index 5d38eddd2a..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801A61F4: -/* 801A61F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801A61F8 7C 08 02 A6 */ mflr r0 -/* 801A61FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A6200 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801A6204 7C 85 23 78 */ mr r5, r4 -/* 801A6208 3B E0 00 01 */ li r31, 1 -/* 801A620C 88 83 00 1F */ lbz r4, 0x1f(r3) -/* 801A6210 28 04 00 FF */ cmplwi r4, 0xff -/* 801A6214 41 82 00 4C */ beq lbl_801A6260 -/* 801A6218 88 03 00 1E */ lbz r0, 0x1e(r3) -/* 801A621C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 801A6220 40 82 00 24 */ bne lbl_801A6244 -/* 801A6224 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801A6228 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801A622C 7C A5 07 74 */ extsb r5, r5 -/* 801A6230 4B E8 F1 31 */ bl isSwitch__10dSv_info_cCFii -/* 801A6234 2C 03 00 00 */ cmpwi r3, 0 -/* 801A6238 41 82 00 28 */ beq lbl_801A6260 -/* 801A623C 3B E0 00 00 */ li r31, 0 -/* 801A6240 48 00 00 20 */ b lbl_801A6260 -lbl_801A6244: -/* 801A6244 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801A6248 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801A624C 7C A5 07 74 */ extsb r5, r5 -/* 801A6250 4B E8 F1 11 */ bl isSwitch__10dSv_info_cCFii -/* 801A6254 2C 03 00 00 */ cmpwi r3, 0 -/* 801A6258 40 82 00 08 */ bne lbl_801A6260 -/* 801A625C 3B E0 00 00 */ li r31, 0 -lbl_801A6260: -/* 801A6260 7F E3 FB 78 */ mr r3, r31 -/* 801A6264 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801A6268 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801A626C 7C 08 03 A6 */ mtlr r0 -/* 801A6270 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A6274 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_mock_light_every_set__FP15LIGHT_INFLUENCE.s b/asm/d/kankyo/d_kankyo/dKy_mock_light_every_set__FP15LIGHT_INFLUENCE.s deleted file mode 100644 index 9a385886bc..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_mock_light_every_set__FP15LIGHT_INFLUENCE.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801A7738: -/* 801A7738 38 E0 00 32 */ li r7, 0x32 -/* 801A773C 38 80 00 C8 */ li r4, 0xc8 -/* 801A7740 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7744 38 C5 CA 54 */ addi r6, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A7748 38 00 00 32 */ li r0, 0x32 -/* 801A774C 7C 09 03 A6 */ mtctr r0 -lbl_801A7750: -/* 801A7750 7C A6 22 14 */ add r5, r6, r4 -/* 801A7754 80 05 03 F8 */ lwz r0, 0x3f8(r5) -/* 801A7758 28 00 00 00 */ cmplwi r0, 0 -/* 801A775C 40 82 00 24 */ bne lbl_801A7780 -/* 801A7760 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7764 38 05 CA 54 */ addi r0, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A7768 7C 80 22 14 */ add r4, r0, r4 -/* 801A776C 90 64 03 F8 */ stw r3, 0x3f8(r4) -/* 801A7770 38 07 00 01 */ addi r0, r7, 1 -/* 801A7774 80 64 03 F8 */ lwz r3, 0x3f8(r4) -/* 801A7778 90 03 00 1C */ stw r0, 0x1c(r3) -/* 801A777C 4E 80 00 20 */ blr -lbl_801A7780: -/* 801A7780 38 E7 00 01 */ addi r7, r7, 1 -/* 801A7784 38 84 00 04 */ addi r4, r4, 4 -/* 801A7788 42 00 FF C8 */ bdnz lbl_801A7750 -/* 801A778C 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_plight_cut__FP15LIGHT_INFLUENCE.s b/asm/d/kankyo/d_kankyo/dKy_plight_cut__FP15LIGHT_INFLUENCE.s deleted file mode 100644 index a38d5a26a9..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_plight_cut__FP15LIGHT_INFLUENCE.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801A792C: -/* 801A792C 28 03 00 00 */ cmplwi r3, 0 -/* 801A7930 4D 82 00 20 */ beqlr -/* 801A7934 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 801A7938 2C 00 00 00 */ cmpwi r0, 0 -/* 801A793C 4D 82 00 20 */ beqlr -/* 801A7940 40 80 00 0C */ bge lbl_801A794C -/* 801A7944 1C 00 FF FF */ mulli r0, r0, -1 -/* 801A7948 90 03 00 1C */ stw r0, 0x1c(r3) -lbl_801A794C: -/* 801A794C 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 801A7950 54 03 05 3E */ clrlwi r3, r0, 0x14 -/* 801A7954 38 03 FF FF */ addi r0, r3, -1 -/* 801A7958 2C 00 00 32 */ cmpwi r0, 0x32 -/* 801A795C 4C 80 00 20 */ bgelr -/* 801A7960 38 80 00 00 */ li r4, 0 -/* 801A7964 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7968 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A796C 54 00 10 3A */ slwi r0, r0, 2 -/* 801A7970 7C 63 02 14 */ add r3, r3, r0 -/* 801A7974 90 83 03 F8 */ stw r4, 0x3f8(r3) -/* 801A7978 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_plight_priority_set__FP15LIGHT_INFLUENCE.s b/asm/d/kankyo/d_kankyo/dKy_plight_priority_set__FP15LIGHT_INFLUENCE.s deleted file mode 100644 index 49d02daf19..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_plight_priority_set__FP15LIGHT_INFLUENCE.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_801A789C: -/* 801A789C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801A78A0 7C 08 02 A6 */ mflr r0 -/* 801A78A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A78A8 38 E0 00 00 */ li r7, 0 -/* 801A78AC 38 80 00 00 */ li r4, 0 -/* 801A78B0 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A78B4 38 C5 CA 54 */ addi r6, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A78B8 38 00 00 32 */ li r0, 0x32 -/* 801A78BC 7C 09 03 A6 */ mtctr r0 -lbl_801A78C0: -/* 801A78C0 7C A6 22 14 */ add r5, r6, r4 -/* 801A78C4 80 05 03 F8 */ lwz r0, 0x3f8(r5) -/* 801A78C8 28 00 00 00 */ cmplwi r0, 0 -/* 801A78CC 40 82 00 28 */ bne lbl_801A78F4 -/* 801A78D0 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A78D4 38 05 CA 54 */ addi r0, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A78D8 7C 80 22 14 */ add r4, r0, r4 -/* 801A78DC 90 64 03 F8 */ stw r3, 0x3f8(r4) -/* 801A78E0 38 07 00 01 */ addi r0, r7, 1 -/* 801A78E4 7C 00 00 D0 */ neg r0, r0 -/* 801A78E8 80 64 03 F8 */ lwz r3, 0x3f8(r4) -/* 801A78EC 90 03 00 1C */ stw r0, 0x1c(r3) -/* 801A78F0 48 00 00 10 */ b lbl_801A7900 -lbl_801A78F4: -/* 801A78F4 38 E7 00 01 */ addi r7, r7, 1 -/* 801A78F8 38 84 00 04 */ addi r4, r4, 4 -/* 801A78FC 42 00 FF C4 */ bdnz lbl_801A78C0 -lbl_801A7900: -/* 801A7900 2C 07 00 32 */ cmpwi r7, 0x32 -/* 801A7904 41 80 00 18 */ blt lbl_801A791C -/* 801A7908 3C 60 80 39 */ lis r3, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */ -/* 801A790C 38 63 4C 6C */ addi r3, r3, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */ -/* 801A7910 38 63 02 09 */ addi r3, r3, 0x209 -/* 801A7914 4C C6 31 82 */ crclr 6 -/* 801A7918 4B E5 F3 D5 */ bl OSReport_Warning -lbl_801A791C: -/* 801A791C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801A7920 7C 08 03 A6 */ mtlr r0 -/* 801A7924 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A7928 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_plight_set__FP15LIGHT_INFLUENCE.s b/asm/d/kankyo/d_kankyo/dKy_plight_set__FP15LIGHT_INFLUENCE.s deleted file mode 100644 index 484f9bfd77..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_plight_set__FP15LIGHT_INFLUENCE.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_801A7790: -/* 801A7790 38 80 00 00 */ li r4, 0 -/* 801A7794 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A7798 38 C5 CA 54 */ addi r6, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A779C 38 00 00 64 */ li r0, 0x64 -/* 801A77A0 7C 09 03 A6 */ mtctr r0 -lbl_801A77A4: -/* 801A77A4 7C A6 22 14 */ add r5, r6, r4 -/* 801A77A8 80 05 03 F8 */ lwz r0, 0x3f8(r5) -/* 801A77AC 7C 00 18 40 */ cmplw r0, r3 -/* 801A77B0 4D 82 00 20 */ beqlr -/* 801A77B4 38 84 00 04 */ addi r4, r4, 4 -/* 801A77B8 42 00 FF EC */ bdnz lbl_801A77A4 -/* 801A77BC 38 E0 00 00 */ li r7, 0 -/* 801A77C0 38 80 00 00 */ li r4, 0 -/* 801A77C4 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A77C8 38 C5 CA 54 */ addi r6, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A77CC 38 00 00 32 */ li r0, 0x32 -/* 801A77D0 7C 09 03 A6 */ mtctr r0 -lbl_801A77D4: -/* 801A77D4 7C A6 22 14 */ add r5, r6, r4 -/* 801A77D8 80 05 03 F8 */ lwz r0, 0x3f8(r5) -/* 801A77DC 28 00 00 00 */ cmplwi r0, 0 -/* 801A77E0 40 82 00 24 */ bne lbl_801A7804 -/* 801A77E4 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A77E8 38 05 CA 54 */ addi r0, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A77EC 7C 80 22 14 */ add r4, r0, r4 -/* 801A77F0 90 64 03 F8 */ stw r3, 0x3f8(r4) -/* 801A77F4 38 07 00 01 */ addi r0, r7, 1 -/* 801A77F8 80 64 03 F8 */ lwz r3, 0x3f8(r4) -/* 801A77FC 90 03 00 1C */ stw r0, 0x1c(r3) -/* 801A7800 4E 80 00 20 */ blr -lbl_801A7804: -/* 801A7804 38 E7 00 01 */ addi r7, r7, 1 -/* 801A7808 38 84 00 04 */ addi r4, r4, 4 -/* 801A780C 42 00 FF C8 */ bdnz lbl_801A77D4 -/* 801A7810 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c.s b/asm/d/kankyo/d_kankyo/setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c.s deleted file mode 100644 index d3278bc1c0..0000000000 --- a/asm/d/kankyo/d_kankyo/setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_801A4DA0: -/* 801A4DA0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801A4DA4 7C 08 02 A6 */ mflr r0 -/* 801A4DA8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801A4DAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A4DB0 48 1B D4 29 */ bl _savegpr_28 -/* 801A4DB4 7C 7E 1B 78 */ mr r30, r3 -/* 801A4DB8 7C 9C 23 78 */ mr r28, r4 -/* 801A4DBC 7C BD 2B 78 */ mr r29, r5 -/* 801A4DC0 88 05 03 83 */ lbz r0, 0x383(r5) -/* 801A4DC4 28 00 00 7C */ cmplwi r0, 0x7c -/* 801A4DC8 41 82 00 34 */ beq lbl_801A4DFC -/* 801A4DCC 28 00 00 7B */ cmplwi r0, 0x7b -/* 801A4DD0 41 82 00 18 */ beq lbl_801A4DE8 -/* 801A4DD4 7F A3 EB 78 */ mr r3, r29 -/* 801A4DD8 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 801A4DDC 7C 04 07 74 */ extsb r4, r0 -/* 801A4DE0 38 A0 00 FF */ li r5, 0xff -/* 801A4DE4 48 00 3B 09 */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc -lbl_801A4DE8: -/* 801A4DE8 7F C3 F3 78 */ mr r3, r30 -/* 801A4DEC 38 80 00 0B */ li r4, 0xb -/* 801A4DF0 38 A0 00 00 */ li r5, 0 -/* 801A4DF4 7F A6 EB 78 */ mr r6, r29 -/* 801A4DF8 4B FF E9 CD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -lbl_801A4DFC: -/* 801A4DFC 7F A3 EB 78 */ mr r3, r29 -/* 801A4E00 48 00 20 9D */ bl dKy_setLight_nowroom_actor__FP12dKy_tevstr_c -/* 801A4E04 88 1D 03 7A */ lbz r0, 0x37a(r29) -/* 801A4E08 28 00 00 0A */ cmplwi r0, 0xa -/* 801A4E0C 40 81 00 1C */ ble lbl_801A4E28 -/* 801A4E10 28 00 00 0C */ cmplwi r0, 0xc -/* 801A4E14 41 82 00 14 */ beq lbl_801A4E28 -/* 801A4E18 28 00 00 0D */ cmplwi r0, 0xd -/* 801A4E1C 41 82 00 0C */ beq lbl_801A4E28 -/* 801A4E20 3B E0 00 00 */ li r31, 0 -/* 801A4E24 48 00 00 08 */ b lbl_801A4E2C -lbl_801A4E28: -/* 801A4E28 3B E0 00 01 */ li r31, 1 -lbl_801A4E2C: -/* 801A4E2C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 801A4E30 41 82 00 18 */ beq lbl_801A4E48 -/* 801A4E34 7F 83 E3 78 */ mr r3, r28 -/* 801A4E38 7F A4 EB 78 */ mr r4, r29 -/* 801A4E3C 7F E5 FB 78 */ mr r5, r31 -/* 801A4E40 4B FF FD D1 */ bl dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci -/* 801A4E44 48 00 00 34 */ b lbl_801A4E78 -lbl_801A4E48: -/* 801A4E48 A0 7C 00 5C */ lhz r3, 0x5c(r28) -/* 801A4E4C 3B C3 FF FF */ addi r30, r3, -1 -/* 801A4E50 48 00 00 20 */ b lbl_801A4E70 -lbl_801A4E54: -/* 801A4E54 80 7C 00 60 */ lwz r3, 0x60(r28) -/* 801A4E58 57 C0 13 BA */ rlwinm r0, r30, 2, 0xe, 0x1d -/* 801A4E5C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 801A4E60 7F A4 EB 78 */ mr r4, r29 -/* 801A4E64 7F E5 FB 78 */ mr r5, r31 -/* 801A4E68 4B FF F5 B9 */ bl setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci -/* 801A4E6C 3B DE FF FF */ addi r30, r30, -1 -lbl_801A4E70: -/* 801A4E70 2C 1E 00 00 */ cmpwi r30, 0 -/* 801A4E74 40 80 FF E0 */ bge lbl_801A4E54 -lbl_801A4E78: -/* 801A4E78 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A4E7C 48 1B D3 A9 */ bl _restgpr_28 -/* 801A4E80 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801A4E84 7C 08 03 A6 */ mtlr r0 -/* 801A4E88 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A4E8C 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_setupStageTexture__FP12J3DModelData.s b/asm/m_Do/m_Do_ext/mDoExt_setupStageTexture__FP12J3DModelData.s deleted file mode 100644 index ce618f2229..0000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_setupStageTexture__FP12J3DModelData.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_8000EA80: -/* 8000EA80 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8000EA84 7C 08 02 A6 */ mflr r0 -/* 8000EA88 90 01 00 64 */ stw r0, 0x64(r1) -/* 8000EA8C 39 61 00 60 */ addi r11, r1, 0x60 -/* 8000EA90 48 35 37 45 */ bl _savegpr_27 -/* 8000EA94 7C 7B 1B 78 */ mr r27, r3 -/* 8000EA98 83 E3 00 6C */ lwz r31, 0x6c(r3) -/* 8000EA9C 28 1F 00 00 */ cmplwi r31, 0 -/* 8000EAA0 41 82 02 08 */ beq lbl_8000ECA8 -/* 8000EAA4 83 DB 00 70 */ lwz r30, 0x70(r27) -/* 8000EAA8 28 1E 00 00 */ cmplwi r30, 0 -/* 8000EAAC 41 82 01 FC */ beq lbl_8000ECA8 -/* 8000EAB0 38 80 00 00 */ li r4, 0 -/* 8000EAB4 3B 80 00 00 */ li r28, 0 -/* 8000EAB8 48 00 01 40 */ b lbl_8000EBF8 -lbl_8000EABC: -/* 8000EABC 80 1F 00 04 */ lwz r0, 4(r31) -/* 8000EAC0 57 9D 2A F4 */ rlwinm r29, r28, 5, 0xb, 0x1a -/* 8000EAC4 7C 60 EA 14 */ add r3, r0, r29 -/* 8000EAC8 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 8000EACC 28 00 00 00 */ cmplwi r0, 0 -/* 8000EAD0 40 82 01 24 */ bne lbl_8000EBF4 -/* 8000EAD4 7F C3 F3 78 */ mr r3, r30 -/* 8000EAD8 7F 84 E3 78 */ mr r4, r28 -/* 8000EADC 48 2D 00 1D */ bl getName__10JUTNameTabCFUs -/* 8000EAE0 7C 66 1B 78 */ mr r6, r3 -/* 8000EAE4 38 61 00 08 */ addi r3, r1, 8 -/* 8000EAE8 38 80 00 40 */ li r4, 0x40 -/* 8000EAEC 3C A0 80 37 */ lis r5, m_Do_m_Do_ext__stringBase0@ha /* 0x803740FC@ha */ -/* 8000EAF0 38 A5 40 FC */ addi r5, r5, m_Do_m_Do_ext__stringBase0@l /* 0x803740FC@l */ -/* 8000EAF4 38 A5 00 1C */ addi r5, r5, 0x1c -/* 8000EAF8 4C C6 31 82 */ crclr 6 -/* 8000EAFC 48 35 7A C1 */ bl snprintf -/* 8000EB00 38 61 00 08 */ addi r3, r1, 8 -/* 8000EB04 48 02 09 31 */ bl dComIfG_getStageRes__FPCc -/* 8000EB08 80 1F 00 04 */ lwz r0, 4(r31) -/* 8000EB0C 7C 80 EA 14 */ add r4, r0, r29 -/* 8000EB10 88 03 00 00 */ lbz r0, 0(r3) -/* 8000EB14 98 04 00 00 */ stb r0, 0(r4) -/* 8000EB18 88 03 00 01 */ lbz r0, 1(r3) -/* 8000EB1C 98 04 00 01 */ stb r0, 1(r4) -/* 8000EB20 A0 03 00 02 */ lhz r0, 2(r3) -/* 8000EB24 B0 04 00 02 */ sth r0, 2(r4) -/* 8000EB28 A0 03 00 04 */ lhz r0, 4(r3) -/* 8000EB2C B0 04 00 04 */ sth r0, 4(r4) -/* 8000EB30 88 03 00 06 */ lbz r0, 6(r3) -/* 8000EB34 98 04 00 06 */ stb r0, 6(r4) -/* 8000EB38 88 03 00 07 */ lbz r0, 7(r3) -/* 8000EB3C 98 04 00 07 */ stb r0, 7(r4) -/* 8000EB40 88 03 00 08 */ lbz r0, 8(r3) -/* 8000EB44 98 04 00 08 */ stb r0, 8(r4) -/* 8000EB48 88 03 00 09 */ lbz r0, 9(r3) -/* 8000EB4C 98 04 00 09 */ stb r0, 9(r4) -/* 8000EB50 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8000EB54 B0 04 00 0A */ sth r0, 0xa(r4) -/* 8000EB58 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8000EB5C 90 04 00 0C */ stw r0, 0xc(r4) -/* 8000EB60 88 03 00 10 */ lbz r0, 0x10(r3) -/* 8000EB64 98 04 00 10 */ stb r0, 0x10(r4) -/* 8000EB68 88 03 00 11 */ lbz r0, 0x11(r3) -/* 8000EB6C 98 04 00 11 */ stb r0, 0x11(r4) -/* 8000EB70 88 03 00 12 */ lbz r0, 0x12(r3) -/* 8000EB74 98 04 00 12 */ stb r0, 0x12(r4) -/* 8000EB78 88 03 00 13 */ lbz r0, 0x13(r3) -/* 8000EB7C 98 04 00 13 */ stb r0, 0x13(r4) -/* 8000EB80 88 03 00 14 */ lbz r0, 0x14(r3) -/* 8000EB84 98 04 00 14 */ stb r0, 0x14(r4) -/* 8000EB88 88 03 00 15 */ lbz r0, 0x15(r3) -/* 8000EB8C 98 04 00 15 */ stb r0, 0x15(r4) -/* 8000EB90 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8000EB94 98 04 00 16 */ stb r0, 0x16(r4) -/* 8000EB98 88 03 00 17 */ lbz r0, 0x17(r3) -/* 8000EB9C 98 04 00 17 */ stb r0, 0x17(r4) -/* 8000EBA0 88 03 00 18 */ lbz r0, 0x18(r3) -/* 8000EBA4 98 04 00 18 */ stb r0, 0x18(r4) -/* 8000EBA8 88 03 00 19 */ lbz r0, 0x19(r3) -/* 8000EBAC 98 04 00 19 */ stb r0, 0x19(r4) -/* 8000EBB0 A8 03 00 1A */ lha r0, 0x1a(r3) -/* 8000EBB4 B0 04 00 1A */ sth r0, 0x1a(r4) -/* 8000EBB8 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 8000EBBC 90 04 00 1C */ stw r0, 0x1c(r4) -/* 8000EBC0 80 1F 00 04 */ lwz r0, 4(r31) -/* 8000EBC4 7C 80 EA 14 */ add r4, r0, r29 -/* 8000EBC8 80 04 00 1C */ lwz r0, 0x1c(r4) -/* 8000EBCC 7C 03 02 14 */ add r0, r3, r0 -/* 8000EBD0 7C 04 00 50 */ subf r0, r4, r0 -/* 8000EBD4 90 04 00 1C */ stw r0, 0x1c(r4) -/* 8000EBD8 80 1F 00 04 */ lwz r0, 4(r31) -/* 8000EBDC 7C 80 EA 14 */ add r4, r0, r29 -/* 8000EBE0 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8000EBE4 7C 03 02 14 */ add r0, r3, r0 -/* 8000EBE8 7C 04 00 50 */ subf r0, r4, r0 -/* 8000EBEC 90 04 00 0C */ stw r0, 0xc(r4) -/* 8000EBF0 38 80 00 01 */ li r4, 1 -lbl_8000EBF4: -/* 8000EBF4 3B 9C 00 01 */ addi r28, r28, 1 -lbl_8000EBF8: -/* 8000EBF8 57 83 04 3E */ clrlwi r3, r28, 0x10 -/* 8000EBFC A0 1F 00 00 */ lhz r0, 0(r31) -/* 8000EC00 7C 03 00 40 */ cmplw r3, r0 -/* 8000EC04 41 80 FE B8 */ blt lbl_8000EABC -/* 8000EC08 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8000EC0C 41 82 00 9C */ beq lbl_8000ECA8 -/* 8000EC10 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8000EC14 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8000EC18 93 E3 00 58 */ stw r31, 0x58(r3) -/* 8000EC1C 3B C0 00 00 */ li r30, 0 -/* 8000EC20 48 00 00 78 */ b lbl_8000EC98 -lbl_8000EC24: -/* 8000EC24 80 7B 00 60 */ lwz r3, 0x60(r27) -/* 8000EC28 57 C0 13 BA */ rlwinm r0, r30, 2, 0xe, 0x1d -/* 8000EC2C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8000EC30 83 83 00 2C */ lwz r28, 0x2c(r3) -/* 8000EC34 28 1C 00 00 */ cmplwi r28, 0 -/* 8000EC38 41 82 00 5C */ beq lbl_8000EC94 -/* 8000EC3C 83 A3 00 48 */ lwz r29, 0x48(r3) -/* 8000EC40 28 1D 00 00 */ cmplwi r29, 0 -/* 8000EC44 41 82 00 50 */ beq lbl_8000EC94 -/* 8000EC48 48 32 EA AD */ bl OSDisableInterrupts -/* 8000EC4C 7C 7F 1B 78 */ mr r31, r3 -/* 8000EC50 3C 60 80 43 */ lis r3, sGDLObj__17J3DDisplayListObj@ha /* 0x80434C70@ha */ -/* 8000EC54 38 63 4C 70 */ addi r3, r3, sGDLObj__17J3DDisplayListObj@l /* 0x80434C70@l */ -/* 8000EC58 80 9D 00 00 */ lwz r4, 0(r29) -/* 8000EC5C 80 BD 00 08 */ lwz r5, 8(r29) -/* 8000EC60 48 35 23 39 */ bl GDInitGDLObj -/* 8000EC64 3C 60 80 43 */ lis r3, sGDLObj__17J3DDisplayListObj@ha /* 0x80434C70@ha */ -/* 8000EC68 38 03 4C 70 */ addi r0, r3, sGDLObj__17J3DDisplayListObj@l /* 0x80434C70@l */ -/* 8000EC6C 90 0D 94 00 */ stw r0, __GDCurrentDL(r13) -/* 8000EC70 7F 83 E3 78 */ mr r3, r28 -/* 8000EC74 81 9C 00 00 */ lwz r12, 0(r28) -/* 8000EC78 81 8C 00 34 */ lwz r12, 0x34(r12) -/* 8000EC7C 7D 89 03 A6 */ mtctr r12 -/* 8000EC80 4E 80 04 21 */ bctrl -/* 8000EC84 7F E3 FB 78 */ mr r3, r31 -/* 8000EC88 48 32 EA 95 */ bl OSRestoreInterrupts -/* 8000EC8C 38 00 00 00 */ li r0, 0 -/* 8000EC90 90 0D 94 00 */ stw r0, __GDCurrentDL(r13) -lbl_8000EC94: -/* 8000EC94 3B DE 00 01 */ addi r30, r30, 1 -lbl_8000EC98: -/* 8000EC98 57 C3 04 3E */ clrlwi r3, r30, 0x10 -/* 8000EC9C A0 1B 00 5C */ lhz r0, 0x5c(r27) -/* 8000ECA0 7C 03 00 40 */ cmplw r3, r0 -/* 8000ECA4 41 80 FF 80 */ blt lbl_8000EC24 -lbl_8000ECA8: -/* 8000ECA8 39 61 00 60 */ addi r11, r1, 0x60 -/* 8000ECAC 48 35 35 75 */ bl _restgpr_27 -/* 8000ECB0 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8000ECB4 7C 08 03 A6 */ mtlr r0 -/* 8000ECB8 38 21 00 60 */ addi r1, r1, 0x60 -/* 8000ECBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Delete__FP13kytag08_class.s b/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Delete__FP13kytag08_class.s deleted file mode 100644 index 5c1ed9d4fb..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Delete__FP13kytag08_class.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8085AEA8: -/* 8085AEA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8085AEAC 7C 08 02 A6 */ mflr r0 -/* 8085AEB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8085AEB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8085AEB8 7C 7F 1B 78 */ mr r31, r3 -/* 8085AEBC 80 63 05 9C */ lwz r3, 0x59c(r3) -/* 8085AEC0 28 03 00 00 */ cmplwi r3, 0 -/* 8085AEC4 41 82 00 40 */ beq lbl_8085AF04 -/* 8085AEC8 4B A2 3D 99 */ bl deleteAllParticle__14JPABaseEmitterFv -/* 8085AECC 80 7F 05 9C */ lwz r3, 0x59c(r31) -/* 8085AED0 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8085AED4 60 00 00 01 */ ori r0, r0, 1 -/* 8085AED8 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8085AEDC 38 00 00 01 */ li r0, 1 -/* 8085AEE0 90 03 00 24 */ stw r0, 0x24(r3) -/* 8085AEE4 80 7F 05 9C */ lwz r3, 0x59c(r31) -/* 8085AEE8 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8085AEEC 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 8085AEF0 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8085AEF4 38 00 00 00 */ li r0, 0 -/* 8085AEF8 80 7F 05 9C */ lwz r3, 0x59c(r31) -/* 8085AEFC 90 03 00 EC */ stw r0, 0xec(r3) -/* 8085AF00 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_8085AF04: -/* 8085AF04 80 7F 05 A0 */ lwz r3, 0x5a0(r31) -/* 8085AF08 28 03 00 00 */ cmplwi r3, 0 -/* 8085AF0C 41 82 00 40 */ beq lbl_8085AF4C -/* 8085AF10 4B A2 3D 51 */ bl deleteAllParticle__14JPABaseEmitterFv -/* 8085AF14 80 7F 05 A0 */ lwz r3, 0x5a0(r31) -/* 8085AF18 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8085AF1C 60 00 00 01 */ ori r0, r0, 1 -/* 8085AF20 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8085AF24 38 00 00 01 */ li r0, 1 -/* 8085AF28 90 03 00 24 */ stw r0, 0x24(r3) -/* 8085AF2C 80 7F 05 A0 */ lwz r3, 0x5a0(r31) -/* 8085AF30 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8085AF34 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 8085AF38 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8085AF3C 38 00 00 00 */ li r0, 0 -/* 8085AF40 80 7F 05 A0 */ lwz r3, 0x5a0(r31) -/* 8085AF44 90 03 00 EC */ stw r0, 0xec(r3) -/* 8085AF48 90 1F 05 A0 */ stw r0, 0x5a0(r31) -lbl_8085AF4C: -/* 8085AF4C 38 7F 05 A4 */ addi r3, r31, 0x5a4 -/* 8085AF50 3C 80 80 86 */ lis r4, d_a_kytag08__stringBase0@ha /* 0x8085B310@ha */ -/* 8085AF54 38 84 B3 10 */ addi r4, r4, d_a_kytag08__stringBase0@l /* 0x8085B310@l */ -/* 8085AF58 4B 7D 20 B1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8085AF5C 38 60 00 01 */ li r3, 1 -/* 8085AF60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8085AF64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8085AF68 7C 08 03 A6 */ mtlr r0 -/* 8085AF6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8085AF70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 5579c9845a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8059A5C8: -/* 8059A5C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059A5CC 7C 08 02 A6 */ mflr r0 -/* 8059A5D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059A5D4 48 00 02 35 */ bl CreateHeap__11daObjSwPr_cFv -/* 8059A5D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059A5DC 7C 08 03 A6 */ mtlr r0 -/* 8059A5E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059A5E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/CreateHeap__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/CreateHeap__11daObjSwPr_cFv.s deleted file mode 100644 index e60c564829..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/CreateHeap__11daObjSwPr_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8059A808: -/* 8059A808 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059A80C 7C 08 02 A6 */ mflr r0 -/* 8059A810 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059A814 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059A818 7C 7F 1B 78 */ mr r31, r3 -/* 8059A81C 88 03 08 3E */ lbz r0, 0x83e(r3) -/* 8059A820 54 00 10 3A */ slwi r0, r0, 2 -/* 8059A824 3C 60 80 5A */ lis r3, l_arcName@ha /* 0x8059B380@ha */ -/* 8059A828 38 63 B3 80 */ addi r3, r3, l_arcName@l /* 0x8059B380@l */ -/* 8059A82C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8059A830 3C 80 80 5A */ lis r4, l_bmdName@ha /* 0x8059B2C8@ha */ -/* 8059A834 38 84 B2 C8 */ addi r4, r4, l_bmdName@l /* 0x8059B2C8@l */ -/* 8059A838 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8059A83C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059A840 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059A844 3C A5 00 02 */ addis r5, r5, 2 -/* 8059A848 38 C0 00 80 */ li r6, 0x80 -/* 8059A84C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8059A850 4B AA 1A 9D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8059A854 3C 80 00 08 */ lis r4, 8 -/* 8059A858 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 8059A85C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 8059A860 4B A7 A3 F5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8059A864 90 7F 05 70 */ stw r3, 0x570(r31) -/* 8059A868 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 8059A86C 30 03 FF FF */ addic r0, r3, -1 -/* 8059A870 7C 60 19 10 */ subfe r3, r0, r3 -/* 8059A874 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059A878 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059A87C 7C 08 03 A6 */ mtlr r0 -/* 8059A880 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059A884 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/Create__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/Create__11daObjSwPr_cFv.s deleted file mode 100644 index 4d80ead704..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/Create__11daObjSwPr_cFv.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_8059A670: -/* 8059A670 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8059A674 7C 08 02 A6 */ mflr r0 -/* 8059A678 90 01 00 24 */ stw r0, 0x24(r1) -/* 8059A67C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059A680 4B DC 7B 55 */ bl _savegpr_27 -/* 8059A684 7C 7E 1B 78 */ mr r30, r3 -/* 8059A688 3C 80 80 5A */ lis r4, l_bmdName@ha /* 0x8059B2C8@ha */ -/* 8059A68C 3B E4 B2 C8 */ addi r31, r4, l_bmdName@l /* 0x8059B2C8@l */ -/* 8059A690 4B FF FF 59 */ bl initBaseMtx__11daObjSwPr_cFv -/* 8059A694 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 8059A698 38 03 00 24 */ addi r0, r3, 0x24 -/* 8059A69C 90 1E 05 04 */ stw r0, 0x504(r30) -/* 8059A6A0 38 7E 05 74 */ addi r3, r30, 0x574 -/* 8059A6A4 38 80 00 FF */ li r4, 0xff -/* 8059A6A8 38 A0 00 FF */ li r5, 0xff -/* 8059A6AC 7F C6 F3 78 */ mr r6, r30 -/* 8059A6B0 4B AE 91 B1 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 8059A6B4 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 8059A6B8 38 9F 00 10 */ addi r4, r31, 0x10 -/* 8059A6BC 4B AE A1 F9 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 8059A6C0 38 1E 05 74 */ addi r0, r30, 0x574 -/* 8059A6C4 90 1E 05 F4 */ stw r0, 0x5f4(r30) -/* 8059A6C8 88 1E 08 3C */ lbz r0, 0x83c(r30) -/* 8059A6CC 28 00 00 01 */ cmplwi r0, 1 -/* 8059A6D0 40 82 00 28 */ bne lbl_8059A6F8 -/* 8059A6D4 38 7E 06 EC */ addi r3, r30, 0x6ec -/* 8059A6D8 38 9F 00 10 */ addi r4, r31, 0x10 -/* 8059A6DC 4B AE A1 D9 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 8059A6E0 38 1E 05 74 */ addi r0, r30, 0x574 -/* 8059A6E4 90 1E 07 30 */ stw r0, 0x730(r30) -/* 8059A6E8 38 00 02 00 */ li r0, 0x200 -/* 8059A6EC 90 1E 07 14 */ stw r0, 0x714(r30) -/* 8059A6F0 38 00 00 03 */ li r0, 3 -/* 8059A6F4 98 1E 07 A5 */ stb r0, 0x7a5(r30) -lbl_8059A6F8: -/* 8059A6F8 7F C3 F3 78 */ mr r3, r30 -/* 8059A6FC C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 8059A700 38 9F 00 54 */ addi r4, r31, 0x54 -/* 8059A704 C0 44 00 04 */ lfs f2, 4(r4) -/* 8059A708 C0 64 00 08 */ lfs f3, 8(r4) -/* 8059A70C C0 84 00 0C */ lfs f4, 0xc(r4) -/* 8059A710 C0 A4 00 10 */ lfs f5, 0x10(r4) -/* 8059A714 C0 C4 00 14 */ lfs f6, 0x14(r4) -/* 8059A718 4B A7 FE 31 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 8059A71C 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 8059A720 80 63 00 04 */ lwz r3, 4(r3) -/* 8059A724 83 83 00 54 */ lwz r28, 0x54(r3) -/* 8059A728 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 8059A72C 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 8059A730 B0 1E 08 30 */ sth r0, 0x830(r30) -/* 8059A734 3B 60 00 00 */ li r27, 0 -/* 8059A738 3C 60 80 5A */ lis r3, l_joint_name@ha /* 0x8059B388@ha */ -/* 8059A73C 3B A3 B3 88 */ addi r29, r3, l_joint_name@l /* 0x8059B388@l */ -/* 8059A740 48 00 00 28 */ b lbl_8059A768 -lbl_8059A744: -/* 8059A744 7F 83 E3 78 */ mr r3, r28 -/* 8059A748 7F 64 DB 78 */ mr r4, r27 -/* 8059A74C 4B D4 43 AD */ bl getName__10JUTNameTabCFUs -/* 8059A750 80 9D 00 00 */ lwz r4, 0(r29) -/* 8059A754 4B DC E2 41 */ bl strcmp -/* 8059A758 2C 03 00 00 */ cmpwi r3, 0 -/* 8059A75C 40 82 00 08 */ bne lbl_8059A764 -/* 8059A760 B3 7E 08 30 */ sth r27, 0x830(r30) -lbl_8059A764: -/* 8059A764 3B 7B 00 01 */ addi r27, r27, 1 -lbl_8059A768: -/* 8059A768 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 8059A76C 80 83 00 04 */ lwz r4, 4(r3) -/* 8059A770 A0 64 00 2C */ lhz r3, 0x2c(r4) -/* 8059A774 57 60 04 3E */ clrlwi r0, r27, 0x10 -/* 8059A778 7C 00 18 40 */ cmplw r0, r3 -/* 8059A77C 41 80 FF C8 */ blt lbl_8059A744 -/* 8059A780 80 64 00 28 */ lwz r3, 0x28(r4) -/* 8059A784 A0 1E 08 30 */ lhz r0, 0x830(r30) -/* 8059A788 54 00 10 3A */ slwi r0, r0, 2 -/* 8059A78C 7C 83 00 2E */ lwzx r4, r3, r0 -/* 8059A790 3C 60 80 5A */ lis r3, nodeCallBack__FP8J3DJointi@ha /* 0x8059A518@ha */ -/* 8059A794 38 03 A5 18 */ addi r0, r3, nodeCallBack__FP8J3DJointi@l /* 0x8059A518@l */ -/* 8059A798 90 04 00 04 */ stw r0, 4(r4) -/* 8059A79C 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 8059A7A0 93 C3 00 14 */ stw r30, 0x14(r3) -/* 8059A7A4 C0 3E 05 3C */ lfs f1, 0x53c(r30) -/* 8059A7A8 C0 1F 00 74 */ lfs f0, 0x74(r31) -/* 8059A7AC EC 01 00 2A */ fadds f0, f1, f0 -/* 8059A7B0 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 8059A7B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059A7B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059A7BC 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8059A7C0 3C 80 80 5A */ lis r4, d_a_obj_swpropeller__stringBase0@ha /* 0x8059B360@ha */ -/* 8059A7C4 38 84 B3 60 */ addi r4, r4, d_a_obj_swpropeller__stringBase0@l /* 0x8059B360@l */ -/* 8059A7C8 38 84 00 19 */ addi r4, r4, 0x19 -/* 8059A7CC 4B DC E1 C9 */ bl strcmp -/* 8059A7D0 2C 03 00 00 */ cmpwi r3, 0 -/* 8059A7D4 40 82 00 18 */ bne lbl_8059A7EC -/* 8059A7D8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8059A7DC 2C 00 00 04 */ cmpwi r0, 4 -/* 8059A7E0 40 82 00 0C */ bne lbl_8059A7EC -/* 8059A7E4 C0 1F 00 74 */ lfs f0, 0x74(r31) -/* 8059A7E8 D0 1E 05 20 */ stfs f0, 0x520(r30) -lbl_8059A7EC: -/* 8059A7EC 38 60 00 01 */ li r3, 1 -/* 8059A7F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059A7F4 4B DC 7A 2D */ bl _restgpr_27 -/* 8059A7F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059A7FC 7C 08 03 A6 */ mtlr r0 -/* 8059A800 38 21 00 20 */ addi r1, r1, 0x20 -/* 8059A804 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/__dt__8cM3dGAabFv.s deleted file mode 100644 index e3dccfcca8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8059AABC: -/* 8059AABC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059AAC0 7C 08 02 A6 */ mflr r0 -/* 8059AAC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059AAC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059AACC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8059AAD0 41 82 00 1C */ beq lbl_8059AAEC -/* 8059AAD4 3C A0 80 5A */ lis r5, __vt__8cM3dGAab@ha /* 0x8059B3E8@ha */ -/* 8059AAD8 38 05 B3 E8 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x8059B3E8@l */ -/* 8059AADC 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8059AAE0 7C 80 07 35 */ extsh. r0, r4 -/* 8059AAE4 40 81 00 08 */ ble lbl_8059AAEC -/* 8059AAE8 4B D3 42 55 */ bl __dl__FPv -lbl_8059AAEC: -/* 8059AAEC 7F E3 FB 78 */ mr r3, r31 -/* 8059AAF0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059AAF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059AAF8 7C 08 03 A6 */ mtlr r0 -/* 8059AAFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059AB00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/__dt__8cM3dGCylFv.s deleted file mode 100644 index 160bfb79fd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8059AA74: -/* 8059AA74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059AA78 7C 08 02 A6 */ mflr r0 -/* 8059AA7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059AA80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059AA84 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8059AA88 41 82 00 1C */ beq lbl_8059AAA4 -/* 8059AA8C 3C A0 80 5A */ lis r5, __vt__8cM3dGCyl@ha /* 0x8059B3DC@ha */ -/* 8059AA90 38 05 B3 DC */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x8059B3DC@l */ -/* 8059AA94 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8059AA98 7C 80 07 35 */ extsh. r0, r4 -/* 8059AA9C 40 81 00 08 */ ble lbl_8059AAA4 -/* 8059AAA0 4B D3 42 9D */ bl __dl__FPv -lbl_8059AAA4: -/* 8059AAA4 7F E3 FB 78 */ mr r3, r31 -/* 8059AAA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059AAAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059AAB0 7C 08 03 A6 */ mtlr r0 -/* 8059AAB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059AAB8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/_delete__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/_delete__11daObjSwPr_cFv.s deleted file mode 100644 index 2d59bcfd52..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/_delete__11daObjSwPr_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8059B1AC: -/* 8059B1AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059B1B0 7C 08 02 A6 */ mflr r0 -/* 8059B1B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059B1B8 7C 64 1B 78 */ mr r4, r3 -/* 8059B1BC 38 64 05 68 */ addi r3, r4, 0x568 -/* 8059B1C0 88 04 08 3E */ lbz r0, 0x83e(r4) -/* 8059B1C4 54 00 10 3A */ slwi r0, r0, 2 -/* 8059B1C8 3C 80 80 5A */ lis r4, l_arcName@ha /* 0x8059B380@ha */ -/* 8059B1CC 38 84 B3 80 */ addi r4, r4, l_arcName@l /* 0x8059B380@l */ -/* 8059B1D0 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8059B1D4 4B A9 1E 35 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8059B1D8 38 60 00 01 */ li r3, 1 -/* 8059B1DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059B1E0 7C 08 03 A6 */ mtlr r0 -/* 8059B1E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059B1E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Create__FP10fopAc_ac_c.s deleted file mode 100644 index e19a78d1e8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8059B24C: -/* 8059B24C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059B250 7C 08 02 A6 */ mflr r0 -/* 8059B254 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059B258 4B FF F6 31 */ bl create__11daObjSwPr_cFv -/* 8059B25C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059B260 7C 08 03 A6 */ mtlr r0 -/* 8059B264 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059B268 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Delete__FP11daObjSwPr_c.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Delete__FP11daObjSwPr_c.s deleted file mode 100644 index ef092e2d26..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Delete__FP11daObjSwPr_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8059B22C: -/* 8059B22C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059B230 7C 08 02 A6 */ mflr r0 -/* 8059B234 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059B238 4B FF FF 75 */ bl _delete__11daObjSwPr_cFv -/* 8059B23C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059B240 7C 08 03 A6 */ mtlr r0 -/* 8059B244 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059B248 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Draw__FP11daObjSwPr_c.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Draw__FP11daObjSwPr_c.s deleted file mode 100644 index 226e8bd577..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Draw__FP11daObjSwPr_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8059B1EC: -/* 8059B1EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059B1F0 7C 08 02 A6 */ mflr r0 -/* 8059B1F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059B1F8 4B FF FF 51 */ bl draw__11daObjSwPr_cFv -/* 8059B1FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059B200 7C 08 03 A6 */ mtlr r0 -/* 8059B204 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059B208 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Execute__FP11daObjSwPr_c.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Execute__FP11daObjSwPr_c.s deleted file mode 100644 index 4ba20d8816..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/daObjSwPr_Execute__FP11daObjSwPr_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8059B20C: -/* 8059B20C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059B210 7C 08 02 A6 */ mflr r0 -/* 8059B214 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059B218 4B FF FD FD */ bl execute__11daObjSwPr_cFv -/* 8059B21C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059B220 7C 08 03 A6 */ mtlr r0 -/* 8059B224 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059B228 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/draw__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/draw__11daObjSwPr_cFv.s deleted file mode 100644 index c5fbda80d1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/draw__11daObjSwPr_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8059B148: -/* 8059B148 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059B14C 7C 08 02 A6 */ mflr r0 -/* 8059B150 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059B154 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059B158 7C 7F 1B 78 */ mr r31, r3 -/* 8059B15C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8059B160 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8059B164 38 80 00 10 */ li r4, 0x10 -/* 8059B168 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8059B16C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 8059B170 4B C0 86 55 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8059B174 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8059B178 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8059B17C 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 8059B180 80 84 00 04 */ lwz r4, 4(r4) -/* 8059B184 38 BF 01 0C */ addi r5, r31, 0x10c -/* 8059B188 4B C0 9C 19 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8059B18C 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 8059B190 4B A7 2B 35 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8059B194 38 60 00 01 */ li r3, 1 -/* 8059B198 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059B19C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059B1A0 7C 08 03 A6 */ mtlr r0 -/* 8059B1A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059B1A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute__11daObjSwPr_cFv.s deleted file mode 100644 index 3b5aaffd80..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute__11daObjSwPr_cFv.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_8059B014: -/* 8059B014 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8059B018 7C 08 02 A6 */ mflr r0 -/* 8059B01C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8059B020 39 61 00 30 */ addi r11, r1, 0x30 -/* 8059B024 4B DC 71 B9 */ bl _savegpr_29 -/* 8059B028 7C 7E 1B 78 */ mr r30, r3 -/* 8059B02C 3C 80 80 5A */ lis r4, l_bmdName@ha /* 0x8059B2C8@ha */ -/* 8059B030 3B E4 B2 C8 */ addi r31, r4, l_bmdName@l /* 0x8059B2C8@l */ -/* 8059B034 88 03 08 3C */ lbz r0, 0x83c(r3) -/* 8059B038 2C 00 00 01 */ cmpwi r0, 1 -/* 8059B03C 41 82 00 1C */ beq lbl_8059B058 -/* 8059B040 40 80 00 1C */ bge lbl_8059B05C -/* 8059B044 2C 00 00 00 */ cmpwi r0, 0 -/* 8059B048 40 80 00 08 */ bge lbl_8059B050 -/* 8059B04C 48 00 00 10 */ b lbl_8059B05C -lbl_8059B050: -/* 8059B050 4B FF FB 4D */ bl execute_type_boomerang__11daObjSwPr_cFv -/* 8059B054 48 00 00 08 */ b lbl_8059B05C -lbl_8059B058: -/* 8059B058 4B FF FD 75 */ bl execute_type_wind__11daObjSwPr_cFv -lbl_8059B05C: -/* 8059B05C A8 7E 08 28 */ lha r3, 0x828(r30) -/* 8059B060 7C 60 07 35 */ extsh. r0, r3 -/* 8059B064 41 82 00 A0 */ beq lbl_8059B104 -/* 8059B068 A8 9E 08 2A */ lha r4, 0x82a(r30) -/* 8059B06C 7C 80 07 35 */ extsh. r0, r4 -/* 8059B070 41 82 00 94 */ beq lbl_8059B104 -/* 8059B074 C0 7F 00 80 */ lfs f3, 0x80(r31) -/* 8059B078 C8 5F 00 90 */ lfd f2, 0x90(r31) -/* 8059B07C 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 8059B080 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059B084 3C 60 43 30 */ lis r3, 0x4330 -/* 8059B088 90 61 00 10 */ stw r3, 0x10(r1) -/* 8059B08C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8059B090 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8059B094 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 8059B098 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8059B09C 90 61 00 18 */ stw r3, 0x18(r1) -/* 8059B0A0 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8059B0A4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8059B0A8 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8059B0AC EC 23 00 32 */ fmuls f1, f3, f0 -/* 8059B0B0 4B DC 6F FD */ bl __cvt_fp2unsigned -/* 8059B0B4 7C 7D 1B 78 */ mr r29, r3 -/* 8059B0B8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8059B0BC 7C 03 07 74 */ extsb r3, r0 -/* 8059B0C0 4B A9 1F AD */ bl dComIfGp_getReverb__Fi -/* 8059B0C4 7C 67 1B 78 */ mr r7, r3 -/* 8059B0C8 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800CF@ha */ -/* 8059B0CC 38 03 00 CF */ addi r0, r3, 0x00CF /* 0x000800CF@l */ -/* 8059B0D0 90 01 00 08 */ stw r0, 8(r1) -/* 8059B0D4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8059B0D8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8059B0DC 80 63 00 00 */ lwz r3, 0(r3) -/* 8059B0E0 38 81 00 08 */ addi r4, r1, 8 -/* 8059B0E4 38 BE 05 38 */ addi r5, r30, 0x538 -/* 8059B0E8 7F A6 EB 78 */ mr r6, r29 -/* 8059B0EC C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8059B0F0 FC 40 08 90 */ fmr f2, f1 -/* 8059B0F4 C0 7F 00 7C */ lfs f3, 0x7c(r31) -/* 8059B0F8 FC 80 18 90 */ fmr f4, f3 -/* 8059B0FC 39 00 00 00 */ li r8, 0 -/* 8059B100 4B D1 14 0D */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_8059B104: -/* 8059B104 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059B108 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059B10C 38 63 5B 6C */ addi r3, r3, 0x5b6c -/* 8059B110 7F C4 F3 78 */ mr r4, r30 -/* 8059B114 C0 3F 00 84 */ lfs f1, 0x84(r31) -/* 8059B118 C0 5F 00 88 */ lfs f2, 0x88(r31) -/* 8059B11C C0 7F 00 8C */ lfs f3, 0x8c(r31) -/* 8059B120 38 A0 69 78 */ li r5, 0x6978 -/* 8059B124 38 C0 00 02 */ li r6, 2 -/* 8059B128 4B AD 8B E1 */ bl request__10dAttLook_cFP10fopAc_ac_cfffsi -/* 8059B12C 38 60 00 01 */ li r3, 1 -/* 8059B130 39 61 00 30 */ addi r11, r1, 0x30 -/* 8059B134 4B DC 70 F5 */ bl _restgpr_29 -/* 8059B138 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8059B13C 7C 08 03 A6 */ mtlr r0 -/* 8059B140 38 21 00 30 */ addi r1, r1, 0x30 -/* 8059B144 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute_type_boomerang__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute_type_boomerang__11daObjSwPr_cFv.s deleted file mode 100644 index 78c27b92af..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute_type_boomerang__11daObjSwPr_cFv.s +++ /dev/null @@ -1,148 +0,0 @@ -lbl_8059AB9C: -/* 8059AB9C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8059ABA0 7C 08 02 A6 */ mflr r0 -/* 8059ABA4 90 01 00 44 */ stw r0, 0x44(r1) -/* 8059ABA8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8059ABAC 4B DC 76 2D */ bl _savegpr_28 -/* 8059ABB0 7C 7E 1B 78 */ mr r30, r3 -/* 8059ABB4 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 8059ABB8 4B AE 98 A9 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 8059ABBC 30 03 FF FF */ addic r0, r3, -1 -/* 8059ABC0 7C 00 19 10 */ subfe r0, r0, r3 -/* 8059ABC4 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 8059ABC8 A8 7E 08 2C */ lha r3, 0x82c(r30) -/* 8059ABCC A8 1E 08 28 */ lha r0, 0x828(r30) -/* 8059ABD0 7C 03 02 14 */ add r0, r3, r0 -/* 8059ABD4 B0 1E 08 2C */ sth r0, 0x82c(r30) -/* 8059ABD8 38 7E 08 28 */ addi r3, r30, 0x828 -/* 8059ABDC 38 80 00 00 */ li r4, 0 -/* 8059ABE0 A8 BE 08 2A */ lha r5, 0x82a(r30) -/* 8059ABE4 A8 1E 08 2E */ lha r0, 0x82e(r30) -/* 8059ABE8 7C 05 03 D6 */ divw r0, r5, r0 -/* 8059ABEC 7C 05 07 34 */ extsh r5, r0 -/* 8059ABF0 4B CD 5F A1 */ bl cLib_chaseAngleS__FPsss -/* 8059ABF4 3B 80 00 00 */ li r28, 0 -/* 8059ABF8 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 8059ABFC 4B AE 98 65 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 8059AC00 28 03 00 00 */ cmplwi r3, 0 -/* 8059AC04 41 82 00 74 */ beq lbl_8059AC78 -/* 8059AC08 88 1E 08 38 */ lbz r0, 0x838(r30) -/* 8059AC0C 28 00 00 00 */ cmplwi r0, 0 -/* 8059AC10 40 82 00 68 */ bne lbl_8059AC78 -/* 8059AC14 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 8059AC18 4B AE 98 E1 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 8059AC1C 7C 7D 1B 79 */ or. r29, r3, r3 -/* 8059AC20 41 82 00 44 */ beq lbl_8059AC64 -/* 8059AC24 80 1D 00 10 */ lwz r0, 0x10(r29) -/* 8059AC28 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 8059AC2C 41 82 00 28 */ beq lbl_8059AC54 -/* 8059AC30 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 8059AC34 4B AE 99 15 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 8059AC38 28 03 00 00 */ cmplwi r3, 0 -/* 8059AC3C 41 82 00 18 */ beq lbl_8059AC54 -/* 8059AC40 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 8059AC44 4B AE 99 05 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 8059AC48 88 03 00 75 */ lbz r0, 0x75(r3) -/* 8059AC4C 28 00 00 03 */ cmplwi r0, 3 -/* 8059AC50 41 82 00 10 */ beq lbl_8059AC60 -lbl_8059AC54: -/* 8059AC54 80 1D 00 10 */ lwz r0, 0x10(r29) -/* 8059AC58 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 8059AC5C 41 82 00 08 */ beq lbl_8059AC64 -lbl_8059AC60: -/* 8059AC60 3B 80 00 01 */ li r28, 1 -lbl_8059AC64: -/* 8059AC64 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 8059AC68 81 9E 05 EC */ lwz r12, 0x5ec(r30) -/* 8059AC6C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 8059AC70 7D 89 03 A6 */ mtctr r12 -/* 8059AC74 4E 80 04 21 */ bctrl -lbl_8059AC78: -/* 8059AC78 2C 1C 00 00 */ cmpwi r28, 0 -/* 8059AC7C 41 82 00 C0 */ beq lbl_8059AD3C -/* 8059AC80 88 7E 08 39 */ lbz r3, 0x839(r30) -/* 8059AC84 38 03 00 01 */ addi r0, r3, 1 -/* 8059AC88 98 1E 08 39 */ stb r0, 0x839(r30) -/* 8059AC8C 38 00 20 00 */ li r0, 0x2000 -/* 8059AC90 B0 1E 08 2A */ sth r0, 0x82a(r30) -/* 8059AC94 B0 1E 08 28 */ sth r0, 0x828(r30) -/* 8059AC98 7F C3 F3 78 */ mr r3, r30 -/* 8059AC9C 4B FF FE 69 */ bl setRotateTime__11daObjSwPr_cFv -/* 8059ACA0 B0 7E 08 2E */ sth r3, 0x82e(r30) -/* 8059ACA4 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8059ACA8 7C 03 07 74 */ extsb r3, r0 -/* 8059ACAC 4B A9 23 C1 */ bl dComIfGp_getReverb__Fi -/* 8059ACB0 7C 67 1B 78 */ mr r7, r3 -/* 8059ACB4 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800E3@ha */ -/* 8059ACB8 38 03 00 E3 */ addi r0, r3, 0x00E3 /* 0x000800E3@l */ -/* 8059ACBC 90 01 00 08 */ stw r0, 8(r1) -/* 8059ACC0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8059ACC4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8059ACC8 80 63 00 00 */ lwz r3, 0(r3) -/* 8059ACCC 38 81 00 08 */ addi r4, r1, 8 -/* 8059ACD0 38 BE 05 38 */ addi r5, r30, 0x538 -/* 8059ACD4 38 C0 00 00 */ li r6, 0 -/* 8059ACD8 3D 00 80 5A */ lis r8, lit_3983@ha /* 0x8059B340@ha */ -/* 8059ACDC C0 28 B3 40 */ lfs f1, lit_3983@l(r8) /* 0x8059B340@l */ -/* 8059ACE0 FC 40 08 90 */ fmr f2, f1 -/* 8059ACE4 3D 00 80 5A */ lis r8, lit_3984@ha /* 0x8059B344@ha */ -/* 8059ACE8 C0 68 B3 44 */ lfs f3, lit_3984@l(r8) /* 0x8059B344@l */ -/* 8059ACEC FC 80 18 90 */ fmr f4, f3 -/* 8059ACF0 39 00 00 00 */ li r8, 0 -/* 8059ACF4 4B D1 0C 91 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8059ACF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059ACFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059AD00 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8059AD04 3C 80 80 5A */ lis r4, d_a_obj_swpropeller__stringBase0@ha /* 0x8059B360@ha */ -/* 8059AD08 38 84 B3 60 */ addi r4, r4, d_a_obj_swpropeller__stringBase0@l /* 0x8059B360@l */ -/* 8059AD0C 38 84 00 19 */ addi r4, r4, 0x19 -/* 8059AD10 4B DC DC 85 */ bl strcmp -/* 8059AD14 2C 03 00 00 */ cmpwi r3, 0 -/* 8059AD18 40 82 00 1C */ bne lbl_8059AD34 -/* 8059AD1C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8059AD20 7C 00 07 75 */ extsb. r0, r0 -/* 8059AD24 40 82 00 10 */ bne lbl_8059AD34 -/* 8059AD28 38 00 00 00 */ li r0, 0 -/* 8059AD2C B0 1E 08 32 */ sth r0, 0x832(r30) -/* 8059AD30 48 00 00 0C */ b lbl_8059AD3C -lbl_8059AD34: -/* 8059AD34 38 00 00 08 */ li r0, 8 -/* 8059AD38 B0 1E 08 32 */ sth r0, 0x832(r30) -lbl_8059AD3C: -/* 8059AD3C 38 7E 08 3A */ addi r3, r30, 0x83a -/* 8059AD40 48 00 05 49 */ bl func_8059B288 -/* 8059AD44 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8059AD48 41 82 00 0C */ beq lbl_8059AD54 -/* 8059AD4C 38 00 20 00 */ li r0, 0x2000 -/* 8059AD50 B0 1E 08 28 */ sth r0, 0x828(r30) -lbl_8059AD54: -/* 8059AD54 7F C3 F3 78 */ mr r3, r30 -/* 8059AD58 4B FF FD BD */ bl switchCtrl__11daObjSwPr_cFv -/* 8059AD5C 7F C3 F3 78 */ mr r3, r30 -/* 8059AD60 4B FF F8 C5 */ bl setBaseMtx__11daObjSwPr_cFv -/* 8059AD64 3C 60 80 43 */ lis r3, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 8059AD68 C4 03 0C F4 */ lfsu f0, Zero__4cXyz@l(r3) /* 0x80430CF4@l */ -/* 8059AD6C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8059AD70 C0 03 00 04 */ lfs f0, 4(r3) -/* 8059AD74 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8059AD78 C0 03 00 08 */ lfs f0, 8(r3) -/* 8059AD7C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8059AD80 38 61 00 0C */ addi r3, r1, 0xc -/* 8059AD84 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 8059AD88 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8059AD8C 4B CC BD 59 */ bl __pl__4cXyzCFRC3Vec -/* 8059AD90 38 7E 06 D4 */ addi r3, r30, 0x6d4 -/* 8059AD94 38 81 00 0C */ addi r4, r1, 0xc -/* 8059AD98 4B CD 44 45 */ bl SetC__8cM3dGCylFRC4cXyz -/* 8059AD9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059ADA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059ADA4 38 63 23 3C */ addi r3, r3, 0x233c -/* 8059ADA8 38 9E 05 B0 */ addi r4, r30, 0x5b0 -/* 8059ADAC 4B CC 9D FD */ bl Set__4cCcSFP8cCcD_Obj -/* 8059ADB0 9B FE 08 38 */ stb r31, 0x838(r30) -/* 8059ADB4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8059ADB8 4B DC 74 6D */ bl _restgpr_28 -/* 8059ADBC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8059ADC0 7C 08 03 A6 */ mtlr r0 -/* 8059ADC4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8059ADC8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute_type_wind__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute_type_wind__11daObjSwPr_cFv.s deleted file mode 100644 index 9cf0202a03..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/execute_type_wind__11daObjSwPr_cFv.s +++ /dev/null @@ -1,153 +0,0 @@ -lbl_8059ADCC: -/* 8059ADCC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8059ADD0 7C 08 02 A6 */ mflr r0 -/* 8059ADD4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8059ADD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059ADDC 4B DC 73 FD */ bl _savegpr_28 -/* 8059ADE0 7C 7C 1B 78 */ mr r28, r3 -/* 8059ADE4 3B C0 00 00 */ li r30, 0 -/* 8059ADE8 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8059ADEC 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 8059ADF0 3B A0 00 00 */ li r29, 0 -/* 8059ADF4 38 7C 06 EC */ addi r3, r28, 0x6ec -/* 8059ADF8 4B AE 96 69 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 8059ADFC 28 03 00 00 */ cmplwi r3, 0 -/* 8059AE00 41 82 00 A0 */ beq lbl_8059AEA0 -/* 8059AE04 38 7C 06 EC */ addi r3, r28, 0x6ec -/* 8059AE08 4B AE 97 41 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 8059AE0C 28 03 00 00 */ cmplwi r3, 0 -/* 8059AE10 41 82 00 98 */ beq lbl_8059AEA8 -/* 8059AE14 38 7C 06 EC */ addi r3, r28, 0x6ec -/* 8059AE18 4B AE 97 31 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 8059AE1C 88 03 00 75 */ lbz r0, 0x75(r3) -/* 8059AE20 28 00 00 03 */ cmplwi r0, 3 -/* 8059AE24 40 82 00 84 */ bne lbl_8059AEA8 -/* 8059AE28 38 7C 06 EC */ addi r3, r28, 0x6ec -/* 8059AE2C 4B AE 96 CD */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 8059AE30 28 03 00 00 */ cmplwi r3, 0 -/* 8059AE34 41 82 00 74 */ beq lbl_8059AEA8 -/* 8059AE38 3B C0 1B 58 */ li r30, 0x1b58 -/* 8059AE3C 38 00 1B 58 */ li r0, 0x1b58 -/* 8059AE40 B0 1C 08 2A */ sth r0, 0x82a(r28) -/* 8059AE44 3B A0 00 01 */ li r29, 1 -/* 8059AE48 A0 7C 08 34 */ lhz r3, 0x834(r28) -/* 8059AE4C 38 03 00 01 */ addi r0, r3, 1 -/* 8059AE50 B0 1C 08 34 */ sth r0, 0x834(r28) -/* 8059AE54 A0 1C 08 34 */ lhz r0, 0x834(r28) -/* 8059AE58 28 00 00 14 */ cmplwi r0, 0x14 -/* 8059AE5C 40 82 00 20 */ bne lbl_8059AE7C -/* 8059AE60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059AE64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059AE68 7F E4 FB 78 */ mr r4, r31 -/* 8059AE6C 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 8059AE70 7C 05 07 74 */ extsb r5, r0 -/* 8059AE74 4B A9 A3 8D */ bl onSwitch__10dSv_info_cFii -/* 8059AE78 48 00 00 30 */ b lbl_8059AEA8 -lbl_8059AE7C: -/* 8059AE7C 28 00 00 19 */ cmplwi r0, 0x19 -/* 8059AE80 40 82 00 28 */ bne lbl_8059AEA8 -/* 8059AE84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059AE88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059AE8C 7F E4 FB 78 */ mr r4, r31 -/* 8059AE90 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 8059AE94 7C 05 07 74 */ extsb r5, r0 -/* 8059AE98 4B A9 A4 19 */ bl offSwitch__10dSv_info_cFii -/* 8059AE9C 48 00 00 0C */ b lbl_8059AEA8 -lbl_8059AEA0: -/* 8059AEA0 38 00 00 00 */ li r0, 0 -/* 8059AEA4 B0 1C 08 34 */ sth r0, 0x834(r28) -lbl_8059AEA8: -/* 8059AEA8 38 7C 05 B0 */ addi r3, r28, 0x5b0 -/* 8059AEAC 4B AE 95 B5 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 8059AEB0 28 03 00 00 */ cmplwi r3, 0 -/* 8059AEB4 41 82 00 A4 */ beq lbl_8059AF58 -/* 8059AEB8 38 7C 05 B0 */ addi r3, r28, 0x5b0 -/* 8059AEBC 4B AE 96 8D */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 8059AEC0 28 03 00 00 */ cmplwi r3, 0 -/* 8059AEC4 41 82 00 C8 */ beq lbl_8059AF8C -/* 8059AEC8 38 7C 05 B0 */ addi r3, r28, 0x5b0 -/* 8059AECC 4B AE 96 7D */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 8059AED0 88 03 00 75 */ lbz r0, 0x75(r3) -/* 8059AED4 28 00 00 03 */ cmplwi r0, 3 -/* 8059AED8 40 82 00 B4 */ bne lbl_8059AF8C -/* 8059AEDC 38 7C 05 B0 */ addi r3, r28, 0x5b0 -/* 8059AEE0 4B AE 96 19 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 8059AEE4 28 03 00 00 */ cmplwi r3, 0 -/* 8059AEE8 41 82 00 A4 */ beq lbl_8059AF8C -/* 8059AEEC 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8059AEF0 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 -/* 8059AEF4 40 82 00 0C */ bne lbl_8059AF00 -/* 8059AEF8 54 60 03 DF */ rlwinm. r0, r3, 0, 0xf, 0xf -/* 8059AEFC 41 82 00 90 */ beq lbl_8059AF8C -lbl_8059AF00: -/* 8059AF00 38 00 1B 58 */ li r0, 0x1b58 -/* 8059AF04 B0 1C 08 28 */ sth r0, 0x828(r28) -/* 8059AF08 A8 1C 08 28 */ lha r0, 0x828(r28) -/* 8059AF0C B0 1C 08 2A */ sth r0, 0x82a(r28) -/* 8059AF10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059AF14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059AF18 7F E4 FB 78 */ mr r4, r31 -/* 8059AF1C 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 8059AF20 7C 05 07 74 */ extsb r5, r0 -/* 8059AF24 4B A9 A2 DD */ bl onSwitch__10dSv_info_cFii -/* 8059AF28 38 00 00 0A */ li r0, 0xa -/* 8059AF2C B0 1C 08 36 */ sth r0, 0x836(r28) -/* 8059AF30 80 1C 00 B0 */ lwz r0, 0xb0(r28) -/* 8059AF34 54 04 46 3E */ srwi r4, r0, 0x18 -/* 8059AF38 28 04 00 FF */ cmplwi r4, 0xff -/* 8059AF3C 41 82 00 50 */ beq lbl_8059AF8C -/* 8059AF40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059AF44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059AF48 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 8059AF4C 7C 05 07 74 */ extsb r5, r0 -/* 8059AF50 4B A9 A2 B1 */ bl onSwitch__10dSv_info_cFii -/* 8059AF54 48 00 00 38 */ b lbl_8059AF8C -lbl_8059AF58: -/* 8059AF58 A0 1C 08 36 */ lhz r0, 0x836(r28) -/* 8059AF5C 28 00 00 00 */ cmplwi r0, 0 -/* 8059AF60 41 82 00 2C */ beq lbl_8059AF8C -/* 8059AF64 38 7C 08 36 */ addi r3, r28, 0x836 -/* 8059AF68 48 00 03 05 */ bl func_8059B26C -/* 8059AF6C 54 60 04 3F */ clrlwi. r0, r3, 0x10 -/* 8059AF70 40 82 00 1C */ bne lbl_8059AF8C -/* 8059AF74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059AF78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059AF7C 7F E4 FB 78 */ mr r4, r31 -/* 8059AF80 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 8059AF84 7C 05 07 74 */ extsb r5, r0 -/* 8059AF88 4B A9 A3 29 */ bl offSwitch__10dSv_info_cFii -lbl_8059AF8C: -/* 8059AF8C 38 7C 08 28 */ addi r3, r28, 0x828 -/* 8059AF90 7F C4 F3 78 */ mr r4, r30 -/* 8059AF94 38 A0 00 1E */ li r5, 0x1e -/* 8059AF98 38 C0 00 64 */ li r6, 0x64 -/* 8059AF9C 38 E0 00 32 */ li r7, 0x32 -/* 8059AFA0 4B CD 55 A1 */ bl cLib_addCalcAngleS__FPsssss -/* 8059AFA4 A8 7C 08 2C */ lha r3, 0x82c(r28) -/* 8059AFA8 A8 1C 08 28 */ lha r0, 0x828(r28) -/* 8059AFAC 7C 03 02 14 */ add r0, r3, r0 -/* 8059AFB0 B0 1C 08 2C */ sth r0, 0x82c(r28) -/* 8059AFB4 7F 83 E3 78 */ mr r3, r28 -/* 8059AFB8 4B FF F6 6D */ bl setBaseMtx__11daObjSwPr_cFv -/* 8059AFBC 38 7C 06 D4 */ addi r3, r28, 0x6d4 -/* 8059AFC0 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 8059AFC4 4B CD 42 19 */ bl SetC__8cM3dGCylFRC4cXyz -/* 8059AFC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059AFCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059AFD0 3B C3 23 3C */ addi r30, r3, 0x233c -/* 8059AFD4 7F C3 F3 78 */ mr r3, r30 -/* 8059AFD8 38 9C 05 B0 */ addi r4, r28, 0x5b0 -/* 8059AFDC 4B CC 9B CD */ bl Set__4cCcSFP8cCcD_Obj -/* 8059AFE0 38 7C 08 10 */ addi r3, r28, 0x810 -/* 8059AFE4 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 8059AFE8 4B CD 41 F5 */ bl SetC__8cM3dGCylFRC4cXyz -/* 8059AFEC 7F C3 F3 78 */ mr r3, r30 -/* 8059AFF0 38 9C 06 EC */ addi r4, r28, 0x6ec -/* 8059AFF4 4B CC 9B B5 */ bl Set__4cCcSFP8cCcD_Obj -/* 8059AFF8 9B BC 08 3D */ stb r29, 0x83d(r28) -/* 8059AFFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059B000 4B DC 72 25 */ bl _restgpr_28 -/* 8059B004 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059B008 7C 08 03 A6 */ mtlr r0 -/* 8059B00C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8059B010 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/func_8059A888.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/func_8059A888.s deleted file mode 100644 index 8d02fbf9ac..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/func_8059A888.s +++ /dev/null @@ -1,132 +0,0 @@ -lbl_8059A888: -/* 8059A888 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8059A88C 7C 08 02 A6 */ mflr r0 -/* 8059A890 90 01 00 24 */ stw r0, 0x24(r1) -/* 8059A894 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059A898 4B DC 79 39 */ bl _savegpr_26 -/* 8059A89C 7C 7F 1B 78 */ mr r31, r3 -/* 8059A8A0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8059A8A4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8059A8A8 40 82 00 FC */ bne lbl_8059A9A4 -/* 8059A8AC 7F E0 FB 79 */ or. r0, r31, r31 -/* 8059A8B0 41 82 00 E8 */ beq lbl_8059A998 -/* 8059A8B4 7C 1E 03 78 */ mr r30, r0 -/* 8059A8B8 4B A7 E2 AD */ bl __ct__10fopAc_ac_cFv -/* 8059A8BC 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 8059A8C0 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 8059A8C4 90 1E 05 8C */ stw r0, 0x58c(r30) -/* 8059A8C8 38 7E 05 90 */ addi r3, r30, 0x590 -/* 8059A8CC 4B AE 8E 95 */ bl __ct__10dCcD_GSttsFv -/* 8059A8D0 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 8059A8D4 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 8059A8D8 90 7E 05 8C */ stw r3, 0x58c(r30) -/* 8059A8DC 38 03 00 20 */ addi r0, r3, 0x20 -/* 8059A8E0 90 1E 05 90 */ stw r0, 0x590(r30) -/* 8059A8E4 3B 5E 05 B0 */ addi r26, r30, 0x5b0 -/* 8059A8E8 7F 43 D3 78 */ mr r3, r26 -/* 8059A8EC 4B AE 91 3D */ bl __ct__12dCcD_GObjInfFv -/* 8059A8F0 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8059A8F4 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8059A8F8 90 1A 01 20 */ stw r0, 0x120(r26) -/* 8059A8FC 3C 60 80 5A */ lis r3, __vt__8cM3dGAab@ha /* 0x8059B3E8@ha */ -/* 8059A900 38 03 B3 E8 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8059B3E8@l */ -/* 8059A904 90 1A 01 1C */ stw r0, 0x11c(r26) -/* 8059A908 3C 60 80 5A */ lis r3, __vt__8cM3dGCyl@ha /* 0x8059B3DC@ha */ -/* 8059A90C 38 03 B3 DC */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x8059B3DC@l */ -/* 8059A910 90 1A 01 38 */ stw r0, 0x138(r26) -/* 8059A914 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 8059A918 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 8059A91C 90 7A 01 20 */ stw r3, 0x120(r26) -/* 8059A920 3B A3 00 58 */ addi r29, r3, 0x58 -/* 8059A924 93 BA 01 38 */ stw r29, 0x138(r26) -/* 8059A928 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 8059A92C 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 8059A930 90 7A 00 3C */ stw r3, 0x3c(r26) -/* 8059A934 3B 83 00 2C */ addi r28, r3, 0x2c -/* 8059A938 93 9A 01 20 */ stw r28, 0x120(r26) -/* 8059A93C 3B 63 00 84 */ addi r27, r3, 0x84 -/* 8059A940 93 7A 01 38 */ stw r27, 0x138(r26) -/* 8059A944 3B 5E 06 EC */ addi r26, r30, 0x6ec -/* 8059A948 7F 43 D3 78 */ mr r3, r26 -/* 8059A94C 4B AE 90 DD */ bl __ct__12dCcD_GObjInfFv -/* 8059A950 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8059A954 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8059A958 90 1A 01 20 */ stw r0, 0x120(r26) -/* 8059A95C 3C 60 80 5A */ lis r3, __vt__8cM3dGAab@ha /* 0x8059B3E8@ha */ -/* 8059A960 38 03 B3 E8 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8059B3E8@l */ -/* 8059A964 90 1A 01 1C */ stw r0, 0x11c(r26) -/* 8059A968 3C 60 80 5A */ lis r3, __vt__8cM3dGCyl@ha /* 0x8059B3DC@ha */ -/* 8059A96C 38 03 B3 DC */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x8059B3DC@l */ -/* 8059A970 90 1A 01 38 */ stw r0, 0x138(r26) -/* 8059A974 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 8059A978 38 03 35 A4 */ addi r0, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 8059A97C 90 1A 01 20 */ stw r0, 0x120(r26) -/* 8059A980 93 BA 01 38 */ stw r29, 0x138(r26) -/* 8059A984 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 8059A988 38 03 C0 50 */ addi r0, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 8059A98C 90 1A 00 3C */ stw r0, 0x3c(r26) -/* 8059A990 93 9A 01 20 */ stw r28, 0x120(r26) -/* 8059A994 93 7A 01 38 */ stw r27, 0x138(r26) -lbl_8059A998: -/* 8059A998 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8059A99C 60 00 00 08 */ ori r0, r0, 8 -/* 8059A9A0 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8059A9A4: -/* 8059A9A4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8059A9A8 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8059A9AC 98 1F 08 3C */ stb r0, 0x83c(r31) -/* 8059A9B0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8059A9B4 54 00 87 3E */ rlwinm r0, r0, 0x10, 0x1c, 0x1f -/* 8059A9B8 28 00 00 0F */ cmplwi r0, 0xf -/* 8059A9BC 41 82 00 0C */ beq lbl_8059A9C8 -/* 8059A9C0 28 00 00 00 */ cmplwi r0, 0 -/* 8059A9C4 40 82 00 10 */ bne lbl_8059A9D4 -lbl_8059A9C8: -/* 8059A9C8 38 00 00 00 */ li r0, 0 -/* 8059A9CC 98 1F 08 3E */ stb r0, 0x83e(r31) -/* 8059A9D0 48 00 00 14 */ b lbl_8059A9E4 -lbl_8059A9D4: -/* 8059A9D4 28 00 00 01 */ cmplwi r0, 1 -/* 8059A9D8 40 82 00 0C */ bne lbl_8059A9E4 -/* 8059A9DC 38 00 00 01 */ li r0, 1 -/* 8059A9E0 98 1F 08 3E */ stb r0, 0x83e(r31) -lbl_8059A9E4: -/* 8059A9E4 38 7F 05 68 */ addi r3, r31, 0x568 -/* 8059A9E8 88 1F 08 3E */ lbz r0, 0x83e(r31) -/* 8059A9EC 54 00 10 3A */ slwi r0, r0, 2 -/* 8059A9F0 3C 80 80 5A */ lis r4, l_arcName@ha /* 0x8059B380@ha */ -/* 8059A9F4 38 84 B3 80 */ addi r4, r4, l_arcName@l /* 0x8059B380@l */ -/* 8059A9F8 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8059A9FC 4B A9 24 C1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8059AA00 7C 7B 1B 78 */ mr r27, r3 -/* 8059AA04 2C 1B 00 04 */ cmpwi r27, 4 -/* 8059AA08 40 82 00 50 */ bne lbl_8059AA58 -/* 8059AA0C 7F E3 FB 78 */ mr r3, r31 -/* 8059AA10 3C 80 80 5A */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x8059A5C8@ha */ -/* 8059AA14 38 84 A5 C8 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x8059A5C8@l */ -/* 8059AA18 88 1F 08 3E */ lbz r0, 0x83e(r31) -/* 8059AA1C 54 00 10 3A */ slwi r0, r0, 2 -/* 8059AA20 3C A0 80 5A */ lis r5, l_heap_size@ha /* 0x8059B2D0@ha */ -/* 8059AA24 38 A5 B2 D0 */ addi r5, r5, l_heap_size@l /* 0x8059B2D0@l */ -/* 8059AA28 7C A5 00 2E */ lwzx r5, r5, r0 -/* 8059AA2C 4B A7 FA 85 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8059AA30 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8059AA34 40 82 00 0C */ bne lbl_8059AA40 -/* 8059AA38 38 60 00 05 */ li r3, 5 -/* 8059AA3C 48 00 00 20 */ b lbl_8059AA5C -lbl_8059AA40: -/* 8059AA40 7F E3 FB 78 */ mr r3, r31 -/* 8059AA44 4B FF FC 2D */ bl Create__11daObjSwPr_cFv -/* 8059AA48 2C 03 00 00 */ cmpwi r3, 0 -/* 8059AA4C 40 82 00 0C */ bne lbl_8059AA58 -/* 8059AA50 38 60 00 05 */ li r3, 5 -/* 8059AA54 48 00 00 08 */ b lbl_8059AA5C -lbl_8059AA58: -/* 8059AA58 7F 63 DB 78 */ mr r3, r27 -lbl_8059AA5C: -/* 8059AA5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059AA60 4B DC 77 BD */ bl _restgpr_26 -/* 8059AA64 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059AA68 7C 08 03 A6 */ mtlr r0 -/* 8059AA6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8059AA70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/initBaseMtx__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/initBaseMtx__11daObjSwPr_cFv.s deleted file mode 100644 index 9c9137da15..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/initBaseMtx__11daObjSwPr_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8059A5E8: -/* 8059A5E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059A5EC 7C 08 02 A6 */ mflr r0 -/* 8059A5F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059A5F4 80 83 05 70 */ lwz r4, 0x570(r3) -/* 8059A5F8 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8059A5FC D0 04 00 18 */ stfs f0, 0x18(r4) -/* 8059A600 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 8059A604 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 8059A608 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8059A60C D0 04 00 20 */ stfs f0, 0x20(r4) -/* 8059A610 48 00 00 15 */ bl setBaseMtx__11daObjSwPr_cFv -/* 8059A614 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059A618 7C 08 03 A6 */ mtlr r0 -/* 8059A61C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059A620 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/nodeCallBack__FP8J3DJointi.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/nodeCallBack__FP8J3DJointi.s deleted file mode 100644 index 90f961eae9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/nodeCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8059A518: -/* 8059A518 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8059A51C 7C 08 02 A6 */ mflr r0 -/* 8059A520 90 01 00 24 */ stw r0, 0x24(r1) -/* 8059A524 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059A528 4B DC 7C B5 */ bl _savegpr_29 -/* 8059A52C 2C 04 00 00 */ cmpwi r4, 0 -/* 8059A530 40 82 00 7C */ bne lbl_8059A5AC -/* 8059A534 A0 83 00 14 */ lhz r4, 0x14(r3) -/* 8059A538 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8059A53C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8059A540 83 E3 00 38 */ lwz r31, 0x38(r3) -/* 8059A544 83 BF 00 14 */ lwz r29, 0x14(r31) -/* 8059A548 A0 1D 08 30 */ lhz r0, 0x830(r29) -/* 8059A54C 7C 04 00 00 */ cmpw r4, r0 -/* 8059A550 40 82 00 5C */ bne lbl_8059A5AC -/* 8059A554 80 7F 00 84 */ lwz r3, 0x84(r31) -/* 8059A558 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8059A55C 1F C4 00 30 */ mulli r30, r4, 0x30 -/* 8059A560 7C 60 F2 14 */ add r3, r0, r30 -/* 8059A564 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059A568 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059A56C 4B DA BF 45 */ bl PSMTXCopy -/* 8059A570 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059A574 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059A578 A8 9D 08 2C */ lha r4, 0x82c(r29) -/* 8059A57C 4B A7 1E B9 */ bl mDoMtx_YrotM__FPA4_fs -/* 8059A580 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059A584 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059A588 80 9F 00 84 */ lwz r4, 0x84(r31) -/* 8059A58C 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8059A590 7C 80 F2 14 */ add r4, r0, r30 -/* 8059A594 4B DA BF 1D */ bl PSMTXCopy -/* 8059A598 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059A59C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059A5A0 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */ -/* 8059A5A4 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */ -/* 8059A5A8 4B DA BF 09 */ bl PSMTXCopy -lbl_8059A5AC: -/* 8059A5AC 38 60 00 01 */ li r3, 1 -/* 8059A5B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059A5B4 4B DC 7C 75 */ bl _restgpr_29 -/* 8059A5B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059A5BC 7C 08 03 A6 */ mtlr r0 -/* 8059A5C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8059A5C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/setBaseMtx__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/setBaseMtx__11daObjSwPr_cFv.s deleted file mode 100644 index 6a4bfdbe1a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/setBaseMtx__11daObjSwPr_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8059A624: -/* 8059A624 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059A628 7C 08 02 A6 */ mflr r0 -/* 8059A62C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059A630 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059A634 7C 7F 1B 78 */ mr r31, r3 -/* 8059A638 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8059A63C 4B A7 27 29 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 8059A640 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 8059A644 4B A7 29 01 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 8059A648 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059A64C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059A650 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 8059A654 38 84 00 24 */ addi r4, r4, 0x24 -/* 8059A658 4B DA BE 59 */ bl PSMTXCopy -/* 8059A65C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059A660 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059A664 7C 08 03 A6 */ mtlr r0 -/* 8059A668 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059A66C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/setRotateTime__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/setRotateTime__11daObjSwPr_cFv.s deleted file mode 100644 index cf0bc2cc56..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/setRotateTime__11daObjSwPr_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8059AB04: -/* 8059AB04 38 00 00 00 */ li r0, 0 -/* 8059AB08 98 03 08 3A */ stb r0, 0x83a(r3) -/* 8059AB0C 38 60 00 64 */ li r3, 0x64 -/* 8059AB10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/switchCtrl__11daObjSwPr_cFv.s b/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/switchCtrl__11daObjSwPr_cFv.s deleted file mode 100644 index 3cef2721e7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/switchCtrl__11daObjSwPr_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8059AB14: -/* 8059AB14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059AB18 7C 08 02 A6 */ mflr r0 -/* 8059AB1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059AB20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059AB24 93 C1 00 08 */ stw r30, 8(r1) -/* 8059AB28 7C 7E 1B 78 */ mr r30, r3 -/* 8059AB2C 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8059AB30 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 8059AB34 A8 03 08 28 */ lha r0, 0x828(r3) -/* 8059AB38 2C 00 00 00 */ cmpwi r0, 0 -/* 8059AB3C 40 82 00 20 */ bne lbl_8059AB5C -/* 8059AB40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059AB44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059AB48 7F E4 FB 78 */ mr r4, r31 -/* 8059AB4C 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 8059AB50 7C 05 07 74 */ extsb r5, r0 -/* 8059AB54 4B A9 A7 5D */ bl offSwitch__10dSv_info_cFii -/* 8059AB58 48 00 00 2C */ b lbl_8059AB84 -lbl_8059AB5C: -/* 8059AB5C 38 7E 08 32 */ addi r3, r30, 0x832 -/* 8059AB60 48 00 07 45 */ bl func_8059B2A4 -/* 8059AB64 7C 60 07 35 */ extsh. r0, r3 -/* 8059AB68 40 82 00 1C */ bne lbl_8059AB84 -/* 8059AB6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059AB70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059AB74 7F E4 FB 78 */ mr r4, r31 -/* 8059AB78 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 8059AB7C 7C 05 07 74 */ extsb r5, r0 -/* 8059AB80 4B A9 A6 81 */ bl onSwitch__10dSv_info_cFii -lbl_8059AB84: -/* 8059AB84 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059AB88 83 C1 00 08 */ lwz r30, 8(r1) -/* 8059AB8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059AB90 7C 08 03 A6 */ mtlr r0 -/* 8059AB94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059AB98 4E 80 00 20 */ blr