diff --git a/src/audio/general.c b/src/audio/general.c index 46c3252781..83ada03616 100644 --- a/src/audio/general.c +++ b/src/audio/general.c @@ -100,7 +100,11 @@ f32 D_801305E4[4] = { 1.0f, 1.12246f, 1.33484f, 1.33484f }; // 2**({0, 2, 5, 5}/ f32 D_801305F4 = 1.0f; u8 sGanonsTowerLevelsVol[8] = { 127, 80, 75, 73, 70, 68, 65, 60 }; u8 sEnterGanonsTowerTimer = 0; +#if OOT_DEBUG s8 sSoundMode = SOUNDMODE_SURROUND; +#else +s8 sSoundMode = SOUNDMODE_STEREO; +#endif s8 D_80130608 = 0; s8 sAudioCutsceneFlag = 0; s8 sSpecReverb = 0; diff --git a/src/code/code_800FC620.c b/src/code/code_800FC620.c index 462179b388..eafbe5080e 100644 --- a/src/code/code_800FC620.c +++ b/src/code/code_800FC620.c @@ -13,7 +13,11 @@ typedef struct InitFunc { // .data void* sInitFuncs = NULL; +#if OOT_DEBUG char sNew[] = "new"; +#else +char sNew[] = ""; +#endif char D_80134488[0x18] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x00, 0x00, diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index b274d4182b..8d85486225 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -58,7 +58,9 @@ static void* sEyeTextures[] = { gImpaEyeClosedTex, }; +#if OOT_DEBUG static u32 D_8098783C = 0; +#endif static ColliderCylinderInitType1 sCylinderInit = { { diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index ba19c5c25d..b930f0365a 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -69,7 +69,9 @@ static void* sMouthTextures[] = { gSariaMouthSmilingOpenTex, gSariaMouthFrowningTex, }; +#if OOT_DEBUG static u32 D_80990108 = 0; +#endif #include "z_demo_sa_cutscene_data.inc.c" diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 5c0631fb69..336aad8d15 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -83,7 +83,9 @@ static void* sEyeTextures[] = { gNabooruEyeClosedTex, }; +#if OOT_DEBUG static s32 D_80AB4318 = 0; +#endif #include "z_en_nb_cutscene_data.inc.c" diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 00cb959f12..c2c23b2b90 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -61,7 +61,9 @@ static void* sEyeTextures[] = { gAdultRutoEyeClosedTex, }; +#if OOT_DEBUG static UNK_TYPE D_80AF4118 = 0; +#endif #include "z_en_ru2_cutscene_data.inc.c" diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index b2b8dda8c1..3809daae4d 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -472,7 +472,6 @@ void EnXc_SetColossusWindSFX(PlayState* play) { if (gSaveContext.sceneLayer == 4) { static s32 D_80B41D90 = 0; static Vec3f sPos = { 0.0f, 0.0f, 0.0f }; - static f32 sMaxSpeed = 0.0f; static Vec3f D_80B42DB0; s32 pad; s16 sceneId = play->sceneId; @@ -487,8 +486,9 @@ void EnXc_SetColossusWindSFX(PlayState* play) { if (D_80B41D90 != 0) { f32 speed = Math3D_Vec3f_DistXYZ(&D_80B42DB0, eye) / 7.058922f; - #if OOT_DEBUG + static f32 sMaxSpeed = 0.0f; + sMaxSpeed = CLAMP_MIN(sMaxSpeed, speed); PRINTF("MAX speed = %f\n", sMaxSpeed); #endif