Merge pull request #6158 from Tomcc/master Improved arbitrary mipmap detection (Mario Sunshine water fix)