Handle optional arguments for warp commands, add WARP_ID_NONE

5 files changed, 22 insertions, 22 deletions

diff --git a/data/scripts/abnormal_weather.inc b/data/scripts/abnormal_weather.inc
index 9af24c45d..bc4a867e3 100644
--- a/data/scripts/abnormal_weather.inc
+++ b/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
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index 3260bcfd8..e11f99762 100644
--- a/data/scripts/battle_pike.inc
+++ b/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
 
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index ea9a2b4e3..714792fc6 100644
--- a/data/scripts/cable_club.inc
+++ b/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
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 6dd0767f0..3b7d85a67 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -1,13 +1,13 @@
 SafariZone_EventScript_OutOfBallsMidBattle::
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
-	setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
+	setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 2, 5
 	end
 
 SafariZone_EventScript_Exit::
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
-	warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
+	warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 2, 5
 	waitstate
 	end
 
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index f3ba5f035..8804b71b0 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -41,7 +41,7 @@ TrainerHill_1F_EventScript_DummyWarpToEntranceCounter::
 
 @ Never reached
 TrainerHill_1F_EventScript_WarpSilentToEntranceCounter::
-	warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
+	warpsilent MAP_TRAINER_HILL_ENTRANCE, 9, 6
 	waitstate
 	end
 
@@ -53,7 +53,7 @@ TrainerHill_1F_EventScript_Lost::
 
 TrainerHill_EventScript_WarpToEntranceCounter::
 	setvar VAR_TEMP_1, 0
-	warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
+	warp MAP_TRAINER_HILL_ENTRANCE, 9, 6
 	waitstate
 	end