diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/fanclub.asm | 6 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index 6f65b287..cbe0cb31 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -5,14 +5,12 @@ FanClubObject: ; 0x59c97 (size=62) db $7, $2, $1, $ff db $7, $3, $1, $ff - db $2 ; signs - db $0, $1, $7 ; FanClubText7 - db $0, $6, $8 ; FanClubText8 + 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, $6, $4, STAY, LEFT, $3 ; 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 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 410ed3c1..5804cfd5 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -90,7 +90,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route12Gate_h) db BANK(BillsHouse_h) db BANK(VermilionPokecenter_h) - db $16 ; db BANK(FanClub_h) + db BANK(FanClub_h) db $17 ; db BANK(VermilionMart_h) db $17 ; db BANK(VermilionGym_h) db $07 ; db BANK(VermilionHouse1_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index e1ed2a3b..6d52f36f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -90,7 +90,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route12Gate_h dw BillsHouse_h dw VermilionPokecenter_h - dw $5a00 ; dw FanClub_h ;id=90 + dw FanClub_h ;id=90 dw $48cb ; dw VermilionMart_h dw $4910 ; dw VermilionGym_h dw $53f8 ; dw VermilionHouse1_h |