From 7beb497d3aba7cd1bb34f2b1394bde80c1cd9807 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 28 Dec 2017 13:23:44 +0100 Subject: Uppercase MACRO and EQU(S) according to the style guide --- maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 4 ++-- maps/map_headers.asm | 2 +- maps/second_map_headers.asm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'maps') 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) -- cgit v1.2.3 From 50fc9c3389ae8130d3670683f22f3e49555c57a3 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 28 Dec 2017 22:31:16 +0100 Subject: endm -> ENDM --- maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 4 ++-- maps/map_headers.asm | 2 +- maps/second_map_headers.asm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'maps') diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 747d86a3f..56213e6a8 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -7,7 +7,7 @@ UNDERGROUND_DOOR_OPEN2 EQU $3d ugdoor: MACRO \1_YCOORD EQU \2 \1_XCOORD EQU \3 -endm +ENDM ugdoor UGDOOR_1, $10, $06 ugdoor UGDOOR_2, $0a, $06 @@ -28,7 +28,7 @@ endm doorstate: MACRO changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2 -endm +ENDM const_value set 2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1 diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 62df15ec5..ac4b20ece 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -13,7 +13,7 @@ map_header: MACRO db \4, \5 dn \6, \7 db \8 -endm +ENDM MapGroupPointers:: ; pointers to the first map header of each map group diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 03702b4bb..3628babd2 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -12,7 +12,7 @@ map_header_2: MACRO dw \1_MapScriptHeader dw \1_MapEventHeader db \4 -endm +ENDM connection: MACRO if "\1" == "north" @@ -82,7 +82,7 @@ if "\1" == "east" db 0 dw OverworldMap + \2_WIDTH + 7 endc -endm +ENDM map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST -- cgit v1.2.3