From 77b65ba68c2279b2868cd91cd80fb78342fe33aa Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 27 Mar 2024 21:32:13 -0400
Subject: [PATCH 1/2] shader var renames for hashlink

---
 Project.xml                                          | 2 +-
 assets                                               | 2 +-
 source/funkin/graphics/shaders/GaussianBlurShader.hx | 2 +-
 source/funkin/graphics/shaders/Grayscale.hx          | 2 +-
 source/funkin/graphics/shaders/HSVShader.hx          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Project.xml b/Project.xml
index ffc8382a4..ab709db17 100644
--- a/Project.xml
+++ b/Project.xml
@@ -111,7 +111,7 @@
 	<haxelib name="flixel-text-input" /> <!-- Improved text field rendering for HaxeUI -->
 	<haxelib name="polymod" /> <!-- Modding framework -->
 	<haxelib name="flxanimate" /> <!-- Texture atlas rendering -->
-	<haxelib name="hxCodec" if="desktop" /> <!-- Video playback -->
+	<haxelib name="hxCodec" if="desktop" unless="hl" /> <!-- Video playback -->
 
 	<haxelib name="json2object" /> <!-- JSON parsing -->
 	<haxelib name="thx.semver" /> <!-- Version string handling -->
diff --git a/assets b/assets
index 8013845e3..47a2869c7 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 8013845e331015b40c4cc35230f6d02bd2148d52
+Subproject commit 47a2869c7fdcd342b15ceaa676710a7239615c01
diff --git a/source/funkin/graphics/shaders/GaussianBlurShader.hx b/source/funkin/graphics/shaders/GaussianBlurShader.hx
index 81167655b..cecfdab80 100644
--- a/source/funkin/graphics/shaders/GaussianBlurShader.hx
+++ b/source/funkin/graphics/shaders/GaussianBlurShader.hx
@@ -20,6 +20,6 @@ class GaussianBlurShader extends FlxRuntimeShader
   public function setAmount(value:Float):Void
   {
     this.amount = value;
-    this.setFloat("amount", amount);
+    this.setFloat("_amount", amount);
   }
 }
diff --git a/source/funkin/graphics/shaders/Grayscale.hx b/source/funkin/graphics/shaders/Grayscale.hx
index 6673ace24..fbd0970e5 100644
--- a/source/funkin/graphics/shaders/Grayscale.hx
+++ b/source/funkin/graphics/shaders/Grayscale.hx
@@ -17,6 +17,6 @@ class Grayscale extends FlxRuntimeShader
   public function setAmount(value:Float):Void
   {
     amount = value;
-    this.setFloat("amount", amount);
+    this.setFloat("_amount", amount);
   }
 }
diff --git a/source/funkin/graphics/shaders/HSVShader.hx b/source/funkin/graphics/shaders/HSVShader.hx
index 733bbca7f..2dfdac2c9 100644
--- a/source/funkin/graphics/shaders/HSVShader.hx
+++ b/source/funkin/graphics/shaders/HSVShader.hx
@@ -20,7 +20,7 @@ class HSVShader extends FlxRuntimeShader
 
   function set_hue(value:Float):Float
   {
-    this.setFloat('hue', value);
+    this.setFloat('_hue', value);
     this.hue = value;
 
     return this.hue;

From e9b0af6ea246ea567d21fc719111b53f50fa35cd Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 3 Apr 2024 03:40:10 -0400
Subject: [PATCH 2/2] assets submod

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 503b73d20..15cf800ac 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 503b73d20be0b55f881da6182b70432b0810fd17
+Subproject commit 15cf800ac9cc4e55210dafb8f2c64838360f9fd0