diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-09-14 18:29:28 -0400 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-09-14 18:37:33 -0400 |
| commit | ca9c3fd7f3c97d8c0fb7b4c308069f0a3eb5d2e5 (patch) | |
| tree | 4df6ecf6cdee3ebe47060a59c2e2ad931036165b /src/d/d_message.cpp | |
| parent | 67c9e3346c32ff52c37e21ec5804a2fd59cf9031 (diff) | |
Storyflag Enum
Diffstat (limited to 'src/d/d_message.cpp')
| -rw-r--r-- | src/d/d_message.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/d_message.cpp b/src/d/d_message.cpp index 764b066a..2f099177 100644 --- a/src/d/d_message.cpp +++ b/src/d/d_message.cpp @@ -7,13 +7,13 @@ #include "d/a/d_a_player.h" #include "d/d_base.h" #include "d/d_light_env.h" +#include "d/d_lyt_hio.h" #include "d/d_player.h" #include "d/d_pouch.h" #include "d/d_sc_game.h" #include "d/d_stage.h" #include "d/d_stage_mgr.h" #include "d/d_tag_processor.h" -#include "d/d_lyt_hio.h" #include "d/flag/itemflag_manager.h" #include "d/flag/sceneflag_manager.h" #include "d/flag/storyflag_manager.h" @@ -467,7 +467,7 @@ bool dFlow_c::handleEventInternal(const MsbFlowInfo *element) { } case EVENT_SET_STORYFLAG_217: StoryflagManager::sInstance->setFlagOrCounterToValue( - 217, dLytMsgWindow_c::getInstance()->getTextOptionSelection() + STORYFLAG_217, dLytMsgWindow_c::getInstance()->getTextOptionSelection() ); break; case EVENT_DEMO_METER_ITEM_SELECT: return dLytMeter_c::GetInstance()->itemSelectDemoRelated(params1n2); @@ -623,7 +623,7 @@ bool dFlow_c::handleMessage() { fiHelpIndex = 0; } if (fiHelpIndex == 5) { - StoryflagManager::sInstance->setFlag(727); + StoryflagManager::sInstance->setFlag(STORYFLAG_WALLET_FULL_ACK); } mCurrentTextLabelName.sprintf("KEN4_%03d", fiHelpIndex); } else if (mCurrentTextLabelName == "KEN5_000") { @@ -706,7 +706,7 @@ bool dFlow_c::handleMessage() { } else if (mCurrentTextLabelName == "KEN9_000") { // Random hint s32 v; - if (StoryflagManager::sInstance->getCounterOrFlag(530)) { + if (StoryflagManager::sInstance->getCounterOrFlag(STORYFLAG_BOSS_RUSH_ACTIVE)) { // "When you require my analysis..." v = 200; } else if (dStageMgr_c::GetInstance()->getSTIFbyte4() == 0) { @@ -939,7 +939,7 @@ u16 dFlow_c::branchHandler21(const MsbFlowInfo *element) const { } u16 dFlow_c::branchHandler22(const MsbFlowInfo *element) const { - u16 ret = StoryflagManager::sInstance->getCounterOrFlag(692); + u16 ret = StoryflagManager::sInstance->getCounterOrFlag(STORYFLAG_692); if (ret > 3) { ret = 3; } @@ -1004,7 +1004,7 @@ void dFlow_c::triggerEntryPoint(s32 labelPart1, s32 labelPart2) { FiContext::setField_0x48(true); labelPart2 = 401; } else if (labelPart2 == 401) { - StoryflagManager::sInstance->setFlag(808); + StoryflagManager::sInstance->setFlag(STORYFLAG_LOW_HEART_NOTICE); // Don't introduce heart dowsing in areas where you might // not be able to dowse if (dStageMgr_c::GetInstance()->isAreaTypeNormal()) { |
