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/CeladonMartElevator.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/CeladonMartElevator.asm')
| -rw-r--r-- | data/maps/objects/CeladonMartElevator.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/objects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm index d03984a6..2b0382ef 100644 --- a/data/maps/objects/CeladonMartElevator.asm +++ b/data/maps/objects/CeladonMartElevator.asm @@ -1,13 +1,13 @@ CeladonMartElevator_Object: db $f ; border block - def_warps - warp 1, 3, 5, CELADON_MART_1F - warp 2, 3, 5, CELADON_MART_1F + def_warp_events + warp_event 1, 3, CELADON_MART_1F, 5 + warp_event 2, 3, CELADON_MART_1F, 5 - def_signs - sign 3, 0, 1 ; CeladonMartElevatorText1 + def_bg_events + bg_event 3, 0, 1 ; CeladonMartElevatorText1 - def_objects + def_object_events def_warps_to CELADON_MART_ELEVATOR |