return of the warnings

10 files changed, 88 insertions, 90 deletions

diff --git a/arm9/lib/src/FS_archive.c b/arm9/lib/src/FS_archive.c
index 6c0f01f1..01f794f8 100644
--- a/arm9/lib/src/FS_archive.c
+++ b/arm9/lib/src/FS_archive.c
@@ -1,5 +1,4 @@
 #include "FS_archive.h"
-#include "FS_file.h"
 #include "FS_command.h"
 #include "FSi_util.h"
 #include "MI_memory.h"
@@ -45,6 +44,7 @@ ARM_FUNC FSResult FSi_WriteMemCallback(struct FSArchive * p_arc, const void * sr
 
 ARM_FUNC FSResult FSi_ReadMemoryCore(FSArchive * p_arc, void * dest, u32 pos, u32 size)
 {
+#pragma unused(p_arc)
     MI_CpuCopy8((const void *)pos, dest, size);
     return FS_RESULT_SUCCESS;
 }
@@ -77,21 +77,21 @@ ARM_FUNC FSFile * FSi_NextCommand(FSArchive * p_arc)
             const BOOL is_start = !FSi_IsArchiveRunning(p_arc);
             if (is_start)
                 p_arc->flag |= FS_ARCHIVE_FLAG_RUNNING;
-            OS_RestoreInterrupts(bak_psr);
+            (void)OS_RestoreInterrupts(bak_psr);
             if (is_start)
             {
                 if ((p_arc->proc_flag & FS_ARCHIVE_PROC_ACTIVATE) != 0)
-                    (*p_arc->proc) (p_file, FS_COMMAND_ACTIVATE);
+                    (void)((*p_arc->proc) (p_file, FS_COMMAND_ACTIVATE));
             }
             bak_psr = OS_DisableInterrupts();
             p_file->stat |= FS_FILE_STATUS_OPERATING;
             if (FS_IsFileSyncMode(p_file))
             {
                 OS_WakeupThread(p_file->queue);
-                OS_RestoreInterrupts(bak_psr);
+                (void)OS_RestoreInterrupts(bak_psr);
                 return NULL;
             }
-            OS_RestoreInterrupts(bak_psr);
+            (void)OS_RestoreInterrupts(bak_psr);
             return p_file;
         }
     }
@@ -103,7 +103,7 @@ ARM_FUNC FSFile * FSi_NextCommand(FSArchive * p_arc)
             FSFile tmp;
             FS_InitFile(&tmp);
             tmp.arc = p_arc;
-            (*p_arc->proc)(&tmp, FS_COMMAND_IDLE);
+            (void)((*p_arc->proc)(&tmp, FS_COMMAND_IDLE));
         }
     }
     if (FSi_IsArchiveSuspending(p_arc))
@@ -112,7 +112,7 @@ ARM_FUNC FSFile * FSi_NextCommand(FSArchive * p_arc)
         p_arc->flag |= FS_ARCHIVE_FLAG_SUSPEND;
         OS_WakeupThread(&p_arc->stat_q);
     }
-    OS_RestoreInterrupts(bak_psr);
+    (void)OS_RestoreInterrupts(bak_psr);
     return NULL;
 }
 
@@ -126,11 +126,11 @@ ARM_FUNC void FSi_ExecuteAsyncCommand(FSFile * p_file)
         if (FS_IsFileSyncMode(p_file))
         {
             OS_WakeupThread(p_file->queue);
-            OS_RestoreInterrupts(bak_psr);
+            (void)OS_RestoreInterrupts(bak_psr);
             break;
         }
         p_file->stat |= FS_FILE_STATUS_ASYNC;
-        OS_RestoreInterrupts(bak_psr);
+        (void)OS_RestoreInterrupts(bak_psr);
         if (FSi_TranslateCommand(p_file, p_file->command) == FS_RESULT_PROC_ASYNC)
             break;
         p_file = FSi_NextCommand(p_arc);
@@ -160,7 +160,7 @@ ARM_FUNC BOOL FSi_SendCommand(FSFile * p_file, FSCommandType command)
         if (FSi_IsArchiveUnloading(p_arc))
         {
             FSi_ReleaseCommand(p_file, FS_RESULT_CANCELLED);
-            OS_RestoreInterrupts(bak_psr);
+            (void)OS_RestoreInterrupts(bak_psr);
             return FALSE;
         }
         if ((bit & FS_ARCHIVE_PROC_SYNC) != 0)
@@ -169,22 +169,22 @@ ARM_FUNC BOOL FSi_SendCommand(FSFile * p_file, FSCommandType command)
         if (!FS_IsArchiveSuspended(p_arc) && !FSi_IsArchiveRunning(p_arc))
         {
             p_arc->flag |= FS_ARCHIVE_FLAG_RUNNING;
-            OS_RestoreInterrupts(bak_psr);
+            (void)OS_RestoreInterrupts(bak_psr);
             if ((p_arc->proc_flag & FS_ARCHIVE_PROC_ACTIVATE))
-                (*p_arc->proc)(p_file, FS_COMMAND_ACTIVATE);
+                (void)((*p_arc->proc)(p_file, FS_COMMAND_ACTIVATE));
             bak_psr = OS_DisableInterrupts();
             p_file->stat |= FS_FILE_STATUS_OPERATING;
             if (!FS_IsFileSyncMode(p_file))
             {
-                OS_RestoreInterrupts(bak_psr);
+                (void)OS_RestoreInterrupts(bak_psr);
                 FSi_ExecuteAsyncCommand(p_file);
                 return TRUE;
             }
-            OS_RestoreInterrupts(bak_psr);
+            (void)OS_RestoreInterrupts(bak_psr);
         }
         else if (!FS_IsFileSyncMode(p_file))
         {
-            OS_RestoreInterrupts(bak_psr);
+            (void)OS_RestoreInterrupts(bak_psr);
             return TRUE;
         }
         else
@@ -193,7 +193,7 @@ ARM_FUNC BOOL FSi_SendCommand(FSFile * p_file, FSCommandType command)
             {
                 OS_SleepThread(p_file->queue);
             } while (!(p_file->stat & FS_FILE_STATUS_OPERATING));
-            OS_RestoreInterrupts(bak_psr);
+            (void)OS_RestoreInterrupts(bak_psr);
         }
     }
     return FSi_ExecuteSyncCommand(p_file);
@@ -213,7 +213,7 @@ ARM_FUNC FSArchive * const FS_FindArchive(const char * name, int name_len)
     FSArchive * p_arc = arc_list;
     while (p_arc && (p_arc->name.pack != pack))
         p_arc = p_arc->next;
-    OS_RestoreInterrupts(bak_psr);
+    (void)OS_RestoreInterrupts(bak_psr);
     return p_arc;
 }
 
@@ -243,7 +243,7 @@ ARM_FUNC BOOL FS_RegisterArchiveName(FSArchive * p_arc, const char * name, int n
         p_arc->flag |= FS_ARCHIVE_FLAG_REGISTER;
         ret = TRUE;
     }
-    OS_RestoreInterrupts(bak_psr);
+    (void)OS_RestoreInterrupts(bak_psr);
     return ret;
 }
 
@@ -266,7 +266,7 @@ ARM_FUNC void FS_ReleaseArchiveName(FSArchive * p_arc)
             current_dir_pos.index = 0;
             current_dir_pos.own_id = 0;
         }
-        OS_RestoreInterrupts(bak_psr);
+        (void)OS_RestoreInterrupts(bak_psr);
     }
 }
 
@@ -305,7 +305,7 @@ ARM_FUNC BOOL FS_UnloadArchive(FSArchive * p_arc)
             }
             p_arc->list.next = NULL;
             if (bak_state)
-                FS_ResumeArchive(p_arc);
+                (void)FS_ResumeArchive(p_arc);
         }
         p_arc->base = 0;
         p_arc->fat = 0;
@@ -315,7 +315,7 @@ ARM_FUNC BOOL FS_UnloadArchive(FSArchive * p_arc)
         p_arc->fat_bak = p_arc->fnt_bak = 0;
         p_arc->flag &= ~(FS_ARCHIVE_FLAG_CANCELING | FS_ARCHIVE_FLAG_LOADED | FS_ARCHIVE_FLAG_UNLOADING);
     }
-    OS_RestoreInterrupts(bak_psr);
+    (void)OS_RestoreInterrupts(bak_psr);
     return TRUE;
 }
 
@@ -333,7 +333,7 @@ ARM_FUNC u32 FS_LoadArchiveTables(FSArchive *p_arc, void *p_mem, u32 max_size)
             {
                 MI_CpuFill8(p_cache, 0x00, p_arc->fat_size);
             }
-            FS_CloseFile(&tmp);
+            (void)FS_CloseFile(&tmp);
         }
         p_arc->fat = (u32)p_cache;
         p_cache += p_arc->fat_size;
@@ -343,7 +343,7 @@ ARM_FUNC u32 FS_LoadArchiveTables(FSArchive *p_arc, void *p_mem, u32 max_size)
             {
                 MI_CpuFill8(p_cache, 0x00, p_arc->fnt_size);
             }
-            FS_CloseFile(&tmp);
+            (void)FS_CloseFile(&tmp);
         }
         p_arc->fnt = (u32)p_cache;
         p_arc->load_mem = p_mem;
@@ -369,7 +369,7 @@ ARM_FUNC void * FS_UnloadArchiveTables(FSArchive * p_arc)
             p_arc->table_func = p_arc->read_func;
         }
         if (bak_stat)
-            FS_ResumeArchive(p_arc);
+            (void)FS_ResumeArchive(p_arc);
     }
     return ret;
 }
@@ -392,7 +392,7 @@ ARM_FUNC BOOL FS_SuspendArchive(FSArchive * p_arc)
             p_arc->flag |= FS_ARCHIVE_FLAG_SUSPEND;
         }
     }
-    OS_RestoreInterrupts(bak_psr);
+    (void)OS_RestoreInterrupts(bak_psr);
     return bak_stat;
 }
 
@@ -406,7 +406,7 @@ ARM_FUNC BOOL FS_ResumeArchive(FSArchive * p_arc)
         p_arc->flag &= ~FS_ARCHIVE_FLAG_SUSPEND;
         p_target = FSi_NextCommand(p_arc);
     }
-    OS_RestoreInterrupts(bak_psr);
+    (void)OS_RestoreInterrupts(bak_psr);
     if (p_target)
         FSi_ExecuteAsyncCommand(p_target);
     return bak_stat;
diff --git a/arm9/lib/src/FS_overlay.c b/arm9/lib/src/FS_overlay.c
index 79a3b43e..de64d97d 100644
--- a/arm9/lib/src/FS_overlay.c
+++ b/arm9/lib/src/FS_overlay.c
@@ -67,16 +67,16 @@ ARM_FUNC BOOL FSi_LoadOverlayInfoCore(FSOverlayInfo * p_ovi, MIProcessor target,
         return FALSE;
     if (FS_ReadFile(file, p_ovi, sizeof(FSOverlayInfoHeader)) != sizeof(FSOverlayInfoHeader))
     {
-        FS_CloseFile(file);
+        (void)FS_CloseFile(file);
         return FALSE;
     }
-    FS_CloseFile(file);
+    (void)FS_CloseFile(file);
     p_ovi->target = target;
     if (!FS_OpenFileFast(file, FS_GetOverlayFileID(p_ovi)))
         return FALSE;
     p_ovi->file_pos.offset = FS_GetFileImageTop(file);
     p_ovi->file_pos.length = FS_GetLength(file);
-    FS_CloseFile(file);
+    (void)FS_CloseFile(file);
     return TRUE;
 }
 
@@ -96,7 +96,7 @@ ARM_FUNC BOOL FS_LoadOverlayInfo(FSOverlayInfo * p_ovi, MIProcessor target, FSOv
             return FALSE;
         p_ovi->file_pos.offset = FS_GetFileImageTop(file);
         p_ovi->file_pos.length = FS_GetLength(file);
-        FS_CloseFile(file);
+        (void)FS_CloseFile(file);
         return TRUE;
     }
     else
@@ -114,11 +114,11 @@ ARM_FUNC BOOL FS_LoadOverlayImageAsync(FSOverlayInfo * p_ovi, FSFile * p_file)
         return FALSE;
     else
     {
-        s32 size = FSi_GetOverlayBinarySize(p_ovi);
+        s32 size = (s32)FSi_GetOverlayBinarySize(p_ovi);
         FS_ClearOverlayImage(p_ovi);
         if (FS_ReadFileAsync(p_file, FS_GetOverlayAddress(p_ovi), size) != size)
         {
-            FS_CloseFile(p_file);
+            (void)FS_CloseFile(p_file);
             return FALSE;
         }
         return TRUE;
@@ -133,14 +133,14 @@ ARM_FUNC BOOL FS_LoadOverlayImage(FSOverlayInfo * p_ovi)
         return FALSE;
     else
     {
-        s32 size = FSi_GetOverlayBinarySize(p_ovi);
+        s32 size = (s32)FSi_GetOverlayBinarySize(p_ovi);
         FS_ClearOverlayImage(p_ovi);
         if (FS_ReadFile(file, FS_GetOverlayAddress(p_ovi), size) != size)
         {
-            FS_CloseFile(file);
+            (void)FS_CloseFile(file);
             return FALSE;
         }
-        FS_CloseFile(file);
+        (void)FS_CloseFile(file);
         return TRUE;
     }
 }
@@ -168,9 +168,9 @@ static const u8 fsi_def_digest_key[64] = {
 };
 
 static const void *fsi_digest_key_ptr = fsi_def_digest_key;
-static int fsi_digest_key_len = sizeof(fsi_def_digest_key);
+static u32 fsi_digest_key_len = sizeof(fsi_def_digest_key);
 
-ARM_FUNC BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, int len)
+ARM_FUNC BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, u32 len)
 {
     int i;
     u8 digest[FS_OVERLAY_DIGEST_SIZE];
@@ -203,7 +203,7 @@ ARM_FUNC void FS_StartOverlay(FSOverlayInfo * p_ovi)
             if (p_ovi->header.id < odt_max)
             {
                 const u8 * spec_digest = SDK_OVERLAY_DIGEST + FS_OVERLAY_DIGEST_SIZE * p_ovi->header.id;
-                ret = FSi_CompareDigest(spec_digest, p_ovi->header.ram_address, (int)rare_size);
+                ret = FSi_CompareDigest(spec_digest, p_ovi->header.ram_address, rare_size);
             }
         }
         if (!ret)
@@ -276,7 +276,7 @@ ARM_FUNC void FS_EndOverlay(FSOverlayInfo *p_ovi)
                 }
                 p = next;
             }
-            OS_RestoreInterrupts(bak_psr);
+            (void)OS_RestoreInterrupts(bak_psr);
         }
 
         if (!head)
diff --git a/arm9/lib/src/FX_mtx44.c b/arm9/lib/src/FX_mtx44.c
index 8152907d..697f8709 100644
--- a/arm9/lib/src/FX_mtx44.c
+++ b/arm9/lib/src/FX_mtx44.c
@@ -29,46 +29,46 @@ ARM_FUNC void MTX_Concat44(struct Mtx44 *a, struct Mtx44 *b, struct Mtx44 *c){
     a1 = a->_[1];
     a2 = a->_[2];
     a3 = a->_[3];
-    dst->_[0] =  (((fx64)a0  * b->_[0] + (fx64)a1  * b->_[4] + (fx64)a2  * b->_[8]  + (fx64)a3  * b->_[12]) >> FX32_INT_SHIFT);
-    dst->_[1] =  (((fx64)a0  * b->_[1] + (fx64)a1  * b->_[5] + (fx64)a2  * b->_[9]  + (fx64)a3  * b->_[13]) >> FX32_INT_SHIFT);
-    dst->_[3] =  (((fx64)a0  * b->_[3] + (fx64)a1  * b->_[7] + (fx64)a2  * b->_[11] + (fx64)a3  * b->_[15]) >> FX32_INT_SHIFT);
+    dst->_[0] =  (fx32)(((fx64)a0  * b->_[0] + (fx64)a1  * b->_[4] + (fx64)a2  * b->_[8]  + (fx64)a3  * b->_[12]) >> FX32_INT_SHIFT);
+    dst->_[1] =  (fx32)(((fx64)a0  * b->_[1] + (fx64)a1  * b->_[5] + (fx64)a2  * b->_[9]  + (fx64)a3  * b->_[13]) >> FX32_INT_SHIFT);
+    dst->_[3] =  (fx32)(((fx64)a0  * b->_[3] + (fx64)a1  * b->_[7] + (fx64)a2  * b->_[11] + (fx64)a3  * b->_[15]) >> FX32_INT_SHIFT);
     b0 = b->_[2];
     b1 = b->_[6];
     b2 = b->_[10];
     b3 = b->_[14];
-    dst->_[2] =  (((fx64)a0  * b0 + (fx64)a1  * b1 + (fx64)a2  * b2 + (fx64)a3  * b3) >> FX32_INT_SHIFT);
+    dst->_[2] =  (fx32)(((fx64)a0  * b0 + (fx64)a1  * b1 + (fx64)a2  * b2 + (fx64)a3  * b3) >> FX32_INT_SHIFT);
     a0 = a->_[4];
     a1 = a->_[5];
     a2 = a->_[6];
     a3 = a->_[7];
-    dst->_[6] =  (((fx64)a0  * b0 + (fx64)a1  * b1 + (fx64)a2  * b2 + (fx64)a3  * b3) >> FX32_INT_SHIFT);
-    dst->_[5] =  (((fx64)a0  * b->_[1] + (fx64)a1  * b->_[5] + (fx64)a2  * b->_[9]  + (fx64)a3  * b->_[13]) >> FX32_INT_SHIFT);
-    dst->_[7] =  (((fx64)a0  * b->_[3] + (fx64)a1  * b->_[7] + (fx64)a2  * b->_[11] + (fx64)a3  * b->_[15]) >> FX32_INT_SHIFT);
+    dst->_[6] =  (fx32)(((fx64)a0  * b0 + (fx64)a1  * b1 + (fx64)a2  * b2 + (fx64)a3  * b3) >> FX32_INT_SHIFT);
+    dst->_[5] =  (fx32)(((fx64)a0  * b->_[1] + (fx64)a1  * b->_[5] + (fx64)a2  * b->_[9]  + (fx64)a3  * b->_[13]) >> FX32_INT_SHIFT);
+    dst->_[7] =  (fx32)(((fx64)a0  * b->_[3] + (fx64)a1  * b->_[7] + (fx64)a2  * b->_[11] + (fx64)a3  * b->_[15]) >> FX32_INT_SHIFT);
     b0 = b->_[0];
     b1 = b->_[4];
     b2 = b->_[8];
     b3 = b->_[12];
-    dst->_[4] =  (((fx64)a0  * b0 + (fx64)a1  * b1 + (fx64)a2  * b2  + (fx64)a3  * b3) >> FX32_INT_SHIFT);
+    dst->_[4] =  (fx32)(((fx64)a0  * b0 + (fx64)a1  * b1 + (fx64)a2  * b2  + (fx64)a3  * b3) >> FX32_INT_SHIFT);
     a0 = a->_[8];
     a1 = a->_[9];
     a2 = a->_[10];
     a3 = a->_[11];
-    dst->_[8] =  (((fx64)a0  * b0 + (fx64)a1  * b1 + (fx64)a2 * b2  + (fx64)a3 * b3) >> FX32_INT_SHIFT);
-    dst->_[9] =  (((fx64)a0  * b->_[1] + (fx64)a1  * b->_[5] + (fx64)a2 * b->_[9]  + (fx64)a3 * b->_[13]) >> FX32_INT_SHIFT);
-    dst->_[11] = (((fx64)a0  * b->_[3] + (fx64)a1  * b->_[7] + (fx64)a2 * b->_[11] + (fx64)a3 * b->_[15]) >> FX32_INT_SHIFT);
+    dst->_[8] =  (fx32)(((fx64)a0  * b0 + (fx64)a1  * b1 + (fx64)a2 * b2  + (fx64)a3 * b3) >> FX32_INT_SHIFT);
+    dst->_[9] =  (fx32)(((fx64)a0  * b->_[1] + (fx64)a1  * b->_[5] + (fx64)a2 * b->_[9]  + (fx64)a3 * b->_[13]) >> FX32_INT_SHIFT);
+    dst->_[11] = (fx32)(((fx64)a0  * b->_[3] + (fx64)a1  * b->_[7] + (fx64)a2 * b->_[11] + (fx64)a3 * b->_[15]) >> FX32_INT_SHIFT);
     b0 = b->_[2];
     b1 = b->_[6];
     b2 = b->_[10];
     b3 = b->_[14];
-    dst->_[10] = (((fx64)a0  * b0 + (fx64)a1  * b1 + (fx64)a2 * b2 + (fx64)a3 * b3) >> FX32_INT_SHIFT);
+    dst->_[10] = (fx32)(((fx64)a0  * b0 + (fx64)a1  * b1 + (fx64)a2 * b2 + (fx64)a3 * b3) >> FX32_INT_SHIFT);
     a0 = a->_[12];
     a1 = a->_[13];
     a2 = a->_[14];
     a3 = a->_[15];
-    dst->_[14] = (((fx64)a0 * b0 + (fx64)a1 * b1 + (fx64)a2 * b2 + (fx64)a3 * b3) >> FX32_INT_SHIFT);
-    dst->_[13] = (((fx64)a0 * b->_[1] + (fx64)a1 * b->_[5] + (fx64)a2 * b->_[9]  + (fx64)a3 * b->_[13]) >> FX32_INT_SHIFT);
-    dst->_[12] = (((fx64)a0 * b->_[0] + (fx64)a1 * b->_[4] + (fx64)a2 * b->_[8]  + (fx64)a3 * b->_[12]) >> FX32_INT_SHIFT);
-    dst->_[15] = (((fx64)a0 * b->_[3] + (fx64)a1 * b->_[7] + (fx64)a2 * b->_[11] + (fx64)a3 * b->_[15]) >> FX32_INT_SHIFT);
+    dst->_[14] = (fx32)(((fx64)a0 * b0 + (fx64)a1 * b1 + (fx64)a2 * b2 + (fx64)a3 * b3) >> FX32_INT_SHIFT);
+    dst->_[13] = (fx32)(((fx64)a0 * b->_[1] + (fx64)a1 * b->_[5] + (fx64)a2 * b->_[9]  + (fx64)a3 * b->_[13]) >> FX32_INT_SHIFT);
+    dst->_[12] = (fx32)(((fx64)a0 * b->_[0] + (fx64)a1 * b->_[4] + (fx64)a2 * b->_[8]  + (fx64)a3 * b->_[12]) >> FX32_INT_SHIFT);
+    dst->_[15] = (fx32)(((fx64)a0 * b->_[3] + (fx64)a1 * b->_[7] + (fx64)a2 * b->_[11] + (fx64)a3 * b->_[15]) >> FX32_INT_SHIFT);
     if (dst == &temp)
         *c = temp;
 }
diff --git a/arm9/lib/src/GX.c b/arm9/lib/src/GX.c
index b1d62145..6b2f7790 100644
--- a/arm9/lib/src/GX.c
+++ b/arm9/lib/src/GX.c
@@ -10,10 +10,10 @@ static u16 sIsDispOn = TRUE;
 
 ARM_FUNC void GX_Init(){
     reg_GX_POWCNT |= 0x8000;
-    reg_GX_POWCNT = (reg_GX_POWCNT & ~0x20E) | 0x20E;
-    reg_GX_POWCNT = reg_GX_POWCNT | 0x1;
+    reg_GX_POWCNT = (u16)((reg_GX_POWCNT & ~0x20E) | 0x20E);
+    reg_GX_POWCNT = (u16)(reg_GX_POWCNT | 0x1);
     GX_InitGXState();
-    u32 temp;
+    s32 temp;
     while (GXi_VRamLockId == 0)
     {
         temp = OS_GetLockID();
@@ -21,7 +21,7 @@ ARM_FUNC void GX_Init(){
         {
             OS_Terminate();
         }
-        GXi_VRamLockId = temp;
+        GXi_VRamLockId = (vu16)temp;
     }
     reg_GX_DISPSTAT = 0x0;
     reg_GX_DISPCNT = 0x0;
@@ -48,7 +48,7 @@ ARM_FUNC void GX_Init(){
 }
 
 ARM_FUNC u32 GX_HBlankIntr(u32 enable){
-    u32 temp = reg_GX_DISPSTAT & 0x10;
+    u32 temp = (u32)(reg_GX_DISPSTAT & 0x10);
     if (enable)
     {
         reg_GX_DISPSTAT |= 0x10;
@@ -61,7 +61,7 @@ ARM_FUNC u32 GX_HBlankIntr(u32 enable){
 }
 
 ARM_FUNC u32 GX_VBlankIntr(u32 enable){
-    u32 temp = reg_GX_DISPSTAT & 0x8;
+    u32 temp = (u32)(reg_GX_DISPSTAT & 0x8);
     if (enable)
     {
         reg_GX_DISPSTAT |= 0x8;
@@ -76,7 +76,7 @@ ARM_FUNC u32 GX_VBlankIntr(u32 enable){
 ARM_FUNC void GX_DispOff(){
     u32 temp = reg_GX_DISPCNT;
     sIsDispOn = 0x0;
-    sDispMode = (temp & 0x30000) >> 0x10;
+    sDispMode = (u16)((temp & 0x30000) >> 0x10);
     reg_GX_DISPCNT = temp & ~0x30000;
 }
 
@@ -94,7 +94,7 @@ ARM_FUNC void GX_DispOn(){
 
 ARM_FUNC void GX_SetGraphicsMode(u32 mode1, u32 mode2, u32 mode3){
     u32 temp2 = reg_GX_DISPCNT;
-    sDispMode = mode1;
+    sDispMode = (u16)mode1;
     if (!sIsDispOn)
         mode1 = 0;
     reg_GX_DISPCNT = (mode2 | ((temp2 & 0xFFF0FFF0) | (mode1 << 0x10))) | (mode3 << 0x3);
@@ -113,10 +113,10 @@ ARM_FUNC void GXx_SetMasterBrightness_(vu16 *dst, s32 brightness){
     }
     else if (brightness > 0)
     {
-        *dst = 0x4000 | brightness;
+        *dst = (u16)(0x4000 | brightness);
     }
     else
     {
-        *dst = 0x8000 | -brightness;
+        *dst = (u16)(0x8000 | -brightness);
     }
 }
diff --git a/arm9/lib/src/GX_bgcnt.c b/arm9/lib/src/GX_bgcnt.c
index 2086ad16..92f2c4b8 100644
--- a/arm9/lib/src/GX_bgcnt.c
+++ b/arm9/lib/src/GX_bgcnt.c
@@ -3,7 +3,7 @@
 #include "GX.h"
 
 ARM_FUNC void *G2_GetBG0ScrPtr(){
-    u32 temp = (((reg_G2_BG0CNT & 0x1F00) >> 0x8) << 0xB);
+    u32 temp = (u32)(((reg_G2_BG0CNT & 0x1F00) >> 0x8) << 0xB);
     return (void *)(0x6000000 + (((reg_GX_DISPCNT & 0x38000000) >> 0x1B) << 0x10) + temp);
 }
 
@@ -12,7 +12,7 @@ ARM_FUNC void *G2S_GetBG0ScrPtr(){
 }
 
 ARM_FUNC void *G2_GetBG1ScrPtr(){
-    u32 temp = (((reg_G2_BG1CNT & 0x1F00) >> 0x8) << 0xB);
+    u32 temp = (u32)(((reg_G2_BG1CNT & 0x1F00) >> 0x8) << 0xB);
     return (void *)(0x6000000 + (((reg_GX_DISPCNT & 0x38000000) >> 0x1B) << 0x10) + temp);
 }
 
@@ -119,7 +119,7 @@ ARM_FUNC void *G2S_GetBG3ScrPtr(){
 }
 
 ARM_FUNC void *G2_GetBG0CharPtr(){
-    u32 temp = (((reg_G2_BG0CNT & 0x3C) >> 0x2) << 0xE);
+    u32 temp = (u32)(((reg_G2_BG0CNT & 0x3C) >> 0x2) << 0xE);
     return (void *)(0x6000000 + (((reg_GX_DISPCNT & 0x7000000) >> 0x18) << 0x10) + temp);
 }
 
@@ -128,7 +128,7 @@ ARM_FUNC void *G2S_GetBG0CharPtr(){
 }
 
 ARM_FUNC void *G2_GetBG1CharPtr(){
-    u32 temp = (((reg_G2_BG1CNT & 0x3C) >> 0x2) << 0xE);
+    u32 temp = (u32)(((reg_G2_BG1CNT & 0x3C) >> 0x2) << 0xE);
     return (void *)(0x6000000 + (((reg_GX_DISPCNT & 0x7000000) >> 0x18) << 0x10) + temp);
 }
 
@@ -137,7 +137,7 @@ ARM_FUNC void *G2S_GetBG1CharPtr(){
 }
 
 ARM_FUNC void *G2_GetBG2CharPtr(){
-    s32 temp1 = (reg_GX_DISPCNT & 0x7);
+    s32 temp1 = (s32)(reg_GX_DISPCNT & 0x7);
     u32 temp = reg_G2_BG2CNT;
     if (temp1 < 5 || !(temp & 0x80))
     {
@@ -152,7 +152,7 @@ ARM_FUNC void *G2_GetBG2CharPtr(){
 }
 
 ARM_FUNC void *G2S_GetBG2CharPtr(){
-    s32 temp1 = (reg_GXS_DB_DISPCNT & 0x7);
+    s32 temp1 = (s32)(reg_GXS_DB_DISPCNT & 0x7);
     u32 temp = reg_G2S_DB_BG2CNT;
     if (temp1 < 5 || !(temp & 0x80))
     {
@@ -166,7 +166,7 @@ ARM_FUNC void *G2S_GetBG2CharPtr(){
 }
 
 ARM_FUNC void *G2_GetBG3CharPtr(){
-    s32 temp1 = (reg_GX_DISPCNT & 0x7);
+    s32 temp1 = (s32)(reg_GX_DISPCNT & 0x7);
     u32 temp = reg_G2_BG3CNT;
     if (temp1 < 3 || (temp1 < 6 && !(temp & 0x80)))
     {
@@ -181,7 +181,7 @@ ARM_FUNC void *G2_GetBG3CharPtr(){
 }
 
 ARM_FUNC void *G2S_GetBG3CharPtr(){
-    s32 temp1 = (reg_GXS_DB_DISPCNT & 0x7);
+    s32 temp1 = (s32)(reg_GXS_DB_DISPCNT & 0x7);
     u32 temp = reg_G2S_DB_BG3CNT;
     if (temp1 < 3 || (temp1 < 6 && !(temp & 0x80)))
     {
diff --git a/arm9/lib/src/GX_g3b.c b/arm9/lib/src/GX_g3b.c
index 21698547..c71ff9d5 100644
--- a/arm9/lib/src/GX_g3b.c
+++ b/arm9/lib/src/GX_g3b.c
@@ -42,7 +42,7 @@ since the vector is assumed to be normalized, are used
 */
 ARM_FUNC void G3B_Normal(struct GXDLInfo * displaylist, fx16 x, fx16 y, fx16 z){
     *(u32 *)displaylist->curr_cmd = 0x21;
-    *displaylist->curr_param = ((x >> 3) & 0x3FF) | (((y >> 3) & 0x3FF) << 0xA) | (((z >> 3) & 0x3FF) << 0x14) ;
+    *displaylist->curr_param = (u32)(((x >> 3) & 0x3FF) | (((y >> 3) & 0x3FF) << 0xA) | (((z >> 3) & 0x3FF) << 0x14));
     displaylist->curr_cmd = (u8 *)displaylist->curr_param + 0x4;
     displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1;
 }
diff --git a/arm9/lib/src/GX_load2d.c b/arm9/lib/src/GX_load2d.c
index 2f7c0242..92669bce 100644
--- a/arm9/lib/src/GX_load2d.c
+++ b/arm9/lib/src/GX_load2d.c
@@ -135,7 +135,7 @@ ARM_FUNC void GXS_LoadBG3Char(void *src, u32 offset, u32 size){
 }
 
 ARM_FUNC void GX_BeginLoadBGExtPltt(){
-    sBGExtPltt = GX_ResetBankForBGExtPltt();
+    sBGExtPltt = (s32)GX_ResetBankForBGExtPltt();
     switch (sBGExtPltt)
     {
     case 0: //needed to match
@@ -169,7 +169,7 @@ ARM_FUNC void GX_EndLoadBGExtPltt(){
 }
 
 ARM_FUNC void GX_BeginLoadOBJExtPltt(){
-    sOBJExtPltt = GX_ResetBankForOBJExtPltt();
+    sOBJExtPltt = (s32)GX_ResetBankForOBJExtPltt();
     switch (sOBJExtPltt)
     {
     case 0: //needed to match
@@ -195,7 +195,7 @@ ARM_FUNC void GX_EndLoadOBJExtPltt(){
 }
 
 ARM_FUNC void GXS_BeginLoadBGExtPltt(){
-    sSubBGExtPltt = FUN_020C6034();
+    sSubBGExtPltt = (s32)FUN_020C6034();
 }
 
 ARM_FUNC void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){
@@ -209,7 +209,7 @@ ARM_FUNC void GXS_EndLoadBGExtPltt(){
 }
 
 ARM_FUNC void GXS_BeginLoadOBJExtPltt(){
-    sSubOBJExtPltt = GX_ResetBankForSubOBJ();
+    sSubOBJExtPltt = (s32)GX_ResetBankForSubOBJ();
 }
 
 ARM_FUNC void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){
diff --git a/arm9/lib/src/GX_load3d.c b/arm9/lib/src/GX_load3d.c
index efab53ae..df057a44 100644
--- a/arm9/lib/src/GX_load3d.c
+++ b/arm9/lib/src/GX_load3d.c
@@ -52,10 +52,10 @@ static u32 sClrImgLCDCBlk = 0;
 
 ARM_FUNC void GX_BeginLoadTex(){
     u32 temp = GX_ResetBankForTex();
-    sTex = temp;
-    sTexLCDCBlk1 = sTexStartAddrTable[temp].blk1 << 0xC;
-    sTexLCDCBlk2 = sTexStartAddrTable[temp].blk2 << 0xC;
-    sSzTexBlk1 = sTexStartAddrTable[temp].szBlk1 << 0xC;
+    sTex = (s32)temp;
+    sTexLCDCBlk1 = (u32)(sTexStartAddrTable[temp].blk1 << 0xC);
+    sTexLCDCBlk2 = (u32)(sTexStartAddrTable[temp].blk2 << 0xC);
+    sSzTexBlk1 = (u32)(sTexStartAddrTable[temp].szBlk1 << 0xC);
 }
 
 ARM_FUNC void GX_LoadTex(void *src, u32 offset, u32 size){
@@ -97,9 +97,9 @@ ARM_FUNC void GX_EndLoadTex(){
 }
 
 ARM_FUNC void GX_BeginLoadTexPltt(){
-    s32 temp = GX_ResetBankForTexPltt();
+    s32 temp = (s32)GX_ResetBankForTexPltt();
     sTexPltt = temp;
-    sTexPlttLCDCBlk = sTexPlttStartAddrTable[temp >> 4] << 0xC;
+    sTexPlttLCDCBlk = (u32)(sTexPlttStartAddrTable[temp >> 4] << 0xC);
 }
 
 ARM_FUNC void GX_LoadTexPltt(void *src, u32 offset, u32 size){
@@ -114,8 +114,8 @@ ARM_FUNC void GX_EndLoadTexPltt(){
 }
 
 ARM_FUNC void GX_BeginLoadClearImage(){
-    s32 temp = GX_ResetBankForClearImage();
-    sClrImg = temp;
+    u32 temp = GX_ResetBankForClearImage();
+    sClrImg = (s32)temp;
     switch (temp)
     {
     case 2:
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c
index e051f6ff..b3aff389 100644
--- a/arm9/lib/src/OS_reset.c
+++ b/arm9/lib/src/OS_reset.c
@@ -55,7 +55,7 @@ ARM_FUNC void OS_ResetSystem(u32 parameter) {
     MI_StopDma(2);
     MI_StopDma(3);
     (void)OS_SetIrqMask(0x40000);
-    OS_ResetRequestIrqMask((u32)~0);
+    (void)OS_ResetRequestIrqMask((u32)~0);
     *(u32 *)HW_RESET_PARAMETER_BUF = parameter;
     OSi_SendToPxi(OS_PXI_COMMAND_RESET);
     OSi_DoResetSystem(); //oh boy this is in itcm, that's gonna be fun to deal with Kappa
diff --git a/arm9/lib/src/custom_allocator.c b/arm9/lib/src/custom_allocator.c
index 869901ce..1b1375bc 100644
--- a/arm9/lib/src/custom_allocator.c
+++ b/arm9/lib/src/custom_allocator.c
@@ -1,7 +1,5 @@
 #include "global.h"
-
-typedef void * (* AllocFunc)(u32 size);
-typedef void (* FreeFunc)(void * ptr);
+#include "custom_allocator.h"
 
 static FreeFunc sDestructor;
 static AllocFunc sAllocator;