diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/unknowndungeon2.asm | 9 | ||||
| -rwxr-xr-x | data/mapObjects/unknowndungeon3.asm | 8 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 20 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 22 |
4 files changed, 31 insertions, 28 deletions
diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index e5ebca56..88cc6ba0 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -11,10 +11,11 @@ UnknownDungeon2Object: ; 0x45e14 (size=73) db $0 ; signs - db $3 ; objects - object SPRITE_BALL, $1d, $9, STAY, NONE, $1, PP_UP - object SPRITE_BALL, $4, $f, STAY, NONE, $2, ULTRA_BALL - object SPRITE_BALL, $d, $6, STAY, NONE, $3, FULL_RESTORE + db $4 ; objects + object SPRITE_BALL, $0, $b, STAY, NONE, $1, RARE_CANDY + object SPRITE_BALL, $10, $7, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $13, $b, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $1b, $9, STAY, NONE, $4, FULL_RESTORE ; warp-to EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index 8b733e6b..cb2d8f83 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -6,10 +6,12 @@ UnknownDungeon3Object: ; 0x45f36 (size=34) db $0 ; signs - db $3 ; objects + db $5 ; objects object SPRITE_SLOWBRO, $1b, $d, STAY, DOWN, $1, MEWTWO, 70 - object SPRITE_BALL, $10, $9, STAY, NONE, $2, ULTRA_BALL - object SPRITE_BALL, $12, $1, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $1a, $1, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $2, $d, STAY, NONE, $3, ULTRA_BALL + object SPRITE_BALL, $3, $d, STAY, NONE, $4, MAX_REVIVE + object SPRITE_BALL, $f, $3, STAY, NONE, $5, MAX_ELIXER ; warp-to EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 728b8675..ab536b39 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -217,22 +217,22 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Mansion2_h) db BANK(Mansion3_h) db BANK(Mansion4_h) - db $11 ; db BANK(SafariZoneEast_h) - db $11 ; db BANK(SafariZoneNorth_h) + db BANK(SafariZoneEast_h) + db BANK(SafariZoneNorth_h) db $12 ; db BANK(SafariZoneWest_h) - db $11 ; db BANK(SafariZoneCenter_h) - db $11 ; db BANK(SafariZoneRestHouse1_h) + db BANK(SafariZoneCenter_h) + db BANK(SafariZoneRestHouse1_h) db $12 ; db BANK(SafariZoneSecretHouse_h) - db $11 ; db BANK(SafariZoneRestHouse2_h) - db $11 ; db BANK(SafariZoneRestHouse3_h) - db $11 ; db BANK(SafariZoneRestHouse4_h) - db $11 ; db BANK(UnknownDungeon2_h) - db $11 ; db BANK(UnknownDungeon3_h) + db BANK(SafariZoneRestHouse2_h) + db BANK(SafariZoneRestHouse3_h) + db BANK(SafariZoneRestHouse4_h) + db BANK(UnknownDungeon2_h) + db BANK(UnknownDungeon3_h) db $1d ; db BANK(UnknownDungeon1_h) db BANK(NameRater_h) db $1d ; db BANK(CeruleanHouse2_h) db $01 ; unused - db $11 ; db BANK(RockTunnel2_h) + db BANK(RockTunnel2_h) db BANK(SilphCo9_h) db BANK(SilphCo10_h) db $18 ; db BANK(SilphCo11_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 5b224ec3..d476cd56 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -217,22 +217,22 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Mansion2_h dw Mansion3_h dw Mansion4_h - dw $5ab3 ; dw SafariZoneEast_h - dw $5bf3 ; dw SafariZoneNorth_h + dw SafariZoneEast_h + dw SafariZoneNorth_h dw $635a ; dw SafariZoneWest_h - dw $5dfa ; dw SafariZoneCenter_h ;220 - dw $5f35 ; dw SafariZoneRestHouse1_h + dw SafariZoneCenter_h ;220 + dw SafariZoneRestHouse1_h dw $64bc ; dw SafariZoneSecretHouse_h - dw $5f72 ; dw SafariZoneRestHouse2_h - dw $5fbd ; dw SafariZoneRestHouse3_h - dw $6008 ; dw SafariZoneRestHouse4_h - dw $6053 ; dw UnknownDungeon2_h - dw $6141 ; dw UnknownDungeon3_h + dw SafariZoneRestHouse2_h + dw SafariZoneRestHouse3_h + dw SafariZoneRestHouse4_h + dw UnknownDungeon2_h + dw UnknownDungeon3_h dw $453d ; dw UnknownDungeon1_h dw NameRater_h dw $4643 ; dw CeruleanHouse2_h - dw $5649 ; dw Route16Gate_h ; unused - dw $624e ; dw RockTunnel2_h + dw Route16Gate_h ; unused + dw RockTunnel2_h dw SilphCo9_h dw SilphCo10_h dw $6105 ; dw SilphCo11_h |