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 b0e956437..ea3be036b 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
@@ -53,4 +53,4 @@ 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
diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 4dadc4684..42cc27435 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1497,3 +1497,122 @@ 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,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
+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,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
+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,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
+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
+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
+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,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
+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
+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
+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,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
+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 9d7da05b5..2a2a1afe6 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -69426,3 +69426,290 @@ 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,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
+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
+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
+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
+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
+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
+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
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 5a2e4b54d..f90cd7c8d 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -2176,6 +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
+882,9,Galar Mine
+883,9,Galar Mine No. 2
+891,9,Glimwood Tangle
+896,9,Hulbury
+906,9,Motostoke
+907,9,Motostoke Outskirts
+939,9,Turffield
+942,9,Wegehurst
 1167,9,Lighthouse Basement
 1167,6,Leuchtturm Keller
 1167,5,Phare de la Liberté
@@ -2395,3 +2409,7 @@ 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)
+1368,9,Route 3 (West)
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 8aec81801..2310d9aeb 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -724,9 +724,8 @@ id,location_id,game_index,identifier
 841,237,0,
 842,247,0,
 843,868,0,
-844,869,0,
-845,870,0,main
-846,870,0,garbage
+844,869,0,main
+845,870,0,east
 847,871,0,
 848,872,0,
 849,873,0,
@@ -786,7 +785,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,
@@ -1245,3 +1244,7 @@ id,location_id,game_index,identifier
 1362,175,0,
 1363,243,0,
 1364,347,0,
+1365,869,0,lake
+1366,869,0,lakeside
+1367,918,0,gym
+1368,870,0,west