Fix the sections in home/header.asm

3 files changed, 15 insertions, 68 deletions

diff --git a/home/header.asm b/home/header.asm
index 92e302c8..ae77c7e4 100755
--- a/home/header.asm
+++ b/home/header.asm
@@ -1,24 +1,24 @@
 ; rst vectors (called through the rst instruction)
 
-SECTION "rst0", ROM0
+SECTION "rst0", ROM0[$0000]
 	di
 	jp Start
 
-SECTION "rst8", ROM0 ; rst FarCall
+SECTION "rst8", ROM0[$0008] ; rst FarCall
 	jp FarCall_hl
 
-SECTION "rst10", ROM0 ; rst Bankswitch
+SECTION "rst10", ROM0[$0010] ; rst Bankswitch
 	ldh [hROMBank], a
 	ld [MBC3RomBank], a
 	ret
 
-SECTION "rst18", ROM0
+SECTION "rst18", ROM0[$0018]
 	rst $38
 
-SECTION "rst20", ROM0
+SECTION "rst20", ROM0[$0020]
 	rst $38
 
-SECTION "rst28", ROM0 ; rst JumpTable
+SECTION "rst28", ROM0[$0028] ; rst JumpTable
 	push de
 	ld e, a
 	ld d, 0
@@ -26,36 +26,36 @@ SECTION "rst28", ROM0 ; rst JumpTable
 	add hl, de
 	ld a, [hli]
 	ld h, [hl]
-; SECTION "rst30", ROM0
+; SECTION "rst30", ROM0[$0030]
 	ld l, a
 	pop de
 	jp hl
 
-SECTION "rst38", ROM0
+SECTION "rst38", ROM0[$0038]
 	rst $38
 
 
 ; Game Boy hardware interrupts
 
-SECTION "vblank", ROM0
+SECTION "vblank", ROM0[$0040]
 	jp VBlank
 
-SECTION "lcd", ROM0
+SECTION "lcd", ROM0[$0048]
 	jp LCD
 
-SECTION "timer", ROM0
+SECTION "timer", ROM0[$0050]
 	reti
 
-SECTION "serial", ROM0
+SECTION "serial", ROM0[$0058]
 	jp Serial
 
-SECTION "joypad", ROM0
+SECTION "joypad", ROM0[$0060]
 	jp Joypad
 
 
 ; Game Boy cartridge header
 
-SECTION "Header", ROM0
+SECTION "Header", ROM0[$0100]
 
 Start::
 	nop
@@ -63,4 +63,4 @@ Start::
 
 ; The cartridge header data is filled in by rgbfix.
 ; This makes sure it doesn't get used.
-	ds $0150 - $0104
+	ds $0150 - @
diff --git a/home/interrupts.asm b/home/interrupts.asm
deleted file mode 100755
index c65e5061..00000000
--- a/home/interrupts.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; Game Boy hardware interrupts
-
-SECTION "vblank",ROM0
-	jp VBlank
-
-SECTION "lcd",ROM0
-	jp LCD
-
-SECTION "timer",ROM0
-	reti
-
-SECTION "serial",ROM0
-	jp Serial
-
-SECTION "joypad",ROM0
-	jp Joypad
diff --git a/home/rst.asm b/home/rst.asm
deleted file mode 100644
index 7da45ddd..00000000
--- a/home/rst.asm
+++ /dev/null
@@ -1,37 +0,0 @@
-; rst vectors
-
-SECTION "rst0",ROM0
-	di
-	jp Start
-
-SECTION "rst8",ROM0
-	jp FarCall_hl
-
-SECTION "rst10",ROM0
-	ldh [hROMBank], a
-	ld [MBC3RomBank], a
-	ret
-
-SECTION "rst18",ROM0
-	rst $38
-
-SECTION "rst20",ROM0
-	rst $38
-
-SECTION "rst28",ROM0
-	push de
-	ld e, a
-	ld d, 0
-	add hl, de
-	add hl, de
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	pop de
-	jp hl
-
-; SECTION "rst30",ROM0
-; rst30 is midst rst28
-
-SECTION "rst38",ROM0
-	rst $38