Revert "Add dpad menu and fix some combat mechanics"

This reverts commit 9211d330d14c459cd266945a974b4476200cdfcb.