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

This reverts commit 2f0de70272be25078eb539df83a3c1c5717fae5d.