aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/ssanne4.asm
diff options
context:
space:
mode:
authorShakib2001 <shakibafzali@gmail.com>2020-03-27 14:31:38 -0400
committerShakib2001 <shakibafzali@gmail.com>2020-03-27 14:31:38 -0400
commit3d8e949d373a828fee370b08d005f131abb67333 (patch)
treee200b8d12dbbbcb7683560fb904b32a5c5a1c9a7 /data/mapObjects/ssanne4.asm
parentMerge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff)
downloadpokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.gz
pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.xz
pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.zip
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/ssanne4.asm')
-rwxr-xr-xdata/mapObjects/ssanne4.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm
index fbd1df5b..f4a0d720 100755
--- a/data/mapObjects/ssanne4.asm
+++ b/data/mapObjects/ssanne4.asm
@@ -1,22 +1,22 @@
SSAnne4Object:
db $c ; border block
- db $6 ; warps
- db $3, $17, $8, SS_ANNE_10
- db $3, $13, $6, SS_ANNE_10
- db $3, $f, $4, SS_ANNE_10
- db $3, $b, $2, SS_ANNE_10
- db $3, $7, $0, SS_ANNE_10
- db $5, $1b, $9, SS_ANNE_1
+ db 6 ; warps
+ warp 23, 3, 8, SS_ANNE_10
+ warp 19, 3, 6, SS_ANNE_10
+ warp 15, 3, 4, SS_ANNE_10
+ warp 11, 3, 2, SS_ANNE_10
+ warp 7, 3, 0, SS_ANNE_10
+ warp 27, 5, 9, SS_ANNE_1
- db $0 ; signs
+ db 0 ; signs
- db $0 ; objects
+ db 0 ; objects
; warp-to
- EVENT_DISP SS_ANNE_4_WIDTH, $3, $17 ; SS_ANNE_10
- EVENT_DISP SS_ANNE_4_WIDTH, $3, $13 ; SS_ANNE_10
- EVENT_DISP SS_ANNE_4_WIDTH, $3, $f ; SS_ANNE_10
- EVENT_DISP SS_ANNE_4_WIDTH, $3, $b ; SS_ANNE_10
- EVENT_DISP SS_ANNE_4_WIDTH, $3, $7 ; SS_ANNE_10
- EVENT_DISP SS_ANNE_4_WIDTH, $5, $1b ; SS_ANNE_1
+ warp_to 23, 3, SS_ANNE_4_WIDTH ; SS_ANNE_B1F_ROOMS
+ warp_to 19, 3, SS_ANNE_4_WIDTH ; SS_ANNE_B1F_ROOMS
+ warp_to 15, 3, SS_ANNE_4_WIDTH ; SS_ANNE_B1F_ROOMS
+ warp_to 11, 3, SS_ANNE_4_WIDTH ; SS_ANNE_B1F_ROOMS
+ warp_to 7, 3, SS_ANNE_4_WIDTH ; SS_ANNE_B1F_ROOMS
+ warp_to 27, 5, SS_ANNE_4_WIDTH ; SS_ANNE_1F