diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index 5619c0682..a0db0fadf 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -133,8 +133,8 @@ public:
     Mtx33* getBumpMtxPtr(int idx) { return mpBumpMtxArr[1][idx][mCurrentViewNo]; }
     Vec* getBaseScale() { return &mBaseScale; } // Unused in TWW
     void setBaseScale(const Vec& scale) { mBaseScale = scale; }
-    void setUserArea(u32 area) { mUserArea = area; }
-    u32 getUserArea() const { return mUserArea; }
+    void setUserArea(uintptr_t area) { mUserArea = area; }
+    uintptr_t getUserArea() const { return mUserArea; }
     void setVisibilityManager(J3DVisibilityManager* manager) { mpVisibilityManager = manager; }
     J3DSkinDeform* getSkinDeform() { return mpSkinDeform; }
 
@@ -144,7 +144,7 @@ private:
     /* 0x008 */ u32 mFlags;
     /* 0x00C */ u32 mDiffFlag;
     /* 0x010 */ J3DCalcCallBack mCalcCallBack;
-    /* 0x014 */ u32 mUserArea;
+    /* 0x014 */ uintptr_t mUserArea;
     /* 0x018 */ Vec mBaseScale;
     /* 0x024 */ Mtx mBaseTransformMtx;
     /* 0x054 */ Mtx mViewBaseMtx;
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index 39d8efdce..e4e34726b 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -8,7 +8,6 @@
 #include "JSystem/J3DGraphBase/J3DVertex.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 
-typedef struct _GXColor GXColor;
 class JUTNameTab;
 
 enum J3DMaterialCopyFlag {
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 33b6d74e7..d5e499783 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -56,7 +56,7 @@ public:
     J3DDisplayListObj* getSharedDisplayListObj() { return mSharedDLObj; }
     J3DIndBlock* getIndBlock() { return mIndBlock; }
     J3DMaterialAnm* getMaterialAnm() {
-        if ((u32)mMaterialAnm < 0xC0000000) {
+        if ((uintptr_t)mMaterialAnm < 0xC0000000) {
             return mMaterialAnm;
         } else {
             return NULL;
diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h
index e7826fcfb..8331b04b0 100644
--- a/include/JSystem/J3DGraphBase/J3DPacket.h
+++ b/include/JSystem/J3DGraphBase/J3DPacket.h
@@ -110,8 +110,8 @@ public:
         mpFirstChild = NULL;
     }
 
-    void setUserArea(u32 area) { mpUserData = (void*)area; }
-    u32 getUserArea() const { return (u32)mpUserData; }
+    void setUserArea(uintptr_t area) { mpUserData = area; }
+    uintptr_t getUserArea() const { return mpUserData; }
 
     virtual bool isSame(J3DMatPacket*) const;
     virtual int entry(J3DDrawBuffer*);
@@ -121,7 +121,7 @@ public:
 public:
     /* 0x04 */ J3DPacket* mpNextPacket;
     /* 0x08 */ J3DPacket* mpFirstChild;
-    /* 0x0C */ void* mpUserData;
+    /* 0x0C */ uintptr_t mpUserData;
 };  // Size: 0x10
 
 class J3DDrawPacket : public J3DPacket {
@@ -207,7 +207,7 @@ public:
     }
     void setTexture(J3DTexture* pTexture) { mpTexture = pTexture; }
     void setInitShapePacket(J3DShapePacket* packet) { mpInitShapePacket = packet; }
-    void setMaterialAnmID(u32 materialAnm) { mpMaterialAnm = (J3DMaterialAnm*)materialAnm; }
+    void setMaterialAnmID(uintptr_t materialAnm) { mpMaterialAnm = (J3DMaterialAnm*)materialAnm; }
     void setMaterialID(u32 id) { mDiffFlag = id; }
     bool isChanged() { return mDiffFlag & 0x80000000; }
     bool isEnabled_Diff() { return mpInitShapePacket->getDisplayListObj() != NULL; }
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 791d93bca..66b9e594b 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -15,15 +15,15 @@ public:
 };
 
 static inline void JRNLoadCPCmd(u8 cmd, u32 param) {
-    GXFIFO.u8 = GX_CMD_LOAD_CP_REG;
-    GXFIFO.u8 = cmd;
-    GXFIFO.u32 = param;
+    GXCmd1u8(GX_CMD_LOAD_CP_REG);
+    GXCmd1u8(cmd);
+    GXCmd1u32(param);
 }
 
 inline void JRNLoadXFCmdHdr(u16 cmd, u8 len) {
-    GXFIFO.u8 = GX_CMD_LOAD_XF_REG;
-    GXFIFO.u16 = len - 1;
-    GXFIFO.u16 = cmd;
+    GXCmd1u8(GX_CMD_LOAD_XF_REG);
+    GXCmd1u16(len - 1);
+    GXCmd1u16(cmd);
 }
 
 class J3DCurrentMtx : public J3DCurrentMtxInfo {
@@ -45,8 +45,8 @@ public:
         JRNLoadCPCmd(0x30, getMtxIdxRegA());  // CP_MATINDEX_A
         JRNLoadCPCmd(0x40, getMtxIdxRegB());  // CP_MATINDEX_B
         JRNLoadXFCmdHdr(0x1018, 2);
-        GXFIFO.u32 = getMtxIdxRegA();
-        GXFIFO.u32 = getMtxIdxRegB();
+        GXCmd1u32(getMtxIdxRegA());
+        GXCmd1u32(getMtxIdxRegB());
     }
 
     void setCurrentTexMtx(u8 t0, u8 t1, u8 t2, u8 t3, u8 t4, u8 t5, u8 t6, u8 t7) {
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 7147982c9..4165ee279 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -46,8 +46,8 @@ public:
     void setResTIMG(u16 index, const ResTIMG& timg) {
         J3D_ASSERT(81, index < mNum, "Error : range over.");
         mpRes[index] = timg;
-        mpRes[index].imageOffset = ((mpRes[index].imageOffset + (u32)&timg - (u32)(mpRes + index)));
-        mpRes[index].paletteOffset = ((mpRes[index].paletteOffset + (u32)&timg - (u32)(mpRes + index)));
+        mpRes[index].imageOffset = ((mpRes[index].imageOffset + (uintptr_t)&timg - (uintptr_t)(mpRes + index)));
+        mpRes[index].paletteOffset = ((mpRes[index].paletteOffset + (uintptr_t)&timg - (uintptr_t)(mpRes + index)));
     }
 };
 
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index b3184eb30..7a5a15b14 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -5,7 +5,6 @@
 #include "dolphin/mtx/vec.h"
 #include "dolphin/types.h"
 
-typedef struct _GXColor GXColor;
 class J3DModel;
 class J3DAnmVtxColor;
 class J3DVertexBuffer;
diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h
index d41547913..5263d5901 100644
--- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h
+++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h
@@ -64,7 +64,7 @@ public:
     u16 countUniqueMaterials();
     u32 countTexGens(int) const;
     u32 countStages(int) const;
-    J3DMaterial* create(J3DMaterial*, int, unsigned long) const;
+    J3DMaterial* create(J3DMaterial*, int, u32) const;
     J3DGXColor newMatColor(int, int) const;
     u8 newColorChanNum(int) const;
     J3DColorChan newColorChan(int, int) const;
diff --git a/include/JSystem/JAudio/JAIGlobalParameter.h b/include/JSystem/JAudio/JAIGlobalParameter.h
index a07201542..30b716d4e 100644
--- a/include/JSystem/JAudio/JAIGlobalParameter.h
+++ b/include/JSystem/JAudio/JAIGlobalParameter.h
@@ -64,12 +64,12 @@ namespace JAIGlobalParameter {
     f32 getParamSeDolbyCenterValue();
     f32 getParamSeDolbyFrontDistanceMax();
     f32 getParamSeDolbyBehindDistanceMax();
-    char* getParamInitDataFileName();
-    char* getParamWavePath();
-    char* getParamSequenceArchivesPath();
-    char* getParamStreamPath();
-    char* getParamAudioResPath();
-    char* getParamSequenceArchivesFileName();
+    const char* getParamInitDataFileName();
+    const char* getParamWavePath();
+    const char* getParamSequenceArchivesPath();
+    const char* getParamStreamPath();
+    const char* getParamAudioResPath();
+    const char* getParamSequenceArchivesFileName();
     u32 getParamDopplarMoveTime();
     u8 getParamDistanceParameterMoveTime();
     u32 getParamDummyObjectMax();
@@ -99,12 +99,12 @@ namespace JAIGlobalParameter {
     extern u32 stayHeapMax;
     extern u32 autoHeapRoomSize;
     extern u32 stayHeapSize;
-    extern char* initDataFileName;
-    extern char* wavePath;
-    extern char* sequenceArchivesPath;
-    extern char* streamPath;
-    extern char* audioResPath;
-    extern char* sequenceArchivesFileName;
+    extern const char* initDataFileName;
+    extern const char* wavePath;
+    extern const char* sequenceArchivesPath;
+    extern const char* streamPath;
+    extern const char* audioResPath;
+    extern const char* sequenceArchivesFileName;
     extern f32 inputGainDown;
     extern f32 outputGainUp;
     extern f32 distanceMax;
diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index 4d06b074d..8a23f94c3 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/include/JSystem/JFramework/JFWDisplay.h
@@ -8,8 +8,6 @@
 #include "dolphin/os/OSAlarm.h"
 #include "dolphin/types.h"
 
-typedef struct _GXColor GXColor;
-typedef struct _GXRenderModeObj GXRenderModeObj;
 class JKRHeap;
 
 typedef void (*JFWDisplayUnkFunc)(void);
diff --git a/include/JSystem/JKernel/JKRAramPiece.h b/include/JSystem/JKernel/JKRAramPiece.h
index e1d959b5a..a1289eb21 100644
--- a/include/JSystem/JKernel/JKRAramPiece.h
+++ b/include/JSystem/JKernel/JKRAramPiece.h
@@ -22,8 +22,8 @@ public:
 
     /* 0x40 */ s32 mTransferDirection;
     /* 0x44 */ u32 mDataLength;
-    /* 0x48 */ u32 mSrc;
-    /* 0x4C */ u32 mDst;
+    /* 0x48 */ uintptr_t mSrc;
+    /* 0x4C */ uintptr_t mDst;
     /* 0x50 */ JKRAramBlock* mAramBlock;
     /* 0x54 */ u32 field_0x54;
     /* 0x58 */ AsyncCallback mCallback;
@@ -50,22 +50,22 @@ public:
     };
 
 public:
-    static JKRAMCommand* prepareCommand(int, u32, u32, u32, JKRAramBlock*,
+    static JKRAMCommand* prepareCommand(int, uintptr_t, uintptr_t, u32, JKRAramBlock*,
                                         JKRAMCommand::AsyncCallback);
     static void sendCommand(JKRAMCommand*);
 
-    static JKRAMCommand* orderAsync(int, u32, u32, u32, JKRAramBlock*, JKRAMCommand::AsyncCallback);
+    static JKRAMCommand* orderAsync(int, uintptr_t, uintptr_t, u32, JKRAramBlock*, JKRAMCommand::AsyncCallback);
     static BOOL sync(JKRAMCommand*, int);
-    static BOOL orderSync(int, u32, u32, u32, JKRAramBlock*);
+    static BOOL orderSync(int, uintptr_t, uintptr_t, u32, JKRAramBlock*);
     static void startDMA(JKRAMCommand*);
-    static void doneDMA(u32);
+    static void doneDMA(uintptr_t);
 
 private:
     static void lock() { OSLockMutex(&mMutex); }
     static void unlock() { OSUnlockMutex(&mMutex); }
 };
 
-inline BOOL JKRAramPcs(int direction, u32 source, u32 destination, u32 length,
+inline BOOL JKRAramPcs(int direction, uintptr_t source, uintptr_t destination, u32 length,
                        JKRAramBlock* block) {
     return JKRAramPiece::orderSync(direction, source, destination, length, block);
 }
diff --git a/include/JSystem/JKernel/JKRDecomp.h b/include/JSystem/JKernel/JKRDecomp.h
index e62482184..7714ce3da 100644
--- a/include/JSystem/JKernel/JKRDecomp.h
+++ b/include/JSystem/JKernel/JKRDecomp.h
@@ -7,7 +7,7 @@
 class JKRAMCommand;
 class JKRDecompCommand {
 public:
-    typedef void (*AsyncCallback)(u32);
+    typedef void (*AsyncCallback)(uintptr_t);
 
     JKRDecompCommand();
     ~JKRDecompCommand();
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper.h b/include/JSystem/JKernel/JKRDvdAramRipper.h
index 50957d4e0..d8d5ed97b 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper.h
+++ b/include/JSystem/JKernel/JKRDvdAramRipper.h
@@ -25,7 +25,7 @@ public:
     /* 0x34 */ int field_0x34;
     /* 0x38 */ int field_0x38;
     /* 0x3C */ int field_0x3c;
-    /* 0x40 */ void (*mCallback)(u32);
+    /* 0x40 */ void (*mCallback)(uintptr_t);
     /* 0x44 */ int field_0x44;
     /* 0x48 */ bool field_0x48;
     /* 0x4C */ JKRAramStreamCommand* mStreamCommand;
@@ -36,7 +36,7 @@ class JKRDvdAramRipper {
 public:
     static JKRAramBlock* loadToAram(s32, u32, JKRExpandSwitch, u32, u32);
     static JKRAramBlock* loadToAram(JKRDvdFile*, u32, JKRExpandSwitch, u32, u32);
-    static JKRADCommand* loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32,
+    static JKRADCommand* loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(uintptr_t), u32,
                                           u32);
     static JKRADCommand* callCommand_Async(JKRADCommand*);
     static bool syncAram(JKRADCommand*, int);
diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h
index b1043ae30..1f0d73fef 100644
--- a/include/JSystem/JKernel/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap.h
@@ -30,7 +30,7 @@ public:
         CMemBlock* getNextBlock() const { return mNext; }
         u32 getSize() const { return size; }
         u8 getGroupId() const { return mGroupId; }
-        static CMemBlock* getBlock(void* data) { return (CMemBlock*)((u32)data + -0x10); }
+        static CMemBlock* getBlock(void* data) { return (CMemBlock*)((uintptr_t)data + -sizeof(CMemBlock)); }
 
     private:
         /* 0x0 */ u16 mMagic;
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
index 9323fcbe8..ddaed2503 100644
--- a/include/JSystem/JKernel/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap.h
@@ -50,7 +50,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();
diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h
index 4c4001808..7e428de6c 100644
--- a/include/JSystem/JStudio/JStudio/functionvalue.h
+++ b/include/JSystem/JStudio/JStudio/functionvalue.h
@@ -174,7 +174,7 @@ private:
 class TFunctionValue_composite : public TFunctionValue, public TFunctionValueAttribute_refer {
 public:
     struct TData {
-        TData(void* data) : uintdata((u32)data) {}
+        TData(void* data) : uintdata((uintptr_t)data) {}
         TData(unsigned int data) : uintdata(data) {}
         TData(f64 data) : f64data(data) {}
 
diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h
index 2c0617e9d..bf874dbfc 100644
--- a/include/JSystem/JStudio/JStudio/jstudio-object.h
+++ b/include/JSystem/JStudio/JStudio/jstudio-object.h
@@ -4,8 +4,6 @@
 #include "JSystem/JStudio/JStudio/jstudio-control.h"
 #include "limits.h"
 
-typedef struct _GXColor GXColor;
-
 namespace JStudio {
 namespace data {
     enum TEOperationData {
diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h
index 33cdfd02a..aa3ad31a7 100644
--- a/include/JSystem/JUtility/JUTException.h
+++ b/include/JSystem/JUtility/JUTException.h
@@ -8,8 +8,6 @@
 #include "dolphin/os/OSError.h"
 #include "global.h"
 
-typedef struct _GXRenderModeObj GXRenderModeObj;
-typedef struct OSContext OSContext;
 class JUTDirectPrint;
 
 class JUTExternalFB {
diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h
index 054a4ca3b..36d05cf39 100644
--- a/include/JSystem/JUtility/JUTXfb.h
+++ b/include/JSystem/JUtility/JUTXfb.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/JUtility/JUTVideo.h"
 
-typedef struct _GXRenderModeObj GXRenderModeObj;
 class JKRHeap;
 
 class JUTXfb {
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
index 5ca892e98..c8522bf55 100644
--- a/include/SSystem/SComponent/c_cc_d.h
+++ b/include/SSystem/SComponent/c_cc_d.h
@@ -15,7 +15,6 @@ class cCcD_TriAttr;
 class cCcD_AabAttr;
 class cCcD_CylAttr;
 class cCcD_SphAttr;
-typedef struct _GXColor GXColor;
 
 enum cCcD_AtSPrm_e {
     /* 0x01 */ cCcD_AtSPrm_Set_e = 0x01,
diff --git a/include/d/actor/d_a_boko.h b/include/d/actor/d_a_boko.h
index 60dff2cb7..428bef468 100644
--- a/include/d/actor/d_a_boko.h
+++ b/include/d/actor/d_a_boko.h
@@ -47,7 +47,7 @@ public:
 
     static u32 m_bound_se[6];
     static u32 m_heap_size[6];
-    static char* m_arc_name[6];
+    static const char* m_arc_name[6];
     static Vec m_cull_min[6];
     static Vec m_cull_max[6];
 
diff --git a/include/d/actor/d_a_dai.h b/include/d/actor/d_a_dai.h
index 3dd30d307..dcac923c1 100644
--- a/include/d/actor/d_a_dai.h
+++ b/include/d/actor/d_a_dai.h
@@ -25,7 +25,7 @@ public:
     void proc();
     bool _draw();
     u32 getMsg();
-    u16 next_msgStatus(unsigned long*);
+    u16 next_msgStatus(u32*);
 
     static void init() {
         mNowDaizaNum = 0;
diff --git a/include/d/actor/d_a_daiocta.h b/include/d/actor/d_a_daiocta.h
index 15fe36e09..cd95169c3 100644
--- a/include/d/actor/d_a_daiocta.h
+++ b/include/d/actor/d_a_daiocta.h
@@ -40,7 +40,7 @@ public:
         typedef void (daDaiocta_c::*ModeProcFunc)(void);
         ModeProcFunc mInitFunc;
         ModeProcFunc mUpdFunc;
-        char* mModeName;
+        const char* mModeName;
     };
 
     u8 getSw() { return mSwitchNo; }
diff --git a/include/d/actor/d_a_door12.h b/include/d/actor/d_a_door12.h
index e996a9164..de01ebb83 100644
--- a/include/d/actor/d_a_door12.h
+++ b/include/d/actor/d_a_door12.h
@@ -25,7 +25,7 @@ public:
     BOOL chkStopClose();
     BOOL CreateHeap();
     u8 getShapeType();
-    char* getArcName();
+    const char* getArcName();
     s32 getBdlLf();
     s32 getBdlRt();
     s32 getDzb();
diff --git a/include/d/actor/d_a_hmlif.h b/include/d/actor/d_a_hmlif.h
index 9df9d0c22..f0a7a9a61 100644
--- a/include/d/actor/d_a_hmlif.h
+++ b/include/d/actor/d_a_hmlif.h
@@ -29,7 +29,7 @@ public:
     bool chkSwitchPathType();
     virtual BOOL Draw();
 
-    static char* m_arcname[];
+    static const char* m_arcname[];
     static const f32 m_speed[];
     static const s16 m_bmdidx[];
     static const s16 m_dzbidx[];
diff --git a/include/d/actor/d_a_lod_bg.h b/include/d/actor/d_a_lod_bg.h
index 558c72dee..f84463001 100644
--- a/include/d/actor/d_a_lod_bg.h
+++ b/include/d/actor/d_a_lod_bg.h
@@ -20,7 +20,7 @@ public:
 
     void deleteModelData();
 #if VERSION > VERSION_DEMO
-    BOOL loadModelData(const char*, J3DModelData*&, JKRSolidHeap*&, unsigned long&);
+    BOOL loadModelData(const char*, J3DModelData*&, JKRSolidHeap*&, u32&);
     BOOL createModelData();
 #endif
     BOOL execCreateWait();
diff --git a/include/d/actor/d_a_npc_ah.h b/include/d/actor/d_a_npc_ah.h
index a86ffa437..c700e5cc7 100644
--- a/include/d/actor/d_a_npc_ah.h
+++ b/include/d/actor/d_a_npc_ah.h
@@ -60,7 +60,7 @@ public:
     daNpcAh_c();
 
     request_of_phase_process_class* getPhaseP() { return &mPhs; }
-    void setResFlag(unsigned char flag) { field_0x747 = flag; }
+    void setResFlag(u8 flag) { field_0x747 = flag; }
 
     cPhs_State _create();
     BOOL createHeap();
@@ -69,7 +69,7 @@ public:
     bool _draw();
     bool _execute();
     u8 executeCommon();
-    void executeSetMode(unsigned char);
+    void executeSetMode(u8);
     BOOL executeWaitInit();
     void executeWait();
     BOOL executeTalkInit();
@@ -82,10 +82,10 @@ public:
     bool eventMesSet();
     void eventGetItemInit();
     u16 talk2(int);
-    u16 next_msgStatus(unsigned long*);
+    u16 next_msgStatus(u32*);
     u32 getMsg();
     void chkMsg();
-    void setMessage(unsigned long);
+    void setMessage(u32);
     void setAnmFromMsgTag();
     u8 getPrmArg0();
     u8 getSwBit();
@@ -95,7 +95,7 @@ public:
     BOOL initTexPatternAnm(bool);
     void playTexPatternAnm();
     void playAnm();
-    void setAnm(unsigned char, int, float);
+    void setAnm(u8, int, float);
     bool setAnmTbl(sAhAnmDat*);
     void setCollision(dCcD_Cyl*, cXyz, float, float);
     BOOL chkEndEvent();
diff --git a/include/d/actor/d_a_npc_kamome.h b/include/d/actor/d_a_npc_kamome.h
index e5c79bc18..bc587b3f0 100644
--- a/include/d/actor/d_a_npc_kamome.h
+++ b/include/d/actor/d_a_npc_kamome.h
@@ -28,19 +28,19 @@ public:
     typedef void (daNpc_kam_c::*EventActionInitFunc)(int evtStaffId);
     typedef BOOL (daNpc_kam_c::*EventActionFunc)(int evtStaffId);
     
-    void offLineHit() { cLib_offBit(mHitFlags, 0x07UL); }
-    void onFrontLineHit() { cLib_onBit(mHitFlags, 0x01UL); }
-    u32 isFrontLineHit() { return cLib_checkBit(mHitFlags, 0x01UL); }
-    void onLeftLineHit() { cLib_onBit(mHitFlags, 0x02UL); }
-    u32 isLeftLineHit() { return cLib_checkBit(mHitFlags, 0x02UL); }
-    void onRightLineHit() { cLib_onBit(mHitFlags, 0x04UL); }
-    u32 isRightLineHit() { return cLib_checkBit(mHitFlags, 0x04UL); }
-    void onWaterHit() { cLib_onBit(mHitFlags, 0x08UL); }
-    void offWaterHit() { cLib_offBit(mHitFlags, 0x08UL); }
-    u32 isWaterHit() { return cLib_checkBit(mHitFlags, 0x08UL); }
-    void onNoBgCheck() { cLib_onBit(mHitFlags, 0x10UL); }
-    void offNoBgCheck() { cLib_offBit(mHitFlags, 0x10UL); }
-    u32 isNoBgCheck() { return cLib_checkBit(mHitFlags, 0x10UL); }
+    void offLineHit() { cLib_offBit<u32>(mHitFlags, 0x07UL); }
+    void onFrontLineHit() { cLib_onBit<u32>(mHitFlags, 0x01UL); }
+    u32 isFrontLineHit() { return cLib_checkBit<u32>(mHitFlags, 0x01UL); }
+    void onLeftLineHit() { cLib_onBit<u32>(mHitFlags, 0x02UL); }
+    u32 isLeftLineHit() { return cLib_checkBit<u32>(mHitFlags, 0x02UL); }
+    void onRightLineHit() { cLib_onBit<u32>(mHitFlags, 0x04UL); }
+    u32 isRightLineHit() { return cLib_checkBit<u32>(mHitFlags, 0x04UL); }
+    void onWaterHit() { cLib_onBit<u32>(mHitFlags, 0x08UL); }
+    void offWaterHit() { cLib_offBit<u32>(mHitFlags, 0x08UL); }
+    u32 isWaterHit() { return cLib_checkBit<u32>(mHitFlags, 0x08UL); }
+    void onNoBgCheck() { cLib_onBit<u32>(mHitFlags, 0x10UL); }
+    void offNoBgCheck() { cLib_offBit<u32>(mHitFlags, 0x10UL); }
+    u32 isNoBgCheck() { return cLib_checkBit<u32>(mHitFlags, 0x10UL); }
     
     void onHyoiKamome() { m_hyoi_kamome = true; }
     void offHyoiKamome() { m_hyoi_kamome = false; }
diff --git a/include/d/actor/d_a_npc_mk.h b/include/d/actor/d_a_npc_mk.h
index e2e984fae..8a414db66 100644
--- a/include/d/actor/d_a_npc_mk.h
+++ b/include/d/actor/d_a_npc_mk.h
@@ -209,7 +209,7 @@ public:
     /* 0x6DC */ cXyz field_0x6DC;
     /* 0x6E8 */ s16 field_0x6E8;
     /* 0x6EA */ s16 mEventIdx;
-    /* 0x6EC */ char* mpName;
+    /* 0x6EC */ const char* mpName;
     /* 0x6F0 */ s16 field_0x6F0;
     /* 0x6F2 */ u8 field_0x6F2[0x6F4 - 0x6F2];
     /* 0x6F4 */ u32 mMsgNo;
diff --git a/include/d/actor/d_a_npc_os.h b/include/d/actor/d_a_npc_os.h
index 10f0505e4..7ddab24da 100644
--- a/include/d/actor/d_a_npc_os.h
+++ b/include/d/actor/d_a_npc_os.h
@@ -58,15 +58,15 @@ public:
         }
     }
 
-    BOOL isFinish() { return cLib_checkBit(field_0x784, 0x1UL); }
-    void onFinish() { cLib_onBit(field_0x784, 0x1UL); }
-    BOOL isSetHomePos() { return cLib_checkBit(field_0x784, 0x2UL); }
-    void onSetHomePos() { cLib_onBit(field_0x784, 0x2UL); }
-    BOOL isWaterHit() { return cLib_checkBit(field_0x784, 0x4UL); }
-    void onWaterHit() { cLib_onBit(field_0x784, 0x4UL); }
-    BOOL isGravity() { return cLib_checkBit(field_0x784, 0x8UL); }
-    void onGravity() { cLib_onBit(field_0x784, 0x8UL); }
-    void offGravity() { cLib_offBit(field_0x784, 0x8UL); }
+    BOOL isFinish() { return cLib_checkBit<u32>(field_0x784, 0x1UL); }
+    void onFinish() { cLib_onBit<u32>(field_0x784, 0x1UL); }
+    BOOL isSetHomePos() { return cLib_checkBit<u32>(field_0x784, 0x2UL); }
+    void onSetHomePos() { cLib_onBit<u32>(field_0x784, 0x2UL); }
+    BOOL isWaterHit() { return cLib_checkBit<u32>(field_0x784, 0x4UL); }
+    void onWaterHit() { cLib_onBit<u32>(field_0x784, 0x4UL); }
+    BOOL isGravity() { return cLib_checkBit<u32>(field_0x784, 0x8UL); }
+    void onGravity() { cLib_onBit<u32>(field_0x784, 0x8UL); }
+    void offGravity() { cLib_offBit<u32>(field_0x784, 0x8UL); }
     // Note: The 0x10 bit is used in the final release, but not in the demo debug maps, so its official name is unknown.
 
     void offPlayerRoom(int idx) { m_playerRoom[idx] = false; }
diff --git a/include/d/actor/d_a_npc_rsh1.h b/include/d/actor/d_a_npc_rsh1.h
index 3a892452a..a1a53fd28 100644
--- a/include/d/actor/d_a_npc_rsh1.h
+++ b/include/d/actor/d_a_npc_rsh1.h
@@ -37,13 +37,13 @@ public:
     BOOL checkCreateInShopPlayer();
     BOOL initTexPatternAnm(bool);
     void playTexPatternAnm();
-    void setAnm(signed char);
-    void setTexAnm(signed char);
+    void setAnm(s8);
+    void setTexAnm(s8);
     void setAnmFromMsgTag();
-    bool chkAttention(cXyz, short);
+    bool chkAttention(cXyz, s16);
     void eventOrder();
     void checkOrder();
-    u16 next_msgStatus(unsigned long*);
+    u16 next_msgStatus(u32*);
     u32 getMsg();
     void setCollision();
     void talkInit();
diff --git a/include/d/actor/d_a_obj_doguu.h b/include/d/actor/d_a_obj_doguu.h
index 91bb7106b..8f4420c64 100644
--- a/include/d/actor/d_a_obj_doguu.h
+++ b/include/d/actor/d_a_obj_doguu.h
@@ -16,7 +16,7 @@ public:
     BOOL CreateHeap();
     void CreateInit();
     void set_mtx();
-    u16 next_msgStatus(unsigned long*);
+    u16 next_msgStatus(u32*);
     u32 getMsg();
     void setGoal(int);
     void setPlayerAngle(int);
diff --git a/include/d/actor/d_a_obj_mtest.h b/include/d/actor/d_a_obj_mtest.h
index 222359f62..c8160dae6 100644
--- a/include/d/actor/d_a_obj_mtest.h
+++ b/include/d/actor/d_a_obj_mtest.h
@@ -41,7 +41,7 @@ namespace daObjMtest {
         // TODO: Look into these meshes more.
         s32 prm_get_arg1() const { return daObj::PrmAbstract(this, PRM_ARG1_W, PRM_ARG1_S); }
         
-        static char* M_arcname[];
+        static const char* M_arcname[];
         static const dCcD_SrcCyl M_cyl_src;
         static cXyz M_scl_mult[];
         
diff --git a/include/d/actor/d_a_oship.h b/include/d/actor/d_a_oship.h
index ca78719bd..b1e25def0 100644
--- a/include/d/actor/d_a_oship.h
+++ b/include/d/actor/d_a_oship.h
@@ -35,7 +35,7 @@ public:
         typedef void (daOship_c::*ModeProcFunc)(void);
         ModeProcFunc mInitFunc;
         ModeProcFunc mUpdFunc;
-        char* mModeName;
+        const char* mModeName;
     };
 
     u8 getSw() { return mSwitchA; }
diff --git a/include/d/actor/d_a_player_npc.h b/include/d/actor/d_a_player_npc.h
index 8eff8a698..9fd8287b7 100644
--- a/include/d/actor/d_a_player_npc.h
+++ b/include/d/actor/d_a_player_npc.h
@@ -13,12 +13,12 @@ public:
     /* 0x4E9 */ u8 mDamageFogTimer;
     /* 0x4EA */ u8 field_4EA[0x4EC - 0x4EA];
     
-    void returnLink() { cLib_onBit(m4E4, 0x01UL); }
-    void offReturnLink() { cLib_offBit(m4E4, 0x01UL); }
-    bool isReturnLink() { return cLib_checkBit(m4E4, 0x01UL); }
-    void onEventAccept() { cLib_onBit(m4E4, 0x02UL); }
-    void offEventAccept() { cLib_offBit(m4E4, 0x02UL); }
-    bool isEventAccept() { return cLib_checkBit(m4E4, 0x02UL); }
+    void returnLink() { cLib_onBit<u32>(m4E4, 0x01UL); }
+    void offReturnLink() { cLib_offBit<u32>(m4E4, 0x01UL); }
+    bool isReturnLink() { return cLib_checkBit<u32>(m4E4, 0x01UL); }
+    void onEventAccept() { cLib_onBit<u32>(m4E4, 0x02UL); }
+    void offEventAccept() { cLib_offBit<u32>(m4E4, 0x02UL); }
+    bool isEventAccept() { return cLib_checkBit<u32>(m4E4, 0x02UL); }
     
     u8 getDamageFogTimer() { return mDamageFogTimer; }
     void setDamageFogTimer(u8 timer) { mDamageFogTimer = timer; }
diff --git a/include/d/actor/d_a_salvage.h b/include/d/actor/d_a_salvage.h
index 87befa125..1aca8b44b 100644
--- a/include/d/actor/d_a_salvage.h
+++ b/include/d/actor/d_a_salvage.h
@@ -89,7 +89,7 @@ public:
         mSalvageId = -1;
     }
 
-    static char* m_arcname;
+    static const char* m_arcname;
     static const f32 m_outersea_near;
     static const f32 m_inside_near;
     static const f32 m_cmap_near;
diff --git a/include/d/actor/d_a_shutter.h b/include/d/actor/d_a_shutter.h
index b2c61fdf5..16de4d1b0 100644
--- a/include/d/actor/d_a_shutter.h
+++ b/include/d/actor/d_a_shutter.h
@@ -29,10 +29,10 @@ public:
     /* 0x38 */ static const Vec m_cull_min[2];
     /* 0x50 */ static const Vec m_cull_max[2];
 
-    static char* m_arcname[2];
-    static char* m_open_ev_name[2];
-    static char* m_close_ev_name[2];
-    static char* m_staff_name[2];
+    static const char* m_arcname[2];
+    static const char* m_open_ev_name[2];
+    static const char* m_close_ev_name[2];
+    static const char* m_staff_name[2];
     
 public:
     /* 0x290 */ request_of_phase_process_class mPhs;
diff --git a/include/d/actor/d_a_shutter2.h b/include/d/actor/d_a_shutter2.h
index 1198f80f4..90e9e4203 100644
--- a/include/d/actor/d_a_shutter2.h
+++ b/include/d/actor/d_a_shutter2.h
@@ -27,10 +27,10 @@ public:
     /* 0x1C */ static const Vec m_cull_min[1];
     /* 0x28 */ static const Vec m_cull_max[1];
 
-    static char* m_arcname[1];
-    static char* m_open_ev_name[1];
-    static char* m_close_ev_name[1];
-    static char* m_staff_name[1];
+    static const char* m_arcname[1];
+    static const char* m_open_ev_name[1];
+    static const char* m_close_ev_name[1];
+    static const char* m_staff_name[1];
 
 public:
     /* 0x2C8 */ request_of_phase_process_class mPhs;
diff --git a/include/d/actor/d_a_tag_hint.h b/include/d/actor/d_a_tag_hint.h
index c4060387d..3286b00fa 100644
--- a/include/d/actor/d_a_tag_hint.h
+++ b/include/d/actor/d_a_tag_hint.h
@@ -34,7 +34,7 @@ public:
     void setPlayerAngle();
     void darkProc();
     void startProc();
-    u16 next_msgStatus(unsigned long*);
+    u16 next_msgStatus(u32*);
     u32 getMsg();
     void talkInit();
     u16 talk();
diff --git a/include/d/actor/d_a_tag_island.h b/include/d/actor/d_a_tag_island.h
index 5e7ef88b7..040301370 100644
--- a/include/d/actor/d_a_tag_island.h
+++ b/include/d/actor/d_a_tag_island.h
@@ -31,7 +31,7 @@ public:
     BOOL otherCheck();
     BOOL arrivalTerms();
     void demoInitProc();
-    int next_msgStatus(unsigned long*);
+    int next_msgStatus(u32*);
     u32 getMsg();
     void talkInit();
     u16 talk();
diff --git a/include/d/actor/d_a_tag_mk.h b/include/d/actor/d_a_tag_mk.h
index 1489661f3..2c7ea008a 100644
--- a/include/d/actor/d_a_tag_mk.h
+++ b/include/d/actor/d_a_tag_mk.h
@@ -69,7 +69,7 @@ private:
     /* 0x2B0 */ s16 mCutEndTimer;
     /* 0x2B2 */ u8 m2B2[0x2B4 - 0x2B2];
     /* 0x2B4 */ fpc_ProcID m2B4;
-    /* 0x2B8 */ char* m2B8;
+    /* 0x2B8 */ const char* m2B8;
 };  // Size: 0x2BC
 
 #endif /* D_A_TAG_MK_H */
diff --git a/include/d/d_attention.h b/include/d/d_attention.h
index c83215297..18db08785 100644
--- a/include/d/d_attention.h
+++ b/include/d/d_attention.h
@@ -249,7 +249,7 @@ public:
         f32 mDeltaYMax;
         f32 mDeltaYMin;
         f32 mWeightDivisor;
-        int mFrontAngleCheckBits;
+        u32 mFrontAngleCheckBits;
     } dist_table[];
 
     // TODO:
diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h
index 893224131..674e3b493 100644
--- a/include/d/d_bg_s.h
+++ b/include/d/d_bg_s.h
@@ -74,7 +74,7 @@ public:
     // void ChkDeleteActorRegist(fopAc_ac_c*) {}
     // void DebugDrawPoly(dBgW&) {}
     // void Draw() {}
-    // void DrawPoly(cBgS_PolyInfo&, _GXColor&) {}
+    // void DrawPoly(cBgS_PolyInfo&, GXColor&) {}
     dBgW* GetBgWPointer(cBgS_PolyInfo& i_poly) { return (dBgW*)cBgS::GetBgWPointer(i_poly); }
     // void GetPolyCamId(cBgS_PolyInfo&) {}
     // void GroundCross(cBgS_GndChk*) {}
diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h
index a6ab8d443..a2ce9cbd9 100644
--- a/include/d/d_bg_w.h
+++ b/include/d/d_bg_w.h
@@ -3,6 +3,7 @@
 
 #include "SSystem/SComponent/c_bg_w.h"
 #include "SSystem/SComponent/c_sxyz.h"
+#include "dolphin/gx/GXStruct.h"
 
 class dBgS_Acch;
 class cM3dGPla;
@@ -14,7 +15,6 @@ class dBgS_CrrPos;
 class cBgS_PolyInfo;
 class fopAc_ac_c;
 class dBgS_CaptPoly;
-typedef struct _GXColor GXColor;
 
 class dBgW : public cBgW {
 public:
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 63fda32b0..f8c45b7cb 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -3623,7 +3623,7 @@ inline int dComIfGp_evmng_getMyActIdx(int staffIdx, char** pActions, int actionC
     return dComIfGp_getPEvtManager()->getMyActIdx(staffIdx, pActions, actionCount, force, nameType);
 }
 
-inline char* dComIfGp_evmng_getMyActName(int staffIdx) {
+inline const char* dComIfGp_evmng_getMyActName(int staffIdx) {
     return dComIfGp_getPEvtManager()->getMyActName(staffIdx);
 }
 
diff --git a/include/d/d_demo.h b/include/d/d_demo.h
index 32bcbe439..a64981e85 100644
--- a/include/d/d_demo.h
+++ b/include/d/d_demo.h
@@ -345,7 +345,7 @@ private:
     /* 0x18 */ dMesg_tControl* mMesgControl;
     /* 0x1C */ JStudio_JMessage::TCreateObject* mMessage;
     /* 0x20 */ dDemo_object_c mDemoObj;
-    /* 0xD0 */ char* mCurFile;
+    /* 0xD0 */ const char* mCurFile;
     /* 0xD4 */ int mFrame;
     /* 0xD8 */ int mFrameNoMsg;
     /* 0xDC */ int mMode;
diff --git a/include/d/d_event_data.h b/include/d/d_event_data.h
index d952770ad..7753d0cab 100644
--- a/include/d/d_event_data.h
+++ b/include/d/d_event_data.h
@@ -38,7 +38,7 @@ public:
     /* 0x30 */ s32 mNextIdx;
     /* 0x34 */ u32 field_0x34[3];
 
-    char* getName() { return mName; }
+    const char* getName() { return mName; }
     s32 getNext() { return mNextIdx; }
     s32 getNumber() { return mSubstanceSize; }
     s32 getIndex() { return mSubstanceIdx; }
@@ -127,7 +127,7 @@ public:
     BOOL finish_check();
     void specialStaffProc(dEvDtStaff_c*);
 
-    char * getName() { return mName; }
+    char* getName() { return mName; }
     int getStaff(int idx) { return mStaffIdx[idx]; }
     s32 getNStaff() { return mNStaff; }
     u32 getPriority() { return mPriority; }
@@ -187,7 +187,7 @@ public:
     dEvDtEvent_c* getEventP(int i) { return &mEventP[i]; }
     dEvDtData_c* getDataP(int i) { return &mDataP[i]; }
     dEvDtCut_c* getCutP(int i) { return &mCutP[i]; }
-    char* getEventName(int i) { return mEventP[i].getName(); }
+    const char* getEventName(int i) { return mEventP[i].getName(); }
     int getStaffCurrentCut(int i) { return mStaffP[i].getCurrentCut(); }
     dEvDtCut_c* getCutStaffCurrentCutP(int i) { return getCutP(getStaffCurrentCut(i)); }
     int getStaffStartCut(int i) { return mStaffP[i].getStartCut(); }
diff --git a/include/d/d_event_manager.h b/include/d/d_event_manager.h
index 6c1fb0543..f9b7d86ff 100644
--- a/include/d/d_event_manager.h
+++ b/include/d/d_event_manager.h
@@ -43,7 +43,7 @@ public:
     int getMyStaffId(const char*, fopAc_ac_c*, int);
     BOOL getIsAddvance(int);
     int getMyActIdx(int staffIdx, const char* const* action, int actionNum, BOOL force, int nameType);
-    char* getMyActName(int);
+    const char* getMyActName(int);
     char* getMyNowCutName(int);
     dEvDtData_c* getMyDataP(int, const char*, int);
     void* getMySubstanceP(int, const char*, int);
diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h
index 413a8097a..989ce9503 100644
--- a/include/d/d_item_data.h
+++ b/include/d/d_item_data.h
@@ -265,8 +265,8 @@ enum ItemTable {
 #define MSG_NO_FOR_ITEM(item_no) item_no + 101
 
 struct dItem_data_item_resource {
-    /* 0x00 */ char* mArcname;
-    /* 0x04 */ char* mTexture; // Filename in /files/res/Msg/itemicon.arc of its inventory icon.
+    /* 0x00 */ const char* mArcname;
+    /* 0x04 */ const char* mTexture; // Filename in /files/res/Msg/itemicon.arc of its inventory icon.
     /* 0x08 */ s16 mBmdIdx;
     /* 0x0A */ s16 mSrtIdx; // BTK
     /* 0x0C */ s16 mSrtIdx2; // BTK
@@ -283,7 +283,7 @@ struct dItem_data_item_resource {
 STATIC_ASSERT(sizeof(dItem_data_item_resource) == 0x24);
 
 struct dItem_data_field_item_res {
-    /* 0x00 */ char* mArc;
+    /* 0x00 */ const char* mArc;
     /* 0x04 */ s16 mBmdIdx;
     /* 0x06 */ s16 mSrtIdx; // BTK
     /* 0x08 */ s16 mSrtIdx2; // BTK
@@ -315,15 +315,15 @@ STATIC_ASSERT(sizeof(dItem_data_effect_info) == 0x4);
 
 class dItem_data {
 public:
-    static char* item_arcname_tbl[0x70];
-    static char* item_texture_tbl[0x74];
+    static const char* item_arcname_tbl[0x70];
+    static const char* item_texture_tbl[0x74];
     static dItem_data_item_resource item_resource[0x100];
     static dItem_data_field_item_res field_item_res[0x100];
     static dItem_data_item_info item_info[0x100];
     static dItem_data_effect_info effect_info[0x81];
     
-    static char* getArcname(u8 no) { return item_resource[no].mArcname; }
-    static char* getTexture(u8 no) { return item_resource[no].mTexture; }
+    static const char* getArcname(u8 no) { return item_resource[no].mArcname; }
+    static const char* getTexture(u8 no) { return item_resource[no].mTexture; }
     static s16 getBmdIdx(u8 no) { return item_resource[no].mBmdIdx; }
     static s16 getSrtIdx(u8 no) { return item_resource[no].mSrtIdx; }
     static s16 getSrtIdx2(u8 no) { return item_resource[no].mSrtIdx2; }
@@ -335,7 +335,7 @@ public:
     static s16 getItemMesgNum(u8 no) { return item_resource[no].mItemMesgNum; }
     static u32 getHeapSize(u8 no) { return item_resource[no].mHeapSize; }
     
-    static char* getFieldArc(u8 no) { return field_item_res[no].mArc; }
+    static const char* getFieldArc(u8 no) { return field_item_res[no].mArc; }
     static s16 getFieldBmdIdx(u8 no) { return field_item_res[no].mBmdIdx; }
     static s16 getFieldSrtIdx(u8 no) { return field_item_res[no].mSrtIdx; }
     static s16 getFieldSrtIdx2(u8 no) { return field_item_res[no].mSrtIdx2; }
diff --git a/include/d/d_npc.h b/include/d/d_npc.h
index da7616c7b..c8ce1fc2d 100644
--- a/include/d/d_npc.h
+++ b/include/d/d_npc.h
@@ -107,7 +107,7 @@ public:
 
 class dNpc_EventCut_c {
 private:
-    /* 0x00 */ char* mpEvtStaffName;
+    /* 0x00 */ const char* mpEvtStaffName;
     /* 0x04 */ int mEvtStaffId;
     /* 0x08 */ fopAc_ac_c* mpActor;
     /* 0x0C */ fopNpc_npc_c* mpTalkActor;
@@ -157,7 +157,7 @@ public:
     void cutContinueTalkStart();
     void cutTalkMsgProc();
 
-    char* getActorName() { return mpEvtStaffName; }
+    const char* getActorName() { return mpEvtStaffName; }
     int getNowCut() { return mCurActIdx; }
     bool getAttnFlag() { return mbAttention; }
     void setAttnFlag(bool flag) { mbAttention = flag; }
diff --git a/include/dolphin/ar/arq.h b/include/dolphin/ar/arq.h
index 083c118a4..a827b87d7 100644
--- a/include/dolphin/ar/arq.h
+++ b/include/dolphin/ar/arq.h
@@ -9,7 +9,7 @@ extern "C" {
 
 #define ARQ_CHUNK_SIZE_DEFAULT 4096
 
-typedef void (*ARQCallback)(u32 request_address);
+typedef void (*ARQCallback)(uintptr_t request_address);
 
 typedef enum _ARamType {
     ARAM_DIR_MRAM_TO_ARAM,
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 168db7fde..4a7b94e3a 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -286,15 +286,15 @@ struct mDoExt_MtxCalcAnmBlendTblOld : public mDoExt_MtxCalcAnmBlendTbl {
         mOldFrame = oldFrame;
         mBeforeCallback = NULL;
         mAfterCallback = NULL;
-        mUserArea = 0;
+        mUserArea = NULL;
     }
     virtual void calc(u16);
 
-    void setUserArea(u32 area)  { mUserArea = area; }
+    void setUserArea(uintptr_t area)  { mUserArea = area; }
     void setBeforeCalc(CalcCallback callback) { mBeforeCallback = callback; }
     void setAfterCalc(CalcCallback callback) { mAfterCallback = callback; }
 
-    /* 0x58 */ u32 mUserArea;
+    /* 0x58 */ uintptr_t mUserArea;
     /* 0x5C */ mDoExt_MtxCalcOldFrame* mOldFrame;
     /* 0x60 */ CalcCallback mBeforeCallback;
     /* 0x64 */ CalcCallback mAfterCallback;
@@ -596,11 +596,11 @@ public:
     // some calls to these functions define i_color inline which is illegal in C++ for a non-const
     // reference parameter - we add these overloads to enable standard compiler compatibility
 #if !__MWERKS__
-    void update(u16 i_segs, f32 i_size, const _GXColor& i_color, u16 i_space, dKy_tevstr_c* i_tevStr) {
-        update(i_segs, i_size, const_cast<_GXColor&>(i_color), i_space, i_tevStr);
+    void update(u16 i_segs, f32 i_size, const GXColor& i_color, u16 i_space, dKy_tevstr_c* i_tevStr) {
+        update(i_segs, i_size, const_cast<GXColor&>(i_color), i_space, i_tevStr);
     }
-    void update(u16 i_segs, const _GXColor& i_color, dKy_tevstr_c* i_tevStr) {
-        update(i_segs, const_cast<_GXColor&>(i_color), i_tevStr);
+    void update(u16 i_segs, const GXColor& i_color, dKy_tevstr_c* i_tevStr) {
+        update(i_segs, const_cast<GXColor&>(i_color), i_tevStr);
     }
 #endif
 
diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h
index 5b949f26b..39719834b 100644
--- a/include/m_Do/m_Do_hostIO.h
+++ b/include/m_Do/m_Do_hostIO.h
@@ -21,9 +21,9 @@ class JORServer;
 class JORMContext {
 public:
     void genCheckBox(const char* param_1, u8* param_2, u8 param_3, u32 param_4, JOREventListener* param_5, u16 param_6, u16 param_7, u16 param_8, u16 param_9) {
-        genCheckBoxSub(0x108, param_1, (u32)param_2, param_4, *param_2, param_3, param_5, param_6, param_7, param_8, param_9);
+        genCheckBoxSub(0x108, param_1, (uintptr_t)param_2, param_4, *param_2, param_3, param_5, param_6, param_7, param_8, param_9);
     }
-    void genCheckBoxSub(u32, const char*, u32, u32, u16, u16, JOREventListener*, u16, u16, u16, u16);
+    void genCheckBoxSub(u32, const char*, uintptr_t, u32, u16, u16, JOREventListener*, u16, u16, u16, u16);
 };
 
 class JOREventListener {
diff --git a/include/weak_bss_3569.h b/include/weak_bss_3569.h
index 399afcf76..53520c528 100644
--- a/include/weak_bss_3569.h
+++ b/include/weak_bss_3569.h
@@ -17,7 +17,7 @@ static inline void dummy_bss_3569() {
 #include "dolphin/mtx/mtx.h"
 
 static inline void dummy_bss_3569() {
-    Vec vec = (Vec){0.0f, 0.0f, 0.0f}; // @3569 / @3599
+    Vec vec = {0.0f, 0.0f, 0.0f}; // @3569 / @3599
 }
 #endif
 
diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp
index f9f779246..7b0049243 100644
--- a/src/JSystem/J2DGraph/J2DPrint.cpp
+++ b/src/JSystem/J2DGraph/J2DPrint.cpp
@@ -186,7 +186,7 @@ f32 J2DPrint::parse(const u8* param_1, int param_2, int param_3, u16* param_4, J
             local_f0 = 1;
         }
 
-        if (r27 == 0 || ((u32)param_1 - (u32)local_a4) > param_2) {
+        if (r27 == 0 || ((uintptr_t)param_1 - (uintptr_t)local_a4) > param_2) {
             if (param_7 == 0 && param_4 != NULL) {
                 param_4[r29] = 0.5f + f31;
             }
@@ -227,7 +227,7 @@ f32 J2DPrint::parse(const u8* param_1, int param_2, int param_3, u16* param_4, J
                         f31 = 0.0f;
                     }
                 }
-            } else if (local_f0 && ((u32)param_1 - (u32)local_a4 > (u32)param_2)) {
+            } else if (local_f0 && ((uintptr_t)param_1 - (uintptr_t)local_a4 > (u32)param_2)) {
                 if ((!param_7) && (param_4 != NULL)) {
                     param_4[r29] = 0.5f + f31;
                 }
@@ -500,11 +500,11 @@ s32 J2DPrint::getNumberS32(const u8** param_1, s32 param_2, s32 param_3, int bas
     uVar2 = 0;
     char* local_28;
     if (base == 10) {
-        uVar2 = strtol((char*)*param_1, &local_28, base);
+        uVar2 = strtol((const char*)*param_1, &local_28, base);
     } else if (base == 16) {
-        uVar2 = strtoul((char*)*param_1, &local_28, base);
-        if ((u32)local_28 - (u32)*param_1 != 8) {
-            if ((u32)local_28 - (u32)*param_1 == 6) {
+        uVar2 = strtoul((const char*)*param_1, &local_28, base);
+        if ((uintptr_t)local_28 - (uintptr_t)*param_1 != 8) {
+            if ((uintptr_t)local_28 - (uintptr_t)*param_1 == 6) {
                 uVar2 = (uVar2 << 8) | 0xff;
             } else {
                 *param_1 = puVar1;
@@ -537,11 +537,11 @@ f32 J2DPrint::getNumberF32(const u8** param_1, f32 param_2, f32 param_3, int bas
     uVar2 = 0;
     char* local_28;
     if (base == 10) {
-        uVar2 = strtol((char*)*param_1, &local_28, base);
+        uVar2 = strtol((const char*)*param_1, &local_28, base);
     } else if (base == 16) {
-        uVar2 = strtoul((char*)*param_1, &local_28, base);
-        if ((u32)local_28 - (u32)*param_1 != 8) {
-            if ((u32)local_28 - (u32)*param_1 == 6) {
+        uVar2 = strtoul((const char*)*param_1, &local_28, base);
+        if ((uintptr_t)local_28 - (uintptr_t)*param_1 != 8) {
+            if ((uintptr_t)local_28 - (uintptr_t)*param_1 == 6) {
                 uVar2 = (uVar2 << 8) | 0xff;
             } else {
                 *param_1 = puVar1;
diff --git a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp
index 286161762..a9bd17103 100644
--- a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp
@@ -245,7 +245,7 @@ void J3DJoint::entryIn() {
                 mesh->calc(anmMtx);
             }
             mesh->setCurrentMtx();
-            matPacket->setMaterialAnmID((u32)mesh->getMaterialAnm());
+            matPacket->setMaterialAnmID((uintptr_t)mesh->getMaterialAnm());
             matPacket->setShapePacket(shapePacket);
             J3DDrawBuffer* drawBuffer = j3dSys.getDrawBuffer(mesh->isDrawModeOpaTexEdge());
             if ((u8)matPacket->entry(drawBuffer)) {
diff --git a/src/JSystem/J3DGraphAnimator/J3DModel.cpp b/src/JSystem/J3DGraphAnimator/J3DModel.cpp
index bc67f8f25..f25189576 100644
--- a/src/JSystem/J3DGraphAnimator/J3DModel.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DModel.cpp
@@ -32,7 +32,7 @@ void J3DModel::initialize() {
     mFlags = 0;
     mDiffFlag = 0;
     mCalcCallBack = NULL;
-    mUserArea = 0;
+    mUserArea = NULL;
 
     mBaseScale.x = 1.0f;
     mBaseScale.y = 1.0f;
diff --git a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
index aaf471fbe..a109d1d9d 100644
--- a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
+++ b/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
@@ -71,7 +71,7 @@ int J3DDrawBuffer::entryMatSort(J3DMatPacket* pMatPacket) {
     if (texNo == 0xFFFF) {
         hash = 0;
     } else {
-        hash = ((u32)texture->getResTIMG(texNo) + texture->getResTIMG(texNo)->imageOffset) >> 5;
+        hash = ((uintptr_t)texture->getResTIMG(texNo) + texture->getResTIMG(texNo)->imageOffset) >> 5;
     }
     u32 slot = hash & (mEntryTableSize - 1);
 
@@ -95,7 +95,7 @@ int J3DDrawBuffer::entryMatSort(J3DMatPacket* pMatPacket) {
 /* 802ECA38-802ECAF0       .text entryMatAnmSort__13J3DDrawBufferFP12J3DMatPacket */
 int J3DDrawBuffer::entryMatAnmSort(J3DMatPacket* pMatPacket) {
     J3DMaterialAnm* pMaterialAnm = pMatPacket->mpMaterialAnm;
-    u32 slot = (u32)pMaterialAnm & (mEntryTableSize - 1);
+    u32 slot = (uintptr_t)pMaterialAnm & (mEntryTableSize - 1);
 
     if (pMaterialAnm == NULL) {
         return entryMatSort(pMatPacket);
diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp
index 6feeb125f..3722a10ac 100644
--- a/src/JSystem/J3DGraphBase/J3DShape.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShape.cpp
@@ -56,15 +56,15 @@ u32 J3DShape::countBumpMtxNum() const {
 
 /* 802DD2F0-802DD308       .text J3DLoadCPCmd__FUcUl */
 void J3DLoadCPCmd(u8 cmd, u32 param) {
-    GXFIFO.u8 = GX_CMD_LOAD_CP_REG;
-    GXFIFO.u8 = cmd;
-    GXFIFO.u32 = param;
+    GXCmd1u8(GX_CMD_LOAD_CP_REG);
+    GXCmd1u8(cmd);
+    GXCmd1u32(param);
 }
 
 /* 802DD308-802DD344       .text J3DLoadArrayBasePtr__F7_GXAttrPv */
 static void J3DLoadArrayBasePtr(GXAttr attr, void* data) {
     u32 idx = (attr == GX_VA_NBT) ? 1 : (attr - GX_VA_POS);
-    J3DLoadCPCmd(0xA0 + idx, ((u32)data & 0x7FFFFFFF));
+    J3DLoadCPCmd(0xA0 + idx, ((uintptr_t)data & 0x7FFFFFFF));
 }
 
 /* 802DD344-802DD3B4       .text loadVtxArray__8J3DShapeCFv */
diff --git a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
index 6b4e2e579..f5e929a19 100644
--- a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
@@ -11,8 +11,8 @@
 
 /* 802FE1A4-802FE1FC       .text __ct__15J3DJointFactoryFRC13J3DJointBlock */
 J3DJointFactory::J3DJointFactory(const J3DJointBlock& jointBlock) {
-    mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&jointBlock, (u32)jointBlock.mpJointInitData);
-    mIndexTable = JSUConvertOffsetToPtr<u16>(&jointBlock, (u32)jointBlock.mpIndexTable);
+    mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&jointBlock, (uintptr_t)jointBlock.mpJointInitData);
+    mIndexTable = JSUConvertOffsetToPtr<u16>(&jointBlock, (uintptr_t)jointBlock.mpIndexTable);
 }
 
 /* 802FE1FC-802FE390       .text create__15J3DJointFactoryFi */
diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
index 445177d09..48621cfa3 100644
--- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
@@ -16,7 +16,7 @@ J3DMaterialFactory::J3DMaterialFactory(const J3DMaterialBlock& block) {
     mpMaterialInitData = JSUConvertOffsetToPtr<J3DMaterialInitData>(&block, block.mpMaterialInitData);
     mpMaterialID = JSUConvertOffsetToPtr<u16>(&block, block.mpMaterialID);
 
-    if (block.mpIndInitData != NULL && ((u32)block.mpIndInitData - (u32)block.mpNameTable) > 4)
+    if (block.mpIndInitData != NULL && ((uintptr_t)block.mpIndInitData - (uintptr_t)block.mpNameTable) > 4)
         mpIndInitData = JSUConvertOffsetToPtr<J3DIndInitData>(&block, block.mpIndInitData);
     else
         mpIndInitData = NULL;
@@ -341,7 +341,7 @@ J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* mat, int idx,
     mat->mPEBlock->setFogOffset(mpPatchingInfo[idx].mFogOffset);
     if (mat->mSharedDLObj == NULL) {
         mat->mSharedDLObj = new J3DDisplayListObj();
-        mat->mSharedDLObj->setSingleDisplayList((void*)(mpDisplayListInit[idx].mOffset + (u32)&mpDisplayListInit[idx]), mpDisplayListInit[idx].mSize);
+        mat->mSharedDLObj->setSingleDisplayList((void*)(mpDisplayListInit[idx].mOffset + (uintptr_t)&mpDisplayListInit[idx]), mpDisplayListInit[idx].mSize);
     }
     return mat;
 }
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
index 6fabb49de..1a7c75ceb 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
@@ -215,9 +215,9 @@ void J3DModelLoader::setupBBoardInfo() {
         J3DMaterial* mesh = mpModelData->getJointNodePointer(i)->getMesh();
         if (mesh != NULL) {
             u16 shape_index = mesh->getShape()->getIndex();
-            u16* index_table = JSUConvertOffsetToPtr<u16>(mpShapeBlock, (u32)mpShapeBlock->mpIndexTable);
+            u16* index_table = JSUConvertOffsetToPtr<u16>(mpShapeBlock, (uintptr_t)mpShapeBlock->mpIndexTable);
             J3DShapeInitData* shape_init_data =
-                JSUConvertOffsetToPtr<J3DShapeInitData>(mpShapeBlock, (u32)mpShapeBlock->mpShapeInitData);
+                JSUConvertOffsetToPtr<J3DShapeInitData>(mpShapeBlock, (uintptr_t)mpShapeBlock->mpShapeInitData);
             J3DJoint* joint;
             switch (shape_init_data[index_table[shape_index]].mShapeMtxType) {
                 case 0:
@@ -310,9 +310,9 @@ void J3DModelLoader::readVertex(const J3DVertexBlock* i_block) {
     if (vertex_data.mVtxNrmArray == NULL) {
         vertex_data.mNrmNum = 0;
     } else if (nrm_end != NULL) {
-        vertex_data.mNrmNum = ((u32)nrm_end - (u32)vertex_data.mVtxNrmArray) / nrm_size + 1;
+        vertex_data.mNrmNum = ((uintptr_t)nrm_end - (uintptr_t)vertex_data.mVtxNrmArray) / nrm_size + 1;
     } else {
-        vertex_data.mNrmNum = (i_block->mSize - (u32)i_block->mpVtxNrmArray) / nrm_size + 1;
+        vertex_data.mNrmNum = (i_block->mSize - (uintptr_t)i_block->mpVtxNrmArray) / nrm_size + 1;
     }
 
     void* color0_end = NULL;
@@ -325,15 +325,15 @@ void J3DModelLoader::readVertex(const J3DVertexBlock* i_block) {
     if (vertex_data.mVtxColorArray[0] == NULL) {
         vertex_data.mColNum = 0;
     } else if (color0_end != NULL) {
-        vertex_data.mColNum = ((u32)color0_end - (u32)vertex_data.mVtxColorArray[0]) / 4 + 1;
+        vertex_data.mColNum = ((uintptr_t)color0_end - (uintptr_t)vertex_data.mVtxColorArray[0]) / 4 + 1;
     } else {
-        vertex_data.mColNum = (i_block->mSize - (u32)i_block->mpVtxColorArray[0]) / 4 + 1;
+        vertex_data.mColNum = (i_block->mSize - (uintptr_t)i_block->mpVtxColorArray[0]) / 4 + 1;
     }
 
     if (vertex_data.mVtxTexCoordArray[0] == NULL) {
         vertex_data.mTexCoordNum = 0;
     } else {
-        vertex_data.mTexCoordNum = (i_block->mSize - (u32)i_block->mpVtxTexCoordArray[0]) / 8 + 1;
+        vertex_data.mTexCoordNum = (i_block->mSize - (uintptr_t)i_block->mpVtxTexCoordArray[0]) / 8 + 1;
     }
 }
 
@@ -403,7 +403,7 @@ void J3DModelLoader_v26::readMaterial(const J3DMaterialBlock* i_block, u32 i_fla
         for (u16 i = 0; i < mpMaterialTable->mUniqueMatNum; i++) {
             factory.create(&mpMaterialTable->mMaterialBase[i],
                            J3DMaterialFactory::MATERIAL_TYPE_NORMAL, i, i_flags);
-            mpMaterialTable->mMaterialBase[i].mDiffFlag = (u32)&mpMaterialTable->mMaterialBase[i] >> 4;
+            mpMaterialTable->mMaterialBase[i].mDiffFlag = (uintptr_t)&mpMaterialTable->mMaterialBase[i] >> 4;
         }
     }
     for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
@@ -413,14 +413,14 @@ void J3DModelLoader_v26::readMaterial(const J3DMaterialBlock* i_block, u32 i_fla
     if (i_flags & 0x200000) {
         for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
             mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-                (u32)&mpMaterialTable->mMaterialBase[factory.getMaterialID(i)] >> 4;
+                (uintptr_t)&mpMaterialTable->mMaterialBase[factory.getMaterialID(i)] >> 4;
             mpMaterialTable->mMaterialNodePointer[i]->mpOrigMaterial =
                 &mpMaterialTable->mMaterialBase[factory.getMaterialID(i)];
         }
     } else {
         for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
             mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-                ((u32)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
+                ((uintptr_t)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
         }
     }
 }
@@ -445,7 +445,7 @@ void J3DModelLoader_v21::readMaterial_v21(const J3DMaterialBlock_v21* i_block, u
     if (i_flags & 0x200000) {
         for (u16 i = 0; i < mpMaterialTable->mUniqueMatNum; i++) {
             factory.create(&mpMaterialTable->mMaterialBase[i], i, i_flags);
-            mpMaterialTable->mMaterialBase[i].mDiffFlag = (u32)&mpMaterialTable->mMaterialBase[i] >> 4;
+            mpMaterialTable->mMaterialBase[i].mDiffFlag = (uintptr_t)&mpMaterialTable->mMaterialBase[i] >> 4;
         }
     }
     for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
@@ -454,7 +454,7 @@ void J3DModelLoader_v21::readMaterial_v21(const J3DMaterialBlock_v21* i_block, u
     if (i_flags & 0x200000) {
         for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
             mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-                (u32)&mpMaterialTable->mMaterialBase[factory.getMaterialID(i)] >> 4;
+                (uintptr_t)&mpMaterialTable->mMaterialBase[factory.getMaterialID(i)] >> 4;
             mpMaterialTable->mMaterialNodePointer[i]->mpOrigMaterial =
                 &mpMaterialTable->mMaterialBase[factory.getMaterialID(i)];
         }
@@ -517,7 +517,7 @@ void J3DModelLoader_v26::readMaterialTable(const J3DMaterialBlock* i_block, u32
     }
     for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
         mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-            (u32)mpMaterialTable->mMaterialNodePointer + factory.getMaterialID(i);
+            (uintptr_t)mpMaterialTable->mMaterialNodePointer + factory.getMaterialID(i);
     }
 }
 
@@ -538,7 +538,7 @@ void J3DModelLoader_v21::readMaterialTable_v21(const J3DMaterialBlock_v21* i_blo
     }
     for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
         mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-            ((u32)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
+            ((uintptr_t)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
     }
 }
 
@@ -571,7 +571,7 @@ void J3DModelLoader::readPatchedMaterial(const J3DMaterialBlock* i_block, u32 i_
         mpMaterialTable->mMaterialNodePointer[i] =
             factory.create(NULL, J3DMaterialFactory::MATERIAL_TYPE_PATCHED, i, i_flags);
         mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-            ((u32)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
+            ((uintptr_t)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
     }
 }
 
diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
index 4fcaec643..d06567758 100644
--- a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
@@ -16,13 +16,13 @@
 
 /* 802FE3A8-802FE458       .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock */
 J3DShapeFactory::J3DShapeFactory(const J3DShapeBlock& block) {
-    mpShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, (u32)block.mpShapeInitData);
-    mpIndexTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpIndexTable);
-    mpVtxDescList = JSUConvertOffsetToPtr<GXVtxDescList>(&block, (u32)block.mpVtxDescList);
-    mpMtxTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpMtxTable);
-    mpDisplayListData = JSUConvertOffsetToPtr<u8>(&block, (u32)block.mpDisplayListData);
-    mpMtxInitData = JSUConvertOffsetToPtr<J3DShapeMtxInitData>(&block, (u32)block.mpMtxInitData);
-    mpDrawInitData = JSUConvertOffsetToPtr<J3DShapeDrawInitData>(&block, (u32)block.mpDrawInitData);
+    mpShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, (uintptr_t)block.mpShapeInitData);
+    mpIndexTable = JSUConvertOffsetToPtr<u16>(&block, (uintptr_t)block.mpIndexTable);
+    mpVtxDescList = JSUConvertOffsetToPtr<GXVtxDescList>(&block, (uintptr_t)block.mpVtxDescList);
+    mpMtxTable = JSUConvertOffsetToPtr<u16>(&block, (uintptr_t)block.mpMtxTable);
+    mpDisplayListData = JSUConvertOffsetToPtr<u8>(&block, (uintptr_t)block.mpDisplayListData);
+    mpMtxInitData = JSUConvertOffsetToPtr<J3DShapeMtxInitData>(&block, (uintptr_t)block.mpMtxInitData);
+    mpDrawInitData = JSUConvertOffsetToPtr<J3DShapeDrawInitData>(&block, (uintptr_t)block.mpDrawInitData);
     mpVcdVatCmdBuffer = NULL;
 }
 
diff --git a/src/JSystem/JAudio/JAIGlobalParameter.cpp b/src/JSystem/JAudio/JAIGlobalParameter.cpp
index 8bb279c92..9283bec61 100644
--- a/src/JSystem/JAudio/JAIGlobalParameter.cpp
+++ b/src/JSystem/JAudio/JAIGlobalParameter.cpp
@@ -301,32 +301,32 @@ f32 JAIGlobalParameter::getParamSeDolbyBehindDistanceMax() {
 }
 
 /* 802923E8-802923F0       .text getParamInitDataFileName__18JAIGlobalParameterFv */
-char* JAIGlobalParameter::getParamInitDataFileName() {
+const char* JAIGlobalParameter::getParamInitDataFileName() {
     return initDataFileName;
 }
 
 /* 802923F0-802923F8       .text getParamWavePath__18JAIGlobalParameterFv */
-char* JAIGlobalParameter::getParamWavePath() {
+const char* JAIGlobalParameter::getParamWavePath() {
     return wavePath;
 }
 
 /* 802923F8-80292400       .text getParamSequenceArchivesPath__18JAIGlobalParameterFv */
-char* JAIGlobalParameter::getParamSequenceArchivesPath() {
+const char* JAIGlobalParameter::getParamSequenceArchivesPath() {
     return sequenceArchivesPath;
 }
 
 /* 80292400-80292408       .text getParamStreamPath__18JAIGlobalParameterFv */
-char* JAIGlobalParameter::getParamStreamPath() {
+const char* JAIGlobalParameter::getParamStreamPath() {
     return streamPath;
 }
 
 /* 80292408-80292410       .text getParamAudioResPath__18JAIGlobalParameterFv */
-char* JAIGlobalParameter::getParamAudioResPath() {
+const char* JAIGlobalParameter::getParamAudioResPath() {
     return audioResPath;
 }
 
 /* 80292410-80292418       .text getParamSequenceArchivesFileName__18JAIGlobalParameterFv */
-char* JAIGlobalParameter::getParamSequenceArchivesFileName() {
+const char* JAIGlobalParameter::getParamSequenceArchivesFileName() {
     return sequenceArchivesFileName;
 }
 
@@ -398,12 +398,12 @@ u32 JAIGlobalParameter::autoHeapMax = 2;
 u32 JAIGlobalParameter::stayHeapMax = 2;
 u32 JAIGlobalParameter::autoHeapRoomSize = 0xC000;
 u32 JAIGlobalParameter::stayHeapSize = 0x00010000;
-char* JAIGlobalParameter::initDataFileName = "JaiInit.aaf";
-char* JAIGlobalParameter::wavePath = "Banks/";
-char* JAIGlobalParameter::sequenceArchivesPath = "Seqs/";
-char* JAIGlobalParameter::streamPath = "Stream/";
-char* JAIGlobalParameter::audioResPath = "AudioRes/";
-char* JAIGlobalParameter::sequenceArchivesFileName = "JaiSeqs.arc";
+const char* JAIGlobalParameter::initDataFileName = "JaiInit.aaf";
+const char* JAIGlobalParameter::wavePath = "Banks/";
+const char* JAIGlobalParameter::sequenceArchivesPath = "Seqs/";
+const char* JAIGlobalParameter::streamPath = "Stream/";
+const char* JAIGlobalParameter::audioResPath = "AudioRes/";
+const char* JAIGlobalParameter::sequenceArchivesFileName = "JaiSeqs.arc";
 f32 JAIGlobalParameter::inputGainDown = 0.5f;
 f32 JAIGlobalParameter::outputGainUp = 1.2f;
 f32 JAIGlobalParameter::distanceMax = 5000.0f;
diff --git a/src/JSystem/JAudio/JAIInitData.cpp b/src/JSystem/JAudio/JAIInitData.cpp
index 239fbf4ca..d08c80ed5 100644
--- a/src/JSystem/JAudio/JAIInitData.cpp
+++ b/src/JSystem/JAudio/JAIInitData.cpp
@@ -24,15 +24,15 @@ u32* JAInter::InitData::aafPointer;
 
 /* 80292460-80292548       .text checkInitDataFile__Q27JAInter8InitDataFv */
 BOOL JAInter::InitData::checkInitDataFile() {
-    if (!SystemInterface::checkFileExsistence(JAIGlobalParameter::getParamInitDataFileName())) {
+    if (!SystemInterface::checkFileExsistence((char*)JAIGlobalParameter::getParamInitDataFileName())) {
         char* fileName = (char*)JASDram->alloc(strlen(JAIGlobalParameter::getParamAudioResPath()) + strlen(JAIGlobalParameter::getParamInitDataFileName()) + 1, 0);
         sprintf(fileName, "%s%s%c", JAIGlobalParameter::getParamAudioResPath(), JAIGlobalParameter::getParamInitDataFileName(), 0);
         JAIGlobalParameter::setParamInitDataFileName(fileName);
-        if (!SystemInterface::checkFileExsistence(JAIGlobalParameter::getParamInitDataFileName())) {
+        if (!SystemInterface::checkFileExsistence((char*)JAIGlobalParameter::getParamInitDataFileName())) {
             return false;
         }
     }
-    loadTmpDVDFile(JAIGlobalParameter::getParamInitDataFileName(), (u8**)&aafPointer);
+    loadTmpDVDFile((char*)JAIGlobalParameter::getParamInitDataFileName(), (u8**)&aafPointer);
     if (aafPointer) {
         checkInitDataOnMemory();
         deleteTmpDVDFile((u8**)&aafPointer);
diff --git a/src/JSystem/JAudio/JAISequenceMgr.cpp b/src/JSystem/JAudio/JAISequenceMgr.cpp
index 827495a5a..4650acd51 100644
--- a/src/JSystem/JAudio/JAISequenceMgr.cpp
+++ b/src/JSystem/JAudio/JAISequenceMgr.cpp
@@ -186,7 +186,7 @@ void JAInter::SequenceMgr::checkEntriedSeq() {
             }
 
         } else {
-            if ((u32)buffer == 0xFFFFFFFF) {
+            if ((uintptr_t)buffer == 0xFFFFFFFF) {
                 continue;
             }
             if (heapIdx != 255) {
diff --git a/src/JSystem/JAudio/JAIStreamMgr.cpp b/src/JSystem/JAudio/JAIStreamMgr.cpp
index 6aeb3ec76..149794abb 100644
--- a/src/JSystem/JAudio/JAIStreamMgr.cpp
+++ b/src/JSystem/JAudio/JAIStreamMgr.cpp
@@ -369,7 +369,7 @@ void JAInter::StreamMgr::checkPlayingStream() {
 /* 8029C730-8029C858       .text Play_DirectPCM__Q27JAInter9StreamLibFPQ28JASystem11TDSPChannelPsUsUlsUs */
 void JAInter::StreamLib::Play_DirectPCM(JASystem::TDSPChannel* param_1, s16* param_2, u16 param_3, u32 param_4, s16 param_5, u16 param_6) {
     JASystem::DSPInterface::DSPBuffer* buffer = JASystem::DSPInterface::getDSPHandle(param_1->mNumber);
-    buffer->field_0x118 = (u32)param_2;
+    buffer->field_0x118 = (uintptr_t)param_2;
     buffer->field_0x102 = 0;
     buffer->field_0x100 = 33;
     if (JAInter::StreamLib::header.field_0x10 != 0) {
@@ -377,7 +377,7 @@ void JAInter::StreamLib::Play_DirectPCM(JASystem::TDSPChannel* param_1, s16* par
     } else {
         buffer->field_0x74 = param_4;
     }
-    buffer->field_0x110 = (u32)param_2;
+    buffer->field_0x110 = (uintptr_t)param_2;
     buffer->field_0x114 = param_3 << 16;
     JASystem::DSPInterface::getDSPHandle(param_1->mNumber)->setMixerInitDelayMax(0);
     for (u8 i = 0; i < 6; i++) {
diff --git a/src/JSystem/JAudio/JASDSPInterface.cpp b/src/JSystem/JAudio/JASDSPInterface.cpp
index 16cbac19b..2989578f0 100644
--- a/src/JSystem/JAudio/JASDSPInterface.cpp
+++ b/src/JSystem/JAudio/JASDSPInterface.cpp
@@ -61,8 +61,8 @@ u32 JASystem::DSPInterface::DOLBY2_DELAY_BUF[600];
 
 /* 8028A240-8028A28C       .text setupBuffer__Q28JASystem12DSPInterfaceFv */
 void JASystem::DSPInterface::setupBuffer() {
-    DsetupTable(64, (u32)CH_BUF, (u32)&DSPRES_FILTER, (u32)&DSPADPCM_FILTER, (u32)FX_BUF);
-    DsetDolbyDelay((u32)&DOLBY2_DELAY_BUF, 10);
+    DsetupTable(64, (uintptr_t)CH_BUF, (uintptr_t)DSPRES_FILTER, (uintptr_t)DSPADPCM_FILTER, (uintptr_t)FX_BUF);
+    DsetDolbyDelay((uintptr_t)DOLBY2_DELAY_BUF, 10);
 }
 
 /* 8028A28C-8028A368       .text initBuffer__Q28JASystem12DSPInterfaceFv */
diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp
index 7e6728b27..f09c77bdc 100644
--- a/src/JSystem/JKernel/JKRAram.cpp
+++ b/src/JSystem/JKernel/JKRAram.cpp
@@ -102,12 +102,12 @@ void* JKRAram::run() {
 
 /* 802B45D4-802B4664       .text checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl */
 bool JKRAram::checkOkAddress(u8* addr, u32 size, JKRAramBlock* block, u32 param_4) {
-    if (!IS_ALIGNED((u32)addr, 0x20) && !IS_ALIGNED(size, 0x20)) {
+    if (!IS_ALIGNED((uintptr_t)addr, 0x20) && !IS_ALIGNED(size, 0x20)) {
         OSPanic(__FILE__, 226, ":::address not 32Byte aligned.");
         return false;
     }
 
-    if (block && !IS_ALIGNED((u32)block->getAddress() + param_4, 0x20)) {
+    if (block && !IS_ALIGNED((uintptr_t)block->getAddress() + param_4, 0x20)) {
         OSPanic(__FILE__, 235, ":::address not 32Byte aligned.");
         return false;
     }
@@ -169,7 +169,7 @@ JKRAramBlock* JKRAram::mainRamToAram(u8 *buf, u32 bufSize, u32 alignedSize, JKRE
         }
         else {
             JKRDecompress(buf, (u8 *)allocatedMem, fileSize, 0);
-            JKRAramPcs(0, (u32)allocatedMem, bufSize, alignedSize, block);
+            JKRAramPcs(0, (uintptr_t)allocatedMem, bufSize, alignedSize, block);
             JKRFreeToHeap(heap, allocatedMem);
             block = block == NULL ? (JKRAramBlock *)-1 : block;
         }
@@ -186,7 +186,7 @@ JKRAramBlock* JKRAram::mainRamToAram(u8 *buf, u32 bufSize, u32 alignedSize, JKRE
             bufSize = allocatedBlock->getAddress();
         }
 
-        JKRAramPcs(0, (u32)buf, bufSize, alignedSize, block);
+        JKRAramPcs(0, (uintptr_t)buf, bufSize, alignedSize, block);
         block = block == NULL ? (JKRAramBlock *)-1 : block;
     }
     return block;
@@ -216,8 +216,8 @@ u8* JKRAram::aramToMainRam(u32 address, u8 *buf, u32 p3, JKRExpandSwitch expandS
     u32 expandSize;
     if (expandSwitch == EXPAND_SWITCH_UNKNOWN1) {
         u8 buffer[64];
-        u8 *bufPtr = (u8 *)ALIGN_NEXT((u32)buffer, 32);
-        JKRAramPcs(1, address, (u32)bufPtr, sizeof(buffer) / 2, NULL); // probably change sizeof(buffer) / 2 to 32
+        u8 *bufPtr = (u8 *)ALIGN_NEXT((uintptr_t)buffer, 32);
+        JKRAramPcs(1, address, (uintptr_t)bufPtr, sizeof(buffer) / 2, NULL); // probably change sizeof(buffer) / 2 to 32
         compression = JKRCheckCompressed(bufPtr);
         expandSize = JKRDecompExpandSize(bufPtr);
     }
@@ -245,7 +245,7 @@ u8* JKRAram::aramToMainRam(u32 address, u8 *buf, u32 p3, JKRExpandSwitch expandS
             return NULL;
         }
         else {
-            JKRAramPcs(1, address, (u32)szpSpace, p3, NULL);
+            JKRAramPcs(1, address, (uintptr_t)szpSpace, p3, NULL);
             if (p5 != 0 && p5 < expandSize)
                 expandSize = p5;
 
@@ -279,7 +279,7 @@ u8* JKRAram::aramToMainRam(u32 address, u8 *buf, u32 p3, JKRExpandSwitch expandS
         }
         else {
             changeGroupIdIfNeed(buf, id);
-            JKRAramPcs(1, address, (u32)buf, p3, NULL);
+            JKRAramPcs(1, address, (uintptr_t)buf, p3, NULL);
             if (pSize != NULL) {
                 *pSize = p3;
             }
@@ -512,8 +512,8 @@ static u8* firstSrcData() {
         length = size;
     }
 
-    u32 src = (u32)(srcAddress + srcOffset);
-    u32 dst = (u32)buffer;
+    uintptr_t src = (uintptr_t)(srcAddress + srcOffset);
+    uintptr_t dst = (uintptr_t)buffer;
     u32 alignedLength = ALIGN_NEXT(length, 0x20);
     JKRAramPcs(1, src, dst, alignedLength, NULL);
 
@@ -545,7 +545,7 @@ static u8* nextSrcData(u8* current) {
     }
     JUT_ASSERT(VERSION_SELECT(1321, 1376, 1361, 1361), transSize > 0);
 
-    JKRAramPcs(1, (u32)(srcAddress + srcOffset), ((u32)dest + left), ALIGN_NEXT(transSize, 0x20),
+    JKRAramPcs(1, (uintptr_t)(srcAddress + srcOffset), ((uintptr_t)dest + left), ALIGN_NEXT(transSize, 0x20),
                NULL);
     srcOffset += transSize;
     transLeft -= transSize;
diff --git a/src/JSystem/JKernel/JKRAramPiece.cpp b/src/JSystem/JKernel/JKRAramPiece.cpp
index ad9694ac1..c05fad3e3 100644
--- a/src/JSystem/JKernel/JKRAramPiece.cpp
+++ b/src/JSystem/JKernel/JKRAramPiece.cpp
@@ -12,7 +12,7 @@
 #include "dolphin/os/OS.h"
 
 /* 802B5C14-802B5C94       .text prepareCommand__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v */
-JKRAMCommand* JKRAramPiece::prepareCommand(int direction, u32 src, u32 dst, u32 length, JKRAramBlock* block, JKRAMCommand::AsyncCallback callback) {
+JKRAMCommand* JKRAramPiece::prepareCommand(int direction, uintptr_t src, uintptr_t dst, u32 length, JKRAramBlock* block, JKRAMCommand::AsyncCallback callback) {
     JKRAMCommand* command = new (JKRHeap::getSystemHeap(), -4) JKRAMCommand();
     command->mTransferDirection = direction;
     command->mSrc = src;
@@ -32,7 +32,7 @@ JSUList<JKRAMCommand> JKRAramPiece::sAramPieceCommandList;
 OSMutex JKRAramPiece::mMutex;
 
 /* 802B5CB4-802B5E0C       .text orderAsync__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v */
-JKRAMCommand* JKRAramPiece::orderAsync(int direction, u32 source, u32 destination, u32 length, JKRAramBlock* block, JKRAMCommand::AsyncCallback callback) {
+JKRAMCommand* JKRAramPiece::orderAsync(int direction, uintptr_t source, uintptr_t destination, u32 length, JKRAramBlock* block, JKRAMCommand::AsyncCallback callback) {
     lock();
     if ((source & 0x1f) != 0 || (destination & 0x1f) != 0) {
         OSReport("direction = %x\n", direction);
@@ -81,7 +81,7 @@ BOOL JKRAramPiece::sync(JKRAMCommand* command, int is_non_blocking) {
 }
 
 /* 802B5ED4-802B5F68       .text orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock */
-BOOL JKRAramPiece::orderSync(int direction, u32 source, u32 destination, u32 length, JKRAramBlock* block) {
+BOOL JKRAramPiece::orderSync(int direction, uintptr_t source, uintptr_t destination, u32 length, JKRAramBlock* block) {
     lock();
 
     JKRAMCommand* command =
@@ -106,7 +106,7 @@ void JKRAramPiece::startDMA(JKRAMCommand* command) {
 }
 
 /* 802B5FE0-802B6088       .text doneDMA__12JKRAramPieceFUl */
-void JKRAramPiece::doneDMA(u32 requestAddress) {
+void JKRAramPiece::doneDMA(uintptr_t requestAddress) {
     JKRAMCommand* command = (JKRAMCommand*)requestAddress;
 
     if (command->mTransferDirection == 1) {
diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp
index c2017471e..8624d96cd 100644
--- a/src/JSystem/JKernel/JKRAramStream.cpp
+++ b/src/JSystem/JKernel/JKRAramStream.cpp
@@ -66,7 +66,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
     u32 dstSize = command->mSize;
     u32 offset = command->mOffset;
     u32 writtenLength = 0;
-    u32 destination = command->mAddress;
+    uintptr_t destination = command->mAddress;
     u8* buffer = command->mTransferBuffer;
     u32 bufferSize = command->mTransferBufferSize;
     JKRHeap* heap = command->mHeap;
@@ -113,7 +113,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
                 break;
             }
 
-            JKRAramPcs(0, (u32)buffer, destination, length, NULL);
+            JKRAramPcs(0, (uintptr_t)buffer, destination, length, NULL);
             dstSize -= length;
             writtenLength += length;
             destination += length;
@@ -184,7 +184,7 @@ void JKRAramStream::setTransBuffer(u8* buffer, u32 bufferSize, JKRHeap* heap) {
     transHeap = NULL;
 
     if (buffer) {
-        transBuffer = (u8*)ALIGN_NEXT((u32)buffer, 0x20);
+        transBuffer = (u8*)ALIGN_NEXT((uintptr_t)buffer, 0x20);
     }
 
     if (bufferSize) {
diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp
index c902ebdbe..71e33ea1e 100644
--- a/src/JSystem/JKernel/JKRCompArchive.cpp
+++ b/src/JSystem/JKernel/JKRCompArchive.cpp
@@ -118,9 +118,9 @@ bool JKRCompArchive::open(s32 entryNum) {
             }
             else
             {
-                JKRDvdToMainRam(entryNum, (u8 *)mArcInfoBlock, EXPAND_SWITCH_UNKNOWN1, (u32)arcHeader->file_data_offset + mSizeOfMemPart,
+                JKRDvdToMainRam(entryNum, (u8 *)mArcInfoBlock, EXPAND_SWITCH_UNKNOWN1, (uintptr_t)arcHeader->file_data_offset + mSizeOfMemPart,
                                 NULL, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, 0x20, NULL);
-                field_0x64 = (u32)mArcInfoBlock + arcHeader->file_data_offset;
+                field_0x64 = (uintptr_t)mArcInfoBlock + arcHeader->file_data_offset;
 
                 if (mSizeOfAramPart != 0) {
                     mAramPart = (JKRAramBlock*)JKRAllocFromAram(mSizeOfAramPart, JKRAramHeap::HEAD);
@@ -132,9 +132,9 @@ bool JKRCompArchive::open(s32 entryNum) {
                     JKRDvdToAram(entryNum, mAramPart->getAddress(), EXPAND_SWITCH_UNKNOWN1, arcHeader->header_length + arcHeader->file_data_offset + mSizeOfMemPart, 0);
                 }
 
-                mNodes = (SDIDirEntry*)((u32)mArcInfoBlock + mArcInfoBlock->node_offset);
-                mFiles = (SDIFileEntry *)((u32)mArcInfoBlock + mArcInfoBlock->file_entry_offset);
-                mStringTable = (char*)((u32)mArcInfoBlock + mArcInfoBlock->string_table_offset);
+                mNodes = (SDIDirEntry*)((uintptr_t)mArcInfoBlock + mArcInfoBlock->node_offset);
+                mFiles = (SDIFileEntry *)((uintptr_t)mArcInfoBlock + mArcInfoBlock->file_entry_offset);
+                mStringTable = (char*)((uintptr_t)mArcInfoBlock + mArcInfoBlock->string_table_offset);
                 field_0x6c = arcHeader->header_length + arcHeader->file_data_offset;
             }
             break;
@@ -167,7 +167,7 @@ bool JKRCompArchive::open(s32 entryNum) {
                     else {
                         // arcHeader + 1 should lead to 0x20, which is the data after the header
                         JKRHeap::copyMemory((u8 *)mArcInfoBlock, arcHeader + 1, (arcHeader->file_data_offset + mSizeOfMemPart));
-                        field_0x64 = (u32)mArcInfoBlock + arcHeader->file_data_offset;
+                        field_0x64 = (uintptr_t)mArcInfoBlock + arcHeader->file_data_offset;
                         if (mSizeOfAramPart != 0) {
                             mAramPart = (JKRAramBlock*)JKRAllocFromAram(mSizeOfAramPart, JKRAramHeap::HEAD);
                             if(mAramPart == NULL) {
@@ -181,9 +181,9 @@ bool JKRCompArchive::open(s32 entryNum) {
                     }
                 }
             }
-            mNodes = (SDIDirEntry *)((u32)mArcInfoBlock + mArcInfoBlock->node_offset);
-            mFiles = (SDIFileEntry *)((u32)mArcInfoBlock + mArcInfoBlock->file_entry_offset);
-            mStringTable = (char *)((u32)mArcInfoBlock + mArcInfoBlock->string_table_offset);
+            mNodes = (SDIDirEntry *)((uintptr_t)mArcInfoBlock + mArcInfoBlock->node_offset);
+            mFiles = (SDIFileEntry *)((uintptr_t)mArcInfoBlock + mArcInfoBlock->file_entry_offset);
+            mStringTable = (char *)((uintptr_t)mArcInfoBlock + mArcInfoBlock->string_table_offset);
             field_0x6c = arcHeader->header_length + arcHeader->file_data_offset;
             break;
         }
@@ -374,7 +374,7 @@ u32 JKRCompArchive::getExpandedResSize(const void* resource) const {
     }
 
     u8 buf[64];
-    u8 *bufPtr = (u8 *)ALIGN_NEXT((u32)buf, 32);
+    u8 *bufPtr = (u8 *)ALIGN_NEXT((uintptr_t)buf, 32);
     if ((flags & 0x20) != 0) {
         u32 addr = mAramPart->mAddress;
         addr = fileEntry->data_offset + addr;
diff --git a/src/JSystem/JKernel/JKRDecomp.cpp b/src/JSystem/JKernel/JKRDecomp.cpp
index a23a41f39..d2c44b1d8 100644
--- a/src/JSystem/JKernel/JKRDecomp.cpp
+++ b/src/JSystem/JKernel/JKRDecomp.cpp
@@ -49,7 +49,7 @@ void* JKRDecomp::run() {
         }
 
         if (command->mCallback) {
-            (*command->mCallback)((u32)command);
+            (*command->mCallback)((uintptr_t)command);
             continue;
         }
 
diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/JSystem/JKernel/JKRDvdAramRipper.cpp
index 216bd6b95..21453470b 100644
--- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdAramRipper.cpp
@@ -24,7 +24,7 @@ static int JKRDecompressFromDVDToAram(JKRDvdFile*, u32, u32, u32, u32, u32);
 static int decompSZS_subroutine(u8*, u32);
 static u8* firstSrcData();
 static u8* nextSrcData(u8*);
-static u32 dmaBufferFlush(u32);
+static u32 dmaBufferFlush(uintptr_t);
 
 /* 802BDA14-802BDAB0       .text loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUl */
 JKRAramBlock* JKRDvdAramRipper::loadToAram(s32 entryNumber, u32 address, JKRExpandSwitch expandSwitch, u32 param_3, u32 param_4) {
@@ -59,7 +59,7 @@ JKRAramBlock* JKRDvdAramRipper::loadToAram(JKRDvdFile* dvdFile, u32 address, JKR
 bool JKRDvdAramRipper::errorRetry = true;
 
 /* 802BDB50-802BDBFC       .text loadToAram_Async__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchPFUl_vUlUl */
-JKRADCommand* JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* dvdFile, u32 address, JKRExpandSwitch expandSwitch, void (*callback)(u32), u32 param_4, u32 param_5) {
+JKRADCommand* JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* dvdFile, u32 address, JKRExpandSwitch expandSwitch, void (*callback)(uintptr_t), u32 param_4, u32 param_5) {
     JKRADCommand* command = new (JKRGetSystemHeap(), -4) JKRADCommand();
     command->mDvdFile = dvdFile;
     command->mAddress = address;
@@ -101,7 +101,7 @@ JKRADCommand* JKRDvdAramRipper::callCommand_Async(JKRADCommand* command) {
         fileSize = ALIGN_NEXT(fileSize, 0x20);
         if (command->mExpandSwitch == 1) {
             u8 buffer[0x40];
-            u8* bufPtr = (u8*)ALIGN_NEXT((u32)&buffer, 0x20);
+            u8* bufPtr = (u8*)ALIGN_NEXT((uintptr_t)buffer, 0x20);
             while (true) {
                 if (DVDReadPrio(dvdFile->getFileInfo(), bufPtr, 0x20, 0, 2) >= 0) {
                     break;
@@ -175,7 +175,7 @@ JKRADCommand* JKRDvdAramRipper::callCommand_Async(JKRADCommand* command) {
         if (!command->mCallback) {
             (*((JSUList<JKRADCommand>*)&sDvdAramAsyncList)).append(&command->mLink);
         } else {
-            command->mCallback((u32)command);
+            command->mCallback((uintptr_t)command);
         }
     }
 
@@ -433,12 +433,12 @@ static u8* nextSrcData(u8* src) {
 }
 
 /* 802BE790-802BE7F8       .text dmaBufferFlush__FUl */
-static u32 dmaBufferFlush(u32 param_1) {
+static u32 dmaBufferFlush(uintptr_t param_1) {
     if (dmaCurrent == dmaBuf) {
         return 0;
     }
     u32 size = ALIGN_NEXT(dmaCurrent - dmaBuf, 0x20);
-    JKRAramPiece::orderSync(0, (u32)dmaBuf, param_1, size, NULL);
+    JKRAramPiece::orderSync(0, (uintptr_t)dmaBuf, param_1, size, NULL);
     dmaCurrent = dmaBuf;
     return size;
 }
diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp
index 252c0fc29..9a675c2fe 100644
--- a/src/JSystem/JKernel/JKRDvdArchive.cpp
+++ b/src/JSystem/JKernel/JKRDvdArchive.cpp
@@ -238,7 +238,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
             // The dst pointer to JKRDvdToMainRam should be aligned to 32 bytes. This will align
             // arcHeader to 32 bytes on the stack.
             char arcHeaderBuffer[64];
-            u8* arcHeader = (u8*)ALIGN_NEXT((u32)arcHeaderBuffer, 0x20);
+            u8* arcHeader = (u8*)ALIGN_NEXT((uintptr_t)arcHeaderBuffer, 0x20);
             JKRDvdToMainRam(entryNum, arcHeader, EXPAND_SWITCH_UNKNOWN2, sizeof(SArcHeader),
                             NULL, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL);
 #if VERSION > VERSION_DEMO
@@ -301,7 +301,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
             // The dst pointer to JKRDvdToMainRam should be aligned to 32 bytes. This will align
             // arcHeader to 32 bytes on the stack.
             char arcHeaderBuffer[64];
-            u8* arcHeader = (u8*)ALIGN_NEXT((u32)arcHeaderBuffer, 0x20);
+            u8* arcHeader = (u8*)ALIGN_NEXT((uintptr_t)arcHeaderBuffer, 0x20);
             JKRDvdToMainRam(entryNum, arcHeader, EXPAND_SWITCH_UNKNOWN2, sizeof(SArcHeader),
                             NULL, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL);
 #if VERSION > VERSION_DEMO
@@ -366,7 +366,7 @@ u32 JKRDvdArchive::getExpandedResSize(const void* resource) const {
     // The dst pointer to JKRDvdToMainRam should be aligned to 32 bytes. This will align arcHeader
     // to 32 bytes on the stack.
     char buffer[64];
-    u8* arcHeader = (u8*)ALIGN_NEXT((u32)buffer, 0x20);
+    u8* arcHeader = (u8*)ALIGN_NEXT((uintptr_t)buffer, 0x20);
     JKRDvdToMainRam(mEntryNum, arcHeader, EXPAND_SWITCH_UNKNOWN2, sizeof(SArcHeader), NULL,
                     JKRDvdRipper::ALLOC_DIRECTION_FORWARD,
                     this->mDataOffset + fileEntry->data_offset, NULL);
diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp
index 5b12385f9..0de584e50 100644
--- a/src/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdRipper.cpp
@@ -50,7 +50,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
     fileSizeAligned = ALIGN_NEXT(dvdFile->getFileSize(), 32);
     if (expandSwitch == EXPAND_SWITCH_UNKNOWN1) {
         u8 buffer[0x40];
-        u8 *bufPtr = (u8 *)ALIGN_NEXT((u32)buffer, 32);
+        u8 *bufPtr = (u8 *)ALIGN_NEXT((uintptr_t)buffer, 32);
         while (true) {
             int readBytes = DVDReadPrio(dvdFile->getFileInfo(), bufPtr, 0x20, 0, 2);
             if (readBytes >= 0) {
@@ -109,7 +109,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
 
         if (offset != 0) {
             u8 buffer[0x40];
-            u8 *bufPtr = (u8 *)ALIGN_NEXT((u32)buffer, 32);
+            u8 *bufPtr = (u8 *)ALIGN_NEXT((uintptr_t)buffer, 32);
             while (true) {
                 int readBytes = DVDReadPrio(dvdFile->getFileInfo(), bufPtr, 32, (s32)offset, 2);
                 if (readBytes >= 0) {
@@ -419,7 +419,7 @@ static u8* nextSrcData(u8* src) {
     }
 
     memcpy(buf, src, limit);
-    u32 transSize = (u32)(szpEnd - (buf + limit));
+    u32 transSize = szpEnd - (buf + limit);
     if (transSize > transLeft) {
         transSize = transLeft;
     }
diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp
index 89a537322..524f6d4f2 100644
--- a/src/JSystem/JKernel/JKRExpHeap.cpp
+++ b/src/JSystem/JKernel/JKRExpHeap.cpp
@@ -142,8 +142,8 @@ void* JKRExpHeap::allocFromHead(u32 size, int align) {
     CMemBlock* newUsedBlock = NULL;
 
     for (CMemBlock* block = mHeadFreeList; block; block = block->mNext) {
-        u32 alignedContent = ALIGN_NEXT((u32)block->getContent(), align);
-        u32 offset = alignedContent - (u32)block->getContent();
+        uintptr_t alignedContent = ALIGN_NEXT((uintptr_t)block->getContent(), align);
+        u32 offset = alignedContent - (uintptr_t)block->getContent();
         if (block->size < size + offset) {
             continue;
         }
@@ -200,7 +200,7 @@ void* JKRExpHeap::allocFromHead(u32 size, int align) {
                 CMemBlock* prev = foundBlock->mPrev;
                 CMemBlock* next = foundBlock->mNext;
                 removeFreeBlock(foundBlock);
-                newUsedBlock = (CMemBlock*)((u32)foundBlock + foundOffset);
+                newUsedBlock = (CMemBlock*)((uintptr_t)foundBlock + foundOffset);
                 newUsedBlock->size = foundBlock->size - foundOffset;
                 newFreeBlock =
                     newUsedBlock->allocFore(size, mCurrentGroupId, (u8)foundOffset, 0, 0);
@@ -273,8 +273,8 @@ void* JKRExpHeap::allocFromTail(u32 size, int align) {
     u32 start;
 
     for (CMemBlock* block = mTailFreeList; block; block = block->mPrev) {
-        start = ALIGN_PREV((u32)block->getContent() + block->size - size, align);
-        usedSize = (u32)block->getContent() + block->size - start;
+        start = ALIGN_PREV((uintptr_t)block->getContent() + block->size - size, align);
+        usedSize = (uintptr_t)block->getContent() + block->size - start;
         if (block->size >= usedSize) {
             foundBlock = block;
             offset = block->size - usedSize;
@@ -407,7 +407,7 @@ s32 JKRExpHeap::do_resize(void* ptr, u32 size) {
     if (size > block->size) {
         CMemBlock* foundBlock = NULL;
         for (CMemBlock* freeBlock = mHeadFreeList; freeBlock; freeBlock = freeBlock->mNext) {
-            if (freeBlock == (CMemBlock*)((u32)(block + 1) + block->size)) {
+            if (freeBlock == (CMemBlock*)((uintptr_t)(block + 1) + block->size)) {
                 foundBlock = freeBlock;
                 break;
             }
@@ -666,10 +666,10 @@ void JKRExpHeap::recycleFreeBlock(CMemBlock* block) {
 
 /* 802B27D0-802B291C       .text joinTwoBlocks__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock */
 void JKRExpHeap::joinTwoBlocks(CMemBlock* block) {
-    u32 curBlock = (u32)block; // Fakematch?
-    u32 endAddr = (u32)(block + 1) + block->size;
+    uintptr_t curBlock = (uintptr_t)block; // Fakematch?
+    uintptr_t endAddr = (uintptr_t)(block + 1) + block->size;
     CMemBlock* next = block->mNext;
-    u32 nextAddr = (u32)next - (next->mFlags & 0x7f);
+    uintptr_t nextAddr = (uintptr_t)next - (next->mFlags & 0x7f);
     if (endAddr > nextAddr) {
         JUTWarningConsole_f(":::Heap may be broken. (block = %x)", block);
         OSReport(":::block = %x\n", curBlock);
@@ -731,7 +731,7 @@ bool JKRExpHeap::check() {
                                     block->mNext->mPrev);
             }
 
-            if ((u32)block + block->size + sizeof(CMemBlock) > (u32)block->mNext) {
+            if ((uintptr_t)block + block->size + sizeof(CMemBlock) > (uintptr_t)block->mNext) {
                 ok = false;
                 JUTWarningConsole_f(":::addr %08x: bad block size (%08x)\n", block, block->size);
             }
@@ -947,7 +947,7 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocFore(u32 size, u8 groupId1, u
     mGroupId = groupId1;
     mFlags = alignment1;
     if (getSize() >= size + sizeof(CMemBlock)) {
-        block = (CMemBlock*)(size + (u32)this);
+        block = (CMemBlock*)(size + (uintptr_t)this);
         block[1].mGroupId = groupId2;
         block[1].mFlags = alignment2;
         block[1].size = this->size - (size + sizeof(CMemBlock));
@@ -961,7 +961,7 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocFore(u32 size, u8 groupId1, u
 JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocBack(u32 size, u8 groupId1, u8 alignment1, u8 groupId2, u8 alignment2) {
     CMemBlock* newblock = NULL;
     if (getSize() >= size + sizeof(CMemBlock)) {
-        newblock = (CMemBlock*)((u32)this + getSize() - size);
+        newblock = (CMemBlock*)((uintptr_t)this + getSize() - size);
         newblock->mGroupId = groupId2;
         newblock->mFlags = alignment2 | 0x80;
         newblock->size = size;
diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp
index 07040bc7c..022c8e025 100644
--- a/src/JSystem/JKernel/JKRHeap.cpp
+++ b/src/JSystem/JKernel/JKRHeap.cpp
@@ -95,7 +95,7 @@ bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) {
     OSSetArenaHi(ram_end);
 
     *memory = (char*)ram_start;
-    *size = (u32)ram_end - (u32)ram_start;
+    *size = (uintptr_t)ram_end - (uintptr_t)ram_start;
     return true;
 }
 
@@ -251,7 +251,7 @@ u8 JKRHeap::changeGroupID(u8 groupID) {
 
 /* 802B0918-802B0978       .text getMaxAllocatableSize__7JKRHeapFi */
 u32 JKRHeap::getMaxAllocatableSize(int alignment) {
-    u32 maxFreeBlock = (u32)getMaxFreeBlock();
+    uintptr_t maxFreeBlock = (uintptr_t)getMaxFreeBlock();
     u32 ptrOffset = (alignment - 1) & alignment - (maxFreeBlock & 0xf);
     return ~(alignment - 1) & (getFreeSize() - ptrOffset);
 }
@@ -291,7 +291,7 @@ JKRHeap* JKRHeap::find(void* memory) const {
 }
 
 /* 802B0A58-802B0AEC       .text dispose_subroutine__7JKRHeapFUlUl */
-void JKRHeap::dispose_subroutine(u32 begin, u32 end) {
+void JKRHeap::dispose_subroutine(uintptr_t begin, uintptr_t end) {
     JSUListIterator<JKRDisposer> last_iterator;
     JSUListIterator<JKRDisposer> next_iterator;
     JSUListIterator<JKRDisposer> iterator;
@@ -320,13 +320,13 @@ void JKRHeap::dispose_subroutine(u32 begin, u32 end) {
 
 /* 802B0AEC-802B0B14       .text dispose__7JKRHeapFPvUl */
 bool JKRHeap::dispose(void* ptr, u32 size) {
-    dispose_subroutine((u32)ptr, (u32)ptr + size);
+    dispose_subroutine((uintptr_t)ptr, (uintptr_t)ptr + size);
     return false;
 }
 
 /* 802B0B14-802B0B34       .text dispose__7JKRHeapFPvPv */
 void JKRHeap::dispose(void* begin, void* end) {
-    dispose_subroutine((u32)begin, (u32)end);
+    dispose_subroutine((uintptr_t)begin, (uintptr_t)end);
 }
 
 /* 802B0B34-802B0B8C       .text dispose__7JKRHeapFv */
diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp
index ccc602013..cfde5a605 100644
--- a/src/JSystem/JKernel/JKRMemArchive.cpp
+++ b/src/JSystem/JKernel/JKRMemArchive.cpp
@@ -120,7 +120,7 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio
         mStringTable = (char *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset);
 
         mArchiveData =
-            (u8 *)((u32)mArcHeader + mArcHeader->header_length + mArcHeader->file_data_offset);
+            (u8 *)((uintptr_t)mArcHeader + mArcHeader->header_length + mArcHeader->file_data_offset);
         mIsOpen = true;
     }
     if (mMountMode == 0) {
@@ -134,11 +134,11 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio
 bool JKRMemArchive::open(void* buffer, u32 bufferSize, JKRMemBreakFlag flag) {
     mArcHeader = (SArcHeader *)buffer;
     JUT_ASSERT(471, mArcHeader->signature =='RARC');
-    mArcInfoBlock = (SArcDataInfo *)((u8 *)mArcHeader + mArcHeader->header_length);
-    mNodes = (SDIDirEntry *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset);
-    mFiles = (SDIFileEntry *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset);
-    mStringTable = (char *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset);
-    mArchiveData = (u8 *)(((u32)mArcHeader + mArcHeader->header_length) + mArcHeader->file_data_offset);
+    mArcInfoBlock = (SArcDataInfo *)((uintptr_t)mArcHeader + mArcHeader->header_length);
+    mNodes = (SDIDirEntry *)((uintptr_t)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset);
+    mFiles = (SDIFileEntry *)((uintptr_t)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset);
+    mStringTable = (char *)((uintptr_t)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset);
+    mArchiveData = (u8 *)(((uintptr_t)mArcHeader + mArcHeader->header_length) + mArcHeader->file_data_offset);
     mIsOpen = (flag == JKRMEMBREAK_FLAG_UNKNOWN1) ? true : false; // mIsOpen might be u8
     mHeap = JKRHeap::findFromRoot(buffer);
     mCompression = COMPRESSION_NONE;
diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp
index a8a5e7f61..fd9cfa5f2 100644
--- a/src/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/src/JSystem/JKernel/JKRSolidHeap.cpp
@@ -63,8 +63,8 @@ s32 JKRSolidHeap::adjustSize() {
     JKRHeap* parent = getParent();
     if (parent) {
         lock();
-        u32 thisSize = (u32)mStart - (u32)this;
-        u32 newSize = ALIGN_NEXT(mSolidHead - mStart, 0x20);
+        ptrdiff_t thisSize = (uintptr_t)mStart - (uintptr_t)this;
+        ptrdiff_t newSize = ALIGN_NEXT(mSolidHead - mStart, 0x20);
         if (parent->resize(this, thisSize + newSize) != -1) {
             mFreeSize = 0;
             mSize = newSize;
@@ -110,8 +110,8 @@ void* JKRSolidHeap::do_alloc(u32 size, int alignment) {
 void* JKRSolidHeap::allocFromHead(u32 size, int alignment) {
     size = ALIGN_NEXT(size, 0x4);
     void* ptr = NULL;
-    u32 alignedStart = (alignment - 1 + (u32)mSolidHead) & ~(alignment - 1);
-    u32 offset = alignedStart - (u32)mSolidHead;
+    uintptr_t alignedStart = (alignment - 1 + (uintptr_t)mSolidHead) & ~(alignment - 1);
+    u32 offset = alignedStart - (uintptr_t)mSolidHead;
     u32 totalSize = size + offset;
     if (totalSize <= mFreeSize) {
         ptr = (void*)alignedStart;
@@ -131,8 +131,8 @@ void* JKRSolidHeap::allocFromHead(u32 size, int alignment) {
 void* JKRSolidHeap::allocFromTail(u32 size, int alignment) {
     size = ALIGN_NEXT(size, 4);
     void* ptr = NULL;
-    u32 alignedStart = ALIGN_PREV((u32)mSolidTail - size, alignment);
-    u32 totalSize = (u32)mSolidTail - (u32)alignedStart;
+    uintptr_t alignedStart = ALIGN_PREV((uintptr_t)mSolidTail - size, alignment);
+    u32 totalSize = (uintptr_t)mSolidTail - alignedStart;
     if (totalSize <= mFreeSize) {
         ptr = (void*)alignedStart;
         mSolidTail -= totalSize;
@@ -172,7 +172,7 @@ void JKRSolidHeap::do_freeTail() {
         dispose(mSolidTail, mEnd);
     }
 
-    this->mFreeSize = ((u32)mEnd - (u32)mSolidTail + mFreeSize);
+    this->mFreeSize = (mEnd - mSolidTail + mFreeSize);
     this->mSolidTail = mEnd;
 
     JKRSolidHeap::Unknown* unknown = field_0x78;
@@ -201,8 +201,7 @@ bool JKRSolidHeap::check() {
     lock();
 
     bool result = true;
-    u32 calculatedSize =
-        ((u32)mSolidHead - (u32)mStart) + mFreeSize + ((u32)mEnd - (u32)mSolidTail);
+    u32 calculatedSize = (mSolidHead - mStart) + mFreeSize + (mEnd - mSolidTail);
     u32 availableSize = mSize;
     if (calculatedSize != availableSize) {
         result = false;
@@ -224,11 +223,11 @@ bool JKRSolidHeap::dump() {
     bool result = check();
 
     lock();
-    u32 headSize = ((u32)mSolidHead - (u32)mStart);
-    u32 tailSize = ((u32)mEnd - (u32)mSolidTail);
+    u32 headSize = (mSolidHead - mStart);
+    u32 tailSize = (mEnd - mSolidTail);
     s32 htSize = headSize + tailSize;
-    JUTReportConsole_f("head %08x: %08x\n", mStart, headSize);
-    JUTReportConsole_f("tail %08x: %08x\n", mSolidTail, ((u32)mEnd - (u32)mSolidTail));
+    JUTReportConsole_f("head %08x: %08x\n", (uintptr_t)mStart, headSize);
+    JUTReportConsole_f("tail %08x: %08x\n", (uintptr_t)mSolidTail, (uintptr_t)(mEnd - mSolidTail));
 
     u32 totalSize = mSize;
     float percentage = (float)htSize / (float)totalSize * 100.0f;
@@ -246,8 +245,8 @@ void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
     getState_(p);
     setState_u32ID_(p, id);
     setState_uUsedSize_(p, getUsedSize((JKRSolidHeap*)this));
-    u32 r29 = (u32)mSolidHead;
-    r29 += (u32)mSolidTail * 3;
+    u32 r29 = (uintptr_t)mSolidHead;
+    r29 += (uintptr_t)mSolidTail * 3;
     setState_u32CheckCode_(p, r29);
 }
 
diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp
index 5ec2306ac..8d9f51cdb 100644
--- a/src/JSystem/JKernel/JKRThread.cpp
+++ b/src/JSystem/JKernel/JKRThread.cpp
@@ -44,7 +44,7 @@ JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadLi
 JKRThread::JKRThread(OSThread* thread, int message_count) : mThreadListLink(this) {
     mHeap = NULL;
     mThreadRecord = thread;
-    mStackSize = (u32)thread->stack_end - (u32)thread->stack_base;
+    mStackSize = (uintptr_t)thread->stack_end - (uintptr_t)thread->stack_base;
     mStackMemory = thread->stack_base;
 
     mMessageCount = message_count;
diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp
index bed228fa7..7f6225ef1 100644
--- a/src/JSystem/JStudio/JStudio/stb.cpp
+++ b/src/JSystem/JStudio/JStudio/stb.cpp
@@ -235,7 +235,7 @@ void TObject::process_paragraph_reserved_(u32 arg1, const void* pContent, u32 uS
         data::TParse_TParagraph_dataID dataID(pContent);
         const void* temp = dataID.getContent();
         on_data(dataID.get_ID(), dataID.get_IDSize(), temp,
-                uSize - ((u32)temp - (u32)dataID.getRaw()));
+                uSize - ((uintptr_t)temp - (uintptr_t)dataID.getRaw()));
         break;
     }
     case 0x82:
diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
index a560acc56..a4fde38ec 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
@@ -236,7 +236,7 @@ void TAdaptor_actor::setJSG_ID_(IDFunction function, JStudio::data::TEOperationD
 void TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::operator()(f32 p1, JStudio::TAdaptor* adaptor) const {
     JStage::TActor* actor = static_cast<TAdaptor_actor*>(adaptor)->mObject;
     // not sure what this bit is
-    u32 idx = *(u32*)(((u32)adaptor - 1) + _08);
+    u32 idx = *(u32*)(((uintptr_t)adaptor - 1) + _08);
 
     u8 idx_lowBytes  = idx;
     u8 idx_highBytes = idx >> 8;
diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp
index 79a40c303..ac1113832 100644
--- a/src/JSystem/JUtility/JUTCacheFont.cpp
+++ b/src/JSystem/JUtility/JUTCacheFont.cpp
@@ -364,7 +364,7 @@ void JUTCacheFont::getGlyphFromAram(TGlyphCacheInfo* param_0, TCachePage* pCache
     *param_3 = iVar2;
     *param_2 -= iVar2 * iVar3;
     u8* result =
-        JKRAramToMainRam((u32)param_0->mPrev + pGylphCacheInfo->field_0x10 * iVar2, (u8*)(pCachePage + 1),
+        JKRAramToMainRam((uintptr_t)param_0->mPrev + pGylphCacheInfo->field_0x10 * iVar2, (u8*)(pCachePage + 1),
                          pGylphCacheInfo->field_0x10, EXPAND_SWITCH_UNKNOWN0, 0, NULL, 0xffffffff, NULL);
     JUT_ASSERT(623, result);
     GXInitTexObj(&pCachePage->mTexObj, pCachePage + 1, pGylphCacheInfo->mWidth, pGylphCacheInfo->mHeight,
diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/src/JSystem/JUtility/JUTDirectFile.cpp
index 29af10005..9ed84d7a5 100644
--- a/src/JSystem/JUtility/JUTDirectFile.cpp
+++ b/src/JSystem/JUtility/JUTDirectFile.cpp
@@ -37,7 +37,7 @@ JUTDirectFile::JUTDirectFile() {
     mLength = 0;
     mPos = 0;
     mToRead = 0;
-    mSectorStart = (u8*)ALIGN_NEXT((u32)mBuffer, 0x20);
+    mSectorStart = (u8*)ALIGN_NEXT((uintptr_t)mBuffer, 0x20);
     mIsOpen = false;
 }
 
diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp
index 9ecda6515..3f4b67f34 100644
--- a/src/JSystem/JUtility/JUTException.cpp
+++ b/src/JSystem/JUtility/JUTException.cpp
@@ -795,7 +795,7 @@ void JUTException::createFB() {
     u32 pixel_count = width * height;
     u32 size = pixel_count * 2;
 
-    void* begin = (void*)ALIGN_PREV((u32)end - size, 32);
+    void* begin = (void*)ALIGN_PREV((uintptr_t)end - size, 32);
     void* object = (void*)ALIGN_PREV((s32)begin - sizeof(JUTExternalFB), 32);
     new (object) JUTExternalFB(renderMode, GX_GM_1_7, begin, size);
 
diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/src/JSystem/JUtility/JUTProcBar.cpp
index 2b87167f1..d6b59e533 100644
--- a/src/JSystem/JUtility/JUTProcBar.cpp
+++ b/src/JSystem/JUtility/JUTProcBar.cpp
@@ -237,7 +237,7 @@ void JUTProcBar::drawProcessBar() {
 
 /* 802C9CE4-802C9D4C       .text addrToXPos__FPvi */
 int addrToXPos(void* param_0, int param_1) {
-    return param_1 * (((u32)param_0 - 0x80000000) / (float)JKRHeap::mMemorySize);
+    return param_1 * (((uintptr_t)param_0 - 0x80000000) / (float)JKRHeap::mMemorySize);
 }
 
 /* 802C9D4C-802C9DB4       .text byteToXLen__Fii */
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__mem.c b/src/PowerPC_EABI_Support/Runtime/Src/__mem.c
index 126e382f1..0a0ad1b81 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/__mem.c
+++ b/src/PowerPC_EABI_Support/Runtime/Src/__mem.c
@@ -5,7 +5,7 @@ SECTION_INIT void* memcpy(void* dst, const void* src, size_t n)
 {
 	const char* p;
 	char* q;
-	int rev = ((u32)src < (u32)dst);
+	int rev = ((uintptr_t)src < (uintptr_t)dst);
 
 	if (!rev) {
 
@@ -24,10 +24,10 @@ SECTION_INIT void __fill_mem(void* dst, int val, u32 n)
 	u32 v = (u8)val;
 	u32 i;
 
-	((u8*)dst) = ((u8*)dst) - 1;
+	dst = ((u8*)dst) - 1;
 
 	if (n >= 32) {
-		i = (~(u32)dst) & 3;
+		i = (~(uintptr_t)dst) & 3;
 
 		if (i) {
 			n -= i;
@@ -40,7 +40,7 @@ SECTION_INIT void __fill_mem(void* dst, int val, u32 n)
 		if (v)
 			v |= v << 24 | v << 16 | v << 8;
 
-		((u32*)dst) = ((u32*)(((u8*)dst) + 1)) - 1;
+		dst = ((u32*)(((u8*)dst) + 1)) - 1;
 
 		i = n >> 5;
 
@@ -63,7 +63,7 @@ SECTION_INIT void __fill_mem(void* dst, int val, u32 n)
 				*++(((u32*)dst)) = v;
 			while (--i);
 
-		((u8*)dst) = ((u8*)(((u32*)dst) + 1)) - 1;
+		dst = ((u8*)(((u32*)dst) + 1)) - 1;
 
 		n = n & 3;
 	}
diff --git a/src/SSystem/SComponent/c_bg_s.cpp b/src/SSystem/SComponent/c_bg_s.cpp
index 85628ea63..0b578822e 100644
--- a/src/SSystem/SComponent/c_bg_s.cpp
+++ b/src/SSystem/SComponent/c_bg_s.cpp
@@ -161,16 +161,16 @@ void* cBgS::ConvDzb(void* work) {
     JUT_ASSERT(0x219, ((int)pbgd->m_ti_tbl % 4) == 0);
 
     if (pbgd->m_v_tbl != NULL)
-        pbgd->m_v_tbl = (cBgD_Vtx_t*)((u32)pbgd->m_v_tbl + (u32)pbgd);
+        pbgd->m_v_tbl = (cBgD_Vtx_t*)((u32)pbgd->m_v_tbl + (uintptr_t)pbgd);
 
-    pbgd->m_t_tbl = (cBgD_Tri_t*)((u32)pbgd->m_t_tbl + (u32)pbgd);
-    pbgd->m_b_tbl = (cBgD_Blk_t*)((u32)pbgd->m_b_tbl + (u32)pbgd);
-    pbgd->m_tree_tbl = (cBgD_Tree_t*)((u32)pbgd->m_tree_tbl + (u32)pbgd);
-    pbgd->m_g_tbl = (cBgD_Grp_t*)((u32)pbgd->m_g_tbl + (u32)pbgd);
-    pbgd->m_ti_tbl = (cBgD_Ti_t*)((u32)pbgd->m_ti_tbl + (u32)pbgd);
+    pbgd->m_t_tbl = (cBgD_Tri_t*)((u32)pbgd->m_t_tbl + (uintptr_t)pbgd);
+    pbgd->m_b_tbl = (cBgD_Blk_t*)((u32)pbgd->m_b_tbl + (uintptr_t)pbgd);
+    pbgd->m_tree_tbl = (cBgD_Tree_t*)((u32)pbgd->m_tree_tbl + (uintptr_t)pbgd);
+    pbgd->m_g_tbl = (cBgD_Grp_t*)((u32)pbgd->m_g_tbl + (uintptr_t)pbgd);
+    pbgd->m_ti_tbl = (cBgD_Ti_t*)((u32)pbgd->m_ti_tbl + (uintptr_t)pbgd);
 
     for (s32 i = 0; i < pbgd->m_g_num; i++) {
-        pbgd->m_g_tbl[i].m_name = (char*)((u32)pbgd + (u32)pbgd->m_g_tbl[i].m_name);
+        pbgd->m_g_tbl[i].m_name = (char*)((u32)pbgd->m_g_tbl[i].m_name + (uintptr_t)pbgd);
     }
 
     return pbgd;
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index 449cafb3d..cc1efc9f0 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -1135,7 +1135,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
         return FALSE;
     }
 
-    a_this->mpMorf->getModel()->setUserArea((u32)a_this);
+    a_this->mpMorf->getModel()->setUserArea((uintptr_t)a_this);
     for (u16 i = 0; i < a_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         a_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
     }
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp
index 5066f112f..c6a175c79 100644
--- a/src/d/actor/d_a_am2.cpp
+++ b/src/d/actor/d_a_am2.cpp
@@ -1249,7 +1249,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
     if (!ret) { return FALSE; }
     if (!a_this->mpBrkAnm) { return FALSE; }
     
-    a_this->mpMorf->getModel()->setUserArea((u32)a_this);
+    a_this->mpMorf->getModel()->setUserArea((uintptr_t)a_this);
     for (u16 i = 0; i < a_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         a_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
     }
diff --git a/src/d/actor/d_a_amiprop.cpp b/src/d/actor/d_a_amiprop.cpp
index b7187e4ca..f09328e28 100644
--- a/src/d/actor/d_a_amiprop.cpp
+++ b/src/d/actor/d_a_amiprop.cpp
@@ -82,7 +82,7 @@ BOOL daAmiProp_c::CreateHeap() {
         return FALSE;
     }
 
-    mpModel->setUserArea(reinterpret_cast<u32>(this));
+    mpModel->setUserArea(reinterpret_cast<uintptr_t>(this));
     setMoveBGMtx();
 
     mpBgW = new dBgW();
diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp
index df878ad9d..a340b3b44 100644
--- a/src/d/actor/d_a_bb.cpp
+++ b/src/d/actor/d_a_bb.cpp
@@ -2720,7 +2720,7 @@ static cPhs_State daBb_Create(fopAc_ac_c* a_this) {
             }
         }
 
-        model->setUserArea(reinterpret_cast<u32>(i_this));
+        model->setUserArea(reinterpret_cast<uintptr_t>(i_this));
 
         if (i_this->unk_2DA != 0xFF) {
             i_this->ppd = dPath_GetRoomPath(i_this->unk_2DA, fopAcM_GetRoomNo(a_this));
diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp
index 7e1cbc02a..e087e88ba 100644
--- a/src/d/actor/d_a_bdk.cpp
+++ b/src/d/actor/d_a_bdk.cpp
@@ -3722,7 +3722,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
         }
     }
 
-    i_this->mpMorf->getModel()->setUserArea((u32)i_this);
+    i_this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
 
     i_this->mp2BC = mDoExt_J3DModel__create(i_this->mpMorf->getModel()->getModelData(), 0, 0x11020203);
     if (i_this->mp2BC == NULL) {
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp
index 816660796..97b7cfd63 100644
--- a/src/d/actor/d_a_bk.cpp
+++ b/src/d/actor/d_a_bk.cpp
@@ -5011,7 +5011,7 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) {
         fopAcM_SetMin(i_actor, -200.0f, -50.0f, -100.0f);
         fopAcM_SetMax(i_actor, 125.0f, 250.0f, 250.0f);
         fopAcM_SetMtx(i_actor, i_this->mpMorf->getModel()->getBaseTRMtx());
-        i_this->mpMorf->getModel()->setUserArea((u32)i_this);
+        i_this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
         i_this->initBt(162.5f, 125.0f);
         
         i_this->dr.m70C = 1;
diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp
index 9da7336b6..369f7ab4d 100644
--- a/src/d/actor/d_a_bmd.cpp
+++ b/src/d/actor/d_a_bmd.cpp
@@ -1765,7 +1765,7 @@ BOOL useHeapInit(bmd_class* i_this) {
     if (model == NULL) {
         return FALSE;
     }
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
     for (u16 uVar16 = 0; uVar16 < model->getModelData()->getJointNum(); uVar16++) {
         model->getModelData()->getJointNodePointer(uVar16)->setCallBack(core_nodeCallBack);
     }
diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp
index 51fa65ed3..b11da687d 100644
--- a/src/d/actor/d_a_bmdfoot.cpp
+++ b/src/d/actor/d_a_bmdfoot.cpp
@@ -704,7 +704,7 @@ static int useHeapInit(bmdfoot_class* i_this) {
     }
 #endif
 
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
     }
diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp
index fd3055306..38d5e537a 100644
--- a/src/d/actor/d_a_boko.cpp
+++ b/src/d/actor/d_a_boko.cpp
@@ -35,7 +35,7 @@ u32 daBoko_c::m_heap_size[] = {
     /* Type_PGANON_SWORD_e  */ 0x2000
 };
 
-char* daBoko_c::m_arc_name[] = {
+const char* daBoko_c::m_arc_name[] = {
     /* Type_BOKO_STICK_e    */ "Boko",
     /* Type_MACHETE_e       */ "Nata",
     /* Type_STALFOS_MACE_e  */ "Club",
diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp
index 74b6c835c..6a9bf3100 100644
--- a/src/d/actor/d_a_bpw.cpp
+++ b/src/d/actor/d_a_bpw.cpp
@@ -4265,7 +4265,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) {
     if ((i_this->mpMorf == NULL) || (i_this->mpMorf->getModel() == NULL)) {
         return FALSE;
     }
-    i_this->mpMorf->getModel()->setUserArea((u32)i_this);
+    i_this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
     for (u16 i = 0; i < i_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         i_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(body_nodeCallBack);
     }
@@ -4412,7 +4412,7 @@ static BOOL kantera_useHeapInit(fopAc_ac_c* a_this) {
     if ((i_this->mpMorf == NULL) || (i_this->mpMorf->getModel() == NULL)) {
         return FALSE;
     }
-    i_this->mpMorf->getModel()->setUserArea((u32)i_this);
+    i_this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
     for (u16 i = 0; i < i_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         i_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(kantera_nodeCallBack);
     }
diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp
index 13040c3dc..54d089d18 100644
--- a/src/d/actor/d_a_bst.cpp
+++ b/src/d/actor/d_a_bst.cpp
@@ -2844,7 +2844,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
                 i_this->m02B8->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBackHead);
             }
         }
-        i_this->m02B8->getModel()->setUserArea((u32)i_this);
+        i_this->m02B8->getModel()->setUserArea((uintptr_t)i_this);
     }
     i_this->m0388 = mDoExt_J3DModel__create(i_this->m02B8->getModel()->getModelData(), 0, 0x11020203);
     if (i_this->m0388 == NULL) {
diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp
index e94cea6aa..bf873e55f 100644
--- a/src/d/actor/d_a_btd.cpp
+++ b/src/d/actor/d_a_btd.cpp
@@ -2675,7 +2675,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
             i_this->mpPhase1Morf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
         }
     }
-    i_this->mpPhase1Morf->getModel()->setUserArea((u32)i_this);
+    i_this->mpPhase1Morf->getModel()->setUserArea((uintptr_t)i_this);
     pModel = i_this->mpPhase1Morf->getModel();
     i_this->btk = new mDoExt_btkAnm();
     JUT_ASSERT(DEMO_SELECT(5327, 5370), i_this->btk);
@@ -2719,7 +2719,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
             i_this->mpPhase2Morf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
         }
     }
-    i_this->mpPhase2Morf->getModel()->setUserArea((u32)i_this);
+    i_this->mpPhase2Morf->getModel()->setUserArea((uintptr_t)i_this);
     pModel = i_this->mpPhase2Morf->getModel();
     i_this->btkS = new mDoExt_btkAnm();
     JUT_ASSERT(DEMO_SELECT(5370, 5432), i_this->btkS);
diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp
index 6935f785f..a858202ce 100644
--- a/src/d/actor/d_a_canon.cpp
+++ b/src/d/actor/d_a_canon.cpp
@@ -509,7 +509,7 @@ BOOL daCanon_c::CreateHeap() {
 
     s8 cVar10 = modelData->getJointName()->getIndex("canon");
     modelData->getJointNodePointer(cVar10)->setCallBack(daCanon_nodeCallBack);
-    mpModel1->setUserArea((u32)this);
+    mpModel1->setUserArea((uintptr_t)this);
     mpModel2 = mDoExt_J3DModel__create(modelData2, 0, 0x11020203);
     if (mpModel2 == NULL) {
         return FALSE;
diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp
index a72b33bf1..ce714feea 100644
--- a/src/d/actor/d_a_cc.cpp
+++ b/src/d/actor/d_a_cc.cpp
@@ -2391,7 +2391,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    i_this->m2B4->getModel()->setUserArea((u32)i_this);
+    i_this->m2B4->getModel()->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < i_this->m2B4->getModel()->getModelData()->getJointNum(); i++) {
         i_this->m2B4->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp
index 7be614036..603aff0c7 100644
--- a/src/d/actor/d_a_dai_item.cpp
+++ b/src/d/actor/d_a_dai_item.cpp
@@ -360,7 +360,7 @@ void daStandItem_c::CreateInit() {
                     break;
                 }
             }
-            mpModel->setUserArea((u32)this);
+            mpModel->setUserArea((uintptr_t)this);
             mpModel->calc();
         }
         break;
@@ -371,7 +371,7 @@ void daStandItem_c::CreateInit() {
                 if (strcmp("tuboko_head", jointName) == 0 || strcmp("tuboko_base", jointName) == 0)
                     mpModel->getModelData()->getJointNodePointer(i)->setCallBack(DEMO_SELECT(nodeCallBack, daiItemNodeCallBack));
             }
-            mpModel->setUserArea((u32)this);
+            mpModel->setUserArea((uintptr_t)this);
             mpModel->calc();
         }
         break;
diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp
index e3b0cb6d0..8bca9362c 100644
--- a/src/d/actor/d_a_daiocta.cpp
+++ b/src/d/actor/d_a_daiocta.cpp
@@ -349,7 +349,7 @@ BOOL daDaiocta_c::createBodyHeap() {
         return FALSE;
     }
 
-    mpMorf->getModel()->setUserArea((u32) this);
+    mpMorf->getModel()->setUserArea((uintptr_t) this);
 
     return TRUE;
 }
@@ -1096,7 +1096,7 @@ void daDaiocta_c::modeDemo() {
 
     if (eventInfo.checkCommandDemoAccrpt()) {
         int staff_id = dComIfGp_evmng_getMyStaffId("Daiocta");
-        char* cut_name = dComIfGp_getPEvtManager()->getMyNowCutName(staff_id);
+        const char* cut_name = dComIfGp_getPEvtManager()->getMyNowCutName(staff_id);
 
         cXyz current_pos = current.pos;
         s16 o_angle;
@@ -1228,7 +1228,7 @@ void daDaiocta_c::modeDeleteInit() {
 void daDaiocta_c::modeDelete() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         int staff_id = dComIfGp_evmng_getMyStaffId("Daiocta");
-        char* cut_name = dComIfGp_getPEvtManager()->getMyNowCutName(staff_id);
+        const char* cut_name = dComIfGp_getPEvtManager()->getMyNowCutName(staff_id);
 
         if (strcmp(cut_name, "DEATH1") == 0) {
             current.pos.y = mWaterY;
diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp
index c0632b52a..8892bd9ab 100644
--- a/src/d/actor/d_a_daiocta_eye.cpp
+++ b/src/d/actor/d_a_daiocta_eye.cpp
@@ -124,7 +124,7 @@ BOOL daDaiocta_Eye_c::_createHeap() {
         return FALSE;
     }
     
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
 
     mpBrk = static_cast<J3DAnmTevRegKey *>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_DAMAGE_EYE_A1_e));
 
diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp
index 9cc776983..8891c2873 100644
--- a/src/d/actor/d_a_demo_item.cpp
+++ b/src/d/actor/d_a_demo_item.cpp
@@ -456,7 +456,7 @@ cPhs_State daDitem_c::create() {
     
     m_itemNo = daDitem_prm::getNo(this);
     
-    char* arcName = dItem_data::getArcname(m_itemNo);
+    const char* arcName = dItem_data::getArcname(m_itemNo);
     if (dItem_data::getBmdIdx(m_itemNo) == -1 || arcName == NULL) {
         m_itemNo = dItemNo_GREEN_RUPEE_e;
     }
diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp
index cc02fa748..1cc83ed57 100644
--- a/src/d/actor/d_a_dk.cpp
+++ b/src/d/actor/d_a_dk.cpp
@@ -335,7 +335,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
             a_this->field_0x2B8->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
         }
     }
-    a_this->field_0x2B8->getModel()->setUserArea((u32) a_this);
+    a_this->field_0x2B8->getModel()->setUserArea((uintptr_t) a_this);
 
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BDL_DK_KAMEN_e);
     a_this->mpModelKamen = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020002);
diff --git a/src/d/actor/d_a_door12.cpp b/src/d/actor/d_a_door12.cpp
index d06211e59..61b64727d 100644
--- a/src/d/actor/d_a_door12.cpp
+++ b/src/d/actor/d_a_door12.cpp
@@ -304,9 +304,9 @@ u8 daDoor12_c::getShapeType() {
 }
 
 /* 00000974-000009B0       .text getArcName__10daDoor12_cFv */
-char* daDoor12_c::getArcName() {
+const char* daDoor12_c::getArcName() {
     u8 uVar2 = getShapeType();
-    char* pcVar1;
+    const char* pcVar1;
 
     if (uVar2 >= 3) {
         pcVar1 = "door13";
diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp
index 639e8212f..5f61534f5 100644
--- a/src/d/actor/d_a_dr2.cpp
+++ b/src/d/actor/d_a_dr2.cpp
@@ -671,7 +671,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
     for (u16 i = 0; i < i_this->mpMorf1->getModel()->getModelData()->getJointNum(); i++) {
         i_this->mpMorf1->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
     }
-    i_this->mpMorf1->getModel()->setUserArea((u32)i_this);
+    i_this->mpMorf1->getModel()->setUserArea((uintptr_t)i_this);
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BDL_IWA00_e);
     JUT_ASSERT(DEMO_SELECT(1347, 1361), modelData != NULL);
diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp
index f907f8dba..7fe3f1ac9 100644
--- a/src/d/actor/d_a_fan.cpp
+++ b/src/d/actor/d_a_fan.cpp
@@ -76,7 +76,7 @@ BOOL daFan_c::CreateHeap() {
     mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (mModel == NULL)
         return FALSE;
-    mModel->setUserArea((u32)this);
+    mModel->setUserArea((uintptr_t)this);
 
     modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BDL_YAFLW00_e);
     JUT_ASSERT(0x17f, modelData != NULL);
diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp
index 55f8cc056..160e6bf5c 100644
--- a/src/d/actor/d_a_fm.cpp
+++ b/src/d/actor/d_a_fm.cpp
@@ -413,7 +413,7 @@ bool daFm_c::bodyCreateHeap() {
     if (mInvisibleModel.create(mpMorf->getModel()) == 0) {
         return false;
     }
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     return true;
 }
 
@@ -1753,7 +1753,7 @@ void daFm_c::modeGrabFootDemo() {
     } else {
         if(eventInfo.checkCommandDemoAccrpt()) {
             int staffIdx = dComIfGp_evmng_getMyStaffId("Fmaster");
-            char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx);
+            const char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx);
             if(strcmp(cutName, "Dummy") == 0 || strcmp(cutName, "WAIT") == 0) {
                 dComIfGp_evmng_cutEnd(staffIdx);
             }
@@ -2195,7 +2195,7 @@ void daFm_c::modePlayerStartDemo() {
     resetInvKine();
     if(dComIfGp_event_runCheck()) {
         int staffIdx = dComIfGp_evmng_getMyStaffId("Fmaster");
-        char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx);
+        const char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx);
 
         daPy_py_c* pLink = (daPy_py_c*)dComIfGp_getLinkPlayer();
         
diff --git a/src/d/actor/d_a_gy_ctrl.cpp b/src/d/actor/d_a_gy_ctrl.cpp
index 05eee6501..4b90d2590 100644
--- a/src/d/actor/d_a_gy_ctrl.cpp
+++ b/src/d/actor/d_a_gy_ctrl.cpp
@@ -270,7 +270,7 @@ void daGy_Ctrl_c::modeProc(daGy_Ctrl_c::Proc_e arg1, int arg2) {
     struct ModeData {
         /* 0x00 */ ModeFunc init;
         /* 0x0C */ ModeFunc exec;
-        /* 0x18 */ char* name;
+        /* 0x18 */ const char* name;
     }; // size = 0x1C
 
     static ModeData mode_tbl[] = {
diff --git a/src/d/actor/d_a_hmlif.cpp b/src/d/actor/d_a_hmlif.cpp
index 49fbdaa09..8d76f403a 100644
--- a/src/d/actor/d_a_hmlif.cpp
+++ b/src/d/actor/d_a_hmlif.cpp
@@ -12,7 +12,7 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-char* daHmlif_c::m_arcname[] = {"Hmlif", "Hyuf1", "Hyuf2"};
+const char* daHmlif_c::m_arcname[] = {"Hmlif", "Hyuf1", "Hyuf2"};
 const f32 daHmlif_c::m_speed[] = {
     1.6666666f,
     3.3333333f,
diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp
index 180984ed0..171ab1357 100644
--- a/src/d/actor/d_a_hookshot.cpp
+++ b/src/d/actor/d_a_hookshot.cpp
@@ -517,7 +517,7 @@ static dCcD_SrcCps l_at_cps_src = {
 cPhs_State daHookshot_c::create() {
     fopAcM_ct(this, daHookshot_c);
     
-    mShape.setUserArea(reinterpret_cast<u32>(this));
+    mShape.setUserArea(reinterpret_cast<uintptr_t>(this));
     mLinChk.ClrSttsRoofOff();
     procWait_init(FALSE);
     gravity = -5.0f;
diff --git a/src/d/actor/d_a_jbo.cpp b/src/d/actor/d_a_jbo.cpp
index 88a6df448..09e49ef84 100644
--- a/src/d/actor/d_a_jbo.cpp
+++ b/src/d/actor/d_a_jbo.cpp
@@ -178,7 +178,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
     if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
         return FALSE;
     }
-    a_this->mpMorf->getModel()->setUserArea(reinterpret_cast<u32>(a_this));
+    a_this->mpMorf->getModel()->setUserArea(reinterpret_cast<uintptr_t>(a_this));
     for (u16 i = 0; i < a_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         a_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
     }
diff --git a/src/d/actor/d_a_kamome.cpp b/src/d/actor/d_a_kamome.cpp
index 07aaaf494..ded2bf1b5 100644
--- a/src/d/actor/d_a_kamome.cpp
+++ b/src/d/actor/d_a_kamome.cpp
@@ -1436,7 +1436,7 @@ static BOOL createHeap(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    i_this->mpMorf->getModel()->setUserArea((u32)&i_this->actor);
+    i_this->mpMorf->getModel()->setUserArea((uintptr_t)&i_this->actor);
     return TRUE;
 }
 
diff --git a/src/d/actor/d_a_kantera.cpp b/src/d/actor/d_a_kantera.cpp
index 9113d7e14..3ee857a28 100644
--- a/src/d/actor/d_a_kantera.cpp
+++ b/src/d/actor/d_a_kantera.cpp
@@ -403,7 +403,7 @@ static cPhs_State daKantera_Create(fopAc_ac_c* a_this) {
 
         fopAcM_SetMtx(a_this, i_this->mpModel1->getBaseTRMtx());
         fopAcM_setCullSizeBox(a_this, -60.0f, -100.0f, -60.0f, 60.0f, 50.0f, 60.0f);
-        model->setUserArea((u32)a_this);
+        model->setUserArea((uintptr_t)a_this);
         i_this->m2B0 = (s16)cM_rndF(100.0f);
         i_this->m2B4 = (s16)cM_rndF(100.0f);
         dKy_plight_set(&i_this->mPlight);
diff --git a/src/d/actor/d_a_kb.cpp b/src/d/actor/d_a_kb.cpp
index 9a74475a4..5ad0ccff2 100644
--- a/src/d/actor/d_a_kb.cpp
+++ b/src/d/actor/d_a_kb.cpp
@@ -2424,7 +2424,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
     tex_anm_set(i_this, temp);
 
     i_this->mpMaterialTable = (J3DMaterialTable*)dComIfG_getObjectRes("Kb", kb_bmt_idx[temp]);
-    i_this->mpMorf->getModel()->setUserArea((u32)i_actor);
+    i_this->mpMorf->getModel()->setUserArea((uintptr_t)i_actor);
 
     for (u16 i = 0; i < i_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         i_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp
index 447f76e08..5e940df82 100644
--- a/src/d/actor/d_a_ki.cpp
+++ b/src/d/actor/d_a_ki.cpp
@@ -1274,7 +1274,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
     }
 
     tex_anm_set(i_this, 1);
-    i_this->mpMorf->getModel()->setUserArea((u32)i_this);
+    i_this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
     return TRUE;
 }
 
diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp
index c6a022648..f5872f9eb 100644
--- a/src/d/actor/d_a_leaflift.cpp
+++ b/src/d/actor/d_a_leaflift.cpp
@@ -87,7 +87,7 @@ BOOL daLlift_c::CreateHeap() {
         return FALSE;
     }
 
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
     mpBgW = new dBgW();
     if (mpBgW) {
         cBgD_t* pData = (cBgD_t *)dComIfG_getObjectRes(m_arcname, dRes_INDEX_OLIFT_DZB_OLIFT_e);
diff --git a/src/d/actor/d_a_lwood.cpp b/src/d/actor/d_a_lwood.cpp
index 39ca9b393..4f21fc5fb 100644
--- a/src/d/actor/d_a_lwood.cpp
+++ b/src/d/actor/d_a_lwood.cpp
@@ -26,7 +26,7 @@ BOOL daLwood_c::CreateHeap() {
     if (mModel == NULL)
         return FALSE;
 
-    mModel->setUserArea((u32)this);
+    mModel->setUserArea((uintptr_t)this);
     setMoveBGMtx();
     cBgD_t* bgp = (cBgD_t*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_LWOOD_DZB_ALWD_e);
     mpBgW = dBgW_NewSet(bgp, dBgW::MOVE_BG_e, &mtx);
diff --git a/src/d/actor/d_a_machine.cpp b/src/d/actor/d_a_machine.cpp
index 4bc7a15e9..817a798f4 100644
--- a/src/d/actor/d_a_machine.cpp
+++ b/src/d/actor/d_a_machine.cpp
@@ -155,7 +155,7 @@ void daMachine_c::CreateInit() {
 
     set_mtx();
 
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
 
     JUTNameTab* jointName = mpModel->getModelData()->getJointName();
     for(u16 i = 0; i < mpModel->getModelData()->getJointNum(); ++i) {
diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp
index 74218ba9a..706242432 100644
--- a/src/d/actor/d_a_mo2.cpp
+++ b/src/d/actor/d_a_mo2.cpp
@@ -4124,7 +4124,7 @@ static cPhs_State daMo2_Create(fopAc_ac_c* a_this) {
     fopAcM_SetMin(a_this, -200.0f, -50.0f, -100.0f);
     fopAcM_SetMax(a_this, 125.0f, 250.0f, 250.0f);
     fopAcM_SetMtx(a_this, i_this->mpMorf->getModel()->getBaseTRMtx());
-    i_this->mpMorf->getModel()->setUserArea((u32)a_this);
+    i_this->mpMorf->getModel()->setUserArea((uintptr_t)a_this);
     i_this->actor.initBt(162.5f, 125.0f);
     i_this->mDamageReaction.m70C = 1;
     i_this->mDamageReaction.mSpawnY = a_this->current.pos.y;
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index bcd3fdf6c..c52d1dada 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -212,7 +212,7 @@ cPhs_State daMozo_c::CreateInit() {
     }
     field_0x376 = cLib_minMaxLimit<u8>(temp, 0, 2);
 
-    mAnimMorf->getModel()->setUserArea((u32)this);
+    mAnimMorf->getModel()->setUserArea((uintptr_t)this);
     for (u16 i = 0; i < mdlData->getJointNum(); i++) {
         if (i == MOZ_JNT_ATAMA_J_e) {
             mdlData->getJointNodePointer(i)->setCallBack(daMozo_nodeCallBack);
diff --git a/src/d/actor/d_a_npc_ah.cpp b/src/d/actor/d_a_npc_ah.cpp
index eac3a2f68..440b2792f 100644
--- a/src/d/actor/d_a_npc_ah.cpp
+++ b/src/d/actor/d_a_npc_ah.cpp
@@ -252,7 +252,7 @@ BOOL daNpcAh_c::createHeap() {
             modelData->getJointTree().getJointNodePointer(jntIdx)->setCallBack(da_Npc_Ah_nodeCallBack);
         }
     }   
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     mAcchCir.SetWall(30.0f, 30.0f);
     mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this));
     return TRUE;
@@ -483,7 +483,7 @@ void daNpcAh_c::privateCut() {
         "MES_SET",
         "GET_ITEM",
     };
-    int staff_idx = dComIfGp_evmng_getMyStaffId(*l_npc_staff_id);
+    int staff_idx = dComIfGp_evmng_getMyStaffId(l_npc_staff_id[0]);
     if(staff_idx != -1){
         mActIdx = dComIfGp_evmng_getMyActIdx(staff_idx, cut_name_tbl, 2, 1, 0);
         if(mActIdx == -1){
@@ -646,7 +646,7 @@ void daNpcAh_c::chkMsg() {
 }
 
 /* 0000195C-00001964       .text setMessage__9daNpcAh_cFUl */
-void daNpcAh_c::setMessage(unsigned long msgNo) {
+void daNpcAh_c::setMessage(u32 msgNo) {
     mCurrMsgNo = msgNo;
 }
 
@@ -851,7 +851,7 @@ void daNpcAh_c::playAnm() {
 }
 
 /* 00002148-00002218       .text setAnm__9daNpcAh_cFUcif */
-void daNpcAh_c::setAnm(unsigned char bck_ix, int loopMode, float morf) {
+void daNpcAh_c::setAnm(u8 bck_ix, int loopMode, float morf) {
     f32 tempMorf = field_0x71C;
     if(tempMorf>=0.0f){
         morf = tempMorf;
diff --git a/src/d/actor/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp
index 78a98ae09..829983feb 100644
--- a/src/d/actor/d_a_npc_ba1.cpp
+++ b/src/d/actor/d_a_npc_ba1.cpp
@@ -2057,7 +2057,7 @@ BOOL daNpc_Ba1_c::CreateHeap() {
                 mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_Ba1);
             }
         }
-        mpMorf->getModel()->setUserArea((u32)this);
+        mpMorf->getModel()->setUserArea((uintptr_t)this);
         mAcchCir.SetWall(30.0f,50.0f);
         mObjAcch.Set(
             fopAcM_GetPosition_p(this),
diff --git a/src/d/actor/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp
index 0920c62ec..6d7cc4ce0 100644
--- a/src/d/actor/d_a_npc_bm1.cpp
+++ b/src/d/actor/d_a_npc_bm1.cpp
@@ -852,7 +852,7 @@ void daNpc_Bm1_c::setMtx(bool i_param_1) {
 
 /* 000017A8-000017F8       .text anmNum_toResID__11daNpc_Bm1_cFi */
 char* daNpc_Bm1_c::anmNum_toResID(int i_anmNum) {
-    static char* a_BCKName_TBL[0x16] = {"bm_dwait",    "bm_fly01",     "bm_lookup",  "bm_orooro",   "bm_wait01", "bm_wait02",  "bm_talk01", "bm_nadame",
+    static const char* a_BCKName_TBL[0x16] = {"bm_dwait",    "bm_fly01",     "bm_lookup",  "bm_orooro",   "bm_wait01", "bm_wait02",  "bm_talk01", "bm_nadame",
                                         "bm_gliding",  "bm_endurance", "bm_flyaway", "bm_flyaway2", "bm_talk02", "bm_landing", "bm_walk",   "bm02_wait01",
                                         "bm02_talk01", "bm02_talk02",  "bm_talk03",  "bm_turn",     "bm_walk02", "bm_check"};
     strcpy(l_BCKName, a_BCKName_TBL[i_anmNum]);
@@ -861,7 +861,7 @@ char* daNpc_Bm1_c::anmNum_toResID(int i_anmNum) {
 
 /* 000017F8-00001848       .text headAnmNum_toResID__11daNpc_Bm1_cFi */
 char* daNpc_Bm1_c::headAnmNum_toResID(int i_anmNum) {
-    static char* a_BCKName_TBL[0x16] = {"bmhead01_dwait",   "bmhead01_fly01",    "bmhead01_lookup", "bmhead01_orooro",  "bmhead01_wait01",
+    static const char* a_BCKName_TBL[0x16] = {"bmhead01_dwait",   "bmhead01_fly01",    "bmhead01_lookup", "bmhead01_orooro",  "bmhead01_wait01",
                                         "bmhead01_wait02",  "bmhead01_talk01",   "bmhead01_nadame", "bmhead01_gliding", "bmhead01_endurance",
                                         "bmhead01_flyaway", "bmhead01_flyaway2", "bmhead01_talk02", "bmhead01_landing", "bmhead01_walk",
                                         "bmhead01_wait01",  "bmhead01_wait01",   "bmhead01_wait01", "bmhead01_talk03",  "bmhead01_turn",
@@ -872,7 +872,7 @@ char* daNpc_Bm1_c::headAnmNum_toResID(int i_anmNum) {
 
 /* 00001848-00001898       .text wingAnmNum_toResID__11daNpc_Bm1_cFi */
 char* daNpc_Bm1_c::wingAnmNum_toResID(int i_anmNum) {
-    static char* a_BCKName_TBL[0x16] = {"bmwing_dwait", "bmwing_fly01",  "bmwing_lookup",  "bmwing_orooro",    "bmarm_wait01",   "bmarm_wait02",
+    static const char* a_BCKName_TBL[0x16] = {"bmwing_dwait", "bmwing_fly01",  "bmwing_lookup",  "bmwing_orooro",    "bmarm_wait01",   "bmarm_wait02",
                                         "bmarm_talk01", "bmarm_nadame",  "bmwing_gliding", "bmwing_endurance", "bmarm_flyaway",  "bmwing_flyaway2",
                                         "bmarm_talk02", "bmarm_landing", "bmarm_walk",     "bmarm02_wait01",   "bmarm02_talk01", "bmarm02_talk02",
                                         "bmarm_talk03", "bmarm_turn",    "bmarm_walk02",   "bmarm_check"};
@@ -882,8 +882,8 @@ char* daNpc_Bm1_c::wingAnmNum_toResID(int i_anmNum) {
 
 /* 00001898-00001948       .text btpNum_toResID__11daNpc_Bm1_cFi */
 char* daNpc_Bm1_c::btpNum_toResID(int i_param_1) {
-    static char* a_BTPName_TBL[] = {"bmhead01"};
-    static char* a_BTPName_TBL_2[] = {
+    static const char* a_BTPName_TBL[] = {"bmhead01"};
+    static const char* a_BTPName_TBL_2[] = {
         "bmhead01",
         "bmhead01",
         "bmhead01",
@@ -4143,7 +4143,7 @@ J3DModelData* daNpc_Bm1_c::create_Anm() {
 
 /* 00008710-00008878       .text create_hed_Anm__11daNpc_Bm1_cFv */
 J3DModelData* daNpc_Bm1_c::create_hed_Anm() {
-    static char* a_headBDLName_TBL[] = {
+    static const char* a_headBDLName_TBL[] = {
         "bmhead01.bdl",
         "bmhead01.bdl",
         "bmhead01.bdl",
@@ -4333,19 +4333,19 @@ BOOL daNpc_Bm1_c::CreateHeap() {
                 mpWingMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_Wng);
             }
         }
-        mpWingMorf->getModel()->setUserArea((u32)this);
+        mpWingMorf->getModel()->setUserArea((uintptr_t)this);
         for (u16 i = 0; i < arm_anmdata->getJointNum(); i++) {
             if ((i == m_armL1_jnt_num) || (i == m_armL2_jnt_num) || (i == m_armR1_jnt_num) || (i == m_armR2_jnt_num)) {
                 mpArmMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_Arm);
             }
         }
-        mpArmMorf->getModel()->setUserArea((u32)this);
+        mpArmMorf->getModel()->setUserArea((uintptr_t)this);
         for (u16 i = 0; i < anm_model->getJointNum(); i++) {
             if ((i == m_hed_jnt_num) || (i == m_nec_jnt_num) || (i == m_bbone_jnt_num) || (i == m_arm_L_jnt_num) || i == m_arm_R_jnt_num) {
                 mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_Bm1);
             }
         }
-        mpMorf->getModel()->setUserArea((u32)this);
+        mpMorf->getModel()->setUserArea((uintptr_t)this);
         mAcchCir.SetWall(30.0f, 50.0f);
         mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), NULL, NULL);
 
diff --git a/src/d/actor/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp
index 4ac321dfb..a800bdfe4 100644
--- a/src/d/actor/d_a_npc_bmsw.cpp
+++ b/src/d/actor/d_a_npc_bmsw.cpp
@@ -1253,8 +1253,8 @@ BOOL daNpc_Bmsw_c::CreateHeap() {
             armModelData->getJointNodePointer(i)->setCallBack(nodeCallBackArm);
         }
     }
-    mpMorf->getModel()->setUserArea((u32) this);
-    mpMorfHand->getModel()->setUserArea((u32) this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
+    mpMorfHand->getModel()->setUserArea((uintptr_t)this);
 
     field_0x930[0] = &mSwMail0;
     field_0x930[1] = &mSwMail1;
diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp
index 528112c1a..c4847f91a 100644
--- a/src/d/actor/d_a_npc_bs1.cpp
+++ b/src/d/actor/d_a_npc_bs1.cpp
@@ -2222,7 +2222,7 @@ BOOL daNpc_Bs1_c::CreateHeap() {
             mpMorf->getModel()->getModelData()->getJointNodePointer(jntNo)->setCallBack(nodeCallBack_Bs);
         }
     }
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     mAcchCir.SetWall(30.0f, 0.0f);
     mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this),  this, 1, &mAcchCir, fopAcM_GetSpeed_p(this));
     J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bs", dRes_INDEX_BS_BRK_SHOP_CURSOR01_e);
diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp
index 0dd94fa86..1ebd48f57 100644
--- a/src/d/actor/d_a_npc_btsw.cpp
+++ b/src/d/actor/d_a_npc_btsw.cpp
@@ -1042,7 +1042,7 @@ BOOL daNpc_Btsw_c::CreateHeap() {
         }
     }
 
-    mpMorf->getModel()->setUserArea((u32) this);
+    mpMorf->getModel()->setUserArea((uintptr_t) this);
 
     field_0x920[0] = &mSwMail0;
     field_0x920[1] = &mSwMail1;
diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp
index d7765977e..afd36fc3d 100644
--- a/src/d/actor/d_a_npc_btsw2.cpp
+++ b/src/d/actor/d_a_npc_btsw2.cpp
@@ -391,7 +391,7 @@ BOOL daNpc_Btsw2_c::CreateHeap() {
     modelData = mpMorf->getModel()->getModelData();
     modelData->getJointNodePointer(m_jnt.getHeadJntNum())->setCallBack(nodeCallBack);
     modelData->getJointNodePointer(m_jnt.getBackboneJntNum())->setCallBack(nodeCallBack);
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     mAcchCir.SetWall(30.0f, 0.0f);
     mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this));
     
diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp
index 018f9ba9e..6310fd54d 100644
--- a/src/d/actor/d_a_npc_cb1.cpp
+++ b/src/d/actor/d_a_npc_cb1.cpp
@@ -487,7 +487,7 @@ BOOL daNpc_Cb1_c::createHeap() {
 
     modelData->getJointNodePointer(m_backbone_jnt_num)->setCallBack(nodeCallBack);
 
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
 
     mpFaceModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BDL_CB_FACE_e), 0x00080000, 0x11000022);
     if(mpFaceModel == NULL) {
@@ -506,7 +506,7 @@ BOOL daNpc_Cb1_c::createHeap() {
         JUT_ASSERT(DEMO_SELECT(983, 982), m_nut_jnt_num >= 0);
         modelData->getJointNodePointer(m_nut_jnt_num)->setCallBack(nutNodeCallBack);
 
-        mpStickModel->setUserArea((u32)this);
+        mpStickModel->setUserArea((uintptr_t)this);
 
         modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BDL_CB_CELLO_e);
         JUT_ASSERT(DEMO_SELECT(990, 989), modelData != NULL);
@@ -526,7 +526,7 @@ BOOL daNpc_Cb1_c::createHeap() {
     m_center_jnt_num = modelData->getJointName()->getIndex("center");
     modelData->getJointNodePointer(m_center_jnt_num)->setCallBack(ppNodeCallBack);
 
-    mpPropellerModel->setUserArea((u32)this);
+    mpPropellerModel->setUserArea((uintptr_t)this);
 
     if(!mPropellerBckAnim.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BCK_M_OPEN_e), FALSE, J3DFrameCtrl::EMode_NONE)) {
         return FALSE;
diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp
index ce76a38dd..519c7f344 100644
--- a/src/d/actor/d_a_npc_hi1.cpp
+++ b/src/d/actor/d_a_npc_hi1.cpp
@@ -981,7 +981,7 @@ BOOL daNpc_Hi1_c::bodyCreateHeap() {
 
     mpMorf->getModel()->getModelData()->getJointNodePointer(m_hed_jnt_num & 0xffff)->setCallBack(nodeCB_Head);
     mpMorf->getModel()->getModelData()->getJointNodePointer(m_bbone_jnt_num & 0xffff)->setCallBack(nodeCB_BackBone);
-    mpMorf->getModel()->setUserArea((u32)(this));
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
 
     return TRUE;
 }
diff --git a/src/d/actor/d_a_npc_ho.cpp b/src/d/actor/d_a_npc_ho.cpp
index 610bd0728..dd25aaf0b 100644
--- a/src/d/actor/d_a_npc_ho.cpp
+++ b/src/d/actor/d_a_npc_ho.cpp
@@ -954,7 +954,7 @@ BOOL daNpc_Ho_c::CreateHeap() {
         }
     }
 
-    mpMorf->getModel()->setUserArea((u32)(this));
+    mpMorf->getModel()->setUserArea((uintptr_t)(this));
 
     mAcchCir.SetWall(30.0f, 30.0f);
     mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this),  this, 1, &mAcchCir, fopAcM_GetSpeed_p(this));
diff --git a/src/d/actor/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp
index 55f7690ee..4d526ba79 100644
--- a/src/d/actor/d_a_npc_hr.cpp
+++ b/src/d/actor/d_a_npc_hr.cpp
@@ -2210,12 +2210,12 @@ BOOL daNpc_Hr_c::CreateHeap() {
         }
     }
 
-    mpHrMorf->getModel()->setUserArea((u32)this);
+    mpHrMorf->getModel()->setUserArea((uintptr_t)this);
 
     for(u16 i = 0; i < antModelData->getJointNum(); i++) {
         mpAntennaMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_Ht_ant);
     }
-    mpAntennaMorf->getModel()->setUserArea((u32)this);
+    mpAntennaMorf->getModel()->setUserArea((uintptr_t)this);
     
     return TRUE;
 }
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index 72c710323..3a7bdd199 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -4653,7 +4653,7 @@ BOOL daNpc_Ji1_c::CreateHeap() {
         }
     }
 
-    mpOrcaMorf->getModel()->setUserArea((u32)this);
+    mpOrcaMorf->getModel()->setUserArea((uintptr_t)this);
 
     mAcchCir.SetWall(60.0f, 50.0f);
     mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this));
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index 2584ee3d9..62a90ee74 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -67,7 +67,7 @@ public:
     /* 0x24 */ daNpc_kam_HIO1_c mHio1;
 };  // Size: 0x50
 
-static char* l_staff_name = "HyoiKam";
+static const char* l_staff_name = "HyoiKam";
 static daNpc_kam_HIO_c l_HIO;
 static int l_hio_counter;
 static fpc_ProcID l_msgId;
@@ -299,7 +299,7 @@ BOOL daNpc_kam_c::createHeap() {
     m_jnt_body = modelData->getJointName()->getIndex("j_ka_spin1");
     JUT_ASSERT(DEMO_SELECT(782, 783), m_jnt_body >= 0);
     
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     
     return TRUE;
 }
diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp
index 02815fca2..dae127e77 100644
--- a/src/d/actor/d_a_npc_km1.cpp
+++ b/src/d/actor/d_a_npc_km1.cpp
@@ -764,7 +764,7 @@ BOOL daNpc_Km1_c::CreateHeap() {
                             mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_Km);
                         }
                     }
-                    mpMorf->getModel()->setUserArea((u32)this);
+                    mpMorf->getModel()->setUserArea((uintptr_t)this);
                     mAcchCir.SetWall(30.0f,60.0f);
                     mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this));
                     return TRUE;
diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp
index 4d3274e23..0a0dc2966 100644
--- a/src/d/actor/d_a_npc_ls1.cpp
+++ b/src/d/actor/d_a_npc_ls1.cpp
@@ -2542,7 +2542,7 @@ BOOL daNpc_Ls1_c::bodyCreateHeap() {
     mpMorf->getModel()->getModelData()->getJointNodePointer(m_bbone_jnt_num)->setCallBack(nodeCB_BackBone);
     mpMorf->getModel()->getModelData()->getJointNodePointer(m_hnd_L_jnt_num)->setCallBack(nodeCB_Hand_L);
     mpMorf->getModel()->getModelData()->getJointNodePointer(m_hnd_R_jnt_num)->setCallBack(nodeCB_Hand_R);
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     
     return TRUE;
 }
@@ -2566,7 +2566,7 @@ BOOL daNpc_Ls1_c::handCreateHeap() {
 
     mpLsHandModel->getModelData()->getJointNodePointer(m_lsHnd_L_jnt_num)->setCallBack(Ls_hand_nodeCB_Hand_L);
     mpLsHandModel->getModelData()->getJointNodePointer(m_lsHnd_R_jnt_num)->setCallBack(Ls_hand_nodeCB_Hand_R);
-    mpLsHandModel->setUserArea((u32)this);
+    mpLsHandModel->setUserArea((uintptr_t)this);
     return TRUE;
 }
 
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index 32a0ea7fb..7e749c505 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -207,9 +207,9 @@ static daNpc_Md_HIO_c l_HIO;
 static cXyz l_ms_light_local_vec(0.0f, 0.0f, -10000.0f);
 static cXyz l_ms_light_local_start(5.0f, 7.0f, 0.0f);
 
-static char* l_arc_name = "Md";
-static char* l_arc_name_ship = "Md_ship";
-static char* l_staff_name = "Md1";
+static const char* l_arc_name = "Md";
+static const char* l_arc_name_ship = "Md_ship";
+static const char* l_staff_name = "Md1";
 
 static char* event_name_tbl[] = {
     "Md_ItemGet",
@@ -913,7 +913,7 @@ static BOOL hairNodeCallBack(J3DNode* node, int calcTiming) {
     return TRUE;
 }
 
-static char* hairName[] = {
+static const char* hairName[] = {
     "hair1",
     "hair2",
     "hair3",
@@ -986,7 +986,7 @@ BOOL daNpc_Md_c::createHeap() {
         }
     }
 
-    getModel()->setUserArea((u32)this);
+    getModel()->setUserArea((uintptr_t)this);
 
     modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "mdarm.bdl");
     JUT_ASSERT(DEMO_SELECT(2016, 2051), modelData != NULL);
@@ -1020,7 +1020,7 @@ BOOL daNpc_Md_c::createHeap() {
     modelData->getJointNodePointer(m_armRloc_jnt_num)->setCallBack(armNodeCallBack);
     modelData->getJointNodePointer(m_armLloc_jnt_num)->setCallBack(armNodeCallBack);
 
-    mpArmMorf->getModel()->setUserArea((u32)this);
+    mpArmMorf->getModel()->setUserArea((uintptr_t)this);
 
     if (!isTypeShipRide()) {
         modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "mdwing.bdl");
@@ -1060,7 +1060,7 @@ BOOL daNpc_Md_c::createHeap() {
         modelData->getJointNodePointer(m_wingRloc_jnt_num)->setCallBack(armNodeCallBack);
         modelData->getJointNodePointer(m_wingLloc_jnt_num)->setCallBack(armNodeCallBack);
 
-        mpWingMorf->getModel()->setUserArea((u32)this);
+        mpWingMorf->getModel()->setUserArea((uintptr_t)this);
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "md_harp.bdl");
diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp
index fc451b27a..caa1e44f2 100644
--- a/src/d/actor/d_a_npc_mk.cpp
+++ b/src/d/actor/d_a_npc_mk.cpp
@@ -1715,7 +1715,7 @@ BOOL daNpc_Mk_c::CreateHeap() {
         }
     }
 
-    mpMorf->getModel()->setUserArea((u32)(this));
+    mpMorf->getModel()->setUserArea((uintptr_t)(this));
 
     mAcchCir.SetWall(60.0f, 30.0f);
     mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this));
diff --git a/src/d/actor/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp
index c9ddbf412..cd5338a0a 100644
--- a/src/d/actor/d_a_npc_mt.cpp
+++ b/src/d/actor/d_a_npc_mt.cpp
@@ -321,7 +321,7 @@ static u16 l_figure_comp[] = {
     dSv_event_flag_c::UNK_80FF,
 };
 
-static char* l_figure_room_name[] = {
+static const char* l_figure_room_name[] = {
     "Pfigure",
     "figureA",
     "figureB",
@@ -467,7 +467,7 @@ BOOL daNpcMt_c::createHeap() {
         }
     }
 
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     mAcchCir.SetWall(30.0f, 30.0f);
     mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this));
     return TRUE;
diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp
index b914c6e48..88fdc1dc4 100644
--- a/src/d/actor/d_a_npc_nz.cpp
+++ b/src/d/actor/d_a_npc_nz.cpp
@@ -183,7 +183,7 @@ BOOL daNpc_Nz_c::_createHeap() {
         return false;
     }
 
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
 
     m_jnt.setHeadJntNum(modelData->getJointName()->getIndex("head"));
     JUT_ASSERT(0xDA, m_jnt.getHeadJntNum() >= 0);
diff --git a/src/d/actor/d_a_npc_nz_cut.inc b/src/d/actor/d_a_npc_nz_cut.inc
index 9255b2f58..e187aec0d 100644
--- a/src/d/actor/d_a_npc_nz_cut.inc
+++ b/src/d/actor/d_a_npc_nz_cut.inc
@@ -157,7 +157,7 @@ void daNpc_Nz_c::cutProc() {
         }
     };
 
-    static char* a_demo_name_tbl[] = {
+    static const char* a_demo_name_tbl[] = {
         "DEFAULT_NPC_NZ_ESA",
     };
 
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp
index a0b8899da..32d6709cf 100644
--- a/src/d/actor/d_a_npc_os.cpp
+++ b/src/d/actor/d_a_npc_os.cpp
@@ -325,7 +325,7 @@ BOOL daNpc_Os_c::createHeap() {
         modelData->getJointNodePointer(mTuno3JointIdx)->setCallBack(&tunoNodeCallBack);
     }
 
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
 
     u8 anm;
     if(wakeupCheck()) {
diff --git a/src/d/actor/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp
index 41321f53d..544ed91b1 100644
--- a/src/d/actor/d_a_npc_p1.cpp
+++ b/src/d/actor/d_a_npc_p1.cpp
@@ -1159,7 +1159,7 @@ BOOL daNpc_P1_c::CreateHeap() {
             model_data_p->getJointNodePointer(i)->setCallBack(nodeCallBack1);
         }
     }
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     mAcchCir.SetWall(30.0f, 0.0f);
     mObjAcch.Set(
         fopAcM_GetPosition_p(this),
diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp
index 150f2416a..96e9b7d6e 100644
--- a/src/d/actor/d_a_npc_people.cpp
+++ b/src/d/actor/d_a_npc_people.cpp
@@ -4404,7 +4404,7 @@ BOOL daNpcPeople_c::createHeap() {
         }
     }
 
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
 
     mAcchCir.SetWall(30.0f, 30.0f);
     mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this),  this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this));
diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp
index 007a7d74e..82bee639a 100644
--- a/src/d/actor/d_a_npc_photo.cpp
+++ b/src/d/actor/d_a_npc_photo.cpp
@@ -684,7 +684,7 @@ BOOL daNpcPhoto_c::createHeap() {
             modelData->getJointNodePointer(i)->setCallBack(daNpc_Photo_nodeCallBack);
         }
     }
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     mAcchCir.SetWall(30.0f, 30.0f);
     mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this));
     return TRUE;
diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp
index c79b4d1c6..37dbf4634 100644
--- a/src/d/actor/d_a_npc_roten.cpp
+++ b/src/d/actor/d_a_npc_roten.cpp
@@ -1710,7 +1710,7 @@ BOOL daNpcRoten_c::createHeap() {
         }
     }
 
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     mAcchCir.SetWall(30.0f, 30.0f);
     mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this),  this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this));
 
diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp
index 2c883a2ac..a4081f034 100644
--- a/src/d/actor/d_a_npc_rsh1.cpp
+++ b/src/d/actor/d_a_npc_rsh1.cpp
@@ -363,8 +363,8 @@ void daNpc_Rsh1_c::playTexPatternAnm() {
 /* 00000BDC-00000C64       .text setAnm__12daNpc_Rsh1_cFSc */
 void daNpc_Rsh1_c::setAnm(s8 i_index) {
     static int play_mode_tbl[7] = {
-        2, 2, 2, 2,
-        2, 2, 2
+        J3DFrameCtrl::EMode_LOOP, J3DFrameCtrl::EMode_LOOP, J3DFrameCtrl::EMode_LOOP, J3DFrameCtrl::EMode_LOOP,
+        J3DFrameCtrl::EMode_LOOP, J3DFrameCtrl::EMode_LOOP, J3DFrameCtrl::EMode_LOOP
     };
 
     static float morf_frame_tbl[7] = {
@@ -1875,7 +1875,7 @@ BOOL daNpc_Rsh1_c::CreateHeap() {
         }
     }
 
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     mAcchCir.SetWall(30.0f, 0.0f);
     cXyz* speed_p = &speed;
     cXyz* old_pos_p = &old.pos;
diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp
index c6346ef34..1cb94f85a 100644
--- a/src/d/actor/d_a_npc_tc.cpp
+++ b/src/d/actor/d_a_npc_tc.cpp
@@ -1891,7 +1891,7 @@ BOOL daNpc_Tc_c::_createHeap() {
     JUT_ASSERT(DEMO_SELECT(0xA38, 0xA42), m_jnt.getBackboneJntNum() >= 0);
     modelData->getJointNodePointer(TC_JNT_HEAD_e)->setCallBack(nodeCallBack);
     modelData->getJointNodePointer(TC_JNT_BACKBONE_e)->setCallBack(nodeCallBack);
-    mpMorf->getModel()->setUserArea(reinterpret_cast<u32>(this));
+    mpMorf->getModel()->setUserArea(reinterpret_cast<uintptr_t>(this));
 
     mTexPatternNum = 0;
     if (!initTexPatternAnm(false)) {
diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp
index 864f93e42..fddd3c60d 100644
--- a/src/d/actor/d_a_npc_tt.cpp
+++ b/src/d/actor/d_a_npc_tt.cpp
@@ -937,7 +937,7 @@ BOOL daNpc_Tt_c::CreateHeap() {
         }
     }
 
-    mpMorf->getModel()->setUserArea((u32)(this));
+    mpMorf->getModel()->setUserArea((uintptr_t)(this));
 
     mAcchCir.SetWall(30.0f, 0.0f);
     mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this));
diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp
index d5728d30a..15b2585bd 100644
--- a/src/d/actor/d_a_npc_zl1.cpp
+++ b/src/d/actor/d_a_npc_zl1.cpp
@@ -2978,7 +2978,7 @@ BOOL daNpc_Zl1_c::bodyCreateHeap() {
 
     mpMorf->getModel()->getModelData()->getJointNodePointer(m_hed_jnt_num & 0xffff)->setCallBack(nodeCB_Head);
     mpMorf->getModel()->getModelData()->getJointNodePointer(m_bbone_jnt_num & 0xffff)->setCallBack(nodeCB_BackBone);
-    mpMorf->getModel()->setUserArea((u32)(this));
+    mpMorf->getModel()->setUserArea((uintptr_t)(this));
     return TRUE;
 }
 
diff --git a/src/d/actor/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp
index 33507468a..5b12273ea 100644
--- a/src/d/actor/d_a_obj_canon.cpp
+++ b/src/d/actor/d_a_obj_canon.cpp
@@ -134,7 +134,7 @@ BOOL daObj_Canon_c::_createHeap() {
     }
 #endif
 
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
     modelData->getJointNodePointer(WALLBOM_JNT_SHOT_e)->setCallBack(nodeControl_CB);
 
     return TRUE;
diff --git a/src/d/actor/d_a_obj_hami3.cpp b/src/d/actor/d_a_obj_hami3.cpp
index 1f31d9e3a..28a71ac6b 100644
--- a/src/d/actor/d_a_obj_hami3.cpp
+++ b/src/d/actor/d_a_obj_hami3.cpp
@@ -51,7 +51,7 @@ BOOL daObjHami3::Act_c::CreateHeap() {
                 break;
             }
         }
-        field_0x2D4->setUserArea((u32)this);
+        field_0x2D4->setUserArea((uintptr_t)this);
     } else {
         return FALSE;
     }
diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp
index 3d0feb51d..bbdb193d7 100644
--- a/src/d/actor/d_a_obj_ikada.cpp
+++ b/src/d/actor/d_a_obj_ikada.cpp
@@ -1499,7 +1499,7 @@ BOOL daObj_Ikada_c::_createHeap() {
         }
     }
 
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
 
     if (mType == 4) {
         for (u16 i = 0; i < modelData->getJointNum(); i++) {
diff --git a/src/d/actor/d_a_obj_jump.cpp b/src/d/actor/d_a_obj_jump.cpp
index c0ee1b7e6..e4265da6e 100644
--- a/src/d/actor/d_a_obj_jump.cpp
+++ b/src/d/actor/d_a_obj_jump.cpp
@@ -82,7 +82,7 @@ BOOL daObjJump::Act_c::CreateHeap() {
     mModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000022);
     if (mModel != NULL) {
         model_data->getJointTree().getJointNodePointer(attr().springJntNum)->setCallBack(jnodeCB_lower);
-        mModel->setUserArea((u32)this);
+        mModel->setUserArea((uintptr_t)this);
     }
     return mModel != NULL;
 }
diff --git a/src/d/actor/d_a_obj_lpalm.cpp b/src/d/actor/d_a_obj_lpalm.cpp
index dd1a089c5..7ec34577c 100644
--- a/src/d/actor/d_a_obj_lpalm.cpp
+++ b/src/d/actor/d_a_obj_lpalm.cpp
@@ -50,7 +50,7 @@ BOOL daObjLpalm_c::CreateHeap() {
     if (mModel == NULL)
         return false;
 
-    mModel->setUserArea((u32)this);
+    mModel->setUserArea((uintptr_t)this);
     mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_OYASHI_DZB_OYASHI_e), dBgW::MOVE_BG_e, &mModel->getBaseTRMtx());
     if (mpBgW == NULL)
         return false;
diff --git a/src/d/actor/d_a_obj_mkie.cpp b/src/d/actor/d_a_obj_mkie.cpp
index 0e389ce12..6909699fb 100644
--- a/src/d/actor/d_a_obj_mkie.cpp
+++ b/src/d/actor/d_a_obj_mkie.cpp
@@ -267,7 +267,7 @@ BOOL daObjMkie::Act_c::chk_light() {
 
 /* 00000DF4-00000E84       .text eff_break__Q29daObjMkie5Act_cFv */
 void daObjMkie::Act_c::eff_break() {
-    _GXColor envColor;
+    GXColor envColor;
     envColor.r = (u8)tevStr.mColorC0.r;
     envColor.g = (u8)tevStr.mColorC0.g;
     envColor.b = (u8)tevStr.mColorC0.b;
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index 1f7c4c713..2818a3c80 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -196,7 +196,7 @@ BOOL daObjMknjD::Act_c::CreateHeap() {
             }
         }
 
-        mMainMdl->setUserArea(reinterpret_cast<u32>(this));
+        mMainMdl->setUserArea(reinterpret_cast<uintptr_t>(this));
 
         int curTblIdx = 0;
         nameTable = mBreakMdl->getModelData()->getJointName();
@@ -214,7 +214,7 @@ BOOL daObjMknjD::Act_c::CreateHeap() {
             }
         }
 
-        mBreakMdl->setUserArea(reinterpret_cast<u32>(this));
+        mBreakMdl->setUserArea(reinterpret_cast<uintptr_t>(this));
         mMainMdlAlpha = 0xFF;
 
         return TRUE;
diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp
index 8921aafea..7bb72621a 100644
--- a/src/d/actor/d_a_obj_mtest.cpp
+++ b/src/d/actor/d_a_obj_mtest.cpp
@@ -12,7 +12,7 @@
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
 
-char* daObjMtest::Act_c::M_arcname[Type_Max] = {
+const char* daObjMtest::Act_c::M_arcname[Type_Max] = {
     "Mtest",
     "Mtest",
     "Mtest",
diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp
index fbd532a6b..e84f2374d 100644
--- a/src/d/actor/d_a_obj_paper.cpp
+++ b/src/d/actor/d_a_obj_paper.cpp
@@ -24,7 +24,7 @@ namespace daObjPaper {
 
 namespace {
     struct Attr_c {
-        /* 0x00 */ char* mResName;
+        /* 0x00 */ const char* mResName;
         /* 0x04 */ s32 mHeapSize;
         /* 0x06 */ s16 mModelId;
         /* 0x08 */ s16 mEyeOffset;
diff --git a/src/d/actor/d_a_obj_pfall.cpp b/src/d/actor/d_a_obj_pfall.cpp
index 66daf71fa..da564a4a5 100644
--- a/src/d/actor/d_a_obj_pfall.cpp
+++ b/src/d/actor/d_a_obj_pfall.cpp
@@ -143,7 +143,7 @@ BOOL daObj_Pfall_c::CreateHeap() {
     if(mpMorf == NULL || mpMorf->getModel() == NULL) {
         return FALSE;
     }
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     set_mtx();
     mpMorf->calc();
     mpBgW = new dBgW();
diff --git a/src/d/actor/d_a_obj_plant.cpp b/src/d/actor/d_a_obj_plant.cpp
index 206a1686e..02443c863 100644
--- a/src/d/actor/d_a_obj_plant.cpp
+++ b/src/d/actor/d_a_obj_plant.cpp
@@ -140,7 +140,7 @@ BOOL daObjPlant_c::CreateHeap() {
                 break;
             }
         }
-        mpModel->setUserArea((u32)this);
+        mpModel->setUserArea((uintptr_t)this);
     } else {
         return FALSE; 
     }
diff --git a/src/d/actor/d_a_obj_rflw.cpp b/src/d/actor/d_a_obj_rflw.cpp
index 0edd077b1..07199649c 100644
--- a/src/d/actor/d_a_obj_rflw.cpp
+++ b/src/d/actor/d_a_obj_rflw.cpp
@@ -62,7 +62,7 @@ BOOL daObjRflw_c::CreateHeap() {
                 break;
             }
         }
-        mpModel->setUserArea(reinterpret_cast<u32>(this));
+        mpModel->setUserArea(reinterpret_cast<uintptr_t>(this));
     } else {
         return FALSE;
     }
diff --git a/src/d/actor/d_a_obj_shmrgrd.cpp b/src/d/actor/d_a_obj_shmrgrd.cpp
index dff221ec9..cf187ac1c 100644
--- a/src/d/actor/d_a_obj_shmrgrd.cpp
+++ b/src/d/actor/d_a_obj_shmrgrd.cpp
@@ -183,7 +183,7 @@ BOOL daObjShmrgrd_c::create_heap() {
         mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203);
         if (mpModel) {
             mdl_data->getJointNodePointer(SHMRGRD_JNT_HIT_e)->setCallBack(jnodeCB);
-            mpModel->setUserArea((u32) this);
+            mpModel->setUserArea((uintptr_t) this);
             mpBgW = dBgW_NewSet((cBgD_t *)dComIfG_getObjectRes(M_arcname, dRes_INDEX_SHMRGRD_DZB_HGBASE_e), cBgW::MOVE_BG_e, &mMtx);
             if (mpBgW) {
                 rt = TRUE;
diff --git a/src/d/actor/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp
index 92a541466..7a866c153 100644
--- a/src/d/actor/d_a_obj_swhammer.cpp
+++ b/src/d/actor/d_a_obj_swhammer.cpp
@@ -118,7 +118,7 @@ BOOL daObjSwhammer::Act_c::CreateHeap() {
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (mpModel) {
         modelData->getJointNodePointer(MHMRSW_JNT_HIT_e)->setCallBack(jnodeCB);
-        mpModel->setUserArea((u32) this);
+        mpModel->setUserArea((uintptr_t) this);
     }
     return mpModel != NULL;
 }
diff --git a/src/d/actor/d_a_obj_swlight.cpp b/src/d/actor/d_a_obj_swlight.cpp
index 48a768eba..5918f043d 100644
--- a/src/d/actor/d_a_obj_swlight.cpp
+++ b/src/d/actor/d_a_obj_swlight.cpp
@@ -71,7 +71,7 @@ bool Act_c::create_heap() {
         modelData->getJointNodePointer(MSUSW_JNT_AFTER_FIRE2_e)->setCallBack(jnodeCB_moon);
         modelData->getJointNodePointer(MSUSW_JNT_BEFORE_FACE_e)->setCallBack(jnodeCB_moon);
         modelData->getJointNodePointer(MSUSW_JNT_BEFORE_MIRROR_e)->setCallBack(jnodeCB_moon);
-        m298->setUserArea((u32)this);
+        m298->setUserArea((uintptr_t)this);
     }
 
     J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MMIRROR_BTK_MSUSW_e));
diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp
index ce4ace832..08a2d85a5 100644
--- a/src/d/actor/d_a_obj_swpush.cpp
+++ b/src/d/actor/d_a_obj_swpush.cpp
@@ -157,7 +157,7 @@ bool daObjSwpush::Act_c::create_heap() {
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, flag);
     if (mpModel) {
         model_data->getJointNodePointer(1)->setCallBack(jnodeCB);
-        mpModel->setUserArea((u32) this);
+        mpModel->setUserArea((uintptr_t) this);
     }
 
     BOOL btp_success = TRUE;
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 9f0fc5eaf..5b3ea863e 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -121,7 +121,7 @@ BOOL daObjTpost_c::_createHeap() {
         return FALSE;
     }
     else {
-        mMorf->getModel()->setUserArea((u32)this);
+        mMorf->getModel()->setUserArea((uintptr_t)this);
 
         return TRUE;
     }
diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp
index c1751e6fd..8a128cef6 100644
--- a/src/d/actor/d_a_obj_warpt.cpp
+++ b/src/d/actor/d_a_obj_warpt.cpp
@@ -512,7 +512,7 @@ void daObj_Warpt_c::modeEventWarp() {
         }
         player->onNoResetFlg0(daPy_py_c::daPyFlg0_NO_FALL_VOICE);
         int staffIdx = dComIfGp_evmng_getMyStaffId("Warpt");
-        char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx);
+        const char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx);
 
         bool cVar3 = true;
         if (strcmp(cutName, "WARP") == 0) {
@@ -599,7 +599,7 @@ void daObj_Warpt_c::modeProc(daObj_Warpt_c::Proc_e proc, int index) {
     struct mode_entry_t {
         /* 0x00 */ ModeProcFunc init;
         /* 0x04 */ ModeProcFunc run;
-        /* 0x08 */ char* name;
+        /* 0x08 */ const char* name;
     }; // size = 0x8
 
     static mode_entry_t mode_tbl[] = {
diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp
index 482f61743..f4f962b7f 100644
--- a/src/d/actor/d_a_oship.cpp
+++ b/src/d/actor/d_a_oship.cpp
@@ -974,7 +974,7 @@ BOOL daOship_c::_createHeap() {
         return FALSE;
     }
 
-    mpModel->setUserArea((u32) this);
+    mpModel->setUserArea((uintptr_t) this);
     for (u16 i = 0; i < modelData->getJointNum(); i++) {
         switch (i) {
             case VBTSP_JNT_HEAD_e:
diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc
index 37e72185c..1c83cd4a3 100644
--- a/src/d/actor/d_a_player_bow.inc
+++ b/src/d/actor/d_a_player_bow.inc
@@ -229,7 +229,7 @@ void daPy_lk_c::setBowModel() {
     lineDamMAT_mtl->getShape()->hide();
     tmp_modelData->getJointNodePointer(LINK_BOW_JNT_LINEAB_JNT_e)->setCallBack(daPy_bowJointCB);
     tmp_modelData->getJointNodePointer(LINK_BOW_JNT_LINEBB_JNT_e)->setCallBack(daPy_bowJointCB);
-    mpEquipItemModel->setUserArea(reinterpret_cast<u32>(this));
+    mpEquipItemModel->setUserArea(reinterpret_cast<uintptr_t>(this));
 }
 
 /* 8014A834-8014A8D4       .text procBowSubject_init__9daPy_lk_cFv */
diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc
index 4f1e6e968..c9382c1e5 100644
--- a/src/d/actor/d_a_player_dproc.inc
+++ b/src/d/actor/d_a_player_dproc.inc
@@ -598,7 +598,7 @@ BOOL daPy_lk_c::setGetDemo() {
                 mMsgId = fpcM_ERROR_PROCESS_ID_e;
             }
             m34CE |= 0x01;
-            char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx);
+            const char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx);
             if (cutName != NULL) {
                 // TODO: is there an inline for parsing link's cut name -> cut
                 // index?
diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc
index fa682a244..ec3e7b5a4 100644
--- a/src/d/actor/d_a_player_fan.inc
+++ b/src/d/actor/d_a_player_fan.inc
@@ -139,7 +139,7 @@ void daPy_lk_c::setSmallFanModel() {
         JUT_ASSERT(275, FALSE);
     }
     mDoExt_setCurrentHeap(oldHeap);
-    mpEquipItemModel->setUserArea(reinterpret_cast<u32>(this));
+    mpEquipItemModel->setUserArea(reinterpret_cast<uintptr_t>(this));
     tmp_modelData->getJointNodePointer(FANSMALL_JNT_FANSMA_JNT_e)->setCallBack(daPy_fanJointCallback);
     tmp_modelData->getJointNodePointer(FANSMALL_JNT_FANSMB_JNT_e)->setCallBack(daPy_fanJointCallback);
     m355C = 0;
@@ -172,7 +172,7 @@ void daPy_lk_c::setParachuteFanModel(f32 f31) {
 
     mpEquipItemModel = mpParachuteFanMorf->getModel();
     mDoExt_setCurrentHeap(oldHeap);
-    mpEquipItemModel->setUserArea(reinterpret_cast<u32>(this));
+    mpEquipItemModel->setUserArea(reinterpret_cast<uintptr_t>(this));
     modelData->getJointNodePointer(FANB_JNT_LROOT_e)->setCallBack(daPy_parachuteJointCallback);
     modelData->getJointNodePointer(FANB_JNT_RROOT_e)->setCallBack(daPy_parachuteJointCallback);
     modelData->getJointNodePointer(FANB_JNT_LARMB_e)->setCallBack(daPy_parachuteJointCallback);
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index e50532d48..d08d143af 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -10361,7 +10361,7 @@ void daPy_lk_c::setDemoData() {
             mDemo.setSystemDemoType();
         }
         if (mStaffIdx != -1) {
-            char* cut_name = dComIfGp_getPEvtManager()->getMyNowCutName(mStaffIdx);
+            const char* cut_name = dComIfGp_getPEvtManager()->getMyNowCutName(mStaffIdx);
             if (cut_name != NULL) {
                 // Take the first 3 chars in cut_name, convert them to integers, and calculate demo_mode
                 demo_mode = ((cut_name[0] - '0') * 100 + (cut_name[1] - '0') * 10 + (cut_name[2] - '0'));
@@ -12111,8 +12111,8 @@ void daPy_lk_c::playerInit() {
     
     fopAcM_SetMtx(this, mpCLModel->getBaseTRMtx());
     
-    mpCLModel->setUserArea(reinterpret_cast<u32>(this));
-    mpYmgcs00Model->setUserArea(reinterpret_cast<u32>(this));
+    mpCLModel->setUserArea(reinterpret_cast<uintptr_t>(this));
+    mpYmgcs00Model->setUserArea(reinterpret_cast<uintptr_t>(this));
     for (u16 jnt_no = 0; jnt_no < mpYmgcs00Model->getModelData()->getJointNum(); jnt_no++) {
         mpYmgcs00Model->getModelData()->getJointNodePointer(jnt_no)->setCallBack(daPy_auraCallback);
     }
@@ -12127,10 +12127,10 @@ void daPy_lk_c::playerInit() {
     mpCLModelData->getJointNodePointer(CL_JNT_LINK_ROOT_e)->setCallBack(daPy_jointCallback0);
     mpCLModelData->getJointNodePointer(CL_JNT_RTOE_JNT_e)->setCallBack(daPy_jointCallback1);
     
-    m_pbCalc[PART_UNDER_e]->setUserArea(reinterpret_cast<u32>(this));
+    m_pbCalc[PART_UNDER_e]->setUserArea(reinterpret_cast<uintptr_t>(this));
     m_pbCalc[PART_UNDER_e]->setBeforeCalc(daPy_jointBeforeCallback);
     m_pbCalc[PART_UNDER_e]->setAfterCalc(daPy_jointAfterCallback);
-    m_pbCalc[PART_UPPER_e]->setUserArea(reinterpret_cast<u32>(this));
+    m_pbCalc[PART_UPPER_e]->setUserArea(reinterpret_cast<uintptr_t>(this));
     m_pbCalc[PART_UPPER_e]->setBeforeCalc(daPy_jointBeforeCallback);
     m_pbCalc[PART_UPPER_e]->setAfterCalc(daPy_jointAfterCallback);
     
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index 10a39e54f..edd7b047f 100644
--- a/src/d/actor/d_a_rd.cpp
+++ b/src/d/actor/d_a_rd.cpp
@@ -249,7 +249,7 @@ BOOL daRd_c::_createHeap() {
     if (mpMorf == NULL || mpMorf->getModel() == NULL) {
         return FALSE;
     }
-    mpMorf->getModel()->setUserArea(reinterpret_cast<u32>(this));
+    mpMorf->getModel()->setUserArea(reinterpret_cast<uintptr_t>(this));
     
     if (!mInvisModel.create(mpMorf->getModel())) {
         return FALSE;
diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp
index 50455ce3d..b37311df4 100644
--- a/src/d/actor/d_a_salvage.cpp
+++ b/src/d/actor/d_a_salvage.cpp
@@ -18,7 +18,7 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-char* daSalvage_c::m_arcname = "Yslvg00";
+const char* daSalvage_c::m_arcname = "Yslvg00";
 
 const f32 daSalvage_c::m_outersea_near = 20.0f;
 const f32 daSalvage_c::m_inside_near = 10.0f;
diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp
index 1ab3b22ec..88f2c830b 100644
--- a/src/d/actor/d_a_ship.cpp
+++ b/src/d/actor/d_a_ship.cpp
@@ -4570,7 +4570,7 @@ cPhs_State daShip_c::create() {
         pModel = mpBodyAnm->getModel();
         pModelData = pModel->getModelData();
         
-        pModel->setUserArea(reinterpret_cast<u32>(this));
+        pModel->setUserArea(reinterpret_cast<uintptr_t>(this));
         
         fopAcM_SetMtx(this, pModel->getBaseTRMtx());
         
@@ -4598,7 +4598,7 @@ cPhs_State daShip_c::create() {
         pModel = mpHeadAnm->getModel();
         pModelData = pModel->getModelData();
         
-        pModel->setUserArea(reinterpret_cast<u32>(this));
+        pModel->setUserArea(reinterpret_cast<uintptr_t>(this));
         
         for (u16 jno = 0; jno < pModelData->getJointNum(); jno++) {
             if (jno == FN_HEAD_H_JNT_J_FN_ATAMA_e || jno == FN_HEAD_H_JNT_J_FN_AGO2_e) {
@@ -4618,14 +4618,14 @@ cPhs_State daShip_c::create() {
             }
         }
         
-        mpCannonModel->setUserArea(reinterpret_cast<u32>(this));
+        mpCannonModel->setUserArea(reinterpret_cast<uintptr_t>(this));
         
         pModelData = mpCannonModel->getModelData();
         
         pModelData->getJointNodePointer(VFNCN_JNT_CANON1_e)->setCallBack(daShip_cannonJointCallBack);
         pModelData->getJointNodePointer(VFNCN_JNT_CANON2_e)->setCallBack(daShip_cannonJointCallBack);
         
-        mpSalvageArmModel->setUserArea(reinterpret_cast<u32>(this));
+        mpSalvageArmModel->setUserArea(reinterpret_cast<uintptr_t>(this));
         mpSalvageArmModel->getModelData()->getJointNodePointer(VFNCR_JNT_V_CRANE_ROTATION_e)->setCallBack(daShip_craneJointCallBack);
         
         m034B = fopAcM_GetParam(this);
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index 4224a08b8..07556d7b4 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -61,7 +61,7 @@ void daShopItem_c::CreateInit() {
         mTevType = TEV_TYPE_BG1_PLIGHT;
     }
 
-    mpModel->setUserArea(0);
+    mpModel->setUserArea(NULL);
 }
 
 /* 00000240-000003BC       .text clothCreate__12daShopItem_cFv */
diff --git a/src/d/actor/d_a_shutter.cpp b/src/d/actor/d_a_shutter.cpp
index 4d6b53012..6edbbb0a4 100644
--- a/src/d/actor/d_a_shutter.cpp
+++ b/src/d/actor/d_a_shutter.cpp
@@ -20,10 +20,10 @@ const s32 daShutter_c::m_heapsize[2] = {0x1140, 0x3000};
 const Vec daShutter_c::m_cull_min[2] = {{-500.0f, -100.0f, -50.0f}, {-150.0f, -100.0f, -50.0f}};
 const Vec daShutter_c::m_cull_max[2] = {{500.0f, 250.0f, 50.0f}, {150.0f, 250.0f, 50.0f}};
 
-char* daShutter_c::m_arcname[2] = {"Htobi1", "Htobi2"};
-char* daShutter_c::m_open_ev_name[2] = {"HYSDOOROPEN", "R03DOOROPEN"};
-char* daShutter_c::m_close_ev_name[2] = {NULL, "R03DOORCLOSE"};
-char* daShutter_c::m_staff_name[2] = {"Htobi1", "Htobi2"};
+const char* daShutter_c::m_arcname[2] = {"Htobi1", "Htobi2"};
+const char* daShutter_c::m_open_ev_name[2] = {"HYSDOOROPEN", "R03DOOROPEN"};
+const char* daShutter_c::m_close_ev_name[2] = {NULL, "R03DOORCLOSE"};
+const char* daShutter_c::m_staff_name[2] = {"Htobi1", "Htobi2"};
 
 /* 00000078-00000108       .text _delete__11daShutter_cFv */
 bool daShutter_c::_delete() {
diff --git a/src/d/actor/d_a_shutter2.cpp b/src/d/actor/d_a_shutter2.cpp
index bdbc845b4..309ee3a91 100644
--- a/src/d/actor/d_a_shutter2.cpp
+++ b/src/d/actor/d_a_shutter2.cpp
@@ -19,10 +19,10 @@ const s32 daShutter2_c::m_heapsize[1] = {0x0C00};
 const Vec daShutter2_c::m_cull_min[1] = {{-300.0f, -10.0f, -40.0f}};
 const Vec daShutter2_c::m_cull_max[1] = {{300.0f, 400.0f, 40.0f}};
 
-char* daShutter2_c::m_arcname[1] = {"Htobi3"};
-char* daShutter2_c::m_open_ev_name[1] = {"R04DOOROPEN"};
-char* daShutter2_c::m_close_ev_name[1] = {"R04DOORCLOSE"};
-char* daShutter2_c::m_staff_name[1] = {"Htobi3"};
+const char* daShutter2_c::m_arcname[1] = {"Htobi3"};
+const char* daShutter2_c::m_open_ev_name[1] = {"R04DOOROPEN"};
+const char* daShutter2_c::m_close_ev_name[1] = {"R04DOORCLOSE"};
+const char* daShutter2_c::m_staff_name[1] = {"Htobi3"};
 
 /* 00000078-000000B8       .text Delete__12daShutter2_cFv */
 BOOL daShutter2_c::Delete() {
diff --git a/src/d/actor/d_a_sk.cpp b/src/d/actor/d_a_sk.cpp
index 68bc09bbb..513f192dd 100644
--- a/src/d/actor/d_a_sk.cpp
+++ b/src/d/actor/d_a_sk.cpp
@@ -212,7 +212,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    i_this->mpMorf->getModel()->setUserArea((u32)i_this);
+    i_this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < i_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         i_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_sk2.cpp b/src/d/actor/d_a_sk2.cpp
index 7144760bb..a9ad5c00c 100644
--- a/src/d/actor/d_a_sk2.cpp
+++ b/src/d/actor/d_a_sk2.cpp
@@ -165,7 +165,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    i_this->mpMorf->getModel()->setUserArea((u32)i_this);
+    i_this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < i_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         i_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_ssk.cpp b/src/d/actor/d_a_ssk.cpp
index b7c2032ee..c49c06905 100644
--- a/src/d/actor/d_a_ssk.cpp
+++ b/src/d/actor/d_a_ssk.cpp
@@ -292,7 +292,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    i_this->mpMorf1->getModel()->setUserArea((u32)i_this);
+    i_this->mpMorf1->getModel()->setUserArea((uintptr_t)i_this);
 
 #if VERSION > VERSION_DEMO
     static Vec sph_offset = {0.0f, 0.0f, 0.0f};
diff --git a/src/d/actor/d_a_st.cpp b/src/d/actor/d_a_st.cpp
index e174b7ac0..493dd021c 100644
--- a/src/d/actor/d_a_st.cpp
+++ b/src/d/actor/d_a_st.cpp
@@ -2693,7 +2693,7 @@ static BOOL createHeap(fopAc_ac_c* a_this) {
     }
 #if VERSION == VERSION_DEMO
     J3DModel* model = i_this->mpMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         if ((i < ST_JNT_ASIR_e + 1) && (i != ST_JNT_BUKI_e)) {
             model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
@@ -2877,7 +2877,7 @@ static cPhs_State daSt_Create(fopAc_ac_c* a_this) {
                 i_this->m02B9 = 0xFF;
             }
         }
-        i_this->mpMorf->getModel()->setUserArea((u32)a_this);
+        i_this->mpMorf->getModel()->setUserArea((uintptr_t)a_this);
         e_this->initBt(162.5f, 125.0f);
         a_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
         fopAcM_OnStatus(a_this, fopAcStts_SHOWMAP_e);
diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp
index f575d41d7..5791ba709 100644
--- a/src/d/actor/d_a_syan.cpp
+++ b/src/d/actor/d_a_syan.cpp
@@ -216,7 +216,7 @@ static cPhs_State daSyan_Create(fopAc_ac_c* i_ac) {
             fopAcM_SetMin(i_this, -1000.0f, -5000.0f, -1000.0f);
             fopAcM_SetMax(i_this, 1000.0f, 5000.0f, 1000.0f);
             fopAcM_SetMtx(i_this, i_this->morf->getModel()->getBaseTRMtx());
-            model->setUserArea((u32)i_this);
+            model->setUserArea((uintptr_t)i_this);
             i_this->field_0x2b8 = 200.0f;
 
             static s16 fire_time[] = { 0, 5, 10, 15, 20, 25 };
diff --git a/src/d/actor/d_a_tag_hint.cpp b/src/d/actor/d_a_tag_hint.cpp
index 99bb13368..82ddc4fed 100644
--- a/src/d/actor/d_a_tag_hint.cpp
+++ b/src/d/actor/d_a_tag_hint.cpp
@@ -478,8 +478,8 @@ void daTag_Hint_c::startProc() {
 }
 
 /* 000018A4-000018AC       .text next_msgStatus__12daTag_Hint_cFPUl */
-u16 daTag_Hint_c::next_msgStatus(unsigned long*) {
-    return 16;
+u16 daTag_Hint_c::next_msgStatus(u32*) {
+    return fopMsgStts_MSG_ENDS_e;
 }
 
 /* 000018AC-000018B4       .text getMsg__12daTag_Hint_cFv */
diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp
index b0b2f6734..bee000832 100644
--- a/src/d/actor/d_a_tag_island.cpp
+++ b/src/d/actor/d_a_tag_island.cpp
@@ -136,7 +136,7 @@ void daTag_Island_c::demoInitProc() {
 }
 
 /* 00000550-00000558       .text next_msgStatus__14daTag_Island_cFPUl */
-int daTag_Island_c::next_msgStatus(unsigned long*) {
+int daTag_Island_c::next_msgStatus(u32*) {
     return fopMsgStts_MSG_ENDS_e;
 }
 
diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp
index 7c2ba3414..6833f7d84 100644
--- a/src/d/actor/d_a_tn.cpp
+++ b/src/d/actor/d_a_tn.cpp
@@ -3896,7 +3896,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         0x11020203
     );
     model = i_this->mpBodyMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
     int r3;
     for (u16 i = 0; i <= ARRAY_SSIZE(joint_check) - 1; i++) {
         r3 = joint_check[i];
@@ -3925,7 +3925,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         0x11020203
     );
     model = i_this->mpShieldMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
     model->getModelData()->getJointNodePointer(TN_MAIN_JNT_J_TN_MUNE1_e)->setCallBack(nodeCallBack_kata);
     i_this->mpBrkAnm = new mDoExt_brkAnm();
     if (i_this->mpBrkAnm == NULL) {
diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp
index 42741fe14..d78440538 100644
--- a/src/d/actor/d_a_toge.cpp
+++ b/src/d/actor/d_a_toge.cpp
@@ -77,7 +77,7 @@ BOOL daToge_c::CreateHeap() {
         return FALSE;
     }
 
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
 
     mpBgW1 = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HTOGE1_DZB_HTOGE1A_e), cBgW::MOVE_BG_e, &mtx1);
     mpBgW2 = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HTOGE1_DZB_HTOGE1B_e), cBgW::MOVE_BG_e, &mtx2);
diff --git a/src/d/actor/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp
index 05784498f..26a6c2b67 100644
--- a/src/d/actor/d_a_windmill.cpp
+++ b/src/d/actor/d_a_windmill.cpp
@@ -204,7 +204,7 @@ void daWindMill_c::CreateInit() {
             break;
     }
 
-    mpModel->setUserArea((u32) this);
+    mpModel->setUserArea((uintptr_t)this);
     set_mtx();
 
     for (u16 i = 0; i < mpModel->getModelData()->getJointNum(); i++) {
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index e7774d5f7..aa96d1bca 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -253,7 +253,7 @@ s32 check_event_condition(u32 attnType, u16 flags) {
 /* 8009DB60-8009DC28       .text check_flontofplayer__FUlss */
 s32 check_flontofplayer(u32 checkMask, s16 angle1, s16 angle2) {
     /// merged from TP
-    static uint ftp_table[] = {
+    static u32 ftp_table[] = {
         0x04, 0x01, 0x02, 0x08, 0x10, 0x20, 0x40, 0x80, 0x100,
     };
     static s16 ang_table[3] = {
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index 2c600871d..8a2eaf046 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -1510,7 +1510,7 @@ void dComIfGs_setPlayerRecollectionData() {
 
     // TODO: This matches but could probably be cleaned up somehow.
     dSv_player_status_c_c* stts = dComIfGs_getpPlayerStatusC(tbl);
-    u32 buffer = (u32)dComIfGp_getPlayerInfoBuffer();
+    uintptr_t buffer = (uintptr_t)dComIfGp_getPlayerInfoBuffer();
     memcpy((void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectStatusA)),       dComIfGs_getpPlayerStatusA(),             sizeof(stts->mRecollectStatusA));
     memcpy((void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectItem)),          dComIfGs_getpItem(),                      sizeof(stts->mRecollectItem));
     memcpy((void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectItemRecord)),    &dComIfGs_getpItemRecord()->mItemRecord2, sizeof(stts->mRecollectItemRecord));
@@ -1619,7 +1619,7 @@ void dComIfGs_revPlayerRecollectionData() {
     tmp_item.mItems[dInvSlot_CAMERA_e]  = dComIfGs_getItem(dInvSlot_CAMERA_e);
 
     // TODO: This matches but could probably be cleaned up somehow.
-    u32 buffer = (u32)dComIfGp_getPlayerInfoBuffer();
+    uintptr_t buffer = (uintptr_t)dComIfGp_getPlayerInfoBuffer();
     memcpy(dComIfGs_getpPlayerStatusA(),             (void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectStatusA)),       sizeof(dSv_player_status_c_c().mRecollectStatusA));
     memcpy(dComIfGs_getpItem(),                      (void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectItem)),          sizeof(dSv_player_status_c_c().mRecollectItem));
     memcpy(&dComIfGs_getpItemRecord()->mItemRecord2, (void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectItemRecord)),    sizeof(dSv_player_status_c_c().mRecollectItemRecord));
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp
index 519b91efd..2d1a33a48 100644
--- a/src/d/d_demo.cpp
+++ b/src/d/d_demo.cpp
@@ -673,7 +673,7 @@ bool dDemo_manager_c::create(const u8* r29, cXyz* r30, f32 f31) {
     }
     mFrame = 0;
     mFrameNoMsg = 0;
-    mCurFile = (char*)r29;
+    mCurFile = (const char*)r29;
     mMode = 1;
     return true;
 }
diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp
index deb3e2bfb..bad5572bd 100644
--- a/src/d/d_event_manager.cpp
+++ b/src/d/d_event_manager.cpp
@@ -488,11 +488,11 @@ int dEvent_manager_c::getMyActIdx(int staffIdx, const char* const* action, int a
 }
 
 /* 80074964-800749A0       .text getMyActName__16dEvent_manager_cFi */
-char* dEvent_manager_c::getMyActName(int staffIdx) {
+const char* dEvent_manager_c::getMyActName(int staffIdx) {
     if (staffIdx == -1)
         return NULL;
 
-    char* cutName = getMyNowCutName(staffIdx);
+    const char* cutName = getMyNowCutName(staffIdx);
     if (cutName == NULL)
         return NULL;
 
diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp
index 9bd31e329..710316ab4 100644
--- a/src/d/d_item_data.cpp
+++ b/src/d/d_item_data.cpp
@@ -116,7 +116,7 @@
 #include "res/Object/Vbeso.h"
 
 /* 80383F20-803840E0       .data item_arcname_tbl__10dItem_data */
-char* dItem_data::item_arcname_tbl[0x70] = {
+const char* dItem_data::item_arcname_tbl[0x70] = {
     "Always",
     "Vhutu",
     "Vhkak",
@@ -347,7 +347,7 @@ enum ItemArcnameIdx {
 };
 
 /* 803840E0-803842B0       .data item_texture_tbl__10dItem_data */
-char* dItem_data::item_texture_tbl[0x74] = {
+const char* dItem_data::item_texture_tbl[0x74] = {
     "get_rupy.bti",
     "get_key.bti",
     "heart_up_01.bti",
diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp
index 7e07625c1..17e95c85b 100644
--- a/src/d/d_menu_collect.cpp
+++ b/src/d/d_menu_collect.cpp
@@ -164,7 +164,7 @@ void dMenu_Collect_c::screenSet() {
         'wk03',
     };
 
-    static char* triTex[8] = {
+    static const char* triTex[8] = {
         "triforce_00.bti",
         "triforce_01.bti",
         "triforce_02.bti",
@@ -174,12 +174,12 @@ void dMenu_Collect_c::screenSet() {
         "triforce_06.bti",
         "triforce_07.bti",
     };
-    static char* symTex[3] = {
+    static const char* symTex[3] = {
         "god_symbol_02.bti",
         "god_symbol_00.bti",
         "god_symbol_01.bti",
     };
-    static char* wepTex[5] = {
+    static const char* wepTex[5] = {
         "sword_00.bti",
         "shield_00.bti",
         "gloves_00.bti",
@@ -384,7 +384,7 @@ void dMenu_Collect_c::screenSet() {
 
     for (int i = 0; i < 8; i++) {
         JKRArchive* archive = dComIfGp_getItemIconArchive();
-        char* r6 = triTex[i];
+        const char* r6 = triTex[i];
         JKRReadTypeResource(mTriforceTexBuffer[i], 0xc00, 'TIMG', r6, archive);
 #if VERSION <= VERSION_JPN
         DCFlushRangeNoSync(mTriforceTexBuffer[i], 0xc00);
@@ -400,7 +400,7 @@ void dMenu_Collect_c::screenSet() {
 
     for (int i = 0; i < 3; i++) {
         JKRArchive* archive = dComIfGp_getItemIconArchive();
-        char* r6 = symTex[i];
+        const char* r6 = symTex[i];
         JKRReadTypeResource(mSymbolTexBuffer[i], 0xc00, 'TIMG', r6, archive);
 #if VERSION <= VERSION_JPN
         DCFlushRangeNoSync(mSymbolTexBuffer[i], 0xc00);
@@ -413,7 +413,7 @@ void dMenu_Collect_c::screenSet() {
 
     for (int i = 0; i < 5; i++) {
         JKRArchive* archive = dComIfGp_getItemIconArchive();
-        char* r6 = wepTex[i];
+        const char* r6 = wepTex[i];
         JKRReadTypeResource(mItemTexBuffer[i], 0xc00, 'TIMG', r6, archive);
 #if VERSION <= VERSION_JPN
         DCFlushRangeNoSync(mItemTexBuffer[i], 0xc00);
diff --git a/src/d/d_s_actor_data_mng.cpp b/src/d/d_s_actor_data_mng.cpp
index d8a34d698..20b9e282d 100644
--- a/src/d/d_s_actor_data_mng.cpp
+++ b/src/d/d_s_actor_data_mng.cpp
@@ -112,7 +112,7 @@ void dADM::SetData(void* pData) {
 
     u32 *pHeader = (u32*)mpData;
     for (s32 i = 0; i < mBlockCount; i++) {
-        pHeader[2] = pHeader[2] + (u32)pData;
+        pHeader[2] = pHeader[2] + (uintptr_t)pData;
         pHeader += 3;
     }
 
@@ -131,5 +131,5 @@ void dADM::SetData(void* pData) {
     }
 
     JUT_ASSERT(202, row * name == dat_size);
-    mCharTbl.SetData((u32)pData, row, rowOffs, name, nameOffs, dat_size, dataOffs);
+    mCharTbl.SetData((uintptr_t)pData, row, rowOffs, name, nameOffs, dat_size, dataOffs);
 }
diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp
index 61cfdb8ca..587ff8c53 100644
--- a/src/d/d_s_play.cpp
+++ b/src/d/d_s_play.cpp
@@ -44,7 +44,7 @@ static const int PRELOAD_RES_MAX = 0x23;
 static const int PRELOAD_DYL_MAX = 0x1B;
 
 struct PreLoadInfoT_s {
-    char* stageName;
+    const char* stageName;
     const s16* dylKeyTbl;
     const char** resName;
     u8 dylKeyTblNum;
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index af23051e3..a687605f9 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -198,7 +198,7 @@ int createRoomScene(int param_0) {
     }
 
     *ptr = param_0;
-    return fopScnM_CreateReq(fpcNm_ROOM_SCENE_e, fpcNm_INVALID_e, 0, (u32)ptr);
+    return fopScnM_CreateReq(fpcNm_ROOM_SCENE_e, fpcNm_INVALID_e, 0, (uintptr_t)ptr);
 }
 
 /* 80040E38-80040E6C       .text checkRoomDisp__20dStage_roomControl_cCFi */
@@ -1736,8 +1736,8 @@ int dStage_roomReadInit(dStage_dt_c* i_stage, void* i_data, int i_num, void* i_f
     i_stage->setRoom(rtbl);
 
     for (int i = 0; i < rtbl->num; i++) {
-        rtbl_entries[i] = (roomRead_data_class*)((u32)i_file + (u32)rtbl_entries[i]);
-        rtbl_entries[i]->m_rooms = (u8*)((u32)i_file + (u32)rtbl_entries[i]->m_rooms);
+        rtbl_entries[i] = (roomRead_data_class*)((uintptr_t)i_file + (uintptr_t)rtbl_entries[i]);
+        rtbl_entries[i]->m_rooms = (u8*)((uintptr_t)i_file + (uintptr_t)rtbl_entries[i]->m_rooms);
     }
 
     return 1;
@@ -1766,7 +1766,7 @@ int dStage_pathInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void*) {
 
     i_stage->setPathInfo(pStagePath);
     for (s32 i = 0; i < pStagePath->num; pPath++, i++)
-        pPath->m_points = (dPnt*)((u32)pPath->m_points + i_stage->getPntInf()->m_pnt_offset);
+        pPath->m_points = (dPnt*)((uintptr_t)pPath->m_points + i_stage->getPntInf()->m_pnt_offset);
     return 1;
 }
 
@@ -1784,7 +1784,7 @@ int dStage_rpatInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void*) {
 
     i_stage->setPath2Info(pStagePath);
     for (s32 i = 0; i < pStagePath->num; pPath++, i++)
-        pPath->m_points = (dPnt*)((u32)pPath->m_points + i_stage->getPnt2Inf()->m_pnt_offset);
+        pPath->m_points = (dPnt*)((uintptr_t)pPath->m_points + i_stage->getPnt2Inf()->m_pnt_offset);
     return 1;
 }
 
@@ -2049,7 +2049,7 @@ void dStage_dt_c_offsetToPtr(void* i_data) {
 
     for (int i = 0; i < file->m_chunkCount; i++) {
         if (p_tno->m_offset != 0) {
-            p_tno->m_offset += (u32)i_data;
+            p_tno->m_offset += (uintptr_t)i_data;
         }
         p_tno++;
     }
@@ -2246,7 +2246,7 @@ void dStage_Create() {
 
 /* 80043464-80043514       .text dStage_Delete__Fv */
 void dStage_Delete() {
-    char* demoArcName = dStage_roomControl_c::getDemoArcName();
+    const char* demoArcName = dStage_roomControl_c::getDemoArcName();
     if (*demoArcName != 0) {
         dComIfG_deleteObjectRes(demoArcName);
     }
diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp
index d559cc3d3..7568e72dd 100644
--- a/src/d/d_wood.cpp
+++ b/src/d/d_wood.cpp
@@ -586,7 +586,7 @@ void dWood::Unit_c::cc_hit_before_cut(dWood::Packet_c *packet) {
     }
 
     // Evaluate for attacks that will not cut us down
-    if (cLib_checkBit(ret, 0x01UL)) {
+    if (cLib_checkBit<u32>(ret, 0x01UL)) {
         cCcD_Obj *atHitObj = inf.GetAtHitObj();
         if (atHitObj != NULL && (atHitObj->ChkAtType(AT_TYPE_WIND) ||
                                  atHitObj->ChkAtType(AT_TYPE_BOMB) ||
@@ -627,7 +627,7 @@ void dWood::Unit_c::cc_hit_before_cut(dWood::Packet_c *packet) {
     }
 
     // Check for collisions that are not attacks
-    if (cLib_checkBit(ret, 0x02UL) && actor && inf.GetCoHitObj() &&
+    if (cLib_checkBit<u32>(ret, 0x02UL) && actor && inf.GetCoHitObj() &&
         inf.GetCoHitObj()->GetStts()) {
         animIdx = packet->search_anm(Anm_c::Mode_PushInto);
 
@@ -656,7 +656,7 @@ void dWood::Unit_c::cc_hit_before_cut(dWood::Packet_c *packet) {
     }
 
     // Check for attacks that WILL cut us down
-    if (cLib_checkBit(ret, 0x01UL)) {
+    if (cLib_checkBit<u32>(ret, 0x01UL)) {
         AnmID_e oldAnimIdx = mAnmIdx;
 
         if ((mAnmIdx < 8)) {
diff --git a/src/dolphin/vi/vi.c b/src/dolphin/vi/vi.c
index e74b61670..43d3799da 100644
--- a/src/dolphin/vi/vi.c
+++ b/src/dolphin/vi/vi.c
@@ -908,7 +908,7 @@ void VISetNextFrameBuffer(void* fb) {
         "VISetNextFrameBuffer(): Frame buffer address(0x%08x) is not 32byte aligned\n",
         fb);
     enabled = OSDisableInterrupts();
-    HorVer.bufAddr = (u32)fb;
+    HorVer.bufAddr = (uintptr_t)fb;
     FBSet = 1;
     setFbbRegs(&HorVer, &HorVer.tfbb, &HorVer.bfbb, &HorVer.rtfbb, &HorVer.rbfbb);
     OSRestoreInterrupts(enabled);
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index 3afe66095..a9f47b105 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -512,13 +512,13 @@ bool mDoMch_Create() {
     JKRHeap::setDefaultDebugFill(mDoMch::mDebugFill);
     JFWSystem::setMaxStdHeap(1);
 
-    u32 arenaHi = (u32)OSGetArenaHi();
-    u32 arenaLo = (u32)OSGetArenaLo();
+    uintptr_t arenaHi = (uintptr_t)OSGetArenaHi();
+    uintptr_t arenaLo = (uintptr_t)OSGetArenaLo();
     if (arenaHi > 0x81800000 && arenaHi - 0x1800000 > arenaLo) {
         OSSetArenaHi((void*)(arenaHi - 0x1800000));
     }
 
-    u32 arenaSize = ((u32)OSGetArenaHi() - (u32)OSGetArenaLo()) - 0xF0;
+    u32 arenaSize = ((uintptr_t)OSGetArenaHi() - (uintptr_t)OSGetArenaLo()) - 0xF0;
 #if VERSION != VERSION_PAL
     if (OSGetConsoleSimulatedMemSize() >= 0x3000000) {
         arenaSize -= DEMO_SELECT(0x800000, 0x1000000);
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index 31e9f3d71..4471eda21 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -50,19 +50,20 @@ extern "C" int search_partial_address(void* address, int* module_id, int* sectio
 
     OSModuleInfo* module = __OSModuleList.head;
     for (; module != NULL; module = (OSModuleInfo*)module->link.next) {
-        u32 i, addr;
+        u32 i;
+        uintptr_t addr;
         OSSectionInfo* section = (OSSectionInfo*)module->sectionInfoOffset;
 
         for (i = 0; i < module->numSections; section++, i++) {
             if (section->size != 0) {
                 addr = section->offset & ~0x01;
-                if ((addr <= (u32)address) && (u32)address < (addr + section->size)) {
+                if ((addr <= (uintptr_t)address) && (uintptr_t)address < (addr + section->size)) {
                     if (module_id != NULL)
                         *module_id = module->id;
                     if (section_id != NULL)
                         *section_id = i;
                     if (section_offset)
-                        *section_offset = (u32)address - addr;
+                        *section_offset = (uintptr_t)address - addr;
                     if (name_offset)
                         *name_offset = module->nameOffset;
                     return 0;
@@ -75,14 +76,14 @@ extern "C" int search_partial_address(void* address, int* module_id, int* sectio
 }
 
 /* 80006770-800067D0       .text convert_partial_address */
-extern "C" u32 convert_partial_address(void* param_0) {
+extern "C" uintptr_t convert_partial_address(void* param_0) {
     int param_1;
     int param_2;
     int param_3;
     if (search_partial_address(param_0, &param_1, &param_2, &param_3, NULL) == 0) {
         return (param_2 << 28) + (param_3 & 0x01FFFFFF);
     } else {
-        return (u32)param_0;
+        return (uintptr_t)param_0;
     }
 }