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/SilphCo1F.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/SilphCo1F.asm')
| -rw-r--r-- | data/maps/objects/SilphCo1F.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 7a9bdb61..23323e27 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -1,16 +1,16 @@ SilphCo1F_Object: db $2e ; border block - def_warps - warp 10, 17, 5, LAST_MAP - warp 11, 17, 5, LAST_MAP - warp 26, 0, 0, SILPH_CO_2F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 16, 10, 6, SILPH_CO_3F + def_warp_events + warp_event 10, 17, LAST_MAP, 5 + warp_event 11, 17, LAST_MAP, 5 + warp_event 26, 0, SILPH_CO_2F, 0 + warp_event 20, 0, SILPH_CO_ELEVATOR, 0 + warp_event 16, 10, SILPH_CO_3F, 6 - def_signs + def_bg_events - def_objects - object SPRITE_LINK_RECEPTIONIST, 4, 2, STAY, DOWN, 1 ; person + def_object_events + object_event 4, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person def_warps_to SILPH_CO_1F |