summaryrefslogtreecommitdiff
path: root/data/mapObjects/agatha.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/agatha.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/agatha.asm')
-rwxr-xr-xdata/mapObjects/agatha.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm
index 22000dde..2651b10a 100755
--- a/data/mapObjects/agatha.asm
+++ b/data/mapObjects/agatha.asm
@@ -2,10 +2,10 @@ AgathaObject:
db $0 ; border block
db $4 ; warps
- db $b, $4, $2, BRUNOS_ROOM
- db $b, $5, $3, BRUNOS_ROOM
- db $0, $4, $0, LANCES_ROOM
- db $0, $5, $0, LANCES_ROOM
+ warp $4, $b, $2, BRUNOS_ROOM
+ warp $5, $b, $3, BRUNOS_ROOM
+ warp $4, $0, $0, LANCES_ROOM
+ warp $5, $0, $0, LANCES_ROOM
db $0 ; signs
@@ -13,7 +13,7 @@ AgathaObject:
object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, OPP_AGATHA, $1
; warp-to
- EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM
- EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $5 ; BRUNOS_ROOM
- EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $4 ; LANCES_ROOM
- EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $5 ; LANCES_ROOM
+ warp_to $4, $b, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM
+ warp_to $5, $b, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM
+ warp_to $4, $0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM
+ warp_to $5, $0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM