diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-20 03:51:52 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-20 03:51:52 -0400 |
| commit | bef792f2d21ccac0127aeffd9e0838aba81f44b6 (patch) | |
| tree | 22185c93e9f9dcc3937a5e96279dd71f3b24c0d8 /macros | |
| parent | 94129b6b451fc7770ea75ffbdcbaab4967f513bd (diff) | |
More label updates, moved predefs to new file
Also named most of the engine and event flag constants.
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/map.asm | 2 | ||||
| -rw-r--r-- | macros/predef.asm | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/macros/map.asm b/macros/map.asm index 570205517..17b1f5a65 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -67,7 +67,7 @@ warp_def: macro map_header: MACRO - ; label, tileset, permission, location, music, time of day, fishing group + ; label, tileset, permission, location, music, phone service flag, time of day, fishing group \1_MapHeader: db BANK(\1_SecondMapHeader), \2, \3 dw \1_SecondMapHeader diff --git a/macros/predef.asm b/macros/predef.asm index d6c0344e6..b99c6e1f2 100644 --- a/macros/predef.asm +++ b/macros/predef.asm @@ -1,7 +1,6 @@ add_predef: MACRO \1Predef:: - dw \1 - db BANK(\1) + dwb \1, BANK(\1) ENDM predef_id: MACRO |