diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv index 3841ebefa..e49100703 100644 --- a/data/v2/csv/encounter_condition_prose.csv +++ b/data/v2/csv/encounter_condition_prose.csv @@ -33,5 +33,5 @@ encounter_condition_id,local_language_id,name 13,9,First party Pokemon 14,5,Rencontre spéciale 14,9,Special encounter -15,9,Trade a specific Pokemon to an NPC! +15,9,Trade a specific Pokemon to an NPC 16,9,Redeem Coins for a Pokemon at the Prize Corner or Game Corner diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 3c25cfe4f..eba6c4d93 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -18195,3 +18195,22 @@ encounter_id,encounter_condition_value_id 71215,158 71216,159 71217,160 +71218,161 +71219,162 +71220,163 +71221,164 +71222,165 +71223,166 +71224,161 +71225,162 +71226,163 +71227,164 +71228,165 +71229,166 +71230,161 +71231,145 +71232,163 +71233,164 +71234,165 +71235,167 +71236,168 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index ef14ab0e0..106a58a0e 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -281,3 +281,11 @@ encounter_condition_value_id,local_language_id,name 158,9,Give Golduck in a Trade 159,9,Give Growlithe in a Trade 160,9,Give Kangaskhan in a Trade +161,9,Give Bellsprout in a Trade +162,9,Give Drowzee in a Trade +163,9,Give Krabby in a Trade +164,9,Give Dragonair in a Trade +165,9,Give Chansey in a Trade +166,9,Give Gloom in a Trade +167,9,Give Haunter in a Trade +168,9,Give Dugtrio in a Trade diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index 969bdaecf..dac456229 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -159,3 +159,11 @@ id,encounter_condition_id,identifier,is_default 158,15,trade-golduck,1 159,15,trade-growlithe,1 160,15,trade-kangaskhan,1 +161,15,trade-bellsprout,1 +162,15,trade-drowzee,1 +163,15,trade-krabby,1 +164,15,trade-dragonair,1 +165,15,trade-chansey,1 +166,15,trade-gloom,1 +167,15,trade-haunter,1 +168,15,trade-dugtrio,1 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 3feceb3a8..9120ce6e3 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1381,3 +1381,5 @@ id,version_group_id,encounter_method_id,slot,rarity 1380,29,18,,100 1381,1,36,,100 1382,2,36,,100 +1383,3,36,,100 +1384,4,36,,100 \ No newline at end of file diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 89c85a328..cd31ca370 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -65656,3 +65656,22 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 71215,3,833,1382,112,15,100 71216,3,833,1382,87,26,100 71217,3,833,1382,89,28,100 +71218,4,1303,1383,95,3,100 +71219,4,1304,1383,66,5,100 +71220,4,224,1383,100,5,100 +71221,4,249,1383,112,30,100 +71222,4,307,1383,142,5,100 +71223,4,1200,1383,78,15,100 +71224,5,1303,1383,95,3,100 +71225,5,1304,1383,66,5,100 +71226,5,224,1383,100,5,100 +71227,5,249,1383,112,30,100 +71228,5,307,1383,142,5,100 +71229,5,1200,1383,78,15,100 +71230,6,1303,1384,95,5,100 +71231,6,1304,1384,66,5,100 +71232,6,224,1384,100,5,100 +71233,6,249,1384,85,30,100 +71234,6,307,1384,142,5,100 +71235,6,1200,1384,178,15,100 +71236,6,330,1384,82,16,100 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index c8023cd69..463a3f923 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2357,3 +2357,5 @@ location_area_id,local_language_id,name 1300,9,Celadon City Prize Corner 1301,9,Goldenrod City Game Corner 1302,9,Kanto Underground Path +1303,9,Violet City (Southwest House) +1304,9,Goldenrod City Department Store 5F diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 5ea7d8a9d..762f6f189 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -1191,3 +1191,5 @@ id,location_id,game_index,identifier 1300,67,0,prize-corner 1301,229,0,game-corner 1302,1113,0, +1303,153,0,southwest-house +1304,229,0,department-store-5f diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv index a86a333db..4c729e1e8 100644 --- a/data/v2/csv/location_names.csv +++ b/data/v2/csv/location_names.csv @@ -454,7 +454,7 @@ location_id,local_language_id,name,subtitle 157,9,Route 23, 158,5,Centrale, 158,6,Kraftwerk, -158,9,Power Plant, +158,9,Kanto Power Plant, 159,5,Route Victoire, 159,6,Siegesstraße, 159,9,Victory Road, diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index fe44bae25..cc9012d4a 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -150,7 +150,7 @@ id,region_id,identifier 155,1,viridian-forest 156,2,whirl-islands 157,1,kanto-route-23 -158,1,power-plant +158,1,kanto-power-plant 159,1,kanto-victory-road-2 160,1,pokemon-tower 161,1,pokemon-mansion