diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
| commit | 4b36a9d2e1d6b6ac823fbb14e8f0ba750b0eecc2 (patch) | |
| tree | fcbbd0247503a200c4c1d8df690a676b49a09efd /maps/ElmsLab.asm | |
| parent | e3ee39f3344107f666099448401d28b04c983cd6 (diff) | |
| parent | a6656a986bf9dde51561cab090648e0117b173ad (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'maps/ElmsLab.asm')
| -rw-r--r-- | maps/ElmsLab.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index c64997e71..4eeba20da 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 |