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/VermilionCity.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/VermilionCity.asm')
| -rw-r--r-- | data/maps/objects/VermilionCity.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index e86720fe..8780717c 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -22,11 +22,11 @@ VermilionCity_Object: bg_event 29, 15, 14 ; VermilionCityText13 def_object_events - object_event 19, 7, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 1 ; person - object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person + object_event 19, 7, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 1 ; person + object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person object_event 19, 30, SPRITE_SAILOR, STAY, UP, 3 ; person - object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, 4 ; person - object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person + object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, 4 ; person + object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person object_event 19, 15, SPRITE_OFFICER_JENNY, STAY, NONE, 7 ; person |