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:
PikalaxALT
2015-07-23 12:59:19 -04:00
parent 185b0a1c86
commit 432df825d4
389 changed files with 1551 additions and 1551 deletions

View File

@@ -126,17 +126,17 @@ FuchsiaCity_MapEventHeader:
.Warps:
db 11
warp_def $d, $5, 2, GROUP_FUCHSIA_MART, MAP_FUCHSIA_MART
warp_def $d, $16, 1, GROUP_SAFARI_ZONE_MAIN_OFFICE, MAP_SAFARI_ZONE_MAIN_OFFICE
warp_def $1b, $8, 1, GROUP_FUCHSIA_GYM, MAP_FUCHSIA_GYM
warp_def $1b, $b, 1, GROUP_FUCHSIA_BILL_SPEECH_HOUSE, MAP_FUCHSIA_BILL_SPEECH_HOUSE
warp_def $1b, $13, 1, GROUP_FUCHSIA_POKECENTER_1F, MAP_FUCHSIA_POKECENTER_1F
warp_def $1b, $1b, 1, GROUP_SAFARI_ZONE_WARDENS_HOME, MAP_SAFARI_ZONE_WARDENS_HOME
warp_def $3, $12, 3, GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA, MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA
warp_def $16, $25, 1, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE
warp_def $17, $25, 2, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE
warp_def $23, $7, 1, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE
warp_def $23, $8, 2, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE
warp_def $d, $5, 2, FUCHSIA_MART
warp_def $d, $16, 1, SAFARI_ZONE_MAIN_OFFICE
warp_def $1b, $8, 1, FUCHSIA_GYM
warp_def $1b, $b, 1, FUCHSIA_BILL_SPEECH_HOUSE
warp_def $1b, $13, 1, FUCHSIA_POKECENTER_1F
warp_def $1b, $1b, 1, SAFARI_ZONE_WARDENS_HOME
warp_def $3, $12, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA
warp_def $16, $25, 1, ROUTE_15_FUCHSIA_GATE
warp_def $17, $25, 2, ROUTE_15_FUCHSIA_GATE
warp_def $23, $7, 1, ROUTE_19___FUCHSIA_GATE
warp_def $23, $8, 2, ROUTE_19___FUCHSIA_GATE
.XYTriggers:
db 0