aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/RocketHideoutElevator.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-09-26 22:38:47 -0500
committerdannye <33dannye@gmail.com>2021-09-26 22:43:09 -0500
commit501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch)
treec2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/RocketHideoutElevator.asm
parentSwitch from Travis CI to GitHub Actions (diff)
parentFix typos (#334) (diff)
downloadpokeyellow-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/RocketHideoutElevator.asm')
-rw-r--r--data/maps/objects/RocketHideoutElevator.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/objects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm
index 20ab4956..25c507f1 100644
--- a/data/maps/objects/RocketHideoutElevator.asm
+++ b/data/maps/objects/RocketHideoutElevator.asm
@@ -1,13 +1,13 @@
RocketHideoutElevator_Object:
db $f ; border block
- def_warps
- warp 2, 1, 2, ROCKET_HIDEOUT_B1F
- warp 3, 1, 4, ROCKET_HIDEOUT_B1F
+ def_warp_events
+ warp_event 2, 1, ROCKET_HIDEOUT_B1F, 2
+ warp_event 3, 1, ROCKET_HIDEOUT_B1F, 4
- def_signs
- sign 1, 1, 1 ; RocketHideoutElevatorText1
+ def_bg_events
+ bg_event 1, 1, 1 ; RocketHideoutElevatorText1
- def_objects
+ def_object_events
def_warps_to ROCKET_HIDEOUT_ELEVATOR