From 9365b01809d8709f135209820cd9887c6f1e93c8 Mon Sep 17 00:00:00 2001 From: TakaRikka Date: Fri, 30 Jun 2023 16:35:31 -0700 Subject: [PATCH] remove asm --- .../daDisappear_Create__FP10fopAc_ac_c.s | 67 ------- ...daDisappear_Execute__FP15disappear_class.s | 18 -- .../ghost_disappear__FP15disappear_classf.s | 46 ----- .../d_a_disappear/s_ks_sub__FPvPv.s | 21 --- .../set_disappear__FP15disappear_classf.s | 148 --------------- .../yami_disappear__FP15disappear_classf.s | 54 ------ .../d/a/d_a_talk/d_a_talk/__dt__8daTalk_cFv.s | 29 --- .../a/d_a_talk/d_a_talk/create__8daTalk_cFv.s | 55 ------ .../d_a_talk/daTalk_Create__FP10fopAc_ac_c.s | 9 - .../d_a_talk/daTalk_Delete__FP8daTalk_c.s | 11 -- .../d_a_talk/daTalk_Draw__FP8daTalk_c.s | 9 - .../d_a_talk/daTalk_Execute__FP8daTalk_c.s | 9 - .../d_a_talk/getStatus__8daTalk_cFv.s | 9 - .../d_a_talk/messageSet__8daTalk_cFv.s | 16 -- .../d_a_talk/setStatus__8daTalk_cFUs.s | 10 - .../daKytag16_Create__FP10fopAc_ac_c.s | 172 ------------------ .../daKytag16_Execute__FP13kytag16_class.s | 154 ---------------- .../Create__15daObjWaterEff_cFv.s | 59 ------ .../d_a_obj_lv3waterEff/__dt__4cXyzFv.s | 17 -- .../_delete__15daObjWaterEff_cFv.s | 25 --- .../daObjWaterEff_Create__FP10fopAc_ac_c.s | 9 - ...aObjWaterEff_Delete__FP15daObjWaterEff_c.s | 9 - ...ObjWaterEff_Execute__FP15daObjWaterEff_c.s | 9 - .../execute__15daObjWaterEff_cFv.s | 74 -------- .../d_a_obj_lv3waterEff/func_80C5C5DC.s | 42 ----- .../d_a_tag_mist/Create__11daTagMist_cFv.s | 55 ------ .../d_a_tag_mist/d_a_tag_mist/__dt__4cXyzFv.s | 17 -- .../daTagMist_Create__FP10fopAc_ac_c.s | 9 - .../daTagMist_Delete__FP11daTagMist_c.s | 9 - .../daTagMist_Execute__FP11daTagMist_c.s | 9 - .../d_a_tag_mist/execute__11daTagMist_cFv.s | 83 --------- .../d_a_tag_mist/d_a_tag_mist/func_8048F444.s | 59 ------ .../d_a_tag_mist/isMySw__11daTagMist_cFv.s | 27 --- .../d_a_tag_mist/offSw__11daTagMist_cFv.s | 30 --- .../d_a_tag_mist/onMySw__11daTagMist_cFv.s | 21 --- 35 files changed, 1400 deletions(-) delete mode 100644 asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Execute__FP15disappear_class.s delete mode 100644 asm/rel/d/a/d_a_disappear/d_a_disappear/ghost_disappear__FP15disappear_classf.s delete mode 100644 asm/rel/d/a/d_a_disappear/d_a_disappear/s_ks_sub__FPvPv.s delete mode 100644 asm/rel/d/a/d_a_disappear/d_a_disappear/set_disappear__FP15disappear_classf.s delete mode 100644 asm/rel/d/a/d_a_disappear/d_a_disappear/yami_disappear__FP15disappear_classf.s delete mode 100644 asm/rel/d/a/d_a_talk/d_a_talk/__dt__8daTalk_cFv.s delete mode 100644 asm/rel/d/a/d_a_talk/d_a_talk/create__8daTalk_cFv.s delete mode 100644 asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Delete__FP8daTalk_c.s delete mode 100644 asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Draw__FP8daTalk_c.s delete mode 100644 asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Execute__FP8daTalk_c.s delete mode 100644 asm/rel/d/a/d_a_talk/d_a_talk/getStatus__8daTalk_cFv.s delete mode 100644 asm/rel/d/a/d_a_talk/d_a_talk/messageSet__8daTalk_cFv.s delete mode 100644 asm/rel/d/a/d_a_talk/d_a_talk/setStatus__8daTalk_cFUs.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/Create__15daObjWaterEff_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/__dt__4cXyzFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/_delete__15daObjWaterEff_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Delete__FP15daObjWaterEff_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Execute__FP15daObjWaterEff_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/execute__15daObjWaterEff_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/func_80C5C5DC.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/Create__11daTagMist_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/__dt__4cXyzFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Delete__FP11daTagMist_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Execute__FP11daTagMist_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/execute__11daTagMist_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/func_8048F444.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/isMySw__11daTagMist_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/offSw__11daTagMist_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/onMySw__11daTagMist_cFv.s diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 09a8bd37df1..00000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_804A9364: -/* 804A9364 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 804A9368 7C 08 02 A6 */ mflr r0 -/* 804A936C 90 01 00 34 */ stw r0, 0x34(r1) -/* 804A9370 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 804A9374 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 804A9378 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 804A937C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 804A9380 7C 7E 1B 78 */ mr r30, r3 -/* 804A9384 3C 80 80 4B */ lis r4, lit_3704@ha /* 0x804A9460@ha */ -/* 804A9388 3B E4 94 60 */ addi r31, r4, lit_3704@l /* 0x804A9460@l */ -/* 804A938C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 804A9390 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 804A9394 40 82 00 1C */ bne lbl_804A93B0 -/* 804A9398 28 1E 00 00 */ cmplwi r30, 0 -/* 804A939C 41 82 00 08 */ beq lbl_804A93A4 -/* 804A93A0 4B B6 F7 C5 */ bl __ct__10fopAc_ac_cFv -lbl_804A93A4: -/* 804A93A4 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 804A93A8 60 00 00 08 */ ori r0, r0, 8 -/* 804A93AC 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_804A93B0: -/* 804A93B0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 804A93B4 98 1E 05 67 */ stb r0, 0x567(r30) -/* 804A93B8 80 7E 00 B0 */ lwz r3, 0xb0(r30) -/* 804A93BC 54 60 C6 3E */ rlwinm r0, r3, 0x18, 0x18, 0x1f -/* 804A93C0 C8 3F 00 18 */ lfd f1, 0x18(r31) -/* 804A93C4 90 01 00 0C */ stw r0, 0xc(r1) -/* 804A93C8 3C 00 43 30 */ lis r0, 0x4330 -/* 804A93CC 90 01 00 08 */ stw r0, 8(r1) -/* 804A93D0 C8 01 00 08 */ lfd f0, 8(r1) -/* 804A93D4 EF E0 08 28 */ fsubs f31, f0, f1 -/* 804A93D8 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 804A93DC FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 804A93E0 4C 41 13 82 */ cror 2, 1, 2 -/* 804A93E4 40 82 00 10 */ bne lbl_804A93F4 -/* 804A93E8 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 804A93EC EF FF 00 32 */ fmuls f31, f31, f0 -/* 804A93F0 48 00 00 0C */ b lbl_804A93FC -lbl_804A93F4: -/* 804A93F4 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 804A93F8 EF FF 00 32 */ fmuls f31, f31, f0 -lbl_804A93FC: -/* 804A93FC 54 63 86 3E */ rlwinm r3, r3, 0x10, 0x18, 0x1f -/* 804A9400 28 03 00 FF */ cmplwi r3, 0xff -/* 804A9404 41 82 00 24 */ beq lbl_804A9428 -/* 804A9408 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 804A940C 38 A0 FF FF */ li r5, -1 -/* 804A9410 38 C0 FF FF */ li r6, -1 -/* 804A9414 38 E0 00 00 */ li r7, 0 -/* 804A9418 39 00 00 00 */ li r8, 0 -/* 804A941C 39 20 00 00 */ li r9, 0 -/* 804A9420 39 40 00 00 */ li r10, 0 -/* 804A9424 4B B7 29 F1 */ bl fopAcM_createItemFromEnemyID__FUcPC4cXyziiPC5csXyzPC4cXyzPfPf -lbl_804A9428: -/* 804A9428 7F C3 F3 78 */ mr r3, r30 -/* 804A942C FC 20 F8 90 */ fmr f1, f31 -/* 804A9430 4B FF FD 01 */ bl set_disappear__FP15disappear_classf -/* 804A9434 38 60 00 04 */ li r3, 4 -/* 804A9438 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 804A943C CB E1 00 20 */ lfd f31, 0x20(r1) -/* 804A9440 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 804A9444 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 804A9448 80 01 00 34 */ lwz r0, 0x34(r1) -/* 804A944C 7C 08 03 A6 */ mtlr r0 -/* 804A9450 38 21 00 30 */ addi r1, r1, 0x30 -/* 804A9454 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Execute__FP15disappear_class.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Execute__FP15disappear_class.s deleted file mode 100644 index d7190622317..00000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Execute__FP15disappear_class.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_804A8F6C: -/* 804A8F6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804A8F70 7C 08 02 A6 */ mflr r0 -/* 804A8F74 90 01 00 14 */ stw r0, 0x14(r1) -/* 804A8F78 A8 83 05 74 */ lha r4, 0x574(r3) -/* 804A8F7C 2C 04 00 00 */ cmpwi r4, 0 -/* 804A8F80 41 82 00 10 */ beq lbl_804A8F90 -/* 804A8F84 38 04 FF FF */ addi r0, r4, -1 -/* 804A8F88 B0 03 05 74 */ sth r0, 0x574(r3) -/* 804A8F8C 48 00 00 08 */ b lbl_804A8F94 -lbl_804A8F90: -/* 804A8F90 4B B7 0C ED */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_804A8F94: -/* 804A8F94 38 60 00 01 */ li r3, 1 -/* 804A8F98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804A8F9C 7C 08 03 A6 */ mtlr r0 -/* 804A8FA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 804A8FA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/ghost_disappear__FP15disappear_classf.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/ghost_disappear__FP15disappear_classf.s deleted file mode 100644 index bba3309a7d1..00000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/ghost_disappear__FP15disappear_classf.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_804A9080: -/* 804A9080 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 804A9084 7C 08 02 A6 */ mflr r0 -/* 804A9088 90 01 00 54 */ stw r0, 0x54(r1) -/* 804A908C 39 61 00 50 */ addi r11, r1, 0x50 -/* 804A9090 4B EB 91 41 */ bl _savegpr_26 -/* 804A9094 7C 7A 1B 78 */ mr r26, r3 -/* 804A9098 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 804A909C D0 21 00 24 */ stfs f1, 0x24(r1) -/* 804A90A0 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 804A90A4 3B 60 00 00 */ li r27, 0 -/* 804A90A8 3B E0 00 00 */ li r31, 0 -/* 804A90AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804A90B0 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804A90B4 3C 60 80 4B */ lis r3, da_name_3710@ha /* 0x804A9488@ha */ -/* 804A90B8 3B A3 94 88 */ addi r29, r3, da_name_3710@l /* 0x804A9488@l */ -/* 804A90BC 3C 60 80 4B */ lis r3, lit_3704@ha /* 0x804A9460@ha */ -/* 804A90C0 3B C3 94 60 */ addi r30, r3, lit_3704@l /* 0x804A9460@l */ -lbl_804A90C4: -/* 804A90C4 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 804A90C8 38 80 00 00 */ li r4, 0 -/* 804A90CC 90 81 00 08 */ stw r4, 8(r1) -/* 804A90D0 38 00 FF FF */ li r0, -1 -/* 804A90D4 90 01 00 0C */ stw r0, 0xc(r1) -/* 804A90D8 90 81 00 10 */ stw r4, 0x10(r1) -/* 804A90DC 90 81 00 14 */ stw r4, 0x14(r1) -/* 804A90E0 90 81 00 18 */ stw r4, 0x18(r1) -/* 804A90E4 38 80 00 00 */ li r4, 0 -/* 804A90E8 7C BD FA 2E */ lhzx r5, r29, r31 -/* 804A90EC 38 DA 04 D0 */ addi r6, r26, 0x4d0 -/* 804A90F0 38 E0 00 00 */ li r7, 0 -/* 804A90F4 39 00 00 00 */ li r8, 0 -/* 804A90F8 39 21 00 20 */ addi r9, r1, 0x20 -/* 804A90FC 39 40 00 FF */ li r10, 0xff -/* 804A9100 C0 3E 00 00 */ lfs f1, 0(r30) -/* 804A9104 4B BA 39 8D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804A9108 3B 7B 00 01 */ addi r27, r27, 1 -/* 804A910C 2C 1B 00 05 */ cmpwi r27, 5 -/* 804A9110 3B FF 00 02 */ addi r31, r31, 2 -/* 804A9114 41 80 FF B0 */ blt lbl_804A90C4 -/* 804A9118 39 61 00 50 */ addi r11, r1, 0x50 -/* 804A911C 4B EB 91 01 */ bl _restgpr_26 -/* 804A9120 80 01 00 54 */ lwz r0, 0x54(r1) -/* 804A9124 7C 08 03 A6 */ mtlr r0 -/* 804A9128 38 21 00 50 */ addi r1, r1, 0x50 -/* 804A912C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/s_ks_sub__FPvPv.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/s_ks_sub__FPvPv.s deleted file mode 100644 index fe59ed43a6e..00000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/s_ks_sub__FPvPv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_804A8F20: -/* 804A8F20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804A8F24 7C 08 02 A6 */ mflr r0 -/* 804A8F28 90 01 00 14 */ stw r0, 0x14(r1) -/* 804A8F2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804A8F30 7C 7F 1B 78 */ mr r31, r3 -/* 804A8F34 4B B6 FD AD */ bl fopAc_IsActor__FPv -/* 804A8F38 2C 03 00 00 */ cmpwi r3, 0 -/* 804A8F3C 41 82 00 18 */ beq lbl_804A8F54 -/* 804A8F40 A8 1F 00 08 */ lha r0, 8(r31) -/* 804A8F44 2C 00 00 60 */ cmpwi r0, 0x60 -/* 804A8F48 40 82 00 0C */ bne lbl_804A8F54 -/* 804A8F4C 38 00 00 01 */ li r0, 1 -/* 804A8F50 B0 1F 05 62 */ sth r0, 0x562(r31) -lbl_804A8F54: -/* 804A8F54 38 60 00 00 */ li r3, 0 -/* 804A8F58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804A8F5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804A8F60 7C 08 03 A6 */ mtlr r0 -/* 804A8F64 38 21 00 10 */ addi r1, r1, 0x10 -/* 804A8F68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/set_disappear__FP15disappear_classf.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/set_disappear__FP15disappear_classf.s deleted file mode 100644 index 0b55972859e..00000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/set_disappear__FP15disappear_classf.s +++ /dev/null @@ -1,148 +0,0 @@ -lbl_804A9130: -/* 804A9130 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 804A9134 7C 08 02 A6 */ mflr r0 -/* 804A9138 90 01 00 74 */ stw r0, 0x74(r1) -/* 804A913C DB E1 00 60 */ stfd f31, 0x60(r1) -/* 804A9140 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 804A9144 39 61 00 60 */ addi r11, r1, 0x60 -/* 804A9148 4B EB 90 89 */ bl _savegpr_26 -/* 804A914C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 804A9150 FF E0 08 90 */ fmr f31, f1 -/* 804A9154 3C 60 80 4B */ lis r3, lit_3704@ha /* 0x804A9460@ha */ -/* 804A9158 3B E3 94 60 */ addi r31, r3, lit_3704@l /* 0x804A9460@l */ -/* 804A915C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 804A9160 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 804A9164 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 804A9168 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 804A916C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 804A9170 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 804A9174 38 61 00 2C */ addi r3, r1, 0x2c -/* 804A9178 38 80 00 78 */ li r4, 0x78 -/* 804A917C 41 82 00 0C */ beq lbl_804A9188 -/* 804A9180 80 BE 00 04 */ lwz r5, 4(r30) -/* 804A9184 48 00 00 08 */ b lbl_804A918C -lbl_804A9188: -/* 804A9188 38 A0 FF FF */ li r5, -1 -lbl_804A918C: -/* 804A918C 38 C0 00 0A */ li r6, 0xa -/* 804A9190 4B CF F0 31 */ bl dKy_Sound_set__F4cXyziUii -/* 804A9194 3C 60 80 4B */ lis r3, s_ks_sub__FPvPv@ha /* 0x804A8F20@ha */ -/* 804A9198 38 63 8F 20 */ addi r3, r3, s_ks_sub__FPvPv@l /* 0x804A8F20@l */ -/* 804A919C 7F C4 F3 78 */ mr r4, r30 -/* 804A91A0 4B B7 81 99 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 804A91A4 88 1E 05 67 */ lbz r0, 0x567(r30) -/* 804A91A8 7C 00 07 74 */ extsb r0, r0 -/* 804A91AC 2C 00 00 03 */ cmpwi r0, 3 -/* 804A91B0 40 82 00 60 */ bne lbl_804A9210 -/* 804A91B4 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804A91B8 7C 03 07 74 */ extsb r3, r0 -/* 804A91BC 4B B8 3E B1 */ bl dComIfGp_getReverb__Fi -/* 804A91C0 7C 67 1B 78 */ mr r7, r3 -/* 804A91C4 3C 60 00 06 */ lis r3, 0x0006 /* 0x0006000A@ha */ -/* 804A91C8 38 03 00 0A */ addi r0, r3, 0x000A /* 0x0006000A@l */ -/* 804A91CC 90 01 00 28 */ stw r0, 0x28(r1) -/* 804A91D0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804A91D4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804A91D8 80 63 00 00 */ lwz r3, 0(r3) -/* 804A91DC 38 81 00 28 */ addi r4, r1, 0x28 -/* 804A91E0 38 BE 05 38 */ addi r5, r30, 0x538 -/* 804A91E4 38 C0 00 00 */ li r6, 0 -/* 804A91E8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 804A91EC FC 40 08 90 */ fmr f2, f1 -/* 804A91F0 C0 7F 00 04 */ lfs f3, 4(r31) -/* 804A91F4 FC 80 18 90 */ fmr f4, f3 -/* 804A91F8 39 00 00 00 */ li r8, 0 -/* 804A91FC 4B E0 27 89 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804A9200 7F C3 F3 78 */ mr r3, r30 -/* 804A9204 FC 20 F8 90 */ fmr f1, f31 -/* 804A9208 4B FF FE 79 */ bl ghost_disappear__FP15disappear_classf -/* 804A920C 48 00 01 38 */ b lbl_804A9344 -lbl_804A9210: -/* 804A9210 2C 00 00 01 */ cmpwi r0, 1 -/* 804A9214 41 80 00 64 */ blt lbl_804A9278 -/* 804A9218 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804A921C 7C 03 07 74 */ extsb r3, r0 -/* 804A9220 4B B8 3E 4D */ bl dComIfGp_getReverb__Fi -/* 804A9224 7C 67 1B 78 */ mr r7, r3 -/* 804A9228 3C 60 00 06 */ lis r3, 0x0006 /* 0x00060028@ha */ -/* 804A922C 38 03 00 28 */ addi r0, r3, 0x0028 /* 0x00060028@l */ -/* 804A9230 90 01 00 24 */ stw r0, 0x24(r1) -/* 804A9234 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804A9238 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804A923C 80 63 00 00 */ lwz r3, 0(r3) -/* 804A9240 38 81 00 24 */ addi r4, r1, 0x24 -/* 804A9244 38 BE 05 38 */ addi r5, r30, 0x538 -/* 804A9248 38 C0 00 00 */ li r6, 0 -/* 804A924C C0 3F 00 00 */ lfs f1, 0(r31) -/* 804A9250 FC 40 08 90 */ fmr f2, f1 -/* 804A9254 C0 7F 00 04 */ lfs f3, 4(r31) -/* 804A9258 FC 80 18 90 */ fmr f4, f3 -/* 804A925C 39 00 00 00 */ li r8, 0 -/* 804A9260 4B E0 27 25 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804A9264 7F C3 F3 78 */ mr r3, r30 -/* 804A9268 C0 1F 00 08 */ lfs f0, 8(r31) -/* 804A926C EC 20 07 F2 */ fmuls f1, f0, f31 -/* 804A9270 4B FF FD 49 */ bl yami_disappear__FP15disappear_classf -/* 804A9274 48 00 00 D0 */ b lbl_804A9344 -lbl_804A9278: -/* 804A9278 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804A927C 7C 03 07 74 */ extsb r3, r0 -/* 804A9280 4B B8 3D ED */ bl dComIfGp_getReverb__Fi -/* 804A9284 7C 67 1B 78 */ mr r7, r3 -/* 804A9288 3C 60 00 06 */ lis r3, 0x0006 /* 0x0006000A@ha */ -/* 804A928C 38 03 00 0A */ addi r0, r3, 0x000A /* 0x0006000A@l */ -/* 804A9290 90 01 00 20 */ stw r0, 0x20(r1) -/* 804A9294 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804A9298 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804A929C 80 63 00 00 */ lwz r3, 0(r3) -/* 804A92A0 38 81 00 20 */ addi r4, r1, 0x20 -/* 804A92A4 38 BE 05 38 */ addi r5, r30, 0x538 -/* 804A92A8 38 C0 00 00 */ li r6, 0 -/* 804A92AC C0 3F 00 00 */ lfs f1, 0(r31) -/* 804A92B0 FC 40 08 90 */ fmr f2, f1 -/* 804A92B4 C0 7F 00 04 */ lfs f3, 4(r31) -/* 804A92B8 FC 80 18 90 */ fmr f4, f3 -/* 804A92BC 39 00 00 00 */ li r8, 0 -/* 804A92C0 4B E0 26 C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804A92C4 D3 E1 00 38 */ stfs f31, 0x38(r1) -/* 804A92C8 D3 E1 00 3C */ stfs f31, 0x3c(r1) -/* 804A92CC D3 E1 00 40 */ stfs f31, 0x40(r1) -/* 804A92D0 38 00 00 3A */ li r0, 0x3a -/* 804A92D4 B0 1E 05 74 */ sth r0, 0x574(r30) -/* 804A92D8 3B 40 00 00 */ li r26, 0 -/* 804A92DC 3B A0 00 00 */ li r29, 0 -/* 804A92E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804A92E4 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804A92E8 3C 60 80 4B */ lis r3, da_name_3736@ha /* 0x804A9494@ha */ -/* 804A92EC 3B 83 94 94 */ addi r28, r3, da_name_3736@l /* 0x804A9494@l */ -lbl_804A92F0: -/* 804A92F0 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 804A92F4 38 80 00 00 */ li r4, 0 -/* 804A92F8 90 81 00 08 */ stw r4, 8(r1) -/* 804A92FC 38 00 FF FF */ li r0, -1 -/* 804A9300 90 01 00 0C */ stw r0, 0xc(r1) -/* 804A9304 90 81 00 10 */ stw r4, 0x10(r1) -/* 804A9308 90 81 00 14 */ stw r4, 0x14(r1) -/* 804A930C 90 81 00 18 */ stw r4, 0x18(r1) -/* 804A9310 38 80 00 00 */ li r4, 0 -/* 804A9314 7C BC EA 2E */ lhzx r5, r28, r29 -/* 804A9318 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 804A931C 38 E0 00 00 */ li r7, 0 -/* 804A9320 39 00 00 00 */ li r8, 0 -/* 804A9324 39 21 00 38 */ addi r9, r1, 0x38 -/* 804A9328 39 40 00 FF */ li r10, 0xff -/* 804A932C C0 3F 00 00 */ lfs f1, 0(r31) -/* 804A9330 4B BA 37 61 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804A9334 3B 5A 00 01 */ addi r26, r26, 1 -/* 804A9338 2C 1A 00 07 */ cmpwi r26, 7 -/* 804A933C 3B BD 00 02 */ addi r29, r29, 2 -/* 804A9340 41 80 FF B0 */ blt lbl_804A92F0 -lbl_804A9344: -/* 804A9344 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 804A9348 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 804A934C 39 61 00 60 */ addi r11, r1, 0x60 -/* 804A9350 4B EB 8E CD */ bl _restgpr_26 -/* 804A9354 80 01 00 74 */ lwz r0, 0x74(r1) -/* 804A9358 7C 08 03 A6 */ mtlr r0 -/* 804A935C 38 21 00 70 */ addi r1, r1, 0x70 -/* 804A9360 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/yami_disappear__FP15disappear_classf.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/yami_disappear__FP15disappear_classf.s deleted file mode 100644 index 8565421d300..00000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/yami_disappear__FP15disappear_classf.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_804A8FB8: -/* 804A8FB8 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 804A8FBC 7C 08 02 A6 */ mflr r0 -/* 804A8FC0 90 01 00 54 */ stw r0, 0x54(r1) -/* 804A8FC4 39 61 00 50 */ addi r11, r1, 0x50 -/* 804A8FC8 4B EB 92 05 */ bl _savegpr_25 -/* 804A8FCC 7C 79 1B 78 */ mr r25, r3 -/* 804A8FD0 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 804A8FD4 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 804A8FD8 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 804A8FDC 3B 60 00 03 */ li r27, 3 -/* 804A8FE0 88 03 05 67 */ lbz r0, 0x567(r3) -/* 804A8FE4 2C 00 00 02 */ cmpwi r0, 2 -/* 804A8FE8 40 82 00 08 */ bne lbl_804A8FF0 -/* 804A8FEC 3B 60 00 04 */ li r27, 4 -lbl_804A8FF0: -/* 804A8FF0 3B 40 00 00 */ li r26, 0 -/* 804A8FF4 3B E0 00 00 */ li r31, 0 -/* 804A8FF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804A8FFC 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804A9000 3C 60 80 4B */ lis r3, da_name_3684@ha /* 0x804A9480@ha */ -/* 804A9004 3B A3 94 80 */ addi r29, r3, da_name_3684@l /* 0x804A9480@l */ -/* 804A9008 3C 60 80 4B */ lis r3, lit_3704@ha /* 0x804A9460@ha */ -/* 804A900C 3B C3 94 60 */ addi r30, r3, lit_3704@l /* 0x804A9460@l */ -/* 804A9010 48 00 00 50 */ b lbl_804A9060 -lbl_804A9014: -/* 804A9014 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 804A9018 38 80 00 00 */ li r4, 0 -/* 804A901C 90 81 00 08 */ stw r4, 8(r1) -/* 804A9020 38 00 FF FF */ li r0, -1 -/* 804A9024 90 01 00 0C */ stw r0, 0xc(r1) -/* 804A9028 90 81 00 10 */ stw r4, 0x10(r1) -/* 804A902C 90 81 00 14 */ stw r4, 0x14(r1) -/* 804A9030 90 81 00 18 */ stw r4, 0x18(r1) -/* 804A9034 38 80 00 00 */ li r4, 0 -/* 804A9038 7C BD FA 2E */ lhzx r5, r29, r31 -/* 804A903C 38 D9 04 D0 */ addi r6, r25, 0x4d0 -/* 804A9040 38 E0 00 00 */ li r7, 0 -/* 804A9044 39 00 00 00 */ li r8, 0 -/* 804A9048 39 21 00 20 */ addi r9, r1, 0x20 -/* 804A904C 39 40 00 FF */ li r10, 0xff -/* 804A9050 C0 3E 00 00 */ lfs f1, 0(r30) -/* 804A9054 4B BA 3A 3D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804A9058 3B 5A 00 01 */ addi r26, r26, 1 -/* 804A905C 3B FF 00 02 */ addi r31, r31, 2 -lbl_804A9060: -/* 804A9060 7C 1A D8 00 */ cmpw r26, r27 -/* 804A9064 41 80 FF B0 */ blt lbl_804A9014 -/* 804A9068 39 61 00 50 */ addi r11, r1, 0x50 -/* 804A906C 4B EB 91 AD */ bl _restgpr_25 -/* 804A9070 80 01 00 54 */ lwz r0, 0x54(r1) -/* 804A9074 7C 08 03 A6 */ mtlr r0 -/* 804A9078 38 21 00 50 */ addi r1, r1, 0x50 -/* 804A907C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_talk/d_a_talk/__dt__8daTalk_cFv.s b/asm/rel/d/a/d_a_talk/d_a_talk/__dt__8daTalk_cFv.s deleted file mode 100644 index 1cac3064c10..00000000000 --- a/asm/rel/d/a/d_a_talk/d_a_talk/__dt__8daTalk_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80D66378: -/* 80D66378 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D6637C 7C 08 02 A6 */ mflr r0 -/* 80D66380 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D66384 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D66388 93 C1 00 08 */ stw r30, 8(r1) -/* 80D6638C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80D66390 7C 9F 23 78 */ mr r31, r4 -/* 80D66394 41 82 00 34 */ beq lbl_80D663C8 -/* 80D66398 38 60 FF FF */ li r3, -1 -/* 80D6639C 4B 4D 1D ED */ bl setProcessID__12dMsgObject_cFUi -/* 80D663A0 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80D663A4 38 80 FF FF */ li r4, -1 -/* 80D663A8 4B 4E 3B A1 */ bl __dt__10dMsgFlow_cFv -/* 80D663AC 7F C3 F3 78 */ mr r3, r30 -/* 80D663B0 38 80 00 00 */ li r4, 0 -/* 80D663B4 4B 2B 28 D9 */ bl __dt__10fopAc_ac_cFv -/* 80D663B8 7F E0 07 35 */ extsh. r0, r31 -/* 80D663BC 40 81 00 0C */ ble lbl_80D663C8 -/* 80D663C0 7F C3 F3 78 */ mr r3, r30 -/* 80D663C4 4B 56 89 79 */ bl __dl__FPv -lbl_80D663C8: -/* 80D663C8 7F C3 F3 78 */ mr r3, r30 -/* 80D663CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D663D0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D663D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D663D8 7C 08 03 A6 */ mtlr r0 -/* 80D663DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D663E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_talk/d_a_talk/create__8daTalk_cFv.s b/asm/rel/d/a/d_a_talk/d_a_talk/create__8daTalk_cFv.s deleted file mode 100644 index 20934184569..00000000000 --- a/asm/rel/d/a/d_a_talk/d_a_talk/create__8daTalk_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80D663E4: -/* 80D663E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D663E8 7C 08 02 A6 */ mflr r0 -/* 80D663EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D663F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D663F4 93 C1 00 08 */ stw r30, 8(r1) -/* 80D663F8 7C 7E 1B 78 */ mr r30, r3 -/* 80D663FC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D66400 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D66404 40 82 00 28 */ bne lbl_80D6642C -/* 80D66408 7F C0 F3 79 */ or. r0, r30, r30 -/* 80D6640C 41 82 00 14 */ beq lbl_80D66420 -/* 80D66410 7C 1F 03 78 */ mr r31, r0 -/* 80D66414 4B 2B 27 51 */ bl __ct__10fopAc_ac_cFv -/* 80D66418 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80D6641C 4B 4E 3A E5 */ bl __ct__10dMsgFlow_cFv -lbl_80D66420: -/* 80D66420 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80D66424 60 00 00 08 */ ori r0, r0, 8 -/* 80D66428 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80D6642C: -/* 80D6642C 7F C3 F3 78 */ mr r3, r30 -/* 80D66430 48 00 02 59 */ bl getStatus__8daTalk_cFv -/* 80D66434 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80D66438 28 00 00 01 */ cmplwi r0, 1 -/* 80D6643C 41 82 00 0C */ beq lbl_80D66448 -/* 80D66440 38 60 00 05 */ li r3, 5 -/* 80D66444 48 00 00 50 */ b lbl_80D66494 -lbl_80D66448: -/* 80D66448 4B 4D 1D 79 */ bl getpTalkActor__12dMsgObject_cFv -/* 80D6644C 3B E3 05 44 */ addi r31, r3, 0x544 -/* 80D66450 38 7E 05 44 */ addi r3, r30, 0x544 -/* 80D66454 7F E4 FB 78 */ mr r4, r31 -/* 80D66458 38 A0 00 09 */ li r5, 9 -/* 80D6645C 4B 5F B7 E1 */ bl __copy -/* 80D66460 A8 1F 00 0A */ lha r0, 0xa(r31) -/* 80D66464 B0 1E 05 4E */ sth r0, 0x54e(r30) -/* 80D66468 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80D6646C D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 80D66470 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 80D66474 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80D66478 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80D6647C D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80D66480 80 1F 00 18 */ lwz r0, 0x18(r31) -/* 80D66484 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 80D66488 38 00 FF FF */ li r0, -1 -/* 80D6648C 90 1E 05 B4 */ stw r0, 0x5b4(r30) -/* 80D66490 38 60 00 04 */ li r3, 4 -lbl_80D66494: -/* 80D66494 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D66498 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D6649C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D664A0 7C 08 03 A6 */ mtlr r0 -/* 80D664A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D664A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 441b81fd84f..00000000000 --- a/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D666E4: -/* 80D666E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D666E8 7C 08 02 A6 */ mflr r0 -/* 80D666EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D666F0 4B FF FC F5 */ bl create__8daTalk_cFv -/* 80D666F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D666F8 7C 08 03 A6 */ mtlr r0 -/* 80D666FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D66700 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Delete__FP8daTalk_c.s b/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Delete__FP8daTalk_c.s deleted file mode 100644 index ea88beb6233..00000000000 --- a/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Delete__FP8daTalk_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80D66704: -/* 80D66704 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D66708 7C 08 02 A6 */ mflr r0 -/* 80D6670C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D66710 38 80 FF FF */ li r4, -1 -/* 80D66714 4B FF FC 65 */ bl __dt__8daTalk_cFv -/* 80D66718 38 60 00 01 */ li r3, 1 -/* 80D6671C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D66720 7C 08 03 A6 */ mtlr r0 -/* 80D66724 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D66728 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Draw__FP8daTalk_c.s b/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Draw__FP8daTalk_c.s deleted file mode 100644 index 024e655efd1..00000000000 --- a/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Draw__FP8daTalk_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D6674C: -/* 80D6674C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D66750 7C 08 02 A6 */ mflr r0 -/* 80D66754 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D66758 4B FF FF 05 */ bl draw__8daTalk_cFv -/* 80D6675C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D66760 7C 08 03 A6 */ mtlr r0 -/* 80D66764 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D66768 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Execute__FP8daTalk_c.s b/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Execute__FP8daTalk_c.s deleted file mode 100644 index e71ecdf6b65..00000000000 --- a/asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Execute__FP8daTalk_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D6672C: -/* 80D6672C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D66730 7C 08 02 A6 */ mflr r0 -/* 80D66734 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D66738 4B FF FD 75 */ bl execute__8daTalk_cFv -/* 80D6673C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D66740 7C 08 03 A6 */ mtlr r0 -/* 80D66744 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D66748 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_talk/d_a_talk/getStatus__8daTalk_cFv.s b/asm/rel/d/a/d_a_talk/d_a_talk/getStatus__8daTalk_cFv.s deleted file mode 100644 index 61b0b6f50d0..00000000000 --- a/asm/rel/d/a/d_a_talk/d_a_talk/getStatus__8daTalk_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D66688: -/* 80D66688 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D6668C 7C 08 02 A6 */ mflr r0 -/* 80D66690 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D66694 4B 4D 1B 99 */ bl getStatus__12dMsgObject_cFv -/* 80D66698 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D6669C 7C 08 03 A6 */ mtlr r0 -/* 80D666A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D666A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_talk/d_a_talk/messageSet__8daTalk_cFv.s b/asm/rel/d/a/d_a_talk/d_a_talk/messageSet__8daTalk_cFv.s deleted file mode 100644 index f99dbcad84b..00000000000 --- a/asm/rel/d/a/d_a_talk/d_a_talk/messageSet__8daTalk_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D666A8: -/* 80D666A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D666AC 7C 08 02 A6 */ mflr r0 -/* 80D666B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D666B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D666B8 4B 4D 1B 09 */ bl getpTalkActor__12dMsgObject_cFv -/* 80D666BC 7C 7F 1B 78 */ mr r31, r3 -/* 80D666C0 4B 4D 1B 15 */ bl getIdx__12dMsgObject_cFv -/* 80D666C4 7F E4 FB 78 */ mr r4, r31 -/* 80D666C8 38 A0 03 E8 */ li r5, 0x3e8 -/* 80D666CC 4B 2B 96 69 */ bl fopMsgM_messageSet__FUlP10fopAc_ac_cUl -/* 80D666D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D666D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D666D8 7C 08 03 A6 */ mtlr r0 -/* 80D666DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D666E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_talk/d_a_talk/setStatus__8daTalk_cFUs.s b/asm/rel/d/a/d_a_talk/d_a_talk/setStatus__8daTalk_cFUs.s deleted file mode 100644 index d9451093627..00000000000 --- a/asm/rel/d/a/d_a_talk/d_a_talk/setStatus__8daTalk_cFUs.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80D66664: -/* 80D66664 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D66668 7C 08 02 A6 */ mflr r0 -/* 80D6666C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D66670 7C 83 23 78 */ mr r3, r4 -/* 80D66674 4B 4D 1B 89 */ bl setStatus__12dMsgObject_cFUs -/* 80D66678 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D6667C 7C 08 03 A6 */ mtlr r0 -/* 80D66680 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D66684 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 74da3b636d1..00000000000 --- a/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,172 +0,0 @@ -lbl_80860EAC: -/* 80860EAC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80860EB0 7C 08 02 A6 */ mflr r0 -/* 80860EB4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80860EB8 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80860EBC 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80860EC0 7C 7E 1B 78 */ mr r30, r3 -/* 80860EC4 3C 80 80 86 */ lis r4, lit_3839@ha /* 0x80861134@ha */ -/* 80860EC8 3B E4 11 34 */ addi r31, r4, lit_3839@l /* 0x80861134@l */ -/* 80860ECC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80860ED0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80860ED4 40 82 00 1C */ bne lbl_80860EF0 -/* 80860ED8 28 1E 00 00 */ cmplwi r30, 0 -/* 80860EDC 41 82 00 08 */ beq lbl_80860EE4 -/* 80860EE0 4B 7B 7C 85 */ bl __ct__10fopAc_ac_cFv -lbl_80860EE4: -/* 80860EE4 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80860EE8 60 00 00 08 */ ori r0, r0, 8 -/* 80860EEC 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80860EF0: -/* 80860EF0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80860EF4 98 1E 05 73 */ stb r0, 0x573(r30) -/* 80860EF8 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80860EFC 54 00 B6 BE */ rlwinm r0, r0, 0x16, 0x1a, 0x1f -/* 80860F00 98 1E 05 6C */ stb r0, 0x56c(r30) -/* 80860F04 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80860F08 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80860F0C 98 1E 05 6D */ stb r0, 0x56d(r30) -/* 80860F10 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80860F14 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 80860F18 98 1E 05 6E */ stb r0, 0x56e(r30) -/* 80860F1C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80860F20 54 00 46 3E */ srwi r0, r0, 0x18 -/* 80860F24 98 1E 05 6F */ stb r0, 0x56f(r30) -/* 80860F28 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80860F2C 54 00 06 FE */ clrlwi r0, r0, 0x1b -/* 80860F30 98 1E 05 71 */ stb r0, 0x571(r30) -/* 80860F34 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80860F38 54 00 DE FE */ rlwinm r0, r0, 0x1b, 0x1b, 0x1f -/* 80860F3C 98 1E 05 72 */ stb r0, 0x572(r30) -/* 80860F40 C0 7F 00 2C */ lfs f3, 0x2c(r31) -/* 80860F44 A8 1E 04 E4 */ lha r0, 0x4e4(r30) -/* 80860F48 C8 5F 00 58 */ lfd f2, 0x58(r31) -/* 80860F4C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80860F50 90 01 00 0C */ stw r0, 0xc(r1) -/* 80860F54 3C 60 43 30 */ lis r3, 0x4330 -/* 80860F58 90 61 00 08 */ stw r3, 8(r1) -/* 80860F5C C8 01 00 08 */ lfd f0, 8(r1) -/* 80860F60 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80860F64 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80860F68 EC 00 08 24 */ fdivs f0, f0, f1 -/* 80860F6C EC 03 00 32 */ fmuls f0, f3, f0 -/* 80860F70 D0 1E 05 78 */ stfs f0, 0x578(r30) -/* 80860F74 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 80860F78 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80860F7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80860F80 90 61 00 10 */ stw r3, 0x10(r1) -/* 80860F84 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80860F88 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80860F8C EC 00 08 24 */ fdivs f0, f0, f1 -/* 80860F90 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80860F94 D0 1E 05 7C */ stfs f0, 0x57c(r30) -/* 80860F98 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80860F9C 4B A0 69 F1 */ bl cM_rndFX__Ff -/* 80860FA0 FC 00 08 1E */ fctiwz f0, f1 -/* 80860FA4 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80860FA8 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80860FAC B0 1E 05 88 */ sth r0, 0x588(r30) -/* 80860FB0 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80860FB4 4B A0 69 D9 */ bl cM_rndFX__Ff -/* 80860FB8 FC 00 08 1E */ fctiwz f0, f1 -/* 80860FBC D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80860FC0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80860FC4 B0 1E 05 8A */ sth r0, 0x58a(r30) -/* 80860FC8 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80860FCC D0 3E 05 84 */ stfs f1, 0x584(r30) -/* 80860FD0 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80860FD4 D0 1E 05 68 */ stfs f0, 0x568(r30) -/* 80860FD8 88 1E 05 6C */ lbz r0, 0x56c(r30) -/* 80860FDC 28 00 00 07 */ cmplwi r0, 7 -/* 80860FE0 41 81 01 30 */ bgt lbl_80861110 -/* 80860FE4 3C 60 80 86 */ lis r3, lit_3917@ha /* 0x8086119C@ha */ -/* 80860FE8 38 63 11 9C */ addi r3, r3, lit_3917@l /* 0x8086119C@l */ -/* 80860FEC 54 00 10 3A */ slwi r0, r0, 2 -/* 80860FF0 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80860FF4 7C 09 03 A6 */ mtctr r0 -/* 80860FF8 4E 80 04 20 */ bctr -lbl_80860FFC: -/* 80860FFC C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80861000 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 80861004 D0 3E 05 74 */ stfs f1, 0x574(r30) -/* 80861008 38 00 00 00 */ li r0, 0 -/* 8086100C 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 80861010 38 00 00 03 */ li r0, 3 -/* 80861014 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 80861018 48 00 00 F8 */ b lbl_80861110 -lbl_8086101C: -/* 8086101C C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80861020 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 80861024 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80861028 D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 8086102C 38 00 00 00 */ li r0, 0 -/* 80861030 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 80861034 38 00 00 03 */ li r0, 3 -/* 80861038 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 8086103C 48 00 00 D4 */ b lbl_80861110 -lbl_80861040: -/* 80861040 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80861044 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 80861048 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 8086104C D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 80861050 38 00 00 00 */ li r0, 0 -/* 80861054 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 80861058 38 00 00 03 */ li r0, 3 -/* 8086105C 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 80861060 48 00 00 B0 */ b lbl_80861110 -lbl_80861064: -/* 80861064 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80861068 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 8086106C D0 3E 05 74 */ stfs f1, 0x574(r30) -/* 80861070 38 00 00 02 */ li r0, 2 -/* 80861074 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 80861078 38 00 00 03 */ li r0, 3 -/* 8086107C 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 80861080 48 00 00 90 */ b lbl_80861110 -lbl_80861084: -/* 80861084 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80861088 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 8086108C C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80861090 D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 80861094 38 00 00 02 */ li r0, 2 -/* 80861098 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 8086109C 38 00 00 03 */ li r0, 3 -/* 808610A0 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 808610A4 48 00 00 6C */ b lbl_80861110 -lbl_808610A8: -/* 808610A8 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 808610AC D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 808610B0 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 808610B4 D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 808610B8 38 00 00 02 */ li r0, 2 -/* 808610BC 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 808610C0 38 00 00 03 */ li r0, 3 -/* 808610C4 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 808610C8 48 00 00 48 */ b lbl_80861110 -lbl_808610CC: -/* 808610CC C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 808610D0 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 808610D4 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 808610D8 D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 808610DC 38 00 00 02 */ li r0, 2 -/* 808610E0 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 808610E4 38 00 00 01 */ li r0, 1 -/* 808610E8 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 808610EC 48 00 00 24 */ b lbl_80861110 -lbl_808610F0: -/* 808610F0 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 808610F4 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 808610F8 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 808610FC D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 80861100 38 00 00 02 */ li r0, 2 -/* 80861104 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 80861108 38 00 00 01 */ li r0, 1 -/* 8086110C 98 1E 05 8D */ stb r0, 0x58d(r30) -lbl_80861110: -/* 80861110 38 60 00 04 */ li r3, 4 -/* 80861114 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80861118 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 8086111C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80861120 7C 08 03 A6 */ mtlr r0 -/* 80861124 38 21 00 30 */ addi r1, r1, 0x30 -/* 80861128 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s b/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s deleted file mode 100644 index dc287e88b32..00000000000 --- a/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s +++ /dev/null @@ -1,154 +0,0 @@ -lbl_80860C60: -/* 80860C60 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80860C64 7C 08 02 A6 */ mflr r0 -/* 80860C68 90 01 00 44 */ stw r0, 0x44(r1) -/* 80860C6C DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80860C70 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80860C74 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 80860C78 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 80860C7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80860C80 4B B0 15 5D */ bl _savegpr_29 -/* 80860C84 7C 7E 1B 78 */ mr r30, r3 -/* 80860C88 3C 60 80 86 */ lis r3, lit_3839@ha /* 0x80861134@ha */ -/* 80860C8C 3B E3 11 34 */ addi r31, r3, lit_3839@l /* 0x80861134@l */ -/* 80860C90 3B A0 00 00 */ li r29, 0 -/* 80860C94 C3 FF 00 00 */ lfs f31, 0(r31) -/* 80860C98 FF C0 F8 90 */ fmr f30, f31 -/* 80860C9C 88 7E 05 71 */ lbz r3, 0x571(r30) -/* 80860CA0 28 03 00 1F */ cmplwi r3, 0x1f -/* 80860CA4 40 80 00 60 */ bge lbl_80860D04 -/* 80860CA8 88 1E 05 72 */ lbz r0, 0x572(r30) -/* 80860CAC 7C 03 00 40 */ cmplw r3, r0 -/* 80860CB0 40 81 00 2C */ ble lbl_80860CDC -/* 80860CB4 4B 93 ED 5D */ bl dKy_getdaytime_hour__Fv -/* 80860CB8 88 1E 05 71 */ lbz r0, 0x571(r30) -/* 80860CBC 7C 03 00 00 */ cmpw r3, r0 -/* 80860CC0 40 80 00 14 */ bge lbl_80860CD4 -/* 80860CC4 4B 93 ED 4D */ bl dKy_getdaytime_hour__Fv -/* 80860CC8 88 1E 05 72 */ lbz r0, 0x572(r30) -/* 80860CCC 7C 03 00 00 */ cmpw r3, r0 -/* 80860CD0 41 81 00 38 */ bgt lbl_80860D08 -lbl_80860CD4: -/* 80860CD4 3B A0 00 01 */ li r29, 1 -/* 80860CD8 48 00 00 30 */ b lbl_80860D08 -lbl_80860CDC: -/* 80860CDC 4B 93 ED 35 */ bl dKy_getdaytime_hour__Fv -/* 80860CE0 88 1E 05 71 */ lbz r0, 0x571(r30) -/* 80860CE4 7C 03 00 00 */ cmpw r3, r0 -/* 80860CE8 41 80 00 20 */ blt lbl_80860D08 -/* 80860CEC 4B 93 ED 25 */ bl dKy_getdaytime_hour__Fv -/* 80860CF0 88 1E 05 72 */ lbz r0, 0x572(r30) -/* 80860CF4 7C 03 00 00 */ cmpw r3, r0 -/* 80860CF8 41 81 00 10 */ bgt lbl_80860D08 -/* 80860CFC 3B A0 00 01 */ li r29, 1 -/* 80860D00 48 00 00 08 */ b lbl_80860D08 -lbl_80860D04: -/* 80860D04 3B A0 00 01 */ li r29, 1 -lbl_80860D08: -/* 80860D08 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80860D0C 41 82 00 40 */ beq lbl_80860D4C -/* 80860D10 3B A0 00 00 */ li r29, 0 -/* 80860D14 88 9E 05 73 */ lbz r4, 0x573(r30) -/* 80860D18 28 04 00 FF */ cmplwi r4, 0xff -/* 80860D1C 41 82 00 2C */ beq lbl_80860D48 -/* 80860D20 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80860D24 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80860D28 7C A5 07 74 */ extsb r5, r5 -/* 80860D2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80860D30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80860D34 4B 7D 46 2D */ bl isSwitch__10dSv_info_cCFii -/* 80860D38 2C 03 00 00 */ cmpwi r3, 0 -/* 80860D3C 41 82 00 10 */ beq lbl_80860D4C -/* 80860D40 3B A0 00 01 */ li r29, 1 -/* 80860D44 48 00 00 08 */ b lbl_80860D4C -lbl_80860D48: -/* 80860D48 3B A0 00 01 */ li r29, 1 -lbl_80860D4C: -/* 80860D4C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80860D50 41 82 00 B8 */ beq lbl_80860E08 -/* 80860D54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80860D58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80860D5C 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80860D60 3C 80 80 86 */ lis r4, d_a_kytag16__stringBase0@ha /* 0x80861194@ha */ -/* 80860D64 38 84 11 94 */ addi r4, r4, d_a_kytag16__stringBase0@l /* 0x80861194@l */ -/* 80860D68 4B B0 7C 2D */ bl strcmp -/* 80860D6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80860D70 41 82 00 20 */ beq lbl_80860D90 -/* 80860D74 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80860D78 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80860D7C C0 5F 00 08 */ lfs f2, 8(r31) -/* 80860D80 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 80860D84 C0 9F 00 10 */ lfs f4, 0x10(r31) -/* 80860D88 4B A0 EB F5 */ bl cLib_addCalc__FPfffff -/* 80860D8C 48 00 00 94 */ b lbl_80860E20 -lbl_80860D90: -/* 80860D90 A8 BE 05 88 */ lha r5, 0x588(r30) -/* 80860D94 54 A0 04 38 */ rlwinm r0, r5, 0, 0x10, 0x1c -/* 80860D98 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80860D9C 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80860DA0 7F E4 04 2E */ lfsx f31, r4, r0 -/* 80860DA4 A8 1E 05 8A */ lha r0, 0x58a(r30) -/* 80860DA8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80860DAC 7C 64 02 14 */ add r3, r4, r0 -/* 80860DB0 C3 C3 00 04 */ lfs f30, 4(r3) -/* 80860DB4 38 05 05 00 */ addi r0, r5, 0x500 -/* 80860DB8 B0 1E 05 88 */ sth r0, 0x588(r30) -/* 80860DBC A8 7E 05 8A */ lha r3, 0x58a(r30) -/* 80860DC0 38 03 03 20 */ addi r0, r3, 0x320 -/* 80860DC4 B0 1E 05 8A */ sth r0, 0x58a(r30) -/* 80860DC8 3C 60 80 43 */ lis r3, g_Counter@ha /* 0x80430CD8@ha */ -/* 80860DCC 80 03 0C D8 */ lwz r0, g_Counter@l(r3) /* 0x80430CD8@l */ -/* 80860DD0 1C 00 05 00 */ mulli r0, r0, 0x500 -/* 80860DD4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80860DD8 7C 04 04 2E */ lfsx f0, r4, r0 -/* 80860DDC 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80860DE0 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80860DE4 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 80860DE8 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80860DEC EC 21 00 2A */ fadds f1, f1, f0 -/* 80860DF0 C0 5F 00 08 */ lfs f2, 8(r31) -/* 80860DF4 C0 9F 00 10 */ lfs f4, 0x10(r31) -/* 80860DF8 4B A0 EB 85 */ bl cLib_addCalc__FPfffff -/* 80860DFC C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80860E00 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 80860E04 48 00 00 1C */ b lbl_80860E20 -lbl_80860E08: -/* 80860E08 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80860E0C C0 3F 00 00 */ lfs f1, 0(r31) -/* 80860E10 C0 5F 00 08 */ lfs f2, 8(r31) -/* 80860E14 C0 7F 00 1C */ lfs f3, 0x1c(r31) -/* 80860E18 C0 9F 00 10 */ lfs f4, 0x10(r31) -/* 80860E1C 4B A0 EB 61 */ bl cLib_addCalc__FPfffff -lbl_80860E20: -/* 80860E20 C0 9E 05 68 */ lfs f4, 0x568(r30) -/* 80860E24 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80860E28 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 80860E2C 40 81 00 44 */ ble lbl_80860E70 -/* 80860E30 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80860E34 C0 3E 05 78 */ lfs f1, 0x578(r30) -/* 80860E38 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80860E3C EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80860E40 EC 21 00 2A */ fadds f1, f1, f0 -/* 80860E44 C0 5E 05 7C */ lfs f2, 0x57c(r30) -/* 80860E48 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 80860E4C EC 00 07 B2 */ fmuls f0, f0, f30 -/* 80860E50 EC 42 00 2A */ fadds f2, f2, f0 -/* 80860E54 C0 7E 05 80 */ lfs f3, 0x580(r30) -/* 80860E58 38 9E 05 6D */ addi r4, r30, 0x56d -/* 80860E5C C0 1E 05 74 */ lfs f0, 0x574(r30) -/* 80860E60 EC 80 01 32 */ fmuls f4, f0, f4 -/* 80860E64 88 BE 05 8C */ lbz r5, 0x58c(r30) -/* 80860E68 88 DE 05 8D */ lbz r6, 0x58d(r30) -/* 80860E6C 4B 94 97 F9 */ bl dKy_BossSpotLight_set__FP4cXyzfffP8_GXColorfUcUc -lbl_80860E70: -/* 80860E70 38 60 00 01 */ li r3, 1 -/* 80860E74 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 80860E78 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80860E7C E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 80860E80 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 80860E84 39 61 00 20 */ addi r11, r1, 0x20 -/* 80860E88 4B B0 13 A1 */ bl _restgpr_29 -/* 80860E8C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80860E90 7C 08 03 A6 */ mtlr r0 -/* 80860E94 38 21 00 40 */ addi r1, r1, 0x40 -/* 80860E98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/Create__15daObjWaterEff_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/Create__15daObjWaterEff_cFv.s deleted file mode 100644 index d7e9cd4ae40..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/Create__15daObjWaterEff_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80C5C4F8: -/* 80C5C4F8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80C5C4FC 7C 08 02 A6 */ mflr r0 -/* 80C5C500 90 01 00 44 */ stw r0, 0x44(r1) -/* 80C5C504 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C5C508 4B 70 5C C5 */ bl _savegpr_25 -/* 80C5C50C 7C 79 1B 78 */ mr r25, r3 -/* 80C5C510 3C 60 80 C6 */ lis r3, l_eff_id@ha /* 0x80C5C878@ha */ -/* 80C5C514 3B 63 C8 78 */ addi r27, r3, l_eff_id@l /* 0x80C5C878@l */ -/* 80C5C518 3B 40 00 00 */ li r26, 0 -/* 80C5C51C 3B E0 00 00 */ li r31, 0 -/* 80C5C520 3B C0 00 00 */ li r30, 0 -/* 80C5C524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5C528 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5C52C 3B BB 00 00 */ addi r29, r27, 0 -lbl_80C5C530: -/* 80C5C530 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 80C5C534 38 80 00 00 */ li r4, 0 -/* 80C5C538 90 81 00 08 */ stw r4, 8(r1) -/* 80C5C53C 38 00 FF FF */ li r0, -1 -/* 80C5C540 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C5C544 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C5C548 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C5C54C 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C5C550 38 80 00 00 */ li r4, 0 -/* 80C5C554 7C BD F2 2E */ lhzx r5, r29, r30 -/* 80C5C558 38 D9 04 D0 */ addi r6, r25, 0x4d0 -/* 80C5C55C 38 E0 00 00 */ li r7, 0 -/* 80C5C560 39 00 00 00 */ li r8, 0 -/* 80C5C564 39 20 00 00 */ li r9, 0 -/* 80C5C568 39 40 00 FF */ li r10, 0xff -/* 80C5C56C C0 3B 00 08 */ lfs f1, 8(r27) -/* 80C5C570 4B 3F 05 21 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C5C574 38 1F 05 80 */ addi r0, r31, 0x580 -/* 80C5C578 7C 79 01 2E */ stwx r3, r25, r0 -/* 80C5C57C 3B 5A 00 01 */ addi r26, r26, 1 -/* 80C5C580 2C 1A 00 04 */ cmpwi r26, 4 -/* 80C5C584 3B FF 00 04 */ addi r31, r31, 4 -/* 80C5C588 3B DE 00 02 */ addi r30, r30, 2 -/* 80C5C58C 41 80 FF A4 */ blt lbl_80C5C530 -/* 80C5C590 C0 1B 00 0C */ lfs f0, 0xc(r27) -/* 80C5C594 D0 19 05 68 */ stfs f0, 0x568(r25) -/* 80C5C598 C0 1B 00 10 */ lfs f0, 0x10(r27) -/* 80C5C59C D0 19 05 6C */ stfs f0, 0x56c(r25) -/* 80C5C5A0 C0 1B 00 14 */ lfs f0, 0x14(r27) -/* 80C5C5A4 D0 19 05 70 */ stfs f0, 0x570(r25) -/* 80C5C5A8 C0 1B 00 18 */ lfs f0, 0x18(r27) -/* 80C5C5AC D0 19 05 74 */ stfs f0, 0x574(r25) -/* 80C5C5B0 C0 1B 00 1C */ lfs f0, 0x1c(r27) -/* 80C5C5B4 D0 19 05 78 */ stfs f0, 0x578(r25) -/* 80C5C5B8 C0 1B 00 20 */ lfs f0, 0x20(r27) -/* 80C5C5BC D0 19 05 7C */ stfs f0, 0x57c(r25) -/* 80C5C5C0 38 60 00 01 */ li r3, 1 -/* 80C5C5C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C5C5C8 4B 70 5C 51 */ bl _restgpr_25 -/* 80C5C5CC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80C5C5D0 7C 08 03 A6 */ mtlr r0 -/* 80C5C5D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80C5C5D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/__dt__4cXyzFv.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/__dt__4cXyzFv.s deleted file mode 100644 index bf9236bda4d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/__dt__4cXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C5C670: -/* 80C5C670 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C674 7C 08 02 A6 */ mflr r0 -/* 80C5C678 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C67C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5C680 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5C684 41 82 00 10 */ beq lbl_80C5C694 -/* 80C5C688 7C 80 07 35 */ extsh. r0, r4 -/* 80C5C68C 40 81 00 08 */ ble lbl_80C5C694 -/* 80C5C690 4B 67 26 AD */ bl __dl__FPv -lbl_80C5C694: -/* 80C5C694 7F E3 FB 78 */ mr r3, r31 -/* 80C5C698 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C69C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C6A0 7C 08 03 A6 */ mtlr r0 -/* 80C5C6A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C6A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/_delete__15daObjWaterEff_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/_delete__15daObjWaterEff_cFv.s deleted file mode 100644 index 024d70e8670..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/_delete__15daObjWaterEff_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80C5C7B8: -/* 80C5C7B8 38 80 00 00 */ li r4, 0 -/* 80C5C7BC 38 E0 00 01 */ li r7, 1 -/* 80C5C7C0 7C 85 23 78 */ mr r5, r4 -/* 80C5C7C4 38 00 00 04 */ li r0, 4 -/* 80C5C7C8 7C 09 03 A6 */ mtctr r0 -lbl_80C5C7CC: -/* 80C5C7CC 39 04 05 80 */ addi r8, r4, 0x580 -/* 80C5C7D0 7C C3 40 2E */ lwzx r6, r3, r8 -/* 80C5C7D4 28 06 00 00 */ cmplwi r6, 0 -/* 80C5C7D8 41 82 00 28 */ beq lbl_80C5C800 -/* 80C5C7DC 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 80C5C7E0 60 00 00 01 */ ori r0, r0, 1 -/* 80C5C7E4 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 80C5C7E8 90 E6 00 24 */ stw r7, 0x24(r6) -/* 80C5C7EC 7C C3 40 2E */ lwzx r6, r3, r8 -/* 80C5C7F0 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 80C5C7F4 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 80C5C7F8 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 80C5C7FC 7C A3 41 2E */ stwx r5, r3, r8 -lbl_80C5C800: -/* 80C5C800 38 84 00 04 */ addi r4, r4, 4 -/* 80C5C804 42 00 FF C8 */ bdnz lbl_80C5C7CC -/* 80C5C808 38 60 00 01 */ li r3, 1 -/* 80C5C80C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Create__FP10fopAc_ac_c.s deleted file mode 100644 index a0848ed9a2a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5C850: -/* 80C5C850 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C854 7C 08 02 A6 */ mflr r0 -/* 80C5C858 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C85C 4B FF FD 81 */ bl create__15daObjWaterEff_cFv -/* 80C5C860 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C864 7C 08 03 A6 */ mtlr r0 -/* 80C5C868 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C86C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Delete__FP15daObjWaterEff_c.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Delete__FP15daObjWaterEff_c.s deleted file mode 100644 index 40986d05039..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Delete__FP15daObjWaterEff_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5C830: -/* 80C5C830 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C834 7C 08 02 A6 */ mflr r0 -/* 80C5C838 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C83C 4B FF FF 7D */ bl _delete__15daObjWaterEff_cFv -/* 80C5C840 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C844 7C 08 03 A6 */ mtlr r0 -/* 80C5C848 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C84C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Execute__FP15daObjWaterEff_c.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Execute__FP15daObjWaterEff_c.s deleted file mode 100644 index c1f57ea6ad0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Execute__FP15daObjWaterEff_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5C810: -/* 80C5C810 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C814 7C 08 02 A6 */ mflr r0 -/* 80C5C818 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C81C 4B FF FE 95 */ bl execute__15daObjWaterEff_cFv -/* 80C5C820 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C824 7C 08 03 A6 */ mtlr r0 -/* 80C5C828 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C82C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/execute__15daObjWaterEff_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/execute__15daObjWaterEff_cFv.s deleted file mode 100644 index b5fddfc27f1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/execute__15daObjWaterEff_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80C5C6B0: -/* 80C5C6B0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C5C6B4 7C 08 02 A6 */ mflr r0 -/* 80C5C6B8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C5C6BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C5C6C0 4B 70 5B 0D */ bl _savegpr_25 -/* 80C5C6C4 7C 7F 1B 78 */ mr r31, r3 -/* 80C5C6C8 4B 54 EB B9 */ bl dKy_camera_water_in_status_check__Fv -/* 80C5C6CC 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5C6D0 41 82 00 34 */ beq lbl_80C5C704 -/* 80C5C6D4 38 60 00 00 */ li r3, 0 -/* 80C5C6D8 38 80 00 FF */ li r4, 0xff -/* 80C5C6DC 38 00 00 04 */ li r0, 4 -/* 80C5C6E0 7C 09 03 A6 */ mtctr r0 -lbl_80C5C6E4: -/* 80C5C6E4 38 03 05 80 */ addi r0, r3, 0x580 -/* 80C5C6E8 7C BF 00 2E */ lwzx r5, r31, r0 -/* 80C5C6EC 28 05 00 00 */ cmplwi r5, 0 -/* 80C5C6F0 41 82 00 08 */ beq lbl_80C5C6F8 -/* 80C5C6F4 98 85 00 BB */ stb r4, 0xbb(r5) -lbl_80C5C6F8: -/* 80C5C6F8 38 63 00 04 */ addi r3, r3, 4 -/* 80C5C6FC 42 00 FF E8 */ bdnz lbl_80C5C6E4 -/* 80C5C700 48 00 00 30 */ b lbl_80C5C730 -lbl_80C5C704: -/* 80C5C704 38 60 00 00 */ li r3, 0 -/* 80C5C708 38 80 00 80 */ li r4, 0x80 -/* 80C5C70C 38 00 00 04 */ li r0, 4 -/* 80C5C710 7C 09 03 A6 */ mtctr r0 -lbl_80C5C714: -/* 80C5C714 38 03 05 80 */ addi r0, r3, 0x580 -/* 80C5C718 7C BF 00 2E */ lwzx r5, r31, r0 -/* 80C5C71C 28 05 00 00 */ cmplwi r5, 0 -/* 80C5C720 41 82 00 08 */ beq lbl_80C5C728 -/* 80C5C724 98 85 00 BB */ stb r4, 0xbb(r5) -lbl_80C5C728: -/* 80C5C728 38 63 00 04 */ addi r3, r3, 4 -/* 80C5C72C 42 00 FF E8 */ bdnz lbl_80C5C714 -lbl_80C5C730: -/* 80C5C730 3B 20 00 00 */ li r25, 0 -/* 80C5C734 3B C0 00 00 */ li r30, 0 -/* 80C5C738 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080299@ha */ -/* 80C5C73C 3B 43 02 99 */ addi r26, r3, 0x0299 /* 0x00080299@l */ -/* 80C5C740 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C5C744 3B 63 13 68 */ addi r27, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C5C748 3C 60 80 C6 */ lis r3, lit_3637@ha /* 0x80C5C880@ha */ -/* 80C5C74C 3B 83 C8 80 */ addi r28, r3, lit_3637@l /* 0x80C5C880@l */ -/* 80C5C750 3C 60 80 C6 */ lis r3, lit_3710@ha /* 0x80C5C89C@ha */ -/* 80C5C754 3B A3 C8 9C */ addi r29, r3, lit_3710@l /* 0x80C5C89C@l */ -lbl_80C5C758: -/* 80C5C758 93 41 00 08 */ stw r26, 8(r1) -/* 80C5C75C 80 7B 00 00 */ lwz r3, 0(r27) -/* 80C5C760 38 81 00 08 */ addi r4, r1, 8 -/* 80C5C764 38 BE 05 68 */ addi r5, r30, 0x568 -/* 80C5C768 7C BF 2A 14 */ add r5, r31, r5 -/* 80C5C76C 38 C0 00 00 */ li r6, 0 -/* 80C5C770 38 E0 00 00 */ li r7, 0 -/* 80C5C774 C0 3C 00 00 */ lfs f1, 0(r28) -/* 80C5C778 FC 40 08 90 */ fmr f2, f1 -/* 80C5C77C C0 7D 00 00 */ lfs f3, 0(r29) -/* 80C5C780 FC 80 18 90 */ fmr f4, f3 -/* 80C5C784 39 00 00 00 */ li r8, 0 -/* 80C5C788 4B 64 FD 85 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C5C78C 3B 39 00 01 */ addi r25, r25, 1 -/* 80C5C790 2C 19 00 02 */ cmpwi r25, 2 -/* 80C5C794 3B DE 00 0C */ addi r30, r30, 0xc -/* 80C5C798 41 80 FF C0 */ blt lbl_80C5C758 -/* 80C5C79C 38 60 00 01 */ li r3, 1 -/* 80C5C7A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C5C7A4 4B 70 5A 75 */ bl _restgpr_25 -/* 80C5C7A8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C5C7AC 7C 08 03 A6 */ mtlr r0 -/* 80C5C7B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C5C7B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/func_80C5C5DC.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/func_80C5C5DC.s deleted file mode 100644 index abe5aa7f49f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/func_80C5C5DC.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C5C5DC: -/* 80C5C5DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C5E0 7C 08 02 A6 */ mflr r0 -/* 80C5C5E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C5E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5C5EC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5C5F0 7C 7F 1B 78 */ mr r31, r3 -/* 80C5C5F4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C5C5F8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C5C5FC 40 82 00 40 */ bne lbl_80C5C63C -/* 80C5C600 7F E0 FB 79 */ or. r0, r31, r31 -/* 80C5C604 41 82 00 2C */ beq lbl_80C5C630 -/* 80C5C608 7C 1E 03 78 */ mr r30, r0 -/* 80C5C60C 4B 3B C5 59 */ bl __ct__10fopAc_ac_cFv -/* 80C5C610 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80C5C614 3C 80 80 C6 */ lis r4, __ct__4cXyzFv@ha /* 0x80C5C6AC@ha */ -/* 80C5C618 38 84 C6 AC */ addi r4, r4, __ct__4cXyzFv@l /* 0x80C5C6AC@l */ -/* 80C5C61C 3C A0 80 C6 */ lis r5, __dt__4cXyzFv@ha /* 0x80C5C670@ha */ -/* 80C5C620 38 A5 C6 70 */ addi r5, r5, __dt__4cXyzFv@l /* 0x80C5C670@l */ -/* 80C5C624 38 C0 00 0C */ li r6, 0xc -/* 80C5C628 38 E0 00 02 */ li r7, 2 -/* 80C5C62C 4B 70 57 35 */ bl __construct_array -lbl_80C5C630: -/* 80C5C630 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C5C634 60 00 00 08 */ ori r0, r0, 8 -/* 80C5C638 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C5C63C: -/* 80C5C63C 7F E3 FB 78 */ mr r3, r31 -/* 80C5C640 4B FF FE B9 */ bl Create__15daObjWaterEff_cFv -/* 80C5C644 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5C648 40 82 00 0C */ bne lbl_80C5C654 -/* 80C5C64C 38 60 00 05 */ li r3, 5 -/* 80C5C650 48 00 00 08 */ b lbl_80C5C658 -lbl_80C5C654: -/* 80C5C654 38 60 00 04 */ li r3, 4 -lbl_80C5C658: -/* 80C5C658 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C65C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5C660 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C664 7C 08 03 A6 */ mtlr r0 -/* 80C5C668 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C66C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/Create__11daTagMist_cFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/Create__11daTagMist_cFv.s deleted file mode 100644 index 4c51652614c..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/Create__11daTagMist_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_8048F370: -/* 8048F370 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F374 7C 08 02 A6 */ mflr r0 -/* 8048F378 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F37C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048F380 7C 7F 1B 78 */ mr r31, r3 -/* 8048F384 3C 80 80 49 */ lis r4, lit_3678@ha /* 0x8048F700@ha */ -/* 8048F388 38 84 F7 00 */ addi r4, r4, lit_3678@l /* 0x8048F700@l */ -/* 8048F38C C0 44 00 00 */ lfs f2, 0(r4) -/* 8048F390 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8048F394 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8048F398 D0 03 05 70 */ stfs f0, 0x570(r3) -/* 8048F39C C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8048F3A0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8048F3A4 D0 03 05 78 */ stfs f0, 0x578(r3) -/* 8048F3A8 C0 24 00 04 */ lfs f1, 4(r4) -/* 8048F3AC C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8048F3B0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8048F3B4 D0 03 05 7C */ stfs f0, 0x57c(r3) -/* 8048F3B8 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8048F3BC EC 02 00 32 */ fmuls f0, f2, f0 -/* 8048F3C0 D0 03 05 84 */ stfs f0, 0x584(r3) -/* 8048F3C4 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8048F3C8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8048F3CC D0 03 05 88 */ stfs f0, 0x588(r3) -/* 8048F3D0 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8048F3D4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8048F3D8 D0 03 05 90 */ stfs f0, 0x590(r3) -/* 8048F3DC C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8048F3E0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8048F3E4 D0 03 05 94 */ stfs f0, 0x594(r3) -/* 8048F3E8 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8048F3EC EC 01 00 32 */ fmuls f0, f1, f0 -/* 8048F3F0 D0 03 05 9C */ stfs f0, 0x59c(r3) -/* 8048F3F4 C0 04 00 08 */ lfs f0, 8(r4) -/* 8048F3F8 D0 03 05 98 */ stfs f0, 0x598(r3) -/* 8048F3FC D0 03 05 8C */ stfs f0, 0x58c(r3) -/* 8048F400 D0 03 05 80 */ stfs f0, 0x580(r3) -/* 8048F404 D0 03 05 74 */ stfs f0, 0x574(r3) -/* 8048F408 4B FF FF 09 */ bl isMySw__11daTagMist_cFv -/* 8048F40C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048F410 41 82 00 14 */ beq lbl_8048F424 -/* 8048F414 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8048F418 54 00 46 BE */ rlwinm r0, r0, 8, 0x1a, 0x1f -/* 8048F41C 3C 60 80 45 */ lis r3, mPlayerNo__11daTagMist_c+0x0@ha /* 0x80450DC0@ha */ -/* 8048F420 98 03 0D C0 */ stb r0, mPlayerNo__11daTagMist_c+0x0@l(r3) /* 0x80450DC0@l */ -lbl_8048F424: -/* 8048F424 38 00 00 00 */ li r0, 0 -/* 8048F428 98 1F 05 A0 */ stb r0, 0x5a0(r31) -/* 8048F42C 38 60 00 01 */ li r3, 1 -/* 8048F430 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048F434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F438 7C 08 03 A6 */ mtlr r0 -/* 8048F43C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F440 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/__dt__4cXyzFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/__dt__4cXyzFv.s deleted file mode 100644 index 11909032ebb..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/__dt__4cXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8048F518: -/* 8048F518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F51C 7C 08 02 A6 */ mflr r0 -/* 8048F520 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F524 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048F528 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8048F52C 41 82 00 10 */ beq lbl_8048F53C -/* 8048F530 7C 80 07 35 */ extsh. r0, r4 -/* 8048F534 40 81 00 08 */ ble lbl_8048F53C -/* 8048F538 4B E3 F8 05 */ bl __dl__FPv -lbl_8048F53C: -/* 8048F53C 7F E3 FB 78 */ mr r3, r31 -/* 8048F540 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048F544 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F548 7C 08 03 A6 */ mtlr r0 -/* 8048F54C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F550 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Create__FP10fopAc_ac_c.s deleted file mode 100644 index aad8f156a14..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048F6D8: -/* 8048F6D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F6DC 7C 08 02 A6 */ mflr r0 -/* 8048F6E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F6E4 4B FF FD 61 */ bl create__11daTagMist_cFv -/* 8048F6E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F6EC 7C 08 03 A6 */ mtlr r0 -/* 8048F6F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F6F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Delete__FP11daTagMist_c.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Delete__FP11daTagMist_c.s deleted file mode 100644 index 109ee8cc8d1..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Delete__FP11daTagMist_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048F6B8: -/* 8048F6B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F6BC 7C 08 02 A6 */ mflr r0 -/* 8048F6C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F6C4 4B FF FF CD */ bl _delete__11daTagMist_cFv -/* 8048F6C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F6CC 7C 08 03 A6 */ mtlr r0 -/* 8048F6D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F6D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Execute__FP11daTagMist_c.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Execute__FP11daTagMist_c.s deleted file mode 100644 index 88e80d1b584..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Execute__FP11daTagMist_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048F698: -/* 8048F698 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F69C 7C 08 02 A6 */ mflr r0 -/* 8048F6A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F6A4 4B FF FE B5 */ bl execute__11daTagMist_cFv -/* 8048F6A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F6AC 7C 08 03 A6 */ mtlr r0 -/* 8048F6B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F6B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/execute__11daTagMist_cFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/execute__11daTagMist_cFv.s deleted file mode 100644 index f7259cf39b8..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/execute__11daTagMist_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_8048F558: -/* 8048F558 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048F55C 7C 08 02 A6 */ mflr r0 -/* 8048F560 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048F564 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8048F568 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8048F56C 7C 7F 1B 78 */ mr r31, r3 -/* 8048F570 A0 03 05 A2 */ lhz r0, 0x5a2(r3) -/* 8048F574 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8048F578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048F57C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048F580 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8048F584 7C 05 07 74 */ extsb r5, r0 -/* 8048F588 4B BA 5D D9 */ bl isSwitch__10dSv_info_cCFii -/* 8048F58C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048F590 41 82 00 0C */ beq lbl_8048F59C -/* 8048F594 38 60 00 01 */ li r3, 1 -/* 8048F598 48 00 00 E0 */ b lbl_8048F678 -lbl_8048F59C: -/* 8048F59C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048F5A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048F5A4 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 8048F5A8 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 8048F5AC D0 01 00 08 */ stfs f0, 8(r1) -/* 8048F5B0 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 8048F5B4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8048F5B8 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 8048F5BC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8048F5C0 38 61 00 08 */ addi r3, r1, 8 -/* 8048F5C4 38 9F 04 A8 */ addi r4, r31, 0x4a8 -/* 8048F5C8 7C 65 1B 78 */ mr r5, r3 -/* 8048F5CC 4B EB 7A E9 */ bl PSVECSubtract -/* 8048F5D0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8048F5D4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8048F5D8 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 8048F5DC 7C 00 00 D0 */ neg r0, r0 -/* 8048F5E0 7C 04 07 34 */ extsh r4, r0 -/* 8048F5E4 4B B7 CD F9 */ bl mDoMtx_YrotS__FPA4_fs -/* 8048F5E8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8048F5EC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8048F5F0 38 81 00 08 */ addi r4, r1, 8 -/* 8048F5F4 7C 85 23 78 */ mr r5, r4 -/* 8048F5F8 4B EB 77 75 */ bl PSMTXMultVec -/* 8048F5FC 38 00 00 00 */ li r0, 0 -/* 8048F600 C0 1F 05 70 */ lfs f0, 0x570(r31) -/* 8048F604 C0 41 00 08 */ lfs f2, 8(r1) -/* 8048F608 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 8048F60C 40 80 00 30 */ bge lbl_8048F63C -/* 8048F610 C0 1F 05 78 */ lfs f0, 0x578(r31) -/* 8048F614 C0 21 00 10 */ lfs f1, 0x10(r1) -/* 8048F618 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8048F61C 40 80 00 20 */ bge lbl_8048F63C -/* 8048F620 C0 1F 05 88 */ lfs f0, 0x588(r31) -/* 8048F624 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 8048F628 40 81 00 14 */ ble lbl_8048F63C -/* 8048F62C C0 1F 05 90 */ lfs f0, 0x590(r31) -/* 8048F630 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8048F634 40 81 00 08 */ ble lbl_8048F63C -/* 8048F638 38 00 00 01 */ li r0, 1 -lbl_8048F63C: -/* 8048F63C 54 1E 06 3F */ clrlwi. r30, r0, 0x18 -/* 8048F640 41 82 00 30 */ beq lbl_8048F670 -/* 8048F644 88 1F 05 A0 */ lbz r0, 0x5a0(r31) -/* 8048F648 28 00 00 00 */ cmplwi r0, 0 -/* 8048F64C 40 82 00 24 */ bne lbl_8048F670 -/* 8048F650 7F E3 FB 78 */ mr r3, r31 -/* 8048F654 4B FF FC 05 */ bl offSw__11daTagMist_cFv -/* 8048F658 7F E3 FB 78 */ mr r3, r31 -/* 8048F65C 4B FF FC 69 */ bl onMySw__11daTagMist_cFv -/* 8048F660 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8048F664 54 00 46 BE */ rlwinm r0, r0, 8, 0x1a, 0x1f -/* 8048F668 3C 60 80 45 */ lis r3, mPlayerNo__11daTagMist_c+0x0@ha /* 0x80450DC0@ha */ -/* 8048F66C 98 03 0D C0 */ stb r0, mPlayerNo__11daTagMist_c+0x0@l(r3) /* 0x80450DC0@l */ -lbl_8048F670: -/* 8048F670 9B DF 05 A0 */ stb r30, 0x5a0(r31) -/* 8048F674 38 60 00 01 */ li r3, 1 -lbl_8048F678: -/* 8048F678 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8048F67C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8048F680 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048F684 7C 08 03 A6 */ mtlr r0 -/* 8048F688 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048F68C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/func_8048F444.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/func_8048F444.s deleted file mode 100644 index 54c7b503cbe..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/func_8048F444.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8048F444: -/* 8048F444 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F448 7C 08 02 A6 */ mflr r0 -/* 8048F44C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F450 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048F454 93 C1 00 08 */ stw r30, 8(r1) -/* 8048F458 7C 7F 1B 78 */ mr r31, r3 -/* 8048F45C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8048F460 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8048F464 40 82 00 40 */ bne lbl_8048F4A4 -/* 8048F468 7F E0 FB 79 */ or. r0, r31, r31 -/* 8048F46C 41 82 00 2C */ beq lbl_8048F498 -/* 8048F470 7C 1E 03 78 */ mr r30, r0 -/* 8048F474 4B B8 96 F1 */ bl __ct__10fopAc_ac_cFv -/* 8048F478 38 7E 05 70 */ addi r3, r30, 0x570 -/* 8048F47C 3C 80 80 49 */ lis r4, __ct__4cXyzFv@ha /* 0x8048F554@ha */ -/* 8048F480 38 84 F5 54 */ addi r4, r4, __ct__4cXyzFv@l /* 0x8048F554@l */ -/* 8048F484 3C A0 80 49 */ lis r5, __dt__4cXyzFv@ha /* 0x8048F518@ha */ -/* 8048F488 38 A5 F5 18 */ addi r5, r5, __dt__4cXyzFv@l /* 0x8048F518@l */ -/* 8048F48C 38 C0 00 0C */ li r6, 0xc -/* 8048F490 38 E0 00 04 */ li r7, 4 -/* 8048F494 4B ED 28 CD */ bl __construct_array -lbl_8048F498: -/* 8048F498 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8048F49C 60 00 00 08 */ ori r0, r0, 8 -/* 8048F4A0 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8048F4A4: -/* 8048F4A4 88 1F 05 A1 */ lbz r0, 0x5a1(r31) -/* 8048F4A8 28 00 00 00 */ cmplwi r0, 0 -/* 8048F4AC 40 82 00 38 */ bne lbl_8048F4E4 -/* 8048F4B0 38 00 00 01 */ li r0, 1 -/* 8048F4B4 98 1F 05 A1 */ stb r0, 0x5a1(r31) -/* 8048F4B8 A8 1F 04 B4 */ lha r0, 0x4b4(r31) -/* 8048F4BC B0 1F 05 A2 */ sth r0, 0x5a2(r31) -/* 8048F4C0 A8 1F 04 B8 */ lha r0, 0x4b8(r31) -/* 8048F4C4 B0 1F 05 A4 */ sth r0, 0x5a4(r31) -/* 8048F4C8 38 00 00 00 */ li r0, 0 -/* 8048F4CC B0 1F 04 B8 */ sth r0, 0x4b8(r31) -/* 8048F4D0 B0 1F 04 B4 */ sth r0, 0x4b4(r31) -/* 8048F4D4 B0 1F 04 E0 */ sth r0, 0x4e0(r31) -/* 8048F4D8 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 8048F4DC B0 1F 04 E8 */ sth r0, 0x4e8(r31) -/* 8048F4E0 B0 1F 04 E4 */ sth r0, 0x4e4(r31) -lbl_8048F4E4: -/* 8048F4E4 7F E3 FB 78 */ mr r3, r31 -/* 8048F4E8 4B FF FE 89 */ bl Create__11daTagMist_cFv -/* 8048F4EC 2C 03 00 00 */ cmpwi r3, 0 -/* 8048F4F0 40 82 00 0C */ bne lbl_8048F4FC -/* 8048F4F4 38 60 00 05 */ li r3, 5 -/* 8048F4F8 48 00 00 08 */ b lbl_8048F500 -lbl_8048F4FC: -/* 8048F4FC 38 60 00 04 */ li r3, 4 -lbl_8048F500: -/* 8048F500 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048F504 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048F508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F50C 7C 08 03 A6 */ mtlr r0 -/* 8048F510 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F514 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/isMySw__11daTagMist_cFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/isMySw__11daTagMist_cFv.s deleted file mode 100644 index a7c60a4b19b..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/isMySw__11daTagMist_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8048F310: -/* 8048F310 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F314 7C 08 02 A6 */ mflr r0 -/* 8048F318 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F31C 7C 65 1B 78 */ mr r5, r3 -/* 8048F320 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048F324 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8048F328 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8048F32C 28 00 00 FF */ cmplwi r0, 0xff -/* 8048F330 41 82 00 2C */ beq lbl_8048F35C -/* 8048F334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048F338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048F33C 7C 84 02 14 */ add r4, r4, r0 -/* 8048F340 88 05 04 BA */ lbz r0, 0x4ba(r5) -/* 8048F344 7C 05 07 74 */ extsb r5, r0 -/* 8048F348 4B BA 60 19 */ bl isSwitch__10dSv_info_cCFii -/* 8048F34C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048F350 41 82 00 0C */ beq lbl_8048F35C -/* 8048F354 38 60 00 01 */ li r3, 1 -/* 8048F358 48 00 00 08 */ b lbl_8048F360 -lbl_8048F35C: -/* 8048F35C 38 60 00 00 */ li r3, 0 -lbl_8048F360: -/* 8048F360 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F364 7C 08 03 A6 */ mtlr r0 -/* 8048F368 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F36C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/offSw__11daTagMist_cFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/offSw__11daTagMist_cFv.s deleted file mode 100644 index ecdc4442cd2..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/offSw__11daTagMist_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8048F258: -/* 8048F258 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048F25C 7C 08 02 A6 */ mflr r0 -/* 8048F260 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048F264 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048F268 4B ED 2F 6D */ bl _savegpr_27 -/* 8048F26C 7C 7B 1B 78 */ mr r27, r3 -/* 8048F270 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048F274 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 8048F278 54 1D 86 3E */ rlwinm r29, r0, 0x10, 0x18, 0x1f -/* 8048F27C 3B 80 00 00 */ li r28, 0 -/* 8048F280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048F284 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048F288 48 00 00 1C */ b lbl_8048F2A4 -lbl_8048F28C: -/* 8048F28C 7F E3 FB 78 */ mr r3, r31 -/* 8048F290 7C 9E E2 14 */ add r4, r30, r28 -/* 8048F294 88 1B 04 BA */ lbz r0, 0x4ba(r27) -/* 8048F298 7C 05 07 74 */ extsb r5, r0 -/* 8048F29C 4B BA 60 15 */ bl offSwitch__10dSv_info_cFii -/* 8048F2A0 3B 9C 00 01 */ addi r28, r28, 1 -lbl_8048F2A4: -/* 8048F2A4 7C 1C E8 00 */ cmpw r28, r29 -/* 8048F2A8 41 80 FF E4 */ blt lbl_8048F28C -/* 8048F2AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048F2B0 4B ED 2F 71 */ bl _restgpr_27 -/* 8048F2B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048F2B8 7C 08 03 A6 */ mtlr r0 -/* 8048F2BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048F2C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/onMySw__11daTagMist_cFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/onMySw__11daTagMist_cFv.s deleted file mode 100644 index b0b780f313b..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/onMySw__11daTagMist_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8048F2C4: -/* 8048F2C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F2C8 7C 08 02 A6 */ mflr r0 -/* 8048F2CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F2D0 7C 65 1B 78 */ mr r5, r3 -/* 8048F2D4 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048F2D8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8048F2DC 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8048F2E0 28 00 00 FF */ cmplwi r0, 0xff -/* 8048F2E4 41 82 00 1C */ beq lbl_8048F300 -/* 8048F2E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048F2EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048F2F0 7C 84 02 14 */ add r4, r4, r0 -/* 8048F2F4 88 05 04 BA */ lbz r0, 0x4ba(r5) -/* 8048F2F8 7C 05 07 74 */ extsb r5, r0 -/* 8048F2FC 4B BA 5F 05 */ bl onSwitch__10dSv_info_cFii -lbl_8048F300: -/* 8048F300 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F304 7C 08 03 A6 */ mtlr r0 -/* 8048F308 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F30C 4E 80 00 20 */ blr