From d21b5919138cbc69b639070259b8f3ff6f6e37af Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 8 Jun 2026 10:11:01 -0500 Subject: [PATCH 01/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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/89] 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 fc0fb1987c19c78a3f0ec89b7a4d8789bc5739d1 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 18:15:17 -0500 Subject: [PATCH 50/89] feat: add galar-route-6 encounters --- data/v2/csv/encounter_slots.csv | 14 +++++++++++++ data/v2/csv/encounters.csv | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index b54af4e7b..0d6e40f7f 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1616,3 +1616,17 @@ id,version_group_id,encounter_method_id,slot,rarity 1615,20,38,3,15 1616,20,38,4,10 1617,20,38,5,5 +1618,20,38,1,35 +1619,20,38,2,29 +1620,20,38,3,20 +1621,20,38,4,10 +1622,20,38,5,5 +1623,20,38,6,1 +1624,20,1,1,30 +1625,20,1,2,20 +1626,20,1,3,18 +1627,20,1,4,10 +1628,20,1,5,10 +1629,20,1,6,5 +1630,20,1,7,5 +1631,20,1,8,2 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 2a2a1afe6..5bed2fdd7 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69713,3 +69713,39 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75575,34,907,1528,624,21,24 75576,34,907,1529,833,21,24 75577,34,907,1530,859,21,24 +75578,33,849,1618,10179,29,33 +75579,33,849,1619,694,29,33 +75580,33,849,1620,51,29,33 +75581,33,849,1621,556,29,33 +75582,33,849,1622,610,29,33 +75583,33,849,1623,328,29,33 +75584,33,849,1624,843,28,30 +75585,33,849,1625,632,28,30 +75586,33,849,1626,355,28,30 +75587,33,849,1627,451,28,30 +75588,33,849,1628,449,28,30 +75589,33,849,1629,631,28,30 +75590,33,849,1630,324,28,30 +75591,33,849,1631,701,28,30 +75592,33,849,1570,820,28,30 +75593,33,849,1571,129,28,30 +75594,33,849,1572,834,28,30 +75595,33,849,1573,118,28,30 +75596,34,849,1618,10179,29,33 +75597,34,849,1619,694,29,33 +75598,34,849,1620,51,29,33 +75599,34,849,1621,556,29,33 +75600,34,849,1622,328,29,33 +75601,34,849,1623,610,29,33 +75602,34,849,1624,843,28,30 +75603,34,849,1625,631,28,30 +75604,34,849,1626,355,28,30 +75605,34,849,1627,451,28,30 +75606,34,849,1628,449,28,30 +75607,34,849,1629,632,28,30 +75608,34,849,1630,324,28,30 +75609,34,849,1631,701,28,30 +75610,34,849,1570,820,28,30 +75611,34,849,1571,129,28,30 +75612,34,849,1572,834,28,30 +75613,34,849,1573,118,28,30 From 1dd4ccbde0578db16c75705e0b1573e08cb0514b Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 18:20:03 -0500 Subject: [PATCH 51/89] feat: add glimwood-tangle encounters --- data/v2/csv/encounter_slots.csv | 19 +++++++++++++++++++ data/v2/csv/encounters.csv | 23 +++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 0d6e40f7f..3a6fbee03 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1630,3 +1630,22 @@ id,version_group_id,encounter_method_id,slot,rarity 1629,20,1,6,5 1630,20,1,7,5 1631,20,1,8,2 +1632,20,38,1,20 +1633,20,38,2,20 +1634,20,38,3,15 +1635,20,38,4,10 +1636,20,38,5,10 +1637,20,38,6,10 +1638,20,38,7,9 +1639,20,38,8,5 +1640,20,38,9,1 +1641,20,38,1,20 +1642,20,38,2,15 +1643,20,38,3,10 +1644,20,38,4,10 +1645,20,38,5,10 +1646,20,38,6,10 +1647,20,38,7,10 +1648,20,38,8,9 +1649,20,38,9,5 +1650,20,38,10,1 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 5bed2fdd7..e0b1a54c8 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69749,3 +69749,26 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75611,34,849,1571,129,28,30 75612,34,849,1572,834,28,30 75613,34,849,1573,118,28,30 +75614,33,891,1632,860,34,36 +75615,33,891,1633,756,34,36 +75616,33,891,1634,857,34,36 +75617,33,891,1635,854,34,36 +75618,33,891,1636,708,34,36 +75619,33,891,1637,684,34,36 +75620,33,891,1638,766,34,36 +75621,33,891,1639,876,34,36 +75622,33,891,1640,854,34,36 +75623,34,891,1641,860,34,36 +75624,34,891,1642,756,34,36 +75625,34,891,1643,10162,34,36 +75626,34,891,1644,857,34,36 +75627,34,891,1645,708,34,36 +75628,34,891,1646,682,34,36 +75629,34,891,1647,854,34,36 +75630,34,891,1648,765,34,36 +75631,34,891,1649,10186,34,36 +75632,34,891,1650,854,34,36 +75633,33,891,1499,859,31,31 +75634,33,891,578,860,38,38 +75635,34,891,1499,859,31,31 +75636,34,891,578,860,38,38 From 8456f1c92b693ffac8d094bc73d27a6036775a29 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 18:29:54 -0500 Subject: [PATCH 52/89] feat: add galar-route-7 encounters and location area prose --- data/v2/csv/encounter_slots.csv | 13 +++++++++++++ data/v2/csv/encounters.csv | 28 ++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + 3 files changed, 42 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 3a6fbee03..ff5baa851 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1649,3 +1649,16 @@ id,version_group_id,encounter_method_id,slot,rarity 1648,20,38,8,9 1649,20,38,9,5 1650,20,38,10,1 +1651,20,38,1,30 +1652,20,38,2,20 +1653,20,38,3,20 +1654,20,38,4,15 +1655,20,38,5,10 +1656,20,38,6,5 +1657,20,1,1,25 +1658,20,1,2,25 +1659,20,1,3,20 +1660,20,1,4,10 +1661,20,1,5,10 +1662,20,1,6,5 +1663,20,1,7,5 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index e0b1a54c8..fbf2a63c4 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69772,3 +69772,31 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75634,33,891,578,860,38,38 75635,34,891,1499,859,31,31 75636,34,891,578,860,38,38 +75637,33,850,1651,863,37,41 +75638,33,850,1652,828,37,41 +75639,33,850,1653,596,37,41 +75640,33,850,1654,510,37,41 +75641,33,850,1655,686,37,41 +75642,33,850,1656,877,37,41 +75643,33,850,1657,848,36,40 +75644,33,850,1658,588,36,40 +75645,33,850,1659,823,36,40 +75646,33,850,1660,510,36,40 +75647,33,850,1661,678,36,40 +75648,33,850,1662,537,36,40 +75649,33,850,1663,616,36,40 +75650,33,850,1570,820,36,40 +75651,34,850,1651,863,37,41 +75652,34,850,1652,828,37,41 +75653,34,850,1653,596,37,41 +75654,34,850,1654,510,37,41 +75655,34,850,1655,686,37,41 +75656,34,850,1656,877,37,41 +75657,34,850,1657,848,36,40 +75658,34,850,1658,616,36,40 +75659,34,850,1659,823,36,40 +75660,34,850,1660,510,36,40 +75661,34,850,1661,10025,36,40 +75662,34,850,1662,537,36,40 +75663,34,850,1663,588,36,40 +75664,34,850,1570,820,36,40 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index f90cd7c8d..b830d23b0 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 849,9,Route 6 +850,9,Route 7 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle From 695055b8b5b9a1d1a06a4251d7d7ffdaca09508f Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 18:55:56 -0500 Subject: [PATCH 53/89] feat: add galar-route-8 encounters and location area prose --- data/v2/csv/encounter_slots.csv | 24 ++++++++++++++ data/v2/csv/encounters.csv | 49 +++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 2 ++ 3 files changed, 75 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index ff5baa851..5b4620b1c 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1662,3 +1662,27 @@ id,version_group_id,encounter_method_id,slot,rarity 1661,20,1,5,10 1662,20,1,6,5 1663,20,1,7,5 +1664,20,38,1,25 +1665,20,38,2,25 +1666,20,38,3,20 +1667,20,38,4,10 +1668,20,38,5,5 +1669,20,38,6,10 +1670,20,38,7,5 +1671,20,1,1,30 +1672,20,1,2,20 +1673,20,1,3,15 +1674,20,1,4,10 +1675,20,1,5,10 +1676,20,1,6,8 +1677,20,1,7,5 +1678,20,1,8,2 +1679,20,38,1,40 +1680,20,38,2,25 +1681,20,38,3,20 +1682,20,38,4,10 +1683,20,38,5,5 +1684,20,1,1,40 +1685,20,1,2,25 +1686,20,1,3,20 +1687,20,1,4,15 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index fbf2a63c4..49a30e010 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69800,3 +69800,52 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75662,34,850,1662,537,36,40 75663,34,850,1663,588,36,40 75664,34,850,1570,820,36,40 +75665,33,851,1664,622,39,41 +75666,33,851,1665,533,39,41 +75667,33,851,1666,624,39,41 +75668,33,851,1667,525,39,41 +75669,33,851,1668,777,39,41 +75670,33,851,1669,627,39,41 +75671,33,851,1670,338,39,41 +75672,33,851,1671,844,38,40 +75673,33,851,1672,111,38,40 +75674,33,851,1673,356,38,40 +75675,33,851,1674,93,38,40 +75676,33,851,1675,437,38,40 +75677,33,851,1676,450,38,40 +75678,33,851,1677,452,38,40 +75679,33,851,1678,870,38,40 +75680,34,851,1664,622,39,41 +75681,34,851,1665,525,39,41 +75682,34,851,1666,624,39,41 +75683,34,851,1667,533,39,41 +75684,34,851,1668,777,39,41 +75685,34,851,1669,629,39,41 +75686,34,851,1670,337,39,41 +75687,34,851,1671,844,38,40 +75688,34,851,1672,111,38,40 +75689,34,851,1673,356,38,40 +75690,34,851,1674,93,38,40 +75691,34,851,1675,437,38,40 +75692,34,851,1676,450,38,40 +75693,34,851,1677,452,38,40 +75694,34,851,1678,870,38,40 +75695,33,852,1679,872,39,43 +75696,33,852,1680,361,39,43 +75697,33,852,1681,215,39,43 +75698,33,852,1682,583,39,43 +75699,33,852,1683,539,39,43 +75700,34,852,1679,872,39,43 +75701,34,852,1680,361,39,43 +75702,34,852,1681,215,39,43 +75703,34,852,1682,583,39,43 +75704,34,852,1683,538,39,43 +75705,33,852,1515,872,38,41 +75706,33,852,1516,215,38,41 +75707,33,852,1517,459,38,41 +75708,33,852,1518,225,38,41 +75709,33,852,1519,554,38,41 +75710,34,852,1684,872,38,41 +75711,34,852,1685,215,38,41 +75712,34,852,1686,459,38,41 +75713,34,852,1687,225,38,41 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index b830d23b0..23d806dda 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2183,6 +2183,8 @@ location_area_id,local_language_id,name 848,9,Route 5 849,9,Route 6 850,9,Route 7 +851,9,Route 8 (Main) +852,9,Route 8 (Steamdrift Way) 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle From a2559dc2a06d5b8fff09164061ce8da5a1d94deb Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 18:58:05 -0500 Subject: [PATCH 54/89] fix: add missing galar-route-8 encounters --- data/v2/csv/encounters.csv | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 49a30e010..35bdf9296 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69849,3 +69849,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75711,34,852,1685,215,38,41 75712,34,852,1686,459,38,41 75713,34,852,1687,225,38,41 +75714,33,851,578,558,40,40 +75715,33,851,1499,870,40,40 +75716,34,851,578,558,40,40 +75717,34,851,1499,870,40,40 From 331016bfdcab52cd15836c61f27715b8578607c8 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 19:10:00 -0500 Subject: [PATCH 55/89] feat: add galar-route-9-main encounters and location area prose --- data/v2/csv/encounter_slots.csv | 16 ++++++++++++++ data/v2/csv/encounters.csv | 34 +++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + 3 files changed, 51 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 5b4620b1c..656577eb5 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1686,3 +1686,19 @@ id,version_group_id,encounter_method_id,slot,rarity 1685,20,1,2,25 1686,20,1,3,20 1687,20,1,4,15 +1688,20,38,1,40 +1689,20,38,2,35 +1690,20,38,3,15 +1691,20,38,4,5 +1692,20,38,5,5 +1693,20,1,1,40 +1694,20,1,2,30 +1695,20,1,3,25 +1696,20,1,4,5 +1697,20,56,1,60 +1698,20,56,2,30 +1699,20,56,3,10 +1700,20,39,1,40 +1701,20,39,2,30 +1702,20,39,3,25 +1703,20,39,4,5 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 35bdf9296..3ca3bbeaa 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69853,3 +69853,37 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75715,33,851,1499,870,40,40 75716,34,851,578,558,40,40 75717,34,851,1499,870,40,40 +75718,33,853,1688,279,41,44 +75719,33,853,1689,747,41,44 +75720,33,853,1690,423,41,44 +75721,33,853,1691,593,41,44 +75722,33,853,1692,771,41,44 +75723,33,853,1693,845,38,42 +75724,33,853,1694,224,38,42 +75725,33,853,1695,99,38,42 +75726,33,853,1696,871,38,42 +75727,33,853,578,362,55,55 +75728,34,853,1688,279,41,44 +75729,34,853,1689,593,41,44 +75730,34,853,1690,423,41,44 +75731,34,853,1691,747,41,44 +75732,34,853,1692,771,41,44 +75733,34,853,1693,845,38,42 +75734,34,853,1694,224,38,42 +75735,34,853,1695,99,38,42 +75736,34,853,1696,871,38,42 +75737,34,853,578,362,55,55 +75738,33,853,1697,224,38,42 +75739,33,853,1698,746,38,42 +75740,33,853,1699,771,38,42 +75741,33,853,1700,279,39,43 +75742,33,853,1701,211,39,43 +75743,33,853,1702,458,39,43 +75744,33,853,1703,593,39,43 +75745,34,853,1697,224,38,42 +75746,34,853,1698,746,38,42 +75747,34,853,1699,771,38,42 +75748,34,853,1700,279,39,43 +75749,34,853,1701,211,39,43 +75750,34,853,1702,458,39,43 +75751,34,853,1703,593,39,43 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 23d806dda..a13c1bd42 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 850,9,Route 7 851,9,Route 8 (Main) 852,9,Route 8 (Steamdrift Way) +853,9,Route 9 (Main) 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle From bd33afaa4cd435e24f7305394251838d4014cd29 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 19:10:17 -0500 Subject: [PATCH 56/89] fix: correct typo in location area ID --- data/v2/csv/location_areas.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 2310d9aeb..de1d9a71a 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -734,7 +734,7 @@ id,location_id,game_index,identifier 852,875,0,steamdrift-way 853,876,0,main 854,876,0,circhester-bay -855,876,0,outer-spikemouth +855,876,0,outer-spikemuth 856,877,0,main 857,877,0,near-station 858,878,0, From 18eb0181570e0f25ca7a7d7bf394965e418657bd Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 20:04:09 -0500 Subject: [PATCH 57/89] feat: add galar-route-9-circhester-bay encounters and location area prose --- data/v2/csv/encounter_slots.csv | 22 +++++++++++++++ data/v2/csv/encounters.csv | 42 +++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + 3 files changed, 65 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 656577eb5..202f6177c 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1702,3 +1702,25 @@ id,version_group_id,encounter_method_id,slot,rarity 1701,20,39,2,30 1702,20,39,3,25 1703,20,39,4,5 +1704,20,38,1,30 +1705,20,38,2,24 +1706,20,38,3,20 +1707,20,38,4,10 +1708,20,38,5,15 +1709,20,38,6,1 +1710,20,38,1,30 +1711,20,38,2,24 +1712,20,38,3,20 +1713,20,38,4,20 +1714,20,38,5,5 +1715,20,38,6,1 +1716,20,43,1,100 +1717,20,56,1,50 +1718,20,56,2,34 +1719,20,56,3,10 +1720,20,56,4,5 +1721,20,56,5,1 +1722,20,39,1,40 +1723,20,39,2,15 +1724,20,39,3,35 +1725,20,39,4,10 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 3ca3bbeaa..88e3c139f 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69887,3 +69887,45 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75749,34,853,1701,211,39,43 75750,34,853,1702,458,39,43 75751,34,853,1703,593,39,43 +75752,33,854,1704,852,39,43 +75753,33,854,1705,224,39,43 +75754,33,854,1706,748,39,43 +75755,33,854,1707,689,39,43 +75756,33,854,1708,712,39,43 +75757,33,854,1709,781,39,43 +75758,34,854,1710,852,39,43 +75759,34,854,1711,224,39,43 +75760,34,854,1712,689,39,43 +75761,34,854,1713,712,39,43 +75762,34,854,1714,748,39,43 +75763,34,854,1715,781,39,43 +75764,33,854,1693,845,39,43 +75765,33,854,1694,423,39,43 +75766,33,854,1695,686,39,43 +75767,33,854,1696,871,39,43 +75768,34,854,1693,845,39,43 +75769,34,854,1694,423,39,43 +75770,34,854,1695,686,39,43 +75771,34,854,1696,871,39,43 +75772,33,854,1716,853,50,50 +75773,34,854,1716,853,50,50 +75774,33,854,1570,820,39,43 +75775,34,854,1570,820,39,43 +75776,33,854,1717,458,39,43 +75777,33,854,1718,320,39,43 +75778,33,854,1719,226,39,43 +75779,33,854,1720,321,39,43 +75780,33,854,1721,131,39,43 +75781,33,854,1722,320,39,43 +75782,33,854,1723,223,39,43 +75783,33,854,1724,458,39,43 +75784,33,854,1725,226,39,43 +75785,34,854,1717,458,39,43 +75786,34,854,1718,320,39,43 +75787,34,854,1719,226,39,43 +75788,34,854,1720,321,39,43 +75789,34,854,1721,131,39,43 +75790,34,854,1722,320,39,43 +75791,34,854,1723,223,39,43 +75792,34,854,1724,458,39,43 +75793,34,854,1725,226,39,43 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index a13c1bd42..8e18c9803 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2186,6 +2186,7 @@ location_area_id,local_language_id,name 851,9,Route 8 (Main) 852,9,Route 8 (Steamdrift Way) 853,9,Route 9 (Main) +854,9,Route 9 (Circhester Bay) 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle From a0025e391e70f7ba105340e7e54748c06ec15472 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 20:04:44 -0500 Subject: [PATCH 58/89] feat: add galar-route-9-outer-spikemuth 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 8e18c9803..3b9d94146 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2187,6 +2187,7 @@ location_area_id,local_language_id,name 852,9,Route 8 (Steamdrift Way) 853,9,Route 9 (Main) 854,9,Route 9 (Circhester Bay) +855,9,Route 9 (Outer Spikemuth) 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle From e4b1a64c7d9b7ab4b3430f4f8df8296f631ea8c6 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 20:13:44 -0500 Subject: [PATCH 59/89] feat: add galar-route-10 encounters and location area prose --- data/v2/csv/encounter_slots.csv | 21 +++++++++++++ data/v2/csv/encounters.csv | 46 +++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 2 ++ 3 files changed, 69 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 202f6177c..2da42bc37 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1724,3 +1724,24 @@ id,version_group_id,encounter_method_id,slot,rarity 1723,20,39,2,15 1724,20,39,3,35 1725,20,39,4,10 +1726,20,38,1,30 +1727,20,38,2,30 +1728,20,38,3,20 +1729,20,38,4,10 +1730,20,38,5,10 +1731,20,1,1,30 +1732,20,1,2,30 +1733,20,1,3,25 +1734,20,1,4,10 +1735,20,1,5,5 +1736,20,38,1,40 +1737,20,38,2,30 +1738,20,38,3,15 +1739,20,38,4,14 +1740,20,38,5,1 +1741,20,1,1,30 +1742,20,1,2,28 +1743,20,1,3,25 +1744,20,1,4,10 +1745,20,1,5,5 +1746,20,1,6,2 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 88e3c139f..4028db31c 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69929,3 +69929,49 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75791,34,854,1723,223,39,43 75792,34,854,1724,458,39,43 75793,34,854,1725,226,39,43 +75794,33,857,1726,10168,45,48 +75795,33,857,1727,613,45,48 +75796,33,857,1728,459,45,48 +75797,33,857,1729,362,45,48 +75798,33,857,1730,584,45,48 +75799,33,857,1731,600,43,46 +75800,33,857,1732,583,43,46 +75801,33,857,1733,112,43,46 +75802,33,857,1734,872,43,46 +75803,33,857,1735,10176,43,46 +75804,34,857,1726,10168,45,48 +75805,34,857,1727,613,45,48 +75806,34,857,1728,459,45,48 +75807,34,857,1729,362,45,48 +75808,34,857,1730,584,45,48 +75809,34,857,1731,600,43,46 +75810,34,857,1732,583,43,46 +75811,34,857,1733,112,43,46 +75812,34,857,1734,872,43,46 +75813,34,857,1735,583,43,46 +75814,33,856,1736,10168,45,48 +75815,33,856,1737,459,45,48 +75816,33,856,1738,613,45,48 +75817,33,856,1739,215,45,48 +75818,33,856,1740,884,45,48 +75819,33,856,1741,583,44,46 +75820,33,856,1742,460,44,46 +75821,33,856,1743,614,44,46 +75822,33,856,1744,872,44,46 +75823,33,856,1745,10176,44,46 +75824,33,856,1746,874,44,46 +75825,33,856,578,460,55,55 +75826,33,856,578,614,55,55 +75827,34,856,1736,10168,45,48 +75828,34,856,1737,459,45,48 +75829,34,856,1738,613,45,48 +75830,34,856,1739,215,45,48 +75831,34,856,1740,884,45,48 +75832,34,856,1741,583,44,46 +75833,34,856,1742,460,44,46 +75834,34,856,1743,614,44,46 +75835,34,856,1744,872,44,46 +75836,34,856,1745,583,44,46 +75837,34,856,1746,875,44,46 +75838,34,856,578,460,55,55 +75839,34,856,578,614,55,55 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 3b9d94146..af8a6b71e 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2188,6 +2188,8 @@ location_area_id,local_language_id,name 853,9,Route 9 (Main) 854,9,Route 9 (Circhester Bay) 855,9,Route 9 (Outer Spikemuth) +856,9,Route 10 (Main) +857,9,Route 10 (Near Station) 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle From 7c3c8899addd3ee9d8b7002725eb69db6d635ec3 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 20:20:59 -0500 Subject: [PATCH 60/89] feat: add slumbering-weald encounters, location areas, and relevant prose --- data/v2/csv/encounter_slots.csv | 18 +++++++++++ data/v2/csv/encounters.csv | 46 +++++++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 2 ++ data/v2/csv/location_areas.csv | 3 +- 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 2da42bc37..a947f9599 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1745,3 +1745,21 @@ id,version_group_id,encounter_method_id,slot,rarity 1744,20,1,4,10 1745,20,1,5,5 1746,20,1,6,2 +1747,20,38,1,40 +1748,20,38,2,30 +1749,20,38,3,20 +1750,20,38,4,10 +1751,20,1,1,50 +1752,20,1,2,20 +1753,20,1,3,15 +1754,20,1,4,10 +1755,20,1,5,5 +1756,20,1,1,30 +1757,20,1,2,25 +1758,20,1,3,20 +1759,20,1,4,15 +1760,20,1,5,5 +1761,20,1,6,5 +1762,20,56,1,60 +1763,20,56,2,20 +1764,20,56,3,20 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 4028db31c..bde23cc9d 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69975,3 +69975,49 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75837,34,856,1746,875,44,46 75838,34,856,578,460,55,55 75839,34,856,578,614,55,55 +75840,33,919,1747,819,2,3 +75841,33,919,1748,821,2,3 +75842,33,919,1749,824,2,3 +75843,33,919,1750,736,2,3 +75844,33,919,1751,819,2,3 +75845,33,919,1752,821,2,3 +75846,33,919,1753,163,2,3 +75847,33,919,1754,824,2,3 +75848,33,919,1755,736,2,3 +75849,34,919,1747,819,2,3 +75850,34,919,1748,821,2,3 +75851,34,919,1749,824,2,3 +75852,34,919,1750,736,2,3 +75853,34,919,1751,819,2,3 +75854,34,919,1752,821,2,3 +75855,34,919,1753,163,2,3 +75856,34,919,1754,824,2,3 +75857,34,919,1755,736,2,3 +75858,33,1369,1500,10167,45,47 +75859,33,1369,1501,517,45,47 +75860,33,1369,1502,826,45,47 +75861,33,1369,1503,823,45,47 +75862,33,1369,1756,10167,45,47 +75863,33,1369,1757,517,45,47 +75864,33,1369,1758,823,45,47 +75865,33,1369,1759,826,45,47 +75866,33,1369,1760,12,45,47 +75867,33,1369,1761,10180,45,47 +75868,33,1369,1499,10180,48,48 +75869,33,1369,1762,340,45,47 +75870,33,1369,1763,339,45,47 +75871,33,1369,1764,129,45,47 +75872,34,1369,1500,10167,45,47 +75873,34,1369,1501,517,45,47 +75874,34,1369,1502,826,45,47 +75875,34,1369,1503,823,45,47 +75876,34,1369,1756,10167,45,47 +75877,34,1369,1757,517,45,47 +75878,34,1369,1758,823,45,47 +75879,34,1369,1759,826,45,47 +75880,34,1369,1760,12,45,47 +75881,34,1369,1761,10180,45,47 +75882,34,1369,1499,10180,48,48 +75883,34,1369,1762,340,45,47 +75884,34,1369,1763,339,45,47 +75885,34,1369,1764,129,45,47 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index af8a6b71e..6a8a6eefc 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2196,6 +2196,7 @@ location_area_id,local_language_id,name 896,9,Hulbury 906,9,Motostoke 907,9,Motostoke Outskirts +919,9,Slumbering Weald (Entrance) 939,9,Turffield 942,9,Wegehurst 1167,9,Lighthouse Basement @@ -2421,3 +2422,4 @@ location_area_id,local_language_id,name 1366,9,Route 2 (Lakeside) 1367,9,Motostoke (Gym) 1368,9,Route 3 (West) +1369,9,Slumbering Weald (Deep) diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index de1d9a71a..d768e1060 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -798,7 +798,7 @@ id,location_id,game_index,identifier 916,928,0,main 917,928,0,2 918,929,0, -919,930,0, +919,930,0,main 920,931,0, 921,932,0, 922,933,0,main @@ -1248,3 +1248,4 @@ id,location_id,game_index,identifier 1366,869,0,lakeside 1367,918,0,gym 1368,870,0,west +1369,930,0,deep From 375c13fce1934bca67a735e7570354a4282f613b Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 20:27:48 -0500 Subject: [PATCH 61/89] feat: add new location energy-plant and relevant encounters, areas, and prose --- data/v2/csv/encounters.csv | 4 ++++ data/v2/csv/location_area_prose.csv | 1 + data/v2/csv/location_areas.csv | 1 + data/v2/csv/location_names.csv | 1 + data/v2/csv/locations.csv | 1 + 5 files changed, 8 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index bde23cc9d..54490c290 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70021,3 +70021,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75883,34,1369,1762,340,45,47 75884,34,1369,1763,339,45,47 75885,34,1369,1764,129,45,47 +75886,33,1370,578,890,60,60 +75887,34,1370,578,890,60,60 +75888,33,1370,578,888,70,70 +75889,34,1370,578,889,70,70 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 6a8a6eefc..eac63b733 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2423,3 +2423,4 @@ location_area_id,local_language_id,name 1367,9,Motostoke (Gym) 1368,9,Route 3 (West) 1369,9,Slumbering Weald (Deep) +1370,9,Energy Plant Tower Summit diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index d768e1060..0ecb4462f 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -1249,3 +1249,4 @@ id,location_id,game_index,identifier 1367,918,0,gym 1368,870,0,west 1369,930,0,deep +1370,1114,0,tower-summit diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv index 4c729e1e8..29d05c6e0 100644 --- a/data/v2/csv/location_names.csv +++ b/data/v2/csv/location_names.csv @@ -4957,3 +4957,4 @@ location_id,local_language_id,name,subtitle 1111,9,Cipher Key Lair, 1112,9,Citadark Isle, 1113,9,Kanto Underground Path, +1114,9,Energy Plant diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index cc9012d4a..eb74f0287 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -1095,3 +1095,4 @@ id,region_id,identifier 1111,11,cipher-key-lair 1112,11,citadark-isle 1113,1,kanto-underground-path +1114,8,energy-plant From 95f9cef49c4eca0209fa39f7c4573997ea988d95 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 20:44:35 -0500 Subject: [PATCH 62/89] 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 | 64 +++++++++++++------------- 3 files changed, 34 insertions(+), 34 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 a947f9599..44315f70b 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 @@ -1695,9 +1695,9 @@ id,version_group_id,encounter_method_id,slot,rarity 1694,20,1,2,30 1695,20,1,3,25 1696,20,1,4,5 -1697,20,56,1,60 -1698,20,56,2,30 -1699,20,56,3,10 +1697,20,34,1,60 +1698,20,34,2,30 +1699,20,34,3,10 1700,20,39,1,40 1701,20,39,2,30 1702,20,39,3,25 @@ -1715,11 +1715,11 @@ id,version_group_id,encounter_method_id,slot,rarity 1714,20,38,5,5 1715,20,38,6,1 1716,20,43,1,100 -1717,20,56,1,50 -1718,20,56,2,34 -1719,20,56,3,10 -1720,20,56,4,5 -1721,20,56,5,1 +1717,20,34,1,50 +1718,20,34,2,34 +1719,20,34,3,10 +1720,20,34,4,5 +1721,20,34,5,1 1722,20,39,1,40 1723,20,39,2,15 1724,20,39,3,35 @@ -1760,6 +1760,6 @@ id,version_group_id,encounter_method_id,slot,rarity 1759,20,1,4,15 1760,20,1,5,5 1761,20,1,6,5 -1762,20,56,1,60 -1763,20,56,2,20 -1764,20,56,3,20 +1762,20,34,1,60 +1763,20,34,2,20 +1764,20,34,3,20 From b0fa67294854d024e50d9b0e8feeeb13bda27fab Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 21:26:56 -0500 Subject: [PATCH 63/89] feat: add new encounter condition save-data and values for LGPE --- data/v2/csv/encounter_condition_prose.csv | 1 + data/v2/csv/encounter_condition_value_map.csv | 4 ++++ data/v2/csv/encounter_condition_value_prose.csv | 2 ++ data/v2/csv/encounter_condition_values.csv | 2 ++ data/v2/csv/encounter_conditions.csv | 1 + 5 files changed, 10 insertions(+) diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv index 2a856089a..7c66a3141 100644 --- a/data/v2/csv/encounter_condition_prose.csv +++ b/data/v2/csv/encounter_condition_prose.csv @@ -41,3 +41,4 @@ encounter_condition_id,local_language_id,name 20,9,Headbutt Tree Type 21,9,Listen to Mr. Backlot 22,9,Bug-Catching Contest +23,9,Have save data from another Pokémon game diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index ddf2c863e..2535d1993 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22624,3 +22624,7 @@ encounter_id,encounter_condition_value_id 19983,204 19984,204 19985,204 +75896,206 +75897,207 +75898,206 +75899,207 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 89a24c45b..6d1de8fab 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -326,3 +326,5 @@ encounter_condition_value_id,local_language_id,name 203,9,Mr. Backlot has mentioned seeing this Pokemon in the garden 204,9,Not during the Bug-Catching Contest 205,9,During the Bug-Catching Contest +206,9,Have save data from Let's Go Pikachu +207,9,Have save data from Let's Go Eevee diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index 8115f8a62..20d076003 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -204,3 +204,5 @@ id,encounter_condition_id,identifier,is_default 203,21,backlot-mentioned,0 204,22,bug-catching-contest-no,1 205,22,bug-catching-contest-yes,0 +206,23,save-data-from-lets-go-pikachu,0 +207,23,save-data-from-lets-go-eevee,0 diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv index 3a38986c2..4856496cb 100644 --- a/data/v2/csv/encounter_conditions.csv +++ b/data/v2/csv/encounter_conditions.csv @@ -21,3 +21,4 @@ id,identifier 20,headbutt-tree 21,backlot 22,bug-catching-contest +23,save-data From 74a8238cb6e60f7aac043b0092cff1926a44f9cd Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 21:28:04 -0500 Subject: [PATCH 64/89] feat: add gift starter pokemon --- data/v2/csv/encounter_slots.csv | 1 + data/v2/csv/encounters.csv | 6 ++++++ data/v2/csv/location_area_prose.csv | 1 + data/v2/csv/location_areas.csv | 1 + 4 files changed, 9 insertions(+) diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 44315f70b..6f5a62ac7 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1763,3 +1763,4 @@ id,version_group_id,encounter_method_id,slot,rarity 1762,20,34,1,60 1763,20,34,2,20 1764,20,34,3,20 +1765,20,18,1,100 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 54490c290..b038139d4 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70025,3 +70025,9 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75887,34,1370,578,890,60,60 75888,33,1370,578,888,70,70 75889,34,1370,578,889,70,70 +75890,33,912,1765,810,5,5 +75891,33,912,1765,813,5,5 +75892,33,912,1765,816,5,5 +75893,34,912,1765,810,5,5 +75894,34,912,1765,813,5,5 +75895,34,912,1765,816,5,5 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index eac63b733..be3420940 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2196,6 +2196,7 @@ location_area_id,local_language_id,name 896,9,Hulbury 906,9,Motostoke 907,9,Motostoke Outskirts +912,9,Postwick 919,9,Slumbering Weald (Entrance) 939,9,Turffield 942,9,Wegehurst diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 0ecb4462f..0f4e72b98 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -1250,3 +1250,4 @@ id,location_id,game_index,identifier 1368,870,0,west 1369,930,0,deep 1370,1114,0,tower-summit +1371,1115,0, From b099bd59504aefd37ab4350145e142db6a19ace2 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 21:28:22 -0500 Subject: [PATCH 65/89] feat: add gift pikachu and eevee for having save data from LGPE games --- data/v2/csv/encounters.csv | 4 ++++ data/v2/csv/location_area_prose.csv | 1 + data/v2/csv/locations.csv | 1 + 3 files changed, 6 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index b038139d4..1add20f71 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70031,3 +70031,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75893,34,912,1765,810,5,5 75894,34,912,1765,813,5,5 75895,34,912,1765,816,5,5 +75896,33,1371,1765,25,10,10 +75897,33,1371,1765,133,10,10 +75898,34,1371,1765,25,10,10 +75899,34,1371,1765,133,10,10 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index be3420940..b171a2b86 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2425,3 +2425,4 @@ location_area_id,local_language_id,name 1368,9,Route 3 (West) 1369,9,Slumbering Weald (Deep) 1370,9,Energy Plant Tower Summit +1371,9,Meetup Spot diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index eb74f0287..35c9aa7b7 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -1096,3 +1096,4 @@ id,region_id,identifier 1112,11,citadark-isle 1113,1,kanto-underground-path 1114,8,energy-plant +1115,8,meetup-spot From ad72be5f1ba638024de6a2782c7044db67cd5fec Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 21:29:03 -0500 Subject: [PATCH 66/89] feat: add gift toxel --- 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 1add20f71..08e893ff2 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70035,3 +70035,5 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75897,33,1371,1765,133,10,10 75898,34,1371,1765,25,10,10 75899,34,1371,1765,133,10,10 +75900,33,848,1765,848,1,1 +75901,34,848,1765,848,1,1 From e644b9c335f65b3dea7fe35efcc6974ec8764e7a Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 21:31:47 -0500 Subject: [PATCH 67/89] feat: add SWSH fossil conditions and gift encounters --- data/v2/csv/encounter_condition_value_map.csv | 16 ++++++++++++++++ data/v2/csv/encounter_condition_value_prose.csv | 4 ++++ data/v2/csv/encounter_condition_values.csv | 4 ++++ data/v2/csv/encounters.csv | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 2535d1993..22aee4819 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22628,3 +22628,19 @@ encounter_id,encounter_condition_value_id 75897,207 75898,206 75899,207 +75902,208 +75902,209 +75903,208 +75903,210 +75904,209 +75904,211 +75905,210 +75905,211 +75906,208 +75906,209 +75907,208 +75907,210 +75908,209 +75908,211 +75909,210 +75909,211 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 6d1de8fab..d19f73185 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -328,3 +328,7 @@ encounter_condition_value_id,local_language_id,name 205,9,During the Bug-Catching Contest 206,9,Have save data from Let's Go Pikachu 207,9,Have save data from Let's Go Eevee +208,9,Have Fossilized Bird in bag +209,9,Have Fossilized Drake in bag +210,9,Have Fossilized Dino in bag +211,9,Have Fossilized Fish in bag diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index 20d076003..f65d9bfc6 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -206,3 +206,7 @@ id,encounter_condition_id,identifier,is_default 205,22,bug-catching-contest-yes,0 206,23,save-data-from-lets-go-pikachu,0 207,23,save-data-from-lets-go-eevee,0 +208,11,item-fossilized-bird,0 +209,11,item-fossilized-drake,0 +210,11,item-fossilized-dino,0 +211,11,item-fossilized-fish,0 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 08e893ff2..ec553fdb6 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70037,3 +70037,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75899,34,1371,1765,133,10,10 75900,33,848,1765,848,1,1 75901,34,848,1765,848,1,1 +75902,33,849,1765,880,10,10 +75903,33,849,1765,881,10,10 +75904,33,849,1765,882,10,10 +75905,33,849,1765,883,10,10 +75906,34,849,1765,880,10,10 +75907,34,849,1765,881,10,10 +75908,34,849,1765,882,10,10 +75909,34,849,1765,883,10,10 From fe9011ad6b78a7b87e5b74022c4ea9a3e333a7ab Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 21:39:42 -0500 Subject: [PATCH 68/89] feat: add galar-battle-tower gift type-null. rename battle-tower to galar-battle-tower for consistency --- data/v2/csv/encounter_condition_value_map.csv | 2 ++ data/v2/csv/encounters.csv | 2 ++ data/v2/csv/location_area_prose.csv | 1 + data/v2/csv/locations.csv | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 22aee4819..1f9456154 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22644,3 +22644,5 @@ encounter_id,encounter_condition_value_id 75908,211 75909,210 75909,211 +75910,35 +75911,35 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index ec553fdb6..49fa07c42 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70045,3 +70045,5 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75907,34,849,1765,881,10,10 75908,34,849,1765,882,10,10 75909,34,849,1765,883,10,10 +75910,33,861,1765,772,50,50 +75911,34,861,1765,772,50,50 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index b171a2b86..3fbd7a1ab 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2190,6 +2190,7 @@ location_area_id,local_language_id,name 855,9,Route 9 (Outer Spikemuth) 856,9,Route 10 (Main) 857,9,Route 10 (Near Station) +861,9,Battle Tower 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index 35c9aa7b7..e4f161690 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -862,7 +862,7 @@ id,region_id,identifier 878,8,axews-eye 879,8,ballimere-lake 880,8,ballonlea -881,8,battle-tower +881,8,galar-battle-tower 882,8,brawlers-cave 883,8,bridge-field 884,8,challenge-beach From 2c6438378f7072e95c1fd1be0ba70c569573e067 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Fri, 12 Jun 2026 21:41:20 -0500 Subject: [PATCH 69/89] feat: add postwick-leons-room location area and gift charmander --- data/v2/csv/encounter_condition_value_map.csv | 2 ++ data/v2/csv/encounters.csv | 2 ++ data/v2/csv/location_area_prose.csv | 1 + data/v2/csv/location_areas.csv | 1 + 4 files changed, 6 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 1f9456154..37955fda5 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22646,3 +22646,5 @@ encounter_id,encounter_condition_value_id 75909,211 75910,35 75911,35 +75912,35 +75913,35 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 49fa07c42..e653f8efb 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70047,3 +70047,5 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75909,34,849,1765,883,10,10 75910,33,861,1765,772,50,50 75911,34,861,1765,772,50,50 +75912,33,1372,1765,4,5,5 +75913,34,1372,1765,4,5,5 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 3fbd7a1ab..1b62de2a8 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2427,3 +2427,4 @@ location_area_id,local_language_id,name 1369,9,Slumbering Weald (Deep) 1370,9,Energy Plant Tower Summit 1371,9,Meetup Spot +1372,9,Postwick (Leon's Room) diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 0f4e72b98..c519acd6f 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -1251,3 +1251,4 @@ id,location_id,game_index,identifier 1369,930,0,deep 1370,1114,0,tower-summit 1371,1115,0, +1372,924,0,leons-room From 58e26754ae8d6597639274483010335919065029 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 10:45:27 -0500 Subject: [PATCH 70/89] feat: add master-dojo gifts, encounter conditions, and prose --- data/v2/csv/encounter_condition_value_map.csv | 8 ++++++++ data/v2/csv/encounter_condition_value_prose.csv | 2 ++ data/v2/csv/encounter_condition_values.csv | 2 ++ data/v2/csv/encounters.csv | 8 ++++++++ data/v2/csv/location_area_prose.csv | 1 + 5 files changed, 21 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 37955fda5..f365b2655 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22648,3 +22648,11 @@ encounter_id,encounter_condition_value_id 75911,35 75912,35 75913,35 +75914,212 +75915,212 +75916,213 +75917,212 +75918,212 +75919,213 +75920,213 +75921,213 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index d19f73185..7652cf33e 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -332,3 +332,5 @@ encounter_condition_value_id,local_language_id,name 209,9,Have Fossilized Drake in bag 210,9,Have Fossilized Dino in bag 211,9,Have Fossilized Fish in bag +212,9,Complete the Master Dojo's first trial +213,9,Complete all three Master Dojo trials diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index f65d9bfc6..f3e2d730e 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -210,3 +210,5 @@ id,encounter_condition_id,identifier,is_default 209,11,item-fossilized-drake,0 210,11,item-fossilized-dino,0 211,11,item-fossilized-fish,0 +212,9,story-progress-master-dojo-complete-first-trial,0 +213,9,story-progress-master-dojo-complete-third-trial,0 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index e653f8efb..35c92ba1d 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70049,3 +70049,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75911,34,861,1765,772,50,50 75912,33,1372,1765,4,5,5 75913,34,1372,1765,4,5,5 +75914,33,904,1765,1,5,5 +75915,33,904,1765,7,5,5 +75916,33,904,1765,891,10,10 +75917,34,904,1765,1,5,5 +75918,34,904,1765,7,5,5 +75919,34,904,1765,891,10,10 +75920,33,904,1765,137,25,25 +75921,34,904,1765,137,25,25 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 1b62de2a8..c435fe040 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2195,6 +2195,7 @@ location_area_id,local_language_id,name 883,9,Galar Mine No. 2 891,9,Glimwood Tangle 896,9,Hulbury +904,9,Master Dojo 906,9,Motostoke 907,9,Motostoke Outskirts 912,9,Postwick From 236eea699fc02ab4f95ccad8e3ed4d9e0595ea49 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 10:56:09 -0500 Subject: [PATCH 71/89] feat: add fields-of-honor gift encounters, conditions, prose, and update location areas --- data/v2/csv/encounter_condition_prose.csv | 1 + data/v2/csv/encounter_condition_value_map.csv | 28 +++++++++++++++++++ .../csv/encounter_condition_value_prose.csv | 12 ++++++++ data/v2/csv/encounter_condition_values.csv | 12 ++++++++ data/v2/csv/encounter_conditions.csv | 1 + data/v2/csv/encounters.csv | 22 +++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + data/v2/csv/location_areas.csv | 3 +- 8 files changed, 78 insertions(+), 2 deletions(-) diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv index 7c66a3141..9b6426245 100644 --- a/data/v2/csv/encounter_condition_prose.csv +++ b/data/v2/csv/encounter_condition_prose.csv @@ -42,3 +42,4 @@ encounter_condition_id,local_language_id,name 21,9,Listen to Mr. Backlot 22,9,Bug-Catching Contest 23,9,Have save data from another Pokémon game +24,9,Find a certain number of Alolan Diglett in Isle of Armor diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index f365b2655..8386f5758 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22656,3 +22656,31 @@ encounter_id,encounter_condition_value_id 75919,213 75920,213 75921,213 +75922,214 +75923,215 +75924,216 +75925,217 +75926,218 +75927,219 +75928,220 +75929,221 +75929,223 +75930,221 +75930,224 +75931,221 +75931,225 +75932,222 +75933,214 +75934,215 +75935,216 +75936,217 +75937,218 +75938,219 +75939,220 +75940,221 +75940,223 +75941,221 +75941,224 +75942,221 +75942,225 +75943,222 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 7652cf33e..c023b242f 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -334,3 +334,15 @@ encounter_condition_value_id,local_language_id,name 211,9,Have Fossilized Fish in bag 212,9,Complete the Master Dojo's first trial 213,9,Complete all three Master Dojo trials +214,9,Find 5 Alolan Diglett in Isle of Armor +215,9,Find 10 Alolan Diglett in Isle of Armor +216,9,Find 20 Alolan Diglett in Isle of Armor +217,9,Find 30 Alolan Diglett in Isle of Armor +218,9,Find 40 Alolan Diglett in Isle of Armor +219,9,Find 50 Alolan Diglett in Isle of Armor +220,9,Find 75 Alolan Diglett in Isle of Armor +221,9,Find 100 Alolan Diglett in Isle of Armor +222,9,Find 150 Alolan Diglett in Isle of Armor +223,9,Grookey as starter +224,9,Scorbunny as starter +225,9,Sobble as starter diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index f3e2d730e..87cab27ed 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -212,3 +212,15 @@ id,encounter_condition_id,identifier,is_default 211,11,item-fossilized-fish,0 212,9,story-progress-master-dojo-complete-first-trial,0 213,9,story-progress-master-dojo-complete-third-trial,0 +214,24,alolan-diglett-found-5,0 +215,24,alolan-diglett-found-10,0 +216,24,alolan-diglett-found-20,0 +217,24,alolan-diglett-found-30,0 +218,24,alolan-diglett-found-40,0 +219,24,alolan-diglett-found-50,0 +220,24,alolan-diglett-found-75,0 +221,24,alolan-diglett-found-100,0 +222,24,alolan-diglett-found-150,0 +223,7,starter-grookey,0 +224,7,starter-scorbunny,0 +225,7,starter-sobble,0 diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv index 4856496cb..0daddaea1 100644 --- a/data/v2/csv/encounter_conditions.csv +++ b/data/v2/csv/encounter_conditions.csv @@ -22,3 +22,4 @@ id,identifier 21,backlot 22,bug-catching-contest 23,save-data +24,alolan-diglett-found diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 35c92ba1d..4ec31fbeb 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70057,3 +70057,25 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75919,34,904,1765,891,10,10 75920,33,904,1765,137,25,25 75921,34,904,1765,137,25,25 +75922,33,876,1765,10107,5,5 +75923,33,876,1765,79,10,10 +75924,33,876,1765,10103,5,5 +75925,33,876,1765,10101,5,5 +75926,33,876,1765,10100,30,30 +75927,33,876,1765,10115,30,30 +75928,33,876,1765,10114,30,30 +75929,33,876,1765,722,5,5 +75930,33,876,1765,725,5,5 +75931,33,876,1765,728,5,5 +75932,33,876,1765,10105,20,20 +75933,34,876,1765,10107,5,5 +75934,34,876,1765,79,10,10 +75935,34,876,1765,10103,5,5 +75936,34,876,1765,10101,5,5 +75937,34,876,1765,10100,30,30 +75938,34,876,1765,10115,30,30 +75939,34,876,1765,10114,30,30 +75940,34,876,1765,722,5,5 +75941,34,876,1765,725,5,5 +75942,34,876,1765,728,5,5 +75943,34,876,1765,10105,20,20 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index c435fe040..fbceb07b3 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2191,6 +2191,7 @@ location_area_id,local_language_id,name 856,9,Route 10 (Main) 857,9,Route 10 (Near Station) 861,9,Battle Tower +876,9,Fields of Honor 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index c519acd6f..f8f7b71ab 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -755,8 +755,7 @@ id,location_id,game_index,identifier 873,890,0, 874,891,0, 875,892,0, -876,893,0,main -877,893,0,beach +876,893,0, 878,894,0, 879,895,0, 880,896,0, From a4c5696a05321c20e4bc3cb2fda19654a75b7ef1 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 11:00:58 -0500 Subject: [PATCH 72/89] feat: add gift cosmog in freezington --- data/v2/csv/encounter_condition_value_map.csv | 2 ++ data/v2/csv/encounter_condition_value_prose.csv | 1 + data/v2/csv/encounter_condition_values.csv | 1 + data/v2/csv/encounters.csv | 2 ++ data/v2/csv/location_area_prose.csv | 1 + 5 files changed, 7 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 8386f5758..aa1000d93 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22684,3 +22684,5 @@ encounter_id,encounter_condition_value_id 75942,221 75942,225 75943,222 +75944,226 +75945,226 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index c023b242f..e9c42843c 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -346,3 +346,4 @@ encounter_condition_value_id,local_language_id,name 223,9,Grookey as starter 224,9,Scorbunny as starter 225,9,Sobble as starter +226,9,Save Freezington from the onslaught from Glastrier or Spectrier diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index 87cab27ed..2f128d269 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -224,3 +224,4 @@ id,encounter_condition_id,identifier,is_default 223,7,starter-grookey,0 224,7,starter-scorbunny,0 225,7,starter-sobble,0 +226,9,story-progress-save-village-from-glastrier-spectrier,0 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 4ec31fbeb..9e35611b2 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70079,3 +70079,5 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75941,34,876,1765,725,5,5 75942,34,876,1765,728,5,5 75943,34,876,1765,10105,20,20 +75944,33,879,1765,789,5,5 +75945,34,879,1765,789,5,5 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index fbceb07b3..14f5822ab 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2192,6 +2192,7 @@ location_area_id,local_language_id,name 857,9,Route 10 (Near Station) 861,9,Battle Tower 876,9,Fields of Honor +879,9,Freezington 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle From 435c1caf8543667798d12e79e972908fee88cf8f Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 11:02:46 -0500 Subject: [PATCH 73/89] feat: add gift poipole in max-lair --- data/v2/csv/encounter_condition_value_map.csv | 2 ++ data/v2/csv/encounter_condition_value_prose.csv | 1 + data/v2/csv/encounter_condition_values.csv | 1 + data/v2/csv/encounters.csv | 2 ++ data/v2/csv/location_area_prose.csv | 1 + 5 files changed, 7 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index aa1000d93..bd57444fe 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22686,3 +22686,5 @@ encounter_id,encounter_condition_value_id 75943,222 75944,226 75945,226 +75946,227 +75947,227 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index e9c42843c..49f9034a6 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -347,3 +347,4 @@ encounter_condition_value_id,local_language_id,name 224,9,Scorbunny as starter 225,9,Sobble as starter 226,9,Save Freezington from the onslaught from Glastrier or Spectrier +227,9,Catch 5 Ultra Beasts in Dynamax Adventures diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index 2f128d269..a49ac1d60 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -225,3 +225,4 @@ id,encounter_condition_id,identifier,is_default 224,7,starter-scorbunny,0 225,7,starter-sobble,0 226,9,story-progress-save-village-from-glastrier-spectrier,0 +227,9,story-progress-catch-five-ultra-beasts,0 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 9e35611b2..d03db6b27 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70081,3 +70081,5 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75943,34,876,1765,10105,20,20 75944,33,879,1765,789,5,5 75945,34,879,1765,789,5,5 +75946,33,905,1765,803,20,20 +75947,34,905,1765,803,20,20 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 14f5822ab..888076ee7 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2198,6 +2198,7 @@ location_area_id,local_language_id,name 891,9,Glimwood Tangle 896,9,Hulbury 904,9,Master Dojo +905,9,Max Lair 906,9,Motostoke 907,9,Motostoke Outskirts 912,9,Postwick From 31911beac50c2851baef035b360c84ca45481919 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 11:27:16 -0500 Subject: [PATCH 74/89] feat: add base game npc-trade encounters, conditions, and relevant prose --- data/v2/csv/encounter_condition_value_map.csv | 18 ++++++++++++++++++ .../csv/encounter_condition_value_prose.csv | 19 +++++++++++++++++++ data/v2/csv/encounter_condition_values.csv | 19 +++++++++++++++++++ data/v2/csv/encounter_slots.csv | 1 + data/v2/csv/encounters.csv | 18 ++++++++++++++++++ data/v2/csv/location_area_prose.csv | 8 ++++++++ data/v2/csv/location_areas.csv | 3 +++ 7 files changed, 86 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index bd57444fe..e54154b02 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22688,3 +22688,21 @@ encounter_id,encounter_condition_value_id 75945,226 75946,227 75947,227 +75948,228 +75949,228 +75950,229 +75951,229 +75952,230 +75953,230 +75954,231 +75955,231 +75956,232 +75957,232 +75958,233 +75959,233 +75960,234 +75961,234 +75962,235 +75963,235 +75964,236 +75965,236 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 49f9034a6..b8c630e63 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -348,3 +348,22 @@ encounter_condition_value_id,local_language_id,name 225,9,Sobble as starter 226,9,Save Freezington from the onslaught from Glastrier or Spectrier 227,9,Catch 5 Ultra Beasts in Dynamax Adventures +228,9,Give Bunnelby in a Trade +229,9,Give Galarian Meowth in a Trade +230,9,Give Minccino in a Trade +231,9,Give Toxel in a Trade +232,9,Give Maractus in a Trade +233,9,Give Galarian Yamask in a Trade +234,9,Give Vanillish in a Trade +235,9,Give Obstagoon in a Trade +236,9,Give Frosmoth in a Trade +237,9,Give Galarian Farfetch'd in a Trade +238,9,Give Galarian Corsola in a Trade +239,9,Give Galarian Ponyta in a Trade +240,9,Give Galarian Mr. Mime in a Trade +241,9,Give Galarian Darumaka in a Trade +242,9,Give Galarian Zigzagoon in a Trade +243,9,Give Galarian Stunfisk in a Trade +244,9,Give Galarian Weezing in a Trade +245,9,Give Exeggutor in a Trade +246,9,Give Marowak in a Trade diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index a49ac1d60..f36f8b7d4 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -226,3 +226,22 @@ id,encounter_condition_id,identifier,is_default 225,7,starter-sobble,0 226,9,story-progress-save-village-from-glastrier-spectrier,0 227,9,story-progress-catch-five-ultra-beasts,0 +228,15,trade-bunnelby,1 +229,15,trade-meowth-galar,1 +230,15,trade-minccino,1 +231,15,trade-toxel,1 +232,15,trade-maractus,1 +233,15,trade-yamask-galar,1 +234,15,trade-vanillish,1 +235,15,trade-obstagoon,1 +236,15,trade-frosmoth,1 +237,15,trade-farfetchd-galar,1 +238,15,trade-corsola-galar,1 +239,15,trade-ponyta-galar,1 +240,15,trade-mr-mime-galar,1 +241,15,trade-darumaka-galar,1 +242,15,trade-zigzagoon-galar,1 +243,15,trade-stunfisk-galar,1 +244,15,trade-weezing-galar,1 +245,15,trade-exeggutor,1 +246,15,trade-marowak,1 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 6f5a62ac7..5eb53177d 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1764,3 +1764,4 @@ id,version_group_id,encounter_method_id,slot,rarity 1763,20,34,2,20 1764,20,34,3,20 1765,20,18,1,100 +1766,20,36,1,100 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index d03db6b27..bfb119ab0 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70083,3 +70083,21 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75945,34,879,1765,789,5,5 75946,33,905,1765,803,20,20 75947,34,905,1765,803,20,20 +75948,33,1373,1766,819,10,10 +75949,34,1373,1766,819,10,10 +75950,33,1374,1766,52,18,18 +75951,34,1374,1766,52,18,18 +75952,33,896,1766,546,23,23 +75953,34,896,1766,546,23,23 +75954,33,892,1766,175,25,25 +75955,34,892,1766,175,25,25 +75956,33,932,1766,856,30,30 +75957,34,932,1766,859,30,30 +75958,33,1375,1766,562,36,36 +75959,34,1375,1766,562,36,36 +75960,33,869,1766,538,37,37 +75961,34,869,1766,539,37,37 +75962,33,924,1766,122,40,40 +75963,34,924,1766,122,40,40 +75964,33,945,1766,884,50,50 +75965,34,945,1766,884,50,50 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 888076ee7..7b95446dd 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2191,11 +2191,13 @@ location_area_id,local_language_id,name 856,9,Route 10 (Main) 857,9,Route 10 (Near Station) 861,9,Battle Tower +869,9,Circhester 876,9,Fields of Honor 879,9,Freezington 882,9,Galar Mine 883,9,Galar Mine No. 2 891,9,Glimwood Tangle +892,9,Hammerlocke 896,9,Hulbury 904,9,Master Dojo 905,9,Max Lair @@ -2203,8 +2205,11 @@ location_area_id,local_language_id,name 907,9,Motostoke Outskirts 912,9,Postwick 919,9,Slumbering Weald (Entrance) +924,9,Spikemuth +932,9,Stow-on-Side 939,9,Turffield 942,9,Wegehurst +945,9,Wyndon 1167,9,Lighthouse Basement 1167,6,Leuchtturm Keller 1167,5,Phare de la Liberté @@ -2432,3 +2437,6 @@ location_area_id,local_language_id,name 1370,9,Energy Plant Tower Summit 1371,9,Meetup Spot 1372,9,Postwick (Leon's Room) +1373,9,Motostoke Pokémon Center +1374,9,Turffield (Gym) +1375,9,Ballonlea (Gym) diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index f8f7b71ab..17c121996 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -1251,3 +1251,6 @@ id,location_id,game_index,identifier 1370,1114,0,tower-summit 1371,1115,0, 1372,924,0,leons-room +1373,918,0,pokemon-center +1374,945,0,gym +1375,880,0,gym From 40d61cb4b0ae36d51707dcfd8c475b833a5b74ab Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 11:39:27 -0500 Subject: [PATCH 75/89] feat: add DLC trades in random locations using new location isle-of-armor-caves --- data/v2/csv/encounter_condition_value_map.csv | 22 +++++++++++++++++++ data/v2/csv/encounters.csv | 22 +++++++++++++++++++ data/v2/csv/location_area_prose.csv | 1 + data/v2/csv/location_areas.csv | 1 + data/v2/csv/locations.csv | 1 + 5 files changed, 47 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index e54154b02..b38c24886 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22706,3 +22706,25 @@ encounter_id,encounter_condition_value_id 75963,235 75964,236 75965,236 +75966,229 +75967,237 +75968,238 +75969,239 +75970,240 +75971,241 +75972,242 +75973,243 +75974,244 +75975,245 +75976,246 +75977,229 +75978,237 +75979,238 +75980,239 +75981,240 +75982,241 +75983,242 +75984,243 +75985,244 +75986,245 +75987,246 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index bfb119ab0..bcc593880 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70101,3 +70101,25 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75963,34,924,1766,122,40,40 75964,33,945,1766,884,50,50 75965,34,945,1766,884,50,50 +75966,33,1376,1766,52,15,15 +75967,33,1376,1766,83,15,15 +75968,33,1376,1766,222,15,15 +75969,33,1376,1766,77,15,15 +75970,33,1376,1766,122,15,15 +75971,33,1376,1766,554,15,15 +75972,33,1376,1766,263,15,15 +75973,33,1376,1766,618,15,15 +75974,33,1376,1766,110,15,15 +75975,33,1376,1766,10114,15,15 +75976,33,1376,1766,10115,15,15 +75977,34,1376,1766,52,15,15 +75978,34,1376,1766,83,15,15 +75979,34,1376,1766,222,15,15 +75980,34,1376,1766,77,15,15 +75981,34,1376,1766,122,15,15 +75982,34,1376,1766,554,15,15 +75983,34,1376,1766,263,15,15 +75984,34,1376,1766,618,15,15 +75985,34,1376,1766,110,15,15 +75986,34,1376,1766,10114,15,15 +75987,34,1376,1766,10115,15,15 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 7b95446dd..c194fe36d 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2440,3 +2440,4 @@ location_area_id,local_language_id,name 1373,9,Motostoke Pokémon Center 1374,9,Turffield (Gym) 1375,9,Ballonlea (Gym) +1376,9,Random caves across the Isle of Armor diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 17c121996..dd8a66148 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -1254,3 +1254,4 @@ id,location_id,game_index,identifier 1373,918,0,pokemon-center 1374,945,0,gym 1375,880,0,gym +1376,1116,0, diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index e4f161690..5dfd3e2cc 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -1097,3 +1097,4 @@ id,region_id,identifier 1113,1,kanto-underground-path 1114,8,energy-plant 1115,8,meetup-spot +1116,8,isle-of-armor-caves From 0279f25eee26f92827122bbfd4f7aee3d73ce357 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 11:48:28 -0500 Subject: [PATCH 76/89] feat: add weather encounter conditions for wild areas --- data/v2/csv/encounter_condition_prose.csv | 1 + data/v2/csv/encounter_condition_value_prose.csv | 9 +++++++++ data/v2/csv/encounter_condition_values.csv | 9 +++++++++ data/v2/csv/encounter_conditions.csv | 1 + 4 files changed, 20 insertions(+) diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv index 9b6426245..763f0c603 100644 --- a/data/v2/csv/encounter_condition_prose.csv +++ b/data/v2/csv/encounter_condition_prose.csv @@ -43,3 +43,4 @@ encounter_condition_id,local_language_id,name 22,9,Bug-Catching Contest 23,9,Have save data from another Pokémon game 24,9,Find a certain number of Alolan Diglett in Isle of Armor +25,9,Specific weather diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index b8c630e63..9bf4f0838 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -367,3 +367,12 @@ encounter_condition_value_id,local_language_id,name 244,9,Give Galarian Weezing in a Trade 245,9,Give Exeggutor in a Trade 246,9,Give Marowak in a Trade +247,9,During normal weather +248,9,During overcast weather +249,9,During rainy weather +250,9,During a thunderstorm +251,9,During snowy weather +252,9,During a snowstorm +253,9,During a sandstorm +254,9,During intense sun +255,9,During foggy weather diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index f36f8b7d4..cc8bc4514 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -245,3 +245,12 @@ id,encounter_condition_id,identifier,is_default 244,15,trade-weezing-galar,1 245,15,trade-exeggutor,1 246,15,trade-marowak,1 +247,25,weather-normal,1 +248,25,weather-overcast,0 +249,25,weather-raining,0 +250,25,weather-thunderstorm,0 +251,25,weather-snowing,0 +252,25,weather-snowstorm,0 +253,25,weather-sandstorm,0 +254,25,weather-intense-sun,0 +255,25,weather-fog,0 diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv index 0daddaea1..37aa58819 100644 --- a/data/v2/csv/encounter_conditions.csv +++ b/data/v2/csv/encounter_conditions.csv @@ -23,3 +23,4 @@ id,identifier 22,bug-catching-contest 23,save-data 24,alolan-diglett-found +25,weather From eab6e8ac2f053688c6c1873c011a3d9a9c4a7566 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 14:26:15 -0500 Subject: [PATCH 77/89] feat: add galar-route-9-outer-spikemuth all weather encounters --- 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 bcc593880..ab72852f0 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70123,3 +70123,13 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75985,34,1376,1766,110,15,15 75986,34,1376,1766,10114,15,15 75987,34,1376,1766,10115,15,15 +75988,33,855,1693,863,40,44 +75989,33,855,1694,828,40,44 +75990,33,855,1695,510,40,44 +75991,33,855,1696,877,40,44 +75992,33,855,1570,820,40,44 +75993,34,855,1693,863,40,44 +75994,34,855,1694,828,40,44 +75995,34,855,1695,510,40,44 +75996,34,855,1696,877,40,44 +75997,34,855,1570,820,40,44 From b458d84cc1713cf54b0c1c971906e7e22c9558cf Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 15:19:58 -0500 Subject: [PATCH 78/89] feat: add weather-dependent encounters in galar-route-9-outer-spikemuth --- data/v2/csv/encounter_condition_value_map.csv | 90 +++++++++++++++++++ data/v2/csv/encounter_slots.csv | 5 ++ data/v2/csv/encounters.csv | 90 +++++++++++++++++++ 3 files changed, 185 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index b38c24886..13aed59d0 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22728,3 +22728,93 @@ encounter_id,encounter_condition_value_id 75985,244 75986,245 75987,246 +75998,247 +75999,247 +76000,247 +76001,247 +76002,247 +76003,248 +76004,248 +76005,248 +76006,248 +76007,248 +76008,249 +76009,249 +76010,249 +76011,249 +76012,249 +76013,250 +76014,250 +76015,250 +76016,250 +76017,250 +76018,251 +76019,251 +76020,251 +76021,251 +76022,251 +76023,252 +76024,252 +76025,252 +76026,252 +76027,252 +76028,254 +76029,254 +76030,254 +76031,254 +76032,254 +76033,253 +76034,253 +76035,253 +76036,253 +76037,253 +76038,255 +76039,255 +76040,255 +76041,255 +76042,255 +76043,247 +76044,247 +76045,247 +76046,247 +76047,247 +76048,248 +76049,248 +76050,248 +76051,248 +76052,248 +76053,249 +76054,249 +76055,249 +76056,249 +76057,249 +76058,250 +76059,250 +76060,250 +76061,250 +76062,250 +76063,251 +76064,251 +76065,251 +76066,251 +76067,251 +76068,252 +76069,252 +76070,252 +76071,252 +76072,252 +76073,254 +76074,254 +76075,254 +76076,254 +76077,254 +76078,253 +76079,253 +76080,253 +76081,253 +76082,253 +76083,255 +76084,255 +76085,255 +76086,255 +76087,255 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 5eb53177d..46a3cd669 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1765,3 +1765,8 @@ id,version_group_id,encounter_method_id,slot,rarity 1764,20,34,3,20 1765,20,18,1,100 1766,20,36,1,100 +1767,20,38,1,40 +1768,20,38,2,30 +1769,20,38,3,24 +1770,20,38,4,5 +1771,20,38,5,1 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index ab72852f0..57e85c74f 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70133,3 +70133,93 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75995,34,855,1695,510,40,44 75996,34,855,1696,877,40,44 75997,34,855,1570,820,40,44 +75998,33,855,1767,712,40,44 +75999,33,855,1768,852,40,44 +76000,33,855,1769,747,40,44 +76001,33,855,1770,748,40,44 +76002,33,855,1771,781,40,44 +76003,33,855,1767,712,40,44 +76004,33,855,1768,852,40,44 +76005,33,855,1769,747,40,44 +76006,33,855,1770,593,40,44 +76007,33,855,1771,781,40,44 +76008,33,855,1767,712,40,44 +76009,33,855,1768,852,40,44 +76010,33,855,1769,747,40,44 +76011,33,855,1770,593,40,44 +76012,33,855,1771,781,40,44 +76013,33,855,1767,712,40,44 +76014,33,855,1768,852,40,44 +76015,33,855,1769,747,40,44 +76016,33,855,1770,593,40,44 +76017,33,855,1771,781,40,44 +76018,33,855,1767,712,40,44 +76019,33,855,1768,852,40,44 +76020,33,855,1769,747,40,44 +76021,33,855,1770,593,40,44 +76022,33,855,1771,781,40,44 +76023,33,855,1767,712,40,44 +76024,33,855,1768,852,40,44 +76025,33,855,1769,747,40,44 +76026,33,855,1770,593,40,44 +76027,33,855,1771,781,40,44 +76028,33,855,1767,712,40,44 +76029,33,855,1768,852,40,44 +76030,33,855,1769,747,40,44 +76031,33,855,1770,593,40,44 +76032,33,855,1771,781,40,44 +76033,33,855,1767,712,40,44 +76034,33,855,1768,852,40,44 +76035,33,855,1769,747,40,44 +76036,33,855,1770,593,40,44 +76037,33,855,1771,781,40,44 +76038,33,855,1767,712,40,44 +76039,33,855,1768,852,40,44 +76040,33,855,1769,747,40,44 +76041,33,855,1770,593,40,44 +76042,33,855,1771,781,40,44 +76043,34,855,1767,712,40,44 +76044,34,855,1768,852,40,44 +76045,34,855,1769,747,40,44 +76046,34,855,1770,748,40,44 +76047,34,855,1771,781,40,44 +76048,34,855,1767,712,40,44 +76049,34,855,1768,852,40,44 +76050,34,855,1769,747,40,44 +76051,34,855,1770,593,40,44 +76052,34,855,1771,781,40,44 +76053,34,855,1767,712,40,44 +76054,34,855,1768,852,40,44 +76055,34,855,1769,747,40,44 +76056,34,855,1770,593,40,44 +76057,34,855,1771,781,40,44 +76058,34,855,1767,712,40,44 +76059,34,855,1768,852,40,44 +76060,34,855,1769,747,40,44 +76061,34,855,1770,593,40,44 +76062,34,855,1771,781,40,44 +76063,34,855,1767,712,40,44 +76064,34,855,1768,852,40,44 +76065,34,855,1769,747,40,44 +76066,34,855,1770,593,40,44 +76067,34,855,1771,781,40,44 +76068,34,855,1767,712,40,44 +76069,34,855,1768,852,40,44 +76070,34,855,1769,747,40,44 +76071,34,855,1770,593,40,44 +76072,34,855,1771,781,40,44 +76073,34,855,1767,712,40,44 +76074,34,855,1768,852,40,44 +76075,34,855,1769,747,40,44 +76076,34,855,1770,593,40,44 +76077,34,855,1771,781,40,44 +76078,34,855,1767,712,40,44 +76079,34,855,1768,852,40,44 +76080,34,855,1769,747,40,44 +76081,34,855,1770,593,40,44 +76082,34,855,1771,781,40,44 +76083,34,855,1767,712,40,44 +76084,34,855,1768,852,40,44 +76085,34,855,1769,747,40,44 +76086,34,855,1770,593,40,44 +76087,34,855,1771,781,40,44 From c26370954a384aef190dd02ee1c84e940da90963 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 19:06:21 -0500 Subject: [PATCH 79/89] feat: add encounters for rolling-fields-main for all weather --- data/v2/csv/encounter_condition_value_map.csv | 8 ++++++++ data/v2/csv/encounter_condition_value_prose.csv | 1 + data/v2/csv/encounter_condition_values.csv | 1 + data/v2/csv/encounters.csv | 8 ++++++++ data/v2/csv/location_area_prose.csv | 2 ++ data/v2/csv/location_areas.csv | 2 +- 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 13aed59d0..126438334 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22818,3 +22818,11 @@ encounter_id,encounter_condition_value_id 76085,255 76086,255 76087,255 +76088,256 +76089,256 +76090,35 +76091,35 +76092,256 +76093,256 +76094,35 +76095,35 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 9bf4f0838..b640c7288 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -376,3 +376,4 @@ encounter_condition_value_id,local_language_id,name 253,9,During a sandstorm 254,9,During intense sun 255,9,During foggy weather +256,9,Before entering the Hall of Fame diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index cc8bc4514..090d4eb26 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -254,3 +254,4 @@ id,encounter_condition_id,identifier,is_default 253,25,weather-sandstorm,0 254,25,weather-intense-sun,0 255,25,weather-fog,0 +256,9,story-progress-before-hall-of-fame,1 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 57e85c74f..6c6ff4b6f 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70223,3 +70223,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 76085,34,855,1769,747,40,44 76086,34,855,1770,593,40,44 76087,34,855,1771,781,40,44 +76088,33,916,1544,819,7,10 +76089,33,916,1545,420,7,10 +76090,33,916,1544,819,60,60 +76091,33,916,1545,420,60,60 +76092,34,916,1544,819,7,10 +76093,34,916,1545,420,7,10 +76094,34,916,1544,819,60,60 +76095,34,916,1545,420,60,60 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index c194fe36d..c20f4f340 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2204,6 +2204,8 @@ location_area_id,local_language_id,name 906,9,Motostoke 907,9,Motostoke Outskirts 912,9,Postwick +916,9,Rolling Fields (Main Area) +917,9,Rolling Fields (Area 2) 919,9,Slumbering Weald (Entrance) 924,9,Spikemuth 932,9,Stow-on-Side diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index dd8a66148..4e513d0cd 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -795,7 +795,7 @@ id,location_id,game_index,identifier 914,926,0, 915,927,0, 916,928,0,main -917,928,0,2 +917,928,0,area-2 918,929,0, 919,930,0,main 920,931,0, From 6cfe9085491514a8514916870626afb618079769 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 13 Jun 2026 20:18:17 -0500 Subject: [PATCH 80/89] feat: add weather-normal encounters in rolling-fields --- data/v2/csv/encounter_condition_value_map.csv | 160 ++++++++++++++++++ data/v2/csv/encounter_method_prose.csv | 1 + data/v2/csv/encounter_methods.csv | 1 + data/v2/csv/encounter_slots.csv | 12 ++ data/v2/csv/encounters.csv | 80 +++++++++ 5 files changed, 254 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 126438334..8c8dd05b8 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22826,3 +22826,163 @@ encounter_id,encounter_condition_value_id 76093,256 76094,35 76095,35 +76096,247 +76096,256 +76097,247 +76097,35 +76098,247 +76098,256 +76099,247 +76099,35 +76100,247 +76100,256 +76101,247 +76101,35 +76102,247 +76102,256 +76103,247 +76103,35 +76104,247 +76104,256 +76105,247 +76105,35 +76106,247 +76106,256 +76107,247 +76107,35 +76108,247 +76108,256 +76109,247 +76109,35 +76110,247 +76110,256 +76111,247 +76111,35 +76112,247 +76112,256 +76113,247 +76113,35 +76114,247 +76114,256 +76115,247 +76115,35 +76116,247 +76116,256 +76117,247 +76117,35 +76118,247 +76118,256 +76119,247 +76119,35 +76120,247 +76120,256 +76121,247 +76121,35 +76122,247 +76122,256 +76123,247 +76123,35 +76124,247 +76124,256 +76125,247 +76125,35 +76126,247 +76126,256 +76127,247 +76127,35 +76128,247 +76128,256 +76129,247 +76129,35 +76130,247 +76130,256 +76131,247 +76131,35 +76132,247 +76132,256 +76133,247 +76133,35 +76134,247 +76134,256 +76135,247 +76135,35 +76136,247 +76136,256 +76137,247 +76137,35 +76138,247 +76138,256 +76139,247 +76139,35 +76140,247 +76140,256 +76141,247 +76141,35 +76142,247 +76142,256 +76143,247 +76143,35 +76144,247 +76144,256 +76145,247 +76145,35 +76146,247 +76146,256 +76147,247 +76147,35 +76148,247 +76148,256 +76149,247 +76149,35 +76150,247 +76150,256 +76151,247 +76151,35 +76152,247 +76152,256 +76153,247 +76153,35 +76154,247 +76154,256 +76155,247 +76155,35 +76156,247 +76156,256 +76157,247 +76157,35 +76158,247 +76158,256 +76159,247 +76159,35 +76160,247 +76160,256 +76161,247 +76161,35 +76162,247 +76162,256 +76163,247 +76163,35 +76164,247 +76164,256 +76165,247 +76165,35 +76166,247 +76166,256 +76167,247 +76167,35 +76168,247 +76168,256 +76169,247 +76169,35 +76170,247 +76170,256 +76171,247 +76171,35 +76172,247 +76172,256 +76173,247 +76173,35 +76174,247 +76174,256 +76175,247 +76175,35 diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv index 54570b8df..c64050f1d 100644 --- a/data/v2/csv/encounter_method_prose.csv +++ b/data/v2/csv/encounter_method_prose.csv @@ -103,3 +103,4 @@ encounter_method_id,local_language_id,name 53,9,"Finding a Wild Pokemon at any of the three Pokespots in Pokemon XD: Gale of Darkness." 54,9,Finding a Pokemon in a Hidden Grotto 55,9,Slathering a Honey Tree with Honey and waiting for a Pokémon to appear. +56,9,Overworld spawn coming from underground diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index ea3be036b..eef1ca0a9 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -54,3 +54,4 @@ id,identifier,order 53,pokespot,53 54,hidden-grotto,54 55,honey-tree,54 +56,overworld-dirt,56 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 46a3cd669..78d047b39 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1770,3 +1770,15 @@ id,version_group_id,encounter_method_id,slot,rarity 1769,20,38,3,24 1770,20,38,4,5 1771,20,38,5,1 +1772,20,38,1,60 +1773,20,38,2,25 +1774,20,38,3,10 +1775,20,38,4,5 +1776,20,1,1,40 +1777,20,1,2,35 +1778,20,1,3,20 +1779,20,1,4,5 +1780,20,40,1,75 +1781,20,40,2,25 +1782,20,56,1,80 +1783,20,56,2,20 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 6c6ff4b6f..f30aee2bc 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70231,3 +70231,83 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 76093,34,916,1545,420,7,10 76094,34,916,1544,819,60,60 76095,34,916,1545,420,60,60 +76096,33,916,1772,415,7,10 +76097,33,916,1772,415,60,60 +76098,33,916,1773,659,7,10 +76099,33,916,1773,659,60,60 +76100,33,916,1774,11,7,10 +76101,33,916,1774,11,60,60 +76102,33,916,1775,236,7,10 +76103,33,916,1775,236,60,60 +76104,34,916,1772,415,7,10 +76105,34,916,1772,415,60,60 +76106,34,916,1773,659,7,10 +76107,34,916,1773,659,60,60 +76108,34,916,1774,11,7,10 +76109,34,916,1774,11,60,60 +76110,34,916,1775,236,7,10 +76111,34,916,1775,236,60,60 +76112,33,916,1776,659,7,9 +76113,33,916,1776,659,60,60 +76114,33,916,1777,572,7,9 +76115,33,916,1777,572,60,60 +76116,33,916,1778,761,7,9 +76117,33,916,1778,761,60,60 +76118,33,916,1779,11,7,9 +76119,33,916,1779,11,60,60 +76120,34,916,1776,659,7,9 +76121,34,916,1776,659,60,60 +76122,34,916,1777,572,7,9 +76123,34,916,1777,572,60,60 +76124,34,916,1778,761,7,9 +76125,34,916,1778,761,60,60 +76126,34,916,1779,572,7,9 +76127,34,916,1779,572,60,60 +76128,33,916,1499,95,26,26 +76129,33,916,1499,95,60,60 +76130,33,916,1499,315,15,15 +76131,33,916,1499,315,60,60 +76132,33,916,1499,675,32,32 +76133,33,916,1499,675,60,60 +76134,33,916,1499,416,26,26 +76135,33,916,1499,416,60,60 +76136,33,916,1499,291,15,15 +76137,33,916,1499,291,60,60 +76138,33,916,1499,660,15,15 +76139,33,916,1499,660,60,60 +76140,33,916,1499,750,31,31 +76141,33,916,1499,750,60,60 +76142,33,916,1499,832,36,36 +76143,33,916,1499,832,60,60 +76144,34,916,1499,95,26,26 +76145,34,916,1499,95,60,60 +76146,34,916,1499,315,15,15 +76147,34,916,1499,315,60,60 +76148,34,916,1499,675,32,32 +76149,34,916,1499,675,60,60 +76150,34,916,1499,416,26,26 +76151,34,916,1499,416,60,60 +76152,34,916,1499,291,15,15 +76153,34,916,1499,291,60,60 +76154,34,916,1499,660,15,15 +76155,34,916,1499,660,60,60 +76156,34,916,1499,750,31,31 +76157,34,916,1499,750,60,60 +76158,34,916,1499,832,36,36 +76159,34,916,1499,832,60,60 +76160,33,916,1780,12,7,10 +76161,33,916,1780,12,60,60 +76162,33,916,1781,519,7,10 +76163,33,916,1781,519,60,60 +76164,33,916,1782,50,8,10 +76165,33,916,1782,50,60,60 +76166,33,916,1783,524,8,10 +76167,33,916,1783,524,60,60 +76168,34,916,1780,12,7,10 +76169,34,916,1780,12,60,60 +76170,34,916,1781,519,7,10 +76171,34,916,1781,519,60,60 +76172,34,916,1782,50,8,10 +76173,34,916,1782,50,60,60 +76174,34,916,1783,524,8,10 +76175,34,916,1783,524,60,60 From 90a268160163c5477a08fb4c50fe462356e16de5 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Sat, 20 Jun 2026 08:43:41 -0500 Subject: [PATCH 81/89] feat: add all wild area encounters for rolling-fields-main --- data/v2/csv/encounter_condition_value_map.csv | 1072 +++++++++++++++++ data/v2/csv/encounters.csv | 536 +++++++++ 2 files changed, 1608 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 8c8dd05b8..14fa9fff9 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22986,3 +22986,1075 @@ encounter_id,encounter_condition_value_id 76174,256 76175,247 76175,35 +76176,249 +76176,256 +76177,249 +76177,35 +76178,249 +76178,256 +76179,249 +76179,35 +76180,249 +76180,256 +76181,249 +76181,35 +76182,249 +76182,256 +76183,249 +76183,35 +76184,249 +76184,256 +76185,249 +76185,35 +76186,249 +76186,256 +76187,249 +76187,35 +76188,249 +76188,256 +76189,249 +76189,35 +76190,249 +76190,256 +76191,249 +76191,35 +76192,249 +76192,256 +76193,249 +76193,35 +76194,249 +76194,256 +76195,249 +76195,35 +76196,249 +76196,256 +76197,249 +76197,35 +76198,249 +76198,256 +76199,249 +76199,35 +76200,249 +76200,256 +76201,249 +76201,35 +76202,249 +76202,256 +76203,249 +76203,35 +76204,249 +76204,256 +76205,249 +76205,35 +76206,249 +76206,256 +76207,249 +76207,35 +76208,249 +76208,256 +76209,249 +76209,35 +76210,249 +76210,256 +76211,249 +76211,35 +76212,249 +76212,256 +76213,249 +76213,35 +76214,249 +76214,256 +76215,249 +76215,35 +76216,249 +76216,256 +76217,249 +76217,35 +76218,249 +76218,256 +76219,249 +76219,35 +76220,249 +76220,256 +76221,249 +76221,35 +76222,249 +76222,256 +76223,249 +76223,35 +76224,249 +76224,256 +76225,249 +76225,35 +76226,249 +76226,256 +76227,249 +76227,35 +76228,249 +76228,256 +76229,249 +76229,35 +76230,249 +76230,256 +76231,249 +76231,35 +76232,249 +76232,256 +76233,249 +76233,35 +76234,249 +76234,256 +76235,249 +76235,35 +76236,249 +76236,256 +76237,249 +76237,35 +76238,249 +76238,256 +76239,249 +76239,35 +76240,249 +76240,256 +76241,249 +76241,35 +76242,249 +76242,256 +76243,249 +76243,35 +76244,249 +76244,256 +76245,249 +76245,35 +76246,249 +76246,256 +76247,249 +76247,35 +76248,249 +76248,256 +76249,249 +76249,35 +76250,249 +76250,256 +76251,249 +76251,35 +76252,249 +76252,256 +76253,249 +76253,35 +76254,249 +76254,256 +76255,249 +76255,35 +76256,250 +76256,256 +76257,250 +76257,35 +76258,250 +76258,256 +76259,250 +76259,35 +76260,250 +76260,256 +76261,250 +76261,35 +76262,250 +76262,256 +76263,250 +76263,35 +76264,250 +76264,256 +76265,250 +76265,35 +76266,250 +76266,256 +76267,250 +76267,35 +76268,250 +76268,256 +76269,250 +76269,35 +76270,250 +76270,256 +76271,250 +76271,35 +76272,250 +76272,256 +76273,250 +76273,35 +76274,250 +76274,256 +76275,250 +76275,35 +76276,250 +76276,256 +76277,250 +76277,35 +76278,250 +76278,256 +76279,250 +76279,35 +76280,250 +76280,256 +76281,250 +76281,35 +76282,250 +76282,256 +76283,250 +76283,35 +76284,250 +76284,256 +76285,250 +76285,35 +76286,250 +76286,256 +76287,250 +76287,35 +76288,250 +76288,256 +76289,250 +76289,35 +76290,250 +76290,256 +76291,250 +76291,35 +76292,250 +76292,256 +76293,250 +76293,35 +76294,250 +76294,256 +76295,250 +76295,35 +76296,250 +76296,256 +76297,250 +76297,35 +76298,250 +76298,256 +76299,250 +76299,35 +76300,250 +76300,256 +76301,250 +76301,35 +76302,250 +76302,256 +76303,250 +76303,35 +76304,250 +76304,256 +76305,250 +76305,35 +76306,250 +76306,256 +76307,250 +76307,35 +76308,250 +76308,256 +76309,250 +76309,35 +76310,250 +76310,256 +76311,250 +76311,35 +76312,250 +76312,256 +76313,250 +76313,35 +76314,250 +76314,256 +76315,250 +76315,35 +76316,250 +76316,256 +76317,250 +76317,35 +76318,250 +76318,256 +76319,250 +76319,35 +76320,250 +76320,256 +76321,250 +76321,35 +76322,250 +76322,256 +76323,250 +76323,35 +76324,250 +76324,256 +76325,250 +76325,35 +76326,250 +76326,256 +76327,250 +76327,35 +76328,250 +76328,256 +76329,250 +76329,35 +76330,250 +76330,256 +76331,250 +76331,35 +76332,250 +76332,256 +76333,250 +76333,35 +76334,250 +76334,256 +76335,250 +76335,35 +76336,251 +76336,256 +76337,251 +76337,35 +76338,251 +76338,256 +76339,251 +76339,35 +76340,251 +76340,256 +76341,251 +76341,35 +76342,251 +76342,256 +76343,251 +76343,35 +76344,251 +76344,256 +76345,251 +76345,35 +76346,251 +76346,256 +76347,251 +76347,35 +76348,251 +76348,256 +76349,251 +76349,35 +76350,251 +76350,256 +76351,251 +76351,35 +76352,251 +76352,256 +76353,251 +76353,35 +76354,251 +76354,256 +76355,251 +76355,35 +76356,251 +76356,256 +76357,251 +76357,35 +76358,251 +76358,256 +76359,251 +76359,35 +76360,251 +76360,256 +76361,251 +76361,35 +76362,251 +76362,256 +76363,251 +76363,35 +76364,251 +76364,256 +76365,251 +76365,35 +76366,251 +76366,256 +76367,251 +76367,35 +76368,251 +76368,256 +76369,251 +76369,35 +76370,251 +76370,256 +76371,251 +76371,35 +76372,251 +76372,256 +76373,251 +76373,35 +76374,251 +76374,256 +76375,251 +76375,35 +76376,251 +76376,256 +76377,251 +76377,35 +76378,251 +76378,256 +76379,251 +76379,35 +76380,251 +76380,256 +76381,251 +76381,35 +76382,251 +76382,256 +76383,251 +76383,35 +76384,251 +76384,256 +76385,251 +76385,35 +76386,251 +76386,256 +76387,251 +76387,35 +76388,251 +76388,256 +76389,251 +76389,35 +76390,251 +76390,256 +76391,251 +76391,35 +76392,251 +76392,256 +76393,251 +76393,35 +76394,251 +76394,256 +76395,251 +76395,35 +76396,251 +76396,256 +76397,251 +76397,35 +76398,251 +76398,256 +76399,251 +76399,35 +76400,251 +76400,256 +76401,251 +76401,35 +76402,251 +76402,256 +76403,251 +76403,35 +76404,251 +76404,256 +76405,251 +76405,35 +76406,251 +76406,256 +76407,251 +76407,35 +76408,252 +76408,256 +76409,252 +76409,35 +76410,252 +76410,256 +76411,252 +76411,35 +76412,252 +76412,256 +76413,252 +76413,35 +76414,252 +76414,256 +76415,252 +76415,35 +76416,252 +76416,256 +76417,252 +76417,35 +76418,252 +76418,256 +76419,252 +76419,35 +76420,252 +76420,256 +76421,252 +76421,35 +76422,252 +76422,256 +76423,252 +76423,35 +76424,252 +76424,256 +76425,252 +76425,35 +76426,252 +76426,256 +76427,252 +76427,35 +76428,252 +76428,256 +76429,252 +76429,35 +76430,252 +76430,256 +76431,252 +76431,35 +76432,252 +76432,256 +76433,252 +76433,35 +76434,252 +76434,256 +76435,252 +76435,35 +76436,252 +76436,256 +76437,252 +76437,35 +76438,252 +76438,256 +76439,252 +76439,35 +76440,252 +76440,256 +76441,252 +76441,35 +76442,252 +76442,256 +76443,252 +76443,35 +76444,252 +76444,256 +76445,252 +76445,35 +76446,252 +76446,256 +76447,252 +76447,35 +76448,252 +76448,256 +76449,252 +76449,35 +76450,252 +76450,256 +76451,252 +76451,35 +76452,252 +76452,256 +76453,252 +76453,35 +76454,252 +76454,256 +76455,252 +76455,35 +76456,252 +76456,256 +76457,252 +76457,35 +76458,252 +76458,256 +76459,252 +76459,35 +76460,252 +76460,256 +76461,252 +76461,35 +76462,252 +76462,256 +76463,252 +76463,35 +76464,252 +76464,256 +76465,252 +76465,35 +76466,252 +76466,256 +76467,252 +76467,35 +76468,252 +76468,256 +76469,252 +76469,35 +76470,252 +76470,256 +76471,252 +76471,35 +76472,252 +76472,256 +76473,252 +76473,35 +76474,252 +76474,256 +76475,252 +76475,35 +76476,252 +76476,256 +76477,252 +76477,35 +76478,252 +76478,256 +76479,252 +76479,35 +76480,254 +76480,256 +76481,254 +76481,35 +76482,254 +76482,256 +76483,254 +76483,35 +76484,254 +76484,256 +76485,254 +76485,35 +76486,254 +76486,256 +76487,254 +76487,35 +76488,254 +76488,256 +76489,254 +76489,35 +76490,254 +76490,256 +76491,254 +76491,35 +76492,254 +76492,256 +76493,254 +76493,35 +76494,254 +76494,256 +76495,254 +76495,35 +76496,254 +76496,256 +76497,254 +76497,35 +76498,254 +76498,256 +76499,254 +76499,35 +76500,254 +76500,256 +76501,254 +76501,35 +76502,254 +76502,256 +76503,254 +76503,35 +76504,254 +76504,256 +76505,254 +76505,35 +76506,254 +76506,256 +76507,254 +76507,35 +76508,254 +76508,256 +76509,254 +76509,35 +76510,254 +76510,256 +76511,254 +76511,35 +76512,254 +76512,256 +76513,254 +76513,35 +76514,254 +76514,256 +76515,254 +76515,35 +76516,254 +76516,256 +76517,254 +76517,35 +76518,254 +76518,256 +76519,254 +76519,35 +76520,254 +76520,256 +76521,254 +76521,35 +76522,254 +76522,256 +76523,254 +76523,35 +76524,254 +76524,256 +76525,254 +76525,35 +76526,254 +76526,256 +76527,254 +76527,35 +76528,254 +76528,256 +76529,254 +76529,35 +76530,254 +76530,256 +76531,254 +76531,35 +76532,254 +76532,256 +76533,254 +76533,35 +76534,254 +76534,256 +76535,254 +76535,35 +76536,254 +76536,256 +76537,254 +76537,35 +76538,254 +76538,256 +76539,254 +76539,35 +76540,254 +76540,256 +76541,254 +76541,35 +76542,254 +76542,256 +76543,254 +76543,35 +76544,254 +76544,256 +76545,254 +76545,35 +76546,254 +76546,256 +76547,254 +76547,35 +76548,254 +76548,256 +76549,254 +76549,35 +76550,254 +76550,256 +76551,254 +76551,35 +76552,254 +76552,256 +76553,254 +76553,35 +76554,254 +76554,256 +76555,254 +76555,35 +76556,253 +76556,256 +76557,253 +76557,35 +76558,253 +76558,256 +76559,253 +76559,35 +76560,253 +76560,256 +76561,253 +76561,35 +76562,253 +76562,256 +76563,253 +76563,35 +76564,253 +76564,256 +76565,253 +76565,35 +76566,253 +76566,256 +76567,253 +76567,35 +76568,253 +76568,256 +76569,253 +76569,35 +76570,253 +76570,256 +76571,253 +76571,35 +76572,253 +76572,256 +76573,253 +76573,35 +76574,253 +76574,256 +76575,253 +76575,35 +76576,253 +76576,256 +76577,253 +76577,35 +76578,253 +76578,256 +76579,253 +76579,35 +76580,253 +76580,256 +76581,253 +76581,35 +76582,253 +76582,256 +76583,253 +76583,35 +76584,253 +76584,256 +76585,253 +76585,35 +76586,253 +76586,256 +76587,253 +76587,35 +76588,253 +76588,256 +76589,253 +76589,35 +76590,253 +76590,256 +76591,253 +76591,35 +76592,253 +76592,256 +76593,253 +76593,35 +76594,253 +76594,256 +76595,253 +76595,35 +76596,253 +76596,256 +76597,253 +76597,35 +76598,253 +76598,256 +76599,253 +76599,35 +76600,253 +76600,256 +76601,253 +76601,35 +76602,253 +76602,256 +76603,253 +76603,35 +76604,253 +76604,256 +76605,253 +76605,35 +76606,253 +76606,256 +76607,253 +76607,35 +76608,253 +76608,256 +76609,253 +76609,35 +76610,253 +76610,256 +76611,253 +76611,35 +76612,253 +76612,256 +76613,253 +76613,35 +76614,253 +76614,256 +76615,253 +76615,35 +76616,253 +76616,256 +76617,253 +76617,35 +76618,253 +76618,256 +76619,253 +76619,35 +76620,253 +76620,256 +76621,253 +76621,35 +76622,253 +76622,256 +76623,253 +76623,35 +76624,253 +76624,256 +76625,253 +76625,35 +76626,253 +76626,256 +76627,253 +76627,35 +76628,253 +76628,256 +76629,253 +76629,35 +76630,253 +76630,256 +76631,253 +76631,35 +76632,255 +76632,256 +76633,255 +76633,35 +76634,255 +76634,256 +76635,255 +76635,35 +76636,255 +76636,256 +76637,255 +76637,35 +76638,255 +76638,256 +76639,255 +76639,35 +76640,255 +76640,256 +76641,255 +76641,35 +76642,255 +76642,256 +76643,255 +76643,35 +76644,255 +76644,256 +76645,255 +76645,35 +76646,255 +76646,256 +76647,255 +76647,35 +76648,255 +76648,256 +76649,255 +76649,35 +76650,255 +76650,256 +76651,255 +76651,35 +76652,255 +76652,256 +76653,255 +76653,35 +76654,255 +76654,256 +76655,255 +76655,35 +76656,255 +76656,256 +76657,255 +76657,35 +76658,255 +76658,256 +76659,255 +76659,35 +76660,255 +76660,256 +76661,255 +76661,35 +76662,255 +76662,256 +76663,255 +76663,35 +76664,255 +76664,256 +76665,255 +76665,35 +76666,255 +76666,256 +76667,255 +76667,35 +76668,255 +76668,256 +76669,255 +76669,35 +76670,255 +76670,256 +76671,255 +76671,35 +76672,255 +76672,256 +76673,255 +76673,35 +76674,255 +76674,256 +76675,255 +76675,35 +76676,255 +76676,256 +76677,255 +76677,35 +76678,255 +76678,256 +76679,255 +76679,35 +76680,255 +76680,256 +76681,255 +76681,35 +76682,255 +76682,256 +76683,255 +76683,35 +76684,255 +76684,256 +76685,255 +76685,35 +76686,255 +76686,256 +76687,255 +76687,35 +76688,255 +76688,256 +76689,255 +76689,35 +76690,255 +76690,256 +76691,255 +76691,35 +76692,255 +76692,256 +76693,255 +76693,35 +76694,255 +76694,256 +76695,255 +76695,35 +76696,255 +76696,256 +76697,255 +76697,35 +76698,255 +76698,256 +76699,255 +76699,35 +76700,255 +76700,256 +76701,255 +76701,35 +76702,255 +76702,256 +76703,255 +76703,35 +76704,255 +76704,256 +76705,255 +76705,35 +76706,255 +76706,256 +76707,255 +76707,35 +76708,255 +76708,256 +76709,255 +76709,35 +76710,255 +76710,256 +76711,255 +76711,35 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index f30aee2bc..9c938957e 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70311,3 +70311,539 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 76173,34,916,1782,50,60,60 76174,34,916,1783,524,8,10 76175,34,916,1783,524,60,60 +76176,33,916,1772,278,7,10 +76177,33,916,1772,278,60,60 +76178,33,916,1773,659,7,10 +76179,33,916,1773,659,60,60 +76180,33,916,1774,11,7,10 +76181,33,916,1774,11,60,60 +76182,33,916,1775,236,7,10 +76183,33,916,1775,236,60,60 +76184,33,916,1776,274,7,9 +76185,33,916,1776,274,60,60 +76186,33,916,1777,278,7,9 +76187,33,916,1777,278,60,60 +76188,33,916,1778,659,7,9 +76189,33,916,1778,659,60,60 +76190,33,916,1779,11,7,9 +76191,33,916,1779,11,60,60 +76192,33,916,1499,95,26,26 +76193,33,916,1499,95,60,60 +76194,33,916,1499,315,15,15 +76195,33,916,1499,315,60,60 +76196,33,916,1499,675,32,32 +76197,33,916,1499,675,60,60 +76198,33,916,1499,279,26,26 +76199,33,916,1499,279,60,60 +76200,33,916,1499,291,15,15 +76201,33,916,1499,291,60,60 +76202,33,916,1499,660,15,15 +76203,33,916,1499,660,60,60 +76204,33,916,1499,93,31,31 +76205,33,916,1499,93,60,60 +76206,33,916,1499,832,36,36 +76207,33,916,1499,832,60,60 +76208,33,916,1780,519,7,10 +76209,33,916,1780,519,60,60 +76210,33,916,1781,12,7,10 +76211,33,916,1781,12,60,60 +76212,33,916,1782,50,8,10 +76213,33,916,1782,50,60,60 +76214,33,916,1783,524,8,10 +76215,33,916,1783,524,60,60 +76216,34,916,1772,278,7,10 +76217,34,916,1772,278,60,60 +76218,34,916,1773,659,7,10 +76219,34,916,1773,659,60,60 +76220,34,916,1774,11,7,10 +76221,34,916,1774,11,60,60 +76222,34,916,1775,236,7,10 +76223,34,916,1775,236,60,60 +76224,34,916,1776,271,7,9 +76225,34,916,1776,271,60,60 +76226,34,916,1777,278,7,9 +76227,34,916,1777,278,60,60 +76228,34,916,1778,659,7,9 +76229,34,916,1778,659,60,60 +76230,34,916,1779,11,7,9 +76231,34,916,1779,11,60,60 +76232,34,916,1499,95,26,26 +76233,34,916,1499,95,60,60 +76234,34,916,1499,315,15,15 +76235,34,916,1499,315,60,60 +76236,34,916,1499,675,32,32 +76237,34,916,1499,675,60,60 +76238,34,916,1499,279,26,26 +76239,34,916,1499,279,60,60 +76240,34,916,1499,291,15,15 +76241,34,916,1499,291,60,60 +76242,34,916,1499,660,15,15 +76243,34,916,1499,660,60,60 +76244,34,916,1499,93,31,31 +76245,34,916,1499,93,60,60 +76246,34,916,1499,832,36,36 +76247,34,916,1499,832,60,60 +76248,34,916,1780,519,7,10 +76249,34,916,1780,519,60,60 +76250,34,916,1781,12,7,10 +76251,34,916,1781,12,60,60 +76252,34,916,1782,50,8,10 +76253,34,916,1782,50,60,60 +76254,34,916,1783,524,8,10 +76255,34,916,1783,524,60,60 +76256,33,916,1772,309,7,10 +76257,33,916,1772,309,60,60 +76258,33,916,1773,278,7,10 +76259,33,916,1773,278,60,60 +76260,33,916,1774,11,7,10 +76261,33,916,1774,11,60,60 +76262,33,916,1775,236,7,10 +76263,33,916,1775,236,60,60 +76264,33,916,1776,595,7,9 +76265,33,916,1776,595,60,60 +76266,33,916,1777,309,7,9 +76267,33,916,1777,309,60,60 +76268,33,916,1778,659,7,9 +76269,33,916,1778,659,60,60 +76270,33,916,1779,11,7,9 +76271,33,916,1779,11,60,60 +76272,33,916,1499,95,26,26 +76273,33,916,1499,95,60,60 +76274,33,916,1499,25,15,15 +76275,33,916,1499,25,60,60 +76276,33,916,1499,675,32,32 +76277,33,916,1499,675,60,60 +76278,33,916,1499,310,26,26 +76279,33,916,1499,310,60,60 +76280,33,916,1499,291,15,15 +76281,33,916,1499,291,60,60 +76282,33,916,1499,660,15,15 +76283,33,916,1499,660,60,60 +76284,33,916,1499,93,31,31 +76285,33,916,1499,93,60,60 +76286,33,916,1499,832,36,36 +76287,33,916,1499,832,60,60 +76288,33,916,1780,519,7,10 +76289,33,916,1780,519,60,60 +76290,33,916,1781,12,7,10 +76291,33,916,1781,12,60,60 +76292,33,916,1782,50,8,10 +76293,33,916,1782,50,60,60 +76294,33,916,1783,524,8,10 +76295,33,916,1783,524,60,60 +76296,34,916,1772,309,7,10 +76297,34,916,1772,309,60,60 +76298,34,916,1773,278,7,10 +76299,34,916,1773,278,60,60 +76300,34,916,1774,11,7,10 +76301,34,916,1774,11,60,60 +76302,34,916,1775,236,7,10 +76303,34,916,1775,236,60,60 +76304,34,916,1776,595,7,9 +76305,34,916,1776,595,60,60 +76306,34,916,1777,309,7,9 +76307,34,916,1777,309,60,60 +76308,34,916,1778,659,7,9 +76309,34,916,1778,659,60,60 +76310,34,916,1779,11,7,9 +76311,34,916,1779,11,60,60 +76312,34,916,1499,95,26,26 +76313,34,916,1499,95,60,60 +76314,34,916,1499,25,15,15 +76315,34,916,1499,25,60,60 +76316,34,916,1499,675,32,32 +76317,34,916,1499,675,60,60 +76318,34,916,1499,310,26,26 +76319,34,916,1499,310,60,60 +76320,34,916,1499,291,15,15 +76321,34,916,1499,291,60,60 +76322,34,916,1499,660,15,15 +76323,34,916,1499,660,60,60 +76324,34,916,1499,93,31,31 +76325,34,916,1499,93,60,60 +76326,34,916,1499,832,36,36 +76327,34,916,1499,832,60,60 +76328,34,916,1780,519,7,10 +76329,34,916,1780,519,60,60 +76330,34,916,1781,12,7,10 +76331,34,916,1781,12,60,60 +76332,34,916,1782,50,8,10 +76333,34,916,1782,50,60,60 +76334,34,916,1783,524,8,10 +76335,34,916,1783,524,60,60 +76336,33,916,1772,582,7,10 +76337,33,916,1772,582,60,60 +76338,33,916,1773,659,7,10 +76339,33,916,1773,659,60,60 +76340,33,916,1774,11,7,10 +76341,33,916,1774,11,60,60 +76342,33,916,1775,236,7,10 +76343,33,916,1775,236,60,60 +76344,33,916,1776,582,7,9 +76345,33,916,1776,582,60,60 +76346,33,916,1777,220,7,9 +76347,33,916,1777,220,60,60 +76348,33,916,1778,659,7,9 +76349,33,916,1778,659,60,60 +76350,33,916,1779,572,7,9 +76351,33,916,1779,572,60,60 +76352,33,916,1499,95,26,26 +76353,33,916,1499,95,60,60 +76354,33,916,1499,315,15,15 +76355,33,916,1499,315,60,60 +76356,33,916,1499,221,32,32 +76357,33,916,1499,221,60,60 +76358,33,916,1499,660,26,26 +76359,33,916,1499,660,60,60 +76360,33,916,1499,291,15,15 +76361,33,916,1499,291,60,60 +76362,33,916,1499,832,36,36 +76363,33,916,1499,832,60,60 +76364,33,916,1780,519,7,10 +76365,33,916,1780,519,60,60 +76366,33,916,1781,12,7,10 +76367,33,916,1781,12,60,60 +76368,33,916,1782,50,8,10 +76369,33,916,1782,50,60,60 +76370,33,916,1783,524,8,10 +76371,33,916,1783,524,60,60 +76372,34,916,1772,582,7,10 +76373,34,916,1772,582,60,60 +76374,34,916,1773,659,7,10 +76375,34,916,1773,659,60,60 +76376,34,916,1774,11,7,10 +76377,34,916,1774,11,60,60 +76378,34,916,1775,236,7,10 +76379,34,916,1775,236,60,60 +76380,34,916,1776,582,7,9 +76381,34,916,1776,582,60,60 +76382,34,916,1777,220,7,9 +76383,34,916,1777,220,60,60 +76384,34,916,1778,659,7,9 +76385,34,916,1778,659,60,60 +76386,34,916,1779,572,7,9 +76387,34,916,1779,572,60,60 +76388,34,916,1499,95,26,26 +76389,34,916,1499,95,60,60 +76390,34,916,1499,315,15,15 +76391,34,916,1499,315,60,60 +76392,34,916,1499,221,32,32 +76393,34,916,1499,221,60,60 +76394,34,916,1499,660,26,26 +76395,34,916,1499,660,60,60 +76396,34,916,1499,291,15,15 +76397,34,916,1499,291,60,60 +76398,34,916,1499,832,36,36 +76399,34,916,1499,832,60,60 +76400,34,916,1780,519,7,10 +76401,34,916,1780,519,60,60 +76402,34,916,1781,12,7,10 +76403,34,916,1781,12,60,60 +76404,34,916,1782,50,8,10 +76405,34,916,1782,50,60,60 +76406,34,916,1783,524,8,10 +76407,34,916,1783,524,60,60 +76408,33,916,1772,225,7,10 +76409,33,916,1772,225,60,60 +76410,33,916,1773,582,7,10 +76411,33,916,1773,582,60,60 +76412,33,916,1774,11,7,10 +76413,33,916,1774,11,60,60 +76414,33,916,1775,236,7,10 +76415,33,916,1775,236,60,60 +76416,33,916,1776,220,7,9 +76417,33,916,1776,220,60,60 +76418,33,916,1777,225,7,9 +76419,33,916,1777,225,60,60 +76420,33,916,1778,361,7,9 +76421,33,916,1778,361,60,60 +76422,33,916,1779,659,7,9 +76423,33,916,1779,659,60,60 +76424,33,916,1499,95,26,26 +76425,33,916,1499,95,60,60 +76426,33,916,1499,439,15,15 +76427,33,916,1499,439,60,60 +76428,33,916,1499,221,32,32 +76429,33,916,1499,221,60,60 +76430,33,916,1499,660,26,26 +76431,33,916,1499,660,60,60 +76432,33,916,1499,291,15,15 +76433,33,916,1499,291,60,60 +76434,33,916,1499,832,36,36 +76435,33,916,1499,832,60,60 +76436,33,916,1780,519,7,10 +76437,33,916,1780,519,60,60 +76438,33,916,1781,12,7,10 +76439,33,916,1781,12,60,60 +76440,33,916,1782,50,8,10 +76441,33,916,1782,50,60,60 +76442,33,916,1783,524,8,10 +76443,33,916,1783,524,60,60 +76444,34,916,1772,225,7,10 +76445,34,916,1772,225,60,60 +76446,34,916,1773,582,7,10 +76447,34,916,1773,582,60,60 +76448,34,916,1774,11,7,10 +76449,34,916,1774,11,60,60 +76450,34,916,1775,236,7,10 +76451,34,916,1775,236,60,60 +76452,34,916,1776,220,7,9 +76453,34,916,1776,220,60,60 +76454,34,916,1777,225,7,9 +76455,34,916,1777,225,60,60 +76456,34,916,1778,361,7,9 +76457,34,916,1778,361,60,60 +76458,34,916,1779,659,7,9 +76459,34,916,1779,659,60,60 +76460,34,916,1499,95,26,26 +76461,34,916,1499,95,60,60 +76462,34,916,1499,439,15,15 +76463,34,916,1499,439,60,60 +76464,34,916,1499,221,32,32 +76465,34,916,1499,221,60,60 +76466,34,916,1499,660,26,26 +76467,34,916,1499,660,60,60 +76468,34,916,1499,291,15,15 +76469,34,916,1499,291,60,60 +76470,34,916,1499,832,36,36 +76471,34,916,1499,832,60,60 +76472,34,916,1780,519,7,10 +76473,34,916,1780,519,60,60 +76474,34,916,1781,12,7,10 +76475,34,916,1781,12,60,60 +76476,34,916,1782,50,8,10 +76477,34,916,1782,50,60,60 +76478,34,916,1783,524,8,10 +76479,34,916,1783,524,60,60 +76480,33,916,1772,37,7,10 +76481,33,916,1772,37,60,60 +76482,33,916,1773,659,7,10 +76483,33,916,1773,659,60,60 +76484,33,916,1774,11,7,10 +76485,33,916,1774,11,60,60 +76486,33,916,1775,236,7,10 +76487,33,916,1775,236,60,60 +76488,33,916,1776,343,7,9 +76489,33,916,1776,343,60,60 +76490,33,916,1777,749,7,9 +76491,33,916,1777,749,60,60 +76492,33,916,1778,37,7,9 +76493,33,916,1778,37,60,60 +76494,33,916,1779,659,7,9 +76495,33,916,1779,659,60,60 +76496,33,916,1499,95,26,26 +76497,33,916,1499,95,60,60 +76498,33,916,1499,315,15,15 +76499,33,916,1499,315,60,60 +76500,33,916,1499,675,32,32 +76501,33,916,1499,675,60,60 +76502,33,916,1499,660,26,26 +76503,33,916,1499,660,60,60 +76504,33,916,1499,291,15,15 +76505,33,916,1499,291,60,60 +76506,33,916,1499,750,31,31 +76507,33,916,1499,750,60,60 +76508,33,916,1499,832,36,36 +76509,33,916,1499,832,60,60 +76510,33,916,1780,519,7,10 +76511,33,916,1780,519,60,60 +76512,33,916,1781,12,7,10 +76513,33,916,1781,12,60,60 +76514,33,916,1782,524,8,10 +76515,33,916,1782,524,60,60 +76516,33,916,1783,50,8,10 +76517,33,916,1783,50,60,60 +76518,34,916,1772,58,7,10 +76519,34,916,1772,58,60,60 +76520,34,916,1773,659,7,10 +76521,34,916,1773,659,60,60 +76522,34,916,1774,11,7,10 +76523,34,916,1774,11,60,60 +76524,34,916,1775,236,7,10 +76525,34,916,1775,236,60,60 +76526,34,916,1776,343,7,9 +76527,34,916,1776,343,60,60 +76528,34,916,1777,749,7,9 +76529,34,916,1777,749,60,60 +76530,34,916,1778,58,7,9 +76531,34,916,1778,58,60,60 +76532,34,916,1779,659,7,9 +76533,34,916,1779,659,60,60 +76534,34,916,1499,95,26,26 +76535,34,916,1499,95,60,60 +76536,34,916,1499,315,15,15 +76537,34,916,1499,315,60,60 +76538,34,916,1499,675,32,32 +76539,34,916,1499,675,60,60 +76540,34,916,1499,660,26,26 +76541,34,916,1499,660,60,60 +76542,34,916,1499,291,15,15 +76543,34,916,1499,291,60,60 +76544,34,916,1499,750,31,31 +76545,34,916,1499,750,60,60 +76546,34,916,1499,832,36,36 +76547,34,916,1499,832,60,60 +76548,34,916,1780,519,7,10 +76549,34,916,1780,519,60,60 +76550,34,916,1781,12,7,10 +76551,34,916,1781,12,60,60 +76552,34,916,1782,524,8,10 +76553,34,916,1782,524,60,60 +76554,34,916,1783,50,8,10 +76555,34,916,1783,50,60,60 +76556,33,916,1772,343,7,10 +76557,33,916,1772,343,60,60 +76558,33,916,1773,659,7,10 +76559,33,916,1773,659,60,60 +76560,33,916,1774,11,7,10 +76561,33,916,1774,11,60,60 +76562,33,916,1775,236,7,10 +76563,33,916,1775,236,60,60 +76564,33,916,1776,557,7,9 +76565,33,916,1776,557,60,60 +76566,33,916,1777,343,7,9 +76567,33,916,1777,343,60,60 +76568,33,916,1778,622,7,9 +76569,33,916,1778,622,60,60 +76570,33,916,1779,659,7,9 +76571,33,916,1779,659,60,60 +76572,33,916,1499,95,26,26 +76573,33,916,1499,95,60,60 +76574,33,916,1499,315,15,15 +76575,33,916,1499,315,60,60 +76576,33,916,1499,558,34,34 +76577,33,916,1499,558,60,60 +76578,33,916,1499,660,26,26 +76579,33,916,1499,660,60,60 +76580,33,916,1499,291,15,15 +76581,33,916,1499,291,60,60 +76582,33,916,1499,750,31,31 +76583,33,916,1499,750,60,60 +76584,33,916,1499,832,36,36 +76585,33,916,1499,832,60,60 +76586,33,916,1780,519,7,10 +76587,33,916,1780,519,60,60 +76588,33,916,1781,12,7,10 +76589,33,916,1781,12,60,60 +76590,33,916,1782,524,8,10 +76591,33,916,1782,524,60,60 +76592,33,916,1783,50,8,10 +76593,33,916,1783,50,60,60 +76594,34,916,1772,343,7,10 +76595,34,916,1772,343,60,60 +76596,34,916,1773,659,7,10 +76597,34,916,1773,659,60,60 +76598,34,916,1774,11,7,10 +76599,34,916,1774,11,60,60 +76600,34,916,1775,236,7,10 +76601,34,916,1775,236,60,60 +76602,34,916,1776,557,7,9 +76603,34,916,1776,557,60,60 +76604,34,916,1777,343,7,9 +76605,34,916,1777,343,60,60 +76606,34,916,1778,622,7,9 +76607,34,916,1778,622,60,60 +76608,34,916,1779,659,7,9 +76609,34,916,1779,659,60,60 +76610,34,916,1499,95,26,26 +76611,34,916,1499,95,60,60 +76612,34,916,1499,315,15,15 +76613,34,916,1499,315,60,60 +76614,34,916,1499,558,34,34 +76615,34,916,1499,558,60,60 +76616,34,916,1499,660,26,26 +76617,34,916,1499,660,60,60 +76618,34,916,1499,291,15,15 +76619,34,916,1499,291,60,60 +76620,34,916,1499,750,31,31 +76621,34,916,1499,750,60,60 +76622,34,916,1499,832,36,36 +76623,34,916,1499,832,60,60 +76624,34,916,1780,519,7,10 +76625,34,916,1780,519,60,60 +76626,34,916,1781,12,7,10 +76627,34,916,1781,12,60,60 +76628,34,916,1782,524,8,10 +76629,34,916,1782,524,60,60 +76630,34,916,1783,50,8,10 +76631,34,916,1783,50,60,60 +76632,33,916,1772,280,7,10 +76633,33,916,1772,280,60,60 +76634,33,916,1773,659,7,10 +76635,33,916,1773,659,60,60 +76636,33,916,1774,11,7,10 +76637,33,916,1774,11,60,60 +76638,33,916,1775,236,7,10 +76639,33,916,1775,236,60,60 +76640,33,916,1776,517,7,9 +76641,33,916,1776,517,60,60 +76642,33,916,1777,177,7,9 +76643,33,916,1777,177,60,60 +76644,33,916,1778,659,7,9 +76645,33,916,1778,659,60,60 +76646,33,916,1779,11,7,9 +76647,33,916,1779,11,60,60 +76648,33,916,1499,95,26,26 +76649,33,916,1499,95,60,60 +76650,33,916,1499,315,15,15 +76651,33,916,1499,315,60,60 +76652,33,916,1499,282,32,32 +76653,33,916,1499,282,60,60 +76654,33,916,1499,281,26,26 +76655,33,916,1499,281,60,60 +76656,33,916,1499,291,15,15 +76657,33,916,1499,291,60,60 +76658,33,916,1499,660,15,15 +76659,33,916,1499,660,60,60 +76660,33,916,1499,750,31,31 +76661,33,916,1499,750,60,60 +76662,33,916,1499,832,36,36 +76663,33,916,1499,832,60,60 +76664,33,916,1780,12,7,10 +76665,33,916,1780,12,60,60 +76666,33,916,1781,519,7,10 +76667,33,916,1781,519,60,60 +76668,33,916,1782,50,8,10 +76669,33,916,1782,50,60,60 +76670,33,916,1783,524,8,10 +76671,33,916,1783,524,60,60 +76672,34,916,1772,280,7,10 +76673,34,916,1772,280,60,60 +76674,34,916,1773,659,7,10 +76675,34,916,1773,659,60,60 +76676,34,916,1774,11,7,10 +76677,34,916,1774,11,60,60 +76678,34,916,1775,236,7,10 +76679,34,916,1775,236,60,60 +76680,34,916,1776,517,7,9 +76681,34,916,1776,517,60,60 +76682,34,916,1777,177,7,9 +76683,34,916,1777,177,60,60 +76684,34,916,1778,659,7,9 +76685,34,916,1778,659,60,60 +76686,34,916,1779,11,7,9 +76687,34,916,1779,11,60,60 +76688,34,916,1499,95,26,26 +76689,34,916,1499,95,60,60 +76690,34,916,1499,315,15,15 +76691,34,916,1499,315,60,60 +76692,34,916,1499,282,32,32 +76693,34,916,1499,282,60,60 +76694,34,916,1499,281,26,26 +76695,34,916,1499,281,60,60 +76696,34,916,1499,291,15,15 +76697,34,916,1499,291,60,60 +76698,34,916,1499,660,15,15 +76699,34,916,1499,660,60,60 +76700,34,916,1499,750,31,31 +76701,34,916,1499,750,60,60 +76702,34,916,1499,832,36,36 +76703,34,916,1499,832,60,60 +76704,34,916,1780,12,7,10 +76705,34,916,1780,12,60,60 +76706,34,916,1781,519,7,10 +76707,34,916,1781,519,60,60 +76708,34,916,1782,50,8,10 +76709,34,916,1782,50,60,60 +76710,34,916,1783,524,8,10 +76711,34,916,1783,524,60,60 From f8708cbb4f25b9ae7fdfc426913f6ef6fa5f1e17 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 22 Jun 2026 14:42:59 -0500 Subject: [PATCH 82/89] fix: add missing overcast spawns in rolling-fields-main --- data/v2/csv/encounter_condition_value_map.csv | 152 ++++++++++++++++++ data/v2/csv/encounter_slots.csv | 4 + data/v2/csv/encounters.csv | 76 +++++++++ 3 files changed, 232 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 14fa9fff9..91f059d8e 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -24058,3 +24058,155 @@ encounter_id,encounter_condition_value_id 76710,256 76711,255 76711,35 +76712,248 +76712,256 +76713,248 +76713,35 +76714,248 +76714,256 +76715,248 +76715,35 +76716,248 +76716,256 +76717,248 +76717,35 +76718,248 +76718,256 +76719,248 +76719,35 +76720,248 +76720,256 +76721,248 +76721,35 +76722,248 +76722,256 +76723,248 +76723,35 +76724,248 +76724,256 +76725,248 +76725,35 +76726,248 +76726,256 +76727,248 +76727,35 +76728,248 +76728,256 +76729,248 +76729,35 +76730,248 +76730,256 +76731,248 +76731,35 +76732,248 +76732,256 +76733,248 +76733,35 +76734,248 +76734,256 +76735,248 +76735,35 +76736,248 +76736,256 +76737,248 +76737,35 +76738,248 +76738,256 +76739,248 +76739,35 +76740,248 +76740,256 +76741,248 +76741,35 +76742,248 +76742,256 +76743,248 +76743,35 +76744,248 +76744,256 +76745,248 +76745,35 +76746,248 +76746,256 +76747,248 +76747,35 +76748,248 +76748,256 +76749,248 +76749,35 +76750,248 +76750,256 +76751,248 +76751,35 +76752,248 +76752,256 +76753,248 +76753,35 +76754,248 +76754,256 +76755,248 +76755,35 +76756,248 +76756,256 +76757,248 +76757,35 +76758,248 +76758,256 +76759,248 +76759,35 +76760,248 +76760,256 +76761,248 +76761,35 +76762,248 +76762,256 +76763,248 +76763,35 +76764,248 +76764,256 +76765,248 +76765,35 +76766,248 +76766,256 +76767,248 +76767,35 +76768,248 +76768,256 +76769,248 +76769,35 +76770,248 +76770,256 +76771,248 +76771,35 +76772,248 +76772,256 +76773,248 +76773,35 +76774,248 +76774,256 +76775,248 +76775,35 +76776,248 +76776,256 +76777,248 +76777,35 +76778,248 +76778,256 +76779,248 +76779,35 +76780,248 +76780,256 +76781,248 +76781,35 +76782,248 +76782,256 +76783,248 +76783,35 +76784,248 +76784,256 +76785,248 +76785,35 +76786,248 +76786,256 +76787,248 +76787,35 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 78d047b39..808c3be91 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1782,3 +1782,7 @@ id,version_group_id,encounter_method_id,slot,rarity 1781,20,40,2,25 1782,20,56,1,80 1783,20,56,2,20 +1784,20,38,1,60 +1785,20,38,2,28 +1786,20,38,3,10 +1787,20,38,4,2 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 9c938957e..390023e65 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70847,3 +70847,79 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 76709,34,916,1782,50,60,60 76710,34,916,1783,524,8,10 76711,34,916,1783,524,60,60 +76712,33,916,1784,659,7,10 +76713,33,916,1784,659,60,60 +76714,33,916,1785,236,7,10 +76715,33,916,1785,236,60,60 +76716,33,916,1786,11,7,10 +76717,33,916,1786,11,60,60 +76718,33,916,1787,280,7,10 +76719,33,916,1787,280,60,60 +76720,33,916,1776,43,7,9 +76721,33,916,1776,43,60,60 +76722,33,916,1777,406,7,9 +76723,33,916,1777,406,60,60 +76724,33,916,1778,659,7,9 +76725,33,916,1778,659,60,60 +76726,33,916,1779,11,7,9 +76727,33,916,1779,11,60,60 +76728,33,916,1499,95,26,26 +76729,33,916,1499,95,60,60 +76730,33,916,1499,315,15,15 +76731,33,916,1499,315,60,60 +76732,33,916,1499,675,32,32 +76733,33,916,1499,675,60,60 +76734,33,916,1499,291,15,15 +76735,33,916,1499,291,60,60 +76736,33,916,1499,660,15,15 +76737,33,916,1499,660,60,60 +76738,33,916,1499,750,31,31 +76739,33,916,1499,750,60,60 +76740,33,916,1499,832,36,36 +76741,33,916,1499,832,60,60 +76742,33,916,1780,12,7,10 +76743,33,916,1780,12,60,60 +76744,33,916,1781,519,7,10 +76745,33,916,1781,519,60,60 +76746,33,916,1782,524,8,10 +76747,33,916,1782,524,60,60 +76748,33,916,1783,50,8,10 +76749,33,916,1783,50,60,60 +76750,34,916,1784,659,7,10 +76751,34,916,1784,659,60,60 +76752,34,916,1785,236,7,10 +76753,34,916,1785,236,60,60 +76754,34,916,1786,11,7,10 +76755,34,916,1786,11,60,60 +76756,34,916,1787,280,7,10 +76757,34,916,1787,280,60,60 +76758,34,916,1776,43,7,9 +76759,34,916,1776,43,60,60 +76760,34,916,1777,406,7,9 +76761,34,916,1777,406,60,60 +76762,34,916,1778,659,7,9 +76763,34,916,1778,659,60,60 +76764,34,916,1779,11,7,9 +76765,34,916,1779,11,60,60 +76766,34,916,1499,95,26,26 +76767,34,916,1499,95,60,60 +76768,34,916,1499,315,15,15 +76769,34,916,1499,315,60,60 +76770,34,916,1499,675,32,32 +76771,34,916,1499,675,60,60 +76772,34,916,1499,291,15,15 +76773,34,916,1499,291,60,60 +76774,34,916,1499,660,15,15 +76775,34,916,1499,660,60,60 +76776,34,916,1499,750,31,31 +76777,34,916,1499,750,60,60 +76778,34,916,1499,832,36,36 +76779,34,916,1499,832,60,60 +76780,34,916,1780,12,7,10 +76781,34,916,1780,12,60,60 +76782,34,916,1781,519,7,10 +76783,34,916,1781,519,60,60 +76784,34,916,1782,524,8,10 +76785,34,916,1782,524,60,60 +76786,34,916,1783,50,8,10 +76787,34,916,1783,50,60,60 From 6c7596a6b0f2abe63138f415a57d75e075dc6a5a Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 22 Jun 2026 15:00:20 -0500 Subject: [PATCH 83/89] feat: add weather-based encounters in rolling-fields-area-2 --- data/v2/csv/encounter_condition_value_map.csv | 288 ++++++++++++++++++ data/v2/csv/encounters.csv | 144 +++++++++ 2 files changed, 432 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 91f059d8e..f002e1a2b 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -24210,3 +24210,291 @@ encounter_id,encounter_condition_value_id 76786,256 76787,248 76787,35 +76788,247 +76788,256 +76789,247 +76789,35 +76790,247 +76790,256 +76791,247 +76791,35 +76792,247 +76792,256 +76793,247 +76793,35 +76794,247 +76794,256 +76795,247 +76795,35 +76796,247 +76796,256 +76797,247 +76797,35 +76798,247 +76798,256 +76799,247 +76799,35 +76800,247 +76800,256 +76801,247 +76801,35 +76802,247 +76802,256 +76803,247 +76803,35 +76804,248 +76804,256 +76805,248 +76805,35 +76806,248 +76806,256 +76807,248 +76807,35 +76808,248 +76808,256 +76809,248 +76809,35 +76810,248 +76810,256 +76811,248 +76811,35 +76812,248 +76812,256 +76813,248 +76813,35 +76814,248 +76814,256 +76815,248 +76815,35 +76816,248 +76816,256 +76817,248 +76817,35 +76818,248 +76818,256 +76819,248 +76819,35 +76820,249 +76820,256 +76821,249 +76821,35 +76822,249 +76822,256 +76823,249 +76823,35 +76824,249 +76824,256 +76825,249 +76825,35 +76826,249 +76826,256 +76827,249 +76827,35 +76828,249 +76828,256 +76829,249 +76829,35 +76830,249 +76830,256 +76831,249 +76831,35 +76832,249 +76832,256 +76833,249 +76833,35 +76834,249 +76834,256 +76835,249 +76835,35 +76836,250 +76836,256 +76837,250 +76837,35 +76838,250 +76838,256 +76839,250 +76839,35 +76840,250 +76840,256 +76841,250 +76841,35 +76842,250 +76842,256 +76843,250 +76843,35 +76844,250 +76844,256 +76845,250 +76845,35 +76846,250 +76846,256 +76847,250 +76847,35 +76848,250 +76848,256 +76849,250 +76849,35 +76850,250 +76850,256 +76851,250 +76851,35 +76852,251 +76852,256 +76853,251 +76853,35 +76854,251 +76854,256 +76855,251 +76855,35 +76856,251 +76856,256 +76857,251 +76857,35 +76858,251 +76858,256 +76859,251 +76859,35 +76860,251 +76860,256 +76861,251 +76861,35 +76862,251 +76862,256 +76863,251 +76863,35 +76864,251 +76864,256 +76865,251 +76865,35 +76866,251 +76866,256 +76867,251 +76867,35 +76868,252 +76868,256 +76869,252 +76869,35 +76870,252 +76870,256 +76871,252 +76871,35 +76872,252 +76872,256 +76873,252 +76873,35 +76874,252 +76874,256 +76875,252 +76875,35 +76876,252 +76876,256 +76877,252 +76877,35 +76878,252 +76878,256 +76879,252 +76879,35 +76880,252 +76880,256 +76881,252 +76881,35 +76882,252 +76882,256 +76883,252 +76883,35 +76884,254 +76884,256 +76885,254 +76885,35 +76886,254 +76886,256 +76887,254 +76887,35 +76888,254 +76888,256 +76889,254 +76889,35 +76890,254 +76890,256 +76891,254 +76891,35 +76892,254 +76892,256 +76893,254 +76893,35 +76894,254 +76894,256 +76895,254 +76895,35 +76896,254 +76896,256 +76897,254 +76897,35 +76898,254 +76898,256 +76899,254 +76899,35 +76900,253 +76900,256 +76901,253 +76901,35 +76902,253 +76902,256 +76903,253 +76903,35 +76904,253 +76904,256 +76905,253 +76905,35 +76906,253 +76906,256 +76907,253 +76907,35 +76908,253 +76908,256 +76909,253 +76909,35 +76910,253 +76910,256 +76911,253 +76911,35 +76912,253 +76912,256 +76913,253 +76913,35 +76914,253 +76914,256 +76915,253 +76915,35 +76916,255 +76916,256 +76917,255 +76917,35 +76918,255 +76918,256 +76919,255 +76919,35 +76920,255 +76920,256 +76921,255 +76921,35 +76922,255 +76922,256 +76923,255 +76923,35 +76924,255 +76924,256 +76925,255 +76925,35 +76926,255 +76926,256 +76927,255 +76927,35 +76928,255 +76928,256 +76929,255 +76929,35 +76930,255 +76930,256 +76931,255 +76931,35 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 390023e65..f0706e0a9 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70923,3 +70923,147 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 76785,34,916,1782,524,60,60 76786,34,916,1783,50,8,10 76787,34,916,1783,50,60,60 +76788,33,917,1772,674,7,10 +76789,33,917,1772,674,60,60 +76790,33,917,1773,415,7,10 +76791,33,917,1773,415,60,60 +76792,33,917,1774,11,7,10 +76793,33,917,1774,11,60,60 +76794,33,917,1775,236,7,10 +76795,33,917,1775,236,60,60 +76796,34,917,1772,674,7,10 +76797,34,917,1772,674,60,60 +76798,34,917,1773,415,7,10 +76799,34,917,1773,415,60,60 +76800,34,917,1774,11,7,10 +76801,34,917,1774,11,60,60 +76802,34,917,1775,236,7,10 +76803,34,917,1775,236,60,60 +76804,33,917,1784,674,7,10 +76805,33,917,1784,674,60,60 +76806,33,917,1785,236,7,10 +76807,33,917,1785,236,60,60 +76808,33,917,1786,11,7,10 +76809,33,917,1786,11,60,60 +76810,33,917,1787,280,7,10 +76811,33,917,1787,280,60,60 +76812,34,917,1784,674,7,10 +76813,34,917,1784,674,60,60 +76814,34,917,1785,236,7,10 +76815,34,917,1785,236,60,60 +76816,34,917,1786,11,7,10 +76817,34,917,1786,11,60,60 +76818,34,917,1787,280,7,10 +76819,34,917,1787,280,60,60 +76820,33,917,1772,674,7,10 +76821,33,917,1772,674,60,60 +76822,33,917,1773,278,7,10 +76823,33,917,1773,278,60,60 +76824,33,917,1774,11,7,10 +76825,33,917,1774,11,60,60 +76826,33,917,1775,236,7,10 +76827,33,917,1775,236,60,60 +76828,34,917,1772,674,7,10 +76829,34,917,1772,674,60,60 +76830,34,917,1773,278,7,10 +76831,34,917,1773,278,60,60 +76832,34,917,1774,11,7,10 +76833,34,917,1774,11,60,60 +76834,34,917,1775,236,7,10 +76835,34,917,1775,236,60,60 +76836,33,917,1772,674,7,10 +76837,33,917,1772,674,60,60 +76838,33,917,1773,309,7,10 +76839,33,917,1773,309,60,60 +76840,33,917,1774,11,7,10 +76841,33,917,1774,11,60,60 +76842,33,917,1775,236,7,10 +76843,33,917,1775,236,60,60 +76844,34,917,1772,674,7,10 +76845,34,917,1772,674,60,60 +76846,34,917,1773,309,7,10 +76847,34,917,1773,309,60,60 +76848,34,917,1774,11,7,10 +76849,34,917,1774,11,60,60 +76850,34,917,1775,236,7,10 +76851,34,917,1775,236,60,60 +76852,33,917,1772,674,7,10 +76853,33,917,1772,674,60,60 +76854,33,917,1773,582,7,10 +76855,33,917,1773,582,60,60 +76856,33,917,1774,11,7,10 +76857,33,917,1774,11,60,60 +76858,33,917,1775,236,7,10 +76859,33,917,1775,236,60,60 +76860,34,917,1772,674,7,10 +76861,34,917,1772,674,60,60 +76862,34,917,1773,582,7,10 +76863,34,917,1773,582,60,60 +76864,34,917,1774,11,7,10 +76865,34,917,1774,11,60,60 +76866,34,917,1775,236,7,10 +76867,34,917,1775,236,60,60 +76868,33,917,1772,674,7,10 +76869,33,917,1772,674,60,60 +76870,33,917,1773,582,7,10 +76871,33,917,1773,582,60,60 +76872,33,917,1774,11,7,10 +76873,33,917,1774,11,60,60 +76874,33,917,1775,236,7,10 +76875,33,917,1775,236,60,60 +76876,34,917,1772,674,7,10 +76877,34,917,1772,674,60,60 +76878,34,917,1773,582,7,10 +76879,34,917,1773,582,60,60 +76880,34,917,1774,11,7,10 +76881,34,917,1774,11,60,60 +76882,34,917,1775,236,7,10 +76883,34,917,1775,236,60,60 +76884,33,917,1772,674,7,10 +76885,33,917,1772,674,60,60 +76886,33,917,1773,37,7,10 +76887,33,917,1773,37,60,60 +76888,33,917,1774,11,7,10 +76889,33,917,1774,11,60,60 +76890,33,917,1775,236,7,10 +76891,33,917,1775,236,60,60 +76892,34,917,1772,674,7,10 +76893,34,917,1772,674,60,60 +76894,34,917,1773,58,7,10 +76895,34,917,1773,58,60,60 +76896,34,917,1774,11,7,10 +76897,34,917,1774,11,60,60 +76898,34,917,1775,236,7,10 +76899,34,917,1775,236,60,60 +76900,33,917,1772,674,7,10 +76901,33,917,1772,674,60,60 +76902,33,917,1773,343,7,10 +76903,33,917,1773,343,60,60 +76904,33,917,1774,11,7,10 +76905,33,917,1774,11,60,60 +76906,33,917,1775,236,7,10 +76907,33,917,1775,236,60,60 +76908,34,917,1772,674,7,10 +76909,34,917,1772,674,60,60 +76910,34,917,1773,343,7,10 +76911,34,917,1773,343,60,60 +76912,34,917,1774,11,7,10 +76913,34,917,1774,11,60,60 +76914,34,917,1775,236,7,10 +76915,34,917,1775,236,60,60 +76916,33,917,1772,674,7,10 +76917,33,917,1772,674,60,60 +76918,33,917,1773,280,7,10 +76919,33,917,1773,280,60,60 +76920,33,917,1774,11,7,10 +76921,33,917,1774,11,60,60 +76922,33,917,1775,236,7,10 +76923,33,917,1775,236,60,60 +76924,34,917,1772,674,7,10 +76925,34,917,1772,674,60,60 +76926,34,917,1773,280,7,10 +76927,34,917,1773,280,60,60 +76928,34,917,1774,11,7,10 +76929,34,917,1774,11,60,60 +76930,34,917,1775,236,7,10 +76931,34,917,1775,236,60,60 From 2d111cbb36247cfe33c9cf81c74a84febd78add6 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 22 Jun 2026 15:19:10 -0500 Subject: [PATCH 84/89] fix: rename galar route prose to be consistent with other regions --- data/v2/csv/location_area_prose.csv | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index c20f4f340..5f5813ac4 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2176,20 +2176,20 @@ 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 -845,9,Route 3 (East) -847,9,Route 4 -848,9,Route 5 -849,9,Route 6 -850,9,Route 7 -851,9,Route 8 (Main) -852,9,Route 8 (Steamdrift Way) -853,9,Route 9 (Main) -854,9,Route 9 (Circhester Bay) -855,9,Route 9 (Outer Spikemuth) -856,9,Route 10 (Main) -857,9,Route 10 (Near Station) +843,9,Galar Route 1 +844,9,Galar Route 2 +845,9,Galar Route 3 (East) +847,9,Galar Route 4 +848,9,Galar Route 5 +849,9,Galar Route 6 +850,9,Galar Route 7 +851,9,Galar Route 8 (Main) +852,9,Galar Route 8 (Steamdrift Way) +853,9,Galar Route 9 (Main) +854,9,Galar Route 9 (Circhester Bay) +855,9,Galar Route 9 (Outer Spikemuth) +856,9,Galar Route 10 (Main) +857,9,Galar Route 10 (Near Station) 861,9,Battle Tower 869,9,Circhester 876,9,Fields of Honor From 47a1c710fa866beab28aff49e0af743258bba982 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 22 Jun 2026 15:19:18 -0500 Subject: [PATCH 85/89] fix: add missing location names --- data/v2/csv/location_names.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv index de503fd22..0699a0311 100644 --- a/data/v2/csv/location_names.csv +++ b/data/v2/csv/location_names.csv @@ -5244,3 +5244,5 @@ location_id,local_language_id,name,subtitle 1112,9,Citadark Isle, 1113,9,Kanto Underground Path, 1114,9,Energy Plant +1115,9,Meetup Spot +1116,9,Random caves across the Isle of Armor From 76e6b3992131173f7ceddda37393aa6812f3d3cf Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 22 Jun 2026 15:44:26 -0500 Subject: [PATCH 86/89] fix: correct encounter method ordering --- data/v2/csv/encounter_methods.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index eef1ca0a9..158caa763 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -53,5 +53,5 @@ id,identifier,order 52,snag-rematch,52 53,pokespot,53 54,hidden-grotto,54 -55,honey-tree,54 +55,honey-tree,55 56,overworld-dirt,56 From 182faa8fe77911e03b848bb8162f9aec24a57ca5 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Mon, 22 Jun 2026 20:09:08 -0500 Subject: [PATCH 87/89] fix: add missing commas in location_names --- data/v2/csv/location_names.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv index 0699a0311..da344248b 100644 --- a/data/v2/csv/location_names.csv +++ b/data/v2/csv/location_names.csv @@ -5243,6 +5243,6 @@ location_id,local_language_id,name,subtitle 1111,9,Cipher Key Lair, 1112,9,Citadark Isle, 1113,9,Kanto Underground Path, -1114,9,Energy Plant -1115,9,Meetup Spot -1116,9,Random caves across the Isle of Armor +1114,9,Energy Plant, +1115,9,Meetup Spot, +1116,9,Random caves across the Isle of Armor, From f4775563f175db7091ce471a64871c5e5dce1354 Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Wed, 24 Jun 2026 11:17:51 -0500 Subject: [PATCH 88/89] fix: remove unnecessary region prefix on galar routes and some newer unova hidden grotto areas --- data/v2/csv/location_area_prose.csv | 54 ++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 5f5813ac4..b598c5fa2 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2176,20 +2176,20 @@ location_area_id,local_language_id,name 842,9,Sinjoy Ruins 842,6,Sinjoh-Ruinen 842,5,Ruines Sinjoh -843,9,Galar Route 1 -844,9,Galar Route 2 -845,9,Galar Route 3 (East) -847,9,Galar Route 4 -848,9,Galar Route 5 -849,9,Galar Route 6 -850,9,Galar Route 7 -851,9,Galar Route 8 (Main) -852,9,Galar Route 8 (Steamdrift Way) -853,9,Galar Route 9 (Main) -854,9,Galar Route 9 (Circhester Bay) -855,9,Galar Route 9 (Outer Spikemuth) -856,9,Galar Route 10 (Main) -857,9,Galar Route 10 (Near Station) +843,9,Route 1 +844,9,Route 2 +845,9,Route 3 (East) +847,9,Route 4 +848,9,Route 5 +849,9,Route 6 +850,9,Route 7 +851,9,Route 8 (Main) +852,9,Route 8 (Steamdrift Way) +853,9,Route 9 (Main) +854,9,Route 9 (Circhester Bay) +855,9,Route 9 (Outer Spikemuth) +856,9,Route 10 (Main) +857,9,Route 10 (Near Station) 861,9,Battle Tower 869,9,Circhester 876,9,Fields of Honor @@ -2406,19 +2406,19 @@ location_area_id,local_language_id,name 1337,9,Friend Safari (Dark) 1338,9,Friend Safari (Steel) 1339,9,Friend Safari (Fairy) -1340,9, Route 2 (Hidden Grotto) -1341,9,Unova Route 3 (Hidden Grotto – Dark Grass) -1342,9,Unova Route 3 (Hidden Grotto – Pond) -1343,9,Unova Route 5 (Hidden Grotto) -1344,9,Unova Route 6 (Hidden Grotto – Near Pokemon Breeder) -1345,9,Unova Route 6 (Hidden Grotto – Mistralton Cave) -1346,9,Unova Route 7 (Hidden Grotto) -1347,9,Unova Route 9 (Hidden Grotto) -1348,9,Unova Route 13 (Hidden Grotto – Giant Chasm) -1349,9,Unova Route 13 (Hidden Grotto – Stairs) -1350,9,Unova Route 18 (Hidden Grotto) -1351,9,Unova Route 22 (Hidden Grotto) -1352,9,Unova Route 23 (Hidden Grotto) +1340,9,Route 2 (Hidden Grotto) +1341,9,Route 3 (Hidden Grotto – Dark Grass) +1342,9,Route 3 (Hidden Grotto – Pond) +1343,9,Route 5 (Hidden Grotto) +1344,9,Route 6 (Hidden Grotto – Near Pokemon Breeder) +1345,9,Route 6 (Hidden Grotto – Mistralton Cave) +1346,9,Route 7 (Hidden Grotto) +1347,9,Route 9 (Hidden Grotto) +1348,9,Route 13 (Hidden Grotto – Giant Chasm) +1349,9,Route 13 (Hidden Grotto – Stairs) +1350,9,Route 18 (Hidden Grotto) +1351,9,Route 22 (Hidden Grotto) +1352,9,Route 23 (Hidden Grotto) 1353,9,Floccesy Ranch (Hidden Grotto) 1354,9,Lostlorn Forest (Hidden Grotto) 1355,9,Giant Chasm (Hidden Grotto) From bb93f15db133fecb278a623cf7714ad36f9448fd Mon Sep 17 00:00:00 2001 From: Justin Marquez Date: Wed, 24 Jun 2026 11:19:02 -0500 Subject: [PATCH 89/89] fix: be more specific on weather encounter condition --- data/v2/csv/encounter_condition_prose.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv index 763f0c603..32585effe 100644 --- a/data/v2/csv/encounter_condition_prose.csv +++ b/data/v2/csv/encounter_condition_prose.csv @@ -43,4 +43,4 @@ encounter_condition_id,local_language_id,name 22,9,Bug-Catching Contest 23,9,Have save data from another Pokémon game 24,9,Find a certain number of Alolan Diglett in Isle of Armor -25,9,Specific weather +25,9,"During specific weather conditions like sun, rain, or snow"