More tweaks to ff2 goomba support.

And hopefully the last :/