shithub: pokecrystal

--- a/docs/map_scripts.md

+++ b/docs/map_scripts.md

@@ -78,7 +78,7 @@

 ### <code>.Warps: db <i>N</i></code>

 <pre>

-	warp_def <i>x</i>, <i>y</i>, <i>warp_id</i>, <i>map</i>

+	warp_event <i>x</i>, <i>y</i>, <i>warp_id</i>, <i>map</i>

 </pre>

--- a/macros/scripts/maps.asm

+++ b/macros/scripts/maps.asm

@@ -15,7 +15,7 @@

 	dbw \1, \2

 ENDM

-warp_def: MACRO

+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

--- a/maps/AzaleaGym.asm

+++ b/maps/AzaleaGym.asm

@@ -367,8 +367,8 @@

 .Warps:

 	db 2

-	warp_def 4, 15, 5, AZALEA_TOWN

-	warp_def 5, 15, 5, AZALEA_TOWN

+	warp_event 4, 15, 5, AZALEA_TOWN

+	warp_event 5, 15, 5, AZALEA_TOWN

 .CoordEvents:

 	db 0

--- a/maps/AzaleaMart.asm

+++ b/maps/AzaleaMart.asm

@@ -51,8 +51,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, AZALEA_TOWN

-	warp_def 3, 7, 3, AZALEA_TOWN

+	warp_event 2, 7, 3, AZALEA_TOWN

+	warp_event 3, 7, 3, AZALEA_TOWN

 .CoordEvents:

 	db 0

--- a/maps/AzaleaPokecenter1F.asm

+++ b/maps/AzaleaPokecenter1F.asm

@@ -82,9 +82,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 1, AZALEA_TOWN

-	warp_def 4, 7, 1, AZALEA_TOWN

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 1, AZALEA_TOWN

+	warp_event 4, 7, 1, AZALEA_TOWN

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/AzaleaTown.asm

+++ b/maps/AzaleaTown.asm

@@ -461,14 +461,14 @@

 .Warps:

 	db 8

-	warp_def 15, 9, 1, AZALEA_POKECENTER_1F

-	warp_def 21, 13, 1, CHARCOAL_KILN

-	warp_def 21, 5, 2, AZALEA_MART

-	warp_def 9, 5, 1, KURTS_HOUSE

-	warp_def 10, 15, 1, AZALEA_GYM

-	warp_def 31, 7, 1, SLOWPOKE_WELL_B1F

-	warp_def 2, 10, 3, ILEX_FOREST_AZALEA_GATE

-	warp_def 2, 11, 4, ILEX_FOREST_AZALEA_GATE

+	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

 .CoordEvents:

 	db 3

--- a/maps/BattleTower1F.asm

+++ b/maps/BattleTower1F.asm

@@ -799,9 +799,9 @@

 .Warps:

 	db 3

-	warp_def 7, 9, 3, BATTLE_TOWER_OUTSIDE

-	warp_def 8, 9, 4, BATTLE_TOWER_OUTSIDE

-	warp_def 7, 0, 1, BATTLE_TOWER_ELEVATOR

+	warp_event 7, 9, 3, BATTLE_TOWER_OUTSIDE

+	warp_event 8, 9, 4, BATTLE_TOWER_OUTSIDE

+	warp_event 7, 0, 1, BATTLE_TOWER_ELEVATOR

 .CoordEvents:

 	db 0

--- a/maps/BattleTowerBattleRoom.asm

+++ b/maps/BattleTowerBattleRoom.asm

@@ -144,8 +144,8 @@

 .Warps:

 	db 2

-	warp_def 3, 7, 4, BATTLE_TOWER_HALLWAY

-	warp_def 4, 7, 4, BATTLE_TOWER_HALLWAY

+	warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY

+	warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY

 .CoordEvents:

 	db 0

--- a/maps/BattleTowerElevator.asm

+++ b/maps/BattleTowerElevator.asm

@@ -50,8 +50,8 @@

 .Warps:

 	db 2

-	warp_def 1, 3, 1, BATTLE_TOWER_HALLWAY

-	warp_def 2, 3, 1, BATTLE_TOWER_HALLWAY

+	warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY

+	warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY

 .CoordEvents:

 	db 0

--- a/maps/BattleTowerHallway.asm

+++ b/maps/BattleTowerHallway.asm

@@ -82,12 +82,12 @@

 .Warps:

 	db 6

-	warp_def 11, 1, 1, BATTLE_TOWER_ELEVATOR

-	warp_def 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM

-	warp_def 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM

-	warp_def 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM

-	warp_def 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM

-	warp_def 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/BattleTowerOutside.asm

+++ b/maps/BattleTowerOutside.asm

@@ -132,10 +132,10 @@

 .Warps:

 	db 4

-	warp_def 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE

-	warp_def 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE

-	warp_def 8, 9, 1, BATTLE_TOWER_1F

-	warp_def 9, 9, 2, BATTLE_TOWER_1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/BillsBrothersHouse.asm

+++ b/maps/BillsBrothersHouse.asm

@@ -33,8 +33,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, FUCHSIA_CITY

-	warp_def 3, 7, 4, FUCHSIA_CITY

+	warp_event 2, 7, 4, FUCHSIA_CITY

+	warp_event 3, 7, 4, FUCHSIA_CITY

 .CoordEvents:

 	db 0

--- a/maps/BillsFamilysHouse.asm

+++ b/maps/BillsFamilysHouse.asm

@@ -248,8 +248,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, GOLDENROD_CITY

-	warp_def 3, 7, 4, GOLDENROD_CITY

+	warp_event 2, 7, 4, GOLDENROD_CITY

+	warp_event 3, 7, 4, GOLDENROD_CITY

 .CoordEvents:

 	db 0

--- a/maps/BillsHouse.asm

+++ b/maps/BillsHouse.asm

@@ -359,8 +359,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, ROUTE_25

-	warp_def 3, 7, 1, ROUTE_25

+	warp_event 2, 7, 1, ROUTE_25

+	warp_event 3, 7, 1, ROUTE_25

 .CoordEvents:

 	db 0

--- a/maps/BlackthornCity.asm

+++ b/maps/BlackthornCity.asm

@@ -318,14 +318,14 @@

 .Warps:

 	db 8

-	warp_def 18, 11, 1, BLACKTHORN_GYM_1F

-	warp_def 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE

-	warp_def 29, 23, 1, BLACKTHORN_EMYS_HOUSE

-	warp_def 15, 29, 2, BLACKTHORN_MART

-	warp_def 21, 29, 1, BLACKTHORN_POKECENTER_1F

-	warp_def 9, 31, 1, MOVE_DELETERS_HOUSE

-	warp_def 36, 9, 2, ICE_PATH_1F

-	warp_def 20, 1, 1, DRAGONS_DEN_1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/BlackthornDragonSpeechHouse.asm

+++ b/maps/BlackthornDragonSpeechHouse.asm

@@ -53,8 +53,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, BLACKTHORN_CITY

-	warp_def 3, 7, 2, BLACKTHORN_CITY

+	warp_event 2, 7, 2, BLACKTHORN_CITY

+	warp_event 3, 7, 2, BLACKTHORN_CITY

 .CoordEvents:

 	db 0

--- a/maps/BlackthornEmysHouse.asm

+++ b/maps/BlackthornEmysHouse.asm

@@ -25,8 +25,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, BLACKTHORN_CITY

-	warp_def 3, 7, 3, BLACKTHORN_CITY

+	warp_event 2, 7, 3, BLACKTHORN_CITY

+	warp_event 3, 7, 3, BLACKTHORN_CITY

 .CoordEvents:

 	db 0

--- a/maps/BlackthornGym1F.asm

+++ b/maps/BlackthornGym1F.asm

@@ -392,13 +392,13 @@

 .Warps:

 	db 7

-	warp_def 4, 17, 1, BLACKTHORN_CITY

-	warp_def 5, 17, 1, BLACKTHORN_CITY

-	warp_def 1, 7, 1, BLACKTHORN_GYM_2F

-	warp_def 7, 9, 2, BLACKTHORN_GYM_2F

-	warp_def 2, 6, 3, BLACKTHORN_GYM_2F

-	warp_def 7, 7, 4, BLACKTHORN_GYM_2F

-	warp_def 7, 6, 5, BLACKTHORN_GYM_2F

+	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

 .CoordEvents:

 	db 0

--- a/maps/BlackthornGym2F.asm

+++ b/maps/BlackthornGym2F.asm

@@ -131,11 +131,11 @@

 .Warps:

 	db 5

-	warp_def 1, 7, 3, BLACKTHORN_GYM_1F

-	warp_def 7, 9, 4, BLACKTHORN_GYM_1F

-	warp_def 2, 5, 5, BLACKTHORN_GYM_1F ; hole

-	warp_def 8, 7, 6, BLACKTHORN_GYM_1F ; hole

-	warp_def 8, 3, 7, BLACKTHORN_GYM_1F ; hole

+	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

 .CoordEvents:

 	db 0

--- a/maps/BlackthornMart.asm

+++ b/maps/BlackthornMart.asm

@@ -52,8 +52,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, BLACKTHORN_CITY

-	warp_def 3, 7, 4, BLACKTHORN_CITY

+	warp_event 2, 7, 4, BLACKTHORN_CITY

+	warp_event 3, 7, 4, BLACKTHORN_CITY

 .CoordEvents:

 	db 0

--- a/maps/BlackthornPokecenter1F.asm

+++ b/maps/BlackthornPokecenter1F.asm

@@ -55,9 +55,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 5, BLACKTHORN_CITY

-	warp_def 4, 7, 5, BLACKTHORN_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 5, BLACKTHORN_CITY

+	warp_event 4, 7, 5, BLACKTHORN_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/BluesHouse.asm

+++ b/maps/BluesHouse.asm

@@ -150,8 +150,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, PALLET_TOWN

-	warp_def 3, 7, 2, PALLET_TOWN

+	warp_event 2, 7, 2, PALLET_TOWN

+	warp_event 3, 7, 2, PALLET_TOWN

 .CoordEvents:

 	db 0

--- a/maps/BrunosRoom.asm

+++ b/maps/BrunosRoom.asm

@@ -130,10 +130,10 @@

 .Warps:

 	db 4

-	warp_def 4, 17, 3, KOGAS_ROOM

-	warp_def 5, 17, 4, KOGAS_ROOM

-	warp_def 4, 2, 1, KARENS_ROOM

-	warp_def 5, 2, 2, KARENS_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/BurnedTower1F.asm

+++ b/maps/BurnedTower1F.asm

@@ -283,20 +283,20 @@

 .Warps:

 	db 14

-	warp_def 9, 15, 13, ECRUTEAK_CITY

-	warp_def 10, 15, 13, ECRUTEAK_CITY

-	warp_def 10, 9,  1, BURNED_TOWER_B1F

-	warp_def 5, 5,  1, BURNED_TOWER_B1F

-	warp_def 5, 6,  1, BURNED_TOWER_B1F

-	warp_def 4, 6,  1, BURNED_TOWER_B1F

-	warp_def 15, 4,  2, BURNED_TOWER_B1F

-	warp_def 15, 5,  2, BURNED_TOWER_B1F

-	warp_def 10, 7,  3, BURNED_TOWER_B1F

-	warp_def 5, 14,  4, BURNED_TOWER_B1F

-	warp_def 4, 14,  4, BURNED_TOWER_B1F

-	warp_def 14, 14,  5, BURNED_TOWER_B1F

-	warp_def 15, 14,  5, BURNED_TOWER_B1F

-	warp_def 7, 15,  6, BURNED_TOWER_B1F

+	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

 .CoordEvents:

 	db 1

--- a/maps/BurnedTowerB1F.asm

+++ b/maps/BurnedTowerB1F.asm

@@ -241,12 +241,12 @@

 .Warps:

 	db 6

-	warp_def 10, 9, 3, BURNED_TOWER_1F

-	warp_def 17, 7, 7, BURNED_TOWER_1F

-	warp_def 10, 8, 9, BURNED_TOWER_1F

-	warp_def 3, 13, 10, BURNED_TOWER_1F

-	warp_def 17, 14, 12, BURNED_TOWER_1F

-	warp_def 7, 15, 14, BURNED_TOWER_1F

+	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

 .CoordEvents:

 	db 1

--- a/maps/CeladonCafe.asm

+++ b/maps/CeladonCafe.asm

@@ -213,8 +213,8 @@

 .Warps:

 	db 2

-	warp_def 6, 7, 9, CELADON_CITY

-	warp_def 7, 7, 9, CELADON_CITY

+	warp_event 6, 7, 9, CELADON_CITY

+	warp_event 7, 7, 9, CELADON_CITY

 .CoordEvents:

 	db 0

--- a/maps/CeladonCity.asm

+++ b/maps/CeladonCity.asm

@@ -240,15 +240,15 @@

 .Warps:

 	db 9

-	warp_def 4, 9, 1, CELADON_DEPT_STORE_1F

-	warp_def 16, 9, 1, CELADON_MANSION_1F

-	warp_def 16, 3, 3, CELADON_MANSION_1F

-	warp_def 17, 3, 3, CELADON_MANSION_1F

-	warp_def 29, 9, 1, CELADON_POKECENTER_1F

-	warp_def 18, 19, 1, CELADON_GAME_CORNER

-	warp_def 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM

-	warp_def 10, 29, 1, CELADON_GYM

-	warp_def 25, 29, 1, CELADON_CAFE

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeladonDeptStore1F.asm

+++ b/maps/CeladonDeptStore1F.asm

@@ -79,10 +79,10 @@

 .Warps:

 	db 4

-	warp_def 7, 7, 1, CELADON_CITY

-	warp_def 8, 7, 1, CELADON_CITY

-	warp_def 15, 0, 2, CELADON_DEPT_STORE_2F

-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeladonDeptStore2F.asm

+++ b/maps/CeladonDeptStore2F.asm

@@ -74,9 +74,9 @@

 .Warps:

 	db 3

-	warp_def 12, 0, 1, CELADON_DEPT_STORE_3F

-	warp_def 15, 0, 3, CELADON_DEPT_STORE_1F

-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeladonDeptStore3F.asm

+++ b/maps/CeladonDeptStore3F.asm

@@ -100,9 +100,9 @@

 .Warps:

 	db 3

-	warp_def 12, 0, 1, CELADON_DEPT_STORE_2F

-	warp_def 15, 0, 2, CELADON_DEPT_STORE_4F

-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeladonDeptStore4F.asm

+++ b/maps/CeladonDeptStore4F.asm

@@ -56,9 +56,9 @@

 .Warps:

 	db 3

-	warp_def 12, 0, 1, CELADON_DEPT_STORE_5F

-	warp_def 15, 0, 2, CELADON_DEPT_STORE_3F

-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeladonDeptStore5F.asm

+++ b/maps/CeladonDeptStore5F.asm

@@ -77,9 +77,9 @@

 .Warps:

 	db 3

-	warp_def 12, 0, 1, CELADON_DEPT_STORE_4F

-	warp_def 15, 0, 1, CELADON_DEPT_STORE_6F

-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeladonDeptStore6F.asm

+++ b/maps/CeladonDeptStore6F.asm

@@ -151,8 +151,8 @@

 .Warps:

 	db 2

-	warp_def 15, 0, 2, CELADON_DEPT_STORE_5F

-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR

+	warp_event 15, 0, 2, CELADON_DEPT_STORE_5F

+	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR

 .CoordEvents:

 	db 0

--- a/maps/CeladonDeptStoreElevator.asm

+++ b/maps/CeladonDeptStoreElevator.asm

@@ -33,8 +33,8 @@

 .Warps:

 	db 2

-	warp_def 1, 3, -1, CELADON_DEPT_STORE_1F

-	warp_def 2, 3, -1, CELADON_DEPT_STORE_1F

+	warp_event 1, 3, -1, CELADON_DEPT_STORE_1F

+	warp_event 2, 3, -1, CELADON_DEPT_STORE_1F

 .CoordEvents:

 	db 0

--- a/maps/CeladonGameCorner.asm

+++ b/maps/CeladonGameCorner.asm

@@ -287,8 +287,8 @@

 .Warps:

 	db 2

-	warp_def 14, 13, 6, CELADON_CITY

-	warp_def 15, 13, 6, CELADON_CITY

+	warp_event 14, 13, 6, CELADON_CITY

+	warp_event 15, 13, 6, CELADON_CITY

 .CoordEvents:

 	db 0

--- a/maps/CeladonGameCornerPrizeRoom.asm

+++ b/maps/CeladonGameCornerPrizeRoom.asm

@@ -269,8 +269,8 @@

 .Warps:

 	db 2

-	warp_def 2, 5, 7, CELADON_CITY

-	warp_def 3, 5, 7, CELADON_CITY

+	warp_event 2, 5, 7, CELADON_CITY

+	warp_event 3, 5, 7, CELADON_CITY

 .CoordEvents:

 	db 0

--- a/maps/CeladonGym.asm

+++ b/maps/CeladonGym.asm

@@ -273,8 +273,8 @@

 .Warps:

 	db 2

-	warp_def 4, 17, 8, CELADON_CITY

-	warp_def 5, 17, 8, CELADON_CITY

+	warp_event 4, 17, 8, CELADON_CITY

+	warp_event 5, 17, 8, CELADON_CITY

 .CoordEvents:

 	db 0

--- a/maps/CeladonMansion1F.asm

+++ b/maps/CeladonMansion1F.asm

@@ -80,11 +80,11 @@

 .Warps:

 	db 5

-	warp_def 6, 9, 2, CELADON_CITY

-	warp_def 7, 9, 2, CELADON_CITY

-	warp_def 3, 0, 3, CELADON_CITY

-	warp_def 0, 0, 1, CELADON_MANSION_2F

-	warp_def 7, 0, 4, CELADON_MANSION_2F

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeladonMansion2F.asm

+++ b/maps/CeladonMansion2F.asm

@@ -55,10 +55,10 @@

 .Warps:

 	db 4

-	warp_def 0, 0, 4, CELADON_MANSION_1F

-	warp_def 1, 0, 2, CELADON_MANSION_3F

-	warp_def 6, 0, 3, CELADON_MANSION_3F

-	warp_def 7, 0, 5, CELADON_MANSION_1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeladonMansion3F.asm

+++ b/maps/CeladonMansion3F.asm

@@ -195,10 +195,10 @@

 .Warps:

 	db 4

-	warp_def 0, 0, 1, CELADON_MANSION_ROOF

-	warp_def 1, 0, 2, CELADON_MANSION_2F

-	warp_def 6, 0, 3, CELADON_MANSION_2F

-	warp_def 7, 0, 2, CELADON_MANSION_ROOF

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeladonMansionRoof.asm

+++ b/maps/CeladonMansionRoof.asm

@@ -39,9 +39,9 @@

 .Warps:

 	db 3

-	warp_def 1, 1, 1, CELADON_MANSION_3F

-	warp_def 6, 1, 4, CELADON_MANSION_3F

-	warp_def 2, 5, 1, CELADON_MANSION_ROOF_HOUSE

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeladonMansionRoofHouse.asm

+++ b/maps/CeladonMansionRoofHouse.asm

@@ -122,8 +122,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, CELADON_MANSION_ROOF

-	warp_def 3, 7, 3, CELADON_MANSION_ROOF

+	warp_event 2, 7, 3, CELADON_MANSION_ROOF

+	warp_event 3, 7, 3, CELADON_MANSION_ROOF

 .CoordEvents:

 	db 0

--- a/maps/CeladonPokecenter1F.asm

+++ b/maps/CeladonPokecenter1F.asm

@@ -151,9 +151,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 5, CELADON_CITY

-	warp_def 4, 7, 5, CELADON_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 5, CELADON_CITY

+	warp_event 4, 7, 5, CELADON_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/CeladonPokecenter2FBeta.asm

+++ b/maps/CeladonPokecenter2FBeta.asm

@@ -11,7 +11,7 @@

 .Warps:

 	db 1

-	warp_def 0, 7, 3, CELADON_POKECENTER_1F

+	warp_event 0, 7, 3, CELADON_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/CeruleanCity.asm

+++ b/maps/CeruleanCity.asm

@@ -281,12 +281,12 @@

 .Warps:

 	db 6

-	warp_def 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE

-	warp_def 28, 17, 1, CERULEAN_POLICE_STATION

-	warp_def 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE

-	warp_def 19, 21, 1, CERULEAN_POKECENTER_1F

-	warp_def 30, 23, 1, CERULEAN_GYM

-	warp_def 25, 29, 2, CERULEAN_MART

+	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

 .CoordEvents:

 	db 0

--- a/maps/CeruleanGym.asm

+++ b/maps/CeruleanGym.asm

@@ -368,8 +368,8 @@

 .Warps:

 	db 2

-	warp_def 4, 15, 5, CERULEAN_CITY

-	warp_def 5, 15, 5, CERULEAN_CITY

+	warp_event 4, 15, 5, CERULEAN_CITY

+	warp_event 5, 15, 5, CERULEAN_CITY

 .CoordEvents:

 	db 0

--- a/maps/CeruleanGymBadgeSpeechHouse.asm

+++ b/maps/CeruleanGymBadgeSpeechHouse.asm

@@ -22,8 +22,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, CERULEAN_CITY

-	warp_def 3, 7, 1, CERULEAN_CITY

+	warp_event 2, 7, 1, CERULEAN_CITY

+	warp_event 3, 7, 1, CERULEAN_CITY

 .CoordEvents:

 	db 0

--- a/maps/CeruleanMart.asm

+++ b/maps/CeruleanMart.asm

@@ -51,8 +51,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 6, CERULEAN_CITY

-	warp_def 3, 7, 6, CERULEAN_CITY

+	warp_event 2, 7, 6, CERULEAN_CITY

+	warp_event 3, 7, 6, CERULEAN_CITY

 .CoordEvents:

 	db 0

--- a/maps/CeruleanPokecenter1F.asm

+++ b/maps/CeruleanPokecenter1F.asm

@@ -68,9 +68,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 4, CERULEAN_CITY

-	warp_def 4, 7, 4, CERULEAN_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 4, CERULEAN_CITY

+	warp_event 4, 7, 4, CERULEAN_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/CeruleanPokecenter2FBeta.asm

+++ b/maps/CeruleanPokecenter2FBeta.asm

@@ -11,7 +11,7 @@

 .Warps:

 	db 1

-	warp_def 0, 7, 1, CERULEAN_POKECENTER_1F

+	warp_event 0, 7, 1, CERULEAN_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/CeruleanPoliceStation.asm

+++ b/maps/CeruleanPoliceStation.asm

@@ -49,8 +49,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, CERULEAN_CITY

-	warp_def 3, 7, 2, CERULEAN_CITY

+	warp_event 2, 7, 2, CERULEAN_CITY

+	warp_event 3, 7, 2, CERULEAN_CITY

 .CoordEvents:

 	db 0

--- a/maps/CeruleanTradeSpeechHouse.asm

+++ b/maps/CeruleanTradeSpeechHouse.asm

@@ -59,8 +59,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, CERULEAN_CITY

-	warp_def 3, 7, 3, CERULEAN_CITY

+	warp_event 2, 7, 3, CERULEAN_CITY

+	warp_event 3, 7, 3, CERULEAN_CITY

 .CoordEvents:

 	db 0

--- a/maps/CharcoalKiln.asm

+++ b/maps/CharcoalKiln.asm

@@ -154,8 +154,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, AZALEA_TOWN

-	warp_def 3, 7, 2, AZALEA_TOWN

+	warp_event 2, 7, 2, AZALEA_TOWN

+	warp_event 3, 7, 2, AZALEA_TOWN

 .CoordEvents:

 	db 0

--- a/maps/CherrygroveCity.asm

+++ b/maps/CherrygroveCity.asm

@@ -552,11 +552,11 @@

 .Warps:

 	db 5

-	warp_def 23, 3, 2, CHERRYGROVE_MART

-	warp_def 29, 3, 1, CHERRYGROVE_POKECENTER_1F

-	warp_def 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE

-	warp_def 25, 9, 1, GUIDE_GENTS_HOUSE

-	warp_def 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE

+	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

 .CoordEvents:

 	db 2

--- a/maps/CherrygroveEvolutionSpeechHouse.asm

+++ b/maps/CherrygroveEvolutionSpeechHouse.asm

@@ -47,8 +47,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 5, CHERRYGROVE_CITY

-	warp_def 3, 7, 5, CHERRYGROVE_CITY

+	warp_event 2, 7, 5, CHERRYGROVE_CITY

+	warp_event 3, 7, 5, CHERRYGROVE_CITY

 .CoordEvents:

 	db 0

--- a/maps/CherrygroveGymSpeechHouse.asm

+++ b/maps/CherrygroveGymSpeechHouse.asm

@@ -50,8 +50,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, CHERRYGROVE_CITY

-	warp_def 3, 7, 3, CHERRYGROVE_CITY

+	warp_event 2, 7, 3, CHERRYGROVE_CITY

+	warp_event 3, 7, 3, CHERRYGROVE_CITY

 .CoordEvents:

 	db 0

--- a/maps/CherrygroveMart.asm

+++ b/maps/CherrygroveMart.asm

@@ -77,8 +77,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, CHERRYGROVE_CITY

-	warp_def 3, 7, 1, CHERRYGROVE_CITY

+	warp_event 2, 7, 1, CHERRYGROVE_CITY

+	warp_event 3, 7, 1, CHERRYGROVE_CITY

 .CoordEvents:

 	db 0

--- a/maps/CherrygrovePokecenter1F.asm

+++ b/maps/CherrygrovePokecenter1F.asm

@@ -74,9 +74,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 2, CHERRYGROVE_CITY

-	warp_def 4, 7, 2, CHERRYGROVE_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 2, CHERRYGROVE_CITY

+	warp_event 4, 7, 2, CHERRYGROVE_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/CianwoodCity.asm

+++ b/maps/CianwoodCity.asm

@@ -386,13 +386,13 @@

 .Warps:

 	db 7

-	warp_def 17, 41, 1, MANIAS_HOUSE

-	warp_def 8, 43, 1, CIANWOOD_GYM

-	warp_def 23, 43, 1, CIANWOOD_POKECENTER_1F

-	warp_def 15, 47, 1, CIANWOOD_PHARMACY

-	warp_def 9, 31, 1, CIANWOOD_PHOTO_STUDIO

-	warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE

-	warp_def 5, 17, 1, POKE_SEERS_HOUSE

+	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

 .CoordEvents:

 	db 1

--- a/maps/CianwoodGym.asm

+++ b/maps/CianwoodGym.asm

@@ -311,8 +311,8 @@

 .Warps:

 	db 2

-	warp_def 4, 17, 2, CIANWOOD_CITY

-	warp_def 5, 17, 2, CIANWOOD_CITY

+	warp_event 4, 17, 2, CIANWOOD_CITY

+	warp_event 5, 17, 2, CIANWOOD_CITY

 .CoordEvents:

 	db 0

--- a/maps/CianwoodLugiaSpeechHouse.asm

+++ b/maps/CianwoodLugiaSpeechHouse.asm

@@ -67,8 +67,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 6, CIANWOOD_CITY

-	warp_def 3, 7, 6, CIANWOOD_CITY

+	warp_event 2, 7, 6, CIANWOOD_CITY

+	warp_event 3, 7, 6, CIANWOOD_CITY

 .CoordEvents:

 	db 0

--- a/maps/CianwoodPharmacy.asm

+++ b/maps/CianwoodPharmacy.asm

@@ -78,8 +78,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, CIANWOOD_CITY

-	warp_def 3, 7, 4, CIANWOOD_CITY

+	warp_event 2, 7, 4, CIANWOOD_CITY

+	warp_event 3, 7, 4, CIANWOOD_CITY

 .CoordEvents:

 	db 0

--- a/maps/CianwoodPhotoStudio.asm

+++ b/maps/CianwoodPhotoStudio.asm

@@ -54,8 +54,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 5, CIANWOOD_CITY

-	warp_def 3, 7, 5, CIANWOOD_CITY

+	warp_event 2, 7, 5, CIANWOOD_CITY

+	warp_event 3, 7, 5, CIANWOOD_CITY

 .CoordEvents:

 	db 0

--- a/maps/CianwoodPokecenter1F.asm

+++ b/maps/CianwoodPokecenter1F.asm

@@ -137,9 +137,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 3, CIANWOOD_CITY

-	warp_def 4, 7, 3, CIANWOOD_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 3, CIANWOOD_CITY

+	warp_event 4, 7, 3, CIANWOOD_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/CinnabarIsland.asm

+++ b/maps/CinnabarIsland.asm

@@ -133,7 +133,7 @@

 .Warps:

 	db 1

-	warp_def 11, 11, 1, CINNABAR_POKECENTER_1F

+	warp_event 11, 11, 1, CINNABAR_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/CinnabarPokecenter1F.asm

+++ b/maps/CinnabarPokecenter1F.asm

@@ -40,9 +40,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 1, CINNABAR_ISLAND

-	warp_def 4, 7, 1, CINNABAR_ISLAND

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 1, CINNABAR_ISLAND

+	warp_event 4, 7, 1, CINNABAR_ISLAND

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/CinnabarPokecenter2FBeta.asm

+++ b/maps/CinnabarPokecenter2FBeta.asm

@@ -11,7 +11,7 @@

 .Warps:

 	db 1

-	warp_def 0, 7, 3, CINNABAR_POKECENTER_1F

+	warp_event 0, 7, 3, CINNABAR_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/Colosseum.asm

+++ b/maps/Colosseum.asm

@@ -68,8 +68,8 @@

 .Warps:

 	db 2

-	warp_def 4, 7, 3, POKECENTER_2F

-	warp_def 5, 7, 3, POKECENTER_2F

+	warp_event 4, 7, 3, POKECENTER_2F

+	warp_event 5, 7, 3, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/CopycatsHouse1F.asm

+++ b/maps/CopycatsHouse1F.asm

@@ -78,9 +78,9 @@

 .Warps:

 	db 3

-	warp_def 2, 7, 8, SAFFRON_CITY

-	warp_def 3, 7, 8, SAFFRON_CITY

-	warp_def 2, 0, 1, COPYCATS_HOUSE_2F

+	warp_event 2, 7, 8, SAFFRON_CITY

+	warp_event 3, 7, 8, SAFFRON_CITY

+	warp_event 2, 0, 1, COPYCATS_HOUSE_2F

 .CoordEvents:

 	db 0

--- a/maps/CopycatsHouse2F.asm

+++ b/maps/CopycatsHouse2F.asm

@@ -366,7 +366,7 @@

 .Warps:

 	db 1

-	warp_def 3, 0, 3, COPYCATS_HOUSE_1F

+	warp_event 3, 0, 3, COPYCATS_HOUSE_1F

 .CoordEvents:

 	db 0

--- a/maps/DanceTheatre.asm

+++ b/maps/DanceTheatre.asm

@@ -343,8 +343,8 @@

 .Warps:

 	db 2

-	warp_def 5, 13, 8, ECRUTEAK_CITY

-	warp_def 6, 13, 8, ECRUTEAK_CITY

+	warp_event 5, 13, 8, ECRUTEAK_CITY

+	warp_event 6, 13, 8, ECRUTEAK_CITY

 .CoordEvents:

 	db 0

--- a/maps/DarkCaveBlackthornEntrance.asm

+++ b/maps/DarkCaveBlackthornEntrance.asm

@@ -67,8 +67,8 @@

 .Warps:

 	db 2

-	warp_def 23, 3, 1, ROUTE_45

-	warp_def 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE

+	warp_event 23, 3, 1, ROUTE_45

+	warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE

 .CoordEvents:

 	db 0

--- a/maps/DarkCaveVioletEntrance.asm

+++ b/maps/DarkCaveVioletEntrance.asm

@@ -39,9 +39,9 @@

 .Warps:

 	db 3

-	warp_def 3, 15, 3, ROUTE_31

-	warp_def 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE

-	warp_def 35, 33, 3, ROUTE_46

+	warp_event 3, 15, 3, ROUTE_31

+	warp_event 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE

+	warp_event 35, 33, 3, ROUTE_46

 .CoordEvents:

 	db 0

--- a/maps/DayCare.asm

+++ b/maps/DayCare.asm

@@ -161,10 +161,10 @@

 .Warps:

 	db 4

-	warp_def 0, 5, 3, ROUTE_34

-	warp_def 0, 6, 4, ROUTE_34

-	warp_def 2, 7, 5, ROUTE_34

-	warp_def 3, 7, 5, ROUTE_34

+	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

 .CoordEvents:

 	db 0

--- a/maps/DayOfWeekSiblingsHouse.asm

+++ b/maps/DayOfWeekSiblingsHouse.asm

@@ -76,8 +76,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, ROUTE_26

-	warp_def 3, 7, 3, ROUTE_26

+	warp_event 2, 7, 3, ROUTE_26

+	warp_event 3, 7, 3, ROUTE_26

 .CoordEvents:

 	db 0

--- a/maps/DiglettsCave.asm

+++ b/maps/DiglettsCave.asm

@@ -28,12 +28,12 @@

 .Warps:

 	db 6

-	warp_def 3, 33, 10, VERMILION_CITY

-	warp_def 5, 31, 5, DIGLETTS_CAVE

-	warp_def 15, 5, 5, ROUTE_2

-	warp_def 17, 3, 6, DIGLETTS_CAVE

-	warp_def 17, 33, 2, DIGLETTS_CAVE

-	warp_def 3, 3, 4, DIGLETTS_CAVE

+	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

 .CoordEvents:

 	db 0

--- a/maps/DragonShrine.asm

+++ b/maps/DragonShrine.asm

@@ -663,8 +663,8 @@

 .Warps:

 	db 2

-	warp_def 4, 9, 2, DRAGONS_DEN_B1F

-	warp_def 5, 9, 2, DRAGONS_DEN_B1F

+	warp_event 4, 9, 2, DRAGONS_DEN_B1F

+	warp_event 5, 9, 2, DRAGONS_DEN_B1F

 .CoordEvents:

 	db 0

--- a/maps/DragonsDen1F.asm

+++ b/maps/DragonsDen1F.asm

@@ -11,10 +11,10 @@

 .Warps:

 	db 4

-	warp_def 3, 5, 8, BLACKTHORN_CITY

-	warp_def 3, 3, 4, DRAGONS_DEN_1F

-	warp_def 5, 15, 1, DRAGONS_DEN_B1F

-	warp_def 5, 13, 2, DRAGONS_DEN_1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/DragonsDenB1F.asm

+++ b/maps/DragonsDenB1F.asm

@@ -412,8 +412,8 @@

 .Warps:

 	db 2

-	warp_def 20, 3, 3, DRAGONS_DEN_1F

-	warp_def 19, 29, 1, DRAGON_SHRINE

+	warp_event 20, 3, 3, DRAGONS_DEN_1F

+	warp_event 19, 29, 1, DRAGON_SHRINE

 .CoordEvents:

 	db 1

--- a/maps/EarlsPokemonAcademy.asm

+++ b/maps/EarlsPokemonAcademy.asm

@@ -417,8 +417,8 @@

 .Warps:

 	db 2

-	warp_def 3, 15, 3, VIOLET_CITY

-	warp_def 4, 15, 3, VIOLET_CITY

+	warp_event 3, 15, 3, VIOLET_CITY

+	warp_event 4, 15, 3, VIOLET_CITY

 .CoordEvents:

 	db 0

--- a/maps/EcruteakCity.asm

+++ b/maps/EcruteakCity.asm

@@ -265,21 +265,21 @@

 .Warps:

 	db 15

-	warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE

-	warp_def 35, 27, 2, ROUTE_42_ECRUTEAK_GATE

-	warp_def 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE

-	warp_def 20, 2, 1, WISE_TRIOS_ROOM

-	warp_def 20, 3, 2, WISE_TRIOS_ROOM

-	warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F

-	warp_def 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE

-	warp_def 23, 21, 1, DANCE_THEATRE

-	warp_def 29, 21, 2, ECRUTEAK_MART

-	warp_def 6, 27, 1, ECRUTEAK_GYM

-	warp_def 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE

-	warp_def 37, 7, 1, TIN_TOWER_1F

-	warp_def 5, 5, 1, BURNED_TOWER_1F

-	warp_def 0, 18, 3, ROUTE_38_ECRUTEAK_GATE

-	warp_def 0, 19, 4, ROUTE_38_ECRUTEAK_GATE

+	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

 .CoordEvents:

 	db 0

--- a/maps/EcruteakGym.asm

+++ b/maps/EcruteakGym.asm

@@ -392,39 +392,39 @@

 .Warps:

 	db 33

-	warp_def 4, 17, 10, ECRUTEAK_CITY

-	warp_def 5, 17, 10, ECRUTEAK_CITY

-	warp_def 4, 14, 4, ECRUTEAK_GYM

-	warp_def 2, 4, 3, ECRUTEAK_GYM

-	warp_def 3, 4, 3, ECRUTEAK_GYM

-	warp_def 4, 4, 3, ECRUTEAK_GYM

-	warp_def 4, 5, 3, ECRUTEAK_GYM

-	warp_def 6, 7, 3, ECRUTEAK_GYM

-	warp_def 7, 4, 3, ECRUTEAK_GYM

-	warp_def 2, 6, 3, ECRUTEAK_GYM

-	warp_def 3, 6, 3, ECRUTEAK_GYM

-	warp_def 4, 6, 3, ECRUTEAK_GYM

-	warp_def 5, 6, 3, ECRUTEAK_GYM

-	warp_def 7, 6, 3, ECRUTEAK_GYM

-	warp_def 7, 7, 3, ECRUTEAK_GYM

-	warp_def 4, 8, 3, ECRUTEAK_GYM

-	warp_def 5, 8, 3, ECRUTEAK_GYM

-	warp_def 6, 8, 3, ECRUTEAK_GYM

-	warp_def 7, 8, 3, ECRUTEAK_GYM

-	warp_def 2, 8, 3, ECRUTEAK_GYM

-	warp_def 2, 9, 3, ECRUTEAK_GYM

-	warp_def 2, 10, 3, ECRUTEAK_GYM

-	warp_def 2, 11, 3, ECRUTEAK_GYM

-	warp_def 4, 10, 3, ECRUTEAK_GYM

-	warp_def 5, 10, 3, ECRUTEAK_GYM

-	warp_def 2, 12, 3, ECRUTEAK_GYM

-	warp_def 3, 12, 3, ECRUTEAK_GYM

-	warp_def 4, 12, 3, ECRUTEAK_GYM

-	warp_def 5, 12, 3, ECRUTEAK_GYM

-	warp_def 7, 10, 3, ECRUTEAK_GYM

-	warp_def 7, 11, 3, ECRUTEAK_GYM

-	warp_def 7, 12, 3, ECRUTEAK_GYM

-	warp_def 7, 13, 3, ECRUTEAK_GYM

+	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

 .CoordEvents:

 	db 0

--- a/maps/EcruteakItemfinderHouse.asm

+++ b/maps/EcruteakItemfinderHouse.asm

@@ -168,8 +168,8 @@

 .Warps:

 	db 2

-	warp_def 3, 7, 11, ECRUTEAK_CITY

-	warp_def 4, 7, 11, ECRUTEAK_CITY

+	warp_event 3, 7, 11, ECRUTEAK_CITY

+	warp_event 4, 7, 11, ECRUTEAK_CITY

 .CoordEvents:

 	db 0

--- a/maps/EcruteakLugiaSpeechHouse.asm

+++ b/maps/EcruteakLugiaSpeechHouse.asm

@@ -50,8 +50,8 @@

 .Warps:

 	db 2

-	warp_def 3, 7, 7, ECRUTEAK_CITY

-	warp_def 4, 7, 7, ECRUTEAK_CITY

+	warp_event 3, 7, 7, ECRUTEAK_CITY

+	warp_event 4, 7, 7, ECRUTEAK_CITY

 .CoordEvents:

 	db 0

--- a/maps/EcruteakMart.asm

+++ b/maps/EcruteakMart.asm

@@ -51,8 +51,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 9, ECRUTEAK_CITY

-	warp_def 3, 7, 9, ECRUTEAK_CITY

+	warp_event 2, 7, 9, ECRUTEAK_CITY

+	warp_event 3, 7, 9, ECRUTEAK_CITY

 .CoordEvents:

 	db 0

--- a/maps/EcruteakPokecenter1F.asm

+++ b/maps/EcruteakPokecenter1F.asm

@@ -212,9 +212,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 6, ECRUTEAK_CITY

-	warp_def 4, 7, 6, ECRUTEAK_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 6, ECRUTEAK_CITY

+	warp_event 4, 7, 6, ECRUTEAK_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/EcruteakTinTowerEntrance.asm

+++ b/maps/EcruteakTinTowerEntrance.asm

@@ -283,11 +283,11 @@

 .Warps:

 	db 5

-	warp_def 4, 17, 3, ECRUTEAK_CITY

-	warp_def 5, 17, 3, ECRUTEAK_CITY

-	warp_def 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE

-	warp_def 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE

-	warp_def 17, 3, 3, WISE_TRIOS_ROOM

+	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

 .CoordEvents:

 	db 2

--- a/maps/ElmsHouse.asm

+++ b/maps/ElmsHouse.asm

@@ -89,8 +89,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, NEW_BARK_TOWN

-	warp_def 3, 7, 4, NEW_BARK_TOWN

+	warp_event 2, 7, 4, NEW_BARK_TOWN

+	warp_event 3, 7, 4, NEW_BARK_TOWN

 .CoordEvents:

 	db 0

--- a/maps/ElmsLab.asm

+++ b/maps/ElmsLab.asm

@@ -1376,8 +1376,8 @@

 .Warps:

 	db 2

-	warp_def 4, 11, 1, NEW_BARK_TOWN

-	warp_def 5, 11, 1, NEW_BARK_TOWN

+	warp_event 4, 11, 1, NEW_BARK_TOWN

+	warp_event 5, 11, 1, NEW_BARK_TOWN

 .CoordEvents:

 	db 8

--- a/maps/FastShip1F.asm

+++ b/maps/FastShip1F.asm

@@ -291,18 +291,18 @@

 .Warps:

 	db 12

-	warp_def 25, 1, -1, FAST_SHIP_1F

-	warp_def 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE

-	warp_def 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE

-	warp_def 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE

-	warp_def 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW

-	warp_def 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW

-	warp_def 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW

-	warp_def 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN

-	warp_def 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN

-	warp_def 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN

-	warp_def 6, 12, 1, FAST_SHIP_B1F

-	warp_def 30, 14, 2, FAST_SHIP_B1F

+	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

 .CoordEvents:

 	db 2

--- a/maps/FastShipB1F.asm

+++ b/maps/FastShipB1F.asm

@@ -454,8 +454,8 @@

 .Warps:

 	db 2

-	warp_def 5, 11, 11, FAST_SHIP_1F

-	warp_def 31, 13, 12, FAST_SHIP_1F

+	warp_event 5, 11, 11, FAST_SHIP_1F

+	warp_event 31, 13, 12, FAST_SHIP_1F

 .CoordEvents:

 	db 2

--- a/maps/FastShipCabins_NNW_NNE_NE.asm

+++ b/maps/FastShipCabins_NNW_NNE_NE.asm

@@ -272,9 +272,9 @@

 .Warps:

 	db 3

-	warp_def 2, 0, 2, FAST_SHIP_1F

-	warp_def 2, 12, 3, FAST_SHIP_1F

-	warp_def 2, 24, 4, FAST_SHIP_1F

+	warp_event 2, 0, 2, FAST_SHIP_1F

+	warp_event 2, 12, 3, FAST_SHIP_1F

+	warp_event 2, 24, 4, FAST_SHIP_1F

 .CoordEvents:

 	db 0

--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm

+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm

@@ -468,12 +468,12 @@

 .Warps:

 	db 6

-	warp_def 2, 7, 8, FAST_SHIP_1F

-	warp_def 3, 7, 8, FAST_SHIP_1F

-	warp_def 2, 19, 9, FAST_SHIP_1F

-	warp_def 3, 19, 9, FAST_SHIP_1F

-	warp_def 2, 33, 10, FAST_SHIP_1F

-	warp_def 3, 33, 10, FAST_SHIP_1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/FastShipCabins_SW_SSW_NW.asm

+++ b/maps/FastShipCabins_SW_SSW_NW.asm

@@ -228,11 +228,11 @@

 .Warps:

 	db 5

-	warp_def 2, 0, 5, FAST_SHIP_1F

-	warp_def 2, 19, 6, FAST_SHIP_1F

-	warp_def 3, 19, 6, FAST_SHIP_1F

-	warp_def 2, 31, 7, FAST_SHIP_1F

-	warp_def 3, 31, 7, FAST_SHIP_1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/FightingDojo.asm

+++ b/maps/FightingDojo.asm

@@ -48,8 +48,8 @@

 .Warps:

 	db 2

-	warp_def 4, 11, 1, SAFFRON_CITY

-	warp_def 5, 11, 1, SAFFRON_CITY

+	warp_event 4, 11, 1, SAFFRON_CITY

+	warp_event 5, 11, 1, SAFFRON_CITY

 .CoordEvents:

 	db 0

--- a/maps/FuchsiaCity.asm

+++ b/maps/FuchsiaCity.asm

@@ -130,17 +130,17 @@

 .Warps:

 	db 11

-	warp_def 5, 13, 2, FUCHSIA_MART

-	warp_def 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE

-	warp_def 8, 27, 1, FUCHSIA_GYM

-	warp_def 11, 27, 1, BILLS_BROTHERS_HOUSE

-	warp_def 19, 27, 1, FUCHSIA_POKECENTER_1F

-	warp_def 27, 27, 1, SAFARI_ZONE_WARDENS_HOME

-	warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA

-	warp_def 37, 22, 1, ROUTE_15_FUCHSIA_GATE

-	warp_def 37, 23, 2, ROUTE_15_FUCHSIA_GATE

-	warp_def 7, 35, 1, ROUTE_19_FUCHSIA_GATE

-	warp_def 8, 35, 2, ROUTE_19_FUCHSIA_GATE

+	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

 .CoordEvents:

 	db 0

--- a/maps/FuchsiaGym.asm

+++ b/maps/FuchsiaGym.asm

@@ -386,8 +386,8 @@

 .Warps:

 	db 2

-	warp_def 4, 17, 3, FUCHSIA_CITY

-	warp_def 5, 17, 3, FUCHSIA_CITY

+	warp_event 4, 17, 3, FUCHSIA_CITY

+	warp_event 5, 17, 3, FUCHSIA_CITY

 .CoordEvents:

 	db 0

--- a/maps/FuchsiaMart.asm

+++ b/maps/FuchsiaMart.asm

@@ -43,8 +43,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, FUCHSIA_CITY

-	warp_def 3, 7, 1, FUCHSIA_CITY

+	warp_event 2, 7, 1, FUCHSIA_CITY

+	warp_event 3, 7, 1, FUCHSIA_CITY

 .CoordEvents:

 	db 0

--- a/maps/FuchsiaPokecenter1F.asm

+++ b/maps/FuchsiaPokecenter1F.asm

@@ -94,9 +94,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 5, FUCHSIA_CITY

-	warp_def 4, 7, 5, FUCHSIA_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 5, FUCHSIA_CITY

+	warp_event 4, 7, 5, FUCHSIA_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/FuchsiaPokecenter2FBeta.asm

+++ b/maps/FuchsiaPokecenter2FBeta.asm

@@ -11,7 +11,7 @@

 .Warps:

 	db 1

-	warp_def 0, 7, 3, FUCHSIA_POKECENTER_1F

+	warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodBikeShop.asm

+++ b/maps/GoldenrodBikeShop.asm

@@ -108,8 +108,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, GOLDENROD_CITY

-	warp_def 3, 7, 2, GOLDENROD_CITY

+	warp_event 2, 7, 2, GOLDENROD_CITY

+	warp_event 3, 7, 2, GOLDENROD_CITY

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodCity.asm

+++ b/maps/GoldenrodCity.asm

@@ -557,21 +557,21 @@

 .Warps:

 	db 15

-	warp_def 24, 7, 1, GOLDENROD_GYM

-	warp_def 29, 29, 1, GOLDENROD_BIKE_SHOP

-	warp_def 31, 21, 1, GOLDENROD_HAPPINESS_RATER

-	warp_def 5, 25, 1, BILLS_FAMILYS_HOUSE

-	warp_def 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION

-	warp_def 29, 5, 1, GOLDENROD_FLOWER_SHOP

-	warp_def 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE

-	warp_def 15, 7, 1, GOLDENROD_NAME_RATER

-	warp_def 24, 27, 1, GOLDENROD_DEPT_STORE_1F

-	warp_def 14, 21, 1, GOLDENROD_GAME_CORNER

-	warp_def 5, 15, 1, RADIO_TOWER_1F

-	warp_def 19, 1, 3, ROUTE_35_GOLDENROD_GATE

-	warp_def 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES

-	warp_def 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES

-	warp_def 15, 27, 1, GOLDENROD_POKECENTER_1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodDeptStore1F.asm

+++ b/maps/GoldenrodDeptStore1F.asm

@@ -84,10 +84,10 @@

 .Warps:

 	db 4

-	warp_def 7, 7, 9, GOLDENROD_CITY

-	warp_def 8, 7, 9, GOLDENROD_CITY

-	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_2F

-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodDeptStore2F.asm

+++ b/maps/GoldenrodDeptStore2F.asm

@@ -106,9 +106,9 @@

 .Warps:

 	db 3

-	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_3F

-	warp_def 15, 0, 3, GOLDENROD_DEPT_STORE_1F

-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodDeptStore3F.asm

+++ b/maps/GoldenrodDeptStore3F.asm

@@ -62,9 +62,9 @@

 .Warps:

 	db 3

-	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_2F

-	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_4F

-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodDeptStore4F.asm

+++ b/maps/GoldenrodDeptStore4F.asm

@@ -83,9 +83,9 @@

 .Warps:

 	db 3

-	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_5F

-	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_3F

-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodDeptStore5F.asm

+++ b/maps/GoldenrodDeptStore5F.asm

@@ -223,9 +223,9 @@

 .Warps:

 	db 3

-	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_4F

-	warp_def 15, 0, 1, GOLDENROD_DEPT_STORE_6F

-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodDeptStore6F.asm

+++ b/maps/GoldenrodDeptStore6F.asm

@@ -153,9 +153,9 @@

 .Warps:

 	db 3

-	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_5F

-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR

-	warp_def 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF

+	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

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodDeptStoreB1F.asm

+++ b/maps/GoldenrodDeptStoreB1F.asm

@@ -115,9 +115,9 @@

 .Warps:

 	db 3

-	warp_def 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE

-	warp_def 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR

-	warp_def 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR

+	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

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodDeptStoreElevator.asm

+++ b/maps/GoldenrodDeptStoreElevator.asm

@@ -60,8 +60,8 @@

 .Warps:

 	db 2

-	warp_def 1, 3, -1, GOLDENROD_DEPT_STORE_1F

-	warp_def 2, 3, -1, GOLDENROD_DEPT_STORE_1F

+	warp_event 1, 3, -1, GOLDENROD_DEPT_STORE_1F

+	warp_event 2, 3, -1, GOLDENROD_DEPT_STORE_1F

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodDeptStoreRoof.asm

+++ b/maps/GoldenrodDeptStoreRoof.asm

@@ -217,7 +217,7 @@

 .Warps:

 	db 1

-	warp_def 13, 1, 3, GOLDENROD_DEPT_STORE_6F

+	warp_event 13, 1, 3, GOLDENROD_DEPT_STORE_6F

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodFlowerShop.asm

+++ b/maps/GoldenrodFlowerShop.asm

@@ -165,8 +165,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 6, GOLDENROD_CITY

-	warp_def 3, 7, 6, GOLDENROD_CITY

+	warp_event 2, 7, 6, GOLDENROD_CITY

+	warp_event 3, 7, 6, GOLDENROD_CITY

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodGameCorner.asm

+++ b/maps/GoldenrodGameCorner.asm

@@ -442,8 +442,8 @@

 .Warps:

 	db 2

-	warp_def 2, 13, 10, GOLDENROD_CITY

-	warp_def 3, 13, 10, GOLDENROD_CITY

+	warp_event 2, 13, 10, GOLDENROD_CITY

+	warp_event 3, 13, 10, GOLDENROD_CITY

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodGym.asm

+++ b/maps/GoldenrodGym.asm

@@ -385,8 +385,8 @@

 .Warps:

 	db 2

-	warp_def 2, 17, 1, GOLDENROD_CITY

-	warp_def 3, 17, 1, GOLDENROD_CITY

+	warp_event 2, 17, 1, GOLDENROD_CITY

+	warp_event 3, 17, 1, GOLDENROD_CITY

 .CoordEvents:

 	db 1

--- a/maps/GoldenrodHappinessRater.asm

+++ b/maps/GoldenrodHappinessRater.asm

@@ -142,8 +142,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, GOLDENROD_CITY

-	warp_def 3, 7, 3, GOLDENROD_CITY

+	warp_event 2, 7, 3, GOLDENROD_CITY

+	warp_event 3, 7, 3, GOLDENROD_CITY

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodMagnetTrainStation.asm

+++ b/maps/GoldenrodMagnetTrainStation.asm

@@ -170,10 +170,10 @@

 .Warps:

 	db 4

-	warp_def 8, 17, 5, GOLDENROD_CITY

-	warp_def 9, 17, 5, GOLDENROD_CITY

-	warp_def 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION

-	warp_def 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION

+	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

 .CoordEvents:

 	db 1

--- a/maps/GoldenrodNameRater.asm

+++ b/maps/GoldenrodNameRater.asm

@@ -30,8 +30,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 8, GOLDENROD_CITY

-	warp_def 3, 7, 8, GOLDENROD_CITY

+	warp_event 2, 7, 8, GOLDENROD_CITY

+	warp_event 3, 7, 8, GOLDENROD_CITY

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodPPSpeechHouse.asm

+++ b/maps/GoldenrodPPSpeechHouse.asm

@@ -57,8 +57,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 7, GOLDENROD_CITY

-	warp_def 3, 7, 7, GOLDENROD_CITY

+	warp_event 2, 7, 7, GOLDENROD_CITY

+	warp_event 3, 7, 7, GOLDENROD_CITY

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodPokecenter1F.asm

+++ b/maps/GoldenrodPokecenter1F.asm

@@ -810,10 +810,10 @@

 .Warps:

 	db 4

-	warp_def 3, 7, 15, GOLDENROD_CITY

-	warp_def 4, 7, 15, GOLDENROD_CITY

-	warp_def 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE

-	warp_def 0, 7, 1, POKECENTER_2F

+	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

 .CoordEvents:

 	db 2

--- a/maps/GoldenrodUnderground.asm

+++ b/maps/GoldenrodUnderground.asm

@@ -652,12 +652,12 @@

 .Warps:

 	db 6

-	warp_def 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES

-	warp_def 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES

-	warp_def 18, 6, 4, GOLDENROD_UNDERGROUND

-	warp_def 21, 31, 3, GOLDENROD_UNDERGROUND

-	warp_def 22, 31, 3, GOLDENROD_UNDERGROUND

-	warp_def 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES

+	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

 .CoordEvents:

 	db 0

--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm

+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm

@@ -936,15 +936,15 @@

 .Warps:

 	db 9

-	warp_def 23, 3, 6, GOLDENROD_UNDERGROUND

-	warp_def 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE

-	warp_def 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE

-	warp_def 5, 25, 2, GOLDENROD_UNDERGROUND

-	warp_def 4, 29, 14, GOLDENROD_CITY

-	warp_def 5, 29, 14, GOLDENROD_CITY

-	warp_def 21, 25, 1, GOLDENROD_UNDERGROUND

-	warp_def 20, 29, 13, GOLDENROD_CITY

-	warp_def 21, 29, 13, GOLDENROD_CITY

+	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

 .CoordEvents:

 	db 2

--- a/maps/GoldenrodUndergroundWarehouse.asm

+++ b/maps/GoldenrodUndergroundWarehouse.asm

@@ -216,9 +216,9 @@

 .Warps:

 	db 3

-	warp_def 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES

-	warp_def 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES

-	warp_def 17, 2, 1, GOLDENROD_DEPT_STORE_B1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/GuideGentsHouse.asm

+++ b/maps/GuideGentsHouse.asm

@@ -33,8 +33,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, CHERRYGROVE_CITY

-	warp_def 3, 7, 4, CHERRYGROVE_CITY

+	warp_event 2, 7, 4, CHERRYGROVE_CITY

+	warp_event 3, 7, 4, CHERRYGROVE_CITY

 .CoordEvents:

 	db 0

--- a/maps/HallOfFame.asm

+++ b/maps/HallOfFame.asm

@@ -116,8 +116,8 @@

 .Warps:

 	db 2

-	warp_def 4, 13, 3, LANCES_ROOM

-	warp_def 5, 13, 4, LANCES_ROOM

+	warp_event 4, 13, 3, LANCES_ROOM

+	warp_event 5, 13, 4, LANCES_ROOM

 .CoordEvents:

 	db 0

--- a/maps/IcePath1F.asm

+++ b/maps/IcePath1F.asm

@@ -25,10 +25,10 @@

 .Warps:

 	db 4

-	warp_def 4, 19, 1, ROUTE_44

-	warp_def 36, 27, 7, BLACKTHORN_CITY

-	warp_def 37, 5, 1, ICE_PATH_B1F

-	warp_def 37, 13, 7, ICE_PATH_B1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/IcePathB1F.asm

+++ b/maps/IcePathB1F.asm

@@ -81,14 +81,14 @@

 .Warps:

 	db 8

-	warp_def 3, 15, 3, ICE_PATH_1F

-	warp_def 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE

-	warp_def 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole

-	warp_def 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole

-	warp_def 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole

-	warp_def 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole

-	warp_def 5, 25, 4, ICE_PATH_1F

-	warp_def 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE

+	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

 .CoordEvents:

 	db 0

--- a/maps/IcePathB2FBlackthornSide.asm

+++ b/maps/IcePathB2FBlackthornSide.asm

@@ -20,8 +20,8 @@

 .Warps:

 	db 2

-	warp_def 3, 15, 8, ICE_PATH_B1F

-	warp_def 3, 3, 2, ICE_PATH_B3F

+	warp_event 3, 15, 8, ICE_PATH_B1F

+	warp_event 3, 3, 2, ICE_PATH_B3F

 .CoordEvents:

 	db 0

--- a/maps/IcePathB2FMahoganySide.asm

+++ b/maps/IcePathB2FMahoganySide.asm

@@ -36,12 +36,12 @@

 .Warps:

 	db 6

-	warp_def 17, 1, 2, ICE_PATH_B1F

-	warp_def 9, 11, 1, ICE_PATH_B3F

-	warp_def 11, 4, 3, ICE_PATH_B1F

-	warp_def 4, 6, 4, ICE_PATH_B1F

-	warp_def 4, 12, 5, ICE_PATH_B1F

-	warp_def 12, 12, 6, ICE_PATH_B1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/IcePathB3F.asm

+++ b/maps/IcePathB3F.asm

@@ -21,8 +21,8 @@

 .Warps:

 	db 2

-	warp_def 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE

-	warp_def 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE

+	warp_event 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE

+	warp_event 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE

 .CoordEvents:

 	db 0

--- a/maps/IlexForest.asm

+++ b/maps/IlexForest.asm

@@ -943,9 +943,9 @@

 .Warps:

 	db 3

-	warp_def 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE

-	warp_def 3, 42, 1, ILEX_FOREST_AZALEA_GATE

-	warp_def 3, 43, 2, ILEX_FOREST_AZALEA_GATE

+	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

 .CoordEvents:

 	db 0

--- a/maps/IlexForestAzaleaGate.asm

+++ b/maps/IlexForestAzaleaGate.asm

@@ -36,10 +36,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 2, ILEX_FOREST

-	warp_def 0, 5, 3, ILEX_FOREST

-	warp_def 9, 4, 7, AZALEA_TOWN

-	warp_def 9, 5, 8, AZALEA_TOWN

+	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

 .CoordEvents:

 	db 0

--- a/maps/IndigoPlateauPokecenter1F.asm

+++ b/maps/IndigoPlateauPokecenter1F.asm

@@ -308,10 +308,10 @@

 .Warps:

 	db 4

-	warp_def 5, 13, 1, ROUTE_23

-	warp_def 6, 13, 2, ROUTE_23

-	warp_def 0, 13, 1, POKECENTER_2F

-	warp_def 14, 3, 1, WILLS_ROOM

+	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

 .CoordEvents:

 	db 2

--- a/maps/KarensRoom.asm

+++ b/maps/KarensRoom.asm

@@ -138,10 +138,10 @@

 .Warps:

 	db 4

-	warp_def 4, 17, 3, BRUNOS_ROOM

-	warp_def 5, 17, 4, BRUNOS_ROOM

-	warp_def 4, 2, 1, LANCES_ROOM

-	warp_def 5, 2, 2, LANCES_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/KogasRoom.asm

+++ b/maps/KogasRoom.asm

@@ -135,10 +135,10 @@

 .Warps:

 	db 4

-	warp_def 4, 17, 2, WILLS_ROOM

-	warp_def 5, 17, 3, WILLS_ROOM

-	warp_def 4, 2, 1, BRUNOS_ROOM

-	warp_def 5, 2, 2, BRUNOS_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/KurtsHouse.asm

+++ b/maps/KurtsHouse.asm

@@ -682,8 +682,8 @@

 .Warps:

 	db 2

-	warp_def 3, 7, 4, AZALEA_TOWN

-	warp_def 4, 7, 4, AZALEA_TOWN

+	warp_event 3, 7, 4, AZALEA_TOWN

+	warp_event 4, 7, 4, AZALEA_TOWN

 .CoordEvents:

 	db 0

--- a/maps/LakeOfRage.asm

+++ b/maps/LakeOfRage.asm

@@ -499,8 +499,8 @@

 .Warps:

 	db 2

-	warp_def 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE

-	warp_def 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE

+	warp_event 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE

+	warp_event 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE

 .CoordEvents:

 	db 0

--- a/maps/LakeOfRageHiddenPowerHouse.asm

+++ b/maps/LakeOfRageHiddenPowerHouse.asm

@@ -73,8 +73,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, LAKE_OF_RAGE

-	warp_def 3, 7, 1, LAKE_OF_RAGE

+	warp_event 2, 7, 1, LAKE_OF_RAGE

+	warp_event 3, 7, 1, LAKE_OF_RAGE

 .CoordEvents:

 	db 0

--- a/maps/LakeOfRageMagikarpHouse.asm

+++ b/maps/LakeOfRageMagikarpHouse.asm

@@ -212,8 +212,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, LAKE_OF_RAGE

-	warp_def 3, 7, 2, LAKE_OF_RAGE

+	warp_event 2, 7, 2, LAKE_OF_RAGE

+	warp_event 3, 7, 2, LAKE_OF_RAGE

 .CoordEvents:

 	db 0

--- a/maps/LancesRoom.asm

+++ b/maps/LancesRoom.asm

@@ -343,10 +343,10 @@

 .Warps:

 	db 4

-	warp_def 4, 23, 3, KARENS_ROOM

-	warp_def 5, 23, 4, KARENS_ROOM

-	warp_def 4, 1, 1, HALL_OF_FAME

-	warp_def 5, 1, 2, HALL_OF_FAME

+	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

 .CoordEvents:

 	db 2

--- a/maps/LavRadioTower1F.asm

+++ b/maps/LavRadioTower1F.asm

@@ -227,8 +227,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 7, LAVENDER_TOWN

-	warp_def 3, 7, 7, LAVENDER_TOWN

+	warp_event 2, 7, 7, LAVENDER_TOWN

+	warp_event 3, 7, 7, LAVENDER_TOWN

 .CoordEvents:

 	db 0

--- a/maps/LavenderMart.asm

+++ b/maps/LavenderMart.asm

@@ -53,8 +53,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 5, LAVENDER_TOWN

-	warp_def 3, 7, 5, LAVENDER_TOWN

+	warp_event 2, 7, 5, LAVENDER_TOWN

+	warp_event 3, 7, 5, LAVENDER_TOWN

 .CoordEvents:

 	db 0

--- a/maps/LavenderNameRater.asm

+++ b/maps/LavenderNameRater.asm

@@ -29,8 +29,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, LAVENDER_TOWN

-	warp_def 3, 7, 4, LAVENDER_TOWN

+	warp_event 2, 7, 4, LAVENDER_TOWN

+	warp_event 3, 7, 4, LAVENDER_TOWN

 .CoordEvents:

 	db 0

--- a/maps/LavenderPokecenter1F.asm

+++ b/maps/LavenderPokecenter1F.asm

@@ -86,9 +86,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 1, LAVENDER_TOWN

-	warp_def 4, 7, 1, LAVENDER_TOWN

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 1, LAVENDER_TOWN

+	warp_event 4, 7, 1, LAVENDER_TOWN

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/LavenderPokecenter2FBeta.asm

+++ b/maps/LavenderPokecenter2FBeta.asm

@@ -11,7 +11,7 @@

 .Warps:

 	db 1

-	warp_def 0, 7, 3, LAVENDER_POKECENTER_1F

+	warp_event 0, 7, 3, LAVENDER_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/LavenderSpeechHouse.asm

+++ b/maps/LavenderSpeechHouse.asm

@@ -34,8 +34,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, LAVENDER_TOWN

-	warp_def 3, 7, 3, LAVENDER_TOWN

+	warp_event 2, 7, 3, LAVENDER_TOWN

+	warp_event 3, 7, 3, LAVENDER_TOWN

 .CoordEvents:

 	db 0

--- a/maps/LavenderTown.asm

+++ b/maps/LavenderTown.asm

@@ -111,13 +111,13 @@

 .Warps:

 	db 7

-	warp_def 5, 5, 1, LAVENDER_POKECENTER_1F

-	warp_def 5, 9, 1, MR_FUJIS_HOUSE

-	warp_def 3, 13, 1, LAVENDER_SPEECH_HOUSE

-	warp_def 7, 13, 1, LAVENDER_NAME_RATER

-	warp_def 1, 5, 2, LAVENDER_MART

-	warp_def 13, 11, 1, SOUL_HOUSE

-	warp_def 14, 5, 1, LAV_RADIO_TOWER_1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/MahoganyGym.asm

+++ b/maps/MahoganyGym.asm

@@ -378,8 +378,8 @@

 .Warps:

 	db 2

-	warp_def 4, 17, 3, MAHOGANY_TOWN

-	warp_def 5, 17, 3, MAHOGANY_TOWN

+	warp_event 4, 17, 3, MAHOGANY_TOWN

+	warp_event 5, 17, 3, MAHOGANY_TOWN

 .CoordEvents:

 	db 0

--- a/maps/MahoganyMart1F.asm

+++ b/maps/MahoganyMart1F.asm

@@ -226,9 +226,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 1, MAHOGANY_TOWN

-	warp_def 4, 7, 1, MAHOGANY_TOWN

-	warp_def 7, 3, 1, TEAM_ROCKET_BASE_B1F

+	warp_event 3, 7, 1, MAHOGANY_TOWN

+	warp_event 4, 7, 1, MAHOGANY_TOWN

+	warp_event 7, 3, 1, TEAM_ROCKET_BASE_B1F

 .CoordEvents:

 	db 0

--- a/maps/MahoganyPokecenter1F.asm

+++ b/maps/MahoganyPokecenter1F.asm

@@ -59,9 +59,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 4, MAHOGANY_TOWN

-	warp_def 4, 7, 4, MAHOGANY_TOWN

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 4, MAHOGANY_TOWN

+	warp_event 4, 7, 4, MAHOGANY_TOWN

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/MahoganyRedGyaradosSpeechHouse.asm

+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm

@@ -66,8 +66,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, MAHOGANY_TOWN

-	warp_def 3, 7, 2, MAHOGANY_TOWN

+	warp_event 2, 7, 2, MAHOGANY_TOWN

+	warp_event 3, 7, 2, MAHOGANY_TOWN

 .CoordEvents:

 	db 0

--- a/maps/MahoganyTown.asm

+++ b/maps/MahoganyTown.asm

@@ -250,11 +250,11 @@

 .Warps:

 	db 5

-	warp_def 11, 7, 1, MAHOGANY_MART_1F

-	warp_def 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE

-	warp_def 6, 13, 1, MAHOGANY_GYM

-	warp_def 15, 13, 1, MAHOGANY_POKECENTER_1F

-	warp_def 9, 1, 3, ROUTE_43_MAHOGANY_GATE

+	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

 .CoordEvents:

 	db 2

--- a/maps/ManiasHouse.asm

+++ b/maps/ManiasHouse.asm

@@ -205,8 +205,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, CIANWOOD_CITY

-	warp_def 3, 7, 1, CIANWOOD_CITY

+	warp_event 2, 7, 1, CIANWOOD_CITY

+	warp_event 3, 7, 1, CIANWOOD_CITY

 .CoordEvents:

 	db 0

--- a/maps/MobileBattleRoom.asm

+++ b/maps/MobileBattleRoom.asm

@@ -72,8 +72,8 @@

 .Warps:

 	db 2

-	warp_def 4, 7, 6, POKECENTER_2F

-	warp_def 5, 7, 6, POKECENTER_2F

+	warp_event 4, 7, 6, POKECENTER_2F

+	warp_event 5, 7, 6, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/MobileTradeRoomMobile.asm

+++ b/maps/MobileTradeRoomMobile.asm

@@ -40,8 +40,8 @@

 .Warps:

 	db 2

-	warp_def 4, 7, 5, POKECENTER_2F

-	warp_def 5, 7, 5, POKECENTER_2F

+	warp_event 4, 7, 5, POKECENTER_2F

+	warp_event 5, 7, 5, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/MountMoon.asm

+++ b/maps/MountMoon.asm

@@ -166,14 +166,14 @@

 .Warps:

 	db 8

-	warp_def 3, 3, 1, ROUTE_3

-	warp_def 15, 15, 1, ROUTE_4

-	warp_def 13, 3, 7, MOUNT_MOON

-	warp_def 15, 11, 8, MOUNT_MOON

-	warp_def 25, 5, 1, MOUNT_MOON_SQUARE

-	warp_def 25, 15, 2, MOUNT_MOON_SQUARE

-	warp_def 25, 3, 3, MOUNT_MOON

-	warp_def 25, 13, 4, MOUNT_MOON

+	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

 .CoordEvents:

 	db 0

--- a/maps/MountMoonGiftShop.asm

+++ b/maps/MountMoonGiftShop.asm

@@ -33,8 +33,8 @@

 .Warps:

 	db 2

-	warp_def 3, 7, 3, MOUNT_MOON_SQUARE

-	warp_def 4, 7, 3, MOUNT_MOON_SQUARE

+	warp_event 3, 7, 3, MOUNT_MOON_SQUARE

+	warp_event 4, 7, 3, MOUNT_MOON_SQUARE

 .CoordEvents:

 	db 0

--- a/maps/MountMoonSquare.asm

+++ b/maps/MountMoonSquare.asm

@@ -138,9 +138,9 @@

 .Warps:

 	db 3

-	warp_def 20, 5, 5, MOUNT_MOON

-	warp_def 22, 11, 6, MOUNT_MOON

-	warp_def 13, 7, 1, MOUNT_MOON_GIFT_SHOP

+	warp_event 20, 5, 5, MOUNT_MOON

+	warp_event 22, 11, 6, MOUNT_MOON

+	warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP

 .CoordEvents:

 	db 1

--- a/maps/MountMortar1FInside.asm

+++ b/maps/MountMortar1FInside.asm

@@ -122,12 +122,12 @@

 .Warps:

 	db 6

-	warp_def 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE

-	warp_def 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE

-	warp_def 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE

-	warp_def 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE

-	warp_def 3, 19, 1, MOUNT_MORTAR_B1F

-	warp_def 9, 9, 2, MOUNT_MORTAR_2F_INSIDE

+	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

 .CoordEvents:

 	db 0

--- a/maps/MountMortar1FOutside.asm

+++ b/maps/MountMortar1FOutside.asm

@@ -24,15 +24,15 @@

 .Warps:

 	db 9

-	warp_def 3, 33, 3, ROUTE_42

-	warp_def 17, 33, 4, ROUTE_42

-	warp_def 37, 33, 5, ROUTE_42

-	warp_def 17, 5, 1, MOUNT_MORTAR_2F_INSIDE

-	warp_def 11, 21, 1, MOUNT_MORTAR_1F_INSIDE

-	warp_def 29, 21, 2, MOUNT_MORTAR_1F_INSIDE

-	warp_def 17, 29, 2, MOUNT_MORTAR_B1F

-	warp_def 7, 13, 3, MOUNT_MORTAR_1F_INSIDE

-	warp_def 33, 13, 4, MOUNT_MORTAR_1F_INSIDE

+	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

 .CoordEvents:

 	db 0

--- a/maps/MountMortar2FInside.asm

+++ b/maps/MountMortar2FInside.asm

@@ -72,8 +72,8 @@

 .Warps:

 	db 2

-	warp_def 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE

-	warp_def 3, 5, 6, MOUNT_MORTAR_1F_INSIDE

+	warp_event 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE

+	warp_event 3, 5, 6, MOUNT_MORTAR_1F_INSIDE

 .CoordEvents:

 	db 0

--- a/maps/MountMortarB1F.asm

+++ b/maps/MountMortarB1F.asm

@@ -140,8 +140,8 @@

 .Warps:

 	db 2

-	warp_def 3, 3, 5, MOUNT_MORTAR_1F_INSIDE

-	warp_def 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE

+	warp_event 3, 3, 5, MOUNT_MORTAR_1F_INSIDE

+	warp_event 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE

 .CoordEvents:

 	db 0

--- a/maps/MoveDeletersHouse.asm

+++ b/maps/MoveDeletersHouse.asm

@@ -25,8 +25,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 6, BLACKTHORN_CITY

-	warp_def 3, 7, 6, BLACKTHORN_CITY

+	warp_event 2, 7, 6, BLACKTHORN_CITY

+	warp_event 3, 7, 6, BLACKTHORN_CITY

 .CoordEvents:

 	db 0

--- a/maps/MrFujisHouse.asm

+++ b/maps/MrFujisHouse.asm

@@ -85,8 +85,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, LAVENDER_TOWN

-	warp_def 3, 7, 2, LAVENDER_TOWN

+	warp_event 2, 7, 2, LAVENDER_TOWN

+	warp_event 3, 7, 2, LAVENDER_TOWN

 .CoordEvents:

 	db 0

--- a/maps/MrPokemonsHouse.asm

+++ b/maps/MrPokemonsHouse.asm

@@ -378,8 +378,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, ROUTE_30

-	warp_def 3, 7, 2, ROUTE_30

+	warp_event 2, 7, 2, ROUTE_30

+	warp_event 3, 7, 2, ROUTE_30

 .CoordEvents:

 	db 0

--- a/maps/MrPsychicsHouse.asm

+++ b/maps/MrPsychicsHouse.asm

@@ -53,8 +53,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 5, SAFFRON_CITY

-	warp_def 3, 7, 5, SAFFRON_CITY

+	warp_event 2, 7, 5, SAFFRON_CITY

+	warp_event 3, 7, 5, SAFFRON_CITY

 .CoordEvents:

 	db 0

--- a/maps/NationalPark.asm

+++ b/maps/NationalPark.asm

@@ -519,10 +519,10 @@

 .Warps:

 	db 4

-	warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE

-	warp_def 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE

-	warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE

-	warp_def 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE

+	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

 .CoordEvents:

 	db 0

--- a/maps/NationalParkBugContest.asm

+++ b/maps/NationalParkBugContest.asm

@@ -226,10 +226,10 @@

 .Warps:

 	db 4

-	warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE

-	warp_def 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE

-	warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE

-	warp_def 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE

+	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

 .CoordEvents:

 	db 0

--- a/maps/NewBarkTown.asm

+++ b/maps/NewBarkTown.asm

@@ -287,10 +287,10 @@

 .Warps:

 	db 4

-	warp_def 6, 3, 1, ELMS_LAB

-	warp_def 13, 5, 1, PLAYERS_HOUSE_1F

-	warp_def 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE

-	warp_def 11, 13, 1, ELMS_HOUSE

+	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

 .CoordEvents:

 	db 2

--- a/maps/OaksLab.asm

+++ b/maps/OaksLab.asm

@@ -262,8 +262,8 @@

 .Warps:

 	db 2

-	warp_def 4, 11, 3, PALLET_TOWN

-	warp_def 5, 11, 3, PALLET_TOWN

+	warp_event 4, 11, 3, PALLET_TOWN

+	warp_event 5, 11, 3, PALLET_TOWN

 .CoordEvents:

 	db 0

--- a/maps/OlivineCafe.asm

+++ b/maps/OlivineCafe.asm

@@ -84,8 +84,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 7, OLIVINE_CITY

-	warp_def 3, 7, 7, OLIVINE_CITY

+	warp_event 2, 7, 7, OLIVINE_CITY

+	warp_event 3, 7, 7, OLIVINE_CITY

 .CoordEvents:

 	db 0

--- a/maps/OlivineCity.asm

+++ b/maps/OlivineCity.asm

@@ -293,17 +293,17 @@

 .Warps:

 	db 11

-	warp_def 13, 21, 1, OLIVINE_POKECENTER_1F

-	warp_def 10, 11, 1, OLIVINE_GYM

-	warp_def 25, 11, 1, OLIVINE_TIMS_HOUSE

-	warp_def 0, 0, 1, OLIVINE_HOUSE_BETA

-	warp_def 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE

-	warp_def 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE

-	warp_def 7, 21, 1, OLIVINE_CAFE

-	warp_def 19, 17, 2, OLIVINE_MART

-	warp_def 29, 27, 1, OLIVINE_LIGHTHOUSE_1F

-	warp_def 19, 27, 1, OLIVINE_PORT_PASSAGE

-	warp_def 20, 27, 2, OLIVINE_PORT_PASSAGE

+	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

 .CoordEvents:

 	db 2

--- a/maps/OlivineGoodRodHouse.asm

+++ b/maps/OlivineGoodRodHouse.asm

@@ -88,8 +88,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 6, OLIVINE_CITY

-	warp_def 3, 7, 6, OLIVINE_CITY

+	warp_event 2, 7, 6, OLIVINE_CITY

+	warp_event 3, 7, 6, OLIVINE_CITY

 .CoordEvents:

 	db 0

--- a/maps/OlivineGym.asm

+++ b/maps/OlivineGym.asm

@@ -203,8 +203,8 @@

 .Warps:

 	db 2

-	warp_def 4, 15, 2, OLIVINE_CITY

-	warp_def 5, 15, 2, OLIVINE_CITY

+	warp_event 4, 15, 2, OLIVINE_CITY

+	warp_event 5, 15, 2, OLIVINE_CITY

 .CoordEvents:

 	db 0

--- a/maps/OlivineHouseBeta.asm

+++ b/maps/OlivineHouseBeta.asm

@@ -45,8 +45,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, OLIVINE_CITY

-	warp_def 3, 7, 4, OLIVINE_CITY

+	warp_event 2, 7, 4, OLIVINE_CITY

+	warp_event 3, 7, 4, OLIVINE_CITY

 .CoordEvents:

 	db 0

--- a/maps/OlivineLighthouse1F.asm

+++ b/maps/OlivineLighthouse1F.asm

@@ -42,11 +42,11 @@

 .Warps:

 	db 5

-	warp_def 10, 17, 9, OLIVINE_CITY

-	warp_def 11, 17, 9, OLIVINE_CITY

-	warp_def 3, 11, 1, OLIVINE_LIGHTHOUSE_2F

-	warp_def 16, 13, 3, OLIVINE_LIGHTHOUSE_2F

-	warp_def 17, 13, 4, OLIVINE_LIGHTHOUSE_2F

+	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

 .CoordEvents:

 	db 0

--- a/maps/OlivineLighthouse2F.asm

+++ b/maps/OlivineLighthouse2F.asm

@@ -210,12 +210,12 @@

 .Warps:

 	db 6

-	warp_def 3, 11, 3, OLIVINE_LIGHTHOUSE_1F

-	warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_3F

-	warp_def 16, 13, 4, OLIVINE_LIGHTHOUSE_1F

-	warp_def 17, 13, 5, OLIVINE_LIGHTHOUSE_1F

-	warp_def 16, 11, 4, OLIVINE_LIGHTHOUSE_3F

-	warp_def 17, 11, 5, OLIVINE_LIGHTHOUSE_3F

+	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

 .CoordEvents:

 	db 0

--- a/maps/OlivineLighthouse3F.asm

+++ b/maps/OlivineLighthouse3F.asm

@@ -118,15 +118,15 @@

 .Warps:

 	db 9

-	warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_4F

-	warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_2F

-	warp_def 9, 5, 4, OLIVINE_LIGHTHOUSE_4F

-	warp_def 16, 11, 5, OLIVINE_LIGHTHOUSE_2F

-	warp_def 17, 11, 6, OLIVINE_LIGHTHOUSE_2F

-	warp_def 16, 9, 5, OLIVINE_LIGHTHOUSE_4F

-	warp_def 17, 9, 6, OLIVINE_LIGHTHOUSE_4F

-	warp_def 8, 3, 7, OLIVINE_LIGHTHOUSE_4F

-	warp_def 9, 3, 8, OLIVINE_LIGHTHOUSE_4F

+	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

 .CoordEvents:

 	db 0

--- a/maps/OlivineLighthouse4F.asm

+++ b/maps/OlivineLighthouse4F.asm

@@ -87,16 +87,16 @@

 .Warps:

 	db 10

-	warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_3F

-	warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_5F

-	warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_5F

-	warp_def 9, 5, 3, OLIVINE_LIGHTHOUSE_3F

-	warp_def 16, 9, 6, OLIVINE_LIGHTHOUSE_3F

-	warp_def 17, 9, 7, OLIVINE_LIGHTHOUSE_3F

-	warp_def 8, 3, 8, OLIVINE_LIGHTHOUSE_3F

-	warp_def 9, 3, 9, OLIVINE_LIGHTHOUSE_3F

-	warp_def 16, 7, 4, OLIVINE_LIGHTHOUSE_5F

-	warp_def 17, 7, 5, OLIVINE_LIGHTHOUSE_5F

+	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

 .CoordEvents:

 	db 0

--- a/maps/OlivineLighthouse5F.asm

+++ b/maps/OlivineLighthouse5F.asm

@@ -96,13 +96,13 @@

 .Warps:

 	db 7

-	warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_6F

-	warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_4F

-	warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_4F

-	warp_def 16, 7, 9, OLIVINE_LIGHTHOUSE_4F

-	warp_def 17, 7, 10, OLIVINE_LIGHTHOUSE_4F

-	warp_def 16, 5, 2, OLIVINE_LIGHTHOUSE_6F

-	warp_def 17, 5, 3, OLIVINE_LIGHTHOUSE_6F

+	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

 .CoordEvents:

 	db 0

--- a/maps/OlivineLighthouse6F.asm

+++ b/maps/OlivineLighthouse6F.asm

@@ -263,9 +263,9 @@

 .Warps:

 	db 3

-	warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_5F

-	warp_def 16, 5, 6, OLIVINE_LIGHTHOUSE_5F

-	warp_def 17, 5, 7, OLIVINE_LIGHTHOUSE_5F

+	warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_5F

+	warp_event 16, 5, 6, OLIVINE_LIGHTHOUSE_5F

+	warp_event 17, 5, 7, OLIVINE_LIGHTHOUSE_5F

 .CoordEvents:

 	db 0

--- a/maps/OlivineMart.asm

+++ b/maps/OlivineMart.asm

@@ -51,8 +51,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 8, OLIVINE_CITY

-	warp_def 3, 7, 8, OLIVINE_CITY

+	warp_event 2, 7, 8, OLIVINE_CITY

+	warp_event 3, 7, 8, OLIVINE_CITY

 .CoordEvents:

 	db 0

--- a/maps/OlivinePokecenter1F.asm

+++ b/maps/OlivinePokecenter1F.asm

@@ -53,9 +53,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 1, OLIVINE_CITY

-	warp_def 4, 7, 1, OLIVINE_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 1, OLIVINE_CITY

+	warp_event 4, 7, 1, OLIVINE_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/OlivinePort.asm

+++ b/maps/OlivinePort.asm

@@ -390,8 +390,8 @@

 .Warps:

 	db 2

-	warp_def 11, 7, 5, OLIVINE_PORT_PASSAGE

-	warp_def 7, 23, 1, FAST_SHIP_1F

+	warp_event 11, 7, 5, OLIVINE_PORT_PASSAGE

+	warp_event 7, 23, 1, FAST_SHIP_1F

 .CoordEvents:

 	db 1

--- a/maps/OlivinePortPassage.asm

+++ b/maps/OlivinePortPassage.asm

@@ -25,11 +25,11 @@

 .Warps:

 	db 5

-	warp_def 15, 0, 10, OLIVINE_CITY

-	warp_def 16, 0, 11, OLIVINE_CITY

-	warp_def 15, 4, 4, OLIVINE_PORT_PASSAGE

-	warp_def 3, 2, 3, OLIVINE_PORT_PASSAGE

-	warp_def 3, 14, 1, OLIVINE_PORT

+	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

 .CoordEvents:

 	db 0

--- a/maps/OlivinePunishmentSpeechHouse.asm

+++ b/maps/OlivinePunishmentSpeechHouse.asm

@@ -45,8 +45,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 5, OLIVINE_CITY

-	warp_def 3, 7, 5, OLIVINE_CITY

+	warp_event 2, 7, 5, OLIVINE_CITY

+	warp_event 3, 7, 5, OLIVINE_CITY

 .CoordEvents:

 	db 0

--- a/maps/OlivineTimsHouse.asm

+++ b/maps/OlivineTimsHouse.asm

@@ -25,8 +25,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, OLIVINE_CITY

-	warp_def 3, 7, 3, OLIVINE_CITY

+	warp_event 2, 7, 3, OLIVINE_CITY

+	warp_event 3, 7, 3, OLIVINE_CITY

 .CoordEvents:

 	db 0

--- a/maps/PalletTown.asm

+++ b/maps/PalletTown.asm

@@ -75,9 +75,9 @@

 .Warps:

 	db 3

-	warp_def 5, 5, 1, REDS_HOUSE_1F

-	warp_def 13, 5, 1, BLUES_HOUSE

-	warp_def 12, 11, 1, OAKS_LAB

+	warp_event 5, 5, 1, REDS_HOUSE_1F

+	warp_event 13, 5, 1, BLUES_HOUSE

+	warp_event 12, 11, 1, OAKS_LAB

 .CoordEvents:

 	db 0

--- a/maps/PewterCity.asm

+++ b/maps/PewterCity.asm

@@ -158,11 +158,11 @@

 .Warps:

 	db 5

-	warp_def 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE

-	warp_def 16, 17, 1, PEWTER_GYM

-	warp_def 23, 17, 2, PEWTER_MART

-	warp_def 13, 25, 1, PEWTER_POKECENTER_1F

-	warp_def 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE

+	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

 .CoordEvents:

 	db 0

--- a/maps/PewterGym.asm

+++ b/maps/PewterGym.asm

@@ -214,8 +214,8 @@

 .Warps:

 	db 2

-	warp_def 4, 13, 2, PEWTER_CITY

-	warp_def 5, 13, 2, PEWTER_CITY

+	warp_event 4, 13, 2, PEWTER_CITY

+	warp_event 5, 13, 2, PEWTER_CITY

 .CoordEvents:

 	db 0

--- a/maps/PewterMart.asm

+++ b/maps/PewterMart.asm

@@ -51,8 +51,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, PEWTER_CITY

-	warp_def 3, 7, 3, PEWTER_CITY

+	warp_event 2, 7, 3, PEWTER_CITY

+	warp_event 3, 7, 3, PEWTER_CITY

 .CoordEvents:

 	db 0

--- a/maps/PewterNidoranSpeechHouse.asm

+++ b/maps/PewterNidoranSpeechHouse.asm

@@ -34,8 +34,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, PEWTER_CITY

-	warp_def 3, 7, 1, PEWTER_CITY

+	warp_event 2, 7, 1, PEWTER_CITY

+	warp_event 3, 7, 1, PEWTER_CITY

 .CoordEvents:

 	db 0

--- a/maps/PewterPokecenter1F.asm

+++ b/maps/PewterPokecenter1F.asm

@@ -73,9 +73,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 4, PEWTER_CITY

-	warp_def 4, 7, 4, PEWTER_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 4, PEWTER_CITY

+	warp_event 4, 7, 4, PEWTER_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/PewterPokecenter2FBeta.asm

+++ b/maps/PewterPokecenter2FBeta.asm

@@ -11,7 +11,7 @@

 .Warps:

 	db 1

-	warp_def 0, 7, 3, PEWTER_POKECENTER_1F

+	warp_event 0, 7, 3, PEWTER_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/PewterSnoozeSpeechHouse.asm

+++ b/maps/PewterSnoozeSpeechHouse.asm

@@ -26,8 +26,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 5, PEWTER_CITY

-	warp_def 3, 7, 5, PEWTER_CITY

+	warp_event 2, 7, 5, PEWTER_CITY

+	warp_event 3, 7, 5, PEWTER_CITY

 .CoordEvents:

 	db 0

--- a/maps/PlayersHouse1F.asm

+++ b/maps/PlayersHouse1F.asm

@@ -391,9 +391,9 @@

 .Warps:

 	db 3

-	warp_def 6, 7, 2, NEW_BARK_TOWN

-	warp_def 7, 7, 2, NEW_BARK_TOWN

-	warp_def 9, 0, 1, PLAYERS_HOUSE_2F

+	warp_event 6, 7, 2, NEW_BARK_TOWN

+	warp_event 7, 7, 2, NEW_BARK_TOWN

+	warp_event 9, 0, 1, PLAYERS_HOUSE_2F

 .CoordEvents:

 	db 2

--- a/maps/PlayersHouse2F.asm

+++ b/maps/PlayersHouse2F.asm

@@ -121,7 +121,7 @@

 .Warps:

 	db 1

-	warp_def 7, 0, 3, PLAYERS_HOUSE_1F

+	warp_event 7, 0, 3, PLAYERS_HOUSE_1F

 .CoordEvents:

 	db 0

--- a/maps/PlayersNeighborsHouse.asm

+++ b/maps/PlayersNeighborsHouse.asm

@@ -104,8 +104,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, NEW_BARK_TOWN

-	warp_def 3, 7, 3, NEW_BARK_TOWN

+	warp_event 2, 7, 3, NEW_BARK_TOWN

+	warp_event 3, 7, 3, NEW_BARK_TOWN

 .CoordEvents:

 	db 0

--- a/maps/PokeSeersHouse.asm

+++ b/maps/PokeSeersHouse.asm

@@ -22,8 +22,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 7, CIANWOOD_CITY

-	warp_def 3, 7, 7, CIANWOOD_CITY

+	warp_event 2, 7, 7, CIANWOOD_CITY

+	warp_event 3, 7, 7, CIANWOOD_CITY

 .CoordEvents:

 	db 0

--- a/maps/Pokecenter2F.asm

+++ b/maps/Pokecenter2F.asm

@@ -1028,12 +1028,12 @@

 .Warps:

 	db 6

-	warp_def 0, 7, -1, POKECENTER_2F

-	warp_def 5, 0, 1, TRADE_CENTER

-	warp_def 9, 0, 1, COLOSSEUM

-	warp_def 13, 2, 1, TIME_CAPSULE

-	warp_def 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE

-	warp_def 10, 0, 1, MOBILE_BATTLE_ROOM

+	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_MOBILE

+	warp_event 10, 0, 1, MOBILE_BATTLE_ROOM

 .CoordEvents:

 	db 0

--- a/maps/PokecomCenterAdminRoomMobile.asm

+++ b/maps/PokecomCenterAdminRoomMobile.asm

@@ -268,8 +268,8 @@

 .Warps:

 	db 2

-	warp_def 0, 31, 3, GOLDENROD_POKECENTER_1F

-	warp_def 1, 31, 3, GOLDENROD_POKECENTER_1F

+	warp_event 0, 31, 3, GOLDENROD_POKECENTER_1F

+	warp_event 1, 31, 3, GOLDENROD_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/PokemonFanClub.asm

+++ b/maps/PokemonFanClub.asm

@@ -302,8 +302,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, VERMILION_CITY

-	warp_def 3, 7, 3, VERMILION_CITY

+	warp_event 2, 7, 3, VERMILION_CITY

+	warp_event 3, 7, 3, VERMILION_CITY

 .CoordEvents:

 	db 0

--- a/maps/PowerPlant.asm

+++ b/maps/PowerPlant.asm

@@ -394,8 +394,8 @@

 .Warps:

 	db 2

-	warp_def 2, 17, 2, ROUTE_10_NORTH

-	warp_def 3, 17, 2, ROUTE_10_NORTH

+	warp_event 2, 17, 2, ROUTE_10_NORTH

+	warp_event 3, 17, 2, ROUTE_10_NORTH

 .CoordEvents:

 	db 1

--- a/maps/RadioTower1F.asm

+++ b/maps/RadioTower1F.asm

@@ -478,9 +478,9 @@

 .Warps:

 	db 3

-	warp_def 2, 7, 11, GOLDENROD_CITY

-	warp_def 3, 7, 11, GOLDENROD_CITY

-	warp_def 15, 0, 2, RADIO_TOWER_2F

+	warp_event 2, 7, 11, GOLDENROD_CITY

+	warp_event 3, 7, 11, GOLDENROD_CITY

+	warp_event 15, 0, 2, RADIO_TOWER_2F

 .CoordEvents:

 	db 0

--- a/maps/RadioTower2F.asm

+++ b/maps/RadioTower2F.asm

@@ -716,8 +716,8 @@

 .Warps:

 	db 2

-	warp_def 0, 0, 1, RADIO_TOWER_3F

-	warp_def 15, 0, 3, RADIO_TOWER_1F

+	warp_event 0, 0, 1, RADIO_TOWER_3F

+	warp_event 15, 0, 3, RADIO_TOWER_1F

 .CoordEvents:

 	db 0

--- a/maps/RadioTower3F.asm

+++ b/maps/RadioTower3F.asm

@@ -334,9 +334,9 @@

 .Warps:

 	db 3

-	warp_def 0, 0, 1, RADIO_TOWER_2F

-	warp_def 7, 0, 2, RADIO_TOWER_4F

-	warp_def 17, 0, 4, RADIO_TOWER_4F

+	warp_event 0, 0, 1, RADIO_TOWER_2F

+	warp_event 7, 0, 2, RADIO_TOWER_4F

+	warp_event 17, 0, 4, RADIO_TOWER_4F

 .CoordEvents:

 	db 0

--- a/maps/RadioTower4F.asm

+++ b/maps/RadioTower4F.asm

@@ -251,10 +251,10 @@

 .Warps:

 	db 4

-	warp_def 0, 0, 1, RADIO_TOWER_5F

-	warp_def 9, 0, 2, RADIO_TOWER_3F

-	warp_def 12, 0, 2, RADIO_TOWER_5F

-	warp_def 17, 0, 3, RADIO_TOWER_3F

+	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

 .CoordEvents:

 	db 0

--- a/maps/RadioTower5F.asm

+++ b/maps/RadioTower5F.asm

@@ -426,8 +426,8 @@

 .Warps:

 	db 2

-	warp_def 0, 0, 1, RADIO_TOWER_4F

-	warp_def 12, 0, 3, RADIO_TOWER_4F

+	warp_event 0, 0, 1, RADIO_TOWER_4F

+	warp_event 12, 0, 3, RADIO_TOWER_4F

 .CoordEvents:

 	db 2

--- a/maps/RedsHouse1F.asm

+++ b/maps/RedsHouse1F.asm

@@ -80,9 +80,9 @@

 .Warps:

 	db 3

-	warp_def 2, 7, 1, PALLET_TOWN

-	warp_def 3, 7, 1, PALLET_TOWN

-	warp_def 7, 0, 1, REDS_HOUSE_2F

+	warp_event 2, 7, 1, PALLET_TOWN

+	warp_event 3, 7, 1, PALLET_TOWN

+	warp_event 7, 0, 1, REDS_HOUSE_2F

 .CoordEvents:

 	db 0

--- a/maps/RedsHouse2F.asm

+++ b/maps/RedsHouse2F.asm

@@ -31,7 +31,7 @@

 .Warps:

 	db 1

-	warp_def 7, 0, 3, REDS_HOUSE_1F

+	warp_event 7, 0, 3, REDS_HOUSE_1F

 .CoordEvents:

 	db 0

--- a/maps/RockTunnel1F.asm

+++ b/maps/RockTunnel1F.asm

@@ -27,12 +27,12 @@

 .Warps:

 	db 6

-	warp_def 15, 3, 1, ROUTE_9

-	warp_def 11, 25, 1, ROUTE_10_SOUTH

-	warp_def 5, 3, 3, ROCK_TUNNEL_B1F

-	warp_def 15, 9, 2, ROCK_TUNNEL_B1F

-	warp_def 27, 3, 4, ROCK_TUNNEL_B1F

-	warp_def 27, 13, 1, ROCK_TUNNEL_B1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/RockTunnelB1F.asm

+++ b/maps/RockTunnelB1F.asm

@@ -28,10 +28,10 @@

 .Warps:

 	db 4

-	warp_def 3, 3, 6, ROCK_TUNNEL_1F

-	warp_def 17, 9, 4, ROCK_TUNNEL_1F

-	warp_def 23, 3, 3, ROCK_TUNNEL_1F

-	warp_def 25, 23, 5, ROCK_TUNNEL_1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route10North.asm

+++ b/maps/Route10North.asm

@@ -21,8 +21,8 @@

 .Warps:

 	db 2

-	warp_def 11, 1, 1, ROUTE_10_POKECENTER_1F

-	warp_def 3, 9, 1, POWER_PLANT

+	warp_event 11, 1, 1, ROUTE_10_POKECENTER_1F

+	warp_event 3, 9, 1, POWER_PLANT

 .CoordEvents:

 	db 0

--- a/maps/Route10Pokecenter1F.asm

+++ b/maps/Route10Pokecenter1F.asm

@@ -86,9 +86,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 1, ROUTE_10_NORTH

-	warp_def 4, 7, 1, ROUTE_10_NORTH

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 1, ROUTE_10_NORTH

+	warp_event 4, 7, 1, ROUTE_10_NORTH

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/Route10Pokecenter2FBeta.asm

+++ b/maps/Route10Pokecenter2FBeta.asm

@@ -11,7 +11,7 @@

 .Warps:

 	db 1

-	warp_def 0, 7, 3, ROUTE_10_POKECENTER_1F

+	warp_event 0, 7, 3, ROUTE_10_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/Route10South.asm

+++ b/maps/Route10South.asm

@@ -81,7 +81,7 @@

 .Warps:

 	db 1

-	warp_def 6, 1, 2, ROCK_TUNNEL_1F

+	warp_event 6, 1, 2, ROCK_TUNNEL_1F

 .CoordEvents:

 	db 0

--- a/maps/Route12.asm

+++ b/maps/Route12.asm

@@ -172,7 +172,7 @@

 .Warps:

 	db 1

-	warp_def 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE

+	warp_event 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE

 .CoordEvents:

 	db 0

--- a/maps/Route12SuperRodHouse.asm

+++ b/maps/Route12SuperRodHouse.asm

@@ -85,8 +85,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, ROUTE_12

-	warp_def 3, 7, 1, ROUTE_12

+	warp_event 2, 7, 1, ROUTE_12

+	warp_event 3, 7, 1, ROUTE_12

 .CoordEvents:

 	db 0

--- a/maps/Route15.asm

+++ b/maps/Route15.asm

@@ -207,8 +207,8 @@

 .Warps:

 	db 2

-	warp_def 2, 4, 3, ROUTE_15_FUCHSIA_GATE

-	warp_def 2, 5, 4, ROUTE_15_FUCHSIA_GATE

+	warp_event 2, 4, 3, ROUTE_15_FUCHSIA_GATE

+	warp_event 2, 5, 4, ROUTE_15_FUCHSIA_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route15FuchsiaGate.asm

+++ b/maps/Route15FuchsiaGate.asm

@@ -25,10 +25,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 8, FUCHSIA_CITY

-	warp_def 0, 5, 9, FUCHSIA_CITY

-	warp_def 9, 4, 1, ROUTE_15

-	warp_def 9, 5, 2, ROUTE_15

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route16.asm

+++ b/maps/Route16.asm

@@ -34,11 +34,11 @@

 .Warps:

 	db 5

-	warp_def 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE

-	warp_def 14, 6, 3, ROUTE_16_GATE

-	warp_def 14, 7, 4, ROUTE_16_GATE

-	warp_def 9, 6, 1, ROUTE_16_GATE

-	warp_def 9, 7, 2, ROUTE_16_GATE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route16FuchsiaSpeechHouse.asm

+++ b/maps/Route16FuchsiaSpeechHouse.asm

@@ -28,8 +28,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, ROUTE_16

-	warp_def 3, 7, 1, ROUTE_16

+	warp_event 2, 7, 1, ROUTE_16

+	warp_event 3, 7, 1, ROUTE_16

 .CoordEvents:

 	db 0

--- a/maps/Route16Gate.asm

+++ b/maps/Route16Gate.asm

@@ -66,10 +66,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 4, ROUTE_16

-	warp_def 0, 5, 5, ROUTE_16

-	warp_def 9, 4, 2, ROUTE_16

-	warp_def 9, 5, 3, ROUTE_16

+	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

 .CoordEvents:

 	db 2

--- a/maps/Route17.asm

+++ b/maps/Route17.asm

@@ -138,8 +138,8 @@

 .Warps:

 	db 2

-	warp_def 17, 82, 1, ROUTE_17_ROUTE_18_GATE

-	warp_def 17, 83, 2, ROUTE_17_ROUTE_18_GATE

+	warp_event 17, 82, 1, ROUTE_17_ROUTE_18_GATE

+	warp_event 17, 83, 2, ROUTE_17_ROUTE_18_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route17Route18Gate.asm

+++ b/maps/Route17Route18Gate.asm

@@ -57,10 +57,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 1, ROUTE_17

-	warp_def 0, 5, 2, ROUTE_17

-	warp_def 9, 4, 1, ROUTE_18

-	warp_def 9, 5, 2, ROUTE_18

+	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

 .CoordEvents:

 	db 2

--- a/maps/Route18.asm

+++ b/maps/Route18.asm

@@ -83,8 +83,8 @@

 .Warps:

 	db 2

-	warp_def 2, 6, 3, ROUTE_17_ROUTE_18_GATE

-	warp_def 2, 7, 4, ROUTE_17_ROUTE_18_GATE

+	warp_event 2, 6, 3, ROUTE_17_ROUTE_18_GATE

+	warp_event 2, 7, 4, ROUTE_17_ROUTE_18_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route19.asm

+++ b/maps/Route19.asm

@@ -240,7 +240,7 @@

 .Warps:

 	db 1

-	warp_def 7, 3, 3, ROUTE_19_FUCHSIA_GATE

+	warp_event 7, 3, 3, ROUTE_19_FUCHSIA_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route19FuchsiaGate.asm

+++ b/maps/Route19FuchsiaGate.asm

@@ -51,10 +51,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 10, FUCHSIA_CITY

-	warp_def 5, 0, 11, FUCHSIA_CITY

-	warp_def 4, 7, 1, ROUTE_19

-	warp_def 5, 7, 1, ROUTE_19

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route2.asm

+++ b/maps/Route2.asm

@@ -152,11 +152,11 @@

 .Warps:

 	db 5

-	warp_def 15, 15, 1, ROUTE_2_NUGGET_HOUSE

-	warp_def 15, 31, 3, ROUTE_2_GATE

-	warp_def 16, 27, 1, ROUTE_2_GATE

-	warp_def 17, 27, 2, ROUTE_2_GATE

-	warp_def 12, 7, 3, DIGLETTS_CAVE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route20.asm

+++ b/maps/Route20.asm

@@ -118,7 +118,7 @@

 .Warps:

 	db 1

-	warp_def 38, 7, 1, SEAFOAM_GYM

+	warp_event 38, 7, 1, SEAFOAM_GYM

 .CoordEvents:

 	db 0

--- a/maps/Route22.asm

+++ b/maps/Route22.asm

@@ -21,7 +21,7 @@

 .Warps:

 	db 1

-	warp_def 13, 5, 1, VICTORY_ROAD_GATE

+	warp_event 13, 5, 1, VICTORY_ROAD_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route23.asm

+++ b/maps/Route23.asm

@@ -28,10 +28,10 @@

 .Warps:

 	db 4

-	warp_def 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F

-	warp_def 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F

-	warp_def 9, 13, 10, VICTORY_ROAD

-	warp_def 10, 13, 10, VICTORY_ROAD

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route25.asm

+++ b/maps/Route25.asm

@@ -435,7 +435,7 @@

 .Warps:

 	db 1

-	warp_def 47, 5, 1, BILLS_HOUSE

+	warp_event 47, 5, 1, BILLS_HOUSE

 .CoordEvents:

 	db 2

--- a/maps/Route26.asm

+++ b/maps/Route26.asm

@@ -418,9 +418,9 @@

 .Warps:

 	db 3

-	warp_def 7, 5, 3, VICTORY_ROAD_GATE

-	warp_def 15, 57, 1, ROUTE_26_HEAL_HOUSE

-	warp_def 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route26HealHouse.asm

+++ b/maps/Route26HealHouse.asm

@@ -54,8 +54,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, ROUTE_26

-	warp_def 3, 7, 2, ROUTE_26

+	warp_event 2, 7, 2, ROUTE_26

+	warp_event 3, 7, 2, ROUTE_26

 .CoordEvents:

 	db 0

--- a/maps/Route27.asm

+++ b/maps/Route27.asm

@@ -473,9 +473,9 @@

 .Warps:

 	db 3

-	warp_def 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE

-	warp_def 26, 5, 1, TOHJO_FALLS

-	warp_def 36, 5, 2, TOHJO_FALLS

+	warp_event 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE

+	warp_event 26, 5, 1, TOHJO_FALLS

+	warp_event 36, 5, 2, TOHJO_FALLS

 .CoordEvents:

 	db 2

--- a/maps/Route27SandstormHouse.asm

+++ b/maps/Route27SandstormHouse.asm

@@ -99,8 +99,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, ROUTE_27

-	warp_def 3, 7, 1, ROUTE_27

+	warp_event 2, 7, 1, ROUTE_27

+	warp_event 3, 7, 1, ROUTE_27

 .CoordEvents:

 	db 0

--- a/maps/Route28.asm

+++ b/maps/Route28.asm

@@ -21,8 +21,8 @@

 .Warps:

 	db 2

-	warp_def 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE

-	warp_def 33, 5, 7, VICTORY_ROAD_GATE

+	warp_event 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE

+	warp_event 33, 5, 7, VICTORY_ROAD_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route28SteelWingHouse.asm

+++ b/maps/Route28SteelWingHouse.asm

@@ -76,8 +76,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, ROUTE_28

-	warp_def 3, 7, 1, ROUTE_28

+	warp_event 2, 7, 1, ROUTE_28

+	warp_event 3, 7, 1, ROUTE_28

 .CoordEvents:

 	db 0

--- a/maps/Route29.asm

+++ b/maps/Route29.asm

@@ -421,7 +421,7 @@

 .Warps:

 	db 1

-	warp_def 27, 1, 3, ROUTE_29_ROUTE_46_GATE

+	warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE

 .CoordEvents:

 	db 2

--- a/maps/Route29Route46Gate.asm

+++ b/maps/Route29Route46Gate.asm

@@ -42,10 +42,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 1, ROUTE_46

-	warp_def 5, 0, 2, ROUTE_46

-	warp_def 4, 7, 1, ROUTE_29

-	warp_def 5, 7, 1, ROUTE_29

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route2Gate.asm

+++ b/maps/Route2Gate.asm

@@ -31,10 +31,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 3, ROUTE_2

-	warp_def 5, 0, 4, ROUTE_2

-	warp_def 4, 7, 2, ROUTE_2

-	warp_def 5, 7, 2, ROUTE_2

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route2NuggetHouse.asm

+++ b/maps/Route2NuggetHouse.asm

@@ -58,8 +58,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, ROUTE_2

-	warp_def 3, 7, 1, ROUTE_2

+	warp_event 2, 7, 1, ROUTE_2

+	warp_event 3, 7, 1, ROUTE_2

 .CoordEvents:

 	db 0

--- a/maps/Route3.asm

+++ b/maps/Route3.asm

@@ -138,7 +138,7 @@

 .Warps:

 	db 1

-	warp_def 52, 1, 1, MOUNT_MOON

+	warp_event 52, 1, 1, MOUNT_MOON

 .CoordEvents:

 	db 0

--- a/maps/Route30.asm

+++ b/maps/Route30.asm

@@ -412,8 +412,8 @@

 .Warps:

 	db 2

-	warp_def 7, 39, 1, ROUTE_30_BERRY_HOUSE

-	warp_def 17, 5, 1, MR_POKEMONS_HOUSE

+	warp_event 7, 39, 1, ROUTE_30_BERRY_HOUSE

+	warp_event 17, 5, 1, MR_POKEMONS_HOUSE

 .CoordEvents:

 	db 0

--- a/maps/Route30BerryHouse.asm

+++ b/maps/Route30BerryHouse.asm

@@ -52,8 +52,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, ROUTE_30

-	warp_def 3, 7, 1, ROUTE_30

+	warp_event 2, 7, 1, ROUTE_30

+	warp_event 3, 7, 1, ROUTE_30

 .CoordEvents:

 	db 0

--- a/maps/Route31.asm

+++ b/maps/Route31.asm

@@ -423,9 +423,9 @@

 .Warps:

 	db 3

-	warp_def 4, 6, 3, ROUTE_31_VIOLET_GATE

-	warp_def 4, 7, 4, ROUTE_31_VIOLET_GATE

-	warp_def 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route31VioletGate.asm

+++ b/maps/Route31VioletGate.asm

@@ -33,10 +33,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 8, VIOLET_CITY

-	warp_def 0, 5, 9, VIOLET_CITY

-	warp_def 9, 4, 1, ROUTE_31

-	warp_def 9, 5, 2, ROUTE_31

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route32.asm

+++ b/maps/Route32.asm

@@ -934,10 +934,10 @@

 .Warps:

 	db 4

-	warp_def 11, 73, 1, ROUTE_32_POKECENTER_1F

-	warp_def 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE

-	warp_def 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE

-	warp_def 6, 79, 4, UNION_CAVE_1F

+	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

 .CoordEvents:

 	db 2

--- a/maps/Route32Pokecenter1F.asm

+++ b/maps/Route32Pokecenter1F.asm

@@ -100,9 +100,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 1, ROUTE_32

-	warp_def 4, 7, 1, ROUTE_32

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 1, ROUTE_32

+	warp_event 4, 7, 1, ROUTE_32

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/Route32RuinsOfAlphGate.asm

+++ b/maps/Route32RuinsOfAlphGate.asm

@@ -52,10 +52,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 10, RUINS_OF_ALPH_OUTSIDE

-	warp_def 0, 5, 11, RUINS_OF_ALPH_OUTSIDE

-	warp_def 9, 4, 2, ROUTE_32

-	warp_def 9, 5, 3, ROUTE_32

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route33.asm

+++ b/maps/Route33.asm

@@ -200,7 +200,7 @@

 .Warps:

 	db 1

-	warp_def 11, 9, 3, UNION_CAVE_1F

+	warp_event 11, 9, 3, UNION_CAVE_1F

 .CoordEvents:

 	db 0

--- a/maps/Route34.asm

+++ b/maps/Route34.asm

@@ -766,11 +766,11 @@

 .Warps:

 	db 5

-	warp_def 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE

-	warp_def 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE

-	warp_def 11, 14, 1, DAY_CARE

-	warp_def 11, 15, 2, DAY_CARE

-	warp_def 13, 15, 3, DAY_CARE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route34IlexForestGate.asm

+++ b/maps/Route34IlexForestGate.asm

@@ -141,10 +141,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 1, ROUTE_34

-	warp_def 5, 0, 2, ROUTE_34

-	warp_def 4, 7, 1, ILEX_FOREST

-	warp_def 5, 7, 1, ILEX_FOREST

+	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

 .CoordEvents:

 	db 1

--- a/maps/Route35.asm

+++ b/maps/Route35.asm

@@ -468,9 +468,9 @@

 .Warps:

 	db 3

-	warp_def 9, 33, 1, ROUTE_35_GOLDENROD_GATE

-	warp_def 10, 33, 2, ROUTE_35_GOLDENROD_GATE

-	warp_def 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route35GoldenrodGate.asm

+++ b/maps/Route35GoldenrodGate.asm

@@ -201,10 +201,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 1, ROUTE_35

-	warp_def 5, 0, 2, ROUTE_35

-	warp_def 4, 7, 12, GOLDENROD_CITY

-	warp_def 5, 7, 12, GOLDENROD_CITY

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route35NationalParkGate.asm

+++ b/maps/Route35NationalParkGate.asm

@@ -443,10 +443,10 @@

 .Warps:

 	db 4

-	warp_def 3, 0, 3, NATIONAL_PARK

-	warp_def 4, 0, 4, NATIONAL_PARK

-	warp_def 3, 7, 3, ROUTE_35

-	warp_def 4, 7, 3, ROUTE_35

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route36.asm

+++ b/maps/Route36.asm

@@ -665,10 +665,10 @@

 .Warps:

 	db 4

-	warp_def 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE

-	warp_def 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE

-	warp_def 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE

-	warp_def 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE

+	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

 .CoordEvents:

 	db 2

--- a/maps/Route36NationalParkGate.asm

+++ b/maps/Route36NationalParkGate.asm

@@ -855,10 +855,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 1, NATIONAL_PARK

-	warp_def 0, 5, 2, NATIONAL_PARK

-	warp_def 9, 4, 1, ROUTE_36

-	warp_def 9, 5, 2, ROUTE_36

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route36RuinsOfAlphGate.asm

+++ b/maps/Route36RuinsOfAlphGate.asm

@@ -40,10 +40,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 3, ROUTE_36

-	warp_def 5, 0, 4, ROUTE_36

-	warp_def 4, 7, 9, RUINS_OF_ALPH_OUTSIDE

-	warp_def 5, 7, 9, RUINS_OF_ALPH_OUTSIDE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route38.asm

+++ b/maps/Route38.asm

@@ -478,8 +478,8 @@

 .Warps:

 	db 2

-	warp_def 35, 8, 1, ROUTE_38_ECRUTEAK_GATE

-	warp_def 35, 9, 2, ROUTE_38_ECRUTEAK_GATE

+	warp_event 35, 8, 1, ROUTE_38_ECRUTEAK_GATE

+	warp_event 35, 9, 2, ROUTE_38_ECRUTEAK_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route38EcruteakGate.asm

+++ b/maps/Route38EcruteakGate.asm

@@ -30,10 +30,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 1, ROUTE_38

-	warp_def 0, 5, 2, ROUTE_38

-	warp_def 9, 4, 14, ECRUTEAK_CITY

-	warp_def 9, 5, 15, ECRUTEAK_CITY

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route39.asm

+++ b/maps/Route39.asm

@@ -349,8 +349,8 @@

 .Warps:

 	db 2

-	warp_def 1, 3, 1, ROUTE_39_BARN

-	warp_def 5, 3, 1, ROUTE_39_FARMHOUSE

+	warp_event 1, 3, 1, ROUTE_39_BARN

+	warp_event 5, 3, 1, ROUTE_39_FARMHOUSE

 .CoordEvents:

 	db 0

--- a/maps/Route39Barn.asm

+++ b/maps/Route39Barn.asm

@@ -194,8 +194,8 @@

 .Warps:

 	db 2

-	warp_def 3, 7, 1, ROUTE_39

-	warp_def 4, 7, 1, ROUTE_39

+	warp_event 3, 7, 1, ROUTE_39

+	warp_event 4, 7, 1, ROUTE_39

 .CoordEvents:

 	db 0

--- a/maps/Route39Farmhouse.asm

+++ b/maps/Route39Farmhouse.asm

@@ -198,8 +198,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, ROUTE_39

-	warp_def 3, 7, 2, ROUTE_39

+	warp_event 2, 7, 2, ROUTE_39

+	warp_event 3, 7, 2, ROUTE_39

 .CoordEvents:

 	db 0

--- a/maps/Route4.asm

+++ b/maps/Route4.asm

@@ -126,7 +126,7 @@

 .Warps:

 	db 1

-	warp_def 2, 5, 2, MOUNT_MOON

+	warp_event 2, 5, 2, MOUNT_MOON

 .CoordEvents:

 	db 0

--- a/maps/Route40.asm

+++ b/maps/Route40.asm

@@ -343,7 +343,7 @@

 .Warps:

 	db 1

-	warp_def 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE

+	warp_event 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route40BattleTowerGate.asm

+++ b/maps/Route40BattleTowerGate.asm

@@ -76,10 +76,10 @@

 .Warps:

 	db 4

-	warp_def 4, 7, 1, ROUTE_40

-	warp_def 5, 7, 1, ROUTE_40

-	warp_def 4, 0, 1, BATTLE_TOWER_OUTSIDE

-	warp_def 5, 0, 2, BATTLE_TOWER_OUTSIDE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route41.asm

+++ b/maps/Route41.asm

@@ -347,10 +347,10 @@

 .Warps:

 	db 4

-	warp_def 12, 17, 1, WHIRL_ISLAND_NW

-	warp_def 36, 19, 1, WHIRL_ISLAND_NE

-	warp_def 12, 37, 1, WHIRL_ISLAND_SW

-	warp_def 36, 45, 1, WHIRL_ISLAND_SE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route42.asm

+++ b/maps/Route42.asm

@@ -324,11 +324,11 @@

 .Warps:

 	db 5

-	warp_def 0, 8, 3, ROUTE_42_ECRUTEAK_GATE

-	warp_def 0, 9, 4, ROUTE_42_ECRUTEAK_GATE

-	warp_def 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE

-	warp_def 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE

-	warp_def 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE

+	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

 .CoordEvents:

 	db 1

--- a/maps/Route42EcruteakGate.asm

+++ b/maps/Route42EcruteakGate.asm

@@ -25,10 +25,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 1, ECRUTEAK_CITY

-	warp_def 0, 5, 2, ECRUTEAK_CITY

-	warp_def 9, 4, 1, ROUTE_42

-	warp_def 9, 5, 2, ROUTE_42

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route43.asm

+++ b/maps/Route43.asm

@@ -506,11 +506,11 @@

 .Warps:

 	db 5

-	warp_def 9, 51, 1, ROUTE_43_MAHOGANY_GATE

-	warp_def 10, 51, 2, ROUTE_43_MAHOGANY_GATE

-	warp_def 17, 35, 3, ROUTE_43_GATE

-	warp_def 17, 31, 1, ROUTE_43_GATE

-	warp_def 18, 31, 2, ROUTE_43_GATE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route43Gate.asm

+++ b/maps/Route43Gate.asm

@@ -253,10 +253,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 4, ROUTE_43

-	warp_def 5, 0, 5, ROUTE_43

-	warp_def 4, 7, 3, ROUTE_43

-	warp_def 5, 7, 3, ROUTE_43

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route43MahoganyGate.asm

+++ b/maps/Route43MahoganyGate.asm

@@ -44,10 +44,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 1, ROUTE_43

-	warp_def 5, 0, 2, ROUTE_43

-	warp_def 4, 7, 5, MAHOGANY_TOWN

-	warp_def 5, 7, 5, MAHOGANY_TOWN

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route44.asm

+++ b/maps/Route44.asm

@@ -512,7 +512,7 @@

 .Warps:

 	db 1

-	warp_def 56, 7, 1, ICE_PATH_1F

+	warp_event 56, 7, 1, ICE_PATH_1F

 .CoordEvents:

 	db 0

--- a/maps/Route45.asm

+++ b/maps/Route45.asm

@@ -537,7 +537,7 @@

 .Warps:

 	db 1

-	warp_def 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE

+	warp_event 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE

 .CoordEvents:

 	db 0

--- a/maps/Route46.asm

+++ b/maps/Route46.asm

@@ -256,9 +256,9 @@

 .Warps:

 	db 3

-	warp_def 7, 33, 1, ROUTE_29_ROUTE_46_GATE

-	warp_def 8, 33, 2, ROUTE_29_ROUTE_46_GATE

-	warp_def 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route5.asm

+++ b/maps/Route5.asm

@@ -45,10 +45,10 @@

 .Warps:

 	db 4

-	warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE

-	warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE

-	warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE

-	warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route5CleanseTagHouse.asm

+++ b/maps/Route5CleanseTagHouse.asm

@@ -66,8 +66,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, ROUTE_5

-	warp_def 3, 7, 4, ROUTE_5

+	warp_event 2, 7, 4, ROUTE_5

+	warp_event 3, 7, 4, ROUTE_5

 .CoordEvents:

 	db 0

--- a/maps/Route5SaffronGate.asm

+++ b/maps/Route5SaffronGate.asm

@@ -26,10 +26,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 2, ROUTE_5

-	warp_def 5, 0, 3, ROUTE_5

-	warp_def 4, 7, 9, SAFFRON_CITY

-	warp_def 5, 7, 9, SAFFRON_CITY

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route5UndergroundPathEntrance.asm

+++ b/maps/Route5UndergroundPathEntrance.asm

@@ -25,9 +25,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 1, ROUTE_5

-	warp_def 4, 7, 1, ROUTE_5

-	warp_def 4, 3, 1, UNDERGROUND_PATH

+	warp_event 3, 7, 1, ROUTE_5

+	warp_event 4, 7, 1, ROUTE_5

+	warp_event 4, 3, 1, UNDERGROUND_PATH

 .CoordEvents:

 	db 0

--- a/maps/Route6.asm

+++ b/maps/Route6.asm

@@ -97,8 +97,8 @@

 .Warps:

 	db 2

-	warp_def 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE

-	warp_def 6, 1, 3, ROUTE_6_SAFFRON_GATE

+	warp_event 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE

+	warp_event 6, 1, 3, ROUTE_6_SAFFRON_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route6SaffronGate.asm

+++ b/maps/Route6SaffronGate.asm

@@ -63,10 +63,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 12, SAFFRON_CITY

-	warp_def 5, 0, 13, SAFFRON_CITY

-	warp_def 4, 7, 2, ROUTE_6

-	warp_def 5, 7, 2, ROUTE_6

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route6UndergroundPathEntrance.asm

+++ b/maps/Route6UndergroundPathEntrance.asm

@@ -11,9 +11,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 1, ROUTE_6

-	warp_def 4, 7, 1, ROUTE_6

-	warp_def 4, 3, 2, UNDERGROUND_PATH

+	warp_event 3, 7, 1, ROUTE_6

+	warp_event 4, 7, 1, ROUTE_6

+	warp_event 4, 3, 2, UNDERGROUND_PATH

 .CoordEvents:

 	db 0

--- a/maps/Route7.asm

+++ b/maps/Route7.asm

@@ -40,8 +40,8 @@

 .Warps:

 	db 2

-	warp_def 15, 6, 1, ROUTE_7_SAFFRON_GATE

-	warp_def 15, 7, 2, ROUTE_7_SAFFRON_GATE

+	warp_event 15, 6, 1, ROUTE_7_SAFFRON_GATE

+	warp_event 15, 7, 2, ROUTE_7_SAFFRON_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route7SaffronGate.asm

+++ b/maps/Route7SaffronGate.asm

@@ -51,10 +51,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 1, ROUTE_7

-	warp_def 0, 5, 2, ROUTE_7

-	warp_def 9, 4, 10, SAFFRON_CITY

-	warp_def 9, 5, 11, SAFFRON_CITY

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route8.asm

+++ b/maps/Route8.asm

@@ -178,8 +178,8 @@

 .Warps:

 	db 2

-	warp_def 4, 4, 3, ROUTE_8_SAFFRON_GATE

-	warp_def 4, 5, 4, ROUTE_8_SAFFRON_GATE

+	warp_event 4, 4, 3, ROUTE_8_SAFFRON_GATE

+	warp_event 4, 5, 4, ROUTE_8_SAFFRON_GATE

 .CoordEvents:

 	db 0

--- a/maps/Route8SaffronGate.asm

+++ b/maps/Route8SaffronGate.asm

@@ -25,10 +25,10 @@

 .Warps:

 	db 4

-	warp_def 0, 4, 14, SAFFRON_CITY

-	warp_def 0, 5, 15, SAFFRON_CITY

-	warp_def 9, 4, 1, ROUTE_8

-	warp_def 9, 5, 2, ROUTE_8

+	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

 .CoordEvents:

 	db 0

--- a/maps/Route9.asm

+++ b/maps/Route9.asm

@@ -211,7 +211,7 @@

 .Warps:

 	db 1

-	warp_def 48, 15, 1, ROCK_TUNNEL_1F

+	warp_event 48, 15, 1, ROCK_TUNNEL_1F

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphAerodactylChamber.asm

+++ b/maps/RuinsOfAlphAerodactylChamber.asm

@@ -149,11 +149,11 @@

 .Warps:

 	db 5

-	warp_def 3, 9, 4, RUINS_OF_ALPH_OUTSIDE

-	warp_def 4, 9, 4, RUINS_OF_ALPH_OUTSIDE

-	warp_def 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER

-	warp_def 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER

-	warp_def 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphAerodactylItemRoom.asm

+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm

@@ -38,10 +38,10 @@

 .Warps:

 	db 4

-	warp_def 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER

-	warp_def 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER

-	warp_def 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM

-	warp_def 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphAerodactylWordRoom.asm

+++ b/maps/RuinsOfAlphAerodactylWordRoom.asm

@@ -11,9 +11,9 @@

 .Warps:

 	db 3

-	warp_def 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM

-	warp_def 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM

-	warp_def 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphHoOhChamber.asm

+++ b/maps/RuinsOfAlphHoOhChamber.asm

@@ -150,11 +150,11 @@

 .Warps:

 	db 5

-	warp_def 3, 9, 1, RUINS_OF_ALPH_OUTSIDE

-	warp_def 4, 9, 1, RUINS_OF_ALPH_OUTSIDE

-	warp_def 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER

-	warp_def 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER

-	warp_def 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphHoOhItemRoom.asm

+++ b/maps/RuinsOfAlphHoOhItemRoom.asm

@@ -38,10 +38,10 @@

 .Warps:

 	db 4

-	warp_def 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER

-	warp_def 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER

-	warp_def 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM

-	warp_def 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphHoOhWordRoom.asm

+++ b/maps/RuinsOfAlphHoOhWordRoom.asm

@@ -11,9 +11,9 @@

 .Warps:

 	db 3

-	warp_def 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM

-	warp_def 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM

-	warp_def 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphInnerChamber.asm

+++ b/maps/RuinsOfAlphInnerChamber.asm

@@ -82,15 +82,15 @@

 .Warps:

 	db 9

-	warp_def 10, 13, 5, RUINS_OF_ALPH_OUTSIDE

-	warp_def 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER

-	warp_def 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER

-	warp_def 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER

-	warp_def 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER

-	warp_def 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER

-	warp_def 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER

-	warp_def 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER

-	warp_def 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphKabutoChamber.asm

+++ b/maps/RuinsOfAlphKabutoChamber.asm

@@ -261,11 +261,11 @@

 .Warps:

 	db 5

-	warp_def 3, 9, 2, RUINS_OF_ALPH_OUTSIDE

-	warp_def 4, 9, 2, RUINS_OF_ALPH_OUTSIDE

-	warp_def 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER

-	warp_def 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER

-	warp_def 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphKabutoItemRoom.asm

+++ b/maps/RuinsOfAlphKabutoItemRoom.asm

@@ -38,10 +38,10 @@

 .Warps:

 	db 4

-	warp_def 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER

-	warp_def 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER

-	warp_def 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM

-	warp_def 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphKabutoWordRoom.asm

+++ b/maps/RuinsOfAlphKabutoWordRoom.asm

@@ -11,9 +11,9 @@

 .Warps:

 	db 3

-	warp_def 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM

-	warp_def 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM

-	warp_def 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphOmanyteChamber.asm

+++ b/maps/RuinsOfAlphOmanyteChamber.asm

@@ -150,11 +150,11 @@

 .Warps:

 	db 5

-	warp_def 3, 9, 3, RUINS_OF_ALPH_OUTSIDE

-	warp_def 4, 9, 3, RUINS_OF_ALPH_OUTSIDE

-	warp_def 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER

-	warp_def 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER

-	warp_def 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphOmanyteItemRoom.asm

+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm

@@ -38,10 +38,10 @@

 .Warps:

 	db 4

-	warp_def 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER

-	warp_def 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER

-	warp_def 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM

-	warp_def 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphOmanyteWordRoom.asm

+++ b/maps/RuinsOfAlphOmanyteWordRoom.asm

@@ -11,9 +11,9 @@

 .Warps:

 	db 3

-	warp_def 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM

-	warp_def 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM

-	warp_def 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER

+	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

 .CoordEvents:

 	db 0

--- a/maps/RuinsOfAlphOutside.asm

+++ b/maps/RuinsOfAlphOutside.asm

@@ -286,17 +286,17 @@

 .Warps:

 	db 11

-	warp_def 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER

-	warp_def 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER

-	warp_def 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER

-	warp_def 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER

-	warp_def 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER

-	warp_def 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER

-	warp_def 6, 19, 1, UNION_CAVE_B1F

-	warp_def 6, 27, 2, UNION_CAVE_B1F

-	warp_def 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE

-	warp_def 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE

-	warp_def 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE

+	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

 .CoordEvents:

 	db 2

--- a/maps/RuinsOfAlphResearchCenter.asm

+++ b/maps/RuinsOfAlphResearchCenter.asm

@@ -398,8 +398,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 6, RUINS_OF_ALPH_OUTSIDE

-	warp_def 3, 7, 6, RUINS_OF_ALPH_OUTSIDE

+	warp_event 2, 7, 6, RUINS_OF_ALPH_OUTSIDE

+	warp_event 3, 7, 6, RUINS_OF_ALPH_OUTSIDE

 .CoordEvents:

 	db 0

--- a/maps/SafariZoneBeta.asm

+++ b/maps/SafariZoneBeta.asm

@@ -11,8 +11,8 @@

 .Warps:

 	db 2

-	warp_def 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA

-	warp_def 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA

+	warp_event 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA

+	warp_event 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA

 .CoordEvents:

 	db 0

--- a/maps/SafariZoneFuchsiaGateBeta.asm

+++ b/maps/SafariZoneFuchsiaGateBeta.asm

@@ -11,10 +11,10 @@

 .Warps:

 	db 4

-	warp_def 4, 0, 1, SAFARI_ZONE_BETA

-	warp_def 5, 0, 2, SAFARI_ZONE_BETA

-	warp_def 4, 7, 7, FUCHSIA_CITY

-	warp_def 5, 7, 7, FUCHSIA_CITY

+	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

 .CoordEvents:

 	db 0

--- a/maps/SafariZoneMainOffice.asm

+++ b/maps/SafariZoneMainOffice.asm

@@ -11,8 +11,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, FUCHSIA_CITY

-	warp_def 3, 7, 2, FUCHSIA_CITY

+	warp_event 2, 7, 2, FUCHSIA_CITY

+	warp_event 3, 7, 2, FUCHSIA_CITY

 .CoordEvents:

 	db 0

--- a/maps/SafariZoneWardensHome.asm

+++ b/maps/SafariZoneWardensHome.asm

@@ -82,8 +82,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 6, FUCHSIA_CITY

-	warp_def 3, 7, 6, FUCHSIA_CITY

+	warp_event 2, 7, 6, FUCHSIA_CITY

+	warp_event 3, 7, 6, FUCHSIA_CITY

 .CoordEvents:

 	db 0

--- a/maps/SaffronCity.asm

+++ b/maps/SaffronCity.asm

@@ -271,21 +271,21 @@

 .Warps:

 	db 15

-	warp_def 26, 3, 1, FIGHTING_DOJO

-	warp_def 34, 3, 1, SAFFRON_GYM

-	warp_def 25, 11, 2, SAFFRON_MART

-	warp_def 9, 29, 1, SAFFRON_POKECENTER_1F

-	warp_def 27, 29, 1, MR_PSYCHICS_HOUSE

-	warp_def 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION

-	warp_def 18, 21, 1, SILPH_CO_1F

-	warp_def 9, 11, 1, COPYCATS_HOUSE_1F

-	warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE

-	warp_def 0, 24, 3, ROUTE_7_SAFFRON_GATE

-	warp_def 0, 25, 4, ROUTE_7_SAFFRON_GATE

-	warp_def 16, 33, 1, ROUTE_6_SAFFRON_GATE

-	warp_def 17, 33, 2, ROUTE_6_SAFFRON_GATE

-	warp_def 39, 22, 1, ROUTE_8_SAFFRON_GATE

-	warp_def 39, 23, 2, ROUTE_8_SAFFRON_GATE

+	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

 .CoordEvents:

 	db 0

--- a/maps/SaffronGym.asm

+++ b/maps/SaffronGym.asm

@@ -296,38 +296,38 @@

 .Warps:

 	db 32

-	warp_def 8, 17, 2, SAFFRON_CITY

-	warp_def 9, 17, 2, SAFFRON_CITY

-	warp_def 11, 15, 18, SAFFRON_GYM

-	warp_def 19, 15, 19, SAFFRON_GYM

-	warp_def 19, 11, 20, SAFFRON_GYM

-	warp_def 1, 11, 21, SAFFRON_GYM

-	warp_def 5, 3, 22, SAFFRON_GYM

-	warp_def 11, 5, 23, SAFFRON_GYM

-	warp_def 1, 15, 24, SAFFRON_GYM

-	warp_def 19, 3, 25, SAFFRON_GYM

-	warp_def 15, 17, 26, SAFFRON_GYM

-	warp_def 5, 17, 27, SAFFRON_GYM

-	warp_def 5, 9, 28, SAFFRON_GYM

-	warp_def 9, 3, 29, SAFFRON_GYM

-	warp_def 15, 9, 30, SAFFRON_GYM

-	warp_def 15, 5, 31, SAFFRON_GYM

-	warp_def 1, 5, 32, SAFFRON_GYM

-	warp_def 19, 17, 3, SAFFRON_GYM

-	warp_def 19, 9, 4, SAFFRON_GYM

-	warp_def 1, 9, 5, SAFFRON_GYM

-	warp_def 5, 5, 6, SAFFRON_GYM

-	warp_def 11, 3, 7, SAFFRON_GYM

-	warp_def 1, 17, 8, SAFFRON_GYM

-	warp_def 19, 5, 9, SAFFRON_GYM

-	warp_def 15, 15, 10, SAFFRON_GYM

-	warp_def 5, 15, 11, SAFFRON_GYM

-	warp_def 5, 11, 12, SAFFRON_GYM

-	warp_def 9, 5, 13, SAFFRON_GYM

-	warp_def 15, 11, 14, SAFFRON_GYM

-	warp_def 15, 3, 15, SAFFRON_GYM

-	warp_def 1, 3, 16, SAFFRON_GYM

-	warp_def 11, 9, 17, SAFFRON_GYM

+	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

 .CoordEvents:

 	db 0

--- a/maps/SaffronMagnetTrainStation.asm

+++ b/maps/SaffronMagnetTrainStation.asm

@@ -221,10 +221,10 @@

 .Warps:

 	db 4

-	warp_def 8, 17, 6, SAFFRON_CITY

-	warp_def 9, 17, 6, SAFFRON_CITY

-	warp_def 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION

-	warp_def 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION

+	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

 .CoordEvents:

 	db 1

--- a/maps/SaffronMart.asm

+++ b/maps/SaffronMart.asm

@@ -43,8 +43,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 3, SAFFRON_CITY

-	warp_def 3, 7, 3, SAFFRON_CITY

+	warp_event 2, 7, 3, SAFFRON_CITY

+	warp_event 3, 7, 3, SAFFRON_CITY

 .CoordEvents:

 	db 0

--- a/maps/SaffronPokecenter1F.asm

+++ b/maps/SaffronPokecenter1F.asm

@@ -117,9 +117,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 4, SAFFRON_CITY

-	warp_def 4, 7, 4, SAFFRON_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 4, SAFFRON_CITY

+	warp_event 4, 7, 4, SAFFRON_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/SaffronPokecenter2FBeta.asm

+++ b/maps/SaffronPokecenter2FBeta.asm

@@ -11,7 +11,7 @@

 .Warps:

 	db 1

-	warp_def 0, 7, 3, SAFFRON_POKECENTER_1F

+	warp_event 0, 7, 3, SAFFRON_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/SeafoamGym.asm

+++ b/maps/SeafoamGym.asm

@@ -163,7 +163,7 @@

 .Warps:

 	db 1

-	warp_def 5, 5, 1, ROUTE_20

+	warp_event 5, 5, 1, ROUTE_20

 .CoordEvents:

 	db 0

--- a/maps/SilphCo1F.asm

+++ b/maps/SilphCo1F.asm

@@ -61,8 +61,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 7, SAFFRON_CITY

-	warp_def 3, 7, 7, SAFFRON_CITY

+	warp_event 2, 7, 7, SAFFRON_CITY

+	warp_event 3, 7, 7, SAFFRON_CITY

 .CoordEvents:

 	db 0

--- a/maps/SilverCaveItemRooms.asm

+++ b/maps/SilverCaveItemRooms.asm

@@ -21,8 +21,8 @@

 .Warps:

 	db 2

-	warp_def 13, 3, 3, SILVER_CAVE_ROOM_2

-	warp_def 7, 15, 4, SILVER_CAVE_ROOM_2

+	warp_event 13, 3, 3, SILVER_CAVE_ROOM_2

+	warp_event 7, 15, 4, SILVER_CAVE_ROOM_2

 .CoordEvents:

 	db 0

--- a/maps/SilverCaveOutside.asm

+++ b/maps/SilverCaveOutside.asm

@@ -29,8 +29,8 @@

 .Warps:

 	db 2

-	warp_def 23, 19, 1, SILVER_CAVE_POKECENTER_1F

-	warp_def 18, 11, 1, SILVER_CAVE_ROOM_1

+	warp_event 23, 19, 1, SILVER_CAVE_POKECENTER_1F

+	warp_event 18, 11, 1, SILVER_CAVE_ROOM_1

 .CoordEvents:

 	db 0

--- a/maps/SilverCavePokecenter1F.asm

+++ b/maps/SilverCavePokecenter1F.asm

@@ -35,9 +35,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 1, SILVER_CAVE_OUTSIDE

-	warp_def 4, 7, 1, SILVER_CAVE_OUTSIDE

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 1, SILVER_CAVE_OUTSIDE

+	warp_event 4, 7, 1, SILVER_CAVE_OUTSIDE

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/SilverCaveRoom1.asm

+++ b/maps/SilverCaveRoom1.asm

@@ -35,8 +35,8 @@

 .Warps:

 	db 2

-	warp_def 9, 33, 2, SILVER_CAVE_OUTSIDE

-	warp_def 15, 1, 1, SILVER_CAVE_ROOM_2

+	warp_event 9, 33, 2, SILVER_CAVE_OUTSIDE

+	warp_event 15, 1, 1, SILVER_CAVE_ROOM_2

 .CoordEvents:

 	db 0

--- a/maps/SilverCaveRoom2.asm

+++ b/maps/SilverCaveRoom2.asm

@@ -28,10 +28,10 @@

 .Warps:

 	db 4

-	warp_def 17, 31, 2, SILVER_CAVE_ROOM_1

-	warp_def 11, 5, 1, SILVER_CAVE_ROOM_3

-	warp_def 13, 21, 1, SILVER_CAVE_ITEM_ROOMS

-	warp_def 23, 3, 2, SILVER_CAVE_ITEM_ROOMS

+	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

 .CoordEvents:

 	db 0

--- a/maps/SilverCaveRoom3.asm

+++ b/maps/SilverCaveRoom3.asm

@@ -56,7 +56,7 @@

 .Warps:

 	db 1

-	warp_def 9, 33, 2, SILVER_CAVE_ROOM_2

+	warp_event 9, 33, 2, SILVER_CAVE_ROOM_2

 .CoordEvents:

 	db 0

--- a/maps/SlowpokeWellB1F.asm

+++ b/maps/SlowpokeWellB1F.asm

@@ -326,8 +326,8 @@

 .Warps:

 	db 2

-	warp_def 17, 15, 6, AZALEA_TOWN

-	warp_def 7, 11, 1, SLOWPOKE_WELL_B2F

+	warp_event 17, 15, 6, AZALEA_TOWN

+	warp_event 7, 11, 1, SLOWPOKE_WELL_B2F

 .CoordEvents:

 	db 0

--- a/maps/SlowpokeWellB2F.asm

+++ b/maps/SlowpokeWellB2F.asm

@@ -67,7 +67,7 @@

 .Warps:

 	db 1

-	warp_def 9, 11, 2, SLOWPOKE_WELL_B1F

+	warp_event 9, 11, 2, SLOWPOKE_WELL_B1F

 .CoordEvents:

 	db 0

--- a/maps/SoulHouse.asm

+++ b/maps/SoulHouse.asm

@@ -78,8 +78,8 @@

 .Warps:

 	db 2

-	warp_def 4, 7, 6, LAVENDER_TOWN

-	warp_def 5, 7, 6, LAVENDER_TOWN

+	warp_event 4, 7, 6, LAVENDER_TOWN

+	warp_event 5, 7, 6, LAVENDER_TOWN

 .CoordEvents:

 	db 0

--- a/maps/SproutTower1F.asm

+++ b/maps/SproutTower1F.asm

@@ -108,11 +108,11 @@

 .Warps:

 	db 5

-	warp_def 9, 15, 7, VIOLET_CITY

-	warp_def 10, 15, 7, VIOLET_CITY

-	warp_def 6, 4, 1, SPROUT_TOWER_2F

-	warp_def 2, 6, 2, SPROUT_TOWER_2F

-	warp_def 17, 3, 3, SPROUT_TOWER_2F

+	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

 .CoordEvents:

 	db 0

--- a/maps/SproutTower2F.asm

+++ b/maps/SproutTower2F.asm

@@ -90,10 +90,10 @@

 .Warps:

 	db 4

-	warp_def 6, 4, 3, SPROUT_TOWER_1F

-	warp_def 2, 6, 4, SPROUT_TOWER_1F

-	warp_def 17, 3, 5, SPROUT_TOWER_1F

-	warp_def 10, 14, 1, SPROUT_TOWER_3F

+	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

 .CoordEvents:

 	db 0

--- a/maps/SproutTower3F.asm

+++ b/maps/SproutTower3F.asm

@@ -335,7 +335,7 @@

 .Warps:

 	db 1

-	warp_def 10, 14, 4, SPROUT_TOWER_2F

+	warp_event 10, 14, 4, SPROUT_TOWER_2F

 .CoordEvents:

 	db 1

--- a/maps/TeamRocketBaseB1F.asm

+++ b/maps/TeamRocketBaseB1F.asm

@@ -732,10 +732,10 @@

 .Warps:

 	db 4

-	warp_def 27, 2, 3, MAHOGANY_MART_1F

-	warp_def 3, 14, 1, TEAM_ROCKET_BASE_B2F

-	warp_def 5, 15, 4, TEAM_ROCKET_BASE_B1F

-	warp_def 25, 2, 3, TEAM_ROCKET_BASE_B1F

+	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

 .CoordEvents:

 	db 30

--- a/maps/TeamRocketBaseB2F.asm

+++ b/maps/TeamRocketBaseB2F.asm

@@ -914,11 +914,11 @@

 .Warps:

 	db 5

-	warp_def 3, 14, 2, TEAM_ROCKET_BASE_B1F

-	warp_def 3, 2, 1, TEAM_ROCKET_BASE_B3F

-	warp_def 27, 2, 2, TEAM_ROCKET_BASE_B3F

-	warp_def 3, 6, 3, TEAM_ROCKET_BASE_B3F

-	warp_def 27, 14, 4, TEAM_ROCKET_BASE_B3F

+	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

 .CoordEvents:

 	db 9

--- a/maps/TeamRocketBaseB3F.asm

+++ b/maps/TeamRocketBaseB3F.asm

@@ -571,10 +571,10 @@

 .Warps:

 	db 4

-	warp_def 3, 2, 2, TEAM_ROCKET_BASE_B2F

-	warp_def 27, 2, 3, TEAM_ROCKET_BASE_B2F

-	warp_def 3, 6, 4, TEAM_ROCKET_BASE_B2F

-	warp_def 27, 14, 5, TEAM_ROCKET_BASE_B2F

+	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

 .CoordEvents:

 	db 3

--- a/maps/TimeCapsule.asm

+++ b/maps/TimeCapsule.asm

@@ -59,8 +59,8 @@

 .Warps:

 	db 2

-	warp_def 4, 7, 4, POKECENTER_2F

-	warp_def 5, 7, 4, POKECENTER_2F

+	warp_event 4, 7, 4, POKECENTER_2F

+	warp_event 5, 7, 4, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/TinTower1F.asm

+++ b/maps/TinTower1F.asm

@@ -528,9 +528,9 @@

 .Warps:

 	db 3

-	warp_def 9, 15, 12, ECRUTEAK_CITY

-	warp_def 10, 15, 12, ECRUTEAK_CITY

-	warp_def 10, 2, 2, TIN_TOWER_2F

+	warp_event 9, 15, 12, ECRUTEAK_CITY

+	warp_event 10, 15, 12, ECRUTEAK_CITY

+	warp_event 10, 2, 2, TIN_TOWER_2F

 .CoordEvents:

 	db 0

--- a/maps/TinTower2F.asm

+++ b/maps/TinTower2F.asm

@@ -11,8 +11,8 @@

 .Warps:

 	db 2

-	warp_def 10, 14, 1, TIN_TOWER_3F

-	warp_def 10, 2, 3, TIN_TOWER_1F

+	warp_event 10, 14, 1, TIN_TOWER_3F

+	warp_event 10, 2, 3, TIN_TOWER_1F

 .CoordEvents:

 	db 0

--- a/maps/TinTower3F.asm

+++ b/maps/TinTower3F.asm

@@ -17,8 +17,8 @@

 .Warps:

 	db 2

-	warp_def 10, 14, 1, TIN_TOWER_2F

-	warp_def 16, 2, 2, TIN_TOWER_4F

+	warp_event 10, 14, 1, TIN_TOWER_2F

+	warp_event 16, 2, 2, TIN_TOWER_4F

 .CoordEvents:

 	db 0

--- a/maps/TinTower4F.asm

+++ b/maps/TinTower4F.asm

@@ -28,10 +28,10 @@

 .Warps:

 	db 4

-	warp_def 2, 4, 2, TIN_TOWER_5F

-	warp_def 16, 2, 2, TIN_TOWER_3F

-	warp_def 2, 14, 3, TIN_TOWER_5F

-	warp_def 17, 15, 4, TIN_TOWER_5F

+	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

 .CoordEvents:

 	db 0

--- a/maps/TinTower5F.asm

+++ b/maps/TinTower5F.asm

@@ -23,10 +23,10 @@

 .Warps:

 	db 4

-	warp_def 11, 15, 2, TIN_TOWER_6F

-	warp_def 2, 4, 1, TIN_TOWER_4F

-	warp_def 2, 14, 3, TIN_TOWER_4F

-	warp_def 17, 15, 4, TIN_TOWER_4F

+	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

 .CoordEvents:

 	db 0

--- a/maps/TinTower6F.asm

+++ b/maps/TinTower6F.asm

@@ -17,8 +17,8 @@

 .Warps:

 	db 2

-	warp_def 3, 9, 1, TIN_TOWER_7F

-	warp_def 11, 15, 1, TIN_TOWER_5F

+	warp_event 3, 9, 1, TIN_TOWER_7F

+	warp_event 11, 15, 1, TIN_TOWER_5F

 .CoordEvents:

 	db 0

--- a/maps/TinTower7F.asm

+++ b/maps/TinTower7F.asm

@@ -17,11 +17,11 @@

 .Warps:

 	db 5

-	warp_def 3, 9, 1, TIN_TOWER_6F

-	warp_def 10, 15, 1, TIN_TOWER_8F

-	warp_def 12, 7, 4, TIN_TOWER_7F

-	warp_def 8, 3, 3, TIN_TOWER_7F

-	warp_def 6, 9, 5, TIN_TOWER_9F

+	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

 .CoordEvents:

 	db 0

--- a/maps/TinTower8F.asm

+++ b/maps/TinTower8F.asm

@@ -25,12 +25,12 @@

 .Warps:

 	db 6

-	warp_def 2, 5, 2, TIN_TOWER_7F

-	warp_def 2, 11, 1, TIN_TOWER_9F

-	warp_def 16, 7, 2, TIN_TOWER_9F

-	warp_def 10, 3, 3, TIN_TOWER_9F

-	warp_def 14, 15, 6, TIN_TOWER_9F

-	warp_def 6, 9, 7, TIN_TOWER_9F

+	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

 .CoordEvents:

 	db 0

--- a/maps/TinTower9F.asm

+++ b/maps/TinTower9F.asm

@@ -27,13 +27,13 @@

 .Warps:

 	db 7

-	warp_def 12, 3, 2, TIN_TOWER_8F

-	warp_def 2, 5, 3, TIN_TOWER_8F

-	warp_def 12, 7, 4, TIN_TOWER_8F

-	warp_def 7, 9, 1, TIN_TOWER_ROOF

-	warp_def 16, 7, 5, TIN_TOWER_7F

-	warp_def 6, 13, 5, TIN_TOWER_8F

-	warp_def 8, 13, 6, TIN_TOWER_8F

+	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

 .CoordEvents:

 	db 0

--- a/maps/TinTowerRoof.asm

+++ b/maps/TinTowerRoof.asm

@@ -50,7 +50,7 @@

 .Warps:

 	db 1

-	warp_def 9, 13, 4, TIN_TOWER_9F

+	warp_event 9, 13, 4, TIN_TOWER_9F

 .CoordEvents:

 	db 0

--- a/maps/TohjoFalls.asm

+++ b/maps/TohjoFalls.asm

@@ -17,8 +17,8 @@

 .Warps:

 	db 2

-	warp_def 13, 15, 2, ROUTE_27

-	warp_def 25, 15, 3, ROUTE_27

+	warp_event 13, 15, 2, ROUTE_27

+	warp_event 25, 15, 3, ROUTE_27

 .CoordEvents:

 	db 0

--- a/maps/TradeCenter.asm

+++ b/maps/TradeCenter.asm

@@ -59,8 +59,8 @@

 .Warps:

 	db 2

-	warp_def 4, 7, 2, POKECENTER_2F

-	warp_def 5, 7, 2, POKECENTER_2F

+	warp_event 4, 7, 2, POKECENTER_2F

+	warp_event 5, 7, 2, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/TrainerHouse1F.asm

+++ b/maps/TrainerHouse1F.asm

@@ -143,9 +143,9 @@

 .Warps:

 	db 3

-	warp_def 2, 13, 3, VIRIDIAN_CITY

-	warp_def 3, 13, 3, VIRIDIAN_CITY

-	warp_def 8, 2, 1, TRAINER_HOUSE_B1F

+	warp_event 2, 13, 3, VIRIDIAN_CITY

+	warp_event 3, 13, 3, VIRIDIAN_CITY

+	warp_event 8, 2, 1, TRAINER_HOUSE_B1F

 .CoordEvents:

 	db 0

--- a/maps/TrainerHouseB1F.asm

+++ b/maps/TrainerHouseB1F.asm

@@ -175,7 +175,7 @@

 .Warps:

 	db 1

-	warp_def 9, 4, 3, TRAINER_HOUSE_1F

+	warp_event 9, 4, 3, TRAINER_HOUSE_1F

 .CoordEvents:

 	db 1

--- a/maps/UndergroundPath.asm

+++ b/maps/UndergroundPath.asm

@@ -17,8 +17,8 @@

 .Warps:

 	db 2

-	warp_def 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE

-	warp_def 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE

+	warp_event 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE

+	warp_event 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE

 .CoordEvents:

 	db 0

--- a/maps/UnionCave1F.asm

+++ b/maps/UnionCave1F.asm

@@ -205,10 +205,10 @@

 .Warps:

 	db 4

-	warp_def 5, 19, 3, UNION_CAVE_B1F

-	warp_def 3, 33, 4, UNION_CAVE_B1F

-	warp_def 17, 31, 1, ROUTE_33

-	warp_def 17, 3, 4, ROUTE_32

+	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

 .CoordEvents:

 	db 0

--- a/maps/UnionCaveB1F.asm

+++ b/maps/UnionCaveB1F.asm

@@ -158,11 +158,11 @@

 .Warps:

 	db 5

-	warp_def 3, 3, 7, RUINS_OF_ALPH_OUTSIDE

-	warp_def 3, 11, 8, RUINS_OF_ALPH_OUTSIDE

-	warp_def 7, 19, 1, UNION_CAVE_1F

-	warp_def 3, 33, 2, UNION_CAVE_1F

-	warp_def 17, 31, 1, UNION_CAVE_B2F

+	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

 .CoordEvents:

 	db 0

--- a/maps/UnionCaveB2F.asm

+++ b/maps/UnionCaveB2F.asm

@@ -147,7 +147,7 @@

 .Warps:

 	db 1

-	warp_def 5, 3, 5, UNION_CAVE_B1F

+	warp_event 5, 3, 5, UNION_CAVE_B1F

 .CoordEvents:

 	db 0

--- a/maps/VermilionCity.asm

+++ b/maps/VermilionCity.asm

@@ -273,16 +273,16 @@

 .Warps:

 	db 10

-	warp_def 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE

-	warp_def 9, 5, 1, VERMILION_POKECENTER_1F

-	warp_def 7, 13, 1, POKEMON_FAN_CLUB

-	warp_def 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE

-	warp_def 21, 13, 2, VERMILION_MART

-	warp_def 21, 17, 1, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE

-	warp_def 10, 19, 1, VERMILION_GYM

-	warp_def 19, 31, 1, VERMILION_PORT_PASSAGE

-	warp_def 20, 31, 2, VERMILION_PORT_PASSAGE

-	warp_def 34, 7, 1, DIGLETTS_CAVE

+	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

 .CoordEvents:

 	db 0

--- a/maps/VermilionDiglettsCaveSpeechHouse.asm

+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm

@@ -26,8 +26,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 6, VERMILION_CITY

-	warp_def 3, 7, 6, VERMILION_CITY

+	warp_event 2, 7, 6, VERMILION_CITY

+	warp_event 3, 7, 6, VERMILION_CITY

 .CoordEvents:

 	db 0

--- a/maps/VermilionFishingSpeechHouse.asm

+++ b/maps/VermilionFishingSpeechHouse.asm

@@ -56,8 +56,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, VERMILION_CITY

-	warp_def 3, 7, 1, VERMILION_CITY

+	warp_event 2, 7, 1, VERMILION_CITY

+	warp_event 3, 7, 1, VERMILION_CITY

 .CoordEvents:

 	db 0

--- a/maps/VermilionGym.asm

+++ b/maps/VermilionGym.asm

@@ -266,8 +266,8 @@

 .Warps:

 	db 2

-	warp_def 4, 17, 7, VERMILION_CITY

-	warp_def 5, 17, 7, VERMILION_CITY

+	warp_event 4, 17, 7, VERMILION_CITY

+	warp_event 5, 17, 7, VERMILION_CITY

 .CoordEvents:

 	db 0

--- a/maps/VermilionMagnetTrainSpeechHouse.asm

+++ b/maps/VermilionMagnetTrainSpeechHouse.asm

@@ -39,8 +39,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, VERMILION_CITY

-	warp_def 3, 7, 4, VERMILION_CITY

+	warp_event 2, 7, 4, VERMILION_CITY

+	warp_event 3, 7, 4, VERMILION_CITY

 .CoordEvents:

 	db 0

--- a/maps/VermilionMart.asm

+++ b/maps/VermilionMart.asm

@@ -42,8 +42,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 5, VERMILION_CITY

-	warp_def 3, 7, 5, VERMILION_CITY

+	warp_event 2, 7, 5, VERMILION_CITY

+	warp_event 3, 7, 5, VERMILION_CITY

 .CoordEvents:

 	db 0

--- a/maps/VermilionPokecenter1F.asm

+++ b/maps/VermilionPokecenter1F.asm

@@ -82,9 +82,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 2, VERMILION_CITY

-	warp_def 4, 7, 2, VERMILION_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 2, VERMILION_CITY

+	warp_event 4, 7, 2, VERMILION_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/VermilionPokecenter2FBeta.asm

+++ b/maps/VermilionPokecenter2FBeta.asm

@@ -11,7 +11,7 @@

 .Warps:

 	db 1

-	warp_def 0, 7, 3, VERMILION_POKECENTER_1F

+	warp_event 0, 7, 3, VERMILION_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/VermilionPort.asm

+++ b/maps/VermilionPort.asm

@@ -304,8 +304,8 @@

 .Warps:

 	db 2

-	warp_def 9, 5, 5, VERMILION_PORT_PASSAGE

-	warp_def 7, 17, 1, FAST_SHIP_1F

+	warp_event 9, 5, 5, VERMILION_PORT_PASSAGE

+	warp_event 7, 17, 1, FAST_SHIP_1F

 .CoordEvents:

 	db 1

--- a/maps/VermilionPortPassage.asm

+++ b/maps/VermilionPortPassage.asm

@@ -24,11 +24,11 @@

 .Warps:

 	db 5

-	warp_def 15, 0, 8, VERMILION_CITY

-	warp_def 16, 0, 9, VERMILION_CITY

-	warp_def 15, 4, 4, VERMILION_PORT_PASSAGE

-	warp_def 3, 2, 3, VERMILION_PORT_PASSAGE

-	warp_def 3, 14, 1, VERMILION_PORT

+	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

 .CoordEvents:

 	db 0

--- a/maps/VictoryRoad.asm

+++ b/maps/VictoryRoad.asm

@@ -244,16 +244,16 @@

 .Warps:

 	db 10

-	warp_def 9, 67, 5, VICTORY_ROAD_GATE

-	warp_def 1, 49, 3, VICTORY_ROAD

-	warp_def 1, 35, 2, VICTORY_ROAD

-	warp_def 13, 31, 5, VICTORY_ROAD

-	warp_def 13, 17, 4, VICTORY_ROAD

-	warp_def 17, 33, 7, VICTORY_ROAD

-	warp_def 17, 19, 6, VICTORY_ROAD

-	warp_def 0, 11, 9, VICTORY_ROAD

-	warp_def 0, 27, 8, VICTORY_ROAD

-	warp_def 13, 5, 3, ROUTE_23

+	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

 .CoordEvents:

 	db 2

--- a/maps/VictoryRoadGate.asm

+++ b/maps/VictoryRoadGate.asm

@@ -103,14 +103,14 @@

 .Warps:

 	db 8

-	warp_def 17, 7, 1, ROUTE_22

-	warp_def 18, 7, 1, ROUTE_22

-	warp_def 9, 17, 1, ROUTE_26

-	warp_def 10, 17, 1, ROUTE_26

-	warp_def 9, 0, 1, VICTORY_ROAD

-	warp_def 10, 0, 1, VICTORY_ROAD

-	warp_def 1, 7, 2, ROUTE_28

-	warp_def 2, 7, 2, ROUTE_28

+	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

 .CoordEvents:

 	db 1

--- a/maps/VioletCity.asm

+++ b/maps/VioletCity.asm

@@ -284,15 +284,15 @@

 .Warps:

 	db 9

-	warp_def 9, 17, 2, VIOLET_MART

-	warp_def 18, 17, 1, VIOLET_GYM

-	warp_def 30, 17, 1, EARLS_POKEMON_ACADEMY

-	warp_def 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE

-	warp_def 31, 25, 1, VIOLET_POKECENTER_1F

-	warp_def 21, 29, 1, VIOLET_KYLES_HOUSE

-	warp_def 23, 5, 1, SPROUT_TOWER_1F

-	warp_def 39, 24, 1, ROUTE_31_VIOLET_GATE

-	warp_def 39, 25, 2, ROUTE_31_VIOLET_GATE

+	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

 .CoordEvents:

 	db 0

--- a/maps/VioletGym.asm

+++ b/maps/VioletGym.asm

@@ -287,8 +287,8 @@

 .Warps:

 	db 2

-	warp_def 4, 15, 2, VIOLET_CITY

-	warp_def 5, 15, 2, VIOLET_CITY

+	warp_event 4, 15, 2, VIOLET_CITY

+	warp_event 5, 15, 2, VIOLET_CITY

 .CoordEvents:

 	db 0

--- a/maps/VioletKylesHouse.asm

+++ b/maps/VioletKylesHouse.asm

@@ -38,8 +38,8 @@

 .Warps:

 	db 2

-	warp_def 3, 7, 6, VIOLET_CITY

-	warp_def 4, 7, 6, VIOLET_CITY

+	warp_event 3, 7, 6, VIOLET_CITY

+	warp_event 4, 7, 6, VIOLET_CITY

 .CoordEvents:

 	db 0

--- a/maps/VioletMart.asm

+++ b/maps/VioletMart.asm

@@ -54,8 +54,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 1, VIOLET_CITY

-	warp_def 3, 7, 1, VIOLET_CITY

+	warp_event 2, 7, 1, VIOLET_CITY

+	warp_event 3, 7, 1, VIOLET_CITY

 .CoordEvents:

 	db 0

--- a/maps/VioletNicknameSpeechHouse.asm

+++ b/maps/VioletNicknameSpeechHouse.asm

@@ -50,8 +50,8 @@

 .Warps:

 	db 2

-	warp_def 3, 7, 4, VIOLET_CITY

-	warp_def 4, 7, 4, VIOLET_CITY

+	warp_event 3, 7, 4, VIOLET_CITY

+	warp_event 4, 7, 4, VIOLET_CITY

 .CoordEvents:

 	db 0

--- a/maps/VioletPokecenter1F.asm

+++ b/maps/VioletPokecenter1F.asm

@@ -221,9 +221,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 5, VIOLET_CITY

-	warp_def 4, 7, 5, VIOLET_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 5, VIOLET_CITY

+	warp_event 4, 7, 5, VIOLET_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/ViridianCity.asm

+++ b/maps/ViridianCity.asm

@@ -221,11 +221,11 @@

 .Warps:

 	db 5

-	warp_def 32, 7, 1, VIRIDIAN_GYM

-	warp_def 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE

-	warp_def 23, 15, 1, TRAINER_HOUSE_1F

-	warp_def 29, 19, 2, VIRIDIAN_MART

-	warp_def 23, 25, 1, VIRIDIAN_POKECENTER_1F

+	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

 .CoordEvents:

 	db 0

--- a/maps/ViridianGym.asm

+++ b/maps/ViridianGym.asm

@@ -175,8 +175,8 @@

 .Warps:

 	db 2

-	warp_def 4, 17, 1, VIRIDIAN_CITY

-	warp_def 5, 17, 1, VIRIDIAN_CITY

+	warp_event 4, 17, 1, VIRIDIAN_CITY

+	warp_event 5, 17, 1, VIRIDIAN_CITY

 .CoordEvents:

 	db 0

--- a/maps/ViridianMart.asm

+++ b/maps/ViridianMart.asm

@@ -42,8 +42,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 4, VIRIDIAN_CITY

-	warp_def 3, 7, 4, VIRIDIAN_CITY

+	warp_event 2, 7, 4, VIRIDIAN_CITY

+	warp_event 3, 7, 4, VIRIDIAN_CITY

 .CoordEvents:

 	db 0

--- a/maps/ViridianNicknameSpeechHouse.asm

+++ b/maps/ViridianNicknameSpeechHouse.asm

@@ -67,8 +67,8 @@

 .Warps:

 	db 2

-	warp_def 2, 7, 2, VIRIDIAN_CITY

-	warp_def 3, 7, 2, VIRIDIAN_CITY

+	warp_event 2, 7, 2, VIRIDIAN_CITY

+	warp_event 3, 7, 2, VIRIDIAN_CITY

 .CoordEvents:

 	db 0

--- a/maps/ViridianPokecenter1F.asm

+++ b/maps/ViridianPokecenter1F.asm

@@ -77,9 +77,9 @@

 .Warps:

 	db 3

-	warp_def 3, 7, 5, VIRIDIAN_CITY

-	warp_def 4, 7, 5, VIRIDIAN_CITY

-	warp_def 0, 7, 1, POKECENTER_2F

+	warp_event 3, 7, 5, VIRIDIAN_CITY

+	warp_event 4, 7, 5, VIRIDIAN_CITY

+	warp_event 0, 7, 1, POKECENTER_2F

 .CoordEvents:

 	db 0

--- a/maps/ViridianPokecenter2FBeta.asm

+++ b/maps/ViridianPokecenter2FBeta.asm

@@ -11,7 +11,7 @@

 .Warps:

 	db 1

-	warp_def 0, 7, 3, VIRIDIAN_POKECENTER_1F

+	warp_event 0, 7, 3, VIRIDIAN_POKECENTER_1F

 .CoordEvents:

 	db 0

--- a/maps/WhirlIslandB1F.asm

+++ b/maps/WhirlIslandB1F.asm

@@ -46,15 +46,15 @@

 .Warps:

 	db 9

-	warp_def 5, 5, 2, WHIRL_ISLAND_NW

-	warp_def 35, 3, 2, WHIRL_ISLAND_NE

-	warp_def 29, 9, 3, WHIRL_ISLAND_NE

-	warp_def 9, 31, 3, WHIRL_ISLAND_SW

-	warp_def 23, 31, 2, WHIRL_ISLAND_SW

-	warp_def 31, 29, 2, WHIRL_ISLAND_SE

-	warp_def 25, 21, 1, WHIRL_ISLAND_B2F

-	warp_def 13, 27, 2, WHIRL_ISLAND_B2F

-	warp_def 17, 21, 1, WHIRL_ISLAND_CAVE

+	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

 .CoordEvents:

 	db 0

--- a/maps/WhirlIslandB2F.asm

+++ b/maps/WhirlIslandB2F.asm

@@ -25,10 +25,10 @@

 .Warps:

 	db 4

-	warp_def 11, 5, 7, WHIRL_ISLAND_B1F

-	warp_def 7, 11, 8, WHIRL_ISLAND_B1F

-	warp_def 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER

-	warp_def 13, 31, 5, WHIRL_ISLAND_SW

+	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

 .CoordEvents:

 	db 0

--- a/maps/WhirlIslandCave.asm

+++ b/maps/WhirlIslandCave.asm

@@ -11,8 +11,8 @@

 .Warps:

 	db 2

-	warp_def 7, 5, 9, WHIRL_ISLAND_B1F

-	warp_def 3, 13, 4, WHIRL_ISLAND_NW

+	warp_event 7, 5, 9, WHIRL_ISLAND_B1F

+	warp_event 3, 13, 4, WHIRL_ISLAND_NW

 .CoordEvents:

 	db 0

--- a/maps/WhirlIslandLugiaChamber.asm

+++ b/maps/WhirlIslandLugiaChamber.asm

@@ -49,7 +49,7 @@

 .Warps:

 	db 1

-	warp_def 9, 13, 3, WHIRL_ISLAND_B2F

+	warp_event 9, 13, 3, WHIRL_ISLAND_B2F

 .CoordEvents:

 	db 0

--- a/maps/WhirlIslandNE.asm

+++ b/maps/WhirlIslandNE.asm

@@ -17,9 +17,9 @@

 .Warps:

 	db 3

-	warp_def 3, 13, 2, ROUTE_41

-	warp_def 17, 3, 2, WHIRL_ISLAND_B1F

-	warp_def 13, 11, 3, WHIRL_ISLAND_B1F

+	warp_event 3, 13, 2, ROUTE_41

+	warp_event 17, 3, 2, WHIRL_ISLAND_B1F

+	warp_event 13, 11, 3, WHIRL_ISLAND_B1F

 .CoordEvents:

 	db 0

--- a/maps/WhirlIslandNW.asm

+++ b/maps/WhirlIslandNW.asm

@@ -11,10 +11,10 @@

 .Warps:

 	db 4

-	warp_def 5, 7, 1, ROUTE_41

-	warp_def 5, 3, 1, WHIRL_ISLAND_B1F

-	warp_def 3, 15, 4, WHIRL_ISLAND_SW

-	warp_def 7, 15, 2, WHIRL_ISLAND_CAVE

+	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

 .CoordEvents:

 	db 0

--- a/maps/WhirlIslandSE.asm

+++ b/maps/WhirlIslandSE.asm

@@ -11,8 +11,8 @@

 .Warps:

 	db 2

-	warp_def 5, 13, 4, ROUTE_41

-	warp_def 5, 3, 6, WHIRL_ISLAND_B1F

+	warp_event 5, 13, 4, ROUTE_41

+	warp_event 5, 3, 6, WHIRL_ISLAND_B1F

 .CoordEvents:

 	db 0

--- a/maps/WhirlIslandSW.asm

+++ b/maps/WhirlIslandSW.asm

@@ -17,11 +17,11 @@

 .Warps:

 	db 5

-	warp_def 5, 7, 3, ROUTE_41

-	warp_def 17, 3, 5, WHIRL_ISLAND_B1F

-	warp_def 3, 3, 4, WHIRL_ISLAND_B1F

-	warp_def 3, 15, 3, WHIRL_ISLAND_NW

-	warp_def 17, 15, 4, WHIRL_ISLAND_B2F

+	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

 .CoordEvents:

 	db 0

--- a/maps/WillsRoom.asm

+++ b/maps/WillsRoom.asm

@@ -134,9 +134,9 @@

 .Warps:

 	db 3

-	warp_def 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F

-	warp_def 4, 2, 1, KOGAS_ROOM

-	warp_def 5, 2, 2, KOGAS_ROOM

+	warp_event 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F

+	warp_event 4, 2, 1, KOGAS_ROOM

+	warp_event 5, 2, 2, KOGAS_ROOM

 .CoordEvents:

 	db 0

--- a/maps/WiseTriosRoom.asm

+++ b/maps/WiseTriosRoom.asm

@@ -350,9 +350,9 @@

 .Warps:

 	db 3

-	warp_def 7, 4, 4, ECRUTEAK_CITY

-	warp_def 7, 5, 5, ECRUTEAK_CITY

-	warp_def 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE

+	warp_event 7, 4, 4, ECRUTEAK_CITY

+	warp_event 7, 5, 5, ECRUTEAK_CITY

+	warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE

 .CoordEvents:

 	db 1