Gen V ribbon fixes
Gen VI Pokemon structure additions