* 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>

Periodic cherry-pick from upstream

* Ensures the If statement checks that the actor.parent is !NULL before checking if the parent has an update. Prevents a null pointer reference and a crash.

* Update mm/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c

---------

Co-authored-by: CobraChicken997 <CobraChicken997@pm.me>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* [Enhancement] Difficulty options for Fisherman's Jumping Game

* Remove unnecessary include

* More compatible replacement

* Fix escape sequence

* Clang-format

* [Enhancement] Always find Rock Sirloin

* Move to "Other" Difficulty options

* [Enhancement] Alien speed modifier

* Clang-format

develop-battler -> develop