diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv
index 98932906e..2492d213e 100644
--- a/data/v2/csv/encounter_condition_prose.csv
+++ b/data/v2/csv/encounter_condition_prose.csv
@@ -47,3 +47,5 @@ encounter_condition_id,local_language_id,name
 26,9,Johto Safari Zone Blocks
 27,9,Max Den Rarity
 28,9,Max Den Difficulty Rating
+29,9,Berry Tree Type
+30,9,Trash Can Type
diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index c46eca337..80dcad042 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -22813,1684 +22813,1684 @@ encounter_id,encounter_condition_value_id
 76085,255
 76086,255
 76087,255
-76088,256
-76089,256
+76088,343
+76089,343
 76090,35
 76091,35
-76092,256
-76093,256
+76092,343
+76093,343
 76094,35
 76095,35
 76096,247
-76096,256
+76096,343
 76097,247
 76097,35
 76098,247
-76098,256
+76098,343
 76099,247
 76099,35
 76100,247
-76100,256
+76100,343
 76101,247
 76101,35
 76102,247
-76102,256
+76102,343
 76103,247
 76103,35
 76104,247
-76104,256
+76104,343
 76105,247
 76105,35
 76106,247
-76106,256
+76106,343
 76107,247
 76107,35
 76108,247
-76108,256
+76108,343
 76109,247
 76109,35
 76110,247
-76110,256
+76110,343
 76111,247
 76111,35
 76112,247
-76112,256
+76112,343
 76113,247
 76113,35
 76114,247
-76114,256
+76114,343
 76115,247
 76115,35
 76116,247
-76116,256
+76116,343
 76117,247
 76117,35
 76118,247
-76118,256
+76118,343
 76119,247
 76119,35
 76120,247
-76120,256
+76120,343
 76121,247
 76121,35
 76122,247
-76122,256
+76122,343
 76123,247
 76123,35
 76124,247
-76124,256
+76124,343
 76125,247
 76125,35
 76126,247
-76126,256
+76126,343
 76127,247
 76127,35
 76128,247
-76128,256
+76128,343
 76129,247
 76129,35
 76130,247
-76130,256
+76130,343
 76131,247
 76131,35
 76132,247
-76132,256
+76132,343
 76133,247
 76133,35
 76134,247
-76134,256
+76134,343
 76135,247
 76135,35
 76136,247
-76136,256
+76136,343
 76137,247
 76137,35
 76138,247
-76138,256
+76138,343
 76139,247
 76139,35
 76140,247
-76140,256
+76140,343
 76141,247
 76141,35
 76142,247
-76142,256
+76142,343
 76143,247
 76143,35
 76144,247
-76144,256
+76144,343
 76145,247
 76145,35
 76146,247
-76146,256
+76146,343
 76147,247
 76147,35
 76148,247
-76148,256
+76148,343
 76149,247
 76149,35
 76150,247
-76150,256
+76150,343
 76151,247
 76151,35
 76152,247
-76152,256
+76152,343
 76153,247
 76153,35
 76154,247
-76154,256
+76154,343
 76155,247
 76155,35
 76156,247
-76156,256
+76156,343
 76157,247
 76157,35
 76158,247
-76158,256
+76158,343
 76159,247
 76159,35
 76160,247
-76160,256
+76160,343
 76161,247
 76161,35
 76162,247
-76162,256
+76162,343
 76163,247
 76163,35
 76164,247
-76164,256
+76164,343
 76165,247
 76165,35
 76166,247
-76166,256
+76166,343
 76167,247
 76167,35
 76168,247
-76168,256
+76168,343
 76169,247
 76169,35
 76170,247
-76170,256
+76170,343
 76171,247
 76171,35
 76172,247
-76172,256
+76172,343
 76173,247
 76173,35
 76174,247
-76174,256
+76174,343
 76175,247
 76175,35
 76176,249
-76176,256
+76176,343
 76177,249
 76177,35
 76178,249
-76178,256
+76178,343
 76179,249
 76179,35
 76180,249
-76180,256
+76180,343
 76181,249
 76181,35
 76182,249
-76182,256
+76182,343
 76183,249
 76183,35
 76184,249
-76184,256
+76184,343
 76185,249
 76185,35
 76186,249
-76186,256
+76186,343
 76187,249
 76187,35
 76188,249
-76188,256
+76188,343
 76189,249
 76189,35
 76190,249
-76190,256
+76190,343
 76191,249
 76191,35
 76192,249
-76192,256
+76192,343
 76193,249
 76193,35
 76194,249
-76194,256
+76194,343
 76195,249
 76195,35
 76196,249
-76196,256
+76196,343
 76197,249
 76197,35
 76198,249
-76198,256
+76198,343
 76199,249
 76199,35
 76200,249
-76200,256
+76200,343
 76201,249
 76201,35
 76202,249
-76202,256
+76202,343
 76203,249
 76203,35
 76204,249
-76204,256
+76204,343
 76205,249
 76205,35
 76206,249
-76206,256
+76206,343
 76207,249
 76207,35
 76208,249
-76208,256
+76208,343
 76209,249
 76209,35
 76210,249
-76210,256
+76210,343
 76211,249
 76211,35
 76212,249
-76212,256
+76212,343
 76213,249
 76213,35
 76214,249
-76214,256
+76214,343
 76215,249
 76215,35
 76216,249
-76216,256
+76216,343
 76217,249
 76217,35
 76218,249
-76218,256
+76218,343
 76219,249
 76219,35
 76220,249
-76220,256
+76220,343
 76221,249
 76221,35
 76222,249
-76222,256
+76222,343
 76223,249
 76223,35
 76224,249
-76224,256
+76224,343
 76225,249
 76225,35
 76226,249
-76226,256
+76226,343
 76227,249
 76227,35
 76228,249
-76228,256
+76228,343
 76229,249
 76229,35
 76230,249
-76230,256
+76230,343
 76231,249
 76231,35
 76232,249
-76232,256
+76232,343
 76233,249
 76233,35
 76234,249
-76234,256
+76234,343
 76235,249
 76235,35
 76236,249
-76236,256
+76236,343
 76237,249
 76237,35
 76238,249
-76238,256
+76238,343
 76239,249
 76239,35
 76240,249
-76240,256
+76240,343
 76241,249
 76241,35
 76242,249
-76242,256
+76242,343
 76243,249
 76243,35
 76244,249
-76244,256
+76244,343
 76245,249
 76245,35
 76246,249
-76246,256
+76246,343
 76247,249
 76247,35
 76248,249
-76248,256
+76248,343
 76249,249
 76249,35
 76250,249
-76250,256
+76250,343
 76251,249
 76251,35
 76252,249
-76252,256
+76252,343
 76253,249
 76253,35
 76254,249
-76254,256
+76254,343
 76255,249
 76255,35
 76256,250
-76256,256
+76256,343
 76257,250
 76257,35
 76258,250
-76258,256
+76258,343
 76259,250
 76259,35
 76260,250
-76260,256
+76260,343
 76261,250
 76261,35
 76262,250
-76262,256
+76262,343
 76263,250
 76263,35
 76264,250
-76264,256
+76264,343
 76265,250
 76265,35
 76266,250
-76266,256
+76266,343
 76267,250
 76267,35
 76268,250
-76268,256
+76268,343
 76269,250
 76269,35
 76270,250
-76270,256
+76270,343
 76271,250
 76271,35
 76272,250
-76272,256
+76272,343
 76273,250
 76273,35
 76274,250
-76274,256
+76274,343
 76275,250
 76275,35
 76276,250
-76276,256
+76276,343
 76277,250
 76277,35
 76278,250
-76278,256
+76278,343
 76279,250
 76279,35
 76280,250
-76280,256
+76280,343
 76281,250
 76281,35
 76282,250
-76282,256
+76282,343
 76283,250
 76283,35
 76284,250
-76284,256
+76284,343
 76285,250
 76285,35
 76286,250
-76286,256
+76286,343
 76287,250
 76287,35
 76288,250
-76288,256
+76288,343
 76289,250
 76289,35
 76290,250
-76290,256
+76290,343
 76291,250
 76291,35
 76292,250
-76292,256
+76292,343
 76293,250
 76293,35
 76294,250
-76294,256
+76294,343
 76295,250
 76295,35
 76296,250
-76296,256
+76296,343
 76297,250
 76297,35
 76298,250
-76298,256
+76298,343
 76299,250
 76299,35
 76300,250
-76300,256
+76300,343
 76301,250
 76301,35
 76302,250
-76302,256
+76302,343
 76303,250
 76303,35
 76304,250
-76304,256
+76304,343
 76305,250
 76305,35
 76306,250
-76306,256
+76306,343
 76307,250
 76307,35
 76308,250
-76308,256
+76308,343
 76309,250
 76309,35
 76310,250
-76310,256
+76310,343
 76311,250
 76311,35
 76312,250
-76312,256
+76312,343
 76313,250
 76313,35
 76314,250
-76314,256
+76314,343
 76315,250
 76315,35
 76316,250
-76316,256
+76316,343
 76317,250
 76317,35
 76318,250
-76318,256
+76318,343
 76319,250
 76319,35
 76320,250
-76320,256
+76320,343
 76321,250
 76321,35
 76322,250
-76322,256
+76322,343
 76323,250
 76323,35
 76324,250
-76324,256
+76324,343
 76325,250
 76325,35
 76326,250
-76326,256
+76326,343
 76327,250
 76327,35
 76328,250
-76328,256
+76328,343
 76329,250
 76329,35
 76330,250
-76330,256
+76330,343
 76331,250
 76331,35
 76332,250
-76332,256
+76332,343
 76333,250
 76333,35
 76334,250
-76334,256
+76334,343
 76335,250
 76335,35
 76336,251
-76336,256
+76336,343
 76337,251
 76337,35
 76338,251
-76338,256
+76338,343
 76339,251
 76339,35
 76340,251
-76340,256
+76340,343
 76341,251
 76341,35
 76342,251
-76342,256
+76342,343
 76343,251
 76343,35
 76344,251
-76344,256
+76344,343
 76345,251
 76345,35
 76346,251
-76346,256
+76346,343
 76347,251
 76347,35
 76348,251
-76348,256
+76348,343
 76349,251
 76349,35
 76350,251
-76350,256
+76350,343
 76351,251
 76351,35
 76352,251
-76352,256
+76352,343
 76353,251
 76353,35
 76354,251
-76354,256
+76354,343
 76355,251
 76355,35
 76356,251
-76356,256
+76356,343
 76357,251
 76357,35
 76358,251
-76358,256
+76358,343
 76359,251
 76359,35
 76360,251
-76360,256
+76360,343
 76361,251
 76361,35
 76362,251
-76362,256
+76362,343
 76363,251
 76363,35
 76364,251
-76364,256
+76364,343
 76365,251
 76365,35
 76366,251
-76366,256
+76366,343
 76367,251
 76367,35
 76368,251
-76368,256
+76368,343
 76369,251
 76369,35
 76370,251
-76370,256
+76370,343
 76371,251
 76371,35
 76372,251
-76372,256
+76372,343
 76373,251
 76373,35
 76374,251
-76374,256
+76374,343
 76375,251
 76375,35
 76376,251
-76376,256
+76376,343
 76377,251
 76377,35
 76378,251
-76378,256
+76378,343
 76379,251
 76379,35
 76380,251
-76380,256
+76380,343
 76381,251
 76381,35
 76382,251
-76382,256
+76382,343
 76383,251
 76383,35
 76384,251
-76384,256
+76384,343
 76385,251
 76385,35
 76386,251
-76386,256
+76386,343
 76387,251
 76387,35
 76388,251
-76388,256
+76388,343
 76389,251
 76389,35
 76390,251
-76390,256
+76390,343
 76391,251
 76391,35
 76392,251
-76392,256
+76392,343
 76393,251
 76393,35
 76394,251
-76394,256
+76394,343
 76395,251
 76395,35
 76396,251
-76396,256
+76396,343
 76397,251
 76397,35
 76398,251
-76398,256
+76398,343
 76399,251
 76399,35
 76400,251
-76400,256
+76400,343
 76401,251
 76401,35
 76402,251
-76402,256
+76402,343
 76403,251
 76403,35
 76404,251
-76404,256
+76404,343
 76405,251
 76405,35
 76406,251
-76406,256
+76406,343
 76407,251
 76407,35
 76408,252
-76408,256
+76408,343
 76409,252
 76409,35
 76410,252
-76410,256
+76410,343
 76411,252
 76411,35
 76412,252
-76412,256
+76412,343
 76413,252
 76413,35
 76414,252
-76414,256
+76414,343
 76415,252
 76415,35
 76416,252
-76416,256
+76416,343
 76417,252
 76417,35
 76418,252
-76418,256
+76418,343
 76419,252
 76419,35
 76420,252
-76420,256
+76420,343
 76421,252
 76421,35
 76422,252
-76422,256
+76422,343
 76423,252
 76423,35
 76424,252
-76424,256
+76424,343
 76425,252
 76425,35
 76426,252
-76426,256
+76426,343
 76427,252
 76427,35
 76428,252
-76428,256
+76428,343
 76429,252
 76429,35
 76430,252
-76430,256
+76430,343
 76431,252
 76431,35
 76432,252
-76432,256
+76432,343
 76433,252
 76433,35
 76434,252
-76434,256
+76434,343
 76435,252
 76435,35
 76436,252
-76436,256
+76436,343
 76437,252
 76437,35
 76438,252
-76438,256
+76438,343
 76439,252
 76439,35
 76440,252
-76440,256
+76440,343
 76441,252
 76441,35
 76442,252
-76442,256
+76442,343
 76443,252
 76443,35
 76444,252
-76444,256
+76444,343
 76445,252
 76445,35
 76446,252
-76446,256
+76446,343
 76447,252
 76447,35
 76448,252
-76448,256
+76448,343
 76449,252
 76449,35
 76450,252
-76450,256
+76450,343
 76451,252
 76451,35
 76452,252
-76452,256
+76452,343
 76453,252
 76453,35
 76454,252
-76454,256
+76454,343
 76455,252
 76455,35
 76456,252
-76456,256
+76456,343
 76457,252
 76457,35
 76458,252
-76458,256
+76458,343
 76459,252
 76459,35
 76460,252
-76460,256
+76460,343
 76461,252
 76461,35
 76462,252
-76462,256
+76462,343
 76463,252
 76463,35
 76464,252
-76464,256
+76464,343
 76465,252
 76465,35
 76466,252
-76466,256
+76466,343
 76467,252
 76467,35
 76468,252
-76468,256
+76468,343
 76469,252
 76469,35
 76470,252
-76470,256
+76470,343
 76471,252
 76471,35
 76472,252
-76472,256
+76472,343
 76473,252
 76473,35
 76474,252
-76474,256
+76474,343
 76475,252
 76475,35
 76476,252
-76476,256
+76476,343
 76477,252
 76477,35
 76478,252
-76478,256
+76478,343
 76479,252
 76479,35
 76480,254
-76480,256
+76480,343
 76481,254
 76481,35
 76482,254
-76482,256
+76482,343
 76483,254
 76483,35
 76484,254
-76484,256
+76484,343
 76485,254
 76485,35
 76486,254
-76486,256
+76486,343
 76487,254
 76487,35
 76488,254
-76488,256
+76488,343
 76489,254
 76489,35
 76490,254
-76490,256
+76490,343
 76491,254
 76491,35
 76492,254
-76492,256
+76492,343
 76493,254
 76493,35
 76494,254
-76494,256
+76494,343
 76495,254
 76495,35
 76496,254
-76496,256
+76496,343
 76497,254
 76497,35
 76498,254
-76498,256
+76498,343
 76499,254
 76499,35
 76500,254
-76500,256
+76500,343
 76501,254
 76501,35
 76502,254
-76502,256
+76502,343
 76503,254
 76503,35
 76504,254
-76504,256
+76504,343
 76505,254
 76505,35
 76506,254
-76506,256
+76506,343
 76507,254
 76507,35
 76508,254
-76508,256
+76508,343
 76509,254
 76509,35
 76510,254
-76510,256
+76510,343
 76511,254
 76511,35
 76512,254
-76512,256
+76512,343
 76513,254
 76513,35
 76514,254
-76514,256
+76514,343
 76515,254
 76515,35
 76516,254
-76516,256
+76516,343
 76517,254
 76517,35
 76518,254
-76518,256
+76518,343
 76519,254
 76519,35
 76520,254
-76520,256
+76520,343
 76521,254
 76521,35
 76522,254
-76522,256
+76522,343
 76523,254
 76523,35
 76524,254
-76524,256
+76524,343
 76525,254
 76525,35
 76526,254
-76526,256
+76526,343
 76527,254
 76527,35
 76528,254
-76528,256
+76528,343
 76529,254
 76529,35
 76530,254
-76530,256
+76530,343
 76531,254
 76531,35
 76532,254
-76532,256
+76532,343
 76533,254
 76533,35
 76534,254
-76534,256
+76534,343
 76535,254
 76535,35
 76536,254
-76536,256
+76536,343
 76537,254
 76537,35
 76538,254
-76538,256
+76538,343
 76539,254
 76539,35
 76540,254
-76540,256
+76540,343
 76541,254
 76541,35
 76542,254
-76542,256
+76542,343
 76543,254
 76543,35
 76544,254
-76544,256
+76544,343
 76545,254
 76545,35
 76546,254
-76546,256
+76546,343
 76547,254
 76547,35
 76548,254
-76548,256
+76548,343
 76549,254
 76549,35
 76550,254
-76550,256
+76550,343
 76551,254
 76551,35
 76552,254
-76552,256
+76552,343
 76553,254
 76553,35
 76554,254
-76554,256
+76554,343
 76555,254
 76555,35
 76556,253
-76556,256
+76556,343
 76557,253
 76557,35
 76558,253
-76558,256
+76558,343
 76559,253
 76559,35
 76560,253
-76560,256
+76560,343
 76561,253
 76561,35
 76562,253
-76562,256
+76562,343
 76563,253
 76563,35
 76564,253
-76564,256
+76564,343
 76565,253
 76565,35
 76566,253
-76566,256
+76566,343
 76567,253
 76567,35
 76568,253
-76568,256
+76568,343
 76569,253
 76569,35
 76570,253
-76570,256
+76570,343
 76571,253
 76571,35
 76572,253
-76572,256
+76572,343
 76573,253
 76573,35
 76574,253
-76574,256
+76574,343
 76575,253
 76575,35
 76576,253
-76576,256
+76576,343
 76577,253
 76577,35
 76578,253
-76578,256
+76578,343
 76579,253
 76579,35
 76580,253
-76580,256
+76580,343
 76581,253
 76581,35
 76582,253
-76582,256
+76582,343
 76583,253
 76583,35
 76584,253
-76584,256
+76584,343
 76585,253
 76585,35
 76586,253
-76586,256
+76586,343
 76587,253
 76587,35
 76588,253
-76588,256
+76588,343
 76589,253
 76589,35
 76590,253
-76590,256
+76590,343
 76591,253
 76591,35
 76592,253
-76592,256
+76592,343
 76593,253
 76593,35
 76594,253
-76594,256
+76594,343
 76595,253
 76595,35
 76596,253
-76596,256
+76596,343
 76597,253
 76597,35
 76598,253
-76598,256
+76598,343
 76599,253
 76599,35
 76600,253
-76600,256
+76600,343
 76601,253
 76601,35
 76602,253
-76602,256
+76602,343
 76603,253
 76603,35
 76604,253
-76604,256
+76604,343
 76605,253
 76605,35
 76606,253
-76606,256
+76606,343
 76607,253
 76607,35
 76608,253
-76608,256
+76608,343
 76609,253
 76609,35
 76610,253
-76610,256
+76610,343
 76611,253
 76611,35
 76612,253
-76612,256
+76612,343
 76613,253
 76613,35
 76614,253
-76614,256
+76614,343
 76615,253
 76615,35
 76616,253
-76616,256
+76616,343
 76617,253
 76617,35
 76618,253
-76618,256
+76618,343
 76619,253
 76619,35
 76620,253
-76620,256
+76620,343
 76621,253
 76621,35
 76622,253
-76622,256
+76622,343
 76623,253
 76623,35
 76624,253
-76624,256
+76624,343
 76625,253
 76625,35
 76626,253
-76626,256
+76626,343
 76627,253
 76627,35
 76628,253
-76628,256
+76628,343
 76629,253
 76629,35
 76630,253
-76630,256
+76630,343
 76631,253
 76631,35
 76632,255
-76632,256
+76632,343
 76633,255
 76633,35
 76634,255
-76634,256
+76634,343
 76635,255
 76635,35
 76636,255
-76636,256
+76636,343
 76637,255
 76637,35
 76638,255
-76638,256
+76638,343
 76639,255
 76639,35
 76640,255
-76640,256
+76640,343
 76641,255
 76641,35
 76642,255
-76642,256
+76642,343
 76643,255
 76643,35
 76644,255
-76644,256
+76644,343
 76645,255
 76645,35
 76646,255
-76646,256
+76646,343
 76647,255
 76647,35
 76648,255
-76648,256
+76648,343
 76649,255
 76649,35
 76650,255
-76650,256
+76650,343
 76651,255
 76651,35
 76652,255
-76652,256
+76652,343
 76653,255
 76653,35
 76654,255
-76654,256
+76654,343
 76655,255
 76655,35
 76656,255
-76656,256
+76656,343
 76657,255
 76657,35
 76658,255
-76658,256
+76658,343
 76659,255
 76659,35
 76660,255
-76660,256
+76660,343
 76661,255
 76661,35
 76662,255
-76662,256
+76662,343
 76663,255
 76663,35
 76664,255
-76664,256
+76664,343
 76665,255
 76665,35
 76666,255
-76666,256
+76666,343
 76667,255
 76667,35
 76668,255
-76668,256
+76668,343
 76669,255
 76669,35
 76670,255
-76670,256
+76670,343
 76671,255
 76671,35
 76672,255
-76672,256
+76672,343
 76673,255
 76673,35
 76674,255
-76674,256
+76674,343
 76675,255
 76675,35
 76676,255
-76676,256
+76676,343
 76677,255
 76677,35
 76678,255
-76678,256
+76678,343
 76679,255
 76679,35
 76680,255
-76680,256
+76680,343
 76681,255
 76681,35
 76682,255
-76682,256
+76682,343
 76683,255
 76683,35
 76684,255
-76684,256
+76684,343
 76685,255
 76685,35
 76686,255
-76686,256
+76686,343
 76687,255
 76687,35
 76688,255
-76688,256
+76688,343
 76689,255
 76689,35
 76690,255
-76690,256
+76690,343
 76691,255
 76691,35
 76692,255
-76692,256
+76692,343
 76693,255
 76693,35
 76694,255
-76694,256
+76694,343
 76695,255
 76695,35
 76696,255
-76696,256
+76696,343
 76697,255
 76697,35
 76698,255
-76698,256
+76698,343
 76699,255
 76699,35
 76700,255
-76700,256
+76700,343
 76701,255
 76701,35
 76702,255
-76702,256
+76702,343
 76703,255
 76703,35
 76704,255
-76704,256
+76704,343
 76705,255
 76705,35
 76706,255
-76706,256
+76706,343
 76707,255
 76707,35
 76708,255
-76708,256
+76708,343
 76709,255
 76709,35
 76710,255
-76710,256
+76710,343
 76711,255
 76711,35
 76712,248
-76712,256
+76712,343
 76713,248
 76713,35
 76714,248
-76714,256
+76714,343
 76715,248
 76715,35
 76716,248
-76716,256
+76716,343
 76717,248
 76717,35
 76718,248
-76718,256
+76718,343
 76719,248
 76719,35
 76720,248
-76720,256
+76720,343
 76721,248
 76721,35
 76722,248
-76722,256
+76722,343
 76723,248
 76723,35
 76724,248
-76724,256
+76724,343
 76725,248
 76725,35
 76726,248
-76726,256
+76726,343
 76727,248
 76727,35
 76728,248
-76728,256
+76728,343
 76729,248
 76729,35
 76730,248
-76730,256
+76730,343
 76731,248
 76731,35
 76732,248
-76732,256
+76732,343
 76733,248
 76733,35
 76734,248
-76734,256
+76734,343
 76735,248
 76735,35
 76736,248
-76736,256
+76736,343
 76737,248
 76737,35
 76738,248
-76738,256
+76738,343
 76739,248
 76739,35
 76740,248
-76740,256
+76740,343
 76741,248
 76741,35
 76742,248
-76742,256
+76742,343
 76743,248
 76743,35
 76744,248
-76744,256
+76744,343
 76745,248
 76745,35
 76746,248
-76746,256
+76746,343
 76747,248
 76747,35
 76748,248
-76748,256
+76748,343
 76749,248
 76749,35
 76750,248
-76750,256
+76750,343
 76751,248
 76751,35
 76752,248
-76752,256
+76752,343
 76753,248
 76753,35
 76754,248
-76754,256
+76754,343
 76755,248
 76755,35
 76756,248
-76756,256
+76756,343
 76757,248
 76757,35
 76758,248
-76758,256
+76758,343
 76759,248
 76759,35
 76760,248
-76760,256
+76760,343
 76761,248
 76761,35
 76762,248
-76762,256
+76762,343
 76763,248
 76763,35
 76764,248
-76764,256
+76764,343
 76765,248
 76765,35
 76766,248
-76766,256
+76766,343
 76767,248
 76767,35
 76768,248
-76768,256
+76768,343
 76769,248
 76769,35
 76770,248
-76770,256
+76770,343
 76771,248
 76771,35
 76772,248
-76772,256
+76772,343
 76773,248
 76773,35
 76774,248
-76774,256
+76774,343
 76775,248
 76775,35
 76776,248
-76776,256
+76776,343
 76777,248
 76777,35
 76778,248
-76778,256
+76778,343
 76779,248
 76779,35
 76780,248
-76780,256
+76780,343
 76781,248
 76781,35
 76782,248
-76782,256
+76782,343
 76783,248
 76783,35
 76784,248
-76784,256
+76784,343
 76785,248
 76785,35
 76786,248
-76786,256
+76786,343
 76787,248
 76787,35
 76788,247
-76788,256
+76788,343
 76789,247
 76789,35
 76790,247
-76790,256
+76790,343
 76791,247
 76791,35
 76792,247
-76792,256
+76792,343
 76793,247
 76793,35
 76794,247
-76794,256
+76794,343
 76795,247
 76795,35
 76796,247
-76796,256
+76796,343
 76797,247
 76797,35
 76798,247
-76798,256
+76798,343
 76799,247
 76799,35
 76800,247
-76800,256
+76800,343
 76801,247
 76801,35
 76802,247
-76802,256
+76802,343
 76803,247
 76803,35
 76804,248
-76804,256
+76804,343
 76805,248
 76805,35
 76806,248
-76806,256
+76806,343
 76807,248
 76807,35
 76808,248
-76808,256
+76808,343
 76809,248
 76809,35
 76810,248
-76810,256
+76810,343
 76811,248
 76811,35
 76812,248
-76812,256
+76812,343
 76813,248
 76813,35
 76814,248
-76814,256
+76814,343
 76815,248
 76815,35
 76816,248
-76816,256
+76816,343
 76817,248
 76817,35
 76818,248
-76818,256
+76818,343
 76819,248
 76819,35
 76820,249
-76820,256
+76820,343
 76821,249
 76821,35
 76822,249
-76822,256
+76822,343
 76823,249
 76823,35
 76824,249
-76824,256
+76824,343
 76825,249
 76825,35
 76826,249
-76826,256
+76826,343
 76827,249
 76827,35
 76828,249
-76828,256
+76828,343
 76829,249
 76829,35
 76830,249
-76830,256
+76830,343
 76831,249
 76831,35
 76832,249
-76832,256
+76832,343
 76833,249
 76833,35
 76834,249
-76834,256
+76834,343
 76835,249
 76835,35
 76836,250
-76836,256
+76836,343
 76837,250
 76837,35
 76838,250
-76838,256
+76838,343
 76839,250
 76839,35
 76840,250
-76840,256
+76840,343
 76841,250
 76841,35
 76842,250
-76842,256
+76842,343
 76843,250
 76843,35
 76844,250
-76844,256
+76844,343
 76845,250
 76845,35
 76846,250
-76846,256
+76846,343
 76847,250
 76847,35
 76848,250
-76848,256
+76848,343
 76849,250
 76849,35
 76850,250
-76850,256
+76850,343
 76851,250
 76851,35
 76852,251
-76852,256
+76852,343
 76853,251
 76853,35
 76854,251
-76854,256
+76854,343
 76855,251
 76855,35
 76856,251
-76856,256
+76856,343
 76857,251
 76857,35
 76858,251
-76858,256
+76858,343
 76859,251
 76859,35
 76860,251
-76860,256
+76860,343
 76861,251
 76861,35
 76862,251
-76862,256
+76862,343
 76863,251
 76863,35
 76864,251
-76864,256
+76864,343
 76865,251
 76865,35
 76866,251
-76866,256
+76866,343
 76867,251
 76867,35
 76868,252
-76868,256
+76868,343
 76869,252
 76869,35
 76870,252
-76870,256
+76870,343
 76871,252
 76871,35
 76872,252
-76872,256
+76872,343
 76873,252
 76873,35
 76874,252
-76874,256
+76874,343
 76875,252
 76875,35
 76876,252
-76876,256
+76876,343
 76877,252
 76877,35
 76878,252
-76878,256
+76878,343
 76879,252
 76879,35
 76880,252
-76880,256
+76880,343
 76881,252
 76881,35
 76882,252
-76882,256
+76882,343
 76883,252
 76883,35
 76884,254
-76884,256
+76884,343
 76885,254
 76885,35
 76886,254
-76886,256
+76886,343
 76887,254
 76887,35
 76888,254
-76888,256
+76888,343
 76889,254
 76889,35
 76890,254
-76890,256
+76890,343
 76891,254
 76891,35
 76892,254
-76892,256
+76892,343
 76893,254
 76893,35
 76894,254
-76894,256
+76894,343
 76895,254
 76895,35
 76896,254
-76896,256
+76896,343
 76897,254
 76897,35
 76898,254
-76898,256
+76898,343
 76899,254
 76899,35
 76900,253
-76900,256
+76900,343
 76901,253
 76901,35
 76902,253
-76902,256
+76902,343
 76903,253
 76903,35
 76904,253
-76904,256
+76904,343
 76905,253
 76905,35
 76906,253
-76906,256
+76906,343
 76907,253
 76907,35
 76908,253
-76908,256
+76908,343
 76909,253
 76909,35
 76910,253
-76910,256
+76910,343
 76911,253
 76911,35
 76912,253
-76912,256
+76912,343
 76913,253
 76913,35
 76914,253
-76914,256
+76914,343
 76915,253
 76915,35
 76916,255
-76916,256
+76916,343
 76917,255
 76917,35
 76918,255
-76918,256
+76918,343
 76919,255
 76919,35
 76920,255
-76920,256
+76920,343
 76921,255
 76921,35
 76922,255
-76922,256
+76922,343
 76923,255
 76923,35
 76924,255
-76924,256
+76924,343
 76925,255
 76925,35
 76926,255
-76926,256
+76926,343
 76927,255
 76927,35
 76928,255
-76928,256
+76928,343
 76929,255
 76929,35
 76930,255
-76930,256
+76930,343
 76931,255
 76931,35
 76932,256
@@ -81880,3 +81880,25 @@ encounter_id,encounter_condition_value_id
 107842,342
 107843,337
 107843,342
+107844,344
+107845,345
+107846,346
+107847,347
+107848,348
+107849,349
+107850,344
+107851,345
+107852,346
+107853,347
+107854,348
+107855,349
+107856,350
+107857,350
+107858,351
+107859,350
+107860,350
+107861,351
+107862,350
+107863,352
+107864,350
+107865,352
\ 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 c8fcf93c7..733f72336 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -464,3 +464,12 @@ encounter_condition_value_id,local_language_id,name
 341,9,Start a max raid with a difficulty of 4 stars.
 342,9,Start a max raid with a difficulty of 5 stars.
 343,9,"Start max raid in a den with a weak, red pillar of light after checking Wild Area News."
+344,9,Interact with a Red Berry Tree
+345,9,Interact with a Blue Berry Tree
+346,9,Interact with a Purple Berry Tree
+347,9,Interact with a Green Berry Tree
+348,9,Interact with a Yellow Berry Tree
+349,9,Interact with a Pink Berry Tree
+350,9,Interact with a Shaking Trash Can (Daily)
+351,9,Interact with a Shaking Trash Can (Tuesday)
+352,9,Interact with a Shaking Trash Can (Thursday)
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index fa9d43d78..f881e8618 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -245,15 +245,15 @@ id,encounter_condition_id,identifier,is_default
 244,15,trade-weezing-galar,1
 245,15,trade-exeggutor,1
 246,15,trade-marowak,1
-247,25,weather-normal,1
-248,25,weather-overcast,0
-249,25,weather-raining,0
-250,25,weather-thunderstorm,0
-251,25,weather-snowing,0
-252,25,weather-snowstorm,0
-253,25,weather-sandstorm,0
-254,25,weather-intense-sun,0
-255,25,weather-fog,0
+247,28,weather-normal,1
+248,28,weather-overcast,0
+249,28,weather-raining,0
+250,28,weather-thunderstorm,0
+251,28,weather-snowing,0
+252,28,weather-snowstorm,0
+253,28,weather-sandstorm,0
+254,28,weather-intense-sun,0
+255,28,weather-fog,0
 256,9,story-progress-before-hall-of-fame,1
 257,26,johto-safari-blocks-inactive,1
 258,26,johto-safari-blocks-plains-min-2,0
@@ -342,3 +342,12 @@ id,encounter_condition_id,identifier,is_default
 341,28,max-den-rating-4-star,0
 342,28,max-den-rating-5-star,0
 343,27,max-den-rarity-special,0
+344,29,berry-tree-type-red,1
+345,29,berry-tree-type-blue,1
+346,29,berry-tree-type-purple,1
+347,29,berry-tree-type-green,1
+348,29,berry-tree-type-yellow,1
+349,29,berry-tree-type-pink,1
+350,30,trash-can-type-daily,1
+351,30,trash-can-type-tuesday,1
+352,30,trash-can-type-thursday,1
diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv
index ebaed4522..45d9a32eb 100644
--- a/data/v2/csv/encounter_conditions.csv
+++ b/data/v2/csv/encounter_conditions.csv
@@ -27,3 +27,5 @@ id,identifier
 26,johto-safari-blocks
 27,max-den-rarity
 28,max-den-rating
+29,berry-tree-type
+30,trash-can-type
diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv
index 546676719..a5470df94 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
@@ -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
@@ -98,9 +99,9 @@ encounter_method_id,local_language_id,name
 48,9,Receiving a Manaphy from Pokemon Ranger
 49,9,"Receiving a Pikachu, Electivire, or Magmar from Pokemon Battle Revolution"
 50,9,Receiving an egg from the Pokemon center in New York City that contains the special move Wish.
-51,9,"Snagging a Pokemon from a trainer in Pokemon Colosseum or Pokemon XD: Gale of Darkness."
+51,9,Snagging a Pokemon from a trainer in Pokemon Colosseum or Pokemon XD: Gale of Darkness.
 52,9,"Snagging a Pokemon from a trainer in Pokemon Colosseum or Pokemon XD: Gale of Darkness, after you have failed to capture them once."
-53,9,"Finding a Wild Pokemon at any of the three Pokespots in Pokemon XD: Gale of Darkness."
+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.
 56,9,Overworld spawn coming from underground or within a swamp.
@@ -109,3 +110,8 @@ encounter_method_id,local_language_id,name
 59,9,Get chased by territorial Pokémon when entering the water.
 60,9,Capture during a Dynamax Adventure.
 61,9,Catch a wild Dynamax or Gigantamas Pokémon in a Max Raid battle.
+62,9,Ambushed by a Wild Pokemon from a Trash Can
+63,9,Ambushed by a Wild Pokemon from a Rustling Bush
+64,9,Ambushed by a Wild Pokemon from the Ceiling of a Cave
+65,9,Ambushed by a Wild Pokemon from the Ground
+66,9,Ambushed by a Wild Pokemon from the Sky
diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv
index 38088a18b..ef575fab3 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,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
@@ -60,3 +60,8 @@ id,identifier,order
 59,chase-water,59
 60,dynamax-adventure,60
 61,max-raid,61
+62,trash-can-ambush,57
+63,rustling-bush-ambush,58
+64,ceiling-ambush,59
+65,ground-ambush,60
+66,sky-ambush,61
diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index b507b0a86..ff619693f 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -3474,3 +3474,30 @@ id,version_group_id,encounter_method_id,slot,rarity
 3473,20,61,3,25
 3474,20,61,4,10
 3475,20,61,5,1
+3476,15,35,1,100
+3477,15,62,1,80
+3478,15,62,2,20
+3479,15,62,1,75
+3480,15,62,2,5
+3481,15,62,3,5
+3482,15,62,4,5
+3483,15,62,5,5
+3484,15,62,6,5
+3485,15,62,1,100
+3486,15,63,1,80
+3487,15,63,2,20
+3488,15,63,1,90
+3489,15,63,2,10
+3490,15,64,1,45
+3491,15,64,2,33
+3492,15,64,3,22
+3493,15,64,1,80
+3494,15,64,2,20
+3495,15,64,1,85
+3496,15,64,2,15
+3497,15,65,1,40
+3498,15,65,2,40
+3499,15,65,3,20
+3500,15,66,1,77
+3501,15,66,2,18
+3502,15,66,3,5
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 891debed7..6c02f1378 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -101975,3 +101975,101 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 107841,34,1482,3456,866,55,60
 107842,34,1482,3457,478,55,60
 107843,34,1482,3458,471,55,60
+107844,23,1483,3476,165,14,15
+107845,23,1483,3476,313,14,15
+107846,23,1483,3476,314,14,15
+107847,23,1483,3476,412,14,15
+107848,23,1483,3476,415,14,15
+107849,23,1483,3476,665,14,15
+107850,24,1483,3476,165,14,15
+107851,24,1483,3476,313,14,15
+107852,24,1483,3476,314,14,15
+107853,24,1483,3476,412,14,15
+107854,24,1483,3476,415,14,15
+107855,24,1483,3476,665,14,15
+107856,23,759,3477,568,35,35
+107857,23,759,3478,569,36,38
+107858,23,759,3479,479,38,38
+107859,24,759,3477,568,35,35
+107860,24,759,3478,569,36,38
+107861,24,759,3479,479,38,38
+107862,23,747,3480,569,46,50
+107863,23,747,3480,354,46,50
+107864,24,747,3480,569,46,50
+107865,24,747,3480,354,46,50
+107866,23,717,3481,543,10,12
+107867,23,717,3482,531,10,12
+107868,24,717,3481,543,10,12
+107869,24,717,3482,531,10,12
+107870,23,729,3483,632,44,46
+107871,23,729,3484,631,45,45
+107872,24,729,3483,632,44,46
+107873,24,729,3484,631,45,45
+107874,23,748,3485,75,57,57
+107875,23,748,3486,168,58,59
+107876,23,748,3487,714,57,59
+107877,23,749,3485,75,57,57
+107878,23,749,3486,168,58,59
+107879,23,749,3487,714,57,59
+107880,23,750,3485,75,57,57
+107881,23,750,3486,168,58,59
+107882,23,750,3487,714,57,59
+107883,23,752,3485,75,57,57
+107884,23,752,3486,168,58,59
+107885,23,752,3487,714,57,59
+107886,24,748,3485,75,57,57
+107887,24,748,3486,168,58,59
+107888,24,748,3487,714,57,59
+107889,24,749,3485,75,57,57
+107890,24,749,3486,168,58,59
+107891,24,749,3487,714,57,59
+107892,24,750,3485,75,57,57
+107893,24,750,3486,168,58,59
+107894,24,750,3487,714,57,59
+107895,24,752,3485,75,57,57
+107896,24,752,3486,168,58,59
+107897,24,752,3487,714,57,59
+107898,23,754,3488,168,44,46
+107899,23,754,3489,714,44,46
+107900,23,755,3488,168,44,46
+107901,23,755,3489,714,44,46
+107902,23,756,3488,168,44,46
+107903,23,756,3489,714,44,46
+107904,23,757,3488,168,44,46
+107905,23,757,3489,714,44,46
+107906,23,758,3488,168,44,46
+107907,23,758,3489,714,44,46
+107908,24,754,3488,168,44,46
+107909,24,754,3489,714,44,46
+107910,24,755,3488,168,44,46
+107911,24,755,3489,714,44,46
+107912,24,756,3488,168,44,46
+107913,24,756,3489,714,44,46
+107914,24,757,3488,168,44,46
+107915,24,757,3489,714,44,46
+107916,24,758,3488,168,44,46
+107917,24,758,3489,714,44,46
+107918,23,736,3490,527,15,17
+107919,23,736,3491,597,15,17
+107920,23,737,3490,527,15,17
+107921,23,737,3491,597,15,17
+107922,24,736,3490,527,15,17
+107923,24,736,3491,597,15,17
+107924,24,737,3490,527,15,17
+107925,24,737,3491,597,15,17
+107926,23,738,3488,527,21,23
+107927,23,738,3489,597,21,23
+107928,24,738,3488,527,21,23
+107929,24,738,3489,597,21,23
+107930,23,724,3490,51,26,28
+107931,23,724,3491,328,26,28
+107932,23,724,3492,443,26,28
+107933,24,724,3490,51,26,28
+107934,24,724,3491,328,26,28
+107935,24,724,3492,443,26,28
+107936,23,751,3493,22,57,59
+107937,23,751,3494,227,57,59
+107938,23,751,3495,635,59,59
+107939,24,751,3493,22,57,59
+107940,24,751,3494,227,57,59
+107941,24,751,3495,635,59,59
\ No newline at end of file
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index d8a67f0cc..16147f65c 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1355,3 +1355,4 @@ id,location_id,game_index,identifier
 1480,906,0,max-den-e
 1481,906,0,max-den-f
 1482,906,0,max-den-g
+1483,1121,0,
\ No newline at end of file
diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv
index b4239fbb1..4454f0fa7 100644
--- a/data/v2/csv/location_names.csv
+++ b/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,
@@ -5250,3 +5250,4 @@ location_id,local_language_id,name,subtitle
 1118,9,Roaming the Isle of Armor,
 1119,9,Roaming the Crown Tundra,
 1120,9,All Max Dens in the Galar Wild Area,
+1121,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 533be5816..969769056 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
@@ -1102,3 +1102,4 @@ id,region_id,identifier
 1118,8,roaming-isle-of-armor
 1119,8,roaming-crown-tundra
 1120,8,galar-wild-area-max-dens
+1121,6,kalos-berry-fields
\ No newline at end of file