ref: 047c8e4bc079140b2e88b27e4ed8a6ca2ae9533d
parent: 8b501c19a6a70f8911159b510760eb3dbcb5a3a6
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Tue Dec 12 09:11:23 EST 2017
xy_trigger handles $0 padding, so map scripts are simpler
--- a/macros/map.asm
+++ b/macros/map.asm
@@ -21,13 +21,10 @@
;\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
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -472,9 +472,9 @@
.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
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -302,7 +302,7 @@
.XYTriggers:
db 1
- xy_trigger 1, $9, $b, $0, BurnedTowerRivalBattleScript, $0, $0
+ xy_trigger 1, $9, $b, BurnedTowerRivalBattleScript
.Signposts:
db 2
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -250,7 +250,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $6, $a, $0, ReleaseTheBeasts, $0, $0
+ xy_trigger 0, $6, $a, ReleaseTheBeasts
.Signposts:
db 0
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -560,8 +560,8 @@
.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
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -396,7 +396,7 @@
.XYTriggers:
db 1
- xy_trigger 1, $10, $b, $0, CianwoodCitySuicuneAndEusine, $0, $0
+ xy_trigger 1, $10, $b, CianwoodCitySuicuneAndEusine
.Signposts:
db 8
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -417,7 +417,7 @@
.XYTriggers:
db 1
- xy_trigger 1, $1e, $13, $0, DragonsDenB1F_ClairTrigger, $0, $0
+ xy_trigger 1, $1e, $13, DragonsDenB1F_ClairTrigger
.Signposts:
db 4
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -291,8 +291,8 @@
.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
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1381,14 +1381,14 @@
.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
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -306,8 +306,8 @@
.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
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -459,8 +459,8 @@
.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
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -390,7 +390,7 @@
.XYTriggers:
db 1
- xy_trigger 1, $5, $8, $0, WhitneyCriesScript, $0, $0
+ xy_trigger 1, $5, $8, WhitneyCriesScript
.Signposts:
db 2
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -177,7 +177,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $6, $b, $0, Script_ArriveFromSaffron, $0, $0
+ xy_trigger 0, $6, $b, Script_ArriveFromSaffron
.Signposts:
db 0
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -817,8 +817,8 @@
.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
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -315,8 +315,8 @@
.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
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -397,8 +397,8 @@
.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
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -350,8 +350,8 @@
.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
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -258,8 +258,8 @@
.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
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -145,7 +145,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $b, $7, $0, ClefairyDance, $0, $0
+ xy_trigger 0, $b, $7, ClefairyDance
.Signposts:
db 2
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -294,8 +294,8 @@
.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
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -307,8 +307,8 @@
.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
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -396,7 +396,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $f, $7, $0, UnknownScript_0x7491f, $0, $0
+ xy_trigger 0, $f, $7, UnknownScript_0x7491f
.Signposts:
db 1
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -399,7 +399,7 @@
.XYTriggers:
db 1
- xy_trigger 1, $c, $5, $0, PowerPlantGuardPhoneScript, $0, $0
+ xy_trigger 1, $c, $5, PowerPlantGuardPhoneScript
.Signposts:
db 2
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -431,8 +431,8 @@
.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
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -73,8 +73,8 @@
.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
--- a/maps/Route1718Gate.asm
+++ b/maps/Route1718Gate.asm
@@ -64,8 +64,8 @@
.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
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -440,8 +440,8 @@
.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
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -479,8 +479,8 @@
.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
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -425,8 +425,8 @@
.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
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -943,8 +943,8 @@
.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
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -148,7 +148,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $7, $4, $0, UnknownScript_0x62d3d, $0, $0
+ xy_trigger 0, $7, $4, UnknownScript_0x62d3d
.Signposts:
db 0
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -672,8 +672,8 @@
.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
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -333,7 +333,7 @@
.XYTriggers:
db 1
- xy_trigger 1, $e, $18, $0, Route42SuicuneScript, $0, $0
+ xy_trigger 1, $e, $18, Route42SuicuneScript
.Signposts:
db 5
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -302,8 +302,8 @@
.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
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -228,7 +228,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $6, $b, $0, Script_ArriveFromGoldenrod, $0, $0
+ xy_trigger 0, $6, $b, Script_ArriveFromGoldenrod
.Signposts:
db 0
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -339,7 +339,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $9, $b, $0, UnknownScript_0x184947, $0, $0
+ xy_trigger 0, $9, $b, UnknownScript_0x184947
.Signposts:
db 6
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -742,38 +742,38 @@
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
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -923,15 +923,15 @@
.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
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -578,9 +578,9 @@
.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
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -179,7 +179,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $3, $7, $0, TrainerHouseReceptionistScript, $0, $0
+ xy_trigger 0, $3, $7, TrainerHouseReceptionistScript
.Signposts:
db 0
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -949,8 +949,8 @@
.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
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -310,7 +310,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $b, $7, $0, UnknownScript_0x74e20, $0, $0
+ xy_trigger 0, $b, $7, UnknownScript_0x74e20
.Signposts:
db 1
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -259,8 +259,8 @@
.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
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -114,7 +114,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $b, $a, $0, VictoryRoadGateBadgeCheckTrigger, $0, $0
+ xy_trigger 0, $b, $a, VictoryRoadGateBadgeCheckTrigger
.Signposts:
db 0
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -356,7 +356,7 @@
.XYTriggers:
db 1
- xy_trigger 0, $4, $7, $0, UnknownScript_0x985a3, $0, $0
+ xy_trigger 0, $4, $7, UnknownScript_0x985a3
.Signposts:
db 0