aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/ssanne7.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
commitd271d6917549074e721f3e5064b77e1ad1dbe44a (patch)
treecee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/ssanne7.asm
parentAdd pokegold and pokefirered. (diff)
downloadpokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.gz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.xz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.zip
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/ssanne7.asm')
-rwxr-xr-xdata/mapObjects/ssanne7.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm
index 6002e85b..8e9c9194 100755
--- a/data/mapObjects/ssanne7.asm
+++ b/data/mapObjects/ssanne7.asm
@@ -2,14 +2,14 @@ SSAnne7Object:
db $c ; border block
db $1 ; warps
- db $7, $0, $8, SS_ANNE_2
+ warp $0, $7, $8, SS_ANNE_2
db $2 ; signs
- db $1, $4, $2 ; SSAnne7Text2
- db $2, $1, $3 ; SSAnne7Text3
+ sign $4, $1, $2 ; SSAnne7Text2
+ sign $1, $2, $3 ; SSAnne7Text3
db $1 ; objects
object SPRITE_SS_CAPTAIN, $4, $2, STAY, UP, $1 ; person
; warp-to
- EVENT_DISP SS_ANNE_7_WIDTH, $7, $0 ; SS_ANNE_2
+ warp_to $0, $7, SS_ANNE_7_WIDTH ; SS_ANNE_2