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

Found the real names for reverted functions 

Former-commit-id: ab1f7c19a2
This commit is contained in:
Phillip Stephens 2023-01-11 13:54:57 -08:00
parent d92abab6be
commit 1b0b3b8b4d
4 changed files with 41 additions and 41 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 sub_803034C4 /* 802C93E8 002C6348 48 03 A0 DD */ bl AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor
/* 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 sub_803034C4 /* 802C9470 002C63D0 48 03 A0 55 */ bl AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor
/* 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

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

@ -1591,8 +1591,8 @@ AddPushState__18CTextExecuteBufferFv:
/* 80303154 003000B4 38 21 00 20 */ addi r1, r1, 0x20 /* 80303154 003000B4 38 21 00 20 */ addi r1, r1, 0x20
/* 80303158 003000B8 4E 80 00 20 */ blr /* 80303158 003000B8 4E 80 00 20 */ blr
.global sub_8030315c .global AddVerticalJustification__18CTextExecuteBufferF22EVerticalJustification
sub_8030315c: AddVerticalJustification__18CTextExecuteBufferF22EVerticalJustification:
/* 8030315C 003000BC 90 83 00 9C */ stw r4, 0x9c(r3) /* 8030315C 003000BC 90 83 00 9C */ stw r4, 0x9c(r3)
/* 80303160 003000C0 80 63 00 A4 */ lwz r3, 0xa4(r3) /* 80303160 003000C0 80 63 00 A4 */ lwz r3, 0xa4(r3)
/* 80303164 003000C4 28 03 00 00 */ cmplwi r3, 0 /* 80303164 003000C4 28 03 00 00 */ cmplwi r3, 0
@ -1603,8 +1603,8 @@ sub_8030315c:
/* 80303178 003000D8 90 83 00 2C */ stw r4, 0x2c(r3) /* 80303178 003000D8 90 83 00 2C */ stw r4, 0x2c(r3)
/* 8030317C 003000DC 4E 80 00 20 */ blr /* 8030317C 003000DC 4E 80 00 20 */ blr
.global sub_80303180 .global AddJustification__18CTextExecuteBufferF14EJustification
sub_80303180: AddJustification__18CTextExecuteBufferF14EJustification:
/* 80303180 003000E0 90 83 00 98 */ stw r4, 0x98(r3) /* 80303180 003000E0 90 83 00 98 */ stw r4, 0x98(r3)
/* 80303184 003000E4 80 63 00 A4 */ lwz r3, 0xa4(r3) /* 80303184 003000E4 80 63 00 A4 */ lwz r3, 0xa4(r3)
/* 80303188 003000E8 28 03 00 00 */ cmplwi r3, 0 /* 80303188 003000E8 28 03 00 00 */ cmplwi r3, 0
@ -1615,8 +1615,8 @@ sub_80303180:
/* 8030319C 003000FC 90 83 00 28 */ stw r4, 0x28(r3) /* 8030319C 003000FC 90 83 00 28 */ stw r4, 0x28(r3)
/* 803031A0 00300100 4E 80 00 20 */ blr /* 803031A0 00300100 4E 80 00 20 */ blr
.global sub_803031A4 .global AddLineExtraSpace__18CTextExecuteBufferFi
sub_803031A4: AddLineExtraSpace__18CTextExecuteBufferFi:
/* 803031A4 00300104 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803031A4 00300104 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 803031A8 00300108 7C 08 02 A6 */ mflr r0 /* 803031A8 00300108 7C 08 02 A6 */ mflr r0
/* 803031AC 0030010C 3C A0 80 3D */ lis r5, lbl_803D6E90@ha /* 803031AC 0030010C 3C A0 80 3D */ lis r5, lbl_803D6E90@ha
@ -1668,8 +1668,8 @@ sub_803031A4:
/* 8030325C 003001BC 38 21 00 20 */ addi r1, r1, 0x20 /* 8030325C 003001BC 38 21 00 20 */ addi r1, r1, 0x20
/* 80303260 003001C0 4E 80 00 20 */ blr /* 80303260 003001C0 4E 80 00 20 */ blr
.global sub_80303264 .global AddLineSpacing__18CTextExecuteBufferFf
sub_80303264: AddLineSpacing__18CTextExecuteBufferFf:
/* 80303264 003001C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80303264 003001C4 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80303268 003001C8 7C 08 02 A6 */ mflr r0 /* 80303268 003001C8 7C 08 02 A6 */ mflr r0
/* 8030326C 003001CC 3C 80 80 3D */ lis r4, lbl_803D6E90@ha /* 8030326C 003001CC 3C 80 80 3D */ lis r4, lbl_803D6E90@ha
@ -1720,8 +1720,8 @@ sub_80303264:
/* 80303318 00300278 38 21 00 20 */ addi r1, r1, 0x20 /* 80303318 00300278 38 21 00 20 */ addi r1, r1, 0x20
/* 8030331C 0030027C 4E 80 00 20 */ blr /* 8030331C 0030027C 4E 80 00 20 */ blr
.global sub_80303320 .global AddRemoveColorOverride__18CTextExecuteBufferFi
sub_80303320: AddRemoveColorOverride__18CTextExecuteBufferFi:
/* 80303320 00300280 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80303320 00300280 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80303324 00300284 7C 08 02 A6 */ mflr r0 /* 80303324 00300284 7C 08 02 A6 */ mflr r0
/* 80303328 00300288 3C A0 80 3D */ lis r5, lbl_803D6E90@ha /* 80303328 00300288 3C A0 80 3D */ lis r5, lbl_803D6E90@ha
@ -1772,8 +1772,8 @@ sub_80303320:
/* 803033D4 00300334 38 21 00 20 */ addi r1, r1, 0x20 /* 803033D4 00300334 38 21 00 20 */ addi r1, r1, 0x20
/* 803033D8 00300338 4E 80 00 20 */ blr /* 803033D8 00300338 4E 80 00 20 */ blr
.global sub_803033DC .global AddColorOverride__18CTextExecuteBufferFiRC10CTextColor
sub_803033DC: AddColorOverride__18CTextExecuteBufferFiRC10CTextColor:
/* 803033DC 0030033C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803033DC 0030033C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 803033E0 00300340 7C 08 02 A6 */ mflr r0 /* 803033E0 00300340 7C 08 02 A6 */ mflr r0
/* 803033E4 00300344 3C C0 80 3D */ lis r6, lbl_803D6E90@ha /* 803033E4 00300344 3C C0 80 3D */ lis r6, lbl_803D6E90@ha
@ -1835,8 +1835,8 @@ sub_803033DC:
/* 803034BC 0030041C 38 21 00 20 */ addi r1, r1, 0x20 /* 803034BC 0030041C 38 21 00 20 */ addi r1, r1, 0x20
/* 803034C0 00300420 4E 80 00 20 */ blr /* 803034C0 00300420 4E 80 00 20 */ blr
.global sub_803034C4 .global AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor
sub_803034C4: AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor:
/* 803034C4 00300424 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803034C4 00300424 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 803034C8 00300428 7C 08 02 A6 */ mflr r0 /* 803034C8 00300428 7C 08 02 A6 */ mflr r0
/* 803034CC 0030042C 3C C0 80 3D */ lis r6, lbl_803D6E90@ha /* 803034CC 0030042C 3C C0 80 3D */ lis r6, lbl_803D6E90@ha

44
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 sub_803034C4 /* 80304704 00301664 4B FF ED C1 */ bl AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor
/* 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 sub_803034C4 /* 8030474C 003016AC 4B FF ED 79 */ bl AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor
/* 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 sub_803034C4 /* 80304794 003016F4 4B FF ED 31 */ bl AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor
/* 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 sub_803034C4 /* 803047DC 0030173C 4B FF EC E9 */ bl AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor
/* 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 sub_80303320 /* 80304874 003017D4 4B FF EA AD */ bl AddRemoveColorOverride__18CTextExecuteBufferFi
/* 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 sub_803033DC /* 8030489C 003017FC 4B FF EB 41 */ bl AddColorOverride__18CTextExecuteBufferFiRC10CTextColor
/* 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 sub_80303264 /* 803048FC 0030185C 4B FF E9 69 */ bl AddLineSpacing__18CTextExecuteBufferFf
/* 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 sub_803031A4 /* 8030493C 0030189C 4B FF E8 69 */ bl AddLineExtraSpace__18CTextExecuteBufferFi
/* 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
@ -505,7 +505,7 @@ lbl_80304944:
/* 80304980 003018E0 41 82 00 14 */ beq lbl_80304994 /* 80304980 003018E0 41 82 00 14 */ beq lbl_80304994
/* 80304984 003018E4 7F A3 EB 78 */ mr r3, r29 /* 80304984 003018E4 7F A3 EB 78 */ mr r3, r29
/* 80304988 003018E8 38 80 00 00 */ li r4, 0 /* 80304988 003018E8 38 80 00 00 */ li r4, 0
/* 8030498C 003018EC 4B FF E7 F5 */ bl sub_80303180 /* 8030498C 003018EC 4B FF E7 F5 */ bl AddJustification__18CTextExecuteBufferF14EJustification
/* 80304990 003018F0 48 00 03 00 */ b lbl_80304C90 /* 80304990 003018F0 48 00 03 00 */ b lbl_80304C90
lbl_80304994: lbl_80304994:
/* 80304994 003018F4 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304994 003018F4 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -518,7 +518,7 @@ lbl_80304994:
/* 803049B0 00301910 41 82 00 14 */ beq lbl_803049C4 /* 803049B0 00301910 41 82 00 14 */ beq lbl_803049C4
/* 803049B4 00301914 7F A3 EB 78 */ mr r3, r29 /* 803049B4 00301914 7F A3 EB 78 */ mr r3, r29
/* 803049B8 00301918 38 80 00 01 */ li r4, 1 /* 803049B8 00301918 38 80 00 01 */ li r4, 1
/* 803049BC 0030191C 4B FF E7 C5 */ bl sub_80303180 /* 803049BC 0030191C 4B FF E7 C5 */ bl AddJustification__18CTextExecuteBufferF14EJustification
/* 803049C0 00301920 48 00 02 D0 */ b lbl_80304C90 /* 803049C0 00301920 48 00 02 D0 */ b lbl_80304C90
lbl_803049C4: lbl_803049C4:
/* 803049C4 00301924 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 803049C4 00301924 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -531,7 +531,7 @@ lbl_803049C4:
/* 803049E0 00301940 41 82 00 14 */ beq lbl_803049F4 /* 803049E0 00301940 41 82 00 14 */ beq lbl_803049F4
/* 803049E4 00301944 7F A3 EB 78 */ mr r3, r29 /* 803049E4 00301944 7F A3 EB 78 */ mr r3, r29
/* 803049E8 00301948 38 80 00 02 */ li r4, 2 /* 803049E8 00301948 38 80 00 02 */ li r4, 2
/* 803049EC 0030194C 4B FF E7 95 */ bl sub_80303180 /* 803049EC 0030194C 4B FF E7 95 */ bl AddJustification__18CTextExecuteBufferF14EJustification
/* 803049F0 00301950 48 00 02 A0 */ b lbl_80304C90 /* 803049F0 00301950 48 00 02 A0 */ b lbl_80304C90
lbl_803049F4: lbl_803049F4:
/* 803049F4 00301954 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 803049F4 00301954 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -544,7 +544,7 @@ lbl_803049F4:
/* 80304A10 00301970 41 82 00 14 */ beq lbl_80304A24 /* 80304A10 00301970 41 82 00 14 */ beq lbl_80304A24
/* 80304A14 00301974 7F A3 EB 78 */ mr r3, r29 /* 80304A14 00301974 7F A3 EB 78 */ mr r3, r29
/* 80304A18 00301978 38 80 00 03 */ li r4, 3 /* 80304A18 00301978 38 80 00 03 */ li r4, 3
/* 80304A1C 0030197C 4B FF E7 65 */ bl sub_80303180 /* 80304A1C 0030197C 4B FF E7 65 */ bl AddJustification__18CTextExecuteBufferF14EJustification
/* 80304A20 00301980 48 00 02 70 */ b lbl_80304C90 /* 80304A20 00301980 48 00 02 70 */ b lbl_80304C90
lbl_80304A24: lbl_80304A24:
/* 80304A24 00301984 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304A24 00301984 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -557,7 +557,7 @@ lbl_80304A24:
/* 80304A40 003019A0 41 82 00 14 */ beq lbl_80304A54 /* 80304A40 003019A0 41 82 00 14 */ beq lbl_80304A54
/* 80304A44 003019A4 7F A3 EB 78 */ mr r3, r29 /* 80304A44 003019A4 7F A3 EB 78 */ mr r3, r29
/* 80304A48 003019A8 38 80 00 04 */ li r4, 4 /* 80304A48 003019A8 38 80 00 04 */ li r4, 4
/* 80304A4C 003019AC 4B FF E7 35 */ bl sub_80303180 /* 80304A4C 003019AC 4B FF E7 35 */ bl AddJustification__18CTextExecuteBufferF14EJustification
/* 80304A50 003019B0 48 00 02 40 */ b lbl_80304C90 /* 80304A50 003019B0 48 00 02 40 */ b lbl_80304C90
lbl_80304A54: lbl_80304A54:
/* 80304A54 003019B4 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304A54 003019B4 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -570,7 +570,7 @@ lbl_80304A54:
/* 80304A70 003019D0 41 82 00 14 */ beq lbl_80304A84 /* 80304A70 003019D0 41 82 00 14 */ beq lbl_80304A84
/* 80304A74 003019D4 7F A3 EB 78 */ mr r3, r29 /* 80304A74 003019D4 7F A3 EB 78 */ mr r3, r29
/* 80304A78 003019D8 38 80 00 05 */ li r4, 5 /* 80304A78 003019D8 38 80 00 05 */ li r4, 5
/* 80304A7C 003019DC 4B FF E7 05 */ bl sub_80303180 /* 80304A7C 003019DC 4B FF E7 05 */ bl AddJustification__18CTextExecuteBufferF14EJustification
/* 80304A80 003019E0 48 00 02 10 */ b lbl_80304C90 /* 80304A80 003019E0 48 00 02 10 */ b lbl_80304C90
lbl_80304A84: lbl_80304A84:
/* 80304A84 003019E4 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304A84 003019E4 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -583,7 +583,7 @@ lbl_80304A84:
/* 80304AA0 00301A00 41 82 01 F0 */ beq lbl_80304C90 /* 80304AA0 00301A00 41 82 01 F0 */ beq lbl_80304C90
/* 80304AA4 00301A04 7F A3 EB 78 */ mr r3, r29 /* 80304AA4 00301A04 7F A3 EB 78 */ mr r3, r29
/* 80304AA8 00301A08 38 80 00 06 */ li r4, 6 /* 80304AA8 00301A08 38 80 00 06 */ li r4, 6
/* 80304AAC 00301A0C 4B FF E6 D5 */ bl sub_80303180 /* 80304AAC 00301A0C 4B FF E6 D5 */ bl AddJustification__18CTextExecuteBufferF14EJustification
/* 80304AB0 00301A10 48 00 01 E0 */ b lbl_80304C90 /* 80304AB0 00301A10 48 00 01 E0 */ b lbl_80304C90
lbl_80304AB4: lbl_80304AB4:
/* 80304AB4 00301A14 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304AB4 00301A14 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -604,7 +604,7 @@ lbl_80304AB4:
/* 80304AF0 00301A50 41 82 00 14 */ beq lbl_80304B04 /* 80304AF0 00301A50 41 82 00 14 */ beq lbl_80304B04
/* 80304AF4 00301A54 7F A3 EB 78 */ mr r3, r29 /* 80304AF4 00301A54 7F A3 EB 78 */ mr r3, r29
/* 80304AF8 00301A58 38 80 00 00 */ li r4, 0 /* 80304AF8 00301A58 38 80 00 00 */ li r4, 0
/* 80304AFC 00301A5C 4B FF E6 61 */ bl sub_8030315c /* 80304AFC 00301A5C 4B FF E6 61 */ bl AddVerticalJustification__18CTextExecuteBufferF22EVerticalJustification
/* 80304B00 00301A60 48 00 01 90 */ b lbl_80304C90 /* 80304B00 00301A60 48 00 01 90 */ b lbl_80304C90
lbl_80304B04: lbl_80304B04:
/* 80304B04 00301A64 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304B04 00301A64 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -617,7 +617,7 @@ lbl_80304B04:
/* 80304B20 00301A80 41 82 00 14 */ beq lbl_80304B34 /* 80304B20 00301A80 41 82 00 14 */ beq lbl_80304B34
/* 80304B24 00301A84 7F A3 EB 78 */ mr r3, r29 /* 80304B24 00301A84 7F A3 EB 78 */ mr r3, r29
/* 80304B28 00301A88 38 80 00 01 */ li r4, 1 /* 80304B28 00301A88 38 80 00 01 */ li r4, 1
/* 80304B2C 00301A8C 4B FF E6 31 */ bl sub_8030315c /* 80304B2C 00301A8C 4B FF E6 31 */ bl AddVerticalJustification__18CTextExecuteBufferF22EVerticalJustification
/* 80304B30 00301A90 48 00 01 60 */ b lbl_80304C90 /* 80304B30 00301A90 48 00 01 60 */ b lbl_80304C90
lbl_80304B34: lbl_80304B34:
/* 80304B34 00301A94 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304B34 00301A94 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -630,7 +630,7 @@ lbl_80304B34:
/* 80304B50 00301AB0 41 82 00 14 */ beq lbl_80304B64 /* 80304B50 00301AB0 41 82 00 14 */ beq lbl_80304B64
/* 80304B54 00301AB4 7F A3 EB 78 */ mr r3, r29 /* 80304B54 00301AB4 7F A3 EB 78 */ mr r3, r29
/* 80304B58 00301AB8 38 80 00 02 */ li r4, 2 /* 80304B58 00301AB8 38 80 00 02 */ li r4, 2
/* 80304B5C 00301ABC 4B FF E6 01 */ bl sub_8030315c /* 80304B5C 00301ABC 4B FF E6 01 */ bl AddVerticalJustification__18CTextExecuteBufferF22EVerticalJustification
/* 80304B60 00301AC0 48 00 01 30 */ b lbl_80304C90 /* 80304B60 00301AC0 48 00 01 30 */ b lbl_80304C90
lbl_80304B64: lbl_80304B64:
/* 80304B64 00301AC4 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304B64 00301AC4 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -643,7 +643,7 @@ lbl_80304B64:
/* 80304B80 00301AE0 41 82 00 14 */ beq lbl_80304B94 /* 80304B80 00301AE0 41 82 00 14 */ beq lbl_80304B94
/* 80304B84 00301AE4 7F A3 EB 78 */ mr r3, r29 /* 80304B84 00301AE4 7F A3 EB 78 */ mr r3, r29
/* 80304B88 00301AE8 38 80 00 03 */ li r4, 3 /* 80304B88 00301AE8 38 80 00 03 */ li r4, 3
/* 80304B8C 00301AEC 4B FF E5 D1 */ bl sub_8030315c /* 80304B8C 00301AEC 4B FF E5 D1 */ bl AddVerticalJustification__18CTextExecuteBufferF22EVerticalJustification
/* 80304B90 00301AF0 48 00 01 00 */ b lbl_80304C90 /* 80304B90 00301AF0 48 00 01 00 */ b lbl_80304C90
lbl_80304B94: lbl_80304B94:
/* 80304B94 00301AF4 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304B94 00301AF4 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -656,7 +656,7 @@ lbl_80304B94:
/* 80304BB0 00301B10 41 82 00 14 */ beq lbl_80304BC4 /* 80304BB0 00301B10 41 82 00 14 */ beq lbl_80304BC4
/* 80304BB4 00301B14 7F A3 EB 78 */ mr r3, r29 /* 80304BB4 00301B14 7F A3 EB 78 */ mr r3, r29
/* 80304BB8 00301B18 38 80 00 04 */ li r4, 4 /* 80304BB8 00301B18 38 80 00 04 */ li r4, 4
/* 80304BBC 00301B1C 4B FF E5 A1 */ bl sub_8030315c /* 80304BBC 00301B1C 4B FF E5 A1 */ bl AddVerticalJustification__18CTextExecuteBufferF22EVerticalJustification
/* 80304BC0 00301B20 48 00 00 D0 */ b lbl_80304C90 /* 80304BC0 00301B20 48 00 00 D0 */ b lbl_80304C90
lbl_80304BC4: lbl_80304BC4:
/* 80304BC4 00301B24 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304BC4 00301B24 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -669,7 +669,7 @@ lbl_80304BC4:
/* 80304BE0 00301B40 41 82 00 14 */ beq lbl_80304BF4 /* 80304BE0 00301B40 41 82 00 14 */ beq lbl_80304BF4
/* 80304BE4 00301B44 7F A3 EB 78 */ mr r3, r29 /* 80304BE4 00301B44 7F A3 EB 78 */ mr r3, r29
/* 80304BE8 00301B48 38 80 00 05 */ li r4, 5 /* 80304BE8 00301B48 38 80 00 05 */ li r4, 5
/* 80304BEC 00301B4C 4B FF E5 71 */ bl sub_8030315c /* 80304BEC 00301B4C 4B FF E5 71 */ bl AddVerticalJustification__18CTextExecuteBufferF22EVerticalJustification
/* 80304BF0 00301B50 48 00 00 A0 */ b lbl_80304C90 /* 80304BF0 00301B50 48 00 00 A0 */ b lbl_80304C90
lbl_80304BF4: lbl_80304BF4:
/* 80304BF4 00301B54 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304BF4 00301B54 3C 80 80 3F */ lis r4, lbl_803ED718@ha
@ -682,7 +682,7 @@ lbl_80304BF4:
/* 80304C10 00301B70 41 82 00 80 */ beq lbl_80304C90 /* 80304C10 00301B70 41 82 00 80 */ beq lbl_80304C90
/* 80304C14 00301B74 7F A3 EB 78 */ mr r3, r29 /* 80304C14 00301B74 7F A3 EB 78 */ mr r3, r29
/* 80304C18 00301B78 38 80 00 06 */ li r4, 6 /* 80304C18 00301B78 38 80 00 06 */ li r4, 6
/* 80304C1C 00301B7C 4B FF E5 41 */ bl sub_8030315c /* 80304C1C 00301B7C 4B FF E5 41 */ bl AddVerticalJustification__18CTextExecuteBufferF22EVerticalJustification
/* 80304C20 00301B80 48 00 00 70 */ b lbl_80304C90 /* 80304C20 00301B80 48 00 00 70 */ b lbl_80304C90
lbl_80304C24: lbl_80304C24:
/* 80304C24 00301B84 3C 80 80 3F */ lis r4, lbl_803ED718@ha /* 80304C24 00301B84 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 sub_803034C4 /* 800286D8 00025638 48 2D AD ED */ bl AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor
/* 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 sub_803034C4 /* 80028740 000256A0 48 2D AD 85 */ bl AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor
/* 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 sub_803034C4 /* 8002878C 000256EC 48 2D AD 39 */ bl AddColor__18CTextExecuteBufferF10EColorTypeRC10CTextColor
/* 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