From 412d3c7a920659615af70097f942e7ffe6d95a21 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 27 Jun 2020 18:05:51 -0400
Subject: Create .map files, and don't sort .sym files since rgbds 0.4.0 does
 that

---
 .gitignore | 1 +
 Makefile   | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e2a884db..dd1b5a9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 *.gb
 
 # rgbds extras
+*.map
 *.sym
 
 # converted image data
diff --git a/Makefile b/Makefile
index 20462319..06cbcd7a 100644
--- a/Makefile
+++ b/Makefile
@@ -43,12 +43,12 @@ compare: $(roms)
 	@$(MD5) roms.md5
 
 clean:
-	rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym)
+	rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
 	find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} +
 	$(MAKE) clean -C tools/
 
 tidy:
-	rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym)
+	rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
 	$(MAKE) clean -C tools/
 
 tools:
@@ -76,9 +76,8 @@ pokered_opt  = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED"
 pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE"
 
 %.gbc: $$(%_obj)
-	$(RGBLINK) -d -n $*.sym -l layout.link -o $@ $^
+	$(RGBLINK) -d -m $*.map -n $*.sym -l layout.link -o $@ $^
 	$(RGBFIX) $($*_opt) $@
-	sort $*.sym -o $*.sym
 
 
 ### Misc file-specific graphics rules
-- 
cgit v1.2.3