From a1951cefc09035e11077a433b28ec8c66b3b03db Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Tue, 23 Jan 2018 17:39:09 -0500 Subject: Prefix wram labels with w, part 2. --- engine/battle/effect_commands/rollout.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engine/battle/effect_commands/rollout.asm') diff --git a/engine/battle/effect_commands/rollout.asm b/engine/battle/effect_commands/rollout.asm index 4ce9ab3d8..f6966c48a 100644 --- a/engine/battle/effect_commands/rollout.asm +++ b/engine/battle/effect_commands/rollout.asm @@ -4,11 +4,11 @@ MAX_ROLLOUT_COUNT EQU 5 BattleCommand_CheckCurl: ; 37718 ; checkcurl - ld de, PlayerRolloutCount + ld de, wPlayerRolloutCount ld a, [hBattleTurn] and a jr z, .ok - ld de, EnemyRolloutCount + ld de, wEnemyRolloutCount .ok ld a, BATTLE_VARS_SUBSTATUS1 call GetBattleVar @@ -33,11 +33,11 @@ BattleCommand_RolloutPower: ; 37734 and SLP ret nz - ld hl, PlayerRolloutCount + ld hl, wPlayerRolloutCount ld a, [hBattleTurn] and a jr z, .got_rollout_count - ld hl, EnemyRolloutCount + ld hl, wEnemyRolloutCount .got_rollout_count ld a, [hl] @@ -47,7 +47,7 @@ BattleCommand_RolloutPower: ; 37734 ld [wSomeoneIsRampaging], a .skip_set_rampage - ld a, [AttackMissed] + ld a, [wAttackMissed] and a jr z, .hit @@ -84,7 +84,7 @@ BattleCommand_RolloutPower: ; 37734 dec b jr z, .done_damage - ld hl, CurDamage + 1 + ld hl, wCurDamage + 1 sla [hl] dec hl rl [hl] -- cgit v1.2.3