Funny change bf

superpowers04 · May 19, 2024 · 7f95f33 · 7f95f33
1 parent 3408c14
commit 7f95f33
Show file tree

Hide file tree

Showing 8 changed files with 217 additions and 210 deletions.
diff --git a/Project.xml b/Project.xml
@@ -125,6 +125,8 @@
 	<haxelib name="flxanimate" /> <!-- Texture atlas rendering -->
 	<haxelib name="hxCodec" if="desktop" unless="hl" /> <!-- Video playback -->
 	<haxelib name="funkin.vis"/>
+
+	<define name='message.no-color'/>
 
 
 	<haxelib name="json2object" /> <!-- JSON parsing -->

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
@@ -57,6 +57,7 @@ import funkin.ui.debug.stage.StageOffsetSubState;
 import funkin.ui.mainmenu.MainMenuState;
 import funkin.ui.MusicBeatSubState;
 import funkin.ui.options.PreferencesMenu;
+import funkin.ui.options.CharacterSelect;
 import funkin.ui.story.StoryMenuState;
 import funkin.ui.transition.LoadingState;
 import funkin.util.SerializerUtil;
@@ -1667,7 +1668,7 @@ class PlayState extends MusicBeatSubState
     //
     // BOYFRIEND
     //
-    var boyfriend:BaseCharacter = CharacterDataParser.fetchCharacter(currentCharacterData.player);
+    var boyfriend:BaseCharacter = CharacterDataParser.fetchCharacter(CharacterSelect.BF == "" ? currentCharacterData.player : CharacterSelect.BF);
 
     if (boyfriend != null)
     {