From 24096bd319c10aa150c9a8fcd578fbb812e14045 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 4 Sep 2024 10:58:18 -0400
Subject: [PATCH] Fixed positioning in Blazin'.

---
 assets                                                | 2 +-
 source/funkin/audio/visualize/ABotVis.hx              | 4 +++-
 source/funkin/play/character/AnimateAtlasCharacter.hx | 2 +-
 source/funkin/ui/charSelect/CharSelectGF.hx           | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/assets b/assets
index 8156c2d4b..bbf8c7d53 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 8156c2d4b356a9e4b12a0275a82e58c84b65c4c3
+Subproject commit bbf8c7d53b7560c7440efd4fb8b1d5cfa17e56b9
diff --git a/source/funkin/audio/visualize/ABotVis.hx b/source/funkin/audio/visualize/ABotVis.hx
index a6ad0570e..4d2243b7c 100644
--- a/source/funkin/audio/visualize/ABotVis.hx
+++ b/source/funkin/audio/visualize/ABotVis.hx
@@ -102,7 +102,9 @@ class ABotVis extends FlxTypedSpriteGroup<FlxSprite>
       var animFrame:Int = Math.round(levels[i].value * 5);
 
       #if desktop
-      animFrame = Math.round(animFrame * FlxG.sound.volume);
+      // Web version scales with the Flixel volume level.
+      // This line brings platform parity but looks worse.
+      // animFrame = Math.round(animFrame * FlxG.sound.volume);
       #end
 
       animFrame = Math.floor(Math.min(5, animFrame));
diff --git a/source/funkin/play/character/AnimateAtlasCharacter.hx b/source/funkin/play/character/AnimateAtlasCharacter.hx
index 5cc603429..f432d08a0 100644
--- a/source/funkin/play/character/AnimateAtlasCharacter.hx
+++ b/source/funkin/play/character/AnimateAtlasCharacter.hx
@@ -122,7 +122,7 @@ class AnimateAtlasCharacter extends BaseCharacter
    */
   public override function isAnimationFinished():Bool
   {
-    return mainSprite.isAnimationFinished();
+    return mainSprite?.isAnimationFinished() ?? false;
   }
 
   function loadAtlasSprite():FlxAtlasSprite
diff --git a/source/funkin/ui/charSelect/CharSelectGF.hx b/source/funkin/ui/charSelect/CharSelectGF.hx
index ea7d41448..a990db817 100644
--- a/source/funkin/ui/charSelect/CharSelectGF.hx
+++ b/source/funkin/ui/charSelect/CharSelectGF.hx
@@ -109,7 +109,9 @@ class CharSelectGF extends FlxAtlasSprite implements IBPMSyncedScriptedClass
         var animFrame:Int = Math.round(levels[i].value * 12);
 
         #if desktop
-        animFrame = Math.round(animFrame * FlxG.sound.volume);
+        // Web version scales with the Flixel volume level.
+        // This line brings platform parity but looks worse.
+        // animFrame = Math.round(animFrame * FlxG.sound.volume);
         #end
 
         animFrame = Math.floor(Math.min(12, animFrame));