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/SummerBeachHouse.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/SummerBeachHouse.asm')
| -rw-r--r-- | data/maps/objects/SummerBeachHouse.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/SummerBeachHouse.asm b/data/maps/objects/SummerBeachHouse.asm index 7d6ddf0f..c7a4e340 100644 --- a/data/maps/objects/SummerBeachHouse.asm +++ b/data/maps/objects/SummerBeachHouse.asm @@ -12,7 +12,7 @@ SummerBeachHouse_Object: bg_event 13, 1, 6 def_object_events - object_event 2, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; surfin' dude - object_event 5, 3, SPRITE_PIKACHU, WALK, 1, 2 ; pikachu + object_event 2, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; surfin' dude + object_event 5, 3, SPRITE_PIKACHU, WALK, 1, 2 ; pikachu def_warps_to SUMMER_BEACH_HOUSE |