diff options
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/scrcmd_sound.c | 3 | ||||
| -rw-r--r-- | arm9/src/sound_chatot.c | 8 | ||||
| -rw-r--r-- | arm9/src/unk_020040F4.c | 24 |
3 files changed, 18 insertions, 17 deletions
diff --git a/arm9/src/scrcmd_sound.c b/arm9/src/scrcmd_sound.c index 8e59c182..b0993387 100644 --- a/arm9/src/scrcmd_sound.c +++ b/arm9/src/scrcmd_sound.c @@ -37,7 +37,8 @@ THUMB_FUNC BOOL ScrCmd_PlayBgm(struct ScriptContext *ctx) THUMB_FUNC BOOL ScrCmd_StopBgm(struct ScriptContext *ctx) { - u32 unk0 = FUN_02004124(ScriptReadHalfword(ctx)); + ScriptReadHalfword(ctx); + u32 unk0 = FUN_02004124(); FUN_02005350(unk0, 0); return FALSE; } diff --git a/arm9/src/sound_chatot.c b/arm9/src/sound_chatot.c index 71cc1abc..2efe4843 100644 --- a/arm9/src/sound_chatot.c +++ b/arm9/src/sound_chatot.c @@ -8,7 +8,7 @@ #include "unk_020040F4.h" #include "unk_020051F4.h" -THUMB_FUNC BOOL FUN_02005CFC() +THUMB_FUNC BOOL FUN_02005CFC(void) { if (*(u8 *)FUN_02003D38(29) == 1 && FUN_02004ABC(14) == 0) { @@ -77,7 +77,7 @@ THUMB_FUNC u32 FUN_02005D48(struct SaveChatotSoundClip *param0, u32 param1, s32 return res; } -THUMB_FUNC void FUN_02005DFC() +THUMB_FUNC void FUN_02005DFC(void) { u8 *r5 = FUN_02003D38(15); u8 *r4 = FUN_02003D38(29); @@ -91,7 +91,7 @@ THUMB_FUNC void FUN_02005DFC() *r4 = 0; } -THUMB_FUNC u32 Chatot_startRecording() +THUMB_FUNC u32 Chatot_startRecording(void) { struct MIC_SamplingData st0; @@ -110,7 +110,7 @@ THUMB_FUNC u32 Chatot_startRecording() return GF_MIC_StartAutoSampling(&st0); } -THUMB_FUNC void Chatot_stopRecording() +THUMB_FUNC void Chatot_stopRecording(void) { GF_MIC_StopAutoSampling(); } diff --git a/arm9/src/unk_020040F4.c b/arm9/src/unk_020040F4.c index 3436fe68..fa1d968f 100644 --- a/arm9/src/unk_020040F4.c +++ b/arm9/src/unk_020040F4.c @@ -57,7 +57,7 @@ THUMB_FUNC void FUN_020040F4(u8 param0) *ptr = param0; } -THUMB_FUNC u8 FUN_02004104() +THUMB_FUNC u8 FUN_02004104(void) { u8 *ptr = FUN_02003D38(5); @@ -72,7 +72,7 @@ THUMB_FUNC void FUN_02004110(u16 param0) FUN_02004130(0); } -THUMB_FUNC u16 FUN_02004124() +THUMB_FUNC u16 FUN_02004124(void) { u16 *ptr = FUN_02003D38(9); @@ -85,7 +85,7 @@ THUMB_FUNC void FUN_02004130(u16 param0) *ptr = param0; } -THUMB_FUNC u16 FUN_02004140() +THUMB_FUNC u16 FUN_02004140(void) { u16 *ptr = FUN_02003D38(10); @@ -469,7 +469,7 @@ THUMB_FUNC void FUN_02004724(int param0) FUN_0200521C(param0); } -THUMB_FUNC void FUN_02004738() +THUMB_FUNC void FUN_02004738(void) { GF_Snd_RestoreState(FUN_02004748(4)); } @@ -542,7 +542,7 @@ THUMB_FUNC void FUN_020047C8(u8 param0, u8 param1) *ptr = param1; } -THUMB_FUNC void FUN_02004810() +THUMB_FUNC void FUN_02004810(void) { u8 *ptr = FUN_02003D38(11); u8 *ptr2 = FUN_02003D38(12); @@ -653,7 +653,7 @@ THUMB_FUNC u32 GF_MIC_StartAutoSampling(struct MIC_SamplingData *param0) return MIC_StartAutoSampling(param0); } -THUMB_FUNC u32 GF_MIC_StopAutoSampling() +THUMB_FUNC u32 GF_MIC_StopAutoSampling(void) { GetSoundDataPointer(); return MIC_StopAutoSampling(); @@ -911,7 +911,7 @@ THUMB_FUNC void FUN_02004C3C(u32 param0) } } -THUMB_FUNC BOOL GF_SndCaptureIsActive() +THUMB_FUNC BOOL GF_SndCaptureIsActive(void) { return NNS_SndCaptureIsActive(); } @@ -933,7 +933,7 @@ THUMB_FUNC void GF_SndCaptureSetReverbVolume(u32 param0, u32 param1) NNS_SndCaptureSetReverbVolume(param0, param1); } -THUMB_FUNC void FUN_02004CB4() +THUMB_FUNC void FUN_02004CB4(void) { GetSoundDataPointer(); @@ -945,7 +945,7 @@ THUMB_FUNC void FUN_02004CB4() NNS_SndCaptureStartEffect(r4, 0x1000, 0, 0x55F0, 2, FUN_02005068, st8); } -THUMB_FUNC void GF_SndCaptureStopEffect() +THUMB_FUNC void GF_SndCaptureStopEffect(void) { NNS_SndCaptureStopEffect(); } @@ -997,7 +997,7 @@ THUMB_FUNC void FUN_02004D84(u32 param0) *(u32 *)FUN_02003D38(7) = param0; } -THUMB_FUNC u16 FUN_02004D94() +THUMB_FUNC u16 FUN_02004D94(void) { u16 *ptr = FUN_02003D38(7); @@ -1010,7 +1010,7 @@ THUMB_FUNC u16 FUN_02004D94() return --(*ptr); } -THUMB_FUNC u8 *FUN_02004DB4() +THUMB_FUNC u8 *FUN_02004DB4(void) { return UNK_021C3DE0; } @@ -1342,7 +1342,7 @@ THUMB_FUNC void FUN_0200516C(u32 param0) GF_SndCaptureIsActive(); } -THUMB_FUNC void FUN_020051AC() +THUMB_FUNC void FUN_020051AC(void) { if (FUN_02005404() == FALSE && GF_SndPlayerGetSeqNo(GetSoundPlayer(0)) != -1 && FUN_02004124() != 0x47e) |