summaryrefslogtreecommitdiff
path: root/maps/Route2.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-23 12:59:19 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-23 12:59:19 -0400
commit432df825d4039a44a49fff01ef843395ab5abb3d (patch)
tree5a2dce3edf871a8d420b927411cee6ef1f931781 /maps/Route2.asm
parent185b0a1c86e442d9c3ecd38d7c3fc7cfdb24be21 (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/Route2.asm')
-rw-r--r--maps/Route2.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route2.asm b/maps/Route2.asm
index 2fb81e3f8..cc9a220e4 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -142,11 +142,11 @@ Route2_MapEventHeader:
.Warps:
db 5
- warp_def $f, $f, 1, GROUP_ROUTE_2_NUGGET_SPEECH_HOUSE, MAP_ROUTE_2_NUGGET_SPEECH_HOUSE
- warp_def $1f, $f, 3, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE
- warp_def $1b, $10, 1, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE
- warp_def $1b, $11, 2, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE
- warp_def $7, $c, 3, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE
+ warp_def $f, $f, 1, ROUTE_2_NUGGET_SPEECH_HOUSE
+ warp_def $1f, $f, 3, ROUTE_2_GATE
+ warp_def $1b, $10, 1, ROUTE_2_GATE
+ warp_def $1b, $11, 2, ROUTE_2_GATE
+ warp_def $7, $c, 3, DIGLETTS_CAVE
.XYTriggers:
db 0