Adding Gen 6 Ambush Encounters

data/v2/csv/encounter_condition_prose.csv

@@ -44,3 +44,5 @@ encounter_condition_id,local_language_id,name
 23,9,Have save data from another Pokémon game
 24,9,Find a certain number of Alolan Diglett in Isle of Armor
 25,9,"During specific weather conditions like sun, rain, or snow"
+26,9,Berry Tree Type
+27,9,Trash Can Type

data/v2/csv/encounter_condition_value_map.csv

@@ -24498,3 +24498,25 @@ encounter_id,encounter_condition_value_id
 76930,256
 76931,255
 76931,35
+76932,257
+76933,258
+76934,259
+76935,260
+76936,261
+76937,262
+76938,257
+76939,258
+76940,259
+76941,260
+76942,261
+76943,262
+76944,263
+76945,263
+76946,264
+76947,263
+76948,263
+76949,264
+76950,263
+76951,265
+76952,263
+76953,265

data/v2/csv/encounter_condition_value_prose.csv

@@ -377,3 +377,12 @@ encounter_condition_value_id,local_language_id,name
 254,9,During intense sun
 255,9,During foggy weather
 256,9,Before entering the Hall of Fame
+257,9,Interact with a Red Berry Tree
+258,9,Interact with a Blue Berry Tree
+259,9,Interact with a Purple Berry Tree
+260,9,Interact with a Green Berry Tree
+261,9,Interact with a Yellow Berry Tree
+262,9,Interact with a Pink Berry Tree
+263,9,Interact with a Shaking Trash Can (Daily)
+264,9,Interact with a Shaking Trash Can (Tuesday)
+265,9,Interact with a Shaking Trash Can (Thursday)

data/v2/csv/encounter_condition_values.csv

@@ -255,3 +255,12 @@ id,encounter_condition_id,identifier,is_default
 254,25,weather-intense-sun,0
 255,25,weather-fog,0
 256,9,story-progress-before-hall-of-fame,1
+257,26,berry-tree-red,1
+258,26,berry-tree-blue,1
+259,26,berry-tree-purple,1
+260,26,berry-tree-green,1
+261,26,berry-tree-yellow,1
+262,26,berry-tree-pink,1
+263,27,trash-can-type-daily,1
+264,27,trash-can-type-tuesday,1
+265,27,trash-can-type-thursday,1

data/v2/csv/encounter_conditions.csv

@@ -24,3 +24,5 @@ id,identifier
 23,save-data
 24,alolan-diglett-found
 25,weather
+26,berry-tree-type
+27,trash-can-type

data/v2/csv/encounter_method_prose.csv

@@ -54,8 +54,8 @@ encounter_method_id,local_language_id,name
 18,5,Reçu en cadeau
 19,9,Receive egg as a gift
 19,5,Œuf reçu en cadeau
-20,9,"Static encounter, only one chance"
-20,5,"Rencontre statique, chance unique"
+20,9,"Static encounter"
+20,5,"Rencontre statique"
 21,9,Playing Pokéflute
 21,5,En jouant de la Pokéflûte
 22,9,Headbutting a low encounter rate tree
@@ -79,6 +79,7 @@ encounter_method_id,local_language_id,name
 31,9,Fishing in a Feebas Tile
 31,5,En pêchant sur une tuile à Barpau
 34,9,Fishing at bubbling spots in the water
+35,9,Interacting with a Berry Tree
 38,9,Walking in the overworld
 38,5,En marchant dans le monde extérieur
 39,9,Surfing in the overworld
@@ -104,3 +105,8 @@ encounter_method_id,local_language_id,name
 54,9,Finding a Pokemon in a Hidden Grotto
 55,9,Slathering a Honey Tree with Honey and waiting for a Pokémon to appear.
 56,9,Overworld spawn coming from underground
+57,9,Ambushed by a Wild Pokemon from a Trash Can
+58,9,Ambushed by a Wild Pokemon from a Rustling Bush
+59,9,Ambushed by a Wild Pokemon from the Ceiling of a Cave
+60,9,Ambushed by a Wild Pokemon from the Ground
+61,9,Ambushed by a Wild Pokemon from the Sky

data/v2/csv/encounter_methods.csv

@@ -18,7 +18,7 @@ id,identifier,order
 17,rough-terrain,9
 18,gift,18
 19,gift-egg,19
-20,only-one,20
+20,static,20
 21,pokeflute,21
 22,headbutt-low,22
 23,headbutt-normal,23
@@ -31,7 +31,7 @@ id,identifier,order
 30,devon-scope,30
 31,feebas-tile-fishing,31
 32,island-scan,32
-33,sos-encounter,33
+33,sos,33
 34,bubbling-spots,34
 35,berry-trees,35
 36,npc-trade,36
@@ -55,3 +55,8 @@ id,identifier,order
 54,hidden-grotto,54
 55,honey-tree,55
 56,overworld-dirt,56
+57,trash-can-ambush,57
+58,rustling-bush-ambush,58
+59,ceiling-ambush,59
+60,ground-ambush,60
+61,sky-ambush,61

data/v2/csv/encounter_slots.csv

@@ -1786,3 +1786,30 @@ id,version_group_id,encounter_method_id,slot,rarity
 1785,20,38,2,28
 1786,20,38,3,10
 1787,20,38,4,2
+1788,15,35,1,100
+1789,15,57,1,80
+1790,15,57,2,20
+1791,15,57,1,75
+1792,15,57,2,5
+1793,15,57,3,5
+1794,15,57,4,5
+1795,15,57,5,5
+1796,15,57,6,5
+1797,15,57,1,100
+1798,15,58,1,80
+1799,15,58,2,20
+1800,15,58,1,90
+1801,15,58,2,10
+1802,15,59,1,45
+1803,15,59,2,33
+1804,15,59,3,22
+1805,15,59,1,80
+1806,15,59,2,20
+1807,15,59,1,85
+1808,15,59,2,15
+1809,15,60,1,40
+1810,15,60,2,40
+1811,15,60,3,20
+1812,15,61,1,77
+1813,15,61,2,18
+1814,15,61,3,5

data/v2/csv/encounters.csv

@@ -71067,3 +71067,113 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 76929,34,917,1774,11,60,60
 76930,34,917,1775,236,7,10
 76931,34,917,1775,236,60,60
+76932,23,1377,1788,165,14,15
+76933,23,1377,1788,313,14,15
+76934,23,1377,1788,314,14,15
+76935,23,1377,1788,412,14,15
+76936,23,1377,1788,415,14,15
+76937,23,1377,1788,665,14,15
+76938,24,1377,1788,165,14,15
+76939,24,1377,1788,313,14,15
+76940,24,1377,1788,314,14,15
+76941,24,1377,1788,412,14,15
+76942,24,1377,1788,415,14,15
+76943,24,1377,1788,665,14,15
+76944,23,759,1789,568,35,35
+76945,23,759,1790,569,36,38
+76946,23,759,1797,479,38,38
+76947,24,759,1789,568,35,35
+76948,24,759,1790,569,36,38
+76949,24,759,1797,479,38,38
+76950,23,747,1797,569,46,50
+76951,23,747,1797,354,46,50
+76952,24,747,1797,569,46,50
+76953,24,747,1797,354,46,50
+76954,23,717,1798,543,10,12
+76955,23,717,1799,531,10,12
+76956,24,717,1798,543,10,12
+76957,24,717,1799,531,10,12
+76958,23,729,1800,632,44,46
+76959,23,729,1801,631,45,45
+76960,24,729,1800,632,44,46
+76961,24,729,1801,631,45,45
+76962,23,748,1802,75,57,57
+76963,23,748,1803,168,58,59
+76964,23,748,1804,714,57,59
+76965,23,749,1802,75,57,57
+76966,23,749,1803,168,58,59
+76967,23,749,1804,714,57,59
+76968,23,750,1802,75,57,57
+76969,23,750,1803,168,58,59
+76970,23,750,1804,714,57,59
+76971,23,752,1802,75,57,57
+76972,23,752,1803,168,58,59
+76973,23,752,1804,714,57,59
+76974,24,748,1802,75,57,57
+76975,24,748,1803,168,58,59
+76976,24,748,1804,714,57,59
+76977,24,749,1802,75,57,57
+76978,24,749,1803,168,58,59
+76979,24,749,1804,714,57,59
+76980,24,750,1802,75,57,57
+76981,24,750,1803,168,58,59
+76982,24,750,1804,714,57,59
+76983,24,752,1802,75,57,57
+76984,24,752,1803,168,58,59
+76985,24,752,1804,714,57,59
+76986,23,754,1805,168,44,46
+76987,23,754,1806,714,44,46
+76988,23,755,1805,168,44,46
+76989,23,755,1806,714,44,46
+76990,23,756,1805,168,44,46
+76991,23,756,1806,714,44,46
+76992,23,757,1805,168,44,46
+76993,23,757,1806,714,44,46
+76994,23,758,1805,168,44,46
+76995,23,758,1806,714,44,46
+76996,24,754,1805,168,44,46
+76997,24,754,1806,714,44,46
+76998,24,755,1805,168,44,46
+76999,24,755,1806,714,44,46
+77000,24,756,1805,168,44,46
+77001,24,756,1806,714,44,46
+77002,24,757,1805,168,44,46
+77003,24,757,1806,714,44,46
+77004,24,758,1805,168,44,46
+77005,24,758,1806,714,44,46
+77006,23,736,1807,527,15,17
+77007,23,736,1808,597,15,17
+77008,23,737,1807,527,15,17
+77009,23,737,1808,597,15,17
+77010,24,736,1807,527,15,17
+77011,24,736,1808,597,15,17
+77012,24,737,1807,527,15,17
+77013,24,737,1808,597,15,17
+77014,23,738,1805,527,21,23
+77015,23,738,1806,597,21,23
+77016,23,739,1805,527,21,23
+77017,23,739,1806,597,21,23
+77018,23,740,1805,527,21,23
+77019,23,740,1806,597,21,23
+77020,23,741,1805,527,21,23
+77021,23,741,1806,597,21,23
+77022,24,738,1805,527,21,23
+77023,24,738,1806,597,21,23
+77024,24,739,1805,527,21,23
+77025,24,739,1806,597,21,23
+77026,24,740,1805,527,21,23
+77027,24,740,1806,597,21,23
+77028,24,741,1805,527,21,23
+77029,24,741,1806,597,21,23
+77030,23,724,1809,51,26,28
+77031,23,724,1810,50,26,28
+77032,23,724,1811,443,26,28
+77033,24,724,1809,51,26,28
+77034,24,724,1810,50,26,28
+77035,24,724,1811,443,26,28
+77036,23,751,1812,22,57,59
+77037,23,751,1813,227,57,59
+77038,23,751,1814,635,59,59
+77039,24,751,1812,22,57,59
+77040,24,751,1813,227,57,59
+77041,24,751,1814,635,59,59

data/v2/csv/location_areas.csv

@@ -1255,3 +1255,4 @@ id,location_id,game_index,identifier
 1374,945,0,gym
 1375,880,0,gym
 1376,1116,0,
+1377,1117,0,

data/v2/csv/location_names.csv

@@ -3579,11 +3579,11 @@ location_id,local_language_id,name,subtitle
 728,1,きのみばたけ,
 728,3,나무열매 밭,
 728,4,樹果園,
-728,5,Champ de Baies,
-728,6,Beerenfelder,
-728,7,Huerto de Bayas,
-728,8,Orto delle Bacche,
-728,9,Berry Fields,
+728,5,Champ de Baies d'Alola,
+728,6,Alola-Beerenfelder,
+728,7,Huerto de Bayas de Alola,
+728,8,Orto delle Bacche di Alola,
+728,9,Alola Berry Fields,
 728,11,きのみ畑,
 728,12,树果园,
 728,14,Huerto de Bayas,
@@ -5246,3 +5246,4 @@ location_id,local_language_id,name,subtitle
 1114,9,Energy Plant,
 1115,9,Meetup Spot,
 1116,9,Random caves across the Isle of Armor,
+1117,6,Kalos Berry Fields,

data/v2/csv/locations.csv

@@ -709,7 +709,7 @@ id,region_id,identifier
 725,7,hauoli-cemetery
 726,7,melemele-meadow
 727,7,seaward-cave
-728,7,berry-fields
+728,7,alola-berry-fields
 729,7,verdant-cavern--trial-site
 730,7,verdant-cavern--totems-den
 731,7,alola-route-4
@@ -1098,3 +1098,4 @@ id,region_id,identifier
 1114,8,energy-plant
 1115,8,meetup-spot
 1116,8,isle-of-armor-caves
+1117,6,kalos-berry-fields