From fa65a2b0b27abbbb9958352ed73e16fefd85ba38 Mon Sep 17 00:00:00 2001
From: tA <s@p7.co.nz>
Date: Mon, 25 May 2020 17:10:59 +1200
Subject: [PATCH] cleaned up header

---
 Makefile       | 11 ++++++++++-
 src/entry.asm  |  3 ++-
 src/header.asm | 43 ++++---------------------------------------
 src/misc.asm   |  3 +--
 4 files changed, 17 insertions(+), 43 deletions(-)

diff --git a/Makefile b/Makefile
index b49a37a..443de8f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,16 @@ ROM_OUTPUT=${BUILD}/${NAME}.gb
 OBJECT_OUTPUT=${BUILD}/${NAME}.o
 SYMFILE_OUTPUT=${BUILD}/${NAME}.sym
 
+LICENSEE="tA"
+OLDLIC="0x33"
+MBC="0x00"
+VERSION="0"
+PAD="0xFF"
+RAM="0x00"
+
+PP_FLAGS=-c -f lhg -j -t ${NAME} -k ${LICENSEE} -l ${OLDLIC} -m ${MBC} -n ${VERSION} -p ${PAD} -r ${RAM}
+
 all : ${ENTRY}
 	${ASSEMBLER} -o ${OBJECT_OUTPUT} ${ENTRY} \
 		&& ${LINKER} -o ${ROM_OUTPUT} -n ${SYMFILE_OUTPUT} ${OBJECT_OUTPUT} \
-		&& ${POSTPROC} -v -p 0 ${ROM_OUTPUT}
+		&& ${POSTPROC} -v ${PP_FLAGS} ${ROM_OUTPUT}
diff --git a/src/entry.asm b/src/entry.asm
index 5be7906..01cf543 100644
--- a/src/entry.asm
+++ b/src/entry.asm
@@ -6,9 +6,9 @@ INCLUDE "src/actor.asm"
 
 SECTION "Program Start", ROM0[$150]
 Start:
-   ei
    ld a, IEF_VBLANK
    ld [rIE], a
+   ei
    xor a
    ld [hVBlankFlag], a
    call Wait_VBlank
@@ -21,6 +21,7 @@ Start:
    ld a, %11100100
    ld [rBGP], a
    ld [rOBP0], a
+   ld [rOBP1], a
    xor a
    ld [rSCY], a
    ld [rSCX], a
diff --git a/src/header.asm b/src/header.asm
index 1ee56d4..fc3680a 100644
--- a/src/header.asm
+++ b/src/header.asm
@@ -2,44 +2,9 @@
 ; Gameboy Header
 ;-----------------
 
-SECTION "Header", ROM0[$100]
-
-; Jump to the "Start" label
-; which we must define ourselves
-
-EntryPoint:
-  nop
+SECTION "Entry", ROM0[$100]
+  di
   jp Start;
 
-; ROM Header $104 to $150
-RomHeader:
-; Nintendo Logo $104-$133
-  db $CE,$ED,$66,$66,$CC,$0D,$00,$0B,$03,$73,$00,$83,$00,$0C,$00,$0D
-  db $00,$08,$11,$1F,$88,$89,$00,$0E,$DC,$CC,$6E,$E6,$DD,$DD,$D9,$99
-  db $BB,$BB,$67,$63,$6E,$0E,$EC,$CC,$DD,$DC,$99,$9F,$BB,$B9,$33,$3E
-; Title (11 characters) $134-$13E
-  db "ANIMATION",$00,$00
-; Manufacturer Code (4 characters) $13F-$142
-  db "LATA"
-; CGB Flag $143
-  db $00
-; Licensee Code (2 characters) $144-$145
-  db "00"
-; SGB Flag $146
-  db $00
-; Cartridge Type $147
-  db $00
-; ROM Size $148
-  db $00
-; RAM Size $149
-  db $00
-; Destination Code $14A
-  db $01
-; Depreciated Licensee Code $14B
-  db $33
-; Version Number $14C
-  db $00
-; Header Checksum $14D
-  db $00
-; Global Checksum $14E-$14F
-  db $00, $00
+  ; Reserve space for header
+  ds $150 - @, 0
diff --git a/src/misc.asm b/src/misc.asm
index e2c3a1b..0911276 100644
--- a/src/misc.asm
+++ b/src/misc.asm
@@ -49,7 +49,7 @@ Clear_OAM:
 
 Hide_OAM:
    ld hl, wShadowOAM
-   ld c, wShadowOAMEnd - wShadowOAM
+   ld c, (wShadowOAMEnd - wShadowOAM) / 4
 .loop:
    xor a
    ld [hl], a
@@ -91,4 +91,3 @@ Load_Map:
    call MemCpy
    ret
 
-