diff --git a/Makefile b/Makefile
index cd72ccde2..441675cdd 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ pokecrystal.o: pokecrystal.asm main.tx constants.asm wram.asm ${TEXTFILES}
 
 pokecrystal.gbc: pokecrystal.o
 	rgblink -o $@ $<
+	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
 	cmp baserom.gbc $@
 
 clean:
diff --git a/main.asm b/main.asm
index cbd87e4c0..8c1b7b8ba 100644
--- a/main.asm
+++ b/main.asm
@@ -1,6 +1,14 @@
 SECTION "bank0",HOME
 
-INCBIN "baserom.gbc",$00,$52f - $00
+INCBIN "baserom.gbc",0,$100
+
+SECTION "romheader",HOME[$100]
+	nop
+	jp $016e
+
+SECTION "start",HOME[$150]
+
+INCBIN "baserom.gbc",$150,$52f - $150
 
 IncGradGBPalTable_01: ; 0x52f
     db %11111111 ;BG Pal