diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:33:42 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:33:42 -0500 |
| commit | 3ea9cff2c67b3db195c3326afc56fa0662c2327a (patch) | |
| tree | b5439c760be451055f0de03f3319a72768a1e8b5 /asm/contest_effect.s | |
| parent | 26fcc566a4da9287ab4d3795aaadde2a9f4a2947 (diff) | |
| parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) | |
Merge branch 'master' into unk_text_8095904
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 |