Populated choices.txt

Some scenes have special effects and require individual attention. The
ones I encountered while checking for branch convergence points have
been added as #TODO.