Additionally, making HMs in-battle moves always wound up creating some bizarre Story/Gameplay Segregation issues. With some HMs - surf, waterfall, rock climb - the out of battle ability was just completely different from the actual attack. Surf, especially. Out of battle, you are swimming across...