diff --git a/CMakeLists.txt b/CMakeLists.txt index ec1cc87c..a4e18016 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,6 +119,11 @@ else () target_compile_options(dol PRIVATE "-fvisibility=default") endif() +add_executable(marioparty4 src/port/portmain.c) +target_compile_definitions(marioparty4 PRIVATE TARGET_PC VERSION=${VERSION}) +target_include_directories(marioparty4 PRIVATE include) +target_link_libraries(marioparty4 PRIVATE dol aurora::main) + add_library(bootDll SHARED src/REL/bootDll/main.c src/REL/bootDll/language.c) target_compile_definitions(bootDll PRIVATE TARGET_PC VERSION=${VERSION}) target_include_directories(bootDll PRIVATE include build/GMPE01_00/include) @@ -128,8 +133,4 @@ else () endif() set(CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS OFF) target_link_libraries(bootDll PRIVATE dol musyx) - -add_executable(marioparty4 src/port/portmain.c) -target_compile_definitions(marioparty4 PRIVATE TARGET_PC VERSION=${VERSION}) -target_include_directories(marioparty4 PRIVATE include) -target_link_libraries(marioparty4 PRIVATE dol aurora::main) +add_dependencies(marioparty4 bootDll) diff --git a/src/port/audio.c b/src/port/audio.c index e1d4a9cb..f6e78076 100644 --- a/src/port/audio.c +++ b/src/port/audio.c @@ -108,12 +108,7 @@ void HuAudFadeOut(s32 speed) { int HuAudFXPlay(int seId) { - WipeState *wipe = &wipeData; - - if (omSysExitReq != 0 || (wipeData.mode == WIPE_MODE_OUT && wipe->time / wipe->duration > 0.5)) { - return 0; - } - return HuAudFXPlayVolPan(seId, MSM_VOL_MAX, MSM_PAN_CENTER); + return 5; } int HuAudFXPlayVol(int seId, s16 vol) { diff --git a/src/port/stubs.c b/src/port/stubs.c index 00f6b1ef..70a901f2 100644 --- a/src/port/stubs.c +++ b/src/port/stubs.c @@ -641,7 +641,6 @@ void HuDvdErrDispInit(GXRenderModeObj *rmode, void *xfb1, void *xfb2) { } void msmSysRegularProc(void) { - puts("msmSysRegularProc is a stub"); } void msmMusFdoutEnd(void)