diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 227b3cdfa..8416f8149 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1924,3 +1924,6 @@ id,version_group_id,encounter_method_id,slot,rarity 1923,20,38,1,70 1924,20,38,2,25 1925,20,38,3,5 +1926,21,36,1,100 +1927,21,18,1,100 +1928,22,18,1,100 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index c9be5fbab..0bf17a4e9 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -70049,40 +70049,40 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75911,34,861,1765,772,50,50 75912,33,1372,1765,4,5,5 75913,34,1372,1765,4,5,5 -75914,33,904,1765,1,5,5 -75915,33,904,1765,7,5,5 -75916,33,904,1765,891,10,10 -75917,34,904,1765,1,5,5 -75918,34,904,1765,7,5,5 -75919,34,904,1765,891,10,10 -75920,33,904,1765,137,25,25 -75921,34,904,1765,137,25,25 -75922,33,876,1765,10107,5,5 -75923,33,876,1765,79,10,10 -75924,33,876,1765,10103,5,5 -75925,33,876,1765,10101,5,5 -75926,33,876,1765,10100,30,30 -75927,33,876,1765,10115,30,30 -75928,33,876,1765,10114,30,30 -75929,33,876,1765,722,5,5 -75930,33,876,1765,725,5,5 -75931,33,876,1765,728,5,5 -75932,33,876,1765,10105,20,20 -75933,34,876,1765,10107,5,5 -75934,34,876,1765,79,10,10 -75935,34,876,1765,10103,5,5 -75936,34,876,1765,10101,5,5 -75937,34,876,1765,10100,30,30 -75938,34,876,1765,10115,30,30 -75939,34,876,1765,10114,30,30 -75940,34,876,1765,722,5,5 -75941,34,876,1765,725,5,5 -75942,34,876,1765,728,5,5 -75943,34,876,1765,10105,20,20 -75944,33,879,1765,789,5,5 -75945,34,879,1765,789,5,5 -75946,33,905,1765,803,20,20 -75947,34,905,1765,803,20,20 +75914,35,904,1927,1,5,5 +75915,35,904,1927,7,5,5 +75916,35,904,1927,891,10,10 +75917,50,904,1927,1,5,5 +75918,50,904,1927,7,5,5 +75919,50,904,1927,891,10,10 +75920,35,904,1927,137,25,25 +75921,50,904,1927,137,25,25 +75922,35,876,1927,10107,5,5 +75923,35,876,1927,79,10,10 +75924,35,876,1927,10103,5,5 +75925,35,876,1927,10101,5,5 +75926,35,876,1927,10100,30,30 +75927,35,876,1927,10115,30,30 +75928,35,876,1927,10114,30,30 +75929,35,876,1927,722,5,5 +75930,35,876,1927,725,5,5 +75931,35,876,1927,728,5,5 +75932,35,876,1927,10105,20,20 +75933,50,876,1927,10107,5,5 +75934,50,876,1927,79,10,10 +75935,50,876,1927,10103,5,5 +75936,50,876,1927,10101,5,5 +75937,50,876,1927,10100,30,30 +75938,50,876,1927,10115,30,30 +75939,50,876,1927,10114,30,30 +75940,50,876,1927,722,5,5 +75941,50,876,1927,725,5,5 +75942,50,876,1927,728,5,5 +75943,50,876,1927,10105,20,20 +75944,36,879,1928,789,5,5 +75945,51,879,1928,789,5,5 +75946,36,905,1928,803,20,20 +75947,51,905,1928,803,20,20 75948,33,1373,1766,819,10,10 75949,34,1373,1766,819,10,10 75950,33,1374,1766,52,18,18 @@ -70101,28 +70101,28 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75963,34,924,1766,122,40,40 75964,33,945,1766,884,50,50 75965,34,945,1766,884,50,50 -75966,33,1376,1766,52,15,15 -75967,33,1376,1766,83,15,15 -75968,33,1376,1766,222,15,15 -75969,33,1376,1766,77,15,15 -75970,33,1376,1766,122,15,15 -75971,33,1376,1766,554,15,15 -75972,33,1376,1766,263,15,15 -75973,33,1376,1766,618,15,15 -75974,33,1376,1766,110,15,15 -75975,33,1376,1766,10114,15,15 -75976,33,1376,1766,10115,15,15 -75977,34,1376,1766,52,15,15 -75978,34,1376,1766,83,15,15 -75979,34,1376,1766,222,15,15 -75980,34,1376,1766,77,15,15 -75981,34,1376,1766,122,15,15 -75982,34,1376,1766,554,15,15 -75983,34,1376,1766,263,15,15 -75984,34,1376,1766,618,15,15 -75985,34,1376,1766,110,15,15 -75986,34,1376,1766,10114,15,15 -75987,34,1376,1766,10115,15,15 +75966,35,1376,1926,52,15,15 +75967,35,1376,1926,83,15,15 +75968,35,1376,1926,222,15,15 +75969,35,1376,1926,77,15,15 +75970,35,1376,1926,122,15,15 +75971,35,1376,1926,554,15,15 +75972,35,1376,1926,263,15,15 +75973,35,1376,1926,618,15,15 +75974,35,1376,1926,110,15,15 +75975,35,1376,1926,10114,15,15 +75976,35,1376,1926,10115,15,15 +75977,50,1376,1926,52,15,15 +75978,50,1376,1926,83,15,15 +75979,50,1376,1926,222,15,15 +75980,50,1376,1926,77,15,15 +75981,50,1376,1926,122,15,15 +75982,50,1376,1926,554,15,15 +75983,50,1376,1926,263,15,15 +75984,50,1376,1926,618,15,15 +75985,50,1376,1926,110,15,15 +75986,50,1376,1926,10114,15,15 +75987,50,1376,1926,10115,15,15 75988,33,855,1693,863,40,44 75989,33,855,1694,828,40,44 75990,33,855,1695,510,40,44 diff --git a/data/v2/csv/version_names.csv b/data/v2/csv/version_names.csv index 5965d56d7..92795510f 100644 --- a/data/v2/csv/version_names.csv +++ b/data/v2/csv/version_names.csv @@ -335,26 +335,26 @@ version_id,local_language_id,name 34,9,Shield 34,12,盾 34,14,Escudo -35,1,鎧の孤島 -35,3,갑옷의 외딴섬 -35,4,鎧之孤島 -35,5,L’île solitaire de l’Armure -35,6,Die Insel der Rüstung -35,7,La isla de la armadura -35,8,L’isola solitaria dell’armatura -35,9,The Isle of Armor -35,12,铠之孤岛 -35,14,La isla de la armadura -36,1,冠の雪原 -36,3,왕관의 설원 -36,4,冠之雪原 -36,5,Les terres enneigées de la Couronne -36,6,Die Schneelande der Krone -36,7,Las nieves de la corona -36,8,Le terre innevate della corona -36,9,The Crown Tundra -36,12,冠之雪原 -36,14,Las nieves de la corona +35,1,ソード: 鎧の孤島 +35,3,소드: 갑옷의 외딴섬 +35,4,劍: 鎧之孤島 +35,5,Épée: L’île solitaire de l’Armure +35,6,Schwert: Die Insel der Rüstung +35,7,Espada: La isla de la armadura +35,8,Spada: L’isola solitaria dell’armatura +35,9,Sword: The Isle of Armor +35,12,剑: 铠之孤岛 +35,14,Espada: La isla de la armadura +36,1,ソード: 冠の雪原 +36,3,소드: 왕관의 설원 +36,4,劍: 冠之雪原 +36,5,Épée: Les terres enneigées de la Couronne +36,6,Schwert: Die Schneelande der Krone +36,7,Espada: Las nieves de la corona +36,8,Spada: Le terre innevate della corona +36,9,Sword: The Crown Tundra +36,12,剑: 冠之雪原 +36,14,Espada: Las nieves de la corona 37,1,ブリリアントダイヤモンド 37,3,브릴리언트 다이아몬드 37,4,晶燦鑽石 @@ -405,22 +405,22 @@ version_id,local_language_id,name 41,9,Violet 41,12,紫 41,14,Púrpura -42,1,碧の仮面 -42,5,Le Masque Turquoise -42,6,Die Türkisgrüne Maske -42,7,La máscara turquesa -42,8,La maschera turchese -42,9,The Teal Mask -42,12,碧之假面 -42,14,La máscara turquesa -43,1,藍の円盤 -43,5,Le Disque Indigo -43,6,Die Indigoblaue Scheibe -43,7,El disco índigo -43,8,Il disco indaco -43,9,The Indigo Disk -43,12,藍之圓盤 -43,14,El disco índigo +42,1,スカーレット: 碧の仮面 +42,5,Écarlate: Le Masque Turquoise +42,6,Karmesin: Die Türkisgrüne Maske +42,7,Escarlata: La máscara turquesa +42,8,Scarlatto: La maschera turchese +42,9,Scarlet: The Teal Mask +42,12,朱: 碧之假面 +42,14,Escarlata: La máscara turquesa +43,1,スカーレット: 藍の円盤 +43,5,Écarlate: Le Disque Indigo +43,6,Karmesin: Die Indigoblaue Scheibe +43,7,Escarlata: El disco índigo +43,8,Scarlatto: Il disco indaco +43,9,Scarlet: The Indigo Disk +43,12,朱: 藍之圓盤 +43,14,Escarlata: El disco índigo 44,1,赤 44,3,레드 44,5,Rouge @@ -467,3 +467,39 @@ version_id,local_language_id,name 48,12,超次元爆涌 48,14,Megadimensión 49,9,Champions +50,1,シールド: 鎧の孤島 +50,3,실드: 갑옷의 외딴섬 +50,4,盾: 鎧之孤島 +50,5,Bouclier: L’île solitaire de l’Armure +50,6,Schild: Die Insel der Rüstung +50,7,Escudo: La isla de la armadura +50,8,Scudo: L’isola solitaria dell’armatura +50,9,Shield: The Isle of Armor +50,12,盾: 铠之孤岛 +50,14,Escudo: La isla de la armadura +51,1,シールド: 冠の雪原 +51,3,실드: 왕관의 설원 +51,4,盾: 冠之雪原 +51,5,Bouclier: Les terres enneigées de la Couronne +51,6,Schild: Die Schneelande der Krone +51,7,Escudo: Las nieves de la corona +51,8,Scudo: Le terre innevate della corona +51,9,Shield: The Crown Tundra +51,12,盾: 冠之雪原 +51,14,Escudo: Las nieves de la corona +52,1,バイオレット: 碧の仮面 +52,5,Violet: Le Masque Turquoise +52,6,Purpur: Die Türkisgrüne Maske +52,7,Púrpura: La máscara turquesa +52,8,Violetto: La maschera turchese +52,9,Violet: The Teal Mask +52,12,紫: 碧之假面 +52,14,Púrpura: La máscara turquesa +53,1,バイオレット: 藍の円盤 +53,5,Violet: Le Disque Indigo +53,6,Purpur: Die Indigoblaue Scheibe +53,7,Púrpura: El disco índigo +53,8,Violetto: Il disco indaco +53,9,Violet: The Indigo Disk +53,12,紫: 藍之圓盤 +53,14,Púrpura: El disco índigo diff --git a/data/v2/csv/versions.csv b/data/v2/csv/versions.csv index 1aee73efc..93a41c529 100644 --- a/data/v2/csv/versions.csv +++ b/data/v2/csv/versions.csv @@ -33,18 +33,22 @@ id,version_group_id,identifier 32,19,lets-go-eevee 33,20,sword 34,20,shield -35,21,the-isle-of-armor -36,22,the-crown-tundra +35,21,the-isle-of-armor-sword +36,22,the-crown-tundra-sword 37,23,brilliant-diamond 38,23,shining-pearl 39,24,legends-arceus 40,25,scarlet 41,25,violet -42,26,the-teal-mask -43,27,the-indigo-disk +42,26,the-teal-mask-scarlet +43,27,the-indigo-disk-scarlet 44,28,red-japan 45,28,green-japan 46,29,blue-japan 47,30,legends-za 48,31,mega-dimension 49,32,champions +50,21,the-isle-of-armor-shield +51,22,the-crown-tundra-shield +52,26,the-teal-mask-violet +53,27,the-indigo-disk-violet