diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-16 15:41:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-16 15:41:54 -0400 |
| commit | 559833ccf622eef7932369b169f279a0b73c807f (patch) | |
| tree | 4bec10795ab76bc055dfd9c3d73c3e79100ec38d /asm/easy_chat.s | |
| parent | c7f28f034c4a86b6373b45941f47e5a231392ad0 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge branch 'master' into field_map_obj
Diffstat (limited to 'asm/easy_chat.s')
| -rw-r--r-- | asm/easy_chat.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index d123b23f2..565d9fcc6 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -10177,7 +10177,7 @@ _0811F146: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl pokedex_flag_operation + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _0811F166 @@ -11016,7 +11016,7 @@ _0811F7D8: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl pokedex_flag_operation + bl GetSetPokedexFlag lsls r0, 24 lsrs r0, 24 b _0811F82C @@ -11030,7 +11030,7 @@ _0811F7EE: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl pokedex_flag_operation + bl GetSetPokedexFlag _0811F808: movs r0, 0x1 b _0811F82C |