d_menu_save / pane_class / rename some data (#205)

* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc

6 files changed, 18 insertions, 14 deletions

diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/include/JSystem/J2DGraph/J2DOrthoGraph.h
index 8259b27c94..e6bf5bb59a 100644
--- a/include/JSystem/J2DGraph/J2DOrthoGraph.h
+++ b/include/JSystem/J2DGraph/J2DOrthoGraph.h
@@ -15,9 +15,15 @@ public:
     /* 802E97B4 */ virtual void setPort();
     /* 802E9C88 */ virtual s32 getGrafType() const { return 1; }
     /* 802E9840 */ virtual void setLookat();
+
     f32 getWidthPower() const { return mBounds.getWidth() / mOrtho.getWidth(); }
     f32 getHeightPower() const { return mBounds.getHeight() / mOrtho.getHeight(); }
 
+    void setOrtho(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5) {
+        JGeometry::TBox2<f32> ortho(param_0, param_1, param_0 + param_2, param_1 + param_3);
+        setOrtho(ortho, param_4, param_5);
+    }
+
 private:
     /* 0xBC */ JGeometry::TBox2<f32> mOrtho;
     /* 0xCC */ f32 mNear;
diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h
index c2af88aa20..6653617fc8 100644
--- a/include/JSystem/J2DGraph/J2DPane.h
+++ b/include/JSystem/J2DGraph/J2DPane.h
@@ -134,6 +134,7 @@ public:
     void animationTransform();
     void updateTransform(const J2DAnmTransform* transform);
     void setUserInfo(u64 info) { mUserInfoTag = info; }
+    const Mtx* getMtx() const { return &mPositionMtx; }
 
     static JGeometry::TBox2<f32> static_mBounds;
 
diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h
index ba81b38f62..6535cfc1eb 100644
--- a/include/JSystem/J2DGraph/J2DTextBox.h
+++ b/include/JSystem/J2DGraph/J2DTextBox.h
@@ -40,8 +40,8 @@ public:
     /* 80254408 */ virtual bool setBlack(JUtility::TColor);
     /* 80186C84 */ virtual void setWhite(JUtility::TColor);
     /* 8019230C */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor);
-    /* 801DFA34 */ virtual void getBlack() const;
-    /* 801DFA28 */ virtual void getWhite() const;
+    /* 801DFA34 */ virtual JUtility::TColor getBlack() const;
+    /* 801DFA28 */ virtual JUtility::TColor getWhite() const;
     /* 8025602C */ virtual bool getMaterial() const;
 
     /* 802FFBC4 */ J2DTextBox(u64, JGeometry::TBox2<f32> const&, ResFONT const*, char const*, s16,
diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h
index ce4ab4b4e5..778236d80f 100644
--- a/include/JSystem/J3DGraphBase/J3DStruct.h
+++ b/include/JSystem/J3DGraphBase/J3DStruct.h
@@ -12,13 +12,9 @@ public:
 
     /* 0x00 */ Vec mLightPosition;
     /* 0x0C */ Vec mLightDirection;
-    /* 0x18 */ _GXColor mColor;
-    /* 0x1C */ f32 mA0;
-    /* 0x20 */ f32 mA1;
-    /* 0x24 */ f32 mA2;
-    /* 0x28 */ f32 mK0;
-    /* 0x2C */ f32 mK1;
-    /* 0x30 */ f32 mK2;
+    /* 0x18 */ GXColor mColor;
+    /* 0x1C */ Vec mCosAtten;
+    /* 0x28 */ Vec mDistAtten;
 };  // Size = 0x34
 
 extern "C" extern J3DLightInfo const j3dDefaultLightInfo;
diff --git a/include/JSystem/JSupport/JSUMemoryStream.h b/include/JSystem/JSupport/JSUMemoryStream.h
index aa8c84480f..d6fbdfed73 100644
--- a/include/JSystem/JSupport/JSUMemoryStream.h
+++ b/include/JSystem/JSupport/JSUMemoryStream.h
@@ -4,11 +4,11 @@
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include "dolphin/types.h"
 
-class JSUMemoryInputStream : JSURandomInputStream {
+class JSUMemoryInputStream : public JSURandomInputStream {
 public:
     JSUMemoryInputStream(const void* res, u32 size) { setBuffer(res, size); }
 
-    /* 802552B8 */ ~JSUMemoryInputStream() {}
+    /* 802552B8 */ virtual ~JSUMemoryInputStream() {}
     /* 802DC520 */ void setBuffer(void const*, s32);
     /* 802DC534 */ u32 readData(void*, s32);
     /* 802DC5AC */ s32 seekPos(s32, JSUStreamSeekFrom);
diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h
index 49a5a0315e..707b63e2f8 100644
--- a/include/JSystem/JUtility/JUTGamePad.h
+++ b/include/JSystem/JUtility/JUTGamePad.h
@@ -26,8 +26,7 @@ enum {
 };
 }
 
-extern bool struct_80451500;
-extern bool struct_80451501;  // sResetOccured
+extern bool sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset;
 
 struct JUTGamePadRecordBase {
     virtual void unk0() {}
@@ -75,7 +74,7 @@ public:
         PADSetAnalogMode(mode);
     }
 
-    static void clearResetOccurred() { struct_80451501 = false; }
+    static void clearResetOccurred() { C3ButtonReset::sResetOccurred = false; }
 
     static void setResetCallback(callbackFn callback, void* param_0) {
         C3ButtonReset::sCallback = callback;
@@ -165,6 +164,8 @@ public:
         static void* sCallbackArg;
         static OSTime sThreshold;
         static s32 sResetOccurredPort;
+        static bool sResetOccurred;
+        static bool sResetSwitchPushing;
 
         /* 0x0 */ bool mReset;
     };  // Size: 0x4