diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2022-10-22 16:50:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-22 16:50:23 -0400 |
| commit | af5a780e6354f4d5a29909ab337b3756ec18d760 (patch) | |
| tree | 0ee1dc2505c1e46c6f704afcdb8fc82ee00197a6 | |
| parent | de38e366a0ee783129f555d000b880b500f12619 (diff) | |
| parent | 6e2c38895bb40492bd0361fec76aa83278d3f68a (diff) | |
Merge pull request #1836 from HarbourMasters/develop-zhora
zhora -> dev
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | soh/src/code/z_parameter.c | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 78f61f903..d7875b23a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE) project(Ship LANGUAGES C CXX - VERSION 4.0.4) -set(PROJECT_BUILD_NAME "ZHORA ECHO" CACHE STRING "") + VERSION 4.0.5) +set(PROJECT_BUILD_NAME "ZHORA FOXTROT" CACHE STRING "") set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "") set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh) diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index cd57e97b4..f81d97381 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -949,7 +949,15 @@ void func_80083108(GlobalContext* globalCtx) { gSaveContext.buttonStatus[0] = BTN_DISABLED; for (i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) { - if (func_8008F2F8(globalCtx) == 2) { + if ((gSaveContext.equips.buttonItems[i] >= ITEM_SHIELD_DEKU) && + (gSaveContext.equips.buttonItems[i] <= ITEM_BOOTS_HOVER)) { + // Equipment on c-buttons is always enabled + if (gSaveContext.buttonStatus[BUTTON_STATUS_INDEX(i)] == BTN_DISABLED) { + sp28 = 1; + } + + gSaveContext.buttonStatus[BUTTON_STATUS_INDEX(i)] = BTN_ENABLED; + } else if (func_8008F2F8(globalCtx) == 2) { if ((gSaveContext.equips.buttonItems[i] != ITEM_HOOKSHOT) && (gSaveContext.equips.buttonItems[i] != ITEM_LONGSHOT)) { if (gSaveContext.buttonStatus[BUTTON_STATUS_INDEX(i)] == BTN_ENABLED) { |