diff --git a/Project/DexTool.yyp b/Project/DexTool.yyp
index 9d280f4..de6ac70 100644
--- a/Project/DexTool.yyp
+++ b/Project/DexTool.yyp
@@ -8586,7 +8586,7 @@
             "Key": "5ebf8e8d-9772-aef2-28cb-e8743d4d575d",
             "Value": {
                 "id": "5fbb9f86-4fbb-99cd-ea2a-820b65d5cad0",
-                "resourcePath": "scripts\\show_galar_toggle\\show_galar_toggle.yy",
+                "resourcePath": "scripts\/show_dex_toggle\/show_dex_toggle.yy",
                 "resourceType": "GMScript"
             }
         },
@@ -9582,6 +9582,14 @@
                 "resourceType": "GMFolder"
             }
         },
+        {
+            "Key": "6ade07ea-0dc5-f3e3-549d-5765f94bcb31",
+            "Value": {
+                "id": "4e2d8d4b-12ce-da5d-7e30-77d3b96dbd2b",
+                "resourcePath": "scripts\\dex_armor_load\\dex_armor_load.yy",
+                "resourceType": "GMScript"
+            }
+        },
         {
             "Key": "6b10ade4-6ef7-473b-bbca-80467063ec65",
             "Value": {
@@ -11990,6 +11998,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "86a11d15-9ba9-ef00-cd20-52b16a03bd31",
+            "Value": {
+                "id": "cb4de92c-11a0-476d-dbf2-80191b6fffe2",
+                "resourcePath": "scripts\\version_get\\version_get.yy",
+                "resourceType": "GMScript"
+            }
+        },
         {
             "Key": "86a487a6-4f0d-478d-8c21-233fceb1485d",
             "Value": {
@@ -13862,6 +13878,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "9cd5f278-7287-1058-6ab4-3030cbba04a4",
+            "Value": {
+                "id": "b316acdf-52ca-8ef5-b84b-955222e336a9",
+                "resourcePath": "scripts\\show_check\\show_check.yy",
+                "resourceType": "GMScript"
+            }
+        },
         {
             "Key": "9cfd3481-bfce-47e4-ba8c-d724f5206e03",
             "Value": {
@@ -22417,6 +22441,7 @@
         "961739d9-bcef-9d3d-a9a7-6d0487191e8e",
         "9d9efccc-e28a-2782-ecbe-3ea08da108d6",
         "baf1e68b-6877-c2da-aed5-31f319313796",
+        "6ade07ea-0dc5-f3e3-549d-5765f94bcb31",
         "27426a5b-252b-ce49-0d97-9a0b620973f4",
         "01109f28-4eca-fc23-b0d9-649acb9c158c",
         "0c8bde50-6fda-efe6-8809-de6b265ccbcc",
@@ -22462,7 +22487,9 @@
         "c854fb34-52ee-fd8e-b01b-086f33590212",
         "d258aee7-2bed-eaae-edfb-2228979346df",
         "a7ef39a4-ac5a-45bb-7ded-c0562f4f4d23",
-        "4bee5f27-7512-964a-379d-a45443f42683"
+        "4bee5f27-7512-964a-379d-a45443f42683",
+        "9cd5f278-7287-1058-6ab4-3030cbba04a4",
+        "86a11d15-9ba9-ef00-cd20-52b16a03bd31"
     ],
     "tutorial": ""
 }
\ No newline at end of file
diff --git a/Project/objects/obj_global/Create_0.gml b/Project/objects/obj_global/Create_0.gml
index 70e0f90..d9198bb 100644
--- a/Project/objects/obj_global/Create_0.gml
+++ b/Project/objects/obj_global/Create_0.gml
@@ -1,6 +1,7 @@
 
 dex_data_load();
 dex_galar_load();
+dex_armor_load();
 initials_set();
 savedata_load();
 boxes_spawn();
diff --git a/Project/scripts/boxes_spawn/boxes_spawn.gml b/Project/scripts/boxes_spawn/boxes_spawn.gml
index 3a30eb6..f657441 100644
--- a/Project/scripts/boxes_spawn/boxes_spawn.gml
+++ b/Project/scripts/boxes_spawn/boxes_spawn.gml
@@ -1,5 +1,7 @@
 ///boxes_spawn()
 
+window_set_cursor(cr_hourglass);
+
 if (file_exists(working_directory+"/Logs/MissingSprites.log"))
     file_delete(working_directory+"/Logs/MissingSprites.log");
 
@@ -41,7 +43,7 @@ for (global.box_count=1; global.current<global.dex_len; global.box_count++)
                 
                 if (!check_jump(j, i, global.current))
                 {
-                    if (check_galar(global.current, global.show_galar))
+                    if (show_check(global.current, global.show_dex))
                         make_slot(j, i, global.current);
                         
                     global.current++;
@@ -52,4 +54,6 @@ for (global.box_count=1; global.current<global.dex_len; global.box_count++)
         }
 }
 
-global.gen_header[gen_current] = global.box_count-1; // Last header.
\ No newline at end of file
+global.gen_header[gen_current] = global.box_count-1; // Last header.
+
+window_set_cursor(cr_default);
\ No newline at end of file
diff --git a/Project/scripts/button_do/button_do.gml b/Project/scripts/button_do/button_do.gml
index b1bd849..274ab22 100644
--- a/Project/scripts/button_do/button_do.gml
+++ b/Project/scripts/button_do/button_do.gml
@@ -32,7 +32,7 @@ switch(argument0)
     break;
     
     case but.national:
-        show_galar_toggle();
+        show_dex_toggle();
     break;
     
     case but.shiny:
diff --git a/Project/scripts/button_set/button_set.gml b/Project/scripts/button_set/button_set.gml
index fd7cbd7..6019afd 100644
--- a/Project/scripts/button_set/button_set.gml
+++ b/Project/scripts/button_set/button_set.gml
@@ -55,10 +55,13 @@ switch(type)
     break;
     
     case but.national:
-        if (!global.show_galar)
-            text = "NATIONAL";
-        else
-            text = "GALAR";
+        switch(global.show_dex)
+        {
+            case shw.national: text="NATIONAL"; break;
+            case shw.galar:    text="GALAR";    break;
+            case shw.armor:    text="ARMOR";    break;
+        }
+        
         scale = global.icon_scale * 0.75;
         x_ = button_align_x(region.bot_left, -1.25);
         y_ = button_align_y(region._100, -0.5 - 0.5);
diff --git a/Project/scripts/dex_armor_load/dex_armor_load.gml b/Project/scripts/dex_armor_load/dex_armor_load.gml
new file mode 100644
index 0000000..a484f3d
--- /dev/null
+++ b/Project/scripts/dex_armor_load/dex_armor_load.gml
@@ -0,0 +1,15 @@
+///dex_armor_load()
+
+// Isle of Armor Dex data loading
+
+/*enum gdex
+{
+    galarno,
+    dexno,
+    pokemon,
+    type1,
+    type2
+}*/
+
+//if (global.show_armor)
+    global.armordata = csv_load("armordex");
\ No newline at end of file
diff --git a/Project/scripts/dex_armor_load/dex_armor_load.yy b/Project/scripts/dex_armor_load/dex_armor_load.yy
new file mode 100644
index 0000000..bff78a4
--- /dev/null
+++ b/Project/scripts/dex_armor_load/dex_armor_load.yy
@@ -0,0 +1,8 @@
+{
+    "id": "6ade07ea-0dc5-f3e3-549d-5765f94bcb31",
+    "modelName": "GMScript",
+    "mvc": "1.0",
+    "name": "dex_armor_load",
+    "IsCompatibility": false,
+    "IsDnD": false
+}
\ No newline at end of file
diff --git a/Project/scripts/initials_set/initials_set.gml b/Project/scripts/initials_set/initials_set.gml
index cfd44bc..56fdcdf 100644
--- a/Project/scripts/initials_set/initials_set.gml
+++ b/Project/scripts/initials_set/initials_set.gml
@@ -1,5 +1,10 @@
 ///initials_set()
 
+enum region { boxes, top, mid_left, mid_right, bot_left, bot_right,
+              _0, _25, _50, _75, _100 };
+              
+enum shw { national, galar, armor, LENGTH};
+
 global.window_width = window_get_width();
 global.window_height = window_get_height();
 
@@ -31,6 +36,3 @@ global.change = false;
 
 global.progress =     0;
 global.progress_max = 0;
-
-enum region { boxes, top, mid_left, mid_right, bot_left, bot_right,
-              _0, _25, _50, _75, _100 };
\ No newline at end of file
diff --git a/Project/scripts/savedata_load/savedata_load.gml b/Project/scripts/savedata_load/savedata_load.gml
index a7b6b40..574212a 100644
--- a/Project/scripts/savedata_load/savedata_load.gml
+++ b/Project/scripts/savedata_load/savedata_load.gml
@@ -3,9 +3,9 @@
 if (file_exists("save.ini"))
 {
     ini_open("save.ini")
-        global.current_box =    ini_read_real("Navigation", "Current Box", 1);
-        global.show_galar =     ini_read_real("Display", "Galar Dex", false);
-        global.show_shiny =     ini_read_real("Display", "Shiny Mode", false);
+        global.current_box = ini_read_real("Navigation", "Current Box", 1);
+        global.show_dex =	 ini_read_real("Display", "Galar Dex", shw.national);
+        global.show_shiny =  ini_read_real("Display", "Shiny Mode", false);
         
         var section = savedata_section_get(global.show_shiny);
         global.countdata[0] =0
@@ -29,11 +29,11 @@ if (file_exists("save.ini"))
 else
 {
     ini_open("save.ini");
-        ini_write_real("Info", "Number", 0.2);
+        ini_write_real("Info", "Number", version_get());
     ini_close();
     
     global.current_box = 1;
-    global.show_galar = false;
+    global.show_dex = 0;
     global.show_shiny = false;
     
     for (var i=0; i<=global.dex_len; i++)
diff --git a/Project/scripts/shortcut_check/shortcut_check.gml b/Project/scripts/shortcut_check/shortcut_check.gml
index ca23116..a3135d3 100644
--- a/Project/scripts/shortcut_check/shortcut_check.gml
+++ b/Project/scripts/shortcut_check/shortcut_check.gml
@@ -1,7 +1,7 @@
 ///shortcut_check()
 
 // Letters
-     if (keyboard_check_pressed(ord("G")))  show_galar_toggle();
+     if (keyboard_check_pressed(ord("G")))  show_dex_toggle();
 else if (keyboard_check_pressed(ord("I")))  make_screenshot();
 else if (keyboard_check_pressed(ord("S")))  show_shiny_toggle();
 
diff --git a/Project/scripts/show_check/show_check.gml b/Project/scripts/show_check/show_check.gml
new file mode 100644
index 0000000..a0941ce
--- /dev/null
+++ b/Project/scripts/show_check/show_check.gml
@@ -0,0 +1,29 @@
+/// @description check_galar(id, _show?)
+/// @param idee
+/// @param ...
+// Checks if the Pokémon can move to Sword/Shield.
+
+var idee = argument[0];
+
+// Sanity Check™
+if (argument_count>1 && argument[1]==shw.national)
+    return true;
+
+var nat = global.dexdata[idee, dex.dexno];
+
+switch(global.show_dex)
+{
+    case shw.galar:
+        for (var i=1; i<array_height_2d(global.galardata); i++)
+            if (nat == global.galardata[i, gdex.dexno])
+                return true;
+    break;
+    
+    case shw.armor:
+        for (var i=1; i<array_height_2d(global.armordata); i++)
+            if (nat == global.armordata[i, gdex.dexno])
+                return true;
+    break;
+}
+        
+return false;
diff --git a/Project/scripts/show_check/show_check.yy b/Project/scripts/show_check/show_check.yy
new file mode 100644
index 0000000..cefd73b
--- /dev/null
+++ b/Project/scripts/show_check/show_check.yy
@@ -0,0 +1,8 @@
+{
+    "id": "9cd5f278-7287-1058-6ab4-3030cbba04a4",
+    "modelName": "GMScript",
+    "mvc": "1.0",
+    "name": "show_check",
+    "IsCompatibility": false,
+    "IsDnD": false
+}
\ No newline at end of file
diff --git a/Project/scripts/show_dex_toggle/show_dex_toggle.gml b/Project/scripts/show_dex_toggle/show_dex_toggle.gml
new file mode 100644
index 0000000..be7517a
--- /dev/null
+++ b/Project/scripts/show_dex_toggle/show_dex_toggle.gml
@@ -0,0 +1,8 @@
+window_set_cursor(cr_hourglass);
+
+if (++global.show_dex >= shw.LENGTH)
+    global.show_dex = 0;
+
+savedata_write("Display", "Galar Dex", global.show_dex);
+
+room_restart();
\ No newline at end of file
diff --git a/Project/scripts/show_galar_toggle/show_galar_toggle.yy b/Project/scripts/show_dex_toggle/show_dex_toggle.yy
similarity index 81%
rename from Project/scripts/show_galar_toggle/show_galar_toggle.yy
rename to Project/scripts/show_dex_toggle/show_dex_toggle.yy
index 482e8df..e67e7b8 100644
--- a/Project/scripts/show_galar_toggle/show_galar_toggle.yy
+++ b/Project/scripts/show_dex_toggle/show_dex_toggle.yy
@@ -2,7 +2,7 @@
     "id": "5ebf8e8d-9772-aef2-28cb-e8743d4d575d",
     "modelName": "GMScript",
     "mvc": "1.0",
-    "name": "show_galar_toggle",
+    "name": "show_dex_toggle",
     "IsCompatibility": false,
     "IsDnD": false
 }
\ No newline at end of file
diff --git a/Project/scripts/show_galar_toggle/show_galar_toggle.gml b/Project/scripts/show_galar_toggle/show_galar_toggle.gml
deleted file mode 100644
index d6a9bc1..0000000
--- a/Project/scripts/show_galar_toggle/show_galar_toggle.gml
+++ /dev/null
@@ -1,5 +0,0 @@
-global.show_galar = !global.show_galar
-
-savedata_write("Display", "Galar Dex", global.show_galar);
-
-room_restart();
\ No newline at end of file
diff --git a/Project/scripts/show_shiny_toggle/show_shiny_toggle.gml b/Project/scripts/show_shiny_toggle/show_shiny_toggle.gml
index 03e4ca4..8c6fc88 100644
--- a/Project/scripts/show_shiny_toggle/show_shiny_toggle.gml
+++ b/Project/scripts/show_shiny_toggle/show_shiny_toggle.gml
@@ -1,4 +1,5 @@
 ///show_shiny_toggle()
+window_set_cursor(cr_hourglass);
 
 global.show_shiny = !global.show_shiny
 
diff --git a/Project/scripts/version_get/version_get.gml b/Project/scripts/version_get/version_get.gml
new file mode 100644
index 0000000..9f754c4
--- /dev/null
+++ b/Project/scripts/version_get/version_get.gml
@@ -0,0 +1 @@
+return 0.4;
\ No newline at end of file
diff --git a/Project/scripts/version_get/version_get.yy b/Project/scripts/version_get/version_get.yy
new file mode 100644
index 0000000..623906d
--- /dev/null
+++ b/Project/scripts/version_get/version_get.yy
@@ -0,0 +1,8 @@
+{
+    "id": "86a11d15-9ba9-ef00-cd20-52b16a03bd31",
+    "modelName": "GMScript",
+    "mvc": "1.0",
+    "name": "version_get",
+    "IsCompatibility": false,
+    "IsDnD": false
+}
\ No newline at end of file
diff --git a/Project/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy b/Project/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy
index 5ba1b86..40a0b9b 100644
--- a/Project/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy
+++ b/Project/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy
@@ -33,6 +33,7 @@
         "961739d9-bcef-9d3d-a9a7-6d0487191e8e",
         "9d9efccc-e28a-2782-ecbe-3ea08da108d6",
         "baf1e68b-6877-c2da-aed5-31f319313796",
+        "6ade07ea-0dc5-f3e3-549d-5765f94bcb31",
         "27426a5b-252b-ce49-0d97-9a0b620973f4",
         "01109f28-4eca-fc23-b0d9-649acb9c158c",
         "0c8bde50-6fda-efe6-8809-de6b265ccbcc",
@@ -71,7 +72,9 @@
         "c854fb34-52ee-fd8e-b01b-086f33590212",
         "d258aee7-2bed-eaae-edfb-2228979346df",
         "a7ef39a4-ac5a-45bb-7ded-c0562f4f4d23",
-        "4bee5f27-7512-964a-379d-a45443f42683"
+        "4bee5f27-7512-964a-379d-a45443f42683",
+        "9cd5f278-7287-1058-6ab4-3030cbba04a4",
+        "86a11d15-9ba9-ef00-cd20-52b16a03bd31"
     ],
     "filterType": "GMScript",
     "folderName": "scripts",