From 047c8e4bc079140b2e88b27e4ed8a6ca2ae9533d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 12 Dec 2017 14:11:23 -0500 Subject: [PATCH] xy_trigger handles $0 padding, so map scripts are simpler --- macros/map.asm | 11 ++-- maps/AzaleaTown.asm | 6 +-- maps/BurnedTower1F.asm | 2 +- maps/BurnedTowerB1F.asm | 2 +- maps/CherrygroveCity.asm | 4 +- maps/CianwoodCity.asm | 2 +- maps/DragonsDenB1F.asm | 2 +- maps/EcruteakHouse.asm | 4 +- maps/ElmsLab.asm | 16 +++--- maps/FastShip1F.asm | 4 +- maps/FastShipB1F.asm | 4 +- maps/GoldenrodGym.asm | 2 +- maps/GoldenrodMagnetTrainStation.asm | 2 +- maps/GoldenrodPokecenter1F.asm | 4 +- maps/IndigoPlateauPokecenter1F.asm | 4 +- maps/KrissHouse1F.asm | 4 +- maps/LancesRoom.asm | 4 +- maps/MahoganyTown.asm | 4 +- maps/MountMoonSquare.asm | 2 +- maps/NewBarkTown.asm | 4 +- maps/OlivineCity.asm | 4 +- maps/OlivinePort.asm | 2 +- maps/PowerPlant.asm | 2 +- maps/RadioTower5F.asm | 4 +- maps/Route16Gate.asm | 4 +- maps/Route1718Gate.asm | 4 +- maps/Route25.asm | 4 +- maps/Route27.asm | 4 +- maps/Route29.asm | 4 +- maps/Route32.asm | 4 +- maps/Route34IlexForestGate.asm | 2 +- maps/Route36.asm | 4 +- maps/Route42.asm | 2 +- maps/RuinsOfAlphOutside.asm | 4 +- maps/SaffronTrainStation.asm | 2 +- maps/SproutTower3F.asm | 2 +- maps/TeamRocketBaseB1F.asm | 60 ++++++++++----------- maps/TeamRocketBaseB2F.asm | 18 +++---- maps/TeamRocketBaseB3F.asm | 6 +-- maps/TrainerHouseB1F.asm | 2 +- maps/UndergroundPathSwitchRoomEntrances.asm | 4 +- maps/VermilionPort.asm | 2 +- maps/VictoryRoad.asm | 4 +- maps/VictoryRoadGate.asm | 2 +- maps/WiseTriosRoom.asm | 2 +- 45 files changed, 118 insertions(+), 121 deletions(-) diff --git a/macros/map.asm b/macros/map.asm index eb78be7259..f153806da3 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -21,13 +21,10 @@ xy_trigger: macro ;\1: number: controlled by dotrigger/domaptrigger ;\2: y: top to bottom, starts at 0 ;\3: x: left to right, starts at 0 -;\4: unknown1: $0 -;\5: script pointer -;\6: unknown2: $0 -;\7: unknown3: $0 - db \1, \2, \3, \4 - dw \5 - db \6, \7 +;\4: script pointer + db \1, \2, \3, $0 + dw \4 + db $0, $0 endm signpost: macro diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index db1f5e0d15..90e387f466 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -472,9 +472,9 @@ AzaleaTown_MapEventHeader: .XYTriggers: db 3 - xy_trigger 1, $a, $5, $0, AzaleaTownRivalBattleTrigger1, $0, $0 - xy_trigger 1, $b, $5, $0, AzaleaTownRivalBattleTrigger2, $0, $0 - xy_trigger 2, $6, $9, $0, AzaleaTownCelebiTrigger, $0, $0 + xy_trigger 1, $a, $5, AzaleaTownRivalBattleTrigger1 + xy_trigger 1, $b, $5, AzaleaTownRivalBattleTrigger2 + xy_trigger 2, $6, $9, AzaleaTownCelebiTrigger .Signposts: db 9 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index f90a5caba1..b9c11593b8 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -302,7 +302,7 @@ BurnedTower1F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $9, $b, $0, BurnedTowerRivalBattleScript, $0, $0 + xy_trigger 1, $9, $b, BurnedTowerRivalBattleScript .Signposts: db 2 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 6879526e8c..d46f633f7a 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -250,7 +250,7 @@ BurnedTowerB1F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $6, $a, $0, ReleaseTheBeasts, $0, $0 + xy_trigger 0, $6, $a, ReleaseTheBeasts .Signposts: db 0 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index ef13130bce..043dfcb546 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -560,8 +560,8 @@ CherrygroveCity_MapEventHeader: .XYTriggers: db 2 - xy_trigger 1, $6, $21, $0, CherrygroveSilverTriggerNorth, $0, $0 - xy_trigger 1, $7, $21, $0, CherrygroveSilverTriggerSouth, $0, $0 + xy_trigger 1, $6, $21, CherrygroveSilverTriggerNorth + xy_trigger 1, $7, $21, CherrygroveSilverTriggerSouth .Signposts: db 4 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index f86e9dcca2..eb2036ecec 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -396,7 +396,7 @@ CianwoodCity_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $10, $b, $0, CianwoodCitySuicuneAndEusine, $0, $0 + xy_trigger 1, $10, $b, CianwoodCitySuicuneAndEusine .Signposts: db 8 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index b50d1f3a56..d17c3c4a32 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -417,7 +417,7 @@ DragonsDenB1F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $1e, $13, $0, DragonsDenB1F_ClairTrigger, $0, $0 + xy_trigger 1, $1e, $13, DragonsDenB1F_ClairTrigger .Signposts: db 4 diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index f50b39627e..4cfc709278 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -291,8 +291,8 @@ EcruteakHouse_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $7, $4, $0, EcruteakHouse_XYTrigger1, $0, $0 - xy_trigger 0, $7, $5, $0, EcruteakHouse_XYTrigger2, $0, $0 + xy_trigger 0, $7, $4, EcruteakHouse_XYTrigger1 + xy_trigger 0, $7, $5, EcruteakHouse_XYTrigger2 .Signposts: db 0 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index c64997e711..4eeba20dab 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1381,14 +1381,14 @@ ElmsLab_MapEventHeader: .XYTriggers: db 8 - xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0 - xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0 - xy_trigger 3, $5, $4, $0, MeetCopScript, $0, $0 - xy_trigger 3, $5, $5, $0, MeetCopScript2, $0, $0 - xy_trigger 5, $8, $4, $0, AideScript_WalkPotions1, $0, $0 - xy_trigger 5, $8, $5, $0, AideScript_WalkPotions2, $0, $0 - xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0 - xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0 + xy_trigger 1, $6, $4, LabTryToLeaveScript + xy_trigger 1, $6, $5, LabTryToLeaveScript + xy_trigger 3, $5, $4, MeetCopScript + xy_trigger 3, $5, $5, MeetCopScript2 + xy_trigger 5, $8, $4, AideScript_WalkPotions1 + xy_trigger 5, $8, $5, AideScript_WalkPotions2 + xy_trigger 6, $8, $4, AideScript_WalkBalls1 + xy_trigger 6, $8, $5, AideScript_WalkBalls2 .Signposts: db 16 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 9a6a93f5d6..284fa374d7 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -306,8 +306,8 @@ FastShip1F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 2, $6, $18, $0, WorriedGrandpaTriggerLeft, $0, $0 - xy_trigger 2, $6, $19, $0, WorriedGrandpaTriggerRight, $0, $0 + xy_trigger 2, $6, $18, WorriedGrandpaTriggerLeft + xy_trigger 2, $6, $19, WorriedGrandpaTriggerRight .Signposts: db 0 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index fb0ff9bf76..951b1c7372 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -459,8 +459,8 @@ FastShipB1F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $7, $1e, $0, UnknownScript_0x7673c, $0, $0 - xy_trigger 0, $7, $1f, $0, UnknownScript_0x76751, $0, $0 + xy_trigger 0, $7, $1e, UnknownScript_0x7673c + xy_trigger 0, $7, $1f, UnknownScript_0x76751 .Signposts: db 1 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index ac77767694..c8f47f6dcf 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -390,7 +390,7 @@ GoldenrodGym_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $5, $8, $0, WhitneyCriesScript, $0, $0 + xy_trigger 1, $5, $8, WhitneyCriesScript .Signposts: db 2 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 9818cd9eef..d94c5a3bda 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -177,7 +177,7 @@ GoldenrodMagnetTrainStation_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $6, $b, $0, Script_ArriveFromSaffron, $0, $0 + xy_trigger 0, $6, $b, Script_ArriveFromSaffron .Signposts: db 0 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 2189b4d7e5..fc82c2549f 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -817,8 +817,8 @@ GoldenrodPokecenter1F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $7, $3, $0, GoldenrodPokecenter1F_GSBallTriggerLeft, $0, $0 - xy_trigger 0, $7, $4, $0, GoldenrodPokecenter1F_GSBallTriggerRight, $0, $0 + xy_trigger 0, $7, $3, GoldenrodPokecenter1F_GSBallTriggerLeft + xy_trigger 0, $7, $4, GoldenrodPokecenter1F_GSBallTriggerRight .Signposts: db 0 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 5721e6bfca..080d319d6e 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -315,8 +315,8 @@ IndigoPlateauPokecenter1F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $4, $10, $0, PlateauRivalBattle1, $0, $0 - xy_trigger 0, $4, $11, $0, PlateauRivalBattle2, $0, $0 + xy_trigger 0, $4, $10, PlateauRivalBattle1 + xy_trigger 0, $4, $11, PlateauRivalBattle2 .Signposts: db 0 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 3a313ac7bb..3be6aaffac 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -397,8 +397,8 @@ KrissHouse1F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $4, $8, $0, UnknownScript_0x7a4d8, $0, $0 - xy_trigger 0, $4, $9, $0, UnknownScript_0x7a4db, $0, $0 + xy_trigger 0, $4, $8, UnknownScript_0x7a4d8 + xy_trigger 0, $4, $9, UnknownScript_0x7a4db .Signposts: db 4 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index fd083d28b5..cb32f222c6 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -350,8 +350,8 @@ LancesRoom_MapEventHeader: .XYTriggers: db 2 - xy_trigger 1, $5, $4, $0, Script_ApproachLanceFromLeft, $0, $0 - xy_trigger 1, $5, $5, $0, Script_ApproachLanceFromRight, $0, $0 + xy_trigger 1, $5, $4, Script_ApproachLanceFromLeft + xy_trigger 1, $5, $5, Script_ApproachLanceFromRight .Signposts: db 0 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 1ac3c1a4bb..5439e065c8 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -258,8 +258,8 @@ MahoganyTown_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $8, $13, $0, UnknownScript_0x190013, $0, $0 - xy_trigger 0, $9, $13, $0, UnknownScript_0x190013, $0, $0 + xy_trigger 0, $8, $13, UnknownScript_0x190013 + xy_trigger 0, $9, $13, UnknownScript_0x190013 .Signposts: db 4 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 5b5c2e1132..d92ede7299 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -145,7 +145,7 @@ MountMoonSquare_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $b, $7, $0, ClefairyDance, $0, $0 + xy_trigger 0, $b, $7, ClefairyDance .Signposts: db 2 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 050582f6d6..ff74da9f19 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -294,8 +294,8 @@ NewBarkTown_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $8, $1, $0, NewBarkTown_TeacherStopsYouTrigger1, $0, $0 - xy_trigger 0, $9, $1, $0, NewBarkTown_TeacherStopsYouTrigger2, $0, $0 + xy_trigger 0, $8, $1, NewBarkTown_TeacherStopsYouTrigger1 + xy_trigger 0, $9, $1, NewBarkTown_TeacherStopsYouTrigger2 .Signposts: db 4 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 605bd0da25..21b9943ec5 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -307,8 +307,8 @@ OlivineCity_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $c, $d, $0, UnknownScript_0x1a8833, $0, $0 - xy_trigger 0, $d, $d, $0, UnknownScript_0x1a886b, $0, $0 + xy_trigger 0, $c, $d, UnknownScript_0x1a8833 + xy_trigger 0, $d, $d, UnknownScript_0x1a886b .Signposts: db 7 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 200abc9e9f..f0137e2944 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -396,7 +396,7 @@ OlivinePort_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $f, $7, $0, UnknownScript_0x7491f, $0, $0 + xy_trigger 0, $f, $7, UnknownScript_0x7491f .Signposts: db 1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index f96f0aef59..8c487a0020 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -399,7 +399,7 @@ PowerPlant_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $c, $5, $0, PowerPlantGuardPhoneScript, $0, $0 + xy_trigger 1, $c, $5, PowerPlantGuardPhoneScript .Signposts: db 2 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index a2a7ea2f31..e8b70f7e1f 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -431,8 +431,8 @@ RadioTower5F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $3, $0, $0, FakeDirectorScript, $0, $0 - xy_trigger 1, $5, $10, $0, RadioTower5FRocketBossTrigger, $0, $0 + xy_trigger 0, $3, $0, FakeDirectorScript + xy_trigger 1, $5, $10, RadioTower5FRocketBossTrigger .Signposts: db 5 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index d04e8a61d6..3da6f3458e 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -73,8 +73,8 @@ Route16Gate_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $4, $5, $0, UnknownScript_0x733ed, $0, $0 - xy_trigger 0, $5, $5, $0, UnknownScript_0x733ed, $0, $0 + xy_trigger 0, $4, $5, UnknownScript_0x733ed + xy_trigger 0, $5, $5, UnknownScript_0x733ed .Signposts: db 0 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index fae494532a..b93e7978f8 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -64,8 +64,8 @@ Route1718Gate_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $4, $5, $0, UnknownScript_0x73611, $0, $0 - xy_trigger 0, $5, $5, $0, UnknownScript_0x73611, $0, $0 + xy_trigger 0, $4, $5, UnknownScript_0x73611 + xy_trigger 0, $5, $5, UnknownScript_0x73611 .Signposts: db 0 diff --git a/maps/Route25.asm b/maps/Route25.asm index 6bccab1f6c..76b43b70fc 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -440,8 +440,8 @@ Route25_MapEventHeader: .XYTriggers: db 2 - xy_trigger 1, $6, $2a, $0, UnknownScript_0x19eea0, $0, $0 - xy_trigger 1, $7, $2a, $0, UnknownScript_0x19eee0, $0, $0 + xy_trigger 1, $6, $2a, UnknownScript_0x19eea0 + xy_trigger 1, $7, $2a, UnknownScript_0x19eee0 .Signposts: db 2 diff --git a/maps/Route27.asm b/maps/Route27.asm index 2210dc24c9..9af0531cf2 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -479,8 +479,8 @@ Route27_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $a, $12, $0, UnknownScript_0x1a0873, $0, $0 - xy_trigger 0, $a, $13, $0, UnknownScript_0x1a0881, $0, $0 + xy_trigger 0, $a, $12, UnknownScript_0x1a0873 + xy_trigger 0, $a, $13, UnknownScript_0x1a0881 .Signposts: db 1 diff --git a/maps/Route29.asm b/maps/Route29.asm index 8ead09afcc..c84318b80d 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -425,8 +425,8 @@ Route29_MapEventHeader: .XYTriggers: db 2 - xy_trigger 1, $8, $35, $0, Route29Tutorial1, $0, $0 - xy_trigger 1, $9, $35, $0, Route29Tutorial2, $0, $0 + xy_trigger 1, $8, $35, Route29Tutorial1 + xy_trigger 1, $9, $35, Route29Tutorial2 .Signposts: db 2 diff --git a/maps/Route32.asm b/maps/Route32.asm index ded3439988..7da56507aa 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -943,8 +943,8 @@ Route32_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $8, $12, $0, Route32CooltrainerMStopsYou, $0, $0 - xy_trigger 1, $47, $7, $0, Route32WannaBuyASlowpokeTailScript, $0, $0 + xy_trigger 0, $8, $12, Route32CooltrainerMStopsYou + xy_trigger 1, $47, $7, Route32WannaBuyASlowpokeTailScript .Signposts: db 6 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index bed78d12a2..143a1adc9e 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -148,7 +148,7 @@ Route34IlexForestGate_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $7, $4, $0, UnknownScript_0x62d3d, $0, $0 + xy_trigger 0, $7, $4, UnknownScript_0x62d3d .Signposts: db 0 diff --git a/maps/Route36.asm b/maps/Route36.asm index 918f046459..5519a692b2 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -672,8 +672,8 @@ Route36_MapEventHeader: .XYTriggers: db 2 - xy_trigger 1, $7, $14, $0, Route36SuicuneScript, $0, $0 - xy_trigger 1, $7, $16, $0, Route36SuicuneScript, $0, $0 + xy_trigger 1, $7, $14, Route36SuicuneScript + xy_trigger 1, $7, $16, Route36SuicuneScript .Signposts: db 4 diff --git a/maps/Route42.asm b/maps/Route42.asm index 8c190d88a9..99bb953cb5 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -333,7 +333,7 @@ Route42_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $e, $18, $0, Route42SuicuneScript, $0, $0 + xy_trigger 1, $e, $18, Route42SuicuneScript .Signposts: db 5 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 87f134f3f7..f18e8d99bf 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -302,8 +302,8 @@ RuinsOfAlphOutside_MapEventHeader: .XYTriggers: db 2 - xy_trigger 1, $e, $b, $0, RuinsOfAlphOutsideScientistTrigger1, $0, $0 - xy_trigger 1, $f, $a, $0, RuinsOfAlphOutsideScientistTrigger2, $0, $0 + xy_trigger 1, $e, $b, RuinsOfAlphOutsideScientistTrigger1 + xy_trigger 1, $f, $a, RuinsOfAlphOutsideScientistTrigger2 .Signposts: db 3 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index cfbbc078e9..f6599a6ed2 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -228,7 +228,7 @@ SaffronTrainStation_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $6, $b, $0, Script_ArriveFromGoldenrod, $0, $0 + xy_trigger 0, $6, $b, Script_ArriveFromGoldenrod .Signposts: db 0 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 0163744428..71188ee597 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -339,7 +339,7 @@ SproutTower3F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $9, $b, $0, UnknownScript_0x184947, $0, $0 + xy_trigger 0, $9, $b, UnknownScript_0x184947 .Signposts: db 6 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 93fe001325..390ea5d7a4 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -742,38 +742,38 @@ TeamRocketBaseB1F_MapEventHeader: db 30 ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. - xy_trigger 0, $2, $18, $0, SecurityCamera1a, $0, $0 - xy_trigger 0, $3, $18, $0, SecurityCamera1b, $0, $0 - xy_trigger 0, $2, $6, $0, SecurityCamera2a, $0, $0 - xy_trigger 0, $3, $6, $0, SecurityCamera2b, $0, $0 - xy_trigger 0, $6, $18, $0, SecurityCamera3a, $0, $0 - xy_trigger 0, $7, $18, $0, SecurityCamera3b, $0, $0 - xy_trigger 0, $10, $16, $0, SecurityCamera4, $0, $0 - xy_trigger 0, $10, $8, $0, SecurityCamera5, $0, $0 + xy_trigger 0, $2, $18, SecurityCamera1a + xy_trigger 0, $3, $18, SecurityCamera1b + xy_trigger 0, $2, $6, SecurityCamera2a + xy_trigger 0, $3, $6, SecurityCamera2b + xy_trigger 0, $6, $18, SecurityCamera3a + xy_trigger 0, $7, $18, SecurityCamera3b + xy_trigger 0, $10, $16, SecurityCamera4 + xy_trigger 0, $10, $8, SecurityCamera5 ; There are spots on the floor that trigger a Pokémon battle. ; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct. - xy_trigger 0, $7, $2, $0, ExplodingTrap1, $0, $0 - xy_trigger 0, $7, $3, $0, ExplodingTrap2, $0, $0 - xy_trigger 0, $7, $4, $0, ExplodingTrap3, $0, $0 - xy_trigger 0, $8, $1, $0, ExplodingTrap4, $0, $0 - xy_trigger 0, $8, $3, $0, ExplodingTrap5, $0, $0 - xy_trigger 0, $8, $5, $0, ExplodingTrap6, $0, $0 - xy_trigger 0, $9, $3, $0, ExplodingTrap7, $0, $0 - xy_trigger 0, $9, $4, $0, ExplodingTrap8, $0, $0 - xy_trigger 0, $a, $1, $0, ExplodingTrap9, $0, $0 - xy_trigger 0, $a, $2, $0, ExplodingTrap10, $0, $0 - xy_trigger 0, $a, $3, $0, ExplodingTrap11, $0, $0 - xy_trigger 0, $a, $5, $0, ExplodingTrap12, $0, $0 - xy_trigger 0, $b, $2, $0, ExplodingTrap13, $0, $0 - xy_trigger 0, $b, $4, $0, ExplodingTrap14, $0, $0 - xy_trigger 0, $c, $1, $0, ExplodingTrap15, $0, $0 - xy_trigger 0, $c, $2, $0, ExplodingTrap16, $0, $0 - xy_trigger 0, $c, $4, $0, ExplodingTrap17, $0, $0 - xy_trigger 0, $c, $5, $0, ExplodingTrap18, $0, $0 - xy_trigger 0, $d, $1, $0, ExplodingTrap19, $0, $0 - xy_trigger 0, $d, $3, $0, ExplodingTrap20, $0, $0 - xy_trigger 0, $d, $4, $0, ExplodingTrap21, $0, $0 - xy_trigger 0, $d, $5, $0, ExplodingTrap22, $0, $0 + xy_trigger 0, $7, $2, ExplodingTrap1 + xy_trigger 0, $7, $3, ExplodingTrap2 + xy_trigger 0, $7, $4, ExplodingTrap3 + xy_trigger 0, $8, $1, ExplodingTrap4 + xy_trigger 0, $8, $3, ExplodingTrap5 + xy_trigger 0, $8, $5, ExplodingTrap6 + xy_trigger 0, $9, $3, ExplodingTrap7 + xy_trigger 0, $9, $4, ExplodingTrap8 + xy_trigger 0, $a, $1, ExplodingTrap9 + xy_trigger 0, $a, $2, ExplodingTrap10 + xy_trigger 0, $a, $3, ExplodingTrap11 + xy_trigger 0, $a, $5, ExplodingTrap12 + xy_trigger 0, $b, $2, ExplodingTrap13 + xy_trigger 0, $b, $4, ExplodingTrap14 + xy_trigger 0, $c, $1, ExplodingTrap15 + xy_trigger 0, $c, $2, ExplodingTrap16 + xy_trigger 0, $c, $4, ExplodingTrap17 + xy_trigger 0, $c, $5, ExplodingTrap18 + xy_trigger 0, $d, $1, ExplodingTrap19 + xy_trigger 0, $d, $3, ExplodingTrap20 + xy_trigger 0, $d, $4, ExplodingTrap21 + xy_trigger 0, $d, $5, ExplodingTrap22 .Signposts: db 9 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index c7feb44467..9223be1388 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -923,15 +923,15 @@ TeamRocketBaseB2F_MapEventHeader: .XYTriggers: db 9 - xy_trigger 0, $e, $5, $0, LanceHealsScript1, $0, $0 - xy_trigger 0, $d, $4, $0, LanceHealsScript2, $0, $0 - xy_trigger 1, $b, $e, $0, UnknownScript_0x6cf95, $0, $0 - xy_trigger 1, $b, $f, $0, UnknownScript_0x6cf9c, $0, $0 - xy_trigger 2, $c, $e, $0, UnknownScript_0x6d075, $0, $0 - xy_trigger 2, $c, $f, $0, UnknownScript_0x6d075, $0, $0 - xy_trigger 2, $3, $c, $0, UnknownScript_0x6d07a, $0, $0 - xy_trigger 2, $a, $c, $0, UnknownScript_0x6d07a, $0, $0 - xy_trigger 2, $b, $c, $0, UnknownScript_0x6d07a, $0, $0 + xy_trigger 0, $e, $5, LanceHealsScript1 + xy_trigger 0, $d, $4, LanceHealsScript2 + xy_trigger 1, $b, $e, UnknownScript_0x6cf95 + xy_trigger 1, $b, $f, UnknownScript_0x6cf9c + xy_trigger 2, $c, $e, UnknownScript_0x6d075 + xy_trigger 2, $c, $f, UnknownScript_0x6d075 + xy_trigger 2, $3, $c, UnknownScript_0x6d07a + xy_trigger 2, $a, $c, UnknownScript_0x6d07a + xy_trigger 2, $b, $c, UnknownScript_0x6d07a .Signposts: db 23 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 85d3765e21..916e7dd9db 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -578,9 +578,9 @@ TeamRocketBaseB3F_MapEventHeader: .XYTriggers: db 3 - xy_trigger 2, $8, $a, $0, UnknownScript_0x6e04b, $0, $0 - xy_trigger 2, $8, $b, $0, UnknownScript_0x6e052, $0, $0 - xy_trigger 1, $a, $8, $0, RocketBaseRival, $0, $0 + xy_trigger 2, $8, $a, UnknownScript_0x6e04b + xy_trigger 2, $8, $b, UnknownScript_0x6e052 + xy_trigger 1, $a, $8, RocketBaseRival .Signposts: db 10 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index cd36ae1362..caae8972d5 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -179,7 +179,7 @@ TrainerHouseB1F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $3, $7, $0, TrainerHouseReceptionistScript, $0, $0 + xy_trigger 0, $3, $7, TrainerHouseReceptionistScript .Signposts: db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index f4015232cd..f060fbf1ab 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -949,8 +949,8 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $4, $13, $0, UndergroundSilverTrigger1, $0, 0 - xy_trigger 0, $5, $13, $0, UndergroundSilverTrigger2, $0, 0 + xy_trigger 0, $4, $13, UndergroundSilverTrigger1 + xy_trigger 0, $5, $13, UndergroundSilverTrigger2 .Signposts: db 6 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 3bf754db42..dd88f911d8 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -310,7 +310,7 @@ VermilionPort_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $b, $7, $0, UnknownScript_0x74e20, $0, $0 + xy_trigger 0, $b, $7, UnknownScript_0x74e20 .Signposts: db 1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 4320621f24..2890977dc8 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -259,8 +259,8 @@ VictoryRoad_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $8, $c, $0, UnknownScript_0x74492, $0, $0 - xy_trigger 0, $8, $d, $0, UnknownScript_0x744b5, $0, $0 + xy_trigger 0, $8, $c, UnknownScript_0x74492 + xy_trigger 0, $8, $d, UnknownScript_0x744b5 .Signposts: db 2 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 36c57fd610..dbfbafb09d 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -114,7 +114,7 @@ VictoryRoadGate_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $b, $a, $0, VictoryRoadGateBadgeCheckTrigger, $0, $0 + xy_trigger 0, $b, $a, VictoryRoadGateBadgeCheckTrigger .Signposts: db 0 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index dee082bd8e..5f4a38dadd 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -356,7 +356,7 @@ WiseTriosRoom_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $4, $7, $0, UnknownScript_0x985a3, $0, $0 + xy_trigger 0, $4, $7, UnknownScript_0x985a3 .Signposts: db 0