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

Author: Starexify

source/funkin/audio/waveform/WaveformSprite.hx

@@ -13,6 +13,8 @@ class WaveformSprite extends MeshRender
   static final DEFAULT_WIDTH:Float = 100.0;
   static final DEFAULT_HEIGHT:Float = 100.0;
 
+  public var iconId:String;
+
   /**
    * Set this to true to tell the waveform to rebuild itself.
    * Do this any time the data or drawable area of the waveform changes.

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.
    */
@@ -3570,6 +3575,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     handlePlaybar();
     handleNotePreview();
     handleHealthIcons();
+    handleWaveforms();
 
     handleFileKeybinds();
     handleViewKeybinds();
@@ -5770,6 +5776,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
       {
         buttonSelectOpponent.text = charDataDad?.name ?? 'Opponent';
       }
+      waveformsDirty = true;
       healthIconsDirty = false;
     }
 
@@ -5793,6 +5800,26 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     }
   }
 
+  /**
+   * Handle waveforms aligning based on the health icons position.
+   */
+  function handleWaveforms()
+  {
+    if (!waveformsDirty) return;
+
+    for (waveform in audioWaveforms.members)
+    {
+      waveform.x = switch (waveform.iconId)
+      {
+        case "bf": healthIconBF != null ? healthIconBF.x : 840 + FullScreenScaleMode.gameCutoutSize.x * 0.5;
+        case "dad": healthIconDad != null ? healthIconDad.x : 360 + FullScreenScaleMode.gameCutoutSize.x * 0.5;
+        default: 0;
+      }
+    }
+
+    waveformsDirty = false;
+  }
+
   /**
    * Handle keybinds for File menu items.
    */

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,12 +200,12 @@ class ChartEditorAudioHandler
           {
             var duration:Float = Conductor.instance.getStepTimeInMs(16) * 0.001;
             var waveformSprite:WaveformSprite = new WaveformSprite(waveformData, VERTICAL, FlxColor.WHITE);
-            waveformSprite.x = 840;
             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;
             waveformSprite.time = 0;
             waveformSprite.duration = duration;
+            waveformSprite.iconId = "bf";
             state.audioWaveforms.add(waveformSprite);
           }
           else
@@ -225,12 +224,12 @@ class ChartEditorAudioHandler
           {
             var duration:Float = Conductor.instance.getStepTimeInMs(16) * 0.001;
             var waveformSprite:WaveformSprite = new WaveformSprite(waveformData, VERTICAL, FlxColor.WHITE);
-            waveformSprite.x = 360;
             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;
             waveformSprite.time = 0;
             waveformSprite.duration = duration;
+            waveformSprite.iconId = "dad";
             state.audioWaveforms.add(waveformSprite);
           }
           else