Enable -E option of rgbasm

This option makes rgbasm export the name of all labels, not only the one of global labels. This makes debugging easier inside functions because the names are also exported to the .sym file. Renamed a few labels that had the same name in different files, rgblink complained about it.
AntonioND · Jan 3, 2017 · ebe504c · ebe504c
1 parent 404353f
commit ebe504c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -76,7 +76,7 @@ clean:
 
 %.obj : %.asm
 	@echo rgbasm $<
-	@$(RGBASM) $(INCLUDES) -o$@ $<
+	@$(RGBASM) $(INCLUDES) -E -o$@ $<
 
 $(BIN): $(OBJ)
 	@echo rgblink $(BIN)

diff --git a/source/room_minimap/minimap_pollution.asm b/source/room_minimap/minimap_pollution.asm
@@ -35,7 +35,7 @@
 
 ;-------------------------------------------------------------------------------
 
-MINIMAP_TILE_COLORS:
+MINIMAP_TILE_COLORS_POLLUTION:
     DB 0,0,0,0
     DB 0,1,1,0
     DB 1,1,1,1
@@ -86,7 +86,7 @@ MinimapDrawPollutionMap::
             rlca ; Overflow from top bits
             and     a,7 ; Reduce from 8 to 3 bits
 
-            ld      de,MINIMAP_TILE_COLORS
+            ld      de,MINIMAP_TILE_COLORS_POLLUTION
             ld      l,a
             ld      h,0
             add     hl,hl

diff --git a/source/room_minimap/minimap_population.asm b/source/room_minimap/minimap_population.asm
@@ -35,7 +35,7 @@
 
 ;-------------------------------------------------------------------------------
 
-MINIMAP_TILE_COLORS:
+MINIMAP_TILE_COLORS_POPULATION:
     DB 0,0,0,0
     DB 0,1,1,0
     DB 1,1,1,1
@@ -88,7 +88,7 @@ ENDC
             sra     a
             sra     a ; From 6 bits to 3 (63 -> 7)
 
-            ld      de,MINIMAP_TILE_COLORS
+            ld      de,MINIMAP_TILE_COLORS_POPULATION
             ld      l,a
             ld      h,0
             add     hl,hl

diff --git a/source/room_minimap/minimap_power.asm b/source/room_minimap/minimap_power.asm
@@ -153,7 +153,7 @@ MinimapDrawPowerGridMap::
 
 ;-------------------------------------------------------------------------------
 
-MINIMAP_TILE_COLORS:
+MINIMAP_TILE_COLORS_POWER:
     DB 0,0,0,0
     DB 0,1,1,0
     DB 1,1,1,1
@@ -218,7 +218,7 @@ ENDC
             inc     a ; Round up
             sra     a ; From 4 bits to 3 (15 -> 7)
 
-            ld      de,MINIMAP_TILE_COLORS
+            ld      de,MINIMAP_TILE_COLORS_POWER
             ld      l,a
             ld      h,0
             add     hl,hl

diff --git a/source/room_minimap/minimap_services.asm b/source/room_minimap/minimap_services.asm
@@ -35,7 +35,7 @@
 
 ;-------------------------------------------------------------------------------
 
-MINIMAP_TILE_COLORS: ; Common to all services
+MINIMAP_TILE_COLORS_SERVICES: ; Common to all services
     DB 0,0,0,0
     DB 0,1,1,0
     DB 1,1,1,1
@@ -69,7 +69,7 @@ MinimapServicesCommonDrawMap:
             rlca ; Overflow from top bits
             and     a,7 ; Reduce from 8 to 3 bits
 
-            ld      de,MINIMAP_TILE_COLORS
+            ld      de,MINIMAP_TILE_COLORS_SERVICES
             ld      l,a
             ld      h,0
             add     hl,hl