ref: 3088a77a21fd39b9bfa0850e676ddbbed5fdf52b
parent: 323ef81286c554d928520341fbc13ef21dc1ec79
author: Rangi <[email protected]>
date: Thu Feb 1 16:54:00 EST 2018
warp_event x, y, map, warp_id
--- a/docs/map_event_scripts.md
+++ b/docs/map_event_scripts.md
@@ -106,7 +106,7 @@
<pre>
db <i>N</i> ; warp events
- warp_event <i>x</i>, <i>y</i>, <i>warp_id</i>, <i>map</i>
+ warp_event <i>x</i>, <i>y</i>, <i>map</i>, <i>warp_id</i>
</pre>
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -19,10 +19,10 @@
warp_event: MACRO
;\1: x: left to right, starts at 0
;\2: y: top to bottom, starts at 0
-;\3: warp destination: starts at 1
-;\4: map id: from constants/map_constants.asm
- db \2, \1, \3
- map \4
+;\3: map id: from constants/map_constants.asm
+;\4: warp destination: starts at 1
+ db \2, \1, \4
+ map \3
ENDM
coord_event: MACRO
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -363,8 +363,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 15, 5, AZALEA_TOWN
- warp_event 5, 15, 5, AZALEA_TOWN
+ warp_event 4, 15, AZALEA_TOWN, 5
+ warp_event 5, 15, AZALEA_TOWN, 5
db 0 ; coord events
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -47,8 +47,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, AZALEA_TOWN
- warp_event 3, 7, 3, AZALEA_TOWN
+ warp_event 2, 7, AZALEA_TOWN, 3
+ warp_event 3, 7, AZALEA_TOWN, 3
db 0 ; coord events
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -78,9 +78,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 1, AZALEA_TOWN
- warp_event 4, 7, 1, AZALEA_TOWN
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, AZALEA_TOWN, 1
+ warp_event 4, 7, AZALEA_TOWN, 1
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -457,14 +457,14 @@
db 0, 0 ; filler
db 8 ; warp events
- warp_event 15, 9, 1, AZALEA_POKECENTER_1F
- warp_event 21, 13, 1, CHARCOAL_KILN
- warp_event 21, 5, 2, AZALEA_MART
- warp_event 9, 5, 1, KURTS_HOUSE
- warp_event 10, 15, 1, AZALEA_GYM
- warp_event 31, 7, 1, SLOWPOKE_WELL_B1F
- warp_event 2, 10, 3, ILEX_FOREST_AZALEA_GATE
- warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
+ warp_event 15, 9, AZALEA_POKECENTER_1F, 1
+ warp_event 21, 13, CHARCOAL_KILN, 1
+ warp_event 21, 5, AZALEA_MART, 2
+ warp_event 9, 5, KURTS_HOUSE, 1
+ warp_event 10, 15, AZALEA_GYM, 1
+ warp_event 31, 7, SLOWPOKE_WELL_B1F, 1
+ warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3
+ warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4
db 3 ; coord events
coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -795,9 +795,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 7, 9, 3, BATTLE_TOWER_OUTSIDE
- warp_event 8, 9, 4, BATTLE_TOWER_OUTSIDE
- warp_event 7, 0, 1, BATTLE_TOWER_ELEVATOR
+ warp_event 7, 9, BATTLE_TOWER_OUTSIDE, 3
+ warp_event 8, 9, BATTLE_TOWER_OUTSIDE, 4
+ warp_event 7, 0, BATTLE_TOWER_ELEVATOR, 1
db 0 ; coord events
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -140,8 +140,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY
- warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY
+ warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4
+ warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4
db 0 ; coord events
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -45,8 +45,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY
- warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY
+ warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1
+ warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1
db 0 ; coord events
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -78,12 +78,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 11, 1, 1, BATTLE_TOWER_ELEVATOR
- warp_event 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM
- warp_event 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM
- warp_event 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM
- warp_event 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM
- warp_event 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM
+ warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1
+ warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1
+ warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1
+ warp_event 9, 0, BATTLE_TOWER_BATTLE_ROOM, 1
+ warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1
+ warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1
db 0 ; coord events
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -128,10 +128,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE
- warp_event 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE
- warp_event 8, 9, 1, BATTLE_TOWER_1F
- warp_event 9, 9, 2, BATTLE_TOWER_1F
+ warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3
+ warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4
+ warp_event 8, 9, BATTLE_TOWER_1F, 1
+ warp_event 9, 9, BATTLE_TOWER_1F, 2
db 0 ; coord events
--- a/maps/BillsBrothersHouse.asm
+++ b/maps/BillsBrothersHouse.asm
@@ -29,8 +29,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, FUCHSIA_CITY
- warp_event 3, 7, 4, FUCHSIA_CITY
+ warp_event 2, 7, FUCHSIA_CITY, 4
+ warp_event 3, 7, FUCHSIA_CITY, 4
db 0 ; coord events
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -244,8 +244,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, GOLDENROD_CITY
- warp_event 3, 7, 4, GOLDENROD_CITY
+ warp_event 2, 7, GOLDENROD_CITY, 4
+ warp_event 3, 7, GOLDENROD_CITY, 4
db 0 ; coord events
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -355,8 +355,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, ROUTE_25
- warp_event 3, 7, 1, ROUTE_25
+ warp_event 2, 7, ROUTE_25, 1
+ warp_event 3, 7, ROUTE_25, 1
db 0 ; coord events
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -314,14 +314,14 @@
db 0, 0 ; filler
db 8 ; warp events
- warp_event 18, 11, 1, BLACKTHORN_GYM_1F
- warp_event 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
- warp_event 29, 23, 1, BLACKTHORN_EMYS_HOUSE
- warp_event 15, 29, 2, BLACKTHORN_MART
- warp_event 21, 29, 1, BLACKTHORN_POKECENTER_1F
- warp_event 9, 31, 1, MOVE_DELETERS_HOUSE
- warp_event 36, 9, 2, ICE_PATH_1F
- warp_event 20, 1, 1, DRAGONS_DEN_1F
+ warp_event 18, 11, BLACKTHORN_GYM_1F, 1
+ warp_event 13, 21, BLACKTHORN_DRAGON_SPEECH_HOUSE, 1
+ warp_event 29, 23, BLACKTHORN_EMYS_HOUSE, 1
+ warp_event 15, 29, BLACKTHORN_MART, 2
+ warp_event 21, 29, BLACKTHORN_POKECENTER_1F, 1
+ warp_event 9, 31, MOVE_DELETERS_HOUSE, 1
+ warp_event 36, 9, ICE_PATH_1F, 2
+ warp_event 20, 1, DRAGONS_DEN_1F, 1
db 0 ; coord events
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -49,8 +49,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, BLACKTHORN_CITY
- warp_event 3, 7, 2, BLACKTHORN_CITY
+ warp_event 2, 7, BLACKTHORN_CITY, 2
+ warp_event 3, 7, BLACKTHORN_CITY, 2
db 0 ; coord events
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -21,8 +21,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, BLACKTHORN_CITY
- warp_event 3, 7, 3, BLACKTHORN_CITY
+ warp_event 2, 7, BLACKTHORN_CITY, 3
+ warp_event 3, 7, BLACKTHORN_CITY, 3
db 0 ; coord events
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -388,13 +388,13 @@
db 0, 0 ; filler
db 7 ; warp events
- warp_event 4, 17, 1, BLACKTHORN_CITY
- warp_event 5, 17, 1, BLACKTHORN_CITY
- warp_event 1, 7, 1, BLACKTHORN_GYM_2F
- warp_event 7, 9, 2, BLACKTHORN_GYM_2F
- warp_event 2, 6, 3, BLACKTHORN_GYM_2F
- warp_event 7, 7, 4, BLACKTHORN_GYM_2F
- warp_event 7, 6, 5, BLACKTHORN_GYM_2F
+ warp_event 4, 17, BLACKTHORN_CITY, 1
+ warp_event 5, 17, BLACKTHORN_CITY, 1
+ warp_event 1, 7, BLACKTHORN_GYM_2F, 1
+ warp_event 7, 9, BLACKTHORN_GYM_2F, 2
+ warp_event 2, 6, BLACKTHORN_GYM_2F, 3
+ warp_event 7, 7, BLACKTHORN_GYM_2F, 4
+ warp_event 7, 6, BLACKTHORN_GYM_2F, 5
db 0 ; coord events
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -127,11 +127,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 1, 7, 3, BLACKTHORN_GYM_1F
- warp_event 7, 9, 4, BLACKTHORN_GYM_1F
- warp_event 2, 5, 5, BLACKTHORN_GYM_1F ; hole
- warp_event 8, 7, 6, BLACKTHORN_GYM_1F ; hole
- warp_event 8, 3, 7, BLACKTHORN_GYM_1F ; hole
+ warp_event 1, 7, BLACKTHORN_GYM_1F, 3
+ warp_event 7, 9, BLACKTHORN_GYM_1F, 4
+ warp_event 2, 5, BLACKTHORN_GYM_1F, 5 ; hole
+ warp_event 8, 7, BLACKTHORN_GYM_1F, 6 ; hole
+ warp_event 8, 3, BLACKTHORN_GYM_1F, 7 ; hole
db 0 ; coord events
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -48,8 +48,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, BLACKTHORN_CITY
- warp_event 3, 7, 4, BLACKTHORN_CITY
+ warp_event 2, 7, BLACKTHORN_CITY, 4
+ warp_event 3, 7, BLACKTHORN_CITY, 4
db 0 ; coord events
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -51,9 +51,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 5, BLACKTHORN_CITY
- warp_event 4, 7, 5, BLACKTHORN_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, BLACKTHORN_CITY, 5
+ warp_event 4, 7, BLACKTHORN_CITY, 5
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -146,8 +146,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, PALLET_TOWN
- warp_event 3, 7, 2, PALLET_TOWN
+ warp_event 2, 7, PALLET_TOWN, 2
+ warp_event 3, 7, PALLET_TOWN, 2
db 0 ; coord events
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -126,10 +126,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 17, 3, KOGAS_ROOM
- warp_event 5, 17, 4, KOGAS_ROOM
- warp_event 4, 2, 1, KARENS_ROOM
- warp_event 5, 2, 2, KARENS_ROOM
+ warp_event 4, 17, KOGAS_ROOM, 3
+ warp_event 5, 17, KOGAS_ROOM, 4
+ warp_event 4, 2, KARENS_ROOM, 1
+ warp_event 5, 2, KARENS_ROOM, 2
db 0 ; coord events
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -279,20 +279,20 @@
db 0, 0 ; filler
db 14 ; warp events
- warp_event 9, 15, 13, ECRUTEAK_CITY
- warp_event 10, 15, 13, ECRUTEAK_CITY
- warp_event 10, 9, 1, BURNED_TOWER_B1F
- warp_event 5, 5, 1, BURNED_TOWER_B1F
- warp_event 5, 6, 1, BURNED_TOWER_B1F
- warp_event 4, 6, 1, BURNED_TOWER_B1F
- warp_event 15, 4, 2, BURNED_TOWER_B1F
- warp_event 15, 5, 2, BURNED_TOWER_B1F
- warp_event 10, 7, 3, BURNED_TOWER_B1F
- warp_event 5, 14, 4, BURNED_TOWER_B1F
- warp_event 4, 14, 4, BURNED_TOWER_B1F
- warp_event 14, 14, 5, BURNED_TOWER_B1F
- warp_event 15, 14, 5, BURNED_TOWER_B1F
- warp_event 7, 15, 6, BURNED_TOWER_B1F
+ warp_event 9, 15, ECRUTEAK_CITY, 13
+ warp_event 10, 15, ECRUTEAK_CITY, 13
+ warp_event 10, 9, BURNED_TOWER_B1F, 1
+ warp_event 5, 5, BURNED_TOWER_B1F, 1
+ warp_event 5, 6, BURNED_TOWER_B1F, 1
+ warp_event 4, 6, BURNED_TOWER_B1F, 1
+ warp_event 15, 4, BURNED_TOWER_B1F, 2
+ warp_event 15, 5, BURNED_TOWER_B1F, 2
+ warp_event 10, 7, BURNED_TOWER_B1F, 3
+ warp_event 5, 14, BURNED_TOWER_B1F, 4
+ warp_event 4, 14, BURNED_TOWER_B1F, 4
+ warp_event 14, 14, BURNED_TOWER_B1F, 5
+ warp_event 15, 14, BURNED_TOWER_B1F, 5
+ warp_event 7, 15, BURNED_TOWER_B1F, 6
db 1 ; coord events
coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -237,12 +237,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 10, 9, 3, BURNED_TOWER_1F
- warp_event 17, 7, 7, BURNED_TOWER_1F
- warp_event 10, 8, 9, BURNED_TOWER_1F
- warp_event 3, 13, 10, BURNED_TOWER_1F
- warp_event 17, 14, 12, BURNED_TOWER_1F
- warp_event 7, 15, 14, BURNED_TOWER_1F
+ warp_event 10, 9, BURNED_TOWER_1F, 3
+ warp_event 17, 7, BURNED_TOWER_1F, 7
+ warp_event 10, 8, BURNED_TOWER_1F, 9
+ warp_event 3, 13, BURNED_TOWER_1F, 10
+ warp_event 17, 14, BURNED_TOWER_1F, 12
+ warp_event 7, 15, BURNED_TOWER_1F, 14
db 1 ; coord events
coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -209,8 +209,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 6, 7, 9, CELADON_CITY
- warp_event 7, 7, 9, CELADON_CITY
+ warp_event 6, 7, CELADON_CITY, 9
+ warp_event 7, 7, CELADON_CITY, 9
db 0 ; coord events
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -236,15 +236,15 @@
db 0, 0 ; filler
db 9 ; warp events
- warp_event 4, 9, 1, CELADON_DEPT_STORE_1F
- warp_event 16, 9, 1, CELADON_MANSION_1F
- warp_event 16, 3, 3, CELADON_MANSION_1F
- warp_event 17, 3, 3, CELADON_MANSION_1F
- warp_event 29, 9, 1, CELADON_POKECENTER_1F
- warp_event 18, 19, 1, CELADON_GAME_CORNER
- warp_event 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM
- warp_event 10, 29, 1, CELADON_GYM
- warp_event 25, 29, 1, CELADON_CAFE
+ warp_event 4, 9, CELADON_DEPT_STORE_1F, 1
+ warp_event 16, 9, CELADON_MANSION_1F, 1
+ warp_event 16, 3, CELADON_MANSION_1F, 3
+ warp_event 17, 3, CELADON_MANSION_1F, 3
+ warp_event 29, 9, CELADON_POKECENTER_1F, 1
+ warp_event 18, 19, CELADON_GAME_CORNER, 1
+ warp_event 23, 19, CELADON_GAME_CORNER_PRIZE_ROOM, 1
+ warp_event 10, 29, CELADON_GYM, 1
+ warp_event 25, 29, CELADON_CAFE, 1
db 0 ; coord events
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -75,10 +75,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 7, 7, 1, CELADON_CITY
- warp_event 8, 7, 1, CELADON_CITY
- warp_event 15, 0, 2, CELADON_DEPT_STORE_2F
- warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+ warp_event 7, 7, CELADON_CITY, 1
+ warp_event 8, 7, CELADON_CITY, 1
+ warp_event 15, 0, CELADON_DEPT_STORE_2F, 2
+ warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -70,9 +70,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 12, 0, 1, CELADON_DEPT_STORE_3F
- warp_event 15, 0, 3, CELADON_DEPT_STORE_1F
- warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+ warp_event 12, 0, CELADON_DEPT_STORE_3F, 1
+ warp_event 15, 0, CELADON_DEPT_STORE_1F, 3
+ warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -96,9 +96,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 12, 0, 1, CELADON_DEPT_STORE_2F
- warp_event 15, 0, 2, CELADON_DEPT_STORE_4F
- warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+ warp_event 12, 0, CELADON_DEPT_STORE_2F, 1
+ warp_event 15, 0, CELADON_DEPT_STORE_4F, 2
+ warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -52,9 +52,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 12, 0, 1, CELADON_DEPT_STORE_5F
- warp_event 15, 0, 2, CELADON_DEPT_STORE_3F
- warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+ warp_event 12, 0, CELADON_DEPT_STORE_5F, 1
+ warp_event 15, 0, CELADON_DEPT_STORE_3F, 2
+ warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -73,9 +73,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 12, 0, 1, CELADON_DEPT_STORE_4F
- warp_event 15, 0, 1, CELADON_DEPT_STORE_6F
- warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+ warp_event 12, 0, CELADON_DEPT_STORE_4F, 1
+ warp_event 15, 0, CELADON_DEPT_STORE_6F, 1
+ warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -147,8 +147,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 15, 0, 2, CELADON_DEPT_STORE_5F
- warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+ warp_event 15, 0, CELADON_DEPT_STORE_5F, 2
+ warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -29,8 +29,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 1, 3, -1, CELADON_DEPT_STORE_1F
- warp_event 2, 3, -1, CELADON_DEPT_STORE_1F
+ warp_event 1, 3, CELADON_DEPT_STORE_1F, -1
+ warp_event 2, 3, CELADON_DEPT_STORE_1F, -1
db 0 ; coord events
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -283,8 +283,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 14, 13, 6, CELADON_CITY
- warp_event 15, 13, 6, CELADON_CITY
+ warp_event 14, 13, CELADON_CITY, 6
+ warp_event 15, 13, CELADON_CITY, 6
db 0 ; coord events
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -265,8 +265,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 5, 7, CELADON_CITY
- warp_event 3, 5, 7, CELADON_CITY
+ warp_event 2, 5, CELADON_CITY, 7
+ warp_event 3, 5, CELADON_CITY, 7
db 0 ; coord events
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -269,8 +269,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 17, 8, CELADON_CITY
- warp_event 5, 17, 8, CELADON_CITY
+ warp_event 4, 17, CELADON_CITY, 8
+ warp_event 5, 17, CELADON_CITY, 8
db 0 ; coord events
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -76,11 +76,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 6, 9, 2, CELADON_CITY
- warp_event 7, 9, 2, CELADON_CITY
- warp_event 3, 0, 3, CELADON_CITY
- warp_event 0, 0, 1, CELADON_MANSION_2F
- warp_event 7, 0, 4, CELADON_MANSION_2F
+ warp_event 6, 9, CELADON_CITY, 2
+ warp_event 7, 9, CELADON_CITY, 2
+ warp_event 3, 0, CELADON_CITY, 3
+ warp_event 0, 0, CELADON_MANSION_2F, 1
+ warp_event 7, 0, CELADON_MANSION_2F, 4
db 0 ; coord events
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -51,10 +51,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 0, 4, CELADON_MANSION_1F
- warp_event 1, 0, 2, CELADON_MANSION_3F
- warp_event 6, 0, 3, CELADON_MANSION_3F
- warp_event 7, 0, 5, CELADON_MANSION_1F
+ warp_event 0, 0, CELADON_MANSION_1F, 4
+ warp_event 1, 0, CELADON_MANSION_3F, 2
+ warp_event 6, 0, CELADON_MANSION_3F, 3
+ warp_event 7, 0, CELADON_MANSION_1F, 5
db 0 ; coord events
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -191,10 +191,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 0, 1, CELADON_MANSION_ROOF
- warp_event 1, 0, 2, CELADON_MANSION_2F
- warp_event 6, 0, 3, CELADON_MANSION_2F
- warp_event 7, 0, 2, CELADON_MANSION_ROOF
+ warp_event 0, 0, CELADON_MANSION_ROOF, 1
+ warp_event 1, 0, CELADON_MANSION_2F, 2
+ warp_event 6, 0, CELADON_MANSION_2F, 3
+ warp_event 7, 0, CELADON_MANSION_ROOF, 2
db 0 ; coord events
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -35,9 +35,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 1, 1, 1, CELADON_MANSION_3F
- warp_event 6, 1, 4, CELADON_MANSION_3F
- warp_event 2, 5, 1, CELADON_MANSION_ROOF_HOUSE
+ warp_event 1, 1, CELADON_MANSION_3F, 1
+ warp_event 6, 1, CELADON_MANSION_3F, 4
+ warp_event 2, 5, CELADON_MANSION_ROOF_HOUSE, 1
db 0 ; coord events
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -118,8 +118,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, CELADON_MANSION_ROOF
- warp_event 3, 7, 3, CELADON_MANSION_ROOF
+ warp_event 2, 7, CELADON_MANSION_ROOF, 3
+ warp_event 3, 7, CELADON_MANSION_ROOF, 3
db 0 ; coord events
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -147,9 +147,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 5, CELADON_CITY
- warp_event 4, 7, 5, CELADON_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, CELADON_CITY, 5
+ warp_event 4, 7, CELADON_CITY, 5
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/CeladonPokecenter2FBeta.asm
+++ b/maps/CeladonPokecenter2FBeta.asm
@@ -7,7 +7,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 0, 7, 3, CELADON_POKECENTER_1F
+ warp_event 0, 7, CELADON_POKECENTER_1F, 3
db 0 ; coord events
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -277,12 +277,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE
- warp_event 28, 17, 1, CERULEAN_POLICE_STATION
- warp_event 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE
- warp_event 19, 21, 1, CERULEAN_POKECENTER_1F
- warp_event 30, 23, 1, CERULEAN_GYM
- warp_event 25, 29, 2, CERULEAN_MART
+ warp_event 7, 15, CERULEAN_GYM_BADGE_SPEECH_HOUSE, 1
+ warp_event 28, 17, CERULEAN_POLICE_STATION, 1
+ warp_event 13, 19, CERULEAN_TRADE_SPEECH_HOUSE, 1
+ warp_event 19, 21, CERULEAN_POKECENTER_1F, 1
+ warp_event 30, 23, CERULEAN_GYM, 1
+ warp_event 25, 29, CERULEAN_MART, 2
db 0 ; coord events
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -364,8 +364,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 15, 5, CERULEAN_CITY
- warp_event 5, 15, 5, CERULEAN_CITY
+ warp_event 4, 15, CERULEAN_CITY, 5
+ warp_event 5, 15, CERULEAN_CITY, 5
db 0 ; coord events
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -18,8 +18,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, CERULEAN_CITY
- warp_event 3, 7, 1, CERULEAN_CITY
+ warp_event 2, 7, CERULEAN_CITY, 1
+ warp_event 3, 7, CERULEAN_CITY, 1
db 0 ; coord events
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -47,8 +47,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 6, CERULEAN_CITY
- warp_event 3, 7, 6, CERULEAN_CITY
+ warp_event 2, 7, CERULEAN_CITY, 6
+ warp_event 3, 7, CERULEAN_CITY, 6
db 0 ; coord events
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -64,9 +64,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 4, CERULEAN_CITY
- warp_event 4, 7, 4, CERULEAN_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, CERULEAN_CITY, 4
+ warp_event 4, 7, CERULEAN_CITY, 4
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/CeruleanPokecenter2FBeta.asm
+++ b/maps/CeruleanPokecenter2FBeta.asm
@@ -7,7 +7,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 0, 7, 1, CERULEAN_POKECENTER_1F
+ warp_event 0, 7, CERULEAN_POKECENTER_1F, 1
db 0 ; coord events
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -45,8 +45,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, CERULEAN_CITY
- warp_event 3, 7, 2, CERULEAN_CITY
+ warp_event 2, 7, CERULEAN_CITY, 2
+ warp_event 3, 7, CERULEAN_CITY, 2
db 0 ; coord events
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -55,8 +55,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, CERULEAN_CITY
- warp_event 3, 7, 3, CERULEAN_CITY
+ warp_event 2, 7, CERULEAN_CITY, 3
+ warp_event 3, 7, CERULEAN_CITY, 3
db 0 ; coord events
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -150,8 +150,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, AZALEA_TOWN
- warp_event 3, 7, 2, AZALEA_TOWN
+ warp_event 2, 7, AZALEA_TOWN, 2
+ warp_event 3, 7, AZALEA_TOWN, 2
db 0 ; coord events
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -548,11 +548,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 23, 3, 2, CHERRYGROVE_MART
- warp_event 29, 3, 1, CHERRYGROVE_POKECENTER_1F
- warp_event 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
- warp_event 25, 9, 1, GUIDE_GENTS_HOUSE
- warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
+ warp_event 23, 3, CHERRYGROVE_MART, 2
+ warp_event 29, 3, CHERRYGROVE_POKECENTER_1F, 1
+ warp_event 17, 7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1
+ warp_event 25, 9, GUIDE_GENTS_HOUSE, 1
+ warp_event 31, 11, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 1
db 2 ; coord events
coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -43,8 +43,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 5, CHERRYGROVE_CITY
- warp_event 3, 7, 5, CHERRYGROVE_CITY
+ warp_event 2, 7, CHERRYGROVE_CITY, 5
+ warp_event 3, 7, CHERRYGROVE_CITY, 5
db 0 ; coord events
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -46,8 +46,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, CHERRYGROVE_CITY
- warp_event 3, 7, 3, CHERRYGROVE_CITY
+ warp_event 2, 7, CHERRYGROVE_CITY, 3
+ warp_event 3, 7, CHERRYGROVE_CITY, 3
db 0 ; coord events
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -73,8 +73,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, CHERRYGROVE_CITY
- warp_event 3, 7, 1, CHERRYGROVE_CITY
+ warp_event 2, 7, CHERRYGROVE_CITY, 1
+ warp_event 3, 7, CHERRYGROVE_CITY, 1
db 0 ; coord events
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -70,9 +70,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 2, CHERRYGROVE_CITY
- warp_event 4, 7, 2, CHERRYGROVE_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, CHERRYGROVE_CITY, 2
+ warp_event 4, 7, CHERRYGROVE_CITY, 2
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -382,13 +382,13 @@
db 0, 0 ; filler
db 7 ; warp events
- warp_event 17, 41, 1, MANIAS_HOUSE
- warp_event 8, 43, 1, CIANWOOD_GYM
- warp_event 23, 43, 1, CIANWOOD_POKECENTER_1F
- warp_event 15, 47, 1, CIANWOOD_PHARMACY
- warp_event 9, 31, 1, CIANWOOD_PHOTO_STUDIO
- warp_event 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
- warp_event 5, 17, 1, POKE_SEERS_HOUSE
+ warp_event 17, 41, MANIAS_HOUSE, 1
+ warp_event 8, 43, CIANWOOD_GYM, 1
+ warp_event 23, 43, CIANWOOD_POKECENTER_1F, 1
+ warp_event 15, 47, CIANWOOD_PHARMACY, 1
+ warp_event 9, 31, CIANWOOD_PHOTO_STUDIO, 1
+ warp_event 15, 37, CIANWOOD_LUGIA_SPEECH_HOUSE, 1
+ warp_event 5, 17, POKE_SEERS_HOUSE, 1
db 1 ; coord events
coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -307,8 +307,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 17, 2, CIANWOOD_CITY
- warp_event 5, 17, 2, CIANWOOD_CITY
+ warp_event 4, 17, CIANWOOD_CITY, 2
+ warp_event 5, 17, CIANWOOD_CITY, 2
db 0 ; coord events
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -63,8 +63,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 6, CIANWOOD_CITY
- warp_event 3, 7, 6, CIANWOOD_CITY
+ warp_event 2, 7, CIANWOOD_CITY, 6
+ warp_event 3, 7, CIANWOOD_CITY, 6
db 0 ; coord events
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -74,8 +74,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, CIANWOOD_CITY
- warp_event 3, 7, 4, CIANWOOD_CITY
+ warp_event 2, 7, CIANWOOD_CITY, 4
+ warp_event 3, 7, CIANWOOD_CITY, 4
db 0 ; coord events
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -50,8 +50,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 5, CIANWOOD_CITY
- warp_event 3, 7, 5, CIANWOOD_CITY
+ warp_event 2, 7, CIANWOOD_CITY, 5
+ warp_event 3, 7, CIANWOOD_CITY, 5
db 0 ; coord events
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -133,9 +133,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 3, CIANWOOD_CITY
- warp_event 4, 7, 3, CIANWOOD_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, CIANWOOD_CITY, 3
+ warp_event 4, 7, CIANWOOD_CITY, 3
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -129,7 +129,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 11, 11, 1, CINNABAR_POKECENTER_1F
+ warp_event 11, 11, CINNABAR_POKECENTER_1F, 1
db 0 ; coord events
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -36,9 +36,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 1, CINNABAR_ISLAND
- warp_event 4, 7, 1, CINNABAR_ISLAND
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, CINNABAR_ISLAND, 1
+ warp_event 4, 7, CINNABAR_ISLAND, 1
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/CinnabarPokecenter2FBeta.asm
+++ b/maps/CinnabarPokecenter2FBeta.asm
@@ -7,7 +7,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 0, 7, 3, CINNABAR_POKECENTER_1F
+ warp_event 0, 7, CINNABAR_POKECENTER_1F, 3
db 0 ; coord events
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -64,8 +64,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 7, 3, POKECENTER_2F
- warp_event 5, 7, 3, POKECENTER_2F
+ warp_event 4, 7, POKECENTER_2F, 3
+ warp_event 5, 7, POKECENTER_2F, 3
db 0 ; coord events
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -74,9 +74,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 2, 7, 8, SAFFRON_CITY
- warp_event 3, 7, 8, SAFFRON_CITY
- warp_event 2, 0, 1, COPYCATS_HOUSE_2F
+ warp_event 2, 7, SAFFRON_CITY, 8
+ warp_event 3, 7, SAFFRON_CITY, 8
+ warp_event 2, 0, COPYCATS_HOUSE_2F, 1
db 0 ; coord events
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -362,7 +362,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 3, 0, 3, COPYCATS_HOUSE_1F
+ warp_event 3, 0, COPYCATS_HOUSE_1F, 3
db 0 ; coord events
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -339,8 +339,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 5, 13, 8, ECRUTEAK_CITY
- warp_event 6, 13, 8, ECRUTEAK_CITY
+ warp_event 5, 13, ECRUTEAK_CITY, 8
+ warp_event 6, 13, ECRUTEAK_CITY, 8
db 0 ; coord events
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -63,8 +63,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 23, 3, 1, ROUTE_45
- warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE
+ warp_event 23, 3, ROUTE_45, 1
+ warp_event 3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2
db 0 ; coord events
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -35,9 +35,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 15, 3, ROUTE_31
- warp_event 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
- warp_event 35, 33, 3, ROUTE_46
+ warp_event 3, 15, ROUTE_31, 3
+ warp_event 17, 1, DARK_CAVE_BLACKTHORN_ENTRANCE, 2
+ warp_event 35, 33, ROUTE_46, 3
db 0 ; coord events
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -157,10 +157,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 5, 3, ROUTE_34
- warp_event 0, 6, 4, ROUTE_34
- warp_event 2, 7, 5, ROUTE_34
- warp_event 3, 7, 5, ROUTE_34
+ warp_event 0, 5, ROUTE_34, 3
+ warp_event 0, 6, ROUTE_34, 4
+ warp_event 2, 7, ROUTE_34, 5
+ warp_event 3, 7, ROUTE_34, 5
db 0 ; coord events
--- a/maps/DayOfWeekSiblingsHouse.asm
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -72,8 +72,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, ROUTE_26
- warp_event 3, 7, 3, ROUTE_26
+ warp_event 2, 7, ROUTE_26, 3
+ warp_event 3, 7, ROUTE_26, 3
db 0 ; coord events
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -24,12 +24,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 3, 33, 10, VERMILION_CITY
- warp_event 5, 31, 5, DIGLETTS_CAVE
- warp_event 15, 5, 5, ROUTE_2
- warp_event 17, 3, 6, DIGLETTS_CAVE
- warp_event 17, 33, 2, DIGLETTS_CAVE
- warp_event 3, 3, 4, DIGLETTS_CAVE
+ warp_event 3, 33, VERMILION_CITY, 10
+ warp_event 5, 31, DIGLETTS_CAVE, 5
+ warp_event 15, 5, ROUTE_2, 5
+ warp_event 17, 3, DIGLETTS_CAVE, 6
+ warp_event 17, 33, DIGLETTS_CAVE, 2
+ warp_event 3, 3, DIGLETTS_CAVE, 4
db 0 ; coord events
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -659,8 +659,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 9, 2, DRAGONS_DEN_B1F
- warp_event 5, 9, 2, DRAGONS_DEN_B1F
+ warp_event 4, 9, DRAGONS_DEN_B1F, 2
+ warp_event 5, 9, DRAGONS_DEN_B1F, 2
db 0 ; coord events
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -7,10 +7,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 3, 5, 8, BLACKTHORN_CITY
- warp_event 3, 3, 4, DRAGONS_DEN_1F
- warp_event 5, 15, 1, DRAGONS_DEN_B1F
- warp_event 5, 13, 2, DRAGONS_DEN_1F
+ warp_event 3, 5, BLACKTHORN_CITY, 8
+ warp_event 3, 3, DRAGONS_DEN_1F, 4
+ warp_event 5, 15, DRAGONS_DEN_B1F, 1
+ warp_event 5, 13, DRAGONS_DEN_1F, 2
db 0 ; coord events
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -408,8 +408,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 20, 3, 3, DRAGONS_DEN_1F
- warp_event 19, 29, 1, DRAGON_SHRINE
+ warp_event 20, 3, DRAGONS_DEN_1F, 3
+ warp_event 19, 29, DRAGON_SHRINE, 1
db 1 ; coord events
coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -413,8 +413,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 15, 3, VIOLET_CITY
- warp_event 4, 15, 3, VIOLET_CITY
+ warp_event 3, 15, VIOLET_CITY, 3
+ warp_event 4, 15, VIOLET_CITY, 3
db 0 ; coord events
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -261,21 +261,21 @@
db 0, 0 ; filler
db 15 ; warp events
- warp_event 35, 26, 1, ROUTE_42_ECRUTEAK_GATE
- warp_event 35, 27, 2, ROUTE_42_ECRUTEAK_GATE
- warp_event 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE
- warp_event 20, 2, 1, WISE_TRIOS_ROOM
- warp_event 20, 3, 2, WISE_TRIOS_ROOM
- warp_event 23, 27, 1, ECRUTEAK_POKECENTER_1F
- warp_event 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE
- warp_event 23, 21, 1, DANCE_THEATRE
- warp_event 29, 21, 2, ECRUTEAK_MART
- warp_event 6, 27, 1, ECRUTEAK_GYM
- warp_event 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE
- warp_event 37, 7, 1, TIN_TOWER_1F
- warp_event 5, 5, 1, BURNED_TOWER_1F
- warp_event 0, 18, 3, ROUTE_38_ECRUTEAK_GATE
- warp_event 0, 19, 4, ROUTE_38_ECRUTEAK_GATE
+ warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1
+ warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2
+ warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1
+ warp_event 20, 2, WISE_TRIOS_ROOM, 1
+ warp_event 20, 3, WISE_TRIOS_ROOM, 2
+ warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1
+ warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1
+ warp_event 23, 21, DANCE_THEATRE, 1
+ warp_event 29, 21, ECRUTEAK_MART, 2
+ warp_event 6, 27, ECRUTEAK_GYM, 1
+ warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1
+ warp_event 37, 7, TIN_TOWER_1F, 1
+ warp_event 5, 5, BURNED_TOWER_1F, 1
+ warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3
+ warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4
db 0 ; coord events
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -388,39 +388,39 @@
db 0, 0 ; filler
db 33 ; warp events
- warp_event 4, 17, 10, ECRUTEAK_CITY
- warp_event 5, 17, 10, ECRUTEAK_CITY
- warp_event 4, 14, 4, ECRUTEAK_GYM
- warp_event 2, 4, 3, ECRUTEAK_GYM
- warp_event 3, 4, 3, ECRUTEAK_GYM
- warp_event 4, 4, 3, ECRUTEAK_GYM
- warp_event 4, 5, 3, ECRUTEAK_GYM
- warp_event 6, 7, 3, ECRUTEAK_GYM
- warp_event 7, 4, 3, ECRUTEAK_GYM
- warp_event 2, 6, 3, ECRUTEAK_GYM
- warp_event 3, 6, 3, ECRUTEAK_GYM
- warp_event 4, 6, 3, ECRUTEAK_GYM
- warp_event 5, 6, 3, ECRUTEAK_GYM
- warp_event 7, 6, 3, ECRUTEAK_GYM
- warp_event 7, 7, 3, ECRUTEAK_GYM
- warp_event 4, 8, 3, ECRUTEAK_GYM
- warp_event 5, 8, 3, ECRUTEAK_GYM
- warp_event 6, 8, 3, ECRUTEAK_GYM
- warp_event 7, 8, 3, ECRUTEAK_GYM
- warp_event 2, 8, 3, ECRUTEAK_GYM
- warp_event 2, 9, 3, ECRUTEAK_GYM
- warp_event 2, 10, 3, ECRUTEAK_GYM
- warp_event 2, 11, 3, ECRUTEAK_GYM
- warp_event 4, 10, 3, ECRUTEAK_GYM
- warp_event 5, 10, 3, ECRUTEAK_GYM
- warp_event 2, 12, 3, ECRUTEAK_GYM
- warp_event 3, 12, 3, ECRUTEAK_GYM
- warp_event 4, 12, 3, ECRUTEAK_GYM
- warp_event 5, 12, 3, ECRUTEAK_GYM
- warp_event 7, 10, 3, ECRUTEAK_GYM
- warp_event 7, 11, 3, ECRUTEAK_GYM
- warp_event 7, 12, 3, ECRUTEAK_GYM
- warp_event 7, 13, 3, ECRUTEAK_GYM
+ warp_event 4, 17, ECRUTEAK_CITY, 10
+ warp_event 5, 17, ECRUTEAK_CITY, 10
+ warp_event 4, 14, ECRUTEAK_GYM, 4
+ warp_event 2, 4, ECRUTEAK_GYM, 3
+ warp_event 3, 4, ECRUTEAK_GYM, 3
+ warp_event 4, 4, ECRUTEAK_GYM, 3
+ warp_event 4, 5, ECRUTEAK_GYM, 3
+ warp_event 6, 7, ECRUTEAK_GYM, 3
+ warp_event 7, 4, ECRUTEAK_GYM, 3
+ warp_event 2, 6, ECRUTEAK_GYM, 3
+ warp_event 3, 6, ECRUTEAK_GYM, 3
+ warp_event 4, 6, ECRUTEAK_GYM, 3
+ warp_event 5, 6, ECRUTEAK_GYM, 3
+ warp_event 7, 6, ECRUTEAK_GYM, 3
+ warp_event 7, 7, ECRUTEAK_GYM, 3
+ warp_event 4, 8, ECRUTEAK_GYM, 3
+ warp_event 5, 8, ECRUTEAK_GYM, 3
+ warp_event 6, 8, ECRUTEAK_GYM, 3
+ warp_event 7, 8, ECRUTEAK_GYM, 3
+ warp_event 2, 8, ECRUTEAK_GYM, 3
+ warp_event 2, 9, ECRUTEAK_GYM, 3
+ warp_event 2, 10, ECRUTEAK_GYM, 3
+ warp_event 2, 11, ECRUTEAK_GYM, 3
+ warp_event 4, 10, ECRUTEAK_GYM, 3
+ warp_event 5, 10, ECRUTEAK_GYM, 3
+ warp_event 2, 12, ECRUTEAK_GYM, 3
+ warp_event 3, 12, ECRUTEAK_GYM, 3
+ warp_event 4, 12, ECRUTEAK_GYM, 3
+ warp_event 5, 12, ECRUTEAK_GYM, 3
+ warp_event 7, 10, ECRUTEAK_GYM, 3
+ warp_event 7, 11, ECRUTEAK_GYM, 3
+ warp_event 7, 12, ECRUTEAK_GYM, 3
+ warp_event 7, 13, ECRUTEAK_GYM, 3
db 0 ; coord events
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -164,8 +164,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 7, 11, ECRUTEAK_CITY
- warp_event 4, 7, 11, ECRUTEAK_CITY
+ warp_event 3, 7, ECRUTEAK_CITY, 11
+ warp_event 4, 7, ECRUTEAK_CITY, 11
db 0 ; coord events
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -46,8 +46,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 7, 7, ECRUTEAK_CITY
- warp_event 4, 7, 7, ECRUTEAK_CITY
+ warp_event 3, 7, ECRUTEAK_CITY, 7
+ warp_event 4, 7, ECRUTEAK_CITY, 7
db 0 ; coord events
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -47,8 +47,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 9, ECRUTEAK_CITY
- warp_event 3, 7, 9, ECRUTEAK_CITY
+ warp_event 2, 7, ECRUTEAK_CITY, 9
+ warp_event 3, 7, ECRUTEAK_CITY, 9
db 0 ; coord events
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -208,9 +208,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 6, ECRUTEAK_CITY
- warp_event 4, 7, 6, ECRUTEAK_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, ECRUTEAK_CITY, 6
+ warp_event 4, 7, ECRUTEAK_CITY, 6
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -279,11 +279,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 4, 17, 3, ECRUTEAK_CITY
- warp_event 5, 17, 3, ECRUTEAK_CITY
- warp_event 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE
- warp_event 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE
- warp_event 17, 3, 3, WISE_TRIOS_ROOM
+ warp_event 4, 17, ECRUTEAK_CITY, 3
+ warp_event 5, 17, ECRUTEAK_CITY, 3
+ warp_event 5, 3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4
+ warp_event 17, 15, ECRUTEAK_TIN_TOWER_ENTRANCE, 3
+ warp_event 17, 3, WISE_TRIOS_ROOM, 3
db 2 ; coord events
coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -85,8 +85,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, NEW_BARK_TOWN
- warp_event 3, 7, 4, NEW_BARK_TOWN
+ warp_event 2, 7, NEW_BARK_TOWN, 4
+ warp_event 3, 7, NEW_BARK_TOWN, 4
db 0 ; coord events
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1372,8 +1372,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 11, 1, NEW_BARK_TOWN
- warp_event 5, 11, 1, NEW_BARK_TOWN
+ warp_event 4, 11, NEW_BARK_TOWN, 1
+ warp_event 5, 11, NEW_BARK_TOWN, 1
db 8 ; coord events
coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -287,18 +287,18 @@
db 0, 0 ; filler
db 12 ; warp events
- warp_event 25, 1, -1, FAST_SHIP_1F
- warp_event 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE
- warp_event 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE
- warp_event 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE
- warp_event 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW
- warp_event 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW
- warp_event 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW
- warp_event 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
- warp_event 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
- warp_event 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
- warp_event 6, 12, 1, FAST_SHIP_B1F
- warp_event 30, 14, 2, FAST_SHIP_B1F
+ warp_event 25, 1, FAST_SHIP_1F, -1
+ warp_event 27, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 1
+ warp_event 23, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 2
+ warp_event 19, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 3
+ warp_event 15, 8, FAST_SHIP_CABINS_SW_SSW_NW, 1
+ warp_event 15, 15, FAST_SHIP_CABINS_SW_SSW_NW, 2
+ warp_event 19, 15, FAST_SHIP_CABINS_SW_SSW_NW, 4
+ warp_event 23, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 1
+ warp_event 27, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 3
+ warp_event 3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5
+ warp_event 6, 12, FAST_SHIP_B1F, 1
+ warp_event 30, 14, FAST_SHIP_B1F, 2
db 2 ; coord events
coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -450,8 +450,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 5, 11, 11, FAST_SHIP_1F
- warp_event 31, 13, 12, FAST_SHIP_1F
+ warp_event 5, 11, FAST_SHIP_1F, 11
+ warp_event 31, 13, FAST_SHIP_1F, 12
db 2 ; coord events
coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -268,9 +268,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 2, 0, 2, FAST_SHIP_1F
- warp_event 2, 12, 3, FAST_SHIP_1F
- warp_event 2, 24, 4, FAST_SHIP_1F
+ warp_event 2, 0, FAST_SHIP_1F, 2
+ warp_event 2, 12, FAST_SHIP_1F, 3
+ warp_event 2, 24, FAST_SHIP_1F, 4
db 0 ; coord events
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -464,12 +464,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 2, 7, 8, FAST_SHIP_1F
- warp_event 3, 7, 8, FAST_SHIP_1F
- warp_event 2, 19, 9, FAST_SHIP_1F
- warp_event 3, 19, 9, FAST_SHIP_1F
- warp_event 2, 33, 10, FAST_SHIP_1F
- warp_event 3, 33, 10, FAST_SHIP_1F
+ warp_event 2, 7, FAST_SHIP_1F, 8
+ warp_event 3, 7, FAST_SHIP_1F, 8
+ warp_event 2, 19, FAST_SHIP_1F, 9
+ warp_event 3, 19, FAST_SHIP_1F, 9
+ warp_event 2, 33, FAST_SHIP_1F, 10
+ warp_event 3, 33, FAST_SHIP_1F, 10
db 0 ; coord events
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -224,11 +224,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 2, 0, 5, FAST_SHIP_1F
- warp_event 2, 19, 6, FAST_SHIP_1F
- warp_event 3, 19, 6, FAST_SHIP_1F
- warp_event 2, 31, 7, FAST_SHIP_1F
- warp_event 3, 31, 7, FAST_SHIP_1F
+ warp_event 2, 0, FAST_SHIP_1F, 5
+ warp_event 2, 19, FAST_SHIP_1F, 6
+ warp_event 3, 19, FAST_SHIP_1F, 6
+ warp_event 2, 31, FAST_SHIP_1F, 7
+ warp_event 3, 31, FAST_SHIP_1F, 7
db 0 ; coord events
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -44,8 +44,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 11, 1, SAFFRON_CITY
- warp_event 5, 11, 1, SAFFRON_CITY
+ warp_event 4, 11, SAFFRON_CITY, 1
+ warp_event 5, 11, SAFFRON_CITY, 1
db 0 ; coord events
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -126,17 +126,17 @@
db 0, 0 ; filler
db 11 ; warp events
- warp_event 5, 13, 2, FUCHSIA_MART
- warp_event 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE
- warp_event 8, 27, 1, FUCHSIA_GYM
- warp_event 11, 27, 1, BILLS_BROTHERS_HOUSE
- warp_event 19, 27, 1, FUCHSIA_POKECENTER_1F
- warp_event 27, 27, 1, SAFARI_ZONE_WARDENS_HOME
- warp_event 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA
- warp_event 37, 22, 1, ROUTE_15_FUCHSIA_GATE
- warp_event 37, 23, 2, ROUTE_15_FUCHSIA_GATE
- warp_event 7, 35, 1, ROUTE_19_FUCHSIA_GATE
- warp_event 8, 35, 2, ROUTE_19_FUCHSIA_GATE
+ warp_event 5, 13, FUCHSIA_MART, 2
+ warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1
+ warp_event 8, 27, FUCHSIA_GYM, 1
+ warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1
+ warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1
+ warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1
+ warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3
+ warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1
+ warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2
+ warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1
+ warp_event 8, 35, ROUTE_19_FUCHSIA_GATE, 2
db 0 ; coord events
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -382,8 +382,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 17, 3, FUCHSIA_CITY
- warp_event 5, 17, 3, FUCHSIA_CITY
+ warp_event 4, 17, FUCHSIA_CITY, 3
+ warp_event 5, 17, FUCHSIA_CITY, 3
db 0 ; coord events
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -39,8 +39,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, FUCHSIA_CITY
- warp_event 3, 7, 1, FUCHSIA_CITY
+ warp_event 2, 7, FUCHSIA_CITY, 1
+ warp_event 3, 7, FUCHSIA_CITY, 1
db 0 ; coord events
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -90,9 +90,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 5, FUCHSIA_CITY
- warp_event 4, 7, 5, FUCHSIA_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, FUCHSIA_CITY, 5
+ warp_event 4, 7, FUCHSIA_CITY, 5
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/FuchsiaPokecenter2FBeta.asm
+++ b/maps/FuchsiaPokecenter2FBeta.asm
@@ -7,7 +7,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F
+ warp_event 0, 7, FUCHSIA_POKECENTER_1F, 3
db 0 ; coord events
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -104,8 +104,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, GOLDENROD_CITY
- warp_event 3, 7, 2, GOLDENROD_CITY
+ warp_event 2, 7, GOLDENROD_CITY, 2
+ warp_event 3, 7, GOLDENROD_CITY, 2
db 0 ; coord events
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -553,21 +553,21 @@
db 0, 0 ; filler
db 15 ; warp events
- warp_event 24, 7, 1, GOLDENROD_GYM
- warp_event 29, 29, 1, GOLDENROD_BIKE_SHOP
- warp_event 31, 21, 1, GOLDENROD_HAPPINESS_RATER
- warp_event 5, 25, 1, BILLS_FAMILYS_HOUSE
- warp_event 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION
- warp_event 29, 5, 1, GOLDENROD_FLOWER_SHOP
- warp_event 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE
- warp_event 15, 7, 1, GOLDENROD_NAME_RATER
- warp_event 24, 27, 1, GOLDENROD_DEPT_STORE_1F
- warp_event 14, 21, 1, GOLDENROD_GAME_CORNER
- warp_event 5, 15, 1, RADIO_TOWER_1F
- warp_event 19, 1, 3, ROUTE_35_GOLDENROD_GATE
- warp_event 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
- warp_event 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
- warp_event 15, 27, 1, GOLDENROD_POKECENTER_1F
+ warp_event 24, 7, GOLDENROD_GYM, 1
+ warp_event 29, 29, GOLDENROD_BIKE_SHOP, 1
+ warp_event 31, 21, GOLDENROD_HAPPINESS_RATER, 1
+ warp_event 5, 25, BILLS_FAMILYS_HOUSE, 1
+ warp_event 9, 13, GOLDENROD_MAGNET_TRAIN_STATION, 2
+ warp_event 29, 5, GOLDENROD_FLOWER_SHOP, 1
+ warp_event 33, 9, GOLDENROD_PP_SPEECH_HOUSE, 1
+ warp_event 15, 7, GOLDENROD_NAME_RATER, 1
+ warp_event 24, 27, GOLDENROD_DEPT_STORE_1F, 1
+ warp_event 14, 21, GOLDENROD_GAME_CORNER, 1
+ warp_event 5, 15, RADIO_TOWER_1F, 1
+ warp_event 19, 1, ROUTE_35_GOLDENROD_GATE, 3
+ warp_event 9, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 8
+ warp_event 11, 29, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 5
+ warp_event 15, 27, GOLDENROD_POKECENTER_1F, 1
db 0 ; coord events
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -80,10 +80,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 7, 7, 9, GOLDENROD_CITY
- warp_event 8, 7, 9, GOLDENROD_CITY
- warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_2F
- warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+ warp_event 7, 7, GOLDENROD_CITY, 9
+ warp_event 8, 7, GOLDENROD_CITY, 9
+ warp_event 15, 0, GOLDENROD_DEPT_STORE_2F, 2
+ warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -102,9 +102,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_3F
- warp_event 15, 0, 3, GOLDENROD_DEPT_STORE_1F
- warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+ warp_event 12, 0, GOLDENROD_DEPT_STORE_3F, 1
+ warp_event 15, 0, GOLDENROD_DEPT_STORE_1F, 3
+ warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -58,9 +58,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_2F
- warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_4F
- warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+ warp_event 12, 0, GOLDENROD_DEPT_STORE_2F, 1
+ warp_event 15, 0, GOLDENROD_DEPT_STORE_4F, 2
+ warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -79,9 +79,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_5F
- warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_3F
- warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+ warp_event 12, 0, GOLDENROD_DEPT_STORE_5F, 1
+ warp_event 15, 0, GOLDENROD_DEPT_STORE_3F, 2
+ warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -219,9 +219,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_4F
- warp_event 15, 0, 1, GOLDENROD_DEPT_STORE_6F
- warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+ warp_event 12, 0, GOLDENROD_DEPT_STORE_4F, 1
+ warp_event 15, 0, GOLDENROD_DEPT_STORE_6F, 1
+ warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -149,9 +149,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_5F
- warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
- warp_event 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF
+ warp_event 15, 0, GOLDENROD_DEPT_STORE_5F, 2
+ warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+ warp_event 13, 0, GOLDENROD_DEPT_STORE_ROOF, 1
db 0 ; coord events
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -111,9 +111,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE
- warp_event 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR
- warp_event 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR
+ warp_event 17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE, 3
+ warp_event 9, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+ warp_event 10, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 2
db 0 ; coord events
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -56,8 +56,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 1, 3, -1, GOLDENROD_DEPT_STORE_1F
- warp_event 2, 3, -1, GOLDENROD_DEPT_STORE_1F
+ warp_event 1, 3, GOLDENROD_DEPT_STORE_1F, -1
+ warp_event 2, 3, GOLDENROD_DEPT_STORE_1F, -1
db 0 ; coord events
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -213,7 +213,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 13, 1, 3, GOLDENROD_DEPT_STORE_6F
+ warp_event 13, 1, GOLDENROD_DEPT_STORE_6F, 3
db 0 ; coord events
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -161,8 +161,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 6, GOLDENROD_CITY
- warp_event 3, 7, 6, GOLDENROD_CITY
+ warp_event 2, 7, GOLDENROD_CITY, 6
+ warp_event 3, 7, GOLDENROD_CITY, 6
db 0 ; coord events
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -438,8 +438,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 13, 10, GOLDENROD_CITY
- warp_event 3, 13, 10, GOLDENROD_CITY
+ warp_event 2, 13, GOLDENROD_CITY, 10
+ warp_event 3, 13, GOLDENROD_CITY, 10
db 0 ; coord events
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -381,8 +381,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 17, 1, GOLDENROD_CITY
- warp_event 3, 17, 1, GOLDENROD_CITY
+ warp_event 2, 17, GOLDENROD_CITY, 1
+ warp_event 3, 17, GOLDENROD_CITY, 1
db 1 ; coord events
coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -138,8 +138,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, GOLDENROD_CITY
- warp_event 3, 7, 3, GOLDENROD_CITY
+ warp_event 2, 7, GOLDENROD_CITY, 3
+ warp_event 3, 7, GOLDENROD_CITY, 3
db 0 ; coord events
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -166,10 +166,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 8, 17, 5, GOLDENROD_CITY
- warp_event 9, 17, 5, GOLDENROD_CITY
- warp_event 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION
- warp_event 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION
+ warp_event 8, 17, GOLDENROD_CITY, 5
+ warp_event 9, 17, GOLDENROD_CITY, 5
+ warp_event 6, 5, SAFFRON_MAGNET_TRAIN_STATION, 4
+ warp_event 11, 5, SAFFRON_MAGNET_TRAIN_STATION, 3
db 1 ; coord events
coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromSaffron
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -26,8 +26,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 8, GOLDENROD_CITY
- warp_event 3, 7, 8, GOLDENROD_CITY
+ warp_event 2, 7, GOLDENROD_CITY, 8
+ warp_event 3, 7, GOLDENROD_CITY, 8
db 0 ; coord events
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -53,8 +53,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 7, GOLDENROD_CITY
- warp_event 3, 7, 7, GOLDENROD_CITY
+ warp_event 2, 7, GOLDENROD_CITY, 7
+ warp_event 3, 7, GOLDENROD_CITY, 7
db 0 ; coord events
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -806,10 +806,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 3, 7, 15, GOLDENROD_CITY
- warp_event 4, 7, 15, GOLDENROD_CITY
- warp_event 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, GOLDENROD_CITY, 15
+ warp_event 4, 7, GOLDENROD_CITY, 15
+ warp_event 0, 6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1
+ warp_event 0, 7, POKECENTER_2F, 1
db 2 ; coord events
coord_event 3, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -648,12 +648,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
- warp_event 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
- warp_event 18, 6, 4, GOLDENROD_UNDERGROUND
- warp_event 21, 31, 3, GOLDENROD_UNDERGROUND
- warp_event 22, 31, 3, GOLDENROD_UNDERGROUND
- warp_event 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+ warp_event 3, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 7
+ warp_event 3, 34, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 4
+ warp_event 18, 6, GOLDENROD_UNDERGROUND, 4
+ warp_event 21, 31, GOLDENROD_UNDERGROUND, 3
+ warp_event 22, 31, GOLDENROD_UNDERGROUND, 3
+ warp_event 22, 27, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 1
db 0 ; coord events
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -932,15 +932,15 @@
db 0, 0 ; filler
db 9 ; warp events
- warp_event 23, 3, 6, GOLDENROD_UNDERGROUND
- warp_event 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE
- warp_event 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE
- warp_event 5, 25, 2, GOLDENROD_UNDERGROUND
- warp_event 4, 29, 14, GOLDENROD_CITY
- warp_event 5, 29, 14, GOLDENROD_CITY
- warp_event 21, 25, 1, GOLDENROD_UNDERGROUND
- warp_event 20, 29, 13, GOLDENROD_CITY
- warp_event 21, 29, 13, GOLDENROD_CITY
+ warp_event 23, 3, GOLDENROD_UNDERGROUND, 6
+ warp_event 22, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 1
+ warp_event 23, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 2
+ warp_event 5, 25, GOLDENROD_UNDERGROUND, 2
+ warp_event 4, 29, GOLDENROD_CITY, 14
+ warp_event 5, 29, GOLDENROD_CITY, 14
+ warp_event 21, 25, GOLDENROD_UNDERGROUND, 1
+ warp_event 20, 29, GOLDENROD_CITY, 13
+ warp_event 21, 29, GOLDENROD_CITY, 13
db 2 ; coord events
coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -212,9 +212,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
- warp_event 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
- warp_event 17, 2, 1, GOLDENROD_DEPT_STORE_B1F
+ warp_event 2, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 2
+ warp_event 3, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 3
+ warp_event 17, 2, GOLDENROD_DEPT_STORE_B1F, 1
db 0 ; coord events
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -29,8 +29,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, CHERRYGROVE_CITY
- warp_event 3, 7, 4, CHERRYGROVE_CITY
+ warp_event 2, 7, CHERRYGROVE_CITY, 4
+ warp_event 3, 7, CHERRYGROVE_CITY, 4
db 0 ; coord events
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -112,8 +112,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 13, 3, LANCES_ROOM
- warp_event 5, 13, 4, LANCES_ROOM
+ warp_event 4, 13, LANCES_ROOM, 3
+ warp_event 5, 13, LANCES_ROOM, 4
db 0 ; coord events
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -21,10 +21,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 19, 1, ROUTE_44
- warp_event 36, 27, 7, BLACKTHORN_CITY
- warp_event 37, 5, 1, ICE_PATH_B1F
- warp_event 37, 13, 7, ICE_PATH_B1F
+ warp_event 4, 19, ROUTE_44, 1
+ warp_event 36, 27, BLACKTHORN_CITY, 7
+ warp_event 37, 5, ICE_PATH_B1F, 1
+ warp_event 37, 13, ICE_PATH_B1F, 7
db 0 ; coord events
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -77,14 +77,14 @@
db 0, 0 ; filler
db 8 ; warp events
- warp_event 3, 15, 3, ICE_PATH_1F
- warp_event 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE
- warp_event 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
- warp_event 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
- warp_event 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
- warp_event 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
- warp_event 5, 25, 4, ICE_PATH_1F
- warp_event 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE
+ warp_event 3, 15, ICE_PATH_1F, 3
+ warp_event 17, 3, ICE_PATH_B2F_MAHOGANY_SIDE, 1
+ warp_event 11, 2, ICE_PATH_B2F_MAHOGANY_SIDE, 3 ; hole
+ warp_event 4, 7, ICE_PATH_B2F_MAHOGANY_SIDE, 4 ; hole
+ warp_event 5, 12, ICE_PATH_B2F_MAHOGANY_SIDE, 5 ; hole
+ warp_event 12, 13, ICE_PATH_B2F_MAHOGANY_SIDE, 6 ; hole
+ warp_event 5, 25, ICE_PATH_1F, 4
+ warp_event 11, 27, ICE_PATH_B2F_BLACKTHORN_SIDE, 1
db 0 ; coord events
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -16,8 +16,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 15, 8, ICE_PATH_B1F
- warp_event 3, 3, 2, ICE_PATH_B3F
+ warp_event 3, 15, ICE_PATH_B1F, 8
+ warp_event 3, 3, ICE_PATH_B3F, 2
db 0 ; coord events
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -32,12 +32,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 17, 1, 2, ICE_PATH_B1F
- warp_event 9, 11, 1, ICE_PATH_B3F
- warp_event 11, 4, 3, ICE_PATH_B1F
- warp_event 4, 6, 4, ICE_PATH_B1F
- warp_event 4, 12, 5, ICE_PATH_B1F
- warp_event 12, 12, 6, ICE_PATH_B1F
+ warp_event 17, 1, ICE_PATH_B1F, 2
+ warp_event 9, 11, ICE_PATH_B3F, 1
+ warp_event 11, 4, ICE_PATH_B1F, 3
+ warp_event 4, 6, ICE_PATH_B1F, 4
+ warp_event 4, 12, ICE_PATH_B1F, 5
+ warp_event 12, 12, ICE_PATH_B1F, 6
db 0 ; coord events
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -17,8 +17,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE
- warp_event 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE
+ warp_event 3, 5, ICE_PATH_B2F_MAHOGANY_SIDE, 2
+ warp_event 15, 5, ICE_PATH_B2F_BLACKTHORN_SIDE, 2
db 0 ; coord events
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -939,9 +939,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE
- warp_event 3, 42, 1, ILEX_FOREST_AZALEA_GATE
- warp_event 3, 43, 2, ILEX_FOREST_AZALEA_GATE
+ warp_event 1, 5, ROUTE_34_ILEX_FOREST_GATE, 3
+ warp_event 3, 42, ILEX_FOREST_AZALEA_GATE, 1
+ warp_event 3, 43, ILEX_FOREST_AZALEA_GATE, 2
db 0 ; coord events
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -32,10 +32,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 2, ILEX_FOREST
- warp_event 0, 5, 3, ILEX_FOREST
- warp_event 9, 4, 7, AZALEA_TOWN
- warp_event 9, 5, 8, AZALEA_TOWN
+ warp_event 0, 4, ILEX_FOREST, 2
+ warp_event 0, 5, ILEX_FOREST, 3
+ warp_event 9, 4, AZALEA_TOWN, 7
+ warp_event 9, 5, AZALEA_TOWN, 8
db 0 ; coord events
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -304,10 +304,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 5, 13, 1, ROUTE_23
- warp_event 6, 13, 2, ROUTE_23
- warp_event 0, 13, 1, POKECENTER_2F
- warp_event 14, 3, 1, WILLS_ROOM
+ warp_event 5, 13, ROUTE_23, 1
+ warp_event 6, 13, ROUTE_23, 2
+ warp_event 0, 13, POKECENTER_2F, 1
+ warp_event 14, 3, WILLS_ROOM, 1
db 2 ; coord events
coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -134,10 +134,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 17, 3, BRUNOS_ROOM
- warp_event 5, 17, 4, BRUNOS_ROOM
- warp_event 4, 2, 1, LANCES_ROOM
- warp_event 5, 2, 2, LANCES_ROOM
+ warp_event 4, 17, BRUNOS_ROOM, 3
+ warp_event 5, 17, BRUNOS_ROOM, 4
+ warp_event 4, 2, LANCES_ROOM, 1
+ warp_event 5, 2, LANCES_ROOM, 2
db 0 ; coord events
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -131,10 +131,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 17, 2, WILLS_ROOM
- warp_event 5, 17, 3, WILLS_ROOM
- warp_event 4, 2, 1, BRUNOS_ROOM
- warp_event 5, 2, 2, BRUNOS_ROOM
+ warp_event 4, 17, WILLS_ROOM, 2
+ warp_event 5, 17, WILLS_ROOM, 3
+ warp_event 4, 2, BRUNOS_ROOM, 1
+ warp_event 5, 2, BRUNOS_ROOM, 2
db 0 ; coord events
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -678,8 +678,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 7, 4, AZALEA_TOWN
- warp_event 4, 7, 4, AZALEA_TOWN
+ warp_event 3, 7, AZALEA_TOWN, 4
+ warp_event 4, 7, AZALEA_TOWN, 4
db 0 ; coord events
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -495,8 +495,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE
- warp_event 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE
+ warp_event 7, 3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1
+ warp_event 27, 31, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1
db 0 ; coord events
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -69,8 +69,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, LAKE_OF_RAGE
- warp_event 3, 7, 1, LAKE_OF_RAGE
+ warp_event 2, 7, LAKE_OF_RAGE, 1
+ warp_event 3, 7, LAKE_OF_RAGE, 1
db 0 ; coord events
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -208,8 +208,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, LAKE_OF_RAGE
- warp_event 3, 7, 2, LAKE_OF_RAGE
+ warp_event 2, 7, LAKE_OF_RAGE, 2
+ warp_event 3, 7, LAKE_OF_RAGE, 2
db 0 ; coord events
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -339,10 +339,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 23, 3, KARENS_ROOM
- warp_event 5, 23, 4, KARENS_ROOM
- warp_event 4, 1, 1, HALL_OF_FAME
- warp_event 5, 1, 2, HALL_OF_FAME
+ warp_event 4, 23, KARENS_ROOM, 3
+ warp_event 5, 23, KARENS_ROOM, 4
+ warp_event 4, 1, HALL_OF_FAME, 1
+ warp_event 5, 1, HALL_OF_FAME, 2
db 2 ; coord events
coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -223,8 +223,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 7, LAVENDER_TOWN
- warp_event 3, 7, 7, LAVENDER_TOWN
+ warp_event 2, 7, LAVENDER_TOWN, 7
+ warp_event 3, 7, LAVENDER_TOWN, 7
db 0 ; coord events
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -49,8 +49,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 5, LAVENDER_TOWN
- warp_event 3, 7, 5, LAVENDER_TOWN
+ warp_event 2, 7, LAVENDER_TOWN, 5
+ warp_event 3, 7, LAVENDER_TOWN, 5
db 0 ; coord events
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -25,8 +25,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, LAVENDER_TOWN
- warp_event 3, 7, 4, LAVENDER_TOWN
+ warp_event 2, 7, LAVENDER_TOWN, 4
+ warp_event 3, 7, LAVENDER_TOWN, 4
db 0 ; coord events
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -82,9 +82,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 1, LAVENDER_TOWN
- warp_event 4, 7, 1, LAVENDER_TOWN
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, LAVENDER_TOWN, 1
+ warp_event 4, 7, LAVENDER_TOWN, 1
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/LavenderPokecenter2FBeta.asm
+++ b/maps/LavenderPokecenter2FBeta.asm
@@ -7,7 +7,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 0, 7, 3, LAVENDER_POKECENTER_1F
+ warp_event 0, 7, LAVENDER_POKECENTER_1F, 3
db 0 ; coord events
--- a/maps/LavenderSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -30,8 +30,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, LAVENDER_TOWN
- warp_event 3, 7, 3, LAVENDER_TOWN
+ warp_event 2, 7, LAVENDER_TOWN, 3
+ warp_event 3, 7, LAVENDER_TOWN, 3
db 0 ; coord events
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -107,13 +107,13 @@
db 0, 0 ; filler
db 7 ; warp events
- warp_event 5, 5, 1, LAVENDER_POKECENTER_1F
- warp_event 5, 9, 1, MR_FUJIS_HOUSE
- warp_event 3, 13, 1, LAVENDER_SPEECH_HOUSE
- warp_event 7, 13, 1, LAVENDER_NAME_RATER
- warp_event 1, 5, 2, LAVENDER_MART
- warp_event 13, 11, 1, SOUL_HOUSE
- warp_event 14, 5, 1, LAV_RADIO_TOWER_1F
+ warp_event 5, 5, LAVENDER_POKECENTER_1F, 1
+ warp_event 5, 9, MR_FUJIS_HOUSE, 1
+ warp_event 3, 13, LAVENDER_SPEECH_HOUSE, 1
+ warp_event 7, 13, LAVENDER_NAME_RATER, 1
+ warp_event 1, 5, LAVENDER_MART, 2
+ warp_event 13, 11, SOUL_HOUSE, 1
+ warp_event 14, 5, LAV_RADIO_TOWER_1F, 1
db 0 ; coord events
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -374,8 +374,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 17, 3, MAHOGANY_TOWN
- warp_event 5, 17, 3, MAHOGANY_TOWN
+ warp_event 4, 17, MAHOGANY_TOWN, 3
+ warp_event 5, 17, MAHOGANY_TOWN, 3
db 0 ; coord events
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -222,9 +222,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 1, MAHOGANY_TOWN
- warp_event 4, 7, 1, MAHOGANY_TOWN
- warp_event 7, 3, 1, TEAM_ROCKET_BASE_B1F
+ warp_event 3, 7, MAHOGANY_TOWN, 1
+ warp_event 4, 7, MAHOGANY_TOWN, 1
+ warp_event 7, 3, TEAM_ROCKET_BASE_B1F, 1
db 0 ; coord events
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -55,9 +55,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 4, MAHOGANY_TOWN
- warp_event 4, 7, 4, MAHOGANY_TOWN
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, MAHOGANY_TOWN, 4
+ warp_event 4, 7, MAHOGANY_TOWN, 4
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -62,8 +62,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, MAHOGANY_TOWN
- warp_event 3, 7, 2, MAHOGANY_TOWN
+ warp_event 2, 7, MAHOGANY_TOWN, 2
+ warp_event 3, 7, MAHOGANY_TOWN, 2
db 0 ; coord events
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -246,11 +246,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 11, 7, 1, MAHOGANY_MART_1F
- warp_event 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE
- warp_event 6, 13, 1, MAHOGANY_GYM
- warp_event 15, 13, 1, MAHOGANY_POKECENTER_1F
- warp_event 9, 1, 3, ROUTE_43_MAHOGANY_GATE
+ warp_event 11, 7, MAHOGANY_MART_1F, 1
+ warp_event 17, 7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1
+ warp_event 6, 13, MAHOGANY_GYM, 1
+ warp_event 15, 13, MAHOGANY_POKECENTER_1F, 1
+ warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3
db 2 ; coord events
coord_event 19, 8, SCENE_DEFAULT, UnknownScript_0x190013
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -201,8 +201,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, CIANWOOD_CITY
- warp_event 3, 7, 1, CIANWOOD_CITY
+ warp_event 2, 7, CIANWOOD_CITY, 1
+ warp_event 3, 7, CIANWOOD_CITY, 1
db 0 ; coord events
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -68,8 +68,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 7, 6, POKECENTER_2F
- warp_event 5, 7, 6, POKECENTER_2F
+ warp_event 4, 7, POKECENTER_2F, 6
+ warp_event 5, 7, POKECENTER_2F, 6
db 0 ; coord events
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -36,8 +36,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 7, 5, POKECENTER_2F
- warp_event 5, 7, 5, POKECENTER_2F
+ warp_event 4, 7, POKECENTER_2F, 5
+ warp_event 5, 7, POKECENTER_2F, 5
db 0 ; coord events
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -162,14 +162,14 @@
db 0, 0 ; filler
db 8 ; warp events
- warp_event 3, 3, 1, ROUTE_3
- warp_event 15, 15, 1, ROUTE_4
- warp_event 13, 3, 7, MOUNT_MOON
- warp_event 15, 11, 8, MOUNT_MOON
- warp_event 25, 5, 1, MOUNT_MOON_SQUARE
- warp_event 25, 15, 2, MOUNT_MOON_SQUARE
- warp_event 25, 3, 3, MOUNT_MOON
- warp_event 25, 13, 4, MOUNT_MOON
+ warp_event 3, 3, ROUTE_3, 1
+ warp_event 15, 15, ROUTE_4, 1
+ warp_event 13, 3, MOUNT_MOON, 7
+ warp_event 15, 11, MOUNT_MOON, 8
+ warp_event 25, 5, MOUNT_MOON_SQUARE, 1
+ warp_event 25, 15, MOUNT_MOON_SQUARE, 2
+ warp_event 25, 3, MOUNT_MOON, 3
+ warp_event 25, 13, MOUNT_MOON, 4
db 0 ; coord events
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -29,8 +29,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 7, 3, MOUNT_MOON_SQUARE
- warp_event 4, 7, 3, MOUNT_MOON_SQUARE
+ warp_event 3, 7, MOUNT_MOON_SQUARE, 3
+ warp_event 4, 7, MOUNT_MOON_SQUARE, 3
db 0 ; coord events
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -134,9 +134,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 20, 5, 5, MOUNT_MOON
- warp_event 22, 11, 6, MOUNT_MOON
- warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP
+ warp_event 20, 5, MOUNT_MOON, 5
+ warp_event 22, 11, MOUNT_MOON, 6
+ warp_event 13, 7, MOUNT_MOON_GIFT_SHOP, 1
db 1 ; coord events
coord_event 7, 11, SCENE_DEFAULT, ClefairyDance
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -118,12 +118,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE
- warp_event 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE
- warp_event 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE
- warp_event 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE
- warp_event 3, 19, 1, MOUNT_MORTAR_B1F
- warp_event 9, 9, 2, MOUNT_MORTAR_2F_INSIDE
+ warp_event 11, 47, MOUNT_MORTAR_1F_OUTSIDE, 5
+ warp_event 29, 47, MOUNT_MORTAR_1F_OUTSIDE, 6
+ warp_event 5, 39, MOUNT_MORTAR_1F_OUTSIDE, 8
+ warp_event 33, 41, MOUNT_MORTAR_1F_OUTSIDE, 9
+ warp_event 3, 19, MOUNT_MORTAR_B1F, 1
+ warp_event 9, 9, MOUNT_MORTAR_2F_INSIDE, 2
db 0 ; coord events
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -20,15 +20,15 @@
db 0, 0 ; filler
db 9 ; warp events
- warp_event 3, 33, 3, ROUTE_42
- warp_event 17, 33, 4, ROUTE_42
- warp_event 37, 33, 5, ROUTE_42
- warp_event 17, 5, 1, MOUNT_MORTAR_2F_INSIDE
- warp_event 11, 21, 1, MOUNT_MORTAR_1F_INSIDE
- warp_event 29, 21, 2, MOUNT_MORTAR_1F_INSIDE
- warp_event 17, 29, 2, MOUNT_MORTAR_B1F
- warp_event 7, 13, 3, MOUNT_MORTAR_1F_INSIDE
- warp_event 33, 13, 4, MOUNT_MORTAR_1F_INSIDE
+ warp_event 3, 33, ROUTE_42, 3
+ warp_event 17, 33, ROUTE_42, 4
+ warp_event 37, 33, ROUTE_42, 5
+ warp_event 17, 5, MOUNT_MORTAR_2F_INSIDE, 1
+ warp_event 11, 21, MOUNT_MORTAR_1F_INSIDE, 1
+ warp_event 29, 21, MOUNT_MORTAR_1F_INSIDE, 2
+ warp_event 17, 29, MOUNT_MORTAR_B1F, 2
+ warp_event 7, 13, MOUNT_MORTAR_1F_INSIDE, 3
+ warp_event 33, 13, MOUNT_MORTAR_1F_INSIDE, 4
db 0 ; coord events
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -68,8 +68,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE
- warp_event 3, 5, 6, MOUNT_MORTAR_1F_INSIDE
+ warp_event 17, 33, MOUNT_MORTAR_1F_OUTSIDE, 4
+ warp_event 3, 5, MOUNT_MORTAR_1F_INSIDE, 6
db 0 ; coord events
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -136,8 +136,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 3, 5, MOUNT_MORTAR_1F_INSIDE
- warp_event 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE
+ warp_event 3, 3, MOUNT_MORTAR_1F_INSIDE, 5
+ warp_event 19, 29, MOUNT_MORTAR_1F_OUTSIDE, 7
db 0 ; coord events
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -21,8 +21,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 6, BLACKTHORN_CITY
- warp_event 3, 7, 6, BLACKTHORN_CITY
+ warp_event 2, 7, BLACKTHORN_CITY, 6
+ warp_event 3, 7, BLACKTHORN_CITY, 6
db 0 ; coord events
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -81,8 +81,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, LAVENDER_TOWN
- warp_event 3, 7, 2, LAVENDER_TOWN
+ warp_event 2, 7, LAVENDER_TOWN, 2
+ warp_event 3, 7, LAVENDER_TOWN, 2
db 0 ; coord events
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -374,8 +374,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, ROUTE_30
- warp_event 3, 7, 2, ROUTE_30
+ warp_event 2, 7, ROUTE_30, 2
+ warp_event 3, 7, ROUTE_30, 2
db 0 ; coord events
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -49,8 +49,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 5, SAFFRON_CITY
- warp_event 3, 7, 5, SAFFRON_CITY
+ warp_event 2, 7, SAFFRON_CITY, 5
+ warp_event 3, 7, SAFFRON_CITY, 5
db 0 ; coord events
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -515,10 +515,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
- warp_event 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE
- warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
- warp_event 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE
+ warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1
+ warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 2
+ warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
+ warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 2
db 0 ; coord events
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -222,10 +222,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
- warp_event 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE
- warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
- warp_event 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
+ warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1
+ warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 1
+ warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
+ warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
db 0 ; coord events
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -283,10 +283,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 6, 3, 1, ELMS_LAB
- warp_event 13, 5, 1, PLAYERS_HOUSE_1F
- warp_event 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE
- warp_event 11, 13, 1, ELMS_HOUSE
+ warp_event 6, 3, ELMS_LAB, 1
+ warp_event 13, 5, PLAYERS_HOUSE_1F, 1
+ warp_event 3, 11, PLAYERS_NEIGHBORS_HOUSE, 1
+ warp_event 11, 13, ELMS_HOUSE, 1
db 2 ; coord events
coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -258,8 +258,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 11, 3, PALLET_TOWN
- warp_event 5, 11, 3, PALLET_TOWN
+ warp_event 4, 11, PALLET_TOWN, 3
+ warp_event 5, 11, PALLET_TOWN, 3
db 0 ; coord events
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -80,8 +80,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 7, OLIVINE_CITY
- warp_event 3, 7, 7, OLIVINE_CITY
+ warp_event 2, 7, OLIVINE_CITY, 7
+ warp_event 3, 7, OLIVINE_CITY, 7
db 0 ; coord events
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -289,17 +289,17 @@
db 0, 0 ; filler
db 11 ; warp events
- warp_event 13, 21, 1, OLIVINE_POKECENTER_1F
- warp_event 10, 11, 1, OLIVINE_GYM
- warp_event 25, 11, 1, OLIVINE_TIMS_HOUSE
- warp_event 0, 0, 1, OLIVINE_HOUSE_BETA
- warp_event 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE
- warp_event 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE
- warp_event 7, 21, 1, OLIVINE_CAFE
- warp_event 19, 17, 2, OLIVINE_MART
- warp_event 29, 27, 1, OLIVINE_LIGHTHOUSE_1F
- warp_event 19, 27, 1, OLIVINE_PORT_PASSAGE
- warp_event 20, 27, 2, OLIVINE_PORT_PASSAGE
+ warp_event 13, 21, OLIVINE_POKECENTER_1F, 1
+ warp_event 10, 11, OLIVINE_GYM, 1
+ warp_event 25, 11, OLIVINE_TIMS_HOUSE, 1
+ warp_event 0, 0, OLIVINE_HOUSE_BETA, 1
+ warp_event 29, 11, OLIVINE_PUNISHMENT_SPEECH_HOUSE, 1
+ warp_event 13, 15, OLIVINE_GOOD_ROD_HOUSE, 1
+ warp_event 7, 21, OLIVINE_CAFE, 1
+ warp_event 19, 17, OLIVINE_MART, 2
+ warp_event 29, 27, OLIVINE_LIGHTHOUSE_1F, 1
+ warp_event 19, 27, OLIVINE_PORT_PASSAGE, 1
+ warp_event 20, 27, OLIVINE_PORT_PASSAGE, 2
db 2 ; coord events
coord_event 13, 12, SCENE_DEFAULT, UnknownScript_0x1a8833
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -84,8 +84,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 6, OLIVINE_CITY
- warp_event 3, 7, 6, OLIVINE_CITY
+ warp_event 2, 7, OLIVINE_CITY, 6
+ warp_event 3, 7, OLIVINE_CITY, 6
db 0 ; coord events
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -199,8 +199,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 15, 2, OLIVINE_CITY
- warp_event 5, 15, 2, OLIVINE_CITY
+ warp_event 4, 15, OLIVINE_CITY, 2
+ warp_event 5, 15, OLIVINE_CITY, 2
db 0 ; coord events
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -41,8 +41,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, OLIVINE_CITY
- warp_event 3, 7, 4, OLIVINE_CITY
+ warp_event 2, 7, OLIVINE_CITY, 4
+ warp_event 3, 7, OLIVINE_CITY, 4
db 0 ; coord events
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -38,11 +38,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 10, 17, 9, OLIVINE_CITY
- warp_event 11, 17, 9, OLIVINE_CITY
- warp_event 3, 11, 1, OLIVINE_LIGHTHOUSE_2F
- warp_event 16, 13, 3, OLIVINE_LIGHTHOUSE_2F
- warp_event 17, 13, 4, OLIVINE_LIGHTHOUSE_2F
+ warp_event 10, 17, OLIVINE_CITY, 9
+ warp_event 11, 17, OLIVINE_CITY, 9
+ warp_event 3, 11, OLIVINE_LIGHTHOUSE_2F, 1
+ warp_event 16, 13, OLIVINE_LIGHTHOUSE_2F, 3
+ warp_event 17, 13, OLIVINE_LIGHTHOUSE_2F, 4
db 0 ; coord events
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -206,12 +206,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 3, 11, 3, OLIVINE_LIGHTHOUSE_1F
- warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_3F
- warp_event 16, 13, 4, OLIVINE_LIGHTHOUSE_1F
- warp_event 17, 13, 5, OLIVINE_LIGHTHOUSE_1F
- warp_event 16, 11, 4, OLIVINE_LIGHTHOUSE_3F
- warp_event 17, 11, 5, OLIVINE_LIGHTHOUSE_3F
+ warp_event 3, 11, OLIVINE_LIGHTHOUSE_1F, 3
+ warp_event 5, 3, OLIVINE_LIGHTHOUSE_3F, 2
+ warp_event 16, 13, OLIVINE_LIGHTHOUSE_1F, 4
+ warp_event 17, 13, OLIVINE_LIGHTHOUSE_1F, 5
+ warp_event 16, 11, OLIVINE_LIGHTHOUSE_3F, 4
+ warp_event 17, 11, OLIVINE_LIGHTHOUSE_3F, 5
db 0 ; coord events
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -114,15 +114,15 @@
db 0, 0 ; filler
db 9 ; warp events
- warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_4F
- warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_2F
- warp_event 9, 5, 4, OLIVINE_LIGHTHOUSE_4F
- warp_event 16, 11, 5, OLIVINE_LIGHTHOUSE_2F
- warp_event 17, 11, 6, OLIVINE_LIGHTHOUSE_2F
- warp_event 16, 9, 5, OLIVINE_LIGHTHOUSE_4F
- warp_event 17, 9, 6, OLIVINE_LIGHTHOUSE_4F
- warp_event 8, 3, 7, OLIVINE_LIGHTHOUSE_4F
- warp_event 9, 3, 8, OLIVINE_LIGHTHOUSE_4F
+ warp_event 13, 3, OLIVINE_LIGHTHOUSE_4F, 1
+ warp_event 5, 3, OLIVINE_LIGHTHOUSE_2F, 2
+ warp_event 9, 5, OLIVINE_LIGHTHOUSE_4F, 4
+ warp_event 16, 11, OLIVINE_LIGHTHOUSE_2F, 5
+ warp_event 17, 11, OLIVINE_LIGHTHOUSE_2F, 6
+ warp_event 16, 9, OLIVINE_LIGHTHOUSE_4F, 5
+ warp_event 17, 9, OLIVINE_LIGHTHOUSE_4F, 6
+ warp_event 8, 3, OLIVINE_LIGHTHOUSE_4F, 7
+ warp_event 9, 3, OLIVINE_LIGHTHOUSE_4F, 8
db 0 ; coord events
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -83,16 +83,16 @@
db 0, 0 ; filler
db 10 ; warp events
- warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_3F
- warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_5F
- warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_5F
- warp_event 9, 5, 3, OLIVINE_LIGHTHOUSE_3F
- warp_event 16, 9, 6, OLIVINE_LIGHTHOUSE_3F
- warp_event 17, 9, 7, OLIVINE_LIGHTHOUSE_3F
- warp_event 8, 3, 8, OLIVINE_LIGHTHOUSE_3F
- warp_event 9, 3, 9, OLIVINE_LIGHTHOUSE_3F
- warp_event 16, 7, 4, OLIVINE_LIGHTHOUSE_5F
- warp_event 17, 7, 5, OLIVINE_LIGHTHOUSE_5F
+ warp_event 13, 3, OLIVINE_LIGHTHOUSE_3F, 1
+ warp_event 3, 5, OLIVINE_LIGHTHOUSE_5F, 2
+ warp_event 9, 7, OLIVINE_LIGHTHOUSE_5F, 3
+ warp_event 9, 5, OLIVINE_LIGHTHOUSE_3F, 3
+ warp_event 16, 9, OLIVINE_LIGHTHOUSE_3F, 6
+ warp_event 17, 9, OLIVINE_LIGHTHOUSE_3F, 7
+ warp_event 8, 3, OLIVINE_LIGHTHOUSE_3F, 8
+ warp_event 9, 3, OLIVINE_LIGHTHOUSE_3F, 9
+ warp_event 16, 7, OLIVINE_LIGHTHOUSE_5F, 4
+ warp_event 17, 7, OLIVINE_LIGHTHOUSE_5F, 5
db 0 ; coord events
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -92,13 +92,13 @@
db 0, 0 ; filler
db 7 ; warp events
- warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_6F
- warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_4F
- warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_4F
- warp_event 16, 7, 9, OLIVINE_LIGHTHOUSE_4F
- warp_event 17, 7, 10, OLIVINE_LIGHTHOUSE_4F
- warp_event 16, 5, 2, OLIVINE_LIGHTHOUSE_6F
- warp_event 17, 5, 3, OLIVINE_LIGHTHOUSE_6F
+ warp_event 9, 15, OLIVINE_LIGHTHOUSE_6F, 1
+ warp_event 3, 5, OLIVINE_LIGHTHOUSE_4F, 2
+ warp_event 9, 7, OLIVINE_LIGHTHOUSE_4F, 3
+ warp_event 16, 7, OLIVINE_LIGHTHOUSE_4F, 9
+ warp_event 17, 7, OLIVINE_LIGHTHOUSE_4F, 10
+ warp_event 16, 5, OLIVINE_LIGHTHOUSE_6F, 2
+ warp_event 17, 5, OLIVINE_LIGHTHOUSE_6F, 3
db 0 ; coord events
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -259,9 +259,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_5F
- warp_event 16, 5, 6, OLIVINE_LIGHTHOUSE_5F
- warp_event 17, 5, 7, OLIVINE_LIGHTHOUSE_5F
+ warp_event 9, 15, OLIVINE_LIGHTHOUSE_5F, 1
+ warp_event 16, 5, OLIVINE_LIGHTHOUSE_5F, 6
+ warp_event 17, 5, OLIVINE_LIGHTHOUSE_5F, 7
db 0 ; coord events
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -47,8 +47,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 8, OLIVINE_CITY
- warp_event 3, 7, 8, OLIVINE_CITY
+ warp_event 2, 7, OLIVINE_CITY, 8
+ warp_event 3, 7, OLIVINE_CITY, 8
db 0 ; coord events
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -49,9 +49,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 1, OLIVINE_CITY
- warp_event 4, 7, 1, OLIVINE_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, OLIVINE_CITY, 1
+ warp_event 4, 7, OLIVINE_CITY, 1
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -386,8 +386,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 11, 7, 5, OLIVINE_PORT_PASSAGE
- warp_event 7, 23, 1, FAST_SHIP_1F
+ warp_event 11, 7, OLIVINE_PORT_PASSAGE, 5
+ warp_event 7, 23, FAST_SHIP_1F, 1
db 1 ; coord events
coord_event 7, 15, SCENE_DEFAULT, UnknownScript_0x7491f
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -21,11 +21,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 15, 0, 10, OLIVINE_CITY
- warp_event 16, 0, 11, OLIVINE_CITY
- warp_event 15, 4, 4, OLIVINE_PORT_PASSAGE
- warp_event 3, 2, 3, OLIVINE_PORT_PASSAGE
- warp_event 3, 14, 1, OLIVINE_PORT
+ warp_event 15, 0, OLIVINE_CITY, 10
+ warp_event 16, 0, OLIVINE_CITY, 11
+ warp_event 15, 4, OLIVINE_PORT_PASSAGE, 4
+ warp_event 3, 2, OLIVINE_PORT_PASSAGE, 3
+ warp_event 3, 14, OLIVINE_PORT, 1
db 0 ; coord events
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -41,8 +41,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 5, OLIVINE_CITY
- warp_event 3, 7, 5, OLIVINE_CITY
+ warp_event 2, 7, OLIVINE_CITY, 5
+ warp_event 3, 7, OLIVINE_CITY, 5
db 0 ; coord events
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -21,8 +21,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, OLIVINE_CITY
- warp_event 3, 7, 3, OLIVINE_CITY
+ warp_event 2, 7, OLIVINE_CITY, 3
+ warp_event 3, 7, OLIVINE_CITY, 3
db 0 ; coord events
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -71,9 +71,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 5, 5, 1, REDS_HOUSE_1F
- warp_event 13, 5, 1, BLUES_HOUSE
- warp_event 12, 11, 1, OAKS_LAB
+ warp_event 5, 5, REDS_HOUSE_1F, 1
+ warp_event 13, 5, BLUES_HOUSE, 1
+ warp_event 12, 11, OAKS_LAB, 1
db 0 ; coord events
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -154,11 +154,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE
- warp_event 16, 17, 1, PEWTER_GYM
- warp_event 23, 17, 2, PEWTER_MART
- warp_event 13, 25, 1, PEWTER_POKECENTER_1F
- warp_event 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE
+ warp_event 29, 13, PEWTER_NIDORAN_SPEECH_HOUSE, 1
+ warp_event 16, 17, PEWTER_GYM, 1
+ warp_event 23, 17, PEWTER_MART, 2
+ warp_event 13, 25, PEWTER_POKECENTER_1F, 1
+ warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1
db 0 ; coord events
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -210,8 +210,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 13, 2, PEWTER_CITY
- warp_event 5, 13, 2, PEWTER_CITY
+ warp_event 4, 13, PEWTER_CITY, 2
+ warp_event 5, 13, PEWTER_CITY, 2
db 0 ; coord events
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -47,8 +47,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, PEWTER_CITY
- warp_event 3, 7, 3, PEWTER_CITY
+ warp_event 2, 7, PEWTER_CITY, 3
+ warp_event 3, 7, PEWTER_CITY, 3
db 0 ; coord events
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -30,8 +30,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, PEWTER_CITY
- warp_event 3, 7, 1, PEWTER_CITY
+ warp_event 2, 7, PEWTER_CITY, 1
+ warp_event 3, 7, PEWTER_CITY, 1
db 0 ; coord events
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -69,9 +69,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 4, PEWTER_CITY
- warp_event 4, 7, 4, PEWTER_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, PEWTER_CITY, 4
+ warp_event 4, 7, PEWTER_CITY, 4
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/PewterPokecenter2FBeta.asm
+++ b/maps/PewterPokecenter2FBeta.asm
@@ -7,7 +7,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 0, 7, 3, PEWTER_POKECENTER_1F
+ warp_event 0, 7, PEWTER_POKECENTER_1F, 3
db 0 ; coord events
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -22,8 +22,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 5, PEWTER_CITY
- warp_event 3, 7, 5, PEWTER_CITY
+ warp_event 2, 7, PEWTER_CITY, 5
+ warp_event 3, 7, PEWTER_CITY, 5
db 0 ; coord events
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -387,9 +387,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 6, 7, 2, NEW_BARK_TOWN
- warp_event 7, 7, 2, NEW_BARK_TOWN
- warp_event 9, 0, 1, PLAYERS_HOUSE_2F
+ warp_event 6, 7, NEW_BARK_TOWN, 2
+ warp_event 7, 7, NEW_BARK_TOWN, 2
+ warp_event 9, 0, PLAYERS_HOUSE_2F, 1
db 2 ; coord events
coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -117,7 +117,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 7, 0, 3, PLAYERS_HOUSE_1F
+ warp_event 7, 0, PLAYERS_HOUSE_1F, 3
db 0 ; coord events
--- a/maps/PlayersNeighborsHouse.asm
+++ b/maps/PlayersNeighborsHouse.asm
@@ -100,8 +100,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, NEW_BARK_TOWN
- warp_event 3, 7, 3, NEW_BARK_TOWN
+ warp_event 2, 7, NEW_BARK_TOWN, 3
+ warp_event 3, 7, NEW_BARK_TOWN, 3
db 0 ; coord events
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -18,8 +18,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 7, CIANWOOD_CITY
- warp_event 3, 7, 7, CIANWOOD_CITY
+ warp_event 2, 7, CIANWOOD_CITY, 7
+ warp_event 3, 7, CIANWOOD_CITY, 7
db 0 ; coord events
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -1024,12 +1024,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 0, 7, -1, POKECENTER_2F
- warp_event 5, 0, 1, TRADE_CENTER
- warp_event 9, 0, 1, COLOSSEUM
- warp_event 13, 2, 1, TIME_CAPSULE
- warp_event 6, 0, 1, MOBILE_TRADE_ROOM
- warp_event 10, 0, 1, MOBILE_BATTLE_ROOM
+ warp_event 0, 7, POKECENTER_2F, -1
+ warp_event 5, 0, TRADE_CENTER, 1
+ warp_event 9, 0, COLOSSEUM, 1
+ warp_event 13, 2, TIME_CAPSULE, 1
+ warp_event 6, 0, MOBILE_TRADE_ROOM, 1
+ warp_event 10, 0, MOBILE_BATTLE_ROOM, 1
db 0 ; coord events
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -264,8 +264,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 0, 31, 3, GOLDENROD_POKECENTER_1F
- warp_event 1, 31, 3, GOLDENROD_POKECENTER_1F
+ warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3
+ warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3
db 0 ; coord events
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -298,8 +298,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, VERMILION_CITY
- warp_event 3, 7, 3, VERMILION_CITY
+ warp_event 2, 7, VERMILION_CITY, 3
+ warp_event 3, 7, VERMILION_CITY, 3
db 0 ; coord events
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -390,8 +390,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 17, 2, ROUTE_10_NORTH
- warp_event 3, 17, 2, ROUTE_10_NORTH
+ warp_event 2, 17, ROUTE_10_NORTH, 2
+ warp_event 3, 17, ROUTE_10_NORTH, 2
db 1 ; coord events
coord_event 5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -474,9 +474,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 2, 7, 11, GOLDENROD_CITY
- warp_event 3, 7, 11, GOLDENROD_CITY
- warp_event 15, 0, 2, RADIO_TOWER_2F
+ warp_event 2, 7, GOLDENROD_CITY, 11
+ warp_event 3, 7, GOLDENROD_CITY, 11
+ warp_event 15, 0, RADIO_TOWER_2F, 2
db 0 ; coord events
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -712,8 +712,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 0, 0, 1, RADIO_TOWER_3F
- warp_event 15, 0, 3, RADIO_TOWER_1F
+ warp_event 0, 0, RADIO_TOWER_3F, 1
+ warp_event 15, 0, RADIO_TOWER_1F, 3
db 0 ; coord events
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -330,9 +330,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 0, 0, 1, RADIO_TOWER_2F
- warp_event 7, 0, 2, RADIO_TOWER_4F
- warp_event 17, 0, 4, RADIO_TOWER_4F
+ warp_event 0, 0, RADIO_TOWER_2F, 1
+ warp_event 7, 0, RADIO_TOWER_4F, 2
+ warp_event 17, 0, RADIO_TOWER_4F, 4
db 0 ; coord events
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -247,10 +247,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 0, 1, RADIO_TOWER_5F
- warp_event 9, 0, 2, RADIO_TOWER_3F
- warp_event 12, 0, 2, RADIO_TOWER_5F
- warp_event 17, 0, 3, RADIO_TOWER_3F
+ warp_event 0, 0, RADIO_TOWER_5F, 1
+ warp_event 9, 0, RADIO_TOWER_3F, 2
+ warp_event 12, 0, RADIO_TOWER_5F, 2
+ warp_event 17, 0, RADIO_TOWER_3F, 3
db 0 ; coord events
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -422,8 +422,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 0, 0, 1, RADIO_TOWER_4F
- warp_event 12, 0, 3, RADIO_TOWER_4F
+ warp_event 0, 0, RADIO_TOWER_4F, 1
+ warp_event 12, 0, RADIO_TOWER_4F, 3
db 2 ; coord events
coord_event 0, 3, SCENE_DEFAULT, FakeDirectorScript
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -76,9 +76,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 2, 7, 1, PALLET_TOWN
- warp_event 3, 7, 1, PALLET_TOWN
- warp_event 7, 0, 1, REDS_HOUSE_2F
+ warp_event 2, 7, PALLET_TOWN, 1
+ warp_event 3, 7, PALLET_TOWN, 1
+ warp_event 7, 0, REDS_HOUSE_2F, 1
db 0 ; coord events
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -27,7 +27,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 7, 0, 3, REDS_HOUSE_1F
+ warp_event 7, 0, REDS_HOUSE_1F, 3
db 0 ; coord events
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -23,12 +23,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 15, 3, 1, ROUTE_9
- warp_event 11, 25, 1, ROUTE_10_SOUTH
- warp_event 5, 3, 3, ROCK_TUNNEL_B1F
- warp_event 15, 9, 2, ROCK_TUNNEL_B1F
- warp_event 27, 3, 4, ROCK_TUNNEL_B1F
- warp_event 27, 13, 1, ROCK_TUNNEL_B1F
+ warp_event 15, 3, ROUTE_9, 1
+ warp_event 11, 25, ROUTE_10_SOUTH, 1
+ warp_event 5, 3, ROCK_TUNNEL_B1F, 3
+ warp_event 15, 9, ROCK_TUNNEL_B1F, 2
+ warp_event 27, 3, ROCK_TUNNEL_B1F, 4
+ warp_event 27, 13, ROCK_TUNNEL_B1F, 1
db 0 ; coord events
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -24,10 +24,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 3, 3, 6, ROCK_TUNNEL_1F
- warp_event 17, 9, 4, ROCK_TUNNEL_1F
- warp_event 23, 3, 3, ROCK_TUNNEL_1F
- warp_event 25, 23, 5, ROCK_TUNNEL_1F
+ warp_event 3, 3, ROCK_TUNNEL_1F, 6
+ warp_event 17, 9, ROCK_TUNNEL_1F, 4
+ warp_event 23, 3, ROCK_TUNNEL_1F, 3
+ warp_event 25, 23, ROCK_TUNNEL_1F, 5
db 0 ; coord events
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -17,8 +17,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 11, 1, 1, ROUTE_10_POKECENTER_1F
- warp_event 3, 9, 1, POWER_PLANT
+ warp_event 11, 1, ROUTE_10_POKECENTER_1F, 1
+ warp_event 3, 9, POWER_PLANT, 1
db 0 ; coord events
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -82,9 +82,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 1, ROUTE_10_NORTH
- warp_event 4, 7, 1, ROUTE_10_NORTH
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, ROUTE_10_NORTH, 1
+ warp_event 4, 7, ROUTE_10_NORTH, 1
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/Route10Pokecenter2FBeta.asm
+++ b/maps/Route10Pokecenter2FBeta.asm
@@ -7,7 +7,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 0, 7, 3, ROUTE_10_POKECENTER_1F
+ warp_event 0, 7, ROUTE_10_POKECENTER_1F, 3
db 0 ; coord events
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -77,7 +77,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 6, 1, 2, ROCK_TUNNEL_1F
+ warp_event 6, 1, ROCK_TUNNEL_1F, 2
db 0 ; coord events
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -168,7 +168,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE
+ warp_event 11, 33, ROUTE_12_SUPER_ROD_HOUSE, 1
db 0 ; coord events
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -81,8 +81,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, ROUTE_12
- warp_event 3, 7, 1, ROUTE_12
+ warp_event 2, 7, ROUTE_12, 1
+ warp_event 3, 7, ROUTE_12, 1
db 0 ; coord events
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -203,8 +203,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 4, 3, ROUTE_15_FUCHSIA_GATE
- warp_event 2, 5, 4, ROUTE_15_FUCHSIA_GATE
+ warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3
+ warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4
db 0 ; coord events
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -21,10 +21,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 8, FUCHSIA_CITY
- warp_event 0, 5, 9, FUCHSIA_CITY
- warp_event 9, 4, 1, ROUTE_15
- warp_event 9, 5, 2, ROUTE_15
+ warp_event 0, 4, FUCHSIA_CITY, 8
+ warp_event 0, 5, FUCHSIA_CITY, 9
+ warp_event 9, 4, ROUTE_15, 1
+ warp_event 9, 5, ROUTE_15, 2
db 0 ; coord events
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -30,11 +30,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE
- warp_event 14, 6, 3, ROUTE_16_GATE
- warp_event 14, 7, 4, ROUTE_16_GATE
- warp_event 9, 6, 1, ROUTE_16_GATE
- warp_event 9, 7, 2, ROUTE_16_GATE
+ warp_event 3, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE, 1
+ warp_event 14, 6, ROUTE_16_GATE, 3
+ warp_event 14, 7, ROUTE_16_GATE, 4
+ warp_event 9, 6, ROUTE_16_GATE, 1
+ warp_event 9, 7, ROUTE_16_GATE, 2
db 0 ; coord events
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -24,8 +24,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, ROUTE_16
- warp_event 3, 7, 1, ROUTE_16
+ warp_event 2, 7, ROUTE_16, 1
+ warp_event 3, 7, ROUTE_16, 1
db 0 ; coord events
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -62,10 +62,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 4, ROUTE_16
- warp_event 0, 5, 5, ROUTE_16
- warp_event 9, 4, 2, ROUTE_16
- warp_event 9, 5, 3, ROUTE_16
+ warp_event 0, 4, ROUTE_16, 4
+ warp_event 0, 5, ROUTE_16, 5
+ warp_event 9, 4, ROUTE_16, 2
+ warp_event 9, 5, ROUTE_16, 3
db 2 ; coord events
coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -134,8 +134,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 17, 82, 1, ROUTE_17_ROUTE_18_GATE
- warp_event 17, 83, 2, ROUTE_17_ROUTE_18_GATE
+ warp_event 17, 82, ROUTE_17_ROUTE_18_GATE, 1
+ warp_event 17, 83, ROUTE_17_ROUTE_18_GATE, 2
db 0 ; coord events
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -53,10 +53,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 1, ROUTE_17
- warp_event 0, 5, 2, ROUTE_17
- warp_event 9, 4, 1, ROUTE_18
- warp_event 9, 5, 2, ROUTE_18
+ warp_event 0, 4, ROUTE_17, 1
+ warp_event 0, 5, ROUTE_17, 2
+ warp_event 9, 4, ROUTE_18, 1
+ warp_event 9, 5, ROUTE_18, 2
db 2 ; coord events
coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x73611
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -79,8 +79,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 6, 3, ROUTE_17_ROUTE_18_GATE
- warp_event 2, 7, 4, ROUTE_17_ROUTE_18_GATE
+ warp_event 2, 6, ROUTE_17_ROUTE_18_GATE, 3
+ warp_event 2, 7, ROUTE_17_ROUTE_18_GATE, 4
db 0 ; coord events
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -236,7 +236,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 7, 3, 3, ROUTE_19_FUCHSIA_GATE
+ warp_event 7, 3, ROUTE_19_FUCHSIA_GATE, 3
db 0 ; coord events
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -47,10 +47,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 10, FUCHSIA_CITY
- warp_event 5, 0, 11, FUCHSIA_CITY
- warp_event 4, 7, 1, ROUTE_19
- warp_event 5, 7, 1, ROUTE_19
+ warp_event 4, 0, FUCHSIA_CITY, 10
+ warp_event 5, 0, FUCHSIA_CITY, 11
+ warp_event 4, 7, ROUTE_19, 1
+ warp_event 5, 7, ROUTE_19, 1
db 0 ; coord events
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -148,11 +148,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 15, 15, 1, ROUTE_2_NUGGET_HOUSE
- warp_event 15, 31, 3, ROUTE_2_GATE
- warp_event 16, 27, 1, ROUTE_2_GATE
- warp_event 17, 27, 2, ROUTE_2_GATE
- warp_event 12, 7, 3, DIGLETTS_CAVE
+ warp_event 15, 15, ROUTE_2_NUGGET_HOUSE, 1
+ warp_event 15, 31, ROUTE_2_GATE, 3
+ warp_event 16, 27, ROUTE_2_GATE, 1
+ warp_event 17, 27, ROUTE_2_GATE, 2
+ warp_event 12, 7, DIGLETTS_CAVE, 3
db 0 ; coord events
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -114,7 +114,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 38, 7, 1, SEAFOAM_GYM
+ warp_event 38, 7, SEAFOAM_GYM, 1
db 0 ; coord events
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -17,7 +17,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 13, 5, 1, VICTORY_ROAD_GATE
+ warp_event 13, 5, VICTORY_ROAD_GATE, 1
db 0 ; coord events
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -24,10 +24,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F
- warp_event 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F
- warp_event 9, 13, 10, VICTORY_ROAD
- warp_event 10, 13, 10, VICTORY_ROAD
+ warp_event 9, 5, INDIGO_PLATEAU_POKECENTER_1F, 1
+ warp_event 10, 5, INDIGO_PLATEAU_POKECENTER_1F, 2
+ warp_event 9, 13, VICTORY_ROAD, 10
+ warp_event 10, 13, VICTORY_ROAD, 10
db 0 ; coord events
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -431,7 +431,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 47, 5, 1, BILLS_HOUSE
+ warp_event 47, 5, BILLS_HOUSE, 1
db 2 ; coord events
coord_event 42, 6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -414,9 +414,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 7, 5, 3, VICTORY_ROAD_GATE
- warp_event 15, 57, 1, ROUTE_26_HEAL_HOUSE
- warp_event 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE
+ warp_event 7, 5, VICTORY_ROAD_GATE, 3
+ warp_event 15, 57, ROUTE_26_HEAL_HOUSE, 1
+ warp_event 5, 71, DAY_OF_WEEK_SIBLINGS_HOUSE, 1
db 0 ; coord events
--- a/maps/Route26HealHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -50,8 +50,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, ROUTE_26
- warp_event 3, 7, 2, ROUTE_26
+ warp_event 2, 7, ROUTE_26, 2
+ warp_event 3, 7, ROUTE_26, 2
db 0 ; coord events
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -469,9 +469,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE
- warp_event 26, 5, 1, TOHJO_FALLS
- warp_event 36, 5, 2, TOHJO_FALLS
+ warp_event 33, 7, ROUTE_27_SANDSTORM_HOUSE, 1
+ warp_event 26, 5, TOHJO_FALLS, 1
+ warp_event 36, 5, TOHJO_FALLS, 2
db 2 ; coord events
coord_event 18, 10, SCENE_DEFAULT, UnknownScript_0x1a0873
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -95,8 +95,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, ROUTE_27
- warp_event 3, 7, 1, ROUTE_27
+ warp_event 2, 7, ROUTE_27, 1
+ warp_event 3, 7, ROUTE_27, 1
db 0 ; coord events
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -17,8 +17,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE
- warp_event 33, 5, 7, VICTORY_ROAD_GATE
+ warp_event 7, 3, ROUTE_28_STEEL_WING_HOUSE, 1
+ warp_event 33, 5, VICTORY_ROAD_GATE, 7
db 0 ; coord events
--- a/maps/Route28SteelWingHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -72,8 +72,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, ROUTE_28
- warp_event 3, 7, 1, ROUTE_28
+ warp_event 2, 7, ROUTE_28, 1
+ warp_event 3, 7, ROUTE_28, 1
db 0 ; coord events
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -417,7 +417,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE
+ warp_event 27, 1, ROUTE_29_ROUTE_46_GATE, 3
db 2 ; coord events
coord_event 53, 8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -38,10 +38,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 1, ROUTE_46
- warp_event 5, 0, 2, ROUTE_46
- warp_event 4, 7, 1, ROUTE_29
- warp_event 5, 7, 1, ROUTE_29
+ warp_event 4, 0, ROUTE_46, 1
+ warp_event 5, 0, ROUTE_46, 2
+ warp_event 4, 7, ROUTE_29, 1
+ warp_event 5, 7, ROUTE_29, 1
db 0 ; coord events
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -27,10 +27,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 3, ROUTE_2
- warp_event 5, 0, 4, ROUTE_2
- warp_event 4, 7, 2, ROUTE_2
- warp_event 5, 7, 2, ROUTE_2
+ warp_event 4, 0, ROUTE_2, 3
+ warp_event 5, 0, ROUTE_2, 4
+ warp_event 4, 7, ROUTE_2, 2
+ warp_event 5, 7, ROUTE_2, 2
db 0 ; coord events
--- a/maps/Route2NuggetHouse.asm
+++ b/maps/Route2NuggetHouse.asm
@@ -54,8 +54,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, ROUTE_2
- warp_event 3, 7, 1, ROUTE_2
+ warp_event 2, 7, ROUTE_2, 1
+ warp_event 3, 7, ROUTE_2, 1
db 0 ; coord events
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -134,7 +134,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 52, 1, 1, MOUNT_MOON
+ warp_event 52, 1, MOUNT_MOON, 1
db 0 ; coord events
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -408,8 +408,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 7, 39, 1, ROUTE_30_BERRY_HOUSE
- warp_event 17, 5, 1, MR_POKEMONS_HOUSE
+ warp_event 7, 39, ROUTE_30_BERRY_HOUSE, 1
+ warp_event 17, 5, MR_POKEMONS_HOUSE, 1
db 0 ; coord events
--- a/maps/Route30BerryHouse.asm
+++ b/maps/Route30BerryHouse.asm
@@ -48,8 +48,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, ROUTE_30
- warp_event 3, 7, 1, ROUTE_30
+ warp_event 2, 7, ROUTE_30, 1
+ warp_event 3, 7, ROUTE_30, 1
db 0 ; coord events
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -419,9 +419,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 4, 6, 3, ROUTE_31_VIOLET_GATE
- warp_event 4, 7, 4, ROUTE_31_VIOLET_GATE
- warp_event 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE
+ warp_event 4, 6, ROUTE_31_VIOLET_GATE, 3
+ warp_event 4, 7, ROUTE_31_VIOLET_GATE, 4
+ warp_event 34, 5, DARK_CAVE_VIOLET_ENTRANCE, 1
db 0 ; coord events
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -29,10 +29,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 8, VIOLET_CITY
- warp_event 0, 5, 9, VIOLET_CITY
- warp_event 9, 4, 1, ROUTE_31
- warp_event 9, 5, 2, ROUTE_31
+ warp_event 0, 4, VIOLET_CITY, 8
+ warp_event 0, 5, VIOLET_CITY, 9
+ warp_event 9, 4, ROUTE_31, 1
+ warp_event 9, 5, ROUTE_31, 2
db 0 ; coord events
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -930,10 +930,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 11, 73, 1, ROUTE_32_POKECENTER_1F
- warp_event 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE
- warp_event 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE
- warp_event 6, 79, 4, UNION_CAVE_1F
+ warp_event 11, 73, ROUTE_32_POKECENTER_1F, 1
+ warp_event 4, 2, ROUTE_32_RUINS_OF_ALPH_GATE, 3
+ warp_event 4, 3, ROUTE_32_RUINS_OF_ALPH_GATE, 4
+ warp_event 6, 79, UNION_CAVE_1F, 4
db 2 ; coord events
coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -96,9 +96,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 1, ROUTE_32
- warp_event 4, 7, 1, ROUTE_32
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, ROUTE_32, 1
+ warp_event 4, 7, ROUTE_32, 1
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -48,10 +48,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 10, RUINS_OF_ALPH_OUTSIDE
- warp_event 0, 5, 11, RUINS_OF_ALPH_OUTSIDE
- warp_event 9, 4, 2, ROUTE_32
- warp_event 9, 5, 3, ROUTE_32
+ warp_event 0, 4, RUINS_OF_ALPH_OUTSIDE, 10
+ warp_event 0, 5, RUINS_OF_ALPH_OUTSIDE, 11
+ warp_event 9, 4, ROUTE_32, 2
+ warp_event 9, 5, ROUTE_32, 3
db 0 ; coord events
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -196,7 +196,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 11, 9, 3, UNION_CAVE_1F
+ warp_event 11, 9, UNION_CAVE_1F, 3
db 0 ; coord events
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -762,11 +762,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE
- warp_event 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE
- warp_event 11, 14, 1, DAY_CARE
- warp_event 11, 15, 2, DAY_CARE
- warp_event 13, 15, 3, DAY_CARE
+ warp_event 13, 37, ROUTE_34_ILEX_FOREST_GATE, 1
+ warp_event 14, 37, ROUTE_34_ILEX_FOREST_GATE, 2
+ warp_event 11, 14, DAY_CARE, 1
+ warp_event 11, 15, DAY_CARE, 2
+ warp_event 13, 15, DAY_CARE, 3
db 0 ; coord events
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -137,10 +137,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 1, ROUTE_34
- warp_event 5, 0, 2, ROUTE_34
- warp_event 4, 7, 1, ILEX_FOREST
- warp_event 5, 7, 1, ILEX_FOREST
+ warp_event 4, 0, ROUTE_34, 1
+ warp_event 5, 0, ROUTE_34, 2
+ warp_event 4, 7, ILEX_FOREST, 1
+ warp_event 5, 7, ILEX_FOREST, 1
db 1 ; coord events
coord_event 4, 7, 0, UnknownScript_0x62d3d
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -464,9 +464,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 9, 33, 1, ROUTE_35_GOLDENROD_GATE
- warp_event 10, 33, 2, ROUTE_35_GOLDENROD_GATE
- warp_event 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE
+ warp_event 9, 33, ROUTE_35_GOLDENROD_GATE, 1
+ warp_event 10, 33, ROUTE_35_GOLDENROD_GATE, 2
+ warp_event 3, 5, ROUTE_35_NATIONAL_PARK_GATE, 3
db 0 ; coord events
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -197,10 +197,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 1, ROUTE_35
- warp_event 5, 0, 2, ROUTE_35
- warp_event 4, 7, 12, GOLDENROD_CITY
- warp_event 5, 7, 12, GOLDENROD_CITY
+ warp_event 4, 0, ROUTE_35, 1
+ warp_event 5, 0, ROUTE_35, 2
+ warp_event 4, 7, GOLDENROD_CITY, 12
+ warp_event 5, 7, GOLDENROD_CITY, 12
db 0 ; coord events
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -439,10 +439,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 3, 0, 3, NATIONAL_PARK
- warp_event 4, 0, 4, NATIONAL_PARK
- warp_event 3, 7, 3, ROUTE_35
- warp_event 4, 7, 3, ROUTE_35
+ warp_event 3, 0, NATIONAL_PARK, 3
+ warp_event 4, 0, NATIONAL_PARK, 4
+ warp_event 3, 7, ROUTE_35, 3
+ warp_event 4, 7, ROUTE_35, 3
db 0 ; coord events
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -661,10 +661,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE
- warp_event 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE
- warp_event 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE
- warp_event 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE
+ warp_event 18, 8, ROUTE_36_NATIONAL_PARK_GATE, 3
+ warp_event 18, 9, ROUTE_36_NATIONAL_PARK_GATE, 4
+ warp_event 47, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 1
+ warp_event 48, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 2
db 2 ; coord events
coord_event 20, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -851,10 +851,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 1, NATIONAL_PARK
- warp_event 0, 5, 2, NATIONAL_PARK
- warp_event 9, 4, 1, ROUTE_36
- warp_event 9, 5, 2, ROUTE_36
+ warp_event 0, 4, NATIONAL_PARK, 1
+ warp_event 0, 5, NATIONAL_PARK, 2
+ warp_event 9, 4, ROUTE_36, 1
+ warp_event 9, 5, ROUTE_36, 2
db 0 ; coord events
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -36,10 +36,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 3, ROUTE_36
- warp_event 5, 0, 4, ROUTE_36
- warp_event 4, 7, 9, RUINS_OF_ALPH_OUTSIDE
- warp_event 5, 7, 9, RUINS_OF_ALPH_OUTSIDE
+ warp_event 4, 0, ROUTE_36, 3
+ warp_event 5, 0, ROUTE_36, 4
+ warp_event 4, 7, RUINS_OF_ALPH_OUTSIDE, 9
+ warp_event 5, 7, RUINS_OF_ALPH_OUTSIDE, 9
db 0 ; coord events
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -474,8 +474,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 35, 8, 1, ROUTE_38_ECRUTEAK_GATE
- warp_event 35, 9, 2, ROUTE_38_ECRUTEAK_GATE
+ warp_event 35, 8, ROUTE_38_ECRUTEAK_GATE, 1
+ warp_event 35, 9, ROUTE_38_ECRUTEAK_GATE, 2
db 0 ; coord events
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -26,10 +26,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 1, ROUTE_38
- warp_event 0, 5, 2, ROUTE_38
- warp_event 9, 4, 14, ECRUTEAK_CITY
- warp_event 9, 5, 15, ECRUTEAK_CITY
+ warp_event 0, 4, ROUTE_38, 1
+ warp_event 0, 5, ROUTE_38, 2
+ warp_event 9, 4, ECRUTEAK_CITY, 14
+ warp_event 9, 5, ECRUTEAK_CITY, 15
db 0 ; coord events
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -345,8 +345,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 1, 3, 1, ROUTE_39_BARN
- warp_event 5, 3, 1, ROUTE_39_FARMHOUSE
+ warp_event 1, 3, ROUTE_39_BARN, 1
+ warp_event 5, 3, ROUTE_39_FARMHOUSE, 1
db 0 ; coord events
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -190,8 +190,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 7, 1, ROUTE_39
- warp_event 4, 7, 1, ROUTE_39
+ warp_event 3, 7, ROUTE_39, 1
+ warp_event 4, 7, ROUTE_39, 1
db 0 ; coord events
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -194,8 +194,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, ROUTE_39
- warp_event 3, 7, 2, ROUTE_39
+ warp_event 2, 7, ROUTE_39, 2
+ warp_event 3, 7, ROUTE_39, 2
db 0 ; coord events
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -122,7 +122,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 2, 5, 2, MOUNT_MOON
+ warp_event 2, 5, MOUNT_MOON, 2
db 0 ; coord events
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -339,7 +339,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE
+ warp_event 9, 5, ROUTE_40_BATTLE_TOWER_GATE, 1
db 0 ; coord events
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -72,10 +72,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 7, 1, ROUTE_40
- warp_event 5, 7, 1, ROUTE_40
- warp_event 4, 0, 1, BATTLE_TOWER_OUTSIDE
- warp_event 5, 0, 2, BATTLE_TOWER_OUTSIDE
+ warp_event 4, 7, ROUTE_40, 1
+ warp_event 5, 7, ROUTE_40, 1
+ warp_event 4, 0, BATTLE_TOWER_OUTSIDE, 1
+ warp_event 5, 0, BATTLE_TOWER_OUTSIDE, 2
db 0 ; coord events
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -343,10 +343,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 12, 17, 1, WHIRL_ISLAND_NW
- warp_event 36, 19, 1, WHIRL_ISLAND_NE
- warp_event 12, 37, 1, WHIRL_ISLAND_SW
- warp_event 36, 45, 1, WHIRL_ISLAND_SE
+ warp_event 12, 17, WHIRL_ISLAND_NW, 1
+ warp_event 36, 19, WHIRL_ISLAND_NE, 1
+ warp_event 12, 37, WHIRL_ISLAND_SW, 1
+ warp_event 36, 45, WHIRL_ISLAND_SE, 1
db 0 ; coord events
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -320,11 +320,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 0, 8, 3, ROUTE_42_ECRUTEAK_GATE
- warp_event 0, 9, 4, ROUTE_42_ECRUTEAK_GATE
- warp_event 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE
- warp_event 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE
- warp_event 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE
+ warp_event 0, 8, ROUTE_42_ECRUTEAK_GATE, 3
+ warp_event 0, 9, ROUTE_42_ECRUTEAK_GATE, 4
+ warp_event 10, 5, MOUNT_MORTAR_1F_OUTSIDE, 1
+ warp_event 28, 9, MOUNT_MORTAR_1F_OUTSIDE, 2
+ warp_event 46, 7, MOUNT_MORTAR_1F_OUTSIDE, 3
db 1 ; coord events
coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -21,10 +21,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 1, ECRUTEAK_CITY
- warp_event 0, 5, 2, ECRUTEAK_CITY
- warp_event 9, 4, 1, ROUTE_42
- warp_event 9, 5, 2, ROUTE_42
+ warp_event 0, 4, ECRUTEAK_CITY, 1
+ warp_event 0, 5, ECRUTEAK_CITY, 2
+ warp_event 9, 4, ROUTE_42, 1
+ warp_event 9, 5, ROUTE_42, 2
db 0 ; coord events
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -502,11 +502,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 9, 51, 1, ROUTE_43_MAHOGANY_GATE
- warp_event 10, 51, 2, ROUTE_43_MAHOGANY_GATE
- warp_event 17, 35, 3, ROUTE_43_GATE
- warp_event 17, 31, 1, ROUTE_43_GATE
- warp_event 18, 31, 2, ROUTE_43_GATE
+ warp_event 9, 51, ROUTE_43_MAHOGANY_GATE, 1
+ warp_event 10, 51, ROUTE_43_MAHOGANY_GATE, 2
+ warp_event 17, 35, ROUTE_43_GATE, 3
+ warp_event 17, 31, ROUTE_43_GATE, 1
+ warp_event 18, 31, ROUTE_43_GATE, 2
db 0 ; coord events
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -249,10 +249,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 4, ROUTE_43
- warp_event 5, 0, 5, ROUTE_43
- warp_event 4, 7, 3, ROUTE_43
- warp_event 5, 7, 3, ROUTE_43
+ warp_event 4, 0, ROUTE_43, 4
+ warp_event 5, 0, ROUTE_43, 5
+ warp_event 4, 7, ROUTE_43, 3
+ warp_event 5, 7, ROUTE_43, 3
db 0 ; coord events
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -40,10 +40,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 1, ROUTE_43
- warp_event 5, 0, 2, ROUTE_43
- warp_event 4, 7, 5, MAHOGANY_TOWN
- warp_event 5, 7, 5, MAHOGANY_TOWN
+ warp_event 4, 0, ROUTE_43, 1
+ warp_event 5, 0, ROUTE_43, 2
+ warp_event 4, 7, MAHOGANY_TOWN, 5
+ warp_event 5, 7, MAHOGANY_TOWN, 5
db 0 ; coord events
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -508,7 +508,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 56, 7, 1, ICE_PATH_1F
+ warp_event 56, 7, ICE_PATH_1F, 1
db 0 ; coord events
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -533,7 +533,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE
+ warp_event 2, 5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1
db 0 ; coord events
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -252,9 +252,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 7, 33, 1, ROUTE_29_ROUTE_46_GATE
- warp_event 8, 33, 2, ROUTE_29_ROUTE_46_GATE
- warp_event 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE
+ warp_event 7, 33, ROUTE_29_ROUTE_46_GATE, 1
+ warp_event 8, 33, ROUTE_29_ROUTE_46_GATE, 2
+ warp_event 14, 5, DARK_CAVE_VIOLET_ENTRANCE, 3
db 0 ; coord events
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -41,10 +41,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
- warp_event 8, 17, 1, ROUTE_5_SAFFRON_GATE
- warp_event 9, 17, 2, ROUTE_5_SAFFRON_GATE
- warp_event 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE
+ warp_event 17, 15, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 1
+ warp_event 8, 17, ROUTE_5_SAFFRON_GATE, 1
+ warp_event 9, 17, ROUTE_5_SAFFRON_GATE, 2
+ warp_event 10, 11, ROUTE_5_CLEANSE_TAG_HOUSE, 1
db 0 ; coord events
--- a/maps/Route5CleanseTagHouse.asm
+++ b/maps/Route5CleanseTagHouse.asm
@@ -62,8 +62,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, ROUTE_5
- warp_event 3, 7, 4, ROUTE_5
+ warp_event 2, 7, ROUTE_5, 4
+ warp_event 3, 7, ROUTE_5, 4
db 0 ; coord events
--- a/maps/Route5SaffronGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -22,10 +22,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 2, ROUTE_5
- warp_event 5, 0, 3, ROUTE_5
- warp_event 4, 7, 9, SAFFRON_CITY
- warp_event 5, 7, 9, SAFFRON_CITY
+ warp_event 4, 0, ROUTE_5, 2
+ warp_event 5, 0, ROUTE_5, 3
+ warp_event 4, 7, SAFFRON_CITY, 9
+ warp_event 5, 7, SAFFRON_CITY, 9
db 0 ; coord events
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -21,9 +21,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 1, ROUTE_5
- warp_event 4, 7, 1, ROUTE_5
- warp_event 4, 3, 1, UNDERGROUND_PATH
+ warp_event 3, 7, ROUTE_5, 1
+ warp_event 4, 7, ROUTE_5, 1
+ warp_event 4, 3, UNDERGROUND_PATH, 1
db 0 ; coord events
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -93,8 +93,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
- warp_event 6, 1, 3, ROUTE_6_SAFFRON_GATE
+ warp_event 17, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1
+ warp_event 6, 1, ROUTE_6_SAFFRON_GATE, 3
db 0 ; coord events
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -59,10 +59,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 12, SAFFRON_CITY
- warp_event 5, 0, 13, SAFFRON_CITY
- warp_event 4, 7, 2, ROUTE_6
- warp_event 5, 7, 2, ROUTE_6
+ warp_event 4, 0, SAFFRON_CITY, 12
+ warp_event 5, 0, SAFFRON_CITY, 13
+ warp_event 4, 7, ROUTE_6, 2
+ warp_event 5, 7, ROUTE_6, 2
db 0 ; coord events
--- a/maps/Route6UndergroundPathEntrance.asm
+++ b/maps/Route6UndergroundPathEntrance.asm
@@ -7,9 +7,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 1, ROUTE_6
- warp_event 4, 7, 1, ROUTE_6
- warp_event 4, 3, 2, UNDERGROUND_PATH
+ warp_event 3, 7, ROUTE_6, 1
+ warp_event 4, 7, ROUTE_6, 1
+ warp_event 4, 3, UNDERGROUND_PATH, 2
db 0 ; coord events
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -36,8 +36,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 15, 6, 1, ROUTE_7_SAFFRON_GATE
- warp_event 15, 7, 2, ROUTE_7_SAFFRON_GATE
+ warp_event 15, 6, ROUTE_7_SAFFRON_GATE, 1
+ warp_event 15, 7, ROUTE_7_SAFFRON_GATE, 2
db 0 ; coord events
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -47,10 +47,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 1, ROUTE_7
- warp_event 0, 5, 2, ROUTE_7
- warp_event 9, 4, 10, SAFFRON_CITY
- warp_event 9, 5, 11, SAFFRON_CITY
+ warp_event 0, 4, ROUTE_7, 1
+ warp_event 0, 5, ROUTE_7, 2
+ warp_event 9, 4, SAFFRON_CITY, 10
+ warp_event 9, 5, SAFFRON_CITY, 11
db 0 ; coord events
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -174,8 +174,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 4, 3, ROUTE_8_SAFFRON_GATE
- warp_event 4, 5, 4, ROUTE_8_SAFFRON_GATE
+ warp_event 4, 4, ROUTE_8_SAFFRON_GATE, 3
+ warp_event 4, 5, ROUTE_8_SAFFRON_GATE, 4
db 0 ; coord events
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -21,10 +21,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 0, 4, 14, SAFFRON_CITY
- warp_event 0, 5, 15, SAFFRON_CITY
- warp_event 9, 4, 1, ROUTE_8
- warp_event 9, 5, 2, ROUTE_8
+ warp_event 0, 4, SAFFRON_CITY, 14
+ warp_event 0, 5, SAFFRON_CITY, 15
+ warp_event 9, 4, ROUTE_8, 1
+ warp_event 9, 5, ROUTE_8, 2
db 0 ; coord events
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -207,7 +207,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 48, 15, 1, ROCK_TUNNEL_1F
+ warp_event 48, 15, ROCK_TUNNEL_1F, 1
db 0 ; coord events
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -145,11 +145,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 3, 9, 4, RUINS_OF_ALPH_OUTSIDE
- warp_event 4, 9, 4, RUINS_OF_ALPH_OUTSIDE
- warp_event 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER
- warp_event 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER
- warp_event 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
+ warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 4
+ warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 4
+ warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 8
+ warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 9
+ warp_event 4, 0, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 1
db 0 ; coord events
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -34,10 +34,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
- warp_event 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
- warp_event 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
- warp_event 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
+ warp_event 3, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5
+ warp_event 4, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5
+ warp_event 3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 1
+ warp_event 4, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 2
db 0 ; coord events
--- a/maps/RuinsOfAlphAerodactylWordRoom.asm
+++ b/maps/RuinsOfAlphAerodactylWordRoom.asm
@@ -7,9 +7,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
- warp_event 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
- warp_event 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER
+ warp_event 9, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 3
+ warp_event 10, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4
+ warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 8
db 0 ; coord events
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -146,11 +146,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 3, 9, 1, RUINS_OF_ALPH_OUTSIDE
- warp_event 4, 9, 1, RUINS_OF_ALPH_OUTSIDE
- warp_event 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER
- warp_event 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER
- warp_event 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
+ warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 1
+ warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 1
+ warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 2
+ warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 3
+ warp_event 4, 0, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 1
db 0 ; coord events
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -34,10 +34,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
- warp_event 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
- warp_event 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM
- warp_event 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM
+ warp_event 3, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
+ warp_event 4, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
+ warp_event 3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 1
+ warp_event 4, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 2
db 0 ; coord events
--- a/maps/RuinsOfAlphHoOhWordRoom.asm
+++ b/maps/RuinsOfAlphHoOhWordRoom.asm
@@ -7,9 +7,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
- warp_event 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
- warp_event 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER
+ warp_event 9, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 3
+ warp_event 10, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4
+ warp_event 17, 21, RUINS_OF_ALPH_INNER_CHAMBER, 2
db 0 ; coord events
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -78,15 +78,15 @@
db 0, 0 ; filler
db 9 ; warp events
- warp_event 10, 13, 5, RUINS_OF_ALPH_OUTSIDE
- warp_event 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER
- warp_event 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER
- warp_event 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER
- warp_event 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER
- warp_event 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER
- warp_event 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER
- warp_event 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER
- warp_event 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER
+ warp_event 10, 13, RUINS_OF_ALPH_OUTSIDE, 5
+ warp_event 3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3
+ warp_event 4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4
+ warp_event 15, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 3
+ warp_event 16, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 4
+ warp_event 3, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 3
+ warp_event 4, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 4
+ warp_event 15, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 3
+ warp_event 16, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4
db 0 ; coord events
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -257,11 +257,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 3, 9, 2, RUINS_OF_ALPH_OUTSIDE
- warp_event 4, 9, 2, RUINS_OF_ALPH_OUTSIDE
- warp_event 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER
- warp_event 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER
- warp_event 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
+ warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 2
+ warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 2
+ warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 4
+ warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 5
+ warp_event 4, 0, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 1
db 0 ; coord events
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -34,10 +34,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
- warp_event 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
- warp_event 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM
- warp_event 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM
+ warp_event 3, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5
+ warp_event 4, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5
+ warp_event 3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 1
+ warp_event 4, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 2
db 0 ; coord events
--- a/maps/RuinsOfAlphKabutoWordRoom.asm
+++ b/maps/RuinsOfAlphKabutoWordRoom.asm
@@ -7,9 +7,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
- warp_event 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
- warp_event 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER
+ warp_event 9, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 3
+ warp_event 10, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4
+ warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 4
db 0 ; coord events
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -146,11 +146,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 3, 9, 3, RUINS_OF_ALPH_OUTSIDE
- warp_event 4, 9, 3, RUINS_OF_ALPH_OUTSIDE
- warp_event 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER
- warp_event 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER
- warp_event 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
+ warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 3
+ warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 3
+ warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 6
+ warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 7
+ warp_event 4, 0, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 1
db 0 ; coord events
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -34,10 +34,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
- warp_event 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
- warp_event 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
- warp_event 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
+ warp_event 3, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
+ warp_event 4, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
+ warp_event 3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1
+ warp_event 4, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2
db 0 ; coord events
--- a/maps/RuinsOfAlphOmanyteWordRoom.asm
+++ b/maps/RuinsOfAlphOmanyteWordRoom.asm
@@ -7,9 +7,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
- warp_event 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
- warp_event 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER
+ warp_event 9, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 3
+ warp_event 10, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4
+ warp_event 17, 13, RUINS_OF_ALPH_INNER_CHAMBER, 6
db 0 ; coord events
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -282,17 +282,17 @@
db 0, 0 ; filler
db 11 ; warp events
- warp_event 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER
- warp_event 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER
- warp_event 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER
- warp_event 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER
- warp_event 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER
- warp_event 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER
- warp_event 6, 19, 1, UNION_CAVE_B1F
- warp_event 6, 27, 2, UNION_CAVE_B1F
- warp_event 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE
- warp_event 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE
- warp_event 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE
+ warp_event 2, 17, RUINS_OF_ALPH_HO_OH_CHAMBER, 1
+ warp_event 14, 7, RUINS_OF_ALPH_KABUTO_CHAMBER, 1
+ warp_event 2, 29, RUINS_OF_ALPH_OMANYTE_CHAMBER, 1
+ warp_event 16, 33, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 1
+ warp_event 10, 13, RUINS_OF_ALPH_INNER_CHAMBER, 1
+ warp_event 17, 11, RUINS_OF_ALPH_RESEARCH_CENTER, 1
+ warp_event 6, 19, UNION_CAVE_B1F, 1
+ warp_event 6, 27, UNION_CAVE_B1F, 2
+ warp_event 7, 5, ROUTE_36_RUINS_OF_ALPH_GATE, 3
+ warp_event 13, 20, ROUTE_32_RUINS_OF_ALPH_GATE, 1
+ warp_event 13, 21, ROUTE_32_RUINS_OF_ALPH_GATE, 2
db 2 ; coord events
coord_event 11, 14, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene1
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -394,8 +394,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 6, RUINS_OF_ALPH_OUTSIDE
- warp_event 3, 7, 6, RUINS_OF_ALPH_OUTSIDE
+ warp_event 2, 7, RUINS_OF_ALPH_OUTSIDE, 6
+ warp_event 3, 7, RUINS_OF_ALPH_OUTSIDE, 6
db 0 ; coord events
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -7,8 +7,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA
- warp_event 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA
+ warp_event 9, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 1
+ warp_event 10, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 2
db 0 ; coord events
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -7,10 +7,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 4, 0, 1, SAFARI_ZONE_BETA
- warp_event 5, 0, 2, SAFARI_ZONE_BETA
- warp_event 4, 7, 7, FUCHSIA_CITY
- warp_event 5, 7, 7, FUCHSIA_CITY
+ warp_event 4, 0, SAFARI_ZONE_BETA, 1
+ warp_event 5, 0, SAFARI_ZONE_BETA, 2
+ warp_event 4, 7, FUCHSIA_CITY, 7
+ warp_event 5, 7, FUCHSIA_CITY, 7
db 0 ; coord events
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -7,8 +7,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, FUCHSIA_CITY
- warp_event 3, 7, 2, FUCHSIA_CITY
+ warp_event 2, 7, FUCHSIA_CITY, 2
+ warp_event 3, 7, FUCHSIA_CITY, 2
db 0 ; coord events
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -78,8 +78,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 6, FUCHSIA_CITY
- warp_event 3, 7, 6, FUCHSIA_CITY
+ warp_event 2, 7, FUCHSIA_CITY, 6
+ warp_event 3, 7, FUCHSIA_CITY, 6
db 0 ; coord events
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -267,21 +267,21 @@
db 0, 0 ; filler
db 15 ; warp events
- warp_event 26, 3, 1, FIGHTING_DOJO
- warp_event 34, 3, 1, SAFFRON_GYM
- warp_event 25, 11, 2, SAFFRON_MART
- warp_event 9, 29, 1, SAFFRON_POKECENTER_1F
- warp_event 27, 29, 1, MR_PSYCHICS_HOUSE
- warp_event 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION
- warp_event 18, 21, 1, SILPH_CO_1F
- warp_event 9, 11, 1, COPYCATS_HOUSE_1F
- warp_event 18, 3, 3, ROUTE_5_SAFFRON_GATE
- warp_event 0, 24, 3, ROUTE_7_SAFFRON_GATE
- warp_event 0, 25, 4, ROUTE_7_SAFFRON_GATE
- warp_event 16, 33, 1, ROUTE_6_SAFFRON_GATE
- warp_event 17, 33, 2, ROUTE_6_SAFFRON_GATE
- warp_event 39, 22, 1, ROUTE_8_SAFFRON_GATE
- warp_event 39, 23, 2, ROUTE_8_SAFFRON_GATE
+ warp_event 26, 3, FIGHTING_DOJO, 1
+ warp_event 34, 3, SAFFRON_GYM, 1
+ warp_event 25, 11, SAFFRON_MART, 2
+ warp_event 9, 29, SAFFRON_POKECENTER_1F, 1
+ warp_event 27, 29, MR_PSYCHICS_HOUSE, 1
+ warp_event 8, 3, SAFFRON_MAGNET_TRAIN_STATION, 2
+ warp_event 18, 21, SILPH_CO_1F, 1
+ warp_event 9, 11, COPYCATS_HOUSE_1F, 1
+ warp_event 18, 3, ROUTE_5_SAFFRON_GATE, 3
+ warp_event 0, 24, ROUTE_7_SAFFRON_GATE, 3
+ warp_event 0, 25, ROUTE_7_SAFFRON_GATE, 4
+ warp_event 16, 33, ROUTE_6_SAFFRON_GATE, 1
+ warp_event 17, 33, ROUTE_6_SAFFRON_GATE, 2
+ warp_event 39, 22, ROUTE_8_SAFFRON_GATE, 1
+ warp_event 39, 23, ROUTE_8_SAFFRON_GATE, 2
db 0 ; coord events
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -292,38 +292,38 @@
db 0, 0 ; filler
db 32 ; warp events
- warp_event 8, 17, 2, SAFFRON_CITY
- warp_event 9, 17, 2, SAFFRON_CITY
- warp_event 11, 15, 18, SAFFRON_GYM
- warp_event 19, 15, 19, SAFFRON_GYM
- warp_event 19, 11, 20, SAFFRON_GYM
- warp_event 1, 11, 21, SAFFRON_GYM
- warp_event 5, 3, 22, SAFFRON_GYM
- warp_event 11, 5, 23, SAFFRON_GYM
- warp_event 1, 15, 24, SAFFRON_GYM
- warp_event 19, 3, 25, SAFFRON_GYM
- warp_event 15, 17, 26, SAFFRON_GYM
- warp_event 5, 17, 27, SAFFRON_GYM
- warp_event 5, 9, 28, SAFFRON_GYM
- warp_event 9, 3, 29, SAFFRON_GYM
- warp_event 15, 9, 30, SAFFRON_GYM
- warp_event 15, 5, 31, SAFFRON_GYM
- warp_event 1, 5, 32, SAFFRON_GYM
- warp_event 19, 17, 3, SAFFRON_GYM
- warp_event 19, 9, 4, SAFFRON_GYM
- warp_event 1, 9, 5, SAFFRON_GYM
- warp_event 5, 5, 6, SAFFRON_GYM
- warp_event 11, 3, 7, SAFFRON_GYM
- warp_event 1, 17, 8, SAFFRON_GYM
- warp_event 19, 5, 9, SAFFRON_GYM
- warp_event 15, 15, 10, SAFFRON_GYM
- warp_event 5, 15, 11, SAFFRON_GYM
- warp_event 5, 11, 12, SAFFRON_GYM
- warp_event 9, 5, 13, SAFFRON_GYM
- warp_event 15, 11, 14, SAFFRON_GYM
- warp_event 15, 3, 15, SAFFRON_GYM
- warp_event 1, 3, 16, SAFFRON_GYM
- warp_event 11, 9, 17, SAFFRON_GYM
+ warp_event 8, 17, SAFFRON_CITY, 2
+ warp_event 9, 17, SAFFRON_CITY, 2
+ warp_event 11, 15, SAFFRON_GYM, 18
+ warp_event 19, 15, SAFFRON_GYM, 19
+ warp_event 19, 11, SAFFRON_GYM, 20
+ warp_event 1, 11, SAFFRON_GYM, 21
+ warp_event 5, 3, SAFFRON_GYM, 22
+ warp_event 11, 5, SAFFRON_GYM, 23
+ warp_event 1, 15, SAFFRON_GYM, 24
+ warp_event 19, 3, SAFFRON_GYM, 25
+ warp_event 15, 17, SAFFRON_GYM, 26
+ warp_event 5, 17, SAFFRON_GYM, 27
+ warp_event 5, 9, SAFFRON_GYM, 28
+ warp_event 9, 3, SAFFRON_GYM, 29
+ warp_event 15, 9, SAFFRON_GYM, 30
+ warp_event 15, 5, SAFFRON_GYM, 31
+ warp_event 1, 5, SAFFRON_GYM, 32
+ warp_event 19, 17, SAFFRON_GYM, 3
+ warp_event 19, 9, SAFFRON_GYM, 4
+ warp_event 1, 9, SAFFRON_GYM, 5
+ warp_event 5, 5, SAFFRON_GYM, 6
+ warp_event 11, 3, SAFFRON_GYM, 7
+ warp_event 1, 17, SAFFRON_GYM, 8
+ warp_event 19, 5, SAFFRON_GYM, 9
+ warp_event 15, 15, SAFFRON_GYM, 10
+ warp_event 5, 15, SAFFRON_GYM, 11
+ warp_event 5, 11, SAFFRON_GYM, 12
+ warp_event 9, 5, SAFFRON_GYM, 13
+ warp_event 15, 11, SAFFRON_GYM, 14
+ warp_event 15, 3, SAFFRON_GYM, 15
+ warp_event 1, 3, SAFFRON_GYM, 16
+ warp_event 11, 9, SAFFRON_GYM, 17
db 0 ; coord events
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -217,10 +217,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 8, 17, 6, SAFFRON_CITY
- warp_event 9, 17, 6, SAFFRON_CITY
- warp_event 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION
- warp_event 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
+ warp_event 8, 17, SAFFRON_CITY, 6
+ warp_event 9, 17, SAFFRON_CITY, 6
+ warp_event 6, 5, GOLDENROD_MAGNET_TRAIN_STATION, 4
+ warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3
db 1 ; coord events
coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -39,8 +39,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 3, SAFFRON_CITY
- warp_event 3, 7, 3, SAFFRON_CITY
+ warp_event 2, 7, SAFFRON_CITY, 3
+ warp_event 3, 7, SAFFRON_CITY, 3
db 0 ; coord events
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -113,9 +113,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 4, SAFFRON_CITY
- warp_event 4, 7, 4, SAFFRON_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, SAFFRON_CITY, 4
+ warp_event 4, 7, SAFFRON_CITY, 4
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/SaffronPokecenter2FBeta.asm
+++ b/maps/SaffronPokecenter2FBeta.asm
@@ -7,7 +7,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 0, 7, 3, SAFFRON_POKECENTER_1F
+ warp_event 0, 7, SAFFRON_POKECENTER_1F, 3
db 0 ; coord events
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -159,7 +159,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 5, 5, 1, ROUTE_20
+ warp_event 5, 5, ROUTE_20, 1
db 0 ; coord events
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -57,8 +57,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 7, SAFFRON_CITY
- warp_event 3, 7, 7, SAFFRON_CITY
+ warp_event 2, 7, SAFFRON_CITY, 7
+ warp_event 3, 7, SAFFRON_CITY, 7
db 0 ; coord events
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -17,8 +17,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 13, 3, 3, SILVER_CAVE_ROOM_2
- warp_event 7, 15, 4, SILVER_CAVE_ROOM_2
+ warp_event 13, 3, SILVER_CAVE_ROOM_2, 3
+ warp_event 7, 15, SILVER_CAVE_ROOM_2, 4
db 0 ; coord events
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -25,8 +25,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 23, 19, 1, SILVER_CAVE_POKECENTER_1F
- warp_event 18, 11, 1, SILVER_CAVE_ROOM_1
+ warp_event 23, 19, SILVER_CAVE_POKECENTER_1F, 1
+ warp_event 18, 11, SILVER_CAVE_ROOM_1, 1
db 0 ; coord events
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -31,9 +31,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 1, SILVER_CAVE_OUTSIDE
- warp_event 4, 7, 1, SILVER_CAVE_OUTSIDE
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, SILVER_CAVE_OUTSIDE, 1
+ warp_event 4, 7, SILVER_CAVE_OUTSIDE, 1
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -31,8 +31,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 9, 33, 2, SILVER_CAVE_OUTSIDE
- warp_event 15, 1, 1, SILVER_CAVE_ROOM_2
+ warp_event 9, 33, SILVER_CAVE_OUTSIDE, 2
+ warp_event 15, 1, SILVER_CAVE_ROOM_2, 1
db 0 ; coord events
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -24,10 +24,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 17, 31, 2, SILVER_CAVE_ROOM_1
- warp_event 11, 5, 1, SILVER_CAVE_ROOM_3
- warp_event 13, 21, 1, SILVER_CAVE_ITEM_ROOMS
- warp_event 23, 3, 2, SILVER_CAVE_ITEM_ROOMS
+ warp_event 17, 31, SILVER_CAVE_ROOM_1, 2
+ warp_event 11, 5, SILVER_CAVE_ROOM_3, 1
+ warp_event 13, 21, SILVER_CAVE_ITEM_ROOMS, 1
+ warp_event 23, 3, SILVER_CAVE_ITEM_ROOMS, 2
db 0 ; coord events
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -52,7 +52,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 9, 33, 2, SILVER_CAVE_ROOM_2
+ warp_event 9, 33, SILVER_CAVE_ROOM_2, 2
db 0 ; coord events
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -322,8 +322,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 17, 15, 6, AZALEA_TOWN
- warp_event 7, 11, 1, SLOWPOKE_WELL_B2F
+ warp_event 17, 15, AZALEA_TOWN, 6
+ warp_event 7, 11, SLOWPOKE_WELL_B2F, 1
db 0 ; coord events
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -63,7 +63,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 9, 11, 2, SLOWPOKE_WELL_B1F
+ warp_event 9, 11, SLOWPOKE_WELL_B1F, 2
db 0 ; coord events
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -74,8 +74,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 7, 6, LAVENDER_TOWN
- warp_event 5, 7, 6, LAVENDER_TOWN
+ warp_event 4, 7, LAVENDER_TOWN, 6
+ warp_event 5, 7, LAVENDER_TOWN, 6
db 0 ; coord events
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -104,11 +104,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 9, 15, 7, VIOLET_CITY
- warp_event 10, 15, 7, VIOLET_CITY
- warp_event 6, 4, 1, SPROUT_TOWER_2F
- warp_event 2, 6, 2, SPROUT_TOWER_2F
- warp_event 17, 3, 3, SPROUT_TOWER_2F
+ warp_event 9, 15, VIOLET_CITY, 7
+ warp_event 10, 15, VIOLET_CITY, 7
+ warp_event 6, 4, SPROUT_TOWER_2F, 1
+ warp_event 2, 6, SPROUT_TOWER_2F, 2
+ warp_event 17, 3, SPROUT_TOWER_2F, 3
db 0 ; coord events
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -86,10 +86,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 6, 4, 3, SPROUT_TOWER_1F
- warp_event 2, 6, 4, SPROUT_TOWER_1F
- warp_event 17, 3, 5, SPROUT_TOWER_1F
- warp_event 10, 14, 1, SPROUT_TOWER_3F
+ warp_event 6, 4, SPROUT_TOWER_1F, 3
+ warp_event 2, 6, SPROUT_TOWER_1F, 4
+ warp_event 17, 3, SPROUT_TOWER_1F, 5
+ warp_event 10, 14, SPROUT_TOWER_3F, 1
db 0 ; coord events
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -331,7 +331,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 10, 14, 4, SPROUT_TOWER_2F
+ warp_event 10, 14, SPROUT_TOWER_2F, 4
db 1 ; coord events
coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -728,10 +728,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 27, 2, 3, MAHOGANY_MART_1F
- warp_event 3, 14, 1, TEAM_ROCKET_BASE_B2F
- warp_event 5, 15, 4, TEAM_ROCKET_BASE_B1F
- warp_event 25, 2, 3, TEAM_ROCKET_BASE_B1F
+ warp_event 27, 2, MAHOGANY_MART_1F, 3
+ warp_event 3, 14, TEAM_ROCKET_BASE_B2F, 1
+ warp_event 5, 15, TEAM_ROCKET_BASE_B1F, 4
+ warp_event 25, 2, TEAM_ROCKET_BASE_B1F, 3
db 30 ; coord events
; There are five security cameras in the base.
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -910,11 +910,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 3, 14, 2, TEAM_ROCKET_BASE_B1F
- warp_event 3, 2, 1, TEAM_ROCKET_BASE_B3F
- warp_event 27, 2, 2, TEAM_ROCKET_BASE_B3F
- warp_event 3, 6, 3, TEAM_ROCKET_BASE_B3F
- warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F
+ warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2
+ warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1
+ warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2
+ warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3
+ warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4
db 9 ; coord events
coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -567,10 +567,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 3, 2, 2, TEAM_ROCKET_BASE_B2F
- warp_event 27, 2, 3, TEAM_ROCKET_BASE_B2F
- warp_event 3, 6, 4, TEAM_ROCKET_BASE_B2F
- warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F
+ warp_event 3, 2, TEAM_ROCKET_BASE_B2F, 2
+ warp_event 27, 2, TEAM_ROCKET_BASE_B2F, 3
+ warp_event 3, 6, TEAM_ROCKET_BASE_B2F, 4
+ warp_event 27, 14, TEAM_ROCKET_BASE_B2F, 5
db 3 ; coord events
coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -55,8 +55,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 7, 4, POKECENTER_2F
- warp_event 5, 7, 4, POKECENTER_2F
+ warp_event 4, 7, POKECENTER_2F, 4
+ warp_event 5, 7, POKECENTER_2F, 4
db 0 ; coord events
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -524,9 +524,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 9, 15, 12, ECRUTEAK_CITY
- warp_event 10, 15, 12, ECRUTEAK_CITY
- warp_event 10, 2, 2, TIN_TOWER_2F
+ warp_event 9, 15, ECRUTEAK_CITY, 12
+ warp_event 10, 15, ECRUTEAK_CITY, 12
+ warp_event 10, 2, TIN_TOWER_2F, 2
db 0 ; coord events
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -7,8 +7,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 10, 14, 1, TIN_TOWER_3F
- warp_event 10, 2, 3, TIN_TOWER_1F
+ warp_event 10, 14, TIN_TOWER_3F, 1
+ warp_event 10, 2, TIN_TOWER_1F, 3
db 0 ; coord events
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -13,8 +13,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 10, 14, 1, TIN_TOWER_2F
- warp_event 16, 2, 2, TIN_TOWER_4F
+ warp_event 10, 14, TIN_TOWER_2F, 1
+ warp_event 16, 2, TIN_TOWER_4F, 2
db 0 ; coord events
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -24,10 +24,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 2, 4, 2, TIN_TOWER_5F
- warp_event 16, 2, 2, TIN_TOWER_3F
- warp_event 2, 14, 3, TIN_TOWER_5F
- warp_event 17, 15, 4, TIN_TOWER_5F
+ warp_event 2, 4, TIN_TOWER_5F, 2
+ warp_event 16, 2, TIN_TOWER_3F, 2
+ warp_event 2, 14, TIN_TOWER_5F, 3
+ warp_event 17, 15, TIN_TOWER_5F, 4
db 0 ; coord events
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -19,10 +19,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 11, 15, 2, TIN_TOWER_6F
- warp_event 2, 4, 1, TIN_TOWER_4F
- warp_event 2, 14, 3, TIN_TOWER_4F
- warp_event 17, 15, 4, TIN_TOWER_4F
+ warp_event 11, 15, TIN_TOWER_6F, 2
+ warp_event 2, 4, TIN_TOWER_4F, 1
+ warp_event 2, 14, TIN_TOWER_4F, 3
+ warp_event 17, 15, TIN_TOWER_4F, 4
db 0 ; coord events
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -13,8 +13,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 9, 1, TIN_TOWER_7F
- warp_event 11, 15, 1, TIN_TOWER_5F
+ warp_event 3, 9, TIN_TOWER_7F, 1
+ warp_event 11, 15, TIN_TOWER_5F, 1
db 0 ; coord events
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -13,11 +13,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 3, 9, 1, TIN_TOWER_6F
- warp_event 10, 15, 1, TIN_TOWER_8F
- warp_event 12, 7, 4, TIN_TOWER_7F
- warp_event 8, 3, 3, TIN_TOWER_7F
- warp_event 6, 9, 5, TIN_TOWER_9F
+ warp_event 3, 9, TIN_TOWER_6F, 1
+ warp_event 10, 15, TIN_TOWER_8F, 1
+ warp_event 12, 7, TIN_TOWER_7F, 4
+ warp_event 8, 3, TIN_TOWER_7F, 3
+ warp_event 6, 9, TIN_TOWER_9F, 5
db 0 ; coord events
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -21,12 +21,12 @@
db 0, 0 ; filler
db 6 ; warp events
- warp_event 2, 5, 2, TIN_TOWER_7F
- warp_event 2, 11, 1, TIN_TOWER_9F
- warp_event 16, 7, 2, TIN_TOWER_9F
- warp_event 10, 3, 3, TIN_TOWER_9F
- warp_event 14, 15, 6, TIN_TOWER_9F
- warp_event 6, 9, 7, TIN_TOWER_9F
+ warp_event 2, 5, TIN_TOWER_7F, 2
+ warp_event 2, 11, TIN_TOWER_9F, 1
+ warp_event 16, 7, TIN_TOWER_9F, 2
+ warp_event 10, 3, TIN_TOWER_9F, 3
+ warp_event 14, 15, TIN_TOWER_9F, 6
+ warp_event 6, 9, TIN_TOWER_9F, 7
db 0 ; coord events
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -23,13 +23,13 @@
db 0, 0 ; filler
db 7 ; warp events
- warp_event 12, 3, 2, TIN_TOWER_8F
- warp_event 2, 5, 3, TIN_TOWER_8F
- warp_event 12, 7, 4, TIN_TOWER_8F
- warp_event 7, 9, 1, TIN_TOWER_ROOF
- warp_event 16, 7, 5, TIN_TOWER_7F
- warp_event 6, 13, 5, TIN_TOWER_8F
- warp_event 8, 13, 6, TIN_TOWER_8F
+ warp_event 12, 3, TIN_TOWER_8F, 2
+ warp_event 2, 5, TIN_TOWER_8F, 3
+ warp_event 12, 7, TIN_TOWER_8F, 4
+ warp_event 7, 9, TIN_TOWER_ROOF, 1
+ warp_event 16, 7, TIN_TOWER_7F, 5
+ warp_event 6, 13, TIN_TOWER_8F, 5
+ warp_event 8, 13, TIN_TOWER_8F, 6
db 0 ; coord events
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -46,7 +46,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 9, 13, 4, TIN_TOWER_9F
+ warp_event 9, 13, TIN_TOWER_9F, 4
db 0 ; coord events
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -13,8 +13,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 13, 15, 2, ROUTE_27
- warp_event 25, 15, 3, ROUTE_27
+ warp_event 13, 15, ROUTE_27, 2
+ warp_event 25, 15, ROUTE_27, 3
db 0 ; coord events
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -55,8 +55,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 7, 2, POKECENTER_2F
- warp_event 5, 7, 2, POKECENTER_2F
+ warp_event 4, 7, POKECENTER_2F, 2
+ warp_event 5, 7, POKECENTER_2F, 2
db 0 ; coord events
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -139,9 +139,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 2, 13, 3, VIRIDIAN_CITY
- warp_event 3, 13, 3, VIRIDIAN_CITY
- warp_event 8, 2, 1, TRAINER_HOUSE_B1F
+ warp_event 2, 13, VIRIDIAN_CITY, 3
+ warp_event 3, 13, VIRIDIAN_CITY, 3
+ warp_event 8, 2, TRAINER_HOUSE_B1F, 1
db 0 ; coord events
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -171,7 +171,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 9, 4, 3, TRAINER_HOUSE_1F
+ warp_event 9, 4, TRAINER_HOUSE_1F, 3
db 1 ; coord events
coord_event 7, 3, SCENE_DEFAULT, TrainerHouseReceptionistScript
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -13,8 +13,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
- warp_event 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
+ warp_event 3, 2, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 3
+ warp_event 3, 24, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 3
db 0 ; coord events
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -201,10 +201,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 5, 19, 3, UNION_CAVE_B1F
- warp_event 3, 33, 4, UNION_CAVE_B1F
- warp_event 17, 31, 1, ROUTE_33
- warp_event 17, 3, 4, ROUTE_32
+ warp_event 5, 19, UNION_CAVE_B1F, 3
+ warp_event 3, 33, UNION_CAVE_B1F, 4
+ warp_event 17, 31, ROUTE_33, 1
+ warp_event 17, 3, ROUTE_32, 4
db 0 ; coord events
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -154,11 +154,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 3, 3, 7, RUINS_OF_ALPH_OUTSIDE
- warp_event 3, 11, 8, RUINS_OF_ALPH_OUTSIDE
- warp_event 7, 19, 1, UNION_CAVE_1F
- warp_event 3, 33, 2, UNION_CAVE_1F
- warp_event 17, 31, 1, UNION_CAVE_B2F
+ warp_event 3, 3, RUINS_OF_ALPH_OUTSIDE, 7
+ warp_event 3, 11, RUINS_OF_ALPH_OUTSIDE, 8
+ warp_event 7, 19, UNION_CAVE_1F, 1
+ warp_event 3, 33, UNION_CAVE_1F, 2
+ warp_event 17, 31, UNION_CAVE_B2F, 1
db 0 ; coord events
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -143,7 +143,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 5, 3, 5, UNION_CAVE_B1F
+ warp_event 5, 3, UNION_CAVE_B1F, 5
db 0 ; coord events
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -269,16 +269,16 @@
db 0, 0 ; filler
db 10 ; warp events
- warp_event 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE
- warp_event 9, 5, 1, VERMILION_POKECENTER_1F
- warp_event 7, 13, 1, POKEMON_FAN_CLUB
- warp_event 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE
- warp_event 21, 13, 2, VERMILION_MART
- warp_event 21, 17, 1, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE
- warp_event 10, 19, 1, VERMILION_GYM
- warp_event 19, 31, 1, VERMILION_PORT_PASSAGE
- warp_event 20, 31, 2, VERMILION_PORT_PASSAGE
- warp_event 34, 7, 1, DIGLETTS_CAVE
+ warp_event 5, 5, VERMILION_FISHING_SPEECH_HOUSE, 1
+ warp_event 9, 5, VERMILION_POKECENTER_1F, 1
+ warp_event 7, 13, POKEMON_FAN_CLUB, 1
+ warp_event 13, 13, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 1
+ warp_event 21, 13, VERMILION_MART, 2
+ warp_event 21, 17, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 1
+ warp_event 10, 19, VERMILION_GYM, 1
+ warp_event 19, 31, VERMILION_PORT_PASSAGE, 1
+ warp_event 20, 31, VERMILION_PORT_PASSAGE, 2
+ warp_event 34, 7, DIGLETTS_CAVE, 1
db 0 ; coord events
--- a/maps/VermilionDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -22,8 +22,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 6, VERMILION_CITY
- warp_event 3, 7, 6, VERMILION_CITY
+ warp_event 2, 7, VERMILION_CITY, 6
+ warp_event 3, 7, VERMILION_CITY, 6
db 0 ; coord events
--- a/maps/VermilionFishingSpeechHouse.asm
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -52,8 +52,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, VERMILION_CITY
- warp_event 3, 7, 1, VERMILION_CITY
+ warp_event 2, 7, VERMILION_CITY, 1
+ warp_event 3, 7, VERMILION_CITY, 1
db 0 ; coord events
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -262,8 +262,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 17, 7, VERMILION_CITY
- warp_event 5, 17, 7, VERMILION_CITY
+ warp_event 4, 17, VERMILION_CITY, 7
+ warp_event 5, 17, VERMILION_CITY, 7
db 0 ; coord events
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -35,8 +35,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, VERMILION_CITY
- warp_event 3, 7, 4, VERMILION_CITY
+ warp_event 2, 7, VERMILION_CITY, 4
+ warp_event 3, 7, VERMILION_CITY, 4
db 0 ; coord events
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -38,8 +38,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 5, VERMILION_CITY
- warp_event 3, 7, 5, VERMILION_CITY
+ warp_event 2, 7, VERMILION_CITY, 5
+ warp_event 3, 7, VERMILION_CITY, 5
db 0 ; coord events
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -78,9 +78,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 2, VERMILION_CITY
- warp_event 4, 7, 2, VERMILION_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, VERMILION_CITY, 2
+ warp_event 4, 7, VERMILION_CITY, 2
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/VermilionPokecenter2FBeta.asm
+++ b/maps/VermilionPokecenter2FBeta.asm
@@ -7,7 +7,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 0, 7, 3, VERMILION_POKECENTER_1F
+ warp_event 0, 7, VERMILION_POKECENTER_1F, 3
db 0 ; coord events
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -300,8 +300,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 9, 5, 5, VERMILION_PORT_PASSAGE
- warp_event 7, 17, 1, FAST_SHIP_1F
+ warp_event 9, 5, VERMILION_PORT_PASSAGE, 5
+ warp_event 7, 17, FAST_SHIP_1F, 1
db 1 ; coord events
coord_event 7, 11, SCENE_DEFAULT, UnknownScript_0x74e20
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -20,11 +20,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 15, 0, 8, VERMILION_CITY
- warp_event 16, 0, 9, VERMILION_CITY
- warp_event 15, 4, 4, VERMILION_PORT_PASSAGE
- warp_event 3, 2, 3, VERMILION_PORT_PASSAGE
- warp_event 3, 14, 1, VERMILION_PORT
+ warp_event 15, 0, VERMILION_CITY, 8
+ warp_event 16, 0, VERMILION_CITY, 9
+ warp_event 15, 4, VERMILION_PORT_PASSAGE, 4
+ warp_event 3, 2, VERMILION_PORT_PASSAGE, 3
+ warp_event 3, 14, VERMILION_PORT, 1
db 0 ; coord events
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -240,16 +240,16 @@
db 0, 0 ; filler
db 10 ; warp events
- warp_event 9, 67, 5, VICTORY_ROAD_GATE
- warp_event 1, 49, 3, VICTORY_ROAD
- warp_event 1, 35, 2, VICTORY_ROAD
- warp_event 13, 31, 5, VICTORY_ROAD
- warp_event 13, 17, 4, VICTORY_ROAD
- warp_event 17, 33, 7, VICTORY_ROAD
- warp_event 17, 19, 6, VICTORY_ROAD
- warp_event 0, 11, 9, VICTORY_ROAD
- warp_event 0, 27, 8, VICTORY_ROAD
- warp_event 13, 5, 3, ROUTE_23
+ warp_event 9, 67, VICTORY_ROAD_GATE, 5
+ warp_event 1, 49, VICTORY_ROAD, 3
+ warp_event 1, 35, VICTORY_ROAD, 2
+ warp_event 13, 31, VICTORY_ROAD, 5
+ warp_event 13, 17, VICTORY_ROAD, 4
+ warp_event 17, 33, VICTORY_ROAD, 7
+ warp_event 17, 19, VICTORY_ROAD, 6
+ warp_event 0, 11, VICTORY_ROAD, 9
+ warp_event 0, 27, VICTORY_ROAD, 8
+ warp_event 13, 5, ROUTE_23, 3
db 2 ; coord events
coord_event 12, 8, SCENE_DEFAULT, UnknownScript_0x74492
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -99,14 +99,14 @@
db 0, 0 ; filler
db 8 ; warp events
- warp_event 17, 7, 1, ROUTE_22
- warp_event 18, 7, 1, ROUTE_22
- warp_event 9, 17, 1, ROUTE_26
- warp_event 10, 17, 1, ROUTE_26
- warp_event 9, 0, 1, VICTORY_ROAD
- warp_event 10, 0, 1, VICTORY_ROAD
- warp_event 1, 7, 2, ROUTE_28
- warp_event 2, 7, 2, ROUTE_28
+ warp_event 17, 7, ROUTE_22, 1
+ warp_event 18, 7, ROUTE_22, 1
+ warp_event 9, 17, ROUTE_26, 1
+ warp_event 10, 17, ROUTE_26, 1
+ warp_event 9, 0, VICTORY_ROAD, 1
+ warp_event 10, 0, VICTORY_ROAD, 1
+ warp_event 1, 7, ROUTE_28, 2
+ warp_event 2, 7, ROUTE_28, 2
db 1 ; coord events
coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -280,15 +280,15 @@
db 0, 0 ; filler
db 9 ; warp events
- warp_event 9, 17, 2, VIOLET_MART
- warp_event 18, 17, 1, VIOLET_GYM
- warp_event 30, 17, 1, EARLS_POKEMON_ACADEMY
- warp_event 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE
- warp_event 31, 25, 1, VIOLET_POKECENTER_1F
- warp_event 21, 29, 1, VIOLET_KYLES_HOUSE
- warp_event 23, 5, 1, SPROUT_TOWER_1F
- warp_event 39, 24, 1, ROUTE_31_VIOLET_GATE
- warp_event 39, 25, 2, ROUTE_31_VIOLET_GATE
+ warp_event 9, 17, VIOLET_MART, 2
+ warp_event 18, 17, VIOLET_GYM, 1
+ warp_event 30, 17, EARLS_POKEMON_ACADEMY, 1
+ warp_event 3, 15, VIOLET_NICKNAME_SPEECH_HOUSE, 1
+ warp_event 31, 25, VIOLET_POKECENTER_1F, 1
+ warp_event 21, 29, VIOLET_KYLES_HOUSE, 1
+ warp_event 23, 5, SPROUT_TOWER_1F, 1
+ warp_event 39, 24, ROUTE_31_VIOLET_GATE, 1
+ warp_event 39, 25, ROUTE_31_VIOLET_GATE, 2
db 0 ; coord events
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -283,8 +283,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 15, 2, VIOLET_CITY
- warp_event 5, 15, 2, VIOLET_CITY
+ warp_event 4, 15, VIOLET_CITY, 2
+ warp_event 5, 15, VIOLET_CITY, 2
db 0 ; coord events
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -34,8 +34,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 7, 6, VIOLET_CITY
- warp_event 4, 7, 6, VIOLET_CITY
+ warp_event 3, 7, VIOLET_CITY, 6
+ warp_event 4, 7, VIOLET_CITY, 6
db 0 ; coord events
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -50,8 +50,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 1, VIOLET_CITY
- warp_event 3, 7, 1, VIOLET_CITY
+ warp_event 2, 7, VIOLET_CITY, 1
+ warp_event 3, 7, VIOLET_CITY, 1
db 0 ; coord events
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -46,8 +46,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 3, 7, 4, VIOLET_CITY
- warp_event 4, 7, 4, VIOLET_CITY
+ warp_event 3, 7, VIOLET_CITY, 4
+ warp_event 4, 7, VIOLET_CITY, 4
db 0 ; coord events
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -217,9 +217,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 5, VIOLET_CITY
- warp_event 4, 7, 5, VIOLET_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, VIOLET_CITY, 5
+ warp_event 4, 7, VIOLET_CITY, 5
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -217,11 +217,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 32, 7, 1, VIRIDIAN_GYM
- warp_event 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE
- warp_event 23, 15, 1, TRAINER_HOUSE_1F
- warp_event 29, 19, 2, VIRIDIAN_MART
- warp_event 23, 25, 1, VIRIDIAN_POKECENTER_1F
+ warp_event 32, 7, VIRIDIAN_GYM, 1
+ warp_event 21, 9, VIRIDIAN_NICKNAME_SPEECH_HOUSE, 1
+ warp_event 23, 15, TRAINER_HOUSE_1F, 1
+ warp_event 29, 19, VIRIDIAN_MART, 2
+ warp_event 23, 25, VIRIDIAN_POKECENTER_1F, 1
db 0 ; coord events
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -171,8 +171,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 4, 17, 1, VIRIDIAN_CITY
- warp_event 5, 17, 1, VIRIDIAN_CITY
+ warp_event 4, 17, VIRIDIAN_CITY, 1
+ warp_event 5, 17, VIRIDIAN_CITY, 1
db 0 ; coord events
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -38,8 +38,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 4, VIRIDIAN_CITY
- warp_event 3, 7, 4, VIRIDIAN_CITY
+ warp_event 2, 7, VIRIDIAN_CITY, 4
+ warp_event 3, 7, VIRIDIAN_CITY, 4
db 0 ; coord events
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -63,8 +63,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 2, 7, 2, VIRIDIAN_CITY
- warp_event 3, 7, 2, VIRIDIAN_CITY
+ warp_event 2, 7, VIRIDIAN_CITY, 2
+ warp_event 3, 7, VIRIDIAN_CITY, 2
db 0 ; coord events
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -73,9 +73,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 7, 5, VIRIDIAN_CITY
- warp_event 4, 7, 5, VIRIDIAN_CITY
- warp_event 0, 7, 1, POKECENTER_2F
+ warp_event 3, 7, VIRIDIAN_CITY, 5
+ warp_event 4, 7, VIRIDIAN_CITY, 5
+ warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
--- a/maps/ViridianPokecenter2FBeta.asm
+++ b/maps/ViridianPokecenter2FBeta.asm
@@ -7,7 +7,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 0, 7, 3, VIRIDIAN_POKECENTER_1F
+ warp_event 0, 7, VIRIDIAN_POKECENTER_1F, 3
db 0 ; coord events
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -42,15 +42,15 @@
db 0, 0 ; filler
db 9 ; warp events
- warp_event 5, 5, 2, WHIRL_ISLAND_NW
- warp_event 35, 3, 2, WHIRL_ISLAND_NE
- warp_event 29, 9, 3, WHIRL_ISLAND_NE
- warp_event 9, 31, 3, WHIRL_ISLAND_SW
- warp_event 23, 31, 2, WHIRL_ISLAND_SW
- warp_event 31, 29, 2, WHIRL_ISLAND_SE
- warp_event 25, 21, 1, WHIRL_ISLAND_B2F
- warp_event 13, 27, 2, WHIRL_ISLAND_B2F
- warp_event 17, 21, 1, WHIRL_ISLAND_CAVE
+ warp_event 5, 5, WHIRL_ISLAND_NW, 2
+ warp_event 35, 3, WHIRL_ISLAND_NE, 2
+ warp_event 29, 9, WHIRL_ISLAND_NE, 3
+ warp_event 9, 31, WHIRL_ISLAND_SW, 3
+ warp_event 23, 31, WHIRL_ISLAND_SW, 2
+ warp_event 31, 29, WHIRL_ISLAND_SE, 2
+ warp_event 25, 21, WHIRL_ISLAND_B2F, 1
+ warp_event 13, 27, WHIRL_ISLAND_B2F, 2
+ warp_event 17, 21, WHIRL_ISLAND_CAVE, 1
db 0 ; coord events
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -21,10 +21,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 11, 5, 7, WHIRL_ISLAND_B1F
- warp_event 7, 11, 8, WHIRL_ISLAND_B1F
- warp_event 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER
- warp_event 13, 31, 5, WHIRL_ISLAND_SW
+ warp_event 11, 5, WHIRL_ISLAND_B1F, 7
+ warp_event 7, 11, WHIRL_ISLAND_B1F, 8
+ warp_event 7, 25, WHIRL_ISLAND_LUGIA_CHAMBER, 1
+ warp_event 13, 31, WHIRL_ISLAND_SW, 5
db 0 ; coord events
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -7,8 +7,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 7, 5, 9, WHIRL_ISLAND_B1F
- warp_event 3, 13, 4, WHIRL_ISLAND_NW
+ warp_event 7, 5, WHIRL_ISLAND_B1F, 9
+ warp_event 3, 13, WHIRL_ISLAND_NW, 4
db 0 ; coord events
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -45,7 +45,7 @@
db 0, 0 ; filler
db 1 ; warp events
- warp_event 9, 13, 3, WHIRL_ISLAND_B2F
+ warp_event 9, 13, WHIRL_ISLAND_B2F, 3
db 0 ; coord events
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -13,9 +13,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 3, 13, 2, ROUTE_41
- warp_event 17, 3, 2, WHIRL_ISLAND_B1F
- warp_event 13, 11, 3, WHIRL_ISLAND_B1F
+ warp_event 3, 13, ROUTE_41, 2
+ warp_event 17, 3, WHIRL_ISLAND_B1F, 2
+ warp_event 13, 11, WHIRL_ISLAND_B1F, 3
db 0 ; coord events
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -7,10 +7,10 @@
db 0, 0 ; filler
db 4 ; warp events
- warp_event 5, 7, 1, ROUTE_41
- warp_event 5, 3, 1, WHIRL_ISLAND_B1F
- warp_event 3, 15, 4, WHIRL_ISLAND_SW
- warp_event 7, 15, 2, WHIRL_ISLAND_CAVE
+ warp_event 5, 7, ROUTE_41, 1
+ warp_event 5, 3, WHIRL_ISLAND_B1F, 1
+ warp_event 3, 15, WHIRL_ISLAND_SW, 4
+ warp_event 7, 15, WHIRL_ISLAND_CAVE, 2
db 0 ; coord events
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -7,8 +7,8 @@
db 0, 0 ; filler
db 2 ; warp events
- warp_event 5, 13, 4, ROUTE_41
- warp_event 5, 3, 6, WHIRL_ISLAND_B1F
+ warp_event 5, 13, ROUTE_41, 4
+ warp_event 5, 3, WHIRL_ISLAND_B1F, 6
db 0 ; coord events
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -13,11 +13,11 @@
db 0, 0 ; filler
db 5 ; warp events
- warp_event 5, 7, 3, ROUTE_41
- warp_event 17, 3, 5, WHIRL_ISLAND_B1F
- warp_event 3, 3, 4, WHIRL_ISLAND_B1F
- warp_event 3, 15, 3, WHIRL_ISLAND_NW
- warp_event 17, 15, 4, WHIRL_ISLAND_B2F
+ warp_event 5, 7, ROUTE_41, 3
+ warp_event 17, 3, WHIRL_ISLAND_B1F, 5
+ warp_event 3, 3, WHIRL_ISLAND_B1F, 4
+ warp_event 3, 15, WHIRL_ISLAND_NW, 3
+ warp_event 17, 15, WHIRL_ISLAND_B2F, 4
db 0 ; coord events
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -130,9 +130,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F
- warp_event 4, 2, 1, KOGAS_ROOM
- warp_event 5, 2, 2, KOGAS_ROOM
+ warp_event 5, 17, INDIGO_PLATEAU_POKECENTER_1F, 4
+ warp_event 4, 2, KOGAS_ROOM, 1
+ warp_event 5, 2, KOGAS_ROOM, 2
db 0 ; coord events
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -346,9 +346,9 @@
db 0, 0 ; filler
db 3 ; warp events
- warp_event 7, 4, 4, ECRUTEAK_CITY
- warp_event 7, 5, 5, ECRUTEAK_CITY
- warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE
+ warp_event 7, 4, ECRUTEAK_CITY, 4
+ warp_event 7, 5, ECRUTEAK_CITY, 5
+ warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5
db 1 ; coord events
coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3