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

@@ -258,21 +258,21 @@ EcruteakCity_MapEventHeader:
.Warps:
db 15
warp_def $1a, $23, 1, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE
warp_def $1b, $23, 2, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE
warp_def $b, $12, 1, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE
warp_def $2, $14, 1, GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM
warp_def $3, $14, 2, GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM
warp_def $1b, $17, 1, GROUP_ECRUTEAK_POKECENTER_1F, MAP_ECRUTEAK_POKECENTER_1F
warp_def $15, $5, 1, GROUP_ECRUTEAK_LUGIA_SPEECH_HOUSE, MAP_ECRUTEAK_LUGIA_SPEECH_HOUSE
warp_def $15, $17, 1, GROUP_DANCE_THEATRE, MAP_DANCE_THEATRE
warp_def $15, $1d, 2, GROUP_ECRUTEAK_MART, MAP_ECRUTEAK_MART
warp_def $1b, $6, 1, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $1b, $d, 1, GROUP_ECRUTEAK_ITEMFINDER_HOUSE, MAP_ECRUTEAK_ITEMFINDER_HOUSE
warp_def $7, $25, 1, GROUP_TIN_TOWER_1F, MAP_TIN_TOWER_1F
warp_def $5, $5, 1, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
warp_def $12, $0, 3, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE
warp_def $13, $0, 4, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE
warp_def $1a, $23, 1, ROUTE_42_ECRUTEAK_GATE
warp_def $1b, $23, 2, ROUTE_42_ECRUTEAK_GATE
warp_def $b, $12, 1, ECRUTEAK_HOUSE
warp_def $2, $14, 1, WISE_TRIOS_ROOM
warp_def $3, $14, 2, WISE_TRIOS_ROOM
warp_def $1b, $17, 1, ECRUTEAK_POKECENTER_1F
warp_def $15, $5, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE
warp_def $15, $17, 1, DANCE_THEATRE
warp_def $15, $1d, 2, ECRUTEAK_MART
warp_def $1b, $6, 1, ECRUTEAK_GYM
warp_def $1b, $d, 1, ECRUTEAK_ITEMFINDER_HOUSE
warp_def $7, $25, 1, TIN_TOWER_1F
warp_def $5, $5, 1, BURNED_TOWER_1F
warp_def $12, $0, 3, ROUTE_38_ECRUTEAK_GATE
warp_def $13, $0, 4, ROUTE_38_ECRUTEAK_GATE
.XYTriggers:
db 0