update ps2sdk

ThirteenAG · ThirteenAG · commit 4000b8d58df3 · 2024-10-13T12:03:27.000+08:00
diff --git a/external/modutils b/external/modutils
@@ -1 +1 @@
-Subproject commit 58f3f475e6e84dc97f5e2c171e21b928c2c366ab
+Subproject commit cc5c9df5895e7c0ca0dc087a716f4782635ddcfe
diff --git a/external/ps2sdk b/external/ps2sdk
@@ -1 +1 @@
-Subproject commit 0cdda8bf28bc88bf3711ab59611bf7e454222b43
+Subproject commit 93110f981e49c02706e5a75044b0df096d42c472
diff --git a/includes/pcsx2/inireader.c b/includes/pcsx2/inireader.c
@@ -2,15 +2,15 @@
 
 void SetIniPath(const char* szFileContent, size_t size)
 {
-    inireader.iniBuf = szFileContent;
+    inireader.iniBuf = (int)szFileContent;
     inireader.iniBufSize = size;
 }
 
 int ReadInteger(char* szSection, char* szKey, int iDefaultValue)
 {
     // hex numbers are not supported
     int result = iDefaultValue;
-    if (rini_get_key(szSection, szKey, inireader.iniBuf, inireader.iniBufSize, &result, sizeof(result), INT_VAL))
+    if (rini_get_key(szSection, szKey, (char*)inireader.iniBuf, inireader.iniBufSize, &result, sizeof(result), INT_VAL))
     {
         return result;
     }
@@ -55,7 +55,7 @@ float ratof(char* arr)
 float ReadFloat(char* szSection, char* szKey, float fltDefaultValue)
 {
     static char Buffer[30];
-    if (rini_get_key(szSection, szKey, inireader.iniBuf, inireader.iniBufSize, &Buffer, sizeof(Buffer), STRING_VAL))
+    if (rini_get_key(szSection, szKey, (char*)inireader.iniBuf, inireader.iniBufSize, &Buffer, sizeof(Buffer), STRING_VAL))
     {
         return ratof(Buffer);
     }
@@ -68,7 +68,7 @@ float ReadFloat(char* szSection, char* szKey, float fltDefaultValue)
 bool ReadBoolean(char* szSection, char* szKey, bool bDefaultValue)
 {
     bool result = bDefaultValue;
-    if (rini_get_key(szSection, szKey, inireader.iniBuf, inireader.iniBufSize, &result, sizeof(result), BOOL_VAL))
+    if (rini_get_key(szSection, szKey, (char*)inireader.iniBuf, inireader.iniBufSize, &result, sizeof(result), BOOL_VAL))
     {
         return result;
     }
@@ -80,7 +80,7 @@ bool ReadBoolean(char* szSection, char* szKey, bool bDefaultValue)
 
 char* ReadString(char* szSection, char* szKey, char* szDefaultValue, char* Buffer, int BufferSize)
 {
-    if (rini_get_key(szSection, szKey, inireader.iniBuf, inireader.iniBufSize, Buffer, BufferSize, STRING_VAL))
+    if (rini_get_key(szSection, szKey, (char*)inireader.iniBuf, inireader.iniBufSize, Buffer, BufferSize, STRING_VAL))
     {
         while (*Buffer == ' ')
             *Buffer++;
diff --git a/includes/pcsx2/injector.c b/includes/pcsx2/injector.c
@@ -9,9 +9,9 @@ uint32_t parseCommand(uint32_t command, uint32_t from, uint32_t to)
     return (command & mask) >> from;
 }
 
-void* GetGP()
+void* _GetGP()
 {
-    unsigned int gp;
+    void* gp;
     asm(
         "move %0, $gp\n"
         : "=r"(gp)
@@ -26,17 +26,17 @@ uintptr_t adjustAddress(uintptr_t addr)
 
 void WriteMemoryRaw(uintptr_t addr, void* value, size_t size)
 {
-    memcpy(adjustAddress(addr), value, size);
+    memcpy((void*)adjustAddress(addr), value, size);
 }
 
 void ReadMemoryRaw(uintptr_t addr, void* ret, size_t size)
 {
-    memcpy(ret, adjustAddress(addr), size);
+    memcpy((void*)ret, (void*)adjustAddress(addr), size);
 }
 
 void MemoryFill(uintptr_t addr, uint8_t value, size_t size)
 {
-    unsigned char* p = adjustAddress(addr);
+    unsigned char* p = (unsigned char*)adjustAddress(addr);
     while (size--)
     {
         *p++ = (unsigned char)value;
@@ -134,7 +134,7 @@ uintptr_t MakeJMPwNOP(uintptr_t at, uintptr_t dest)
 {
     uintptr_t bd = GetBranchDestination(at);
     WriteMemory32(adjustAddress(at), (0x08000000 | ((adjustAddress(dest) & 0x0FFFFFFC) >> 2)));
-    MakeNOP(adjustAddress(at + 4));
+    injector.MakeNOP(adjustAddress(at + 4));
     return bd;
 }
 
@@ -182,7 +182,7 @@ uintptr_t MakeInline(size_t instrCount, uintptr_t at, ...)
 }
 
 uintptr_t MakeCallStub(uintptr_t numInstr) {
-    return AllocMemBlock(numInstr * sizeof(uintptr_t));
+    return (uintptr_t)AllocMemBlock(numInstr * sizeof(uintptr_t));
 }
 
 void MakeLUIORI(uintptr_t at, RegisterID reg, float imm)
@@ -291,7 +291,7 @@ void MakeInlineLI(uintptr_t at, int32_t imm)
 
 struct injector_t injector =
 {
-    .GetGP = GetGP,
+    .GetGP = _GetGP,
     .WriteMemoryRaw = WriteMemoryRaw,
     .ReadMemoryRaw = ReadMemoryRaw,
     .MemoryFill = MemoryFill,
diff --git a/includes/pcsx2/injector.h b/includes/pcsx2/injector.h
@@ -79,6 +79,6 @@ extern struct injector_t injector;
          9,8,7,6,5,4,3,2,1,0
 #endif
 
-#define MakeInlineWrapper(at, ...) MakeInline(PP_NARG(__VA_ARGS__), at, __VA_ARGS__)
-#define MakeInlineWrapperWithNOP(at, ...) MakeNOP(at + 4); MakeInline(PP_NARG(__VA_ARGS__), at, __VA_ARGS__)
+#define MakeInlineWrapper(at, ...) injector.MakeInline(PP_NARG(__VA_ARGS__), at, __VA_ARGS__)
+#define MakeInlineWrapperWithNOP(at, ...) injector.MakeNOP(at + 4); injector.MakeInline(PP_NARG(__VA_ARGS__), at, __VA_ARGS__)
 #endif
diff --git a/includes/pcsx2/memalloc.c b/includes/pcsx2/memalloc.c
@@ -5,7 +5,7 @@
 #endif
 
 int mem_custom_initialized = 0;
-char mem_custom[MEM_CUSTOM_TOTAL_SIZE] = { 0 };
+char mem_custom[MEM_CUSTOM_TOTAL_SIZE] = { 1 };
 struct mem_block* mem_freeList = (struct mem_block*)mem_custom;
 
 void mem_initialize() {
diff --git a/includes/pcsx2/memalloc.h b/includes/pcsx2/memalloc.h
@@ -2,6 +2,7 @@
 #define H_MEMALLOC
 #include <stdio.h>
 #include <stddef.h>
+#include <string.h>
 
 struct mem_block {
     size_t size;
diff --git a/includes/pcsx2/patterns.c b/includes/pcsx2/patterns.c
@@ -95,9 +95,9 @@ uintptr_t range_get(size_t count, uintptr_t range_start, size_t range_size, cons
     size_t len = strlen(pattern_str);
     static uint8_t buf[buf_size/*len*/];
     uint8_t size = hextobin(pattern_str, buf, len, wc);
-    uint8_t* result = bytes_find_nth(count, range_start, range_size, buf, size, wc);
+    uint8_t* result = bytes_find_nth(count, (uint8_t*)range_start, range_size, buf, size, wc);
     if (result)
-        return result + offset;
+        return (uintptr_t)(result + offset);
     else
         return 0;
 }
diff --git a/source/GTALCS.PCSX2F.WidescreenFix/lodl.c b/source/GTALCS.PCSX2F.WidescreenFix/lodl.c
@@ -4831,7 +4831,7 @@ void RegisterLODLights()
                     {
                         if (!aLodLights[i].nCoronaShowMode)
                         {
-                            CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
+                            CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
                         }
                         //else
                         //{
@@ -4850,7 +4850,7 @@ void RegisterLODLights()
                     {
                         if ((aLodLights[i].r >= 250 && aLodLights[i].g >= 100 && aLodLights[i].b <= 100) && ((curMin == 9 || curMin == 19 || curMin == 29 || curMin == 39 || curMin == 49 || curMin == 59))) //yellow
                         {
-                            CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
+                            CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
                         }
                         else
                         {
@@ -4859,27 +4859,27 @@ void RegisterLODLights()
                             {
                                 if ((aLodLights[i].r >= 250 && aLodLights[i].g < 100 && aLodLights[i].b == 0) && (((curMin >= 0 && curMin < 9) || (curMin >= 20 && curMin < 29) || (curMin >= 40 && curMin < 49)))) //red
                                 {
-                                    CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
+                                    CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
                                 }
                                 else
                                 {
                                     if ((aLodLights[i].r == 0 && aLodLights[i].g >= 250 && aLodLights[i].b == 0) && (((curMin > 9 && curMin < 19) || (curMin > 29 && curMin < 39) || (curMin > 49 && curMin < 59)))) //green
                                     {
-                                        CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
+                                        CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
                                     }
                                 }
                             }
                             else
                             {
                                 if ((aLodLights[i].r == 0 && aLodLights[i].g >= 250 && aLodLights[i].b == 0) && (((curMin >= 0 && curMin < 9) || (curMin >= 20 && curMin < 29) || (curMin >= 40 && curMin < 49)))) //red
                                 {
-                                    CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
+                                    CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
                                 }
                                 else
                                 {
                                     if ((aLodLights[i].r >= 250 && aLodLights[i].g < 100 && aLodLights[i].b == 0) && (((curMin > 9 && curMin < 19) || (curMin > 29 && curMin < 39) || (curMin > 49 && curMin < 59)))) //green
                                     {
-                                        CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
+                                        CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);
                                     }
                                 }
                             }
diff --git a/source/GTAVCS.PCSX2F.ImVehLM/main.c b/source/GTAVCS.PCSX2F.ImVehLM/main.c
@@ -538,7 +538,7 @@ struct VehicleLightsData
     uint8_t align16 rasterBuffer[NUM_LIGHTS][16384];
 };
 
-struct VehicleLightsData align16 arrayofData[NUM_VEHICLES - _6ATV] = { 0 };
+struct VehicleLightsData align16 arrayofData[NUM_VEHICLES - _6ATV] = { 1 };
 
 struct RslTexture* DuplicateCarTexture(int arrI, int lightI, struct RslTexture* src)
 {
@@ -670,19 +670,19 @@ int CEntity__Render(void* car)
 
 #ifdef DUMPER_MODE
     int (*FindPlayerVehicle)() = (void*)0x24A2D0;
-    if (FindPlayerVehicle() == (int)car)
+    if (FindPlayerVehicle() == (uintptr_t)car)
 #endif
     {
 #ifdef DUMPER_MODE
-        if (gPVeh != (int)car)
+        if (gPVeh != (uintptr_t)car)
             gCounter = 0;
 
-        gPVeh = (int)car;
+        gPVeh = (uintptr_t)car;
         counter++;
 #endif
 
         // PreRender
-        struct RslElement* m_pRwClump = *(struct RslElement**)((int)car + 0x50);
+        struct RslElement* m_pRwClump = *(struct RslElement**)((uintptr_t)car + 0x50);
         RslElementGroupForAllElements(m_pRwClump, SetElementRendererCB_ImVehLM, car);
         // Render
         res = CEntityRender(car);
diff --git a/source/GTAVCS.PCSX2F.Project2DFX/lodl.c b/source/GTAVCS.PCSX2F.Project2DFX/lodl.c
@@ -4831,7 +4831,7 @@ void RegisterLODLights()
                     {
                         //if (!aLodLights[i].nCoronaShowMode)
                         {
-                            CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
+                            CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
                         }
                         //else //causes crashing for some reason
                         //{
@@ -4853,7 +4853,7 @@ void RegisterLODLights()
                     {
                         if ((aLodLights[i].r >= 250 && aLodLights[i].g >= 100 && aLodLights[i].b <= 100) && ((curMin == 9 || curMin == 19 || curMin == 29 || curMin == 39 || curMin == 49 || curMin == 59))) //yellow
                         {
-                            CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
+                            CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
                         }
                         else
                         {
@@ -4862,27 +4862,27 @@ void RegisterLODLights()
                             {
                                 if ((aLodLights[i].r >= 250 && aLodLights[i].g < 100 && aLodLights[i].b == 0) && (((curMin >= 0 && curMin < 9) || (curMin >= 20 && curMin < 29) || (curMin >= 40 && curMin < 49)))) //red
                                 {
-                                    CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
+                                    CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
                                 }
                                 else
                                 {
                                     if ((aLodLights[i].r == 0 && aLodLights[i].g >= 250 && aLodLights[i].b == 0) && (((curMin > 9 && curMin < 19) || (curMin > 29 && curMin < 39) || (curMin > 49 && curMin < 59)))) //green
                                     {
-                                        CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
+                                        CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
                                     }
                                 }
                             }
                             else
                             {
                                 if ((aLodLights[i].r == 0 && aLodLights[i].g >= 250 && aLodLights[i].b == 0) && (((curMin >= 0 && curMin < 9) || (curMin >= 20 && curMin < 29) || (curMin >= 40 && curMin < 49)))) //red
                                 {
-                                    CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
+                                    CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
                                 }
                                 else
                                 {
                                     if ((aLodLights[i].r >= 250 && aLodLights[i].g < 100 && aLodLights[i].b == 0) && (((curMin > 9 && curMin < 19) || (curMin > 29 && curMin < 39) || (curMin > 49 && curMin < 59)))) //green
                                     {
-                                        CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
+                                        CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0, 0);
                                     }
                                 }
                             }
diff --git a/source/GTAVCS.PCSX2F.WidescreenFix/ckey.c b/source/GTAVCS.PCSX2F.WidescreenFix/ckey.c
@@ -184,10 +184,10 @@ void ReplacePadFuncsWithPCControls()
         injector.MakeNOPWithSize(0x2955D8, 64);
         MakeInlineWrapper(0x2955D8,
             move(at, v0),
-            jal(CPad__KBLookAroundLeftRightNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundLeftRightNoTimeStamp),
             move(a0, at),
             movs(f20, f0),
-            jal(CPad__KBLookAroundUpDownNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundUpDownNoTimeStamp),
             move(a0, at),
             movs(f5, f0),
             lui(at, 0x3F80),
@@ -205,10 +205,10 @@ void ReplacePadFuncsWithPCControls()
     {
         injector.MakeNOPWithSize(0x29EC9C, 44);
         MakeInlineWrapper(0x29EC9C,
-            jal(CPad__KBLookAroundLeftRightNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundLeftRightNoTimeStamp),
             lw(a0, sp, 0xBC),
             movs(f20, f0),
-            jal(CPad__KBLookAroundUpDownNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundUpDownNoTimeStamp),
             lw(a0, sp, 0xBC),
             movs(f21, f0)
         );
@@ -241,10 +241,10 @@ void ReplacePadFuncsWithPCControls()
     {
         injector.MakeNOPWithSize(0x2A0E94, 44);
         MakeInlineWrapper(0x2A0E94,
-            jal(CPad__KBLookAroundLeftRightNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundLeftRightNoTimeStamp),
             lw(a0, sp, 0xCC),
             movs(f20, f0),
-            jal(CPad__KBLookAroundUpDownNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundUpDownNoTimeStamp),
             lw(a0, sp, 0xCC),
             movs(f21, f0)
         );
@@ -263,10 +263,10 @@ void ReplacePadFuncsWithPCControls()
         injector.MakeNOPWithSize(0x29804C, 52);
         MakeInlineWrapper(0x29804C,
             move(at, v0),
-            jal(CPad__KBLookAroundLeftRightNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundLeftRightNoTimeStamp),
             move(a0, at),
             movs(f21, f0),
-            jal(CPad__KBLookAroundUpDownNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundUpDownNoTimeStamp),
             move(a0, at),
             movs(f8, f0)
         );
@@ -327,10 +327,10 @@ void ReplacePadFuncsWithPCControls()
         injector.MakeNOPWithSize(0x29CD04, 56);
         MakeInlineWrapper(0x29CD04,
             move(at, v0),
-            jal(CPad__KBLookAroundLeftRightNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundLeftRightNoTimeStamp),
             move(a0, at),
             movs(f20, f0),
-            jal(CPad__KBLookAroundUpDownNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundUpDownNoTimeStamp),
             move(a0, at)
             //movs(f0, f0)
         );
@@ -349,10 +349,10 @@ void ReplacePadFuncsWithPCControls()
             mtc1(at, f23),
             lui(at, 0x42DC),
             mtc1(at, f24),
-            jal(CPad__KBLookAroundLeftRightNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundLeftRightNoTimeStamp),
             move(a0, s0),
             movs(f22, f0),
-            jal(CPad__KBLookAroundUpDownNoTimeStamp),
+            jal((uintptr_t)CPad__KBLookAroundUpDownNoTimeStamp),
             move(a0, s0),
             movs(f25, f0)
         );
diff --git a/source/GTAVCS.PCSX2F.WidescreenFix/main.c b/source/GTAVCS.PCSX2F.WidescreenFix/main.c
@@ -261,7 +261,7 @@ void init()
         {
             //logger.Write("Fixing FOV...");
             uintptr_t ptr_44A648 = pattern.get(0, "90 FF BD 27 58 00 B5 E7 50 00 B4 E7 46 6D 00 46", 0);
-            game_atan2f = (float (*)(float))ptr_44A648;
+            game_atan2f = (float (*)(float, float))ptr_44A648;
             uintptr_t ptr_21CD68 = pattern.get(0, "03 84 10 00 03 8C 11 00 03 94 12 00 03 9C 13 00 03 A4 14 00 03 AC 15 00", 0);
             flt_487484 = (float*)GetAbsoluteAddress(ptr_21CD68, 32, 48);
             temp_t = tan(fDefaultFOV / 2.0f * ((float)M_PI / 180.0f));
@@ -480,7 +480,7 @@ void init()
         MakeInlineWrapper(0x37281C,
             lui(at, 0x40A0),
             move(a0, s0),
-            jal(isLittleWillie),
+            jal((uintptr_t)isLittleWillie),
             nop()
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,15 @@`
`2`	`2`
`3`	`3`	`void SetIniPath(const char* szFileContent, size_t size)`
`4`	`4`	`{`
`5`		`- inireader.iniBuf = szFileContent;`
	`5`	`+ inireader.iniBuf = (int)szFileContent;`
`6`	`6`	`inireader.iniBufSize = size;`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`int ReadInteger(char* szSection, char* szKey, int iDefaultValue)`
`10`	`10`	`{`
`11`	`11`	`// hex numbers are not supported`
`12`	`12`	`int result = iDefaultValue;`
`13`		`- if (rini_get_key(szSection, szKey, inireader.iniBuf, inireader.iniBufSize, &result, sizeof(result), INT_VAL))`
	`13`	`+ if (rini_get_key(szSection, szKey, (char*)inireader.iniBuf, inireader.iniBufSize, &result, sizeof(result), INT_VAL))`
`14`	`14`	`{`
`15`	`15`	`return result;`
`16`	`16`	`}`
`@@ -55,7 +55,7 @@ float ratof(char* arr)`
`55`	`55`	`float ReadFloat(char* szSection, char* szKey, float fltDefaultValue)`
`56`	`56`	`{`
`57`	`57`	`static char Buffer[30];`
`58`		`- if (rini_get_key(szSection, szKey, inireader.iniBuf, inireader.iniBufSize, &Buffer, sizeof(Buffer), STRING_VAL))`
	`58`	`+ if (rini_get_key(szSection, szKey, (char*)inireader.iniBuf, inireader.iniBufSize, &Buffer, sizeof(Buffer), STRING_VAL))`
`59`	`59`	`{`
`60`	`60`	`return ratof(Buffer);`
`61`	`61`	`}`
`@@ -68,7 +68,7 @@ float ReadFloat(char* szSection, char* szKey, float fltDefaultValue)`
`68`	`68`	`bool ReadBoolean(char* szSection, char* szKey, bool bDefaultValue)`
`69`	`69`	`{`
`70`	`70`	`bool result = bDefaultValue;`
`71`		`- if (rini_get_key(szSection, szKey, inireader.iniBuf, inireader.iniBufSize, &result, sizeof(result), BOOL_VAL))`
	`71`	`+ if (rini_get_key(szSection, szKey, (char*)inireader.iniBuf, inireader.iniBufSize, &result, sizeof(result), BOOL_VAL))`
`72`	`72`	`{`
`73`	`73`	`return result;`
`74`	`74`	`}`
`@@ -80,7 +80,7 @@ bool ReadBoolean(char* szSection, char* szKey, bool bDefaultValue)`
`80`	`80`
`81`	`81`	`char* ReadString(char* szSection, char* szKey, char* szDefaultValue, char* Buffer, int BufferSize)`
`82`	`82`	`{`
`83`		`- if (rini_get_key(szSection, szKey, inireader.iniBuf, inireader.iniBufSize, Buffer, BufferSize, STRING_VAL))`
	`83`	`+ if (rini_get_key(szSection, szKey, (char*)inireader.iniBuf, inireader.iniBufSize, Buffer, BufferSize, STRING_VAL))`
`84`	`84`	`{`
`85`	`85`	`while (*Buffer == ' ')`
`86`	`86`	`*Buffer++;`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ uint32_t parseCommand(uint32_t command, uint32_t from, uint32_t to)`
`9`	`9`	`return (command & mask) >> from;`
`10`	`10`	`}`
`11`	`11`
`12`		`-void* GetGP()`
	`12`	`+void* _GetGP()`
`13`	`13`	`{`
`14`		`- unsigned int gp;`
	`14`	`+ void* gp;`
`15`	`15`	`asm(`
`16`	`16`	`"move %0, $gp\n"`
`17`	`17`	`: "=r"(gp)`
`@@ -26,17 +26,17 @@ uintptr_t adjustAddress(uintptr_t addr)`
`26`	`26`
`27`	`27`	`void WriteMemoryRaw(uintptr_t addr, void* value, size_t size)`
`28`	`28`	`{`
`29`		`- memcpy(adjustAddress(addr), value, size);`
	`29`	`+ memcpy((void*)adjustAddress(addr), value, size);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`void ReadMemoryRaw(uintptr_t addr, void* ret, size_t size)`
`33`	`33`	`{`
`34`		`- memcpy(ret, adjustAddress(addr), size);`
	`34`	`+ memcpy((void)ret, (void)adjustAddress(addr), size);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`void MemoryFill(uintptr_t addr, uint8_t value, size_t size)`
`38`	`38`	`{`
`39`		`- unsigned char* p = adjustAddress(addr);`
	`39`	`+ unsigned char* p = (unsigned char*)adjustAddress(addr);`
`40`	`40`	`while (size--)`
`41`	`41`	`{`
`42`	`42`	`*p++ = (unsigned char)value;`
`@@ -134,7 +134,7 @@ uintptr_t MakeJMPwNOP(uintptr_t at, uintptr_t dest)`
`134`	`134`	`{`
`135`	`135`	`uintptr_t bd = GetBranchDestination(at);`
`136`	`136`	`WriteMemory32(adjustAddress(at), (0x08000000 \| ((adjustAddress(dest) & 0x0FFFFFFC) >> 2)));`
`137`		`- MakeNOP(adjustAddress(at + 4));`
	`137`	`+ injector.MakeNOP(adjustAddress(at + 4));`
`138`	`138`	`return bd;`
`139`	`139`	`}`
`140`	`140`
`@@ -182,7 +182,7 @@ uintptr_t MakeInline(size_t instrCount, uintptr_t at, ...)`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`uintptr_t MakeCallStub(uintptr_t numInstr) {`
`185`		`- return AllocMemBlock(numInstr * sizeof(uintptr_t));`
	`185`	`+ return (uintptr_t)AllocMemBlock(numInstr * sizeof(uintptr_t));`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`void MakeLUIORI(uintptr_t at, RegisterID reg, float imm)`
`@@ -291,7 +291,7 @@ void MakeInlineLI(uintptr_t at, int32_t imm)`
`291`	`291`
`292`	`292`	`struct injector_t injector =`
`293`	`293`	`{`
`294`		`- .GetGP = GetGP,`
	`294`	`+ .GetGP = _GetGP,`
`295`	`295`	`.WriteMemoryRaw = WriteMemoryRaw,`
`296`	`296`	`.ReadMemoryRaw = ReadMemoryRaw,`
`297`	`297`	`.MemoryFill = MemoryFill,`
Original file line number	Diff line number	Diff line change
`@@ -4831,7 +4831,7 @@ void RegisterLODLights()`
`4831`	`4831`	`{`
`4832`	`4832`	`if (!aLodLights[i].nCoronaShowMode)`
`4833`	`4833`	`{`
`4834`		`- CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
	`4834`	`+ CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
`4835`	`4835`	`}`
`4836`	`4836`	`//else`
`4837`	`4837`	`//{`
`@@ -4850,7 +4850,7 @@ void RegisterLODLights()`
`4850`	`4850`	`{`
`4851`	`4851`	`if ((aLodLights[i].r >= 250 && aLodLights[i].g >= 100 && aLodLights[i].b <= 100) && ((curMin == 9 \|\| curMin == 19 \|\| curMin == 29 \|\| curMin == 39 \|\| curMin == 49 \|\| curMin == 59))) //yellow`
`4852`	`4852`	`{`
`4853`		`- CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
	`4853`	`+ CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
`4854`	`4854`	`}`
`4855`	`4855`	`else`
`4856`	`4856`	`{`
`@@ -4859,27 +4859,27 @@ void RegisterLODLights()`
`4859`	`4859`	`{`
`4860`	`4860`	`if ((aLodLights[i].r >= 250 && aLodLights[i].g < 100 && aLodLights[i].b == 0) && (((curMin >= 0 && curMin < 9) \|\| (curMin >= 20 && curMin < 29) \|\| (curMin >= 40 && curMin < 49)))) //red`
`4861`	`4861`	`{`
`4862`		`- CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
	`4862`	`+ CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
`4863`	`4863`	`}`
`4864`	`4864`	`else`
`4865`	`4865`	`{`
`4866`	`4866`	`if ((aLodLights[i].r == 0 && aLodLights[i].g >= 250 && aLodLights[i].b == 0) && (((curMin > 9 && curMin < 19) \|\| (curMin > 29 && curMin < 39) \|\| (curMin > 49 && curMin < 59)))) //green`
`4867`	`4867`	`{`
`4868`		`- CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
	`4868`	`+ CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
`4869`	`4869`	`}`
`4870`	`4870`	`}`
`4871`	`4871`	`}`
`4872`	`4872`	`else`
`4873`	`4873`	`{`
`4874`	`4874`	`if ((aLodLights[i].r == 0 && aLodLights[i].g >= 250 && aLodLights[i].b == 0) && (((curMin >= 0 && curMin < 9) \|\| (curMin >= 20 && curMin < 29) \|\| (curMin >= 40 && curMin < 49)))) //red`
`4875`	`4875`	`{`
`4876`		`- CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
	`4876`	`+ CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
`4877`	`4877`	`}`
`4878`	`4878`	`else`
`4879`	`4879`	`{`
`4880`	`4880`	`if ((aLodLights[i].r >= 250 && aLodLights[i].g < 100 && aLodLights[i].b == 0) && (((curMin > 9 && curMin < 19) \|\| (curMin > 29 && curMin < 39) \|\| (curMin > 49 && curMin < 59)))) //green`
`4881`	`4881`	`{`
`4882`		`- CCoronas__RegisterCorona(&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
	`4882`	`+ CCoronas__RegisterCorona((int)&aLodLights[i], aLodLights[i].r, aLodLights[i].g, aLodLights[i].b, alpha, pos, 0, 0, radius, fCoronaFarClip, fUnkDist1, fUnkDist2, 1, 0, 0, 0);`
`4883`	`4883`	`}`
`4884`	`4884`	`}`
`4885`	`4885`	`}`