Merge branch 'main' into base-fnf-port-remake

source/funkin/backend/scripting/HScript.hx

@@ -64,7 +64,7 @@ class HScript extends Script {
 	}
 
 	private function importFailedCallback(cl:Array<String>):Bool {
-		if(_importFailedCallback(cl, "") || _importFailedCallback(cl, "source/")) {
+		if(_importFailedCallback(cl, "source/") || _importFailedCallback(cl, "")) {
 			return true;
 		}
 		return false;

source/funkin/backend/shaders/FunkinShader.hx

@@ -482,11 +482,6 @@ uniform sampler2D bitmap;
 uniform bool hasTransform;
 uniform bool hasColorTransform;
 
-vec4 flixel_texture2D(sampler2D bitmap, vec2 coord) {
-	vec4 color = texture2D(bitmap, coord);
-	return applyFlixelEffects(color);
-}
-
 vec4 applyFlixelEffects(vec4 color) {
 	if (!hasTransform) {
 		return color;
@@ -509,6 +504,11 @@ vec4 applyFlixelEffects(vec4 color) {
 	return vec4(0.0, 0.0, 0.0, 0.0);
 }
 
+vec4 flixel_texture2D(sampler2D bitmap, vec2 coord) {
+	vec4 color = texture2D(bitmap, coord);
+	return applyFlixelEffects(color);
+}
+
 uniform vec4 _camSize;
 
 float map(float value, float min1, float max1, float min2, float max2) {