From ae165903bd15b94f39537261feb7d918d56af47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Marchal?= Date: Wed, 15 Mar 2023 18:33:25 +0100 Subject: [PATCH] Add Walking Wake and Iron Leaves --- flashdex.js | 10 +++++----- pokemon | 2 +- pokemon.json | 2 ++ poketest.js | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/flashdex.js b/flashdex.js index fc9d512..ec67d3d 100644 --- a/flashdex.js +++ b/flashdex.js @@ -9,12 +9,12 @@ $(document).ready(function() var G6 = [650, 721]; var G7 = [722, 809]; var G8 = [810, 905]; - var G9 = [906, 1008]; - var MEGA = [1009, 1058]; - var GIGA = [1059, 1090]; - var REG = [1091, 1145]; + var G9 = [906, 1010]; + var MEGA = [1011, 1060]; + var GIGA = [1061, 1092]; + var REG = [1093, 1147]; - var EXCEPTION = 1090; // urshifu g-max + var EXCEPTION = 1092; // urshifu g-max /************ GAME *************/ /*******************************/ diff --git a/pokemon b/pokemon index 2a7c881..9c36e2a 160000 --- a/pokemon +++ b/pokemon @@ -1 +1 @@ -Subproject commit 2a7c8815f952f20b38ec4ed2f6c7748e871812cc +Subproject commit 9c36e2a1696245a52e1b5f71b6456f0685d04735 diff --git a/pokemon.json b/pokemon.json index 717cba5..cbc0cec 100644 --- a/pokemon.json +++ b/pokemon.json @@ -1006,6 +1006,8 @@ { "num": 1006, "fr": "Garde-de-Fer", "en": "Iron Valiant", "ja": "テツノブジン", "romaji": "Tetsunobujin", "de": "Eisenkrieger", "kr": "무쇠무인", "cn": "鐵武者", "cs": "铁武者", "origin": "9G", "type": [ "Fairy", "Fighting" ] }, { "num": 1007, "fr": "Koraidon", "en": "Koraidon", "ja": "コライドン", "romaji": "Koraidon", "de": "Koraidon", "kr": "코라이돈", "cn": "故勒頓", "cs": "故勒顿", "origin": "9G", "type": [ "Fighting", "Dragon" ] }, { "num": 1008, "fr": "Miraidon", "en": "Miraidon", "ja": "ミライドン", "romaji": "Miraidon", "de": "Miraidon", "kr": "미라이돈", "cn": "密勒頓", "cs": "密勒顿", "origin": "9G", "type": [ "Electric", "Fighting" ] }, +{ "num": 1009, "fr": "Serpente-Eau", "en": "Walking Wake", "ja": "ウネルミナモ", "romaji": "Uneruminamo", "de": "Windewoge", "kr": "굽이치는물결", "cn": "波盪水", "cs": "波荡水", "origin": "9G", "type": [ "Water", "Dragon" ] }, +{ "num": 1010, "fr": "Vert-de-Fer", "en": "Iron Leaves", "ja": "テツノイサハ", "romaji": "Tetsunoisaha", "de": "Eisenblatt", "kr": "무쇠잎새", "cn": "鐵斑葉", "cs": "铁斑叶", "origin": "9G", "type": [ "Grass", "Psychic" ] }, { "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" ] }, diff --git a/poketest.js b/poketest.js index 2f03752..a4f61f8 100644 --- a/poketest.js +++ b/poketest.js @@ -29,10 +29,10 @@ $(document).ready(function() { var G6 = [650, 721]; var G7 = [722, 809]; var G8 = [810, 905]; - var G9 = [906, 1008]; - var MEGA = [1009, 1058]; - var GIGA = [1059, 1090]; - var REG = [1091, 1145]; + var G9 = [906, 1010]; + var MEGA = [1011, 1060]; + var GIGA = [1061, 1092]; + var REG = [1093, 1147]; var gen_number = 9; var extra_number = 3; // mega, giga, reg