First real-world test of Scenario branching

Just some minor refactoring for the battle screen transition method to
check the "disable transitions" flag at scene time using doIf blocks.
Seems to work so far!