Merge pull request #738 from SimplyBLGDev/simply-fix-missing-encounters

data/v2/csv/encounter_condition_value_prose.csv

@@ -58,3 +58,35 @@ encounter_condition_value_id,local_language_id,name
 37,9,Acquired National Pokédex
 38,9,None
 39,9,Beat the Pokémon league after knocking out Snorlax at Route 11
+40,9,Playing on the Virtual Console Release
+41,9,Cure the nightmares of Eldritch’s Son
+42,9,Talk to Cynthia’s grandmother
+43,9,No item requirement
+44,9,Have Adamant Orb in bag
+45,9,Have Lustrous Orb in bag
+46,9,Have Helix Fossil in bag
+47,9,Have Dome Fossil in bag
+48,9,Have Old Amber in bag
+49,9,Have Root Fossil in bag
+50,9,Have Claw Fossil in bag
+51,9,Defeat Jupiter
+52,9,Defeat Team Galactic at Iron Island
+53,9,Input correct password
+54,9,Obtained Zephyr badge
+55,9,Defeat Red
+56,9,Received a Kanto Starter
+57,9,Received TM59 From Claire
+58,9,"Have Regirock, Regice and Registeel in the party"
+59,9,Sunday
+60,9,Monday
+61,9,Tuesday
+62,9,Wednesday
+63,9,Thursday
+64,9,Friday
+65,9,Saturday
+66,9,The first Pokémon in the player’s party has a high friendship stat
+67,9,Beat Mars for the first time
+68,9,Have Odd Keystone in bag
+69,9,Has talked to at least 32 people in the underground
+70,9,Returned Machine Part to Power Plant
+10,9,Have an Event Arceus in the party

data/v2/csv/encounter_condition_values.csv

@@ -38,3 +38,35 @@ id,encounter_condition_id,identifier,is_default
 37,9,story-progress-national-dex,0
 38,10,other-none,1
 39,10,other-snorlax-11-beat-league,0
+40,10,other-virtual-console,0
+41,9,story-progress-cure-eldritch-nightmares,0
+42,10,other-talk-to-cynthias-grandmother,0
+43,11,item-none,1
+44,11,item-adamant-orb,0
+45,11,item-lustrous-orb,0
+46,11,item-helix-fossil,0
+47,11,item-dome-fossil,0
+48,11,item-old-amber,0
+49,11,item-root-fossil,0
+50,11,item-claw-fossil,0
+51,9,story-progress-defeat-jupiter,0
+52,9,story-progress-beat-team-galactic-iron-island,0
+53,10,other-correct-password,0
+54,9,story-progress-zephyr-badge,0
+55,9,story-progress-beat-red,0
+56,10,other-received-kanto-starter,0
+57,9,story-progress-receive-tm-from-claire,0
+58,10,other-regirock-regice-registeel-in-party,0
+59,12,weekday-sunday,0
+60,12,weekday-monday,0
+61,12,weekday-tuesday,0
+62,12,weekday-wednesday,0
+63,12,weekday-thursday,0
+64,12,weekday-friday,0
+65,12,weekday-saturday,0
+66,13,first-party-pokemon-high-friendship,0
+67,9,story-progress-defeat-mars,0
+68,11,item-odd-keystone,0
+69,10,other-talked-to-32-people-underground,0
+70,9,story-progress-returned-machine-part,0
+71,10,other-event-arceus-in-party,0

data/v2/csv/encounter_conditions.csv

@@ -9,3 +9,6 @@ id,identifier
 8,tv-option
 9,story-progress
 10,other
+11,item
+12,weekday
+13,first-party-pokemon

data/v2/csv/encounter_method_prose.csv

@@ -42,4 +42,8 @@ encounter_method_id,local_language_id,name
 24,9,Headbutting a high encounter rate tree
 25,9,Using the Squirt Bottle on a Sudowoodo
 26,9,Using the Wailmer Pail on a Sudowoodo
-27,9,Surfing on seaweed
+27,9,Diving on seaweed
+28,9,On any overworld patch of grass
+29,9,On any overworld water tile
+30,9,Using Devon Scope
+31,9,Fishing in a Feebas Tile

data/v2/csv/encounter_methods.csv

@@ -26,3 +26,7 @@ id,identifier,order
 25,squirt-bottle,25
 26,wailmer-pail,26
 27,seaweed,27
+28,roaming-grass,28
+29,roaming-water,29
+30,devon-scope,30
+31,feebas-tile-fishing,31

data/v2/csv/encounter_slots.csv

@@ -645,3 +645,173 @@ id,version_group_id,encounter_method_id,slot,rarity
 644,6,27,3,5
 645,6,27,4,4
 646,6,27,5,1
+647,10,1,1,10
+648,10,1,2,10
+649,10,1,3,10
+650,10,1,4,10
+651,10,1,5,10
+652,10,1,6,10
+653,10,1,7,10
+654,10,1,8,10
+655,10,1,9,10
+656,10,1,10,10
+657,10,2,1,10
+658,10,2,2,10
+659,10,2,3,10
+660,10,2,4,10
+661,10,2,5,5
+662,10,2,6,10
+663,10,2,7,5
+664,10,2,8,10
+665,10,2,9,15
+666,10,2,10,15
+667,10,2,11,0
+668,10,2,12,0
+669,10,3,1,10
+670,10,3,2,10
+671,10,3,3,10
+672,10,3,4,10
+673,10,3,5,5
+674,10,3,6,10
+675,10,3,7,5
+676,10,3,8,10
+677,10,3,9,15
+678,10,3,10,15
+679,10,3,11,0
+680,10,3,12,0
+681,10,4,1,10
+682,10,4,2,10
+683,10,4,3,10
+684,10,4,4,10
+685,10,4,5,5
+686,10,4,6,10
+687,10,4,7,5
+688,10,4,8,10
+689,10,4,9,15
+690,10,4,10,15
+691,10,4,11,0
+692,10,4,12,0
+693,10,5,1,10
+694,10,5,2,10
+695,10,5,3,10
+696,10,5,4,10
+697,10,5,5,5
+698,10,5,6,10
+699,10,5,7,5
+700,10,5,8,10
+701,10,5,9,15
+702,10,5,10,15
+703,10,5,11,0
+704,10,5,12,0
+705,3,28,1,10
+706,4,28,1,10
+707,5,28,1,25
+708,5,29,1,25
+709,6,28,1,25
+710,6,29,1,25
+711,7,28,1,25
+712,8,28,1,25
+713,8,29,1,25
+714,9,28,1,25
+715,9,29,1,25
+716,10,28,1,25
+717,10,2,1,10
+718,10,2,2,10
+719,10,2,3,5
+720,10,2,4,10
+721,10,2,5,5
+722,10,2,6,10
+723,10,2,7,15
+724,10,2,8,15
+725,10,2,9,0
+726,10,2,10,0
+727,10,2,11,10
+728,10,2,12,10
+729,10,3,1,10
+730,10,3,2,10
+731,10,3,3,5
+732,10,3,4,10
+733,10,3,5,5
+734,10,3,6,10
+735,10,3,7,15
+736,10,3,8,15
+737,10,3,9,0
+738,10,3,10,0
+739,10,3,11,10
+740,10,3,12,10
+741,10,4,1,10
+742,10,4,2,10
+743,10,4,3,5
+744,10,4,4,10
+745,10,4,5,5
+746,10,4,6,10
+747,10,4,7,15
+748,10,4,8,15
+749,10,4,9,0
+750,10,4,10,0
+751,10,4,11,10
+752,10,4,12,10
+753,10,5,1,10
+754,10,5,2,10
+755,10,5,3,5
+756,10,5,4,10
+757,10,5,5,5
+758,10,5,6,10
+759,10,5,7,15
+760,10,5,8,15
+761,10,5,9,0
+762,10,5,10,0
+763,10,5,11,10
+764,10,5,12,10
+765,10,2,1,5
+766,10,2,2,10
+767,10,2,3,5
+768,10,2,4,10
+769,10,2,5,15
+770,10,2,6,15
+771,10,2,7,0
+772,10,2,8,0
+773,10,2,9,10
+774,10,2,10,10
+775,10,2,11,10
+776,10,2,12,10
+777,10,3,1,5
+778,10,3,2,10
+779,10,3,3,5
+780,10,3,4,10
+781,10,3,5,15
+782,10,3,6,15
+783,10,3,7,0
+784,10,3,8,0
+785,10,3,9,10
+786,10,3,10,10
+787,10,3,11,10
+788,10,3,12,10
+789,10,4,1,5
+790,10,4,2,10
+791,10,4,3,5
+792,10,4,4,10
+793,10,4,5,15
+794,10,4,6,15
+795,10,4,7,0
+796,10,4,8,0
+797,10,4,9,10
+798,10,4,10,10
+799,10,4,11,10
+800,10,4,12,10
+801,10,5,1,5
+802,10,5,2,10
+803,10,5,3,5
+804,10,5,4,10
+805,10,5,5,15
+806,10,5,6,15
+807,10,5,7,0
+808,10,5,8,0
+809,10,5,9,10
+810,10,5,10,10
+811,10,5,11,10
+812,10,5,12,10
+813,5,30,1,100
+814,6,30,1,100
+815,5,31,1,50
+816,6,31,1,50

data/v2/csv/location_area_prose.csv

@@ -669,3 +669,33 @@ location_area_id,local_language_id,name
 810,9,Desert Ruins
 811,9,Island Cave
 812,9,Ancient Tomb
+813,9,Johto Safari Zone Peak
+814,9,Johto Safari Zone Desert
+815,9,Johto Safari Zone Plains
+816,9,Johto Safari Zone Meadow
+817,9,Johto Safari Zone Forest
+818,9,Johto Safari Zone Swamp
+819,9,Johto Safari Zone Marshland
+820,9,Johto Safari Zone Mountain
+821,9,Johto Safari Zone Rocky Beach
+822,9,Johto Safari Zone Wasteland
+823,9,Johto Safari Zone Savannah
+824,9,Johto Safari Zone Wetland
+825,9,Mt. Ember Summit
+826,9,Kyogre’s Room
+827,9,Groudon’s Room
+828,9,Rayquaza’s Room
+829,9,Acuity Cavern
+830,9,Valor Cavern
+831,9,Spear Pillar
+832,9,Pokémon Center
+833,9,Cinnabar Lab
+834,9,
+835,9,Silph Co.
+836,9,Pokémon Center
+837,9,Heatran Chamber
+838,9,
+839,9,
+840,9,
+841,9,
+842,9,

data/v2/csv/location_areas.csv

@@ -701,3 +701,33 @@ id,location_id,game_index,identifier
 810,582,0,area
 811,581,0,area
 812,583,0,area
+813,814,0,johto-safari-zone-peak
+814,814,0,johto-safari-zone-desert
+815,814,0,johto-safari-zone-plains
+816,814,0,johto-safari-zone-meadow
+817,814,0,johto-safari-zone-forest
+818,814,0,johto-safari-zone-swamp
+819,814,0,johto-safari-zone-marshland
+820,814,0,johto-safari-zone-mountain
+821,814,0,johto-safari-zone-rocky-beach
+822,814,0,johto-safari-zone-wasteland
+823,814,0,johto-safari-zone-savannah
+824,814,0,johto-safari-zone-wetland
+825,500,0,summit
+826,248,0,kyogre-room
+827,248,0,groundon-room
+828,248,0,rayquaza-room
+829,28,0,cavern
+830,27,0,cavern
+831,172,0,area
+832,109,0,pokemon-center
+833,71,0,cinnabar-lab
+834,573,0,
+835,234,0,silph-co
+836,70,0,pokemon-center
+837,16,0,heatran-chamber
+838,183,0,
+839,179,0,
+840,188,0,
+841,237,0,
+842,247,0,

data/v2/csv/location_names.csv

@@ -3591,3 +3591,4 @@ location_id,local_language_id,name,subtitle
 811,9,Navel Rock,
 812,9,Faraway Island,
 813,9,Hoenn Battle Frontier,
+814,9,Johto Safari Zone,

data/v2/csv/locations.csv

@@ -795,3 +795,4 @@ id,region_id,identifier
 811,1,navel-rock
 812,3,faraway-island
 813,3,hoenn-battle-frontier
+814,2,johto-safari-zone