Knock Off, Sub, Item, Berry fixes
You're not supposed to be there...
Merge pull request #953 from Fuzzysqurl/fixes

Knock Off, Sub, Item, Berry fixes