* commiting to branch switch * shop,scrubs and merchant code unified * last cleanups * Update soh/soh/Enhancements/randomizer/hook_handlers.cpp Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> * attempt to fix reviews DOES NOT BUILD * TIL include order matters * Update soh/soh/Enhancements/randomizer/3drando/shops.cpp Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> * Update soh/soh/Enhancements/randomizer/3drando/shops.cpp Note to self, Don't code tired. *proceeds to ignore note* Co-authored-by: Angelo Bulfone <boomshroom@users.noreply.github.com> * fix typos * post merge * commiting to check something * probably cleaned up, needs a doublecheck * fix presets * address reviews * fix small shopsanity count oversights * undo rename --------- Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> Co-authored-by: Angelo Bulfone <boomshroom@users.noreply.github.com> Co-authored-by: Malkierian <malkierian@gmail.com>