Merge branch 'RSE-Trade-Encounters-Remove-Altering-Cave' of https://github.com/notblisy/pokeapi into RSE-Trade-Encounters-Remove-Altering-Cave

Author: notblisy

data/v2/csv/abilities.csv

@@ -306,6 +306,10 @@ id,identifier,generation_id,is_main_series
 305,tera-shell,9,1
 306,teraform-zero,9,1
 307,poison-puppeteer,9,1
+308,piercing-drill,9,1
+309,dragonize,9,1
+310,mega-sol,9,1
+311,spicy-spray,9,1
 10001,mountaineer,5,0
 10002,wave-rider,5,0
 10003,skater,5,0

data/v2/csv/ability_flavor_text.csv

@@ -29859,3 +29859,7 @@ Unnerve Ability and Spectrier’s Grim Neigh Ability."
 306,27,9,"When Terapagos changes into its Stellar Form, it uses its hidden powers to eliminate all effects of weather and terrain, reducing them to zero."
 307,27,5,"Lorsque Pêchaminus empoisonne un Pokémon grâce\nà l’une de ses capacités, ce dernier devient également\nconfus."
 307,27,9,Pokémon poisoned by Pecharunt's moves will also become confused.
+308,32,9,"When the Pokémon uses contact moves, it can hit even targets that are protecting themselves, dealing 1/4 of the damage that the move would otherwise deal. Everything aside from the target's protective effects is still triggered."
+309,32,9,"The Pokémon's Normal-type moves become Dragon-type moves and their power is boosted by 20%."
+310,32,9,"Even when the sunlight has not turned harsh, the Pokémon can use its moves as if the weather were harsh sunlight."
+311,32,9,"When the Pokémon takes damage from a move, it burns the attacker."

data/v2/csv/ability_names.csv

@@ -2978,6 +2978,10 @@ ability_id,local_language_id,name
 307,9,Poison Puppeteer
 307,11,どくくぐつ
 307,12,毒傀儡
+308,9,Piercing Drill
+309,9,Dragonize
+310,9,Mega Sol
+311,9,Spicy Spray
 10001,9,Mountaineer
 10002,9,Wave Rider
 10003,9,Skater

data/v2/csv/ability_prose.csv

@@ -2037,4 +2037,8 @@ This Ability is not bypassed by []{ability:mold-breaker}, []{ability:teravolt},
 306,5,"Tant que Terapagos est dans sa Forme Stellaire, il neutralisera immédiatement les effets de météo et terrain.","Quand Terapagos prend sa Forme Stellaire, il utilise ses pouvoirs cachés pour éliminer tous les effets du météo et de terrain, les réduisant à zéro."
 306,9,"As soon as Terapagos assumes its Stellar Form, it will immediately neutralize weather and terrain effects. ","When Terapagos changes into its Stellar Form, it uses its hidden powers to eliminate all effects of weather and terrain, reducing them to zero."
 307,5,Un Pokémon empoisonné par les capacités de Pêchaminus sera aussi confus.,"Quand un Pokémon est empoisonné par n'importe quelle capacité de Pêchaminus, il sera aussi confus."
-307,9,"Pokémon poisoned by Pecharunt's moves will also become confused.","When a Pokémon is poisoned by any of Pecharunt's moves, it will also become confused."
+307,9,"Pokémon poisoned by Pecharunt's moves will also become confused.","When a Pokémon is poisoned by any of Pecharunt's moves, it will also become confused."
+308,9,"When the Pokémon uses contact moves, it can hit even targets that are protecting themselves.","When the Pokémon uses contact moves, it can hit even targets that are protecting themselves, dealing 1/4 of the damage that the move would otherwise deal. Everything aside from the target's protective effects is still triggered."
+309,9,"The Pokémon's Normal-type moves become Dragon-type moves and their power is boosted by 20%.","The Pokémon's Normal-type moves become Dragon-type moves and their power is boosted by 20%."
+310,9,"The Pokémon can use its moves as if the weather were harsh sunlight.","Even when the sunlight has not turned harsh, the Pokémon can use its moves as if the weather were harsh sunlight."
+311,9,"When the Pokémon takes damage from a move, it burns the attacker.","When the Pokémon takes damage from a move, it burns the attacker."

data/v2/csv/encounter_slots.csv

@@ -1383,5 +1383,11 @@ id,version_group_id,encounter_method_id,slot,rarity
 1382,2,36,,100
 1383,3,36,,100
 1384,4,36,,100
-1385,5,36,,100
-1386,6,36,,100
+1385,16,1,1,40
+1386,16,1,2,30
+1387,16,1,3,30
+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

@@ -61041,8 +61041,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 66616,9,1166,566,101,30,30
 66617,8,1166,565,101,30,30
 66618,9,1166,566,101,30,30
-66619,7,1167,565,101,30,30
-66620,7,1167,565,101,30,30
 66621,8,1165,565,101,30,30
 66622,9,1165,566,101,30,30
 66623,8,1165,565,101,30,30
@@ -65579,13 +65577,120 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 71234,6,307,1384,142,5,100
 71235,6,1200,1384,178,15,100
 71236,6,330,1384,82,16,100
-71237,7,834,1385,296,5,100
-71238,7,1305,1385,300,5,100
-71239,7,434,1385,222,21,100
-71240,8,834,1385,296,5,100
-71241,8,1305,1385,300,5,100
-71242,8,434,1385,222,21,100
-71243,9,834,1386,273,4,100
-71244,9,1305,1386,311,5,100
-71245,9,434,1386,116,5,100
-71246,9,809,1386,52,5,100
+71237,25,1305,1360,602,36,38
+71238,25,1305,1361,563,36,38
+71239,25,1305,1362,79,36,38
+71240,26,1305,1360,602,36,38
+71241,26,1305,1361,563,36,38
+71242,26,1305,1362,79,36,38
+71244,25,1306,1385,132,36,38
+71245,25,1306,1386,530,36,38
+71246,25,1306,1387,602,36,38
+71247,26,1306,1385,132,36,38
+71248,26,1306,1386,530,36,38
+71249,26,1306,1387,602,36,38
+71250,25,1307,1388,79,36,38
+71251,25,1307,1389,602,36,38
+71252,26,1307,1388,79,36,38
+71253,26,1307,1389,602,36,38
+71254,25,1308,1348,599,36,38
+71255,25,1308,1349,602,36,38
+71256,25,1308,1350,530,36,38
+71257,25,1308,1351,95,36,38
+71258,26,1308,1348,599,36,38
+71259,26,1308,1349,602,36,38
+71260,26,1308,1350,530,36,38
+71261,26,1308,1351,95,36,38
+71262,25,1309,1352,602,36,38
+71263,25,1309,1353,95,36,38
+71264,26,1309,1352,602,36,38
+71265,26,1309,1353,95,36,38
+71266,25,1309,1356,75,35,38
+71267,25,1309,1357,525,37,37
+71268,26,1309,1356,75,35,38
+71269,26,1309,1357,525,37,37
+71270,25,1310,1390,201,36,38
+71271,26,1310,1390,201,36,38
+71272,25,1311,1352,599,36,38
+71273,25,1311,1353,563,36,38
+71274,26,1311,1352,599,36,38
+71275,26,1311,1353,563,36,38
+71276,25,1311,1356,75,35,38
+71277,25,1311,1357,525,37,37
+71278,26,1311,1356,75,35,38
+71279,26,1311,1357,525,37,37
+71280,25,1312,1352,599,36,38
+71281,25,1312,1353,602,36,38
+71282,26,1312,1352,599,36,38
+71283,26,1312,1353,602,36,38
+71284,25,1312,1356,75,35,38
+71285,25,1312,1357,525,37,37
+71286,26,1312,1356,75,35,38
+71287,26,1312,1357,525,37,37
+71288,25,1313,1360,531,36,38
+71289,25,1313,1361,440,36,38
+71290,25,1313,1362,114,36,38
+71291,26,1313,1360,531,36,38
+71292,26,1313,1361,440,36,38
+71293,26,1313,1362,114,36,38
+71294,25,1314,1352,555,36,38
+71295,25,1314,1353,240,36,38
+71296,26,1314,1352,555,36,38
+71297,26,1314,1353,240,36,38
+71298,25,1315,1360,178,36,38
+71299,25,1315,1361,517,36,38
+71300,25,1315,1362,137,36,38
+71301,26,1315,1360,178,36,38
+71302,26,1315,1361,517,36,38
+71303,26,1315,1362,137,36,38
+71304,25,1315,1356,75,35,38
+71305,25,1315,1357,558,37,37
+71306,26,1315,1356,75,35,38
+71307,26,1315,1357,558,37,37
+71308,25,1316,1348,205,36,38
+71309,25,1316,1349,232,36,38
+71310,25,1316,1350,402,36,38
+71311,25,1316,1351,627,36,38
+71312,26,1316,1348,205,36,38
+71313,26,1316,1349,232,36,38
+71314,26,1316,1350,402,36,38
+71315,26,1316,1351,627,36,38
+71316,25,1317,1348,205,36,38
+71317,25,1317,1349,232,36,38
+71318,25,1317,1350,402,36,38
+71319,25,1317,1351,234,36,38
+71320,26,1317,1348,205,36,38
+71321,26,1317,1349,232,36,38
+71322,26,1317,1350,402,36,38
+71323,26,1317,1351,234,36,38
+71324,25,1318,1352,523,36,38
+71325,25,1318,1353,239,36,38
+71326,26,1318,1352,523,36,38
+71327,26,1318,1353,239,36,38
+71328,25,1319,1348,205,36,38
+71329,25,1319,1349,232,36,38
+71330,25,1319,1350,402,36,38
+71331,25,1319,1351,203,36,38
+71332,26,1319,1348,205,36,38
+71333,26,1319,1349,232,36,38
+71334,26,1319,1350,402,36,38
+71335,26,1319,1351,203,36,38
+71336,25,1320,1348,205,36,38
+71337,25,1320,1349,232,36,38
+71338,25,1320,1350,402,36,38
+71339,25,1320,1351,629,36,38
+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
+71344,7,834,1385,296,5,100
+71345,7,1305,1385,300,5,100
+71346,7,434,1385,222,21,100
+71347,8,834,1385,296,5,100
+71348,8,1305,1385,300,5,100
+71349,8,434,1385,222,21,100
+71350,9,834,1386,273,4,100
+71351,9,1305,1386,311,5,100
+71352,9,434,1386,116,5,100
+71353,9,809,1386,52,5,100
+

data/v2/csv/location_area_prose.csv

@@ -2335,4 +2335,20 @@ location_area_id,local_language_id,name
 1302,9,Kanto Underground Path
 1303,9,Violet City (Southwest House)
 1304,9,Goldenrod City Department Store 5F
-1305,9,Fortree City
+1305,9,Mirage Cave (South of Pacifidlog)
+1306,9,Mirage Cave (North of Route 132)
+1307,9,Mirage Cave (North of Fallarbor)
+1308,9,Mirage Cave (North of Fortree)
+1309,9,Mirage Cave (South East of Route 129)
+1310,9,Mirage Cave (South of Route 107)
+1311,9,Mirage Cave (North of Route 124)
+1312,9,Mirage Cave (West of Rustboro)
+1313,9,Mirage Mountain (East of Mossdeep)
+1314,9,Mirage Mountain (North of Mossdeep)
+1315,9,Mirage Mountain (South East of Route 129)
+1316,9,Mirage Mountain (North of Lilycove)
+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)
+1321,9,Fortree City

data/v2/csv/location_areas.csv

@@ -1185,4 +1185,20 @@ id,location_id,game_index,identifier
 1302,1113,0,
 1303,153,0,southwest-house
 1304,229,0,department-store-5f
-1305,574,0,
+1305,698,0,south-of-pacifidlog
+1306,698,0,north-of-route-132
+1307,698,0,north-of-fallarbor
+1308,698,0,north-of-fortree
+1309,698,0,south-east-of-route-129
+1310,698,0,south-of-route-107
+1311,698,0,north-of-route-124
+1312,698,0,west-of-rustburo
+1313,699,0,east-of-mossdeep
+1314,699,0,north-of-mossdeep
+1315,699,0,south-east-of-route-129
+1316,699,0,north-of-lilycove
+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
+1321,574,0,

data/v2/csv/pokemon_abilities.csv

@@ -2902,3 +2902,26 @@ pokemon_id,ability_id,is_hidden,slot
 10275,5,0,1
 10276,305,0,1
 10277,306,0,1
+10278,156,0,1
+10279,215,0,1
+10280,37,0,1
+10281,136,0,1
+10282,310,0,1
+10283,309,0,1
+10284,242,0,1
+10285,117,0,1
+10286,104,0,1
+10287,308,0,1
+10291,151,0,1
+10292,171,0,1
+10293,26,0,1
+10294,168,0,1
+10296,187,0,1
+10300,99,0,1
+10302,201,0,1
+10306,26,0,1
+10313,260,0,1
+10314,36,0,1
+10315,89,0,1
+10320,311,0,1
+10321,91,0,1

data/v2/csv/version_groups.csv

@@ -30,3 +30,4 @@ id,identifier,generation_id,order
 29,blue-japan,1,2
 30,legends-za,9,30
 31,mega-dimension,9,31
+32,champions,9,32