Move Mew, add Old Sea Chart, add wild data

I am 90% sure something will bug out, can't test the map right now for obvious reasons. Tested everything else, though.

Mostly copied data from Cinnabar Volcano while commenting out Vermillion Dock Mew info to move it.

Wild data has been added along with a fishing group, just dummied out slots.

Old Sea Chart is a clone of the Citrine Pass which is all it needs to be. It is obtainable near the truck.
This commit is contained in:
May Evans 2022-10-16 09:05:26 +01:00
parent 4cc05243ed
commit 78ae4e9029
18 changed files with 251 additions and 177 deletions

View file

@ -103,4 +103,5 @@ KeyItemFlags:
dbit FALSE ; BLK_AUGURITE
dbit FALSE ; DUBIOUS_DISC
dbit TRUE ; CITRINE_PASS
dbit TRUE ; OLDSEACHART
end_bit_array NUM_ITEMS + NUM_FLOORS

View file

@ -104,4 +104,5 @@ ItemNames::
li "BLK AUGURITE"
li "DUBIOUS DISC"
li "CITRINE PASS"
li "OLDSEACHART"
assert_list_length NUM_ITEMS + NUM_FLOORS

View file

@ -104,4 +104,5 @@ ItemPrices::
bcd3 2100 ; BLK_AUGURITE
bcd3 3000 ; DUBIOUS_DISC
bcd3 0 ; CITRINE_PASS
bcd3 0 ; OLDSEACHART
assert_table_length NUM_ITEMS + NUM_FLOORS

View file

@ -97,7 +97,8 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
dw VermilionDockHS
dw VermilionDockHS ; may not be necessary now? old sea chart tho.
; dw NoHS swap if you need to remove the vermillion dock bit
dw NoHS
dw SSAnne2FHS
dw NoHS
@ -117,7 +118,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
dw NoHS
dw FarawayIslandInsideHS
dw NoHS
dw NoHS
dw NoHS
@ -568,7 +569,10 @@ SeafoamIslandsB4FHS:
db SEAFOAM_ISLANDS_B4F, $01, HIDE
db SEAFOAM_ISLANDS_B4F, $02, HIDE
db SEAFOAM_ISLANDS_B4F, $03, SHOW
VermilionDockHS:
db VERMILION_DOCK, $01, HIDE
db $FF, $01, SHOW ; end
VermilionDockHS: ; unsure if necessary
db VERMILION_DOCK, $01, SHOW
;db $FF, $01, SHOW ; end
FarawayIslandInsideHS:
db FARAWAY_ISLAND_INSIDE, $01, HIDE ; if mew is fucking up this is why
assert_table_length NUM_HS_OBJECTS + 1

View file

@ -6,6 +6,7 @@ FarawayIslandInside_Object:
warp_event 15, 21, 0, FARAWAY_ISLAND_OUTSIDE
def_bg_events
object_event 14, 10, SPRITE_MONSTER, STAY, DOWN, 1, MEW, 50 | OW_POKEMON
def_object_events

View file

@ -8,6 +8,7 @@ VermilionDock_Object:
def_bg_events
def_object_events
object_event 21, 0, SPRITE_MONSTER, STAY, DOWN, 2, MEW, 30 | OW_POKEMON
object_event 22, 0, SPRITE_POKE_BALL, STAY, NONE, 2, OLDSEACHART
; object_event 21, 0, SPRITE_MONSTER, STAY, DOWN, 2, MEW, 30 | OW_POKEMON
def_warps_to VERMILION_DOCK

View file

@ -114,7 +114,7 @@ WildDataPointers:
dw Gauntlet6FWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw FarawayIslandInsideMons ; I think this is right??
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
@ -328,3 +328,4 @@ INCLUDE "data/wild/maps/SilphGauntlet3F.asm"
INCLUDE "data/wild/maps/SilphGauntlet4F.asm"
INCLUDE "data/wild/maps/SilphGauntlet5F.asm"
INCLUDE "data/wild/maps/SilphGauntlet6F.asm"
INCLUDE "data/wild/maps/FarawayIslandInside.asm"

View file

@ -0,0 +1,26 @@
FarawayIslandInsideMons:
def_grass_wildmons 10 ; encounter rate
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
end_grass_wildmons
def_water_wildmons 10 ; encounter rate
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
end_water_wildmons

View file

@ -37,6 +37,7 @@ SuperRodData:
dbw SILPH_GAUNTLET_5F, .Group10
dbw ROCK_TUNNEL_1F, .Group5
dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
dbw FARAWAY_ISLAND_INSIDE, .Group7
db -1 ; end
; fishing groups