Various Tweaks, Prepping for New Enemy Health

…Systems stuff
Fixed merge conflicts in HowieS and YarlaCtrl. Reworked enemy health system.