summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/silphco11.asm5
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
3 files changed, 5 insertions, 4 deletions
diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm
index 8cba618e..bae7eda5 100755
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/silphco11.asm
@@ -9,12 +9,13 @@ SilphCo11Object: ; 0x62380 (size=72)
db $0 ; signs
- db $5 ; objects
+ db $6 ; objects
object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person
object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person
object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2
- object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29
+ object SPRITE_JAMES, $2, $8, STAY, UP, $4
object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28
+ object SPRITE_JESSIE, $3, $8, STAY, UP, $6
; warp-to
EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 6de9bbcb..01d33040 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -235,7 +235,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(RockTunnel2_h)
db BANK(SilphCo9_h)
db BANK(SilphCo10_h)
- db $18 ; db BANK(SilphCo11_h)
+ db BANK(SilphCo11_h)
db BANK(SilphCoElevator_h)
db $11 ; unused
db $11 ; unused
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 6a4fc9f2..259ab1bd 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -235,7 +235,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw RockTunnel2_h
dw SilphCo9_h
dw SilphCo10_h
- dw $6105 ; dw SilphCo11_h
+ dw SilphCo11_h
dw SilphCoElevator_h
dw SilphCo2_h ; unused
dw SilphCo2_h ; unused