diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-02-17 04:03:59 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-02-17 04:03:59 -0600 |
| commit | ebd88b36060e8958fbf5f3b2028629575c79a243 (patch) | |
| tree | 101cf777ea827ff7e68069c5ad45822a629ea75c /asm/easy_chat.s | |
| parent | 1605f6253564e4e5f67dd295a1ac70145e5c1c9d (diff) | |
| parent | e2932a38ded59a6b794d10024498db718c0b0bb9 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into intro
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 db2ffac14..0cbe1f1ae 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -9252,7 +9252,7 @@ start_menu_is_selected_item_valid: @ 811EA6C cmp r0, 0 bne _0811EA84 movs r0, 0 - bl pokedex_count + bl GetNationalPokedexCount lsls r0, 16 lsrs r0, 16 b _0811EA9A @@ -10369,7 +10369,7 @@ sub_811F2D4: @ 811F2D4 movs r5, 0 strh r5, [r0] movs r0, 0 - bl pokedex_count + bl GetNationalPokedexCount lsls r0, 16 cmp r0, 0 beq _0811F2FC |