From d21b5919138cbc69b639070259b8f3ff6f6e37af Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 10:11:01 -0500 Subject: [PATCH 01/50] feat: add new swsh encounter slots --- data/v2/csv/encounter_slots.csv | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 4dadc4684..b0b62c675 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1497,3 +1497,35 @@ id,version_group_id,encounter_method_id,slot,rarity 1496,10,1,8,5 1497,10,1,9,5 1498,10,1,10,5 +1499,20,41,,100 +1500,20,43,,100 +1501,20,1,1,20 +1502,20,1,2,15 +1503,20,1,3,15 +1504,20,1,4,10 +1505,20,1,5,10 +1506,20,1,6,10 +1507,20,1,7,10 +1508,20,1,8,5 +1509,20,1,9,4 +1510,20,1,10,1 +1511,20,38,1,20 +1512,20,38,2,15 +1513,20,38,3,15 +1514,20,38,4,10 +1515,20,38,5,10 +1516,20,38,6,10 +1517,20,38,7,10 +1518,20,38,8,5 +1519,20,38,9,4 +1520,20,38,10,1 +1521,20,39,1,20 +1522,20,39,2,15 +1523,20,39,3,15 +1524,20,39,4,10 +1525,20,39,5,10 +1526,20,39,6,10 +1527,20,39,7,10 +1528,20,39,8,5 +1529,20,39,9,4 +1530,20,39,10,1 From 37c9c8c56b9c1f23d1e1d9eefc1bf2dd930cdbca Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 10:11:24 -0500 Subject: [PATCH 02/50] feat: add galar-route-1 encounters for sword and shield --- data/v2/csv/encounters.csv | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 9d7da05b5..623f4f2a7 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69426,3 +69426,43 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75288,16,207,1497,127,27,28 75289,15,207,1498,415,27,34 75290,16,207,1498,415,27,34 +75291,33,843,1511,819,3,6 +75292,33,843,1512,819,3,6 +75293,33,843,1513,819,3,6 +75294,33,843,1514,821,3,6 +75295,33,843,1515,821,3,6 +75296,33,843,1516,821,3,6 +75297,33,843,1517,831,3,6 +75298,33,843,1518,831,3,6 +75299,33,843,1519,827,3,6 +75300,33,843,1520,827,3,6 +75301,33,843,1501,819,2,5 +75302,33,843,1504,819,2,5 +75303,33,843,1505,819,2,5 +75304,33,843,1502,824,2,5 +75305,33,843,1503,824,2,5 +75306,33,843,1506,10,2,5 +75307,33,843,1508,10,2,5 +75308,33,843,1507,736,2,5 +75309,33,843,1509,163,2,5 +75310,33,843,1510,163,2,5 +75311,34,843,1511,819,3,6 +75312,34,843,1512,819,3,6 +75313,34,843,1513,819,3,6 +75314,34,843,1514,821,3,6 +75315,34,843,1515,821,3,6 +75316,34,843,1516,821,3,6 +75317,34,843,1517,831,3,6 +75318,34,843,1518,831,3,6 +75319,34,843,1519,827,3,6 +75320,34,843,1520,827,3,6 +75321,34,843,1501,819,2,5 +75322,34,843,1504,819,2,5 +75323,34,843,1505,819,2,5 +75324,34,843,1502,824,2,5 +75325,34,843,1503,824,2,5 +75326,34,843,1506,10,2,5 +75327,34,843,1508,10,2,5 +75328,34,843,1507,736,2,5 +75329,34,843,1509,163,2,5 +75330,34,843,1510,163,2,5 From ea75c8a0e445d066faf205836f7c4e40a00ed0cd Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 12:07:17 -0500 Subject: [PATCH 03/50] feat: add slowpoke wedgehurst encounters --- data/v2/csv/encounters.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 623f4f2a7..4cc11ab55 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69466,3 +69466,5 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75328,34,843,1507,736,2,5 75329,34,843,1509,163,2,5 75330,34,843,1510,163,2,5 +75331,33,942,578,10164,12,12 +75332,34,942,578,10164,12,12 From 54fdf330246d8b6cd3430f15556d984475ed481c Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 12:13:11 -0500 Subject: [PATCH 04/50] feat: update galar-route-2 location areas --- data/v2/csv/location_areas.csv | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 8aec81801..ece6f3146 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -724,7 +724,7 @@ id,location_id,game_index,identifier 841,237,0, 842,247,0, 843,868,0, -844,869,0, +844,869,0,main 845,870,0,main 846,870,0,garbage 847,871,0, @@ -1245,3 +1245,5 @@ id,location_id,game_index,identifier 1362,175,0, 1363,243,0, 1364,347,0, +1365,869,0,lake +1366,869,0,lakeside From 8218e463edbb9666556ac029cf7d3b4e2ca7773d Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 13:01:56 -0500 Subject: [PATCH 05/50] fix: update encounter slots and current galar encounters --- data/v2/csv/encounter_slots.csv | 52 ++++++++++--------- data/v2/csv/encounters.csv | 92 ++++++++++++++++++--------------- 2 files changed, 79 insertions(+), 65 deletions(-) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index b0b62c675..4f5410ddc 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1505,27 +1505,33 @@ id,version_group_id,encounter_method_id,slot,rarity 1504,20,1,4,10 1505,20,1,5,10 1506,20,1,6,10 -1507,20,1,7,10 +1507,20,1,7,5 1508,20,1,8,5 -1509,20,1,9,4 -1510,20,1,10,1 -1511,20,38,1,20 -1512,20,38,2,15 -1513,20,38,3,15 -1514,20,38,4,10 -1515,20,38,5,10 -1516,20,38,6,10 -1517,20,38,7,10 -1518,20,38,8,5 -1519,20,38,9,4 -1520,20,38,10,1 -1521,20,39,1,20 -1522,20,39,2,15 -1523,20,39,3,15 -1524,20,39,4,10 -1525,20,39,5,10 -1526,20,39,6,10 -1527,20,39,7,10 -1528,20,39,8,5 -1529,20,39,9,4 -1530,20,39,10,1 +1509,20,1,9,5 +1510,20,1,10,2 +1511,20,1,11,2 +1512,20,1,12,1 +1513,20,38,1,20 +1514,20,38,2,15 +1515,20,38,3,15 +1516,20,38,4,10 +1517,20,38,5,10 +1518,20,38,6,10 +1519,20,38,7,5 +1520,20,38,8,5 +1521,20,38,9,5 +1522,20,38,10,2 +1523,20,38,11,2 +1524,20,38,12,1 +1525,20,39,1,20 +1526,20,39,2,15 +1527,20,39,3,15 +1528,20,39,4,10 +1529,20,39,5,10 +1530,20,39,6,10 +1531,20,39,7,5 +1532,20,39,8,5 +1533,20,39,9,5 +1534,20,39,10,2 +1535,20,39,11,2 +1536,20,39,12,1 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 4cc11ab55..822ce4931 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69426,45 +69426,53 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75288,16,207,1497,127,27,28 75289,15,207,1498,415,27,34 75290,16,207,1498,415,27,34 -75291,33,843,1511,819,3,6 -75292,33,843,1512,819,3,6 -75293,33,843,1513,819,3,6 -75294,33,843,1514,821,3,6 -75295,33,843,1515,821,3,6 -75296,33,843,1516,821,3,6 -75297,33,843,1517,831,3,6 -75298,33,843,1518,831,3,6 -75299,33,843,1519,827,3,6 -75300,33,843,1520,827,3,6 -75301,33,843,1501,819,2,5 -75302,33,843,1504,819,2,5 -75303,33,843,1505,819,2,5 -75304,33,843,1502,824,2,5 -75305,33,843,1503,824,2,5 -75306,33,843,1506,10,2,5 -75307,33,843,1508,10,2,5 -75308,33,843,1507,736,2,5 -75309,33,843,1509,163,2,5 -75310,33,843,1510,163,2,5 -75311,34,843,1511,819,3,6 -75312,34,843,1512,819,3,6 -75313,34,843,1513,819,3,6 -75314,34,843,1514,821,3,6 -75315,34,843,1515,821,3,6 -75316,34,843,1516,821,3,6 -75317,34,843,1517,831,3,6 -75318,34,843,1518,831,3,6 -75319,34,843,1519,827,3,6 -75320,34,843,1520,827,3,6 -75321,34,843,1501,819,2,5 -75322,34,843,1504,819,2,5 -75323,34,843,1505,819,2,5 -75324,34,843,1502,824,2,5 -75325,34,843,1503,824,2,5 -75326,34,843,1506,10,2,5 -75327,34,843,1508,10,2,5 -75328,34,843,1507,736,2,5 -75329,34,843,1509,163,2,5 -75330,34,843,1510,163,2,5 -75331,33,942,578,10164,12,12 -75332,34,942,578,10164,12,12 +75291,33,843,1513,819,3,6 +75292,33,843,1514,819,3,6 +75293,33,843,1515,819,3,6 +75294,33,843,1516,821,3,6 +75295,33,843,1517,821,3,6 +75296,33,843,1518,821,3,6 +75297,33,843,1519,831,3,6 +75298,33,843,1520,831,3,6 +75299,33,843,1521,831,3,6 +75300,33,843,1522,827,3,6 +75301,33,843,1523,827,3,6 +75302,33,843,1524,827,3,6 +75303,33,843,1501,819,2,5 +75304,33,843,1504,819,2,5 +75305,33,843,1505,819,2,5 +75306,33,843,1502,824,2,5 +75307,33,843,1503,824,2,5 +75308,33,843,1506,10,2,5 +75309,33,843,1507,10,2,5 +75310,33,843,1508,736,2,5 +75311,33,843,1509,736,2,5 +75312,33,843,1510,163,2,5 +75313,33,843,1511,163,2,5 +75314,33,843,1512,163,2,5 +75315,34,843,1513,819,3,6 +75316,34,843,1514,819,3,6 +75317,34,843,1515,819,3,6 +75318,34,843,1516,821,3,6 +75319,34,843,1517,821,3,6 +75320,34,843,1518,821,3,6 +75321,34,843,1519,831,3,6 +75322,34,843,1520,831,3,6 +75323,34,843,1521,831,3,6 +75324,34,843,1522,827,3,6 +75325,34,843,1523,827,3,6 +75326,34,843,1524,827,3,6 +75327,34,843,1501,819,2,5 +75328,34,843,1504,819,2,5 +75329,34,843,1505,819,2,5 +75330,34,843,1502,824,2,5 +75331,34,843,1503,824,2,5 +75332,34,843,1506,10,2,5 +75333,34,843,1507,10,2,5 +75334,34,843,1508,736,2,5 +75335,34,843,1509,736,2,5 +75336,34,843,1510,163,2,5 +75337,34,843,1511,163,2,5 +75338,34,843,1512,163,2,5 +75339,33,942,578,10164,12,12 +75340,34,942,578,10164,12,12 From 95570a55d0ce984b3f0da9b0cdfd65b1788112f0 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 14:44:56 -0500 Subject: [PATCH 06/50] feat: add encounters to galar-route-2-main --- data/v2/csv/encounters.csv | 52 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 822ce4931..a54bc9b9b 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69476,3 +69476,55 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75338,34,843,1512,163,2,5 75339,33,942,578,10164,12,12 75340,34,942,578,10164,12,12 +75341,33,844,1513,819,5,7 +75342,33,844,1514,819,5,7 +75343,33,844,1523,819,5,7 +75344,33,844,1524,819,5,7 +75345,33,844,1515,821,5,7 +75346,33,844,1516,821,5,7 +75347,33,844,1519,821,5,7 +75348,33,844,1517,827,5,7 +75349,33,844,1520,827,5,7 +75350,33,844,1518,833,5,7 +75351,33,844,1521,835,5,7 +75352,33,844,1522,10174,5,7 +75353,34,844,1513,819,5,7 +75354,34,844,1514,819,5,7 +75355,34,844,1523,819,5,7 +75356,34,844,1524,819,5,7 +75357,34,844,1515,821,5,7 +75358,34,844,1516,821,5,7 +75359,34,844,1519,821,5,7 +75360,34,844,1517,827,5,7 +75361,34,844,1520,827,5,7 +75362,34,844,1518,833,5,7 +75363,34,844,1521,835,5,7 +75364,34,844,1522,10174,5,7 +75365,33,844,1501,824,4,6 +75366,33,844,1504,824,4,6 +75367,33,844,1505,824,4,6 +75368,33,844,1502,821,4,6 +75369,33,844,1506,821,4,6 +75370,33,844,1503,273,4,6 +75371,33,844,1507,273,4,6 +75372,33,844,1508,509,4,6 +75373,33,844,1509,509,4,6 +75374,33,844,1510,163,4,6 +75375,33,844,1511,163,4,6 +75376,33,844,1512,163,4,6 +75377,34,844,1501,824,4,6 +75378,34,844,1504,824,4,6 +75379,34,844,1505,824,4,6 +75380,34,844,1502,821,4,6 +75381,34,844,1506,821,4,6 +75382,34,844,1503,273,4,6 +75383,34,844,1507,273,4,6 +75384,34,844,1508,509,4,6 +75385,34,844,1509,509,4,6 +75386,34,844,1510,163,4,6 +75387,34,844,1511,163,4,6 +75388,34,844,1512,163,4,6 +75389,33,844,1499,833,8,8 +75390,33,844,1499,835,8,8 +75391,34,844,1499,833,8,8 +75392,34,844,1499,835,8,8 From d0586257ef9e911e2acbf95a7b672a373e37dd14 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 15:08:01 -0500 Subject: [PATCH 07/50] feat: add fishing encounter method and encounter slots in swsh --- data/v2/csv/encounter_methods.csv | 3 ++- data/v2/csv/encounter_slots.csv | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index b0e956437..d1267243d 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -53,4 +53,5 @@ id,identifier,order 52,snag-rematch,52 53,pokespot,53 54,hidden-grotto,54 -55,honey-tree,54 \ No newline at end of file +55,honey-tree,54 +56,fishing,56 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 4f5410ddc..5ac6705f5 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1535,3 +1535,8 @@ id,version_group_id,encounter_method_id,slot,rarity 1534,20,39,10,2 1535,20,39,11,2 1536,20,39,12,1 +1537,20,56,1,40 +1538,20,56,2,40 +1539,20,56,3,15 +1540,20,56,4,4 +1541,20,56,5,1 From 69182b5c758282a69539652b7b3477b82de5050c Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 15:10:46 -0500 Subject: [PATCH 08/50] feat: add fishing encounters to galar-route-2 --- data/v2/csv/encounters.csv | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index a54bc9b9b..1f2d9c428 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69528,3 +69528,13 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75390,33,844,1499,835,8,8 75391,34,844,1499,833,8,8 75392,34,844,1499,835,8,8 +75393,33,844,1537,129,4,6 +75394,33,844,1538,129,4,6 +75395,33,844,1539,833,4,6 +75396,33,844,1540,846,4,6 +75397,33,844,1541,846,4,6 +75398,34,844,1537,129,4,6 +75399,34,844,1538,129,4,6 +75400,34,844,1539,833,4,6 +75401,34,844,1540,846,4,6 +75402,34,844,1541,846,4,6 From 3cddf7cfeb67d92f6735400b6f9e97ff0942d5df Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 15:11:46 -0500 Subject: [PATCH 09/50] fix: change seedot encounters in shield to lotad on route 2 --- data/v2/csv/encounters.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 1f2d9c428..c0de3b104 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69517,8 +69517,8 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75379,34,844,1505,824,4,6 75380,34,844,1502,821,4,6 75381,34,844,1506,821,4,6 -75382,34,844,1503,273,4,6 -75383,34,844,1507,273,4,6 +75382,34,844,1503,270,4,6 +75383,34,844,1507,270,4,6 75384,34,844,1508,509,4,6 75385,34,844,1509,509,4,6 75386,34,844,1510,163,4,6 From 7e8630e5c822961fedca0a51220ade9ac98e8275 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 15:28:58 -0500 Subject: [PATCH 10/50] feat: add encounters for galar-route-2-lake --- data/v2/csv/encounters.csv | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index c0de3b104..cfa59955a 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69538,3 +69538,31 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75400,34,844,1539,833,4,6 75401,34,844,1540,846,4,6 75402,34,844,1541,846,4,6 +75403,33,1365,1500,834,50,50 +75404,33,1365,1500,131,55,55 +75405,33,1365,1525,846,38,40 +75406,33,1365,1526,846,38,40 +75407,33,1365,1527,846,38,40 +75408,33,1365,1528,846,38,40 +75409,33,1365,1529,846,38,40 +75410,33,1365,1530,847,38,40 +75411,33,1365,1531,847,38,40 +75412,33,1365,1532,847,38,40 +75413,33,1365,1533,847,38,40 +75414,33,1365,1535,847,38,40 +75415,33,1365,1536,847,38,40 +75416,33,1365,1534,130,38,40 +75417,34,1365,1500,834,50,50 +75418,34,1365,1500,131,55,55 +75419,34,1365,1525,846,38,40 +75420,34,1365,1526,846,38,40 +75421,34,1365,1527,846,38,40 +75422,34,1365,1528,846,38,40 +75423,34,1365,1529,846,38,40 +75424,34,1365,1530,847,38,40 +75425,34,1365,1531,847,38,40 +75426,34,1365,1532,847,38,40 +75427,34,1365,1533,847,38,40 +75428,34,1365,1535,847,38,40 +75429,34,1365,1536,847,38,40 +75430,34,1365,1534,130,38,40 From 7811f87a95d18c7baa9ef021b2161570894e2806 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 15:38:52 -0500 Subject: [PATCH 11/50] feat: add most encounters on galar-route-2-lakeside --- data/v2/csv/encounters.csv | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index cfa59955a..a115c795f 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69566,3 +69566,53 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75428,34,1365,1535,847,38,40 75429,34,1365,1536,847,38,40 75430,34,1365,1534,130,38,40 +75431,33,1366,1513,10174,40,43 +75432,33,1366,1514,10174,40,43 +75433,33,1366,1515,10174,40,43 +75434,33,1366,1516,824,40,43 +75435,33,1366,1517,824,40,43 +75436,33,1366,1518,824,40,43 +75437,33,1366,1519,827,40,43 +75438,33,1366,1520,827,40,43 +75439,33,1366,1521,827,40,43 +75440,33,1366,1522,835,40,43 +75441,33,1366,1523,835,40,43 +75442,33,1366,1524,835,40,43 +75443,34,1366,1513,10174,40,43 +75444,34,1366,1514,10174,40,43 +75445,34,1366,1515,10174,40,43 +75446,34,1366,1516,824,40,43 +75447,34,1366,1517,824,40,43 +75448,34,1366,1518,824,40,43 +75449,34,1366,1519,827,40,43 +75450,34,1366,1520,827,40,43 +75451,34,1366,1521,827,40,43 +75452,34,1366,1522,835,40,43 +75453,34,1366,1523,835,40,43 +75454,34,1366,1524,835,40,43 +75455,33,1366,1501,829,37,40 +75456,33,1366,1502,829,37,40 +75457,33,1366,1503,509,37,40 +75458,33,1366,1504,509,37,40 +75459,33,1366,1507,509,37,40 +75460,33,1366,1505,273,37,40 +75461,33,1366,1506,273,37,40 +75462,33,1366,1508,824,37,40 +75463,33,1366,1509,824,37,40 +75464,33,1366,1510,833,37,40 +75465,33,1366,1511,833,37,40 +75466,33,1366,1512,833,37,40 +75467,34,1366,1501,829,37,40 +75468,34,1366,1502,829,37,40 +75469,34,1366,1503,509,37,40 +75470,34,1366,1504,509,37,40 +75471,34,1366,1507,509,37,40 +75472,34,1366,1505,270,37,40 +75473,34,1366,1506,270,37,40 +75474,34,1366,1508,824,37,40 +75475,34,1366,1509,824,37,40 +75476,34,1366,1510,833,37,40 +75477,34,1366,1511,833,37,40 +75478,34,1366,1512,833,37,40 +75479,33,1366,1499,862,50,50 +75480,34,1366,1499,862,50,50 From d8f8cda8bb8afd8bb74093094ec7986d6e012b7d Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 15:47:01 -0500 Subject: [PATCH 12/50] feat: update fishing encounter slots to match others and re-add galar-route-2-main fishing --- data/v2/csv/encounter_slots.csv | 15 +++++++++++---- data/v2/csv/encounters.csv | 34 +++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 5ac6705f5..4c93b099c 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1535,8 +1535,15 @@ id,version_group_id,encounter_method_id,slot,rarity 1534,20,39,10,2 1535,20,39,11,2 1536,20,39,12,1 -1537,20,56,1,40 -1538,20,56,2,40 +1537,20,56,1,20 +1538,20,56,2,15 1539,20,56,3,15 -1540,20,56,4,4 -1541,20,56,5,1 +1540,20,56,4,10 +1541,20,56,5,10 +1542,20,56,6,10 +1543,20,56,7,5 +1544,20,56,8,5 +1545,20,56,9,5 +1546,20,56,10,2 +1547,20,56,11,2 +1548,20,56,12,1 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index a115c795f..190c675ec 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69528,16 +69528,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75390,33,844,1499,835,8,8 75391,34,844,1499,833,8,8 75392,34,844,1499,835,8,8 -75393,33,844,1537,129,4,6 -75394,33,844,1538,129,4,6 -75395,33,844,1539,833,4,6 -75396,33,844,1540,846,4,6 -75397,33,844,1541,846,4,6 -75398,34,844,1537,129,4,6 -75399,34,844,1538,129,4,6 -75400,34,844,1539,833,4,6 -75401,34,844,1540,846,4,6 -75402,34,844,1541,846,4,6 75403,33,1365,1500,834,50,50 75404,33,1365,1500,131,55,55 75405,33,1365,1525,846,38,40 @@ -69616,3 +69606,27 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75478,34,1366,1512,833,37,40 75479,33,1366,1499,862,50,50 75480,34,1366,1499,862,50,50 +75481,33,844,1537,129,4,6 +75482,33,844,1538,129,4,6 +75483,33,844,1539,129,4,6 +75484,33,844,1540,129,4,6 +75485,33,844,1541,129,4,6 +75486,33,844,1542,129,4,6 +75487,33,844,1543,833,4,6 +75488,33,844,1544,833,4,6 +75489,33,844,1545,833,4,6 +75490,33,844,1546,846,4,6 +75491,33,844,1547,846,4,6 +75492,33,844,1548,846,4,6 +75493,34,844,1537,129,4,6 +75494,34,844,1538,129,4,6 +75495,34,844,1539,129,4,6 +75496,34,844,1540,129,4,6 +75497,34,844,1541,129,4,6 +75498,34,844,1542,129,4,6 +75499,34,844,1543,833,4,6 +75500,34,844,1544,833,4,6 +75501,34,844,1545,833,4,6 +75502,34,844,1546,846,4,6 +75503,34,844,1547,846,4,6 +75504,34,844,1548,846,4,6 From de5e35c82dc2008c0a65f93a17c4448cbdce1ae2 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 15:49:16 -0500 Subject: [PATCH 13/50] feat: add fishing encounters for galar-route-2-lakeside --- data/v2/csv/encounters.csv | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 190c675ec..271ad2877 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69630,3 +69630,27 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75502,34,844,1546,846,4,6 75503,34,844,1547,846,4,6 75504,34,844,1548,846,4,6 +75505,33,1366,1537,129,37,40 +75506,33,1366,1538,129,37,40 +75507,33,1366,1539,129,37,40 +75508,33,1366,1540,833,37,40 +75509,33,1366,1541,833,37,40 +75510,33,1366,1542,833,37,40 +75511,33,1366,1543,833,37,40 +75512,33,1366,1544,833,37,40 +75513,33,1366,1545,129,37,40 +75514,33,1366,1546,129,37,40 +75515,33,1366,1547,129,37,40 +75516,33,1366,1548,349,37,40 +75517,34,1366,1537,129,37,40 +75518,34,1366,1538,129,37,40 +75519,34,1366,1539,129,37,40 +75520,34,1366,1540,833,37,40 +75521,34,1366,1541,833,37,40 +75522,34,1366,1542,833,37,40 +75523,34,1366,1543,833,37,40 +75524,34,1366,1544,833,37,40 +75525,34,1366,1545,129,37,40 +75526,34,1366,1546,129,37,40 +75527,34,1366,1547,129,37,40 +75528,34,1366,1548,349,37,40 From bd80cf8acd9477882a4c402accd8b56671a7d385 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 16:18:42 -0500 Subject: [PATCH 14/50] feat: add motostoke location areas --- data/v2/csv/location_areas.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index ece6f3146..a9b2a7ae5 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -786,7 +786,7 @@ id,location_id,game_index,identifier 903,915,0,beach 904,916,0, 905,917,0, -906,918,0, +906,918,0,main 907,919,0, 908,920,0, 909,921,0, @@ -1247,3 +1247,4 @@ id,location_id,game_index,identifier 1364,347,0, 1365,869,0,lake 1366,869,0,lakeside +1367,918,0,gym From bb6c73d1ff1cc393462423ba7b55ef85d78b3296 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 16:18:57 -0500 Subject: [PATCH 15/50] feat: add motostoke encounters --- data/v2/csv/encounters.csv | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 271ad2877..949b25a1f 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69654,3 +69654,33 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75526,34,1366,1546,129,37,40 75527,34,1366,1547,129,37,40 75528,34,1366,1548,349,37,40 +75529,33,906,1537,129,7,11 +75530,33,906,1538,129,7,11 +75531,33,906,1539,129,7,11 +75532,33,906,1540,833,7,11 +75533,33,906,1541,833,7,11 +75534,33,906,1542,833,7,11 +75535,33,906,1543,833,7,11 +75536,33,906,1544,833,7,11 +75537,33,906,1545,339,7,11 +75538,33,906,1546,339,7,11 +75539,33,906,1547,339,7,11 +75540,33,906,1548,339,7,11 +75541,34,906,1537,129,7,11 +75542,34,906,1538,129,7,11 +75543,34,906,1539,129,7,11 +75544,34,906,1540,833,7,11 +75545,34,906,1541,833,7,11 +75546,34,906,1542,833,7,11 +75547,34,906,1543,833,7,11 +75548,34,906,1544,833,7,11 +75549,34,906,1545,339,7,11 +75550,34,906,1546,339,7,11 +75551,34,906,1547,339,7,11 +75552,34,906,1548,339,7,11 +75553,33,1367,1499,37,24,24 +75554,33,1367,1499,607,25,25 +75555,33,1367,1499,850,25,25 +75556,34,1367,1499,37,24,24 +75557,34,1367,1499,607,25,25 +75558,34,1367,1499,850,25,25 From 87f41e82144a5949f91a647a7da3ae8a85595e8d Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 16:52:23 -0500 Subject: [PATCH 16/50] feat: add location area prose --- data/v2/csv/location_area_prose.csv | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 5a2e4b54d..40ed64ef5 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2176,6 +2176,9 @@ location_area_id,local_language_id,name 842,9,Sinjoy Ruins 842,6,Sinjoh-Ruinen 842,5,Ruines Sinjoh +843,9,Route 1 +844,9,Route 2 +906,9,Motostoke 1167,9,Lighthouse Basement 1167,6,Leuchtturm Keller 1167,5,Phare de la Liberté @@ -2395,3 +2398,6 @@ location_area_id,local_language_id,name 1362,9,Floaroma Meadow 1363,9,Safari Zone Gate 1364,9,Accumula Town +1365,9,Route 2 (Lake) +1366,9,Route 2 (Lakeside) +1367,9,Motostoke (Gym) From 5f6487365bca3ac2ca807249fb83dd55b94057ef Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 16:52:40 -0500 Subject: [PATCH 17/50] fix: remove unknown location area for galar-route-3 --- data/v2/csv/location_areas.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index a9b2a7ae5..2d8ecd3ca 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -726,7 +726,6 @@ id,location_id,game_index,identifier 843,868,0, 844,869,0,main 845,870,0,main -846,870,0,garbage 847,871,0, 848,872,0, 849,873,0, From aebc6d930eaa558e7c98236a6708c0298bc59f60 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 17:03:46 -0500 Subject: [PATCH 18/50] feat: add galar-route-3 prose and update location area name --- data/v2/csv/location_area_prose.csv | 1 + data/v2/csv/location_areas.csv | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 40ed64ef5..9d0411efc 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2178,6 +2178,7 @@ location_area_id,local_language_id,name 842,5,Ruines Sinjoh 843,9,Route 1 844,9,Route 2 +845,9,Route 3 906,9,Motostoke 1167,9,Lighthouse Basement 1167,6,Leuchtturm Keller diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 2d8ecd3ca..9abb6aecb 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -725,7 +725,7 @@ id,location_id,game_index,identifier 842,247,0, 843,868,0, 844,869,0,main -845,870,0,main +845,870,0, 847,871,0, 848,872,0, 849,873,0, From d7e4a796d59245c67e93e045acff9a07f0f4d291 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 17:11:40 -0500 Subject: [PATCH 19/50] feat: add galar-route-3 encounters --- data/v2/csv/encounters.csv | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 949b25a1f..3d6641d95 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69684,3 +69684,53 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75556,34,1367,1499,37,24,24 75557,34,1367,1499,607,25,25 75558,34,1367,1499,850,25,25 +75559,33,845,1513,10174,10,14 +75560,33,845,1514,10174,10,14 +75561,33,845,1523,10174,10,14 +75562,33,845,1524,10174,10,14 +75563,33,845,1515,829,10,14 +75564,33,845,1516,829,10,14 +75565,33,845,1519,829,10,14 +75566,33,845,1517,37,10,14 +75567,33,845,1520,37,10,14 +75568,33,845,1518,434,10,14 +75569,33,845,1521,568,10,14 +75570,33,845,1522,236,10,14 +75571,34,845,1513,10174,10,14 +75572,34,845,1514,10174,10,14 +75573,34,845,1523,10174,10,14 +75574,34,845,1524,10174,10,14 +75575,34,845,1515,829,10,14 +75576,34,845,1516,829,10,14 +75577,34,845,1519,829,10,14 +75578,34,845,1517,58,10,14 +75579,34,845,1520,58,10,14 +75580,34,845,1518,434,10,14 +75581,34,845,1521,568,10,14 +75582,34,845,1522,236,10,14 +75583,33,845,1501,821,8,13 +75584,33,845,1502,821,8,13 +75585,33,845,1503,66,8,13 +75586,33,845,1507,66,8,13 +75587,33,845,1504,674,8,13 +75588,33,845,1505,674,8,13 +75589,33,845,1506,749,8,13 +75590,33,845,1508,749,8,13 +75591,33,845,1509,599,8,13 +75592,33,845,1510,599,8,13 +75593,33,845,1511,599,8,13 +75594,33,845,1512,850,8,13 +75595,34,845,1501,821,8,13 +75596,34,845,1502,821,8,13 +75597,34,845,1503,66,8,13 +75598,34,845,1507,66,8,13 +75599,34,845,1504,674,8,13 +75600,34,845,1505,674,8,13 +75601,34,845,1506,749,8,13 +75602,34,845,1508,749,8,13 +75603,34,845,1509,599,8,13 +75604,34,845,1510,599,8,13 +75605,34,845,1511,599,8,13 +75606,34,845,1512,850,8,13 +75607,33,845,1499,822,18,18 +75608,34,845,1499,822,18,18 From 2b1d94959b21db622663912b70563a6d5b9b4135 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 17:14:08 -0500 Subject: [PATCH 20/50] feat: update galar-route-3 location areas --- data/v2/csv/location_area_prose.csv | 3 ++- data/v2/csv/location_areas.csv | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 9d0411efc..2594eed3f 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2178,7 +2178,7 @@ location_area_id,local_language_id,name 842,5,Ruines Sinjoh 843,9,Route 1 844,9,Route 2 -845,9,Route 3 +845,9,Route 3 (East) 906,9,Motostoke 1167,9,Lighthouse Basement 1167,6,Leuchtturm Keller @@ -2402,3 +2402,4 @@ location_area_id,local_language_id,name 1365,9,Route 2 (Lake) 1366,9,Route 2 (Lakeside) 1367,9,Motostoke (Gym) +1368,9,Route 3 (West) diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 9abb6aecb..2310d9aeb 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -725,7 +725,7 @@ id,location_id,game_index,identifier 842,247,0, 843,868,0, 844,869,0,main -845,870,0, +845,870,0,east 847,871,0, 848,872,0, 849,873,0, @@ -1247,3 +1247,4 @@ id,location_id,game_index,identifier 1365,869,0,lake 1366,869,0,lakeside 1367,918,0,gym +1368,870,0,west From 432cf50ec4e910d040c50954879d504f9a42d98d Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 17:15:16 -0500 Subject: [PATCH 21/50] fix: add missing galar-route-3 encounters --- data/v2/csv/encounters.csv | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 3d6641d95..988d02230 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69734,3 +69734,27 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75606,34,845,1512,850,8,13 75607,33,845,1499,822,18,18 75608,34,845,1499,822,18,18 +75609,33,1368,1513,837,10,13 +75610,33,1368,1514,837,10,13 +75611,33,1368,1515,837,10,13 +75612,33,1368,1516,837,10,13 +75613,33,1368,1517,837,10,13 +75614,33,1368,1518,837,10,13 +75615,33,1368,1519,837,10,13 +75616,33,1368,1520,837,10,13 +75617,33,1368,1521,837,10,13 +75618,33,1368,1522,837,10,13 +75619,33,1368,1523,837,10,13 +75620,33,1368,1524,568,10,13 +75621,34,1368,1513,837,10,13 +75622,34,1368,1514,837,10,13 +75623,34,1368,1515,837,10,13 +75624,34,1368,1516,837,10,13 +75625,34,1368,1517,837,10,13 +75626,34,1368,1518,837,10,13 +75627,34,1368,1519,837,10,13 +75628,34,1368,1520,837,10,13 +75629,34,1368,1521,837,10,13 +75630,34,1368,1522,837,10,13 +75631,34,1368,1523,837,10,13 +75632,34,1368,1524,568,10,13 From 41da8e962a65bde1bf6a561d89ef87720d279e10 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 17:19:33 -0500 Subject: [PATCH 22/50] feat: add galar-encounters and location area prose --- data/v2/csv/encounters.csv | 26 ++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + 2 files changed, 27 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 988d02230..fe70b7a1b 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69758,3 +69758,29 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75630,34,1368,1522,837,10,13 75631,34,1368,1523,837,10,13 75632,34,1368,1524,568,10,13 +75633,33,882,1513,837,11,14 +75634,33,882,1514,837,11,14 +75635,33,882,1515,532,11,14 +75636,33,882,1516,532,11,14 +75637,33,882,1517,527,11,14 +75638,33,882,1519,527,11,14 +75639,33,882,1518,50,11,14 +75640,33,882,1520,529,11,14 +75641,33,882,1521,529,11,14 +75642,33,882,1522,524,11,14 +75643,33,882,1523,524,11,14 +75644,33,882,1524,524,11,14 +75645,33,882,1499,838,18,18 +75646,34,882,1513,837,11,14 +75647,34,882,1514,837,11,14 +75648,34,882,1515,532,11,14 +75649,34,882,1516,532,11,14 +75650,34,882,1517,527,11,14 +75651,34,882,1519,527,11,14 +75652,34,882,1518,50,11,14 +75653,34,882,1520,529,11,14 +75654,34,882,1521,529,11,14 +75655,34,882,1522,524,11,14 +75656,34,882,1523,524,11,14 +75657,34,882,1524,524,11,14 +75658,34,882,1499,838,18,18 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 2594eed3f..07e58b5d8 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2179,6 +2179,7 @@ location_area_id,local_language_id,name 843,9,Route 1 844,9,Route 2 845,9,Route 3 (East) +882,9,Galar Mine 906,9,Motostoke 1167,9,Lighthouse Basement 1167,6,Leuchtturm Keller From 427ea6aa4bcf0e88569ace182e1cba04e34a70ed Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 18:04:46 -0500 Subject: [PATCH 23/50] feat: add encounter slots for berry trees in sword-shield --- data/v2/csv/encounter_slots.csv | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 4c93b099c..a9c2c2029 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1547,3 +1547,15 @@ id,version_group_id,encounter_method_id,slot,rarity 1546,20,56,10,2 1547,20,56,11,2 1548,20,56,12,1 +1549,20,35,1,20 +1550,20,35,2,15 +1551,20,35,3,15 +1552,20,35,4,10 +1553,20,35,5,10 +1554,20,35,6,10 +1555,20,35,7,5 +1556,20,35,8,5 +1557,20,35,9,5 +1558,20,35,10,2 +1559,20,35,11,2 +1560,20,35,12,1 From fc892114874ee18c30158708ac4912308c73b562 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 18:07:43 -0500 Subject: [PATCH 24/50] fix: add missing berry-trees encounters. rename berry-piles to berry-trees --- data/v2/csv/encounter_methods.csv | 2 +- data/v2/csv/encounters.csv | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index d1267243d..150717b4a 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -33,7 +33,7 @@ id,identifier,order 32,island-scan,32 33,sos-encounter,33 34,bubbling-spots,34 -35,berry-piles,35 +35,berry-trees,35 36,npc-trade,36 37,sos-from-bubbling-spot,37 38,overworld,38 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index fe70b7a1b..96e62cef3 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69784,3 +69784,27 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75656,34,882,1523,524,11,14 75657,34,882,1524,524,11,14 75658,34,882,1499,838,18,18 +75659,33,845,1549,819,8,13 +75660,33,845,1550,819,8,13 +75661,33,845,1551,819,8,13 +75662,33,845,1552,819,8,13 +75663,33,845,1553,819,8,13 +75664,33,845,1554,819,8,13 +75665,33,845,1555,420,8,13 +75666,33,845,1556,420,8,13 +75667,33,845,1557,420,8,13 +75668,33,845,1558,420,8,13 +75669,33,845,1559,420,8,13 +75670,33,845,1560,420,8,13 +75671,34,845,1549,819,8,13 +75672,34,845,1550,819,8,13 +75673,34,845,1551,819,8,13 +75674,34,845,1552,819,8,13 +75675,34,845,1553,819,8,13 +75676,34,845,1554,819,8,13 +75677,34,845,1555,420,8,13 +75678,34,845,1556,420,8,13 +75679,34,845,1557,420,8,13 +75680,34,845,1558,420,8,13 +75681,34,845,1559,420,8,13 +75682,34,845,1560,420,8,13 From 3112e85ebb1cf6ed790e5815018402d523ba5ceb Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 18:16:17 -0500 Subject: [PATCH 25/50] fix: update encounter slots and clear encounter progress --- data/v2/csv/encounter_slots.csv | 103 +++++---- data/v2/csv/encounters.csv | 382 -------------------------------- 2 files changed, 54 insertions(+), 431 deletions(-) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index a9c2c2029..535a9943c 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1509,53 +1509,58 @@ id,version_group_id,encounter_method_id,slot,rarity 1508,20,1,8,5 1509,20,1,9,5 1510,20,1,10,2 -1511,20,1,11,2 +1511,20,1,11,1 1512,20,1,12,1 -1513,20,38,1,20 -1514,20,38,2,15 -1515,20,38,3,15 -1516,20,38,4,10 -1517,20,38,5,10 -1518,20,38,6,10 -1519,20,38,7,5 -1520,20,38,8,5 -1521,20,38,9,5 -1522,20,38,10,2 -1523,20,38,11,2 -1524,20,38,12,1 -1525,20,39,1,20 -1526,20,39,2,15 -1527,20,39,3,15 -1528,20,39,4,10 -1529,20,39,5,10 -1530,20,39,6,10 -1531,20,39,7,5 -1532,20,39,8,5 -1533,20,39,9,5 -1534,20,39,10,2 -1535,20,39,11,2 -1536,20,39,12,1 -1537,20,56,1,20 -1538,20,56,2,15 -1539,20,56,3,15 -1540,20,56,4,10 -1541,20,56,5,10 -1542,20,56,6,10 -1543,20,56,7,5 -1544,20,56,8,5 -1545,20,56,9,5 -1546,20,56,10,2 -1547,20,56,11,2 -1548,20,56,12,1 -1549,20,35,1,20 -1550,20,35,2,15 -1551,20,35,3,15 -1552,20,35,4,10 -1553,20,35,5,10 -1554,20,35,6,10 -1555,20,35,7,5 -1556,20,35,8,5 -1557,20,35,9,5 -1558,20,35,10,2 -1559,20,35,11,2 -1560,20,35,12,1 +1513,20,1,13,1 +1514,20,38,1,20 +1515,20,38,2,15 +1516,20,38,3,15 +1517,20,38,4,10 +1518,20,38,5,10 +1519,20,38,6,10 +1520,20,38,7,5 +1521,20,38,8,5 +1522,20,38,9,5 +1523,20,38,10,2 +1524,20,38,11,1 +1525,20,38,12,1 +1526,20,38,13,1 +1527,20,39,1,20 +1528,20,39,2,15 +1529,20,39,3,15 +1530,20,39,4,10 +1531,20,39,5,10 +1532,20,39,6,10 +1533,20,39,7,5 +1534,20,39,8,5 +1535,20,39,9,5 +1536,20,39,10,2 +1537,20,39,11,1 +1538,20,39,12,1 +1539,20,39,13,1 +1540,20,56,1,20 +1541,20,56,2,15 +1542,20,56,3,15 +1543,20,56,4,10 +1544,20,56,5,10 +1545,20,56,6,10 +1546,20,56,7,5 +1547,20,56,8,5 +1548,20,56,9,5 +1549,20,56,10,2 +1550,20,56,11,1 +1551,20,56,12,1 +1552,20,56,13,1 +1553,20,35,1,20 +1554,20,35,2,15 +1555,20,35,3,15 +1556,20,35,4,10 +1557,20,35,5,10 +1558,20,35,6,10 +1559,20,35,7,5 +1560,20,35,8,5 +1561,20,35,9,5 +1562,20,35,10,2 +1563,20,35,11,1 +1564,20,35,12,1 +1565,20,35,13,1 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 96e62cef3..9d7da05b5 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69426,385 +69426,3 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75288,16,207,1497,127,27,28 75289,15,207,1498,415,27,34 75290,16,207,1498,415,27,34 -75291,33,843,1513,819,3,6 -75292,33,843,1514,819,3,6 -75293,33,843,1515,819,3,6 -75294,33,843,1516,821,3,6 -75295,33,843,1517,821,3,6 -75296,33,843,1518,821,3,6 -75297,33,843,1519,831,3,6 -75298,33,843,1520,831,3,6 -75299,33,843,1521,831,3,6 -75300,33,843,1522,827,3,6 -75301,33,843,1523,827,3,6 -75302,33,843,1524,827,3,6 -75303,33,843,1501,819,2,5 -75304,33,843,1504,819,2,5 -75305,33,843,1505,819,2,5 -75306,33,843,1502,824,2,5 -75307,33,843,1503,824,2,5 -75308,33,843,1506,10,2,5 -75309,33,843,1507,10,2,5 -75310,33,843,1508,736,2,5 -75311,33,843,1509,736,2,5 -75312,33,843,1510,163,2,5 -75313,33,843,1511,163,2,5 -75314,33,843,1512,163,2,5 -75315,34,843,1513,819,3,6 -75316,34,843,1514,819,3,6 -75317,34,843,1515,819,3,6 -75318,34,843,1516,821,3,6 -75319,34,843,1517,821,3,6 -75320,34,843,1518,821,3,6 -75321,34,843,1519,831,3,6 -75322,34,843,1520,831,3,6 -75323,34,843,1521,831,3,6 -75324,34,843,1522,827,3,6 -75325,34,843,1523,827,3,6 -75326,34,843,1524,827,3,6 -75327,34,843,1501,819,2,5 -75328,34,843,1504,819,2,5 -75329,34,843,1505,819,2,5 -75330,34,843,1502,824,2,5 -75331,34,843,1503,824,2,5 -75332,34,843,1506,10,2,5 -75333,34,843,1507,10,2,5 -75334,34,843,1508,736,2,5 -75335,34,843,1509,736,2,5 -75336,34,843,1510,163,2,5 -75337,34,843,1511,163,2,5 -75338,34,843,1512,163,2,5 -75339,33,942,578,10164,12,12 -75340,34,942,578,10164,12,12 -75341,33,844,1513,819,5,7 -75342,33,844,1514,819,5,7 -75343,33,844,1523,819,5,7 -75344,33,844,1524,819,5,7 -75345,33,844,1515,821,5,7 -75346,33,844,1516,821,5,7 -75347,33,844,1519,821,5,7 -75348,33,844,1517,827,5,7 -75349,33,844,1520,827,5,7 -75350,33,844,1518,833,5,7 -75351,33,844,1521,835,5,7 -75352,33,844,1522,10174,5,7 -75353,34,844,1513,819,5,7 -75354,34,844,1514,819,5,7 -75355,34,844,1523,819,5,7 -75356,34,844,1524,819,5,7 -75357,34,844,1515,821,5,7 -75358,34,844,1516,821,5,7 -75359,34,844,1519,821,5,7 -75360,34,844,1517,827,5,7 -75361,34,844,1520,827,5,7 -75362,34,844,1518,833,5,7 -75363,34,844,1521,835,5,7 -75364,34,844,1522,10174,5,7 -75365,33,844,1501,824,4,6 -75366,33,844,1504,824,4,6 -75367,33,844,1505,824,4,6 -75368,33,844,1502,821,4,6 -75369,33,844,1506,821,4,6 -75370,33,844,1503,273,4,6 -75371,33,844,1507,273,4,6 -75372,33,844,1508,509,4,6 -75373,33,844,1509,509,4,6 -75374,33,844,1510,163,4,6 -75375,33,844,1511,163,4,6 -75376,33,844,1512,163,4,6 -75377,34,844,1501,824,4,6 -75378,34,844,1504,824,4,6 -75379,34,844,1505,824,4,6 -75380,34,844,1502,821,4,6 -75381,34,844,1506,821,4,6 -75382,34,844,1503,270,4,6 -75383,34,844,1507,270,4,6 -75384,34,844,1508,509,4,6 -75385,34,844,1509,509,4,6 -75386,34,844,1510,163,4,6 -75387,34,844,1511,163,4,6 -75388,34,844,1512,163,4,6 -75389,33,844,1499,833,8,8 -75390,33,844,1499,835,8,8 -75391,34,844,1499,833,8,8 -75392,34,844,1499,835,8,8 -75403,33,1365,1500,834,50,50 -75404,33,1365,1500,131,55,55 -75405,33,1365,1525,846,38,40 -75406,33,1365,1526,846,38,40 -75407,33,1365,1527,846,38,40 -75408,33,1365,1528,846,38,40 -75409,33,1365,1529,846,38,40 -75410,33,1365,1530,847,38,40 -75411,33,1365,1531,847,38,40 -75412,33,1365,1532,847,38,40 -75413,33,1365,1533,847,38,40 -75414,33,1365,1535,847,38,40 -75415,33,1365,1536,847,38,40 -75416,33,1365,1534,130,38,40 -75417,34,1365,1500,834,50,50 -75418,34,1365,1500,131,55,55 -75419,34,1365,1525,846,38,40 -75420,34,1365,1526,846,38,40 -75421,34,1365,1527,846,38,40 -75422,34,1365,1528,846,38,40 -75423,34,1365,1529,846,38,40 -75424,34,1365,1530,847,38,40 -75425,34,1365,1531,847,38,40 -75426,34,1365,1532,847,38,40 -75427,34,1365,1533,847,38,40 -75428,34,1365,1535,847,38,40 -75429,34,1365,1536,847,38,40 -75430,34,1365,1534,130,38,40 -75431,33,1366,1513,10174,40,43 -75432,33,1366,1514,10174,40,43 -75433,33,1366,1515,10174,40,43 -75434,33,1366,1516,824,40,43 -75435,33,1366,1517,824,40,43 -75436,33,1366,1518,824,40,43 -75437,33,1366,1519,827,40,43 -75438,33,1366,1520,827,40,43 -75439,33,1366,1521,827,40,43 -75440,33,1366,1522,835,40,43 -75441,33,1366,1523,835,40,43 -75442,33,1366,1524,835,40,43 -75443,34,1366,1513,10174,40,43 -75444,34,1366,1514,10174,40,43 -75445,34,1366,1515,10174,40,43 -75446,34,1366,1516,824,40,43 -75447,34,1366,1517,824,40,43 -75448,34,1366,1518,824,40,43 -75449,34,1366,1519,827,40,43 -75450,34,1366,1520,827,40,43 -75451,34,1366,1521,827,40,43 -75452,34,1366,1522,835,40,43 -75453,34,1366,1523,835,40,43 -75454,34,1366,1524,835,40,43 -75455,33,1366,1501,829,37,40 -75456,33,1366,1502,829,37,40 -75457,33,1366,1503,509,37,40 -75458,33,1366,1504,509,37,40 -75459,33,1366,1507,509,37,40 -75460,33,1366,1505,273,37,40 -75461,33,1366,1506,273,37,40 -75462,33,1366,1508,824,37,40 -75463,33,1366,1509,824,37,40 -75464,33,1366,1510,833,37,40 -75465,33,1366,1511,833,37,40 -75466,33,1366,1512,833,37,40 -75467,34,1366,1501,829,37,40 -75468,34,1366,1502,829,37,40 -75469,34,1366,1503,509,37,40 -75470,34,1366,1504,509,37,40 -75471,34,1366,1507,509,37,40 -75472,34,1366,1505,270,37,40 -75473,34,1366,1506,270,37,40 -75474,34,1366,1508,824,37,40 -75475,34,1366,1509,824,37,40 -75476,34,1366,1510,833,37,40 -75477,34,1366,1511,833,37,40 -75478,34,1366,1512,833,37,40 -75479,33,1366,1499,862,50,50 -75480,34,1366,1499,862,50,50 -75481,33,844,1537,129,4,6 -75482,33,844,1538,129,4,6 -75483,33,844,1539,129,4,6 -75484,33,844,1540,129,4,6 -75485,33,844,1541,129,4,6 -75486,33,844,1542,129,4,6 -75487,33,844,1543,833,4,6 -75488,33,844,1544,833,4,6 -75489,33,844,1545,833,4,6 -75490,33,844,1546,846,4,6 -75491,33,844,1547,846,4,6 -75492,33,844,1548,846,4,6 -75493,34,844,1537,129,4,6 -75494,34,844,1538,129,4,6 -75495,34,844,1539,129,4,6 -75496,34,844,1540,129,4,6 -75497,34,844,1541,129,4,6 -75498,34,844,1542,129,4,6 -75499,34,844,1543,833,4,6 -75500,34,844,1544,833,4,6 -75501,34,844,1545,833,4,6 -75502,34,844,1546,846,4,6 -75503,34,844,1547,846,4,6 -75504,34,844,1548,846,4,6 -75505,33,1366,1537,129,37,40 -75506,33,1366,1538,129,37,40 -75507,33,1366,1539,129,37,40 -75508,33,1366,1540,833,37,40 -75509,33,1366,1541,833,37,40 -75510,33,1366,1542,833,37,40 -75511,33,1366,1543,833,37,40 -75512,33,1366,1544,833,37,40 -75513,33,1366,1545,129,37,40 -75514,33,1366,1546,129,37,40 -75515,33,1366,1547,129,37,40 -75516,33,1366,1548,349,37,40 -75517,34,1366,1537,129,37,40 -75518,34,1366,1538,129,37,40 -75519,34,1366,1539,129,37,40 -75520,34,1366,1540,833,37,40 -75521,34,1366,1541,833,37,40 -75522,34,1366,1542,833,37,40 -75523,34,1366,1543,833,37,40 -75524,34,1366,1544,833,37,40 -75525,34,1366,1545,129,37,40 -75526,34,1366,1546,129,37,40 -75527,34,1366,1547,129,37,40 -75528,34,1366,1548,349,37,40 -75529,33,906,1537,129,7,11 -75530,33,906,1538,129,7,11 -75531,33,906,1539,129,7,11 -75532,33,906,1540,833,7,11 -75533,33,906,1541,833,7,11 -75534,33,906,1542,833,7,11 -75535,33,906,1543,833,7,11 -75536,33,906,1544,833,7,11 -75537,33,906,1545,339,7,11 -75538,33,906,1546,339,7,11 -75539,33,906,1547,339,7,11 -75540,33,906,1548,339,7,11 -75541,34,906,1537,129,7,11 -75542,34,906,1538,129,7,11 -75543,34,906,1539,129,7,11 -75544,34,906,1540,833,7,11 -75545,34,906,1541,833,7,11 -75546,34,906,1542,833,7,11 -75547,34,906,1543,833,7,11 -75548,34,906,1544,833,7,11 -75549,34,906,1545,339,7,11 -75550,34,906,1546,339,7,11 -75551,34,906,1547,339,7,11 -75552,34,906,1548,339,7,11 -75553,33,1367,1499,37,24,24 -75554,33,1367,1499,607,25,25 -75555,33,1367,1499,850,25,25 -75556,34,1367,1499,37,24,24 -75557,34,1367,1499,607,25,25 -75558,34,1367,1499,850,25,25 -75559,33,845,1513,10174,10,14 -75560,33,845,1514,10174,10,14 -75561,33,845,1523,10174,10,14 -75562,33,845,1524,10174,10,14 -75563,33,845,1515,829,10,14 -75564,33,845,1516,829,10,14 -75565,33,845,1519,829,10,14 -75566,33,845,1517,37,10,14 -75567,33,845,1520,37,10,14 -75568,33,845,1518,434,10,14 -75569,33,845,1521,568,10,14 -75570,33,845,1522,236,10,14 -75571,34,845,1513,10174,10,14 -75572,34,845,1514,10174,10,14 -75573,34,845,1523,10174,10,14 -75574,34,845,1524,10174,10,14 -75575,34,845,1515,829,10,14 -75576,34,845,1516,829,10,14 -75577,34,845,1519,829,10,14 -75578,34,845,1517,58,10,14 -75579,34,845,1520,58,10,14 -75580,34,845,1518,434,10,14 -75581,34,845,1521,568,10,14 -75582,34,845,1522,236,10,14 -75583,33,845,1501,821,8,13 -75584,33,845,1502,821,8,13 -75585,33,845,1503,66,8,13 -75586,33,845,1507,66,8,13 -75587,33,845,1504,674,8,13 -75588,33,845,1505,674,8,13 -75589,33,845,1506,749,8,13 -75590,33,845,1508,749,8,13 -75591,33,845,1509,599,8,13 -75592,33,845,1510,599,8,13 -75593,33,845,1511,599,8,13 -75594,33,845,1512,850,8,13 -75595,34,845,1501,821,8,13 -75596,34,845,1502,821,8,13 -75597,34,845,1503,66,8,13 -75598,34,845,1507,66,8,13 -75599,34,845,1504,674,8,13 -75600,34,845,1505,674,8,13 -75601,34,845,1506,749,8,13 -75602,34,845,1508,749,8,13 -75603,34,845,1509,599,8,13 -75604,34,845,1510,599,8,13 -75605,34,845,1511,599,8,13 -75606,34,845,1512,850,8,13 -75607,33,845,1499,822,18,18 -75608,34,845,1499,822,18,18 -75609,33,1368,1513,837,10,13 -75610,33,1368,1514,837,10,13 -75611,33,1368,1515,837,10,13 -75612,33,1368,1516,837,10,13 -75613,33,1368,1517,837,10,13 -75614,33,1368,1518,837,10,13 -75615,33,1368,1519,837,10,13 -75616,33,1368,1520,837,10,13 -75617,33,1368,1521,837,10,13 -75618,33,1368,1522,837,10,13 -75619,33,1368,1523,837,10,13 -75620,33,1368,1524,568,10,13 -75621,34,1368,1513,837,10,13 -75622,34,1368,1514,837,10,13 -75623,34,1368,1515,837,10,13 -75624,34,1368,1516,837,10,13 -75625,34,1368,1517,837,10,13 -75626,34,1368,1518,837,10,13 -75627,34,1368,1519,837,10,13 -75628,34,1368,1520,837,10,13 -75629,34,1368,1521,837,10,13 -75630,34,1368,1522,837,10,13 -75631,34,1368,1523,837,10,13 -75632,34,1368,1524,568,10,13 -75633,33,882,1513,837,11,14 -75634,33,882,1514,837,11,14 -75635,33,882,1515,532,11,14 -75636,33,882,1516,532,11,14 -75637,33,882,1517,527,11,14 -75638,33,882,1519,527,11,14 -75639,33,882,1518,50,11,14 -75640,33,882,1520,529,11,14 -75641,33,882,1521,529,11,14 -75642,33,882,1522,524,11,14 -75643,33,882,1523,524,11,14 -75644,33,882,1524,524,11,14 -75645,33,882,1499,838,18,18 -75646,34,882,1513,837,11,14 -75647,34,882,1514,837,11,14 -75648,34,882,1515,532,11,14 -75649,34,882,1516,532,11,14 -75650,34,882,1517,527,11,14 -75651,34,882,1519,527,11,14 -75652,34,882,1518,50,11,14 -75653,34,882,1520,529,11,14 -75654,34,882,1521,529,11,14 -75655,34,882,1522,524,11,14 -75656,34,882,1523,524,11,14 -75657,34,882,1524,524,11,14 -75658,34,882,1499,838,18,18 -75659,33,845,1549,819,8,13 -75660,33,845,1550,819,8,13 -75661,33,845,1551,819,8,13 -75662,33,845,1552,819,8,13 -75663,33,845,1553,819,8,13 -75664,33,845,1554,819,8,13 -75665,33,845,1555,420,8,13 -75666,33,845,1556,420,8,13 -75667,33,845,1557,420,8,13 -75668,33,845,1558,420,8,13 -75669,33,845,1559,420,8,13 -75670,33,845,1560,420,8,13 -75671,34,845,1549,819,8,13 -75672,34,845,1550,819,8,13 -75673,34,845,1551,819,8,13 -75674,34,845,1552,819,8,13 -75675,34,845,1553,819,8,13 -75676,34,845,1554,819,8,13 -75677,34,845,1555,420,8,13 -75678,34,845,1556,420,8,13 -75679,34,845,1557,420,8,13 -75680,34,845,1558,420,8,13 -75681,34,845,1559,420,8,13 -75682,34,845,1560,420,8,13 From d1e0267308c4fd625b5eb8aac9fed2e8032cc851 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 19:40:12 -0500 Subject: [PATCH 26/50] feat: add galar-route-1 encounters --- data/v2/csv/encounters.csv | 52 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 9d7da05b5..6140a880e 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69426,3 +69426,55 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75288,16,207,1497,127,27,28 75289,15,207,1498,415,27,34 75290,16,207,1498,415,27,34 +75291,33,843,1514,819,3,6 +75292,33,843,1515,819,3,6 +75293,33,843,1516,819,3,6 +75294,33,843,1517,821,3,6 +75295,33,843,1518,821,3,6 +75296,33,843,1519,821,3,6 +75297,33,843,1520,831,3,6 +75298,33,843,1521,831,3,6 +75299,33,843,1522,831,3,6 +75300,33,843,1523,827,3,6 +75301,33,843,1524,827,3,6 +75302,33,843,1525,827,3,6 +75303,33,843,1526,827,3,6 +75304,33,843,1501,819,2,5 +75305,33,843,1502,819,2,5 +75306,33,843,1507,819,2,5 +75307,33,843,1503,824,2,5 +75308,33,843,1504,824,2,5 +75309,33,843,1508,824,2,5 +75310,33,843,1505,10,2,5 +75311,33,843,1509,10,2,5 +75312,33,843,1506,736,2,5 +75313,33,843,1510,163,2,5 +75314,33,843,1511,163,2,5 +75315,33,843,1512,163,2,5 +75316,33,843,1513,163,2,5 +75317,34,843,1514,819,3,6 +75318,34,843,1515,819,3,6 +75319,34,843,1516,819,3,6 +75320,34,843,1517,821,3,6 +75321,34,843,1518,821,3,6 +75322,34,843,1519,821,3,6 +75323,34,843,1520,831,3,6 +75324,34,843,1521,831,3,6 +75325,34,843,1522,831,3,6 +75326,34,843,1523,827,3,6 +75327,34,843,1524,827,3,6 +75328,34,843,1525,827,3,6 +75329,34,843,1526,827,3,6 +75330,34,843,1501,819,2,5 +75331,34,843,1502,819,2,5 +75332,34,843,1507,819,2,5 +75333,34,843,1503,824,2,5 +75334,34,843,1504,824,2,5 +75335,34,843,1508,824,2,5 +75336,34,843,1505,10,2,5 +75337,34,843,1509,10,2,5 +75338,34,843,1506,736,2,5 +75339,34,843,1510,163,2,5 +75340,34,843,1511,163,2,5 +75341,34,843,1512,163,2,5 +75342,34,843,1513,163,2,5 From 364879a21b91a914d22b939d0a0df1f45fe09a59 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 19:41:08 -0500 Subject: [PATCH 27/50] feat: add wedgehurst encounters and location area prose --- data/v2/csv/encounters.csv | 2 ++ data/v2/csv/location_area_prose.csv | 1 + 2 files changed, 3 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 6140a880e..b0ad0b953 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69478,3 +69478,5 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75340,34,843,1511,163,2,5 75341,34,843,1512,163,2,5 75342,34,843,1513,163,2,5 +75343,33,942,578,10164,12,12 +75344,34,942,578,10164,12,12 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 07e58b5d8..d19ed5ec9 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2181,6 +2181,7 @@ location_area_id,local_language_id,name 845,9,Route 3 (East) 882,9,Galar Mine 906,9,Motostoke +942,9,Wegehurst 1167,9,Lighthouse Basement 1167,6,Leuchtturm Keller 1167,5,Phare de la Liberté From 4ff783151868bb6c87afbfbf0acf09df76bc2c21 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 19:49:26 -0500 Subject: [PATCH 28/50] feat: add galar-route-2 encounters for main and lake location areas --- data/v2/csv/encounters.csv | 86 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index b0ad0b953..e4efa4e84 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69480,3 +69480,89 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75342,34,843,1513,163,2,5 75343,33,942,578,10164,12,12 75344,34,942,578,10164,12,12 +75345,33,844,1514,819,5,7 +75346,33,844,1515,819,5,7 +75347,33,844,1523,819,5,7 +75348,33,844,1524,819,5,7 +75349,33,844,1516,821,5,7 +75350,33,844,1517,821,5,7 +75351,33,844,1520,821,5,7 +75352,33,844,1518,827,5,7 +75353,33,844,1521,827,5,7 +75354,33,844,1519,833,5,7 +75355,33,844,1522,835,5,7 +75356,33,844,1525,10174,5,7 +75357,33,844,1526,10174,5,7 +75358,34,844,1514,819,5,7 +75359,34,844,1515,819,5,7 +75360,34,844,1523,819,5,7 +75361,34,844,1524,819,5,7 +75362,34,844,1516,821,5,7 +75363,34,844,1517,821,5,7 +75364,34,844,1520,821,5,7 +75365,34,844,1518,827,5,7 +75366,34,844,1521,827,5,7 +75367,34,844,1519,833,5,7 +75368,34,844,1522,835,5,7 +75369,34,844,1525,10174,5,7 +75370,34,844,1526,10174,5,7 +75371,33,844,1499,833,8,8 +75372,33,844,1499,835,8,8 +75373,34,844,1499,833,8,8 +75374,34,844,1499,835,8,8 +75375,33,844,1540,129,4,6 +75376,33,844,1541,129,4,6 +75377,33,844,1542,129,4,6 +75378,33,844,1543,129,4,6 +75379,33,844,1544,129,4,6 +75380,33,844,1545,129,4,6 +75381,33,844,1546,833,4,6 +75382,33,844,1547,833,4,6 +75383,33,844,1548,833,4,6 +75384,33,844,1549,846,4,6 +75385,33,844,1550,846,4,6 +75386,33,844,1551,846,4,6 +75387,33,844,1552,846,4,6 +75388,34,844,1540,129,4,6 +75389,34,844,1541,129,4,6 +75390,34,844,1542,129,4,6 +75391,34,844,1543,129,4,6 +75392,34,844,1544,129,4,6 +75393,34,844,1545,129,4,6 +75394,34,844,1546,833,4,6 +75395,34,844,1547,833,4,6 +75396,34,844,1548,833,4,6 +75397,34,844,1549,846,4,6 +75398,34,844,1550,846,4,6 +75399,34,844,1551,846,4,6 +75400,34,844,1552,846,4,6 +75401,33,1365,1499,834,50,50 +75402,33,1365,1500,131,55,55 +75403,34,1365,1499,834,50,50 +75404,34,1365,1500,131,55,55 +75405,33,1365,1527,846,38,40 +75406,33,1365,1528,846,38,40 +75407,33,1365,1529,846,38,40 +75408,33,1365,1530,846,38,40 +75409,33,1365,1531,846,38,40 +75410,33,1365,1532,847,38,40 +75411,33,1365,1533,847,38,40 +75412,33,1365,1534,847,38,40 +75413,33,1365,1535,847,38,40 +75414,33,1365,1536,847,38,40 +75415,33,1365,1537,847,38,40 +75416,33,1365,1538,130,38,40 +75417,33,1365,1539,130,38,40 +75418,34,1365,1527,846,38,40 +75419,34,1365,1528,846,38,40 +75420,34,1365,1529,846,38,40 +75421,34,1365,1530,846,38,40 +75422,34,1365,1531,846,38,40 +75423,34,1365,1532,847,38,40 +75424,34,1365,1533,847,38,40 +75425,34,1365,1534,847,38,40 +75426,34,1365,1535,847,38,40 +75427,34,1365,1536,847,38,40 +75428,34,1365,1537,847,38,40 +75429,34,1365,1538,130,38,40 +75430,34,1365,1539,130,38,40 From d14ec02087e35ec3fce0e1ee54d024129a17638f Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 19:55:45 -0500 Subject: [PATCH 29/50] feat: add galar-route-2-lakeside encounters --- data/v2/csv/encounters.csv | 80 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index e4efa4e84..5d4250e26 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69566,3 +69566,83 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75428,34,1365,1537,847,38,40 75429,34,1365,1538,130,38,40 75430,34,1365,1539,130,38,40 +75431,33,1366,1514,10174,40,43 +75432,33,1366,1515,10174,40,43 +75433,33,1366,1516,10174,40,43 +75434,33,1366,1517,824,40,43 +75435,33,1366,1518,824,40,43 +75436,33,1366,1519,824,40,43 +75437,33,1366,1520,827,40,43 +75438,33,1366,1521,827,40,43 +75439,33,1366,1522,827,40,43 +75440,33,1366,1523,835,40,43 +75441,33,1366,1524,835,40,43 +75442,33,1366,1525,835,40,43 +75443,33,1366,1526,835,40,43 +75444,34,1366,1514,10174,40,43 +75445,34,1366,1515,10174,40,43 +75446,34,1366,1516,10174,40,43 +75447,34,1366,1517,824,40,43 +75448,34,1366,1518,824,40,43 +75449,34,1366,1519,824,40,43 +75450,34,1366,1520,827,40,43 +75451,34,1366,1521,827,40,43 +75452,34,1366,1522,827,40,43 +75453,34,1366,1523,835,40,43 +75454,34,1366,1524,835,40,43 +75455,34,1366,1525,835,40,43 +75456,34,1366,1526,835,40,43 +75457,33,1366,1501,829,37,40 +75458,33,1366,1502,829,37,40 +75459,33,1366,1503,509,37,40 +75460,33,1366,1504,509,37,40 +75461,33,1366,1507,509,37,40 +75462,33,1366,1505,273,37,40 +75463,33,1366,1506,273,37,40 +75464,33,1366,1508,824,37,40 +75465,33,1366,1509,824,37,40 +75466,33,1366,1510,833,37,40 +75467,33,1366,1511,833,37,40 +75468,33,1366,1512,833,37,40 +75469,33,1366,1513,833,37,40 +75470,34,1366,1501,829,37,40 +75471,34,1366,1502,829,37,40 +75472,34,1366,1503,509,37,40 +75473,34,1366,1504,509,37,40 +75474,34,1366,1507,509,37,40 +75475,34,1366,1505,270,37,40 +75476,34,1366,1506,270,37,40 +75477,34,1366,1508,824,37,40 +75478,34,1366,1509,824,37,40 +75479,34,1366,1510,833,37,40 +75480,34,1366,1511,833,37,40 +75481,34,1366,1512,833,37,40 +75482,34,1366,1513,833,37,40 +75483,33,1366,1499,862,50,50 +75484,34,1366,1499,862,50,50 +75485,33,1366,1540,129,37,40 +75486,33,1366,1541,129,37,40 +75487,33,1366,1542,129,37,40 +75488,33,1366,1548,129,37,40 +75489,33,1366,1549,129,37,40 +75490,33,1366,1550,129,37,40 +75491,33,1366,1551,129,37,40 +75492,33,1366,1543,833,37,40 +75493,33,1366,1544,833,37,40 +75494,33,1366,1545,833,37,40 +75495,33,1366,1546,833,37,40 +75496,33,1366,1547,833,37,40 +75497,33,1366,1552,349,37,40 +75498,34,1366,1540,129,37,40 +75499,34,1366,1541,129,37,40 +75500,34,1366,1542,129,37,40 +75501,34,1366,1548,129,37,40 +75502,34,1366,1549,129,37,40 +75503,34,1366,1550,129,37,40 +75504,34,1366,1551,129,37,40 +75505,34,1366,1543,833,37,40 +75506,34,1366,1544,833,37,40 +75507,34,1366,1545,833,37,40 +75508,34,1366,1546,833,37,40 +75509,34,1366,1547,833,37,40 +75510,34,1366,1552,349,37,40 From 471b1276c04a5bd52f09d0577bec262ce0f5c949 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 19:59:56 -0500 Subject: [PATCH 30/50] feat: add motostoke encounters --- data/v2/csv/encounters.csv | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 5d4250e26..131834479 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69646,3 +69646,35 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75508,34,1366,1546,833,37,40 75509,34,1366,1547,833,37,40 75510,34,1366,1552,349,37,40 +75511,33,906,1540,129,7,11 +75512,33,906,1541,129,7,11 +75513,33,906,1542,129,7,11 +75514,33,906,1543,833,7,11 +75515,33,906,1544,833,7,11 +75516,33,906,1545,833,7,11 +75517,33,906,1546,833,7,11 +75518,33,906,1547,833,7,11 +75519,33,906,1548,339,7,11 +75520,33,906,1549,339,7,11 +75521,33,906,1550,339,7,11 +75522,33,906,1551,339,7,11 +75523,33,906,1552,339,7,11 +75524,34,906,1540,129,7,11 +75525,34,906,1541,129,7,11 +75526,34,906,1542,129,7,11 +75527,34,906,1543,833,7,11 +75528,34,906,1544,833,7,11 +75529,34,906,1545,833,7,11 +75530,34,906,1546,833,7,11 +75531,34,906,1547,833,7,11 +75532,34,906,1548,339,7,11 +75533,34,906,1549,339,7,11 +75534,34,906,1550,339,7,11 +75535,34,906,1551,339,7,11 +75536,34,906,1552,339,7,11 +75537,33,1367,1499,37,24,24 +75538,33,1367,1499,607,25,25 +75539,33,1367,1499,850,25,25 +75540,34,1367,1499,37,24,24 +75541,34,1367,1499,607,25,25 +75542,34,1367,1499,850,25,25 From 11fb367ecd47d3829d21f0a1e12f940e7516b7ea Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 20:07:02 -0500 Subject: [PATCH 31/50] feat: add galar-route-3 encounters --- data/v2/csv/encounters.csv | 106 +++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 131834479..c08217aef 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69678,3 +69678,109 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75540,34,1367,1499,37,24,24 75541,34,1367,1499,607,25,25 75542,34,1367,1499,850,25,25 +75543,33,845,1514,10174,10,14 +75544,33,845,1515,10174,10,14 +75545,33,845,1523,10174,10,14 +75546,33,845,1524,10174,10,14 +75547,33,845,1516,829,10,14 +75548,33,845,1517,829,10,14 +75549,33,845,1520,829,10,14 +75550,33,845,1518,37,10,14 +75551,33,845,1521,37,10,14 +75552,33,845,1519,434,10,14 +75553,33,845,1522,568,10,14 +75554,33,845,1525,236,10,14 +75555,33,845,1526,236,10,14 +75556,34,845,1514,10174,10,14 +75557,34,845,1515,10174,10,14 +75558,34,845,1523,10174,10,14 +75559,34,845,1524,10174,10,14 +75560,34,845,1516,829,10,14 +75561,34,845,1517,829,10,14 +75562,34,845,1520,829,10,14 +75563,34,845,1518,58,10,14 +75564,34,845,1521,58,10,14 +75565,34,845,1519,434,10,14 +75566,34,845,1522,568,10,14 +75567,34,845,1525,236,10,14 +75568,34,845,1526,236,10,14 +75569,33,845,1501,821,8,13 +75570,33,845,1502,821,8,13 +75571,33,845,1503,66,8,13 +75572,33,845,1507,66,8,13 +75573,33,845,1504,674,8,13 +75574,33,845,1505,674,8,13 +75575,33,845,1506,749,8,13 +75576,33,845,1508,749,8,13 +75577,33,845,1509,599,8,13 +75578,33,845,1510,599,8,13 +75579,33,845,1511,599,8,13 +75580,33,845,1512,599,8,13 +75581,33,845,1513,850,8,13 +75582,34,845,1501,821,8,13 +75583,34,845,1502,821,8,13 +75584,34,845,1503,66,8,13 +75585,34,845,1507,66,8,13 +75586,34,845,1504,674,8,13 +75587,34,845,1505,674,8,13 +75588,34,845,1506,749,8,13 +75589,34,845,1508,749,8,13 +75590,34,845,1509,599,8,13 +75591,34,845,1510,599,8,13 +75592,34,845,1511,599,8,13 +75593,34,845,1512,599,8,13 +75594,34,845,1513,850,8,13 +75595,33,845,1499,822,18,18 +75596,34,845,1499,822,18,18 +75597,33,845,1553,819,8,13 +75598,33,845,1554,819,8,13 +75599,33,845,1555,819,8,13 +75600,33,845,1556,819,8,13 +75601,33,845,1557,819,8,13 +75602,33,845,1558,819,8,13 +75603,33,845,1559,420,8,13 +75604,33,845,1560,420,8,13 +75605,33,845,1561,420,8,13 +75606,33,845,1562,420,8,13 +75607,33,845,1563,420,8,13 +75608,33,845,1564,420,8,13 +75609,33,845,1565,420,8,13 +75610,34,845,1553,819,8,13 +75611,34,845,1554,819,8,13 +75612,34,845,1555,819,8,13 +75613,34,845,1556,819,8,13 +75614,34,845,1557,819,8,13 +75615,34,845,1558,819,8,13 +75616,34,845,1559,420,8,13 +75617,34,845,1560,420,8,13 +75618,34,845,1561,420,8,13 +75619,34,845,1562,420,8,13 +75620,34,845,1563,420,8,13 +75621,34,845,1564,420,8,13 +75622,34,845,1565,420,8,13 +75623,33,1368,1514,837,10,13 +75624,33,1368,1515,837,10,13 +75625,33,1368,1516,837,10,13 +75626,33,1368,1517,837,10,13 +75627,33,1368,1518,837,10,13 +75628,33,1368,1519,837,10,13 +75629,33,1368,1520,837,10,13 +75630,33,1368,1521,837,10,13 +75631,33,1368,1522,837,10,13 +75632,33,1368,1523,837,10,13 +75633,33,1368,1524,837,10,13 +75634,33,1368,1525,837,10,13 +75635,33,1368,1526,568,10,13 +75636,34,1368,1514,837,10,13 +75637,34,1368,1515,837,10,13 +75638,34,1368,1516,837,10,13 +75639,34,1368,1517,837,10,13 +75640,34,1368,1518,837,10,13 +75641,34,1368,1519,837,10,13 +75642,34,1368,1520,837,10,13 +75643,34,1368,1521,837,10,13 +75644,34,1368,1522,837,10,13 +75645,34,1368,1523,837,10,13 +75646,34,1368,1524,837,10,13 +75647,34,1368,1525,837,10,13 +75648,34,1368,1526,568,10,13 From dd468e494d6ba988755e74748d0262fbf503d9e1 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 20:11:23 -0500 Subject: [PATCH 32/50] feat: add galar-mine encounters --- data/v2/csv/encounters.csv | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index c08217aef..351717b19 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69784,3 +69784,33 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75646,34,1368,1524,837,10,13 75647,34,1368,1525,837,10,13 75648,34,1368,1526,568,10,13 +75649,33,882,1514,837,11,14 +75650,33,882,1515,837,11,14 +75651,33,882,1516,532,11,14 +75652,33,882,1517,532,11,14 +75653,33,882,1518,527,11,14 +75654,33,882,1520,527,11,14 +75655,33,882,1519,50,11,14 +75656,33,882,1521,529,11,14 +75657,33,882,1522,529,11,14 +75658,33,882,1523,524,11,14 +75659,33,882,1524,524,11,14 +75660,33,882,1525,524,11,14 +75661,33,882,1526,524,11,14 +75662,34,882,1514,837,11,14 +75663,34,882,1515,837,11,14 +75664,34,882,1516,524,11,14 +75665,34,882,1517,524,11,14 +75666,34,882,1518,527,11,14 +75667,34,882,1520,527,11,14 +75668,34,882,1519,50,11,14 +75669,34,882,1521,529,11,14 +75670,34,882,1522,529,11,14 +75671,34,882,1523,532,11,14 +75672,34,882,1524,532,11,14 +75673,34,882,1525,532,11,14 +75674,34,882,1526,532,11,14 +75675,33,882,1499,838,18,18 +75676,34,882,1499,838,18,18 +75677,33,882,1499,527,16,16 +75678,34,882,1499,527,16,16 From f169604b15f698f1bb0db50e76697ef053ef240c Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 20:16:09 -0500 Subject: [PATCH 33/50] fix: change overworld-special and overworld-water-special to only-one for certain encounters --- data/v2/csv/encounters.csv | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 351717b19..5c17cd91f 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69506,10 +69506,10 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75368,34,844,1522,835,5,7 75369,34,844,1525,10174,5,7 75370,34,844,1526,10174,5,7 -75371,33,844,1499,833,8,8 -75372,33,844,1499,835,8,8 -75373,34,844,1499,833,8,8 -75374,34,844,1499,835,8,8 +75371,33,844,578,833,8,8 +75372,33,844,578,835,8,8 +75373,34,844,578,833,8,8 +75374,34,844,578,835,8,8 75375,33,844,1540,129,4,6 75376,33,844,1541,129,4,6 75377,33,844,1542,129,4,6 @@ -69536,10 +69536,10 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75398,34,844,1550,846,4,6 75399,34,844,1551,846,4,6 75400,34,844,1552,846,4,6 -75401,33,1365,1499,834,50,50 -75402,33,1365,1500,131,55,55 -75403,34,1365,1499,834,50,50 -75404,34,1365,1500,131,55,55 +75401,33,1365,578,834,50,50 +75402,33,1365,578,131,55,55 +75403,34,1365,578,834,50,50 +75404,34,1365,578,131,55,55 75405,33,1365,1527,846,38,40 75406,33,1365,1528,846,38,40 75407,33,1365,1529,846,38,40 @@ -69618,8 +69618,8 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75480,34,1366,1511,833,37,40 75481,34,1366,1512,833,37,40 75482,34,1366,1513,833,37,40 -75483,33,1366,1499,862,50,50 -75484,34,1366,1499,862,50,50 +75483,33,1366,578,862,50,50 +75484,34,1366,578,862,50,50 75485,33,1366,1540,129,37,40 75486,33,1366,1541,129,37,40 75487,33,1366,1542,129,37,40 From 03e5189e131bc90656f874f7cc869743b7fede22 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 20:28:36 -0500 Subject: [PATCH 34/50] feat: add galar-route-4 encounters --- data/v2/csv/encounters.csv | 106 ++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + 2 files changed, 107 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 5c17cd91f..896c92048 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69814,3 +69814,109 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75676,34,882,1499,838,18,18 75677,33,882,1499,527,16,16 75678,34,882,1499,527,16,16 +75679,33,847,1515,309,14,16 +75680,33,847,1516,309,14,16 +75681,33,847,1514,10161,14,16 +75682,33,847,1523,10161,14,16 +75683,33,847,1524,10161,14,16 +75684,33,847,1517,835,14,16 +75685,33,847,1518,835,14,16 +75686,33,847,1519,710,14,16 +75687,33,847,1520,10027,14,16 +75688,33,847,1521,10028,14,16 +75689,33,847,1522,25,14,16 +75690,33,847,1525,133,14,16 +75691,33,847,1526,10029,14,16 +75692,34,847,1515,309,14,16 +75693,34,847,1516,309,14,16 +75694,34,847,1514,10161,14,16 +75695,34,847,1523,10161,14,16 +75696,34,847,1524,10161,14,16 +75697,34,847,1517,835,14,16 +75698,34,847,1518,835,14,16 +75699,34,847,1519,710,14,16 +75700,34,847,1520,10027,14,16 +75701,34,847,1521,10028,14,16 +75702,34,847,1522,133,14,16 +75703,34,847,1525,25,14,16 +75704,34,847,1526,10029,14,16 +75705,33,847,1501,10161,13,15 +75706,33,847,1502,10161,13,15 +75707,33,847,1503,831,13,15 +75708,33,847,1504,831,13,15 +75709,33,847,1505,868,13,15 +75710,33,847,1506,868,13,15 +75711,33,847,1507,595,13,15 +75712,33,847,1508,595,13,15 +75713,33,847,1509,742,13,15 +75714,33,847,1510,406,13,15 +75715,33,847,1511,406,13,15 +75716,33,847,1512,406,13,15 +75717,33,847,1513,597,13,15 +75718,34,847,1501,10161,13,15 +75719,34,847,1502,10161,13,15 +75720,34,847,1503,831,13,15 +75721,34,847,1504,831,13,15 +75722,34,847,1505,868,13,15 +75723,34,847,1506,868,13,15 +75724,34,847,1507,595,13,15 +75725,34,847,1508,595,13,15 +75726,34,847,1509,742,13,15 +75727,34,847,1510,406,13,15 +75728,34,847,1511,406,13,15 +75729,34,847,1512,406,13,15 +75730,34,847,1513,597,13,15 +75731,33,847,1499,50,17,17 +75732,34,847,1499,50,17,17 +75733,33,847,1553,819,13,15 +75734,33,847,1554,819,13,15 +75735,33,847,1555,819,13,15 +75736,33,847,1556,819,13,15 +75737,33,847,1557,819,13,15 +75738,33,847,1558,819,13,15 +75739,33,847,1559,819,13,15 +75740,33,847,1560,819,13,15 +75741,33,847,1561,819,13,15 +75742,33,847,1562,819,13,15 +75743,33,847,1563,819,13,15 +75744,33,847,1564,819,13,15 +75745,33,847,1565,819,13,15 +75746,34,847,1553,819,13,15 +75747,34,847,1554,819,13,15 +75748,34,847,1555,819,13,15 +75749,34,847,1556,819,13,15 +75750,34,847,1557,819,13,15 +75751,34,847,1558,819,13,15 +75752,34,847,1559,819,13,15 +75753,34,847,1560,819,13,15 +75754,34,847,1561,819,13,15 +75755,34,847,1562,819,13,15 +75756,34,847,1563,819,13,15 +75757,34,847,1564,819,13,15 +75758,34,847,1565,819,13,15 +75759,33,847,1540,129,13,15 +75760,33,847,1541,129,13,15 +75761,33,847,1542,129,13,15 +75762,33,847,1543,129,13,15 +75763,33,847,1544,129,13,15 +75764,33,847,1545,833,13,15 +75765,33,847,1546,833,13,15 +75766,33,847,1547,833,13,15 +75767,33,847,1548,118,13,15 +75768,33,847,1549,118,13,15 +75769,33,847,1550,118,13,15 +75770,33,847,1551,118,13,15 +75771,33,847,1552,118,13,15 +75772,34,847,1540,129,13,15 +75773,34,847,1541,129,13,15 +75774,34,847,1542,129,13,15 +75775,34,847,1543,129,13,15 +75776,34,847,1544,129,13,15 +75777,34,847,1545,833,13,15 +75778,34,847,1546,833,13,15 +75779,34,847,1547,833,13,15 +75780,34,847,1548,118,13,15 +75781,34,847,1549,118,13,15 +75782,34,847,1550,118,13,15 +75783,34,847,1551,118,13,15 +75784,34,847,1552,118,13,15 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index d19ed5ec9..7f1f38f47 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2179,6 +2179,7 @@ location_area_id,local_language_id,name 843,9,Route 1 844,9,Route 2 845,9,Route 3 (East) +847,9,Route 4 882,9,Galar Mine 906,9,Motostoke 942,9,Wegehurst From cc6c5967e92abeb5382c0891585987f74eba0df5 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 20:35:58 -0500 Subject: [PATCH 35/50] feat: add turffield encounters and location area prose --- data/v2/csv/encounters.csv | 2 ++ data/v2/csv/location_area_prose.csv | 1 + 2 files changed, 3 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 896c92048..d8c8947f3 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69920,3 +69920,5 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75782,34,847,1550,118,13,15 75783,34,847,1551,118,13,15 75784,34,847,1552,118,13,15 +75785,33,939,578,342,50,50 +75786,34,939,578,342,50,50 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 7f1f38f47..ccaa6c4f3 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2182,6 +2182,7 @@ location_area_id,local_language_id,name 847,9,Route 4 882,9,Galar Mine 906,9,Motostoke +939,9,Turffield 942,9,Wegehurst 1167,9,Lighthouse Basement 1167,6,Leuchtturm Keller From d3d1f0c8fb34b34d7093aa13fa9a02a386d44de5 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 20:58:12 -0500 Subject: [PATCH 36/50] feat: add galar-route-5 encounters and location area prose --- data/v2/csv/encounters.csv | 106 ++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + 2 files changed, 107 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index d8c8947f3..4ce998d97 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69922,3 +69922,109 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75784,34,847,1552,118,13,15 75785,33,939,578,342,50,50 75786,34,939,578,342,50,50 +75787,33,848,1514,759,19,21 +75788,33,848,1515,759,19,21 +75789,33,848,1516,684,19,21 +75790,33,848,1517,684,19,21 +75791,33,848,1520,684,19,21 +75792,33,848,1518,572,19,21 +75793,33,848,1521,572,19,21 +75794,33,848,1519,202,19,21 +75795,33,848,1522,10166,19,21 +75796,33,848,1523,425,19,21 +75797,33,848,1524,425,19,21 +75798,33,848,1525,425,19,21 +75799,33,848,1526,425,19,21 +75800,34,848,1514,759,19,21 +75801,34,848,1515,759,19,21 +75802,34,848,1516,682,19,21 +75803,34,848,1517,682,19,21 +75804,34,848,1520,682,19,21 +75805,34,848,1518,572,19,21 +75806,34,848,1519,572,19,21 +75807,34,848,1521,202,19,21 +75808,34,848,1522,202,19,21 +75809,34,848,1523,425,19,21 +75810,34,848,1524,425,19,21 +75811,34,848,1525,425,19,21 +75812,34,848,1526,425,19,21 +75813,33,848,1502,825,16,18 +75814,33,848,1504,825,16,18 +75815,33,848,1513,825,16,18 +75816,33,848,1501,677,16,18 +75817,33,848,1503,274,16,18 +75818,33,848,1507,274,16,18 +75819,33,848,1505,684,16,18 +75820,33,848,1510,684,16,18 +75821,33,848,1511,684,16,18 +75822,33,848,1512,684,16,18 +75823,33,848,1508,751,16,18 +75824,33,848,1506,840,16,18 +75825,33,848,1509,290,16,18 +75826,34,848,1502,825,16,18 +75827,34,848,1504,825,16,18 +75828,34,848,1513,825,16,18 +75829,34,848,1501,677,16,18 +75830,34,848,1503,271,16,18 +75831,34,848,1507,271,16,18 +75832,34,848,1505,682,16,18 +75833,34,848,1510,682,16,18 +75834,34,848,1511,682,16,18 +75835,34,848,1512,682,16,18 +75836,34,848,1508,751,16,18 +75837,34,848,1506,840,16,18 +75838,34,848,1509,290,16,18 +75839,33,848,578,830,22,22 +75840,34,848,578,830,22,22 +75841,33,848,1553,819,16,18 +75842,33,848,1554,819,16,18 +75843,33,848,1555,819,16,18 +75844,33,848,1556,819,16,18 +75845,33,848,1557,819,16,18 +75846,33,848,1558,819,16,18 +75847,33,848,1559,819,16,18 +75848,33,848,1560,819,16,18 +75849,33,848,1561,819,16,18 +75850,33,848,1562,819,16,18 +75851,33,848,1563,819,16,18 +75852,33,848,1564,819,16,18 +75853,33,848,1565,819,16,18 +75854,34,848,1553,819,16,18 +75855,34,848,1554,819,16,18 +75856,34,848,1555,819,16,18 +75857,34,848,1556,819,16,18 +75858,34,848,1557,819,16,18 +75859,34,848,1558,819,16,18 +75860,34,848,1559,819,16,18 +75861,34,848,1560,819,16,18 +75862,34,848,1561,819,16,18 +75863,34,848,1562,819,16,18 +75864,34,848,1563,819,16,18 +75865,34,848,1564,819,16,18 +75866,34,848,1565,819,16,18 +75867,33,848,1540,129,16,18 +75868,33,848,1541,129,16,18 +75869,33,848,1542,129,16,18 +75870,33,848,1543,129,16,18 +75871,33,848,1544,129,16,18 +75872,33,848,1545,833,16,18 +75873,33,848,1546,833,16,18 +75874,33,848,1547,833,16,18 +75875,33,848,1548,118,16,18 +75876,33,848,1549,118,16,18 +75877,33,848,1550,118,16,18 +75878,33,848,1551,118,16,18 +75879,33,848,1552,118,16,18 +75880,34,848,1540,129,16,18 +75881,34,848,1541,129,16,18 +75882,34,848,1542,129,16,18 +75883,34,848,1543,129,16,18 +75884,34,848,1544,129,16,18 +75885,34,848,1545,833,16,18 +75886,34,848,1546,833,16,18 +75887,34,848,1547,833,16,18 +75888,34,848,1548,118,16,18 +75889,34,848,1549,118,16,18 +75890,34,848,1550,118,16,18 +75891,34,848,1551,118,16,18 +75892,34,848,1552,118,16,18 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index ccaa6c4f3..60883776d 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2180,6 +2180,7 @@ location_area_id,local_language_id,name 844,9,Route 2 845,9,Route 3 (East) 847,9,Route 4 +848,9,Route 5 882,9,Galar Mine 906,9,Motostoke 939,9,Turffield From 1fc35afa589ba6b7cda1d75f67d5147bc2760773 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 21:02:55 -0500 Subject: [PATCH 37/50] feat: add hulbury encounters --- data/v2/csv/encounters.csv | 26 ++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + 2 files changed, 27 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 4ce998d97..2245ddc96 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70028,3 +70028,29 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75890,34,848,1550,118,16,18 75891,34,848,1551,118,16,18 75892,34,848,1552,118,16,18 +75893,33,896,1540,846,20,24 +75894,33,896,1541,846,20,24 +75895,33,896,1542,846,20,24 +75896,33,896,1543,833,20,24 +75897,33,896,1546,833,20,24 +75898,33,896,1544,170,20,24 +75899,33,896,1545,170,20,24 +75900,33,896,1547,550,20,24 +75901,33,896,1548,550,20,24 +75902,33,896,1549,746,20,24 +75903,33,896,1550,746,20,24 +75904,33,896,1551,746,20,24 +75905,33,896,1552,746,20,24 +75906,34,896,1540,846,20,24 +75907,34,896,1541,846,20,24 +75908,34,896,1542,846,20,24 +75909,34,896,1543,833,20,24 +75910,34,896,1546,833,20,24 +75911,34,896,1544,170,20,24 +75912,34,896,1545,170,20,24 +75913,34,896,1547,10016,20,24 +75914,34,896,1548,10016,20,24 +75915,34,896,1549,746,20,24 +75916,34,896,1550,746,20,24 +75917,34,896,1551,746,20,24 +75918,34,896,1552,746,20,24 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 60883776d..3588ebcc4 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2182,6 +2182,7 @@ location_area_id,local_language_id,name 847,9,Route 4 848,9,Route 5 882,9,Galar Mine +896,9,Hulbury 906,9,Motostoke 939,9,Turffield 942,9,Wegehurst From 5fc8c899bd8356697d72d8337143b58e324edab3 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Tue, 9 Jun 2026 08:53:34 -0500 Subject: [PATCH 38/50] feat: add galar-mine-no-2 encounters --- data/v2/csv/encounters.csv | 58 +++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + 2 files changed, 59 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 2245ddc96..53f7c7e42 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70054,3 +70054,61 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75916,34,896,1550,746,20,24 75917,34,896,1551,746,20,24 75918,34,896,1552,746,20,24 +75919,33,883,1514,422,20,24 +75920,33,883,1523,422,20,24 +75921,33,883,1524,422,20,24 +75922,33,883,1525,422,20,24 +75923,33,883,1526,422,20,24 +75924,33,883,1515,767,20,24 +75925,33,883,1517,767,20,24 +75926,33,883,1516,688,20,24 +75927,33,883,1518,559,20,24 +75928,33,883,1520,559,20,24 +75929,33,883,1521,833,20,24 +75930,33,883,1522,213,20,24 +75931,33,883,1519,714,20,24 +75932,34,883,1514,422,20,24 +75933,34,883,1523,422,20,24 +75934,34,883,1524,422,20,24 +75935,34,883,1525,422,20,24 +75936,34,883,1526,422,20,24 +75937,34,883,1515,767,20,24 +75938,34,883,1517,767,20,24 +75939,34,883,1516,833,20,24 +75940,34,883,1521,833,20,24 +75941,34,883,1518,453,20,24 +75942,34,883,1520,453,20,24 +75943,34,883,1522,213,20,24 +75944,34,883,1519,714,20,24 +75945,33,883,1499,10180,25,25 +75946,33,883,578,423,50,50 +75947,33,883,578,834,24,24 +75948,34,883,1499,10180,25,25 +75949,34,883,578,423,50,50 +75950,34,883,578,834,24,24 +75951,33,883,1540,339,20,24 +75952,33,883,1541,339,20,24 +75953,33,883,1542,339,20,24 +75954,33,883,1546,339,20,24 +75955,33,883,1543,833,20,24 +75956,33,883,1544,833,20,24 +75957,33,883,1545,833,20,24 +75958,33,883,1547,341,20,24 +75959,33,883,1548,341,20,24 +75960,33,883,1549,341,20,24 +75961,33,883,1550,341,20,24 +75962,33,883,1551,341,20,24 +75963,33,883,1552,341,20,24 +75964,34,883,1540,339,20,24 +75965,34,883,1541,339,20,24 +75966,34,883,1542,339,20,24 +75967,34,883,1546,339,20,24 +75968,34,883,1543,833,20,24 +75969,34,883,1544,833,20,24 +75970,34,883,1545,833,20,24 +75971,34,883,1547,341,20,24 +75972,34,883,1548,341,20,24 +75973,34,883,1549,341,20,24 +75974,34,883,1550,341,20,24 +75975,34,883,1551,341,20,24 +75976,34,883,1552,341,20,24 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 3588ebcc4..c278d03b5 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2182,6 +2182,7 @@ location_area_id,local_language_id,name 847,9,Route 4 848,9,Route 5 882,9,Galar Mine +883,9,Galar Mine No. 2 896,9,Hulbury 906,9,Motostoke 939,9,Turffield From 6c2003088f65aaa145a4eed36620d8a573335ebd Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Tue, 9 Jun 2026 09:02:33 -0500 Subject: [PATCH 39/50] feat: add motostoke-outskirts encounters and location area prose --- data/v2/csv/encounters.csv | 52 +++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + 2 files changed, 53 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 53f7c7e42..02f154223 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70112,3 +70112,55 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75974,34,883,1550,341,20,24 75975,34,883,1551,341,20,24 75976,34,883,1552,341,20,24 +75977,33,907,1514,164,22,26 +75978,33,907,1515,164,22,26 +75979,33,907,1520,164,22,26 +75980,33,907,1517,185,22,26 +75981,33,907,1518,185,22,26 +75982,33,907,1519,185,22,26 +75983,33,907,1516,109,22,26 +75984,33,907,1521,856,22,26 +75985,33,907,1522,856,22,26 +75986,33,907,1523,539,22,26 +75987,33,907,1524,539,22,26 +75988,33,907,1525,539,22,26 +75989,33,907,1526,539,22,26 +75990,34,907,1514,164,22,26 +75991,34,907,1515,164,22,26 +75992,34,907,1517,185,22,26 +75993,34,907,1518,185,22,26 +75994,34,907,1519,185,22,26 +75995,34,907,1516,109,22,26 +75996,34,907,1521,856,22,26 +75997,34,907,1522,856,22,26 +75998,34,907,1520,757,22,26 +75999,34,907,1523,538,22,26 +76000,34,907,1524,538,22,26 +76001,34,907,1525,538,22,26 +76002,34,907,1526,538,22,26 +76003,33,907,1501,559,21,24 +76004,33,907,1502,559,21,24 +76005,33,907,1504,524,21,24 +76006,33,907,1505,524,21,24 +76007,33,907,1506,524,21,24 +76008,33,907,1503,624,21,24 +76009,33,907,1507,624,21,24 +76010,33,907,1508,833,21,24 +76011,33,907,1509,833,21,24 +76012,33,907,1510,859,21,24 +76013,33,907,1511,859,21,24 +76014,33,907,1512,859,21,24 +76015,33,907,1513,859,21,24 +76016,34,907,1501,453,21,24 +76017,34,907,1502,453,21,24 +76018,34,907,1504,524,21,24 +76019,34,907,1505,524,21,24 +76020,34,907,1506,524,21,24 +76021,34,907,1503,624,21,24 +76022,34,907,1507,624,21,24 +76023,34,907,1508,833,21,24 +76024,34,907,1509,833,21,24 +76025,34,907,1510,859,21,24 +76026,34,907,1511,859,21,24 +76027,34,907,1512,859,21,24 +76028,34,907,1513,859,21,24 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index c278d03b5..99ba64a55 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2185,6 +2185,7 @@ location_area_id,local_language_id,name 883,9,Galar Mine No. 2 896,9,Hulbury 906,9,Motostoke +907,9,Motostoke Outskirts 939,9,Turffield 942,9,Wegehurst 1167,9,Lighthouse Basement From c3b41b0331f111814696c57dcc9ee5e9784bc7ed Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Tue, 9 Jun 2026 14:26:40 -0500 Subject: [PATCH 40/50] feat: add galar-route-6 encounters and location area prose --- data/v2/csv/encounters.csv | 104 ++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + 2 files changed, 105 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 02f154223..9c4fe77f9 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70164,3 +70164,107 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 76026,34,907,1511,859,21,24 76027,34,907,1512,859,21,24 76028,34,907,1513,859,21,24 +76029,33,849,1514,10179,29,33 +76030,33,849,1515,10179,29,33 +76031,33,849,1516,694,29,33 +76032,33,849,1517,694,29,33 +76033,33,849,1523,694,29,33 +76034,33,849,1524,694,29,33 +76035,33,849,1525,694,29,33 +76036,33,849,1518,51,29,33 +76037,33,849,1519,51,29,33 +76038,33,849,1520,556,29,33 +76039,33,849,1521,556,29,33 +76040,33,849,1522,610,29,33 +76041,33,849,1526,328,29,33 +76042,34,849,1514,10179,29,33 +76043,34,849,1515,10179,29,33 +76044,34,849,1516,694,29,33 +76045,34,849,1517,694,29,33 +76046,34,849,1523,694,29,33 +76047,34,849,1524,694,29,33 +76048,34,849,1525,694,29,33 +76049,34,849,1518,51,29,33 +76050,34,849,1519,51,29,33 +76051,34,849,1520,556,29,33 +76052,34,849,1521,556,29,33 +76053,34,849,1522,328,29,33 +76054,34,849,1526,610,29,33 +76055,33,849,1502,843,28,30 +76056,33,849,1503,843,28,30 +76057,33,849,1501,632,28,30 +76058,33,849,1504,355,28,30 +76059,33,849,1507,355,28,30 +76060,33,849,1510,355,28,30 +76061,33,849,1511,355,28,30 +76062,33,849,1505,451,28,30 +76063,33,849,1506,449,28,30 +76064,33,849,1508,631,28,30 +76065,33,849,1509,324,28,30 +76066,33,849,1512,701,28,30 +76067,33,849,1513,701,28,30 +76068,34,849,1502,843,28,30 +76069,34,849,1503,843,28,30 +76070,34,849,1501,631,28,30 +76071,34,849,1504,355,28,30 +76072,34,849,1507,355,28,30 +76073,34,849,1510,355,28,30 +76074,34,849,1511,355,28,30 +76075,34,849,1505,451,28,30 +76076,34,849,1506,449,28,30 +76077,34,849,1508,632,28,30 +76078,34,849,1509,324,28,30 +76079,34,849,1512,701,28,30 +76080,34,849,1513,701,28,30 +76081,33,849,1553,820,28,30 +76082,33,849,1554,820,28,30 +76083,33,849,1555,820,28,30 +76084,33,849,1556,820,28,30 +76085,33,849,1557,820,28,30 +76086,33,849,1558,820,28,30 +76087,33,849,1559,820,28,30 +76088,33,849,1560,820,28,30 +76089,33,849,1561,820,28,30 +76090,33,849,1562,820,28,30 +76091,33,849,1563,820,28,30 +76092,33,849,1564,820,28,30 +76093,33,849,1565,820,28,30 +76094,34,849,1553,820,28,30 +76095,34,849,1554,820,28,30 +76096,34,849,1555,820,28,30 +76097,34,849,1556,820,28,30 +76098,34,849,1557,820,28,30 +76099,34,849,1558,820,28,30 +76100,34,849,1559,820,28,30 +76101,34,849,1560,820,28,30 +76102,34,849,1561,820,28,30 +76103,34,849,1562,820,28,30 +76104,34,849,1563,820,28,30 +76105,34,849,1564,820,28,30 +76106,34,849,1565,820,28,30 +76107,33,849,1540,129,28,30 +76108,33,849,1541,129,28,30 +76109,33,849,1542,129,28,30 +76110,33,849,1543,129,28,30 +76111,33,849,1544,129,28,30 +76112,33,849,1545,834,28,30 +76113,33,849,1546,834,28,30 +76114,33,849,1547,834,28,30 +76115,33,849,1548,118,28,30 +76116,33,849,1549,118,28,30 +76117,33,849,1550,118,28,30 +76118,33,849,1551,118,28,30 +76119,33,849,1552,118,28,30 +76120,34,849,1540,129,28,30 +76121,34,849,1541,129,28,30 +76122,34,849,1542,129,28,30 +76123,34,849,1543,129,28,30 +76124,34,849,1544,129,28,30 +76125,34,849,1545,834,28,30 +76126,34,849,1546,834,28,30 +76127,34,849,1547,834,28,30 +76128,34,849,1548,118,28,30 +76129,34,849,1549,118,28,30 +76130,34,849,1550,118,28,30 +76131,34,849,1551,118,28,30 +76132,34,849,1552,118,28,30 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 99ba64a55..b7e867acd 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2181,6 +2181,7 @@ location_area_id,local_language_id,name 845,9,Route 3 (East) 847,9,Route 4 848,9,Route 5 +859,9,Route 6 882,9,Galar Mine 883,9,Galar Mine No. 2 896,9,Hulbury From c905cd3db91a0cb0ba03d94d22e6b6473bcbb352 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Tue, 9 Jun 2026 18:20:24 -0500 Subject: [PATCH 41/50] feat: add glimwood-tangle location area prose --- data/v2/csv/location_area_prose.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index b7e867acd..66157f2aa 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2184,6 +2184,7 @@ location_area_id,local_language_id,name 859,9,Route 6 882,9,Galar Mine 883,9,Galar Mine No. 2 +891,9,Glimwood Tangle 896,9,Hulbury 906,9,Motostoke 907,9,Motostoke Outskirts From 5d6580588e4d7dee9a494f268e7456962a45bfd8 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 16:29:12 -0500 Subject: [PATCH 42/50] fix: begin re-doing encounters with encounter slots made per unique setup across location areas. add galar-route-1 and wedgehurst --- data/v2/csv/encounter_slots.csv | 75 +-- data/v2/csv/encounters.csv | 862 +------------------------------- 2 files changed, 29 insertions(+), 908 deletions(-) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 535a9943c..db98aced2 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1498,69 +1498,12 @@ id,version_group_id,encounter_method_id,slot,rarity 1497,10,1,9,5 1498,10,1,10,5 1499,20,41,,100 -1500,20,43,,100 -1501,20,1,1,20 -1502,20,1,2,15 -1503,20,1,3,15 -1504,20,1,4,10 -1505,20,1,5,10 -1506,20,1,6,10 -1507,20,1,7,5 -1508,20,1,8,5 -1509,20,1,9,5 -1510,20,1,10,2 -1511,20,1,11,1 -1512,20,1,12,1 -1513,20,1,13,1 -1514,20,38,1,20 -1515,20,38,2,15 -1516,20,38,3,15 -1517,20,38,4,10 -1518,20,38,5,10 -1519,20,38,6,10 -1520,20,38,7,5 -1521,20,38,8,5 -1522,20,38,9,5 -1523,20,38,10,2 -1524,20,38,11,1 -1525,20,38,12,1 -1526,20,38,13,1 -1527,20,39,1,20 -1528,20,39,2,15 -1529,20,39,3,15 -1530,20,39,4,10 -1531,20,39,5,10 -1532,20,39,6,10 -1533,20,39,7,5 -1534,20,39,8,5 -1535,20,39,9,5 -1536,20,39,10,2 -1537,20,39,11,1 -1538,20,39,12,1 -1539,20,39,13,1 -1540,20,56,1,20 -1541,20,56,2,15 -1542,20,56,3,15 -1543,20,56,4,10 -1544,20,56,5,10 -1545,20,56,6,10 -1546,20,56,7,5 -1547,20,56,8,5 -1548,20,56,9,5 -1549,20,56,10,2 -1550,20,56,11,1 -1551,20,56,12,1 -1552,20,56,13,1 -1553,20,35,1,20 -1554,20,35,2,15 -1555,20,35,3,15 -1556,20,35,4,10 -1557,20,35,5,10 -1558,20,35,6,10 -1559,20,35,7,5 -1560,20,35,8,5 -1561,20,35,9,5 -1562,20,35,10,2 -1563,20,35,11,1 -1564,20,35,12,1 -1565,20,35,13,1 +1500,20,38,1,50 +1501,20,38,2,30 +1502,20,38,3,15 +1503,20,38,4,5 +1504,20,1,1,40 +1505,20,1,2,30 +1506,20,1,3,15 +1507,20,1,4,10 +1508,20,1,5,5 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 9c4fe77f9..0fd73350c 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69426,845 +69426,23 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75288,16,207,1497,127,27,28 75289,15,207,1498,415,27,34 75290,16,207,1498,415,27,34 -75291,33,843,1514,819,3,6 -75292,33,843,1515,819,3,6 -75293,33,843,1516,819,3,6 -75294,33,843,1517,821,3,6 -75295,33,843,1518,821,3,6 -75296,33,843,1519,821,3,6 -75297,33,843,1520,831,3,6 -75298,33,843,1521,831,3,6 -75299,33,843,1522,831,3,6 -75300,33,843,1523,827,3,6 -75301,33,843,1524,827,3,6 -75302,33,843,1525,827,3,6 -75303,33,843,1526,827,3,6 -75304,33,843,1501,819,2,5 -75305,33,843,1502,819,2,5 -75306,33,843,1507,819,2,5 -75307,33,843,1503,824,2,5 -75308,33,843,1504,824,2,5 -75309,33,843,1508,824,2,5 -75310,33,843,1505,10,2,5 -75311,33,843,1509,10,2,5 -75312,33,843,1506,736,2,5 -75313,33,843,1510,163,2,5 -75314,33,843,1511,163,2,5 -75315,33,843,1512,163,2,5 -75316,33,843,1513,163,2,5 -75317,34,843,1514,819,3,6 -75318,34,843,1515,819,3,6 -75319,34,843,1516,819,3,6 -75320,34,843,1517,821,3,6 -75321,34,843,1518,821,3,6 -75322,34,843,1519,821,3,6 -75323,34,843,1520,831,3,6 -75324,34,843,1521,831,3,6 -75325,34,843,1522,831,3,6 -75326,34,843,1523,827,3,6 -75327,34,843,1524,827,3,6 -75328,34,843,1525,827,3,6 -75329,34,843,1526,827,3,6 -75330,34,843,1501,819,2,5 -75331,34,843,1502,819,2,5 -75332,34,843,1507,819,2,5 -75333,34,843,1503,824,2,5 -75334,34,843,1504,824,2,5 -75335,34,843,1508,824,2,5 -75336,34,843,1505,10,2,5 -75337,34,843,1509,10,2,5 -75338,34,843,1506,736,2,5 -75339,34,843,1510,163,2,5 -75340,34,843,1511,163,2,5 -75341,34,843,1512,163,2,5 -75342,34,843,1513,163,2,5 -75343,33,942,578,10164,12,12 -75344,34,942,578,10164,12,12 -75345,33,844,1514,819,5,7 -75346,33,844,1515,819,5,7 -75347,33,844,1523,819,5,7 -75348,33,844,1524,819,5,7 -75349,33,844,1516,821,5,7 -75350,33,844,1517,821,5,7 -75351,33,844,1520,821,5,7 -75352,33,844,1518,827,5,7 -75353,33,844,1521,827,5,7 -75354,33,844,1519,833,5,7 -75355,33,844,1522,835,5,7 -75356,33,844,1525,10174,5,7 -75357,33,844,1526,10174,5,7 -75358,34,844,1514,819,5,7 -75359,34,844,1515,819,5,7 -75360,34,844,1523,819,5,7 -75361,34,844,1524,819,5,7 -75362,34,844,1516,821,5,7 -75363,34,844,1517,821,5,7 -75364,34,844,1520,821,5,7 -75365,34,844,1518,827,5,7 -75366,34,844,1521,827,5,7 -75367,34,844,1519,833,5,7 -75368,34,844,1522,835,5,7 -75369,34,844,1525,10174,5,7 -75370,34,844,1526,10174,5,7 -75371,33,844,578,833,8,8 -75372,33,844,578,835,8,8 -75373,34,844,578,833,8,8 -75374,34,844,578,835,8,8 -75375,33,844,1540,129,4,6 -75376,33,844,1541,129,4,6 -75377,33,844,1542,129,4,6 -75378,33,844,1543,129,4,6 -75379,33,844,1544,129,4,6 -75380,33,844,1545,129,4,6 -75381,33,844,1546,833,4,6 -75382,33,844,1547,833,4,6 -75383,33,844,1548,833,4,6 -75384,33,844,1549,846,4,6 -75385,33,844,1550,846,4,6 -75386,33,844,1551,846,4,6 -75387,33,844,1552,846,4,6 -75388,34,844,1540,129,4,6 -75389,34,844,1541,129,4,6 -75390,34,844,1542,129,4,6 -75391,34,844,1543,129,4,6 -75392,34,844,1544,129,4,6 -75393,34,844,1545,129,4,6 -75394,34,844,1546,833,4,6 -75395,34,844,1547,833,4,6 -75396,34,844,1548,833,4,6 -75397,34,844,1549,846,4,6 -75398,34,844,1550,846,4,6 -75399,34,844,1551,846,4,6 -75400,34,844,1552,846,4,6 -75401,33,1365,578,834,50,50 -75402,33,1365,578,131,55,55 -75403,34,1365,578,834,50,50 -75404,34,1365,578,131,55,55 -75405,33,1365,1527,846,38,40 -75406,33,1365,1528,846,38,40 -75407,33,1365,1529,846,38,40 -75408,33,1365,1530,846,38,40 -75409,33,1365,1531,846,38,40 -75410,33,1365,1532,847,38,40 -75411,33,1365,1533,847,38,40 -75412,33,1365,1534,847,38,40 -75413,33,1365,1535,847,38,40 -75414,33,1365,1536,847,38,40 -75415,33,1365,1537,847,38,40 -75416,33,1365,1538,130,38,40 -75417,33,1365,1539,130,38,40 -75418,34,1365,1527,846,38,40 -75419,34,1365,1528,846,38,40 -75420,34,1365,1529,846,38,40 -75421,34,1365,1530,846,38,40 -75422,34,1365,1531,846,38,40 -75423,34,1365,1532,847,38,40 -75424,34,1365,1533,847,38,40 -75425,34,1365,1534,847,38,40 -75426,34,1365,1535,847,38,40 -75427,34,1365,1536,847,38,40 -75428,34,1365,1537,847,38,40 -75429,34,1365,1538,130,38,40 -75430,34,1365,1539,130,38,40 -75431,33,1366,1514,10174,40,43 -75432,33,1366,1515,10174,40,43 -75433,33,1366,1516,10174,40,43 -75434,33,1366,1517,824,40,43 -75435,33,1366,1518,824,40,43 -75436,33,1366,1519,824,40,43 -75437,33,1366,1520,827,40,43 -75438,33,1366,1521,827,40,43 -75439,33,1366,1522,827,40,43 -75440,33,1366,1523,835,40,43 -75441,33,1366,1524,835,40,43 -75442,33,1366,1525,835,40,43 -75443,33,1366,1526,835,40,43 -75444,34,1366,1514,10174,40,43 -75445,34,1366,1515,10174,40,43 -75446,34,1366,1516,10174,40,43 -75447,34,1366,1517,824,40,43 -75448,34,1366,1518,824,40,43 -75449,34,1366,1519,824,40,43 -75450,34,1366,1520,827,40,43 -75451,34,1366,1521,827,40,43 -75452,34,1366,1522,827,40,43 -75453,34,1366,1523,835,40,43 -75454,34,1366,1524,835,40,43 -75455,34,1366,1525,835,40,43 -75456,34,1366,1526,835,40,43 -75457,33,1366,1501,829,37,40 -75458,33,1366,1502,829,37,40 -75459,33,1366,1503,509,37,40 -75460,33,1366,1504,509,37,40 -75461,33,1366,1507,509,37,40 -75462,33,1366,1505,273,37,40 -75463,33,1366,1506,273,37,40 -75464,33,1366,1508,824,37,40 -75465,33,1366,1509,824,37,40 -75466,33,1366,1510,833,37,40 -75467,33,1366,1511,833,37,40 -75468,33,1366,1512,833,37,40 -75469,33,1366,1513,833,37,40 -75470,34,1366,1501,829,37,40 -75471,34,1366,1502,829,37,40 -75472,34,1366,1503,509,37,40 -75473,34,1366,1504,509,37,40 -75474,34,1366,1507,509,37,40 -75475,34,1366,1505,270,37,40 -75476,34,1366,1506,270,37,40 -75477,34,1366,1508,824,37,40 -75478,34,1366,1509,824,37,40 -75479,34,1366,1510,833,37,40 -75480,34,1366,1511,833,37,40 -75481,34,1366,1512,833,37,40 -75482,34,1366,1513,833,37,40 -75483,33,1366,578,862,50,50 -75484,34,1366,578,862,50,50 -75485,33,1366,1540,129,37,40 -75486,33,1366,1541,129,37,40 -75487,33,1366,1542,129,37,40 -75488,33,1366,1548,129,37,40 -75489,33,1366,1549,129,37,40 -75490,33,1366,1550,129,37,40 -75491,33,1366,1551,129,37,40 -75492,33,1366,1543,833,37,40 -75493,33,1366,1544,833,37,40 -75494,33,1366,1545,833,37,40 -75495,33,1366,1546,833,37,40 -75496,33,1366,1547,833,37,40 -75497,33,1366,1552,349,37,40 -75498,34,1366,1540,129,37,40 -75499,34,1366,1541,129,37,40 -75500,34,1366,1542,129,37,40 -75501,34,1366,1548,129,37,40 -75502,34,1366,1549,129,37,40 -75503,34,1366,1550,129,37,40 -75504,34,1366,1551,129,37,40 -75505,34,1366,1543,833,37,40 -75506,34,1366,1544,833,37,40 -75507,34,1366,1545,833,37,40 -75508,34,1366,1546,833,37,40 -75509,34,1366,1547,833,37,40 -75510,34,1366,1552,349,37,40 -75511,33,906,1540,129,7,11 -75512,33,906,1541,129,7,11 -75513,33,906,1542,129,7,11 -75514,33,906,1543,833,7,11 -75515,33,906,1544,833,7,11 -75516,33,906,1545,833,7,11 -75517,33,906,1546,833,7,11 -75518,33,906,1547,833,7,11 -75519,33,906,1548,339,7,11 -75520,33,906,1549,339,7,11 -75521,33,906,1550,339,7,11 -75522,33,906,1551,339,7,11 -75523,33,906,1552,339,7,11 -75524,34,906,1540,129,7,11 -75525,34,906,1541,129,7,11 -75526,34,906,1542,129,7,11 -75527,34,906,1543,833,7,11 -75528,34,906,1544,833,7,11 -75529,34,906,1545,833,7,11 -75530,34,906,1546,833,7,11 -75531,34,906,1547,833,7,11 -75532,34,906,1548,339,7,11 -75533,34,906,1549,339,7,11 -75534,34,906,1550,339,7,11 -75535,34,906,1551,339,7,11 -75536,34,906,1552,339,7,11 -75537,33,1367,1499,37,24,24 -75538,33,1367,1499,607,25,25 -75539,33,1367,1499,850,25,25 -75540,34,1367,1499,37,24,24 -75541,34,1367,1499,607,25,25 -75542,34,1367,1499,850,25,25 -75543,33,845,1514,10174,10,14 -75544,33,845,1515,10174,10,14 -75545,33,845,1523,10174,10,14 -75546,33,845,1524,10174,10,14 -75547,33,845,1516,829,10,14 -75548,33,845,1517,829,10,14 -75549,33,845,1520,829,10,14 -75550,33,845,1518,37,10,14 -75551,33,845,1521,37,10,14 -75552,33,845,1519,434,10,14 -75553,33,845,1522,568,10,14 -75554,33,845,1525,236,10,14 -75555,33,845,1526,236,10,14 -75556,34,845,1514,10174,10,14 -75557,34,845,1515,10174,10,14 -75558,34,845,1523,10174,10,14 -75559,34,845,1524,10174,10,14 -75560,34,845,1516,829,10,14 -75561,34,845,1517,829,10,14 -75562,34,845,1520,829,10,14 -75563,34,845,1518,58,10,14 -75564,34,845,1521,58,10,14 -75565,34,845,1519,434,10,14 -75566,34,845,1522,568,10,14 -75567,34,845,1525,236,10,14 -75568,34,845,1526,236,10,14 -75569,33,845,1501,821,8,13 -75570,33,845,1502,821,8,13 -75571,33,845,1503,66,8,13 -75572,33,845,1507,66,8,13 -75573,33,845,1504,674,8,13 -75574,33,845,1505,674,8,13 -75575,33,845,1506,749,8,13 -75576,33,845,1508,749,8,13 -75577,33,845,1509,599,8,13 -75578,33,845,1510,599,8,13 -75579,33,845,1511,599,8,13 -75580,33,845,1512,599,8,13 -75581,33,845,1513,850,8,13 -75582,34,845,1501,821,8,13 -75583,34,845,1502,821,8,13 -75584,34,845,1503,66,8,13 -75585,34,845,1507,66,8,13 -75586,34,845,1504,674,8,13 -75587,34,845,1505,674,8,13 -75588,34,845,1506,749,8,13 -75589,34,845,1508,749,8,13 -75590,34,845,1509,599,8,13 -75591,34,845,1510,599,8,13 -75592,34,845,1511,599,8,13 -75593,34,845,1512,599,8,13 -75594,34,845,1513,850,8,13 -75595,33,845,1499,822,18,18 -75596,34,845,1499,822,18,18 -75597,33,845,1553,819,8,13 -75598,33,845,1554,819,8,13 -75599,33,845,1555,819,8,13 -75600,33,845,1556,819,8,13 -75601,33,845,1557,819,8,13 -75602,33,845,1558,819,8,13 -75603,33,845,1559,420,8,13 -75604,33,845,1560,420,8,13 -75605,33,845,1561,420,8,13 -75606,33,845,1562,420,8,13 -75607,33,845,1563,420,8,13 -75608,33,845,1564,420,8,13 -75609,33,845,1565,420,8,13 -75610,34,845,1553,819,8,13 -75611,34,845,1554,819,8,13 -75612,34,845,1555,819,8,13 -75613,34,845,1556,819,8,13 -75614,34,845,1557,819,8,13 -75615,34,845,1558,819,8,13 -75616,34,845,1559,420,8,13 -75617,34,845,1560,420,8,13 -75618,34,845,1561,420,8,13 -75619,34,845,1562,420,8,13 -75620,34,845,1563,420,8,13 -75621,34,845,1564,420,8,13 -75622,34,845,1565,420,8,13 -75623,33,1368,1514,837,10,13 -75624,33,1368,1515,837,10,13 -75625,33,1368,1516,837,10,13 -75626,33,1368,1517,837,10,13 -75627,33,1368,1518,837,10,13 -75628,33,1368,1519,837,10,13 -75629,33,1368,1520,837,10,13 -75630,33,1368,1521,837,10,13 -75631,33,1368,1522,837,10,13 -75632,33,1368,1523,837,10,13 -75633,33,1368,1524,837,10,13 -75634,33,1368,1525,837,10,13 -75635,33,1368,1526,568,10,13 -75636,34,1368,1514,837,10,13 -75637,34,1368,1515,837,10,13 -75638,34,1368,1516,837,10,13 -75639,34,1368,1517,837,10,13 -75640,34,1368,1518,837,10,13 -75641,34,1368,1519,837,10,13 -75642,34,1368,1520,837,10,13 -75643,34,1368,1521,837,10,13 -75644,34,1368,1522,837,10,13 -75645,34,1368,1523,837,10,13 -75646,34,1368,1524,837,10,13 -75647,34,1368,1525,837,10,13 -75648,34,1368,1526,568,10,13 -75649,33,882,1514,837,11,14 -75650,33,882,1515,837,11,14 -75651,33,882,1516,532,11,14 -75652,33,882,1517,532,11,14 -75653,33,882,1518,527,11,14 -75654,33,882,1520,527,11,14 -75655,33,882,1519,50,11,14 -75656,33,882,1521,529,11,14 -75657,33,882,1522,529,11,14 -75658,33,882,1523,524,11,14 -75659,33,882,1524,524,11,14 -75660,33,882,1525,524,11,14 -75661,33,882,1526,524,11,14 -75662,34,882,1514,837,11,14 -75663,34,882,1515,837,11,14 -75664,34,882,1516,524,11,14 -75665,34,882,1517,524,11,14 -75666,34,882,1518,527,11,14 -75667,34,882,1520,527,11,14 -75668,34,882,1519,50,11,14 -75669,34,882,1521,529,11,14 -75670,34,882,1522,529,11,14 -75671,34,882,1523,532,11,14 -75672,34,882,1524,532,11,14 -75673,34,882,1525,532,11,14 -75674,34,882,1526,532,11,14 -75675,33,882,1499,838,18,18 -75676,34,882,1499,838,18,18 -75677,33,882,1499,527,16,16 -75678,34,882,1499,527,16,16 -75679,33,847,1515,309,14,16 -75680,33,847,1516,309,14,16 -75681,33,847,1514,10161,14,16 -75682,33,847,1523,10161,14,16 -75683,33,847,1524,10161,14,16 -75684,33,847,1517,835,14,16 -75685,33,847,1518,835,14,16 -75686,33,847,1519,710,14,16 -75687,33,847,1520,10027,14,16 -75688,33,847,1521,10028,14,16 -75689,33,847,1522,25,14,16 -75690,33,847,1525,133,14,16 -75691,33,847,1526,10029,14,16 -75692,34,847,1515,309,14,16 -75693,34,847,1516,309,14,16 -75694,34,847,1514,10161,14,16 -75695,34,847,1523,10161,14,16 -75696,34,847,1524,10161,14,16 -75697,34,847,1517,835,14,16 -75698,34,847,1518,835,14,16 -75699,34,847,1519,710,14,16 -75700,34,847,1520,10027,14,16 -75701,34,847,1521,10028,14,16 -75702,34,847,1522,133,14,16 -75703,34,847,1525,25,14,16 -75704,34,847,1526,10029,14,16 -75705,33,847,1501,10161,13,15 -75706,33,847,1502,10161,13,15 -75707,33,847,1503,831,13,15 -75708,33,847,1504,831,13,15 -75709,33,847,1505,868,13,15 -75710,33,847,1506,868,13,15 -75711,33,847,1507,595,13,15 -75712,33,847,1508,595,13,15 -75713,33,847,1509,742,13,15 -75714,33,847,1510,406,13,15 -75715,33,847,1511,406,13,15 -75716,33,847,1512,406,13,15 -75717,33,847,1513,597,13,15 -75718,34,847,1501,10161,13,15 -75719,34,847,1502,10161,13,15 -75720,34,847,1503,831,13,15 -75721,34,847,1504,831,13,15 -75722,34,847,1505,868,13,15 -75723,34,847,1506,868,13,15 -75724,34,847,1507,595,13,15 -75725,34,847,1508,595,13,15 -75726,34,847,1509,742,13,15 -75727,34,847,1510,406,13,15 -75728,34,847,1511,406,13,15 -75729,34,847,1512,406,13,15 -75730,34,847,1513,597,13,15 -75731,33,847,1499,50,17,17 -75732,34,847,1499,50,17,17 -75733,33,847,1553,819,13,15 -75734,33,847,1554,819,13,15 -75735,33,847,1555,819,13,15 -75736,33,847,1556,819,13,15 -75737,33,847,1557,819,13,15 -75738,33,847,1558,819,13,15 -75739,33,847,1559,819,13,15 -75740,33,847,1560,819,13,15 -75741,33,847,1561,819,13,15 -75742,33,847,1562,819,13,15 -75743,33,847,1563,819,13,15 -75744,33,847,1564,819,13,15 -75745,33,847,1565,819,13,15 -75746,34,847,1553,819,13,15 -75747,34,847,1554,819,13,15 -75748,34,847,1555,819,13,15 -75749,34,847,1556,819,13,15 -75750,34,847,1557,819,13,15 -75751,34,847,1558,819,13,15 -75752,34,847,1559,819,13,15 -75753,34,847,1560,819,13,15 -75754,34,847,1561,819,13,15 -75755,34,847,1562,819,13,15 -75756,34,847,1563,819,13,15 -75757,34,847,1564,819,13,15 -75758,34,847,1565,819,13,15 -75759,33,847,1540,129,13,15 -75760,33,847,1541,129,13,15 -75761,33,847,1542,129,13,15 -75762,33,847,1543,129,13,15 -75763,33,847,1544,129,13,15 -75764,33,847,1545,833,13,15 -75765,33,847,1546,833,13,15 -75766,33,847,1547,833,13,15 -75767,33,847,1548,118,13,15 -75768,33,847,1549,118,13,15 -75769,33,847,1550,118,13,15 -75770,33,847,1551,118,13,15 -75771,33,847,1552,118,13,15 -75772,34,847,1540,129,13,15 -75773,34,847,1541,129,13,15 -75774,34,847,1542,129,13,15 -75775,34,847,1543,129,13,15 -75776,34,847,1544,129,13,15 -75777,34,847,1545,833,13,15 -75778,34,847,1546,833,13,15 -75779,34,847,1547,833,13,15 -75780,34,847,1548,118,13,15 -75781,34,847,1549,118,13,15 -75782,34,847,1550,118,13,15 -75783,34,847,1551,118,13,15 -75784,34,847,1552,118,13,15 -75785,33,939,578,342,50,50 -75786,34,939,578,342,50,50 -75787,33,848,1514,759,19,21 -75788,33,848,1515,759,19,21 -75789,33,848,1516,684,19,21 -75790,33,848,1517,684,19,21 -75791,33,848,1520,684,19,21 -75792,33,848,1518,572,19,21 -75793,33,848,1521,572,19,21 -75794,33,848,1519,202,19,21 -75795,33,848,1522,10166,19,21 -75796,33,848,1523,425,19,21 -75797,33,848,1524,425,19,21 -75798,33,848,1525,425,19,21 -75799,33,848,1526,425,19,21 -75800,34,848,1514,759,19,21 -75801,34,848,1515,759,19,21 -75802,34,848,1516,682,19,21 -75803,34,848,1517,682,19,21 -75804,34,848,1520,682,19,21 -75805,34,848,1518,572,19,21 -75806,34,848,1519,572,19,21 -75807,34,848,1521,202,19,21 -75808,34,848,1522,202,19,21 -75809,34,848,1523,425,19,21 -75810,34,848,1524,425,19,21 -75811,34,848,1525,425,19,21 -75812,34,848,1526,425,19,21 -75813,33,848,1502,825,16,18 -75814,33,848,1504,825,16,18 -75815,33,848,1513,825,16,18 -75816,33,848,1501,677,16,18 -75817,33,848,1503,274,16,18 -75818,33,848,1507,274,16,18 -75819,33,848,1505,684,16,18 -75820,33,848,1510,684,16,18 -75821,33,848,1511,684,16,18 -75822,33,848,1512,684,16,18 -75823,33,848,1508,751,16,18 -75824,33,848,1506,840,16,18 -75825,33,848,1509,290,16,18 -75826,34,848,1502,825,16,18 -75827,34,848,1504,825,16,18 -75828,34,848,1513,825,16,18 -75829,34,848,1501,677,16,18 -75830,34,848,1503,271,16,18 -75831,34,848,1507,271,16,18 -75832,34,848,1505,682,16,18 -75833,34,848,1510,682,16,18 -75834,34,848,1511,682,16,18 -75835,34,848,1512,682,16,18 -75836,34,848,1508,751,16,18 -75837,34,848,1506,840,16,18 -75838,34,848,1509,290,16,18 -75839,33,848,578,830,22,22 -75840,34,848,578,830,22,22 -75841,33,848,1553,819,16,18 -75842,33,848,1554,819,16,18 -75843,33,848,1555,819,16,18 -75844,33,848,1556,819,16,18 -75845,33,848,1557,819,16,18 -75846,33,848,1558,819,16,18 -75847,33,848,1559,819,16,18 -75848,33,848,1560,819,16,18 -75849,33,848,1561,819,16,18 -75850,33,848,1562,819,16,18 -75851,33,848,1563,819,16,18 -75852,33,848,1564,819,16,18 -75853,33,848,1565,819,16,18 -75854,34,848,1553,819,16,18 -75855,34,848,1554,819,16,18 -75856,34,848,1555,819,16,18 -75857,34,848,1556,819,16,18 -75858,34,848,1557,819,16,18 -75859,34,848,1558,819,16,18 -75860,34,848,1559,819,16,18 -75861,34,848,1560,819,16,18 -75862,34,848,1561,819,16,18 -75863,34,848,1562,819,16,18 -75864,34,848,1563,819,16,18 -75865,34,848,1564,819,16,18 -75866,34,848,1565,819,16,18 -75867,33,848,1540,129,16,18 -75868,33,848,1541,129,16,18 -75869,33,848,1542,129,16,18 -75870,33,848,1543,129,16,18 -75871,33,848,1544,129,16,18 -75872,33,848,1545,833,16,18 -75873,33,848,1546,833,16,18 -75874,33,848,1547,833,16,18 -75875,33,848,1548,118,16,18 -75876,33,848,1549,118,16,18 -75877,33,848,1550,118,16,18 -75878,33,848,1551,118,16,18 -75879,33,848,1552,118,16,18 -75880,34,848,1540,129,16,18 -75881,34,848,1541,129,16,18 -75882,34,848,1542,129,16,18 -75883,34,848,1543,129,16,18 -75884,34,848,1544,129,16,18 -75885,34,848,1545,833,16,18 -75886,34,848,1546,833,16,18 -75887,34,848,1547,833,16,18 -75888,34,848,1548,118,16,18 -75889,34,848,1549,118,16,18 -75890,34,848,1550,118,16,18 -75891,34,848,1551,118,16,18 -75892,34,848,1552,118,16,18 -75893,33,896,1540,846,20,24 -75894,33,896,1541,846,20,24 -75895,33,896,1542,846,20,24 -75896,33,896,1543,833,20,24 -75897,33,896,1546,833,20,24 -75898,33,896,1544,170,20,24 -75899,33,896,1545,170,20,24 -75900,33,896,1547,550,20,24 -75901,33,896,1548,550,20,24 -75902,33,896,1549,746,20,24 -75903,33,896,1550,746,20,24 -75904,33,896,1551,746,20,24 -75905,33,896,1552,746,20,24 -75906,34,896,1540,846,20,24 -75907,34,896,1541,846,20,24 -75908,34,896,1542,846,20,24 -75909,34,896,1543,833,20,24 -75910,34,896,1546,833,20,24 -75911,34,896,1544,170,20,24 -75912,34,896,1545,170,20,24 -75913,34,896,1547,10016,20,24 -75914,34,896,1548,10016,20,24 -75915,34,896,1549,746,20,24 -75916,34,896,1550,746,20,24 -75917,34,896,1551,746,20,24 -75918,34,896,1552,746,20,24 -75919,33,883,1514,422,20,24 -75920,33,883,1523,422,20,24 -75921,33,883,1524,422,20,24 -75922,33,883,1525,422,20,24 -75923,33,883,1526,422,20,24 -75924,33,883,1515,767,20,24 -75925,33,883,1517,767,20,24 -75926,33,883,1516,688,20,24 -75927,33,883,1518,559,20,24 -75928,33,883,1520,559,20,24 -75929,33,883,1521,833,20,24 -75930,33,883,1522,213,20,24 -75931,33,883,1519,714,20,24 -75932,34,883,1514,422,20,24 -75933,34,883,1523,422,20,24 -75934,34,883,1524,422,20,24 -75935,34,883,1525,422,20,24 -75936,34,883,1526,422,20,24 -75937,34,883,1515,767,20,24 -75938,34,883,1517,767,20,24 -75939,34,883,1516,833,20,24 -75940,34,883,1521,833,20,24 -75941,34,883,1518,453,20,24 -75942,34,883,1520,453,20,24 -75943,34,883,1522,213,20,24 -75944,34,883,1519,714,20,24 -75945,33,883,1499,10180,25,25 -75946,33,883,578,423,50,50 -75947,33,883,578,834,24,24 -75948,34,883,1499,10180,25,25 -75949,34,883,578,423,50,50 -75950,34,883,578,834,24,24 -75951,33,883,1540,339,20,24 -75952,33,883,1541,339,20,24 -75953,33,883,1542,339,20,24 -75954,33,883,1546,339,20,24 -75955,33,883,1543,833,20,24 -75956,33,883,1544,833,20,24 -75957,33,883,1545,833,20,24 -75958,33,883,1547,341,20,24 -75959,33,883,1548,341,20,24 -75960,33,883,1549,341,20,24 -75961,33,883,1550,341,20,24 -75962,33,883,1551,341,20,24 -75963,33,883,1552,341,20,24 -75964,34,883,1540,339,20,24 -75965,34,883,1541,339,20,24 -75966,34,883,1542,339,20,24 -75967,34,883,1546,339,20,24 -75968,34,883,1543,833,20,24 -75969,34,883,1544,833,20,24 -75970,34,883,1545,833,20,24 -75971,34,883,1547,341,20,24 -75972,34,883,1548,341,20,24 -75973,34,883,1549,341,20,24 -75974,34,883,1550,341,20,24 -75975,34,883,1551,341,20,24 -75976,34,883,1552,341,20,24 -75977,33,907,1514,164,22,26 -75978,33,907,1515,164,22,26 -75979,33,907,1520,164,22,26 -75980,33,907,1517,185,22,26 -75981,33,907,1518,185,22,26 -75982,33,907,1519,185,22,26 -75983,33,907,1516,109,22,26 -75984,33,907,1521,856,22,26 -75985,33,907,1522,856,22,26 -75986,33,907,1523,539,22,26 -75987,33,907,1524,539,22,26 -75988,33,907,1525,539,22,26 -75989,33,907,1526,539,22,26 -75990,34,907,1514,164,22,26 -75991,34,907,1515,164,22,26 -75992,34,907,1517,185,22,26 -75993,34,907,1518,185,22,26 -75994,34,907,1519,185,22,26 -75995,34,907,1516,109,22,26 -75996,34,907,1521,856,22,26 -75997,34,907,1522,856,22,26 -75998,34,907,1520,757,22,26 -75999,34,907,1523,538,22,26 -76000,34,907,1524,538,22,26 -76001,34,907,1525,538,22,26 -76002,34,907,1526,538,22,26 -76003,33,907,1501,559,21,24 -76004,33,907,1502,559,21,24 -76005,33,907,1504,524,21,24 -76006,33,907,1505,524,21,24 -76007,33,907,1506,524,21,24 -76008,33,907,1503,624,21,24 -76009,33,907,1507,624,21,24 -76010,33,907,1508,833,21,24 -76011,33,907,1509,833,21,24 -76012,33,907,1510,859,21,24 -76013,33,907,1511,859,21,24 -76014,33,907,1512,859,21,24 -76015,33,907,1513,859,21,24 -76016,34,907,1501,453,21,24 -76017,34,907,1502,453,21,24 -76018,34,907,1504,524,21,24 -76019,34,907,1505,524,21,24 -76020,34,907,1506,524,21,24 -76021,34,907,1503,624,21,24 -76022,34,907,1507,624,21,24 -76023,34,907,1508,833,21,24 -76024,34,907,1509,833,21,24 -76025,34,907,1510,859,21,24 -76026,34,907,1511,859,21,24 -76027,34,907,1512,859,21,24 -76028,34,907,1513,859,21,24 -76029,33,849,1514,10179,29,33 -76030,33,849,1515,10179,29,33 -76031,33,849,1516,694,29,33 -76032,33,849,1517,694,29,33 -76033,33,849,1523,694,29,33 -76034,33,849,1524,694,29,33 -76035,33,849,1525,694,29,33 -76036,33,849,1518,51,29,33 -76037,33,849,1519,51,29,33 -76038,33,849,1520,556,29,33 -76039,33,849,1521,556,29,33 -76040,33,849,1522,610,29,33 -76041,33,849,1526,328,29,33 -76042,34,849,1514,10179,29,33 -76043,34,849,1515,10179,29,33 -76044,34,849,1516,694,29,33 -76045,34,849,1517,694,29,33 -76046,34,849,1523,694,29,33 -76047,34,849,1524,694,29,33 -76048,34,849,1525,694,29,33 -76049,34,849,1518,51,29,33 -76050,34,849,1519,51,29,33 -76051,34,849,1520,556,29,33 -76052,34,849,1521,556,29,33 -76053,34,849,1522,328,29,33 -76054,34,849,1526,610,29,33 -76055,33,849,1502,843,28,30 -76056,33,849,1503,843,28,30 -76057,33,849,1501,632,28,30 -76058,33,849,1504,355,28,30 -76059,33,849,1507,355,28,30 -76060,33,849,1510,355,28,30 -76061,33,849,1511,355,28,30 -76062,33,849,1505,451,28,30 -76063,33,849,1506,449,28,30 -76064,33,849,1508,631,28,30 -76065,33,849,1509,324,28,30 -76066,33,849,1512,701,28,30 -76067,33,849,1513,701,28,30 -76068,34,849,1502,843,28,30 -76069,34,849,1503,843,28,30 -76070,34,849,1501,631,28,30 -76071,34,849,1504,355,28,30 -76072,34,849,1507,355,28,30 -76073,34,849,1510,355,28,30 -76074,34,849,1511,355,28,30 -76075,34,849,1505,451,28,30 -76076,34,849,1506,449,28,30 -76077,34,849,1508,632,28,30 -76078,34,849,1509,324,28,30 -76079,34,849,1512,701,28,30 -76080,34,849,1513,701,28,30 -76081,33,849,1553,820,28,30 -76082,33,849,1554,820,28,30 -76083,33,849,1555,820,28,30 -76084,33,849,1556,820,28,30 -76085,33,849,1557,820,28,30 -76086,33,849,1558,820,28,30 -76087,33,849,1559,820,28,30 -76088,33,849,1560,820,28,30 -76089,33,849,1561,820,28,30 -76090,33,849,1562,820,28,30 -76091,33,849,1563,820,28,30 -76092,33,849,1564,820,28,30 -76093,33,849,1565,820,28,30 -76094,34,849,1553,820,28,30 -76095,34,849,1554,820,28,30 -76096,34,849,1555,820,28,30 -76097,34,849,1556,820,28,30 -76098,34,849,1557,820,28,30 -76099,34,849,1558,820,28,30 -76100,34,849,1559,820,28,30 -76101,34,849,1560,820,28,30 -76102,34,849,1561,820,28,30 -76103,34,849,1562,820,28,30 -76104,34,849,1563,820,28,30 -76105,34,849,1564,820,28,30 -76106,34,849,1565,820,28,30 -76107,33,849,1540,129,28,30 -76108,33,849,1541,129,28,30 -76109,33,849,1542,129,28,30 -76110,33,849,1543,129,28,30 -76111,33,849,1544,129,28,30 -76112,33,849,1545,834,28,30 -76113,33,849,1546,834,28,30 -76114,33,849,1547,834,28,30 -76115,33,849,1548,118,28,30 -76116,33,849,1549,118,28,30 -76117,33,849,1550,118,28,30 -76118,33,849,1551,118,28,30 -76119,33,849,1552,118,28,30 -76120,34,849,1540,129,28,30 -76121,34,849,1541,129,28,30 -76122,34,849,1542,129,28,30 -76123,34,849,1543,129,28,30 -76124,34,849,1544,129,28,30 -76125,34,849,1545,834,28,30 -76126,34,849,1546,834,28,30 -76127,34,849,1547,834,28,30 -76128,34,849,1548,118,28,30 -76129,34,849,1549,118,28,30 -76130,34,849,1550,118,28,30 -76131,34,849,1551,118,28,30 -76132,34,849,1552,118,28,30 +75291,33,843,1500,819,3,6 +75292,33,843,1501,821,3,6 +75293,33,843,1502,831,3,6 +75294,33,843,1503,827,3,6 +75295,33,843,1504,819,2,5 +75296,33,843,1505,824,2,5 +75297,33,843,1506,10,2,5 +75298,33,843,1507,736,2,5 +75299,33,843,1508,163,2,5 +75300,34,843,1500,819,3,6 +75301,34,843,1501,821,3,6 +75302,34,843,1502,831,3,6 +75303,34,843,1503,827,3,6 +75304,34,843,1504,819,2,5 +75305,34,843,1505,824,2,5 +75306,34,843,1506,10,2,5 +75307,34,843,1507,736,2,5 +75308,34,843,1508,163,2,5 +75309,33,942,578,10164,12,12 +75310,34,942,578,10164,12,12 From 903b8e7995a36fb6fb351555fb644c2c9f7b6b29 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 16:43:42 -0500 Subject: [PATCH 43/50] feat: add galar-route-2 encounters --- data/v2/csv/encounter_slots.csv | 26 ++++++++++++ data/v2/csv/encounters.csv | 70 +++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index db98aced2..0869d6df9 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1507,3 +1507,29 @@ id,version_group_id,encounter_method_id,slot,rarity 1506,20,1,3,15 1507,20,1,4,10 1508,20,1,5,5 +1509,20,38,1,38 +1510,20,38,2,30 +1511,20,38,3,15 +1512,20,38,4,10 +1513,20,38,5,5 +1514,20,38,6,2 +1515,20,1,1,40 +1516,20,1,2,25 +1517,20,1,3,20 +1518,20,1,4,10 +1519,20,1,5,5 +1520,20,56,1,80 +1521,20,56,2,15 +1522,20,56,3,5 +1523,20,39,1,70 +1524,20,39,2,28 +1525,20,39,3,2 +1526,20,1,1,35 +1527,20,1,2,30 +1528,20,1,3,20 +1529,20,1,4,10 +1530,20,1,5,5 +1531,20,56,1,50 +1532,20,56,2,40 +1533,20,56,3,9 +1534,20,56,4,1 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 0fd73350c..2e7847b8b 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69446,3 +69446,73 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75308,34,843,1508,163,2,5 75309,33,942,578,10164,12,12 75310,34,942,578,10164,12,12 +75311,33,844,1509,819,5,7 +75312,33,844,1510,821,5,7 +75313,33,844,1511,827,5,7 +75314,33,844,1512,833,5,7 +75315,33,844,1513,835,5,7 +75316,33,844,1514,10174,5,7 +75317,33,844,1515,824,4,6 +75318,33,844,1516,821,4,6 +75319,33,844,1517,273,4,6 +75320,33,844,1518,509,4,6 +75321,33,844,1519,163,4,6 +75322,33,844,578,835,8,8 +75323,33,844,578,833,8,8 +75324,33,844,1520,129,4,6 +75325,33,844,1521,833,4,6 +75326,33,844,1522,846,4,6 +75327,34,844,1509,819,5,7 +75328,34,844,1510,821,5,7 +75329,34,844,1511,827,5,7 +75330,34,844,1512,833,5,7 +75331,34,844,1513,835,5,7 +75332,34,844,1514,10174,5,7 +75333,34,844,1515,824,4,6 +75334,34,844,1516,821,4,6 +75335,34,844,1517,270,4,6 +75336,34,844,1518,509,4,6 +75337,34,844,1519,163,4,6 +75338,34,844,578,835,8,8 +75339,34,844,578,833,8,8 +75340,34,844,1520,129,4,6 +75341,34,844,1521,833,4,6 +75342,34,844,1522,846,4,6 +75343,33,1365,578,834,50,50 +75344,33,1365,578,131,55,55 +75345,33,1365,1523,846,38,40 +75346,33,1365,1524,847,38,40 +75347,33,1365,1525,130,38,40 +75348,34,1365,578,834,50,50 +75349,34,1365,578,131,55,55 +75350,34,1365,1523,846,38,40 +75351,34,1365,1524,847,38,40 +75352,34,1365,1525,130,38,40 +75353,33,1366,1500,10174,40,43 +75354,33,1366,1501,824,40,43 +75355,33,1366,1502,827,40,43 +75356,33,1366,1503,835,40,43 +75357,33,1366,1526,829,37,40 +75358,33,1366,1527,509,37,40 +75359,33,1366,1528,273,37,40 +75360,33,1366,1529,824,37,40 +75361,33,1366,1530,833,37,40 +75362,33,1366,578,862,50,50 +75363,33,1366,1531,129,37,40 +75364,33,1366,1532,833,37,40 +75365,33,1366,1533,129,37,40 +75366,33,1366,1534,349,37,40 +75367,34,1366,1500,10174,40,43 +75368,34,1366,1501,824,40,43 +75369,34,1366,1502,827,40,43 +75370,34,1366,1503,835,40,43 +75371,34,1366,1526,829,37,40 +75372,34,1366,1527,509,37,40 +75373,34,1366,1528,270,37,40 +75374,34,1366,1529,824,37,40 +75375,34,1366,1530,833,37,40 +75376,34,1366,578,862,50,50 +75377,34,1366,1531,129,37,40 +75378,34,1366,1532,833,37,40 +75379,34,1366,1533,129,37,40 +75380,34,1366,1534,349,37,40 From 7719645f99ecd2cf9c6eeefa7980a2dbc890b355 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 16:48:15 -0500 Subject: [PATCH 44/50] feat: add motostoke encounters --- data/v2/csv/encounter_slots.csv | 3 +++ data/v2/csv/encounters.csv | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 0869d6df9..15d55d8f5 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1533,3 +1533,6 @@ id,version_group_id,encounter_method_id,slot,rarity 1532,20,56,2,40 1533,20,56,3,9 1534,20,56,4,1 +1535,20,56,1,50 +1536,20,56,2,40 +1537,20,56,3,10 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 2e7847b8b..9a03a166d 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69516,3 +69516,15 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75378,34,1366,1532,833,37,40 75379,34,1366,1533,129,37,40 75380,34,1366,1534,349,37,40 +75381,33,906,1535,129,7,11 +75382,33,906,1536,833,7,11 +75383,33,906,1537,339,7,11 +75384,34,906,1535,129,7,11 +75385,34,906,1536,833,7,11 +75386,34,906,1537,339,7,11 +75387,33,1367,1499,37,24,24 +75388,33,1367,1499,607,25,25 +75389,33,1367,1499,850,25,25 +75390,34,1367,1499,37,24,24 +75391,34,1367,1499,607,25,25 +75392,34,1367,1499,850,25,25 From 551b4e93518b94a0bb3759a1756059835400062c Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 17:31:49 -0500 Subject: [PATCH 45/50] feat: add galar-route-3 encounters --- data/v2/csv/encounter_slots.csv | 10 ++++++++++ data/v2/csv/encounters.csv | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 15d55d8f5..f9dfae491 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1536,3 +1536,13 @@ id,version_group_id,encounter_method_id,slot,rarity 1535,20,56,1,50 1536,20,56,2,40 1537,20,56,3,10 +1538,20,1,1,35 +1539,20,1,2,20 +1540,20,1,3,20 +1541,20,1,4,15 +1542,20,1,5,9 +1543,20,1,6,1 +1544,20,35,1,80 +1545,20,35,2,20 +1546,20,38,1,99 +1547,20,38,2,1 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 9a03a166d..e80a53a32 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69528,3 +69528,37 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75390,34,1367,1499,37,24,24 75391,34,1367,1499,607,25,25 75392,34,1367,1499,850,25,25 +75393,33,845,1509,10174,10,14 +75394,33,845,1510,829,10,14 +75395,33,845,1511,37,10,14 +75396,33,845,1512,434,10,14 +75397,33,845,1513,568,10,14 +75398,33,845,1514,236,10,14 +75399,33,845,1538,821,8,13 +75400,33,845,1539,66,8,13 +75401,33,845,1540,674,8,13 +75402,33,845,1541,749,8,13 +75403,33,845,1542,599,8,13 +75404,33,845,1543,850,8,13 +75405,33,845,1499,822,18,18 +75406,33,845,1544,819,8,13 +75407,33,845,1545,420,8,13 +75408,34,845,1509,10174,10,14 +75409,34,845,1510,829,10,14 +75410,34,845,1511,58,10,14 +75411,34,845,1512,434,10,14 +75412,34,845,1513,568,10,14 +75413,34,845,1514,236,10,14 +75414,34,845,1538,821,8,13 +75415,34,845,1539,66,8,13 +75416,34,845,1540,674,8,13 +75417,34,845,1541,749,8,13 +75418,34,845,1542,599,8,13 +75419,34,845,1543,850,8,13 +75420,34,845,1499,822,18,18 +75421,34,845,1544,819,8,13 +75422,34,845,1545,420,8,13 +75423,33,1368,1546,837,10,13 +75424,33,1368,1547,568,10,13 +75425,34,1368,1546,837,10,13 +75426,34,1368,1547,568,10,13 From 83f75cb3c1b898ba4b348fd9b879fbd28eba46ff Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 17:35:08 -0500 Subject: [PATCH 46/50] feat: add galar-mine encounters --- data/v2/csv/encounter_slots.csv | 6 ++++++ data/v2/csv/encounters.csv | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index f9dfae491..c04f806e3 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1546,3 +1546,9 @@ id,version_group_id,encounter_method_id,slot,rarity 1545,20,35,2,20 1546,20,38,1,99 1547,20,38,2,1 +1548,20,38,1,35 +1549,20,38,2,25 +1550,20,38,3,15 +1551,20,38,4,10 +1552,20,38,5,10 +1553,20,38,6,5 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index e80a53a32..75ea189fb 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69562,3 +69562,19 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75424,33,1368,1547,568,10,13 75425,34,1368,1546,837,10,13 75426,34,1368,1547,568,10,13 +75427,33,882,1548,837,11,14 +75428,33,882,1549,532,11,14 +75429,33,882,1550,527,11,14 +75430,33,882,1551,50,11,14 +75431,33,882,1552,529,11,14 +75432,33,882,1553,524,11,14 +75433,33,882,1499,838,18,18 +75434,34,882,1548,837,11,14 +75435,34,882,1549,524,11,14 +75436,34,882,1550,527,11,14 +75437,34,882,1551,50,11,14 +75438,34,882,1552,529,11,14 +75439,34,882,1553,532,11,14 +75440,34,882,1499,838,18,18 +75441,33,882,1499,527,16,16 +75442,34,882,1499,527,16,16 From 2af1460c452c593b834a3550cebe22738b6a6bc1 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 17:46:05 -0500 Subject: [PATCH 47/50] feat: add galar-route-4, turffield, galar-route-5 encounters --- data/v2/csv/encounter_slots.csv | 38 ++++++++++++++++ data/v2/csv/encounters.csv | 79 +++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index c04f806e3..36ca63e7d 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1552,3 +1552,41 @@ id,version_group_id,encounter_method_id,slot,rarity 1551,20,38,4,10 1552,20,38,5,10 1553,20,38,6,5 +1554,20,38,1,30 +1555,20,38,2,23 +1556,20,38,3,20 +1557,20,38,4,10 +1558,20,38,5,5 +1559,20,38,6,5 +1560,20,38,7,5 +1561,20,38,8,1 +1562,20,38,9,1 +1563,20,1,1,35 +1564,20,1,2,25 +1565,20,1,3,20 +1566,20,1,4,10 +1567,20,1,5,5 +1568,20,1,6,4 +1569,20,1,7,1 +1570,20,35,1,100 +1571,20,56,1,70 +1572,20,56,2,20 +1573,20,56,3,10 +1574,20,38,1,35 +1575,20,38,2,30 +1576,20,38,3,15 +1577,20,38,4,10 +1578,20,38,5,5 +1579,20,38,6,5 +1580,20,38,1,35 +1581,20,38,2,30 +1582,20,38,3,20 +1583,20,38,4,10 +1584,20,38,5,5 +1585,20,1,1,26 +1586,20,1,2,20 +1587,20,1,3,20 +1588,20,1,4,14 +1589,20,1,5,5 +1590,20,1,6,10 +1591,20,1,7,5 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 75ea189fb..a73a9ea9f 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69578,3 +69578,82 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75440,34,882,1499,838,18,18 75441,33,882,1499,527,16,16 75442,34,882,1499,527,16,16 +75443,33,847,1554,309,14,16 +75444,33,847,1555,10161,14,16 +75445,33,847,1556,835,14,16 +75446,33,847,1557,710,14,16 +75447,33,847,1558,10027,14,16 +75448,33,847,1559,10028,14,16 +75449,33,847,1560,25,14,16 +75450,33,847,1561,133,14,16 +75451,33,847,1562,10029,14,16 +75452,33,847,1563,10161,13,15 +75453,33,847,1564,831,13,15 +75454,33,847,1565,868,13,15 +75455,33,847,1566,595,13,15 +75456,33,847,1567,742,13,15 +75457,33,847,1568,406,13,15 +75458,33,847,1569,597,13,15 +75459,33,847,1499,50,17,17 +75460,33,847,1570,819,13,15 +75461,33,847,1571,129,13,15 +75462,33,847,1572,833,13,15 +75463,33,847,1573,118,13,15 +75464,34,847,1554,309,14,16 +75465,34,847,1555,10161,14,16 +75466,34,847,1556,835,14,16 +75467,34,847,1557,710,14,16 +75468,34,847,1558,10027,14,16 +75469,34,847,1559,10028,14,16 +75470,34,847,1560,133,14,16 +75471,34,847,1561,25,14,16 +75472,34,847,1562,10029,14,16 +75473,34,847,1563,10161,13,15 +75474,34,847,1564,831,13,15 +75475,34,847,1565,868,13,15 +75476,34,847,1566,595,13,15 +75477,34,847,1567,742,13,15 +75478,34,847,1568,406,13,15 +75479,34,847,1569,597,13,15 +75480,34,847,1499,50,17,17 +75481,34,847,1570,819,13,15 +75482,34,847,1571,129,13,15 +75483,34,847,1572,833,13,15 +75484,34,847,1573,118,13,15 +75485,33,939,578,342,50,50 +75486,34,939,578,342,50,50 +75487,33,848,1574,759,19,21 +75488,33,848,1575,684,19,21 +75489,33,848,1576,572,19,21 +75490,33,848,1577,202,19,21 +75491,33,848,1578,10166,19,21 +75492,33,848,1579,425,19,21 +75493,34,848,1580,759,19,21 +75494,34,848,1581,682,19,21 +75495,34,848,1582,572,19,21 +75496,34,848,1583,202,19,21 +75497,34,848,1584,425,19,21 +75498,33,848,1585,825,16,18 +75499,33,848,1586,677,16,18 +75500,33,848,1587,274,16,18 +75501,33,848,1588,684,16,18 +75502,33,848,1589,751,16,18 +75503,33,848,1590,840,16,18 +75504,33,848,1591,290,16,18 +75505,34,848,1585,825,16,18 +75506,34,848,1586,677,16,18 +75507,34,848,1587,271,16,18 +75508,34,848,1588,682,16,18 +75509,34,848,1589,751,16,18 +75510,34,848,1590,840,16,18 +75511,34,848,1591,290,16,18 +75512,33,848,578,830,22,22 +75513,33,848,1570,819,16,18 +75514,33,848,1571,129,16,18 +75515,33,848,1572,833,16,18 +75516,33,848,1573,118,16,18 +75517,34,848,578,830,22,22 +75518,34,848,1570,819,16,18 +75519,34,848,1571,129,16,18 +75520,34,848,1572,833,16,18 +75521,34,848,1573,118,16,18 From 9622050b7da81f1b7e14b76884ec02f015dc1aeb Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 18:05:51 -0500 Subject: [PATCH 48/50] feat: add hulbury, galar-mine-no-2, and motostoke-outskirts encounters --- data/v2/csv/encounter_slots.csv | 26 +++++++++++++++ data/v2/csv/encounters.csv | 56 +++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 36ca63e7d..b54af4e7b 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1590,3 +1590,29 @@ id,version_group_id,encounter_method_id,slot,rarity 1589,20,1,5,5 1590,20,1,6,10 1591,20,1,7,5 +1592,20,56,1,50 +1593,20,56,2,15 +1594,20,56,3,20 +1595,20,56,4,10 +1596,20,56,5,5 +1597,20,38,1,25 +1598,20,38,2,25 +1599,20,38,3,15 +1600,20,38,4,15 +1601,20,38,5,5 +1602,20,38,6,5 +1603,20,38,7,10 +1604,20,38,1,25 +1605,20,38,2,25 +1606,20,38,3,20 +1607,20,38,4,15 +1608,20,38,5,5 +1609,20,38,6,10 +1610,20,56,1,55 +1611,20,56,2,30 +1612,20,56,3,15 +1613,20,38,1,40 +1614,20,38,2,30 +1615,20,38,3,15 +1616,20,38,4,10 +1617,20,38,5,5 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index a73a9ea9f..2a2a1afe6 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69657,3 +69657,59 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75519,34,848,1571,129,16,18 75520,34,848,1572,833,16,18 75521,34,848,1573,118,16,18 +75522,33,896,1592,846,20,24 +75523,33,896,1593,833,20,24 +75524,33,896,1594,170,20,24 +75525,33,896,1595,550,20,24 +75526,33,896,1596,746,20,24 +75527,34,896,1592,846,20,24 +75528,34,896,1593,833,20,24 +75529,34,896,1594,170,20,24 +75530,34,896,1595,550,20,24 +75531,34,896,1596,746,20,24 +75532,33,883,1597,422,20,24 +75533,33,883,1598,767,20,24 +75534,33,883,1599,688,20,24 +75535,33,883,1600,559,20,24 +75536,33,883,1601,833,20,24 +75537,33,883,1602,213,20,24 +75538,33,883,1603,714,20,24 +75539,34,883,1604,422,20,24 +75540,34,883,1605,767,20,24 +75541,34,883,1606,833,20,24 +75542,34,883,1607,453,20,24 +75543,34,883,1608,213,20,24 +75544,34,883,1609,714,20,24 +75545,33,883,1499,10180,25,25 +75546,33,883,578,423,50,50 +75547,33,883,578,834,24,24 +75548,34,883,1499,10180,25,25 +75549,34,883,578,423,50,50 +75550,34,883,578,834,24,24 +75551,33,883,1610,339,20,24 +75552,33,883,1611,833,20,24 +75553,33,883,1612,341,20,24 +75554,34,883,1610,339,20,24 +75555,34,883,1611,833,20,24 +75556,34,883,1612,341,20,24 +75557,33,907,1613,164,22,26 +75558,33,907,1614,185,22,26 +75559,33,907,1615,109,22,26 +75560,33,907,1616,856,22,26 +75561,33,907,1617,539,22,26 +75562,34,907,1574,164,22,26 +75563,34,907,1575,185,22,26 +75564,34,907,1576,109,22,26 +75565,34,907,1577,856,22,26 +75566,34,907,1578,538,22,26 +75567,34,907,1579,757,22,26 +75568,33,907,1526,559,21,24 +75569,33,907,1527,524,21,24 +75570,33,907,1528,624,21,24 +75571,33,907,1529,833,21,24 +75572,33,907,1530,859,21,24 +75573,34,907,1526,453,21,24 +75574,34,907,1527,524,21,24 +75575,34,907,1528,624,21,24 +75576,34,907,1529,833,21,24 +75577,34,907,1530,859,21,24 From 17c313b0c1b23573a095bb3d29d51bfb0e1d61d3 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 18:10:28 -0500 Subject: [PATCH 49/50] fix: correct location area prose for Route 6 (wrong id) --- data/v2/csv/location_area_prose.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 66157f2aa..f90cd7c8d 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2181,7 +2181,7 @@ location_area_id,local_language_id,name 845,9,Route 3 (East) 847,9,Route 4 848,9,Route 5 -859,9,Route 6 +849,9,Route 6 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle From 224edf63e7e2cf59c38e52c0c61c7db06bd1082e Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 20:46:05 -0500 Subject: [PATCH 50/50] fix: remove fishing encounter method and use existing bubbling-spots method --- data/v2/csv/encounter_method_prose.csv | 3 +- data/v2/csv/encounter_methods.csv | 1 - data/v2/csv/encounter_slots.csv | 42 +++++++++++++------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv index a0dff6952..54570b8df 100644 --- a/data/v2/csv/encounter_method_prose.csv +++ b/data/v2/csv/encounter_method_prose.csv @@ -78,6 +78,7 @@ 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 +34,9,Fishing at bubbling spots in the water 38,9,Walking in the overworld 38,5,En marchant dans le monde extérieur 39,9,Surfing in the overworld @@ -101,4 +102,4 @@ encounter_method_id,local_language_id,name 52,9,"Snagging a Pokemon from a trainer in Pokemon Colosseum or Pokemon XD: Gale of Darkness, after you have failed to capture them once." 53,9,"Finding a Wild Pokemon at any of the three Pokespots in Pokemon XD: Gale of Darkness." 54,9,Finding a Pokemon in a Hidden Grotto -55,9,Slathering a Honey Tree with Honey and waiting for a Pokémon to appear. \ No newline at end of file +55,9,Slathering a Honey Tree with Honey and waiting for a Pokémon to appear. diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index 150717b4a..ea3be036b 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -54,4 +54,3 @@ id,identifier,order 53,pokespot,53 54,hidden-grotto,54 55,honey-tree,54 -56,fishing,56 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index b54af4e7b..42cc27435 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1518,9 +1518,9 @@ id,version_group_id,encounter_method_id,slot,rarity 1517,20,1,3,20 1518,20,1,4,10 1519,20,1,5,5 -1520,20,56,1,80 -1521,20,56,2,15 -1522,20,56,3,5 +1520,20,34,1,80 +1521,20,34,2,15 +1522,20,34,3,5 1523,20,39,1,70 1524,20,39,2,28 1525,20,39,3,2 @@ -1529,13 +1529,13 @@ id,version_group_id,encounter_method_id,slot,rarity 1528,20,1,3,20 1529,20,1,4,10 1530,20,1,5,5 -1531,20,56,1,50 -1532,20,56,2,40 -1533,20,56,3,9 -1534,20,56,4,1 -1535,20,56,1,50 -1536,20,56,2,40 -1537,20,56,3,10 +1531,20,34,1,50 +1532,20,34,2,40 +1533,20,34,3,9 +1534,20,34,4,1 +1535,20,34,1,50 +1536,20,34,2,40 +1537,20,34,3,10 1538,20,1,1,35 1539,20,1,2,20 1540,20,1,3,20 @@ -1569,9 +1569,9 @@ id,version_group_id,encounter_method_id,slot,rarity 1568,20,1,6,4 1569,20,1,7,1 1570,20,35,1,100 -1571,20,56,1,70 -1572,20,56,2,20 -1573,20,56,3,10 +1571,20,34,1,70 +1572,20,34,2,20 +1573,20,34,3,10 1574,20,38,1,35 1575,20,38,2,30 1576,20,38,3,15 @@ -1590,11 +1590,11 @@ id,version_group_id,encounter_method_id,slot,rarity 1589,20,1,5,5 1590,20,1,6,10 1591,20,1,7,5 -1592,20,56,1,50 -1593,20,56,2,15 -1594,20,56,3,20 -1595,20,56,4,10 -1596,20,56,5,5 +1592,20,34,1,50 +1593,20,34,2,15 +1594,20,34,3,20 +1595,20,34,4,10 +1596,20,34,5,5 1597,20,38,1,25 1598,20,38,2,25 1599,20,38,3,15 @@ -1608,9 +1608,9 @@ id,version_group_id,encounter_method_id,slot,rarity 1607,20,38,4,15 1608,20,38,5,5 1609,20,38,6,10 -1610,20,56,1,55 -1611,20,56,2,30 -1612,20,56,3,15 +1610,20,34,1,55 +1611,20,34,2,30 +1612,20,34,3,15 1613,20,38,1,40 1614,20,38,2,30 1615,20,38,3,15