diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 20:18:48 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 20:18:48 -0400 |
commit | 6c52f7ce04ea37ae6a1854521f0e312d39e86ecb (patch) | |
tree | b7369c07f40081796b51fc52ca5f26faaa8b8723 /asm/easy_chat.s | |
parent | e143072f961cfffc5e8e2cc5b2a6059c27124808 (diff) | |
parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/easy_chat.s')
-rw-r--r-- | asm/easy_chat.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 6e20b06da..05a45baa1 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -158,11 +158,11 @@ _080BD810: _080BD814: movs r0, 0xB muls r0, r2 - ldr r1, _080BD820 @ =gUnknown_8245EE0 + ldr r1, _080BD820 @ =gSpeciesNames adds r0, r1 b _080BD846 .align 2, 0 -_080BD820: .4byte gUnknown_8245EE0 +_080BD820: .4byte gSpeciesNames _080BD824: movs r0, 0xD muls r0, r2 |