AVALANCHE: Move some variables, fix savegame counter increment when saving