diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
| commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
| tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /asm/naming_screen.s | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/naming_screen.s')
| -rw-r--r-- | asm/naming_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/naming_screen.s b/asm/naming_screen.s index e42ed45d8..2601ab1f1 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -3524,7 +3524,7 @@ sub_809F4F0: @ 809F4F0 ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, _0809F560 @ =gUnknown_8245EE0 + ldr r0, _0809F560 @ =gSpeciesNames adds r1, r0 add r0, sp, 0xC bl StringCopy @@ -3565,7 +3565,7 @@ sub_809F4F0: @ 809F4F0 .align 2, 0 _0809F558: .4byte gUnknown_203998C _0809F55C: .4byte 0x00001e34 -_0809F560: .4byte gUnknown_8245EE0 +_0809F560: .4byte gSpeciesNames _0809F564: .4byte 0x00001e28 _0809F568: .4byte 0x00001e14 thumb_func_end sub_809F4F0 |