diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-10-14 11:53:12 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-10-14 11:53:12 -0700 |
| commit | 80329c54897a545b9b8b3e82b686b09f295bb67a (patch) | |
| tree | 322ca10c3e768cabfba250f1c7879b246a0781b6 /battle/effects/protect.asm | |
| parent | 94d4c89e093b76a0964114bd7a370046e70e965e (diff) | |
| parent | cf966bb824ce0ffe384291cd51aa96a2dd86e839 (diff) | |
Merge pull request #210 from yenatch/master
contest mons, fixed dumb labels, fixed more lz dumps, game freak logo, roofs
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 |