diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /maps/second_map_headers.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'maps/second_map_headers.asm')
| -rw-r--r-- | maps/second_map_headers.asm | 8 |
1 files changed, 4 insertions, 4 deletions
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 |