From f4ce13c0ffff06199c55c6ba025ddb1fa387fa6b Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 3 Jul 2018 17:58:20 -0400
Subject: Fix Makefile and clean up pokegold-spaceworld.link a bit.

---
 .gitignore               |  1 +
 Makefile                 | 12 ++++++------
 pokegold-spaceworld.link | 21 ---------------------
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index b8e03c9..f68af74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ tools/gfx
 coverage.png
 coverage.log
 temp/
+pokegold-spaceworld-gen.link
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 129ea09..da03ebf 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,12 @@ RGBGFX := rgbgfx
 RGBLINK := rgblink
 RGBFIX := rgbfix
 sort_sym := tools/sort_symfile.sh
-#sort_sym := $(PYTHON3) tools/sort_sym.py
 
 RGBASMFLAGS := -h -E -i $(BUILD)/ -DGOLD -DDEBUG=1
 tools/gfx :=
 
-ROMNAME := pokegold-spaceworld
-ROM := $(ROMNAME).gb
+ROM := pokegold-spaceworld.gb
+LINKERSCRIPT := pokegold-spaceworld-gen.link
 BASEROM := baserom.gb
 SHIM := shim.sym
 CORRECTEDROM := $(ROM:%.gb=%-correctheader.gb)
@@ -56,9 +55,10 @@ coverage: $(ROM:.gb=.map) tools/disasm_coverage.py
 	$(PYTHON) tools/disasm_coverage.py -m $< -b 0x40
 
 .PHONY: linkerscript
-linkerscript: $(ROMNAME)-gen.link
+linkerscript: $(ROM:.gb=-gen.link)
 
-%.link: %.map tools/map2link.py
+# TODO FIX HARDCODE
+%.link: pokegold-spaceworld.map tools/map2link.py
 	$(PYTHON3) tools/map2link.py $< $@
 
 %.map: %.gb
@@ -69,7 +69,7 @@ $(CORRECTEDROM): %-correctheader.gb: %.gb
 	$(RGBFIX) -f hg -m 0x10 $@
 
 $(ROM): poke%-spaceworld.gb: $(OBJS) | $(BASEROM)
-	$(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -l $(ROMNAME).link -O $(BASEROM) -o $@ $^
+	$(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -l $(@:.gb=.link) -O $(BASEROM) -o $@ $^
 	$(RGBFIX) -f lh -k 01 -l 0x33 -m 0x03 -p 0 -r 3 -t "POKEMON2$(shell echo $* | cut -d _ -f 1 | tr '[:lower:]' '[:upper:]')" $@
 	$(sort_sym) $(@:.gb=.sym)
 
diff --git a/pokegold-spaceworld.link b/pokegold-spaceworld.link
index 0bface0..8b0d1bc 100644
--- a/pokegold-spaceworld.link
+++ b/pokegold-spaceworld.link
@@ -2,40 +2,28 @@
 ROM0
 	org $0000
 	"home/rst.asm@rst00"
-	; $0001
 	org $0008
 	"home/rst.asm@rst08"
-	; $0009
 	org $0010
 	"home/rst.asm@rst10"
-	; $0011
 	org $0018
 	"home/rst.asm@rst18"
-	; $0019
 	org $0020
 	"home/rst.asm@rst20"
-	; $0021
 	org $0028
 	"home/rst.asm@rst28"
-	; $0029
 	org $0030
 	"home/rst.asm@rst30"
-	; $0031
 	org $0038
 	"home/rst.asm@rst38"
-	; $003b
 	org $0040
 	"home/interrupts.asm@VBlank interrupt vector"
-	; $0043
 	org $0048
 	"home/interrupts.asm@LCD interrupt vector"
-	; $004b
 	org $0050
 	"home/interrupts.asm@Timer interrupt vector"
-	; $0053
 	org $0058
 	"home/interrupts.asm@Serial interrupt vector"
-	; $005b
 	org $0060
 	"home/interrupts.asm@Joypad interrupt vector"
 	; $0063
@@ -136,7 +124,6 @@ ROMX $01
 	org $7894
 	"engine/overworld/object_collision.asm@_CheckPlayerObjectCollision"
 ROMX $02
-	org $4000
 	org $4000
 	org $44bf
 	"gfx.asm@Bank 2 Misc GFX"
@@ -293,7 +280,6 @@ ROMX $0f
 	org $6a3c
 	"data/wild.asm"
 ROMX $10
-	org $4000
 	org $4000
 	org $4943
 	"data/pokemon/dex_order_alpha.asm"
@@ -330,7 +316,6 @@ ROMX $13
 	org $6900
 	"gfx.asm@Bank 13 Tilesets 1a"
 ROMX $14
-	org $4000
 	org $4000
 	org $40dd
 	"data/types/names.asm"
@@ -378,7 +363,6 @@ ROMX $21
 	org $4000
 	"gfx.asm@Attack Animation GFX"
 ROMX $23
-	org $4000
 	org $4000
 	org $433e
 	"engine/palettes.asm@Overworld fade"
@@ -388,7 +372,6 @@ ROMX $23
 	org $60cc
 	"gfx.asm@Pokemon Party Sprites"
 ROMX $24
-	org $4000
 	org $4000
 	org $4fdb
 	"gfx.asm@Slot Machine GFX"
@@ -766,7 +749,6 @@ ROMX $32
 	; $4cfe
 ROMX $33
 	org $4000
-	org $4000
 ROMX $34
 	org $4000
 	"data/maps/attributes.asm@RouteSilentEastGate"
@@ -785,7 +767,6 @@ ROMX $34
 	org $605d
 	"data/maps/attributes.asm@Unused13"
 ROMX $36
-	org $4000
 	org $4000
 	org $4014
 	"data/maps/attributes.asm@SilentHill"
@@ -882,7 +863,6 @@ ROMX $37
 	org $6b00
 	"gfx.asm@Bank 37 Tilesets 18"
 ROMX $38
-	org $4000
 	org $4000
 	org $5403
 	"gfx.asm@Poker GFX"
@@ -896,7 +876,6 @@ ROMX $38
 	org $75b7
 	"gfx.asm@Picross GFX"
 ROMX $39
-	org $4000
 	org $4000
 	org $41ff
 	"gfx.asm@Gamefreak Logo GFX"
-- 
cgit v1.2.3