Minor code cleanup and reformatting. Removed unnecessary battleStates.
Merge branch 'master' of https://github.com/chessmasterhong/WaterEmblem
Minor code cleanup for consistency.
Minor code optimization for freeSlot() and hasSlots() functions.
Combined hasSlots() functionality with freeSlot(). Removed unnecessary hasSlots() function.