From 499681ff8d760fd8757b2b9ee15c781e51f95826 Mon Sep 17 00:00:00 2001 From: MysterD Date: Sun, 10 Apr 2022 22:48:31 -0700 Subject: [PATCH] Fix custom sounds in SM74 --- src/pc/lua/utils/smlua_audio_utils.c | 4 ++++ src/pc/mods/mod.c | 1 + 2 files changed, 5 insertions(+) diff --git a/src/pc/lua/utils/smlua_audio_utils.c b/src/pc/lua/utils/smlua_audio_utils.c index a1c4d8069..4c1080c66 100644 --- a/src/pc/lua/utils/smlua_audio_utils.c +++ b/src/pc/lua/utils/smlua_audio_utils.c @@ -3,6 +3,7 @@ #include "pc/mods/mods.h" #include "pc/lua/smlua.h" #include "pc/debuglog.h" +#include "pc/mods/mods_utils.h" #define MAX_OVERRIDE 64 @@ -102,6 +103,7 @@ void smlua_audio_utils_replace_sequence(u8 sequenceId, u8 bankId, u8 defaultVolu LOG_LUA("Could not concat m64path: %s", m64path); return; } + normalize_path(m64path); for (s32 i = 0; i < gLuaActiveMod->fileCount; i++) { struct ModFile* file = &gLuaActiveMod->files[i]; @@ -112,6 +114,8 @@ void smlua_audio_utils_replace_sequence(u8 sequenceId, u8 bankId, u8 defaultVolu LOG_ERROR("Failed to concat full path to m64: %s", m64Name); return; } + normalize_path(fullPath); + struct AudioOverride* override = &sAudioOverrides[sequenceId]; smlua_audio_utils_reset(override); diff --git a/src/pc/mods/mod.c b/src/pc/mods/mod.c index c0b33fb61..635454a16 100644 --- a/src/pc/mods/mod.c +++ b/src/pc/mods/mod.c @@ -96,6 +96,7 @@ void mod_activate(struct Mod* mod) { // activate dynos models for (int i = 0; i < mod->fileCount; i++) { struct ModFile* file = &mod->files[i]; + normalize_path(file->relativePath); if (str_ends_with(file->relativePath, ".bin")) { mod_activate_bin(mod, file); }