diff options
| -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 | ||||
| -rwxr-xr-x | main.asm | 8 |
4 files changed, 8 insertions, 6 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 @@ -1596,8 +1596,7 @@ INCLUDE "engine/save.asm" SECTION "bank1D",ROMX,BANK[$1D] - dr $74000,$74010 - +CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" PewterMartBlocks: CinnabarMartBlocks: INCBIN "maps/pewtermart.blk" FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk" @@ -1700,7 +1699,10 @@ INCLUDE "data/mapObjects/cinnabarpokecenter.asm" INCLUDE "data/mapHeaders/cinnabarmart.asm" INCLUDE "scripts/cinnabarmart.asm" INCLUDE "data/mapObjects/cinnabarmart.asm" - dr $75746,$757a0 + +INCLUDE "data/mapHeaders/copycatshouse1f.asm" +INCLUDE "scripts/copycatshouse1f.asm" +INCLUDE "data/mapObjects/copycatshouse1f.asm" INCLUDE "data/mapHeaders/gary.asm" INCLUDE "scripts/gary.asm" |