A few updates

- Changes Bill's Garden to be a more fitting Overworld-tileset map

- Gives Cinnabar Volcano a unique palette, being a slightly less-bright version of the RedMon palette

- A few small changes/improvements to the Rival teams

- Reduced wild encounter levels in Silph Gauntlet a little

- Adds a 100% chance for a Magmar encounter when fishing in the Cinnabar Volcano lava

- Hides more 'secret' areas off the Pokedex area listing, namely Mt. Moon Crater and Faraway Island

- Improves Jabetta's sprite a little
This commit is contained in:
MementoMartha 2023-05-19 16:17:44 +01:00
parent 9a88543f19
commit b70e7b5fb5
29 changed files with 200 additions and 171 deletions

View file

@ -39,6 +39,7 @@ WildDataPointers:
dw Route24WildMons ; ROUTE_24
dw Route25WildMons ; ROUTE_25
dw BrunswickTrailMons ; BRUNSWICK_TRAIL
dw BillsGardenWildMons ; BILLS_GARDEN
dw NothingWildMons ; REDS_HOUSE_1F
dw NothingWildMons
dw NothingWildMons
@ -244,7 +245,6 @@ WildDataPointers:
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw BillsGardenWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons

View file

@ -9,9 +9,9 @@ BillsGardenWildMons:
db 50, EEVEE
db 50, CHARMANDER
db 50, BULBASAUR
db 50, HITMONTOP
db 50, HITMONCHAN
db 50, HITMONLEE
db 50, HITMONCHAN
db 50, HITMONTOP
db 50, ELECTRODE_H
db 50, ARCANINE_H
db 50, DECILLA

View file

@ -3,12 +3,12 @@ Gauntlet1FWildMons:
db 50, BUTTERFREE
db 50, BEEDRILL
db 51, VENOMOTH
db 51, PARASECT
db 51, TANGELA
db 51, BEEDRILL
db 52, VENOMOTH
db 52, TANGROWTH
db 53, GOROCHU
db 53, TANGROWTH
db 52, CARAPTHOR
db 53, RAICHU
db 53, CARAPTHOR
db 55, VENUSAUR
end_grass_wildmons

View file

@ -1,15 +1,15 @@
Gauntlet2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 52, GOLEM
db 51, GRAVELER
db 51, SANDSLASH
db 52, MACHOKE
db 52, CROBAT
db 52, SANDSLASH
db 53, MACHAMP
db 53, CROBAT
db 53, SANDSLASH
db 54, MACHAMP
db 53, MACHOKE
db 53, STEELIX
db 54, CLEFABLE
db 54, STEELIX
db 55, CLEFABLE
db 55, STEELIX
db 57, CHARIZARD
db 56, CHARIZARD
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

View file

@ -1,15 +1,15 @@
Gauntlet3FWildMons:
def_grass_wildmons 15 ; encounter rate
db 54, TENTACRUEL
db 54, JABETTA
db 55, KINGLER
db 55, PENDRAKEN
db 55, JABETTA
db 56, KINGLER
db 56, GOLDUCK
db 57, GYARADOS
db 57, GOLDUCK
db 59, TOTARTLE
def_grass_wildmons 10 ; encounter rate
db 52, POLIWHIRL
db 52, JABETTA
db 53, KINGLER
db 53, SLOWBRO
db 53, JABETTA
db 54, KINGLER
db 54, GOLDUCK
db 55, BLASTOISE
db 55, GOLDUCK
db 57, TOTARTLE
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

View file

@ -1,15 +1,15 @@
Gauntlet4FWildMons:
def_grass_wildmons 15 ; encounter rate
db 56, GENGAR
db 56, GUARDIA
db 57, NINETALES
db 57, BARUNDA
db 57, GUARDIA
db 58, NINETALES
db 58, HYPNO
db 59, ALAKAZAM
db 59, HYPNO
db 61, ALAKAZAM
def_grass_wildmons 10 ; encounter rate
db 53, HAUNTER
db 53, GUARDIA
db 54, NINETALES
db 54, BARUNDA
db 54, GUARDIA
db 55, NINETALES
db 55, HYPNO
db 56, KADABRA
db 56, HYPNO
db 58, ANNIHILAPE
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

View file

@ -1,15 +1,15 @@
Gauntlet5FWildMons:
def_grass_wildmons 30 ; encounter rate
db 58, DODRIO
db 58, RHYDON
db 59, EXEGGUTOR
db 59, SCYTHER
db 59, PINSIR
db 60, KANGASKHAN
db 60, TAUROS
db 61, TRAMPEL
db 61, CHANSEY
db 63, DRAGONITE
def_grass_wildmons 20 ; encounter rate
db 54, DODRIO
db 54, RHYDON
db 55, EXEGGUTOR
db 55, SCYTHER
db 55, PINSIR
db 56, KANGASKHAN
db 56, TAUROS
db 57, TRAMPEL
db 57, CHANSEY
db 59, DRAGONITE
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

View file

@ -1,15 +1,15 @@
Gauntlet6FWildMons:
def_grass_wildmons 10 ; encounter rate
db 60, MUK
db 60, WEEZING
db 61, ANIMON
db 61, PORYGON
db 61, WEEZING
db 62, ANIMON
db 62, MAGNEZONE
db 63, AERODACTYL
db 63, MAGNEZONE
db 65, GYAOON
db 55, MUK
db 55, WEEZING
db 56, ANIMON
db 56, ELECTRODE
db 56, WEEZING
db 57, ANIMON
db 57, MAGNEZONE
db 58, PORYGON
db 58, MAGNEZONE
db 60, OMEGA
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

View file

@ -1,48 +1,55 @@
; super rod encounters
SuperRodData:
; map, fishing group
dbw PALLET_TOWN, .Group1
dbw VIRIDIAN_CITY, .Group1
dbw CERULEAN_CITY, .Group2
dbw VERMILION_CITY, .Group3
dbw CELADON_CITY, .Group11
dbw FUCHSIA_CITY, .Group5
dbw CINNABAR_ISLAND, .Group8
dbw CITRINE_CITY, .Group9
dbw ROUTE_4, .Group2
dbw ROUTE_6, .Group2
dbw ROUTE_10, .Group4
dbw ROUTE_11, .Group3
dbw ROUTE_12, .Group4
dbw ROUTE_13, .Group5
dbw ROUTE_17, .Group5
dbw ROUTE_18, .Group5
dbw ROUTE_19, .Group8
dbw ROUTE_20, .Group8
dbw ROUTE_21, .Group8
dbw ROUTE_22, .Group1
dbw ROUTE_23, .Group8
dbw ROUTE_24, .Group2
dbw ROUTE_25, .Group3
dbw CERULEAN_GYM, .Group2
dbw VERMILION_DOCK, .Group3
dbw SEAFOAM_ISLANDS_B3F, .Group8
dbw SEAFOAM_ISLANDS_B4F, .Group8
dbw SAFARI_ZONE_EAST, .Group6
dbw SAFARI_ZONE_NORTH, .Group6
dbw SAFARI_ZONE_WEST, .Group6
dbw SAFARI_ZONE_CENTER, .Group6
dbw CERULEAN_CAVE_2F, .Group10
dbw CERULEAN_CAVE_B1F, .Group10
dbw CERULEAN_CAVE_1F, .Group10
dbw SILPH_GAUNTLET_5F, .Group6
dbw ROCK_TUNNEL_1F, .Group4
dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
dbw FARAWAY_ISLAND_INSIDE, .Group10
dbw MT_MOON_CRATER, .Group10
dbw DIGLETTS_CAVE, .Group12
dbw BILLS_GARDEN, .Group7
dbw UNDERWATER_TUNNEL, .Group8
dbw PALLET_TOWN, .Group1
dbw VIRIDIAN_CITY, .Group1
dbw CERULEAN_CITY, .Group2
dbw VERMILION_CITY, .Group3
dbw CELADON_CITY, .Group11
dbw FUCHSIA_CITY, .Group5
dbw CINNABAR_ISLAND, .Group8
dbw CITRINE_CITY, .Group9
dbw ROUTE_4, .Group2
dbw ROUTE_6, .Group2
dbw ROUTE_10, .Group4
dbw ROUTE_11, .Group3
dbw ROUTE_12, .Group4
dbw ROUTE_13, .Group5
dbw ROUTE_17, .Group5
dbw ROUTE_18, .Group5
dbw ROUTE_19, .Group8
dbw ROUTE_20, .Group8
dbw ROUTE_21, .Group8
dbw ROUTE_22, .Group1
dbw ROUTE_23, .Group8
dbw ROUTE_24, .Group2
dbw ROUTE_25, .Group3
dbw BRUNSWICK_TRAIL, .Group9
dbw CERULEAN_GYM, .Group2
dbw VERMILION_DOCK, .Group3
dbw SEAFOAM_ISLANDS_B3F, .Group8
dbw SEAFOAM_ISLANDS_B4F, .Group8
dbw SAFARI_ZONE_EAST, .Group6
dbw SAFARI_ZONE_NORTH, .Group6
dbw SAFARI_ZONE_WEST, .Group6
dbw SAFARI_ZONE_CENTER, .Group6
dbw CERULEAN_CAVE_2F, .Group10
dbw CERULEAN_CAVE_B1F, .Group10
dbw CERULEAN_CAVE_1F, .Group10
dbw SILPH_GAUNTLET_5F, .Group6
dbw ROCK_TUNNEL_1F, .Group4
dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
dbw FARAWAY_ISLAND_INSIDE, .Group5
dbw MT_MOON_CRATER, .Group10
dbw DIGLETTS_CAVE, .Group12
dbw BILLS_GARDEN, .Group7
dbw UNDERWATER_TUNNEL, .Group8
dbw LORELEIS_ROOM, .Group8
dbw GARNET_CAVERN_1F, .Group9
dbw GARNET_CAVERN_2F, .Group9
dbw GARNET_CAVERN_B1F, .Group9
dbw CINNABAR_VOLCANO_FLOORS, .Group13
dbw CINNABAR_VOLCANO, .Group13
db -1 ; end
; fishing groups
@ -118,7 +125,7 @@ SuperRodData:
db 30, BLASTYKE
db 30, GOLDEEN
.Group9: ; Citrine, Chartreuse, Crimson
.Group9: ; Citrine, Brunswick, Garnet
db 10
db 50, JAGG
db 50, SEAKING
@ -161,4 +168,10 @@ SuperRodData:
db 19, WIGLETT
db 21, WIGLETT
db 20, WIGLETT
db 28, WUGTRIO
db 28, WUGTRIO
.Group13: ; Cinnabar Volcano
db 3
db 35, MAGMAR
db 37, MAGMAR
db 40, MAGMAR