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

@@ -64,7 +64,7 @@ UnknownScript_0x58044:
disappear $3
stopfollow
applymovement $0, MovementData_0x580c5
domaptrigger GROUP_RUINS_OF_ALPH_RESEARCH_CENTER, MAP_RUINS_OF_ALPH_RESEARCH_CENTER, $1
domaptrigger RUINS_OF_ALPH_RESEARCH_CENTER, $1
warpcheck
end
@@ -286,17 +286,17 @@ RuinsofAlphOutside_MapEventHeader:
.Warps:
db 11
warp_def $11, $2, 1, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER
warp_def $7, $e, 1, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER
warp_def $1d, $2, 1, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER
warp_def $21, $10, 1, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER
warp_def $d, $a, 1, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER
warp_def $b, $11, 1, GROUP_RUINS_OF_ALPH_RESEARCH_CENTER, MAP_RUINS_OF_ALPH_RESEARCH_CENTER
warp_def $13, $6, 1, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F
warp_def $1b, $6, 2, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F
warp_def $5, $7, 3, GROUP_ROUTE_36_RUINS_OF_ALPH_GATE, MAP_ROUTE_36_RUINS_OF_ALPH_GATE
warp_def $14, $d, 1, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE
warp_def $15, $d, 2, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE
warp_def $11, $2, 1, RUINS_OF_ALPH_HO_OH_CHAMBER
warp_def $7, $e, 1, RUINS_OF_ALPH_KABUTO_CHAMBER
warp_def $1d, $2, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER
warp_def $21, $10, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER
warp_def $d, $a, 1, RUINS_OF_ALPH_INNER_CHAMBER
warp_def $b, $11, 1, RUINS_OF_ALPH_RESEARCH_CENTER
warp_def $13, $6, 1, UNION_CAVE_B1F
warp_def $1b, $6, 2, UNION_CAVE_B1F
warp_def $5, $7, 3, ROUTE_36_RUINS_OF_ALPH_GATE
warp_def $14, $d, 1, ROUTE_32_RUINS_OF_ALPH_GATE
warp_def $15, $d, 2, ROUTE_32_RUINS_OF_ALPH_GATE
.XYTriggers:
db 2