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
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user