pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

.TriggerX labels are now consistently 0-based

Browse Source
This commit is contained in:
PikalaxALT 2015-12-10 22:28:46 -05:00
parent b9870541d4
commit 3980d2d736
24 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maps/AzaleaTown.asm
View File

@ -17,9 +17,9 @@ AzaleaTown_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0 dw .Trigger2, 0
dw .Trigger3, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -27,15 +27,15 @@ AzaleaTown_MapScriptHeader:
; callbacks ; callbacks
dbw 5, .Flypoint dbw 5, .Flypoint
.Trigger0
end
.Trigger1 .Trigger1
end end
.Trigger2 .Trigger2
end end
.Trigger3
end
.Flypoint .Flypoint
setflag ENGINE_FLYPOINT_AZALEA setflag ENGINE_FLYPOINT_AZALEA
return return

6
maps/CherrygroveCity.asm
View File

@ -10,8 +10,8 @@ CherrygroveCity_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -19,10 +19,10 @@ CherrygroveCity_MapScriptHeader:
; callbacks ; callbacks
dbw 5, .FlyPoint dbw 5, .FlyPoint
.Trigger1 .Trigger0
end end
.Trigger2 .Trigger1
end end
.FlyPoint .FlyPoint

6
maps/CianwoodCity.asm
View File

@ -17,8 +17,8 @@ CianwoodCity_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -26,10 +26,10 @@ CianwoodCity_MapScriptHeader:
; callbacks ; callbacks
dbw 5, .FlyPointAndSuicune dbw 5, .FlyPointAndSuicune
.Trigger1 .Trigger0
end end
.Trigger2 .Trigger1
end end
.FlyPointAndSuicune .FlyPointAndSuicune

8
maps/Colosseum.asm
View File

@ -7,9 +7,9 @@ Colosseum_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0 dw .Trigger2, 0
dw .Trigger3, 0
.MapCallbacks: .MapCallbacks:
db 2 db 2
@ -20,14 +20,14 @@ Colosseum_MapScriptHeader:
dbw 5, ColosseumScript_InitializeCB dbw 5, ColosseumScript_InitializeCB
.Trigger1: .Trigger0:
priorityjump ColosseumScript_Initialize priorityjump ColosseumScript_Initialize
end end
.Trigger2: .Trigger1:
end end
.Trigger3: .Trigger2:
end end
ColosseumScript_SetWhichChris: ColosseumScript_SetWhichChris:

6
maps/DragonShrine.asm
View File

@ -9,17 +9,17 @@ DragonShrine_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger1: .Trigger0:
priorityjump DragonShrineTestScript priorityjump DragonShrineTestScript
end end
.Trigger2: .Trigger1:
end end
DragonShrineTestScript: DragonShrineTestScript:

6
maps/DragonsDenB1F.asm
View File

@ -14,8 +14,8 @@ DragonsDenB1F_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -24,10 +24,10 @@ DragonsDenB1F_MapScriptHeader:
dbw 5, .CheckSilver dbw 5, .CheckSilver
.Trigger1: .Trigger0:
end end
.Trigger2: .Trigger1:
end end
.CheckSilver: .CheckSilver:

6
maps/EcruteakHouse.asm
View File

@ -9,8 +9,8 @@ EcruteakHouse_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -19,10 +19,10 @@ EcruteakHouse_MapScriptHeader:
dbw 2, .InitializeSages dbw 2, .InitializeSages
.Trigger1: .Trigger0:
end end
.Trigger2: .Trigger1:
end end
.InitializeSages: .InitializeSages:

8
maps/FastShip1F.asm
View File

@ -9,21 +9,21 @@ FastShip1F_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0 dw .Trigger2, 0
dw .Trigger3, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger1: .Trigger0:
end end
.Trigger2: .Trigger1:
priorityjump .PriorityJump2 priorityjump .PriorityJump2
end end
.Trigger3: .Trigger2:
end end
.PriorityJump2: .PriorityJump2:

4
maps/GoldenrodMagnetTrainStation.asm
View File

@ -7,12 +7,12 @@ GoldenrodMagnetTrainStation_MapScriptHeader:
db 1 db 1
; triggers ; triggers
dw .Trigger1, 0 dw .Trigger0, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger1: .Trigger0:
end end
OfficerScript_0x550ec: OfficerScript_0x550ec:

6
maps/HallOfFame.asm
View File

@ -6,17 +6,17 @@ HallOfFame_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger1: .Trigger0:
priorityjump HallOfFameScript priorityjump HallOfFameScript
end end
.Trigger2: .Trigger1:
end end
HallOfFameScript: HallOfFameScript:

6
maps/LakeofRage.asm
View File

@ -17,8 +17,8 @@ LakeofRage_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 2 db 2
@ -28,10 +28,10 @@ LakeofRage_MapScriptHeader:
dbw 5, .FlyPoint dbw 5, .FlyPoint
dbw 2, .Wesley dbw 2, .Wesley
.Trigger1 .Trigger0
end end
.Trigger2 .Trigger1
end end
.FlyPoint .FlyPoint

6
maps/MahoganyTown.asm
View File

@ -9,8 +9,8 @@ MahoganyTown_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -18,10 +18,10 @@ MahoganyTown_MapScriptHeader:
; callbacks ; callbacks
dbw 5, .FlyPoint dbw 5, .FlyPoint
.Trigger1 .Trigger0
end end
.Trigger2 .Trigger1
end end
.FlyPoint .FlyPoint

6
maps/MobileBattleRoom.asm
View File

@ -5,17 +5,17 @@ MobileBattleRoom_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger1: .Trigger0:
priorityjump MobileBattleRoom_Initialize priorityjump MobileBattleRoom_Initialize
end end
.Trigger2: .Trigger1:
end end
MobileBattleRoom_Initialize: MobileBattleRoom_Initialize:

6
maps/MobileTradeRoomMobile.asm
View File

@ -5,17 +5,17 @@ MobileTradeRoomMobile_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger1: .Trigger0:
priorityjump MobileTradeRoomMobile_Initialize priorityjump MobileTradeRoomMobile_Initialize
end end
.Trigger2: .Trigger1:
end end
MobileTradeRoomMobile_Initialize: MobileTradeRoomMobile_Initialize:

6
maps/NewBarkTown.asm
View File

@ -8,8 +8,8 @@ NewBarkTown_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -17,10 +17,10 @@ NewBarkTown_MapScriptHeader:
; callbacks ; callbacks
dbw 5, .FlyPoint dbw 5, .FlyPoint
.Trigger1 .Trigger0
end end
.Trigger2 .Trigger1
end end
.FlyPoint .FlyPoint

6
maps/OlivineCity.asm
View File

@ -9,8 +9,8 @@ OlivineCity_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -18,10 +18,10 @@ OlivineCity_MapScriptHeader:
; callbacks ; callbacks
dbw 5, .FlyPoint dbw 5, .FlyPoint
.Trigger1 .Trigger0
end end
.Trigger2 .Trigger1
end end
.FlyPoint .FlyPoint

20
maps/PokeCenter2F.asm
View File

@ -9,44 +9,44 @@ PokeCenter2F_MapScriptHeader:
db 6 db 6
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0 dw .Trigger2, 0
dw .Trigger3, 0 dw .Trigger3, 0
dw .Trigger4, 0 dw .Trigger4, 0
dw .Trigger5, 0 dw .Trigger5, 0
dw .Trigger6, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger1: .Trigger0:
special Special_CheckMysteryGift special Special_CheckMysteryGift
if_equal $0, .Trigger1Done if_equal $0, .Trigger0Done
clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
checkevent EVENT_RECEIVED_BALLS_FROM_KURT checkevent EVENT_RECEIVED_BALLS_FROM_KURT
iftrue .Trigger1Done iftrue .Trigger0Done
priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy
.Trigger1Done: .Trigger0Done:
end end
.Trigger2: .Trigger1:
priorityjump Script_LeftCableTradeCenter priorityjump Script_LeftCableTradeCenter
end end
.Trigger3: .Trigger2:
priorityjump Script_LeftCableColosseum priorityjump Script_LeftCableColosseum
end end
.Trigger4: .Trigger3:
priorityjump Script_LeftTimeCapsule priorityjump Script_LeftTimeCapsule
end end
.Trigger5: .Trigger4:
priorityjump Script_LeftMobileTradeRoom priorityjump Script_LeftMobileTradeRoom
end end
.Trigger6: .Trigger5:
priorityjump Script_LeftMobileBattleRoom priorityjump Script_LeftMobileBattleRoom
end end

8
maps/Route36NationalParkgate.asm
View File

@ -17,9 +17,9 @@ Route36NationalParkgate_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0 dw .Trigger2, 0
dw .Trigger3, 0
.MapCallbacks: .MapCallbacks:
db 2 db 2
@ -30,13 +30,13 @@ Route36NationalParkgate_MapScriptHeader:
dbw 2, .CheckIfContestAvailable dbw 2, .CheckIfContestAvailable
.Trigger0:
end
.Trigger1: .Trigger1:
end end
.Trigger2: .Trigger2:
end
.Trigger3:
priorityjump .LeftTheContestEarly priorityjump .LeftTheContestEarly
end end

4
maps/SaffronTrainStation.asm
View File

@ -9,12 +9,12 @@ SaffronTrainStation_MapScriptHeader:
db 1 db 1
; triggers ; triggers
dw .Trigger1, 0 dw .Trigger0, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger1: .Trigger0:
end end
OfficerScript_0x18a81e: OfficerScript_0x18a81e:

4
maps/TeamRocketBaseB1F.asm
View File

@ -11,7 +11,7 @@ TeamRocketBaseB1F_MapScriptHeader:
db 1 db 1
; triggers ; triggers
dw .Trigger1, 0 dw .Trigger0, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -20,7 +20,7 @@ TeamRocketBaseB1F_MapScriptHeader:
dbw 2, .Callback1 dbw 2, .Callback1
.Trigger1: .Trigger0:
end end
.Callback1: .Callback1:

10
maps/TeamRocketBaseB3F.asm
View File

@ -19,10 +19,10 @@ TeamRocketBaseB3F_MapScriptHeader:
db 4 db 4
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0 dw .Trigger2, 0
dw .Trigger3, 0 dw .Trigger3, 0
dw .Trigger4, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -31,19 +31,19 @@ TeamRocketBaseB3F_MapScriptHeader:
dbw 1, .CheckGiovanniDoor dbw 1, .CheckGiovanniDoor
.Trigger1: .Trigger0:
priorityjump LanceScript_0x6dffc priorityjump LanceScript_0x6dffc
end end
.Trigger1:
end
.Trigger2: .Trigger2:
end end
.Trigger3: .Trigger3:
end end
.Trigger4:
end
.CheckGiovanniDoor: .CheckGiovanniDoor:
checkevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE checkevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
iftrue .OpenSesame iftrue .OpenSesame

6
maps/TimeCapsule.asm
View File

@ -7,8 +7,8 @@ TimeCapsule_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -17,11 +17,11 @@ TimeCapsule_MapScriptHeader:
dbw 2, TimeCapsule_SetWhichChris dbw 2, TimeCapsule_SetWhichChris
.Trigger1: .Trigger0:
priorityjump TimeCapsule_Initialize priorityjump TimeCapsule_Initialize
end end
.Trigger2: .Trigger1:
end end
TimeCapsule_SetWhichChris: TimeCapsule_SetWhichChris:

6
maps/TradeCenter.asm
View File

@ -7,8 +7,8 @@ TradeCenter_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -17,11 +17,11 @@ TradeCenter_MapScriptHeader:
dbw 2, TradeCenter_SetWhichChris dbw 2, TradeCenter_SetWhichChris
.Trigger1: .Trigger0:
priorityjump TradeCenter_Initialize priorityjump TradeCenter_Initialize
end end
.Trigger2: .Trigger1:
end end
TradeCenter_SetWhichChris: TradeCenter_SetWhichChris:

6
maps/VermilionPort.asm
View File

@ -8,8 +8,8 @@ VermilionPort_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0
dw .Trigger1, 0 dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -17,10 +17,10 @@ VermilionPort_MapScriptHeader:
; callbacks ; callbacks
dbw 5, .FlyPoint dbw 5, .FlyPoint
.Trigger1 .Trigger0
end end
.Trigger2 .Trigger1
priorityjump UnknownScript_0x74da6 priorityjump UnknownScript_0x74da6
end end