ref: 3c953efcba01422102b00f4ee2c861f611a2e84d
parent: 0722de77ae57ed6832b9a725ddc14511668f79c5
author: Remy Oukaour <[email protected]>
date: Mon Jan 1 13:33:42 EST 2018
Consistent *_palette_map.asm
--- a/data/palettes/town_map.asm
+++ /dev/null
@@ -1,34 +1,0 @@
- const_def
- const PAL_TOWNMAP_BORDER ; 0
- const PAL_TOWNMAP_EARTH ; 1
- const PAL_TOWNMAP_MOUNTAIN ; 2
- const PAL_TOWNMAP_CITY ; 3
- const PAL_TOWNMAP_POI ; 4
- const PAL_TOWNMAP_POI_MTN ; 5
-
-townmappals: MACRO
-rept _NARG / 2
- dn PAL_TOWNMAP_\2, PAL_TOWNMAP_\1
- shift
- shift
-endr
-ENDM
-
-; gfx/pokegear/town_map.png
- townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN
- townmappals BORDER, BORDER, EARTH, EARTH, CITY, EARTH
- townmappals POI, POI_MTN, POI, POI_MTN, EARTH, EARTH
- townmappals EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN, BORDER, BORDER
- townmappals EARTH, EARTH, BORDER, EARTH, EARTH, BORDER
- townmappals BORDER, BORDER, EARTH, EARTH, EARTH, MOUNTAIN
- townmappals MOUNTAIN, MOUNTAIN, BORDER, BORDER, BORDER, BORDER
- townmappals BORDER, BORDER, BORDER, BORDER, BORDER, BORDER
-; gfx/pokegear/pokegear.png
- townmappals BORDER, BORDER, BORDER, BORDER, POI, POI
- townmappals POI, BORDER, BORDER, BORDER, BORDER, BORDER
- townmappals BORDER, BORDER, BORDER, BORDER, CITY, CITY
- townmappals CITY, CITY, CITY, CITY, CITY, CITY
- townmappals CITY, CITY, CITY, CITY, CITY, CITY
- townmappals CITY, BORDER, CITY, CITY, CITY, CITY
- townmappals CITY, CITY, CITY, CITY, BORDER, BORDER
- townmappals BORDER, BORDER, BORDER, BORDER, BORDER, BORDER
--- /dev/null
+++ b/data/palettes/town_map_palette_map.asm
@@ -1,0 +1,34 @@
+ const_def
+ const PAL_TOWNMAP_BORDER ; 0
+ const PAL_TOWNMAP_EARTH ; 1
+ const PAL_TOWNMAP_MOUNTAIN ; 2
+ const PAL_TOWNMAP_CITY ; 3
+ const PAL_TOWNMAP_POI ; 4
+ const PAL_TOWNMAP_POI_MTN ; 5
+
+townmappals: MACRO
+rept _NARG / 2
+ dn PAL_TOWNMAP_\2, PAL_TOWNMAP_\1
+ shift
+ shift
+endr
+ENDM
+
+; gfx/pokegear/town_map.png
+ townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN
+ townmappals BORDER, BORDER, EARTH, EARTH, CITY, EARTH
+ townmappals POI, POI_MTN, POI, POI_MTN, EARTH, EARTH
+ townmappals EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN, BORDER, BORDER
+ townmappals EARTH, EARTH, BORDER, EARTH, EARTH, BORDER
+ townmappals BORDER, BORDER, EARTH, EARTH, EARTH, MOUNTAIN
+ townmappals MOUNTAIN, MOUNTAIN, BORDER, BORDER, BORDER, BORDER
+ townmappals BORDER, BORDER, BORDER, BORDER, BORDER, BORDER
+; gfx/pokegear/pokegear.png
+ townmappals BORDER, BORDER, BORDER, BORDER, POI, POI
+ townmappals POI, BORDER, BORDER, BORDER, BORDER, BORDER
+ townmappals BORDER, BORDER, BORDER, BORDER, CITY, CITY
+ townmappals CITY, CITY, CITY, CITY, CITY, CITY
+ townmappals CITY, CITY, CITY, CITY, CITY, CITY
+ townmappals CITY, BORDER, CITY, CITY, CITY, CITY
+ townmappals CITY, CITY, CITY, CITY, BORDER, BORDER
+ townmappals BORDER, BORDER, BORDER, BORDER, BORDER, BORDER
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -2834,7 +2834,7 @@
ret
.PalMap:
-INCLUDE "data/palettes/town_map.asm"
+INCLUDE "data/palettes/town_map_palette_map.asm"
; 91f7b
TownMapMon: ; 91f7b