More polish for battle effects and overall ui interactions

Fix Def not being able to be boosted more than once

Lots of small data fixes and tweaks

Fix Rival Counter not counting up for Rival Achievement