pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

xy_trigger handles $0 padding, so map scripts are simpler

Browse Source
This commit is contained in:
Remy Oukaour 2017-12-12 14:11:23 -05:00
parent 8b501c19a6
commit 047c8e4bc0
45 changed files with 118 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
macros/map.asm
View File

@ -21,13 +21,10 @@ xy_trigger: macro
;\1: number: controlled by dotrigger/domaptrigger ;\1: number: controlled by dotrigger/domaptrigger
;\2: y: top to bottom, starts at 0 ;\2: y: top to bottom, starts at 0
;\3: x: left to right, starts at 0 ;\3: x: left to right, starts at 0
;\4: unknown1: $0 ;\4: script pointer
;\5: script pointer db \1, \2, \3, $0
;\6: unknown2: $0 dw \4
;\7: unknown3: $0 db $0, $0
db \1, \2, \3, \4
dw \5
db \6, \7
endm endm
signpost: macro signpost: macro

6
maps/AzaleaTown.asm
View File

@ -472,9 +472,9 @@ AzaleaTown_MapEventHeader:
.XYTriggers: .XYTriggers:
db 3 db 3
xy_trigger 1, $a, $5, $0, AzaleaTownRivalBattleTrigger1, $0, $0 xy_trigger 1, $a, $5, AzaleaTownRivalBattleTrigger1
xy_trigger 1, $b, $5, $0, AzaleaTownRivalBattleTrigger2, $0, $0 xy_trigger 1, $b, $5, AzaleaTownRivalBattleTrigger2
xy_trigger 2, $6, $9, $0, AzaleaTownCelebiTrigger, $0, $0 xy_trigger 2, $6, $9, AzaleaTownCelebiTrigger
.Signposts: .Signposts:
db 9 db 9

2
maps/BurnedTower1F.asm
View File

@ -302,7 +302,7 @@ BurnedTower1F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 1, $9, $b, $0, BurnedTowerRivalBattleScript, $0, $0 xy_trigger 1, $9, $b, BurnedTowerRivalBattleScript
.Signposts: .Signposts:
db 2 db 2

2
maps/BurnedTowerB1F.asm
View File

@ -250,7 +250,7 @@ BurnedTowerB1F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $6, $a, $0, ReleaseTheBeasts, $0, $0 xy_trigger 0, $6, $a, ReleaseTheBeasts
.Signposts: .Signposts:
db 0 db 0

4
maps/CherrygroveCity.asm
View File

@ -560,8 +560,8 @@ CherrygroveCity_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 1, $6, $21, $0, CherrygroveSilverTriggerNorth, $0, $0 xy_trigger 1, $6, $21, CherrygroveSilverTriggerNorth
xy_trigger 1, $7, $21, $0, CherrygroveSilverTriggerSouth, $0, $0 xy_trigger 1, $7, $21, CherrygroveSilverTriggerSouth
.Signposts: .Signposts:
db 4 db 4

2
maps/CianwoodCity.asm
View File

@ -396,7 +396,7 @@ CianwoodCity_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 1, $10, $b, $0, CianwoodCitySuicuneAndEusine, $0, $0 xy_trigger 1, $10, $b, CianwoodCitySuicuneAndEusine
.Signposts: .Signposts:
db 8 db 8

2
maps/DragonsDenB1F.asm
View File

@ -417,7 +417,7 @@ DragonsDenB1F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 1, $1e, $13, $0, DragonsDenB1F_ClairTrigger, $0, $0 xy_trigger 1, $1e, $13, DragonsDenB1F_ClairTrigger
.Signposts: .Signposts:
db 4 db 4

4
maps/EcruteakHouse.asm
View File

@ -291,8 +291,8 @@ EcruteakHouse_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $7, $4, $0, EcruteakHouse_XYTrigger1, $0, $0 xy_trigger 0, $7, $4, EcruteakHouse_XYTrigger1
xy_trigger 0, $7, $5, $0, EcruteakHouse_XYTrigger2, $0, $0 xy_trigger 0, $7, $5, EcruteakHouse_XYTrigger2
.Signposts: .Signposts:
db 0 db 0

16
maps/ElmsLab.asm
View File

@ -1381,14 +1381,14 @@ ElmsLab_MapEventHeader:
.XYTriggers: .XYTriggers:
db 8 db 8
xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0 xy_trigger 1, $6, $4, LabTryToLeaveScript
xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0 xy_trigger 1, $6, $5, LabTryToLeaveScript
xy_trigger 3, $5, $4, $0, MeetCopScript, $0, $0 xy_trigger 3, $5, $4, MeetCopScript
xy_trigger 3, $5, $5, $0, MeetCopScript2, $0, $0 xy_trigger 3, $5, $5, MeetCopScript2
xy_trigger 5, $8, $4, $0, AideScript_WalkPotions1, $0, $0 xy_trigger 5, $8, $4, AideScript_WalkPotions1
xy_trigger 5, $8, $5, $0, AideScript_WalkPotions2, $0, $0 xy_trigger 5, $8, $5, AideScript_WalkPotions2
xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0 xy_trigger 6, $8, $4, AideScript_WalkBalls1
xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0 xy_trigger 6, $8, $5, AideScript_WalkBalls2
.Signposts: .Signposts:
db 16 db 16

4
maps/FastShip1F.asm
View File

@ -306,8 +306,8 @@ FastShip1F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 2, $6, $18, $0, WorriedGrandpaTriggerLeft, $0, $0 xy_trigger 2, $6, $18, WorriedGrandpaTriggerLeft
xy_trigger 2, $6, $19, $0, WorriedGrandpaTriggerRight, $0, $0 xy_trigger 2, $6, $19, WorriedGrandpaTriggerRight
.Signposts: .Signposts:
db 0 db 0

4
maps/FastShipB1F.asm
View File

@ -459,8 +459,8 @@ FastShipB1F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $7, $1e, $0, UnknownScript_0x7673c, $0, $0 xy_trigger 0, $7, $1e, UnknownScript_0x7673c
xy_trigger 0, $7, $1f, $0, UnknownScript_0x76751, $0, $0 xy_trigger 0, $7, $1f, UnknownScript_0x76751
.Signposts: .Signposts:
db 1 db 1

2
maps/GoldenrodGym.asm
View File

@ -390,7 +390,7 @@ GoldenrodGym_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 1, $5, $8, $0, WhitneyCriesScript, $0, $0 xy_trigger 1, $5, $8, WhitneyCriesScript
.Signposts: .Signposts:
db 2 db 2

2
maps/GoldenrodMagnetTrainStation.asm
View File

@ -177,7 +177,7 @@ GoldenrodMagnetTrainStation_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $6, $b, $0, Script_ArriveFromSaffron, $0, $0 xy_trigger 0, $6, $b, Script_ArriveFromSaffron
.Signposts: .Signposts:
db 0 db 0

4
maps/GoldenrodPokecenter1F.asm
View File

@ -817,8 +817,8 @@ GoldenrodPokecenter1F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $7, $3, $0, GoldenrodPokecenter1F_GSBallTriggerLeft, $0, $0 xy_trigger 0, $7, $3, GoldenrodPokecenter1F_GSBallTriggerLeft
xy_trigger 0, $7, $4, $0, GoldenrodPokecenter1F_GSBallTriggerRight, $0, $0 xy_trigger 0, $7, $4, GoldenrodPokecenter1F_GSBallTriggerRight
.Signposts: .Signposts:
db 0 db 0

4
maps/IndigoPlateauPokecenter1F.asm
View File

@ -315,8 +315,8 @@ IndigoPlateauPokecenter1F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $4, $10, $0, PlateauRivalBattle1, $0, $0 xy_trigger 0, $4, $10, PlateauRivalBattle1
xy_trigger 0, $4, $11, $0, PlateauRivalBattle2, $0, $0 xy_trigger 0, $4, $11, PlateauRivalBattle2
.Signposts: .Signposts:
db 0 db 0

4
maps/KrissHouse1F.asm
View File

@ -397,8 +397,8 @@ KrissHouse1F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $4, $8, $0, UnknownScript_0x7a4d8, $0, $0 xy_trigger 0, $4, $8, UnknownScript_0x7a4d8
xy_trigger 0, $4, $9, $0, UnknownScript_0x7a4db, $0, $0 xy_trigger 0, $4, $9, UnknownScript_0x7a4db
.Signposts: .Signposts:
db 4 db 4

4
maps/LancesRoom.asm
View File

@ -350,8 +350,8 @@ LancesRoom_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 1, $5, $4, $0, Script_ApproachLanceFromLeft, $0, $0 xy_trigger 1, $5, $4, Script_ApproachLanceFromLeft
xy_trigger 1, $5, $5, $0, Script_ApproachLanceFromRight, $0, $0 xy_trigger 1, $5, $5, Script_ApproachLanceFromRight
.Signposts: .Signposts:
db 0 db 0

4
maps/MahoganyTown.asm
View File

@ -258,8 +258,8 @@ MahoganyTown_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $8, $13, $0, UnknownScript_0x190013, $0, $0 xy_trigger 0, $8, $13, UnknownScript_0x190013
xy_trigger 0, $9, $13, $0, UnknownScript_0x190013, $0, $0 xy_trigger 0, $9, $13, UnknownScript_0x190013
.Signposts: .Signposts:
db 4 db 4

2
maps/MountMoonSquare.asm
View File

@ -145,7 +145,7 @@ MountMoonSquare_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $b, $7, $0, ClefairyDance, $0, $0 xy_trigger 0, $b, $7, ClefairyDance
.Signposts: .Signposts:
db 2 db 2

4
maps/NewBarkTown.asm
View File

@ -294,8 +294,8 @@ NewBarkTown_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $8, $1, $0, NewBarkTown_TeacherStopsYouTrigger1, $0, $0 xy_trigger 0, $8, $1, NewBarkTown_TeacherStopsYouTrigger1
xy_trigger 0, $9, $1, $0, NewBarkTown_TeacherStopsYouTrigger2, $0, $0 xy_trigger 0, $9, $1, NewBarkTown_TeacherStopsYouTrigger2
.Signposts: .Signposts:
db 4 db 4

4
maps/OlivineCity.asm
View File

@ -307,8 +307,8 @@ OlivineCity_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $c, $d, $0, UnknownScript_0x1a8833, $0, $0 xy_trigger 0, $c, $d, UnknownScript_0x1a8833
xy_trigger 0, $d, $d, $0, UnknownScript_0x1a886b, $0, $0 xy_trigger 0, $d, $d, UnknownScript_0x1a886b
.Signposts: .Signposts:
db 7 db 7

2
maps/OlivinePort.asm
View File

@ -396,7 +396,7 @@ OlivinePort_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $f, $7, $0, UnknownScript_0x7491f, $0, $0 xy_trigger 0, $f, $7, UnknownScript_0x7491f
.Signposts: .Signposts:
db 1 db 1

2
maps/PowerPlant.asm
View File

@ -399,7 +399,7 @@ PowerPlant_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 1, $c, $5, $0, PowerPlantGuardPhoneScript, $0, $0 xy_trigger 1, $c, $5, PowerPlantGuardPhoneScript
.Signposts: .Signposts:
db 2 db 2

4
maps/RadioTower5F.asm
View File

@ -431,8 +431,8 @@ RadioTower5F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $3, $0, $0, FakeDirectorScript, $0, $0 xy_trigger 0, $3, $0, FakeDirectorScript
xy_trigger 1, $5, $10, $0, RadioTower5FRocketBossTrigger, $0, $0 xy_trigger 1, $5, $10, RadioTower5FRocketBossTrigger
.Signposts: .Signposts:
db 5 db 5

4
maps/Route16Gate.asm
View File

@ -73,8 +73,8 @@ Route16Gate_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $4, $5, $0, UnknownScript_0x733ed, $0, $0 xy_trigger 0, $4, $5, UnknownScript_0x733ed
xy_trigger 0, $5, $5, $0, UnknownScript_0x733ed, $0, $0 xy_trigger 0, $5, $5, UnknownScript_0x733ed
.Signposts: .Signposts:
db 0 db 0

4
maps/Route1718Gate.asm
View File

@ -64,8 +64,8 @@ Route1718Gate_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $4, $5, $0, UnknownScript_0x73611, $0, $0 xy_trigger 0, $4, $5, UnknownScript_0x73611
xy_trigger 0, $5, $5, $0, UnknownScript_0x73611, $0, $0 xy_trigger 0, $5, $5, UnknownScript_0x73611
.Signposts: .Signposts:
db 0 db 0

4
maps/Route25.asm
View File

@ -440,8 +440,8 @@ Route25_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 1, $6, $2a, $0, UnknownScript_0x19eea0, $0, $0 xy_trigger 1, $6, $2a, UnknownScript_0x19eea0
xy_trigger 1, $7, $2a, $0, UnknownScript_0x19eee0, $0, $0 xy_trigger 1, $7, $2a, UnknownScript_0x19eee0
.Signposts: .Signposts:
db 2 db 2

4
maps/Route27.asm
View File

@ -479,8 +479,8 @@ Route27_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $a, $12, $0, UnknownScript_0x1a0873, $0, $0 xy_trigger 0, $a, $12, UnknownScript_0x1a0873
xy_trigger 0, $a, $13, $0, UnknownScript_0x1a0881, $0, $0 xy_trigger 0, $a, $13, UnknownScript_0x1a0881
.Signposts: .Signposts:
db 1 db 1

4
maps/Route29.asm
View File

@ -425,8 +425,8 @@ Route29_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 1, $8, $35, $0, Route29Tutorial1, $0, $0 xy_trigger 1, $8, $35, Route29Tutorial1
xy_trigger 1, $9, $35, $0, Route29Tutorial2, $0, $0 xy_trigger 1, $9, $35, Route29Tutorial2
.Signposts: .Signposts:
db 2 db 2

4
maps/Route32.asm
View File

@ -943,8 +943,8 @@ Route32_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $8, $12, $0, Route32CooltrainerMStopsYou, $0, $0 xy_trigger 0, $8, $12, Route32CooltrainerMStopsYou
xy_trigger 1, $47, $7, $0, Route32WannaBuyASlowpokeTailScript, $0, $0 xy_trigger 1, $47, $7, Route32WannaBuyASlowpokeTailScript
.Signposts: .Signposts:
db 6 db 6

2
maps/Route34IlexForestGate.asm
View File

@ -148,7 +148,7 @@ Route34IlexForestGate_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $7, $4, $0, UnknownScript_0x62d3d, $0, $0 xy_trigger 0, $7, $4, UnknownScript_0x62d3d
.Signposts: .Signposts:
db 0 db 0

4
maps/Route36.asm
View File

@ -672,8 +672,8 @@ Route36_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 1, $7, $14, $0, Route36SuicuneScript, $0, $0 xy_trigger 1, $7, $14, Route36SuicuneScript
xy_trigger 1, $7, $16, $0, Route36SuicuneScript, $0, $0 xy_trigger 1, $7, $16, Route36SuicuneScript
.Signposts: .Signposts:
db 4 db 4

2
maps/Route42.asm
View File

@ -333,7 +333,7 @@ Route42_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 1, $e, $18, $0, Route42SuicuneScript, $0, $0 xy_trigger 1, $e, $18, Route42SuicuneScript
.Signposts: .Signposts:
db 5 db 5

4
maps/RuinsOfAlphOutside.asm
View File

@ -302,8 +302,8 @@ RuinsOfAlphOutside_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 1, $e, $b, $0, RuinsOfAlphOutsideScientistTrigger1, $0, $0 xy_trigger 1, $e, $b, RuinsOfAlphOutsideScientistTrigger1
xy_trigger 1, $f, $a, $0, RuinsOfAlphOutsideScientistTrigger2, $0, $0 xy_trigger 1, $f, $a, RuinsOfAlphOutsideScientistTrigger2
.Signposts: .Signposts:
db 3 db 3

2
maps/SaffronTrainStation.asm
View File

@ -228,7 +228,7 @@ SaffronTrainStation_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $6, $b, $0, Script_ArriveFromGoldenrod, $0, $0 xy_trigger 0, $6, $b, Script_ArriveFromGoldenrod
.Signposts: .Signposts:
db 0 db 0

2
maps/SproutTower3F.asm
View File

@ -339,7 +339,7 @@ SproutTower3F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $9, $b, $0, UnknownScript_0x184947, $0, $0 xy_trigger 0, $9, $b, UnknownScript_0x184947
.Signposts: .Signposts:
db 6 db 6

60
maps/TeamRocketBaseB1F.asm
View File

@ -742,38 +742,38 @@ TeamRocketBaseB1F_MapEventHeader:
db 30 db 30
; There are five security cameras in the base. ; There are five security cameras in the base.
; Walking in front of one triggers two Rocket Grunts. ; Walking in front of one triggers two Rocket Grunts.
xy_trigger 0, $2, $18, $0, SecurityCamera1a, $0, $0 xy_trigger 0, $2, $18, SecurityCamera1a
xy_trigger 0, $3, $18, $0, SecurityCamera1b, $0, $0 xy_trigger 0, $3, $18, SecurityCamera1b
xy_trigger 0, $2, $6, $0, SecurityCamera2a, $0, $0 xy_trigger 0, $2, $6, SecurityCamera2a
xy_trigger 0, $3, $6, $0, SecurityCamera2b, $0, $0 xy_trigger 0, $3, $6, SecurityCamera2b
xy_trigger 0, $6, $18, $0, SecurityCamera3a, $0, $0 xy_trigger 0, $6, $18, SecurityCamera3a
xy_trigger 0, $7, $18, $0, SecurityCamera3b, $0, $0 xy_trigger 0, $7, $18, SecurityCamera3b
xy_trigger 0, $10, $16, $0, SecurityCamera4, $0, $0 xy_trigger 0, $10, $16, SecurityCamera4
xy_trigger 0, $10, $8, $0, SecurityCamera5, $0, $0 xy_trigger 0, $10, $8, SecurityCamera5
; There are spots on the floor that trigger a Pokémon battle. ; There are spots on the floor that trigger a Pokémon battle.
; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct. ; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct.
xy_trigger 0, $7, $2, $0, ExplodingTrap1, $0, $0 xy_trigger 0, $7, $2, ExplodingTrap1
xy_trigger 0, $7, $3, $0, ExplodingTrap2, $0, $0 xy_trigger 0, $7, $3, ExplodingTrap2
xy_trigger 0, $7, $4, $0, ExplodingTrap3, $0, $0 xy_trigger 0, $7, $4, ExplodingTrap3
xy_trigger 0, $8, $1, $0, ExplodingTrap4, $0, $0 xy_trigger 0, $8, $1, ExplodingTrap4
xy_trigger 0, $8, $3, $0, ExplodingTrap5, $0, $0 xy_trigger 0, $8, $3, ExplodingTrap5
xy_trigger 0, $8, $5, $0, ExplodingTrap6, $0, $0 xy_trigger 0, $8, $5, ExplodingTrap6
xy_trigger 0, $9, $3, $0, ExplodingTrap7, $0, $0 xy_trigger 0, $9, $3, ExplodingTrap7
xy_trigger 0, $9, $4, $0, ExplodingTrap8, $0, $0 xy_trigger 0, $9, $4, ExplodingTrap8
xy_trigger 0, $a, $1, $0, ExplodingTrap9, $0, $0 xy_trigger 0, $a, $1, ExplodingTrap9
xy_trigger 0, $a, $2, $0, ExplodingTrap10, $0, $0 xy_trigger 0, $a, $2, ExplodingTrap10
xy_trigger 0, $a, $3, $0, ExplodingTrap11, $0, $0 xy_trigger 0, $a, $3, ExplodingTrap11
xy_trigger 0, $a, $5, $0, ExplodingTrap12, $0, $0 xy_trigger 0, $a, $5, ExplodingTrap12
xy_trigger 0, $b, $2, $0, ExplodingTrap13, $0, $0 xy_trigger 0, $b, $2, ExplodingTrap13
xy_trigger 0, $b, $4, $0, ExplodingTrap14, $0, $0 xy_trigger 0, $b, $4, ExplodingTrap14
xy_trigger 0, $c, $1, $0, ExplodingTrap15, $0, $0 xy_trigger 0, $c, $1, ExplodingTrap15
xy_trigger 0, $c, $2, $0, ExplodingTrap16, $0, $0 xy_trigger 0, $c, $2, ExplodingTrap16
xy_trigger 0, $c, $4, $0, ExplodingTrap17, $0, $0 xy_trigger 0, $c, $4, ExplodingTrap17
xy_trigger 0, $c, $5, $0, ExplodingTrap18, $0, $0 xy_trigger 0, $c, $5, ExplodingTrap18
xy_trigger 0, $d, $1, $0, ExplodingTrap19, $0, $0 xy_trigger 0, $d, $1, ExplodingTrap19
xy_trigger 0, $d, $3, $0, ExplodingTrap20, $0, $0 xy_trigger 0, $d, $3, ExplodingTrap20
xy_trigger 0, $d, $4, $0, ExplodingTrap21, $0, $0 xy_trigger 0, $d, $4, ExplodingTrap21
xy_trigger 0, $d, $5, $0, ExplodingTrap22, $0, $0 xy_trigger 0, $d, $5, ExplodingTrap22
.Signposts: .Signposts:
db 9 db 9

18
maps/TeamRocketBaseB2F.asm
View File

@ -923,15 +923,15 @@ TeamRocketBaseB2F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 9 db 9
xy_trigger 0, $e, $5, $0, LanceHealsScript1, $0, $0 xy_trigger 0, $e, $5, LanceHealsScript1
xy_trigger 0, $d, $4, $0, LanceHealsScript2, $0, $0 xy_trigger 0, $d, $4, LanceHealsScript2
xy_trigger 1, $b, $e, $0, UnknownScript_0x6cf95, $0, $0 xy_trigger 1, $b, $e, UnknownScript_0x6cf95
xy_trigger 1, $b, $f, $0, UnknownScript_0x6cf9c, $0, $0 xy_trigger 1, $b, $f, UnknownScript_0x6cf9c
xy_trigger 2, $c, $e, $0, UnknownScript_0x6d075, $0, $0 xy_trigger 2, $c, $e, UnknownScript_0x6d075
xy_trigger 2, $c, $f, $0, UnknownScript_0x6d075, $0, $0 xy_trigger 2, $c, $f, UnknownScript_0x6d075
xy_trigger 2, $3, $c, $0, UnknownScript_0x6d07a, $0, $0 xy_trigger 2, $3, $c, UnknownScript_0x6d07a
xy_trigger 2, $a, $c, $0, UnknownScript_0x6d07a, $0, $0 xy_trigger 2, $a, $c, UnknownScript_0x6d07a
xy_trigger 2, $b, $c, $0, UnknownScript_0x6d07a, $0, $0 xy_trigger 2, $b, $c, UnknownScript_0x6d07a
.Signposts: .Signposts:
db 23 db 23

6
maps/TeamRocketBaseB3F.asm
View File

@ -578,9 +578,9 @@ TeamRocketBaseB3F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 3 db 3
xy_trigger 2, $8, $a, $0, UnknownScript_0x6e04b, $0, $0 xy_trigger 2, $8, $a, UnknownScript_0x6e04b
xy_trigger 2, $8, $b, $0, UnknownScript_0x6e052, $0, $0 xy_trigger 2, $8, $b, UnknownScript_0x6e052
xy_trigger 1, $a, $8, $0, RocketBaseRival, $0, $0 xy_trigger 1, $a, $8, RocketBaseRival
.Signposts: .Signposts:
db 10 db 10

2
maps/TrainerHouseB1F.asm
View File

@ -179,7 +179,7 @@ TrainerHouseB1F_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $3, $7, $0, TrainerHouseReceptionistScript, $0, $0 xy_trigger 0, $3, $7, TrainerHouseReceptionistScript
.Signposts: .Signposts:
db 0 db 0

4
maps/UndergroundPathSwitchRoomEntrances.asm
View File

@ -949,8 +949,8 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $4, $13, $0, UndergroundSilverTrigger1, $0, 0 xy_trigger 0, $4, $13, UndergroundSilverTrigger1
xy_trigger 0, $5, $13, $0, UndergroundSilverTrigger2, $0, 0 xy_trigger 0, $5, $13, UndergroundSilverTrigger2
.Signposts: .Signposts:
db 6 db 6

2
maps/VermilionPort.asm
View File

@ -310,7 +310,7 @@ VermilionPort_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $b, $7, $0, UnknownScript_0x74e20, $0, $0 xy_trigger 0, $b, $7, UnknownScript_0x74e20
.Signposts: .Signposts:
db 1 db 1

4
maps/VictoryRoad.asm
View File

@ -259,8 +259,8 @@ VictoryRoad_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 0, $8, $c, $0, UnknownScript_0x74492, $0, $0 xy_trigger 0, $8, $c, UnknownScript_0x74492
xy_trigger 0, $8, $d, $0, UnknownScript_0x744b5, $0, $0 xy_trigger 0, $8, $d, UnknownScript_0x744b5
.Signposts: .Signposts:
db 2 db 2

2
maps/VictoryRoadGate.asm
View File

@ -114,7 +114,7 @@ VictoryRoadGate_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $b, $a, $0, VictoryRoadGateBadgeCheckTrigger, $0, $0 xy_trigger 0, $b, $a, VictoryRoadGateBadgeCheckTrigger
.Signposts: .Signposts:
db 0 db 0

2
maps/WiseTriosRoom.asm
View File

@ -356,7 +356,7 @@ WiseTriosRoom_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $4, $7, $0, UnknownScript_0x985a3, $0, $0 xy_trigger 0, $4, $7, UnknownScript_0x985a3
.Signposts: .Signposts:
db 0 db 0