diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-23 12:59:19 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-23 12:59:19 -0400 |
| commit | 432df825d4039a44a49fff01ef843395ab5abb3d (patch) | |
| tree | 5a2dce3edf871a8d420b927411cee6ef1f931781 /maps/ElmsLab.asm | |
| parent | 185b0a1c86e442d9c3ecd38d7c3fc7cfdb24be21 (diff) | |
Replaced GROUP_, MAP_ references with the map macro
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro
Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme
Added new macro elevfloor to simplify the definition of elevators under this new scheme
Diffstat (limited to 'maps/ElmsLab.asm')
| -rw-r--r-- | maps/ElmsLab.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index d6c242e4a..07a902cf6 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -272,7 +272,7 @@ ElmDirectionsScript: setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_RIVAL_CHERRYGROVE_CITY dotrigger $5 - domaptrigger GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $1 + domaptrigger NEW_BARK_TOWN, $1 end ElmDescribesMrPokemonScript: @@ -338,7 +338,7 @@ ElmAfterTheftScript: keeptextopen setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON - domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1 + domaptrigger ROUTE_29, $1 clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 @@ -1373,8 +1373,8 @@ ElmsLab_MapEventHeader: .Warps: db 2 - warp_def $b, $4, 1, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - warp_def $b, $5, 1, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN + warp_def $b, $4, 1, NEW_BARK_TOWN + warp_def $b, $5, 1, NEW_BARK_TOWN .XYTriggers: db 8 |