aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/RocketHideoutElevator.asm
diff options
context:
space:
mode:
authorYoann Fievez <yoann.fievez@gmail.com>2021-09-27 04:56:09 +0200
committerGitHub <noreply@github.com>2021-09-26 21:56:09 -0500
commit2c4f35848b786864822a3f211df91de30a2857c9 (patch)
treefcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/RocketHideoutElevator.asm
parent`ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` (diff)
downloadpokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.gz
pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.xz
pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.zip
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289 * Rename warp to warp_event * Replace object to object_event * Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
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