diff --git a/LivingDexSS.gmx/Configs/Default.config.gmx b/LivingDexSS.gmx/Configs/Default.config.gmx
index d94db8d..be822fa 100644
--- a/LivingDexSS.gmx/Configs/Default.config.gmx
+++ b/LivingDexSS.gmx/Configs/Default.config.gmx
@@ -211,7 +211,7 @@
false
true
0
- DexTools
+ DexTool
True
0
@@ -493,8 +493,8 @@
Posho
- 1
- 0
+ 0
+ 1
0
@@ -577,8 +577,8 @@
0
Configs\Default\windows\runner_icon.ico
Configs\Default\windows\License.txt
- 0
- 1
+ 1
+ 0
Configs\Default\windows\RunnerInstaller.nsi
0
diff --git a/LivingDexSS.gmx/LivingDexSS.project.gmx b/LivingDexSS.gmx/LivingDexSS.project.gmx
index bc0323f..4b954fc 100644
--- a/LivingDexSS.gmx/LivingDexSS.project.gmx
+++ b/LivingDexSS.gmx/LivingDexSS.project.gmx
@@ -3,9 +3,9 @@
Configs\Default
-
-
-
+
+
+
ABOMASNOW-MEGA.png
-1
@@ -30742,7 +30742,7 @@
ZYGARDE-COMPLETE.png
-
+
ABSOL-MEGA.png
-1
@@ -32496,7 +32496,7 @@
-
+
abomasnow-mega.png
-1
@@ -50517,7 +50517,7 @@
zygarde.png
-
+
frillish.png
-1
@@ -50638,7 +50638,7 @@
unfezant.png
-
+
absol-mega.png
-1
@@ -52410,6 +52410,40 @@
pokedata.csv
+
+ galardex.csv
+ -1
+ 13385
+ 2
+
+ 0
+ -1
+ 0
+ 0
+
+
+ 9223372036854775807
+
+
+ galardex.csv
+
+
+ README.txt
+ -1
+ 900
+ 2
+
+ 0
+ -1
+ 0
+ 0
+
+
+ 9223372036854775807
+
+
+ README.txt
+
extensions\CSV Manager
@@ -52456,6 +52490,7 @@
+
diff --git a/LivingDexSS.gmx/datafiles/README.txt b/LivingDexSS.gmx/datafiles/README.txt
new file mode 100644
index 0000000..c5dde37
--- /dev/null
+++ b/LivingDexSS.gmx/datafiles/README.txt
@@ -0,0 +1,26 @@
+Hello lonely guy. Thank you for being perfectionist enough to try my Living Dex tool thing.
+
+
+How to Use:
+> Scroll up/down to change boxes.
+> Right click a Pokémon to change its marking. You can decide the meaning of each color but I just go by:
+-White: Not obtained
+-Red: In HOME
+-Blue: In HOME but unorganized
+-Yellow: In Let's Go Pikachu/Eevee
+-Lght Blue: In Sword/Shield
+> Press S to save a picture of your Living Dex to your Pictures folder.
+> Press G to toggle between National Dex view and Galar Dex view (boxes are still displayed in National Dex order for user management convenience)
+
+
+This program is very barebones so expect things to go south at some point, so try to make BACKUPS whenever you can.
+
+
+Your SAVE DATA is stored at:
+C:\Users\\AppData\Local\LivingDexSS\save.ini
+
+Your IMAGE EXPORTS are stored at:
+C:\Users\\Pictures\dex.png
+
+
+Cheers!
\ No newline at end of file
diff --git a/LivingDexSS.gmx/datafiles/galardex.csv b/LivingDexSS.gmx/datafiles/galardex.csv
new file mode 100644
index 0000000..e3ad085
--- /dev/null
+++ b/LivingDexSS.gmx/datafiles/galardex.csv
@@ -0,0 +1,484 @@
+GalarNo,DexNo,Pokemon,Type 1,Type 2
+001,810,GROOKEY,Grass,
+002,811,THWACKEY,Grass,
+003,812,RILLABOOM,Grass,
+004,813,SCORBUNNY,Fire,
+005,814,RABOOT,Fire,
+006,815,CINDERACE,Fire,
+007,816,SOBBLE,Water,
+008,817,DRIZZILE,Water,
+009,818,INTELEON,Water,
+010,824,BLIPBUG,Bug,
+011,825,DOTTLER,Bug,Psychic
+012,826,ORBEETLE,Bug,Psychic
+013,010,CATERPIE,Bug,
+014,011,METAPOD,Bug,
+015,012,BUTTERFREE,Bug,Flying
+016,736,GRUBBIN,Bug,
+017,737,CHARJABUG,Bug,Electric
+018,738,VIKAVOLT,Bug,Electric
+019,163,HOOTHOOT,Normal,Flying
+020,164,NOCTOWL,Normal,Flying
+021,821,ROOKIDEE,Flying,
+022,822,CORVISQUIRE,Flying,
+023,823,CORVIKNIGHT,Flying,Steel
+024,819,SKWOVET,Normal,
+025,820,GREEDENT,Normal,
+026,519,PIDOVE,Normal,Flying
+027,520,TRANQUILL,Normal,Flying
+028,521,UNFEZANT,Normal,Flying
+029,827,NICKIT,Dark,
+030,828,THIEVUL,Dark,
+031,263,ZIGZAGOON,Dark,Normal
+031,263,ZIGZAGOON,Normal,
+032,264,LINOONE,Dark,Normal
+032,264,LINOONE,Normal,
+033,862,OBSTAGOON,Dark,Normal
+034,831,WOOLOO,Normal,
+035,832,DUBWOOL,Normal,
+036,270,LOTAD,Water,Grass
+037,271,LOMBRE,Water,Grass
+038,272,LUDICOLO,Water,Grass
+039,273,SEEDOT,Grass,
+040,274,NUZLEAF,Grass,Dark
+041,275,SHIFTRY,Grass,Dark
+042,833,CHEWTLE,Water,
+043,834,DREDNAW,Water,Rock
+044,509,PURRLOIN,Dark,
+045,510,LIEPARD,Dark,
+046,835,YAMPER,Electric,
+047,836,BOLTUND,Electric,
+048,659,BUNNELBY,Normal,
+049,660,DIGGERSBY,Normal,Ground
+050,572,MINCCINO,Normal,
+051,573,CINCCINO,Normal,
+052,761,BOUNSWEET,Grass,
+053,762,STEENEE,Grass,
+054,763,TSAREENA,Grass,
+055,043,ODDISH,Grass,Poison
+056,044,GLOOM,Grass,Poison
+057,045,VILEPLUME,Grass,Poison
+058,182,BELLOSSOM,Grass,
+059,406,BUDEW,Grass,Poison
+060,315,ROSELIA,Grass,Poison
+061,407,ROSERADE,Grass,Poison
+062,278,WINGULL,Water,Flying
+063,279,PELIPPER,Water,Flying
+064,595,JOLTIK,Bug,Electric
+065,596,GALVANTULA,Bug,Electric
+066,309,ELECTRIKE,Electric,
+067,310,MANECTRIC,Electric,
+068,037,VULPIX,Fire,
+068,037,VULPIX,Ice,
+069,038,NINETALES,Fire,
+069,038,NINETALES,Ice,Fairy
+070,058,GROWLITHE,Fire,
+071,059,ARCANINE,Fire,
+072,582,VANILLITE,Ice,
+073,583,VANILLISH,Ice,
+074,584,VANILLUXE,Ice,
+075,220,SWINUB,Ice,Ground
+076,221,PILOSWINE,Ice,Ground
+077,473,MAMOSWINE,Ice,Ground
+078,225,DELIBIRD,Ice,Flying
+079,361,SNORUNT,Ice,
+080,362,GLALIE,Ice,
+081,478,FROSLASS,Ice,Ghost
+082,343,BALTOY,Ground,Psychic
+083,344,CLAYDOL,Ground,Psychic
+084,749,MUDBRAY,Ground,
+085,750,MUDSDALE,Ground,
+086,557,DWEBBLE,Bug,Rock
+087,558,CRUSTLE,Bug,Rock
+088,622,GOLETT,Ground,Ghost
+089,623,GOLURK,Ground,Ghost
+090,517,MUNNA,Psychic,
+091,518,MUSHARNA,Psychic,
+092,177,NATU,Psychic,Flying
+093,178,XATU,Psychic,Flying
+094,759,STUFFUL,Normal,Fighting
+095,760,BEWEAR,Normal,Fighting
+096,459,SNOVER,Grass,Ice
+097,460,ABOMASNOW,Grass,Ice
+098,098,KRABBY,Water,
+099,099,KINGLER,Water,
+100,194,WOOPER,Water,Ground
+101,195,QUAGSIRE,Water,Ground
+102,341,CORPHISH,Water,
+103,342,CRAWDAUNT,Water,Dark
+104,290,NINCADA,Bug,Ground
+105,291,NINJASK,Bug,Flying
+106,292,SHEDINJA,Bug,Ghost
+107,236,TYROGUE,Fighting,
+108,106,HITMONLEE,Fighting,
+109,107,HITMONCHAN,Fighting,
+110,237,HITMONTOP,Fighting,
+111,674,PANCHAM,Fighting,
+112,675,PANGORO,Fighting,Dark
+113,599,KLINK,Steel,
+114,600,KLANG,Steel,
+115,601,KLINKLANG,Steel,
+116,415,COMBEE,Bug,Flying
+117,416,VESPIQUEN,Bug,Flying
+118,436,BRONZOR,Steel,Psychic
+119,437,BRONZONG,Steel,Psychic
+120,280,RALTS,Psychic,Fairy
+121,281,KIRLIA,Psychic,Fairy
+122,282,GARDEVOIR,Psychic,Fairy
+123,475,GALLADE,Psychic,Fighting
+124,425,DRIFLOON,Ghost,Flying
+125,426,DRIFBLIM,Ghost,Flying
+126,829,GOSSIFLEUR,Grass,
+127,830,ELDEGOSS,Grass,
+128,420,CHERUBI,Grass,
+129,421,CHERRIM,Grass,
+130,434,STUNKY,Poison,Dark
+131,435,SKUNTANK,Poison,Dark
+132,535,TYMPOLE,Water,
+133,536,PALPITOAD,Water,Ground
+134,537,SEISMITOAD,Water,Ground
+135,355,DUSKULL,Ghost,
+136,356,DUSCLOPS,Ghost,
+137,477,DUSKNOIR,Ghost,
+138,066,MACHOP,Fighting,
+139,067,MACHOKE,Fighting,
+140,068,MACHAMP,Fighting,
+141,092,GASTLY,Ghost,Poison
+142,093,HAUNTER,Ghost,Poison
+143,094,GENGAR,Ghost,Poison
+144,129,MAGIKARP,Water,
+145,130,GYARADOS,Water,Flying
+146,118,GOLDEEN,Water,
+147,119,SEAKING,Water,
+148,223,REMORAID,Water,
+149,224,OCTILLERY,Water,
+150,090,SHELLDER,Water,
+151,091,CLOYSTER,Water,Ice
+152,349,FEEBAS,Water,
+153,350,MILOTIC,Water,
+154,550,BASCULIN,Water,
+154,550,BASCULIN,Water,
+155,746,WISHIWASHI,Water,
+156,771,PYUKUMUKU,Water,
+157,568,TRUBBISH,Poison,
+158,569,GARBODOR,Poison,
+159,850,SIZZLIPEDE,Fire,Bug
+160,851,CENTISKORCH,Fire,Bug
+161,837,ROLYCOLY,Rock,
+162,838,CARKOL,Rock,Fire
+163,839,COALOSSAL,Rock,Fire
+164,050,DIGLETT,Ground,
+164,050,DIGLETT,Ground,Steel
+165,051,DUGTRIO,Ground,
+165,051,DUGTRIO,Ground,Steel
+166,529,DRILBUR,Ground,
+167,530,EXCADRILL,Ground,Steel
+168,524,ROGGENROLA,Rock,
+169,525,BOLDORE,Rock,
+170,526,GIGALITH,Rock,
+171,532,TIMBURR,Fighting,
+172,533,GURDURR,Fighting,
+173,534,CONKELDURR,Fighting,
+174,527,WOOBAT,Psychic,Flying
+175,528,SWOOBAT,Psychic,Flying
+176,714,NOIBAT,Flying,Dragon
+177,715,NOIVERN,Flying,Dragon
+178,095,ONIX,Rock,Ground
+179,208,STEELIX,Steel,Ground
+180,846,ARROKUDA,Water,
+181,847,BARRASKEWDA,Water,
+182,052,MEOWTH,Steel,
+182,052,MEOWTH,Normal,
+182,052,MEOWTH,Dark,
+183,863,PERRSERKER,Steel,
+184,053,PERSIAN,Normal,
+184,053,PERSIAN,Dark,
+185,868,MILCERY,Fairy,
+186,869,ALCREMIE,Fairy,
+187,742,CUTIEFLY,Bug,Fairy
+188,743,RIBOMBEE,Bug,Fairy
+189,597,FERROSEED,Grass,Steel
+190,598,FERROTHORN,Grass,Steel
+191,710,PUMPKABOO,Ghost,Grass
+192,711,GOURGEIST,Ghost,Grass
+193,172,PICHU,Electric,
+194,025,PIKACHU,Electric,
+194,025,PIKACHU,Electric,
+194,025,PIKACHU,Electric,
+194,025,PIKACHU,Electric,
+194,025,PIKACHU,Electric,
+194,025,PIKACHU,Electric,
+194,025,PIKACHU,Electric,
+194,025,PIKACHU,Electric,
+195,026,RAICHU,Electric,
+195,026,RAICHU,Electric,Psychic
+196,133,EEVEE,Normal,
+197,134,VAPOREON,Water,
+198,135,JOLTEON,Electric,
+199,136,FLAREON,Fire,
+200,196,ESPEON,Psychic,
+201,197,UMBREON,Dark,
+202,470,LEAFEON,Grass,
+203,471,GLACEON,Ice,
+204,700,SYLVEON,Fairy,
+205,840,APPLIN,Grass,Dragon
+206,841,FLAPPLE,Grass,Dragon
+207,842,APPLETUN,Grass,Dragon
+208,677,ESPURR,Psychic,
+209,678,MEOWSTIC,Psychic,
+209,678,MEOWSTIC,Psychic,
+210,684,SWIRLIX,Fairy,
+211,685,SLURPUFF,Fairy,
+212,682,SPRITZEE,Fairy,
+213,683,AROMATISSE,Fairy,
+214,751,DEWPIDER,Water,Bug
+215,752,ARAQUANID,Water,Bug
+216,360,WYNAUT,Psychic,
+217,202,WOBBUFFET,Psychic,
+218,083,FARFETCH'D,Fighting,
+218,083,FARFETCH'D,Normal,Flying
+219,865,SIRFETCH'D,Fighting,
+220,170,CHINCHOU,Water,Electric
+221,171,LANTURN,Water,Electric
+222,453,CROAGUNK,Poison,Fighting
+223,454,TOXICROAK,Poison,Fighting
+224,559,SCRAGGY,Dark,Fighting
+225,560,SCRAFTY,Dark,Fighting
+226,618,STUNFISK,Ground,Steel
+226,618,STUNFISK,Ground,Electric
+227,213,SHUCKLE,Bug,Rock
+228,339,BARBOACH,Water,Ground
+229,340,WHISCASH,Water,Ground
+230,422,SHELLOS,Water,
+230,422,SHELLOS,Water,
+231,423,GASTRODON,Water,Ground
+231,423,GASTRODON,Water,Ground
+232,767,WIMPOD,Bug,Water
+233,768,GOLISOPOD,Bug,Water
+234,688,BINACLE,Rock,Water
+235,689,BARBARACLE,Rock,Water
+236,222,CORSOLA,Ghost,
+236,222,CORSOLA,Water,Rock
+237,864,CURSOLA,Ghost,
+238,859,IMPIDIMP,Dark,Fairy
+239,860,MORGREM,Dark,Fairy
+240,861,GRIMMSNARL,Dark,Fairy
+241,856,HATENNA,Psychic,
+242,857,HATTREM,Psychic,
+243,858,HATTERENE,Psychic,Fairy
+244,757,SALANDIT,Poison,Fire
+245,758,SALAZZLE,Poison,Fire
+246,624,PAWNIARD,Dark,Steel
+247,625,BISHARP,Dark,Steel
+248,538,THROH,Fighting,
+249,539,SAWK,Fighting,
+250,109,KOFFING,Poison,
+251,110,WEEZING,Poison,Fairy
+251,110,WEEZING,Poison,
+252,438,BONSLY,Rock,
+253,185,SUDOWOODO,Rock,
+254,173,CLEFFA,Fairy,
+255,035,CLEFAIRY,Fairy,
+256,036,CLEFABLE,Fairy,
+257,175,TOGEPI,Fairy,
+258,176,TOGETIC,Fairy,Flying
+259,468,TOGEKISS,Fairy,Flying
+260,446,MUNCHLAX,Normal,
+261,143,SNORLAX,Normal,
+262,546,COTTONEE,Grass,Fairy
+263,547,WHIMSICOTT,Grass,Fairy
+264,111,RHYHORN,Ground,Rock
+265,112,RHYDON,Ground,Rock
+266,464,RHYPERIOR,Ground,Rock
+267,574,GOTHITA,Psychic,
+268,575,GOTHORITA,Psychic,
+269,576,GOTHITELLE,Psychic,
+270,577,SOLOSIS,Psychic,
+271,578,DUOSION,Psychic,
+272,579,REUNICLUS,Psychic,
+273,588,KARRABLAST,Bug,
+274,589,ESCAVALIER,Bug,Steel
+275,616,SHELMET,Bug,
+276,617,ACCELGOR,Bug,
+277,605,ELGYEM,Psychic,
+278,606,BEHEEYEM,Psychic,
+279,613,CUBCHOO,Ice,
+280,614,BEARTIC,Ice,
+281,627,RUFFLET,Normal,Flying
+282,628,BRAVIARY,Normal,Flying
+283,629,VULLABY,Dark,Flying
+284,630,MANDIBUZZ,Dark,Flying
+285,451,SKORUPI,Poison,Bug
+286,452,DRAPION,Poison,Dark
+287,607,LITWICK,Ghost,Fire
+288,608,LAMPENT,Ghost,Fire
+289,609,CHANDELURE,Ghost,Fire
+290,686,INKAY,Dark,Psychic
+291,687,MALAMAR,Dark,Psychic
+292,215,SNEASEL,Dark,Ice
+293,461,WEAVILE,Dark,Ice
+294,302,SABLEYE,Dark,Ghost
+295,303,MAWILE,Steel,Fairy
+296,556,MARACTUS,Grass,
+297,561,SIGILYPH,Psychic,Flying
+298,447,RIOLU,Fighting,
+299,448,LUCARIO,Fighting,Steel
+300,324,TORKOAL,Fire,
+301,778,MIMIKYU,Ghost,Fairy
+302,878,CUFANT,Steel,
+303,879,COPPERAJAH,Steel,
+304,211,QWILFISH,Water,Poison
+305,592,FRILLISH,Water,Ghost
+306,593,JELLICENT,Water,Ghost
+307,747,MAREANIE,Poison,Water
+308,748,TOXAPEX,Poison,Water
+309,845,CRAMORANT,Flying,Water
+310,848,TOXEL,Electric,Poison
+311,849,TOXTRICITY,Electric,Poison
+311,849,TOXTRICITY,Electric,Poison
+312,843,SILICOBRA,Ground,
+313,844,SANDACONDA,Ground,
+314,449,HIPPOPOTAS,Ground,
+315,450,HIPPOWDON,Ground,
+316,632,DURANT,Bug,Steel
+317,631,HEATMOR,Fire,
+318,694,HELIOPTILE,Electric,Normal
+319,695,HELIOLISK,Electric,Normal
+320,701,HAWLUCHA,Fighting,Flying
+321,328,TRAPINCH,Ground,
+322,329,VIBRAVA,Ground,Dragon
+323,330,FLYGON,Ground,Dragon
+324,610,AXEW,Dragon,
+325,611,FRAXURE,Dragon,
+326,612,HAXORUS,Dragon,
+327,562,YAMASK,Ground,Ghost
+327,562,YAMASK,Ghost,
+328,867,RUNERIGUS,Ground,Ghost
+329,563,COFAGRIGUS,Ghost,
+330,679,HONEDGE,Steel,Ghost
+331,680,DOUBLADE,Steel,Ghost
+332,681,AEGISLASH,Steel,Ghost
+333,077,PONYTA,Psychic,
+333,077,PONYTA,Fire,
+334,078,RAPIDASH,Psychic,Fairy
+334,078,RAPIDASH,Fire,
+335,854,SINISTEA,Ghost,
+336,855,POLTEAGEIST,Ghost,
+337,876,INDEEDEE,Psychic,Normal
+337,876,INDEEDEE,Psychic,Normal
+338,708,PHANTUMP,Ghost,Grass
+339,709,TREVENANT,Ghost,Grass
+340,755,MORELULL,Grass,Fairy
+341,756,SHIINOTIC,Grass,Fairy
+342,765,ORANGURU,Normal,Psychic
+343,766,PASSIMIAN,Fighting,
+344,877,MORPEKO,Electric,Dark
+345,870,FALINKS,Fighting,
+346,780,DRAMPA,Normal,Dragon
+347,776,TURTONATOR,Fire,Dragon
+348,777,TOGEDEMARU,Electric,Steel
+349,872,SNOM,Ice,Bug
+350,873,FROSMOTH,Ice,Bug
+351,852,CLOBBOPUS,Fighting,
+352,853,GRAPPLOCT,Fighting,
+353,871,PINCURCHIN,Electric,
+354,458,MANTYKE,Water,Flying
+355,226,MANTINE,Water,Flying
+356,320,WAILMER,Water,
+357,321,WAILORD,Water,
+358,712,BERGMITE,Ice,
+359,713,AVALUGG,Ice,
+360,781,DHELMISE,Ghost,Grass
+361,131,LAPRAS,Water,Ice
+362,337,LUNATONE,Rock,Psychic
+363,338,SOLROCK,Rock,Psychic
+364,439,MIME JR.,Psychic,Fairy
+365,122,MR. MIME,Ice,Psychic
+365,122,MR. MIME,Psychic,Fairy
+366,866,MR. RIME,Ice,Psychic
+367,554,DARUMAKA,Ice,
+367,554,DARUMAKA,Fire,
+368,555,DARMANITAN,Ice,
+368,555,DARMANITAN,Ice,Fire
+368,555,DARMANITAN,Fire,
+368,555,DARMANITAN,Fire,Psychic
+369,874,STONJOURNER,Rock,
+370,875,EISCUE,Ice,
+371,884,DURALUDON,Steel,Dragon
+372,479,ROTOM,Electric,Ghost
+372,479,ROTOM,Electric,Fire
+372,479,ROTOM,Electric,Water
+372,479,ROTOM,Electric,Ice
+372,479,ROTOM,Electric,Flying
+372,479,ROTOM,Electric,Grass
+373,132,DITTO,Normal,
+374,880,DRACOZOLT,Electric,Dragon
+375,881,ARCTOZOLT,Electric,Ice
+376,882,DRACOVISH,Water,Dragon
+377,883,ARCTOVISH,Water,Ice
+378,004,CHARMANDER,Fire,
+379,005,CHARMELEON,Fire,
+380,006,CHARIZARD,Fire,Flying
+381,772,TYPE: NULL,Normal,
+382,773,SILVALLY,Normal,
+383,246,LARVITAR,Rock,Ground
+384,247,PUPITAR,Rock,Ground
+385,248,TYRANITAR,Rock,Dark
+386,633,DEINO,Dark,Dragon
+387,634,ZWEILOUS,Dark,Dragon
+388,635,HYDREIGON,Dark,Dragon
+389,704,GOOMY,Dragon,
+390,705,SLIGGOO,Dragon,
+391,706,GOODRA,Dragon,
+392,782,JANGMO-O,Dragon,
+393,783,HAKAMO-O,Dragon,Fighting
+394,784,KOMMO-O,Dragon,Fighting
+395,885,DREEPY,Dragon,Ghost
+396,886,DRAKLOAK,Dragon,Ghost
+397,887,DRAGAPULT,Dragon,Ghost
+398,888,ZACIAN,Fairy,
+398,888,ZACIAN,Fairy,Steel
+399,889,ZAMAZENTA,Fighting,
+399,889,ZAMAZENTA,Fighting,Steel
+400,890,ETERNATUS,Poison,Dragon
+?,001,BULBASAUR,Poison,
+?,002,IVYSAUR,Grass,Poison
+?,003,VENUSAUR,Grass,Poison
+?,007,SQUIRTLE,Water,
+?,008,WARTORTLE,Water,
+?,009,BLASTOISE,Water,
+?,079,SLOWPOKE,Psychic,
+?,150,MEWTWO,Psychic,
+?,151,MEW,Psychic,
+?,251,CELEBI,Psychic,Grass
+?,385,JIRACHI,Steel,Psychic
+?,638,COBALION,Steel,Fighting
+?,639,TERRAKION,Rock,Fighting
+?,640,VIRIZION,Grass,Fighting
+?,643,RESHIRAM,Dragon,Fire
+?,644,ZEKROM,Dragon,Electric
+?,646,KYUREM,Dragon,Ice
+?,646,KYUREM,Dragon,Ice
+?,646,KYUREM,Dragon,Ice
+?,647,KELDEO,Water,Fighting
+?,647,KELDEO,Water,Fighting
+?,722,ROWLET,Grass,Flying
+?,723,DARTRIX,Grass,Flying
+?,724,DECIDUEYE,Grass,Ghost
+?,725,LITTEN,Fire,
+?,726,TORRACAT,Fire,
+?,727,INCINEROAR,Fire,Dark
+?,728,POPPLIO,Water,
+?,729,BRIONNE,Water,
+?,730,PRIMARINA,Water,Fairy
+?,789,COSMOG,Psychic,
+?,790,COSMOEM,Psychic,
+?,791,SOLGALEO,Psychic,Steel
+?,792,LUNALA,Psychic,Ghost
+?,800,NECROZMA,Psychic,
+?,800,NECROZMA,Psychic,Steel
+?,800,NECROZMA,Psychic,Ghost
+?,802,MARSHADOW,Fighting,Ghost
+?,807,ZERAORA,Electric,
+?,808,MELTAN,Steel,
+?,809,MELMETAL,Steel,
\ No newline at end of file
diff --git a/LivingDexSS.gmx/objects/obj_global.object.gmx b/LivingDexSS.gmx/objects/obj_global.object.gmx
index b76e7fa..8ec3df5 100644
--- a/LivingDexSS.gmx/objects/obj_global.object.gmx
+++ b/LivingDexSS.gmx/objects/obj_global.object.gmx
@@ -25,7 +25,9 @@
1
- /// DEX LOAD & ENUM
+ /// DEX LOAD & ENUM (+GALAR DEX)
+
+// National Dex data loading
enum dex
{
@@ -42,6 +44,20 @@ enum dex
}
global.dexdata = csv_load("pokedata");
+
+
+// Galar Dex data loading
+
+enum gdex
+{
+ galarno,
+ dexno,
+ pokemon,
+ type1,
+ type2
+}
+
+global.galardata = csv_load("galardex");
@@ -119,7 +135,8 @@ global.various_to = 0;
if (file_exists("save.ini"))
{
ini_open("save.ini")
- global.current_box = ini_read_real("Navigation", "Current Box", 1);
+ global.current_box = ini_read_real("Navigation", "Current Box", 1);
+ global.show_galar = ini_read_real("Display", "Galar Dex", false);
for (var i=0; i<=global.dex_len; i++)
global.savedata[i] = ini_read_real("Pokemon", string(i), 0);
@@ -188,7 +205,9 @@ for (global.box_count=1; global.current<global.dex_len; global.box_count++)
if (!check_jump(j, i, global.current))
{
- make_slot(j, i, global.current);
+ if (check_galar(global.current, global.show_galar))
+ make_slot(j, i, global.current);
+
global.current++;
}
else
@@ -464,6 +483,38 @@ draw_type_hud(global.selected[dex.type1], global.selected[dex.type2], 4.5);
+
+
+ 1
+ 603
+ 7
+ 0
+ 0
+ -1
+ 2
+
+
+ self
+ 0
+ 0
+
+
+ 1
+ global.show_galar = !global.show_galar
+
+if (file_exists("save.ini"))
+{
+ ini_open("save.ini")
+ ini_write_real("Display", "Galar Dex", global.show_galar);
+ ini_close();
+}
+
+room_restart();
+
+
+
+
+
0
0
diff --git a/LivingDexSS.gmx/scripts/check_galar.gml b/LivingDexSS.gmx/scripts/check_galar.gml
new file mode 100644
index 0000000..b3164f3
--- /dev/null
+++ b/LivingDexSS.gmx/scripts/check_galar.gml
@@ -0,0 +1,20 @@
+///check_galar(id, show?)
+
+var idee = argument0;
+var show = argument1;
+
+// Sanity Check™
+if (!show)
+ return true;
+
+var nat = global.dexdata[idee, dex.dexno];
+
+for (var i=1; i