diff options
| author | Fredrik Ljungdahl <fredde1994@gmail.com> | 2017-01-08 01:26:48 +0100 |
|---|---|---|
| committer | Fredrik Ljungdahl <fredde1994@gmail.com> | 2017-01-08 01:26:48 +0100 |
| commit | f8455e9b4f0270811dac718810811292beb41da6 (patch) | |
| tree | 3331a394e71b2518c04314866f7c5ec5e40bbb19 /battle/ai/switch.asm | |
| parent | 146d12d6e50ed468bcb4866b23483bdebf4e5874 (diff) | |
Reverse the LastEnemyCounterMove and LastPlayerCounterMove labels
They were swapped
Diffstat (limited to 'battle/ai/switch.asm')
| -rwxr-xr-x | battle/ai/switch.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/battle/ai/switch.asm b/battle/ai/switch.asm index cb1fe3660..c2f83fa1f 100755 --- a/battle/ai/switch.asm +++ b/battle/ai/switch.asm @@ -229,7 +229,7 @@ CheckAbleToSwitch: ; 34941 cp 11 ret nc - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] and a jr z, .no_last_counter_move @@ -378,8 +378,8 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a ld [CurSpecies], a call GetBaseData - ; the enemy's last move is damaging... - ld a, [LastEnemyCounterMove] + ; the player's last move is damaging... + ld a, [LastPlayerCounterMove] dec a ld hl, Moves + MOVE_POWER call GetMoveAttr @@ -568,7 +568,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20 push hl ld [CurSpecies], a call GetBaseData - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] and a jr z, .skip_move |