From f04f4f219f673ebf36aa9505be13cbfffe9edc47 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 23 Sep 2023 14:13:59 -0700
Subject: [PATCH] minor cleanup

---
 include/JSystem/JUtility/JUTGamePad.h | 13 ++-----------
 src/c/c_dylink.cpp                    |  6 +++---
 src/m_Do/m_Do_controller_pad.cpp      |  1 -
 src/m_Do/m_Do_main.cpp                | 15 +++------------
 4 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h
index dc90bf5cb..e25b7affb 100644
--- a/include/JSystem/JUtility/JUTGamePad.h
+++ b/include/JSystem/JUtility/JUTGamePad.h
@@ -81,27 +81,19 @@ public:
     }
 
     u32 getButton() const { return mButton.mButton; }
-
     u32 getTrigger() const { return mButton.mTrigger; }
 
     f32 getMainStickX() const { return mMainStick.mPosX; }
-
     f32 getMainStickY() const { return mMainStick.mPosY; }
-
     f32 getMainStickValue() const { return mMainStick.mValue; }
-
     s16 getMainStickAngle() const { return mMainStick.mAngle; }
 
     f32 getSubStickX() const { return mSubStick.mPosX; }
-
     f32 getSubStickY() const { return mSubStick.mPosY; }
-
     f32 getSubStickValue() const { return mSubStick.mValue; }
-
     s16 getSubStickAngle() const { return mSubStick.mAngle; }
 
     u8 getAnalogA() const { return mButton.mAnalogA; }
-
     u8 getAnalogB() const { return mButton.mAnalogB; }
 
     u8 getAnalogL() const { return mButton.mAnalogL; }
@@ -111,14 +103,13 @@ public:
     f32 getAnalogRf() const { return mButton.mAnalogRf; }
 
     s8 getErrorStatus() const { return mErrorStatus; }
-
     s16 getPortNum() const { return mPortNum; }
 
     JUTGamePadRecordBase* getPadReplay() const { return mPadReplay; }
-
     JUTGamePadRecordBase* getPadRecord() const { return mPadRecord; }
 
-    u32 testTrigger(u32 button) const { return mButton.mTrigger & button; }
+    u32 testButton(u32 button) const { return getButton() & button; }
+    u32 testTrigger(u32 button) const { return getTrigger() & button; }
 
     bool isPushing3ButtonReset() const {
         bool isPushingReset = false;
diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp
index 8e31a1451..41754cc51 100644
--- a/src/c/c_dylink.cpp
+++ b/src/c/c_dylink.cpp
@@ -72,11 +72,11 @@ const DynamicNameTableEntry DynamicNameTable[] = {
     {PROC_Obj_Lpalm,      "d_a_obj_lpalm"},
     {PROC_Obj_Mtest,      "d_a_obj_mtest"},
     {PROC_Obj_Mkie,       "d_a_obj_mkie"},
-    {PROC_Obj_Mkie,       "d_a_obj_mkiek"},
+    {PROC_Obj_Mkiek,      "d_a_obj_mkiek"},
     {PROC_Obj_MknjD,      "d_a_obj_mknjd"},
     {PROC_Obj_Msdan,      "d_a_obj_msdan"},
-    {PROC_Obj_Msdan,      "d_a_obj_msdan_sub"},
-    {PROC_Obj_Msdan,      "d_a_obj_msdan2"},
+    {PROC_Obj_MsdanSub,   "d_a_obj_msdan_sub"},
+    {PROC_Obj_Msdan2,     "d_a_obj_msdan2"},
     {PROC_Obj_MsdanSub2,  "d_a_obj_msdan_sub2"},
     {PROC_Obj_Nest,       "d_a_obj_nest"},
     {PROC_Obj_Ojtree,     "d_a_obj_ojtree"},
diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp
index d90c8a9ad..4ae299469 100644
--- a/src/m_Do/m_Do_controller_pad.cpp
+++ b/src/m_Do/m_Do_controller_pad.cpp
@@ -31,7 +31,6 @@ inline void mDoCPd_TRIGGER_CONV(u8 analog, f32& param_1) {
 /* 80007598-800078C0       .text mDoCPd_Convert__FP27interface_of_controller_padP10JUTGamePad */
 // NONMATCHING
 static s32 mDoCPd_Convert(interface_of_controller_pad* pInterface, JUTGamePad* pPad) {
-    // pInterface->mButtonFlags = pPad->getButton();
     pInterface->mMainStickPosX = pPad->getMainStickX();
     pInterface->mMainStickPosY = pPad->getMainStickY();
     pInterface->mMainStickValue = pPad->getMainStickValue();
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 304386ae8..090447896 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -93,11 +93,8 @@ void CheckHeap(JUTGamePad* i_pad) {
     bool comboCheck = false;
 
     // if L + R + Z is pressed
-    if ((i_pad->getButton() & ~CButton::Z) == (CButton::L + CButton::R) &&
-        i_pad->getTrigger() & CButton::Z)
-    {
+    if ((i_pad->testButton(~CButton::Z)) == (CButton::L | CButton::R) && i_pad->testTrigger(CButton::Z))
         comboCheck = true;
-    }
 
     int saveRel = comboCheck;
     for (int i = 0; i < HeapCheckTableNum; i++) {
@@ -377,18 +374,12 @@ void debug() {
             CheckHeap(g_mDoCPd_gamePad[2]);
         }
 
-        if ((g_mDoCPd_gamePad[2]->getButton() & ~CButton::Z) == CButton::R &&
-            g_mDoCPd_gamePad[2]->testTrigger(CButton::Z))
-        {
+        if (g_mDoCPd_gamePad[2]->testButton(~CButton::Z) == CButton::R && g_mDoCPd_gamePad[2]->testTrigger(CButton::Z))
             mDisplayHeapSize ^= 1;
-        }
 
         if (mDisplayHeapSize) {
-            if ((g_mDoCPd_gamePad[2]->getButton() & ~CButton::Z) == CButton::L &&
-                g_mDoCPd_gamePad[2]->testTrigger(CButton::Z))
-            {
+            if (g_mDoCPd_gamePad[2]->testButton(~CButton::Z) == CButton::L && g_mDoCPd_gamePad[2]->testTrigger(CButton::Z))
                 mHeapBriefType < 5 ? mHeapBriefType++ : mHeapBriefType = 1;
-            }
 
             debugDisplay();
         }