diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:00:47 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:14:15 -0700 |
| commit | 415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch) | |
| tree | 8793240342d37104610f34756f6fee9db706ee8f /asm/easy_chat.s | |
| parent | ae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff) | |
| parent | 1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff) | |
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'asm/easy_chat.s')
| -rw-r--r-- | asm/easy_chat.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 6b85e1e76..7bb496641 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -9975,7 +9975,7 @@ _080EAE50: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl GetNationalPokedexFlag + bl GetSetPokedexFlag b _080EAE7C _080EAE62: ldr r0, _080EAE74 @ =gUnknown_083DB694 |