diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
| commit | d271d6917549074e721f3e5064b77e1ad1dbe44a (patch) | |
| tree | cee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/gary.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/gary.asm')
| -rwxr-xr-x | data/mapObjects/gary.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index e0f37b91..f26ed787 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -2,10 +2,10 @@ 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 + 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 @@ -14,7 +14,7 @@ GaryObject: 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 |