Align x positions of Chart Editor waveforms to the center of the health icons

Author: Starexify

source/funkin/ui/debug/charting/ChartEditorState.hx

@@ -963,10 +963,15 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
   var noteTooltipsDirty:Bool = true;
 
   /**
-   * Whether the selected charactesr have been modified and the health icons need to be updated.
+   * Whether the selected characters have been modified and the health icons need to be updated.
    */
   var healthIconsDirty:Bool = true;
 
+  /**
+   * Whether the waveforms were modified and need to be updated.
+   */
+  var waveformsDirty:Bool = false;
+
   /**
    * Whether the note preview graphic needs to be FULLY rebuilt.
    */
@@ -2702,6 +2707,8 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     healthIconBF.zIndex = 30;
 
     add(audioWaveforms);
+
+    if (healthIconDad.frames == null || healthIconBF.frames == null) waveformsDirty = true;
   }
 
   function createSubtitles():Void
@@ -5770,7 +5777,8 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
       {
         buttonSelectOpponent.text = charDataDad?.name ?? 'Opponent';
       }
-      healthIconsDirty = false;
+
+      healthIconsDirty = !waveformsDirty;
     }
 
     // Right align, and visibly center, the BF health icon.
@@ -5791,6 +5799,11 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
       var yOffset = 30 - (healthIconDad.height / 2);
       healthIconDad.y = (gridTiledSprite == null) ? (0) : (GRID_INITIAL_Y_POS - NOTE_SELECT_BUTTON_HEIGHT + 8) + yOffset;
     }
+
+    if (healthIconsDirty && waveformsDirty) {
+      switchToCurrentInstrumental();
+      healthIconsDirty = waveformsDirty = false;
+    }
   }
 
   /**

source/funkin/ui/debug/charting/handlers/ChartEditorAudioHandler.hx

@@ -8,7 +8,6 @@ import funkin.play.character.BaseCharacter.CharacterType;
 import funkin.util.FileUtil;
 import funkin.util.assets.SoundUtil;
 import funkin.audio.waveform.WaveformData;
-import funkin.audio.waveform.WaveformDataParser;
 import funkin.audio.waveform.WaveformSprite;
 import flixel.util.FlxColor;
 import haxe.io.Bytes;
@@ -201,7 +200,7 @@ class ChartEditorAudioHandler
           {
             var duration:Float = Conductor.instance.getStepTimeInMs(16) * 0.001;
             var waveformSprite:WaveformSprite = new WaveformSprite(waveformData, VERTICAL, FlxColor.WHITE);
-            waveformSprite.x = 840;
+            waveformSprite.x = state.healthIconBF != null ? state.healthIconBF.x : 840 + FullScreenScaleMode.gameCutoutSize.x * 0.5;
             waveformSprite.y = Math.max(state.gridTiledSprite?.y ?? 0.0, ChartEditorState.GRID_INITIAL_Y_POS - ChartEditorState.GRID_TOP_PAD);
             waveformSprite.height = (ChartEditorState.GRID_SIZE) * 16;
             waveformSprite.width = (ChartEditorState.GRID_SIZE) * 2;
@@ -225,7 +224,7 @@ class ChartEditorAudioHandler
           {
             var duration:Float = Conductor.instance.getStepTimeInMs(16) * 0.001;
             var waveformSprite:WaveformSprite = new WaveformSprite(waveformData, VERTICAL, FlxColor.WHITE);
-            waveformSprite.x = 360;
+            waveformSprite.x = state.healthIconDad != null ? state.healthIconDad.x : 360 + FullScreenScaleMode.gameCutoutSize.x * 0.5;
             waveformSprite.y = Math.max(state.gridTiledSprite?.y ?? 0.0, ChartEditorState.GRID_INITIAL_Y_POS - ChartEditorState.GRID_TOP_PAD);
             waveformSprite.height = (ChartEditorState.GRID_SIZE) * 16;
             waveformSprite.width = (ChartEditorState.GRID_SIZE) * 2;