Change tabs to 2 spaces
Merge pull request #2203 from niamu/code_cleanup

Change tabs to 2 spaces
Fix trampoline blur
Fix enemy flashing on high frequency attacks

Used player flashing as a reference and developed a foolproof method for always making sure that enemy flashing is cancelled at the appropriate time.
Merge pull request #2250 from niamu/trampoline

Fix trampoline blur height
Merge pull request #2239 from niamu/enemy_hurt_state

Fix enemy flashing on high frequency attacks
Acquire messages all have colours now
Merge pull request #2248 from niamu/acquire_dialog

Acquire messages all have colours now