Gen 2: Waterfall has no chance to flinch

Also remove trailing comma for compatibility and sort moves alphabetically (Magikarp's Revenge stays at the end as it used to be)