diff --git a/constants.asm b/constants.asm
index 84d93f9dd..817268e9f 100644
--- a/constants.asm
+++ b/constants.asm
@@ -6,6 +6,9 @@ else
 VERSION EQU 1
 endc
 
+INCLUDE "gbhw.asm"
+INCLUDE "hram.asm"
+
 INCLUDE "constants/pokemon_constants.asm"
 INCLUDE "constants/move_constants.asm"
 INCLUDE "constants/battle_constants.asm"
diff --git a/pokecrystal.asm b/pokecrystal.asm
index 0155e0ca9..f64d44e76 100644
--- a/pokecrystal.asm
+++ b/pokecrystal.asm
@@ -1,5 +1,3 @@
 INCLUDE "wram.asm"
 INCLUDE "constants.asm"
-INCLUDE "gbhw.asm"
-INCLUDE "hram.asm"
-INCLUDE "main.tx"
+INCLUDE "main.asm"