summaryrefslogtreecommitdiff
path: root/maps/UndergroundPathSwitchRoomEntrances.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/UndergroundPathSwitchRoomEntrances.asm')
-rw-r--r--maps/UndergroundPathSwitchRoomEntrances.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm
index 14273808b..2c9ccd2f2 100644
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -119,7 +119,7 @@ UnknownScript_0x7cad4:
checkevent EVENT_RIVAL_BURNED_TOWER
iftrue UnknownScript_0x7cae1
setevent EVENT_RIVAL_BURNED_TOWER
- domaptrigger GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F, $1
+ domaptrigger BURNED_TOWER_1F, $1
UnknownScript_0x7cae1:
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
@@ -897,15 +897,15 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader:
.Warps:
db 9
- warp_def $3, $17, 6, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE
- warp_def $a, $16, 1, GROUP_UNDERGROUND_WAREHOUSE, MAP_UNDERGROUND_WAREHOUSE
- warp_def $a, $17, 2, GROUP_UNDERGROUND_WAREHOUSE, MAP_UNDERGROUND_WAREHOUSE
- warp_def $19, $5, 2, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE
- warp_def $1d, $4, 14, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY
- warp_def $1d, $5, 14, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY
- warp_def $19, $15, 1, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE
- warp_def $1d, $14, 13, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY
- warp_def $1d, $15, 13, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY
+ warp_def $3, $17, 6, WAREHOUSE_ENTRANCE
+ warp_def $a, $16, 1, UNDERGROUND_WAREHOUSE
+ warp_def $a, $17, 2, UNDERGROUND_WAREHOUSE
+ warp_def $19, $5, 2, WAREHOUSE_ENTRANCE
+ warp_def $1d, $4, 14, GOLDENROD_CITY
+ warp_def $1d, $5, 14, GOLDENROD_CITY
+ warp_def $19, $15, 1, WAREHOUSE_ENTRANCE
+ warp_def $1d, $14, 13, GOLDENROD_CITY
+ warp_def $1d, $15, 13, GOLDENROD_CITY
.XYTriggers:
db 2