I’ve beaten the game. I haven’t gone back to do any of the extra battles, but I at least got the secret ending.