summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/ceruleanhouse1.asm8
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
3 files changed, 7 insertions, 5 deletions
diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm
index db0be014..aa9f66a4 100755
--- a/data/mapObjects/ceruleanhouse1.asm
+++ b/data/mapObjects/ceruleanhouse1.asm
@@ -7,9 +7,11 @@ CeruleanHouse1Object: ; 0x1d710 (size=32)
db $0 ; signs
- db $2 ; objects
- object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, STAY, LEFT, $1 ; person
- object SPRITE_GAMBLER, $1, $2, STAY, NONE, $2 ; person
+ db $4 ; objects
+ object SPRITE_GIRL, $3, $1, STAY, DOWN, $1 ; person
+ object SPRITE_BULBASAUR, $4, $1, STAY, DOWN, $2 ; person
+ object SPRITE_ODDISH, $1, $4, STAY, NONE, $3 ; person
+ object SPRITE_SANDSHREW, $5, $3, STAY, LEFT, $4 ; person
; warp-to
EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 1664cb08..bbcdd278 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -63,7 +63,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(MtMoon2_h)
db BANK(MtMoon3_h)
db BANK(CeruleanHouseTrashed_h)
- db $07 ; db BANK(CeruleanHouse1_h)
+ db BANK(CeruleanHouse1_h)
db $17 ; db BANK(CeruleanPokecenter_h)
db $17 ; db BANK(CeruleanGym_h)
db $07 ; db BANK(BikeShop_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 4d6a8847..9558ca6e 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -63,7 +63,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw MtMoon2_h ;id=60
dw MtMoon3_h
dw CeruleanHouseTrashed_h
- dw $4f34 ; dw CeruleanHouse1_h
+ dw CeruleanHouse1_h
dw $44f5 ; dw CeruleanPokecenter_h
dw $4577 ; dw CeruleanGym_h
dw $5038 ; dw BikeShop_h