From f287bebde429f1dbaa0f00a2eaaa92a99c845e4a Mon Sep 17 00:00:00 2001
From: George Rodriguez <GRodriguez@ocde.us>
Date: Tue, 3 Feb 2026 16:18:46 -0800
Subject: [PATCH 01/11] feat: add horde encounter information pt 1

---
 data/v2/csv/encounter_method_prose.csv |   1 +
 data/v2/csv/encounter_methods.csv      |   1 +
 data/v2/csv/encounter_slots.csv        |  83 ++++++++
 data/v2/csv/encounters.csv             | 258 ++++++++++++++++++++++++-
 data/v2/csv/location_areas.csv         |   2 +-
 5 files changed, 342 insertions(+), 3 deletions(-)

diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv
index 2dd0f0f06..2ce3a3a48 100644
--- a/data/v2/csv/encounter_method_prose.csv
+++ b/data/v2/csv/encounter_method_prose.csv
@@ -78,3 +78,4 @@ encounter_method_id,local_language_id,name
 30,5,En utilisant le Devon Scope
 31,9,Fishing in a Feebas Tile
 31,5,En pêchant sur une tuile à Barpau
+38,9,"Walking in grass, flowers, terrain, or in a cave"
\ No newline at end of file
diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv
index e0089172a..ac457313b 100644
--- a/data/v2/csv/encounter_methods.csv
+++ b/data/v2/csv/encounter_methods.csv
@@ -36,3 +36,4 @@ id,identifier,order
 35,berry-piles,35
 36,npc-trade,36
 37,sos-from-bubbling-spot,37
+38,horde,38
diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index a4929e3f9..0eb274302 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1171,3 +1171,86 @@ id,version_group_id,encounter_method_id,slot,rarity
 1170,28,18,,100
 1171,28,20,,100
 1172,28,21,,100
+1173,15,38,1,35
+1174,15,38,2,60
+1175,15,38,3,5
+1176,15,38,1,60
+1177,15,38,2,35
+1178,15,38,3,5
+1179,15,38,4,5
+1180,15,38,1,35
+1181,15,38,2,5
+1182,15,38,3,60
+1183,15,38,1,5
+1184,15,38,2,60
+1185,15,38,3,35
+1186,15,38,1,35
+1187,15,38,2,5
+1188,15,38,3,5
+1189,15,38,4,60
+1190,15,38,1,35
+1191,15,38,2,5
+1192,15,38,3,60
+1193,15,38,1,60
+1194,15,38,2,35
+1195,15,38,3,5
+1196,15,38,4,35
+1197,15,38,1,5
+1198,15,38,2,5
+1199,15,38,3,60
+1200,15,38,4,35
+1201,15,38,1,35
+1202,15,38,2,60
+1203,15,38,3,5
+1204,15,38,1,5
+1205,15,38,2,60
+1206,15,38,3,35
+1207,15,38,4,35
+1208,15,38,1,35
+1209,15,38,2,5
+1210,15,38,3,60
+1211,15,38,4,5
+1212,15,38,1,60
+1213,15,38,2,60
+1214,15,38,3,5
+1215,15,38,4,35
+1216,15,38,1,5
+1217,15,38,2,35
+1218,15,38,3,5
+1219,15,38,4,60
+1220,15,38,1,5
+1221,15,38,2,60
+1222,15,38,3,35
+1223,15,38,1,60
+1224,15,38,2,35
+1225,15,38,3,5
+1226,15,38,1,60
+1227,15,38,2,5
+1228,15,38,3,35
+1229,15,38,4,5
+1230,15,38,1,5
+1231,15,38,2,60
+1232,15,38,3,35
+1233,15,38,1,5
+1234,15,38,2,60
+1235,15,38,3,35
+1236,15,38,4,5
+1237,15,38,1,5
+1238,15,38,2,60
+1239,15,38,3,35
+1240,16,38,1,35
+1241,16,38,2,60
+1242,16,38,3,5
+1243,16,38,1,100
+1244,16,38,1,60
+1245,16,38,2,35
+1246,16,38,3,35
+1247,16,38,4,5
+1248,16,38,1,60
+1249,16,38,2,40
+1250,16,38,1,60
+1251,16,38,2,5
+1252,16,38,3,5
+1253,16,38,4,35
+1254,16,38,1,35
+1255,16,38,2,65
\ No newline at end of file
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 399394649..399b9f8be 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -45264,7 +45264,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 48974,23,750,420,108,59,59
 48975,23,750,421,634,59,59
 48976,23,750,422,634,59,59
-48977,23,751,471,271,57,57
+48977,23,751,471,271,57,59
 48978,23,751,472,419,57,57
 48979,23,751,473,271,58,58
 48980,23,751,474,419,59,59
@@ -46359,7 +46359,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 50069,24,750,420,108,59,59
 50070,24,750,421,634,59,59
 50071,24,750,422,634,59,59
-50072,24,751,471,271,57,57
+50072,24,751,471,271,57,59
 50073,24,751,472,419,57,57
 50074,24,751,473,271,58,58
 50075,24,751,474,419,59,59
@@ -63266,3 +63266,257 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 68749,45,330,1171,100,40,40
 68750,45,330,1171,100,40,40
 68751,45,330,1171,101,43,43
+68752,23,753,1173,41,8,8
+68753,23,753,1174,293,7,7
+68754,23,753,1175,610,8,8
+68755,24,753,1173,41,8,8
+68756,24,753,1174,293,7,7
+68757,24,753,1175,610,8,8
+68758,23,738,1176,439,11,11
+68759,23,738,1177,524,11,11
+68760,23,738,1178,524,11,11
+68761,23,738,1179,703,11,11
+68762,23,739,1176,439,11,11
+68763,23,739,1177,524,11,11
+68764,23,739,1178,524,11,11
+68765,23,739,1179,703,11,11
+68766,23,740,1176,439,11,11
+68767,23,740,1177,524,11,11
+68768,23,740,1178,524,11,11
+68769,23,740,1179,703,11,11
+68770,23,741,1176,439,11,11
+68771,23,741,1177,524,11,11
+68772,23,741,1178,524,11,11
+68773,23,741,1179,703,11,11
+68774,24,738,1176,439,11,11
+68775,24,738,1177,524,11,11
+68776,24,738,1178,524,11,11
+68777,24,738,1179,703,11,11
+68778,24,739,1176,439,11,11
+68779,24,739,1177,524,11,11
+68780,24,739,1178,524,11,11
+68781,24,739,1179,703,11,11
+68782,24,740,1176,439,11,11
+68783,24,740,1177,524,11,11
+68784,24,740,1178,524,11,11
+68785,24,740,1179,703,11,11
+68786,24,741,1176,439,11,11
+68787,24,741,1177,524,11,11
+68788,24,741,1178,524,11,11
+68789,24,741,1179,703,11,11
+68790,23,760,1180,79,13,13
+68791,23,760,1181,102,14,14
+68792,23,760,1182,278,13,13
+68793,24,760,1180,79,13,13
+68794,24,760,1181,102,14,14
+68795,24,760,1182,278,13,13
+68796,23,742,1183,238,21,21
+68797,23,742,1184,582,20,20
+68798,23,742,1185,613,20,20
+68799,23,743,1183,238,21,21
+68800,23,743,1184,582,20,20
+68801,23,743,1185,613,20,20
+68802,23,744,1183,238,21,21
+68803,23,744,1184,582,20,20
+68804,23,744,1185,613,20,20
+68805,23,745,1183,238,21,21
+68806,23,745,1184,582,20,20
+68807,23,745,1185,613,20,20
+68808,23,746,1183,238,21,21
+68809,23,746,1184,582,20,20
+68810,23,746,1185,613,20,20
+68811,24,742,1183,238,21,21
+68812,24,742,1184,582,20,20
+68813,24,742,1185,613,20,20
+68814,24,743,1183,238,21,21
+68815,24,743,1184,582,20,20
+68816,24,743,1185,613,20,20
+68817,24,744,1183,238,21,21
+68818,24,744,1184,582,20,20
+68819,24,744,1185,613,20,20
+68820,24,745,1183,238,21,21
+68821,24,745,1184,582,20,20
+68822,24,745,1185,613,20,20
+68823,24,746,1183,238,21,21
+68824,24,746,1184,582,20,20
+68825,24,746,1185,613,20,20
+68826,23,754,1186,74,23,23
+68827,24,754,1186,74,23,23
+68828,23,754,1187,246,24,24
+68829,24,754,1188,304,24,24
+68830,23,754,1189,632,23,23
+68831,24,754,1189,632,23,23
+68832,23,755,1186,74,23,23
+68833,24,755,1186,74,23,23
+68834,23,755,1187,246,24,24
+68835,24,755,1188,304,24,24
+68836,23,755,1189,632,23,23
+68837,24,755,1189,632,23,23
+68838,23,756,1186,74,23,23
+68839,24,756,1186,74,23,23
+68840,23,756,1187,246,24,24
+68841,24,756,1188,304,24,24
+68842,23,756,1189,632,23,23
+68843,24,756,1189,632,23,23
+68844,23,757,1186,74,23,23
+68845,24,757,1186,74,23,23
+68846,23,757,1187,246,24,24
+68847,24,757,1188,304,24,24
+68848,23,757,1189,632,23,23
+68849,24,757,1189,632,23,23
+68850,23,758,1186,74,23,23
+68851,24,758,1186,74,23,23
+68852,23,758,1187,246,24,24
+68853,24,758,1188,304,24,24
+68854,23,758,1189,632,23,23
+68855,24,758,1189,632,23,23
+68856,23,747,1190,60,25,25
+68857,23,747,1191,271,25,25
+68858,23,747,1192,590,25,25
+68859,24,747,1190,60,25,25
+68860,24,747,1191,271,25,25
+68861,24,747,1192,590,25,25
+68862,23,748,1193,74,28,28
+68863,23,748,1195,108,30,30
+68864,23,748,1196,419,29,29
+68865,23,749,1193,74,28,28
+68866,23,749,1194,75,29,29
+68867,23,749,1195,108,30,30
+68868,23,750,1193,74,28,28
+68869,23,750,1194,75,29,29
+68870,23,750,1195,108,30,30
+68871,23,752,1193,74,28,28
+68872,23,752,1195,108,30,30
+68873,23,752,1196,419,29,29
+68874,24,748,1193,74,28,28
+68875,24,748,1195,108,30,30
+68876,24,748,1196,419,29,29
+68877,24,749,1193,74,28,28
+68878,24,749,1194,75,29,29
+68879,24,749,1195,108,30,30
+68880,24,750,1193,74,28,28
+68881,24,750,1194,75,29,29
+68882,24,750,1195,108,30,30
+68883,24,752,1193,74,28,28
+68884,24,752,1195,108,30,30
+68885,24,752,1196,419,29,29
+68886,23,716,1197,311,6,6
+68887,23,716,1198,312,6,6
+68888,23,716,1199,316,5,5
+68889,23,716,1200,559,5,5
+68890,24,716,1197,311,6,6
+68891,24,716,1198,312,6,6
+68892,24,716,1199,316,5,5
+68893,24,716,1200,559,5,5
+68894,23,718,1201,54,7,7
+68895,23,718,1202,187,7,7
+68896,23,718,1203,315,8,8
+68897,24,718,1201,54,7,7
+68898,24,718,1202,187,7,7
+68899,24,718,1203,315,8,8
+68900,23,719,1204,276,7,7
+68901,23,719,1205,278,7,7
+68902,23,719,1206,335,8,8
+68903,23,719,1207,336,8,8
+68904,24,719,1204,276,7,7
+68905,24,719,1205,278,7,7
+68906,24,719,1206,335,8,8
+68907,24,719,1207,336,8,8
+68908,23,721,1208,193,10,10
+68909,23,721,1209,228,11,11
+68910,23,721,1210,299,10,10
+68911,24,721,1208,193,10,10
+68912,24,721,1211,309,11,11
+68913,24,721,1210,299,10,10
+68914,23,722,1212,29,11,11
+68915,23,722,1213,32,11,11
+68916,23,722,1214,396,12,12
+68917,23,722,1215,434,11,11
+68918,24,722,1212,29,11,11
+68919,24,722,1213,32,11,11
+68920,24,722,1214,396,12,12
+68921,24,722,1215,434,11,11
+68922,23,723,1216,128,14,14
+68923,23,723,1217,179,13,13
+68924,23,723,1218,241,14,14
+68925,23,723,1219,278,13,13
+68926,24,723,1216,128,14,14
+68927,24,723,1217,179,13,13
+68928,24,723,1218,241,14,14
+68929,24,723,1219,278,13,13
+68930,23,725,1220,23,17,17
+68931,23,725,1221,69,16,16
+68932,23,725,1222,451,16,16
+68933,24,725,1220,23,17,17
+68934,24,725,1221,69,16,16
+68935,24,725,1222,451,16,16
+68936,23,726,1223,198,18,18
+68937,23,726,1224,590,18,18
+68938,23,726,1225,707,19,19
+68939,24,726,1223,198,18,18
+68940,24,726,1224,590,18,18
+68941,24,727,1225,707,19,19
+68942,23,727,1223,198,18,18
+68943,23,727,1224,590,18,18
+68944,23,727,1225,707,19,19
+68945,24,727,1223,198,18,18
+68946,24,727,1224,590,18,18
+68947,24,727,1225,707,19,19
+68948,23,729,1226,74,23,23
+68949,23,729,1227,631,23,23
+68950,23,729,1228,632,23,23
+68951,23,729,1229,632,23,23
+68952,24,729,1226,74,23,23
+68953,24,729,1227,631,23,23
+68954,24,729,1228,632,23,23
+68955,24,729,1229,632,23,23
+68956,23,730,1230,24,25,25
+68957,23,730,1231,70,24,24
+68958,23,730,1232,207,24,24
+68959,24,730,1230,24,25,25
+68960,24,730,1231,70,24,24
+68961,24,730,1232,207,24,24
+68962,23,731,1233,185,25,25
+68963,23,731,1234,590,25,25
+68964,23,731,1235,709,25,25
+68965,23,731,1236,709,25,25
+68966,24,731,1233,185,25,25
+68967,24,731,1234,590,25,25
+68968,24,731,1235,709,25,25
+68969,24,731,1236,709,25,25
+68970,23,732,1237,123,27,27
+68971,23,732,1238,327,26,26
+68972,23,732,1239,333,26,26
+68973,24,732,1237,123,27,27
+68974,24,732,1238,327,26,26
+68975,24,732,1239,333,26,26
+68976,25,365,1240,263,3,3
+68977,25,365,1241,265,3,3
+68978,25,365,1242,285,3,3
+68979,26,365,1240,263,3,3
+68980,26,365,1241,265,3,3
+68981,26,365,1242,285,3,3
+68982,25,360,1243,293,5,5
+68983,26,360,1243,293,5,5
+68984,25,361,1244,41,6,6
+68985,25,361,1245,74,6,6
+68986,25,361,1246,296,6,6
+68987,25,361,1247,296,6,6
+68988,26,361,1244,41,6,6
+68989,26,361,1245,74,6,6
+68990,26,361,1246,296,6,6
+68991,26,361,1247,296,6,6
+68992,25,362,1248,41,6,6
+68993,25,362,1249,304,6,6
+68994,26,362,1248,41,6,6
+68995,26,362,1249,304,6,6
+68996,25,363,1250,41,6,6
+68997,26,363,1250,41,6,6
+68998,26,363,1251,302,6,6
+68999,25,363,1252,303,6,6
+69000,25,363,1253,304,6,6
+69001,26,363,1253,304,6,6
+69002,25,388,1254,81,12,12
+69003,25,388,1255,100,12,12
+69004,26,388,1254,81,12,12
+69005,26,388,1255,100,12,12
\ No newline at end of file
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index c78f8644c..248f1c98c 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -640,7 +640,7 @@ id,location_id,game_index,identifier
 748,657,0,unknown-area-322
 749,657,0,unknown-area-324
 750,657,0,unknown-area-326
-751,657,0,unknown-area-327
+751,657,0,outside
 752,657,0,unknown-area-328
 753,672,0,
 754,676,0,1f

From 91085959e147878365828c67b45bdb0c24b4f4ff Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Tue, 3 Feb 2026 22:44:18 -0800
Subject: [PATCH 02/11] feat: add horde encounter info for xy and oras

---
 data/v2/csv/encounter_slots.csv |  75 ++++++++++-
 data/v2/csv/encounters.csv      | 214 +++++++++++++++++++++++++++++++-
 2 files changed, 287 insertions(+), 2 deletions(-)

diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 0eb274302..eec538809 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1253,4 +1253,77 @@ id,version_group_id,encounter_method_id,slot,rarity
 1252,16,38,3,5
 1253,16,38,4,35
 1254,16,38,1,35
-1255,16,38,2,65
\ No newline at end of file
+1255,16,38,2,65
+1256,16,38,1,35
+1257,16,38,2,35
+1258,16,38,3,5
+1259,16,38,4,60
+1260,16,38,1,65
+1261,16,38,2,35
+1262,16,38,1,100
+1263,16,38,1,95
+1264,16,38,2,5
+1265,16,38,1,100
+1266,16,38,1,35
+1267,16,38,2,5
+1268,16,38,3,60
+1269,16,38,1,100
+1270,16,38,1,5
+1271,16,38,2,35
+1272,16,38,3,60
+1273,16,38,1,40
+1274,16,38,2,60
+1275,16,38,1,60
+1276,16,38,2,5
+1277,16,38,3,35
+1278,16,38,1,100
+1279,16,38,1,60
+1280,16,38,2,35
+1281,16,38,3,5
+1282,16,38,1,60
+1283,16,38,2,5
+1284,16,38,3,35
+1285,16,38,1,5
+1286,16,38,2,95
+1287,16,38,1,60
+1288,16,38,2,35
+1289,16,38,3,35
+1290,16,38,4,5
+1291,16,38,1,35
+1292,16,38,2,60
+1293,16,38,3,5
+1294,16,38,1,95
+1295,16,38,2,5
+1296,16,38,3,5
+1297,16,38,1,60
+1298,16,38,2,35
+1299,16,38,3,5
+1300,16,38,4,35
+1301,16,38,5,5
+1302,16,38,1,100
+1303,16,38,1,35
+1304,16,38,2,65
+1305,16,38,1,5
+1306,16,38,2,95
+1307,16,38,1,35
+1308,16,38,2,35
+1309,16,38,3,35
+1310,16,38,4,65
+1311,16,38,1,100
+1312,16,38,1,60
+1313,16,38,2,35
+1314,16,38,3,5
+1315,16,38,1,60
+1316,16,38,2,5
+1317,16,38,3,60
+1318,16,38,4,35
+1319,16,38,1,35
+1320,16,38,2,60
+1321,16,38,3,5
+1322,16,38,1,100
+1323,16,38,1,60
+1324,16,38,2,35
+1325,16,38,3,5
+1326,16,38,1,35
+1327,16,38,2,5
+1328,16,38,3,60
\ No newline at end of file
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 399b9f8be..277fa35fe 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -63519,4 +63519,216 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 69002,25,388,1254,81,12,12
 69003,25,388,1255,100,12,12
 69004,26,388,1254,81,12,12
-69005,26,388,1255,100,12,12
\ No newline at end of file
+69005,26,388,1255,100,12,12
+69006,26,367,1256,88,8,8
+69007,25,367,1257,109,8,8
+69008,25,367,1258,218,8,8
+69009,25,367,1259,322,8,8
+69010,26,367,1258,218,8,8
+69011,26,367,1259,322,8,8
+69012,25,366,1260,66,10,10
+69013,25,366,1261,325,10,10
+69014,26,366,1260,66,10,10
+69015,26,366,1261,325,10,10
+69016,25,356,1262,41,9,9
+69017,25,357,1262,41,20,20
+69018,25,358,1262,41,20,20
+69019,25,359,1263,41,20,20
+69020,25,359,1264,371,20,20
+69021,26,356,1262,41,9,9
+69022,26,357,1262,41,20,20
+69023,26,358,1262,41,20,20
+69024,26,359,1263,41,20,20
+69025,26,359,1264,371,20,20
+69026,25,1186,1265,41,14,14
+69027,25,1187,1265,41,14,14
+69028,25,1188,1265,41,14,14
+69029,26,1186,1265,41,14,14
+69030,26,1187,1265,41,14,14
+69031,26,1188,1265,41,14,14
+69032,25,429,1266,43,15,15
+69033,25,429,1267,54,15,15
+69034,25,429,1268,84,15,15
+69035,25,430,1266,43,15,15
+69036,25,430,1267,54,15,15
+69037,25,430,1268,84,15,15
+69038,25,431,1266,43,15,15
+69039,25,431,1267,54,15,15
+69040,25,431,1268,84,15,15
+69041,25,432,1266,43,15,15
+69042,25,432,1267,54,15,15
+69043,25,432,1268,84,15,15
+69044,26,429,1266,43,15,15
+69045,26,429,1267,54,15,15
+69046,26,429,1268,84,15,15
+69047,26,430,1266,43,15,15
+69048,26,430,1267,54,15,15
+69049,26,430,1268,84,15,15
+69050,26,431,1266,43,15,15
+69051,26,431,1267,54,15,15
+69052,26,431,1268,84,15,15
+69053,26,432,1266,43,15,15
+69054,26,432,1267,54,15,15
+69055,26,432,1268,84,15,15
+69056,25,368,1269,353,15,15
+69057,25,369,1269,353,15,15
+69058,25,370,1269,353,15,15
+69059,25,371,1269,353,15,15
+69060,26,368,1269,353,15,15
+69061,26,369,1269,353,15,15
+69062,26,370,1269,353,15,15
+69063,26,371,1269,353,15,15
+69064,25,374,1270,37,15,15
+69065,25,374,1271,307,15,15
+69066,25,374,1272,353,15,15
+69067,26,374,1270,37,15,15
+69068,26,374,1271,307,15,15
+69069,26,374,1272,353,15,15
+69070,25,375,1270,37,15,15
+69071,25,375,1271,307,15,15
+69072,25,375,1272,353,15,15
+69073,26,375,1270,37,15,15
+69074,26,375,1271,307,15,15
+69075,26,375,1272,353,15,15
+69076,25,385,1273,41,17,17
+69077,25,385,1274,363,17,17
+69078,25,386,1275,41,17,17
+69079,25,386,1276,361,17,17
+69080,25,386,1277,363,17,17
+69081,26,385,1273,41,17,17
+69082,26,385,1274,363,17,17
+69083,26,386,1275,41,17,17
+69084,26,386,1276,361,17,17
+69085,26,386,1277,363,17,17
+69086,25,376,1278,41,18,18
+69087,26,376,1278,41,18,18
+69088,25,377,1278,41,18,18
+69089,26,377,1278,41,18,18
+69090,25,378,1278,41,18,18
+69091,26,378,1278,41,18,18
+69092,25,379,1278,41,18,18
+69093,26,379,1278,41,18,18
+69094,25,380,1278,41,18,18
+69095,26,380,1278,41,18,18
+69096,25,381,1278,41,18,18
+69097,26,381,1278,41,18,18
+69098,25,390,1279,42,23,23
+69099,25,390,1280,168,23,23
+69100,25,390,1281,333,23,23
+69101,25,391,1279,42,23,23
+69102,25,391,1280,168,23,23
+69103,25,391,1281,333,23,23
+69104,25,392,1279,42,23,23
+69105,25,392,1280,168,23,23
+69106,25,392,1281,333,23,23
+69107,26,390,1279,42,23,23
+69108,26,390,1280,168,23,23
+69109,26,390,1281,333,23,23
+69110,26,391,1279,42,23,23
+69111,26,391,1280,168,23,23
+69112,26,391,1281,333,23,23
+69113,26,392,1279,42,23,23
+69114,26,392,1280,168,23,23
+69115,26,392,1281,333,23,23
+69116,25,382,1282,41,20,20
+69117,25,382,1283,294,20,20
+69118,25,382,1284,304,20,20
+69119,25,383,1282,41,20,20
+69120,25,383,1283,294,20,20
+69121,25,383,1284,304,20,20
+69122,26,382,1282,41,20,20
+69123,26,382,1283,294,20,20
+69124,26,382,1284,304,20,20
+69125,26,383,1282,41,20,20
+69126,26,383,1283,294,20,20
+69127,26,383,1284,304,20,20
+69128,25,393,1285,261,2,2
+69129,25,393,1286,263,2,2
+69130,26,393,1285,261,2,2
+69131,26,393,1286,263,2,2
+69132,25,394,1287,263,2,2
+69133,26,394,1287,263,2,2
+69134,26,394,1288,270,2,2
+69135,25,394,1289,273,2,2
+69136,25,394,1290,280,2,2
+69137,26,394,1290,280,2,2
+69138,25,395,1291,261,2,2
+69139,25,395,1292,263,2,2
+69140,25,395,1293,278,2,2
+69141,26,395,1291,261,2,2
+69142,26,395,1292,263,2,2
+69143,26,395,1293,278,2,2
+69144,25,396,1294,263,2,2
+69145,25,396,1295,278,2,2
+69146,25,396,1296,276,3,3
+69147,26,396,1294,263,2,2
+69148,26,396,1295,278,2,2
+69149,26,396,1296,276,3,3
+69150,25,402,1297,81,6,6
+69151,26,402,1297,81,6,6
+69152,26,402,1298,311,6,6
+69153,25,402,1299,311,6,6
+69154,26,402,1299,311,6,6
+69155,25,402,1300,312,6,6
+69156,25,402,1301,312,6,6
+69157,26,402,1301,312,6,6
+69158,25,403,1302,27,11,11
+69159,26,403,1302,27,11,11
+69160,25,404,1303,66,8,8
+69161,25,404,1304,322,8,8
+69162,26,404,1303,66,8,8
+69163,26,404,1304,322,8,8
+69164,25,405,1305,227,9,9
+69165,25,405,1306,327,9,9
+69166,26,405,1305,227,9,9
+69167,26,405,1306,327,9,9
+69168,25,406,1307,270,9,9
+69169,25,406,1308,273,9,9
+69170,25,406,1309,333,9,9
+69171,25,406,1310,333,9,9
+69172,26,406,1307,270,9,9
+69173,26,406,1308,273,9,9
+69174,26,406,1309,333,9,9
+69175,26,406,1310,333,9,9
+69176,25,407,1311,333,10,10
+69177,26,407,1311,333,10,10
+69178,25,408,1312,263,4,4
+69179,25,408,1313,290,4,4
+69180,25,408,1314,300,4,4
+69181,26,408,1312,263,4,4
+69182,26,408,1313,290,4,4
+69183,26,408,1314,300,4,4
+69184,25,409,1315,43,7,7
+69185,25,409,1316,183,7,7
+69186,25,409,1317,263,7,7
+69187,25,409,1318,315,7,7
+69188,26,409,1315,43,7,7
+69189,26,409,1316,183,7,7
+69190,26,409,1317,263,7,7
+69191,26,409,1318,315,7,7
+69192,25,410,1319,278,12,12
+69193,25,410,1320,309,12,12
+69194,25,410,1321,352,12,12
+69195,26,410,1319,278,12,12
+69196,26,410,1320,309,12,12
+69197,26,410,1321,352,12,12
+69198,25,411,1322,43,12,12
+69199,26,411,1322,43,12,12
+69200,25,412,1323,43,13,13
+69201,25,412,1324,183,13,13
+69202,25,412,1325,352,13,13
+69203,26,412,1323,43,13,13
+69204,26,412,1324,183,13,13
+69205,26,412,1325,352,13,13
+69206,25,413,1326,278,15,15
+69207,25,413,1327,352,15,15
+69208,25,413,1328,353,15,15
+69209,26,413,1326,278,15,15
+69210,26,413,1327,352,15,15
+69211,26,413,1328,353,15,15
+69212,25,415,1326,278,15,15
+69213,25,415,1327,352,15,15
+69214,25,415,1328,353,15,15
+69215,26,415,1326,278,15,15
+69216,26,415,1327,352,15,15
+69217,26,415,1328,353,15,15
\ No newline at end of file

From 4c187d7b045c4a7e531c61dd12fbf0d5058b69b5 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Fri, 20 Feb 2026 11:20:20 -0800
Subject: [PATCH 03/11] Update encounter method description for clarity

---
 data/v2/csv/encounter_method_prose.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv
index 8ad37e96a..3ed5d0cff 100644
--- a/data/v2/csv/encounter_method_prose.csv
+++ b/data/v2/csv/encounter_method_prose.csv
@@ -90,4 +90,4 @@ encounter_method_id,local_language_id,name
 42,9,Rare spawn in the sky with lure or catch combo
 43,5,Apparition rare dans l'eau avec un parfum ou un combo capture
 43,9,Rare spawn in water with lure or catch combo
-44,9,"Walking in grass, flowers, terrain, or in a cave"
+44,9,"Encountering 5 Pokemon within grass, flowers, or wthin a cave"

From 782d56e349642b202e8d1ad5cd8a2284aa85b803 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Fri, 20 Feb 2026 11:21:46 -0800
Subject: [PATCH 04/11] Update encounter slots in CSV file

Updated Encounter Method Id to match Horde Encounter Id
---
 data/v2/csv/encounter_slots.csv | 312 ++++++++++++++++----------------
 1 file changed, 156 insertions(+), 156 deletions(-)

diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 585f6655f..f27937618 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1179,159 +1179,159 @@ id,version_group_id,encounter_method_id,slot,rarity
 1178,19,42,,100
 1179,19,36,,100
 1180,19,43,,100
-1181,15,38,1,35
-1182,15,38,2,60
-1183,15,38,3,5
-1184,15,38,1,60
-1185,15,38,2,35
-1186,15,38,3,5
-1187,15,38,4,5
-1188,15,38,1,35
-1189,15,38,2,5
-1190,15,38,3,60
-1191,15,38,1,5
-1192,15,38,2,60
-1193,15,38,3,35
-1194,15,38,1,35
-1195,15,38,2,5
-1196,15,38,3,5
-1197,15,38,4,60
-1198,15,38,1,35
-1199,15,38,2,5
-1200,15,38,3,60
-1201,15,38,1,60
-1202,15,38,2,35
-1203,15,38,3,5
-1204,15,38,4,35
-1205,15,38,1,5
-1206,15,38,2,5
-1207,15,38,3,60
-1208,15,38,4,35
-1209,15,38,1,35
-1210,15,38,2,60
-1211,15,38,3,5
-1212,15,38,1,5
-1213,15,38,2,60
-1214,15,38,3,35
-1215,15,38,4,35
-1216,15,38,1,35
-1217,15,38,2,5
-1218,15,38,3,60
-1219,15,38,4,5
-1220,15,38,1,60
-1221,15,38,2,60
-1222,15,38,3,5
-1223,15,38,4,35
-1224,15,38,1,5
-1225,15,38,2,35
-1226,15,38,3,5
-1227,15,38,4,60
-1228,15,38,1,5
-1229,15,38,2,60
-1230,15,38,3,35
-1231,15,38,1,60
-1232,15,38,2,35
-1233,15,38,3,5
-1234,15,38,1,60
-1235,15,38,2,5
-1236,15,38,3,35
-1237,15,38,4,5
-1238,15,38,1,5
-1239,15,38,2,60
-1240,15,38,3,35
-1241,15,38,1,5
-1242,15,38,2,60
-1243,15,38,3,35
-1244,15,38,4,5
-1245,15,38,1,5
-1246,15,38,2,60
-1247,15,38,3,35
-1248,16,38,1,35
-1249,16,38,2,60
-1250,16,38,3,5
-1251,16,38,1,100
-1252,16,38,1,60
-1253,16,38,2,35
-1254,16,38,3,35
-1255,16,38,4,5
-1256,16,38,1,60
-1257,16,38,2,40
-1258,16,38,1,60
-1259,16,38,2,5
-1260,16,38,3,5
-1261,16,38,4,35
-1262,16,38,1,35
-1263,16,38,2,65
-1264,16,38,1,35
-1265,16,38,2,35
-1266,16,38,3,5
-1267,16,38,4,60
-1268,16,38,1,65
-1269,16,38,2,35
-1270,16,38,1,100
-1271,16,38,1,95
-1272,16,38,2,5
-1273,16,38,1,100
-1274,16,38,1,35
-1275,16,38,2,5
-1276,16,38,3,60
-1277,16,38,1,100
-1278,16,38,1,5
-1279,16,38,2,35
-1280,16,38,3,60
-1281,16,38,1,40
-1282,16,38,2,60
-1283,16,38,1,60
-1284,16,38,2,5
-1285,16,38,3,35
-1286,16,38,1,100
-1287,16,38,1,60
-1288,16,38,2,35
-1289,16,38,3,5
-1290,16,38,1,60
-1291,16,38,2,5
-1292,16,38,3,35
-1293,16,38,1,5
-1294,16,38,2,95
-1295,16,38,1,60
-1296,16,38,2,35
-1297,16,38,3,35
-1298,16,38,4,5
-1299,16,38,1,35
-1300,16,38,2,60
-1301,16,38,3,5
-1302,16,38,1,95
-1303,16,38,2,5
-1304,16,38,3,5
-1305,16,38,1,60
-1306,16,38,2,35
-1307,16,38,3,5
-1308,16,38,4,35
-1309,16,38,5,5
-1310,16,38,1,100
-1311,16,38,1,35
-1312,16,38,2,65
-1313,16,38,1,5
-1314,16,38,2,95
-1315,16,38,1,35
-1316,16,38,2,35
-1317,16,38,3,35
-1318,16,38,4,65
-1319,16,38,1,100
-1320,16,38,1,60
-1321,16,38,2,35
-1322,16,38,3,5
-1323,16,38,1,60
-1324,16,38,2,5
-1325,16,38,3,60
-1326,16,38,4,35
-1327,16,38,1,35
-1328,16,38,2,60
-1329,16,38,3,5
-1330,16,38,1,100
-1331,16,38,1,60
-1332,16,38,2,35
-1333,16,38,3,5
-1334,16,38,1,35
-1335,16,38,2,5
-1336,16,38,3,60
\ No newline at end of file
+1181,15,44,1,35
+1182,15,44,2,60
+1183,15,44,3,5
+1184,15,44,1,60
+1185,15,44,2,35
+1186,15,44,3,5
+1187,15,44,4,5
+1188,15,44,1,35
+1189,15,44,2,5
+1190,15,44,3,60
+1191,15,44,1,5
+1192,15,44,2,60
+1193,15,44,3,35
+1194,15,44,1,35
+1195,15,44,2,5
+1196,15,44,3,5
+1197,15,44,4,60
+1198,15,44,1,35
+1199,15,44,2,5
+1200,15,44,3,60
+1201,15,44,1,60
+1202,15,44,2,35
+1203,15,44,3,5
+1204,15,44,4,35
+1205,15,44,1,5
+1206,15,44,2,5
+1207,15,44,3,60
+1208,15,44,4,35
+1209,15,44,1,35
+1210,15,44,2,60
+1211,15,44,3,5
+1212,15,44,1,5
+1213,15,44,2,60
+1214,15,44,3,35
+1215,15,44,4,35
+1216,15,44,1,35
+1217,15,44,2,5
+1218,15,44,3,60
+1219,15,44,4,5
+1220,15,44,1,60
+1221,15,44,2,60
+1222,15,44,3,5
+1223,15,44,4,35
+1224,15,44,1,5
+1225,15,44,2,35
+1226,15,44,3,5
+1227,15,44,4,60
+1228,15,44,1,5
+1229,15,44,2,60
+1230,15,44,3,35
+1231,15,44,1,60
+1232,15,44,2,35
+1233,15,44,3,5
+1234,15,44,1,60
+1235,15,44,2,5
+1236,15,44,3,35
+1237,15,44,4,5
+1238,15,44,1,5
+1239,15,44,2,60
+1240,15,44,3,35
+1241,15,44,1,5
+1242,15,44,2,60
+1243,15,44,3,35
+1244,15,44,4,5
+1245,15,44,1,5
+1246,15,44,2,60
+1247,15,44,3,35
+1248,16,44,1,35
+1249,16,44,2,60
+1250,16,44,3,5
+1251,16,44,1,100
+1252,16,44,1,60
+1253,16,44,2,35
+1254,16,44,3,35
+1255,16,44,4,5
+1256,16,44,1,60
+1257,16,44,2,40
+1258,16,44,1,60
+1259,16,44,2,5
+1260,16,44,3,5
+1261,16,44,4,35
+1262,16,44,1,35
+1263,16,44,2,65
+1264,16,44,1,35
+1265,16,44,2,35
+1266,16,44,3,5
+1267,16,44,4,60
+1268,16,44,1,65
+1269,16,44,2,35
+1270,16,44,1,100
+1271,16,44,1,95
+1272,16,44,2,5
+1273,16,44,1,100
+1274,16,44,1,35
+1275,16,44,2,5
+1276,16,44,3,60
+1277,16,44,1,100
+1278,16,44,1,5
+1279,16,44,2,35
+1280,16,44,3,60
+1281,16,44,1,40
+1282,16,44,2,60
+1283,16,44,1,60
+1284,16,44,2,5
+1285,16,44,3,35
+1286,16,44,1,100
+1287,16,44,1,60
+1288,16,44,2,35
+1289,16,44,3,5
+1290,16,44,1,60
+1291,16,44,2,5
+1292,16,44,3,35
+1293,16,44,1,5
+1294,16,44,2,95
+1295,16,44,1,60
+1296,16,44,2,35
+1297,16,44,3,35
+1298,16,44,4,5
+1299,16,44,1,35
+1300,16,44,2,60
+1301,16,44,3,5
+1302,16,44,1,95
+1303,16,44,2,5
+1304,16,44,3,5
+1305,16,44,1,60
+1306,16,44,2,35
+1307,16,44,3,5
+1308,16,44,4,35
+1309,16,44,5,5
+1310,16,44,1,100
+1311,16,44,1,35
+1312,16,44,2,65
+1313,16,44,1,5
+1314,16,44,2,95
+1315,16,44,1,35
+1316,16,44,2,35
+1317,16,44,3,35
+1318,16,44,4,65
+1319,16,44,1,100
+1320,16,44,1,60
+1321,16,44,2,35
+1322,16,44,3,5
+1323,16,44,1,60
+1324,16,44,2,5
+1325,16,44,3,60
+1326,16,44,4,35
+1327,16,44,1,35
+1328,16,44,2,60
+1329,16,44,3,5
+1330,16,44,1,100
+1331,16,44,1,60
+1332,16,44,2,35
+1333,16,44,3,5
+1334,16,44,1,35
+1335,16,44,2,5
+1336,16,44,3,60

From c9ee9f7694c26999aa0ce261466df8882da50ac4 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Fri, 20 Feb 2026 22:48:34 -0800
Subject: [PATCH 05/11] Fix encounter slot value for Swablu on 114

This change is speculative, but makes sense when check against other encounter percentages
---
 data/v2/csv/encounter_slots.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index f27937618..3f06c276d 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1315,7 +1315,7 @@ id,version_group_id,encounter_method_id,slot,rarity
 1314,16,44,2,95
 1315,16,44,1,35
 1316,16,44,2,35
-1317,16,44,3,35
+1317,16,44,3,5
 1318,16,44,4,65
 1319,16,44,1,100
 1320,16,44,1,60

From 35f29443a3826c4f7049a46cf4673aea7b3b6a95 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Fri, 20 Feb 2026 22:50:11 -0800
Subject: [PATCH 06/11] Fix encounters based on comments given

---
 data/v2/csv/encounters.csv | 158 +++++++++++++++++++------------------
 1 file changed, 81 insertions(+), 77 deletions(-)

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index dde18ed4b..2a9f964d2 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -64728,32 +64728,32 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70287,24,746,1193,613,20,20
 70288,23,754,1194,74,23,23
 70289,24,754,1194,74,23,23
-70290,23,754,1195,246,24,24
-70291,24,754,1196,304,24,24
+70290,24,754,1195,246,24,24
+70291,23,754,1196,304,24,24
 70292,23,754,1197,632,23,23
 70293,24,754,1197,632,23,23
 70294,23,755,1194,74,23,23
 70295,24,755,1194,74,23,23
-70296,23,755,1195,246,24,24
-70297,24,755,1196,304,24,24
+70296,24,755,1195,246,24,24
+70297,23,755,1196,304,24,24
 70298,23,755,1197,632,23,23
 70299,24,755,1197,632,23,23
 70300,23,756,1194,74,23,23
 70301,24,756,1194,74,23,23
-70302,23,756,1195,246,24,24
-70303,24,756,1196,304,24,24
+70302,24,756,1195,246,24,24
+70303,23,756,1196,304,24,24
 70304,23,756,1197,632,23,23
 70305,24,756,1197,632,23,23
 70306,23,757,1194,74,23,23
 70307,24,757,1194,74,23,23
-70308,23,757,1195,246,24,24
-70309,24,757,1196,304,24,24
+70308,24,757,1195,246,24,24
+70309,23,757,1196,304,24,24
 70310,23,757,1197,632,23,23
 70311,24,757,1197,632,23,23
 70312,23,758,1194,74,23,23
 70313,24,758,1194,74,23,23
-70314,23,758,1195,246,24,24
-70315,24,758,1196,304,24,24
+70314,24,758,1195,246,24,24
+70315,23,758,1196,304,24,24
 70316,23,758,1197,632,23,23
 70317,24,758,1197,632,23,23
 70318,23,747,1198,60,25,25
@@ -64841,7 +64841,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70400,23,726,1233,707,19,19
 70401,24,726,1231,198,18,18
 70402,24,726,1232,590,18,18
-70403,24,727,1233,707,19,19
+70403,24,726,1233,707,19,19
 70404,23,727,1231,198,18,18
 70405,23,727,1232,590,18,18
 70406,23,727,1233,707,19,19
@@ -64976,16 +64976,16 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70535,26,375,1278,37,15,15
 70536,26,375,1279,307,15,15
 70537,26,375,1280,353,15,15
-70538,25,385,1281,41,17,17
-70539,25,385,1282,363,17,17
-70540,25,386,1283,41,17,17
-70541,25,386,1284,361,17,17
-70542,25,386,1285,363,17,17
-70543,26,385,1281,41,17,17
-70544,26,385,1282,363,17,17
-70545,26,386,1283,41,17,17
-70546,26,386,1284,361,17,17
-70547,26,386,1285,363,17,17
+70538,25,1204,1281,41,17,17
+70539,25,1204,1282,363,17,17
+70540,25,1206,1283,41,17,17
+70541,25,1206,1284,361,17,17
+70542,25,1206,1285,363,17,17
+70543,26,1204,1281,41,17,17
+70544,26,1204,1282,363,17,17
+70545,26,1206,1283,41,17,17
+70546,26,1206,1284,361,17,17
+70547,26,1206,1285,363,17,17
 70548,25,376,1286,41,18,18
 70549,26,376,1286,41,18,18
 70550,25,377,1286,41,18,18
@@ -65044,12 +65044,12 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70603,26,395,1299,261,2,2
 70604,26,395,1300,263,2,2
 70605,26,395,1301,278,2,2
-70606,25,396,1302,263,2,2
-70607,25,396,1303,278,2,2
-70608,25,396,1304,276,3,3
-70609,26,396,1302,263,2,2
-70610,26,396,1303,278,2,2
-70611,26,396,1304,276,3,3
+70606,25,1207,1302,263,2,2
+70607,25,1208,1303,278,2,2
+70608,25,1207,1304,276,3,3
+70609,26,1207,1302,263,2,2
+70610,26,1208,1303,278,2,2
+70611,26,1207,1304,276,3,3
 70612,25,402,1305,81,6,6
 70613,26,402,1305,81,6,6
 70614,26,402,1306,311,6,6
@@ -65068,53 +65068,57 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70627,25,405,1314,327,9,9
 70628,26,405,1313,227,9,9
 70629,26,405,1314,327,9,9
-70630,25,406,1315,270,9,9
-70631,25,406,1316,273,9,9
-70632,25,406,1317,333,9,9
-70633,25,406,1318,333,9,9
-70634,26,406,1315,270,9,9
-70635,26,406,1316,273,9,9
-70636,26,406,1317,333,9,9
-70637,26,406,1318,333,9,9
-70638,25,407,1319,333,10,10
-70639,26,407,1319,333,10,10
-70640,25,408,1320,263,4,4
-70641,25,408,1321,290,4,4
-70642,25,408,1322,300,4,4
-70643,26,408,1320,263,4,4
-70644,26,408,1321,290,4,4
-70645,26,408,1322,300,4,4
-70646,25,409,1323,43,7,7
-70647,25,409,1324,183,7,7
-70648,25,409,1325,263,7,7
-70649,25,409,1326,315,7,7
-70650,26,409,1323,43,7,7
-70651,26,409,1324,183,7,7
-70652,26,409,1325,263,7,7
-70653,26,409,1326,315,7,7
-70654,25,410,1327,278,12,12
-70655,25,410,1328,309,12,12
-70656,25,410,1329,352,12,12
-70657,26,410,1327,278,12,12
-70658,26,410,1328,309,12,12
-70659,26,410,1329,352,12,12
-70660,25,411,1330,43,12,12
-70661,26,411,1330,43,12,12
-70662,25,412,1331,43,13,13
-70663,25,412,1332,183,13,13
-70664,25,412,1333,352,13,13
-70665,26,412,1331,43,13,13
-70666,26,412,1332,183,13,13
-70667,26,412,1333,352,13,13
-70668,25,413,1334,278,15,15
-70669,25,413,1335,352,15,15
-70670,25,413,1336,353,15,15
-70671,26,413,1334,278,15,15
-70672,26,413,1335,352,15,15
-70673,26,413,1336,353,15,15
-70674,25,415,1334,278,15,15
-70675,25,415,1335,352,15,15
-70676,25,415,1336,353,15,15
-70677,26,415,1334,278,15,15
-70678,26,415,1335,352,15,15
-70679,26,415,1336,353,15,15
+70630,25,406,1316,273,9,9
+70631,25,406,1317,333,9,9
+70632,25,406,1318,333,9,9
+70633,26,406,1315,270,9,9
+70634,26,406,1317,333,9,9
+70635,26,406,1318,333,9,9
+70636,25,407,1319,333,10,10
+70637,26,407,1319,333,10,10
+70638,25,408,1320,263,4,4
+70639,25,408,1321,290,4,4
+70640,25,408,1322,300,4,4
+70641,26,408,1320,263,4,4
+70642,26,408,1321,290,4,4
+70643,26,408,1322,300,4,4
+70644,25,409,1323,43,7,7
+70645,25,409,1324,183,7,7
+70646,25,409,1325,263,7,7
+70647,25,409,1326,315,7,7
+70648,26,409,1323,43,7,7
+70649,26,409,1324,183,7,7
+70650,26,409,1325,263,7,7
+70651,26,409,1326,315,7,7
+70652,25,410,1327,278,12,12
+70653,25,410,1328,309,12,12
+70654,25,410,1329,352,12,12
+70655,26,410,1327,278,12,12
+70656,26,410,1328,309,12,12
+70657,26,410,1329,352,12,12
+70658,25,411,1330,43,12,12
+70659,26,411,1330,43,12,12
+70660,25,412,1331,43,13,13
+70661,25,412,1332,183,13,13
+70662,25,412,1333,352,13,13
+70663,26,412,1331,43,13,13
+70664,26,412,1332,183,13,13
+70665,26,412,1333,352,13,13
+70666,25,413,1334,278,15,15
+70667,25,413,1335,352,15,15
+70668,25,413,1336,353,15,15
+70669,26,413,1334,278,15,15
+70670,26,413,1335,352,15,15
+70671,26,413,1336,353,15,15
+70672,25,415,1334,278,15,15
+70673,25,415,1335,352,15,15
+70674,25,415,1336,353,15,15
+70675,26,415,1334,278,15,15
+70676,26,415,1335,352,15,15
+70677,26,415,1336,353,15,15
+70678,25,1205,1282,41,17,17
+70679,25,1205,1281,363,17,17
+70680,26,1205,1282,41,17,17
+70681,26,1205,1281,363,17,17
+70682,25,1208,1302,263,2,2
+70683,26,1208,1302,263,2,2

From 452c2de9f5f21b305668c38f269342b0b735ca54 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Fri, 20 Feb 2026 22:51:08 -0800
Subject: [PATCH 07/11] Update location areas with new names and ORAS specific
 locations

---
 data/v2/csv/location_areas.csv | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 8da8b5690..45b1685f1 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -339,8 +339,8 @@ id,location_id,game_index,identifier
 382,444,40,1f
 383,444,41,b1f
 384,444,42,b2f
-385,445,43,
-386,445,47,b1f
+385,445,43,main cave
+386,445,47,ice room
 387,446,48,entrance
 388,446,49,
 389,447,50,
@@ -1092,3 +1092,8 @@ id,location_id,game_index,identifier
 1201,232,0,
 1202,233,0,
 1203,234,0,
+1204,445,0,high tide cave
+1205,445,0,low tide cave
+1206,445,0,low tide ice room
+1207,452,0,north
+1208,452,0,south

From 8bed8bbb5fc1f329e5994fc0e1b66f9d333e0e23 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Sat, 21 Feb 2026 09:45:27 -0800
Subject: [PATCH 08/11] Update encounter records with new location area IDs

---
 data/v2/csv/encounters.csv | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 2a9f964d2..f5d8e6fb6 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -64978,14 +64978,14 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70537,26,375,1280,353,15,15
 70538,25,1204,1281,41,17,17
 70539,25,1204,1282,363,17,17
-70540,25,1206,1283,41,17,17
-70541,25,1206,1284,361,17,17
-70542,25,1206,1285,363,17,17
+70540,25,1208,1283,41,17,17
+70541,25,1208,1284,361,17,17
+70542,25,1208,1285,363,17,17
 70543,26,1204,1281,41,17,17
 70544,26,1204,1282,363,17,17
-70545,26,1206,1283,41,17,17
-70546,26,1206,1284,361,17,17
-70547,26,1206,1285,363,17,17
+70545,26,1208,1283,41,17,17
+70546,26,1208,1284,361,17,17
+70547,26,1208,1285,363,17,17
 70548,25,376,1286,41,18,18
 70549,26,376,1286,41,18,18
 70550,25,377,1286,41,18,18
@@ -65044,12 +65044,12 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70603,26,395,1299,261,2,2
 70604,26,395,1300,263,2,2
 70605,26,395,1301,278,2,2
-70606,25,1207,1302,263,2,2
-70607,25,1208,1303,278,2,2
-70608,25,1207,1304,276,3,3
-70609,26,1207,1302,263,2,2
-70610,26,1208,1303,278,2,2
-70611,26,1207,1304,276,3,3
+70606,25,1209,1302,263,2,2
+70607,25,1210,1303,278,2,2
+70608,25,1209,1304,276,3,3
+70609,26,1209,1302,263,2,2
+70610,26,1210,1303,278,2,2
+70611,26,1209,1304,276,3,3
 70612,25,402,1305,81,6,6
 70613,26,402,1305,81,6,6
 70614,26,402,1306,311,6,6
@@ -65120,5 +65120,13 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70679,25,1205,1281,363,17,17
 70680,26,1205,1282,41,17,17
 70681,26,1205,1281,363,17,17
-70682,25,1208,1302,263,2,2
-70683,26,1208,1302,263,2,2
+70682,25,1210,1302,263,2,2
+70683,26,1210,1302,263,2,2
+70684,25,1206,1283,41,17,17
+70685,25,1206,1285,363,17,17
+70686,26,1206,1283,41,17,17
+70687,26,1206,1285,363,17,17
+70688,25,1207,1283,41,17,17
+70689,25,1207,1285,363,17,17
+70690,26,1207,1283,41,17,17
+70691,26,1207,1285,363,17,17

From 371fdb49796ce142280279bf6c8ae41379efe8a2 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Sat, 21 Feb 2026 09:46:14 -0800
Subject: [PATCH 09/11] Change location names for ORAS specific locations

Updated location names for clarity and consistency.
---
 data/v2/csv/location_areas.csv | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 45b1685f1..b4bf0b1d5 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -339,8 +339,8 @@ id,location_id,game_index,identifier
 382,444,40,1f
 383,444,41,b1f
 384,444,42,b2f
-385,445,43,main cave
-386,445,47,ice room
+385,445,43,
+386,445,47,bf1
 387,446,48,entrance
 388,446,49,
 389,447,50,
@@ -1092,8 +1092,10 @@ id,location_id,game_index,identifier
 1201,232,0,
 1202,233,0,
 1203,234,0,
-1204,445,0,high tide cave
-1205,445,0,low tide cave
-1206,445,0,low tide ice room
-1207,452,0,north
-1208,452,0,south
+1204,445,0,high-tide-cave
+1205,445,0,low-tide-cave
+1206,445,0,low-tide-cave-bf1
+1207,445,0,low-tide-cave-bf2
+1208,445,0,low-tide-cave-bf3
+1209,452,0,north-oras
+1210,452,0,south-oras

From 39834d4ea6f6e37fcb784872b141b4644a9eee58 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Sun, 22 Feb 2026 21:54:44 -0800
Subject: [PATCH 10/11] Updated location areas based on feedback

---
 data/v2/csv/location_areas.csv | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index b4bf0b1d5..c8e88b856 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -340,7 +340,7 @@ id,location_id,game_index,identifier
 383,444,41,b1f
 384,444,42,b2f
 385,445,43,
-386,445,47,bf1
+386,445,47,b1f
 387,446,48,entrance
 388,446,49,
 389,447,50,
@@ -1092,10 +1092,8 @@ id,location_id,game_index,identifier
 1201,232,0,
 1202,233,0,
 1203,234,0,
-1204,445,0,high-tide-cave
-1205,445,0,low-tide-cave
-1206,445,0,low-tide-cave-bf1
-1207,445,0,low-tide-cave-bf2
-1208,445,0,low-tide-cave-bf3
-1209,452,0,north-oras
-1210,452,0,south-oras
+1204,445,0,low-tide-oras
+1205,445,0,b2f
+1206,445,0,b3f
+1207,452,0,north-oras
+1208,452,0,south-oras

From a5b7ae2a3dc83046103fada454484dd37f05bd85 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Sun, 22 Feb 2026 22:33:17 -0800
Subject: [PATCH 11/11] Update encounter records based on feedback

---
 data/v2/csv/encounters.csv | 60 +++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index f5d8e6fb6..7c717e666 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -64976,16 +64976,16 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70535,26,375,1278,37,15,15
 70536,26,375,1279,307,15,15
 70537,26,375,1280,353,15,15
-70538,25,1204,1281,41,17,17
-70539,25,1204,1282,363,17,17
-70540,25,1208,1283,41,17,17
-70541,25,1208,1284,361,17,17
-70542,25,1208,1285,363,17,17
-70543,26,1204,1281,41,17,17
-70544,26,1204,1282,363,17,17
-70545,26,1208,1283,41,17,17
-70546,26,1208,1284,361,17,17
-70547,26,1208,1285,363,17,17
+70538,25,385,1281,41,17,17
+70539,25,385,1282,363,17,17
+70540,25,1206,1283,41,17,17
+70541,25,1206,1284,361,17,17
+70542,25,1206,1285,363,17,17
+70543,26,385,1281,41,17,17
+70544,26,385,1282,363,17,17
+70545,26,1206,1283,41,17,17
+70546,26,1206,1284,361,17,17
+70547,26,1206,1285,363,17,17
 70548,25,376,1286,41,18,18
 70549,26,376,1286,41,18,18
 70550,25,377,1286,41,18,18
@@ -65044,12 +65044,12 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70603,26,395,1299,261,2,2
 70604,26,395,1300,263,2,2
 70605,26,395,1301,278,2,2
-70606,25,1209,1302,263,2,2
-70607,25,1210,1303,278,2,2
-70608,25,1209,1304,276,3,3
-70609,26,1209,1302,263,2,2
-70610,26,1210,1303,278,2,2
-70611,26,1209,1304,276,3,3
+70606,25,1207,1302,263,2,2
+70607,25,1208,1303,278,2,2
+70608,25,1207,1304,276,3,3
+70609,26,1207,1302,263,2,2
+70610,26,1208,1303,278,2,2
+70611,26,1207,1304,276,3,3
 70612,25,402,1305,81,6,6
 70613,26,402,1305,81,6,6
 70614,26,402,1306,311,6,6
@@ -65116,17 +65116,17 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70675,26,415,1334,278,15,15
 70676,26,415,1335,352,15,15
 70677,26,415,1336,353,15,15
-70678,25,1205,1282,41,17,17
-70679,25,1205,1281,363,17,17
-70680,26,1205,1282,41,17,17
-70681,26,1205,1281,363,17,17
-70682,25,1210,1302,263,2,2
-70683,26,1210,1302,263,2,2
-70684,25,1206,1283,41,17,17
-70685,25,1206,1285,363,17,17
-70686,26,1206,1283,41,17,17
-70687,26,1206,1285,363,17,17
-70688,25,1207,1283,41,17,17
-70689,25,1207,1285,363,17,17
-70690,26,1207,1283,41,17,17
-70691,26,1207,1285,363,17,17
+70678,25,1204,1282,41,17,17
+70679,25,1204,1281,363,17,17
+70680,26,1204,1282,41,17,17
+70681,26,1204,1281,363,17,17
+70682,25,1208,1302,263,2,2
+70683,26,1208,1302,263,2,2
+70684,25,386,1283,41,17,17
+70685,25,386,1285,363,17,17
+70686,26,386,1283,41,17,17
+70687,26,386,1285,363,17,17
+70688,25,1205,1283,41,17,17
+70689,25,1205,1285,363,17,17
+70690,26,1205,1283,41,17,17
+70691,26,1205,1285,363,17,17