ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

placeholder strings

Browse Source
This commit is contained in:
YamaArashi 2017-01-14 02:22:08 -08:00
parent dd0ed3d043
commit 2f76de380c
3 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/naming_screen.s
View File

@ -3826,7 +3826,7 @@ sub_80E4D10: @ 80E4D10
bcs _080E4DA6
add r5, sp, 0xC
mov r10, r4
ldr r0, =gUnknown_085E8218
ldr r0, =gExpandedPlaceholder_Empty
ldrb r0, [r0]
mov r8, r0
_080E4D52:

24
asm/string_util.s
View File

@ -811,11 +811,11 @@ StringRef_GetDummiedOutGenderDependentString: @ 8009058
ldrb r0, [r0, 0x8]
cmp r0, 0
beq _08009070
ldr r0, =gUnknown_085E821A
ldr r0, =gExpandedPlaceholder_Chan
b _08009072
.pool
_08009070:
ldr r0, =gUnknown_085E8219
ldr r0, =gExpandedPlaceholder_Kun
_08009072:
pop {r1}
bx r1
@ -831,11 +831,11 @@ StringRef_GetRivalName: @ 800907C
ldrb r0, [r0, 0x8]
cmp r0, 0
beq _08009094
ldr r0, =gUnknown_085E8258
ldr r0, =gExpandedPlaceholder_Brendan
b _08009096
.pool
_08009094:
ldr r0, =gUnknown_085E8260
ldr r0, =gExpandedPlaceholder_May
_08009096:
pop {r1}
bx r1
@ -845,7 +845,7 @@ _08009096:
thumb_func_start StringRef_GetEmeraldString
@ u8 *StringRef_GetEmeraldString()
StringRef_GetEmeraldString: @ 80090A0
ldr r0, =gUnknown_085E8229
ldr r0, =gExpandedPlaceholder_Emerald
bx lr
.pool
thumb_func_end StringRef_GetEmeraldString
@ -853,7 +853,7 @@ StringRef_GetEmeraldString: @ 80090A0
thumb_func_start StringRef_GetAquaString
@ u8 *StringRef_GetAquaString()
StringRef_GetAquaString: @ 80090A8
ldr r0, =gUnknown_085E8231
ldr r0, =gExpandedPlaceholder_Aqua
bx lr
.pool
thumb_func_end StringRef_GetAquaString
@ -861,7 +861,7 @@ StringRef_GetAquaString: @ 80090A8
thumb_func_start StringRef_GetMagmaString
@ u8 *StringRef_GetMagmaString()
StringRef_GetMagmaString: @ 80090B0
ldr r0, =gUnknown_085E8236
ldr r0, =gExpandedPlaceholder_Magma
bx lr
.pool
thumb_func_end StringRef_GetMagmaString
@ -869,7 +869,7 @@ StringRef_GetMagmaString: @ 80090B0
thumb_func_start StringRef_GetArchieString
@ u8 *StringRef_GetArchieString()
StringRef_GetArchieString: @ 80090B8
ldr r0, =gUnknown_085E823C
ldr r0, =gExpandedPlaceholder_Archie
bx lr
.pool
thumb_func_end StringRef_GetArchieString
@ -877,7 +877,7 @@ StringRef_GetArchieString: @ 80090B8
thumb_func_start StringRef_GetMaxieString
@ u8 *StringRef_GetMaxieString()
StringRef_GetMaxieString: @ 80090C0
ldr r0, =gUnknown_085E8243
ldr r0, =gExpandedPlaceholder_Maxie
bx lr
.pool
thumb_func_end StringRef_GetMaxieString
@ -885,7 +885,7 @@ StringRef_GetMaxieString: @ 80090C0
thumb_func_start StringRef_GetKyogreString
@ u8 *StringRef_GetKyogreString()
StringRef_GetKyogreString: @ 80090C8
ldr r0, =gUnknown_085E8249
ldr r0, =gExpandedPlaceholder_Kyogre
bx lr
.pool
thumb_func_end StringRef_GetKyogreString
@ -893,7 +893,7 @@ StringRef_GetKyogreString: @ 80090C8
thumb_func_start StringRef_GetGroudonString
@ u8 *StringRef_GetGroudonString()
StringRef_GetGroudonString: @ 80090D0
ldr r0, =gUnknown_085E8250
ldr r0, =gExpandedPlaceholder_Groudon
bx lr
.pool
thumb_func_end StringRef_GetGroudonString
@ -912,7 +912,7 @@ GetExpandedStringRef: @ 80090D8
b _080090F2
.pool
_080090F0:
ldr r0, =gUnknown_085E8218
ldr r0, =gExpandedPlaceholder_Empty
_080090F2:
pop {r1}
bx r1

54
data/strings.s
View File

@ -3,41 +3,47 @@
.section .rodata
gUnknown_085E8218:: @ 85E8218
.incbin "baserom.gba", 0x5e8218, 0x1
gExpandedPlaceholder_Empty:: @ 85E8218
.string "$"
gUnknown_085E8219:: @ 85E8219
.incbin "baserom.gba", 0x5e8219, 0x1
gExpandedPlaceholder_Kun:: @ 85E8219
.string "$"
gUnknown_085E821A:: @ 85E821A
.incbin "baserom.gba", 0x5e821a, 0xf
gExpandedPlaceholder_Chan:: @ 85E821A
.string "$"
gUnknown_085E8229:: @ 85E8229
.incbin "baserom.gba", 0x5e8229, 0x8
gExpandedPlaceholder_Sapphire:: @ 85E821B
.string "SAPPHIRE$"
gUnknown_085E8231:: @ 85E8231
.incbin "baserom.gba", 0x5e8231, 0x5
gExpandedPlaceholder_Ruby:: @ 85E8224
.string "RUBY$"
gUnknown_085E8236:: @ 85E8236
.incbin "baserom.gba", 0x5e8236, 0x6
gExpandedPlaceholder_Emerald:: @ 85E8229
.string "EMERALD$"
gUnknown_085E823C:: @ 85E823C
.incbin "baserom.gba", 0x5e823c, 0x7
gExpandedPlaceholder_Aqua:: @ 85E8231
.string "AQUA$"
gUnknown_085E8243:: @ 85E8243
.incbin "baserom.gba", 0x5e8243, 0x6
gExpandedPlaceholder_Magma:: @ 85E8236
.string "MAGMA$"
gUnknown_085E8249:: @ 85E8249
.incbin "baserom.gba", 0x5e8249, 0x7
gExpandedPlaceholder_Archie:: @ 85E823C
.string "ARCHIE$"
gUnknown_085E8250:: @ 85E8250
.incbin "baserom.gba", 0x5e8250, 0x8
gExpandedPlaceholder_Maxie:: @ 85E8243
.string "MAXIE$"
gUnknown_085E8258:: @ 85E8258
.incbin "baserom.gba", 0x5e8258, 0x8
gExpandedPlaceholder_Kyogre:: @ 85E8249
.string "KYOGRE$"
gUnknown_085E8260:: @ 85E8260
.incbin "baserom.gba", 0x5e8260, 0x4
gExpandedPlaceholder_Groudon:: @ 85E8250
.string "GROUDON$"
gExpandedPlaceholder_Brendan:: @ 85E8258
.string "BRENDAN$"
gExpandedPlaceholder_May:: @ 85E8260
.string "MAY$"
gUnknown_085E8264:: @ 85E8264
.incbin "baserom.gba", 0x5e8264, 0x4