Revert "Merge branch 'master' of https://github.com/remiscarlet/WaterEmblem"

This reverts commit 221a81af433df3016121129673d4d1f44c6e625a, reversing
changes made to 8225dd3802620f58bddfce627ed94537cb746b61.

Hopefully fixing things