diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/SummerBeachHouse.asm | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.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 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/SummerBeachHouse.asm b/data/maps/objects/SummerBeachHouse.asm index c503b8a7..7d6ddf0f 100644 --- a/data/maps/objects/SummerBeachHouse.asm +++ b/data/maps/objects/SummerBeachHouse.asm @@ -1,18 +1,18 @@ SummerBeachHouse_Object: db $a ; border block - def_warps - warp 2, 7, 0, LAST_MAP - warp 3, 7, 0, LAST_MAP + def_warp_events + warp_event 2, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 0 - def_signs - sign 3, 0, 3 - sign 7, 0, 4 - sign 11, 0, 5 - sign 13, 1, 6 + def_bg_events + bg_event 3, 0, 3 + bg_event 7, 0, 4 + bg_event 11, 0, 5 + bg_event 13, 1, 6 - def_objects - object SPRITE_FISHING_GURU, 2, 3, STAY, DOWN, 1 ; surfin' dude - object SPRITE_PIKACHU, 5, 3, WALK, 1, 2 ; pikachu + 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 def_warps_to SUMMER_BEACH_HOUSE |