.TriggerX labels are now consistently 0-based

24 files changed, 82 insertions, 82 deletions

diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 1657557f5..9a842b8f4 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -17,9 +17,9 @@ AzaleaTown_MapScriptHeader:
 	db 3
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
 	dw .Trigger2, 0
-	dw .Trigger3, 0
 
 .MapCallbacks:
 	db 1
@@ -27,13 +27,13 @@ AzaleaTown_MapScriptHeader:
 	; callbacks
 	dbw 5, .Flypoint
 
-.Trigger1
+.Trigger0
 	end
 
-.Trigger2
+.Trigger1
 	end
 
-.Trigger3
+.Trigger2
 	end
 
 .Flypoint
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 71eecaf50..fb60a3132 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -10,8 +10,8 @@ CherrygroveCity_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 1
@@ -19,10 +19,10 @@ CherrygroveCity_MapScriptHeader:
 	; callbacks
 	dbw 5, .FlyPoint
 
-.Trigger1
+.Trigger0
 	end
 
-.Trigger2
+.Trigger1
 	end
 
 .FlyPoint
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 70d7d455d..4babcd4f9 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -17,8 +17,8 @@ CianwoodCity_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 1
@@ -26,10 +26,10 @@ CianwoodCity_MapScriptHeader:
 	; callbacks
 	dbw 5, .FlyPointAndSuicune
 
-.Trigger1
+.Trigger0
 	end
 
-.Trigger2
+.Trigger1
 	end
 
 .FlyPointAndSuicune
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index a5c109757..b4383ac75 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -7,9 +7,9 @@ Colosseum_MapScriptHeader:
 	db 3
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
 	dw .Trigger2, 0
-	dw .Trigger3, 0
 
 .MapCallbacks:
 	db 2
@@ -20,14 +20,14 @@ Colosseum_MapScriptHeader:
 
 	dbw 5, ColosseumScript_InitializeCB
 
-.Trigger1:
+.Trigger0:
 	priorityjump ColosseumScript_Initialize
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
-.Trigger3:
+.Trigger2:
 	end
 
 ColosseumScript_SetWhichChris:
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 21b17c640..8dadee3f7 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -9,17 +9,17 @@ DragonShrine_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 0
 
-.Trigger1:
+.Trigger0:
 	priorityjump DragonShrineTestScript
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
 DragonShrineTestScript:
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 538392c78..39b781935 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -14,8 +14,8 @@ DragonsDenB1F_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 1
@@ -24,10 +24,10 @@ DragonsDenB1F_MapScriptHeader:
 
 	dbw 5, .CheckSilver
 
-.Trigger1:
+.Trigger0:
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
 .CheckSilver:
diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm
index c7873273d..e8de95bc7 100644
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -9,8 +9,8 @@ EcruteakHouse_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 1
@@ -19,10 +19,10 @@ EcruteakHouse_MapScriptHeader:
 
 	dbw 2, .InitializeSages
 
-.Trigger1:
+.Trigger0:
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
 .InitializeSages:
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 2904f9b7d..40335d6df 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -9,21 +9,21 @@ FastShip1F_MapScriptHeader:
 	db 3
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
 	dw .Trigger2, 0
-	dw .Trigger3, 0
 
 .MapCallbacks:
 	db 0
 
-.Trigger1:
+.Trigger0:
 	end
 
-.Trigger2:
+.Trigger1:
 	priorityjump .PriorityJump2
 	end
 
-.Trigger3:
+.Trigger2:
 	end
 
 .PriorityJump2:
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index 08ea69c4f..a8276d1cf 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -7,12 +7,12 @@ GoldenrodMagnetTrainStation_MapScriptHeader:
 	db 1
 
 	; triggers
-	dw .Trigger1, 0
+	dw .Trigger0, 0
 
 .MapCallbacks:
 	db 0
 
-.Trigger1:
+.Trigger0:
 	end
 
 OfficerScript_0x550ec:
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 879b4cae7..c8ee751a1 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -6,17 +6,17 @@ HallOfFame_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 0
 
-.Trigger1:
+.Trigger0:
 	priorityjump HallOfFameScript
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
 HallOfFameScript:
diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm
index bec992b47..a62f04cb9 100644
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -17,8 +17,8 @@ LakeofRage_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 2
@@ -28,10 +28,10 @@ LakeofRage_MapScriptHeader:
 	dbw 5, .FlyPoint
 	dbw 2, .Wesley
 
-.Trigger1
+.Trigger0
 	end
 
-.Trigger2
+.Trigger1
 	end
 
 .FlyPoint
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index e56f898e6..1e0a13fff 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -9,8 +9,8 @@ MahoganyTown_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 1
@@ -18,10 +18,10 @@ MahoganyTown_MapScriptHeader:
 	; callbacks
 	dbw 5, .FlyPoint
 
-.Trigger1
+.Trigger0
 	end
 
-.Trigger2
+.Trigger1
 	end
 
 .FlyPoint
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 3a06dd87d..b781e44b8 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -5,17 +5,17 @@ MobileBattleRoom_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 0
 
-.Trigger1:
+.Trigger0:
 	priorityjump MobileBattleRoom_Initialize
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
 MobileBattleRoom_Initialize:
diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm
index 6e81467b8..422945de9 100644
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -5,17 +5,17 @@ MobileTradeRoomMobile_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 0
 
-.Trigger1:
+.Trigger0:
 	priorityjump MobileTradeRoomMobile_Initialize
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
 MobileTradeRoomMobile_Initialize:
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index ffb55d97d..1743f4726 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -8,8 +8,8 @@ NewBarkTown_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 1
@@ -17,10 +17,10 @@ NewBarkTown_MapScriptHeader:
 	; callbacks
 	dbw 5, .FlyPoint
 
-.Trigger1
+.Trigger0
 	end
 
-.Trigger2
+.Trigger1
 	end
 
 .FlyPoint
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index e643524b0..09c4a26c7 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -9,8 +9,8 @@ OlivineCity_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 1
@@ -18,10 +18,10 @@ OlivineCity_MapScriptHeader:
 	; callbacks
 	dbw 5, .FlyPoint
 
-.Trigger1
+.Trigger0
 	end
 
-.Trigger2
+.Trigger1
 	end
 
 .FlyPoint
diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm
index c9d6922c6..60f34aa19 100644
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -9,44 +9,44 @@ PokeCenter2F_MapScriptHeader:
 	db 6
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
 	dw .Trigger2, 0
 	dw .Trigger3, 0
 	dw .Trigger4, 0
 	dw .Trigger5, 0
-	dw .Trigger6, 0
 
 .MapCallbacks:
 	db 0
 
-.Trigger1:
+.Trigger0:
 	special Special_CheckMysteryGift
-	if_equal $0, .Trigger1Done
+	if_equal $0, .Trigger0Done
 	clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
 	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
-	iftrue .Trigger1Done
+	iftrue .Trigger0Done
 	priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy
 
-.Trigger1Done:
+.Trigger0Done:
 	end
 
-.Trigger2:
+.Trigger1:
 	priorityjump Script_LeftCableTradeCenter
 	end
 
-.Trigger3:
+.Trigger2:
 	priorityjump Script_LeftCableColosseum
 	end
 
-.Trigger4:
+.Trigger3:
 	priorityjump Script_LeftTimeCapsule
 	end
 
-.Trigger5:
+.Trigger4:
 	priorityjump Script_LeftMobileTradeRoom
 	end
 
-.Trigger6:
+.Trigger5:
 	priorityjump Script_LeftMobileBattleRoom
 	end
 
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index d62f6c4f0..0a93c0d98 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -17,9 +17,9 @@ Route36NationalParkgate_MapScriptHeader:
 	db 3
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
 	dw .Trigger2, 0
-	dw .Trigger3, 0
 
 .MapCallbacks:
 	db 2
@@ -30,13 +30,13 @@ Route36NationalParkgate_MapScriptHeader:
 
 	dbw 2, .CheckIfContestAvailable
 
-.Trigger1:
+.Trigger0:
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
-.Trigger3:
+.Trigger2:
 	priorityjump .LeftTheContestEarly
 	end
 
diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm
index 6a5de5a7b..cce353350 100644
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -9,12 +9,12 @@ SaffronTrainStation_MapScriptHeader:
 	db 1
 
 	; triggers
-	dw .Trigger1, 0
+	dw .Trigger0, 0
 
 .MapCallbacks:
 	db 0
 
-.Trigger1:
+.Trigger0:
 	end
 
 OfficerScript_0x18a81e:
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 90d846cf8..b19badb05 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -11,7 +11,7 @@ TeamRocketBaseB1F_MapScriptHeader:
 	db 1
 
 	; triggers
-	dw .Trigger1, 0
+	dw .Trigger0, 0
 
 .MapCallbacks:
 	db 1
@@ -20,7 +20,7 @@ TeamRocketBaseB1F_MapScriptHeader:
 
 	dbw 2, .Callback1
 
-.Trigger1:
+.Trigger0:
 	end
 
 .Callback1:
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 06eb0c9ec..068221626 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -19,10 +19,10 @@ TeamRocketBaseB3F_MapScriptHeader:
 	db 4
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
 	dw .Trigger2, 0
 	dw .Trigger3, 0
-	dw .Trigger4, 0
 
 .MapCallbacks:
 	db 1
@@ -31,17 +31,17 @@ TeamRocketBaseB3F_MapScriptHeader:
 
 	dbw 1, .CheckGiovanniDoor
 
-.Trigger1:
+.Trigger0:
 	priorityjump LanceScript_0x6dffc
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
-.Trigger3:
+.Trigger2:
 	end
 
-.Trigger4:
+.Trigger3:
 	end
 
 .CheckGiovanniDoor:
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 682c44aca..e543c352f 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -7,8 +7,8 @@ TimeCapsule_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 1
@@ -17,11 +17,11 @@ TimeCapsule_MapScriptHeader:
 
 	dbw 2, TimeCapsule_SetWhichChris
 
-.Trigger1:
+.Trigger0:
 	priorityjump TimeCapsule_Initialize
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
 TimeCapsule_SetWhichChris:
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index ca889a009..3abad85e7 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -7,8 +7,8 @@ TradeCenter_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 1
@@ -17,11 +17,11 @@ TradeCenter_MapScriptHeader:
 
 	dbw 2, TradeCenter_SetWhichChris
 
-.Trigger1:
+.Trigger0:
 	priorityjump TradeCenter_Initialize
 	end
 
-.Trigger2:
+.Trigger1:
 	end
 
 TradeCenter_SetWhichChris:
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 677de3ab1..b3ccd1d4c 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -8,8 +8,8 @@ VermilionPort_MapScriptHeader:
 	db 2
 
 	; triggers
+	dw .Trigger0, 0
 	dw .Trigger1, 0
-	dw .Trigger2, 0
 
 .MapCallbacks:
 	db 1
@@ -17,10 +17,10 @@ VermilionPort_MapScriptHeader:
 	; callbacks
 	dbw 5, .FlyPoint
 
-.Trigger1
+.Trigger0
 	end
 
-.Trigger2
+.Trigger1
 	priorityjump UnknownScript_0x74da6
 	end