ref: 1480602df75b980e291a832ba3a485d123a53047
parent: 2c5be6760437c363617ad4052a40e5f5fd8e7470
author: yenatch <[email protected]>
date: Wed Feb 11 18:20:53 EST 2015
Move the map_header macro into macros/map.asm.
--- a/macros/map.asm
+++ b/macros/map.asm
@@ -66,6 +66,15 @@
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::
--- 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