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/SaffronCity.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/SaffronCity.asm')
| -rw-r--r-- | data/maps/objects/SaffronCity.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index e3e067bf..c301ad7e 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -24,19 +24,19 @@ SaffronCity_Object: bg_event 1, 19, 25 ; SaffronCityText25 def_object_events - object_event 7, 6, SPRITE_ROCKET, STAY, NONE, 1 ; person - object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, 2 ; person - object_event 34, 4, SPRITE_ROCKET, STAY, NONE, 3 ; person + object_event 7, 6, SPRITE_ROCKET, STAY, NONE, 1 ; person + object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, 2 ; person + object_event 34, 4, SPRITE_ROCKET, STAY, NONE, 3 ; person object_event 13, 12, SPRITE_ROCKET, STAY, NONE, 4 ; person object_event 11, 25, SPRITE_ROCKET, WALK, LEFT_RIGHT, 5 ; person object_event 32, 13, SPRITE_ROCKET, WALK, LEFT_RIGHT, 6 ; person object_event 18, 30, SPRITE_ROCKET, WALK, LEFT_RIGHT, 7 ; person - object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, 8 ; person + object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, 8 ; person object_event 23, 23, SPRITE_SILPH_WORKER, STAY, NONE, 9 ; person object_event 17, 30, SPRITE_ERIKA, WALK, LEFT_RIGHT, 10 ; person object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, 11 ; person object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; person - object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person + object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person def_warps_to SAFFRON_CITY |