diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-22 18:58:56 -0500 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-22 18:58:56 -0500 |
commit | 0cee36de656fb3c220b8f449fcb0183d54247826 (patch) | |
tree | eacd2de208dd3caaf48f97809304fa9f3fe2eb66 /asm/contest_effect.s | |
parent | bce1ed4a093cf0f846b00466dd0ea6fc669936e5 (diff) | |
parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'asm/contest_effect.s')
-rw-r--r-- | asm/contest_effect.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/contest_effect.s b/asm/contest_effect.s index 1f7c7b109..d06789976 100644 --- a/asm/contest_effect.s +++ b/asm/contest_effect.s @@ -860,7 +860,7 @@ _080B8340: bne _080B836E lsls r0, r6, 24 lsrs r0, 24 - bl sub_80AF59C + bl Contest_IsMonsTurnDisabled lsls r0, 24 cmp r0, 0 bne _080B836E |