diff --git a/Project/DexTool/DexTool.yyp b/Project/DexTool/DexTool.yyp index b88b82c..7b2ef41 100644 --- a/Project/DexTool/DexTool.yyp +++ b/Project/DexTool/DexTool.yyp @@ -134,6 +134,14 @@ "resourceType": "GMIncludedFile" } }, + { + "Key": "01109f28-4eca-fc23-b0d9-649acb9c158c", + "Value": { + "id": "7e1eab98-49d1-5c6f-ebfe-dc1f5b61e3e5", + "resourcePath": "scripts\\initials_set\\initials_set.yy", + "resourceType": "GMScript" + } + }, { "Key": "0114af16-544a-47b5-9361-edceacf54387", "Value": { @@ -1398,6 +1406,14 @@ "resourceType": "GMIncludedFile" } }, + { + "Key": "0c8bde50-6fda-efe6-8809-de6b265ccbcc", + "Value": { + "id": "be205714-8cc7-4ca8-bb9d-e415f9cac929", + "resourcePath": "scripts\\boxes_spawn\\boxes_spawn.yy", + "resourceType": "GMScript" + } + }, { "Key": "0c94b312-e27e-4ecf-ac65-7b02c19732b8", "Value": { @@ -25457,7 +25473,9 @@ "961739d9-bcef-9d3d-a9a7-6d0487191e8e", "9d9efccc-e28a-2782-ecbe-3ea08da108d6", "baf1e68b-6877-c2da-aed5-31f319313796", - "27426a5b-252b-ce49-0d97-9a0b620973f4" + "27426a5b-252b-ce49-0d97-9a0b620973f4", + "01109f28-4eca-fc23-b0d9-649acb9c158c", + "0c8bde50-6fda-efe6-8809-de6b265ccbcc" ], "tutorial": "" } \ No newline at end of file diff --git a/Project/DexTool/objects/obj_global/Create_0.gml b/Project/DexTool/objects/obj_global/Create_0.gml index d919e1d..d7b47e3 100644 --- a/Project/DexTool/objects/obj_global/Create_0.gml +++ b/Project/DexTool/objects/obj_global/Create_0.gml @@ -1,89 +1,7 @@ -/// @description DEX LOAD & ENUM (+GALAR DEX) -/// @param +GALAR DEX dex_data_load(); - - -/// INITIALS - -global.window_width = window_get_width(); -global.window_height = window_get_height(); - -scr_window_resize(); - -global.window_width = window_get_width(); -global.window_height = window_get_height(); - -global.box_len = global.window_width/2/7; -global.icon_scale = 2; - -global.font = font_add_sprite_ext(spr_font,"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZéÉ#-'!?():@_.% /♂♀",true,1) - -global.selected[dex.dexno] = "001"; -global.selected[dex.pokemon] = "BULBASAUR"; -global.selected[dex.form] = ""; -global.selected[dex.type1] = "Grass"; -global.selected[dex.type2] = "Poison"; -global.selected[dex.sprite] = -1; -global.selected[dex.own] = 0; - -global.dex_len = array_height_2d(global.dexdata); - -global.hud_pokemon_rate = 0.225; - -global.mouse_x_prev = mouse_x; -global.mouse_y_prev = mouse_x; - -global.various = false; -global.various_to = 0; - -/// SAVE DATA +initials_set(); savedata_load(); - dex_galar_load(global.show_galar); - -/// SPAWN SLOTS - -var pos_x = 0; -var pos_y = 0; - -global.current = 1; - -for (global.box_count=1; global.current