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/PowerPlant.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/PowerPlant.asm')
| -rw-r--r-- | maps/PowerPlant.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index ee45ddcf1..c23440f26 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -141,7 +141,7 @@ PowerPlantManager: setevent EVENT_MET_MANAGER_AT_POWER_PLANT clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - domaptrigger GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $1 + domaptrigger CERULEAN_GYM, $1 dotrigger $1 end @@ -387,8 +387,8 @@ PowerPlant_MapEventHeader: .Warps: db 2 - warp_def $11, $2, 2, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH - warp_def $11, $3, 2, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH + warp_def $11, $2, 2, ROUTE_10_NORTH + warp_def $11, $3, 2, ROUTE_10_NORTH .XYTriggers: db 1 |