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/FuchsiaCity.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/FuchsiaCity.asm')
| -rw-r--r-- | data/maps/objects/FuchsiaCity.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index 0a421fb7..06caf507 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -32,12 +32,12 @@ FuchsiaCity_Object: object_event 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person - object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person - object_event 31, 5, SPRITE_CHANSEY, STAY, DOWN, 5 ; person - object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person - object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person + object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person + object_event 31, 5, SPRITE_CHANSEY, STAY, DOWN, 5 ; person + object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person + object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, 8 ; person - object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person - object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, 10 ; person + object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person + object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, 10 ; person def_warps_to FUCHSIA_CITY |