From b232d730861e6567c1cc429e8d003b5d04ac48bd Mon Sep 17 00:00:00 2001 From: Christopher Monsanto Date: Sat, 22 Aug 2020 03:32:13 -0400 Subject: [PATCH] Merge pikachus in sidetable Marty added 815--is this already OK? --- data/species.json | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/data/species.json b/data/species.json index 72ae4a8e..2c2ccb86 100644 --- a/data/species.json +++ b/data/species.json @@ -304,44 +304,51 @@ "num": 25, "formeNum": 9, "base": "Pikachu", - "forme": "Rock-Star", + "forme": "World", "sid": 809 }, "810": { "num": 25, "formeNum": 10, "base": "Pikachu", - "forme": "Belle", + "forme": "Rock-Star", "sid": 810 }, "811": { "num": 25, "formeNum": 11, "base": "Pikachu", - "forme": "Pop-Star", + "forme": "Belle", "sid": 811 }, "812": { "num": 25, "formeNum": 12, "base": "Pikachu", - "forme": "PhD", + "forme": "Pop-Star", "sid": 812 }, "813": { "num": 25, "formeNum": 13, "base": "Pikachu", - "forme": "Libre", + "forme": "PhD", "sid": 813 }, "814": { "num": 25, "formeNum": 14, "base": "Pikachu", - "forme": "Cosplay", + "forme": "Libre", "sid": 814 }, + "815": { + "num": 25, + "formeNum": 15, + "base": "Pikachu", + "forme": "Cosplay", + "sid": 815 + }, "832": { "num": 26, "formeNum": 0,