d_a_item -> Layout and Enum (#92)

* mostly done

* Update d_t_tumble_weed.cpp

* remove cM::calcTimer

* just regswap on adjustSpeed

* checkpoint

* file setup

* fix incorrect symbol

* some tidbits i guess

* fixup merge

* fix merge 2.0

* Item Renames from Esme

* fix d_t_tumble_weed

* fixup merge
This commit is contained in:
Elijah Thomas
2024-11-09 11:53:22 -05:00
committed by GitHub
parent a3472ab02d
commit 126e1a9fd7
22 changed files with 1641 additions and 189 deletions
+10 -8
View File
@@ -1,19 +1,18 @@
#include "toBeSorted/dowsing_target.h"
#include "c/c_math.h"
#include "m/m_mtx.h"
#include "d/flag/itemflag_manager.h"
#include "d/flag/storyflag_manager.h"
#include "m/m_mtx.h"
#include "toBeSorted/tlist.h"
typedef TList<DowsingTarget, offsetof(DowsingTarget, mLink)> DowsingList;
DowsingList DOWSING_LISTS[8];
static const int DOWSING_TARGET_STORY_FLAGS[8] = {
100, 105, 100, 104, 108, 110, 109, 102,
};
}; // TODO (Story Flag ID)
DowsingTarget::~DowsingTarget() {
doUnregister();
@@ -56,6 +55,8 @@ void DowsingTarget::getPosition(mVec3_c &position) {
PSMTXMultVec(mtx.m, mOffset, position);
}
// TODO (Story Flag IDs)
bool DowsingTarget::hasZeldaDowsing() {
return StoryflagManager::sInstance->getCounterOrFlag(100);
}
@@ -73,14 +74,15 @@ bool DowsingTarget::hasDesertNodeDowsing() {
}
inline bool checkTrial(u16 itemflag, u16 storyflag) {
return (ItemflagManager::sInstance->getFlagDirect(itemflag) && !StoryflagManager::sInstance->getCounterOrFlag(storyflag)) ? true : false;
return (ItemflagManager::sInstance->getFlagDirect(itemflag) &&
!StoryflagManager::sInstance->getCounterOrFlag(storyflag)) ?
true :
false;
}
// TODO (Story Flag IDs) (you get the point lmao)
bool DowsingTarget::hasAnyTrialDowsing() {
return checkTrial(187, 93) ||
checkTrial(188, 97) ||
checkTrial(189, 98) ||
checkTrial(193, 99);
return checkTrial(187, 93) || checkTrial(188, 97) || checkTrial(189, 98) || checkTrial(193, 99);
}
bool DowsingTarget::hasSacredWaterDowsing() {