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/CeladonMansion1F.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/CeladonMansion1F.asm')
| -rw-r--r-- | data/maps/objects/CeladonMansion1F.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 274fca30..01a907f1 100644 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm @@ -12,9 +12,9 @@ CeladonMansion1F_Object: bg_event 4, 9, 5 ; CeladonMansion1Text5 def_object_events - object_event 0, 5, SPRITE_MONSTER, STAY, RIGHT, 1 ; person - object_event 1, 5, SPRITE_GRANNY, STAY, DOWN, 2 ; person - object_event 1, 8, SPRITE_FAIRY, WALK, LEFT_RIGHT, 3 ; person - object_event 4, 4, SPRITE_MONSTER, WALK, UP_DOWN, 4 ; person + object_event 0, 5, SPRITE_MONSTER, STAY, RIGHT, 1 ; person + object_event 1, 5, SPRITE_GRANNY, STAY, DOWN, 2 ; person + object_event 1, 8, SPRITE_FAIRY, WALK, LEFT_RIGHT, 3 ; person + object_event 4, 4, SPRITE_MONSTER, WALK, UP_DOWN, 4 ; person def_warps_to CELADON_MANSION_1F |