diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-02 13:13:31 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-02 13:13:31 -0400 |
commit | 34061c6d0fae84b4a572bb2792ec6c09ede95e20 (patch) | |
tree | b5a0b650800942c18aa37bcce9ff0e379df19cae /data | |
parent | 14e60de3a624a087b054862a1a4695be8454a600 (diff) |
Copycat's House 1F
Diffstat (limited to 'data')
-rwxr-xr-x | data/mapObjects/copycatshouse1f.asm | 2 | ||||
-rw-r--r-- | data/map_header_banks.asm | 2 | ||||
-rw-r--r-- | data/map_header_pointers.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 96787714..983baa99 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -11,7 +11,7 @@ CopycatsHouse1FObject: ; 0x75ee3 (size=46) db $3 ; objects object SPRITE_MOM_GEISHA, $2, $2, STAY, DOWN, $1 ; person object SPRITE_FAT_BALD_GUY, $5, $4, STAY, LEFT, $2 ; person - object SPRITE_CLEFAIRY, $1, $4, WALK, $1, $3 ; person + object SPRITE_CHANSEY, $1, $4, STAY, NONE, $3 ; person ; warp-to EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $2 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index e2eefc08..1239167c 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -175,7 +175,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CinnabarMart_h) db BANK(CinnabarMart_h) db $06 ; db BANK(IndigoPlateauLobby_h) - db $1d ; db BANK(CopycatsHouse1F_h) + db BANK(CopycatsHouse1F_h) db $17 ; db BANK(CopycatsHouse2F_h) db $17 ; db BANK(FightingDojo_h) db $17 ; db BANK(SaffronGym_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index dc1588c6..c0d1b477 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -175,7 +175,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CinnabarMart_h dw CinnabarMart_h ; unused dw $5d45 ; dw IndigoPlateauLobby_h - dw $5746 ; dw CopycatsHouse1F_h + dw CopycatsHouse1F_h dw $4b5b ; dw CopycatsHouse2F_h dw $4c47 ; dw FightingDojo_h dw $4ef7 ; dw SaffronGym_h |