Moved variable declarations to more fitting locations
Removed to variables and moved others to more fitting locations.
Merge branch 'master' of https://github.com/Belbertn/ZeldaLiek