From bef792f2d21ccac0127aeffd9e0838aba81f44b6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 20 Jul 2015 03:51:52 -0400 Subject: More label updates, moved predefs to new file Also named most of the engine and event flag constants. --- macros/map.asm | 2 +- macros/predef.asm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'macros') 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 -- cgit v1.2.3