From 3c953efcba01422102b00f4ee2c861f611a2e84d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 1 Jan 2018 18:33:42 -0500 Subject: Consistent *_palette_map.asm --- data/palettes/town_map.asm | 34 ---------------------------------- data/palettes/town_map_palette_map.asm | 34 ++++++++++++++++++++++++++++++++++ engine/pokegear.asm | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 data/palettes/town_map.asm create mode 100644 data/palettes/town_map_palette_map.asm diff --git a/data/palettes/town_map.asm b/data/palettes/town_map.asm deleted file mode 100644 index 36f2b6391..000000000 --- a/data/palettes/town_map.asm +++ /dev/null @@ -1,34 +0,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 diff --git a/data/palettes/town_map_palette_map.asm b/data/palettes/town_map_palette_map.asm new file mode 100644 index 000000000..36f2b6391 --- /dev/null +++ b/data/palettes/town_map_palette_map.asm @@ -0,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 diff --git a/engine/pokegear.asm b/engine/pokegear.asm index dba071b28..93ee5a79f 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -2834,7 +2834,7 @@ TownMapPals: ; 91f13 ret .PalMap: -INCLUDE "data/palettes/town_map.asm" +INCLUDE "data/palettes/town_map_palette_map.asm" ; 91f7b TownMapMon: ; 91f7b -- cgit v1.2.3