diff --git a/Makefile b/Makefile
index 9637d98a8..4e504aecb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,11 @@ include $(DEVKITARM)/base_tools
 export CPP := $(PREFIX)cpp
 export LD := $(PREFIX)ld
 
+TITLE       := POKEMON EMER
+GAME_CODE   := BPEE
+MAKER_CODE  := 01
+REVISION    := 0
+
 SHELL := /bin/bash -o pipefail
 
 ROM := pokeemerald.gba
@@ -165,5 +170,6 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
 	cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
 
 $(ROM): $(ELF)
-	$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
+	$(OBJCOPY) -O binary $< $@
+	gbafix $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION)
 
diff --git a/asm/rom_header.inc b/asm/rom_header.inc
index 1cef6393c..6730efae2 100644
--- a/asm/rom_header.inc
+++ b/asm/rom_header.inc
@@ -1,38 +1,19 @@
 	.global RomHeaderNintendoLogo
 RomHeaderNintendoLogo:
-	.byte 0x24,0xff,0xae,0x51,0x69,0x9a,0xa2,0x21
-	.byte 0x3d,0x84,0x82,0x0a,0x84,0xe4,0x09,0xad
-	.byte 0x11,0x24,0x8b,0x98,0xc0,0x81,0x7f,0x21
-	.byte 0xa3,0x52,0xbe,0x19,0x93,0x09,0xce,0x20
-	.byte 0x10,0x46,0x4a,0x4a,0xf8,0x27,0x31,0xec
-	.byte 0x58,0xc7,0xe8,0x33,0x82,0xe3,0xce,0xbf
-	.byte 0x85,0xf4,0xdf,0x94,0xce,0x4b,0x09,0xc1
-	.byte 0x94,0x56,0x8a,0xc0,0x13,0x72,0xa7,0xfc
-	.byte 0x9f,0x84,0x4d,0x73,0xa3,0xca,0x9a,0x61
-	.byte 0x58,0x97,0xa3,0x27,0xfc,0x03,0x98,0x76
-	.byte 0x23,0x1d,0xc7,0x61,0x03,0x04,0xae,0x56
-	.byte 0xbf,0x38,0x84,0x00,0x40,0xa7,0x0e,0xfd
-	.byte 0xff,0x52,0xfe,0x03,0x6f,0x95,0x30,0xf1
-	.byte 0x97,0xfb,0xc0,0x85,0x60,0xd6,0x80,0x25
-	.byte 0xa9,0x63,0xbe,0x03,0x01,0x4e,0x38,0xe2
-	.byte 0xf9,0xa2,0x34,0xff,0xbb,0x3e,0x03,0x44
-	.byte 0x78,0x00,0x90,0xcb,0x88,0x11,0x3a,0x94
-	.byte 0x65,0xc0,0x7c,0x63,0x87,0xf0,0x3c,0xaf
-	.byte 0xd6,0x25,0xe4,0x8b,0x38,0x0a,0xac,0x72
-	.byte 0x21,0xd4,0xf8,0x07
+	.space 156
 
 RomHeaderGameTitle:
-	.ascii "POKEMON EMER"
+	.space 12
 
 	.global RomHeaderGameCode
 RomHeaderGameCode:
-	.ascii "BPEE"
+	.space 4
 
 RomHeaderMakerCode:
-	.ascii "01"
+	.space 2
 
 RomHeaderMagic:
-	.byte 0x96
+	.byte 0
 
 RomHeaderMainUnitCode:
 	.byte 0
@@ -41,18 +22,14 @@ RomHeaderDeviceType:
 	.byte 0
 
 RomHeaderReserved1:
-	.rept 7
-	.byte 0
-	.endr
+	.space 7
 
 	.global RomHeaderSoftwareVersion
 RomHeaderSoftwareVersion:
 	.byte 0
 
 RomHeaderChecksum:
-	.byte 0x72
+	.byte 0
 
 RomHeaderReserved2:
-	.rept 2
-	.byte 0
-	.endr
+	.space 2