Quoted By:
Either remove HMs completely and replace them with key items or give every pokemon an optional moveslot for an HM that they cant use in combat. (If you want to use it in combat then you are allowed to just put it in one of your normal 4 slots)