From 7f2ef50fe26f4a89ffb348beb56e3562384ed3ec Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 13 Jun 2026 10:58:42 -0700
Subject: [PATCH 1/5] Add Johto safari zone encounters

---
 data/v2/csv/encounter_condition_prose.csv     |    1 +
 data/v2/csv/encounter_condition_value_map.csv | 1926 +++++++++++++++++
 .../csv/encounter_condition_value_prose.csv   |    2 +
 data/v2/csv/encounter_condition_values.csv    |    2 +
 data/v2/csv/encounter_conditions.csv          |    1 +
 data/v2/csv/encounters.csv                    |  596 +++++
 6 files changed, 2528 insertions(+)

diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv
index 01f4edaf8..05d226222 100644
--- a/data/v2/csv/encounter_condition_prose.csv
+++ b/data/v2/csv/encounter_condition_prose.csv
@@ -40,3 +40,4 @@ encounter_condition_id,local_language_id,name
 19,9,Honey Tree Group
 20,9,Headbutt Tree Type
 21,9,Listen to Mr. Backlot
+23,9,Johto Safari Zone Block Replacement
diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index 383f04741..528377223 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -22316,3 +22316,1929 @@ encounter_id,encounter_condition_value_id
 75209,203
 75210,37
 75210,203
+59318,206
+59319,206
+59320,206
+59321,206
+59322,206
+59323,206
+59324,206
+59325,206
+59326,206
+59327,206
+59328,206
+59329,206
+59330,206
+59331,206
+59332,206
+59333,206
+59334,206
+59335,206
+59336,206
+59337,206
+59338,206
+59339,206
+59340,206
+59341,206
+59342,206
+59343,206
+59344,206
+59345,206
+59346,206
+59347,206
+59348,206
+59349,206
+59350,206
+59351,206
+59352,206
+59353,206
+59354,206
+59355,206
+59356,206
+59357,206
+59358,206
+59359,206
+59360,206
+59361,206
+59362,206
+59363,206
+59364,206
+59365,206
+59366,206
+59367,206
+59368,206
+59369,206
+59370,206
+59371,206
+59372,206
+59373,206
+59374,206
+59375,206
+59376,206
+59377,206
+59378,206
+59379,206
+59380,206
+59381,206
+59382,206
+59383,206
+59384,206
+59385,206
+59386,206
+59387,206
+59388,206
+59389,206
+59390,206
+59391,206
+59392,206
+59393,206
+59394,206
+59395,206
+59396,206
+59397,206
+59398,206
+59399,206
+59400,206
+59401,206
+59402,206
+59403,206
+59404,206
+59405,206
+59406,206
+59407,206
+59408,206
+59409,206
+59410,206
+59411,206
+59412,206
+59413,206
+59414,206
+59415,206
+59416,206
+59417,206
+59418,206
+59419,206
+59420,206
+59421,206
+59422,206
+59423,206
+59424,206
+59425,206
+59426,206
+59427,206
+59428,206
+59429,206
+59430,206
+59431,206
+59432,206
+59433,206
+59434,206
+59435,206
+59436,206
+59437,206
+59438,206
+59439,206
+59440,206
+59441,206
+59442,206
+59443,206
+59444,206
+59445,206
+59446,206
+59447,206
+59448,206
+59449,206
+59450,206
+59451,206
+59452,206
+59453,206
+59454,206
+59455,206
+59456,206
+59457,206
+59458,206
+59459,206
+59460,206
+59461,206
+59462,206
+59463,206
+59464,206
+59465,206
+59466,206
+59467,206
+59468,206
+59469,206
+59470,206
+59471,206
+59472,206
+59473,206
+59474,206
+59475,206
+59476,206
+59477,206
+59478,206
+59479,206
+59480,206
+59481,206
+59482,206
+59483,206
+59484,206
+59485,206
+59486,206
+59487,206
+59488,206
+59489,206
+59490,206
+59491,206
+59492,206
+59493,206
+59494,206
+59495,206
+59496,206
+59497,206
+59498,206
+59499,206
+59500,206
+59501,206
+59502,206
+59503,206
+59504,206
+59505,206
+59506,206
+59507,206
+59508,206
+59509,206
+59510,206
+59511,206
+59512,206
+59513,206
+59514,206
+59515,206
+59516,206
+59517,206
+59518,206
+59519,206
+59520,206
+59521,206
+59522,206
+59523,206
+59524,206
+59525,206
+59526,206
+59527,206
+59528,206
+59529,206
+59530,206
+59531,206
+59532,206
+59533,206
+59534,206
+59535,206
+59536,206
+59537,206
+59538,206
+59539,206
+59540,206
+59541,206
+59542,206
+59543,206
+59544,206
+59545,206
+59546,206
+59547,206
+59548,206
+59549,206
+59550,206
+59551,206
+59552,206
+59553,206
+59554,206
+59555,206
+59556,206
+59557,206
+59558,206
+59559,206
+59560,206
+59561,206
+59562,206
+59563,206
+59564,206
+59565,206
+59566,206
+59567,206
+59568,206
+59569,206
+59570,206
+59571,206
+59572,206
+59573,206
+59574,206
+59575,206
+59576,206
+59577,206
+59578,206
+59579,206
+59580,206
+59581,206
+59582,206
+59583,206
+59584,206
+59585,206
+59586,206
+59587,206
+59588,206
+59589,206
+59590,206
+59591,206
+59592,206
+59593,206
+59594,206
+59595,206
+59596,206
+59597,206
+59598,206
+59599,206
+59600,206
+59601,206
+59602,206
+59603,206
+59604,206
+59605,206
+59606,206
+59607,206
+59608,206
+59609,206
+59610,206
+59611,206
+59612,206
+59613,206
+59614,206
+59615,206
+59616,206
+59617,206
+59618,206
+59619,206
+59620,206
+59621,206
+59622,206
+59623,206
+59624,206
+59625,206
+59626,206
+59627,206
+59628,206
+59629,206
+59630,206
+59631,206
+59632,206
+59633,206
+59634,206
+59635,206
+59636,206
+59637,206
+59638,206
+59639,206
+59640,206
+59641,206
+59642,206
+59643,206
+59644,206
+59645,206
+59646,206
+59647,206
+59648,206
+59649,206
+59650,206
+59651,206
+59652,206
+59653,206
+59654,206
+59655,206
+59656,206
+59657,206
+59658,206
+59659,206
+59660,206
+59661,206
+59662,206
+59663,206
+59664,206
+59665,206
+59666,206
+59667,206
+59668,206
+59669,206
+59670,206
+59671,206
+59672,206
+59673,206
+59674,206
+59675,206
+59676,206
+59677,206
+59678,206
+59679,206
+59680,206
+59681,206
+59682,206
+59683,206
+59684,206
+59685,206
+59686,206
+59687,206
+59688,206
+59689,206
+59690,206
+59691,206
+59692,206
+59693,206
+59694,206
+59695,206
+59696,206
+59697,206
+59698,206
+59699,206
+59700,206
+59701,206
+59702,206
+59703,206
+59704,206
+59705,206
+59706,206
+59707,206
+59708,206
+59709,206
+59710,206
+59711,206
+59712,206
+59713,206
+59714,206
+59715,206
+59716,206
+59717,206
+59718,206
+59719,206
+59720,206
+59721,206
+59722,206
+59723,206
+59724,206
+59725,206
+59726,206
+59727,206
+59728,206
+59729,206
+59730,206
+59731,206
+59732,206
+59733,206
+59734,206
+59735,206
+59736,206
+59737,206
+59738,206
+59739,206
+59740,206
+59741,206
+59742,206
+59743,206
+59744,206
+59745,206
+59746,206
+59747,206
+59748,206
+59749,206
+59750,206
+59751,206
+59752,206
+59753,206
+59754,206
+59755,206
+59756,206
+59757,206
+59758,206
+59759,206
+59760,206
+59761,206
+59762,206
+59763,206
+59764,206
+59765,206
+59766,206
+59767,206
+59768,206
+59769,206
+59770,206
+59771,206
+59772,206
+59773,206
+59774,206
+59775,206
+59776,206
+59777,206
+59778,206
+59779,206
+59780,206
+59781,206
+59782,206
+59783,206
+59784,206
+59785,206
+59786,206
+59787,206
+59788,206
+59789,206
+59790,206
+59791,206
+59792,206
+59793,206
+59794,206
+59795,206
+59796,206
+59797,206
+59798,206
+59799,206
+59800,206
+59801,206
+59802,206
+59803,206
+59804,206
+59805,206
+59806,206
+59807,206
+59808,206
+59809,206
+59810,206
+59811,206
+59812,206
+59813,206
+59814,206
+59815,206
+59816,206
+59817,206
+59818,206
+59819,206
+59820,206
+59821,206
+59822,206
+59823,206
+59824,206
+59825,206
+59826,206
+59827,206
+59828,206
+59829,206
+59830,206
+59831,206
+59832,206
+59833,206
+59834,206
+59835,206
+59836,206
+59837,206
+59838,206
+59839,206
+59840,206
+59841,206
+59842,206
+59843,206
+59844,206
+59845,206
+59846,206
+59847,206
+59848,206
+59849,206
+59850,206
+59851,206
+59852,206
+59853,206
+59854,206
+59855,206
+59856,206
+59857,206
+59858,206
+59859,206
+59860,206
+59861,206
+59862,206
+59863,206
+59864,206
+59865,206
+59866,206
+59867,206
+59868,206
+59869,206
+59870,206
+59871,206
+59872,206
+59873,206
+59874,206
+59875,206
+59876,206
+59877,206
+59878,206
+59879,206
+59880,206
+59881,206
+59882,206
+59883,206
+59884,206
+59885,206
+59886,206
+59887,206
+59888,206
+59889,206
+59890,206
+59891,206
+59892,206
+59893,206
+59894,206
+59895,206
+59896,206
+59897,206
+59898,206
+59899,206
+59900,206
+59901,206
+59902,206
+59903,206
+59904,206
+59905,206
+59906,206
+59907,206
+59908,206
+59909,206
+59910,206
+59911,206
+59912,206
+59913,206
+59914,206
+59915,206
+59916,206
+59917,206
+59918,206
+59919,206
+59920,206
+59921,206
+59922,206
+59923,206
+59924,206
+59925,206
+59926,206
+59927,206
+59928,206
+59929,206
+59930,206
+59931,206
+59932,206
+59933,206
+59934,206
+59935,206
+59936,206
+59937,206
+59938,206
+59939,206
+59940,206
+59941,206
+59942,206
+59943,206
+59944,206
+59945,206
+59946,206
+59947,206
+59948,206
+59949,206
+59950,206
+59951,206
+59952,206
+59953,206
+59954,206
+59955,206
+59956,206
+59957,206
+59958,206
+59959,206
+59960,206
+59961,206
+59962,206
+59963,206
+59964,206
+59965,206
+59966,206
+59967,206
+59968,206
+59969,206
+59970,206
+59971,206
+59972,206
+59973,206
+59974,206
+59975,206
+59976,206
+59977,206
+59978,206
+59979,206
+59980,206
+59981,206
+59982,206
+59983,206
+59984,206
+59985,206
+59986,206
+59987,206
+59988,206
+59989,206
+59990,206
+59991,206
+59992,206
+59993,206
+59994,206
+59995,206
+59996,206
+59997,206
+59998,206
+59999,206
+60000,206
+60001,206
+60002,206
+60003,206
+60004,206
+60005,206
+60006,206
+60007,206
+60008,206
+60009,206
+60010,206
+60011,206
+60012,206
+60013,206
+60014,206
+60015,206
+60016,206
+60017,206
+60018,206
+60019,206
+60020,206
+60021,206
+60022,206
+60023,206
+60024,206
+60025,206
+60026,206
+60027,206
+60028,206
+60029,206
+60030,206
+60031,206
+60032,206
+60033,206
+60034,206
+60035,206
+60036,206
+60037,206
+60038,206
+60039,206
+60040,206
+60041,206
+60042,206
+60043,206
+60044,206
+60045,206
+60046,206
+60047,206
+60048,206
+60049,206
+60050,206
+60051,206
+60052,206
+60053,206
+60054,206
+60055,206
+60056,206
+60057,206
+60058,206
+60059,206
+60060,206
+60061,206
+60062,206
+60063,206
+60064,206
+60065,206
+60066,206
+60067,206
+60068,206
+60069,206
+60070,206
+60071,206
+60072,206
+60073,206
+60074,206
+60075,206
+60076,206
+60077,206
+60078,206
+60079,206
+60080,206
+60081,206
+60082,206
+60083,206
+60084,206
+60085,206
+60086,206
+60087,206
+60088,206
+60089,206
+60090,206
+60091,206
+60092,206
+60093,206
+60094,206
+60095,206
+60096,206
+60097,206
+60098,206
+60099,206
+60100,206
+60101,206
+60102,206
+60103,206
+60104,206
+60105,206
+60106,206
+60107,206
+60108,206
+60109,206
+60110,206
+60111,206
+60112,206
+60113,206
+60114,206
+60115,206
+60116,206
+60117,206
+60118,206
+60119,206
+60120,206
+60121,206
+60122,206
+60123,206
+60124,206
+60125,206
+60126,206
+60127,206
+60128,206
+60129,206
+60130,206
+60131,206
+60132,206
+60133,206
+60134,206
+60135,206
+60136,206
+60137,206
+60138,206
+60139,206
+60140,206
+60141,206
+60142,206
+60143,206
+60144,206
+60145,206
+60146,206
+60147,206
+60148,206
+60149,206
+60150,206
+60151,206
+60152,206
+60153,206
+60154,206
+60155,206
+60156,206
+60157,206
+60158,206
+60159,206
+60160,206
+60161,206
+60162,206
+60163,206
+60164,206
+60165,206
+60166,206
+60167,206
+60168,206
+60169,206
+60170,206
+60171,206
+60172,206
+60173,206
+60174,206
+60175,206
+60176,206
+60177,206
+60178,206
+60179,206
+60180,206
+60181,206
+60182,206
+60183,206
+60184,206
+60185,206
+60186,206
+60187,206
+60188,206
+60189,206
+60190,206
+60191,206
+60192,206
+60193,206
+60194,206
+60195,206
+60196,206
+60197,206
+60198,206
+60199,206
+60200,206
+60201,206
+60202,206
+60203,206
+60204,206
+60205,206
+60206,206
+60207,206
+60208,206
+60209,206
+60210,206
+60211,206
+60212,206
+60213,206
+60214,206
+60215,206
+60216,206
+60217,206
+60218,206
+60219,206
+60220,206
+60221,206
+60222,206
+60223,206
+60224,206
+60225,206
+60226,206
+60227,206
+60228,206
+60229,206
+60230,206
+60231,206
+60232,206
+60233,206
+60234,206
+60235,206
+60236,206
+60237,206
+60238,206
+60239,206
+60240,206
+60241,206
+60242,206
+60243,206
+60244,206
+60245,206
+60246,206
+60247,206
+60248,206
+60249,206
+60250,206
+60251,206
+60252,206
+60253,206
+60254,206
+60255,206
+60256,206
+60257,206
+60258,206
+60259,206
+60260,206
+60261,206
+60262,206
+60263,206
+60264,206
+60265,206
+60266,206
+60267,206
+60268,206
+60269,206
+60270,206
+60271,206
+60272,206
+60273,206
+60274,206
+60275,206
+60276,206
+60277,206
+60278,206
+60279,206
+60280,206
+60281,206
+60282,206
+60283,206
+60284,206
+60285,206
+60286,206
+60287,206
+60288,206
+60289,206
+60290,206
+60291,206
+60292,206
+60293,206
+60294,206
+60295,206
+60296,206
+60297,206
+60298,206
+60299,206
+60300,206
+60301,206
+60302,206
+60303,206
+60304,206
+60305,206
+60306,206
+60307,206
+60308,206
+60309,206
+60310,206
+60311,206
+60312,206
+60313,206
+60314,206
+60315,206
+60316,206
+60317,206
+60318,206
+60319,206
+60320,206
+60321,206
+60322,206
+60323,206
+60324,206
+60325,206
+60326,206
+60327,206
+60328,206
+60329,206
+60330,206
+60331,206
+60332,206
+60333,206
+60334,206
+60335,206
+60336,206
+60337,206
+60338,206
+60339,206
+60340,206
+60341,206
+60342,206
+60343,206
+60344,206
+60345,206
+60346,206
+60347,206
+60348,206
+60349,206
+60350,206
+60351,206
+60352,206
+60353,206
+60354,206
+60355,206
+60356,206
+60357,206
+60358,206
+60359,206
+60360,206
+60361,206
+60362,206
+60363,206
+60364,206
+60365,206
+60366,206
+60367,206
+60368,206
+60369,206
+60370,206
+60371,206
+60372,206
+60373,206
+60374,206
+60375,206
+60376,206
+60377,206
+60378,206
+60379,206
+60380,206
+60381,206
+60382,206
+60383,206
+60384,206
+60385,206
+60386,206
+60387,206
+60388,206
+60389,206
+60390,206
+60391,206
+60392,206
+60393,206
+60394,206
+60395,206
+60396,206
+60397,206
+60398,206
+60399,206
+60400,206
+60401,206
+60402,206
+60403,206
+60404,206
+60405,206
+60406,206
+60407,206
+60408,206
+60409,206
+60410,206
+60411,206
+60412,206
+60413,206
+60414,206
+60415,206
+60416,206
+60417,206
+60418,206
+60419,206
+60420,206
+60421,206
+60422,206
+60423,206
+60424,206
+60425,206
+60426,206
+60427,206
+60428,206
+60429,206
+60430,206
+60431,206
+60432,206
+60433,206
+60434,206
+60435,206
+60436,206
+60437,206
+75291,207
+75291,3
+75292,207
+75292,3
+75293,207
+75293,4
+75294,207
+75294,4
+75295,207
+75295,5
+75296,207
+75296,5
+75297,207
+75297,3
+75298,207
+75298,3
+75299,207
+75299,4
+75300,207
+75300,4
+75301,207
+75301,5
+75302,207
+75302,5
+75303,207
+75304,207
+75305,207
+75305,3
+75306,207
+75306,3
+75307,207
+75307,4
+75308,207
+75308,4
+75309,207
+75309,5
+75310,207
+75310,5
+75311,207
+75312,207
+75313,207
+75314,207
+75315,207
+75315,3
+75316,207
+75316,3
+75317,207
+75317,4
+75318,207
+75318,4
+75319,207
+75319,5
+75320,207
+75320,5
+75321,207
+75321,3
+75322,207
+75322,3
+75323,207
+75323,4
+75324,207
+75324,4
+75325,207
+75325,5
+75326,207
+75326,5
+75327,207
+75328,207
+75329,207
+75330,207
+75331,207
+75332,207
+75333,207
+75334,207
+75335,207
+75336,207
+75337,207
+75338,207
+75339,207
+75340,207
+75341,207
+75342,207
+75343,207
+75344,207
+75345,207
+75346,207
+75347,207
+75348,207
+75349,207
+75350,207
+75351,207
+75352,207
+75353,207
+75354,207
+75355,207
+75356,207
+75357,207
+75358,207
+75359,207
+75359,3
+75360,207
+75360,3
+75361,207
+75361,4
+75362,207
+75362,4
+75363,207
+75363,5
+75364,207
+75364,5
+75365,207
+75365,3
+75366,207
+75366,3
+75367,207
+75367,4
+75368,207
+75368,4
+75369,207
+75369,5
+75370,207
+75370,5
+75371,207
+75372,207
+75373,207
+75373,3
+75374,207
+75374,3
+75375,207
+75375,4
+75376,207
+75376,4
+75377,207
+75377,5
+75378,207
+75378,5
+75379,207
+75380,207
+75381,207
+75382,207
+75383,207
+75384,207
+75385,207
+75386,207
+75387,207
+75388,207
+75389,207
+75390,207
+75391,207
+75392,207
+75393,207
+75394,207
+75395,207
+75396,207
+75397,207
+75398,207
+75399,207
+75400,207
+75401,207
+75402,207
+75403,207
+75403,3
+75404,207
+75404,3
+75405,207
+75405,4
+75406,207
+75406,4
+75407,207
+75407,5
+75408,207
+75408,5
+75409,207
+75410,207
+75411,207
+75412,207
+75413,207
+75414,207
+75415,207
+75416,207
+75417,207
+75418,207
+75419,207
+75419,3
+75420,207
+75420,3
+75421,207
+75421,4
+75422,207
+75422,4
+75423,207
+75423,5
+75424,207
+75424,5
+75425,207
+75426,207
+75427,207
+75428,207
+75429,207
+75430,207
+75431,207
+75432,207
+75433,207
+75434,207
+75435,207
+75436,207
+75437,207
+75438,207
+75439,207
+75440,207
+75441,207
+75442,207
+75443,207
+75444,207
+75445,207
+75446,207
+75447,207
+75447,3
+75448,207
+75448,3
+75449,207
+75449,4
+75450,207
+75450,4
+75451,207
+75451,5
+75452,207
+75452,5
+75453,207
+75454,207
+75455,207
+75456,207
+75457,207
+75458,207
+75459,207
+75459,3
+75460,207
+75460,3
+75461,207
+75461,4
+75462,207
+75462,4
+75463,207
+75463,5
+75464,207
+75464,5
+75465,207
+75466,207
+75467,207
+75467,3
+75468,207
+75468,3
+75469,207
+75469,4
+75470,207
+75470,4
+75471,207
+75471,5
+75472,207
+75472,5
+75473,207
+75474,207
+75475,207
+75475,3
+75476,207
+75476,3
+75477,207
+75477,4
+75478,207
+75478,4
+75479,207
+75479,5
+75480,207
+75480,5
+75481,207
+75482,207
+75483,207
+75484,207
+75485,207
+75486,207
+75487,207
+75488,207
+75489,207
+75490,207
+75491,207
+75492,207
+75493,207
+75494,207
+75495,207
+75496,207
+75497,207
+75498,207
+75499,207
+75500,207
+75501,207
+75502,207
+75503,207
+75504,207
+75505,207
+75506,207
+75507,207
+75508,207
+75509,207
+75510,207
+75511,207
+75512,207
+75513,207
+75514,207
+75515,207
+75515,3
+75516,207
+75516,3
+75517,207
+75517,4
+75518,207
+75518,4
+75519,207
+75519,5
+75520,207
+75520,5
+75521,207
+75522,207
+75523,207
+75524,207
+75525,207
+75526,207
+75527,207
+75528,207
+75529,207
+75530,207
+75531,207
+75532,207
+75533,207
+75534,207
+75535,207
+75535,3
+75536,207
+75536,3
+75537,207
+75537,4
+75538,207
+75538,4
+75539,207
+75539,5
+75540,207
+75540,5
+75541,207
+75541,3
+75542,207
+75542,3
+75543,207
+75543,4
+75544,207
+75544,4
+75545,207
+75545,5
+75546,207
+75546,5
+75547,207
+75547,3
+75548,207
+75548,3
+75549,207
+75549,4
+75550,207
+75550,4
+75551,207
+75551,5
+75552,207
+75552,5
+75553,207
+75554,207
+75555,207
+75556,207
+75557,207
+75558,207
+75559,207
+75560,207
+75561,207
+75562,207
+75563,207
+75564,207
+75565,207
+75566,207
+75567,207
+75568,207
+75569,207
+75570,207
+75571,207
+75571,3
+75572,207
+75572,3
+75573,207
+75573,4
+75574,207
+75574,4
+75575,207
+75575,5
+75576,207
+75576,5
+75577,207
+75578,207
+75579,207
+75580,207
+75581,207
+75582,207
+75583,207
+75584,207
+75585,207
+75585,3
+75586,207
+75586,3
+75587,207
+75587,4
+75588,207
+75588,4
+75589,207
+75589,5
+75590,207
+75590,5
+75591,207
+75591,3
+75592,207
+75592,3
+75593,207
+75593,4
+75594,207
+75594,4
+75595,207
+75595,5
+75596,207
+75596,5
+75597,207
+75598,207
+75599,207
+75600,207
+75601,207
+75602,207
+75603,207
+75604,207
+75605,207
+75606,207
+75607,207
+75608,207
+75609,207
+75609,3
+75610,207
+75610,3
+75611,207
+75611,4
+75612,207
+75612,4
+75613,207
+75613,5
+75614,207
+75614,5
+75615,207
+75616,207
+75617,207
+75617,3
+75618,207
+75618,3
+75619,207
+75619,4
+75620,207
+75620,4
+75621,207
+75621,5
+75622,207
+75622,5
+75623,207
+75624,207
+75625,207
+75626,207
+75627,207
+75628,207
+75629,207
+75630,207
+75631,207
+75632,207
+75633,207
+75634,207
+75635,207
+75636,207
+75637,207
+75638,207
+75639,207
+75640,207
+75641,207
+75642,207
+75643,207
+75644,207
+75645,207
+75646,207
+75647,207
+75648,207
+75649,207
+75650,207
+75651,207
+75652,207
+75653,207
+75654,207
+75655,207
+75655,3
+75656,207
+75656,3
+75657,207
+75657,4
+75658,207
+75658,4
+75659,207
+75659,5
+75660,207
+75660,5
+75661,207
+75662,207
+75663,207
+75663,3
+75664,207
+75664,3
+75665,207
+75665,4
+75666,207
+75666,4
+75667,207
+75667,5
+75668,207
+75668,5
+75669,207
+75670,207
+75671,207
+75672,207
+75673,207
+75673,3
+75674,207
+75674,3
+75675,207
+75675,4
+75676,207
+75676,4
+75677,207
+75677,5
+75678,207
+75678,5
+75679,207
+75680,207
+75681,207
+75682,207
+75683,207
+75684,207
+75685,207
+75686,207
+75687,207
+75688,207
+75689,207
+75690,207
+75691,207
+75692,207
+75693,207
+75694,207
+75695,207
+75696,207
+75697,207
+75698,207
+75699,207
+75700,207
+75701,207
+75702,207
+75703,207
+75703,3
+75704,207
+75704,3
+75705,207
+75705,4
+75706,207
+75706,4
+75707,207
+75707,5
+75708,207
+75708,5
+75709,207
+75710,207
+75711,207
+75712,207
+75713,207
+75714,207
+75715,207
+75716,207
+75717,207
+75718,207
+75719,207
+75719,3
+75720,207
+75720,3
+75721,207
+75721,4
+75722,207
+75722,4
+75723,207
+75723,5
+75724,207
+75724,5
+75725,207
+75726,207
+75727,207
+75728,207
+75729,207
+75730,207
+75731,207
+75732,207
+75733,207
+75734,207
+75735,207
+75736,207
+75737,207
+75738,207
+75739,207
+75740,207
+75741,207
+75742,207
+75743,207
+75744,207
+75745,207
+75746,207
+75747,207
+75748,207
+75749,207
+75750,207
+75751,207
+75752,207
+75753,207
+75754,207
+75755,207
+75756,207
+75757,207
+75757,3
+75758,207
+75758,3
+75759,207
+75759,4
+75760,207
+75760,4
+75761,207
+75761,5
+75762,207
+75762,5
+75763,207
+75763,3
+75764,207
+75764,3
+75765,207
+75765,4
+75766,207
+75766,4
+75767,207
+75767,5
+75768,207
+75768,5
+75769,207
+75770,207
+75771,207
+75772,207
+75773,207
+75774,207
+75775,207
+75776,207
+75777,207
+75778,207
+75779,207
+75780,207
+75781,207
+75782,207
+75783,207
+75784,207
+75785,207
+75786,207
+75787,207
+75788,207
+75789,207
+75790,207
+75791,207
+75792,207
+75793,207
+75794,207
+75795,207
+75796,207
+75797,207
+75797,3
+75798,207
+75798,3
+75799,207
+75799,4
+75800,207
+75800,4
+75801,207
+75801,5
+75802,207
+75802,5
+75803,207
+75803,3
+75804,207
+75804,3
+75805,207
+75805,4
+75806,207
+75806,4
+75807,207
+75807,5
+75808,207
+75808,5
+75809,207
+75810,207
+75811,207
+75812,207
+75813,207
+75814,207
+75815,207
+75816,207
+75817,207
+75818,207
+75819,207
+75820,207
+75821,207
+75822,207
+75823,207
+75824,207
+75825,207
+75826,207
+75827,207
+75828,207
+75829,207
+75830,207
+75831,207
+75832,207
+75833,207
+75834,207
+75835,207
+75836,207
+75837,207
+75838,207
+75839,207
+75840,207
+75841,207
+75842,207
+75843,207
+75844,207
+75845,207
+75845,3
+75846,207
+75846,3
+75847,207
+75847,4
+75848,207
+75848,4
+75849,207
+75849,5
+75850,207
+75850,5
+75851,207
+75851,3
+75852,207
+75852,3
+75853,207
+75853,4
+75854,207
+75854,4
+75855,207
+75855,5
+75856,207
+75856,5
+75857,207
+75858,207
+75859,207
+75859,3
+75860,207
+75860,3
+75861,207
+75861,4
+75862,207
+75862,4
+75863,207
+75863,5
+75864,207
+75864,5
+75865,207
+75866,207
+75867,207
+75868,207
+75869,207
+75870,207
+75871,207
+75872,207
+75873,207
+75874,207
+75875,207
+75876,207
+75877,207
+75878,207
+75879,207
+75880,207
+75881,207
+75882,207
+75883,207
+75884,207
+75885,207
+75886,207
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index 2839362a3..6ec60be08 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -324,3 +324,5 @@ encounter_condition_value_id,local_language_id,name
 201,9,Give Hippowdon in a Trade
 202,9,Mr. Backlot hasn't mentioned any Pokemon
 203,9,Mr. Backlot has mentioned seeing this Pokemon in the garden
+206,9,Not displaced by block-based encounter
+207,9,Displaced by block-based encounter
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index 89a038add..78149618d 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -202,3 +202,5 @@ id,encounter_condition_id,identifier,is_default
 201,15,trade-hippowdon,1
 202,21,backlot-not-mentioned,1
 203,21,backlot-mentioned,0
+206,23,johto-safari-not-displaced,1
+207,23,johto-safari-displaced,0
diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv
index 1ba300d67..170edf7df 100644
--- a/data/v2/csv/encounter_conditions.csv
+++ b/data/v2/csv/encounter_conditions.csv
@@ -20,3 +20,4 @@ id,identifier
 19,honey-tree-group
 20,headbutt-tree
 21,backlot
+23,johto-safari-block-replacement
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 5cdcd997a..110bdb419 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -69346,3 +69346,599 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 75208,14,118,130,183,22,22
 75209,14,118,130,113,22,22
 75210,14,118,130,298,22,22
+75291,15,815,647,203,40,40
+75292,16,815,647,203,40,40
+75293,15,815,647,203,40,40
+75294,16,815,647,203,40,40
+75295,15,815,647,234,40,40
+75296,16,815,647,234,40,40
+75297,15,815,648,403,43,43
+75298,16,815,648,403,43,43
+75299,15,815,648,403,43,43
+75300,16,815,648,403,43,43
+75301,15,815,648,403,44,44
+75302,16,815,648,403,44,44
+75303,15,815,649,310,45,45
+75304,16,815,649,310,45,45
+75305,15,815,650,235,41,41
+75306,16,815,650,235,41,41
+75307,15,815,650,235,41,41
+75308,16,815,650,235,41,41
+75309,15,815,650,234,41,41
+75310,16,815,650,234,41,41
+75311,15,815,651,263,44,44
+75312,16,815,651,263,44,44
+75313,15,815,652,77,42,42
+75314,16,815,652,77,42,42
+75315,15,815,653,229,43,43
+75316,16,815,653,229,43,43
+75317,15,815,653,229,43,43
+75318,16,815,653,229,43,43
+75319,15,815,653,229,44,44
+75320,16,815,653,229,44,44
+75321,15,815,654,335,43,43
+75322,16,815,654,335,43,43
+75323,15,815,654,335,43,43
+75324,16,815,654,335,43,43
+75325,15,815,654,335,45,45
+75326,16,815,654,335,45,45
+75327,15,815,655,270,42,42
+75328,16,815,655,270,42,42
+75329,15,815,656,283,46,46
+75330,16,815,656,283,46,46
+75331,15,815,657,119,20,20
+75332,16,815,657,119,20,20
+75333,15,815,658,119,20,20
+75334,16,815,658,119,20,20
+75335,15,815,667,147,25,25
+75336,16,815,667,147,25,25
+75337,15,815,668,147,25,25
+75338,16,815,668,147,25,25
+75339,15,815,677,148,45,45
+75340,16,815,677,148,45,45
+75341,15,815,678,148,45,45
+75342,16,815,678,148,45,45
+75343,15,815,687,195,25,25
+75344,16,815,687,195,25,25
+75345,15,815,688,283,25,25
+75346,16,815,688,283,25,25
+75347,15,815,689,283,25,25
+75348,16,815,689,283,25,25
+75349,15,816,647,20,40,40
+75350,16,816,647,20,40,40
+75351,15,816,648,113,42,42
+75352,16,816,648,113,42,42
+75353,15,816,649,273,45,45
+75354,16,816,649,273,45,45
+75355,15,816,650,188,40,40
+75356,16,816,650,188,40,40
+75357,15,816,651,274,38,38
+75358,16,816,651,274,38,38
+75359,15,816,652,274,48,48
+75360,16,816,652,274,48,48
+75361,15,816,652,274,47,47
+75362,16,816,652,274,47,47
+75363,15,816,652,274,47,47
+75364,16,816,652,274,47,47
+75365,15,816,653,74,45,45
+75366,16,816,653,74,45,45
+75367,15,816,653,74,45,45
+75368,16,816,653,74,45,45
+75369,15,816,653,35,42,42
+75370,16,816,653,35,42,42
+75371,15,816,654,299,45,45
+75372,16,816,654,299,45,45
+75373,15,816,655,447,45,45
+75374,16,816,655,447,45,45
+75375,15,816,655,447,46,46
+75376,16,816,655,447,46,46
+75377,15,816,655,447,45,45
+75378,16,816,655,447,45,45
+75379,15,816,656,194,40,40
+75380,16,816,656,194,40,40
+75381,15,816,657,61,15,15
+75382,16,816,657,61,15,15
+75383,15,816,658,61,16,16
+75384,16,816,658,61,16,16
+75385,15,816,667,61,27,27
+75386,16,816,667,61,27,27
+75387,15,816,668,130,28,28
+75388,16,816,668,130,28,28
+75389,15,816,677,130,42,42
+75390,16,816,677,130,42,42
+75391,15,816,678,130,45,45
+75392,16,816,678,130,45,45
+75393,15,816,687,188,47,47
+75394,16,816,687,188,47,47
+75395,15,816,688,284,42,42
+75396,16,816,688,284,42,42
+75397,15,816,689,284,46,46
+75398,16,816,689,284,46,46
+75399,15,823,647,128,41,41
+75400,16,823,647,128,41,41
+75401,15,823,648,263,38,38
+75402,16,823,648,263,38,38
+75403,15,823,649,404,46,46
+75404,16,823,649,404,46,46
+75405,15,823,649,404,46,46
+75406,16,823,649,404,46,46
+75407,15,823,649,404,45,45
+75408,16,823,649,404,45,45
+75409,15,823,650,228,42,42
+75410,16,823,650,228,42,42
+75411,15,823,651,332,42,42
+75412,16,823,651,332,42,42
+75413,15,823,652,285,45,45
+75414,16,823,652,285,45,45
+75415,15,823,653,111,41,41
+75416,16,823,653,111,41,41
+75417,15,823,654,112,44,44
+75418,16,823,654,112,44,44
+75419,15,823,655,324,46,46
+75420,16,823,655,324,46,46
+75421,15,823,655,324,47,47
+75422,16,823,655,324,47,47
+75423,15,823,655,324,47,47
+75424,16,823,655,324,47,47
+75425,15,823,656,298,42,42
+75426,16,823,656,298,42,42
+75427,15,823,657,119,20,20
+75428,16,823,657,119,20,20
+75429,15,823,658,119,20,20
+75430,16,823,658,119,20,20
+75431,15,823,667,147,25,25
+75432,16,823,667,147,25,25
+75433,15,823,668,147,25,25
+75434,16,823,668,147,25,25
+75435,15,823,677,148,45,45
+75436,16,823,677,148,45,45
+75437,15,823,678,148,45,45
+75438,16,823,678,148,45,45
+75439,15,823,687,195,25,25
+75440,16,823,687,195,25,25
+75441,15,823,688,283,25,25
+75442,16,823,688,283,25,25
+75443,15,823,689,283,25,25
+75444,16,823,689,283,25,25
+75445,15,813,647,264,46,46
+75446,16,813,647,264,46,46
+75447,15,813,648,335,45,45
+75448,16,813,648,335,45,45
+75449,15,813,648,335,45,45
+75450,16,813,648,335,45,45
+75451,15,813,648,335,43,43
+75452,16,813,648,335,43,43
+75453,15,813,649,46,42,42
+75454,16,813,649,46,42,42
+75455,15,813,650,22,44,44
+75456,16,813,650,22,44,44
+75457,15,813,651,288,47,47
+75458,16,813,651,288,47,47
+75459,15,813,652,126,41,41
+75460,16,813,652,126,41,41
+75461,15,813,652,126,41,41
+75462,16,813,652,126,41,41
+75463,15,813,652,202,41,41
+75464,16,813,652,202,41,41
+75465,15,813,653,305,45,45
+75466,16,813,653,305,45,45
+75467,15,813,654,436,45,45
+75468,16,813,654,436,45,45
+75469,15,813,654,436,45,45
+75470,16,813,654,436,45,45
+75471,15,813,654,436,46,46
+75472,16,813,654,436,46,46
+75473,15,813,655,80,45,45
+75474,16,813,655,80,45,45
+75475,15,813,656,363,45,45
+75476,16,813,656,363,45,45
+75477,15,813,656,363,45,45
+75478,16,813,656,363,45,45
+75479,15,813,656,363,44,44
+75480,16,813,656,363,44,44
+75481,15,813,657,119,20,20
+75482,16,813,657,119,20,20
+75483,15,813,658,119,20,20
+75484,16,813,658,119,20,20
+75485,15,813,667,147,25,25
+75486,16,813,667,147,25,25
+75487,15,813,668,147,25,25
+75488,16,813,668,147,25,25
+75489,15,813,677,148,45,45
+75490,16,813,677,148,45,45
+75491,15,813,678,148,45,45
+75492,16,813,678,148,45,45
+75493,15,813,687,195,25,25
+75494,16,813,687,195,25,25
+75495,15,813,688,283,25,25
+75496,16,813,688,283,25,25
+75497,15,813,689,283,25,25
+75498,16,813,689,283,25,25
+75499,15,821,647,85,42,42
+75500,16,821,647,85,42,42
+75501,15,821,648,309,42,42
+75502,16,821,648,309,42,42
+75503,15,821,649,443,44,44
+75504,16,821,649,443,44,44
+75505,15,821,650,179,43,43
+75506,16,821,650,179,43,43
+75507,15,821,651,310,37,37
+75508,16,821,651,310,37,37
+75509,15,821,652,406,40,40
+75510,16,821,652,406,40,40
+75511,15,821,653,80,42,42
+75512,16,821,653,80,42,42
+75513,15,821,654,99,40,40
+75514,16,821,654,99,40,40
+75515,15,821,655,304,45,45
+75516,16,821,655,304,45,45
+75517,15,821,655,304,45,45
+75518,16,821,655,304,45,45
+75519,15,821,655,304,44,44
+75520,16,821,655,304,44,44
+75521,15,821,656,80,37,37
+75522,16,821,656,80,37,37
+75523,15,821,657,98,17,17
+75524,16,821,657,98,17,17
+75525,15,821,658,98,18,18
+75526,16,821,658,98,18,18
+75527,15,821,667,99,26,26
+75528,16,821,667,99,26,26
+75529,15,821,668,99,27,27
+75530,16,821,668,99,27,27
+75531,15,821,677,341,46,46
+75532,16,821,677,341,46,46
+75533,15,821,678,341,48,48
+75534,16,821,678,341,48,48
+75535,15,821,687,131,37,37
+75536,16,821,687,131,37,37
+75537,15,821,687,131,37,37
+75538,16,821,687,131,37,37
+75539,15,821,687,131,36,36
+75540,16,821,687,131,36,36
+75541,15,821,688,131,42,42
+75542,16,821,688,131,42,42
+75543,15,821,688,131,42,42
+75544,16,821,688,131,42,42
+75545,15,821,688,131,41,41
+75546,16,821,688,131,41,41
+75547,15,821,689,131,47,47
+75548,16,821,689,131,47,47
+75549,15,821,689,131,47,47
+75550,16,821,689,131,47,47
+75551,15,821,689,131,46,46
+75552,16,821,689,131,46,46
+75553,15,824,647,162,37,37
+75554,16,824,647,162,37,37
+75555,15,824,648,283,40,40
+75556,16,824,648,283,40,40
+75557,15,824,649,271,47,47
+75558,16,824,649,271,47,47
+75559,15,824,650,83,41,41
+75560,16,824,650,83,41,41
+75561,15,824,651,417,43,43
+75562,16,824,651,417,43,43
+75563,15,824,652,84,45,45
+75564,16,824,652,84,45,45
+75565,15,824,653,55,40,40
+75566,16,824,653,55,40,40
+75567,15,824,654,372,46,46
+75568,16,824,654,372,46,46
+75569,15,824,655,132,41,41
+75570,16,824,655,132,41,41
+75571,15,824,656,418,45,45
+75572,16,824,656,418,45,45
+75573,15,824,656,418,45,45
+75574,16,824,656,418,45,45
+75575,15,824,656,418,44,44
+75576,16,824,656,418,44,44
+75577,15,824,657,61,17,17
+75578,16,824,657,61,17,17
+75579,15,824,658,61,18,18
+75580,16,824,658,61,18,18
+75581,15,824,667,341,26,26
+75582,16,824,667,341,26,26
+75583,15,824,668,341,28,28
+75584,16,824,668,341,28,28
+75585,15,824,677,130,45,45
+75586,16,824,677,130,45,45
+75587,15,824,677,130,44,44
+75588,16,824,677,130,44,44
+75589,15,824,677,130,45,45
+75590,16,824,677,130,45,45
+75591,15,824,678,130,48,48
+75592,16,824,678,130,48,48
+75593,15,824,678,130,47,47
+75594,16,824,678,130,47,47
+75595,15,824,678,130,48,48
+75596,16,824,678,130,48,48
+75597,15,824,687,195,37,37
+75598,16,824,687,195,37,37
+75599,15,824,688,55,37,37
+75600,16,824,688,55,37,37
+75601,15,824,689,55,45,45
+75602,16,824,689,55,45,45
+75603,15,817,647,122,45,45
+75604,16,817,647,122,45,45
+75605,15,817,648,406,47,47
+75606,16,817,648,406,47,47
+75607,15,817,649,200,42,42
+75608,16,817,649,200,42,42
+75609,15,817,650,353,46,46
+75610,16,817,650,353,46,46
+75611,15,817,650,353,46,46
+75612,16,817,650,353,46,46
+75613,15,817,650,353,47,47
+75614,16,817,650,353,47,47
+75615,15,817,651,125,41,41
+75616,16,817,651,125,41,41
+75617,15,817,652,437,45,45
+75618,16,817,652,437,45,45
+75619,15,817,652,437,44,44
+75620,16,817,652,437,44,44
+75621,15,817,652,437,44,44
+75622,16,817,652,437,44,44
+75623,15,817,653,374,44,44
+75624,16,817,653,374,44,44
+75625,15,817,654,108,40,40
+75626,16,817,654,108,40,40
+75627,15,817,655,399,40,40
+75628,16,817,655,399,40,40
+75629,15,817,656,283,42,42
+75630,16,817,656,283,42,42
+75631,15,817,657,119,20,20
+75632,16,817,657,119,20,20
+75633,15,817,658,119,20,20
+75634,16,817,658,119,20,20
+75635,15,817,667,147,25,25
+75636,16,817,667,147,25,25
+75637,15,817,668,147,25,25
+75638,16,817,668,147,25,25
+75639,15,817,677,148,45,45
+75640,16,817,677,148,45,45
+75641,15,817,678,148,45,45
+75642,16,817,678,148,45,45
+75643,15,817,687,195,25,25
+75644,16,817,687,195,25,25
+75645,15,817,688,283,25,25
+75646,16,817,688,283,25,25
+75647,15,817,689,283,25,25
+75648,16,817,689,283,25,25
+75649,15,818,647,47,41,41
+75650,16,818,647,47,41,41
+75651,15,818,648,162,42,42
+75652,16,818,648,162,42,42
+75653,15,818,649,417,47,47
+75654,16,818,649,417,47,47
+75655,15,818,650,198,37,37
+75656,16,818,650,198,37,37
+75657,15,818,650,198,37,37
+75658,16,818,650,198,37,37
+75659,15,818,650,97,37,37
+75660,16,818,650,97,37,37
+75661,15,818,651,70,46,46
+75662,16,818,651,70,46,46
+75663,15,818,652,358,46,46
+75664,16,818,652,358,46,46
+75665,15,818,652,358,46,46
+75666,16,818,652,358,46,46
+75667,15,818,652,358,47,47
+75668,16,818,652,358,47,47
+75669,15,818,653,100,42,42
+75670,16,818,653,100,42,42
+75671,15,818,654,355,38,38
+75672,16,818,654,355,38,38
+75673,15,818,655,371,45,45
+75674,16,818,655,371,45,45
+75675,15,818,655,371,45,45
+75676,16,818,655,371,45,45
+75677,15,818,655,371,44,44
+75678,16,818,655,371,44,44
+75679,15,818,656,419,44,44
+75680,16,818,656,419,44,44
+75681,15,818,657,118,17,17
+75682,16,818,657,118,17,17
+75683,15,818,658,119,17,17
+75684,16,818,658,119,17,17
+75685,15,818,667,119,27,27
+75686,16,818,667,119,27,27
+75687,15,818,668,147,29,29
+75688,16,818,668,147,29,29
+75689,15,818,677,148,42,42
+75690,16,818,677,148,42,42
+75691,15,818,678,148,45,45
+75692,16,818,678,148,45,45
+75693,15,818,687,119,42,42
+75694,16,818,687,119,42,42
+75695,15,818,688,198,47,47
+75696,16,818,688,198,47,47
+75697,15,818,689,355,48,48
+75698,16,818,689,355,48,48
+75699,15,819,647,44,42,42
+75700,16,819,647,44,42,42
+75701,15,819,648,189,38,38
+75702,16,819,648,189,38,38
+75703,15,819,649,336,48,48
+75704,16,819,649,336,48,48
+75705,15,819,649,336,47,47
+75706,16,819,649,336,47,47
+75707,15,819,649,336,47,47
+75708,16,819,649,336,47,47
+75709,15,819,650,455,41,41
+75710,16,819,650,455,41,41
+75711,15,819,651,453,44,44
+75712,16,819,651,453,44,44
+75713,15,819,652,315,46,46
+75714,16,819,652,315,46,46
+75715,15,819,653,50,43,43
+75716,16,819,653,50,43,43
+75717,15,819,654,213,44,44
+75718,16,819,654,213,44,44
+75719,15,819,655,354,44,44
+75720,16,819,655,354,44,44
+75721,15,819,655,354,44,44
+75722,16,819,655,354,44,44
+75723,15,819,655,354,45,45
+75724,16,819,655,354,45,45
+75725,15,819,656,89,38,38
+75726,16,819,656,89,38,38
+75727,15,819,657,60,16,16
+75728,16,819,657,60,16,16
+75729,15,819,658,60,18,18
+75730,16,819,658,60,18,18
+75731,15,819,667,130,26,26
+75732,16,819,667,130,26,26
+75733,15,819,668,130,29,29
+75734,16,819,668,130,29,29
+75735,15,819,677,339,42,42
+75736,16,819,677,339,42,42
+75737,15,819,678,339,45,45
+75738,16,819,678,339,45,45
+75739,15,819,687,189,47,47
+75740,16,819,687,189,47,47
+75741,15,819,688,195,43,43
+75742,16,819,688,195,43,43
+75743,15,819,689,89,48,48
+75744,16,819,689,89,48,48
+75745,15,822,647,310,41,41
+75746,16,822,647,310,41,41
+75747,15,822,648,314,46,46
+75748,16,822,648,314,46,46
+75749,15,822,649,69,41,41
+75750,16,822,649,69,41,41
+75751,15,822,650,308,44,44
+75752,16,822,650,308,44,44
+75753,15,822,651,286,46,46
+75754,16,822,651,286,46,46
+75755,15,822,652,67,40,40
+75756,16,822,652,67,40,40
+75757,15,822,653,451,44,44
+75758,16,822,653,451,44,44
+75759,15,822,653,451,44,44
+75760,16,822,653,451,44,44
+75761,15,822,653,451,45,45
+75762,16,822,653,451,45,45
+75763,15,822,654,338,45,45
+75764,16,822,654,338,45,45
+75765,15,822,654,338,46,46
+75766,16,822,654,338,46,46
+75767,15,822,654,338,45,45
+75768,16,822,654,338,45,45
+75769,15,822,655,55,45,45
+75770,16,822,655,55,45,45
+75771,15,822,656,99,48,48
+75772,16,822,656,99,48,48
+75773,15,822,657,119,20,20
+75774,16,822,657,119,20,20
+75775,15,822,658,119,20,20
+75776,16,822,658,119,20,20
+75777,15,822,667,147,25,25
+75778,16,822,667,147,25,25
+75779,15,822,668,147,25,25
+75780,16,822,668,147,25,25
+75781,15,822,677,148,45,45
+75782,16,822,677,148,45,45
+75783,15,822,678,148,45,45
+75784,16,822,678,148,45,45
+75785,15,822,687,195,25,25
+75786,16,822,687,195,25,25
+75787,15,822,688,283,25,25
+75788,16,822,688,283,25,25
+75789,15,822,689,283,25,25
+75790,16,822,689,283,25,25
+75791,15,820,647,82,42,42
+75792,16,820,647,82,42,42
+75793,15,820,648,313,46,46
+75794,16,820,648,313,46,46
+75795,15,820,649,433,38,38
+75796,16,820,649,433,38,38
+75797,15,820,650,307,44,44
+75798,16,820,650,307,44,44
+75799,15,820,650,307,43,43
+75800,16,820,650,307,43,43
+75801,15,820,650,307,43,43
+75802,16,820,650,307,43,43
+75803,15,820,651,356,45,45
+75804,16,820,651,356,45,45
+75805,15,820,651,356,45,45
+75806,16,820,651,356,45,45
+75807,15,820,651,356,46,46
+75808,16,820,651,356,46,46
+75809,15,820,652,246,42,42
+75810,16,820,652,246,42,42
+75811,15,820,653,337,46,46
+75812,16,820,653,337,46,46
+75813,15,820,654,375,44,44
+75814,16,820,654,375,44,44
+75815,15,820,655,98,43,43
+75816,16,820,655,98,43,43
+75817,15,820,656,364,45,45
+75818,16,820,656,364,45,45
+75819,15,820,657,119,20,20
+75820,16,820,657,119,20,20
+75821,15,820,658,119,20,20
+75822,16,820,658,119,20,20
+75823,15,820,667,147,25,25
+75824,16,820,667,147,25,25
+75825,15,820,668,147,25,25
+75826,16,820,668,147,25,25
+75827,15,820,677,148,45,45
+75828,16,820,677,148,45,45
+75829,15,820,678,148,45,45
+75830,16,820,678,148,45,45
+75831,15,820,687,195,25,25
+75832,16,820,687,195,25,25
+75833,15,820,688,283,25,25
+75834,16,820,688,283,25,25
+75835,15,820,689,283,25,25
+75836,16,820,689,283,25,25
+75837,15,814,647,22,38,38
+75838,16,814,647,22,38,38
+75839,15,814,648,327,45,45
+75840,16,814,648,327,45,45
+75841,15,814,649,455,48,48
+75842,16,814,649,455,48,48
+75843,15,814,650,331,35,35
+75844,16,814,650,331,35,35
+75845,15,814,651,329,44,44
+75846,16,814,651,329,44,44
+75847,15,814,651,329,45,45
+75848,16,814,651,329,45,45
+75849,15,814,651,329,44,44
+75850,16,814,651,329,44,44
+75851,15,814,652,105,41,41
+75852,16,814,652,105,41,41
+75853,15,814,652,105,41,41
+75854,16,814,652,105,41,41
+75855,15,814,652,22,41,41
+75856,16,814,652,22,41,41
+75857,15,814,653,449,43,43
+75858,16,814,653,449,43,43
+75859,15,814,654,328,46,46
+75860,16,814,654,328,46,46
+75861,15,814,654,328,47,47
+75862,16,814,654,328,47,47
+75863,15,814,654,328,46,46
+75864,16,814,654,328,46,46
+75865,15,814,655,270,38,38
+75866,16,814,655,270,38,38
+75867,15,814,656,332,48,48
+75868,16,814,656,332,48,48
+75869,15,814,657,119,20,20
+75870,16,814,657,119,20,20
+75871,15,814,658,119,20,20
+75872,16,814,658,119,20,20
+75873,15,814,667,147,25,25
+75874,16,814,667,147,25,25
+75875,15,814,668,147,25,25
+75876,16,814,668,147,25,25
+75877,15,814,677,148,45,45
+75878,16,814,677,148,45,45
+75879,15,814,678,148,45,45
+75880,16,814,678,148,45,45
+75881,15,814,687,195,25,25
+75882,16,814,687,195,25,25
+75883,15,814,688,283,25,25
+75884,16,814,688,283,25,25
+75885,15,814,689,283,25,25
+75886,16,814,689,283,25,25

From f3ac386f4a0a44dac543d4724cc59ee5571ca0b9 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 19 Jun 2026 10:07:04 -0700
Subject: [PATCH 2/5] Adjust naming/prose

---
 data/v2/csv/encounter_condition_value_prose.csv | 4 ++--
 data/v2/csv/encounter_condition_values.csv      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index 1aefc574e..f3f2b5346 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -326,5 +326,5 @@ 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,Not displaced by block-based encounter
-207,9,Displaced by block-based encounter
+206,9,Encounter slot active when no block-based encounter is replacing it
+207,9,Encounter slot requires specific block placement to unlock
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index f512e2412..aaa878bda 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -204,5 +204,5 @@ 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,johto-safari-not-displaced,1
-207,23,johto-safari-displaced,0
+206,23,johto-safari-blocks-inactive,1
+207,23,johto-safari-blocks-required,0

From 88b92af7401a6484e9733fa570e49258bdff38ab Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Mon, 29 Jun 2026 22:27:12 -0700
Subject: [PATCH 3/5] Use more expressive conditions

---
 data/v2/csv/encounter_condition_value_map.csv | 1224 +++++++++--------
 .../csv/encounter_condition_value_prose.csv   |   65 +-
 data/v2/csv/encounter_condition_values.csv    |   65 +-
 3 files changed, 756 insertions(+), 598 deletions(-)

diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index 652633120..f9550f64a 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -23436,812 +23436,216 @@ encounter_id,encounter_condition_value_id
 60435,206
 60436,206
 60437,206
-75578,207
 75578,3
-75579,207
 75579,3
-75580,207
 75580,4
-75581,207
 75581,4
-75582,207
 75582,5
-75583,207
 75583,5
-75584,207
 75584,3
-75585,207
 75585,3
-75586,207
 75586,4
-75587,207
 75587,4
-75588,207
 75588,5
-75589,207
 75589,5
-75590,207
-75591,207
-75592,207
 75592,3
-75593,207
 75593,3
-75594,207
 75594,4
-75595,207
 75595,4
-75596,207
 75596,5
-75597,207
 75597,5
-75598,207
-75599,207
-75600,207
-75601,207
-75602,207
 75602,3
-75603,207
 75603,3
-75604,207
 75604,4
-75605,207
 75605,4
-75606,207
 75606,5
-75607,207
 75607,5
-75608,207
 75608,3
-75609,207
 75609,3
-75610,207
 75610,4
-75611,207
 75611,4
-75612,207
 75612,5
-75613,207
 75613,5
-75614,207
-75615,207
-75616,207
-75617,207
-75618,207
-75619,207
-75620,207
-75621,207
-75622,207
-75623,207
-75624,207
-75625,207
-75626,207
-75627,207
-75628,207
-75629,207
-75630,207
-75631,207
-75632,207
-75633,207
-75634,207
-75635,207
-75636,207
-75637,207
-75638,207
-75639,207
-75640,207
-75641,207
-75642,207
-75643,207
-75644,207
-75645,207
-75646,207
 75646,3
-75647,207
 75647,3
-75648,207
 75648,4
-75649,207
 75649,4
-75650,207
 75650,5
-75651,207
 75651,5
-75652,207
 75652,3
-75653,207
 75653,3
-75654,207
 75654,4
-75655,207
 75655,4
-75656,207
 75656,5
-75657,207
 75657,5
-75658,207
-75659,207
-75660,207
 75660,3
-75661,207
 75661,3
-75662,207
 75662,4
-75663,207
 75663,4
-75664,207
 75664,5
-75665,207
 75665,5
-75666,207
-75667,207
-75668,207
-75669,207
-75670,207
-75671,207
-75672,207
-75673,207
-75674,207
-75675,207
-75676,207
-75677,207
-75678,207
-75679,207
-75680,207
-75681,207
-75682,207
-75683,207
-75684,207
-75685,207
-75686,207
-75687,207
-75688,207
-75689,207
-75690,207
 75690,3
-75691,207
 75691,3
-75692,207
 75692,4
-75693,207
 75693,4
-75694,207
 75694,5
-75695,207
 75695,5
-75696,207
-75697,207
-75698,207
-75699,207
-75700,207
-75701,207
-75702,207
-75703,207
-75704,207
-75705,207
-75706,207
 75706,3
-75707,207
 75707,3
-75708,207
 75708,4
-75709,207
 75709,4
-75710,207
 75710,5
-75711,207
 75711,5
-75712,207
-75713,207
-75714,207
-75715,207
-75716,207
-75717,207
-75718,207
-75719,207
-75720,207
-75721,207
-75722,207
-75723,207
-75724,207
-75725,207
-75726,207
-75727,207
-75728,207
-75729,207
-75730,207
-75731,207
-75732,207
-75733,207
-75734,207
 75734,3
-75735,207
 75735,3
-75736,207
 75736,4
-75737,207
 75737,4
-75738,207
 75738,5
-75739,207
 75739,5
-75740,207
-75741,207
-75742,207
-75743,207
-75744,207
-75745,207
-75746,207
 75746,3
-75747,207
 75747,3
-75748,207
 75748,4
-75749,207
 75749,4
-75750,207
 75750,5
-75751,207
 75751,5
-75752,207
-75753,207
-75754,207
 75754,3
-75755,207
 75755,3
-75756,207
 75756,4
-75757,207
 75757,4
-75758,207
 75758,5
-75759,207
 75759,5
-75760,207
-75761,207
-75762,207
 75762,3
-75763,207
 75763,3
-75764,207
 75764,4
-75765,207
 75765,4
-75766,207
 75766,5
-75767,207
 75767,5
-75768,207
-75769,207
-75770,207
-75771,207
-75772,207
-75773,207
-75774,207
-75775,207
-75776,207
-75777,207
-75778,207
-75779,207
-75780,207
-75781,207
-75782,207
-75783,207
-75784,207
-75785,207
-75786,207
-75787,207
-75788,207
-75789,207
-75790,207
-75791,207
-75792,207
-75793,207
-75794,207
-75795,207
-75796,207
-75797,207
-75798,207
-75799,207
-75800,207
-75801,207
-75802,207
 75802,3
-75803,207
 75803,3
-75804,207
 75804,4
-75805,207
 75805,4
-75806,207
 75806,5
-75807,207
 75807,5
-75808,207
-75809,207
-75810,207
-75811,207
-75812,207
-75813,207
-75814,207
-75815,207
-75816,207
-75817,207
-75818,207
-75819,207
-75820,207
-75821,207
-75822,207
 75822,3
-75823,207
 75823,3
-75824,207
 75824,4
-75825,207
 75825,4
-75826,207
 75826,5
-75827,207
 75827,5
-75828,207
 75828,3
-75829,207
 75829,3
-75830,207
 75830,4
-75831,207
 75831,4
-75832,207
 75832,5
-75833,207
 75833,5
-75834,207
 75834,3
-75835,207
 75835,3
-75836,207
 75836,4
-75837,207
 75837,4
-75838,207
 75838,5
-75839,207
 75839,5
-75840,207
-75841,207
-75842,207
-75843,207
-75844,207
-75845,207
-75846,207
-75847,207
-75848,207
-75849,207
-75850,207
-75851,207
-75852,207
-75853,207
-75854,207
-75855,207
-75856,207
-75857,207
-75858,207
 75858,3
-75859,207
 75859,3
-75860,207
 75860,4
-75861,207
 75861,4
-75862,207
 75862,5
-75863,207
 75863,5
-75864,207
-75865,207
-75866,207
-75867,207
-75868,207
-75869,207
-75870,207
-75871,207
-75872,207
 75872,3
-75873,207
 75873,3
-75874,207
 75874,4
-75875,207
 75875,4
-75876,207
 75876,5
-75877,207
 75877,5
-75878,207
 75878,3
-75879,207
 75879,3
-75880,207
 75880,4
-75881,207
 75881,4
-75882,207
 75882,5
-75883,207
 75883,5
-75884,207
-75885,207
-75886,207
-75887,207
-75888,207
-75889,207
-75890,207
-75891,207
-75892,207
-75893,207
-75894,207
-75895,207
-75896,207
 75896,3
-75897,207
 75897,3
-75898,207
 75898,4
-75899,207
 75899,4
-75900,207
 75900,5
-75901,207
 75901,5
-75902,207
-75903,207
-75904,207
 75904,3
-75905,207
 75905,3
-75906,207
 75906,4
-75907,207
 75907,4
-75908,207
 75908,5
-75909,207
 75909,5
-75910,207
-75911,207
-75912,207
-75913,207
-75914,207
-75915,207
-75916,207
-75917,207
-75918,207
-75919,207
-75920,207
-75921,207
-75922,207
-75923,207
-75924,207
-75925,207
-75926,207
-75927,207
-75928,207
-75929,207
-75930,207
-75931,207
-75932,207
-75933,207
-75934,207
-75935,207
-75936,207
-75937,207
-75938,207
-75939,207
-75940,207
-75941,207
-75942,207
 75942,3
-75943,207
 75943,3
-75944,207
 75944,4
-75945,207
 75945,4
-75946,207
 75946,5
-75947,207
 75947,5
-75948,207
-75949,207
-75950,207
 75950,3
-75951,207
 75951,3
-75952,207
 75952,4
-75953,207
 75953,4
-75954,207
 75954,5
-75955,207
 75955,5
-75956,207
-75957,207
-75958,207
-75959,207
-75960,207
 75960,3
-75961,207
 75961,3
-75962,207
 75962,4
-75963,207
 75963,4
-75964,207
 75964,5
-75965,207
 75965,5
-75966,207
-75967,207
-75968,207
-75969,207
-75970,207
-75971,207
-75972,207
-75973,207
-75974,207
-75975,207
-75976,207
-75977,207
-75978,207
-75979,207
-75980,207
-75981,207
-75982,207
-75983,207
-75984,207
-75985,207
-75986,207
-75987,207
-75988,207
-75989,207
-75990,207
 75990,3
-75991,207
 75991,3
-75992,207
 75992,4
-75993,207
 75993,4
-75994,207
 75994,5
-75995,207
 75995,5
-75996,207
-75997,207
-75998,207
-75999,207
-76000,207
-76001,207
-76002,207
-76003,207
-76004,207
-76005,207
-76006,207
 76006,3
-76007,207
 76007,3
-76008,207
 76008,4
-76009,207
 76009,4
-76010,207
 76010,5
-76011,207
 76011,5
-76012,207
-76013,207
-76014,207
-76015,207
-76016,207
-76017,207
-76018,207
-76019,207
-76020,207
-76021,207
-76022,207
-76023,207
-76024,207
-76025,207
-76026,207
-76027,207
-76028,207
-76029,207
-76030,207
-76031,207
-76032,207
-76033,207
-76034,207
-76035,207
-76036,207
-76037,207
-76038,207
-76039,207
-76040,207
-76041,207
-76042,207
-76043,207
-76044,207
 76044,3
-76045,207
 76045,3
-76046,207
 76046,4
-76047,207
 76047,4
-76048,207
 76048,5
-76049,207
 76049,5
-76050,207
 76050,3
-76051,207
 76051,3
-76052,207
 76052,4
-76053,207
 76053,4
-76054,207
 76054,5
-76055,207
 76055,5
-76056,207
-76057,207
-76058,207
-76059,207
-76060,207
-76061,207
-76062,207
-76063,207
-76064,207
-76065,207
-76066,207
-76067,207
-76068,207
-76069,207
-76070,207
-76071,207
-76072,207
-76073,207
-76074,207
-76075,207
-76076,207
-76077,207
-76078,207
-76079,207
-76080,207
-76081,207
-76082,207
-76083,207
-76084,207
 76084,3
-76085,207
 76085,3
-76086,207
 76086,4
-76087,207
 76087,4
-76088,207
 76088,5
-76089,207
 76089,5
-76090,207
 76090,3
-76091,207
 76091,3
-76092,207
 76092,4
-76093,207
 76093,4
-76094,207
 76094,5
-76095,207
 76095,5
-76096,207
-76097,207
-76098,207
-76099,207
-76100,207
-76101,207
-76102,207
-76103,207
-76104,207
-76105,207
-76106,207
-76107,207
-76108,207
-76109,207
-76110,207
-76111,207
-76112,207
-76113,207
-76114,207
-76115,207
-76116,207
-76117,207
-76118,207
-76119,207
-76120,207
-76121,207
-76122,207
-76123,207
-76124,207
-76125,207
-76126,207
-76127,207
-76128,207
-76129,207
-76130,207
-76131,207
-76132,207
 76132,3
-76133,207
 76133,3
-76134,207
 76134,4
-76135,207
 76135,4
-76136,207
 76136,5
-76137,207
 76137,5
-76138,207
 76138,3
-76139,207
 76139,3
-76140,207
 76140,4
-76141,207
 76141,4
-76142,207
 76142,5
-76143,207
 76143,5
-76144,207
-76145,207
-76146,207
 76146,3
-76147,207
 76147,3
-76148,207
 76148,4
-76149,207
 76149,4
-76150,207
 76150,5
-76151,207
 76151,5
-76152,207
-76153,207
-76154,207
-76155,207
-76156,207
-76157,207
-76158,207
-76159,207
-76160,207
-76161,207
-76162,207
-76163,207
-76164,207
-76165,207
-76166,207
-76167,207
-76168,207
-76169,207
-76170,207
-76171,207
-76172,207
-76173,207
 75211,205
 75211,186
 75212,205
@@ -24550,3 +23954,631 @@ encounter_id,encounter_condition_value_id
 19983,204
 19984,204
 19985,204
+75578,208
+75579,208
+75580,208
+75581,208
+75582,208
+75583,208
+75584,212
+75585,212
+75586,212
+75587,212
+75588,212
+75589,212
+75590,215
+75591,215
+75592,220
+75593,220
+75594,220
+75595,220
+75596,220
+75597,220
+75598,226
+75599,226
+75600,236
+75601,236
+75602,239
+75603,239
+75604,239
+75605,239
+75606,239
+75607,239
+75608,240
+75609,240
+75610,240
+75611,240
+75612,240
+75613,240
+75614,258
+75615,258
+75616,266
+75617,266
+75618,257
+75619,257
+75620,264
+75621,264
+75622,257
+75623,257
+75624,264
+75625,264
+75626,264
+75627,264
+75628,267
+75629,267
+75630,257
+75631,257
+75632,228
+75633,228
+75634,228
+75635,228
+75636,210
+75637,210
+75638,213
+75639,213
+75640,218
+75641,218
+75642,223
+75643,223
+75644,229
+75645,229
+75646,230
+75647,230
+75648,230
+75649,230
+75650,230
+75651,230
+75652,234
+75653,234
+75654,234
+75655,234
+75656,234
+75657,234
+75658,244
+75659,244
+75660,245
+75660,229
+75661,245
+75661,229
+75662,245
+75662,229
+75663,245
+75663,229
+75664,245
+75664,229
+75665,245
+75665,229
+75666,250
+75667,250
+75668,249
+75669,249
+75670,250
+75671,250
+75672,252
+75673,252
+75674,254
+75675,254
+75676,257
+75677,257
+75678,260
+75679,260
+75680,250
+75681,250
+75682,257
+75683,257
+75684,260
+75685,260
+75686,210
+75687,210
+75688,212
+75689,212
+75690,216
+75691,216
+75692,216
+75693,216
+75694,216
+75695,216
+75696,221
+75697,221
+75698,230
+75699,230
+75700,230
+75700,213
+75701,230
+75701,213
+75702,236
+75703,236
+75704,239
+75705,239
+75706,244
+75707,244
+75708,244
+75709,244
+75710,244
+75711,244
+75712,252
+75713,252
+75714,257
+75715,257
+75716,264
+75717,264
+75718,257
+75719,257
+75720,264
+75721,264
+75722,264
+75723,264
+75724,267
+75725,267
+75726,257
+75727,257
+75728,228
+75729,228
+75730,228
+75731,228
+75732,210
+75733,210
+75734,213
+75735,213
+75736,213
+75737,213
+75738,213
+75739,213
+75740,220
+75741,220
+75742,222
+75743,222
+75744,233
+75744,217
+75745,233
+75745,217
+75746,239
+75747,239
+75748,239
+75749,239
+75750,239
+75751,239
+75752,242
+75753,242
+75754,244
+75754,225
+75755,244
+75755,225
+75756,244
+75756,225
+75757,244
+75757,225
+75758,244
+75758,225
+75759,244
+75759,225
+75760,252
+75761,252
+75762,268
+75763,268
+75764,268
+75765,268
+75766,268
+75767,268
+75768,257
+75769,257
+75770,264
+75771,264
+75772,257
+75773,257
+75774,264
+75775,264
+75776,264
+75777,264
+75778,267
+75779,267
+75780,257
+75781,257
+75782,228
+75783,228
+75784,228
+75785,228
+75786,209
+75787,209
+75788,212
+75789,212
+75790,219
+75790,246
+75791,219
+75791,246
+75792,222
+75793,222
+75794,224
+75795,224
+75796,227
+75797,227
+75798,234
+75799,234
+75800,238
+75801,238
+75802,242
+75803,242
+75804,242
+75805,242
+75806,242
+75807,242
+75808,252
+75809,252
+75810,249
+75811,249
+75812,250
+75813,250
+75814,252
+75815,252
+75816,255
+75817,255
+75818,261
+75819,261
+75820,264
+75821,264
+75822,257
+75823,257
+75824,257
+75825,257
+75826,257
+75827,257
+75828,260
+75829,260
+75830,260
+75831,260
+75832,260
+75833,260
+75834,263
+75835,263
+75836,263
+75837,263
+75838,263
+75839,263
+75840,207
+75841,207
+75842,211
+75843,211
+75844,214
+75845,214
+75846,220
+75847,220
+75848,223
+75849,223
+75850,235
+75851,235
+75852,236
+75853,236
+75854,248
+75855,248
+75856,261
+75857,261
+75858,268
+75859,268
+75860,268
+75861,268
+75862,268
+75863,268
+75864,249
+75865,249
+75866,250
+75867,250
+75868,257
+75869,257
+75870,260
+75871,260
+75872,253
+75873,253
+75874,253
+75875,253
+75876,253
+75877,253
+75878,256
+75879,256
+75880,256
+75881,256
+75882,256
+75883,256
+75884,250
+75885,250
+75886,251
+75887,251
+75888,253
+75889,253
+75890,208
+75891,208
+75892,216
+75893,216
+75894,221
+75895,221
+75896,230
+75897,230
+75898,230
+75899,230
+75900,230
+75901,230
+75902,235
+75903,235
+75904,247
+75904,230
+75905,247
+75905,230
+75906,247
+75906,230
+75907,247
+75907,230
+75908,247
+75908,230
+75909,247
+75909,230
+75910,248
+75911,248
+75912,250
+75913,250
+75914,257
+75915,257
+75916,265
+75917,265
+75918,257
+75919,257
+75920,264
+75921,264
+75922,257
+75923,257
+75924,264
+75925,264
+75926,264
+75927,264
+75928,267
+75929,267
+75930,257
+75931,257
+75932,228
+75933,228
+75934,228
+75935,228
+75936,208
+75937,208
+75938,210
+75939,210
+75940,212
+75941,212
+75942,222
+75943,222
+75944,222
+75945,222
+75946,222
+75947,222
+75948,223
+75949,223
+75950,226
+75951,226
+75952,226
+75953,226
+75954,226
+75955,226
+75956,239
+75957,239
+75958,243
+75959,243
+75960,247
+75960,230
+75961,247
+75961,230
+75962,247
+75962,230
+75963,247
+75963,230
+75964,247
+75964,230
+75965,247
+75965,230
+75966,257
+75967,257
+75968,249
+75969,249
+75970,250
+75971,250
+75972,253
+75973,253
+75974,257
+75975,257
+75976,261
+75977,261
+75978,264
+75979,264
+75980,251
+75981,251
+75982,257
+75983,257
+75984,268
+75985,268
+75986,207
+75987,207
+75988,210
+75989,210
+75990,218
+75991,218
+75992,218
+75993,218
+75994,218
+75995,218
+75996,230
+75997,230
+75998,231
+75999,231
+76000,232
+76001,232
+76002,236
+76003,236
+76004,238
+76005,238
+76006,246
+76007,246
+76008,246
+76009,246
+76010,246
+76011,246
+76012,255
+76013,255
+76014,249
+76015,249
+76016,250
+76017,250
+76018,250
+76019,250
+76020,251
+76021,251
+76022,251
+76023,251
+76024,252
+76025,252
+76026,257
+76027,257
+76028,259
+76029,259
+76030,262
+76031,262
+76032,208
+76033,208
+76034,212
+76035,212
+76036,220
+76037,220
+76038,230
+76039,230
+76040,231
+76041,231
+76042,236
+76043,236
+76044,243
+76045,243
+76046,243
+76047,243
+76048,243
+76049,243
+76050,245
+76051,245
+76052,245
+76053,245
+76054,245
+76055,245
+76056,250
+76057,250
+76058,257
+76059,257
+76060,257
+76061,257
+76062,264
+76063,264
+76064,257
+76065,257
+76066,264
+76067,264
+76068,264
+76069,264
+76070,267
+76071,267
+76072,257
+76073,257
+76074,228
+76075,228
+76076,228
+76077,228
+76078,208
+76079,208
+76080,212
+76081,212
+76082,224
+76083,224
+76084,228
+76085,228
+76086,228
+76087,228
+76088,228
+76089,228
+76090,230
+76091,230
+76092,230
+76093,230
+76094,230
+76095,230
+76096,236
+76097,236
+76098,240
+76099,240
+76100,247
+76101,247
+76102,250
+76103,250
+76104,270
+76104,241
+76105,270
+76105,241
+76106,257
+76107,257
+76108,264
+76109,264
+76110,257
+76111,257
+76112,264
+76113,264
+76114,264
+76115,264
+76116,267
+76117,267
+76118,257
+76119,257
+76120,228
+76121,228
+76122,228
+76123,228
+76124,208
+76125,208
+76126,214
+76127,214
+76128,219
+76129,219
+76130,230
+76131,230
+76132,232
+76133,232
+76134,232
+76135,232
+76136,232
+76137,232
+76138,237
+76139,237
+76140,237
+76141,237
+76142,237
+76143,237
+76144,243
+76145,243
+76146,246
+76147,246
+76148,246
+76149,246
+76150,246
+76151,246
+76152,255
+76153,255
+76154,269
+76155,269
+76156,257
+76157,257
+76158,264
+76159,264
+76160,257
+76161,257
+76162,264
+76163,264
+76164,264
+76165,264
+76166,267
+76167,267
+76168,257
+76169,257
+76170,228
+76171,228
+76172,228
+76173,228
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index f3f2b5346..383ffc050 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -327,4 +327,67 @@ encounter_condition_value_id,local_language_id,name
 204,9,Not during the Bug-Catching Contest
 205,9,During the Bug-Catching Contest
 206,9,Encounter slot active when no block-based encounter is replacing it
-207,9,Encounter slot requires specific block placement to unlock
+207,9,At least 2 Plains block points placed
+208,9,At least 3 Plains block points placed
+209,9,At least 4 Plains block points placed
+210,9,At least 5 Plains block points placed
+211,9,At least 6 Plains block points placed
+212,9,At least 10 Plains block points placed
+213,9,At least 12 Plains block points placed
+214,9,At least 14 Plains block points placed
+215,9,At least 15 Plains block points placed
+216,9,At least 24 Plains block points placed
+217,9,At least 28 Plains block points placed
+218,9,At least 35 Plains block points placed
+219,9,At least 49 Plains block points placed
+220,9,At least 3 Forest block points placed
+221,9,At least 4 Forest block points placed
+222,9,At least 5 Forest block points placed
+223,9,At least 8 Forest block points placed
+224,9,At least 10 Forest block points placed
+225,9,At least 14 Forest block points placed
+226,9,At least 15 Forest block points placed
+227,9,At least 18 Forest block points placed
+228,9,At least 20 Forest block points placed
+229,9,At least 28 Forest block points placed
+230,9,At least 35 Forest block points placed
+231,9,At least 42 Forest block points placed
+232,9,At least 49 Forest block points placed
+233,9,At least 56 Forest block points placed
+234,9,At least 3 Peak block points placed
+235,9,At least 4 Peak block points placed
+236,9,At least 5 Peak block points placed
+237,9,At least 6 Peak block points placed
+238,9,At least 8 Peak block points placed
+239,9,At least 10 Peak block points placed
+240,9,At least 15 Peak block points placed
+241,9,At least 21 Peak block points placed
+242,9,At least 24 Peak block points placed
+243,9,At least 28 Peak block points placed
+244,9,At least 35 Peak block points placed
+245,9,At least 42 Peak block points placed
+246,9,At least 49 Peak block points placed
+247,9,At least 56 Peak block points placed
+248,9,At least 63 Peak block points placed
+249,9,At least 2 Water block points placed
+250,9,At least 3 Water block points placed
+251,9,At least 4 Water block points placed
+252,9,At least 5 Water block points placed
+253,9,At least 6 Water block points placed
+254,9,At least 7 Water block points placed
+255,9,At least 8 Water block points placed
+256,9,At least 9 Water block points placed
+257,9,At least 10 Water block points placed
+258,9,At least 12 Water block points placed
+259,9,At least 13 Water block points placed
+260,9,At least 14 Water block points placed
+261,9,At least 15 Water block points placed
+262,9,At least 16 Water block points placed
+263,9,At least 18 Water block points placed
+264,9,At least 20 Water block points placed
+265,9,At least 24 Water block points placed
+266,9,At least 28 Water block points placed
+267,9,At least 30 Water block points placed
+268,9,At least 35 Water block points placed
+269,9,At least 42 Water block points placed
+270,9,At least 49 Water block points placed
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index aaa878bda..deb119a37 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -205,4 +205,67 @@ id,encounter_condition_id,identifier,is_default
 204,22,bug-catching-contest-no,1
 205,22,bug-catching-contest-yes,0
 206,23,johto-safari-blocks-inactive,1
-207,23,johto-safari-blocks-required,0
+207,23,johto-safari-plains-blocks-min-2,0
+208,23,johto-safari-plains-blocks-min-3,0
+209,23,johto-safari-plains-blocks-min-4,0
+210,23,johto-safari-plains-blocks-min-5,0
+211,23,johto-safari-plains-blocks-min-6,0
+212,23,johto-safari-plains-blocks-min-10,0
+213,23,johto-safari-plains-blocks-min-12,0
+214,23,johto-safari-plains-blocks-min-14,0
+215,23,johto-safari-plains-blocks-min-15,0
+216,23,johto-safari-plains-blocks-min-24,0
+217,23,johto-safari-plains-blocks-min-28,0
+218,23,johto-safari-plains-blocks-min-35,0
+219,23,johto-safari-plains-blocks-min-49,0
+220,23,johto-safari-forest-blocks-min-3,0
+221,23,johto-safari-forest-blocks-min-4,0
+222,23,johto-safari-forest-blocks-min-5,0
+223,23,johto-safari-forest-blocks-min-8,0
+224,23,johto-safari-forest-blocks-min-10,0
+225,23,johto-safari-forest-blocks-min-14,0
+226,23,johto-safari-forest-blocks-min-15,0
+227,23,johto-safari-forest-blocks-min-18,0
+228,23,johto-safari-forest-blocks-min-20,0
+229,23,johto-safari-forest-blocks-min-28,0
+230,23,johto-safari-forest-blocks-min-35,0
+231,23,johto-safari-forest-blocks-min-42,0
+232,23,johto-safari-forest-blocks-min-49,0
+233,23,johto-safari-forest-blocks-min-56,0
+234,23,johto-safari-peak-blocks-min-3,0
+235,23,johto-safari-peak-blocks-min-4,0
+236,23,johto-safari-peak-blocks-min-5,0
+237,23,johto-safari-peak-blocks-min-6,0
+238,23,johto-safari-peak-blocks-min-8,0
+239,23,johto-safari-peak-blocks-min-10,0
+240,23,johto-safari-peak-blocks-min-15,0
+241,23,johto-safari-peak-blocks-min-21,0
+242,23,johto-safari-peak-blocks-min-24,0
+243,23,johto-safari-peak-blocks-min-28,0
+244,23,johto-safari-peak-blocks-min-35,0
+245,23,johto-safari-peak-blocks-min-42,0
+246,23,johto-safari-peak-blocks-min-49,0
+247,23,johto-safari-peak-blocks-min-56,0
+248,23,johto-safari-peak-blocks-min-63,0
+249,23,johto-safari-water-blocks-min-2,0
+250,23,johto-safari-water-blocks-min-3,0
+251,23,johto-safari-water-blocks-min-4,0
+252,23,johto-safari-water-blocks-min-5,0
+253,23,johto-safari-water-blocks-min-6,0
+254,23,johto-safari-water-blocks-min-7,0
+255,23,johto-safari-water-blocks-min-8,0
+256,23,johto-safari-water-blocks-min-9,0
+257,23,johto-safari-water-blocks-min-10,0
+258,23,johto-safari-water-blocks-min-12,0
+259,23,johto-safari-water-blocks-min-13,0
+260,23,johto-safari-water-blocks-min-14,0
+261,23,johto-safari-water-blocks-min-15,0
+262,23,johto-safari-water-blocks-min-16,0
+263,23,johto-safari-water-blocks-min-18,0
+264,23,johto-safari-water-blocks-min-20,0
+265,23,johto-safari-water-blocks-min-24,0
+266,23,johto-safari-water-blocks-min-28,0
+267,23,johto-safari-water-blocks-min-30,0
+268,23,johto-safari-water-blocks-min-35,0
+269,23,johto-safari-water-blocks-min-42,0
+270,23,johto-safari-water-blocks-min-49,0

From 8976c19092ddfa8d86cadfc16677693d341d2f6f Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Tue, 30 Jun 2026 20:52:12 -0700
Subject: [PATCH 4/5] Remove impossible water-based encounters

---
 data/v2/csv/encounter_condition_value_map.csv | 162 ++----------------
 .../csv/encounter_condition_value_prose.csv   |   7 +-
 data/v2/csv/encounter_condition_values.csv    |   7 +-
 data/v2/csv/encounters.csv                    | 126 --------------
 4 files changed, 24 insertions(+), 278 deletions(-)

diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index aa403e21f..221be96c2 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -25868,24 +25868,6 @@ encounter_id,encounter_condition_value_id
 76969,309
 76970,317
 76971,317
-76972,308
-76973,308
-76974,315
-76975,315
-76976,308
-76977,308
-76978,315
-76979,315
-76980,315
-76981,315
-76982,318
-76983,318
-76984,308
-76985,308
-76986,279
-76987,279
-76988,279
-76989,279
 76990,261
 76991,261
 76992,264
@@ -25972,24 +25954,6 @@ encounter_id,encounter_condition_value_id
 77065,295
 77066,303
 77067,303
-77068,308
-77069,308
-77070,315
-77071,315
-77072,308
-77073,308
-77074,315
-77075,315
-77076,315
-77077,315
-77078,318
-77079,318
-77080,308
-77081,308
-77082,279
-77083,279
-77084,279
-77085,279
 77086,261
 77087,261
 77088,264
@@ -26028,30 +25992,12 @@ encounter_id,encounter_condition_value_id
 77113,276
 77114,303
 77115,303
-77116,319
-77117,319
-77118,319
-77119,319
-77120,319
-77121,319
-77122,308
-77123,308
-77124,315
-77125,315
-77126,308
-77127,308
-77128,315
-77129,315
-77130,315
-77131,315
-77132,318
-77133,318
-77134,308
-77135,308
-77136,279
-77137,279
-77138,279
-77139,279
+77116,318
+77117,318
+77118,318
+77119,318
+77120,318
+77121,318
 77140,260
 77141,260
 77142,263
@@ -26126,12 +26072,12 @@ encounter_id,encounter_condition_value_id
 77209,299
 77210,312
 77211,312
-77212,319
-77213,319
-77214,319
-77215,319
-77216,319
-77217,319
+77212,318
+77213,318
+77214,318
+77215,318
+77216,318
+77217,318
 77218,300
 77219,300
 77220,301
@@ -26192,24 +26138,6 @@ encounter_id,encounter_condition_value_id
 77269,308
 77270,316
 77271,316
-77272,308
-77273,308
-77274,315
-77275,315
-77276,308
-77277,308
-77278,315
-77279,315
-77280,315
-77281,315
-77282,318
-77283,318
-77284,308
-77285,308
-77286,279
-77287,279
-77288,279
-77289,279
 77290,259
 77291,259
 77292,261
@@ -26264,8 +26192,8 @@ encounter_id,encounter_condition_value_id
 77335,302
 77336,308
 77337,308
-77338,319
-77339,319
+77338,318
+77339,318
 77340,258
 77341,258
 77342,261
@@ -26340,24 +26268,6 @@ encounter_id,encounter_condition_value_id
 77411,301
 77412,308
 77413,308
-77414,308
-77415,308
-77416,315
-77417,315
-77418,308
-77419,308
-77420,315
-77421,315
-77422,315
-77423,315
-77424,318
-77425,318
-77426,308
-77427,308
-77428,279
-77429,279
-77430,279
-77431,279
 77432,259
 77433,259
 77434,263
@@ -26384,28 +26294,10 @@ encounter_id,encounter_condition_value_id
 77455,298
 77456,301
 77457,301
-77458,321
+77458,320
 77458,292
-77459,321
+77459,320
 77459,292
-77460,308
-77461,308
-77462,315
-77463,315
-77464,308
-77465,308
-77466,315
-77467,315
-77468,315
-77469,315
-77470,318
-77471,318
-77472,308
-77473,308
-77474,279
-77475,279
-77476,279
-77477,279
 77478,259
 77479,259
 77480,265
@@ -26436,23 +26328,5 @@ encounter_id,encounter_condition_value_id
 77505,297
 77506,306
 77507,306
-77508,320
-77509,320
-77510,308
-77511,308
-77512,315
-77513,315
-77514,308
-77515,308
-77516,315
-77517,315
-77518,315
-77519,315
-77520,318
-77521,318
-77522,308
-77523,308
-77524,279
-77525,279
-77526,279
-77527,279
+77508,319
+77509,319
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index d1c82ddc7..0c60ad3e6 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -438,7 +438,6 @@ encounter_condition_value_id,local_language_id,name
 315,9,At least 20 Water block points placed
 316,9,At least 24 Water block points placed
 317,9,At least 28 Water block points placed
-318,9,At least 30 Water block points placed
-319,9,At least 35 Water block points placed
-320,9,At least 42 Water block points placed
-321,9,At least 49 Water block points placed
+318,9,At least 35 Water block points placed
+319,9,At least 42 Water block points placed
+320,9,At least 49 Water block points placed
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index 3f207dd00..bbe5e9114 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -316,7 +316,6 @@ id,encounter_condition_id,identifier,is_default
 315,26,johto-safari-water-blocks-min-20,0
 316,26,johto-safari-water-blocks-min-24,0
 317,26,johto-safari-water-blocks-min-28,0
-318,26,johto-safari-water-blocks-min-30,0
-319,26,johto-safari-water-blocks-min-35,0
-320,26,johto-safari-water-blocks-min-42,0
-321,26,johto-safari-water-blocks-min-49,0
+318,26,johto-safari-water-blocks-min-35,0
+319,26,johto-safari-water-blocks-min-42,0
+320,26,johto-safari-water-blocks-min-49,0
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 0f98d093d..40e37567b 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -71107,24 +71107,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 76969,16,815,655,270,42,42
 76970,15,815,656,283,46,46
 76971,16,815,656,283,46,46
-76972,15,815,657,119,20,20
-76973,16,815,657,119,20,20
-76974,15,815,658,119,20,20
-76975,16,815,658,119,20,20
-76976,15,815,667,147,25,25
-76977,16,815,667,147,25,25
-76978,15,815,668,147,25,25
-76979,16,815,668,147,25,25
-76980,15,815,677,148,45,45
-76981,16,815,677,148,45,45
-76982,15,815,678,148,45,45
-76983,16,815,678,148,45,45
-76984,15,815,687,195,25,25
-76985,16,815,687,195,25,25
-76986,15,815,688,283,25,25
-76987,16,815,688,283,25,25
-76988,15,815,689,283,25,25
-76989,16,815,689,283,25,25
 76990,15,816,647,20,40,40
 76991,16,816,647,20,40,40
 76992,15,816,648,113,42,42
@@ -71203,24 +71185,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 77065,16,823,655,324,47,47
 77066,15,823,656,298,42,42
 77067,16,823,656,298,42,42
-77068,15,823,657,119,20,20
-77069,16,823,657,119,20,20
-77070,15,823,658,119,20,20
-77071,16,823,658,119,20,20
-77072,15,823,667,147,25,25
-77073,16,823,667,147,25,25
-77074,15,823,668,147,25,25
-77075,16,823,668,147,25,25
-77076,15,823,677,148,45,45
-77077,16,823,677,148,45,45
-77078,15,823,678,148,45,45
-77079,16,823,678,148,45,45
-77080,15,823,687,195,25,25
-77081,16,823,687,195,25,25
-77082,15,823,688,283,25,25
-77083,16,823,688,283,25,25
-77084,15,823,689,283,25,25
-77085,16,823,689,283,25,25
 77086,15,813,647,264,46,46
 77087,16,813,647,264,46,46
 77088,15,813,648,335,45,45
@@ -71257,24 +71221,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 77119,16,813,656,363,45,45
 77120,15,813,656,363,44,44
 77121,16,813,656,363,44,44
-77122,15,813,657,119,20,20
-77123,16,813,657,119,20,20
-77124,15,813,658,119,20,20
-77125,16,813,658,119,20,20
-77126,15,813,667,147,25,25
-77127,16,813,667,147,25,25
-77128,15,813,668,147,25,25
-77129,16,813,668,147,25,25
-77130,15,813,677,148,45,45
-77131,16,813,677,148,45,45
-77132,15,813,678,148,45,45
-77133,16,813,678,148,45,45
-77134,15,813,687,195,25,25
-77135,16,813,687,195,25,25
-77136,15,813,688,283,25,25
-77137,16,813,688,283,25,25
-77138,15,813,689,283,25,25
-77139,16,813,689,283,25,25
 77140,15,821,647,85,42,42
 77141,16,821,647,85,42,42
 77142,15,821,648,309,42,42
@@ -71407,24 +71353,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 77269,16,817,655,399,40,40
 77270,15,817,656,283,42,42
 77271,16,817,656,283,42,42
-77272,15,817,657,119,20,20
-77273,16,817,657,119,20,20
-77274,15,817,658,119,20,20
-77275,16,817,658,119,20,20
-77276,15,817,667,147,25,25
-77277,16,817,667,147,25,25
-77278,15,817,668,147,25,25
-77279,16,817,668,147,25,25
-77280,15,817,677,148,45,45
-77281,16,817,677,148,45,45
-77282,15,817,678,148,45,45
-77283,16,817,678,148,45,45
-77284,15,817,687,195,25,25
-77285,16,817,687,195,25,25
-77286,15,817,688,283,25,25
-77287,16,817,688,283,25,25
-77288,15,817,689,283,25,25
-77289,16,817,689,283,25,25
 77290,15,818,647,47,41,41
 77291,16,818,647,47,41,41
 77292,15,818,648,162,42,42
@@ -71549,24 +71477,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 77411,16,822,655,55,45,45
 77412,15,822,656,99,48,48
 77413,16,822,656,99,48,48
-77414,15,822,657,119,20,20
-77415,16,822,657,119,20,20
-77416,15,822,658,119,20,20
-77417,16,822,658,119,20,20
-77418,15,822,667,147,25,25
-77419,16,822,667,147,25,25
-77420,15,822,668,147,25,25
-77421,16,822,668,147,25,25
-77422,15,822,677,148,45,45
-77423,16,822,677,148,45,45
-77424,15,822,678,148,45,45
-77425,16,822,678,148,45,45
-77426,15,822,687,195,25,25
-77427,16,822,687,195,25,25
-77428,15,822,688,283,25,25
-77429,16,822,688,283,25,25
-77430,15,822,689,283,25,25
-77431,16,822,689,283,25,25
 77432,15,820,647,82,42,42
 77433,16,820,647,82,42,42
 77434,15,820,648,313,46,46
@@ -71595,24 +71505,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 77457,16,820,655,98,43,43
 77458,15,820,656,364,45,45
 77459,16,820,656,364,45,45
-77460,15,820,657,119,20,20
-77461,16,820,657,119,20,20
-77462,15,820,658,119,20,20
-77463,16,820,658,119,20,20
-77464,15,820,667,147,25,25
-77465,16,820,667,147,25,25
-77466,15,820,668,147,25,25
-77467,16,820,668,147,25,25
-77468,15,820,677,148,45,45
-77469,16,820,677,148,45,45
-77470,15,820,678,148,45,45
-77471,16,820,678,148,45,45
-77472,15,820,687,195,25,25
-77473,16,820,687,195,25,25
-77474,15,820,688,283,25,25
-77475,16,820,688,283,25,25
-77476,15,820,689,283,25,25
-77477,16,820,689,283,25,25
 77478,15,814,647,22,38,38
 77479,16,814,647,22,38,38
 77480,15,814,648,327,45,45
@@ -71645,21 +71537,3 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 77507,16,814,655,270,38,38
 77508,15,814,656,332,48,48
 77509,16,814,656,332,48,48
-77510,15,814,657,119,20,20
-77511,16,814,657,119,20,20
-77512,15,814,658,119,20,20
-77513,16,814,658,119,20,20
-77514,15,814,667,147,25,25
-77515,16,814,667,147,25,25
-77516,15,814,668,147,25,25
-77517,16,814,668,147,25,25
-77518,15,814,677,148,45,45
-77519,16,814,677,148,45,45
-77520,15,814,678,148,45,45
-77521,16,814,678,148,45,45
-77522,15,814,687,195,25,25
-77523,16,814,687,195,25,25
-77524,15,814,688,283,25,25
-77525,16,814,688,283,25,25
-77526,15,814,689,283,25,25
-77527,16,814,689,283,25,25

From f0e151107629a8824f09ef1f96a2f792aaa28e58 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Tue, 30 Jun 2026 20:59:34 -0700
Subject: [PATCH 5/5] Adjust naming

---
 data/v2/csv/encounter_condition_prose.csv     |   2 +-
 .../csv/encounter_condition_value_prose.csv   |   2 +-
 data/v2/csv/encounter_condition_values.csv    | 126 +++++++++---------
 data/v2/csv/encounter_conditions.csv          |   2 +-
 4 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv
index 6e75985e8..808a49c09 100644
--- a/data/v2/csv/encounter_condition_prose.csv
+++ b/data/v2/csv/encounter_condition_prose.csv
@@ -44,4 +44,4 @@ 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,Johto Safari Zone Block Replacement
+26,9,Johto Safari Zone Blocks
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index 0c60ad3e6..f67c46af5 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -377,7 +377,7 @@ 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,Encounter slot active when no block-based encounter is replacing it
+257,9,Not replaced by block-based encounter
 258,9,At least 2 Plains block points placed
 259,9,At least 3 Plains block points placed
 260,9,At least 4 Plains block points placed
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index bbe5e9114..c949f58e4 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -256,66 +256,66 @@ id,encounter_condition_id,identifier,is_default
 255,25,weather-fog,0
 256,9,story-progress-before-hall-of-fame,1
 257,26,johto-safari-blocks-inactive,1
-258,26,johto-safari-plains-blocks-min-2,0
-259,26,johto-safari-plains-blocks-min-3,0
-260,26,johto-safari-plains-blocks-min-4,0
-261,26,johto-safari-plains-blocks-min-5,0
-262,26,johto-safari-plains-blocks-min-6,0
-263,26,johto-safari-plains-blocks-min-10,0
-264,26,johto-safari-plains-blocks-min-12,0
-265,26,johto-safari-plains-blocks-min-14,0
-266,26,johto-safari-plains-blocks-min-15,0
-267,26,johto-safari-plains-blocks-min-24,0
-268,26,johto-safari-plains-blocks-min-28,0
-269,26,johto-safari-plains-blocks-min-35,0
-270,26,johto-safari-plains-blocks-min-49,0
-271,26,johto-safari-forest-blocks-min-3,0
-272,26,johto-safari-forest-blocks-min-4,0
-273,26,johto-safari-forest-blocks-min-5,0
-274,26,johto-safari-forest-blocks-min-8,0
-275,26,johto-safari-forest-blocks-min-10,0
-276,26,johto-safari-forest-blocks-min-14,0
-277,26,johto-safari-forest-blocks-min-15,0
-278,26,johto-safari-forest-blocks-min-18,0
-279,26,johto-safari-forest-blocks-min-20,0
-280,26,johto-safari-forest-blocks-min-28,0
-281,26,johto-safari-forest-blocks-min-35,0
-282,26,johto-safari-forest-blocks-min-42,0
-283,26,johto-safari-forest-blocks-min-49,0
-284,26,johto-safari-forest-blocks-min-56,0
-285,26,johto-safari-peak-blocks-min-3,0
-286,26,johto-safari-peak-blocks-min-4,0
-287,26,johto-safari-peak-blocks-min-5,0
-288,26,johto-safari-peak-blocks-min-6,0
-289,26,johto-safari-peak-blocks-min-8,0
-290,26,johto-safari-peak-blocks-min-10,0
-291,26,johto-safari-peak-blocks-min-15,0
-292,26,johto-safari-peak-blocks-min-21,0
-293,26,johto-safari-peak-blocks-min-24,0
-294,26,johto-safari-peak-blocks-min-28,0
-295,26,johto-safari-peak-blocks-min-35,0
-296,26,johto-safari-peak-blocks-min-42,0
-297,26,johto-safari-peak-blocks-min-49,0
-298,26,johto-safari-peak-blocks-min-56,0
-299,26,johto-safari-peak-blocks-min-63,0
-300,26,johto-safari-water-blocks-min-2,0
-301,26,johto-safari-water-blocks-min-3,0
-302,26,johto-safari-water-blocks-min-4,0
-303,26,johto-safari-water-blocks-min-5,0
-304,26,johto-safari-water-blocks-min-6,0
-305,26,johto-safari-water-blocks-min-7,0
-306,26,johto-safari-water-blocks-min-8,0
-307,26,johto-safari-water-blocks-min-9,0
-308,26,johto-safari-water-blocks-min-10,0
-309,26,johto-safari-water-blocks-min-12,0
-310,26,johto-safari-water-blocks-min-13,0
-311,26,johto-safari-water-blocks-min-14,0
-312,26,johto-safari-water-blocks-min-15,0
-313,26,johto-safari-water-blocks-min-16,0
-314,26,johto-safari-water-blocks-min-18,0
-315,26,johto-safari-water-blocks-min-20,0
-316,26,johto-safari-water-blocks-min-24,0
-317,26,johto-safari-water-blocks-min-28,0
-318,26,johto-safari-water-blocks-min-35,0
-319,26,johto-safari-water-blocks-min-42,0
-320,26,johto-safari-water-blocks-min-49,0
+258,26,johto-safari-blocks-plains-min-2,0
+259,26,johto-safari-blocks-plains-min-3,0
+260,26,johto-safari-blocks-plains-min-4,0
+261,26,johto-safari-blocks-plains-min-5,0
+262,26,johto-safari-blocks-plains-min-6,0
+263,26,johto-safari-blocks-plains-min-10,0
+264,26,johto-safari-blocks-plains-min-12,0
+265,26,johto-safari-blocks-plains-min-14,0
+266,26,johto-safari-blocks-plains-min-15,0
+267,26,johto-safari-blocks-plains-min-24,0
+268,26,johto-safari-blocks-plains-min-28,0
+269,26,johto-safari-blocks-plains-min-35,0
+270,26,johto-safari-blocks-plains-min-49,0
+271,26,johto-safari-blocks-forest-min-3,0
+272,26,johto-safari-blocks-forest-min-4,0
+273,26,johto-safari-blocks-forest-min-5,0
+274,26,johto-safari-blocks-forest-min-8,0
+275,26,johto-safari-blocks-forest-min-10,0
+276,26,johto-safari-blocks-forest-min-14,0
+277,26,johto-safari-blocks-forest-min-15,0
+278,26,johto-safari-blocks-forest-min-18,0
+279,26,johto-safari-blocks-forest-min-20,0
+280,26,johto-safari-blocks-forest-min-28,0
+281,26,johto-safari-blocks-forest-min-35,0
+282,26,johto-safari-blocks-forest-min-42,0
+283,26,johto-safari-blocks-forest-min-49,0
+284,26,johto-safari-blocks-forest-min-56,0
+285,26,johto-safari-blocks-peak-min-3,0
+286,26,johto-safari-blocks-peak-min-4,0
+287,26,johto-safari-blocks-peak-min-5,0
+288,26,johto-safari-blocks-peak-min-6,0
+289,26,johto-safari-blocks-peak-min-8,0
+290,26,johto-safari-blocks-peak-min-10,0
+291,26,johto-safari-blocks-peak-min-15,0
+292,26,johto-safari-blocks-peak-min-21,0
+293,26,johto-safari-blocks-peak-min-24,0
+294,26,johto-safari-blocks-peak-min-28,0
+295,26,johto-safari-blocks-peak-min-35,0
+296,26,johto-safari-blocks-peak-min-42,0
+297,26,johto-safari-blocks-peak-min-49,0
+298,26,johto-safari-blocks-peak-min-56,0
+299,26,johto-safari-blocks-peak-min-63,0
+300,26,johto-safari-blocks-water-min-2,0
+301,26,johto-safari-blocks-water-min-3,0
+302,26,johto-safari-blocks-water-min-4,0
+303,26,johto-safari-blocks-water-min-5,0
+304,26,johto-safari-blocks-water-min-6,0
+305,26,johto-safari-blocks-water-min-7,0
+306,26,johto-safari-blocks-water-min-8,0
+307,26,johto-safari-blocks-water-min-9,0
+308,26,johto-safari-blocks-water-min-10,0
+309,26,johto-safari-blocks-water-min-12,0
+310,26,johto-safari-blocks-water-min-13,0
+311,26,johto-safari-blocks-water-min-14,0
+312,26,johto-safari-blocks-water-min-15,0
+313,26,johto-safari-blocks-water-min-16,0
+314,26,johto-safari-blocks-water-min-18,0
+315,26,johto-safari-blocks-water-min-20,0
+316,26,johto-safari-blocks-water-min-24,0
+317,26,johto-safari-blocks-water-min-28,0
+318,26,johto-safari-blocks-water-min-35,0
+319,26,johto-safari-blocks-water-min-42,0
+320,26,johto-safari-blocks-water-min-49,0
diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv
index fe53222d1..6e802868d 100644
--- a/data/v2/csv/encounter_conditions.csv
+++ b/data/v2/csv/encounter_conditions.csv
@@ -24,4 +24,4 @@ id,identifier
 23,save-data
 24,alolan-diglett-found
 25,weather
-26,johto-safari-block-replacement
+26,johto-safari-blocks