From 83216e171c1053c2e0dce7432ad13e0b40332c95 Mon Sep 17 00:00:00 2001
From: Hyper_ <40342021+NotHyper-474@users.noreply.github.com>
Date: Sun, 4 May 2025 21:43:42 -0300
Subject: [PATCH 01/11] Remove unnecessary Tracy frame mark

This is already done by OpenFL
---
 source/funkin/util/WindowUtil.hx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/source/funkin/util/WindowUtil.hx b/source/funkin/util/WindowUtil.hx
index ee64660cb..8f2ae227f 100644
--- a/source/funkin/util/WindowUtil.hx
+++ b/source/funkin/util/WindowUtil.hx
@@ -85,12 +85,6 @@ class WindowUtil
    */
   public static function initTracy():Void
   {
-    // Apply a marker to indicate frame end for the Tracy profiler.
-    // Do this only if Tracy is configured to prevent lag.
-    openfl.Lib.current.stage.addEventListener(openfl.events.Event.EXIT_FRAME, (e:openfl.events.Event) -> {
-      cpp.vm.tracy.TracyProfiler.frameMark();
-    });
-
     var appInfoMessage = funkin.util.logging.CrashHandler.buildSystemInfo();
 
     trace("Friday Night Funkin': Connection to Tracy profiler successful.");

From a5921ab96c703b99fb94e1cef0039e7aa6c7e88f Mon Sep 17 00:00:00 2001
From: KarimAkra <karimakra512@gmail.com>
Date: Wed, 4 Jun 2025 16:31:15 +0300
Subject: [PATCH 02/11] Disable the lime.utils.AssetCache version macro

---
 project.hxp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/project.hxp b/project.hxp
index f90d3f3e2..06fdde9f3 100644
--- a/project.hxp
+++ b/project.hxp
@@ -762,6 +762,10 @@ class Project extends HXProject
     // Enable OpenFL's error handler. Required for the crash logger.
     setHaxedef("openfl-enable-handle-error");
 
+    // Disable a macro in Lime that generates a random number for Assets.cache.version every build.
+    // This doesn't seem to be of any use and it causes lime.utils.AssetCache to be re-compiled on every build.
+    setHaxeDef("lime_disable_assets_version");
+
     // Enable stack trace tracking. Good for debugging but has a (minor) performance impact.
     setHaxedef("HXCPP_CHECK_POINTER");
     setHaxedef("HXCPP_STACK_LINE");

From 5177e1275eb2fb2b016224c139e84debb421b895 Mon Sep 17 00:00:00 2001
From: Lasercar <64717068+Lasercar@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:46:43 +1000
Subject: [PATCH 03/11] Add all tween types

---
 source/funkin/play/event/FocusCameraSongEvent.hx | 12 ++++++++++++
 source/funkin/play/event/ScrollSpeedEvent.hx     | 14 +++++++++++++-
 source/funkin/play/event/ZoomCameraSongEvent.hx  | 14 +++++++++++++-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/source/funkin/play/event/FocusCameraSongEvent.hx b/source/funkin/play/event/FocusCameraSongEvent.hx
index 3198e0792..137a9fbc5 100644
--- a/source/funkin/play/event/FocusCameraSongEvent.hx
+++ b/source/funkin/play/event/FocusCameraSongEvent.hx
@@ -218,9 +218,21 @@ class FocusCameraSongEvent extends SongEvent
           'Smooth Step In' => 'smoothStepIn',
           'Smooth Step Out' => 'smoothStepOut',
           'Smooth Step In/Out' => 'smoothStepInOut',
+          'Smoother Step In' => 'smootherStepIn',
+          'Smoother Step Out' => 'smootherStepOut',
+          'Smoother Step In/Out' => 'smootherStepInOut',
           'Elastic In' => 'elasticIn',
           'Elastic Out' => 'elasticOut',
           'Elastic In/Out' => 'elasticInOut',
+          'Back In' => 'backIn',
+          'Back Out' => 'backOut',
+          'Back In/Out' => 'backInOut',
+          'Bounce In' => 'bounceIn',
+          'Bounce Out' => 'bounceOut',
+          'Bounce In/Out' => 'bounceInOut',
+          'Circ In' => 'circIn',
+          'Circ Out' => 'circOut',
+          'Circ In/Out' => 'circInOut',
           'Instant (Ignores duration)' => 'INSTANT',
           'Classic (Ignores duration)' => 'CLASSIC'
         ]
diff --git a/source/funkin/play/event/ScrollSpeedEvent.hx b/source/funkin/play/event/ScrollSpeedEvent.hx
index bc0e99ba5..227fa0be2 100644
--- a/source/funkin/play/event/ScrollSpeedEvent.hx
+++ b/source/funkin/play/event/ScrollSpeedEvent.hx
@@ -149,9 +149,21 @@ class ScrollSpeedEvent extends SongEvent
           'Smooth Step In' => 'smoothStepIn',
           'Smooth Step Out' => 'smoothStepOut',
           'Smooth Step In/Out' => 'smoothStepInOut',
+          'Smoother Step In' => 'smootherStepIn',
+          'Smoother Step Out' => 'smootherStepOut',
+          'Smoother Step In/Out' => 'smootherStepInOut',
           'Elastic In' => 'elasticIn',
           'Elastic Out' => 'elasticOut',
-          'Elastic In/Out' => 'elasticInOut'
+          'Elastic In/Out' => 'elasticInOut',
+          'Back In' => 'backIn',
+          'Back Out' => 'backOut',
+          'Back In/Out' => 'backInOut',
+          'Bounce In' => 'bounceIn',
+          'Bounce Out' => 'bounceOut',
+          'Bounce In/Out' => 'bounceInOut',
+          'Circ In' => 'circIn',
+          'Circ Out' => 'circOut',
+          'Circ In/Out' => 'circInOut'
         ]
       },
       {
diff --git a/source/funkin/play/event/ZoomCameraSongEvent.hx b/source/funkin/play/event/ZoomCameraSongEvent.hx
index 0c34028c8..d3635f893 100644
--- a/source/funkin/play/event/ZoomCameraSongEvent.hx
+++ b/source/funkin/play/event/ZoomCameraSongEvent.hx
@@ -158,9 +158,21 @@ class ZoomCameraSongEvent extends SongEvent
           'Smooth Step In' => 'smoothStepIn',
           'Smooth Step Out' => 'smoothStepOut',
           'Smooth Step In/Out' => 'smoothStepInOut',
+          'Smoother Step In' => 'smootherStepIn',
+          'Smoother Step Out' => 'smootherStepOut',
+          'Smoother Step In/Out' => 'smootherStepInOut',
           'Elastic In' => 'elasticIn',
           'Elastic Out' => 'elasticOut',
-          'Elastic In/Out' => 'elasticInOut'
+          'Elastic In/Out' => 'elasticInOut',
+          'Back In' => 'backIn',
+          'Back Out' => 'backOut',
+          'Back In/Out' => 'backInOut',
+          'Bounce In' => 'bounceIn',
+          'Bounce Out' => 'bounceOut',
+          'Bounce In/Out' => 'bounceInOut',
+          'Circ In' => 'circIn',
+          'Circ Out' => 'circOut',
+          'Circ In/Out' => 'circInOut'
         ]
       }
     ]);

From 0345107e71e175f20ef0e5131c00c100665c7cdd Mon Sep 17 00:00:00 2001
From: sector-a <82838084+sector-a@users.noreply.github.com>
Date: Thu, 5 Jun 2025 01:17:33 +0300
Subject: [PATCH 04/11] Disable inst select menu on mobile

---
 source/funkin/ui/freeplay/FreeplayState.hx | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index dce3fcda0..a2893bf70 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -2290,16 +2290,22 @@ class FreeplayState extends MusicBeatSubState
     var altInstrumentalIds:Array<String> = targetSong.listAltInstrumentalIds(targetDifficultyId,
       targetDifficulty?.variation ?? Constants.DEFAULT_VARIATION) ?? [];
 
+    #if !mobile
     if (altInstrumentalIds.length > 0)
     {
       var instrumentalIds = [baseInstrumentalId].concat(altInstrumentalIds);
       openInstrumentalList(cap, instrumentalIds);
+
+      return;
     }
-    else
-    {
-      trace('NO ALTS');
-      capsuleOnConfirmDefault(cap);
-    }
+    #end
+
+    #if mobile
+    trace('ALTS ARE DISABLED');
+    #else
+    trace('NO ALTS');
+    #end
+    capsuleOnConfirmDefault(cap);
   }
 
   public function getControls():Controls

From 067a04e0698276f9952481d326499a9cd404fc09 Mon Sep 17 00:00:00 2001
From: VioletSnowLeopard <ngzeretzke@gmail.com>
Date: Wed, 7 May 2025 23:24:57 -0400
Subject: [PATCH 05/11] Remove this unnecessary line

`curSelected` is always set to 0 directly above this
---
 source/funkin/ui/freeplay/FreeplayState.hx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index a2893bf70..081e1bedc 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -833,10 +833,6 @@ class FreeplayState extends MusicBeatSubState
     currentFilteredSongs = tempSongs;
     curSelected = 0;
 
-    // If curSelected is 0, the result will be null and fall back to the rememberedSongId.
-    // We set this so if we change the filter, we'd remain on the same song if it's still in the list.
-    rememberedSongId = grpCapsules.members[curSelected]?.freeplayData?.data.id ?? rememberedSongId;
-
     grpCapsules.killMembers();
 
     // Initialize the random capsule, with empty/blank info (which we display once bf/pico does his hand)

From 3bbb4b06c8c1a1885a18d4354fcfa4363a0c6c75 Mon Sep 17 00:00:00 2001
From: Lasercar <64717068+Lasercar@users.noreply.github.com>
Date: Mon, 5 May 2025 16:10:30 +1000
Subject: [PATCH 06/11] no character?

---
 .../dialogs/ChartEditorCharacterIconSelectorMenu.hx      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx
index 2c9de5c62..01b7c59ac 100644
--- a/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx
+++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx
@@ -22,7 +22,8 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
   public var charSelectScroll:ScrollView;
   public var charIconName:Label;
 
-  var currentCharButton:Button;
+  var currentCharButton:Null<Button> = null;
+  var currentCharId:String = '';
 
   public function new(chartEditorState2:ChartEditorState, charType:CharacterType, lockPosition:Bool = false)
   {
@@ -36,14 +37,16 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
         ease: FlxEase.quartOut,
         onComplete: function(_) {
           // Just focus the button FFS. Idk why, but the scrollbar doesn't update until after the tween finishes with this????
-          currentCharButton.focus = true;
+          if (currentCharButton != null) currentCharButton.focus = true;
+          else
+            chartEditorState.error('Failure', 'Could not find character of ${currentCharId} in registry (Is the character in the registry?)');
         }
       });
   }
 
   function initialize(charType:CharacterType, lockPosition:Bool)
   {
-    var currentCharId:String = switch (charType)
+    currentCharId = switch (charType)
     {
       case BF: chartEditorState.currentSongMetadata.playData.characters.player;
       case GF: chartEditorState.currentSongMetadata.playData.characters.girlfriend;

From ab817bb1eab74ae71c1b1fd74d7512a11e6d4339 Mon Sep 17 00:00:00 2001
From: Lasercar <64717068+Lasercar@users.noreply.github.com>
Date: Sun, 4 May 2025 23:31:18 +1000
Subject: [PATCH 07/11] Fake rank now visible Also fixes the song text clipping
 the rank area when getting a new rank

---
 source/funkin/ui/freeplay/FreeplayState.hx | 5 ++++-
 source/funkin/ui/freeplay/SongMenuItem.hx  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index 081e1bedc..03f03bfc4 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -959,6 +959,9 @@ class FreeplayState extends MusicBeatSubState
 
     rememberedSongId = fromResults.songId;
     rememberedDifficulty = fromResults.difficultyId;
+    capsuleToRank.fakeRanking.visible = true;
+    capsuleToRank.fakeRanking.alpha = 0; // If this isn't done, you'd see a tiny E being replaced for the first rank
+
     changeSelection();
     changeDiff();
 
@@ -999,6 +1002,7 @@ class FreeplayState extends MusicBeatSubState
       sparksADD.cameras = [rankCamera];
       sparksADD.color = fromResults.oldRank.getRankingFreeplayColor();
       // sparksADD.color = sparks.color;
+      capsuleToRank.fakeRanking.alpha = 1.0;
     }
 
     capsuleToRank.doLerp = false;
@@ -1011,7 +1015,6 @@ class FreeplayState extends MusicBeatSubState
     trace(originalPos);
 
     capsuleToRank.ranking.visible = false;
-    capsuleToRank.fakeRanking.visible = false;
 
     // Rank animation vibrations.
     HapticUtil.increasingVibrate(Constants.MIN_VIBRATION_AMPLITUDE, Constants.MAX_VIBRATION_AMPLITUDE, 0.6);
diff --git a/source/funkin/ui/freeplay/SongMenuItem.hx b/source/funkin/ui/freeplay/SongMenuItem.hx
index fb4e64e2a..43215ba3c 100644
--- a/source/funkin/ui/freeplay/SongMenuItem.hx
+++ b/source/funkin/ui/freeplay/SongMenuItem.hx
@@ -300,7 +300,7 @@ class SongMenuItem extends FlxSpriteGroup
     var clipSize:Int = 290;
     var clipType:Int = 0;
 
-    if (ranking.visible)
+    if (ranking.visible || fakeRanking.visible)
     {
       favIconBlurred.x = this.x + 370;
       favIcon.x = favIconBlurred.x;

From 34d5ed11695cef7348c13505f13fb1da38b7988c Mon Sep 17 00:00:00 2001
From: VioletSnowLeopard <ngzeretzke@gmail.com>
Date: Sat, 3 May 2025 17:33:59 -0400
Subject: [PATCH 08/11] Fix combo drop animations

---
 source/funkin/modding/events/ScriptEvent.hx | 2 +-
 source/funkin/play/PlayState.hx             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/funkin/modding/events/ScriptEvent.hx b/source/funkin/modding/events/ScriptEvent.hx
index 6f4742a29..6710e4138 100644
--- a/source/funkin/modding/events/ScriptEvent.hx
+++ b/source/funkin/modding/events/ScriptEvent.hx
@@ -255,7 +255,7 @@ class HoldNoteScriptEvent extends NoteScriptEvent
    */
   public var doesNotesplash:Bool = false;
 
-  public function new(type:ScriptEventType, holdNote:SustainTrail, healthChange:Float, score:Int, isComboBreak:Bool, cancelable:Bool = false):Void
+  public function new(type:ScriptEventType, holdNote:SustainTrail, healthChange:Float, score:Int, isComboBreak:Bool, comboCount:Int = 0, cancelable:Bool = false):Void
   {
     super(type, null, healthChange, comboCount, true);
     this.holdNote = holdNote;
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 0978839e0..adfc28c3e 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -2517,7 +2517,7 @@ class PlayState extends MusicBeatSubState
       {
         // Call an event to allow canceling the note miss.
         // NOTE: This is what handles the character animations!
-        var event:NoteScriptEvent = new NoteScriptEvent(NOTE_MISS, note, Constants.HEALTH_MISS_PENALTY, 0, true);
+        var event:NoteScriptEvent = new NoteScriptEvent(NOTE_MISS, note, Constants.HEALTH_MISS_PENALTY, Highscore.tallies.combo, true);
         dispatchEvent(event);
 
         // Calling event.cancelEvent() skips all the other logic! Neat!
@@ -2584,7 +2584,7 @@ class PlayState extends MusicBeatSubState
             var healthChange = healthChangeUncapped.clamp(healthChangeMax, 0);
             var scoreChange = Std.int(Constants.SCORE_HOLD_DROP_PENALTY_PER_SECOND * remainingLengthSec);
 
-            var event:HoldNoteScriptEvent = new HoldNoteScriptEvent(NOTE_HOLD_DROP, holdNote, healthChange, scoreChange, true);
+            var event:HoldNoteScriptEvent = new HoldNoteScriptEvent(NOTE_HOLD_DROP, holdNote, healthChange, scoreChange, true, Highscore.tallies.combo);
             dispatchEvent(event);
 
             trace('Penalizing score by ${event.score} and health by ${event.healthChange} for dropping hold note (is combo break: ${event.isComboBreak})!');

From 451d4d1399a78d5e656025d695002e4bb7cb03e9 Mon Sep 17 00:00:00 2001
From: Eric <ericmyllyoja@gmail.com>
Date: Wed, 4 Jun 2025 21:03:31 -0400
Subject: [PATCH 09/11] Fix typo in project.hxp (#1116)

---
 project.hxp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.hxp b/project.hxp
index 98a31ca5e..dc20650fd 100644
--- a/project.hxp
+++ b/project.hxp
@@ -769,7 +769,7 @@ class Project extends HXProject
 
     // Disable a macro in Lime that generates a random number for Assets.cache.version every build.
     // This doesn't seem to be of any use and it causes lime.utils.AssetCache to be re-compiled on every build.
-    setHaxeDef("lime_disable_assets_version");
+    setHaxedef("lime_disable_assets_version");
 
     // Enable stack trace tracking. Good for debugging but has a (minor) performance impact.
     setHaxedef("HXCPP_CHECK_POINTER");

From 2f647127b1a08da4b59df196da9e693f9619cdfa Mon Sep 17 00:00:00 2001
From: MAJigsaw77 <77043862+MAJigsaw77@users.noreply.github.com>
Date: Thu, 5 Jun 2025 10:05:28 +0300
Subject: [PATCH 10/11] Use `TOP_CENTER` for the `AD` banner on the pause menu.

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

diff --git a/source/funkin/play/PauseSubState.hx b/source/funkin/play/PauseSubState.hx
index b732d92f4..916b1a6a7 100644
--- a/source/funkin/play/PauseSubState.hx
+++ b/source/funkin/play/PauseSubState.hx
@@ -213,7 +213,7 @@ class PauseSubState extends MusicBeatSubState
     #if FEATURE_MOBILE_ADVERTISEMENTS
     extension.admob.Admob.onEvent.add(onBannerEvent);
 
-    funkin.mobile.util.AdMobUtil.addBanner(extension.admob.AdmobBannerSize.BANNER, extension.admob.AdmobBannerAlign.TOP_LEFT);
+    funkin.mobile.util.AdMobUtil.addBanner(extension.admob.AdmobBannerSize.BANNER, extension.admob.AdmobBannerAlign.TOP_CENTER);
     #end
 
     super.create();
@@ -279,6 +279,7 @@ class PauseSubState extends MusicBeatSubState
         failedAdPlaceHolder = new FunkinSprite(0, 0);
         failedAdPlaceHolder.makeSolidColor(Math.floor(320 * scale), Math.floor(50 * scale), FlxColor.RED);
         failedAdPlaceHolder.updateHitbox();
+        failedAdPlaceHolder.screenCenter(X);
         failedAdPlaceHolder.scrollFactor.set(0, 0);
         add(failedAdPlaceHolder);
       }

From fabc16d265dcd0854a16ddb8dd220af8b916d05a Mon Sep 17 00:00:00 2001
From: sector-a <82838084+sector-a@users.noreply.github.com>
Date: Fri, 6 Jun 2025 00:10:25 +0300
Subject: [PATCH 11/11] Add haptics preference

---
 source/funkin/Preferences.hx                  | 37 +++++++++++++++----
 .../play/notes/NoteVibrationsHandler.hx       |  5 ++-
 source/funkin/save/Save.hx                    |  8 ++--
 source/funkin/ui/options/PreferencesMenu.hx   | 15 ++++++++
 source/funkin/util/HapticUtil.hx              | 28 +++++++++++++-
 5 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/source/funkin/Preferences.hx b/source/funkin/Preferences.hx
index 057429055..f89a5e202 100644
--- a/source/funkin/Preferences.hx
+++ b/source/funkin/Preferences.hx
@@ -5,6 +5,7 @@ import funkin.mobile.ui.FunkinHitbox;
 #end
 import funkin.save.Save;
 import funkin.util.WindowUtil;
+import funkin.util.HapticUtil.HapticsMode;
 
 /**
  * A core class which provides a store of user-configurable, globally relevant values.
@@ -147,20 +148,42 @@ class Preferences
   }
 
   /**
-   * If enabled, vibration will be enabled.
-   * @default `true`
+   * If enabled, haptic feedback will be enabled.
+   * @default `All`
    */
-  public static var vibration(get, set):Bool;
+  public static var hapticsMode(get, set):HapticsMode;
 
-  static function get_vibration():Bool
+  static function get_hapticsMode():HapticsMode
   {
-    return Save?.instance?.options?.vibration ?? true;
+    var value = Save?.instance?.options?.hapticsMode ?? "All";
+
+    return switch (value)
+    {
+      case "None":
+        HapticsMode.NONE;
+      case "Notes Only":
+        HapticsMode.NOTES_ONLY;
+      default:
+        HapticsMode.ALL;
+    };
   }
 
-  static function set_vibration(value:Bool):Bool
+  static function set_hapticsMode(value:HapticsMode):HapticsMode
   {
+    var string;
+
+    switch (value)
+    {
+      case HapticsMode.NONE:
+        string = "None";
+      case HapticsMode.NOTES_ONLY:
+        string = "Notes Only";
+      default:
+        string = "All";
+    };
+
     var save:Save = Save.instance;
-    save.options.vibration = value;
+    save.options.hapticsMode = string;
     save.flush();
     return value;
   }
diff --git a/source/funkin/play/notes/NoteVibrationsHandler.hx b/source/funkin/play/notes/NoteVibrationsHandler.hx
index 46804d794..e37392b64 100644
--- a/source/funkin/play/notes/NoteVibrationsHandler.hx
+++ b/source/funkin/play/notes/NoteVibrationsHandler.hx
@@ -1,6 +1,7 @@
 package funkin.play.notes;
 
 import funkin.util.HapticUtil;
+import funkin.util.HapticUtil.HapticsMode;
 
 /**
  * Handles vibrations on note presses.
@@ -60,7 +61,7 @@ class NoteVibrationsHandler
 
     if (stackingAmplitude > Constants.MAX_VIBRATION_AMPLITUDE) stackingAmplitude = Constants.MAX_VIBRATION_AMPLITUDE;
 
-    if (stackingAmplitude > 0) HapticUtil.vibrate(0, 0.01, stackingAmplitude);
+    if (stackingAmplitude > 0) HapticUtil.vibrate(0, 0.01, stackingAmplitude, [HapticsMode.ALL, HapticsMode.NOTES_ONLY]);
   }
 
   /**
@@ -83,7 +84,7 @@ class NoteVibrationsHandler
 
     if (stackingAmplitude > Constants.MAX_VIBRATION_AMPLITUDE) stackingAmplitude = Constants.MAX_VIBRATION_AMPLITUDE;
 
-    if (stackingAmplitude > 0) HapticUtil.vibrate(0, 0.01, stackingAmplitude);
+    if (stackingAmplitude > 0) HapticUtil.vibrate(0, 0.01, stackingAmplitude, [HapticsMode.ALL, HapticsMode.NOTES_ONLY]);
 
     for (currentNoteStatus in noteStatuses)
     {
diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx
index 64b8935fa..0a11fca3e 100644
--- a/source/funkin/save/Save.hx
+++ b/source/funkin/save/Save.hx
@@ -121,7 +121,7 @@ class Save
           flashingLights: true,
           zoomCamera: true,
           debugDisplay: false,
-          vibration: true,
+          hapticsMode: 'All',
           autoPause: true,
           vsyncMode: 'Off',
           strumlineBackgroundOpacity: 0,
@@ -1435,10 +1435,10 @@ typedef SaveDataOptions =
   var debugDisplay:Bool;
 
   /**
-   * If enabled, vibration will be enabled.
-   * @default `true`
+   * If enabled, haptic feedback will be enabled.
+   * @default `All`
    */
-  var vibration:Bool;
+  var hapticsMode:String;
 
   /**
    * If enabled, the game will automatically pause when tabbing out.
diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index e4934331e..0515e7532 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -22,6 +22,7 @@ import funkin.mobile.ui.FunkinHitbox.FunkinHitboxControlSchemes;
 import funkin.util.TouchUtil;
 import funkin.util.SwipeUtil;
 #end
+import funkin.util.HapticUtil;
 import lime.ui.WindowVSyncMode;
 
 class PreferencesMenu extends Page<OptionsState.OptionsMenuPageName>
@@ -124,6 +125,20 @@ class PreferencesMenu extends Page<OptionsState.OptionsMenuPageName>
     createPrefItemCheckbox('Camera Zooms', 'If disabled, camera stops bouncing to the song.', function(value:Bool):Void {
       Preferences.zoomCamera = value;
     }, Preferences.zoomCamera);
+    #if FEATURE_HAPTICS
+    createPrefItemEnum('Haptics', 'If enabled, game will use haptic feedback effects.', [
+      "All" => HapticsMode.ALL,
+      "Notes Only" => HapticsMode.NOTES_ONLY,
+      "None" => HapticsMode.NONE,
+    ], function(key:String, value:HapticsMode):Void {
+      Preferences.hapticsMode = value;
+    }, switch (Preferences.hapticsMode)
+      {
+        case HapticsMode.NOTES_ONLY: "Notes Only";
+        case HapticsMode.NONE: "None";
+        default: "All";
+      });
+    #end
     createPrefItemCheckbox('Debug Display', 'If enabled, FPS and other debug stats will be displayed.', function(value:Bool):Void {
       Preferences.debugDisplay = value;
     }, Preferences.debugDisplay);
diff --git a/source/funkin/util/HapticUtil.hx b/source/funkin/util/HapticUtil.hx
index a3b73cd94..8e2ce0cd6 100644
--- a/source/funkin/util/HapticUtil.hx
+++ b/source/funkin/util/HapticUtil.hx
@@ -34,11 +34,14 @@ class HapticUtil
    * @param amplitude The intensity of the vibration (0.0 to 1.0).
    */
   public static function vibrate(period:Float = Constants.DEFAULT_VIBRATION_PERIOD, duration:Float = Constants.DEFAULT_VIBRATION_DURATION,
-      amplitude:Float = Constants.DEFAULT_VIBRATION_AMPLITUDE):Void
+      amplitude:Float = Constants.DEFAULT_VIBRATION_AMPLITUDE, ?targetHapticsModes:Array<HapticsMode>):Void
   {
     #if FEATURE_HAPTICS
     if (!HapticUtil.hapticsAvailable) return;
 
+    final hapticsModes:Array<HapticsMode> = targetHapticsModes ?? [HapticsMode.ALL];
+    if (!hapticsModes.contains(Preferences.hapticsMode)) return;
+
     #if ios
     final amplitudeValue = FlxMath.bound(amplitude * 2.5, 0, Constants.MAX_VIBRATION_AMPLITUDE);
     #else
@@ -117,7 +120,7 @@ class HapticUtil
   static function get_hapticsAvailable():Bool
   {
     #if FEATURE_HAPTICS
-    if (Preferences.vibration) return true;
+    if (Preferences.hapticsMode != HapticsMode.NONE) return true;
     #end
 
     return false;
@@ -144,3 +147,24 @@ typedef VibrationPreset =
    */
   var amplitude:Float;
 }
+
+/**
+ * An abstract for vibrations preference.
+ */
+enum abstract HapticsMode(Int) from Int to Int
+{
+  /**
+   * Haptics are completely disabled.
+   */
+  var NONE:Int = 0;
+
+  /**
+   * Only note haptics are enabled.
+   */
+  var NOTES_ONLY:Int = 1;
+
+  /**
+   * All the haptics are enabled.
+   */
+  var ALL:Int = 2;
+}