aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmartelevator.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-03-27 14:11:59 -0500
committerGitHub <noreply@github.com>2020-03-27 14:11:59 -0500
commite2e8bf6a8477af254ea7057028f72ac918b62005 (patch)
treeffed0137cf81880afa4b0ec2fa30300565996f4b /data/mapObjects/celadonmartelevator.asm
parentMerge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff)
parentRemoved EVENT_DISP (diff)
downloadpokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.gz
pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.xz
pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.zip
Merge pull request #47 from ValientOrc98/master
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/celadonmartelevator.asm')
-rwxr-xr-xdata/mapObjects/celadonmartelevator.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm
index 2db8635a..14fca2bf 100755
--- a/data/mapObjects/celadonmartelevator.asm
+++ b/data/mapObjects/celadonmartelevator.asm
@@ -1,15 +1,15 @@
CeladonMartElevatorObject:
db $f ; border block
- db $2 ; warps
- db $3, $1, $5, CELADON_MART_1
- db $3, $2, $5, CELADON_MART_1
+ db 2 ; warps
+ warp 1, 3, 5, CELADON_MART_1
+ warp 2, 3, 5, CELADON_MART_1
- db $1 ; signs
- db $0, $3, $1 ; CeladonMartElevatorText1
+ db 1 ; signs
+ sign 3, 0, 1 ; CeladonMartElevatorText1
- db $0 ; objects
+ db 0 ; objects
; warp-to
- EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $1 ; CELADON_MART_1
- EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $2 ; CELADON_MART_1
+ warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F
+ warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F