From 34639d729daa511d22b6b0abd85d1f1f9221c215 Mon Sep 17 00:00:00 2001 From: Ralty <78720179+Raltyro@users.noreply.github.com> Date: Thu, 18 Dec 2025 16:32:01 +0700 Subject: [PATCH] Fix ScriptedCutscene Confusing Event Names --- source/funkin/game/cutscenes/ScriptedCutscene.hx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source/funkin/game/cutscenes/ScriptedCutscene.hx b/source/funkin/game/cutscenes/ScriptedCutscene.hx index cdd8c0f7..76c30347 100644 --- a/source/funkin/game/cutscenes/ScriptedCutscene.hx +++ b/source/funkin/game/cutscenes/ScriptedCutscene.hx @@ -95,18 +95,20 @@ class ScriptedCutscene extends Cutscene { script.call("stepHit", [curStep]); } - public override function openSubState(sub:FlxSubState) + public override function openSubState(subState:FlxSubState) { - var event = EventManager.get(StateEvent).recycle(sub); - script.call("onSubstateClose", [event]); - if(!event.cancelled) super.openSubState(event.substate is FlxSubState ? cast event.substate : sub); + var event = EventManager.get(StateEvent).recycle(subState); + script.call(Flags.MOD_API_VERSION > 2 ? "onSubstateClose" /*Remove this entirely*/ : "onOpenSubState", [event]); + if (!event.cancelled) + super.openSubState(event.substate is FlxSubState ? event.substate : subState); } public override function closeSubState() { var event = EventManager.get(StateEvent).recycle(subState); - script.call("onSubstateOpen", [event]); - if(!event.cancelled) super.closeSubState(); + script.call(Flags.MOD_API_VERSION > 2 ? "onSubstateOpen" /*Remove this entirely*/ : "onCloseSubState", [event]); + if (!event.cancelled) + super.closeSubState(); } public override function destroy() {