wii building OK / m_Do_graphic debug work (#2815)

* wii building OK + m_Do_graphic debug work

* d_meter_HIO debug cleanup

* wii m_Do_graphic stuff

* tag_attack_item OK, mirror_chain almost

* fix build

* mg_fshop matching

6 files changed, 18 insertions, 5 deletions

diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index 79a115046c..9ba569b6e5 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/include/JSystem/JFramework/JFWDisplay.h
@@ -72,6 +72,10 @@ public:
 
     static JFWDisplay* getManager() { return sManager; }
 
+    static JFWDisplay* createManager(JKRHeap* i_heap, JUTXfb::EXfbNumber i_xfbNum, bool param_2) {
+        return createManager(NULL, i_heap, i_xfbNum, param_2);
+    }
+
     bool startFadeOut(int param_0) {
         if (mFader != NULL) {
             return mFader->startFadeOut(param_0);
diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h
index 4215fd4a2c..f9f126aa23 100644
--- a/include/JSystem/JKernel/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap.h
@@ -28,7 +28,7 @@ public:
 
         void newGroupId(u8 groupId) { mGroupId = groupId; }
         bool isValid() const { return mMagic == 'HM'; }
-        bool _isTempMemBlock() const { return (mFlags & 0x80) ? true : false; }
+        bool isTempMemBlock() const { return mFlags & 0x80; }
         int getAlignment() const { return mFlags & 0x7f; }
         void* getContent() const { return (void*)(this + 1); }
         CMemBlock* getPrevBlock() const { return mPrev; }
diff --git a/include/JSystem/JKernel/JKRFileCache.h b/include/JSystem/JKernel/JKRFileCache.h
index 9103340cd1..c6e47d2cc2 100644
--- a/include/JSystem/JKernel/JKRFileCache.h
+++ b/include/JSystem/JKernel/JKRFileCache.h
@@ -68,4 +68,8 @@ inline JKRFileCache* JKRMountDvdDrive(const char* path, JKRHeap* heap, const cha
     return JKRFileCache::mount(path, heap, param_2);
 }
 
+inline void JKRUnmountDvdDrive(JKRFileCache* filecache) {
+    filecache->unmount();
+}
+
 #endif /* JKRFILECACHE_H */
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
index 474edf5757..d64a598233 100644
--- a/include/JSystem/JKernel/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap.h
@@ -91,7 +91,7 @@ public:
     void setDebugFill(bool debugFill) { mDebugFill = debugFill; }
     bool getDebugFill() const { return mDebugFill; }
     void* getStartAddr() { return (void*)mStart; }
-    void* getEndAddr() const { return (void*)mEnd; }
+    void* getEndAddr() { return (void*)mEnd; }
     u32 getSize() const { return mSize; }
     bool getErrorFlag() const { return mErrorFlag; }
     void callErrorHandler(JKRHeap* heap, u32 size, int alignment) {
diff --git a/include/JSystem/JParticle/JPADrawInfo.h b/include/JSystem/JParticle/JPADrawInfo.h
index 061783af2e..0cf63754c5 100644
--- a/include/JSystem/JParticle/JPADrawInfo.h
+++ b/include/JSystem/JParticle/JPADrawInfo.h
@@ -9,12 +9,12 @@
  */
 class JPADrawInfo {
 public:
-    JPADrawInfo(Mtx param_0, f32 fovY, f32 aspect) {
+    JPADrawInfo(const Mtx param_0, f32 fovY, f32 aspect) {
         MTXCopy(param_0, mCamMtx);
         C_MTXLightPerspective(mPrjMtx, fovY, aspect, 0.5f, -0.5f, 0.5f, 0.5f);
     }
 
-    JPADrawInfo(Mtx param_0, f32 top, f32 bottom, f32 left, f32 right) {
+    JPADrawInfo(const Mtx param_0, f32 top, f32 bottom, f32 left, f32 right) {
         MTXCopy(param_0, mCamMtx);
         C_MTXLightOrtho(mPrjMtx, top, bottom, left, right, 0.5f, 0.5f, 0.5f, 0.5f);
     }
@@ -24,6 +24,8 @@ public:
 
     void getCamMtx(Mtx dst) const { MTXCopy(mCamMtx, dst); }
     void getPrjMtx(Mtx dst) const { MTXCopy(mPrjMtx, dst); }
+
+    void setPrjMtx(const Mtx src) { MTXCopy(src, mPrjMtx); }
 };
 
 #endif
diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h
index bbb20c0865..b2e5403de8 100644
--- a/include/JSystem/JUtility/JUTGamePad.h
+++ b/include/JSystem/JUtility/JUTGamePad.h
@@ -110,7 +110,10 @@ public:
     void stopMotor() { mRumble.stopMotor(mPortNum, false); }
     void stopMotorHard() { mRumble.stopMotorHard(mPortNum); }
 
-    static s8 getPortStatus(u32 port) { return mPadStatus[port].err; }
+    static s8 getPortStatus(EPadPort port) {
+        JUT_ASSERT(360, 0 <= port && port < 4);
+        return mPadStatus[port].err;
+    }
 
     struct CButton {
         CButton() { clear(); }