diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-05 19:58:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 19:58:21 -0400 |
| commit | c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0 (patch) | |
| tree | 531d6b30d5a606ae963024825ed6e614843000a6 /engine/battle/trainer_ai.asm | |
| parent | Merge pull request #257 from Rangi42/master (diff) | |
| parent | db $f6 == script_cable_club_receptionist (diff) | |
| download | pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.tar.gz pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.tar.xz pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.zip | |
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'engine/battle/trainer_ai.asm')
| -rw-r--r-- | engine/battle/trainer_ai.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index d61b44f8..8373ef4f 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -549,7 +549,7 @@ AIPrintItemUseAndUpdateHPBar: jp DecrementAICount AISwitchIfEnoughMons: -; enemy trainer switches if there are 3 or more unfainted mons in party +; enemy trainer switches if there are 2 or more unfainted mons in party ld a, [wEnemyPartyCount] ld c, a ld hl, wEnemyMon1HP @@ -573,7 +573,7 @@ AISwitchIfEnoughMons: jr nz, .loop ld a, d ; how many available monsters are there? - cp 2 ; don't bother if only 1 or 2 + cp 2 ; don't bother if only 1 jp nc, SwitchEnemyMon and a ret @@ -610,8 +610,8 @@ SwitchEnemyMon: ret AIBattleWithdrawText: - TX_FAR _AIBattleWithdrawText - db "@" + text_far _AIBattleWithdrawText + text_end AIUseFullHeal: call AIPlayRestoringSFX @@ -735,5 +735,5 @@ AIPrintItemUse_: jp PrintText AIBattleUseItemText: - TX_FAR _AIBattleUseItemText - db "@" + text_far _AIBattleUseItemText + text_end |