d_menu_save / pane_class / rename some data (#205)

* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc

libs/JSystem/JUtility/JUTGamePad.cpp

@@ -325,8 +325,8 @@ OSTime JUTGamePad::C3ButtonReset::sThreshold = (OSTime)((OS_BUS_CLOCK / 4) / 60)
 /* 80451500-80451504 -00001 0004+00 3/3 6/6 0/0 .sbss            None */
 /* 80451500 0001+00 data_80451500 None */
 /* 80451501 0003+00 data_80451501 None */
-bool struct_80451500;
-bool struct_80451501;
+bool JUTGamePad::C3ButtonReset::sResetSwitchPushing;
+bool JUTGamePad::C3ButtonReset::sResetOccurred;
 
 /* 80451504-80451508 000A04 0004+00 2/2 0/0 0/0 .sbss
  * sResetOccurredPort__Q210JUTGamePad13C3ButtonReset            */
@@ -339,7 +339,7 @@ void JUTGamePad::checkResetCallback(OSTime holdTime) {
         return;
     }
 
-    struct_80451501 = true;
+    JUTGamePad::C3ButtonReset::sResetOccurred = true;
     JUTGamePad::C3ButtonReset::sResetOccurredPort = mPortNum;
 
     if (JUTGamePad::C3ButtonReset::sCallback != NULL) {
@@ -380,7 +380,7 @@ void JUTGamePad::update() {
         if (field_0xa8 == 0 ||
             (mButton.mButton & C3ButtonReset::sResetMaskPattern) != C3ButtonReset::sResetPattern) {
             mButtonReset.mReset = false;
-        } else if (!struct_80451501) {
+        } else if (!JUTGamePad::C3ButtonReset::sResetOccurred) {
             if (mButtonReset.mReset == true) {
                 checkResetCallback(OSGetTime() - mResetTime);
             } else {
@@ -425,19 +425,19 @@ asm void JUTGamePad::update() {
 
 /* 802E0FA4-802E1024 2DB8E4 0080+00 1/1 0/0 0/0 .text            checkResetSwitch__10JUTGamePadFv */
 void JUTGamePad::checkResetSwitch() {
-    if (!struct_80451501) {
+    if (!JUTGamePad::C3ButtonReset::sResetOccurred) {
         if (OSGetResetSwitchState()) {
-            struct_80451500 = true;
+            C3ButtonReset::sResetSwitchPushing = true;
         } else {
-            if (struct_80451500 == true) {
-                struct_80451501 = true;
+            if (C3ButtonReset::sResetSwitchPushing == true) {
+                C3ButtonReset::sResetOccurred = true;
                 C3ButtonReset::sResetOccurredPort = -1;
 
                 if (C3ButtonReset::sCallback != NULL) {
                     C3ButtonReset::sCallback(-1, C3ButtonReset::sCallbackArg);
                 }
             }
-            struct_80451500 = false;
+            C3ButtonReset::sResetSwitchPushing = false;
         }
     }
 }

libs/SSystem/SComponent/c_API_controller_pad.cpp

@@ -6,51 +6,14 @@
 #include "SSystem/SComponent/c_API_controller_pad.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-
-//
-// Types:
-//
-
-struct mDoCPd_c {
-    /* 80007D74 */ void recalibrate();
-
-    static u8 m_cpadInfo[256];
-};
-
-//
-// Forward References:
-//
-
-extern "C" void cAPICPad_recalibrate__Fv();
-extern "C" void cAPICPad_ANY_BUTTON__FUl();
-
-//
-// External References:
-//
-
-extern "C" void recalibrate__8mDoCPd_cFv();
-extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
-
-//
-// Declarations:
-//
+#include "m_Do/m_Do_controller_pad.h"
 
 /* 8026328C-802632AC 25DBCC 0020+00 0/0 3/3 0/0 .text            cAPICPad_recalibrate__Fv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void cAPICPad_recalibrate() {
-    nofralloc
-#include "asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_recalibrate__Fv.s"
+void cAPICPad_recalibrate() {
+    mDoCPd_c::recalibrate();
 }
-#pragma pop
 
 /* 802632AC-802632C8 25DBEC 001C+00 0/0 3/3 1/1 .text            cAPICPad_ANY_BUTTON__FUl */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm u32 cAPICPad_ANY_BUTTON(u32 param_0) {
-    nofralloc
-#include "asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_ANY_BUTTON__FUl.s"
+u32 cAPICPad_ANY_BUTTON(u32 portNo) {
+    return mDoCPd_c::getTrig(portNo) & (CButton::A | CButton::B | CButton::START);
 }
-#pragma pop

libs/Z2AudioLib/Z2SeqMgr.cpp

@@ -1062,7 +1062,7 @@ asm void Z2SeqMgr::processBgmFramework() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void Z2SeqMgr::checkBgmIDPlaying(u32 param_0) {
+asm bool Z2SeqMgr::checkBgmIDPlaying(u32 param_0) {
     nofralloc
 #include "asm/Z2AudioLib/Z2SeqMgr/checkBgmIDPlaying__8Z2SeqMgrFUl.s"
 }

libs/Z2AudioLib/Z2StatusMgr.cpp

@@ -112,7 +112,7 @@ extern "C" extern u8 data_80450B7C[4];
 extern "C" extern u8 data_80450B80[4];
 extern "C" extern Z2SeqMgr* data_80450B84;
 extern "C" extern Z2SeMgr* data_80450B88;
-extern "C" extern u8 struct_80451124[4];
+extern "C" extern u8 pauseTimer__9dScnPly_c[4];
 extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */];
 
 //