35 files changed, 29 insertions, 29 deletions
diff --git a/src/engine/ai/attacks.asm b/src/engine/duel/ai/attacks.asm
index 69ae2e1..69ae2e1 100644
--- a/src/engine/ai/attacks.asm
+++ b/src/engine/duel/ai/attacks.asm
diff --git a/src/engine/ai/boss_deck_set_up.asm b/src/engine/duel/ai/boss_deck_set_up.asm
index ebcd2ea..ebcd2ea 100644
--- a/src/engine/ai/boss_deck_set_up.asm
+++ b/src/engine/duel/ai/boss_deck_set_up.asm
diff --git a/src/engine/ai/common.asm b/src/engine/duel/ai/common.asm
index d4f1da4..d4f1da4 100644
--- a/src/engine/ai/common.asm
+++ b/src/engine/duel/ai/common.asm
diff --git a/src/engine/ai/core.asm b/src/engine/duel/ai/core.asm
index f182375..9604322 100644
--- a/src/engine/ai/core.asm
+++ b/src/engine/duel/ai/core.asm
@@ -1,4 +1,4 @@
-INCLUDE "engine/ai/decks/unreferenced.asm"
+INCLUDE "engine/duel/ai/decks/unreferenced.asm"
 
 ; returns carry if damage dealt from any of
 ; a card's attacks KOs defending Pokémon
@@ -707,13 +707,13 @@ LookForCardIDInHand: ; 143bf (5:43bf)
 	or a
 	ret
 
-INCLUDE "engine/ai/damage_calculation.asm"
+INCLUDE "engine/duel/ai/damage_calculation.asm"
 
 AIProcessHandTrainerCards: ; 14663 (5:4663)
 	farcall _AIProcessHandTrainerCards
 	ret
 
-INCLUDE "engine/ai/deck_ai.asm"
+INCLUDE "engine/duel/ai/deck_ai.asm"
 
 ; return carry if card ID loaded in a is found in hand
 ; and outputs in a the deck index of that card
@@ -815,7 +815,7 @@ AIAttachEnergyInHandToCardInBench: ; 1562b (5:562b)
 	ld b, PLAY_AREA_BENCH_1
 	jr AIAttachEnergyInHandToCardInPlayArea.attach
 
-INCLUDE "engine/ai/init.asm"
+INCLUDE "engine/duel/ai/init.asm"
 
 ; load selected attack from Pokémon in hTempPlayAreaLocation_ff9d,
 ; gets an energy card to discard and subsequently
@@ -1306,7 +1306,7 @@ Func_15886: ; 15886 (5:5886)
 	inc hl
 	jr .loop_energy_cards
 
-INCLUDE "engine/ai/retreat.asm"
+INCLUDE "engine/duel/ai/retreat.asm"
 
 ; Copy cards from wDuelTempList in hl to wHandTempList in de
 CopyHandCardList: ; 15ea6 (5:5ea6)
@@ -1317,7 +1317,7 @@ CopyHandCardList: ; 15ea6 (5:5ea6)
 	inc de
 	jr CopyHandCardList
 
-INCLUDE "engine/ai/hand_pokemon.asm"
+INCLUDE "engine/duel/ai/hand_pokemon.asm"
 
 ; check if player's active Pokémon is Mr Mime
 ; if it isn't, set carry
@@ -1804,11 +1804,11 @@ CheckForEvolutionInDeck: ; 16451 (5:6451)
 	scf
 	ret
 
-INCLUDE "engine/ai/energy.asm"
+INCLUDE "engine/duel/ai/energy.asm"
 
-INCLUDE "engine/ai/attacks.asm"
+INCLUDE "engine/duel/ai/attacks.asm"
 
-INCLUDE "engine/ai/special_attacks.asm"
+INCLUDE "engine/duel/ai/special_attacks.asm"
 
 ; checks in other Play Area for non-basic cards.
 ; afterwards, that card is checked for damage,
@@ -2285,7 +2285,7 @@ CheckCardEvolutionInHandOrDeck: ; 17274 (5:7274)
 	scf
 	ret
 
-INCLUDE "engine/ai/boss_deck_set_up.asm"
+INCLUDE "engine/duel/ai/boss_deck_set_up.asm"
 
 ; returns carry if Pokemon at PLAY_AREA* in a
 ; can damage defending Pokémon with any of its attacks
diff --git a/src/engine/ai/damage_calculation.asm b/src/engine/duel/ai/damage_calculation.asm
index 97c24b6..97c24b6 100644
--- a/src/engine/ai/damage_calculation.asm
+++ b/src/engine/duel/ai/damage_calculation.asm
diff --git a/src/engine/ai/deck_ai.asm b/src/engine/duel/ai/deck_ai.asm
index c330418..b46de01 100644
--- a/src/engine/ai/deck_ai.asm
+++ b/src/engine/duel/ai/deck_ai.asm
@@ -61,22 +61,22 @@ ENDM
 ; wAICardListRetreatBonus  : scores given to certain cards for retreat;
 ; wAICardListEnergyBonus   : max number of energy cards and card scores.
 
-INCLUDE "engine/ai/decks/general.asm"
-INCLUDE "engine/ai/decks/sams_practice.asm"
-INCLUDE "engine/ai/decks/general_no_retreat.asm"
-INCLUDE "engine/ai/decks/legendary_moltres.asm"
-INCLUDE "engine/ai/decks/legendary_zapdos.asm"
-INCLUDE "engine/ai/decks/legendary_articuno.asm"
-INCLUDE "engine/ai/decks/legendary_dragonite.asm"
-INCLUDE "engine/ai/decks/first_strike.asm"
-INCLUDE "engine/ai/decks/rock_crusher.asm"
-INCLUDE "engine/ai/decks/go_go_rain_dance.asm"
-INCLUDE "engine/ai/decks/zapping_selfdestruct.asm"
-INCLUDE "engine/ai/decks/flower_power.asm"
-INCLUDE "engine/ai/decks/strange_psyshock.asm"
-INCLUDE "engine/ai/decks/wonders_of_science.asm"
-INCLUDE "engine/ai/decks/fire_charge.asm"
-INCLUDE "engine/ai/decks/im_ronald.asm"
-INCLUDE "engine/ai/decks/powerful_ronald.asm"
-INCLUDE "engine/ai/decks/invincible_ronald.asm"
-INCLUDE "engine/ai/decks/legendary_ronald.asm"
+INCLUDE "engine/duel/ai/decks/general.asm"
+INCLUDE "engine/duel/ai/decks/sams_practice.asm"
+INCLUDE "engine/duel/ai/decks/general_no_retreat.asm"
+INCLUDE "engine/duel/ai/decks/legendary_moltres.asm"
+INCLUDE "engine/duel/ai/decks/legendary_zapdos.asm"
+INCLUDE "engine/duel/ai/decks/legendary_articuno.asm"
+INCLUDE "engine/duel/ai/decks/legendary_dragonite.asm"
+INCLUDE "engine/duel/ai/decks/first_strike.asm"
+INCLUDE "engine/duel/ai/decks/rock_crusher.asm"
+INCLUDE "engine/duel/ai/decks/go_go_rain_dance.asm"
+INCLUDE "engine/duel/ai/decks/zapping_selfdestruct.asm"
+INCLUDE "engine/duel/ai/decks/flower_power.asm"
+INCLUDE "engine/duel/ai/decks/strange_psyshock.asm"
+INCLUDE "engine/duel/ai/decks/wonders_of_science.asm"
+INCLUDE "engine/duel/ai/decks/fire_charge.asm"
+INCLUDE "engine/duel/ai/decks/im_ronald.asm"
+INCLUDE "engine/duel/ai/decks/powerful_ronald.asm"
+INCLUDE "engine/duel/ai/decks/invincible_ronald.asm"
+INCLUDE "engine/duel/ai/decks/legendary_ronald.asm"
diff --git a/src/engine/ai/decks/fire_charge.asm b/src/engine/duel/ai/decks/fire_charge.asm
index f5b347b..f5b347b 100644
--- a/src/engine/ai/decks/fire_charge.asm
+++ b/src/engine/duel/ai/decks/fire_charge.asm
diff --git a/src/engine/ai/decks/first_strike.asm b/src/engine/duel/ai/decks/first_strike.asm
index 2e636e1..2e636e1 100644
--- a/src/engine/ai/decks/first_strike.asm
+++ b/src/engine/duel/ai/decks/first_strike.asm
diff --git a/src/engine/ai/decks/flower_power.asm b/src/engine/duel/ai/decks/flower_power.asm
index 4d423a3..4d423a3 100644
--- a/src/engine/ai/decks/flower_power.asm
+++ b/src/engine/duel/ai/decks/flower_power.asm
diff --git a/src/engine/ai/decks/general.asm b/src/engine/duel/ai/decks/general.asm
index 039e101..039e101 100644
--- a/src/engine/ai/decks/general.asm
+++ b/src/engine/duel/ai/decks/general.asm
diff --git a/src/engine/ai/decks/general_no_retreat.asm b/src/engine/duel/ai/decks/general_no_retreat.asm
index 20d84e3..20d84e3 100644
--- a/src/engine/ai/decks/general_no_retreat.asm
+++ b/src/engine/duel/ai/decks/general_no_retreat.asm
diff --git a/src/engine/ai/decks/go_go_rain_dance.asm b/src/engine/duel/ai/decks/go_go_rain_dance.asm
index 23547e2..23547e2 100644
--- a/src/engine/ai/decks/go_go_rain_dance.asm
+++ b/src/engine/duel/ai/decks/go_go_rain_dance.asm
diff --git a/src/engine/ai/decks/im_ronald.asm b/src/engine/duel/ai/decks/im_ronald.asm
index b002d83..b002d83 100644
--- a/src/engine/ai/decks/im_ronald.asm
+++ b/src/engine/duel/ai/decks/im_ronald.asm
diff --git a/src/engine/ai/decks/invincible_ronald.asm b/src/engine/duel/ai/decks/invincible_ronald.asm
index 463560b..463560b 100644
--- a/src/engine/ai/decks/invincible_ronald.asm
+++ b/src/engine/duel/ai/decks/invincible_ronald.asm
diff --git a/src/engine/ai/decks/legendary_articuno.asm b/src/engine/duel/ai/decks/legendary_articuno.asm
index 6409330..6409330 100644
--- a/src/engine/ai/decks/legendary_articuno.asm
+++ b/src/engine/duel/ai/decks/legendary_articuno.asm
diff --git a/src/engine/ai/decks/legendary_dragonite.asm b/src/engine/duel/ai/decks/legendary_dragonite.asm
index 597f72c..597f72c 100644
--- a/src/engine/ai/decks/legendary_dragonite.asm
+++ b/src/engine/duel/ai/decks/legendary_dragonite.asm
diff --git a/src/engine/ai/decks/legendary_moltres.asm b/src/engine/duel/ai/decks/legendary_moltres.asm
index c2a3882..c2a3882 100644
--- a/src/engine/ai/decks/legendary_moltres.asm
+++ b/src/engine/duel/ai/decks/legendary_moltres.asm
diff --git a/src/engine/ai/decks/legendary_ronald.asm b/src/engine/duel/ai/decks/legendary_ronald.asm
index 3356838..3356838 100644
--- a/src/engine/ai/decks/legendary_ronald.asm
+++ b/src/engine/duel/ai/decks/legendary_ronald.asm
diff --git a/src/engine/ai/decks/legendary_zapdos.asm b/src/engine/duel/ai/decks/legendary_zapdos.asm
index cc99f0c..cc99f0c 100644
--- a/src/engine/ai/decks/legendary_zapdos.asm
+++ b/src/engine/duel/ai/decks/legendary_zapdos.asm
diff --git a/src/engine/ai/decks/powerful_ronald.asm b/src/engine/duel/ai/decks/powerful_ronald.asm
index 096fbea..096fbea 100644
--- a/src/engine/ai/decks/powerful_ronald.asm
+++ b/src/engine/duel/ai/decks/powerful_ronald.asm
diff --git a/src/engine/ai/decks/rock_crusher.asm b/src/engine/duel/ai/decks/rock_crusher.asm
index 41a50fa..41a50fa 100644
--- a/src/engine/ai/decks/rock_crusher.asm
+++ b/src/engine/duel/ai/decks/rock_crusher.asm
diff --git a/src/engine/ai/decks/sams_practice.asm b/src/engine/duel/ai/decks/sams_practice.asm
index dddce61..dddce61 100644
--- a/src/engine/ai/decks/sams_practice.asm
+++ b/src/engine/duel/ai/decks/sams_practice.asm
diff --git a/src/engine/ai/decks/strange_psyshock.asm b/src/engine/duel/ai/decks/strange_psyshock.asm
index ef378b0..ef378b0 100644
--- a/src/engine/ai/decks/strange_psyshock.asm
+++ b/src/engine/duel/ai/decks/strange_psyshock.asm
diff --git a/src/engine/ai/decks/unreferenced.asm b/src/engine/duel/ai/decks/unreferenced.asm
index 8722a27..8722a27 100644
--- a/src/engine/ai/decks/unreferenced.asm
+++ b/src/engine/duel/ai/decks/unreferenced.asm
diff --git a/src/engine/ai/decks/wonders_of_science.asm b/src/engine/duel/ai/decks/wonders_of_science.asm
index 706a7e6..706a7e6 100644
--- a/src/engine/ai/decks/wonders_of_science.asm
+++ b/src/engine/duel/ai/decks/wonders_of_science.asm
diff --git a/src/engine/ai/decks/zapping_selfdestruct.asm b/src/engine/duel/ai/decks/zapping_selfdestruct.asm
index da5e7c6..da5e7c6 100644
--- a/src/engine/ai/decks/zapping_selfdestruct.asm
+++ b/src/engine/duel/ai/decks/zapping_selfdestruct.asm
diff --git a/src/engine/ai/energy.asm b/src/engine/duel/ai/energy.asm
index ce8c037..ce8c037 100644
--- a/src/engine/ai/energy.asm
+++ b/src/engine/duel/ai/energy.asm
diff --git a/src/engine/ai/hand_pokemon.asm b/src/engine/duel/ai/hand_pokemon.asm
index 27a4176..27a4176 100644
--- a/src/engine/ai/hand_pokemon.asm
+++ b/src/engine/duel/ai/hand_pokemon.asm
diff --git a/src/engine/ai/init.asm b/src/engine/duel/ai/init.asm
index 33132cf..33132cf 100644
--- a/src/engine/ai/init.asm
+++ b/src/engine/duel/ai/init.asm
diff --git a/src/engine/ai/pkmn_powers.asm b/src/engine/duel/ai/pkmn_powers.asm
index 8ae629a..8ae629a 100644
--- a/src/engine/ai/pkmn_powers.asm
+++ b/src/engine/duel/ai/pkmn_powers.asm
diff --git a/src/engine/ai/retreat.asm b/src/engine/duel/ai/retreat.asm
index 768a48b..768a48b 100644
--- a/src/engine/ai/retreat.asm
+++ b/src/engine/duel/ai/retreat.asm
diff --git a/src/engine/ai/special_attacks.asm b/src/engine/duel/ai/special_attacks.asm
index 770324e..770324e 100644
--- a/src/engine/ai/special_attacks.asm
+++ b/src/engine/duel/ai/special_attacks.asm
diff --git a/src/engine/ai/trainer_cards.asm b/src/engine/duel/ai/trainer_cards.asm
index 4bee001..4bee001 100644
--- a/src/engine/ai/trainer_cards.asm
+++ b/src/engine/duel/ai/trainer_cards.asm
diff --git a/src/engine/effect_functions.asm b/src/engine/duel/effect_functions.asm
index ce3a517..ce3a517 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/duel/effect_functions.asm
diff --git a/src/engine/sprite_vblank.asm b/src/engine/gfx/sprite_vblank.asm
index 5f099a1..5f099a1 100644
--- a/src/engine/sprite_vblank.asm
+++ b/src/engine/gfx/sprite_vblank.asm