From d965a1198804b0477e8bdcfd07ef1c6865da7d5d Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Mon, 12 Apr 2021 10:31:16 -0700
Subject: [PATCH] Don't restart music in trinket cutscenes

When you pick up a trinket in the wild, the music will fade back in
afterwards. However, the special trinket cutscenes (where Victoria or
Vitellary will directly give you a trinket) are inconsistent with this,
and restart the music instead of fading it back in.

Looking at the scripts themselves, it immediately becomes obvious the
reason for this inconsistency - 2.2 and previous didn't implement the
musicfadein command, so it couldn't be used, and Terry or Simon simply
had to make do with simply restarting the music. However, 2.3 implements
musicfadein, so we can simply swap it out and remove the
trinketscriptmusic command.
---
 desktop_version/src/Scripts.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/desktop_version/src/Scripts.cpp b/desktop_version/src/Scripts.cpp
index df7a4ac5..01fc4ac3 100644
--- a/desktop_version/src/Scripts.cpp
+++ b/desktop_version/src/Scripts.cpp
@@ -5469,8 +5469,7 @@ void scriptclass::load(const std::string& name)
         //found a trinket!
         "foundtrinket(18)",
         "endtext",
-        //"musicfadein",
-        "trinketscriptmusic",
+        "musicfadein",
 
         "delay(30)",
         "createentity(136,80,22,18,0)",
@@ -5577,8 +5576,7 @@ void scriptclass::load(const std::string& name)
         //found a trinket!
         "foundtrinket(18)",
         "endtext",
-        //"musicfadein",
-        "trinketscriptmusic",
+        "musicfadein",
 
         "delay(30)",
         "createentity(136,80,22,18,0)",
@@ -5766,8 +5764,7 @@ void scriptclass::load(const std::string& name)
         //found a trinket!
         "foundtrinket(18)",
         "endtext",
-        //"musicfadein",
-        "trinketscriptmusic",
+        "musicfadein",
 
         "delay(30)",