diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-07 13:15:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 13:15:34 -0400 |
| commit | 2a7205dec677c98d087cb8ba191370de464c8bf0 (patch) | |
| tree | bbad1ce5b07b922803f25dfdcb3feee909c513c9 /asm/easy_chat.s | |
| parent | fb9b695f9a366f662b5262f440d77c770b131d0d (diff) | |
| parent | 13468377bc85b2daa309b049e3d9f733dadce440 (diff) | |
Merge pull request #111 from PikalaxALT/link
Port link from Emerald
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 ffd31bcc8..26d7ac8bc 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -797,7 +797,7 @@ _080BDCA4: .4byte 0x0000ffff thumb_func_start sub_80BDCA8 sub_80BDCA8: @ 80BDCA8 push {lr} - bl sub_806E25C + bl IsNationalPokedexEnabled lsls r0, 24 lsrs r0, 24 pop {r1} @@ -1116,7 +1116,7 @@ _080BDEB2: movs r0, 0x13 strh r0, [r3] _080BDF0C: - bl sub_806E25C + bl IsNationalPokedexEnabled cmp r0, 0 beq _080BDF2A ldr r0, _080BDF30 @ =gUnknown_20399BC |