diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-11 23:20:53 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-11 23:27:11 -0800 |
| commit | 1480602df75b980e291a832ba3a485d123a53047 (patch) | |
| tree | 0b8be61e8f894e0cd21c3794378b4c871d4f9717 | |
| parent | 2c5be6760437c363617ad4052a40e5f5fd8e7470 (diff) | |
Move the map_header macro into macros/map.asm.
| -rw-r--r-- | macros/map.asm | 9 | ||||
| -rw-r--r-- | maps/map_headers.asm | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/macros/map.asm b/macros/map.asm index 81ac32a1b..b5f66bafb 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -66,6 +66,15 @@ warp_def: macro endm +map_header: MACRO + ; label, tileset, permission, location, music, time of day, fishing group +\1_MapHeader: + db BANK(\1_SecondMapHeader), \2, \3 + dw \1_SecondMapHeader + db \4, \5, \6, \7 +ENDM + + map_header_2: MACRO ; label, map, border block, connections \1_SecondMapHeader:: diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 90cb1f415..36768a54d 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -1,11 +1,3 @@ -map_header: MACRO - ; label, tileset, permission, location, music, time of day, fishing group -\1_MapHeader: - db BANK(\1_SecondMapHeader), \2, \3 - dw \1_SecondMapHeader - db \4, \5, \6, \7 -ENDM - MapGroupPointers:: ; 0x94000 ; pointers to the first map header of each map group |