Handle optional arguments for warp commands, add WARP_ID_NONE

asm/macros/event.inc

@@ -377,37 +377,64 @@
 	.byte \speed
 	.endm
 
-	@ Warps the player to the specified map.
-	@ The player will warp to the coordinates of the given 'warp'.
-	@ If 'warp' is set to an invalid id (e.g. 255) then the coordinates x/y will be used instead.
-	.macro warp map:req, warp:req, x=0, y=0
-	.byte 0x39
+	@ Helper macro for warp commands. It formats the arguments for a warp command.
+	@ It allows warp macros to either provide 1. a valid id for which warp location to use,
+	@ or 2. a pair of x/y coordinates to use. Both may be provided but at least one will be
+	@ ignored by SetPlayerCoordsFromWard. If none are provided it will use dummy arguments,
+	@ and the warp will send the player to the center of the map.
+	@ Examples of valid inputs for a warp command:
+	@ - warp MAP, x, y
+	@ - warp MAP, warpId
+	@ - warp MAP
+	@ - warp MAP, warpId, x, y
+	.macro formatwarp map:req, a, b, c
 	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	.ifb \a @ No arguments provided, use dummy warpId and coords.
+		.byte WARP_ID_NONE
+		.2byte -1 @ x
+		.2byte -1 @ y
+	.else
+	.ifb \b @ Only one argument provided, treat it as a warpId and use dummy coords.
+		.byte \a   @ warpId
+		.2byte -1  @ x
+		.2byte -1  @ y
+	.else
+	.ifb \c @ Only two arguments provided, treat them as a coord pair and use dummy warpId.
+		.byte WARP_ID_NONE
+		.2byte \a  @ x
+		.2byte \b  @ y
+	.else @ All three arguments provided. Output them and let the warp sort out which to use.
+		.byte \a  @ warpId
+		.2byte \b @ x
+		.2byte \c @ y
+	.endif
+	.endif
+	.endif
+	.endm
+
+
+	@ Warps the player to the specified map.
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro warp map:req, a, b, c
+	.byte 0x39
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	@ Warps the player to the specified map without playing a sound effect.
-	@ The player will warp to the coordinates of the given 'warp'.
-	@ If 'warp' is set to an invalid id (e.g. 255) then the coordinates x/y will be used instead.
-	.macro warpsilent map:req, warp:req, x=0, y=0
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro warpsilent map:req, a, b, c
 	.byte 0x3a
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	@ Warps the player to the specified map and plays a door opening animation before stepping upwards into it.
-	@ The player will warp to the coordinates of the given 'warp'.
-	@ If 'warp' is set to an invalid id (e.g. 255) then the coordinates x/y will be used instead.
-	.macro warpdoor map:req, warp:req, x=0, y=0
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro warpdoor map:req, a, b, c
 	.byte 0x3b
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	@ Warps the player to another map using a hole animation.
@@ -416,55 +443,48 @@
 	map \map
 	.endm
 
-	@ Warps the player to the specified map using a teleport effect.
-	@ The player will warp to the coordinates of the given 'warp'.
-	@ If 'warp' is set to an invalid id (e.g. 255) then the coordinates x/y will be used instead.
-	.macro warpteleport map:req, warp:req, x=0, y=0
+	@ Warps the player to the specified map using a teleport effect. Effect is similar to warpspinenter but
+	@ this warp has a fade out first and doesn't maintain the original facing direction.
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro warpteleport map:req, a, b, c
 	.byte 0x3d
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	@ Sets the warp destination to be used later.
-	@ The player will warp to the coordinates of the given 'warp'.
-	@ If 'warp' is set to an invalid id (e.g. 255) then the coordinates x/y will be used instead.
-	.macro setwarp map:req, warp:req, x=0, y=0
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro setwarp map:req, a, b, c
 	.byte 0x3e
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
-	@ TODO
-	@ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to.
-	@ Useful when a map has warps that need to go to script-controlled locations (i.e. elevators).
-	.macro setdynamicwarp map:req, warp:req, x:req, y:req
+	@ Sets the dynamic warp destination. Warps with a destination map of MAP_NONE will target this destination.
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro setdynamicwarp map:req, a, b, c
 	.byte 0x3f
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	@ Sets the destination that diving or emerging from a dive will take the player to.
-	.macro setdivewarp map:req, warp:req, x:req, y:req
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro setdivewarp map:req, a, b, c
 	.byte 0x40
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	@ Sets the destination that falling into a hole will take the player to.
-	.macro setholewarp map:req, warp:req, x:req, y:req
+	@ While it does accept and set the x/y coordinates and warpId, they are ultimately ignored.
+	@ This is only used to set the map the player should fall to. The exact location on the
+	@ map to fall to is determined by warphole.
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro setholewarp map:req, a=0, b=0, c
 	.byte 0x41
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	@ Retrieves the player's zero-indexed x- and y-coordinates in the map, and stores them in the specified variables.
@@ -1441,14 +1461,11 @@
 	.endm
 
 	@ Sets the destination that using an Escape Rope or Dig will take the player to.
-	@ The player will warp to the coordinates of the given 'warp'.
-	@ If 'warp' is set to an invalid id (e.g. 255) then the coordinates x/y will be used instead.
-	.macro setescapewarp map:req, warp:req, x=0, y=0
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro setescapewarp map:req, a, b, c
 	.byte 0xc4
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	@ Blocks script execution until cry finishes.
@@ -1522,15 +1539,11 @@
 	.2byte \worldmapflag
 	.endm
 
-	@ Clone of warpteleport? It is apparently only used in FR/LG, and only with specials.[source]
-	@ The player will warp to the coordinates of the given 'warp'.
-	@ If 'warp' is set to an invalid id (e.g. 255) then the coordinates x/y will be used instead.
-	.macro warpteleport2 map:req, warp:req, x=0, y=0
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro warpspinenter map:req, a, b, c
 	.byte 0xd1
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	@ Changes the location where the player caught the Pokemon in the specified slot of their party.
@@ -1565,14 +1578,11 @@
 	.byte 0xd6
 	.endm
 
-	@ The player will warp to the coordinates of the given 'warp'.
-	@ If 'warp' is set to an invalid id (e.g. 255) then the coordinates x/y will be used instead.
-	.macro warpmossdeepgym map:req, warp:req, x=0, y=0
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro warpmossdeepgym map:req, a, b, c
 	.byte 0xd7
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	.macro selectapproachingtrainer
@@ -1614,14 +1624,11 @@
 	.4byte \pointer
 	.endm
 
-	@ The player will warp to the coordinates of the given 'warp'.
-	@ If 'warp' is set to an invalid id (e.g. 255) then the coordinates x/y will be used instead.
-	.macro warpsootopolislegend map:req, warp:req, x=0, y=0
+	@ Warp commands can be given either the id of which warp location to go to on the destination map
+	@ or a pair of x/y coordinates to go to directly on the destination map.
+	.macro warpsootopolislegend map:req, a, b, c
 	.byte 0xe0
-	map \map
-	.byte \warp
-	.2byte \x
-	.2byte \y
+	formatwarp \map, \a, \b, \c
 	.endm
 
 	.macro buffercontesttypestring out:req, word:req

data/maps/AbandonedShip_Corridors_B1F/scripts.inc

@@ -4,7 +4,7 @@ AbandonedShip_Corridors_B1F_MapScripts::
 	.byte 0
 
 AbandonedShip_Corridors_B1F_OnResume:
-	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
+	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 5, 4
 	end
 
 AbandonedShip_Corridors_B1F_OnLoad:

data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc

@@ -4,7 +4,7 @@ AbandonedShip_HiddenFloorCorridors_MapScripts::
 	.byte 0
 
 AbandonedShip_HiddenFloorCorridors_OnResume:
-	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
+	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 5, 4
 	end
 
 AbandonedShip_HiddenFloorCorridors_OnLoad:

data/maps/AbandonedShip_Rooms_B1F/scripts.inc

@@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F_MapScripts::
 	.byte 0
 
 AbandonedShip_Rooms_B1F_OnResume:
-	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4
+	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 17, 4
 	end
 
 AbandonedShip_Rooms_B1F_EventScript_FatMan::

data/maps/AbandonedShip_Underwater1/scripts.inc

@@ -3,6 +3,6 @@ AbandonedShip_Underwater1_MapScripts::
 	.byte 0
 
 AbandonedShip_Underwater1_OnResume:
-	setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10
+	setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 0, 10
 	end
 

data/maps/AbandonedShip_Underwater2/scripts.inc

@@ -3,6 +3,6 @@ AbandonedShip_Underwater2_MapScripts::
 	.byte 0
 
 AbandonedShip_Underwater2_OnResume:
-	setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7
+	setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 13, 7
 	end
 

data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc

@@ -110,7 +110,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner::
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT
 BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
+	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 7, 8
 	waitstate
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent::
@@ -210,7 +210,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge::
 BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon::
 	delay 60
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
+	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 7, 8
 	waitstate
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent::

data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc

@@ -22,7 +22,7 @@ BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor
 	waitmovement 0
 	setvar VAR_0x8006, 0
-	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5
+	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 7, 5
 	waitstate
 	end
 

data/maps/BattleFrontier_BattleArenaLobby/scripts.inc

@@ -173,7 +173,7 @@ BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge::
 	call_if_eq BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50
 	compare VAR_RESULT, FRONTIER_LVL_OPEN
 	call_if_eq BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen
-	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13
+	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 9, 13
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc

@@ -164,7 +164,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent::
 	switch VAR_RESULT
 	case DOME_ROUNDS_COUNT, BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
 	setvar VAR_0x8006, 1
-	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 5, 3
 	waitstate
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney::
@@ -885,12 +885,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles
-	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 5, 11
 	waitstate
 	end
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles::
-	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 17, 11
 	waitstate
 	end
 

data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc

@@ -40,7 +40,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen::
 BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom::
 	waitmovement 0
 	setvar VAR_0x8006, 0
-	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 5, 7
 	waitstate
 	end
 

data/maps/BattleFrontier_BattleDomeLobby/scripts.inc

@@ -202,7 +202,7 @@ BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge::
 	closemessage
 	call BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor
 	special HealPlayerParty
-	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 23, 6
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc

@@ -163,7 +163,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge::
 	waitmovement 0
 	closedoor 5, 1
 	waitdooranim
-	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 9, 5
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc

@@ -119,7 +119,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum::
 	switch VAR_RESULT
 	case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon
 	setvar VAR_0x8006, 1
-	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8
+	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 8, 8
 	waitstate
 BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
@@ -247,12 +247,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles
-	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8
+	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 4, 8
 	waitstate
 	end
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles::
-	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8
+	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 14, 8
 	waitstate
 	end
 

data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc

@@ -181,7 +181,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge::
 	applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor
 	waitmovement 0
-	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13
+	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 8, 13
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc

@@ -54,7 +54,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom::
 	compare VAR_RESULT, FRONTIER_LVL_OPEN
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen
 	waitmovement 0
-	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11
+	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 6, 11
 	waitstate
 	end
 

data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc

@@ -419,12 +419,12 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles
-	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7
+	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 5, 7
 	waitstate
 	end
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles::
-	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7
+	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 19, 7
 	waitstate
 	end
 

data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc

@@ -53,7 +53,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom::
 	closedoor 10, 3
 	waitdooranim
 BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom::
-	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4
+	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 7, 4
 	waitstate
 	end
 

data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc

@@ -192,7 +192,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_FollowMe, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor
-	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13
+	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 8, 13
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc

@@ -25,7 +25,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor::
 	waitmovement 0
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
-	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 6, 10
 	waitstate
 	end
 

data/maps/BattleFrontier_BattlePikeLobby/scripts.inc

@@ -159,7 +159,7 @@ BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge::
 	call BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor
 	special HealPlayerParty
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
-	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 6, 7
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc

@@ -18,7 +18,7 @@ BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom::
 	msgbox BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease, MSGBOX_DEFAULT
 	closemessage
 	releaseall
-	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 5, 6
 	waitstate
 	end
 

data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc

@@ -44,7 +44,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom::
 	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle
 BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 5, 6
 	waitstate
 	end
 

data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc

@@ -16,7 +16,7 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom::
 
 BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 5, 6
 	waitstate
 	end
 

data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc

@@ -28,7 +28,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus::
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby::
-	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 5, 6
 	waitstate
 	end
 

data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc

@@ -70,7 +70,7 @@ BattleFrontier_BattlePyramid_EventScript_WarpToLobby::
 	pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS
 	pyramid_clearhelditems
 	special HealPlayerParty
-	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 7, 13
 	waitstate
 	end
 
@@ -102,12 +102,12 @@ BattlePyramid_WarpToNextFloor::
 	pyramid_seedfloor
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_RESULT, 0
-	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 255, 1, 1
+	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 1, 1
 	waitstate
 	end
 
 BattlePyramid_WarpToTop::
-	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17
+	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 17, 17
 	waitstate
 	end
 

data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc

@@ -173,7 +173,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_RESULT, 0
 	special HealPlayerParty
-	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 255, 1, 1
+	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 1, 1
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/maps/BattleFrontier_BattlePyramidTop/scripts.inc

@@ -93,7 +93,7 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant::
 	closemessage
 BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
+	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 7, 13
 	waitstate
 	end
 

data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc

@@ -428,23 +428,23 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby::
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis
 	compare VAR_RESULT, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 6, 6
 	waitstate
 	end
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles::
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 10, 6
 	waitstate
 	end
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis::
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 14, 6
 	waitstate
 	end
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis::
 	tower_closelink
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 18, 6
 	waitstate
 	end
 

data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc

@@ -37,7 +37,7 @@ BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor::
 
 BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom::
 	setvar VAR_TEMP_0, 0
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 4, 8
 	waitstate
 	end
 

data/maps/BattleFrontier_BattleTowerElevator/scripts.inc

@@ -37,23 +37,23 @@ BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom::
 	return
 
 BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor::
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 8, 1
 	waitstate
 	return
 
 BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti::
 	goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 7, 2
 	waitstate
 	return
 
 BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti::
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 7, 2
 	waitstate
 	return
 
 BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom::
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 1
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 10, 1
 	waitstate
 	return
 

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -615,7 +615,7 @@ BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad::
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad
 	call BattleFrontier_BattleTowerLobby_EventScript_ShowYouToBattleRoom
 	clearflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 1, 6
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc

@@ -106,18 +106,18 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom::
 	return
 
 BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom::
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 4, 8
 	waitstate
 	return
 
 BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom::
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 4, 5
 	waitstate
 	return
 
 @ Unnecessary duplicate of the above
 BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom::
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 4, 5
 	waitstate
 	return
 

data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc

@@ -108,7 +108,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator::
 	call BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator
 	closedoor 10, 1
 	waitdooranim
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 1, 6
 	waitstate
 	releaseall
 	end
@@ -189,7 +189,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner::
 	call_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth
 	removeobject VAR_LAST_TALKED
 	setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
-	warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 3
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 10, 3
 	waitstate
 	release
 	end

data/maps/BattleFrontier_OutsideWest/scripts.inc

@@ -48,7 +48,7 @@ BattleFrontier_OutsideWest_EventScript_FerryToSlateport::
 	goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
 	msgbox BattleFrontier_OutsideWest_Text_PleaseBoardFerry, MSGBOX_DEFAULT
 	call BattleFrontier_OutsideWest_EventScript_BoardFerry
-	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
+	warp MAP_SLATEPORT_CITY_HARBOR, 8, 11
 	waitstate
 	release
 	end
@@ -59,7 +59,7 @@ BattleFrontier_OutsideWest_EventScript_FerryToLilycove::
 	goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
 	msgbox BattleFrontier_OutsideWest_Text_PleaseBoardFerry, MSGBOX_DEFAULT
 	call BattleFrontier_OutsideWest_EventScript_BoardFerry
-	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	warp MAP_LILYCOVE_CITY_HARBOR, 8, 11
 	waitstate
 	release
 	end

data/maps/BirthIsland_Harbor/scripts.inc

@@ -18,7 +18,7 @@ BirthIsland_Harbor_EventScript_Sailor::
 	hideobjectat LOCALID_SAILOR, MAP_BIRTH_ISLAND_HARBOR
 	setvar VAR_0x8004, LOCALID_SS_TIDAL
 	call Common_EventScript_FerryDepartIsland
-	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	warp MAP_LILYCOVE_CITY_HARBOR, 8, 11
 	waitstate
 	release
 	end

data/maps/CaveOfOrigin_Entrance/scripts.inc

@@ -3,6 +3,6 @@ CaveOfOrigin_Entrance_MapScripts::
 	.byte 0
 
 CaveOfOrigin_Entrance_OnResume:
-	setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17
+	setescapewarp MAP_SOOTOPOLIS_CITY, 31, 17
 	end
 

data/maps/ContestHall/scripts.inc

@@ -418,27 +418,27 @@ ContestHall_EventScript_SetExitWarp::
 	return
 
 ContestHall_EventScript_SetExitWarpNormalContest::
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 14, 4
 	waitstate
 	end
 
 ContestHall_EventScript_SetExitWarpSuperContest::
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 14, 4
 	waitstate
 	end
 
 ContestHall_EventScript_SetExitWarpHyperContest::
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 14, 4
 	waitstate
 	end
 
 ContestHall_EventScript_SetExitWarpMasterContest::
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 14, 4
 	waitstate
 	end
 
 ContestHall_EventScript_SetExitWarpLinkContest::
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 15, 4
 	waitstate
 	end
 

data/maps/DewfordTown/scripts.inc

@@ -152,7 +152,7 @@ DewfordTown_EventScript_SailToPetalburg::
 	hideobjectat LOCALID_BOAT_DEWFORD, MAP_DEWFORD_TOWN
 	setvar VAR_BOARD_BRINEY_BOAT_STATE, 2
 	resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
-	warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
+	warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 5, 4
 	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
 	waitstate
 	release

data/maps/EverGrandeCity_ChampionsRoom/scripts.inc

@@ -141,7 +141,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF::
 	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit
 	waitmovement 0
 	setflag FLAG_HIDE_PETALBURG_GYM_GREETER
-	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
+	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 7, 16
 	waitstate
 	releaseall
 	end

data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc

@@ -71,7 +71,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter::
 FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
-	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
+	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 6, 6
 	waitstate
 
 FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent::
@@ -142,7 +142,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon::
 	delay 60
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
-	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
+	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 6, 6
 	waitstate
 
 @ Unreachable code block? The flow into the next block also doesnt make sense

data/maps/FallarborTown_BattleTentCorridor/scripts.inc

@@ -22,7 +22,7 @@ FallarborTown_BattleTentCorridor_EventScript_EnterCorridor::
 	closedoor 2, 1
 	waitdooranim
 	setvar VAR_0x8006, 0
-	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4
+	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 4, 4
 	waitstate
 	releaseall
 	end

data/maps/FallarborTown_BattleTentLobby/scripts.inc

@@ -161,7 +161,7 @@ FallarborTown_BattleTentLobby_EventScript_EnterChallenge::
 	msgbox FallarborTown_BattleTentLobby_Text_GuideYouToBattleTent, MSGBOX_DEFAULT
 	closemessage
 	call FallarborTown_BattleTentLobby_EventScript_WalkToDoor
-	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
+	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 2, 7
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/maps/FarawayIsland_Entrance/scripts.inc

@@ -33,7 +33,7 @@ FarawayIsland_Entrance_EventScript_Sailor::
 	hideobjectat LOCALID_SAILOR, MAP_FARAWAY_ISLAND_ENTRANCE
 	setvar VAR_0x8004, LOCALID_SS_TIDAL
 	call Common_EventScript_FerryDepartIsland
-	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	warp MAP_LILYCOVE_CITY_HARBOR, 8, 11
 	waitstate
 	release
 	end

data/maps/GraniteCave_B1F/scripts.inc

@@ -6,6 +6,6 @@ GraniteCave_B1F_MapScripts::
 
 GraniteCave_B1F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
-	setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0
+	setholewarp MAP_GRANITE_CAVE_B2F
 	end
 

data/maps/InsideOfTruck/scripts.inc

@@ -32,7 +32,7 @@ InsideOfTruck_EventScript_SetIntroFlagsMale::
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
 	setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 1
-	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10
+	setdynamicwarp MAP_LITTLEROOT_TOWN, 3, 10
 	releaseall
 	end
 
@@ -45,7 +45,7 @@ InsideOfTruck_EventScript_SetIntroFlagsFemale::
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
 	setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 1
-	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
+	setdynamicwarp MAP_LITTLEROOT_TOWN, 12, 10
 	releaseall
 	end
 

data/maps/LilycoveCity_ContestLobby/scripts.inc

@@ -384,31 +384,31 @@ LilycoveCity_ContestLobby_EventScript_WarpToContestHall::
 	return
 
 LilycoveCity_ContestLobby_EventScript_WarpToCoolContestHall::
-	setwarp MAP_CONTEST_HALL_COOL, 255, 7, 5
+	setwarp MAP_CONTEST_HALL_COOL, 7, 5
 	special DoContestHallWarp
 	waitstate
 	return
 
 LilycoveCity_ContestLobby_EventScript_WarpToBeautyContestHall::
-	setwarp MAP_CONTEST_HALL_BEAUTY, 255, 7, 5
+	setwarp MAP_CONTEST_HALL_BEAUTY, 7, 5
 	special DoContestHallWarp
 	waitstate
 	return
 
 LilycoveCity_ContestLobby_EventScript_WarpToCuteContestHall::
-	setwarp MAP_CONTEST_HALL_CUTE, 255, 7, 5
+	setwarp MAP_CONTEST_HALL_CUTE, 7, 5
 	special DoContestHallWarp
 	waitstate
 	return
 
 LilycoveCity_ContestLobby_EventScript_WarpToSmartContestHall::
-	setwarp MAP_CONTEST_HALL_SMART, 255, 7, 5
+	setwarp MAP_CONTEST_HALL_SMART, 7, 5
 	special DoContestHallWarp
 	waitstate
 	return
 
 LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall::
-	setwarp MAP_CONTEST_HALL_TOUGH, 255, 7, 5
+	setwarp MAP_CONTEST_HALL_TOUGH, 7, 5
 	special DoContestHallWarp
 	waitstate
 	return

data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc

@@ -59,7 +59,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor::
 
 LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor::
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_1F
-	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1
+	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
 	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
@@ -69,7 +69,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor::
 
 LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor::
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_2F
-	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1
+	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
 	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
@@ -79,7 +79,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor::
 
 LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor::
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_3F
-	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1
+	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
 	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
@@ -89,7 +89,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor::
 
 LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor::
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_4F
-	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1
+	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
 	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
@@ -99,7 +99,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor::
 
 LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor::
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_5F
-	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1
+	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
 	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator

data/maps/LilycoveCity_Harbor/scripts.inc

@@ -8,7 +8,7 @@ LilycoveCity_Harbor_MapScripts::
 	.byte 0
 
 LilycoveCity_Harbor_OnTransition:
-	setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33
+	setescapewarp MAP_LILYCOVE_CITY, 12, 33
 	end
 
 LilycoveCity_Harbor_EventScript_FerryAttendant::
@@ -64,28 +64,28 @@ LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect::
 
 LilycoveCity_Harbor_EventScript_GoToSouthernIsland::
 	call LilycoveCity_Harbor_EventScript_BoardFerry
-	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
+	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 13, 22
 	waitstate
 	release
 	end
 
 LilycoveCity_Harbor_EventScript_GoToNavelRock::
 	call LilycoveCity_Harbor_EventScript_BoardFerry
-	warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4
+	warp MAP_NAVEL_ROCK_HARBOR, 8, 4
 	waitstate
 	release
 	end
 
 LilycoveCity_Harbor_EventScript_GoToBirthIsland::
 	call LilycoveCity_Harbor_EventScript_BoardFerry
-	warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4
+	warp MAP_BIRTH_ISLAND_HARBOR, 8, 4
 	waitstate
 	release
 	end
 
 LilycoveCity_Harbor_EventScript_GoToFarawayIsland::
 	call LilycoveCity_Harbor_EventScript_BoardFerry
-	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
+	warp MAP_FARAWAY_ISLAND_ENTRANCE, 13, 38
 	waitstate
 	release
 	end
@@ -96,7 +96,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateport::
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE
 	call LilycoveCity_Harbor_EventScript_BoardFerry
-	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
+	warp MAP_SS_TIDAL_CORRIDOR, 1, 10
 	waitstate
 	release
 	end
@@ -106,7 +106,7 @@ LilycoveCity_Harbor_EventScript_GoToBattleFrontier::
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
 	call LilycoveCity_Harbor_EventScript_BoardFerry
-	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
+	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 19, 67
 	waitstate
 	release
 	end
@@ -223,7 +223,7 @@ LilycoveCity_Harbor_EventScript_EonTicketFirstTime::
 LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime::
 	closemessage
 	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
-	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
+	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 13, 22
 	waitstate
 	release
 	end
@@ -240,7 +240,7 @@ LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime::
 LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime::
 	closemessage
 	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
-	warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4
+	warp MAP_BIRTH_ISLAND_HARBOR, 8, 4
 	waitstate
 	release
 	end
@@ -281,7 +281,7 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime::
 	call_if_eq LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast
 	setvar VAR_0x8004, LOCALID_SS_TIDAL
 	call Common_EventScript_FerryDepart
-	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
+	warp MAP_FARAWAY_ISLAND_ENTRANCE, 13, 38
 	waitstate
 	release
 	end
@@ -289,7 +289,7 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime::
 LilycoveCity_Harbor_EventScript_GoToFarawayIslandFirstTime::
 	closemessage
 	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
-	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
+	warp MAP_FARAWAY_ISLAND_ENTRANCE, 13, 38
 	waitstate
 	release
 	end
@@ -306,7 +306,7 @@ LilycoveCity_Harbor_EventScript_MysticTicketFirstTime::
 LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime::
 	closemessage
 	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
-	warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4
+	warp MAP_NAVEL_ROCK_HARBOR, 8, 4
 	waitstate
 	release
 	end
@@ -399,7 +399,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateportUnused::
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE
 	call LilycoveCity_Harbor_EventScript_BoardFerry
-	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
+	warp MAP_SS_TIDAL_CORRIDOR, 1, 10
 	waitstate
 	release
 	end
@@ -410,7 +410,7 @@ LilycoveCity_Harbor_EventScript_GoToBattleFrontierUnused::
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
 	call LilycoveCity_Harbor_EventScript_BoardFerry
-	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
+	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 19, 67
 	waitstate
 	release
 	end

data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc

@@ -52,7 +52,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth
 	waitmovement 0
-	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
+	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 11, 8
 	waitstate
 	end
 
@@ -60,7 +60,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest
 	waitmovement 0
-	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
+	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 11, 8
 	waitstate
 	end
 
@@ -68,7 +68,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast
 	waitmovement 0
-	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
+	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 11, 8
 	waitstate
 	end
 

data/maps/LittlerootTown/scripts.inc

@@ -129,7 +129,7 @@ LittlerootTown_EventScript_StepOffTruckMale::
 	setvar VAR_0x8005, 8
 	call LittlerootTown_EventScript_GoInsideWithMom
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
-	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
+	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 8, 8
 	waitstate
 	releaseall
 	end
@@ -140,7 +140,7 @@ LittlerootTown_EventScript_StepOffTruckFemale::
 	setvar VAR_0x8005, 8
 	call LittlerootTown_EventScript_GoInsideWithMom
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
-	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
+	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 2, 8
 	waitstate
 	releaseall
 	end
@@ -230,7 +230,7 @@ LittlerootTown_EventScript_BeginDexUpgradeScene::
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 	delay 20
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
-	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
+	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 6, 5
 	waitstate
 	releaseall
 	end

data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc

@@ -70,7 +70,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock::
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs
 	applymovement LOCALID_MOM, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs
 	waitmovement 0
-	warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1
+	warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 7, 1
 	waitstate
 	releaseall
 	end

data/maps/LittlerootTown_MaysHouse_1F/scripts.inc

@@ -69,7 +69,7 @@ LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock::
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs
 	applymovement LOCALID_MOM, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs
 	waitmovement 0
-	warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1
+	warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 1, 1
 	waitstate
 	releaseall
 	end

data/maps/MarineCave_Entrance/scripts.inc

@@ -3,6 +3,6 @@ MarineCave_Entrance_MapScripts::
 	.byte 0
 
 MarineCave_Entrance_OnResume:
-	setdivewarp MAP_UNDERWATER_MARINE_CAVE, 255, 9, 6
+	setdivewarp MAP_UNDERWATER_MARINE_CAVE, 9, 6
 	end
 

data/maps/MirageTower_2F/scripts.inc

@@ -6,6 +6,6 @@ MirageTower_2F_MapScripts::
 
 MirageTower_2F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
-	setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0
+	setholewarp MAP_MIRAGE_TOWER_1F
 	end
 

data/maps/MirageTower_3F/scripts.inc

@@ -6,6 +6,6 @@ MirageTower_3F_MapScripts::
 
 MirageTower_3F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
-	setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0
+	setholewarp MAP_MIRAGE_TOWER_2F
 	end
 

data/maps/MirageTower_4F/scripts.inc

@@ -57,7 +57,7 @@ MirageTower_4F_EventScript_CollapseMirageTower::
 	waitstate
 	setvar VAR_MIRAGE_TOWER_STATE, 1
 	clearflag FLAG_LANDMARK_MIRAGE_TOWER
-	warp MAP_ROUTE111, 255, 19, 59
+	warp MAP_ROUTE111, 19, 59
 	waitstate
 	release
 	end

data/maps/MossdeepCity_Gym/scripts.inc

@@ -201,7 +201,7 @@ MossdeepCity_Gym_EventScript_ClearSwitch4::
 
 MossdeepCity_Gym_EventScript_WarpToEntrance::
 	lockall
-	warpmossdeepgym MAP_MOSSDEEP_CITY_GYM, 255, 7, 30
+	warpmossdeepgym MAP_MOSSDEEP_CITY_GYM, 7, 30
 	waitstate
 	releaseall
 	end

data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc

@@ -54,7 +54,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts::
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit
 	waitmovement 0
-	warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1
+	warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 13, 1
 	waitstate
 	releaseall
 	end

data/maps/MtPyre_2F/scripts.inc

@@ -6,7 +6,7 @@ MtPyre_2F_MapScripts::
 
 MtPyre_2F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
-	setholewarp MAP_MT_PYRE_1F, 255, 0, 0
+	setholewarp MAP_MT_PYRE_1F
 	end
 
 MtPyre_2F_EventScript_Woman::

data/maps/NavelRock_Harbor/scripts.inc

@@ -18,7 +18,7 @@ NavelRock_Harbor_EventScript_Sailor::
 	hideobjectat LOCALID_SAILOR, MAP_NAVEL_ROCK_HARBOR
 	setvar VAR_0x8004, LOCALID_SS_TIDAL
 	call Common_EventScript_FerryDepartIsland
-	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	warp MAP_LILYCOVE_CITY_HARBOR, 8, 11
 	waitstate
 	release
 	end

data/maps/PetalburgCity/scripts.inc

@@ -60,7 +60,7 @@ PetalburgCity_EventScript_WallyTutorial::
 	clearflag FLAG_DONT_TRANSITION_MUSIC
 	special LoadPlayerParty
 	setvar VAR_PETALBURG_GYM_STATE, 1
-	warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
+	warp MAP_PETALBURG_CITY_GYM, 4, 108
 	waitstate
 	releaseall
 	end
@@ -85,7 +85,7 @@ PetalburgCity_EventScript_WalkToWallyHouse::
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	fadedefaultbgm
 	clearflag FLAG_DONT_TRANSITION_MUSIC
-	warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4
+	warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 2, 4
 	waitstate
 	releaseall
 	end

data/maps/PetalburgCity_Gym/scripts.inc

@@ -220,7 +220,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial::
 	clearflag FLAG_HIDE_PETALBURG_GYM_WALLY
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
 	special InitBirchState
-	warp MAP_PETALBURG_CITY, 255, 15, 8
+	warp MAP_PETALBURG_CITY, 15, 8
 	waitstate
 	release
 	end
@@ -497,7 +497,7 @@ PetalburgCity_Gym_EventScript_WallysDadArrives::
 	removeobject LOCALID_WALLYS_DAD
 	setvar VAR_PETALBURG_CITY_STATE, 4
 	clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
-	warp MAP_PETALBURG_CITY, 255, 15, 8
+	warp MAP_PETALBURG_CITY, 15, 8
 	waitstate
 	release
 	end
@@ -796,7 +796,7 @@ PetalburgCity_Gym_EventScript_SpeedRoomDoor::
 PetalburgCity_Gym_EventScript_EnterRoom::
 	closemessage
 	delay 30
-	warpdoor MAP_PETALBURG_CITY_GYM, 255, VAR_0x8008, VAR_0x8009
+	warpdoor MAP_PETALBURG_CITY_GYM, VAR_0x8008, VAR_0x8009
 	waitstate
 	releaseall
 	end

data/maps/Route101/scripts.inc

@@ -245,7 +245,7 @@ Route101_EventScript_BirchsBag::
 	call_if_eq Route101_EventScript_HideMayInBedroom
 	compare VAR_RESULT, FEMALE
 	call_if_eq Route101_EventScript_HideBrendanInBedroom
-	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
+	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 6, 5
 	waitstate
 	release
 	end

data/maps/Route104_MrBrineysHouse/scripts.inc

@@ -86,7 +86,7 @@ Route104_MrBrineysHouse_EventScript_SailToDewford::
 	setvar VAR_ROUTE104_STATE, 2
 	setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
 	setflag FLAG_HIDE_ROUTE_104_RIVAL
-	warp MAP_ROUTE104, 255, 13, 51
+	warp MAP_ROUTE104, 13, 51
 	waitstate
 	releaseall
 	end

data/maps/Route110_TrickHouseEntrance/scripts.inc

@@ -269,7 +269,7 @@ Route110_TrickHouseEntrance_EventScript_FoundTrickMaster::
 	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion
 	closemessage
 	setvar VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1
-	warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
+	warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 6, 2
 	waitstate
 	releaseall
 	end
@@ -535,49 +535,49 @@ Route110_TrickHouseEntrance_Movement_EnterRoom:
 	step_end
 
 Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1::
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 0, 21
 	waitstate
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2::
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 0, 21
 	waitstate
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3::
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 0, 21
 	waitstate
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4::
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 0, 21
 	waitstate
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5::
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 0, 21
 	waitstate
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6::
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 0, 21
 	waitstate
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7::
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 0, 21
 	waitstate
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8::
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 0, 21
 	waitstate
 	releaseall
 	end

data/maps/Route110_TrickHousePuzzle5/scripts.inc

@@ -465,7 +465,7 @@ Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer::
 	waitmovement 0
 	msgbox Route110_TrickHousePuzzle5_Text_WaitForNextChallenge, MSGBOX_DEFAULT
 	closemessage
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 0, 21
 	waitstate
 	releaseall
 	end

data/maps/Route110_TrickHousePuzzle7/scripts.inc

@@ -113,7 +113,7 @@ Route110_TrickHousePuzzle7_EventScript_FoundScroll::
 Route110_TrickHousePuzzle7_EventScript_TeleportPad::
 	lockall
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
-	warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19
+	warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 3, 19
 	waitstate
 	releaseall
 	end

data/maps/Route112_CableCarStation/scripts.inc

@@ -6,7 +6,7 @@ Route112_CableCarStation_MapScripts::
 	.byte 0
 
 Route112_CableCarStation_OnTransition:
-	setescapewarp MAP_ROUTE112, 255, 28, 28
+	setescapewarp MAP_ROUTE112, 28, 28
 	compare VAR_CABLE_CAR_STATION_STATE, 2
 	call_if_eq Route112_CableCarStation_EventScript_MoveAttendantAside
 	end

data/maps/Route121_SafariZoneEntrance/scripts.inc

@@ -80,7 +80,7 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone::
 	special EnterSafariMode
 	setvar VAR_SAFARI_ZONE_STATE, 2
 	clearflag FLAG_GOOD_LUCK_SAFARI_ZONE
-	warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33
+	warp MAP_SAFARI_ZONE_SOUTH, 32, 33
 	waitstate
 	end
 

data/maps/Route134/scripts.inc

@@ -3,7 +3,7 @@ Route134_MapScripts::
 	.byte 0
 
 Route134_OnResume:
-	setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6
+	setdivewarp MAP_UNDERWATER_ROUTE134, 8, 6
 	end
 
 Route134_EventScript_Jack::

data/maps/RustboroCity/scripts.inc

@@ -621,7 +621,7 @@ RustboroCity_EventScript_ReturnGoods::
 	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
 	setvar VAR_RUSTBORO_CITY_STATE, 5
 	delay 30
-	warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
+	warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 2, 2
 	waitstate
 	releaseall
 	end

data/maps/SSTidalCorridor/scripts.inc

@@ -129,7 +129,7 @@ SSTidalCorridor_EventScript_ExitLilycove::
 	setrespawn HEAL_LOCATION_LILYCOVE_CITY
 	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
 	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
-	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	warp MAP_LILYCOVE_CITY_HARBOR, 8, 11
 	waitstate
 	release
 	end
@@ -138,7 +138,7 @@ SSTidalCorridor_EventScript_ExitSlateport::
 	setrespawn HEAL_LOCATION_SLATEPORT_CITY
 	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
 	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
-	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
+	warp MAP_SLATEPORT_CITY_HARBOR, 8, 11
 	waitstate
 	release
 	end

data/maps/SafariZone_South/scripts.inc

@@ -94,7 +94,7 @@ SafariZone_South_EventScript_ExitEarlyEast::
 SafariZone_South_EventScript_Exit::
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
-	warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
+	warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 2, 5
 	waitstate
 	end
 

data/maps/SeafloorCavern_Entrance/scripts.inc

@@ -5,8 +5,8 @@ SeafloorCavern_Entrance_MapScripts::
 	.byte 0
 
 SeafloorCavern_Entrance_OnResume:
-	setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
-	setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
+	setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 6, 5
+	setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 6, 5
 	end
 
 SeafloorCavern_Entrance_EventScript_Grunt::

data/maps/SeafloorCavern_Room9/scripts.inc

@@ -145,7 +145,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre::
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
 	setflag FLAG_HIDE_MAP_NAME_POPUP
-	warp MAP_ROUTE128, 255, 38, 22
+	warp MAP_ROUTE128, 38, 22
 	waitstate
 	releaseall
 	end

data/maps/SealedChamber_OuterRoom/scripts.inc

@@ -5,8 +5,8 @@ SealedChamber_OuterRoom_MapScripts::
 	.byte 0
 
 SealedChamber_OuterRoom_OnResume:
-	setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
-	setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
+	setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 12, 44
+	setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 12, 44
 	end
 
 SealedChamber_OuterRoom_OnTransition:

data/maps/SkyPillar_2F/scripts.inc

@@ -16,6 +16,6 @@ SkyPillar_2F_EventScript_CleanFloor::
 
 SkyPillar_2F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
-	setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0
+	setholewarp MAP_SKY_PILLAR_1F
 	end
 

data/maps/SkyPillar_4F/scripts.inc

@@ -16,6 +16,6 @@ SkyPillar_4F_EventScript_CleanFloor::
 
 SkyPillar_4F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
-	setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0
+	setholewarp MAP_SKY_PILLAR_3F
 	end
 

data/maps/SlateportCity/scripts.inc

@@ -635,7 +635,7 @@ SlateportCity_EventScript_CaptStern::
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
 	setvar VAR_SLATEPORT_CITY_STATE, 2
-	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
+	warp MAP_SLATEPORT_CITY_HARBOR, 11, 14
 	waitstate
 	releaseall
 	end

data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc

@@ -68,7 +68,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom::
 SlateportCity_BattleTent_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
-	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
+	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 6, 6
 	waitstate
 @ forced stop
 
@@ -79,14 +79,14 @@ SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent::
 	switch VAR_RESULT
 	case 3, SlateportCity_BattleTentBattleRoom_EventScript_WarpToLobbyWon
 	setvar VAR_0x8006, 1
-	warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3
+	warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 2, 3
 	waitstate
 @ forced stop
 
 SlateportCity_BattleTentBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
-	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
+	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 6, 6
 	waitstate
 @ forced stop
 

data/maps/SlateportCity_BattleTentCorridor/scripts.inc

@@ -52,7 +52,7 @@ SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom::
 	waitmovement 0
 	closedoor 2, 1
 	waitdooranim
-	warp MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4
+	warp MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 4, 4
 	waitstate
 	end
 

data/maps/SlateportCity_BattleTentLobby/scripts.inc

@@ -134,7 +134,7 @@ SlateportCity_BattleTentLobby_EventScript_EnterChallenge::
 	msgbox SlateportCity_BattleTentLobby_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
 	call SlateportCity_BattleTentLobby_EventScript_WalkToDoor
-	warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7
+	warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 2, 7
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/maps/SlateportCity_Harbor/scripts.inc

@@ -9,7 +9,7 @@ SlateportCity_Harbor_MapScripts::
 	.byte 0
 
 SlateportCity_Harbor_OnTransition:
-	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
+	setescapewarp MAP_SLATEPORT_CITY, 28, 13
 	setvar VAR_TEMP_1, 0
 	compare VAR_SLATEPORT_HARBOR_STATE, 1
 	call_if_eq SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene
@@ -210,7 +210,7 @@ SlateportCity_Harbor_EventScript_Lilycove::
 	goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT
 	call SlateportCity_Harbor_EventScript_BoardFerry
-	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
+	warp MAP_SS_TIDAL_CORRIDOR, 1, 10
 	waitstate
 	release
 	end
@@ -220,7 +220,7 @@ SlateportCity_Harbor_EventScript_BattleFrontier::
 	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
 	call SlateportCity_Harbor_EventScript_BoardFerry
-	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
+	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 19, 67
 	waitstate
 	release
 	end

data/maps/SootopolisCity/scripts.inc

@@ -206,7 +206,7 @@ SootopolisCity_EventScript_PlayerFaceLegendaries2::
 	return
 
 SootopolisCity_OnResume:
-	setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6
+	setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 9, 6
 	end
 
 SootopolisCity_OnFrame:
@@ -565,7 +565,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter::
 	fadenewbgm MUS_SOOTOPOLIS
 	delay 120
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
-	warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 43, 32
+	warpsootopolislegend MAP_SOOTOPOLIS_CITY, 43, 32
 	waitstate
 	end
 
@@ -618,7 +618,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive::
 	fadenewbgm MUS_SURF
 	delay 120
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
-	warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 29, 53
+	warpsootopolislegend MAP_SOOTOPOLIS_CITY, 29, 53
 	waitstate
 	end
 
@@ -1003,7 +1003,7 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin::
 	setflag FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin
 	waitmovement 0
-	warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20
+	warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 9, 20
 	waitstate
 	end
 
@@ -1460,7 +1460,7 @@ SootopolisCity_EventScript_MaxieArchieLeave::
 	clearflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE
 	clearflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
 	setvar VAR_MT_PYRE_STATE, 2
-	warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34
+	warpsilent MAP_SOOTOPOLIS_CITY, 31, 34
 	waitstate
 	releaseall
 	end

data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc

@@ -115,7 +115,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_TrainerVisiting::
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementEast
 	compare VAR_FACING, DIR_WEST
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementWest
-	warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1
+	warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 3, 1
 	waitstate
 	release
 	end

data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc

@@ -34,7 +34,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer::
 	waitmovement 0
 	special LoadPlayerParty
 	setvar VAR_TEMP_1, 1
-	warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1
+	warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 3, 1
 	waitstate
 	releaseall
 	end

data/maps/SouthernIsland_Exterior/scripts.inc

@@ -23,7 +23,7 @@ SouthernIsland_Exterior_EventScript_Sailor::
 	hideobjectat LOCALID_SAILOR, MAP_SOUTHERN_ISLAND_EXTERIOR
 	setvar VAR_0x8004, LOCALID_SS_TIDAL
 	call Common_EventScript_FerryDepartIsland
-	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	warp MAP_LILYCOVE_CITY_HARBOR, 8, 11
 	waitstate
 	release
 	end

data/maps/TrainerHill_Elevator/scripts.inc

@@ -15,7 +15,7 @@ TrainerHill_Elevator_EventScript_ExitToRoof::
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof
 	waitmovement 0
 	releaseall
-	warp MAP_TRAINER_HILL_ROOF, 255, 15, 5
+	warp MAP_TRAINER_HILL_ROOF, 15, 5
 	waitstate
 	end
 
@@ -37,7 +37,7 @@ TrainerHill_Elevator_EventScript_EnterElevator::
 	delay 25
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevator
 	waitmovement 0
-	warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8
+	warp MAP_TRAINER_HILL_ENTRANCE, 17, 8
 	waitstate
 	end
 

data/maps/Underwater_MarineCave/scripts.inc

@@ -8,6 +8,6 @@ Underwater_MarineCave_OnTransition:
 	end
 
 Underwater_MarineCave_OnResume:
-	setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17
+	setdivewarp MAP_MARINE_CAVE_ENTRANCE, 10, 17
 	end
 

data/maps/Underwater_Route134/scripts.inc

@@ -3,6 +3,6 @@ Underwater_Route134_MapScripts::
 	.byte 0
 
 Underwater_Route134_OnResume:
-	setdivewarp MAP_ROUTE134, 255, 60, 31
+	setdivewarp MAP_ROUTE134, 60, 31
 	end
 

data/maps/Underwater_SeafloorCavern/scripts.inc

@@ -33,7 +33,7 @@ Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles::
 	return
 
 Underwater_SeafloorCavern_OnResume:
-	setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17
+	setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 10, 17
 	end
 
 Underwater_SeafloorCavern_EventScript_CheckStolenSub::

data/maps/Underwater_SealedChamber/scripts.inc

@@ -11,11 +11,11 @@ Underwater_SealedChamber_OnDive:
 	goto Underwater_SealedChamber_EventScript_SurfaceSealedChamber
 
 Underwater_SealedChamber_EventScript_SurfaceRoute134::
-	setdivewarp MAP_ROUTE134, 255, 60, 31
+	setdivewarp MAP_ROUTE134, 60, 31
 	end
 
 Underwater_SealedChamber_EventScript_SurfaceSealedChamber::
-	setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19
+	setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 10, 19
 	end
 
 Underwater_SealedChamber_EventScript_Braille::

data/maps/Underwater_SootopolisCity/scripts.inc

@@ -3,6 +3,6 @@ Underwater_SootopolisCity_MapScripts::
 	.byte 0
 
 Underwater_SootopolisCity_OnResume:
-	setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53
+	setdivewarp MAP_SOOTOPOLIS_CITY, 29, 53
 	end
 

data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc

@@ -59,7 +59,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter::
 VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
-	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
+	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 6, 6
 	waitstate
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent::
@@ -120,7 +120,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_ContinueChallenge::
 VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
-	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
+	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 6, 6
 	waitstate
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_PauseChallenge::

data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc

@@ -22,7 +22,7 @@ VerdanturfTown_BattleTentCorridor_EventScript_EnterCorridor::
 	closedoor 2, 1
 	waitdooranim
 	setvar VAR_0x8006, 0
-	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5
+	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 6, 5
 	waitstate
 	releaseall
 	end

data/maps/VerdanturfTown_BattleTentLobby/scripts.inc

@@ -162,7 +162,7 @@ VerdanturfTown_BattleTentLobby_EventScript_EnterChallenge::
 	msgbox VerdanturfTown_BattleTentLobby_Text_NowFollowMe, MSGBOX_DEFAULT
 	closemessage
 	call VerdanturfTown_BattleTentLobby_EventScript_WalkToDoor
-	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
+	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 2, 7
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end

data/scripts/abnormal_weather.inc

@@ -394,33 +394,33 @@ AbnormalWeather_Underwater_SetupEscapeWarp::
 	return
 
 AbnormalWeather_Underwater_SetupEscapeWarpRoute105North::
-	setescapewarp MAP_ROUTE105, 255, 11, 29
+	setescapewarp MAP_ROUTE105, 11, 29
 	return
 
 AbnormalWeather_Underwater_SetupEscapeWarpRoute105South::
-	setescapewarp MAP_ROUTE105, 255, 21, 54
+	setescapewarp MAP_ROUTE105, 21, 54
 	return
 
 AbnormalWeather_Underwater_SetupEscapeWarpRoute125West::
-	setescapewarp MAP_ROUTE125, 255, 9, 17
+	setescapewarp MAP_ROUTE125, 9, 17
 	return
 
 AbnormalWeather_Underwater_SetupEscapeWarpRoute125East::
-	setescapewarp MAP_ROUTE125, 255, 54, 19
+	setescapewarp MAP_ROUTE125, 54, 19
 	return
 
 AbnormalWeather_Underwater_SetupEscapeWarpRoute127North::
-	setescapewarp MAP_ROUTE127, 255, 58, 10
+	setescapewarp MAP_ROUTE127, 58, 10
 	return
 
 AbnormalWeather_Underwater_SetupEscapeWarpRoute127South::
-	setescapewarp MAP_ROUTE127, 255, 62, 31
+	setescapewarp MAP_ROUTE127, 62, 31
 	return
 
 AbnormalWeather_Underwater_SetupEscapeWarpRoute129West::
-	setescapewarp MAP_ROUTE129, 255, 17, 15
+	setescapewarp MAP_ROUTE129, 17, 15
 	return
 
 AbnormalWeather_Underwater_SetupEscapeWarpRoute129East::
-	setescapewarp MAP_ROUTE129, 255, 43, 20
+	setescapewarp MAP_ROUTE129, 43, 20
 	return

data/scripts/battle_pike.inc

@@ -114,7 +114,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
 	waitmovement 0
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
-	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL, 255, 4, 7
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL, 4, 7
 	waitstate
 	end
 
@@ -122,7 +122,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
 	waitmovement 0
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
-	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS, 255, 4, 19
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS, 4, 19
 	waitstate
 	end
 
@@ -184,14 +184,14 @@ BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
 	waitmovement 0
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
-	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL, 255, 2, 7
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL, 2, 7
 	return
 
 BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
 	waitmovement 0
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
-	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 6, 10
 	return
 
 BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit::
@@ -230,7 +230,7 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack::
 
 BattleFrontier_BattlePike_EventScript_Retire::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS CHALLENGE_STATUS_LOST
-	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 5, 6
 	waitstate
 	end
 

data/scripts/cable_club.inc

@@ -388,7 +388,7 @@ CableClub_EventScript_EnterColosseum::
 	compare VAR_0x8004, USING_MULTI_BATTLE
 	goto_if_eq CableClub_EventScript_WarpTo4PColosseum
 	special SetCableClubWarp
-	warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8
+	warp MAP_BATTLE_COLOSSEUM_2P, 6, 8
 	special DoCableClubWarp
 	waitstate
 	end
@@ -401,7 +401,7 @@ CableClub_EventScript_PlayerApproachLinkRoomRight::
 
 CableClub_EventScript_WarpTo4PColosseum::
 	special SetCableClubWarp
-	warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8
+	warp MAP_BATTLE_COLOSSEUM_4P, 5, 8
 	special DoCableClubWarp
 	waitstate
 	end
@@ -491,7 +491,7 @@ CableClub_EventScript_EnterTradeCenter::
 	waitdooranim
 	release
 	special SetCableClubWarp
-	setwarp MAP_TRADE_CENTER, 255, 5, 8
+	setwarp MAP_TRADE_CENTER, 5, 8
 	special DoCableClubWarp
 	waitstate
 	end
@@ -566,7 +566,7 @@ CableClub_EventScript_EnterRecordCorner::
 	waitdooranim
 	release
 	special SetCableClubWarp
-	setwarp MAP_RECORD_CORNER, 255, 8, 9
+	setwarp MAP_RECORD_CORNER, 8, 9
 	special DoCableClubWarp
 	waitstate
 	end
@@ -968,7 +968,7 @@ CableClub_EventScript_EnterUnionRoom::
 	waitdooranim
 	special Script_ResetUnionRoomTrade
 	special SetCableClubWarp
-	warpteleport2 MAP_UNION_ROOM, 255, 7, 11
+	warpspinenter MAP_UNION_ROOM, 7, 11
 	waitstate
 	special RunUnionRoom
 	waitstate