portx64: and more s32 -> uintptr_t

src/include/constants.h

@@ -51,7 +51,7 @@
 #define ALIGN2(val)         (((val) | 1) ^ 0x1)
 #define ALIGN8(val)         ((((val) + 0x7) | 0x7) ^ 0x7)
 #define ALIGN16(val)        ((((val) + 0xf) | 0xf) ^ 0xf)
-#define ALIGN64(val)        (((((u32)(val)) + 0x3f) | 0x3f) ^ 0x3f)
+#define ALIGN64(val)        (((((uintptr_t)(val)) + 0x3f) | 0x3f) ^ 0x3f)
 #define ARRAYCOUNT(a)       (s32)(sizeof(a) / sizeof(a[0]))
 #define CHRNAVSEED(chr)     ((g_Vars.lvframe60 >> 9) * 128 + chr->chrnum * 8)
 #define CHRRACE(chr)        (chr ? chr->race : RACE_HUMAN)

src/include/game/bondgun.h

@@ -118,8 +118,8 @@ bool bgun0f0a27c8(void);
 void bgunHandlePlayerDead(void);
 bool bgunIsMissionCritical(s32 weaponnum);
 void bgunDisarm(struct prop *attacker);
-void bgunExecuteModelCmdList(s32 *arg0);
-s32 bgunCreateModelCmdList(struct model *model, struct modelnode *node, s32 *ptr);
+void bgunExecuteModelCmdList(uintptr_t *arg0);
+s32 bgunCreateModelCmdList(struct model *model, struct modelnode *node, uintptr_t *ptr);
 void bgunStartDetonateAnimation(s32 playernum);
 void bgunUpdateGangsta(struct hand *hand, s32 handnum, struct coord *arg2, struct weaponfunc *funcdef, Mtxf *arg4, Mtxf *arg5);
 void bgunUpdateSmoke(struct hand *hand, s32 handnum, s32 weaponnum, struct weaponfunc *funcdef);

src/include/game/filemgr.h

@@ -16,7 +16,7 @@ void filemgrSetFileToDelete(struct filelistfile *file, s32 filetype);
 char *filemgrMenuTextFailReason(struct menuitem *item);
 char *filemgrMenuTextDeviceNameForError(struct menuitem *item);
 void filemgrPushErrorDialog(u16 errnum);
-s32 filemgrGetDeviceNameOrStartIndex(s32 listnum, s32 operation, s32 optionindex);
+uintptr_t filemgrGetDeviceNameOrStartIndex(s32 listnum, s32 operation, s32 optionindex);
 char *filemgrMenuTextErrorTitle(struct menuitem *item);
 char *filemgrMenuTextFileType(struct menuitem *item);
 void func0f10898c(void);

src/include/game/texdecompress.h

@@ -33,7 +33,7 @@ s32 texGetPoolFreeBytes(struct texpool *pool);
 u8 *texGetPoolLeftPos(struct texpool *pool);
 void texLoadFromDisplayList(Gfx *gdl, struct texpool *pool, s32 arg2);
 void texLoad(texnum_t *updateword, struct texpool *pool, bool unusedarg);
-void texLoadFromConfigs(struct textureconfig *configs, s32 numconfigs, struct texpool *pool, s32 arg3);
+void texLoadFromConfigs(struct textureconfig *configs, s32 numconfigs, struct texpool *pool, uintptr_t arg3);
 void texLoadFromTextureNum(u32 arg0, struct texpool *pool);
 #ifndef PLATFORM_N64
 void texSwizzleInternal(u8 *dst, s32 width, s32 height, s32 format, u32 dstlen);

src/include/lib/mema.h

@@ -6,13 +6,13 @@
 
 void memaDefrag(void);
 void memaInit(void);
-void memaReset(void *ptr, u32 size);
+void memaReset(void *ptr, u64 size);
 void memaPrint(void);
-void *memaAlloc(u32 size);
-s32 memaGrow(s32 addr, u32 amount);
-void _memaFree(s32 addr, s32 size);
-void memaFree(void *addr, s32 size);
-s32 memaGetLongestFree(void);
-bool memaRealloc(s32 addr, u32 oldsize, u32 newsize);
+void *memaAlloc(u64 size);
+uintptr_t memaGrow(uintptr_t addr, u64 amount);
+void _memaFree(uintptr_t addr, u64 size);
+void memaFree(void *addr, u64 size);
+u64 memaGetLongestFree(void);
+bool memaRealloc(uintptr_t addr, u64 oldsize, u64 newsize);
 
 #endif

src/include/lib/mp3.h

@@ -5,7 +5,7 @@
 #include "types.h"
 
 void mp3Init(ALHeap *heap);
-void mp3PlayFile(s32 romaddr, s32 filesize);
+void mp3PlayFile(uintptr_t romaddr, s32 filesize);
 void func00037e1c(void);
 void func00037e38(void);
 void func00037e68(void);

src/include/lib/snd.h

@@ -12,11 +12,11 @@ void snd0000ea80(u16 volume);
 void sndResetCurMp3(void);
 void sndLoadSfxCtl(void);
 void sndIncrementAges(void);
-ALEnvelope *sndLoadEnvelope(u32 offset, u16 index);
-ALKeyMap *sndLoadKeymap(u32 offset, u16 index);
-ALADPCMBook *sndLoadAdpcmBook(u32 offset, u16 index);
-ALADPCMloop *sndLoadAdpcmLoop(u32 offset, u16 index);
-ALWaveTable *sndLoadWavetable(u32 offset, u16 index);
+ALEnvelope *sndLoadEnvelope(uintptr_t offset, u16 index);
+ALKeyMap *sndLoadKeymap(uintptr_t offset, u16 index);
+ALADPCMBook* sndLoadAdpcmBook(uintptr_t offset, u16 index);
+ALADPCMloop* sndLoadAdpcmLoop(uintptr_t offset, u16 index);
+ALWaveTable* sndLoadWavetable(uintptr_t offset, u16 index);
 void sndSetSoundMode(s32 mode);
 ALSound *sndLoadSound(s16 soundnum);
 void seqInit(struct seqinstance *seq);

src/include/types.h

@@ -2307,7 +2307,7 @@ struct hand {
 	/*0x0dc0*/ u32 fspare8;
 	/*0x0dc4*/ struct abmag abmag;
 	/*0x0dcc*/ s32 *unk0dcc;
-	/*0x0dd0*/ s32 *unk0dd0;
+	/*0x0dd0*/ uintptr_t *unk0dd0;
 	/*0x0dd4*/ s32 unk0dd4;
 	/*0x0dd8*/ Mtxf *unk0dd8;
 };
@@ -2354,8 +2354,8 @@ struct gunctrl {
 	/*0x15b1*/ u8 gunloadstate;
 	/*0x15b2*/ u16 loadfilenum;
 	/*0x15b4*/ struct modeldef **loadtomodeldef;
-	/*0x15b8*/ u32 *loadmemptr;
-	/*0x15bc*/ u32 *loadmemremaining;
+	/*0x15b8*/ uintptr_t *loadmemptr;
+	/*0x15bc*/ uintptr_t*loadmemremaining;
 	/*0x15c0*/ struct texpool texpool;
 	/*0x15d0*/ u32 nexttexturetoload;
 	/*0x15d4*/ struct fileinfo fileinfo;
@@ -3363,8 +3363,8 @@ struct handlerdata_label {
 
 struct handlerdata_list {
 	union {
-		u32 value;
-		s32 values32;
+		uintptr_t value;
+		intptr_t values32;
 	};
 	union {
 		s32 unk04;