Gen 2: Waterfall has no change to flinch

Also, add newline at the end and remove trailing comma for compatibility.
Sorted moves alphabetically (Magikarp's revenge stays at the end as it used to be).