From 3e39a940833eb0d984fe4bb361a8856e8a2d1c1e Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Wed, 13 Aug 2025 04:56:52 +0200
Subject: [PATCH] Turn song text into a notification (#5712)

---
 soh/soh/Enhancements/audio/AudioCollection.cpp | 9 +++++++++
 soh/soh/Enhancements/audio/AudioCollection.h   | 1 +
 soh/soh/Enhancements/mods.cpp                  | 1 -
 soh/soh/OTRGlobals.cpp                         | 9 ---------
 soh/soh/OTRGlobals.h                           | 2 --
 soh/src/code/audio_load.c                      | 6 ++----
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/soh/soh/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp
index d3f69dad8..a30d3f086 100644
--- a/soh/soh/Enhancements/audio/AudioCollection.cpp
+++ b/soh/soh/Enhancements/audio/AudioCollection.cpp
@@ -2,6 +2,7 @@
 #include "sequence.h"
 #include "sfx.h"
 #include "soh/cvar_prefixes.h"
+#include "soh/Notification/Notification.h"
 #include <vector>
 #include <utils/StringHelper.h>
 #include <libultraship/bridge.h>
@@ -458,3 +459,11 @@ extern "C" bool AudioCollection_HasSequenceNum(uint16_t seqId) {
 extern "C" size_t AudioCollection_SequenceMapSize() {
     return AudioCollection::Instance->SequenceMapSize();
 }
+
+extern "C" void AudioCollection_EmitSongNameNotification(s32 seqId) {
+    const char* sequenceName = AudioCollection_GetSequenceName(seqId);
+    if (sequenceName != NULL) {
+        Notification::Emit({ .message = "Currently playing: " + std::string(sequenceName),
+                             .remainingTime = (float)CVarGetInteger(CVAR_AUDIO("SeqNameOverlayDuration"), 5) });
+    }
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/audio/AudioCollection.h b/soh/soh/Enhancements/audio/AudioCollection.h
index 2cdb02e21..51a6902cf 100644
--- a/soh/soh/Enhancements/audio/AudioCollection.h
+++ b/soh/soh/Enhancements/audio/AudioCollection.h
@@ -73,4 +73,5 @@ void AudioCollection_AddToCollection(char* otrPath, uint16_t seqNum);
 const char* AudioCollection_GetSequenceName(uint16_t seqId);
 bool AudioCollection_HasSequenceNum(uint16_t seqId);
 size_t AudioCollection_SequenceMapSize();
+void AudioCollection_EmitSongNameNotification(s32 seqId);
 #endif
\ No newline at end of file
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 6c547db08..15f85e52a 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -49,7 +49,6 @@ extern "C" {
 
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
-extern void Overlay_DisplayText(float duration, const char* text);
 }
 
 // GreyScaleEndDlist
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index d59871d54..7d2194cca 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2580,15 +2580,6 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
     return false;
 }
 
-extern "C" void Overlay_DisplayText(float duration, const char* text) {
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(duration, true, text);
-}
-
-extern "C" void Overlay_DisplayText_Seconds(int seconds, const char* text) {
-    float duration = seconds * OTRGlobals::Instance->GetInterpolationFPS() * 0.05;
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(duration, true, text);
-}
-
 extern "C" void EntranceTracker_SetCurrentGrottoID(s16 entranceIndex) {
     SetCurrentGrottoIDForTracker(entranceIndex);
 }
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index cab7575cd..032686f8e 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -156,8 +156,6 @@ void Randomizer_SetSpoilerLoaded(bool spoilerLoaded);
 uint8_t Randomizer_GenerateRandomizer();
 void Randomizer_ShowRandomizerMenu();
 int CustomMessage_RetrieveIfExists(PlayState* play);
-void Overlay_DisplayText(float duration, const char* text);
-void Overlay_DisplayText_Seconds(int seconds, const char* text);
 GetItemEntry ItemTable_Retrieve(int16_t getItemID);
 GetItemEntry ItemTable_RetrieveEntry(s16 modIndex, s16 getItemID);
 void EntranceTracker_SetCurrentGrottoID(s16 entranceIndex);
diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c
index 81f67f9c0..52efa4016 100644
--- a/soh/src/code/audio_load.c
+++ b/soh/src/code/audio_load.c
@@ -640,10 +640,8 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
         if (gPlayState != NULL) {
             previousSceneNum = gPlayState->sceneNum;
         }
-        const char* sequenceName = AudioCollection_GetSequenceName(seqId);
-        if (sequenceName != NULL) {
-            Overlay_DisplayText_Seconds(CVarGetInteger(CVAR_AUDIO("SeqNameOverlayDuration"), 5), sequenceName);
-        }
+
+        AudioCollection_EmitSongNameNotification(seqId);
     }
 }