diff options
| author | yenatch <yenatch@gmail.com> | 2015-08-17 11:58:57 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-08-17 11:58:57 -0400 |
| commit | 3cd79c55a3e1b50c8a71ad76692342e52382c700 (patch) | |
| tree | 32a9feb55a0eadc24c4690cef4fd0d26b2032f00 /macros/map.asm | |
| parent | 9974a2c7014cbe7db3d0e516580fea48001ab3df (diff) | |
| parent | 4831b4429eab57f56cce4736b6930a54f07314f7 (diff) | |
Merge pull request #309 from PikalaxALT/master
Wild data, save functions, fix missing include
Diffstat (limited to 'macros/map.asm')
| -rw-r--r-- | macros/map.asm | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/macros/map.asm b/macros/map.asm index 17b1f5a65..a9d3209c1 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -1,12 +1,5 @@ map: MACRO -; This is a silly hack to get around an rgbds bug. - -; Ideally: -; db GROUP_\1, MAP_\1 - -\1\@ EQUS "GROUP_\1" -\1\@2 EQUS "MAP_\1" - db \1\@, \1\@2 + db GROUP_\1, MAP_\1 ENDM roam_map: MACRO @@ -23,16 +16,17 @@ roam_map: MACRO db 0 ENDM - person_event: macro db \1 ; sprite db \2 ; y db \3 ; x - db \4 ; facing - db \5 ; movement - db \6 ; clock_hour - db \7 ; clock_daytime - db \8 ; color_function + db \4 ; movement function + dn \5, \6 ; radius: y, x + db \7 ; clock_hour + db \8 ; clock_daytime + shift + dn \8, \9 ; color_function + shift db \9 ; sight_range shift dw \9 ; pointer @@ -61,8 +55,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 @@ -164,16 +157,23 @@ endc ENDM mapgroup: MACRO -; map id, height, width -\1\@ EQUS "GROUP_\1" -\1\@2 EQUS "MAP_\1" -\1\@ EQU const_value - enum \1\@2 +GROUP_\1 EQU const_value + enum MAP_\1 \1_HEIGHT EQU \2 \1_WIDTH EQU \3 ENDM +; map id, height, width +; \1\@ EQUS "GROUP_\1" +; \1\@_2 EQUS "MAP_\1" +; \1\@ EQU const_value + ; enum \1\@_2 newgroup: MACRO const_value = const_value + 1 enum_start 1 ENDM + +elevfloor: MACRO + db \1, \2 + map \3 +ENDM |