general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)

* typedef for cPhs_Step

* make sdk includes consistent

* d_menu_quit / d_msg_scrn_explain debug

* d_a_obj_testcube mostly done

* d_debug_pad mostly done

* jstudio tool library headers

* some JStudioCameraEditor headers

* d_jcam_editor mostly done

* try fixing some shield regressions

* d_bg_parts mostly done

* fix merge errors

* debug fix

src/JSystem/J2DGraph/J2DAnimation.cpp

@@ -5,7 +5,7 @@
 #include "JSystem/J3DGraphBase/J3DTexture.h"
 #include "JSystem/JUtility/JUTPalette.h"
 #include "JSystem/JUtility/JUTResource.h"
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 
 template<typename T>
 f32 J2DGetKeyFrameInterpolation(f32 param_0, J3DAnmKeyTableBase* param_1, T* param_2) {

src/JSystem/J2DGraph/J2DGrafContext.cpp

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DGrafContext.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 
 J2DGrafContext::J2DGrafContext(f32 x, f32 y, f32 width, f32 height)
     : mBounds(x, y, x + width, y + height), mScissorBounds(x, y, x + width, y + height) {

src/JSystem/J2DGraph/J2DMatBlock.cpp

@@ -5,7 +5,7 @@
 #include "JSystem/JUtility/JUTPalette.h"
 #include "JSystem/JUtility/JUTResFont.h"
 #include "JSystem/JUtility/JUTTexture.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 
 void J2DColorBlock::initialize() {
     for (int i = 0; i < 2; i++) {

src/JSystem/J2DGraph/J2DMaterialFactory.cpp

@@ -6,7 +6,7 @@
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JUtility/JUTResource.h"
 #include <string>
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) {
     field_0x0 = param_0.field_0x8;

src/JSystem/J2DGraph/J2DOrthoGraph.cpp

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 
 J2DOrthoGraph::J2DOrthoGraph() : J2DGrafContext(0, 0, 0, 0) {
     this->setLookat();

src/JSystem/J2DGraph/J2DPicture.cpp

@@ -7,7 +7,7 @@
 #include "JSystem/JUtility/JUTTexture.h"
 #include "JSystem/JUtility/JUTResource.h"
 #include "JSystem/JSupport/JSURandomInputStream.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 
 J2DPicture::J2DPicture() : mPalette(NULL) {
     for (u32 i = 0; i < 2; i++) {

src/JSystem/J2DGraph/J2DPictureEx.cpp

@@ -5,7 +5,7 @@
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include "JSystem/JUtility/JUTTexture.h"
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 void J2DPictureEx::initiate(ResTIMG const* param_0, ResTLUT const* param_1) {
     u32 texGenNum = mMaterial->getTexGenBlock()->getTexGenNum();

src/JSystem/J2DGraph/J2DScreen.cpp

@@ -9,7 +9,7 @@
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JSupport/JSUMemoryStream.h"
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 J2DScreen::J2DScreen()
     : J2DPane(NULL, true, 'root', JGeometry::TBox2<f32>(JGeometry::TVec2<f32>(0, 0), JGeometry::TVec2<f32>(640, 480))), mColor() {

src/JSystem/J2DGraph/J2DTevs.cpp

@@ -7,7 +7,7 @@
 #include "JSystem/J2DGraph/J2DTevs.h"
 #include "JSystem/J2DGraph/J2DMaterial.h"
 #include <cmath>
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 
 void J2DTexMtx::load(u32 mtxIdx) {
     GXLoadTexMtxImm(mTexMtx, mtxIdx * 3 + GX_TEXMTX0, (GXTexMtxType)mInfo.mTexMtxType);

src/JSystem/J3DGraphAnimator/J3DCluster.cpp

@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/JMath/JMATrigonometric.h"
-#include "dolphin/base/PPCArch.h"
+#include <dolphin/base/PPCArch.h>
 
 J3DDeformData::J3DDeformData() {
     mClusterNum = 0;

src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp

@@ -7,7 +7,7 @@
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "JSystem/JSupport/JSupport.h"
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 
 J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseFlag flag) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data;

src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp

@@ -8,7 +8,7 @@
 #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 #include <string>
 
 void* J3DClusterLoaderDataBase::load(const void* i_data) {

src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp

@@ -8,7 +8,7 @@
 #include "JSystem/J3DGraphAnimator/J3DJoint.h"
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
 #include "JSystem/JSupport/JSupport.h"
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 #include "global.h"
 
 u16 J3DModelLoader::countMaterialNum(const void* stream) {

src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp

@@ -5,7 +5,7 @@
 #include "JSystem/J3DGraphBase/J3DShapeMtx.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JSupport/JSupport.h"
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 #include "global.h"
 
 J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) {

src/JSystem/JAudio2/JASAiCtrl.cpp

@@ -14,7 +14,7 @@
 #include "JSystem/JAudio2/JASLfo.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/ai.h"
+#include <dolphin/ai.h>
 #include <dolphin/os.h>
 #include <stdint.h>
 

src/JSystem/JAudio2/JASAudioReseter.cpp

@@ -5,7 +5,7 @@
 #include "JSystem/JAudio2/JASCriticalSection.h"
 #include "JSystem/JAudio2/JASDriverIF.h"
 #include "JSystem/JAudio2/JASDSPChannel.h"
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 JASAudioReseter::JASAudioReseter() {
     field_0x0 = 0;

src/JSystem/JAudio2/JASAudioThread.cpp

@@ -9,7 +9,7 @@
 #include "JSystem/JAudio2/JASProbe.h"
 #include "JSystem/JAudio2/JASReport.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
-#include "dolphin/dsp.h"
+#include <dolphin/dsp.h>
 #include <stdint.h>
 
 JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority)

src/JSystem/JAudio2/JASCmdStack.cpp

@@ -6,7 +6,7 @@
 
 #include "JSystem/JAudio2/JASCmdStack.h"
 #include "JSystem/JAudio2/JASCriticalSection.h"
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 
 JASPortCmd::TPortHead JASPortCmd::sCommandListOnce;
 

src/JSystem/JAudio2/JASHeapCtrl.cpp

@@ -6,7 +6,7 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/ar.h"
+#include <dolphin/ar.h>
 
 JASHeap::JASHeap(JASDisposer* disposer) : mTree(this) {
     mDisposer = disposer;

src/JSystem/JAudio2/JASWaveArcLoader.cpp

@@ -6,7 +6,7 @@
 #include "JSystem/JAudio2/JASMutex.h"
 #include "JSystem/JKernel/JKRDvdAramRipper.h"
 #include <string>
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 #include <stdint.h>
 
 JASHeap* JASWaveArcLoader::sAramHeap;

src/JSystem/JAudio2/JAUSectionHeap.cpp

@@ -14,7 +14,7 @@
 #include "JSystem/JAudio2/JAUSoundTable.h"
 #include "JSystem/JAudio2/JAUStreamFileTable.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
-#include "dolphin/dvd.h"
+#include <dolphin/dvd.h>
 
 namespace {
     class TPushCurrentHeap {

src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp

@@ -7,7 +7,7 @@
 #include "JSystem/JAudio2/JAUSeqDataBlockMgr.h"
 #include "JSystem/JAudio2/JAUSoundInfo.h"
 #include "JSystem/JAudio2/JASResArcLoader.h"
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 JAUSeqDataBlock::JAUSeqDataBlock() : field_0x0(this) {}
 

src/JSystem/JAudio2/osdsp.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JAudio2/osdsp.h"
 #include "JSystem/JAudio2/osdsp_task.h"
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 #include <dolphin/dsp.h>
 
 extern "C" void __DSP_insert_task(DSPTaskInfo*);

src/JSystem/JFramework/JFWDisplay.cpp

@@ -6,7 +6,7 @@
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTDbPrint.h"
 #include "JSystem/JUtility/JUTProcBar.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 #include <dolphin/vi.h>
 #include "global.h"
 #include <stdint.h>

src/JSystem/JKernel/JKRAram.cpp

@@ -6,7 +6,7 @@
 #include "JSystem/JKernel/JKRDecomp.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "dolphin/ar.h"
+#include <dolphin/ar.h>
 #include <dolphin/os.h>
 #include <string>
 

src/JSystem/JKernel/JKRAramPiece.cpp

@@ -4,7 +4,7 @@
 #include "JSystem/JKernel/JKRAram.h"
 #include "JSystem/JKernel/JKRDecomp.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 
 JKRAMCommand* JKRAramPiece::prepareCommand(int direction, u32 src, u32 dst, u32 length,
                                            JKRAramBlock* block,

src/JSystem/JKernel/JKRDvdAramRipper.cpp

@@ -9,7 +9,7 @@
 #include "JSystem/JSupport/JSUFileStream.h"
 #include <dolphin/os.h>
 #include <dolphin/os.h>
-#include "dolphin/vi.h"
+#include <dolphin/vi.h>
 #include "global.h"
 #include <string>
 

src/JSystem/JKernel/JKRDvdRipper.cpp

@@ -10,7 +10,7 @@
 #include "JSystem/JUtility/JUTException.h"
 #include <string>
 #include <dolphin/os.h>
-#include "dolphin/vi.h"
+#include <dolphin/vi.h>
 #include <stdint.h>
 
 static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*);

src/JSystem/JKernel/JKRFile.cpp

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JKernel/JKRFile.h"
-#include "dolphin/vi.h"
+#include <dolphin/vi.h>
 
 void JKRFile::read(void* data, s32 length, s32 offset) {
     JUT_ASSERT(32, ( length & 0x1f ) == 0);

src/JSystem/JParticle/JPABaseShape.cpp

@@ -6,8 +6,8 @@
 #include "JSystem/JParticle/JPAEmitter.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "JSystem/JMath/JMATrigonometric.h"
-#include "dolphin/mtx.h"
-#include "dolphin/gx.h"
+#include <dolphin/mtx.h>
+#include <dolphin/gx.h>
 
 void JPASetPointSize(JPAEmitterWorkData* work) {
     GXSetPointSize((u8)(25.0f * work->mGlobalPtclScl.x), GX_TO_ONE);

src/JSystem/JParticle/JPAChildShape.cpp

@@ -3,8 +3,8 @@
 #include "JSystem/JParticle/JPAChildShape.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JParticle/JPAEmitter.h"
-#include "dolphin/gx.h"
-#include "dolphin/os.h"
+#include <dolphin/gx.h>
+#include <dolphin/os.h>
 
 void JPARegistChildPrmEnv(JPAEmitterWorkData* work) {
     JPAChildShape* csp = work->mpRes->getCsp();

src/JSystem/JParticle/JPAEmitter.cpp

@@ -5,7 +5,7 @@
 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "JSystem/JParticle/JPABaseShape.h"
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 JPAEmitterCallBack::~JPAEmitterCallBack() {
 }

src/JSystem/JParticle/JPAEmitterManager.cpp

@@ -6,7 +6,7 @@
 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 
 JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHeap, u8 i_gidMax,
                                      u8 i_ridMax) {

src/JSystem/JParticle/JPAExTexShape.cpp

@@ -3,7 +3,7 @@
 #include "JSystem/JParticle/JPAExTexShape.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "JSystem/JParticle/JPAEmitter.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 
 void JPALoadExTex(JPAEmitterWorkData* work) {
     JPAExTexShape* ets = work->mpRes->getEts();

src/JSystem/JParticle/JPAExtraShape.cpp

@@ -4,7 +4,7 @@
 #include "JSystem/JMath/JMATrigonometric.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JParticle/JPAEmitter.h"
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 
 void JPACalcScaleX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();

src/JSystem/JParticle/JPAResource.cpp

@@ -11,7 +11,7 @@
 #include "JSystem/JParticle/JPAKeyBlock.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 #include "global.h"
 
 JPAResource::JPAResource() {

src/JSystem/JStudio/JStudio/stb-data-parse.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JStudio/JStudio/stb-data-parse.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/os.h"
+#include <dolphin/os.h>
 #include <stdint.h>
 
 namespace JStudio {

src/JSystem/JUtility/JUTCacheFont.cpp

@@ -5,7 +5,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JKernel/JKRAram.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 #include <stdint.h>
 
 JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) {

src/JSystem/JUtility/JUTPalette.cpp

@@ -1,8 +1,8 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTPalette.h"
-#include "dolphin/gx.h"
-#include "dolphin/os.h"
+#include <dolphin/gx.h>
+#include <dolphin/os.h>
 
 void JUTPalette::storeTLUT(GXTlut param_0, ResTLUT* tlut) {
     if (tlut == NULL) {

src/JSystem/JUtility/JUTResFont.cpp

@@ -5,7 +5,7 @@
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 
 JUTResFont::JUTResFont() {
     initialize_state();

src/JSystem/JUtility/JUTTexture.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JUtility/JUTTexture.h"
 #include "JSystem/JUtility/JUTPalette.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 
 JUTTexture::~JUTTexture() {
     if (getCaptureFlag()) {

src/JSystem/JUtility/JUTVideo.cpp

@@ -3,7 +3,7 @@
 #include "JSystem/JUtility/JUTVideo.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTXfb.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 #include <dolphin/vi.h>
 
 JUTVideo* JUTVideo::sManager;

src/JSystem/JUtility/JUTXfb.cpp

@@ -3,7 +3,7 @@
 #include "JSystem/JUtility/JUTXfb.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/gx.h"
+#include <dolphin/gx.h>
 
 void JUTXfb::clearIndex() {
     mDrawingXfbIndex = -1;