Add RSE Trades, remove non-zubat encounters from altering cave in Emerald

data/v2/csv/encounter_condition_value_map.csv

@@ -18214,3 +18214,13 @@ encounter_id,encounter_condition_value_id
 71234,165
 71235,167
 71236,168
+71344,169
+71345,170
+71346,171
+71347,169
+71348,170
+71349,171
+71350,172
+71351,173
+71352,174
+71353,175

data/v2/csv/encounter_condition_value_prose.csv

@@ -289,3 +289,10 @@ encounter_condition_value_id,local_language_id,name
 166,9,Give Gloom in a Trade
 167,9,Give Haunter in a Trade
 168,9,Give Dugtrio in a Trade
+169,9,Give Slakoth in a Trade
+170,9,Give Pikachu in a Trade
+171,9,Give Bellossom in a Trade
+172,9,Give Ralts in a Trade
+173,9,Give Volbeat in a Trade
+174,9,Give Bagon in a Trade
+175,9,Give Skitty in a Trade

data/v2/csv/encounter_condition_values.csv

@@ -167,3 +167,10 @@ id,encounter_condition_id,identifier,is_default
 166,15,trade-gloom,1
 167,15,trade-haunter,1
 168,15,trade-dugtrio,1
+169,15,trade-slakoth,1
+170,15,trade-pikachu,1
+171,15,trade-bellossom,1
+172,15,trade-ralts,1
+173,15,trade-volbeat,1
+174,15,trade-bagon,1
+175,15,trade-skitty,1

data/v2/csv/encounter_slots.csv

@@ -1389,3 +1389,5 @@ id,version_group_id,encounter_method_id,slot,rarity
 1388,16,1,1,40
 1389,16,1,2,60
 1390,16,1,1,100
+1391,5,36,,100
+1392,6,36,,100

data/v2/csv/encounters.csv

@@ -27409,102 +27409,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 31119,9,441,196,41,14,14
 31120,9,441,197,41,8,8
 31121,9,441,198,41,14,14
-31122,9,442,187,179,7,7
-31123,9,442,188,179,9,9
-31124,9,442,189,179,5,5
-31125,9,442,190,179,11,11
-31126,9,442,191,179,7,7
-31127,9,442,192,179,9,9
-31128,9,442,193,179,13,13
-31129,9,442,194,179,3,3
-31130,9,442,195,179,5,5
-31131,9,442,196,179,11,11
-31132,9,442,197,179,5,5
-31133,9,442,198,179,11,11
-31134,9,443,187,204,23,23
-31135,9,443,188,204,25,25
-31136,9,443,189,204,22,22
-31137,9,443,190,204,27,27
-31138,9,443,191,204,23,23
-31139,9,443,192,204,25,25
-31140,9,443,193,204,29,29
-31141,9,443,194,204,19,19
-31142,9,443,195,204,21,21
-31143,9,443,196,204,27,27
-31144,9,443,197,204,21,21
-31145,9,443,198,204,27,27
-31146,9,444,187,228,16,16
-31147,9,444,188,228,18,18
-31148,9,444,189,228,14,14
-31149,9,444,190,228,20,20
-31150,9,444,191,228,16,16
-31151,9,444,192,228,18,18
-31152,9,444,193,228,22,22
-31153,9,444,194,228,12,12
-31154,9,444,195,228,14,14
-31155,9,444,196,228,20,20
-31156,9,444,197,228,14,14
-31157,9,444,198,228,20,20
-31158,9,445,187,216,10,10
-31159,9,445,188,216,12,12
-31160,9,445,189,216,8,8
-31161,9,445,190,216,14,14
-31162,9,445,191,216,10,10
-31163,9,445,192,216,12,12
-31164,9,445,193,216,16,16
-31165,9,445,194,216,6,6
-31166,9,445,195,216,8,8
-31167,9,445,196,216,14,14
-31168,9,445,197,216,8,8
-31169,9,445,198,216,14,14
-31170,9,446,187,190,22,22
-31171,9,446,188,190,24,24
-31172,9,446,189,190,20,20
-31173,9,446,190,190,26,26
-31174,9,446,191,190,22,22
-31175,9,446,192,190,24,24
-31176,9,446,193,190,28,28
-31177,9,446,194,190,18,18
-31178,9,446,195,190,20,20
-31179,9,446,196,190,26,26
-31180,9,446,197,190,20,20
-31181,9,446,198,190,26,26
-31182,9,447,187,213,22,22
-31183,9,447,188,213,24,24
-31184,9,447,189,213,20,20
-31185,9,447,190,213,26,26
-31186,9,447,191,213,22,22
-31187,9,447,192,213,24,24
-31188,9,447,193,213,28,28
-31189,9,447,194,213,18,18
-31190,9,447,195,213,20,20
-31191,9,447,196,213,26,26
-31192,9,447,197,213,20,20
-31193,9,447,198,213,26,26
-31194,9,448,187,234,22,22
-31195,9,448,188,234,24,24
-31196,9,448,189,234,20,20
-31197,9,448,190,234,26,26
-31198,9,448,191,234,22,22
-31199,9,448,192,234,24,24
-31200,9,448,193,234,28,28
-31201,9,448,194,234,18,18
-31202,9,448,195,234,20,20
-31203,9,448,196,234,26,26
-31204,9,448,197,234,20,20
-31205,9,448,198,234,26,26
-31206,9,449,187,235,22,22
-31207,9,449,188,235,24,24
-31208,9,449,189,235,20,20
-31209,9,449,190,235,26,26
-31210,9,449,191,235,22,22
-31211,9,449,192,235,24,24
-31212,9,449,193,235,28,28
-31213,9,449,194,235,18,18
-31214,9,449,195,235,20,20
-31215,9,449,196,235,26,26
-31216,9,449,197,235,20,20
-31217,9,449,198,235,26,26
 31218,10,450,219,201,25,25
 31219,10,450,220,201,25,25
 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
 71340,26,1320,1348,205,36,38
 71341,26,1320,1349,232,36,38
 71342,26,1320,1350,402,36,38
-71343,26,1320,1351,629,36,38
+71343,26,1320,1351,629,36,38
+71344,7,834,1391,296,5,100
+71345,7,1321,1391,300,5,100
+71346,7,434,1391,222,21,100
+71347,8,834,1391,296,5,100
+71348,8,1321,1391,300,5,100
+71349,8,434,1391,222,21,100
+71350,9,834,1392,273,4,100
+71351,9,1321,1392,311,5,100
+71352,9,434,1392,116,5,100
+71353,9,809,1392,52,5,100

data/v2/csv/location_area_encounter_rates.csv

@@ -2968,14 +2968,6 @@ location_area_id,encounter_method_id,version_id,rate
 439,1,9,10
 440,1,9,10
 441,1,9,7
-442,1,9,7
-443,1,9,7
-444,1,9,7
-445,1,9,7
-446,1,9,7
-447,1,9,7
-448,1,9,7
-449,1,9,7
 450,1,10,7
 450,1,11,7
 451,1,10,7

data/v2/csv/location_area_prose.csv

@@ -1187,33 +1187,9 @@ location_area_id,local_language_id,name
 440,9,Artisan Cave
 440,6,Höhlenatelier
 440,5,Grotte Atelier
-441,9,Altering Cave (A)
-441,6,Wandelhöhle (A)
-441,5,Grotte Métamo (A)
-442,9,Altering Cave (B)
-442,6,Wandelhöhle (B)
-442,5,Grotte Métamo (B)
-443,9,Altering Cave (C)
-443,6,Wandelhöhle (C)
-443,5,Grotte Métamo (C)
-444,9,Altering Cave (D)
-444,6,Wandelhöhle (D)
-444,5,Grotte Métamo (D)
-445,9,Altering Cave (E)
-445,6,Wandelhöhle (E)
-445,5,Grotte Métamo (E)
-446,9,Altering Cave (F)
-446,6,Wandelhöhle (F)
-446,5,Grotte Métamo (F)
-447,9,Altering Cave (G)
-447,6,Wandelhöhle (G)
-447,5,Grotte Métamo (G)
-448,9,Altering Cave (H)
-448,6,Wandelhöhle (H)
-448,5,Grotte Métamo (H)
-449,9,Altering Cave (I)
-449,6,Wandelhöhle (I)
-449,5,Grotte Métamo (I)
+441,9,Altering Cave
+441,6,Wandelhöhle
+441,5,Grotte Métamo
 450,9,Monean Chamber
 450,6,Einamon-Kammer
 450,5,Chambre Anemune
@@ -2374,4 +2350,5 @@ location_area_id,local_language_id,name
 1317,9,Mirage Mountain (West of Route 104)
 1318,9,Mirage Mountain (South of Route 129)
 1319,9,Mirage Mountain (South of Route 131)
-1320,9,Mirage Mountain (North East of Route 125)
+1320,9,Mirage Mountain (North East of Route 125)
+1321,9,Fortree City

data/v2/csv/location_areas.csv

@@ -395,15 +395,7 @@ id,location_id,game_index,identifier
 438,487,107,
 439,488,111,
 440,489,112,
-441,490,114,a
-442,490,115,b
-443,490,116,c
-444,490,117,d
-445,490,118,e
-446,490,119,f
-447,490,120,g
-448,490,121,h
-449,490,122,i
+441,490,114,
 450,491,0,
 451,492,1,
 452,493,2,
@@ -1208,4 +1200,5 @@ id,location_id,game_index,identifier
 1317,699,0,west-of-route-104
 1318,699,0,south-of-route-129
 1319,699,0,south-of-route-131
-1320,699,0,north-east-of-route-125
+1320,699,0,north-east-of-route-125
+1321,574,0,