Enable `-Wint-conversion` warning (#1266)

* fixing some warnings

* more pointer fixing

* Use `-Wno-int-conversion` on audio files

* more progress

* fix

* more pointer fixes

* kinda progress

* Fix remaining casts

* Format

* fix merge

* fix warnings

* fix parameter

* use SEGMENT_ROM_START_OFFSET a bit more

* format

* fix audio warnings

* some more fixes

* fix en_go

* review

* review

* whoops, missing cast

* review

* review

* ->data

* format

* review

* fix

* asPtr

* fix

* Update src/code/sched.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

* fix in EnDnh

* improve format

* engo

* format

* fix

* format

* Update include/z64.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* TexturePtr

* fix warnings

* fix warnings

* format

* fix

* review

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

3 files changed, 27 insertions, 27 deletions

diff --git a/src/boot/O2/loadfragment.c b/src/boot/O2/loadfragment.c
index b22b1a692..69fa9959c 100644
--- a/src/boot/O2/loadfragment.c
+++ b/src/boot/O2/loadfragment.c
@@ -135,10 +135,10 @@ void Fragment_Relocate(void* allocatedRamAddr, OverlayRelocationSection* ovlRelo
     }
 }
 
-size_t Fragment_Load(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t vramStart, void* allocatedRamAddr,
+size_t Fragment_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* allocatedRamAddr,
                      size_t allocatedBytes) {
     size_t size = vromEnd - vromStart;
-    void* end;
+    uintptr_t end;
     s32 pad;
     OverlayRelocationSection* ovlRelocs;
 
@@ -148,7 +148,7 @@ size_t Fragment_Load(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t vramStart
     end = (uintptr_t)allocatedRamAddr + size;
     DmaMgr_SendRequest0(allocatedRamAddr, vromStart, size);
 
-    ovlRelocs = (OverlayRelocationSection*)((uintptr_t)end - ((s32*)end)[-1]);
+    ovlRelocs = (OverlayRelocationSection*)(end - ((s32*)end)[-1]);
 
     if (gLoadLogSeverity >= 3) {}
 
@@ -161,11 +161,11 @@ size_t Fragment_Load(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t vramStart
 
     if (gLoadLogSeverity >= 3) {}
 
-    Fragment_Relocate(allocatedRamAddr, ovlRelocs, vramStart);
+    Fragment_Relocate(allocatedRamAddr, ovlRelocs, (uintptr_t)vramStart);
 
     if (ovlRelocs->bssSize != 0) {
         if (gLoadLogSeverity >= 3) {}
-        bzero(end, ovlRelocs->bssSize);
+        bzero((void*)end, ovlRelocs->bssSize);
     }
 
     osWritebackDCache(allocatedRamAddr, allocatedBytes);
@@ -176,9 +176,9 @@ size_t Fragment_Load(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t vramStart
     return allocatedBytes;
 }
 
-void* Fragment_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t vramStart) {
+void* Fragment_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart) {
     size_t size = vromEnd - vromStart;
-    void* end;
+    uintptr_t end;
     void* allocatedRamAddr;
     uintptr_t ovlOffset;
     OverlayRelocationSection* ovlRelocs;
@@ -195,8 +195,8 @@ void* Fragment_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t
 
     if (gLoadLogSeverity >= 3) {}
 
-    ovlOffset = (uintptr_t)end - 4;
-    ovlRelocs = (OverlayRelocationSection*)((uintptr_t)end - ((s32*)end)[-1]);
+    ovlOffset = end - sizeof(s32);
+    ovlRelocs = (OverlayRelocationSection*)(end - ((s32*)end)[-1]);
 
     if (1) {}
 
@@ -212,15 +212,15 @@ void* Fragment_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t
     }
 
     end = (uintptr_t)allocatedRamAddr + size;
-    ovlRelocs = (OverlayRelocationSection*)((uintptr_t)end - *(uintptr_t*)ovlOffset);
+    ovlRelocs = (OverlayRelocationSection*)(end - *(uintptr_t*)ovlOffset);
 
     if (gLoadLogSeverity >= 3) {}
 
-    Fragment_Relocate(allocatedRamAddr, ovlRelocs, vramStart);
+    Fragment_Relocate(allocatedRamAddr, ovlRelocs, (uintptr_t)vramStart);
 
     if (ovlRelocs->bssSize != 0) {
         if (gLoadLogSeverity >= 3) {}
-        bzero(end, ovlRelocs->bssSize);
+        bzero((void*)end, ovlRelocs->bssSize);
     }
 
     osInvalICache(allocatedRamAddr, allocatedBytes);
diff --git a/src/boot/O2/loadfragment2.c b/src/boot/O2/loadfragment2.c
index 6925aaaac..02b3ab218 100644
--- a/src/boot/O2/loadfragment2.c
+++ b/src/boot/O2/loadfragment2.c
@@ -131,11 +131,11 @@ void Overlay_Relocate(void* allocatedRamAddr, OverlayRelocationSection* ovlReloc
     }
 }
 
-size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t vramStart, uintptr_t vramEnd,
-                    void* allocatedRamAddr) {
-    s32 pad[2];
+size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* ramStart, void* ramEnd, void* allocatedRamAddr) {
+    uintptr_t vramStart = (uintptr_t)ramStart;
+    uintptr_t vramEnd = (uintptr_t)ramEnd;
     s32 size = vromEnd - vromStart;
-    void* end;
+    uintptr_t end;
     OverlayRelocationSection* ovlRelocs;
 
     if (gOverlayLogSeverity >= 3) {}
@@ -144,7 +144,7 @@ size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t vramStart,
     end = (uintptr_t)allocatedRamAddr + size;
     DmaMgr_SendRequest0(allocatedRamAddr, vromStart, size);
 
-    ovlRelocs = (OverlayRelocationSection*)((uintptr_t)end - ((s32*)end)[-1]);
+    ovlRelocs = (OverlayRelocationSection*)(end - ((s32*)end)[-1]);
 
     if (gOverlayLogSeverity >= 3) {}
     if (gOverlayLogSeverity >= 3) {}
@@ -153,7 +153,7 @@ size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t vramStart,
 
     if (ovlRelocs->bssSize != 0) {
         if (gOverlayLogSeverity >= 3) {}
-        bzero(end, ovlRelocs->bssSize);
+        bzero((void*)end, ovlRelocs->bssSize);
     }
 
     size = vramEnd - vramStart;
@@ -166,8 +166,8 @@ size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t vramStart,
     return size;
 }
 
-void* Overlay_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, uintptr_t vramStart, uintptr_t vramEnd) {
-    void* allocatedRamAddr = SystemArena_MallocR(vramEnd - vramStart);
+void* Overlay_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd) {
+    void* allocatedRamAddr = SystemArena_MallocR((uintptr_t)vramEnd - (uintptr_t)vramStart);
 
     if (allocatedRamAddr != NULL) {
         Overlay_Load(vromStart, vromEnd, vramStart, vramEnd, allocatedRamAddr);
diff --git a/src/boot/O2/system_heap.c b/src/boot/O2/system_heap.c
index 365d94596..c34129f12 100644
--- a/src/boot/O2/system_heap.c
+++ b/src/boot/O2/system_heap.c
@@ -8,9 +8,9 @@
 #include "global.h"
 #include "system_malloc.h"
 
-typedef void (*BlockFunc)(void*);
-typedef void (*BlockFunc1)(void*, u32);
-typedef void (*BlockFunc8)(void*, u32, u32, u32, u32, u32, u32, u32, u32);
+typedef void (*BlockFunc)(uintptr_t);
+typedef void (*BlockFunc1)(uintptr_t, u32);
+typedef void (*BlockFunc8)(uintptr_t, u32, u32, u32, u32, u32, u32, u32, u32);
 
 typedef struct InitFunc {
     /* 0x0 */ uintptr_t nextOffset;
@@ -41,7 +41,7 @@ void SystemHeap_Free(void* ptr) {
 }
 
 void SystemHeap_RunBlockFunc(void* blk, size_t nBlk, size_t blkSize, BlockFunc blockFunc) {
-    uintptr_t pos = blk;
+    uintptr_t pos = (uintptr_t)blk;
 
     for (; pos < (uintptr_t)blk + (nBlk * blkSize); pos += (blkSize & ~0)) {
         blockFunc(pos);
@@ -49,7 +49,7 @@ void SystemHeap_RunBlockFunc(void* blk, size_t nBlk, size_t blkSize, BlockFunc b
 }
 
 void SystemHeap_RunBlockFunc1(void* blk, size_t nBlk, size_t blkSize, BlockFunc1 blockFunc) {
-    uintptr_t pos = blk;
+    uintptr_t pos = (uintptr_t)blk;
 
     for (; pos < (uintptr_t)blk + (nBlk * blkSize); pos += (blkSize & ~0)) {
         blockFunc(pos, 2);
@@ -62,7 +62,7 @@ void* SystemHeap_RunBlockFunc8(void* blk, size_t nBlk, size_t blkSize, BlockFunc
     }
 
     if ((blk != NULL) && (blockFunc != NULL)) {
-        uintptr_t pos = blk;
+        uintptr_t pos = (uintptr_t)blk;
 
         for (; pos < (uintptr_t)blk + (nBlk * blkSize); pos += (blkSize & ~0)) {
             blockFunc(pos, 0, 0, 0, 0, 0, 0, 0, 0);
@@ -82,7 +82,7 @@ void SystemHeap_RunBlockFunc1Reverse(void* blk, size_t nBlk, size_t blkSize, Blo
     }
 
     if (blockFunc != NULL) {
-        start = blk;
+        start = (uintptr_t)blk;
         maskedBlkSize = (blkSize & ~0);
         pos = (uintptr_t)start + (nBlk * blkSize);