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

20 files changed, 516 insertions, 152 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index 22b0aa6bd5..a9835b5858 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -469,7 +469,7 @@ public:
     /* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*);
 
     /* 8032BCAC */ virtual ~J3DAnmColor();
-    /* 8032BF44 */ virtual bool getKind() const;
+    /* 8032BF44 */ virtual s32 getKind() const;
     /* 8032BF4C */ virtual void getColor(u16, _GXColor*) const;
 
     u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
index c489742c32..da9e49cfe2 100644
--- a/include/JSystem/J3DGraphBase/J3DMatBlock.h
+++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h
@@ -41,8 +41,8 @@ public:
     virtual void diff(u32) = 0;
     virtual void diffTexMtx() = 0;
     virtual void diffTexGen() = 0;
-    /* 803172FC */ virtual bool countDLSize();
-    virtual void getType() = 0;
+    /* 803172FC */ virtual s32 countDLSize();
+    virtual u32 getType() = 0;
     /* 8031741C */ virtual void setTexGenNum(u32 const*);
     /* 8000E0D0 */ virtual void setTexGenNum(u32);
     /* 8000DFE8 */ virtual bool getTexGenNum() const;
@@ -76,12 +76,12 @@ public:
     /* 80322E74 */ virtual u32 getType();
     /* 80322D3C */ virtual void setTexGenNum(u32 const*);
     /* 80322D34 */ virtual void setTexGenNum(u32);
-    /* 80322D48 */ virtual void getTexGenNum() const;
+    /* 80322D48 */ virtual bool getTexGenNum() const;
     /* 80322D50 */ virtual void setTexCoord(u32, J3DTexCoord const*);
-    /* 80322D64 */ virtual void getTexCoord(u32);
+    /* 80322D64 */ virtual bool getTexCoord(u32);
     /* 80322D78 */ virtual void setTexMtx(u32, J3DTexMtx*);
-    /* 80322D88 */ virtual void getTexMtx(u32);
-    /* 80322D98 */ virtual void getTexMtxOffset() const;
+    /* 80322D88 */ virtual J3DTexMtx* getTexMtx(u32);
+    /* 80322D98 */ virtual bool getTexMtxOffset() const;
     /* 80322DA0 */ virtual void setTexMtxOffset(u32);
     /* 80317180 */ virtual ~J3DTexGenBlockPatched();
 
@@ -103,7 +103,7 @@ public:
     /* 80322C6C */ virtual u32 getType();
     /* 80322C9C */ virtual void setNBTScale(J3DNBTScale const*);
     /* 80322C78 */ virtual void setNBTScale(J3DNBTScale);
-    /* 80322CC0 */ virtual void getNBTScale();
+    /* 80322CC0 */ virtual J3DNBTScale* getNBTScale();
     /* 80322CC8 */ virtual ~J3DTexGenBlockBasic();
 
 private:
@@ -121,7 +121,7 @@ public:
     /* 80322DA8 */ virtual u32 getType();
     /* 80322DD8 */ virtual void setNBTScale(J3DNBTScale const*);
     /* 80322DB4 */ virtual void setNBTScale(J3DNBTScale);
-    /* 80322DFC */ virtual void getNBTScale();
+    /* 80322DFC */ virtual J3DNBTScale* getNBTScale();
     /* 80322E04 */ virtual ~J3DTexGenBlock4();
 
 private:
@@ -144,8 +144,8 @@ public:
     /* 8000DBC8 */ virtual void patchTexNoAndTexCoordScale();
     virtual void ptrToIndex() = 0;
     virtual void indexToPtr() = 0;
-    virtual void getType() = 0;
-    /* 8031730C */ virtual bool countDLSize();
+    virtual u32 getType() = 0;
+    /* 8031730C */ virtual s32 countDLSize();
     /* 80323544 */ virtual void setTexNo(u32, u16 const*);
     /* 8000E0AC */ virtual void setTexNo(u32, u16);
     /* 8000DF94 */ virtual u32 getTexNo(u32) const;
@@ -214,27 +214,27 @@ public:
     /* 803229E4 */ virtual u32 getTexNo(u32) const;
     /* 80322A08 */ virtual void setTevOrder(u32, J3DTevOrder const*);
     /* 803229F4 */ virtual void setTevOrder(u32, J3DTevOrder);
-    /* 80322A1C */ virtual void getTevOrder(u32);
+    /* 80322A1C */ virtual bool getTevOrder(u32);
     /* 80322B24 */ virtual void setTevColor(u32, J3DGXColorS10 const*);
     /* 80322AF8 */ virtual void setTevColor(u32, J3DGXColorS10);
-    /* 80322B50 */ virtual void getTevColor(u32);
+    /* 80322B50 */ virtual GXColorS10* getTevColor(u32);
     /* 80322B90 */ virtual void setTevKColor(u32, J3DGXColor const*);
     /* 80322B64 */ virtual void setTevKColor(u32, J3DGXColor);
-    /* 80322BBC */ virtual void getTevKColor(u32);
+    /* 80322BBC */ virtual GXColor* getTevKColor(u32);
     /* 80322BDC */ virtual void setTevKColorSel(u32, u8 const*);
     /* 80322BD0 */ virtual void setTevKColorSel(u32, u8);
-    /* 80322BEC */ virtual void getTevKColorSel(u32);
+    /* 80322BEC */ virtual bool getTevKColorSel(u32);
     /* 803229AC */ virtual void setTevStageNum(u8 const*);
     /* 803229A4 */ virtual void setTevStageNum(u8);
-    /* 803229B8 */ virtual void getTevStageNum() const;
+    /* 803229B8 */ virtual u8 getTevStageNum() const;
     /* 80322A6C */ virtual void setTevStage(u32, J3DTevStage const*);
     /* 80322A30 */ virtual void setTevStage(u32, J3DTevStage);
-    /* 80322AA8 */ virtual void getTevStage(u32);
+    /* 80322AA8 */ virtual bool getTevStage(u32);
     /* 80322AD0 */ virtual void setIndTevStage(u32, J3DIndTevStage const*);
     /* 80322ABC */ virtual void setIndTevStage(u32, J3DIndTevStage);
-    /* 80322AE4 */ virtual void getIndTevStage(u32);
-    /* 80322BF8 */ virtual void getTexNoOffset() const;
-    /* 80322C00 */ virtual void getTevRegOffset() const;
+    /* 80322AE4 */ virtual bool getIndTevStage(u32);
+    /* 80322BF8 */ virtual bool getTexNoOffset() const;
+    /* 80322C00 */ virtual bool getTevRegOffset() const;
     /* 80322C08 */ virtual void setTevRegOffset(u32);
     /* 80322C10 */ virtual ~J3DTevBlockPatched();
 
@@ -278,35 +278,35 @@ public:
     /* 80322040 */ virtual u32 getTexNo(u32) const;
     /* 80322064 */ virtual void setTevOrder(u32, J3DTevOrder const*);
     /* 80322050 */ virtual void setTevOrder(u32, J3DTevOrder);
-    /* 80322078 */ virtual void getTevOrder(u32);
+    /* 80322078 */ virtual bool getTevOrder(u32);
     /* 803220B8 */ virtual void setTevColor(u32, J3DGXColorS10 const*);
     /* 8032208C */ virtual void setTevColor(u32, J3DGXColorS10);
-    /* 803220E4 */ virtual void getTevColor(u32);
+    /* 803220E4 */ virtual GXColorS10* getTevColor(u32);
     /* 80322124 */ virtual void setTevKColor(u32, J3DGXColor const*);
     /* 803220F8 */ virtual void setTevKColor(u32, J3DGXColor);
-    /* 80322150 */ virtual void getTevKColor(u32);
+    /* 80322150 */ virtual GXColor* getTevKColor(u32);
     /* 80322170 */ virtual void setTevKColorSel(u32, u8 const*);
     /* 80322164 */ virtual void setTevKColorSel(u32, u8);
-    /* 80322180 */ virtual void getTevKColorSel(u32);
+    /* 80322180 */ virtual bool getTevKColorSel(u32);
     /* 80322198 */ virtual void setTevKAlphaSel(u32, u8 const*);
     /* 8032218C */ virtual void setTevKAlphaSel(u32, u8);
-    /* 803221A8 */ virtual void getTevKAlphaSel(u32);
+    /* 803221A8 */ virtual bool getTevKAlphaSel(u32);
     /* 803221BC */ virtual void setTevStageNum(u8 const*);
     /* 803221B4 */ virtual void setTevStageNum(u8);
-    /* 803221C8 */ virtual void getTevStageNum() const;
+    /* 803221C8 */ virtual u8 getTevStageNum() const;
     /* 8032220C */ virtual void setTevStage(u32, J3DTevStage const*);
     /* 803221D0 */ virtual void setTevStage(u32, J3DTevStage);
-    /* 80322248 */ virtual void getTevStage(u32);
+    /* 80322248 */ virtual bool getTevStage(u32);
     /* 80322294 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*);
     /* 8032225C */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo);
     /* 803222DC */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*);
     /* 803222CC */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable);
-    /* 803222EC */ virtual void getTevSwapModeTable(u32);
+    /* 803222EC */ virtual bool getTevSwapModeTable(u32);
     /* 80322310 */ virtual void setIndTevStage(u32, J3DIndTevStage const*);
     /* 803222FC */ virtual void setIndTevStage(u32, J3DIndTevStage);
-    /* 80322324 */ virtual void getIndTevStage(u32);
-    /* 80322338 */ virtual void getTexNoOffset() const;
-    /* 80322340 */ virtual void getTevRegOffset() const;
+    /* 80322324 */ virtual bool getIndTevStage(u32);
+    /* 80322338 */ virtual bool getTexNoOffset() const;
+    /* 80322340 */ virtual bool getTevRegOffset() const;
     /* 80322348 */ virtual void setTevRegOffset(u32);
     /* 80322350 */ virtual ~J3DTevBlock4();
 
@@ -348,35 +348,35 @@ public:
     /* 80322404 */ virtual u32 getTexNo(u32) const;
     /* 80322428 */ virtual void setTevOrder(u32, J3DTevOrder const*);
     /* 80322414 */ virtual void setTevOrder(u32, J3DTevOrder);
-    /* 8032243C */ virtual void getTevOrder(u32);
+    /* 8032243C */ virtual bool getTevOrder(u32);
     /* 8032247C */ virtual void setTevColor(u32, J3DGXColorS10 const*);
     /* 80322450 */ virtual void setTevColor(u32, J3DGXColorS10);
-    /* 803224A8 */ virtual void getTevColor(u32);
+    /* 803224A8 */ virtual GXColorS10* getTevColor(u32);
     /* 803224E8 */ virtual void setTevKColor(u32, J3DGXColor const*);
     /* 803224BC */ virtual void setTevKColor(u32, J3DGXColor);
-    /* 80322514 */ virtual void getTevKColor(u32);
+    /* 80322514 */ virtual GXColor* getTevKColor(u32);
     /* 80322534 */ virtual void setTevKColorSel(u32, u8 const*);
     /* 80322528 */ virtual void setTevKColorSel(u32, u8);
-    /* 80322544 */ virtual void getTevKColorSel(u32);
+    /* 80322544 */ virtual bool getTevKColorSel(u32);
     /* 8032255C */ virtual void setTevKAlphaSel(u32, u8 const*);
     /* 80322550 */ virtual void setTevKAlphaSel(u32, u8);
-    /* 8032256C */ virtual void getTevKAlphaSel(u32);
+    /* 8032256C */ virtual bool getTevKAlphaSel(u32);
     /* 80322580 */ virtual void setTevStageNum(u8 const*);
     /* 80322578 */ virtual void setTevStageNum(u8);
-    /* 8032258C */ virtual void getTevStageNum() const;
+    /* 8032258C */ virtual u8 getTevStageNum() const;
     /* 803225D0 */ virtual void setTevStage(u32, J3DTevStage const*);
     /* 80322594 */ virtual void setTevStage(u32, J3DTevStage);
-    /* 8032260C */ virtual void getTevStage(u32);
+    /* 8032260C */ virtual bool getTevStage(u32);
     /* 80322658 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*);
     /* 80322620 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo);
     /* 803226A0 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*);
     /* 80322690 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable);
-    /* 803226B0 */ virtual void getTevSwapModeTable(u32);
+    /* 803226B0 */ virtual bool getTevSwapModeTable(u32);
     /* 803226D4 */ virtual void setIndTevStage(u32, J3DIndTevStage const*);
     /* 803226C0 */ virtual void setIndTevStage(u32, J3DIndTevStage);
-    /* 803226E8 */ virtual void getIndTevStage(u32);
-    /* 803226FC */ virtual void getTexNoOffset() const;
-    /* 80322704 */ virtual void getTevRegOffset() const;
+    /* 803226E8 */ virtual bool getIndTevStage(u32);
+    /* 803226FC */ virtual bool getTexNoOffset() const;
+    /* 80322704 */ virtual bool getTevRegOffset() const;
     /* 8032270C */ virtual void setTevRegOffset(u32);
     /* 80322714 */ virtual ~J3DTevBlock2();
 
@@ -418,35 +418,35 @@ public:
     /* 80321C74 */ virtual u32 getTexNo(u32) const;
     /* 80321C98 */ virtual void setTevOrder(u32, J3DTevOrder const*);
     /* 80321C84 */ virtual void setTevOrder(u32, J3DTevOrder);
-    /* 80321CAC */ virtual void getTevOrder(u32);
+    /* 80321CAC */ virtual bool getTevOrder(u32);
     /* 80321CEC */ virtual void setTevColor(u32, J3DGXColorS10 const*);
     /* 80321CC0 */ virtual void setTevColor(u32, J3DGXColorS10);
-    /* 80321D18 */ virtual void getTevColor(u32);
+    /* 80321D18 */ virtual GXColorS10* getTevColor(u32);
     /* 80321D58 */ virtual void setTevKColor(u32, J3DGXColor const*);
     /* 80321D2C */ virtual void setTevKColor(u32, J3DGXColor);
-    /* 80321D84 */ virtual void getTevKColor(u32);
+    /* 80321D84 */ virtual GXColor* getTevKColor(u32);
     /* 80321DA4 */ virtual void setTevKColorSel(u32, u8 const*);
     /* 80321D98 */ virtual void setTevKColorSel(u32, u8);
-    /* 80321DB4 */ virtual void getTevKColorSel(u32);
+    /* 80321DB4 */ virtual bool getTevKColorSel(u32);
     /* 80321DCC */ virtual void setTevKAlphaSel(u32, u8 const*);
     /* 80321DC0 */ virtual void setTevKAlphaSel(u32, u8);
-    /* 80321DDC */ virtual void getTevKAlphaSel(u32);
+    /* 80321DDC */ virtual bool getTevKAlphaSel(u32);
     /* 80321DE8 */ virtual void setTevStageNum(u8);
     /* 80321DF0 */ virtual void setTevStageNum(u8 const*);
-    /* 80321DFC */ virtual void getTevStageNum() const;
+    /* 80321DFC */ virtual u8 getTevStageNum() const;
     /* 80321E40 */ virtual void setTevStage(u32, J3DTevStage const*);
     /* 80321E04 */ virtual void setTevStage(u32, J3DTevStage);
-    /* 80321E7C */ virtual void getTevStage(u32);
+    /* 80321E7C */ virtual bool getTevStage(u32);
     /* 80321EC8 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*);
     /* 80321E90 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo);
     /* 80321F10 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*);
     /* 80321F00 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable);
-    /* 80321F20 */ virtual void getTevSwapModeTable(u32);
+    /* 80321F20 */ virtual bool getTevSwapModeTable(u32);
     /* 80321F44 */ virtual void setIndTevStage(u32, J3DIndTevStage const*);
     /* 80321F30 */ virtual void setIndTevStage(u32, J3DIndTevStage);
-    /* 80321F58 */ virtual void getIndTevStage(u32);
-    /* 80321F6C */ virtual void getTexNoOffset() const;
-    /* 80321F74 */ virtual void getTevRegOffset() const;
+    /* 80321F58 */ virtual bool getIndTevStage(u32);
+    /* 80321F6C */ virtual bool getTexNoOffset() const;
+    /* 80321F74 */ virtual bool getTevRegOffset() const;
     /* 80321F7C */ virtual void setTevRegOffset(u32);
     /* 80321F84 */ virtual ~J3DTevBlock16();
 
@@ -488,17 +488,17 @@ public:
     /* 803227C8 */ virtual u32 getTexNo(u32) const;
     /* 803227EC */ virtual void setTevOrder(u32, J3DTevOrder const*);
     /* 803227D8 */ virtual void setTevOrder(u32, J3DTevOrder);
-    /* 80322800 */ virtual void getTevOrder(u32);
+    /* 80322800 */ virtual bool getTevOrder(u32);
     /* 80322818 */ virtual void setTevStageNum(u8 const*);
     /* 80322814 */ virtual void setTevStageNum(u8);
-    /* 8032281C */ virtual bool getTevStageNum() const;
+    /* 8032281C */ virtual u8 getTevStageNum() const;
     /* 80322860 */ virtual void setTevStage(u32, J3DTevStage const*);
     /* 80322824 */ virtual void setTevStage(u32, J3DTevStage);
-    /* 8032289C */ virtual void getTevStage(u32);
+    /* 8032289C */ virtual bool getTevStage(u32);
     /* 803228C4 */ virtual void setIndTevStage(u32, J3DIndTevStage const*);
     /* 803228B0 */ virtual void setIndTevStage(u32, J3DIndTevStage);
-    /* 803228D8 */ virtual void getIndTevStage(u32);
-    /* 803228EC */ virtual void getTexNoOffset() const;
+    /* 803228D8 */ virtual bool getIndTevStage(u32);
+    /* 803228EC */ virtual bool getTexNoOffset() const;
     /* 803228F4 */ virtual ~J3DTevBlock1();
 
 private:
@@ -554,8 +554,8 @@ public:
     /* 80317344 */ virtual void diff(u32);
     /* 8031735C */ virtual void diffFog();
     /* 80317360 */ virtual void diffBlend();
-    virtual bool countDLSize();
-    virtual void getType() = 0;
+    virtual s32 countDLSize();
+    virtual u32 getType() = 0;
     /* 80317368 */ virtual void setFog(J3DFog);
     /* 80317364 */ virtual void setFog(J3DFog*);
     /* 8000DF5C */ virtual bool getFog();
@@ -617,23 +617,23 @@ public:
     /* 8032194C */ virtual u32 getType();
     /* 8032197C */ virtual void setFog(J3DFog);
     /* 80321958 */ virtual void setFog(J3DFog*);
-    /* 803219A0 */ virtual void getFog();
+    /* 803219A0 */ virtual bool getFog();
     /* 803219C4 */ virtual void setAlphaComp(J3DAlphaComp const*);
     /* 803219A8 */ virtual void setAlphaComp(J3DAlphaComp const&);
-    /* 803219E0 */ virtual void getAlphaComp();
+    /* 803219E0 */ virtual bool getAlphaComp();
     /* 803219F4 */ virtual void setBlend(J3DBlend const*);
     /* 803219E8 */ virtual void setBlend(J3DBlend const&);
-    /* 80321A00 */ virtual void getBlend();
+    /* 80321A00 */ virtual bool getBlend();
     /* 80321A14 */ virtual void setZMode(J3DZMode const*);
     /* 80321A08 */ virtual void setZMode(J3DZMode);
-    /* 80321A20 */ virtual void getZMode();
+    /* 80321A20 */ virtual bool getZMode();
     /* 80321A30 */ virtual void setZCompLoc(u8 const*);
     /* 80321A28 */ virtual void setZCompLoc(u8);
-    /* 80321A3C */ virtual void getZCompLoc() const;
+    /* 80321A3C */ virtual bool getZCompLoc() const;
     /* 80321A4C */ virtual void setDither(u8 const*);
     /* 80321A44 */ virtual void setDither(u8);
-    /* 80321A58 */ virtual void getDither() const;
-    /* 80321A60 */ virtual void getFogOffset() const;
+    /* 80321A58 */ virtual bool getDither() const;
+    /* 80321A60 */ virtual bool getFogOffset() const;
     /* 80321A68 */ virtual void setFogOffset(u32);
     /* 80321A70 */ virtual ~J3DPEBlockFull();
 
@@ -659,19 +659,19 @@ public:
     /* 80321B00 */ virtual u32 getType();
     /* 80321B28 */ virtual void setAlphaComp(J3DAlphaComp const*);
     /* 80321B0C */ virtual void setAlphaComp(J3DAlphaComp const&);
-    /* 80321B44 */ virtual void getAlphaComp();
+    /* 80321B44 */ virtual bool getAlphaComp();
     /* 80321B58 */ virtual void setBlend(J3DBlend const*);
     /* 80321B4C */ virtual void setBlend(J3DBlend const&);
-    /* 80321B64 */ virtual void getBlend();
+    /* 80321B64 */ virtual bool getBlend();
     /* 80321B78 */ virtual void setZMode(J3DZMode const*);
     /* 80321B6C */ virtual void setZMode(J3DZMode);
-    /* 80321B84 */ virtual void getZMode();
+    /* 80321B84 */ virtual bool getZMode();
     /* 80321B94 */ virtual void setZCompLoc(u8 const*);
     /* 80321B8C */ virtual void setZCompLoc(u8);
-    /* 80321BA0 */ virtual void getZCompLoc() const;
+    /* 80321BA0 */ virtual bool getZCompLoc() const;
     /* 80321BB0 */ virtual void setDither(u8 const*);
     /* 80321BA8 */ virtual void setDither(u8);
-    /* 80321BBC */ virtual void getDither() const;
+    /* 80321BBC */ virtual bool getDither() const;
     /* 80321BC4 */ virtual ~J3DPEBlockFogOff();
 
 private:
@@ -710,8 +710,8 @@ public:
     /* 8031734C */ virtual void reset(J3DIndBlock*);
     virtual void load() = 0;
     virtual void diff(u32) = 0;
-    /* 80317314 */ virtual bool countDLSize();
-    virtual void getType() = 0;
+    /* 80317314 */ virtual s32 countDLSize();
+    virtual u32 getType() = 0;
     /* 8000E0A0 */ virtual void setIndTexStageNum(u8);
     /* 8000DF7C */ virtual bool getIndTexStageNum() const;
     /* 80317410 */ virtual void setIndTexOrder(u32, J3DIndTexOrder);
@@ -736,16 +736,16 @@ public:
     /* 80317BDC */ virtual s32 countDLSize();
     /* 80323390 */ virtual u32 getType();
     /* 8032339C */ virtual void setIndTexStageNum(u8);
-    /* 803233A4 */ virtual void getIndTexStageNum() const;
+    /* 803233A4 */ virtual bool getIndTexStageNum() const;
     /* 803233AC */ virtual void setIndTexOrder(u32, J3DIndTexOrder);
     /* 803233C0 */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*);
-    /* 803233D4 */ virtual void getIndTexOrder(u32);
+    /* 803233D4 */ virtual bool getIndTexOrder(u32);
     /* 8032341C */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*);
     /* 803233E8 */ virtual void setIndTexMtx(u32, J3DIndTexMtx);
-    /* 80323450 */ virtual void getIndTexMtx(u32);
+    /* 80323450 */ virtual bool getIndTexMtx(u32);
     /* 80323478 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*);
     /* 80323464 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale);
-    /* 8032348C */ virtual void getIndTexCoordScale(u32);
+    /* 8032348C */ virtual bool getIndTexCoordScale(u32);
     /* 803234A0 */ virtual ~J3DIndBlockFull();
 
 private:
@@ -791,8 +791,8 @@ public:
     /* 8031743C */ virtual void diffMatColor();
     /* 80317440 */ virtual void diffColorChan();
     /* 80317444 */ virtual void diffLightObj(u32);
-    /* 80317304 */ virtual bool countDLSize();
-    virtual void getType() = 0;
+    /* 80317304 */ virtual s32 countDLSize();
+    virtual u32 getType() = 0;
     /* 80317448 */ virtual void setMatColor(u32, J3DGXColor const*);
     /* 8000E0DC */ virtual void setMatColor(u32, J3DGXColor);
     /* 8000E000 */ virtual _GXColor* getMatColor(u32);
@@ -835,23 +835,23 @@ public:
     /* 80322E80 */ virtual u32 getType();
     /* 80322EB8 */ virtual void setMatColor(u32, J3DGXColor const*);
     /* 80322E8C */ virtual void setMatColor(u32, J3DGXColor);
-    /* 80322EE4 */ virtual void getMatColor(u32);
+    /* 80322EE4 */ virtual GXColor* getMatColor(u32);
     /* 80322F24 */ virtual void setAmbColor(u32, J3DGXColor const*);
     /* 80322EF8 */ virtual void setAmbColor(u32, J3DGXColor);
-    /* 80322F50 */ virtual void getAmbColor(u32);
+    /* 80322F50 */ virtual bool getAmbColor(u32);
     /* 80322F70 */ virtual void setColorChanNum(u8);
     /* 80322F64 */ virtual void setColorChanNum(u8 const*);
-    /* 80322F78 */ virtual void getColorChanNum() const;
+    /* 80322F78 */ virtual bool getColorChanNum() const;
     /* 80322F94 */ virtual void setColorChan(u32, J3DColorChan const&);
     /* 80322F80 */ virtual void setColorChan(u32, J3DColorChan const*);
-    /* 80322FA8 */ virtual void getColorChan(u32);
+    /* 80322FA8 */ virtual bool getColorChan(u32);
     /* 80322FBC */ virtual void setLight(u32, J3DLightObj*);
-    /* 80322FCC */ virtual void getLight(u32);
+    /* 80322FCC */ virtual bool getLight(u32);
     /* 80322FE4 */ virtual void setCullMode(u8 const*);
     /* 80322FDC */ virtual void setCullMode(u8);
-    /* 80322FF0 */ virtual void getCullMode() const;
-    /* 80322FF8 */ virtual void getMatColorOffset() const;
-    /* 80323000 */ virtual void getColorChanOffset() const;
+    /* 80322FF0 */ virtual s32 getCullMode() const;
+    /* 80322FF8 */ virtual bool getMatColorOffset() const;
+    /* 80323000 */ virtual bool getColorChanOffset() const;
     /* 80323008 */ virtual void setMatColorOffset(u32);
     /* 80323010 */ virtual void setColorChanOffset(u32);
     /* 80323018 */ virtual ~J3DColorBlockLightOn();
@@ -883,18 +883,18 @@ public:
     /* 80323560 */ virtual u32 getType();
     /* 80323184 */ virtual void setMatColor(u32, J3DGXColor const*);
     /* 80323158 */ virtual void setMatColor(u32, J3DGXColor);
-    /* 803231B0 */ virtual void getMatColor(u32);
+    /* 803231B0 */ virtual GXColor* getMatColor(u32);
     /* 803231D0 */ virtual void setColorChanNum(u8);
     /* 803231C4 */ virtual void setColorChanNum(u8 const*);
-    /* 803231D8 */ virtual void getColorChanNum() const;
+    /* 803231D8 */ virtual bool getColorChanNum() const;
     /* 803231F4 */ virtual void setColorChan(u32, J3DColorChan const&);
     /* 803231E0 */ virtual void setColorChan(u32, J3DColorChan const*);
-    /* 80323208 */ virtual void getColorChan(u32);
+    /* 80323208 */ virtual bool getColorChan(u32);
     /* 80323224 */ virtual void setCullMode(u8 const*);
     /* 8032321C */ virtual void setCullMode(u8);
-    /* 80323230 */ virtual void getCullMode() const;
-    /* 80323238 */ virtual void getMatColorOffset() const;
-    /* 80323240 */ virtual void getColorChanOffset() const;
+    /* 80323230 */ virtual s32 getCullMode() const;
+    /* 80323238 */ virtual bool getMatColorOffset() const;
+    /* 80323240 */ virtual bool getColorChanOffset() const;
     /* 80323248 */ virtual void setMatColorOffset(u32);
     /* 80323250 */ virtual void setColorChanOffset(u32);
     /* 803170DC */ virtual ~J3DColorBlockLightOff();
@@ -918,7 +918,7 @@ public:
     /* 80323074 */ virtual u32 getType();
     /* 803230AC */ virtual void setAmbColor(u32, J3DGXColor const*);
     /* 80323080 */ virtual void setAmbColor(u32, J3DGXColor);
-    /* 803230D8 */ virtual void getAmbColor(u32);
+    /* 803230D8 */ virtual bool getAmbColor(u32);
     /* 803230EC */ virtual ~J3DColorBlockAmbientOn();
 
 private:
diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index 3a007a1922..d189cd7cde 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/include/JSystem/JFramework/JFWDisplay.h
@@ -82,6 +82,10 @@ public:
         mFrameRate = 0;
     }
 
+    void setDrawDoneMethod(EDrawDone drawDone) { mDrawDoneMethod = drawDone; }
+    void setFader(JUTFader* fader) { mFader = fader; }
+    void setClearColor(JUtility::TColor color) { mClearColor = color; }
+
     static JFWDisplay* sManager;
 
 private:
diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h
index 5b6b2c5978..d9fb055f24 100644
--- a/include/JSystem/JMath/JMath.h
+++ b/include/JSystem/JMath/JMath.h
@@ -21,12 +21,16 @@ inline float __frsqrtes(register double f) {
     return out;
 }
 
-inline f32 JMAFastSqrt(f32 input) {
+inline f32 JMAFastSqrt(register f32 input) {
     if (input > 0.0f) {
-        f32 tmp = __frsqrtes(input);
-        return tmp * input;
+        register f32 out;
+        asm {
+            frsqrte out, input
+        }
+        return out * input;
+    } else {
+        return input;
     }
-    return input;
 }
 
 namespace JMath {
diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h
index 5d72c30279..c8379df13e 100644
--- a/include/JSystem/JParticle/JPAParticle.h
+++ b/include/JSystem/JParticle/JPAParticle.h
@@ -23,6 +23,16 @@ class JPAResourceManager;
 
 class JPADrawInfo {
 public:
+    JPADrawInfo(Mtx param_0, f32 fovY, f32 aspect) {
+        PSMTXCopy(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) {
+        PSMTXCopy(param_0, mCamMtx);
+        C_MTXLightOrtho(mPrjMtx, top, bottom, left, right, 0.5f, 0.5f, 0.5f, 0.5f);
+    }
+
     Mtx mCamMtx;
     Mtx mPrjMtx;
 
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h
index 778ff90eb3..5404009a9f 100644
--- a/include/d/a/d_a_alink.h
+++ b/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 {
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 3a19fc9d30..229859b2e3 100644
--- a/include/d/a/d_a_player.h
+++ b/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();
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index abe20294b6..033dd088de 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/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();
 }
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index 11384960ec..e787cdd8d7 100644
--- a/include/d/d_drawlist.h
+++ b/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; }
diff --git a/include/d/d_ky_thunder.h b/include/d/d_ky_thunder.h
index fd2049b86c..ab099ac2a0 100644
--- a/include/d/d_ky_thunder.h
+++ b/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);
-    }
-    
-};
-
-inline int draw() {
-    // finish
-};
+    ~dThunder_c() { mDoExt_destroySolidHeap(mpHeap); }
 
-inline int execute() {
-    // finish
+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 thunder_delete(dThunder_c* i_dthunderP) {
-    if (i_dthunderP) {
-        delete i_dthunderP;
-    }
-    return 1;
-}
-
 #endif /* D_D_KY_THUNDER_H */
diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h
index d55cc9097a..38dc72efc8 100644
--- a/include/d/kankyo/d_kankyo.h
+++ b/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() {}
diff --git a/include/d/kankyo/d_kankyo_rain.h b/include/d/kankyo/d_kankyo_rain.h
index d9d94e98f3..bcb9548c84 100644
--- a/include/d/kankyo/d_kankyo_rain.h
+++ b/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 */
diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h
index 75198c5793..c959a4876b 100644
--- a/include/d/meter/d_meter2.h
+++ b/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 {
diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h
index b1ebbbc3ba..c36d4dbdb6 100644
--- a/include/d/meter/d_meter2_info.h
+++ b/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();
diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h
index 6a3846f1e8..52167cba2b 100644
--- a/include/d/particle/d_particle.h
+++ b/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(); }
diff --git a/include/d/save/d_save_init.h b/include/d/save/d_save_init.h
index be61da3fe2..e4d6361256 100644
--- a/include/d/save/d_save_init.h
+++ b/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 */
diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h
index 60f9e23a13..dd739e2603 100644
--- a/include/f_ap/f_ap_game.h
+++ b/include/f_ap/f_ap_game.h
@@ -43,7 +43,7 @@ public:
 
 extern fapGm_HIO_c g_HIO;
 
-inline bool fapGmHIO_isMenu() {
+inline BOOL fapGmHIO_isMenu() {
     return g_HIO.mDisplayPrint & 2;
 }
 
diff --git a/include/f_op/f_op_view.h b/include/f_op/f_op_view.h
index 7d99922076..b61c866212 100644
--- a/include/f_op/f_op_view.h
+++ b/include/f_op/f_op_view.h
@@ -24,6 +24,13 @@ public:
     /* 0x18 */ cXyz mUp;
 };
 
+struct scissor_class {
+    /* 0x0 */ f32 mXOrig;
+    /* 0x4 */ f32 mYOrig;
+    /* 0x8 */ f32 mWidth;
+    /* 0xC */ f32 mHeight;
+};
+
 struct view_port_class {
     /* 0x00 */ f32 mXOrig;
     /* 0x04 */ f32 mYOrig;
@@ -31,10 +38,7 @@ struct view_port_class {
     /* 0x0C */ f32 mHeight;
     /* 0x10 */ f32 mNearZ;
     /* 0x14 */ f32 mFarZ;
-    /* 0x18 */ f32 mScissorXOrig;
-    /* 0x1C */ f32 mScissorYOrig;
-    /* 0x20 */ f32 mScissorWidth;
-    /* 0x24 */ f32 mScissorHeight;
+    /* 0x18 */ scissor_class mScissor;
 };
 
 struct view_class : public leafdraw_class {
diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h
index b5d1196a03..f3c77c5928 100644
--- a/include/m_Do/m_Do_audio.h
+++ b/include/m_Do/m_Do_audio.h
@@ -120,4 +120,8 @@ inline void mDoAud_mEnvse_framework() {
     g_mEnvSeMgr.framework();
 }
 
+inline void mDoAud_mEnvSe_startFarThunderSe(const Vec* param_0) {
+    g_mEnvSeMgr.startFarThunderSe((Vec*)param_0, 0);
+}
+
 #endif /* M_DO_M_DO_AUDIO_H */
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index 1607cbc14e..71d79aa0e0 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -22,6 +22,9 @@ public:
         /* 800095F8 */ void remove();
         /* 80009650 */ void draw();
 
+        u8 getEnable() { return mEnable; }
+        GXColor* getMonoColor() { return &mMonoColor; }
+
         /* 0x00 */ GXColor mBlendColor;
         /* 0x04 */ GXColor mMonoColor;
         /* 0x08 */ u8 mEnable;
@@ -43,9 +46,16 @@ public:
     /* 80008330 */ static void calcFade();
 
     static JUTFader* getFader() { return mFader; }
+    static void setFader(JUTFader* fader) {
+        JFWDisplay::getManager()->setFader(fader);
+        mFader = fader;
+    }
+
     static int startFadeOut(int param_0) { return JFWDisplay::getManager()->startFadeOut(param_0); }
     static int startFadeIn(int param_0) { return JFWDisplay::getManager()->startFadeIn(param_0); }
     static void setFadeColor(JUtility::TColor& color) { mFader->setColor(color); }
+    static void setClearColor(JUtility::TColor color) { JFWDisplay::getManager()->setClearColor(color); }
+    static void setBackColor(GXColor& color) { mBackColor = color; }
     static void endFrame() { JFWDisplay::getManager()->endFrame(); }
     static void offFade() { mFade = 0; }
     static u8 isFade() { return mFade; }
@@ -59,6 +69,8 @@ public:
     static f32 getHeight() { return 448.0f; }
     static f32 getMinYF() { return 0.0f; }
     static f32 getMinXF() { return 0.0f; }
+    static f32 getMaxYF() { return 448.0f; }
+    static f32 getMaxXF() { return 608.0f; }
     static int getMinY() { return 0; }
     static int getMinX() { return 0; }
     static int getMaxY() { return 448; }
@@ -69,6 +81,8 @@ public:
     static f32 getFadeRate() { return mFadeRate; }
     static bloom_c* getBloom() { return &m_bloom; }
     static GXColor& getFadeColor() { return mFadeColor; }
+    static GXColor& getBackColor() { return mBackColor; }
+    static void endRender() { JFWDisplay::getManager()->endRender(); }
 
     static GXTexObj mFrameBufferTexObj;
     static GXTexObj mZbufferTexObj;