19 files changed, 18 insertions, 16 deletions
diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm
index c5aef7750..c419cd465 100755
--- a/constants/cgb_constants.asm
+++ b/constants/cgb_constants.asm
@@ -1,4 +1,4 @@
-; GetSGBLayout arguments (see predef/cgb.asm and predef/sgb.asm)
+; GetSGBLayout arguments (see engine/cgb_layouts.asm and engine/sgb_layouts.asm)
 	const_def
 	const SCGB_BATTLE_GRAYSCALE
 	const SCGB_BATTLE_COLORS
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm
index 445f0d815..4c3b23fc9 100644
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -19,3 +19,6 @@ HP_BAR_LENGTH EQU 6 ; tiles
 HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels
 EXP_BAR_LENGTH EQU 8 ; tiles
 EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels
+
+
+PALPACKET_LENGTH EQU $10
diff --git a/tilesets/bg.pal b/data/palettes/bg.pal
index 3cd14d142..3cd14d142 100644
--- a/tilesets/bg.pal
+++ b/data/palettes/bg.pal
diff --git a/tilesets/ob.pal b/data/palettes/ob.pal
index a6e20d7f0..a6e20d7f0 100644
--- a/tilesets/ob.pal
+++ b/data/palettes/ob.pal
diff --git a/tilesets/roof.pal b/data/palettes/roof.pal
index ba65fc7d2..ba65fc7d2 100644
--- a/tilesets/roof.pal
+++ b/data/palettes/roof.pal
diff --git a/engine/breeding/egg.asm b/engine/breeding.asm
index b402f99f1..b402f99f1 100755
--- a/engine/breeding/egg.asm
+++ b/engine/breeding.asm
diff --git a/predef/cgb.asm b/engine/cgb_layouts.asm
index 7ede2768f..7ede2768f 100644
--- a/predef/cgb.asm
+++ b/engine/cgb_layouts.asm
diff --git a/engine/color.asm b/engine/color.asm
index add8c24ac..e339b30be 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1,5 +1,4 @@
-PALPACKET_LENGTH EQU $10
-INCLUDE "predef/sgb.asm"
+INCLUDE "engine/sgb_layouts.asm"
 
 SHINY_ATK_BIT EQU 5
 SHINY_DEF_VAL EQU 10
@@ -500,7 +499,7 @@ LoadMailPalettes:
 	RGB 00, 21, 00
 	RGB 00, 00, 00
 
-INCLUDE "predef/cgb.asm"
+INCLUDE "engine/cgb_layouts.asm"
 
 Function95f0:
 ; XXX
@@ -2027,13 +2026,13 @@ Palette_b311: ; b311 not mobile
 	RGB 00, 00, 00
 
 TilesetBGPalette:
-INCLUDE "tilesets/bg.pal"
+INCLUDE "data/palettes/bg.pal"
 
 MapObjectPals::
-INCLUDE "tilesets/ob.pal"
+INCLUDE "data/palettes/ob.pal"
 
 RoofPals:
-INCLUDE "tilesets/roof.pal"
+INCLUDE "data/palettes/roof.pal"
 
 DiplomaPalettes:
 	RGB 27, 31, 27
diff --git a/predef/crystal.asm b/engine/crystal_colors.asm
index 9aa0fbdf2..125fee8bc 100755
--- a/predef/crystal.asm
+++ b/engine/crystal_colors.asm
@@ -295,7 +295,7 @@ LoadPokeComPalette: ; 494f2
 ; 49501
 
 PokeComPalette: ; 49501
-INCLUDE "tilesets/pokecom.pal"
+INCLUDE "tilesets/pokecom_center.pal"
 ; 49541
 
 LoadBattleTowerPalette: ; 49541
@@ -334,7 +334,7 @@ LoadHousePalette: ; 495df
 ; 495ee
 
 HousePalette: ; 495ee
-INCLUDE "tilesets/house.pal"
+INCLUDE "tilesets/house_1.pal"
 ; 4962e
 
 LoadRadioTowerPalette: ; 4962e
diff --git a/engine/link.asm b/engine/link.asm
index 7bca8b891..5be841394 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -2034,7 +2034,7 @@ Function28f09: ; 28f09
 	ret
 ; 28f24
 
-INCLUDE "engine/trade/animation.asm"
+INCLUDE "engine/trade_animation.asm"
 
 Special_CheckTimeCapsuleCompatibility: ; 29bfb
 ; Checks to see if your Party is compatible with the generation 1 games.  Returns the following in ScriptVar:
diff --git a/engine/printer.asm b/engine/printer.asm
index 7dd2d4f4a..777ea9269 100755
--- a/engine/printer.asm
+++ b/engine/printer.asm
@@ -1,4 +1,4 @@
-INCLUDE "engine/printer/serial.asm"
+INCLUDE "engine/printer_serial.asm"
 
 SendScreenToPrinter: ; 843f0
 .loop
diff --git a/engine/printer/serial.asm b/engine/printer_serial.asm
index 6909a38b2..6909a38b2 100755
--- a/engine/printer/serial.asm
+++ b/engine/printer_serial.asm
diff --git a/predef/sgb.asm b/engine/sgb_layouts.asm
index dc174e86f..dc174e86f 100644
--- a/predef/sgb.asm
+++ b/engine/sgb_layouts.asm
diff --git a/engine/time_capsule/conversion.asm b/engine/time_capsule.asm
index eb8896355..eb8896355 100755
--- a/engine/time_capsule/conversion.asm
+++ b/engine/time_capsule.asm
diff --git a/engine/trade/animation.asm b/engine/trade_animation.asm
index 7100bd558..7100bd558 100755
--- a/engine/trade/animation.asm
+++ b/engine/trade_animation.asm
diff --git a/macros.asm b/macros.asm
index f0dc01fbe..48c2ceca4 100644
--- a/macros.asm
+++ b/macros.asm
@@ -22,5 +22,5 @@ INCLUDE "macros/scripts/gfx_anim.asm"
 
 percent EQUS "* $ff / 100"
 
-tiles EQUS "* $10"
-tile  EQUS "+ $10 *"
+tiles EQUS "* LEN_2BPP_TILE"
+tile  EQUS "+ LEN_2BPP_TILE *"
diff --git a/main.asm b/main.asm
index 3deb21334..5049540d8 100644
--- a/main.asm
+++ b/main.asm
@@ -612,7 +612,7 @@ INCLUDE "data/items/marts.asm"
 INCLUDE "event/mom.asm"
 INCLUDE "event/daycare.asm"
 INCLUDE "event/photo.asm"
-INCLUDE "engine/breeding/egg.asm"
+INCLUDE "engine/breeding.asm"
 
 
 INCLUDE "tilesets/data.asm"
@@ -1771,7 +1771,7 @@ CheckCanLearnMoveTutorMove: ; 492b9
 	db 12, 00 ; start coords
 	db 17, 19 ; end coords
 
-INCLUDE "predef/crystal.asm"
+INCLUDE "engine/crystal_colors.asm"
 
 Unknown_4985a: ; unreferenced
 	db $ab, $03, $57, $24, $ac, $0e, $13, $32
@@ -5073,7 +5073,7 @@ INCLUDE "engine/crystal_intro.asm"
 SECTION "bank3E", ROMX
 
 INCLUDE "gfx/font.asm"
-INCLUDE "engine/time_capsule/conversion.asm"
+INCLUDE "engine/time_capsule.asm"
 INCLUDE "engine/unowndex.asm"
 INCLUDE "event/magikarp.asm"
 INCLUDE "battle/hidden_power.asm"
diff --git a/tilesets/house.pal b/tilesets/house_1.pal
index a9f8b74b6..a9f8b74b6 100644
--- a/tilesets/house.pal
+++ b/tilesets/house_1.pal
diff --git a/tilesets/pokecom.pal b/tilesets/pokecom_center.pal
index 9fe7b765a..9fe7b765a 100644
--- a/tilesets/pokecom.pal
+++ b/tilesets/pokecom_center.pal