diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-06-15 14:40:59 -0400 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-06-15 14:40:59 -0400 |
| commit | e4b1c30f472e7a4fdbce657aba7b9b5fb0dd2d59 (patch) | |
| tree | cd267c29d69e4996ff1d120ebb3613744ca69f1b /src/toBeSorted/fi_context.cpp | |
| parent | 2707f74d70f2783f8e70889f48e95b3ec8c00635 (diff) | |
Pad stuff
Diffstat (limited to 'src/toBeSorted/fi_context.cpp')
| -rw-r--r-- | src/toBeSorted/fi_context.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/toBeSorted/fi_context.cpp b/src/toBeSorted/fi_context.cpp index cf4584d8..8f0c7b06 100644 --- a/src/toBeSorted/fi_context.cpp +++ b/src/toBeSorted/fi_context.cpp @@ -3,6 +3,7 @@ #include "common.h" #include "d/a/d_a_item.h" #include "d/d_message.h" +#include "d/d_pad.h" #include "d/d_pouch.h" #include "d/d_sc_game.h" #include "d/d_stage_mgr.h" @@ -13,6 +14,7 @@ #include "toBeSorted/file_manager.h" #include "toBeSorted/unk_save_time.h" + // https://github.com/lepelog/skywardsword-tools/wiki/Navi-Table-(Fi-Advice) // Portability hazard, only works for 32 bit architectures @@ -290,9 +292,6 @@ u8 FiContext::rateBattlePerformance(u8 id) { return ret; } -extern "C" bool isLowBattery1(); -extern "C" bool isLowBattery2(); - u16 FiContext::prepareFiHelpIndex() { u16 ret = 0xFFFF; setHelpIndex(-1); @@ -317,10 +316,10 @@ u16 FiContext::prepareFiHelpIndex() { setHelpIndex(0); } - if (isLowBattery2() || isLowBattery1()) { + if (dPad::ex_c::getInstance()->isLowBattery() || dPad::ex_c::getInstance()->isOutOfBattery()) { if (!getField_0x48()) { ret = 6400; - if (isLowBattery1()) { + if (dPad::ex_c::getInstance()->isOutOfBattery()) { // "Master, the batteries in your Wii Remote will be depleted any moment." setHelpIndex(3); } else { |