diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/unknowndungeon1.asm | 9 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 10 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 10 |
3 files changed, 15 insertions, 14 deletions
diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index c55711b4..0635e9a7 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -14,10 +14,11 @@ UnknownDungeon1Object: ; 0x74d15 (size=97) db $0 ; signs - db $3 ; objects - object SPRITE_BALL, $7, $d, STAY, NONE, $1, FULL_RESTORE - object SPRITE_BALL, $13, $3, STAY, NONE, $2, MAX_ELIXER - object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET + db $4 ; objects + object SPRITE_BALL, $1d, $10, STAY, NONE, $1, RARE_CANDY + object SPRITE_BALL, $7, $b, STAY, NONE, $2, MAX_ELIXER + object SPRITE_BALL, $1d, $9, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $12, $3, STAY, NONE, $4, ULTRA_BALL ; warp-to EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 01d33040..eef36242 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -228,9 +228,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(SafariZoneRestHouse4_h) db BANK(UnknownDungeon2_h) db BANK(UnknownDungeon3_h) - db $1d ; db BANK(UnknownDungeon1_h) + db BANK(UnknownDungeon1_h) db BANK(NameRater_h) - db $1d ; db BANK(CeruleanHouse2_h) + db BANK(CeruleanHouse2_h) db $01 ; unused db BANK(RockTunnel2_h) db BANK(SilphCo9_h) @@ -245,7 +245,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $11 ; unused db $11 ; unused db $11 ; unused - db $1d ; db BANK(Lorelei_h) - db $1d ; db BANK(Bruno_h) - db $1d ; db BANK(Agatha_h) + db BANK(Lorelei_h) + db BANK(Bruno_h) + db BANK(Agatha_h) db BANK(BeachHouse_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 259ab1bd..730038f3 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -228,9 +228,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SafariZoneRestHouse4_h dw UnknownDungeon2_h dw UnknownDungeon3_h - dw $453d ; dw UnknownDungeon1_h + dw UnknownDungeon1_h dw NameRater_h - dw $4643 ; dw CeruleanHouse2_h + dw CeruleanHouse2_h dw Route16Gate_h ; unused dw RockTunnel2_h dw SilphCo9_h @@ -245,7 +245,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SilphCo2_h ; unused dw SilphCo2_h ; unused dw SilphCo2_h ; unused - dw $59ef ; dw Lorelei_h - dw $5b4a ; dw Bruno_h - dw $5ca1 ; dw Agatha_h ;247 + dw Lorelei_h + dw Bruno_h + dw Agatha_h ;247 dw BeachHouse_h |