diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-22 20:15:42 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-22 20:15:42 -0400 |
| commit | af404efb489f0294823a414a9a7fc41c0607fd04 (patch) | |
| tree | 6d5db20a531536bb8543c13bc31491e6caddab6a | |
| parent | 3013730a5fcdcd95039c66d942d871de5aede931 (diff) | |
Move the 'map' macro to where it is used
| -rw-r--r-- | data/maps/maps.asm | 11 | ||||
| -rw-r--r-- | macros/maps.asm | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/maps.asm b/data/maps/maps.asm index aaa74aa..4252579 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -1,5 +1,16 @@ INCLUDE "constants.asm" +map: MACRO +;\1: map name: for the MapAttributes pointer (see data/maps/attributes.asm) +;\2: tileset: a TILESET_* constant +;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON +;\4: location: from constants/landmark_constants.asm + db BANK(\1_MapAttributes), \2, \3 + dw \1_MapAttributes + db \4 + db 0, 0 +ENDM + SECTION "data/maps/maps.asm", ROMX db 0 ; ??? diff --git a/macros/maps.asm b/macros/maps.asm index 356e868..c25942a 100644 --- a/macros/maps.asm +++ b/macros/maps.asm @@ -97,17 +97,6 @@ endc endc ENDM -map: MACRO -;\1: map name: for the MapAttributes pointer (see data/maps/attributes.asm) -;\2: tileset: a TILESET_* constant -;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON -;\4: location: from constants/landmark_constants.asm - db BANK(\1_MapAttributes), \2, \3 - dw \1_MapAttributes - db \4 - db 0, 0 -ENDM - def_warp_events: MACRO if DEF(_NUM_WARP_EVENTS) PURGE _NUM_WARP_EVENTS |