BrokenSword checking more robust

Still problems with shifting IDs, but now should no longer be possible
to see weirdly named icons and have invalid trades