summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-03-21 14:01:05 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-03-21 14:01:05 -0400
commit6a6ba10315baf4b0092c6d952a2f0cb502b6ac8e (patch)
tree5a32545646f9214cd7674320495cc3e8c6929875 /data
parent5a5f5ececdde2c4c62bdee649d8b1d3edba96fed (diff)
rgbds supports 'X - 1' instead of 'X + -1'
Diffstat (limited to 'data')
-rw-r--r--data/maps/attributes.asm6
-rw-r--r--data/wild/roammon_maps.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index 0b49a351a..d149f59ce 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -38,7 +38,7 @@ _tgt = 0
endc
if "\1" == "north"
-_blk = \3_WIDTH * (\3_HEIGHT + -3) + _src
+_blk = \3_WIDTH * (\3_HEIGHT - 3) + _src
_map = _tgt
_win = (\3_WIDTH + 6) * \3_HEIGHT + 1
_y = \3_HEIGHT * 2 - 1
@@ -60,9 +60,9 @@ _len = \3_WIDTH
endc
elif "\1" == "west"
-_blk = (\3_WIDTH * _src) + \3_WIDTH + -3
+_blk = (\3_WIDTH * _src) + \3_WIDTH - 3
_map = (CURRENT_MAP_WIDTH + 6) * _tgt
-_win = (\3_WIDTH + 6) * 2 + -6
+_win = (\3_WIDTH + 6) * 2 - 6
_y = (\4) * -2
_x = \3_WIDTH * 2 - 1
_len = CURRENT_MAP_HEIGHT + 3 - (\4)
diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm
index 747dffae1..628a26795 100644
--- a/data/wild/roammon_maps.asm
+++ b/data/wild/roammon_maps.asm
@@ -4,7 +4,7 @@
roam_map: MACRO
map_id \1
db _NARG - 1
-rept _NARG + -1
+rept _NARG - 1
map_id \2
shift
endr