       y: settings.y - Crafty.viewport.y
     )
 
+    type = if @entity.has('ViewportFixed')
+      'viewport'
+    else
+      settings.x = deltaX
+      settings.y = deltaY
+      'linear'
+
     @entity.hideMarker.choreography([
-      type: 'viewport'
+      type: type
       x: settings.x
       maxSpeed: settings.speed
       duration: duration

          return @_moveAir(airSettings)
            .then =>
              @enemy.moveState = 'water'
              if @enemy.alive > 0
                @_setupWaterSpot()
                @_waterSplash()
                @_moveWater(settings)


  _moveAir: (settings) ->
    defaults =
      speed: @entity.speed

    if @entity.has('ViewportFixed')
      defaults.x = @entity.x + Crafty.viewport.x
      defaults.y = @entity.y + Crafty.viewport.y

    settings = _.defaults(settings, defaults)

