From 7fbea59c41c2d8ac0efee988eec05f34840f9309 Mon Sep 17 00:00:00 2001 From: escape209 Date: Wed, 9 Oct 2024 14:36:05 +0100 Subject: [PATCH] iCutscene: enable match --- configure.py | 2 +- src/SB/Core/gc/iCutscene.cpp | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/configure.py b/configure.py index c820da69..9bdaaa8c 100644 --- 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 index 39cc05cd..973bf9f2 100644 --- 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; } }