diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/SilphCo7F.asm | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/SilphCo7F.asm')
| -rw-r--r-- | data/maps/objects/SilphCo7F.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index 55f2ade6..7855516c 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -1,27 +1,27 @@ SilphCo7F_Object: db $2e ; border block - def_warps - warp 16, 0, 1, SILPH_CO_8F - warp 22, 0, 0, SILPH_CO_6F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 5, 7, 3, SILPH_CO_11F - warp 5, 3, 8, SILPH_CO_3F - warp 21, 15, 3, SILPH_CO_5F + def_warp_events + warp_event 16, 0, SILPH_CO_8F, 1 + warp_event 22, 0, SILPH_CO_6F, 0 + warp_event 18, 0, SILPH_CO_ELEVATOR, 0 + warp_event 5, 7, SILPH_CO_11F, 3 + warp_event 5, 3, SILPH_CO_3F, 8 + warp_event 21, 15, SILPH_CO_5F, 3 - def_signs + def_bg_events - def_objects - object SPRITE_SILPH_WORKER, 1, 5, STAY, NONE, 1 ; person - object SPRITE_SILPH_WORKER, 13, 13, STAY, UP, 2 ; person - object SPRITE_SILPH_WORKER, 7, 10, STAY, NONE, 3 ; person - object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person - object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32 - object SPRITE_SCIENTIST, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8 - object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33 - object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34 - object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person - object SPRITE_POKE_BALL, 1, 9, STAY, NONE, 10, CALCIUM - object SPRITE_POKE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE + def_object_events + object_event 1, 5, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person + object_event 13, 13, SPRITE_SILPH_WORKER, STAY, UP, 2 ; person + object_event 7, 10, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person + object_event 10, 8, SPRITE_ERIKA, STAY, NONE, 4 ; person + object_event 13, 1, SPRITE_ROCKET, STAY, DOWN, 5, OPP_ROCKET, 32 + object_event 2, 13, SPRITE_SCIENTIST, STAY, DOWN, 6, OPP_SCIENTIST, 8 + object_event 20, 2, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 33 + object_event 19, 14, SPRITE_ROCKET, STAY, RIGHT, 8, OPP_ROCKET, 34 + object_event 3, 7, SPRITE_BLUE, STAY, UP, 9 ; person + object_event 1, 9, SPRITE_POKE_BALL, STAY, NONE, 10, CALCIUM + object_event 24, 11, SPRITE_POKE_BALL, STAY, NONE, 11, TM_SWORDS_DANCE def_warps_to SILPH_CO_7F |