summaryrefslogtreecommitdiff
path: root/macros/map.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-23 12:59:19 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-23 12:59:19 -0400
commit432df825d4039a44a49fff01ef843395ab5abb3d (patch)
tree5a2dce3edf871a8d420b927411cee6ef1f931781 /macros/map.asm
parent185b0a1c86e442d9c3ecd38d7c3fc7cfdb24be21 (diff)
Replaced GROUP_, MAP_ references with the map macro
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme Added new macro elevfloor to simplify the definition of elevators under this new scheme
Diffstat (limited to 'macros/map.asm')
-rw-r--r--macros/map.asm8
1 files changed, 6 insertions, 2 deletions
diff --git a/macros/map.asm b/macros/map.asm
index 17b1f5a65..30609e7ed 100644
--- a/macros/map.asm
+++ b/macros/map.asm
@@ -61,8 +61,7 @@ warp_def: macro
db \1 ; y
db \2 ; x
db \3 ; warp_to
- db \4 ; map group
- db \5 ; map number
+ map \4 ; map
endm
@@ -177,3 +176,8 @@ newgroup: MACRO
const_value = const_value + 1
enum_start 1
ENDM
+
+elevfloor: MACRO
+ db \1, \2
+ map \3
+ENDM