diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-24 17:43:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-24 17:43:48 -0400 |
| commit | d0d61cb3ab847ff0c72a840363b89d4acf05b5f5 (patch) | |
| tree | 8c5fd287e727f253f84c89ce32f01a76f948e4fb /battle/ai/switch.asm | |
| parent | 080704e49f49777baac124d1bba8c1066acd1bb1 (diff) | |
| parent | 0e76127da878efbe86997eb5a58e6bcd4bf66ff5 (diff) | |
Merge pull request #354 from FredrIQ/comments
Fix a reversed label mistake and reference a major bug
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 |