Correctly track type changes
Fixes graphical issues involving seemingly quad-typed mons