diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv
index 6742f60cb..f139cd6bb 100644
--- a/data/v2/csv/encounter_condition_prose.csv
+++ b/data/v2/csv/encounter_condition_prose.csv
@@ -32,4 +32,5 @@ encounter_condition_id,local_language_id,name
 13,5,Premier Pokemon de l'équipe
 13,9,First party Pokemon
 14,5,Rencontre spéciale
-14,9,Special encounter
\ No newline at end of file
+14,9,Special encounter
+15,9,Trade a specific Pokemon to an NPC!
diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index aa66ec96f..4413d8e96 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -18084,3 +18084,11 @@ encounter_id,encounter_condition_value_id
 69576,108
 69610,108
 69611,108
+71105,109
+71106,110
+71107,111
+71108,112
+71095,113
+71109,114
+71110,114
+71111,114
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index 7b50a043c..761e9cb95 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -228,4 +228,10 @@ encounter_condition_value_id,local_language_id,name
 104,9,Have Dialga and Palkia in party
 104,5,Avoir Dialga et Palkia dans l'équipe
 105,9,Scan a specific QR Code
-105,5,Scanner un code QR spécifique
\ No newline at end of file
+105,5,Scanner un code QR spécifique
+109,9,Trade Danny the Purified Shadow Togepi for an Elekid
+110,9,Trade Duking a Trapinch for a Meditite from a Pokespot
+111,9,Trade Duking a Surskit for a Shuckle from a Pokespot
+112,9,Trade Duking a Wooper for a Larvitar from a Pokespot
+113,9,Catch all 82 Shadow Pokemon and Mirror B will appear in Gateon with a Shadow Dragonite
+114,9,Complete Mt. Battle to receive a special prize Pokemon!
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index 5c23cee9a..9c343e397 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -107,3 +107,9 @@ id,encounter_condition_id,identifier,is_default
 106,10,other-caught-articuno,0
 107,10,other-caught-zapdos,0
 108,10,other-caught-moltres,0
+109,15,trade-danny-togepi,0
+110,15,trade-duking-trapinch,0
+111,15,trade-duking-surskit,0
+112,15,trade-duking-wooper,0
+113,9,story-progress-catch-all-shadow-pokemon,0
+114,9,other-complete-mt-battle,0
diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv
index d297a4937..b5411b5d9 100644
--- a/data/v2/csv/encounter_conditions.csv
+++ b/data/v2/csv/encounter_conditions.csv
@@ -13,3 +13,4 @@ id,identifier
 12,weekday
 13,first-party-pokemon
 14,special-encounter
+15,trade
diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv
index b8b735815..f535b5c81 100644
--- a/data/v2/csv/encounter_method_prose.csv
+++ b/data/v2/csv/encounter_method_prose.csv
@@ -99,3 +99,4 @@ encounter_method_id,local_language_id,name
 50,9,Receiving an egg from the Pokemon center in New York City that contains the special move Wish.
 51,9,"Snagging a Pokemon from a trainer in Pokemon Colosseum or Pokemon XD: Gale of Darkness."
 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."
diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv
index 6747ce111..6288b54e5 100644
--- a/data/v2/csv/encounter_methods.csv
+++ b/data/v2/csv/encounter_methods.csv
@@ -51,3 +51,4 @@ id,identifier,order
 50,new-york-pokecenter-wish-eggs,50
 51,snag,51
 52,snag-rematch,52
+53,pokespot,53
diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 5f4677f4c..a9b363dd6 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1365,3 +1365,9 @@ id,version_group_id,encounter_method_id,slot,rarity
 1364,12,51,,100
 1365,12,18,,100
 1366,12,52,,100
+1367,13,51,,100
+1368,13,18,,100
+1369,13,53,1,50
+1370,13,53,2,35
+1371,13,53,3,15
+1372,13,36,,100
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 1a8bb7484..9a5bbbeed 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65451,3 +65451,107 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 71010,19,1262,1364,179,37,37
 71011,19,1262,1364,212,50,50
 71012,19,1260,1366,185,35,35
+71013,20,1263,1368,133,10,10
+71014,20,1264,1367,216,11,11
+71015,20,1265,1367,165,10,10
+71016,20,1266,1367,261,10,10
+71017,20,1267,1367,228,17,17
+71018,20,1267,1367,343,17,17
+71019,20,1267,1367,363,17,17
+71020,20,1267,1367,179,17,17
+71021,20,1267,1367,316,17,17
+71022,20,1267,1367,273,17,17
+71023,20,1268,1367,167,14,14
+71024,20,1269,1367,322,14,14
+71025,20,1269,1367,285,15,15
+71026,20,1269,1367,318,15,15
+71027,20,1269,1367,301,18,18
+71028,20,1270,1367,100,19,19
+71029,20,1271,1367,296,18,18
+71030,20,1271,1367,37,18,18
+71031,20,1272,1367,355,19,19
+71032,20,1273,1367,280,20,20
+71033,20,1274,1367,303,22,22
+71034,20,1233,1367,361,20,20
+71035,20,1233,1367,204,20,20
+71036,20,1275,1367,177,22,22
+71037,20,1275,1367,315,22,22
+71038,20,1275,1367,52,22,22
+71039,20,1299,1367,220,22,22
+71040,20,1249,1367,21,22,22
+71041,20,1249,1367,88,23,23
+71042,20,1249,1367,86,23,23
+71043,20,1249,1367,337,25,25
+71044,20,1298,1367,299,26,26
+71045,20,1276,1367,335,28,28
+71046,20,1277,1367,46,28,28
+71047,20,1277,1367,58,28,28
+71048,20,1278,1367,90,29,29
+71049,20,1279,1367,15,30,30
+71050,20,1279,1367,17,30,30
+71051,20,1280,1367,114,30,30
+71052,20,1280,1367,12,30,30
+71053,20,1280,1367,82,30,30
+71054,20,1281,1367,49,32,32
+71055,20,1281,1367,70,32,32
+71056,20,1281,1367,24,33,33
+71057,20,1282,1367,57,34,34
+71058,20,1282,1367,97,34,34
+71059,20,1283,1367,55,33,33
+71060,20,1283,1367,302,33,33
+71061,20,1284,1367,20,34,34
+71062,20,1284,1367,85,34,34
+71063,20,1284,1367,83,36,36
+71064,20,1284,1367,334,36,36
+71065,20,1285,1367,115,36,36
+71066,20,1285,1367,354,37,37
+71067,20,1286,1367,126,36,36
+71068,20,1286,1367,127,35,35
+71069,20,1287,1367,219,38,38
+71070,20,1287,1367,78,40,40
+71071,20,1287,1367,106,38,38
+71072,20,1287,1367,107,38,38
+71073,20,1288,1367,108,38,38
+71074,20,1288,1367,123,40,40
+71075,20,1288,1367,113,39,39
+71076,20,1289,1367,338,41,41
+71077,20,1289,1367,121,41,41
+71078,20,1289,1367,125,43,43
+71079,20,1289,1367,277,43,43
+71080,20,1289,1367,143,43,43
+71081,20,1289,1367,62,43,43
+71082,20,1289,1367,122,43,43
+71083,20,1290,1367,51,40,40
+71084,20,1291,1367,310,44,44
+71085,20,1291,1367,373,50,50
+71086,20,1291,1367,105,44,44
+71087,20,1291,1367,131,44,44
+71088,20,1292,1367,249,50,50
+71089,20,1292,1367,144,50,50
+71090,20,1292,1367,145,50,50
+71091,20,1292,1367,146,50,50
+71092,20,1292,1367,128,46,46
+71093,20,1292,1367,112,46,46
+71094,20,1292,1367,103,46,46
+71095,20,1266,1367,149,55,55
+71096,20,1294,1369,27,10,23
+71097,20,1294,1370,207,10,20
+71098,20,1294,1371,328,10,20
+71099,20,1295,1369,187,10,20
+71100,20,1295,1370,231,10,20
+71101,20,1295,1371,283,10,20
+71102,20,1270,1369,41,10,21
+71103,20,1270,1370,304,10,21
+71104,20,1270,1371,194,10,21
+71105,20,1297,1372,239,20,20
+71106,20,1250,1372,307,20,20
+71107,20,1250,1372,213,20,20
+71108,20,1250,1372,246,20,20
+71109,20,1296,1368,152,5,5
+71110,20,1296,1368,155,5,5
+71111,20,1296,1368,158,5,5
+71112,20,1297,1368,175,25,25
+71113,20,1294,1367,299,26,26
+71114,20,1295,1367,299,26,26
+71115,20,1270,1367,299,26,26
+71116,20,1259,1367,299,26,26
diff --git a/data/v2/csv/location_area_encounter_rates.csv b/data/v2/csv/location_area_encounter_rates.csv
index 4e738dae3..ed1f8a7c6 100644
--- a/data/v2/csv/location_area_encounter_rates.csv
+++ b/data/v2/csv/location_area_encounter_rates.csv
@@ -3877,3 +3877,12 @@ location_area_id,encounter_method_id,version_id,rate
 1206,1,7,10
 1206,1,8,10
 1206,1,9,10
+1270,53,20,50
+1270,53,20,35
+1270,53,20,15
+1294,53,20,50
+1294,53,20,35
+1294,53,20,15
+1295,53,20,50
+1295,53,20,35
+1295,53,20,15
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 9c3ccd2a0..9ca529fd5 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -2317,3 +2317,40 @@ location_area_id,local_language_id,name
 1260,9,The Under (Deep Colosseum)
 1261,9,Mt. Battle 100F
 1262,9,Phenac City (Card E Room)
+1263,9,Pokemon HQ Lab 
+1264,9,Pokemon HQ Lab (Outside)
+1265,9,Gateon Port (Across Bridge)
+1266,9,Gateon Port (Lighthouse Top)
+1267,9,Cipher Lab (Outside)
+1268,9,Cipher Lab B2F
+1269,9,Cipher Lab B1F
+1270,9,Cave Pokespot 
+1271,9,ONBS 2F
+1272,9,ONBS 3F
+1273,9,ONBS Roof
+1274,9,ONBS 4F
+1275,9,Phenac City Prestige Precept Center
+1276,9,Cipher Key Lair (Outside)
+1277,9,Cipher Key Lair 1F
+1278,9,Cipher Key Lair 2F
+1279,9,Cipher Key Lair 3F
+1280,9,Cipher Key Lair 4F
+1281,9,Cipher Key Lair Roof
+1282,9,Cipher Key Lair 5F
+1283,9,Citadark Isle (Outside)
+1284,9,Citadark Isle 1F
+1285,9,Citadark Isle B1F
+1286,9,Citadark Isle 2F
+1287,9,Citadark Isle 3F
+1288,9,Citadark Isle 6F
+1289,9,Citadark Isle Dome Exterior
+1290,9,Citadark Isle Dome B1F
+1291,9,Citadark Isle Dome 1F
+1292,9,Citadark Isle Dome 2F
+1293,9,Gateon Port 
+1294,9,Rock Pokespot 
+1295,9,Oasis Pokespot 
+1296,9,Mt. Battle Lobby
+1297,9,Outskirt Stand (Inside)
+1298,9,Pyrite Town Colosseum
+1299,9,Phenac City Colosseum (Outside)
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 5e195e4e0..a1e798470 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1151,3 +1151,40 @@ id,location_id,game_index,identifier
 1260,1104,0,deep-colosseum
 1261,1105,0,100f
 1262,1096,0,card-e-room
+1263,1106,0,
+1264,1106,0,outside
+1265,1107,0,across-bridge
+1266,1107,0,lighthouse-top
+1267,1108,0,outside
+1268,1108,0,bf2
+1269,1108,0,bf1
+1270,1109,0,
+1271,1110,0,2f
+1272,1110,0,3f
+1273,1110,0,roof
+1274,1110,0,4f
+1275,1096,0,prestige-precept-center
+1276,1111,0,outside
+1277,1111,0,1f
+1278,1111,0,2f
+1279,1111,0,3f
+1280,1111,0,4f
+1281,1111,0,roof
+1282,1111,0,5f
+1283,1112,0,outside
+1284,1112,0,1f
+1285,1112,0,bf1
+1286,1112,0,2f
+1287,1112,0,3f
+1288,1112,0,6f
+1289,1112,0,dome-exterior
+1290,1112,0,dome-bf1
+1291,1112,0,dome-1f
+1292,1112,0,dome-2f
+1293,1107,0,
+1294,1113,0,
+1295,1114,0,
+1296,1105,0,lobby
+1297,1095,0,inside
+1298,1099,0,colosseum
+1299,1096,0,colosseum-outside
\ No newline at end of file
diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv
index a183f0245..2b3c8a9d1 100644
--- a/data/v2/csv/location_names.csv
+++ b/data/v2/csv/location_names.csv
@@ -4948,4 +4948,13 @@ location_id,local_language_id,name,subtitle
 1102,9,Realgam Tower,
 1103,9,Agate Village,
 1104,9,The Under,
-1105,9,Mt. Battle,
\ No newline at end of file
+1105,9,Mt. Battle,
+1106,9,Pokemon Hq Lab,
+1107,9,Gateon Port,
+1108,9,Cipher Lab,
+1109,9,Cave Pokespot,
+1110,9,ONBS,
+1111,9,Cipher Key Lair,
+1112,9,Citadark Isle,
+1113,9,Rock Pokespot,
+1114,9,Oasis Pokespot,
\ No newline at end of file
diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv
index 2e6006579..9fa6b406f 100644
--- a/data/v2/csv/locations.csv
+++ b/data/v2/csv/locations.csv
@@ -1087,3 +1087,12 @@ id,region_id,identifier
 1103,11,agate-village
 1104,11,the-under
 1105,11,mt-battle
+1106,11,pokemon-hq-lab
+1107,11,gateon-port
+1108,11,cipher-lab
+1109,11,cave-pokespot
+1110,11,onbs
+1111,11,cipher-key-lair
+1112,11,citadark-isle
+1113,11,rock-pokespot
+1114,11,oasis-pokespot
diff --git a/data/v2/csv/pokemon_items.csv b/data/v2/csv/pokemon_items.csv
index 0e62ddcff..625ede1c7 100644
--- a/data/v2/csv/pokemon_items.csv
+++ b/data/v2/csv/pokemon_items.csv
@@ -5426,3 +5426,24 @@ pokemon_id,version_id,item_id,rarity
 227,19,221,100
 376,19,210,100
 248,19,92,100
+322,20,226,100
+318,20,217,100
+100,20,219,100
+280,20,225,100
+220,20,223,100
+21,20,221,100
+86,20,220,100
+337,20,215,100
+335,20,228,100
+15,20,222,100
+114,20,216,100
+82,20,210,100
+49,20,199,100
+83,20,236,100
+334,20,227,100
+354,20,224,100
+106,20,218,100
+113,20,233,100
+143,20,211,100
+51,20,214,100
+105,20,235,100