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/fanclub.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/fanclub.asm')
| -rwxr-xr-x | data/mapObjects/fanclub.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index f0f544ef..c310ed53 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -2,12 +2,12 @@ FanClubObject: db $d ; border block db $2 ; warps - db $7, $2, $1, $ff - db $7, $3, $1, $ff + warp $2, $7, $1, $ff + warp $3, $7, $1, $ff db $2 ; signs - db $0, $1, $7 ; FanClubText7 - db $0, $6, $8 ; FanClubText8 + sign $1, $0, $7 ; FanClubText7 + sign $6, $0, $8 ; FanClubText8 db $6 ; objects object SPRITE_FISHER2, $6, $3, STAY, LEFT, $1 ; person @@ -18,5 +18,5 @@ FanClubObject: object SPRITE_CABLE_CLUB_WOMAN, $5, $1, STAY, DOWN, $6 ; person ; warp-to - EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $2 - EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $3 + warp_to $2, $7, POKEMON_FAN_CLUB_WIDTH + warp_to $3, $7, POKEMON_FAN_CLUB_WIDTH |