diff options
| author | Daniel Harding <33dannye@gmail.com> | 2021-02-03 22:18:22 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 22:18:22 -0600 |
| commit | 6e5930f1fd92ba435c58a7936b15ded2cd4118aa (patch) | |
| tree | cf2d7134e0a8caf413938b5062f2ae80be9d6239 /src/engine/deck_ai | |
| parent | dd304349c3e19bfe5d3cec3666367cc561b2d833 (diff) | |
| parent | 616d0d2468c1d4d3c7c6e59e9a4a8dc84b16577b (diff) | |
Merge pull request #94 from ElectroDeoxys/master
Consolidate "move" and "attack"
Diffstat (limited to 'src/engine/deck_ai')
| -rw-r--r-- | src/engine/deck_ai/decks/legendary_articuno.asm | 10 | ||||
| -rw-r--r-- | src/engine/deck_ai/decks/sams_practice.asm | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/deck_ai/decks/legendary_articuno.asm b/src/engine/deck_ai/decks/legendary_articuno.asm index 562e7c5..6b3b9f8 100644 --- a/src/engine/deck_ai/decks/legendary_articuno.asm +++ b/src/engine/deck_ai/decks/legendary_articuno.asm @@ -91,18 +91,18 @@ ScoreLegendaryArticunoCards: ; 14c91 (5:4c91) ; player prizes >= 3 ; if Lapras has more than half HP and -; can use second move, check next for Articuno +; can use second attack, check next for Articuno ; otherwise, check if Articuno or Dewgong -; have more than half HP and can use second move +; have more than half HP and can use second attack ; and if so, the next Pokémon to check is Lapras ld a, LAPRAS - call CheckForBenchIDAtHalfHPAndCanUseSecondMove + call CheckForBenchIDAtHalfHPAndCanUseSecondAttack jr c, .articuno ld a, ARTICUNO1 - call CheckForBenchIDAtHalfHPAndCanUseSecondMove + call CheckForBenchIDAtHalfHPAndCanUseSecondAttack jr c, .lapras ld a, DEWGONG - call CheckForBenchIDAtHalfHPAndCanUseSecondMove + call CheckForBenchIDAtHalfHPAndCanUseSecondAttack jr c, .lapras jr .articuno diff --git a/src/engine/deck_ai/decks/sams_practice.asm b/src/engine/deck_ai/decks/sams_practice.asm index 10ce811..b92253d 100644 --- a/src/engine/deck_ai/decks/sams_practice.asm +++ b/src/engine/deck_ai/decks/sams_practice.asm @@ -104,7 +104,7 @@ AIPerformScriptedTurn: ; 1483a (5:483a) xor a ldh [hTempPlayAreaLocation_ff9d], a ld [wSelectedAttack], a - call CheckIfSelectedMoveIsUnusable + call CheckIfSelectedAttackIsUnusable jr c, .unusable call AITryUseAttack ret |