diff --git a/src/audio/synthesis.c b/src/audio/synthesis.c index fcf4d6c6..f1d1627d 100644 --- a/src/audio/synthesis.c +++ b/src/audio/synthesis.c @@ -195,7 +195,7 @@ u8 sAudioSynthesisPad[0x20]; #endif #ifdef BETTER_REVERB -inline s16 clamp16(s32 x) { +static inline s16 clamp16(s32 x) { if (x >= 32767) return 32767; if (x <= -32768) @@ -204,7 +204,7 @@ inline s16 clamp16(s32 x) { return (s16) x; } -inline void reverb_samples(s16 *outSampleL, s16 *outSampleR, s32 inSampleL, s32 inSampleR) { +static inline void reverb_samples(s16 *outSampleL, s16 *outSampleR, s32 inSampleL, s32 inSampleR) { u32 i = 0; s32 j = 0; u8 k = 0; @@ -245,7 +245,7 @@ inline void reverb_samples(s16 *outSampleL, s16 *outSampleR, s32 inSampleL, s32 *outSampleR = clamp16((outTmpR * gReverbWetSignal/* + inSampleR * gReverbDrySignal*/) / 256); } -inline void reverb_mono_sample(s16 *outSample, s32 inSample) { +static inline void reverb_mono_sample(s16 *outSample, s32 inSample) { u32 i = 0; s32 j = 0; u8 k = 0; diff --git a/src/game/behaviors/snow_mound.inc.c b/src/game/behaviors/snow_mound.inc.c index f8fcc539..b9bfb978 100644 --- a/src/game/behaviors/snow_mound.inc.c +++ b/src/game/behaviors/snow_mound.inc.c @@ -33,7 +33,7 @@ void bhv_snow_mound_spawn_loop(void) { if (o->oTimer == 64 || o->oTimer == 128 || o->oTimer == 192 || o->oTimer == 224 || o->oTimer == 256) sp1C = spawn_object(o, MODEL_SL_SNOW_TRIANGLE, bhvSlidingSnowMound); - if (o->oTimer == 256) { + if (sp1C && o->oTimer == 256) { sp1C->header.gfx.scale[0] = 2.0f; sp1C->header.gfx.scale[1] = 2.0f; }