aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/undergroundpathentranceroute5.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/undergroundpathentranceroute5.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/undergroundpathentranceroute5.asm')
-rwxr-xr-xdata/mapObjects/undergroundpathentranceroute5.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm
index 14d7232e..dd6746a7 100755
--- a/data/mapObjects/undergroundpathentranceroute5.asm
+++ b/data/mapObjects/undergroundpathentranceroute5.asm
@@ -1,17 +1,17 @@
UndergroundPathEntranceRoute5Object:
db $a ; border block
- db $3 ; warps
- db $7, $3, $3, $ff
- db $7, $4, $3, $ff
- db $4, $4, $0, UNDERGROUND_PATH_NS
+ db 3 ; warps
+ warp 3, 7, 3, -1
+ warp 4, 7, 3, -1
+ warp 4, 4, 0, UNDERGROUND_PATH_NS
- db $0 ; signs
+ db 0 ; signs
- db $1 ; objects
- object SPRITE_LITTLE_GIRL, $2, $3, STAY, NONE, $1 ; person
+ db 1 ; objects
+ object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person
; warp-to
- EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $3
- EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $4
- EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $4, $4 ; UNDERGROUND_PATH_NS
+ warp_to 3, 7, PATH_ENTRANCE_ROUTE_5_WIDTH
+ warp_to 4, 7, PATH_ENTRANCE_ROUTE_5_WIDTH
+ warp_to 4, 4, PATH_ENTRANCE_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH