cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'rewrite/master' into week2-erect-bg-fixes

Browse source
This commit is contained in:
Cameron Taylor 2024-09-10 07:38:38 -04:00
parent ee78178b20 f6bd203786
commit 96657e9e41
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/funkin/ui/freeplay/FreeplayState.hx
View file

@ -1985,6 +1985,12 @@ class FreeplayState extends MusicBeatSubState
return;
}
if (targetInstId == null)
{
var baseInstrumentalId:String = targetSong?.getBaseInstrumentalId(targetDifficultyId, targetDifficulty.variation ?? Constants.DEFAULT_VARIATION) ?? '';
targetInstId = baseInstrumentalId;
}
// Visual and audio effects.
FunkinSound.playOnce(Paths.sound('confirmMenu'));
if (dj != null) dj.confirm();
@ -2409,6 +2415,7 @@ class DifficultySprite extends FlxSprite
if (assetDiffIdParts.length == 0) break;
assetDiffId = assetDiffIdParts.join('-');
}
trace('Found difficulty asset: freeplay/freeplay${assetDiffId}');
// Check for an XML to use an animation instead of an image.
if (Assets.exists(Paths.file('images/freeplay/freeplay${assetDiffId}.xml')))