Some u32/s32 -> uintptr_t/intptr_t

include/JSystem/JAudio2/JAISound.h

@@ -134,7 +134,7 @@ struct JAISoundStatus_ {
             u8 flag8 : 1;
         } flags;
     } state;
-    /* 0x4 */ u32 userdata_;
+    /* 0x4 */ uintptr_t userdata_;
 };  // Size: 0x8
 
 /**
@@ -294,8 +294,8 @@ public:
     void setAnimationState(u32 state) {
         status_.state.flags.animationState = state;
     }
-    u32 getUserData() const { return status_.userdata_; }
-    void setUserData(u32 userData) { status_.userdata_ = userData; }
+    uintptr_t getUserData() const { return status_.userdata_; }
+    void setUserData(uintptr_t userData) { status_.userdata_ = userData; }
     JAIAudible* getAudible() { return audible_; }
     bool isHandleAttached() const { return handle_ != NULL; }
     bool hasLifeTime() const { return status_.field_0x1.flags.flag2; }

include/JSystem/JAudio2/JASDSPInterface.h

@@ -112,7 +112,7 @@ namespace JASDsp {
     void invalChannelAll();
     void initBuffer();
     int setFXLine(u8, s16*, JASDsp::FxlineConfig_*);
-    BOOL changeFXLineParam(u8, u8, u32);
+    BOOL changeFXLineParam(u8, u8, uintptr_t);
 
     extern u8 const DSPADPCM_FILTER[64];
     extern u32 const DSPRES_FILTER[320];

include/JSystem/JAudio2/JASHeapCtrl.h

@@ -265,13 +265,13 @@ namespace JASKernel {
     void setupRootHeap(JKRSolidHeap*, u32);
     JKRHeap* getSystemHeap();
     JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* getCommandHeap();
-    void setupAramHeap(u32, u32);
+    void setupAramHeap(uintptr_t, u32);
     JASHeap* getAramHeap();
     u32 getAramFreeSize();
     u32 getAramSize();
 
     extern JASHeap audioAramHeap;
-    extern u32 sAramBase;
+    extern uintptr_t sAramBase;
     extern JKRHeap* sSystemHeap;
     extern JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* sCommandHeap;
 };

include/JSystem/JAudio2/JASResArcLoader.h

@@ -8,10 +8,10 @@ namespace JASResArcLoader {
     size_t getResSize(JKRArchive const*, u16);
     size_t getResMaxSize(JKRArchive const*);
     static void loadResourceCallback(void*);
-    int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
+    int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, uintptr_t), uintptr_t);
 
     // from pikmin2
-    typedef void (*LoadCallback)(u32, u32);
+    typedef void (*LoadCallback)(u32, uintptr_t);
 
     struct TLoadResInfo {
         inline TLoadResInfo(JKRArchive* archive, u16 id, void* buf, u32 size)
@@ -30,7 +30,7 @@ namespace JASResArcLoader {
         void* mBuffer;          // _08
         u32 mBufferSize;        // _0C
         LoadCallback mCallback; // _10
-        u32 mCallbackArg;       // _14, arg to pass to mCallback along with readResource result
+        uintptr_t mCallbackArg; // _14, arg to pass to mCallback along with readResource result
         OSMessageQueue* mQueue; // _18
     };
 };

include/JSystem/JKernel/JKRHeap.h

@@ -72,7 +72,7 @@ public:
     JKRHeap* find(void* ptr) const;
     JKRHeap* findAllHeap(void* ptr) const;
 
-    void dispose_subroutine(u32 start, u32 end);
+    void dispose_subroutine(uintptr_t start, uintptr_t end);
     bool dispose(void* ptr, u32 size);
     void dispose(void* begin, void* end);
     void dispose();