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/silphco1.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/silphco1.asm')
| -rwxr-xr-x | data/mapObjects/silphco1.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index fe779393..0ef17156 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -2,11 +2,11 @@ SilphCo1Object: db $2e ; border block db $5 ; warps - db $11, $a, $5, $ff - db $11, $b, $5, $ff - db $0, $1a, $0, SILPH_CO_2F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $a, $10, $6, SILPH_CO_3F + warp $a, $11, $5, $ff + warp $b, $11, $5, $ff + warp $1a, $0, $0, SILPH_CO_2F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $10, $a, $6, SILPH_CO_3F db $0 ; signs @@ -14,8 +14,8 @@ SilphCo1Object: object SPRITE_CABLE_CLUB_WOMAN, $4, $2, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP SILPH_CO_1F_WIDTH, $11, $a - EVENT_DISP SILPH_CO_1F_WIDTH, $11, $b - EVENT_DISP SILPH_CO_1F_WIDTH, $0, $1a ; SILPH_CO_2F - EVENT_DISP SILPH_CO_1F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_1F_WIDTH, $a, $10 ; SILPH_CO_3F + warp_to $a, $11, SILPH_CO_1F_WIDTH + warp_to $b, $11, SILPH_CO_1F_WIDTH + warp_to $1a, $0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F + warp_to $14, $0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $10, $a, SILPH_CO_1F_WIDTH ; SILPH_CO_3F |