ref: 3980d2d7367a9352cfd245dd4c6e5b89b3c73648
parent: b9870541d4b6132f28bfaf3db168e6524bbb7b61
author: PikalaxALT <PikalaxALT@gmail.com>
date: Thu Dec 10 17:28:46 EST 2015
.TriggerX labels are now consistently 0-based
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -17,9 +17,9 @@
db 3
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
dw .Trigger2, 0
- dw .Trigger3, 0
.MapCallbacks:
db 1
@@ -27,13 +27,13 @@
; callbacks
dbw 5, .Flypoint
-.Trigger1
+.Trigger0
end
-.Trigger2
+.Trigger1
end
-.Trigger3
+.Trigger2
end
.Flypoint
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -10,8 +10,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -19,10 +19,10 @@
; callbacks
dbw 5, .FlyPoint
-.Trigger1
+.Trigger0
end
-.Trigger2
+.Trigger1
end
.FlyPoint
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -17,8 +17,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -26,10 +26,10 @@
; callbacks
dbw 5, .FlyPointAndSuicune
-.Trigger1
+.Trigger0
end
-.Trigger2
+.Trigger1
end
.FlyPointAndSuicune
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -7,9 +7,9 @@
db 3
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
dw .Trigger2, 0
- dw .Trigger3, 0
.MapCallbacks:
db 2
@@ -20,14 +20,14 @@
dbw 5, ColosseumScript_InitializeCB
-.Trigger1:
+.Trigger0:
priorityjump ColosseumScript_Initialize
end
-.Trigger2:
+.Trigger1:
end
-.Trigger3:
+.Trigger2:
end
ColosseumScript_SetWhichChris:
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -9,17 +9,17 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 0
-.Trigger1:
+.Trigger0:
priorityjump DragonShrineTestScript
end
-.Trigger2:
+.Trigger1:
end
DragonShrineTestScript:
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -14,8 +14,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -24,10 +24,10 @@
dbw 5, .CheckSilver
-.Trigger1:
+.Trigger0:
end
-.Trigger2:
+.Trigger1:
end
.CheckSilver:
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -9,8 +9,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -19,10 +19,10 @@
dbw 2, .InitializeSages
-.Trigger1:
+.Trigger0:
end
-.Trigger2:
+.Trigger1:
end
.InitializeSages:
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -9,21 +9,21 @@
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:
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -7,12 +7,12 @@
db 1
; triggers
- dw .Trigger1, 0
+ dw .Trigger0, 0
.MapCallbacks:
db 0
-.Trigger1:
+.Trigger0:
end
OfficerScript_0x550ec:
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -6,17 +6,17 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 0
-.Trigger1:
+.Trigger0:
priorityjump HallOfFameScript
end
-.Trigger2:
+.Trigger1:
end
HallOfFameScript:
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -17,8 +17,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 2
@@ -28,10 +28,10 @@
dbw 5, .FlyPoint
dbw 2, .Wesley
-.Trigger1
+.Trigger0
end
-.Trigger2
+.Trigger1
end
.FlyPoint
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -9,8 +9,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -18,10 +18,10 @@
; callbacks
dbw 5, .FlyPoint
-.Trigger1
+.Trigger0
end
-.Trigger2
+.Trigger1
end
.FlyPoint
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -5,17 +5,17 @@
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:
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -5,17 +5,17 @@
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:
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -8,8 +8,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -17,10 +17,10 @@
; callbacks
dbw 5, .FlyPoint
-.Trigger1
+.Trigger0
end
-.Trigger2
+.Trigger1
end
.FlyPoint
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -9,8 +9,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -18,10 +18,10 @@
; callbacks
dbw 5, .FlyPoint
-.Trigger1
+.Trigger0
end
-.Trigger2
+.Trigger1
end
.FlyPoint
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -9,44 +9,44 @@
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
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -17,9 +17,9 @@
db 3
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
dw .Trigger2, 0
- dw .Trigger3, 0
.MapCallbacks:
db 2
@@ -30,13 +30,13 @@
dbw 2, .CheckIfContestAvailable
-.Trigger1:
+.Trigger0:
end
-.Trigger2:
+.Trigger1:
end
-.Trigger3:
+.Trigger2:
priorityjump .LeftTheContestEarly
end
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -9,12 +9,12 @@
db 1
; triggers
- dw .Trigger1, 0
+ dw .Trigger0, 0
.MapCallbacks:
db 0
-.Trigger1:
+.Trigger0:
end
OfficerScript_0x18a81e:
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -11,7 +11,7 @@
db 1
; triggers
- dw .Trigger1, 0
+ dw .Trigger0, 0
.MapCallbacks:
db 1
@@ -20,7 +20,7 @@
dbw 2, .Callback1
-.Trigger1:
+.Trigger0:
end
.Callback1:
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -19,10 +19,10 @@
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 @@
dbw 1, .CheckGiovanniDoor
-.Trigger1:
+.Trigger0:
priorityjump LanceScript_0x6dffc
end
-.Trigger2:
+.Trigger1:
end
-.Trigger3:
+.Trigger2:
end
-.Trigger4:
+.Trigger3:
end
.CheckGiovanniDoor:
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -7,8 +7,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -17,11 +17,11 @@
dbw 2, TimeCapsule_SetWhichChris
-.Trigger1:
+.Trigger0:
priorityjump TimeCapsule_Initialize
end
-.Trigger2:
+.Trigger1:
end
TimeCapsule_SetWhichChris:
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -7,8 +7,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -17,11 +17,11 @@
dbw 2, TradeCenter_SetWhichChris
-.Trigger1:
+.Trigger0:
priorityjump TradeCenter_Initialize
end
-.Trigger2:
+.Trigger1:
end
TradeCenter_SetWhichChris:
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -8,8 +8,8 @@
db 2
; triggers
+ dw .Trigger0, 0
dw .Trigger1, 0
- dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -17,10 +17,10 @@
; callbacks
dbw 5, .FlyPoint
-.Trigger1
+.Trigger0
end
-.Trigger2
+.Trigger1
priorityjump UnknownScript_0x74da6
end