Merge pull request #312 from elijah-thomas774/d_a_e_ks

dAcEKs_c

6 files changed, 20 insertions, 19 deletions

diff --git a/src/d/a/d_a_item.cpp b/src/d/a/d_a_item.cpp
index 1452dd69..3de0f79f 100644
--- a/src/d/a/d_a_item.cpp
+++ b/src/d/a/d_a_item.cpp
@@ -445,15 +445,13 @@ extern const UnkFloat f2(1.0f);
 SPECIAL_ACTOR_PROFILE(ITEM, dAcItem_c, fProfile::ITEM, 0x2B, 0, 2);
 
 const dAcItem_c::sStaticPtmf dAcItem_c::sStaticPtmfs1[] = {
-    &dAcItem_c::fn_80248020, nullptr,
-    &dAcItem_c::fn_80248010, nullptr,
-    &dAcItem_c::fn_80255B30, &dAcItem_c::fn_80255BA0,
+    &dAcItem_c::fn_80248020, nullptr, &dAcItem_c::fn_80248010, nullptr, &dAcItem_c::fn_80255B30,
+    &dAcItem_c::fn_80255BA0,
 };
 
 const dAcItem_c::sStaticPtmf dAcItem_c::sStaticPtmfs2[] = {
-    &dAcItem_c::fn_80248040, nullptr,
-    &dAcItem_c::fn_80248030, nullptr,
-    &dAcItem_c::fn_80255BD0, &dAcItem_c::fn_80255C40,
+    &dAcItem_c::fn_80248040, nullptr, &dAcItem_c::fn_80248030, nullptr, &dAcItem_c::fn_80255BD0,
+    &dAcItem_c::fn_80255C40,
 };
 
 fLiMgBa_c dAcItem_c::sItemList;
@@ -1429,7 +1427,7 @@ void dAcItem_c::executeState_Wait() {
         if (fn_802574A0() && !tgBit1) {
             // TODO weird double load of link
             link = dAcPy_c::GetLinkM();
-            if (!link->vt_0x1C0()) {
+            if (!link->getBeetleInFlight()) {
                 addToGetQueue();
 
                 if ((link->ifHasHealthAndSomethingElse() && this == sItemListHead.get() &&
@@ -1752,7 +1750,7 @@ void dAcItem_c::executeState_Carry() {
     if (fn_802574A0()) {
         // TODO weird double load
         dAcPy_c *link = dAcPy_c::GetLinkM();
-        if (!link->vt_0x1C0()) {
+        if (!link->getBeetleInFlight()) {
             addToGetQueue();
             if (link->ifHasHealthAndSomethingElse() && this == sItemListHead.get() &&
                 FileManager::sInstance->getCurrentHealth() != 0) {
@@ -1816,7 +1814,7 @@ void dAcItem_c::executeState_GetBeetle() {
     if (link == nullptr) {
         return;
     }
-    dAcBoomerang_c *beetlePtr = (dAcBoomerang_c *)link->vt_0x1C0();
+    dAcBoomerang_c *beetlePtr = (dAcBoomerang_c *)link->getBeetleInFlight();
     if (beetlePtr == nullptr) {
         if (link->ifHasHealthAndSomethingElse() && this == sItemListHead.get() &&
             FileManager::sInstance->getCurrentHealth() != 0) {
diff --git a/src/d/col/c/c_cc_d.cpp b/src/d/col/c/c_cc_d.cpp
index e54f258e..ebf84503 100644
--- a/src/d/col/c/c_cc_d.cpp
+++ b/src/d/col/c/c_cc_d.cpp
@@ -486,7 +486,7 @@ bool cCcD_Obj::ChkTgBit25() const {
     return mTg.MskAtHitSPrm(0x2000000);
 }
 
-u16 cCcD_Obj::GetTgSoundID() const {
+s32 cCcD_Obj::GetTgSoundID() const {
     return mTg.mAtHitSrc.field_0x10;
 }
 
diff --git a/src/d/d_pad.cpp b/src/d/d_pad.cpp
index d20ec8f5..c49a6f0d 100644
--- a/src/d/d_pad.cpp
+++ b/src/d/d_pad.cpp
@@ -225,7 +225,7 @@ void beginPad_BR() {
         if ((dCsGame_c::GetInstance() != nullptr && dCsGame_c::GetInstance()->shouldDraw() && !ex.field_0x22D0) ||
             (dAcPy_c::GetLink() != nullptr &&
              dAcPy_c::GetLink()->checkActionFlagsCont(0x400 | 0x100 | 0x80 | 0x40 | 0x10 | 0x4 | 0x2 | 0x1) &&
-             !dAcPy_c::GetLink()->vt_0x1C0() && !dLytMeter_c::GetMain()->getField_0x1377F()) ||
+             !dAcPy_c::GetLink()->getBeetleInFlight() && !dLytMeter_c::GetMain()->getField_0x1377F()) ||
             ex.field_0x22CF) {
             if (dLytControlGame_c::getInstance() && dLytControlGame_c::getInstance()->isStateNormal()) {
                 if (!(dPadManager_c::GetInstance() && dPadManager_c::GetInstance()->getField_0x25())) {
diff --git a/src/d/lyt/meter/d_lyt_meter.cpp b/src/d/lyt/meter/d_lyt_meter.cpp
index 4de66635..25798d54 100644
--- a/src/d/lyt/meter/d_lyt_meter.cpp
+++ b/src/d/lyt/meter/d_lyt_meter.cpp
@@ -1179,8 +1179,9 @@ void dLytMeterMain_c::checkPaneVisibility() {
 
         || (MinigameManager::isInMinigameState(MinigameManager::TRIAL_TIME_ATTACK) &&
             LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_B) == LytDoButtonRelated::ACT_IE_NONE) ||
-        (dLytMeter_c::getField_0x13B66() || (shouldBeHiddenGeneral() && !mItemSelect.fn_800F02F0() && !isDoingSkyKeepPuzzle()) ||
-         isInModeMap() || isInModePause())) {
+        (dLytMeter_c::getField_0x13B66() ||
+         (shouldBeHiddenGeneral() && !mItemSelect.fn_800F02F0() && !isDoingSkyKeepPuzzle()) || isInModeMap() ||
+         isInModePause())) {
         mPanesVisible[METER_ANIM_ITEM_SELECT] = false;
     }
 
@@ -1278,7 +1279,8 @@ void dLytMeterMain_c::checkPaneVisibility() {
          MinigameManager::isInMinigameState(MinigameManager::TRIAL_TIME_ATTACK) ||
          MinigameManager::isInMinigameState(MinigameManager::PUMPKIN_ARCHERY) ||
          MinigameManager::isInMinigameState(MinigameManager::SPIRAL_CHARGE_TUTORIAL) ||
-         MinigameManager::isInMinigameState(MinigameManager::ROLLERCOASTER) || shouldBeHiddenGeneral() || mIsInSwordDrawEvent)
+         MinigameManager::isInMinigameState(MinigameManager::ROLLERCOASTER) || shouldBeHiddenGeneral() ||
+         mIsInSwordDrawEvent)
 
         || (dLytMeter_c::getField_0x13B66() || fn_800D5420() ||
             (dLytSimpleWindow_c::getInstance() != nullptr && dLytSimpleWindow_c::getInstance()->isOutputText()) ||
@@ -1352,7 +1354,7 @@ void dLytMeterMain_c::checkPaneVisibility() {
         }
     }
 
-    if ((dAcPy_c::GetLink()->hasvt_0x1C0() || dAcPy_c::GetLink()->checkActionFlagsCont(0x10) ||
+    if ((dAcPy_c::GetLink()->isBeetleInFlight() || dAcPy_c::GetLink()->checkActionFlagsCont(0x10) ||
          (shouldBeHiddenGeneral() && !mHelpOpen) || mGanbariGauge.fn_80104760() ||
 
          MinigameManager::isInMinigameState(MinigameManager::FUN_FUN_ISLAND) ||
@@ -1490,7 +1492,8 @@ void dLytMeterMain_c::checkPaneVisibility() {
         if (!field_0x137B2 || dLytAreaCaption_c::getVisible() || fn_800D5380(false) ||
             MinigameManager::isInAnyMinigame() || mIsInSwordDrawEvent
 
-            || shouldBeHiddenGeneral() || dLytMeter_c::getField_0x13B66() || fn_800D5420() || isInModeMap() || isInModePause()) {
+            || shouldBeHiddenGeneral() || dLytMeter_c::getField_0x13B66() || fn_800D5420() || isInModeMap() ||
+            isInModePause()) {
             mDrinkVisible = false;
         }
 
diff --git a/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp b/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp
index da100999..6a7d7618 100644
--- a/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp
+++ b/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp
@@ -600,7 +600,7 @@ bool dLytMeterGanbariGauge_c::execute() {
     mAnm[GANBARI_ANIM_DRINK].setFrame(drinkFrame);
     mAnm[GANBARI_ANIM_DRINK].setAnimEnable(true);
 
-    if (!EventManager::isInEvent() && !dAcPy_c::GetLink()->hasvt_0x1C0() &&
+    if (!EventManager::isInEvent() && !dAcPy_c::GetLink()->isBeetleInFlight() &&
         !dAcPy_c::GetLink()->checkActionFlagsCont(0x10) &&
         (d3d::isOnScreen(dAcPy_c::GetLink()->mPositionCopy3) || fn_80104710(false) || isCrawling()) &&
         *mStateMgrWheel.getStateID() != StateID_Full && *mStateMgrMain.getStateID() == StateID_InvisibleWait &&
@@ -609,7 +609,7 @@ bool dLytMeterGanbariGauge_c::execute() {
     } else if (!EventManager::isInEvent() && *mStateMgrWheel.getStateID() == StateID_Full &&
                *mStateMgrWheel.getOldStateID() != StateID_Full && *mStateMgrMain.getStateID() == StateID_Wait) {
         mStateMgrMain.changeState(StateID_OutWait);
-    } else if ((EventManager::isInEvent() || dAcPy_c::GetLink()->hasvt_0x1C0() ||
+    } else if ((EventManager::isInEvent() || dAcPy_c::GetLink()->isBeetleInFlight() ||
                 dAcPy_c::GetLink()->checkActionFlagsCont(0x10) ||
                 (!d3d::isOnScreen(dAcPy_c::GetLink()->mPositionCopy3) && !fn_80104710(false) && !isCrawling())) &&
                *mStateMgrMain.getStateID() == StateID_Wait) {
diff --git a/src/d/snd/d_snd_sound_equipment_callbacks.cpp b/src/d/snd/d_snd_sound_equipment_callbacks.cpp
index d5260734..75d9e10f 100644
--- a/src/d/snd/d_snd_sound_equipment_callbacks.cpp
+++ b/src/d/snd/d_snd_sound_equipment_callbacks.cpp
@@ -27,7 +27,7 @@ void dSndSourceEquipment_c::cbBeFlyLv(dSndSeSound_c *sound, dSoundSource_c *sour
 }
 
 void dSndSourceEquipment_c::cbBeThrowRc(dSndSeSound_c *sound, dSoundSource_c *source, nw4r::snd::SoundHandle &handle) {
-    if (dAcPy_c::GetLink() != nullptr && !dAcPy_c::GetLink()->hasvt_0x1C0()) {
+    if (dAcPy_c::GetLink() != nullptr && !dAcPy_c::GetLink()->isBeetleInFlight()) {
         handle.Stop(10);
         return;
     }