summaryrefslogtreecommitdiff
path: root/data/mapObjects/fanclub.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/fanclub.asm')
-rwxr-xr-xdata/mapObjects/fanclub.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm
index f0f544ef..8e0fd931 100755
--- a/data/mapObjects/fanclub.asm
+++ b/data/mapObjects/fanclub.asm
@@ -1,22 +1,22 @@
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 $2 ; signs
- db $0, $1, $7 ; FanClubText7
- db $0, $6, $8 ; FanClubText8
+ db 2 ; signs
+ sign 1, 0, 7 ; FanClubText7
+ sign 6, 0, 8 ; FanClubText8
- db $6 ; objects
- object SPRITE_FISHER2, $6, $3, STAY, LEFT, $1 ; person
- object SPRITE_GIRL, $1, $3, STAY, RIGHT, $2 ; person
- object SPRITE_CLEFAIRY, $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, 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