d_ky_thunder done / d_scope wip / m_Do_graphic wip (#308)

* d_ky_thunder OK + misc build fixes

* d_scope mostly done

* some m_Do_graphic wip

* remove asm

include/d/a/d_a_alink.h

@@ -6334,10 +6334,9 @@ public:
         if (field_0x84e != 3 && field_0x84e != 4) {
             if (field_0x84e == 2) {
                 return false;
-            } else {
-                return true;
             }
         }
+        return true;
     }
 
     int checkShadowModelDraw() const {

include/d/a/d_a_player.h

@@ -578,7 +578,7 @@ public:
     virtual bool exchangeGrabActor(fopAc_ac_c*);
     virtual bool setForceGrab(fopAc_ac_c*, int, int);
     virtual void setForcePutPos(cXyz const&);
-    virtual bool checkPlayerNoDraw();
+    virtual BOOL checkPlayerNoDraw();
     virtual bool checkRopeTag();
     virtual void voiceStart(u32);
     virtual void seStartOnlyReverb(u32);
@@ -601,7 +601,7 @@ public:
     virtual void setPlayerPosAndAngle(float (*)[4]);
     virtual bool setThrowDamage(short, float, float, int, int, int);
     virtual bool checkSetNpcTks(cXyz*, int, int);
-    virtual bool setRollJump(float, float, short);
+    virtual int setRollJump(float, float, short);
     virtual void playerStartCollisionSE(u32, u32);
     virtual void changeTextureAnime(u16, u16, int);
     virtual void cancelChangeTextureAnime();

include/d/com/d_com_inf_game.h

@@ -85,6 +85,7 @@ class daHorse_c;
 class dPa_control_c;
 class daAlink_c;
 class dMsgObject_c;
+class J2DOrthoGraph;
 
 class dComIfG_play_c {
 public:
@@ -126,7 +127,7 @@ public:
     dStage_stageDt_c& getStage() { return mStageData; }
     dEvt_control_c& getEvent() { return mEvent; }
     daHorse_c* getHorseActor() { return (daHorse_c*)mPlayerPtr[1]; }
-    J2DGrafContext* getCurrentGrafPort() { return mCurrentGrafPort; }
+    J2DGrafContext* getCurrentGrafPort() { return (J2DGrafContext*)mCurrentGrafPort; }
     dVibration_c& getVibration() { return mVibration; }
     camera_class* getCamera(int idx) { return mCameraInfo[idx].mCamera; }
     void* getPlayerPtr(int ptrIdx) { return mPlayerPtr[ptrIdx]; }
@@ -136,6 +137,11 @@ public:
     dAttention_c& getAttention() { return mAttention; }
     dStage_startStage_c* getStartStage() { return &mStartStage; }
 
+    void setCurrentGrafPort(J2DOrthoGraph* i_graf) { mCurrentGrafPort = i_graf; }
+    void setCurrentWindow(dDlst_window_c* i_window) { mCurrentWindow = i_window; }
+    void setCurrentView(view_class* i_view) { mCurrentView = i_view; }
+    void setCurrentViewport(view_port_class* i_viewport) { mCurrentViewport = i_viewport; }
+
     void setSelectItem(int idx, u8 i_itemNo) { mSelectItem[idx] = i_itemNo; }
     u8 getSelectItem(int idx) { return mSelectItem[idx]; }
     void setSelectEquip(int idx, u8 item_id) { mSelectEquip[idx] = item_id; }
@@ -267,6 +273,11 @@ public:
         mASetFlagForce = flag;
     }
 
+    void setRStatusForce(u8 status, u8 flag) {
+        mRStatusForce = status;
+        mRSetFlagForce = flag;
+    }
+
     void setItemRupeeCount(s32 rupees) { mItemRupeeCount += rupees; }
     void setItemMagicCount(s16 magic) { mItemMagicCount += magic; }
     void setItemMaxMagicCount(s16 max) { mItemMaxMagicCount += max; }
@@ -401,6 +412,8 @@ public:
         setCameraAttentionStatus(camIdx, 0);
     }
 
+    f32 getCameraZoomForcus(int i_no) { return mCameraInfo[i_no].mCameraZoomForcus; }
+
     void setMesgCamInfoID(int param_0) {
         mMesgCamInfo = param_0;
     }
@@ -656,7 +669,7 @@ public:
     /* 0x0500C */ dDlst_window_c* mCurrentWindow;
     /* 0x05010 */ view_class* mCurrentView;
     /* 0x05014 */ view_port_class* mCurrentViewport;
-    /* 0x05018 */ J2DGrafContext* mCurrentGrafPort;
+    /* 0x05018 */ J2DOrthoGraph* mCurrentGrafPort;
     /* 0x0501C */ void* mItemTable;
     /* 0x0501D */ u8 field_0x501d[4];
     /* 0x05024 */ char mLastPlayStageName[8];
@@ -1956,6 +1969,10 @@ inline void dComIfGp_setAStatusForce(u8 status, u8 flag) {
     g_dComIfG_gameInfo.play.setAStatusForce(status, flag);
 }
 
+inline void dComIfGp_setRStatusForce(u8 status, u8 flag) {
+    g_dComIfG_gameInfo.play.setRStatusForce(status, flag);
+}
+
 inline u8 dComIfGp_getAStatus() {
     return g_dComIfG_gameInfo.play.getAStatus();
 }
@@ -2173,6 +2190,10 @@ inline void dComIfGp_setCameraInfo(int camIdx, camera_class* p_cam, int param_2,
     g_dComIfG_gameInfo.play.setCameraInfo(camIdx, p_cam, param_2, param_3, param_4);
 }
 
+inline f32 dComIfGp_getCameraZoomForcus(int i_no) {
+    return g_dComIfG_gameInfo.play.getCameraZoomForcus(i_no);
+}
+
 inline void dComIfGp_clearPlayerStatus0(int param_0, u32 flag) {
     g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 0, flag);
 }
@@ -2505,6 +2526,22 @@ inline dEvent_manager_c& i_dComIfGp_getEventManager() {
     return g_dComIfG_gameInfo.play.getEvtManager();
 }
 
+inline void dComIfGp_setCurrentGrafPort(J2DOrthoGraph* i_graf) {
+    g_dComIfG_gameInfo.play.setCurrentGrafPort(i_graf);
+}
+
+inline void dComIfGp_setCurrentWindow(dDlst_window_c* i_window) {
+    g_dComIfG_gameInfo.play.setCurrentWindow(i_window);
+}
+
+inline void dComIfGp_setCurrentView(view_class* i_view) {
+    g_dComIfG_gameInfo.play.setCurrentView(i_view);
+}
+
+inline void dComIfGp_setCurrentViewport(view_port_class* i_viewport) {
+    g_dComIfG_gameInfo.play.setCurrentViewport(i_viewport);
+}
+
 inline BOOL dComIfGp_event_compulsory(void* param_0, const char* param_1, u16 param_2) {
     return g_dComIfG_gameInfo.play.getEvent().compulsory(param_0, param_1, param_2);
 }
@@ -2658,6 +2695,12 @@ inline void dComIfGp_particle_calc2D() {
     g_dComIfG_gameInfo.play.getParticle()->calc2D();
 }
 
+inline void dComIfGp_particle_calcMenu() {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->calcMenu();
+    }
+}
+
 inline void dComIfGp_particle_cleanup() {
     g_dComIfG_gameInfo.play.getParticle()->cleanup();
 }
@@ -2666,6 +2709,120 @@ inline void dComIfGp_particle_removeScene(bool param_0) {
     g_dComIfG_gameInfo.play.getParticle()->removeScene(param_0);
 }
 
+inline void dComIfGp_particle_drawFogPri0_B(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawFogPri0_B(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawNormalPri0_B(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawNormalPri0_B(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawFogPri0_A(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawFogPri0_A(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawNormalPri0_A(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawNormalPri0_A(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawFogPri4(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawFogPri4(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawProjection(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawProjection(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawFogPri1(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawFogPri1(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_draw(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawNormal(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawFogPri2(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawFogPri2(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawFog(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawNormalFog(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawFogPri3(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawFogPri3(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawP1(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawNormalP1(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawDarkworld(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawDarkworld(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_drawScreen(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->drawFogScreen(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_draw2Dgame(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->draw2Dgame(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_draw2Dfore(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->draw2Dfore(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_draw2Dback(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->draw2Dback(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_draw2DmenuFore(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->draw2DmenuFore(i_drawInfo);
+    }
+}
+
+inline void dComIfGp_particle_draw2DmenuBack(JPADrawInfo* i_drawInfo) {
+    if (g_dComIfG_gameInfo.play.getParticle() != NULL) {
+        g_dComIfG_gameInfo.play.getParticle()->draw2DmenuBack(i_drawInfo);
+    }
+}
+
 inline int dComIfG_getTimerNowTimeMs() {
     return g_dComIfG_gameInfo.play.getTimerNowTimeMs();
 }
@@ -2944,6 +3101,110 @@ inline void dComIfGd_entryZSortListZxlu(J3DPacket* i_packet, cXyz& param_1) {
     g_dComIfG_gameInfo.drawlist.entryZSortListZxlu(i_packet, param_1);
 }
 
+inline void dComIfGd_drawCopy2D() {
+    g_dComIfG_gameInfo.drawlist.drawCopy2D();
+}
+
+inline void dComIfGd_drawOpaListSky() {
+    g_dComIfG_gameInfo.drawlist.drawOpaListSky();
+}
+
+inline void dComIfGd_drawXluListSky() {
+    g_dComIfG_gameInfo.drawlist.drawXluListSky();
+}
+
+inline void dComIfGd_drawOpaListBG() {
+    g_dComIfG_gameInfo.drawlist.drawOpaListBG();
+}
+
+inline void dComIfGd_drawOpaListDarkBG() {
+    g_dComIfG_gameInfo.drawlist.drawOpaListDarkBG();
+}
+
+inline void dComIfGd_drawOpaListMiddle() {
+    g_dComIfG_gameInfo.drawlist.drawOpaListMiddle();
+}
+
+inline void dComIfGd_drawOpaList() {
+    g_dComIfG_gameInfo.drawlist.drawOpaList();
+}
+
+inline void dComIfGd_drawOpaListDark() {
+    g_dComIfG_gameInfo.drawlist.drawOpaListDark();
+}
+
+inline void dComIfGd_drawOpaListPacket() {
+    g_dComIfG_gameInfo.drawlist.drawOpaListPacket();
+}
+
+inline void dComIfGd_drawXluListBG() {
+    g_dComIfG_gameInfo.drawlist.drawXluListBG();
+}
+
+inline void dComIfGd_drawXluListDarkBG() {
+    g_dComIfG_gameInfo.drawlist.drawXluListDarkBG();
+}
+
+inline void dComIfGd_drawXluList() {
+    g_dComIfG_gameInfo.drawlist.drawXluList();
+}
+
+inline void dComIfGd_drawXluListDark() {
+    g_dComIfG_gameInfo.drawlist.drawXluListDark();
+}
+
+inline void dComIfGd_drawXluListInvisible() {
+    g_dComIfG_gameInfo.drawlist.drawXluListInvisible();
+}
+
+inline void dComIfGd_drawOpaListInvisible() {
+    g_dComIfG_gameInfo.drawlist.drawOpaListInvisible();
+}
+
+inline void dComIfGd_drawXluListZxlu() {
+    g_dComIfG_gameInfo.drawlist.drawXluListZxlu();
+}
+
+inline void dComIfGd_drawXluList2DScreen() {
+    g_dComIfG_gameInfo.drawlist.drawXluList2DScreen();
+}
+
+inline void dComIfGd_drawOpaList3Dlast() {
+    g_dComIfG_gameInfo.drawlist.drawOpaList3Dlast();
+}
+
+inline void dComIfGd_draw2DOpa() {
+    g_dComIfG_gameInfo.drawlist.draw2DOpa();
+}
+
+inline void dComIfGd_draw2DOpaTop() {
+    g_dComIfG_gameInfo.drawlist.draw2DOpaTop();
+}
+
+inline void dComIfGd_draw2DXlu() {
+    g_dComIfG_gameInfo.drawlist.draw2DXlu();
+}
+
+inline void dComIfGd_drawOpaListFilter() {
+    g_dComIfG_gameInfo.drawlist.drawOpaListFilter();
+}
+
+inline void dComIfGd_drawIndScreen() {
+    g_dComIfG_gameInfo.drawlist.drawOpaListP0();
+}
+
+inline void dComIfGd_drawListZxlu() {
+    g_dComIfG_gameInfo.drawlist.drawXluListZxlu();
+}
+
+inline void dComIfGd_drawShadow(Mtx param_0) {
+    g_dComIfG_gameInfo.drawlist.drawShadow(param_0);
+}
+
+inline void dComIfGd_imageDrawShadow(Mtx param_0) {
+    g_dComIfG_gameInfo.drawlist.imageDrawShadow(param_0);
+}
+
 inline daPy_py_c* daPy_getLinkPlayerActorClass() {
     return dComIfGp_getLinkPlayer();
 }

include/d/d_drawlist.h

@@ -218,7 +218,7 @@ private:
     /* 0x15EF4 */ void* field_0x15ef4;
 };
 
-class dDlst_window_c : public view_port_class {
+class dDlst_window_c {
 public:
     dDlst_window_c() {}
     ~dDlst_window_c() {}
@@ -228,9 +228,10 @@ public:
     void setCameraID(int id) { mCameraID = id; }
     s8 getCameraID() { return mCameraID; }
     void setMode(int mode) { mMode = mode; }
-    f32 getViewPort() { return mXOrig; }
+    view_port_class* getViewPort() { return &mViewport; }
 
 private:
+    /* 0x00 */ view_port_class mViewport;
     /* 0x28 */ s8 mCameraID;
     /* 0x29 */ s8 mMode;
 };
@@ -257,7 +258,7 @@ public:
     /* 800567C4 */ void draw(dDlst_base_c**, dDlst_base_c**);
     /* 8005681C */ static void wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor);
     /* 800568D8 */ static void wipeIn(f32 i_wipeSpeed);
-    /* 80056900 */ void calcWipe();
+    /* 80056900 */ static void calcWipe();
 
     enum DrawBuffer {
         /* 0x00 */ DB_OPA_LIST_SKY,
@@ -331,9 +332,34 @@ public:
         mPeekZ.newData(param_0, param_1, param_2);
     }
 
-    view_port_class* getViewport() {
-        return mViewport;
-    }
+    view_port_class* getViewport() { return mViewport; }
+
+    void drawCopy2D() { draw(mpCopy2DDraw[0], mpCopy2DSet[0]); }
+    void drawOpaListSky() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_SKY]); }
+    void drawXluListSky() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST_SKY]); }
+    void drawOpaListBG() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_BG]); }
+    void drawOpaListDarkBG() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_DARK_BG]); }
+    void drawOpaListMiddle() { drawOpaDrawList(mDrawBuffers[DB_LIST_MIDDLE]); }
+    void drawOpaList() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST]); }
+    void drawOpaListDark() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_DARK]); }
+    void drawOpaListPacket() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_PACKET]); }
+    void drawXluListBG() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST_BG]); }
+    void drawXluListDarkBG() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK_BG]); }
+    void drawXluList() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST]); }
+    void drawXluListDark() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK]); }
+    void drawXluListInvisible() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST_INVISIBLE]); }
+    void drawOpaListInvisible() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_INVISIBLE]); }
+    void drawXluListZxlu() { drawXluDrawList(mDrawBuffers[DB_LIST_Z_XLU]); }
+    void drawXluList2DScreen() { drawXluDrawList(mDrawBuffers[DB_LIST_2D_SCREEN]); }
+    void drawOpaList3Dlast() { drawOpaDrawList(mDrawBuffers[DB_LIST_3D_LAST]); }
+    void drawOpaListFilter() { drawOpaDrawList(mDrawBuffers[DB_LIST_FILTER]); }
+    void drawOpaListP0() { drawOpaDrawList(mDrawBuffers[DB_LIST_P0]); }
+    void draw2DOpa() { draw(mp2DOpaDraw[0], mp2DOpaSet[0]); }
+    void draw2DOpaTop() { draw(mp2DOpaTopDraw[0], mp2DOpaTopSet[0]); }
+    void draw2DXlu() { draw(mp2DXluDraw[0], mp2DXluSet[0]); }
+
+    void imageDrawShadow(Mtx param_0) { mShadowControl.imageDraw(param_0); }
+    void drawShadow(Mtx param_0) { mShadowControl.draw(param_0); }
 
     static void offWipe() { mWipe = 0; }
     static f32 getWipeRate() { return mWipeRate; }

include/d/d_ky_thunder.h

@@ -1,38 +1,41 @@
 #ifndef D_D_KY_THUNDER_H
 #define D_D_KY_THUNDER_H
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
+#include "f_op/f_op_kankyo.h"
 #include "m_Do/m_Do_ext.h"
 
-class dThunder_c {
-private:
-    /* 0x00 */ u8 field_0x00[0xf8];
-    /* 0xF8 */ JKRSolidHeap* mpHeap;
+class dThunder_modelInfo_c {
+public:
+    /* 0x00 */ J3DModel* mpModel;
+    /* 0x04 */ mDoExt_invisibleModel mInvisModel;
+    /* 0x0C */ mDoExt_brkAnm mBrk;
+    /* 0x24 */ mDoExt_btpAnm mBtp;
+};  // Size: 0x3C
+
+class dThunder_c : public kankyo_class {
 public:
     /* 801ADF58 */ int createHeap();
     /* 801ADFB4 */ void adjustHeap();
     /* 801AE458 */ int create();
+    inline int draw();
+    inline int execute(dThunder_c* i_thunder);
+    inline int thunder_delete(dThunder_c* i_thunder);
 
-    ~dThunder_c() {
-        mDoExt_destroySolidHeap(mpHeap);
-    }
-    
+    ~dThunder_c() { mDoExt_destroySolidHeap(mpHeap); }
+
+private:
+    /* 0x0F8 */ JKRSolidHeap* mpHeap;
+    /* 0x0FC */ dThunder_modelInfo_c mModelInfo;
+    /* 0x138 */ cXyz field_0x138;
+    /* 0x144 */ cXyz mThunderPos;
+    /* 0x150 */ cXyz field_0x150;
+    /* 0x15C */ f32 field_0x15c;
+    /* 0x160 */ u8 unk_0x160[4];
+    /* 0x164 */ f32 mBrkSpeed;
+    /* 0x168 */ s16 field_0x168;
+    /* 0x16A */ s16 field_0x16a;
+    /* 0x16C */ s16 field_0x16c;
 };
 
-inline int draw() {
-    // finish
-};
-
-inline int execute() {
-    // finish
-};
-
-inline int thunder_delete(dThunder_c* i_dthunderP) {
-    if (i_dthunderP) {
-        delete i_dthunderP;
-    }
-    return 1;
-}
-
 #endif /* D_D_KY_THUNDER_H */

include/d/kankyo/d_kankyo.h

@@ -41,6 +41,7 @@ void dKy_bg_MAxx_proc(void* param_0);
 void dKy_change_colpat(u8 colpat);
 void dKy_BossLight_set(cXyz* param_0, _GXColor* param_1, f32 param_2, u8 param_3);
 void dKy_custom_colset(u8 prevGather, u8 curGather, f32 blend);
+void dKy_setLight();
 
 struct LIGHT_INFLUENCE {
     /* 800CFC7C */ ~LIGHT_INFLUENCE() {}

include/d/kankyo/d_kankyo_rain.h

@@ -39,5 +39,6 @@ void dKyr_star_init();
 void dKyr_shstar_init();
 void dKyr_star_move();
 void dKyr_shstar_move();
+void dKyr_get_vectle_calc(cXyz* param_0, cXyz* param_1, cXyz* param_2);
 
 #endif /* D_KANKYO_D_KANKYO_RAIN_H */

include/d/meter/d_meter2.h

@@ -12,12 +12,20 @@ class dMeterMap_c;
 
 class dMeterSub_c : public dDlst_base_c {
 public:
+    // these seem to be inlined, but generates in the wrong order in d_scope.cpp
+    /* 8019412C */ //virtual void draw() {}
+    /* 801940D4 */ //virtual ~dMeterSub_c() {}
+    /* 8019411C */ //virtual int _create() { return 0; }
+    /* 80194130 */ //virtual int _execute(u32) { return 0; }
+    /* 80194124 */ //virtual int _delete() { return 0; }
+    /* 80194138 */ //virtual int isDead() { return 0; }
+
     /* 8019412C */ virtual void draw();
-    /* 801940D4 */ virtual ~dMeterSub_c();
-    /* 8019411C */ virtual bool _create();
-    /* 80194130 */ virtual bool _execute(u32);
-    /* 80194124 */ virtual bool _delete();
-    /* 80194138 */ virtual bool isDead();
+    /* 801940D4 */ virtual ~dMeterSub_c() {}
+    /* 8019411C */ virtual int _create();
+    /* 80194130 */ virtual int _execute(u32);
+    /* 80194124 */ virtual int _delete();
+    /* 80194138 */ virtual int isDead();
 };
 
 class dMeterButton_c : public dDlst_base_c {
@@ -130,9 +138,9 @@ public:
 
     /* 8020F1B0 */ virtual void draw();
     /* 8020EDF4 */ virtual ~dMeterString_c();
-    /* 8020EE70 */ virtual bool _create();
-    /* 8020F150 */ virtual bool _execute(u32);
-    /* 8020F49C */ virtual bool _delete();
+    /* 8020EE70 */ virtual int _create();
+    /* 8020F150 */ virtual int _execute(u32);
+    /* 8020F49C */ virtual int _delete();
 };
 
 class dMeterHaihai_c : public dMeterSub_c {
@@ -153,9 +161,9 @@ public:
 
     /* 8020B140 */ virtual void draw();
     /* 8020AEF0 */ virtual ~dMeterHaihai_c();
-    /* 8020AF6C */ virtual bool _create();
-    /* 8020B0F4 */ virtual bool _execute(u32);
-    /* 8020BDAC */ virtual bool _delete();
+    /* 8020AF6C */ virtual int _create();
+    /* 8020B0F4 */ virtual int _execute(u32);
+    /* 8020BDAC */ virtual int _delete();
 };
 
 class dMeter2_c : public msg_class {

include/d/meter/d_meter2_info.h

@@ -148,6 +148,7 @@ public:
     u32 getMsgTimeMs() { return mMsgTimeMs; }
     u32 getTimeMs() { return mTimeMs; }
     u8 getNowCount() { return mNowCount; }
+    void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; }
 
 public:
     /* 0x04 */ u8 unk4[4];
@@ -224,7 +225,7 @@ public:
     /* 0xE2 */ u8 mGoldWolfMapType;
     /* 0xE3 */ u8 mLightDropGetFlag[3];
     /* 0xE6 */ u8 mLifeGaugeSE;
-    /* 0xE7 */ u8 unk231;
+    /* 0xE7 */ u8 mScopeZoomPointer;
     /* 0xE8 */ u8 mItemExplainWindowStatus;
     /* 0xE9 */ char mSaveStageName[8];
     /* 0xF1 */ bool mFloatingMessageWakuVisible;
@@ -518,6 +519,10 @@ inline u8 dMeter2Info_getNowCount() {
     return g_meter2_info.getNowCount();
 }
 
+inline void dMeter2Info_setScopeZoomPointer(u8 param_0) {
+    g_meter2_info.setScopeZoomPointer(param_0);
+}
+
 char* dMeter2Info_getNumberTextureName(int pIndex);
 void dMeter2Info_recieveLetter();
 u8 dMeter2Info_getNewLetterNum();

include/d/particle/d_particle.h

@@ -343,6 +343,26 @@ public:
                    param_9, param_10, param_11, param_12);
     }
 
+    void drawFogPri0_B(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 7); }
+    void drawNormalPri0_B(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 5); }
+    void drawFogPri0_A(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 6); }
+    void drawNormalPri0_A(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 4); }
+    void drawFogPri4(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 11); }
+    void drawProjection(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 3); }
+    void drawFogPri1(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 8); }
+    void drawNormal(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 0); }
+    void drawFogPri2(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 9); }
+    void drawNormalFog(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 1); }
+    void drawFogPri3(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 10); }
+    void drawNormalP1(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 2); }
+    void drawDarkworld(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 12); }
+    void drawFogScreen(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 13); }
+    void draw2Dgame(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 14); }
+    void draw2Dfore(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 15); }
+    void draw2Dback(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 16); }
+    void draw2DmenuFore(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 17); }
+    void draw2DmenuBack(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 18); }
+
     JKRExpHeap* getResHeap() { return m_resHeap; }
 
     void levelAllForceOnEventMove() { field_0x210.allForceOnEventMove(); }

include/d/save/d_save_init.h

@@ -1,6 +1,6 @@
 #ifndef D_SAVE_D_SAVE_INIT_H
 #define D_SAVE_D_SAVE_INIT_H
 
-#include "dolphin/types.h"
+void setInitEventBit();
 
 #endif /* D_SAVE_D_SAVE_INIT_H */