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 a0225952e..e68d505bf 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1487,3 +1487,39 @@ id,version_group_id,encounter_method_id,slot,rarity
 1486,10,7,5,5
 1487,10,7,6,5
 1488,14,36,,100
+1489,16,5,,60
+1490,16,5,,35
+1491,16,5,,5
+1492,16,2,,65
+1493,16,2,,35
+1494,16,3,,60
+1495,16,3,,35
+1496,16,3,,5
+1497,16,4,,100
+1498,16,5,,50
+1499,16,5,,31
+1500,16,5,,15
+1501,16,5,,4
+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,,95
+1509,16,5,,5
+1510,16,2,,100
+1511,16,3,,100
+1512,16,4,,100
+1513,16,5,,65
+1514,16,5,,30
+1515,16,5,,5
+1516,16,2,,65
+1517,16,2,,35
+1518,16,3,,60
+1519,16,3,,35
+1520,16,3,,5
+1521,16,4,,100
+1522,16,56,,60
+1523,16,56,,35
+1524,16,56,,5
\ No newline at end of file
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 5cdcd997a..45b64c665 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -69346,3 +69346,137 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 75208,14,118,130,183,22,22
 75209,14,118,130,113,22,22
 75210,14,118,130,298,22,22
+75211,25,395,1489,72,20,25
+75212,25,395,1490,278,20,20
+75213,25,395,1491,279,25,30
+75214,25,395,1492,129,10,15
+75215,25,395,1493,72,5,5
+75216,25,395,1494,129,25,25
+75217,25,395,1495,72,25,25
+75218,25,395,1496,320,25,25
+75219,25,395,1497,320,30,40
+75220,26,395,1489,72,20,25
+75221,26,395,1490,278,20,20
+75222,26,395,1491,279,25,30
+75223,26,395,1492,129,10,15
+75224,26,395,1493,72,5,5
+75225,26,395,1494,129,25,25
+75226,26,395,1495,72,25,25
+75227,26,395,1496,320,25,25
+75228,26,395,1497,320,30,40
+75229,25,394,1498,183,15,15
+75230,25,394,1499,184,20,25
+75231,25,394,1500,283,20,20
+75232,25,394,1501,284,25,25
+75233,25,394,1502,129,10,15
+75234,25,394,1503,118,5,5
+75235,25,394,1504,129,25,25
+75236,25,394,1505,118,25,25
+75237,25,394,1506,341,25,25
+75238,25,394,1507,341,30,40
+75239,26,394,1498,183,15,15
+75240,26,394,1499,184,20,25
+75241,26,394,1500,283,20,20
+75242,26,394,1501,284,25,25
+75243,26,394,1502,129,10,15
+75244,26,394,1503,118,5,5
+75245,26,394,1504,129,25,25
+75246,26,394,1505,118,25,25
+75247,26,394,1506,341,25,25
+75248,26,394,1507,341,30,40
+75249,25,350,1498,183,15,15
+75250,25,350,1499,184,20,25
+75251,25,350,1500,283,15,15
+75252,25,350,1501,284,25,25
+75253,25,350,1502,129,10,15
+75254,25,350,1503,118,5,5
+75255,25,350,1504,129,25,25
+75256,25,350,1505,118,25,25
+75257,25,350,1506,341,25,25
+75258,25,350,1507,341,30,40
+75259,26,350,1498,183,15,15
+75260,26,350,1499,184,20,25
+75261,26,350,1500,283,20,20
+75262,26,350,1501,284,25,25
+75263,26,350,1502,129,10,15
+75264,26,350,1503,118,5,5
+75265,26,350,1504,129,25,25
+75266,26,350,1505,118,25,25
+75267,26,350,1506,341,25,25
+75268,26,350,1507,341,30,40
+75269,25,396,1508,278,15,20
+75270,25,396,1509,279,25,25
+75271,25,396,1510,129,5,15
+75272,25,396,1511,129,25,25
+75273,25,396,1512,129,30,40
+75274,26,396,1508,278,15,20
+75275,26,396,1509,279,25,25
+75276,26,396,1510,129,5,15
+75277,26,396,1511,129,25,25
+75278,26,396,1512,129,30,40
+75279,25,397,1513,72,20,25
+75280,25,397,1514,278,20,20
+75281,25,397,1515,279,25,30
+75282,25,397,1516,129,10,15
+75283,25,397,1517,72,5,5
+75284,25,397,1518,129,25,25
+75285,25,397,1519,72,25,25
+75286,25,397,1520,320,25,25
+75287,25,397,1521,320,30,40
+75288,26,397,1513,72,20,25
+75289,26,397,1514,278,20,20
+75290,26,397,1515,279,25,30
+75291,26,397,1516,129,10,15
+75292,26,397,1517,72,5,5
+75293,26,397,1518,129,25,25
+75294,26,397,1519,72,25,25
+75295,26,397,1520,320,25,25
+75296,26,397,1521,320,30,40
+75297,25,397,1522,592,25,25
+75298,26,397,1522,592,25,25
+75299,25,397,1523,690,25,25
+75300,26,397,1523,692,25,25
+75301,25,397,1524,98,25,25
+75302,26,397,1524,98,25,25
+75303,25,398,1513,72,20,25
+75304,25,398,1514,278,20,20
+75305,25,398,1515,279,25,30
+75306,25,398,1516,129,10,15
+75307,25,398,1517,72,5,5
+75308,25,398,1518,129,25,25
+75309,25,398,1519,72,25,25
+75310,25,398,1520,320,25,25
+75311,25,398,1521,320,30,40
+75312,26,398,1513,72,20,25
+75313,26,398,1514,278,20,20
+75314,26,398,1515,279,25,30
+75315,26,398,1516,129,10,15
+75316,26,398,1517,72,5,5
+75317,26,398,1518,129,25,25
+75318,26,398,1519,72,25,25
+75319,26,398,1520,320,25,25
+75320,26,398,1521,320,30,40
+75321,25,398,1522,592,25,25
+75322,26,398,1522,592,25,25
+75323,25,398,1523,690,25,25
+75324,26,398,1523,692,25,25
+75325,25,398,1524,98,25,25
+75326,26,398,1524,98,25,25
+75327,25,351,1513,72,20,25
+75328,25,351,1514,278,20,20
+75329,25,351,1515,279,25,30
+75330,25,351,1516,129,10,15
+75331,25,351,1517,72,5,5
+75332,25,351,1518,129,25,25
+75333,25,351,1519,72,25,25
+75334,25,351,1520,320,25,25
+75335,25,351,1521,320,30,40
+75336,26,351,1513,72,20,25
+75337,26,351,1514,278,20,20
+75338,26,351,1515,279,25,30
+75339,26,351,1516,129,10,15
+75340,26,351,1517,72,5,5
+75341,26,351,1518,129,25,25
+75342,26,351,1519,72,25,25
+75343,26,351,1520,320,25,25
+75344,26,351,1521,320,30,40
\ No newline at end of file