every d_pad function attempted

3 files changed, 24 insertions, 13 deletions

diff --git a/include/d/d_pad.h b/include/d/d_pad.h
index 12fb299a..0d4f4129 100644
--- a/include/d/d_pad.h
+++ b/include/d/d_pad.h
@@ -13,7 +13,7 @@ class ex_c {
     // Complete Made up name
     struct acc_c {
         void init();
-        f32 getEntryField_0xB40(s32 chan);
+        f32 getMaxAccValue(s32 chan);
         void fn_800576D0(s32 chan);
         void fn_800578E0(s32 chan);
         void fn_80057AC0(s32 chan, bool);
@@ -22,13 +22,13 @@ class ex_c {
         f32 fn_80057F30(s32 chan);
         f32 fn_80057F60(s32 chan);
 
-        bool fn_80057F90(s32 chan, bool);
-        bool fn_800580C0(s32 chan, bool);
+        bool fn_80057F90(s32 idx, bool);
+        bool fn_800580C0(s32 idx, bool);
 
-        bool fn_800581F0(s32 chan, bool);
-        bool fn_80058320(s32 chan, bool);
+        bool fn_800581F0(s32 idx, bool);
+        bool fn_80058320(s32 idx, bool);
 
-        bool fn_80058450(s32 chan, bool);
+        bool fn_80058450(s32 idx, bool);
 
         void fn_80058540(s32 chan, bool);
 
@@ -38,9 +38,9 @@ class ex_c {
         f32 fn_80058A00();
         void fn_80058AE0(s32 chan, bool);
 
-        /* 0x0000 */ mVec3_c field_0x000[120];
+        /* 0x0000 */ mVec3_c mAccVecs[120];
         /* 0x05A0 */ mVec3_c field_0x5A0[120];
-        /* 0x0B40 */ f32 field_0xB40[120];
+        /* 0x0B40 */ f32 mAccValues[120];
         /* 0x0D20 */ mVec3_c field_0xD20[39];
         /* 0x0EF4 */ mVec3_c field_0xEF4[33];
         /* 0x1080 */ mVec3_c field_0x1080;
@@ -48,9 +48,9 @@ class ex_c {
         /* 0x1098 */ mMtx_c field_0x1098;
         /* 0x10C8 */ u32 field_0x10C8;
         /* 0x10CC */ u32 field_0x10CC;
-        /* 0x10D0 */ u32 field_0x10D0;
+        /* 0x10D0 */ s32 field_0x10D0;
         /* 0x10D4 */ f32 field_0x10D4;
-        /* 0x10D8 */ u32 field_0x10D8;
+        /* 0x10D8 */ s32 field_0x10D8;
     };
 
     struct mpls_c {
diff --git a/include/d/d_sc_game.h b/include/d/d_sc_game.h
index 6c86c0db..69054716 100644
--- a/include/d/d_sc_game.h
+++ b/include/d/d_sc_game.h
@@ -31,8 +31,10 @@ class ScGameScreenTargeting : public ScGameScreen {
 public:
     ScGameScreenTargeting(u8 priority) : ScGameScreen(priority), mLetterboxAmount(0.0f) {}
 
+    f32 fn_801BBEC0() const;
+
 private:
-    f32 mLetterboxAmount;
+    /* 0x98 */ f32 mLetterboxAmount;
 };
 
 struct SpawnInfo {
@@ -200,6 +202,10 @@ public:
         return mFader.isSettled();
     }
 
+    f32 targetingScreenFn_801BBEC0() const {
+        return mScreen1.fn_801BBEC0();
+    }
+
 protected:
     static u32 sUpdateFrameCount;
     static u8 sCurrentLayer;
@@ -252,7 +258,7 @@ protected:
     /* 0x0C4 */ LayoutArcControl mLayoutCtrl;
     /* 0x0D0 */ dFader_c mFader;
 
-    /* 0x0F8 */ ScGameScreenTargeting mScreen1;
+    /* 0x0F4 */ ScGameScreenTargeting mScreen1;
     /* 0x194 */ ScGameScreen mScreen2;
     /* 0x228 */ UNKWORD field_0x228;
     /* 0x22C */ u8 _0x22C[0x230 - 0x22C];
diff --git a/include/d/lyt/d_lyt_map.h b/include/d/lyt/d_lyt_map.h
index 652fcf4f..7a040021 100644
--- a/include/d/lyt/d_lyt_map.h
+++ b/include/d/lyt/d_lyt_map.h
@@ -276,6 +276,7 @@ public:
 
     void build();
 
+    bool isNotInvisible() const;
     bool isOpenMaybe() const;
     bool fn_80139EA0() const;
     void lightPillarRelated(s32, s32, s32);
@@ -392,10 +393,14 @@ public:
         return &sInstance->mResAcc;
     }
 
-    static dLytMap_c *getInstance() {
+    static dLytMap_c *GetInstance() {
         return sInstance;
     }
 
+    bool isNotInvisible() const {
+        return mMapMain.isNotInvisible();
+    }
+
     bool isOpenMaybe() const {
         return mMapMain.isOpenMaybe();
     }