From 0f08b1133e67c1f7bcc7d5a905e218b7ba595dad Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sat, 14 Oct 2023 22:49:24 -0400
Subject: [PATCH] Rename some sounds used by the chart editor
---
assets | 2 +-
source/funkin/ui/debug/charting/ChartEditorCommand.hx | 8 +++++---
source/funkin/ui/debug/charting/ChartEditorState.hx | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/assets b/assets
index b767f2d43..05973b6bb 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit b767f2d43bf357e0d092fdf255a28963fe42cdff
+Subproject commit 05973b6bb816464b5cb46631285f17477d05cf08
diff --git a/source/funkin/ui/debug/charting/ChartEditorCommand.hx b/source/funkin/ui/debug/charting/ChartEditorCommand.hx
index ccefea67d..e6caf61e7 100644
--- a/source/funkin/ui/debug/charting/ChartEditorCommand.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorCommand.hx
@@ -114,7 +114,8 @@ class RemoveNotesCommand implements ChartEditorCommand
state.currentSongChartNoteData = SongDataUtils.subtractNotes(state.currentSongChartNoteData, notes);
state.currentNoteSelection = [];
state.currentEventSelection = [];
- ChartEditorAudioHandler.playSound(Paths.sound('funnyNoise/funnyNoise-01'));
+
+ ChartEditorAudioHandler.playSound(Paths.sound('chartingSounds/noteErase'));
state.saveDataDirty = true;
state.noteDisplayDirty = true;
@@ -296,7 +297,8 @@ class RemoveEventsCommand implements ChartEditorCommand
{
state.currentSongChartEventData = SongDataUtils.subtractEvents(state.currentSongChartEventData, events);
state.currentEventSelection = [];
- ChartEditorAudioHandler.playSound(Paths.sound('funnyNoise/funnyNoise-01'));
+
+ ChartEditorAudioHandler.playSound(Paths.sound('chartingSounds/noteErase'));
state.saveDataDirty = true;
state.noteDisplayDirty = true;
@@ -352,7 +354,7 @@ class RemoveItemsCommand implements ChartEditorCommand
state.currentNoteSelection = [];
state.currentEventSelection = [];
- ChartEditorAudioHandler.playSound(Paths.sound('funnyNoise/funnyNoise-01'));
+ ChartEditorAudioHandler.playSound(Paths.sound('chartingSounds/noteErase'));
state.saveDataDirty = true;
state.noteDisplayDirty = true;
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 277079e31..b23df1d3a 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -3849,9 +3849,9 @@ class ChartEditorState extends HaxeUIState
switch (noteData.getStrumlineIndex())
{
case 0: // Player
- if (hitsoundsEnabledPlayer) ChartEditorAudioHandler.playSound(Paths.sound('funnyNoise/funnyNoise-09'));
+ if (hitsoundsEnabledPlayer) ChartEditorAudioHandler.playSound(Paths.sound('chartingSounds/hitNotePlayer'));
case 1: // Opponent
- if (hitsoundsEnabledOpponent) ChartEditorAudioHandler.playSound(Paths.sound('funnyNoise/funnyNoise-010'));
+ if (hitsoundsEnabledOpponent) ChartEditorAudioHandler.playSound(Paths.sound('chartingSounds/hitNoteOpponent'));
}
}
}