From 722278fdd2f7b4601d8aaaed988e4a44317304ff Mon Sep 17 00:00:00 2001
From: haven <85509162+cookiesock@users.noreply.github.com>
Date: Tue, 22 Oct 2024 17:54:06 -0500
Subject: [PATCH 1/3] fix not returning to `PlayState` when leaving the options
 menu

---
 source/funkin/menus/PauseSubState.hx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx
index fb2326e5c..f48a4735a 100644
--- a/source/funkin/menus/PauseSubState.hx
+++ b/source/funkin/menus/PauseSubState.hx
@@ -153,6 +153,7 @@ class PauseSubState extends MusicBeatSubstate
 				persistentDraw = false;
 				openSubState(new KeybindsOptions());
 			case "Change Options":
+				TreeMenu.lastState = PlayState;
 				FlxG.switchState(new OptionsMenu());
 			case "Exit to charter":
 				FlxG.switchState(new funkin.editors.charter.Charter(PlayState.SONG.meta.name, PlayState.difficulty, false));
@@ -205,4 +206,4 @@ class PauseSubState extends MusicBeatSubstate
 				item.alpha = 0.6;
 		}
 	}
-}
\ No newline at end of file
+}

From 753404bb798661a6d312f00dbfc0aa7b9523e2ad Mon Sep 17 00:00:00 2001
From: haven <85509162+cookiesock@users.noreply.github.com>
Date: Tue, 22 Oct 2024 17:57:22 -0500
Subject: [PATCH 2/3] we will never speak of this.

---
 source/funkin/menus/PauseSubState.hx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx
index f48a4735a..bff3cd4df 100644
--- a/source/funkin/menus/PauseSubState.hx
+++ b/source/funkin/menus/PauseSubState.hx
@@ -14,6 +14,7 @@ import funkin.options.keybinds.KeybindsOptions;
 import funkin.menus.StoryMenuState;
 import funkin.backend.system.Conductor;
 import funkin.backend.utils.FunkinParentDisabler;
+import funkin.options.TreeMenu;
 
 class PauseSubState extends MusicBeatSubstate
 {

From 08179b124dc1f09f21df3b827565cce4c9b56a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=8D=9A=7ENex?=
 <87421482+NexIsDumb@users.noreply.github.com>
Date: Fri, 25 Oct 2024 01:11:45 +0200
Subject: [PATCH 3/3] bugfix when setting a new icon on the same hp

---
 source/funkin/game/HealthIcon.hx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/source/funkin/game/HealthIcon.hx b/source/funkin/game/HealthIcon.hx
index d55bf14b5..70f5024bf 100644
--- a/source/funkin/game/HealthIcon.hx
+++ b/source/funkin/game/HealthIcon.hx
@@ -85,12 +85,11 @@ class HealthIcon extends FlxSprite
 		if (animation.curAnim != null) {
 			var i:Int = -1;
 			var oldKey:Int = -1;
-			for(k=>icon in healthSteps) {
-				if (k > oldKey && k < health * 100) {
-					oldKey = k;
-					i = icon;
-				}
+			for (k=>icon in healthSteps) if (k > oldKey && k <= health * 100) {
+				oldKey = k;
+				i = icon;
 			}
+
 			if (i >= 0) animation.curAnim.curFrame = i;
 		}
 	}