v0.0.3-alpha

Project/DexTool.yyp

@@ -2590,6 +2590,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "1db19231-d201-4aa9-b81a-1958175751c5",
+            "Value": {
+                "id": "832f9b0d-4ded-4db5-be2f-cf7b297245f0",
+                "resourcePath": "datafiles_yy\\Icons\\Regular\\NIDORAN-MALE.png.yy",
+                "resourceType": "GMIncludedFile"
+            }
+        },
         {
             "Key": "1db7cb7b-5535-49f5-a576-173afb32364d",
             "Value": {
@@ -2942,6 +2950,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "22c23791-3f9c-47e0-88bf-90dfd8f7a595",
+            "Value": {
+                "id": "cee6a97d-e22b-441a-a115-4b77b4ec55ed",
+                "resourcePath": "datafiles_yy\\Icons\\Shiny\\NIDORAN-MALE.png.yy",
+                "resourceType": "GMIncludedFile"
+            }
+        },
         {
             "Key": "22d61b9b-e89c-44b0-bde8-95d939863505",
             "Value": {
@@ -3214,6 +3230,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "251c6936-354b-4f36-9fce-656a1474808d",
+            "Value": {
+                "id": "ca268c8a-981a-4523-8aad-56422b86bda1",
+                "resourcePath": "datafiles_yy\\NIDORAN-FEMALE.png.yy",
+                "resourceType": "GMIncludedFile"
+            }
+        },
         {
             "Key": "251f6662-44c2-4c89-acff-92c9c5e48c01",
             "Value": {
@@ -21094,6 +21118,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "f3940cf8-cc3c-47b9-9d6a-e886f7ffc56c",
+            "Value": {
+                "id": "14497b55-9082-4dbf-a966-bb785eaa6a18",
+                "resourcePath": "datafiles_yy\\Icons\\Regular\\NIDORAN-FEMALE.png.yy",
+                "resourceType": "GMIncludedFile"
+            }
+        },
         {
             "Key": "f3d4b520-7e04-42d8-ab41-d60a07944610",
             "Value": {
@@ -21838,6 +21870,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "fbcf4f33-71a9-488c-886e-0ca981e0f30c",
+            "Value": {
+                "id": "4b805fef-5cfc-4839-9c1a-98b9988d4199",
+                "resourcePath": "datafiles_yy\\pokedata.csv.yy",
+                "resourceType": "GMIncludedFile"
+            }
+        },
         {
             "Key": "fbd023d7-16a7-408a-aee9-661225d960b8",
             "Value": {
@@ -22038,14 +22078,6 @@
                 "resourceType": "GMIncludedFile"
             }
         },
-        {
-            "Key": "fe090029-e154-41dc-9a67-3e5b0d802aea",
-            "Value": {
-                "id": "f51826bf-f7ff-49ab-8d95-7342f0820a0c",
-                "resourcePath": "datafiles_yy\\pokedata.csv.yy",
-                "resourceType": "GMIncludedFile"
-            }
-        },
         {
             "Key": "fe1053bc-f8e6-4a9b-adf5-940745971d73",
             "Value": {

Project/datafiles_yy/Icons/Regular/NIDORAN-FEMALE.png.yy

@@ -0,0 +1,19 @@
+{
+    "id": "f3940cf8-cc3c-47b9-9d6a-e886f7ffc56c",
+    "modelName": "GMIncludedFile",
+    "mvc": "1.0",
+    "name": "NIDORAN-FEMALE.png",
+    "CopyToMask": -1,
+    "exists": false,
+    "exportAction": 0,
+    "exportDir": "",
+    "fileName": "NIDORAN-FEMALE.png",
+    "filePath": "datafiles\\Icons\\Regular",
+    "freeData": false,
+    "origName": "",
+    "overwrite": false,
+    "removeEnd": false,
+    "size": 0,
+    "store": false,
+    "tags": ""
+}

Project/datafiles_yy/Icons/Regular/NIDORAN-MALE.png.yy

@@ -0,0 +1,19 @@
+{
+    "id": "1db19231-d201-4aa9-b81a-1958175751c5",
+    "modelName": "GMIncludedFile",
+    "mvc": "1.0",
+    "name": "NIDORAN-MALE.png",
+    "CopyToMask": -1,
+    "exists": false,
+    "exportAction": 0,
+    "exportDir": "",
+    "fileName": "NIDORAN-MALE.png",
+    "filePath": "datafiles\\Icons\\Regular",
+    "freeData": false,
+    "origName": "",
+    "overwrite": false,
+    "removeEnd": false,
+    "size": 0,
+    "store": false,
+    "tags": ""
+}

Project/datafiles_yy/Icons/Shiny/NIDORAN-MALE.png.yy

@@ -0,0 +1,19 @@
+{
+    "id": "22c23791-3f9c-47e0-88bf-90dfd8f7a595",
+    "modelName": "GMIncludedFile",
+    "mvc": "1.0",
+    "name": "NIDORAN-MALE.png",
+    "CopyToMask": -1,
+    "exists": false,
+    "exportAction": 0,
+    "exportDir": "",
+    "fileName": "NIDORAN-MALE.png",
+    "filePath": "datafiles\\Icons\\Shiny",
+    "freeData": false,
+    "origName": "",
+    "overwrite": false,
+    "removeEnd": false,
+    "size": 0,
+    "store": false,
+    "tags": ""
+}

Project/datafiles_yy/NIDORAN-FEMALE.png.yy

@@ -0,0 +1,19 @@
+{
+    "id": "251c6936-354b-4f36-9fce-656a1474808d",
+    "modelName": "GMIncludedFile",
+    "mvc": "1.0",
+    "name": "NIDORAN-FEMALE.png",
+    "CopyToMask": -1,
+    "exists": false,
+    "exportAction": 0,
+    "exportDir": "",
+    "fileName": "NIDORAN-FEMALE.png",
+    "filePath": "datafiles",
+    "freeData": false,
+    "origName": "",
+    "overwrite": false,
+    "removeEnd": false,
+    "size": 0,
+    "store": false,
+    "tags": ""
+}

Project/datafiles_yy/pokedata.csv.yy

@@ -1,5 +1,5 @@
 {
-    "id": "fe090029-e154-41dc-9a67-3e5b0d802aea",
+    "id": "fbcf4f33-71a9-488c-886e-0ca981e0f30c",
     "modelName": "GMIncludedFile",
     "mvc": "1.0",
     "name": "pokedata.csv",

Project/scripts/boxes_spawn/boxes_spawn.gml

@@ -21,7 +21,7 @@ for (global.box_count=1; global.current<global.dex_len; global.box_count++)
         global.box_header[global.box_count] = self;
         number = global.box_count;
         image_index = get_gen(global.dexdata[global.current, dex.dexno])-1;
-        show_debug_message("Spawned Box "+string(global.box_count)+" with PKMN #"+string(global.dexdata[global.current, dex.dexno])+" from Gen "+string(get_gen(global.dexdata[global.current, dex.dexno])))
+        //show_debug_message("Spawned Box "+string(global.box_count)+" with PKMN #"+string(global.dexdata[global.current, dex.dexno])+" from Gen "+string(get_gen(global.dexdata[global.current, dex.dexno])))
         image_speed = 0;
         
         if (check_genfirst(global.dexdata[global.current, dex.pokemon], false))

Project/scripts/button_do/button_do.gml

@@ -13,6 +13,7 @@ switch(argument0)
     case but.plus:
         global.counter++;
         
+        global.countdata[global.selecting.idno] = global.counter;
         savedata_write(savedata_section_get(global.show_shiny)+" Count", global.selecting.idno, global.counter);
         change_add();
     break;
@@ -21,6 +22,7 @@ switch(argument0)
         if (global.counter > 0)
             global.counter--;
         
+        global.countdata[global.selecting.idno] = global.counter;
         savedata_write(savedata_section_get(global.show_shiny)+" Count", global.selecting.idno, global.counter);
         change_add();
     break;

Project/scripts/click_slot/click_slot.gml

@@ -7,8 +7,11 @@ spr_plus = 0.75;
     
 color = get_color3(own, true);
 
-global.selected[dex.own] = own;
+if (global.selected[dex.idno] == idno)
+    global.selected[dex.own] = own;
+    
 global.savedata[idno] = own;
+//global.countdata[idno] = own;
 
 // Auto-Saves
 if (savedata_write(savedata_section_get(global.show_shiny), string(idno), own))

Project/scripts/dex_data_load/dex_data_load.gml

@@ -16,4 +16,10 @@ enum dex
     own
 }
 
-global.dexdata = csv_load("pokedata");
+global.dexdata = csv_load("pokedata");
+
+// NIDORAN temp fix
+global.dexdata[56,2] = "NIDORAN";
+global.dexdata[56,3] = "FEMALE";
+global.dexdata[59,2] = "NIDORAN";
+global.dexdata[59,3] = "MALE";

Project/scripts/form_get_gender_major/form_get_gender_major.gml

@@ -3,6 +3,7 @@
 
 switch(argument0)
 {
+    case "NIDORAN": //temp
     case "HIPPOPOTAS":
     case "HIPPOWDON":
     case "UNFEZANT":

Project/scripts/make_screenshot_shiny/make_screenshot_shiny.gml

@@ -12,15 +12,15 @@ show_debug_message("Loading count data...");
 
 var count_total = 0;
 
-ini_open("save.ini")
+//ini_open("save.ini")
 	for (var i=1; i<global.dex_len; i++)
 	{
-		global.countdata[i] = ini_read_real(look, string(i), 0);
+	//	global.countdata[i] = ini_read_real(look, string(i), 0);
 		
-		if (global.savedata[global.dexdata[i, dex.idno]] || global.countdata[i])
+		if (global.savedata[global.dexdata[i, dex.idno]] || global.countdata[global.dexdata[i, dex.idno]])
 			count_total++;
 	}
-ini_close();
+//ini_close();
 
 
 // Sanity Check
@@ -89,7 +89,7 @@ for (var i=0; i<slots_per_col; i++)
 	for (var j=0; j<slots_per_row; j++)
 		if (current<global.dex_len)
         {
-			while(!check_skip(current) || (current<global.dex_len-1 && !(global.savedata[global.dexdata[current, dex.idno]] || global.countdata[current])))
+			while(!check_skip(current) || (current<global.dex_len-1 && !(global.savedata[global.dexdata[current, dex.idno]] || global.countdata[global.dexdata[current, dex.idno]])))
                     current++;
             
             if (global.dexdata[current, dex.pokemon] != "ETERNATUS") // This is a line of code from a man who has given up.
@@ -124,8 +124,8 @@ for (var i=0; i<slots_per_col; i++)
 				draw_set_valign(fa_middle);
 				draw_set_halign(fa_center);
 				
-				if (global.countdata[current] != 0)
-					var txt = string(global.countdata[current]);
+				if (global.countdata[global.dexdata[current, dex.idno]] != 0)
+					var txt = string(global.countdata[global.dexdata[current, dex.idno]]);
 				else
 					var txt = "-";
 				

Project/scripts/savedata_load/savedata_load.gml

@@ -8,9 +8,20 @@ if (file_exists("save.ini"))
         global.show_shiny =     ini_read_real("Display", "Shiny Mode", false);
         
         var section = savedata_section_get(global.show_shiny);
+        global.countdata[0] =0
+        for (var i=1; i<=global.dex_len; i++)
+        {
+            global.savedata[i]  = ini_read_real(section,          string(i), 0);
+            global.countdata[i] = ini_read_real(section+" Count", string(i), 0);
+            /*
+            if (global.savedata[global.dexdata[i, dex.idno]] || global.countdata[global.dexdata[i, dex.idno]])
+            show_debug_message( "found: "+global.dexdata[i, dex.pokemon]+
+								"\tid: "+string(i)+
+								"\town: "+string(global.savedata[global.dexdata[i, dex.idno]])+
+								"\tcount: "+global.countdata[global.dexdata[i, dex.idno]]);*/
+        }
+        
         
-        for (var i=0; i<=global.dex_len; i++)
-            global.savedata[i] = ini_read_real(section, string(i), 0);
         
     ini_close();
     show_debug_message("LOADED SAVE FILE.");

Project/views/3a6f7b22-791c-4ade-a8fb-cd1be90397e1.yy

@@ -7,7 +7,8 @@
         "7bcacbef-4426-4c1d-9cd7-a525e542b8d5",
         "fc1d7186-0884-41d7-b5db-31b244cbf15d",
         "c28cce02-e90b-4eba-a72f-3196b96acf51",
-        "fe090029-e154-41dc-9a67-3e5b0d802aea"
+        "fbcf4f33-71a9-488c-886e-0ca981e0f30c",
+        "251c6936-354b-4f36-9fce-656a1474808d"
     ],
     "filterType": "GMIncludedFile",
     "folderName": "datafiles",

Project/views/5fad4cfd-9798-423c-8bbf-9b4bba9b9172.yy

@@ -1323,7 +1323,9 @@
         "a66f140c-862a-4615-9817-9bc374f61549",
         "428b9afc-125c-457b-b60f-0408c228d805",
         "85d705c4-b1e8-4293-8c80-3c88da004559",
-        "081c9ac3-b409-4650-a28b-b412d625cd3a"
+        "081c9ac3-b409-4650-a28b-b412d625cd3a",
+        "f3940cf8-cc3c-47b9-9d6a-e886f7ffc56c",
+        "1db19231-d201-4aa9-b81a-1958175751c5"
     ],
     "filterType": "GMIncludedFile",
     "folderName": "Regular",

Project/views/df726f61-1fee-4f7a-95da-50dc006de2ee.yy

@@ -1323,7 +1323,8 @@
         "f2d1b366-57bf-4b1a-a0f5-07e619513692",
         "40a6b72f-bf47-4947-a79c-778ef7895988",
         "29ad1e5f-ae25-4691-a6be-f94036e90f31",
-        "f7ef168c-0cca-48de-ad28-178dcecbfd44"
+        "f7ef168c-0cca-48de-ad28-178dcecbfd44",
+        "22c23791-3f9c-47e0-88bf-90dfd8f7a595"
     ],
     "filterType": "GMIncludedFile",
     "folderName": "Shiny",