Merge pull request #2892 from AlmostSeagull/fix-tempo-rary-issue

Fix tempo rary issue

Author: AlmostSeagull

base-hack/src/misc/music_text.c

@@ -72,9 +72,9 @@ void SpeedUpMusic(void) {
         // Checking items
         if (win_con == GOAL_KROOL) {
             win_con_item = REQITEM_KEY;
-            win_con_count = 9; // Triggers upon picking up key 8
+            win_con_count = 9; // Triggers upon picking up the 8th key
         } else if (win_con != GOAL_CUSTOMITEM) {
-            // Goal is inelligible for speed up
+            // Goal is ineligible for speed up
             return;
         }
         if (win_con_count < 2) {
@@ -90,10 +90,11 @@ void SpeedUpMusic(void) {
         songs song = SongInWriteSlot[i];
         if ((music_types[song] == SONGTYPE_BGM) && (song != SONG_BABOONBALLOON)) {
             int existing_tempo = getSongTempo(compactSequencePlayers[i]);
-            float tempo = musicStorage[i]->division * compactSequencePlayers[i]->uspt;
-            float targ_tempo = tempo / 1.5f;
-            if (existing_tempo != targ_tempo) {
-                alCSPSetTempo(compactSequencePlayers[i], targ_tempo);
+            float current_inverse_division = compactSequencePlayers[i]->target->qnpt;
+            float target_inverse_division = (1.0f / musicStorage[i]->division / 1.5f);
+            if (current_inverse_division != target_inverse_division) {
+                compactSequencePlayers[i]->target->qnpt = target_inverse_division;
+                alCSPSetTempo(compactSequencePlayers[i], existing_tempo);
             }
         }
     }

randomizer/Patching/ApplyLocal.py

@@ -293,7 +293,7 @@ async def patching_response(data, from_patch_gen=False, lanky_from_history=False
                 BooleanProperties(settings.camera_is_follow, 0xCB),  # Free/Follow Cam
                 BooleanProperties(settings.camera_is_not_inverted, 0xCC),  # Inverted/Non-Inverted Camera
                 BooleanProperties(settings.fps_display, 0x96),  # FPS Display
-                # BooleanProperties(settings.song_speed_near_win, 0x1B4),  # Song Win Con Speedup
+                BooleanProperties(settings.song_speed_near_win, 0x1B4),  # Song Win Con Speedup
                 BooleanProperties(settings.disable_flavor_text, 0xAF),  # Disable Flavor Text
                 BooleanProperties(settings.rainbow_ammo, 0x112),  # Rainbow Ammo
             ]