summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-01-23 17:39:09 -0500
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-01-23 17:39:09 -0500
commita1951cefc09035e11077a433b28ec8c66b3b03db (patch)
tree4de98db5a6edb6d74192028d50893da2b764421f /data/maps
parent79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff)
Prefix wram labels with w, part 2.
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/data.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/data.asm b/data/maps/data.asm
index 0cdfb0826..6344f0572 100644
--- a/data/maps/data.asm
+++ b/data/maps/data.asm
@@ -24,12 +24,12 @@ if "\1" == "north"
;\7: this map id
map \2
dw \3_Blocks + \2_WIDTH * (\2_HEIGHT - 3) + \5
- dw OverworldMap + \4 + 3
+ dw wOverworldMap + \4 + 3
db \6
db \2_WIDTH
db \2_HEIGHT * 2 - 1
db (\4 - \5) * -2
- dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1
+ dw wOverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1
endc
if "\1" == "south"
@@ -41,12 +41,12 @@ if "\1" == "south"
;\7: this map id
map \2
dw \3_Blocks + \5
- dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3
+ dw wOverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3
db \6
db \2_WIDTH
db 0
db (\4 - \5) * -2
- dw OverworldMap + \2_WIDTH + 7
+ dw wOverworldMap + \2_WIDTH + 7
endc
if "\1" == "west"
@@ -58,12 +58,12 @@ if "\1" == "west"
;\7: this map id
map \2
dw \3_Blocks + (\2_WIDTH * \5) + \2_WIDTH - 3
- dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3)
+ dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3)
db \6
db \2_WIDTH
db (\4 - \5) * -2
db \2_WIDTH * 2 - 1
- dw OverworldMap + \2_WIDTH * 2 + 6
+ dw wOverworldMap + \2_WIDTH * 2 + 6
endc
if "\1" == "east"
@@ -75,12 +75,12 @@ if "\1" == "east"
;\7: this map id
map \2
dw \3_Blocks + (\2_WIDTH * \5)
- dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3
+ dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3
db \6
db \2_WIDTH
db (\4 - \5) * -2
db 0
- dw OverworldMap + \2_WIDTH + 7
+ dw wOverworldMap + \2_WIDTH + 7
endc
ENDM