diff options
Diffstat (limited to 'src/engine/ai')
| -rw-r--r-- | src/engine/ai/attacks.asm | 4 | ||||
| -rw-r--r-- | src/engine/ai/init.asm | 2 | ||||
| -rw-r--r-- | src/engine/ai/retreat.asm | 4 | ||||
| -rw-r--r-- | src/engine/ai/trainer_cards.asm | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/ai/attacks.asm b/src/engine/ai/attacks.asm index 3b331a6..69ae2e1 100644 --- a/src/engine/ai/attacks.asm +++ b/src/engine/ai/attacks.asm @@ -147,8 +147,8 @@ AIProcessAttacks: ; 169fc (5:69fc) ; return carry if attack is chosen ; and AI tries to use it. .use_attack - ld a, $01 - ld [wcddb], a + ld a, TRUE + ld [wAITriedAttack], a call AITryUseAttack scf ret diff --git a/src/engine/ai/init.asm b/src/engine/ai/init.asm index 9f252d6..406d7d9 100644 --- a/src/engine/ai/init.asm +++ b/src/engine/ai/init.asm @@ -19,7 +19,7 @@ InitAITurnVars: ; 15649 (5:5649) xor a ld [wPreviousAIFlags], a - ld [wcddb], a + ld [wAITriedAttack], a ld [wcddc], a ld [wAIRetreatedThisTurn], a diff --git a/src/engine/ai/retreat.asm b/src/engine/ai/retreat.asm index 04fc415..768a48b 100644 --- a/src/engine/ai/retreat.asm +++ b/src/engine/ai/retreat.asm @@ -434,7 +434,7 @@ AIDecideWhetherToRetreat: ; 158b2 (5:58b2) jr .set_carry ; if player's turn and loaded attack is not a Pokémon Power OR -; if opponent's turn and wcddb == 0 +; if opponent's turn and wAITriedAttack == 0 ; set wcdda's bit 7 flag Func_15b54: ; 15b54 (5:5b54) xor a @@ -450,7 +450,7 @@ Func_15b54: ; 15b54 (5:5b54) jr .set_flag .opponent - ld a, [wcddb] + ld a, [wAITriedAttack] or a ret nz diff --git a/src/engine/ai/trainer_cards.asm b/src/engine/ai/trainer_cards.asm index e85b022..6c1f3a2 100644 --- a/src/engine/ai/trainer_cards.asm +++ b/src/engine/ai/trainer_cards.asm @@ -1,7 +1,7 @@ INCLUDE "data/ai_trainer_card_logic.asm" _AIProcessHandTrainerCards: ; 200e5 (8:40e5) - ld [wce18], a + ld [wAITrainerCardPhase], a ; create hand list in wDuelTempList and wTempHandCardList. call CreateHandCardList ld hl, wDuelTempList @@ -16,7 +16,7 @@ _AIProcessHandTrainerCards: ; 200e5 (8:40e5) ret z push hl - ld a, [wce18] + ld a, [wAITrainerCardPhase] ld d, a ld hl, AITrainerCardLogic .loop_data |