diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-25 17:57:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-25 17:57:27 -0400 |
| commit | 193dbd53a62a5789c26f2a34452170802a317a5f (patch) | |
| tree | 9ec77143a4b14dfc1ecb37d9d036524daaa9dc60 /battle/effects/protect.asm | |
| parent | 52a6b7da8ebebe2adefc03b43bcc5800ddec2835 (diff) | |
| parent | 0ead58cdaac5e231650ed39db38344e52051254f (diff) | |
Merge commit '0ead58cd' into merge-mrwint
Conflicts:
main.asm
Diffstat (limited to 'battle/effects/protect.asm')
| -rw-r--r-- | battle/effects/protect.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/battle/effects/protect.asm b/battle/effects/protect.asm index 80edc0d85..45e9a75d4 100644 --- a/battle/effects/protect.asm +++ b/battle/effects/protect.asm @@ -4,7 +4,7 @@ BattleCommand55: ; 37618 ret c ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarPair + call _GetBattleVar set SUBSTATUS_PROTECT, [hl] call Function0x37e01 @@ -29,7 +29,7 @@ ProtectChance: ; 3762c ; Can't have a substitute. ld a, BATTLE_VARS_SUBSTATUS4 - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_SUBSTITUTE, a jr nz, .failed |