End Fight Bugfix

BUGFIXES:

• The Cannonball fight now triggers.
• You can't enter a fight during dialogue anymore.