diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-05 23:50:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 23:50:02 -0500 |
| commit | 5db3bdd6551fad07066b669db1e44a6151aaa0b4 (patch) | |
| tree | ab357b894c9457b3d1d38fd49300df34412168f8 /engine/battle/trainer_ai.asm | |
| parent | Merge pull request #59 from Rangi42/master (diff) | |
| parent | Sync more with pokered (diff) | |
| download | pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.gz pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.xz pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.zip | |
Merge pull request #60 from Rangi42/master
Organize home and macro code
Diffstat (limited to 'engine/battle/trainer_ai.asm')
| -rw-r--r-- | engine/battle/trainer_ai.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 17e68e75..94e427a1 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -295,10 +295,10 @@ TrainerAI: cp LINK_STATE_BATTLING jr z, .done ; if in a link battle, we're done as well ld a, [wEnemyBattleStatus1] - and 1 << CHARGING_UP | 1 << THRASHING_ABOUT | 1 << STORING_ENERGY ; %10011 + and 1 << CHARGING_UP | 1 << THRASHING_ABOUT | 1 << STORING_ENERGY jr nz, .done ; don't follow trainer ai if opponent is in a locked state ld a, [wEnemyBattleStatus2] - and 1 << USING_RAGE ; %1000000 + and 1 << USING_RAGE jr nz, .done ; don't follow trainer ai if opponent is locked in rage ; note that this doesn't check for hyper beam recharge which can cause problems ld a, [wTrainerClass] ; what trainer class is this? @@ -311,7 +311,7 @@ TrainerAI: add hl, bc ld a, [wAICount] and a - jr z, .done; if no AI uses left, we're done here + jr z, .done ; if no AI uses left, we're done here inc hl inc a jr nz, .getpointer |