diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-25 06:58:56 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-25 06:58:56 +0800 |
| commit | 8b14f4e90abf8010e83d6b38a26034458ce36d5d (patch) | |
| tree | b435edeb745cd9d232011cdcea7662711987e1d1 /asm/easy_chat.s | |
| parent | 41a7e6967dd4fd79eb01a45f4d77cf7c2ca11dc1 (diff) | |
| parent | 74e2a0e123be0ecd0e0df516ce242aea9c348117 (diff) | |
Merge branch 'master' into battle
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 0ec71e087..604929f1f 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -51,7 +51,7 @@ start_menu_is_selected_item_valid: @ 80BD754 cmp r0, 0x15 bne _080BD76C movs r0, 0 - bl pokedex_count + bl GetNationalPokedexCount lsls r0, 16 lsrs r0, 16 b _080BD782 @@ -1054,7 +1054,7 @@ sub_80BDE88: @ 80BDE88 ldr r1, [r4] movs r0, 0 strh r0, [r1] - bl pokedex_count + bl GetNationalPokedexCount lsls r0, 16 cmp r0, 0 beq _080BDEB0 |