IIRC, Rika didn't get killed by Shion in Taraimawashi-hen because Keiichi didn't ask her to protect him, so you're partially right. Then the end part played out similar to Yakusamashi (except Mion, who was being kept in the Sonozaki dungeon by Shion and thus escaped the 'gas disaster', took the place of Satoko.)
|