From ca15abf2ffc14fdb92079f6fccff09eb04305d18 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 23 Sep 2021 18:37:05 +0100 Subject: Split bank1 --- src/engine/ai/init.asm | 6 +++--- src/engine/ai/pkmn_powers.asm | 2 +- src/engine/ai/trainer_cards.asm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/engine/ai') diff --git a/src/engine/ai/init.asm b/src/engine/ai/init.asm index 406d7d9..33132cf 100644 --- a/src/engine/ai/init.asm +++ b/src/engine/ai/init.asm @@ -1,11 +1,11 @@ InitAIDuelVars: ; 15636 (5:5636) - ld a, $10 - ld hl, wcda5 + ld a, wAIDuelVarsEnd - wAIDuelVars + ld hl, wAIDuelVars call ClearMemory_Bank5 ld a, 5 ld [wAIPokedexCounter], a ld a, $ff - ld [wcda5], a + ld [wAIPeekedPrizes], a ret ; initializes some variables and sets value of wAIBarrierFlagCounter. diff --git a/src/engine/ai/pkmn_powers.asm b/src/engine/ai/pkmn_powers.asm index 52a8036..8ae629a 100644 --- a/src/engine/ai/pkmn_powers.asm +++ b/src/engine/ai/pkmn_powers.asm @@ -727,7 +727,7 @@ HandleAIPeek: ; 224e6 (8:64e6) .check_ai_prizes ld a, DUELVARS_PRIZES call GetTurnDuelistVariable - ld hl, wcda5 + ld hl, wAIPeekedPrizes and [hl] ld [hl], a or a diff --git a/src/engine/ai/trainer_cards.asm b/src/engine/ai/trainer_cards.asm index 6c1f3a2..4bee001 100644 --- a/src/engine/ai/trainer_cards.asm +++ b/src/engine/ai/trainer_cards.asm @@ -1,4 +1,4 @@ -INCLUDE "data/ai_trainer_card_logic.asm" +INCLUDE "data/duel/ai_trainer_card_logic.asm" _AIProcessHandTrainerCards: ; 200e5 (8:40e5) ld [wAITrainerCardPhase], a -- cgit v1.2.3