diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 14:25:37 -0400 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 19:02:36 -0400 |
commit | 6c3000efd2818f8d5cb0a01770d1b92991b80340 (patch) | |
tree | 38d458d3ff19039cd865998bb122666b943e91d6 /macros/map.asm | |
parent | 432df825d4039a44a49fff01ef843395ab5abb3d (diff) |
Macro update, roam mon annotations
Updated map and mapgroup macros to get around an rgbds bug.
Legendary beast locale handling annotated and relabeled.
Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function. This will make it easier for modders to add or remove engine flags.
Diffstat (limited to 'macros/map.asm')
-rw-r--r-- | macros/map.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/macros/map.asm b/macros/map.asm index 30609e7ed..a999a38c6 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -5,8 +5,8 @@ map: MACRO ; db GROUP_\1, MAP_\1 \1\@ EQUS "GROUP_\1" -\1\@2 EQUS "MAP_\1" - db \1\@, \1\@2 +\1\@_2 EQUS "MAP_\1" + db \1\@, \1\@_2 ENDM roam_map: MACRO @@ -165,9 +165,9 @@ ENDM mapgroup: MACRO ; map id, height, width \1\@ EQUS "GROUP_\1" -\1\@2 EQUS "MAP_\1" +\1\@_2 EQUS "MAP_\1" \1\@ EQU const_value - enum \1\@2 + enum \1\@_2 \1_HEIGHT EQU \2 \1_WIDTH EQU \3 ENDM |