xy_trigger handles $0 padding, so map scripts are simpler

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

View File

@@ -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