diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 19:34:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 19:34:43 -0500 |
| commit | 82a05a1752b476caab8951fe03f539dcc1a63669 (patch) | |
| tree | 972f867159ded40695e868338bb697a303335b62 /maps | |
| parent | e2b378f5e32ea1416fbc9ac5e96d23be244e4a6b (diff) | |
| parent | 50fc9c3389ae8130d3670683f22f3e49555c57a3 (diff) | |
Merge pull request #443 from xCrystal/master
Misc style cleanup and documentation
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 8 | ||||
| -rw-r--r-- | maps/map_headers.asm | 4 | ||||
| -rw-r--r-- | maps/second_map_headers.asm | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index d27b6ff85..56213e6a8 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -4,10 +4,10 @@ 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 +ENDM ugdoor UGDOOR_1, $10, $06 ugdoor UGDOOR_2, $0a, $06 @@ -26,9 +26,9 @@ 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 +ENDM const_value set 2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1 diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 9053329d7..ac4b20ece 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 @@ -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 7503e72ae..3628babd2 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 @@ -12,9 +12,9 @@ map_header_2: macro dw \1_MapScriptHeader dw \1_MapEventHeader db \4 -endm +ENDM -connection: macro +connection: MACRO if "\1" == "north" ;\2: map id ;\3: map label (eventually will be rolled into map id) @@ -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 |