From 9edf9e135d9171d215c50a707c038c4ebc8a61db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Marchal?= Date: Mon, 25 Jul 2022 12:17:35 +0200 Subject: [PATCH] Add new batch of 9G monsters --- flashdex.js | 10 +++++----- pokemon | 2 +- pokemon.json | 5 +++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/flashdex.js b/flashdex.js index a4c6ab1..0e814a9 100644 --- a/flashdex.js +++ b/flashdex.js @@ -9,10 +9,10 @@ $(document).ready(function() var G6 = [650, 721]; var G7 = [722, 809]; var G8 = [810, 905]; - var G9 = [906, 908]; - var MEGA = [909, 958]; - var GIGA = [959, 990]; - var REG = [991, 1043]; + var G9 = [906, 913]; + var MEGA = [914, 963]; + var GIGA = [964, 995]; + var REG = [996, 1048]; var EXCEPTION = 990; // urshifu g-max @@ -95,7 +95,7 @@ $(document).ready(function() function getFormattedNumber(num) { - if (num > 905 && num < 909) // 9G temporary numbers + if (num > 905 && num < 914) // 9G temporary numbers return "???"; if (num[0] == 'M' || num[0] == 'R' || num[0] == 'G') return num.substring(1, num.length); diff --git a/pokemon b/pokemon index cafa98a..03236f2 160000 --- a/pokemon +++ b/pokemon @@ -1 +1 @@ -Subproject commit cafa98a3b0c530d30423c4d48ba266a1a0b2c7b4 +Subproject commit 03236f2237e77055f1444a4928114a840b894dd1 diff --git a/pokemon.json b/pokemon.json index 62a775b..5e08aae 100644 --- a/pokemon.json +++ b/pokemon.json @@ -906,6 +906,11 @@ { "num": 906, "fr": "Poussacha", "en": "Sprigatito", "ja": "ニャオハ", "romaji": "Nyaoha", "de": "Felori", "kr": "나오하", "cn": "新葉喵", "cs": "新叶喵", "origin": "9G", "type": [ "Grass" ] }, { "num": 907, "fr": "Chochodile", "en": "Fuecoco", "ja": "ホゲータ", "romaji": "Hogēta", "de": "Krokel", "kr": "뜨아거", "cn": "呆火鱷", "cs": "呆火鳄", "origin": "9G", "type": [ "Fire" ] }, { "num": 908, "fr": "Coiffeton", "en": "Quaxly", "ja": "クワッス", "romaji": "Kewassu", "de": "Kwaks", "kr": "꾸왁스", "cn": "潤水鴨", "cs": "润水鸭", "origin": "9G", "type": [ "Water" ] }, +{ "num": 909, "fr": "Pohm", "en": "Pawmi", "ja": "パモ", "romaji": "Pamo", "de": "Pamo", "kr": "빠모", "cn": "布撥", "cs": "布拨", "origin": "9G", "type": [ "Electric" ] }, +{ "num": 910, "fr": "Olivini", "en": "Smoliv", "ja": "ミニーブ", "romaji": "Minību", "de": "Olini", "kr": "미니브", "cn": "迷你芙", "cs": "迷你芙", "origin": "9G", "type": [ "Grass", "Normal" ] }, +{ "num": 911, "fr": "Gourmelet", "en": "Lechonk", "ja": "グルトン", "romaji": "Guruton", "de": "Ferkuli", "kr": "맛보돈", "cn": "愛吃豚", "cs": "爱吃豚", "origin": "9G", "type": [ "Normal" ] }, +{ "num": 912, "fr": "Koraidon", "en": "Koraidon", "ja": "コライドン", "romaji": "Koraidon", "de": "Koraidon", "kr": "코라이돈", "cn": "故勒頓", "cs": "故勒顿", "origin": "9G", "type": [ "" ] }, +{ "num": 913, "fr": "Miraidon", "en": "Miraidon", "ja": "ミライドン", "romaji": "Miraidon", "de": "Miraidon", "kr": "미라이돈", "cn": "密勒頓", "cs": "密勒顿", "origin": "9G", "type": [ "" ] }, { "num": "M3", "fr": "Méga-Florizarre", "en": "Mega Venusaur", "ja": "メガ フシギバナ", "romaji": "Mega Fushigibana", "de": "Mega-Bisaflor", "kr": "메가이상해꽃", "cn": "超級妙蛙花", "cs": "超级妙蛙花", "form": "mega", "type": [ "Grass", "Poison" ] }, { "num": "M6X", "fr": "Méga-Dracaufeu X", "en": "Mega Charizard X", "ja": "メガ リザードン X", "romaji": "Mega Lizardon X", "de": "Mega-Glurak X", "kr": "메가리자몽 X", "cn": "超級噴火龍X", "cs": "超级喷火龙X", "form": "mega", "type": [ "Fire", "Dragon" ] }, { "num": "M6Y", "fr": "Méga-Dracaufeu Y", "en": "Mega Charizard Y", "ja": "メガ リザードン Y", "romaji": "Mega Lizardon Y", "de": "Mega-Glurak Y", "kr": "메가리자몽 Y", "cn": "超級噴火龍Y", "cs": "超级喷火龙Y", "form": "mega", "type": [ "Fire", "Flying" ] },