Skip to content

Commit 3878ef1

Browse files
Add BW2 in-game trades (#1524)
Adds the seven specific NPC trades from Pokémon Black 2 and White 2 (sourced from Serebii): - Route 4: Cottonee ↔ Petilil (version-exclusive) - Route 7: Emolga → Gigalith - Humilau City: Mantine → Tangrowth - Route 15: Ditto → Rotom - Accumula Town: Excadrill → Ambipom - Accumula Town: Hippowdon → Alakazam To support these: - Add encounter slot for the BW2 npc-trade method (vg 14, method 36) - Add Accumula Town location area (no entry existed) - Add seven new "Give X in a Trade" encounter condition values - Add encounters and encounter condition value mappings for B2 and W2 The Yancy/Curtis Funfest Mission trades in Nimbasa City are not included; they accept any Pokémon and depend on player gender, which needs additional encounter-condition infrastructure not present today.
1 parent e4cbf7a commit 3878ef1

7 files changed

Lines changed: 42 additions & 1 deletion

data/v2/csv/encounter_condition_value_map.csv

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22106,3 +22106,15 @@ encounter_id,encounter_condition_value_id
2210622106
75100,193
2210722107
75101,193
2210822108
75102,193
22109+
75103,195
22110+
75104,197
22111+
75105,198
22112+
75106,199
22113+
75107,200
22114+
75108,201
22115+
75109,196
22116+
75110,197
22117+
75111,198
22118+
75112,199
22119+
75113,200
22120+
75114,201

data/v2/csv/encounter_condition_value_prose.csv

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,3 +315,10 @@ encounter_condition_value_id,local_language_id,name
315315
192,9,Headbutt Tree (Common)
316316
193,9,Headbutt Tree (Rare)
317317
194,9,Headbutt Tree (Secret)
318+
195,9,Give Cottonee in a Trade
319+
196,9,Give Petilil in a Trade
320+
197,9,Give Emolga in a Trade
321+
198,9,Give Mantine in a Trade
322+
199,9,Give Ditto in a Trade
323+
200,9,Give Excadrill in a Trade
324+
201,9,Give Hippowdon in a Trade

data/v2/csv/encounter_condition_values.csv

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,10 @@ id,encounter_condition_id,identifier,is_default
193193
192,20,headbutt-tree-common,0
194194
193,20,headbutt-tree-rare,0
195195
194,20,headbutt-tree-secret,0
196+
195,15,trade-cottonee,1
197+
196,15,trade-petilil,1
198+
197,15,trade-emolga,1
199+
198,15,trade-mantine,1
200+
199,15,trade-ditto,1
201+
200,15,trade-excadrill,1
202+
201,15,trade-hippowdon,1

data/v2/csv/encounter_slots.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,3 +1486,4 @@ id,version_group_id,encounter_method_id,slot,rarity
14861486
1485,10,7,4,10
14871487
1486,10,7,5,5
14881488
1487,10,7,6,5
1489+
1488,14,36,,100

data/v2/csv/encounters.csv

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69238,3 +69238,15 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
6923869238
75100,16,271,1486,177,45,48
6923969239
75101,15,271,1487,177,45,48
6924069240
75102,16,271,1487,177,45,48
69241+
75103,21,627,1488,548,20,20
69242+
75104,21,632,1488,526,35,35
69243+
75105,21,659,1488,465,45,45
69244+
75106,21,650,1488,479,60,60
69245+
75107,21,1364,1488,424,40,40
69246+
75108,21,1364,1488,65,40,40
69247+
75109,22,627,1488,546,20,20
69248+
75110,22,632,1488,526,35,35
69249+
75111,22,659,1488,465,45,45
69250+
75112,22,650,1488,479,60,60
69251+
75113,22,1364,1488,424,40,40
69252+
75114,22,1364,1488,65,40,40

data/v2/csv/location_area_prose.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2393,4 +2393,5 @@ location_area_id,local_language_id,name
23932393
1360,9,Oreburgh Mining Museum
23942394
1361,9,Pewter Museum of Science
23952395
1362,9,Floaroma Meadow
2396-
1363,9,Safari Zone Gate
2396+
1363,9,Safari Zone Gate
2397+
1364,9,Accumula Town

data/v2/csv/location_areas.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,3 +1244,4 @@ id,location_id,game_index,identifier
12441244
1361,231,0,pewter-museum-of-science
12451245
1362,175,0,
12461246
1363,243,0,
1247+
1364,347,0,

0 commit comments

Comments
 (0)