From b84aca0cfdf46e3f6fe2947e757572f952bb1239 Mon Sep 17 00:00:00 2001 From: Trueffeloot Date: Wed, 5 Apr 2023 07:24:19 +0200 Subject: [PATCH] d_a_tag_lantern OK --- Progress.md | 8 +- .../Delete__15daTag_Lantern_cFv.s | 14 --- .../Execute__15daTag_Lantern_cFv.s | 106 ------------------ .../__dt__15daTag_Lantern_cFv.s | 33 ------ .../__dt__21daTag_Lantern_Param_cFv.s | 20 ---- .../__sinit_d_a_tag_lantern_cpp.s | 17 --- .../create__15daTag_Lantern_cFv.s | 35 ------ .../daTag_Lantern_Create__FPv.s | 9 -- .../daTag_Lantern_Delete__FPv.s | 9 -- .../d_a_tag_lantern/daTag_Lantern_Draw__FPv.s | 9 -- .../daTag_Lantern_Execute__FPv.s | 9 -- .../initialize__15daTag_Lantern_cFv.s | 47 -------- 12 files changed, 4 insertions(+), 312 deletions(-) delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Delete__15daTag_Lantern_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Execute__15daTag_Lantern_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__dt__15daTag_Lantern_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__dt__21daTag_Lantern_Param_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__sinit_d_a_tag_lantern_cpp.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/create__15daTag_Lantern_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Create__FPv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Delete__FPv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Draw__FPv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Execute__FPv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/initialize__15daTag_Lantern_cFv.s diff --git a/Progress.md b/Progress.md index 1bd88aa4984..9f872d05c0a 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 34.306504% | 1379352 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 34.306504% | 1379352 | 4020672 -RELs | 33.416206% | 3842972 | 11500324 -Total | 33.646836% | 5222324 | 15520996 +RELs | 33.426154% | 3844116 | 11500324 +Total | 33.654206% | 5223468 | 15520996 ## RELs @@ -735,7 +735,7 @@ d_a_tag_hstop | 100.000000% | 3424 | 3424 d_a_tag_instruction | 100.000000% | 712 | 712 d_a_tag_kago_fall | 34.469328% | 1416 | 4108 d_a_tag_kmsg | 32.037997% | 1484 | 4632 -d_a_tag_lantern | 52.013423% | 1240 | 2384 +d_a_tag_lantern | 100.000000% | 2384 | 2384 d_a_tag_lightball | 46.212121% | 976 | 2112 d_a_tag_lv2prchk | 35.734870% | 992 | 2776 d_a_tag_lv5soup | 100.000000% | 1908 | 1908 @@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244 d_a_warp_bug | 54.940711% | 1112 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 33.416206% | 3842972 | 11500324 +Total | 33.426154% | 3844116 | 11500324 diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Delete__15daTag_Lantern_cFv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Delete__15daTag_Lantern_cFv.s deleted file mode 100644 index 71d330baf45..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Delete__15daTag_Lantern_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8048EDA8: -/* 8048EDA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048EDAC 7C 08 02 A6 */ mflr r0 -/* 8048EDB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048EDB4 38 80 FF FF */ li r4, -1 -/* 8048EDB8 81 83 06 08 */ lwz r12, 0x608(r3) -/* 8048EDBC 81 8C 00 08 */ lwz r12, 8(r12) -/* 8048EDC0 7D 89 03 A6 */ mtctr r12 -/* 8048EDC4 4E 80 04 21 */ bctrl -/* 8048EDC8 38 60 00 01 */ li r3, 1 -/* 8048EDCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048EDD0 7C 08 03 A6 */ mtlr r0 -/* 8048EDD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048EDD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Execute__15daTag_Lantern_cFv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Execute__15daTag_Lantern_cFv.s deleted file mode 100644 index 213a7f52cd2..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Execute__15daTag_Lantern_cFv.s +++ /dev/null @@ -1,106 +0,0 @@ -lbl_8048EDDC: -/* 8048EDDC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048EDE0 7C 08 02 A6 */ mflr r0 -/* 8048EDE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048EDE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048EDEC 4B ED 33 F1 */ bl _savegpr_29 -/* 8048EDF0 7C 7F 1B 78 */ mr r31, r3 -/* 8048EDF4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048EDF8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048EDFC 3B C4 0F 38 */ addi r30, r4, 0xf38 -/* 8048EE00 88 04 4F AD */ lbz r0, 0x4fad(r4) -/* 8048EE04 28 00 00 00 */ cmplwi r0, 0 -/* 8048EE08 41 82 00 80 */ beq lbl_8048EE88 -/* 8048EE0C A0 1F 00 F8 */ lhz r0, 0xf8(r31) -/* 8048EE10 28 00 00 01 */ cmplwi r0, 1 -/* 8048EE14 40 82 00 98 */ bne lbl_8048EEAC -/* 8048EE18 88 1F 06 04 */ lbz r0, 0x604(r31) -/* 8048EE1C 28 00 00 00 */ cmplwi r0, 0 -/* 8048EE20 40 82 00 2C */ bne lbl_8048EE4C -/* 8048EE24 38 7F 05 68 */ addi r3, r31, 0x568 -/* 8048EE28 7F E4 FB 78 */ mr r4, r31 -/* 8048EE2C 80 BF 06 00 */ lwz r5, 0x600(r31) -/* 8048EE30 38 C0 00 00 */ li r6, 0 -/* 8048EE34 38 E0 00 00 */ li r7, 0 -/* 8048EE38 4B DB B1 59 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 8048EE3C 88 7F 06 04 */ lbz r3, 0x604(r31) -/* 8048EE40 38 03 00 01 */ addi r0, r3, 1 -/* 8048EE44 98 1F 06 04 */ stb r0, 0x604(r31) -/* 8048EE48 48 00 00 64 */ b lbl_8048EEAC -lbl_8048EE4C: -/* 8048EE4C 28 00 00 01 */ cmplwi r0, 1 -/* 8048EE50 40 82 00 5C */ bne lbl_8048EEAC -/* 8048EE54 38 7F 05 68 */ addi r3, r31, 0x568 -/* 8048EE58 7F E4 FB 78 */ mr r4, r31 -/* 8048EE5C 38 A0 00 00 */ li r5, 0 -/* 8048EE60 38 C0 00 00 */ li r6, 0 -/* 8048EE64 4B DB B4 75 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 8048EE68 2C 03 00 00 */ cmpwi r3, 0 -/* 8048EE6C 41 82 00 40 */ beq lbl_8048EEAC -/* 8048EE70 38 7E 3F 90 */ addi r3, r30, 0x3f90 -/* 8048EE74 4B BB 35 F5 */ bl reset__14dEvt_control_cFv -/* 8048EE78 38 00 00 00 */ li r0, 0 -/* 8048EE7C 98 1F 06 04 */ stb r0, 0x604(r31) -/* 8048EE80 90 1F 05 F8 */ stw r0, 0x5f8(r31) -/* 8048EE84 48 00 00 28 */ b lbl_8048EEAC -lbl_8048EE88: -/* 8048EE88 80 1F 05 F8 */ lwz r0, 0x5f8(r31) -/* 8048EE8C 2C 00 00 00 */ cmpwi r0, 0 -/* 8048EE90 41 82 00 1C */ beq lbl_8048EEAC -/* 8048EE94 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 8048EE98 60 00 00 01 */ ori r0, r0, 1 -/* 8048EE9C B0 1F 00 FA */ sth r0, 0xfa(r31) -/* 8048EEA0 38 80 00 00 */ li r4, 0 -/* 8048EEA4 38 A0 00 00 */ li r5, 0 -/* 8048EEA8 4B B8 C2 F5 */ bl fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs -lbl_8048EEAC: -/* 8048EEAC 38 7F 05 B4 */ addi r3, r31, 0x5b4 -/* 8048EEB0 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8048EEB4 4B DD 8E 75 */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 8048EEB8 7F C3 F3 78 */ mr r3, r30 -/* 8048EEBC 38 9F 05 B4 */ addi r4, r31, 0x5b4 -/* 8048EEC0 4B BE 55 E1 */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 8048EEC4 D0 3F 05 F4 */ stfs f1, 0x5f4(r31) -/* 8048EEC8 3C 60 80 49 */ lis r3, lit_3683@ha /* 0x8048F148@ha */ -/* 8048EECC C0 23 F1 48 */ lfs f1, lit_3683@l(r3) /* 0x8048F148@l */ -/* 8048EED0 C0 1F 05 F4 */ lfs f0, 0x5f4(r31) -/* 8048EED4 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8048EED8 41 82 00 28 */ beq lbl_8048EF00 -/* 8048EEDC 7F C3 F3 78 */ mr r3, r30 -/* 8048EEE0 38 9F 05 C8 */ addi r4, r31, 0x5c8 -/* 8048EEE4 4B BE 62 1D */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 8048EEE8 7C 7D 1B 78 */ mr r29, r3 -/* 8048EEEC 7F C3 F3 78 */ mr r3, r30 -/* 8048EEF0 38 9F 05 C8 */ addi r4, r31, 0x5c8 -/* 8048EEF4 4B BE 5C F5 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 8048EEF8 98 7F 04 8D */ stb r3, 0x48d(r31) -/* 8048EEFC 48 00 00 10 */ b lbl_8048EF0C -lbl_8048EF00: -/* 8048EF00 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8048EF04 8B A3 0D 64 */ lbz r29, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8048EF08 7F BD 07 74 */ extsb r29, r29 -lbl_8048EF0C: -/* 8048EF0C 9B BF 04 8C */ stb r29, 0x48c(r31) -/* 8048EF10 88 1F 04 8C */ lbz r0, 0x48c(r31) -/* 8048EF14 98 1F 04 E2 */ stb r0, 0x4e2(r31) -/* 8048EF18 38 00 00 00 */ li r0, 0 -/* 8048EF1C 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 8048EF20 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 8048EF24 D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 8048EF28 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 8048EF2C D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 8048EF30 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 8048EF34 D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 8048EF38 C0 1F 05 50 */ lfs f0, 0x550(r31) -/* 8048EF3C D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 8048EF40 C0 1F 05 54 */ lfs f0, 0x554(r31) -/* 8048EF44 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 8048EF48 C0 1F 05 58 */ lfs f0, 0x558(r31) -/* 8048EF4C D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 8048EF50 38 60 00 01 */ li r3, 1 -/* 8048EF54 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048EF58 4B ED 32 D1 */ bl _restgpr_29 -/* 8048EF5C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048EF60 7C 08 03 A6 */ mtlr r0 -/* 8048EF64 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048EF68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__dt__15daTag_Lantern_cFv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__dt__15daTag_Lantern_cFv.s deleted file mode 100644 index 7d3c27940b7..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__dt__15daTag_Lantern_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8048ECAC: -/* 8048ECAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048ECB0 7C 08 02 A6 */ mflr r0 -/* 8048ECB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048ECB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048ECBC 93 C1 00 08 */ stw r30, 8(r1) -/* 8048ECC0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8048ECC4 7C 9F 23 78 */ mr r31, r4 -/* 8048ECC8 41 82 00 44 */ beq lbl_8048ED0C -/* 8048ECCC 3C 60 80 49 */ lis r3, __vt__15daTag_Lantern_c@ha /* 0x8048F1A4@ha */ -/* 8048ECD0 38 03 F1 A4 */ addi r0, r3, __vt__15daTag_Lantern_c@l /* 0x8048F1A4@l */ -/* 8048ECD4 90 1E 06 08 */ stw r0, 0x608(r30) -/* 8048ECD8 38 7E 05 B4 */ addi r3, r30, 0x5b4 -/* 8048ECDC 38 80 FF FF */ li r4, -1 -/* 8048ECE0 4B DD 8F B5 */ bl __dt__11cBgS_GndChkFv -/* 8048ECE4 38 7E 05 68 */ addi r3, r30, 0x568 -/* 8048ECE8 38 80 FF FF */ li r4, -1 -/* 8048ECEC 4B DB B2 5D */ bl __dt__10dMsgFlow_cFv -/* 8048ECF0 7F C3 F3 78 */ mr r3, r30 -/* 8048ECF4 38 80 00 00 */ li r4, 0 -/* 8048ECF8 4B B8 9F 95 */ bl __dt__10fopAc_ac_cFv -/* 8048ECFC 7F E0 07 35 */ extsh. r0, r31 -/* 8048ED00 40 81 00 0C */ ble lbl_8048ED0C -/* 8048ED04 7F C3 F3 78 */ mr r3, r30 -/* 8048ED08 4B E4 00 35 */ bl __dl__FPv -lbl_8048ED0C: -/* 8048ED0C 7F C3 F3 78 */ mr r3, r30 -/* 8048ED10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048ED14 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048ED18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048ED1C 7C 08 03 A6 */ mtlr r0 -/* 8048ED20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048ED24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__dt__21daTag_Lantern_Param_cFv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__dt__21daTag_Lantern_Param_cFv.s deleted file mode 100644 index 7ced5247c61..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__dt__21daTag_Lantern_Param_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8048F0EC: -/* 8048F0EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F0F0 7C 08 02 A6 */ mflr r0 -/* 8048F0F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F0F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048F0FC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8048F100 41 82 00 1C */ beq lbl_8048F11C -/* 8048F104 3C A0 80 49 */ lis r5, __vt__21daTag_Lantern_Param_c@ha /* 0x8048F1B0@ha */ -/* 8048F108 38 05 F1 B0 */ addi r0, r5, __vt__21daTag_Lantern_Param_c@l /* 0x8048F1B0@l */ -/* 8048F10C 90 1F 00 00 */ stw r0, 0(r31) -/* 8048F110 7C 80 07 35 */ extsh. r0, r4 -/* 8048F114 40 81 00 08 */ ble lbl_8048F11C -/* 8048F118 4B E3 FC 25 */ bl __dl__FPv -lbl_8048F11C: -/* 8048F11C 7F E3 FB 78 */ mr r3, r31 -/* 8048F120 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048F124 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F128 7C 08 03 A6 */ mtlr r0 -/* 8048F12C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F130 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__sinit_d_a_tag_lantern_cpp.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__sinit_d_a_tag_lantern_cpp.s deleted file mode 100644 index 031c0ef7b50..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/__sinit_d_a_tag_lantern_cpp.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8048F0AC: -/* 8048F0AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F0B0 7C 08 02 A6 */ mflr r0 -/* 8048F0B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F0B8 3C 60 80 49 */ lis r3, __vt__21daTag_Lantern_Param_c@ha /* 0x8048F1B0@ha */ -/* 8048F0BC 38 03 F1 B0 */ addi r0, r3, __vt__21daTag_Lantern_Param_c@l /* 0x8048F1B0@l */ -/* 8048F0C0 3C 60 80 49 */ lis r3, l_HIO@ha /* 0x8048F1D4@ha */ -/* 8048F0C4 94 03 F1 D4 */ stwu r0, l_HIO@l(r3) /* 0x8048F1D4@l */ -/* 8048F0C8 3C 80 80 49 */ lis r4, __dt__21daTag_Lantern_Param_cFv@ha /* 0x8048F0EC@ha */ -/* 8048F0CC 38 84 F0 EC */ addi r4, r4, __dt__21daTag_Lantern_Param_cFv@l /* 0x8048F0EC@l */ -/* 8048F0D0 3C A0 80 49 */ lis r5, lit_3622@ha /* 0x8048F1C8@ha */ -/* 8048F0D4 38 A5 F1 C8 */ addi r5, r5, lit_3622@l /* 0x8048F1C8@l */ -/* 8048F0D8 4B FF FB 61 */ bl __register_global_object -/* 8048F0DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F0E0 7C 08 03 A6 */ mtlr r0 -/* 8048F0E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F0E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/create__15daTag_Lantern_cFv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/create__15daTag_Lantern_cFv.s deleted file mode 100644 index a908d1e559f..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/create__15daTag_Lantern_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8048ED28: -/* 8048ED28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048ED2C 7C 08 02 A6 */ mflr r0 -/* 8048ED30 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048ED34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048ED38 93 C1 00 08 */ stw r30, 8(r1) -/* 8048ED3C 7C 7F 1B 78 */ mr r31, r3 -/* 8048ED40 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8048ED44 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8048ED48 40 82 00 3C */ bne lbl_8048ED84 -/* 8048ED4C 7F E0 FB 79 */ or. r0, r31, r31 -/* 8048ED50 41 82 00 28 */ beq lbl_8048ED78 -/* 8048ED54 7C 1E 03 78 */ mr r30, r0 -/* 8048ED58 4B B8 9E 0D */ bl __ct__10fopAc_ac_cFv -/* 8048ED5C 3C 60 80 49 */ lis r3, __vt__15daTag_Lantern_c@ha /* 0x8048F1A4@ha */ -/* 8048ED60 38 03 F1 A4 */ addi r0, r3, __vt__15daTag_Lantern_c@l /* 0x8048F1A4@l */ -/* 8048ED64 90 1E 06 08 */ stw r0, 0x608(r30) -/* 8048ED68 38 7E 05 68 */ addi r3, r30, 0x568 -/* 8048ED6C 4B DB B1 95 */ bl __ct__10dMsgFlow_cFv -/* 8048ED70 38 7E 05 B4 */ addi r3, r30, 0x5b4 -/* 8048ED74 4B DD 8E A9 */ bl __ct__11cBgS_GndChkFv -lbl_8048ED78: -/* 8048ED78 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8048ED7C 60 00 00 08 */ ori r0, r0, 8 -/* 8048ED80 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8048ED84: -/* 8048ED84 7F E3 FB 78 */ mr r3, r31 -/* 8048ED88 48 00 01 ED */ bl initialize__15daTag_Lantern_cFv -/* 8048ED8C 38 60 00 04 */ li r3, 4 -/* 8048ED90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048ED94 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048ED98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048ED9C 7C 08 03 A6 */ mtlr r0 -/* 8048EDA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048EDA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Create__FPv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Create__FPv.s deleted file mode 100644 index 7309629f9b7..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Create__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048F024: -/* 8048F024 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F028 7C 08 02 A6 */ mflr r0 -/* 8048F02C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F030 4B FF FC F9 */ bl create__15daTag_Lantern_cFv -/* 8048F034 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F038 7C 08 03 A6 */ mtlr r0 -/* 8048F03C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F040 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Delete__FPv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Delete__FPv.s deleted file mode 100644 index cca3dd3aba4..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Delete__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048F044: -/* 8048F044 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F048 7C 08 02 A6 */ mflr r0 -/* 8048F04C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F050 4B FF FD 59 */ bl Delete__15daTag_Lantern_cFv -/* 8048F054 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F058 7C 08 03 A6 */ mtlr r0 -/* 8048F05C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F060 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Draw__FPv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Draw__FPv.s deleted file mode 100644 index 203bb1d45da..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Draw__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048F084: -/* 8048F084 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F088 7C 08 02 A6 */ mflr r0 -/* 8048F08C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F090 4B FF FE DD */ bl Draw__15daTag_Lantern_cFv -/* 8048F094 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F098 7C 08 03 A6 */ mtlr r0 -/* 8048F09C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F0A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Execute__FPv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Execute__FPv.s deleted file mode 100644 index 88efa3002eb..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/daTag_Lantern_Execute__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048F064: -/* 8048F064 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F068 7C 08 02 A6 */ mflr r0 -/* 8048F06C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F070 4B FF FD 6D */ bl Execute__15daTag_Lantern_cFv -/* 8048F074 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F078 7C 08 03 A6 */ mtlr r0 -/* 8048F07C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F080 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/initialize__15daTag_Lantern_cFv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/initialize__15daTag_Lantern_cFv.s deleted file mode 100644 index 16ec0f41933..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/initialize__15daTag_Lantern_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8048EF74: -/* 8048EF74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048EF78 7C 08 02 A6 */ mflr r0 -/* 8048EF7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048EF80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048EF84 7C 7F 1B 78 */ mr r31, r3 -/* 8048EF88 3C 80 80 49 */ lis r4, lit_3697@ha /* 0x8048F14C@ha */ -/* 8048EF8C C0 24 F1 4C */ lfs f1, lit_3697@l(r4) /* 0x8048F14C@l */ -/* 8048EF90 FC 40 08 90 */ fmr f2, f1 -/* 8048EF94 FC 60 08 90 */ fmr f3, f1 -/* 8048EF98 FC 80 08 90 */ fmr f4, f1 -/* 8048EF9C FC A0 08 90 */ fmr f5, f1 -/* 8048EFA0 FC C0 08 90 */ fmr f6, f1 -/* 8048EFA4 4B B8 B5 A5 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 8048EFA8 A8 7F 04 B8 */ lha r3, 0x4b8(r31) -/* 8048EFAC 3C 03 00 00 */ addis r0, r3, 0 -/* 8048EFB0 28 00 FF FF */ cmplwi r0, 0xffff -/* 8048EFB4 41 82 00 0C */ beq lbl_8048EFC0 -/* 8048EFB8 90 7F 06 00 */ stw r3, 0x600(r31) -/* 8048EFBC 48 00 00 0C */ b lbl_8048EFC8 -lbl_8048EFC0: -/* 8048EFC0 38 00 FF FF */ li r0, -1 -/* 8048EFC4 90 1F 06 00 */ stw r0, 0x600(r31) -lbl_8048EFC8: -/* 8048EFC8 38 00 00 00 */ li r0, 0 -/* 8048EFCC B0 1F 04 B8 */ sth r0, 0x4b8(r31) -/* 8048EFD0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8048EFD4 54 00 05 3E */ clrlwi r0, r0, 0x14 -/* 8048EFD8 90 1F 05 FC */ stw r0, 0x5fc(r31) -/* 8048EFDC C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048EFE0 3C 60 80 49 */ lis r3, lit_3698@ha /* 0x8048F150@ha */ -/* 8048EFE4 C0 23 F1 50 */ lfs f1, lit_3698@l(r3) /* 0x8048F150@l */ -/* 8048EFE8 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048EFEC D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048EFF0 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048EFF4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048EFF8 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048EFFC C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048F000 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048F004 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048F008 7F E3 FB 78 */ mr r3, r31 -/* 8048F00C 4B FF FD D1 */ bl Execute__15daTag_Lantern_cFv -/* 8048F010 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048F014 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F018 7C 08 03 A6 */ mtlr r0 -/* 8048F01C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F020 4E 80 00 20 */ blr