Xd encounters trades

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
+14,9,Special encounter
+15,9,Trade a specific Pokemon to an NPC!

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

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
+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!

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

data/v2/csv/encounter_conditions.csv

@@ -13,3 +13,4 @@ id,identifier
 12,weekday
 13,first-party-pokemon
 14,special-encounter
+15,trade

data/v2/csv/encounter_method_prose.csv

@@ -97,3 +97,6 @@ encounter_method_id,local_language_id,name
 48,9,Receiving a Manaphy from Pokemon Ranger
 49,9,"Receiving a Pikachu, Electivire, or Magmar from Pokemon Battle Revolution"
 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."

data/v2/csv/encounter_methods.csv

@@ -49,3 +49,6 @@ id,identifier,order
 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

data/v2/csv/encounter_slots.csv

@@ -1361,4 +1361,13 @@ id,version_group_id,encounter_method_id,slot,rarity
 1360,16,1,1,60
 1361,16,1,2,30
 1362,16,1,3,10
-1363,16,6,1,100
+1363,16,6,1,100
+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

data/v2/csv/encounters.csv

@@ -65367,4 +65367,191 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70926,25,1231,1352,402,36,38
 70927,25,1231,1353,636,36,38
 70928,26,1231,1352,402,36,38
-70929,26,1231,1353,636,36,38
+70929,26,1231,1353,636,36,38
+70930,19,1232,1365,196,25,25
+70931,19,1232,1365,197,26,26
+70932,19,1233,1364,296,30,30
+70933,19,1234,1366,153,30,30
+70934,19,1235,1366,153,30,30
+70935,19,1236,1364,153,30,30
+70936,19,1234,1366,156,30,30
+70937,19,1235,1366,156,30,30
+70938,19,1237,1364,156,30,30
+70939,19,1234,1366,159,30,30
+70940,19,1235,1366,159,30,30
+70941,19,1238,1364,159,30,30
+70942,19,1239,1364,200,30,30
+70943,19,1239,1364,218,30,30
+70944,19,1239,1364,164,30,30
+70945,19,1239,1364,180,30,30
+70946,19,1239,1364,188,30,30
+70947,19,1239,1364,195,30,30
+70948,19,1240,1364,162,33,33
+70949,19,1234,1366,193,33,33
+70950,19,1241,1364,193,33,33
+70951,19,1242,1366,223,20,20
+70952,19,1243,1364,223,20,20
+70953,19,1242,1366,226,33,33
+70954,19,1243,1364,226,33,33
+70955,19,1244,1364,211,33,33
+70956,19,1245,1364,206,33,33
+70957,19,1246,1364,307,33,33
+70958,19,1247,1364,333,33,33
+70959,19,1248,1366,185,35,35
+70960,19,1242,1364,185,35,35
+70961,19,1250,1365,311,13,13
+70962,19,1234,1366,237,38,38
+70963,19,1251,1366,237,38,38
+70964,19,1252,1364,237,38,38
+70965,19,1248,1366,244,40,40
+70966,19,1260,1366,244,40,40
+70967,19,1254,1364,244,40,40
+70968,19,1234,1366,166,40,40
+70969,19,1255,1364,166,40,40
+70970,19,1248,1366,245,40,40
+70971,19,1260,1366,245,40,40
+70972,19,1256,1364,245,40,40
+70973,19,1234,1366,207,43,43
+70974,19,1257,1364,207,43,43
+70975,19,1234,1366,215,43,43
+70976,19,1257,1364,215,43,43
+70977,19,1234,1366,221,43,43
+70978,19,1257,1364,221,43,43
+70979,19,1234,1366,234,43,43
+70980,19,1257,1364,234,43,43
+70981,19,1235,1364,168,43,43
+70982,19,1251,1364,190,43,43
+70983,19,1251,1364,198,43,43
+70984,19,1235,1364,205,43,43
+70985,19,1235,1364,210,43,43
+70986,19,1251,1364,329,43,43
+70987,19,1248,1366,243,40,40
+70988,19,1260,1366,243,40,40
+70989,19,1235,1364,243,40,40
+70990,19,1234,1366,192,45,45
+70991,19,1248,1364,192,45,45
+70992,19,1234,1366,225,45,45
+70993,19,1248,1364,225,45,45
+70994,19,1234,1366,214,45,45
+70995,19,1248,1364,214,45,45
+70996,19,1258,1366,227,47,47
+70997,19,1248,1364,227,47,47
+70998,19,1259,1364,241,48,48
+70999,19,1259,1364,359,48,48
+71000,19,1259,1364,229,48,48
+71001,19,1259,1364,357,49,49
+71002,19,1259,1364,376,50,50
+71003,19,1259,1364,248,55,55
+71004,19,1258,1364,235,45,45
+71005,19,1258,1364,217,45,45
+71006,19,1260,1364,213,45,45
+71007,19,1232,1364,176,20,20
+71008,19,1261,1365,250,70,70
+71009,19,1262,1364,175,20,20
+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

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

data/v2/csv/location_area_prose.csv

@@ -2285,4 +2285,72 @@ location_area_id,local_language_id,name
 1228,9,Mirage Forest (North of Route 124)
 1229,9,Mirage Forest (West of Route 114)
 1230,9,Mirage Forest (West of Route 105)
-1231,9,Mirage Forest (South of Route 111)
+1231,9,Mirage Forest (South of Route 111)
+1232,9,Outskirt Stand (Outside)
+1233,9,Phenac City (Mayor's House)
+1234,9,Snagem Hideout 1F
+1235,9,Shadow Pokémon Lab B2F
+1236,9,Phenac City (West Exit)
+1237,9,Phenac City (East Exit)
+1238,9,Phenac City (South Exit)
+1239,9,Pyrite Town (Duel Square)
+1240,9,Pyrite Town (Entrance)
+1241,9,Pyrite Bldg 1F
+1242,9,Pyrite Cave (Miror's Hideout)
+1243,9,Pyrite Bldg 4F
+1244,9,Pyrite Cave (Outside)
+1245,9,Pyrite Cave (South Sewers)
+1246,9,Pyrite Cave B1F
+1247,9,Pyrite Cave B1F (Post Sewers)
+1248,9,Realgam Tower
+1249,9,Phenac City Colosseum
+1250,9,Pyrite Town (Duking's House)
+1251,9,Shadow Pokémon Lab B1F
+1252,9,Agate Village (Relic Forest)
+1253,9,The Under Colosseum
+1254,9,Mt. Battle 10F
+1255,9,The Under
+1256,9,The Under (TV Studio)
+1257,9,The Under (Subway)
+1258,9,Snagem Hideout 2F
+1259,9,Realgam Tower Colosseum
+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)