diff options
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 4 | ||||
| -rw-r--r-- | maps/map_headers.asm | 2 | ||||
| -rw-r--r-- | maps/second_map_headers.asm | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index d27b6ff85..747d86a3f 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -4,7 +4,7 @@ UNDERGROUND_DOOR_CLOSED3 EQU $3f UNDERGROUND_DOOR_OPEN1 EQU $2d UNDERGROUND_DOOR_OPEN2 EQU $3d -ugdoor: macro +ugdoor: MACRO \1_YCOORD EQU \2 \1_XCOORD EQU \3 endm @@ -26,7 +26,7 @@ endm ugdoor UGDOOR_15, $12, $0a ugdoor UGDOOR_16, $12, $0c -doorstate: macro +doorstate: MACRO changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2 endm diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 9053329d7..62df15ec5 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -1,4 +1,4 @@ -map_header: macro +map_header: MACRO ;\1: map label ;\2: tileset: a TILESET_* constant ;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 7503e72ae..03702b4bb 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -1,4 +1,4 @@ -map_header_2: macro +map_header_2: MACRO ;\1: map label ;\2: map id ;\3: border block @@ -14,7 +14,7 @@ map_header_2: macro db \4 endm -connection: macro +connection: MACRO if "\1" == "north" ;\2: map id ;\3: map label (eventually will be rolled into map id) |