104 files changed, 10 insertions, 10 deletions

diff --git a/engine/diploma.asm b/engine/events/diploma.asm
index 5d0482cc4..5d0482cc4 100644
--- a/engine/diploma.asm
+++ b/engine/events/diploma.asm
diff --git a/engine/card_flip.asm b/engine/game/card_flip.asm
index fbeb3e3b6..fbeb3e3b6 100755
--- a/engine/card_flip.asm
+++ b/engine/game/card_flip.asm
diff --git a/engine/dummy_game.asm b/engine/game/dummy_game.asm
index 6d7e12196..6d7e12196 100755
--- a/engine/dummy_game.asm
+++ b/engine/game/dummy_game.asm
diff --git a/engine/slot_machine.asm b/engine/game/slot_machine.asm
index 924c78924..924c78924 100755
--- a/engine/slot_machine.asm
+++ b/engine/game/slot_machine.asm
diff --git a/engine/unown_puzzle.asm b/engine/game/unown_puzzle.asm
index 83527ea69..83527ea69 100755
--- a/engine/unown_puzzle.asm
+++ b/engine/game/unown_puzzle.asm
diff --git a/engine/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index b36dceeb6..b36dceeb6 100644
--- a/engine/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
diff --git a/engine/color.asm b/engine/gfx/color.asm
index b0bc653b0..6cf896ff4 100644
--- a/engine/color.asm
+++ b/engine/gfx/color.asm
@@ -1,4 +1,4 @@
-INCLUDE "engine/sgb_layouts.asm"
+INCLUDE "engine/gfx/sgb_layouts.asm"
 
 SHINY_ATK_BIT EQU 5
 SHINY_DEF_VAL EQU 10
@@ -445,7 +445,7 @@ LoadMailPalettes:
 .MailPals:
 INCLUDE "gfx/mail/mail.pal"
 
-INCLUDE "engine/cgb_layouts.asm"
+INCLUDE "engine/gfx/cgb_layouts.asm"
 
 Unreferenced_Function95f0:
 	ld hl, .Palette
diff --git a/engine/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm
index d6b193e9d..0133916e5 100755
--- a/engine/crystal_layouts.asm
+++ b/engine/gfx/crystal_layouts.asm
@@ -203,7 +203,7 @@ Function49496: ; 49496
 	ret
 ; 494ac
 
-INCLUDE "engine/tileset_palettes.asm"
+INCLUDE "engine/gfx/tileset_palettes.asm"
 
 MG_Mobile_Layout02: ; 49706
 	ld hl, .Palette_49732
diff --git a/engine/evolution_animation.asm b/engine/gfx/evolution_animation.asm
index 978f9e968..978f9e968 100755
--- a/engine/evolution_animation.asm
+++ b/engine/gfx/evolution_animation.asm
diff --git a/engine/gbc_only.asm b/engine/gfx/gbc_only.asm
index badd953aa..badd953aa 100644
--- a/engine/gbc_only.asm
+++ b/engine/gfx/gbc_only.asm
diff --git a/engine/load_font.asm b/engine/gfx/load_font.asm
index 40dbb9c10..40dbb9c10 100644
--- a/engine/load_font.asm
+++ b/engine/gfx/load_font.asm
diff --git a/engine/load_pics.asm b/engine/gfx/load_pics.asm
index b533ee56b..b533ee56b 100755
--- a/engine/load_pics.asm
+++ b/engine/gfx/load_pics.asm
diff --git a/engine/map_palettes.asm b/engine/gfx/map_palettes.asm
index a9d2b382f..a9d2b382f 100644
--- a/engine/map_palettes.asm
+++ b/engine/gfx/map_palettes.asm
diff --git a/engine/mapgroup_roofs.asm b/engine/gfx/mapgroup_roofs.asm
index 58e5e7cfe..58e5e7cfe 100644
--- a/engine/mapgroup_roofs.asm
+++ b/engine/gfx/mapgroup_roofs.asm
diff --git a/engine/mon_icons.asm b/engine/gfx/mon_icons.asm
index 5a26d2d7c..5a26d2d7c 100755
--- a/engine/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
diff --git a/engine/pic_animation.asm b/engine/gfx/pic_animation.asm
index 8781c2fd0..8781c2fd0 100644
--- a/engine/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
diff --git a/engine/player_gfx.asm b/engine/gfx/player_gfx.asm
index deb16ad3a..deb16ad3a 100644
--- a/engine/player_gfx.asm
+++ b/engine/gfx/player_gfx.asm
diff --git a/engine/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index 24bdc952e..24bdc952e 100644
--- a/engine/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
diff --git a/engine/sprite_anims.asm b/engine/gfx/sprite_anims.asm
index 9353b71c9..9353b71c9 100755
--- a/engine/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
diff --git a/engine/sprites.asm b/engine/gfx/sprites.asm
index 99d1d2ae4..63666c624 100755
--- a/engine/sprites.asm
+++ b/engine/gfx/sprites.asm
@@ -552,7 +552,7 @@ Unreferenced_BrokenGetStdGraphics: ; 8d1ac
 
 INCLUDE "data/sprite_anims/sequences.asm"
 
-INCLUDE "engine/sprite_anims.asm"
+INCLUDE "engine/gfx/sprite_anims.asm"
 
 INCLUDE "data/sprite_anims/framesets.asm"
 
diff --git a/engine/tileset_anims.asm b/engine/gfx/tileset_anims.asm
index bf0037e65..bf0037e65 100644
--- a/engine/tileset_anims.asm
+++ b/engine/gfx/tileset_anims.asm
diff --git a/engine/tileset_palettes.asm b/engine/gfx/tileset_palettes.asm
index e2c39c0ab..e2c39c0ab 100644
--- a/engine/tileset_palettes.asm
+++ b/engine/gfx/tileset_palettes.asm
diff --git a/engine/timeofdaypals.asm b/engine/gfx/timeofdaypals.asm
index b8d43d252..b8d43d252 100644
--- a/engine/timeofdaypals.asm
+++ b/engine/gfx/timeofdaypals.asm
diff --git a/engine/trade_animation.asm b/engine/gfx/trade_animation.asm
index 04c31df80..04c31df80 100755
--- a/engine/trade_animation.asm
+++ b/engine/gfx/trade_animation.asm
diff --git a/engine/link.asm b/engine/link/link.asm
index c693e6919..86af41c01 100755
--- a/engine/link.asm
+++ b/engine/link/link.asm
@@ -2029,7 +2029,7 @@ Unreferenced_Function28f09: ; 28f09
 	ret
 ; 28f24
 
-INCLUDE "engine/trade_animation.asm"
+INCLUDE "engine/gfx/trade_animation.asm"
 
 CheckTimeCapsuleCompatibility: ; 29bfb
 ; Checks to see if your party is compatible with the Gen 1 games.
diff --git a/engine/link_2.asm b/engine/link/link_2.asm
index e2fe47dc5..e2fe47dc5 100644
--- a/engine/link_2.asm
+++ b/engine/link/link_2.asm
diff --git a/engine/link_trade.asm b/engine/link/link_trade.asm
index 4c2af0842..4c2af0842 100755
--- a/engine/link_trade.asm
+++ b/engine/link/link_trade.asm
diff --git a/engine/mystery_gift.asm b/engine/link/mystery_gift.asm
index c73e4246e..c73e4246e 100755
--- a/engine/mystery_gift.asm
+++ b/engine/link/mystery_gift.asm
diff --git a/engine/mystery_gift_2.asm b/engine/link/mystery_gift_2.asm
index e0e2e88fd..e0e2e88fd 100755
--- a/engine/mystery_gift_2.asm
+++ b/engine/link/mystery_gift_2.asm
diff --git a/engine/time_capsule.asm b/engine/link/time_capsule.asm
index f90b7e249..f90b7e249 100755
--- a/engine/time_capsule.asm
+++ b/engine/link/time_capsule.asm
diff --git a/engine/time_capsule_2.asm b/engine/link/time_capsule_2.asm
index a56e51785..a56e51785 100644
--- a/engine/time_capsule_2.asm
+++ b/engine/link/time_capsule_2.asm
diff --git a/engine/buy_sell_toss.asm b/engine/menu/buy_sell_toss.asm
index 84481d030..84481d030 100755
--- a/engine/buy_sell_toss.asm
+++ b/engine/menu/buy_sell_toss.asm
diff --git a/engine/clock_reset.asm b/engine/menu/clock_reset.asm
index c05129349..c05129349 100755
--- a/engine/clock_reset.asm
+++ b/engine/menu/clock_reset.asm
diff --git a/engine/delete_save_change_clock.asm b/engine/menu/delete_save_change_clock.asm
index 431dc6034..431dc6034 100755
--- a/engine/delete_save_change_clock.asm
+++ b/engine/menu/delete_save_change_clock.asm
diff --git a/engine/main_menu.asm b/engine/menu/main_menu.asm
index d83ce873b..d83ce873b 100755
--- a/engine/main_menu.asm
+++ b/engine/menu/main_menu.asm
diff --git a/engine/mart.asm b/engine/menu/mart.asm
index 911251f65..911251f65 100755
--- a/engine/mart.asm
+++ b/engine/menu/mart.asm
diff --git a/engine/menu.asm b/engine/menu/menu.asm
index 51de2e1a4..51de2e1a4 100755
--- a/engine/menu.asm
+++ b/engine/menu/menu.asm
diff --git a/engine/menu_2.asm b/engine/menu/menu_2.asm
index 16cce5348..16cce5348 100644
--- a/engine/menu_2.asm
+++ b/engine/menu/menu_2.asm
diff --git a/engine/mon_menu.asm b/engine/menu/mon_menu.asm
index 088b1b1a3..088b1b1a3 100755
--- a/engine/mon_menu.asm
+++ b/engine/menu/mon_menu.asm
diff --git a/engine/naming_screen.asm b/engine/menu/naming_screen.asm
index a958e10eb..a958e10eb 100755
--- a/engine/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
diff --git a/engine/options_menu.asm b/engine/menu/options_menu.asm
index c0a255cb0..c0a255cb0 100755
--- a/engine/options_menu.asm
+++ b/engine/menu/options_menu.asm
diff --git a/engine/pack.asm b/engine/menu/pack.asm
index ea3a051ac..ea3a051ac 100644
--- a/engine/pack.asm
+++ b/engine/menu/pack.asm
diff --git a/engine/scrolling_menu.asm b/engine/menu/scrolling_menu.asm
index 3be3d839c..3be3d839c 100755
--- a/engine/scrolling_menu.asm
+++ b/engine/menu/scrolling_menu.asm
diff --git a/engine/start_menu.asm b/engine/menu/start_menu.asm
index 037efd947..037efd947 100755
--- a/engine/start_menu.asm
+++ b/engine/menu/start_menu.asm
diff --git a/engine/switch_items.asm b/engine/menu/switch_items.asm
index 77b635246..77b635246 100755
--- a/engine/switch_items.asm
+++ b/engine/menu/switch_items.asm
diff --git a/engine/timeset.asm b/engine/menu/timeset.asm
index eda3094e1..eda3094e1 100755
--- a/engine/timeset.asm
+++ b/engine/menu/timeset.asm
diff --git a/engine/tmhm.asm b/engine/menu/tmhm.asm
index 9db3dc291..9db3dc291 100755
--- a/engine/tmhm.asm
+++ b/engine/menu/tmhm.asm
diff --git a/engine/trainer_card.asm b/engine/menu/trainer_card.asm
index e84c1c9f3..e84c1c9f3 100755
--- a/engine/trainer_card.asm
+++ b/engine/menu/trainer_card.asm
diff --git a/engine/decorations.asm b/engine/overworld/decorations.asm
index 33d0ca0cd..33d0ca0cd 100755
--- a/engine/decorations.asm
+++ b/engine/overworld/decorations.asm
diff --git a/engine/events.asm b/engine/overworld/events.asm
index 35a54138b..cc2c8c574 100644
--- a/engine/events.asm
+++ b/engine/overworld/events.asm
@@ -1106,6 +1106,6 @@ ChangeDirectionScript: ; 9
 	end
 ; 96c56
 
-INCLUDE "engine/scripting.asm"
+INCLUDE "engine/overworld/scripting.asm"
 
-INCLUDE "engine/events_2.asm"
+INCLUDE "engine/overworld/events_2.asm"
diff --git a/engine/events_2.asm b/engine/overworld/events_2.asm
index 6e106541a..6e106541a 100644
--- a/engine/events_2.asm
+++ b/engine/overworld/events_2.asm
diff --git a/engine/init_map.asm b/engine/overworld/init_map.asm
index 2eb4998a6..2eb4998a6 100644
--- a/engine/init_map.asm
+++ b/engine/overworld/init_map.asm
diff --git a/engine/landmarks.asm b/engine/overworld/landmarks.asm
index f16f48e67..f16f48e67 100644
--- a/engine/landmarks.asm
+++ b/engine/overworld/landmarks.asm
diff --git a/engine/map_object_action.asm b/engine/overworld/map_object_action.asm
index c82cd80a2..c82cd80a2 100755
--- a/engine/map_object_action.asm
+++ b/engine/overworld/map_object_action.asm
diff --git a/engine/map_objects.asm b/engine/overworld/map_objects.asm
index 78d9062ef..8d6f4082f 100644
--- a/engine/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -185,7 +185,7 @@ _HandleObjectAction
 	ret
 ; 445f
 
-INCLUDE "engine/map_object_action.asm"
+INCLUDE "engine/overworld/map_object_action.asm"
 
 CopyNextCoordsTileToStandingCoordsTile: ; 4600
 	ld hl, OBJECT_NEXT_MAP_X
@@ -1990,7 +1990,7 @@ DoMovementFunction: ; 506b
 	ret
 ; 5075
 
-INCLUDE "engine/movement.asm"
+INCLUDE "engine/overworld/movement.asm"
 ; 54b8
 
 ApplyMovementToFollower: ; 54b8
diff --git a/engine/map_objects_2.asm b/engine/overworld/map_objects_2.asm
index 038e2b49b..038e2b49b 100644
--- a/engine/map_objects_2.asm
+++ b/engine/overworld/map_objects_2.asm
diff --git a/engine/map_setup.asm b/engine/overworld/map_setup.asm
index 268574de0..268574de0 100644
--- a/engine/map_setup.asm
+++ b/engine/overworld/map_setup.asm
diff --git a/engine/movement.asm b/engine/overworld/movement.asm
index 3dbb0b83a..3dbb0b83a 100644
--- a/engine/movement.asm
+++ b/engine/overworld/movement.asm
diff --git a/engine/npc_movement.asm b/engine/overworld/npc_movement.asm
index 5670935e8..5670935e8 100755
--- a/engine/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
diff --git a/engine/overworld.asm b/engine/overworld/overworld.asm
index 381c2d89f..381c2d89f 100755
--- a/engine/overworld.asm
+++ b/engine/overworld/overworld.asm
diff --git a/engine/player_movement.asm b/engine/overworld/player_movement.asm
index ef9afc7ad..ef9afc7ad 100755
--- a/engine/player_movement.asm
+++ b/engine/overworld/player_movement.asm
diff --git a/engine/player_object.asm b/engine/overworld/player_object.asm
index 7d287dedb..7d287dedb 100755
--- a/engine/player_object.asm
+++ b/engine/overworld/player_object.asm
diff --git a/engine/player_step.asm b/engine/overworld/player_step.asm
index 675c6553b..675c6553b 100755
--- a/engine/player_step.asm
+++ b/engine/overworld/player_step.asm
diff --git a/engine/scripting.asm b/engine/overworld/scripting.asm
index f65f2f9c0..f65f2f9c0 100644
--- a/engine/scripting.asm
+++ b/engine/overworld/scripting.asm
diff --git a/engine/select_menu.asm b/engine/overworld/select_menu.asm
index 9898afda2..9898afda2 100755
--- a/engine/select_menu.asm
+++ b/engine/overworld/select_menu.asm
diff --git a/engine/spawn_points.asm b/engine/overworld/spawn_points.asm
index 1a3d12441..1a3d12441 100644
--- a/engine/spawn_points.asm
+++ b/engine/overworld/spawn_points.asm
diff --git a/engine/tile_events.asm b/engine/overworld/tile_events.asm
index 705c0e427..705c0e427 100755
--- a/engine/tile_events.asm
+++ b/engine/overworld/tile_events.asm
diff --git a/engine/time.asm b/engine/overworld/time.asm
index 0f83447cc..0f83447cc 100755
--- a/engine/time.asm
+++ b/engine/overworld/time.asm
diff --git a/engine/variables.asm b/engine/overworld/variables.asm
index 89026fdba..89026fdba 100755
--- a/engine/variables.asm
+++ b/engine/overworld/variables.asm
diff --git a/engine/warp_connection.asm b/engine/overworld/warp_connection.asm
index 069b72234..069b72234 100755
--- a/engine/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
diff --git a/engine/wildmons.asm b/engine/overworld/wildmons.asm
index 494e8d2a4..494e8d2a4 100755
--- a/engine/wildmons.asm
+++ b/engine/overworld/wildmons.asm
diff --git a/engine/pokegear.asm b/engine/pokegear/pokegear.asm
index f04276b2d..f04276b2d 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
diff --git a/engine/radio.asm b/engine/pokegear/radio.asm
index ffaef80f0..ffaef80f0 100644
--- a/engine/radio.asm
+++ b/engine/pokegear/radio.asm
diff --git a/engine/billspc.asm b/engine/pokemon/billspc.asm
index 96d6ac310..96d6ac310 100755
--- a/engine/billspc.asm
+++ b/engine/pokemon/billspc.asm
diff --git a/engine/billspctop.asm b/engine/pokemon/billspctop.asm
index 1e808c02c..1e808c02c 100755
--- a/engine/billspctop.asm
+++ b/engine/pokemon/billspctop.asm
diff --git a/engine/breeding.asm b/engine/pokemon/breeding.asm
index 58b42953c..58b42953c 100755
--- a/engine/breeding.asm
+++ b/engine/pokemon/breeding.asm
diff --git a/engine/caught_data.asm b/engine/pokemon/caught_data.asm
index 3bfacf539..3bfacf539 100644
--- a/engine/caught_data.asm
+++ b/engine/pokemon/caught_data.asm
diff --git a/engine/european_mail.asm b/engine/pokemon/european_mail.asm
index 8f037cc43..8f037cc43 100644
--- a/engine/european_mail.asm
+++ b/engine/pokemon/european_mail.asm
diff --git a/engine/evolve.asm b/engine/pokemon/evolve.asm
index 5a7e75dfa..5a7e75dfa 100755
--- a/engine/evolve.asm
+++ b/engine/pokemon/evolve.asm
diff --git a/engine/experience.asm b/engine/pokemon/experience.asm
index 6b94ed357..6b94ed357 100644
--- a/engine/experience.asm
+++ b/engine/pokemon/experience.asm
diff --git a/engine/health.asm b/engine/pokemon/health.asm
index cc47e8252..cc47e8252 100755
--- a/engine/health.asm
+++ b/engine/pokemon/health.asm
diff --git a/engine/learn.asm b/engine/pokemon/learn.asm
index fb62289a7..fb62289a7 100755
--- a/engine/learn.asm
+++ b/engine/pokemon/learn.asm
diff --git a/engine/mail.asm b/engine/pokemon/mail.asm
index b8685c0df..b8685c0df 100755
--- a/engine/mail.asm
+++ b/engine/pokemon/mail.asm
diff --git a/engine/mail_2.asm b/engine/pokemon/mail_2.asm
index 6e326641b..6e326641b 100755
--- a/engine/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
diff --git a/engine/mon_stats.asm b/engine/pokemon/mon_stats.asm
index 2b5586c51..2b5586c51 100644
--- a/engine/mon_stats.asm
+++ b/engine/pokemon/mon_stats.asm
diff --git a/engine/move_mon.asm b/engine/pokemon/move_mon.asm
index 8ccf319f0..8ccf319f0 100755
--- a/engine/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
diff --git a/engine/move_mon_wo_mail.asm b/engine/pokemon/move_mon_wo_mail.asm
index 5d81da8a0..5d81da8a0 100755
--- a/engine/move_mon_wo_mail.asm
+++ b/engine/pokemon/move_mon_wo_mail.asm
diff --git a/engine/party_menu.asm b/engine/pokemon/party_menu.asm
index fc1783c71..fc1783c71 100644
--- a/engine/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
diff --git a/engine/search.asm b/engine/pokemon/search.asm
index 57b489a37..57b489a37 100755
--- a/engine/search.asm
+++ b/engine/pokemon/search.asm
diff --git a/engine/search2.asm b/engine/pokemon/search2.asm
index b7112f1f8..b7112f1f8 100755
--- a/engine/search2.asm
+++ b/engine/pokemon/search2.asm
diff --git a/engine/stats_screen.asm b/engine/pokemon/stats_screen.asm
index 59d96999f..59d96999f 100755
--- a/engine/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
diff --git a/engine/tempmon.asm b/engine/pokemon/tempmon.asm
index 723bfb1dd..723bfb1dd 100644
--- a/engine/tempmon.asm
+++ b/engine/pokemon/tempmon.asm
diff --git a/engine/tmhm2.asm b/engine/pokemon/tmhm.asm
index 442f73cfa..442f73cfa 100755
--- a/engine/tmhm2.asm
+++ b/engine/pokemon/tmhm.asm
diff --git a/engine/types.asm b/engine/pokemon/types.asm
index dc0df61ae..dc0df61ae 100644
--- a/engine/types.asm
+++ b/engine/pokemon/types.asm
diff --git a/engine/print_party.asm b/engine/printer/print_party.asm
index 1095ce584..1095ce584 100755
--- a/engine/print_party.asm
+++ b/engine/printer/print_party.asm
diff --git a/engine/printer.asm b/engine/printer/printer.asm
index b9e55ef2a..0264b4f7a 100755
--- a/engine/printer.asm
+++ b/engine/printer/printer.asm
@@ -1,4 +1,4 @@
-INCLUDE "engine/printer_serial.asm"
+INCLUDE "engine/printer/printer_serial.asm"
 
 SendScreenToPrinter: ; 843f0
 .loop
diff --git a/engine/printer_serial.asm b/engine/printer/printer_serial.asm
index 4e0d10851..4e0d10851 100755
--- a/engine/printer_serial.asm
+++ b/engine/printer/printer_serial.asm
diff --git a/engine/math.asm b/engine/routines/math.asm
index 0cd6b0b47..0cd6b0b47 100755
--- a/engine/math.asm
+++ b/engine/routines/math.asm
diff --git a/engine/printnum.asm b/engine/routines/printnum.asm
index fec798d5c..fec798d5c 100755
--- a/engine/printnum.asm
+++ b/engine/routines/printnum.asm
diff --git a/engine/credits.asm b/engine/title/credits.asm
index 1aaecf64a..1aaecf64a 100644
--- a/engine/credits.asm
+++ b/engine/title/credits.asm
diff --git a/engine/crystal_intro.asm b/engine/title/crystal_intro.asm
index 56bb02750..56bb02750 100755
--- a/engine/crystal_intro.asm
+++ b/engine/title/crystal_intro.asm
diff --git a/engine/init_hof_credits.asm b/engine/title/init_hof_credits.asm
index e8e98a0e1..e8e98a0e1 100644
--- a/engine/init_hof_credits.asm
+++ b/engine/title/init_hof_credits.asm
diff --git a/engine/title.asm b/engine/title/title.asm
index f311f2342..f311f2342 100644
--- a/engine/title.asm
+++ b/engine/title/title.asm
diff --git a/engine/unused_title.asm b/engine/title/unused_title.asm
index 8e52a71bb..8e52a71bb 100644
--- a/engine/unused_title.asm
+++ b/engine/title/unused_title.asm