diff --git a/assets b/assets index 80cabb3d9..bf85a6950 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 80cabb3d9bb7bb228c5c0dbdaa170b0888b78e74 +Subproject commit bf85a69507203318bb3f2d2aa24fe14324dd7e9c diff --git a/source/funkin/play/PauseSubState.hx b/source/funkin/play/PauseSubState.hx index 136c6a564..5dcca8a42 100644 --- a/source/funkin/play/PauseSubState.hx +++ b/source/funkin/play/PauseSubState.hx @@ -80,9 +80,7 @@ class PauseSubState extends MusicBeatSubState * Pause menu entries for when the game is paused during a video cutscene. */ static final PAUSE_MENU_ENTRIES_VIDEO_CUTSCENE:Array = [ - #if !mobile {text: 'Resume', callback: resume}, - #end {text: 'Skip Cutscene', callback: skipVideoCutscene}, {text: 'Restart Cutscene', callback: restartVideoCutscene}, {text: 'Exit to Menu', callback: quitToMenu}, diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index 7c5dc307d..f961cc7f3 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -845,6 +845,14 @@ class PlayState extends MusicBeatSubState refresh(); } + public function togglePauseButton(visible:Bool = false):Void + { + #if mobile + pauseCircle.alpha = visible ? 0.1 : 0; + pauseButton.alpha = visible ? 1 : 0; + #end + } + function assertChartExists():Bool { // Returns null if the song failed to load or doesn't have the selected difficulty. @@ -3153,7 +3161,8 @@ class PlayState extends MusicBeatSubState #if mobile // Hide the buttons while the song is ending. - hitbox.visible = pauseButton.visible = false; + hitbox.visible = false; + pauseButton.visible = false; pauseCircle.visible = false; #end diff --git a/source/funkin/play/cutscene/VideoCutscene.hx b/source/funkin/play/cutscene/VideoCutscene.hx index 0b32307b4..798ab1d3d 100644 --- a/source/funkin/play/cutscene/VideoCutscene.hx +++ b/source/funkin/play/cutscene/VideoCutscene.hx @@ -89,6 +89,13 @@ class VideoCutscene VideoCutscene.cutsceneType = cutsceneType; + #if mobile + if (cutsceneType == ENDING) + { + PlayState.instance.togglePauseButton(); + } + #end + #if html5 playVideoHTML5(rawFilePath); #elseif hxvlc