let's see if it works this time
fix some costumes
fix overworld sprites colours
switch characters & overlay problems fixed
Stick waves back in
fix character.lua so it merges
Moved the FPS-drawing code to main

By moving the code to main.lua, all of the game windows will have the
FPS drawn on them if the option is enabled, without having to add the
code to each individual window.
Updated code style
Merge pull request #1273 from Protuhj/fps-menus

Moved the FPS-drawing code to main.lua
Merge pull request #1228 from edisonout/overworldupdate

Need to reassign Britta's costumes. Gonna get done in the batching this week