diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-08-04 08:14:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-04 08:14:38 -0400 |
| commit | 51111676c48851a01ba92e8bf30a894b889a1d24 (patch) | |
| tree | 68edd607fc51ac0a8afcfd7970697b59c60b1a87 /src/boot_O2_g3 | |
| parent | 7743e5a2c4b6d01c847dea8929c707e65e5e18b3 (diff) | |
Fix gcc warnings (#246)
* fix a huge amount of warnings
* fix another big bunch
* fix remaining warnings
* Run formatter
Diffstat (limited to 'src/boot_O2_g3')
| -rw-r--r-- | src/boot_O2_g3/fault_drawer.c | 2 | ||||
| -rw-r--r-- | src/boot_O2_g3/yaz0.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/boot_O2_g3/fault_drawer.c b/src/boot_O2_g3/fault_drawer.c index 171aad96b..a5d728864 100644 --- a/src/boot_O2_g3/fault_drawer.c +++ b/src/boot_O2_g3/fault_drawer.c @@ -145,7 +145,7 @@ void FaultDrawer_FillScreen() { #pragma GLOBAL_ASM("asm/non_matchings/boot/fault_drawer/D_80099080.s") void FaultDrawer_VPrintf(const char* str, char* args) { // va_list - _Printf((printf_func)FaultDrawer_FormatStringFunc, sFaultDrawContext, str, args); + _Printf((PrintCallback)FaultDrawer_FormatStringFunc, sFaultDrawContext, str, args); } void FaultDrawer_Printf(const char* fmt, ...) { diff --git a/src/boot_O2_g3/yaz0.c b/src/boot_O2_g3/yaz0.c index e4b43209f..bf42adf3f 100644 --- a/src/boot_O2_g3/yaz0.c +++ b/src/boot_O2_g3/yaz0.c @@ -104,9 +104,9 @@ s32 Yaz0_DecompressImpl(u8* src, u8* dst) { backPtr = dst - off; src += 2; - chunkSize = (nibble == 0) // N = chunkSize; B = back offset - ? *src++ + 0x12 // 3 bytes 0B BB NN - : nibble + 2; // 2 bytes NB BB + chunkSize = (nibble == 0) // N = chunkSize; B = back offset + ? (u32)(*src++ + 0x12) // 3 bytes 0B BB NN + : nibble + 2; // 2 bytes NB BB do { *dst++ = *(backPtr++ - 1); @@ -125,8 +125,8 @@ s32 Yaz0_DecompressImpl(u8* src, u8* dst) { void Yaz0_Decompress(u32 romStart, void* dst, u32 size) { s32 status; u32 pad; - u8 sp80[0x50]; - u8 sp30[0x50]; + char sp80[0x50]; + char sp30[0x50]; if (sYaz0CurDataEnd != NULL) { while (sYaz0CurDataEnd != NULL) { |