From ebe9fdd20a618bb9c37afcbcd360a04b97437fdb Mon Sep 17 00:00:00 2001 From: ItsMeJoji Date: Thu, 18 Jun 2026 16:58:26 -0700 Subject: [PATCH 1/5] adding kalos berry fields encounters --- data/v2/csv/encounter_condition_prose.csv | 1 + data/v2/csv/encounter_condition_value_map.csv | 12 ++++++++++++ data/v2/csv/encounter_condition_value_prose.csv | 6 ++++++ data/v2/csv/encounter_condition_values.csv | 6 ++++++ data/v2/csv/encounter_conditions.csv | 1 + data/v2/csv/encounter_method_prose.csv | 6 ++++-- data/v2/csv/encounter_methods.csv | 5 +++-- data/v2/csv/encounter_slots.csv | 1 + data/v2/csv/encounters.csv | 12 ++++++++++++ data/v2/csv/location_areas.csv | 1 + data/v2/csv/location_names.csv | 11 ++++++----- data/v2/csv/locations.csv | 3 ++- 12 files changed, 55 insertions(+), 10 deletions(-) diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv index 2a856089a..8054286c8 100644 --- a/data/v2/csv/encounter_condition_prose.csv +++ b/data/v2/csv/encounter_condition_prose.csv @@ -41,3 +41,4 @@ encounter_condition_id,local_language_id,name 20,9,Headbutt Tree Type 21,9,Listen to Mr. Backlot 22,9,Bug-Catching Contest +23,9,Berry Tree Type \ No newline at end of file diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index ddf2c863e..01dbc227d 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22624,3 +22624,15 @@ encounter_id,encounter_condition_value_id 19983,204 19984,204 19985,204 +75578,206 +75579,207 +75580,208 +75581,209 +75582,210 +75583,211 +75584,206 +75585,207 +75586,208 +75587,209 +75588,210 +75589,211 \ No newline at end of file diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 89a24c45b..438ab6022 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -326,3 +326,9 @@ encounter_condition_value_id,local_language_id,name 203,9,Mr. Backlot has mentioned seeing this Pokemon in the garden 204,9,Not during the Bug-Catching Contest 205,9,During the Bug-Catching Contest +206,9,Interact with a Red Berry Tree +207,9,Interact with a Blue Berry Tree +208,9,Interact with a Purple Berry Tree +209,9,Interact with a Green Berry Tree +210,9,Interact with a Yellow Berry Tree +211,9,Interact with a Pink Berry Tree \ No newline at end of file diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index 8115f8a62..4a89036a8 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -204,3 +204,9 @@ id,encounter_condition_id,identifier,is_default 203,21,backlot-mentioned,0 204,22,bug-catching-contest-no,1 205,22,bug-catching-contest-yes,0 +206,23,berry-tree-red,1 +207,23,berry-tree-blue,1 +208,23,berry-tree-purple,1 +209,23,berry-tree-green,1 +210,23,berry-tree-yellow,1 +211,23,berry-tree-pink,1 \ No newline at end of file diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv index 3a38986c2..2f813013c 100644 --- a/data/v2/csv/encounter_conditions.csv +++ b/data/v2/csv/encounter_conditions.csv @@ -21,3 +21,4 @@ id,identifier 20,headbutt-tree 21,backlot 22,bug-catching-contest +23,berry-tree-type \ No newline at end of file diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv index 54570b8df..82a385541 100644 --- a/data/v2/csv/encounter_method_prose.csv +++ b/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 @@ -103,3 +103,5 @@ encounter_method_id,local_language_id,name 53,9,"Finding a Wild Pokemon at any of the three Pokespots in Pokemon XD: Gale of Darkness." 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. +35,9,Interacting with a Berry Tree +56,9,Interacting with a Trash Can \ No newline at end of file diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index ea3be036b..320744725 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/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-encounter,20 21,pokeflute,21 22,headbutt-low,22 23,headbutt-normal,23 @@ -53,4 +53,5 @@ id,identifier,order 52,snag-rematch,52 53,pokespot,53 54,hidden-grotto,54 -55,honey-tree,54 +55,honey-tree,55 +56,trash-can,56 \ No newline at end of file diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 42cc27435..bf117e22d 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1616,3 +1616,4 @@ id,version_group_id,encounter_method_id,slot,rarity 1615,20,38,3,15 1616,20,38,4,10 1617,20,38,5,5 +1618,15,35,1,100 \ No newline at end of file diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 2a2a1afe6..b902249a8 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69713,3 +69713,15 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75575,34,907,1528,624,21,24 75576,34,907,1529,833,21,24 75577,34,907,1530,859,21,24 +75578,23,1369,1618,165,14,15 +75579,23,1369,1618,313,14,15 +75580,23,1369,1618,314,14,15 +75581,23,1369,1618,412,14,15 +75582,23,1369,1618,415,14,15 +75583,23,1369,1618,665,14,15 +75584,24,1369,1618,165,14,15 +75585,24,1369,1618,313,14,15 +75586,24,1369,1618,314,14,15 +75587,24,1369,1618,412,14,15 +75588,24,1369,1618,415,14,15 +75589,24,1369,1618,665,14,15 \ No newline at end of file diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 2310d9aeb..f5e937b6e 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -1248,3 +1248,4 @@ id,location_id,game_index,identifier 1366,869,0,lakeside 1367,918,0,gym 1368,870,0,west +1369,1114,0, \ No newline at end of file diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv index 4c729e1e8..ed3f65ab7 100644 --- a/data/v2/csv/location_names.csv +++ b/data/v2/csv/location_names.csv @@ -3364,11 +3364,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,树果园, 729,1,しげみのどうくつ,しれんのま @@ -4957,3 +4957,4 @@ location_id,local_language_id,name,subtitle 1111,9,Cipher Key Lair, 1112,9,Citadark Isle, 1113,9,Kanto Underground Path, +1114,6,Kalos Berry Fields \ No newline at end of file diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index cc9012d4a..911eda702 100644 --- a/data/v2/csv/locations.csv +++ b/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 @@ -1095,3 +1095,4 @@ id,region_id,identifier 1111,11,cipher-key-lair 1112,11,citadark-isle 1113,1,kanto-underground-path +1114,6,kalos-berry-fields \ No newline at end of file From 74a9c6cf8e01e622ca573914aab2079d2eda513e Mon Sep 17 00:00:00 2001 From: ItsMeJoji Date: Fri, 26 Jun 2026 09:26:42 -0700 Subject: [PATCH 2/5] Gen 6 Trash Can, Rustling Bush, Ceiling, Ground, and Sky Ambush Encounters added --- data/v2/csv/encounter_condition_prose.csv | 3 +- data/v2/csv/encounter_condition_value_map.csv | 12 ++- .../csv/encounter_condition_value_prose.csv | 5 +- data/v2/csv/encounter_condition_values.csv | 5 +- data/v2/csv/encounter_conditions.csv | 3 +- data/v2/csv/encounter_method_prose.csv | 6 +- data/v2/csv/encounter_methods.csv | 6 +- data/v2/csv/encounter_slots.csv | 28 ++++- data/v2/csv/encounters.csv | 100 +++++++++++++++++- 9 files changed, 159 insertions(+), 9 deletions(-) diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv index 8054286c8..a5b4cdc26 100644 --- a/data/v2/csv/encounter_condition_prose.csv +++ b/data/v2/csv/encounter_condition_prose.csv @@ -41,4 +41,5 @@ encounter_condition_id,local_language_id,name 20,9,Headbutt Tree Type 21,9,Listen to Mr. Backlot 22,9,Bug-Catching Contest -23,9,Berry Tree Type \ No newline at end of file +23,9,Berry Tree Type +24,9,Trash Can Type \ No newline at end of file diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 01dbc227d..0851be4d2 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22635,4 +22635,14 @@ encounter_id,encounter_condition_value_id 75586,208 75587,209 75588,210 -75589,211 \ No newline at end of file +75589,211 +75590,212 +75591,212 +75592,213 +75593,212 +75594,212 +75595,213 +75596,212 +75597,214 +75598,212 +75599,214 \ No newline at end of file diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 438ab6022..41654d15a 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -331,4 +331,7 @@ encounter_condition_value_id,local_language_id,name 208,9,Interact with a Purple Berry Tree 209,9,Interact with a Green Berry Tree 210,9,Interact with a Yellow Berry Tree -211,9,Interact with a Pink Berry Tree \ No newline at end of file +211,9,Interact with a Pink Berry Tree +212,9,Interact with a Shaking Trash Can (Daily) +213,9,Interact with a Shaking Trash Can (Tuesday) +214,9,Interact with a Shaking Trash Can (Thursday) \ No newline at end of file diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index 4a89036a8..206662a1b 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -209,4 +209,7 @@ id,encounter_condition_id,identifier,is_default 208,23,berry-tree-purple,1 209,23,berry-tree-green,1 210,23,berry-tree-yellow,1 -211,23,berry-tree-pink,1 \ No newline at end of file +211,23,berry-tree-pink,1 +212,24,daily-trash-can,1 +213,24,tuesday-trash-can,1 +214,24,thursday-trash-can,1 \ No newline at end of file diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv index 2f813013c..c76686a33 100644 --- a/data/v2/csv/encounter_conditions.csv +++ b/data/v2/csv/encounter_conditions.csv @@ -21,4 +21,5 @@ id,identifier 20,headbutt-tree 21,backlot 22,bug-catching-contest -23,berry-tree-type \ No newline at end of file +23,berry-tree-type +24,trash-can-type \ No newline at end of file diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv index 82a385541..bc4f1fd7c 100644 --- a/data/v2/csv/encounter_method_prose.csv +++ b/data/v2/csv/encounter_method_prose.csv @@ -104,4 +104,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. 35,9,Interacting with a Berry Tree -56,9,Interacting with a Trash Can \ No newline at end of file +56,9,Interacting with a Trash Can +57,9,Ambushed by a Wild Pokemon from a Rustling Bush +58,9,Ambushed by a Wild Pokemon from the Ceiling of a Cave +59,9,Ambushed by a Wild Pokemon from the Ground +60,9,Ambushed by a Wild Pokemon from the Sky \ No newline at end of file diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index 320744725..e66c1c630 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -54,4 +54,8 @@ id,identifier,order 53,pokespot,53 54,hidden-grotto,54 55,honey-tree,55 -56,trash-can,56 \ No newline at end of file +56,trash-can,56 +57,rustling-bush-ambush,57 +58,ceiling-ambush,58 +59,ground-ambush,59 +60,sky-ambush,60 \ No newline at end of file diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index bf117e22d..c377c4180 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1616,4 +1616,30 @@ id,version_group_id,encounter_method_id,slot,rarity 1615,20,38,3,15 1616,20,38,4,10 1617,20,38,5,5 -1618,15,35,1,100 \ No newline at end of file +1618,15,35,1,100 +1619,15,56,1,80 +1620,15,56,2,20 +1621,15,56,1,75 +1622,15,56,2,5 +1623,15,56,3,5 +1624,15,56,4,5 +1625,15,56,5,5 +1626,15,56,6,5 +1627,15,56,1,100 +1628,15,57,1,80 +1629,15,57,2,20 +1630,15,57,1,90 +1631,15,57,2,10 +1632,15,58,1,45 +1633,15,58,2,33 +1634,15,58,3,22 +1635,15,58,1,80 +1636,15,58,2,20 +1637,15,58,1,85 +1638,15,58,2,15 +1639,15,59,1,40 +1640,15,59,2,40 +1641,15,59,3,20 +1642,15,60,1,77 +1643,15,60,2,18 +1644,15,60,3,5 \ No newline at end of file diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index b902249a8..45251765b 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69724,4 +69724,102 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75586,24,1369,1618,314,14,15 75587,24,1369,1618,412,14,15 75588,24,1369,1618,415,14,15 -75589,24,1369,1618,665,14,15 \ No newline at end of file +75589,24,1369,1618,665,14,15 +75590,23,759,1619,568,35,35 +75591,23,759,1620,569,36,38 +75592,23,759,1627,479,38,38 +75593,24,759,1619,568,35,35 +75594,24,759,1620,569,36,38 +75595,24,759,1627,479,38,38 +75596,23,747,1627,569,46,50 +75597,23,747,1627,354,46,50 +75598,24,747,1627,569,46,50 +75599,24,747,1627,354,46,50 +75600,23,717,1628,543,10,12 +75601,23,717,1629,531,10,12 +75602,24,717,1628,543,10,12 +75603,24,717,1629,531,10,12 +75604,23,729,1630,632,44,46 +75605,23,729,1631,631,45,45 +75606,24,729,1630,632,44,46 +75607,24,729,1631,631,45,45 +75608,23,748,1632,75,57,57 +75609,23,748,1633,168,58,59 +75610,23,748,1634,714,57,59 +75611,23,749,1632,75,57,57 +75612,23,749,1633,168,58,59 +75613,23,749,1634,714,57,59 +75614,23,750,1632,75,57,57 +75615,23,750,1633,168,58,59 +75616,23,750,1634,714,57,59 +75617,23,752,1632,75,57,57 +75618,23,752,1633,168,58,59 +75619,23,752,1634,714,57,59 +75620,24,748,1632,75,57,57 +75621,24,748,1633,168,58,59 +75622,24,748,1634,714,57,59 +75623,24,749,1632,75,57,57 +75624,24,749,1633,168,58,59 +75625,24,749,1634,714,57,59 +75626,24,750,1632,75,57,57 +75627,24,750,1633,168,58,59 +75628,24,750,1634,714,57,59 +75629,24,752,1632,75,57,57 +75630,24,752,1633,168,58,59 +75631,24,752,1634,714,57,59 +75632,23,754,1635,168,44,46 +75633,23,754,1636,714,44,46 +75634,23,755,1635,168,44,46 +75635,23,755,1636,714,44,46 +75636,23,756,1635,168,44,46 +75637,23,756,1636,714,44,46 +75638,23,757,1635,168,44,46 +75639,23,757,1636,714,44,46 +75640,23,758,1635,168,44,46 +75641,23,758,1636,714,44,46 +75642,24,754,1635,168,44,46 +75643,24,754,1636,714,44,46 +75644,24,755,1635,168,44,46 +75645,24,755,1636,714,44,46 +75646,24,756,1635,168,44,46 +75647,24,756,1636,714,44,46 +75648,24,757,1635,168,44,46 +75649,24,757,1636,714,44,46 +75650,24,758,1635,168,44,46 +75651,24,758,1636,714,44,46 +75652,23,736,1637,527,15,17 +75653,23,736,1638,597,15,17 +75654,23,737,1637,527,15,17 +75655,23,737,1638,597,15,17 +75656,24,736,1637,527,15,17 +75657,24,736,1638,597,15,17 +75658,24,737,1637,527,15,17 +75659,24,737,1638,597,15,17 +75660,23,738,1635,527,21,23 +75661,23,738,1636,597,21,23 +75662,23,739,1635,527,21,23 +75663,23,739,1636,597,21,23 +75664,23,740,1635,527,21,23 +75665,23,740,1636,597,21,23 +75666,23,741,1635,527,21,23 +75667,23,741,1636,597,21,23 +75668,24,738,1635,527,21,23 +75669,24,738,1636,597,21,23 +75670,24,739,1635,527,21,23 +75671,24,739,1636,597,21,23 +75672,24,740,1635,527,21,23 +75673,24,740,1636,597,21,23 +75674,24,741,1635,527,21,23 +75675,24,741,1636,597,21,23 +75676,23,724,1639,51,26,28 +75677,23,724,1640,50,26,28 +75678,23,724,1641,443,26,28 +75679,24,724,1639,51,26,28 +75680,24,724,1640,50,26,28 +75681,24,724,1641,443,26,28 +75682,23,751,1642,22,57,59 +75683,23,751,1643,227,57,59 +75684,23,751,1644,635,59,59 +75685,24,751,1642,22,57,59 +75686,24,751,1643,227,57,59 +75687,24,751,1644,635,59,59 \ No newline at end of file From 9d1529f1ef5ae2c979d03cdc7bad06f80f6e59be Mon Sep 17 00:00:00 2001 From: ItsMeJoji Date: Fri, 26 Jun 2026 12:39:39 -0700 Subject: [PATCH 3/5] correcting new encounters --- data/v2/csv/encounters.csv | 222 ++++++++++++++++++------------------- 1 file changed, 110 insertions(+), 112 deletions(-) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index fd5fad8c4..cd2eef186 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -71067,115 +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 - - -75578,23,1369,1618,165,14,15 -75579,23,1369,1618,313,14,15 -75580,23,1369,1618,314,14,15 -75581,23,1369,1618,412,14,15 -75582,23,1369,1618,415,14,15 -75583,23,1369,1618,665,14,15 -75584,24,1369,1618,165,14,15 -75585,24,1369,1618,313,14,15 -75586,24,1369,1618,314,14,15 -75587,24,1369,1618,412,14,15 -75588,24,1369,1618,415,14,15 -75589,24,1369,1618,665,14,15 -75590,23,759,1619,568,35,35 -75591,23,759,1620,569,36,38 -75592,23,759,1627,479,38,38 -75593,24,759,1619,568,35,35 -75594,24,759,1620,569,36,38 -75595,24,759,1627,479,38,38 -75596,23,747,1627,569,46,50 -75597,23,747,1627,354,46,50 -75598,24,747,1627,569,46,50 -75599,24,747,1627,354,46,50 -75600,23,717,1628,543,10,12 -75601,23,717,1629,531,10,12 -75602,24,717,1628,543,10,12 -75603,24,717,1629,531,10,12 -75604,23,729,1630,632,44,46 -75605,23,729,1631,631,45,45 -75606,24,729,1630,632,44,46 -75607,24,729,1631,631,45,45 -75608,23,748,1632,75,57,57 -75609,23,748,1633,168,58,59 -75610,23,748,1634,714,57,59 -75611,23,749,1632,75,57,57 -75612,23,749,1633,168,58,59 -75613,23,749,1634,714,57,59 -75614,23,750,1632,75,57,57 -75615,23,750,1633,168,58,59 -75616,23,750,1634,714,57,59 -75617,23,752,1632,75,57,57 -75618,23,752,1633,168,58,59 -75619,23,752,1634,714,57,59 -75620,24,748,1632,75,57,57 -75621,24,748,1633,168,58,59 -75622,24,748,1634,714,57,59 -75623,24,749,1632,75,57,57 -75624,24,749,1633,168,58,59 -75625,24,749,1634,714,57,59 -75626,24,750,1632,75,57,57 -75627,24,750,1633,168,58,59 -75628,24,750,1634,714,57,59 -75629,24,752,1632,75,57,57 -75630,24,752,1633,168,58,59 -75631,24,752,1634,714,57,59 -75632,23,754,1635,168,44,46 -75633,23,754,1636,714,44,46 -75634,23,755,1635,168,44,46 -75635,23,755,1636,714,44,46 -75636,23,756,1635,168,44,46 -75637,23,756,1636,714,44,46 -75638,23,757,1635,168,44,46 -75639,23,757,1636,714,44,46 -75640,23,758,1635,168,44,46 -75641,23,758,1636,714,44,46 -75642,24,754,1635,168,44,46 -75643,24,754,1636,714,44,46 -75644,24,755,1635,168,44,46 -75645,24,755,1636,714,44,46 -75646,24,756,1635,168,44,46 -75647,24,756,1636,714,44,46 -75648,24,757,1635,168,44,46 -75649,24,757,1636,714,44,46 -75650,24,758,1635,168,44,46 -75651,24,758,1636,714,44,46 -75652,23,736,1637,527,15,17 -75653,23,736,1638,597,15,17 -75654,23,737,1637,527,15,17 -75655,23,737,1638,597,15,17 -75656,24,736,1637,527,15,17 -75657,24,736,1638,597,15,17 -75658,24,737,1637,527,15,17 -75659,24,737,1638,597,15,17 -75660,23,738,1635,527,21,23 -75661,23,738,1636,597,21,23 -75662,23,739,1635,527,21,23 -75663,23,739,1636,597,21,23 -75664,23,740,1635,527,21,23 -75665,23,740,1636,597,21,23 -75666,23,741,1635,527,21,23 -75667,23,741,1636,597,21,23 -75668,24,738,1635,527,21,23 -75669,24,738,1636,597,21,23 -75670,24,739,1635,527,21,23 -75671,24,739,1636,597,21,23 -75672,24,740,1635,527,21,23 -75673,24,740,1636,597,21,23 -75674,24,741,1635,527,21,23 -75675,24,741,1636,597,21,23 -75676,23,724,1639,51,26,28 -75677,23,724,1640,50,26,28 -75678,23,724,1641,443,26,28 -75679,24,724,1639,51,26,28 -75680,24,724,1640,50,26,28 -75681,24,724,1641,443,26,28 -75682,23,751,1642,22,57,59 -75683,23,751,1643,227,57,59 -75684,23,751,1644,635,59,59 -75685,24,751,1642,22,57,59 -75686,24,751,1643,227,57,59 -75687,24,751,1644,635,59,59 \ No newline at end of file +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 \ No newline at end of file From 3c92cdec97ab2a8961fbb718fcd472a0afb5f33c Mon Sep 17 00:00:00 2001 From: ItsMeJoji Date: Fri, 26 Jun 2026 13:59:22 -0700 Subject: [PATCH 4/5] Missing comma... --- data/v2/csv/location_names.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv index f10bbf0d0..c287e20cb 100644 --- a/data/v2/csv/location_names.csv +++ b/data/v2/csv/location_names.csv @@ -5246,4 +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 \ No newline at end of file +1117,6,Kalos Berry Fields, \ No newline at end of file From 4ab8aaeffb5fc5253b1558b1d9786c5ec47144cb Mon Sep 17 00:00:00 2001 From: ItsMeJoji Date: Mon, 29 Jun 2026 15:37:14 -0700 Subject: [PATCH 5/5] Corrections based on comments made. --- data/v2/csv/encounter_condition_values.csv | 6 +-- data/v2/csv/encounter_method_prose.csv | 2 +- data/v2/csv/encounter_methods.csv | 6 +-- data/v2/csv/encounter_slots.csv | 52 +++++++++++----------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index 05acdbbf2..7a3c6fe3f 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -261,6 +261,6 @@ id,encounter_condition_id,identifier,is_default 260,26,berry-tree-green,1 261,26,berry-tree-yellow,1 262,26,berry-tree-pink,1 -263,27,daily-trash-can,1 -264,27,tuesday-trash-can,1 -265,27,thursday-trash-can,1 \ No newline at end of file +263,27,trash-can-type-daily,1 +264,27,trash-can-type-tuesday,1 +265,27,trash-can-type-thursday,1 \ No newline at end of file diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv index e84b11777..ac180cfcb 100644 --- a/data/v2/csv/encounter_method_prose.csv +++ b/data/v2/csv/encounter_method_prose.csv @@ -105,7 +105,7 @@ 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,Interacting with a Trash Can +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 diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index 2a5d50d5b..cd09ab188 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/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,static-encounter,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,7 +55,7 @@ id,identifier,order 54,hidden-grotto,54 55,honey-tree,55 56,overworld-dirt,56 -57,trash-can,57 +57,trash-can-ambush,57 58,rustling-bush-ambush,58 59,ceiling-ambush,59 60,ground-ambush,60 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 42e840dfe..0b536a79c 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1787,29 +1787,29 @@ id,version_group_id,encounter_method_id,slot,rarity 1786,20,38,3,10 1787,20,38,4,2 1788,15,35,1,100 -1789,15,56,1,80 -1790,15,56,2,20 -1791,15,56,1,75 -1792,15,56,2,5 -1793,15,56,3,5 -1794,15,56,4,5 -1795,15,56,5,5 -1796,15,56,6,5 -1797,15,56,1,100 -1798,15,57,1,80 -1799,15,57,2,20 -1800,15,57,1,90 -1801,15,57,2,10 -1802,15,58,1,45 -1803,15,58,2,33 -1804,15,58,3,22 -1805,15,58,1,80 -1806,15,58,2,20 -1807,15,58,1,85 -1808,15,58,2,15 -1809,15,59,1,40 -1810,15,59,2,40 -1811,15,59,3,20 -1812,15,60,1,77 -1813,15,60,2,18 -1814,15,60,3,5 \ No newline at end of file +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 \ No newline at end of file