iCutscene: enable match (#385)

bfbbdecomp · Oct 9, 2024 · fb4dd6e · fb4dd6e
1 parent 0ec3eb6
commit fb4dd6e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/configure.py b/configure.py
@@ -464,7 +464,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Game/zTalkBox.cpp"),
             Object(NonMatching, "SB/Game/zTextBox.cpp"),
             Object(NonMatching, "SB/Game/zTaskBox.cpp"),
-            Object(NonMatching, "SB/Core/gc/iCutscene.cpp"),
+            Object(Matching, "SB/Core/gc/iCutscene.cpp"),
             Object(Matching, "SB/Game/zNPCTypeTest.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeSubBoss.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeBoss.cpp"),

diff --git a/src/SB/Core/gc/iCutscene.cpp b/src/SB/Core/gc/iCutscene.cpp
@@ -11,10 +11,6 @@
 
 U32 read_sizzze = 0;
 
-extern F32 _835_1;
-extern F32 _836_1;
-extern F32 _837_4;
-
 void iCSSoundSetup(xCutscene* csn)
 {
     xCutsceneData* data;
@@ -316,17 +312,17 @@ S32 iCSLoadStep(xCutscene* csn)
                 {
                     // Stereo
 
-                    csn->SndHandle[0] = xSndPlay(csn->SndAssetID[0], _835_1, _836_1, 255, 0x200, 0,
-                                                 SND_CAT_CUTSCENE, _837_4);
-                    csn->SndHandle[1] = xSndPlay(csn->SndAssetID[1], _835_1, _836_1, 255, 0x200, 0,
-                                                 SND_CAT_CUTSCENE, _837_4);
+                    csn->SndHandle[0] = xSndPlay(csn->SndAssetID[0], 0.9f, -99999.0f, 255, 0x200, 0,
+                                                 SND_CAT_CUTSCENE, 0.0f);
+                    csn->SndHandle[1] = xSndPlay(csn->SndAssetID[1], 0.9f, -99999.0f, 255, 0x200, 0,
+                                                 SND_CAT_CUTSCENE, 0.0f);
                 }
                 else
                 {
                     // Mono
 
-                    csn->SndHandle[0] = xSndPlay(csn->SndAssetID[0], _835_1, _836_1, 255, 0x200, 0,
-                                                 SND_CAT_CUTSCENE, _837_4);
+                    csn->SndHandle[0] = xSndPlay(csn->SndAssetID[0], 0.9f, -99999.0f, 255, 0x200, 0,
+                                                 SND_CAT_CUTSCENE, 0.0f);
                     csn->SndHandle[1] = 0;
                 }
             }