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/lorelei.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/lorelei.asm')
| -rwxr-xr-x | data/mapObjects/lorelei.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 5b985369..9791b859 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -2,10 +2,10 @@ LoreleiObject: db $3 ; border block db $4 ; warps - db $b, $4, $2, INDIGO_PLATEAU_LOBBY - db $b, $5, $2, INDIGO_PLATEAU_LOBBY - db $0, $4, $0, BRUNOS_ROOM - db $0, $5, $1, BRUNOS_ROOM + warp $4, $b, $2, INDIGO_PLATEAU_LOBBY + warp $5, $b, $2, INDIGO_PLATEAU_LOBBY + warp $4, $0, $0, BRUNOS_ROOM + warp $5, $0, $1, BRUNOS_ROOM db $0 ; signs @@ -13,7 +13,7 @@ LoreleiObject: object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, OPP_LORELEI, $1 ; warp-to - EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY - EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $5 ; INDIGO_PLATEAU_LOBBY - EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $4 ; BRUNOS_ROOM - EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $5 ; BRUNOS_ROOM + warp_to $4, $b, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to $5, $b, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to $4, $0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to $5, $0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM |