From 95b5cc1828ca6573606f2ec3feab8dd076cb77f1 Mon Sep 17 00:00:00 2001 From: TheGreenTie Date: Mon, 2 Mar 2020 00:46:38 -0600 Subject: [PATCH] Updated the dexdata --- Project/DexTool.yyp | 16 ++++++++-------- Project/datafiles/pokedata.csv | 12 +----------- Project/datafiles_yy/pokedata.csv.yy | 2 +- .../3a6f7b22-791c-4ade-a8fb-cd1be90397e1.yy | 2 +- 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/Project/DexTool.yyp b/Project/DexTool.yyp index f7c78db..9b38248 100644 --- a/Project/DexTool.yyp +++ b/Project/DexTool.yyp @@ -5782,6 +5782,14 @@ "resourceType": "GMIncludedFile" } }, + { + "Key": "40d0dc52-c5d4-4d38-aac7-1af90bf58397", + "Value": { + "id": "76d8a45a-33f7-48e3-b721-980f7d89a4ff", + "resourcePath": "datafiles_yy\\pokedata.csv.yy", + "resourceType": "GMIncludedFile" + } + }, { "Key": "40ded2f0-7b95-4a7d-905e-d3b4dd034fbe", "Value": { @@ -20318,14 +20326,6 @@ "resourceType": "GMIncludedFile" } }, - { - "Key": "e9a5c773-67ba-4682-b95d-eef64bc09439", - "Value": { - "id": "0bfc4b91-c4f3-4d04-b9d6-7d87d9124b14", - "resourcePath": "datafiles_yy\\pokedata.csv.yy", - "resourceType": "GMIncludedFile" - } - }, { "Key": "e9c79e2b-def7-46f0-b82d-a7145e2ac8f2", "Value": { diff --git a/Project/datafiles/pokedata.csv b/Project/datafiles/pokedata.csv index 3551229..d970533 100644 --- a/Project/datafiles/pokedata.csv +++ b/Project/datafiles/pokedata.csv @@ -4,7 +4,6 @@ id,DexNo,Pokemon,Form,Type 1,Type 2,Boxable,Bankable,Obtainable 3,003,VENUSAUR,FEMALE,Grass,Poison,TRUE,TRUE,TRUE 4,003,VENUSAUR,MALE,Grass,Poison,TRUE,TRUE,TRUE 5,003,VENUSAUR,MEGA,Grass,Poison,TRUE,FALSE,TRUE -1319,003,VENUSAUR,GIGANTAMAX,Grass,Poison,TRUE,TRUE,FALSE 6,004,CHARMANDER,,Fire,,TRUE,TRUE,TRUE 7,005,CHARMELEON,,Fire,,TRUE,TRUE,TRUE 8,006,CHARIZARD,,Fire,Flying,TRUE,TRUE,TRUE @@ -15,7 +14,6 @@ id,DexNo,Pokemon,Form,Type 1,Type 2,Boxable,Bankable,Obtainable 13,008,WARTORTLE,,Water,,TRUE,TRUE,TRUE 14,009,BLASTOISE,,Water,,TRUE,TRUE,TRUE 15,009,BLASTOISE,MEGA,Water,,TRUE,FALSE,TRUE -1320,009,BLASTOISE,GIGANTAMAX,Water,,TRUE,TRUE,FALSE 16,010,CATERPIE,,Bug,,TRUE,TRUE,TRUE 17,011,METAPOD,,Bug,,TRUE,TRUE,TRUE 18,012,BUTTERFREE,FEMALE,Bug,Flying,TRUE,TRUE,TRUE @@ -128,10 +126,9 @@ id,DexNo,Pokemon,Form,Type 1,Type 2,Boxable,Bankable,Obtainable 125,078,RAPIDASH,,Fire,,TRUE,TRUE,TRUE 126,078,RAPIDASH,GALARIAN,Psychic,Fairy,TRUE,TRUE,TRUE 127,079,SLOWPOKE,,Water,Psychic,TRUE,TRUE,TRUE -1324,079,SLOWPOKE,GALARIAN,Psychic,,TRUE,TRUE,TRUE +1319,079,SLOWPOKE,GALARIAN,Psychic,,TRUE,TRUE,TRUE 128,080,SLOWBRO,,Water,Psychic,TRUE,TRUE,TRUE 129,080,SLOWBRO,MEGA,Water,Psychic,TRUE,FALSE,TRUE -1325,080,SLOWBRO,GALARIAN,???,,TRUE,TRUE,FALSE 130,081,MAGNEMITE,,Electric,Steel,TRUE,TRUE,TRUE 131,082,MAGNETON,,Electric,Steel,TRUE,TRUE,TRUE 132,083,FARFETCH'D,,Normal,Flying,TRUE,TRUE,TRUE @@ -223,11 +220,8 @@ id,DexNo,Pokemon,Form,Type 1,Type 2,Boxable,Bankable,Obtainable 218,143,SNORLAX,,Normal,,TRUE,TRUE,TRUE 219,143,SNORLAX,GIGANTAMAX,Normal,,TRUE,TRUE,TRUE 220,144,ARTICUNO,,Ice,Flying,TRUE,TRUE,TRUE -1326,144,ARTICUNO,GALARIAN,???,,TRUE,TRUE,FALSE 221,145,ZAPDOS,,Electric,Flying,TRUE,TRUE,TRUE -1327,145,ZAPDOS,GALARIAN,???,,TRUE,TRUE,FALSE 222,146,MOLTRES,,Fire,Flying,TRUE,TRUE,TRUE -1328,146,MOLTRES,GALARIAN,???,,TRUE,TRUE,FALSE 223,147,DRATINI,,Dragon,,TRUE,TRUE,TRUE 224,148,DRAGONAIR,,Dragon,,TRUE,TRUE,TRUE 225,149,DRAGONITE,,Dragon,Flying,TRUE,TRUE,TRUE @@ -294,7 +288,6 @@ id,DexNo,Pokemon,Form,Type 1,Type 2,Boxable,Bankable,Obtainable 286,198,MURKROW,FEMALE,Dark,Flying,TRUE,TRUE,TRUE 287,198,MURKROW,MALE,Dark,Flying,TRUE,TRUE,TRUE 288,199,SLOWKING,,Water,Psychic,TRUE,TRUE,TRUE -1329,199,SLOWKING,GALARIAN,???,,TRUE,TRUE,FALSE 289,200,MISDREAVUS,,Ghost,,TRUE,TRUE,TRUE 290,201,UNOWN,A,Psychic,,TRUE,TRUE,TRUE 291,201,UNOWN,B,Psychic,,TRUE,TRUE,TRUE @@ -1165,15 +1158,12 @@ id,DexNo,Pokemon,Form,Type 1,Type 2,Boxable,Bankable,Obtainable 1156,810,GROOKEY,,Grass,,TRUE,TRUE,TRUE 1157,811,THWACKEY,,Grass,,TRUE,TRUE,TRUE 1158,812,RILLABOOM,,Grass,,TRUE,TRUE,TRUE -1321,812,RILLABOOM,GIGANTAMAX,Grass,,TRUE,TRUE,FALSE 1159,813,SCORBUNNY,,Fire,,TRUE,TRUE,TRUE 1160,814,RABOOT,,Fire,,TRUE,TRUE,TRUE 1161,815,CINDERACE,,Fire,,TRUE,TRUE,TRUE -1322,815,CINDERACE,GIGANTAMAX,Fire,,TRUE,TRUE,FALSE 1162,816,SOBBLE,,Water,,TRUE,TRUE,TRUE 1163,817,DRIZZILE,,Water,,TRUE,TRUE,TRUE 1164,818,INTELEON,,Water,,TRUE,TRUE,TRUE -1323,818,INTELEON,GIGANTAMAX,Water,,TRUE,TRUE,FALSE 1165,819,SKWOVET,,Normal,,TRUE,TRUE,TRUE 1166,820,GREEDENT,,Normal,,TRUE,TRUE,TRUE 1167,821,ROOKIDEE,,Flying,,TRUE,TRUE,TRUE diff --git a/Project/datafiles_yy/pokedata.csv.yy b/Project/datafiles_yy/pokedata.csv.yy index 8d1d258..a1c795c 100644 --- a/Project/datafiles_yy/pokedata.csv.yy +++ b/Project/datafiles_yy/pokedata.csv.yy @@ -1,5 +1,5 @@ { - "id": "e9a5c773-67ba-4682-b95d-eef64bc09439", + "id": "40d0dc52-c5d4-4d38-aac7-1af90bf58397", "modelName": "GMIncludedFile", "mvc": "1.0", "name": "pokedata.csv", diff --git a/Project/views/3a6f7b22-791c-4ade-a8fb-cd1be90397e1.yy b/Project/views/3a6f7b22-791c-4ade-a8fb-cd1be90397e1.yy index d403633..33f69c4 100644 --- a/Project/views/3a6f7b22-791c-4ade-a8fb-cd1be90397e1.yy +++ b/Project/views/3a6f7b22-791c-4ade-a8fb-cd1be90397e1.yy @@ -7,7 +7,7 @@ "7bcacbef-4426-4c1d-9cd7-a525e542b8d5", "fc1d7186-0884-41d7-b5db-31b244cbf15d", "c28cce02-e90b-4eba-a72f-3196b96acf51", - "e9a5c773-67ba-4682-b95d-eef64bc09439" + "40d0dc52-c5d4-4d38-aac7-1af90bf58397" ], "filterType": "GMIncludedFile", "folderName": "datafiles",