d_operate_wind mostly done (#1207)

3 files changed, 63 insertions, 13 deletions

diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h
index dd55e7e8..a8af95ad 100644
--- a/include/JSystem/J2DGraph/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture.h
@@ -27,7 +27,10 @@ enum J2DMirror {
 class J2DPicture : public J2DPane {
 public:
     struct TCornerColor {
-        // TODO
+        JUtility::TColor corner0;
+        JUtility::TColor corner1;
+        JUtility::TColor corner2;
+        JUtility::TColor corner3;
     };
 
     J2DPicture();
@@ -122,8 +125,12 @@ public:
 
     void load(u8 i) { mpTexture[i]->load((GXTexMapID)i); }
 
-    // TODO
-    void getCornerColor(J2DPicture::TCornerColor&) const {}
+    void getCornerColor(J2DPicture::TCornerColor& rColor) const {
+        rColor.corner0 = mCornerColor[0];
+        rColor.corner1 = mCornerColor[1];
+        rColor.corner2 = mCornerColor[2];
+        rColor.corner3 = mCornerColor[3];
+    }
 
 protected:
     /* 0x0CC */ JUTTexture* mpTexture[4];
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index baf35c1e..e98b1db4 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -622,6 +622,7 @@ public:
     void setMsgDtArchive(JKRArchive * pArc) { mpEnglishTextArchive = pArc; }
     JKRArchive* getMsgDtArchive() { return mpEnglishTextArchive; }
     JKRArchive* getNameResArchive() { return mpNameResArchive; }
+    JKRArchive* getWindResArchive() { return mpWindResArchive; }
 #if VERSION > VERSION_JPN
     void setMsgDt2Archive(JKRArchive * pArc) { mpHyruleTextArchive = pArc; }
     JKRArchive* getMsgDt2Archive() { return mpHyruleTextArchive; }
@@ -4004,6 +4005,7 @@ inline void dComIfGp_setFontArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play
 inline void dComIfGp_setMsgDtArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setMsgDtArchive(pArc); }
 inline JKRArchive* dComIfGp_getMsgDtArchive() { return g_dComIfG_gameInfo.play.getMsgDtArchive(); }
 inline JKRArchive* dComIfGp_getNameResArchive() { return g_dComIfG_gameInfo.play.getNameResArchive(); }
+inline JKRArchive* dComIfGp_getWindResArchive() { return g_dComIfG_gameInfo.play.getWindResArchive(); }
 #if VERSION > VERSION_JPN
 inline void dComIfGp_setMsgDt2Archive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setMsgDt2Archive(pArc); }
 inline JKRArchive* dComIfGp_getMsgDt2Archive() { return g_dComIfG_gameInfo.play.getMsgDt2Archive(); }
diff --git a/include/d/d_operate_wind.h b/include/d/d_operate_wind.h
index 94edb695..6c02f7f0 100644
--- a/include/d/d_operate_wind.h
+++ b/include/d/d_operate_wind.h
@@ -52,7 +52,7 @@ public:
 
 class dDlst_Ow_mask_c : public dDlst_base_c {
 public:
-    void setScreen(J2DScreen*) {}
+    void setScreen(J2DScreen* s) { scrn = s; }
     
     void draw();
 
@@ -63,9 +63,11 @@ public:
 class dOperate_wind_c {
 public:
     virtual ~dOperate_wind_c() {}
-    void setTimer(s16) {}
+    void setTimer(s16 i_timer) {
+        mTimer = i_timer;
+    }
     
-    static int dOw_angleRegular(f32);
+    int dOw_angleRegular(f32);
     int dOw_stickControl(int, s16);
     void screenSet();
     void alphaSet(f32);
@@ -90,7 +92,11 @@ public:
 public:
     /* 0x004 */ J2DScreen* scrn1;
     /* 0x008 */ J2DScreen* scrn2;
-    /* 0x00C */ fopMsgM_pane_class field_0x0c[5];
+    /* 0x00C */ fopMsgM_pane_class field_0x0c;
+    /* 0x044 */ fopMsgM_pane_class field_0x44;
+    /* 0x07C */ fopMsgM_pane_class field_0x7c;
+    /* 0x0B4 */ fopMsgM_pane_class field_0xb4;
+    /* 0x0EC */ fopMsgM_pane_class field_0xec;
     /* 0x124 */ fopMsgM_pane_class field_0x124[2];
     /* 0x194 */ fopMsgM_pane_class field_0x194;
     /* 0x1CC */ fopMsgM_pane_class field_0x1cc[4];
@@ -101,6 +107,26 @@ public:
     /* 0x55C */ STControl* stick;
     /* 0x560 */ dDlst_Ow_main_c* mMain;
     /* 0x564 */ dDlst_Ow_mask_c* mMask;
+#if VERSION == VERSION_PAL
+    /* 0x568 */ ResTIMG* shipfontTimg;
+#endif
+    /* 0x568 */ J2DPicture::TCornerColor field_0x568;
+    /* 0x578 */ J2DPicture::TCornerColor field_0x578;
+    /* 0x588 */ J2DPicture::TCornerColor field_0x588;
+    /* 0x598 */ f32 field_0x598[50];
+    /* 0x660 */ f32 field_0x660[50];
+    /* 0x728 */ f32 field_0x728[50];
+    /* 0x7F0 */ f32 field_0x7f0[50];
+    /* 0x8B8 */ f32 field_0x8b8;
+    /* 0x8BC */ u8 field_0x8BC[0x8C0 - 0x8BC];
+    /* 0x8C0 */ f32 mPosX;
+    /* 0x8C4 */ f32 mPosY;
+    /* 0x8C8 */ s16 mTimer;
+    /* 0x8CA */ s16 field_0x8ca;
+    /* 0x8CC */ s16 mDeg;
+    /* 0x8CE */ s16 field_0x8ce;
+    /* 0x8D0 */ int field_0x8d0;
+    /* 0x8D4 */ u8 field_0x8d4;
 };
 
 class dOw_c : public msg_class {
@@ -109,11 +135,26 @@ public:
     inline bool _draw();
     inline void _move();
     inline void _open();
-    JKRExpHeap* getHeap() { return heap; }
-    void getStatus() {}
-    void setHeap(JKRExpHeap* h) { heap = h; }
-    void setStatus(u8) {}
-    void setTimer(s16) {}
+
+    JKRExpHeap* getHeap() {
+        return heap;
+    }
+
+    u8 getStatus() {
+        return status;
+    }
+
+    void setHeap(JKRExpHeap* h) {
+        heap = h;
+    }
+
+    void setStatus(u8 i_status) {
+        status = i_status;
+    }
+
+    void setTimer(s16 i_timer) {
+        dOw_scrn->setTimer(i_timer);
+    }
 
     void _create();
     void _delete();
@@ -121,7 +162,7 @@ public:
 public:
     /* 0x0FC */ JKRExpHeap* heap;
     /* 0x100 */ dOperate_wind_c* dOw_scrn;
-    /* 0x104 */ u8 field_0x104;
+    /* 0x104 */ u8 status;
 };
 
 #endif /* D_OPERATE_WIND_H */