From 401aa383e2972049210046c0bfd60171f707ae28 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 14 Jun 2020 21:52:33 -0400
Subject: [PATCH] make DEBUG=1 logs all symbols in the .map and .sym files

---
 .gitignore                     |  7 ++++---
 Makefile                       |  5 +++++
 engine/overworld/scripting.asm |  4 ++--
 maps/PlayersHouse1F.asm        | 32 ++++++++++++++++----------------
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f7b9a932..faa96ee16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,11 +42,12 @@ used_space.png
 # osx files
 .DS_STORE
 
-*.dimensions
-*.gbcpal
-*.2bpp
+# compiled graphics
 *.1bpp
+*.2bpp
 *.lz
+*.gbcpal
+*.dimensions
 *.animated.tilemap
 *.sgb.tilemap
 gfx/pokemon/*/bitmask.asm
diff --git a/Makefile b/Makefile
index 0c6b1e426..d130725a8 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,11 @@ tools:
 
 
 RGBASMFLAGS = -L -Weverything
+# Create a sym/map for debug purposes if `make` run with `DEBUG=1`
+ifeq ($(DEBUG),1)
+RGBASMFLAGS += -E
+endif
+
 $(crystal_obj):    RGBASMFLAGS +=
 $(crystal11_obj):  RGBASMFLAGS += -D _CRYSTAL11
 $(crystal_au_obj): RGBASMFLAGS += -D _CRYSTAL11 -D _CRYSTAL_AU
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index bd74cfc40..8e35b3b45 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -516,7 +516,7 @@ ret_96f76:
 
 GiveItemScript:
 	callasm ret_96f76
-	writetext ReceivedItemText
+	writetext .ReceivedItemText
 	iffalse .Full
 	waitsfx
 	specialsound
@@ -529,7 +529,7 @@ GiveItemScript:
 	pocketisfull
 	end
 
-ReceivedItemText:
+.ReceivedItemText:
 	text_far _ReceivedItemText
 	text_end
 
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index de60497a2..1e8f5e1c9 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -182,17 +182,17 @@ NeighborScript:
 	turnobject PLAYERSHOUSE1F_POKEFAN_F, RIGHT
 	end
 
-TVScript:
-	jumptext TVText
+PlayersHouse1FTVScript:
+	jumptext PlayersHouse1FTVText
 
-StoveScript:
-	jumptext StoveText
+PlayersHouse1FStoveScript:
+	jumptext PlayersHouse1FStoveText
 
-SinkScript:
-	jumptext SinkText
+PlayersHouse1FSinkScript:
+	jumptext PlayersHouse1FSinkText
 
-FridgeScript:
-	jumptext FridgeText
+PlayersHouse1FFridgeScript:
+	jumptext PlayersHouse1FFridgeText
 
 MomTurnsTowardPlayerMovement:
 	turn_head RIGHT
@@ -351,20 +351,20 @@ NeighborText:
 	line "#MON!"
 	done
 
-StoveText:
+PlayersHouse1FStoveText:
 	text "Mom's specialty!"
 
 	para "CINNABAR VOLCANO"
 	line "BURGER!"
 	done
 
-SinkText:
+PlayersHouse1FSinkText:
 	text "The sink is spot-"
 	line "less. Mom likes it"
 	cont "clean."
 	done
 
-FridgeText:
+PlayersHouse1FFridgeText:
 	text "Let's see what's"
 	line "in the fridge…"
 
@@ -372,7 +372,7 @@ FridgeText:
 	line "tasty LEMONADE!"
 	done
 
-TVText:
+PlayersHouse1FTVText:
 	text "There's a movie on"
 	line "TV: Stars dot the"
 
@@ -396,10 +396,10 @@ PlayersHouse1F_MapEvents:
 	coord_event  9,  4, SCENE_DEFAULT, MeetMomRightScript
 
 	db 4 ; bg events
-	bg_event  0,  1, BGEVENT_READ, StoveScript
-	bg_event  1,  1, BGEVENT_READ, SinkScript
-	bg_event  2,  1, BGEVENT_READ, FridgeScript
-	bg_event  4,  1, BGEVENT_READ, TVScript
+	bg_event  0,  1, BGEVENT_READ, PlayersHouse1FStoveScript
+	bg_event  1,  1, BGEVENT_READ, PlayersHouse1FSinkScript
+	bg_event  2,  1, BGEVENT_READ, PlayersHouse1FFridgeScript
+	bg_event  4,  1, BGEVENT_READ, PlayersHouse1FTVScript
 
 	db 5 ; object events
 	object_event  7,  4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_1