Clean up white space

47 files changed, 2889 insertions, 2895 deletions

diff --git a/STYLE_GUIDE.md b/STYLE_GUIDE.md
index 42b0774..4727496 100644
--- a/STYLE_GUIDE.md
+++ b/STYLE_GUIDE.md
@@ -221,7 +221,7 @@ When naming WRAM addresses that belong to the same context or feature, try to ma
 wLoadedCard1:: ; cc24
 	card_data_struct wLoadedCard1
 wLoadedCard2:: ; cc65
-	card_data_struct wLoadedCard2	
+	card_data_struct wLoadedCard2
 ```
 
 Lastly, adding some line of commentary to the memory address is helpful when just the name itself doesn't quite tell the whole story. Usually, this is done to clarify where the memory address is used, or to explain which kind of different values it may hold and perhaps what each of them means (or just to mention the support of specific values, such as $00 or $ff). If the RAM address is supposed to hold a value that maps directly to some group of already defined constants, this is the perfect place to indicate it. Adding commentary to an address that contains a bit field is also particularly useful to describe what each bit means, since that's not doable with just the address name.
diff --git a/src/constants/animation_constants.asm b/src/constants/animation_constants.asm
index f326d5e..bdf93f8 100644
--- a/src/constants/animation_constants.asm
+++ b/src/constants/animation_constants.asm
@@ -6,6 +6,6 @@ ANIM_FURY_SWEEPES    EQU $24
 
 ; Special animations
 ANIM_SHOW_DAMAGE     EQU $09
-ANIM_SHAKE1          EQU $fa 
+ANIM_SHAKE1          EQU $fa
 ANIM_SHAKE2          EQU $fb
-ANIM_SHAKE3          EQU $fc
\ No newline at end of file
+ANIM_SHAKE3          EQU $fc
diff --git a/src/constants/deck_ai_constants.asm b/src/constants/deck_ai_constants.asm
index ceae8ed..a0b87f7 100644
--- a/src/constants/deck_ai_constants.asm
+++ b/src/constants/deck_ai_constants.asm
@@ -1,61 +1,61 @@
-; wPreviousAIFlags and wCurrentAIFlags constants

-AI_FLAG_USED_PLUSPOWER     EQU 1 << 0

-AI_FLAG_USED_SWITCH        EQU 1 << 1

-AI_FLAG_USED_PROFESSOR_OAK EQU 1 << 2

-AI_FLAG_MODIFIED_HAND      EQU 1 << 3

-AI_FLAG_USED_GUST_OF_WIND  EQU 1 << 4

-

-; used as input for AIProcessEnergyCards to determine what to check

-; and whether to play card after the routine is over.

-; I suspect AI_ENERGY_FLAG_DONT_PLAY to be a flag to signal the routine

-; not to actually play the energy card after it's finished,

-; but AIProcessEnergyCards checks whether ANY flag is set in order

-; to decide not to play it, so it's redundant in the presence of another flag.

-AI_ENERGY_FLAG_DONT_PLAY       EQU 1 << 0 ; whether to play energy card (?)

-AI_ENERGY_FLAG_SKIP_EVOLUTION  EQU 1 << 1 ; whether to check if card has evolutions

-AI_ENERGY_FLAG_SKIP_ARENA_CARD EQU 1 << 7 ; whether to include Arena card in determining which card to attach energy

-

-; used to determine which Trainer cards for AI

-; to process in AIProcessHandTrainerCards.

-; these go in chronological order, except for

-; AI_TRAINER_CARD_PHASE_14 which happens just before AI attacks.

-; AI_TRAINER_CARD_PHASE_15 is reserved for Professor Oak card.

-; if Professor Oak is played, all other Trainer card phases

-; are processed again except AI_TRAINER_CARD_PHASE_15.

-	const_def 1

-	const AI_TRAINER_CARD_PHASE_01 ; $1

-	const AI_TRAINER_CARD_PHASE_02 ; $2

-	const AI_TRAINER_CARD_PHASE_03 ; $3

-	const AI_TRAINER_CARD_PHASE_04 ; $4

-	const AI_TRAINER_CARD_PHASE_05 ; $5

-	const AI_TRAINER_CARD_PHASE_06 ; $6

-	const AI_TRAINER_CARD_PHASE_07 ; $7

-	const AI_TRAINER_CARD_PHASE_08 ; $8

-	const AI_TRAINER_CARD_PHASE_09 ; $9

-	const AI_TRAINER_CARD_PHASE_10 ; $a

-	const AI_TRAINER_CARD_PHASE_11 ; $b

-	const AI_TRAINER_CARD_PHASE_12 ; $c

-	const AI_TRAINER_CARD_PHASE_13 ; $d

-	const AI_TRAINER_CARD_PHASE_14 ; $e, just before attack

-	const AI_TRAINER_CARD_PHASE_15 ; $f, for Professor Oak

-

-; used by wAIBarrierFlagCounter to determine

-; whether Player is running Mewtwo1 mill deck.

-; flag set means true, flag not set means false.

-AI_FLAG_MEWTWO_MILL EQU 1 << 7

-

-; defines the behaviour of HandleAIEnergyTrans, for determining

-; whether to move energy cards from the Bench to the Arena or vice-versa

-; and the number of energy cards needed for achieving that.

-AI_ENERGY_TRANS_RETREAT  EQU $9 ; moves energy cards needed for Retreat Cost

-AI_ENERGY_TRANS_ATTACK   EQU $d ; moves energy cards needed for second attack

-AI_ENERGY_TRANS_TO_BENCH EQU $e ; moves energy cards away from Arena card

-

-; used to know which AI routine to call in

-; the AIAction pointer tables in AIDoAction

-	const_def 1

-    const AIACTION_DO_TURN       ; $1

-    const AIACTION_START_DUEL    ; $2

-    const AIACTION_FORCED_SWITCH ; $3

-    const AIACTION_KO_SWITCH     ; $4

-    const AIACTION_TAKE_PRIZE    ; $5

+; wPreviousAIFlags and wCurrentAIFlags constants
+AI_FLAG_USED_PLUSPOWER     EQU 1 << 0
+AI_FLAG_USED_SWITCH        EQU 1 << 1
+AI_FLAG_USED_PROFESSOR_OAK EQU 1 << 2
+AI_FLAG_MODIFIED_HAND      EQU 1 << 3
+AI_FLAG_USED_GUST_OF_WIND  EQU 1 << 4
+
+; used as input for AIProcessEnergyCards to determine what to check
+; and whether to play card after the routine is over.
+; I suspect AI_ENERGY_FLAG_DONT_PLAY to be a flag to signal the routine
+; not to actually play the energy card after it's finished,
+; but AIProcessEnergyCards checks whether ANY flag is set in order
+; to decide not to play it, so it's redundant in the presence of another flag.
+AI_ENERGY_FLAG_DONT_PLAY       EQU 1 << 0 ; whether to play energy card (?)
+AI_ENERGY_FLAG_SKIP_EVOLUTION  EQU 1 << 1 ; whether to check if card has evolutions
+AI_ENERGY_FLAG_SKIP_ARENA_CARD EQU 1 << 7 ; whether to include Arena card in determining which card to attach energy
+
+; used to determine which Trainer cards for AI
+; to process in AIProcessHandTrainerCards.
+; these go in chronological order, except for
+; AI_TRAINER_CARD_PHASE_14 which happens just before AI attacks.
+; AI_TRAINER_CARD_PHASE_15 is reserved for Professor Oak card.
+; if Professor Oak is played, all other Trainer card phases
+; are processed again except AI_TRAINER_CARD_PHASE_15.
+	const_def 1
+	const AI_TRAINER_CARD_PHASE_01 ; $1
+	const AI_TRAINER_CARD_PHASE_02 ; $2
+	const AI_TRAINER_CARD_PHASE_03 ; $3
+	const AI_TRAINER_CARD_PHASE_04 ; $4
+	const AI_TRAINER_CARD_PHASE_05 ; $5
+	const AI_TRAINER_CARD_PHASE_06 ; $6
+	const AI_TRAINER_CARD_PHASE_07 ; $7
+	const AI_TRAINER_CARD_PHASE_08 ; $8
+	const AI_TRAINER_CARD_PHASE_09 ; $9
+	const AI_TRAINER_CARD_PHASE_10 ; $a
+	const AI_TRAINER_CARD_PHASE_11 ; $b
+	const AI_TRAINER_CARD_PHASE_12 ; $c
+	const AI_TRAINER_CARD_PHASE_13 ; $d
+	const AI_TRAINER_CARD_PHASE_14 ; $e, just before attack
+	const AI_TRAINER_CARD_PHASE_15 ; $f, for Professor Oak
+
+; used by wAIBarrierFlagCounter to determine
+; whether Player is running Mewtwo1 mill deck.
+; flag set means true, flag not set means false.
+AI_FLAG_MEWTWO_MILL EQU 1 << 7
+
+; defines the behaviour of HandleAIEnergyTrans, for determining
+; whether to move energy cards from the Bench to the Arena or vice-versa
+; and the number of energy cards needed for achieving that.
+AI_ENERGY_TRANS_RETREAT  EQU $9 ; moves energy cards needed for Retreat Cost
+AI_ENERGY_TRANS_ATTACK   EQU $d ; moves energy cards needed for second attack
+AI_ENERGY_TRANS_TO_BENCH EQU $e ; moves energy cards away from Arena card
+
+; used to know which AI routine to call in
+; the AIAction pointer tables in AIDoAction
+	const_def 1
+	const AIACTION_DO_TURN       ; $1
+	const AIACTION_START_DUEL    ; $2
+	const AIACTION_FORCED_SWITCH ; $3
+	const AIACTION_KO_SWITCH     ; $4
+	const AIACTION_TAKE_PRIZE    ; $5
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm
index 344cff1..de1d07a 100644
--- a/src/constants/duel_constants.asm
+++ b/src/constants/duel_constants.asm
@@ -227,9 +227,9 @@ EFFECT_FAILED_UNSUCCESSFUL EQU $02
 ; wAnimationQueue length
 ANIMATION_QUEUE_LENGTH EQU 7
 
-PRIZES_1	EQU $01
-PRIZES_2	EQU $02
-PRIZES_3	EQU $03
-PRIZES_4	EQU $04
-PRIZES_5	EQU $05
-PRIZES_6	EQU $06
+PRIZES_1 EQU $01
+PRIZES_2 EQU $02
+PRIZES_3 EQU $03
+PRIZES_4 EQU $04
+PRIZES_5 EQU $05
+PRIZES_6 EQU $06
diff --git a/src/constants/name_constants.asm b/src/constants/name_constants.asm
index 7d4370c..7728cca 100644
--- a/src/constants/name_constants.asm
+++ b/src/constants/name_constants.asm
@@ -3,4 +3,4 @@ NAME_BUFFER_LENGTH          EQU 16
 MAX_PLAYER_NAME_LENGTH      EQU 6   * 2
 MAX_DECK_NAME_LENGTH        EQU 20  * 1 ; note that its unit is byte!
 
-NAMING_SCREEN_BUFFER_LENGTH EQU 24
\ No newline at end of file
+NAMING_SCREEN_BUFFER_LENGTH EQU 24
diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm
index eb7b75b..b775a83 100644
--- a/src/constants/npc_constants.asm
+++ b/src/constants/npc_constants.asm
@@ -192,4 +192,3 @@ const_value = const_value+1 ; NPC_11F49 duplicate
 	const NPC_RONALD2                     ; $71
 	const NPC_RONALD3                     ; $72
 const_value = const_value+1 ; NPC_11f49 duplicate
-
diff --git a/src/constants/sfx_constants.asm b/src/constants/sfx_constants.asm
index 4745260..0a99f25 100644
--- a/src/constants/sfx_constants.asm
+++ b/src/constants/sfx_constants.asm
@@ -95,4 +95,3 @@
 	const SFX_5D   ; $5d
 	const SFX_5E   ; $5e
 	const SFX_5F   ; $5f
-
diff --git a/src/data/deck_ai_pointers.asm b/src/data/deck_ai_pointers.asm
index 4f00299..ba8fab7 100644
--- a/src/data/deck_ai_pointers.asm
+++ b/src/data/deck_ai_pointers.asm
@@ -1,55 +1,55 @@
-DeckAIPointerTable: ; 14000 (05:4000)

-	dw AIActionTable_SamPractice         ; SAMS_PRACTICE_DECK

-	dw AIActionTable_GeneralDecks        ; PRACTICE_PLAYER_DECK

-	dw AIActionTable_GeneralDecks        ; SAMS_NORMAL_DECK

-	dw AIActionTable_GeneralDecks        ; CHARMANDER_AND_FRIENDS_DECK

-	dw AIActionTable_GeneralDecks        ; CHARMANDER_EXTRA_DECK

-	dw AIActionTable_GeneralDecks        ; SQUIRTLE_AND_FRIENDS_DECK

-	dw AIActionTable_GeneralDecks        ; SQUIRTLE_EXTRA_DECK

-	dw AIActionTable_GeneralDecks        ; BULBASAUR_AND_FRIENDS_DECK

-	dw AIActionTable_GeneralDecks        ; BULBASAUR_EXTRA_DECK

-	dw AIActionTable_GeneralDecks        ; LIGHTNING_AND_FIRE_DECK

-	dw AIActionTable_GeneralDecks        ; WATER_AND_FIGHTING_DECK

-	dw AIActionTable_GeneralDecks        ; GRASS_AND_PSYCHIC_DECK

-	dw AIActionTable_LegendaryMoltres    ; LEGENDARY_MOLTRES_DECK

-	dw AIActionTable_LegendaryZapdos     ; LEGENDARY_ZAPDOS_DECK

-	dw AIActionTable_LegendaryArticuno   ; LEGENDARY_ARTICUNO_DECK

-	dw AIActionTable_LegendaryDragonite  ; LEGENDARY_DRAGONITE_DECK

-	dw AIActionTable_FirstStrike         ; FIRST_STRIKE_DECK

-	dw AIActionTable_RockCrusher         ; ROCK_CRUSHER_DECK

-	dw AIActionTable_GoGoRainDance       ; GO_GO_RAIN_DANCE_DECK

-	dw AIActionTable_ZappingSelfdestruct ; ZAPPING_SELFDESTRUCT_DECK

-	dw AIActionTable_FlowerPower         ; FLOWER_POWER_DECK

-	dw AIActionTable_StrangePsyshock     ; STRANGE_PSYSHOCK_DECK

-	dw AIActionTable_WondersOfScience    ; WONDERS_OF_SCIENCE_DECK

-	dw AIActionTable_FireCharge          ; FIRE_CHARGE_DECK

-	dw AIActionTable_ImRonald            ; IM_RONALD_DECK

-	dw AIActionTable_PowerfulRonald      ; POWERFUL_RONALD_DECK

-	dw AIActionTable_InvincibleRonald    ; INVINCIBLE_RONALD_DECK

-	dw AIActionTable_LegendaryRonald     ; LEGENDARY_RONALD_DECK

-	dw AIActionTable_GeneralNoRetreat    ; MUSCLES_FOR_BRAINS_DECK

-	dw AIActionTable_GeneralDecks        ; HEATED_BATTLE_DECK

-	dw AIActionTable_GeneralDecks        ; LOVE_TO_BATTLE_DECK

-	dw AIActionTable_GeneralDecks        ; EXCAVATION_DECK

-	dw AIActionTable_GeneralDecks        ; BLISTERING_POKEMON_DECK

-	dw AIActionTable_GeneralDecks        ; HARD_POKEMON_DECK

-	dw AIActionTable_GeneralDecks        ; WATERFRONT_POKEMON_DECK

-	dw AIActionTable_GeneralDecks        ; LONELY_FRIENDS_DECK

-	dw AIActionTable_GeneralDecks        ; SOUND_OF_THE_WAVES_DECK

-	dw AIActionTable_GeneralDecks        ; PIKACHU_DECK

-	dw AIActionTable_GeneralDecks        ; BOOM_BOOM_SELFDESTRUCT_DECK

-	dw AIActionTable_GeneralDecks        ; POWER_GENERATOR_DECK

-	dw AIActionTable_GeneralDecks        ; ETCETERA_DECK

-	dw AIActionTable_GeneralDecks        ; FLOWER_GARDEN_DECK

-	dw AIActionTable_GeneralDecks        ; KALEIDOSCOPE_DECK

-	dw AIActionTable_GeneralDecks        ; GHOST_DECK

-	dw AIActionTable_GeneralDecks        ; NAP_TIME_DECK

-	dw AIActionTable_GeneralDecks        ; STRANGE_POWER_DECK

-	dw AIActionTable_GeneralDecks        ; FLYIN_POKEMON_DECK

-	dw AIActionTable_GeneralDecks        ; LOVELY_NIDORAN_DECK

-	dw AIActionTable_GeneralDecks        ; POISON_DECK

-	dw AIActionTable_GeneralDecks        ; ANGER_DECK

-	dw AIActionTable_GeneralDecks        ; FLAMETHROWER_DECK

-	dw AIActionTable_GeneralDecks        ; RESHUFFLE_DECK

-	dw AIActionTable_GeneralNoRetreat    ; IMAKUNI_DECK

-; 1406a

+DeckAIPointerTable: ; 14000 (05:4000)
+	dw AIActionTable_SamPractice         ; SAMS_PRACTICE_DECK
+	dw AIActionTable_GeneralDecks        ; PRACTICE_PLAYER_DECK
+	dw AIActionTable_GeneralDecks        ; SAMS_NORMAL_DECK
+	dw AIActionTable_GeneralDecks        ; CHARMANDER_AND_FRIENDS_DECK
+	dw AIActionTable_GeneralDecks        ; CHARMANDER_EXTRA_DECK
+	dw AIActionTable_GeneralDecks        ; SQUIRTLE_AND_FRIENDS_DECK
+	dw AIActionTable_GeneralDecks        ; SQUIRTLE_EXTRA_DECK
+	dw AIActionTable_GeneralDecks        ; BULBASAUR_AND_FRIENDS_DECK
+	dw AIActionTable_GeneralDecks        ; BULBASAUR_EXTRA_DECK
+	dw AIActionTable_GeneralDecks        ; LIGHTNING_AND_FIRE_DECK
+	dw AIActionTable_GeneralDecks        ; WATER_AND_FIGHTING_DECK
+	dw AIActionTable_GeneralDecks        ; GRASS_AND_PSYCHIC_DECK
+	dw AIActionTable_LegendaryMoltres    ; LEGENDARY_MOLTRES_DECK
+	dw AIActionTable_LegendaryZapdos     ; LEGENDARY_ZAPDOS_DECK
+	dw AIActionTable_LegendaryArticuno   ; LEGENDARY_ARTICUNO_DECK
+	dw AIActionTable_LegendaryDragonite  ; LEGENDARY_DRAGONITE_DECK
+	dw AIActionTable_FirstStrike         ; FIRST_STRIKE_DECK
+	dw AIActionTable_RockCrusher         ; ROCK_CRUSHER_DECK
+	dw AIActionTable_GoGoRainDance       ; GO_GO_RAIN_DANCE_DECK
+	dw AIActionTable_ZappingSelfdestruct ; ZAPPING_SELFDESTRUCT_DECK
+	dw AIActionTable_FlowerPower         ; FLOWER_POWER_DECK
+	dw AIActionTable_StrangePsyshock     ; STRANGE_PSYSHOCK_DECK
+	dw AIActionTable_WondersOfScience    ; WONDERS_OF_SCIENCE_DECK
+	dw AIActionTable_FireCharge          ; FIRE_CHARGE_DECK
+	dw AIActionTable_ImRonald            ; IM_RONALD_DECK
+	dw AIActionTable_PowerfulRonald      ; POWERFUL_RONALD_DECK
+	dw AIActionTable_InvincibleRonald    ; INVINCIBLE_RONALD_DECK
+	dw AIActionTable_LegendaryRonald     ; LEGENDARY_RONALD_DECK
+	dw AIActionTable_GeneralNoRetreat    ; MUSCLES_FOR_BRAINS_DECK
+	dw AIActionTable_GeneralDecks        ; HEATED_BATTLE_DECK
+	dw AIActionTable_GeneralDecks        ; LOVE_TO_BATTLE_DECK
+	dw AIActionTable_GeneralDecks        ; EXCAVATION_DECK
+	dw AIActionTable_GeneralDecks        ; BLISTERING_POKEMON_DECK
+	dw AIActionTable_GeneralDecks        ; HARD_POKEMON_DECK
+	dw AIActionTable_GeneralDecks        ; WATERFRONT_POKEMON_DECK
+	dw AIActionTable_GeneralDecks        ; LONELY_FRIENDS_DECK
+	dw AIActionTable_GeneralDecks        ; SOUND_OF_THE_WAVES_DECK
+	dw AIActionTable_GeneralDecks        ; PIKACHU_DECK
+	dw AIActionTable_GeneralDecks        ; BOOM_BOOM_SELFDESTRUCT_DECK
+	dw AIActionTable_GeneralDecks        ; POWER_GENERATOR_DECK
+	dw AIActionTable_GeneralDecks        ; ETCETERA_DECK
+	dw AIActionTable_GeneralDecks        ; FLOWER_GARDEN_DECK
+	dw AIActionTable_GeneralDecks        ; KALEIDOSCOPE_DECK
+	dw AIActionTable_GeneralDecks        ; GHOST_DECK
+	dw AIActionTable_GeneralDecks        ; NAP_TIME_DECK
+	dw AIActionTable_GeneralDecks        ; STRANGE_POWER_DECK
+	dw AIActionTable_GeneralDecks        ; FLYIN_POKEMON_DECK
+	dw AIActionTable_GeneralDecks        ; LOVELY_NIDORAN_DECK
+	dw AIActionTable_GeneralDecks        ; POISON_DECK
+	dw AIActionTable_GeneralDecks        ; ANGER_DECK
+	dw AIActionTable_GeneralDecks        ; FLAMETHROWER_DECK
+	dw AIActionTable_GeneralDecks        ; RESHUFFLE_DECK
+	dw AIActionTable_GeneralNoRetreat    ; IMAKUNI_DECK
+; 1406a
diff --git a/src/data/map_objects.asm b/src/data/map_objects.asm
index 1ac73fa..2331125 100644
--- a/src/data/map_objects.asm
+++ b/src/data/map_objects.asm
@@ -47,7 +47,7 @@ MasonLabObjects: ; 13b04 (3:7b04)
 
 	db $ff
 
- 
+
 DeckMachineRoomObjects: ; 13b4d (3:7b4d)
 	db NORTH, 2, 2
 	dw Script_d932
@@ -151,7 +151,7 @@ DeckMachineRoomObjects: ; 13b4d (3:7b4d)
 
 	db $ff
 
- 
+
 IshiharasHouseObjects: ; 13c02 (3:7c02)
 	db NORTH, 6, 2
 	dw PrintInteractableObjectText
@@ -215,7 +215,7 @@ IshiharasHouseObjects: ; 13c02 (3:7c02)
 
 	db $ff
 
- 
+
 FightingClubLobbyObjects: ; 13c6f (3:7c6f)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
@@ -249,7 +249,7 @@ FightingClubLobbyObjects: ; 13c6f (3:7c6f)
 
 	db $ff
 
- 
+
 RockClubLobbyObjects: ; 13ca6 (3:7ca6)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
@@ -283,7 +283,7 @@ RockClubLobbyObjects: ; 13ca6 (3:7ca6)
 
 	db $ff
 
- 
+
 WaterClubLobbyObjects: ; 13cdd (3:7cdd)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
@@ -317,7 +317,7 @@ WaterClubLobbyObjects: ; 13cdd (3:7cdd)
 
 	db $ff
 
- 
+
 LightningClubLobbyObjects: ; 13d14 (3:7d14)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
@@ -351,7 +351,7 @@ LightningClubLobbyObjects: ; 13d14 (3:7d14)
 
 	db $ff
 
- 
+
 GrassClubLobbyObjects: ; 13d4b (3:7d4b)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
@@ -385,7 +385,7 @@ GrassClubLobbyObjects: ; 13d4b (3:7d4b)
 
 	db $ff
 
- 
+
 PsychicClubLobbyObjects: ; 13d82 (3:7d82)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
@@ -419,7 +419,7 @@ PsychicClubLobbyObjects: ; 13d82 (3:7d82)
 
 	db $ff
 
- 
+
 ScienceClubLobbyObjects: ; 13db9 (3:7db9)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
@@ -453,7 +453,7 @@ ScienceClubLobbyObjects: ; 13db9 (3:7db9)
 
 	db $ff
 
- 
+
 FireClubLobbyObjects: ; 13df0 (3:7df0)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
@@ -487,7 +487,7 @@ FireClubLobbyObjects: ; 13df0 (3:7df0)
 
 	db $ff
 
- 
+
 ChallengeHallLobbyObjects: ; 13e27 (3:7e27)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
@@ -521,7 +521,7 @@ ChallengeHallLobbyObjects: ; 13e27 (3:7e27)
 
 	db $ff
 
- 
+
 PokemonDomeEntranceObjects: ; 13e5e (3:7e5e)
 	db NORTH, 2, 2
 	dw PrintInteractableObjectText
@@ -581,7 +581,7 @@ PokemonDomeEntranceObjects: ; 13e5e (3:7e5e)
 
 	db $ff
 
- 
+
 HallOfHonorObjects: ; 13ec2 (3:7ec2)
 	; Legendary Cards
 	db NORTH, 10, 10
@@ -606,5 +606,3 @@ HallOfHonorObjects: ; 13ec2 (3:7ec2)
 	tx Text041a
 
 	db $ff
-
- 
diff --git a/src/data/move_animations.asm b/src/data/move_animations.asm
index c384cd8..f774afa 100644
--- a/src/data/move_animations.asm
+++ b/src/data/move_animations.asm
@@ -911,4 +911,4 @@ MoveAnimation_5668:
 	anim_end
 
 MoveAnimation_5673:
-	anim_end
\ No newline at end of file
+	anim_end
diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index bc09d07..7c01e72 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -416,4 +416,3 @@ HallOfHonorNPCS: ; 7adf (4:13adf)
 	db NPC_LEGENDARY_CARD_RIGHT_SPARK, $0e, $0a, SOUTH
 	dw $0000
 	db $00
-
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index 398f35f..d074c45 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -4372,7 +4372,7 @@ CGBDefaultPalettes: ; 5b44 (1:5b44)
 	rgb 0, 0, 0
 ; BGP3
 	rgb 28, 28, 24
-	rgb 22, 0 ,22
+	rgb 22, 0, 22
 	rgb 27, 7, 3
 	rgb 0, 0, 0
 ; BGP4
@@ -7221,16 +7221,16 @@ ConvertSpecialTrainerCardToPokemon: ; 6d84 (1:6d84)
 	ret
 
 .trainer_to_pkmn_data
-    db 10                 ; CARD_DATA_HP
-    ds $07                ; CARD_DATA_MOVE1_NAME - (CARD_DATA_HP + 1)
-    tx DiscardName        ; CARD_DATA_MOVE1_NAME
-    tx DiscardDescription ; CARD_DATA_MOVE1_DESCRIPTION
-    ds $03                ; CARD_DATA_MOVE1_CATEGORY - (CARD_DATA_MOVE1_DESCRIPTION + 2)
-    db POKEMON_POWER      ; CARD_DATA_MOVE1_CATEGORY
-    dw TrainerCardAsPokemonEffectCommands ; CARD_DATA_MOVE1_EFFECT_COMMANDS
-    ds $18                ; CARD_DATA_RETREAT_COST - (CARD_DATA_MOVE1_EFFECT_COMMANDS + 2)
-    db UNABLE_RETREAT     ; CARD_DATA_RETREAT_COST
-    ds $0d                ; PKMN_CARD_DATA_LENGTH - (CARD_DATA_RETREAT_COST + 1)
+	db 10                 ; CARD_DATA_HP
+	ds $07                ; CARD_DATA_MOVE1_NAME - (CARD_DATA_HP + 1)
+	tx DiscardName        ; CARD_DATA_MOVE1_NAME
+	tx DiscardDescription ; CARD_DATA_MOVE1_DESCRIPTION
+	ds $03                ; CARD_DATA_MOVE1_CATEGORY - (CARD_DATA_MOVE1_DESCRIPTION + 2)
+	db POKEMON_POWER      ; CARD_DATA_MOVE1_CATEGORY
+	dw TrainerCardAsPokemonEffectCommands ; CARD_DATA_MOVE1_EFFECT_COMMANDS
+	ds $18                ; CARD_DATA_RETREAT_COST - (CARD_DATA_MOVE1_EFFECT_COMMANDS + 2)
+	db UNABLE_RETREAT     ; CARD_DATA_RETREAT_COST
+	ds $0d                ; PKMN_CARD_DATA_LENGTH - (CARD_DATA_RETREAT_COST + 1)
 
 ; this function applies status conditions to the defending Pokemon,
 ; returned by the effect functions in wEffectFunctionsFeedback
@@ -7622,7 +7622,7 @@ PrintThereWasNoEffectFromStatusText: ; 700a (1:700a)
 ; 0x7045
 
 ; returns carry if card at hTempPlayAreaLocation_ff9d
-; is a basic card. 
+; is a basic card.
 ; otherwise, lists the card indices of all stages in
 ; that card location, and returns the card one
 ; stage below.
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm
index 5a7761e..203d4bc 100644
--- a/src/engine/bank02.asm
+++ b/src/engine/bank02.asm
@@ -1833,7 +1833,7 @@ Func_8aaa: ; 8aaa (2:4aaa)
 
 Func_8b85: ; 8b85 (2:4b85)
 	INCROM $8b85, $8c8e
-	
+
 OpenGlossaryScreen_TransitionTable:
 	cursor_transition $08, $28, $00, $04, $01, $05, $05
 	cursor_transition $08, $38, $00, $00, $02, $06, $06
diff --git a/src/engine/bank05.asm b/src/engine/bank05.asm
index f7927af..170c45c 100644
--- a/src/engine/bank05.asm
+++ b/src/engine/bank05.asm
@@ -52,9 +52,9 @@ AIActionTable_Unreferenced: ; 1406a (5:406a)
 ; a card's moves KOs defending Pokémon
 ; outputs index of the move that KOs
 ; input:
-; 	[hTempPlayAreaLocation_ff9d] = location of attacking card to consider
+;	[hTempPlayAreaLocation_ff9d] = location of attacking card to consider
 ; output:
-; 	[wSelectedAttack] = move index that KOs
+;	[wSelectedAttack] = move index that KOs
 CheckIfAnyMoveKnocksOutDefendingCard: ; 140ae (5:40ae)
 	xor a ; first move
 	call CheckIfMoveKnocksOutDefendingCard
@@ -131,7 +131,7 @@ FindHighestBenchScore: ; 140df (5:40df)
 ; adds a to wAIScore
 ; if there's overflow, it's capped at $ff
 ; output:
-; 	a = a + wAIScore (capped at $ff)
+;	a = a + wAIScore (capped at $ff)
 AddToAIScore: ; 140fe (5:40fe)
 	push hl
 	ld hl, wAIScore
@@ -284,7 +284,7 @@ CheckIfEnergyIsUseful: ; 14184 (5:4184)
 	pop de
 	or a
 	ret
-	
+
 .check_energy
 	ld a, d
 	cp e
@@ -422,7 +422,7 @@ CheckIfSelectedMoveIsUnusable: ; 1424b (5:424b)
 	ld a, EFFECTCMDTYPE_INITIAL_EFFECT_1
 	call TryExecuteEffectCommandFunction
 	ret c
-	
+
 .bench
 	call CheckEnergyNeededForAttack
 	ret c ; can't be used
@@ -440,7 +440,7 @@ CheckIfSelectedMoveIsUnusable: ; 1424b (5:424b)
 ;	b = basic energy still needed
 ;	c = colorless energy still needed
 ;	e = output of ConvertColorToEnergyCardID, or $0 if not a move
-;	carry set if no move 
+;	carry set if no move
 ;	       OR if it's a Pokémon Power
 ;	       OR if not enough energy for move
 CheckEnergyNeededForAttack: ; 14279 (5:4279)
@@ -463,7 +463,7 @@ CheckEnergyNeededForAttack: ; 14279 (5:4279)
 	ld e, c
 	scf
 	ret
-	
+
 .is_attack
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	ld e, a
@@ -479,7 +479,7 @@ CheckEnergyNeededForAttack: ; 14279 (5:4279)
 	ld de, wLoadedMoveEnergyCost
 	ld b, 0
 	ld c, (NUM_TYPES / 2) - 1
-	
+
 .loop
 	; check all basic energy cards except colorless
 	ld a, [de]
@@ -498,7 +498,7 @@ CheckEnergyNeededForAttack: ; 14279 (5:4279)
 ; will always just return the result for one type of basic energy,
 ; while all others will necessarily have an energy cost of 0
 ; if moves are added to the game with energy requirements of
-; two different basic energy types, then this routine only accounts 
+; two different basic energy types, then this routine only accounts
 ; for the type with the highest index
 
 	; colorless
@@ -536,14 +536,14 @@ CheckEnergyNeededForAttack: ; 14279 (5:4279)
 	ret
 ; 0x142f4
 
-; takes as input the energy cost of a move for a 
+; takes as input the energy cost of a move for a
 ; particular energy, stored in the lower nibble of a
 ; if the move costs some amount of this energy, the lower nibble of a != 0,
 ; and this amount is stored in wTempLoadedMoveEnergyCost
 ; sets carry flag if not enough energy of this type attached
 ; input:
-; 	a    = this energy cost of move (lower nibble)
-; 	[hl] = attached energy
+;	a    = this energy cost of move (lower nibble)
+;	[hl] = attached energy
 ; output:
 ;	carry set if not enough of this energy type attached
 CheckIfEnoughParticularAttachedEnergy: ; 142f4 (5:42f4)
@@ -799,7 +799,7 @@ EstimateDamage_VersusDefendingCard: ; 143e5 (5:43e5)
 	ld a, [wDamage]
 	ld [wAIMinDamage], a
 	ld [wAIMaxDamage], a
-	
+
 .calculation
 ; if temp. location is active, damage calculation can be done directly...
 	ldh a, [hTempPlayAreaLocation_ff9d]
@@ -1070,9 +1070,9 @@ EstimateDamage_FromDefendingPokemon: ; 1450b (5:450b)
 ; and poison damage for two turns
 ; and outputs the result capped at a max of $ff
 ; input:
-; 	[wAIMinDamage] = base damage
-; 	[wAIMaxDamage] = base damage
-; 	[wDamage]      = base damage
+;	[wAIMinDamage] = base damage
+;	[wAIMaxDamage] = base damage
+;	[wDamage]      = base damage
 ;	[hTempPlayAreaLocation_ff9d] = location of card to calculate
 ;								 damage as the receiver
 CalculateDamage_FromDefendingPokemon: ; 1458c (5:458c)
@@ -1430,7 +1430,7 @@ InitAITurnVars: ; 15649 (5:5649)
 ;	b = basic energy still needed
 ;	c = colorless energy still needed
 ;	e = output of ConvertColorToEnergyCardID, or $0 if not a move
-;	carry set if no move 
+;	carry set if no move
 ;	       OR if it's a Pokémon Power
 ;	       OR if not enough energy for move
 CheckEnergyNeededForAttackAfterDiscard: ; 156c3 (5:56c3)
@@ -1571,8 +1571,8 @@ CalculateByteTensDigit: ; 1576b (5:576b)
 ; returns in a the result of
 ; dividing b by a, rounded down
 ; input:
-; 	a = divisor
-; 	b = dividend
+;	a = divisor
+;	b = dividend
 CalculateBDividedByA_Bank5: ; 15778 (5:5778)
 	push bc
 	ld c, a
@@ -1603,7 +1603,7 @@ CountNumberOfEnergyCardsAttached: ; 15787 (5:5787)
 	ld a, [wTotalAttachedEnergies]
 	or a
 	ret z
-	
+
 	xor a
 	push hl
 	push bc
@@ -1884,7 +1884,7 @@ AIDecideWhetherToRetreat: ; 158b2 (5:58b2)
 	jr nc, .active_cant_ko_1
 	ld a, 35
 	call SubFromAIScore
-	
+
 .active_cant_ko_1
 	call CheckIfDefendingPokemonCanKnockOut
 	jr nc, .defending_cant_ko
@@ -2755,7 +2755,7 @@ AITryToRetreat: ; 15d4f (5:5d4f)
 
 ; second, shuffle attached cards and discard energy cards
 ; that are not of the same type as the Pokémon
-; the exception for this are cards that are needed for 
+; the exception for this are cards that are needed for
 ; some attacks but are not of the same color as the Pokémon
 ; (i.e. Psyduck's Headache attack)
 ; and energy cards attached to Eevee corresponding to a
@@ -3174,7 +3174,7 @@ AIDecideEvolution: ; 15f4c (5:5f4c)
 	call CalculateByteTensDigit
 	call SubFromAIScore
 
-; if is Mysterious Fossil or 
+; if is Mysterious Fossil or
 ; wLoadedCard1Unknown2 is set to $02,
 ; raise AI score
 .check_mysterious_fossil
@@ -3363,7 +3363,7 @@ Func_16120: ; 16120 (5:6120)
 	ret
 
 ; if Dragonair is active, check its damage in HP
-; if this result is >= 50, 
+; if this result is >= 50,
 ; and if at least 3 energy cards attached,
 ; check if there's a Muk in any duelist's Play Area
 .is_active
@@ -3416,7 +3416,7 @@ Func_161d5: ; 161d5 (5:61d5)
 	jr nc, .subtract
 	call AIDecideWhetherToRetreat
 	jr c, .subtract
-	
+
 	; checks for player's active card status
 	ld a, DUELVARS_ARENA_CARD_STATUS
 	call GetNonTurnDuelistVariable
@@ -3521,7 +3521,7 @@ CheckIfActiveCardCanKnockOut: ; 1628f (5:628f)
 	jp c, .fail
 	scf
 	ret
-	
+
 .fail
 	or a
 	ret
@@ -3560,7 +3560,7 @@ CheckIfActivePokemonCanUseAnyNonResidualMove: ; 162a1 (5:62a1)
 
 ; looks for energy card(s) in hand depending on
 ; what is needed for selected card, for both moves
-; 	- if one basic energy is required, look for that energy;
+;	- if one basic energy is required, look for that energy;
 ;	- if one colorless is required, create a list at wDuelTempList
 ;	  of all energy cards;
 ;	- if two colorless are required, look for double colorless;
@@ -3622,7 +3622,7 @@ LookForEnergyNeededInHand: ; 162c8 (5:62c8)
 
 ; looks for energy card(s) in hand depending on
 ; what is needed for selected card and move
-; 	- if one basic energy is required, look for that energy;
+;	- if one basic energy is required, look for that energy;
 ;	- if one colorless is required, create a list at wDuelTempList
 ;	  of all energy cards;
 ;	- if two colorless are required, look for double colorless;
@@ -3667,7 +3667,7 @@ LookForEnergyNeededForMoveInHand: ; 16311 (5:6311)
 	jr .done
 ; 0x1633f
 
-; goes through $00 terminated list pointed 
+; goes through $00 terminated list pointed
 ; by wAICardListPlayFromHandPriority and compares it to each card in hand.
 ; Sorts the hand in wDuelTempList so that the found card IDs
 ; are in the same order as the list pointed by de.
@@ -3732,7 +3732,7 @@ SortTempHandByIDList: ; 1633f (5:633f)
 ; depending on energy flags set in a
 ; return carry if successful in finding card
 ; input:
-; 	a = energy flags needed
+;	a = energy flags needed
 CheckEnergyFlagsNeededInList: ; 1637b (5:637b)
 	ld e, a
 	ld hl, wDuelTempList
@@ -4050,7 +4050,7 @@ RetrievePlayAreaAIScoreFromBackup1: ; 164d3 (5:64d3)
 	ret
 ; 0x164e8
 
-; have AI decide whether to play energy card from hand 
+; have AI decide whether to play energy card from hand
 ; and determine which card is best to attach it.
 AIProcessAndTryToPlayEnergy: ; 164e8 (5:64e8)
 	xor a
@@ -4302,7 +4302,7 @@ AIProcessEnergyCards: ; 164fc (5:64fc)
 	ld a, $80
 	sub b
 	call SubFromAIScore
-	
+
 .skip_boss_deck
 	ld a, 1
 	call AddToAIScore
@@ -4313,7 +4313,7 @@ AIProcessEnergyCards: ; 164fc (5:64fc)
 	call DetermineAIScoreOfMoveEnergyRequirement
 	ld a, $01 ; second move
 	call DetermineAIScoreOfMoveEnergyRequirement
-	
+
 ; store bench score for this card.
 .store_score
 	ldh a, [hTempPlayAreaLocation_ff9d]
@@ -4680,7 +4680,7 @@ CheckIfEvolutionNeedsEnergyForMove: ; 16805 (5:6805)
 ; output:
 ;	b = 1 if needs color energy, 0 otherwise;
 ;	c = 1 if only needs colorless energy, 0 otherwise;
-; 	carry set if not Zapdos2's Thunderbolt attack.
+;	carry set if not Zapdos2's Thunderbolt attack.
 GetEnergyCardForDiscardOrEnergyBoostAttack: ; 1683b (5:683b)
 ; load card ID and check selected move index.
 	ldh a, [hTempPlayAreaLocation_ff9d]
@@ -4938,7 +4938,7 @@ AITryToPlayEnergyCard: ; 1689f (5:689f)
 ; return carry if there's a double colorless in hand to attach
 ; and it's one of the card IDs from these decks.
 ; output:
-; 	[hTemp_ffa0] = card index of double colorless in hand;
+;	[hTemp_ffa0] = card index of double colorless in hand;
 ;	carry set if can play energy card.
 CheckSpecificDecksToAttachDoubleColorless: ; 1696e (5:696e)
 	push bc
@@ -5122,7 +5122,7 @@ AIProcessAttacks: ; 169fc (5:69fc)
 	or a
 	jr z, .attack_chosen
 	call CheckWhetherToSwitchToFirstAttack
-	
+
 .attack_chosen
 ; check whether to execute the attack chosen
 	ld a, [wAIExecuteProcessedAttack]
@@ -5268,7 +5268,7 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 ; raise AI score by the number of damage counters that this move deals.
 ; if no damage is dealt, subtract AI score. in case wDamage is zero
 ; but wMaxDamage is not, then encourage move afterwards.
-; otherwise, if wMaxDamage is also zero, check for damage against 
+; otherwise, if wMaxDamage is also zero, check for damage against
 ; player's bench, and encourage move in case there is.
 .check_damage
 	xor a
@@ -5317,7 +5317,7 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	ld a, e
 	call CalculateByteTensDigit
 	call SubFromAIScore
-	
+
 	push de
 	ld a, MOVE_FLAG1_ADDRESS | HIGH_RECOIL_F
 	call CheckLoadedMoveFlag
@@ -5639,7 +5639,7 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 ; isn't (doubly) poisoned already.
 ; if opposing Pokémon is only poisoned and not double poisoned,
 ; and this move has FLAG_2_BIT_6 set, discourage it
-; (possibly to make Nidoking's Toxic attack less likely to be chosen 
+; (possibly to make Nidoking's Toxic attack less likely to be chosen
 ; if the other Pokémon is poisoned.)
 	ld a, MOVE_FLAG1_ADDRESS | INFLICT_POISON_F
 	call CheckLoadedMoveFlag
@@ -6044,7 +6044,7 @@ HandleNinetalesMixUp: ; 16f4e (5:6f4e)
 	or a
 	jr nz, .loop_hand
 	; is a basic Pokémon card
-	inc b 
+	inc b
 	jr .loop_hand
 .tally_basic_cards
 	ld a, b
@@ -6196,7 +6196,7 @@ CheckWhetherToSwitchToFirstAttack: ; 17019 (5:7019)
 	ret
 ; 0x17057
 
-; returns carry if there are 
+; returns carry if there are
 ; any basic Pokémon cards in deck.
 CheckIfAnyBasicPokemonInDeck: ; 17057 (5:7057)
 	ld e, 0
@@ -6280,7 +6280,7 @@ LookForCardThatIsKnockedOutOnDevolution: ; 17080 (5:7080)
 	ldh [hTempPlayAreaLocation_ff9d], a
 	or a
 	ret
-	
+
 .set_carry
 	call SwapTurn
 	pop af
@@ -6604,7 +6604,7 @@ CheckIfNoSurplusEnergyForMove: ; 171fb (5:71fb)
 	inc de
 	dec c
 	jr nz, .loop
-	
+
 	; colorless
 	ld a, [de]
 	swap a
@@ -6624,15 +6624,15 @@ CheckIfNoSurplusEnergyForMove: ; 171fb (5:71fb)
 	ret
 ; 0x17258
 
-; takes as input the energy cost of a move for a 
+; takes as input the energy cost of a move for a
 ; particular energy, stored in the lower nibble of a
 ; if the move costs some amount of this energy, the lower nibble of a != 0,
 ; and this amount is stored in wTempLoadedMoveEnergyCost
 ; also adds the amount of energy still needed
 ; to wTempLoadedMoveEnergyNeededAmount
 ; input:
-; 	a    = this energy cost of move (lower nibble)
-; 	[hl] = attached energy
+;	a    = this energy cost of move (lower nibble)
+;	[hl] = attached energy
 ; output:
 ;	carry set if not enough of this energy type attached
 CalculateParticularAttachedEnergyNeeded: ; 17258 (5:7258)
@@ -6884,7 +6884,7 @@ SetUpBossStartingHandAndDeck: ; 172af (5:72af)
 ; returns carry if Pokemon at PLAY_AREA* in a
 ; can damage defending Pokémon with any of its moves
 ; input:
-; 	a = location of card to check
+;	a = location of card to check
 CheckIfCanDamageDefendingPokemon: ; 17383 (5:7383)
 	ldh [hTempPlayAreaLocation_ff9d], a
 	xor a ; first move
@@ -7132,7 +7132,7 @@ CheckForBenchIDAtHalfHPAndCanUseSecondMove: ; 17474 (5:7474)
 	ld hl, wcdf9
 	cp [hl]
 	jr nz, .loop
-	
+
 	ld a, c
 	ldh [hTempPlayAreaLocation_ff9d], a
 	ld a, $01 ; second move
@@ -7291,7 +7291,7 @@ Func_174f2: ; 174f2 (5:74f2)
 	ld a, [de]
 	or a
 	jr z, .check_next
-; decrease score	
+; decrease score
 	dec [hl]
 	jr .check_next
 .card_with_highest
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 574cbb8..8d6f75a 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -2566,8 +2566,8 @@ KeyboardData_Player: ; (6:6baf)
 	kbitem $04, $12, $37, $00, TX_FULLWIDTH3,   "I"
 	kbitem $06, $12, $38, $00, TX_FULLWIDTH3,   "R"
 	kbitem $08, $12, $39, $00,                  "n"
-	kbitem $0a, $12, $3a, $00,	                "c"
-	kbitem $0c, $12, $3b, $00,	                "p"
+	kbitem $0a, $12, $3a, $00,                  "c"
+	kbitem $0c, $12, $3b, $00,                  "p"
 	kbitem $10, $0f, $01, $09, $0000
 	kbitem $00, $00, $00, $00, $0000
 
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index 45cc8b1..f5b1629 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -518,7 +518,7 @@ Func_1c78d: ; 1c78d (7:478d)
 Func_1c7de: ; 1c7de (7:47de)
 	ld a, [wc3b7]
 	and $20
-    ret
+	ret
 ; 0x1c7e4
 
 	INCROM $1c7e4, $1c82e
@@ -580,7 +580,7 @@ Func_1c8ef: ; 1c8ef (7:48ef)
 	ld a, [wd421]
 	or a
 	jr z, .check_to_play_sfx
-	
+
 	push hl
 	ld bc, $0003
 	add hl, bc
@@ -653,7 +653,7 @@ Func_1c94a:
 	ld [wd42b], a
 	call Func_1c980
 	pop af
-	
+
 	farcall Func_12ab5
 	or a
 	jr .return
@@ -679,7 +679,7 @@ Func_1c980: ; 1c980 (7:4980)
 	ld [hli], a
 	ld [hl], c
 	pop af
-	
+
 	ld bc, $000c
 	add hl, bc
 	ld c, a
diff --git a/src/engine/bank08.asm b/src/engine/bank08.asm
index 1bb06a3..a7a5466 100644
--- a/src/engine/bank08.asm
+++ b/src/engine/bank08.asm
@@ -310,7 +310,7 @@ AIDecide_Potion2: ; 20204 (8:4204)
 	call GetTurnDuelistVariable
 	cp $ff
 	ret z
-	call .check_boost_if_taken_damage	
+	call .check_boost_if_taken_damage
 	jr c, .has_boost_damage
 	call GetCardDamage
 	cp 20 ; if damage >= 20
@@ -1746,7 +1746,7 @@ AIDecide_SuperEnergyRemoval: ; 209bc (8:49bc)
 	call GetTurnDuelistVariable
 	cp $ff
 	jr z, .exit
-	
+
 	ld d, a
 	push de
 	call .LookForNonDoubleColorless
@@ -4156,7 +4156,7 @@ AIDecide_ScoopUp: ; 21506 (8:5506)
 ; this deck will use Scoop Up on a benched Articuno2.
 ; it checks if the defending Pokemon is a Snorlax,
 ; but interestingly does not check for Muk in both Play Areas.
-; will also use Scoop Up on 
+; will also use Scoop Up on
 .HandleLegendaryArticuno
 ; if less than 3 Play Area Pokemon cards, skip.
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
@@ -7891,7 +7891,7 @@ ClearMemory_Bank8: ; 22983 (8:6983)
 ; and outputs result in a
 ; sets carry if none are found
 ; output:
-; 	a = number of energy cards found
+;	a = number of energy cards found
 CountOppEnergyCardsInHand: ; 22990 (8:6990)
 	farcall CreateEnergyCardListFromHand
 	ret c
@@ -7909,9 +7909,9 @@ CountOppEnergyCardsInHand: ; 22990 (8:6990)
 
 ; converts HP in a to number of equivalent damage counters
 ; input:
-; 	a = HP
+;	a = HP
 ; output:
-; 	a = number of damage counters
+;	a = number of damage counters
 ConvertHPToCounters: ; 229a3 (8:69a3)
 	push bc
 	ld c, 0
@@ -8005,7 +8005,7 @@ LookForCardIDInLocation: ; 229d0 (8:69d0)
 ; input:
 ;	a = card ID
 ; output:
-; 	a = card deck index, if found
+;	a = card deck index, if found
 ;	carry set if found
 LookForCardIDInHandList_Bank8: ; 229f3 (8:69f3)
 	ld [wTempCardIDToLook], a
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index 040e612..8e7d0c2 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -509,7 +509,7 @@ InitBoosterData: ; 1e430 (7:6430)
 	call FindBoosterDataPointer
 	ld de, wBoosterData_Set
 	ld bc, wBoosterData_TypeChances - wBoosterData_Set + NUM_BOOSTER_CARD_TYPES ; Pack2 - Pack1
-	call CopyDataHLtoDE	; load booster pack data to wram
+	call CopyDataHLtoDE ; load booster pack data to wram
 	call LoadRarityAmountsToWram
 	ld bc, $0
 	ld d, NUM_BOOSTER_CARD_TYPES
diff --git a/src/engine/deck_ai/deck_ai.asm b/src/engine/deck_ai/deck_ai.asm
index c8b73f3..97093c7 100644
--- a/src/engine/deck_ai/deck_ai.asm
+++ b/src/engine/deck_ai/deck_ai.asm
@@ -1,82 +1,82 @@
-; AI card retreat score bonus

-; when the AI retreat routine runs through the Bench to choose

-; a Pokemon to switch to, it looks up in this list and if

-; a card ID matches, applies a retreat score bonus to this card.

-; positive (negative) means more (less) likely to switch to this card.

-ai_retreat: MACRO

-	db \1       ; card ID

-	db $80 + \2 ; retreat score (ranges between -128 and 127)

-ENDM

-

-; AI card energy attach score bonus

-; when the AI energy attachment routine runs through the Play Area to choose

-; a Pokemon to attach an energy card, it looks up in this list and if

-; a card ID matches, skips this card if the maximum number of energy

-; cards attached has been reached. If it hasn't been reached, additionally

-; applies a positive (or negative) AI score to attach energy to this card. 

-ai_energy: MACRO

-	db \1       ; card ID

-	db \2       ; maximum number of attached cards

-	db $80 + \3 ; energy score (ranges between -128 and 127)

-ENDM

-

-; stores in WRAM pointer to data in argument

-; e.g. store_list_pointer wSomeListPointer, SomeData

-store_list_pointer: MACRO

-	ld hl, \1

-	ld de, \2

-	ld [hl], e

-	inc hl

-	ld [hl], d

-ENDM

-

-; deck AIs are specialized to work on a given deck ID.

-; they decide what happens during a turn, what Pokemon cards

-; to pick during the start of the duel, etc.

-; the different scenarios these are used are listed in AIACTION_* constants.

-; each of these have a pointer table with the following structure:

-; dw .do_turn       : never called;

-;

-; dw .do_turn       : called to handle the main turn logic, from the beginning

-;                     of the turn up to the attack (or lack thereof);

-;

-; dw .start_duel    : called at the start of the duel to initialize some

-;                     variables and optionally set up CPU hand and deck;

-;

-; dw .forced_switch : logic to determine what Pokemon to pick when there's

-;                     an effect that forces AI to switch to Bench card;

-;

-; dw .ko_switch     : logic for picking which card to use after a KO;

-;

-; dw .take_prize    : logic to decide which prize card to pick.

-

-; optionally, decks can also declare card lists that will add

-; more specialized logic during various generic AI routines,

-; and read during the .start_duel routines.

-; the pointers to these lists are stored in memory:

-; wAICardListAvoidPrize    : list of cards to avoid being placed as prize;

-; wAICardListArenaPriority : priority list of Arena card at duel start;

-; wAICardListBenchPriority : priority list of Bench cards at duel start;

-; wAICardListPlayFromHandPriority : priority list of cards to play from hand;

-; wAICardListRetreatBonus  : scores given to certain cards for retreat;

-; wAICardListEnergyBonus   : max number of energy cards and card scores.

-

-INCLUDE "engine/deck_ai/decks/general.asm"

-INCLUDE "engine/deck_ai/decks/sams_practice.asm"

-INCLUDE "engine/deck_ai/decks/general_no_retreat.asm"

-INCLUDE "engine/deck_ai/decks/legendary_moltres.asm"

-INCLUDE "engine/deck_ai/decks/legendary_zapdos.asm"

-INCLUDE "engine/deck_ai/decks/legendary_articuno.asm"

-INCLUDE "engine/deck_ai/decks/legendary_dragonite.asm"

-INCLUDE "engine/deck_ai/decks/first_strike.asm"

-INCLUDE "engine/deck_ai/decks/rock_crusher.asm"

-INCLUDE "engine/deck_ai/decks/go_go_rain_dance.asm"

-INCLUDE "engine/deck_ai/decks/zapping_selfdestruct.asm"

-INCLUDE "engine/deck_ai/decks/flower_power.asm"

-INCLUDE "engine/deck_ai/decks/strange_psyshock.asm"

-INCLUDE "engine/deck_ai/decks/wonders_of_science.asm"

-INCLUDE "engine/deck_ai/decks/fire_charge.asm"

-INCLUDE "engine/deck_ai/decks/im_ronald.asm"

-INCLUDE "engine/deck_ai/decks/powerful_ronald.asm"

-INCLUDE "engine/deck_ai/decks/invincible_ronald.asm"

-INCLUDE "engine/deck_ai/decks/legendary_ronald.asm"

+; AI card retreat score bonus
+; when the AI retreat routine runs through the Bench to choose
+; a Pokemon to switch to, it looks up in this list and if
+; a card ID matches, applies a retreat score bonus to this card.
+; positive (negative) means more (less) likely to switch to this card.
+ai_retreat: MACRO
+	db \1       ; card ID
+	db $80 + \2 ; retreat score (ranges between -128 and 127)
+ENDM
+
+; AI card energy attach score bonus
+; when the AI energy attachment routine runs through the Play Area to choose
+; a Pokemon to attach an energy card, it looks up in this list and if
+; a card ID matches, skips this card if the maximum number of energy
+; cards attached has been reached. If it hasn't been reached, additionally
+; applies a positive (or negative) AI score to attach energy to this card.
+ai_energy: MACRO
+	db \1       ; card ID
+	db \2       ; maximum number of attached cards
+	db $80 + \3 ; energy score (ranges between -128 and 127)
+ENDM
+
+; stores in WRAM pointer to data in argument
+; e.g. store_list_pointer wSomeListPointer, SomeData
+store_list_pointer: MACRO
+	ld hl, \1
+	ld de, \2
+	ld [hl], e
+	inc hl
+	ld [hl], d
+ENDM
+
+; deck AIs are specialized to work on a given deck ID.
+; they decide what happens during a turn, what Pokemon cards
+; to pick during the start of the duel, etc.
+; the different scenarios these are used are listed in AIACTION_* constants.
+; each of these have a pointer table with the following structure:
+; dw .do_turn       : never called;
+;
+; dw .do_turn       : called to handle the main turn logic, from the beginning
+;                     of the turn up to the attack (or lack thereof);
+;
+; dw .start_duel    : called at the start of the duel to initialize some
+;                     variables and optionally set up CPU hand and deck;
+;
+; dw .forced_switch : logic to determine what Pokemon to pick when there's
+;                     an effect that forces AI to switch to Bench card;
+;
+; dw .ko_switch     : logic for picking which card to use after a KO;
+;
+; dw .take_prize    : logic to decide which prize card to pick.
+
+; optionally, decks can also declare card lists that will add
+; more specialized logic during various generic AI routines,
+; and read during the .start_duel routines.
+; the pointers to these lists are stored in memory:
+; wAICardListAvoidPrize    : list of cards to avoid being placed as prize;
+; wAICardListArenaPriority : priority list of Arena card at duel start;
+; wAICardListBenchPriority : priority list of Bench cards at duel start;
+; wAICardListPlayFromHandPriority : priority list of cards to play from hand;
+; wAICardListRetreatBonus  : scores given to certain cards for retreat;
+; wAICardListEnergyBonus   : max number of energy cards and card scores.
+
+INCLUDE "engine/deck_ai/decks/general.asm"
+INCLUDE "engine/deck_ai/decks/sams_practice.asm"
+INCLUDE "engine/deck_ai/decks/general_no_retreat.asm"
+INCLUDE "engine/deck_ai/decks/legendary_moltres.asm"
+INCLUDE "engine/deck_ai/decks/legendary_zapdos.asm"
+INCLUDE "engine/deck_ai/decks/legendary_articuno.asm"
+INCLUDE "engine/deck_ai/decks/legendary_dragonite.asm"
+INCLUDE "engine/deck_ai/decks/first_strike.asm"
+INCLUDE "engine/deck_ai/decks/rock_crusher.asm"
+INCLUDE "engine/deck_ai/decks/go_go_rain_dance.asm"
+INCLUDE "engine/deck_ai/decks/zapping_selfdestruct.asm"
+INCLUDE "engine/deck_ai/decks/flower_power.asm"
+INCLUDE "engine/deck_ai/decks/strange_psyshock.asm"
+INCLUDE "engine/deck_ai/decks/wonders_of_science.asm"
+INCLUDE "engine/deck_ai/decks/fire_charge.asm"
+INCLUDE "engine/deck_ai/decks/im_ronald.asm"
+INCLUDE "engine/deck_ai/decks/powerful_ronald.asm"
+INCLUDE "engine/deck_ai/decks/invincible_ronald.asm"
+INCLUDE "engine/deck_ai/decks/legendary_ronald.asm"
diff --git a/src/engine/deck_ai/decks/fire_charge.asm b/src/engine/deck_ai/decks/fire_charge.asm
index 454f731..0248a8a 100644
--- a/src/engine/deck_ai/decks/fire_charge.asm
+++ b/src/engine/deck_ai/decks/fire_charge.asm
@@ -1,86 +1,86 @@
-AIActionTable_FireCharge: ; 15232 (5:5232)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 1523e (5:523e)

-	call AIMainTurnLogic

-	ret

-; 0x15242

-

-.start_duel ; 15242 (5:5242)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x15253

-

-.forced_switch ; 15253 (5:5253)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x15257

-

-.ko_switch ; 15257 (5:5257)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x1525b

-

-.take_prize ; 1525b (5:525b)

-	call AIPickPrizeCards

-	ret

-; 0x1525f

-

-.list_arena ; 1525f (5:525f)

-	db JIGGLYPUFF3

-	db CHANSEY

-	db TAUROS

-	db MAGMAR1

-	db JIGGLYPUFF1

-	db GROWLITHE

-	db $00

-

-.list_bench ; 15266 (5:5266)

-	db JIGGLYPUFF3

-	db CHANSEY

-	db GROWLITHE

-	db MAGMAR1

-	db JIGGLYPUFF1

-	db TAUROS

-	db $00

-

-.list_retreat ; 1526e (5:526e)

-	ai_retreat JIGGLYPUFF1, -1

-	ai_retreat CHANSEY,     -1

-	ai_retreat GROWLITHE,   -1

-	db $00

-

-.list_energy ; 15274 (5:5274)

-	ai_energy GROWLITHE,   3, +0

-	ai_energy ARCANINE2,   4, +0

-	ai_energy MAGMAR1,     3, +0

-	ai_energy JIGGLYPUFF1, 3, +0

-	ai_energy JIGGLYPUFF3, 2, +0

-	ai_energy WIGGLYTUFF,  3, +0

-	ai_energy CHANSEY,     4, +0

-	ai_energy TAUROS,      3, +0

-	db $00

-

-.list_prize ; 1528d (5:528d)

-	db GAMBLER

-	db $00

-

-.store_list_pointers ; 1528f (5:528f)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x152bd

+AIActionTable_FireCharge: ; 15232 (5:5232)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 1523e (5:523e)
+	call AIMainTurnLogic
+	ret
+; 0x15242
+
+.start_duel ; 15242 (5:5242)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x15253
+
+.forced_switch ; 15253 (5:5253)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x15257
+
+.ko_switch ; 15257 (5:5257)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x1525b
+
+.take_prize ; 1525b (5:525b)
+	call AIPickPrizeCards
+	ret
+; 0x1525f
+
+.list_arena ; 1525f (5:525f)
+	db JIGGLYPUFF3
+	db CHANSEY
+	db TAUROS
+	db MAGMAR1
+	db JIGGLYPUFF1
+	db GROWLITHE
+	db $00
+
+.list_bench ; 15266 (5:5266)
+	db JIGGLYPUFF3
+	db CHANSEY
+	db GROWLITHE
+	db MAGMAR1
+	db JIGGLYPUFF1
+	db TAUROS
+	db $00
+
+.list_retreat ; 1526e (5:526e)
+	ai_retreat JIGGLYPUFF1, -1
+	ai_retreat CHANSEY,     -1
+	ai_retreat GROWLITHE,   -1
+	db $00
+
+.list_energy ; 15274 (5:5274)
+	ai_energy GROWLITHE,   3, +0
+	ai_energy ARCANINE2,   4, +0
+	ai_energy MAGMAR1,     3, +0
+	ai_energy JIGGLYPUFF1, 3, +0
+	ai_energy JIGGLYPUFF3, 2, +0
+	ai_energy WIGGLYTUFF,  3, +0
+	ai_energy CHANSEY,     4, +0
+	ai_energy TAUROS,      3, +0
+	db $00
+
+.list_prize ; 1528d (5:528d)
+	db GAMBLER
+	db $00
+
+.store_list_pointers ; 1528f (5:528f)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x152bd
diff --git a/src/engine/deck_ai/decks/first_strike.asm b/src/engine/deck_ai/decks/first_strike.asm
index 6d2906c..e0bffb2 100644
--- a/src/engine/deck_ai/decks/first_strike.asm
+++ b/src/engine/deck_ai/decks/first_strike.asm
@@ -1,82 +1,82 @@
-AIActionTable_FirstStrike: ; 14e89 (5:4e89)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 14e95 (5:4e95)

-	call AIMainTurnLogic

-	ret

-; 0x14e99

-

-.start_duel ; 14e99 (5:4e99)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x14eaa

-

-.forced_switch ; 14eaa (5:4eaa)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14eae

-

-.ko_switch ; 14eae (5:4eae)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14eb2

-

-.take_prize ; 14eb2 (5:4eb2)

-	call AIPickPrizeCards

-	ret

-; 0x14eb6

-

-.list_arena ; 14eb6 (5:1eb6)

-	db HITMONCHAN

-	db MACHOP

-	db HITMONLEE

-	db MANKEY

-	db $00

-

-.list_bench ; 14ebb (5:1ebb)

-	db MACHOP

-	db HITMONLEE

-	db HITMONCHAN

-	db MANKEY

-	db $00

-

-.list_retreat ; 14ec0 (5:1ec0)

-	ai_retreat MACHOP,  -1

-	ai_retreat MACHOKE, -1

-	ai_retreat MANKEY,  -2

-	db $00

-

-.list_energy ; 14ec7 (5:1ec7)

-	ai_energy MACHOP,     3, +0

-	ai_energy MACHOKE,    4, +0

-	ai_energy MACHAMP,    4, -1

-	ai_energy HITMONCHAN, 3, +0

-	ai_energy HITMONLEE,  3, +0

-	ai_energy MANKEY,     2, -1

-	ai_energy PRIMEAPE,   3, -1

-	db $00

-

-.list_prize ; 14edd (5:1edd)

-	db HITMONLEE

-	db HITMONCHAN

-	db $00

-

-.store_list_pointers ; 14ee0 (5:4ee0)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x14f0e

+AIActionTable_FirstStrike: ; 14e89 (5:4e89)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 14e95 (5:4e95)
+	call AIMainTurnLogic
+	ret
+; 0x14e99
+
+.start_duel ; 14e99 (5:4e99)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x14eaa
+
+.forced_switch ; 14eaa (5:4eaa)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14eae
+
+.ko_switch ; 14eae (5:4eae)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14eb2
+
+.take_prize ; 14eb2 (5:4eb2)
+	call AIPickPrizeCards
+	ret
+; 0x14eb6
+
+.list_arena ; 14eb6 (5:1eb6)
+	db HITMONCHAN
+	db MACHOP
+	db HITMONLEE
+	db MANKEY
+	db $00
+
+.list_bench ; 14ebb (5:1ebb)
+	db MACHOP
+	db HITMONLEE
+	db HITMONCHAN
+	db MANKEY
+	db $00
+
+.list_retreat ; 14ec0 (5:1ec0)
+	ai_retreat MACHOP,  -1
+	ai_retreat MACHOKE, -1
+	ai_retreat MANKEY,  -2
+	db $00
+
+.list_energy ; 14ec7 (5:1ec7)
+	ai_energy MACHOP,     3, +0
+	ai_energy MACHOKE,    4, +0
+	ai_energy MACHAMP,    4, -1
+	ai_energy HITMONCHAN, 3, +0
+	ai_energy HITMONLEE,  3, +0
+	ai_energy MANKEY,     2, -1
+	ai_energy PRIMEAPE,   3, -1
+	db $00
+
+.list_prize ; 14edd (5:1edd)
+	db HITMONLEE
+	db HITMONCHAN
+	db $00
+
+.store_list_pointers ; 14ee0 (5:4ee0)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x14f0e
diff --git a/src/engine/deck_ai/decks/flower_power.asm b/src/engine/deck_ai/decks/flower_power.asm
index 566d064..c9a0ca8 100644
--- a/src/engine/deck_ai/decks/flower_power.asm
+++ b/src/engine/deck_ai/decks/flower_power.asm
@@ -1,81 +1,81 @@
-AIActionTable_FlowerPower: ; 1509b (5:509b)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 150a7 (5:50a7)

-	call AIMainTurnLogic

-	ret

-; 0x150ab

-

-.start_duel ; 150ab (5:50ab)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x150bc

-

-.forced_switch ; 150bc (5:50bc)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x150c0

-

-.ko_switch ; 150c0 (5:50c0)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x150c4

-

-.take_prize ; 150c4 (5:50c4)

-	call AIPickPrizeCards

-	ret

-; 0x150c8

-

-.list_arena ; 150c8 (5:50c8)

-	db ODDISH

-	db EXEGGCUTE

-	db BULBASAUR

-	db $00

-

-.list_bench ; 150cc (5:50cc)

-	db BULBASAUR

-	db EXEGGCUTE

-	db ODDISH

-	db $00

-

-.list_retreat ; 150cf (5:50cf)

-	ai_retreat GLOOM,     -2

-	ai_retreat VILEPLUME, -2

-	ai_retreat BULBASAUR, -2

-	ai_retreat IVYSAUR,   -2

-	db $00

-

-.list_energy ; 150d9 (5:50d9)

-	ai_energy BULBASAUR,  3, +0

-	ai_energy IVYSAUR,    4, +0

-	ai_energy VENUSAUR2,  4, +0

-	ai_energy ODDISH,     2, +0

-	ai_energy GLOOM,      3, -1

-	ai_energy VILEPLUME,  3, -1

-	ai_energy EXEGGCUTE,  3, +0

-	ai_energy EXEGGUTOR, 22, +0

-	db $00

-

-.list_prize ; 150f2 (5:50f2)

-	db VENUSAUR2

-	db $00

-

-.store_list_pointers ; 150f4 (5:50f4)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x15122

+AIActionTable_FlowerPower: ; 1509b (5:509b)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 150a7 (5:50a7)
+	call AIMainTurnLogic
+	ret
+; 0x150ab
+
+.start_duel ; 150ab (5:50ab)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x150bc
+
+.forced_switch ; 150bc (5:50bc)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x150c0
+
+.ko_switch ; 150c0 (5:50c0)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x150c4
+
+.take_prize ; 150c4 (5:50c4)
+	call AIPickPrizeCards
+	ret
+; 0x150c8
+
+.list_arena ; 150c8 (5:50c8)
+	db ODDISH
+	db EXEGGCUTE
+	db BULBASAUR
+	db $00
+
+.list_bench ; 150cc (5:50cc)
+	db BULBASAUR
+	db EXEGGCUTE
+	db ODDISH
+	db $00
+
+.list_retreat ; 150cf (5:50cf)
+	ai_retreat GLOOM,     -2
+	ai_retreat VILEPLUME, -2
+	ai_retreat BULBASAUR, -2
+	ai_retreat IVYSAUR,   -2
+	db $00
+
+.list_energy ; 150d9 (5:50d9)
+	ai_energy BULBASAUR,  3, +0
+	ai_energy IVYSAUR,    4, +0
+	ai_energy VENUSAUR2,  4, +0
+	ai_energy ODDISH,     2, +0
+	ai_energy GLOOM,      3, -1
+	ai_energy VILEPLUME,  3, -1
+	ai_energy EXEGGCUTE,  3, +0
+	ai_energy EXEGGUTOR, 22, +0
+	db $00
+
+.list_prize ; 150f2 (5:50f2)
+	db VENUSAUR2
+	db $00
+
+.store_list_pointers ; 150f4 (5:50f4)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x15122
diff --git a/src/engine/deck_ai/decks/general.asm b/src/engine/deck_ai/decks/general.asm
index 1bfc3e0..546787d 100644
--- a/src/engine/deck_ai/decks/general.asm
+++ b/src/engine/deck_ai/decks/general.asm
@@ -1,196 +1,196 @@
-; AI logic used by general decks

-AIActionTable_GeneralDecks: ; 14668 (05:4668)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 14674 (5:4674)

-	call AIMainTurnLogic

-	ret

-

-.start_duel ; 14678 (5:4678)

-	call InitAIDuelVars

-	call AIPlayInitialBasicCards

-	ret

-

-.forced_switch ; 1467f (5:467f)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-

-.ko_switch ; 14683 (5:4683)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-

-.take_prize: ; 14687 (5:4687)

-	call AIPickPrizeCards

-	ret

-

-; handle AI routines for a whole turn

-AIMainTurnLogic: ; 1468b (5:468b)

-; initialize variables

-	call InitAITurnVars

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	farcall HandleAIAntiMewtwoDeckStrategy

-	jp nc, .try_attack

-; handle Pkmn Powers

-	farcall HandleAIGoGoRainDanceEnergy

-	farcall HandleAIDamageSwap

-	farcall HandleAIPkmnPowers

-	ret c ; return if turn ended

-	farcall HandleAICowardice

-; process Trainer cards

-; phase 2 through 4.

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_03

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_04

-	call AIProcessHandTrainerCards

-; play Pokemon from hand

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-; process Trainer cards

-; phase 5 through 12.

-	ld a, AI_TRAINER_CARD_PHASE_05

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_06

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_07

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_08

-	call AIProcessHandTrainerCards

-	call AIProcessRetreat

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_11

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_12

-	call AIProcessHandTrainerCards

-; play Energy card if possible

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_energy_attach_1

-	call AIProcessAndTryToPlayEnergy

-.skip_energy_attach_1

-; play Pokemon from hand again

-	call AIDecidePlayPokemonCard

-; handle Pkmn Powers again

-	farcall HandleAIDamageSwap

-	farcall HandleAIPkmnPowers

-	ret c ; return if turn ended

-	farcall HandleAIGoGoRainDanceEnergy

-	ld a, AI_ENERGY_TRANS_ATTACK

-	farcall HandleAIEnergyTrans

-; process Trainer cards phases 13 and 15

-	ld a, AI_TRAINER_CARD_PHASE_13

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_15

-	call AIProcessHandTrainerCards

-; if used Professor Oak, process new hand

-; if not, then proceed to attack.

-	ld a, [wPreviousAIFlags]

-	and AI_FLAG_USED_PROFESSOR_OAK

-	jr z, .try_attack

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_03

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_04

-	call AIProcessHandTrainerCards

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-	ld a, AI_TRAINER_CARD_PHASE_05

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_06

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_07

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_08

-	call AIProcessHandTrainerCards

-	call AIProcessRetreat

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_11

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_12

-	call AIProcessHandTrainerCards

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_energy_attach_2

-	call AIProcessAndTryToPlayEnergy

-.skip_energy_attach_2

-	call AIDecidePlayPokemonCard

-	farcall HandleAIDamageSwap

-	farcall HandleAIPkmnPowers

-	ret c ; return if turn ended

-	farcall HandleAIGoGoRainDanceEnergy

-	ld a, AI_ENERGY_TRANS_ATTACK

-	farcall HandleAIEnergyTrans

-	ld a, AI_TRAINER_CARD_PHASE_13

-	call AIProcessHandTrainerCards

-	; skip AI_TRAINER_CARD_PHASE_15

-.try_attack

-	ld a, AI_ENERGY_TRANS_TO_BENCH

-	farcall HandleAIEnergyTrans

-; attack if possible, if not,

-; finish turn without attacking.

-	call AIProcessAndTryToUseAttack

-	ret c ; return if AI attacked

-	ld a, OPPACTION_FINISH_NO_ATTACK

-	bank1call AIMakeDecision

-	ret

-; 0x14786

-

-; handles AI retreating logic

-AIProcessRetreat: ; 14786 (5:4786)

-	ld a, [wAIRetreatedThisTurn]

-	or a

-	ret nz ; return, already retreated this turn

-

-	call AIDecideWhetherToRetreat

-	ret nc ; return if not retreating

-

-	call AIDecideBenchPokemonToSwitchTo

-	ret c ; return if no Bench Pokemon

-

-; store Play Area to retreat to and

-; set wAIRetreatedThisTurn to true

-	ld [wAIPlayAreaCardToSwitch], a

-	ld a, $01

-	ld [wAIRetreatedThisTurn], a

-

-; if AI can use Switch from hand, use it instead...

-	ld a, AI_TRAINER_CARD_PHASE_09

-	call AIProcessHandTrainerCards

-	ld a, [wPreviousAIFlags]

-	and AI_FLAG_USED_SWITCH

-	jr nz, .used_switch

-; ... else try retreating normally.

-	ld a, [wAIPlayAreaCardToSwitch]

-	call AITryToRetreat

-	ret

-

-.used_switch

-; if AI used switch, unset its AI flag

-	ld a, [wPreviousAIFlags]

-	and ~AI_FLAG_USED_SWITCH ; clear Switch flag

-	ld [wPreviousAIFlags], a

-

-; bug, this doesn't make sense being here, since at this point

-; Switch Trainer card was already used to retreat the Pokemon.

-; what the routine will do is just transfer Energy cards to

-; the Arena Pokemon for the purpose of retreating, and

-; then not actually retreat, resulting in unusual behaviour.

-; this would only work placed right after the AI checks whether

-; they have Switch card in hand to use and doesn't have one.

-; (and probably that was the original intention.)

-	ld a, AI_ENERGY_TRANS_RETREAT ; retreat

-	farcall HandleAIEnergyTrans

-	ret

-; 0x147bd

+; AI logic used by general decks
+AIActionTable_GeneralDecks: ; 14668 (05:4668)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 14674 (5:4674)
+	call AIMainTurnLogic
+	ret
+
+.start_duel ; 14678 (5:4678)
+	call InitAIDuelVars
+	call AIPlayInitialBasicCards
+	ret
+
+.forced_switch ; 1467f (5:467f)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+
+.ko_switch ; 14683 (5:4683)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+
+.take_prize: ; 14687 (5:4687)
+	call AIPickPrizeCards
+	ret
+
+; handle AI routines for a whole turn
+AIMainTurnLogic: ; 1468b (5:468b)
+; initialize variables
+	call InitAITurnVars
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	farcall HandleAIAntiMewtwoDeckStrategy
+	jp nc, .try_attack
+; handle Pkmn Powers
+	farcall HandleAIGoGoRainDanceEnergy
+	farcall HandleAIDamageSwap
+	farcall HandleAIPkmnPowers
+	ret c ; return if turn ended
+	farcall HandleAICowardice
+; process Trainer cards
+; phase 2 through 4.
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_03
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_04
+	call AIProcessHandTrainerCards
+; play Pokemon from hand
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+; process Trainer cards
+; phase 5 through 12.
+	ld a, AI_TRAINER_CARD_PHASE_05
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_06
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_07
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_08
+	call AIProcessHandTrainerCards
+	call AIProcessRetreat
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_11
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_12
+	call AIProcessHandTrainerCards
+; play Energy card if possible
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_energy_attach_1
+	call AIProcessAndTryToPlayEnergy
+.skip_energy_attach_1
+; play Pokemon from hand again
+	call AIDecidePlayPokemonCard
+; handle Pkmn Powers again
+	farcall HandleAIDamageSwap
+	farcall HandleAIPkmnPowers
+	ret c ; return if turn ended
+	farcall HandleAIGoGoRainDanceEnergy
+	ld a, AI_ENERGY_TRANS_ATTACK
+	farcall HandleAIEnergyTrans
+; process Trainer cards phases 13 and 15
+	ld a, AI_TRAINER_CARD_PHASE_13
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_15
+	call AIProcessHandTrainerCards
+; if used Professor Oak, process new hand
+; if not, then proceed to attack.
+	ld a, [wPreviousAIFlags]
+	and AI_FLAG_USED_PROFESSOR_OAK
+	jr z, .try_attack
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_03
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_04
+	call AIProcessHandTrainerCards
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+	ld a, AI_TRAINER_CARD_PHASE_05
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_06
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_07
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_08
+	call AIProcessHandTrainerCards
+	call AIProcessRetreat
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_11
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_12
+	call AIProcessHandTrainerCards
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_energy_attach_2
+	call AIProcessAndTryToPlayEnergy
+.skip_energy_attach_2
+	call AIDecidePlayPokemonCard
+	farcall HandleAIDamageSwap
+	farcall HandleAIPkmnPowers
+	ret c ; return if turn ended
+	farcall HandleAIGoGoRainDanceEnergy
+	ld a, AI_ENERGY_TRANS_ATTACK
+	farcall HandleAIEnergyTrans
+	ld a, AI_TRAINER_CARD_PHASE_13
+	call AIProcessHandTrainerCards
+	; skip AI_TRAINER_CARD_PHASE_15
+.try_attack
+	ld a, AI_ENERGY_TRANS_TO_BENCH
+	farcall HandleAIEnergyTrans
+; attack if possible, if not,
+; finish turn without attacking.
+	call AIProcessAndTryToUseAttack
+	ret c ; return if AI attacked
+	ld a, OPPACTION_FINISH_NO_ATTACK
+	bank1call AIMakeDecision
+	ret
+; 0x14786
+
+; handles AI retreating logic
+AIProcessRetreat: ; 14786 (5:4786)
+	ld a, [wAIRetreatedThisTurn]
+	or a
+	ret nz ; return, already retreated this turn
+
+	call AIDecideWhetherToRetreat
+	ret nc ; return if not retreating
+
+	call AIDecideBenchPokemonToSwitchTo
+	ret c ; return if no Bench Pokemon
+
+; store Play Area to retreat to and
+; set wAIRetreatedThisTurn to true
+	ld [wAIPlayAreaCardToSwitch], a
+	ld a, $01
+	ld [wAIRetreatedThisTurn], a
+
+; if AI can use Switch from hand, use it instead...
+	ld a, AI_TRAINER_CARD_PHASE_09
+	call AIProcessHandTrainerCards
+	ld a, [wPreviousAIFlags]
+	and AI_FLAG_USED_SWITCH
+	jr nz, .used_switch
+; ... else try retreating normally.
+	ld a, [wAIPlayAreaCardToSwitch]
+	call AITryToRetreat
+	ret
+
+.used_switch
+; if AI used switch, unset its AI flag
+	ld a, [wPreviousAIFlags]
+	and ~AI_FLAG_USED_SWITCH ; clear Switch flag
+	ld [wPreviousAIFlags], a
+
+; bug, this doesn't make sense being here, since at this point
+; Switch Trainer card was already used to retreat the Pokemon.
+; what the routine will do is just transfer Energy cards to
+; the Arena Pokemon for the purpose of retreating, and
+; then not actually retreat, resulting in unusual behaviour.
+; this would only work placed right after the AI checks whether
+; they have Switch card in hand to use and doesn't have one.
+; (and probably that was the original intention.)
+	ld a, AI_ENERGY_TRANS_RETREAT ; retreat
+	farcall HandleAIEnergyTrans
+	ret
+; 0x147bd
diff --git a/src/engine/deck_ai/decks/general_no_retreat.asm b/src/engine/deck_ai/decks/general_no_retreat.asm
index e735076..e8f8fec 100644
--- a/src/engine/deck_ai/decks/general_no_retreat.asm
+++ b/src/engine/deck_ai/decks/general_no_retreat.asm
@@ -1,146 +1,146 @@
-; acts just like a general deck AI except never retreats

-AIActionTable_GeneralNoRetreat: ; 148dc (5:48dc)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 148e8 (5:48e8)

-	call AIDoTurn_GeneralNoRetreat

-	ret

-; 0x148ec

-

-.start_duel ; 148ec (5:48ec)

-	call InitAIDuelVars

-	call AIPlayInitialBasicCards

-	ret

-; 0x148f3

-

-.forced_switch ; 148f3 (5:48f3)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x148f7

-

-.ko_switch ; 148f7 (5:48f7)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x148fb

-

-.take_prize ; 148fb (5:48fb)

-	call AIPickPrizeCards

-	ret

-; 0x148ff

-

-AIDoTurn_GeneralNoRetreat: ; 148ff (5:48ff)

-; initialize variables

-	call InitAITurnVars

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	farcall HandleAIAntiMewtwoDeckStrategy

-	jp nc, .try_attack

-; handle Pkmn Powers

-	farcall HandleAIGoGoRainDanceEnergy

-	farcall HandleAIDamageSwap

-	farcall HandleAIPkmnPowers

-	ret c ; return if turn ended

-	farcall HandleAICowardice

-; process Trainer cards

-; phase 2 through 4.

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_03

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_04

-	call AIProcessHandTrainerCards

-; play Pokemon from hand

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-; process Trainer cards

-; phase 5 through 12.

-	ld a, AI_TRAINER_CARD_PHASE_05

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_06

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_07

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_08

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_11

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_12

-	call AIProcessHandTrainerCards

-; play Energy card if possible

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_energy_attach_1

-	call AIProcessAndTryToPlayEnergy

-.skip_energy_attach_1

-; play Pokemon from hand again

-	call AIDecidePlayPokemonCard

-; handle Pkmn Powers again

-	farcall HandleAIDamageSwap

-	farcall HandleAIPkmnPowers

-	ret c ; return if turn ended

-	farcall HandleAIGoGoRainDanceEnergy

-	ld a, AI_ENERGY_TRANS_ATTACK

-	farcall HandleAIEnergyTrans

-; process Trainer cards phases 13 and 15

-	ld a, AI_TRAINER_CARD_PHASE_13

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_15

-	call AIProcessHandTrainerCards

-; if used Professor Oak, process new hand

-; if not, then proceed to attack.

-	ld a, [wPreviousAIFlags]

-	and AI_FLAG_USED_PROFESSOR_OAK

-	jr z, .try_attack

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_03

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_04

-	call AIProcessHandTrainerCards

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-	ld a, AI_TRAINER_CARD_PHASE_05

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_06

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_07

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_08

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_11

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_12

-	call AIProcessHandTrainerCards

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_energy_attach_2

-	call AIProcessAndTryToPlayEnergy

-.skip_energy_attach_2

-	call AIDecidePlayPokemonCard

-	farcall HandleAIDamageSwap

-	farcall HandleAIPkmnPowers

-	ret c ; return if turn ended

-	farcall HandleAIGoGoRainDanceEnergy

-	ld a, AI_TRAINER_CARD_PHASE_13

-	call AIProcessHandTrainerCards

-	; skip AI_TRAINER_CARD_PHASE_15

-.try_attack

-; attack if possible, if not,

-; finish turn without attacking.

-	call AIProcessAndTryToUseAttack

-	ret c ; return if turn ended

-	ld a, OPPACTION_FINISH_NO_ATTACK

-	bank1call AIMakeDecision

-	ret

-; 0x149e8

+; acts just like a general deck AI except never retreats
+AIActionTable_GeneralNoRetreat: ; 148dc (5:48dc)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 148e8 (5:48e8)
+	call AIDoTurn_GeneralNoRetreat
+	ret
+; 0x148ec
+
+.start_duel ; 148ec (5:48ec)
+	call InitAIDuelVars
+	call AIPlayInitialBasicCards
+	ret
+; 0x148f3
+
+.forced_switch ; 148f3 (5:48f3)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x148f7
+
+.ko_switch ; 148f7 (5:48f7)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x148fb
+
+.take_prize ; 148fb (5:48fb)
+	call AIPickPrizeCards
+	ret
+; 0x148ff
+
+AIDoTurn_GeneralNoRetreat: ; 148ff (5:48ff)
+; initialize variables
+	call InitAITurnVars
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	farcall HandleAIAntiMewtwoDeckStrategy
+	jp nc, .try_attack
+; handle Pkmn Powers
+	farcall HandleAIGoGoRainDanceEnergy
+	farcall HandleAIDamageSwap
+	farcall HandleAIPkmnPowers
+	ret c ; return if turn ended
+	farcall HandleAICowardice
+; process Trainer cards
+; phase 2 through 4.
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_03
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_04
+	call AIProcessHandTrainerCards
+; play Pokemon from hand
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+; process Trainer cards
+; phase 5 through 12.
+	ld a, AI_TRAINER_CARD_PHASE_05
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_06
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_07
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_08
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_11
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_12
+	call AIProcessHandTrainerCards
+; play Energy card if possible
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_energy_attach_1
+	call AIProcessAndTryToPlayEnergy
+.skip_energy_attach_1
+; play Pokemon from hand again
+	call AIDecidePlayPokemonCard
+; handle Pkmn Powers again
+	farcall HandleAIDamageSwap
+	farcall HandleAIPkmnPowers
+	ret c ; return if turn ended
+	farcall HandleAIGoGoRainDanceEnergy
+	ld a, AI_ENERGY_TRANS_ATTACK
+	farcall HandleAIEnergyTrans
+; process Trainer cards phases 13 and 15
+	ld a, AI_TRAINER_CARD_PHASE_13
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_15
+	call AIProcessHandTrainerCards
+; if used Professor Oak, process new hand
+; if not, then proceed to attack.
+	ld a, [wPreviousAIFlags]
+	and AI_FLAG_USED_PROFESSOR_OAK
+	jr z, .try_attack
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_03
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_04
+	call AIProcessHandTrainerCards
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+	ld a, AI_TRAINER_CARD_PHASE_05
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_06
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_07
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_08
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_11
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_12
+	call AIProcessHandTrainerCards
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_energy_attach_2
+	call AIProcessAndTryToPlayEnergy
+.skip_energy_attach_2
+	call AIDecidePlayPokemonCard
+	farcall HandleAIDamageSwap
+	farcall HandleAIPkmnPowers
+	ret c ; return if turn ended
+	farcall HandleAIGoGoRainDanceEnergy
+	ld a, AI_TRAINER_CARD_PHASE_13
+	call AIProcessHandTrainerCards
+	; skip AI_TRAINER_CARD_PHASE_15
+.try_attack
+; attack if possible, if not,
+; finish turn without attacking.
+	call AIProcessAndTryToUseAttack
+	ret c ; return if turn ended
+	ld a, OPPACTION_FINISH_NO_ATTACK
+	bank1call AIMakeDecision
+	ret
+; 0x149e8
diff --git a/src/engine/deck_ai/decks/go_go_rain_dance.asm b/src/engine/deck_ai/decks/go_go_rain_dance.asm
index 006bbdc..89e34c1 100644
--- a/src/engine/deck_ai/decks/go_go_rain_dance.asm
+++ b/src/engine/deck_ai/decks/go_go_rain_dance.asm
@@ -1,85 +1,85 @@
-AIActionTable_GoGoRainDance: ; 14f8f (5:4f8f)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 14f9b (5:4f9b)

-	call AIMainTurnLogic

-	ret

-; 0x14f9f

-

-.start_duel ; 14f9f (5:4f9f)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x14fb0

-

-.forced_switch ; 14fb0 (5:4fb0)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14fb4

-

-.ko_switch ; 14fb4 (5:4fb4)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14fb8

-

-.take_prize ; 14fb8 (5:4fb8)

-	call AIPickPrizeCards

-	ret

-; 0x14fbc

-

-.list_arena ; 14fbc (5:4fbc)

-	db LAPRAS

-	db HORSEA

-	db GOLDEEN

-	db SQUIRTLE

-	db $00

-

-.list_bench ; 14fc1 (5:4fc1)

-	db SQUIRTLE

-	db HORSEA

-	db GOLDEEN

-	db LAPRAS

-	db $00

-

-.list_retreat ; 14fc6 (5:4fc6)

-	ai_retreat SQUIRTLE,  -3

-	ai_retreat WARTORTLE, -2

-	ai_retreat HORSEA,    -1

-	db $00

-

-.list_energy ; 14fcd (5:4fcd)

-	ai_energy SQUIRTLE,  2, +0

-	ai_energy WARTORTLE, 3, +0

-	ai_energy BLASTOISE, 5, +0

-	ai_energy GOLDEEN,   1, +0

-	ai_energy SEAKING,   2, +0

-	ai_energy HORSEA,    2, +0

-	ai_energy SEADRA,    3, +0

-	ai_energy LAPRAS,    3, +0

-	db $00

-

-.list_prize ; 14fe6 (5:4fe6)

-	db GAMBLER

-	db ENERGY_RETRIEVAL

-	db SUPER_ENERGY_RETRIEVAL

-	db BLASTOISE

-	db $00

-

-.store_list_pointers ; 14feb (5:4feb)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x15019

+AIActionTable_GoGoRainDance: ; 14f8f (5:4f8f)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 14f9b (5:4f9b)
+	call AIMainTurnLogic
+	ret
+; 0x14f9f
+
+.start_duel ; 14f9f (5:4f9f)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x14fb0
+
+.forced_switch ; 14fb0 (5:4fb0)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14fb4
+
+.ko_switch ; 14fb4 (5:4fb4)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14fb8
+
+.take_prize ; 14fb8 (5:4fb8)
+	call AIPickPrizeCards
+	ret
+; 0x14fbc
+
+.list_arena ; 14fbc (5:4fbc)
+	db LAPRAS
+	db HORSEA
+	db GOLDEEN
+	db SQUIRTLE
+	db $00
+
+.list_bench ; 14fc1 (5:4fc1)
+	db SQUIRTLE
+	db HORSEA
+	db GOLDEEN
+	db LAPRAS
+	db $00
+
+.list_retreat ; 14fc6 (5:4fc6)
+	ai_retreat SQUIRTLE,  -3
+	ai_retreat WARTORTLE, -2
+	ai_retreat HORSEA,    -1
+	db $00
+
+.list_energy ; 14fcd (5:4fcd)
+	ai_energy SQUIRTLE,  2, +0
+	ai_energy WARTORTLE, 3, +0
+	ai_energy BLASTOISE, 5, +0
+	ai_energy GOLDEEN,   1, +0
+	ai_energy SEAKING,   2, +0
+	ai_energy HORSEA,    2, +0
+	ai_energy SEADRA,    3, +0
+	ai_energy LAPRAS,    3, +0
+	db $00
+
+.list_prize ; 14fe6 (5:4fe6)
+	db GAMBLER
+	db ENERGY_RETRIEVAL
+	db SUPER_ENERGY_RETRIEVAL
+	db BLASTOISE
+	db $00
+
+.store_list_pointers ; 14feb (5:4feb)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x15019
diff --git a/src/engine/deck_ai/decks/im_ronald.asm b/src/engine/deck_ai/decks/im_ronald.asm
index c140f1d..3ce72e6 100644
--- a/src/engine/deck_ai/decks/im_ronald.asm
+++ b/src/engine/deck_ai/decks/im_ronald.asm
@@ -1,86 +1,86 @@
-AIActionTable_ImRonald: ; 152bd (5:52bd)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 152c9 (5:52c9)

-	call AIMainTurnLogic

-	ret

-; 0x152cd

-

-.start_duel ; 152cd (5:52cd)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x152de

-

-.forced_switch ; 152de (5:52de)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x152e2

-

-.ko_switch ; 152e2 (5:52e2)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x152e6

-

-.take_prize ; 152e6 (5:52e6)

-	call AIPickPrizeCards

-	ret

-; 0x152ea

-

-.list_arena ; 152ea (5:52ea)

-	db LAPRAS

-	db SEEL

-	db CHARMANDER

-	db CUBONE

-	db SQUIRTLE

-	db GROWLITHE

-	db $00

-

-.list_bench ; 152f1 (5:52f1)

-	db CHARMANDER

-	db SQUIRTLE

-	db SEEL

-	db CUBONE

-	db GROWLITHE

-	db LAPRAS

-	db $00

-

-.list_retreat ; 152f8 (5:52f8)

-	db $00

-

-.list_energy ; 152f9 (5:52f9)

-	ai_energy CHARMANDER, 3, +0

-	ai_energy CHARMELEON, 5, +0

-	ai_energy GROWLITHE,  2, +0

-	ai_energy ARCANINE2,  4, +0

-	ai_energy SQUIRTLE,   2, +0

-	ai_energy WARTORTLE,  3, +0

-	ai_energy SEEL,       3, +0

-	ai_energy DEWGONG,    4, +0

-	ai_energy LAPRAS,     3, +0

-	ai_energy CUBONE,     3, +0

-	ai_energy MAROWAK1,   3, +0

-	db $00

-

-.list_prize ; 1531b (5:531b)

-	db LAPRAS

-	db $00

-

-.store_list_pointers ; 1531d (5:531d)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x1534b

+AIActionTable_ImRonald: ; 152bd (5:52bd)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 152c9 (5:52c9)
+	call AIMainTurnLogic
+	ret
+; 0x152cd
+
+.start_duel ; 152cd (5:52cd)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x152de
+
+.forced_switch ; 152de (5:52de)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x152e2
+
+.ko_switch ; 152e2 (5:52e2)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x152e6
+
+.take_prize ; 152e6 (5:52e6)
+	call AIPickPrizeCards
+	ret
+; 0x152ea
+
+.list_arena ; 152ea (5:52ea)
+	db LAPRAS
+	db SEEL
+	db CHARMANDER
+	db CUBONE
+	db SQUIRTLE
+	db GROWLITHE
+	db $00
+
+.list_bench ; 152f1 (5:52f1)
+	db CHARMANDER
+	db SQUIRTLE
+	db SEEL
+	db CUBONE
+	db GROWLITHE
+	db LAPRAS
+	db $00
+
+.list_retreat ; 152f8 (5:52f8)
+	db $00
+
+.list_energy ; 152f9 (5:52f9)
+	ai_energy CHARMANDER, 3, +0
+	ai_energy CHARMELEON, 5, +0
+	ai_energy GROWLITHE,  2, +0
+	ai_energy ARCANINE2,  4, +0
+	ai_energy SQUIRTLE,   2, +0
+	ai_energy WARTORTLE,  3, +0
+	ai_energy SEEL,       3, +0
+	ai_energy DEWGONG,    4, +0
+	ai_energy LAPRAS,     3, +0
+	ai_energy CUBONE,     3, +0
+	ai_energy MAROWAK1,   3, +0
+	db $00
+
+.list_prize ; 1531b (5:531b)
+	db LAPRAS
+	db $00
+
+.store_list_pointers ; 1531d (5:531d)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x1534b
diff --git a/src/engine/deck_ai/decks/invincible_ronald.asm b/src/engine/deck_ai/decks/invincible_ronald.asm
index 0a55461..3f302ac 100644
--- a/src/engine/deck_ai/decks/invincible_ronald.asm
+++ b/src/engine/deck_ai/decks/invincible_ronald.asm
@@ -1,84 +1,84 @@
-AIActionTable_InvincibleRonald: ; 153e8 (5:53e8)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 153f4 (5:53f4)

-	call AIMainTurnLogic

-	ret

-; 0x153f8

-

-.start_duel ; 153f8 (5:53f8)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x15409

-

-.forced_switch ; 15409 (5:5409)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x1540d

-

-.ko_switch ; 1540d (5:540d)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x15411

-

-.take_prize ; 15411 (5:5411)

-	call AIPickPrizeCards

-	ret

-; 0x15415

-

-.list_arena ; 15415 (5:5415)

-	db KANGASKHAN

-	db MAGMAR2

-	db CHANSEY

-	db GEODUDE

-	db SCYTHER

-	db GRIMER

-	db $00

-

-.list_bench ; 1541c (5:541c)

-	db GRIMER

-	db SCYTHER

-	db GEODUDE

-	db CHANSEY

-	db MAGMAR2

-	db KANGASKHAN

-	db $00

-

-.list_retreat ; 15423 (5:5423)

-	ai_retreat GRIMER, -1

-	db $00

-

-.list_energy ; 15426 (5:5426)

-	ai_energy GRIMER,     1, -1

-	ai_energy MUK,        3, -1

-	ai_energy SCYTHER,    4, +1

-	ai_energy MAGMAR2,    2, +0

-	ai_energy GEODUDE,    2, +0

-	ai_energy GRAVELER,   3, +0

-	ai_energy CHANSEY,    4, +0

-	ai_energy KANGASKHAN, 4, -1

-	db $00

-

-.list_prize ; 1543f (5:543f)

-	db GAMBLER

-	db $00

-

-.store_list_pointers ; 15441 (5:5441)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x1546f

+AIActionTable_InvincibleRonald: ; 153e8 (5:53e8)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 153f4 (5:53f4)
+	call AIMainTurnLogic
+	ret
+; 0x153f8
+
+.start_duel ; 153f8 (5:53f8)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x15409
+
+.forced_switch ; 15409 (5:5409)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x1540d
+
+.ko_switch ; 1540d (5:540d)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x15411
+
+.take_prize ; 15411 (5:5411)
+	call AIPickPrizeCards
+	ret
+; 0x15415
+
+.list_arena ; 15415 (5:5415)
+	db KANGASKHAN
+	db MAGMAR2
+	db CHANSEY
+	db GEODUDE
+	db SCYTHER
+	db GRIMER
+	db $00
+
+.list_bench ; 1541c (5:541c)
+	db GRIMER
+	db SCYTHER
+	db GEODUDE
+	db CHANSEY
+	db MAGMAR2
+	db KANGASKHAN
+	db $00
+
+.list_retreat ; 15423 (5:5423)
+	ai_retreat GRIMER, -1
+	db $00
+
+.list_energy ; 15426 (5:5426)
+	ai_energy GRIMER,     1, -1
+	ai_energy MUK,        3, -1
+	ai_energy SCYTHER,    4, +1
+	ai_energy MAGMAR2,    2, +0
+	ai_energy GEODUDE,    2, +0
+	ai_energy GRAVELER,   3, +0
+	ai_energy CHANSEY,    4, +0
+	ai_energy KANGASKHAN, 4, -1
+	db $00
+
+.list_prize ; 1543f (5:543f)
+	db GAMBLER
+	db $00
+
+.store_list_pointers ; 15441 (5:5441)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x1546f
diff --git a/src/engine/deck_ai/decks/legendary_articuno.asm b/src/engine/deck_ai/decks/legendary_articuno.asm
index 183ab62..011abb0 100644
--- a/src/engine/deck_ai/decks/legendary_articuno.asm
+++ b/src/engine/deck_ai/decks/legendary_articuno.asm
@@ -1,217 +1,217 @@
-AIActionTable_LegendaryArticuno: ; 14c0b (5:4c0b)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 14c17 (5:4c17)

-	call AIDoTurn_LegendaryArticuno

-	ret

-; 0x14c1b

-

-.start_duel ; 14c1b (5:4c1b)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x14c2c

-

-.forced_switch ; 14c2c (5:4c2c)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14c30

-

-.ko_switch ; 14c30 (5:4c30)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14c34

-

-.take_prize ; 14c34 (5:4c34)

-	call AIPickPrizeCards

-	ret

-; 0x14c38

-

-.list_arena ; 14c38 (5:4c38)

-	db CHANSEY

-	db LAPRAS

-	db DITTO

-	db SEEL

-	db ARTICUNO1

-	db ARTICUNO2

-	db $00

-

-.list_bench ; 14c3f (5:4c3f)

-	db ARTICUNO1

-	db SEEL

-	db LAPRAS

-	db CHANSEY

-	db DITTO

-	db $00

-

-.list_retreat ; 14c45 (5:4c45)

-	ai_retreat SEEL,  -3

-	ai_retreat DITTO, -3

-	db $00

-

-.list_energy ; 14c4a (5:4c4a)

-	ai_energy SEEL,      3, +1

-	ai_energy DEWGONG,   4, +0

-	ai_energy LAPRAS,    3, +0

-	ai_energy ARTICUNO1, 4, +1

-	ai_energy ARTICUNO2, 3, +0

-	ai_energy CHANSEY,   0, -8

-	ai_energy DITTO,     3, +0

-	db $00

-

-.list_prize ; 14c60 (5:4c60)

-	db GAMBLER

-	db ARTICUNO2

-	db $00

-

-.store_list_pointers ; 14c63 (5:4c63)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x14c91

-

-; this routine handles how Legendary Articuno

-; prioritises playing energy cards to each Pokémon.

-; first, it makes sure that all Lapras have at least

-; 3 energy cards before moving on to Articuno,

-; and then to Dewgong and Seel

-ScoreLegendaryArticunoCards: ; 14c91 (5:4c91)

-	call SwapTurn

-	call CountPrizes

-	call SwapTurn

-	cp 3

-	ret c

-

-; player prizes >= 3

-; if Lapras has more than half HP and

-; can use second move, check next for Articuno

-; otherwise, check if Articuno or Dewgong

-; have more than half HP and can use second move

-; and if so, the next Pokémon to check is Lapras

-	ld a, LAPRAS

-	call CheckForBenchIDAtHalfHPAndCanUseSecondMove

-	jr c, .articuno

-	ld a, ARTICUNO1

-	call CheckForBenchIDAtHalfHPAndCanUseSecondMove

-	jr c, .lapras

-	ld a, DEWGONG

-	call CheckForBenchIDAtHalfHPAndCanUseSecondMove

-	jr c, .lapras

-	jr .articuno

-

-; the following routines check for certain card IDs in bench

-; and call RaiseAIScoreToAllMatchingIDsInBench if these are found.

-; for Lapras, an additional check is made to its

-; attached energy count, which skips calling the routine

-; if this count is >= 3

-.lapras

-	ld a, LAPRAS

-	ld b, PLAY_AREA_BENCH_1

-	call LookForCardIDInPlayArea_Bank5

-	jr nc, .articuno

-	ld e, a

-	call CountNumberOfEnergyCardsAttached

-	cp 3

-	jr nc, .articuno

-	ld a, LAPRAS

-	call RaiseAIScoreToAllMatchingIDsInBench

-	ret

-

-.articuno

-	ld a, ARTICUNO1

-	ld b, PLAY_AREA_BENCH_1

-	call LookForCardIDInPlayArea_Bank5

-	jr nc, .dewgong

-	ld a, ARTICUNO1

-	call RaiseAIScoreToAllMatchingIDsInBench

-	ret

-

-.dewgong

-	ld a, DEWGONG

-	ld b, PLAY_AREA_BENCH_1

-	call LookForCardIDInPlayArea_Bank5

-	jr nc, .seel

-	ld a, DEWGONG

-	call RaiseAIScoreToAllMatchingIDsInBench

-	ret

-

-.seel

-	ld a, SEEL

-	ld b, PLAY_AREA_BENCH_1

-	call LookForCardIDInPlayArea_Bank5

-	ret nc

-	ld a, SEEL

-	call RaiseAIScoreToAllMatchingIDsInBench

-	ret

-; 0x14cf7

-

-AIDoTurn_LegendaryArticuno: ; 14cf7 (5:4cf7)

-; initialize variables

-	call InitAITurnVars

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	farcall HandleAIAntiMewtwoDeckStrategy

-	jp nc, .try_attack

-; process Trainer cards

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-; play Pokemon from hand

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-	call AIProcessRetreat

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-; play Energy card if possible

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_energy_attach_1

-	call AIProcessAndTryToPlayEnergy

-.skip_energy_attach_1

-; play Pokemon from hand again

-	call AIDecidePlayPokemonCard

-; process Trainer cards phases 13 and 15

-	ld a, AI_TRAINER_CARD_PHASE_13

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_15

-	call AIProcessHandTrainerCards

-; if used Professor Oak, process new hand

-	ld a, [wPreviousAIFlags]

-	and AI_FLAG_USED_PROFESSOR_OAK

-	jr z, .try_attack

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-	call AIProcessRetreat

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_energy_attach_2

-	call AIProcessAndTryToPlayEnergy

-.skip_energy_attach_2

-	call AIDecidePlayPokemonCard

-.try_attack

-; attack if possible, if not,

-; finish turn without attacking.

-	call AIProcessAndTryToUseAttack

-	ret c ; return if turn ended

-	ld a, OPPACTION_FINISH_NO_ATTACK

-	bank1call AIMakeDecision

-	ret

-; 0x14d60

+AIActionTable_LegendaryArticuno: ; 14c0b (5:4c0b)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 14c17 (5:4c17)
+	call AIDoTurn_LegendaryArticuno
+	ret
+; 0x14c1b
+
+.start_duel ; 14c1b (5:4c1b)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x14c2c
+
+.forced_switch ; 14c2c (5:4c2c)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14c30
+
+.ko_switch ; 14c30 (5:4c30)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14c34
+
+.take_prize ; 14c34 (5:4c34)
+	call AIPickPrizeCards
+	ret
+; 0x14c38
+
+.list_arena ; 14c38 (5:4c38)
+	db CHANSEY
+	db LAPRAS
+	db DITTO
+	db SEEL
+	db ARTICUNO1
+	db ARTICUNO2
+	db $00
+
+.list_bench ; 14c3f (5:4c3f)
+	db ARTICUNO1
+	db SEEL
+	db LAPRAS
+	db CHANSEY
+	db DITTO
+	db $00
+
+.list_retreat ; 14c45 (5:4c45)
+	ai_retreat SEEL,  -3
+	ai_retreat DITTO, -3
+	db $00
+
+.list_energy ; 14c4a (5:4c4a)
+	ai_energy SEEL,      3, +1
+	ai_energy DEWGONG,   4, +0
+	ai_energy LAPRAS,    3, +0
+	ai_energy ARTICUNO1, 4, +1
+	ai_energy ARTICUNO2, 3, +0
+	ai_energy CHANSEY,   0, -8
+	ai_energy DITTO,     3, +0
+	db $00
+
+.list_prize ; 14c60 (5:4c60)
+	db GAMBLER
+	db ARTICUNO2
+	db $00
+
+.store_list_pointers ; 14c63 (5:4c63)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x14c91
+
+; this routine handles how Legendary Articuno
+; prioritises playing energy cards to each Pokémon.
+; first, it makes sure that all Lapras have at least
+; 3 energy cards before moving on to Articuno,
+; and then to Dewgong and Seel
+ScoreLegendaryArticunoCards: ; 14c91 (5:4c91)
+	call SwapTurn
+	call CountPrizes
+	call SwapTurn
+	cp 3
+	ret c
+
+; player prizes >= 3
+; if Lapras has more than half HP and
+; can use second move, check next for Articuno
+; otherwise, check if Articuno or Dewgong
+; have more than half HP and can use second move
+; and if so, the next Pokémon to check is Lapras
+	ld a, LAPRAS
+	call CheckForBenchIDAtHalfHPAndCanUseSecondMove
+	jr c, .articuno
+	ld a, ARTICUNO1
+	call CheckForBenchIDAtHalfHPAndCanUseSecondMove
+	jr c, .lapras
+	ld a, DEWGONG
+	call CheckForBenchIDAtHalfHPAndCanUseSecondMove
+	jr c, .lapras
+	jr .articuno
+
+; the following routines check for certain card IDs in bench
+; and call RaiseAIScoreToAllMatchingIDsInBench if these are found.
+; for Lapras, an additional check is made to its
+; attached energy count, which skips calling the routine
+; if this count is >= 3
+.lapras
+	ld a, LAPRAS
+	ld b, PLAY_AREA_BENCH_1
+	call LookForCardIDInPlayArea_Bank5
+	jr nc, .articuno
+	ld e, a
+	call CountNumberOfEnergyCardsAttached
+	cp 3
+	jr nc, .articuno
+	ld a, LAPRAS
+	call RaiseAIScoreToAllMatchingIDsInBench
+	ret
+
+.articuno
+	ld a, ARTICUNO1
+	ld b, PLAY_AREA_BENCH_1
+	call LookForCardIDInPlayArea_Bank5
+	jr nc, .dewgong
+	ld a, ARTICUNO1
+	call RaiseAIScoreToAllMatchingIDsInBench
+	ret
+
+.dewgong
+	ld a, DEWGONG
+	ld b, PLAY_AREA_BENCH_1
+	call LookForCardIDInPlayArea_Bank5
+	jr nc, .seel
+	ld a, DEWGONG
+	call RaiseAIScoreToAllMatchingIDsInBench
+	ret
+
+.seel
+	ld a, SEEL
+	ld b, PLAY_AREA_BENCH_1
+	call LookForCardIDInPlayArea_Bank5
+	ret nc
+	ld a, SEEL
+	call RaiseAIScoreToAllMatchingIDsInBench
+	ret
+; 0x14cf7
+
+AIDoTurn_LegendaryArticuno: ; 14cf7 (5:4cf7)
+; initialize variables
+	call InitAITurnVars
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	farcall HandleAIAntiMewtwoDeckStrategy
+	jp nc, .try_attack
+; process Trainer cards
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+; play Pokemon from hand
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+	call AIProcessRetreat
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+; play Energy card if possible
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_energy_attach_1
+	call AIProcessAndTryToPlayEnergy
+.skip_energy_attach_1
+; play Pokemon from hand again
+	call AIDecidePlayPokemonCard
+; process Trainer cards phases 13 and 15
+	ld a, AI_TRAINER_CARD_PHASE_13
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_15
+	call AIProcessHandTrainerCards
+; if used Professor Oak, process new hand
+	ld a, [wPreviousAIFlags]
+	and AI_FLAG_USED_PROFESSOR_OAK
+	jr z, .try_attack
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+	call AIProcessRetreat
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_energy_attach_2
+	call AIProcessAndTryToPlayEnergy
+.skip_energy_attach_2
+	call AIDecidePlayPokemonCard
+.try_attack
+; attack if possible, if not,
+; finish turn without attacking.
+	call AIProcessAndTryToUseAttack
+	ret c ; return if turn ended
+	ld a, OPPACTION_FINISH_NO_ATTACK
+	bank1call AIMakeDecision
+	ret
+; 0x14d60
diff --git a/src/engine/deck_ai/decks/legendary_dragonite.asm b/src/engine/deck_ai/decks/legendary_dragonite.asm
index d320440..a931416 100644
--- a/src/engine/deck_ai/decks/legendary_dragonite.asm
+++ b/src/engine/deck_ai/decks/legendary_dragonite.asm
@@ -1,173 +1,173 @@
-AIActionTable_LegendaryDragonite: ; 14d60 (05:4d60)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 14d6c (5:4d6c)

-	call AIDoTurn_LegendaryDragonite

-	ret

-; 0x14d70

-

-.start_duel ; 14d70 (5:4d70)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x14d81

-

-.forced_switch ; 14d81 (5:4d81)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14d85

-

-.ko_switch ; 14d85 (5:4d85)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14d89

-

-.take_prize ; 14d89 (5:4d89)

-	call AIPickPrizeCards

-	ret

-; 0x14d8d

-

-.list_arena ; 14d8d (5:4d8d)

-	db KANGASKHAN

-	db LAPRAS

-	db CHARMANDER

-	db DRATINI

-	db MAGIKARP

-	db $00

-

-.list_bench ; 14d93 (5:4d93)

-	db CHARMANDER

-	db MAGIKARP

-	db DRATINI

-	db LAPRAS

-	db KANGASKHAN

-	db $00

-

-.list_retreat ; 14d99 (5:4d99)

-	ai_retreat CHARMANDER, -1

-	ai_retreat MAGIKARP,   -5

-	db $00

-

-.list_energy ; 14d9e (5:4d9e)

-	ai_energy CHARMANDER, 3, +1

-	ai_energy CHARMELEON, 4, +1

-	ai_energy CHARIZARD,  5, +0

-	ai_energy MAGIKARP,   3, +1

-	ai_energy GYARADOS,   4, -1

-	ai_energy DRATINI,    2, +0

-	ai_energy DRAGONAIR,  4, +0

-	ai_energy DRAGONITE1, 3, -1

-	ai_energy KANGASKHAN, 2, -2

-	ai_energy LAPRAS,     3, +0

-	db $00

-

-.list_prize ; 14dbd (5:4dbd)

-	db GAMBLER

-	db DRAGONITE1

-	db KANGASKHAN

-	db $00

-

-.store_list_pointers ; 14dc1 (5:4dc1)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x14def

-

-AIDoTurn_LegendaryDragonite: ; 14def (5:4def)

-; initialize variables

-	call InitAITurnVars

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	farcall HandleAIAntiMewtwoDeckStrategy

-	jp nc, .try_attack

-; process Trainer cards

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-; play Pokemon from hand

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-	ld a, AI_TRAINER_CARD_PHASE_07

-	call AIProcessHandTrainerCards

-	call AIProcessRetreat

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_11

-	call AIProcessHandTrainerCards

-; play Energy card if possible

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_energy_attach_1

-

-; if Arena card is Kangaskhan and doens't

-; have Energy cards attached, try attaching from hand.

-; otherwise run normal AI energy attach routine.

-	ld a, DUELVARS_ARENA_CARD

-	call GetTurnDuelistVariable

-	call GetCardIDFromDeckIndex

-	ld a, KANGASKHAN

-	cp e

-	jr nz, .attach_normally

-	call CreateEnergyCardListFromHand

-	jr c, .skip_energy_attach_1

-	ld e, PLAY_AREA_ARENA

-	call CountNumberOfEnergyCardsAttached

-	or a

-	jr nz, .attach_normally

-	xor a

-	ldh [hTempPlayAreaLocation_ff9d], a

-	call AITryToPlayEnergyCard

-	jr c, .skip_energy_attach_1

-.attach_normally

-	call AIProcessAndTryToPlayEnergy

-

-.skip_energy_attach_1

-; play Pokemon from hand again

-	call AIDecidePlayPokemonCard

-	ld a, AI_TRAINER_CARD_PHASE_15

-	call AIProcessHandTrainerCards

-; if used Professor Oak, process new hand

-; if not, then proceed to attack.

-	ld a, [wPreviousAIFlags]

-	and AI_FLAG_USED_PROFESSOR_OAK

-	jr z, .try_attack

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-	ld a, AI_TRAINER_CARD_PHASE_07

-	call AIProcessHandTrainerCards

-	call AIProcessRetreat

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_11

-	call AIProcessHandTrainerCards

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_energy_attach_2

-	call AIProcessAndTryToPlayEnergy

-.skip_energy_attach_2

-	call AIDecidePlayPokemonCard

-.try_attack

-; attack if possible, if not,

-; finish turn without attacking.

-	call AIProcessAndTryToUseAttack

-	ret c ; return if turn ended

-	ld a, OPPACTION_FINISH_NO_ATTACK

-	bank1call AIMakeDecision

-	ret

-; 0x14e89

+AIActionTable_LegendaryDragonite: ; 14d60 (05:4d60)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 14d6c (5:4d6c)
+	call AIDoTurn_LegendaryDragonite
+	ret
+; 0x14d70
+
+.start_duel ; 14d70 (5:4d70)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x14d81
+
+.forced_switch ; 14d81 (5:4d81)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14d85
+
+.ko_switch ; 14d85 (5:4d85)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14d89
+
+.take_prize ; 14d89 (5:4d89)
+	call AIPickPrizeCards
+	ret
+; 0x14d8d
+
+.list_arena ; 14d8d (5:4d8d)
+	db KANGASKHAN
+	db LAPRAS
+	db CHARMANDER
+	db DRATINI
+	db MAGIKARP
+	db $00
+
+.list_bench ; 14d93 (5:4d93)
+	db CHARMANDER
+	db MAGIKARP
+	db DRATINI
+	db LAPRAS
+	db KANGASKHAN
+	db $00
+
+.list_retreat ; 14d99 (5:4d99)
+	ai_retreat CHARMANDER, -1
+	ai_retreat MAGIKARP,   -5
+	db $00
+
+.list_energy ; 14d9e (5:4d9e)
+	ai_energy CHARMANDER, 3, +1
+	ai_energy CHARMELEON, 4, +1
+	ai_energy CHARIZARD,  5, +0
+	ai_energy MAGIKARP,   3, +1
+	ai_energy GYARADOS,   4, -1
+	ai_energy DRATINI,    2, +0
+	ai_energy DRAGONAIR,  4, +0
+	ai_energy DRAGONITE1, 3, -1
+	ai_energy KANGASKHAN, 2, -2
+	ai_energy LAPRAS,     3, +0
+	db $00
+
+.list_prize ; 14dbd (5:4dbd)
+	db GAMBLER
+	db DRAGONITE1
+	db KANGASKHAN
+	db $00
+
+.store_list_pointers ; 14dc1 (5:4dc1)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x14def
+
+AIDoTurn_LegendaryDragonite: ; 14def (5:4def)
+; initialize variables
+	call InitAITurnVars
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	farcall HandleAIAntiMewtwoDeckStrategy
+	jp nc, .try_attack
+; process Trainer cards
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+; play Pokemon from hand
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+	ld a, AI_TRAINER_CARD_PHASE_07
+	call AIProcessHandTrainerCards
+	call AIProcessRetreat
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_11
+	call AIProcessHandTrainerCards
+; play Energy card if possible
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_energy_attach_1
+
+; if Arena card is Kangaskhan and doens't
+; have Energy cards attached, try attaching from hand.
+; otherwise run normal AI energy attach routine.
+	ld a, DUELVARS_ARENA_CARD
+	call GetTurnDuelistVariable
+	call GetCardIDFromDeckIndex
+	ld a, KANGASKHAN
+	cp e
+	jr nz, .attach_normally
+	call CreateEnergyCardListFromHand
+	jr c, .skip_energy_attach_1
+	ld e, PLAY_AREA_ARENA
+	call CountNumberOfEnergyCardsAttached
+	or a
+	jr nz, .attach_normally
+	xor a
+	ldh [hTempPlayAreaLocation_ff9d], a
+	call AITryToPlayEnergyCard
+	jr c, .skip_energy_attach_1
+.attach_normally
+	call AIProcessAndTryToPlayEnergy
+
+.skip_energy_attach_1
+; play Pokemon from hand again
+	call AIDecidePlayPokemonCard
+	ld a, AI_TRAINER_CARD_PHASE_15
+	call AIProcessHandTrainerCards
+; if used Professor Oak, process new hand
+; if not, then proceed to attack.
+	ld a, [wPreviousAIFlags]
+	and AI_FLAG_USED_PROFESSOR_OAK
+	jr z, .try_attack
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+	ld a, AI_TRAINER_CARD_PHASE_07
+	call AIProcessHandTrainerCards
+	call AIProcessRetreat
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_11
+	call AIProcessHandTrainerCards
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_energy_attach_2
+	call AIProcessAndTryToPlayEnergy
+.skip_energy_attach_2
+	call AIDecidePlayPokemonCard
+.try_attack
+; attack if possible, if not,
+; finish turn without attacking.
+	call AIProcessAndTryToUseAttack
+	ret c ; return if turn ended
+	ld a, OPPACTION_FINISH_NO_ATTACK
+	bank1call AIMakeDecision
+	ret
+; 0x14e89
diff --git a/src/engine/deck_ai/decks/legendary_moltres.asm b/src/engine/deck_ai/decks/legendary_moltres.asm
index cb38668..725ef82 100644
--- a/src/engine/deck_ai/decks/legendary_moltres.asm
+++ b/src/engine/deck_ai/decks/legendary_moltres.asm
@@ -1,183 +1,183 @@
-AIActionTable_LegendaryMoltres: ; 149e8 (05:49e8)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 149f4 (5:49f4)

-	call AIDoTurn_LegendaryMoltres

-	ret

-; 0x149f8

-

-.start_duel ; 149f8 (5:49f8)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc ; Play Area set up was successful

-	call AIPlayInitialBasicCards

-	ret

-; 0x14a09

-

-.forced_switch ; 14a09 (5:4a09)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14a0d

-

-.ko_switch ; 14a0d (5:4a0d)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14a11

-

-.take_prize ; 14a11 (5:4a11)

-	call AIPickPrizeCards

-	ret

-; 0x14a15

-

-.list_arena ; 14a15 (5:4a15)

-	db MAGMAR2

-	db GROWLITHE

-	db VULPIX

-	db MAGMAR1

-	db MOLTRES1

-	db MOLTRES2

-	db $00

-

-.list_bench ; 14a1c (5:4a1c)

-	db MOLTRES1

-	db VULPIX

-	db GROWLITHE

-	db MAGMAR2

-	db MAGMAR1

-	db $00

-

-.list_play_hand ; 14a22 (5:4a22)

-	db MOLTRES2

-	db MOLTRES1

-	db VULPIX

-	db GROWLITHE

-	db MAGMAR2

-	db MAGMAR1

-	db $00

-

-.list_retreat ; 14a29 (5:4a29)

-	ai_retreat GROWLITHE, -5

-	ai_retreat VULPIX,    -5

-	db $00

-

-.list_energy ; 14a2e (5:4a2e)

-	ai_energy VULPIX,     3, +0

-	ai_energy NINETAILS2, 3, +1

-	ai_energy GROWLITHE,  3, +1

-	ai_energy ARCANINE2,  4, +1

-	ai_energy MAGMAR1,    4, -1

-	ai_energy MAGMAR2,    1, -1

-	ai_energy MOLTRES2,   3, +2

-	ai_energy MOLTRES1,   4, +2

-	db $00

-

-.list_prize ; 14a47 (5:4a47)

-	db ENERGY_REMOVAL

-	db MOLTRES2

-	db $00

-

-.store_list_pointers ; 14a4a (5:4a4a)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_play_hand

-	store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x14a81

-

-AIDoTurn_LegendaryMoltres: ; 14a81 (5:4a81)

-; initialize variables

-	call InitAITurnVars

-	farcall HandleAIAntiMewtwoDeckStrategy

-	jp nc, .try_attack

-; process Trainer cards

-; phase 2 through 4.

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_04

-	call AIProcessHandTrainerCards

-

-; check if AI can play Moltres2

-; from hand and if so, play it.

-	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA

-	call GetTurnDuelistVariable

-	cp MAX_PLAY_AREA_POKEMON

-	jr nc, .skip_moltres ; skip if bench is full

-	ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK

-	call GetTurnDuelistVariable

-	cp DECK_SIZE - 9

-	jr nc, .skip_moltres ; skip if cards in deck <= 9

-	ld a, MUK

-	call CountPokemonIDInBothPlayAreas

-	jr c, .skip_moltres ; skip if Muk in play

-	ld a, MOLTRES2

-	call LookForCardIDInHandList_Bank5

-	jr nc, .skip_moltres ; skip if no Moltres2 in hand

-	ldh [hTemp_ffa0], a

-	ld a, OPPACTION_PLAY_BASIC_PKMN

-	bank1call AIMakeDecision

-

-.skip_moltres

-; play Pokemon from hand

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-; process Trainer cards

-	ld a, AI_TRAINER_CARD_PHASE_05

-	call AIProcessHandTrainerCards

-	call AIProcessRetreat

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_11

-	call AIProcessHandTrainerCards

-; play Energy card if possible

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_attach_energy

-

-; if Magmar2 is the Arena card and has no energy attached,

-; try attaching an energy card to it from the hand.

-; otherwise, run normal AI energy attach routine.

-	ld a, DUELVARS_ARENA_CARD

-	call GetTurnDuelistVariable

-	call GetCardIDFromDeckIndex

-	ld a, MAGMAR2

-	cp e

-	jr nz, .attach_normally

-	; Magmar2 is the Arena card

-	call CreateEnergyCardListFromHand

-	jr c, .skip_attach_energy

-	ld e, PLAY_AREA_ARENA

-	call CountNumberOfEnergyCardsAttached

-	or a

-	jr nz, .attach_normally

-	xor a ; PLAY_AREA_ARENA

-	ldh [hTempPlayAreaLocation_ff9d], a

-	call AITryToPlayEnergyCard

-	jr c, .skip_attach_energy

-

-.attach_normally

-; play Energy card if possible

-	call AIProcessAndTryToPlayEnergy

-.skip_attach_energy

-; try playing Pokemon cards from hand again

-	call AIDecidePlayPokemonCard

-	ld a, AI_TRAINER_CARD_PHASE_13

-	call AIProcessHandTrainerCards

-

-.try_attack

-; attack if possible, if not,

-; finish turn without attacking.

-	call AIProcessAndTryToUseAttack

-	ret c

-	ld a, OPPACTION_FINISH_NO_ATTACK

-	bank1call AIMakeDecision

-	ret

-; 0x14b0f

+AIActionTable_LegendaryMoltres: ; 149e8 (05:49e8)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 149f4 (5:49f4)
+	call AIDoTurn_LegendaryMoltres
+	ret
+; 0x149f8
+
+.start_duel ; 149f8 (5:49f8)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc ; Play Area set up was successful
+	call AIPlayInitialBasicCards
+	ret
+; 0x14a09
+
+.forced_switch ; 14a09 (5:4a09)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14a0d
+
+.ko_switch ; 14a0d (5:4a0d)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14a11
+
+.take_prize ; 14a11 (5:4a11)
+	call AIPickPrizeCards
+	ret
+; 0x14a15
+
+.list_arena ; 14a15 (5:4a15)
+	db MAGMAR2
+	db GROWLITHE
+	db VULPIX
+	db MAGMAR1
+	db MOLTRES1
+	db MOLTRES2
+	db $00
+
+.list_bench ; 14a1c (5:4a1c)
+	db MOLTRES1
+	db VULPIX
+	db GROWLITHE
+	db MAGMAR2
+	db MAGMAR1
+	db $00
+
+.list_play_hand ; 14a22 (5:4a22)
+	db MOLTRES2
+	db MOLTRES1
+	db VULPIX
+	db GROWLITHE
+	db MAGMAR2
+	db MAGMAR1
+	db $00
+
+.list_retreat ; 14a29 (5:4a29)
+	ai_retreat GROWLITHE, -5
+	ai_retreat VULPIX,    -5
+	db $00
+
+.list_energy ; 14a2e (5:4a2e)
+	ai_energy VULPIX,     3, +0
+	ai_energy NINETAILS2, 3, +1
+	ai_energy GROWLITHE,  3, +1
+	ai_energy ARCANINE2,  4, +1
+	ai_energy MAGMAR1,    4, -1
+	ai_energy MAGMAR2,    1, -1
+	ai_energy MOLTRES2,   3, +2
+	ai_energy MOLTRES1,   4, +2
+	db $00
+
+.list_prize ; 14a47 (5:4a47)
+	db ENERGY_REMOVAL
+	db MOLTRES2
+	db $00
+
+.store_list_pointers ; 14a4a (5:4a4a)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_play_hand
+	store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x14a81
+
+AIDoTurn_LegendaryMoltres: ; 14a81 (5:4a81)
+; initialize variables
+	call InitAITurnVars
+	farcall HandleAIAntiMewtwoDeckStrategy
+	jp nc, .try_attack
+; process Trainer cards
+; phase 2 through 4.
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_04
+	call AIProcessHandTrainerCards
+
+; check if AI can play Moltres2
+; from hand and if so, play it.
+	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
+	call GetTurnDuelistVariable
+	cp MAX_PLAY_AREA_POKEMON
+	jr nc, .skip_moltres ; skip if bench is full
+	ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK
+	call GetTurnDuelistVariable
+	cp DECK_SIZE - 9
+	jr nc, .skip_moltres ; skip if cards in deck <= 9
+	ld a, MUK
+	call CountPokemonIDInBothPlayAreas
+	jr c, .skip_moltres ; skip if Muk in play
+	ld a, MOLTRES2
+	call LookForCardIDInHandList_Bank5
+	jr nc, .skip_moltres ; skip if no Moltres2 in hand
+	ldh [hTemp_ffa0], a
+	ld a, OPPACTION_PLAY_BASIC_PKMN
+	bank1call AIMakeDecision
+
+.skip_moltres
+; play Pokemon from hand
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+; process Trainer cards
+	ld a, AI_TRAINER_CARD_PHASE_05
+	call AIProcessHandTrainerCards
+	call AIProcessRetreat
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_11
+	call AIProcessHandTrainerCards
+; play Energy card if possible
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_attach_energy
+
+; if Magmar2 is the Arena card and has no energy attached,
+; try attaching an energy card to it from the hand.
+; otherwise, run normal AI energy attach routine.
+	ld a, DUELVARS_ARENA_CARD
+	call GetTurnDuelistVariable
+	call GetCardIDFromDeckIndex
+	ld a, MAGMAR2
+	cp e
+	jr nz, .attach_normally
+	; Magmar2 is the Arena card
+	call CreateEnergyCardListFromHand
+	jr c, .skip_attach_energy
+	ld e, PLAY_AREA_ARENA
+	call CountNumberOfEnergyCardsAttached
+	or a
+	jr nz, .attach_normally
+	xor a ; PLAY_AREA_ARENA
+	ldh [hTempPlayAreaLocation_ff9d], a
+	call AITryToPlayEnergyCard
+	jr c, .skip_attach_energy
+
+.attach_normally
+; play Energy card if possible
+	call AIProcessAndTryToPlayEnergy
+.skip_attach_energy
+; try playing Pokemon cards from hand again
+	call AIDecidePlayPokemonCard
+	ld a, AI_TRAINER_CARD_PHASE_13
+	call AIProcessHandTrainerCards
+
+.try_attack
+; attack if possible, if not,
+; finish turn without attacking.
+	call AIProcessAndTryToUseAttack
+	ret c
+	ld a, OPPACTION_FINISH_NO_ATTACK
+	bank1call AIMakeDecision
+	ret
+; 0x14b0f
diff --git a/src/engine/deck_ai/decks/legendary_ronald.asm b/src/engine/deck_ai/decks/legendary_ronald.asm
index 2721ba9..6b77ebb 100644
--- a/src/engine/deck_ai/decks/legendary_ronald.asm
+++ b/src/engine/deck_ai/decks/legendary_ronald.asm
@@ -1,210 +1,210 @@
-AIActionTable_LegendaryRonald: ; 1546f (5:546f)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 1547b (5:547b)

-	call AIDoTurn_LegendaryRonald

-	ret

-; 0x1547f

-

-.start_duel ; 1547f (5:547f)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x15490

-

-.forced_switch ; 15490 (5:5490)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x15494

-

-.ko_switch ; 15494 (5:5494)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x15498

-

-.take_prize ; 15498 (5:5498)

-	call AIPickPrizeCards

-	ret

-; 0x1549c

-

-.list_arena ; 1549c (5:549c)

-	db KANGASKHAN

-	db DRATINI

-	db EEVEE

-	db ZAPDOS3

-	db ARTICUNO2

-	db MOLTRES2

-	db $00

-

-.list_bench ; 154a3 (5:54a3)

-	db KANGASKHAN

-	db DRATINI

-	db EEVEE

-	db $00

-

-.list_play_hand ; 154a7 (5:54a7)

-	db MOLTRES2

-	db ZAPDOS3

-	db KANGASKHAN

-	db DRATINI

-	db EEVEE

-	db ARTICUNO2

-	db $00

-

-.list_retreat ; 154ae (5:54ae)

-	ai_retreat EEVEE, -2

-	db $00

-

-.list_energy ; 154b1 (5:54b1)

-	ai_energy FLAREON1,   3, +0

-	ai_energy MOLTRES2,   3, +0

-	ai_energy VAPOREON1,  3, +0

-	ai_energy ARTICUNO2,  0, -8

-	ai_energy JOLTEON1,   4, +0

-	ai_energy ZAPDOS3,    0, -8

-	ai_energy KANGASKHAN, 4, -1

-	ai_energy EEVEE,      3, +0

-	ai_energy DRATINI,    3, +0

-	ai_energy DRAGONAIR,  4, +0

-	ai_energy DRAGONITE1, 3, +0

-	db $00

-

-.list_prize ; 154d3 (5:54d3)

-	db MOLTRES2

-	db ARTICUNO2

-	db ZAPDOS3

-	db DRAGONITE1

-	db GAMBLER

-	db $00

-

-.store_list_pointers ; 154d9 (5:54d9)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_play_hand

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x15507

-

-AIDoTurn_LegendaryRonald: ; 15507 (5:5507)

-; initialize variables

-	call InitAITurnVars

-; process Trainer cards

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_04

-	call AIProcessHandTrainerCards

-

-; check if AI can play Moltres2

-; from hand and if so, play it.

-	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA

-	call GetTurnDuelistVariable

-	cp MAX_PLAY_AREA_POKEMON

-	jr nc, .skip_moltres_1 ; skip if bench is full

-	ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK

-	call GetTurnDuelistVariable

-	cp DECK_SIZE - 9

-	jr nc, .skip_moltres_1 ; skip if cards in deck <= 9

-	ld a, MUK

-	call CountPokemonIDInBothPlayAreas

-	jr c, .skip_moltres_1 ; skip if Muk in play

-	ld a, MOLTRES2

-	call LookForCardIDInHandList_Bank5

-	jr nc, .skip_moltres_1 ; skip if no Moltres2 in hand

-	ldh [hTemp_ffa0], a

-	ld a, OPPACTION_PLAY_BASIC_PKMN

-	bank1call AIMakeDecision

-

-.skip_moltres_1

-; play Pokemon from hand

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-; process Trainer cards

-	ld a, AI_TRAINER_CARD_PHASE_05

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_07

-	call AIProcessHandTrainerCards

-	call AIProcessRetreat

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-; play Energy card if possible

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_attach_energy_1

-	call AIProcessAndTryToPlayEnergy

-.skip_attach_energy_1

-; try playing Pokemon cards from hand again

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-	ld a, AI_TRAINER_CARD_PHASE_15

-; if used Professor Oak, process new hand

-; if not, then proceed to attack.

-	call AIProcessHandTrainerCards

-	ld a, [wPreviousAIFlags]

-	and AI_FLAG_USED_PROFESSOR_OAK

-	jr z, .try_attack

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_02

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_04

-	call AIProcessHandTrainerCards

-

-; check if AI can play Moltres2

-; from hand and if so, play it.

-	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA

-	call GetTurnDuelistVariable

-	cp MAX_PLAY_AREA_POKEMON

-	jr nc, .skip_moltres_2 ; skip if bench is full

-	ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK

-	call GetTurnDuelistVariable

-	cp DECK_SIZE - 9

-	jr nc, .skip_moltres_2 ; skip if cards in deck <= 9

-	ld a, MUK

-	call CountPokemonIDInBothPlayAreas

-	jr c, .skip_moltres_2 ; skip if Muk in play

-	ld a, MOLTRES2

-	call LookForCardIDInHandList_Bank5

-	jr nc, .skip_moltres_2 ; skip if no Moltres2 in hand

-	ldh [hTemp_ffa0], a

-	ld a, OPPACTION_PLAY_BASIC_PKMN

-	bank1call AIMakeDecision

-

-.skip_moltres_2

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-	ld a, AI_TRAINER_CARD_PHASE_05

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_07

-	call AIProcessHandTrainerCards

-	call AIProcessRetreat

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_attach_energy_2

-	call AIProcessAndTryToPlayEnergy

-.skip_attach_energy_2

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-.try_attack

-; attack if possible, if not,

-; finish turn without attacking.

-	call AIProcessAndTryToUseAttack

-	ret c ; return if turn ended

-	ld a, OPPACTION_FINISH_NO_ATTACK

-	bank1call AIMakeDecision

-	ret

-; 0x155d2

+AIActionTable_LegendaryRonald: ; 1546f (5:546f)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 1547b (5:547b)
+	call AIDoTurn_LegendaryRonald
+	ret
+; 0x1547f
+
+.start_duel ; 1547f (5:547f)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x15490
+
+.forced_switch ; 15490 (5:5490)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x15494
+
+.ko_switch ; 15494 (5:5494)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x15498
+
+.take_prize ; 15498 (5:5498)
+	call AIPickPrizeCards
+	ret
+; 0x1549c
+
+.list_arena ; 1549c (5:549c)
+	db KANGASKHAN
+	db DRATINI
+	db EEVEE
+	db ZAPDOS3
+	db ARTICUNO2
+	db MOLTRES2
+	db $00
+
+.list_bench ; 154a3 (5:54a3)
+	db KANGASKHAN
+	db DRATINI
+	db EEVEE
+	db $00
+
+.list_play_hand ; 154a7 (5:54a7)
+	db MOLTRES2
+	db ZAPDOS3
+	db KANGASKHAN
+	db DRATINI
+	db EEVEE
+	db ARTICUNO2
+	db $00
+
+.list_retreat ; 154ae (5:54ae)
+	ai_retreat EEVEE, -2
+	db $00
+
+.list_energy ; 154b1 (5:54b1)
+	ai_energy FLAREON1,   3, +0
+	ai_energy MOLTRES2,   3, +0
+	ai_energy VAPOREON1,  3, +0
+	ai_energy ARTICUNO2,  0, -8
+	ai_energy JOLTEON1,   4, +0
+	ai_energy ZAPDOS3,    0, -8
+	ai_energy KANGASKHAN, 4, -1
+	ai_energy EEVEE,      3, +0
+	ai_energy DRATINI,    3, +0
+	ai_energy DRAGONAIR,  4, +0
+	ai_energy DRAGONITE1, 3, +0
+	db $00
+
+.list_prize ; 154d3 (5:54d3)
+	db MOLTRES2
+	db ARTICUNO2
+	db ZAPDOS3
+	db DRAGONITE1
+	db GAMBLER
+	db $00
+
+.store_list_pointers ; 154d9 (5:54d9)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_play_hand
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x15507
+
+AIDoTurn_LegendaryRonald: ; 15507 (5:5507)
+; initialize variables
+	call InitAITurnVars
+; process Trainer cards
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_04
+	call AIProcessHandTrainerCards
+
+; check if AI can play Moltres2
+; from hand and if so, play it.
+	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
+	call GetTurnDuelistVariable
+	cp MAX_PLAY_AREA_POKEMON
+	jr nc, .skip_moltres_1 ; skip if bench is full
+	ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK
+	call GetTurnDuelistVariable
+	cp DECK_SIZE - 9
+	jr nc, .skip_moltres_1 ; skip if cards in deck <= 9
+	ld a, MUK
+	call CountPokemonIDInBothPlayAreas
+	jr c, .skip_moltres_1 ; skip if Muk in play
+	ld a, MOLTRES2
+	call LookForCardIDInHandList_Bank5
+	jr nc, .skip_moltres_1 ; skip if no Moltres2 in hand
+	ldh [hTemp_ffa0], a
+	ld a, OPPACTION_PLAY_BASIC_PKMN
+	bank1call AIMakeDecision
+
+.skip_moltres_1
+; play Pokemon from hand
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+; process Trainer cards
+	ld a, AI_TRAINER_CARD_PHASE_05
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_07
+	call AIProcessHandTrainerCards
+	call AIProcessRetreat
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+; play Energy card if possible
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_attach_energy_1
+	call AIProcessAndTryToPlayEnergy
+.skip_attach_energy_1
+; try playing Pokemon cards from hand again
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+	ld a, AI_TRAINER_CARD_PHASE_15
+; if used Professor Oak, process new hand
+; if not, then proceed to attack.
+	call AIProcessHandTrainerCards
+	ld a, [wPreviousAIFlags]
+	and AI_FLAG_USED_PROFESSOR_OAK
+	jr z, .try_attack
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_02
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_04
+	call AIProcessHandTrainerCards
+
+; check if AI can play Moltres2
+; from hand and if so, play it.
+	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
+	call GetTurnDuelistVariable
+	cp MAX_PLAY_AREA_POKEMON
+	jr nc, .skip_moltres_2 ; skip if bench is full
+	ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK
+	call GetTurnDuelistVariable
+	cp DECK_SIZE - 9
+	jr nc, .skip_moltres_2 ; skip if cards in deck <= 9
+	ld a, MUK
+	call CountPokemonIDInBothPlayAreas
+	jr c, .skip_moltres_2 ; skip if Muk in play
+	ld a, MOLTRES2
+	call LookForCardIDInHandList_Bank5
+	jr nc, .skip_moltres_2 ; skip if no Moltres2 in hand
+	ldh [hTemp_ffa0], a
+	ld a, OPPACTION_PLAY_BASIC_PKMN
+	bank1call AIMakeDecision
+
+.skip_moltres_2
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+	ld a, AI_TRAINER_CARD_PHASE_05
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_07
+	call AIProcessHandTrainerCards
+	call AIProcessRetreat
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_attach_energy_2
+	call AIProcessAndTryToPlayEnergy
+.skip_attach_energy_2
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+.try_attack
+; attack if possible, if not,
+; finish turn without attacking.
+	call AIProcessAndTryToUseAttack
+	ret c ; return if turn ended
+	ld a, OPPACTION_FINISH_NO_ATTACK
+	bank1call AIMakeDecision
+	ret
+; 0x155d2
diff --git a/src/engine/deck_ai/decks/legendary_zapdos.asm b/src/engine/deck_ai/decks/legendary_zapdos.asm
index cfa60be..20b1f8f 100644
--- a/src/engine/deck_ai/decks/legendary_zapdos.asm
+++ b/src/engine/deck_ai/decks/legendary_zapdos.asm
@@ -1,160 +1,160 @@
-AIActionTable_LegendaryZapdos: ; 14b0f (05:4b0f)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 14b1b (5:4b1b)

-	call AIDoTurn_LegendaryZapdos

-	ret

-; 0x14b1f

-

-.start_duel ; 14b1f (5:4b1f)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x14b30

-

-.forced_switch ; 14b30 (5:4b30)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14b34

-

-.ko_switch ; 14b34 (5:4b34)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14b38

-

-.take_prize ; 14b38 (5:4b38)

-	call AIPickPrizeCards

-	ret

-; 0x14b3c

-

-.list_arena ; 14b3c (5:4b3c)

-	db ELECTABUZZ2

-	db VOLTORB

-	db EEVEE

-	db ZAPDOS1

-	db ZAPDOS2

-	db ZAPDOS3

-	db $00

-

-.list_bench ; 14b43 (5:4b43)

-	db ZAPDOS2

-	db ZAPDOS1

-	db EEVEE

-	db VOLTORB

-	db ELECTABUZZ2

-	db $00

-

-.list_retreat ; 14b49 (5:4b49)

-	ai_retreat EEVEE,       -5

-	ai_retreat VOLTORB,     -5

-	ai_retreat ELECTABUZZ2, -5

-	db $00

-

-.list_energy ; 14b50 (5:4b50)

-	ai_energy VOLTORB,     1, -1

-	ai_energy ELECTRODE1,  3, +0

-	ai_energy ELECTABUZZ2, 2, -1

-	ai_energy JOLTEON2,    3, +1

-	ai_energy ZAPDOS1,     4, +2

-	ai_energy ZAPDOS2,     4, +2

-	ai_energy ZAPDOS3,     3, +1

-	ai_energy EEVEE,       3, +0

-	db $00

-

-.list_prize ; 14b69 (5:4b69)

-	db GAMBLER

-	db ZAPDOS3

-	db $00

-

-.store_list_pointers ; 14b6c (5:4b6c)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x14b9a

-

-AIDoTurn_LegendaryZapdos: ; 14b9a (5:4b9a)

-; initialize variables

-	call InitAITurnVars

-	farcall HandleAIAntiMewtwoDeckStrategy

-	jp nc, .try_attack

-; process Trainer cards

-	ld a, AI_TRAINER_CARD_PHASE_01

-	call AIProcessHandTrainerCards

-	ld a, AI_TRAINER_CARD_PHASE_04

-	call AIProcessHandTrainerCards

-; play Pokemon from hand

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-	ld a, AI_TRAINER_CARD_PHASE_07

-	call AIProcessHandTrainerCards

-	call AIProcessRetreat

-	ld a, AI_TRAINER_CARD_PHASE_10

-	call AIProcessHandTrainerCards

-; play Energy card if possible.

-	ld a, [wAlreadyPlayedEnergy]

-	or a

-	jr nz, .skip_energy_attach

-

-; if Arena card is Voltorb and there's Electrode1 in hand,

-; or if it's Electabuzz, try attaching Energy card

-; to the Arena card if it doesn't have any energy attached.

-; Otherwise if Energy card is not needed,

-; go through normal AI energy attach routine.

-	ld a, DUELVARS_ARENA_CARD

-	call GetTurnDuelistVariable

-	call GetCardIDFromDeckIndex

-	ld a, VOLTORB

-	cp e

-	jr nz, .check_electabuzz

-	ld a, ELECTRODE1

-	call LookForCardIDInHandList_Bank5

-	jr nc, .attach_normally

-	jr .voltorb_or_electabuzz

-.check_electabuzz

-	ld a, ELECTABUZZ2

-	cp e

-	jr nz, .attach_normally

-

-.voltorb_or_electabuzz

-	call CreateEnergyCardListFromHand

-	jr c, .skip_energy_attach

-	ld e, PLAY_AREA_ARENA

-	call CountNumberOfEnergyCardsAttached

-	or a

-	jr nz, .attach_normally

-	xor a ; PLAY_AREA_ARENA

-	ldh [hTempPlayAreaLocation_ff9d], a

-	call AITryToPlayEnergyCard

-	jr c, .skip_energy_attach

-

-.attach_normally

-	call AIProcessAndTryToPlayEnergy

-

-.skip_energy_attach

-; play Pokemon from hand again

-	call AIDecidePlayPokemonCard

-	ret c ; return if turn ended

-	ld a, AI_TRAINER_CARD_PHASE_13

-	call AIProcessHandTrainerCards

-.try_attack

-; attack if possible, if not,

-; finish turn without attacking.

-	call AIProcessAndTryToUseAttack

-	ret c ; return if turn ended

-	ld a, OPPACTION_FINISH_NO_ATTACK

-	bank1call AIMakeDecision

-	ret

-; 0x14c0b

+AIActionTable_LegendaryZapdos: ; 14b0f (05:4b0f)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 14b1b (5:4b1b)
+	call AIDoTurn_LegendaryZapdos
+	ret
+; 0x14b1f
+
+.start_duel ; 14b1f (5:4b1f)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x14b30
+
+.forced_switch ; 14b30 (5:4b30)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14b34
+
+.ko_switch ; 14b34 (5:4b34)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14b38
+
+.take_prize ; 14b38 (5:4b38)
+	call AIPickPrizeCards
+	ret
+; 0x14b3c
+
+.list_arena ; 14b3c (5:4b3c)
+	db ELECTABUZZ2
+	db VOLTORB
+	db EEVEE
+	db ZAPDOS1
+	db ZAPDOS2
+	db ZAPDOS3
+	db $00
+
+.list_bench ; 14b43 (5:4b43)
+	db ZAPDOS2
+	db ZAPDOS1
+	db EEVEE
+	db VOLTORB
+	db ELECTABUZZ2
+	db $00
+
+.list_retreat ; 14b49 (5:4b49)
+	ai_retreat EEVEE,       -5
+	ai_retreat VOLTORB,     -5
+	ai_retreat ELECTABUZZ2, -5
+	db $00
+
+.list_energy ; 14b50 (5:4b50)
+	ai_energy VOLTORB,     1, -1
+	ai_energy ELECTRODE1,  3, +0
+	ai_energy ELECTABUZZ2, 2, -1
+	ai_energy JOLTEON2,    3, +1
+	ai_energy ZAPDOS1,     4, +2
+	ai_energy ZAPDOS2,     4, +2
+	ai_energy ZAPDOS3,     3, +1
+	ai_energy EEVEE,       3, +0
+	db $00
+
+.list_prize ; 14b69 (5:4b69)
+	db GAMBLER
+	db ZAPDOS3
+	db $00
+
+.store_list_pointers ; 14b6c (5:4b6c)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x14b9a
+
+AIDoTurn_LegendaryZapdos: ; 14b9a (5:4b9a)
+; initialize variables
+	call InitAITurnVars
+	farcall HandleAIAntiMewtwoDeckStrategy
+	jp nc, .try_attack
+; process Trainer cards
+	ld a, AI_TRAINER_CARD_PHASE_01
+	call AIProcessHandTrainerCards
+	ld a, AI_TRAINER_CARD_PHASE_04
+	call AIProcessHandTrainerCards
+; play Pokemon from hand
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+	ld a, AI_TRAINER_CARD_PHASE_07
+	call AIProcessHandTrainerCards
+	call AIProcessRetreat
+	ld a, AI_TRAINER_CARD_PHASE_10
+	call AIProcessHandTrainerCards
+; play Energy card if possible.
+	ld a, [wAlreadyPlayedEnergy]
+	or a
+	jr nz, .skip_energy_attach
+
+; if Arena card is Voltorb and there's Electrode1 in hand,
+; or if it's Electabuzz, try attaching Energy card
+; to the Arena card if it doesn't have any energy attached.
+; Otherwise if Energy card is not needed,
+; go through normal AI energy attach routine.
+	ld a, DUELVARS_ARENA_CARD
+	call GetTurnDuelistVariable
+	call GetCardIDFromDeckIndex
+	ld a, VOLTORB
+	cp e
+	jr nz, .check_electabuzz
+	ld a, ELECTRODE1
+	call LookForCardIDInHandList_Bank5
+	jr nc, .attach_normally
+	jr .voltorb_or_electabuzz
+.check_electabuzz
+	ld a, ELECTABUZZ2
+	cp e
+	jr nz, .attach_normally
+
+.voltorb_or_electabuzz
+	call CreateEnergyCardListFromHand
+	jr c, .skip_energy_attach
+	ld e, PLAY_AREA_ARENA
+	call CountNumberOfEnergyCardsAttached
+	or a
+	jr nz, .attach_normally
+	xor a ; PLAY_AREA_ARENA
+	ldh [hTempPlayAreaLocation_ff9d], a
+	call AITryToPlayEnergyCard
+	jr c, .skip_energy_attach
+
+.attach_normally
+	call AIProcessAndTryToPlayEnergy
+
+.skip_energy_attach
+; play Pokemon from hand again
+	call AIDecidePlayPokemonCard
+	ret c ; return if turn ended
+	ld a, AI_TRAINER_CARD_PHASE_13
+	call AIProcessHandTrainerCards
+.try_attack
+; attack if possible, if not,
+; finish turn without attacking.
+	call AIProcessAndTryToUseAttack
+	ret c ; return if turn ended
+	ld a, OPPACTION_FINISH_NO_ATTACK
+	bank1call AIMakeDecision
+	ret
+; 0x14c0b
diff --git a/src/engine/deck_ai/decks/powerful_ronald.asm b/src/engine/deck_ai/decks/powerful_ronald.asm
index d99f87f..760d66f 100644
--- a/src/engine/deck_ai/decks/powerful_ronald.asm
+++ b/src/engine/deck_ai/decks/powerful_ronald.asm
@@ -1,98 +1,98 @@
-AIActionTable_PowerfulRonald: ; 1534b (5:534b)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 15357 (5:5357)

-	call AIMainTurnLogic

-	ret

-; 0x1535b

-

-.start_duel ; 1535b (5:535b)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x1536c

-

-.forced_switch ; 1536c (5:536c)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x15370

-

-.ko_switch ; 15370 (5:5370)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x15374

-

-.take_prize ; 15374 (5:5374)

-	call AIPickPrizeCards

-	ret

-; 0x15378

-

-.list_arena ; 15378 (5:5378)

-	db KANGASKHAN

-	db ELECTABUZZ2

-	db HITMONCHAN

-	db MR_MIME

-	db LICKITUNG

-	db HITMONLEE

-	db TAUROS

-	db JYNX

-	db MEWTWO1

-	db DODUO

-	db $00

-

-.list_bench ; 15383 (5:5383)

-	db KANGASKHAN

-	db HITMONLEE

-	db HITMONCHAN

-	db TAUROS

-	db DODUO

-	db JYNX

-	db MEWTWO1

-	db ELECTABUZZ2

-	db MR_MIME

-	db LICKITUNG

-	db $00

-

-.list_retreat ; 1538e (5:538e)

-	ai_retreat KANGASKHAN, -1

-	ai_retreat DODUO,      -1

-	ai_retreat DODRIO,     -1

-	db $00

-

-.list_energy ; 15395 (5:5395)

-	ai_energy ELECTABUZZ2, 2, +1

-	ai_energy HITMONLEE,   3, +1

-	ai_energy HITMONCHAN,  3, +1

-	ai_energy MR_MIME,     2, +0

-	ai_energy JYNX,        3, +0

-	ai_energy MEWTWO1,     2, +0

-	ai_energy DODUO,       3, -1

-	ai_energy DODRIO,      3, -1

-	ai_energy LICKITUNG,   2, +0

-	ai_energy KANGASKHAN,  4, -1

-	ai_energy TAUROS,      3, +0

-	db $00

-

-.list_prize ; 153b7 (5:53b7)

-	db GAMBLER

-	db ENERGY_REMOVAL

-	db $00

-

-.store_list_pointers ; 153ba (5:53ba)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x153e8

+AIActionTable_PowerfulRonald: ; 1534b (5:534b)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 15357 (5:5357)
+	call AIMainTurnLogic
+	ret
+; 0x1535b
+
+.start_duel ; 1535b (5:535b)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x1536c
+
+.forced_switch ; 1536c (5:536c)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x15370
+
+.ko_switch ; 15370 (5:5370)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x15374
+
+.take_prize ; 15374 (5:5374)
+	call AIPickPrizeCards
+	ret
+; 0x15378
+
+.list_arena ; 15378 (5:5378)
+	db KANGASKHAN
+	db ELECTABUZZ2
+	db HITMONCHAN
+	db MR_MIME
+	db LICKITUNG
+	db HITMONLEE
+	db TAUROS
+	db JYNX
+	db MEWTWO1
+	db DODUO
+	db $00
+
+.list_bench ; 15383 (5:5383)
+	db KANGASKHAN
+	db HITMONLEE
+	db HITMONCHAN
+	db TAUROS
+	db DODUO
+	db JYNX
+	db MEWTWO1
+	db ELECTABUZZ2
+	db MR_MIME
+	db LICKITUNG
+	db $00
+
+.list_retreat ; 1538e (5:538e)
+	ai_retreat KANGASKHAN, -1
+	ai_retreat DODUO,      -1
+	ai_retreat DODRIO,     -1
+	db $00
+
+.list_energy ; 15395 (5:5395)
+	ai_energy ELECTABUZZ2, 2, +1
+	ai_energy HITMONLEE,   3, +1
+	ai_energy HITMONCHAN,  3, +1
+	ai_energy MR_MIME,     2, +0
+	ai_energy JYNX,        3, +0
+	ai_energy MEWTWO1,     2, +0
+	ai_energy DODUO,       3, -1
+	ai_energy DODRIO,      3, -1
+	ai_energy LICKITUNG,   2, +0
+	ai_energy KANGASKHAN,  4, -1
+	ai_energy TAUROS,      3, +0
+	db $00
+
+.list_prize ; 153b7 (5:53b7)
+	db GAMBLER
+	db ENERGY_REMOVAL
+	db $00
+
+.store_list_pointers ; 153ba (5:53ba)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x153e8
diff --git a/src/engine/deck_ai/decks/rock_crusher.asm b/src/engine/deck_ai/decks/rock_crusher.asm
index f4e79d8..9cd3cff 100644
--- a/src/engine/deck_ai/decks/rock_crusher.asm
+++ b/src/engine/deck_ai/decks/rock_crusher.asm
@@ -1,80 +1,80 @@
-AIActionTable_RockCrusher: ; 14f0e (5:4f0e)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 14f1a (5:4f1a)

-	call AIMainTurnLogic

-	ret

-; 0x14f1e

-

-.start_duel ; 14f1e (5:4f1e)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x14f2f

-

-.forced_switch ; 14f2f (5:4f2f)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14f33

-

-.ko_switch ; 14f33 (5:4f33)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x14f37

-

-.take_prize ; 14f37 (5:4f37)

-	call AIPickPrizeCards

-	ret

-; 0x14f3b

-

-.list_arena ; 14f3b (5:4f3b)

-	db RHYHORN

-	db ONIX

-	db GEODUDE

-	db DIGLETT

-	db $00

-

-.list_bench ; 14f40 (5:4f40)

-	db DIGLETT

-	db GEODUDE

-	db RHYHORN

-	db ONIX

-	db $00

-

-.list_retreat ; 14f45 (5:4f45)

-	ai_retreat DIGLETT, -1

-	db $00

-

-.list_energy ; 14f48 (5:4f48)

-	ai_energy DIGLETT,  3, +1

-	ai_energy DUGTRIO,  4, +0

-	ai_energy GEODUDE,  2, +1

-	ai_energy GRAVELER, 3, +0

-	ai_energy GOLEM,    4, +0

-	ai_energy ONIX,     2, -1

-	ai_energy RHYHORN,  3, +0

-	db $00

-

-.list_prize ; 14f5e (5:4f5e)

-	db ENERGY_REMOVAL

-	db RHYHORN

-	db $00

-

-.store_list_pointers ; 14f61 (5:4f61)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x14f8f

+AIActionTable_RockCrusher: ; 14f0e (5:4f0e)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 14f1a (5:4f1a)
+	call AIMainTurnLogic
+	ret
+; 0x14f1e
+
+.start_duel ; 14f1e (5:4f1e)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x14f2f
+
+.forced_switch ; 14f2f (5:4f2f)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14f33
+
+.ko_switch ; 14f33 (5:4f33)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x14f37
+
+.take_prize ; 14f37 (5:4f37)
+	call AIPickPrizeCards
+	ret
+; 0x14f3b
+
+.list_arena ; 14f3b (5:4f3b)
+	db RHYHORN
+	db ONIX
+	db GEODUDE
+	db DIGLETT
+	db $00
+
+.list_bench ; 14f40 (5:4f40)
+	db DIGLETT
+	db GEODUDE
+	db RHYHORN
+	db ONIX
+	db $00
+
+.list_retreat ; 14f45 (5:4f45)
+	ai_retreat DIGLETT, -1
+	db $00
+
+.list_energy ; 14f48 (5:4f48)
+	ai_energy DIGLETT,  3, +1
+	ai_energy DUGTRIO,  4, +0
+	ai_energy GEODUDE,  2, +1
+	ai_energy GRAVELER, 3, +0
+	ai_energy GOLEM,    4, +0
+	ai_energy ONIX,     2, -1
+	ai_energy RHYHORN,  3, +0
+	db $00
+
+.list_prize ; 14f5e (5:4f5e)
+	db ENERGY_REMOVAL
+	db RHYHORN
+	db $00
+
+.store_list_pointers ; 14f61 (5:4f61)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x14f8f
diff --git a/src/engine/deck_ai/decks/sams_practice.asm b/src/engine/deck_ai/decks/sams_practice.asm
index 2ce0060..c402e49 100644
--- a/src/engine/deck_ai/decks/sams_practice.asm
+++ b/src/engine/deck_ai/decks/sams_practice.asm
@@ -1,222 +1,222 @@
-; AI for Sam's practice duel, which handles his scripted actions.

-; will act as a normal duelist AI after turn 7.

-AIActionTable_SamPractice: ; 147bd (05:47bd)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 147c9 (5:47c9)

-	call IsAIPracticeScriptedTurn

-	jr nc, .scripted_1

-; not scripted, use AI main turn logic

-	call AIMainTurnLogic

-	ret

-.scripted_1 ; use scripted actions instead

-	call AIPerformSciptedTurn

-	ret

-; 0x147d6

-

-.start_duel ; 147d6 (5:47d6)

-	call SetSamsStartingPlayArea

-	ret

-; 0x147da

-

-.forced_switch ; 147da (5:47da)

-	call IsAIPracticeScriptedTurn

-	jr nc, .scripted_2

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-.scripted_2

-	call PickRandomBenchPokemon

-	ret

-; 0x147e7

-

-.ko_switch: ; 147e7 (5:47e7)

-	call IsAIPracticeScriptedTurn

-	jr nc, .scripted_3

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-.scripted_3

-	call GetPlayAreaLocationOfRaticateOrRattata

-	ret

-; 0x147f4

-

-.take_prize: ; 147f4 (5:47f4)

-	call AIPickPrizeCards

-	ret

-; 0x147f8

-

-; returns carry if number of turns

-; the AI has taken >= 7.

-; used to know whether AI Sam is still

-; doing scripted turns.

-IsAIPracticeScriptedTurn: ; 147f8 (5:47f8)

-	ld a, [wDuelTurns]

-	srl a

-	cp 7

-	ccf

-	ret

-; 0x14801

-

-; places one Machop from the hand to the Play Area

-; and sets the number of prizes to 2.

-SetSamsStartingPlayArea: ; 14801 (5:4801)

-	call CreateHandCardList

-	ld hl, wDuelTempList

-.loop_hand

-	ld a, [hli]

-	ldh [hTempCardIndex_ff98], a

-	cp $ff

-	ret z

-	call LoadCardDataToBuffer1_FromDeckIndex

-	cp MACHOP

-	jr nz, .loop_hand

-	ldh a, [hTempCardIndex_ff98]

-	call PutHandPokemonCardInPlayArea

-	ld a, 2

-	ld [wDuelInitialPrizes], a

-	ret

-; 0x1481f

-

-; outputs in a Play Area location of Raticate or Rattata

-; in the Bench. If neither is found, just output PLAY_AREA_BENCH_1.

-GetPlayAreaLocationOfRaticateOrRattata: ; 1481f (5:481f)

-	ld a, RATICATE

-	ld b, PLAY_AREA_BENCH_1

-	call LookForCardIDInPlayArea_Bank5

-	cp $ff

-	jr nz, .found

-	ld a, RATTATA

-	ld b, PLAY_AREA_BENCH_1

-	call LookForCardIDInPlayArea_Bank5

-	cp $ff

-	jr nz, .found

-	ld a, PLAY_AREA_BENCH_1

-.found

-	ldh [hTempPlayAreaLocation_ff9d], a

-	ret

-; 0x1483a

-

-; has AI execute some scripted actions depending on Duel turn.

-AIPerformSciptedTurn: ; 1483a (5:483a)

-	ld a, [wDuelTurns]

-	srl a

-	ld hl, .scripted_actions_list

-	call JumpToFunctionInTable

-

-; always attack with Arena card's first attack.

-; if it's unusable end turn without attacking.

-	xor a

-	ldh [hTempPlayAreaLocation_ff9d], a

-	ld [wSelectedAttack], a

-	call CheckIfSelectedMoveIsUnusable

-	jr c, .unusable

-	call AITryUseAttack

-	ret

-

-.unusable

-	ld a, OPPACTION_FINISH_NO_ATTACK

-	bank1call AIMakeDecision

-	ret

-; 0x1485a

-

-.scripted_actions_list ; 1485a (05:485a)

-	dw .turn_1

-	dw .turn_2

-	dw .turn_3

-	dw .turn_4

-	dw .turn_5

-	dw .turn_6

-	dw .turn_7

-; 0x14868

-

-.turn_1 ; 14868 (5:4868)

-	ld d, MACHOP

-	ld e, FIGHTING_ENERGY

-	call AIAttachEnergyInHandToCardInPlayArea

-	ret

-; 0x14870

-

-.turn_2 ; 14870 (5:4870)

-	ld a, RATTATA

-	call LookForCardIDInHandList_Bank5

-	ldh [hTemp_ffa0], a

-	ld a, OPPACTION_PLAY_BASIC_PKMN

-	bank1call AIMakeDecision

-	ld d, RATTATA

-	ld e, FIGHTING_ENERGY

-	call AIAttachEnergyInHandToCardInPlayArea

-	ret

-; 0x14884

-

-.turn_3 ; 14884 (5:4884)

-	ld a, RATTATA

-	ld b, PLAY_AREA_ARENA

-	call LookForCardIDInPlayArea_Bank5

-	ldh [hTempPlayAreaLocation_ffa1], a

-	ld a, RATICATE

-	call LookForCardIDInHandList_Bank5

-	ldh [hTemp_ffa0], a

-	ld a, OPPACTION_EVOLVE_PKMN

-	bank1call AIMakeDecision

-	ld d, RATICATE

-	ld e, LIGHTNING_ENERGY

-	call AIAttachEnergyInHandToCardInPlayArea

-	ret

-; 0x148a1

-

-.turn_4 ; 148a1 (5:48a1)

-	ld d, RATICATE

-	ld e, LIGHTNING_ENERGY

-	call AIAttachEnergyInHandToCardInPlayArea

-	ret

-; 0x148a9

-

-.turn_5 ; 148a9 (5:48a9)

-	ld a, MACHOP

-	call LookForCardIDInHandList_Bank5

-	ldh [hTemp_ffa0], a

-	ld a, OPPACTION_PLAY_BASIC_PKMN

-	bank1call AIMakeDecision

-	ld d, MACHOP

-	ld e, FIGHTING_ENERGY

-	call AIAttachEnergyInHandToCardInBench

-

-; this is a bug, it's attempting to compare a card ID with a deck index.

-; the intention was to change the card to switch to depending on whether

-; the first Machop was KO'd at this point in the Duel or not.

-; because of the buggy comparison, this will always jump the

-; 'inc a' instruction and switch to PLAY_AREA_BENCH_1.

-; in a normal Practice Duel following Dr. Mason's instructions,

-; this will always lead to the AI correctly switching Raticate with Machop,

-; but in case of a "Free" Duel where the first Machop is not KO'd,

-; the intention was to switch to PLAY_AREA_BENCH_2 instead.

-; but due to 'inc a' always being skipped, it will switch to Raticate.

-	ld a, DUELVARS_ARENA_CARD

-	call GetTurnDuelistVariable

-	cp MACHOP ; wrong

-	ld a, PLAY_AREA_BENCH_1

-	jr nz, .retreat

-	inc a ; PLAY_AREA_BENCH_2

-

-.retreat

-	call AITryToRetreat

-	ret

-; 0x148cc

-

-.turn_6 ; 148cc (5:48cc)

-	ld d, MACHOP

-	ld e, FIGHTING_ENERGY

-	call AIAttachEnergyInHandToCardInPlayArea

-	ret

-; 0x148d4

-

-.turn_7 ; 148d4 (5:48d4)

-	ld d, MACHOP

-	ld e, FIGHTING_ENERGY

-	call AIAttachEnergyInHandToCardInPlayArea

-	ret

-; 0x148dc

+; AI for Sam's practice duel, which handles his scripted actions.
+; will act as a normal duelist AI after turn 7.
+AIActionTable_SamPractice: ; 147bd (05:47bd)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 147c9 (5:47c9)
+	call IsAIPracticeScriptedTurn
+	jr nc, .scripted_1
+; not scripted, use AI main turn logic
+	call AIMainTurnLogic
+	ret
+.scripted_1 ; use scripted actions instead
+	call AIPerformSciptedTurn
+	ret
+; 0x147d6
+
+.start_duel ; 147d6 (5:47d6)
+	call SetSamsStartingPlayArea
+	ret
+; 0x147da
+
+.forced_switch ; 147da (5:47da)
+	call IsAIPracticeScriptedTurn
+	jr nc, .scripted_2
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+.scripted_2
+	call PickRandomBenchPokemon
+	ret
+; 0x147e7
+
+.ko_switch: ; 147e7 (5:47e7)
+	call IsAIPracticeScriptedTurn
+	jr nc, .scripted_3
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+.scripted_3
+	call GetPlayAreaLocationOfRaticateOrRattata
+	ret
+; 0x147f4
+
+.take_prize: ; 147f4 (5:47f4)
+	call AIPickPrizeCards
+	ret
+; 0x147f8
+
+; returns carry if number of turns
+; the AI has taken >= 7.
+; used to know whether AI Sam is still
+; doing scripted turns.
+IsAIPracticeScriptedTurn: ; 147f8 (5:47f8)
+	ld a, [wDuelTurns]
+	srl a
+	cp 7
+	ccf
+	ret
+; 0x14801
+
+; places one Machop from the hand to the Play Area
+; and sets the number of prizes to 2.
+SetSamsStartingPlayArea: ; 14801 (5:4801)
+	call CreateHandCardList
+	ld hl, wDuelTempList
+.loop_hand
+	ld a, [hli]
+	ldh [hTempCardIndex_ff98], a
+	cp $ff
+	ret z
+	call LoadCardDataToBuffer1_FromDeckIndex
+	cp MACHOP
+	jr nz, .loop_hand
+	ldh a, [hTempCardIndex_ff98]
+	call PutHandPokemonCardInPlayArea
+	ld a, 2
+	ld [wDuelInitialPrizes], a
+	ret
+; 0x1481f
+
+; outputs in a Play Area location of Raticate or Rattata
+; in the Bench. If neither is found, just output PLAY_AREA_BENCH_1.
+GetPlayAreaLocationOfRaticateOrRattata: ; 1481f (5:481f)
+	ld a, RATICATE
+	ld b, PLAY_AREA_BENCH_1
+	call LookForCardIDInPlayArea_Bank5
+	cp $ff
+	jr nz, .found
+	ld a, RATTATA
+	ld b, PLAY_AREA_BENCH_1
+	call LookForCardIDInPlayArea_Bank5
+	cp $ff
+	jr nz, .found
+	ld a, PLAY_AREA_BENCH_1
+.found
+	ldh [hTempPlayAreaLocation_ff9d], a
+	ret
+; 0x1483a
+
+; has AI execute some scripted actions depending on Duel turn.
+AIPerformSciptedTurn: ; 1483a (5:483a)
+	ld a, [wDuelTurns]
+	srl a
+	ld hl, .scripted_actions_list
+	call JumpToFunctionInTable
+
+; always attack with Arena card's first attack.
+; if it's unusable end turn without attacking.
+	xor a
+	ldh [hTempPlayAreaLocation_ff9d], a
+	ld [wSelectedAttack], a
+	call CheckIfSelectedMoveIsUnusable
+	jr c, .unusable
+	call AITryUseAttack
+	ret
+
+.unusable
+	ld a, OPPACTION_FINISH_NO_ATTACK
+	bank1call AIMakeDecision
+	ret
+; 0x1485a
+
+.scripted_actions_list ; 1485a (05:485a)
+	dw .turn_1
+	dw .turn_2
+	dw .turn_3
+	dw .turn_4
+	dw .turn_5
+	dw .turn_6
+	dw .turn_7
+; 0x14868
+
+.turn_1 ; 14868 (5:4868)
+	ld d, MACHOP
+	ld e, FIGHTING_ENERGY
+	call AIAttachEnergyInHandToCardInPlayArea
+	ret
+; 0x14870
+
+.turn_2 ; 14870 (5:4870)
+	ld a, RATTATA
+	call LookForCardIDInHandList_Bank5
+	ldh [hTemp_ffa0], a
+	ld a, OPPACTION_PLAY_BASIC_PKMN
+	bank1call AIMakeDecision
+	ld d, RATTATA
+	ld e, FIGHTING_ENERGY
+	call AIAttachEnergyInHandToCardInPlayArea
+	ret
+; 0x14884
+
+.turn_3 ; 14884 (5:4884)
+	ld a, RATTATA
+	ld b, PLAY_AREA_ARENA
+	call LookForCardIDInPlayArea_Bank5
+	ldh [hTempPlayAreaLocation_ffa1], a
+	ld a, RATICATE
+	call LookForCardIDInHandList_Bank5
+	ldh [hTemp_ffa0], a
+	ld a, OPPACTION_EVOLVE_PKMN
+	bank1call AIMakeDecision
+	ld d, RATICATE
+	ld e, LIGHTNING_ENERGY
+	call AIAttachEnergyInHandToCardInPlayArea
+	ret
+; 0x148a1
+
+.turn_4 ; 148a1 (5:48a1)
+	ld d, RATICATE
+	ld e, LIGHTNING_ENERGY
+	call AIAttachEnergyInHandToCardInPlayArea
+	ret
+; 0x148a9
+
+.turn_5 ; 148a9 (5:48a9)
+	ld a, MACHOP
+	call LookForCardIDInHandList_Bank5
+	ldh [hTemp_ffa0], a
+	ld a, OPPACTION_PLAY_BASIC_PKMN
+	bank1call AIMakeDecision
+	ld d, MACHOP
+	ld e, FIGHTING_ENERGY
+	call AIAttachEnergyInHandToCardInBench
+
+; this is a bug, it's attempting to compare a card ID with a deck index.
+; the intention was to change the card to switch to depending on whether
+; the first Machop was KO'd at this point in the Duel or not.
+; because of the buggy comparison, this will always jump the
+; 'inc a' instruction and switch to PLAY_AREA_BENCH_1.
+; in a normal Practice Duel following Dr. Mason's instructions,
+; this will always lead to the AI correctly switching Raticate with Machop,
+; but in case of a "Free" Duel where the first Machop is not KO'd,
+; the intention was to switch to PLAY_AREA_BENCH_2 instead.
+; but due to 'inc a' always being skipped, it will switch to Raticate.
+	ld a, DUELVARS_ARENA_CARD
+	call GetTurnDuelistVariable
+	cp MACHOP ; wrong
+	ld a, PLAY_AREA_BENCH_1
+	jr nz, .retreat
+	inc a ; PLAY_AREA_BENCH_2
+
+.retreat
+	call AITryToRetreat
+	ret
+; 0x148cc
+
+.turn_6 ; 148cc (5:48cc)
+	ld d, MACHOP
+	ld e, FIGHTING_ENERGY
+	call AIAttachEnergyInHandToCardInPlayArea
+	ret
+; 0x148d4
+
+.turn_7 ; 148d4 (5:48d4)
+	ld d, MACHOP
+	ld e, FIGHTING_ENERGY
+	call AIAttachEnergyInHandToCardInPlayArea
+	ret
+; 0x148dc
diff --git a/src/engine/deck_ai/decks/strange_psyshock.asm b/src/engine/deck_ai/decks/strange_psyshock.asm
index 309ef11..2421a8b 100644
--- a/src/engine/deck_ai/decks/strange_psyshock.asm
+++ b/src/engine/deck_ai/decks/strange_psyshock.asm
@@ -1,87 +1,87 @@
-AIActionTable_StrangePsyshock: ; 15122 (5:5122)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 1512e (5:512e)

-	call AIMainTurnLogic

-	ret

-; 0x15132

-

-.start_duel ; 15132 (5:5132)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x15143

-

-.forced_switch ; 15143 (5:5143)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x15147

-

-.ko_switch ; 15147 (5:5147)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x1514b

-

-.take_prize ; 1514b (5:514b)

-	call AIPickPrizeCards

-	ret

-; 0x1514f

-

-.list_arena ; 1514f (5:514f)

-	db KANGASKHAN

-	db CHANSEY

-	db SNORLAX

-	db MR_MIME

-	db ABRA

-	db $00

-

-.list_bench ; 15155 (5:5155)

-	db ABRA

-	db MR_MIME

-	db KANGASKHAN

-	db SNORLAX

-	db CHANSEY

-	db $00

-

-.list_retreat ; 1515b (5:515b)

-	ai_retreat ABRA,       -3

-	ai_retreat SNORLAX,    -3

-	ai_retreat KANGASKHAN, -1

-	ai_retreat CHANSEY,    -1

-	db $00

-

-.list_energy ; 15164 (5:5164)

-	ai_energy ABRA,       3, +1

-	ai_energy KADABRA,    3, +0

-	ai_energy ALAKAZAM,   3, +0

-	ai_energy MR_MIME,    2, +0

-	ai_energy CHANSEY,    2, -2

-	ai_energy KANGASKHAN, 4, -2

-	ai_energy SNORLAX,    0, -8

-	db $00

-

-.list_prize ; 1517a (5:517a)

-	db GAMBLER

-	db MR_MIME

-	db ALAKAZAM

-	db SWITCH

-	db $00

-

-.store_list_pointers ; 1517f (5:517f)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x151ad

+AIActionTable_StrangePsyshock: ; 15122 (5:5122)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 1512e (5:512e)
+	call AIMainTurnLogic
+	ret
+; 0x15132
+
+.start_duel ; 15132 (5:5132)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x15143
+
+.forced_switch ; 15143 (5:5143)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x15147
+
+.ko_switch ; 15147 (5:5147)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x1514b
+
+.take_prize ; 1514b (5:514b)
+	call AIPickPrizeCards
+	ret
+; 0x1514f
+
+.list_arena ; 1514f (5:514f)
+	db KANGASKHAN
+	db CHANSEY
+	db SNORLAX
+	db MR_MIME
+	db ABRA
+	db $00
+
+.list_bench ; 15155 (5:5155)
+	db ABRA
+	db MR_MIME
+	db KANGASKHAN
+	db SNORLAX
+	db CHANSEY
+	db $00
+
+.list_retreat ; 1515b (5:515b)
+	ai_retreat ABRA,       -3
+	ai_retreat SNORLAX,    -3
+	ai_retreat KANGASKHAN, -1
+	ai_retreat CHANSEY,    -1
+	db $00
+
+.list_energy ; 15164 (5:5164)
+	ai_energy ABRA,       3, +1
+	ai_energy KADABRA,    3, +0
+	ai_energy ALAKAZAM,   3, +0
+	ai_energy MR_MIME,    2, +0
+	ai_energy CHANSEY,    2, -2
+	ai_energy KANGASKHAN, 4, -2
+	ai_energy SNORLAX,    0, -8
+	db $00
+
+.list_prize ; 1517a (5:517a)
+	db GAMBLER
+	db MR_MIME
+	db ALAKAZAM
+	db SWITCH
+	db $00
+
+.store_list_pointers ; 1517f (5:517f)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x151ad
diff --git a/src/engine/deck_ai/decks/wonders_of_science.asm b/src/engine/deck_ai/decks/wonders_of_science.asm
index e11a829..19c0051 100644
--- a/src/engine/deck_ai/decks/wonders_of_science.asm
+++ b/src/engine/deck_ai/decks/wonders_of_science.asm
@@ -1,83 +1,83 @@
-AIActionTable_WondersOfScience: ; 151ad (5:51ad)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 151b9 (5:51b9)

-	call AIMainTurnLogic

-	ret

-; 0x151bd

-

-.start_duel ; 151bd (5:51bd)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x151ce

-

-.forced_switch ; 151ce (5:51ce)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x151d2

-

-.ko_switch ; 151d2 (5:51d2)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x151d6

-

-.take_prize ; 151d6 (5:51d6)

-	call AIPickPrizeCards

-	ret

-; 0x151da

-

-.list_arena ; 151da (5:51da)

-	db MEWTWO1

-	db MEWTWO3

-	db MEWTWO2

-	db GRIMER

-	db KOFFING

-	db PORYGON

-	db $00

-

-.list_bench ; 151e1 (5:51e1)

-	db GRIMER

-	db KOFFING

-	db MEWTWO3

-	db MEWTWO2

-	db MEWTWO1

-	db PORYGON

-	db $00

-

-.list_retreat ; 151e8 (5:51e8)

-	db $00

-

-.list_energy ; 151e9 (5:51e9)

-	ai_energy GRIMER,  3, +0

-	ai_energy MUK,     4, +0

-	ai_energy KOFFING, 2, +0

-	ai_energy WEEZING, 3, +0

-	ai_energy MEWTWO1, 2, -1

-	ai_energy MEWTWO3, 2, -1

-	ai_energy MEWTWO2, 2, -1

-	ai_energy PORYGON, 2, -1

-	db $00

-

-.list_prize ; 15202 (5:5202)

-	db MUK

-	db $00

-

-.store_list_pointers ; 15204 (5:5204)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x15232

+AIActionTable_WondersOfScience: ; 151ad (5:51ad)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 151b9 (5:51b9)
+	call AIMainTurnLogic
+	ret
+; 0x151bd
+
+.start_duel ; 151bd (5:51bd)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x151ce
+
+.forced_switch ; 151ce (5:51ce)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x151d2
+
+.ko_switch ; 151d2 (5:51d2)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x151d6
+
+.take_prize ; 151d6 (5:51d6)
+	call AIPickPrizeCards
+	ret
+; 0x151da
+
+.list_arena ; 151da (5:51da)
+	db MEWTWO1
+	db MEWTWO3
+	db MEWTWO2
+	db GRIMER
+	db KOFFING
+	db PORYGON
+	db $00
+
+.list_bench ; 151e1 (5:51e1)
+	db GRIMER
+	db KOFFING
+	db MEWTWO3
+	db MEWTWO2
+	db MEWTWO1
+	db PORYGON
+	db $00
+
+.list_retreat ; 151e8 (5:51e8)
+	db $00
+
+.list_energy ; 151e9 (5:51e9)
+	ai_energy GRIMER,  3, +0
+	ai_energy MUK,     4, +0
+	ai_energy KOFFING, 2, +0
+	ai_energy WEEZING, 3, +0
+	ai_energy MEWTWO1, 2, -1
+	ai_energy MEWTWO3, 2, -1
+	ai_energy MEWTWO2, 2, -1
+	ai_energy PORYGON, 2, -1
+	db $00
+
+.list_prize ; 15202 (5:5202)
+	db MUK
+	db $00
+
+.store_list_pointers ; 15204 (5:5204)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x15232
diff --git a/src/engine/deck_ai/decks/zapping_selfdestruct.asm b/src/engine/deck_ai/decks/zapping_selfdestruct.asm
index 6675c52..a0a0669 100644
--- a/src/engine/deck_ai/decks/zapping_selfdestruct.asm
+++ b/src/engine/deck_ai/decks/zapping_selfdestruct.asm
@@ -1,81 +1,81 @@
-AIActionTable_ZappingSelfdestruct: ; 15019 (5:5019)

-	dw .do_turn ; unused

-	dw .do_turn

-	dw .start_duel

-	dw .forced_switch

-	dw .ko_switch

-	dw .take_prize

-

-.do_turn ; 15025 (5:5025)

-	call AIMainTurnLogic

-	ret

-; 0x15029

-

-.start_duel ; 15029 (5:5029)

-	call InitAIDuelVars

-	call .store_list_pointers

-	call SetUpBossStartingHandAndDeck

-	call TrySetUpBossStartingPlayArea

-	ret nc

-	call AIPlayInitialBasicCards

-	ret

-; 0x1503a

-

-.forced_switch ; 1503a (5:503a)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x1503e

-

-.ko_switch ; 1503e (5:503e)

-	call AIDecideBenchPokemonToSwitchTo

-	ret

-; 0x15042

-

-.take_prize ; 15042 (5:5042)

-	call AIPickPrizeCards

-	ret

-; 0x15046

-

-.list_arena ; 15046 (5:5046)

-	db KANGASKHAN

-	db ELECTABUZZ2

-	db TAUROS

-	db MAGNEMITE1

-	db VOLTORB

-	db $00

-

-.list_bench ; 1504c (5:504c)

-	db MAGNEMITE1

-	db VOLTORB

-	db ELECTABUZZ2

-	db TAUROS

-	db KANGASKHAN

-	db $00

-

-.list_retreat ; 15052 (5:5052)

-	ai_retreat VOLTORB, -1

-	db $00

-

-.list_energy ; 15055 (5:5055)

-	ai_energy MAGNEMITE1,  3, +1

-	ai_energy MAGNETON1,   4, +0

-	ai_energy VOLTORB,     3, +1

-	ai_energy ELECTRODE1,  3, +0

-	ai_energy ELECTABUZZ2, 1, +0

-	ai_energy KANGASKHAN,  2, -2

-	ai_energy TAUROS,      3, +0

-	db $00

-

-.list_prize ; 1506b (5:506b)

-	db KANGASKHAN

-	db $00

-

-.store_list_pointers ; 1506d (5:506d)

-	store_list_pointer wAICardListAvoidPrize, .list_prize

-	store_list_pointer wAICardListArenaPriority, .list_arena

-	store_list_pointer wAICardListBenchPriority, .list_bench

-	store_list_pointer wAICardListPlayFromHandPriority, .list_bench

-	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat

-	store_list_pointer wAICardListEnergyBonus, .list_energy

-	ret

-; 0x1509b

+AIActionTable_ZappingSelfdestruct: ; 15019 (5:5019)
+	dw .do_turn ; unused
+	dw .do_turn
+	dw .start_duel
+	dw .forced_switch
+	dw .ko_switch
+	dw .take_prize
+
+.do_turn ; 15025 (5:5025)
+	call AIMainTurnLogic
+	ret
+; 0x15029
+
+.start_duel ; 15029 (5:5029)
+	call InitAIDuelVars
+	call .store_list_pointers
+	call SetUpBossStartingHandAndDeck
+	call TrySetUpBossStartingPlayArea
+	ret nc
+	call AIPlayInitialBasicCards
+	ret
+; 0x1503a
+
+.forced_switch ; 1503a (5:503a)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x1503e
+
+.ko_switch ; 1503e (5:503e)
+	call AIDecideBenchPokemonToSwitchTo
+	ret
+; 0x15042
+
+.take_prize ; 15042 (5:5042)
+	call AIPickPrizeCards
+	ret
+; 0x15046
+
+.list_arena ; 15046 (5:5046)
+	db KANGASKHAN
+	db ELECTABUZZ2
+	db TAUROS
+	db MAGNEMITE1
+	db VOLTORB
+	db $00
+
+.list_bench ; 1504c (5:504c)
+	db MAGNEMITE1
+	db VOLTORB
+	db ELECTABUZZ2
+	db TAUROS
+	db KANGASKHAN
+	db $00
+
+.list_retreat ; 15052 (5:5052)
+	ai_retreat VOLTORB, -1
+	db $00
+
+.list_energy ; 15055 (5:5055)
+	ai_energy MAGNEMITE1,  3, +1
+	ai_energy MAGNETON1,   4, +0
+	ai_energy VOLTORB,     3, +1
+	ai_energy ELECTRODE1,  3, +0
+	ai_energy ELECTABUZZ2, 1, +0
+	ai_energy KANGASKHAN,  2, -2
+	ai_energy TAUROS,      3, +0
+	db $00
+
+.list_prize ; 1506b (5:506b)
+	db KANGASKHAN
+	db $00
+
+.store_list_pointers ; 1506d (5:506d)
+	store_list_pointer wAICardListAvoidPrize, .list_prize
+	store_list_pointer wAICardListArenaPriority, .list_arena
+	store_list_pointer wAICardListBenchPriority, .list_bench
+	store_list_pointer wAICardListPlayFromHandPriority, .list_bench
+	; missing store_list_pointer wAICardListRetreatBonus, .list_retreat
+	store_list_pointer wAICardListEnergyBonus, .list_energy
+	ret
+; 0x1509b
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index 75b0f76..ffc6c4d 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -166,12 +166,12 @@ Func_2c0c7: ; 2c0c7 (b:40c7)
 
 ; Sets some flags for AI use
 ; if target poisoned
-; 	[wAIMinDamage] <- [wDamage]
-; 	[wAIMaxDamage] <- [wDamage]
+;	[wAIMinDamage] <- [wDamage]
+;	[wAIMaxDamage] <- [wDamage]
 ; else
-; 	[wAIMinDamage] <- [wDamage] + d
-; 	[wAIMaxDamage] <- [wDamage] + e
-; 	[wDamage]      <- [wDamage] + a
+;	[wAIMinDamage] <- [wDamage] + d
+;	[wAIMaxDamage] <- [wDamage] + e
+;	[wDamage]      <- [wDamage] + a
 Func_2c0d4: ; 2c0d4 (b:40d4)
 	push af
 	ld a, DUELVARS_ARENA_CARD_STATUS
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 78e0bf1..78817f3 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -414,10 +414,10 @@ SetupPalettes: ; 036a (0:036a)
 	ret
 
 InitialPalette: ; 0399 (0:0399)
-	rgb 28,28,24
-	rgb 21,21,16
-	rgb 10,10,08
-	rgb 00,00,00
+	rgb 28, 28, 24
+	rgb 21, 21, 16
+	rgb 10, 10, 08
+	rgb 00, 00, 00
 
 ; clear VRAM tile data ([wTileMapFill] should be an empty tile)
 SetupVRAM: ; 03a1 (0:03a1)
diff --git a/src/macros/data.asm b/src/macros/data.asm
index 36eed8d..d08ec4e 100644
--- a/src/macros/data.asm
+++ b/src/macros/data.asm
@@ -99,4 +99,4 @@ cursor_transition: MACRO
 		db \4
 		shift
 	endr
-ENDM
\ No newline at end of file
+ENDM
diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm
index bd1a58f..1a64c38 100644
--- a/src/macros/scripts.asm
+++ b/src/macros/scripts.asm
@@ -118,4 +118,3 @@ ENDM
 	const ScriptCommand_EndScriptLoop8_index         ; $65
 	const ScriptCommand_EndScriptLoop9_index         ; $66
 	const ScriptCommand_EndScriptLoop10_index        ; $67
-
diff --git a/src/macros/text.asm b/src/macros/text.asm
index 8ad94e8..2b29afe 100644
--- a/src/macros/text.asm
+++ b/src/macros/text.asm
@@ -85,4 +85,4 @@ ENDM
 
 ldfw3: MACRO
 	ld \1, (TX_FULLWIDTH3 << 8) | STRCAT("FW3_", \2)
-ENDM
\ No newline at end of file
+ENDM
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index d027768..258b212 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -1,6 +1,6 @@
 	const_def 1
 
-TextOffsets::                                                      ; 34000 (d:4000)
+TextOffsets:: ; 34000 (d:4000)
 	dwb $0000, $00                                                 ; 0x0000
 	textpointer HandText                                           ; 0x0001
 	textpointer CheckText                                          ; 0x0002
diff --git a/src/wram.asm b/src/wram.asm
index acd9638..894c15c 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -937,7 +937,7 @@ wAIMaxDamage:: ; ccbc
 wDealtDamage:: ; ccbf
 	ds $2
 
-; WEAKNESS and RESISTANCE flags	for a damaging attack
+; WEAKNESS and RESISTANCE flags for a damaging attack
 wDamageEffectiveness:: ; ccc1
 	ds $1
 
@@ -1194,9 +1194,9 @@ wAIPokedexCounter:: ; cda6
 
 ; variable to keep track of Mewtwo1's Barrier usage during Player' turn.
 ; AI_FLAG_MEWTWO_MILL set means Player is running Mewtwo1 mill deck.
-; 	- when flag is not set, this counts how many turns in a row
+;	- when flag is not set, this counts how many turns in a row
 ;	  Player used Mewtwo1's Barrier attack;
-; 	- when flag is set, this counts how many turns in a row
+;	- when flag is set, this counts how many turns in a row
 ;	  Player has NOT used Barrier attack.
 wAIBarrierFlagCounter:: ; cda7
 	ds $1
@@ -1369,7 +1369,7 @@ wcdea:: ; cdea
 ;	$01 = can't damage
 wAICannotDamage:: ; cdf0
 	ds $1
-	
+
 ; used by AI to store variable information
 wTempAI:: ; cdf1
 	ds $1
@@ -1413,8 +1413,8 @@ wAIMoveIsNonDamaging:: ; ce02
 	ds $1
 
 ; whether AI already retreated this turn or not.
-; 	- $0 has not retreated;
-; 	- $1 has retreated.
+;	- $0 has not retreated;
+;	- $1 has retreated.
 wAIRetreatedThisTurn:: ; ce03
 	ds $1
 
diff --git a/tcg.link b/tcg.link
index a182d38..49511eb 100644
--- a/tcg.link
+++ b/tcg.link
@@ -1,180 +1,180 @@
-ROM0

-	org $0000

-	"rst00"

-	org $0008

-	"rst08"

-	org $0010

-	"rst10"

-	org $0018

-	"rst18"

-	org $0020

-	"rst20"

-	org $0028

-	"rst28"

-	org $0030

-	"rst30"

-	org $0038

-	"rst38"

-	org $0040

-	"vblank"

-	org $0048

-	"lcdc"

-	org $0050

-	"timer"

-	org $0058

-	"serial"

-	org $0060

-	"joypad"

-	org $0100

-	"romheader"

-	org $0150

-	"start"

-ROMX $01

-	"Bank 1"

-ROMX $02

-	"Bank 2"

-ROMX $03

-	"Bank 3"

-ROMX $04

-	"Bank 4"

-ROMX $06

-	"Bank 6"

-ROMX $07

-	"Bank 7"

-	"Booster Packs"

-ROMX $08

-	"Bank 8"

-ROMX $09

-	"Empty Bank 9"

-ROMX $0a

-	"Empty Bank A"

-ROMX $0b

-	"Effect Functions"

-ROMX $0c

-	"Decks"

-	"Cards"

+ROM0
+	org $0000
+	"rst00"
+	org $0008
+	"rst08"
+	org $0010
+	"rst10"
+	org $0018
+	"rst18"
+	org $0020
+	"rst20"
+	org $0028
+	"rst28"
+	org $0030
+	"rst30"
+	org $0038
+	"rst38"
+	org $0040
+	"vblank"
+	org $0048
+	"lcdc"
+	org $0050
+	"timer"
+	org $0058
+	"serial"
+	org $0060
+	"joypad"
+	org $0100
+	"romheader"
+	org $0150
+	"start"
+ROMX $01
+	"Bank 1"
+ROMX $02
+	"Bank 2"
+ROMX $03
+	"Bank 3"
+ROMX $04
+	"Bank 4"
+ROMX $06
+	"Bank 6"
+ROMX $07
+	"Bank 7"
+	"Booster Packs"
+ROMX $08
+	"Bank 8"
+ROMX $09
+	"Empty Bank 9"
+ROMX $0a
+	"Empty Bank A"
+ROMX $0b
+	"Effect Functions"
+ROMX $0c
+	"Decks"
+	"Cards"
 ROMX $0d
-	"Text 1"

+	"Text 1"
 ROMX $0e
-	"Text 2"

+	"Text 2"
 ROMX $0f
-	"Text 3"

+	"Text 3"
 ROMX $10
-	"Text 4"

+	"Text 4"
 ROMX $11
-	"Text 5"

+	"Text 5"
 ROMX $12
-	"Text 6"

+	"Text 6"
 ROMX $13
-	"Text 7"

+	"Text 7"
 ROMX $14
-	"Text 8"

+	"Text 8"
 ROMX $15
-	"Text 9"

+	"Text 9"
 ROMX $16
-	"Text 10"

+	"Text 10"
 ROMX $17
-	"Text 11"

+	"Text 11"
 ROMX $18
-	"Text 12"

+	"Text 12"
 ROMX $19
-	"Text 13"

+	"Text 13"
 ROMX $1a
-	"Empty Bank 1A"

+	"Empty Bank 1A"
 ROMX $1b
-	"Empty Bank 1B"

+	"Empty Bank 1B"
 ROMX $1c
-	"Bank 1C"

+	"Bank 1C"
 ROMX $1d
-	"Gfx 1"

+	"Gfx 1"
 ROMX $1e
-	"Gfx 2"

+	"Gfx 2"
 ROMX $1f
-	"Empty Bank 1F"

+	"Empty Bank 1F"
 ROMX $20
-	"Bank 20"

+	"Bank 20"
 ROMX $21
-	"Gfx 3"

+	"Gfx 3"
 ROMX $22
-	"Gfx 4"

+	"Gfx 4"
 ROMX $23
-	"Gfx 5"

+	"Gfx 5"
 ROMX $24
-	"Gfx 6"

+	"Gfx 6"
 ROMX $25
-	"Gfx 7"

+	"Gfx 7"
 ROMX $26
-	"Gfx 8"

+	"Gfx 8"
 ROMX $27
-	"Gfx 9"

+	"Gfx 9"
 ROMX $28
-	"Gfx 10"

+	"Gfx 10"
 ROMX $29
-	"Gfx 11"

+	"Gfx 11"
 ROMX $2a
-	"Gfx 12"

+	"Gfx 12"
 ROMX $2b
-	"Gfx 13"

+	"Gfx 13"
 ROMX $2c
-	"Gfx 14"

+	"Gfx 14"
 ROMX $2d
-	"Gfx 15"

+	"Gfx 15"
 ROMX $2e
-	"Gfx 16"

+	"Gfx 16"
 ROMX $2f
-	"Empty Bank 2F"

+	"Empty Bank 2F"
 ROMX $30
-	"Empty Bank 30"

+	"Empty Bank 30"
 ROMX $31
-	"Card Gfx 1"

+	"Card Gfx 1"
 ROMX $32
-	"Card Gfx 2"

+	"Card Gfx 2"
 ROMX $33
-	"Card Gfx 3"

+	"Card Gfx 3"
 ROMX $34
-	"Card Gfx 4"

+	"Card Gfx 4"
 ROMX $35
-	"Card Gfx 5"

+	"Card Gfx 5"
 ROMX $36
-	"Card Gfx 6"

+	"Card Gfx 6"
 ROMX $37
-	"Card Gfx 7"

+	"Card Gfx 7"
 ROMX $38
-	"Card Gfx 8"

+	"Card Gfx 8"
 ROMX $39
-	"Card Gfx 9"

+	"Card Gfx 9"
 ROMX $3a
-	"Card Gfx 10"

+	"Card Gfx 10"
 ROMX $3b
-	"Card Gfx 11"

+	"Card Gfx 11"
 ROMX $3c
-	"Empty Bank 3C"

-ROMX $3d

-	"Audio 1"

-ROMX $3e

-	"Audio 2"

-ROMX $3f

-	"Audio 3"

-WRAM0

-	"WRAM0"

-	"WRAM0 Duels 1"

-	"WRAM0 Text Engine"

-	"WRAM0 1"

-	"WRAM0 Serial Transfer"

-	"WRAM0 Duels 2"

-	"WRAM0 2"

-WRAMX 1

-	"WRAM1"

-	"WRAM1 Audio"

-VRAM $00

-	"VRAM0"

-VRAM $01

-	"VRAM1"

-SRAM $00

-	"SRAM0"

-SRAM $01

-	"SRAM1"

-SRAM $02

-	"SRAM2"

-SRAM $03

-	"SRAM3"

+	"Empty Bank 3C"
+ROMX $3d
+	"Audio 1"
+ROMX $3e
+	"Audio 2"
+ROMX $3f
+	"Audio 3"
+WRAM0
+	"WRAM0"
+	"WRAM0 Duels 1"
+	"WRAM0 Text Engine"
+	"WRAM0 1"
+	"WRAM0 Serial Transfer"
+	"WRAM0 Duels 2"
+	"WRAM0 2"
+WRAMX 1
+	"WRAM1"
+	"WRAM1 Audio"
+VRAM $00
+	"VRAM0"
+VRAM $01
+	"VRAM1"
+SRAM $00
+	"SRAM0"
+SRAM $01
+	"SRAM1"
+SRAM $02
+	"SRAM2"
+SRAM $03
+	"SRAM3"
diff --git a/tools/script_extractor.py b/tools/script_extractor.py
index f043010..dff9f40 100644
--- a/tools/script_extractor.py
+++ b/tools/script_extractor.py
@@ -148,7 +148,7 @@ def printScript(game_data, loc, auto, ignore_broken, scriptList, \
 		#print("Error: first byte was not start_script")
 		print(".ows_" + format(loc,"04x"))
 	else:
- 		
+		
 		# TODO this is hacky please don't do this 
 		printHeader(loc, "Script_")
 		loc += 1