Skip to content

Commit 4acff99

Browse files
authored
Add RSE Trades, remove non-zubat encounters from altering cave in Emerald (#1478)
This commit seeks to do two things: 1. Add all the trade encounters from this article: https://bulbapedia.bulbagarden.net/wiki/In-game_trade#Generation_III into Ruby, Sapphire, and Emerald 2. Remove the non zubat altering cave encounters as described in this issue: #1457 To add the trades, I added a few things: - New location area for foretree city - relevant encounters and encounter slots - encounter conditions for which pokemon to trade - relevant prose To remove altering cave I: - Removed all non-zubat encounters from encounters.csv - Removed all hoenn altering cave location areas except 441, and removed its name "a". - removed relevant prose.
1 parent 050fa27 commit 4acff99

8 files changed

Lines changed: 45 additions & 143 deletions

data/v2/csv/encounter_condition_value_map.csv

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18214,3 +18214,13 @@ encounter_id,encounter_condition_value_id
1821418214
71234,165
1821518215
71235,167
1821618216
71236,168
18217+
71344,169
18218+
71345,170
18219+
71346,171
18220+
71347,169
18221+
71348,170
18222+
71349,171
18223+
71350,172
18224+
71351,173
18225+
71352,174
18226+
71353,175

data/v2/csv/encounter_condition_value_prose.csv

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,3 +289,10 @@ encounter_condition_value_id,local_language_id,name
289289
166,9,Give Gloom in a Trade
290290
167,9,Give Haunter in a Trade
291291
168,9,Give Dugtrio in a Trade
292+
169,9,Give Slakoth in a Trade
293+
170,9,Give Pikachu in a Trade
294+
171,9,Give Bellossom in a Trade
295+
172,9,Give Ralts in a Trade
296+
173,9,Give Volbeat in a Trade
297+
174,9,Give Bagon in a Trade
298+
175,9,Give Skitty in a Trade

data/v2/csv/encounter_condition_values.csv

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,3 +167,10 @@ id,encounter_condition_id,identifier,is_default
167167
166,15,trade-gloom,1
168168
167,15,trade-haunter,1
169169
168,15,trade-dugtrio,1
170+
169,15,trade-slakoth,1
171+
170,15,trade-pikachu,1
172+
171,15,trade-bellossom,1
173+
172,15,trade-ralts,1
174+
173,15,trade-volbeat,1
175+
174,15,trade-bagon,1
176+
175,15,trade-skitty,1

data/v2/csv/encounter_slots.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,3 +1389,5 @@ id,version_group_id,encounter_method_id,slot,rarity
13891389
1388,16,1,1,40
13901390
1389,16,1,2,60
13911391
1390,16,1,1,100
1392+
1391,5,36,,100
1393+
1392,6,36,,100

data/v2/csv/encounters.csv

Lines changed: 11 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -27409,102 +27409,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
2740927409
31119,9,441,196,41,14,14
2741027410
31120,9,441,197,41,8,8
2741127411
31121,9,441,198,41,14,14
27412-
31122,9,442,187,179,7,7
27413-
31123,9,442,188,179,9,9
27414-
31124,9,442,189,179,5,5
27415-
31125,9,442,190,179,11,11
27416-
31126,9,442,191,179,7,7
27417-
31127,9,442,192,179,9,9
27418-
31128,9,442,193,179,13,13
27419-
31129,9,442,194,179,3,3
27420-
31130,9,442,195,179,5,5
27421-
31131,9,442,196,179,11,11
27422-
31132,9,442,197,179,5,5
27423-
31133,9,442,198,179,11,11
27424-
31134,9,443,187,204,23,23
27425-
31135,9,443,188,204,25,25
27426-
31136,9,443,189,204,22,22
27427-
31137,9,443,190,204,27,27
27428-
31138,9,443,191,204,23,23
27429-
31139,9,443,192,204,25,25
27430-
31140,9,443,193,204,29,29
27431-
31141,9,443,194,204,19,19
27432-
31142,9,443,195,204,21,21
27433-
31143,9,443,196,204,27,27
27434-
31144,9,443,197,204,21,21
27435-
31145,9,443,198,204,27,27
27436-
31146,9,444,187,228,16,16
27437-
31147,9,444,188,228,18,18
27438-
31148,9,444,189,228,14,14
27439-
31149,9,444,190,228,20,20
27440-
31150,9,444,191,228,16,16
27441-
31151,9,444,192,228,18,18
27442-
31152,9,444,193,228,22,22
27443-
31153,9,444,194,228,12,12
27444-
31154,9,444,195,228,14,14
27445-
31155,9,444,196,228,20,20
27446-
31156,9,444,197,228,14,14
27447-
31157,9,444,198,228,20,20
27448-
31158,9,445,187,216,10,10
27449-
31159,9,445,188,216,12,12
27450-
31160,9,445,189,216,8,8
27451-
31161,9,445,190,216,14,14
27452-
31162,9,445,191,216,10,10
27453-
31163,9,445,192,216,12,12
27454-
31164,9,445,193,216,16,16
27455-
31165,9,445,194,216,6,6
27456-
31166,9,445,195,216,8,8
27457-
31167,9,445,196,216,14,14
27458-
31168,9,445,197,216,8,8
27459-
31169,9,445,198,216,14,14
27460-
31170,9,446,187,190,22,22
27461-
31171,9,446,188,190,24,24
27462-
31172,9,446,189,190,20,20
27463-
31173,9,446,190,190,26,26
27464-
31174,9,446,191,190,22,22
27465-
31175,9,446,192,190,24,24
27466-
31176,9,446,193,190,28,28
27467-
31177,9,446,194,190,18,18
27468-
31178,9,446,195,190,20,20
27469-
31179,9,446,196,190,26,26
27470-
31180,9,446,197,190,20,20
27471-
31181,9,446,198,190,26,26
27472-
31182,9,447,187,213,22,22
27473-
31183,9,447,188,213,24,24
27474-
31184,9,447,189,213,20,20
27475-
31185,9,447,190,213,26,26
27476-
31186,9,447,191,213,22,22
27477-
31187,9,447,192,213,24,24
27478-
31188,9,447,193,213,28,28
27479-
31189,9,447,194,213,18,18
27480-
31190,9,447,195,213,20,20
27481-
31191,9,447,196,213,26,26
27482-
31192,9,447,197,213,20,20
27483-
31193,9,447,198,213,26,26
27484-
31194,9,448,187,234,22,22
27485-
31195,9,448,188,234,24,24
27486-
31196,9,448,189,234,20,20
27487-
31197,9,448,190,234,26,26
27488-
31198,9,448,191,234,22,22
27489-
31199,9,448,192,234,24,24
27490-
31200,9,448,193,234,28,28
27491-
31201,9,448,194,234,18,18
27492-
31202,9,448,195,234,20,20
27493-
31203,9,448,196,234,26,26
27494-
31204,9,448,197,234,20,20
27495-
31205,9,448,198,234,26,26
27496-
31206,9,449,187,235,22,22
27497-
31207,9,449,188,235,24,24
27498-
31208,9,449,189,235,20,20
27499-
31209,9,449,190,235,26,26
27500-
31210,9,449,191,235,22,22
27501-
31211,9,449,192,235,24,24
27502-
31212,9,449,193,235,28,28
27503-
31213,9,449,194,235,18,18
27504-
31214,9,449,195,235,20,20
27505-
31215,9,449,196,235,26,26
27506-
31216,9,449,197,235,20,20
27507-
31217,9,449,198,235,26,26
2750827412
31218,10,450,219,201,25,25
2750927413
31219,10,450,220,201,25,25
2751027414
31220,10,450,221,201,25,25
@@ -65778,4 +65682,14 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
6577865682
71340,26,1320,1348,205,36,38
6577965683
71341,26,1320,1349,232,36,38
6578065684
71342,26,1320,1350,402,36,38
65781-
71343,26,1320,1351,629,36,38
65685+
71343,26,1320,1351,629,36,38
65686+
71344,7,834,1391,296,5,100
65687+
71345,7,1321,1391,300,5,100
65688+
71346,7,434,1391,222,21,100
65689+
71347,8,834,1391,296,5,100
65690+
71348,8,1321,1391,300,5,100
65691+
71349,8,434,1391,222,21,100
65692+
71350,9,834,1392,273,4,100
65693+
71351,9,1321,1392,311,5,100
65694+
71352,9,434,1392,116,5,100
65695+
71353,9,809,1392,52,5,100

data/v2/csv/location_area_encounter_rates.csv

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2968,14 +2968,6 @@ location_area_id,encounter_method_id,version_id,rate
29682968
439,1,9,10
29692969
440,1,9,10
29702970
441,1,9,7
2971-
442,1,9,7
2972-
443,1,9,7
2973-
444,1,9,7
2974-
445,1,9,7
2975-
446,1,9,7
2976-
447,1,9,7
2977-
448,1,9,7
2978-
449,1,9,7
29792971
450,1,10,7
29802972
450,1,11,7
29812973
451,1,10,7

data/v2/csv/location_area_prose.csv

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,33 +1187,9 @@ location_area_id,local_language_id,name
11871187
440,9,Artisan Cave
11881188
440,6,Höhlenatelier
11891189
440,5,Grotte Atelier
1190-
441,9,Altering Cave (A)
1191-
441,6,Wandelhöhle (A)
1192-
441,5,Grotte Métamo (A)
1193-
442,9,Altering Cave (B)
1194-
442,6,Wandelhöhle (B)
1195-
442,5,Grotte Métamo (B)
1196-
443,9,Altering Cave (C)
1197-
443,6,Wandelhöhle (C)
1198-
443,5,Grotte Métamo (C)
1199-
444,9,Altering Cave (D)
1200-
444,6,Wandelhöhle (D)
1201-
444,5,Grotte Métamo (D)
1202-
445,9,Altering Cave (E)
1203-
445,6,Wandelhöhle (E)
1204-
445,5,Grotte Métamo (E)
1205-
446,9,Altering Cave (F)
1206-
446,6,Wandelhöhle (F)
1207-
446,5,Grotte Métamo (F)
1208-
447,9,Altering Cave (G)
1209-
447,6,Wandelhöhle (G)
1210-
447,5,Grotte Métamo (G)
1211-
448,9,Altering Cave (H)
1212-
448,6,Wandelhöhle (H)
1213-
448,5,Grotte Métamo (H)
1214-
449,9,Altering Cave (I)
1215-
449,6,Wandelhöhle (I)
1216-
449,5,Grotte Métamo (I)
1190+
441,9,Altering Cave
1191+
441,6,Wandelhöhle
1192+
441,5,Grotte Métamo
12171193
450,9,Monean Chamber
12181194
450,6,Einamon-Kammer
12191195
450,5,Chambre Anemune
@@ -2374,4 +2350,5 @@ location_area_id,local_language_id,name
23742350
1317,9,Mirage Mountain (West of Route 104)
23752351
1318,9,Mirage Mountain (South of Route 129)
23762352
1319,9,Mirage Mountain (South of Route 131)
2377-
1320,9,Mirage Mountain (North East of Route 125)
2353+
1320,9,Mirage Mountain (North East of Route 125)
2354+
1321,9,Fortree City

data/v2/csv/location_areas.csv

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -395,15 +395,7 @@ id,location_id,game_index,identifier
395395
438,487,107,
396396
439,488,111,
397397
440,489,112,
398-
441,490,114,a
399-
442,490,115,b
400-
443,490,116,c
401-
444,490,117,d
402-
445,490,118,e
403-
446,490,119,f
404-
447,490,120,g
405-
448,490,121,h
406-
449,490,122,i
398+
441,490,114,
407399
450,491,0,
408400
451,492,1,
409401
452,493,2,
@@ -1208,4 +1200,5 @@ id,location_id,game_index,identifier
12081200
1317,699,0,west-of-route-104
12091201
1318,699,0,south-of-route-129
12101202
1319,699,0,south-of-route-131
1211-
1320,699,0,north-east-of-route-125
1203+
1320,699,0,north-east-of-route-125
1204+
1321,574,0,

0 commit comments

Comments
 (0)