From 8fcc75e0e29a62a083eb858dcdb3f5672dbc94d7 Mon Sep 17 00:00:00 2001
From: stuartt_mcoded <34777184+RealMCoded@users.noreply.github.com>
Date: Sat, 19 Feb 2022 18:35:09 -0500
Subject: [PATCH] proper boot logo wow

---
 objects/obj_bootGraphic/Draw_0.gml     | 7 ++++++-
 rooms/init/RoomCreationCode.gml        | 1 +
 rooms/rm_bootGraphic/rm_bootGraphic.yy | 2 +-
 scripts/initSystem/initSystem.gml      | 8 +++++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/objects/obj_bootGraphic/Draw_0.gml b/objects/obj_bootGraphic/Draw_0.gml
index 19e4814..205d066 100644
--- a/objects/obj_bootGraphic/Draw_0.gml
+++ b/objects/obj_bootGraphic/Draw_0.gml
@@ -1,6 +1,11 @@
 /// @description
-//draw_text_color(32, 32, "TEMPORARY BOOT GRAPHIC!\n\nIT IS LOADING HOWEVER", c_white, c_white, c_white, c_white, t)
 
 draw_sprite_ext(global.sprite[0], 0, 0, 0, 0.7, 0.7, 0, c_white, t)
 
+switch global.system{
+	case "95": draw_sprite_ext(global.sprite[1], 0, room_width/2, room_height/2, 0.5, 0.5, 0, c_white, t*2) break;
+	case "95plus": draw_sprite_ext(global.sprite[1], 0, room_width/2, room_height/2, 1, 1, 0, c_white, t*2) break;
+	default: draw_sprite_ext(global.sprite[1], 0, room_width/2, room_height/2, 1, 1, 0, c_white, t*2) break;	
+}
+
 t+=0.01
\ No newline at end of file
diff --git a/rooms/init/RoomCreationCode.gml b/rooms/init/RoomCreationCode.gml
index 158caa2..5723c3b 100644
--- a/rooms/init/RoomCreationCode.gml
+++ b/rooms/init/RoomCreationCode.gml
@@ -27,6 +27,7 @@ ini_close()
 
 #region Sprites - ALL OF THESE ARE PLACEHOLDERS AT FIRST
 global.sprite[0] = spr_null //
+global.sprite[1] = spr_null
 #endregion
 
 #region Backgrounds
diff --git a/rooms/rm_bootGraphic/rm_bootGraphic.yy b/rooms/rm_bootGraphic/rm_bootGraphic.yy
index cb8eee9..5ebc3ec 100644
--- a/rooms/rm_bootGraphic/rm_bootGraphic.yy
+++ b/rooms/rm_bootGraphic/rm_bootGraphic.yy
@@ -2,7 +2,7 @@
 {
     "name": "rm_bootGraphic",
     "id": "e3d50619-edf7-42e8-a7dd-7584b476be46",
-    "creationCodeFile": "",
+    "creationCodeFile": "RoomCreationCode.gml",
     "inheritCode": false,
     "inheritCreationOrder": false,
     "inheritLayers": false,
diff --git a/scripts/initSystem/initSystem.gml b/scripts/initSystem/initSystem.gml
index 30b11e0..05360fb 100644
--- a/scripts/initSystem/initSystem.gml
+++ b/scripts/initSystem/initSystem.gml
@@ -9,7 +9,13 @@ global.level = ini_read_real(global.system, "level", 1)
 ini_close()
 
 //Define assets
-global.sprite[0] = sprite_add(global.installLocation + "\\wallpapers.desktop\\skins\\" + global.system +"\\wallpaper6.png", 1, 0, 1, 0, 0)
+global.sprite[0] = sprite_add(global.installLocation + "\\wallpapers.desktop\\skins\\" + global.system +"\\sky.png", 1, 0, 1, 0, 0)
+
+switch global.system {
+	case "95": global.sprite[1] = sprite_add(global.installLocation + "\\art\\skins\\" + global.system +"\\logo.png", 1, 0, 0, 512, 256) break;
+	case "95plus": global.sprite[1] = sprite_add(global.installLocation + "\\art\\skins\\" + global.system +"\\logo.png", 1, 0, 0, 256, 128) break;
+	default: break;	
+}
 
 sprite_replace(spr_bar, global.installLocation + "\\art\\skins\\" + global.system +"\\progressbarpanel.png", 1, 0, 0, 66, 22)