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/CeruleanCity.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/CeruleanCity.asm')
| -rw-r--r-- | data/maps/objects/CeruleanCity.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index c7843481..e45bfbda 100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -22,16 +22,16 @@ CeruleanCity_Object: bg_event 27, 21, 17 ; CeruleanCityText17 def_object_events - object_event 20, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person - object_event 30, 8, SPRITE_ROCKET, STAY, NONE, 2, OPP_ROCKET, 5 + object_event 20, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person + object_event 30, 8, SPRITE_ROCKET, STAY, NONE, 2, OPP_ROCKET, 5 object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, 3 ; person object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, 4 ; person - object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person + object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person object_event 28, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, 6 ; person object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person object_event 28, 26, SPRITE_POKE_BALL, STAY, DOWN, 8 ; person - object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person - object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person + object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person + object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person object_event 27, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, 11 ; person def_warps_to CERULEAN_CITY |