Fixes combat looping issue if you opt to leave after beating Izumi.
Merge remote-tracking branch 'upstream/master'