summaryrefslogtreecommitdiff
path: root/data/palettes
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-28 20:56:21 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-28 20:56:21 -0500
commit4c35f3ac8506e5f326658bbab91c257584f7b716 (patch)
tree980025fbbc41e001e260a65ed7c035dd6073e864 /data/palettes
parentbb005694b31b6a8cbaeefa8751ea72117e904e02 (diff)
parent82a05a1752b476caab8951fe03f539dcc1a63669 (diff)
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts: # macros/scripts/maps.asm
Diffstat (limited to 'data/palettes')
-rw-r--r--data/palettes/town_map.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/palettes/town_map.asm b/data/palettes/town_map.asm
index 49fb7a9ce..696863e85 100644
--- a/data/palettes/town_map.asm
+++ b/data/palettes/town_map.asm
@@ -6,13 +6,13 @@
const PAL_TOWNMAP_POI ; 4
const PAL_TOWNMAP_POI_MTN ; 5
-townmappals: macro
+townmappals: MACRO
rept _NARG / 2
dn PAL_TOWNMAP_\2, PAL_TOWNMAP_\1
shift
shift
endr
-endm
+ENDM
; gfx/pokegear/town_map.png
townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN