diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2016-11-01 14:18:05 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2016-11-01 14:18:05 -0500 |
| commit | 265e1b712f6a5b7dedc84f8c98af820ab3539fb1 (patch) | |
| tree | 1dd278216f2633af80a5513cfb08519457dc3f8d /asm/string_util.s | |
| parent | 7dad2846f83f892cdb4ffd7a757d0858b02fc96e (diff) | |
| parent | d708372ea9fc91d8931892425aa786edbdf5a463 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
# Conflicts:
# asm/libagbbackup.s
Diffstat (limited to 'asm/string_util.s')
| -rw-r--r-- | asm/string_util.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/string_util.s b/asm/string_util.s index f3225dd8d..2d5ade7aa 100644 --- a/asm/string_util.s +++ b/asm/string_util.s @@ -764,7 +764,7 @@ _0800901E: thumb_func_start StringRef_GetPossiblyUnusedStringVar @ u8 *StringRef_GetPossiblyUnusedStringVar() StringRef_GetPossiblyUnusedStringVar: @ 800902C - ldr r0, =0x020223ac + ldr r0, =gUnknown_020223AC bx lr .pool thumb_func_end StringRef_GetPossiblyUnusedStringVar @@ -772,7 +772,7 @@ StringRef_GetPossiblyUnusedStringVar: @ 800902C thumb_func_start StringRef_GetPlayerName @ u8 *StringRef_GetPlayerName() StringRef_GetPlayerName: @ 8009034 - ldr r0, =0x03005d90 + ldr r0, =gUnknown_03005D90 ldr r0, [r0] bx lr .pool @@ -781,7 +781,7 @@ StringRef_GetPlayerName: @ 8009034 thumb_func_start StringRef_GetStringVar1 @ u8 *StringRef_GetStringVar1() StringRef_GetStringVar1: @ 8009040 - ldr r0, =0x02021cc4 + ldr r0, =gUnknown_02021CC4 bx lr .pool thumb_func_end StringRef_GetStringVar1 @@ -789,7 +789,7 @@ StringRef_GetStringVar1: @ 8009040 thumb_func_start StringRef_GetStringVar2 @ u8 *StringRef_GetStringVar2() StringRef_GetStringVar2: @ 8009048 - ldr r0, =0x02021dc4 + ldr r0, =gUnknown_02021DC4 bx lr .pool thumb_func_end StringRef_GetStringVar2 @@ -797,7 +797,7 @@ StringRef_GetStringVar2: @ 8009048 thumb_func_start StringRef_GetStringVar3 @ u8 *StringRef_GetStringVar3() StringRef_GetStringVar3: @ 8009050 - ldr r0, =0x02021ec4 + ldr r0, =gUnknown_02021EC4 bx lr .pool thumb_func_end StringRef_GetStringVar3 @@ -806,7 +806,7 @@ StringRef_GetStringVar3: @ 8009050 @ u8 *StringRef_GetDummiedOutGenderDependentString() StringRef_GetDummiedOutGenderDependentString: @ 8009058 push {lr} - ldr r0, =0x03005d90 + ldr r0, =gUnknown_03005D90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 @@ -826,7 +826,7 @@ _08009072: @ u8 *StringRef_GetRivalName() StringRef_GetRivalName: @ 800907C push {lr} - ldr r0, =0x03005d90 + ldr r0, =gUnknown_03005D90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 |