From 1397fa42e3af2006bc6bec530777aaf7f9b140d9 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Thu, 23 Feb 2023 21:11:24 +0100
Subject: [PATCH] fixed 3 github issues in a row holy shit

---
 assets/data/dialogue/boxes/default.xml          |  2 +-
 assets/data/stages/school-evil.xml              |  2 +-
 assets/songs/tutorial/meta.json                 |  3 ++-
 buildnumber.txt                                 |  2 +-
 commit-public.BAT                               |  5 ++---
 commit.bat                                      | 13 -------------
 source/funkin/cutscenes/dialogue/DialogueBox.hx |  2 +-
 source/funkin/game/SplashHandler.hx             |  8 ++++++++
 8 files changed, 16 insertions(+), 21 deletions(-)
 delete mode 100644 commit.bat

diff --git a/assets/data/dialogue/boxes/default.xml b/assets/data/dialogue/boxes/default.xml
index 90e63022..a973f61a 100644
--- a/assets/data/dialogue/boxes/default.xml
+++ b/assets/data/dialogue/boxes/default.xml
@@ -3,7 +3,7 @@
     <!--
         Node containing all text settings
      -->
-    <text font="vcr" x="107" y="206" width="1053" color="#000000" size="40"/>
+    <text font="vcr.ttf" x="107" y="206" width="1053" color="#000000" size="40"/>
 
     <!--
         All positions for characters
diff --git a/assets/data/stages/school-evil.xml b/assets/data/stages/school-evil.xml
index 1c12d28b..63203ecf 100644
--- a/assets/data/stages/school-evil.xml
+++ b/assets/data/stages/school-evil.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-stage>
-<stage zoom="0.5" name="school-evil" folder="stages/school/" >
+<stage zoom="1" name="school-evil" folder="stages/school/" >
     <sprite name="bg" x="400" y="200" sprite="animatedEvilSchool"
         antialiasing="false" scale="6" scrollx="0.8" scrolly="0.9" type="loop"/>
 </stage>
\ No newline at end of file
diff --git a/assets/songs/tutorial/meta.json b/assets/songs/tutorial/meta.json
index 3498512e..e4a6b074 100644
--- a/assets/songs/tutorial/meta.json
+++ b/assets/songs/tutorial/meta.json
@@ -4,5 +4,6 @@
     "icon": "gf",
     "color": "#9271FD",
     "coopAllowed": true,
-    "opponentModeAllowed": true
+    "opponentModeAllowed": true,
+    "needsVoices": false
 }
\ No newline at end of file
diff --git a/buildnumber.txt b/buildnumber.txt
index 7233853f..eb46a8c0 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2386
\ No newline at end of file
+2387
\ No newline at end of file
diff --git a/commit-public.BAT b/commit-public.BAT
index 4a4a90b0..ff6c7eb0 100644
--- a/commit-public.BAT
+++ b/commit-public.BAT
@@ -1,13 +1,12 @@
 @echo OFF
-set /p msg="Commit message: "
 echo ==============================
 echo Adding all files...
 echo ==============================
 git add .
 echo ==============================
-echo Commiting with the message %msg%...
+echo Commiting with the message %1...
 echo ==============================
-git commit -m "%msg%"
+git commit -m %1
 echo ==============================
 echo Pushing...
 echo ==============================
diff --git a/commit.bat b/commit.bat
deleted file mode 100644
index 303874b3..00000000
--- a/commit.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo OFF
-echo ==============================
-echo Adding all files...
-echo ==============================
-git add .
-echo ==============================
-echo Commiting with the message %1...
-echo ==============================
-git commit -m "%1"
-echo ==============================
-echo Pushing...
-echo ==============================
-git push -u dev main
\ No newline at end of file
diff --git a/source/funkin/cutscenes/dialogue/DialogueBox.hx b/source/funkin/cutscenes/dialogue/DialogueBox.hx
index 0e82e30e..1d1a1da7 100644
--- a/source/funkin/cutscenes/dialogue/DialogueBox.hx
+++ b/source/funkin/cutscenes/dialogue/DialogueBox.hx
@@ -55,7 +55,7 @@ class DialogueBox extends FunkinSprite {
                 textNode.has.width ? Std.parseInt(textNode.att.width).getDefault(FlxG.width) : FlxG.width, "");
             text.color = textNode.getAtt("color").getColorFromDynamic().getDefault(0xFF000000);
             text.size = Std.parseInt(textNode.att.size).getDefault(20);
-            text.font = Paths.font('${textNode.getAtt("font").getDefault("vcr")}.ttf');
+            text.font = Paths.font('${textNode.getAtt("font").getDefault("vcr.ttf")}');
             text.antialiasing = textNode.getAtt("antialiasing").getDefault("false") == "true";
             text.sounds = [FlxG.sound.load(textTypeSFX)];
         } catch(e) {
diff --git a/source/funkin/game/SplashHandler.hx b/source/funkin/game/SplashHandler.hx
index 3104fee1..72bdba8f 100644
--- a/source/funkin/game/SplashHandler.hx
+++ b/source/funkin/game/SplashHandler.hx
@@ -31,6 +31,14 @@ class SplashHandler extends FlxTypedGroup<FunkinSprite> {
         grpMap = null;
     }
 
+    var _firstDraw:Bool = true;
+    public override function draw() {
+        super.draw();
+        if (_firstDraw != (_firstDraw = false))
+            for(grp in grpMap)
+                grp.draw();
+    }
+
     var __grp:SplashGroup;
     public function showSplash(name:String, strum:Strum) {
         __grp = getSplashGroup(name);