summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/enum.asm5
-rw-r--r--macros/event.asm2
-rw-r--r--macros/map.asm14
3 files changed, 20 insertions, 1 deletions
diff --git a/macros/enum.asm b/macros/enum.asm
index 0a72d49d8..aee6ee530 100644
--- a/macros/enum.asm
+++ b/macros/enum.asm
@@ -29,3 +29,8 @@ const: MACRO
\1 EQU const_value
const_value = const_value + 1
ENDM
+
+shift_const: MACRO
+\1 EQU 1 << const_value
+const_value = const_value + 1
+ENDM
diff --git a/macros/event.asm b/macros/event.asm
index 893d55fe6..678648a04 100644
--- a/macros/event.asm
+++ b/macros/event.asm
@@ -690,7 +690,7 @@ faceperson: macro
enum variablesprite_command
variablesprite: macro
db variablesprite_command
- db \1 ; byte
+ db \1 - SPRITE_VARS ; byte
db \2 ; sprite
endm
diff --git a/macros/map.asm b/macros/map.asm
index 2ab981823..54b543c6d 100644
--- a/macros/map.asm
+++ b/macros/map.asm
@@ -162,3 +162,17 @@ if "\1" == "east"
endc
ENDM
+
+mapgroup: MACRO
+\1\@ EQUS "GROUP_\1"
+\1\@2 EQUS "MAP_\1"
+\1\@ EQU const_value
+ enum \1\@2
+\1_HEIGHT EQU \2
+\1_WIDTH EQU \3
+ENDM
+
+newgroup: MACRO
+const_value = const_value + 1
+ enum_start 1
+ENDM