summaryrefslogtreecommitdiff
path: root/data/mapObjects/gary.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/gary.asm')
-rwxr-xr-xdata/mapObjects/gary.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm
index e0f37b91..10d9f0ed 100755
--- a/data/mapObjects/gary.asm
+++ b/data/mapObjects/gary.asm
@@ -1,20 +1,20 @@
GaryObject:
db $3 ; border block
- db $4 ; warps
- db $7, $3, $1, LANCES_ROOM
- db $7, $4, $2, LANCES_ROOM
- db $0, $3, $0, HALL_OF_FAME
- db $0, $4, $0, HALL_OF_FAME
+ db 4 ; warps
+ warp 3, 7, 1, LANCES_ROOM
+ warp 4, 7, 2, LANCES_ROOM
+ warp 3, 0, 0, HALL_OF_FAME
+ warp 4, 0, 0, HALL_OF_FAME
- db $0 ; signs
+ db 0 ; signs
- db $2 ; objects
- object SPRITE_BLUE, $4, $2, STAY, DOWN, $1 ; person
- object SPRITE_OAK, $3, $7, STAY, UP, $2 ; person
+ db 2 ; objects
+ object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person
+ object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person
; warp-to
- EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $3 ; LANCES_ROOM
- EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $4 ; LANCES_ROOM
- EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $3 ; HALL_OF_FAME
- EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $4 ; HALL_OF_FAME
+ warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM
+ warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM
+ warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME
+ warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME