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/WardensHouse.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/WardensHouse.asm')
| -rw-r--r-- | data/maps/objects/WardensHouse.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index 9b66c464..46e1f35b 100644 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm @@ -10,8 +10,8 @@ WardensHouse_Object: bg_event 5, 3, 5 ; FuchsiaHouse2Text5 def_object_events - object_event 2, 3, SPRITE_WARDEN, STAY, NONE, 1 ; person - object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 2, RARE_CANDY - object_event 8, 4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object_event 2, 3, SPRITE_WARDEN, STAY, NONE, 1 ; person + object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 2, RARE_CANDY + object_event 8, 4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person def_warps_to WARDENS_HOUSE |
