diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-11 03:04:21 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-11 03:04:21 -0400 |
| commit | 0ead58cdaac5e231650ed39db38344e52051254f (patch) | |
| tree | 3e4ce4a22df7f57b2e2f234794fbe971d8d82135 /battle/effects | |
| parent | 946a213f09db39243c883ad677a22de738977836 (diff) | |
fix labels for and rename GetBattleVarPair to GetBattleVar
Diffstat (limited to 'battle/effects')
| -rw-r--r-- | battle/effects/curse.asm | 2 | ||||
| -rw-r--r-- | battle/effects/endure.asm | 2 | ||||
| -rw-r--r-- | battle/effects/protect.asm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index 41ffc3a8d..9dc7f4b1d 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -66,7 +66,7 @@ BattleCommand54: ; 37588 jr nz, .failed ld a, BATTLE_VARS_SUBSTATUS1_OPP - call GetBattleVarPair + call _GetBattleVar bit 1, [hl] jr nz, .failed diff --git a/battle/effects/endure.asm b/battle/effects/endure.asm index 79f657a24..b2c622079 100644 --- a/battle/effects/endure.asm +++ b/battle/effects/endure.asm @@ -7,7 +7,7 @@ BattleCommand5a: ; 3766f ret c ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarPair + call _GetBattleVar set SUBSTATUS_ENDURE, [hl] call Function0x37e01 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 |