From d92abab6be967c7bd0b174b7b64017663b57d235 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 11 Jan 2023 13:43:07 -0800 Subject: [PATCH] Revert incorrectly named functions Former-commit-id: 58642612731ac05ac450e0f74590102e2cfcb205 --- asm/GuiSys/CGuiTextSupport.s | 4 +- asm/Kyoto/Text/CTextExecuteBuffer.s | 660 ++++++++++++++-------------- asm/Kyoto/Text/CTextParser.s | 16 +- asm/MetroidPrime/CSplashScreen.s | 6 +- 4 files changed, 343 insertions(+), 343 deletions(-) diff --git a/asm/GuiSys/CGuiTextSupport.s b/asm/GuiSys/CGuiTextSupport.s index 9cfc6fd8..54abe15d 100644 --- a/asm/GuiSys/CGuiTextSupport.s +++ b/asm/GuiSys/CGuiTextSupport.s @@ -1756,7 +1756,7 @@ CheckAndRebuildTextBuffer__15CGuiTextSupportFv: /* 802C93DC 002C633C 98 E1 00 19 */ stb r7, 0x19(r1) /* 802C93E0 002C6340 98 C1 00 1A */ stb r6, 0x1a(r1) /* 802C93E4 002C6344 98 01 00 1B */ stb r0, 0x1b(r1) -/* 802C93E8 002C6348 48 03 A0 DD */ bl __ct__17CColorInstructionFiRC6CColor +/* 802C93E8 002C6348 48 03 A0 DD */ bl sub_803034C4 /* 802C93EC 002C634C E0 BF A0 2B */ psq_l f5, 43(r31), 1, qr2 /* 802C93F0 002C6350 E0 3F A0 2A */ psq_l f1, 42(r31), 1, qr2 /* 802C93F4 002C6354 E0 5F A0 29 */ psq_l f2, 41(r31), 1, qr2 @@ -1790,7 +1790,7 @@ CheckAndRebuildTextBuffer__15CGuiTextSupportFv: /* 802C9464 002C63C4 98 E1 00 15 */ stb r7, 0x15(r1) /* 802C9468 002C63C8 98 C1 00 16 */ stb r6, 0x16(r1) /* 802C946C 002C63CC 98 01 00 17 */ stb r0, 0x17(r1) -/* 802C9470 002C63D0 48 03 A0 55 */ bl __ct__17CColorInstructionFiRC6CColor +/* 802C9470 002C63D0 48 03 A0 55 */ bl sub_803034C4 /* 802C9474 002C63D4 80 9F 00 5C */ lwz r4, 0x5c(r31) /* 802C9478 002C63D8 38 60 00 00 */ li r3, 0 /* 802C947C 002C63DC 38 AD A9 1A */ addi r5, r13, lbl_805A94DA@sda21 diff --git a/asm/Kyoto/Text/CTextExecuteBuffer.s b/asm/Kyoto/Text/CTextExecuteBuffer.s index 8ce8283e..6ffc8b6f 100644 --- a/asm/Kyoto/Text/CTextExecuteBuffer.s +++ b/asm/Kyoto/Text/CTextExecuteBuffer.s @@ -20,16 +20,16 @@ BuildRenderBufferPages__18CTextExecuteBufferFRC9CVector2i: /* 80301B64 002FEAC4 90 C1 00 38 */ stw r6, 0x38(r1) /* 80301B68 002FEAC8 90 81 00 3C */ stw r4, 0x3c(r1) /* 80301B6C 002FEACC 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80301B70 002FEAD0 48 00 01 8C */ b lbl_80301CFC -lbl_80301B74: +/* 80301B70 002FEAD0 48 00 01 8C */ b .L_80301CFC +.L_80301B74: /* 80301B74 002FEAD4 38 61 04 E0 */ addi r3, r1, 0x4e0 /* 80301B78 002FEAD8 38 80 00 00 */ li r4, 0 /* 80301B7C 002FEADC 48 05 9A 01 */ bl __ct__17CTextRenderBufferFQ217CTextRenderBuffer5EMode /* 80301B80 002FEAE0 38 61 01 64 */ addi r3, r1, 0x164 /* 80301B84 002FEAE4 4B FF DA 1D */ bl __ct__16CFontRenderStateFv /* 80301B88 002FEAE8 83 9E 00 04 */ lwz r28, 4(r30) -/* 80301B8C 002FEAEC 48 00 00 28 */ b lbl_80301BB4 -lbl_80301B90: +/* 80301B8C 002FEAEC 48 00 00 28 */ b .L_80301BB4 +.L_80301B90: /* 80301B90 002FEAF0 80 7C 00 08 */ lwz r3, 8(r28) /* 80301B94 002FEAF4 38 81 01 64 */ addi r4, r1, 0x164 /* 80301B98 002FEAF8 38 A1 04 E0 */ addi r5, r1, 0x4e0 @@ -39,10 +39,10 @@ lbl_80301B90: /* 80301BA8 002FEB08 7D 89 03 A6 */ mtctr r12 /* 80301BAC 002FEB0C 4E 80 04 21 */ bctrl /* 80301BB0 002FEB10 83 9C 00 04 */ lwz r28, 4(r28) -lbl_80301BB4: +.L_80301BB4: /* 80301BB4 002FEB14 80 1E 00 08 */ lwz r0, 8(r30) /* 80301BB8 002FEB18 7C 1C 00 40 */ cmplw r28, r0 -/* 80301BBC 002FEB1C 40 82 FF D4 */ bne lbl_80301B90 +/* 80301BBC 002FEB1C 40 82 FF D4 */ bne .L_80301B90 /* 80301BC0 002FEB20 38 61 01 64 */ addi r3, r1, 0x164 /* 80301BC4 002FEB24 38 80 FF FF */ li r4, -1 /* 80301BC8 002FEB28 48 00 03 31 */ bl __dt__16CFontRenderStateFv @@ -56,14 +56,14 @@ lbl_80301BB4: /* 80301BE8 002FEB48 83 7E 00 04 */ lwz r27, 4(r30) /* 80301BEC 002FEB4C 90 01 00 18 */ stw r0, 0x18(r1) /* 80301BF0 002FEB50 83 81 00 1C */ lwz r28, 0x1c(r1) -/* 80301BF4 002FEB54 48 00 00 94 */ b lbl_80301C88 -lbl_80301BF8: +/* 80301BF4 002FEB54 48 00 00 94 */ b .L_80301C88 +.L_80301BF8: /* 80301BF8 002FEB58 7C 1B E0 40 */ cmplw r27, r28 -/* 80301BFC 002FEB5C 40 82 00 08 */ bne lbl_80301C04 +/* 80301BFC 002FEB5C 40 82 00 08 */ bne .L_80301C04 /* 80301C00 002FEB60 3B 40 00 00 */ li r26, 0 -lbl_80301C04: +.L_80301C04: /* 80301C04 002FEB64 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 80301C08 002FEB68 41 82 00 28 */ beq lbl_80301C30 +/* 80301C08 002FEB68 41 82 00 28 */ beq .L_80301C30 /* 80301C0C 002FEB6C 80 7B 00 08 */ lwz r3, 8(r27) /* 80301C10 002FEB70 38 81 00 40 */ addi r4, r1, 0x40 /* 80301C14 002FEB74 38 A1 04 E0 */ addi r5, r1, 0x4e0 @@ -72,8 +72,8 @@ lbl_80301C04: /* 80301C20 002FEB80 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80301C24 002FEB84 7D 89 03 A6 */ mtctr r12 /* 80301C28 002FEB88 4E 80 04 21 */ bctrl -/* 80301C2C 002FEB8C 48 00 00 58 */ b lbl_80301C84 -lbl_80301C30: +/* 80301C2C 002FEB8C 48 00 00 58 */ b .L_80301C84 +.L_80301C30: /* 80301C30 002FEB90 80 7B 00 08 */ lwz r3, 8(r27) /* 80301C34 002FEB94 38 81 00 40 */ addi r4, r1, 0x40 /* 80301C38 002FEB98 38 A1 04 E0 */ addi r5, r1, 0x4e0 @@ -91,17 +91,17 @@ lbl_80301C30: /* 80301C68 002FEBC8 38 61 04 E0 */ addi r3, r1, 0x4e0 /* 80301C6C 002FEBCC 48 05 82 4D */ bl HasSpaceAvailable__17CTextRenderBufferFRC9CVector2iRC9CVector2i /* 80301C70 002FEBD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80301C74 002FEBD4 41 82 00 20 */ beq lbl_80301C94 +/* 80301C74 002FEBD4 41 82 00 20 */ beq .L_80301C94 /* 80301C78 002FEBD8 80 61 00 18 */ lwz r3, 0x18(r1) /* 80301C7C 002FEBDC 80 03 00 04 */ lwz r0, 4(r3) /* 80301C80 002FEBE0 90 01 00 18 */ stw r0, 0x18(r1) -lbl_80301C84: +.L_80301C84: /* 80301C84 002FEBE4 83 7B 00 04 */ lwz r27, 4(r27) -lbl_80301C88: +.L_80301C88: /* 80301C88 002FEBE8 80 1E 00 08 */ lwz r0, 8(r30) /* 80301C8C 002FEBEC 7C 1B 00 40 */ cmplw r27, r0 -/* 80301C90 002FEBF0 40 82 FF 68 */ bne lbl_80301BF8 -lbl_80301C94: +/* 80301C90 002FEBF0 40 82 FF 68 */ bne .L_80301BF8 +.L_80301C94: /* 80301C94 002FEBF4 80 1E 00 04 */ lwz r0, 4(r30) /* 80301C98 002FEBF8 38 61 02 88 */ addi r3, r1, 0x288 /* 80301C9C 002FEBFC 80 C1 00 18 */ lwz r6, 0x18(r1) @@ -128,11 +128,11 @@ lbl_80301C94: /* 80301CF0 002FEC50 38 61 04 E0 */ addi r3, r1, 0x4e0 /* 80301CF4 002FEC54 38 80 FF FF */ li r4, -1 /* 80301CF8 002FEC58 4B D2 6C 65 */ bl __dt__17CTextRenderBufferFv -lbl_80301CFC: +.L_80301CFC: /* 80301CFC 002FEC5C 80 61 00 1C */ lwz r3, 0x1c(r1) /* 80301D00 002FEC60 80 1E 00 08 */ lwz r0, 8(r30) /* 80301D04 002FEC64 7C 03 00 40 */ cmplw r3, r0 -/* 80301D08 002FEC68 40 82 FE 6C */ bne lbl_80301B74 +/* 80301D08 002FEC68 40 82 FE 6C */ bne .L_80301B74 /* 80301D0C 002FEC6C 7F A3 EB 78 */ mr r3, r29 /* 80301D10 002FEC70 38 81 00 28 */ addi r4, r1, 0x28 /* 80301D14 002FEC74 48 00 00 25 */ bl sub_80301d38 @@ -199,18 +199,18 @@ sub_80301dd0: /* 80301DF0 002FED50 93 81 00 10 */ stw r28, 0x10(r1) /* 80301DF4 002FED54 7C 7C 1B 78 */ mr r28, r3 /* 80301DF8 002FED58 83 E5 00 00 */ lwz r31, 0(r5) -/* 80301DFC 002FED5C 48 00 00 1C */ b lbl_80301E18 -lbl_80301E00: +/* 80301DFC 002FED5C 48 00 00 1C */ b .L_80301E18 +.L_80301E00: /* 80301E00 002FED60 7F 84 E3 78 */ mr r4, r28 /* 80301E04 002FED64 7F A5 EB 78 */ mr r5, r29 /* 80301E08 002FED68 38 61 00 08 */ addi r3, r1, 8 /* 80301E0C 002FED6C 38 DF 00 08 */ addi r6, r31, 8 /* 80301E10 002FED70 4B FC 66 CD */ bl sub_802c84dc /* 80301E14 002FED74 83 FF 00 04 */ lwz r31, 4(r31) -lbl_80301E18: +.L_80301E18: /* 80301E18 002FED78 80 1E 00 00 */ lwz r0, 0(r30) /* 80301E1C 002FED7C 7C 1F 00 40 */ cmplw r31, r0 -/* 80301E20 002FED80 40 82 FF E0 */ bne lbl_80301E00 +/* 80301E20 002FED80 40 82 FF E0 */ bne .L_80301E00 /* 80301E24 002FED84 80 01 00 24 */ lwz r0, 0x24(r1) /* 80301E28 002FED88 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80301E2C 002FED8C 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -231,27 +231,27 @@ sub_80301e44: /* 80301E5C 002FEDBC 7C 9D 23 78 */ mr r29, r4 /* 80301E60 002FEDC0 93 81 00 10 */ stw r28, 0x10(r1) /* 80301E64 002FEDC4 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80301E68 002FEDC8 41 82 00 44 */ beq lbl_80301EAC +/* 80301E68 002FEDC8 41 82 00 44 */ beq .L_80301EAC /* 80301E6C 002FEDCC 88 1C 00 04 */ lbz r0, 4(r28) /* 80301E70 002FEDD0 28 00 00 00 */ cmplwi r0, 0 -/* 80301E74 002FEDD4 41 82 00 28 */ beq lbl_80301E9C +/* 80301E74 002FEDD4 41 82 00 28 */ beq .L_80301E9C /* 80301E78 002FEDD8 83 FC 00 00 */ lwz r31, 0(r28) /* 80301E7C 002FEDDC 83 DF 00 08 */ lwz r30, 8(r31) /* 80301E80 002FEDE0 80 9F 00 04 */ lwz r4, 4(r31) -/* 80301E84 002FEDE4 48 00 00 10 */ b lbl_80301E94 -lbl_80301E88: +/* 80301E84 002FEDE4 48 00 00 10 */ b .L_80301E94 +.L_80301E88: /* 80301E88 002FEDE8 7F E3 FB 78 */ mr r3, r31 /* 80301E8C 002FEDEC 4B FC 81 D1 */ bl sub_802ca05c /* 80301E90 002FEDF0 7C 64 1B 78 */ mr r4, r3 -lbl_80301E94: +.L_80301E94: /* 80301E94 002FEDF4 7C 04 F0 40 */ cmplw r4, r30 -/* 80301E98 002FEDF8 40 82 FF F0 */ bne lbl_80301E88 -lbl_80301E9C: +/* 80301E98 002FEDF8 40 82 FF F0 */ bne .L_80301E88 +.L_80301E9C: /* 80301E9C 002FEDFC 7F A0 07 35 */ extsh. r0, r29 -/* 80301EA0 002FEE00 40 81 00 0C */ ble lbl_80301EAC +/* 80301EA0 002FEE00 40 81 00 0C */ ble .L_80301EAC /* 80301EA4 002FEE04 7F 83 E3 78 */ mr r3, r28 /* 80301EA8 002FEE08 48 01 3A 89 */ bl Free__7CMemoryFPCv -lbl_80301EAC: +.L_80301EAC: /* 80301EAC 002FEE0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80301EB0 002FEE10 7F 83 E3 78 */ mr r3, r28 /* 80301EB4 002FEE14 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -284,12 +284,12 @@ __dt__16CFontRenderStateFv: /* 80301F08 002FEE68 7C 9F 23 78 */ mr r31, r4 /* 80301F0C 002FEE6C 93 C1 00 28 */ stw r30, 0x28(r1) /* 80301F10 002FEE70 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80301F14 002FEE74 41 82 01 1C */ beq lbl_80302030 +/* 80301F14 002FEE74 41 82 01 1C */ beq .L_80302030 /* 80301F18 002FEE78 38 7E 01 0C */ addi r3, r30, 0x10c /* 80301F1C 002FEE7C 38 80 FF FF */ li r4, -1 /* 80301F20 002FEE80 4B D2 74 59 */ bl sub_80029378 /* 80301F24 002FEE84 34 1E 00 F8 */ addic. r0, r30, 0xf8 -/* 80301F28 002FEE88 41 82 00 40 */ beq lbl_80301F68 +/* 80301F28 002FEE88 41 82 00 40 */ beq .L_80301F68 /* 80301F2C 002FEE8C 80 7E 01 04 */ lwz r3, 0x104(r30) /* 80301F30 002FEE90 80 1E 00 FC */ lwz r0, 0xfc(r30) /* 80301F34 002FEE94 90 61 00 1C */ stw r3, 0x1c(r1) @@ -300,16 +300,16 @@ __dt__16CFontRenderStateFv: /* 80301F48 002FEEA8 90 61 00 18 */ stw r3, 0x18(r1) /* 80301F4C 002FEEAC 7C 09 03 A6 */ mtctr r0 /* 80301F50 002FEEB0 7C 03 20 40 */ cmplw r3, r4 -/* 80301F54 002FEEB4 41 82 00 08 */ beq lbl_80301F5C -lbl_80301F58: -/* 80301F58 002FEEB8 42 00 00 00 */ bdnz lbl_80301F58 -lbl_80301F5C: +/* 80301F54 002FEEB4 41 82 00 08 */ beq .L_80301F5C +.L_80301F58: +/* 80301F58 002FEEB8 42 00 00 00 */ bdnz .L_80301F58 +.L_80301F5C: /* 80301F5C 002FEEBC 28 03 00 00 */ cmplwi r3, 0 -/* 80301F60 002FEEC0 41 82 00 08 */ beq lbl_80301F68 +/* 80301F60 002FEEC0 41 82 00 08 */ beq .L_80301F68 /* 80301F64 002FEEC4 48 01 39 CD */ bl Free__7CMemoryFPCv -lbl_80301F68: +.L_80301F68: /* 80301F68 002FEEC8 34 1E 00 E8 */ addic. r0, r30, 0xe8 -/* 80301F6C 002FEECC 41 82 00 44 */ beq lbl_80301FB0 +/* 80301F6C 002FEECC 41 82 00 44 */ beq .L_80301FB0 /* 80301F70 002FEED0 80 1E 00 EC */ lwz r0, 0xec(r30) /* 80301F74 002FEED4 80 7E 00 F4 */ lwz r3, 0xf4(r30) /* 80301F78 002FEED8 54 00 10 3A */ slwi r0, r0, 2 @@ -319,54 +319,54 @@ lbl_80301F68: /* 80301F88 002FEEE8 90 01 00 14 */ stw r0, 0x14(r1) /* 80301F8C 002FEEEC 90 01 00 10 */ stw r0, 0x10(r1) /* 80301F90 002FEEF0 90 61 00 08 */ stw r3, 8(r1) -/* 80301F94 002FEEF4 48 00 00 08 */ b lbl_80301F9C -lbl_80301F98: +/* 80301F94 002FEEF4 48 00 00 08 */ b .L_80301F9C +.L_80301F98: /* 80301F98 002FEEF8 38 84 00 04 */ addi r4, r4, 4 -lbl_80301F9C: +.L_80301F9C: /* 80301F9C 002FEEFC 7C 04 00 40 */ cmplw r4, r0 -/* 80301FA0 002FEF00 40 82 FF F8 */ bne lbl_80301F98 +/* 80301FA0 002FEF00 40 82 FF F8 */ bne .L_80301F98 /* 80301FA4 002FEF04 28 03 00 00 */ cmplwi r3, 0 -/* 80301FA8 002FEF08 41 82 00 08 */ beq lbl_80301FB0 +/* 80301FA8 002FEF08 41 82 00 08 */ beq .L_80301FB0 /* 80301FAC 002FEF0C 48 01 39 85 */ bl Free__7CMemoryFPCv -lbl_80301FB0: +.L_80301FB0: /* 80301FB0 002FEF10 34 1E 00 8C */ addic. r0, r30, 0x8c -/* 80301FB4 002FEF14 41 82 00 60 */ beq lbl_80302014 +/* 80301FB4 002FEF14 41 82 00 60 */ beq .L_80302014 /* 80301FB8 002FEF18 34 1E 00 90 */ addic. r0, r30, 0x90 -/* 80301FBC 002FEF1C 41 82 00 58 */ beq lbl_80302014 +/* 80301FBC 002FEF1C 41 82 00 58 */ beq .L_80302014 /* 80301FC0 002FEF20 80 BE 00 90 */ lwz r5, 0x90(r30) /* 80301FC4 002FEF24 38 60 00 00 */ li r3, 0 /* 80301FC8 002FEF28 2C 05 00 00 */ cmpwi r5, 0 -/* 80301FCC 002FEF2C 40 81 00 40 */ ble lbl_8030200C +/* 80301FCC 002FEF2C 40 81 00 40 */ ble .L_8030200C /* 80301FD0 002FEF30 2C 05 00 08 */ cmpwi r5, 8 /* 80301FD4 002FEF34 38 85 FF F8 */ addi r4, r5, -8 -/* 80301FD8 002FEF38 40 81 00 20 */ ble lbl_80301FF8 +/* 80301FD8 002FEF38 40 81 00 20 */ ble .L_80301FF8 /* 80301FDC 002FEF3C 38 04 00 07 */ addi r0, r4, 7 /* 80301FE0 002FEF40 54 00 E8 FE */ srwi r0, r0, 3 /* 80301FE4 002FEF44 7C 09 03 A6 */ mtctr r0 /* 80301FE8 002FEF48 2C 04 00 00 */ cmpwi r4, 0 -/* 80301FEC 002FEF4C 40 81 00 0C */ ble lbl_80301FF8 -lbl_80301FF0: +/* 80301FEC 002FEF4C 40 81 00 0C */ ble .L_80301FF8 +.L_80301FF0: /* 80301FF0 002FEF50 38 63 00 08 */ addi r3, r3, 8 -/* 80301FF4 002FEF54 42 00 FF FC */ bdnz lbl_80301FF0 -lbl_80301FF8: +/* 80301FF4 002FEF54 42 00 FF FC */ bdnz .L_80301FF0 +.L_80301FF8: /* 80301FF8 002FEF58 7C 03 28 50 */ subf r0, r3, r5 /* 80301FFC 002FEF5C 7C 09 03 A6 */ mtctr r0 /* 80302000 002FEF60 7C 03 28 00 */ cmpw r3, r5 -/* 80302004 002FEF64 40 80 00 08 */ bge lbl_8030200C -lbl_80302008: -/* 80302008 002FEF68 42 00 00 00 */ bdnz lbl_80302008 -lbl_8030200C: +/* 80302004 002FEF64 40 80 00 08 */ bge .L_8030200C +.L_80302008: +/* 80302008 002FEF68 42 00 00 00 */ bdnz .L_80302008 +.L_8030200C: /* 8030200C 002FEF6C 38 00 00 00 */ li r0, 0 /* 80302010 002FEF70 90 1E 00 90 */ stw r0, 0x90(r30) -lbl_80302014: +.L_80302014: /* 80302014 002FEF74 7F C3 F3 78 */ mr r3, r30 /* 80302018 002FEF78 38 80 FF FF */ li r4, -1 /* 8030201C 002FEF7C 4B D2 6D 09 */ bl __dt__14CSaveableStateFv /* 80302020 002FEF80 7F E0 07 35 */ extsh. r0, r31 -/* 80302024 002FEF84 40 81 00 0C */ ble lbl_80302030 +/* 80302024 002FEF84 40 81 00 0C */ ble .L_80302030 /* 80302028 002FEF88 7F C3 F3 78 */ mr r3, r30 /* 8030202C 002FEF8C 48 01 39 05 */ bl Free__7CMemoryFPCv -lbl_80302030: +.L_80302030: /* 80302030 002FEF90 80 01 00 34 */ lwz r0, 0x34(r1) /* 80302034 002FEF94 7F C3 F3 78 */ mr r3, r30 /* 80302038 002FEF98 83 E1 00 2C */ lwz r31, 0x2c(r1) @@ -391,8 +391,8 @@ BuildRenderBufferPage__18CTextExecuteBufferFv: /* 80302078 002FEFD8 38 61 01 2C */ addi r3, r1, 0x12c /* 8030207C 002FEFDC 4B FF D5 25 */ bl __ct__16CFontRenderStateFv /* 80302080 002FEFE0 83 FB 00 00 */ lwz r31, 0(r27) -/* 80302084 002FEFE4 48 00 00 28 */ b lbl_803020AC -lbl_80302088: +/* 80302084 002FEFE4 48 00 00 28 */ b .L_803020AC +.L_80302088: /* 80302088 002FEFE8 80 7F 00 08 */ lwz r3, 8(r31) /* 8030208C 002FEFEC 38 81 01 2C */ addi r4, r1, 0x12c /* 80302090 002FEFF0 38 A1 02 50 */ addi r5, r1, 0x250 @@ -402,12 +402,12 @@ lbl_80302088: /* 803020A0 002FF000 7D 89 03 A6 */ mtctr r12 /* 803020A4 002FF004 4E 80 04 21 */ bctrl /* 803020A8 002FF008 83 FF 00 04 */ lwz r31, 4(r31) -lbl_803020AC: +.L_803020AC: /* 803020AC 002FF00C 83 DC 00 00 */ lwz r30, 0(r28) /* 803020B0 002FF010 7C 1F F0 40 */ cmplw r31, r30 -/* 803020B4 002FF014 40 82 FF D4 */ bne lbl_80302088 -/* 803020B8 002FF018 48 00 00 28 */ b lbl_803020E0 -lbl_803020BC: +/* 803020B4 002FF014 40 82 FF D4 */ bne .L_80302088 +/* 803020B8 002FF018 48 00 00 28 */ b .L_803020E0 +.L_803020BC: /* 803020BC 002FF01C 80 7E 00 08 */ lwz r3, 8(r30) /* 803020C0 002FF020 38 81 01 2C */ addi r4, r1, 0x12c /* 803020C4 002FF024 38 A1 02 50 */ addi r5, r1, 0x250 @@ -417,10 +417,10 @@ lbl_803020BC: /* 803020D4 002FF034 7D 89 03 A6 */ mtctr r12 /* 803020D8 002FF038 4E 80 04 21 */ bctrl /* 803020DC 002FF03C 83 DE 00 04 */ lwz r30, 4(r30) -lbl_803020E0: +.L_803020E0: /* 803020E0 002FF040 80 1D 00 00 */ lwz r0, 0(r29) /* 803020E4 002FF044 7C 1E 00 40 */ cmplw r30, r0 -/* 803020E8 002FF048 40 82 FF D4 */ bne lbl_803020BC +/* 803020E8 002FF048 40 82 FF D4 */ bne .L_803020BC /* 803020EC 002FF04C 38 61 01 2C */ addi r3, r1, 0x12c /* 803020F0 002FF050 38 80 FF FF */ li r4, -1 /* 803020F4 002FF054 4B FF FE 05 */ bl __dt__16CFontRenderStateFv @@ -430,8 +430,8 @@ lbl_803020E0: /* 80302104 002FF064 38 61 00 08 */ addi r3, r1, 8 /* 80302108 002FF068 4B FF D4 99 */ bl __ct__16CFontRenderStateFv /* 8030210C 002FF06C 83 FB 00 00 */ lwz r31, 0(r27) -/* 80302110 002FF070 48 00 00 28 */ b lbl_80302138 -lbl_80302114: +/* 80302110 002FF070 48 00 00 28 */ b .L_80302138 +.L_80302114: /* 80302114 002FF074 80 7F 00 08 */ lwz r3, 8(r31) /* 80302118 002FF078 38 81 00 08 */ addi r4, r1, 8 /* 8030211C 002FF07C 38 A1 02 50 */ addi r5, r1, 0x250 @@ -441,12 +441,12 @@ lbl_80302114: /* 8030212C 002FF08C 7D 89 03 A6 */ mtctr r12 /* 80302130 002FF090 4E 80 04 21 */ bctrl /* 80302134 002FF094 83 FF 00 04 */ lwz r31, 4(r31) -lbl_80302138: +.L_80302138: /* 80302138 002FF098 83 DC 00 00 */ lwz r30, 0(r28) /* 8030213C 002FF09C 7C 1F F0 40 */ cmplw r31, r30 -/* 80302140 002FF0A0 40 82 FF D4 */ bne lbl_80302114 -/* 80302144 002FF0A4 48 00 00 28 */ b lbl_8030216C -lbl_80302148: +/* 80302140 002FF0A0 40 82 FF D4 */ bne .L_80302114 +/* 80302144 002FF0A4 48 00 00 28 */ b .L_8030216C +.L_80302148: /* 80302148 002FF0A8 80 7E 00 08 */ lwz r3, 8(r30) /* 8030214C 002FF0AC 38 81 00 08 */ addi r4, r1, 8 /* 80302150 002FF0B0 38 A1 02 50 */ addi r5, r1, 0x250 @@ -456,10 +456,10 @@ lbl_80302148: /* 80302160 002FF0C0 7D 89 03 A6 */ mtctr r12 /* 80302164 002FF0C4 4E 80 04 21 */ bctrl /* 80302168 002FF0C8 83 DE 00 04 */ lwz r30, 4(r30) -lbl_8030216C: +.L_8030216C: /* 8030216C 002FF0CC 80 1D 00 00 */ lwz r0, 0(r29) /* 80302170 002FF0D0 7C 1E 00 40 */ cmplw r30, r0 -/* 80302174 002FF0D4 40 82 FF D4 */ bne lbl_80302148 +/* 80302174 002FF0D4 40 82 FF D4 */ bne .L_80302148 /* 80302178 002FF0D8 38 61 00 08 */ addi r3, r1, 8 /* 8030217C 002FF0DC 38 80 FF FF */ li r4, -1 /* 80302180 002FF0E0 4B FF FD 79 */ bl __dt__16CFontRenderStateFv @@ -491,8 +491,8 @@ BuildRenderBuffer__18CTextExecuteBufferFv: /* 803021DC 002FF13C 38 61 01 2C */ addi r3, r1, 0x12c /* 803021E0 002FF140 4B FF D3 C1 */ bl __ct__16CFontRenderStateFv /* 803021E4 002FF144 83 FE 00 04 */ lwz r31, 4(r30) -/* 803021E8 002FF148 48 00 00 28 */ b lbl_80302210 -lbl_803021EC: +/* 803021E8 002FF148 48 00 00 28 */ b .L_80302210 +.L_803021EC: /* 803021EC 002FF14C 80 7F 00 08 */ lwz r3, 8(r31) /* 803021F0 002FF150 38 81 01 2C */ addi r4, r1, 0x12c /* 803021F4 002FF154 38 A1 02 50 */ addi r5, r1, 0x250 @@ -502,10 +502,10 @@ lbl_803021EC: /* 80302204 002FF164 7D 89 03 A6 */ mtctr r12 /* 80302208 002FF168 4E 80 04 21 */ bctrl /* 8030220C 002FF16C 83 FF 00 04 */ lwz r31, 4(r31) -lbl_80302210: +.L_80302210: /* 80302210 002FF170 80 1E 00 08 */ lwz r0, 8(r30) /* 80302214 002FF174 7C 1F 00 40 */ cmplw r31, r0 -/* 80302218 002FF178 40 82 FF D4 */ bne lbl_803021EC +/* 80302218 002FF178 40 82 FF D4 */ bne .L_803021EC /* 8030221C 002FF17C 38 61 01 2C */ addi r3, r1, 0x12c /* 80302220 002FF180 38 80 FF FF */ li r4, -1 /* 80302224 002FF184 4B FF FC D5 */ bl __dt__16CFontRenderStateFv @@ -515,8 +515,8 @@ lbl_80302210: /* 80302234 002FF194 38 61 00 08 */ addi r3, r1, 8 /* 80302238 002FF198 4B FF D3 69 */ bl __ct__16CFontRenderStateFv /* 8030223C 002FF19C 83 FE 00 04 */ lwz r31, 4(r30) -/* 80302240 002FF1A0 48 00 00 28 */ b lbl_80302268 -lbl_80302244: +/* 80302240 002FF1A0 48 00 00 28 */ b .L_80302268 +.L_80302244: /* 80302244 002FF1A4 80 7F 00 08 */ lwz r3, 8(r31) /* 80302248 002FF1A8 38 81 00 08 */ addi r4, r1, 8 /* 8030224C 002FF1AC 38 A1 02 50 */ addi r5, r1, 0x250 @@ -526,10 +526,10 @@ lbl_80302244: /* 8030225C 002FF1BC 7D 89 03 A6 */ mtctr r12 /* 80302260 002FF1C0 4E 80 04 21 */ bctrl /* 80302264 002FF1C4 83 FF 00 04 */ lwz r31, 4(r31) -lbl_80302268: +.L_80302268: /* 80302268 002FF1C8 80 1E 00 08 */ lwz r0, 8(r30) /* 8030226C 002FF1CC 7C 1F 00 40 */ cmplw r31, r0 -/* 80302270 002FF1D0 40 82 FF D4 */ bne lbl_80302244 +/* 80302270 002FF1D0 40 82 FF D4 */ bne .L_80302244 /* 80302274 002FF1D4 38 61 00 08 */ addi r3, r1, 8 /* 80302278 002FF1D8 38 80 FF FF */ li r4, -1 /* 8030227C 002FF1DC 4B FF FC 7D */ bl __dt__16CFontRenderStateFv @@ -560,8 +560,8 @@ GetAssets__18CTextExecuteBufferFv: /* 803022D4 002FF234 3B A0 00 00 */ li r29, 0 /* 803022D8 002FF238 93 81 00 30 */ stw r28, 0x30(r1) /* 803022DC 002FF23C 83 84 00 04 */ lwz r28, 4(r4) -/* 803022E0 002FF240 48 00 00 24 */ b lbl_80302304 -lbl_803022E4: +/* 803022E0 002FF240 48 00 00 24 */ b .L_80302304 +.L_803022E4: /* 803022E4 002FF244 80 7C 00 08 */ lwz r3, 8(r28) /* 803022E8 002FF248 80 63 00 00 */ lwz r3, 0(r3) /* 803022EC 002FF24C 81 83 00 00 */ lwz r12, 0(r3) @@ -570,22 +570,22 @@ lbl_803022E4: /* 803022F8 002FF258 4E 80 04 21 */ bctrl /* 803022FC 002FF25C 7F BD 1A 14 */ add r29, r29, r3 /* 80302300 002FF260 83 9C 00 04 */ lwz r28, 4(r28) -lbl_80302304: +.L_80302304: /* 80302304 002FF264 80 1E 00 08 */ lwz r0, 8(r30) /* 80302308 002FF268 7C 1C 00 40 */ cmplw r28, r0 -/* 8030230C 002FF26C 40 82 FF D8 */ bne lbl_803022E4 +/* 8030230C 002FF26C 40 82 FF D8 */ bne .L_803022E4 /* 80302310 002FF270 38 00 00 00 */ li r0, 0 /* 80302314 002FF274 2C 1D 00 00 */ cmpwi r29, 0 /* 80302318 002FF278 90 01 00 1C */ stw r0, 0x1c(r1) /* 8030231C 002FF27C 90 01 00 20 */ stw r0, 0x20(r1) /* 80302320 002FF280 90 01 00 24 */ stw r0, 0x24(r1) -/* 80302324 002FF284 40 81 00 44 */ ble lbl_80302368 +/* 80302324 002FF284 40 81 00 44 */ ble .L_80302368 /* 80302328 002FF288 7F A4 EB 78 */ mr r4, r29 /* 8030232C 002FF28C 38 61 00 18 */ addi r3, r1, 0x18 /* 80302330 002FF290 4B D0 66 2D */ bl "reserve__Q24rstl42vector<6CToken,Q24rstl17rmemory_allocator>Fi" /* 80302334 002FF294 83 9E 00 04 */ lwz r28, 4(r30) -/* 80302338 002FF298 48 00 00 24 */ b lbl_8030235C -lbl_8030233C: +/* 80302338 002FF298 48 00 00 24 */ b .L_8030235C +.L_8030233C: /* 8030233C 002FF29C 80 7C 00 08 */ lwz r3, 8(r28) /* 80302340 002FF2A0 38 81 00 18 */ addi r4, r1, 0x18 /* 80302344 002FF2A4 80 63 00 00 */ lwz r3, 0(r3) @@ -594,57 +594,57 @@ lbl_8030233C: /* 80302350 002FF2B0 7D 89 03 A6 */ mtctr r12 /* 80302354 002FF2B4 4E 80 04 21 */ bctrl /* 80302358 002FF2B8 83 9C 00 04 */ lwz r28, 4(r28) -lbl_8030235C: +.L_8030235C: /* 8030235C 002FF2BC 80 1E 00 08 */ lwz r0, 8(r30) /* 80302360 002FF2C0 7C 1C 00 40 */ cmplw r28, r0 -/* 80302364 002FF2C4 40 82 FF D8 */ bne lbl_8030233C -lbl_80302368: +/* 80302364 002FF2C4 40 82 FF D8 */ bne .L_8030233C +.L_80302368: /* 80302368 002FF2C8 80 01 00 1C */ lwz r0, 0x1c(r1) /* 8030236C 002FF2CC 90 1F 00 04 */ stw r0, 4(r31) /* 80302370 002FF2D0 80 01 00 20 */ lwz r0, 0x20(r1) /* 80302374 002FF2D4 90 1F 00 08 */ stw r0, 8(r31) /* 80302378 002FF2D8 80 01 00 1C */ lwz r0, 0x1c(r1) /* 8030237C 002FF2DC 2C 00 00 00 */ cmpwi r0, 0 -/* 80302380 002FF2E0 40 82 00 1C */ bne lbl_8030239C +/* 80302380 002FF2E0 40 82 00 1C */ bne .L_8030239C /* 80302384 002FF2E4 80 01 00 20 */ lwz r0, 0x20(r1) /* 80302388 002FF2E8 2C 00 00 00 */ cmpwi r0, 0 -/* 8030238C 002FF2EC 40 82 00 10 */ bne lbl_8030239C +/* 8030238C 002FF2EC 40 82 00 10 */ bne .L_8030239C /* 80302390 002FF2F0 38 00 00 00 */ li r0, 0 /* 80302394 002FF2F4 90 1F 00 0C */ stw r0, 0xc(r31) -/* 80302398 002FF2F8 48 00 00 6C */ b lbl_80302404 -lbl_8030239C: +/* 80302398 002FF2F8 48 00 00 6C */ b .L_80302404 +.L_8030239C: /* 8030239C 002FF2FC 80 1F 00 08 */ lwz r0, 8(r31) /* 803023A0 002FF300 54 03 18 39 */ rlwinm. r3, r0, 3, 0, 0x1c -/* 803023A4 002FF304 40 82 00 10 */ bne lbl_803023B4 +/* 803023A4 002FF304 40 82 00 10 */ bne .L_803023B4 /* 803023A8 002FF308 38 00 00 00 */ li r0, 0 /* 803023AC 002FF30C 90 1F 00 0C */ stw r0, 0xc(r31) -/* 803023B0 002FF310 48 00 00 18 */ b lbl_803023C8 -lbl_803023B4: +/* 803023B0 002FF310 48 00 00 18 */ b .L_803023C8 +.L_803023B4: /* 803023B4 002FF314 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 803023B8 002FF318 38 A0 00 00 */ li r5, 0 /* 803023BC 002FF31C 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 803023C0 002FF320 48 01 34 59 */ bl __nwa__FUlPCcPCc /* 803023C4 002FF324 90 7F 00 0C */ stw r3, 0xc(r31) -lbl_803023C8: +.L_803023C8: /* 803023C8 002FF328 83 9F 00 04 */ lwz r28, 4(r31) /* 803023CC 002FF32C 3B C0 00 00 */ li r30, 0 /* 803023D0 002FF330 83 A1 00 24 */ lwz r29, 0x24(r1) /* 803023D4 002FF334 83 FF 00 0C */ lwz r31, 0xc(r31) -/* 803023D8 002FF338 48 00 00 24 */ b lbl_803023FC -lbl_803023DC: +/* 803023D8 002FF338 48 00 00 24 */ b .L_803023FC +.L_803023DC: /* 803023DC 002FF33C 28 1F 00 00 */ cmplwi r31, 0 -/* 803023E0 002FF340 41 82 00 10 */ beq lbl_803023F0 +/* 803023E0 002FF340 41 82 00 10 */ beq .L_803023F0 /* 803023E4 002FF344 7F E3 FB 78 */ mr r3, r31 /* 803023E8 002FF348 7F A4 EB 78 */ mr r4, r29 /* 803023EC 002FF34C 48 03 EA BD */ bl __ct__6CTokenFRC6CToken -lbl_803023F0: +.L_803023F0: /* 803023F0 002FF350 3B FF 00 08 */ addi r31, r31, 8 /* 803023F4 002FF354 3B DE 00 01 */ addi r30, r30, 1 /* 803023F8 002FF358 3B BD 00 08 */ addi r29, r29, 8 -lbl_803023FC: +.L_803023FC: /* 803023FC 002FF35C 7C 1E E0 00 */ cmpw r30, r28 -/* 80302400 002FF360 41 80 FF DC */ blt lbl_803023DC -lbl_80302404: +/* 80302400 002FF360 41 80 FF DC */ blt .L_803023DC +.L_80302404: /* 80302404 002FF364 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80302408 002FF368 83 81 00 24 */ lwz r28, 0x24(r1) /* 8030240C 002FF36C 54 00 18 38 */ slwi r0, r0, 3 @@ -653,20 +653,20 @@ lbl_80302404: /* 80302418 002FF378 93 E1 00 14 */ stw r31, 0x14(r1) /* 8030241C 002FF37C 93 E1 00 10 */ stw r31, 0x10(r1) /* 80302420 002FF380 93 81 00 08 */ stw r28, 8(r1) -/* 80302424 002FF384 48 00 00 14 */ b lbl_80302438 -lbl_80302428: +/* 80302424 002FF384 48 00 00 14 */ b .L_80302438 +.L_80302428: /* 80302428 002FF388 7F 83 E3 78 */ mr r3, r28 /* 8030242C 002FF38C 38 80 FF FF */ li r4, -1 /* 80302430 002FF390 48 03 EA 11 */ bl __dt__6CTokenFv /* 80302434 002FF394 3B 9C 00 08 */ addi r28, r28, 8 -lbl_80302438: +.L_80302438: /* 80302438 002FF398 7C 1C F8 40 */ cmplw r28, r31 -/* 8030243C 002FF39C 40 82 FF EC */ bne lbl_80302428 +/* 8030243C 002FF39C 40 82 FF EC */ bne .L_80302428 /* 80302440 002FF3A0 80 61 00 24 */ lwz r3, 0x24(r1) /* 80302444 002FF3A4 28 03 00 00 */ cmplwi r3, 0 -/* 80302448 002FF3A8 41 82 00 08 */ beq lbl_80302450 +/* 80302448 002FF3A8 41 82 00 08 */ beq .L_80302450 /* 8030244C 002FF3AC 48 01 34 E5 */ bl Free__7CMemoryFPCv -lbl_80302450: +.L_80302450: /* 80302450 002FF3B0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80302454 002FF3B4 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80302458 002FF3B8 83 C1 00 38 */ lwz r30, 0x38(r1) @@ -687,20 +687,20 @@ AddString__18CTextExecuteBufferFPCwi: /* 80302488 002FF3E8 7C BB 2B 78 */ mr r27, r5 /* 8030248C 002FF3EC 80 03 00 A4 */ lwz r0, 0xa4(r3) /* 80302490 002FF3F0 28 00 00 00 */ cmplwi r0, 0 -/* 80302494 002FF3F4 40 82 00 08 */ bne lbl_8030249C +/* 80302494 002FF3F4 40 82 00 08 */ bne .L_8030249C /* 80302498 002FF3F8 48 00 07 E1 */ bl StartNewLine__18CTextExecuteBufferFv -lbl_8030249C: +.L_8030249C: /* 8030249C 002FF3FC 7F 5F D3 78 */ mr r31, r26 /* 803024A0 002FF400 3B D9 00 60 */ addi r30, r25, 0x60 /* 803024A4 002FF404 3B A0 00 00 */ li r29, 0 /* 803024A8 002FF408 3B 80 00 00 */ li r28, 0 -/* 803024AC 002FF40C 48 00 00 E8 */ b lbl_80302594 -lbl_803024B0: +/* 803024AC 002FF40C 48 00 00 E8 */ b .L_80302594 +.L_803024B0: /* 803024B0 002FF410 28 00 00 0A */ cmplwi r0, 0xa -/* 803024B4 002FF414 41 82 00 0C */ beq lbl_803024C0 +/* 803024B4 002FF414 41 82 00 0C */ beq .L_803024C0 /* 803024B8 002FF418 28 00 00 20 */ cmplwi r0, 0x20 -/* 803024BC 002FF41C 40 82 00 D0 */ bne lbl_8030258C -lbl_803024C0: +/* 803024BC 002FF41C 40 82 00 D0 */ bne .L_8030258C +.L_803024C0: /* 803024C0 002FF420 57 A0 08 3C */ slwi r0, r29, 1 /* 803024C4 002FF424 7F 23 CB 78 */ mr r3, r25 /* 803024C8 002FF428 7C 9A 02 14 */ add r4, r26, r0 @@ -709,11 +709,11 @@ lbl_803024C0: /* 803024D4 002FF434 A0 1F 00 00 */ lhz r0, 0(r31) /* 803024D8 002FF438 3B BC 00 01 */ addi r29, r28, 1 /* 803024DC 002FF43C 28 00 00 0A */ cmplwi r0, 0xa -/* 803024E0 002FF440 40 82 00 10 */ bne lbl_803024F0 +/* 803024E0 002FF440 40 82 00 10 */ bne .L_803024F0 /* 803024E4 002FF444 7F 23 CB 78 */ mr r3, r25 /* 803024E8 002FF448 48 00 07 91 */ bl StartNewLine__18CTextExecuteBufferFv -/* 803024EC 002FF44C 48 00 00 A0 */ b lbl_8030258C -lbl_803024F0: +/* 803024EC 002FF44C 48 00 00 A0 */ b .L_8030258C +.L_803024F0: /* 803024F0 002FF450 7F 23 CB 78 */ mr r3, r25 /* 803024F4 002FF454 48 00 08 C9 */ bl StartNewWord__18CTextExecuteBufferFv /* 803024F8 002FF458 38 00 00 00 */ li r0, 0 @@ -722,7 +722,7 @@ lbl_803024F0: /* 80302504 002FF464 90 01 00 0C */ stw r0, 0xc(r1) /* 80302508 002FF468 4B FF F3 F1 */ bl IsFinishedLoading__14CSaveableStateFv /* 8030250C 002FF46C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80302510 002FF470 41 82 00 30 */ beq lbl_80302540 +/* 80302510 002FF470 41 82 00 30 */ beq .L_80302540 /* 80302514 002FF474 38 00 00 20 */ li r0, 0x20 /* 80302518 002FF478 7F C3 F3 78 */ mr r3, r30 /* 8030251C 002FF47C B0 01 00 08 */ sth r0, 8(r1) @@ -734,11 +734,11 @@ lbl_803024F0: /* 80302534 002FF494 38 E1 00 08 */ addi r7, r1, 8 /* 80302538 002FF498 39 00 00 01 */ li r8, 1 /* 8030253C 002FF49C 4B FF E1 D1 */ bl GetSize__11CRasterFontCFRC18CDrawStringOptionsRiRiPCwi -lbl_80302540: +.L_80302540: /* 80302540 002FF4A0 80 79 00 A0 */ lwz r3, 0xa0(r25) /* 80302544 002FF4A4 80 03 00 14 */ lwz r0, 0x14(r3) /* 80302548 002FF4A8 2C 00 00 00 */ cmpwi r0, 0 -/* 8030254C 002FF4AC 40 82 00 24 */ bne lbl_80302570 +/* 8030254C 002FF4AC 40 82 00 24 */ bne .L_80302570 /* 80302550 002FF4B0 80 99 00 A4 */ lwz r4, 0xa4(r25) /* 80302554 002FF4B4 80 01 00 10 */ lwz r0, 0x10(r1) /* 80302558 002FF4B8 80 64 00 08 */ lwz r3, 8(r4) @@ -746,8 +746,8 @@ lbl_80302540: /* 80302560 002FF4C0 90 04 00 08 */ stw r0, 8(r4) /* 80302564 002FF4C4 80 01 00 10 */ lwz r0, 0x10(r1) /* 80302568 002FF4C8 90 19 00 BC */ stw r0, 0xbc(r25) -/* 8030256C 002FF4CC 48 00 00 20 */ b lbl_8030258C -lbl_80302570: +/* 8030256C 002FF4CC 48 00 00 20 */ b .L_8030258C +.L_80302570: /* 80302570 002FF4D0 80 99 00 A4 */ lwz r4, 0xa4(r25) /* 80302574 002FF4D4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80302578 002FF4D8 80 64 00 0C */ lwz r3, 0xc(r4) @@ -755,26 +755,26 @@ lbl_80302570: /* 80302580 002FF4E0 90 04 00 0C */ stw r0, 0xc(r4) /* 80302584 002FF4E4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80302588 002FF4E8 90 19 00 BC */ stw r0, 0xbc(r25) -lbl_8030258C: +.L_8030258C: /* 8030258C 002FF4EC 3B FF 00 02 */ addi r31, r31, 2 /* 80302590 002FF4F0 3B 9C 00 01 */ addi r28, r28, 1 -lbl_80302594: +.L_80302594: /* 80302594 002FF4F4 A0 1F 00 00 */ lhz r0, 0(r31) /* 80302598 002FF4F8 28 00 00 00 */ cmplwi r0, 0 -/* 8030259C 002FF4FC 41 82 00 14 */ beq lbl_803025B0 +/* 8030259C 002FF4FC 41 82 00 14 */ beq .L_803025B0 /* 803025A0 002FF500 7C 1C D8 00 */ cmpw r28, r27 -/* 803025A4 002FF504 41 80 FF 0C */ blt lbl_803024B0 +/* 803025A4 002FF504 41 80 FF 0C */ blt .L_803024B0 /* 803025A8 002FF508 2C 1B FF FF */ cmpwi r27, -1 -/* 803025AC 002FF50C 41 82 FF 04 */ beq lbl_803024B0 -lbl_803025B0: +/* 803025AC 002FF50C 41 82 FF 04 */ beq .L_803024B0 +.L_803025B0: /* 803025B0 002FF510 7C 1C E8 00 */ cmpw r28, r29 -/* 803025B4 002FF514 40 81 00 18 */ ble lbl_803025CC +/* 803025B4 002FF514 40 81 00 18 */ ble .L_803025CC /* 803025B8 002FF518 57 A0 08 3C */ slwi r0, r29, 1 /* 803025BC 002FF51C 7F 23 CB 78 */ mr r3, r25 /* 803025C0 002FF520 7C 9A 02 14 */ add r4, r26, r0 /* 803025C4 002FF524 7C BD E0 50 */ subf r5, r29, r28 /* 803025C8 002FF528 48 00 00 19 */ bl AddStringFragment__18CTextExecuteBufferFPCwi -lbl_803025CC: +.L_803025CC: /* 803025CC 002FF52C BB 21 00 24 */ lmw r25, 0x24(r1) /* 803025D0 002FF530 80 01 00 44 */ lwz r0, 0x44(r1) /* 803025D4 002FF534 7C 08 03 A6 */ mtlr r0 @@ -797,19 +797,19 @@ AddStringFragment__18CTextExecuteBufferFPCwi: /* 8030260C 002FF56C 80 63 00 A0 */ lwz r3, 0xa0(r3) /* 80302610 002FF570 80 03 00 14 */ lwz r0, 0x14(r3) /* 80302614 002FF574 2C 00 00 00 */ cmpwi r0, 0 -/* 80302618 002FF578 40 82 00 28 */ bne lbl_80302640 -/* 8030261C 002FF57C 48 00 00 1C */ b lbl_80302638 -lbl_80302620: +/* 80302618 002FF578 40 82 00 28 */ bne .L_80302640 +/* 8030261C 002FF57C 48 00 00 1C */ b .L_80302638 +.L_80302620: /* 80302620 002FF580 57 E0 08 3C */ slwi r0, r31, 1 /* 80302624 002FF584 7F 83 E3 78 */ mr r3, r28 /* 80302628 002FF588 7C 9D 02 14 */ add r4, r29, r0 /* 8030262C 002FF58C 7C BF F0 50 */ subf r5, r31, r30 /* 80302630 002FF590 48 00 00 31 */ bl WrapOneLTR__18CTextExecuteBufferFPCwi /* 80302634 002FF594 7F FF 1A 14 */ add r31, r31, r3 -lbl_80302638: +.L_80302638: /* 80302638 002FF598 7C 1F F0 00 */ cmpw r31, r30 -/* 8030263C 002FF59C 40 82 FF E4 */ bne lbl_80302620 -lbl_80302640: +/* 8030263C 002FF59C 40 82 FF E4 */ bne .L_80302620 +.L_80302640: /* 80302640 002FF5A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80302644 002FF5A4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80302648 002FF5A8 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -832,7 +832,7 @@ WrapOneLTR__18CTextExecuteBufferFPCwi: /* 80302680 002FF5E0 38 79 00 18 */ addi r3, r25, 0x18 /* 80302684 002FF5E4 4B FF F2 75 */ bl IsFinishedLoading__14CSaveableStateFv /* 80302688 002FF5E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8030268C 002FF5EC 41 82 02 84 */ beq lbl_80302910 +/* 8030268C 002FF5EC 41 82 02 84 */ beq .L_80302910 /* 80302690 002FF5F0 3B D9 00 60 */ addi r30, r25, 0x60 /* 80302694 002FF5F4 7F C3 F3 78 */ mr r3, r30 /* 80302698 002FF5F8 48 03 E7 75 */ bl GetObj__6CTokenFv @@ -845,7 +845,7 @@ WrapOneLTR__18CTextExecuteBufferFPCwi: /* 803026B4 002FF614 4B FF E0 59 */ bl GetSize__11CRasterFontCFRC18CDrawStringOptionsRiRiPCwi /* 803026B8 002FF618 88 19 00 94 */ lbz r0, 0x94(r25) /* 803026BC 002FF61C 28 00 00 00 */ cmplwi r0, 0 -/* 803026C0 002FF620 41 82 01 24 */ beq lbl_803027E4 +/* 803026C0 002FF620 41 82 01 24 */ beq .L_803027E4 /* 803026C4 002FF624 80 99 00 A4 */ lwz r4, 0xa4(r25) /* 803026C8 002FF628 80 79 00 A0 */ lwz r3, 0xa0(r25) /* 803026CC 002FF62C 80 04 00 08 */ lwz r0, 8(r4) @@ -853,17 +853,17 @@ WrapOneLTR__18CTextExecuteBufferFPCwi: /* 803026D4 002FF634 80 63 00 0C */ lwz r3, 0xc(r3) /* 803026D8 002FF638 7C 05 02 14 */ add r0, r5, r0 /* 803026DC 002FF63C 7C 00 18 00 */ cmpw r0, r3 -/* 803026E0 002FF640 40 81 00 28 */ ble lbl_80302708 +/* 803026E0 002FF640 40 81 00 28 */ ble .L_80302708 /* 803026E4 002FF644 80 04 00 04 */ lwz r0, 4(r4) /* 803026E8 002FF648 2C 00 00 01 */ cmpwi r0, 1 -/* 803026EC 002FF64C 40 81 00 1C */ ble lbl_80302708 +/* 803026EC 002FF64C 40 81 00 1C */ ble .L_80302708 /* 803026F0 002FF650 80 19 00 B0 */ lwz r0, 0xb0(r25) /* 803026F4 002FF654 7C 00 2A 14 */ add r0, r0, r5 /* 803026F8 002FF658 7C 00 18 00 */ cmpw r0, r3 -/* 803026FC 002FF65C 40 80 00 0C */ bge lbl_80302708 +/* 803026FC 002FF65C 40 80 00 0C */ bge .L_80302708 /* 80302700 002FF660 7F 23 CB 78 */ mr r3, r25 /* 80302704 002FF664 48 00 02 E9 */ bl MoveWordLTR__18CTextExecuteBufferFv -lbl_80302708: +.L_80302708: /* 80302708 002FF668 80 99 00 A4 */ lwz r4, 0xa4(r25) /* 8030270C 002FF66C 80 79 00 A0 */ lwz r3, 0xa0(r25) /* 80302710 002FF670 80 A1 00 14 */ lwz r5, 0x14(r1) @@ -871,40 +871,40 @@ lbl_80302708: /* 80302718 002FF678 80 03 00 0C */ lwz r0, 0xc(r3) /* 8030271C 002FF67C 7C 65 22 14 */ add r3, r5, r4 /* 80302720 002FF680 7C 03 00 00 */ cmpw r3, r0 -/* 80302724 002FF684 40 81 00 C0 */ ble lbl_803027E4 +/* 80302724 002FF684 40 81 00 C0 */ ble .L_803027E4 /* 80302728 002FF688 2C 1B 00 01 */ cmpwi r27, 1 -/* 8030272C 002FF68C 40 81 00 B8 */ ble lbl_803027E4 +/* 8030272C 002FF68C 40 81 00 B8 */ ble .L_803027E4 /* 80302730 002FF690 57 60 08 3C */ slwi r0, r27, 1 /* 80302734 002FF694 3B 80 00 05 */ li r28, 5 /* 80302738 002FF698 7F FA 02 14 */ add r31, r26, r0 -lbl_8030273C: +.L_8030273C: /* 8030273C 002FF69C 3B BD FF FF */ addi r29, r29, -1 /* 80302740 002FF6A0 3B FF FF FE */ addi r31, r31, -2 /* 80302744 002FF6A4 2C 1D 00 01 */ cmpwi r29, 1 -/* 80302748 002FF6A8 40 81 00 14 */ ble lbl_8030275C +/* 80302748 002FF6A8 40 81 00 14 */ ble .L_8030275C /* 8030274C 002FF6AC A0 7F FF FE */ lhz r3, -2(r31) /* 80302750 002FF6B0 48 00 32 51 */ bl GetEndRank__16CWordBreakTablesFw /* 80302754 002FF6B4 7C 78 1B 78 */ mr r24, r3 -/* 80302758 002FF6B8 48 00 00 08 */ b lbl_80302760 -lbl_8030275C: +/* 80302758 002FF6B8 48 00 00 08 */ b .L_80302760 +.L_8030275C: /* 8030275C 002FF6BC 3B 00 00 04 */ li r24, 4 -lbl_80302760: +.L_80302760: /* 80302760 002FF6C0 A0 7F 00 00 */ lhz r3, 0(r31) /* 80302764 002FF6C4 48 00 32 D1 */ bl GetBeginRank__16CWordBreakTablesFw /* 80302768 002FF6C8 7C 18 E0 00 */ cmpw r24, r28 -/* 8030276C 002FF6CC 40 80 00 14 */ bge lbl_80302780 +/* 8030276C 002FF6CC 40 80 00 14 */ bge .L_80302780 /* 80302770 002FF6D0 7C 18 18 00 */ cmpw r24, r3 -/* 80302774 002FF6D4 41 81 00 0C */ bgt lbl_80302780 +/* 80302774 002FF6D4 41 81 00 0C */ bgt .L_80302780 /* 80302778 002FF6D8 7F 1C C3 78 */ mr r28, r24 -/* 8030277C 002FF6DC 48 00 00 40 */ b lbl_803027BC -lbl_80302780: +/* 8030277C 002FF6DC 48 00 00 40 */ b .L_803027BC +.L_80302780: /* 80302780 002FF6E0 7C 03 E0 00 */ cmpw r3, r28 -/* 80302784 002FF6E4 40 80 00 14 */ bge lbl_80302798 +/* 80302784 002FF6E4 40 80 00 14 */ bge .L_80302798 /* 80302788 002FF6E8 7C 03 C0 00 */ cmpw r3, r24 -/* 8030278C 002FF6EC 41 81 00 0C */ bgt lbl_80302798 +/* 8030278C 002FF6EC 41 81 00 0C */ bgt .L_80302798 /* 80302790 002FF6F0 7F 1C C3 78 */ mr r28, r24 -/* 80302794 002FF6F4 48 00 00 28 */ b lbl_803027BC -lbl_80302798: +/* 80302794 002FF6F4 48 00 00 28 */ b .L_803027BC +.L_80302798: /* 80302798 002FF6F8 7F C3 F3 78 */ mr r3, r30 /* 8030279C 002FF6FC 48 03 E6 71 */ bl GetObj__6CTokenFv /* 803027A0 002FF700 80 63 00 04 */ lwz r3, 4(r3) @@ -914,7 +914,7 @@ lbl_80302798: /* 803027B0 002FF710 38 A1 00 14 */ addi r5, r1, 0x14 /* 803027B4 002FF714 38 C1 00 10 */ addi r6, r1, 0x10 /* 803027B8 002FF718 4B FF DF 55 */ bl GetSize__11CRasterFontCFRC18CDrawStringOptionsRiRiPCwi -lbl_803027BC: +.L_803027BC: /* 803027BC 002FF71C 80 99 00 A4 */ lwz r4, 0xa4(r25) /* 803027C0 002FF720 80 79 00 A0 */ lwz r3, 0xa0(r25) /* 803027C4 002FF724 80 A1 00 14 */ lwz r5, 0x14(r1) @@ -922,23 +922,23 @@ lbl_803027BC: /* 803027CC 002FF72C 80 03 00 0C */ lwz r0, 0xc(r3) /* 803027D0 002FF730 7C 65 22 14 */ add r3, r5, r4 /* 803027D4 002FF734 7C 03 00 00 */ cmpw r3, r0 -/* 803027D8 002FF738 40 81 00 0C */ ble lbl_803027E4 +/* 803027D8 002FF738 40 81 00 0C */ ble .L_803027E4 /* 803027DC 002FF73C 2C 1D 00 01 */ cmpwi r29, 1 -/* 803027E0 002FF740 41 81 FF 5C */ bgt lbl_8030273C -lbl_803027E4: +/* 803027E0 002FF740 41 81 FF 5C */ bgt .L_8030273C +.L_803027E4: /* 803027E4 002FF744 7F C3 F3 78 */ mr r3, r30 /* 803027E8 002FF748 48 03 E6 25 */ bl GetObj__6CTokenFv /* 803027EC 002FF74C 80 63 00 04 */ lwz r3, 4(r3) /* 803027F0 002FF750 4B FF DE C9 */ bl GetCarriageAdvance__11CRasterFontFv /* 803027F4 002FF754 80 19 00 AC */ lwz r0, 0xac(r25) /* 803027F8 002FF758 7C 03 00 00 */ cmpw r3, r0 -/* 803027FC 002FF75C 40 81 00 18 */ ble lbl_80302814 +/* 803027FC 002FF75C 40 81 00 18 */ ble .L_80302814 /* 80302800 002FF760 7F C3 F3 78 */ mr r3, r30 /* 80302804 002FF764 48 03 E6 09 */ bl GetObj__6CTokenFv /* 80302808 002FF768 80 63 00 04 */ lwz r3, 4(r3) /* 8030280C 002FF76C 4B FF DE AD */ bl GetCarriageAdvance__11CRasterFontFv /* 80302810 002FF770 90 79 00 AC */ stw r3, 0xac(r25) -lbl_80302814: +.L_80302814: /* 80302814 002FF774 7F C3 F3 78 */ mr r3, r30 /* 80302818 002FF778 48 03 E5 F5 */ bl GetObj__6CTokenFv /* 8030281C 002FF77C 83 03 00 04 */ lwz r24, 4(r3) @@ -971,9 +971,9 @@ lbl_80302814: /* 80302888 002FF7E8 80 04 00 2C */ lwz r0, 0x2c(r4) /* 8030288C 002FF7EC 80 63 00 08 */ lwz r3, 8(r3) /* 80302890 002FF7F0 7C 03 00 00 */ cmpw r3, r0 -/* 80302894 002FF7F4 40 81 00 08 */ ble lbl_8030289C +/* 80302894 002FF7F4 40 81 00 08 */ ble .L_8030289C /* 80302898 002FF7F8 90 64 00 2C */ stw r3, 0x2c(r4) -lbl_8030289C: +.L_8030289C: /* 8030289C 002FF7FC 80 B9 00 B0 */ lwz r5, 0xb0(r25) /* 803028A0 002FF800 7F 43 D3 78 */ mr r3, r26 /* 803028A4 002FF804 80 01 00 14 */ lwz r0, 0x14(r1) @@ -988,24 +988,24 @@ lbl_8030289C: /* 803028C8 002FF828 38 A0 00 00 */ li r5, 0 /* 803028CC 002FF82C 48 01 2F A1 */ bl __nw__FUlPCcPCc /* 803028D0 002FF830 28 03 00 00 */ cmplwi r3, 0 -/* 803028D4 002FF834 41 82 00 10 */ beq lbl_803028E4 +/* 803028D4 002FF834 41 82 00 10 */ beq .L_803028E4 /* 803028D8 002FF838 93 43 00 00 */ stw r26, 0(r3) /* 803028DC 002FF83C 38 00 00 01 */ li r0, 1 /* 803028E0 002FF840 90 03 00 04 */ stw r0, 4(r3) -lbl_803028E4: +.L_803028E4: /* 803028E4 002FF844 90 61 00 0C */ stw r3, 0xc(r1) /* 803028E8 002FF848 7F 24 CB 78 */ mr r4, r25 /* 803028EC 002FF84C 38 61 00 08 */ addi r3, r1, 8 /* 803028F0 002FF850 38 A1 00 0C */ addi r5, r1, 0xc /* 803028F4 002FF854 48 00 00 35 */ bl sub_80302928 /* 803028F8 002FF858 7C 1D D8 00 */ cmpw r29, r27 -/* 803028FC 002FF85C 41 82 00 0C */ beq lbl_80302908 +/* 803028FC 002FF85C 41 82 00 0C */ beq .L_80302908 /* 80302900 002FF860 7F 23 CB 78 */ mr r3, r25 /* 80302904 002FF864 48 00 03 75 */ bl StartNewLine__18CTextExecuteBufferFv -lbl_80302908: +.L_80302908: /* 80302908 002FF868 38 61 00 0C */ addi r3, r1, 0xc /* 8030290C 002FF86C 4B D2 6B 01 */ bl sub_8002940c -lbl_80302910: +.L_80302910: /* 80302910 002FF870 7F A3 EB 78 */ mr r3, r29 /* 80302914 002FF874 BB 01 00 20 */ lmw r24, 0x20(r1) /* 80302918 002FF878 80 01 00 44 */ lwz r0, 0x44(r1) @@ -1030,24 +1030,24 @@ sub_80302928: /* 80302958 002FF8B8 83 9D 00 00 */ lwz r28, 0(r29) /* 8030295C 002FF8BC 48 01 2E BD */ bl __nwa__FUlPCcPCc /* 80302960 002FF8C0 7C 67 1B 79 */ or. r7, r3, r3 -/* 80302964 002FF8C4 41 82 00 0C */ beq lbl_80302970 +/* 80302964 002FF8C4 41 82 00 0C */ beq .L_80302970 /* 80302968 002FF8C8 93 87 00 00 */ stw r28, 0(r7) /* 8030296C 002FF8CC 93 A7 00 04 */ stw r29, 4(r7) -lbl_80302970: +.L_80302970: /* 80302970 002FF8D0 34 67 00 08 */ addic. r3, r7, 8 -/* 80302974 002FF8D4 41 82 00 1C */ beq lbl_80302990 +/* 80302974 002FF8D4 41 82 00 1C */ beq .L_80302990 /* 80302978 002FF8D8 80 1B 00 00 */ lwz r0, 0(r27) /* 8030297C 002FF8DC 90 03 00 00 */ stw r0, 0(r3) /* 80302980 002FF8E0 80 83 00 00 */ lwz r4, 0(r3) /* 80302984 002FF8E4 80 64 00 04 */ lwz r3, 4(r4) /* 80302988 002FF8E8 38 03 00 01 */ addi r0, r3, 1 /* 8030298C 002FF8EC 90 04 00 04 */ stw r0, 4(r4) -lbl_80302990: +.L_80302990: /* 80302990 002FF8F0 80 1F 00 04 */ lwz r0, 4(r31) /* 80302994 002FF8F4 7C 1D 00 40 */ cmplw r29, r0 -/* 80302998 002FF8F8 40 82 00 08 */ bne lbl_803029A0 +/* 80302998 002FF8F8 40 82 00 08 */ bne .L_803029A0 /* 8030299C 002FF8FC 90 FF 00 04 */ stw r7, 4(r31) -lbl_803029A0: +.L_803029A0: /* 803029A0 002FF900 80 C7 00 00 */ lwz r6, 0(r7) /* 803029A4 002FF904 7F C3 F3 78 */ mr r3, r30 /* 803029A8 002FF908 38 81 00 0C */ addi r4, r1, 0xc @@ -1087,9 +1087,9 @@ MoveWordLTR__18CTextExecuteBufferFv: /* 80302A24 002FF984 80 9F 00 B8 */ lwz r4, 0xb8(r31) /* 80302A28 002FF988 80 03 00 0C */ lwz r0, 0xc(r3) /* 80302A2C 002FF98C 7C 00 20 00 */ cmpw r0, r4 -/* 80302A30 002FF990 40 81 00 08 */ ble lbl_80302A38 +/* 80302A30 002FF990 40 81 00 08 */ ble .L_80302A38 /* 80302A34 002FF994 90 83 00 0C */ stw r4, 0xc(r3) -lbl_80302A38: +.L_80302A38: /* 80302A38 002FF998 38 00 00 00 */ li r0, 0 /* 80302A3C 002FF99C 7F E3 FB 78 */ mr r3, r31 /* 80302A40 002FF9A0 90 1F 00 BC */ stw r0, 0xbc(r31) @@ -1104,7 +1104,7 @@ lbl_80302A38: /* 80302A64 002FF9C4 38 A0 00 00 */ li r5, 0 /* 80302A68 002FF9C8 48 01 2E 05 */ bl __nw__FUlPCcPCc /* 80302A6C 002FF9CC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80302A70 002FF9D0 41 82 00 68 */ beq lbl_80302AD8 +/* 80302A70 002FF9D0 41 82 00 68 */ beq .L_80302AD8 /* 80302A74 002FF9D4 3C 60 80 3E */ lis r3, __vt__12CInstruction@ha /* 80302A78 002FF9D8 80 FF 00 98 */ lwz r7, 0x98(r31) /* 80302A7C 002FF9DC 81 1F 00 9C */ lwz r8, 0x9c(r31) @@ -1130,18 +1130,18 @@ lbl_80302A38: /* 80302ACC 002FFA2C 90 FE 00 28 */ stw r7, 0x28(r30) /* 80302AD0 002FFA30 91 1E 00 2C */ stw r8, 0x2c(r30) /* 80302AD4 002FFA34 98 DE 00 30 */ stb r6, 0x30(r30) -lbl_80302AD8: +.L_80302AD8: /* 80302AD8 002FFA38 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80302ADC 002FFA3C 38 60 00 08 */ li r3, 8 /* 80302AE0 002FFA40 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80302AE4 002FFA44 38 A0 00 00 */ li r5, 0 /* 80302AE8 002FFA48 48 01 2D 85 */ bl __nw__FUlPCcPCc /* 80302AEC 002FFA4C 28 03 00 00 */ cmplwi r3, 0 -/* 80302AF0 002FFA50 41 82 00 10 */ beq lbl_80302B00 +/* 80302AF0 002FFA50 41 82 00 10 */ beq .L_80302B00 /* 80302AF4 002FFA54 93 C3 00 00 */ stw r30, 0(r3) /* 80302AF8 002FFA58 38 00 00 01 */ li r0, 1 /* 80302AFC 002FFA5C 90 03 00 04 */ stw r0, 4(r3) -lbl_80302B00: +.L_80302B00: /* 80302B00 002FFA60 90 61 00 14 */ stw r3, 0x14(r1) /* 80302B04 002FFA64 7F E4 FB 78 */ mr r4, r31 /* 80302B08 002FFA68 38 BF 00 A8 */ addi r5, r31, 0xa8 @@ -1156,25 +1156,25 @@ lbl_80302B00: /* 80302B2C 002FFA8C 38 A0 00 00 */ li r5, 0 /* 80302B30 002FFA90 48 01 2D 3D */ bl __nw__FUlPCcPCc /* 80302B34 002FFA94 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80302B38 002FFA98 41 82 00 1C */ beq lbl_80302B54 +/* 80302B38 002FFA98 41 82 00 1C */ beq .L_80302B54 /* 80302B3C 002FFA9C 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 80302B40 002FFAA0 3C 60 80 3F */ lis r3, lbl_803ED8A8@ha /* 80302B44 002FFAA4 38 04 9A 6C */ addi r0, r4, __vt__12CInstruction@l /* 80302B48 002FFAA8 90 1E 00 00 */ stw r0, 0(r30) /* 80302B4C 002FFAAC 38 03 D8 A8 */ addi r0, r3, lbl_803ED8A8@l /* 80302B50 002FFAB0 90 1E 00 00 */ stw r0, 0(r30) -lbl_80302B54: +.L_80302B54: /* 80302B54 002FFAB4 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80302B58 002FFAB8 38 60 00 08 */ li r3, 8 /* 80302B5C 002FFABC 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80302B60 002FFAC0 38 A0 00 00 */ li r5, 0 /* 80302B64 002FFAC4 48 01 2D 09 */ bl __nw__FUlPCcPCc /* 80302B68 002FFAC8 28 03 00 00 */ cmplwi r3, 0 -/* 80302B6C 002FFACC 41 82 00 10 */ beq lbl_80302B7C +/* 80302B6C 002FFACC 41 82 00 10 */ beq .L_80302B7C /* 80302B70 002FFAD0 93 C3 00 00 */ stw r30, 0(r3) /* 80302B74 002FFAD4 38 00 00 01 */ li r0, 1 /* 80302B78 002FFAD8 90 03 00 04 */ stw r0, 4(r3) -lbl_80302B7C: +.L_80302B7C: /* 80302B7C 002FFADC 90 61 00 08 */ stw r3, 8(r1) /* 80302B80 002FFAE0 7F E4 FB 78 */ mr r4, r31 /* 80302B84 002FFAE4 38 61 00 0C */ addi r3, r1, 0xc @@ -1213,24 +1213,24 @@ sub_80302bcc: /* 80302BFC 002FFB5C 38 A0 00 00 */ li r5, 0 /* 80302C00 002FFB60 48 01 2C 19 */ bl __nwa__FUlPCcPCc /* 80302C04 002FFB64 28 03 00 00 */ cmplwi r3, 0 -/* 80302C08 002FFB68 41 82 00 0C */ beq lbl_80302C14 +/* 80302C08 002FFB68 41 82 00 0C */ beq .L_80302C14 /* 80302C0C 002FFB6C 93 C3 00 00 */ stw r30, 0(r3) /* 80302C10 002FFB70 93 E3 00 04 */ stw r31, 4(r3) -lbl_80302C14: +.L_80302C14: /* 80302C14 002FFB74 34 83 00 08 */ addic. r4, r3, 8 -/* 80302C18 002FFB78 41 82 00 1C */ beq lbl_80302C34 +/* 80302C18 002FFB78 41 82 00 1C */ beq .L_80302C34 /* 80302C1C 002FFB7C 80 1D 00 00 */ lwz r0, 0(r29) /* 80302C20 002FFB80 90 04 00 00 */ stw r0, 0(r4) /* 80302C24 002FFB84 80 A4 00 00 */ lwz r5, 0(r4) /* 80302C28 002FFB88 80 85 00 04 */ lwz r4, 4(r5) /* 80302C2C 002FFB8C 38 04 00 01 */ addi r0, r4, 1 /* 80302C30 002FFB90 90 05 00 04 */ stw r0, 4(r5) -lbl_80302C34: +.L_80302C34: /* 80302C34 002FFB94 80 1C 00 04 */ lwz r0, 4(r28) /* 80302C38 002FFB98 7C 1F 00 40 */ cmplw r31, r0 -/* 80302C3C 002FFB9C 40 82 00 08 */ bne lbl_80302C44 +/* 80302C3C 002FFB9C 40 82 00 08 */ bne .L_80302C44 /* 80302C40 002FFBA0 90 7C 00 04 */ stw r3, 4(r28) -lbl_80302C44: +.L_80302C44: /* 80302C44 002FFBA4 80 83 00 00 */ lwz r4, 0(r3) /* 80302C48 002FFBA8 90 64 00 04 */ stw r3, 4(r4) /* 80302C4C 002FFBAC 80 83 00 04 */ lwz r4, 4(r3) @@ -1255,16 +1255,16 @@ StartNewLine__18CTextExecuteBufferFv: /* 80302C8C 002FFBEC 93 C1 00 18 */ stw r30, 0x18(r1) /* 80302C90 002FFBF0 80 03 00 A4 */ lwz r0, 0xa4(r3) /* 80302C94 002FFBF4 28 00 00 00 */ cmplwi r0, 0 -/* 80302C98 002FFBF8 41 82 00 08 */ beq lbl_80302CA0 +/* 80302C98 002FFBF8 41 82 00 08 */ beq .L_80302CA0 /* 80302C9C 002FFBFC 48 00 02 05 */ bl TerminateLine__18CTextExecuteBufferFv -lbl_80302CA0: +.L_80302CA0: /* 80302CA0 002FFC00 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80302CA4 002FFC04 38 60 00 34 */ li r3, 0x34 /* 80302CA8 002FFC08 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80302CAC 002FFC0C 38 A0 00 00 */ li r5, 0 /* 80302CB0 002FFC10 48 01 2B BD */ bl __nw__FUlPCcPCc /* 80302CB4 002FFC14 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80302CB8 002FFC18 41 82 00 5C */ beq lbl_80302D14 +/* 80302CB8 002FFC18 41 82 00 5C */ beq .L_80302D14 /* 80302CBC 002FFC1C 3C 60 80 3E */ lis r3, __vt__12CInstruction@ha /* 80302CC0 002FFC20 80 DF 00 98 */ lwz r6, 0x98(r31) /* 80302CC4 002FFC24 80 FF 00 9C */ lwz r7, 0x9c(r31) @@ -1287,18 +1287,18 @@ lbl_80302CA0: /* 80302D08 002FFC68 90 DE 00 28 */ stw r6, 0x28(r30) /* 80302D0C 002FFC6C 90 FE 00 2C */ stw r7, 0x2c(r30) /* 80302D10 002FFC70 98 BE 00 30 */ stb r5, 0x30(r30) -lbl_80302D14: +.L_80302D14: /* 80302D14 002FFC74 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80302D18 002FFC78 38 60 00 08 */ li r3, 8 /* 80302D1C 002FFC7C 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80302D20 002FFC80 38 A0 00 00 */ li r5, 0 /* 80302D24 002FFC84 48 01 2B 49 */ bl __nw__FUlPCcPCc /* 80302D28 002FFC88 28 03 00 00 */ cmplwi r3, 0 -/* 80302D2C 002FFC8C 41 82 00 10 */ beq lbl_80302D3C +/* 80302D2C 002FFC8C 41 82 00 10 */ beq .L_80302D3C /* 80302D30 002FFC90 93 C3 00 00 */ stw r30, 0(r3) /* 80302D34 002FFC94 38 00 00 01 */ li r0, 1 /* 80302D38 002FFC98 90 03 00 04 */ stw r0, 4(r3) -lbl_80302D3C: +.L_80302D3C: /* 80302D3C 002FFC9C 90 61 00 0C */ stw r3, 0xc(r1) /* 80302D40 002FFCA0 90 61 00 10 */ stw r3, 0x10(r1) /* 80302D44 002FFCA4 80 83 00 04 */ lwz r4, 4(r3) @@ -1346,25 +1346,25 @@ StartNewWord__18CTextExecuteBufferFv: /* 80302DE0 002FFD40 38 60 00 04 */ li r3, 4 /* 80302DE4 002FFD44 48 01 2A 89 */ bl __nw__FUlPCcPCc /* 80302DE8 002FFD48 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80302DEC 002FFD4C 41 82 00 1C */ beq lbl_80302E08 +/* 80302DEC 002FFD4C 41 82 00 1C */ beq .L_80302E08 /* 80302DF0 002FFD50 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 80302DF4 002FFD54 3C 60 80 3F */ lis r3, lbl_803ED8A8@ha /* 80302DF8 002FFD58 38 04 9A 6C */ addi r0, r4, __vt__12CInstruction@l /* 80302DFC 002FFD5C 90 1F 00 00 */ stw r0, 0(r31) /* 80302E00 002FFD60 38 03 D8 A8 */ addi r0, r3, lbl_803ED8A8@l /* 80302E04 002FFD64 90 1F 00 00 */ stw r0, 0(r31) -lbl_80302E08: +.L_80302E08: /* 80302E08 002FFD68 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80302E0C 002FFD6C 38 60 00 08 */ li r3, 8 /* 80302E10 002FFD70 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80302E14 002FFD74 38 A0 00 00 */ li r5, 0 /* 80302E18 002FFD78 48 01 2A 55 */ bl __nw__FUlPCcPCc /* 80302E1C 002FFD7C 28 03 00 00 */ cmplwi r3, 0 -/* 80302E20 002FFD80 41 82 00 10 */ beq lbl_80302E30 +/* 80302E20 002FFD80 41 82 00 10 */ beq .L_80302E30 /* 80302E24 002FFD84 93 E3 00 00 */ stw r31, 0(r3) /* 80302E28 002FFD88 38 00 00 01 */ li r0, 1 /* 80302E2C 002FFD8C 90 03 00 04 */ stw r0, 4(r3) -lbl_80302E30: +.L_80302E30: /* 80302E30 002FFD90 90 61 00 0C */ stw r3, 0xc(r1) /* 80302E34 002FFD94 7F C4 F3 78 */ mr r4, r30 /* 80302E38 002FFD98 38 61 00 08 */ addi r3, r1, 8 @@ -1402,9 +1402,9 @@ TerminateLine__18CTextExecuteBufferFv: /* 80302EAC 002FFE0C 80 83 00 A0 */ lwz r4, 0xa0(r3) /* 80302EB0 002FFE10 80 04 00 14 */ lwz r0, 0x14(r4) /* 80302EB4 002FFE14 2C 00 00 00 */ cmpwi r0, 0 -/* 80302EB8 002FFE18 40 82 00 08 */ bne lbl_80302EC0 +/* 80302EB8 002FFE18 40 82 00 08 */ bne .L_80302EC0 /* 80302EBC 002FFE1C 48 00 00 15 */ bl TerminateLineLTR__18CTextExecuteBufferFv -lbl_80302EC0: +.L_80302EC0: /* 80302EC0 002FFE20 80 01 00 14 */ lwz r0, 0x14(r1) /* 80302EC4 002FFE24 7C 08 03 A6 */ mtlr r0 /* 80302EC8 002FFE28 38 21 00 10 */ addi r1, r1, 0x10 @@ -1420,11 +1420,11 @@ TerminateLineLTR__18CTextExecuteBufferFv: /* 80302EE4 002FFE44 80 63 00 A4 */ lwz r3, 0xa4(r3) /* 80302EE8 002FFE48 80 03 00 0C */ lwz r0, 0xc(r3) /* 80302EEC 002FFE4C 2C 00 00 00 */ cmpwi r0, 0 -/* 80302EF0 002FFE50 40 82 00 54 */ bne lbl_80302F44 +/* 80302EF0 002FFE50 40 82 00 54 */ bne .L_80302F44 /* 80302EF4 002FFE54 38 7F 00 18 */ addi r3, r31, 0x18 /* 80302EF8 002FFE58 4B FF EA 01 */ bl IsFinishedLoading__14CSaveableStateFv /* 80302EFC 002FFE5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80302F00 002FFE60 41 82 00 44 */ beq lbl_80302F44 +/* 80302F00 002FFE60 41 82 00 44 */ beq .L_80302F44 /* 80302F04 002FFE64 80 7F 00 A4 */ lwz r3, 0xa4(r31) /* 80302F08 002FFE68 4B FF CA 2D */ bl GetHeight__16CLineInstructionFv /* 80302F0C 002FFE6C 90 61 00 08 */ stw r3, 8(r1) @@ -1436,21 +1436,21 @@ TerminateLineLTR__18CTextExecuteBufferFv: /* 80302F24 002FFE84 38 81 00 0C */ addi r4, r1, 0xc /* 80302F28 002FFE88 90 61 00 0C */ stw r3, 0xc(r1) /* 80302F2C 002FFE8C 7C 03 00 00 */ cmpw r3, r0 -/* 80302F30 002FFE90 40 80 00 08 */ bge lbl_80302F38 +/* 80302F30 002FFE90 40 80 00 08 */ bge .L_80302F38 /* 80302F34 002FFE94 38 81 00 08 */ addi r4, r1, 8 -lbl_80302F38: +.L_80302F38: /* 80302F38 002FFE98 80 04 00 00 */ lwz r0, 0(r4) /* 80302F3C 002FFE9C 80 7F 00 A4 */ lwz r3, 0xa4(r31) /* 80302F40 002FFEA0 90 03 00 0C */ stw r0, 0xc(r3) -lbl_80302F44: +.L_80302F44: /* 80302F44 002FFEA4 80 9F 00 A0 */ lwz r4, 0xa0(r31) /* 80302F48 002FFEA8 80 04 00 1C */ lwz r0, 0x1c(r4) /* 80302F4C 002FFEAC 2C 00 00 03 */ cmpwi r0, 3 -/* 80302F50 002FFEB0 40 82 00 10 */ bne lbl_80302F60 +/* 80302F50 002FFEB0 40 82 00 10 */ bne .L_80302F60 /* 80302F54 002FFEB4 80 7F 00 A4 */ lwz r3, 0xa4(r31) /* 80302F58 002FFEB8 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80302F5C 002FFEBC 48 00 00 44 */ b lbl_80302FA0 -lbl_80302F60: +/* 80302F5C 002FFEBC 48 00 00 44 */ b .L_80302FA0 +.L_80302F60: /* 80302F60 002FFEC0 80 7F 00 A4 */ lwz r3, 0xa4(r31) /* 80302F64 002FFEC4 3C 00 43 30 */ lis r0, 0x4330 /* 80302F68 002FFEC8 90 01 00 10 */ stw r0, 0x10(r1) @@ -1467,7 +1467,7 @@ lbl_80302F60: /* 80302F94 002FFEF4 D8 01 00 18 */ stfd f0, 0x18(r1) /* 80302F98 002FFEF8 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80302F9C 002FFEFC 7C 63 02 14 */ add r3, r3, r0 -lbl_80302FA0: +.L_80302FA0: /* 80302FA0 002FFF00 80 04 00 30 */ lwz r0, 0x30(r4) /* 80302FA4 002FFF04 7C 00 1A 14 */ add r0, r0, r3 /* 80302FA8 002FFF08 90 04 00 30 */ stw r0, 0x30(r4) @@ -1491,25 +1491,25 @@ AddPopState__18CTextExecuteBufferFv: /* 80302FE4 002FFF44 38 60 00 04 */ li r3, 4 /* 80302FE8 002FFF48 48 01 28 85 */ bl __nw__FUlPCcPCc /* 80302FEC 002FFF4C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80302FF0 002FFF50 41 82 00 1C */ beq lbl_8030300C +/* 80302FF0 002FFF50 41 82 00 1C */ beq .L_8030300C /* 80302FF4 002FFF54 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 80302FF8 002FFF58 3C 60 80 3F */ lis r3, __vt__20CPopStateInstruction@ha /* 80302FFC 002FFF5C 38 04 9A 6C */ addi r0, r4, __vt__12CInstruction@l /* 80303000 002FFF60 90 1F 00 00 */ stw r0, 0(r31) /* 80303004 002FFF64 38 03 D6 98 */ addi r0, r3, __vt__20CPopStateInstruction@l /* 80303008 002FFF68 90 1F 00 00 */ stw r0, 0(r31) -lbl_8030300C: +.L_8030300C: /* 8030300C 002FFF6C 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80303010 002FFF70 38 60 00 08 */ li r3, 8 /* 80303014 002FFF74 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80303018 002FFF78 38 A0 00 00 */ li r5, 0 /* 8030301C 002FFF7C 48 01 28 51 */ bl __nw__FUlPCcPCc /* 80303020 002FFF80 28 03 00 00 */ cmplwi r3, 0 -/* 80303024 002FFF84 41 82 00 10 */ beq lbl_80303034 +/* 80303024 002FFF84 41 82 00 10 */ beq .L_80303034 /* 80303028 002FFF88 93 E3 00 00 */ stw r31, 0(r3) /* 8030302C 002FFF8C 38 00 00 01 */ li r0, 1 /* 80303030 002FFF90 90 03 00 04 */ stw r0, 4(r3) -lbl_80303034: +.L_80303034: /* 80303034 002FFF94 90 61 00 0C */ stw r3, 0xc(r1) /* 80303038 002FFF98 7F C4 F3 78 */ mr r4, r30 /* 8030303C 002FFF9C 38 61 00 08 */ addi r3, r1, 8 @@ -1525,13 +1525,13 @@ lbl_80303034: /* 80303064 002FFFC4 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 80303068 002FFFC8 80 03 00 08 */ lwz r0, 8(r3) /* 8030306C 002FFFCC 2C 00 00 00 */ cmpwi r0, 0 -/* 80303070 002FFFD0 40 82 00 18 */ bne lbl_80303088 +/* 80303070 002FFFD0 40 82 00 18 */ bne .L_80303088 /* 80303074 002FFFD4 80 1E 00 98 */ lwz r0, 0x98(r30) /* 80303078 002FFFD8 90 03 00 28 */ stw r0, 0x28(r3) /* 8030307C 002FFFDC 80 1E 00 9C */ lwz r0, 0x9c(r30) /* 80303080 002FFFE0 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 80303084 002FFFE4 90 03 00 2C */ stw r0, 0x2c(r3) -lbl_80303088: +.L_80303088: /* 80303088 002FFFE8 38 61 00 0C */ addi r3, r1, 0xc /* 8030308C 002FFFEC 4B D2 63 81 */ bl sub_8002940c /* 80303090 002FFFF0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1555,25 +1555,25 @@ AddPushState__18CTextExecuteBufferFv: /* 803030CC 0030002C 38 60 00 04 */ li r3, 4 /* 803030D0 00300030 48 01 27 9D */ bl __nw__FUlPCcPCc /* 803030D4 00300034 7C 7F 1B 79 */ or. r31, r3, r3 -/* 803030D8 00300038 41 82 00 1C */ beq lbl_803030F4 +/* 803030D8 00300038 41 82 00 1C */ beq .L_803030F4 /* 803030DC 0030003C 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 803030E0 00300040 3C 60 80 3F */ lis r3, __vt__21CPushStateInstruction@ha /* 803030E4 00300044 38 04 9A 6C */ addi r0, r4, __vt__12CInstruction@l /* 803030E8 00300048 90 1F 00 00 */ stw r0, 0(r31) /* 803030EC 0030004C 38 03 D6 B8 */ addi r0, r3, __vt__21CPushStateInstruction@l /* 803030F0 00300050 90 1F 00 00 */ stw r0, 0(r31) -lbl_803030F4: +.L_803030F4: /* 803030F4 00300054 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 803030F8 00300058 38 60 00 08 */ li r3, 8 /* 803030FC 0030005C 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80303100 00300060 38 A0 00 00 */ li r5, 0 /* 80303104 00300064 48 01 27 69 */ bl __nw__FUlPCcPCc /* 80303108 00300068 28 03 00 00 */ cmplwi r3, 0 -/* 8030310C 0030006C 41 82 00 10 */ beq lbl_8030311C +/* 8030310C 0030006C 41 82 00 10 */ beq .L_8030311C /* 80303110 00300070 93 E3 00 00 */ stw r31, 0(r3) /* 80303114 00300074 38 00 00 01 */ li r0, 1 /* 80303118 00300078 90 03 00 04 */ stw r0, 4(r3) -lbl_8030311C: +.L_8030311C: /* 8030311C 0030007C 90 61 00 0C */ stw r3, 0xc(r1) /* 80303120 00300080 7F C4 F3 78 */ mr r4, r30 /* 80303124 00300084 38 61 00 08 */ addi r3, r1, 8 @@ -1615,8 +1615,8 @@ sub_80303180: /* 8030319C 003000FC 90 83 00 28 */ stw r4, 0x28(r3) /* 803031A0 00300100 4E 80 00 20 */ blr -.global __ct__26CLineExtraSpaceInstructionFi -__ct__26CLineExtraSpaceInstructionFi: +.global sub_803031A4 +sub_803031A4: /* 803031A4 00300104 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803031A8 00300108 7C 08 02 A6 */ mflr r0 /* 803031AC 0030010C 3C A0 80 3D */ lis r5, lbl_803D6E90@ha @@ -1632,7 +1632,7 @@ __ct__26CLineExtraSpaceInstructionFi: /* 803031D4 00300134 38 60 00 08 */ li r3, 8 /* 803031D8 00300138 48 01 26 95 */ bl __nw__FUlPCcPCc /* 803031DC 0030013C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 803031E0 00300140 41 82 00 20 */ beq lbl_80303200 +/* 803031E0 00300140 41 82 00 20 */ beq .L_80303200 /* 803031E4 00300144 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 803031E8 00300148 3C 60 80 3F */ lis r3, __vt__26CLineExtraSpaceInstruction@ha /* 803031EC 0030014C 38 04 9A 6C */ addi r0, r4, __vt__12CInstruction@l @@ -1640,18 +1640,18 @@ __ct__26CLineExtraSpaceInstructionFi: /* 803031F4 00300154 38 03 D6 10 */ addi r0, r3, __vt__26CLineExtraSpaceInstruction@l /* 803031F8 00300158 90 1F 00 00 */ stw r0, 0(r31) /* 803031FC 0030015C 93 DF 00 04 */ stw r30, 4(r31) -lbl_80303200: +.L_80303200: /* 80303200 00300160 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80303204 00300164 38 60 00 08 */ li r3, 8 /* 80303208 00300168 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 8030320C 0030016C 38 A0 00 00 */ li r5, 0 /* 80303210 00300170 48 01 26 5D */ bl __nw__FUlPCcPCc /* 80303214 00300174 28 03 00 00 */ cmplwi r3, 0 -/* 80303218 00300178 41 82 00 10 */ beq lbl_80303228 +/* 80303218 00300178 41 82 00 10 */ beq .L_80303228 /* 8030321C 0030017C 93 E3 00 00 */ stw r31, 0(r3) /* 80303220 00300180 38 00 00 01 */ li r0, 1 /* 80303224 00300184 90 03 00 04 */ stw r0, 4(r3) -lbl_80303228: +.L_80303228: /* 80303228 00300188 90 61 00 0C */ stw r3, 0xc(r1) /* 8030322C 0030018C 7F A4 EB 78 */ mr r4, r29 /* 80303230 00300190 38 61 00 08 */ addi r3, r1, 8 @@ -1668,8 +1668,8 @@ lbl_80303228: /* 8030325C 003001BC 38 21 00 20 */ addi r1, r1, 0x20 /* 80303260 003001C0 4E 80 00 20 */ blr -.global __ct__23CLineSpacingInstructionFf -__ct__23CLineSpacingInstructionFf: +.global sub_80303264 +sub_80303264: /* 80303264 003001C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80303268 003001C8 7C 08 02 A6 */ mflr r0 /* 8030326C 003001CC 3C 80 80 3D */ lis r4, lbl_803D6E90@ha @@ -1684,7 +1684,7 @@ __ct__23CLineSpacingInstructionFf: /* 80303290 003001F0 38 60 00 08 */ li r3, 8 /* 80303294 003001F4 48 01 25 D9 */ bl __nw__FUlPCcPCc /* 80303298 003001F8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8030329C 003001FC 41 82 00 20 */ beq lbl_803032BC +/* 8030329C 003001FC 41 82 00 20 */ beq .L_803032BC /* 803032A0 00300200 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 803032A4 00300204 3C 60 80 3F */ lis r3, __vt__23CLineSpacingInstruction@ha /* 803032A8 00300208 38 04 9A 6C */ addi r0, r4, __vt__12CInstruction@l @@ -1692,18 +1692,18 @@ __ct__23CLineSpacingInstructionFf: /* 803032B0 00300210 38 03 D6 78 */ addi r0, r3, __vt__23CLineSpacingInstruction@l /* 803032B4 00300214 90 1F 00 00 */ stw r0, 0(r31) /* 803032B8 00300218 D3 FF 00 04 */ stfs f31, 4(r31) -lbl_803032BC: +.L_803032BC: /* 803032BC 0030021C 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 803032C0 00300220 38 60 00 08 */ li r3, 8 /* 803032C4 00300224 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 803032C8 00300228 38 A0 00 00 */ li r5, 0 /* 803032CC 0030022C 48 01 25 A1 */ bl __nw__FUlPCcPCc /* 803032D0 00300230 28 03 00 00 */ cmplwi r3, 0 -/* 803032D4 00300234 41 82 00 10 */ beq lbl_803032E4 +/* 803032D4 00300234 41 82 00 10 */ beq .L_803032E4 /* 803032D8 00300238 93 E3 00 00 */ stw r31, 0(r3) /* 803032DC 0030023C 38 00 00 01 */ li r0, 1 /* 803032E0 00300240 90 03 00 04 */ stw r0, 4(r3) -lbl_803032E4: +.L_803032E4: /* 803032E4 00300244 90 61 00 0C */ stw r3, 0xc(r1) /* 803032E8 00300248 7F C4 F3 78 */ mr r4, r30 /* 803032EC 0030024C 38 61 00 08 */ addi r3, r1, 8 @@ -1720,8 +1720,8 @@ lbl_803032E4: /* 80303318 00300278 38 21 00 20 */ addi r1, r1, 0x20 /* 8030331C 0030027C 4E 80 00 20 */ blr -.global __ct__31CRemoveColorOverrideInstructionFi -__ct__31CRemoveColorOverrideInstructionFi: +.global sub_80303320 +sub_80303320: /* 80303320 00300280 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80303324 00300284 7C 08 02 A6 */ mflr r0 /* 80303328 00300288 3C A0 80 3D */ lis r5, lbl_803D6E90@ha @@ -1737,7 +1737,7 @@ __ct__31CRemoveColorOverrideInstructionFi: /* 80303350 003002B0 38 60 00 08 */ li r3, 8 /* 80303354 003002B4 48 01 25 19 */ bl __nw__FUlPCcPCc /* 80303358 003002B8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8030335C 003002BC 41 82 00 20 */ beq lbl_8030337C +/* 8030335C 003002BC 41 82 00 20 */ beq .L_8030337C /* 80303360 003002C0 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 80303364 003002C4 3C 60 80 3F */ lis r3, __vt__31CRemoveColorOverrideInstruction@ha /* 80303368 003002C8 38 04 9A 6C */ addi r0, r4, __vt__12CInstruction@l @@ -1745,18 +1745,18 @@ __ct__31CRemoveColorOverrideInstructionFi: /* 80303370 003002D0 38 03 D6 D8 */ addi r0, r3, __vt__31CRemoveColorOverrideInstruction@l /* 80303374 003002D4 90 1F 00 00 */ stw r0, 0(r31) /* 80303378 003002D8 93 DF 00 04 */ stw r30, 4(r31) -lbl_8030337C: +.L_8030337C: /* 8030337C 003002DC 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80303380 003002E0 38 60 00 08 */ li r3, 8 /* 80303384 003002E4 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80303388 003002E8 38 A0 00 00 */ li r5, 0 /* 8030338C 003002EC 48 01 24 E1 */ bl __nw__FUlPCcPCc /* 80303390 003002F0 28 03 00 00 */ cmplwi r3, 0 -/* 80303394 003002F4 41 82 00 10 */ beq lbl_803033A4 +/* 80303394 003002F4 41 82 00 10 */ beq .L_803033A4 /* 80303398 003002F8 93 E3 00 00 */ stw r31, 0(r3) /* 8030339C 003002FC 38 00 00 01 */ li r0, 1 /* 803033A0 00300300 90 03 00 04 */ stw r0, 4(r3) -lbl_803033A4: +.L_803033A4: /* 803033A4 00300304 90 61 00 0C */ stw r3, 0xc(r1) /* 803033A8 00300308 7F A4 EB 78 */ mr r4, r29 /* 803033AC 0030030C 38 61 00 08 */ addi r3, r1, 8 @@ -1772,8 +1772,8 @@ lbl_803033A4: /* 803033D4 00300334 38 21 00 20 */ addi r1, r1, 0x20 /* 803033D8 00300338 4E 80 00 20 */ blr -.global __ct__25CColorOverrideInstructionFv -__ct__25CColorOverrideInstructionFv: +.global sub_803033DC +sub_803033DC: /* 803033DC 0030033C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803033E0 00300340 7C 08 02 A6 */ mflr r0 /* 803033E4 00300344 3C C0 80 3D */ lis r6, lbl_803D6E90@ha @@ -1791,7 +1791,7 @@ __ct__25CColorOverrideInstructionFv: /* 80303414 00300374 38 60 00 0C */ li r3, 0xc /* 80303418 00300378 48 01 24 55 */ bl __nw__FUlPCcPCc /* 8030341C 0030037C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80303420 00300380 41 82 00 40 */ beq lbl_80303460 +/* 80303420 00300380 41 82 00 40 */ beq .L_80303460 /* 80303424 00300384 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 80303428 00300388 3C 60 80 3F */ lis r3, __vt__25CColorOverrideInstruction@ha /* 8030342C 0030038C 38 04 9A 6C */ addi r0, r4, __vt__12CInstruction@l @@ -1807,18 +1807,18 @@ __ct__25CColorOverrideInstructionFv: /* 80303454 003003B4 98 1F 00 0A */ stb r0, 0xa(r31) /* 80303458 003003B8 88 1E 00 03 */ lbz r0, 3(r30) /* 8030345C 003003BC 98 1F 00 0B */ stb r0, 0xb(r31) -lbl_80303460: +.L_80303460: /* 80303460 003003C0 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80303464 003003C4 38 60 00 08 */ li r3, 8 /* 80303468 003003C8 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 8030346C 003003CC 38 A0 00 00 */ li r5, 0 /* 80303470 003003D0 48 01 23 FD */ bl __nw__FUlPCcPCc /* 80303474 003003D4 28 03 00 00 */ cmplwi r3, 0 -/* 80303478 003003D8 41 82 00 10 */ beq lbl_80303488 +/* 80303478 003003D8 41 82 00 10 */ beq .L_80303488 /* 8030347C 003003DC 93 E3 00 00 */ stw r31, 0(r3) /* 80303480 003003E0 38 00 00 01 */ li r0, 1 /* 80303484 003003E4 90 03 00 04 */ stw r0, 4(r3) -lbl_80303488: +.L_80303488: /* 80303488 003003E8 90 61 00 0C */ stw r3, 0xc(r1) /* 8030348C 003003EC 7F 84 E3 78 */ mr r4, r28 /* 80303490 003003F0 38 61 00 08 */ addi r3, r1, 8 @@ -1835,8 +1835,8 @@ lbl_80303488: /* 803034BC 0030041C 38 21 00 20 */ addi r1, r1, 0x20 /* 803034C0 00300420 4E 80 00 20 */ blr -.global __ct__17CColorInstructionFiRC6CColor -__ct__17CColorInstructionFiRC6CColor: +.global sub_803034C4 +sub_803034C4: /* 803034C4 00300424 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803034C8 00300428 7C 08 02 A6 */ mflr r0 /* 803034CC 0030042C 3C C0 80 3D */ lis r6, lbl_803D6E90@ha @@ -1854,7 +1854,7 @@ __ct__17CColorInstructionFiRC6CColor: /* 803034FC 0030045C 38 60 00 0C */ li r3, 0xc /* 80303500 00300460 48 01 23 6D */ bl __nw__FUlPCcPCc /* 80303504 00300464 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80303508 00300468 41 82 00 40 */ beq lbl_80303548 +/* 80303508 00300468 41 82 00 40 */ beq .L_80303548 /* 8030350C 0030046C 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 80303510 00300470 3C 60 80 3F */ lis r3, __vt__17CColorInstruction@ha /* 80303514 00300474 38 04 9A 6C */ addi r0, r4, __vt__12CInstruction@l @@ -1870,18 +1870,18 @@ __ct__17CColorInstructionFiRC6CColor: /* 8030353C 0030049C 98 1F 00 0A */ stb r0, 0xa(r31) /* 80303540 003004A0 88 1E 00 03 */ lbz r0, 3(r30) /* 80303544 003004A4 98 1F 00 0B */ stb r0, 0xb(r31) -lbl_80303548: +.L_80303548: /* 80303548 003004A8 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 8030354C 003004AC 38 60 00 08 */ li r3, 8 /* 80303550 003004B0 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80303554 003004B4 38 A0 00 00 */ li r5, 0 /* 80303558 003004B8 48 01 23 15 */ bl __nw__FUlPCcPCc /* 8030355C 003004BC 28 03 00 00 */ cmplwi r3, 0 -/* 80303560 003004C0 41 82 00 10 */ beq lbl_80303570 +/* 80303560 003004C0 41 82 00 10 */ beq .L_80303570 /* 80303564 003004C4 93 E3 00 00 */ stw r31, 0(r3) /* 80303568 003004C8 38 00 00 01 */ li r0, 1 /* 8030356C 003004CC 90 03 00 04 */ stw r0, 4(r3) -lbl_80303570: +.L_80303570: /* 80303570 003004D0 90 61 00 0C */ stw r3, 0xc(r1) /* 80303574 003004D4 7F 84 E3 78 */ mr r4, r28 /* 80303578 003004D8 38 61 00 08 */ addi r3, r1, 8 @@ -1911,19 +1911,19 @@ AddImage__18CTextExecuteBufferFRC13CFontImageDef: /* 803035CC 0030052C 93 81 00 60 */ stw r28, 0x60(r1) /* 803035D0 00300530 80 03 00 A4 */ lwz r0, 0xa4(r3) /* 803035D4 00300534 28 00 00 00 */ cmplwi r0, 0 -/* 803035D8 00300538 40 82 00 08 */ bne lbl_803035E0 +/* 803035D8 00300538 40 82 00 08 */ bne .L_803035E0 /* 803035DC 0030053C 4B FF F6 9D */ bl StartNewLine__18CTextExecuteBufferFv -lbl_803035E0: +.L_803035E0: /* 803035E0 00300540 80 1E 00 A0 */ lwz r0, 0xa0(r30) /* 803035E4 00300544 28 00 00 00 */ cmplwi r0, 0 -/* 803035E8 00300548 41 82 02 94 */ beq lbl_8030387C +/* 803035E8 00300548 41 82 02 94 */ beq .L_8030387C /* 803035EC 0030054C 7F E3 FB 78 */ mr r3, r31 /* 803035F0 00300550 48 05 5F 05 */ bl IsLoaded__13CFontImageDefCFv /* 803035F4 00300554 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 803035F8 00300558 41 82 02 84 */ beq lbl_8030387C +/* 803035F8 00300558 41 82 02 84 */ beq .L_8030387C /* 803035FC 0030055C 88 7E 00 94 */ lbz r3, 0x94(r30) /* 80303600 00300560 28 03 00 00 */ cmplwi r3, 0 -/* 80303604 00300564 41 82 00 84 */ beq lbl_80303688 +/* 80303604 00300564 41 82 00 84 */ beq .L_80303688 /* 80303608 00300568 80 BE 00 A4 */ lwz r5, 0xa4(r30) /* 8030360C 0030056C 38 61 00 20 */ addi r3, r1, 0x20 /* 80303610 00300570 80 9F 00 10 */ lwz r4, 0x10(r31) @@ -1956,9 +1956,9 @@ lbl_803035E0: /* 8030367C 003005DC 7C 00 20 38 */ and r0, r0, r4 /* 80303680 003005E0 7C 00 18 50 */ subf r0, r0, r3 /* 80303684 003005E4 54 03 0F FE */ srwi r3, r0, 0x1f -lbl_80303688: +.L_80303688: /* 80303688 003005E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8030368C 003005EC 41 82 00 24 */ beq lbl_803036B0 +/* 8030368C 003005EC 41 82 00 24 */ beq .L_803036B0 /* 80303690 003005F0 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 80303694 003005F4 38 00 00 01 */ li r0, 1 /* 80303698 003005F8 80 83 00 04 */ lwz r4, 4(r3) @@ -1967,12 +1967,12 @@ lbl_80303688: /* 803036A4 00300604 7C 00 20 38 */ and r0, r0, r4 /* 803036A8 00300608 7C 00 18 50 */ subf r0, r0, r3 /* 803036AC 0030060C 54 03 0F FE */ srwi r3, r0, 0x1f -lbl_803036B0: +.L_803036B0: /* 803036B0 00300610 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 803036B4 00300614 41 82 00 0C */ beq lbl_803036C0 +/* 803036B4 00300614 41 82 00 0C */ beq .L_803036C0 /* 803036B8 00300618 7F C3 F3 78 */ mr r3, r30 /* 803036BC 0030061C 4B FF F5 BD */ bl StartNewLine__18CTextExecuteBufferFv -lbl_803036C0: +.L_803036C0: /* 803036C0 00300620 80 9F 00 10 */ lwz r4, 0x10(r31) /* 803036C4 00300624 38 61 00 30 */ addi r3, r1, 0x30 /* 803036C8 00300628 48 03 D7 E1 */ bl __ct__6CTokenFRC6CToken @@ -2027,7 +2027,7 @@ lbl_803036C0: /* 8030378C 003006EC 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 80303790 003006F0 80 03 00 14 */ lwz r0, 0x14(r3) /* 80303794 003006F4 2C 00 00 00 */ cmpwi r0, 0 -/* 80303798 003006F8 40 82 00 E4 */ bne lbl_8030387C +/* 80303798 003006F8 40 82 00 E4 */ bne .L_8030387C /* 8030379C 003006FC 80 9F 00 10 */ lwz r4, 0x10(r31) /* 803037A0 00300700 38 61 00 10 */ addi r3, r1, 0x10 /* 803037A4 00300704 48 03 D7 05 */ bl __ct__6CTokenFRC6CToken @@ -2079,34 +2079,34 @@ lbl_803036C0: /* 8030385C 003007BC 83 A1 00 3C */ lwz r29, 0x3c(r1) /* 80303860 003007C0 48 03 D5 E1 */ bl __dt__6CTokenFv /* 80303864 003007C4 7C 1C E8 00 */ cmpw r28, r29 -/* 80303868 003007C8 40 81 00 14 */ ble lbl_8030387C +/* 80303868 003007C8 40 81 00 14 */ ble .L_8030387C /* 8030386C 003007CC 80 9E 00 A4 */ lwz r4, 0xa4(r30) /* 80303870 003007D0 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 80303874 003007D4 80 04 00 08 */ lwz r0, 8(r4) /* 80303878 003007D8 90 03 00 2C */ stw r0, 0x2c(r3) -lbl_8030387C: +.L_8030387C: /* 8030387C 003007DC 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80303880 003007E0 38 60 00 20 */ li r3, 0x20 /* 80303884 003007E4 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80303888 003007E8 38 A0 00 00 */ li r5, 0 /* 8030388C 003007EC 48 01 1F E1 */ bl __nw__FUlPCcPCc /* 80303890 003007F0 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80303894 003007F4 41 82 00 10 */ beq lbl_803038A4 +/* 80303894 003007F4 41 82 00 10 */ beq .L_803038A4 /* 80303898 003007F8 7F E4 FB 78 */ mr r4, r31 /* 8030389C 003007FC 48 00 00 6D */ bl __ct__17CImageInstructionFRC13CFontImageDef /* 803038A0 00300800 7C 7C 1B 78 */ mr r28, r3 -lbl_803038A4: +.L_803038A4: /* 803038A4 00300804 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 803038A8 00300808 38 60 00 08 */ li r3, 8 /* 803038AC 0030080C 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 803038B0 00300810 38 A0 00 00 */ li r5, 0 /* 803038B4 00300814 48 01 1F B9 */ bl __nw__FUlPCcPCc /* 803038B8 00300818 28 03 00 00 */ cmplwi r3, 0 -/* 803038BC 0030081C 41 82 00 10 */ beq lbl_803038CC +/* 803038BC 0030081C 41 82 00 10 */ beq .L_803038CC /* 803038C0 00300820 93 83 00 00 */ stw r28, 0(r3) /* 803038C4 00300824 38 00 00 01 */ li r0, 1 /* 803038C8 00300828 90 03 00 04 */ stw r0, 4(r3) -lbl_803038CC: +.L_803038CC: /* 803038CC 0030082C 90 61 00 0C */ stw r3, 0xc(r1) /* 803038D0 00300830 7F C4 F3 78 */ mr r4, r30 /* 803038D4 00300834 38 61 00 08 */ addi r3, r1, 8 @@ -2160,7 +2160,7 @@ __ct__17CImageInstructionFRC13CFontImageDef: /* 8030397C 003008DC 38 60 00 0C */ li r3, 0xc /* 80303980 003008E0 48 01 1E ED */ bl __nw__FUlPCcPCc /* 80303984 003008E4 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80303988 003008E8 41 82 00 34 */ beq lbl_803039BC +/* 80303988 003008E8 41 82 00 34 */ beq .L_803039BC /* 8030398C 003008EC 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 80303990 003008F0 3C 60 80 3F */ lis r3, lbl_803ED5F0@ha /* 80303994 003008F4 38 04 9A 6C */ addi r0, r4, __vt__12CInstruction@l @@ -2173,18 +2173,18 @@ __ct__17CImageInstructionFRC13CFontImageDef: /* 803039B0 00300910 48 03 D4 F9 */ bl __ct__6CTokenFRC6CToken /* 803039B4 00300914 38 7B 00 04 */ addi r3, r27, 4 /* 803039B8 00300918 48 03 D3 CD */ bl Lock__6CTokenFv -lbl_803039BC: +.L_803039BC: /* 803039BC 0030091C 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 803039C0 00300920 38 60 00 08 */ li r3, 8 /* 803039C4 00300924 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 803039C8 00300928 38 A0 00 00 */ li r5, 0 /* 803039CC 0030092C 48 01 1E A1 */ bl __nw__FUlPCcPCc /* 803039D0 00300930 28 03 00 00 */ cmplwi r3, 0 -/* 803039D4 00300934 41 82 00 10 */ beq lbl_803039E4 +/* 803039D4 00300934 41 82 00 10 */ beq .L_803039E4 /* 803039D8 00300938 93 A3 00 00 */ stw r29, 0(r3) /* 803039DC 0030093C 38 00 00 01 */ li r0, 1 /* 803039E0 00300940 90 03 00 04 */ stw r0, 4(r3) -lbl_803039E4: +.L_803039E4: /* 803039E4 00300944 90 61 00 0C */ stw r3, 0xc(r1) /* 803039E8 00300948 7F E4 FB 78 */ mr r4, r31 /* 803039EC 0030094C 38 61 00 08 */ addi r3, r1, 8 @@ -2192,27 +2192,27 @@ lbl_803039E4: /* 803039F4 00300954 4B FF EF 35 */ bl sub_80302928 /* 803039F8 00300958 88 1F 00 68 */ lbz r0, 0x68(r31) /* 803039FC 0030095C 28 00 00 00 */ cmplwi r0, 0 -/* 80303A00 00300960 40 82 00 20 */ bne lbl_80303A20 +/* 80303A00 00300960 40 82 00 20 */ bne .L_80303A20 /* 80303A04 00300964 34 7F 00 60 */ addic. r3, r31, 0x60 -/* 80303A08 00300968 41 82 00 0C */ beq lbl_80303A14 +/* 80303A08 00300968 41 82 00 0C */ beq .L_80303A14 /* 80303A0C 0030096C 7F 44 D3 78 */ mr r4, r26 /* 80303A10 00300970 48 03 D4 99 */ bl __ct__6CTokenFRC6CToken -lbl_80303A14: +.L_80303A14: /* 80303A14 00300974 38 00 00 01 */ li r0, 1 /* 80303A18 00300978 98 1F 00 68 */ stb r0, 0x68(r31) -/* 80303A1C 0030097C 48 00 00 10 */ b lbl_80303A2C -lbl_80303A20: +/* 80303A1C 0030097C 48 00 00 10 */ b .L_80303A2C +.L_80303A20: /* 80303A20 00300980 7F 44 D3 78 */ mr r4, r26 /* 80303A24 00300984 38 7F 00 60 */ addi r3, r31, 0x60 /* 80303A28 00300988 48 03 D2 9D */ bl __as__6CTokenFRC6CToken -lbl_80303A2C: +.L_80303A2C: /* 80303A2C 0030098C 80 7A 00 00 */ lwz r3, 0(r26) /* 80303A30 00300990 80 03 00 10 */ lwz r0, 0x10(r3) /* 80303A34 00300994 28 00 00 00 */ cmplwi r0, 0 -/* 80303A38 00300998 41 82 00 D4 */ beq lbl_80303B0C +/* 80303A38 00300998 41 82 00 D4 */ beq .L_80303B0C /* 80303A3C 0030099C 80 1F 00 A0 */ lwz r0, 0xa0(r31) /* 80303A40 003009A0 28 00 00 00 */ cmplwi r0, 0 -/* 80303A44 003009A4 41 82 00 60 */ beq lbl_80303AA4 +/* 80303A44 003009A4 41 82 00 60 */ beq .L_80303AA4 /* 80303A48 003009A8 3B 5F 00 60 */ addi r26, r31, 0x60 /* 80303A4C 003009AC 7F 43 D3 78 */ mr r3, r26 /* 80303A50 003009B0 48 03 D3 BD */ bl GetObj__6CTokenFv @@ -2236,10 +2236,10 @@ lbl_80303A2C: /* 80303A98 003009F8 7F A5 EB 78 */ mr r5, r29 /* 80303A9C 003009FC 7F C6 F3 78 */ mr r6, r30 /* 80303AA0 00300A00 48 00 23 C1 */ bl TestLargestFont__17CBlockInstructionFiii -lbl_80303AA4: +.L_80303AA4: /* 80303AA4 00300A04 80 1F 00 A4 */ lwz r0, 0xa4(r31) /* 80303AA8 00300A08 28 00 00 00 */ cmplwi r0, 0 -/* 80303AAC 00300A0C 41 82 00 60 */ beq lbl_80303B0C +/* 80303AAC 00300A0C 41 82 00 60 */ beq .L_80303B0C /* 80303AB0 00300A10 3B 5F 00 60 */ addi r26, r31, 0x60 /* 80303AB4 00300A14 7F 43 D3 78 */ mr r3, r26 /* 80303AB8 00300A18 48 03 D3 55 */ bl GetObj__6CTokenFv @@ -2263,7 +2263,7 @@ lbl_80303AA4: /* 80303B00 00300A60 7F C5 F3 78 */ mr r5, r30 /* 80303B04 00300A64 7F A6 EB 78 */ mr r6, r29 /* 80303B08 00300A68 4B FF BE 9D */ bl TestLargestFont__16CLineInstructionFiii -lbl_80303B0C: +.L_80303B0C: /* 80303B0C 00300A6C 38 61 00 0C */ addi r3, r1, 0xc /* 80303B10 00300A70 4B D2 58 FD */ bl sub_8002940c /* 80303B14 00300A74 BB 41 00 18 */ lmw r26, 0x18(r1) @@ -2281,9 +2281,9 @@ EndBlock__18CTextExecuteBufferFv: /* 80303B38 00300A98 7C 7F 1B 78 */ mr r31, r3 /* 80303B3C 00300A9C 80 03 00 A4 */ lwz r0, 0xa4(r3) /* 80303B40 00300AA0 28 00 00 00 */ cmplwi r0, 0 -/* 80303B44 00300AA4 41 82 00 08 */ beq lbl_80303B4C +/* 80303B44 00300AA4 41 82 00 08 */ beq .L_80303B4C /* 80303B48 00300AA8 4B FF F3 59 */ bl TerminateLine__18CTextExecuteBufferFv -lbl_80303B4C: +.L_80303B4C: /* 80303B4C 00300AAC 38 00 00 00 */ li r0, 0 /* 80303B50 00300AB0 90 1F 00 A4 */ stw r0, 0xa4(r31) /* 80303B54 00300AB4 90 1F 00 A0 */ stw r0, 0xa0(r31) @@ -2315,7 +2315,7 @@ BeginBlock__18CTextExecuteBufferFiiiib14ETextDirection14EJustification22EVertica /* 80303BB0 00300B10 99 1C 00 C0 */ stb r8, 0xc0(r28) /* 80303BB4 00300B14 48 01 1C B9 */ bl __nw__FUlPCcPCc /* 80303BB8 00300B18 7C 7A 1B 79 */ or. r26, r3, r3 -/* 80303BBC 00300B1C 41 82 00 54 */ beq lbl_80303C10 +/* 80303BBC 00300B1C 41 82 00 54 */ beq .L_80303C10 /* 80303BC0 00300B20 3C 80 80 3E */ lis r4, __vt__12CInstruction@ha /* 80303BC4 00300B24 3C 60 80 3F */ lis r3, lbl_803ED8C8@ha /* 80303BC8 00300B28 38 84 9A 6C */ addi r4, r4, __vt__12CInstruction@l @@ -2336,25 +2336,25 @@ BeginBlock__18CTextExecuteBufferFiiiib14ETextDirection14EJustification22EVertica /* 80303C04 00300B64 90 1A 00 2C */ stw r0, 0x2c(r26) /* 80303C08 00300B68 90 1A 00 30 */ stw r0, 0x30(r26) /* 80303C0C 00300B6C 90 1A 00 34 */ stw r0, 0x34(r26) -lbl_80303C10: +.L_80303C10: /* 80303C10 00300B70 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 80303C14 00300B74 38 60 00 08 */ li r3, 8 /* 80303C18 00300B78 38 84 6E 90 */ addi r4, r4, lbl_803D6E90@l /* 80303C1C 00300B7C 38 A0 00 00 */ li r5, 0 /* 80303C20 00300B80 48 01 1C 4D */ bl __nw__FUlPCcPCc /* 80303C24 00300B84 28 03 00 00 */ cmplwi r3, 0 -/* 80303C28 00300B88 41 82 00 10 */ beq lbl_80303C38 +/* 80303C28 00300B88 41 82 00 10 */ beq .L_80303C38 /* 80303C2C 00300B8C 93 43 00 00 */ stw r26, 0(r3) /* 80303C30 00300B90 38 00 00 01 */ li r0, 1 /* 80303C34 00300B94 90 03 00 04 */ stw r0, 4(r3) -lbl_80303C38: +.L_80303C38: /* 80303C38 00300B98 90 61 00 0C */ stw r3, 0xc(r1) /* 80303C3C 00300B9C 80 03 00 00 */ lwz r0, 0(r3) /* 80303C40 00300BA0 38 7C 00 18 */ addi r3, r28, 0x18 /* 80303C44 00300BA4 90 1C 00 A0 */ stw r0, 0xa0(r28) /* 80303C48 00300BA8 4B FF DC B1 */ bl IsFinishedLoading__14CSaveableStateFv /* 80303C4C 00300BAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80303C50 00300BB0 41 82 00 60 */ beq lbl_80303CB0 +/* 80303C50 00300BB0 41 82 00 60 */ beq .L_80303CB0 /* 80303C54 00300BB4 3B 3C 00 60 */ addi r25, r28, 0x60 /* 80303C58 00300BB8 7F 23 CB 78 */ mr r3, r25 /* 80303C5C 00300BBC 48 03 D1 B1 */ bl GetObj__6CTokenFv @@ -2378,7 +2378,7 @@ lbl_80303C38: /* 80303CA4 00300C04 7F 65 DB 78 */ mr r5, r27 /* 80303CA8 00300C08 7F 46 D3 78 */ mr r6, r26 /* 80303CAC 00300C0C 48 00 21 B5 */ bl TestLargestFont__17CBlockInstructionFiii -lbl_80303CB0: +.L_80303CB0: /* 80303CB0 00300C10 7F 84 E3 78 */ mr r4, r28 /* 80303CB4 00300C14 38 61 00 08 */ addi r3, r1, 8 /* 80303CB8 00300C18 38 A1 00 0C */ addi r5, r1, 0xc @@ -2404,14 +2404,14 @@ Clear__18CTextExecuteBufferFv: /* 80303CFC 00300C5C 7C 7E 1B 78 */ mr r30, r3 /* 80303D00 00300C60 83 E3 00 08 */ lwz r31, 8(r3) /* 80303D04 00300C64 80 83 00 04 */ lwz r4, 4(r3) -/* 80303D08 00300C68 48 00 00 10 */ b lbl_80303D18 -lbl_80303D0C: +/* 80303D08 00300C68 48 00 00 10 */ b .L_80303D18 +.L_80303D0C: /* 80303D0C 00300C6C 7F C3 F3 78 */ mr r3, r30 /* 80303D10 00300C70 48 00 02 B9 */ bl sub_80303fc8 /* 80303D14 00300C74 7C 64 1B 78 */ mr r4, r3 -lbl_80303D18: +.L_80303D18: /* 80303D18 00300C78 7C 04 F8 40 */ cmplw r4, r31 -/* 80303D1C 00300C7C 40 82 FF F0 */ bne lbl_80303D0C +/* 80303D1C 00300C7C 40 82 FF F0 */ bne .L_80303D0C /* 80303D20 00300C80 38 61 00 08 */ addi r3, r1, 8 /* 80303D24 00300C84 4B FF DC 5D */ bl __ct__14CSaveableStateFv /* 80303D28 00300C88 38 7E 00 18 */ addi r3, r30, 0x18 @@ -2510,18 +2510,18 @@ sub_80303e48: .global sub_80303e74 sub_80303e74: /* 80303E74 00300DD4 2C 04 00 00 */ cmpwi r4, 0 -/* 80303E78 00300DD8 40 81 00 B8 */ ble lbl_80303F30 +/* 80303E78 00300DD8 40 81 00 B8 */ ble .L_80303F30 /* 80303E7C 00300DDC 38 C0 00 00 */ li r6, 0 /* 80303E80 00300DE0 4C 81 00 20 */ blelr /* 80303E84 00300DE4 2C 04 00 08 */ cmpwi r4, 8 /* 80303E88 00300DE8 38 A4 FF F8 */ addi r5, r4, -8 -/* 80303E8C 00300DEC 40 81 00 80 */ ble lbl_80303F0C +/* 80303E8C 00300DEC 40 81 00 80 */ ble .L_80303F0C /* 80303E90 00300DF0 38 05 00 07 */ addi r0, r5, 7 /* 80303E94 00300DF4 54 00 E8 FE */ srwi r0, r0, 3 /* 80303E98 00300DF8 7C 09 03 A6 */ mtctr r0 /* 80303E9C 00300DFC 2C 05 00 00 */ cmpwi r5, 0 -/* 80303EA0 00300E00 40 81 00 6C */ ble lbl_80303F0C -lbl_80303EA4: +/* 80303EA0 00300E00 40 81 00 6C */ ble .L_80303F0C +.L_80303EA4: /* 80303EA4 00300E04 80 A3 00 00 */ lwz r5, 0(r3) /* 80303EA8 00300E08 38 C6 00 08 */ addi r6, r6, 8 /* 80303EAC 00300E0C 80 05 00 04 */ lwz r0, 4(r5) @@ -2547,25 +2547,25 @@ lbl_80303EA4: /* 80303EFC 00300E5C 80 A3 00 00 */ lwz r5, 0(r3) /* 80303F00 00300E60 80 05 00 04 */ lwz r0, 4(r5) /* 80303F04 00300E64 90 03 00 00 */ stw r0, 0(r3) -/* 80303F08 00300E68 42 00 FF 9C */ bdnz lbl_80303EA4 -lbl_80303F0C: +/* 80303F08 00300E68 42 00 FF 9C */ bdnz .L_80303EA4 +.L_80303F0C: /* 80303F0C 00300E6C 7C 06 20 50 */ subf r0, r6, r4 /* 80303F10 00300E70 7C 09 03 A6 */ mtctr r0 /* 80303F14 00300E74 7C 06 20 00 */ cmpw r6, r4 /* 80303F18 00300E78 4C 80 00 20 */ bgelr -lbl_80303F1C: +.L_80303F1C: /* 80303F1C 00300E7C 80 83 00 00 */ lwz r4, 0(r3) /* 80303F20 00300E80 80 04 00 04 */ lwz r0, 4(r4) /* 80303F24 00300E84 90 03 00 00 */ stw r0, 0(r3) -/* 80303F28 00300E88 42 00 FF F4 */ bdnz lbl_80303F1C +/* 80303F28 00300E88 42 00 FF F4 */ bdnz .L_80303F1C /* 80303F2C 00300E8C 4E 80 00 20 */ blr -lbl_80303F30: +.L_80303F30: /* 80303F30 00300E90 7C 84 00 D0 */ neg r4, r4 /* 80303F34 00300E94 4C 80 00 20 */ bgelr /* 80303F38 00300E98 54 80 E8 FF */ rlwinm. r0, r4, 0x1d, 3, 0x1f /* 80303F3C 00300E9C 7C 09 03 A6 */ mtctr r0 -/* 80303F40 00300EA0 41 82 00 70 */ beq lbl_80303FB0 -lbl_80303F44: +/* 80303F40 00300EA0 41 82 00 70 */ beq .L_80303FB0 +.L_80303F44: /* 80303F44 00300EA4 80 A3 00 00 */ lwz r5, 0(r3) /* 80303F48 00300EA8 80 05 00 00 */ lwz r0, 0(r5) /* 80303F4C 00300EAC 90 03 00 00 */ stw r0, 0(r3) @@ -2590,16 +2590,16 @@ lbl_80303F44: /* 80303F98 00300EF8 80 A3 00 00 */ lwz r5, 0(r3) /* 80303F9C 00300EFC 80 05 00 00 */ lwz r0, 0(r5) /* 80303FA0 00300F00 90 03 00 00 */ stw r0, 0(r3) -/* 80303FA4 00300F04 42 00 FF A0 */ bdnz lbl_80303F44 +/* 80303FA4 00300F04 42 00 FF A0 */ bdnz .L_80303F44 /* 80303FA8 00300F08 70 84 00 07 */ andi. r4, r4, 7 /* 80303FAC 00300F0C 4D 82 00 20 */ beqlr -lbl_80303FB0: +.L_80303FB0: /* 80303FB0 00300F10 7C 89 03 A6 */ mtctr r4 -lbl_80303FB4: +.L_80303FB4: /* 80303FB4 00300F14 80 A3 00 00 */ lwz r5, 0(r3) /* 80303FB8 00300F18 80 05 00 00 */ lwz r0, 0(r5) /* 80303FBC 00300F1C 90 03 00 00 */ stw r0, 0(r3) -/* 80303FC0 00300F20 42 00 FF F4 */ bdnz lbl_80303FB4 +/* 80303FC0 00300F20 42 00 FF F4 */ bdnz .L_80303FB4 /* 80303FC4 00300F24 4E 80 00 20 */ blr .global sub_80303fc8 @@ -2615,9 +2615,9 @@ sub_80303fc8: /* 80303FE8 00300F48 80 03 00 04 */ lwz r0, 4(r3) /* 80303FEC 00300F4C 83 E4 00 04 */ lwz r31, 4(r4) /* 80303FF0 00300F50 7C 1E 00 40 */ cmplw r30, r0 -/* 80303FF4 00300F54 40 82 00 08 */ bne lbl_80303FFC +/* 80303FF4 00300F54 40 82 00 08 */ bne .L_80303FFC /* 80303FF8 00300F58 93 FD 00 04 */ stw r31, 4(r29) -lbl_80303FFC: +.L_80303FFC: /* 80303FFC 00300F5C 80 1E 00 04 */ lwz r0, 4(r30) /* 80304000 00300F60 34 7E 00 08 */ addic. r3, r30, 8 /* 80304004 00300F64 80 9E 00 00 */ lwz r4, 0(r30) @@ -2625,16 +2625,16 @@ lbl_80303FFC: /* 8030400C 00300F6C 80 1E 00 00 */ lwz r0, 0(r30) /* 80304010 00300F70 80 9E 00 04 */ lwz r4, 4(r30) /* 80304014 00300F74 90 04 00 00 */ stw r0, 0(r4) -/* 80304018 00300F78 41 82 00 10 */ beq lbl_80304028 +/* 80304018 00300F78 41 82 00 10 */ beq .L_80304028 /* 8030401C 00300F7C 28 03 00 00 */ cmplwi r3, 0 -/* 80304020 00300F80 41 82 00 08 */ beq lbl_80304028 +/* 80304020 00300F80 41 82 00 08 */ beq .L_80304028 /* 80304024 00300F84 4B D2 53 E9 */ bl sub_8002940c -lbl_80304028: +.L_80304028: /* 80304028 00300F88 28 1E 00 00 */ cmplwi r30, 0 -/* 8030402C 00300F8C 41 82 00 0C */ beq lbl_80304038 +/* 8030402C 00300F8C 41 82 00 0C */ beq .L_80304038 /* 80304030 00300F90 7F C3 F3 78 */ mr r3, r30 /* 80304034 00300F94 48 01 18 FD */ bl Free__7CMemoryFPCv -lbl_80304038: +.L_80304038: /* 80304038 00300F98 80 9D 00 14 */ lwz r4, 0x14(r29) /* 8030403C 00300F9C 7F E3 FB 78 */ mr r3, r31 /* 80304040 00300FA0 38 04 FF FF */ addi r0, r4, -1 diff --git a/asm/Kyoto/Text/CTextParser.s b/asm/Kyoto/Text/CTextParser.s index 1141fc47..da8792b8 100644 --- a/asm/Kyoto/Text/CTextParser.s +++ b/asm/Kyoto/Text/CTextParser.s @@ -333,7 +333,7 @@ lbl_803046C4: /* 803046F8 00301658 7F A3 EB 78 */ mr r3, r29 /* 803046FC 0030165C 38 A1 00 18 */ addi r5, r1, 0x18 /* 80304700 00301660 38 80 00 03 */ li r4, 3 -/* 80304704 00301664 4B FF ED C1 */ bl __ct__17CColorInstructionFiRC6CColor +/* 80304704 00301664 4B FF ED C1 */ bl sub_803034C4 /* 80304708 00301668 48 00 05 88 */ b lbl_80304C90 lbl_8030470C: /* 8030470C 0030166C 3C 80 80 3F */ lis r4, lbl_803ED718@ha @@ -352,7 +352,7 @@ lbl_8030470C: /* 80304740 003016A0 7F A3 EB 78 */ mr r3, r29 /* 80304744 003016A4 38 A1 00 14 */ addi r5, r1, 0x14 /* 80304748 003016A8 38 80 00 00 */ li r4, 0 -/* 8030474C 003016AC 4B FF ED 79 */ bl __ct__17CColorInstructionFiRC6CColor +/* 8030474C 003016AC 4B FF ED 79 */ bl sub_803034C4 /* 80304750 003016B0 48 00 05 40 */ b lbl_80304C90 lbl_80304754: /* 80304754 003016B4 3C 80 80 3F */ lis r4, lbl_803ED718@ha @@ -371,7 +371,7 @@ lbl_80304754: /* 80304788 003016E8 7F A3 EB 78 */ mr r3, r29 /* 8030478C 003016EC 38 A1 00 10 */ addi r5, r1, 0x10 /* 80304790 003016F0 38 80 00 02 */ li r4, 2 -/* 80304794 003016F4 4B FF ED 31 */ bl __ct__17CColorInstructionFiRC6CColor +/* 80304794 003016F4 4B FF ED 31 */ bl sub_803034C4 /* 80304798 003016F8 48 00 04 F8 */ b lbl_80304C90 lbl_8030479C: /* 8030479C 003016FC 3C 80 80 3F */ lis r4, lbl_803ED718@ha @@ -390,7 +390,7 @@ lbl_8030479C: /* 803047D0 00301730 7F A3 EB 78 */ mr r3, r29 /* 803047D4 00301734 38 A1 00 0C */ addi r5, r1, 0xc /* 803047D8 00301738 38 80 00 01 */ li r4, 1 -/* 803047DC 0030173C 4B FF EC E9 */ bl __ct__17CColorInstructionFiRC6CColor +/* 803047DC 0030173C 4B FF EC E9 */ bl sub_803034C4 /* 803047E0 00301740 48 00 04 B0 */ b lbl_80304C90 lbl_803047E4: /* 803047E4 00301744 3C 80 80 3F */ lis r4, lbl_803ED718@ha @@ -431,7 +431,7 @@ lbl_8030484C: /* 80304868 003017C8 41 82 00 14 */ beq lbl_8030487C /* 8030486C 003017CC 7F A3 EB 78 */ mr r3, r29 /* 80304870 003017D0 7F 64 DB 78 */ mr r4, r27 -/* 80304874 003017D4 4B FF EA AD */ bl __ct__31CRemoveColorOverrideInstructionFi +/* 80304874 003017D4 4B FF EA AD */ bl sub_80303320 /* 80304878 003017D8 48 00 04 18 */ b lbl_80304C90 lbl_8030487C: /* 8030487C 003017DC 7F 84 E3 78 */ mr r4, r28 @@ -442,7 +442,7 @@ lbl_8030487C: /* 80304890 003017F0 7F A3 EB 78 */ mr r3, r29 /* 80304894 003017F4 7F 64 DB 78 */ mr r4, r27 /* 80304898 003017F8 38 A1 00 08 */ addi r5, r1, 8 -/* 8030489C 003017FC 4B FF EB 41 */ bl __ct__25CColorOverrideInstructionFv +/* 8030489C 003017FC 4B FF EB 41 */ bl sub_803033DC /* 803048A0 00301800 48 00 03 F0 */ b lbl_80304C90 lbl_803048A4: /* 803048A4 00301804 3C 80 80 3F */ lis r4, lbl_803ED718@ha @@ -467,7 +467,7 @@ lbl_803048A4: /* 803048F0 00301850 C8 21 00 68 */ lfd f1, 0x68(r1) /* 803048F4 00301854 EC 21 10 28 */ fsubs f1, f1, f2 /* 803048F8 00301858 EC 21 00 24 */ fdivs f1, f1, f0 -/* 803048FC 0030185C 4B FF E9 69 */ bl __ct__23CLineSpacingInstructionFf +/* 803048FC 0030185C 4B FF E9 69 */ bl sub_80303264 /* 80304900 00301860 48 00 03 90 */ b lbl_80304C90 lbl_80304904: /* 80304904 00301864 3C 80 80 3F */ lis r4, lbl_803ED718@ha @@ -484,7 +484,7 @@ lbl_80304904: /* 80304930 00301890 4B FF FA E9 */ bl ParseInt__11CTextParserFPCwib /* 80304934 00301894 7C 64 1B 78 */ mr r4, r3 /* 80304938 00301898 7F A3 EB 78 */ mr r3, r29 -/* 8030493C 0030189C 4B FF E8 69 */ bl __ct__26CLineExtraSpaceInstructionFi +/* 8030493C 0030189C 4B FF E8 69 */ bl sub_803031A4 /* 80304940 003018A0 48 00 03 50 */ b lbl_80304C90 lbl_80304944: /* 80304944 003018A4 3C 80 80 3F */ lis r4, lbl_803ED718@ha diff --git a/asm/MetroidPrime/CSplashScreen.s b/asm/MetroidPrime/CSplashScreen.s index a4c0261d..ed8e1768 100644 --- a/asm/MetroidPrime/CSplashScreen.s +++ b/asm/MetroidPrime/CSplashScreen.s @@ -465,7 +465,7 @@ lbl_800285EC: /* 800286CC 0002562C 98 C1 00 18 */ stb r6, 0x18(r1) /* 800286D0 00025630 98 C1 00 19 */ stb r6, 0x19(r1) /* 800286D4 00025634 98 C1 00 1A */ stb r6, 0x1a(r1) -/* 800286D8 00025638 48 2D AD ED */ bl __ct__17CColorInstructionFiRC6CColor +/* 800286D8 00025638 48 2D AD ED */ bl sub_803034C4 /* 800286DC 0002563C 80 1E 00 20 */ lwz r0, 0x20(r30) /* 800286E0 00025640 2C 00 00 01 */ cmpwi r0, 1 /* 800286E4 00025644 40 82 00 DC */ bne lbl_800287C0 @@ -492,7 +492,7 @@ lbl_800285EC: /* 80028738 00025698 41 82 00 08 */ beq lbl_80028740 /* 8002873C 0002569C 38 A1 00 1C */ addi r5, r1, 0x1c lbl_80028740: -/* 80028740 000256A0 48 2D AD 85 */ bl __ct__17CColorInstructionFiRC6CColor +/* 80028740 000256A0 48 2D AD 85 */ bl sub_803034C4 /* 80028744 000256A4 3C 80 80 3E */ lis r4, lbl_803D9A88@ha /* 80028748 000256A8 38 61 00 78 */ addi r3, r1, 0x78 /* 8002874C 000256AC 38 84 9A 88 */ addi r4, r4, lbl_803D9A88@l @@ -512,7 +512,7 @@ lbl_80028740: /* 80028784 000256E4 41 82 00 08 */ beq lbl_8002878C /* 80028788 000256E8 38 A1 00 18 */ addi r5, r1, 0x18 lbl_8002878C: -/* 8002878C 000256EC 48 2D AD 39 */ bl __ct__17CColorInstructionFiRC6CColor +/* 8002878C 000256EC 48 2D AD 39 */ bl sub_803034C4 /* 80028790 000256F0 3C 80 80 3E */ lis r4, lbl_803D9A88@ha /* 80028794 000256F4 38 61 00 68 */ addi r3, r1, 0x68 /* 80028798 000256F8 38 84 9A 88 */ addi r4, r4, lbl_803D9A88@l