diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 11:05:44 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 11:05:44 -0700 |
| commit | aa6e1a91fc89d01ad65eb532d6832767c936807a (patch) | |
| tree | 77ea1ef0aa2dff7e70165741fcc455c8faaadfc7 /asm/easy_chat.s | |
| parent | 46e957bacd9ba5538262c89bb87e1915167bb201 (diff) | |
| parent | d05339979e39580b162e618087136bb220a4f20d (diff) | |
Merge branch 'master' into vs_seeker
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 |