diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index 0d38f39ce7..5e1cd40b4b 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -5,6 +5,7 @@ #include "JSystem/JAudio2/JAIAudible.h" #include "JSystem/JUtility/JUTAssert.h" #include "global.h" +#include class JAISound; diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index b6a0367bd0..3f3f44083e 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -5,6 +5,7 @@ #include #include "global.h" #include +#include class JKRHeap; typedef void (*JKRErrorHandler)(void*, u32, int); diff --git a/include/JSystem/JStudio/JStudio/stb.h b/include/JSystem/JStudio/JStudio/stb.h index 8bd8d0fc52..b17bb57a8c 100644 --- a/include/JSystem/JStudio/JStudio/stb.h +++ b/include/JSystem/JStudio/JStudio/stb.h @@ -5,6 +5,7 @@ #include "JSystem/JStudio/JStudio/object-id.h" #include "JSystem/JStudio/JStudio/stb-data-parse.h" #include +#include namespace JStudio { class TObject; diff --git a/include/JSystem/JSupport/JSUOutputStream.h b/include/JSystem/JSupport/JSUOutputStream.h index 87113bbdd5..b7ab069fbb 100644 --- a/include/JSystem/JSupport/JSUOutputStream.h +++ b/include/JSystem/JSupport/JSUOutputStream.h @@ -35,6 +35,8 @@ public: JSU_OUTPUTSTREAM_OPERATOR(signed long long) JSU_OUTPUTSTREAM_OPERATOR(unsigned long long) +#undef JSU_OUTPUTSTREAM_OPERATOR + JSUOutputStream& operator<<(const char* param_0) { write(param_0); return *this; diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h index 28059c7073..c4bf605b9c 100644 --- a/include/JSystem/JUtility/JUTXfb.h +++ b/include/JSystem/JUtility/JUTXfb.h @@ -75,7 +75,7 @@ private: static JUTXfb* sManager; private: - /* 0x00 */ void* mBuffer[3]; + /* 0x00 */ u8* mBuffer[3]; /* 0x0C */ bool mXfbAllocated[3]; /* 0x10 */ s32 mBufferNum; /* 0x14 */ s16 mDrawingXfbIndex; diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index d83a937e4d..f224eb43cf 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -226,7 +226,7 @@ bool DynamicModuleControl::do_load() { mModule = (OSModuleHeader*)JKRDvdToMainRam( buffer, NULL, EXPAND_SWITCH_UNKNOWN1, 0, heap, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, 0, NULL, NULL); - if (mModule != NULL) { + if (mModule != 0) { mSize = 0; mResourceType = 7; } diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/src/JSystem/JUtility/JUTGraphFifo.cpp index 840eca7523..1ffc0da27d 100644 --- a/src/JSystem/JUtility/JUTGraphFifo.cpp +++ b/src/JSystem/JUtility/JUTGraphFifo.cpp @@ -18,7 +18,7 @@ JUTGraphFifo::JUTGraphFifo(u32 size) { GXInitFifoPtrs(mFifo, mBase, mBase); } else { mBase = JKRAllocFromSysHeap(mSize + 0xA0, 32); - mBase = (void*)ALIGN_NEXT((intptr_t)mBase, 0x20); + mBase = (void*)ALIGN_NEXT((uintptr_t)mBase, 0x20); mFifo = GXInit(mBase, mSize); GXSetColorUpdate(GX_ENABLE); data_804514B8 = true; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint index 314a548671..35428a686e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint @@ -40,6 +40,20 @@ typedef long long intmax_t; #ifdef __cplusplus }; } + +using std::uint8_t; +using std::uint16_t; +using std::uint32_t; + +using std::int8_t; +using std::int16_t; +using std::int32_t; + +using std::uint64_t; +using std::int64_t; + +using std::uintptr_t; +using std::intptr_t; #endif #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h index 1c8c64b0b5..89ff7339ec 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h @@ -3,24 +3,4 @@ #include -#ifdef _MSVC_LANG - #include -#else - #ifdef __cplusplus - using std::uint8_t; - using std::uint16_t; - using std::uint32_t; - - using std::int8_t; - using std::int16_t; - using std::int32_t; - - using std::uint64_t; - using std::int64_t; - - using std::uintptr_t; - using std::intptr_t; - #endif -#endif - #endif diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index db7404534e..187fa4b172 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -1145,9 +1145,9 @@ void dMenu_Dmap_c::screenInit() { field_0x88[0] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('map000'), 3, NULL); field_0x88[1] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('con000'), 3, NULL); - if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11) { + if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV2) { field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('i_key_n'), 3, NULL); - } else if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x14) { + } else if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV5) { field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('lv5_k_n'), 3, NULL); } else { field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('nor_k_n'), 3, NULL); @@ -1157,7 +1157,7 @@ void dMenu_Dmap_c::screenInit() { field_0x88[i]->scale(0.9f, 0.9f); } - if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11) { + if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV2) { mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_k_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); @@ -1196,7 +1196,7 @@ void dMenu_Dmap_c::screenInit() { ((J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('c_n_1_s')))->changeTexture(tex, 0); ((J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('c_n_1')))->changeTexture(tex, 0); } - } else if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x14) { + } else if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV5) { mpDrawBg->mBaseScreen->search(MULTI_CHAR('i_key_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index 5f985c22e9..f55fbc3fa2 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -83,6 +83,8 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs dPaneClass_showNullPane(mpTxScreen); mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); + JUT_ASSERT(124, mpTm_c[0] != NULL); + mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); JUT_ASSERT(127, mpTm_c[1] != NULL); @@ -114,8 +116,8 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); - field_0x10[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); - field_0x10[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); + mpTmr_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); + mpTmr_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); mpTxScreen->search(MULTI_CHAR('n_3fline'))->show(); @@ -135,6 +137,8 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs field_0x50 = -10.0f; mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); + JUT_ASSERT(162, mpTm_c[0] != NULL); + mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL); JUT_ASSERT(165, mpTm_c[1] != NULL); @@ -178,6 +182,15 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs g_MsgObject_HIO_c.mTextPosX + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.x, g_MsgObject_HIO_c.mTextPosY + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.y); + mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); + JUT_ASSERT(241, mpArw_c != NULL); + + mpMg_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); + JUT_ASSERT(244, mpMg_c[0] != NULL); + + mpMg_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); + JUT_ASSERT(247, mpMg_c[1] != NULL); + mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); mpMg_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); mpMg_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL);