* Prevent Hot Spring Water from cooling

* Remove unnecessary arg's

* Tweak to VB location

---------

Co-authored-by: Garrett <garrettjcox@gmail.com>

develop-battler -> develop

* Beneath The Well Grass Fix

Logic only checked for lit torch or Fire Arrow, but this requires moving between rooms. If going FROM Castle side, logic broke.

* how did I delete this

Co-authored-by: Hyrum Dolan <79908304+hyrumsdolan@users.noreply.github.com>

* Add Additional Items

* Tweaks to UI

---------

Co-authored-by: Garrett <garrettjcox@gmail.com>

* New Mayor Argues until Moonfall Patch

* Fix Mutoh in Town Square after argument resolved

---------

Co-authored-by: Andrew Hendrix <ahendrix@pentara.com>

* proto

* proto 2

* proto 3

* proto 4

* small fix and cleanup

* clang format

* ptr fix

* possible fix for active item with cycle

* strip gfs enhancement

* strip redundant horse check

* small cleanup

* fix button holding

* prevent instant putaway

* cvar cleanup

* B bomb arrow fix

* fix hook reset to neutral

* config migration

* icon for B item

* clang fmt

* fix third person items stripping on dpad

* Apply from review

Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>

* clang fmt

* missed one

Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>

* Revert "missed one"

This reverts commit 1c8312cede581cd1fed68d8d3c703c67d3bcbcde.
Because, apparently, I'm not

* fix

* stricter check

* add isDpad to hook

* add dpad checks

* clang fmt

* Update mm/2s2h/config/ConfigUpdaters.cpp

* Update mm/2s2h/config/ConfigUpdaters.cpp

---------

Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* fixed Kotake logic

Kotake does not require saving Koume but forcing her home on Days 2 and 3.

* Armos chest needed Armos

* Fixed Kotake logic again