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/bruno.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/bruno.asm')
| -rwxr-xr-x | data/mapObjects/bruno.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index a734b07b..b0df7215 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -2,10 +2,10 @@ BrunoObject: db $3 ; border block db $4 ; warps - db $b, $4, $2, LORELEIS_ROOM - db $b, $5, $3, LORELEIS_ROOM - db $0, $4, $0, AGATHAS_ROOM - db $0, $5, $1, AGATHAS_ROOM + warp $4, $b, $2, LORELEIS_ROOM + warp $5, $b, $3, LORELEIS_ROOM + warp $4, $0, $0, AGATHAS_ROOM + warp $5, $0, $1, AGATHAS_ROOM db $0 ; signs @@ -13,7 +13,7 @@ BrunoObject: object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, OPP_BRUNO, $1 ; warp-to - EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $5 ; LORELEIS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $4 ; AGATHAS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $5 ; AGATHAS_ROOM + warp_to $4, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to $5, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to $4, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM + warp_to $5, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM |