Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions data/v2/csv/encounter_condition_value_map.csv
Original file line number Diff line number Diff line change
Expand Up @@ -112030,3 +112030,15 @@ encounter_id,encounter_condition_value_id
123028,359
123029,360
123030,361
123031,195
123032,230
123033,163

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
123033,163
123033,362

The condition should be trade-boldore, not trade-krabby for the Emolga

123034,199
123035,363
123036,18

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
123036,18

I don't think there's a season requirement on the Cottonee trade, right?

123036,196
123037,230
123038,163

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
123038,163
123038,362

Same as above – trade-boldore, not trade-krabby

123039,199
123040,363
123039,18

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
123039,18

Similar comment as before – I don't think the Rotom trade requires it to be summer in White?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
123039,18
123035,18
123040,18

Looks like the Munchlax trade does need it to be summer in both versions.

2 changes: 2 additions & 0 deletions data/v2/csv/encounter_condition_value_prose.csv
Original file line number Diff line number Diff line change
Expand Up @@ -482,3 +482,5 @@ encounter_condition_value_id,local_language_id,name
359,9,Give Forretress in a Trade
360,9,Give Bonsly in a Trade
361,9,Give any Pokemon in a Trade
362,9,Give Boldore in a Trade
363,9,Give Cinccino in a Trade
2 changes: 2 additions & 0 deletions data/v2/csv/encounter_condition_values.csv
Original file line number Diff line number Diff line change
Expand Up @@ -360,3 +360,5 @@ id,encounter_condition_id,identifier,is_default
359,15,trade-forretress,1
360,15,trade-bonsly,1
361,15,trade-any-pokemon,1
362,15,trade-boldore,1
363,15,trade-cinccino,1
1 change: 1 addition & 0 deletions data/v2/csv/encounter_slots.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3808,3 +3808,4 @@ id,version_group_id,encounter_method_id,slot,rarity
3807,8,36,,100
3808,9,36,,100
3809,10,36,,100
3810,11,36,,100
10 changes: 10 additions & 0 deletions data/v2/csv/encounters.csv
Original file line number Diff line number Diff line change
Expand Up @@ -117126,3 +117126,13 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
123028,16,835,3809,374,31,100
123029,16,317,3809,111,1,100
123030,16,1665,3809,208,1,100
123031,17,1666,3810,548,15,15
123032,17,577,3810,550,25,25
123033,17,632,3810,587,30,30
123034,17,650,3810,479,60,60
123035,17,654,3810,446,60,60
123036,18,1666,3810,546,15,15
123037,18,577,3810,10016,25,25
123038,18,632,3810,587,30,30
123039,18,650,3810,479,60,60
123040,18,654,3810,446,60,60
1 change: 1 addition & 0 deletions data/v2/csv/location_area_prose.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3209,3 +3209,4 @@ location_area_id,local_language_id,name
1664,5,Gare de Safrania
1665,9,Olivine City Gym
1665,5,Arène d'Oliville
1665,9,Nacrene City(Dyes House)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
1665,9,Nacrene City(Dyes House)
1665,9,Nacrene City (Dye's House)

1 change: 1 addition & 0 deletions data/v2/csv/location_areas.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1538,3 +1538,4 @@ id,location_id,game_index,identifier
1663,63,0,island-house
1664,234,0,magnet-train-station
1665,85,0,gym
1666,349,0,dyes-house
Loading