Match most of d_msg_string_base (#2021)

9 files changed, 0 insertions, 448 deletions

diff --git a/asm/d/msg/d_msg_string_base/__ct__16dMsgStringBase_cFv.s b/asm/d/msg/d_msg_string_base/__ct__16dMsgStringBase_cFv.s
deleted file mode 100644
index 01bc1f7cca..0000000000
--- a/asm/d/msg/d_msg_string_base/__ct__16dMsgStringBase_cFv.s
+++ /dev/null
@@ -1,102 +0,0 @@
-lbl_802493B4:
-/* 802493B4  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 802493B8  7C 08 02 A6 */	mflr r0
-/* 802493BC  90 01 00 24 */	stw r0, 0x24(r1)
-/* 802493C0  93 E1 00 1C */	stw r31, 0x1c(r1)
-/* 802493C4  7C 7F 1B 78 */	mr r31, r3
-/* 802493C8  3C 80 80 3C */	lis r4, __vt__16dMsgStringBase_c@ha /* 0x803C1478@ha */
-/* 802493CC  38 04 14 78 */	addi r0, r4, __vt__16dMsgStringBase_c@l /* 0x803C1478@l */
-/* 802493D0  90 03 00 00 */	stw r0, 0(r3)
-/* 802493D4  38 00 00 00 */	li r0, 0
-/* 802493D8  B0 03 00 20 */	sth r0, 0x20(r3)
-/* 802493DC  48 00 03 25 */	bl getResource__16dMsgStringBase_cFv
-/* 802493E0  38 60 00 20 */	li r3, 0x20
-/* 802493E4  48 08 58 69 */	bl __nw__FUl
-/* 802493E8  7C 60 1B 79 */	or. r0, r3, r3
-/* 802493EC  41 82 00 0C */	beq lbl_802493F8
-/* 802493F0  48 05 FC 7D */	bl __ct__Q28JMessage18TResourceContainerFv
-/* 802493F4  7C 60 1B 78 */	mr r0, r3
-lbl_802493F8:
-/* 802493F8  90 1F 00 04 */	stw r0, 4(r31)
-/* 802493FC  38 60 00 38 */	li r3, 0x38
-/* 80249400  48 08 58 4D */	bl __nw__FUl
-/* 80249404  7C 60 1B 79 */	or. r0, r3, r3
-/* 80249408  41 82 00 0C */	beq lbl_80249414
-/* 8024940C  4B FE 67 51 */	bl __ct__24jmessage_string_tControlFv
-/* 80249410  7C 60 1B 78 */	mr r0, r3
-lbl_80249414:
-/* 80249414  90 1F 00 08 */	stw r0, 8(r31)
-/* 80249418  38 60 00 88 */	li r3, 0x88
-/* 8024941C  48 08 58 31 */	bl __nw__FUl
-/* 80249420  7C 60 1B 79 */	or. r0, r3, r3
-/* 80249424  41 82 00 0C */	beq lbl_80249430
-/* 80249428  4B FE 64 99 */	bl __ct__26jmessage_string_tReferenceFv
-/* 8024942C  7C 60 1B 78 */	mr r0, r3
-lbl_80249430:
-/* 80249430  90 1F 00 0C */	stw r0, 0xc(r31)
-/* 80249434  38 60 00 8C */	li r3, 0x8c
-/* 80249438  48 08 58 15 */	bl __nw__FUl
-/* 8024943C  7C 60 1B 79 */	or. r0, r3, r3
-/* 80249440  41 82 00 14 */	beq lbl_80249454
-/* 80249444  80 9F 00 0C */	lwz r4, 0xc(r31)
-/* 80249448  80 BF 00 08 */	lwz r5, 8(r31)
-/* 8024944C  4B FE 75 BD */	bl __ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl
-/* 80249450  7C 60 1B 78 */	mr r0, r3
-lbl_80249454:
-/* 80249454  90 1F 00 10 */	stw r0, 0x10(r31)
-/* 80249458  38 60 05 58 */	li r3, 0x558
-/* 8024945C  48 08 57 F1 */	bl __nw__FUl
-/* 80249460  7C 60 1B 79 */	or. r0, r3, r3
-/* 80249464  41 82 00 10 */	beq lbl_80249474
-/* 80249468  80 9F 00 0C */	lwz r4, 0xc(r31)
-/* 8024946C  4B FE 77 5D */	bl __ct__35jmessage_string_tRenderingProcessorFPC26jmessage_string_tReference
-/* 80249470  7C 60 1B 78 */	mr r0, r3
-lbl_80249474:
-/* 80249474  90 1F 00 14 */	stw r0, 0x14(r31)
-/* 80249478  38 60 00 0C */	li r3, 0xc
-/* 8024947C  48 08 57 D1 */	bl __nw__FUl
-/* 80249480  7C 60 1B 79 */	or. r0, r3, r3
-/* 80249484  41 82 00 10 */	beq lbl_80249494
-/* 80249488  80 9F 00 04 */	lwz r4, 4(r31)
-/* 8024948C  48 05 FC A5 */	bl __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer
-/* 80249490  7C 60 1B 78 */	mr r0, r3
-lbl_80249494:
-/* 80249494  90 1F 00 18 */	stw r0, 0x18(r31)
-/* 80249498  80 1F 00 04 */	lwz r0, 4(r31)
-/* 8024949C  80 7F 00 0C */	lwz r3, 0xc(r31)
-/* 802494A0  90 03 00 04 */	stw r0, 4(r3)
-/* 802494A4  80 1F 00 10 */	lwz r0, 0x10(r31)
-/* 802494A8  80 7F 00 08 */	lwz r3, 8(r31)
-/* 802494AC  90 03 00 04 */	stw r0, 4(r3)
-/* 802494B0  80 1F 00 14 */	lwz r0, 0x14(r31)
-/* 802494B4  80 7F 00 08 */	lwz r3, 8(r31)
-/* 802494B8  90 03 00 08 */	stw r0, 8(r3)
-/* 802494BC  80 1F 00 1C */	lwz r0, 0x1c(r31)
-/* 802494C0  90 01 00 08 */	stw r0, 8(r1)
-/* 802494C4  80 7F 00 18 */	lwz r3, 0x18(r31)
-/* 802494C8  38 81 00 08 */	addi r4, r1, 8
-/* 802494CC  38 A0 00 00 */	li r5, 0
-/* 802494D0  48 09 34 41 */	bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl
-/* 802494D4  80 7F 00 08 */	lwz r3, 8(r31)
-/* 802494D8  48 05 E0 FD */	bl reset__Q28JMessage8TControlFv
-/* 802494DC  80 7F 00 08 */	lwz r3, 8(r31)
-/* 802494E0  80 83 00 04 */	lwz r4, 4(r3)
-/* 802494E4  28 04 00 00 */	cmplwi r4, 0
-/* 802494E8  41 82 00 0C */	beq lbl_802494F4
-/* 802494EC  38 00 00 00 */	li r0, 0
-/* 802494F0  90 04 00 08 */	stw r0, 8(r4)
-lbl_802494F4:
-/* 802494F4  80 83 00 08 */	lwz r4, 8(r3)
-/* 802494F8  28 04 00 00 */	cmplwi r4, 0
-/* 802494FC  41 82 00 0C */	beq lbl_80249508
-/* 80249500  38 00 00 00 */	li r0, 0
-/* 80249504  90 04 00 08 */	stw r0, 8(r4)
-lbl_80249508:
-/* 80249508  38 00 00 00 */	li r0, 0
-/* 8024950C  90 03 00 10 */	stw r0, 0x10(r3)
-/* 80249510  7F E3 FB 78 */	mr r3, r31
-/* 80249514  83 E1 00 1C */	lwz r31, 0x1c(r1)
-/* 80249518  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 8024951C  7C 08 03 A6 */	mtlr r0
-/* 80249520  38 21 00 20 */	addi r1, r1, 0x20
-/* 80249524  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_string_base/func_802498D8.s b/asm/d/msg/d_msg_string_base/func_802498D8.s
deleted file mode 100644
index 75de2b75ee..0000000000
--- a/asm/d/msg/d_msg_string_base/func_802498D8.s
+++ /dev/null
@@ -1,97 +0,0 @@
-lbl_802498D8:
-/* 802498D8  94 21 FF C0 */	stwu r1, -0x40(r1)
-/* 802498DC  7C 08 02 A6 */	mflr r0
-/* 802498E0  90 01 00 44 */	stw r0, 0x44(r1)
-/* 802498E4  39 61 00 40 */	addi r11, r1, 0x40
-/* 802498E8  48 11 88 DD */	bl _savegpr_23
-/* 802498EC  7C 78 1B 78 */	mr r24, r3
-/* 802498F0  7C 99 23 78 */	mr r25, r4
-/* 802498F4  7C BA 2B 78 */	mr r26, r5
-/* 802498F8  7C DB 33 78 */	mr r27, r6
-/* 802498FC  7C FC 3B 78 */	mr r28, r7
-/* 80249900  7D 1D 43 78 */	mr r29, r8
-/* 80249904  7D 3E 4B 78 */	mr r30, r9
-/* 80249908  7D 5F 53 78 */	mr r31, r10
-/* 8024990C  8A E1 00 4B */	lbz r23, 0x4b(r1)
-/* 80249910  3C 60 80 43 */	lis r3, g_meter2_info@ha /* 0x80430188@ha */
-/* 80249914  38 63 01 88 */	addi r3, r3, g_meter2_info@l /* 0x80430188@l */
-/* 80249918  80 83 00 10 */	lwz r4, 0x10(r3)
-/* 8024991C  28 04 00 00 */	cmplwi r4, 0
-/* 80249920  41 82 00 64 */	beq lbl_80249984
-/* 80249924  28 19 13 88 */	cmplwi r25, 0x1388
-/* 80249928  40 81 00 34 */	ble lbl_8024995C
-/* 8024992C  80 18 00 1C */	lwz r0, 0x1c(r24)
-/* 80249930  80 63 00 14 */	lwz r3, 0x14(r3)
-/* 80249934  7C 00 18 40 */	cmplw r0, r3
-/* 80249938  41 82 00 4C */	beq lbl_80249984
-/* 8024993C  90 78 00 1C */	stw r3, 0x1c(r24)
-/* 80249940  80 18 00 1C */	lwz r0, 0x1c(r24)
-/* 80249944  90 01 00 0C */	stw r0, 0xc(r1)
-/* 80249948  80 78 00 18 */	lwz r3, 0x18(r24)
-/* 8024994C  38 81 00 0C */	addi r4, r1, 0xc
-/* 80249950  38 A0 00 80 */	li r5, 0x80
-/* 80249954  48 09 2F BD */	bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl
-/* 80249958  48 00 00 2C */	b lbl_80249984
-lbl_8024995C:
-/* 8024995C  80 18 00 1C */	lwz r0, 0x1c(r24)
-/* 80249960  7C 00 20 40 */	cmplw r0, r4
-/* 80249964  41 82 00 20 */	beq lbl_80249984
-/* 80249968  90 98 00 1C */	stw r4, 0x1c(r24)
-/* 8024996C  80 18 00 1C */	lwz r0, 0x1c(r24)
-/* 80249970  90 01 00 08 */	stw r0, 8(r1)
-/* 80249974  80 78 00 18 */	lwz r3, 0x18(r24)
-/* 80249978  38 81 00 08 */	addi r4, r1, 8
-/* 8024997C  38 A0 00 80 */	li r5, 0x80
-/* 80249980  48 09 2F 91 */	bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl
-lbl_80249984:
-/* 80249984  80 78 00 0C */	lwz r3, 0xc(r24)
-/* 80249988  7F 84 E3 78 */	mr r4, r28
-/* 8024998C  7F A5 EB 78 */	mr r5, r29
-/* 80249990  7F C6 F3 78 */	mr r6, r30
-/* 80249994  7F E7 FB 78 */	mr r7, r31
-/* 80249998  7E E8 BB 78 */	mr r8, r23
-/* 8024999C  4B FE 60 11 */	bl init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc
-/* 802499A0  80 78 00 0C */	lwz r3, 0xc(r24)
-/* 802499A4  9B 43 00 83 */	stb r26, 0x83(r3)
-/* 802499A8  80 78 00 0C */	lwz r3, 0xc(r24)
-/* 802499AC  9B 63 00 82 */	stb r27, 0x82(r3)
-/* 802499B0  80 7C 01 08 */	lwz r3, 0x108(r28)
-/* 802499B4  90 61 00 10 */	stw r3, 0x10(r1)
-/* 802499B8  80 1C 01 04 */	lwz r0, 0x104(r28)
-/* 802499BC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802499C0  80 98 00 0C */	lwz r4, 0xc(r24)
-/* 802499C4  90 04 00 78 */	stw r0, 0x78(r4)
-/* 802499C8  90 64 00 7C */	stw r3, 0x7c(r4)
-/* 802499CC  80 78 00 08 */	lwz r3, 8(r24)
-/* 802499D0  7F 24 CB 78 */	mr r4, r25
-/* 802499D4  38 A0 00 00 */	li r5, 0
-/* 802499D8  38 C0 00 00 */	li r6, 0
-/* 802499DC  48 05 DF 19 */	bl setMessageID__Q28JMessage8TControlFUlUlPb
-/* 802499E0  80 78 00 08 */	lwz r3, 8(r24)
-/* 802499E4  48 05 DC 51 */	bl update__Q28JMessage8TControlFv
-/* 802499E8  80 78 00 08 */	lwz r3, 8(r24)
-/* 802499EC  48 05 DC D1 */	bl render__Q28JMessage8TControlFv
-/* 802499F0  80 78 00 08 */	lwz r3, 8(r24)
-/* 802499F4  48 05 DB E1 */	bl reset__Q28JMessage8TControlFv
-/* 802499F8  80 78 00 08 */	lwz r3, 8(r24)
-/* 802499FC  80 83 00 04 */	lwz r4, 4(r3)
-/* 80249A00  28 04 00 00 */	cmplwi r4, 0
-/* 80249A04  41 82 00 0C */	beq lbl_80249A10
-/* 80249A08  38 00 00 00 */	li r0, 0
-/* 80249A0C  90 04 00 08 */	stw r0, 8(r4)
-lbl_80249A10:
-/* 80249A10  80 83 00 08 */	lwz r4, 8(r3)
-/* 80249A14  28 04 00 00 */	cmplwi r4, 0
-/* 80249A18  41 82 00 0C */	beq lbl_80249A24
-/* 80249A1C  38 00 00 00 */	li r0, 0
-/* 80249A20  90 04 00 08 */	stw r0, 8(r4)
-lbl_80249A24:
-/* 80249A24  38 00 00 00 */	li r0, 0
-/* 80249A28  90 03 00 10 */	stw r0, 0x10(r3)
-/* 80249A2C  C0 22 B3 70 */	lfs f1, lit_4046(r2)
-/* 80249A30  39 61 00 40 */	addi r11, r1, 0x40
-/* 80249A34  48 11 87 DD */	bl _restgpr_23
-/* 80249A38  80 01 00 44 */	lwz r0, 0x44(r1)
-/* 80249A3C  7C 08 03 A6 */	mtlr r0
-/* 80249A40  38 21 00 40 */	addi r1, r1, 0x40
-/* 80249A44  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_string_base/getMessageLocal__16dMsgStringBase_cFUlPc.s b/asm/d/msg/d_msg_string_base/getMessageLocal__16dMsgStringBase_cFUlPc.s
deleted file mode 100644
index b6525a69c4..0000000000
--- a/asm/d/msg/d_msg_string_base/getMessageLocal__16dMsgStringBase_cFUlPc.s
+++ /dev/null
@@ -1,84 +0,0 @@
-lbl_80249A70:
-/* 80249A70  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80249A74  7C 08 02 A6 */	mflr r0
-/* 80249A78  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80249A7C  39 61 00 20 */	addi r11, r1, 0x20
-/* 80249A80  48 11 87 5D */	bl _savegpr_29
-/* 80249A84  7C 7D 1B 78 */	mr r29, r3
-/* 80249A88  7C 9E 23 78 */	mr r30, r4
-/* 80249A8C  7C BF 2B 78 */	mr r31, r5
-/* 80249A90  3C 60 80 43 */	lis r3, g_meter2_info@ha /* 0x80430188@ha */
-/* 80249A94  38 63 01 88 */	addi r3, r3, g_meter2_info@l /* 0x80430188@l */
-/* 80249A98  80 83 00 10 */	lwz r4, 0x10(r3)
-/* 80249A9C  28 04 00 00 */	cmplwi r4, 0
-/* 80249AA0  41 82 00 64 */	beq lbl_80249B04
-/* 80249AA4  28 1E 13 88 */	cmplwi r30, 0x1388
-/* 80249AA8  40 81 00 34 */	ble lbl_80249ADC
-/* 80249AAC  80 1D 00 1C */	lwz r0, 0x1c(r29)
-/* 80249AB0  80 63 00 14 */	lwz r3, 0x14(r3)
-/* 80249AB4  7C 00 18 40 */	cmplw r0, r3
-/* 80249AB8  41 82 00 4C */	beq lbl_80249B04
-/* 80249ABC  90 7D 00 1C */	stw r3, 0x1c(r29)
-/* 80249AC0  80 1D 00 1C */	lwz r0, 0x1c(r29)
-/* 80249AC4  90 01 00 0C */	stw r0, 0xc(r1)
-/* 80249AC8  80 7D 00 18 */	lwz r3, 0x18(r29)
-/* 80249ACC  38 81 00 0C */	addi r4, r1, 0xc
-/* 80249AD0  38 A0 00 80 */	li r5, 0x80
-/* 80249AD4  48 09 2E 3D */	bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl
-/* 80249AD8  48 00 00 2C */	b lbl_80249B04
-lbl_80249ADC:
-/* 80249ADC  80 1D 00 1C */	lwz r0, 0x1c(r29)
-/* 80249AE0  7C 00 20 40 */	cmplw r0, r4
-/* 80249AE4  41 82 00 20 */	beq lbl_80249B04
-/* 80249AE8  90 9D 00 1C */	stw r4, 0x1c(r29)
-/* 80249AEC  80 1D 00 1C */	lwz r0, 0x1c(r29)
-/* 80249AF0  90 01 00 08 */	stw r0, 8(r1)
-/* 80249AF4  80 7D 00 18 */	lwz r3, 0x18(r29)
-/* 80249AF8  38 81 00 08 */	addi r4, r1, 8
-/* 80249AFC  38 A0 00 80 */	li r5, 0x80
-/* 80249B00  48 09 2E 11 */	bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl
-lbl_80249B04:
-/* 80249B04  80 7D 00 0C */	lwz r3, 0xc(r29)
-/* 80249B08  38 80 00 00 */	li r4, 0
-/* 80249B0C  38 A0 00 00 */	li r5, 0
-/* 80249B10  38 C0 00 00 */	li r6, 0
-/* 80249B14  38 E0 00 00 */	li r7, 0
-/* 80249B18  39 00 00 00 */	li r8, 0
-/* 80249B1C  4B FE 5E 91 */	bl init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc
-/* 80249B20  80 7D 00 08 */	lwz r3, 8(r29)
-/* 80249B24  7F C4 F3 78 */	mr r4, r30
-/* 80249B28  38 A0 00 00 */	li r5, 0
-/* 80249B2C  38 C0 00 00 */	li r6, 0
-/* 80249B30  48 05 DD C5 */	bl setMessageID__Q28JMessage8TControlFUlUlPb
-/* 80249B34  80 7D 00 08 */	lwz r3, 8(r29)
-/* 80249B38  48 05 DA FD */	bl update__Q28JMessage8TControlFv
-/* 80249B3C  80 7D 00 08 */	lwz r3, 8(r29)
-/* 80249B40  48 05 DB 7D */	bl render__Q28JMessage8TControlFv
-/* 80249B44  80 7D 00 08 */	lwz r3, 8(r29)
-/* 80249B48  48 05 DA 8D */	bl reset__Q28JMessage8TControlFv
-/* 80249B4C  80 7D 00 08 */	lwz r3, 8(r29)
-/* 80249B50  80 83 00 04 */	lwz r4, 4(r3)
-/* 80249B54  28 04 00 00 */	cmplwi r4, 0
-/* 80249B58  41 82 00 0C */	beq lbl_80249B64
-/* 80249B5C  38 00 00 00 */	li r0, 0
-/* 80249B60  90 04 00 08 */	stw r0, 8(r4)
-lbl_80249B64:
-/* 80249B64  80 83 00 08 */	lwz r4, 8(r3)
-/* 80249B68  28 04 00 00 */	cmplwi r4, 0
-/* 80249B6C  41 82 00 0C */	beq lbl_80249B78
-/* 80249B70  38 00 00 00 */	li r0, 0
-/* 80249B74  90 04 00 08 */	stw r0, 8(r4)
-lbl_80249B78:
-/* 80249B78  38 00 00 00 */	li r0, 0
-/* 80249B7C  90 03 00 10 */	stw r0, 0x10(r3)
-/* 80249B80  80 7D 00 14 */	lwz r3, 0x14(r29)
-/* 80249B84  38 83 00 54 */	addi r4, r3, 0x54
-/* 80249B88  7F E3 FB 78 */	mr r3, r31
-/* 80249B8C  48 11 EF A1 */	bl strcpy
-/* 80249B90  C0 22 B3 70 */	lfs f1, lit_4046(r2)
-/* 80249B94  39 61 00 20 */	addi r11, r1, 0x20
-/* 80249B98  48 11 86 91 */	bl _restgpr_29
-/* 80249B9C  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80249BA0  7C 08 03 A6 */	mtlr r0
-/* 80249BA4  38 21 00 20 */	addi r1, r1, 0x20
-/* 80249BA8  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_string_base/getMessage__16dMsgStringBase_cFUlPc.s b/asm/d/msg/d_msg_string_base/getMessage__16dMsgStringBase_cFUlPc.s
deleted file mode 100644
index 35552843da..0000000000
--- a/asm/d/msg/d_msg_string_base/getMessage__16dMsgStringBase_cFUlPc.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80249BF8:
-/* 80249BF8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80249BFC  7C 08 02 A6 */	mflr r0
-/* 80249C00  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80249C04  4B FF FE 6D */	bl getMessageLocal__16dMsgStringBase_cFUlPc
-/* 80249C08  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80249C0C  7C 08 03 A6 */	mtlr r0
-/* 80249C10  38 21 00 10 */	addi r1, r1, 0x10
-/* 80249C14  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_string_base/getPageMax__16dMsgStringBase_cFi.s b/asm/d/msg/d_msg_string_base/getPageMax__16dMsgStringBase_cFi.s
deleted file mode 100644
index 2f78a10372..0000000000
--- a/asm/d/msg/d_msg_string_base/getPageMax__16dMsgStringBase_cFi.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_80249A48:
-/* 80249A48  80 63 00 0C */	lwz r3, 0xc(r3)
-/* 80249A4C  A8 A3 00 80 */	lha r5, 0x80(r3)
-/* 80249A50  7C 05 23 D6 */	divw r0, r5, r4
-/* 80249A54  54 03 06 3E */	clrlwi r3, r0, 0x18
-/* 80249A58  7C 00 21 D6 */	mullw r0, r0, r4
-/* 80249A5C  7C 00 28 51 */	subf. r0, r0, r5
-/* 80249A60  4D 82 00 20 */	beqlr 
-/* 80249A64  38 03 00 01 */	addi r0, r3, 1
-/* 80249A68  54 03 06 3E */	clrlwi r3, r0, 0x18
-/* 80249A6C  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_string_base/getResource__16dMsgStringBase_cFv.s b/asm/d/msg/d_msg_string_base/getResource__16dMsgStringBase_cFv.s
deleted file mode 100644
index d269bc3688..0000000000
--- a/asm/d/msg/d_msg_string_base/getResource__16dMsgStringBase_cFv.s
+++ /dev/null
@@ -1,28 +0,0 @@
-lbl_80249700:
-/* 80249700  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80249704  7C 08 02 A6 */	mflr r0
-/* 80249708  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8024970C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80249710  7C 7F 1B 78 */	mr r31, r3
-/* 80249714  3C 60 80 43 */	lis r3, g_meter2_info@ha /* 0x80430188@ha */
-/* 80249718  38 63 01 88 */	addi r3, r3, g_meter2_info@l /* 0x80430188@l */
-/* 8024971C  80 03 00 10 */	lwz r0, 0x10(r3)
-/* 80249720  90 1F 00 1C */	stw r0, 0x1c(r31)
-/* 80249724  80 1F 00 1C */	lwz r0, 0x1c(r31)
-/* 80249728  28 00 00 00 */	cmplwi r0, 0
-/* 8024972C  40 82 00 28 */	bne lbl_80249754
-/* 80249730  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80249734  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80249738  80 A3 5C F4 */	lwz r5, 0x5cf4(r3)
-/* 8024973C  3C 60 52 4F */	lis r3, 0x524F /* 0x524F4F54@ha */
-/* 80249740  38 63 4F 54 */	addi r3, r3, 0x4F54 /* 0x524F4F54@l */
-/* 80249744  3C 80 80 3A */	lis r4, d_msg_d_msg_string_base__stringBase0@ha /* 0x80399C98@ha */
-/* 80249748  38 84 9C 98 */	addi r4, r4, d_msg_d_msg_string_base__stringBase0@l /* 0x80399C98@l */
-/* 8024974C  48 08 C3 ED */	bl getGlbResource__10JKRArchiveFUlPCcP10JKRArchive
-/* 80249750  90 7F 00 1C */	stw r3, 0x1c(r31)
-lbl_80249754:
-/* 80249754  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80249758  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8024975C  7C 08 03 A6 */	mtlr r0
-/* 80249760  38 21 00 10 */	addi r1, r1, 0x10
-/* 80249764  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_string_base/getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s b/asm/d/msg/d_msg_string_base/getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s
deleted file mode 100644
index 27530016a7..0000000000
--- a/asm/d/msg/d_msg_string_base/getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s
+++ /dev/null
@@ -1,97 +0,0 @@
-lbl_80249768:
-/* 80249768  94 21 FF C0 */	stwu r1, -0x40(r1)
-/* 8024976C  7C 08 02 A6 */	mflr r0
-/* 80249770  90 01 00 44 */	stw r0, 0x44(r1)
-/* 80249774  DB E1 00 38 */	stfd f31, 0x38(r1)
-/* 80249778  39 61 00 38 */	addi r11, r1, 0x38
-/* 8024977C  48 11 8A 51 */	bl _savegpr_25
-/* 80249780  7C 7E 1B 78 */	mr r30, r3
-/* 80249784  7C 9F 23 78 */	mr r31, r4
-/* 80249788  7C B9 2B 78 */	mr r25, r5
-/* 8024978C  7C DA 33 78 */	mr r26, r6
-/* 80249790  7C FB 3B 78 */	mr r27, r7
-/* 80249794  7D 1C 43 78 */	mr r28, r8
-/* 80249798  7D 3D 4B 78 */	mr r29, r9
-/* 8024979C  3C 60 80 43 */	lis r3, g_meter2_info@ha /* 0x80430188@ha */
-/* 802497A0  38 63 01 88 */	addi r3, r3, g_meter2_info@l /* 0x80430188@l */
-/* 802497A4  80 83 00 10 */	lwz r4, 0x10(r3)
-/* 802497A8  28 04 00 00 */	cmplwi r4, 0
-/* 802497AC  41 82 00 64 */	beq lbl_80249810
-/* 802497B0  28 1F 13 88 */	cmplwi r31, 0x1388
-/* 802497B4  40 81 00 34 */	ble lbl_802497E8
-/* 802497B8  80 1E 00 1C */	lwz r0, 0x1c(r30)
-/* 802497BC  80 63 00 14 */	lwz r3, 0x14(r3)
-/* 802497C0  7C 00 18 40 */	cmplw r0, r3
-/* 802497C4  41 82 00 4C */	beq lbl_80249810
-/* 802497C8  90 7E 00 1C */	stw r3, 0x1c(r30)
-/* 802497CC  80 1E 00 1C */	lwz r0, 0x1c(r30)
-/* 802497D0  90 01 00 0C */	stw r0, 0xc(r1)
-/* 802497D4  80 7E 00 18 */	lwz r3, 0x18(r30)
-/* 802497D8  38 81 00 0C */	addi r4, r1, 0xc
-/* 802497DC  38 A0 00 80 */	li r5, 0x80
-/* 802497E0  48 09 31 31 */	bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl
-/* 802497E4  48 00 00 2C */	b lbl_80249810
-lbl_802497E8:
-/* 802497E8  80 1E 00 1C */	lwz r0, 0x1c(r30)
-/* 802497EC  7C 00 20 40 */	cmplw r0, r4
-/* 802497F0  41 82 00 20 */	beq lbl_80249810
-/* 802497F4  90 9E 00 1C */	stw r4, 0x1c(r30)
-/* 802497F8  80 1E 00 1C */	lwz r0, 0x1c(r30)
-/* 802497FC  90 01 00 08 */	stw r0, 8(r1)
-/* 80249800  80 7E 00 18 */	lwz r3, 0x18(r30)
-/* 80249804  38 81 00 08 */	addi r4, r1, 8
-/* 80249808  38 A0 00 80 */	li r5, 0x80
-/* 8024980C  48 09 31 05 */	bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl
-lbl_80249810:
-/* 80249810  80 7E 00 0C */	lwz r3, 0xc(r30)
-/* 80249814  7F 24 CB 78 */	mr r4, r25
-/* 80249818  7F 45 D3 78 */	mr r5, r26
-/* 8024981C  7F 66 DB 78 */	mr r6, r27
-/* 80249820  7F 87 E3 78 */	mr r7, r28
-/* 80249824  7F A8 EB 78 */	mr r8, r29
-/* 80249828  4B FE 61 85 */	bl init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc
-/* 8024982C  80 79 01 08 */	lwz r3, 0x108(r25)
-/* 80249830  90 61 00 10 */	stw r3, 0x10(r1)
-/* 80249834  80 19 01 04 */	lwz r0, 0x104(r25)
-/* 80249838  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8024983C  80 9E 00 0C */	lwz r4, 0xc(r30)
-/* 80249840  90 04 00 78 */	stw r0, 0x78(r4)
-/* 80249844  90 64 00 7C */	stw r3, 0x7c(r4)
-/* 80249848  80 7E 00 08 */	lwz r3, 8(r30)
-/* 8024984C  7F E4 FB 78 */	mr r4, r31
-/* 80249850  38 A0 00 00 */	li r5, 0
-/* 80249854  38 C0 00 00 */	li r6, 0
-/* 80249858  48 05 E0 9D */	bl setMessageID__Q28JMessage8TControlFUlUlPb
-/* 8024985C  80 7E 00 08 */	lwz r3, 8(r30)
-/* 80249860  48 05 DD D5 */	bl update__Q28JMessage8TControlFv
-/* 80249864  80 7E 00 08 */	lwz r3, 8(r30)
-/* 80249868  48 05 DE 55 */	bl render__Q28JMessage8TControlFv
-/* 8024986C  80 7E 00 0C */	lwz r3, 0xc(r30)
-/* 80249870  38 80 00 00 */	li r4, 0
-/* 80249874  4B FE 61 C5 */	bl getLineLength__26jmessage_string_tReferenceFi
-/* 80249878  FF E0 08 90 */	fmr f31, f1
-/* 8024987C  80 7E 00 08 */	lwz r3, 8(r30)
-/* 80249880  48 05 DD 55 */	bl reset__Q28JMessage8TControlFv
-/* 80249884  80 7E 00 08 */	lwz r3, 8(r30)
-/* 80249888  80 83 00 04 */	lwz r4, 4(r3)
-/* 8024988C  28 04 00 00 */	cmplwi r4, 0
-/* 80249890  41 82 00 0C */	beq lbl_8024989C
-/* 80249894  38 00 00 00 */	li r0, 0
-/* 80249898  90 04 00 08 */	stw r0, 8(r4)
-lbl_8024989C:
-/* 8024989C  80 83 00 08 */	lwz r4, 8(r3)
-/* 802498A0  28 04 00 00 */	cmplwi r4, 0
-/* 802498A4  41 82 00 0C */	beq lbl_802498B0
-/* 802498A8  38 00 00 00 */	li r0, 0
-/* 802498AC  90 04 00 08 */	stw r0, 8(r4)
-lbl_802498B0:
-/* 802498B0  38 00 00 00 */	li r0, 0
-/* 802498B4  90 03 00 10 */	stw r0, 0x10(r3)
-/* 802498B8  FC 20 F8 90 */	fmr f1, f31
-/* 802498BC  CB E1 00 38 */	lfd f31, 0x38(r1)
-/* 802498C0  39 61 00 38 */	addi r11, r1, 0x38
-/* 802498C4  48 11 89 55 */	bl _restgpr_25
-/* 802498C8  80 01 00 44 */	lwz r0, 0x44(r1)
-/* 802498CC  7C 08 03 A6 */	mtlr r0
-/* 802498D0  38 21 00 40 */	addi r1, r1, 0x40
-/* 802498D4  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_string_base/getStringPage__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s b/asm/d/msg/d_msg_string_base/getStringPage__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s
deleted file mode 100644
index b2e0f01313..0000000000
--- a/asm/d/msg/d_msg_string_base/getStringPage__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_80249BD0:
-/* 80249BD0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80249BD4  7C 08 02 A6 */	mflr r0
-/* 80249BD8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80249BDC  88 01 00 1B */	lbz r0, 0x1b(r1)
-/* 80249BE0  90 01 00 08 */	stw r0, 8(r1)
-/* 80249BE4  4B FF FC F5 */	bl getStringPageLocal__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc
-/* 80249BE8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80249BEC  7C 08 03 A6 */	mtlr r0
-/* 80249BF0  38 21 00 10 */	addi r1, r1, 0x10
-/* 80249BF4  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_string_base/getString__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s b/asm/d/msg/d_msg_string_base/getString__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s
deleted file mode 100644
index 9f52106bed..0000000000
--- a/asm/d/msg/d_msg_string_base/getString__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80249BB0:
-/* 80249BB0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80249BB4  7C 08 02 A6 */	mflr r0
-/* 80249BB8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80249BBC  4B FF FB AD */	bl getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc
-/* 80249BC0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80249BC4  7C 08 03 A6 */	mtlr r0
-/* 80249BC8  38 21 00 10 */	addi r1, r1, 0x10
-/* 80249BCC  4E 80 00 20 */	blr