diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
| commit | 94ed208164c3f6484a26923c5bc7664b9a3c4002 (patch) | |
| tree | e6141c9f312ae0edf4b4741a729b03fea1ddebf5 /data/maps/objects/SilphCo7F.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Align `object_event` coordinates (diff) | |
| download | pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.gz pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.xz pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index 7855516c..d6dfeffe 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -12,16 +12,16 @@ SilphCo7F_Object: def_bg_events def_object_events - object_event 1, 5, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person + 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 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 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 |