diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-03-27 14:11:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 14:11:59 -0500 |
| commit | e2e8bf6a8477af254ea7057028f72ac918b62005 (patch) | |
| tree | ffed0137cf81880afa4b0ec2fa30300565996f4b /data/mapObjects/fanclub.asm | |
| parent | ab7c9634be9c7d26c66ebd69b2fcfe3994d627be (diff) | |
| parent | dc503346cab810ad976c3943ad1acca13c69693d (diff) | |
Merge pull request #47 from ValientOrc98/master
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/fanclub.asm')
| -rwxr-xr-x | data/mapObjects/fanclub.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index 1dbb2dca..9ddc6e3a 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -1,20 +1,20 @@ FanClubObject: db $d ; border block - db $2 ; warps - db $7, $2, $1, $ff - db $7, $3, $1, $ff + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 - db $0 ; signs + db 0 ; signs - db $6 ; objects - object SPRITE_FISHER2, $6, $3, STAY, LEFT, $1 ; person - object SPRITE_GIRL, $1, $3, STAY, RIGHT, $2 ; person - object SPRITE_CLEFAIRY_2, $6, $4, STAY, LEFT, $3 ; person - object SPRITE_SEEL, $1, $4, STAY, RIGHT, $4 ; person - object SPRITE_GENTLEMAN, $3, $1, STAY, DOWN, $5 ; person - object SPRITE_CABLE_CLUB_WOMAN, $5, $1, STAY, DOWN, $6 ; person + db 6 ; objects + object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person + object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person + object SPRITE_CLEFAIRY_2, 6, 4, STAY, LEFT, 3 ; person + object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person + object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person + 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 |