diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-02 14:30:10 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-02 14:30:10 -0400 |
| commit | 76185838e2961efb0bb1eacdbf37a45e29ca1a52 (patch) | |
| tree | 8d52f8263282f00b9a9c7b973b125a789af05373 /data | |
| parent | fdf55b45c44f4234f9f0ed6662db6f7089828b63 (diff) | |
Saffron Mart, Pokecenter, and Silph 1F
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/saffronpokecenter.asm | 3 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 6 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index 8487bb01..bda46343 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -7,11 +7,12 @@ SaffronPokecenterObject: ; 0x5d54f (size=44) db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_FOULARD_WOMAN, $5, $5, STAY, NONE, $2 ; person object SPRITE_GENTLEMAN, $8, $3, STAY, DOWN, $3 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 5b968c1e..322d2eb8 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -180,9 +180,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(FightingDojo_h) db BANK(SaffronGym_h) db BANK(SaffronHouse1_h) - db $17 ; db BANK(SaffronMart_h) - db $17 ; db BANK(SilphCo1_h) - db $17 ; db BANK(SaffronPokecenter_h) + db BANK(SaffronMart_h) + db BANK(SilphCo1_h) + db BANK(SaffronPokecenter_h) db BANK(SaffronHouse2_h) db $12 ; db BANK(Route15Gate_h) db $12 ; db BANK(Route15GateUpstairs_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 8b4e634c..5fd190b6 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -180,9 +180,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw FightingDojo_h dw SaffronGym_h dw SaffronHouse1_h - dw $52f3 ; dw SaffronMart_h ;id=180 - dw $5338 ; dw SilphCo1_h - dw $541f ; dw SaffronPokecenter_h + dw SaffronMart_h ;id=180 + dw SilphCo1_h + dw SaffronPokecenter_h dw SaffronHouse2_h dw $558d ; dw Route15Gate_h dw $55d5 ; dw Route15GateUpstairs_h |