diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv
index a0dff6952..f4623409a 100644
--- a/data/v2/csv/encounter_method_prose.csv
+++ b/data/v2/csv/encounter_method_prose.csv
@@ -101,4 +101,6 @@ 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.
+56,9,Surfing and using the PokéNav Plus in Pokémon Omega Ruby and Alpha Sapphire
+56,6,Surfen und das Poké-Multi-Navi nutzen in Pokémon Omega Rubin und Alpha Saphire
\ No newline at end of file
diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv
index b0e956437..d33ef1636 100644
--- a/data/v2/csv/encounter_methods.csv
+++ b/data/v2/csv/encounter_methods.csv
@@ -43,14 +43,15 @@ id,identifier,order
 42,overworld-flying-special,42
 43,overworld-water-special,43
 44,horde,44
-45,colosseum-bonus-disc-us, 45
-46,colosseum-bonus-disc-jpn, 46
-47,pokemon-channel-pal, 47
-48,pokemon-ranger, 48
-49,pokemon-battle-revolution, 49
+45,colosseum-bonus-disc-us,45
+46,colosseum-bonus-disc-jpn,46
+47,pokemon-channel-pal,47
+48,pokemon-ranger,48
+49,pokemon-battle-revolution,49
 50,new-york-pokecenter-wish-eggs,50
 51,snag,51
 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,poke-nav-surfing,55
\ No newline at end of file
diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 4dadc4684..4eb29391e 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1497,3 +1497,43 @@ 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,16,5,,60
+1500,16,5,,35
+1501,16,5,,5
+1502,16,2,,65
+1503,16,2,,35
+1504,16,3,,60
+1505,16,3,,35
+1506,16,3,,5
+1507,16,4,,100
+1508,16,5,,50
+1509,16,5,,31
+1510,16,5,,15
+1511,16,5,,4
+1512,16,2,,65
+1513,16,2,,35
+1514,16,3,,60
+1515,16,3,,35
+1516,16,3,,5
+1517,16,4,,100
+1518,16,5,,95
+1519,16,5,,5
+1520,16,2,,100
+1521,16,3,,100
+1522,16,4,,100
+1523,16,5,,65
+1524,16,5,,30
+1525,16,5,,5
+1526,16,2,,65
+1527,16,2,,35
+1528,16,3,,60
+1529,16,3,,35
+1530,16,3,,5
+1531,16,4,,100
+1532,16,56,,60
+1533,16,56,,35
+1534,16,56,,5
+1535,16,27,,50
+1536,16,27,,30
+1537,16,27,,15
+1538,16,27,,5
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 9d7da05b5..defeeac1a 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -69426,3 +69426,239 @@ 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,25,395,1499,72,20,25
+75292,25,395,1500,278,20,20
+75293,25,395,1501,279,25,30
+75294,25,395,1502,129,10,15
+75295,25,395,1503,72,5,5
+75296,25,395,1504,129,25,25
+75297,25,395,1505,72,25,25
+75298,25,395,1506,320,25,25
+75299,25,395,1507,320,30,40
+75300,26,395,1499,72,20,25
+75301,26,395,1500,278,20,20
+75302,26,395,1501,279,25,30
+75303,26,395,1502,129,10,15
+75304,26,395,1503,72,5,5
+75305,26,395,1504,129,25,25
+75306,26,395,1505,72,25,25
+75307,26,395,1506,320,25,25
+75308,26,395,1507,320,30,40
+75309,25,394,1508,183,15,15
+75310,25,394,1509,184,20,25
+75311,25,394,1510,283,20,20
+75312,25,394,1511,284,25,25
+75313,25,394,1512,129,10,15
+75314,25,394,1513,118,5,5
+75315,25,394,1514,129,25,25
+75316,25,394,1515,118,25,25
+75317,25,394,1516,341,25,25
+75318,25,394,1517,341,30,40
+75319,26,394,1508,183,15,15
+75320,26,394,1509,184,20,25
+75321,26,394,1510,283,20,20
+75322,26,394,1511,284,25,25
+75323,26,394,1512,129,10,15
+75324,26,394,1513,118,5,5
+75325,26,394,1514,129,25,25
+75326,26,394,1515,118,25,25
+75327,26,394,1516,341,25,25
+75328,26,394,1517,341,30,40
+75329,25,350,1508,183,15,15
+75330,25,350,1509,184,20,25
+75331,25,350,1510,283,15,15
+75332,25,350,1511,284,25,25
+75333,25,350,1512,129,10,15
+75334,25,350,1513,118,5,5
+75335,25,350,1514,129,25,25
+75336,25,350,1515,118,25,25
+75337,25,350,1516,341,25,25
+75338,25,350,1517,341,30,40
+75339,26,350,1508,183,15,15
+75340,26,350,1509,184,20,25
+75341,26,350,1510,283,20,20
+75342,26,350,1511,284,25,25
+75343,26,350,1512,129,10,15
+75344,26,350,1513,118,5,5
+75345,26,350,1514,129,25,25
+75346,26,350,1515,118,25,25
+75347,26,350,1516,341,25,25
+75348,26,350,1517,341,30,40
+75349,25,396,1518,278,15,20
+75350,25,396,1519,279,25,25
+75351,25,396,1520,129,5,15
+75352,25,396,1521,129,25,25
+75353,25,396,1522,129,30,40
+75354,26,396,1518,278,15,20
+75355,26,396,1519,279,25,25
+75356,26,396,1520,129,5,15
+75357,26,396,1521,129,25,25
+75358,26,396,1522,129,30,40
+75359,25,397,1523,72,20,25
+75360,25,397,1524,278,20,20
+75361,25,397,1525,279,25,30
+75362,25,397,1526,129,10,15
+75363,25,397,1527,72,5,5
+75364,25,397,1528,129,25,25
+75365,25,397,1529,72,25,25
+75366,25,397,1530,320,25,25
+75367,25,397,1531,320,30,40
+75368,26,397,1523,72,20,25
+75369,26,397,1524,278,20,20
+75370,26,397,1525,279,25,30
+75371,26,397,1526,129,10,15
+75372,26,397,1527,72,5,5
+75373,26,397,1528,129,25,25
+75374,26,397,1529,72,25,25
+75375,26,397,1530,320,25,25
+75376,26,397,1531,320,30,40
+75377,25,397,1532,592,25,25
+75378,26,397,1532,592,25,25
+75379,25,397,1533,690,25,25
+75380,26,397,1533,692,25,25
+75381,25,397,1534,98,25,25
+75382,26,397,1534,98,25,25
+75383,25,398,1523,72,20,25
+75384,25,398,1524,278,20,20
+75385,25,398,1525,279,25,30
+75386,25,398,1526,129,10,15
+75387,25,398,1527,72,5,5
+75388,25,398,1528,129,25,25
+75389,25,398,1529,72,25,25
+75390,25,398,1530,320,25,25
+75391,25,398,1531,320,30,40
+75392,26,398,1523,72,20,25
+75393,26,398,1524,278,20,20
+75394,26,398,1525,279,25,30
+75395,26,398,1526,129,10,15
+75396,26,398,1527,72,5,5
+75397,26,398,1528,129,25,25
+75398,26,398,1529,72,25,25
+75399,26,398,1530,320,25,25
+75400,26,398,1531,320,30,40
+75401,25,398,1532,592,25,25
+75402,26,398,1532,592,25,25
+75403,25,398,1533,690,25,25
+75404,26,398,1533,692,25,25
+75405,25,398,1534,98,25,25
+75406,26,398,1534,98,25,25
+75407,25,351,1523,72,20,25
+75408,25,351,1524,278,20,20
+75409,25,351,1525,279,25,30
+75410,25,351,1526,129,10,15
+75411,25,351,1527,72,5,5
+75412,25,351,1528,129,25,25
+75413,25,351,1529,72,25,25
+75414,25,351,1530,320,25,25
+75415,25,351,1531,320,30,40
+75416,26,351,1523,72,20,25
+75417,26,351,1524,278,20,20
+75418,26,351,1525,279,25,30
+75419,26,351,1526,129,10,15
+75420,26,351,1527,72,5,5
+75421,26,351,1528,129,25,25
+75422,26,351,1529,72,25,25
+75423,26,351,1530,320,25,25
+75424,26,351,1531,320,30,40
+75425,25,399,1523,72,20,25
+75426,25,399,1524,278,20,20
+75427,25,399,1525,279,25,30
+75428,25,399,1526,129,10,15
+75429,25,399,1527,72,5,5
+75430,25,399,1528,129,25,25
+75431,25,399,1529,72,25,25
+75432,25,399,1530,320,25,25
+75433,25,399,1531,320,30,40
+75434,26,399,1523,72,20,25
+75435,26,399,1524,278,20,20
+75436,26,399,1525,279,25,30
+75437,26,399,1526,129,10,15
+75438,26,399,1527,72,5,5
+75439,26,399,1528,129,25,25
+75440,26,399,1529,72,25,25
+75441,26,399,1530,320,25,25
+75442,26,399,1531,320,30,40
+75443,25,399,1532,592,25,25
+75444,26,399,1532,592,25,25
+75445,25,399,1533,690,25,25
+75446,26,399,1533,692,25,25
+75447,25,399,1534,98,25,25
+75448,26,399,1534,98,25,25
+75449,25,399,1535,170,25,25
+75450,25,399,1536,366,30,30
+75451,25,399,1537,171,30,30
+75452,25,399,1538,369,30,35
+75453,26,399,1535,170,25,25
+75454,26,399,1536,366,30,30
+75455,26,399,1537,171,30,30
+75456,26,399,1538,369,30,35
+75457,25,400,1523,72,20,25
+75458,25,400,1524,278,20,20
+75459,25,400,1525,279,25,30
+75460,25,400,1526,129,10,15
+75461,25,400,1527,72,5,5
+75462,25,400,1528,129,25,25
+75463,25,400,1529,72,25,25
+75464,25,400,1530,320,25,25
+75465,25,400,1531,320,30,40
+75466,26,400,1523,72,20,25
+75467,26,400,1524,278,20,20
+75468,26,400,1525,279,25,30
+75469,26,400,1526,129,10,15
+75470,26,400,1527,72,5,5
+75471,26,400,1528,129,25,25
+75472,26,400,1529,72,25,25
+75473,26,400,1530,320,25,25
+75474,26,400,1531,320,30,40
+75475,25,400,1532,592,25,25
+75476,26,400,1532,592,25,25
+75477,25,400,1533,690,25,25
+75478,26,400,1533,692,25,25
+75479,25,400,1534,98,25,25
+75480,26,400,1534,98,25,25
+75481,25,401,1523,72,20,25
+75482,25,401,1524,278,20,20
+75483,25,401,1525,279,25,30
+75484,25,401,1526,129,10,15
+75485,25,401,1527,72,5,5
+75486,25,401,1528,129,25,25
+75487,25,401,1529,72,25,25
+75488,25,401,1530,320,25,25
+75489,25,401,1531,320,30,40
+75490,26,401,1523,72,20,25
+75491,26,401,1524,278,20,20
+75492,26,401,1525,279,25,30
+75493,26,401,1526,129,10,15
+75494,26,401,1527,72,5,5
+75495,26,401,1528,129,25,25
+75496,26,401,1529,72,25,25
+75497,26,401,1530,320,25,25
+75498,26,401,1531,320,30,40
+75499,25,401,1532,592,25,25
+75500,26,401,1532,592,25,25
+75501,25,401,1533,690,25,25
+75502,26,401,1533,692,25,25
+75503,25,401,1534,98,25,25
+75504,26,401,1534,98,25,25
+75505,25,433,1523,72,20,25
+75506,25,433,1524,278,20,20
+75507,25,433,1525,279,25,30
+75508,25,433,1526,129,10,15
+75509,25,433,1527,72,5,5
+75510,25,433,1528,129,25,25
+75511,25,433,1529,72,25,25
+75512,25,433,1530,320,25,25
+75513,25,433,1531,320,30,40
+75514,26,433,1523,72,20,25
+75515,26,433,1524,278,20,20
+75516,26,433,1525,279,25,30
+75517,26,433,1526,129,10,15
+75518,26,433,1527,72,5,5
+75519,26,433,1528,129,25,25
+75520,26,433,1529,72,25,25
+75521,26,433,1530,320,25,25
+75522,26,433,1531,320,30,40
+75523,16,236,1487,190,15,16
+75524,15,241,1482,163,15,16
+75525,16,241,1482,163,15,16
+75526,15,241,1483,204,15,16