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/lance.asm | |
| parent | Add pokegold and pokefirered. (diff) | |
| download | pokeyellow-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/lance.asm')
| -rwxr-xr-x | data/mapObjects/lance.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index e7bf0ad6..73ed8e63 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -2,9 +2,9 @@ LanceObject: db $3 ; border block db $3 ; warps - db $10, $18, $2, AGATHAS_ROOM - db $0, $5, $0, CHAMPIONS_ROOM - db $0, $6, $0, CHAMPIONS_ROOM + warp $18, $10, $2, AGATHAS_ROOM + warp $5, $0, $0, CHAMPIONS_ROOM + warp $6, $0, $0, CHAMPIONS_ROOM db $0 ; signs @@ -12,6 +12,6 @@ LanceObject: object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, OPP_LANCE, $1 ; warp-to - EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM - EVENT_DISP LANCES_ROOM_WIDTH, $0, $5 ; CHAMPIONS_ROOM - EVENT_DISP LANCES_ROOM_WIDTH, $0, $6 ; CHAMPIONS_ROOM + warp_to $18, $10, LANCES_ROOM_WIDTH ; AGATHAS_ROOM + warp_to $5, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM + warp_to $6, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM |