PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert incorrectly named functions 

Former-commit-id: 5864261273
This commit is contained in:
Phillip Stephens 2023-01-11 13:43:07 -08:00
parent 72e9d4d086
commit d92abab6be
4 changed files with 343 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/GuiSys/CGuiTextSupport.s
View File

@ -1756,7 +1756,7 @@ CheckAndRebuildTextBuffer__15CGuiTextSupportFv:
/* 802C93DC 002C633C 98 E1 00 19 */ stb r7, 0x19(r1) /* 802C93DC 002C633C 98 E1 00 19 */ stb r7, 0x19(r1)
/* 802C93E0 002C6340 98 C1 00 1A */ stb r6, 0x1a(r1) /* 802C93E0 002C6340 98 C1 00 1A */ stb r6, 0x1a(r1)
/* 802C93E4 002C6344 98 01 00 1B */ stb r0, 0x1b(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 /* 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 /* 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 /* 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) /* 802C9464 002C63C4 98 E1 00 15 */ stb r7, 0x15(r1)
/* 802C9468 002C63C8 98 C1 00 16 */ stb r6, 0x16(r1) /* 802C9468 002C63C8 98 C1 00 16 */ stb r6, 0x16(r1)
/* 802C946C 002C63CC 98 01 00 17 */ stb r0, 0x17(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) /* 802C9474 002C63D4 80 9F 00 5C */ lwz r4, 0x5c(r31)
/* 802C9478 002C63D8 38 60 00 00 */ li r3, 0 /* 802C9478 002C63D8 38 60 00 00 */ li r3, 0
/* 802C947C 002C63DC 38 AD A9 1A */ addi r5, r13, lbl_805A94DA@sda21 /* 802C947C 002C63DC 38 AD A9 1A */ addi r5, r13, lbl_805A94DA@sda21

660
asm/Kyoto/Text/CTextExecuteBuffer.s
View File

File diff suppressed because it is too large Load Diff

16
asm/Kyoto/Text/CTextParser.s
View File

@ -333,7 +333,7 @@ lbl_803046C4:
/* 803046F8 00301658 7F A3 EB 78 */ mr r3, r29 /* 803046F8 00301658 7F A3 EB 78 */ mr r3, r29
/* 803046FC 0030165C 38 A1 00 18 */ addi r5, r1, 0x18 /* 803046FC 0030165C 38 A1 00 18 */ addi r5, r1, 0x18
/* 80304700 00301660 38 80 00 03 */ li r4, 3 /* 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 /* 80304708 00301668 48 00 05 88 */ b lbl_80304C90
lbl_8030470C: lbl_8030470C:
/* 8030470C 0030166C 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 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 /* 80304740 003016A0 7F A3 EB 78 */ mr r3, r29
/* 80304744 003016A4 38 A1 00 14 */ addi r5, r1, 0x14 /* 80304744 003016A4 38 A1 00 14 */ addi r5, r1, 0x14
/* 80304748 003016A8 38 80 00 00 */ li r4, 0 /* 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 /* 80304750 003016B0 48 00 05 40 */ b lbl_80304C90
lbl_80304754: lbl_80304754:
/* 80304754 003016B4 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 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 /* 80304788 003016E8 7F A3 EB 78 */ mr r3, r29
/* 8030478C 003016EC 38 A1 00 10 */ addi r5, r1, 0x10 /* 8030478C 003016EC 38 A1 00 10 */ addi r5, r1, 0x10
/* 80304790 003016F0 38 80 00 02 */ li r4, 2 /* 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 /* 80304798 003016F8 48 00 04 F8 */ b lbl_80304C90
lbl_8030479C: lbl_8030479C:
/* 8030479C 003016FC 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 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 /* 803047D0 00301730 7F A3 EB 78 */ mr r3, r29
/* 803047D4 00301734 38 A1 00 0C */ addi r5, r1, 0xc /* 803047D4 00301734 38 A1 00 0C */ addi r5, r1, 0xc
/* 803047D8 00301738 38 80 00 01 */ li r4, 1 /* 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 /* 803047E0 00301740 48 00 04 B0 */ b lbl_80304C90
lbl_803047E4: lbl_803047E4:
/* 803047E4 00301744 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 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 /* 80304868 003017C8 41 82 00 14 */ beq lbl_8030487C
/* 8030486C 003017CC 7F A3 EB 78 */ mr r3, r29 /* 8030486C 003017CC 7F A3 EB 78 */ mr r3, r29
/* 80304870 003017D0 7F 64 DB 78 */ mr r4, r27 /* 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 /* 80304878 003017D8 48 00 04 18 */ b lbl_80304C90
lbl_8030487C: lbl_8030487C:
/* 8030487C 003017DC 7F 84 E3 78 */ mr r4, r28 /* 8030487C 003017DC 7F 84 E3 78 */ mr r4, r28
@ -442,7 +442,7 @@ lbl_8030487C:
/* 80304890 003017F0 7F A3 EB 78 */ mr r3, r29 /* 80304890 003017F0 7F A3 EB 78 */ mr r3, r29
/* 80304894 003017F4 7F 64 DB 78 */ mr r4, r27 /* 80304894 003017F4 7F 64 DB 78 */ mr r4, r27
/* 80304898 003017F8 38 A1 00 08 */ addi r5, r1, 8 /* 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 /* 803048A0 00301800 48 00 03 F0 */ b lbl_80304C90
lbl_803048A4: lbl_803048A4:
/* 803048A4 00301804 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 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) /* 803048F0 00301850 C8 21 00 68 */ lfd f1, 0x68(r1)
/* 803048F4 00301854 EC 21 10 28 */ fsubs f1, f1, f2 /* 803048F4 00301854 EC 21 10 28 */ fsubs f1, f1, f2
/* 803048F8 00301858 EC 21 00 24 */ fdivs f1, f1, f0 /* 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 /* 80304900 00301860 48 00 03 90 */ b lbl_80304C90
lbl_80304904: lbl_80304904:
/* 80304904 00301864 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 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 /* 80304930 00301890 4B FF FA E9 */ bl ParseInt__11CTextParserFPCwib
/* 80304934 00301894 7C 64 1B 78 */ mr r4, r3 /* 80304934 00301894 7C 64 1B 78 */ mr r4, r3
/* 80304938 00301898 7F A3 EB 78 */ mr r3, r29 /* 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 /* 80304940 003018A0 48 00 03 50 */ b lbl_80304C90
lbl_80304944: lbl_80304944:
/* 80304944 003018A4 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304944 003018A4 3C 80 80 3F */ lis r4, lbl_803ED718@ha

6
asm/MetroidPrime/CSplashScreen.s
View File

@ -465,7 +465,7 @@ lbl_800285EC:
/* 800286CC 0002562C 98 C1 00 18 */ stb r6, 0x18(r1) /* 800286CC 0002562C 98 C1 00 18 */ stb r6, 0x18(r1)
/* 800286D0 00025630 98 C1 00 19 */ stb r6, 0x19(r1) /* 800286D0 00025630 98 C1 00 19 */ stb r6, 0x19(r1)
/* 800286D4 00025634 98 C1 00 1A */ stb r6, 0x1a(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) /* 800286DC 0002563C 80 1E 00 20 */ lwz r0, 0x20(r30)
/* 800286E0 00025640 2C 00 00 01 */ cmpwi r0, 1 /* 800286E0 00025640 2C 00 00 01 */ cmpwi r0, 1
/* 800286E4 00025644 40 82 00 DC */ bne lbl_800287C0 /* 800286E4 00025644 40 82 00 DC */ bne lbl_800287C0
@ -492,7 +492,7 @@ lbl_800285EC:
/* 80028738 00025698 41 82 00 08 */ beq lbl_80028740 /* 80028738 00025698 41 82 00 08 */ beq lbl_80028740
/* 8002873C 0002569C 38 A1 00 1C */ addi r5, r1, 0x1c /* 8002873C 0002569C 38 A1 00 1C */ addi r5, r1, 0x1c
lbl_80028740: 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 /* 80028744 000256A4 3C 80 80 3E */ lis r4, lbl_803D9A88@ha
/* 80028748 000256A8 38 61 00 78 */ addi r3, r1, 0x78 /* 80028748 000256A8 38 61 00 78 */ addi r3, r1, 0x78
/* 8002874C 000256AC 38 84 9A 88 */ addi r4, r4, lbl_803D9A88@l /* 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 /* 80028784 000256E4 41 82 00 08 */ beq lbl_8002878C
/* 80028788 000256E8 38 A1 00 18 */ addi r5, r1, 0x18 /* 80028788 000256E8 38 A1 00 18 */ addi r5, r1, 0x18
lbl_8002878C: 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 /* 80028790 000256F0 3C 80 80 3E */ lis r4, lbl_803D9A88@ha
/* 80028794 000256F4 38 61 00 68 */ addi r3, r1, 0x68 /* 80028794 000256F4 38 61 00 68 */ addi r3, r1, 0x68
/* 80028798 000256F8 38 84 9A 88 */ addi r4, r4, lbl_803D9A88@l /* 80028798 000256F8 38 84 9A 88 */ addi r4, r4, lbl_803D9A88@l