diff --git a/src/audio/audio_synthesis.c b/src/audio/audio_synthesis.c index 1d08aa90..7c911fd3 100644 --- a/src/audio/audio_synthesis.c +++ b/src/audio/audio_synthesis.c @@ -515,7 +515,7 @@ u64* AudioSynth_ProcessNote(Note* note, NoteSubEu* noteSubEu, NoteSynthesisState DMEM_ADDR_UNCOMPRESSED_NOTE + s5Aligned, s0 * 2); aADPCMdec(cmd++, flags, VIRTUAL_TO_PHYSICAL2(synthesisState->synthesisBuffers->adpcmdecState)); aDMEMMove(cmd++, DMEM_ADDR_UNCOMPRESSED_NOTE + s5Aligned + (s2 * 2), - DMEM_ADDR_UNCOMPRESSED_NOTE + s5, (nSamplesInThisIteration) *2); + DMEM_ADDR_UNCOMPRESSED_NOTE + s5, (nSamplesInThisIteration) * 2); } nAdpcmSamplesProcessed += nSamplesInThisIteration; switch (flags) { diff --git a/src/libultra/io/pfsallocatefile.c b/src/libultra/io/pfsallocatefile.c index 755b4bb8..3e7d85be 100644 --- a/src/libultra/io/pfsallocatefile.c +++ b/src/libultra/io/pfsallocatefile.c @@ -3,7 +3,7 @@ #include "PRinternal/controller.h" #include "PR/rmon.h" -#define ROUND_UP_DIVIDE(numerator, denominator) (((numerator) + (denominator) -1) / (denominator)) +#define ROUND_UP_DIVIDE(numerator, denominator) (((numerator) + (denominator) - 1) / (denominator)) static s32 __osClearPage(OSPfs* pfs, int page_no, u8* data, u8 bank); diff --git a/src/overlays/ovl_i2/ovl_1B9440.c b/src/overlays/ovl_i2/ovl_1B9440.c index dc109226..1e061f25 100644 --- a/src/overlays/ovl_i2/ovl_1B9440.c +++ b/src/overlays/ovl_i2/ovl_1B9440.c @@ -1,8 +1,31 @@ +#include "variables.h" #include "common.h" +extern s32 D_802C8C58[2]; +extern s32 D_802C8C60[2]; +extern s16 D_802C8C68; +extern s16 D_802C8C6A; + +s16 D_802C8C70[4]; + #pragma GLOBAL_ASM("asm/us/rev1/nonmatchings/overlays/ovl_i2/ovl_1B9440/func_i2_802C5800.s") -#pragma GLOBAL_ASM("asm/us/rev1/nonmatchings/overlays/ovl_i2/ovl_1B9440/func_i2_802C5AE4.s") +void func_i2_802C5AE4(void) { + s32 i; + + for (i = 0; i < 2; i++) { + D_802C8C58[i] = 0; + D_802C8C60[i] = 0; + D_801CE6F4[i] = i; + }; +// clang-format off + for (i = 0; i < 4; i++) { \ + D_802C8C70[i] = 0; \ + } \ + +// clang-format on + D_802C8C6A = 0; +} #pragma GLOBAL_ASM("asm/us/rev1/nonmatchings/overlays/ovl_i2/ovl_1B9440/func_i2_802C5B4C.s")