YonKuma

Just want to confirm that the solution in @bslenul 's comment works. Commenting out those two lines causes save states to be loaded correctly.