diff --git a/include/JSystem/JKernel/JKRAram.h b/include/JSystem/JKernel/JKRAram.h
index f211a8a5a..754e9a45c 100644
--- a/include/JSystem/JKernel/JKRAram.h
+++ b/include/JSystem/JKernel/JKRAram.h
@@ -10,7 +10,7 @@ class JKRAMCommand;
 class JKRAramBlock;
 class JKRAram : public JKRThread {
 private:
-    JKRAram(u32, u32, long);
+    JKRAram(u32, u32, s32);
     virtual ~JKRAram();
 
     /* vt[03] */ void* run(void); /* override */
diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile.h
index 4de87b8bc..442ef026c 100644
--- a/include/JSystem/JKernel/JKRDvdFile.h
+++ b/include/JSystem/JKernel/JKRDvdFile.h
@@ -15,7 +15,7 @@ class JKRDvdFile : public JKRFile {
 public:
     JKRDvdFile();
     JKRDvdFile(const char*);
-    JKRDvdFile(long);
+    JKRDvdFile(s32);
     virtual ~JKRDvdFile();
 
     void initiate(void);
diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h
index c6e21e543..65b231a4f 100644
--- a/include/f_op/f_op_msg_mng.h
+++ b/include/f_op/f_op_msg_mng.h
@@ -80,7 +80,7 @@ inline s32 fopMsgM_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3
                             param_8, createFunc);
 }
 
-void fopMsgM_setPaneData(fopMsgM_pane_class*, J2DScreen*, unsigned long);
+void fopMsgM_setPaneData(fopMsgM_pane_class*, J2DScreen*, u32);
 void fopMsgM_setNowAlpha(fopMsgM_pane_class*, f32);
 void fopMsgM_setNowAlphaZero(fopMsgM_pane_class*);
 void fopMsgM_setInitAlpha(fopMsgM_pane_class*);
diff --git a/src/JAZelAudio/JAIZelBasic.cpp b/src/JAZelAudio/JAIZelBasic.cpp
index 951471956..16eebddad 100644
--- a/src/JAZelAudio/JAIZelBasic.cpp
+++ b/src/JAZelAudio/JAIZelBasic.cpp
@@ -207,7 +207,7 @@ void JAIZelBasic::cbPracticeStop() {
 }
 
 /* 802A6508-802A6570       .text checkCbPracticePlay__11JAIZelBasicFv */
-void JAIZelBasic::checkCbPracticePlay() {
+BOOL JAIZelBasic::checkCbPracticePlay() {
     /* Nonmatching */
 }
 
diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/src/JSystem/J3DGraphBase/J3DSys.cpp
index 653bc38c7..a8c5c09d2 100644
--- a/src/JSystem/J3DGraphBase/J3DSys.cpp
+++ b/src/JSystem/J3DGraphBase/J3DSys.cpp
@@ -63,7 +63,7 @@ void J3DSys::loadNrmMtxIndx(int addr, u16 indx) const {
 }
 
 /* 802D8BD8-802D8C58       .text J3DFifoLoadPosMtxImm__FPA4_fUl */
-void J3DFifoLoadPosMtxImm(Mtx mtx, unsigned long idx) {
+void J3DFifoLoadPosMtxImm(Mtx mtx, u32 idx) {
     J3DFifoWriteXFCmd(idx << 2, 12);
     u32 * mtx_u32 = (u32*)mtx;
 
@@ -84,7 +84,7 @@ void J3DFifoLoadPosMtxImm(Mtx mtx, unsigned long idx) {
 }
 
 /* 802D8C58-802D8CC4       .text J3DFifoLoadNrmMtxImm__FPA4_fUl */
-void J3DFifoLoadNrmMtxImm(Mtx mtx, unsigned long idx) {
+void J3DFifoLoadNrmMtxImm(Mtx mtx, u32 idx) {
     J3DFifoWriteXFCmd(0x400 + (idx * 3), 9);
     u32 * mtx_u32 = (u32*)mtx;
 
@@ -102,7 +102,7 @@ void J3DFifoLoadNrmMtxImm(Mtx mtx, unsigned long idx) {
 }
 
 /* 802D8CC4-802D8D30       .text J3DFifoLoadNrmMtxImm3x3__FPA3_fUl */
-void J3DFifoLoadNrmMtxImm3x3(Mtx33 mtx, unsigned long idx) {
+void J3DFifoLoadNrmMtxImm3x3(Mtx33 mtx, u32 idx) {
     J3DFifoWriteXFCmd(0x400 + (idx * 3), 9);
     u32 * mtx_u32 = (u32*)mtx;
 
diff --git a/src/SSystem/SComponent/c_bg_w.cpp b/src/SSystem/SComponent/c_bg_w.cpp
index 598189c77..250aea6fe 100644
--- a/src/SSystem/SComponent/c_bg_w.cpp
+++ b/src/SSystem/SComponent/c_bg_w.cpp
@@ -146,7 +146,7 @@ bool cBgW::ChkMemoryError() {
 }
 
 /* 802481C4-80248414       .text Set__4cBgWFP6cBgD_tUlPA3_A4_f */
-bool cBgW::Set(cBgD_t*, unsigned long, Mtx*) {
+bool cBgW::Set(cBgD_t*, u32, Mtx*) {
     /* Nonmatching */
 }
 
diff --git a/src/SSystem/SComponent/c_cc_d.cpp b/src/SSystem/SComponent/c_cc_d.cpp
index e76041724..e459a642e 100644
--- a/src/SSystem/SComponent/c_cc_d.cpp
+++ b/src/SSystem/SComponent/c_cc_d.cpp
@@ -44,7 +44,7 @@ void cCcD_DivideArea::SetArea(const cM3dGAab& aabb) {
 }
 
 /* 80241558-8024170C       .text CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl */
-void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo*, const cM3dGAab&, unsigned long) {
+void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo*, const cM3dGAab&, u32) {
     /* Nonmatching */
 }
 
diff --git a/src/SSystem/SComponent/c_malloc.cpp b/src/SSystem/SComponent/c_malloc.cpp
index 98b0f84e6..2dfa08605 100644
--- a/src/SSystem/SComponent/c_malloc.cpp
+++ b/src/SSystem/SComponent/c_malloc.cpp
@@ -15,7 +15,7 @@ void cMl::init(JKRHeap* heap) {
 }
 
 /* 802412F8-80241330       .text memalignB__3cMlFiUl */
-void* cMl::memalignB(int alignment, unsigned long size) {
+void* cMl::memalignB(int alignment, u32 size) {
     if (size == 0)
         return NULL;
     else
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index 320fbec8b..c1d5faeba 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -12,7 +12,7 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 
 /* 8009D220-8009D268       .text __ct__11dAttParam_cFl */
-dAttParam_c::dAttParam_c(long) {
+dAttParam_c::dAttParam_c(s32) {
     /* Nonmatching */
     field_0x04 = 45.0f;
     field_0x08 = 30.0f;
@@ -95,7 +95,7 @@ dAttention_c::~dAttention_c() {
 }
 
 /* 8009D6EC-8009D728       .text GetActionList__12dAttention_cFl */
-dAttList_c* dAttention_c::GetActionList(long idx) {
+dAttList_c* dAttention_c::GetActionList(s32 idx) {
     if (mActionNum != 0)
         return &mActionList[(mActionOffs + idx) % mActionNum];
     else
@@ -103,7 +103,7 @@ dAttList_c* dAttention_c::GetActionList(long idx) {
 }
 
 /* 8009D728-8009D764       .text GetLockonList__12dAttention_cFl */
-dAttList_c* dAttention_c::GetLockonList(long idx) {
+dAttList_c* dAttention_c::GetLockonList(s32 idx) {
     if (mLockOnNum != 0)
         return &mLockOnList[(mLockOnOffs + idx) % mLockOnNum];
     else
@@ -145,43 +145,43 @@ dAttList_c* dAttention_c::getActionBtnZ() {
 }
 
 /* 8009DAA4-8009DAF4       .text chkAttMask__12dAttention_cFUlUl */
-void dAttention_c::chkAttMask(unsigned long, unsigned long) {
+void dAttention_c::chkAttMask(u32, u32) {
     /* Nonmatching */
 }
 
 /* 8009DAF4-8009DB60       .text check_event_condition__FUlUs */
-void check_event_condition(unsigned long, unsigned short) {
+void check_event_condition(u32, u16) {
     /* Nonmatching */
 }
 
 /* 8009DB60-8009DC28       .text check_flontofplayer__FUlss */
-void check_flontofplayer(unsigned long, short, short) {
+void check_flontofplayer(u32, s16, s16) {
     /* Nonmatching */
 }
 
 /* 8009DC28-8009DC74       .text distace_weight__Ffsf */
-void distace_weight(float, short, float) {
+void distace_weight(f32, s16, f32) {
     /* Nonmatching */
 }
 
 /* 8009DC74-8009DCD4       .text distace_angle_adjust__Ffsf */
-void distace_angle_adjust(float, short, float) {
+void distace_angle_adjust(f32, s16, f32) {
     /* Nonmatching */
 }
 
 /* 8009DCD4-8009DE44       .text check_distace__FP4cXyzsP4cXyzffff */
-void check_distace(cXyz*, short, cXyz*, float, float, float, float) {
+void check_distace(cXyz*, s16, cXyz*, f32, f32, f32, f32) {
     /* Nonmatching */
 }
 
 /* 8009DE44-8009E03C       .text calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl */
-f32 dAttention_c::calcWeight(int, fopAc_ac_c*, float, short, short, unsigned long*) {
+f32 dAttention_c::calcWeight(int, fopAc_ac_c*, f32, s16, s16, u32*) {
     /* Nonmatching */
 }
 
 /* 8009E03C-8009E128       .text setLList__12dAttention_cFP10fopAc_ac_cffUl */
-void dAttention_c::setLList(fopAc_ac_c* i_actor, float weight, float distance, unsigned long type) {
-    float bestWeight = 0.0f;
+void dAttention_c::setLList(fopAc_ac_c* i_actor, f32 weight, f32 distance, u32 type) {
+    f32 bestWeight = 0.0f;
 
     if (weight > 0.0f) {
         int bestIdx;
@@ -206,8 +206,8 @@ void dAttention_c::setLList(fopAc_ac_c* i_actor, float weight, float distance, u
 }
 
 /* 8009E128-8009E214       .text setAList__12dAttention_cFP10fopAc_ac_cffUl */
-void dAttention_c::setAList(fopAc_ac_c* i_actor, float weight, float distance, unsigned long type) {
-    float bestWeight = 0.0f;
+void dAttention_c::setAList(fopAc_ac_c* i_actor, f32 weight, f32 distance, u32 type) {
+    f32 bestWeight = 0.0f;
 
     if (weight > 0.0f) {
         int bestIdx;
@@ -232,7 +232,7 @@ void dAttention_c::setAList(fopAc_ac_c* i_actor, float weight, float distance, u
 }
 
 /* 8009E214-8009E2CC       .text initList__12dAttention_cFUl */
-void dAttention_c::initList(unsigned long flagMask) {
+void dAttention_c::initList(u32 flagMask) {
     int i;
 
     mFlagMask = flagMask;
@@ -292,7 +292,7 @@ void dAttention_c::sortList() {
 }
 
 /* 8009E5C4-8009E684       .text stockAttention__12dAttention_cFUl */
-void dAttention_c::stockAttention(unsigned long interactMask) {
+void dAttention_c::stockAttention(u32 interactMask) {
     fopAc_ac_c * pTarget = LockonTarget(0);
     initList(interactMask);
     if (makeList())
@@ -313,7 +313,7 @@ void dAttention_c::stockAttention(unsigned long interactMask) {
 }
 
 /* 8009E684-8009E728       .text nextAttention__12dAttention_cFUl */
-void dAttention_c::nextAttention(unsigned long interactMask) {
+void dAttention_c::nextAttention(u32 interactMask) {
     fopAc_ac_c * pTarget = fopAcM_SearchByID(mLockOnTargetBsPcID);
     initList(interactMask);
     if (makeList())
@@ -386,17 +386,17 @@ void dAttention_c::judgementLostCheck() {
 }
 
 /* 8009EF40-8009F0A4       .text judgementStatusSw__12dAttention_cFUl */
-void dAttention_c::judgementStatusSw(unsigned long) {
+void dAttention_c::judgementStatusSw(u32) {
     /* Nonmatching */
 }
 
 /* 8009F0A4-8009F1D4       .text judgementStatusHd__12dAttention_cFUl */
-void dAttention_c::judgementStatusHd(unsigned long) {
+void dAttention_c::judgementStatusHd(u32) {
     /* Nonmatching */
 }
 
 /* 8009F1D4-8009F460       .text Run__12dAttention_cFUl */
-void dAttention_c::Run(unsigned long) {
+void dAttention_c::Run(u32) {
     /* Nonmatching */
 }
 
@@ -411,7 +411,7 @@ void dAttDraw_c::setAnm(int, int, int) {
 }
 
 /* 8009F6B4-8009F834       .text draw__10dAttDraw_cFR4cXyzPA4_f */
-void dAttDraw_c::draw(cXyz&, float(*)[4]) {
+void dAttDraw_c::draw(cXyz&, f32(*)[4]) {
     /* Nonmatching */
 }
 
@@ -531,7 +531,7 @@ void dAttCatch_c::proc() {
 }
 
 /* 8009FC08-8009FE10       .text request__11dAttCatch_cFP10fopAc_ac_cUcfffsi */
-void dAttCatch_c::request(fopAc_ac_c*, unsigned char, float, float, float, short, int) {
+void dAttCatch_c::request(fopAc_ac_c*, u8, f32, f32, f32, s16, int) {
     /* Nonmatching */
 }
 
@@ -555,12 +555,12 @@ void dAttLook_c::proc() {
 }
 
 /* 8009FE74-800A009C       .text request__10dAttLook_cFP10fopAc_ac_cfffsi */
-void dAttLook_c::request(fopAc_ac_c*, float, float, float, short, int) {
+void dAttLook_c::request(fopAc_ac_c*, f32, f32, f32, s16, int) {
     /* Nonmatching */
 }
 
 /* 800A009C-800A0270       .text requestF__10dAttLook_cFP10fopAc_ac_csi */
-void dAttLook_c::requestF(fopAc_ac_c*, short, int) {
+void dAttLook_c::requestF(fopAc_ac_c*, s16, int) {
     /* Nonmatching */
 }
 
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index 1e362743c..62c5c6274 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -33,7 +33,7 @@ mDoRstData* mDoRst::mResetData;
 #endif
 
 /* 80017D7C-80017E40       .text mDoRst_reset__FiUli */
-void mDoRst_reset(int param_0, unsigned long param_1, int param_2) {
+void mDoRst_reset(int param_0, u32 param_1, int param_2) {
     if (DVDGetDriveStatus() == DVD_STATE_FATAL_ERROR) {
         do {
         } while (true);
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index 0b81fb16a..2bab193f7 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -188,7 +188,7 @@ int developKeyCheck(u32 btnTrig, u32 btnHold) {
 }
 
 /* 8000C23C-8000C3C0       .text myExceptionCallback__FUsP9OSContextUlUl */
-void myExceptionCallback(unsigned short, OSContext*, unsigned long, unsigned long) {
+void myExceptionCallback(OSError, OSContext*, u32, u32) {
     u32 btnHold;
     u32 btnTrig;
 
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 18b962c4d..5c7376afe 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -447,7 +447,7 @@ void main() {
     u8 ALIGN_DECL(0x20) stack[0xF000];
 
     mDoMain::sPowerOnTime = OSGetTime();
-    OSReportInit__Fv();
+    OSReportInit();
     version_check();
 #if VERSION != VERSION_JPN
     mDoRstData* reset_data = (mDoRstData*)OSAllocFromArenaLo(0x10, 4);